diff --git a/.bazelrc b/.bazelrc
index 9278352e686ef..c4029cd0bab47 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,14 +2,6 @@
 # Import shared settings first so we can override below
 import %workspace%/.bazelrc.common
 
-# Remote cache settings for local env
-# build --remote_cache=grpcs://cloud.buildbuddy.io
-# build --incompatible_remote_results_ignore_disk=true
-# build --noremote_upload_local_results
-# build --remote_timeout=30
-# build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
-# build --remote_accept_cached=true
-
 # Enable this in case you want to share your build info
 # build --build_metadata=VISIBILITY=PUBLIC
 build --build_metadata=TEST_GROUPS=//packages
diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
index 773672c5f05f5..eac479d4d450f 100644
--- a/.buildkite/pipelines/artifacts.yml
+++ b/.buildkite/pipelines/artifacts.yml
@@ -4,29 +4,68 @@ steps:
     agents:
       queue: c2-16
     timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - wait
 
   - command: TEST_PACKAGE=deb .buildkite/scripts/steps/package_testing/test.sh
-    label: Package testing for deb
+    label: Artifact Testing
     agents:
       queue: n2-4-virt
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - command: TEST_PACKAGE=rpm .buildkite/scripts/steps/package_testing/test.sh
-    label: Package testing for rpm
+    label: Artifact Testing
     agents:
       queue: n2-4-virt
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - command: TEST_PACKAGE=docker .buildkite/scripts/steps/package_testing/test.sh
-    label: Package testing for docker
+    label: Artifact Testing
     agents:
       queue: n2-4-virt
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
 
   - command: .buildkite/scripts/steps/artifacts/docker_context.sh
-    label: 'Docker Build Context'
+    label: 'Docker Context Verification'
     agents:
       queue: n2-2
-    timeout_in_minutes: 20
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/artifacts/cloud.sh
+    label: 'Cloud Deployment'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 30
+    if: "build.env('RELEASE_BUILD') == null || build.env('RELEASE_BUILD') == '' || build.env('RELEASE_BUILD') == 'false'"
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - wait
+
+  - command: .buildkite/scripts/steps/artifacts/publish.sh
+    label: 'Publish Kibana Artifacts'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 30
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
index 18f3440b4acf7..f41af0b4c1475 100755
--- a/.buildkite/pipelines/es_snapshots/verify.yml
+++ b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -29,7 +29,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 27
+    parallelism: 30
     agents:
       queue: n2-4
     depends_on: build
@@ -40,18 +40,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
-    label: 'Docker CI Group'
-    agents:
-      queue: n2-4
-    depends_on: build
-    timeout_in_minutes: 120
-    key: default-cigroup-docker
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-
   - command: .buildkite/scripts/steps/functional/oss_cigroup.sh
     label: 'OSS CI Group'
     parallelism: 11
diff --git a/.buildkite/pipelines/flaky_tests/groups.json b/.buildkite/pipelines/flaky_tests/groups.json
index aa061af00bd6c..e471d5c6a8679 100644
--- a/.buildkite/pipelines/flaky_tests/groups.json
+++ b/.buildkite/pipelines/flaky_tests/groups.json
@@ -26,13 +26,13 @@
       "name": "Fleet - Cypress"
     },
     {
-      "key": "xpack/cigroup",
-      "name": "Default CI Group",
-      "ciGroups": 27
+      "key": "xpack/cypress/apm_cypress",
+      "name": "APM - Cypress"
     },
     {
-      "key": "xpack/cigroup/Docker",
-      "name": "Default CI Group Docker"
+      "key": "xpack/cigroup",
+      "name": "Default CI Group",
+      "ciGroups": 30
     },
     {
       "key": "xpack/firefox",
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index a11f566b06093..9c0f8eecc05b3 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -51,7 +51,7 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 27
+    parallelism: 30
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -64,20 +64,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
-    label: 'Docker CI Group'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 120
-    key: default-cigroup-docker
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-        - exit_status: '*'
-          limit: 1
-
   - command: .buildkite/scripts/steps/functional/oss_cigroup.sh
     label: 'OSS CI Group'
     parallelism: 11
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index 21f324ed12780..9de2e7bc6d807 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -17,26 +17,16 @@ steps:
 
   - command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
     label: 'Default CI Group'
-    parallelism: 27
+    parallelism: 30
     agents:
-      queue: n2-4
+      queue: n2-4-spot-2
     depends_on: build
     timeout_in_minutes: 150
     key: default-cigroup
     retry:
       automatic:
-        - exit_status: '*'
-          limit: 1
-
-  - command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
-    label: 'Docker CI Group'
-    agents:
-      queue: n2-4
-    depends_on: build
-    timeout_in_minutes: 120
-    key: default-cigroup-docker
-    retry:
-      automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -44,12 +34,14 @@ steps:
     label: 'OSS CI Group'
     parallelism: 11
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     key: oss-cigroup
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -61,6 +53,8 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -72,6 +66,8 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -83,6 +79,8 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -94,6 +92,8 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -105,6 +105,8 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -116,6 +118,8 @@ steps:
     timeout_in_minutes: 120
     retry:
       automatic:
+        - exit_status: '-1'
+          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -123,17 +127,25 @@ steps:
     label: 'Jest Tests'
     parallelism: 8
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     timeout_in_minutes: 90
     key: jest
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     parallelism: 3
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     timeout_in_minutes: 120
     key: jest-integration
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
@@ -141,6 +153,10 @@ steps:
       queue: n2-2-spot
     timeout_in_minutes: 120
     key: api-integration
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
@@ -176,6 +192,10 @@ steps:
       queue: n2-4-spot
     key: build_api_docs
     timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
 
   - command: .buildkite/scripts/steps/webpack_bundle_analyzer/build_and_upload.sh
     label: 'Build Webpack Bundle Analyzer reports'
diff --git a/.buildkite/pipelines/pull_request/response_ops.yml b/.buildkite/pipelines/pull_request/response_ops.yml
new file mode 100644
index 0000000000000..846477170409b
--- /dev/null
+++ b/.buildkite/pipelines/pull_request/response_ops.yml
@@ -0,0 +1,11 @@
+steps:
+  - command: .buildkite/scripts/steps/functional/response_ops_cases.sh
+    label: 'Cases Cypress Tests on Security Solution'
+    agents:
+      queue: ci-group-6
+    depends_on: build
+    timeout_in_minutes: 120
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
diff --git a/.buildkite/scripts/build_kibana_plugins.sh b/.buildkite/scripts/build_kibana_plugins.sh
index 94366d9524346..fafd68d86a65d 100755
--- a/.buildkite/scripts/build_kibana_plugins.sh
+++ b/.buildkite/scripts/build_kibana_plugins.sh
@@ -3,18 +3,4 @@
 set -euo pipefail
 
 echo "--- Build Platform Plugins"
-node scripts/build_kibana_platform_plugins \
-  --scan-dir "$KIBANA_DIR/test/analytics/__fixtures__/plugins" \
-  --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
-  --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
-  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
-  --scan-dir "$KIBANA_DIR/examples" \
-  --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
-  --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
-  --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \
-  --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
-  --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
-  --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
-  --scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
-  --scan-dir "$XPACK_DIR/test/security_functional/fixtures/common" \
-  --scan-dir "$XPACK_DIR/examples"
+node scripts/build_kibana_platform_plugins --examples --test-plugins
diff --git a/.buildkite/scripts/common/setup_bazel.sh b/.buildkite/scripts/common/setup_bazel.sh
index f9877b16cd424..96cd04fa612fd 100755
--- a/.buildkite/scripts/common/setup_bazel.sh
+++ b/.buildkite/scripts/common/setup_bazel.sh
@@ -15,8 +15,8 @@ if [[ "${BAZEL_CACHE_MODE:-none}" == read* ]]; then
   echo "[bazel] enabling caching"
 cat <<EOF >> $KIBANA_DIR/.bazelrc
   build --bes_results_url=https://app.buildbuddy.io/invocation/
-  build --bes_backend=grpcs://cloud.buildbuddy.io
-  build --remote_cache=grpcs://cloud.buildbuddy.io
+  build --bes_backend=grpcs://remote.buildbuddy.io
+  build --remote_cache=grpcs://remote.buildbuddy.io
   build --remote_timeout=3600
   build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY
 EOF
diff --git a/.buildkite/scripts/lifecycle/pre_build.sh b/.buildkite/scripts/lifecycle/pre_build.sh
index d901594e36ce4..29da2d207dcc4 100755
--- a/.buildkite/scripts/lifecycle/pre_build.sh
+++ b/.buildkite/scripts/lifecycle/pre_build.sh
@@ -12,3 +12,11 @@ export CI_STATS_TOKEN="$(retry 5 5 vault read -field=api_token secret/kibana-iss
 export CI_STATS_HOST="$(retry 5 5 vault read -field=api_host secret/kibana-issues/dev/kibana_ci_stats)"
 
 node "$(dirname "${0}")/ci_stats_start.js"
+
+# We resolve the latest manifest URL at the beginning of the build to ensure that all steps in the build will use the same manifest
+# Otherwise, the manifest could change if a step is running around the time that a new one is promoted
+if [[ ! "${ES_SNAPSHOT_MANIFEST:-}" ]]; then
+  BUCKET=$(curl -s "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/$(cat package.json | jq -r .version)/manifest-latest-verified.json" | jq -r .bucket)
+  ES_SNAPSHOT_MANIFEST_DEFAULT="https://storage.googleapis.com/$BUCKET/manifest.json"
+  buildkite-agent meta-data set ES_SNAPSHOT_MANIFEST_DEFAULT "$ES_SNAPSHOT_MANIFEST_DEFAULT"
+fi
diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh
index 8b2f1f65a52f4..e7a176a5c2666 100755
--- a/.buildkite/scripts/lifecycle/pre_command.sh
+++ b/.buildkite/scripts/lifecycle/pre_command.sh
@@ -65,6 +65,15 @@ EOF
   fi
 }
 
+# If a custom manifest isn't specified, then use the default one that we resolve earlier in the build
+{
+  if [[ ! "${ES_SNAPSHOT_MANIFEST:-}" ]]; then
+    ES_SNAPSHOT_MANIFEST=${ES_SNAPSHOT_MANIFEST:-$(buildkite-agent meta-data get ES_SNAPSHOT_MANIFEST_DEFAULT --default '')}
+    export ES_SNAPSHOT_MANIFEST
+    echo "Using default ES Snapshot Manifest: $ES_SNAPSHOT_MANIFEST"
+  fi
+}
+
 # Setup CI Stats
 {
   CI_STATS_BUILD_ID="$(buildkite-agent meta-data get ci_stats_build_id --default '')"
diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.js b/.buildkite/scripts/pipelines/pull_request/pipeline.js
index 2d3befd00a890..fa167d9f324b4 100644
--- a/.buildkite/scripts/pipelines/pull_request/pipeline.js
+++ b/.buildkite/scripts/pipelines/pull_request/pipeline.js
@@ -65,7 +65,6 @@ const uploadPipeline = (pipelineContent) => {
     if (
       (await doAnyChangesMatch([
         /^x-pack\/plugins\/security_solution/,
-        /^x-pack\/plugins\/cases/,
         /^x-pack\/plugins\/lists/,
         /^x-pack\/plugins\/timelines/,
         /^x-pack\/test\/security_solution_cypress/,
@@ -77,6 +76,13 @@ const uploadPipeline = (pipelineContent) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
     }
 
+    if (
+      (await doAnyChangesMatch([/^x-pack\/plugins\/cases/])) ||
+      process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+    ) {
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/response_ops.yml'));
+    }
+
     if (
       (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
       process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
diff --git a/.buildkite/scripts/steps/artifacts/build.sh b/.buildkite/scripts/steps/artifacts/build.sh
index 9d40a713d4b0a..4519e5167c91f 100644
--- a/.buildkite/scripts/steps/artifacts/build.sh
+++ b/.buildkite/scripts/steps/artifacts/build.sh
@@ -4,44 +4,23 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 
-if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
-  VERSION="$(jq -r '.version' package.json)"
-  RELEASE_ARG="--release"
-else
-  VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
-  RELEASE_ARG=""
-fi
+source .buildkite/scripts/steps/artifacts/env.sh
 
-echo "--- Build Kibana Distribution"
-node scripts/build "$RELEASE_ARG" --all-platforms --debug --docker-cross-compile --skip-docker-cloud
+echo "--- Build Kibana artifacts"
+node scripts/build --all-platforms --debug --docker-cross-compile $(echo "$BUILD_ARGS")
 
-echo "--- Build dependencies report"
-node scripts/licenses_csv_report "--csv=target/dependencies-$VERSION.csv"
-
-# Release verification
-if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
-  echo "--- Build and push Kibana Cloud Distribution"
-  # This doesn't meet the requirements for a release image, implementation TBD
-  # Beats artifacts will need to match a specific commit sha that matches other stack iamges
-  # For now this is a placeholder step that will allow us to run automated Cloud tests
-  # against a best guess approximation of a release image
-  echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
-  trap 'docker logout docker.elastic.co' EXIT
+echo "--- Extract default i18n messages"
+mkdir -p target/i18n
+node scripts/i18n_extract --output-dir=target/i18n
 
-  node scripts/build \
-    "$RELEASE_ARG" \
-    --skip-initialize \
-    --skip-generic-folders \
-    --skip-platform-folders \
-    --skip-archives \
-    --docker-images \
-    --docker-tag-qualifier="$GIT_COMMIT" \
-    --docker-push \
-    --skip-docker-ubi \
-    --skip-docker-ubuntu \
-    --skip-docker-contexts
-fi
+echo "--- Build dependencies report"
+node scripts/licenses_csv_report "--csv=target/dependencies-$FULL_VERSION.csv"
+(cd target; sha512sum "dependencies-$FULL_VERSION.csv" > "dependencies-$FULL_VERSION.csv.sha512.txt")
 
+echo "--- Upload Kibana Artifacts"
 cd target
-buildkite-agent artifact upload "*"
-cd -
\ No newline at end of file
+buildkite-agent artifact upload 'kibana-*'
+buildkite-agent artifact upload "dependencies-$FULL_VERSION.csv"
+buildkite-agent artifact upload "dependencies-$FULL_VERSION.csv.sha512.txt"
+buildkite-agent artifact upload 'i18n/*.json'
+cd -
diff --git a/.buildkite/scripts/steps/artifacts/cloud.sh b/.buildkite/scripts/steps/artifacts/cloud.sh
new file mode 100644
index 0000000000000..8fa04a5d176b0
--- /dev/null
+++ b/.buildkite/scripts/steps/artifacts/cloud.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+set -euo pipefail
+
+.buildkite/scripts/bootstrap.sh
+
+source .buildkite/scripts/steps/artifacts/env.sh
+
+echo "--- Publish Cloud image"
+mkdir -p target
+cd target
+
+buildkite-agent artifact download "kibana-cloud-$FULL_VERSION-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+docker load --input kibana-cloud-$FULL_VERSION-docker-image.tar.gz
+
+TAG="$FULL_VERSION-$GIT_COMMIT"
+KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$FULL_VERSION"
+KIBANA_TEST_IMAGE="docker.elastic.co/kibana-ci/kibana-cloud:$TAG"
+
+docker tag "$KIBANA_BASE_IMAGE" "$KIBANA_TEST_IMAGE"
+
+echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
+trap 'docker logout docker.elastic.co' EXIT
+
+docker push "$KIBANA_TEST_IMAGE"
+docker logout docker.elastic.co
+
+cd -
+
+echo "--- Create deployment"
+CLOUD_DEPLOYMENT_NAME="kibana-artifacts-$TAG"
+
+LOGS=$(mktemp --suffix ".json")
+DEPLOYMENT_SPEC=$(mktemp --suffix ".json")
+
+jq '
+  .name = "'$CLOUD_DEPLOYMENT_NAME'" |
+  .resources.kibana[0].plan.kibana.docker_image = "'$KIBANA_TEST_IMAGE'" |
+  .resources.kibana[0].plan.kibana.version = "'$FULL_VERSION'" |
+  .resources.elasticsearch[0].plan.elasticsearch.version = "'$FULL_VERSION'" |
+  .resources.enterprise_search[0].plan.enterprise_search.version = "'$FULL_VERSION'" |
+  .resources.integrations_server[0].plan.integrations_server.version = "'$FULL_VERSION'"
+  ' .buildkite/scripts/steps/cloud/deploy.json > "$DEPLOYMENT_SPEC"
+
+ecctl deployment create --track --output json --file "$DEPLOYMENT_SPEC" &> "$LOGS"
+CLOUD_DEPLOYMENT_USERNAME=$(jq --slurp '.[]|select(.resources).resources[] | select(.credentials).credentials.username' "$LOGS")
+CLOUD_DEPLOYMENT_PASSWORD=$(jq --slurp '.[]|select(.resources).resources[] | select(.credentials).credentials.password' "$LOGS")
+CLOUD_DEPLOYMENT_ID=$(jq -r --slurp '.[0].id' "$LOGS")
+CLOUD_DEPLOYMENT_STATUS_MESSAGES=$(jq --slurp '[.[]|select(.resources == null)]' "$LOGS")
+
+CLOUD_DEPLOYMENT_KIBANA_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.kibana[0].info.metadata.aliased_url')
+CLOUD_DEPLOYMENT_ELASTICSEARCH_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.elasticsearch[0].info.metadata.aliased_url')
+
+# NOTE: disabled pending log sanitization
+# echo "--- Setup FTR"
+# export TEST_KIBANA_PROTOCOL=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').protocol)")
+# export TEST_KIBANA_HOSTNAME=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').hostname)")
+# export TEST_KIBANA_PORT=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').port)")
+# export TEST_KIBANA_USERNAME=$CLOUD_DEPLOYMENT_USERNAME"
+# export TEST_KIBANA_PASS=$CLOUD_DEPLOYMENT_PASSWORD"
+
+# export TEST_ES_PROTOCOL=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').protocol)")
+# export TEST_ES_HOSTNAME==$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').hostname)")
+# export TEST_ES_PORT=$(node -e "console.log(new URL('$CLOUD_DEPLOYMENT_KIBANA_URL').port)")
+# export TEST_ES_USER="$CLOUD_DEPLOYMENT_USERNAME"
+# export TEST_ES_PASS="$CLOUD_DEPLOYMENT_PASSWORD"
+
+# export TEST_BROWSER_HEADLESS=1
+
+# Error: attempted to use the "es" service to fetch Elasticsearch version info but the request failed: ConnectionError: self signed certificate in certificate chain
+# export NODE_TLS_REJECT_UNAUTHORIZED=0
+
+# echo "--- Run default functional tests"
+# node --no-warnings scripts/functional_test_runner.js --include-tag=cloud -exclude-tag=skipCloud
+
+# echo "--- Run x-pack functional tests"
+# cd x-pack
+# node --no-warnings scripts/functional_test_runner.js --include-tag=cloud -exclude-tag=skipCloud 
+
+echo "--- Shutdown deployment"
+ecctl deployment shutdown "$CLOUD_DEPLOYMENT_ID" --force --track --output json &> "$LOGS"
diff --git a/.buildkite/scripts/steps/artifacts/docker_context.sh b/.buildkite/scripts/steps/artifacts/docker_context.sh
index 787f5d278febc..a20544de18fd9 100644
--- a/.buildkite/scripts/steps/artifacts/docker_context.sh
+++ b/.buildkite/scripts/steps/artifacts/docker_context.sh
@@ -4,17 +4,11 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 
-if [[ "${RELEASE_BUILD:-}" == "true" ]]; then
-  VERSION="$(jq -r '.version' package.json)"
-  RELEASE_ARG="--release"
-else
-  VERSION="$(jq -r '.version' package.json)-SNAPSHOT"
-  RELEASE_ARG=""
-fi
+source .buildkite/scripts/steps/artifacts/env.sh
 
 echo "--- Create contexts"
 mkdir -p target
-node scripts/build "$RELEASE_ARG" --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact
+node scripts/build --skip-initialize --skip-generic-folders --skip-platform-folders --skip-archives --docker-context-use-local-artifact $(echo "$BUILD_ARGS")
 
 echo "--- Setup default context"
 DOCKER_BUILD_FOLDER=$(mktemp -d)
@@ -22,7 +16,7 @@ DOCKER_BUILD_FOLDER=$(mktemp -d)
 tar -xf target/kibana-[0-9]*-docker-build-context.tar.gz -C "$DOCKER_BUILD_FOLDER"
 cd $DOCKER_BUILD_FOLDER
 
-buildkite-agent artifact download "kibana-$VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+buildkite-agent artifact download "kibana-$FULL_VERSION-linux-x86_64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
 
 echo "--- Build context"
 docker build .
diff --git a/.buildkite/scripts/steps/artifacts/env.sh b/.buildkite/scripts/steps/artifacts/env.sh
new file mode 100755
index 0000000000000..ea2850ff9a38a
--- /dev/null
+++ b/.buildkite/scripts/steps/artifacts/env.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+RELEASE_BUILD="${RELEASE_BUILD:="false"}"
+VERSION_QUALIFIER="${VERSION_QUALIFIER:=""}"
+
+BASE_VERSION="$(jq -r '.version' package.json)"
+
+if [[ "$VERSION_QUALIFIER" == "" ]]; then
+  QUALIFIER_VERSION="$BASE_VERSION"
+else
+  QUALIFIER_VERSION="$BASE_VERSION-$VERSION_QUALIFIER"
+fi
+
+if [[ "$RELEASE_BUILD" == "true" ]]; then
+  FULL_VERSION="$QUALIFIER_VERSION"
+
+  # Beats artifacts will need to match a specific commit sha that matches other stack images
+  # for release builds.  For now we are skipping Cloud builds until there's a pointer.
+  BUILD_ARGS="--release --skip-docker-cloud --version-qualifier=$VERSION_QUALIFIER"
+  WORKFLOW="staging"
+else
+  FULL_VERSION="$QUALIFIER_VERSION-SNAPSHOT"
+  BUILD_ARGS="--version-qualifier=$VERSION_QUALIFIER"
+  WORKFLOW="snapshot"
+fi
+
+export VERSION_QUALIFIER
+export BASE_VERSION
+export QUALIFIER_VERSION
+export FULL_VERSION
+export BUILD_ARGS
+export WORKFLOW
diff --git a/.buildkite/scripts/steps/artifacts/publish.sh b/.buildkite/scripts/steps/artifacts/publish.sh
new file mode 100644
index 0000000000000..c16d7a02d6cd9
--- /dev/null
+++ b/.buildkite/scripts/steps/artifacts/publish.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+source .buildkite/scripts/steps/artifacts/env.sh
+
+echo "--- Download and verify artifacts"
+function download {
+  buildkite-agent artifact download "$1" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  buildkite-agent artifact download "$1.sha512.txt" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  sha512sum -c "$1.sha512.txt"
+  rm "$1.sha512.txt"
+}
+
+mkdir -p target
+cd target
+
+download "kibana-$FULL_VERSION-docker-image.tar.gz"
+download "kibana-$FULL_VERSION-docker-image-aarch64.tar.gz"
+download "kibana-ubi8-$FULL_VERSION-docker-image.tar.gz"
+
+download "kibana-$FULL_VERSION-arm64.deb"
+download "kibana-$FULL_VERSION-amd64.deb"
+download "kibana-$FULL_VERSION-x86_64.rpm"
+download "kibana-$FULL_VERSION-aarch64.rpm"
+
+download "kibana-$FULL_VERSION-docker-build-context.tar.gz"
+download "kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"
+download "kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
+
+download "kibana-$FULL_VERSION-linux-aarch64.tar.gz"
+download "kibana-$FULL_VERSION-linux-x86_64.tar.gz"
+
+download "kibana-$FULL_VERSION-darwin-x86_64.tar.gz"
+download "kibana-$FULL_VERSION-darwin-aarch64.tar.gz"
+
+download "kibana-$FULL_VERSION-windows-x86_64.zip"
+
+download "dependencies-$FULL_VERSION.csv"
+
+cd - 
+
+echo "--- Set artifact permissions"
+chmod -R a+r target/*
+chmod -R a+w target
+
+echo "--- Pull latest Release Manager CLI"
+echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
+trap 'docker logout docker.elastic.co' EXIT
+docker pull docker.elastic.co/infra/release-manager:latest
+
+echo "--- Publish artifacts"
+if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
+  export VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
+  export VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
+  export VAULT_ADDR="https://secrets.elastic.co:8200"
+  docker run --rm \
+    --name release-manager \
+    -e VAULT_ADDR \
+    -e VAULT_ROLE_ID \
+    -e VAULT_SECRET_ID \
+    --mount type=bind,readonly=false,src="$PWD/target",target=/artifacts/target \
+    docker.elastic.co/infra/release-manager:latest \
+      cli collect \
+        --project kibana \
+        --branch "$KIBANA_BASE_BRANCH" \
+        --commit "$GIT_COMMIT" \
+        --workflow "$WORKFLOW" \
+        --version "$BASE_VERSION" \
+        --qualifier "$VERSION_QUALIFIER" \
+        --artifact-set main
+
+  ARTIFACTS_SUBDOMAIN="artifacts-$WORKFLOW"
+  ARTIFACTS_SUMMARY=$(curl -s "https://$ARTIFACTS_SUBDOMAIN.elastic.co/kibana/latest/$FULL_VERSION.json" | jq -re '.summary_url')
+
+  cat << EOF | buildkite-agent annotate --style "info" --context artifacts-summary
+  ### Artifacts Summary
+
+  $ARTIFACTS_SUMMARY
+EOF
+
+else
+  echo "Skipping publish for untracked branch $BUILDKITE_BRANCH"
+fi
diff --git a/.buildkite/scripts/steps/es_snapshots/create_manifest.js b/.buildkite/scripts/steps/es_snapshots/create_manifest.js
index 9357cd72fff06..e20a3262e66e0 100644
--- a/.buildkite/scripts/steps/es_snapshots/create_manifest.js
+++ b/.buildkite/scripts/steps/es_snapshots/create_manifest.js
@@ -8,7 +8,7 @@
 
 const fs = require('fs');
 const { execSync } = require('child_process');
-const { BASE_BUCKET_DAILY } = require('./bucket_config.js');
+const { BASE_BUCKET_DAILY } = require('./bucket_config');
 
 (async () => {
   console.log('--- Create ES Snapshot Manifest');
diff --git a/.buildkite/scripts/steps/es_snapshots/promote_manifest.js b/.buildkite/scripts/steps/es_snapshots/promote_manifest.js
index d7ff670755712..1ba60ae6cd25e 100644
--- a/.buildkite/scripts/steps/es_snapshots/promote_manifest.js
+++ b/.buildkite/scripts/steps/es_snapshots/promote_manifest.js
@@ -8,7 +8,7 @@
 
 const fs = require('fs');
 const { execSync } = require('child_process');
-const { BASE_BUCKET_DAILY, BASE_BUCKET_PERMANENT } = require('./bucket_config.js');
+const { BASE_BUCKET_DAILY, BASE_BUCKET_PERMANENT } = require('./bucket_config');
 
 (async () => {
   try {
diff --git a/.buildkite/scripts/steps/functional/performance_playwright.sh b/.buildkite/scripts/steps/functional/performance_playwright.sh
index 9a4301e94f7fe..dad75c9f66a98 100644
--- a/.buildkite/scripts/steps/functional/performance_playwright.sh
+++ b/.buildkite/scripts/steps/functional/performance_playwright.sh
@@ -20,7 +20,7 @@ sleep 120
 
 cd "$XPACK_DIR"
 
-journeys=("ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard")
+journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard" "many_fields_discover")
 
 for i in "${journeys[@]}"; do
     echo "JOURNEY[${i}] is running"
@@ -28,7 +28,7 @@ for i in "${journeys[@]}"; do
     export TEST_PERFORMANCE_PHASE=WARMUP
     export ELASTIC_APM_ACTIVE=false
     export JOURNEY_NAME="${i}"
-    
+
     checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: WARMUP)" \
       node scripts/functional_tests \
       --config test/performance/config.playwright.ts \
diff --git a/.buildkite/scripts/steps/functional/response_ops_cases.sh b/.buildkite/scripts/steps/functional/response_ops_cases.sh
new file mode 100755
index 0000000000000..13d0ef52130a3
--- /dev/null
+++ b/.buildkite/scripts/steps/functional/response_ops_cases.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/steps/functional/common.sh
+
+export JOB=kibana-security-solution-chrome
+
+echo "--- Response Ops Cases Cypress Tests on Security Solution"
+
+cd "$XPACK_DIR"
+
+checks-reporter-with-killswitch "Response Ops Cases Cypress Tests on Security Solution" \
+ node scripts/functional_tests \
+   --debug --bail \
+   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
+   --config test/security_solution_cypress/cases_cli_config.ts
diff --git a/.buildkite/scripts/steps/package_testing/test.sh b/.buildkite/scripts/steps/package_testing/test.sh
index a9a46502d5b3b..e5ed00f760864 100755
--- a/.buildkite/scripts/steps/package_testing/test.sh
+++ b/.buildkite/scripts/steps/package_testing/test.sh
@@ -15,12 +15,12 @@ elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
   buildkite-agent artifact download 'kibana-*.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   KIBANA_IP_ADDRESS="192.168.56.6"
 elif [[ "$TEST_PACKAGE" == "docker" ]]; then
-  buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION*-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   KIBANA_IP_ADDRESS="192.168.56.7"
 fi
 cd ..
 
-export VAGRANT_CWD=test/package
+export VAGRANT_CWD=$PWD/test/package
 vagrant up "$TEST_PACKAGE" --no-provision
 
 node scripts/es snapshot \
@@ -29,6 +29,16 @@ node scripts/es snapshot \
   --license=trial &
 while ! timeout 1 bash -c "echo > /dev/tcp/localhost/9200"; do sleep 30; done
 
+function echoKibanaLogs {
+  echo '--- Kibana logs'
+  if [[ "$TEST_PACKAGE" == "deb" ]] || [[ "$TEST_PACKAGE" == "rpm" ]]; then
+    vagrant ssh $TEST_PACKAGE -t -c 'sudo cat /var/log/kibana/kibana.log'
+  elif [[ "$TEST_PACKAGE" == "docker" ]]; then
+    vagrant ssh $TEST_PACKAGE -t -c 'sudo docker logs kibana'
+  fi
+}
+trap "echoKibanaLogs" EXIT
+
 vagrant provision "$TEST_PACKAGE"
 
 export TEST_BROWSER_HEADLESS=1
diff --git a/.ci/.storybook/main.js b/.ci/.storybook/main.js
index 37f3391337308..c4e017179021a 100644
--- a/.ci/.storybook/main.js
+++ b/.ci/.storybook/main.js
@@ -7,7 +7,7 @@
  */
 
 const config = require('@kbn/storybook').defaultConfig;
-const aliases = require('../../src/dev/storybook/aliases.ts').storybookAliases;
+const aliases = require('../../src/dev/storybook/aliases').storybookAliases;
 
 config.refs = {};
 
diff --git a/.ci/ci_groups.yml b/.ci/ci_groups.yml
index 1be6e8c196a2d..91ef2b2b7acb7 100644
--- a/.ci/ci_groups.yml
+++ b/.ci/ci_groups.yml
@@ -39,4 +39,6 @@ xpack:
   - ciGroup25
   - ciGroup26
   - ciGroup27
-  - ciGroupDocker
+  - ciGroup28
+  - ciGroup29
+  - ciGroup30
diff --git a/.eslintrc.js b/.eslintrc.js
index 08af34d24e7f5..3c1c455fc3295 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1452,6 +1452,20 @@ module.exports = {
       plugins: ['react', '@typescript-eslint'],
       files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
       rules: {
+        'padding-line-between-statements': [
+          'error',
+          {
+            blankLine: 'always',
+            prev: ['block-like'],
+            next: ['*'],
+          },
+          {
+            blankLine: 'always',
+            prev: ['*'],
+            next: ['return'],
+          },
+        ],
+        'padded-blocks': ['error', 'always'],
         'arrow-body-style': ['error', 'as-needed'],
         'prefer-arrow-callback': 'error',
         'no-unused-vars': 'off',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b846bc0801870..d7c74279d61e4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -88,7 +88,6 @@
 ### Observability Plugins
 
 # Observability Shared
-/x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/observability/public/components/shared/date_picker/ @elastic/uptime
 
 # Unified Observability
@@ -103,6 +102,7 @@
 /x-pack/plugins/observability/public/rules @elastic/actionable-observability
 /x-pack/plugins/observability/public/pages/alerts @elastic/actionable-observability
 /x-pack/plugins/observability/public/pages/cases  @elastic/actionable-observability
+/x-pack/plugins/observability/public/pages/rules  @elastic/actionable-observability
 
 # Infra Monitoring
 /x-pack/plugins/infra/ @elastic/infra-monitoring-ui
@@ -400,8 +400,150 @@
 #CC# /x-pack/plugins/security_solution/ @elastic/security-solution
 
 # Security Solution sub teams
-/x-pack/plugins/timelines @elastic/security-threat-hunting
-/x-pack/plugins/lists @elastic/security-detections-response
+
+## Security Solution sub teams - Threat Hunting Investigations
+/x-pack/plugins/timelines @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/common/search_strategy/timeline @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/common/types/timeline @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/cypress/integration/timeline_templates @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/cypress/integration/timeline @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/cypress/integration/detection_alerts @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/cypress/integration/urls @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/public/common/components/alerts_viewer @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/common/components/event_details @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/common/components/events_viewer @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/common/components/markdown_editor @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/detections/components/alerts_kpis @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/detections/components/alerts_table @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/detections/components/alerts_info @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/resolver @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/public/timelines @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/server/lib/timeline @elastic/security-threat-hunting-investigations
+
+## Security Solution sub teams - Threat Hunting Explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/common/search_strategy/security_solution/user @elastic/security-threat-hunting-explore
+
+/x-pack/plugins/security_solution/cypress/integration/cases @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/host_details @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/overview @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/pagination @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/integration/users @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/screens/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/screens/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/tasks/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/tasks/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/cypress/upgrade_integration/threat_hunting/cases @elastic/security-threat-hunting-explore
+
+/x-pack/plugins/security_solution/public/common/components/charts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/header_page @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/header_section @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/inspect @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/last_event_time @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/links @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/navigation @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/news_feed @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/overview_description_list @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/paginated_table @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/sidebar_header @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/stat_items @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/tables @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/top_n @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/components/with_hover_actions @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/containers/hosts_risk @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/containers/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/common/lib/cell_actions @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/cases @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/overview @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/public/users @elastic/security-threat-hunting-explore
+
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network @elastic/security-threat-hunting-explore
+/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users @elastic/security-threat-hunting-explore
+
+## Security Solution sub teams - Detections and Response Alerts
+/x-pack/plugins/security_solution/public/detections/pages/alerts @elastic/security-detections-response-alerts
+
+/x-pack/plugins/security_solution/server/lib/detection_engine/migrations @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/notifications @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/schemas @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/signals @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index @elastic/security-detections-response-alerts
+/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals @elastic/security-detections-response-alerts
+
+
+## Security Solution sub teams - Detections and Response Rules
+/x-pack/plugins/security_solution/cypress/integration/detection_rules @elastic/security-detections-response-rules
+
+/x-pack/plugins/security_solution/public/detections/components/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/components/severity @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/components/status @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/common/components/health_truncate_text @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/common/components/links_to_docs @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/common/components/callouts @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/components/callouts @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/mitre @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules @elastic/security-detections-response-rules
+
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/rules @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/utils @elastic/security-detections-response-rules
+/x-pack/plugins/security_solution/server/lib/detection_engine/tags @elastic/security-detections-response-rules
+
+## Security Solution sub teams - Security Platform
+/x-pack/plugins/lists @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/cypress/integration/data_sources @elastic/security-solution-platform
+/x-pack/plugins/security_solution/cypress/integration/exceptions @elastic/security-solution-platform
+/x-pack/plugins/security_solution/cypress/integration/value_lists @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/public/common/components/exceptions @elastic/security-solution-platform
+/x-pack/plugins/security_solution/public/exceptions @elastic/security-solution-platform
+/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists @elastic/security-solution-platform
+/x-pack/plugins/security_solution/public/common/components/sourcerer @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/server/lib/sourcerer @elastic/security-solution-platform
+/packages/kbn-securitysolution* @elastic/security-solution-platform
+
+
+## Security Solution sub teams - Security Threat Intelligence
+/x-pack/plugins/security_solution/public/common/components/threat_match @elastic/security-threat-intelligence
+
+## Security Solution cross teams ownership
+/x-pack/plugins/security_solution/cypress/downloads @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/fixtures @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/helpers @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/objects @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/plugins @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/support @elastic/security-detections-response @elastic/security-threat-hunting
+/x-pack/plugins/security_solution/cypress/urls @elastic/security-threat-hunting-investigations @elastic/security-solution-platform
+
+/x-pack/plugins/security_solution/screens/common @elastic/security-detections-response @elastic/security-threat-hunting
+
+/x-pack/plugins/security_solution/common/ecs @elastic/security-detections-response-rules @elastic/security-threat-hunting-investigations
+/x-pack/plugins/security_solution/common/test @elastic/security-detections-response-rules @elastic/security-detections-response-alerts
+
+/x-pack/plugins/security_solution/public/common/components/hover_actions @elastic/security-threat-hunting-explore @elastic/security-threat-hunting-investigations
+
+/x-pack/plugins/security_solution/server/routes @elastic/security-detections-response-alerts @elastic/security-detections-response-rules
+
 
 ## Security Solution sub teams - security-onboarding-and-lifecycle-mgt
 /x-pack/plugins/security_solution/public/management/ @elastic/security-onboarding-and-lifecycle-mgt
@@ -429,10 +571,12 @@ x-pack/test/security_solution_cypress @elastic/security-engineering-productivity
 
 ## Security Solution sub teams - adaptive-workload-protection
 x-pack/plugins/session_view @elastic/awp-platform
+x-pack/plugins/security_solution/public/common/components/sessions_viewer @elastic/awp-platform
 
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
 
+
 # Security Asset Management
 /x-pack/plugins/osquery @elastic/security-asset-management
 
@@ -462,10 +606,12 @@ x-pack/plugins/session_view @elastic/awp-platform
 
 # Reporting
 /x-pack/examples/reporting_example/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/examples/screenshotting_example/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/plugins/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/apps/dashboard/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/apps/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/apps/reporting_management/ @elastic/kibana-reporting-services @elastic/kibana-app-services
+/x-pack/test/examples/screenshotting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/es_archives/lens/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/es_archives/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
 /x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/kibana-reporting-services @elastic/kibana-app-services
@@ -484,6 +630,7 @@ x-pack/plugins/session_view @elastic/awp-platform
 
 ## Shared UX
 /src/plugins/shared_ux/ @elastic/shared-ux
+/packages/shared-ux/ @elastic/shared-ux
 /packages/shared-ux-*/ @elastic/shared-ux
 /src/plugins/kibana_react/ @elastic/shared-ux
 /src/plugins/kibana_react/public/code_editor @elastic/shared-ux @elastic/kibana-presentation
diff --git a/.gitignore b/.gitignore
index 588c185b17a0b..7c20367dfe6de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 node_modules
 !/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
 !/src/dev/notice/__fixtures__/node_modules
+!/packages/kbn-import-resolver/src/__fixtures__/node_modules
 trash
 /optimize
 /built_assets
@@ -98,4 +99,5 @@ elastic-agent-*
 fleet-server-*
 elastic-agent.yml
 fleet-server.yml
+/packages/kbn-synthetic-package-map/synthetic-packages.json
 
diff --git a/.i18nrc.json b/.i18nrc.json
index 573462d497438..a5d1b36ede73d 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -66,6 +66,7 @@
     "share": "src/plugins/share",
     "sharedUX": "src/plugins/shared_ux",
     "sharedUXComponents": "packages/kbn-shared-ux-components/src",
+    "sharedUXPackages": "packages/shared-ux",
     "coloring": "packages/kbn-coloring/src",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": [
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index ff9014214d4c0..891389d803a56 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -10,14 +10,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch Node.js rules
 http_archive(
   name = "build_bazel_rules_nodejs",
-  sha256 = "523da2d6b50bc00eaf14b00ed28b1a366b3ab456e14131e9812558b26599125c",
-  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.3.1/rules_nodejs-5.3.1.tar.gz"],
+  patch_args = ["-p1"],
+  patches = ["//:src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch"],
+  sha256 = "6f15d75f9e99c19d9291ff8e64e4eb594a6b7d25517760a75ad3621a7a48c2df",
+  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.7.0/rules_nodejs-4.7.0.tar.gz"],
 )
 
-# Build Node.js rules dependencies
-load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
-build_bazel_rules_nodejs_dependencies()
-
 # Now that we have the rules let's import from them to complete the work
 load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
 
@@ -39,7 +37,7 @@ node_repositories(
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],
-  yarn_releases = {
+  yarn_repositories = {
     "1.21.1": ("yarn-v1.21.1.tar.gz", "yarn-v1.21.1", "d1d9f4a0f16f5ed484e814afeb98f39b82d4728c6c8beaafb5abc99c02db6674"),
   },
   yarn_version = "1.21.1",
diff --git a/dev_docs/tutorials/screenshotting.mdx b/dev_docs/tutorials/screenshotting.mdx
new file mode 100644
index 0000000000000..76f2859928491
--- /dev/null
+++ b/dev_docs/tutorials/screenshotting.mdx
@@ -0,0 +1,87 @@
+---
+id: kibDevTutorialScreenshotting
+slug: /kibana-dev-docs/tutorials/screenshotting
+title: Kibana Screenshotting Service
+summary: Kibana Screenshotting Service
+date: 2022-04-12
+tags: ['kibana', 'onboarding', 'dev', 'architecture']
+---
+
+## Screenshotting Plugin
+
+This plugin provides functionality to take screenshots of the Kibana pages.
+It uses Chromium and Puppeteer underneath to run the browser in headless mode.
+
+If you are planning to integrate with the screenshotting plugin, please get in touch with the App Services team to know all the limitations.
+
+### Capabilities
+- Canvas workpads screenshots.
+- Dashboards screenshots.
+- Expressions screenshots.
+- PDF generation.
+- Batch screenshotting.
+
+### Usage
+After listing the `screenshotting` plugin in your dependencies, the plugin will be intitalized on the setup stage.
+The intitalization process downloads (if it is not already present) and verifies the Chromium build.
+
+The start contract exposes a public API to interact with the plugin.
+Apart from the actual screenshotting functionality, it also provides a way for self-diagnostics.
+
+Here is an example of how you can take a screenshot of a Kibana URL.
+
+
+```typescript
+import { lastValueFrom } from 'rxjs';
+import type { CoreSetup, Plugin } from 'src/core/server';
+import type { ScreenshottingStart } from 'x-pack/plugins/screenshotting/server';
+
+
+interface StartDeps {
+  screenshotting: ScreenshottingStart;
+}
+
+class ExamplePlugin implements Plugin<void, void, void, StartDeps> {
+  setup({ http, getStartServices }: CoreSetup<StartDeps>) {
+    const router = http.createRouter();
+
+    router.get(
+      {
+        path: '/api/capture',
+        validate: {
+          query: schema.object({
+            id: schema.string(),
+          }),
+        },
+      },
+      async (context, request, response) => {
+        const [, { screenshotting }] = await getStartServices();
+        const { metrics, results } = await lastValueFrom(
+          screenshotting.getScreenshots({
+            request,
+            urls: [`http://localhost/app/canvas#/workpad/workpad-${request.query.id}`],
+          })
+        );
+
+        return response.ok({
+          body: JSON.stringify({
+            metrics,
+            image: results[0]?.screenshots[0]?.data.toString('base64'),
+            errors: results[0]?.renderErrors,
+          } as ScreenshottingExpressionResponse),
+        });
+      }
+    );
+  }
+
+  start() {}
+}
+
+export function plugin() {
+  return new ExamplePlugin();
+}
+```
+
+<DocCallOut>
+  Check the complete API reference <DocLink id="kibScreenshottingPluginApi" text="here" />.
+</DocCallOut>
diff --git a/docs/api/cases.asciidoc b/docs/api/cases.asciidoc
index 3b5bfaeceaff4..9ffe69997f714 100644
--- a/docs/api/cases.asciidoc
+++ b/docs/api/cases.asciidoc
@@ -8,22 +8,22 @@ these APIs:
 * <<cases-api-create>>
 * <<cases-api-delete-cases>>
 * <<cases-api-delete-comments>>
-* {security-guide}/cases-api-find-alert.html[Find all alerts attached to a case]
 * <<cases-api-find-cases>>
-* {security-guide}/cases-api-find-cases-by-alert.html[Find cases by alert]
 * <<cases-api-find-connectors>>
+* <<cases-api-get-alerts>>
 * <<cases-api-get-case-activity>>
 * <<cases-api-get-case>>
 * <<cases-api-get-status>>
+* <<cases-api-get-cases-by-alert>>
 * <<cases-api-get-comments>>
-* {security-guide}/cases-get-connector.html[Get current connector]
+* <<cases-get-configuration>>
 * <<cases-api-get-reporters>>
 * <<cases-api-get-tag>>
-* {security-guide}/cases-api-push.html[Push case]
-* {security-guide}/assign-connector.html[Set default Elastic Security UI connector]
-* {security-guide}/case-api-update-connector.html[Update case configurations]
+* <<cases-api-push>>
+* <<cases-api-set-configuration>>
 * <<cases-api-update>>
 * <<cases-api-update-comment>>
+* <<cases-api-update-configuration>>
 
 //ADD
 include::cases/cases-api-add-comment.asciidoc[leveloffset=+1]
@@ -36,12 +36,20 @@ include::cases/cases-api-delete-comments.asciidoc[leveloffset=+1]
 include::cases/cases-api-find-cases.asciidoc[leveloffset=+1]
 include::cases/cases-api-find-connectors.asciidoc[leveloffset=+1]
 //GET
+include::cases/cases-api-get-alerts.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-case-activity.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-case.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-status.asciidoc[leveloffset=+1]
+include::cases/cases-api-get-cases-by-alert.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-comments.asciidoc[leveloffset=+1]
+include::cases/cases-api-get-configuration.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-reporters.asciidoc[leveloffset=+1]
 include::cases/cases-api-get-tags.asciidoc[leveloffset=+1]
+//PUSH
+include::cases/cases-api-push.asciidoc[leveloffset=+1]
+//SET
+include::cases/cases-api-set-configuration.asciidoc[leveloffset=+1]
 //UPDATE
 include::cases/cases-api-update.asciidoc[leveloffset=+1]
 include::cases/cases-api-update-comment.asciidoc[leveloffset=+1]
+include::cases/cases-api-update-configuration.asciidoc[leveloffset=+1]
diff --git a/docs/api/cases/cases-api-get-alerts.asciidoc b/docs/api/cases/cases-api-get-alerts.asciidoc
new file mode 100644
index 0000000000000..62bca2d38ae8f
--- /dev/null
+++ b/docs/api/cases/cases-api-get-alerts.asciidoc
@@ -0,0 +1,60 @@
+[[cases-api-get-alerts]]
+== Get alerts attached to case API
+++++
+<titleabbrev>Get alerts</titleabbrev>
+++++
+
+preview::[]
+
+Gets all alerts attached to a case.
+
+=== {api-request-title}
+
+`GET <kibana host>:<port>/api/cases/<case_id>/alerts`
+
+`GET <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/alerts`
+
+=== {api-prereq-title}
+
+You must have `read` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the cases you're seeking.
+
+=== {api-path-parms-title}
+
+`<case_id>`::
+(Required, string) The identifier for the case. To retrieve case IDs, use
+<<cases-api-find-cases>>.
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-example-title}
+
+Return all alerts attached to case `293f1bc0-74f6-11ea-b83a-553aecdb28b6`:
+
+[source,sh]
+--------------------------------------------------
+GET api/cases/293f1bc0-74f6-11ea-b83a-553aecdb28b6/alerts
+--------------------------------------------------
+// KIBANA
+
+The API returns a JSON array listing the alerts. For example:
+
+[source,json]
+--------------------------------------------------
+[
+   {
+      "id": "09f0c261e39e36351d75995b78bb83673774d1bc2cca9df2d15f0e5c0a99a540",
+      "index": ".internal.alerts-security.alerts-default-000001",
+      "attached_at": "2022-04-13T21:35:24.602Z"
+   }
+]
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-get-cases-by-alert.asciidoc b/docs/api/cases/cases-api-get-cases-by-alert.asciidoc
new file mode 100644
index 0000000000000..fb1f7c625c5fc
--- /dev/null
+++ b/docs/api/cases/cases-api-get-cases-by-alert.asciidoc
@@ -0,0 +1,72 @@
+[[cases-api-get-cases-by-alert]]
+== Get cases by alert API
+++++
+<titleabbrev>Get cases by alert</titleabbrev>
+++++
+
+preview::[]
+
+Returns the cases associated with a specific alert.
+
+=== {api-request-title}
+
+`GET <kibana host>:<port>/api/cases/alerts/<alert_id>`
+
+`GET <kibana host>:<port>/s/<space_id>/api/cases/alerts/<alert_id>`
+
+=== {api-prereq-title}
+
+You must have `read` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the cases you're seeking.
+
+=== {api-path-parms-title}
+
+`<alert_id>`::
+(Required, string) The alert identifier.
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-query-parms-title}
+
+`owner`::
+(Optional, string or array of strings) A filter to limit the retrieved cases to
+a specific set of applications. Valid values are: `cases`, `observability`,
+and `securitySolution`. If this parameter is omitted, the response contains all
+cases that the user has access to read.
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-example-title}
+
+Return cases associated with the alert ID
+`09f0c261e39e36351d75995b78bb83673774d1bc2cca9df2d15f0e5c0a99a540`:
+
+[source,sh]
+--------------------------------------------------
+GET api/cases/alerts/09f0c261e39e36351d75995b78bb83673774d1bc2cca9df2d15f0e5c0a99a540
+--------------------------------------------------
+// KIBANA
+
+The API returns a JSON array containing the identifier and title of the cases.
+For example:
+
+[source,json]
+--------------------------------------------------
+[
+    {
+        "id": "8af6ac20-74f6-11ea-b83a-553aecdb28b6",
+        "title": "Case 1"
+    },
+    {
+        "id": "a18b38a0-71b0-11ea-a0b2-c51ea50a58e2",
+        "title": "Case 2"
+    }
+]
+--------------------------------------------------
\ No newline at end of file
diff --git a/docs/api/cases/cases-api-get-configuration.asciidoc b/docs/api/cases/cases-api-get-configuration.asciidoc
new file mode 100644
index 0000000000000..778e95949e3f5
--- /dev/null
+++ b/docs/api/cases/cases-api-get-configuration.asciidoc
@@ -0,0 +1,95 @@
+[[cases-get-configuration]]
+== Get case configuration API
+++++
+<titleabbrev>Get configuration</titleabbrev>
+++++
+
+Retrieves external connection details, such as the closure type and
+default connector for cases.
+
+=== {api-request-title}
+
+`GET <kibana host>:<port>/api/cases/configure`
+
+`GET <kibana host>:<port>/s/<space_id>/api/cases/configure`
+
+=== {api-prereq-title}
+
+You must have `read` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the case configuration.
+
+=== {api-path-parms-title}
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-query-parms-title}
+
+`owner`::
+(Optional, string or array of strings) A filter to limit the retrieved
+details to a specific set of applications. Valid values are: `cases`,
+`observability`, and `securitySolution`. If this parameter is omitted, the
+response contains information for all applications that the user has access to
+read.
+
+=== Response code
+
+`200`::
+   Indicates a successful call.
+
+=== Example
+
+[source,sh]
+--------------------------------------------------
+GET api/cases/configure?owner=securitySolution
+--------------------------------------------------
+// KIBANA
+
+The API returns the following type of information:
+
+[source,json]
+--------------------------------------------------
+[
+  {
+    "owner": "securitySolution",
+    "closure_type": "close-by-user",
+    "created_at": "2020-03-30T13:31:38.083Z",
+    "created_by": {
+      "email": "admin@hms.gov.uk",
+      "full_name": "Mr Admin",
+      "username": "admin"
+    },
+    "updated_at": null,
+    "updated_by": null,
+    "connector": {
+      "id": "131d4448-abe0-4789-939d-8ef60680b498",
+      "name": "my-jira",
+      "type": ".jira",
+      "fields": null
+    },
+    "mappings": [
+      {
+        "source": "title", 
+        "target": "summary",
+        "action_type": "overwrite"
+      },
+      {
+        "source": "description", 
+        "target": "description",
+        "action_type": "overwrite"
+      },
+      {
+        "source": "comments", 
+        "target": "comments",
+        "action_type": "append"
+      }
+    ],
+    "version": "WzE3NywxXQ==",
+    "error": null,
+    "id": "7349772f-421a-4de3-b8bb-2d9b22ccee30"
+  }
+]
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-get-tags.asciidoc b/docs/api/cases/cases-api-get-tags.asciidoc
index 426a7e91a0f47..44d2bf9fffd1f 100644
--- a/docs/api/cases/cases-api-get-tags.asciidoc
+++ b/docs/api/cases/cases-api-get-tags.asciidoc
@@ -4,7 +4,7 @@
 <titleabbrev>Get tags</titleabbrev>
 ++++
 
-Aggregates and returns all unique tags from all cases.
+Aggregates and returns a list of case tags.
 
 === Request
 
@@ -21,10 +21,6 @@ You must have `read` privileges for the *Cases* feature in the *Management*,
 
 === Path parameters
 
-`<case_id>`::
-(Required, string) An identifier for the case to retrieve. Use 
-<<cases-api-find-cases>> to retrieve case IDs.
-
 `<space_id>`::
 (Optional, string) An identifier for the space. If it is not specified, the
 default space is used.
@@ -32,9 +28,9 @@ default space is used.
 === Query parameters
 
 `owner`::
-(Optional, string or array of strings) Specifies the set of applications to 
-limit the retrieved tags. If not specified, the response contains all tags from 
-cases that the user has access to read.
+(Optional, string or array of strings) A filter to limit the retrieved tags to a specific set of applications.
+Valid values are: `cases`, `observability`, and `securitySolution`. If this parameter is omitted, the response
+contains tags from all cases that the user has access to read.
 
 ==== Response code
 
@@ -43,16 +39,13 @@ cases that the user has access to read.
 
 ==== Example
 
-Gets all tags for all cases:
-
 [source,sh]
 --------------------------------------------------
 GET api/cases/tags
 --------------------------------------------------
 // KIBANA
 
-The API returns a JSON object with the names and email addresses of users who 
-opened cases. For example: 
+The API returns a JSON object with tags from all the cases that the user has access to read. For example: 
 
 [source,json]
 --------------------------------------------------
@@ -62,4 +55,4 @@ opened cases. For example:
   "social engineering",
   "bubblegum"
 ]
---------------------------------------------------
\ No newline at end of file
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-push.asciidoc b/docs/api/cases/cases-api-push.asciidoc
new file mode 100644
index 0000000000000..e837dc78ad1a4
--- /dev/null
+++ b/docs/api/cases/cases-api-push.asciidoc
@@ -0,0 +1,110 @@
+[[cases-api-push]]
+== Push case API
+++++
+<titleabbrev>Push case</titleabbrev>
+++++
+
+Pushes a case to an external service.
+
+=== {api-request-title}
+
+`POST <kibana host>:<port>/api/cases/<case_id>/connector/<connector_id>/_push`
+
+`POST <kibana host>:<port>/s/<space_id>/api/cases/<case_id>/connector/<connector_id>/_push`
+
+=== {api-prereq-title}
+
+You must have `all` privileges for the *Actions and Connectors* feature in the
+*Management* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>. You must also have `all`
+privileges for the *Cases* feature in the *Management*, *{observability}*, or
+*Security* section of the {kib} feature privileges, depending on the
+`owner` of the case you're pushing.
+
+=== {api-path-parms-title}
+
+`<case_id>`::
+(Required, string) The identifier for the case. To retrieve case IDs, use
+<<cases-api-find-cases>>.
+
+`<connector_id>`::
+(Required, string) The identifier for the connector. To retrieve connector IDs,
+use <<cases-api-find-connectors>>.
+
+<space_id>::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-example-title}
+
+Push the case to an external service:
+
+[source,sh]
+--------------------------------------------------
+POST api/cases/7349772f-421a-4de3-b8bb-2d9b22ccee30/connector/abed3a70-71bd-11ea-a0b2-c51ea50a58e2/_push
+{}
+--------------------------------------------------
+// KIBANA
+
+The API returns a JSON object representing the pushed case. For example:
+
+[source,json]
+--------------------------------------------------
+{
+  "id": "a18b38a0-71b0-11ea-a0b2-c51ea50a58e2",
+  "version": "Wzk4LDFd",
+  "comments": [],
+  "totalComment": 0,
+  "totalAlerts": 0,
+  "title": "This case will self-destruct in 5 seconds",
+  "tags": [ "phishing", "social engineering", "bubblegum" ],
+  "description": "James Bond clicked on a highly suspicious email banner advertising cheap holidays for underpaid civil servants. Operation bubblegum is active. Repeat - operation bubblegum is now active!",
+  "settings": {
+    "syncAlerts": true
+  },
+  "owner": "securitySolution",
+  "closed_at": null,
+  "closed_by": null,
+  "created_at": "2022-03-29T11:30:02.658Z",
+  "created_by": {
+    "email": "ahunley@imf.usa.gov",
+    "full_name": "Alan Hunley",
+    "username": "ahunley"
+  },
+  "status": "open",
+  "updated_at": "2022-03-29T12:01:50.244Z",
+  "updated_by": {
+    "full_name": "Classified",
+    "email": "classified@hms.oo.gov.uk",
+    "username": "M"
+  },
+  "connector": {
+    "id": "08046500-bb7b-11ec-89c3-ef74ed34b2e9",
+    "name": "My connector",
+    "type": ".jira",
+    "fields": {
+      "issueType": "10006",
+      "priority": "High",
+      "parent": null
+    }
+  },
+  "external_service": {
+    "pushed_at":"2022-07-26T18:19:43.688Z",
+    "pushed_by":{
+        "username":"classified@hms.oo.gov.uk",
+        "full_name":null,
+        "email":null
+    },
+    "connector_name":"My connector",
+    "external_id":"10110",
+    "external_title":"TPN-103",
+    "external_url":"https://cases.jira.com",
+    "connector_id":"08046500-bb7b-11ec-89c3-ef74ed34b2e9",
+  }
+}
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-set-configuration.asciidoc b/docs/api/cases/cases-api-set-configuration.asciidoc
new file mode 100644
index 0000000000000..2b0cbefc008ac
--- /dev/null
+++ b/docs/api/cases/cases-api-set-configuration.asciidoc
@@ -0,0 +1,163 @@
+[[cases-api-set-configuration]]
+== Set case configuration API
+++++
+<titleabbrev>Set configuration</titleabbrev>
+++++
+
+Sets external connection details, such as the closure type and
+default connector for cases.
+
+=== {api-request-title}
+
+`POST <kibana host>:<port>/api/cases/configure`
+
+`POST <kibana host>:<port>/s/<space_id>/api/cases/configure`
+
+=== {api-prereq-title}
+
+You must have `all` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the case configuration.
+
+=== {api-description-title}
+
+Connectors are used to interface with external systems. You must create a
+connector before you can use it in your cases. Refer to <<add-case-connectors>>.
+
+If you set a default connector, it is automatically selected when you create
+cases in {kib}. If you use the <<cases-api-create,create case API>>, however,
+you must still specify all of the connector details.
+
+=== {api-path-parms-title}
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== {api-request-body-title}
+
+`closure_type`::
+(Required, string) Specifies whether a case is automatically closed when it is
+pushed to external systems.
++
+--
+Valid values are:
+
+* `close-by-pushing`: Cases are automatically closed when they are pushed.
+* `close-by-user`: Cases are not automatically closed.
+--
+
+`connector`::
+(Required, object) An object that contains the connector configuration.
++
+.Properties of `connector`
+[%collapsible%open]
+====
+`fields`::
+(Required, object) An object that contains the connector fields.
++
+--
+TIP: The fields specified in the case configuration are not used and are not
+propagated to individual cases, therefore it is recommended to set it to `null`.
+--
+
+`id`::
+(Required, string) The identifier for the connector. If you do not want a
+default connector, use `none`. To retrieve connector IDs, use
+<<cases-api-find-connectors>>.
+
+`name`::
+(Required, string) The name of the connector. If you do not want a default
+connector, use `none`. To retrieve connector names, use
+<<cases-api-find-connectors>>.
+
+`type`::
+(Required, string) The type of the connector. Valid values are: `.jira`, `.none`,
+`.resilient`,`.servicenow`, `.servicenow-sir`, and `.swimlane`.
+====
+
+`owner`::
+(Required, string) The application that owns the case configuration. Valid
+values are: `cases`, `observability`, or `securitySolution`. This value affects
+whether you're setting case configuration details for {stack-manage-app},
+{observability}, or {security-app}.
+
+`settings`::
+(Optional, object)
+An object that contains the case settings.
++
+.Properties of `settings`
+[%collapsible%open]
+====
+`syncAlerts`:: 
+(Required, boolean) Turns alert syncing on or off.
+====
+
+=== {api-response-codes-title}
+
+`200`::
+   Indicates a successful call.
+
+=== {api-example-title}
+
+Sets the closure type and default connector for cases in **{stack-manage-app}**:
+
+[source,sh]
+--------------------------------------------------
+POST api/cases/configure
+{
+  "owner": "cases",
+  "connector": {
+    "id": "131d4448-abe0-4789-939d-8ef60680b498",
+    "name": "my-serviceNow",
+    "type": ".servicenow",
+    "fields": null,
+  },
+  "closure_type": "close-by-user"
+}
+--------------------------------------------------
+
+The API returns the following response:
+
+[source,json]
+--------------------------------------------------
+{
+  "owner": "cases",
+  "closure_type": "close-by-user",
+  "created_at": "2022-04-02T01:09:02.303Z",
+  "created_by": {
+    "email": "moneypenny@hms.gov.uk",
+    "full_name": "Ms Moneypenny",
+    "username": "moneypenny"
+  },
+  "updated_at": null,
+  "updated_by": null,
+  "connector": {
+    "id": "131d4448-abe0-4789-939d-8ef60680b498",
+    "name": "my-serviceNow",
+    "type": ".servicenow",
+    "fields": null,
+  },
+  "mappings": [
+    {
+      "source": "title", 
+      "target": "short_description",
+      "action_type": "overwrite"
+    },
+    {
+      "source":"description",
+      "target":"description",
+      "action_type":"overwrite"
+    },
+    {
+      "source":"comments",
+      "target":"work_notes",
+      "action_type":"append"
+    }
+  ],
+  "version": "WzE3NywxXQ==",
+  "error": null,
+  "id": "7349772f-421a-4de3-b8bb-2d9b22ccee30",
+}
+--------------------------------------------------
diff --git a/docs/api/cases/cases-api-update-configuration.asciidoc b/docs/api/cases/cases-api-update-configuration.asciidoc
new file mode 100644
index 0000000000000..cf7d2ea7d8cfd
--- /dev/null
+++ b/docs/api/cases/cases-api-update-configuration.asciidoc
@@ -0,0 +1,129 @@
+[[cases-api-update-configuration]]
+== Update case configuration API
+++++
+<titleabbrev>Update configuration</titleabbrev>
+++++
+
+Updates external connection details, such as the closure type and default
+connector for cases.
+
+=== {api-request-title}
+
+`PATCH <kibana host>:<port>/api/cases/configure/<configuration_id>`
+
+`PATCH <kibana host>:<port>/s/<space_id>/api/cases/configure/<configuration_id>`
+
+=== {api-prereq-title}
+
+You must have `all` privileges for the *Cases* feature in the *Management*,
+*{observability}*, or *Security* section of the
+<<kibana-feature-privileges,{kib} feature privileges>>, depending on the
+`owner` of the case configuration.
+
+=== {api-description-title}
+
+Connectors are used to interface with external systems. You must create a
+connector before you can it in your cases. Refer to <<add-case-connectors>>.
+
+=== {api-path-parms-title}
+
+`<configuration_id>`::
+The identifier for the configuration. To retrieve the configuration IDs, use
+<<cases-get-configuration>>.
+
+`<space_id>`::
+(Optional, string) An identifier for the space. If it is not specified, the
+default space is used.
+
+=== Request body
+
+`closure_type`::
+(Optional, string) Determines whether a case is automatically closed when it is
+pushed to external systems. Valid values are:
++
+--
+* `close-by-pushing`: Cases are automatically closed when they
+are pushed.
+* `close-by-user`: Cases are not automatically closed.
+--
+
+`connector`::
+(Optional, object) An object that contains the connector configuration.
++
+.Properties of `connector`
+[%collapsible%open]
+====
+`fields`::
+(Required, object) An object that contains the connector fields.
++
+--
+TIP: The fields specified in the case configuration are not used and are not
+propagated to individual cases, therefore it is recommended to set it to `null`.
+--
+
+`id`::
+(Required, string) The identifier for the connector. To retrieve connector IDs,
+use <<cases-api-find-connectors>>.
+
+`name`::
+(Required, string) The name of the connector.
+
+`type`::
+(Required, string) The type of the connector. Valid values are: `.servicenow`,
+`.servicenow-sir`, `.jira`, `.resilient`, `.swimlane`, and `.none`.
+====
+
+`version`::
+(Required, string) The version of the connector. To retrieve the version value,
+use <<cases-get-configuration>>.
+
+=== Response code
+
+`200`::
+   Indicates a successful call.
+
+=== Example
+
+Change the closure type configuration option:
+
+[source,sh]
+--------------------------------------------------
+PATCH api/cases/configure/3297a0f0-b5ec-11ec-b141-0fdb20a7f9a9
+{
+  "closure_type": "close-by-pushing",
+  "version": "WzIwMiwxXQ=="
+}
+--------------------------------------------------
+// KIBANA
+
+The API returns the following:
+
+[source,json]
+--------------------------------------------------
+{
+  "closure_type": "close-by-user",
+  "owner": "cases",
+  "created_at": "2022-04-06T20:57:40.746Z",
+  "created_by": {
+    "email": "admin@hms.gov.uk",
+    "full_name": "Ms Admin",
+    "username": "admin"
+  },
+  "updated_at": "2022-04-12T22:41:09.262Z",
+  "updated_by": {
+    "email": "admin@hms.gov.uk",
+    "full_name": "Ms Admin",
+    "username": "admin"
+  },
+  "connector": {
+    "id": "none",
+    "name": "none",
+    "type": ".none",
+    "fields": null
+    },
+  "mappings": [],
+  "version": "WzkwNiw1XQ==",
+  "error": null,
+  "id": "3297a0f0-b5ec-11ec-b141-0fdb20a7f9a9"
+}
+--------------------------------------------------
diff --git a/docs/api/data-views/update-fields.asciidoc b/docs/api/data-views/update-fields.asciidoc
index babe689ce6b23..3ec4b7c84694a 100644
--- a/docs/api/data-views/update-fields.asciidoc
+++ b/docs/api/data-views/update-fields.asciidoc
@@ -49,7 +49,7 @@ Set popularity `count` for field `foo`:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view/fields
+$ curl -X POST api/data_views/data-view/my-view/fields
 {
     "fields": {
         "foo": {
@@ -64,7 +64,7 @@ Update multiple metadata fields in one request:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view/fields
+$ curl -X POST api/data_views/data-view/my-view/fields
 {
     "fields": {
         "foo": {
@@ -82,7 +82,7 @@ $ curl -X POST api/saved_objects/data-view/my-view/fields
 Use `null` value to delete metadata:
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-pattern/fields
+$ curl -X POST api/data_views/data-view/my-pattern/fields
 {
     "fields": {
         "foo": {
diff --git a/docs/api/data-views/update.asciidoc b/docs/api/data-views/update.asciidoc
index b86a13682cb0b..c1473b8f7079b 100644
--- a/docs/api/data-views/update.asciidoc
+++ b/docs/api/data-views/update.asciidoc
@@ -61,7 +61,7 @@ Update a title of the `<my-view>` data view:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view
+$ curl -X POST api/data_views/data-view/my-view
 {
   "data_view": {
     "title": "some-other-view-*"
@@ -74,7 +74,7 @@ Customize the update behavior:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view
+$ curl -X POST api/data_views/data-view/my-view
 {
   "refresh_fields": true,
   "data_view": {
@@ -89,7 +89,7 @@ All update fields are optional, but you can specify the following fields:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/data-view/my-view
+$ curl -X POST api/data_views/data-view/my-view
 {
   "data_view": {
     "title": "...",
diff --git a/docs/api/index-patterns/update-fields.asciidoc b/docs/api/index-patterns/update-fields.asciidoc
index e3ac304745f39..e2655d557e929 100644
--- a/docs/api/index-patterns/update-fields.asciidoc
+++ b/docs/api/index-patterns/update-fields.asciidoc
@@ -46,7 +46,7 @@ Set popularity `count` for field `foo`:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
+$ curl -X POST api/index_patterns/index-pattern/my-pattern/fields
 {
     "fields": {
         "foo": {
@@ -61,7 +61,7 @@ Update multiple metadata fields in one request:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
+$ curl -X POST api/index_patterns/index-pattern/my-pattern/fields
 {
     "fields": {
         "foo": {
@@ -79,7 +79,7 @@ $ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
 Use `null` value to delete metadata:
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern/fields
+$ curl -X POST api/index_patterns/index-pattern/my-pattern/fields
 {
     "fields": {
         "foo": {
diff --git a/docs/api/index-patterns/update.asciidoc b/docs/api/index-patterns/update.asciidoc
index 366afd336d15a..64479f00ef5c5 100644
--- a/docs/api/index-patterns/update.asciidoc
+++ b/docs/api/index-patterns/update.asciidoc
@@ -58,7 +58,7 @@ Update a title of the `<my-pattern>` index pattern:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST api/index_patterns/index-pattern/my-pattern
 {
   "index_pattern": {
     "title": "some-other-pattern-*"
@@ -71,7 +71,7 @@ Customize the update behavior:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST api/index_patterns/index-pattern/my-pattern
 {
   "refresh_fields": true,
   "index_pattern": {
@@ -86,7 +86,7 @@ All update fields are optional, but you can specify the following fields:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST api/index_patterns/index-pattern/my-pattern
 {
   "index_pattern": {
     "title": "...",
diff --git a/docs/api/saved-objects/create.asciidoc b/docs/api/saved-objects/create.asciidoc
index d250b0602adb7..73339946ea0c0 100644
--- a/docs/api/saved-objects/create.asciidoc
+++ b/docs/api/saved-objects/create.asciidoc
@@ -72,7 +72,7 @@ used to specify a single space, and the "All spaces" identifier (`'*'`) is not a
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/index-pattern/my-pattern  -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
+$ curl -X POST api/index_patterns/index-pattern/my-pattern  -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
 {
   "attributes": {
     "title": "my-pattern-*"
diff --git a/docs/api/saved-objects/delete.asciidoc b/docs/api/saved-objects/delete.asciidoc
index eca46e202beda..6cc31b6563aa3 100644
--- a/docs/api/saved-objects/delete.asciidoc
+++ b/docs/api/saved-objects/delete.asciidoc
@@ -47,6 +47,6 @@ Delete {a-data-source} object with the `my-pattern` ID:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X DELETE api/saved_objects/index-pattern/my-pattern
+$ curl -X DELETE api/index_patterns/index-pattern/my-pattern
 --------------------------------------------------
 // KIBANA
diff --git a/docs/api/saved-objects/get.asciidoc b/docs/api/saved-objects/get.asciidoc
index 174587b400993..3f4b6037cd806 100644
--- a/docs/api/saved-objects/get.asciidoc
+++ b/docs/api/saved-objects/get.asciidoc
@@ -39,7 +39,7 @@ Retrieve the {data-source} object with the `my-pattern` ID:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X GET api/saved_objects/index-pattern/my-pattern
+$ curl -X GET api/index_patterns/index-pattern/my-pattern
 --------------------------------------------------
 // KIBANA
 
diff --git a/docs/api/saved-objects/update.asciidoc b/docs/api/saved-objects/update.asciidoc
index fb7decccabd4c..0559c49625fee 100644
--- a/docs/api/saved-objects/update.asciidoc
+++ b/docs/api/saved-objects/update.asciidoc
@@ -58,7 +58,7 @@ Update an existing {data-source} object,`my-pattern`, with a different title:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X PUT api/saved_objects/index-pattern/my-pattern
+$ curl -X PUT api/index_patterns/index-pattern/my-pattern
 {
   "attributes": {
     "title": "some-other-pattern-*"
diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
index 0216d26023a78..eed060d253a28 100644
--- a/docs/developer/getting-started/monorepo-packages.asciidoc
+++ b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -57,7 +57,6 @@ yarn kbn watch
 - @kbn/analytics
 - @kbn/apm-config-loader
 - @kbn/apm-utils
-- @kbn/babel-code-parser
 - @kbn/babel-preset
 - @kbn/cli-dev-mode
 - @kbn/config
diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
index 91cb6c370d759..d5ba98c06ef02 100644
--- a/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
+++ b/docs/development/core/server/kibana-plugin-core-server.kibanaresponsefactory.md
@@ -34,7 +34,7 @@ kibanaResponseFactory: {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
-    customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<string | Error | {
+    customError: (options: CustomHttpResponseOptions<ResponseError | Buffer | Stream>) => KibanaResponse<string | Error | Buffer | Stream | {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
diff --git a/docs/discover/document-explorer.asciidoc b/docs/discover/document-explorer.asciidoc
index de7b07aa4d784..e0cead0292cf3 100644
--- a/docs/discover/document-explorer.asciidoc
+++ b/docs/discover/document-explorer.asciidoc
@@ -1,10 +1,11 @@
 [[document-explorer]]
-== Document Explorer
+== Explore your documents
 
-beta::[]
 
-*Discover* has a *Document Explorer* with resizable columns, better data sorting and comparison,
-and a fullscreen view.
+*Discover* displays your documents in table format, so you can
+best explore your data.
+Use the document table to resize columns, set row height,
+perform multi-column sorting, compare data, and more.
 
 ++++
 <script type="text/javascript" async src="https://play.vidyard.com/embed/v4.js">
@@ -12,20 +13,14 @@ and a fullscreen view.
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/BgbLpBo3qvPZvtXrwZoNuD.jpg"
-data-uuid="BgbLpBo3qvPZvtXrwZoNuD"
+src="https://play.vidyard.com/KbZQP6Y7msjevAm1JGbKeG.jpg"
+data-uuid="KbZQP6Y7msjevAm1JGbKeG"
 data-v="4"
 data-type="inline"
 />
 </br>
 ++++
 
-To use the *Document Explorer* instead of the classic document table:
-
-. Open *Discover*.
-. In the toolbar, click *Options*, and then click *Try Document Explorer*.
-. Turn off the classic view and save the changes.
-
 [float]
 [[document-explorer-columns]]
 === Reorder and resize columns
@@ -51,7 +46,7 @@ adjust the height to fit the contents, click the row height icon
 image:images/row-height-icon.png[icon to open the Row height pop-up].
 
 [role="screenshot"]
-image::images/document-explorer-row-height.png[Row height settings for Document Explroer, width="75%"]
+image::images/document-explorer-row-height.png[Row height settings for the document table, width="75%"]
 
 
 [float]
@@ -61,33 +56,41 @@ image::images/document-explorer-row-height.png[Row height settings for Document
 Sort your data by one or more fields, in ascending or descending order.
 The default sort is based on the time field, from new to old.
 
-. In the *Document Explorer*, click and open the *field sorted* options.
+To add or remove a sort on a single field, click the
+column header, and then select the sort order.
+
+To sort by multiple fields:
+
+. In the document table, click the *field sorted* option.
 +
 [role="screenshot"]
-image::images/document-explorer-sort-data.png[Pop-up in Document Explorer for sorting columns, width="75%"]
+image::images/document-explorer-sort-data.png[Pop-up in document table for sorting columns, width="75%"]
 
 . To add more fields to the sort, select from the dropdown menu.
 +
 By default, columns are sorted in the order they are added.
-For example, to sort by `order_date` then `geo.country_iso_code`, make sure `order_date` appears first.
 +
 [role="screenshot"]
-image::images/document-explorer-multi-field.png[Multi field sort in Document Explorer, width="75%"]
+image::images/document-explorer-multi-field.png[Multi field sort in the document table, width="75%"]
 
 . To change the sort order, select a field in the pop-up, and then drag it to the new location.
++
+For example, to sort by `geo.country_iso_code` then `order_date`, make sure `geo.country_iso_code` appears first.
+
 
 [float]
 [[document-explorer-compare-data]]
 === Compare data
 
-Narrow your results to a subset documents.
+Narrow your results to a subset of documents to easily
+compare the data of interest.
 
 . Select the documents you want to compare.
 
-. Click and open the *documents selected* options, and then select *Show selected documents only*.
+. Click the *documents selected* option, and then select *Show selected documents only*.
 +
 [role="screenshot"]
-image::images/document-explorer-compare-data.png[Multi field sort in Document Explorer, width="75%"]
+image::images/document-explorer-compare-data.png[Compare data in the document table, width="75%"]
 
 [float]
 [[document-explorer-expand-documents]]
@@ -99,26 +102,56 @@ the documents that occurred before and after it.
 . Click the expand icon
 image:images/expand-icon-2.png[double arrow icon to open a flyout with the document details].
 +
+You can view the document in two ways. The **Table** view displays the document fields row-by-row.
+The **JSON** (JavaScript Object Notation) view allows you to look at how {es} returns the document.
++
 [role="screenshot"]
-image::images/document-explorer-expand.png[Expanded view in Document Explorer]
-
-. Scan through the fields and their values, or search for a field by name.
+image::images/document-explorer-expand.png[Expanded view of the document table]
++
+. In the *Table* view, scan through the fields and their values, or search for a field by name.
 
 . When you find a field of interest,
 click
 image:images/actions-icon.png[three dots icon in table column] in the *Actions* column
 to:
-.. Filter the view of the data
-.. Toggle the field in or out the document table
-.. Pin the field so it stays at the top
+.. Filter the results to include or exclude specific fields or values.
+.. Toggle the field in or out the document table.
+.. Pin the field so it stays at the top.
+
+. To navigate to the next and previous documents, click the < and > arrows at the top of the view.
+
+. To create a view of the document that you can bookmark and share, click **Single document**.
++
+[role="screenshot"]
+image::images/discover-view-single-document.png[Discover single document view]
++
+The link is valid for the time the document is available in Elasticsearch. To create a customized view of the document,
+you can create <<external-plugin-development, your own plugin>>.
 
-. For direct access to a particular document, click <<discover-view-single-document,**Single document**>>.
+. To view documents that occurred before or after the event you are looking at, click **Surrounding documents**.
++
+Documents are displayed using the same set of columns as the *Discover* view from which
+the context was opened. The filters you applied are also carried over. Pinned
+filters remain active, while other filters are copied in a disabled state.
++
+[role="screenshot"]
+image::images/discover-context.png[Image showing context view feature, with anchor documents highlighted in blue]
 
-. To view documents that occurred before or after the event you are looking at, click <<discover-view-surrounding-documents,**Surrounding documents**>>.
 
 [float]
 [[document-explorer-full-screen]]
 === View documents in fullscreen
 
 To view as much data as possible and eliminate distractions, click the fullscreen icon
-image:images/fullscreen-icon.png[icon to display the Document Explorer in fullscreen mode].
+image:images/fullscreen-icon.png[icon to display the document table in fullscreen mode]
+in the document table.
+
+[float]
+[[document-explorer-configure-table]]
+=== Configure the number of documents displayed
+
+By default, the document table displays 100 rows per page. To change this number,
+click *Rows per page*.
+
+[role="screenshot"]
+image::images/document-table-rows-per-page.png["Menu with options for setting the number of rows in the document table", width=50%]
diff --git a/docs/discover/field-statistics.asciidoc b/docs/discover/field-statistics.asciidoc
index 750b25c714aa3..52f78f3376cda 100644
--- a/docs/discover/field-statistics.asciidoc
+++ b/docs/discover/field-statistics.asciidoc
@@ -1,5 +1,5 @@
 [[show-field-statistics]]
-== Explore the fields in your data
+== View field statistics
 
 beta::[]
 
@@ -50,7 +50,7 @@ image::images/field-statistics-geo.png["Field statistics for a geo field."]
 . Explore additional field types to see the statistics that *Discover* provides.
 
 . To create a visualization of the field data, click
-image:images/chart-icon.png[Click the magnifying glass icon to create a visualization of the data in Lens]
+image:images/visualization-icon.png[Click the magnifying glass icon to create a visualization of the data in Lens]
 or
 image:images/map-icon.png[Click the Maps icon to explore the data in a map]
 in the *Actions* column.
diff --git a/docs/discover/images/add-field-to-data-view.png b/docs/discover/images/add-field-to-data-view.png
index e4352e814fa0b..4d17b9dd833e0 100644
Binary files a/docs/discover/images/add-field-to-data-view.png and b/docs/discover/images/add-field-to-data-view.png differ
diff --git a/docs/discover/images/chart-icon.png b/docs/discover/images/chart-icon.png
index db7f70319a66d..7d8c5da4621ce 100644
Binary files a/docs/discover/images/chart-icon.png and b/docs/discover/images/chart-icon.png differ
diff --git a/docs/discover/images/customer.png b/docs/discover/images/customer.png
index 55a04bf754d4e..5e2015499d8ef 100644
Binary files a/docs/discover/images/customer.png and b/docs/discover/images/customer.png differ
diff --git a/docs/discover/images/discover-context.png b/docs/discover/images/discover-context.png
index 770c5fb921a5d..dd8a29ba29336 100644
Binary files a/docs/discover/images/discover-context.png and b/docs/discover/images/discover-context.png differ
diff --git a/docs/discover/images/discover-from-visualize.png b/docs/discover/images/discover-from-visualize.png
index 1aa3e9b502d40..74307bcd46a2c 100644
Binary files a/docs/discover/images/discover-from-visualize.png and b/docs/discover/images/discover-from-visualize.png differ
diff --git a/docs/discover/images/discover-search-for-relevance.png b/docs/discover/images/discover-search-for-relevance.png
index 81b8c323e4d49..d9d5834c9e382 100644
Binary files a/docs/discover/images/discover-search-for-relevance.png and b/docs/discover/images/discover-search-for-relevance.png differ
diff --git a/docs/discover/images/discover-view-single-document.png b/docs/discover/images/discover-view-single-document.png
index 18ff5f67eb5d8..5c040087b3a3f 100644
Binary files a/docs/discover/images/discover-view-single-document.png and b/docs/discover/images/discover-view-single-document.png differ
diff --git a/docs/discover/images/discover.png b/docs/discover/images/discover.png
index 83a91e03b033d..6b60f74154a1b 100644
Binary files a/docs/discover/images/discover.png and b/docs/discover/images/discover.png differ
diff --git a/docs/discover/images/document-explorer-compare-data.png b/docs/discover/images/document-explorer-compare-data.png
index 0aeb5635d47e9..1164fb0d1fdba 100644
Binary files a/docs/discover/images/document-explorer-compare-data.png and b/docs/discover/images/document-explorer-compare-data.png differ
diff --git a/docs/discover/images/document-explorer-expand.png b/docs/discover/images/document-explorer-expand.png
index a1b989a0f5ae8..7404e758bf902 100644
Binary files a/docs/discover/images/document-explorer-expand.png and b/docs/discover/images/document-explorer-expand.png differ
diff --git a/docs/discover/images/document-explorer-multi-field.png b/docs/discover/images/document-explorer-multi-field.png
index b8b1865e14927..2b4abb7416a81 100644
Binary files a/docs/discover/images/document-explorer-multi-field.png and b/docs/discover/images/document-explorer-multi-field.png differ
diff --git a/docs/discover/images/document-explorer-sort-data.png b/docs/discover/images/document-explorer-sort-data.png
index 6665f0af52d3e..389c94ba27b46 100644
Binary files a/docs/discover/images/document-explorer-sort-data.png and b/docs/discover/images/document-explorer-sort-data.png differ
diff --git a/docs/discover/images/document-table-expanded.png b/docs/discover/images/document-table-expanded.png
index 9f0a05f74df75..10e8b269efe66 100644
Binary files a/docs/discover/images/document-table-expanded.png and b/docs/discover/images/document-table-expanded.png differ
diff --git a/docs/discover/images/document-table-rows-per-page.png b/docs/discover/images/document-table-rows-per-page.png
new file mode 100644
index 0000000000000..21643903e4021
Binary files /dev/null and b/docs/discover/images/document-table-rows-per-page.png differ
diff --git a/docs/discover/images/document-table.png b/docs/discover/images/document-table.png
index 1fc8a19d54cb7..0df7ad265369c 100644
Binary files a/docs/discover/images/document-table.png and b/docs/discover/images/document-table.png differ
diff --git a/docs/discover/images/field-statistics-geo.png b/docs/discover/images/field-statistics-geo.png
index 14af668af7559..35c727cb1fe76 100644
Binary files a/docs/discover/images/field-statistics-geo.png and b/docs/discover/images/field-statistics-geo.png differ
diff --git a/docs/discover/images/field-statistics-numeric.png b/docs/discover/images/field-statistics-numeric.png
index d81aafb2f2b47..cd587532c9cc4 100644
Binary files a/docs/discover/images/field-statistics-numeric.png and b/docs/discover/images/field-statistics-numeric.png differ
diff --git a/docs/discover/images/field-statistics-view.png b/docs/discover/images/field-statistics-view.png
index 8f51f7c089509..836d0b5173005 100644
Binary files a/docs/discover/images/field-statistics-view.png and b/docs/discover/images/field-statistics-view.png differ
diff --git a/docs/discover/images/hello-field.png b/docs/discover/images/hello-field.png
index bd5999f86dc3e..a8750fac0cb9b 100644
Binary files a/docs/discover/images/hello-field.png and b/docs/discover/images/hello-field.png differ
diff --git a/docs/discover/images/sort-by-relevance.png b/docs/discover/images/sort-by-relevance.png
new file mode 100644
index 0000000000000..893950508e9f1
Binary files /dev/null and b/docs/discover/images/sort-by-relevance.png differ
diff --git a/docs/discover/images/visualization-icon.png b/docs/discover/images/visualization-icon.png
new file mode 100644
index 0000000000000..db7f70319a66d
Binary files /dev/null and b/docs/discover/images/visualization-icon.png differ
diff --git a/docs/discover/search-for-relevance.asciidoc b/docs/discover/search-for-relevance.asciidoc
index cb3728ed38604..d14fb438e2b7e 100644
--- a/docs/discover/search-for-relevance.asciidoc
+++ b/docs/discover/search-for-relevance.asciidoc
@@ -8,7 +8,7 @@ This example shows how to use *Discover* to list
 your documents from most relevant to least relevant. This example uses
 the <<gs-get-data-into-kibana, sample flights data set>>, or you can use your own data.
 
-.  In *Discover*, open the {data-source} dropdown, and select that data you want to work with.
+.  In *Discover*, open the {data-source} dropdown, and select the data that you want to work with.
 +
 For the sample flights data, set the {data-source} to *kibana_sample_data_flights*.
 
@@ -19,15 +19,16 @@ Warsaw OR Venice OR Clear
 ```
 . If you don't see any results, expand the <<set-time-filter,time range>>, for example to *Last 7 days*.
 . From the list of *Available fields*, add `_score` and any other fields you want to the document table.
-. To sort the `_score` column in descending order, hover over its header, and set
-the sort icon to
-image:images/downward-arrow.png[Downward pointing arrow to indicate descending sorting].
 +
-At this point, you're doing a multi-column sort: first by `Time`, and then by `_score`.
-. To turn off sorting for the `Time` field, hover over its header, and set the sort icon to
-image:images/double-arrow.png[Arrow on both ends of the icon indicates sorting is off].
+At this point, you're sorting by the`timestamp` field.
+. To turn off sorting by the `timestamp` field, click the *field sorted* option, and then click *Clear sorting.*
+. To turn on sorting by the `_score` field in descending order, open the dropdown menu and click *_score*, and then select *High-Low*.
++
+[role="screenshot"]
+image::images/sort-by-relevance.png["Field sorting popover", width=75%]
+
 +
 Your table now sorts documents from most to least relevant.
 +
 [role="screenshot"]
-image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant."]
+image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant.", width=75%]
diff --git a/docs/discover/view-document.asciidoc b/docs/discover/view-document.asciidoc
deleted file mode 100644
index c5b59d98dc5fd..0000000000000
--- a/docs/discover/view-document.asciidoc
+++ /dev/null
@@ -1,51 +0,0 @@
-[[discover-view-document]]
-== View a document
-
-Once you've found a document of interest in *Discover*, you have two more ways to
-view it: in a view by itself or in context with surrounding documents.
-
-[float]
-[[discover-view-single-document]]
-=== View a single document
-
-Access a single document so you can bookmark it and share the link.
-
-. In the document table, click the expand icon (>).
-. In the expanded view, click **View single document**.
-+
-You can view the document in two ways. The **Table** view displays the document fields row-by-row.
-The **JSON** (JavaScript Object Notation) view allows you to look at how {es} returns the document.
-+
-[role="screenshot"]
-image::images/discover-view-single-document.png[Discover single document view]
-+
-The link is valid for the time the document is available in Elasticsearch. To create a customized view of the document,
-you can create <<external-plugin-development, your own plugin>>.
-
-[float]
-[[discover-view-surrounding-documents]]
-=== View surrounding documents
-
-To inspect the documents that occurred immediately before and after a document,
-your {data-source} must contain time-based events.
-
-. In the document table, click the expand icon (>).
-. In the expanded view, click **View surrounding documents**.
-+
-Documents are displayed using the same set of columns as the *Discover* view from which
-the context was opened. The filters you applied are also carried over. Pinned
-filters remain active, while normal filters are copied in a disabled state.
-+
-[role="screenshot"]
-image::images/discover-context.png[Image showing context view feature, with anchor documents highlighted in blue]
-
-. To find the documents of interest, add filters.
-
-. To increase the number of documents that surround the anchor document, click *Load*.
-By default, five documents are added with each click.
-+
-[role="screenshot"]
-image::images/discover-context-load-newer-documents.png[Load button and the number of documents to load, width=50%]
-. To configure the number of documents to display and
-the number of documents to load with each button click, go to *Stack Management > Advanced Settings*
-and edit the <<kibana-discover-settings, context settings>>.
diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index a702c7d607e55..dbe0b836e72d1 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -509,6 +509,7 @@ Enables the legacy time axis for charts in Lens, Discover, Visualize and TSVB
 The maximum number of buckets a datasource can return. High numbers can have a negative impact on your browser rendering performance.
 
 [[visualization-visualize-pieChartslibrary]]`visualization:visualize:legacyPieChartsLibrary`::
+**The legacy pie charts are deprecated and will not be supported in a future version.**
 The visualize editor uses new pie charts with improved performance, color palettes, label positioning, and more. Enable this option if you prefer to use the legacy charts library.
 
 [[visualization-visualize-heatmapChartslibrary]]`visualization:visualize:legacyHeatmapChartsLibrary`::
diff --git a/docs/management/connectors/action-types/webhook.asciidoc b/docs/management/connectors/action-types/webhook.asciidoc
index 02c3de139e0d5..4c001920f716c 100644
--- a/docs/management/connectors/action-types/webhook.asciidoc
+++ b/docs/management/connectors/action-types/webhook.asciidoc
@@ -15,7 +15,7 @@ Webhook connectors have the following configuration properties.
 
 Name::      The name of the connector. The name is used to identify a  connector in the management UI connector listing, or in the connector list when configuring an action.
 URL::       The request URL. If you are using the <<action-settings, `xpack.actions.allowedHosts`>> setting, make sure the hostname is added to the allowed hosts.
-Method::    HTTP request method, either `POST`(default) or `PUT`.
+Method::    HTTP request method, either `post`(default) or `put`.
 Headers::   A set of key-value pairs sent as headers with the request
 Require authentication:: If true, a username and password for login type authentication must be provided.
 Username::      Username for HTTP basic authentication.
@@ -38,7 +38,7 @@ Use the <<action-settings, Action configuration settings>> to customize connecto
    actionTypeId: .webhook
    config:
      url: https://test.host
-     method: POST
+     method: post
      headers:
        testheader: testvalue
    secrets:
diff --git a/docs/management/managing-saved-objects.asciidoc b/docs/management/managing-saved-objects.asciidoc
index 3901d178e1461..39d294df43a5a 100644
--- a/docs/management/managing-saved-objects.asciidoc
+++ b/docs/management/managing-saved-objects.asciidoc
@@ -23,7 +23,7 @@ Granting access to Saved Objects Management will authorize users to manage all s
 
 [float]
 [[managing-saved-objects-view]]
-=== View, edit, and delete
+=== View and delete
 
 * To view and edit an object in its associated application, click the object title.
 
@@ -105,26 +105,4 @@ WARNING: The copy operation automatically includes child objects that are relate
 the <<spaces-api-copy-saved-objects, copy saved objects to space API>> instead.
 
 
-[float]
-[[managing-saved-objects-object-definition]]
-=== Advanced editing
-
-Some objects offer an advanced *Edit* page for modifying the object definition.
-To open the page, click the actions icon image:images/actions_icon.png[Actions icon]
-and select *Inspect*.
-You can change the object title, add a description, and modify
-the JSON that defines the object properties.
-
-If you access an object whose index has been deleted, you can:
-
-* Recreate the index so you can continue using the object.
-* Delete the object and recreate it using a different index.
-* Change the index name in the object's `reference` array to point to an existing
-data view. This is useful if the index you were working with has been renamed.
-
-WARNING: Validation is not performed for object properties. Submitting an invalid
-change will render the object unusable. A more failsafe approach is to use
-*Discover* or *Dashboard* to create new objects instead of
-directly editing an existing one.
-
 include::saved-objects/saved-object-ids.asciidoc[]
diff --git a/docs/osquery/advanced-osquery.asciidoc b/docs/osquery/advanced-osquery.asciidoc
new file mode 100644
index 0000000000000..4f03a6d5fe5eb
--- /dev/null
+++ b/docs/osquery/advanced-osquery.asciidoc
@@ -0,0 +1,103 @@
+[[advanced-osquery]]
+== Advanced Osquery
+
+[float]
+[[osquery-map-fields]]
+=== Map result fields to ECS
+
+When you save queries or add queries to a pack, you can optionally map Osquery results or static values to fields in
+the {ecs-ref}/ecs-reference.html[Elastic Common Schema] (ECS).
+This standardizes your Osquery data for use across detections, machine learning,
+and any other areas that rely on ECS-compliant data.
+When the query is run, the results include the original `osquery.<fields>`
+and the mapped ECS fields. For example, if you update a query to map `osquery.name` to `user.name`, the query results include both fields.
+
+. Edit saved queries or queries in a pack to map fields:
+
+* For *Saved queries*: Open the *Saved queries* tab, and then click the edit icon for the query that you want to map.
+
+* For *packs*: Open the *Packs* tab, edit a pack, and then click the edit icon for the query that you want to map.
+
+. In the **ECS mapping** section, select an **ECS field** to map.
+
+. In the **Value** column, use the dropdown on the left to choose what type of value to map to the ECS field:
+
+** **Osquery value**: Select an Osquery field. The fields available are based on the SQL query entered, and only include fields that the query returns. When the query runs, the ECS field is set dynamically to the value of the Osquery field selected.
+
+** **Static value**: Enter a static value. When the query runs, the ECS field is set to the value entered. For example, static fields can be used to apply `tags` or your preferred `event.category` to the query results.
+
+. Map more fields, as needed. To remove any mapped rows, click the delete icon.
+
+. Save your changes.
+
+[NOTE]
+=========================
+
+* Some ECS fields are restricted and cannot be mapped. These are not available in the ECS dropdown.
+
+* Some ECS fields are restricted to a set of allowed values, like {ecs-ref}/ecs-event.html#field-event-category[event.category]. Use the {ecs-ref}/ecs-field-reference.html[ECS Field Reference] for help when mapping fields.
+
+* Osquery date fields have a variety of data types (including integer, text, or bigint). When mapping an Osquery date field to an ECS date field, you might need to use SQL operators in the query to get an {es}-compatible
+{ref}/date.html[date] type.
+=========================
+
+
+[float]
+[[osquery-extended-tables]]
+=== Extended tables for Kubernetes queries
+In addition to the Osquery schema, the Elastic-provided version of Osquery also includes the following tables to support Kubernetes containers. These can be queried with live or scheduled queries.
+
+* `host_users`
+
+* `host_groups`
+
+* `host_processes`
+
+When querying these tables, the expectation is that the `/etc/passwd`, `/etc/group`, and `/proc` are available in the container under `/hostfs` as:
+`/hostfs/etc/passwd`, `/hostfs/etc/group`, and `/hostfs/proc`. For information about the fields available in these tables, see the
+https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields] reference.
+
+[float]
+[[osquery-status]]
+=== Osquery status
+
+A query can have the following status:
+
+[cols="2*<"]
+|===
+| Successful | The query successfully completed.
+| Failed | The query encountered a problem, such as an issue with the query or the agent was disconnected, and might have failed.
+| Not yet responded | The query has not been sent to the agent.
+| Expired | The action request timed out. The agent may be offline.
+|===
+
+NOTE: If an agent is offline, the request status remains **pending** as {kib} retries the request.
+By default, a query request times out after five minutes. The time out applies to the time it takes
+to deliver the action request to an agent to run a query. If the action completes after the timeout period,
+the results are still returned.
+
+
+[float]
+[[osquery-results]]
+=== Osquery results
+When you run live or scheduled queries, the results are automatically
+stored in an {es} index, so that you can search, analyze, and visualize this data in {kib}.
+For a list of the Osquery fields that can be returned in query results,
+refer to https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields].
+Query results can also include ECS fields, if the query has a defined ECS mapping.
+
+Osquery responses include the following information:
+
+* Everything prefaced with `osquery.` is part of the query response. These fields are not mapped to ECS by default.
+
+* Results include some ECS fields by default, such as `host.*` and `agent.*`, which provide information about the host that was queried.
+
+* For live queries, the `action_data.query` is the query that was sent.
+
+* For scheduled queries in a pack, the `action_id` has the format `pack_<pack-name>_<query-ID>`. You can use this information to look up the query that was run.
+
+* By default, all query results are https://osquery.readthedocs.io/en/stable/deployment/logging/#snapshot-logs[snapshot logs]
+that represent a point in time with a set of results, with no
+https://osquery.readthedocs.io/en/stable/deployment/logging/#differential-logs[differentials].
+
+* Osquery data is stored in the `logs-osquery_manager.result-<namespace>` datastream, and the result row data is under the `osquery` property in the document.
diff --git a/docs/osquery/exported-fields-reference.asciidoc b/docs/osquery/exported-fields-reference.asciidoc
new file mode 100644
index 0000000000000..d359c484e4439
--- /dev/null
+++ b/docs/osquery/exported-fields-reference.asciidoc
@@ -0,0 +1,4 @@
+[[exported-fields-osquery]]
+== Exported fields reference
+
+_Content coming soon._
diff --git a/docs/osquery/manage-integration.asciidoc b/docs/osquery/manage-integration.asciidoc
new file mode 100644
index 0000000000000..e35b9ffcc2473
--- /dev/null
+++ b/docs/osquery/manage-integration.asciidoc
@@ -0,0 +1,111 @@
+[[manage-osquery-integration]]
+== Manage the integration
+
+[float]
+=== System requirements
+
+* {fleet-guide}/fleet-overview.html[Fleet] is enabled on your cluster, and
+one or more {fleet-guide}/elastic-agent-installation.html[Elastic Agents] is enrolled.
+* The https://docs.elastic.co/en/integrations/osquery_manager[*Osquery Manager*] integration
+has been added and configured
+for an agent policy through Fleet.
+This integration supports x64 architecture on Windows, MacOS, and Linux platforms,
+and ARM64 architecture on Linux.
+
+[NOTE]
+=========================
+
+* The original {filebeat-ref}/filebeat-module-osquery.html[Filebeat Osquery module]
+and the https://docs.elastic.co/en/integrations/osquery[Osquery]
+integration collect logs from self-managed Osquery deployments.
+The *Osquery Manager* integration manages Osquery deployments
+and supports running and scheduling queries from {kib}.
+
+* *Osquery Manager* cannot be integrated with an Elastic Agent in standalone mode.
+=========================
+
+[float]
+=== Customize Osquery sub-feature privileges
+
+Depending on your https://www.elastic.co/subscriptions[subscription level],
+you can further customize the sub-feature privileges
+for *Osquery Manager*. These include options to grant specific access for running live queries,
+running saved queries, saving queries, and scheduling packs. For example,
+you can create roles for users who can only run live or saved queries, but who cannot save or schedule queries.
+This is useful for teams who need in-depth and detailed control.
+
+[float]
+=== Customize Osquery configuration
+experimental[] By default, all Osquery Manager integrations share the same osquery configuration. However, you can customize how Osquery is configured by editing the Osquery Manager integration for each agent policy
+you want to adjust. The custom configuration is then applied to all agents in the policy.
+This powerful feature allows you to configure
+https://osquery.readthedocs.io/en/stable/deployment/file-integrity-monitoring[File Integrity Monitoring], https://osquery.readthedocs.io/en/stable/deployment/process-auditing[Process auditing],
+and https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-specification[others].
+
+[IMPORTANT]
+=========================
+
+* Take caution when editing this configuration. The changes you make are distributed to all agents in the policy.
+
+* Take caution when editing `packs` using the Advanced *Osquery config* field.
+Any changes you make to `packs` from this field are not reflected in the UI on the Osquery *Packs* page in {kib}, however, these changes are deployed to agents in the policy.
+While this allows you to use advanced Osquery functionality like pack discovery queries, you do lose the ability to manage packs defined this way from the Osquery *Packs* page.
+=========================
+
+. From the {kib} main menu, click *Fleet*, then the *Agent policies* tab.
+
+. Click the name of the agent policy where you want to adjust the Osquery configuration. The configuration changes you make only apply to the policy you select.
+
+. Click the name of the *Osquery Manager* integration, or add the integration first if the agent policy does not yet have it.
+
+. From the *Edit Osquery Manager integration* page, expand the *Advanced* section.
+
+. Edit the *Osquery config* JSON field to apply your preferred Osquery configuration. Note the following:
+
+* The field may already have content if you have scheduled packs for this agent policy. To keep these packs scheduled, do not remove the `packs` section.
+
+* Refer to the https://osquery.readthedocs.io/en/stable/[Osquery documentation] for configuration options.
+
+* Some fields are protected and cannot be set. A warning is displayed with details about which fields should be removed.
+
+* (Optional) To load a full configuration file, drag and drop an Osquery `.conf` file into the area at the bottom of the page.
+
+. Click *Save integration* to apply the custom configuration to all agents in the policy.
++
+As an example, the following configuration disables two tables.
++
+```ts
+{
+   "options":{
+      "disable_tables":"curl,process_envs"
+   }
+}
+```
+
+[float]
+=== Upgrade Osquery versions
+
+The https://github.com/osquery/osquery/releases[Osquery version] available on an Elastic Agent
+is associated to the version of Osquery Beat on the Agent.
+To get the latest version of Osquery Beat,
+https://www.elastic.co/guide/en/fleet/master/upgrade-elastic-agent.html[upgrade your Elastic Agent].
+
+[float]
+=== Debug issues
+If you encounter issues with *Osquery Manager*, find the relevant logs for {elastic-agent}
+and Osquerybeat in the agent directory. Refer to the {fleet-guide}/installation-layout.html[Fleet Installation layout] to find the log file location for your OS.
+
+```ts
+../data/elastic-agent-*/logs/elastic-agent-json.log-*
+../data/elastic-agent-*/logs/default/osquerybeat-json.log
+```
+
+To get more details in the logs, change the agent logging level to debug:
+
+. Open the main menu, and then select **Fleet**.
+
+. Select the agent that you want to debug.
+
+. On the **Logs** tab, change the **Agent logging level** to **debug**, and then click **Apply changes**.
++
+`agent.logging.level` is updated in `fleet.yml`, and the logging level is changed to `debug`.
diff --git a/docs/osquery/osquery.asciidoc b/docs/osquery/osquery.asciidoc
index e745835c87999..ab8058027934e 100644
--- a/docs/osquery/osquery.asciidoc
+++ b/docs/osquery/osquery.asciidoc
@@ -1,13 +1,13 @@
-[chapter]
-[role="xpack"]
 [[osquery]]
 = Osquery
 
+[partintro]
+--
 https://osquery.io[Osquery] is an open source tool that lets you query operating systems like a database, providing you with visibility into your infrastructure and operating systems.
-Using basic SQL commands, you can ask questions about devices, such as servers, 
+Using basic SQL commands, you can ask questions about devices, such as servers,
 Docker containers, and computers running Linux, macOS, or Windows.
 The https://osquery.io/schema[extensive schema] helps with a variety of use cases,
-including vulnerability detection, compliance monitoring, incident investigations, and more.  
+including vulnerability detection, compliance monitoring, incident investigations, and more.
 
 With Osquery in {kib}, you can:
 
@@ -56,11 +56,11 @@ image::images/enter-query.png[Select saved query dropdown name showing query nam
 or to the drag-and-drop *Lens* editor to create visualizations.
 . To view more information about the request, such as failures, open the *Status* tab.
 . To save the query for future use, click *Save for later* and define the ID,
-description, and other <<osquery-manage-query,details>>. 
+description, and other <<osquery-manage-query,details>>.
 
 [float]
 [[osquery-view-history]]
-===  View or rerun previous live queries
+== View or rerun previous live queries
 
 From the *Live queries history* section on the *Live queries* tab:
 
@@ -77,8 +77,8 @@ image::images/live-query-check-results.png[Results of OSquery]
 == Schedule queries with packs
 
 Create packs to organize sets of queries. For example, you might create one pack that checks
-for IT compliance-type issues, and another pack that monitors for evidence of malware. 
-You can schedule packs to run for one or more agent policies. When scheduled, queries in the pack are run at the set intervals for all agents in those policies. Scheduling packs is optional. 
+for IT compliance-type issues, and another pack that monitors for evidence of malware.
+You can schedule packs to run for one or more agent policies. When scheduled, queries in the pack are run at the set intervals for all agents in those policies. Scheduling packs is optional.
 
 . Open the **Packs** tab.
 
@@ -95,7 +95,7 @@ You can schedule packs to run for one or more agent policies. When scheduled, qu
 . Add queries to schedule:
 
 * To add a query to the pack, click *Add query*, and then either add a saved query or enter a new query.
-Each query must include a unique query ID and the interval at which it should run. 
+Each query must include a unique query ID and the interval at which it should run.
 Optionally, set the minimum Osquery version and platform,
 or <<osquery-map-fields,map ECS fields>>. When you add a saved query to a pack, this adds a copy of the query. A connection is not maintained between saved queries and packs.
 
@@ -105,7 +105,7 @@ or <<osquery-map-fields,map ECS fields>>. When you add a saved query to a pack,
 
 [float]
 [[osquery-schedule-status]]
-=== View status of scheduled packs
+== View status of scheduled packs
 
 . Open the **Packs** tab.
 
@@ -151,222 +151,16 @@ To add or edit saved queries from the *Saved queries* tab:
 
 ** The operating system required to run the query. For information about supported platforms per table, refer to the https://osquery.io/schema[Osquery schema].
 
-. Click *Test configuration* to test the query and any mapped fields: 
+. Click *Test configuration* to test the query and any mapped fields:
 
 * From the *Test query* panel, select agents or groups to test the query, then click *Submit* to run a live query. Result columns with the image:images/mapped-icon.png[mapping] icon are mapped. Hover over the icon to see the mapped ECS field.
 
-. Click *Save* or *Update*. 
+. Click *Save* or *Update*.
 
-[float]
-[[osquery-map-fields]]
-== Map result fields to ECS
-
-When you save queries or add queries to a pack, you can optionally map Osquery results or static values to fields in
-the {ecs-ref}/ecs-reference.html[Elastic Common Schema] (ECS).
-This standardizes your Osquery data for use across detections, machine learning,
-and any other areas that rely on ECS-compliant data.
-When the query is run, the results include the original `osquery.<fields>`
-and the mapped ECS fields. For example, if you update a query to map `osquery.name` to `user.name`, the query results include both fields. 
-
-. Edit saved queries or queries in a pack to map fields:
-
-* For *Saved queries*: Open the *Saved queries* tab, and then click the edit icon for the query that you want to map.
-
-* For *packs*: Open the *Packs* tab, edit a pack, and then click the edit icon for the query that you want to map.
-
-. In the **ECS mapping** section, select an **ECS field** to map. 
-
-. In the **Value** column, use the dropdown on the left to choose what type of value to map to the ECS field: 
-
-** **Osquery value**: Select an Osquery field. The fields available are based on the SQL query entered, and only include fields that the query returns. When the query runs, the ECS field is set dynamically to the value of the Osquery field selected.
-
-** **Static value**: Enter a static value. When the query runs, the ECS field is set to the value entered. For example, static fields can be used to apply `tags` or your preferred `event.category` to the query results. 
-
-. Map more fields, as needed. To remove any mapped rows, click the delete icon.
-
-. Save your changes.
-
-[NOTE]
-=========================
-
-* Some ECS fields are restricted and cannot be mapped. These are not available in the ECS dropdown.
-
-* Some ECS fields are restricted to a set of allowed values, like {ecs-ref}/ecs-event.html#field-event-category[event.category]. Use the {ecs-ref}/ecs-field-reference.html[ECS Field Reference] for help when mapping fields. 
-
-* Osquery date fields have a variety of data types (including integer, text, or bigint). When mapping an Osquery date field to an ECS date field, you might need to use SQL operators in the query to get an {es}-compatible 
-{ref}/date.html[date] type. 
-=========================
-
-
-[float]
-[[osquery-extended-tables]]
-== Extended tables for Kubernetes queries
-In addition to the Osquery schema, the Elastic-provided version of Osquery also includes the following tables to support Kubernetes containers. These can be queried with live or scheduled queries.
-
-* `host_users`
+--
 
-* `host_groups`
+include::advanced-osquery.asciidoc[]
 
-* `host_processes`
-
-When querying these tables, the expectation is that the `/etc/passwd`, `/etc/group`, and `/proc` are available in the container under `/hostfs` as:
-`/hostfs/etc/passwd`, `/hostfs/etc/group`, and `/hostfs/proc`. For information about the fields available in these tables, see the
-https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields] reference. 
-
-[float]
-[[osquery-status]]
-== Osquery status
-
-A query can have the following status:
-
-[cols="2*<"]
-|===
-| Successful | The query successfully completed.
-| Failed | The query encountered a problem, such as an issue with the query or the agent was disconnected, and might have failed.
-| Not yet responded | The query has not been sent to the agent.
-| Expired | The action request timed out. The agent may be offline.
-|===
-
-NOTE: If an agent is offline, the request status remains **pending** as {kib} retries the request.
-By default, a query request times out after five minutes. The time out applies to the time it takes
-to deliver the action request to an agent to run a query. If the action completes after the timeout period,
-the results are still returned.
-
-
-[float]
-[[osquery-results]]
-== Osquery results
-When you run live or scheduled queries, the results are automatically 
-stored in an {es} index, so that you can search, analyze, and visualize this data in {kib}.
-For a list of the Osquery fields that can be returned in query results,
-refer to https://docs.elastic.co/en/integrations/osquery_manager#exported-fields[exported fields].
-Query results can also include ECS fields, if the query has a defined ECS mapping.
-
-Osquery responses include the following information:
-
-* Everything prefaced with `osquery.` is part of the query response. These fields are not mapped to ECS by default.
-
-* Results include some ECS fields by default, such as `host.*` and `agent.*`, which provide information about the host that was queried.
-
-* For live queries, the `action_data.query` is the query that was sent.
-
-* For scheduled queries in a pack, the `action_id` has the format `pack_<pack-name>_<query-ID>`. You can use this information to look up the query that was run.
-
-* By default, all query results are https://osquery.readthedocs.io/en/stable/deployment/logging/#snapshot-logs[snapshot logs]
-that represent a point in time with a set of results, with no 
-https://osquery.readthedocs.io/en/stable/deployment/logging/#differential-logs[differentials].
-
-* Osquery data is stored in the `logs-osquery_manager.result-<namespace>` datastream, and the result row data is under the `osquery` property in the document. 
-
-[float]
-[[manage-osquery-integration]]
-== Manage the integration
+include::manage-integration.asciidoc[]
 
-[float]
-=== System requirements
-
-* {fleet-guide}/fleet-overview.html[Fleet] is enabled on your cluster, and
-one or more {fleet-guide}/elastic-agent-installation.html[Elastic Agents] is enrolled.
-* The https://docs.elastic.co/en/integrations/osquery_manager[*Osquery Manager*] integration
-has been added and configured
-for an agent policy through Fleet.
-This integration supports x64 architecture on Windows, MacOS, and Linux platforms, 
-and ARM64 architecture on Linux.
-
-[NOTE]
-=========================
-
-* The original {filebeat-ref}/filebeat-module-osquery.html[Filebeat Osquery module]
-and the https://docs.elastic.co/en/integrations/osquery[Osquery]
-integration collect logs from self-managed Osquery deployments.
-The *Osquery Manager* integration manages Osquery deployments
-and supports running and scheduling queries from {kib}.
-
-* *Osquery Manager* cannot be integrated with an Elastic Agent in standalone mode.
-=========================
-
-[float]
-=== Customize Osquery sub-feature privileges
-
-Depending on your https://www.elastic.co/subscriptions[subscription level],
-you can further customize the sub-feature privileges
-for *Osquery Manager*. These include options to grant specific access for running live queries,
-running saved queries, saving queries, and scheduling packs. For example,
-you can create roles for users who can only run live or saved queries, but who cannot save or schedule queries.
-This is useful for teams who need in-depth and detailed control.
-
-[float]
-=== Customize Osquery configuration
-experimental[] By default, all Osquery Manager integrations share the same osquery configuration. However, you can customize how Osquery is configured by editing the Osquery Manager integration for each agent policy
-you want to adjust. The custom configuration is then applied to all agents in the policy. 
-This powerful feature allows you to configure
-https://osquery.readthedocs.io/en/stable/deployment/file-integrity-monitoring[File Integrity Monitoring], https://osquery.readthedocs.io/en/stable/deployment/process-auditing[Process auditing], 
-and https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-specification[others].
-
-[IMPORTANT]
-=========================
-
-* Take caution when editing this configuration. The changes you make are distributed to all agents in the policy.
-
-* Take caution when editing `packs` using the Advanced *Osquery config* field. 
-Any changes you make to `packs` from this field are not reflected in the UI on the Osquery *Packs* page in {kib}, however, these changes are deployed to agents in the policy. 
-While this allows you to use advanced Osquery functionality like pack discovery queries, you do lose the ability to manage packs defined this way from the Osquery *Packs* page.
-=========================
-
-. From the {kib} main menu, click *Fleet*, then the *Agent policies* tab.
-
-. Click the name of the agent policy where you want to adjust the Osquery configuration. The configuration changes you make only apply to the policy you select.
-
-. Click the name of the *Osquery Manager* integration, or add the integration first if the agent policy does not yet have it.
-
-. From the *Edit Osquery Manager integration* page, expand the *Advanced* section.
-
-. Edit the *Osquery config* JSON field to apply your preferred Osquery configuration. Note the following:
-
-* The field may already have content if you have scheduled packs for this agent policy. To keep these packs scheduled, do not remove the `packs` section.
-
-* Refer to the https://osquery.readthedocs.io/en/stable/[Osquery documentation] for configuration options. 
-
-* Some fields are protected and cannot be set. A warning is displayed with details about which fields should be removed.
-
-* (Optional) To load a full configuration file, drag and drop an Osquery `.conf` file into the area at the bottom of the page.
-
-. Click *Save integration* to apply the custom configuration to all agents in the policy.
-+
-As an example, the following configuration disables two tables.
-+
-```ts
-{
-   "options":{
-      "disable_tables":"curl,process_envs"
-   }
-}
-```
-
-[float]
-=== Upgrade Osquery versions
-
-The https://github.com/osquery/osquery/releases[Osquery version] available on an Elastic Agent
-is associated to the version of Osquery Beat on the Agent.
-To get the latest version of Osquery Beat,
-https://www.elastic.co/guide/en/fleet/master/upgrade-elastic-agent.html[upgrade your Elastic Agent].
-
-[float]
-=== Debug issues
-If you encounter issues with *Osquery Manager*, find the relevant logs for {elastic-agent}
-and Osquerybeat in the agent directory. Refer to the {fleet-guide}/installation-layout.html[Fleet Installation layout] to find the log file location for your OS.
-
-```ts
-../data/elastic-agent-*/logs/elastic-agent-json.log-*
-../data/elastic-agent-*/logs/default/osquerybeat-json.log
-```
-
-To get more details in the logs, change the agent logging level to debug:
-
-. Open the main menu, and then select **Fleet**.
-
-. Select the agent that you want to debug.
-
-. On the **Logs** tab, change the **Agent logging level** to **debug**, and then click **Apply changes**.
-+
-`agent.logging.level` is updated in `fleet.yml`, and the logging level is changed to `debug`.
+include::exported-fields-reference.asciidoc[]
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index 2c9d48813781a..9a96eec55db32 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -329,7 +329,7 @@ This content has moved. Refer to <<kuery-query>>.
 [role="exclude",id="discover-document-context"]
 == View surrounding documents
 
-This content has moved. Refer to <<discover-view-surrounding-documents>>.
+This content has moved. Refer to <<document-explorer>>.
 
 [role="exclude",id="field-formatters-string"]
 == String field formatters
@@ -405,3 +405,8 @@ This content has moved. Refer to {kibana-ref-all}/7.17/upgrade-assistant.html[Up
 == Install {kib} on macOS with Homebrew
 
 This page has been deleted. Refer to <<install>>.
+
+[role="exclude",id="discover-view-document"]
+== View a document
+
+This page has been deleted. Refer to <<document-explorer>>.
diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
index 51fa0b71f9601..3d15c3cc5e368 100644
--- a/docs/settings/alert-action-settings.asciidoc
+++ b/docs/settings/alert-action-settings.asciidoc
@@ -198,24 +198,26 @@ For example, `20m`, `24h`, `7d`. Default: `1m`.
 `xpack.alerting.rules.minimumScheduleInterval.enforce`::
 Specifies the behavior when a new or changed rule has a schedule interval less than the value defined in `xpack.alerting.rules.minimumScheduleInterval.value`. If `false`, rules with schedules less than the interval will be created but warnings will be logged. If `true`, rules with schedules less than the interval cannot be created. Default: `false`.
 
-`xpack.alerting.rules.execution.actions.max`::
+`xpack.alerting.rules.run.actions.max`::
 Specifies the maximum number of actions that a rule can trigger each time detection checks run.
 
-`xpack.alerting.rules.execution.timeout`::
+`xpack.alerting.rules.run.timeout`::
 Specifies the default timeout for tasks associated with all types of rules. The time is formatted as:
 +
 `<count>[ms,s,m,h,d,w,M,Y]`
 +
 For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
 
-`xpack.alerting.rules.execution.ruleTypeOverrides`::
-Overrides the configs under `xpack.alerting.rules.execution` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
+`xpack.alerting.rules.run.ruleTypeOverrides`::
+Overrides the configs under `xpack.alerting.rules.run` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
 +
+--
 For example:
 ```
-xpack.alerting.rules.execution:
+xpack.alerting.rules.run:
     timeout: '5m'
     ruleTypeOverrides:
         - id: '.index-threshold'
           timeout: '15m'
-```
\ No newline at end of file
+```
+--
\ No newline at end of file
diff --git a/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc b/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
index 4bd06284d8d6c..7ab34dacacd98 100644
--- a/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
+++ b/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
@@ -85,7 +85,7 @@ and in the <<rule-details,details page>>:
 [role="screenshot"]
 image::images/rule-details-timeout-error.png[Rule details page with timeout error]
 
-If you want your rules to run longer, update the `xpack.alerting.rules.execution.timeout` configuration in your <<alert-settings>>. You can also target a specific rule type by using `xpack.alerting.rules.execution.ruleTypeOverrides`.
+If you want your rules to run longer, update the `xpack.alerting.rules.run.timeout` configuration in your <<alert-settings>>. You can also target a specific rule type by using `xpack.alerting.rules.run.ruleTypeOverrides`.
 
 Rules that consistently run longer than their <<create-edit-rules, check interval>> may produce unexpected results. If the average run duration, visible on the <<rule-details,details page>>, is greater than the check interval, consider increasing the check interval.
 
diff --git a/docs/user/dashboard/lens.asciidoc b/docs/user/dashboard/lens.asciidoc
index 513671dd51238..b062dcc3349ad 100644
--- a/docs/user/dashboard/lens.asciidoc
+++ b/docs/user/dashboard/lens.asciidoc
@@ -186,6 +186,8 @@ For a time shift example, refer to <<compare-time-ranges>>.
 [[add-annotations]]
 ==== Add annotations
 
+preview::[]
+
 Annotations allow you to call out specific points in your visualizations that are important, such as a major change in the data. You can add text and icons to annotations and customize the appearance, such as the line format and color. 
 
 [role="screenshot"]
diff --git a/docs/user/dashboard/make-dashboards-interactive.asciidoc b/docs/user/dashboard/make-dashboards-interactive.asciidoc
index 2cb750afbe7d5..06c6675bedba3 100644
--- a/docs/user/dashboard/make-dashboards-interactive.asciidoc
+++ b/docs/user/dashboard/make-dashboards-interactive.asciidoc
@@ -196,7 +196,7 @@ image::images/drilldown_on_panel.png[Drilldown on data table that navigates to a
 [[url-drilldowns]]
 ==== Create URL drilldowns
 
-URL drilldowns enable you to navigate from a dashboard to external websites. Destination URLs can be dynamic, depending on the dashboard context or user interaction with a panel. To create URL drilldowns, you add <<variables,variables>> to a URL template, which configures the behavior of the drilldown.
+URL drilldowns enable you to navigate from a dashboard to external websites. Destination URLs can be dynamic, depending on the dashboard context or user interaction with a panel. To create URL drilldowns, you add <<variables,variables>> to a URL template, which configures the behavior of the drilldown. All panels that you create with the visualization editors support dashboard drilldowns.
 
 [role="screenshot"]
 image:images/url_drilldown_go_to_github.gif[Drilldown on pie chart that navigates to Github]
@@ -210,13 +210,6 @@ The <<url-template-variables,variables>> you use to create a <<url_templating-la
 
 For example, *Single click* has `{{event.value}}` and *Range selection* has `{{event.from}}` and `{{event.to}}`.
 
-The panels you create using the following editors support dashboard drilldowns:
-
-* *Lens*
-* *Maps*
-* *TSVB*
-* *Aggregation-based* area chart, data table, heat map, horitizontal bar chart, line chart, pie chart, tag cloud, and vertical bar chart
-
 [float]
 ===== Create a URL drilldown
 
diff --git a/docs/user/discover.asciidoc b/docs/user/discover.asciidoc
index 3d08bceaccc7b..257cd9c856dab 100644
--- a/docs/user/discover.asciidoc
+++ b/docs/user/discover.asciidoc
@@ -54,13 +54,15 @@ Tell {kib} where to find the data you want to explore, and then specify the time
 +
 {kib} uses a <<data-views,{data-source}>> to tell it where to find
 your {es} data.
-To view the ecommerce sample data, make sure the {data-source} is set to **kibana_sample_data_ecommerce**.
+To view the ecommerce sample data, select **kibana_sample_data_ecommerce**
+from the {data-source} dropdown.
 +
 [role="screenshot"]
 image::images/discover-data-view.png[How to set the {data-source} in Discover, width=50%]
 +
 To create a data view for your own data,
-click the ellipsis icon (…​), and then click *Create new data view*.
+click
+image:images/actions-icon.png[three dots icon next to data view dropdown], and then click *Create new data view*.
 For details, refer to <<data-views, Create a data view.>>
 
 . Adjust the <<set-time-filter,time range>> to view data for the *Last 7 days*.
@@ -76,9 +78,10 @@ click and drag the mouse over the chart.
 [[explore-fields-in-your-data]]
 === Explore the fields in your data
 
-**Discover** includes a table that shows all the documents that match your search.
-By default, the table includes columns for the time field and the document `_source`.
-You’ll modify this table to display your fields of interest.
+**Discover** includes a table
+that shows all the documents that match your search.
+By default, the document table includes a column for the time field and a column that lists all other fields in the document.
+You’ll modify the document table to display your fields of interest.
 
 . Scan through the list of **Available fields** until you find the `manufacturer` field.
 You can also search for the field by name.
@@ -94,15 +97,18 @@ image:images/find-manufacturer-field.png[Fields list that displays the top five
 . Click image:images/add-icon.png[Add icon] to toggle the field into the document table.
 
 . Find the `customer_first_name` and `customer_last_name` fields and add
-them to your document table. Your table should look similar to this:
+them to the document table. Your table should look similar to this:
 +
 [role="screenshot"]
 image:images/document-table.png[Document table with fields for manufacturer, customer_first_name, and customer_last_name]
 
-. To rearrange the table columns, hover the mouse over a
-column header, and then use the move control.
+. To rearrange the table columns, click a
+column header, and then select *Move left* or *Move right*.
 
-. To view more of the document table, click *Chart options > Hide chart*.
+. To view more of the document table, click
+image:images/chart-icon.png[icon button for opening Show/Hide chart menu, width=24px]
+to open the *Chart options* menu,
+and then select *Hide chart*.
 
 [float]
 [[add-field-in-discover]]
@@ -114,7 +120,8 @@ You can add a runtime field to your {data-source} from inside of **Discover**,
 and then use that field for analysis and visualizations,
 the same way you do with other fields.
 
-. Click the ellipsis icon (...), and then click *Add field*.
+. Click
+image:images/actions-icon.png[three dots icon next to data view dropdown], and then click *Add field*.
 +
 [role="screenshot"]
 image:images/add-field-to-data-view.png[Dropdown menu located next to {data-source} field with item for adding a field to a {data-source}, width=50%]
@@ -131,10 +138,10 @@ emit("Hello World!");
 
 . Click *Save*.
 
-. In the fields list, search for the *hello* field, and then add it to the table to view it's value.
+. In the fields list, search for the *hello* field, and then add it to the document table to view it's value.
 +
 [role="screenshot"]
-image:images/hello-field.png[hello field in the document table]
+image:images/hello-field.png[hello field in the document tables]
 
 . Create a second field named `customer` that combines customer last name and first initial.
 +
@@ -143,7 +150,7 @@ String str = doc['customer_first_name.keyword'].value;
 char ch1 = str.charAt(0);
 emit(doc['customer_last_name.keyword'].value + ", " + ch1);
 ```
-. Simplify the the document table by removing `customer_first_name` and `customer_last_name` and adding `customer` in their place.
+. Remove `customer_first_name` and `customer_last_name` from the document table, and then add `customer`.
 +
 [role="screenshot"]
 image:images/customer.png[Customer last name, first initial in the document table]
@@ -208,29 +215,31 @@ click the close icon (x) next to its name in the filter bar.
 Dive into an individual document to view its fields and the documents
 that occurred before and after it.
 
-. In the document table, expand any document.
+. In the document table, click the expand icon
+image:images/expand-icon-2.png[double arrow icon to open a flyout with the document details]
+to show document details.
 +
 [role="screenshot"]
 image:images/document-table-expanded.png[Table view with document expanded]
 
 . Scan through the fields and their values. If you find a field of interest,
-hover over its name for filters and other controls.
+click
+image:images/actions-icon.png[three dots icon next to data view dropdown] in the *Actions* column for filters and other controls.
 
 . To view documents that occurred before or after the event you are looking at, click
-<<discover-view-surrounding-documents, View surrounding documents>>.
+**Surrounding documents**.
 
-. For direct access to a particular document, click **<<discover-view-single-document,View single document>>**.
-+
-You can bookmark this document and share the link.
+. To create a view of the document that you can bookmark and share, click **Single document**.
 
 
 [float]
 [[save-your-search]]
 === Save your search for later use
 
-Save your search so you can repeat it later, generate a CSV report, or use it in visualizations, dashboards, and Canvas workpads.
+Save your search so you can use it later, generate a CSV report, or use it to create visualizations, dashboards, and Canvas workpads.
 Saving a search saves the query text, filters,
-and current view of *Discover*, including the columns selected in the document table, the sort order, and the {data-source}.
+and current view of *Discover*, including the columns selected in
+the document table, the sort order, and the {data-source}.
 
 . In the toolbar, click **Save**.
 
@@ -281,8 +290,7 @@ Go to **Advanced Settings** to configure the number of documents to show,
 the table columns that display by default, and more.
 
 --
-
-include::{kib-repo-dir}/discover/view-document.asciidoc[]
+include::{kib-repo-dir}/discover/document-explorer.asciidoc[]
 
 include::{kib-repo-dir}/discover/search-for-relevance.asciidoc[]
 
@@ -290,6 +298,4 @@ include::{kib-repo-dir}/discover/save-search.asciidoc[]
 
 include::{kib-repo-dir}/discover/search-sessions.asciidoc[]
 
-include::{kib-repo-dir}/discover/document-explorer.asciidoc[]
-
 include::{kib-repo-dir}/discover/field-statistics.asciidoc[]
diff --git a/docs/user/production-considerations/task-manager-health-monitoring.asciidoc b/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
index 6232f20d28972..f975816462962 100644
--- a/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
+++ b/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
@@ -21,7 +21,7 @@ $ curl -X GET api/task_manager/_health
 --------------------------------------------------
 // KIBANA
 
-Monitoring the `_health` endpoint of each {kib} instance in the cluster is the recommended method of ensuring confidence in mission critical services such as Alerting and Actions.
+Monitoring the `_health` endpoint of each {kib} instance in the cluster is the recommended method of ensuring confidence in mission critical services such as Alerting, Actions, and Reporting.
 
 [float]
 [[task-manager-configuring-health-monitoring]]
diff --git a/docs/user/production-considerations/task-manager-production-considerations.asciidoc b/docs/user/production-considerations/task-manager-production-considerations.asciidoc
index 28c5f6e4f14c8..8dd27d4e2d5ee 100644
--- a/docs/user/production-considerations/task-manager-production-considerations.asciidoc
+++ b/docs/user/production-considerations/task-manager-production-considerations.asciidoc
@@ -105,7 +105,7 @@ A recommended strategy is to follow these steps:
 3. If the throughput is insufficient, and {kib} instances exhibit low resource usage, incrementally scale vertically while <<kibana-page,monitoring>> the impact of these changes.
 4. If the throughput is insufficient, and {kib} instances are exhibiting high resource usage, incrementally scale horizontally by provisioning new {kib} instances and reassess.
 
-Task Manager, like the rest of the Elastic Stack, is designed to scale horizontally. Take advantage of this ability to ensure mission critical services, such as Alerting and Reporting, always have the capacity they need.
+Task Manager, like the rest of the Elastic Stack, is designed to scale horizontally. Take advantage of this ability to ensure mission critical services, such as Alerting, Actions, and Reporting, always have the capacity they need.
 
 Scaling horizontally requires a higher degree of coordination between {kib} instances. One way Task Manager coordinates with other instances is by delaying its polling schedule to avoid conflicts with other instances.
 By using <<task-manager-health-monitoring, health monitoring>> to evaluate the <<task-manager-health-evaluate-the-runtime,date of the `last_polling_delay`>> across a deployment, you can estimate the frequency at which Task Manager resets its delay mechanism.
diff --git a/docs/user/production-considerations/task-manager-troubleshooting.asciidoc b/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
index 606dd3c8a24ee..de765ea542ecd 100644
--- a/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
+++ b/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
@@ -6,7 +6,7 @@
 <titleabbrev>Troubleshooting</titleabbrev>
 ++++
 
-Task Manager is used by a wide range of services in {kib}, such as <<alerting-production-considerations, Alerting>>, Reporting, and Telemetry.
+Task Manager is used by a wide range of services in {kib}, such as <<alerting-production-considerations, Alerting>>, Actions, Reporting, and Telemetry.
 Unexpected behavior in these services might be a downstream issue originating in Task Manager.
 
 This page describes how to resolve common problems you might encounter with Task Manager.
diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
index c1e131cc057e0..8e1589f985372 100644
--- a/docs/user/reporting/index.asciidoc
+++ b/docs/user/reporting/index.asciidoc
@@ -27,6 +27,10 @@ You access the options from the *Share* menu in the toolbar. The sharing options
 
 * *Embed code* &mdash; Embed a fully interactive dashboard or visualization as an iframe on a web page.
 
+[[reporting-on-cloud-resource-requirements]]
+NOTE: On Elastic Cloud, Kibana requires a minimum of 2GB RAM to generate PDF or PNG reports. To edit Kibana deployments,
+use {ess-console}[Cloud Management].
+
 [float]
 [[manually-generate-reports]]
 == Create reports
diff --git a/examples/bfetch_explorer/public/components/count_until/index.tsx b/examples/bfetch_explorer/public/components/count_until/index.tsx
index d40475f57971d..ca60c78818bdf 100644
--- a/examples/bfetch_explorer/public/components/count_until/index.tsx
+++ b/examples/bfetch_explorer/public/components/count_until/index.tsx
@@ -10,7 +10,7 @@ import React, { useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import useList from 'react-use/lib/useList';
 import { EuiForm, EuiSpacer, EuiFieldNumber, EuiFormRow, EuiButton } from '@elastic/eui';
-import { BfetchPublicSetup } from '../../../../../src/plugins/bfetch/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
 
 export interface Props {
   fetchStreaming: BfetchPublicSetup['fetchStreaming'];
diff --git a/examples/bfetch_explorer/public/hooks/use_deps.ts b/examples/bfetch_explorer/public/hooks/use_deps.ts
index 7d2ab87529833..a8c4b2ae1ad8f 100644
--- a/examples/bfetch_explorer/public/hooks/use_deps.ts
+++ b/examples/bfetch_explorer/public/hooks/use_deps.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { useKibana } from '../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { BfetchDeps } from '../mount';
 
 export const useDeps = () => useKibana().services as BfetchDeps;
diff --git a/examples/bfetch_explorer/public/mount.tsx b/examples/bfetch_explorer/public/mount.tsx
index 8c15405f2f6be..40d171f2d98a3 100644
--- a/examples/bfetch_explorer/public/mount.tsx
+++ b/examples/bfetch_explorer/public/mount.tsx
@@ -8,8 +8,8 @@
 
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { CoreSetup, CoreStart, AppMountParameters } from 'kibana/public';
-import { KibanaContextProvider } from '../../../src/plugins/kibana_react/public';
+import { CoreSetup, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { BfetchExplorerStartPlugins, ExplorerService } from './plugin';
 import { App } from './containers/app';
 
diff --git a/examples/bfetch_explorer/public/plugin.tsx b/examples/bfetch_explorer/public/plugin.tsx
index fd4687c5fb149..cc97a5a95ce72 100644
--- a/examples/bfetch_explorer/public/plugin.tsx
+++ b/examples/bfetch_explorer/public/plugin.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../src/core/public';
-import { BfetchPublicSetup, BfetchPublicStart } from '../../../src/plugins/bfetch/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { BfetchPublicSetup, BfetchPublicStart } from '@kbn/bfetch-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
 
 export interface ExplorerService {
   double: (number: { num: number }) => Promise<{ num: number }>;
diff --git a/examples/bfetch_explorer/server/plugin.ts b/examples/bfetch_explorer/server/plugin.ts
index 37d8645181dde..6e169b76beed1 100644
--- a/examples/bfetch_explorer/server/plugin.ts
+++ b/examples/bfetch_explorer/server/plugin.ts
@@ -7,8 +7,8 @@
  */
 
 import { Subject } from 'rxjs';
-import { Plugin, CoreSetup, CoreStart } from '../../../src/core/server';
-import { BfetchServerSetup, BfetchServerStart } from '../../../src/plugins/bfetch/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { BfetchServerSetup, BfetchServerStart } from '@kbn/bfetch-plugin/server';
 
 export interface BfetchExplorerSetupPlugins {
   bfetch: BfetchServerSetup;
diff --git a/examples/dashboard_embeddable_examples/public/app.tsx b/examples/dashboard_embeddable_examples/public/app.tsx
index c44d67c49f3d7..69d4668d829d7 100644
--- a/examples/dashboard_embeddable_examples/public/app.tsx
+++ b/examples/dashboard_embeddable_examples/public/app.tsx
@@ -18,10 +18,10 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 import 'brace/mode/json';
-import { AppMountParameters, IUiSettingsClient } from '../../../src/core/public';
+import { AppMountParameters, IUiSettingsClient } from '@kbn/core/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DashboardEmbeddableByValue } from './by_value/embeddable';
-import { DashboardStart } from '../../../src/plugins/dashboard/public';
-import { KibanaContextProvider } from '../../../src/plugins/kibana_react/public';
 
 interface PageDef {
   title: string;
diff --git a/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx b/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
index 76e0827ed3fd6..6107605f25017 100644
--- a/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
+++ b/examples/dashboard_embeddable_examples/public/by_value/embeddable.tsx
@@ -7,12 +7,12 @@
  */
 
 import React, { useState } from 'react';
-import { ViewMode } from '../../../../src/plugins/embeddable/public';
-import { DashboardContainerInput, DashboardStart } from '../../../../src/plugins/dashboard/public';
-import { HELLO_WORLD_EMBEDDABLE } from '../../../embeddable_examples/public/hello_world';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { DashboardContainerInput, DashboardStart } from '@kbn/dashboard-plugin/public';
+import { HELLO_WORLD_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public/hello_world';
+import { TODO_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public/todo';
+import { TODO_REF_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public/todo/todo_ref_embeddable';
 import { InputEditor } from './input_editor';
-import { TODO_EMBEDDABLE } from '../../../embeddable_examples/public/todo';
-import { TODO_REF_EMBEDDABLE } from '../../../embeddable_examples/public/todo/todo_ref_embeddable';
 
 const initialInput: DashboardContainerInput = {
   viewMode: ViewMode.VIEW,
diff --git a/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx b/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
index a723712f395d0..1d205eea0efe1 100644
--- a/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
+++ b/examples/dashboard_embeddable_examples/public/by_value/input_editor.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
-import { CodeEditor } from '../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 export const InputEditor = <T,>(props: { input: T; onSubmit: (value: T) => void }) => {
   const input = JSON.stringify(props.input, null, 4);
diff --git a/examples/dashboard_embeddable_examples/public/plugin.tsx b/examples/dashboard_embeddable_examples/public/plugin.tsx
index 14bd71523ef2f..0c31076df8c6c 100644
--- a/examples/dashboard_embeddable_examples/public/plugin.tsx
+++ b/examples/dashboard_embeddable_examples/public/plugin.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '../../../src/core/public';
-import { DashboardStart } from '../../../src/plugins/dashboard/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { EmbeddableExamplesStart } from '../../embeddable_examples/public/plugin';
+import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '@kbn/core/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { EmbeddableExamplesStart } from '@kbn/embeddable-examples-plugin/public/plugin';
 
 interface SetupDeps {
   developerExamples: DeveloperExamplesSetup;
diff --git a/examples/data_view_field_editor_example/public/app.tsx b/examples/data_view_field_editor_example/public/app.tsx
index cbad86d7e21d4..0a5b98ee41a04 100644
--- a/examples/data_view_field_editor_example/public/app.tsx
+++ b/examples/data_view_field_editor_example/public/app.tsx
@@ -19,10 +19,10 @@ import {
   EuiText,
   DefaultItemAction,
 } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
-import type { DataView, DataViewField } from '../../../src/plugins/data_views/public';
-import { IndexPatternFieldEditorStart } from '../../../src/plugins/data_view_field_editor/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
 
 interface Props {
   dataView?: DataView;
diff --git a/examples/data_view_field_editor_example/public/plugin.tsx b/examples/data_view_field_editor_example/public/plugin.tsx
index 3cf0ce618ad3b..087dd2ca8572b 100644
--- a/examples/data_view_field_editor_example/public/plugin.tsx
+++ b/examples/data_view_field_editor_example/public/plugin.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
-import { IndexPatternFieldEditorStart } from '../../../src/plugins/data_view_field_editor/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
 
 interface StartDeps {
   data: DataPublicPluginStart;
diff --git a/examples/developer_examples/public/app.tsx b/examples/developer_examples/public/app.tsx
index e9e277ed69bec..a179ebb6abb6a 100644
--- a/examples/developer_examples/public/app.tsx
+++ b/examples/developer_examples/public/app.tsx
@@ -22,7 +22,7 @@ import {
   EuiLink,
   EuiButtonIcon,
 } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { ExampleDefinition } from './types';
 
 interface Props {
diff --git a/examples/developer_examples/public/plugin.ts b/examples/developer_examples/public/plugin.ts
index 75a05ed95c8a1..c87bd2f5cc890 100644
--- a/examples/developer_examples/public/plugin.ts
+++ b/examples/developer_examples/public/plugin.ts
@@ -6,12 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  CoreSetup,
-  Plugin,
-  AppMountParameters,
-  DEFAULT_APP_CATEGORIES,
-} from '../../../src/core/public';
+import { CoreSetup, Plugin, AppMountParameters, DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 
 import { ExampleDefinition } from './types';
 
diff --git a/examples/embeddable_examples/common/book_saved_object_attributes.ts b/examples/embeddable_examples/common/book_saved_object_attributes.ts
index 596068c7231d0..077f54a0a0d08 100644
--- a/examples/embeddable_examples/common/book_saved_object_attributes.ts
+++ b/examples/embeddable_examples/common/book_saved_object_attributes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from '../../../src/core/types';
+import { SavedObjectAttributes } from '@kbn/core/types';
 
 export const BOOK_SAVED_OBJECT = 'book';
 
diff --git a/examples/embeddable_examples/common/todo_saved_object_attributes.ts b/examples/embeddable_examples/common/todo_saved_object_attributes.ts
index dcaee933a67cc..3a05e02e523f9 100644
--- a/examples/embeddable_examples/common/todo_saved_object_attributes.ts
+++ b/examples/embeddable_examples/common/todo_saved_object_attributes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from '../../../src/core/types';
+import { SavedObjectAttributes } from '@kbn/core/types';
 
 export interface TodoSavedObjectAttributes extends SavedObjectAttributes {
   task: string;
diff --git a/examples/embeddable_examples/public/book/add_book_to_library_action.tsx b/examples/embeddable_examples/public/book/add_book_to_library_action.tsx
index 00b0f69522f84..a9c922f110c09 100644
--- a/examples/embeddable_examples/public/book/add_book_to_library_action.tsx
+++ b/examples/embeddable_examples/public/book/add_book_to_library_action.tsx
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
+import { createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { ViewMode, isReferenceOrValueEmbeddable } from '@kbn/embeddable-plugin/public';
+import { DASHBOARD_CONTAINER_TYPE } from '@kbn/dashboard-plugin/public';
 import { BookEmbeddable, BOOK_EMBEDDABLE } from './book_embeddable';
-import { ViewMode, isReferenceOrValueEmbeddable } from '../../../../src/plugins/embeddable/public';
-import { DASHBOARD_CONTAINER_TYPE } from '../../../../src/plugins/dashboard/public';
 
 interface ActionContext {
   embeddable: BookEmbeddable;
diff --git a/examples/embeddable_examples/public/book/book_component.tsx b/examples/embeddable_examples/public/book/book_component.tsx
index 69535f09cb009..abe6d31b78f81 100644
--- a/examples/embeddable_examples/public/book/book_component.tsx
+++ b/examples/embeddable_examples/public/book/book_component.tsx
@@ -11,7 +11,7 @@ import { EuiFlexItem, EuiFlexGroup, EuiIcon } from '@elastic/eui';
 
 import { EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription } from '@kbn/embeddable-plugin/public';
 import { BookEmbeddableInput, BookEmbeddableOutput, BookEmbeddable } from './book_embeddable';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/book/book_embeddable.tsx b/examples/embeddable_examples/public/book/book_embeddable.tsx
index 024d9d90448eb..fac2c151df469 100644
--- a/examples/embeddable_examples/public/book/book_embeddable.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable.tsx
@@ -17,7 +17,7 @@ import {
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
   AttributeService,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { BookSavedObjectAttributes } from '../../common';
 import { BookEmbeddableComponent } from './book_component';
 
diff --git a/examples/embeddable_examples/public/book/book_embeddable_factory.tsx b/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
index f44446991fde5..7510107854a8f 100644
--- a/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
@@ -8,15 +8,16 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   EmbeddableFactoryDefinition,
   IContainer,
   EmbeddableFactory,
   EmbeddableStart,
   AttributeService,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { OverlayStart, SavedObjectsClientContract, SimpleSavedObject } from '@kbn/core/public';
+import { checkForDuplicateTitle, OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import {
   BookEmbeddable,
   BOOK_EMBEDDABLE,
@@ -24,12 +25,7 @@ import {
   BookEmbeddableOutput,
 } from './book_embeddable';
 import { CreateEditBookComponent } from './create_edit_book_component';
-import {
-  OverlayStart,
-  SavedObjectsClientContract,
-  SimpleSavedObject,
-} from '../../../../src/core/public';
-import { checkForDuplicateTitle, OnSaveProps } from '../../../../src/plugins/saved_objects/public';
+import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
 
 interface StartServices {
   getAttributeService: EmbeddableStart['getAttributeService'];
diff --git a/examples/embeddable_examples/public/book/edit_book_action.tsx b/examples/embeddable_examples/public/book/edit_book_action.tsx
index 0f2a44f177d4c..778b4177331c8 100644
--- a/examples/embeddable_examples/public/book/edit_book_action.tsx
+++ b/examples/embeddable_examples/public/book/edit_book_action.tsx
@@ -7,16 +7,17 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
-import { createAction } from '../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   ViewMode,
   SavedObjectEmbeddableInput,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   BookEmbeddable,
   BOOK_EMBEDDABLE,
@@ -24,8 +25,7 @@ import {
   BookByValueInput,
 } from './book_embeddable';
 import { CreateEditBookComponent } from './create_edit_book_component';
-import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
-import { SavedObjectsClientContract } from '../../../../src/core/public';
+import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
 
 interface StartServices {
   openModal: OverlayStart['openModal'];
diff --git a/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx b/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx
index 5e4680a8fea70..461bcf83e2dfa 100644
--- a/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx
+++ b/examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
+import { createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { ViewMode, isReferenceOrValueEmbeddable } from '@kbn/embeddable-plugin/public';
+import { DASHBOARD_CONTAINER_TYPE } from '@kbn/dashboard-plugin/public';
 import { BookEmbeddable, BOOK_EMBEDDABLE } from './book_embeddable';
-import { ViewMode, isReferenceOrValueEmbeddable } from '../../../../src/plugins/embeddable/public';
-import { DASHBOARD_CONTAINER_TYPE } from '../../../../src/plugins/dashboard/public';
 
 interface ActionContext {
   embeddable: BookEmbeddable;
diff --git a/examples/embeddable_examples/public/create_sample_data.ts b/examples/embeddable_examples/public/create_sample_data.ts
index 3e49f62570238..612290bce78a8 100644
--- a/examples/embeddable_examples/public/create_sample_data.ts
+++ b/examples/embeddable_examples/public/create_sample_data.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { TodoSavedObjectAttributes, BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../common';
 
 export async function createSampleData(client: SavedObjectsClientContract, overwrite = true) {
diff --git a/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
index afec509037434..3f82356a1466e 100644
--- a/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Embeddable, EmbeddableInput, IContainer } from '../../../../src/plugins/embeddable/public';
+import { Embeddable, EmbeddableInput, IContainer } from '@kbn/embeddable-plugin/public';
 
 export const HELLO_WORLD_EMBEDDABLE = 'HELLO_WORLD_EMBEDDABLE';
 
diff --git a/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts b/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
index faa71f7296abe..2147c439cc691 100644
--- a/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
@@ -12,7 +12,7 @@ import {
   EmbeddableInput,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { HelloWorldEmbeddable, HELLO_WORLD_EMBEDDABLE } from './hello_world_embeddable';
 
 export type HelloWorldEmbeddableFactory = EmbeddableFactory;
diff --git a/examples/embeddable_examples/public/list_container/list_container.tsx b/examples/embeddable_examples/public/list_container/list_container.tsx
index 70a4f1ba44f2b..c4641ba0f68de 100644
--- a/examples/embeddable_examples/public/list_container/list_container.tsx
+++ b/examples/embeddable_examples/public/list_container/list_container.tsx
@@ -8,11 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {
-  Container,
-  ContainerInput,
-  EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+import { Container, ContainerInput, EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import { ListContainerComponent } from './list_container_component';
 
 export const LIST_CONTAINER = 'LIST_CONTAINER';
diff --git a/examples/embeddable_examples/public/list_container/list_container_component.tsx b/examples/embeddable_examples/public/list_container/list_container_component.tsx
index d939cc2029f65..d83ce243f37d2 100644
--- a/examples/embeddable_examples/public/list_container/list_container_component.tsx
+++ b/examples/embeddable_examples/public/list_container/list_container_component.tsx
@@ -16,7 +16,7 @@ import {
   ContainerOutput,
   EmbeddableStart,
   EmbeddableChildPanel,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 
 interface Props {
   embeddable: IContainer;
diff --git a/examples/embeddable_examples/public/list_container/list_container_factory.ts b/examples/embeddable_examples/public/list_container/list_container_factory.ts
index 7dc85fa476dfa..ddf889f2afd8a 100644
--- a/examples/embeddable_examples/public/list_container/list_container_factory.ts
+++ b/examples/embeddable_examples/public/list_container/list_container_factory.ts
@@ -13,7 +13,7 @@ import {
   EmbeddableStart,
   EmbeddableFactory,
   ContainerOutput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { LIST_CONTAINER, ListContainer } from './list_container';
 
 interface StartServices {
diff --git a/examples/embeddable_examples/public/migrations/migration.7.3.0.ts b/examples/embeddable_examples/public/migrations/migration.7.3.0.ts
index 5b31cfe2b4e66..79b61848a0166 100644
--- a/examples/embeddable_examples/public/migrations/migration.7.3.0.ts
+++ b/examples/embeddable_examples/public/migrations/migration.7.3.0.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { MigrateFunction } from '../../../../src/plugins/kibana_utils/common/persistable_state';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common/persistable_state';
+import { EmbeddableInput } from '@kbn/embeddable-plugin/common';
 import { SimpleEmbeddableInput } from './migrations_embeddable_factory';
-import { EmbeddableInput } from '../../../../src/plugins/embeddable/common';
 
 // before 7.3.0 this embeddable received a very simple input with a variable named `number`
 // eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx b/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx
index 871994ce2aaae..94f095efd62af 100644
--- a/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx
+++ b/examples/embeddable_examples/public/migrations/migrations_embeddable.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import { SIMPLE_EMBEDDABLE, SimpleEmbeddableInput } from '.';
-import { Embeddable, IContainer } from '../../../../src/plugins/embeddable/public';
 
 export class SimpleEmbeddable extends Embeddable<SimpleEmbeddableInput> {
   // The type of this embeddable. This will be used to find the appropriate factory
diff --git a/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts b/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts
index 61e6bfa56ec47..19efd95a12dde 100644
--- a/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts
+++ b/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EmbeddableStateWithType } from '../../../../src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import {
   IContainer,
   EmbeddableInput,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { SimpleEmbeddable } from './migrations_embeddable';
 import { migration730 } from './migration.7.3.0';
 
diff --git a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx
index 367ce80497728..cda168547b81f 100644
--- a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx
+++ b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx
@@ -17,7 +17,7 @@ import {
   EuiListGroup,
   EuiListGroupItem,
 } from '@elastic/eui';
-import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription } from '@kbn/embeddable-plugin/public';
 import {
   MultiTaskTodoEmbeddable,
   MultiTaskTodoOutput,
diff --git a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx
index 6ce3d456f37ff..eea615626fb5e 100644
--- a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx
+++ b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx
@@ -14,7 +14,7 @@ import {
   EmbeddableInput,
   IContainer,
   EmbeddableOutput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { MultiTaskTodoEmbeddableComponent } from './multi_task_todo_component';
 
 export const MULTI_TASK_TODO_EMBEDDABLE = 'MULTI_TASK_TODO_EMBEDDABLE';
diff --git a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.ts b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.ts
index 7364f336b722c..4c147c760ba51 100644
--- a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.ts
+++ b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.ts
@@ -11,7 +11,7 @@ import {
   IContainer,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import {
   MultiTaskTodoEmbeddable,
   MULTI_TASK_TODO_EMBEDDABLE,
diff --git a/examples/embeddable_examples/public/plugin.ts b/examples/embeddable_examples/public/plugin.ts
index e59e7367e8af7..ffea5710e9ca2 100644
--- a/examples/embeddable_examples/public/plugin.ts
+++ b/examples/embeddable_examples/public/plugin.ts
@@ -10,8 +10,9 @@ import {
   EmbeddableSetup,
   EmbeddableStart,
   CONTEXT_MENU_TRIGGER,
-} from '../../../src/plugins/embeddable/public';
-import { Plugin, CoreSetup, CoreStart, SavedObjectsClient } from '../../../src/core/public';
+} from '@kbn/embeddable-plugin/public';
+import { Plugin, CoreSetup, CoreStart, SavedObjectsClient } from '@kbn/core/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   HelloWorldEmbeddableFactory,
   HELLO_WORLD_EMBEDDABLE,
@@ -46,7 +47,6 @@ import {
   BookEmbeddableFactory,
   BookEmbeddableFactoryDefinition,
 } from './book/book_embeddable_factory';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { createAddBookToLibraryAction } from './book/add_book_to_library_action';
 import { createUnlinkBookFromLibraryAction } from './book/unlink_book_from_library_action';
 import {
diff --git a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
index 8a9fe85a5c4ef..f01e717ec364e 100644
--- a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
@@ -13,7 +13,7 @@ import {
   ContainerInput,
   EmbeddableStart,
   EmbeddableInput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { SearchableListContainerComponent } from './searchable_list_container_component';
 
 export const SEARCHABLE_LIST_CONTAINER = 'SEARCHABLE_LIST_CONTAINER';
diff --git a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx
index 972500c36475b..2c225303fee20 100644
--- a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx
@@ -25,7 +25,7 @@ import {
   ContainerOutput,
   EmbeddableOutput,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { SearchableListContainer, SearchableContainerInput } from './searchable_list_container';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.ts b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.ts
index 5b09719f70b39..5964159512ffb 100644
--- a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.ts
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.ts
@@ -12,7 +12,7 @@ import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import {
   SEARCHABLE_LIST_CONTAINER,
   SearchableListContainer,
diff --git a/examples/embeddable_examples/public/todo/todo_component.tsx b/examples/embeddable_examples/public/todo/todo_component.tsx
index f2ba44de407ee..ed5dc89e4c547 100644
--- a/examples/embeddable_examples/public/todo/todo_component.tsx
+++ b/examples/embeddable_examples/public/todo/todo_component.tsx
@@ -13,10 +13,7 @@ import { EuiText } from '@elastic/eui';
 import { EuiAvatar } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
 import { EuiFlexGrid } from '@elastic/eui';
-import {
-  withEmbeddableSubscription,
-  EmbeddableOutput,
-} from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 import { TodoEmbeddable, TodoInput } from './todo_embeddable';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/todo/todo_embeddable.tsx b/examples/embeddable_examples/public/todo/todo_embeddable.tsx
index 82fcaadf2e172..d08eb7c637788 100644
--- a/examples/embeddable_examples/public/todo/todo_embeddable.tsx
+++ b/examples/embeddable_examples/public/todo/todo_embeddable.tsx
@@ -14,7 +14,7 @@ import {
   EmbeddableInput,
   IContainer,
   EmbeddableOutput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { TodoEmbeddableComponent } from './todo_component';
 
 export const TODO_EMBEDDABLE = 'TODO_EMBEDDABLE';
diff --git a/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx b/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx
index 2c8b3083fd990..456e28074ff03 100644
--- a/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx
+++ b/examples/embeddable_examples/public/todo/todo_embeddable_factory.tsx
@@ -9,15 +9,15 @@
 import React, { useState } from 'react';
 import { EuiModalBody } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { EuiFieldText } from '@elastic/eui';
 import { EuiButton } from '@elastic/eui';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   IContainer,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { TodoEmbeddable, TODO_EMBEDDABLE, TodoInput, TodoOutput } from './todo_embeddable';
 
 function TaskInput({ onSave }: { onSave: (task: string) => void }) {
diff --git a/examples/embeddable_examples/public/todo/todo_ref_component.tsx b/examples/embeddable_examples/public/todo/todo_ref_component.tsx
index d70db903d1dac..65c81aaefbd25 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_component.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_component.tsx
@@ -13,7 +13,7 @@ import { EuiText } from '@elastic/eui';
 import { EuiAvatar } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
 import { EuiFlexGrid } from '@elastic/eui';
-import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import { withEmbeddableSubscription } from '@kbn/embeddable-plugin/public';
 import { TodoRefInput, TodoRefOutput, TodoRefEmbeddable } from './todo_ref_embeddable';
 
 interface Props {
diff --git a/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx b/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx
index b797d8975665b..645fd443220a5 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_embeddable.tsx
@@ -9,14 +9,14 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
-import { TodoSavedObjectAttributes } from 'examples/embeddable_examples/common';
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   Embeddable,
   IContainer,
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { TodoSavedObjectAttributes } from '../../common';
 import { TodoRefEmbeddableComponent } from './todo_ref_component';
 
 // Notice this is not the same value as the 'todo' saved object type. Many of our
diff --git a/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx b/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx
index 467318658da19..2f3d79a672c90 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_embeddable_factory.tsx
@@ -7,15 +7,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObjectsClientContract } from 'kibana/public';
-import { TodoSavedObjectAttributes } from 'examples/embeddable_examples/common';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   IContainer,
   EmbeddableStart,
   ErrorEmbeddable,
   EmbeddableFactoryDefinition,
   EmbeddableFactory,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { TodoSavedObjectAttributes } from '../../common';
 import {
   TodoRefEmbeddable,
   TODO_REF_EMBEDDABLE,
diff --git a/examples/embeddable_examples/server/book_saved_object.ts b/examples/embeddable_examples/server/book_saved_object.ts
index 2a1866b8be82a..31ccb914b2335 100644
--- a/examples/embeddable_examples/server/book_saved_object.ts
+++ b/examples/embeddable_examples/server/book_saved_object.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const bookSavedObject: SavedObjectsType = {
   name: 'book',
diff --git a/examples/embeddable_examples/server/index.ts b/examples/embeddable_examples/server/index.ts
index ab32bdc9e7c2c..0139633a71d69 100644
--- a/examples/embeddable_examples/server/index.ts
+++ b/examples/embeddable_examples/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 
 import { EmbeddableExamplesPlugin } from './plugin';
 
diff --git a/examples/embeddable_examples/server/merge_migration_function_maps.ts b/examples/embeddable_examples/server/merge_migration_function_maps.ts
index 01a46949e6bbf..56c931613b0e3 100644
--- a/examples/embeddable_examples/server/merge_migration_function_maps.ts
+++ b/examples/embeddable_examples/server/merge_migration_function_maps.ts
@@ -8,7 +8,7 @@
 
 import { mergeWith } from 'lodash';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { MigrateFunctionsObject, MigrateFunction } from '../../../src/plugins/kibana_utils/common';
+import { MigrateFunctionsObject, MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 
 export const mergeMigrationFunctionMaps = (
   obj1: MigrateFunctionsObject,
diff --git a/examples/embeddable_examples/server/plugin.ts b/examples/embeddable_examples/server/plugin.ts
index 469c463381d1c..fbf9dc97ac790 100644
--- a/examples/embeddable_examples/server/plugin.ts
+++ b/examples/embeddable_examples/server/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import { todoSavedObject } from './todo_saved_object';
 import { bookSavedObject } from './book_saved_object';
 import { searchableListSavedObject } from './searchable_list_saved_object';
-import { EmbeddableSetup } from '../../../src/plugins/embeddable/server';
 
 export interface EmbeddableExamplesSetupDependencies {
   embeddable: EmbeddableSetup;
diff --git a/examples/embeddable_examples/server/searchable_list_saved_object.ts b/examples/embeddable_examples/server/searchable_list_saved_object.ts
index a3b12a05323f0..7990655822f5a 100644
--- a/examples/embeddable_examples/server/searchable_list_saved_object.ts
+++ b/examples/embeddable_examples/server/searchable_list_saved_object.ts
@@ -7,8 +7,8 @@
  */
 
 import { mapValues } from 'lodash';
-import { SavedObjectsType, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { EmbeddableSetup } from '../../../src/plugins/embeddable/server';
+import { SavedObjectsType, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 // NOTE: this should rather be imported from 'plugins/kibana_utils/server' but examples at the moment don't
 // allow static imports from plugins so this code was duplicated
 import { mergeMigrationFunctionMaps } from './merge_migration_function_maps';
diff --git a/examples/embeddable_examples/server/todo_saved_object.ts b/examples/embeddable_examples/server/todo_saved_object.ts
index 9ac75c248873a..4f987f8f10c72 100644
--- a/examples/embeddable_examples/server/todo_saved_object.ts
+++ b/examples/embeddable_examples/server/todo_saved_object.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const todoSavedObject: SavedObjectsType = {
   name: 'todo',
diff --git a/examples/embeddable_explorer/public/app.tsx b/examples/embeddable_explorer/public/app.tsx
index a23557669c000..ad7eb76188b54 100644
--- a/examples/embeddable_explorer/public/app.tsx
+++ b/examples/embeddable_explorer/public/app.tsx
@@ -12,21 +12,21 @@ import { BrowserRouter as Router, Route, withRouter, RouteComponentProps } from
 
 import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
 
-import { EmbeddableStart } from '../../../src/plugins/embeddable/public';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
-import { Start as InspectorStartContract } from '../../../src/plugins/inspector/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 import {
   AppMountParameters,
   CoreStart,
   SavedObjectsStart,
   IUiSettingsClient,
   OverlayStart,
-} from '../../../src/core/public';
+} from '@kbn/core/public';
+import { EmbeddableExamplesStart } from '@kbn/embeddable-examples-plugin/public/plugin';
 import { HelloWorldEmbeddableExample } from './hello_world_embeddable_example';
 import { TodoEmbeddableExample } from './todo_embeddable_example';
 import { ListContainerExample } from './list_container_example';
 import { EmbeddablePanelExample } from './embeddable_panel_example';
-import { EmbeddableExamplesStart } from '../../embeddable_examples/public/plugin';
 
 interface PageDef {
   title: string;
diff --git a/examples/embeddable_explorer/public/embeddable_panel_example.tsx b/examples/embeddable_explorer/public/embeddable_panel_example.tsx
index 6796ac4105aff..50c941938cb74 100644
--- a/examples/embeddable_explorer/public/embeddable_panel_example.tsx
+++ b/examples/embeddable_explorer/public/embeddable_panel_example.tsx
@@ -18,14 +18,14 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { EuiSpacer } from '@elastic/eui';
-import { EmbeddableStart, IEmbeddable } from '../../../src/plugins/embeddable/public';
+import { EmbeddableStart, IEmbeddable } from '@kbn/embeddable-plugin/public';
 import {
   HELLO_WORLD_EMBEDDABLE,
   TODO_EMBEDDABLE,
   BOOK_EMBEDDABLE,
   MULTI_TASK_TODO_EMBEDDABLE,
   SearchableListContainerFactory,
-} from '../../embeddable_examples/public';
+} from '@kbn/embeddable-examples-plugin/public';
 
 interface Props {
   embeddableServices: EmbeddableStart;
diff --git a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
index 815390b1e1a31..228dd0b9c14e7 100644
--- a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
+++ b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
@@ -17,11 +17,11 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { EmbeddableRenderer } from '../../../src/plugins/embeddable/public';
+import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
 import {
   HelloWorldEmbeddable,
   HelloWorldEmbeddableFactory,
-} from '../../embeddable_examples/public';
+} from '@kbn/embeddable-examples-plugin/public';
 
 interface Props {
   helloWorldEmbeddableFactory: HelloWorldEmbeddableFactory;
diff --git a/examples/embeddable_explorer/public/list_container_example.tsx b/examples/embeddable_explorer/public/list_container_example.tsx
index 9bfd56d9c9fb9..764f02b28e14c 100644
--- a/examples/embeddable_explorer/public/list_container_example.tsx
+++ b/examples/embeddable_explorer/public/list_container_example.tsx
@@ -18,17 +18,17 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { EmbeddableRenderer, ViewMode } from '../../../src/plugins/embeddable/public';
+import { EmbeddableRenderer, ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   HELLO_WORLD_EMBEDDABLE,
   MULTI_TASK_TODO_EMBEDDABLE,
   TODO_EMBEDDABLE,
   ListContainerFactory,
   SearchableListContainerFactory,
-} from '../../embeddable_examples/public';
-import { SearchableContainerInput } from '../../embeddable_examples/public/searchable_list_container/searchable_list_container';
-import { TodoInput } from '../../embeddable_examples/public/todo';
-import { MultiTaskTodoInput } from '../../embeddable_examples/public/multi_task_todo';
+} from '@kbn/embeddable-examples-plugin/public';
+import { SearchableContainerInput } from '@kbn/embeddable-examples-plugin/public/searchable_list_container/searchable_list_container';
+import { TodoInput } from '@kbn/embeddable-examples-plugin/public/todo';
+import { MultiTaskTodoInput } from '@kbn/embeddable-examples-plugin/public/multi_task_todo';
 
 interface Props {
   listContainerEmbeddableFactory: ListContainerFactory;
diff --git a/examples/embeddable_explorer/public/plugin.tsx b/examples/embeddable_explorer/public/plugin.tsx
index ea8c412e443ee..4d534ba56fda6 100644
--- a/examples/embeddable_explorer/public/plugin.tsx
+++ b/examples/embeddable_explorer/public/plugin.tsx
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableExamplesStart } from 'examples/embeddable_examples/public/plugin';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { UiActionsService } from '../../../src/plugins/ui_actions/public';
-import { EmbeddableStart } from '../../../src/plugins/embeddable/public';
-import { Start as InspectorStart } from '../../../src/plugins/inspector/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { EmbeddableExamplesStart } from '@kbn/embeddable-examples-plugin/public/plugin';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { UiActionsService } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import img from './embeddables.png';
 
 interface StartDeps {
diff --git a/examples/embeddable_explorer/public/todo_embeddable_example.tsx b/examples/embeddable_explorer/public/todo_embeddable_example.tsx
index 4c691e4800759..0710f5b0d082e 100644
--- a/examples/embeddable_explorer/public/todo_embeddable_example.tsx
+++ b/examples/embeddable_explorer/public/todo_embeddable_example.tsx
@@ -23,9 +23,9 @@ import {
   EuiTextArea,
   EuiTitle,
 } from '@elastic/eui';
-import { TodoInput } from '../../../examples/embeddable_examples/public/todo';
-import { TodoEmbeddableFactory } from '../../../examples/embeddable_examples/public';
-import { EmbeddableRenderer } from '../../../src/plugins/embeddable/public';
+import { TodoInput } from '@kbn/embeddable-examples-plugin/public/todo';
+import { TodoEmbeddableFactory } from '@kbn/embeddable-examples-plugin/public';
+import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
 
 interface Props {
   todoEmbeddableFactory: TodoEmbeddableFactory;
diff --git a/examples/expressions_explorer/public/actions/navigate_action.ts b/examples/expressions_explorer/public/actions/navigate_action.ts
index e116519b17630..b1ba30d995fd6 100644
--- a/examples/expressions_explorer/public/actions/navigate_action.ts
+++ b/examples/expressions_explorer/public/actions/navigate_action.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createAction } from '../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 
 export const ACTION_NAVIGATE = 'ACTION_NAVIGATE';
 
diff --git a/examples/expressions_explorer/public/actions/navigate_trigger.ts b/examples/expressions_explorer/public/actions/navigate_trigger.ts
index 495615b9075a4..3f3f7f4e51994 100644
--- a/examples/expressions_explorer/public/actions/navigate_trigger.ts
+++ b/examples/expressions_explorer/public/actions/navigate_trigger.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Trigger } from '../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const NAVIGATE_TRIGGER_ID = 'NAVIGATE_TRIGGER_ID';
 
diff --git a/examples/expressions_explorer/public/actions_and_expressions.tsx b/examples/expressions_explorer/public/actions_and_expressions.tsx
index 4d6d8b9f05ed3..a42a7d3b31f10 100644
--- a/examples/expressions_explorer/public/actions_and_expressions.tsx
+++ b/examples/expressions_explorer/public/actions_and_expressions.tsx
@@ -19,9 +19,9 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { NAVIGATE_TRIGGER_ID } from './actions/navigate_trigger';
 
 interface Props {
diff --git a/examples/expressions_explorer/public/actions_and_expressions2.tsx b/examples/expressions_explorer/public/actions_and_expressions2.tsx
index 28c698df38d1b..9745fbbb3241b 100644
--- a/examples/expressions_explorer/public/actions_and_expressions2.tsx
+++ b/examples/expressions_explorer/public/actions_and_expressions2.tsx
@@ -19,9 +19,9 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/expressions_explorer/public/app.tsx b/examples/expressions_explorer/public/app.tsx
index 631b60f4dc566..0ff1ae36f7a9b 100644
--- a/examples/expressions_explorer/public/app.tsx
+++ b/examples/expressions_explorer/public/app.tsx
@@ -18,15 +18,15 @@ import {
   EuiText,
   EuiLink,
 } from '@elastic/eui';
-import { AppMountParameters, IUiSettingsClient } from '../../../src/core/public';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
-import { Start as InspectorStart } from '../../../src/plugins/inspector/public';
+import { AppMountParameters, IUiSettingsClient } from '@kbn/core/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { RunExpressionsExample } from './run_expressions';
 import { RenderExpressionsExample } from './render_expressions';
 import { ActionsExpressionsExample } from './actions_and_expressions';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
 import { ActionsExpressionsExample2 } from './actions_and_expressions2';
-import { createKibanaReactContext } from '../../../src/plugins/kibana_react/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/expressions_explorer/public/editor/expression_editor.tsx b/examples/expressions_explorer/public/editor/expression_editor.tsx
index 79c5a296981db..c940a21fada27 100644
--- a/examples/expressions_explorer/public/editor/expression_editor.tsx
+++ b/examples/expressions_explorer/public/editor/expression_editor.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CodeEditor } from '../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   value: string;
diff --git a/examples/expressions_explorer/public/functions/button.ts b/examples/expressions_explorer/public/functions/button.ts
index 78eb10721cd7f..4f24d2871d61d 100644
--- a/examples/expressions_explorer/public/functions/button.ts
+++ b/examples/expressions_explorer/public/functions/button.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from '../../../../src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   color: string;
diff --git a/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx b/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx
index d05ab5d279d0d..ba272df89f6c1 100644
--- a/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx
+++ b/examples/expressions_explorer/public/inspector/expressions_inspector_view.tsx
@@ -10,7 +10,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt } from '@elastic/eui';
-import { InspectorViewProps, Adapters } from '../../../../src/plugins/inspector/public';
+import { InspectorViewProps, Adapters } from '@kbn/inspector-plugin/public';
 import { AstDebugView } from './ast_debug_view';
 
 interface ExpressionsInspectorViewComponentState {
diff --git a/examples/expressions_explorer/public/inspector/index.ts b/examples/expressions_explorer/public/inspector/index.ts
index e4aaae3a6610f..e7b9d1e496056 100644
--- a/examples/expressions_explorer/public/inspector/index.ts
+++ b/examples/expressions_explorer/public/inspector/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Adapters, InspectorViewDescription } from '../../../../src/plugins/inspector/public';
+import { Adapters, InspectorViewDescription } from '@kbn/inspector-plugin/public';
 import { getExpressionsInspectorViewComponentWrapper } from './expressions_inspector_view_wrapper';
 
 export const getExpressionsInspectorViewDescription = (): InspectorViewDescription => ({
diff --git a/examples/expressions_explorer/public/plugin.tsx b/examples/expressions_explorer/public/plugin.tsx
index a3ad9d60fd47a..53e739658621b 100644
--- a/examples/expressions_explorer/public/plugin.tsx
+++ b/examples/expressions_explorer/public/plugin.tsx
@@ -6,15 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { ExpressionsSetup, ExpressionsStart } from '../../../src/plugins/expressions/public';
-import {
-  Setup as InspectorSetup,
-  Start as InspectorStart,
-} from '../../../src/plugins/inspector/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Setup as InspectorSetup, Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { UiActionsStart, UiActionsSetup } from '@kbn/ui-actions-plugin/public';
 import { getExpressionsInspectorViewDescription } from './inspector';
-import { UiActionsStart, UiActionsSetup } from '../../../src/plugins/ui_actions/public';
 import { NAVIGATE_TRIGGER_ID, navigateTrigger } from './actions/navigate_trigger';
 import { ACTION_NAVIGATE, createNavigateAction } from './actions/navigate_action';
 import { buttonRenderer } from './renderers/button';
diff --git a/examples/expressions_explorer/public/render_expressions.tsx b/examples/expressions_explorer/public/render_expressions.tsx
index b7780939e1913..c0301a3f07281 100644
--- a/examples/expressions_explorer/public/render_expressions.tsx
+++ b/examples/expressions_explorer/public/render_expressions.tsx
@@ -20,9 +20,9 @@ import {
   EuiTitle,
   EuiButton,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { Start as InspectorStart } from '../../../src/plugins/inspector/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/expressions_explorer/public/renderers/button.tsx b/examples/expressions_explorer/public/renderers/button.tsx
index 557180ab73a35..98d0220ce73a3 100644
--- a/examples/expressions_explorer/public/renderers/button.tsx
+++ b/examples/expressions_explorer/public/renderers/button.tsx
@@ -9,7 +9,7 @@
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
-import { ExpressionRenderDefinition } from '../../../../src/plugins/expressions/common/expression_renderers';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 
 export const buttonRenderer: ExpressionRenderDefinition<any> = {
   name: 'button',
diff --git a/examples/expressions_explorer/public/run_expressions.tsx b/examples/expressions_explorer/public/run_expressions.tsx
index 18caa97171847..6e29f3fbad3ba 100644
--- a/examples/expressions_explorer/public/run_expressions.tsx
+++ b/examples/expressions_explorer/public/run_expressions.tsx
@@ -22,9 +22,9 @@ import {
   EuiTitle,
   EuiButton,
 } from '@elastic/eui';
-import { ExpressionsStart } from '../../../src/plugins/expressions/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { Adapters, Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import { ExpressionEditor } from './editor/expression_editor';
-import { Adapters, Start as InspectorStart } from '../../../src/plugins/inspector/public';
 
 interface Props {
   expressions: ExpressionsStart;
diff --git a/examples/field_formats_example/common/example_currency_format.ts b/examples/field_formats_example/common/example_currency_format.ts
index 18ff46892a02c..9134a4cf5f926 100644
--- a/examples/field_formats_example/common/example_currency_format.ts
+++ b/examples/field_formats_example/common/example_currency_format.ts
@@ -7,7 +7,7 @@
  */
 
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
-import { FieldFormat } from '../../../src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 // 1. Create a custom formatter by extending {@link FieldFormat}
 export class ExampleCurrencyFormat extends FieldFormat {
diff --git a/examples/field_formats_example/public/app.tsx b/examples/field_formats_example/public/app.tsx
index 7a6701d115d46..5eea418687928 100644
--- a/examples/field_formats_example/public/app.tsx
+++ b/examples/field_formats_example/public/app.tsx
@@ -23,7 +23,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { FieldFormatsStart } from '../../../src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import * as example1 from './examples/1_using_existing_format';
 import * as example2 from './examples/2_creating_custom_formatter';
 // @ts-ignore
diff --git a/examples/field_formats_example/public/examples/1_using_existing_format.ts b/examples/field_formats_example/public/examples/1_using_existing_format.ts
index 1f534e79d7568..13bc7908dea79 100644
--- a/examples/field_formats_example/public/examples/1_using_existing_format.ts
+++ b/examples/field_formats_example/public/examples/1_using_existing_format.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SerializedFieldFormat } from '../../../../src/plugins/field_formats/common';
-import { FieldFormatsStart } from '../../../../src/plugins/field_formats/public';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 // 1. Assume we have an existing field format configuration serialized and saved somewhere
 // In this case it is `bytes` field formatter with a configured `'0.00b'` pattern
diff --git a/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts b/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
index e3ac523c6c368..a4337b1b0b61c 100644
--- a/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
+++ b/examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SerializedFieldFormat } from '../../../../src/plugins/field_formats/common';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../../../src/plugins/field_formats/public';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 import { ExampleCurrencyFormat } from '../../common';
 
diff --git a/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx b/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx
index e0863a952f8b3..037063b042ce9 100644
--- a/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx
+++ b/examples/field_formats_example/public/examples/3_creating_custom_format_editor.tsx
@@ -12,7 +12,7 @@ import {
   FieldFormatEditor,
   FieldFormatEditorFactory,
   IndexPatternFieldEditorSetup,
-} from '../../../../src/plugins/data_view_field_editor/public';
+} from '@kbn/data-view-field-editor-plugin/public';
 import { ExampleCurrencyFormat } from '../../common';
 
 // 1. Create an editor component
diff --git a/examples/field_formats_example/public/plugin.tsx b/examples/field_formats_example/public/plugin.tsx
index 8e8018a0f5e6e..2457176cbf6b3 100755
--- a/examples/field_formats_example/public/plugin.tsx
+++ b/examples/field_formats_example/public/plugin.tsx
@@ -14,16 +14,16 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-} from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { App } from './app';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../../src/plugins/field_formats/public';
-import { registerExampleFormat } from './examples/2_creating_custom_formatter';
+} from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import {
   IndexPatternFieldEditorStart,
   IndexPatternFieldEditorSetup,
-} from '../../../src/plugins/data_view_field_editor/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
+} from '@kbn/data-view-field-editor-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { registerExampleFormat } from './examples/2_creating_custom_formatter';
+import { App } from './app';
 import { registerExampleFormatEditor } from './examples/3_creating_custom_format_editor';
 import img from './formats.png';
 
diff --git a/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts b/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts
index a2dbb9594512b..b01fc08e9b545 100644
--- a/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts
+++ b/examples/field_formats_example/server/examples/2_creating_custom_formatter.ts
@@ -8,7 +8,7 @@
 
 // This is server-side continuation of examples/field_formats_example/public/examples/2_creating_custom_formatter.ts
 
-import { FieldFormatsSetup } from '../../../../src/plugins/field_formats/server';
+import { FieldFormatsSetup } from '@kbn/field-formats-plugin/server';
 
 import { ExampleCurrencyFormat } from '../../common';
 
diff --git a/examples/field_formats_example/server/plugin.ts b/examples/field_formats_example/server/plugin.ts
index 2163e0fc6e9fe..2223347f389f0 100644
--- a/examples/field_formats_example/server/plugin.ts
+++ b/examples/field_formats_example/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../src/core/server';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../../src/plugins/field_formats/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { registerExampleFormat } from './examples/2_creating_custom_formatter';
 
 interface SetupDeps {
diff --git a/examples/hello_world/public/plugin.tsx b/examples/hello_world/public/plugin.tsx
index 49acf07e6ae12..6433913ad9e03 100755
--- a/examples/hello_world/public/plugin.tsx
+++ b/examples/hello_world/public/plugin.tsx
@@ -7,8 +7,8 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { AppMountParameters, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 
 interface SetupDeps {
   developerExamples: DeveloperExamplesSetup;
diff --git a/examples/locator_examples/public/app.tsx b/examples/locator_examples/public/app.tsx
index cca1bb93b9fa7..c874319de8120 100644
--- a/examples/locator_examples/public/app.tsx
+++ b/examples/locator_examples/public/app.tsx
@@ -15,7 +15,7 @@ import { EuiPageContentBody } from '@elastic/eui';
 import { Route, Switch, Redirect, Router, useLocation } from 'react-router-dom';
 import { createBrowserHistory } from 'history';
 import { EuiText } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 function useQuery() {
   const { search } = useLocation();
diff --git a/examples/locator_examples/public/locator.ts b/examples/locator_examples/public/locator.ts
index 52f44f89c4848..6031bb4b4fe28 100644
--- a/examples/locator_examples/public/locator.ts
+++ b/examples/locator_examples/public/locator.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { MigrateFunction } from 'src/plugins/kibana_utils/common';
-import { LocatorDefinition, LocatorPublic } from '../../../src/plugins/share/public';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common';
+import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 
 export const HELLO_LOCATOR = 'HELLO_LOCATOR';
 
diff --git a/examples/locator_examples/public/plugin.tsx b/examples/locator_examples/public/plugin.tsx
index 4facf9c95964f..79b261039c0fc 100644
--- a/examples/locator_examples/public/plugin.tsx
+++ b/examples/locator_examples/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SharePluginStart, SharePluginSetup } from '../../../src/plugins/share/public';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
 import { HelloLocator, HelloLocatorDefinition } from './locator';
 
 interface SetupDeps {
diff --git a/examples/locator_explorer/public/app.tsx b/examples/locator_explorer/public/app.tsx
index c1e3da665d63a..951320ba83a5c 100644
--- a/examples/locator_explorer/public/app.tsx
+++ b/examples/locator_explorer/public/app.tsx
@@ -18,13 +18,13 @@ import { EuiText } from '@elastic/eui';
 import { EuiFieldText } from '@elastic/eui';
 import { EuiPageHeader } from '@elastic/eui';
 import { EuiLink } from '@elastic/eui';
-import { AppMountParameters } from '../../../src/core/public';
-import { SharePluginSetup } from '../../../src/plugins/share/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 import {
   HelloLocatorV1Params,
   HelloLocatorV2Params,
   HELLO_LOCATOR,
-} from '../../locator_examples/public';
+} from '@kbn/locator-examples-plugin/public';
 
 interface Props {
   share: SharePluginSetup;
diff --git a/examples/locator_explorer/public/plugin.tsx b/examples/locator_explorer/public/plugin.tsx
index 240a1a34caef9..34ff857569166 100644
--- a/examples/locator_explorer/public/plugin.tsx
+++ b/examples/locator_explorer/public/plugin.tsx
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SharePluginSetup, SharePluginStart } from '../../../src/plugins/share/public';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 
 interface SetupDeps {
   developerExamples: DeveloperExamplesSetup;
diff --git a/examples/partial_results_example/public/app/app.tsx b/examples/partial_results_example/public/app/app.tsx
index 5420ab0f4ceed..f6249ea2d33b4 100644
--- a/examples/partial_results_example/public/app/app.tsx
+++ b/examples/partial_results_example/public/app/app.tsx
@@ -22,7 +22,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { ExpressionsContext } from './expressions_context';
 
 const expression = `getEvents
diff --git a/examples/partial_results_example/public/app/expressions_context.ts b/examples/partial_results_example/public/app/expressions_context.ts
index a14c12e0f3ac1..e282abdb382ca 100644
--- a/examples/partial_results_example/public/app/expressions_context.ts
+++ b/examples/partial_results_example/public/app/expressions_context.ts
@@ -7,6 +7,6 @@
  */
 
 import { createContext } from 'react';
-import type { ExpressionsServiceStart } from 'src/plugins/expressions';
+import type { ExpressionsServiceStart } from '@kbn/expressions-plugin';
 
 export const ExpressionsContext = createContext<ExpressionsServiceStart | undefined>(undefined);
diff --git a/examples/partial_results_example/public/functions/count_event.ts b/examples/partial_results_example/public/functions/count_event.ts
index 86090fe4f4d60..93b3856f56075 100644
--- a/examples/partial_results_example/public/functions/count_event.ts
+++ b/examples/partial_results_example/public/functions/count_event.ts
@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent } from 'rxjs';
 import { scan, startWith } from 'rxjs/operators';
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export interface CountEventArguments {
   event: string;
diff --git a/examples/partial_results_example/public/functions/get_events.ts b/examples/partial_results_example/public/functions/get_events.ts
index d911e12f11f96..1abf3cb984c58 100644
--- a/examples/partial_results_example/public/functions/get_events.ts
+++ b/examples/partial_results_example/public/functions/get_events.ts
@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent, merge } from 'rxjs';
 import { distinct, map, pluck, scan, take } from 'rxjs/operators';
-import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 const EVENTS: Array<keyof WindowEventMap> = [
   'mousedown',
diff --git a/examples/partial_results_example/public/functions/pluck.ts b/examples/partial_results_example/public/functions/pluck.ts
index a5a1fbc007ffa..8b32298fc5ced 100644
--- a/examples/partial_results_example/public/functions/pluck.ts
+++ b/examples/partial_results_example/public/functions/pluck.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export interface PluckArguments {
   key: string;
diff --git a/examples/partial_results_example/public/plugin.tsx b/examples/partial_results_example/public/plugin.tsx
index 9599a0d6f590c..fce4f72f28b52 100755
--- a/examples/partial_results_example/public/plugin.tsx
+++ b/examples/partial_results_example/public/plugin.tsx
@@ -7,10 +7,10 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { ExpressionsServiceSetup } from 'src/plugins/expressions';
-import { ExpressionsServiceFork } from 'src/plugins/expressions/common/service/expressions_fork';
-import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '../../../src/core/public';
-import type { DeveloperExamplesSetup } from '../../developer_examples/public';
+import type { ExpressionsServiceSetup } from '@kbn/expressions-plugin';
+import { ExpressionsServiceFork } from '@kbn/expressions-plugin/common/service/expressions_fork';
+import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '@kbn/core/public';
+import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { App, ExpressionsContext } from './app';
 import { countEvent, getEvents, pluck } from './functions';
 
diff --git a/examples/preboot_example/public/app.tsx b/examples/preboot_example/public/app.tsx
index d95df8cf72164..39a50995f0580 100644
--- a/examples/preboot_example/public/app.tsx
+++ b/examples/preboot_example/public/app.tsx
@@ -17,7 +17,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import type { HttpSetup, IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import type { HttpSetup, IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 export const App = ({ http, token }: { http: HttpSetup; token?: string }) => {
   const onCompleteSetup = async ({ shouldReloadConfig }: { shouldReloadConfig: boolean }) => {
diff --git a/examples/preboot_example/public/index.ts b/examples/preboot_example/public/index.ts
index 7859758c274f3..3ee7380e58ec7 100644
--- a/examples/preboot_example/public/index.ts
+++ b/examples/preboot_example/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { PrebootExamplePlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/examples/preboot_example/public/plugin.tsx b/examples/preboot_example/public/plugin.tsx
index 1db38e2240a86..4d4e9bcb509d8 100644
--- a/examples/preboot_example/public/plugin.tsx
+++ b/examples/preboot_example/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { App } from './app';
diff --git a/examples/preboot_example/server/index.ts b/examples/preboot_example/server/index.ts
index 0377250d0cf50..cc231e0c873ed 100644
--- a/examples/preboot_example/server/index.ts
+++ b/examples/preboot_example/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { PrebootExamplePlugin } from './plugin';
diff --git a/examples/preboot_example/server/plugin.ts b/examples/preboot_example/server/plugin.ts
index 288b5245c82b1..f1f24c0972f90 100644
--- a/examples/preboot_example/server/plugin.ts
+++ b/examples/preboot_example/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { CorePreboot, PrebootPlugin, PluginInitializerContext } from 'src/core/server';
+import type { CorePreboot, PrebootPlugin, PluginInitializerContext } from '@kbn/core/server';
 import fs from 'fs/promises';
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
diff --git a/examples/routing_example/public/app.tsx b/examples/routing_example/public/app.tsx
index e8b7b44a0a097..37b6d18a4e669 100644
--- a/examples/routing_example/public/app.tsx
+++ b/examples/routing_example/public/app.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import {
   EuiPage,
   EuiPageBody,
diff --git a/examples/routing_example/public/get_message_example.tsx b/examples/routing_example/public/get_message_example.tsx
index 4cef21128518e..45ad123f7bbba 100644
--- a/examples/routing_example/public/get_message_example.tsx
+++ b/examples/routing_example/public/get_message_example.tsx
@@ -16,7 +16,7 @@ import {
   EuiCallOut,
   EuiFormRow,
 } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { isError } from './is_error';
 import { Services } from './services';
 
diff --git a/examples/routing_example/public/index.ts b/examples/routing_example/public/index.ts
index b7bd5e98baa29..d074112aa86e7 100644
--- a/examples/routing_example/public/index.ts
+++ b/examples/routing_example/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { RoutingExamplePlugin } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}> = () => new RoutingExamplePlugin();
diff --git a/examples/routing_example/public/is_error.ts b/examples/routing_example/public/is_error.ts
index 4d86b8aa8c609..1c8d849c9cc68 100644
--- a/examples/routing_example/public/is_error.ts
+++ b/examples/routing_example/public/is_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 
 export function isError<T>(error: T | HttpFetchError): error is HttpFetchError {
   return error instanceof HttpFetchError;
diff --git a/examples/routing_example/public/plugin.tsx b/examples/routing_example/public/plugin.tsx
index d47d31f7631de..4fbe00333b9a2 100644
--- a/examples/routing_example/public/plugin.tsx
+++ b/examples/routing_example/public/plugin.tsx
@@ -12,8 +12,8 @@ import {
   CoreSetup,
   AppMountParameters,
   AppNavLinkStatus,
-} from '../../../src/core/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+} from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { getServices } from './services';
 
 interface SetupDeps {
diff --git a/examples/routing_example/public/post_message_example.tsx b/examples/routing_example/public/post_message_example.tsx
index 3dce70fc0db2b..bfaf6f09cb6c8 100644
--- a/examples/routing_example/public/post_message_example.tsx
+++ b/examples/routing_example/public/post_message_example.tsx
@@ -17,7 +17,7 @@ import {
   EuiFormRow,
   EuiTextArea,
 } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { isError } from './is_error';
 import { Services } from './services';
 
diff --git a/examples/routing_example/public/random_number_between_example.tsx b/examples/routing_example/public/random_number_between_example.tsx
index 59e1d4de727aa..86c20b9e7dbbb 100644
--- a/examples/routing_example/public/random_number_between_example.tsx
+++ b/examples/routing_example/public/random_number_between_example.tsx
@@ -16,7 +16,7 @@ import {
   EuiCallOut,
   EuiFormRow,
 } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { isError } from './is_error';
 import { Services } from './services';
 
diff --git a/examples/routing_example/public/random_number_example.tsx b/examples/routing_example/public/random_number_example.tsx
index 4ecb46af6f7ce..292093c18767c 100644
--- a/examples/routing_example/public/random_number_example.tsx
+++ b/examples/routing_example/public/random_number_example.tsx
@@ -9,7 +9,7 @@
 import React, { useCallback } from 'react';
 import { useState } from 'react';
 import { EuiText, EuiButton, EuiLoadingSpinner, EuiCallOut } from '@elastic/eui';
-import { HttpFetchError } from '../../../src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { Services } from './services';
 import { isError } from './is_error';
 
diff --git a/examples/routing_example/public/services.ts b/examples/routing_example/public/services.ts
index a7f7aaef344fc..499d7e86a5912 100644
--- a/examples/routing_example/public/services.ts
+++ b/examples/routing_example/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, HttpFetchError } from 'kibana/public';
+import { CoreStart, HttpFetchError } from '@kbn/core/public';
 import {
   RANDOM_NUMBER_ROUTE_PATH,
   RANDOM_NUMBER_BETWEEN_ROUTE_PATH,
diff --git a/examples/routing_example/server/index.ts b/examples/routing_example/server/index.ts
index 15e7a50b56e6d..1fc65c6da1314 100644
--- a/examples/routing_example/server/index.ts
+++ b/examples/routing_example/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 
 import { RoutingExamplePlugin } from './plugin';
 
diff --git a/examples/routing_example/server/plugin.ts b/examples/routing_example/server/plugin.ts
index d9fc2558660af..5a4e88dc094e1 100644
--- a/examples/routing_example/server/plugin.ts
+++ b/examples/routing_example/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
 import { registerRoutes } from './routes';
 
 export class RoutingExamplePlugin implements Plugin<{}, {}> {
diff --git a/examples/routing_example/server/routes/message_routes.ts b/examples/routing_example/server/routes/message_routes.ts
index c53c6d1a934e0..efadb1851313d 100644
--- a/examples/routing_example/server/routes/message_routes.ts
+++ b/examples/routing_example/server/routes/message_routes.ts
@@ -7,10 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { POST_MESSAGE_ROUTE_PATH, INTERNAL_GET_MESSAGE_BY_ID_ROUTE } from '../../common';
 
-import { IRouter } from '../../../../src/core/server';
-
 /**
  *
  * NOTE: DON'T USE IN MEMORY DATA STRUCTURES TO STORE DATA!
diff --git a/examples/routing_example/server/routes/random_number_between_generator.ts b/examples/routing_example/server/routes/random_number_between_generator.ts
index edd100e85e6a0..b7056d12d33b5 100644
--- a/examples/routing_example/server/routes/random_number_between_generator.ts
+++ b/examples/routing_example/server/routes/random_number_between_generator.ts
@@ -7,10 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { RANDOM_NUMBER_BETWEEN_ROUTE_PATH } from '../../common';
 
-import { IRouter } from '../../../../src/core/server';
-
 /**
  *
  * @param router Registers a get route that returns a random number between one and another number suplied by the user.
diff --git a/examples/routing_example/server/routes/random_number_generator.ts b/examples/routing_example/server/routes/random_number_generator.ts
index 6dca4588af216..077d5cd188650 100644
--- a/examples/routing_example/server/routes/random_number_generator.ts
+++ b/examples/routing_example/server/routes/random_number_generator.ts
@@ -6,10 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { IRouter } from '@kbn/core/server';
 import { RANDOM_NUMBER_ROUTE_PATH } from '../../common';
 
-import { IRouter } from '../../../../src/core/server';
-
 /**
  *
  * @param router Registers a get route that returns a random number between one and ten. It has no input
diff --git a/examples/routing_example/server/routes/register_routes.ts b/examples/routing_example/server/routes/register_routes.ts
index 72e25ec18afbd..ef57fc641994c 100644
--- a/examples/routing_example/server/routes/register_routes.ts
+++ b/examples/routing_example/server/routes/register_routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { registerGetRandomNumberRoute } from './random_number_generator';
 import { registerGetRandomNumberBetweenRoute } from './random_number_between_generator';
 import { registerGetMessageByIdRoute, registerPostMessageRoute } from './message_routes';
diff --git a/examples/screenshot_mode_example/public/application.tsx b/examples/screenshot_mode_example/public/application.tsx
index 670468c77bd5f..080b196cdad09 100644
--- a/examples/screenshot_mode_example/public/application.tsx
+++ b/examples/screenshot_mode_example/public/application.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { AppPluginSetupDependencies, AppPluginStartDependencies } from './types';
 import { ScreenshotModeExampleApp } from './components/app';
 
diff --git a/examples/screenshot_mode_example/public/components/app.tsx b/examples/screenshot_mode_example/public/components/app.tsx
index 10dcf05870415..ed4475a9a90b5 100644
--- a/examples/screenshot_mode_example/public/components/app.tsx
+++ b/examples/screenshot_mode_example/public/components/app.tsx
@@ -21,12 +21,12 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { CoreStart } from '../../../../src/core/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import {
   ScreenshotModePluginSetup,
   KBN_SCREENSHOT_MODE_HEADER,
-} from '../../../../src/plugins/screenshot_mode/public';
+} from '@kbn/screenshot-mode-plugin/public';
 
 import { PLUGIN_NAME, BASE_API_ROUTE } from '../../common';
 
diff --git a/examples/screenshot_mode_example/public/plugin.ts b/examples/screenshot_mode_example/public/plugin.ts
index 4108924ca3b8d..788e31e2e0e51 100644
--- a/examples/screenshot_mode_example/public/plugin.ts
+++ b/examples/screenshot_mode_example/public/plugin.ts
@@ -12,7 +12,7 @@ import {
   CoreStart,
   Plugin,
   AppNavLinkStatus,
-} from '../../../src/core/public';
+} from '@kbn/core/public';
 import { AppPluginSetupDependencies, AppPluginStartDependencies } from './types';
 import { MetricsTracking } from './services';
 import { PLUGIN_NAME } from '../common';
diff --git a/examples/screenshot_mode_example/public/services/metrics_tracking.ts b/examples/screenshot_mode_example/public/services/metrics_tracking.ts
index e40b6bbf09e44..5154720f29bd9 100644
--- a/examples/screenshot_mode_example/public/services/metrics_tracking.ts
+++ b/examples/screenshot_mode_example/public/services/metrics_tracking.ts
@@ -7,8 +7,8 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { PLUGIN_NAME } from '../../common';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 
 export class MetricsTracking {
   private trackingDisabled = false;
diff --git a/examples/screenshot_mode_example/public/types.ts b/examples/screenshot_mode_example/public/types.ts
index 2eb9bd8e144a0..3b15d9e8a4e47 100644
--- a/examples/screenshot_mode_example/public/types.ts
+++ b/examples/screenshot_mode_example/public/types.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
-import { ScreenshotModePluginSetup } from '../../../src/plugins/screenshot_mode/public';
-import { UsageCollectionSetup } from '../../../src/plugins/usage_collection/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 
 export interface AppPluginSetupDependencies {
   usageCollection: UsageCollectionSetup;
diff --git a/examples/screenshot_mode_example/server/index.ts b/examples/screenshot_mode_example/server/index.ts
index af23ea893a755..3237dbabff937 100644
--- a/examples/screenshot_mode_example/server/index.ts
+++ b/examples/screenshot_mode_example/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ScreenshotModeExamplePlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new ScreenshotModeExamplePlugin(ctx);
diff --git a/examples/screenshot_mode_example/server/plugin.ts b/examples/screenshot_mode_example/server/plugin.ts
index 5738f4a583a1a..b4609b4a370e0 100644
--- a/examples/screenshot_mode_example/server/plugin.ts
+++ b/examples/screenshot_mode_example/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, PluginInitializerContext, CoreSetup, Logger } from 'kibana/server';
-import { ScreenshotModePluginSetup } from '../../../src/plugins/screenshot_mode/server';
+import { Plugin, PluginInitializerContext, CoreSetup, Logger } from '@kbn/core/server';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { RouteDependencies } from './types';
 import { registerRoutes } from './routes';
 
diff --git a/examples/screenshot_mode_example/server/types.ts b/examples/screenshot_mode_example/server/types.ts
index 9d8d5888c3ab1..a5157cb9a5129 100644
--- a/examples/screenshot_mode_example/server/types.ts
+++ b/examples/screenshot_mode_example/server/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, Logger } from 'kibana/server';
-import { ScreenshotModeRequestHandlerContext } from '../../../src/plugins/screenshot_mode/server';
-import { ScreenshotModePluginSetup } from '../../../src/plugins/screenshot_mode/server';
+import { IRouter, Logger } from '@kbn/core/server';
+import { ScreenshotModeRequestHandlerContext } from '@kbn/screenshot-mode-plugin/server';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 
 export type ScreenshotModeExampleRouter = IRouter<ScreenshotModeRequestHandlerContext>;
 
diff --git a/examples/search_examples/common/types.ts b/examples/search_examples/common/types.ts
index 8bb38ea0b2d0d..c2e174ca4731e 100644
--- a/examples/search_examples/common/types.ts
+++ b/examples/search_examples/common/types.ts
@@ -11,7 +11,7 @@ import {
   IEsSearchResponse,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
-} from '../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 
 export interface IMyStrategyRequest extends IEsSearchRequest {
   get_cool: boolean;
diff --git a/examples/search_examples/public/application.tsx b/examples/search_examples/public/application.tsx
index 2c1d92451fe63..ad39cdf2e662d 100644
--- a/examples/search_examples/public/application.tsx
+++ b/examples/search_examples/public/application.tsx
@@ -10,12 +10,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Route, Redirect } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import { AppMountParameters, CoreStart } from '../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { AppPluginStartDependencies } from './types';
 import { SearchExamplePage, ExampleLink } from './common/example_page';
 import { SearchExamplesApp } from './search/app';
 import { SearchSessionsExampleApp } from './search_sessions/app';
-import { RedirectAppLinks } from '../../../src/plugins/kibana_react/public';
 import { SqlSearchExampleApp } from './sql_search/app';
 
 const LINKS: ExampleLink[] = [
diff --git a/examples/search_examples/public/common/example_page.tsx b/examples/search_examples/public/common/example_page.tsx
index baa3a8ca6ef0a..502d6545be76c 100644
--- a/examples/search_examples/public/common/example_page.tsx
+++ b/examples/search_examples/public/common/example_page.tsx
@@ -8,7 +8,7 @@
 
 import React, { PropsWithChildren } from 'react';
 import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { PLUGIN_ID } from '../../common';
 
 export interface ExampleLink {
diff --git a/examples/search_examples/public/plugin.ts b/examples/search_examples/public/plugin.ts
index 368231018e1a9..f3c23167da63c 100644
--- a/examples/search_examples/public/plugin.ts
+++ b/examples/search_examples/public/plugin.ts
@@ -12,7 +12,7 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-} from '../../../src/core/public';
+} from '@kbn/core/public';
 import {
   AppPluginSetupDependencies,
   AppPluginStartDependencies,
diff --git a/examples/search_examples/public/search/app.tsx b/examples/search_examples/public/search/app.tsx
index 9bd7bf8f7d437..c409403c47259 100644
--- a/examples/search_examples/public/search/app.tsx
+++ b/examples/search_examples/public/search/app.tsx
@@ -32,22 +32,22 @@ import {
   EuiTabbedContentTab,
 } from '@elastic/eui';
 
-import { CoreStart } from '../../../../src/core/public';
-import { mountReactNode } from '../../../../src/core/public/utils';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-
-import { PLUGIN_ID, PLUGIN_NAME, SERVER_SEARCH_ROUTE_PATH } from '../../common';
+import { lastValueFrom } from 'rxjs';
+import { CoreStart } from '@kbn/core/public';
+import { mountReactNode } from '@kbn/core/public/utils';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   isCompleteResponse,
   isErrorResponse,
-} from '../../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { DataViewField, DataView } from '../../../../src/plugins/data_views/public';
+} from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { IMyStrategyResponse } from '../../common/types';
-import { AbortError } from '../../../../src/plugins/kibana_utils/common';
+import { PLUGIN_ID, PLUGIN_NAME, SERVER_SEARCH_ROUTE_PATH } from '../../common';
 
 interface SearchExamplesAppDeps {
   notifications: CoreStart['notifications'];
@@ -306,9 +306,9 @@ export const SearchExamplesApp = ({
       const abortController = new AbortController();
       setAbortController(abortController);
       setIsLoading(true);
-      const { rawResponse: res } = await searchSource
-        .fetch$({ abortSignal: abortController.signal })
-        .toPromise();
+      const { rawResponse: res } = await lastValueFrom(
+        searchSource.fetch$({ abortSignal: abortController.signal })
+      );
       setRawResponse(res);
 
       const message = <EuiText>Searched {res.hits.total} documents.</EuiText>;
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
index fa9ec526e02f7..31ffcc2b9a0f3 100644
--- a/examples/search_examples/public/search_sessions/app.tsx
+++ b/examples/search_examples/public/search_sessions/app.tsx
@@ -30,13 +30,11 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { catchError, map, tap } from 'rxjs/operators';
-import { of } from 'rxjs';
+import { lastValueFrom, of } from 'rxjs';
 
-import { CoreStart } from '../../../../src/core/public';
-import { mountReactNode } from '../../../../src/core/public/utils';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-
-import { PLUGIN_ID } from '../../common';
+import { CoreStart } from '@kbn/core/public';
+import { mountReactNode } from '@kbn/core/public/utils';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   connectToQueryState,
@@ -48,13 +46,11 @@ import {
   QueryState,
   SearchSessionState,
   TimeRange,
-} from '../../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { DataView, DataViewField } from '../../../../src/plugins/data_views/public';
-import {
-  createStateContainer,
-  useContainerState,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { createStateContainer, useContainerState } from '@kbn/kibana-utils-plugin/public';
+import { PLUGIN_ID } from '../../common';
 import { getInitialStateFromUrl, SEARCH_SESSIONS_EXAMPLES_APP_LOCATOR } from './app_locator';
 
 interface SearchSessionsExampleAppDeps {
@@ -693,9 +689,8 @@ function doSearch(
   const startTs = performance.now();
 
   // Submit the search request using the `data.search` service.
-  return data.search
-    .search(req, { sessionId })
-    .pipe(
+  return lastValueFrom(
+    data.search.search(req, { sessionId }).pipe(
       tap((res) => {
         if (isCompleteResponse(res)) {
           const avgResult: number | undefined = res.rawResponse.aggregations
@@ -724,7 +719,7 @@ function doSearch(
         return of({ request: req, response: e });
       })
     )
-    .toPromise();
+  );
 }
 
 function getNumeric(fields?: DataViewField[]) {
diff --git a/examples/search_examples/public/search_sessions/app_locator.ts b/examples/search_examples/public/search_sessions/app_locator.ts
index f7e59ece3be5d..c7f805ed0d5f2 100644
--- a/examples/search_examples/public/search_sessions/app_locator.ts
+++ b/examples/search_examples/public/search_sessions/app_locator.ts
@@ -8,9 +8,9 @@
 
 import { SerializableRecord } from '@kbn/utility-types';
 import { Filter, Query, isFilterPinned } from '@kbn/es-query';
-import type { TimeRange } from '../../../../src/plugins/data/public';
-import { getStatesFromKbnUrl, setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
-import { LocatorDefinition } from '../../../../src/plugins/share/common';
+import type { TimeRange } from '@kbn/data-plugin/public';
+import { getStatesFromKbnUrl, setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import { LocatorDefinition } from '@kbn/share-plugin/common';
 
 export const STATE_STORAGE_KEY = '_a';
 export const GLOBAL_STATE_STORAGE_KEY = '_g';
diff --git a/examples/search_examples/public/sql_search/app.tsx b/examples/search_examples/public/sql_search/app.tsx
index acb640c4d82db..b63425bbe2679 100644
--- a/examples/search_examples/public/sql_search/app.tsx
+++ b/examples/search_examples/public/sql_search/app.tsx
@@ -24,19 +24,19 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { CoreStart } from '../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   isCompleteResponse,
   isErrorResponse,
-} from '../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import {
   SQL_SEARCH_STRATEGY,
   SqlSearchStrategyRequest,
   SqlSearchStrategyResponse,
-} from '../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 
 interface SearchExamplesAppDeps {
   notifications: CoreStart['notifications'];
diff --git a/examples/search_examples/public/types.ts b/examples/search_examples/public/types.ts
index 02f0ad28cfd72..91e3e53045bd3 100644
--- a/examples/search_examples/public/types.ts
+++ b/examples/search_examples/public/types.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../src/plugins/unified_search/public';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
-import { SharePluginSetup } from '../../../src/plugins/share/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SearchExamplesPluginSetup {}
diff --git a/examples/search_examples/server/fibonacci_strategy.ts b/examples/search_examples/server/fibonacci_strategy.ts
index 93cb18d3e9e82..87419d8fe6be4 100644
--- a/examples/search_examples/server/fibonacci_strategy.ts
+++ b/examples/search_examples/server/fibonacci_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import uuid from 'uuid';
-import { ISearchStrategy } from '../../../src/plugins/data/server';
+import { ISearchStrategy } from '@kbn/data-plugin/server';
 import { FibonacciRequest, FibonacciResponse } from '../common/types';
 
 export const fibonacciStrategyProvider = (): ISearchStrategy<
diff --git a/examples/search_examples/server/index.ts b/examples/search_examples/server/index.ts
index 75c23e8e89257..1b1f69bcb32aa 100644
--- a/examples/search_examples/server/index.ts
+++ b/examples/search_examples/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SearchExamplesPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/examples/search_examples/server/my_strategy.ts b/examples/search_examples/server/my_strategy.ts
index db8cd903f23d6..9eea71b7a6c80 100644
--- a/examples/search_examples/server/my_strategy.ts
+++ b/examples/search_examples/server/my_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import { map } from 'rxjs/operators';
-import { ISearchStrategy, PluginStart } from '../../../src/plugins/data/server';
+import { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
 import { IMyStrategyRequest, IMyStrategyResponse } from '../common/types';
 
 export const mySearchStrategyProvider = (
diff --git a/examples/search_examples/server/plugin.ts b/examples/search_examples/server/plugin.ts
index 992c260e25e9d..57a8b055f9b44 100644
--- a/examples/search_examples/server/plugin.ts
+++ b/examples/search_examples/server/plugin.ts
@@ -12,9 +12,9 @@ import type {
   CoreStart,
   Plugin,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 
 import {
   SearchExamplesPluginSetup,
diff --git a/examples/search_examples/server/routes/register_routes.ts b/examples/search_examples/server/routes/register_routes.ts
index f714ec4a6be8c..badbcda86a4be 100644
--- a/examples/search_examples/server/routes/register_routes.ts
+++ b/examples/search_examples/server/routes/register_routes.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter } from 'kibana/server';
-import { DataRequestHandlerContext } from 'src/plugins/data/server';
+import type { IRouter } from '@kbn/core/server';
+import { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 import { registerServerSearchRoute } from './server_search_route';
 
 export function registerRoutes(router: IRouter<DataRequestHandlerContext>) {
diff --git a/examples/search_examples/server/routes/server_search_route.ts b/examples/search_examples/server/routes/server_search_route.ts
index 0d1302233a39c..d7464561a0abb 100644
--- a/examples/search_examples/server/routes/server_search_route.ts
+++ b/examples/search_examples/server/routes/server_search_route.ts
@@ -7,11 +7,11 @@
  */
 
 import { Observable } from 'rxjs';
-import { IEsSearchRequest } from 'src/plugins/data/server';
+import { IEsSearchRequest } from '@kbn/data-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { IEsSearchResponse } from 'src/plugins/data/common';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
-import type { IRouter } from 'src/core/server';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { IRouter } from '@kbn/core/server';
 import { SERVER_SEARCH_ROUTE_PATH } from '../../common';
 
 export function registerServerSearchRoute(router: IRouter<DataRequestHandlerContext>) {
diff --git a/examples/search_examples/server/types.ts b/examples/search_examples/server/types.ts
index 054645a5b3793..e5d52b040a9a8 100644
--- a/examples/search_examples/server/types.ts
+++ b/examples/search_examples/server/types.ts
@@ -7,7 +7,7 @@
  */
 
 // Rename PluginStart to something better
-import { PluginSetup, PluginStart } from '../../../src/plugins/data/server';
+import { PluginSetup, PluginStart } from '@kbn/data-plugin/server';
 
 export interface SearchExamplesPluginSetupDeps {
   data: PluginSetup;
diff --git a/examples/share_examples/public/plugin.tsx b/examples/share_examples/public/plugin.tsx
index 24ca45e8f5f45..e84264f7cf5d2 100644
--- a/examples/share_examples/public/plugin.tsx
+++ b/examples/share_examples/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SharePluginStart, SharePluginSetup } from '../../../src/plugins/share/public';
-import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 interface SetupDeps {
   share: SharePluginSetup;
diff --git a/examples/state_containers_examples/public/common/example_page.tsx b/examples/state_containers_examples/public/common/example_page.tsx
index ccadf45c9d634..91107066e3bc6 100644
--- a/examples/state_containers_examples/public/common/example_page.tsx
+++ b/examples/state_containers_examples/public/common/example_page.tsx
@@ -8,7 +8,7 @@
 
 import React, { PropsWithChildren } from 'react';
 import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
-import { CoreStart } from '../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
 export interface ExampleLink {
   title: string;
diff --git a/examples/state_containers_examples/public/plugin.ts b/examples/state_containers_examples/public/plugin.ts
index bfc20fd2b48d2..e3c5f4138df06 100644
--- a/examples/state_containers_examples/public/plugin.ts
+++ b/examples/state_containers_examples/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { AppMountParameters, CoreSetup, Plugin, AppNavLinkStatus } from '../../../src/core/public';
+import { AppMountParameters, CoreSetup, Plugin, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { AppPluginDependencies } from './with_data_services/types';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
 import image from './state_sync.png';
 
 interface SetupDeps {
diff --git a/examples/state_containers_examples/public/todo/app.tsx b/examples/state_containers_examples/public/todo/app.tsx
index 9ceba35c1350d..81c067cec7d60 100644
--- a/examples/state_containers_examples/public/todo/app.tsx
+++ b/examples/state_containers_examples/public/todo/app.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { createHashHistory } from 'history';
diff --git a/examples/state_containers_examples/public/todo/todo.tsx b/examples/state_containers_examples/public/todo/todo.tsx
index 33ba8c91583bf..1a4e85fbb0928 100644
--- a/examples/state_containers_examples/public/todo/todo.tsx
+++ b/examples/state_containers_examples/public/todo/todo.tsx
@@ -32,13 +32,13 @@ import {
   StateContainer,
   syncState,
   useContainerSelector,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import {
   defaultState,
   pureTransitions,
   TodoActions,
   TodoState,
-} from '../../../../src/plugins/kibana_utils/demos/state_containers/todomvc';
+} from '@kbn/kibana-utils-plugin/demos/state_containers/todomvc';
 
 interface TodoAppProps {
   filter: 'completed' | 'not-completed' | null;
diff --git a/examples/state_containers_examples/public/with_data_services/app.tsx b/examples/state_containers_examples/public/with_data_services/app.tsx
index 881bc07017966..b61e1fe98f83b 100644
--- a/examples/state_containers_examples/public/with_data_services/app.tsx
+++ b/examples/state_containers_examples/public/with_data_services/app.tsx
@@ -19,8 +19,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { Filter, FilterStateStore } from '@kbn/es-query';
-import { CoreStart } from 'kibana/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import {
   connectToQueryState,
@@ -28,15 +28,15 @@ import {
   Query,
   QueryState,
   syncQueryStateWithUrl,
-} from '../../../../src/plugins/data/public';
-import type { DataView } from '../../../../src/plugins/data_views/public';
+} from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   BaseStateContainer,
   createStateContainer,
   IKbnUrlStateStorage,
   syncState,
   useContainerState,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { ExampleLink, StateContainersExamplesPage } from '../common/example_page';
 
 interface StateDemoAppDeps {
diff --git a/examples/state_containers_examples/public/with_data_services/application.tsx b/examples/state_containers_examples/public/with_data_services/application.tsx
index 0ed69d535ef10..7d4810381583c 100644
--- a/examples/state_containers_examples/public/with_data_services/application.tsx
+++ b/examples/state_containers_examples/public/with_data_services/application.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { AppPluginDependencies } from './types';
 import { App } from './app';
-import { createKbnUrlStateStorage } from '../../../../src/plugins/kibana_utils/public/';
 import { ExampleLink } from '../common/example_page';
 
 export const renderApp = (
diff --git a/examples/state_containers_examples/public/with_data_services/types.ts b/examples/state_containers_examples/public/with_data_services/types.ts
index 20264e4235939..c2e5b8477068f 100644
--- a/examples/state_containers_examples/public/with_data_services/types.ts
+++ b/examples/state_containers_examples/public/with_data_services/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface StateDemoPublicPluginSetup {}
diff --git a/examples/ui_action_examples/public/hello_world_action.tsx b/examples/ui_action_examples/public/hello_world_action.tsx
index d534ef851a29b..8771e5fefbeb3 100644
--- a/examples/ui_action_examples/public/hello_world_action.tsx
+++ b/examples/ui_action_examples/public/hello_world_action.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiText, EuiModalBody, EuiButton } from '@elastic/eui';
-import { OverlayStart } from '../../../src/core/public';
-import { createAction } from '../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../src/plugins/kibana_react/public';
+import { OverlayStart } from '@kbn/core/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export const ACTION_HELLO_WORLD = 'ACTION_HELLO_WORLD';
 
diff --git a/examples/ui_action_examples/public/hello_world_trigger.ts b/examples/ui_action_examples/public/hello_world_trigger.ts
index 72e4aa3584c2a..79f07cb119aa9 100644
--- a/examples/ui_action_examples/public/hello_world_trigger.ts
+++ b/examples/ui_action_examples/public/hello_world_trigger.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Trigger } from '../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const HELLO_WORLD_TRIGGER_ID = 'HELLO_WORLD_TRIGGER_ID';
 
diff --git a/examples/ui_action_examples/public/plugin.ts b/examples/ui_action_examples/public/plugin.ts
index 4845ebf683026..ac113056877cf 100644
--- a/examples/ui_action_examples/public/plugin.ts
+++ b/examples/ui_action_examples/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
-import { UiActionsSetup, UiActionsStart } from '../../../src/plugins/ui_actions/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { createHelloWorldAction } from './hello_world_action';
 import { helloWorldTrigger } from './hello_world_trigger';
 
diff --git a/examples/ui_actions_explorer/public/actions/actions.tsx b/examples/ui_actions_explorer/public/actions/actions.tsx
index 27c3cffe10aff..573778a504df3 100644
--- a/examples/ui_actions_explorer/public/actions/actions.tsx
+++ b/examples/ui_actions_explorer/public/actions/actions.tsx
@@ -7,15 +7,15 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { EuiFieldText, EuiModalBody, EuiButton } from '@elastic/eui';
 import { useState } from 'react';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   ActionExecutionContext,
   createAction,
   UiActionsStart,
-} from '../../../../src/plugins/ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
 
 export const USER_TRIGGER = 'USER_TRIGGER';
 export const COUNTRY_TRIGGER = 'COUNTRY_TRIGGER';
diff --git a/examples/ui_actions_explorer/public/app.tsx b/examples/ui_actions_explorer/public/app.tsx
index e0711edb61eb1..f1f0bcb314c27 100644
--- a/examples/ui_actions_explorer/public/app.tsx
+++ b/examples/ui_actions_explorer/public/app.tsx
@@ -21,10 +21,10 @@ import { EuiFieldText } from '@elastic/eui';
 import { EuiCallOut } from '@elastic/eui';
 import { EuiPageHeader } from '@elastic/eui';
 import { EuiModalBody } from '@elastic/eui';
-import { toMountPoint } from '../../../src/plugins/kibana_react/public';
-import { UiActionsStart, createAction } from '../../../src/plugins/ui_actions/public';
-import { AppMountParameters, OverlayStart } from '../../../src/core/public';
-import { HELLO_WORLD_TRIGGER_ID, ACTION_HELLO_WORLD } from '../../ui_action_examples/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { UiActionsStart, createAction } from '@kbn/ui-actions-plugin/public';
+import { AppMountParameters, OverlayStart } from '@kbn/core/public';
+import { HELLO_WORLD_TRIGGER_ID, ACTION_HELLO_WORLD } from '@kbn/ui-actions-examples-plugin/public';
 import { TriggerContextExample } from './trigger_context_example';
 import { ContextMenuExamples } from './context_menu_examples';
 
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx
index e2b3cc22ffb46..cba6b0685120a 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelEdit: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx
index 1efa095f66994..5b21df930e268 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelEditWithDrilldowns: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx
index f485ec3ebbde1..5c52db946ad79 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_edit_with_drilldowns_and_context_actions.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelEditWithDrilldownsAndContextActions: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx
index 3c515c65a2727..9685510e86fb6 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_view.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelView: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx
index 5b827a5bbef4a..edda0235f4ede 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelViewWithSharing: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx
index c0845b33bc8b4..9b16cedc376f1 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx
+++ b/examples/ui_actions_explorer/public/context_menu_examples/panel_view_with_sharing_long.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import useAsync from 'react-use/lib/useAsync';
-import { buildContextMenuForActions, Action } from '../../../../src/plugins/ui_actions/public';
+import { buildContextMenuForActions, Action } from '@kbn/ui-actions-plugin/public';
 import { sampleAction } from './util';
 
 export const PanelViewWithSharingLong: React.FC = () => {
diff --git a/examples/ui_actions_explorer/public/context_menu_examples/util.ts b/examples/ui_actions_explorer/public/context_menu_examples/util.ts
index faa862dfd4008..b982ec7acedde 100644
--- a/examples/ui_actions_explorer/public/context_menu_examples/util.ts
+++ b/examples/ui_actions_explorer/public/context_menu_examples/util.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Action } from '../../../../src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 
 export const sampleAction = (
   id: string,
diff --git a/examples/ui_actions_explorer/public/plugin.tsx b/examples/ui_actions_explorer/public/plugin.tsx
index ef3c961ab5b4b..045ae2f383ee9 100644
--- a/examples/ui_actions_explorer/public/plugin.tsx
+++ b/examples/ui_actions_explorer/public/plugin.tsx
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { UiActionsStart, UiActionsSetup } from '../../../src/plugins/ui_actions/public';
-import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '../../../src/core/public';
+import { UiActionsStart, UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import {
   PHONE_TRIGGER,
   USER_TRIGGER,
@@ -19,7 +20,6 @@ import {
   showcasePluggability,
   createTriggerPhoneTriggerAction,
 } from './actions/actions';
-import { DeveloperExamplesSetup } from '../../developer_examples/public';
 import image from './ui_actions.png';
 
 interface StartDeps {
diff --git a/examples/ui_actions_explorer/public/trigger_context_example.tsx b/examples/ui_actions_explorer/public/trigger_context_example.tsx
index ca818a8ddaadf..3e94cd253a215 100644
--- a/examples/ui_actions_explorer/public/trigger_context_example.tsx
+++ b/examples/ui_actions_explorer/public/trigger_context_example.tsx
@@ -11,7 +11,7 @@ import { EuiButtonEmpty } from '@elastic/eui';
 import { EuiText } from '@elastic/eui';
 import { EuiDataGrid } from '@elastic/eui';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
-import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { USER_TRIGGER, PHONE_TRIGGER, COUNTRY_TRIGGER, User } from './actions/actions';
 
 export interface Props {
diff --git a/kibana.d.ts b/kibana.d.ts
index 8a7a531890057..8d4f25ef47933 100644
--- a/kibana.d.ts
+++ b/kibana.d.ts
@@ -9,7 +9,7 @@
 /**
  * All exports from TS source files (where the implementation is actually done in TS).
  */
-import * as Public from 'src/core/public';
-import * as Server from 'src/core/server';
+import * as Public from '@kbn/core/public';
+import * as Server from '@kbn/core/server';
 
 export { Public, Server };
diff --git a/nav-kibana-dev.docnav.json b/nav-kibana-dev.docnav.json
index 8542855dbcfe6..517d42c8f72d0 100644
--- a/nav-kibana-dev.docnav.json
+++ b/nav-kibana-dev.docnav.json
@@ -62,7 +62,8 @@
         { "id": "kibDevTutorialCI" },
         { "id": "kibDevTutorialServerEndpoint" },
         { "id": "kibDevTutorialAdvancedSettings" },
-        { "id": "kibDevSharePluginReadme" }
+        { "id": "kibDevSharePluginReadme" },
+        { "id": "kibDevTutorialScreenshotting" }
       ]
     },
     {
@@ -146,6 +147,7 @@
         { "id": "kibSavedObjectsTaggingOssPluginApi" },
         { "id": "kibSavedObjectsTaggingPluginApi" },
         { "id": "kibSavedObjectsPluginApi" },
+        { "id": "kibScreenshottingPluginApi" },
         { "id": "kibSecuritySolutionPluginApi" },
         { "id": "kibSecurityPluginApi" },
         { "id": "kibSharePluginApi" },
diff --git a/package.json b/package.json
index 76948decf33a7..35e8a6451b1e5 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.2",
     "@elastic/ems-client": "8.2.0",
-    "@elastic/eui": "53.0.1",
+    "@elastic/eui": "54.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
@@ -117,10 +117,10 @@
     "@elastic/request-crypto": "2.0.1",
     "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
     "@elastic/search-ui-app-search-connector": "^1.6.0",
-    "@emotion/cache": "^11.4.0",
-    "@emotion/css": "^11.4.0",
-    "@emotion/react": "^11.4.0",
-    "@emotion/serialize": "^1.0.2",
+    "@emotion/cache": "^11.7.1",
+    "@emotion/css": "^11.9.0",
+    "@emotion/react": "^11.9.0",
+    "@emotion/serialize": "^1.0.3",
     "@hapi/accept": "^5.0.2",
     "@hapi/boom": "^9.1.4",
     "@hapi/cookie": "^11.0.2",
@@ -173,6 +173,7 @@
     "@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils",
     "@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools",
     "@kbn/server-route-repository": "link:bazel-bin/packages/kbn-server-route-repository",
+    "@kbn/shared-ux-button-exit-full-screen": "link:bazel-bin/packages/shared-ux/button/exit_full_screen",
     "@kbn/shared-ux-components": "link:bazel-bin/packages/kbn-shared-ux-components",
     "@kbn/shared-ux-services": "link:bazel-bin/packages/kbn-shared-ux-services",
     "@kbn/shared-ux-storybook": "link:bazel-bin/packages/kbn-shared-ux-storybook",
@@ -193,6 +194,7 @@
     "@mapbox/geojson-rewind": "^0.5.0",
     "@mapbox/mapbox-gl-draw": "1.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
+    "@mapbox/vector-tile": "1.3.1",
     "@reduxjs/toolkit": "^1.6.1",
     "@slack/webhook": "^5.0.4",
     "@turf/along": "6.0.1",
@@ -207,6 +209,7 @@
     "@turf/length": "^6.0.2",
     "@types/elastic__analytics": "link:bazel-bin/packages/elastic-analytics/npm_module_types",
     "@types/jsonwebtoken": "^8.5.6",
+    "@types/mapbox__vector-tile": "1.3.0",
     "@types/moment-duration-format": "^2.2.3",
     "JSONStream": "1.3.5",
     "abort-controller": "^3.0.0",
@@ -223,7 +226,7 @@
     "chokidar": "^3.4.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
-    "color": "1.0.3",
+    "color": "^4.2.3",
     "commander": "^4.1.1",
     "compare-versions": "3.5.1",
     "constate": "^1.3.2",
@@ -329,6 +332,7 @@
     "p-map": "^4.0.0",
     "p-retry": "^4.2.0",
     "papaparse": "^5.2.0",
+    "pbf": "3.2.1",
     "pdfmake": "^0.2.4",
     "peggy": "^1.2.0",
     "pluralize": "3.1.0",
@@ -383,7 +387,7 @@
     "redux-actions": "^2.6.5",
     "redux-devtools-extension": "^2.13.8",
     "redux-logger": "^3.0.6",
-    "redux-observable": "^1.2.0",
+    "redux-observable": "2.0.0",
     "redux-saga": "^1.1.3",
     "redux-thunk": "^2.3.0",
     "redux-thunks": "^1.0.0",
@@ -394,7 +398,7 @@
     "reselect": "^4.0.0",
     "resize-observer-polyfill": "^1.5.1",
     "rison-node": "1.0.2",
-    "rxjs": "^6.5.5",
+    "rxjs": "^7.5.5",
     "safe-squel": "^5.12.5",
     "seedrandom": "^3.0.5",
     "semver": "^7.3.2",
@@ -441,6 +445,7 @@
     "@babel/eslint-parser": "^7.17.0",
     "@babel/eslint-plugin": "^7.17.7",
     "@babel/generator": "^7.17.7",
+    "@babel/helper-plugin-utils": "^7.16.7",
     "@babel/parser": "^7.17.8",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
@@ -456,7 +461,7 @@
     "@babel/traverse": "^7.17.3",
     "@babel/types": "^7.17.0",
     "@bazel/ibazel": "^0.16.2",
-    "@bazel/typescript": "5.3.1",
+    "@bazel/typescript": "4.6.2",
     "@cypress/code-coverage": "^3.9.12",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.6.0",
@@ -466,13 +471,13 @@
     "@elastic/makelogs": "^6.0.0",
     "@elastic/synthetics": "^1.0.0-beta.22",
     "@emotion/babel-preset-css-prop": "^11.2.0",
-    "@emotion/jest": "^11.3.0",
+    "@emotion/jest": "^11.9.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@istanbuljs/schema": "^0.1.2",
     "@jest/console": "^26.6.2",
     "@jest/reporters": "^26.6.2",
     "@kbn/axe-config": "link:bazel-bin/packages/kbn-axe-config",
-    "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
+    "@kbn/babel-plugin-synthetic-packages": "link:bazel-bin/packages/kbn-babel-plugin-synthetic-packages",
     "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
     "@kbn/bazel-packages": "link:bazel-bin/packages/kbn-bazel-packages",
     "@kbn/cli-dev-mode": "link:bazel-bin/packages/kbn-cli-dev-mode",
@@ -482,13 +487,16 @@
     "@kbn/es-archiver": "link:bazel-bin/packages/kbn-es-archiver",
     "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
     "@kbn/expect": "link:bazel-bin/packages/kbn-expect",
+    "@kbn/find-used-node-modules": "link:bazel-bin/packages/kbn-find-used-node-modules",
     "@kbn/generate": "link:bazel-bin/packages/kbn-generate",
+    "@kbn/import-resolver": "link:bazel-bin/packages/kbn-import-resolver",
     "@kbn/optimizer": "link:bazel-bin/packages/kbn-optimizer",
     "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator",
     "@kbn/plugin-helpers": "link:bazel-bin/packages/kbn-plugin-helpers",
     "@kbn/pm": "link:packages/kbn-pm",
     "@kbn/spec-to-console": "link:bazel-bin/packages/kbn-spec-to-console",
     "@kbn/storybook": "link:bazel-bin/packages/kbn-storybook",
+    "@kbn/synthetic-package-map": "link:bazel-bin/packages/kbn-synthetic-package-map",
     "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools",
     "@kbn/test": "link:bazel-bin/packages/kbn-test",
     "@kbn/test-jest-helpers": "link:bazel-bin/packages/kbn-test-jest-helpers",
@@ -524,13 +532,14 @@
     "@types/apidoc": "^0.22.3",
     "@types/archiver": "^5.1.0",
     "@types/babel__core": "^7.1.19",
+    "@types/babel__helper-plugin-utils": "^7.10.0",
     "@types/base64-js": "^1.2.5",
     "@types/chance": "^1.0.0",
     "@types/chroma-js": "^1.4.2",
     "@types/chromedriver": "^81.0.1",
     "@types/classnames": "^2.2.9",
     "@types/cmd-shim": "^2.0.0",
-    "@types/color": "^3.0.0",
+    "@types/color": "^3.0.3",
     "@types/compression-webpack-plugin": "^2.0.2",
     "@types/cypress-cucumber-preprocessor": "^1.14.1",
     "@types/cytoscape": "^3.14.0",
@@ -603,9 +612,11 @@
     "@types/kbn__es-query": "link:bazel-bin/packages/kbn-es-query/npm_module_types",
     "@types/kbn__eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports/npm_module_types",
     "@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",
+    "@types/kbn__find-used-node-modules": "link:bazel-bin/packages/kbn-find-used-node-modules/npm_module_types",
     "@types/kbn__generate": "link:bazel-bin/packages/kbn-generate/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
     "@types/kbn__i18n-react": "link:bazel-bin/packages/kbn-i18n-react/npm_module_types",
+    "@types/kbn__import-resolver": "link:bazel-bin/packages/kbn-import-resolver/npm_module_types",
     "@types/kbn__interpreter": "link:bazel-bin/packages/kbn-interpreter/npm_module_types",
     "@types/kbn__io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module_types",
     "@types/kbn__logging": "link:bazel-bin/packages/kbn-logging/npm_module_types",
@@ -634,6 +645,7 @@
     "@types/kbn__securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module_types",
     "@types/kbn__server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools/npm_module_types",
     "@types/kbn__server-route-repository": "link:bazel-bin/packages/kbn-server-route-repository/npm_module_types",
+    "@types/kbn__shared-ux-button-exit-full-screen": "link:bazel-bin/packages/shared-ux/button/exit_full_screen/npm_module_types",
     "@types/kbn__shared-ux-components": "link:bazel-bin/packages/kbn-shared-ux-components/npm_module_types",
     "@types/kbn__shared-ux-services": "link:bazel-bin/packages/kbn-shared-ux-services/npm_module_types",
     "@types/kbn__shared-ux-storybook": "link:bazel-bin/packages/kbn-shared-ux-storybook/npm_module_types",
@@ -677,6 +689,7 @@
     "@types/ora": "^1.3.5",
     "@types/papaparse": "^5.0.3",
     "@types/parse-link-header": "^1.0.0",
+    "@types/pbf": "3.0.2",
     "@types/pdfmake": "^0.1.19",
     "@types/pegjs": "^0.10.1",
     "@types/pngjs": "^3.4.0",
@@ -911,7 +924,7 @@
     "tough-cookie": "^4.0.0",
     "ts-loader": "^7.0.5",
     "ts-morph": "^13.0.2",
-    "tsd": "^0.13.1",
+    "tsd": "^0.20.0",
     "typescript": "4.6.3",
     "unlazy-loader": "^0.1.3",
     "url-loader": "^2.2.0",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 61104d1afcac0..3e05f7f745b6e 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -21,7 +21,7 @@ filegroup(
     "//packages/kbn-apm-config-loader:build",
     "//packages/kbn-apm-utils:build",
     "//packages/kbn-axe-config:build",
-    "//packages/kbn-babel-code-parser:build",
+    "//packages/kbn-babel-plugin-synthetic-packages:build",
     "//packages/kbn-babel-preset:build",
     "//packages/kbn-bazel-packages:build",
     "//packages/kbn-cli-dev-mode:build",
@@ -40,10 +40,12 @@ filegroup(
     "//packages/kbn-eslint-plugin-imports:build",
     "//packages/kbn-expect:build",
     "//packages/kbn-field-types:build",
+    "//packages/kbn-find-used-node-modules:build",
     "//packages/kbn-flot-charts:build",
     "//packages/kbn-generate:build",
     "//packages/kbn-i18n-react:build",
     "//packages/kbn-i18n:build",
+    "//packages/kbn-import-resolver:build",
     "//packages/kbn-interpreter:build",
     "//packages/kbn-io-ts-utils:build",
     "//packages/kbn-logging-mocks:build",
@@ -79,6 +81,7 @@ filegroup(
     "//packages/kbn-spec-to-console:build",
     "//packages/kbn-std:build",
     "//packages/kbn-storybook:build",
+    "//packages/kbn-synthetic-package-map:build",
     "//packages/kbn-telemetry-tools:build",
     "//packages/kbn-test-jest-helpers:build",
     "//packages/kbn-test-subj-selector:build",
@@ -93,6 +96,7 @@ filegroup(
     "//packages/kbn-ui-theme:build",
     "//packages/kbn-utility-types:build",
     "//packages/kbn-utils:build",
+    "//packages/shared-ux/button/exit_full_screen:build",
   ],
 )
 
@@ -123,9 +127,11 @@ filegroup(
     "//packages/kbn-es-query:build_types",
     "//packages/kbn-eslint-plugin-imports:build_types",
     "//packages/kbn-field-types:build_types",
+    "//packages/kbn-find-used-node-modules:build_types",
     "//packages/kbn-generate:build_types",
     "//packages/kbn-i18n-react:build_types",
     "//packages/kbn-i18n:build_types",
+    "//packages/kbn-import-resolver:build_types",
     "//packages/kbn-interpreter:build_types",
     "//packages/kbn-io-ts-utils:build_types",
     "//packages/kbn-logging-mocks:build_types",
@@ -170,6 +176,7 @@ filegroup(
     "//packages/kbn-ui-theme:build_types",
     "//packages/kbn-utility-types:build_types",
     "//packages/kbn-utils:build_types",
+    "//packages/shared-ux/button/exit_full_screen:build_types",
   ],
 )
 
diff --git a/packages/elastic-analytics/BUILD.bazel b/packages/elastic-analytics/BUILD.bazel
index a73c908c7ea52..dcf9d33772542 100644
--- a/packages/elastic-analytics/BUILD.bazel
+++ b/packages/elastic-analytics/BUILD.bazel
@@ -36,6 +36,7 @@ NPM_MODULE_EXTRA_FILES = [
 #    "@npm//name-of-package"
 #    eg. "@npm//lodash"
 RUNTIME_DEPS = [
+  "@npm//moment",
   "@npm//rxjs",
 ]
 
@@ -51,6 +52,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "@npm//@types/node",
   "@npm//@types/jest",
+  "@npm//moment",
   "@npm//rxjs",
   "//packages/kbn-logging:npm_module_types",
   "//packages/kbn-logging-mocks:npm_module_types",
diff --git a/packages/elastic-analytics/src/analytics_client/analytics_client.test.ts b/packages/elastic-analytics/src/analytics_client/analytics_client.test.ts
index 05b5f6c40dc7b..08515ecae8d1e 100644
--- a/packages/elastic-analytics/src/analytics_client/analytics_client.test.ts
+++ b/packages/elastic-analytics/src/analytics_client/analytics_client.test.ts
@@ -8,7 +8,7 @@
 
 // eslint-disable-next-line max-classes-per-file
 import type { Observable } from 'rxjs';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, lastValueFrom, Subject } from 'rxjs';
 import type { MockedLogger } from '@kbn/logging-mocks';
 import { loggerMock } from '@kbn/logging-mocks';
 import { AnalyticsClient } from './analytics_client';
@@ -113,14 +113,14 @@ describe('AnalyticsClient', () => {
         },
       });
 
-      // eslint-disable-next-line dot-notation
-      const internalQueuePromise = analyticsClient['internalEventQueue$']
-        .pipe(take(3), toArray())
-        .toPromise();
+      const internalQueuePromise = lastValueFrom(
+        // eslint-disable-next-line dot-notation
+        analyticsClient['internalEventQueue$'].pipe(take(3), toArray())
+      );
 
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3), toArray())
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3), toArray())
+      );
 
       analyticsClient.reportEvent('testEvent', { a_field: 'a' });
       analyticsClient.reportEvent('testEvent', { a_field: 'b' });
@@ -259,7 +259,7 @@ describe('AnalyticsClient', () => {
       // Typescript also helps with the config type inference <3
       analyticsClient.registerShipper(MockedShipper, { telemetryCounter$: mockTelemetryCounter$ });
 
-      const counterEventPromise = analyticsClient.telemetryCounter$.pipe(take(1)).toPromise();
+      const counterEventPromise = lastValueFrom(analyticsClient.telemetryCounter$.pipe(take(1)));
 
       const counter: TelemetryCounter = {
         type: TelemetryCounterType.succeeded,
@@ -383,7 +383,7 @@ describe('AnalyticsClient', () => {
         context$,
       });
 
-      const globalContextPromise = globalContext$.pipe(take(2), toArray()).toPromise();
+      const globalContextPromise = lastValueFrom(globalContext$.pipe(take(2), toArray()));
       context$.next({ a_field: true });
       await expect(globalContextPromise).resolves.toEqual([
         {}, // Original empty state
@@ -392,7 +392,7 @@ describe('AnalyticsClient', () => {
     });
 
     test('It does not break if context emits `undefined`', async () => {
-      const context$ = new Subject<{ a_field: boolean }>();
+      const context$ = new Subject<{ a_field: boolean } | undefined | void>();
       analyticsClient.registerContextProvider({
         name: 'contextProviderA',
         schema: {
@@ -406,7 +406,7 @@ describe('AnalyticsClient', () => {
         context$,
       });
 
-      const globalContextPromise = globalContext$.pipe(take(3), toArray()).toPromise();
+      const globalContextPromise = lastValueFrom(globalContext$.pipe(take(3), toArray()));
       context$.next();
       context$.next(undefined);
       await expect(globalContextPromise).resolves.toEqual([
@@ -431,7 +431,7 @@ describe('AnalyticsClient', () => {
         context$,
       });
 
-      const globalContextPromise = globalContext$.pipe(take(1), toArray()).toPromise();
+      const globalContextPromise = lastValueFrom(globalContext$.pipe(take(1), toArray()));
       await expect(globalContextPromise).resolves.toEqual([
         { a_field: true }, // No original empty state
       ]);
@@ -473,7 +473,7 @@ describe('AnalyticsClient', () => {
         context$: contextB$,
       });
 
-      const globalContextPromise = globalContext$.pipe(take(6), toArray()).toPromise();
+      const globalContextPromise = lastValueFrom(globalContext$.pipe(take(6), toArray()));
       contextA$.next({ a_field: true });
       contextB$.next({ b_field: 1 });
       contextB$.next({ a_field: false, b_field: 1 });
@@ -512,7 +512,7 @@ describe('AnalyticsClient', () => {
         context$,
       });
 
-      const globalContextPromise = globalContext$.pipe(take(6), toArray()).toPromise();
+      const globalContextPromise = lastValueFrom(globalContext$.pipe(take(6), toArray()));
       context$.next({ b_field: 1 });
       context$.next({ a_field: false, b_field: 1 });
       context$.next({ a_field: true, b_field: 1 });
@@ -528,6 +528,44 @@ describe('AnalyticsClient', () => {
       ]);
     });
 
+    test('The undefined values are not forwarded to the global context', async () => {
+      const context$ = new Subject<{ a_field?: boolean; b_field: number }>();
+      analyticsClient.registerContextProvider({
+        name: 'contextProviderA',
+        schema: {
+          a_field: {
+            type: 'boolean',
+            _meta: {
+              description: 'a_field description',
+              optional: true,
+            },
+          },
+          b_field: {
+            type: 'long',
+            _meta: {
+              description: 'b_field description',
+            },
+          },
+        },
+        context$,
+      });
+
+      const globalContextPromise = firstValueFrom(globalContext$.pipe(take(6), toArray()));
+      context$.next({ b_field: 1 });
+      context$.next({ a_field: false, b_field: 1 });
+      context$.next({ a_field: true, b_field: 1 });
+      context$.next({ b_field: 1 });
+      context$.next({ a_field: undefined, b_field: 2 });
+      await expect(globalContextPromise).resolves.toEqual([
+        {}, // Original empty state
+        { b_field: 1 },
+        { a_field: false, b_field: 1 },
+        { a_field: true, b_field: 1 },
+        { b_field: 1 }, // a_field is removed because the context provider removed it.
+        { b_field: 2 }, // a_field is not forwarded because it is `undefined`
+      ]);
+    });
+
     test('Fails to register 2 context providers with the same name', () => {
       analyticsClient.registerContextProvider({
         name: 'contextProviderA',
@@ -582,7 +620,7 @@ describe('AnalyticsClient', () => {
         context$,
       });
 
-      const globalContextPromise = globalContext$.pipe(take(4), toArray()).toPromise();
+      const globalContextPromise = lastValueFrom(globalContext$.pipe(take(4), toArray()));
       context$.next({ a_field: true });
       // The size of the registry grows on the first emission
       expect(contextProvidersRegistry.size).toBe(1);
@@ -736,11 +774,11 @@ describe('AnalyticsClient', () => {
       // eslint-disable-next-line dot-notation
       const internalEventQueue$ = analyticsClient['internalEventQueue$'];
 
-      const internalQueuePromise = internalEventQueue$.pipe(take(2), toArray()).toPromise();
+      const internalQueuePromise = lastValueFrom(internalEventQueue$.pipe(take(2), toArray()));
 
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(2), toArray())
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(2), toArray())
+      );
 
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
       analyticsClient.reportEvent('event-type-b', { b_field: 100 });
@@ -781,9 +819,9 @@ describe('AnalyticsClient', () => {
     });
 
     test('Sends events from the internal queue when there are shippers and an opt-in response is true', async () => {
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3 + 2), toArray()) // Waiting for 3 enqueued + 2 batch-shipped events
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3 + 2), toArray()) // Waiting for 3 enqueued + 2 batch-shipped events
+      );
 
       // Send multiple events of 1 type to test the grouping logic as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
@@ -862,9 +900,9 @@ describe('AnalyticsClient', () => {
     });
 
     test('Discards events from the internal queue when there are shippers and an opt-in response is false', async () => {
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3), toArray()) // Waiting for 3 enqueued
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3), toArray()) // Waiting for 3 enqueued
+      );
 
       // Send multiple events of 1 type to test the grouping logic as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
@@ -904,9 +942,9 @@ describe('AnalyticsClient', () => {
     });
 
     test('Discards only one type of the enqueued events based on event_type config', async () => {
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3 + 1), toArray()) // Waiting for 3 enqueued + 1 batch-shipped events
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3 + 1), toArray()) // Waiting for 3 enqueued + 1 batch-shipped events
+      );
 
       // Send multiple events of 1 type to test the grouping logic as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
@@ -965,9 +1003,9 @@ describe('AnalyticsClient', () => {
     });
 
     test('Discards the event at the shipper level (for a specific event)', async () => {
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3 + 2), toArray()) // Waiting for 3 enqueued + 2 batch-shipped events
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3 + 2), toArray()) // Waiting for 3 enqueued + 2 batch-shipped events
+      );
 
       // Send multiple events of 1 type to test the grouping logic as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
@@ -1061,9 +1099,9 @@ describe('AnalyticsClient', () => {
     });
 
     test('Discards all the events at the shipper level (globally disabled)', async () => {
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3 + 2), toArray()) // Waiting for 3 enqueued + 2 batch-shipped events
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3 + 2), toArray()) // Waiting for 3 enqueued + 2 batch-shipped events
+      );
 
       // Send multiple events of 1 type to test the grouping logic as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
@@ -1154,9 +1192,9 @@ describe('AnalyticsClient', () => {
       analyticsClient.registerShipper(MockedShipper1, { reportEventsMock });
       analyticsClient.optIn({ global: { enabled: false } });
 
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3), toArray()) // Waiting for 3 enqueued
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3), toArray()) // Waiting for 3 enqueued
+      );
 
       // Send multiple events of 1 type to test the non-grouping logic at this stage as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
@@ -1197,9 +1235,9 @@ describe('AnalyticsClient', () => {
       analyticsClient.registerShipper(MockedShipper1, { reportEventsMock });
       analyticsClient.optIn({ global: { enabled: true } });
 
-      const telemetryCounterPromise = analyticsClient.telemetryCounter$
-        .pipe(take(3 * 2), toArray()) // Waiting for 2 events per each reportEvent call: enqueued and sent_to_shipper
-        .toPromise();
+      const telemetryCounterPromise = lastValueFrom(
+        analyticsClient.telemetryCounter$.pipe(take(3 * 2), toArray()) // Waiting for 2 events per each reportEvent call: enqueued and sent_to_shipper
+      );
 
       // Send multiple events of 1 type to test the non-grouping logic at this stage as well
       analyticsClient.reportEvent('event-type-a', { a_field: 'a' });
diff --git a/packages/elastic-analytics/src/analytics_client/context_service.ts b/packages/elastic-analytics/src/analytics_client/context_service.ts
index cee3e56b389d1..7c3f3c8327eb7 100644
--- a/packages/elastic-analytics/src/analytics_client/context_service.ts
+++ b/packages/elastic-analytics/src/analytics_client/context_service.ts
@@ -69,9 +69,21 @@ export class ContextService {
       [...this.contextProvidersRegistry.values()].reduce((acc, context) => {
         return {
           ...acc,
-          ...context,
+          ...this.removeEmptyValues(context),
         };
       }, {} as Partial<EventContext>)
     );
   }
+
+  private removeEmptyValues(context?: Partial<EventContext>) {
+    if (!context) {
+      return {};
+    }
+    return Object.keys(context).reduce((acc, key) => {
+      if (context[key] !== undefined) {
+        acc[key] = context[key];
+      }
+      return acc;
+    }, {} as Partial<EventContext>);
+  }
 }
diff --git a/packages/elastic-analytics/src/events/types.ts b/packages/elastic-analytics/src/events/types.ts
index 8523b7791150a..5f1f587d3b284 100644
--- a/packages/elastic-analytics/src/events/types.ts
+++ b/packages/elastic-analytics/src/events/types.ts
@@ -8,7 +8,34 @@
 
 import type { ShipperName } from '../analytics_client';
 
+/**
+ * Definition of the context that can be appended to the events through the {@link IAnalyticsClient.registerContextProvider}.
+ */
 export interface EventContext {
+  /**
+   * The unique user ID.
+   */
+  userId?: string;
+  /**
+   * The user's organization ID.
+   */
+  esOrgId?: string;
+  /**
+   * The product's version.
+   */
+  version?: string;
+  /**
+   * The name of the current page.
+   */
+  pageName?: string;
+  /**
+   * The current application ID.
+   */
+  applicationId?: string;
+  /**
+   * The current entity ID (dashboard ID, visualization ID, etc.).
+   */
+  entityId?: string;
   // TODO: Extend with known keys
   [key: string]: unknown;
 }
diff --git a/packages/elastic-analytics/src/index.ts b/packages/elastic-analytics/src/index.ts
index 382974783aeb1..c22ea702c5be8 100644
--- a/packages/elastic-analytics/src/index.ts
+++ b/packages/elastic-analytics/src/index.ts
@@ -36,8 +36,10 @@ export type {
   // Types for the registerEventType API
   EventTypeOpts,
 } from './analytics_client';
+
 export type { Event, EventContext, EventType, TelemetryCounter } from './events';
 export { TelemetryCounterType } from './events';
+
 export type {
   RootSchema,
   SchemaObject,
@@ -52,4 +54,6 @@ export type {
   AllowedSchemaStringTypes,
   AllowedSchemaTypes,
 } from './schema';
-export type { IShipper } from './shippers';
+
+export type { IShipper, FullStorySnippetConfig, FullStoryShipperConfig } from './shippers';
+export { FullStoryShipper } from './shippers';
diff --git a/packages/elastic-analytics/src/shippers/fullstory/format_payload.test.ts b/packages/elastic-analytics/src/shippers/fullstory/format_payload.test.ts
new file mode 100644
index 0000000000000..6f9ad05bc9da7
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/format_payload.test.ts
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { formatPayload } from './format_payload';
+
+describe('formatPayload', () => {
+  test('appends `_str` to string values', () => {
+    const payload = {
+      foo: 'bar',
+      baz: ['qux'],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_str: payload.foo,
+      baz_strs: payload.baz,
+    });
+  });
+
+  test('appends `_int` to integer values', () => {
+    const payload = {
+      foo: 1,
+      baz: [100000],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_int: payload.foo,
+      baz_ints: payload.baz,
+    });
+  });
+
+  test('appends `_real` to integer values', () => {
+    const payload = {
+      foo: 1.5,
+      baz: [100000.5],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_real: payload.foo,
+      baz_reals: payload.baz,
+    });
+  });
+
+  test('appends `_bool` to booleans values', () => {
+    const payload = {
+      foo: true,
+      baz: [false],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_bool: payload.foo,
+      baz_bools: payload.baz,
+    });
+  });
+
+  test('appends `_date` to Date values', () => {
+    const payload = {
+      foo: new Date(),
+      baz: [new Date()],
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      foo_date: payload.foo,
+      baz_dates: payload.baz,
+    });
+  });
+
+  test('supports nested values', () => {
+    const payload = {
+      nested: {
+        foo: 'bar',
+        baz: ['qux'],
+      },
+    };
+
+    expect(formatPayload(payload)).toEqual({
+      nested: {
+        foo_str: payload.nested.foo,
+        baz_strs: payload.nested.baz,
+      },
+    });
+  });
+
+  test('does not mutate reserved keys', () => {
+    const payload = {
+      uid: 'uid',
+      displayName: 'displayName',
+      email: 'email',
+      acctId: 'acctId',
+      website: 'website',
+      pageName: 'pageName',
+    };
+
+    expect(formatPayload(payload)).toEqual(payload);
+  });
+
+  test('removes undefined values', () => {
+    const payload = {
+      foo: undefined,
+      baz: [undefined],
+    };
+
+    expect(formatPayload(payload)).toEqual({});
+  });
+
+  test('throws if null is provided', () => {
+    const payload = {
+      foo: null,
+      baz: [null],
+    };
+
+    expect(() => formatPayload(payload)).toThrowErrorMatchingInlineSnapshot(
+      `"Unsupported type: object"`
+    );
+  });
+
+  describe('String to Date identification', () => {
+    test('appends `_date` to ISO string values', () => {
+      const payload = {
+        foo: new Date().toISOString(),
+        baz: [new Date().toISOString()],
+      };
+
+      expect(formatPayload(payload)).toEqual({
+        foo_date: payload.foo,
+        baz_dates: payload.baz,
+      });
+    });
+
+    test('appends `_str` to random string values', () => {
+      const payload = {
+        foo: 'test-1',
+        baz: ['test-1'],
+      };
+
+      expect(formatPayload(payload)).toEqual({
+        foo_str: payload.foo,
+        baz_strs: payload.baz,
+      });
+    });
+  });
+});
diff --git a/packages/elastic-analytics/src/shippers/fullstory/format_payload.ts b/packages/elastic-analytics/src/shippers/fullstory/format_payload.ts
new file mode 100644
index 0000000000000..c55ed2409da50
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/format_payload.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import moment from 'moment';
+
+// https://help.fullstory.com/hc/en-us/articles/360020623234#reserved-properties
+const FULLSTORY_RESERVED_PROPERTIES = [
+  'uid',
+  'displayName',
+  'email',
+  'acctId',
+  'website',
+  // https://developer.fullstory.com/page-variables
+  'pageName',
+];
+
+export function formatPayload(context: Record<string, unknown>): Record<string, unknown> {
+  // format context keys as required for env vars, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
+  return Object.fromEntries(
+    Object.entries(context)
+      // Discard any undefined values
+      .map<[string, unknown]>(([key, value]) => {
+        return Array.isArray(value)
+          ? [key, value.filter((v) => typeof v !== 'undefined')]
+          : [key, value];
+      })
+      .filter(
+        ([, value]) => typeof value !== 'undefined' && (!Array.isArray(value) || value.length > 0)
+      )
+      // Transform key names according to the FullStory needs
+      .map(([key, value]) => {
+        if (FULLSTORY_RESERVED_PROPERTIES.includes(key)) {
+          return [key, value];
+        }
+        if (isRecord(value)) {
+          return [key, formatPayload(value)];
+        }
+        const valueType = getFullStoryType(value);
+        const formattedKey = valueType ? `${key}_${valueType}` : key;
+        return [formattedKey, value];
+      })
+  );
+}
+
+function getFullStoryType(value: unknown) {
+  // For arrays, make the decision based on the first element
+  const isArray = Array.isArray(value);
+  const v = isArray ? value[0] : value;
+  let type: string;
+  switch (typeof v) {
+    case 'string':
+      type = moment(v, moment.ISO_8601, true).isValid() ? 'date' : 'str';
+      break;
+    case 'number':
+      type = Number.isInteger(v) ? 'int' : 'real';
+      break;
+    case 'boolean':
+      type = 'bool';
+      break;
+    case 'object':
+      if (isDate(v)) {
+        type = 'date';
+        break;
+      }
+    default:
+      throw new Error(`Unsupported type: ${typeof v}`);
+  }
+
+  // convert to plural form for arrays
+  return isArray ? `${type}s` : type;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value) && !isDate(value);
+}
+
+function isDate(value: unknown): value is Date {
+  return value instanceof Date;
+}
diff --git a/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.test.mocks.ts b/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.test.mocks.ts
new file mode 100644
index 0000000000000..fadd1ffee2ae0
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.test.mocks.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { FullStoryApi } from './types';
+
+export const fullStoryApiMock: jest.Mocked<FullStoryApi> = {
+  identify: jest.fn(),
+  setUserVars: jest.fn(),
+  setVars: jest.fn(),
+  consent: jest.fn(),
+  restart: jest.fn(),
+  shutdown: jest.fn(),
+  event: jest.fn(),
+};
+jest.doMock('./load_snippet', () => {
+  return {
+    loadSnippet: () => fullStoryApiMock,
+  };
+});
diff --git a/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.test.ts b/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.test.ts
new file mode 100644
index 0000000000000..67797a629c828
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.test.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { loggerMock } from '@kbn/logging-mocks';
+import { fullStoryApiMock } from './fullstory_shipper.test.mocks';
+import { FullStoryShipper } from './fullstory_shipper';
+
+describe('FullStoryShipper', () => {
+  let fullstoryShipper: FullStoryShipper;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    fullstoryShipper = new FullStoryShipper(
+      {
+        debug: true,
+        fullStoryOrgId: 'test-org-id',
+      },
+      {
+        logger: loggerMock.create(),
+        sendTo: 'staging',
+        isDev: true,
+      }
+    );
+  });
+
+  describe('extendContext', () => {
+    describe('FS.identify', () => {
+      test('calls `identify` when the userId is provided', () => {
+        const userId = 'test-user-id';
+        fullstoryShipper.extendContext({ userId });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(userId);
+      });
+
+      test('calls `identify` again only if the userId changes', () => {
+        const userId = 'test-user-id';
+        fullstoryShipper.extendContext({ userId });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledTimes(1);
+        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(userId);
+
+        fullstoryShipper.extendContext({ userId });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledTimes(1); // still only called once
+
+        fullstoryShipper.extendContext({ userId: `${userId}-1` });
+        expect(fullStoryApiMock.identify).toHaveBeenCalledTimes(2); // called again because the user changed
+        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(`${userId}-1`);
+      });
+    });
+
+    describe('FS.setUserVars', () => {
+      test('calls `setUserVars` when version is provided', () => {
+        fullstoryShipper.extendContext({ version: '1.2.3' });
+        expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+          version_str: '1.2.3',
+          version_major_int: 1,
+          version_minor_int: 2,
+          version_patch_int: 3,
+        });
+      });
+
+      test('calls `setUserVars` when esOrgId is provided', () => {
+        fullstoryShipper.extendContext({ esOrgId: 'test-es-org-id' });
+        expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({ org_id_str: 'test-es-org-id' });
+      });
+
+      test('merges both: version and esOrgId if both are provided', () => {
+        fullstoryShipper.extendContext({ version: '1.2.3', esOrgId: 'test-es-org-id' });
+        expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+          org_id_str: 'test-es-org-id',
+          version_str: '1.2.3',
+          version_major_int: 1,
+          version_minor_int: 2,
+          version_patch_int: 3,
+        });
+      });
+    });
+
+    describe('FS.setVars', () => {
+      test('adds the rest of the context to `setVars`', () => {
+        const context = {
+          userId: 'test-user-id',
+          version: '1.2.3',
+          esOrgId: 'test-es-org-id',
+          foo: 'bar',
+        };
+        fullstoryShipper.extendContext(context);
+        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', { foo_str: 'bar' });
+      });
+    });
+  });
+
+  describe('optIn', () => {
+    test('should call consent true and restart when isOptIn: true', () => {
+      fullstoryShipper.optIn(true);
+      expect(fullStoryApiMock.consent).toHaveBeenCalledWith(true);
+      expect(fullStoryApiMock.restart).toHaveBeenCalled();
+    });
+
+    test('should call consent false and shutdown when isOptIn: false', () => {
+      fullstoryShipper.optIn(false);
+      expect(fullStoryApiMock.consent).toHaveBeenCalledWith(false);
+      expect(fullStoryApiMock.shutdown).toHaveBeenCalled();
+    });
+  });
+
+  describe('reportEvents', () => {
+    test('calls the API once per event in the array with the properties transformed', () => {
+      fullstoryShipper.reportEvents([
+        {
+          event_type: 'test-event-1',
+          timestamp: '2020-01-01T00:00:00.000Z',
+          properties: { test: 'test-1' },
+          context: { pageName: 'test-page-1' },
+        },
+        {
+          event_type: 'test-event-2',
+          timestamp: '2020-01-01T00:00:00.000Z',
+          properties: { test: 'test-2' },
+          context: { pageName: 'test-page-1' },
+        },
+      ]);
+
+      expect(fullStoryApiMock.event).toHaveBeenCalledTimes(2);
+      expect(fullStoryApiMock.event).toHaveBeenCalledWith('test-event-1', {
+        test_str: 'test-1',
+      });
+      expect(fullStoryApiMock.event).toHaveBeenCalledWith('test-event-2', {
+        test_str: 'test-2',
+      });
+    });
+  });
+});
diff --git a/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.ts b/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.ts
new file mode 100644
index 0000000000000..ff953393b9ddb
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/fullstory_shipper.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { IShipper } from '../types';
+import type { AnalyticsClientInitContext } from '../../analytics_client';
+import type { EventContext, Event } from '../../events';
+import type { FullStoryApi } from './types';
+import type { FullStorySnippetConfig } from './load_snippet';
+import { getParsedVersion } from './get_parsed_version';
+import { formatPayload } from './format_payload';
+import { loadSnippet } from './load_snippet';
+
+export type FullStoryShipperConfig = FullStorySnippetConfig;
+
+export class FullStoryShipper implements IShipper {
+  public static shipperName = 'FullStory';
+  private readonly fullStoryApi: FullStoryApi;
+  private lastUserId: string | undefined;
+
+  constructor(
+    config: FullStoryShipperConfig,
+    private readonly initContext: AnalyticsClientInitContext
+  ) {
+    this.fullStoryApi = loadSnippet(config);
+  }
+
+  public extendContext(newContext: EventContext): void {
+    this.initContext.logger.debug(`Received context ${JSON.stringify(newContext)}`);
+
+    // FullStory requires different APIs for different type of contexts.
+    const { userId, version, esOrgId, ...nonUserContext } = newContext;
+
+    // Call it only when the userId changes
+    if (userId && userId !== this.lastUserId) {
+      this.initContext.logger.debug(`Calling FS.identify with userId ${userId}`);
+      // We need to call the API for every new userId (restarting the session).
+      this.fullStoryApi.identify(userId);
+      this.lastUserId = userId;
+    }
+
+    // User-level context
+    if (version || esOrgId) {
+      this.initContext.logger.debug(
+        `Calling FS.setUserVars with version ${version} and esOrgId ${esOrgId}`
+      );
+      this.fullStoryApi.setUserVars({
+        ...(version ? getParsedVersion(version) : {}),
+        ...(esOrgId ? { org_id_str: esOrgId } : {}),
+      });
+    }
+
+    // Event-level context. At the moment, only the scope `page` is supported by FullStory for webapps.
+    if (Object.keys(nonUserContext).length) {
+      // Keeping these fields for backwards compatibility.
+      if (nonUserContext.applicationId) nonUserContext.app_id = nonUserContext.applicationId;
+      if (nonUserContext.entityId) nonUserContext.ent_id = nonUserContext.entityId;
+
+      this.initContext.logger.debug(
+        `Calling FS.setVars with context ${JSON.stringify(nonUserContext)}`
+      );
+      this.fullStoryApi.setVars('page', formatPayload(nonUserContext));
+    }
+  }
+
+  public optIn(isOptedIn: boolean): void {
+    this.initContext.logger.debug(`Setting FS to optIn ${isOptedIn}`);
+    // FullStory uses 2 different opt-in methods:
+    // - `consent` is needed to allow collecting information about the components
+    //   declared as "Record with user consent" (https://help.fullstory.com/hc/en-us/articles/360020623574).
+    //   We need to explicitly call `consent` if for the "Record with user content" feature to work.
+    this.fullStoryApi.consent(isOptedIn);
+    // - `restart` and `shutdown` fully start/stop the collection of data.
+    if (isOptedIn) {
+      this.fullStoryApi.restart();
+    } else {
+      this.fullStoryApi.shutdown();
+    }
+  }
+
+  public reportEvents(events: Event[]): void {
+    this.initContext.logger.debug(`Reporting ${events.length} events to FS`);
+    events.forEach((event) => {
+      // We only read event.properties and discard the rest because the context is already sent in the other APIs.
+      this.fullStoryApi.event(event.event_type, formatPayload(event.properties));
+    });
+  }
+}
diff --git a/packages/elastic-analytics/src/shippers/fullstory/get_parsed_version.test.ts b/packages/elastic-analytics/src/shippers/fullstory/get_parsed_version.test.ts
new file mode 100644
index 0000000000000..b4938dbca3bc4
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/get_parsed_version.test.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { getParsedVersion } from './get_parsed_version';
+
+describe('getParsedVersion', () => {
+  test('parses a version string', () => {
+    expect(getParsedVersion('1.2.3')).toEqual({
+      version_str: '1.2.3',
+      version_major_int: 1,
+      version_minor_int: 2,
+      version_patch_int: 3,
+    });
+  });
+
+  test('parses a version string with extra label', () => {
+    expect(getParsedVersion('1.2.3-SNAPSHOT')).toEqual({
+      version_str: '1.2.3-SNAPSHOT',
+      version_major_int: 1,
+      version_minor_int: 2,
+      version_patch_int: 3,
+    });
+  });
+
+  test('does not throw for invalid version', () => {
+    expect(getParsedVersion('INVALID_VERSION')).toEqual({
+      version_str: 'INVALID_VERSION',
+      version_major_int: NaN,
+      version_minor_int: NaN,
+      version_patch_int: NaN,
+    });
+  });
+});
diff --git a/packages/elastic-analytics/src/shippers/fullstory/get_parsed_version.ts b/packages/elastic-analytics/src/shippers/fullstory/get_parsed_version.ts
new file mode 100644
index 0000000000000..873b47a0cde8a
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/get_parsed_version.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export function getParsedVersion(version: string): {
+  version_str: string;
+  version_major_int: number;
+  version_minor_int: number;
+  version_patch_int: number;
+} {
+  const [major, minor, patch] = version.split('.');
+  return {
+    version_str: version,
+    version_major_int: parseInt(major, 10),
+    version_minor_int: parseInt(minor, 10),
+    version_patch_int: parseInt(patch, 10),
+  };
+}
diff --git a/packages/elastic-analytics/src/shippers/fullstory/index.ts b/packages/elastic-analytics/src/shippers/fullstory/index.ts
new file mode 100644
index 0000000000000..a9be91c82e9ec
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { FullStoryShipper } from './fullstory_shipper';
+export type { FullStoryShipperConfig } from './fullstory_shipper';
+export type { FullStorySnippetConfig } from './load_snippet';
diff --git a/packages/elastic-analytics/src/shippers/fullstory/load_snippet.test.ts b/packages/elastic-analytics/src/shippers/fullstory/load_snippet.test.ts
new file mode 100644
index 0000000000000..0b920ef2d22c1
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/load_snippet.test.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { loadSnippet } from './load_snippet';
+
+describe('loadSnippet', () => {
+  beforeAll(() => {
+    // Define necessary window and document global variables for the tests
+    Object.defineProperty(global, 'window', {
+      writable: true,
+      value: {},
+    });
+
+    Object.defineProperty(global, 'document', {
+      writable: true,
+      value: {
+        createElement: jest.fn().mockReturnValue({}),
+        getElementsByTagName: jest
+          .fn()
+          .mockReturnValue([{ parentNode: { insertBefore: jest.fn() } }]),
+      },
+    });
+
+    Object.defineProperty(global, '_fs_script', {
+      writable: true,
+      value: '',
+    });
+  });
+
+  it('should return the FullStory API', () => {
+    const fullStoryApi = loadSnippet({ debug: true, fullStoryOrgId: 'foo' });
+    expect(fullStoryApi).toBeDefined();
+    expect(fullStoryApi.event).toBeDefined();
+    expect(fullStoryApi.consent).toBeDefined();
+    expect(fullStoryApi.restart).toBeDefined();
+    expect(fullStoryApi.shutdown).toBeDefined();
+    expect(fullStoryApi.identify).toBeDefined();
+    expect(fullStoryApi.setUserVars).toBeDefined();
+    expect(fullStoryApi.setVars).toBeDefined();
+  });
+});
diff --git a/packages/elastic-analytics/src/shippers/fullstory/load_snippet.ts b/packages/elastic-analytics/src/shippers/fullstory/load_snippet.ts
new file mode 100644
index 0000000000000..471152f033b5a
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/load_snippet.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { FullStoryApi } from './types';
+
+export interface FullStorySnippetConfig {
+  /**
+   * The FullStory account id.
+   */
+  fullStoryOrgId: string;
+  /**
+   * The host to send the data to. Used to overcome AdBlockers by using custom DNSs.
+   * If not specified, it defaults to `fullstory.com`.
+   */
+  host?: string;
+  /**
+   * The URL to load the FullStory client from. Falls back to `edge.fullstory.com/s/fs.js` if not specified.
+   */
+  scriptUrl?: string;
+  /**
+   * Whether the debug logs should be printed to the console.
+   */
+  debug?: boolean;
+  /**
+   * The name of the variable where the API is stored: `window[namespace]`. Defaults to `FS`.
+   */
+  namespace?: string;
+}
+
+export function loadSnippet({
+  scriptUrl = 'edge.fullstory.com/s/fs.js',
+  fullStoryOrgId,
+  host = 'fullstory.com',
+  namespace = 'FS',
+  debug = false,
+}: FullStorySnippetConfig): FullStoryApi {
+  window._fs_debug = debug;
+  window._fs_host = host;
+  window._fs_script = scriptUrl;
+  window._fs_org = fullStoryOrgId;
+  window._fs_namespace = namespace;
+
+  /* eslint-disable */
+  (function(m,n,e,t,l,o,g,y){
+    if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
+    // @ts-expect-error
+    g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
+    // @ts-expect-error
+    o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src=_fs_script;
+    // @ts-expect-error
+    y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
+    // @ts-expect-error
+    g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
+    // @ts-expect-error
+    g.anonymize=function(){g.identify(!!0)};
+    // @ts-expect-error
+    g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
+    // @ts-expect-error
+    g.log = function(a,b){g("log",[a,b])};
+    // @ts-expect-error
+    g.consent=function(a){g("consent",!arguments.length||a)};
+    // @ts-expect-error
+    g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
+    // @ts-expect-error
+    g.clearUserCookie=function(){};
+    // @ts-expect-error
+    g.setVars=function(n, p){g('setVars',[n,p]);};
+    // @ts-expect-error
+    g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
+    // @ts-expect-error
+    if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
+    // @ts-expect-error
+    g._v="1.3.0";
+
+  })(window,document,window['_fs_namespace'],'script','user');
+
+  const fullStoryApi = window[namespace as 'FS'];
+
+  if (!fullStoryApi) {
+    throw new Error('FullStory snippet failed to load. Check browser logs for more information.');
+  }
+
+  return fullStoryApi;
+}
diff --git a/packages/elastic-analytics/src/shippers/fullstory/types.ts b/packages/elastic-analytics/src/shippers/fullstory/types.ts
new file mode 100644
index 0000000000000..6c448c2c4d2e1
--- /dev/null
+++ b/packages/elastic-analytics/src/shippers/fullstory/types.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * Definition of the FullStory API.
+ * Docs are available at https://developer.fullstory.com/.
+ */
+export interface FullStoryApi {
+  /**
+   * Identify a User
+   * https://developer.fullstory.com/identify
+   * @param userId
+   * @param userVars
+   */
+  identify(userId: string, userVars?: Record<string, unknown>): void;
+
+  /**
+   * Set User Variables
+   * https://developer.fullstory.com/user-variables
+   * @param userVars
+   */
+  setUserVars(userVars: Record<string, unknown>): void;
+
+  /**
+   * Setting page variables
+   * https://developer.fullstory.com/page-variables
+   * @param scope
+   * @param pageProperties
+   */
+  setVars(scope: 'page', pageProperties: Record<string, unknown>): void;
+
+  /**
+   * Sending custom event data into FullStory
+   * https://developer.fullstory.com/custom-events
+   * @param eventName
+   * @param eventProperties
+   */
+  event(eventName: string, eventProperties: Record<string, unknown>): void;
+
+  /**
+   * Selectively record parts of your site based on explicit user consent
+   * https://developer.fullstory.com/consent
+   * @param isOptedIn true if the user has opted in to tracking
+   */
+  consent(isOptedIn: boolean): void;
+
+  /**
+   * Restart session recording after it has been shutdown
+   * https://developer.fullstory.com/restart-recording
+   */
+  restart(): void;
+
+  /**
+   * Stop recording a session
+   * https://developer.fullstory.com/stop-recording
+   */
+  shutdown(): void;
+}
+
+declare global {
+  interface Window {
+    _fs_debug: boolean;
+    _fs_host: string;
+    _fs_org: string;
+    _fs_namespace: string;
+    _fs_script: string;
+    FS: FullStoryApi;
+  }
+}
diff --git a/packages/elastic-analytics/src/shippers/index.ts b/packages/elastic-analytics/src/shippers/index.ts
index 7a4ab7d85b9f2..c75b38b63a499 100644
--- a/packages/elastic-analytics/src/shippers/index.ts
+++ b/packages/elastic-analytics/src/shippers/index.ts
@@ -7,3 +7,6 @@
  */
 
 export type { IShipper } from './types';
+
+export { FullStoryShipper } from './fullstory';
+export type { FullStorySnippetConfig, FullStoryShipperConfig } from './fullstory';
diff --git a/packages/elastic-apm-synthtrace/BUILD.bazel b/packages/elastic-apm-synthtrace/BUILD.bazel
index 334d2a0b9e7be..2fe37502a299a 100644
--- a/packages/elastic-apm-synthtrace/BUILD.bazel
+++ b/packages/elastic-apm-synthtrace/BUILD.bazel
@@ -33,6 +33,7 @@ RUNTIME_DEPS = [
   "@npm//p-limit",
   "@npm//yargs",
   "@npm//node-fetch",
+  "@npm//semver",
 ]
 
 TYPES_DEPS = [
@@ -45,6 +46,7 @@ TYPES_DEPS = [
   "@npm//moment",
   "@npm//p-limit",
   "@npm//@types/node-fetch",
+  "@npm//@types/semver",
 ]
 
 jsts_transpiler(
diff --git a/packages/elastic-apm-synthtrace/README.md b/packages/elastic-apm-synthtrace/README.md
index bf497fecd81c8..0a9dcbe8e96c9 100644
--- a/packages/elastic-apm-synthtrace/README.md
+++ b/packages/elastic-apm-synthtrace/README.md
@@ -102,16 +102,46 @@ The script will try to automatically find bootstrapped APM indices. **If these i
 
 The following options are supported:
 
-| Option            | Description                                        | Default      |
-| ----------------- | -------------------------------------------------- | ------------ |
-| `--target`        | Elasticsearch target, including username/password. | **Required** |
-| `--from`          | The start of the time window.                      | `now - 15m`  |
-| `--to`            | The end of the time window.                        | `now`        |
-| `--live`          | Continously ingest data                            | `false`      |
-| `--clean`         | Clean APM indices before indexing new data.        | `false`      |
-| `--workers`       | Amount of Node.js worker threads                   | `5`          |
-| `--bucketSize`    | Size of bucket for which to generate data.         | `15m`        |
-| `--interval`      | The interval at which to index data.               | `10s`        |
-| `--clientWorkers` | Number of simultaneously connected ES clients      | `5`          |
-| `--batchSize`     | Number of documents per bulk index request         | `1000`       |
-| `--logLevel`      | Log level.                                         | `info`       |
+### Connection options
+
+| Option                 | Type      | Default    | Description                                                                                                                                |
+|------------------------|-----------|:-----------|--------------------------------------------------------------------------------------------------------------------------------------------|
+| `--target`             | [string]  |            | Elasticsearch target                                                                                                                       |
+| `--kibana`             | [string]  |            | Kibana target, used to bootstrap datastreams/mappings/templates/settings                                                                   |
+| `--cloudId`            | [string]  |            | Provide connection information and will force APM on the cloud to migrate to run as a Fleet integration                                    |
+| `--local`              | [boolean] |            | Shortcut during development, assumes `yarn es snapshot` and `yarn start` are running                                                       |
+| `--username`           | [string]  | `elastic`  | Basic authentication username                                                                                                              |
+| `--password`           | [string]  | `changeme` | Basic authentication password                                                                                                              |
+
+Note: 
+- If you only specify `--target` Synthtrace can not automatically setup APM.  
+- If you specify both `--target` and `--kibana` the tool will automatically attempt to install the appropriate APM package   
+- For Cloud its easiest to specify `--cloudId` as it will unpack the ES/Kibana targets and migrate cloud over to managed APM automatically.
+- If you only specify `--kibana` and it's using a cloud hostname a very naive `--target` to Elasticsearch will be inferred.
+
+### Scenario options
+| Option                 | Type      | Default | Description                                                                                                                                |
+|------------------------|-----------|:--------|--------------------------------------------------------------------------------------------------------------------------------------------|
+| `--from`               | [date]    | `now()` | The start of the time window                                                                                                               |
+| `--to`                 | [date]    |         | The end of the time window                                                                                                                 |
+| `--maxDocs`            | [number]  |         | The maximum number of documents we are allowed to generate                                                                                 |
+| `--maxDocsConfidence`  | [number]  | `1`     | Expert setting: --maxDocs relies on accurate tpm reporting of generators setting this to >1 will widen the estimated data generation range |
+| `--live`               | [boolean] |         | Generate and index data continuously                                                                                                       |
+| `--dryRun`             | [boolean] |         | Enumerates the stream without sending events to Elasticsearch                                                                              |
+| `--scenarioOpts`       |           |         | Raw options specific to the scenario                                                                                                       |
+| `--forceLegacyIndices` | [boolean] | `false` | Force writing to legacy indices                                                                                                            |
+
+Note:
+- The default `--to` is `15m` unless `--maxDocs` is specified in which case `--to` is calculated based on the scenario's TPM.
+- You can combine `--from` `--maxDocs` and `--to` with `--live` to back-fill some data.
+
+
+### Setup options
+| Option                 | Type      | Default    | Description                                                                                             |
+|------------------------|-----------|:-----------|---------------------------------------------------------------------------------------------------------|
+| `--numShards`          | [number]  |            | Updates the component templates to update the number of primary shards, requires cloudId to be provided |
+| `--clean`              | [boolean] | `false`    | Clean APM data before indexing new data                                                                 |
+| `--workers`            | [number]  |            | Amount of Node.js worker threads                                                                        |
+| `--logLevel`           | [enum]    | `info`     | Log level                                                                                               |
+| `--gcpRepository`      | [string]  |            | Allows you to register a GCP repository in <client_name>:<bucket>[:base_path] format                    |
+
diff --git a/packages/elastic-apm-synthtrace/src/index.ts b/packages/elastic-apm-synthtrace/src/index.ts
index 9c44f1902789c..ab6a3e3731be7 100644
--- a/packages/elastic-apm-synthtrace/src/index.ts
+++ b/packages/elastic-apm-synthtrace/src/index.ts
@@ -13,6 +13,7 @@ export { cleanWriteTargets } from './lib/utils/clean_write_targets';
 export { createLogger, LogLevel } from './lib/utils/create_logger';
 
 export type { Fields } from './lib/entity';
+export type { ApmFields } from './lib/apm/apm_fields';
 export type { ApmException, ApmSynthtraceEsClient } from './lib/apm';
-export type { SpanIterable } from './lib/span_iterable';
-export { SpanArrayIterable } from './lib/span_iterable';
+export type { EntityIterable } from './lib/entity_iterable';
+export { EntityArrayIterable } from './lib/entity_iterable';
diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts b/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts
index f5d68d8614e6b..6e7fb5ffdb1bc 100644
--- a/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_es_client.ts
@@ -11,47 +11,71 @@ import { cleanWriteTargets } from '../../utils/clean_write_targets';
 import { getApmWriteTargets } from '../utils/get_apm_write_targets';
 import { Logger } from '../../utils/create_logger';
 import { ApmFields } from '../apm_fields';
-import { SpanIterable } from '../../span_iterable';
+import { EntityIterable } from '../../entity_iterable';
 import { StreamProcessor } from '../../stream_processor';
-import { SpanGeneratorsUnion } from '../../span_generators_union';
+import { EntityStreams } from '../../entity_streams';
+import { Fields } from '../../entity';
 
-export interface StreamToBulkOptions {
+export interface StreamToBulkOptions<TFields extends Fields = ApmFields> {
   concurrency?: number;
+  // the maximum number of documents to process
   maxDocs?: number;
+  // the number of documents to flush the bulk operation defaults to 10k
+  flushInterval?: number;
   mapToIndex?: (document: Record<string, any>) => string;
+  dryRun: boolean;
+  itemStartStopCallback?: (item: TFields | null, done: boolean) => void;
+}
+
+export interface ApmSynthtraceEsClientOptions {
+  forceLegacyIndices?: boolean;
+  // defaults to true if unspecified
+  refreshAfterIndex?: boolean;
 }
 
 export class ApmSynthtraceEsClient {
+  private readonly forceLegacyIndices: boolean;
+  private readonly refreshAfterIndex: boolean;
   constructor(
     private readonly client: Client,
     private readonly logger: Logger,
-    private readonly forceDataStreams: boolean
-  ) {}
+    options?: ApmSynthtraceEsClientOptions
+  ) {
+    this.forceLegacyIndices = options?.forceLegacyIndices ?? false;
+    this.refreshAfterIndex = options?.refreshAfterIndex ?? true;
+  }
 
   private getWriteTargets() {
-    return getApmWriteTargets({ client: this.client, forceDataStreams: this.forceDataStreams });
+    return getApmWriteTargets({
+      client: this.client,
+      forceLegacyIndices: this.forceLegacyIndices,
+    });
+  }
+
+  async runningVersion() {
+    const info = await this.client.info();
+    return info.version.number;
   }
 
-  clean() {
+  async clean() {
     return this.getWriteTargets().then(async (writeTargets) => {
       const indices = Object.values(writeTargets);
       this.logger.info(`Attempting to clean: ${indices}`);
-      if (this.forceDataStreams) {
-        for (const name of indices) {
-          const dataStream = await this.client.indices.getDataStream({ name }, { ignore: [404] });
-          if (dataStream.data_streams && dataStream.data_streams.length > 0) {
-            this.logger.debug(`Deleting datastream: ${name}`);
-            await this.client.indices.deleteDataStream({ name });
-          }
+      if (this.forceLegacyIndices) {
+        return cleanWriteTargets({
+          client: this.client,
+          targets: indices,
+          logger: this.logger,
+        });
+      }
+      for (const name of indices) {
+        const dataStream = await this.client.indices.getDataStream({ name }, { ignore: [404] });
+        if (dataStream.data_streams && dataStream.data_streams.length > 0) {
+          this.logger.debug(`Deleting datastream: ${name}`);
+          await this.client.indices.deleteDataStream({ name });
         }
-        return;
       }
-
-      return cleanWriteTargets({
-        client: this.client,
-        targets: indices,
-        logger: this.logger,
-      });
+      return;
     });
   }
 
@@ -76,8 +100,81 @@ export class ApmSynthtraceEsClient {
     }
   }
 
-  async index(events: SpanIterable | SpanIterable[], options?: StreamToBulkOptions) {
-    const dataStream = Array.isArray(events) ? new SpanGeneratorsUnion(events) : events;
+  async registerGcpRepository(connectionString: string) {
+    // <client_name>:<bucket>[:base_path]
+    const [clientName, bucket, basePath] = connectionString.split(':');
+    if (!clientName)
+      throw new Error(
+        `client name is mandatory for gcp repostitory registration: ${connectionString}`
+      );
+    if (!bucket)
+      throw new Error(`bucket is mandatory for gcp repostitory registration: ${connectionString}`);
+
+    const name = `gcp-repository-${clientName}`;
+    this.logger.info(`Registering gcp repository ${name}`);
+    const putRepository = await this.client.snapshot.createRepository({
+      name,
+      type: 'gcs',
+      settings: {
+        // @ts-ignore
+        // missing from es types
+        bucket,
+        client: clientName,
+        base_path: basePath,
+      },
+    });
+    this.logger.info(putRepository);
+
+    this.logger.info(`Verifying gcp repository ${name}`);
+    const verifyRepository = await this.client.snapshot.verifyRepository({ name });
+    this.logger.info(verifyRepository);
+  }
+
+  async refresh() {
+    const writeTargets = await this.getWriteTargets();
+
+    const indices = Object.values(writeTargets);
+    this.logger.info(`Indexed all data attempting to refresh: ${indices}`);
+
+    return this.client.indices.refresh({
+      index: indices,
+      allow_no_indices: true,
+      ignore_unavailable: true,
+    });
+  }
+
+  async index<TFields>(
+    events: EntityIterable<TFields> | Array<EntityIterable<TFields>>,
+    options?: StreamToBulkOptions,
+    streamProcessor?: StreamProcessor
+  ) {
+    const dataStream = Array.isArray(events) ? new EntityStreams(events) : events;
+
+    const sp =
+      streamProcessor != null
+        ? streamProcessor
+        : new StreamProcessor({
+            processors: StreamProcessor.apmProcessors,
+            maxSourceEvents: options?.maxDocs,
+            logger: this.logger,
+          });
+
+    let item: Record<any, any> | null = null;
+    let yielded = 0;
+    if (options?.dryRun) {
+      await this.logger.perf('enumerate_scenario', async () => {
+        // @ts-ignore
+        // We just want to enumerate
+        for await (item of sp.streamToDocumentAsync(sp.toDocument, dataStream)) {
+          if (yielded === 0) {
+            options.itemStartStopCallback?.apply(this, [item, false]);
+            yielded++;
+          }
+        }
+        options.itemStartStopCallback?.apply(this, [item, true]);
+      });
+      return;
+    }
 
     const writeTargets = await this.getWriteTargets();
     // TODO logger.perf
@@ -85,37 +182,33 @@ export class ApmSynthtraceEsClient {
       concurrency: options?.concurrency ?? 10,
       refresh: false,
       refreshOnCompletion: false,
-      datasource: new StreamProcessor({
-        processors: StreamProcessor.apmProcessors,
-        maxSourceEvents: options?.maxDocs,
-        logger: this.logger,
-      })
-        // TODO https://github.com/elastic/elasticsearch-js/issues/1610
-        // having to map here is awkward, it'd be better to map just before serialization.
-        .streamToDocumentAsync(StreamProcessor.toDocument, dataStream),
+      flushBytes: 500000,
+      // TODO https://github.com/elastic/elasticsearch-js/issues/1610
+      // having to map here is awkward, it'd be better to map just before serialization.
+      datasource: sp.streamToDocumentAsync(sp.toDocument, dataStream),
       onDrop: (doc) => {
-        this.logger.info(doc);
+        this.logger.info(JSON.stringify(doc, null, 2));
       },
       // TODO bug in client not passing generic to BulkHelperOptions<>
       // https://github.com/elastic/elasticsearch-js/issues/1611
       onDocument: (doc: unknown) => {
-        const d = doc as Record<string, any>;
+        item = doc as Record<string, any>;
+        if (yielded === 0) {
+          options?.itemStartStopCallback?.apply(this, [item, false]);
+          yielded++;
+        }
         const index = options?.mapToIndex
-          ? options?.mapToIndex(d)
-          : this.forceDataStreams
-          ? StreamProcessor.getDataStreamForEvent(d, writeTargets)
-          : StreamProcessor.getIndexForEvent(d, writeTargets);
+          ? options?.mapToIndex(item)
+          : !this.forceLegacyIndices
+          ? StreamProcessor.getDataStreamForEvent(item, writeTargets)
+          : StreamProcessor.getIndexForEvent(item, writeTargets);
         return { create: { _index: index } };
       },
     });
+    options?.itemStartStopCallback?.apply(this, [item, true]);
 
-    const indices = Object.values(writeTargets);
-    this.logger.info(`Indexed all data attempting to refresh: ${indices}`);
-
-    return this.client.indices.refresh({
-      index: indices,
-      allow_no_indices: true,
-      ignore_unavailable: true,
-    });
+    if (this.refreshAfterIndex) {
+      await this.refresh();
+    }
   }
 }
diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts b/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts
index 6abd3e7633c6b..fbe9cab323fa8 100644
--- a/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/apm/client/apm_synthtrace_kibana_client.ts
@@ -7,6 +7,7 @@
  */
 
 import fetch from 'node-fetch';
+import Semver from 'semver';
 import { Logger } from '../../utils/create_logger';
 
 export class ApmSynthtraceKibanaClient {
@@ -40,4 +41,54 @@ export class ApmSynthtraceKibanaClient {
       }
     });
   }
+
+  async discoverLocalKibana() {
+    return await fetch('http://localhost:5601', {
+      method: 'HEAD',
+      follow: 1,
+      redirect: 'manual',
+    }).then((res) => {
+      const kibanaUrl = res.headers.get('location');
+      this.logger.info(`Discovered local kibana running at: ${kibanaUrl}`);
+      return kibanaUrl;
+    });
+  }
+  async fetchLatestApmPackageVersion(version: string) {
+    const url =
+      'https://epr-snapshot.elastic.co/search?package=apm&prerelease=true&all=true&kibana.version=';
+    const response = await fetch(url + version, { method: 'GET' });
+    const json = await response.json();
+    if (!Array.isArray(json)) {
+      throw new Error('Could not locate apm package compatible with the current kibana version');
+    }
+    const versions = json
+      .map<string>((item) => item.version)
+      .filter((v) => Semver.valid(v))
+      .sort(Semver.rcompare);
+    if (versions.length === 0) {
+      throw new Error('Could not locate apm package compatible with the current kibana version');
+    }
+    return versions[0];
+  }
+
+  async installApmPackage(kibanaUrl: string, version: string, username: string, password: string) {
+    const packageVersion = await this.fetchLatestApmPackageVersion(version);
+    const response = await fetch(kibanaUrl + '/api/fleet/epm/packages/apm/' + packageVersion, {
+      method: 'POST',
+      headers: {
+        Authorization: 'Basic ' + Buffer.from(username + ':' + password).toString('base64'),
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+        'kbn-xsrf': 'kibana',
+      },
+      body: '{"force":true}',
+    });
+    const responseJson = await response.json();
+    if (responseJson.statusCode) {
+      throw Error(`unable to install apm package ${packageVersion}`);
+    }
+    if (responseJson.items) {
+      this.logger.info(`Installed apm package ${packageVersion}`);
+    } else this.logger.error(responseJson);
+  }
 }
diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts b/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts
index 9a919e505185c..d8d001774df6d 100644
--- a/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/apm/defaults/get_chrome_user_agent_defaults.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ApmUserAgentFields } from '../../apm/apm_fields';
+import { ApmUserAgentFields } from '../apm_fields';
 
 export function getChromeUserAgentDefaults(): ApmUserAgentFields {
   return {
diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/utils/get_apm_write_targets.ts b/packages/elastic-apm-synthtrace/src/lib/apm/utils/get_apm_write_targets.ts
index ec2e675d415fa..86b836da3a6b2 100644
--- a/packages/elastic-apm-synthtrace/src/lib/apm/utils/get_apm_write_targets.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/apm/utils/get_apm_write_targets.ts
@@ -18,12 +18,12 @@ export interface ApmElasticsearchOutputWriteTargets {
 
 export async function getApmWriteTargets({
   client,
-  forceDataStreams,
+  forceLegacyIndices,
 }: {
   client: Client;
-  forceDataStreams?: boolean;
+  forceLegacyIndices?: boolean;
 }): Promise<ApmElasticsearchOutputWriteTargets> {
-  if (forceDataStreams) {
+  if (!forceLegacyIndices) {
     return {
       transaction: 'traces-apm-default',
       span: 'traces-apm-default',
diff --git a/packages/elastic-apm-synthtrace/src/lib/entity_generator.ts b/packages/elastic-apm-synthtrace/src/lib/entity_generator.ts
new file mode 100644
index 0000000000000..67ae790a46c20
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/lib/entity_generator.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Interval } from './interval';
+import { EntityStreams } from './entity_streams';
+import { EntityIterable } from './entity_iterable';
+import { Serializable } from './serializable';
+
+export class EntityGenerator<TField> implements EntityIterable<TField> {
+  private readonly _gen: () => Generator<Serializable<TField>>;
+  constructor(
+    private readonly interval: Interval,
+    dataGenerator: (interval: Interval) => Generator<Serializable<TField>>
+  ) {
+    this._order = interval.from > interval.to ? 'desc' : 'asc';
+
+    const generator = dataGenerator(this.interval);
+    const peek = generator.next();
+    const value = peek.value;
+
+    let callCount = 0;
+    this._gen = function* () {
+      if (callCount === 0) {
+        callCount++;
+        yield value;
+        yield* generator;
+      } else {
+        yield* dataGenerator(this.interval);
+      }
+    };
+
+    const peekedNumberOfEvents = peek.done ? 0 : peek.value.serialize().length;
+    this._ratePerMinute = interval.ratePerMinute() * peekedNumberOfEvents;
+  }
+
+  private readonly _order: 'desc' | 'asc';
+  order() {
+    return this._order;
+  }
+
+  toArray(): TField[] {
+    return Array.from(this);
+  }
+
+  merge(...iterables: Array<EntityIterable<TField>>): EntityStreams<TField> {
+    return new EntityStreams([this, ...iterables]);
+  }
+
+  private readonly _ratePerMinute: number;
+  ratePerMinute() {
+    return this._ratePerMinute;
+  }
+
+  *[Symbol.iterator]() {
+    for (const span of this._gen()) {
+      for (const fields of span.serialize()) {
+        yield fields;
+      }
+    }
+  }
+
+  async *[Symbol.asyncIterator]() {
+    for (const span of this._gen()) {
+      for (const fields of span.serialize()) {
+        yield fields;
+      }
+    }
+  }
+}
diff --git a/packages/elastic-apm-synthtrace/src/lib/entity_iterable.ts b/packages/elastic-apm-synthtrace/src/lib/entity_iterable.ts
new file mode 100644
index 0000000000000..2bc7a52e84d8c
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/lib/entity_iterable.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ApmFields } from './apm/apm_fields';
+import { EntityStreams } from './entity_streams';
+import { Fields } from './entity';
+
+export interface EntityIterable<TFields extends Fields = ApmFields>
+  extends Iterable<TFields>,
+    AsyncIterable<TFields> {
+  order(): 'desc' | 'asc';
+
+  ratePerMinute(): number;
+
+  toArray(): ApmFields[];
+
+  merge(...iterables: Array<EntityIterable<TFields>>): EntityStreams<TFields>;
+}
+
+export class EntityArrayIterable<TFields extends Fields = ApmFields>
+  implements EntityIterable<TFields>
+{
+  constructor(private fields: TFields[]) {
+    const timestamps = fields.filter((f) => f['@timestamp']).map((f) => f['@timestamp']!);
+    this._order = timestamps.length > 1 ? (timestamps[0] > timestamps[1] ? 'desc' : 'asc') : 'asc';
+    const sorted = timestamps.sort();
+    const [first, last] = [sorted[0], sorted.slice(-1)[0]];
+    const numberOfMinutes = Math.ceil(Math.abs(last - first) / (1000 * 60)) % 60;
+    this._ratePerMinute = sorted.length / numberOfMinutes;
+  }
+
+  private readonly _order: 'desc' | 'asc';
+  order() {
+    return this._order;
+  }
+
+  private readonly _ratePerMinute: number;
+  ratePerMinute() {
+    return this._ratePerMinute;
+  }
+
+  async *[Symbol.asyncIterator](): AsyncIterator<TFields> {
+    return this.fields[Symbol.iterator]();
+  }
+
+  [Symbol.iterator](): Iterator<TFields> {
+    return this.fields[Symbol.iterator]();
+  }
+
+  merge(...iterables: Array<EntityIterable<TFields>>): EntityStreams<TFields> {
+    return new EntityStreams<TFields>([this, ...iterables]);
+  }
+
+  toArray(): TFields[] {
+    return this.fields;
+  }
+}
diff --git a/packages/elastic-apm-synthtrace/src/lib/span_generators_union.ts b/packages/elastic-apm-synthtrace/src/lib/entity_streams.ts
similarity index 52%
rename from packages/elastic-apm-synthtrace/src/lib/span_generators_union.ts
rename to packages/elastic-apm-synthtrace/src/lib/entity_streams.ts
index 9bbea307276c0..4d5e8311c0e7e 100644
--- a/packages/elastic-apm-synthtrace/src/lib/span_generators_union.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/entity_streams.ts
@@ -6,44 +6,47 @@
  * Side Public License, v 1.
  */
 
-import { ApmFields } from './apm/apm_fields';
-import { SpanIterable } from './span_iterable';
+import { EntityIterable } from './entity_iterable';
 import { merge } from './utils/merge_iterable';
 
-export class SpanGeneratorsUnion implements SpanIterable {
-  constructor(private readonly dataGenerators: SpanIterable[]) {
+export class EntityStreams<TFields> implements EntityIterable<TFields> {
+  constructor(private readonly dataGenerators: Array<EntityIterable<TFields>>) {
     const orders = new Set<'desc' | 'asc'>(dataGenerators.map((d) => d.order()));
     if (orders.size > 1) throw Error('Can only combine intervals with the same order()');
     this._order = orders.has('asc') ? 'asc' : 'desc';
-  }
 
-  static empty: SpanGeneratorsUnion = new SpanGeneratorsUnion([]);
+    this._ratePerMinute = dataGenerators.map((d) => d.ratePerMinute()).reduce((a, b) => a + b, 0);
+  }
 
   private readonly _order: 'desc' | 'asc';
   order() {
     return this._order;
   }
 
-  toArray(): ApmFields[] {
+  private readonly _ratePerMinute: number;
+  ratePerMinute() {
+    return this._ratePerMinute;
+  }
+
+  toArray(): TFields[] {
     return Array.from(this);
   }
 
-  concat(...iterables: SpanIterable[]) {
-    return new SpanGeneratorsUnion([...this.dataGenerators, ...iterables]);
+  merge(...iterables: Array<EntityIterable<TFields>>): EntityStreams<TFields> {
+    return new EntityStreams([...this.dataGenerators, ...iterables]);
   }
 
-  *[Symbol.iterator]() {
+  *[Symbol.iterator](): Iterator<TFields> {
     const iterator = merge(this.dataGenerators);
     for (const fields of iterator) {
       yield fields;
     }
   }
 
-  async *[Symbol.asyncIterator]() {
-    for (const iterator of this.dataGenerators) {
-      for (const fields of iterator) {
-        yield fields;
-      }
+  async *[Symbol.asyncIterator](): AsyncIterator<TFields> {
+    const iterator = merge(this.dataGenerators);
+    for await (const fields of iterator) {
+      yield fields;
     }
   }
 }
diff --git a/packages/elastic-apm-synthtrace/src/lib/interval.ts b/packages/elastic-apm-synthtrace/src/lib/interval.ts
index fc31d0290968a..48d15a1a4d53f 100644
--- a/packages/elastic-apm-synthtrace/src/lib/interval.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/interval.ts
@@ -5,12 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import moment from 'moment';
-import { ApmFields } from './apm/apm_fields';
-import { SpanIterable } from './span_iterable';
-import { SpanGenerator } from './span_generator';
+import moment, { unitOfTime } from 'moment';
+import { random } from 'lodash';
+import { EntityIterable } from './entity_iterable';
+import { EntityGenerator } from './entity_generator';
+import { Serializable } from './serializable';
 
-export function parseInterval(interval: string): [number, string] {
+export function parseInterval(interval: string): [number, unitOfTime.DurationConstructor] {
   const args = interval.match(/(\d+)(s|m|h|d)/);
   if (!args || args.length < 3) {
     throw new Error('Failed to parse interval');
@@ -18,38 +19,71 @@ export function parseInterval(interval: string): [number, string] {
   return [Number(args[1]), args[2] as any];
 }
 
+export interface IntervalOptions {
+  from: Date;
+  to: Date;
+  interval: string;
+  yieldRate?: number;
+
+  intervalUpper?: number;
+  rateUpper?: number;
+}
+
 export class Interval implements Iterable<number> {
-  constructor(
-    public readonly from: Date,
-    public readonly to: Date,
-    public readonly interval: string,
-    public readonly yieldRate: number = 1
-  ) {
-    [this.intervalAmount, this.intervalUnit] = parseInterval(interval);
+  constructor(public readonly options: IntervalOptions) {
+    const parsed = parseInterval(options.interval);
+    this.intervalAmount = parsed[0];
+    this.intervalUnit = parsed[1];
+    this.from = this.options.from;
+    this.to = this.options.to;
   }
+  public readonly from: Date;
+  public readonly to: Date;
 
   private readonly intervalAmount: number;
-  private readonly intervalUnit: any;
-
-  spans(map: (timestamp: number, index?: number) => ApmFields[]): SpanIterable {
-    return new SpanGenerator(this, [
-      function* (i) {
-        let index = 0;
-        for (const x of i) {
-          for (const a of map(x, index)) {
-            yield a;
-            index++;
-          }
+  private readonly intervalUnit: unitOfTime.DurationConstructor;
+  generator<TField>(
+    map: (timestamp: number, index?: number) => Serializable<TField> | Array<Serializable<TField>>
+  ): EntityIterable<TField> {
+    return new EntityGenerator(this, function* (i) {
+      let index = 0;
+      for (const x of i) {
+        const data = map(x, index);
+        if (Array.isArray(data)) {
+          yield* data;
+        } else {
+          yield data;
         }
-      },
-    ]);
+        index++;
+      }
+    });
   }
-
   rate(rate: number): Interval {
-    return new Interval(this.from, this.to, this.interval, rate);
+    return new Interval({ ...this.options, yieldRate: rate });
+  }
+
+  randomize(rateUpper: number, intervalUpper: number): Interval {
+    return new Interval({ ...this.options, intervalUpper, rateUpper });
   }
+
+  ratePerMinute(): number {
+    const rate = this.options.rateUpper
+      ? Math.max(1, this.options.rateUpper)
+      : this.options.yieldRate ?? 1;
+
+    const interval = this.options.intervalUpper ? this.options.intervalUpper : this.intervalAmount;
+    const first = moment();
+    const last = moment(first).subtract(interval, this.intervalUnit);
+    const numberOfMinutes =
+      (Math.abs(last.toDate().getTime() - first.toDate().getTime()) / (1000 * 60)) % 60;
+    return rate / numberOfMinutes;
+  }
+
   private yieldRateTimestamps(timestamp: number) {
-    return new Array<number>(this.yieldRate).fill(timestamp);
+    const rate = this.options.rateUpper
+      ? random(this.options.yieldRate ?? 1, Math.max(1, this.options.rateUpper))
+      : this.options.yieldRate ?? 1;
+    return new Array<number>(rate).fill(timestamp);
   }
 
   private *_generate(): Iterable<number> {
@@ -57,17 +91,25 @@ export class Interval implements Iterable<number> {
       let now = this.from;
       do {
         yield* this.yieldRateTimestamps(now.getTime());
-        now = new Date(moment(now).subtract(this.intervalAmount, this.intervalUnit).valueOf());
+        const amount = this.interval();
+        now = new Date(moment(now).subtract(amount, this.intervalUnit).valueOf());
       } while (now > this.to);
     } else {
       let now = this.from;
       do {
         yield* this.yieldRateTimestamps(now.getTime());
-        now = new Date(moment(now).add(this.intervalAmount, this.intervalUnit).valueOf());
+        const amount = this.interval();
+        now = new Date(moment(now).add(amount, this.intervalUnit).valueOf());
       } while (now < this.to);
     }
   }
 
+  private interval() {
+    return this.options.intervalUpper
+      ? random(this.intervalAmount, this.options.intervalUpper)
+      : this.intervalAmount;
+  }
+
   [Symbol.iterator]() {
     return this._generate()[Symbol.iterator]();
   }
diff --git a/packages/elastic-apm-synthtrace/src/lib/span_generator.ts b/packages/elastic-apm-synthtrace/src/lib/span_generator.ts
deleted file mode 100644
index aa043e982b503..0000000000000
--- a/packages/elastic-apm-synthtrace/src/lib/span_generator.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { Interval } from './interval';
-import { ApmFields } from './apm/apm_fields';
-import { SpanGeneratorsUnion } from './span_generators_union';
-import { SpanIterable } from './span_iterable';
-
-export class SpanGenerator implements SpanIterable {
-  constructor(
-    private readonly interval: Interval,
-    private readonly dataGenerator: Array<(interval: Interval) => Generator<ApmFields>>
-  ) {
-    this._order = interval.from > interval.to ? 'desc' : 'asc';
-  }
-
-  private readonly _order: 'desc' | 'asc';
-  order() {
-    return this._order;
-  }
-
-  toArray(): ApmFields[] {
-    return Array.from(this);
-  }
-
-  concat(...iterables: SpanGenerator[]) {
-    return new SpanGeneratorsUnion([this, ...iterables]);
-  }
-
-  *[Symbol.iterator]() {
-    for (const iterator of this.dataGenerator) {
-      for (const fields of iterator(this.interval)) {
-        yield fields;
-      }
-    }
-  }
-
-  async *[Symbol.asyncIterator]() {
-    for (const iterator of this.dataGenerator) {
-      for (const fields of iterator(this.interval)) {
-        yield fields;
-      }
-    }
-  }
-}
diff --git a/packages/elastic-apm-synthtrace/src/lib/span_iterable.ts b/packages/elastic-apm-synthtrace/src/lib/span_iterable.ts
deleted file mode 100644
index f40658feba1f2..0000000000000
--- a/packages/elastic-apm-synthtrace/src/lib/span_iterable.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { ApmFields } from './apm/apm_fields';
-import { SpanGeneratorsUnion } from './span_generators_union';
-
-export interface SpanIterable extends Iterable<ApmFields>, AsyncIterable<ApmFields> {
-  order(): 'desc' | 'asc';
-
-  toArray(): ApmFields[];
-
-  concat(...iterables: SpanIterable[]): SpanGeneratorsUnion;
-}
-
-export class SpanArrayIterable implements SpanIterable {
-  constructor(private fields: ApmFields[]) {
-    const timestamps = fields.filter((f) => f['@timestamp']).map((f) => f['@timestamp']!);
-    this._order = timestamps.length > 1 ? (timestamps[0] > timestamps[1] ? 'desc' : 'asc') : 'asc';
-  }
-
-  private readonly _order: 'desc' | 'asc';
-  order() {
-    return this._order;
-  }
-
-  async *[Symbol.asyncIterator](): AsyncIterator<ApmFields> {
-    return this.fields[Symbol.iterator]();
-  }
-
-  [Symbol.iterator](): Iterator<ApmFields> {
-    return this.fields[Symbol.iterator]();
-  }
-
-  concat(...iterables: SpanIterable[]): SpanGeneratorsUnion {
-    return new SpanGeneratorsUnion([this, ...iterables]);
-  }
-
-  toArray(): ApmFields[] {
-    return this.fields;
-  }
-}
diff --git a/packages/elastic-apm-synthtrace/src/lib/stream_processor.ts b/packages/elastic-apm-synthtrace/src/lib/stream_processor.ts
index 35cb8d05582d6..17ced20f5d7ed 100644
--- a/packages/elastic-apm-synthtrace/src/lib/stream_processor.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/stream_processor.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { ApmFields } from './apm/apm_fields';
-import { SpanIterable } from './span_iterable';
+import { EntityIterable } from './entity_iterable';
 import { getTransactionMetrics } from './apm/processors/get_transaction_metrics';
 import { getSpanDestinationMetrics } from './apm/processors/get_span_destination_metrics';
 import { getBreakdownMetrics } from './apm/processors/get_breakdown_metrics';
@@ -16,41 +16,54 @@ import { parseInterval } from './interval';
 import { dedot } from './utils/dedot';
 import { ApmElasticsearchOutputWriteTargets } from './apm/utils/get_apm_write_targets';
 import { Logger } from './utils/create_logger';
+import { Fields } from './entity';
 
-export interface StreamProcessorOptions {
-  processors: Array<(events: ApmFields[]) => ApmFields[]>;
+export interface StreamProcessorOptions<TFields extends Fields = ApmFields> {
+  version?: string;
+  processors: Array<(events: TFields[]) => TFields[]>;
   flushInterval?: string;
+  // defaults to 10k
   maxBufferSize?: number;
   // the maximum source events to process, not the maximum documents outputted by the processor
   maxSourceEvents?: number;
   logger?: Logger;
+  name?: string;
+  // called everytime maxBufferSize is processed
+  processedCallback?: (processedDocuments: number) => void;
 }
 
-export class StreamProcessor {
+export class StreamProcessor<TFields extends Fields = ApmFields> {
   public static readonly apmProcessors = [
     getTransactionMetrics,
     getSpanDestinationMetrics,
     getBreakdownMetrics,
   ];
+  public static defaultFlushInterval: number = 10000;
 
-  constructor(private readonly options: StreamProcessorOptions) {
+  constructor(private readonly options: StreamProcessorOptions<TFields>) {
     [this.intervalAmount, this.intervalUnit] = this.options.flushInterval
       ? parseInterval(this.options.flushInterval)
       : parseInterval('1m');
+    this.name = this.options?.name ?? 'StreamProcessor';
+    this.version = this.options.version ?? '8.0.0';
+    this.versionMajor = Number.parseInt(this.version.split('.')[0], 10);
   }
   private readonly intervalAmount: number;
   private readonly intervalUnit: any;
+  private readonly name: string;
+  private readonly version: string;
+  private readonly versionMajor: number;
 
   // TODO move away from chunking and feed this data one by one to processors
-  *stream(...eventSources: SpanIterable[]) {
-    const maxBufferSize = this.options.maxBufferSize ?? 10000;
+  *stream(...eventSources: Array<EntityIterable<TFields>>): Generator<ApmFields, any, any> {
+    const maxBufferSize = this.options.maxBufferSize ?? StreamProcessor.defaultFlushInterval;
     const maxSourceEvents = this.options.maxSourceEvents;
     let localBuffer = [];
     let flushAfter: number | null = null;
     let sourceEventsYielded = 0;
     for (const eventSource of eventSources) {
       const order = eventSource.order();
-      this.options.logger?.info(`order: ${order}`);
+      this.options.logger?.debug(`order: ${order}`);
       for (const event of eventSource) {
         const eventDate = event['@timestamp'] as number;
         localBuffer.push(event);
@@ -58,10 +71,15 @@ export class StreamProcessor {
           flushAfter = this.calculateFlushAfter(eventDate, order);
         }
 
-        yield StreamProcessor.enrich(event);
+        yield StreamProcessor.enrich(event, this.version, this.versionMajor);
         sourceEventsYielded++;
-        if (maxSourceEvents && sourceEventsYielded % (maxSourceEvents / 10) === 0) {
-          this.options.logger?.info(`Yielded ${sourceEventsYielded} events`);
+        if (sourceEventsYielded % maxBufferSize === 0) {
+          if (this.options?.processedCallback) {
+            this.options.processedCallback(maxBufferSize);
+          }
+        }
+        if (maxSourceEvents && sourceEventsYielded % maxBufferSize === 0) {
+          this.options.logger?.debug(`${this.name} yielded ${sourceEventsYielded} events`);
         }
         if (maxSourceEvents && sourceEventsYielded >= maxSourceEvents) {
           // yielded the maximum source events, we still want the local buffer to generate derivative documents
@@ -76,25 +94,34 @@ export class StreamProcessor {
           const e = new Date(eventDate).toISOString();
           const f = new Date(flushAfter!).toISOString();
           this.options.logger?.debug(
-            `flush ${localBuffer.length} documents ${order}: ${e} => ${f}`
+            `${this.name} flush ${localBuffer.length} documents ${order}: ${e} => ${f}`
           );
           for (const processor of this.options.processors) {
-            yield* processor(localBuffer).map(StreamProcessor.enrich);
+            yield* processor(localBuffer).map((d) =>
+              StreamProcessor.enrich(d, this.version, this.versionMajor)
+            );
           }
           localBuffer = [];
           flushAfter = this.calculateFlushAfter(flushAfter, order);
         }
       }
       if (maxSourceEvents && sourceEventsYielded >= maxSourceEvents) {
-        this.options.logger?.info(`Yielded maximum number of documents: ${maxSourceEvents}`);
+        this.options.logger?.info(
+          `${this.name} yielded maximum number of documents: ${maxSourceEvents}`
+        );
         break;
       }
     }
     if (localBuffer.length > 0) {
-      this.options.logger?.info(`Processing remaining buffer: ${localBuffer.length} items left`);
+      this.options.logger?.info(
+        `${this.name} processing remaining buffer: ${localBuffer.length} items left`
+      );
       for (const processor of this.options.processors) {
-        yield* processor(localBuffer).map(StreamProcessor.enrich);
+        yield* processor(localBuffer).map((d) =>
+          StreamProcessor.enrich(d, this.version, this.versionMajor)
+        );
       }
+      this.options.processedCallback?.apply(this, [localBuffer.length]);
     }
   }
 
@@ -106,34 +133,35 @@ export class StreamProcessor {
     }
   }
 
-  async *streamAsync(...eventSources: SpanIterable[]): AsyncIterator<ApmFields> {
+  async *streamAsync(...eventSources: Array<EntityIterable<TFields>>): AsyncIterable<ApmFields> {
     yield* this.stream(...eventSources);
   }
+
   *streamToDocument<TDocument>(
     map: (d: ApmFields) => TDocument,
-    ...eventSources: SpanIterable[]
-  ): Generator<ApmFields> {
+    ...eventSources: Array<EntityIterable<TFields>>
+  ): Generator<TDocument> {
     for (const apmFields of this.stream(...eventSources)) {
       yield map(apmFields);
     }
   }
   async *streamToDocumentAsync<TDocument>(
     map: (d: ApmFields) => TDocument,
-    ...eventSources: SpanIterable[]
-  ): AsyncIterator<ApmFields> {
-    for (const apmFields of this.stream(...eventSources)) {
+    ...eventSources: Array<EntityIterable<TFields>>
+  ): AsyncIterable<TDocument> & AsyncIterator<TDocument> {
+    for await (const apmFields of this.stream(...eventSources)) {
       yield map(apmFields);
     }
   }
-  streamToArray(...eventSources: SpanIterable[]) {
+  streamToArray(...eventSources: Array<EntityIterable<TFields>>) {
     return Array.from<ApmFields>(this.stream(...eventSources));
   }
 
-  static enrich(document: ApmFields): ApmFields {
+  private static enrich(document: ApmFields, version: string, versionMajor: number): ApmFields {
     // see https://github.com/elastic/apm-server/issues/7088 can not be provided as flat key/values
     document.observer = {
-      version: '8.0.0',
-      version_major: 8,
+      version: version ?? '8.2.0',
+      version_major: versionMajor,
     };
     document['service.node.name'] =
       document['service.node.name'] || document['container.id'] || document['host.name'];
@@ -145,11 +173,11 @@ export class StreamProcessor {
     return document;
   }
 
-  static toDocument(document: ApmFields): Record<string, any> {
+  toDocument(document: ApmFields): Record<string, any> {
+    const newDoc: Record<string, any> = {};
     if (!document.observer) {
-      document = StreamProcessor.enrich(document);
+      document = StreamProcessor.enrich(document, this.version, this.versionMajor);
     }
-    const newDoc: Record<string, any> = {};
     dedot(document, newDoc);
     if (typeof newDoc['@timestamp'] === 'number') {
       const timestamp = newDoc['@timestamp'];
@@ -192,16 +220,16 @@ export class StreamProcessor {
   }
 }
 
-export async function* streamProcessAsync(
-  processors: Array<(events: ApmFields[]) => ApmFields[]>,
-  ...eventSources: SpanIterable[]
+export async function* streamProcessAsync<TFields>(
+  processors: Array<(events: TFields[]) => TFields[]>,
+  ...eventSources: Array<EntityIterable<TFields>>
 ) {
   return new StreamProcessor({ processors }).streamAsync(...eventSources);
 }
 
-export function streamProcessToArray(
-  processors: Array<(events: ApmFields[]) => ApmFields[]>,
-  ...eventSources: SpanIterable[]
+export function streamProcessToArray<TFields>(
+  processors: Array<(events: TFields[]) => TFields[]>,
+  ...eventSources: Array<EntityIterable<TFields>>
 ) {
   return new StreamProcessor({ processors }).streamToArray(...eventSources);
 }
diff --git a/packages/elastic-apm-synthtrace/src/lib/timerange.ts b/packages/elastic-apm-synthtrace/src/lib/timerange.ts
index 95e998e9ca20f..41532157b3b91 100644
--- a/packages/elastic-apm-synthtrace/src/lib/timerange.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/timerange.ts
@@ -12,7 +12,7 @@ export class Timerange {
   constructor(private from: Date, private to: Date) {}
 
   interval(interval: string) {
-    return new Interval(this.from, this.to, interval);
+    return new Interval({ from: this.from, to: this.to, interval });
   }
 }
 
diff --git a/packages/elastic-apm-synthtrace/src/lib/utils/merge_iterable.ts b/packages/elastic-apm-synthtrace/src/lib/utils/merge_iterable.ts
index 415aa7eccfa1a..1b6fe82e7bd46 100644
--- a/packages/elastic-apm-synthtrace/src/lib/utils/merge_iterable.ts
+++ b/packages/elastic-apm-synthtrace/src/lib/utils/merge_iterable.ts
@@ -6,20 +6,24 @@
  * Side Public License, v 1.
  */
 
+import { range } from 'lodash';
 import { ApmFields } from '../apm/apm_fields';
-import { SpanIterable } from '../span_iterable';
+import { Fields } from '../entity';
+import { EntityIterable } from '../entity_iterable';
 
-export function merge(iterables: SpanIterable[]): Iterable<ApmFields> {
+export function merge<TField extends Fields>(
+  iterables: Array<EntityIterable<TField>>
+): Iterable<TField> {
   if (iterables.length === 1) return iterables[0];
 
-  const iterators = iterables.map<Iterator<ApmFields>>((i) => {
-    return i[Symbol.iterator]();
+  const iterators = iterables.map<{ it: Iterator<ApmFields>; weight: number }>((i) => {
+    return { it: i[Symbol.iterator](), weight: Math.max(1, i.ratePerMinute()) };
   });
   let done = false;
-  const myIterable: Iterable<ApmFields> = {
+  const myIterable: Iterable<TField> = {
     *[Symbol.iterator]() {
       do {
-        const items = iterators.map((i) => i.next());
+        const items = iterators.flatMap((i) => range(0, i.weight).map(() => i.it.next()));
         done = items.every((item) => item.done);
         if (!done) {
           yield* items.filter((i) => !i.done).map((i) => i.value);
@@ -27,8 +31,8 @@ export function merge(iterables: SpanIterable[]): Iterable<ApmFields> {
       } while (!done);
       // Done for the first time: close all iterators
       for (const iterator of iterators) {
-        if (typeof iterator.return === 'function') {
-          iterator.return();
+        if (typeof iterator.it.return === 'function') {
+          iterator.it.return();
         }
       }
     },
diff --git a/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts b/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts
index b8792f6e1753c..b90bf7bb69c05 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts
@@ -6,14 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { apm, timerange } from '../../index';
+import { apm, timerange } from '../..';
+import { ApmFields } from '../../lib/apm/apm_fields';
 import { Instance } from '../../lib/apm/instance';
 import { Scenario } from '../scenario';
-import { getCommonServices } from '../utils/get_common_services';
+import { getLogger } from '../utils/get_common_services';
 import { RunOptions } from '../utils/parse_run_cli_flags';
 
-const scenario: Scenario = async (runOptions: RunOptions) => {
-  const { logger } = getCommonServices(runOptions);
+const scenario: Scenario<ApmFields> = async (runOptions: RunOptions) => {
+  const logger = getLogger(runOptions);
 
   const { numServices = 3 } = runOptions.scenarioOpts || {};
 
@@ -31,7 +32,7 @@ const scenario: Scenario = async (runOptions: RunOptions) => {
         apm.service(`opbeans-go-${index}`, 'production', 'go').instance('instance')
       );
       const instanceSpans = (instance: Instance) => {
-        const successfulTraceEvents = successfulTimestamps.spans((timestamp) =>
+        const successfulTraceEvents = successfulTimestamps.generator((timestamp) =>
           instance
             .transaction(transactionName)
             .timestamp(timestamp)
@@ -50,10 +51,9 @@ const scenario: Scenario = async (runOptions: RunOptions) => {
                 .success()
                 .timestamp(timestamp)
             )
-            .serialize()
         );
 
-        const failedTraceEvents = failedTimestamps.spans((timestamp) =>
+        const failedTraceEvents = failedTimestamps.generator((timestamp) =>
           instance
             .transaction(transactionName)
             .timestamp(timestamp)
@@ -62,13 +62,12 @@ const scenario: Scenario = async (runOptions: RunOptions) => {
             .errors(
               instance.error('[ResponseError] index_not_found_exception').timestamp(timestamp + 50)
             )
-            .serialize()
         );
 
         const metricsets = range
           .interval('30s')
           .rate(1)
-          .spans((timestamp) =>
+          .generator((timestamp) =>
             instance
               .appMetrics({
                 'system.memory.actual.free': 800,
@@ -77,15 +76,14 @@ const scenario: Scenario = async (runOptions: RunOptions) => {
                 'system.process.cpu.total.norm.pct': 0.7,
               })
               .timestamp(timestamp)
-              .serialize()
           );
 
-        return successfulTraceEvents.concat(failedTraceEvents, metricsets);
+        return successfulTraceEvents.merge(failedTraceEvents, metricsets);
       };
 
       return instances
         .map((instance) => logger.perf('generating_apm_events', () => instanceSpans(instance)))
-        .reduce((p, c) => p.concat(c));
+        .reduce((p, c) => p.merge(c));
     },
   };
 };
diff --git a/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts b/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts
index a19f0454e3447..6d31ae188be40 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/examples/02_kibana_stats.ts
@@ -6,17 +6,19 @@
  * Side Public License, v 1.
  */
 
-import { stackMonitoring, timerange } from '../../index';
+import { stackMonitoring, timerange } from '../..';
 import { Scenario } from '../scenario';
-import { getCommonServices } from '../utils/get_common_services';
+import { getLogger } from '../utils/get_common_services';
 import { RunOptions } from '../utils/parse_run_cli_flags';
+import { ApmFields } from '../../lib/apm/apm_fields';
 
-const scenario: Scenario = async (runOptions: RunOptions) => {
-  const { logger } = getCommonServices(runOptions);
+const scenario: Scenario<ApmFields> = async (runOptions: RunOptions) => {
+  const logger = getLogger(runOptions);
 
-  if (!runOptions.writeTarget) {
-    throw new Error('Write target is not defined');
-  }
+  // TODO reintroduce overwrite
+  // if (!runOptions.writeTarget) {
+  //  throw new Error('Write target is not defined');
+  // }
 
   return {
     generate: ({ from, to }) => {
@@ -26,9 +28,9 @@ const scenario: Scenario = async (runOptions: RunOptions) => {
       return range
         .interval('30s')
         .rate(1)
-        .spans((timestamp) => {
+        .generator((timestamp) => {
           const events = logger.perf('generating_sm_events', () => {
-            return kibanaStats.timestamp(timestamp).requests(10, 20).serialize();
+            return kibanaStats.timestamp(timestamp).requests(10, 20);
           });
           return events;
         });
diff --git a/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts b/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts
index cd98cf6ca0636..bcc1dfb50def2 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/examples/03_monitoring.ts
@@ -8,13 +8,14 @@
 
 // Run with: node ./src/scripts/run ./src/scripts/examples/03_monitoring.ts --target=http://elastic:changeme@localhost:9200
 
-import { stackMonitoring, timerange } from '../../index';
+import { stackMonitoring, timerange } from '../..';
 import { Scenario } from '../scenario';
-import { getCommonServices } from '../utils/get_common_services';
+import { getLogger } from '../utils/get_common_services';
 import { RunOptions } from '../utils/parse_run_cli_flags';
+import { StackMonitoringFields } from '../../lib/stack_monitoring/stack_monitoring_fields';
 
-const scenario: Scenario = async (runOptions: RunOptions) => {
-  const { logger } = getCommonServices(runOptions);
+const scenario: Scenario<StackMonitoringFields> = async (runOptions: RunOptions) => {
+  const logger = getLogger(runOptions);
 
   return {
     mapToIndex: (data) => {
@@ -28,18 +29,18 @@ const scenario: Scenario = async (runOptions: RunOptions) => {
       const kibanaStats = cluster.kibana('kibana-01').stats();
 
       const range = timerange(from, to);
-      return range
-        .interval('10s')
-        .rate(1)
-        .spans((timestamp) => {
-          const clusterEvents = logger.perf('generating_es_events', () => {
-            return clusterStats.timestamp(timestamp).indices(115).serialize();
-          });
-          const kibanaEvents = logger.perf('generating_kb_events', () => {
-            return kibanaStats.timestamp(timestamp).requests(10, 20).serialize();
-          });
-          return [...clusterEvents, ...kibanaEvents];
-        });
+      const interval = range.interval('10s').rate(1);
+      return interval
+        .generator((timestamp) =>
+          logger.perf('generating_es_events', () => clusterStats.timestamp(timestamp).indices(115))
+        )
+        .merge(
+          interval.generator((timestamp) =>
+            logger.perf('generating_kb_events', () =>
+              kibanaStats.timestamp(timestamp).requests(10, 20)
+            )
+          )
+        );
     },
   };
 };
diff --git a/packages/elastic-apm-synthtrace/src/scripts/run.js b/packages/elastic-apm-synthtrace/src/scripts/run.js
index 426b247b6b623..694fd2f869d40 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/run.js
+++ b/packages/elastic-apm-synthtrace/src/scripts/run.js
@@ -12,4 +12,4 @@ require('@babel/register')({
   presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
 });
 
-require('./run.ts');
+require('./run');
diff --git a/packages/elastic-apm-synthtrace/src/scripts/run.ts b/packages/elastic-apm-synthtrace/src/scripts/run.ts
index ac351eb99ee65..7ba3251def983 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/run.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/run.ts
@@ -14,7 +14,6 @@ import { startLiveDataUpload } from './utils/start_live_data_upload';
 import { parseRunCliFlags } from './utils/parse_run_cli_flags';
 import { getCommonServices } from './utils/get_common_services';
 import { ApmSynthtraceKibanaClient } from '../lib/apm/client/apm_synthtrace_kibana_client';
-import { ApmSynthtraceEsClient } from '../lib/apm/client/apm_synthtrace_es_client';
 
 function options(y: Argv) {
   return y
@@ -27,20 +26,29 @@ function options(y: Argv) {
       describe: 'Elasticsearch target',
       string: true,
     })
+    .option('kibana', {
+      describe: 'Kibana target, used to bootstrap datastreams/mappings/templates/settings',
+      string: true,
+    })
     .option('cloudId', {
       describe:
         'Provide connection information and will force APM on the cloud to migrate to run as a Fleet integration',
       string: true,
     })
+    .option('local', {
+      describe:
+        'Shortcut during development, assumes `yarn es snapshot` and `yarn start` are running',
+      boolean: true,
+    })
     .option('username', {
       describe: 'Basic authentication username',
       string: true,
-      demandOption: true,
+      default: 'elastic',
     })
     .option('password', {
       describe: 'Basic authentication password',
       string: true,
-      demandOption: true,
+      default: 'changeme',
     })
     .option('from', {
       description: 'The start of the time window',
@@ -52,14 +60,19 @@ function options(y: Argv) {
       description: 'Generate and index data continuously',
       boolean: true,
     })
-    .option('--dryRun', {
+    .option('dryRun', {
       description: 'Enumerates the stream without sending events to Elasticsearch ',
       boolean: true,
     })
     .option('maxDocs', {
+      description: 'The maximum number of documents we are allowed to generate',
+      number: true,
+    })
+    .option('maxDocsConfidence', {
       description:
-        'The maximum number of documents we are allowed to generate, should be multiple of 10.000',
+        'Expert setting: --maxDocs relies on accurate tpm reporting of generators setting this to >1 will widen the estimated data generation range',
       number: true,
+      default: 1,
     })
     .option('numShards', {
       description:
@@ -73,31 +86,15 @@ function options(y: Argv) {
     })
     .option('workers', {
       describe: 'Amount of Node.js worker threads',
-      default: 5,
-    })
-    .option('bucketSize', {
-      describe: 'Size of bucket for which to generate data',
-      default: '15m',
-    })
-    .option('interval', {
-      describe: 'The interval at which to index data',
-      default: '10s',
-    })
-    .option('clientWorkers', {
-      describe: 'Number of concurrently connected ES clients',
-      default: 5,
-    })
-    .option('batchSize', {
-      describe: 'Number of documents per bulk index request',
-      default: 1000,
+      number: true,
     })
     .option('logLevel', {
       describe: 'Log level',
       default: 'info',
     })
-    .option('writeTarget', {
-      describe: 'Target to index',
-      string: true,
+    .option('forceLegacyIndices', {
+      describe: 'Force writing to legacy indices',
+      boolean: true,
     })
     .option('scenarioOpts', {
       describe: 'Options specific to the scenario',
@@ -105,68 +102,115 @@ function options(y: Argv) {
         return arg as Record<string, any> | undefined;
       },
     })
-    .conflicts('to', 'live')
-    .conflicts('maxDocs', 'live')
-    .conflicts('target', 'cloudId');
+    .option('gcpRepository', {
+      describe:
+        'Allows you to register a GCP repository in <client_name>:<bucket>[:base_path] format',
+      string: true,
+    })
+
+    .conflicts('target', 'cloudId')
+    .conflicts('kibana', 'cloudId')
+    .conflicts('local', 'target')
+    .conflicts('local', 'kibana')
+    .conflicts('local', 'cloudId');
 }
 
 export type RunCliFlags = ReturnType<typeof options>['argv'];
 
 yargs(process.argv.slice(2))
-  .command('*', 'Generate data and index into Elasticsearch', options, async (argv) => {
-    const runOptions = parseRunCliFlags(argv);
-
-    const { logger, client } = getCommonServices(runOptions);
-
-    const toMs = datemath.parse(String(argv.to ?? 'now'))!.valueOf();
-    const to = new Date(toMs);
-    const defaultTimeRange = !runOptions.maxDocs ? '15m' : '52w';
-    const fromMs = argv.from
-      ? datemath.parse(String(argv.from))!.valueOf()
-      : toMs - intervalToMs(defaultTimeRange);
-    const from = new Date(fromMs);
-
-    const live = argv.live;
-
-    const forceDataStreams = !!runOptions.cloudId;
-    const esClient = new ApmSynthtraceEsClient(client, logger, forceDataStreams);
-    if (runOptions.dryRun) {
-      await startHistoricalDataUpload(esClient, logger, runOptions, from, to);
-      return;
-    }
-    if (runOptions.cloudId) {
-      const kibanaClient = new ApmSynthtraceKibanaClient(logger);
-      await kibanaClient.migrateCloudToManagedApm(
-        runOptions.cloudId,
-        runOptions.username,
-        runOptions.password
-      );
-    }
+  .command(
+    '*',
+    'Generate data and index into Elasticsearch',
+    options,
+    async (argv: RunCliFlags) => {
+      if (argv.local) {
+        argv.target = 'http://localhost:9200';
+      }
+      if (argv.kibana && !argv.target) {
+        const url = new URL(argv.kibana);
+        // super naive inference of ES target based on public kibana Cloud endpoint
+        if (url.hostname.match(/\.kb\./)) {
+          argv.target = argv.kibana.replace(/\.kb\./, '.es.');
+        }
+      }
 
-    if (runOptions.cloudId && runOptions.numShards && runOptions.numShards > 0) {
-      await esClient.updateComponentTemplates(runOptions.numShards);
-    }
+      const runOptions = parseRunCliFlags(argv);
 
-    if (argv.clean) {
-      await esClient.clean();
-    }
+      const { logger, apmEsClient } = getCommonServices(runOptions);
+
+      const toMs = datemath.parse(String(argv.to ?? 'now'))!.valueOf();
+      const to = new Date(toMs);
+      const defaultTimeRange = !runOptions.maxDocs ? '15m' : '520w';
+      const fromMs = argv.from
+        ? datemath.parse(String(argv.from))!.valueOf()
+        : toMs - intervalToMs(defaultTimeRange);
+      const from = new Date(fromMs);
+
+      const live = argv.live;
+
+      if (runOptions.dryRun) {
+        await startHistoricalDataUpload(apmEsClient, logger, runOptions, from, to, '8.0.0');
+        return;
+      }
+
+      // we need to know the running version to generate events that satisfy the min version requirements
+      let version = await apmEsClient.runningVersion();
+      logger.info(`Discovered Elasticsearch running version: ${version}`);
+      version = version.replace('-SNAPSHOT', '');
+
+      // We automatically set up managed APM either by migrating on cloud or installing the package locally
+      if (runOptions.cloudId || argv.local || argv.kibana) {
+        const kibanaClient = new ApmSynthtraceKibanaClient(logger);
+        if (runOptions.cloudId) {
+          await kibanaClient.migrateCloudToManagedApm(
+            runOptions.cloudId,
+            runOptions.username,
+            runOptions.password
+          );
+        } else {
+          let kibanaUrl: string | null = argv.kibana ?? null;
+          if (argv.local) {
+            kibanaUrl = await kibanaClient.discoverLocalKibana();
+          }
+          if (!kibanaUrl) throw Error('kibanaUrl could not be determined');
+          await kibanaClient.installApmPackage(
+            kibanaUrl,
+            version,
+            runOptions.username,
+            runOptions.password
+          );
+        }
+      }
+
+      if (runOptions.cloudId && runOptions.numShards && runOptions.numShards > 0) {
+        await apmEsClient.updateComponentTemplates(runOptions.numShards);
+      }
+
+      if (argv.clean) {
+        await apmEsClient.clean();
+      }
+      if (runOptions.gcpRepository) {
+        await apmEsClient.registerGcpRepository(runOptions.gcpRepository);
+      }
+
+      logger.info(
+        `Starting data generation\n: ${JSON.stringify(
+          {
+            ...runOptions,
+            from: from.toISOString(),
+            to: to.toISOString(),
+          },
+          null,
+          2
+        )}`
+      );
+
+      if (runOptions.maxDocs !== 0)
+        await startHistoricalDataUpload(apmEsClient, logger, runOptions, from, to, version);
 
-    logger.info(
-      `Starting data generation\n: ${JSON.stringify(
-        {
-          ...runOptions,
-          from: from.toISOString(),
-          to: to.toISOString(),
-        },
-        null,
-        2
-      )}`
-    );
-
-    await startHistoricalDataUpload(esClient, logger, runOptions, from, to);
-
-    if (live) {
-      await startLiveDataUpload(esClient, logger, runOptions, to);
+      if (live) {
+        await startLiveDataUpload(apmEsClient, logger, runOptions, to, version);
+      }
     }
-  })
+  )
   .parse();
diff --git a/packages/elastic-apm-synthtrace/src/scripts/scenario.ts b/packages/elastic-apm-synthtrace/src/scripts/scenario.ts
index 089babab04413..10201a02dd601 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/scenario.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/scenario.ts
@@ -7,10 +7,10 @@
  */
 
 import { RunOptions } from './utils/parse_run_cli_flags';
-import { SpanIterable } from '../lib/span_iterable';
+import { EntityIterable } from '../lib/entity_iterable';
 
-type Generate = (range: { from: Date; to: Date }) => SpanIterable;
-export type Scenario = (options: RunOptions) => Promise<{
-  generate: Generate;
+type Generate<TFields> = (range: { from: Date; to: Date }) => EntityIterable<TFields>;
+export type Scenario<TFields> = (options: RunOptions) => Promise<{
+  generate: Generate<TFields>;
   mapToIndex?: (data: Record<string, any>) => string;
 }>;
diff --git a/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts
new file mode 100644
index 0000000000000..91412a45a7508
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_low_throughput.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { random } from 'lodash';
+import { apm, timerange } from '../..';
+import { ApmFields } from '../../lib/apm/apm_fields';
+import { Instance } from '../../lib/apm/instance';
+import { Scenario } from '../scenario';
+import { getLogger } from '../utils/get_common_services';
+import { RunOptions } from '../utils/parse_run_cli_flags';
+
+const scenario: Scenario<ApmFields> = async (runOptions: RunOptions) => {
+  const logger = getLogger(runOptions);
+
+  const numServices = 3;
+  const languages = ['go', 'dotnet', 'java', 'python'];
+  const services = ['web', 'order-processing', 'api-backend', 'proxy'];
+
+  return {
+    generate: ({ from, to }) => {
+      const range = timerange(from, to);
+
+      const successfulTimestamps = range.interval('1s').rate(1);
+      // `.randomize(3, 180);
+
+      const instances = [...Array(numServices).keys()].map((index) =>
+        apm
+          .service(
+            `${services[index % services.length]}-${languages[index % languages.length]}-${index}`,
+            'production',
+            languages[index % languages.length]
+          )
+          .instance('instance')
+      );
+
+      const urls = ['GET /order/{id}', 'POST /basket/{id}', 'DELETE /basket', 'GET /products'];
+
+      const instanceSpans = (instance: Instance, url: string, index: number) => {
+        const successfulTraceEvents = successfulTimestamps.generator((timestamp) => {
+          const mod = index % 4;
+          const randomHigh = random(100, mod * 1000);
+          const randomLow = random(10, randomHigh / 10 + mod * 3);
+          const duration = random(randomLow, randomHigh);
+          const childDuration = random(randomLow, duration);
+          const remainderDuration = duration - childDuration;
+          const generateError = index % random(mod, 9) === 0;
+          const generateChildError = index % random(mod, 9) === 0;
+          const span = instance
+            .transaction(url)
+            .timestamp(timestamp)
+            .duration(duration)
+            .children(
+              instance
+                .span('GET apm-*/_search', 'db', 'elasticsearch')
+                .duration(childDuration)
+                .destination('elasticsearch')
+                .timestamp(timestamp)
+                .outcome(generateError && generateChildError ? 'failure' : 'success'),
+              instance
+                .span('custom_operation', 'custom')
+                .duration(remainderDuration)
+                .success()
+                .timestamp(timestamp + childDuration)
+            );
+          return !generateError
+            ? span.success()
+            : span
+                .failure()
+                .errors(instance.error(`No handler for ${url}`).timestamp(timestamp + 50));
+        });
+
+        return successfulTraceEvents;
+      };
+
+      return instances
+        .flatMap((instance) => urls.map((url) => ({ instance, url })))
+        .map(({ instance, url }, index) =>
+          logger.perf('generating_apm_events', () => instanceSpans(instance, url, index))
+        )
+        .reduce((p, c) => p.merge(c));
+    },
+  };
+};
+
+export default scenario;
diff --git a/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts
new file mode 100644
index 0000000000000..728884c1a8df5
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/scripts/scenarios/01_many_services.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { random } from 'lodash';
+import { apm, timerange } from '../..';
+import { Instance } from '../../lib/apm/instance';
+import { Scenario } from '../scenario';
+import { getLogger } from '../utils/get_common_services';
+import { RunOptions } from '../utils/parse_run_cli_flags';
+import { ApmFields } from '../../lib/apm/apm_fields';
+
+const scenario: Scenario<ApmFields> = async (runOptions: RunOptions) => {
+  const logger = getLogger(runOptions);
+
+  const numServices = 500;
+  const languages = ['go', 'dotnet', 'java', 'python'];
+  const services = ['web', 'order-processing', 'api-backend', 'proxy'];
+
+  return {
+    generate: ({ from, to }) => {
+      const range = timerange(from, to);
+
+      const successfulTimestamps = range.interval('1s').rate(3);
+
+      const instances = [...Array(numServices).keys()].map((index) =>
+        apm
+          .service(
+            `${services[index % services.length]}-${languages[index % languages.length]}-${index}`,
+            'production',
+            languages[index % languages.length]
+          )
+          .instance('instance')
+      );
+
+      const urls = ['GET /order/{id}', 'POST /basket/{id}', 'DELETE /basket', 'GET /products'];
+
+      const instanceSpans = (instance: Instance, url: string) => {
+        const successfulTraceEvents = successfulTimestamps.generator((timestamp) => {
+          const randomHigh = random(1000, 4000);
+          const randomLow = random(100, randomHigh / 5);
+          const duration = random(randomLow, randomHigh);
+          const childDuration = random(randomLow, duration);
+          const remainderDuration = duration - childDuration;
+          const generateError = random(1, 4) % 3 === 0;
+          const generateChildError = random(0, 5) % 2 === 0;
+          const span = instance
+            .transaction(url)
+            .timestamp(timestamp)
+            .duration(duration)
+            .children(
+              instance
+                .span('GET apm-*/_search', 'db', 'elasticsearch')
+                .duration(childDuration)
+                .destination('elasticsearch')
+                .timestamp(timestamp)
+                .outcome(generateError && generateChildError ? 'failure' : 'success'),
+              instance
+                .span('custom_operation', 'custom')
+                .duration(remainderDuration)
+                .success()
+                .timestamp(timestamp + childDuration)
+            );
+          return !generateError
+            ? span.success()
+            : span
+                .failure()
+                .errors(instance.error(`No handler for ${url}`).timestamp(timestamp + 50));
+        });
+
+        return successfulTraceEvents;
+      };
+
+      return instances
+        .flatMap((instance) => urls.map((url) => ({ instance, url })))
+        .map(({ instance, url }) =>
+          logger.perf('generating_apm_events', () => instanceSpans(instance, url))
+        )
+        .reduce((p, c) => p.merge(c));
+    },
+  };
+};
+
+export default scenario;
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/get_common_services.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/get_common_services.ts
index 88e5c75e39995..e39aa9fa7112e 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/get_common_services.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/get_common_services.ts
@@ -7,10 +7,18 @@
  */
 
 import { Client, ClientOptions } from '@elastic/elasticsearch';
-import { createLogger } from '../../lib/utils/create_logger';
+import { ApmSynthtraceEsClient } from '../../lib/apm/client/apm_synthtrace_es_client';
+import { createLogger, Logger } from '../../lib/utils/create_logger';
 import { RunOptions } from './parse_run_cli_flags';
 
-export function getCommonServices({ target, cloudId, username, password, logLevel }: RunOptions) {
+export function getLogger({ logLevel }: RunOptions) {
+  return createLogger(logLevel);
+}
+
+export function getCommonServices(
+  { target, cloudId, username, password, logLevel, forceLegacyIndices }: RunOptions,
+  logger?: Logger
+) {
   if (!target && !cloudId) {
     throw Error('target or cloudId needs to be specified');
   }
@@ -19,14 +27,27 @@ export function getCommonServices({ target, cloudId, username, password, logLeve
     username,
     password,
   };
+  // Useful when debugging trough mitmproxy
+  /*
+  options.Connection = HttpConnection;
+  options.proxy = 'http://localhost:8080';
+  options.tls = {
+    rejectUnauthorized: false,
+  };
 
+   */
   const client = new Client(options);
 
-  const logger = createLogger(logLevel);
+  logger = logger ?? createLogger(logLevel);
+
+  const apmEsClient = new ApmSynthtraceEsClient(client, logger, {
+    forceLegacyIndices,
+    refreshAfterIndex: false,
+  });
 
   return {
     logger,
-    client,
+    apmEsClient,
   };
 }
 
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/get_scenario.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/get_scenario.ts
index 43f9e4f5e9988..3f929a62179d8 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/get_scenario.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/get_scenario.ts
@@ -8,6 +8,7 @@
 import Path from 'path';
 import { Logger } from '../../lib/utils/create_logger';
 import { Scenario } from '../scenario';
+import { Fields } from '../../lib/entity';
 
 export function getScenario({ file, logger }: { file: unknown; logger: Logger }) {
   const location = Path.join(process.cwd(), String(file));
@@ -19,5 +20,5 @@ export function getScenario({ file, logger }: { file: unknown; logger: Logger })
       return m.default;
     }
     throw new Error(`Could not find scenario at ${location}`);
-  }) as Promise<Scenario>;
+  }) as Promise<Scenario<Fields>>;
 }
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts
index 5a8b6f96c6316..f2343af9bf2b4 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/parse_run_cli_flags.ts
@@ -9,10 +9,9 @@
 import { pick } from 'lodash';
 import { LogLevel } from '../../lib/utils/create_logger';
 import { RunCliFlags } from '../run';
-import { intervalToMs } from './interval_to_ms';
 
 export function parseRunCliFlags(flags: RunCliFlags) {
-  const { file, _, logLevel, interval, bucketSize } = flags;
+  const { file, _, logLevel } = flags;
 
   const parsedFile = String(file || _[0]);
 
@@ -35,35 +34,24 @@ export function parseRunCliFlags(flags: RunCliFlags) {
       break;
   }
 
-  const intervalInMs = intervalToMs(interval);
-  if (!intervalInMs) {
-    throw new Error('Invalid interval');
-  }
-
-  const bucketSizeInMs = intervalToMs(bucketSize);
-
-  if (!bucketSizeInMs) {
-    throw new Error('Invalid bucket size');
-  }
-
   return {
     ...pick(
       flags,
       'maxDocs',
+      'maxDocsConfidence',
       'target',
       'cloudId',
       'username',
       'password',
       'workers',
-      'clientWorkers',
-      'batchSize',
-      'writeTarget',
+      'flushSizeBulk',
+      'flushSize',
       'numShards',
       'scenarioOpts',
-      'dryRun'
+      'forceLegacyIndices',
+      'dryRun',
+      'gcpRepository'
     ),
-    intervalInMs,
-    bucketSizeInMs,
     logLevel: parsedLogLevel,
     file: parsedFile,
   };
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/start_historical_data_upload.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/start_historical_data_upload.ts
index 415292a85e0e0..06de376223075 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/start_historical_data_upload.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/start_historical_data_upload.ts
@@ -5,55 +5,218 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import moment from 'moment';
+import { Worker } from 'worker_threads';
+import Path from 'path';
+import { range } from 'lodash';
+import pLimit from 'p-limit';
+import { cpus } from 'os';
 import { RunOptions } from './parse_run_cli_flags';
 import { getScenario } from './get_scenario';
-import { ApmSynthtraceEsClient } from '../../lib/apm';
+import { ApmSynthtraceEsClient, LogLevel } from '../..';
 import { Logger } from '../../lib/utils/create_logger';
-import { StreamProcessor } from '../../lib/stream_processor';
 
 export async function startHistoricalDataUpload(
   esClient: ApmSynthtraceEsClient,
   logger: Logger,
   runOptions: RunOptions,
   from: Date,
-  to: Date
+  to: Date,
+  version: string
 ) {
+  // if we want to generate a maximum number of documents reverse generation to descend.
+  [from, to] = runOptions.maxDocs ? [to, from] : [from, to];
+
   const file = runOptions.file;
   const scenario = await logger.perf('get_scenario', () => getScenario({ file, logger }));
+  const { generate } = await scenario(runOptions);
 
-  const { generate, mapToIndex } = await scenario(runOptions);
-
-  // if we want to generate a maximum number of documents reverse generation to descend.
-  [from, to] = runOptions.maxDocs ? [to, from] : [from, to];
+  const cores = cpus().length;
+  // settle on a reasonable max concurrency arbitrarily capping at 10.
+  let maxConcurrency = Math.min(10, cores - 1);
+  // maxWorkers to be spawned is double that of maxConcurrency. We estimate the number of ranges over
+  // maxConcurrency, if that is too conservative this provides more available workers to complete the job.
+  // If any worker finds that work is already completed they will spin down immediately.
+  let maxWorkers = maxConcurrency * 2;
+  logger.info(
+    `Discovered ${cores} cores, splitting work over ${maxWorkers} workers with limited concurrency: ${maxConcurrency}`
+  );
 
-  logger.info(`Generating data from ${from} to ${to}`);
+  // if --workers N is specified it should take precedence over inferred maximum workers
+  if (runOptions.workers) {
+    // ensure maxWorkers is at least 1
+    maxWorkers = Math.max(1, runOptions.workers);
+    // ensure max concurrency is at least 1 or the ceil of --workers N / 2
+    maxConcurrency = Math.ceil(Math.max(1, maxWorkers / 2));
+    logger.info(
+      `updating maxWorkers to ${maxWorkers} and maxConcurrency to ${maxConcurrency} because it was explicitly set through --workers`
+    );
+  }
 
   const events = logger.perf('generate_scenario', () => generate({ from, to }));
+  const ratePerMinute = events.ratePerMinute();
+  logger.info(
+    `Scenario is generating ${ratePerMinute.toLocaleString()} events per minute interval`
+  );
+  let rangeEnd = to;
+  if (runOptions.maxDocs) {
+    // estimate a more accurate range end for when --maxDocs is specified
+    rangeEnd = moment(from)
+      // ratePerMinute() is not exact if the generator is yielding variable documents
+      // the rate is calculated by peeking the first yielded event and its children.
+      // for real complex cases manually specifying --to is encouraged.
+      .subtract((runOptions.maxDocs / ratePerMinute) * runOptions.maxDocsConfidence, 'm')
+      .toDate();
+  }
+  const diff = moment(from).diff(rangeEnd);
+  const d = moment.duration(Math.abs(diff), 'ms');
+  logger.info(
+    `Range: ${d.years()} days ${d.days()} days, ${d.hours()} hours ${d.minutes()} minutes ${d.seconds()} seconds`
+  );
+  // make sure ranges cover at least 100k documents
+  const minIntervalSpan = moment.duration(100000 / ratePerMinute, 'm');
+  const minNumberOfRanges = d.asMilliseconds() / minIntervalSpan.asMilliseconds();
+  if (minNumberOfRanges < maxWorkers) {
+    maxWorkers = Math.max(1, Math.floor(minNumberOfRanges));
+    maxConcurrency = Math.max(1, maxWorkers / 2);
+    if (runOptions.workers) {
+      logger.info(
+        `Ignoring --workers ${runOptions.workers} since each worker would not see enough data`
+      );
+    }
+    logger.info(
+      `updating maxWorkers to ${maxWorkers} and maxConcurrency to ${maxConcurrency} to ensure each worker does enough work`
+    );
+  }
 
-  if (runOptions.dryRun) {
-    const maxDocs = runOptions.maxDocs;
-    const stream = new StreamProcessor({
-      processors: StreamProcessor.apmProcessors,
-      maxSourceEvents: maxDocs,
-      logger,
-    }).streamToDocument(StreamProcessor.toDocument, events);
-    logger.perf('enumerate_scenario', () => {
-      // @ts-ignore
-      // We just want to enumerate
-      let yielded = 0;
-      for (const _ of stream) {
-        yielded++;
+  logger.info(`Generating data from ${from.toISOString()} to ${rangeEnd.toISOString()}`);
+
+  type WorkerMessages =
+    | { log: LogLevel; args: any[] }
+    | { workerIndex: number; processedDocuments: number }
+    | { workerIndex: number; firstTimestamp: Date }
+    | { workerIndex: number; lastTimestamp: Date };
+
+  interface WorkerTotals {
+    total: number;
+    bucketFrom: Date;
+    bucketTo: Date;
+    firstTimestamp?: Date;
+    lastTimestamp?: Date;
+  }
+
+  function rangeStep(interval: number) {
+    if (from > rangeEnd) return moment(from).subtract(interval, 'ms').toDate();
+    return moment(from).add(interval, 'ms').toDate();
+  }
+
+  // precalculate intervals to spawn workers over.
+  // abs() the difference to make add/subtract explicit in rangeStep() in favor of subtracting a negative number
+  const intervalSpan = Math.abs(diff / maxWorkers);
+  const intervals = range(0, maxWorkers)
+    .map((i) => intervalSpan * i)
+    .map((interval, index) => ({
+      workerIndex: index,
+      bucketFrom: rangeStep(interval),
+      bucketTo: rangeStep(interval + intervalSpan),
+    }));
+
+  // precalculate interval state for each worker to report on.
+  let totalProcessed = 0;
+  const workerProcessed = range(0, maxWorkers).reduce<Record<number, WorkerTotals>>((p, c, i) => {
+    p[i] = { total: 0, bucketFrom: intervals[i].bucketFrom, bucketTo: intervals[i].bucketTo };
+    return p;
+  }, {});
+
+  function runService({
+    bucketFrom,
+    bucketTo,
+    workerIndex,
+  }: {
+    bucketFrom: Date;
+    bucketTo: Date;
+    workerIndex: number;
+  }) {
+    return new Promise((resolve, reject) => {
+      logger.info(`Setting up Worker: ${workerIndex}`);
+      if (runOptions.maxDocs && totalProcessed >= runOptions.maxDocs + 10000) {
+        logger.info(
+          `Worker ${workerIndex} has no need to run since ${totalProcessed} documents were already processed `
+        );
+        return resolve(null);
       }
+      const progressToConsole = runOptions?.maxDocs
+        ? Math.min(2000000, runOptions.maxDocs / 20)
+        : 2000000;
+      const worker = new Worker(Path.join(__dirname, './worker.js'), {
+        workerData: {
+          runOptions,
+          bucketFrom,
+          bucketTo,
+          workerIndex,
+          version,
+        },
+      });
+      worker.on('message', (message: WorkerMessages) => {
+        if ('workerIndex' in message) {
+          if ('processedDocuments' in message) {
+            totalProcessed += message.processedDocuments;
+            workerProcessed[workerIndex].total += message.processedDocuments;
+            const check = Math.round(totalProcessed / 10000) * 10000;
+            if (check % progressToConsole === 0) {
+              logger.info(`processed: ${totalProcessed} documents`);
+            }
+          }
+          if ('firstTimestamp' in message)
+            workerProcessed[message.workerIndex].firstTimestamp = message.firstTimestamp;
+          if ('lastTimestamp' in message)
+            workerProcessed[message.workerIndex].lastTimestamp = message.lastTimestamp;
+        } else {
+          switch (message.log) {
+            case LogLevel.debug:
+              logger.debug.apply({}, message.args);
+              return;
+            case LogLevel.info:
+              logger.info.apply({}, message.args);
+              return;
+            case LogLevel.trace:
+              logger.debug.apply({}, message.args);
+              return;
+            case LogLevel.error:
+              logger.error.apply({}, message.args);
+              return;
+            default:
+              logger.info(message);
+          }
+        }
+      });
+      worker.on('error', (message) => {
+        logger.error(message);
+        reject();
+      });
+      worker.on('exit', (code) => {
+        if (code === 2) reject(new Error(`Worker ${workerIndex} exited with error: ${code}`));
+        if (code === 1) {
+          logger.info(`Worker ${workerIndex} exited early because cancellation was requested`);
+        }
+        resolve(null);
+      });
+      worker.postMessage('setup');
+      worker.postMessage('start');
     });
-    return;
   }
 
-  const clientWorkers = runOptions.clientWorkers;
-  await logger.perf('index_scenario', () =>
-    esClient.index(events, {
-      concurrency: clientWorkers,
-      maxDocs: runOptions.maxDocs,
-      mapToIndex,
+  const limiter = pLimit(Math.max(1, Math.floor(intervals.length / 2)));
+  const workers = range(0, intervals.length).map((index) => () => runService(intervals[index]));
+  return Promise.all(workers.map((worker) => limiter(() => worker())))
+    .then(async () => {
+      if (!runOptions.dryRun) {
+        await esClient.refresh();
+      }
     })
-  );
+    .then(() => {
+      // eslint-disable-next-line no-console
+      console.table(workerProcessed);
+      logger.info(`Finished producing ${totalProcessed} events`);
+    });
 }
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/start_live_data_upload.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/start_live_data_upload.ts
index b3e4776498788..154b804626c03 100644
--- a/packages/elastic-apm-synthtrace/src/scripts/utils/start_live_data_upload.ts
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/start_live_data_upload.ts
@@ -12,13 +12,15 @@ import { RunOptions } from './parse_run_cli_flags';
 import { ApmFields } from '../../lib/apm/apm_fields';
 import { ApmSynthtraceEsClient } from '../../lib/apm';
 import { Logger } from '../../lib/utils/create_logger';
-import { SpanArrayIterable } from '../../lib/span_iterable';
+import { EntityArrayIterable } from '../../lib/entity_iterable';
+import { StreamProcessor } from '../../lib/stream_processor';
 
 export async function startLiveDataUpload(
   esClient: ApmSynthtraceEsClient,
   logger: Logger,
   runOptions: RunOptions,
-  start: Date
+  start: Date,
+  version: string
 ) {
   const file = runOptions.file;
 
@@ -27,12 +29,13 @@ export async function startLiveDataUpload(
 
   let queuedEvents: ApmFields[] = [];
   let requestedUntil: Date = start;
+  const bucketSizeInMs = 1000 * 60;
 
   async function uploadNextBatch() {
     const end = new Date();
     if (end > requestedUntil) {
       const bucketFrom = requestedUntil;
-      const bucketTo = new Date(requestedUntil.getTime() + runOptions.bucketSizeInMs);
+      const bucketTo = new Date(requestedUntil.getTime() + bucketSizeInMs);
       // TODO this materializes into an array, assumption is that the live buffer will fit in memory
       const nextEvents = logger.perf('execute_scenario', () =>
         generate({ from: bucketFrom, to: bucketTo }).toArray()
@@ -55,19 +58,30 @@ export async function startLiveDataUpload(
     logger.info(`Uploading until ${new Date(end).toISOString()}, events: ${eventsToUpload.length}`);
 
     queuedEvents = eventsToRemainInQueue;
-
+    const streamProcessor = new StreamProcessor({
+      version,
+      logger,
+      processors: StreamProcessor.apmProcessors,
+      maxSourceEvents: runOptions.maxDocs,
+      name: `Live index`,
+    });
     await logger.perf('index_live_scenario', () =>
-      esClient.index(new SpanArrayIterable(eventsToUpload), {
-        concurrency: runOptions.clientWorkers,
-        maxDocs: runOptions.maxDocs,
-        mapToIndex,
-      })
+      esClient.index(
+        new EntityArrayIterable(eventsToUpload),
+        {
+          concurrency: runOptions.workers,
+          maxDocs: runOptions.maxDocs,
+          mapToIndex,
+          dryRun: false,
+        },
+        streamProcessor
+      )
     );
   }
 
   do {
     await uploadNextBatch();
-    await delay(runOptions.intervalInMs);
+    await delay(bucketSizeInMs);
   } while (true);
 }
 async function delay(ms: number) {
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js b/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js
new file mode 100644
index 0000000000000..84887f4d9285b
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/worker.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/* eslint-disable @typescript-eslint/no-var-requires*/
+require('@babel/register')({
+  extensions: ['.ts', '.js'],
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }], '@babel/preset-typescript'],
+});
+
+require('./worker');
diff --git a/packages/elastic-apm-synthtrace/src/scripts/utils/worker.ts b/packages/elastic-apm-synthtrace/src/scripts/utils/worker.ts
new file mode 100644
index 0000000000000..4e4ef8a02ff71
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/scripts/utils/worker.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// import pLimit from 'p-limit';
+import { workerData, parentPort } from 'worker_threads';
+import { RunOptions } from './parse_run_cli_flags';
+import { getScenario } from './get_scenario';
+import { StreamToBulkOptions } from '../../lib/apm/client/apm_synthtrace_es_client';
+import { getCommonServices } from './get_common_services';
+import { LogLevel } from '../../lib/utils/create_logger';
+import { StreamProcessor } from '../../lib/stream_processor';
+import { Scenario } from '../scenario';
+import { EntityIterable, Fields } from '../..';
+
+// logging proxy to main thread, ensures we see real time logging
+const l = {
+  perf: <T extends any>(name: string, cb: () => T): T => {
+    return cb();
+  },
+  debug: (...args: any[]) => parentPort?.postMessage({ log: LogLevel.debug, args }),
+  info: (...args: any[]) => parentPort?.postMessage({ log: LogLevel.info, args }),
+  error: (...args: any[]) => parentPort?.postMessage({ log: LogLevel.error, args }),
+};
+
+export interface WorkerData {
+  bucketFrom: Date;
+  bucketTo: Date;
+  runOptions: RunOptions;
+  workerIndex: number;
+  version: string;
+}
+
+const { bucketFrom, bucketTo, runOptions, workerIndex, version } = workerData as WorkerData;
+
+const { logger, apmEsClient } = getCommonServices(runOptions, l);
+const file = runOptions.file;
+let scenario: Scenario<Fields>;
+let events: EntityIterable<Fields>;
+let streamToBulkOptions: StreamToBulkOptions;
+let streamProcessor: StreamProcessor;
+
+async function setup() {
+  scenario = await logger.perf('get_scenario', () => getScenario({ file, logger }));
+  const { generate, mapToIndex } = await scenario(runOptions);
+
+  events = logger.perf('generate_scenario', () => generate({ from: bucketFrom, to: bucketTo }));
+  streamToBulkOptions = {
+    maxDocs: runOptions.maxDocs,
+    mapToIndex,
+    dryRun: !!runOptions.dryRun,
+  };
+  streamToBulkOptions.itemStartStopCallback = (item, done) => {
+    if (!item) return;
+    if (!done) {
+      parentPort?.postMessage({ workerIndex, firstTimestamp: item['@timestamp'] });
+    } else {
+      parentPort?.postMessage({ workerIndex, lastTimestamp: item['@timestamp'] });
+    }
+  };
+  streamProcessor = new StreamProcessor({
+    version,
+    processors: StreamProcessor.apmProcessors,
+    maxSourceEvents: runOptions.maxDocs,
+    logger: l,
+    processedCallback: (processedDocuments) => {
+      parentPort!.postMessage({ workerIndex, processedDocuments });
+    },
+    name: `Worker ${workerIndex}`,
+  });
+}
+
+async function doWork() {
+  await logger.perf(
+    'index_scenario',
+    async () => await apmEsClient.index(events, streamToBulkOptions, streamProcessor)
+  );
+}
+
+parentPort!.on('message', async (message) => {
+  if (message === 'setup') {
+    await setup();
+  }
+  if (message === 'start') {
+    try {
+      await doWork();
+      process.exit(0);
+    } catch (error) {
+      l.info(error);
+      process.exit(2);
+    }
+  }
+});
diff --git a/packages/elastic-apm-synthtrace/src/test/apm_events_to_elasticsearch_output.test.ts b/packages/elastic-apm-synthtrace/src/test/apm_events_to_elasticsearch_output.test.ts
index defdcc73cf6cb..3d4225cf3f243 100644
--- a/packages/elastic-apm-synthtrace/src/test/apm_events_to_elasticsearch_output.test.ts
+++ b/packages/elastic-apm-synthtrace/src/test/apm_events_to_elasticsearch_output.test.ts
@@ -11,6 +11,7 @@ import { StreamProcessor } from '../lib/stream_processor';
 
 describe('output apm events to elasticsearch', () => {
   let event: ApmFields;
+  const streamProcessor = new StreamProcessor({ processors: [], version: '8.0.0' });
 
   beforeEach(() => {
     event = {
@@ -22,12 +23,12 @@ describe('output apm events to elasticsearch', () => {
   });
 
   it('properly formats @timestamp', () => {
-    const doc = StreamProcessor.toDocument(event);
+    const doc = streamProcessor.toDocument(event);
     expect(doc['@timestamp']).toEqual('2020-12-31T23:00:00.000Z');
   });
 
   it('formats a nested object', () => {
-    const doc = StreamProcessor.toDocument(event);
+    const doc = streamProcessor.toDocument(event);
 
     expect(doc.processor).toEqual({
       event: 'transaction',
@@ -36,7 +37,7 @@ describe('output apm events to elasticsearch', () => {
   });
 
   it('formats all fields consistently', () => {
-    const doc = StreamProcessor.toDocument(event);
+    const doc = streamProcessor.toDocument(event);
 
     expect(doc).toMatchInlineSnapshot(`
       Object {
diff --git a/packages/elastic-apm-synthtrace/src/test/event_dsl_behavior.test.ts b/packages/elastic-apm-synthtrace/src/test/event_dsl_behavior.test.ts
new file mode 100644
index 0000000000000..31a5ed02429d5
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/test/event_dsl_behavior.test.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { EntityArrayIterable } from '../lib/entity_iterable';
+import { apm } from '../lib/apm';
+import { timerange } from '../lib/timerange';
+import { ApmFields } from '../lib/apm/apm_fields';
+
+describe('DSL invocations', () => {
+  let arrayIterable: EntityArrayIterable<ApmFields>;
+  let eventsCopy: Array<Record<string, any>>;
+
+  const range = timerange(
+    new Date('2021-01-01T00:00:00.000Z'),
+    new Date('2021-01-01T00:15:00.000Z')
+  );
+  const javaService = apm.service('opbeans-java', 'production', 'java');
+  const javaInstance = javaService.instance('instance-1');
+  let globalSeq = 0;
+
+  const iterable = range
+    .interval('1m')
+    .rate(1)
+    .generator((timestamp, index) =>
+      javaInstance
+        .transaction(`GET /api/product/${index}/${globalSeq++}`)
+        .duration(1000)
+        .success()
+        .timestamp(timestamp)
+        .children(
+          javaInstance
+            .span('GET apm-*/_search', 'db', 'elasticsearch')
+            .success()
+            .duration(900)
+            .timestamp(timestamp + 50)
+        )
+    );
+  const events = iterable.toArray();
+
+  beforeEach(() => {
+    eventsCopy = iterable.toArray();
+    arrayIterable = new EntityArrayIterable(events);
+  });
+  it('to array on iterable reads to completion', () => {
+    expect(events.length).toBe(15 * 2);
+  });
+  it('calling to array on SpanArrayIterable returns all events', () => {
+    expect(arrayIterable.toArray().length).toBe(15 * 2);
+  });
+  it('calling toArray multiple times always sees all events', () => {
+    expect(eventsCopy.length).toBe(15 * 2);
+  });
+  it('will yield the first peeked value', () => {
+    expect(events[0]['transaction.name']).toBe('GET /api/product/0/0');
+  });
+  it('2nd invocation of toArray sees a new copy of generator invocation', () => {
+    expect(eventsCopy[0]['transaction.name']).not.toBe('GET /api/product/0/0');
+  });
+  it('array iterable holds a copy and will yield the same items', () => {
+    const copy = arrayIterable.toArray();
+    expect(events[0]['transaction.name']).toBe(copy[0]['transaction.name']);
+  });
+});
diff --git a/packages/elastic-apm-synthtrace/src/test/rate_per_minute.test.ts b/packages/elastic-apm-synthtrace/src/test/rate_per_minute.test.ts
new file mode 100644
index 0000000000000..73517976737bb
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/test/rate_per_minute.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { EntityArrayIterable, EntityIterable } from '../lib/entity_iterable';
+import { apm } from '../lib/apm';
+import { timerange } from '../lib/timerange';
+import { ApmFields } from '../lib/apm/apm_fields';
+
+describe('rate per minute calculations', () => {
+  let iterable: EntityIterable<ApmFields>;
+  let arrayIterable: EntityArrayIterable<ApmFields>;
+  let events: Array<Record<string, any>>;
+
+  const range = timerange(
+    new Date('2021-01-01T00:00:00.000Z'),
+    new Date('2021-01-01T00:15:00.000Z')
+  );
+
+  const i1r3 = range.interval('1m').rate(3);
+  const i5r6 = range.interval('5m').rate(6);
+  const i30r6 = range.interval('30m').rate(6);
+  const i1sr3 = range.interval('1s').rate(3);
+
+  beforeEach(() => {
+    const javaService = apm.service('opbeans-java', 'production', 'java');
+    const javaInstance = javaService.instance('instance-1');
+
+    iterable = range
+      .interval('1m')
+      .rate(1)
+      .generator((timestamp) =>
+        javaInstance
+          .transaction('GET /api/product/list')
+          .duration(1000)
+          .success()
+          .timestamp(timestamp)
+          .children(
+            javaInstance
+              .span('GET apm-*/_search', 'db', 'elasticsearch')
+              .success()
+              .duration(900)
+              .timestamp(timestamp + 50)
+          )
+      );
+    events = iterable.toArray();
+    arrayIterable = new EntityArrayIterable(events);
+  });
+  it('array iterable returns exact rate per minute', () => {
+    expect(arrayIterable.ratePerMinute()).toEqual(2);
+  });
+  it('iterable returns rate per minute approximation', () => {
+    expect(iterable.ratePerMinute()).toEqual(2);
+  });
+  it('iterable returns same rate as materialized iterable', () => {
+    expect(iterable.ratePerMinute()).toEqual(arrayIterable.ratePerMinute());
+  });
+
+  it('interval of 3 per minute returns 3', () => {
+    expect(i1r3.ratePerMinute()).toEqual(3);
+  });
+  it('interval of 6 per 5 minutes returns 6/5', () => {
+    expect(i5r6.ratePerMinute()).toEqual(6 / 5);
+  });
+  it('interval of 6 per 30 minutes returns 6/30', () => {
+    expect(i30r6.ratePerMinute()).toEqual(6 / 30);
+  });
+  it('interval of 3 per second returns 60 * 3', () => {
+    expect(i1sr3.ratePerMinute()).toEqual(60 * 3);
+  });
+});
diff --git a/packages/elastic-apm-synthtrace/src/test/scenarios/01_simple_trace.test.ts b/packages/elastic-apm-synthtrace/src/test/scenarios/01_simple_trace.test.ts
index ce42dfc2a8e6c..530856cb956dc 100644
--- a/packages/elastic-apm-synthtrace/src/test/scenarios/01_simple_trace.test.ts
+++ b/packages/elastic-apm-synthtrace/src/test/scenarios/01_simple_trace.test.ts
@@ -6,10 +6,13 @@
  * Side Public License, v 1.
  */
 
+import { EntityIterable } from '../..';
 import { apm } from '../../lib/apm';
+import { ApmFields } from '../../lib/apm/apm_fields';
 import { timerange } from '../../lib/timerange';
 
 describe('simple trace', () => {
+  let iterable: EntityIterable<ApmFields>;
   let events: Array<Record<string, any>>;
 
   beforeEach(() => {
@@ -21,10 +24,10 @@ describe('simple trace', () => {
       new Date('2021-01-01T00:15:00.000Z')
     );
 
-    events = range
+    iterable = range
       .interval('1m')
       .rate(1)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         javaInstance
           .transaction('GET /api/product/list')
           .duration(1000)
@@ -37,11 +40,11 @@ describe('simple trace', () => {
               .duration(900)
               .timestamp(timestamp + 50)
           )
-          .serialize()
-      )
-      .toArray();
+      );
+    events = iterable.toArray();
   });
 
+  // TODO this is not entirely factual, since id's are generated of a global sequence number
   it('generates the same data every time', () => {
     expect(events).toMatchSnapshot();
   });
diff --git a/packages/elastic-apm-synthtrace/src/test/scenarios/02_transaction_metrics.test.ts b/packages/elastic-apm-synthtrace/src/test/scenarios/02_transaction_metrics.test.ts
index f5a99b3f389d6..d7f60b2396cd0 100644
--- a/packages/elastic-apm-synthtrace/src/test/scenarios/02_transaction_metrics.test.ts
+++ b/packages/elastic-apm-synthtrace/src/test/scenarios/02_transaction_metrics.test.ts
@@ -10,6 +10,7 @@ import { apm } from '../../lib/apm';
 import { timerange } from '../../lib/timerange';
 import { getTransactionMetrics } from '../../lib/apm/processors/get_transaction_metrics';
 import { StreamProcessor } from '../../lib/stream_processor';
+import { ApmFields } from '../../lib/apm/apm_fields';
 
 describe('transaction metrics', () => {
   let events: Array<Record<string, any>>;
@@ -26,7 +27,7 @@ describe('transaction metrics', () => {
     const span = (timestamp: number) =>
       javaInstance.transaction('GET /api/product/list').duration(1000).timestamp(timestamp);
 
-    const processor = new StreamProcessor({
+    const processor = new StreamProcessor<ApmFields>({
       processors: [getTransactionMetrics],
       flushInterval: '15m',
     });
@@ -35,11 +36,11 @@ describe('transaction metrics', () => {
         range
           .interval('1m')
           .rate(25)
-          .spans((timestamp) => span(timestamp).success().serialize()),
+          .generator((timestamp) => span(timestamp).success()),
         range
           .interval('1m')
           .rate(50)
-          .spans((timestamp) => span(timestamp).failure().serialize())
+          .generator((timestamp) => span(timestamp).failure())
       )
       .filter((fields) => fields['metricset.name'] === 'transaction');
   });
diff --git a/packages/elastic-apm-synthtrace/src/test/scenarios/03_span_destination_metrics.test.ts b/packages/elastic-apm-synthtrace/src/test/scenarios/03_span_destination_metrics.test.ts
index b81dea4522064..1e8630ebaa650 100644
--- a/packages/elastic-apm-synthtrace/src/test/scenarios/03_span_destination_metrics.test.ts
+++ b/packages/elastic-apm-synthtrace/src/test/scenarios/03_span_destination_metrics.test.ts
@@ -10,6 +10,7 @@ import { apm } from '../../lib/apm';
 import { timerange } from '../../lib/timerange';
 import { getSpanDestinationMetrics } from '../../lib/apm/processors/get_span_destination_metrics';
 import { StreamProcessor } from '../../lib/stream_processor';
+import { ApmFields } from '../../lib/apm/apm_fields';
 
 describe('span destination metrics', () => {
   let events: Array<Record<string, any>>;
@@ -22,13 +23,13 @@ describe('span destination metrics', () => {
       new Date('2021-01-01T00:00:00.000Z'),
       new Date('2021-01-01T00:15:00.000Z')
     );
-    const processor = new StreamProcessor({ processors: [getSpanDestinationMetrics] });
+    const processor = new StreamProcessor<ApmFields>({ processors: [getSpanDestinationMetrics] });
     events = processor
       .streamToArray(
         range
           .interval('1m')
           .rate(25)
-          .spans((timestamp) =>
+          .generator((timestamp) =>
             javaInstance
               .transaction('GET /api/product/list')
               .duration(1000)
@@ -42,12 +43,11 @@ describe('span destination metrics', () => {
                   .destination('elasticsearch')
                   .success()
               )
-              .serialize()
           ),
         range
           .interval('1m')
           .rate(50)
-          .spans((timestamp) =>
+          .generator((timestamp) =>
             javaInstance
               .transaction('GET /api/product/list')
               .duration(1000)
@@ -66,7 +66,6 @@ describe('span destination metrics', () => {
                   .duration(500)
                   .success()
               )
-              .serialize()
           )
       )
       .filter((fields) => fields['metricset.name'] === 'span_destination');
diff --git a/packages/elastic-apm-synthtrace/src/test/scenarios/04_breakdown_metrics.test.ts b/packages/elastic-apm-synthtrace/src/test/scenarios/04_breakdown_metrics.test.ts
index 45f956834d763..831ca790e57a6 100644
--- a/packages/elastic-apm-synthtrace/src/test/scenarios/04_breakdown_metrics.test.ts
+++ b/packages/elastic-apm-synthtrace/src/test/scenarios/04_breakdown_metrics.test.ts
@@ -32,7 +32,7 @@ describe('breakdown metrics', () => {
     const listSpans = range
       .interval('30s')
       .rate(LIST_RATE)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         javaInstance
           .transaction('GET /api/product/list')
           .timestamp(timestamp)
@@ -44,13 +44,12 @@ describe('breakdown metrics', () => {
               .duration(500),
             javaInstance.span('GET foo', 'db', 'redis').timestamp(timestamp).duration(100)
           )
-          .serialize()
       );
 
     const productPageSpans = range
       .interval('30s')
       .rate(ID_RATE)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         javaInstance
           .transaction('GET /api/product/:id')
           .timestamp(timestamp)
@@ -67,7 +66,6 @@ describe('breakdown metrics', () => {
                   .duration(100)
               )
           )
-          .serialize()
       );
 
     const processor = new StreamProcessor({
diff --git a/packages/elastic-apm-synthtrace/src/test/streams_merge.test.ts b/packages/elastic-apm-synthtrace/src/test/streams_merge.test.ts
new file mode 100644
index 0000000000000..b42e21cbb14fa
--- /dev/null
+++ b/packages/elastic-apm-synthtrace/src/test/streams_merge.test.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { timerange } from '../lib/timerange';
+import { Serializable } from '../lib/serializable';
+import { Fields } from '../lib/entity';
+
+export type DocFields = Fields & Partial<{ type: string }>;
+
+class Doc extends Serializable<DocFields> {
+  constructor(type: string) {
+    super({
+      type,
+    });
+  }
+}
+
+describe('Merging streams', () => {
+  let events: DocFields[];
+  let types: string[];
+
+  const range = timerange(
+    new Date('2021-01-01T00:00:00.000Z'),
+    new Date('2021-01-01T00:02:00.000Z')
+  );
+
+  beforeEach(() => {
+    const iterable = range
+      .interval('1m')
+      .rate(1)
+      .generator(() => new Doc('metric'))
+      .merge(
+        range
+          .interval('1m')
+          .rate(4)
+          .generator(() => new Doc('transaction'))
+      );
+
+    events = iterable.toArray();
+    types = events.map((e) => e.type!);
+  });
+  it('metrics yields before transaction event hough it has less weight', () => {
+    expect(events[0].type).toBe('metric');
+  });
+  it('merging data streams uses rate per minute to ensure high volume streams are represented', () => {
+    expect(types).toEqual([
+      'metric',
+      'transaction',
+      'transaction',
+      'transaction',
+      'transaction',
+      'metric',
+      'transaction',
+      'transaction',
+      'transaction',
+      'transaction',
+    ]);
+  });
+});
diff --git a/packages/elastic-eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js
index 0680fafe50de3..5882dbc57c2f9 100644
--- a/packages/elastic-eslint-config-kibana/.eslintrc.js
+++ b/packages/elastic-eslint-config-kibana/.eslintrc.js
@@ -110,6 +110,7 @@ module.exports = {
     '@kbn/eslint/no_trailing_import_slash': 'error',
     '@kbn/eslint/no_constructor_args_in_property_initializers': 'error',
     '@kbn/eslint/no_this_in_property_initializers': 'error',
-    '@kbn/imports/no_unresolved_imports': 'error',
+    '@kbn/imports/no_unresolvable_imports': 'error',
+    '@kbn/imports/uniform_imports': 'error',
   },
 };
diff --git a/packages/elastic-eslint-config-kibana/BUILD.bazel b/packages/elastic-eslint-config-kibana/BUILD.bazel
index d8b727bf3b6bc..9dceec268418b 100644
--- a/packages/elastic-eslint-config-kibana/BUILD.bazel
+++ b/packages/elastic-eslint-config-kibana/BUILD.bazel
@@ -28,6 +28,7 @@ NPM_MODULE_EXTRA_FILES = [
 RUNTIME_DEPS = [
   "//packages/kbn-babel-preset",
   "//packages/kbn-dev-utils",
+  "//packages/kbn-eslint-plugin-imports",
   "@npm//eslint-config-prettier",
   "@npm//semver",
 ]
diff --git a/packages/elastic-safer-lodash-set/fp/assoc.d.ts b/packages/elastic-safer-lodash-set/fp/assoc.d.ts
index 57fe84d0b07f2..c04c85f63a870 100644
--- a/packages/elastic-safer-lodash-set/fp/assoc.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/assoc.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { assoc } from './index';
+import { assoc } from '.';
 export = assoc;
diff --git a/packages/elastic-safer-lodash-set/fp/assocPath.d.ts b/packages/elastic-safer-lodash-set/fp/assocPath.d.ts
index 76df38e98ff28..534128331f142 100644
--- a/packages/elastic-safer-lodash-set/fp/assocPath.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/assocPath.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { assocPath } from './index';
+import { assocPath } from '.';
 export = assocPath;
diff --git a/packages/elastic-safer-lodash-set/fp/set.d.ts b/packages/elastic-safer-lodash-set/fp/set.d.ts
index 16bc98658bdcd..b676d271e0556 100644
--- a/packages/elastic-safer-lodash-set/fp/set.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/set.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { set } from './index';
+import { set } from '.';
 export = set;
diff --git a/packages/elastic-safer-lodash-set/fp/setWith.d.ts b/packages/elastic-safer-lodash-set/fp/setWith.d.ts
index 556e702f59f0f..812437adc165a 100644
--- a/packages/elastic-safer-lodash-set/fp/setWith.d.ts
+++ b/packages/elastic-safer-lodash-set/fp/setWith.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { setWith } from './index';
+import { setWith } from '.';
 export = setWith;
diff --git a/packages/elastic-safer-lodash-set/set.d.ts b/packages/elastic-safer-lodash-set/set.d.ts
index 16bc98658bdcd..b676d271e0556 100644
--- a/packages/elastic-safer-lodash-set/set.d.ts
+++ b/packages/elastic-safer-lodash-set/set.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { set } from './index';
+import { set } from '.';
 export = set;
diff --git a/packages/elastic-safer-lodash-set/setWith.d.ts b/packages/elastic-safer-lodash-set/setWith.d.ts
index 556e702f59f0f..812437adc165a 100644
--- a/packages/elastic-safer-lodash-set/setWith.d.ts
+++ b/packages/elastic-safer-lodash-set/setWith.d.ts
@@ -5,5 +5,5 @@
  * See `packages/elastic-safer-lodash-set/LICENSE` for more information.
  */
 
-import { setWith } from './index';
+import { setWith } from '.';
 export = setWith;
diff --git a/packages/elastic-safer-lodash-set/test/patch_test.js b/packages/elastic-safer-lodash-set/test/patch_test.js
index 03dfe260009e9..80a44eb0c5b6b 100644
--- a/packages/elastic-safer-lodash-set/test/patch_test.js
+++ b/packages/elastic-safer-lodash-set/test/patch_test.js
@@ -6,11 +6,11 @@
 const test = require('tape');
 
 const setFunctions = [
-  [require('../').set, 'module.set'],
+  [require('..').set, 'module.set'],
   [require('../set'), 'module/set'],
 ];
 const setWithFunctions = [
-  [require('../').setWith, 'module.setWith'],
+  [require('..').setWith, 'module.setWith'],
   [require('../setWith'), 'module/setWith'],
 ];
 const setAndSetWithFunctions = [].concat(setFunctions, setWithFunctions);
diff --git a/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts b/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts
index 53b17d93e38db..3721726fe1f5c 100644
--- a/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts
+++ b/packages/kbn-ace/src/ace/modes/x_json/worker/index.ts
@@ -7,7 +7,7 @@
  */
 
 // @ts-ignore
-import src from '!!raw-loader!./x_json.ace.worker.js';
+import src from '!!raw-loader!./x_json.ace.worker';
 
 export const workerModule = {
   id: 'ace/mode/json_worker',
diff --git a/packages/kbn-ace/src/ace/modes/x_json/x_json.ts b/packages/kbn-ace/src/ace/modes/x_json/x_json.ts
index 46a27e8a0a4c3..5a7e819cb36e8 100644
--- a/packages/kbn-ace/src/ace/modes/x_json/x_json.ts
+++ b/packages/kbn-ace/src/ace/modes/x_json/x_json.ts
@@ -7,7 +7,7 @@
  */
 
 import ace from 'brace';
-import { XJsonHighlightRules } from '../index';
+import { XJsonHighlightRules } from '..';
 import { workerModule } from './worker';
 
 const { WorkerClient } = ace.acequire('ace/worker/worker_client');
diff --git a/packages/kbn-alerts/src/empty_page/index.test.tsx b/packages/kbn-alerts/src/empty_page/index.test.tsx
index be755b0c23c38..ca329ffde3fe2 100644
--- a/packages/kbn-alerts/src/empty_page/index.test.tsx
+++ b/packages/kbn-alerts/src/empty_page/index.test.tsx
@@ -9,7 +9,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { EmptyPage } from './';
+import { EmptyPage } from '.';
 
 describe('EmptyPage component', () => {
   it('renders actions without descriptions', () => {
diff --git a/packages/kbn-analytics/src/metrics/application_usage.ts b/packages/kbn-analytics/src/metrics/application_usage.ts
index 10a40072d48f7..a093b933134ac 100644
--- a/packages/kbn-analytics/src/metrics/application_usage.ts
+++ b/packages/kbn-analytics/src/metrics/application_usage.ts
@@ -7,7 +7,7 @@
  */
 
 import moment, { Moment } from 'moment-timezone';
-import { METRIC_TYPE } from './';
+import { METRIC_TYPE } from '.';
 
 export interface ApplicationUsageMetric {
   type: METRIC_TYPE.APPLICATION_USAGE;
diff --git a/packages/kbn-analytics/src/metrics/ui_counter.ts b/packages/kbn-analytics/src/metrics/ui_counter.ts
index f2a5d2fd18d12..59720fee22b8d 100644
--- a/packages/kbn-analytics/src/metrics/ui_counter.ts
+++ b/packages/kbn-analytics/src/metrics/ui_counter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { METRIC_TYPE } from './';
+import { METRIC_TYPE } from '.';
 
 export type UiCounterMetricType =
   | METRIC_TYPE.CLICK
diff --git a/packages/kbn-analytics/src/metrics/user_agent.ts b/packages/kbn-analytics/src/metrics/user_agent.ts
index 72f5da1e6b779..d54e1fabd05bf 100644
--- a/packages/kbn-analytics/src/metrics/user_agent.ts
+++ b/packages/kbn-analytics/src/metrics/user_agent.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { METRIC_TYPE } from './';
+import { METRIC_TYPE } from '.';
 
 export interface UserAgentMetric {
   type: METRIC_TYPE.USER_AGENT;
diff --git a/packages/kbn-babel-code-parser/BUILD.bazel b/packages/kbn-babel-code-parser/BUILD.bazel
deleted file mode 100644
index 06cb6dfff2281..0000000000000
--- a/packages/kbn-babel-code-parser/BUILD.bazel
+++ /dev/null
@@ -1,61 +0,0 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm")
-
-PKG_BASE_NAME = "kbn-babel-code-parser"
-PKG_REQUIRE_NAME = "@kbn/babel-code-parser"
-
-SOURCE_FILES = glob(
-  [
-    "src/**/*",
-  ],
-  exclude = [
-    "**/*.test.*"
-  ],
-)
-
-SRCS = SOURCE_FILES
-
-filegroup(
-  name = "srcs",
-  srcs = SRCS,
-)
-
-NPM_MODULE_EXTRA_FILES = [
-  "package.json",
-  "README.md",
-]
-
-RUNTIME_DEPS = [
-  "@npm//@babel/parser",
-  "@npm//@babel/traverse",
-  "@npm//lodash",
-]
-
-jsts_transpiler(
-  name = "target_node",
-  srcs = SRCS,
-  build_pkg_name = package_name(),
-)
-
-js_library(
-  name = PKG_BASE_NAME,
-  srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node"],
-  package_name = PKG_REQUIRE_NAME,
-  visibility = ["//visibility:public"],
-)
-
-pkg_npm(
-  name = "npm_module",
-  deps = [
-    ":%s" % PKG_BASE_NAME,
-  ]
-)
-
-filegroup(
-  name = "build",
-  srcs = [
-    ":npm_module",
-  ],
-  visibility = ["//visibility:public"],
-)
diff --git a/packages/kbn-babel-code-parser/README.md b/packages/kbn-babel-code-parser/README.md
deleted file mode 100755
index f99d01541ee22..0000000000000
--- a/packages/kbn-babel-code-parser/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# @kbn/babel-code-parser
-
-Simple abstraction over the `@babel/parser` and the `@babel/traverse` in order 
-to build a code parser on top.
-
-We have two main functions `parseSingleFile` (sync and sync version) and the 
-`parseEntries` (only async version). The first one just parse one entry file
-and the second one parses recursively all the files from a list of 
-start entry points.
-
-Then we have `visitors` and `strategies`. The first ones are basically the
-`visitors` to use into the ast from the `@babel/traverse`. They are the only
-way to collect info when using the `parseSingleFile`. The `strategies` are
-meant to be used with the `parseEntries` and configures the info we want
-to collect from our parsed code. After each loop, one per entry file, the
-`parseEntries` method will call the given `strategy` expecting that 
-`strategy` would call the desired visitors, assemble the important 
-information to collect and adds them to the final results.
-
diff --git a/packages/kbn-babel-code-parser/package.json b/packages/kbn-babel-code-parser/package.json
deleted file mode 100755
index 7ff913087f5bd..0000000000000
--- a/packages/kbn-babel-code-parser/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@kbn/babel-code-parser",
-  "description": "babel code parser for Kibana",
-  "private": true,
-  "version": "1.0.0",
-  "main": "./target_node/index.js",
-  "license": "SSPL-1.0 OR Elastic License 2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/elastic/kibana/tree/main/packages/kbn-babel-code-parser"
-  },
-  "kibana": {
-    "devOnly": true
-  }
-}
diff --git a/packages/kbn-babel-code-parser/src/can_require.js b/packages/kbn-babel-code-parser/src/can_require.js
deleted file mode 100644
index b1b41790583dd..0000000000000
--- a/packages/kbn-babel-code-parser/src/can_require.js
+++ /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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export function canRequire(cwd, entry) {
-  try {
-    // We will try to test if we can resolve
-    // this entry through the require.resolve
-    // setting as the start looking path the
-    // given cwd. Require.resolve will keep
-    // looking recursively as normal starting
-    // from that location.
-    return require.resolve(entry, {
-      paths: [cwd],
-    });
-  } catch (e) {
-    return false;
-  }
-}
diff --git a/packages/kbn-babel-code-parser/src/code_parser.js b/packages/kbn-babel-code-parser/src/code_parser.js
deleted file mode 100644
index 955d529bbabe4..0000000000000
--- a/packages/kbn-babel-code-parser/src/code_parser.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { canRequire } from './can_require';
-import { readFile, readFileSync } from 'fs';
-import { extname } from 'path';
-import { promisify } from 'util';
-import * as parser from '@babel/parser';
-import traverse from '@babel/traverse';
-import * as babelParserOptions from '@kbn/babel-preset/common_babel_parser_options';
-
-const read = promisify(readFile);
-
-function _cannotParseFile(filePath) {
-  return extname(filePath) !== '.js';
-}
-
-function _parseAndTraverseFileContent(fileContent, visitorsGenerator) {
-  const results = [];
-
-  // Parse and get the code AST
-  // All the babel parser plugins
-  // were enabled
-  const ast = parser.parse(fileContent, babelParserOptions);
-
-  // Loop through the code AST with
-  // the defined visitors
-  traverse(ast, visitorsGenerator(results));
-
-  return results;
-}
-
-export async function parseSingleFile(filePath, visitorsGenerator) {
-  // Don't parse any other files than .js ones
-  if (_cannotParseFile(filePath)) {
-    return [];
-  }
-
-  // Read the file
-  const content = await read(filePath, { encoding: 'utf8' });
-
-  // return the results found on parse and traverse
-  // the file content with the given visitors
-  return _parseAndTraverseFileContent(content, visitorsGenerator);
-}
-
-export function parseSingleFileSync(filePath, visitorsGenerator) {
-  // Don't parse any other files than .js ones
-  if (_cannotParseFile(filePath)) {
-    return [];
-  }
-
-  // Read the file
-  const content = readFileSync(filePath, { encoding: 'utf8' });
-
-  // return the results found on parse and traverse
-  // the file content with the given visitors
-  return _parseAndTraverseFileContent(content, visitorsGenerator);
-}
-
-export async function parseEntries(cwd, entries, strategy, results, wasParsed = {}) {
-  // Assure that we always have a cwd
-  const sanitizedCwd = cwd || process.cwd();
-
-  // Test each entry against canRequire function
-  const entriesQueue = entries.map((entry) => canRequire(sanitizedCwd, entry));
-
-  while (entriesQueue.length) {
-    // Get the first element in the queue as
-    // select it as our current entry to parse
-    const mainEntry = entriesQueue.shift();
-
-    // Avoid parse the current entry if it is not valid
-    // or it was already parsed
-    if (typeof mainEntry !== 'string' || wasParsed[mainEntry]) {
-      continue;
-    }
-
-    // Find new entries and adds them to the end of the queue
-    entriesQueue.push(
-      ...(await strategy(sanitizedCwd, parseSingleFile, mainEntry, wasParsed, results))
-    );
-
-    // Mark the current main entry as already parsed
-    wasParsed[mainEntry] = true;
-  }
-
-  return results;
-}
diff --git a/packages/kbn-babel-code-parser/src/strategies.js b/packages/kbn-babel-code-parser/src/strategies.js
deleted file mode 100644
index 9928959da99c8..0000000000000
--- a/packages/kbn-babel-code-parser/src/strategies.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { canRequire } from './can_require';
-import { dependenciesVisitorsGenerator } from './visitors';
-import { dirname, isAbsolute, resolve } from 'path';
-
-export function _calculateTopLevelDependency(inputDep, outputDep = '') {
-  // The path separator will be always the forward slash
-  // as at this point we only have the found entries into
-  // the provided source code entries where we just use it
-  const pathSeparator = '/';
-  const depSplitPaths = inputDep.split(pathSeparator);
-  const firstPart = depSplitPaths.shift();
-  const outputDepFirstArgAppend = outputDep ? pathSeparator : '';
-
-  outputDep += `${outputDepFirstArgAppend}${firstPart}`;
-
-  // In case our dependency isn't started by @
-  // we are already done and we can return the
-  // dependency value we already have
-  if (firstPart.charAt(0) !== '@') {
-    return outputDep;
-  }
-
-  // Otherwise we need to keep constructing the dependency
-  // value because dependencies starting with @ points to
-  // folders of dependencies. For example, in case we found
-  // dependencies values with '@the-deps/a' and '@the-deps/a/b'
-  // we don't want to map it to '@the-deps' but also to @'the-deps/a'
-  // because inside '@the-deps' we can also have '@the-dep/b'
-  return _calculateTopLevelDependency(depSplitPaths.join(pathSeparator), outputDep);
-}
-
-export async function dependenciesParseStrategy(
-  cwd,
-  parseSingleFile,
-  mainEntry,
-  wasParsed,
-  results
-) {
-  // Retrieve native nodeJS modules
-  const natives = process.binding('natives');
-
-  // Get dependencies from a single file and filter
-  // out node native modules from the result
-  const dependencies = (await parseSingleFile(mainEntry, dependenciesVisitorsGenerator)).filter(
-    (dep) => !natives[dep]
-  );
-
-  // Return the list of all the new entries found into
-  // the current mainEntry that we could use to look for
-  // new dependencies
-  return dependencies.reduce((filteredEntries, entry) => {
-    const absEntryPath = resolve(cwd, dirname(mainEntry), entry);
-    const requiredPath = canRequire(cwd, absEntryPath);
-    const requiredRelativePath = canRequire(cwd, entry);
-    const isRelativeFile = !isAbsolute(entry);
-    const isNodeModuleDep = isRelativeFile && !requiredPath && requiredRelativePath;
-    const isNewEntry = isRelativeFile && requiredPath;
-
-    // If it is a node_module add it to the results and also
-    // add the resolved path for the node_module main file
-    // as an entry point to look for dependencies it was
-    // not already parsed
-    if (isNodeModuleDep) {
-      // Save the result as the top level dependency
-      results[_calculateTopLevelDependency(entry)] = true;
-
-      if (!wasParsed[requiredRelativePath]) {
-        filteredEntries.push(requiredRelativePath);
-      }
-    }
-
-    // If a new, not yet parsed, relative entry were found
-    // add it to the list of entries to be parsed
-    if (isNewEntry && !wasParsed[requiredPath]) {
-      if (!wasParsed[requiredPath]) {
-        filteredEntries.push(requiredPath);
-      }
-    }
-
-    return filteredEntries;
-  }, []);
-}
diff --git a/packages/kbn-babel-code-parser/src/strategies.test.js b/packages/kbn-babel-code-parser/src/strategies.test.js
deleted file mode 100644
index fef46858c5a0a..0000000000000
--- a/packages/kbn-babel-code-parser/src/strategies.test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { readFile } from 'fs';
-import { canRequire } from './can_require';
-import { parseSingleFile } from './code_parser';
-import { _calculateTopLevelDependency, dependenciesParseStrategy } from './strategies';
-
-jest.mock('./can_require', () => ({
-  canRequire: jest.fn(),
-}));
-
-jest.mock('fs', () => ({
-  readFile: jest.fn(),
-}));
-
-const mockCwd = '/tmp/project/dir/';
-
-describe('Code Parser Strategies', () => {
-  it('should calculate the top level dependencies correctly', () => {
-    const plainDep = 'dep1/file';
-    const foldedDep = '@kbn/es/file';
-    const otherFoldedDep = '@kbn/es';
-
-    expect(_calculateTopLevelDependency(plainDep)).toEqual('dep1');
-    expect(_calculateTopLevelDependency(foldedDep)).toEqual('@kbn/es');
-    expect(_calculateTopLevelDependency(otherFoldedDep)).toEqual('@kbn/es');
-  });
-
-  it('should exclude native modules', async () => {
-    readFile.mockImplementationOnce((path, options, cb) => {
-      cb(null, `require('fs')`);
-    });
-
-    const results = [];
-    await dependenciesParseStrategy(mockCwd, parseSingleFile, 'dep1/file.js', {}, results);
-
-    expect(results.length).toBe(0);
-  });
-
-  it('should return a dep from_modules', async () => {
-    readFile.mockImplementationOnce((path, options, cb) => {
-      cb(null, `require('dep_from_node_modules')`);
-    });
-
-    canRequire.mockImplementation((mockCwd, entry) => {
-      if (entry === `${mockCwd}dep1/dep_from_node_modules`) {
-        return false;
-      }
-
-      if (entry === 'dep_from_node_modules') {
-        return `${mockCwd}node_modules/dep_from_node_modules/index.js`;
-      }
-    });
-
-    const results = await dependenciesParseStrategy(
-      mockCwd,
-      parseSingleFile,
-      'dep1/file.js',
-      {},
-      {}
-    );
-    expect(results[0]).toBe(`${mockCwd}node_modules/dep_from_node_modules/index.js`);
-  });
-
-  it('should return a relative dep file', async () => {
-    readFile.mockImplementationOnce((path, options, cb) => {
-      cb(null, `require('./relative_dep')`);
-    });
-
-    canRequire.mockImplementation((mockCwd, entry) => {
-      if (entry === `${mockCwd}dep1/relative_dep`) {
-        return `${entry}/index.js`;
-      }
-
-      return false;
-    });
-
-    const results = await dependenciesParseStrategy(
-      mockCwd,
-      parseSingleFile,
-      'dep1/file.js',
-      {},
-      {}
-    );
-    expect(results[0]).toBe(`${mockCwd}dep1/relative_dep/index.js`);
-  });
-
-  afterAll(() => {
-    jest.clearAllMocks();
-  });
-});
diff --git a/packages/kbn-babel-code-parser/src/visitors.js b/packages/kbn-babel-code-parser/src/visitors.js
deleted file mode 100644
index 9974b58b5fb7e..0000000000000
--- a/packages/kbn-babel-code-parser/src/visitors.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { matches } from 'lodash';
-
-/**
- * @notice
- *
- * This product has relied on ASTExplorer that is licensed under MIT.
- */
-export function dependenciesVisitorsGenerator(dependenciesAcc) {
-  return (() => {
-    // This was built with help on an ast explorer and some ESTree docs
-    // like the babel parser ast spec and the main docs for the Esprima
-    // which is a complete and useful docs for the ESTree spec.
-    //
-    // https://astexplorer.net
-    // https://github.com/babel/babel/blob/master/packages/babel-parser/ast/spec.md
-    // https://esprima.readthedocs.io/en/latest/syntax-tree-format.html
-    // https://github.com/estree/estree
-    return {
-      // Visitors to traverse and found dependencies
-      // raw values on require + require.resolve
-      CallExpression: ({ node }) => {
-        // AST check for require expressions
-        const isRequire = (node) => {
-          return matches({
-            callee: {
-              type: 'Identifier',
-              name: 'require',
-            },
-          })(node);
-        };
-
-        // AST check for require.resolve expressions
-        const isRequireResolve = (node) => {
-          return matches({
-            callee: {
-              type: 'MemberExpression',
-              object: {
-                type: 'Identifier',
-                name: 'require',
-              },
-              property: {
-                type: 'Identifier',
-                name: 'resolve',
-              },
-            },
-          })(node);
-        };
-
-        // Get string values inside the expressions
-        // whether they are require or require.resolve
-        if (isRequire(node) || isRequireResolve(node)) {
-          const nodeArguments = node.arguments;
-          const reqArg = Array.isArray(nodeArguments) ? nodeArguments.shift() : null;
-
-          if (!reqArg) {
-            return;
-          }
-
-          if (reqArg.type === 'StringLiteral') {
-            dependenciesAcc.push(reqArg.value);
-          }
-        }
-      },
-      // Visitors to traverse and found dependencies
-      // raw values on import
-      ImportDeclaration: ({ node }) => {
-        // AST check for supported import expressions
-        const isImport = (node) => {
-          return matches({
-            type: 'ImportDeclaration',
-            source: {
-              type: 'StringLiteral',
-            },
-          })(node);
-        };
-
-        // Get string values from import expressions
-        if (isImport(node)) {
-          const importSource = node.source;
-          dependenciesAcc.push(importSource.value);
-        }
-      },
-      // Visitors to traverse and found dependencies
-      // raw values on export from
-      ExportNamedDeclaration: ({ node }) => {
-        // AST check for supported export from expressions
-        const isExportFrom = (node) => {
-          return matches({
-            type: 'ExportNamedDeclaration',
-            source: {
-              type: 'StringLiteral',
-            },
-          })(node);
-        };
-
-        // Get string values from export from expressions
-        if (isExportFrom(node)) {
-          const exportFromSource = node.source;
-          dependenciesAcc.push(exportFromSource.value);
-        }
-      },
-      // Visitors to traverse and found dependencies
-      // raw values on export * from
-      ExportAllDeclaration: ({ node }) => {
-        // AST check for supported export * from expressions
-        const isExportAllFrom = (node) => {
-          return matches({
-            type: 'ExportAllDeclaration',
-            source: {
-              type: 'StringLiteral',
-            },
-          })(node);
-        };
-
-        // Get string values from export * from expressions
-        if (isExportAllFrom(node)) {
-          const exportAllFromSource = node.source;
-          dependenciesAcc.push(exportAllFromSource.value);
-        }
-      },
-    };
-  })();
-}
diff --git a/packages/kbn-babel-code-parser/src/visitors.test.js b/packages/kbn-babel-code-parser/src/visitors.test.js
deleted file mode 100644
index fd8413840d4de..0000000000000
--- a/packages/kbn-babel-code-parser/src/visitors.test.js
+++ /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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import * as parser from '@babel/parser';
-import traverse from '@babel/traverse';
-import { dependenciesVisitorsGenerator } from './visitors';
-
-const visitorsApplier = (code) => {
-  const result = [];
-  traverse(
-    parser.parse(code, {
-      sourceType: 'unambiguous',
-      plugins: ['exportDefaultFrom'],
-    }),
-    dependenciesVisitorsGenerator(result)
-  );
-  return result;
-};
-
-describe('Code Parser Visitors', () => {
-  it('should get values from require', () => {
-    const rawCode = `/*foo*/require('dep1'); const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-  });
-
-  it('should get values from require.resolve', () => {
-    const rawCode = `/*foo*/require.resolve('dep2'); const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep2');
-  });
-
-  it('should get values from import', () => {
-    const rawCode = `/*foo*/import dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-    expect(foundDeps[1] === 'dep2');
-  });
-
-  it('should get values from export from', () => {
-    const rawCode = `/*foo*/export dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-  });
-
-  it('should get values from export * from', () => {
-    const rawCode = `/*foo*/export * from 'dep1'; export dep2 from 'dep2';const bar = 1;`;
-    const foundDeps = visitorsApplier(rawCode);
-    expect(foundDeps[0] === 'dep1');
-    expect(foundDeps[1] === 'dep2');
-  });
-});
diff --git a/packages/kbn-babel-plugin-synthetic-packages/BUILD.bazel b/packages/kbn-babel-plugin-synthetic-packages/BUILD.bazel
new file mode 100644
index 0000000000000..da588dab2ce42
--- /dev/null
+++ b/packages/kbn-babel-plugin-synthetic-packages/BUILD.bazel
@@ -0,0 +1,64 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-babel-plugin-synthetic-packages"
+PKG_REQUIRE_NAME = "@kbn/babel-plugin-synthetic-packages"
+
+filegroup(
+  name = "srcs",
+  srcs = [
+    "babel_plugin_synthetic_packages.js"
+  ],
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//@babel/helper-plugin-utils",
+  "@npm//normalize-path",
+  "//packages/kbn-synthetic-package-map",
+]
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES + [
+    ":srcs",
+  ],
+  deps = RUNTIME_DEPS,
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [
+    ":%s" % PKG_DIRNAME,
+  ]
+)
+
+filegroup(
+  name = "build",
+  srcs = [
+    ":npm_module",
+  ],
+  visibility = ["//visibility:public"],
+)
+
+alias(
+  name = "npm_module_types",
+  actual = ":" + PKG_DIRNAME,
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-babel-plugin-synthetic-packages/babel_plugin_synthetic_packages.js b/packages/kbn-babel-plugin-synthetic-packages/babel_plugin_synthetic_packages.js
new file mode 100644
index 0000000000000..8caa3906c8fe0
--- /dev/null
+++ b/packages/kbn-babel-plugin-synthetic-packages/babel_plugin_synthetic_packages.js
@@ -0,0 +1,183 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/** @typedef {import('@babel/core').PluginObj} PluginObj */
+
+const Path = require('path');
+const Fs = require('fs');
+
+const T = require('@babel/types');
+const normalizePath = require('normalize-path');
+const { declare } = require('@babel/helper-plugin-utils');
+const KbnSyntheticPackageMap = require('@kbn/synthetic-package-map');
+
+const PKG_MAP = KbnSyntheticPackageMap.readPackageMap();
+const PKG_MAP_HASH = KbnSyntheticPackageMap.readHashOfPackageMap();
+
+function getFilename(state) {
+  if (typeof state !== 'object' || !state || !state.filename || !Path.isAbsolute(state.filename)) {
+    throw new Error(
+      `@kbn/babel-plugin-synthetic-packages is only compatible when building files with absolute filename state`
+    );
+  }
+
+  return state.filename;
+}
+
+let foundKibanaRoot;
+function getKibanaRoot(someSourceFilename) {
+  if (foundKibanaRoot) {
+    return foundKibanaRoot;
+  }
+
+  // try to find the Kibana package.json file in a parent directory of the sourceFile
+  let cursorDir = Path.dirname(someSourceFilename);
+  while (true) {
+    const packageJsonPath = Path.resolve(cursorDir, 'package.json');
+    try {
+      const pkg = JSON.parse(Fs.readFileSync(packageJsonPath, 'utf8'));
+      if (pkg && pkg.name === 'kibana') {
+        foundKibanaRoot = cursorDir;
+        return foundKibanaRoot;
+      }
+    } catch {
+      // this directory is not the Kibana dir
+    }
+
+    const nextCursor = Path.dirname(cursorDir);
+    if (!nextCursor || nextCursor === cursorDir) {
+      // stop iterating when we get to the root of the root of the filesystem
+      break;
+    }
+
+    cursorDir = nextCursor;
+  }
+
+  throw new Error(
+    '@kbn/*-plugin and @kbn/core imports can only be used by source files which have not been converted to packages, building packages which rely on these imports requires converting the thing you want into a package.'
+  );
+}
+
+function fixImportRequest(req, filename, kibanaRoot) {
+  if (!req.startsWith('@kbn/')) {
+    return;
+  }
+
+  const parts = req.split('/');
+  const dir = PKG_MAP.get(`@kbn/${parts[1]}`);
+  if (!dir) {
+    return;
+  }
+
+  return normalizePath(
+    Path.relative(
+      Path.dirname(filename),
+      Path.resolve(kibanaRoot ?? getKibanaRoot(filename), dir, ...parts.slice(2))
+    )
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isDynamicImport(node) {
+  return !!(
+    T.isImport(node.callee) &&
+    node.arguments.length === 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isRequire(node) {
+  return !!(
+    T.isIdentifier(node.callee) &&
+    node.callee.name === 'require' &&
+    node.arguments.length >= 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isRequireResolve(node) {
+  return !!(
+    T.isMemberExpression(node.callee) &&
+    T.isIdentifier(node.callee.object) &&
+    node.callee.object.name === 'require' &&
+    T.isIdentifier(node.callee.property) &&
+    node.callee.property.name === 'resolve' &&
+    node.arguments.length >= 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+/**
+ * @param {T.CallExpression} node
+ */
+function isJestMockCall(node) {
+  return !!(
+    T.isMemberExpression(node.callee) &&
+    T.isIdentifier(node.callee.object) &&
+    node.callee.object.name === 'jest' &&
+    node.arguments.length >= 1 &&
+    T.isStringLiteral(node.arguments[0])
+  );
+}
+
+module.exports = declare((api, options) => {
+  const kibanaRoot = options['kibana/rootDir'];
+
+  api.assertVersion(7);
+  api.cache.using(() => `${PKG_MAP_HASH}:${kibanaRoot}`);
+
+  /** @type {PluginObj} */
+  const plugin = {
+    name: 'synthetic-packages',
+    visitor: {
+      'ImportDeclaration|ExportNamedDeclaration|ExportAllDeclaration'(path) {
+        const filename = getFilename(this);
+
+        const source = path.node.source;
+        if (!T.isStringLiteral(source)) {
+          return;
+        }
+
+        const req = source.value;
+        const newReq = fixImportRequest(req, filename, kibanaRoot);
+        if (newReq) {
+          path.get('source').replaceWith(T.stringLiteral(newReq));
+        }
+      },
+      CallExpression(path) {
+        const filename = getFilename(this);
+
+        const { node } = path;
+        if (
+          !isDynamicImport(node) &&
+          !isRequire(node) &&
+          !isRequireResolve(node) &&
+          !isJestMockCall(node)
+        ) {
+          return;
+        }
+
+        const req = node.arguments[0].value;
+        const newReq = fixImportRequest(req, filename, kibanaRoot);
+        if (newReq) {
+          path.get('arguments.0').replaceWith(T.stringLiteral(newReq));
+        }
+      },
+    },
+  };
+
+  return plugin;
+});
diff --git a/packages/kbn-babel-plugin-synthetic-packages/package.json b/packages/kbn-babel-plugin-synthetic-packages/package.json
new file mode 100644
index 0000000000000..f488064fc6100
--- /dev/null
+++ b/packages/kbn-babel-plugin-synthetic-packages/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/babel-plugin-synthetic-packages",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./babel_plugin_synthetic_packages.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-babel-preset/BUILD.bazel b/packages/kbn-babel-preset/BUILD.bazel
index 8e600eb6b23be..1e64c1e9f9ef7 100644
--- a/packages/kbn-babel-preset/BUILD.bazel
+++ b/packages/kbn-babel-preset/BUILD.bazel
@@ -40,6 +40,7 @@ RUNTIME_DEPS = [
   "@npm//babel-plugin-add-module-exports",
   "@npm//babel-plugin-styled-components",
   "@npm//babel-plugin-transform-react-remove-prop-types",
+  "//packages/kbn-babel-plugin-synthetic-packages",
 ]
 
 js_library(
diff --git a/packages/kbn-babel-preset/common_preset.js b/packages/kbn-babel-preset/common_preset.js
index 824a73f9b2611..1c3e2135d1049 100644
--- a/packages/kbn-babel-preset/common_preset.js
+++ b/packages/kbn-babel-preset/common_preset.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-module.exports = {
+module.exports = (_, options = {}) => ({
   presets: [
     // plugins always run before presets, but in this case we need the
     // @babel/preset-typescript preset to run first so we have to move
@@ -46,6 +46,8 @@ module.exports = {
             version: '^7.12.5',
           },
         ],
+
+        [require.resolve('@kbn/babel-plugin-synthetic-packages'), options],
       ],
     },
 
@@ -59,4 +61,4 @@ module.exports = {
       },
     ],
   ],
-};
+});
diff --git a/packages/kbn-babel-preset/node_preset.js b/packages/kbn-babel-preset/node_preset.js
index b69c59f5e2cc5..295ea5d0d8e8b 100644
--- a/packages/kbn-babel-preset/node_preset.js
+++ b/packages/kbn-babel-preset/node_preset.js
@@ -37,7 +37,7 @@ module.exports = (_, options = {}) => {
           ...(options['@babel/preset-env'] || {}),
         },
       ],
-      require('./common_preset'),
+      [require('./common_preset'), options],
     ],
   };
 };
diff --git a/packages/kbn-babel-preset/webpack_preset.js b/packages/kbn-babel-preset/webpack_preset.js
index 7bf1f518012a4..1f5a840f4f54d 100644
--- a/packages/kbn-babel-preset/webpack_preset.js
+++ b/packages/kbn-babel-preset/webpack_preset.js
@@ -8,7 +8,7 @@
 
 const { USES_STYLED_COMPONENTS } = require('./styled_components_files');
 
-module.exports = () => {
+module.exports = (_, options = {}) => {
   return {
     presets: [
       [
@@ -22,7 +22,7 @@ module.exports = () => {
           bugfixes: true,
         },
       ],
-      require('./common_preset'),
+      [require('./common_preset'), options],
     ],
     env: {
       production: {
diff --git a/packages/kbn-bazel-packages/BUILD.bazel b/packages/kbn-bazel-packages/BUILD.bazel
index 9adfe80060889..024282768d633 100644
--- a/packages/kbn-bazel-packages/BUILD.bazel
+++ b/packages/kbn-bazel-packages/BUILD.bazel
@@ -39,6 +39,7 @@ NPM_MODULE_EXTRA_FILES = [
 RUNTIME_DEPS = [
   "//packages/kbn-utils",
   "//packages/kbn-std",
+  "//packages/kbn-synthetic-package-map",
   "@npm//globby",
   "@npm//normalize-path",
 ]
@@ -56,6 +57,7 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-std:npm_module_types",
+  "//packages/kbn-synthetic-package-map:npm_module_types",
   "@npm//@types/normalize-path",
   "@npm//globby",
   "@npm//normalize-path",
diff --git a/packages/kbn-bazel-packages/src/bazel_package.ts b/packages/kbn-bazel-packages/src/bazel_package.ts
index 35950c9896faf..492ce05cf04bf 100644
--- a/packages/kbn-bazel-packages/src/bazel_package.ts
+++ b/packages/kbn-bazel-packages/src/bazel_package.ts
@@ -13,51 +13,21 @@ import Fsp from 'fs/promises';
 import normalizePath from 'normalize-path';
 import { REPO_ROOT } from '@kbn/utils';
 
+import { readPackageJson, ParsedPackageJson } from './parse_package_json';
+
 const BUILD_RULE_NAME = /(^|\s)name\s*=\s*"build"/;
 const BUILD_TYPES_RULE_NAME = /(^|\s)name\s*=\s*"build_types"/;
 
-/**
- * Simple parsed representation of a package.json file, validated
- * by `assertParsedPackageJson()` and extensible as needed in the future
- */
-export interface ParsedPackageJson {
-  /**
-   * The name of the package, usually `@kbn/`+something
-   */
-  name: string;
-  /**
-   * All other fields in the package.json are typed as unknown as all we need at this time is "name"
-   */
-  [key: string]: unknown;
-}
-
-function isObj(v: unknown): v is Record<string, unknown> {
-  return !!(typeof v === 'object' && v);
-}
-
-function assertParsedPackageJson(v: unknown): asserts v is ParsedPackageJson {
-  if (!isObj(v) || typeof v.name !== 'string') {
-    throw new Error('Expected parsed package.json to be an object with at least a "name" property');
-  }
-}
-
 /**
  * Representation of a Bazel Package in the Kibana repository
  */
 export class BazelPackage {
   /**
    * Create a BazelPackage object from a package directory. Reads some files from the package and returns
-   * a Promise for a BazelPackage instance
+   * a Promise for a BazelPackage instance.
    */
   static async fromDir(dir: string) {
-    let pkg;
-    try {
-      pkg = JSON.parse(await Fsp.readFile(Path.resolve(dir, 'package.json'), 'utf8'));
-    } catch (error) {
-      throw new Error(`unable to parse package.json in [${dir}]: ${error.message}`);
-    }
-
-    assertParsedPackageJson(pkg);
+    const pkg = readPackageJson(Path.resolve(dir, 'package.json'));
 
     let buildBazelContent;
     if (pkg.name !== '@kbn/pm') {
diff --git a/packages/kbn-bazel-packages/src/bazel_package_dirs.ts b/packages/kbn-bazel-packages/src/bazel_package_dirs.ts
index f34ab39d3526a..985793afdee8a 100644
--- a/packages/kbn-bazel-packages/src/bazel_package_dirs.ts
+++ b/packages/kbn-bazel-packages/src/bazel_package_dirs.ts
@@ -6,12 +6,35 @@
  * Side Public License, v 1.
  */
 
+import Path from 'path';
+
+import globby from 'globby';
+import { REPO_ROOT } from '@kbn/utils';
+
 /**
  * This is a list of repo-relative paths to directories containing packages. Do not
  * include `**` in these, one or two `*` segments is acceptable, we need this search
  * to be super fast so please avoid deep recursive searching.
  *
- *   eg. src/vis-editors     => would find a package at src/vis-editors/foo/package.json
- *       src/vis-editors/*   => would find a package at src/vis-editors/foo/bar/package.json
+ *   eg. src/vis_editors     => would find a package at src/vis_editors/foo/package.json
+ *       src/vis_editors/*   => would find a package at src/vis_editors/foo/bar/package.json
+ */
+export const BAZEL_PACKAGE_DIRS = ['packages', 'packages/shared-ux', 'packages/shared-ux/*'];
+
+/**
+ * Resolve all the BAZEL_PACKAGE_DIRS to absolute paths
+ */
+export function getAllBazelPackageDirs() {
+  return globby.sync(BAZEL_PACKAGE_DIRS, {
+    cwd: REPO_ROOT,
+    onlyDirectories: true,
+    expandDirectories: false,
+  });
+}
+
+/**
+ * Resolve all the BAZEL_PACKAGE_DIRS to repo-relative paths
  */
-export const BAZEL_PACKAGE_DIRS = ['packages'];
+export function getAllRepoRelativeBazelPackageDirs() {
+  return getAllBazelPackageDirs().map((path) => Path.relative(REPO_ROOT, path));
+}
diff --git a/packages/kbn-bazel-packages/src/discover_packages.ts b/packages/kbn-bazel-packages/src/discover_packages.ts
index fa636b9d3dba6..db31b54beec75 100644
--- a/packages/kbn-bazel-packages/src/discover_packages.ts
+++ b/packages/kbn-bazel-packages/src/discover_packages.ts
@@ -15,22 +15,23 @@ import { asyncMapWithLimit } from '@kbn/std';
 import { BazelPackage } from './bazel_package';
 import { BAZEL_PACKAGE_DIRS } from './bazel_package_dirs';
 
-/**
- * Search the local Kibana repo for bazel packages and return an array of BazelPackage objects
- * representing each package found.
- */
-export async function discoverBazelPackages() {
-  const packageJsons = globby.sync(
-    BAZEL_PACKAGE_DIRS.map((dir) => `${dir}/*/package.json`),
-    {
-      cwd: REPO_ROOT,
-      absolute: true,
-    }
-  );
+export function discoverBazelPackageLocations(repoRoot: string) {
+  return globby
+    .sync(
+      BAZEL_PACKAGE_DIRS.map((dir) => `${dir}/*/package.json`),
+      {
+        cwd: repoRoot,
+        absolute: true,
+      }
+    )
+    .sort((a, b) => a.localeCompare(b))
+    .map((path) => Path.dirname(path));
+}
 
+export async function discoverBazelPackages(repoRoot: string = REPO_ROOT) {
   return await asyncMapWithLimit(
-    packageJsons.sort((a, b) => a.localeCompare(b)),
+    discoverBazelPackageLocations(repoRoot),
     100,
-    async (path) => await BazelPackage.fromDir(Path.dirname(path))
+    async (dir) => await BazelPackage.fromDir(dir)
   );
 }
diff --git a/packages/kbn-bazel-packages/src/parse_package_json.ts b/packages/kbn-bazel-packages/src/parse_package_json.ts
new file mode 100644
index 0000000000000..b213c7c8596b0
--- /dev/null
+++ b/packages/kbn-bazel-packages/src/parse_package_json.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs';
+
+/**
+ * Simple parsed representation of a package.json file, validated
+ * by `assertParsedPackageJson()` and extensible as needed in the future
+ */
+export interface ParsedPackageJson {
+  /**
+   * The name of the package, usually `@kbn/`+something
+   */
+  name: string;
+  /** "dependenices" property from package.json */
+  dependencies?: Record<string, string>;
+  /** "devDependenices" property from package.json */
+  devDependencies?: Record<string, string>;
+  /**
+   * All other fields in the package.json are typed as unknown as we don't care what they are
+   */
+  [key: string]: unknown;
+}
+
+function isObj(v: unknown): v is Record<string, unknown> {
+  return !!(typeof v === 'object' && v);
+}
+
+/**
+ * Asserts that given value looks like a parsed package.json file
+ */
+export function assertParsedPackageJson(v: unknown): asserts v is ParsedPackageJson {
+  if (!isObj(v) || typeof v.name !== 'string') {
+    throw new Error('Expected at least a "name" property');
+  }
+
+  if (v.dependencies && !isObj(v.dependencies)) {
+    throw new Error('Expected "dependencies" to be an object');
+  }
+
+  if (v.devDependencies && !isObj(v.devDependencies)) {
+    throw new Error('Expected "dependencies" to be an object');
+  }
+}
+
+/**
+ * Reads a given package.json file from disk and parses it
+ */
+export function readPackageJson(path: string): ParsedPackageJson {
+  let pkg;
+  try {
+    pkg = JSON.parse(Fs.readFileSync(path, 'utf8'));
+    assertParsedPackageJson(pkg);
+  } catch (error) {
+    throw new Error(`unable to parse package.json at [${path}]: ${error.message}`);
+  }
+  return pkg;
+}
diff --git a/packages/kbn-cli-dev-mode/src/dev_server.ts b/packages/kbn-cli-dev-mode/src/dev_server.ts
index ca213b117ef34..750f93dd6c58c 100644
--- a/packages/kbn-cli-dev-mode/src/dev_server.ts
+++ b/packages/kbn-cli-dev-mode/src/dev_server.ts
@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { EventEmitter } from 'events';
-
 import * as Rx from 'rxjs';
 import {
   map,
@@ -60,9 +58,9 @@ export class DevServer {
     this.script = options.script;
     this.argv = options.argv;
     this.gracefulTimeout = options.gracefulTimeout;
-    this.processExit$ = options.processExit$ ?? Rx.fromEvent(process as EventEmitter, 'exit');
-    this.sigint$ = options.sigint$ ?? Rx.fromEvent(process as EventEmitter, 'SIGINT');
-    this.sigterm$ = options.sigterm$ ?? Rx.fromEvent(process as EventEmitter, 'SIGTERM');
+    this.processExit$ = options.processExit$ ?? Rx.fromEvent<void>(process, 'exit');
+    this.sigint$ = options.sigint$ ?? Rx.fromEvent<void>(process, 'SIGINT');
+    this.sigterm$ = options.sigterm$ ?? Rx.fromEvent<void>(process, 'SIGTERM');
     this.mapLogLine = options.mapLogLine;
   }
 
@@ -117,7 +115,7 @@ export class DevServer {
    */
   run$ = new Rx.Observable<void>((subscriber) => {
     // listen for SIGINT and forward to process if it's running, otherwise unsub
-    const gracefulShutdown$ = new Rx.Subject();
+    const gracefulShutdown$ = new Rx.Subject<void>();
     subscriber.add(
       this.sigint$
         .pipe(
diff --git a/packages/kbn-cli-dev-mode/src/optimizer.test.ts b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
index e1763ab4c4756..c300b34d514d2 100644
--- a/packages/kbn-cli-dev-mode/src/optimizer.test.ts
+++ b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
@@ -12,7 +12,6 @@ import * as Rx from 'rxjs';
 import { toArray } from 'rxjs/operators';
 import { OptimizerUpdate } from '@kbn/optimizer';
 import { observeLines, createReplaceSerializer } from '@kbn/dev-utils';
-import { firstValueFrom } from '@kbn/std';
 
 import { Optimizer, Options } from './optimizer';
 
@@ -130,7 +129,7 @@ it('uses options to create valid OptimizerConfig', () => {
 
 it('is ready when optimizer phase is success or issue and logs in familiar format', async () => {
   const writeLogTo = new PassThrough();
-  const linesPromise = firstValueFrom(observeLines(writeLogTo).pipe(toArray()));
+  const linesPromise = Rx.firstValueFrom(observeLines(writeLogTo).pipe(toArray()));
 
   const { update$, optimizer } = setup({
     ...defaultOptions,
diff --git a/packages/kbn-cli-dev-mode/src/watcher.test.ts b/packages/kbn-cli-dev-mode/src/watcher.test.ts
index b5bfab58a43c5..71839c5b27dd5 100644
--- a/packages/kbn-cli-dev-mode/src/watcher.test.ts
+++ b/packages/kbn-cli-dev-mode/src/watcher.test.ts
@@ -10,7 +10,6 @@ import { EventEmitter } from 'events';
 
 import * as Rx from 'rxjs';
 import { materialize, toArray } from 'rxjs/operators';
-import { firstValueFrom } from '@kbn/std';
 
 import { TestLog } from './log';
 import { Watcher, Options } from './watcher';
@@ -112,7 +111,7 @@ it('closes chokidar watcher when unsubscribed', () => {
 
 it('rethrows chokidar errors', async () => {
   const watcher = new Watcher(defaultOptions);
-  const promise = firstValueFrom(watcher.run$.pipe(materialize(), toArray()));
+  const promise = Rx.firstValueFrom(watcher.run$.pipe(materialize(), toArray()));
 
   isMock(mockChokidar);
   mockChokidar.emit('error', new Error('foo bar'));
diff --git a/packages/kbn-coloring/BUILD.bazel b/packages/kbn-coloring/BUILD.bazel
index 656807d8ba2c1..cbbb4d2b7d3e8 100644
--- a/packages/kbn-coloring/BUILD.bazel
+++ b/packages/kbn-coloring/BUILD.bazel
@@ -49,6 +49,8 @@ RUNTIME_DEPS = [
   "@npm//@elastic/eui",
   "@npm//react-use",
   "@npm//react",
+  "@npm//@emotion/react",
+  "@npm//@emotion/css",
 ]
 
 # In this array place dependencies necessary to build the types, which will include the
@@ -71,6 +73,8 @@ TYPES_DEPS = [
   "@npm//@types/react",
   "@npm//@elastic/eui",
   "@npm//react-use",
+  "@npm//@emotion/react",
+  "@npm//@emotion/css",
 ]
 
 jsts_transpiler(
diff --git a/packages/kbn-coloring/src/palettes/utils.ts b/packages/kbn-coloring/src/palettes/utils.ts
index 2ced7eb105a38..d3a51388c7a3d 100644
--- a/packages/kbn-coloring/src/palettes/utils.ts
+++ b/packages/kbn-coloring/src/palettes/utils.ts
@@ -12,7 +12,7 @@ import {
   CustomPaletteParams,
   DataBounds,
   ColorStop,
-} from '../palettes/types';
+} from './types';
 
 import {
   DEFAULT_COLOR_STEPS,
diff --git a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.scss b/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.scss
deleted file mode 100644
index 82165b172eab9..0000000000000
--- a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.lnsPalettePanel__section {
-  padding: $euiSize;
-}
-
-.lnsPalettePanel__section--shaded {
-  background-color: $euiColorLightestShade;
-  border-bottom: $euiBorderThin;
-}
\ No newline at end of file
diff --git a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx b/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx
index beb7e828c1435..5db80ba80446c 100644
--- a/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx
+++ b/packages/kbn-coloring/src/shared_components/coloring/palette_configuration.tsx
@@ -8,7 +8,8 @@
 import { i18n } from '@kbn/i18n';
 import React, { useReducer, useMemo } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
-import { EuiFormRow, htmlIdGenerator, EuiButtonGroup, EuiIconTip } from '@elastic/eui';
+import { css } from '@emotion/react';
+import { EuiFormRow, htmlIdGenerator, EuiButtonGroup, EuiIconTip, useEuiTheme } from '@elastic/eui';
 import { PalettePicker } from './palette_picker';
 import {
   PaletteOutput,
@@ -19,8 +20,6 @@ import {
   RequiredPaletteParamTypes,
 } from '../../palettes';
 
-import './palette_configuration.scss';
-
 import { toColorRanges } from './utils';
 import { ColorRanges, ColorRangesContext } from './color_ranges';
 import { isAllColorRangesValid } from './color_ranges/color_ranges_validation';
@@ -72,8 +71,19 @@ export const CustomizablePalette = ({
     [localState]
   );
 
+  const { euiTheme } = useEuiTheme();
+
+  const styles = useMemo(
+    () => css`
+      padding: ${euiTheme.size.base};
+      background-color: ${euiTheme.colors.lightestShade};
+      border-bottom: ${euiTheme.border.thin};
+    `,
+    [euiTheme.size.base, euiTheme.colors.lightestShade, euiTheme.border.thin]
+  );
+
   return (
-    <div className="lnsPalettePanel__section lnsPalettePanel__section--shaded">
+    <div css={styles} className="lnsPalettePanel__section">
       <EuiFormRow
         display="rowCompressed"
         label={i18n.translate('coloring.dynamicColoring.palettePicker.label', {
diff --git a/packages/kbn-config-schema/src/references/reference.test.ts b/packages/kbn-config-schema/src/references/reference.test.ts
index db7f0db7a051f..7781d3b485dd6 100644
--- a/packages/kbn-config-schema/src/references/reference.test.ts
+++ b/packages/kbn-config-schema/src/references/reference.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Reference } from './reference';
-import { schema } from '../';
+import { schema } from '..';
 
 describe('Reference.isReference', () => {
   it('handles primitives', () => {
diff --git a/packages/kbn-config/BUILD.bazel b/packages/kbn-config/BUILD.bazel
index e242cf5c92622..3567c549a77c4 100644
--- a/packages/kbn-config/BUILD.bazel
+++ b/packages/kbn-config/BUILD.bazel
@@ -37,6 +37,7 @@ RUNTIME_DEPS = [
   "//packages/kbn-std",
   "//packages/kbn-utility-types",
   "//packages/kbn-i18n",
+  "//packages/kbn-plugin-discovery",
   "@npm//js-yaml",
   "@npm//load-json-file",
   "@npm//lodash",
@@ -52,6 +53,7 @@ TYPES_DEPS = [
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-utility-types:npm_module_types",
   "//packages/kbn-i18n:npm_module_types",
+  "//packages/kbn-plugin-discovery:npm_module_types",
   "@npm//load-json-file",
   "@npm//rxjs",
   "@npm//@types/jest",
diff --git a/packages/kbn-config/src/config_service.ts b/packages/kbn-config/src/config_service.ts
index 08e16a9d2f44b..bb7bb54e75ce5 100644
--- a/packages/kbn-config/src/config_service.ts
+++ b/packages/kbn-config/src/config_service.ts
@@ -9,8 +9,8 @@
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Type } from '@kbn/config-schema';
 import { isEqual } from 'lodash';
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, first, map, shareReplay, take, tap } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, firstValueFrom, Observable } from 'rxjs';
+import { distinctUntilChanged, first, map, shareReplay, tap } from 'rxjs/operators';
 import { Logger, LoggerFactory } from '@kbn/logging';
 
 import { Config, ConfigPath, Env } from '.';
@@ -170,7 +170,7 @@ export class ConfigService {
     const namespace = pathToString(path);
     const hasSchema = this.schemas.has(namespace);
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     if (!hasSchema && config.has(path)) {
       // Throw if there is no schema, but a config exists at the path.
       throw new Error(`No validation schema has been defined for [${namespace}]`);
@@ -195,13 +195,13 @@ export class ConfigService {
   }
 
   public async getUnusedPaths() {
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     const handledPaths = [...this.handledPaths.values()].map(pathToString);
     return config.getFlattenedPaths().filter((path) => !isPathHandled(path, handledPaths));
   }
 
   public async getUsedPaths() {
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     const handledPaths = [...this.handledPaths.values()].map(pathToString);
     return config.getFlattenedPaths().filter((path) => isPathHandled(path, handledPaths));
   }
@@ -211,8 +211,8 @@ export class ConfigService {
   }
 
   private async logDeprecation() {
-    const rawConfig = await this.rawConfigProvider.getConfig$().pipe(take(1)).toPromise();
-    const deprecations = await this.deprecations.pipe(take(1)).toPromise();
+    const rawConfig = await firstValueFrom(this.rawConfigProvider.getConfig$());
+    const deprecations = await firstValueFrom(this.deprecations);
     const deprecationMessages: string[] = [];
     const createAddDeprecation = (domainId: string) => (context: DeprecatedConfigDetails) => {
       if (!context.silent) {
diff --git a/packages/kbn-config/src/env.ts b/packages/kbn-config/src/env.ts
index 73f32606c463f..4c54178447105 100644
--- a/packages/kbn-config/src/env.ts
+++ b/packages/kbn-config/src/env.ts
@@ -8,7 +8,7 @@
 
 import { resolve, join } from 'path';
 import loadJsonFile from 'load-json-file';
-import { getPluginSearchPaths } from './plugins';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { PackageInfo, EnvironmentMode } from './types';
 
 /** @internal */
diff --git a/packages/kbn-config/src/index.ts b/packages/kbn-config/src/index.ts
index 272ee7598570c..e4b60d939c074 100644
--- a/packages/kbn-config/src/index.ts
+++ b/packages/kbn-config/src/index.ts
@@ -30,4 +30,3 @@ export { ObjectToConfigAdapter } from './object_to_config_adapter';
 export type { CliArgs, RawPackageInfo } from './env';
 export { Env } from './env';
 export type { EnvironmentMode, PackageInfo } from './types';
-export { getPluginSearchPaths } from './plugins';
diff --git a/packages/kbn-config/src/object_to_config_adapter.ts b/packages/kbn-config/src/object_to_config_adapter.ts
index a20cd0dc2fa66..6b68f71ea7399 100644
--- a/packages/kbn-config/src/object_to_config_adapter.ts
+++ b/packages/kbn-config/src/object_to_config_adapter.ts
@@ -10,7 +10,7 @@ import { cloneDeep, get, has } from 'lodash';
 import { set } from '@elastic/safer-lodash-set';
 import { getFlattenedObject } from '@kbn/std';
 
-import { Config, ConfigPath } from './';
+import { Config, ConfigPath } from '.';
 
 /**
  * Allows plain javascript object to behave like `RawConfig` instance.
diff --git a/packages/kbn-config/src/plugins/plugin_search_paths.ts b/packages/kbn-config/src/plugins/plugin_search_paths.ts
deleted file mode 100644
index 32eb36f9bc956..0000000000000
--- a/packages/kbn-config/src/plugins/plugin_search_paths.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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { resolve } from 'path';
-
-interface SearchOptions {
-  rootDir: string;
-  oss: boolean;
-  examples: boolean;
-}
-
-export function getPluginSearchPaths({ rootDir, oss, examples }: SearchOptions) {
-  return [
-    resolve(rootDir, 'src', 'plugins'),
-    ...(oss ? [] : [resolve(rootDir, 'x-pack', 'plugins')]),
-    resolve(rootDir, 'plugins'),
-    ...(examples ? [resolve(rootDir, 'examples')] : []),
-    ...(examples && !oss ? [resolve(rootDir, 'x-pack', 'examples')] : []),
-    resolve(rootDir, '..', 'kibana-extra'),
-  ];
-}
diff --git a/packages/kbn-config/src/raw/raw_config_service.test.ts b/packages/kbn-config/src/raw/raw_config_service.test.ts
index 41ca4c3cbf7bc..1e9139d2421ef 100644
--- a/packages/kbn-config/src/raw/raw_config_service.test.ts
+++ b/packages/kbn-config/src/raw/raw_config_service.test.ts
@@ -8,7 +8,7 @@
 
 import { mockGetConfigFromFiles } from './raw_config_service.test.mocks';
 
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { RawConfigService } from './raw_config_service';
 
 const configFile = '/config/kibana.yml';
@@ -72,7 +72,7 @@ test('returns config at path as observable', async () => {
 
   configService.loadConfig();
 
-  const exampleConfig = await configService.getConfig$().pipe(first()).toPromise();
+  const exampleConfig = await firstValueFrom(configService.getConfig$());
 
   expect(exampleConfig.key).toEqual('value');
   expect(Object.keys(exampleConfig)).toEqual(['key']);
diff --git a/packages/kbn-datemath/src/index.test.js b/packages/kbn-datemath/src/index.test.js
index a6a576dd713a9..703254204df50 100644
--- a/packages/kbn-datemath/src/index.test.js
+++ b/packages/kbn-datemath/src/index.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const dateMath = require('./index');
+const dateMath = require('.');
 const moment = require('moment');
 
 /**
diff --git a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts b/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
index 8d8ef81e613fd..54ac750332c5f 100644
--- a/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
+++ b/packages/kbn-dev-utils/src/tooling_log/tooling_log.test.ts
@@ -14,6 +14,7 @@ import { Writer } from './writer';
 import { ToolingLogTextWriter } from './tooling_log_text_writer';
 import { ToolingLogCollectingWriter } from './tooling_log_collecting_writer';
 import { createStripAnsiSerializer } from '../serializers/strip_ansi_serializer';
+import { lastValueFrom } from 'rxjs';
 
 expect.addSnapshotSerializer(createStripAnsiSerializer());
 
@@ -146,8 +147,8 @@ describe('#getWritten$()', () => {
     const log = new ToolingLog();
     log.setWriters(writers);
 
-    const done$ = new Rx.Subject();
-    const promise = log.getWritten$().pipe(takeUntil(done$), toArray()).toPromise();
+    const done$ = new Rx.Subject<void>();
+    const promise = lastValueFrom(log.getWritten$().pipe(takeUntil(done$), toArray()));
 
     log.debug('foo');
     log.info('bar');
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
index 690765f3d0c4d..80760520da27f 100644
--- a/packages/kbn-doc-links/src/get_doc_links.ts
+++ b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -328,10 +328,12 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       detectionsReq: `${SECURITY_SOLUTION_DOCS}detections-permissions-section.html`,
       networkMap: `${SECURITY_SOLUTION_DOCS}conf-map-ui.html`,
       troubleshootGaps: `${SECURITY_SOLUTION_DOCS}alerts-ui-monitor.html#troubleshoot-gaps`,
+      ruleApiOverview: `${SECURITY_SOLUTION_DOCS}rule-api-overview.html`,
     },
     securitySolution: {
       trustedApps: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/trusted-apps-ov.html`,
       eventFilters: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/event-filters.html`,
+      blocklist: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/blocklist.html`,
     },
     query: {
       eql: `${ELASTICSEARCH_DOCS}eql.html`,
diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
index 5e85d01c22ce2..57a48219b973c 100644
--- a/packages/kbn-doc-links/src/types.ts
+++ b/packages/kbn-doc-links/src/types.ts
@@ -233,10 +233,12 @@ export interface DocLinks {
     readonly detectionsReq: string;
     readonly networkMap: string;
     readonly troubleshootGaps: string;
+    readonly ruleApiOverview: string;
   };
   readonly securitySolution: {
     readonly trustedApps: string;
     readonly eventFilters: string;
+    readonly blocklist: string;
   };
   readonly query: {
     readonly eql: string;
diff --git a/packages/kbn-docs-utils/BUILD.bazel b/packages/kbn-docs-utils/BUILD.bazel
index 30baa9dccb7f7..a9035e5aeed89 100644
--- a/packages/kbn-docs-utils/BUILD.bazel
+++ b/packages/kbn-docs-utils/BUILD.bazel
@@ -28,7 +28,7 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 RUNTIME_DEPS = [
-  "//packages/kbn-config",
+  "//packages/kbn-plugin-discovery",
   "//packages/kbn-dev-utils",
   "//packages/kbn-utils",
   "@npm//dedent",
@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config:npm_module_types",
+  "//packages/kbn-plugin-discovery:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
   "@npm//ts-morph",
diff --git a/packages/kbn-docs-utils/src/api_docs/find_plugins.ts b/packages/kbn-docs-utils/src/api_docs/find_plugins.ts
index ebe329029302c..5740d094a6894 100644
--- a/packages/kbn-docs-utils/src/api_docs/find_plugins.ts
+++ b/packages/kbn-docs-utils/src/api_docs/find_plugins.ts
@@ -11,8 +11,7 @@ import globby from 'globby';
 
 import loadJsonFile from 'load-json-file';
 
-import { getPluginSearchPaths } from '@kbn/config';
-import { simpleKibanaPlatformPluginDiscovery } from '@kbn/plugin-discovery';
+import { getPluginSearchPaths, simpleKibanaPlatformPluginDiscovery } from '@kbn/plugin-discovery';
 import { REPO_ROOT } from '@kbn/utils';
 import { ApiScope, PluginOrPackage } from './types';
 
diff --git a/packages/kbn-es-query/src/kuery/ast/ast.ts b/packages/kbn-es-query/src/kuery/ast/ast.ts
index ed1b9b90b4cf6..2c9174a1e6db6 100644
--- a/packages/kbn-es-query/src/kuery/ast/ast.ts
+++ b/packages/kbn-es-query/src/kuery/ast/ast.ts
@@ -8,7 +8,7 @@
 
 import { JsonObject } from '@kbn/utility-types';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { nodeTypes } from '../node_types/index';
+import { nodeTypes } from '../node_types';
 import { KQLSyntaxError } from '../kuery_syntax_error';
 import { KueryNode, KueryParseOptions, KueryQueryOptions } from '../types';
 
diff --git a/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts b/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts
index 65de192f4a49e..8e09af5e5dd0a 100644
--- a/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts
+++ b/packages/kbn-es-query/src/kuery/functions/utils/get_fields.test.ts
@@ -9,7 +9,7 @@
 import { DataViewBase } from '../../..';
 import { fields } from '../../../filters/stubs';
 
-import { nodeTypes } from '../../index';
+import { nodeTypes } from '../..';
 import { getFields } from './get_fields';
 
 jest.mock('../../grammar');
diff --git a/packages/kbn-es-query/src/kuery/node_types/function.test.ts b/packages/kbn-es-query/src/kuery/node_types/function.test.ts
index 754bf170c5062..b50e07c1028f0 100644
--- a/packages/kbn-es-query/src/kuery/node_types/function.test.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/function.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { nodeTypes } from './index';
+import { nodeTypes } from '.';
 
 import { buildNode, buildNodeWithArgumentNodes, toElasticsearchQuery } from './function';
 import { toElasticsearchQuery as isFunctionToElasticsearchQuery } from '../functions/is';
diff --git a/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts b/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
index aefd40c6db3fb..3931c218c9f7e 100644
--- a/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { nodeBuilder } from './node_builder';
-import { toElasticsearchQuery } from '../index';
+import { toElasticsearchQuery } from '..';
 
 jest.mock('../grammar');
 
diff --git a/packages/kbn-eslint-plugin-eslint/BUILD.bazel b/packages/kbn-eslint-plugin-eslint/BUILD.bazel
index c02a468456f77..f8242afb6cf9e 100644
--- a/packages/kbn-eslint-plugin-eslint/BUILD.bazel
+++ b/packages/kbn-eslint-plugin-eslint/BUILD.bazel
@@ -30,6 +30,7 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 RUNTIME_DEPS = [
+  "//packages/kbn-utils",
   "@npm//@babel/eslint-parser",
   "@npm//dedent",
   "@npm//eslint",
diff --git a/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js b/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js
index 733bfc91ab9e1..97126995f3b52 100644
--- a/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js
+++ b/packages/kbn-eslint-plugin-eslint/rules/no_restricted_paths.js
@@ -28,7 +28,7 @@
  */
 const path = require('path');
 const mm = require('micromatch');
-const { resolveKibanaImport } = require('@kbn/eslint-plugin-imports');
+const { getImportResolver } = require('@kbn/eslint-plugin-imports');
 
 function isStaticRequire(node) {
   return (
@@ -90,6 +90,8 @@ module.exports = {
   },
 
   create(context) {
+    const resolver = getImportResolver(context);
+
     const sourcePath = context.getPhysicalFilename
       ? context.getPhysicalFilename()
       : context.getFilename();
@@ -103,7 +105,7 @@ module.exports = {
     }
 
     function checkForRestrictedImportPath(importPath, node) {
-      const resolveReport = resolveKibanaImport(importPath, sourceDirname);
+      const resolveReport = resolver.resolve(importPath, sourceDirname);
 
       if (resolveReport?.type !== 'file' || resolveReport.nodeModule) {
         return;
diff --git a/packages/kbn-eslint-plugin-imports/BUILD.bazel b/packages/kbn-eslint-plugin-imports/BUILD.bazel
index ecfb51b9a6ecb..efb6a40a1d9f0 100644
--- a/packages/kbn-eslint-plugin-imports/BUILD.bazel
+++ b/packages/kbn-eslint-plugin-imports/BUILD.bazel
@@ -37,6 +37,7 @@ NPM_MODULE_EXTRA_FILES = [
 #    eg. "@npm//lodash"
 RUNTIME_DEPS = [
   "//packages/kbn-utils",
+  "//packages/kbn-import-resolver",
   "@npm//resolve",
   "@npm//@typescript-eslint/typescript-estree",
   "@npm//eslint",
@@ -55,6 +56,8 @@ RUNTIME_DEPS = [
 TYPES_DEPS = [
   "//packages/kbn-utils:npm_module_types",
   "//packages/kbn-dev-utils:npm_module_types", # only required for the tests, which are excluded except on windows
+  "//packages/kbn-import-resolver:npm_module_types",
+  "@npm//dedent", # only required for the tests, which are excluded except on windows
   "@npm//@types/eslint",
   "@npm//@types/jest",
   "@npm//@types/node",
diff --git a/packages/kbn-eslint-plugin-imports/README.md b/packages/kbn-eslint-plugin-imports/README.md
index dc8abb4dd0772..ba22ed2400643 100644
--- a/packages/kbn-eslint-plugin-imports/README.md
+++ b/packages/kbn-eslint-plugin-imports/README.md
@@ -1,9 +1,56 @@
 # @kbn/eslint-plugin-imports
 
-ESLint plugin providing custom rules for validating imports in the Kibana repo with custom logic beyond what's possible with custom config to eslint-plugin-imports and even a custom resolver
+ESLint plugin providing custom rules for validating imports in the Kibana repo with custom logic beyond what's possible with custom config to eslint-plugin-imports and even a custom resolver.
 
-## `resolveKibanaImport(request: string, dirname: string)`
+For the purposes of this ESLint plugin "imports" include:
 
-Resolve an import request (the "from" string from an import statement, or any other relative/absolute import path) from a given directory. The `dirname` should be the same for all files in a given directory.
+ - `import` statements
+ - `import()` expressions
+ - `export ... from` statements
+ - `require()` calls
+ - `require.resolve()` calls
+ - `jest.mock()` and related calls
 
-Result will be `null` when the import path does not resolve, but all valid/committed import paths *should* resolve. Other result values are documented in src/resolve_result.ts.
\ No newline at end of file
+An "import request" is the string defining the target package/module by any of the previous mentioned "import" types
+
+## `@kbn/imports/no_unresolvable_imports`
+
+This rule validates that every import request in the repository can be resolved by `@kbn/import-resolver`.
+
+This rule is not configurable, should never be skipped, and is auto-fixable.
+
+If a valid import request can't be resolved for some reason please reach out to Kibana Operations to work on either a different strategy for the import or help updating the resolve to support the new import strategy.
+
+## `@kbn/imports/uniform_imports`
+
+This rule validates that every import request in the repsitory follows a standard set of formatting rules. See the rule implemeation for a full breakdown but here is a breif summary:
+
+ - imports within a single package must use relative paths
+ - imports across packages must reference the other package using it's module id
+ - imports to code not in a package must use relative paths
+ - imports to an `index` file end with the directory name, ie `/index` or `/index.{ext}` are stripped
+ - unless this is a `require.resolve()`, the imports should not mention file extensions. `require.resolve()` calls will retain the extension if added manually
+
+This rule is not configurable, should never be skipped, and is auto-fixable.
+
+## `@kbn/imports/exports_moved_packages`
+
+This rule assists package authors who are doing the good work of breaking up large packages. The goal is to define exports which used to be part of one package as having moved to another package. The configuration maintains this mapping and is designed to be extended in the future is additional needs arrise like targetting specific package types.
+
+Config example:
+```ts
+'@kbn/imports/exports_moved_packages': ['error', [
+  {
+    fromPackage: '@kbn/kitchen-sink',
+    toPackage: '@kbn/spatula',
+    exportNames: [
+      'Spatula',
+      'isSpatula'
+    ]
+  }
+]]
+```
+
+This config will find any import of `@kbn/kitchen-sink` which specifically references the `Spatula` or `isSpatula` exports, remove the old exports from the import (potentially removing the entire import), and add a new import after the previous following it's style pointing to the new package.
+
+The auto-fixer here covers the vast majority of import styles in the repository but might not cover everything, including `import * as Namespace from '@kbn/kitchen-sink'`. Imports like this will need to be found and updated manually, though TypeScript should be able to find the vast majority of those.
\ No newline at end of file
diff --git a/packages/kbn-eslint-plugin-imports/jest.config.js b/packages/kbn-eslint-plugin-imports/jest.config.js
new file mode 100644
index 0000000000000..bf0bad97843ef
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/jest.config.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-eslint-plugin-imports'],
+};
diff --git a/packages/kbn-eslint-plugin-imports/src/get_import_resolver.ts b/packages/kbn-eslint-plugin-imports/src/get_import_resolver.ts
new file mode 100644
index 0000000000000..331232288aef1
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/get_import_resolver.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ImportResolver } from '@kbn/import-resolver';
+import { REPO_ROOT } from '@kbn/utils';
+import { Rule } from 'eslint';
+import { RUNNING_IN_EDITOR } from './helpers/running_in_editor';
+
+let importResolverCache: ImportResolver | undefined;
+
+/**
+ * Create a request resolver for ESLint, requires a PluginPackageResolver from @kbn/bazel-packages which will
+ * be created and cached on contextServices automatically.
+ *
+ * All import requests in the repository should return a result, if they don't it's a bug
+ * which should be caught by the `@kbn/import/no_unresolved` rule, which should never be disabled. If you need help
+ * adding support for an import style please reach out to operations.
+ */
+export function getImportResolver(context: Rule.RuleContext): ImportResolver {
+  if (RUNNING_IN_EDITOR) {
+    return (context.parserServices.kibanaImportResolver ||= ImportResolver.create(REPO_ROOT));
+  }
+
+  return (importResolverCache ||= ImportResolver.create(REPO_ROOT));
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/report.ts b/packages/kbn-eslint-plugin-imports/src/helpers/report.ts
new file mode 100644
index 0000000000000..bfcd9956018cc
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/helpers/report.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Eslint from 'eslint';
+import { SomeNode } from './visit_all_import_statements';
+
+interface ReportOptions {
+  node: SomeNode;
+  message: string;
+  correctImport?: string;
+}
+
+/**
+ * Simple wrapper around context.report so that the types work better with typescript-estree
+ */
+export function report(context: Eslint.Rule.RuleContext, options: ReportOptions) {
+  context.report({
+    node: options.node as any,
+    message: options.message,
+    fix: options.correctImport
+      ? (fixer) => {
+          return fixer.replaceText(options.node as any, `'${options.correctImport}'`);
+        }
+      : null,
+  });
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/running_in_editor.ts b/packages/kbn-eslint-plugin-imports/src/helpers/running_in_editor.ts
new file mode 100644
index 0000000000000..3067cc9d1005f
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/helpers/running_in_editor.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const RUNNING_IN_EDITOR =
+  // vscode sets this in the env for all workers
+  !!process.env.VSCODE_CWD ||
+  // MacOS sets this for intellij processes, not sure if it works in webstorm but we could expand this check later
+  !!process.env.__CFBundleIdentifier?.startsWith('com.jetbrains.intellij');
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts b/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts
index c65843764ef79..6f549d93ef26e 100644
--- a/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts
+++ b/packages/kbn-eslint-plugin-imports/src/helpers/visit_all_import_statements.ts
@@ -6,73 +6,142 @@
  * Side Public License, v 1.
  */
 
+import { Rule } from 'eslint';
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/typescript-estree';
-// @ts-expect-error no types for this module
-import moduleVisitor from 'eslint-module-utils/moduleVisitor';
+import * as T from '@babel/types';
+import { ImportType } from '@kbn/import-resolver';
 
-type Importers =
+const JEST_MODULE_METHODS = [
+  'jest.createMockFromModule',
+  'jest.mock',
+  'jest.unmock',
+  'jest.doMock',
+  'jest.dontMock',
+  'jest.setMock',
+  'jest.requireActual',
+  'jest.requireMock',
+];
+
+export type Importer =
   | TSESTree.ImportDeclaration
+  | T.ImportDeclaration
   | TSESTree.ExportNamedDeclaration
+  | T.ExportNamedDeclaration
   | TSESTree.ExportAllDeclaration
+  | T.ExportAllDeclaration
   | TSESTree.CallExpression
+  | T.CallExpression
   | TSESTree.ImportExpression
-  | TSESTree.CallExpression;
+  | TSESTree.CallExpression
+  | T.CallExpression;
+
+export type SomeNode = TSESTree.Node | T.Node;
+
+interface VisitorContext {
+  node: SomeNode;
+  type: ImportType;
+  importer: Importer;
+}
+type Visitor = (req: string | null, context: VisitorContext) => void;
+
+const isIdent = (node: SomeNode): node is TSESTree.Identifier | T.Identifier =>
+  T.isIdentifier(node) || node.type === AST_NODE_TYPES.Identifier;
+
+const isStringLiteral = (node: SomeNode): node is TSESTree.StringLiteral | T.StringLiteral =>
+  T.isStringLiteral(node) ||
+  (node.type === AST_NODE_TYPES.Literal && typeof node.value === 'string');
+
+const isTemplateLiteral = (node: SomeNode): node is TSESTree.TemplateLiteral | T.TemplateLiteral =>
+  T.isTemplateLiteral(node) || node.type === AST_NODE_TYPES.TemplateLiteral;
 
-type ImportVisitor = (req: string, node: Importers) => void;
+function passSourceAsString(
+  fn: Visitor,
+  node: SomeNode | null | undefined,
+  importer: Importer,
+  type: ImportType
+) {
+  if (!node) {
+    return;
+  }
+
+  const ctx = {
+    node,
+    importer,
+    type,
+  };
+
+  if (isStringLiteral(node)) {
+    return fn(node.value, ctx);
+  }
+
+  if (isTemplateLiteral(node)) {
+    if (node.expressions.length) {
+      return null;
+    }
+
+    return fn(
+      [...node.quasis].reduce((acc, q) => acc + q.value.raw, ''),
+      ctx
+    );
+  }
+
+  return fn(null, ctx);
+}
 
 /**
- * Create an ESLint rule visitor that calls visitor() for every import string, including
- * 'export from' statements, require() calls, jest.mock() calls, and more.
+ * Create an ESLint rule visitor that calls fn() for every import string, including
+ * 'export from' statements, require() calls, require.resolve(), jest.mock() calls, and more.
+ * Works with both babel eslint and typescript-eslint parsers
  */
-export function visitAllImportStatements(visitor: ImportVisitor) {
-  const baseWrapper = moduleVisitor(
-    (reqNode: TSESTree.Literal, importer: Importers) => {
-      const req = reqNode.value;
-      if (typeof req !== 'string') {
-        throw new Error('unable to read value of import request');
-      }
-
-      visitor(req, importer);
+export function visitAllImportStatements(fn: Visitor) {
+  const visitor = {
+    ImportDeclaration(node: TSESTree.ImportDeclaration | T.ImportDeclaration) {
+      passSourceAsString(fn, node.source, node, 'esm');
     },
-    {
-      esmodules: true,
-      commonjs: true,
-    }
-  );
-
-  const baseCallExpressionVisitor = baseWrapper.CallExpression;
-
-  /**
-   * wrapper around the base wrapper which also picks up calls to jest.<any>('../<any>' or '@kbn/<any>', ...) as "import statements"
-   * @param {CallExpression} node
-   */
-  baseWrapper.CallExpression = (node: TSESTree.CallExpression) => {
-    const { callee } = node;
-    // is this call expression a represenation of an obj.method() call?
-    if (callee.type === AST_NODE_TYPES.MemberExpression) {
-      const { object } = callee;
-
-      // is the object being called named "jest"?
-      if (object.type === AST_NODE_TYPES.Identifier && object.name === 'jest') {
-        const [path] = node.arguments;
-
-        // is the first argument to the method a string which starts with '../' or '@kbn/'?
-        if (
-          path &&
-          path.type === AST_NODE_TYPES.Literal &&
-          typeof path.value === 'string' &&
-          (path.value.startsWith('../') || path.value.startsWith('@kbn/'))
-        ) {
-          // call our visitor and assume this node represents a call to a jest mocking function and validate the relative path
-          visitor(path.value, node);
-        }
+    ExportNamedDeclaration(node: TSESTree.ExportNamedDeclaration | T.ExportNamedDeclaration) {
+      passSourceAsString(fn, node.source, node, 'esm');
+    },
+    ExportAllDeclaration(node: TSESTree.ExportAllDeclaration | T.ExportAllDeclaration) {
+      passSourceAsString(fn, node.source, node, 'esm');
+    },
+    ImportExpression(node: TSESTree.ImportExpression) {
+      passSourceAsString(fn, node.source, node, 'esm');
+    },
+    CallExpression(node: TSESTree.CallExpression | T.CallExpression) {
+      const { callee, arguments: args } = node;
+      // babel parser used for .js files treats import() calls as CallExpressions with callees of type "Import"
+      if (T.isImport(callee)) {
+        passSourceAsString(fn, args[0], node, 'esm');
+        return;
+      }
 
+      // is this a `require()` call?
+      if (isIdent(callee) && callee.name === 'require') {
+        passSourceAsString(fn, args[0], node, 'require');
         return;
       }
-    }
 
-    return baseCallExpressionVisitor(node);
+      // is this an `obj.method()` call?
+      if (
+        callee.type === AST_NODE_TYPES.MemberExpression &&
+        isIdent(callee.object) &&
+        isIdent(callee.property)
+      ) {
+        const { object: left, property: right } = callee;
+        const name = `${left.name}.${right.name}`;
+
+        // is it "require.resolve()"?
+        if (name === 'require.resolve') {
+          passSourceAsString(fn, args[0], node, 'require-resolve');
+        }
+
+        // is it one of jest's mock methods?
+        if (left.name === 'jest' && JEST_MODULE_METHODS.includes(name)) {
+          passSourceAsString(fn, args[0], node, 'jest');
+        }
+      }
+    },
   };
 
-  return baseWrapper;
+  return visitor as Rule.RuleListener;
 }
diff --git a/packages/kbn-eslint-plugin-imports/src/index.ts b/packages/kbn-eslint-plugin-imports/src/index.ts
index 756a6f0c19852..24dd819502b58 100644
--- a/packages/kbn-eslint-plugin-imports/src/index.ts
+++ b/packages/kbn-eslint-plugin-imports/src/index.ts
@@ -6,15 +6,17 @@
  * Side Public License, v 1.
  */
 
-export * from './resolve_kibana_import';
-export * from './resolve_result';
-
-import { NoUnresolvedImportsRule } from './rules/no_unresolved_imports';
+export * from './get_import_resolver';
+import { NoUnresolvableImportsRule } from './rules/no_unresolvable_imports';
+import { UniformImportsRule } from './rules/uniform_imports';
+import { ExportsMovedPackagesRule } from './rules/exports_moved_packages';
 
 /**
  * Custom ESLint rules, add `'@kbn/eslint-plugin-imports'` to your eslint config to use them
  * @internal
  */
 export const rules = {
-  no_unresolved_imports: NoUnresolvedImportsRule,
+  no_unresolvable_imports: NoUnresolvableImportsRule,
+  uniform_imports: UniformImportsRule,
+  exports_moved_packages: ExportsMovedPackagesRule,
 };
diff --git a/packages/kbn-eslint-plugin-imports/src/integration_tests/resolve_kibana_import.test.ts b/packages/kbn-eslint-plugin-imports/src/integration_tests/resolve_kibana_import.test.ts
deleted file mode 100644
index 21b1ea7b30409..0000000000000
--- a/packages/kbn-eslint-plugin-imports/src/integration_tests/resolve_kibana_import.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import Path from 'path';
-
-import { REPO_ROOT } from '@kbn/utils';
-import { createAbsolutePathSerializer } from '@kbn/dev-utils';
-import { resolveKibanaImport } from '../resolve_kibana_import';
-
-expect.addSnapshotSerializer(createAbsolutePathSerializer());
-
-const plugin = (subPath: string) => Path.resolve(REPO_ROOT, 'src/plugins', subPath);
-const xPlugin = (subPath: string) => Path.resolve(REPO_ROOT, 'x-pack/plugins', subPath);
-const pkg = (subPath: string) => Path.resolve(REPO_ROOT, 'packages', subPath);
-
-describe('standard import formats', () => {
-  it('resolves requests to src/', () => {
-    expect(resolveKibanaImport('src/core/public', plugin('discovery/public/components/foo')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/public/index.ts,
-        "type": "file",
-      }
-    `);
-    expect(resolveKibanaImport('src/core/server', xPlugin('spaces/server/routes')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/server/index.ts,
-        "type": "file",
-      }
-    `);
-    expect(resolveKibanaImport('src/core/utils', pkg('kbn-dev-utils/lib'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/utils/index.ts,
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves relative paths too', () => {
-    expect(resolveKibanaImport('../../../../core/public', plugin('foo/bar/baz')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/src/core/public/index.ts,
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves @kbn/ imports', () => {
-    expect(resolveKibanaImport('@kbn/std', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/@kbn/std/target_node/index.js,
-        "nodeModule": "@kbn/std",
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves @elastic/ imports', () => {
-    expect(resolveKibanaImport('@elastic/eui', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/@elastic/eui/lib/index.js,
-        "nodeModule": "@elastic/eui",
-        "type": "file",
-      }
-    `);
-  });
-
-  it('resolves normal node module imports', () => {
-    expect(resolveKibanaImport('lodash', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/lodash/lodash.js,
-        "nodeModule": "lodash",
-        "type": "file",
-      }
-    `);
-
-    expect(resolveKibanaImport('globby', pkg('kbn-dev-utils/src'))).toMatchInlineSnapshot(`
-      Object {
-        "absolute": <absolute path>/node_modules/globby/index.js,
-        "nodeModule": "globby",
-        "type": "file",
-      }
-    `);
-  });
-
-  it('returns null when the import cannot be resolved', () => {
-    expect(resolveKibanaImport('../../../../invalid', plugin('foo/bar'))).toMatchInlineSnapshot(
-      `null`
-    );
-    expect(resolveKibanaImport('src/invalid', plugin('foo/bar'))).toMatchInlineSnapshot(`null`);
-    expect(resolveKibanaImport('kibana/invalid', plugin('foo/bar'))).toMatchInlineSnapshot(`null`);
-    expect(resolveKibanaImport('@kbn/invalid', plugin('foo/bar'))).toMatchInlineSnapshot(`null`);
-  });
-
-  it('returns ignore results for known unresolvable but okay import statements', () => {
-    expect(resolveKibanaImport('../../grammar/built_grammar.js', plugin('foo/bar')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('kibana-buildkite-library', pkg('kbn-foo/src')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('core_styles', pkg('kbn-foo/src'))).toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('core_app_image_assets', pkg('kbn-foo/src'))).toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('ace/lib/dom', pkg('kbn-foo/src'))).toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('@elastic/eui/src/components/', pkg('kbn-foo/src')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-
-    expect(resolveKibanaImport('@elastic/eui/src/services/', pkg('kbn-foo/src')))
-      .toMatchInlineSnapshot(`
-      Object {
-        "type": "ignore",
-      }
-    `);
-  });
-});
diff --git a/packages/kbn-eslint-plugin-imports/src/resolve_kibana_import.ts b/packages/kbn-eslint-plugin-imports/src/resolve_kibana_import.ts
deleted file mode 100644
index 00ab3e0cdcf82..0000000000000
--- a/packages/kbn-eslint-plugin-imports/src/resolve_kibana_import.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import Fs from 'fs';
-import Path from 'path';
-
-import Resolve from 'resolve';
-import { REPO_ROOT } from '@kbn/utils';
-
-import { isDirectory, isFile } from './helpers/fs';
-import { ResolveResult } from './resolve_result';
-
-const NODE_MODULE_SEG = Path.sep + 'node_modules' + Path.sep;
-
-function packageFilter(pkg: Record<string, unknown>) {
-  if (!pkg.main && pkg.types) {
-    // for the purpose of resolving files, a "types" file is adequate
-    return {
-      ...pkg,
-      main: pkg.types,
-    };
-  }
-
-  return pkg;
-}
-
-function adaptReq(req: string, dirname: string): string | undefined {
-  // transform webpack loader requests and focus on the actual file selected
-  if (req.startsWith('!!')) {
-    return req.split('!').pop()?.split('?').shift();
-  }
-
-  // handle typescript aliases
-  if (req === 'kibana/public') {
-    return adaptReq('src/core/public', dirname);
-  }
-
-  if (req === 'kibana/server') {
-    return adaptReq('src/core/server', dirname);
-  }
-
-  // turn root-relative paths into relative paths
-  if (
-    req.startsWith('src/') ||
-    req.startsWith('x-pack/') ||
-    req.startsWith('examples/') ||
-    req.startsWith('test/')
-  ) {
-    const absolute = Path.resolve(REPO_ROOT, req);
-    return `./${Path.relative(dirname, absolute)}`;
-  }
-}
-
-function shouldResolve(req: string) {
-  // this library is only installed on CI and never resolvable
-  if (req === 'kibana-buildkite-library') {
-    return;
-  }
-
-  // these are special webpack-aliases only used in storybooks, ignore them
-  if (req === 'core_styles' || req === 'core_app_image_assets') {
-    return;
-  }
-
-  // ignore amd require done by ace syntax plugin
-  if (req === 'ace/lib/dom') {
-    return;
-  }
-
-  // ignore requests to grammar/built_grammar.js files or built kbn-monaco workers, these are built by bazel and never resolvable
-  if (
-    req.endsWith('grammar/built_grammar.js') ||
-    (req.includes('/target_workers/') && req.endsWith('.editor.worker.js'))
-  ) {
-    return;
-  }
-
-  // typescript validates these imports fine and they're purely virtual thanks to ambient type definitions in @elastic/eui so /shrug
-  if (
-    req.startsWith('@elastic/eui/src/components/') ||
-    req.startsWith('@elastic/eui/src/services/')
-  ) {
-    return;
-  }
-
-  return true;
-}
-
-function tryNodeResolve(req: string, dirname: string): ResolveResult | null {
-  try {
-    const path = Resolve.sync(req, {
-      basedir: dirname,
-      extensions: ['.js', '.json', '.ts', '.tsx', '.d.ts'],
-      isDirectory,
-      isFile,
-      packageFilter,
-    });
-
-    if (path.includes(NODE_MODULE_SEG)) {
-      const modulePath = path.split(NODE_MODULE_SEG).pop()!.split(Path.sep);
-      const moduleId = modulePath[0].startsWith('@')
-        ? `${modulePath[0]}/${modulePath[1]}`
-        : modulePath[0];
-      return {
-        type: 'file',
-        absolute: path,
-        nodeModule: moduleId,
-      };
-    }
-
-    return {
-      type: 'file',
-      absolute: path.includes('node_modules') ? Fs.readlinkSync(path) : path,
-    };
-  } catch (error) {
-    if (error && error.code === 'MODULE_NOT_FOUND') {
-      return null;
-    }
-
-    throw error;
-  }
-}
-
-function tryTypesResolve(req: string, dirname: string): ResolveResult | null {
-  const parts = req.split('/');
-  const nmParts = parts[0].startsWith('@') ? [parts[0].slice(1), parts[1]] : [parts[0]];
-  const typesReq = `@types/${nmParts.join('__')}`;
-  const result = tryNodeResolve(typesReq, dirname);
-
-  if (result) {
-    return {
-      type: '@types',
-      module: typesReq,
-    };
-  }
-
-  return null;
-}
-
-/**
- * Resolve an import request. All import requests in the repository should return a result, if they don't it's a bug
- * which should be caught by the `@kbn/import/no_unresolved` rule, which should never be disabled. If you need help
- * adding support for an import style please reach out to operations.
- *
- * @param req Text from an import/require, like `../../src/core/public` or `@kbn/std`
- * @param dirname The directory of the file where the req was found
- */
-export function resolveKibanaImport(req: string, dirname: string): ResolveResult | null {
-  req = adaptReq(req, dirname) ?? req;
-
-  if (!shouldResolve(req)) {
-    return { type: 'ignore' };
-  }
-
-  return tryNodeResolve(req, dirname) ?? tryTypesResolve(req, dirname);
-}
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.test.ts b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.test.ts
new file mode 100644
index 0000000000000..720d738e2ca90
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.test.ts
@@ -0,0 +1,279 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { RuleTester } from 'eslint';
+import { ExportsMovedPackagesRule, MovedExportsRule } from './exports_moved_packages';
+import dedent from 'dedent';
+
+const fmt = (str: TemplateStringsArray) => dedent(str) + '\n';
+
+const OPTIONS: MovedExportsRule[][] = [
+  [
+    {
+      exportNames: ['foo', 'bar'],
+      fromPackage: 'old',
+      toPackage: 'new',
+    },
+  ],
+];
+
+const tsTester = [
+  '@typescript-eslint/parser',
+  new RuleTester({
+    parser: require.resolve('@typescript-eslint/parser'),
+    parserOptions: {
+      sourceType: 'module',
+      ecmaVersion: 2018,
+      ecmaFeatures: {
+        jsx: true,
+      },
+    },
+  }),
+] as const;
+
+const babelTester = [
+  '@babel/eslint-parser',
+  new RuleTester({
+    parser: require.resolve('@babel/eslint-parser'),
+    parserOptions: {
+      sourceType: 'module',
+      ecmaVersion: 2018,
+      requireConfigFile: false,
+      babelOptions: {
+        presets: ['@kbn/babel-preset/node_preset'],
+      },
+    },
+  }),
+] as const;
+
+for (const [name, tester] of [tsTester, babelTester]) {
+  describe(name, () => {
+    tester.run('@kbn/imports/exports_moved_packages', ExportsMovedPackagesRule, {
+      valid: [
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import { foo, bar as Bar } from 'new'
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const { foo, bar: Bar } = require('new')
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export async function x () {
+              const { foo, bar: Bar } = await import('new')
+              return { foo, Bar }
+            }
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const Old = require('old')
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import Old from 'old'
+          `,
+        },
+        {
+          // we aren't going to try to figure out which imports you use from an async import in
+          // a Promise.all
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const [{ foo }] = Promise.all([
+              import('old')
+            ])
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export * from 'old'
+          `,
+        },
+      ],
+
+      invalid: [
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import { foo, bar as Bar } from 'old'
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            import { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            import type { foo, bar as Bar } from 'old'
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            import type { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export { foo, box } from 'old';
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Export "foo" is now in package "new"',
+            },
+          ],
+          output: fmt`
+            export {  box } from 'old';
+            export { foo } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export { foo, bar as Bar } from 'old';
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            export { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export type { foo, bar as Bar } from 'old'
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            export type { foo, bar as Bar } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export type { foo, box } from 'old';
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Export "foo" is now in package "new"',
+            },
+          ],
+          output: fmt`
+            export type {  box } from 'old';
+            export type { foo } from 'new';
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            const { foo, bar: Bar } = require('old')
+          `,
+          errors: [
+            {
+              line: 1,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            const { foo, bar: Bar } = require('new');
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export async function x () {
+              const { foo, bar: Bar } = await import('old')
+              return { foo, Bar }
+            }
+          `,
+          errors: [
+            {
+              line: 2,
+              message: 'Exports "foo", "bar" are now in package "new"',
+            },
+          ],
+          output: fmt`
+            export async function x () {
+              const { foo, bar: Bar } = await import('new');
+              return { foo, Bar }
+            }
+          `,
+        },
+        {
+          filename: 'foo.ts',
+          options: OPTIONS,
+          code: fmt`
+            export async function x () {
+              const { foo, box } = await import('old')
+              return { foo, box }
+            }
+          `,
+          errors: [
+            {
+              line: 2,
+              message: 'Export "foo" is now in package "new"',
+            },
+          ],
+          output: fmt`
+            export async function x () {
+              const {  box } = await import('old')
+            const { foo } = await import('new');
+              return { foo, box }
+            }
+          `,
+        },
+      ],
+    });
+  });
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.ts b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.ts
new file mode 100644
index 0000000000000..2962ab4a5cb12
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/rules/exports_moved_packages.ts
@@ -0,0 +1,375 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Rule, AST } from 'eslint';
+import * as T from '@babel/types';
+import { TSESTree } from '@typescript-eslint/typescript-estree';
+
+import { visitAllImportStatements, Importer } from '../helpers/visit_all_import_statements';
+
+export interface MovedExportsRule {
+  fromPackage: string;
+  toPackage: string;
+  exportNames: string[];
+}
+
+interface Imported {
+  type: 'require' | 'import expression' | 'export' | 'export type' | 'import' | 'import type';
+  node:
+    | TSESTree.ImportSpecifier
+    | T.ImportSpecifier
+    | TSESTree.Property
+    | T.Property
+    | TSESTree.ExportSpecifier
+    | T.ExportSpecifier;
+  name: string;
+  id?: string;
+}
+
+interface BadImport extends Imported {
+  id: string;
+  newPkg: string;
+}
+
+function getParent(node: T.Node | TSESTree.Node): T.Node | TSESTree.Node | undefined {
+  if ('parent' in node) {
+    return node.parent as any;
+  }
+}
+
+function findDeclaration(node: T.Node | TSESTree.Node) {
+  let cursor: T.Node | TSESTree.Node | undefined = node;
+  while (
+    cursor &&
+    !T.isVariableDeclaration(cursor) &&
+    cursor.type !== TSESTree.AST_NODE_TYPES.VariableDeclaration
+  ) {
+    cursor = getParent(cursor);
+  }
+  return cursor;
+}
+
+function getBadImports(imported: Imported[], rules: MovedExportsRule[]): BadImport[] {
+  return imported.flatMap((i): BadImport | never[] => {
+    if (!i.id) {
+      return [];
+    }
+
+    const name = i.name;
+    const match = rules.find((r) => r.exportNames.includes(name));
+    if (!match) {
+      return [];
+    }
+
+    return {
+      type: i.type,
+      node: i.node,
+      id: i.id,
+      name: i.name,
+      newPkg: match.toPackage,
+    };
+  });
+}
+
+function inspectImports(
+  importer: Importer,
+  rules: MovedExportsRule[]
+): undefined | { importCount: number; allBadImports: BadImport[] } {
+  // get import names from require() and await import() calls
+  if (
+    T.isCallExpression(importer) ||
+    importer.type === TSESTree.AST_NODE_TYPES.CallExpression ||
+    importer.type === TSESTree.AST_NODE_TYPES.ImportExpression
+  ) {
+    const declaration = findDeclaration(importer);
+    if (!declaration || !declaration.declarations[0]) {
+      return;
+    }
+    const declarator = declaration.declarations[0];
+    if (
+      !T.isObjectPattern(declarator.id) &&
+      declarator.id.type !== TSESTree.AST_NODE_TYPES.ObjectPattern
+    ) {
+      return;
+    }
+
+    const properties = declarator.id.properties;
+    return {
+      importCount: properties.length,
+      allBadImports: getBadImports(
+        properties.flatMap((prop): Imported | never[] => {
+          if (
+            prop.type !== TSESTree.AST_NODE_TYPES.Property ||
+            prop.kind !== 'init' ||
+            prop.key.type !== TSESTree.AST_NODE_TYPES.Identifier
+          ) {
+            return [];
+          }
+
+          const name = prop.key.name;
+          const local =
+            prop.value.type === TSESTree.AST_NODE_TYPES.Identifier ? prop.value.name : undefined;
+
+          return {
+            node: prop,
+            name,
+            type:
+              importer.type === TSESTree.AST_NODE_TYPES.ImportExpression ||
+              T.isImport(importer.callee)
+                ? 'import expression'
+                : 'require',
+            id: !local ? undefined : name === local ? name : `${name}: ${local}`,
+          };
+        }),
+        rules
+      ),
+    };
+  }
+
+  // get import names from import {} and export {} from
+  if (
+    T.isImportDeclaration(importer) ||
+    importer.type === TSESTree.AST_NODE_TYPES.ImportDeclaration ||
+    T.isExportNamedDeclaration(importer) ||
+    importer.type === TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
+  ) {
+    const type =
+      T.isExportNamedDeclaration(importer) ||
+      importer.type === TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
+        ? importer.exportKind === 'type'
+          ? 'export type'
+          : 'export'
+        : (T.isImportDeclaration(importer) ||
+            importer.type === TSESTree.AST_NODE_TYPES.ImportDeclaration) &&
+          importer.importKind === 'type'
+        ? 'import type'
+        : 'import';
+
+    return {
+      importCount: importer.specifiers.length,
+      allBadImports: getBadImports(
+        importer.specifiers.flatMap((specifier): Imported | never[] => {
+          if (
+            T.isImportSpecifier(specifier) ||
+            specifier.type === TSESTree.AST_NODE_TYPES.ImportSpecifier
+          ) {
+            const name = T.isStringLiteral(specifier.imported)
+              ? specifier.imported.value
+              : specifier.imported.name;
+            const local = specifier.local.name;
+            return {
+              node: specifier,
+              name,
+              type,
+              id: name === local ? name : `${name} as ${local}`,
+            };
+          }
+
+          if (
+            T.isExportSpecifier(specifier) ||
+            specifier.type === TSESTree.AST_NODE_TYPES.ExportSpecifier
+          ) {
+            const name = T.isStringLiteral(specifier.exported)
+              ? specifier.exported.value
+              : specifier.exported.name;
+            const local = specifier.local.name;
+            return {
+              node: specifier,
+              name: local,
+              type,
+              id: name === local ? name : `${local} as ${name}`,
+            };
+          }
+
+          return [];
+        }),
+        rules
+      ),
+    };
+  }
+}
+
+export const ExportsMovedPackagesRule: Rule.RuleModule = {
+  meta: {
+    fixable: 'code',
+    schema: [
+      {
+        type: 'array',
+        items: {
+          type: 'object',
+          properties: {
+            fromPackage: {
+              type: 'string',
+            },
+            toPackage: {
+              type: 'string',
+            },
+            exportNames: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    ],
+    docs: {
+      url: 'https://github.com/elastic/kibana/blob/main/packages/kbn-eslint-plugin-imports/README.md#kbnimportsexports_moved_packages',
+    },
+  },
+
+  create(context) {
+    const rules: MovedExportsRule[] = context.options[0];
+    const source = context.getSourceCode();
+
+    // get the range for the entire "import", expanding require()/import() to their
+    // entire variable declaration and including the trailing newline if we can
+    // idenitify it
+    function getRangeWithNewline(
+      importer: Importer | T.VariableDeclaration | TSESTree.VariableDeclaration
+    ): AST.Range {
+      if (
+        T.isCallExpression(importer) ||
+        importer.type === TSESTree.AST_NODE_TYPES.CallExpression ||
+        importer.type === TSESTree.AST_NODE_TYPES.ImportExpression
+      ) {
+        const declaration = findDeclaration(importer);
+        if (declaration) {
+          return getRangeWithNewline(declaration);
+        }
+      }
+
+      const text = source.getText(importer as any, 0, 1);
+      const range = getRange(importer);
+      return text.endsWith('\n') ? [range[0], range[1] + 1] : range;
+    }
+
+    function getRange(
+      nodeA: T.Node | TSESTree.Node | AST.Token,
+      nodeB: T.Node | TSESTree.Node | AST.Token = nodeA
+    ): AST.Range {
+      if (!nodeA.loc) {
+        throw new Error('unable to use babel AST nodes without locations');
+      }
+      if (!nodeB.loc) {
+        throw new Error('unable to use babel AST nodes without locations');
+      }
+      return [source.getIndexFromLoc(nodeA.loc.start), source.getIndexFromLoc(nodeB.loc.end)];
+    }
+
+    return visitAllImportStatements((req, { importer }) => {
+      if (!req) {
+        return;
+      }
+
+      const rulesForRightPackage = rules.filter((m) => m.fromPackage === req);
+      if (!rulesForRightPackage.length) {
+        return;
+      }
+
+      const { allBadImports, importCount } = inspectImports(importer, rulesForRightPackage) ?? {};
+      if (!allBadImports?.length) {
+        return;
+      }
+
+      const badImportsByNewPkg = new Map<string, typeof allBadImports>();
+      const groupedBadImports = new Map<BadImport['type'], Map<string, typeof allBadImports>>();
+      for (const badProp of allBadImports) {
+        if (!groupedBadImports.has(badProp.type)) {
+          groupedBadImports.set(badProp.type, new Map());
+        }
+        const typeGroup = groupedBadImports.get(badProp.type)!;
+        if (!typeGroup.has(badProp.newPkg)) {
+          typeGroup.set(badProp.newPkg, []);
+        }
+
+        typeGroup.get(badProp.newPkg)!.push(badProp);
+
+        const existing = badImportsByNewPkg.get(badProp.newPkg);
+        if (existing) {
+          existing.push(badProp);
+        } else {
+          badImportsByNewPkg.set(badProp.newPkg, [badProp]);
+        }
+      }
+
+      context.report({
+        node: importer as any,
+        message: Array.from(badImportsByNewPkg)
+          .map(
+            ([pkg, bad]) =>
+              `Export${bad.length === 1 ? '' : 's'} ${bad.map((b) => `"${b.name}"`).join(', ')} ${
+                bad.length === 1 ? 'is' : 'are'
+              } now in package "${pkg}"`
+          )
+          .join('\n'),
+        *fix(fixer) {
+          const importerRange = getRangeWithNewline(importer);
+
+          // insert new require() calls
+          for (const [type, badProps] of groupedBadImports) {
+            for (const [pkg, props] of badProps) {
+              switch (type) {
+                case 'require':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `const { ${props.map((b) => b.id).join(', ')} } = require('${pkg}');\n`
+                  );
+                  break;
+                case 'import expression':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `const { ${props.map((b) => b.id).join(', ')} } = await import('${pkg}');\n`
+                  );
+                  break;
+                case 'export':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `export { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+                case 'export type':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `export type { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+                case 'import':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `import { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+                case 'import type':
+                  yield fixer.insertTextAfterRange(
+                    importerRange,
+                    `import type { ${props.map((b) => b.id).join(', ')} } from '${pkg}';\n`
+                  );
+                  break;
+              }
+            }
+          }
+
+          if (importCount === allBadImports.length) {
+            yield fixer.removeRange(importerRange);
+          } else {
+            for (const bp of allBadImports) {
+              const nextToken = source.getTokenAfter(bp.node as any);
+              if (nextToken?.value === ',') {
+                yield fixer.removeRange(getRange(bp.node, nextToken));
+              } else {
+                yield fixer.removeRange(getRange(bp.node));
+              }
+            }
+          }
+        },
+      });
+    });
+  },
+};
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/no_unresolved_imports.ts b/packages/kbn-eslint-plugin-imports/src/rules/no_unresolvable_imports.ts
similarity index 60%
rename from packages/kbn-eslint-plugin-imports/src/rules/no_unresolved_imports.ts
rename to packages/kbn-eslint-plugin-imports/src/rules/no_unresolvable_imports.ts
index 1e0b8173ab583..e5b324ea0a3e8 100644
--- a/packages/kbn-eslint-plugin-imports/src/rules/no_unresolved_imports.ts
+++ b/packages/kbn-eslint-plugin-imports/src/rules/no_unresolvable_imports.ts
@@ -9,11 +9,19 @@
 import Path from 'path';
 import { Rule } from 'eslint';
 
-import { resolveKibanaImport } from '../resolve_kibana_import';
+import { report } from '../helpers/report';
+import { getImportResolver } from '../get_import_resolver';
 import { visitAllImportStatements } from '../helpers/visit_all_import_statements';
 
-export const NoUnresolvedImportsRule: Rule.RuleModule = {
+export const NoUnresolvableImportsRule: Rule.RuleModule = {
+  meta: {
+    docs: {
+      url: 'https://github.com/elastic/kibana/blob/main/packages/kbn-eslint-plugin-imports/README.md#kbnimportsno_unresolvable_imports',
+    },
+  },
   create(context) {
+    const resolver = getImportResolver(context);
+
     const sourceFilename = context.getPhysicalFilename
       ? context.getPhysicalFilename()
       : context.getFilename();
@@ -22,10 +30,10 @@ export const NoUnresolvedImportsRule: Rule.RuleModule = {
       throw new Error('unable to determine sourceFilename for file being linted');
     }
 
-    return visitAllImportStatements((req, importer) => {
-      if (!resolveKibanaImport(req, Path.dirname(sourceFilename))) {
-        context.report({
-          node: importer as any,
+    return visitAllImportStatements((req, { node }) => {
+      if (req !== null && !resolver.resolve(req, Path.dirname(sourceFilename))) {
+        report(context, {
+          node,
           message: `Unable to resolve import [${req}]`,
         });
       }
diff --git a/packages/kbn-eslint-plugin-imports/src/rules/uniform_imports.ts b/packages/kbn-eslint-plugin-imports/src/rules/uniform_imports.ts
new file mode 100644
index 0000000000000..75487e62cd613
--- /dev/null
+++ b/packages/kbn-eslint-plugin-imports/src/rules/uniform_imports.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import Eslint from 'eslint';
+import { REPO_ROOT } from '@kbn/utils';
+import { getRelativeImportReq, getPackageRelativeImportReq } from '@kbn/import-resolver';
+
+import { report } from '../helpers/report';
+import { visitAllImportStatements } from '../helpers/visit_all_import_statements';
+import { getImportResolver } from '../get_import_resolver';
+
+// TODO: get rid of all the special cases in here by moving more things to packages
+
+const SETUP_NODE_ENV_DIR = Path.resolve(REPO_ROOT, 'src/setup_node_env');
+const PKGJSON_PATH = Path.resolve(REPO_ROOT, 'package.json');
+const XPACK_PKGJSON_PATH = Path.resolve(REPO_ROOT, 'x-pack/package.json');
+const KBN_PM_SCRIPT = Path.resolve(REPO_ROOT, 'packages/kbn-pm/dist/index.js');
+
+export const UniformImportsRule: Eslint.Rule.RuleModule = {
+  meta: {
+    fixable: 'code',
+    docs: {
+      url: 'https://github.com/elastic/kibana/blob/main/packages/kbn-eslint-plugin-imports/README.md#kbnimportsuniform_imports',
+    },
+  },
+
+  create(context) {
+    const resolver = getImportResolver(context);
+    const sourceFilename = context.getPhysicalFilename
+      ? context.getPhysicalFilename()
+      : context.getFilename();
+
+    const sourceDirname = Path.dirname(sourceFilename);
+
+    const ownPackageId = resolver.getPackageIdForPath(sourceFilename);
+
+    return visitAllImportStatements((req, { node, type }) => {
+      if (!req) {
+        return;
+      }
+
+      const result = resolver.resolve(req, sourceDirname);
+      if (result?.type !== 'file' || result.nodeModule) {
+        return;
+      }
+
+      const { absolute } = result;
+      // don't mess with imports to the kbn/pm script for now
+      if (absolute === KBN_PM_SCRIPT) {
+        return;
+      }
+
+      const packageId = resolver.getPackageIdForPath(absolute);
+      if (ownPackageId && !packageId) {
+        // special cases, files that aren't in packages but packages are allowed to import them
+        if (
+          absolute === PKGJSON_PATH ||
+          absolute === XPACK_PKGJSON_PATH ||
+          absolute.startsWith(SETUP_NODE_ENV_DIR)
+        ) {
+          return;
+        }
+
+        if (resolver.isBazelPackage(ownPackageId)) {
+          report(context, {
+            node,
+            message: `Package [${ownPackageId}] can only import other packages`,
+          });
+          return;
+        }
+      }
+
+      if (packageId === ownPackageId || !packageId) {
+        const correct = getRelativeImportReq({
+          ...result,
+          original: req,
+          dirname: sourceDirname,
+          type,
+        });
+
+        if (req !== correct) {
+          report(context, {
+            node,
+            message: `Use import request [${correct}]`,
+            correctImport: correct,
+          });
+        }
+        return;
+      }
+
+      const packageDir = resolver.getAbsolutePackageDir(packageId);
+      if (!packageDir) {
+        report(context, {
+          node,
+          message: `Unable to determine location of package [${packageId}]`,
+        });
+        return;
+      }
+
+      const correct = getPackageRelativeImportReq({
+        ...result,
+        packageDir,
+        packageId,
+        type,
+      });
+      if (req !== correct) {
+        report(context, {
+          node,
+          message: `Use import request [${correct}]`,
+          correctImport: correct,
+        });
+        return;
+      }
+    });
+  },
+};
diff --git a/packages/kbn-field-types/src/kbn_field_types.test.ts b/packages/kbn-field-types/src/kbn_field_types.test.ts
index 6209108712c3f..5f73efd3ad48f 100644
--- a/packages/kbn-field-types/src/kbn_field_types.test.ts
+++ b/packages/kbn-field-types/src/kbn_field_types.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { castEsToKbnFieldTypeName, getKbnFieldType, getKbnTypeNames, KbnFieldType } from './';
+import { castEsToKbnFieldTypeName, getKbnFieldType, getKbnTypeNames, KbnFieldType } from '.';
 
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from './types';
 
diff --git a/packages/kbn-find-used-node-modules/BUILD.bazel b/packages/kbn-find-used-node-modules/BUILD.bazel
new file mode 100644
index 0000000000000..61dc2c7703217
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/BUILD.bazel
@@ -0,0 +1,122 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-find-used-node-modules"
+PKG_REQUIRE_NAME = "@kbn/find-used-node-modules"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "//packages/kbn-babel-preset",
+  "@npm//@babel/core",
+  "@npm//@babel/types",
+  "@npm//@babel/traverse",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "//packages/kbn-import-resolver:npm_module_types",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//@types/babel__core",
+  "@npm//@babel/traverse",
+  "@npm//@babel/types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-find-used-node-modules/README.md b/packages/kbn-find-used-node-modules/README.md
new file mode 100644
index 0000000000000..3480448a1f86a
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/README.md
@@ -0,0 +1,7 @@
+# @kbn/find-used-node-modules
+
+Simple abstraction over the `@babel/parser` and the `@babel/traverse` to find the node_modules used by a list of files.
+
+## `findUsedNodeModules(resolver, entryPaths): string[]`
+
+Pass an `ImportResolver` instance from `@kbn/import-resolver` and a list of absolute paths to JS files to get the list of `node_modules` used by those files and the files the import.
\ No newline at end of file
diff --git a/packages/kbn-find-used-node-modules/jest.config.js b/packages/kbn-find-used-node-modules/jest.config.js
new file mode 100644
index 0000000000000..e8cdf1190cb47
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/jest.config.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-find-used-node-modules'],
+};
diff --git a/packages/kbn-find-used-node-modules/package.json b/packages/kbn-find-used-node-modules/package.json
new file mode 100644
index 0000000000000..c5da8d1f898c1
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/find-used-node-modules",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-find-used-node-modules/src/find_used_node_modules.test.ts b/packages/kbn-find-used-node-modules/src/find_used_node_modules.test.ts
new file mode 100644
index 0000000000000..a5175c8734183
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/find_used_node_modules.test.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { findUsedNodeModules } from './find_used_node_modules';
+import { ImportResolver } from '@kbn/import-resolver';
+
+jest.mock('./fs');
+
+const FILES: Record<string, string> = {
+  '/foo.js': `
+    require('./bar.js')
+  `,
+  '/bar.js': `
+    require('./box')
+  `,
+  '/box.js': `
+    require('foo')
+  `,
+};
+
+class MockResolver extends ImportResolver {
+  constructor() {
+    super('/', new Map(), new Map());
+  }
+
+  isBazelPackage = jest.fn();
+  resolve = jest.fn();
+}
+
+const RESOLVER = new MockResolver();
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  jest.requireMock('./fs').readFile.mockImplementation((path: string) => {
+    if (Object.hasOwn(FILES, path)) {
+      return FILES[path];
+    }
+
+    const error: any = new Error(`ENOENT, missing file [${path}]`);
+    error.code = 'ENOENT';
+    throw error;
+  });
+});
+
+describe('findUsedNodeModules()', () => {
+  it('excludes built-in modules', async () => {
+    RESOLVER.resolve.mockImplementation(() => ({
+      type: 'built-in',
+    }));
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(1);
+    expect(results).toEqual([]);
+  });
+
+  it('returns node_modules found in the source file', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/bar',
+          absolute: '/bar.js',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(1);
+    expect(results).toEqual(['@foo/bar']);
+  });
+
+  it('returns node_modules found in referenced files', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          absolute: '/bar.js',
+        };
+      }
+
+      if (req === './box') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/box',
+          absolute: '/box.js',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(2);
+    expect(results).toEqual(['@foo/box']);
+  });
+
+  it('does not traverse node_modules', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          absolute: '/bar.js',
+        };
+      }
+
+      if (req === './box') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/box',
+          absolute: '/box.js',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(2);
+    expect(results).toEqual(['@foo/box']);
+  });
+
+  it('does traverse node_modules which are also bazel packages', async () => {
+    RESOLVER.resolve.mockImplementation((req) => {
+      if (req === './bar.js') {
+        return {
+          type: 'file',
+          absolute: '/bar.js',
+        };
+      }
+
+      if (req === './box') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/box',
+          absolute: '/box.js',
+        };
+      }
+
+      if (req === 'foo') {
+        return {
+          type: 'file',
+          nodeModule: '@foo/core',
+          absolute: '/non-existant',
+        };
+      }
+
+      throw new Error('unexpected request');
+    });
+
+    RESOLVER.isBazelPackage.mockImplementation((pkgId) => {
+      return pkgId === '@foo/box';
+    });
+
+    const results = await findUsedNodeModules({
+      entryPaths: ['/foo.js'],
+      resolver: RESOLVER,
+      findUsedPeers: false,
+    });
+    expect(RESOLVER.resolve).toHaveBeenCalledTimes(3);
+    expect(results).toEqual(['@foo/box', '@foo/core']);
+  });
+});
diff --git a/packages/kbn-find-used-node-modules/src/find_used_node_modules.ts b/packages/kbn-find-used-node-modules/src/find_used_node_modules.ts
new file mode 100644
index 0000000000000..d02cc084e8901
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/find_used_node_modules.ts
@@ -0,0 +1,138 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import { asyncForEachWithLimit } from '@kbn/std';
+import type { ImportResolver } from '@kbn/import-resolver';
+
+import { readFile, readFileSync } from './fs';
+import { getImportRequests } from './get_import_requests';
+
+function isObj(v: any): v is Record<string, unknown> {
+  return typeof v === 'object' && v !== null;
+}
+
+function getPeerDeps(thisNodeModule: string) {
+  const pkgPath = require.resolve(`${thisNodeModule}/package.json`);
+  const pkg = JSON.parse(readFileSync(pkgPath));
+
+  if (isObj(pkg) && isObj(pkg.peerDependencies)) {
+    return Object.keys(pkg.peerDependencies);
+  } else {
+    return [];
+  }
+}
+
+interface Options {
+  resolver: ImportResolver;
+  entryPaths: string[];
+  findUsedPeers: boolean;
+  // if we are finding used modules in a node_module, this must be the name of the node_module
+  // we should treat as "this module" rather than "another node module"
+  thisNodeModule?: string;
+}
+
+/**
+ * Parse a list of entry paths and find the node_modules which are required by them. If the
+ * entry path requires/imports a non-node_module then that file is scanned too, deeply, until
+ * all referenced files are scanned.
+ *
+ * Optionally, we can find the used peers of the used node_modules. This will keep track of all
+ * the paths we use to enter a node_module and then traverse from those points, finding the
+ * used modules and comparing those to the `peerDependencies` listed in the node_module's package.json
+ * file. If a used dependeny is in the `peerDependencies` and is used by the node_module it will
+ * be included in the results.
+ *
+ * This was implemented mostly for `@emotion/react` which is used by @elastic/eui but only listed
+ * as a peerDependency. If we didn't keep it in the Kibana package.json then the package would not
+ * be installed and cause an error on startup because `@emotion/react` can't be found. We used to
+ * solve this by scanning the node_modules directory for all the packages which are used but that
+ * was much slower and lead to extra entries in package.json.
+ */
+export async function findUsedNodeModules(options: Options) {
+  const queue = new Set<string>(options.entryPaths);
+  const results = new Set<string>();
+
+  const entryPathsIntoNodeModules = new Map<string, Set<string>>();
+
+  for (const path of queue) {
+    if (Path.extname(path) !== '.js') {
+      continue;
+    }
+
+    const dirname = Path.dirname(path);
+    const code = await readFile(path);
+    const reqs = getImportRequests(code);
+
+    for (const req of reqs) {
+      // resolve the request to it's actual file on dist
+      const result = options.resolver.resolve(req, dirname);
+
+      // ignore non-file resolution results, these represent files which aren't on
+      // the file-system yet (like during the build) built-ins, explicitily ignored
+      // files, and @types only imports
+      if (result?.type !== 'file') {
+        continue;
+      }
+
+      // if the result points to a node_module (or another node_module)...
+      if (result.nodeModule && result.nodeModule !== options.thisNodeModule) {
+        // add it to the results
+        results.add(result.nodeModule);
+
+        // record this absolute path as an entry path into the node module from our entries, if we
+        // need to scan this node_module for used deps we need to know how we access it.
+        const nmEntries = entryPathsIntoNodeModules.get(result.nodeModule);
+        if (!nmEntries) {
+          entryPathsIntoNodeModules.set(result.nodeModule, new Set([result.absolute]));
+        } else {
+          nmEntries.add(result.absolute);
+        }
+      }
+
+      // no need to scan node_modules unless they're bazel packages
+      if (
+        !result.nodeModule ||
+        result.nodeModule === options.thisNodeModule ||
+        options.resolver.isBazelPackage(result.nodeModule)
+      ) {
+        queue.add(result.absolute);
+      }
+    }
+  }
+
+  if (options.findUsedPeers) {
+    await asyncForEachWithLimit(results, 10, async (dep) => {
+      const entryPaths = entryPathsIntoNodeModules.get(dep);
+      if (!entryPaths?.size) {
+        return;
+      }
+
+      const peerDeps = getPeerDeps(dep);
+      if (!peerDeps.length) {
+        return;
+      }
+
+      const usedInside = await findUsedNodeModules({
+        resolver: options.resolver,
+        entryPaths: Array.from(entryPaths),
+        findUsedPeers: false,
+        thisNodeModule: dep,
+      });
+
+      for (const peer of peerDeps) {
+        if (usedInside.includes(peer)) {
+          results.add(peer);
+        }
+      }
+    });
+  }
+
+  return Array.from(results).sort((a, b) => a.localeCompare(b));
+}
diff --git a/packages/kbn-babel-code-parser/src/index.js b/packages/kbn-find-used-node-modules/src/fs.ts
similarity index 61%
rename from packages/kbn-babel-code-parser/src/index.js
rename to packages/kbn-find-used-node-modules/src/fs.ts
index cc03bc75a4b4e..e0e9c9690803c 100644
--- a/packages/kbn-babel-code-parser/src/index.js
+++ b/packages/kbn-find-used-node-modules/src/fs.ts
@@ -6,6 +6,13 @@
  * Side Public License, v 1.
  */
 
-export { dependenciesParseStrategy } from './strategies';
-export { dependenciesVisitorsGenerator } from './visitors';
-export { parseSingleFile, parseSingleFileSync, parseEntries } from './code_parser';
+import Fs from 'fs';
+import Fsp from 'fs/promises';
+
+export function readFileSync(path: string) {
+  return Fs.readFileSync(path, 'utf8');
+}
+
+export function readFile(path: string) {
+  return Fsp.readFile(path, 'utf8');
+}
diff --git a/packages/kbn-find-used-node-modules/src/get_import_requests.test.ts b/packages/kbn-find-used-node-modules/src/get_import_requests.test.ts
new file mode 100644
index 0000000000000..ebfc7572cf1e7
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/get_import_requests.test.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { getImportRequests } from './get_import_requests';
+
+describe('getImportRequests()', () => {
+  it('should get requests from `require`', () => {
+    const rawCode = `/*foo*/require('dep1'); const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+      ]
+    `);
+  });
+
+  it('should get requests from `require.resolve`', () => {
+    const rawCode = `/*foo*/require.resolve('dep2'); const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep2",
+      ]
+    `);
+  });
+
+  it('should get requests from `import`', () => {
+    const rawCode = `/*foo*/import dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+        "dep2",
+      ]
+    `);
+  });
+
+  it('should get requests from `export from`', () => {
+    const rawCode = `/*foo*/export dep1 from 'dep1'; import dep2 from 'dep2';const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+        "dep2",
+      ]
+    `);
+  });
+
+  it('should get requests from `export * from`', () => {
+    const rawCode = `/*foo*/export * from 'dep1'; export dep2 from 'dep2';const bar = 1;`;
+    const foundDeps = getImportRequests(rawCode);
+    expect(foundDeps).toMatchInlineSnapshot(`
+      Array [
+        "dep1",
+        "dep2",
+      ]
+    `);
+  });
+});
diff --git a/packages/kbn-find-used-node-modules/src/get_import_requests.ts b/packages/kbn-find-used-node-modules/src/get_import_requests.ts
new file mode 100644
index 0000000000000..03de25f7fb92a
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/get_import_requests.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as parser from '@babel/parser';
+import traverse from '@babel/traverse';
+// @ts-expect-error Not available with types
+import babelParserOptions from '@kbn/babel-preset/common_babel_parser_options';
+
+import { importVisitor } from './import_visitor';
+
+/**
+ * Parse the code and return an array of all the import requests in that file
+ */
+export function getImportRequests(code: string) {
+  const importRequests: string[] = [];
+
+  // Parse and get the code AST
+  const ast = parser.parse(code, babelParserOptions);
+
+  // Loop through the code AST with
+  // the defined visitors
+  traverse(ast, importVisitor(importRequests));
+
+  return importRequests;
+}
diff --git a/packages/kbn-find-used-node-modules/src/import_visitor.ts b/packages/kbn-find-used-node-modules/src/import_visitor.ts
new file mode 100644
index 0000000000000..ac7e09cd726d0
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/src/import_visitor.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as T from '@babel/types';
+import type { Visitor } from '@babel/core';
+
+/**
+ * @notice
+ *
+ * This product has relied on ASTExplorer that is licensed under MIT.
+ */
+
+// AST check for require expressions
+const isRequire = ({ callee }: T.CallExpression) =>
+  T.isIdentifier(callee) && callee.name === 'require';
+
+// AST check for require.resolve expressions
+const isRequireResolve = ({ callee }: T.CallExpression) =>
+  T.isMemberExpression(callee) &&
+  T.isIdentifier(callee.object) &&
+  callee.object.name === 'require' &&
+  T.isIdentifier(callee.property) &&
+  callee.property.name === 'resolve';
+
+/**
+ * Create a Babel AST visitor that will write import requests into the passed array
+ */
+export function importVisitor(importRequests: string[]): Visitor {
+  // This was built with help on an ast explorer and some ESTree docs
+  // like the babel parser ast spec and the main docs for the Esprima
+  // which is a complete and useful docs for the ESTree spec.
+  //
+  // https://astexplorer.net
+  // https://github.com/babel/babel/blob/master/packages/babel-parser/ast/spec.md
+  // https://esprima.readthedocs.io/en/latest/syntax-tree-format.html
+  // https://github.com/estree/estree
+
+  // Visitors to traverse and find dependencies
+  return {
+    // raw values on require + require.resolve
+    CallExpression: ({ node }) => {
+      if (isRequire(node) || isRequireResolve(node)) {
+        const nodeArguments = node.arguments;
+        const reqArg = Array.isArray(nodeArguments) ? nodeArguments.shift() : null;
+
+        if (!reqArg) {
+          return;
+        }
+
+        if (reqArg.type === 'StringLiteral') {
+          importRequests.push(reqArg.value);
+        }
+      }
+    },
+
+    // raw values on import
+    ImportDeclaration: ({ node }) => {
+      // Get string values from import expressions
+      const importSource = node.source;
+      importRequests.push(importSource.value);
+    },
+
+    // raw values on export from
+    ExportNamedDeclaration: ({ node }) => {
+      // Get string values from export from expressions
+      if (node.source) {
+        importRequests.push(node.source.value);
+      }
+    },
+
+    // raw values on export * from
+    ExportAllDeclaration: ({ node }) => {
+      const exportAllFromSource = node.source;
+      importRequests.push(exportAllFromSource.value);
+    },
+  };
+}
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/index.ts b/packages/kbn-find-used-node-modules/src/index.ts
similarity index 84%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/index.ts
rename to packages/kbn-find-used-node-modules/src/index.ts
index 66ffe2976d786..52e2935b5f0e0 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/index.ts
+++ b/packages/kbn-find-used-node-modules/src/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { ExitFullScreenButton } from './exit_full_screen_button';
+export { findUsedNodeModules } from './find_used_node_modules';
diff --git a/packages/kbn-find-used-node-modules/tsconfig.json b/packages/kbn-find-used-node-modules/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-find-used-node-modules/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-generate/src/commands/package_command.ts b/packages/kbn-generate/src/commands/package_command.ts
index 074f48d26114b..b18e63724469a 100644
--- a/packages/kbn-generate/src/commands/package_command.ts
+++ b/packages/kbn-generate/src/commands/package_command.ts
@@ -31,10 +31,12 @@ export const PackageCommand: GenerateCommand = {
       --dev          Generate a package which is intended for dev-only use and can access things like devDependencies
       --web          Build webpack-compatible version of sources for this package. If your package is intended to be
                       used in the browser and Node.js then you need to opt-into these sources being created.
-      --force        If the packageDir already exists, delete it before generation
-      --dir          Directory where this package will live, defaults to [./packages]
-                       Valid Options:
-${BAZEL_PACKAGE_DIRS.map((rel) => `                         ${rel}\n`).join('')}
+      --dir          Specify where this package will be written. The path must be a direct child of one of the
+                      directories selected by the BAZEL_PACKAGE_DIRS const in @kbn/bazel-packages.
+                        Valid locations for packages:
+${BAZEL_PACKAGE_DIRS.map((dir) => `                          ./${dir}/*\n`).join('')}
+                      defaults to [./packages/{kebab-case-version-of-name}]
+      --force        If the --dir already exists, delete it before generation
     `,
   },
   async run({ log, flags, render }) {
@@ -50,15 +52,16 @@ ${BAZEL_PACKAGE_DIRS.map((rel) => `                         ${rel}\n`).join('')}
     const web = !!flags.web;
     const dev = !!flags.dev;
 
-    const containingDir = flags.dir ? Path.resolve(`${flags.dir}`) : ROOT_PKG_DIR;
-    const relContainingDir = Path.relative(REPO_ROOT, containingDir);
+    const packageDir = flags.dir
+      ? Path.resolve(`${flags.dir}`)
+      : Path.resolve(ROOT_PKG_DIR, name.slice(1).replace('/', '-'));
+    const relContainingDir = Path.relative(REPO_ROOT, Path.dirname(packageDir));
     if (!micromatch.isMatch(relContainingDir, BAZEL_PACKAGE_DIRS)) {
       throw createFlagError(
         'Invalid --dir selection. To setup a new --dir option extend the `BAZEL_PACKAGE_DIRS` const in `@kbn/bazel-packages` and make sure to rebuild.'
       );
     }
 
-    const packageDir = Path.resolve(containingDir, name.slice(1).replace('/', '-'));
     const normalizedRepoRelativeDir = normalizePath(Path.relative(REPO_ROOT, packageDir));
 
     try {
diff --git a/packages/kbn-i18n/src/core/i18n.ts b/packages/kbn-i18n/src/core/i18n.ts
index 5d845dd4b12eb..cde5506383dd6 100644
--- a/packages/kbn-i18n/src/core/i18n.ts
+++ b/packages/kbn-i18n/src/core/i18n.ts
@@ -16,7 +16,7 @@ import { hasValues, isObject, isString, mergeAll } from './helper';
 import { isPseudoLocale, translateUsingPseudoLocale } from './pseudo_locale';
 
 // Add all locale data to `IntlMessageFormat`.
-import './locales.js';
+import './locales';
 
 const EN_LOCALE = 'en';
 const translationsForLocale: Record<string, Translation> = {};
diff --git a/packages/kbn-import-resolver/BUILD.bazel b/packages/kbn-import-resolver/BUILD.bazel
new file mode 100644
index 0000000000000..50e91c29d1750
--- /dev/null
+++ b/packages/kbn-import-resolver/BUILD.bazel
@@ -0,0 +1,124 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-import-resolver"
+PKG_REQUIRE_NAME = "@kbn/import-resolver"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "//packages/kbn-bazel-packages",
+  "//packages/kbn-utils",
+  "//packages/kbn-synthetic-package-map",
+  "@npm//resolve",
+  "@npm//normalize-path",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "//packages/kbn-bazel-packages:npm_module_types",
+  "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-synthetic-package-map:npm_module_types",
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//@types/resolve",
+  "@npm//@types/normalize-path",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-import-resolver/README.md b/packages/kbn-import-resolver/README.md
new file mode 100644
index 0000000000000..82760b05f8c4c
--- /dev/null
+++ b/packages/kbn-import-resolver/README.md
@@ -0,0 +1,3 @@
+# @kbn/import-resolver
+
+Empty package generated by @kbn/generate
diff --git a/packages/kbn-import-resolver/jest.integration.config.js b/packages/kbn-import-resolver/jest.integration.config.js
new file mode 100644
index 0000000000000..7a593982100b0
--- /dev/null
+++ b/packages/kbn-import-resolver/jest.integration.config.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_integration_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-import-resolver'],
+};
diff --git a/packages/kbn-import-resolver/package.json b/packages/kbn-import-resolver/package.json
new file mode 100644
index 0000000000000..d8a6e72792399
--- /dev/null
+++ b/packages/kbn-import-resolver/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/import-resolver",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-import-resolver/src/__fixtures__/node_modules/@pkg/box/index.js b/packages/kbn-import-resolver/src/__fixtures__/node_modules/@pkg/box/index.js
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/kbn-import-resolver/src/__fixtures__/node_modules/foo/index.js b/packages/kbn-import-resolver/src/__fixtures__/node_modules/foo/index.js
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/kbn-pm/cli.js b/packages/kbn-import-resolver/src/__fixtures__/packages/box/index.js
similarity index 88%
rename from packages/kbn-pm/cli.js
rename to packages/kbn-import-resolver/src/__fixtures__/packages/box/index.js
index 41b533ee87d8b..5c2d5b68ae2e0 100644
--- a/packages/kbn-pm/cli.js
+++ b/packages/kbn-import-resolver/src/__fixtures__/packages/box/index.js
@@ -5,5 +5,3 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
-require('./dist').run(process.argv.slice(2));
diff --git a/packages/kbn-config/src/plugins/index.ts b/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js
similarity index 84%
rename from packages/kbn-config/src/plugins/index.ts
rename to packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js
index fdb459b5f412e..5c2d5b68ae2e0 100644
--- a/packages/kbn-config/src/plugins/index.ts
+++ b/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js
@@ -5,5 +5,3 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
-export { getPluginSearchPaths } from './plugin_search_paths';
diff --git a/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js b/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js
new file mode 100644
index 0000000000000..5c2d5b68ae2e0
--- /dev/null
+++ b/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
diff --git a/packages/kbn-import-resolver/src/__fixtures__/src/index.js b/packages/kbn-import-resolver/src/__fixtures__/src/index.js
new file mode 100644
index 0000000000000..5c2d5b68ae2e0
--- /dev/null
+++ b/packages/kbn-import-resolver/src/__fixtures__/src/index.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/fs.ts b/packages/kbn-import-resolver/src/helpers/fs.ts
similarity index 55%
rename from packages/kbn-eslint-plugin-imports/src/helpers/fs.ts
rename to packages/kbn-import-resolver/src/helpers/fs.ts
index 98b26bd1336ed..d1897ed9247eb 100644
--- a/packages/kbn-eslint-plugin-imports/src/helpers/fs.ts
+++ b/packages/kbn-import-resolver/src/helpers/fs.ts
@@ -8,11 +8,7 @@
 
 import Fs from 'fs';
 
-import { memoize } from './memoize';
-
-const runningInEditor = !!process.env.VSCODE_CWD;
-
-const safeStat = (path: string) => {
+export function safeStat(path: string) {
   try {
     return Fs.statSync(path);
   } catch (error) {
@@ -22,15 +18,8 @@ const safeStat = (path: string) => {
 
     throw error;
   }
-};
-
-function _isDirectory(path: string) {
-  return !!safeStat(path)?.isDirectory();
 }
 
-function _isFile(path: string) {
-  return !!safeStat(path)?.isFile();
+export function readFileSync(path: string) {
+  return Fs.readFileSync(path, 'utf8');
 }
-
-export const isDirectory = runningInEditor ? _isDirectory : memoize(_isDirectory);
-export const isFile = runningInEditor ? _isFile : memoize(_isFile);
diff --git a/packages/kbn-import-resolver/src/helpers/import_req.ts b/packages/kbn-import-resolver/src/helpers/import_req.ts
new file mode 100644
index 0000000000000..5844f47e880fe
--- /dev/null
+++ b/packages/kbn-import-resolver/src/helpers/import_req.ts
@@ -0,0 +1,100 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import normalizePath from 'normalize-path';
+
+export type ImportType = 'esm' | 'require' | 'require-resolve' | 'jest';
+
+interface WrapOptions {
+  prefix?: string;
+  postfix?: string;
+}
+function wrap(req: string, options: WrapOptions) {
+  return `${options.prefix ?? ''}${req}${options.postfix ?? ''}`;
+}
+
+const EXT_RE = /\.(jsx?|(d\.)?tsx?)$/;
+const INDEX_IN_INDEX_RE = /\/index\/index(\.jsx?|\.d\.tsx?|\.tsx?)$/;
+const INCLUDES_FILENAME_RE = /\/.*\..{2,4}$/;
+
+export function reduceImportRequest(req: string, type: ImportType, original?: string) {
+  let reduced = req;
+
+  if (type === 'require-resolve' && original && original.match(INCLUDES_FILENAME_RE)) {
+    // require.resolve() can be a complicated, it's often used in config files and
+    // sometimes we don't have babel to help resolve .ts to .js, so we try to rely
+    // on the original request and keep the filename listed if it's in the original
+    return req;
+  }
+
+  const indexInIndexMatch = req.match(INDEX_IN_INDEX_RE);
+  if (indexInIndexMatch) {
+    if (indexInIndexMatch[1] !== '.ts' && indexInIndexMatch[1] !== '.tsx') {
+      // this is a very ambiguous request, leave the whole import statement to make it less so
+      return req;
+    }
+
+    // this is also a very ambiguous request, but TS complains about leaving .ts or .tsx on a request so strip it
+    return req.slice(0, -indexInIndexMatch[1].length);
+  }
+
+  const extMatch = req.match(EXT_RE);
+  if (extMatch) {
+    reduced = reduced.slice(0, -extMatch[0].length);
+  }
+
+  if (reduced === 'index') {
+    return '';
+  }
+
+  if (reduced.endsWith('/index')) {
+    reduced = reduced.slice(0, -6);
+  }
+
+  return reduced;
+}
+
+interface RelativeImportReqOptions extends WrapOptions {
+  dirname: string;
+  absolute: string;
+  type: ImportType;
+  original?: string;
+}
+
+export function getRelativeImportReq(options: RelativeImportReqOptions) {
+  const relative = normalizePath(Path.relative(options.dirname, options.absolute));
+  return wrap(
+    reduceImportRequest(
+      relative.startsWith('.') ? relative : `./${relative}`,
+      options.type,
+      options.original
+    ),
+    options
+  );
+}
+
+interface PackageRelativeImportReqOptions extends WrapOptions {
+  packageDir: string;
+  packageId: string;
+  absolute: string;
+  type: ImportType;
+}
+
+export function getPackageRelativeImportReq(options: PackageRelativeImportReqOptions) {
+  const relative = normalizePath(Path.relative(options.packageDir, options.absolute));
+
+  if (!relative) {
+    return wrap(options.packageId, options);
+  }
+
+  const subPath = reduceImportRequest(relative, options.type);
+
+  return wrap(subPath ? `${options.packageId}/${subPath}` : options.packageId, options);
+}
diff --git a/packages/kbn-eslint-plugin-imports/src/helpers/memoize.ts b/packages/kbn-import-resolver/src/helpers/memoize.ts
similarity index 100%
rename from packages/kbn-eslint-plugin-imports/src/helpers/memoize.ts
rename to packages/kbn-import-resolver/src/helpers/memoize.ts
diff --git a/packages/kbn-import-resolver/src/import_resolver.ts b/packages/kbn-import-resolver/src/import_resolver.ts
new file mode 100644
index 0000000000000..44114ce731e28
--- /dev/null
+++ b/packages/kbn-import-resolver/src/import_resolver.ts
@@ -0,0 +1,281 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+import Fs from 'fs';
+
+import Resolve from 'resolve';
+import { REPO_ROOT } from '@kbn/utils';
+import normalizePath from 'normalize-path';
+import { discoverBazelPackageLocations } from '@kbn/bazel-packages';
+import { readPackageMap, PackageMap } from '@kbn/synthetic-package-map';
+
+import { safeStat, readFileSync } from './helpers/fs';
+import { ResolveResult } from './resolve_result';
+import { getRelativeImportReq } from './helpers/import_req';
+import { memoize } from './helpers/memoize';
+
+const NODE_MODULE_SEG = Path.sep + 'node_modules' + Path.sep;
+
+export class ImportResolver {
+  static create(repoRoot: string) {
+    const pkgMap = new Map();
+    for (const dir of discoverBazelPackageLocations(repoRoot)) {
+      const pkg = JSON.parse(Fs.readFileSync(Path.resolve(dir, 'package.json'), 'utf8'));
+      pkgMap.set(pkg.name, normalizePath(Path.relative(repoRoot, dir)));
+    }
+
+    return new ImportResolver(repoRoot, pkgMap, readPackageMap());
+  }
+
+  private safeStat = memoize(safeStat);
+
+  private baseResolveOpts = {
+    extensions: ['.js', '.json', '.ts', '.tsx', '.d.ts'],
+    isFile: (path: string) => !!this.safeStat(path)?.isFile(),
+    isDirectory: (path: string) => !!this.safeStat(path)?.isDirectory(),
+    readFileSync: memoize(readFileSync),
+    packageFilter(pkg: Record<string, unknown>) {
+      if (!pkg.main && pkg.types) {
+        // for the purpose of resolving files, a "types" file is adequate
+        return {
+          ...pkg,
+          main: pkg.types,
+        };
+      }
+
+      return pkg;
+    },
+  };
+
+  constructor(
+    /**
+     * Root directory that all source files for packages are expected to be
+     * in, also the directory that package maps are resolved against.
+     */
+    private readonly cwd: string,
+    /**
+     * Map of actual package names to normalized root-relative directories
+     * for each package
+     */
+    private readonly pkgMap: PackageMap,
+    /**
+     * Map of synthetic package names to normalized root-relative directories
+     * for each simulated package
+     */
+    private readonly synthPkgMap: PackageMap
+  ) {}
+
+  getPackageIdForPath(path: string) {
+    const relative = normalizePath(Path.relative(this.cwd, path));
+    if (relative.startsWith('..')) {
+      throw new Error(`path is outside of cwd [${this.cwd}]`);
+    }
+
+    for (const [synthPkgId, dir] of this.synthPkgMap) {
+      if (relative === dir || relative.startsWith(dir + '/')) {
+        return synthPkgId;
+      }
+    }
+
+    for (const [pkgId, dir] of this.pkgMap) {
+      if (relative === dir || relative.startsWith(dir + '/')) {
+        return pkgId;
+      }
+    }
+
+    return null;
+  }
+
+  getAbsolutePackageDir(pkgId: string) {
+    const dir = this.synthPkgMap.get(pkgId) ?? this.pkgMap.get(pkgId);
+    if (!dir) {
+      return null;
+    }
+    return Path.resolve(this.cwd, dir);
+  }
+
+  isBazelPackage(pkgId: string) {
+    return this.pkgMap.has(pkgId);
+  }
+
+  isSyntheticPackage(pkgId: string) {
+    return this.synthPkgMap.has(pkgId);
+  }
+
+  private shouldIgnore(req: string): boolean {
+    // this library is only installed on CI and never resolvable
+    if (req === 'kibana-buildkite-library') {
+      return true;
+    }
+
+    // these are special webpack-aliases only used in storybooks, ignore them
+    if (req === 'core_styles' || req === 'core_app_image_assets') {
+      return true;
+    }
+
+    // ignore amd require done by ace syntax plugin
+    if (req === 'ace/lib/dom') {
+      return true;
+    }
+
+    // ignore requests to grammar/built_grammar.js files or bazel target dirs, these files are only
+    // available in the build output and will never resolve in dev. We will validate that people don't
+    // import these files from outside the package in another rule
+    if (
+      req.endsWith('grammar/built_grammar.js') ||
+      req.includes('/target_workers/') ||
+      req.includes('/target_node/')
+    ) {
+      return true;
+    }
+
+    // typescript validates these imports fine and they're purely virtual thanks to ambient type definitions in @elastic/eui so /shrug
+    if (
+      req.startsWith('@elastic/eui/src/components/') ||
+      req.startsWith('@elastic/eui/src/services/')
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  private adaptReq(req: string, dirname: string): string | undefined {
+    // handle typescript aliases
+    if (req === 'kibana/public') {
+      return this.adaptReq('src/core/public', dirname);
+    }
+    if (req === 'kibana/server') {
+      return this.adaptReq('src/core/server', dirname);
+    }
+
+    // turn root-relative paths into relative paths
+    if (
+      req.startsWith('src/') ||
+      req.startsWith('x-pack/') ||
+      req.startsWith('examples/') ||
+      req.startsWith('test/')
+    ) {
+      return getRelativeImportReq({
+        dirname,
+        absolute: Path.resolve(REPO_ROOT, req),
+        type: 'esm',
+      });
+    }
+  }
+
+  private tryNodeResolve(req: string, dirname: string): ResolveResult | null {
+    try {
+      const path = Resolve.sync(req, {
+        basedir: dirname,
+        ...this.baseResolveOpts,
+      });
+
+      if (!Path.isAbsolute(path)) {
+        return {
+          type: 'built-in',
+        };
+      }
+
+      const lastNmSeg = path.lastIndexOf(NODE_MODULE_SEG);
+      if (lastNmSeg !== -1) {
+        const segs = path.slice(lastNmSeg + NODE_MODULE_SEG.length).split(Path.sep);
+        const moduleId = segs[0].startsWith('@') ? `${segs[0]}/${segs[1]}` : segs[0];
+
+        return {
+          type: 'file',
+          absolute: path,
+          nodeModule: moduleId,
+        };
+      }
+
+      return {
+        type: 'file',
+        absolute: path,
+      };
+    } catch (error) {
+      if (error && error.code === 'MODULE_NOT_FOUND') {
+        if (req === 'fsevents') {
+          return {
+            type: 'optional-and-missing',
+          };
+        }
+        return null;
+      }
+
+      throw error;
+    }
+  }
+
+  private tryTypesResolve(req: string, dirname: string): ResolveResult | null {
+    const parts = req.split('/');
+    const nmParts = parts[0].startsWith('@') ? [parts[0].slice(1), parts[1]] : [parts[0]];
+    const typesReq = `@types/${nmParts.join('__')}`;
+    const result = this.tryNodeResolve(typesReq, dirname);
+
+    if (result) {
+      return {
+        type: '@types',
+        module: typesReq,
+      };
+    }
+
+    return null;
+  }
+
+  /**
+   * Resolve an import request from a file in the given dirname
+   */
+  resolve(req: string, dirname: string): ResolveResult | null {
+    // transform webpack loader requests and focus on the actual file selected
+    const lastExI = req.lastIndexOf('!');
+    if (lastExI > -1) {
+      const quesI = req.lastIndexOf('?');
+      const prefix = req.slice(0, lastExI + 1);
+      const postfix = quesI > -1 ? req.slice(quesI) : '';
+      const result = this.resolve(req.slice(lastExI + 1, quesI > -1 ? quesI : undefined), dirname);
+
+      if (result?.type !== 'file') {
+        return result;
+      }
+
+      return {
+        ...result,
+        prefix,
+        postfix,
+      };
+    }
+
+    if (req[0] !== '.') {
+      const parts = req.split('/');
+      const pkgId = parts[0].startsWith('@') ? `${parts[0]}/${parts[1]}` : `${parts[0]}`;
+      if (this.synthPkgMap.has(pkgId)) {
+        const pkgDir = this.getAbsolutePackageDir(pkgId);
+        if (pkgDir) {
+          return this.resolve(
+            getRelativeImportReq({
+              absolute: parts.length > 2 ? Path.resolve(pkgDir, ...parts.slice(2)) : pkgDir,
+              dirname,
+              type: 'esm',
+            }),
+            dirname
+          );
+        }
+      }
+    }
+
+    req = this.adaptReq(req, dirname) ?? req;
+
+    if (this.shouldIgnore(req)) {
+      return { type: 'ignore' };
+    }
+
+    return this.tryNodeResolve(req, dirname) ?? this.tryTypesResolve(req, dirname);
+  }
+}
diff --git a/packages/kbn-import-resolver/src/index.ts b/packages/kbn-import-resolver/src/index.ts
new file mode 100644
index 0000000000000..63b551bac9f96
--- /dev/null
+++ b/packages/kbn-import-resolver/src/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from './import_resolver';
+export * from './helpers/import_req';
+export * from './resolve_result';
diff --git a/packages/kbn-import-resolver/src/integration_tests/import_resolver.test.ts b/packages/kbn-import-resolver/src/integration_tests/import_resolver.test.ts
new file mode 100644
index 0000000000000..b811151942bc5
--- /dev/null
+++ b/packages/kbn-import-resolver/src/integration_tests/import_resolver.test.ts
@@ -0,0 +1,192 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+
+import { ImportResolver } from '../import_resolver';
+
+const FIXTURES_DIR = Path.resolve(__dirname, '../__fixtures__');
+
+expect.addSnapshotSerializer(createAbsolutePathSerializer());
+
+const resolver = new ImportResolver(
+  FIXTURES_DIR,
+  new Map([['@pkg/box', 'packages/box']]),
+  new Map([['@synth/bar', 'src/bar']])
+);
+
+describe('#resolve()', () => {
+  it('resolves imports to synth packages', () => {
+    expect(resolver.resolve('@synth/bar', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/src/bar/index.js,
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves imports to bazel packages that are also found in node_modules', () => {
+    expect(resolver.resolve('@pkg/box', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/node_modules/@pkg/box/index.js,
+        "nodeModule": "@pkg/box",
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves node_module imports', () => {
+    expect(resolver.resolve('foo', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/node_modules/foo/index.js,
+        "nodeModule": "foo",
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves requests to src/', () => {
+    expect(resolver.resolve('src/core/public', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/src/core/public/index.ts,
+        "type": "file",
+      }
+    `);
+  });
+
+  it('resolves relative paths', () => {
+    expect(resolver.resolve('./bar', Path.resolve(FIXTURES_DIR, 'src/bar'))).toMatchInlineSnapshot(`
+      Object {
+        "absolute": <absolute path>/packages/kbn-import-resolver/src/__fixtures__/src/bar/bar.js,
+        "type": "file",
+      }
+    `);
+  });
+
+  it('returns null when the import cannot be resolved', () => {
+    expect(resolver.resolve('../../../../invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+    expect(resolver.resolve('src/invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+    expect(resolver.resolve('kibana/invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+    expect(resolver.resolve('@kbn/invalid', FIXTURES_DIR)).toMatchInlineSnapshot(`null`);
+  });
+
+  it('returns ignore results for known unresolvable but okay import statements', () => {
+    expect(resolver.resolve('../../grammar/built_grammar.js', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('kibana-buildkite-library', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('core_styles', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('core_app_image_assets', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('ace/lib/dom', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('@elastic/eui/src/components/foo', FIXTURES_DIR))
+      .toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+
+    expect(resolver.resolve('@elastic/eui/src/services/foo', FIXTURES_DIR)).toMatchInlineSnapshot(`
+      Object {
+        "type": "ignore",
+      }
+    `);
+  });
+});
+
+describe('#getPackageIdForPath()', () => {
+  it('returns package id for bazel package', () => {
+    expect(
+      resolver.getPackageIdForPath(Path.resolve(FIXTURES_DIR, 'packages/box/index.js'))
+    ).toMatchInlineSnapshot(`"@pkg/box"`);
+  });
+
+  it('returns package id for synth package', () => {
+    expect(
+      resolver.getPackageIdForPath(Path.resolve(FIXTURES_DIR, 'src/bar/index.js'))
+    ).toMatchInlineSnapshot(`"@synth/bar"`);
+  });
+
+  it('returns null for files outside of a package', () => {
+    expect(
+      resolver.getPackageIdForPath(Path.resolve(FIXTURES_DIR, 'src/index.js'))
+    ).toMatchInlineSnapshot(`null`);
+  });
+});
+
+describe('#getAbsolutePackageDir()', () => {
+  it('returns path for bazel package', () => {
+    expect(resolver.getAbsolutePackageDir('@pkg/box')).toMatchInlineSnapshot(
+      `<absolute path>/packages/kbn-import-resolver/src/__fixtures__/packages/box`
+    );
+  });
+  it('returns path for synth package', () => {
+    expect(resolver.getAbsolutePackageDir('@synth/bar')).toMatchInlineSnapshot(
+      `<absolute path>/packages/kbn-import-resolver/src/__fixtures__/src/bar`
+    );
+  });
+  it('returns null for node_modules', () => {
+    expect(resolver.getAbsolutePackageDir('foo')).toMatchInlineSnapshot(`null`);
+  });
+  it('returns null for unknown packages', () => {
+    expect(resolver.getAbsolutePackageDir('@kbn/invalid')).toMatchInlineSnapshot(`null`);
+  });
+});
+
+describe('#isBazelPackage()', () => {
+  it('returns true for bazel packages', () => {
+    expect(resolver.isBazelPackage('@pkg/box')).toBe(true);
+  });
+  it('returns false for synth packages', () => {
+    expect(resolver.isBazelPackage('@synth/bar')).toBe(false);
+  });
+  it('returns false for node_modules packages', () => {
+    expect(resolver.isBazelPackage('foo')).toBe(false);
+  });
+  it('returns false for unknown packages', () => {
+    expect(resolver.isBazelPackage('@kbn/invalid')).toBe(false);
+  });
+});
+
+describe('#isSyntheticPackage()', () => {
+  it('returns true for synth packages', () => {
+    expect(resolver.isSyntheticPackage('@synth/bar')).toBe(true);
+  });
+  it('returns false for bazel packages', () => {
+    expect(resolver.isSyntheticPackage('@pkg/box')).toBe(false);
+  });
+  it('returns false for node_modules packages', () => {
+    expect(resolver.isSyntheticPackage('foo')).toBe(false);
+  });
+  it('returns false for unknown packages', () => {
+    expect(resolver.isSyntheticPackage('@kbn/invalid')).toBe(false);
+  });
+});
diff --git a/packages/kbn-eslint-plugin-imports/src/resolve_result.ts b/packages/kbn-import-resolver/src/resolve_result.ts
similarity index 74%
rename from packages/kbn-eslint-plugin-imports/src/resolve_result.ts
rename to packages/kbn-import-resolver/src/resolve_result.ts
index 688683c9ae860..3174da55fb58a 100644
--- a/packages/kbn-eslint-plugin-imports/src/resolve_result.ts
+++ b/packages/kbn-import-resolver/src/resolve_result.ts
@@ -6,6 +6,21 @@
  * Side Public License, v 1.
  */
 
+/**
+ * Resolution result indicating that the import request resolves to a built-in node library
+ */
+export interface BuiltInResult {
+  type: 'built-in';
+}
+
+/**
+ * Resolution result indicating that the import request resolves to an npm dep which isn't
+ * currently installed so assumed to be optional
+ */
+export interface OptionalDepResult {
+  type: 'optional-and-missing';
+}
+
 /**
  * Resolution result indicating that the import request can't be resolved, but it shouldn't need to be
  * because the file that is imported can't be resolved from the source alone, usually because it is explicitly
@@ -35,9 +50,16 @@ export interface FileResult {
   type: 'file';
   absolute: string;
   nodeModule?: string;
+  prefix?: string;
+  postfix?: string;
 }
 
 /**
  * Possible resolve result types
  */
-export type ResolveResult = IgnoreResult | TypesResult | FileResult;
+export type ResolveResult =
+  | BuiltInResult
+  | IgnoreResult
+  | TypesResult
+  | FileResult
+  | OptionalDepResult;
diff --git a/packages/kbn-import-resolver/tsconfig.json b/packages/kbn-import-resolver/tsconfig.json
new file mode 100644
index 0000000000000..a8cfc2cceb08b
--- /dev/null
+++ b/packages/kbn-import-resolver/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-interpreter/src/common/lib/cast.js b/packages/kbn-interpreter/src/common/lib/cast.js
index 6f1ed16bb055c..ccadb00d21597 100644
--- a/packages/kbn-interpreter/src/common/lib/cast.js
+++ b/packages/kbn-interpreter/src/common/lib/cast.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getType } from '../lib/get_type';
+import { getType } from './get_type';
 
 export function castProvider(types) {
   return function cast(node, toTypeNames) {
diff --git a/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts b/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts
index d6d6afbf98755..bf8975bba7df5 100644
--- a/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/iso_to_epoch_rt/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { isoToEpochRt } from './index';
+import { isoToEpochRt } from '.';
 import { isRight } from 'fp-ts/lib/Either';
 
 describe('isoToEpochRt', () => {
diff --git a/packages/kbn-io-ts-utils/src/json_rt/index.test.ts b/packages/kbn-io-ts-utils/src/json_rt/index.test.ts
index 1220639fc7bef..dfc5a24c96c9f 100644
--- a/packages/kbn-io-ts-utils/src/json_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/json_rt/index.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as t from 'io-ts';
-import { jsonRt } from './index';
+import { jsonRt } from '.';
 import { isRight, Either, isLeft, fold } from 'fp-ts/lib/Either';
 import { Right } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
diff --git a/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts b/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts
index 85b58ef76622f..5bf57f41860f1 100644
--- a/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/non_empty_string_rt/index.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { nonEmptyStringRt } from './';
+import { nonEmptyStringRt } from '.';
 import { isLeft, isRight } from 'fp-ts/lib/Either';
 
 describe('nonEmptyStringRt', () => {
diff --git a/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts b/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts
index 6b19026cb1be5..2907889025c41 100644
--- a/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/strict_keys_rt/index.test.ts
@@ -8,7 +8,7 @@
 
 import * as t from 'io-ts';
 import { isRight, isLeft } from 'fp-ts/lib/Either';
-import { strictKeysRt } from './';
+import { strictKeysRt } from '.';
 import { jsonRt } from '../json_rt';
 import { PathReporter } from 'io-ts/lib/PathReporter';
 
diff --git a/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts b/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts
index cac7d3b2aae5e..80045185ea906 100644
--- a/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts
+++ b/packages/kbn-io-ts-utils/src/to_json_schema/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import * as t from 'io-ts';
-import { toJsonSchema } from './';
+import { toJsonSchema } from '.';
 
 describe('toJsonSchema', () => {
   it('converts simple types to JSON schema', () => {
diff --git a/packages/kbn-optimizer/BUILD.bazel b/packages/kbn-optimizer/BUILD.bazel
index 057e00066ddfa..94da078df54b2 100644
--- a/packages/kbn-optimizer/BUILD.bazel
+++ b/packages/kbn-optimizer/BUILD.bazel
@@ -38,6 +38,7 @@ RUNTIME_DEPS = [
   "//packages/kbn-ui-shared-deps-npm",
   "//packages/kbn-ui-shared-deps-src",
   "//packages/kbn-utils",
+  "//packages/kbn-synthetic-package-map",
   "@npm//@babel/core",
   "@npm//chalk",
   "@npm//clean-webpack-plugin",
@@ -70,6 +71,7 @@ TYPES_DEPS = [
   "//packages/kbn-ui-shared-deps-npm:npm_module_types",
   "//packages/kbn-ui-shared-deps-src:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-synthetic-package-map:npm_module_types",
   "@npm//chalk",
   "@npm//clean-webpack-plugin",
   "@npm//cpy",
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index ebab8e61a2268..a8eaa148e74d4 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -3,7 +3,7 @@ pageLoadAssetSize:
   alerting: 106936
   apm: 64385
   canvas: 1066647
-  charts: 95000
+  charts: 55000
   cloud: 21076
   console: 46091
   core: 435325
@@ -30,7 +30,7 @@ pageLoadAssetSize:
   inputControlVis: 172675
   inspector: 148711
   kibanaOverview: 56279
-  lens: 96624
+  lens: 35000
   licenseManagement: 41817
   licensing: 29004
   lists: 22900
diff --git a/packages/kbn-optimizer/src/cli.ts b/packages/kbn-optimizer/src/cli.ts
index 41ca656259fc6..6da282b8995db 100644
--- a/packages/kbn-optimizer/src/cli.ts
+++ b/packages/kbn-optimizer/src/cli.ts
@@ -9,7 +9,7 @@
 import Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';
-import { lastValueFrom } from '@kbn/std';
+import { lastValueFrom } from 'rxjs';
 import { run, createFlagError, Flags } from '@kbn/dev-utils';
 
 import { logOptimizerState } from './log_optimizer_state';
@@ -68,6 +68,11 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
         throw createFlagError('expected --no-examples to have no value');
       }
 
+      const testPlugins = flags['test-plugins'] ?? false;
+      if (typeof testPlugins !== 'boolean') {
+        throw createFlagError('expected --test-plugins to have no value');
+      }
+
       const profileWebpack = flags.profile ?? false;
       if (typeof profileWebpack !== 'boolean') {
         throw createFlagError('expected --profile to have no value');
@@ -133,6 +138,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
         dist: dist || updateLimits,
         cache,
         examples: examples && !(validateLimits || updateLimits),
+        testPlugins: testPlugins && !(validateLimits || updateLimits),
         profileWebpack,
         extraPluginScanDirs,
         inspectWorkers,
@@ -173,6 +179,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
           'watch',
           'oss',
           'examples',
+          'test-plugins',
           'dist',
           'cache',
           'profile',
@@ -202,6 +209,7 @@ export function runKbnOptimizerCli(options: { defaultLimitsPath: string }) {
           --focus            just like --filter, except dependencies are automatically included, --filter applies to result
           --filter           comma-separated list of bundle id filters, results from multiple flags are merged, * and ! are supported
           --no-examples      don't build the example plugins
+          --test-plugins     build test plugins too
           --dist             create bundles that are suitable for inclusion in the Kibana distributable, enabled when running with --update-limits
           --scan-dir         add a directory to the list of directories scanned for plugins (specify as many times as necessary)
           --no-inspect-workers  when inspecting the parent process, don't inspect the workers
diff --git a/packages/kbn-optimizer/src/common/rxjs_helpers.test.ts b/packages/kbn-optimizer/src/common/rxjs_helpers.test.ts
index eb8b6472ebcc4..694a606883957 100644
--- a/packages/kbn-optimizer/src/common/rxjs_helpers.test.ts
+++ b/packages/kbn-optimizer/src/common/rxjs_helpers.test.ts
@@ -7,8 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { toArray, map } from 'rxjs/operators';
-import { lastValueFrom } from '@kbn/std';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
 
 import { pipeClosure, debounceTimeBuffer, maybeMap, maybe } from './rxjs_helpers';
 
@@ -21,26 +20,26 @@ describe('pipeClosure()', () => {
     const foo$ = Rx.of(1, 2, 3).pipe(
       pipeClosure((source$) => {
         const multiplier = ++counter;
-        return source$.pipe(map((i) => i * multiplier));
+        return source$.pipe(Rx.map((i) => i * multiplier));
       }),
-      toArray()
+      Rx.toArray()
     );
 
-    await expect(lastValueFrom(foo$)).resolves.toMatchInlineSnapshot(`
+    await expect(Rx.lastValueFrom(foo$)).resolves.toMatchInlineSnapshot(`
             Array [
               1,
               2,
               3,
             ]
           `);
-    await expect(lastValueFrom(foo$)).resolves.toMatchInlineSnapshot(`
+    await expect(Rx.lastValueFrom(foo$)).resolves.toMatchInlineSnapshot(`
             Array [
               2,
               4,
               6,
             ]
           `);
-    await expect(lastValueFrom(foo$)).resolves.toMatchInlineSnapshot(`
+    await expect(Rx.lastValueFrom(foo$)).resolves.toMatchInlineSnapshot(`
             Array [
               3,
               6,
@@ -52,9 +51,9 @@ describe('pipeClosure()', () => {
 
 describe('maybe()', () => {
   it('filters out undefined values from the stream', async () => {
-    const foo$ = Rx.of(1, undefined, 2, undefined, 3).pipe(maybe(), toArray());
+    const foo$ = Rx.of(1, undefined, 2, undefined, 3).pipe(maybe(), Rx.toArray());
 
-    await expect(lastValueFrom(foo$)).resolves.toEqual([1, 2, 3]);
+    await expect(Rx.lastValueFrom(foo$)).resolves.toEqual([1, 2, 3]);
   });
 });
 
@@ -62,10 +61,10 @@ describe('maybeMap()', () => {
   it('calls map fn and filters out undefined values returned', async () => {
     const foo$ = Rx.of(1, 2, 3, 4, 5).pipe(
       maybeMap((i) => (i % 2 ? i : undefined)),
-      toArray()
+      Rx.toArray()
     );
 
-    await expect(lastValueFrom(foo$)).resolves.toEqual([1, 3, 5]);
+    await expect(Rx.lastValueFrom(foo$)).resolves.toEqual([1, 3, 5]);
   });
 });
 
@@ -78,39 +77,42 @@ describe('debounceTimeBuffer()', () => {
     jest.useRealTimers();
   });
 
-  it('buffers items until there is n milliseconds of silence, then flushes buffer to stream', async () => {
-    const foo$ = new Rx.Subject<number>();
-    const dest = new Rx.BehaviorSubject<number | undefined>(undefined);
-    foo$
-      .pipe(
-        debounceTimeBuffer(100),
-        map((items) => items.reduce((sum, n) => sum + n))
-      )
-      .subscribe(dest);
-
-    foo$.next(1);
-    expect(dest.getValue()).toBe(undefined);
-
-    // only wait 99 milliseconds before sending the next value
-    jest.advanceTimersByTime(99);
-    foo$.next(1);
-    expect(dest.getValue()).toBe(undefined);
-
-    // only wait 99 milliseconds before sending the next value
-    jest.advanceTimersByTime(99);
-    foo$.next(1);
-    expect(dest.getValue()).toBe(undefined);
-
-    // send the next value after 100 milliseconds and observe that it was forwarded
-    jest.advanceTimersByTime(100);
-    foo$.next(1);
-    expect(dest.getValue()).toBe(3);
-
-    foo$.complete();
-    if (!dest.isStopped) {
-      throw new Error('Expected destination to stop as soon as the source is completed');
-    }
-  });
+  it(
+    'buffers items until there is n milliseconds of silence, then flushes buffer to stream',
+    fakeSchedulers(async (advance) => {
+      const foo$ = new Rx.Subject<number>();
+      const dest = new Rx.BehaviorSubject<number | undefined>(undefined);
+      foo$
+        .pipe(
+          debounceTimeBuffer(100),
+          Rx.map((items) => items.reduce((sum, n) => sum + n))
+        )
+        .subscribe(dest);
+
+      foo$.next(1);
+      expect(dest.getValue()).toBe(undefined);
+
+      // only wait 50 milliseconds before sending the next value
+      advance(50);
+      foo$.next(1);
+      expect(dest.getValue()).toBe(undefined);
+
+      // only wait 99 milliseconds before sending the next value
+      advance(99);
+      foo$.next(1);
+      expect(dest.getValue()).toBe(undefined);
+
+      // send the next value after 100 milliseconds and observe that it was forwarded
+      advance(500);
+      foo$.next(1);
+      expect(dest.getValue()).toBe(3);
+
+      foo$.complete();
+      if (!dest.isStopped) {
+        throw new Error('Expected destination to stop as soon as the source is completed');
+      }
+    })
+  );
 
   it('clears queue as soon as source completes if source completes before time is up', () => {
     const foo$ = new Rx.Subject<number>();
@@ -118,7 +120,7 @@ describe('debounceTimeBuffer()', () => {
     foo$
       .pipe(
         debounceTimeBuffer(100),
-        map((items) => items.reduce((sum, n) => sum + n))
+        Rx.map((items) => items.reduce((sum, n) => sum + n))
       )
       .subscribe(dest);
 
diff --git a/packages/kbn-optimizer/src/common/rxjs_helpers.ts b/packages/kbn-optimizer/src/common/rxjs_helpers.ts
index 71e6ea4b5c1b1..7d5a63f3c9396 100644
--- a/packages/kbn-optimizer/src/common/rxjs_helpers.ts
+++ b/packages/kbn-optimizer/src/common/rxjs_helpers.ts
@@ -7,8 +7,6 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, tap, debounceTime, map, toArray } from 'rxjs/operators';
-import { firstValueFrom } from '@kbn/std';
 
 type Operator<T1, T2> = (source: Rx.Observable<T1>) => Rx.Observable<T2>;
 type MapFn<T1, T2> = (item: T1, index: number) => T2;
@@ -29,7 +27,7 @@ export const pipeClosure = <T1, T2>(fn: Operator<T1, T2>): Operator<T1, T2> => {
  * supporting TypeScript
  */
 export const maybe = <T1>(): Operator<T1 | undefined, T1> => {
-  return mergeMap((item) => (item === undefined ? Rx.EMPTY : [item]));
+  return Rx.mergeMap((item) => (item === undefined ? Rx.EMPTY : [item]));
 };
 
 /**
@@ -39,7 +37,7 @@ export const maybe = <T1>(): Operator<T1 | undefined, T1> => {
  * the filter.
  */
 export const maybeMap = <T1, T2>(fn: MapFn<T1, undefined | T2>): Operator<T1, T2> => {
-  return mergeMap((item, index) => {
+  return Rx.mergeMap((item, index) => {
     const result = fn(item, index);
     return result === undefined ? Rx.EMPTY : [result];
   });
@@ -54,9 +52,9 @@ export const debounceTimeBuffer = <T>(ms: number) =>
   pipeClosure((source$: Rx.Observable<T>) => {
     const buffer: T[] = [];
     return source$.pipe(
-      tap((item) => buffer.push(item)),
-      debounceTime(ms),
-      map(() => {
+      Rx.tap((item) => buffer.push(item)),
+      Rx.debounceTime(ms),
+      Rx.map(() => {
         const items = Array.from(buffer);
         buffer.length = 0;
         return items;
@@ -65,4 +63,4 @@ export const debounceTimeBuffer = <T>(ms: number) =>
   });
 
 export const allValuesFrom = <T>(observable: Rx.Observable<T>) =>
-  firstValueFrom(observable.pipe(toArray()));
+  Rx.firstValueFrom(observable.pipe(Rx.toArray()));
diff --git a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
index 767069e3a295f..cafd8ab996577 100644
--- a/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
+++ b/packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts
@@ -17,7 +17,7 @@ import del from 'del';
 import { tap, filter } from 'rxjs/operators';
 import { REPO_ROOT } from '@kbn/utils';
 import { ToolingLog, createReplaceSerializer } from '@kbn/dev-utils';
-import { runOptimizer, OptimizerConfig, OptimizerUpdate, logOptimizerState } from '../index';
+import { runOptimizer, OptimizerConfig, OptimizerUpdate, logOptimizerState } from '..';
 
 import { allValuesFrom } from '../common';
 
diff --git a/packages/kbn-optimizer/src/integration_tests/watch_bundles_for_changes.test.ts b/packages/kbn-optimizer/src/integration_tests/watch_bundles_for_changes.test.ts
index 4ba0a19fc3f5b..91a2f7324806a 100644
--- a/packages/kbn-optimizer/src/integration_tests/watch_bundles_for_changes.test.ts
+++ b/packages/kbn-optimizer/src/integration_tests/watch_bundles_for_changes.test.ts
@@ -8,8 +8,8 @@
 
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
 import ActualWatchpack from 'watchpack';
-import { lastValueFrom } from '@kbn/std';
 
 import { Bundle, ascending } from '../common';
 import { watchBundlesForChanges$ } from '../optimizer/watch_bundles_for_changes';
@@ -65,69 +65,72 @@ afterEach(async () => {
   jest.useRealTimers();
 });
 
-it('notifies of changes and completes once all bundles have changed', async () => {
-  expect.assertions(18);
-
-  const promise = lastValueFrom(
-    watchBundlesForChanges$(bundleCacheEvent$, Date.now()).pipe(
-      map((event, i) => {
-        // each time we trigger a change event we get a 'changed detected' event
-        if (i === 0 || i === 2 || i === 4 || i === 6) {
-          expect(event).toHaveProperty('type', 'changes detected');
-          return;
-        }
-
-        expect(event).toHaveProperty('type', 'changes');
-        // to teach TS what we're doing
-        if (event.type !== 'changes') {
-          return;
-        }
-
-        // first we change foo and bar, after 1 second that change comes though
-        if (i === 1) {
-          expect(event.bundles).toHaveLength(2);
-          const [bar, foo] = event.bundles.sort(ascending((b) => b.id));
-          expect(bar).toHaveProperty('id', 'bar');
-          expect(foo).toHaveProperty('id', 'foo');
-        }
-
-        // next we change just the baz package and it's represented on its own
-        if (i === 3) {
-          expect(event.bundles).toHaveLength(1);
-          expect(event.bundles[0]).toHaveProperty('id', 'baz');
-        }
-
-        // finally we change box and car together
-        if (i === 5) {
-          expect(event.bundles).toHaveLength(2);
-          const [bar, foo] = event.bundles.sort(ascending((b) => b.id));
-          expect(bar).toHaveProperty('id', 'box');
-          expect(foo).toHaveProperty('id', 'car');
-        }
-      })
-    )
-  );
-
-  expect(MockWatchPack.mock.instances).toHaveLength(1);
-  const [watcher] = MockWatchPack.mock.instances as any as Array<jest.Mocked<ActualWatchpack>>;
-  expect(watcher.on).toHaveBeenCalledTimes(1);
-  expect(watcher.on).toHaveBeenCalledWith('change', expect.any(Function));
-  const [, changeListener] = watcher.on.mock.calls[0];
-
-  // foo and bar are changes without 1sec so they are batched
-  changeListener(bundleEntryPath(FOO_BUNDLE), 'modified');
-  jest.advanceTimersByTime(900);
-  changeListener(bundleEntryPath(BAR_BUNDLE), 'modified');
-  jest.advanceTimersByTime(1000);
-
-  // baz is the only change in 1sec so it is on its own
-  changeListener(bundleEntryPath(BAZ_BUNDLE), 'modified');
-  jest.advanceTimersByTime(1000);
-
-  // finish by changing box and car
-  changeListener(bundleEntryPath(BOX_BUNDLE), 'deleted');
-  changeListener(bundleEntryPath(CAR_BUNDLE), 'deleted');
-  jest.advanceTimersByTime(1000);
-
-  await expect(promise).resolves.toEqual(undefined);
-});
+it(
+  'notifies of changes and completes once all bundles have changed',
+  fakeSchedulers(async (advance) => {
+    expect.assertions(18);
+
+    const promise = Rx.lastValueFrom(
+      watchBundlesForChanges$(bundleCacheEvent$, Date.now()).pipe(
+        map((event, i) => {
+          // each time we trigger a change event we get a 'changed detected' event
+          if (i === 0 || i === 2 || i === 4 || i === 6) {
+            expect(event).toHaveProperty('type', 'changes detected');
+            return;
+          }
+
+          expect(event).toHaveProperty('type', 'changes');
+          // to teach TS what we're doing
+          if (event.type !== 'changes') {
+            return;
+          }
+
+          // first we change foo and bar, after 1 second that change comes though
+          if (i === 1) {
+            expect(event.bundles).toHaveLength(2);
+            const [bar, foo] = event.bundles.sort(ascending((b) => b.id));
+            expect(bar).toHaveProperty('id', 'bar');
+            expect(foo).toHaveProperty('id', 'foo');
+          }
+
+          // next we change just the baz package and it's represented on its own
+          if (i === 3) {
+            expect(event.bundles).toHaveLength(1);
+            expect(event.bundles[0]).toHaveProperty('id', 'baz');
+          }
+
+          // finally we change box and car together
+          if (i === 5) {
+            expect(event.bundles).toHaveLength(2);
+            const [bar, foo] = event.bundles.sort(ascending((b) => b.id));
+            expect(bar).toHaveProperty('id', 'box');
+            expect(foo).toHaveProperty('id', 'car');
+          }
+        })
+      )
+    );
+
+    expect(MockWatchPack.mock.instances).toHaveLength(1);
+    const [watcher] = MockWatchPack.mock.instances as any as Array<jest.Mocked<ActualWatchpack>>;
+    expect(watcher.on).toHaveBeenCalledTimes(1);
+    expect(watcher.on).toHaveBeenCalledWith('change', expect.any(Function));
+    const [, changeListener] = watcher.on.mock.calls[0];
+
+    // foo and bar are changes without 1sec so they are batched
+    changeListener(bundleEntryPath(FOO_BUNDLE), 'modified');
+    advance(900);
+    changeListener(bundleEntryPath(BAR_BUNDLE), 'modified');
+    advance(1000);
+
+    // baz is the only change in 1sec so it is on its own
+    changeListener(bundleEntryPath(BAZ_BUNDLE), 'modified');
+    advance(1000);
+
+    // finish by changing box and car
+    changeListener(bundleEntryPath(BOX_BUNDLE), 'deleted');
+    changeListener(bundleEntryPath(CAR_BUNDLE), 'deleted');
+    advance(1000);
+
+    await expect(promise).resolves.toEqual(undefined);
+  })
+);
diff --git a/packages/kbn-optimizer/src/optimizer/observe_worker.ts b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
index 9f0ed9af556fb..338f64a63b3d7 100644
--- a/packages/kbn-optimizer/src/optimizer/observe_worker.ts
+++ b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
@@ -159,7 +159,7 @@ export function observeWorker(
     let lastMsg: WorkerMsg;
     const worker$: Rx.Observable<WorkerMsg | WorkerStatus> = Rx.merge(
       Rx.of({
-        type: 'worker started',
+        type: 'worker started' as const,
         bundles,
       }),
       // TypeScript note: As long as the proc stdio[1] is 'pipe', then stdout will not be null
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
index 3670a6af2cbe5..b8a2aaa592a5c 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
@@ -12,6 +12,14 @@ import { createAbsolutePathSerializer } from '@kbn/dev-utils';
 import { getOptimizerCacheKey } from './optimizer_cache_key';
 import { OptimizerConfig } from './optimizer_config';
 
+jest.mock('@kbn/synthetic-package-map', () => {
+  return {
+    readHashOfPackageMap() {
+      return '<hash of package map>';
+    },
+  };
+});
+
 jest.mock('../common/hashes', () => {
   return {
     Hashes: class MockHashes {
@@ -68,6 +76,7 @@ describe('getOptimizerCacheKey()', () => {
         "checksums": Object {
           "foo": "bar",
         },
+        "synthPackages": "<hash of package map>",
         "workerConfig": Object {
           "browserslistEnv": "dev",
           "dist": false,
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts
index 1c955e18c10ce..586846653802c 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { readHashOfPackageMap } from '@kbn/synthetic-package-map';
+
 import { CacheableWorkerConfig, Hashes } from '../common';
 import { OptimizerConfig } from './optimizer_config';
 import { getOptimizerBuiltPaths } from './optimizer_built_paths';
@@ -13,6 +15,7 @@ import { getOptimizerBuiltPaths } from './optimizer_built_paths';
 export interface OptimizerCacheKey {
   readonly workerConfig: CacheableWorkerConfig;
   readonly checksums: Record<string, string>;
+  readonly synthPackages: string;
 }
 
 /**
@@ -25,5 +28,6 @@ export async function getOptimizerCacheKey(config: OptimizerConfig): Promise<Opt
   return {
     checksums: hashes.cacheToJson(),
     workerConfig: config.getCacheableWorkerConfig(),
+    synthPackages: readHashOfPackageMap(),
   };
 }
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
index dff389f2e0de2..df9e35a406e69 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-jest.mock('./assign_bundles_to_workers.ts');
-jest.mock('./kibana_platform_plugins.ts');
-jest.mock('./get_plugin_bundles.ts');
-jest.mock('../common/theme_tags.ts');
-jest.mock('./filter_by_id.ts');
+jest.mock('./assign_bundles_to_workers');
+jest.mock('./kibana_platform_plugins');
+jest.mock('./get_plugin_bundles');
+jest.mock('../common/theme_tags');
+jest.mock('./filter_by_id');
 jest.mock('./focus_bundles');
-jest.mock('../limits.ts');
+jest.mock('../limits');
 
 jest.mock('os', () => {
   const realOs = jest.requireActual('os');
@@ -381,15 +381,15 @@ describe('OptimizerConfig::parseOptions()', () => {
  */
 describe('OptimizerConfig::create()', () => {
   const assignBundlesToWorkers: jest.Mock = jest.requireMock(
-    './assign_bundles_to_workers.ts'
+    './assign_bundles_to_workers'
   ).assignBundlesToWorkers;
   const findKibanaPlatformPlugins: jest.Mock = jest.requireMock(
-    './kibana_platform_plugins.ts'
+    './kibana_platform_plugins'
   ).findKibanaPlatformPlugins;
-  const getPluginBundles: jest.Mock = jest.requireMock('./get_plugin_bundles.ts').getPluginBundles;
-  const filterById: jest.Mock = jest.requireMock('./filter_by_id.ts').filterById;
+  const getPluginBundles: jest.Mock = jest.requireMock('./get_plugin_bundles').getPluginBundles;
+  const filterById: jest.Mock = jest.requireMock('./filter_by_id').filterById;
   const focusBundles: jest.Mock = jest.requireMock('./focus_bundles').focusBundles;
-  const readLimits: jest.Mock = jest.requireMock('../limits.ts').readLimits;
+  const readLimits: jest.Mock = jest.requireMock('../limits').readLimits;
 
   beforeEach(() => {
     if ('mock' in OptimizerConfig.parseOptions) {
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
index 13c82260d34ff..3a5cea4cb8f12 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import Os from 'os';
-import { getPluginSearchPaths } from '@kbn/config';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 
 import {
   Bundle,
@@ -109,6 +109,9 @@ interface Options {
 
   /** path to a limits.yml file that should be used to inform ci-stats of metric limits */
   limitsPath?: string;
+
+  /** discover and build test plugins along with the standard plugins */
+  testPlugins?: boolean;
 }
 
 export interface ParsedOptions {
@@ -136,6 +139,7 @@ export class OptimizerConfig {
     const examples = !!options.examples;
     const profileWebpack = !!options.profileWebpack;
     const inspectWorkers = !!options.inspectWorkers;
+    const testPlugins = !!options.testPlugins;
     const cache = options.cache !== false && !process.env.KBN_OPTIMIZER_NO_CACHE;
     const includeCoreBundle = !!options.includeCoreBundle;
     const filters = options.filter || [];
@@ -157,6 +161,7 @@ export class OptimizerConfig {
         rootDir: repoRoot,
         oss,
         examples,
+        testPlugins,
       });
 
     if (!pluginScanDirs.every((p) => Path.isAbsolute(p))) {
diff --git a/packages/kbn-optimizer/src/worker/run_compilers.ts b/packages/kbn-optimizer/src/worker/run_compilers.ts
index 4f5bb23c3550d..6578e5fed5738 100644
--- a/packages/kbn-optimizer/src/worker/run_compilers.ts
+++ b/packages/kbn-optimizer/src/worker/run_compilers.ts
@@ -27,7 +27,7 @@ const observeCompiler = (
   compiler: webpack.Compiler
 ): Rx.Observable<CompilerMsg> => {
   const compilerMsgs = new CompilerMsgs(bundle.id);
-  const done$ = new Rx.Subject();
+  const done$ = new Rx.Subject<void>();
   const { beforeRun, watchRun, done } = compiler.hooks;
 
   /**
diff --git a/packages/kbn-plugin-discovery/src/plugin_search_paths.ts b/packages/kbn-plugin-discovery/src/plugin_search_paths.ts
index fe6f0a44b044e..5d46c0c8de868 100644
--- a/packages/kbn-plugin-discovery/src/plugin_search_paths.ts
+++ b/packages/kbn-plugin-discovery/src/plugin_search_paths.ts
@@ -12,9 +12,10 @@ export interface SearchOptions {
   rootDir: string;
   oss: boolean;
   examples: boolean;
+  testPlugins?: boolean;
 }
 
-export function getPluginSearchPaths({ rootDir, oss, examples }: SearchOptions) {
+export function getPluginSearchPaths({ rootDir, oss, examples, testPlugins }: SearchOptions) {
   return [
     resolve(rootDir, 'src', 'plugins'),
     ...(oss ? [] : [resolve(rootDir, 'x-pack', 'plugins')]),
@@ -22,5 +23,25 @@ export function getPluginSearchPaths({ rootDir, oss, examples }: SearchOptions)
     ...(examples ? [resolve(rootDir, 'examples')] : []),
     ...(examples && !oss ? [resolve(rootDir, 'x-pack', 'examples')] : []),
     resolve(rootDir, '..', 'kibana-extra'),
+    ...(testPlugins
+      ? [
+          resolve(rootDir, 'test/analytics/__fixtures__/plugins'),
+          resolve(rootDir, 'test/plugin_functional/plugins'),
+          resolve(rootDir, 'test/interpreter_functional/plugins'),
+          resolve(rootDir, 'test/common/fixtures/plugins'),
+        ]
+      : []),
+    ...(testPlugins && !oss
+      ? [
+          resolve(rootDir, 'x-pack/test/plugin_functional/plugins'),
+          resolve(rootDir, 'x-pack/test/functional_with_es_ssl/fixtures/plugins'),
+          resolve(rootDir, 'x-pack/test/alerting_api_integration/plugins'),
+          resolve(rootDir, 'x-pack/test/plugin_api_integration/plugins'),
+          resolve(rootDir, 'x-pack/test/plugin_api_perf/plugins'),
+          resolve(rootDir, 'x-pack/test/licensing_plugin/plugins'),
+          resolve(rootDir, 'x-pack/test/usage_collection/plugins'),
+          resolve(rootDir, 'x-pack/test/security_functional/fixtures/common'),
+        ]
+      : []),
   ];
 }
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 0d731fd936507..5dceb317067f8 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -82,14646 +82,13293 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ 	return __webpack_require__(__webpack_require__.s = "./src/index.ts");
 /******/ })
 /************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__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__(565);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildBazelProductionProjects"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildNonBazelProductionProjects"]; });
+/******/ ({
 
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(340);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return _utils_projects__WEBPACK_IMPORTED_MODULE_2__["getProjects"]; });
+/***/ "../../node_modules/@babel/code-frame/lib/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(342);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; });
+"use strict";
 
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(343);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "transformDependencies", function() { return _utils_package_json__WEBPACK_IMPORTED_MODULE_4__["transformDependencies"]; });
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(564);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.codeFrameColumns = codeFrameColumns;
+exports.default = _default;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+var _highlight = __webpack_require__("../../node_modules/@babel/highlight/lib/index.js");
 
+let deprecationWarningShown = false;
 
+function getDefs(chalk) {
+  return {
+    gutter: chalk.grey,
+    marker: chalk.red.bold,
+    message: chalk.red.bold
+  };
+}
 
+const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
 
+function getMarkerLines(loc, source, opts) {
+  const startLoc = Object.assign({
+    column: 0,
+    line: -1
+  }, loc.start);
+  const endLoc = Object.assign({}, startLoc, loc.end);
+  const {
+    linesAbove = 2,
+    linesBelow = 3
+  } = opts || {};
+  const startLine = startLoc.line;
+  const startColumn = startLoc.column;
+  const endLine = endLoc.line;
+  const endColumn = endLoc.column;
+  let start = Math.max(startLine - (linesAbove + 1), 0);
+  let end = Math.min(source.length, endLine + linesBelow);
 
+  if (startLine === -1) {
+    start = 0;
+  }
 
+  if (endLine === -1) {
+    end = source.length;
+  }
 
-/***/ }),
-/* 1 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  const lineDiff = endLine - startLine;
+  const markerLines = {};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "run", function() { return run; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
-/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(getopts__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 _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__(129);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(559);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(220);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+  if (lineDiff) {
+    for (let i = 0; i <= lineDiff; i++) {
+      const lineNumber = i + startLine;
 
+      if (!startColumn) {
+        markerLines[lineNumber] = true;
+      } else if (i === 0) {
+        const sourceLength = source[lineNumber - 1].length;
+        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
+      } else if (i === lineDiff) {
+        markerLines[lineNumber] = [0, endColumn];
+      } else {
+        const sourceLength = source[lineNumber - i].length;
+        markerLines[lineNumber] = [0, sourceLength];
+      }
+    }
+  } else {
+    if (startColumn === endColumn) {
+      if (startColumn) {
+        markerLines[startLine] = [startColumn, 0];
+      } else {
+        markerLines[startLine] = true;
+      }
+    } else {
+      markerLines[startLine] = [startColumn, endColumn - startColumn];
+    }
+  }
 
+  return {
+    start,
+    end,
+    markerLines
+  };
+}
 
+function codeFrameColumns(rawLines, loc, opts = {}) {
+  const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight.shouldHighlight)(opts);
+  const chalk = (0, _highlight.getChalk)(opts);
+  const defs = getDefs(chalk);
 
+  const maybeHighlight = (chalkFn, string) => {
+    return highlighted ? chalkFn(string) : string;
+  };
 
+  const lines = rawLines.split(NEWLINE);
+  const {
+    start,
+    end,
+    markerLines
+  } = getMarkerLines(loc, lines, opts);
+  const hasColumns = loc.start && typeof loc.start.column === "number";
+  const numberMaxWidth = String(end).length;
+  const highlightedLines = highlighted ? (0, _highlight.default)(rawLines, opts) : rawLines;
+  let frame = highlightedLines.split(NEWLINE, end).slice(start, end).map((line, index) => {
+    const number = start + 1 + index;
+    const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
+    const gutter = ` ${paddedNumber} |`;
+    const hasMarker = markerLines[number];
+    const lastMarkerLine = !markerLines[number + 1];
 
+    if (hasMarker) {
+      let markerLine = "";
 
+      if (Array.isArray(hasMarker)) {
+        const markerSpacing = line.slice(0, Math.max(hasMarker[0] - 1, 0)).replace(/[^\t]/g, " ");
+        const numberOfMarkers = hasMarker[1] || 1;
+        markerLine = ["\n ", maybeHighlight(defs.gutter, gutter.replace(/\d/g, " ")), " ", markerSpacing, maybeHighlight(defs.marker, "^").repeat(numberOfMarkers)].join("");
 
-function help() {
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      usage: kbn <command> [<args>]
+        if (lastMarkerLine && opts.message) {
+          markerLine += " " + maybeHighlight(defs.message, opts.message);
+        }
+      }
 
-      By default commands are run for Kibana itself, all packages in the 'packages/'
-      folder and for all plugins in './plugins' and '../kibana-extra'.
+      return [maybeHighlight(defs.marker, ">"), maybeHighlight(defs.gutter, gutter), line.length > 0 ? ` ${line}` : "", markerLine].join("");
+    } else {
+      return ` ${maybeHighlight(defs.gutter, gutter)}${line.length > 0 ? ` ${line}` : ""}`;
+    }
+  }).join("\n");
 
-      Available commands:
+  if (opts.message && !hasColumns) {
+    frame = `${" ".repeat(numberMaxWidth + 1)}${opts.message}\n${frame}`;
+  }
 
-        ${Object.values(_commands__WEBPACK_IMPORTED_MODULE_4__["commands"]).map(command => `${command.name} - ${command.description}`).join('\n        ')}
+  if (highlighted) {
+    return chalk.reset(frame);
+  } else {
+    return frame;
+  }
+}
 
-      Global options:
+function _default(rawLines, lineNumber, colNumber, opts = {}) {
+  if (!deprecationWarningShown) {
+    deprecationWarningShown = true;
+    const message = "Passing lineNumber and colNumber is deprecated to @babel/code-frame. Please use `codeFrameColumns`.";
 
-        -e, --exclude           Exclude specified project. Can be specified multiple times to exclude multiple projects, e.g. '-e kibana -e @kbn/pm'.
-        -i, --include           Include only specified projects. If left unspecified, it defaults to including all projects.
-        --oss                   Do not include the x-pack when running command.
-        --skip-kibana-plugins   Filter all plugins in ./plugins and ../kibana-extra when running command.
-        --no-cache              Disable the kbn packages bootstrap cache
-        --no-validate           Disable the bootstrap yarn.lock validation
-        --force-install         Forces yarn install to run on bootstrap
-        --offline               Run in offline mode
-        --verbose               Set log level to verbose
-        --debug                 Set log level to debug
-        --quiet                 Set log level to error
-        --silent                Disable log output
+    if (process.emitWarning) {
+      process.emitWarning(message, "DeprecationWarning");
+    } else {
+      const deprecationError = new Error(message);
+      deprecationError.name = "DeprecationWarning";
+      console.warn(new Error(message));
+    }
+  }
 
-      "run" options:
-        --skip-missing          Ignore packages which don't have the requested script
-    ` + '\n');
+  colNumber = Math.max(colNumber, 0);
+  const location = {
+    start: {
+      column: colNumber,
+      line: lineNumber
+    }
+  };
+  return codeFrameColumns(rawLines, location, opts);
 }
 
-async function run(argv) {
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].setLogLevel(Object(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__["pickLevelFromFlags"])(getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
-    boolean: ['verbose', 'debug', 'quiet', 'silent', 'skip-missing']
-  }))); // We can simplify this setup (and remove this extra handling) once Yarn
-  // starts forwarding the `--` directly to this script, see
-  // https://github.com/yarnpkg/yarn/blob/b2d3e1a8fe45ef376b716d597cc79b38702a9320/src/cli/index.js#L174-L182
+/***/ }),
 
-  if (argv.includes('--')) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].error(`Using "--" is not allowed, as it doesn't work with 'yarn kbn'.`);
-    process.exit(1);
-  }
+/***/ "../../node_modules/@babel/helper-validator-identifier/lib/identifier.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  const options = getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
-    alias: {
-      e: 'exclude',
-      h: 'help',
-      i: 'include'
-    },
-    default: {
-      cache: true,
-      'force-install': false,
-      offline: false,
-      validate: true
-    },
-    boolean: ['cache', 'force-install', 'offline', 'validate']
-  });
-  const args = options._;
+"use strict";
 
-  if (options.help || args.length === 0) {
-    help();
-    return;
-  } // This `rootPath` is relative to `./dist/` as that's the location of the
-  // built version of this tool.
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isIdentifierChar = isIdentifierChar;
+exports.isIdentifierName = isIdentifierName;
+exports.isIdentifierStart = isIdentifierStart;
+let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088e\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ca\ua7d0\ua7d1\ua7d3\ua7d5-\ua7d9\ua7f2-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
+let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0898-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1ace\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
+const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
+const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
+nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
+const astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1070, 4050, 582, 8634, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 46, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 482, 44, 11, 6, 17, 0, 322, 29, 19, 43, 1269, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4152, 8, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
+const astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 
-  const rootPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(__dirname, '../../../');
-  const commandName = args[0];
-  const extraArgs = args.slice(1);
-  const commandOptions = {
-    options,
-    extraArgs,
-    rootPath
-  };
-  const command = _commands__WEBPACK_IMPORTED_MODULE_4__["commands"][commandName];
+function isInAstralSet(code, set) {
+  let pos = 0x10000;
 
-  if (command === undefined) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].error(`[${commandName}] is not a valid command, see 'kbn --help'`);
-    process.exit(1);
+  for (let i = 0, length = set.length; i < length; i += 2) {
+    pos += set[i];
+    if (pos > code) return false;
+    pos += set[i + 1];
+    if (pos >= code) return true;
   }
 
-  await Object(_run__WEBPACK_IMPORTED_MODULE_5__["runCommand"])(command, commandOptions);
+  return false;
 }
 
-/***/ }),
-/* 2 */
-/***/ (function(module, exports, __webpack_require__) {
+function isIdentifierStart(code) {
+  if (code < 65) return code === 36;
+  if (code <= 90) return true;
+  if (code < 97) return code === 95;
+  if (code <= 122) return true;
 
-"use strict";
+  if (code <= 0xffff) {
+    return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
+  }
 
+  return isInAstralSet(code, astralIdentifierStartCodes);
+}
 
-function dedent(strings) {
+function isIdentifierChar(code) {
+  if (code < 48) return code === 36;
+  if (code < 58) return true;
+  if (code < 65) return false;
+  if (code <= 90) return true;
+  if (code < 97) return code === 95;
+  if (code <= 122) return true;
 
-  var raw = void 0;
-  if (typeof strings === "string") {
-    // dedent can be used as a plain function
-    raw = [strings];
-  } else {
-    raw = strings.raw;
+  if (code <= 0xffff) {
+    return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
   }
 
-  // first, perform interpolation
-  var result = "";
-  for (var i = 0; i < raw.length; i++) {
-    result += raw[i].
-    // join lines when there is a suppressed newline
-    replace(/\\\n[ \t]*/g, "").
+  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes);
+}
 
-    // handle escaped backticks
-    replace(/\\`/g, "`");
+function isIdentifierName(name) {
+  let isFirst = true;
 
-    if (i < (arguments.length <= 1 ? 0 : arguments.length - 1)) {
-      result += arguments.length <= i + 1 ? undefined : arguments[i + 1];
-    }
-  }
+  for (let i = 0; i < name.length; i++) {
+    let cp = name.charCodeAt(i);
 
-  // now strip indentation
-  var lines = result.split("\n");
-  var mindent = null;
-  lines.forEach(function (l) {
-    var m = l.match(/^(\s+)\S+/);
-    if (m) {
-      var indent = m[1].length;
-      if (!mindent) {
-        // this is the first indented line
-        mindent = indent;
-      } else {
-        mindent = Math.min(mindent, indent);
+    if ((cp & 0xfc00) === 0xd800 && i + 1 < name.length) {
+      const trail = name.charCodeAt(++i);
+
+      if ((trail & 0xfc00) === 0xdc00) {
+        cp = 0x10000 + ((cp & 0x3ff) << 10) + (trail & 0x3ff);
       }
     }
-  });
 
-  if (mindent !== null) {
-    result = lines.map(function (l) {
-      return l[0] === " " ? l.slice(mindent) : l;
-    }).join("\n");
-  }
+    if (isFirst) {
+      isFirst = false;
 
-  // dedent eats leading and trailing whitespace too
-  result = result.trim();
+      if (!isIdentifierStart(cp)) {
+        return false;
+      }
+    } else if (!isIdentifierChar(cp)) {
+      return false;
+    }
+  }
 
-  // handle escaped newlines at the end to ensure they don't get stripped too
-  return result.replace(/\\n/g, "\n");
+  return !isFirst;
 }
 
-if (true) {
-  module.exports = dedent;
-}
+/***/ }),
+
+/***/ "../../node_modules/@babel/helper-validator-identifier/lib/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "isIdentifierChar", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierChar;
+  }
+});
+Object.defineProperty(exports, "isIdentifierName", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierName;
+  }
+});
+Object.defineProperty(exports, "isIdentifierStart", {
+  enumerable: true,
+  get: function () {
+    return _identifier.isIdentifierStart;
+  }
+});
+Object.defineProperty(exports, "isKeyword", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isKeyword;
+  }
+});
+Object.defineProperty(exports, "isReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictBindOnlyReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictBindOnlyReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictBindReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictBindReservedWord;
+  }
+});
+Object.defineProperty(exports, "isStrictReservedWord", {
+  enumerable: true,
+  get: function () {
+    return _keyword.isStrictReservedWord;
+  }
+});
 
+var _identifier = __webpack_require__("../../node_modules/@babel/helper-validator-identifier/lib/identifier.js");
+
+var _keyword = __webpack_require__("../../node_modules/@babel/helper-validator-identifier/lib/keyword.js");
 
 /***/ }),
-/* 3 */
+
+/***/ "../../node_modules/@babel/helper-validator-identifier/lib/keyword.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const EMPTYARR = []
-const SHORTSPLIT = /$|[!-@[-`{-~][\s\S]*/g
-const isArray = Array.isArray
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isKeyword = isKeyword;
+exports.isReservedWord = isReservedWord;
+exports.isStrictBindOnlyReservedWord = isStrictBindOnlyReservedWord;
+exports.isStrictBindReservedWord = isStrictBindReservedWord;
+exports.isStrictReservedWord = isStrictReservedWord;
+const reservedWords = {
+  keyword: ["break", "case", "catch", "continue", "debugger", "default", "do", "else", "finally", "for", "function", "if", "return", "switch", "throw", "try", "var", "const", "while", "with", "new", "this", "super", "class", "extends", "export", "import", "null", "true", "false", "in", "instanceof", "typeof", "void", "delete"],
+  strict: ["implements", "interface", "let", "package", "private", "protected", "public", "static", "yield"],
+  strictBind: ["eval", "arguments"]
+};
+const keywords = new Set(reservedWords.keyword);
+const reservedWordsStrictSet = new Set(reservedWords.strict);
+const reservedWordsStrictBindSet = new Set(reservedWords.strictBind);
 
-const parseValue = function(any) {
-  if (any === "") return ""
-  if (any === "false") return false
-  const maybe = Number(any)
-  return maybe * 0 === 0 ? maybe : any
+function isReservedWord(word, inModule) {
+  return inModule && word === "await" || word === "enum";
 }
 
-const parseAlias = function(aliases) {
-  let out = {},
-    key,
-    alias,
-    prev,
-    len,
-    any,
-    i,
-    k
-
-  for (key in aliases) {
-    any = aliases[key]
-    alias = out[key] = isArray(any) ? any : [any]
+function isStrictReservedWord(word, inModule) {
+  return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
+}
 
-    for (i = 0, len = alias.length; i < len; i++) {
-      prev = out[alias[i]] = [key]
+function isStrictBindOnlyReservedWord(word) {
+  return reservedWordsStrictBindSet.has(word);
+}
 
-      for (k = 0; k < len; k++) {
-        if (i !== k) prev.push(alias[k])
-      }
-    }
-  }
+function isStrictBindReservedWord(word, inModule) {
+  return isStrictReservedWord(word, inModule) || isStrictBindOnlyReservedWord(word);
+}
 
-  return out
+function isKeyword(word) {
+  return keywords.has(word);
 }
 
-const parseDefault = function(aliases, defaults) {
-  let out = {},
-    key,
-    alias,
-    value,
-    len,
-    i
+/***/ }),
 
-  for (key in defaults) {
-    value = defaults[key]
-    alias = aliases[key]
+/***/ "../../node_modules/@babel/highlight/lib/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    out[key] = value
+"use strict";
 
-    if (alias === undefined) {
-      aliases[key] = EMPTYARR
-    } else {
-      for (i = 0, len = alias.length; i < len; i++) {
-        out[alias[i]] = value
-      }
-    }
-  }
 
-  return out
-}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = highlight;
+exports.getChalk = getChalk;
+exports.shouldHighlight = shouldHighlight;
 
-const parseOptions = function(aliases, options, value) {
-  let out = {},
-    key,
-    alias,
-    len,
-    end,
-    i,
-    k
+var _jsTokens = __webpack_require__("../../node_modules/@babel/highlight/node_modules/js-tokens/index.js");
 
-  if (options !== undefined) {
-    for (i = 0, len = options.length; i < len; i++) {
-      key = options[i]
-      alias = aliases[key]
+var _helperValidatorIdentifier = __webpack_require__("../../node_modules/@babel/helper-validator-identifier/lib/index.js");
 
-      out[key] = value
+var _chalk = __webpack_require__("../../node_modules/@babel/highlight/node_modules/chalk/index.js");
 
-      if (alias === undefined) {
-        aliases[key] = EMPTYARR
-      } else {
-        for (k = 0, end = alias.length; k < end; k++) {
-          out[alias[k]] = value
-        }
-      }
-    }
-  }
+const sometimesKeywords = new Set(["as", "async", "from", "get", "of", "set"]);
 
-  return out
+function getDefs(chalk) {
+  return {
+    keyword: chalk.cyan,
+    capitalized: chalk.yellow,
+    jsxIdentifier: chalk.yellow,
+    punctuator: chalk.yellow,
+    number: chalk.magenta,
+    string: chalk.green,
+    regex: chalk.magenta,
+    comment: chalk.grey,
+    invalid: chalk.white.bgRed.bold
+  };
 }
 
-const write = function(out, key, value, aliases, unknown) {
-  let i,
-    prev,
-    alias = aliases[key],
-    len = alias === undefined ? -1 : alias.length
+const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+const BRACKET = /^[()[\]{}]$/;
+let tokenize;
+{
+  const JSX_TAG = /^[a-z][\w-]*$/i;
 
-  if (len >= 0 || unknown === undefined || unknown(key)) {
-    prev = out[key]
+  const getTokenType = function (token, offset, text) {
+    if (token.type === "name") {
+      if ((0, _helperValidatorIdentifier.isKeyword)(token.value) || (0, _helperValidatorIdentifier.isStrictReservedWord)(token.value, true) || sometimesKeywords.has(token.value)) {
+        return "keyword";
+      }
 
-    if (prev === undefined) {
-      out[key] = value
-    } else {
-      if (isArray(prev)) {
-        prev.push(value)
-      } else {
-        out[key] = [prev, value]
+      if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
+        return "jsxIdentifier";
+      }
+
+      if (token.value[0] !== token.value[0].toLowerCase()) {
+        return "capitalized";
       }
     }
 
-    for (i = 0; i < len; i++) {
-      out[alias[i]] = out[key]
+    if (token.type === "punctuator" && BRACKET.test(token.value)) {
+      return "bracket";
     }
-  }
+
+    if (token.type === "invalid" && (token.value === "@" || token.value === "#")) {
+      return "punctuator";
+    }
+
+    return token.type;
+  };
+
+  tokenize = function* (text) {
+    let match;
+
+    while (match = _jsTokens.default.exec(text)) {
+      const token = _jsTokens.matchToToken(match);
+
+      yield {
+        type: getTokenType(token, match.index, text),
+        value: token.value
+      };
+    }
+  };
 }
 
-const getopts = function(argv, opts) {
-  let unknown = (opts = opts || {}).unknown,
-    aliases = parseAlias(opts.alias),
-    strings = parseOptions(aliases, opts.string, ""),
-    values = parseDefault(aliases, opts.default),
-    bools = parseOptions(aliases, opts.boolean, false),
-    stopEarly = opts.stopEarly,
-    _ = [],
-    out = { _ },
-    i = 0,
-    k = 0,
-    len = argv.length,
-    key,
-    arg,
-    end,
-    match,
-    value
+function highlightTokens(defs, text) {
+  let highlighted = "";
 
-  for (; i < len; i++) {
-    arg = argv[i]
+  for (const {
+    type,
+    value
+  } of tokenize(text)) {
+    const colorize = defs[type];
 
-    if (arg[0] !== "-" || arg === "-") {
-      if (stopEarly) while (i < len) _.push(argv[i++])
-      else _.push(arg)
-    } else if (arg === "--") {
-      while (++i < len) _.push(argv[i])
-    } else if (arg[1] === "-") {
-      end = arg.indexOf("=", 2)
-      if (arg[2] === "n" && arg[3] === "o" && arg[4] === "-") {
-        key = arg.slice(5, end >= 0 ? end : undefined)
-        value = false
-      } else if (end >= 0) {
-        key = arg.slice(2, end)
-        value =
-          bools[key] !== undefined ||
-          (strings[key] === undefined
-            ? parseValue(arg.slice(end + 1))
-            : arg.slice(end + 1))
-      } else {
-        key = arg.slice(2)
-        value =
-          bools[key] !== undefined ||
-          (len === i + 1 || argv[i + 1][0] === "-"
-            ? strings[key] === undefined
-              ? true
-              : ""
-            : strings[key] === undefined
-            ? parseValue(argv[++i])
-            : argv[++i])
-      }
-      write(out, key, value, aliases, unknown)
+    if (colorize) {
+      highlighted += value.split(NEWLINE).map(str => colorize(str)).join("\n");
     } else {
-      SHORTSPLIT.lastIndex = 2
-      match = SHORTSPLIT.exec(arg)
-      end = match.index
-      value = match[0]
-
-      for (k = 1; k < end; k++) {
-        write(
-          out,
-          (key = arg[k]),
-          k + 1 < end
-            ? strings[key] === undefined ||
-                arg.substring(k + 1, (k = end)) + value
-            : value === ""
-            ? len === i + 1 || argv[i + 1][0] === "-"
-              ? strings[key] === undefined || ""
-              : bools[key] !== undefined ||
-                (strings[key] === undefined ? parseValue(argv[++i]) : argv[++i])
-            : bools[key] !== undefined ||
-              (strings[key] === undefined ? parseValue(value) : value),
-          aliases,
-          unknown
-        )
-      }
+      highlighted += value;
     }
   }
 
-  for (key in values) if (out[key] === undefined) out[key] = values[key]
-  for (key in bools) if (out[key] === undefined) out[key] = false
-  for (key in strings) if (out[key] === undefined) out[key] = ""
+  return highlighted;
+}
 
-  return out
+function shouldHighlight(options) {
+  return !!_chalk.supportsColor || options.forceColor;
 }
 
-module.exports = getopts
+function getChalk(options) {
+  return options.forceColor ? new _chalk.constructor({
+    enabled: true,
+    level: 1
+  }) : _chalk;
+}
 
+function highlight(code, options = {}) {
+  if (code !== "" && shouldHighlight(options)) {
+    const chalk = getChalk(options);
+    const defs = getDefs(chalk);
+    return highlightTokens(defs, code);
+  } else {
+    return code;
+  }
+}
 
 /***/ }),
-/* 4 */
-/***/ (function(module, exports) {
 
-module.exports = require("path");
-
-/***/ }),
-/* 5 */
+/***/ "../../node_modules/@babel/highlight/node_modules/ansi-styles/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__("../../node_modules/color-convert/index.js");
 
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ToolingLog", {
-  enumerable: true,
-  get: function () {
-    return _tooling_log.ToolingLog;
-  }
-});
-Object.defineProperty(exports, "ToolingLogCollectingWriter", {
-  enumerable: true,
-  get: function () {
-    return _tooling_log_collecting_writer.ToolingLogCollectingWriter;
-  }
-});
-Object.defineProperty(exports, "ToolingLogTextWriter", {
-  enumerable: true,
-  get: function () {
-    return _tooling_log_text_writer.ToolingLogTextWriter;
-  }
-});
-Object.defineProperty(exports, "parseLogLevel", {
-  enumerable: true,
-  get: function () {
-    return _log_levels.parseLogLevel;
-  }
-});
-Object.defineProperty(exports, "pickLevelFromFlags", {
-  enumerable: true,
-  get: function () {
-    return _log_levels.pickLevelFromFlags;
-  }
-});
+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`;
+};
 
-var _tooling_log = __webpack_require__(6);
+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],
 
-var _tooling_log_text_writer = __webpack_require__(112);
+			// 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],
 
-var _log_levels = __webpack_require__(127);
+			// 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]
+		}
+	};
 
-var _tooling_log_collecting_writer = __webpack_require__(128);
+	// Fix humans
+	styles.color.grey = styles.color.gray;
 
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
 
-"use strict";
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
 
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
-var _interopRequireDefault = __webpack_require__(7);
+			group[styleName] = styles[styleName];
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ToolingLog = void 0;
+			codes.set(style[0], style[1]);
+		}
 
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(8));
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
 
-var Rx = _interopRequireWildcard(__webpack_require__(9));
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
 
-var _tooling_log_text_writer = __webpack_require__(112);
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-class ToolingLog {
-  constructor(writerConfig, options) {
-    (0, _defineProperty2.default)(this, "indentWidth$", void 0);
-    (0, _defineProperty2.default)(this, "writers$", void 0);
-    (0, _defineProperty2.default)(this, "written$", void 0);
-    (0, _defineProperty2.default)(this, "type", void 0);
-    this.indentWidth$ = options !== null && options !== void 0 && options.parent ? options.parent.indentWidth$ : new Rx.BehaviorSubject(0);
-    this.writers$ = options !== null && options !== void 0 && options.parent ? options.parent.writers$ : new Rx.BehaviorSubject([]);
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
 
-    if (!(options !== null && options !== void 0 && options.parent) && writerConfig) {
-      this.writers$.next([new _tooling_log_text_writer.ToolingLogTextWriter(writerConfig)]);
-    }
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
 
-    this.written$ = options !== null && options !== void 0 && options.parent ? options.parent.written$ : new Rx.Subject();
-    this.type = options === null || options === void 0 ? void 0 : options.type;
-  }
-  /**
-   * Get the current indentation level of the ToolingLog
-   */
+		const suite = colorConvert[key];
 
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
 
-  getIndent() {
-    return this.indentWidth$.getValue();
-  }
-  /**
-   * Indent the output of the ToolingLog by some character (4 is a good choice usually).
-   *
-   * If provided, the `block` function will be executed and once it's promise is resolved
-   * or rejected the indentation will be reset to its original state.
-   *
-   * @param delta the number of spaces to increase/decrease the indentation
-   * @param block a function to run and reset any indentation changes after
-   */
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
 
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
 
-  indent(delta = 0, block) {
-    const originalWidth = this.indentWidth$.getValue();
-    this.indentWidth$.next(Math.max(originalWidth + delta, 0));
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
 
-    if (!block) {
-      return;
-    }
+	return styles;
+}
 
-    const maybePromise = block();
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
 
-    if (typeof maybePromise === 'object' && maybePromise && typeof maybePromise.then === 'function') {
-      return (async () => {
-        try {
-          return await maybePromise;
-        } finally {
-          this.indentWidth$.next(originalWidth);
-        }
-      })();
-    }
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
-    this.indentWidth$.next(originalWidth);
-    return maybePromise;
-  }
+/***/ }),
 
-  verbose(...args) {
-    this.sendToWriters('verbose', args);
-  }
+/***/ "../../node_modules/@babel/highlight/node_modules/chalk/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  debug(...args) {
-    this.sendToWriters('debug', args);
-  }
+"use strict";
 
-  info(...args) {
-    this.sendToWriters('info', args);
-  }
+const escapeStringRegexp = __webpack_require__("../../node_modules/escape-string-regexp/index.js");
+const ansiStyles = __webpack_require__("../../node_modules/@babel/highlight/node_modules/ansi-styles/index.js");
+const stdoutColor = __webpack_require__("../../node_modules/@babel/highlight/node_modules/supports-color/index.js").stdout;
 
-  success(...args) {
-    this.sendToWriters('success', args);
-  }
+const template = __webpack_require__("../../node_modules/@babel/highlight/node_modules/chalk/templates.js");
 
-  warning(...args) {
-    this.sendToWriters('warning', args);
-  }
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-  error(error) {
-    this.sendToWriters('error', [error]);
-  }
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-  write(...args) {
-    this.sendToWriters('write', args);
-  }
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
 
-  getWriters() {
-    return [...this.writers$.getValue()];
-  }
+const styles = Object.create(null);
 
-  setWriters(writers) {
-    this.writers$.next([...writers]);
-  }
+function applyOptions(obj, options) {
+	options = options || {};
 
-  getWritten$() {
-    return this.written$.asObservable();
-  }
-  /**
-   * Create a new ToolingLog which sets a different "type", allowing messages to be filtered out by "source"
-   * @param type A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`
-   */
+	// 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;
+}
 
+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);
 
-  withType(type) {
-    return new ToolingLog(undefined, {
-      type,
-      parent: this
-    });
-  }
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
 
-  sendToWriters(type, args) {
-    const indent = this.indentWidth$.getValue();
-    const writers = this.writers$.getValue();
-    const msg = {
-      type,
-      indent,
-      source: this.type,
-      args
-    };
-    let written = false;
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
 
-    for (const writer of writers) {
-      if (writer.write(msg)) {
-        written = true;
-      }
-    }
+		chalk.template.constructor = Chalk;
 
-    if (written) {
-      this.written$.next(msg);
-    }
-  }
+		return chalk.template;
+	}
 
+	applyOptions(this, options);
 }
 
-exports.ToolingLog = ToolingLog;
-
-/***/ }),
-/* 7 */
-/***/ (function(module, exports) {
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
 
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : {
-    "default": obj
-  };
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
 }
 
-module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
 
-/***/ }),
-/* 8 */
-/***/ (function(module, exports) {
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-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;
-  }
+	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);
+			};
+		}
+	};
+}
 
-  return obj;
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
+
+	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);
+			};
+		}
+	};
 }
 
-module.exports = _defineProperty, module.exports.__esModule = true, module.exports["default"] = module.exports;
+const proto = Object.defineProperties(() => {}, styles);
 
-/***/ }),
-/* 9 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]; });
+	builder._styles = _styles;
+	builder._empty = _empty;
 
-/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"]; });
+	const self = this;
 
-/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(32);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__["GroupedObservable"]; });
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
 
-/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__["observable"]; });
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
 
-/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; });
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
 
-/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(33);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["BehaviorSubject"]; });
+	// `__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
 
-/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["ReplaySubject"]; });
+	return builder;
+}
 
-/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(51);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["AsyncSubject"]; });
+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]);
 
-/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(52);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asap"]; });
+	if (argsLen === 0) {
+		return '';
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asapScheduler"]; });
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
 
-/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(56);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "async", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["async"]; });
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["asyncScheduler"]; });
+	// 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 = '';
+	}
 
-/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(35);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queue"]; });
+	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;
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queueScheduler"]; });
+		// 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}`);
+	}
 
-/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(57);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrame"]; });
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrameScheduler"]; });
+	return str;
+}
 
-/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(60);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualTimeScheduler"]; });
+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(' ');
+	}
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualAction"]; });
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
 
-/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(41);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; });
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
 
-/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(18);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["Subscription"]; });
+	return template(chalk, parts.join(''));
+}
 
-/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(12);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["Subscriber"]; });
+Object.defineProperties(Chalk.prototype, styles);
 
-/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(43);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; });
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; });
 
-/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(25);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["pipe"]; });
+/***/ }),
 
-/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(61);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["noop"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/chalk/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(26);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["identity"]; });
+"use strict";
 
-/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(62);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["isObservable"]; });
+const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|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}|x[a-f\d]{2}|.)|([^\\])/gi;
 
-/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(63);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__["ArgumentOutOfRangeError"]; });
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(64);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__["EmptyError"]; });
+function unescape(c) {
+	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(29);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__["ObjectUnsubscribedError"]; });
+	return ESCAPES.get(c) || c;
+}
 
-/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(21);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__["UnsubscriptionError"]; });
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
 
-/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(65);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__["TimeoutError"]; });
+	for (const chunk of chunks) {
+		if (!isNaN(chunk)) {
+			results.push(Number(chunk));
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
 
-/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(66);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__["bindCallback"]; });
+	return results;
+}
 
-/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(68);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__["bindNodeCallback"]; });
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(69);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__["combineLatest"]; });
+	const results = [];
+	let matches;
 
-/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(80);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__["concat"]; });
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(92);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__["defer"]; });
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(44);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["empty"]; });
+	return results;
+}
 
-/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(93);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__["forkJoin"]; });
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(84);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__["from"]; });
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(94);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__["fromEvent"]; });
+	let current = chalk;
+	for (const styleName of Object.keys(enabled)) {
+		if (Array.isArray(enabled[styleName])) {
+			if (!(styleName in current)) {
+				throw new Error(`Unknown Chalk style: ${styleName}`);
+			}
 
-/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(95);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__["fromEventPattern"]; });
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
 
-/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(96);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__["generate"]; });
+	return current;
+}
 
-/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(97);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__["iif"]; });
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(98);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__["interval"]; });
+	// eslint-disable-next-line max-params
+	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
+		if (escapeChar) {
+			chunk.push(unescape(escapeChar));
+		} else if (style) {
+			const str = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
 
-/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(100);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__["merge"]; });
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
 
-/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(101);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["never"]; });
+	chunks.push(chunk.join(''));
 
-/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(45);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__["of"]; });
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(102);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__["onErrorResumeNext"]; });
+	return chunks.join('');
+};
 
-/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(103);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; });
 
-/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(104);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__["partition"]; });
+/***/ }),
 
-/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(107);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__["race"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/has-flag/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(108);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__["range"]; });
+"use strict";
 
-/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(50);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__["throwError"]; });
+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);
+};
 
-/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(109);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__["timer"]; });
 
-/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(110);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__["using"]; });
+/***/ }),
 
-/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(111);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__["zip"]; });
+/***/ "../../node_modules/@babel/highlight/node_modules/js-tokens/index.js":
+/***/ (function(module, exports) {
 
-/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(85);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__["scheduled"]; });
+// Copyright 2014, 2015, 2016, 2017, 2018 Simon Lydell
+// License: MIT. (See LICENSE.)
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["EMPTY"]; });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+})
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["NEVER"]; });
+// This regex comes from regex.coffee, and is inserted here by generate-index.js
+// (run `npm run build`).
+exports.default = /((['"])(?:(?!\2|\\).|\\(?:\r\n|[\s\S]))*(\2)?|`(?:[^`\\$]|\\[\s\S]|\$(?!\{)|\$\{(?:[^{}]|\{[^}]*\}?)*\}?)*(`)?)|(\/\/.*)|(\/\*(?:[^*]|\*(?!\/))*(\*\/)?)|(\/(?!\*)(?:\[(?:(?![\]\\]).|\\.)*\]|(?![\/\]\\]).|\\.)+\/(?:(?!\s*(?:\b|[\u0080-\uFFFF$\\'"~({]|[+\-!](?!=)|\.?\d))|[gmiyus]{1,6}\b(?![\u0080-\uFFFF$\\]|\s*(?:[+\-*%&|^<>!=?({]|\/(?![\/*])))))|(0[xX][\da-fA-F]+|0[oO][0-7]+|0[bB][01]+|(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?)|((?!\d)(?:(?!\s)[$\w\u0080-\uFFFF]|\\u[\da-fA-F]{4}|\\u\{[\da-fA-F]+\})+)|(--|\+\+|&&|\|\||=>|\.{3}|(?:[+\-\/%&|^]|\*{1,2}|<{1,2}|>{1,3}|!=?|={1,2})=?|[?~.,:;[\](){}])|(\s+)|(^$|[\s\S])/g
 
-/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(16);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_52__["config"]; });
+exports.matchToToken = function(match) {
+  var token = {type: "invalid", value: match[0], closed: undefined}
+       if (match[ 1]) token.type = "string" , token.closed = !!(match[3] || match[4])
+  else if (match[ 5]) token.type = "comment"
+  else if (match[ 6]) token.type = "comment", token.closed = !!match[7]
+  else if (match[ 8]) token.type = "regex"
+  else if (match[ 9]) token.type = "number"
+  else if (match[10]) token.type = "name"
+  else if (match[11]) token.type = "punctuator"
+  else if (match[12]) token.type = "whitespace"
+  return token
+}
 
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
 
+/***/ }),
 
+/***/ "../../node_modules/@babel/highlight/node_modules/supports-color/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
+const os = __webpack_require__("os");
+const hasFlag = __webpack_require__("../../node_modules/@babel/highlight/node_modules/has-flag/index.js");
 
+const env = process.env;
 
+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;
+}
 
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
 
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
 
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
+	if (stream && !stream.isTTY && forceColor !== true) {
+		return 0;
+	}
 
+	const min = forceColor ? 1 : 0;
 
+	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;
+		}
 
+		return 1;
+	}
 
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
+		return min;
+	}
 
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
+		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;
+	}
 
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
+	if ('COLORTERM' in env) {
+		return 1;
+	}
 
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
+	return min;
+}
 
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
 
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
 
 
+/***/ }),
 
+/***/ "../../node_modules/@babel/runtime/helpers/defineProperty.js":
+/***/ (function(module, exports) {
 
+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;
+}
 
+module.exports = _defineProperty, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
+/***/ }),
 
+/***/ "../../node_modules/@babel/runtime/helpers/interopRequireDefault.js":
+/***/ (function(module, exports) {
 
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : {
+    "default": obj
+  };
+}
 
+module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter sync recursive":
+/***/ (function(module, exports) {
 
+function webpackEmptyContext(req) {
+	var e = new Error("Cannot find module '" + req + "'");
+	e.code = 'MODULE_NOT_FOUND';
+	throw e;
+}
+webpackEmptyContext.keys = function() { return []; };
+webpackEmptyContext.resolve = webpackEmptyContext;
+module.exports = webpackEmptyContext;
+webpackEmptyContext.id = "../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter sync recursive";
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter/ci_stats_config.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseConfig = parseConfig;
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
+/**
+ * Information about how CiStatsReporter should talk to the ci-stats service. Normally
+ * it is read from a JSON environment variable using the `parseConfig()` function
+ * exported by this module.
+ */
+function validateConfig(log, config) {
+  const validApiToken = typeof config.apiToken === 'string' && config.apiToken.length !== 0;
 
+  if (!validApiToken) {
+    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid api token, stats will not be reported');
+    return;
+  }
 
+  const validId = typeof config.buildId === 'string' && config.buildId.length !== 0;
 
+  if (!validId) {
+    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid build id, stats will not be reported');
+    return;
+  }
 
+  return config;
+}
 
+function parseConfig(log) {
+  const configJson = process.env.KIBANA_CI_STATS_CONFIG;
 
+  if (!configJson) {
+    log.debug('KIBANA_CI_STATS_CONFIG environment variable not found, disabling CiStatsReporter');
+    return;
+  }
 
-//# sourceMappingURL=index.js.map
+  let config;
 
+  try {
+    config = JSON.parse(configJson);
+  } catch (_) {// handled below
+  }
 
-/***/ }),
-/* 10 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (typeof config === 'object' && config !== null) {
+    return validateConfig(log, config);
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return Observable; });
-/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11);
-/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(16);
-/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
+  log.warning('KIBANA_CI_STATS_CONFIG is invalid, stats will not be reported');
+  return;
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter/ci_stats_reporter.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
-var Observable = /*@__PURE__*/ (function () {
-    function Observable(subscribe) {
-        this._isScalar = false;
-        if (subscribe) {
-            this._subscribe = subscribe;
-        }
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CiStatsReporter = void 0;
+
+var _util = __webpack_require__("util");
+
+var _os = _interopRequireDefault(__webpack_require__("os"));
+
+var _fs = _interopRequireDefault(__webpack_require__("fs"));
+
+var _path = _interopRequireDefault(__webpack_require__("path"));
+
+var _crypto = _interopRequireDefault(__webpack_require__("crypto"));
+
+var _execa = _interopRequireDefault(__webpack_require__("../../node_modules/execa/index.js"));
+
+var _axios = _interopRequireDefault(__webpack_require__("../../node_modules/axios/index.js"));
+
+var _http = _interopRequireDefault(__webpack_require__("../../node_modules/axios/lib/adapters/http.js"));
+
+var _ci_stats_config = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter/ci_stats_config.js");
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
+const BASE_URL = 'https://ci-stats.kibana.dev';
+/** A ci-stats metric record */
+
+/** Object that helps report data to the ci-stats service */
+class CiStatsReporter {
+  /**
+   * Create a CiStatsReporter by inspecting the ENV for the necessary config
+   */
+  static fromEnv(log) {
+    return new CiStatsReporter((0, _ci_stats_config.parseConfig)(log), log);
+  }
+
+  constructor(config, log) {
+    this.config = config;
+    this.log = log;
+  }
+  /**
+   * Determine if CI_STATS is explicitly disabled by the environment. To determine
+   * if the CiStatsReporter has enough information in the environment to send metrics
+   * for builds use #hasBuildConfig().
+   */
+
+
+  isEnabled() {
+    return process.env.CI_STATS_DISABLED !== 'true';
+  }
+  /**
+   * Determines if the CiStatsReporter is disabled by the environment, or properly
+   * configured and able to send stats
+   */
+
+
+  hasBuildConfig() {
+    var _this$config, _this$config2;
+
+    return this.isEnabled() && !!((_this$config = this.config) !== null && _this$config !== void 0 && _this$config.apiToken) && !!((_this$config2 = this.config) !== null && _this$config2 !== void 0 && _this$config2.buildId);
+  }
+  /**
+   * Report timings data to the ci-stats service. If running in CI then the reporter
+   * will include the buildId in the report with the access token, otherwise the timings
+   * data will be recorded as anonymous timing data.
+   */
+
+
+  async timings(options) {
+    var _this$config3, _options$upstreamBran, _Os$cpus, _Os$cpus$, _Os$cpus$2;
+
+    if (!this.isEnabled()) {
+      return;
     }
-    Observable.prototype.lift = function (operator) {
-        var observable = new Observable();
-        observable.source = this;
-        observable.operator = operator;
-        return observable;
-    };
-    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
-        var operator = this.operator;
-        var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete);
-        if (operator) {
-            sink.add(operator.call(sink, this.source));
-        }
-        else {
-            sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
-                this._subscribe(sink) :
-                this._trySubscribe(sink));
-        }
-        if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
-            if (sink.syncErrorThrowable) {
-                sink.syncErrorThrowable = false;
-                if (sink.syncErrorThrown) {
-                    throw sink.syncErrorValue;
-                }
-            }
-        }
-        return sink;
-    };
-    Observable.prototype._trySubscribe = function (sink) {
-        try {
-            return this._subscribe(sink);
-        }
-        catch (err) {
-            if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
-                sink.syncErrorThrown = true;
-                sink.syncErrorValue = err;
-            }
-            if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) {
-                sink.error(err);
-            }
-            else {
-                console.warn(err);
-            }
-        }
-    };
-    Observable.prototype.forEach = function (next, promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var subscription;
-            subscription = _this.subscribe(function (value) {
-                try {
-                    next(value);
-                }
-                catch (err) {
-                    reject(err);
-                    if (subscription) {
-                        subscription.unsubscribe();
-                    }
-                }
-            }, reject, resolve);
-        });
-    };
-    Observable.prototype._subscribe = function (subscriber) {
-        var source = this.source;
-        return source && source.subscribe(subscriber);
-    };
-    Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () {
-        return this;
-    };
-    Observable.prototype.pipe = function () {
-        var operations = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            operations[_i] = arguments[_i];
-        }
-        if (operations.length === 0) {
-            return this;
-        }
-        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this);
-    };
-    Observable.prototype.toPromise = function (promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var value;
-            _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); });
-        });
-    };
-    Observable.create = function (subscribe) {
-        return new Observable(subscribe);
+
+    const buildId = (_this$config3 = this.config) === null || _this$config3 === void 0 ? void 0 : _this$config3.buildId;
+    const timings = options.timings;
+    const upstreamBranch = (_options$upstreamBran = options.upstreamBranch) !== null && _options$upstreamBran !== void 0 ? _options$upstreamBran : this.getUpstreamBranch();
+    const kibanaUuid = options.kibanaUuid === undefined ? this.getKibanaUuid() : options.kibanaUuid;
+    let email;
+    let branch;
+
+    try {
+      const {
+        stdout
+      } = await (0, _execa.default)('git', ['config', 'user.email']);
+      email = stdout;
+    } catch (e) {
+      this.log.debug(e.message);
+    }
+
+    try {
+      const {
+        stdout
+      } = await (0, _execa.default)('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
+      branch = stdout;
+    } catch (e) {
+      this.log.debug(e.message);
+    }
+
+    const memUsage = process.memoryUsage();
+    const isElasticCommitter = email && email.endsWith('@elastic.co') ? true : false;
+    const defaultMeta = {
+      kibanaUuid,
+      isElasticCommitter,
+      committerHash: email ? _crypto.default.createHash('sha256').update(email).digest('hex').substring(0, 20) : undefined,
+      email: isElasticCommitter ? email : undefined,
+      branch: isElasticCommitter ? branch : undefined,
+      cpuCount: (_Os$cpus = _os.default.cpus()) === null || _Os$cpus === void 0 ? void 0 : _Os$cpus.length,
+      cpuModel: (_Os$cpus$ = _os.default.cpus()[0]) === null || _Os$cpus$ === void 0 ? void 0 : _Os$cpus$.model,
+      cpuSpeed: (_Os$cpus$2 = _os.default.cpus()[0]) === null || _Os$cpus$2 === void 0 ? void 0 : _Os$cpus$2.speed,
+      freeMem: _os.default.freemem(),
+      memoryUsageRss: memUsage.rss,
+      memoryUsageHeapTotal: memUsage.heapTotal,
+      memoryUsageHeapUsed: memUsage.heapUsed,
+      memoryUsageExternal: memUsage.external,
+      memoryUsageArrayBuffers: memUsage.arrayBuffers,
+      nestedTiming: process.env.CI_STATS_NESTED_TIMING ? true : false,
+      osArch: _os.default.arch(),
+      osPlatform: _os.default.platform(),
+      osRelease: _os.default.release(),
+      totalMem: _os.default.totalmem()
     };
-    return Observable;
-}());
+    this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash);
+    return !!(await this.req({
+      auth: !!buildId,
+      path: '/v1/timings',
+      body: {
+        buildId,
+        upstreamBranch,
+        defaultMeta,
+        timings
+      },
+      bodyDesc: timings.length === 1 ? `${timings.length} timing` : `${timings.length} timings`
+    }));
+  }
+  /**
+   * Report metrics data to the ci-stats service. If running outside of CI this method
+   * does nothing as metrics can only be reported when associated with a specific CI build.
+   */
 
-function getPromiseCtor(promiseCtor) {
-    if (!promiseCtor) {
-        promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise;
+
+  async metrics(metrics, options) {
+    var _this$config4;
+
+    if (!this.hasBuildConfig()) {
+      return;
     }
-    if (!promiseCtor) {
-        throw new Error('no Promise impl found');
+
+    const buildId = (_this$config4 = this.config) === null || _this$config4 === void 0 ? void 0 : _this$config4.buildId;
+
+    if (!buildId) {
+      throw new Error(`metrics can't be reported without a buildId`);
     }
-    return promiseCtor;
-}
-//# sourceMappingURL=Observable.js.map
+
+    return !!(await this.req({
+      auth: true,
+      path: '/v1/metrics',
+      body: {
+        buildId,
+        defaultMeta: options === null || options === void 0 ? void 0 : options.defaultMeta,
+        metrics
+      },
+      bodyDesc: `metrics: ${metrics.map(({
+        group,
+        id,
+        value
+      }) => `[${group}/${id}=${value}]`).join(' ')}`
+    }));
+  }
+  /**
+   * Send test reports to ci-stats
+   */
 
 
-/***/ }),
-/* 11 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  async reportTests({
+    group,
+    testRuns
+  }) {
+    var _this$config5, _this$config6, _this$config7;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canReportError", function() { return canReportError; });
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */
-
-function canReportError(observer) {
-    while (observer) {
-        var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped;
-        if (closed_1 || isStopped) {
-            return false;
-        }
-        else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
-            observer = destination;
-        }
-        else {
-            observer = null;
-        }
+    if (!((_this$config5 = this.config) !== null && _this$config5 !== void 0 && _this$config5.buildId) || !((_this$config6 = this.config) !== null && _this$config6 !== void 0 && _this$config6.apiToken)) {
+      throw new Error('unable to report tests unless buildId is configured and auth config available');
     }
-    return true;
-}
-//# sourceMappingURL=canReportError.js.map
+
+    return await this.req({
+      auth: true,
+      path: '/v1/test_group',
+      query: {
+        buildId: (_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.buildId
+      },
+      bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
+      body: [JSON.stringify({
+        group
+      }), ...testRuns.map(testRun => JSON.stringify({
+        testRun
+      }))].join('\n')
+    });
+  }
+  /**
+   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
+   * in the upstreamBranch when calling the timings() method. Outside of @kbn/pm
+   * we rely on @kbn/utils to find the package.json file.
+   */
 
 
-/***/ }),
-/* 12 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  getUpstreamBranch() {
+    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
+    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return Subscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SafeSubscriber", function() { return SafeSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18);
-/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(22);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(16);
-/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(17);
-/** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */
+    const {
+      kibanaPackageJson
+    } = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter sync recursive")(hideFromWebpack.join(''));
 
+    return kibanaPackageJson.branch;
+  }
+  /**
+   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
+   * in the kibanaUuid when calling the timings() method. Outside of @kbn/pm
+   * we rely on @kbn/utils to find the repo root.
+   */
 
 
+  getKibanaUuid() {
+    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
+    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
 
+    const {
+      REPO_ROOT
+    } = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter sync recursive")(hideFromWebpack.join(''));
 
+    try {
+      return _fs.default.readFileSync(_path.default.resolve(REPO_ROOT, 'data/uuid'), 'utf-8').trim();
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return undefined;
+      }
 
+      throw error;
+    }
+  }
 
-var Subscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subscriber, _super);
-    function Subscriber(destinationOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        _this.syncErrorValue = null;
-        _this.syncErrorThrown = false;
-        _this.syncErrorThrowable = false;
-        _this.isStopped = false;
-        switch (arguments.length) {
-            case 0:
-                _this.destination = _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"];
-                break;
-            case 1:
-                if (!destinationOrNext) {
-                    _this.destination = _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"];
-                    break;
-                }
-                if (typeof destinationOrNext === 'object') {
-                    if (destinationOrNext instanceof Subscriber) {
-                        _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
-                        _this.destination = destinationOrNext;
-                        destinationOrNext.add(_this);
-                    }
-                    else {
-                        _this.syncErrorThrowable = true;
-                        _this.destination = new SafeSubscriber(_this, destinationOrNext);
-                    }
-                    break;
-                }
-            default:
-                _this.syncErrorThrowable = true;
-                _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete);
-                break;
-        }
-        return _this;
+  async req({
+    auth,
+    body,
+    bodyDesc,
+    path,
+    query
+  }) {
+    let attempt = 0;
+    const maxAttempts = 5;
+    let headers;
+
+    if (auth && this.config) {
+      headers = {
+        Authorization: `token ${this.config.apiToken}`
+      };
+    } else if (auth) {
+      throw new Error('this.req() shouldnt be called with auth=true if this.config is not defined');
     }
-    Subscriber.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]] = function () { return this; };
-    Subscriber.create = function (next, error, complete) {
-        var subscriber = new Subscriber(next, error, complete);
-        subscriber.syncErrorThrowable = false;
-        return subscriber;
-    };
-    Subscriber.prototype.next = function (value) {
-        if (!this.isStopped) {
-            this._next(value);
-        }
-    };
-    Subscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            this.isStopped = true;
-            this._error(err);
-        }
-    };
-    Subscriber.prototype.complete = function () {
-        if (!this.isStopped) {
-            this.isStopped = true;
-            this._complete();
-        }
-    };
-    Subscriber.prototype.unsubscribe = function () {
-        if (this.closed) {
-            return;
+
+    while (true) {
+      attempt += 1;
+
+      try {
+        const resp = await _axios.default.request({
+          method: 'POST',
+          url: path,
+          baseURL: BASE_URL,
+          headers,
+          data: body,
+          params: query,
+          adapter: _http.default,
+          // if it can be serialized into a string, send it
+          maxBodyLength: Infinity,
+          maxContentLength: Infinity
+        });
+        return resp.data;
+      } catch (error) {
+        var _error$response;
+
+        if (!(error !== null && error !== void 0 && error.request)) {
+          // not an axios error, must be a usage error that we should notify user about
+          throw error;
         }
-        this.isStopped = true;
-        _super.prototype.unsubscribe.call(this);
-    };
-    Subscriber.prototype._next = function (value) {
-        this.destination.next(value);
-    };
-    Subscriber.prototype._error = function (err) {
-        this.destination.error(err);
-        this.unsubscribe();
-    };
-    Subscriber.prototype._complete = function () {
-        this.destination.complete();
-        this.unsubscribe();
-    };
-    Subscriber.prototype._unsubscribeAndRecycle = function () {
-        var _parentOrParents = this._parentOrParents;
-        this._parentOrParents = null;
-        this.unsubscribe();
-        this.closed = false;
-        this.isStopped = false;
-        this._parentOrParents = _parentOrParents;
-        return this;
-    };
-    return Subscriber;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"]));
 
-var SafeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SafeSubscriber, _super);
-    function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        _this._parentSubscriber = _parentSubscriber;
-        var next;
-        var context = _this;
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(observerOrNext)) {
-            next = observerOrNext;
-        }
-        else if (observerOrNext) {
-            next = observerOrNext.next;
-            error = observerOrNext.error;
-            complete = observerOrNext.complete;
-            if (observerOrNext !== _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]) {
-                context = Object.create(observerOrNext);
-                if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(context.unsubscribe)) {
-                    _this.add(context.unsubscribe.bind(context));
-                }
-                context.unsubscribe = _this.unsubscribe.bind(_this);
-            }
+        if (error !== null && error !== void 0 && error.response && error.response.status < 500) {
+          // error response from service was received so warn the user and move on
+          this.log.warning(`error reporting ${bodyDesc} [status=${error.response.status}] [resp=${(0, _util.inspect)(error.response.data)}]`);
+          return;
         }
-        _this._context = context;
-        _this._next = next;
-        _this._error = error;
-        _this._complete = complete;
-        return _this;
+
+        if (attempt === maxAttempts) {
+          this.log.warning(`unable to report ${bodyDesc}, failed to reach ci-stats service too many times`);
+          return;
+        } // we failed to reach the backend and we have remaining attempts, lets retry after a short delay
+
+
+        const reason = error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && _error$response.status ? `${error.response.status} response` : 'no response';
+        const seconds = attempt * 10;
+        this.log.warning(`failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`);
+        await new Promise(resolve => setTimeout(resolve, seconds * 1000));
+      }
     }
-    SafeSubscriber.prototype.next = function (value) {
-        if (!this.isStopped && this._next) {
-            var _parentSubscriber = this._parentSubscriber;
-            if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                this.__tryOrUnsub(this._next, value);
-            }
-            else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) {
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var _parentSubscriber = this._parentSubscriber;
-            var useDeprecatedSynchronousErrorHandling = _config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling;
-            if (this._error) {
-                if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                    this.__tryOrUnsub(this._error, err);
-                    this.unsubscribe();
-                }
-                else {
-                    this.__tryOrSetError(_parentSubscriber, this._error, err);
-                    this.unsubscribe();
-                }
-            }
-            else if (!_parentSubscriber.syncErrorThrowable) {
-                this.unsubscribe();
-                if (useDeprecatedSynchronousErrorHandling) {
-                    throw err;
-                }
-                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-            }
-            else {
-                if (useDeprecatedSynchronousErrorHandling) {
-                    _parentSubscriber.syncErrorValue = err;
-                    _parentSubscriber.syncErrorThrown = true;
-                }
-                else {
-                    Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-                }
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.complete = function () {
-        var _this = this;
-        if (!this.isStopped) {
-            var _parentSubscriber = this._parentSubscriber;
-            if (this._complete) {
-                var wrappedComplete = function () { return _this._complete.call(_this._context); };
-                if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                    this.__tryOrUnsub(wrappedComplete);
-                    this.unsubscribe();
-                }
-                else {
-                    this.__tryOrSetError(_parentSubscriber, wrappedComplete);
-                    this.unsubscribe();
-                }
-            }
-            else {
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) {
-        try {
-            fn.call(this._context, value);
-        }
-        catch (err) {
-            this.unsubscribe();
-            if (_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
-                throw err;
-            }
-            else {
-                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-            }
-        }
-    };
-    SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) {
-        if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
-            throw new Error('bad call');
-        }
-        try {
-            fn.call(this._context, value);
-        }
-        catch (err) {
-            if (_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
-                parent.syncErrorValue = err;
-                parent.syncErrorThrown = true;
-                return true;
-            }
-            else {
-                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-                return true;
-            }
-        }
-        return false;
-    };
-    SafeSubscriber.prototype._unsubscribe = function () {
-        var _parentSubscriber = this._parentSubscriber;
-        this._context = null;
-        this._parentSubscriber = null;
-        _parentSubscriber.unsubscribe();
-    };
-    return SafeSubscriber;
-}(Subscriber));
+  }
 
-//# sourceMappingURL=Subscriber.js.map
+}
 
+exports.CiStatsReporter = CiStatsReporter;
 
 /***/ }),
-/* 13 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/dev-utils/target_node/sort_package_json.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__extends", function() { return __extends; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__assign", function() { return __assign; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__rest", function() { return __rest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__decorate", function() { return __decorate; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__param", function() { return __param; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__metadata", function() { return __metadata; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__awaiter", function() { return __awaiter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__generator", function() { return __generator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__createBinding", function() { return __createBinding; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__exportStar", function() { return __exportStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncValues", function() { return __asyncValues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__makeTemplateObject", function() { return __makeTemplateObject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importStar", function() { return __importStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importDefault", function() { return __importDefault; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldGet", function() { return __classPrivateFieldGet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldSet", function() { return __classPrivateFieldSet; });
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    }
-    return __assign.apply(this, arguments);
-}
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-}
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-function __createBinding(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}
-
-function __exportStar(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-}
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result.default = mod;
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
-
-function __classPrivateFieldGet(receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
-}
-
-function __classPrivateFieldSet(receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
-}
 
 
-/***/ }),
-/* 14 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFunction", function() { return isFunction; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isFunction(x) {
-    return typeof x === 'function';
-}
-//# sourceMappingURL=isFunction.js.map
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortPackageJson = sortPackageJson;
+
+var _sortPackageJson = _interopRequireDefault(__webpack_require__("../../node_modules/sort-package-json/index.js"));
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function sortPackageJson(json) {
+  return JSON.stringify((0, _sortPackageJson.default)(JSON.parse(json), {
+    // top level keys in the order they were written when this was implemented
+    sortOrder: ['name', 'description', 'keywords', 'private', 'version', 'branch', 'main', 'browser', 'types', 'tsdocMetadata', 'build', 'homepage', 'bugs', 'license', 'kibana', 'author', 'scripts', 'repository', 'engines', 'resolutions']
+  }), null, 2) + '\n';
+}
 
 /***/ }),
-/* 15 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/dev-utils/target_node/stdio/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
-/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17);
-/** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
 
 
-var empty = {
-    closed: true,
-    next: function (value) { },
-    error: function (err) {
-        if (_config__WEBPACK_IMPORTED_MODULE_0__["config"].useDeprecatedSynchronousErrorHandling) {
-            throw err;
-        }
-        else {
-            Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_1__["hostReportError"])(err);
-        }
-    },
-    complete: function () { }
-};
-//# sourceMappingURL=Observer.js.map
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
+var _observe_lines = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/stdio/observe_lines.js");
 
-/***/ }),
-/* 16 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Object.keys(_observe_lines).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _observe_lines[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _observe_lines[key];
+    }
+  });
+});
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return config; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var _enable_super_gross_mode_that_will_cause_bad_things = false;
-var config = {
-    Promise: undefined,
-    set useDeprecatedSynchronousErrorHandling(value) {
-        if (value) {
-            var error = /*@__PURE__*/ new Error();
-            /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack);
-        }
-        else if (_enable_super_gross_mode_that_will_cause_bad_things) {
-            /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3');
-        }
-        _enable_super_gross_mode_that_will_cause_bad_things = value;
-    },
-    get useDeprecatedSynchronousErrorHandling() {
-        return _enable_super_gross_mode_that_will_cause_bad_things;
-    },
-};
-//# sourceMappingURL=config.js.map
+var _observe_readable = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/stdio/observe_readable.js");
 
+Object.keys(_observe_readable).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _observe_readable[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _observe_readable[key];
+    }
+  });
+});
 
 /***/ }),
-/* 17 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hostReportError", function() { return hostReportError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function hostReportError(err) {
-    setTimeout(function () { throw err; }, 0);
-}
-//# sourceMappingURL=hostReportError.js.map
+/***/ "../../node_modules/@kbn/dev-utils/target_node/stdio/observe_lines.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-/***/ }),
-/* 18 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return Subscription; });
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
-/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21);
-/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_UnsubscriptionError PURE_IMPORTS_END */
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.observeLines = observeLines;
 
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
+var _operators = __webpack_require__("../../node_modules/rxjs/dist/esm5/operators/index.js");
 
+var _observe_readable = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/stdio/observe_readable.js");
 
-var Subscription = /*@__PURE__*/ (function () {
-    function Subscription(unsubscribe) {
-        this.closed = false;
-        this._parentOrParents = null;
-        this._subscriptions = null;
-        if (unsubscribe) {
-            this._ctorUnsubscribe = true;
-            this._unsubscribe = unsubscribe;
-        }
-    }
-    Subscription.prototype.unsubscribe = function () {
-        var errors;
-        if (this.closed) {
-            return;
-        }
-        var _a = this, _parentOrParents = _a._parentOrParents, _ctorUnsubscribe = _a._ctorUnsubscribe, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
-        this.closed = true;
-        this._parentOrParents = null;
-        this._subscriptions = null;
-        if (_parentOrParents instanceof Subscription) {
-            _parentOrParents.remove(this);
-        }
-        else if (_parentOrParents !== null) {
-            for (var index = 0; index < _parentOrParents.length; ++index) {
-                var parent_1 = _parentOrParents[index];
-                parent_1.remove(this);
-            }
-        }
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(_unsubscribe)) {
-            if (_ctorUnsubscribe) {
-                this._unsubscribe = undefined;
-            }
-            try {
-                _unsubscribe.call(this);
-            }
-            catch (e) {
-                errors = e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"] ? flattenUnsubscriptionErrors(e.errors) : [e];
-            }
-        }
-        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(_subscriptions)) {
-            var index = -1;
-            var len = _subscriptions.length;
-            while (++index < len) {
-                var sub = _subscriptions[index];
-                if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_1__["isObject"])(sub)) {
-                    try {
-                        sub.unsubscribe();
-                    }
-                    catch (e) {
-                        errors = errors || [];
-                        if (e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) {
-                            errors = errors.concat(flattenUnsubscriptionErrors(e.errors));
-                        }
-                        else {
-                            errors.push(e);
-                        }
-                    }
-                }
-            }
-        }
-        if (errors) {
-            throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"](errors);
-        }
-    };
-    Subscription.prototype.add = function (teardown) {
-        var subscription = teardown;
-        if (!teardown) {
-            return Subscription.EMPTY;
-        }
-        switch (typeof teardown) {
-            case 'function':
-                subscription = new Subscription(teardown);
-            case 'object':
-                if (subscription === this || subscription.closed || typeof subscription.unsubscribe !== 'function') {
-                    return subscription;
-                }
-                else if (this.closed) {
-                    subscription.unsubscribe();
-                    return subscription;
-                }
-                else if (!(subscription instanceof Subscription)) {
-                    var tmp = subscription;
-                    subscription = new Subscription();
-                    subscription._subscriptions = [tmp];
-                }
-                break;
-            default: {
-                throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.');
-            }
-        }
-        var _parentOrParents = subscription._parentOrParents;
-        if (_parentOrParents === null) {
-            subscription._parentOrParents = this;
-        }
-        else if (_parentOrParents instanceof Subscription) {
-            if (_parentOrParents === this) {
-                return subscription;
-            }
-            subscription._parentOrParents = [_parentOrParents, this];
-        }
-        else if (_parentOrParents.indexOf(this) === -1) {
-            _parentOrParents.push(this);
-        }
-        else {
-            return subscription;
-        }
-        var subscriptions = this._subscriptions;
-        if (subscriptions === null) {
-            this._subscriptions = [subscription];
-        }
-        else {
-            subscriptions.push(subscription);
-        }
-        return subscription;
-    };
-    Subscription.prototype.remove = function (subscription) {
-        var subscriptions = this._subscriptions;
-        if (subscriptions) {
-            var subscriptionIndex = subscriptions.indexOf(subscription);
-            if (subscriptionIndex !== -1) {
-                subscriptions.splice(subscriptionIndex, 1);
-            }
-        }
-    };
-    Subscription.EMPTY = (function (empty) {
-        empty.closed = true;
-        return empty;
-    }(new Subscription()));
-    return Subscription;
-}());
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function flattenUnsubscriptionErrors(errors) {
-    return errors.reduce(function (errs, err) { return errs.concat((err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) ? err.errors : err); }, []);
-}
-//# sourceMappingURL=Subscription.js.map
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const SEP = /\r?\n/;
 
-/***/ }),
-/* 19 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ *  Creates an Observable from a Readable Stream that:
+ *   - splits data from `readable` into lines
+ *   - completes when `readable` emits "end"
+ *   - fails if `readable` emits "errors"
+ *
+ *  @param  {ReadableStream} readable
+ *  @return {Rx.Observable}
+ */
+function observeLines(readable) {
+  const done$ = (0, _observe_readable.observeReadable)(readable).pipe((0, _operators.share)());
+  const scan$ = Rx.fromEvent(readable, 'data').pipe((0, _operators.scan)(({
+    buffer
+  }, chunk) => {
+    buffer += chunk;
+    const lines = [];
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArray", function() { return isArray; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var isArray = /*@__PURE__*/ (function () { return Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); })();
-//# sourceMappingURL=isArray.js.map
+    while (true) {
+      const match = buffer.match(SEP);
 
+      if (!match || match.index === undefined) {
+        break;
+      }
 
-/***/ }),
-/* 20 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      lines.push(buffer.slice(0, match.index));
+      buffer = buffer.slice(match.index + match[0].length);
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObject", function() { return isObject; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isObject(x) {
-    return x !== null && typeof x === 'object';
+    return {
+      buffer,
+      lines
+    };
+  }, {
+    buffer: ''
+  }), // stop if done completes or errors
+  (0, _operators.takeUntil)(done$.pipe((0, _operators.materialize)())), (0, _operators.share)());
+  return Rx.merge( // use done$ to provide completion/errors
+  done$, // merge in the "lines" from each step
+  scan$.pipe((0, _operators.mergeMap)(({
+    lines
+  }) => lines || [])), // inject the "unsplit" data at the end
+  scan$.pipe((0, _operators.last)(), (0, _operators.mergeMap)(({
+    buffer
+  }) => buffer ? [buffer] : []), // if there were no lines, last() will error, so catch and complete
+  (0, _operators.catchError)(() => Rx.empty())));
 }
-//# sourceMappingURL=isObject.js.map
-
 
 /***/ }),
-/* 21 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return UnsubscriptionError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var UnsubscriptionErrorImpl = /*@__PURE__*/ (function () {
-    function UnsubscriptionErrorImpl(errors) {
-        Error.call(this);
-        this.message = errors ?
-            errors.length + " errors occurred during unsubscription:\n" + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n  ') : '';
-        this.name = 'UnsubscriptionError';
-        this.errors = errors;
-        return this;
-    }
-    UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return UnsubscriptionErrorImpl;
-})();
-var UnsubscriptionError = UnsubscriptionErrorImpl;
-//# sourceMappingURL=UnsubscriptionError.js.map
+/***/ "../../node_modules/@kbn/dev-utils/target_node/stdio/observe_readable.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-/***/ }),
-/* 22 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rxSubscriber", function() { return rxSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$rxSubscriber", function() { return $$rxSubscriber; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var rxSubscriber = /*@__PURE__*/ (function () {
-    return typeof Symbol === 'function'
-        ? /*@__PURE__*/ Symbol('rxSubscriber')
-        : '@@rxSubscriber_' + /*@__PURE__*/ Math.random();
-})();
-var $$rxSubscriber = rxSubscriber;
-//# sourceMappingURL=rxSubscriber.js.map
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.observeReadable = observeReadable;
 
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
-/***/ }),
-/* 23 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _operators = __webpack_require__("../../node_modules/rxjs/dist/esm5/operators/index.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; });
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(22);
-/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15);
-/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-function toSubscriber(nextOrObserver, error, complete) {
-    if (nextOrObserver) {
-        if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
-            return nextOrObserver;
-        }
-        if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) {
-            return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]();
-        }
-    }
-    if (!nextOrObserver && !error && !complete) {
-        return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]);
-    }
-    return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete);
+/**
+ *  Produces an Observable from a ReadableSteam that:
+ *   - completes on the first "end" event
+ *   - fails on the first "error" event
+ */
+function observeReadable(readable) {
+  return Rx.race(Rx.fromEvent(readable, 'end').pipe((0, _operators.first)(), (0, _operators.ignoreElements)()), Rx.fromEvent(readable, 'error').pipe((0, _operators.first)(), (0, _operators.mergeMap)(err => Rx.throwError(err))));
 }
-//# sourceMappingURL=toSubscriber.js.map
-
 
 /***/ }),
-/* 24 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return observable; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var observable = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })();
-//# sourceMappingURL=observable.js.map
-
-
-/***/ }),
-/* 25 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ "../../node_modules/@kbn/dev-utils/target_node/tooling_log/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return pipe; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipeFromArray", function() { return pipeFromArray; });
-/* harmony import */ var _identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
-/** PURE_IMPORTS_START _identity PURE_IMPORTS_END */
 
-function pipe() {
-    var fns = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        fns[_i] = arguments[_i];
-    }
-    return pipeFromArray(fns);
-}
-function pipeFromArray(fns) {
-    if (fns.length === 0) {
-        return _identity__WEBPACK_IMPORTED_MODULE_0__["identity"];
-    }
-    if (fns.length === 1) {
-        return fns[0];
-    }
-    return function piped(input) {
-        return fns.reduce(function (prev, fn) { return fn(prev); }, input);
-    };
-}
-//# sourceMappingURL=pipe.js.map
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "ToolingLog", {
+  enumerable: true,
+  get: function () {
+    return _tooling_log.ToolingLog;
+  }
+});
+Object.defineProperty(exports, "ToolingLogCollectingWriter", {
+  enumerable: true,
+  get: function () {
+    return _tooling_log_collecting_writer.ToolingLogCollectingWriter;
+  }
+});
+Object.defineProperty(exports, "ToolingLogTextWriter", {
+  enumerable: true,
+  get: function () {
+    return _tooling_log_text_writer.ToolingLogTextWriter;
+  }
+});
+Object.defineProperty(exports, "parseLogLevel", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.parseLogLevel;
+  }
+});
+Object.defineProperty(exports, "pickLevelFromFlags", {
+  enumerable: true,
+  get: function () {
+    return _log_levels.pickLevelFromFlags;
+  }
+});
+
+var _tooling_log = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log.js");
 
-/***/ }),
-/* 26 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _tooling_log_text_writer = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log_text_writer.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return identity; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function identity(x) {
-    return x;
-}
-//# sourceMappingURL=identity.js.map
+var _log_levels = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/log_levels.js");
 
+var _tooling_log_collecting_writer = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log_collecting_writer.js");
 
 /***/ }),
-/* 27 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return ConnectableObservable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connectableObservableDescriptor", function() { return connectableObservableDescriptor; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(18);
-/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(31);
-/** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */
 
+/***/ "../../node_modules/@kbn/dev-utils/target_node/tooling_log/log_levels.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LOG_LEVEL_FLAGS = exports.DEFAULT_LOG_LEVEL = void 0;
+exports.getLogLevelFlagsHelp = getLogLevelFlagsHelp;
+exports.parseLogLevel = parseLogLevel;
+exports.pickLevelFromFlags = pickLevelFromFlags;
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const LEVELS = ['silent', 'error', 'warning', 'success', 'info', 'debug', 'verbose'];
+const DEFAULT_LOG_LEVEL = 'info';
+exports.DEFAULT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
 
-var ConnectableObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableObservable, _super);
-    function ConnectableObservable(source, subjectFactory) {
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.subjectFactory = subjectFactory;
-        _this._refCount = 0;
-        _this._isComplete = false;
-        return _this;
-    }
-    ConnectableObservable.prototype._subscribe = function (subscriber) {
-        return this.getSubject().subscribe(subscriber);
-    };
-    ConnectableObservable.prototype.getSubject = function () {
-        var subject = this._subject;
-        if (!subject || subject.isStopped) {
-            this._subject = this.subjectFactory();
-        }
-        return this._subject;
-    };
-    ConnectableObservable.prototype.connect = function () {
-        var connection = this._connection;
-        if (!connection) {
-            this._isComplete = false;
-            connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"]();
-            connection.add(this.source
-                .subscribe(new ConnectableSubscriber(this.getSubject(), this)));
-            if (connection.closed) {
-                this._connection = null;
-                connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY;
-            }
-        }
-        return connection;
-    };
-    ConnectableObservable.prototype.refCount = function () {
-        return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_5__["refCount"])()(this);
-    };
-    return ConnectableObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
+function pickLevelFromFlags(flags, options = {}) {
+  if (flags.verbose) return 'verbose';
+  if (flags.debug) return 'debug';
+  if (flags.info) return 'info';
+  if (flags.quiet) return 'error';
+  if (flags.silent) return 'silent';
+  return options.default || DEFAULT_LOG_LEVEL;
+}
 
-var connectableObservableDescriptor = /*@__PURE__*/ (function () {
-    var connectableProto = ConnectableObservable.prototype;
-    return {
-        operator: { value: null },
-        _refCount: { value: 0, writable: true },
-        _subject: { value: null, writable: true },
-        _connection: { value: null, writable: true },
-        _subscribe: { value: connectableProto._subscribe },
-        _isComplete: { value: connectableProto._isComplete, writable: true },
-        getSubject: { value: connectableProto.getSubject },
-        connect: { value: connectableProto.connect },
-        refCount: { value: connectableProto.refCount }
-    };
-})();
-var ConnectableSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableSubscriber, _super);
-    function ConnectableSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    ConnectableSubscriber.prototype._error = function (err) {
-        this._unsubscribe();
-        _super.prototype._error.call(this, err);
-    };
-    ConnectableSubscriber.prototype._complete = function () {
-        this.connectable._isComplete = true;
-        this._unsubscribe();
-        _super.prototype._complete.call(this);
-    };
-    ConnectableSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (connectable) {
-            this.connectable = null;
-            var connection = connectable._connection;
-            connectable._refCount = 0;
-            connectable._subject = null;
-            connectable._connection = null;
-            if (connection) {
-                connection.unsubscribe();
-            }
-        }
-    };
-    return ConnectableSubscriber;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["SubjectSubscriber"]));
-var RefCountOperator = /*@__PURE__*/ (function () {
-    function RefCountOperator(connectable) {
-        this.connectable = connectable;
-    }
-    RefCountOperator.prototype.call = function (subscriber, source) {
-        var connectable = this.connectable;
-        connectable._refCount++;
-        var refCounter = new RefCountSubscriber(subscriber, connectable);
-        var subscription = source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            refCounter.connection = connectable.connect();
-        }
-        return subscription;
-    };
-    return RefCountOperator;
-}());
-var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super);
-    function RefCountSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    RefCountSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (!connectable) {
-            this.connection = null;
-            return;
-        }
-        this.connectable = null;
-        var refCount = connectable._refCount;
-        if (refCount <= 0) {
-            this.connection = null;
-            return;
-        }
-        connectable._refCount = refCount - 1;
-        if (refCount > 1) {
-            this.connection = null;
-            return;
-        }
-        var connection = this.connection;
-        var sharedConnection = connectable._connection;
-        this.connection = null;
-        if (sharedConnection && (!connection || sharedConnection === connection)) {
-            sharedConnection.unsubscribe();
-        }
-    };
-    return RefCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
-//# sourceMappingURL=ConnectableObservable.js.map
+const LOG_LEVEL_FLAGS = [{
+  name: 'verbose',
+  help: '--verbose, -v      Log verbosely'
+}, {
+  name: 'info',
+  help: "--info             Don't log debug messages"
+}, {
+  name: 'debug',
+  help: '--debug            Log debug messages (less than verbose)'
+}, {
+  name: 'quiet',
+  help: '--quiet            Only log errors'
+}, {
+  name: 'silent',
+  help: "--silent           Don't log anything"
+}];
+exports.LOG_LEVEL_FLAGS = LOG_LEVEL_FLAGS;
 
+function getLogLevelFlagsHelp(defaultLogLevel = DEFAULT_LOG_LEVEL) {
+  return LOG_LEVEL_FLAGS.filter(({
+    name
+  }) => name !== defaultLogLevel).map(({
+    help
+  }) => help).join('\n');
+}
 
-/***/ }),
-/* 28 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function parseLogLevel(name) {
+  const i = LEVELS.indexOf(name);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscriber", function() { return SubjectSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnonymousSubject", function() { return AnonymousSubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29);
-/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
-/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(22);
-/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */
+  if (i === -1) {
+    const msg = `Invalid log level "${name}" ` + `(expected one of ${LEVELS.join(',')})`;
+    throw new Error(msg);
+  }
 
+  const flags = {};
+  LEVELS.forEach((level, levelI) => {
+    flags[level] = levelI <= i;
+  });
+  return {
+    name,
+    flags: flags
+  };
+}
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-var SubjectSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscriber, _super);
-    function SubjectSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        return _this;
-    }
-    return SubjectSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ToolingLog = void 0;
 
-var Subject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subject, _super);
-    function Subject() {
-        var _this = _super.call(this) || this;
-        _this.observers = [];
-        _this.closed = false;
-        _this.isStopped = false;
-        _this.hasError = false;
-        _this.thrownError = null;
-        return _this;
-    }
-    Subject.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__["rxSubscriber"]] = function () {
-        return new SubjectSubscriber(this);
-    };
-    Subject.prototype.lift = function (operator) {
-        var subject = new AnonymousSubject(this, this);
-        subject.operator = operator;
-        return subject;
-    };
-    Subject.prototype.next = function (value) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        if (!this.isStopped) {
-            var observers = this.observers;
-            var len = observers.length;
-            var copy = observers.slice();
-            for (var i = 0; i < len; i++) {
-                copy[i].next(value);
-            }
-        }
-    };
-    Subject.prototype.error = function (err) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        this.hasError = true;
-        this.thrownError = err;
-        this.isStopped = true;
-        var observers = this.observers;
-        var len = observers.length;
-        var copy = observers.slice();
-        for (var i = 0; i < len; i++) {
-            copy[i].error(err);
-        }
-        this.observers.length = 0;
-    };
-    Subject.prototype.complete = function () {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        this.isStopped = true;
-        var observers = this.observers;
-        var len = observers.length;
-        var copy = observers.slice();
-        for (var i = 0; i < len; i++) {
-            copy[i].complete();
-        }
-        this.observers.length = 0;
-    };
-    Subject.prototype.unsubscribe = function () {
-        this.isStopped = true;
-        this.closed = true;
-        this.observers = null;
-    };
-    Subject.prototype._trySubscribe = function (subscriber) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        else {
-            return _super.prototype._trySubscribe.call(this, subscriber);
-        }
-    };
-    Subject.prototype._subscribe = function (subscriber) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        else if (this.hasError) {
-            subscriber.error(this.thrownError);
-            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-        else if (this.isStopped) {
-            subscriber.complete();
-            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-        else {
-            this.observers.push(subscriber);
-            return new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__["SubjectSubscription"](this, subscriber);
-        }
-    };
-    Subject.prototype.asObservable = function () {
-        var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]();
-        observable.source = this;
-        return observable;
-    };
-    Subject.create = function (destination, source) {
-        return new AnonymousSubject(destination, source);
-    };
-    return Subject;
-}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("../../node_modules/@babel/runtime/helpers/defineProperty.js"));
 
-var AnonymousSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnonymousSubject, _super);
-    function AnonymousSubject(destination, source) {
-        var _this = _super.call(this) || this;
-        _this.destination = destination;
-        _this.source = source;
-        return _this;
-    }
-    AnonymousSubject.prototype.next = function (value) {
-        var destination = this.destination;
-        if (destination && destination.next) {
-            destination.next(value);
-        }
-    };
-    AnonymousSubject.prototype.error = function (err) {
-        var destination = this.destination;
-        if (destination && destination.error) {
-            this.destination.error(err);
-        }
-    };
-    AnonymousSubject.prototype.complete = function () {
-        var destination = this.destination;
-        if (destination && destination.complete) {
-            this.destination.complete();
-        }
-    };
-    AnonymousSubject.prototype._subscribe = function (subscriber) {
-        var source = this.source;
-        if (source) {
-            return this.source.subscribe(subscriber);
-        }
-        else {
-            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-    };
-    return AnonymousSubject;
-}(Subject));
+var Rx = _interopRequireWildcard(__webpack_require__("../../node_modules/rxjs/dist/esm5/index.js"));
 
-//# sourceMappingURL=Subject.js.map
+var _tooling_log_text_writer = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log_text_writer.js");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-/***/ }),
-/* 29 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () {
-    function ObjectUnsubscribedErrorImpl() {
-        Error.call(this);
-        this.message = 'object unsubscribed';
-        this.name = 'ObjectUnsubscribedError';
-        return this;
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+class ToolingLog {
+  constructor(writerConfig, options) {
+    (0, _defineProperty2.default)(this, "indentWidth$", void 0);
+    (0, _defineProperty2.default)(this, "writers$", void 0);
+    (0, _defineProperty2.default)(this, "written$", void 0);
+    (0, _defineProperty2.default)(this, "type", void 0);
+    this.indentWidth$ = options !== null && options !== void 0 && options.parent ? options.parent.indentWidth$ : new Rx.BehaviorSubject(0);
+    this.writers$ = options !== null && options !== void 0 && options.parent ? options.parent.writers$ : new Rx.BehaviorSubject([]);
+
+    if (!(options !== null && options !== void 0 && options.parent) && writerConfig) {
+      this.writers$.next([new _tooling_log_text_writer.ToolingLogTextWriter(writerConfig)]);
     }
-    ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return ObjectUnsubscribedErrorImpl;
-})();
-var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
-//# sourceMappingURL=ObjectUnsubscribedError.js.map
 
+    this.written$ = options !== null && options !== void 0 && options.parent ? options.parent.written$ : new Rx.Subject();
+    this.type = options === null || options === void 0 ? void 0 : options.type;
+  }
+  /**
+   * Get the current indentation level of the ToolingLog
+   */
 
-/***/ }),
-/* 30 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
+  getIndent() {
+    return this.indentWidth$.getValue();
+  }
+  /**
+   * Indent the output of the ToolingLog by some character (4 is a good choice usually).
+   *
+   * If provided, the `block` function will be executed and once it's promise is resolved
+   * or rejected the indentation will be reset to its original state.
+   *
+   * @param delta the number of spaces to increase/decrease the indentation
+   * @param block a function to run and reset any indentation changes after
+   */
 
 
-var SubjectSubscription = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscription, _super);
-    function SubjectSubscription(subject, subscriber) {
-        var _this = _super.call(this) || this;
-        _this.subject = subject;
-        _this.subscriber = subscriber;
-        _this.closed = false;
-        return _this;
+  indent(delta = 0, block) {
+    const originalWidth = this.indentWidth$.getValue();
+    this.indentWidth$.next(Math.max(originalWidth + delta, 0));
+
+    if (!block) {
+      return;
     }
-    SubjectSubscription.prototype.unsubscribe = function () {
-        if (this.closed) {
-            return;
-        }
-        this.closed = true;
-        var subject = this.subject;
-        var observers = subject.observers;
-        this.subject = null;
-        if (!observers || observers.length === 0 || subject.isStopped || subject.closed) {
-            return;
-        }
-        var subscriberIndex = observers.indexOf(this.subscriber);
-        if (subscriberIndex !== -1) {
-            observers.splice(subscriberIndex, 1);
+
+    const maybePromise = block();
+
+    if (typeof maybePromise === 'object' && maybePromise && typeof maybePromise.then === 'function') {
+      return (async () => {
+        try {
+          return await maybePromise;
+        } finally {
+          this.indentWidth$.next(originalWidth);
         }
-    };
-    return SubjectSubscription;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]));
+      })();
+    }
 
-//# sourceMappingURL=SubjectSubscription.js.map
+    this.indentWidth$.next(originalWidth);
+    return maybePromise;
+  }
 
+  verbose(...args) {
+    this.sendToWriters('verbose', args);
+  }
 
-/***/ }),
-/* 31 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  debug(...args) {
+    this.sendToWriters('debug', args);
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return refCount; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  info(...args) {
+    this.sendToWriters('info', args);
+  }
 
+  success(...args) {
+    this.sendToWriters('success', args);
+  }
 
-function refCount() {
-    return function refCountOperatorFunction(source) {
-        return source.lift(new RefCountOperator(source));
-    };
-}
-var RefCountOperator = /*@__PURE__*/ (function () {
-    function RefCountOperator(connectable) {
-        this.connectable = connectable;
-    }
-    RefCountOperator.prototype.call = function (subscriber, source) {
-        var connectable = this.connectable;
-        connectable._refCount++;
-        var refCounter = new RefCountSubscriber(subscriber, connectable);
-        var subscription = source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            refCounter.connection = connectable.connect();
-        }
-        return subscription;
-    };
-    return RefCountOperator;
-}());
-var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super);
-    function RefCountSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    RefCountSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (!connectable) {
-            this.connection = null;
-            return;
-        }
-        this.connectable = null;
-        var refCount = connectable._refCount;
-        if (refCount <= 0) {
-            this.connection = null;
-            return;
-        }
-        connectable._refCount = refCount - 1;
-        if (refCount > 1) {
-            this.connection = null;
-            return;
-        }
-        var connection = this.connection;
-        var sharedConnection = connectable._connection;
-        this.connection = null;
-        if (sharedConnection && (!connection || sharedConnection === connection)) {
-            sharedConnection.unsubscribe();
-        }
-    };
-    return RefCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=refCount.js.map
+  warning(...args) {
+    this.sendToWriters('warning', args);
+  }
 
+  error(error) {
+    this.sendToWriters('error', [error]);
+  }
 
-/***/ }),
-/* 32 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  write(...args) {
+    this.sendToWriters('write', args);
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return groupBy; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return GroupedObservable; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */
+  getWriters() {
+    return [...this.writers$.getValue()];
+  }
 
+  setWriters(writers) {
+    this.writers$.next([...writers]);
+  }
 
+  getWritten$() {
+    return this.written$.asObservable();
+  }
+  /**
+   * Create a new ToolingLog which sets a different "type", allowing messages to be filtered out by "source"
+   * @param type A string that will be passed along with messages from this logger which can be used to filter messages with `ignoreSources`
+   */
 
 
+  withType(type) {
+    return new ToolingLog(undefined, {
+      type,
+      parent: this
+    });
+  }
 
-function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) {
-    return function (source) {
-        return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector));
-    };
-}
-var GroupByOperator = /*@__PURE__*/ (function () {
-    function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) {
-        this.keySelector = keySelector;
-        this.elementSelector = elementSelector;
-        this.durationSelector = durationSelector;
-        this.subjectSelector = subjectSelector;
-    }
-    GroupByOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector));
-    };
-    return GroupByOperator;
-}());
-var GroupBySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupBySubscriber, _super);
-    function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.elementSelector = elementSelector;
-        _this.durationSelector = durationSelector;
-        _this.subjectSelector = subjectSelector;
-        _this.groups = null;
-        _this.attemptedToUnsubscribe = false;
-        _this.count = 0;
-        return _this;
-    }
-    GroupBySubscriber.prototype._next = function (value) {
-        var key;
-        try {
-            key = this.keySelector(value);
-        }
-        catch (err) {
-            this.error(err);
-            return;
-        }
-        this._group(value, key);
-    };
-    GroupBySubscriber.prototype._group = function (value, key) {
-        var groups = this.groups;
-        if (!groups) {
-            groups = this.groups = new Map();
-        }
-        var group = groups.get(key);
-        var element;
-        if (this.elementSelector) {
-            try {
-                element = this.elementSelector(value);
-            }
-            catch (err) {
-                this.error(err);
-            }
-        }
-        else {
-            element = value;
-        }
-        if (!group) {
-            group = (this.subjectSelector ? this.subjectSelector() : new _Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]());
-            groups.set(key, group);
-            var groupedObservable = new GroupedObservable(key, group, this);
-            this.destination.next(groupedObservable);
-            if (this.durationSelector) {
-                var duration = void 0;
-                try {
-                    duration = this.durationSelector(new GroupedObservable(key, group));
-                }
-                catch (err) {
-                    this.error(err);
-                    return;
-                }
-                this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this)));
-            }
-        }
-        if (!group.closed) {
-            group.next(element);
-        }
-    };
-    GroupBySubscriber.prototype._error = function (err) {
-        var groups = this.groups;
-        if (groups) {
-            groups.forEach(function (group, key) {
-                group.error(err);
-            });
-            groups.clear();
-        }
-        this.destination.error(err);
-    };
-    GroupBySubscriber.prototype._complete = function () {
-        var groups = this.groups;
-        if (groups) {
-            groups.forEach(function (group, key) {
-                group.complete();
-            });
-            groups.clear();
-        }
-        this.destination.complete();
-    };
-    GroupBySubscriber.prototype.removeGroup = function (key) {
-        this.groups.delete(key);
-    };
-    GroupBySubscriber.prototype.unsubscribe = function () {
-        if (!this.closed) {
-            this.attemptedToUnsubscribe = true;
-            if (this.count === 0) {
-                _super.prototype.unsubscribe.call(this);
-            }
-        }
-    };
-    return GroupBySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupDurationSubscriber, _super);
-    function GroupDurationSubscriber(key, group, parent) {
-        var _this = _super.call(this, group) || this;
-        _this.key = key;
-        _this.group = group;
-        _this.parent = parent;
-        return _this;
-    }
-    GroupDurationSubscriber.prototype._next = function (value) {
-        this.complete();
-    };
-    GroupDurationSubscriber.prototype._unsubscribe = function () {
-        var _a = this, parent = _a.parent, key = _a.key;
-        this.key = this.parent = null;
-        if (parent) {
-            parent.removeGroup(key);
-        }
+  sendToWriters(type, args) {
+    const indent = this.indentWidth$.getValue();
+    const writers = this.writers$.getValue();
+    const msg = {
+      type,
+      indent,
+      source: this.type,
+      args
     };
-    return GroupDurationSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-var GroupedObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupedObservable, _super);
-    function GroupedObservable(key, groupSubject, refCountSubscription) {
-        var _this = _super.call(this) || this;
-        _this.key = key;
-        _this.groupSubject = groupSubject;
-        _this.refCountSubscription = refCountSubscription;
-        return _this;
+    let written = false;
+
+    for (const writer of writers) {
+      if (writer.write(msg)) {
+        written = true;
+      }
     }
-    GroupedObservable.prototype._subscribe = function (subscriber) {
-        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-        var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject;
-        if (refCountSubscription && !refCountSubscription.closed) {
-            subscription.add(new InnerRefCountSubscription(refCountSubscription));
-        }
-        subscription.add(groupSubject.subscribe(subscriber));
-        return subscription;
-    };
-    return GroupedObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"]));
 
-var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerRefCountSubscription, _super);
-    function InnerRefCountSubscription(parent) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        parent.count++;
-        return _this;
+    if (written) {
+      this.written$.next(msg);
     }
-    InnerRefCountSubscription.prototype.unsubscribe = function () {
-        var parent = this.parent;
-        if (!parent.closed && !this.closed) {
-            _super.prototype.unsubscribe.call(this);
-            parent.count -= 1;
-            if (parent.count === 0 && parent.attemptedToUnsubscribe) {
-                parent.unsubscribe();
-            }
-        }
-    };
-    return InnerRefCountSubscription;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]));
-//# sourceMappingURL=groupBy.js.map
+  }
+
+}
 
+exports.ToolingLog = ToolingLog;
 
 /***/ }),
-/* 33 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log_collecting_writer.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return BehaviorSubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-var BehaviorSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BehaviorSubject, _super);
-    function BehaviorSubject(_value) {
-        var _this = _super.call(this) || this;
-        _this._value = _value;
-        return _this;
-    }
-    Object.defineProperty(BehaviorSubject.prototype, "value", {
-        get: function () {
-            return this.getValue();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    BehaviorSubject.prototype._subscribe = function (subscriber) {
-        var subscription = _super.prototype._subscribe.call(this, subscriber);
-        if (subscription && !subscription.closed) {
-            subscriber.next(this._value);
-        }
-        return subscription;
-    };
-    BehaviorSubject.prototype.getValue = function () {
-        if (this.hasError) {
-            throw this.thrownError;
-        }
-        else if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__["ObjectUnsubscribedError"]();
-        }
-        else {
-            return this._value;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ToolingLogCollectingWriter = void 0;
+
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("../../node_modules/@babel/runtime/helpers/defineProperty.js"));
+
+var _tooling_log_text_writer = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log_text_writer.js");
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+class ToolingLogCollectingWriter extends _tooling_log_text_writer.ToolingLogTextWriter {
+  constructor(level = 'verbose') {
+    super({
+      level,
+      writeTo: {
+        write: msg => {
+          // trim trailing new line
+          this.messages.push(msg.slice(0, -1));
         }
-    };
-    BehaviorSubject.prototype.next = function (value) {
-        _super.prototype.next.call(this, this._value = value);
-    };
-    return BehaviorSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+      }
+    });
+    (0, _defineProperty2.default)(this, "messages", []);
+  }
+  /**
+   * Called by ToolingLog, extends messages with the source if message includes one.
+   */
 
-//# sourceMappingURL=BehaviorSubject.js.map
 
+  write(msg) {
+    if (msg.source) {
+      return super.write({ ...msg,
+        args: [`source[${msg.source}]`, ...msg.args]
+      });
+    }
 
-/***/ }),
-/* 34 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    return super.write(msg);
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return ReplaySubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18);
-/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(29);
-/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(30);
-/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */
+}
 
+exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter;
 
+/***/ }),
 
+/***/ "../../node_modules/@kbn/dev-utils/target_node/tooling_log/tooling_log_text_writer.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-var ReplaySubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ReplaySubject, _super);
-    function ReplaySubject(bufferSize, windowTime, scheduler) {
-        if (bufferSize === void 0) {
-            bufferSize = Number.POSITIVE_INFINITY;
-        }
-        if (windowTime === void 0) {
-            windowTime = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this) || this;
-        _this.scheduler = scheduler;
-        _this._events = [];
-        _this._infiniteTimeWindow = false;
-        _this._bufferSize = bufferSize < 1 ? 1 : bufferSize;
-        _this._windowTime = windowTime < 1 ? 1 : windowTime;
-        if (windowTime === Number.POSITIVE_INFINITY) {
-            _this._infiniteTimeWindow = true;
-            _this.next = _this.nextInfiniteTimeWindow;
-        }
-        else {
-            _this.next = _this.nextTimeWindow;
-        }
-        return _this;
-    }
-    ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) {
-        if (!this.isStopped) {
-            var _events = this._events;
-            _events.push(value);
-            if (_events.length > this._bufferSize) {
-                _events.shift();
-            }
-        }
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype.nextTimeWindow = function (value) {
-        if (!this.isStopped) {
-            this._events.push(new ReplayEvent(this._getNow(), value));
-            this._trimBufferThenGetEvents();
-        }
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype._subscribe = function (subscriber) {
-        var _infiniteTimeWindow = this._infiniteTimeWindow;
-        var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents();
-        var scheduler = this.scheduler;
-        var len = _events.length;
-        var subscription;
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__["ObjectUnsubscribedError"]();
-        }
-        else if (this.isStopped || this.hasError) {
-            subscription = _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-        else {
-            this.observers.push(subscriber);
-            subscription = new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__["SubjectSubscription"](this, subscriber);
-        }
-        if (scheduler) {
-            subscriber.add(subscriber = new _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__["ObserveOnSubscriber"](subscriber, scheduler));
-        }
-        if (_infiniteTimeWindow) {
-            for (var i = 0; i < len && !subscriber.closed; i++) {
-                subscriber.next(_events[i]);
-            }
-        }
-        else {
-            for (var i = 0; i < len && !subscriber.closed; i++) {
-                subscriber.next(_events[i].value);
-            }
-        }
-        if (this.hasError) {
-            subscriber.error(this.thrownError);
-        }
-        else if (this.isStopped) {
-            subscriber.complete();
-        }
-        return subscription;
-    };
-    ReplaySubject.prototype._getNow = function () {
-        return (this.scheduler || _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__["queue"]).now();
-    };
-    ReplaySubject.prototype._trimBufferThenGetEvents = function () {
-        var now = this._getNow();
-        var _bufferSize = this._bufferSize;
-        var _windowTime = this._windowTime;
-        var _events = this._events;
-        var eventsCount = _events.length;
-        var spliceCount = 0;
-        while (spliceCount < eventsCount) {
-            if ((now - _events[spliceCount].time) < _windowTime) {
-                break;
-            }
-            spliceCount++;
-        }
-        if (eventsCount > _bufferSize) {
-            spliceCount = Math.max(spliceCount, eventsCount - _bufferSize);
-        }
-        if (spliceCount > 0) {
-            _events.splice(0, spliceCount);
-        }
-        return _events;
-    };
-    return ReplaySubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
-
-var ReplayEvent = /*@__PURE__*/ (function () {
-    function ReplayEvent(time, value) {
-        this.time = time;
-        this.value = value;
-    }
-    return ReplayEvent;
-}());
-//# sourceMappingURL=ReplaySubject.js.map
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ToolingLogTextWriter = void 0;
 
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("../../node_modules/@babel/runtime/helpers/defineProperty.js"));
 
-/***/ }),
-/* 35 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _util = __webpack_require__("util");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return queueScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return queue; });
-/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36);
-/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39);
-/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */
+var _chalk = _interopRequireDefault(__webpack_require__("../../node_modules/chalk/source/index.js"));
 
+var _log_levels = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/log_levels.js");
 
-var queueScheduler = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["QueueScheduler"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__["QueueAction"]);
-var queue = queueScheduler;
-//# sourceMappingURL=queue.js.map
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+const {
+  magentaBright,
+  yellow,
+  red,
+  blue,
+  green,
+  dim
+} = _chalk.default;
+const PREFIX_INDENT = ' '.repeat(6);
+const MSG_PREFIXES = {
+  verbose: ` ${magentaBright('sill')} `,
+  debug: ` ${dim('debg')} `,
+  info: ` ${blue('info')} `,
+  success: ` ${green('succ')} `,
+  warning: ` ${yellow('warn')} `,
+  error: `${red('ERROR')} `
+};
 
+const has = (obj, key) => obj.hasOwnProperty(key);
 
-/***/ }),
-/* 36 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function shouldWriteType(level, type) {
+  if (type === 'write') {
+    return level.name !== 'silent';
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueAction", function() { return QueueAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37);
-/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+  return Boolean(level.flags[type === 'success' ? 'info' : type]);
+}
 
+function stringifyError(error) {
+  if (typeof error !== 'string' && !(error instanceof Error)) {
+    error = new Error(`"${error}" thrown`);
+  }
 
-var QueueAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueAction, _super);
-    function QueueAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    QueueAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay > 0) {
-            return _super.prototype.schedule.call(this, state, delay);
-        }
-        this.delay = delay;
-        this.state = state;
-        this.scheduler.flush(this);
-        return this;
-    };
-    QueueAction.prototype.execute = function (state, delay) {
-        return (delay > 0 || this.closed) ?
-            _super.prototype.execute.call(this, state, delay) :
-            this._execute(state, delay);
-    };
-    QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        return scheduler.flush(this);
-    };
-    return QueueAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+  if (typeof error === 'string') {
+    return error;
+  }
 
-//# sourceMappingURL=QueueAction.js.map
+  return error.stack || error.message || error;
+}
 
+class ToolingLogTextWriter {
+  constructor(config) {
+    (0, _defineProperty2.default)(this, "level", void 0);
+    (0, _defineProperty2.default)(this, "writeTo", void 0);
+    (0, _defineProperty2.default)(this, "ignoreSources", void 0);
+    this.level = (0, _log_levels.parseLogLevel)(config.level);
+    this.writeTo = config.writeTo;
+    this.ignoreSources = config.ignoreSources;
 
-/***/ }),
-/* 37 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (!this.writeTo || typeof this.writeTo.write !== 'function') {
+      throw new Error('ToolingLogTextWriter requires the `writeTo` option be set to a stream (like process.stdout)');
+    }
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncAction", function() { return AsyncAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38);
-/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */
+  write(msg) {
+    if (!shouldWriteType(this.level, msg.type)) {
+      return false;
+    }
 
+    if (this.ignoreSources && msg.source && this.ignoreSources.includes(msg.source)) {
+      if (msg.type === 'write') {
+        const txt = (0, _util.format)(msg.args[0], ...msg.args.slice(1)); // Ensure that Elasticsearch deprecation log messages from Kibana aren't ignored
 
-var AsyncAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncAction, _super);
-    function AsyncAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.pending = false;
-        return _this;
-    }
-    AsyncAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (this.closed) {
-            return this;
-        }
-        this.state = state;
-        var id = this.id;
-        var scheduler = this.scheduler;
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, delay);
-        }
-        this.pending = true;
-        this.delay = delay;
-        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
-        return this;
-    };
-    AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return setInterval(scheduler.flush.bind(scheduler, this), delay);
-    };
-    AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && this.delay === delay && this.pending === false) {
-            return id;
-        }
-        clearInterval(id);
-        return undefined;
-    };
-    AsyncAction.prototype.execute = function (state, delay) {
-        if (this.closed) {
-            return new Error('executing a cancelled action');
-        }
-        this.pending = false;
-        var error = this._execute(state, delay);
-        if (error) {
-            return error;
-        }
-        else if (this.pending === false && this.id != null) {
-            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
-        }
-    };
-    AsyncAction.prototype._execute = function (state, delay) {
-        var errored = false;
-        var errorValue = undefined;
-        try {
-            this.work(state);
-        }
-        catch (e) {
-            errored = true;
-            errorValue = !!e && e || new Error(e);
-        }
-        if (errored) {
-            this.unsubscribe();
-            return errorValue;
-        }
-    };
-    AsyncAction.prototype._unsubscribe = function () {
-        var id = this.id;
-        var scheduler = this.scheduler;
-        var actions = scheduler.actions;
-        var index = actions.indexOf(this);
-        this.work = null;
-        this.state = null;
-        this.pending = false;
-        this.scheduler = null;
-        if (index !== -1) {
-            actions.splice(index, 1);
-        }
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, null);
+        if (!/elasticsearch\.deprecation/.test(txt)) {
+          return false;
         }
-        this.delay = null;
-    };
-    return AsyncAction;
-}(_Action__WEBPACK_IMPORTED_MODULE_1__["Action"]));
-
-//# sourceMappingURL=AsyncAction.js.map
+      } else {
+        return false;
+      }
+    }
 
+    const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
+    ToolingLogTextWriter.write(this.writeTo, prefix, msg);
+    return true;
+  }
 
-/***/ }),
-/* 38 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  static write(writeTo, prefix, msg) {
+    const txt = msg.type === 'error' ? stringifyError(msg.args[0]) : (0, _util.format)(msg.args[0], ...msg.args.slice(1));
+    (prefix + txt).split('\n').forEach((line, i) => {
+      let lineIndent = '';
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Action", function() { return Action; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
+      if (msg.indent > 0) {
+        // if we are indenting write some spaces followed by a symbol
+        lineIndent += ' '.repeat(msg.indent - 1);
+        lineIndent += line.startsWith('-') ? '└' : '│';
+      }
 
+      if (line && prefix && i > 0) {
+        // apply additional indentation to lines after
+        // the first if this message gets a prefix
+        lineIndent += PREFIX_INDENT;
+      }
 
-var Action = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Action, _super);
-    function Action(scheduler, work) {
-        return _super.call(this) || this;
-    }
-    Action.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return this;
-    };
-    return Action;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]));
+      writeTo.write(`${lineIndent}${line}\n`);
+    });
+  }
 
-//# sourceMappingURL=Action.js.map
+}
 
+exports.ToolingLogTextWriter = ToolingLogTextWriter;
 
 /***/ }),
-/* 39 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueScheduler", function() { return QueueScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(40);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
 
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var QueueScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueScheduler, _super);
-    function QueueScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return QueueScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
+"use strict";
 
-//# sourceMappingURL=QueueScheduler.js.map
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-/***/ }),
-/* 40 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _parse_kibana_platform_plugin = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/parse_kibana_platform_plugin.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncScheduler", function() { return AsyncScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(41);
-/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */
+Object.keys(_parse_kibana_platform_plugin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _parse_kibana_platform_plugin[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _parse_kibana_platform_plugin[key];
+    }
+  });
+});
 
+var _plugin_search_paths = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/plugin_search_paths.js");
 
-var AsyncScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncScheduler, _super);
-    function AsyncScheduler(SchedulerAction, now) {
-        if (now === void 0) {
-            now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"].now;
-        }
-        var _this = _super.call(this, SchedulerAction, function () {
-            if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) {
-                return AsyncScheduler.delegate.now();
-            }
-            else {
-                return now();
-            }
-        }) || this;
-        _this.actions = [];
-        _this.active = false;
-        _this.scheduled = undefined;
-        return _this;
+Object.keys(_plugin_search_paths).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _plugin_search_paths[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugin_search_paths[key];
     }
-    AsyncScheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) {
-            return AsyncScheduler.delegate.schedule(work, delay, state);
-        }
-        else {
-            return _super.prototype.schedule.call(this, work, delay, state);
-        }
-    };
-    AsyncScheduler.prototype.flush = function (action) {
-        var actions = this.actions;
-        if (this.active) {
-            actions.push(action);
-            return;
-        }
-        var error;
-        this.active = true;
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (action = actions.shift());
-        this.active = false;
-        if (error) {
-            while (action = actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsyncScheduler;
-}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"]));
+  });
+});
 
-//# sourceMappingURL=AsyncScheduler.js.map
+var _simple_kibana_platform_plugin_discovery = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/simple_kibana_platform_plugin_discovery.js");
 
+Object.keys(_simple_kibana_platform_plugin_discovery).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _simple_kibana_platform_plugin_discovery[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _simple_kibana_platform_plugin_discovery[key];
+    }
+  });
+});
 
 /***/ }),
-/* 41 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/parse_kibana_platform_plugin.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return Scheduler; });
-var Scheduler = /*@__PURE__*/ (function () {
-    function Scheduler(SchedulerAction, now) {
-        if (now === void 0) {
-            now = Scheduler.now;
-        }
-        this.SchedulerAction = SchedulerAction;
-        this.now = now;
-    }
-    Scheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return new this.SchedulerAction(this, work).schedule(state, delay);
-    };
-    Scheduler.now = function () { return Date.now(); };
-    return Scheduler;
-}());
 
-//# sourceMappingURL=Scheduler.js.map
 
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
-/***/ }),
-/* 42 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseKibanaPlatformPlugin = parseKibanaPlatformPlugin;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return observeOn; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnOperator", function() { return ObserveOnOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnSubscriber", function() { return ObserveOnSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnMessage", function() { return ObserveOnMessage; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(43);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
+var _path = _interopRequireDefault(__webpack_require__("path"));
+
+var _loadJsonFile = _interopRequireDefault(__webpack_require__("../../node_modules/load-json-file/index.js"));
 
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function isValidDepsDeclaration(input, type) {
+  if (typeof input === 'undefined') return [];
 
+  if (Array.isArray(input) && input.every(i => typeof i === 'string')) {
+    return input;
+  }
 
-function observeOn(scheduler, delay) {
-    if (delay === void 0) {
-        delay = 0;
-    }
-    return function observeOnOperatorFunction(source) {
-        return source.lift(new ObserveOnOperator(scheduler, delay));
-    };
+  throw new TypeError(`The "${type}" in plugin manifest should be an array of strings.`);
 }
-var ObserveOnOperator = /*@__PURE__*/ (function () {
-    function ObserveOnOperator(scheduler, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        this.scheduler = scheduler;
-        this.delay = delay;
-    }
-    ObserveOnOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay));
-    };
-    return ObserveOnOperator;
-}());
 
-var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObserveOnSubscriber, _super);
-    function ObserveOnSubscriber(destination, scheduler, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.scheduler = scheduler;
-        _this.delay = delay;
-        return _this;
-    }
-    ObserveOnSubscriber.dispatch = function (arg) {
-        var notification = arg.notification, destination = arg.destination;
-        notification.observe(destination);
-        this.unsubscribe();
-    };
-    ObserveOnSubscriber.prototype.scheduleMessage = function (notification) {
-        var destination = this.destination;
-        destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination)));
-    };
-    ObserveOnSubscriber.prototype._next = function (value) {
-        this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value));
-    };
-    ObserveOnSubscriber.prototype._error = function (err) {
-        this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err));
-        this.unsubscribe();
-    };
-    ObserveOnSubscriber.prototype._complete = function () {
-        this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete());
-        this.unsubscribe();
-    };
-    return ObserveOnSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+function parseKibanaPlatformPlugin(manifestPath) {
+  if (!_path.default.isAbsolute(manifestPath)) {
+    throw new TypeError('expected new platform manifest path to be absolute');
+  }
 
-var ObserveOnMessage = /*@__PURE__*/ (function () {
-    function ObserveOnMessage(notification, destination) {
-        this.notification = notification;
-        this.destination = destination;
-    }
-    return ObserveOnMessage;
-}());
+  const manifest = _loadJsonFile.default.sync(manifestPath);
 
-//# sourceMappingURL=observeOn.js.map
+  if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest)) {
+    throw new TypeError('expected new platform plugin manifest to be a JSON encoded object');
+  }
 
+  if (typeof manifest.id !== 'string') {
+    throw new TypeError('expected new platform plugin manifest to have a string id');
+  }
 
-/***/ }),
-/* 43 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (typeof manifest.version !== 'string') {
+    throw new TypeError('expected new platform plugin manifest to have a string version');
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return NotificationKind; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return Notification; });
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44);
-/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(45);
-/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(50);
-/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */
+  if (!manifest.owner || typeof manifest.owner.name !== 'string') {
+    throw new TypeError(`Expected plugin ${manifest.id} manifest to have an owner with name specified (${manifestPath})`);
+  }
 
+  return {
+    directory: _path.default.dirname(manifestPath),
+    manifestPath,
+    manifest: { ...manifest,
+      ui: !!manifest.ui,
+      server: !!manifest.server,
+      id: manifest.id,
+      version: manifest.version,
+      kibanaVersion: manifest.kibanaVersion || manifest.version,
+      serviceFolders: manifest.serviceFolders || [],
+      owner: manifest.owner,
+      description: manifest.description,
+      enabledOnAnonymousPages: Boolean(manifest.enabledOnAnonymousPages),
+      requiredPlugins: isValidDepsDeclaration(manifest.requiredPlugins, 'requiredPlugins'),
+      optionalPlugins: isValidDepsDeclaration(manifest.optionalPlugins, 'optionalPlugins'),
+      requiredBundles: isValidDepsDeclaration(manifest.requiredBundles, 'requiredBundles'),
+      extraPublicDirs: isValidDepsDeclaration(manifest.extraPublicDirs, 'extraPublicDirs')
+    }
+  };
+}
 
+/***/ }),
 
-var NotificationKind;
-/*@__PURE__*/ (function (NotificationKind) {
-    NotificationKind["NEXT"] = "N";
-    NotificationKind["ERROR"] = "E";
-    NotificationKind["COMPLETE"] = "C";
-})(NotificationKind || (NotificationKind = {}));
-var Notification = /*@__PURE__*/ (function () {
-    function Notification(kind, value, error) {
-        this.kind = kind;
-        this.value = value;
-        this.error = error;
-        this.hasValue = kind === 'N';
-    }
-    Notification.prototype.observe = function (observer) {
-        switch (this.kind) {
-            case 'N':
-                return observer.next && observer.next(this.value);
-            case 'E':
-                return observer.error && observer.error(this.error);
-            case 'C':
-                return observer.complete && observer.complete();
-        }
-    };
-    Notification.prototype.do = function (next, error, complete) {
-        var kind = this.kind;
-        switch (kind) {
-            case 'N':
-                return next && next(this.value);
-            case 'E':
-                return error && error(this.error);
-            case 'C':
-                return complete && complete();
-        }
-    };
-    Notification.prototype.accept = function (nextOrObserver, error, complete) {
-        if (nextOrObserver && typeof nextOrObserver.next === 'function') {
-            return this.observe(nextOrObserver);
-        }
-        else {
-            return this.do(nextOrObserver, error, complete);
-        }
-    };
-    Notification.prototype.toObservable = function () {
-        var kind = this.kind;
-        switch (kind) {
-            case 'N':
-                return Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__["of"])(this.value);
-            case 'E':
-                return Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__["throwError"])(this.error);
-            case 'C':
-                return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_0__["empty"])();
-        }
-        throw new Error('unexpected notification kind value');
-    };
-    Notification.createNext = function (value) {
-        if (typeof value !== 'undefined') {
-            return new Notification('N', value);
-        }
-        return Notification.undefinedValueNotification;
-    };
-    Notification.createError = function (err) {
-        return new Notification('E', undefined, err);
-    };
-    Notification.createComplete = function () {
-        return Notification.completeNotification;
-    };
-    Notification.completeNotification = new Notification('C');
-    Notification.undefinedValueNotification = new Notification('N', undefined);
-    return Notification;
-}());
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/plugin_search_paths.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-//# sourceMappingURL=Notification.js.map
+"use strict";
 
 
-/***/ }),
-/* 44 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPluginSearchPaths = getPluginSearchPaths;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return EMPTY; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+var _path = __webpack_require__("path");
 
-var EMPTY = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.complete(); });
-function empty(scheduler) {
-    return scheduler ? emptyScheduled(scheduler) : EMPTY;
-}
-function emptyScheduled(scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function getPluginSearchPaths({
+  rootDir,
+  oss,
+  examples,
+  testPlugins
+}) {
+  return [(0, _path.resolve)(rootDir, 'src', 'plugins'), ...(oss ? [] : [(0, _path.resolve)(rootDir, 'x-pack', 'plugins')]), (0, _path.resolve)(rootDir, 'plugins'), ...(examples ? [(0, _path.resolve)(rootDir, 'examples')] : []), ...(examples && !oss ? [(0, _path.resolve)(rootDir, 'x-pack', 'examples')] : []), (0, _path.resolve)(rootDir, '..', 'kibana-extra'), ...(testPlugins ? [(0, _path.resolve)(rootDir, 'test/analytics/__fixtures__/plugins'), (0, _path.resolve)(rootDir, 'test/plugin_functional/plugins'), (0, _path.resolve)(rootDir, 'test/interpreter_functional/plugins'), (0, _path.resolve)(rootDir, 'test/common/fixtures/plugins')] : []), ...(testPlugins && !oss ? [(0, _path.resolve)(rootDir, 'x-pack/test/plugin_functional/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/functional_with_es_ssl/fixtures/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/alerting_api_integration/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/plugin_api_integration/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/plugin_api_perf/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/licensing_plugin/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/usage_collection/plugins'), (0, _path.resolve)(rootDir, 'x-pack/test/security_functional/fixtures/common')] : [])];
 }
-//# sourceMappingURL=empty.js.map
-
 
 /***/ }),
-/* 45 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return of; });
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(46);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
-/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(49);
-/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_scheduled_scheduleArray PURE_IMPORTS_END */
+/***/ "../../node_modules/@kbn/plugin-discovery/target_node/simple_kibana_platform_plugin_discovery.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
-function of() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var scheduler = args[args.length - 1];
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(scheduler)) {
-        args.pop();
-        return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(args, scheduler);
-    }
-    else {
-        return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args);
-    }
-}
-//# sourceMappingURL=of.js.map
+var _interopRequireDefault = __webpack_require__("../../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.simpleKibanaPlatformPluginDiscovery = simpleKibanaPlatformPluginDiscovery;
 
-/***/ }),
-/* 46 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _path = _interopRequireDefault(__webpack_require__("path"));
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isScheduler", function() { return isScheduler; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isScheduler(value) {
-    return value && typeof value.schedule === 'function';
-}
-//# sourceMappingURL=isScheduler.js.map
+var _globby = _interopRequireDefault(__webpack_require__("../../node_modules/globby/index.js"));
 
+var _normalizePath = _interopRequireDefault(__webpack_require__("../../node_modules/normalize-path/index.js"));
 
-/***/ }),
-/* 47 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var _parse_kibana_platform_plugin = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/parse_kibana_platform_plugin.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromArray", function() { return fromArray; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
-/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(49);
-/** PURE_IMPORTS_START _Observable,_util_subscribeToArray,_scheduled_scheduleArray PURE_IMPORTS_END */
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
+/**
+ * Helper to find the new platform plugins.
+ */
+function simpleKibanaPlatformPluginDiscovery(scanDirs, pluginPaths) {
+  const patterns = Array.from(new Set([// find kibana.json files up to 5 levels within the scan dir
+  ...scanDirs.reduce((acc, dir) => [...acc, _path.default.resolve(dir, '*/kibana.json'), _path.default.resolve(dir, '*/*/kibana.json'), _path.default.resolve(dir, '*/*/*/kibana.json'), _path.default.resolve(dir, '*/*/*/*/kibana.json'), _path.default.resolve(dir, '*/*/*/*/*/kibana.json')], []), ...pluginPaths.map(path => _path.default.resolve(path, `kibana.json`))])).map(path => (0, _normalizePath.default)(path));
 
+  const manifestPaths = _globby.default.sync(patterns, {
+    absolute: true
+  }).map(path => // absolute paths returned from globby are using normalize or
+  // something so the path separators are `/` even on windows,
+  // Path.resolve solves this
+  _path.default.resolve(path));
 
-function fromArray(input, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(input));
-    }
-    else {
-        return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
-    }
+  return manifestPaths.map(_parse_kibana_platform_plugin.parseKibanaPlatformPlugin);
 }
-//# sourceMappingURL=fromArray.js.map
-
 
 /***/ }),
-/* 48 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/async/for-each.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToArray", function() { return subscribeToArray; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var subscribeToArray = function (array) {
-    return function (subscriber) {
-        for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) {
-            subscriber.next(array[i]);
-        }
-        subscriber.complete();
-    };
-};
-//# sourceMappingURL=subscribeToArray.js.map
 
 
-/***/ }),
-/* 49 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleArray", function() { return scheduleArray; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
+module.exports = asyncForEach;
 
+/**
+ * Simultaneously processes all items in the given array.
+ *
+ * @param {array} array - The array to iterate over
+ * @param {function} iterator - The function to call for each item in the array
+ * @param {function} done - The function to call when all iterators have completed
+ */
+function asyncForEach (array, iterator, done) {
+  if (array.length === 0) {
+    // NOTE: Normally a bad idea to mix sync and async, but it's safe here because
+    // of the way that this method is currently used by DirectoryReader.
+    done();
+    return;
+  }
 
-function scheduleArray(input, scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        var i = 0;
-        sub.add(scheduler.schedule(function () {
-            if (i === input.length) {
-                subscriber.complete();
-                return;
-            }
-            subscriber.next(input[i++]);
-            if (!subscriber.closed) {
-                sub.add(this.schedule());
-            }
-        }));
-        return sub;
+  // Simultaneously process all items in the array.
+  let pending = array.length;
+  array.forEach(item => {
+    iterator(item, () => {
+      if (--pending === 0) {
+        done();
+      }
     });
+  });
 }
-//# sourceMappingURL=scheduleArray.js.map
 
 
 /***/ }),
-/* 50 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return throwError; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-function throwError(error, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.error(error); });
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); });
-    }
-}
-function dispatch(_a) {
-    var error = _a.error, subscriber = _a.subscriber;
-    subscriber.error(error);
-}
-//# sourceMappingURL=throwError.js.map
-
 
-/***/ }),
-/* 51 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/async/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return AsyncSubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */
 
 
+module.exports = readdirAsync;
 
-var AsyncSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncSubject, _super);
-    function AsyncSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.value = null;
-        _this.hasNext = false;
-        _this.hasCompleted = false;
-        return _this;
-    }
-    AsyncSubject.prototype._subscribe = function (subscriber) {
-        if (this.hasError) {
-            subscriber.error(this.thrownError);
-            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
-        }
-        else if (this.hasCompleted && this.hasNext) {
-            subscriber.next(this.value);
-            subscriber.complete();
-            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
-        }
-        return _super.prototype._subscribe.call(this, subscriber);
-    };
-    AsyncSubject.prototype.next = function (value) {
-        if (!this.hasCompleted) {
-            this.value = value;
-            this.hasNext = true;
-        }
-    };
-    AsyncSubject.prototype.error = function (error) {
-        if (!this.hasCompleted) {
-            _super.prototype.error.call(this, error);
-        }
-    };
-    AsyncSubject.prototype.complete = function () {
-        this.hasCompleted = true;
-        if (this.hasNext) {
-            _super.prototype.next.call(this, this.value);
-        }
-        _super.prototype.complete.call(this);
-    };
-    return AsyncSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+const maybe = __webpack_require__("../../node_modules/call-me-maybe/index.js");
+const DirectoryReader = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/directory-reader.js");
 
-//# sourceMappingURL=AsyncSubject.js.map
+let asyncFacade = {
+  fs: __webpack_require__("fs"),
+  forEach: __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/async/for-each.js"),
+  async: true
+};
 
+/**
+ * Returns the buffered output from an asynchronous {@link DirectoryReader},
+ * via an error-first callback or a {@link Promise}.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @param {function} [callback]
+ * @param {object} internalOptions
+ */
+function readdirAsync (dir, options, callback, internalOptions) {
+  if (typeof options === 'function') {
+    callback = options;
+    options = undefined;
+  }
 
-/***/ }),
-/* 52 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return maybe(callback, new Promise(((resolve, reject) => {
+    let results = [];
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return asapScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return asap; });
-/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(53);
-/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55);
-/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */
+    internalOptions.facade = asyncFacade;
 
+    let reader = new DirectoryReader(dir, options, internalOptions);
+    let stream = reader.stream;
 
-var asapScheduler = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapScheduler"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__["AsapAction"]);
-var asap = asapScheduler;
-//# sourceMappingURL=asap.js.map
+    stream.on('error', err => {
+      reject(err);
+      stream.pause();
+    });
+    stream.on('data', result => {
+      results.push(result);
+    });
+    stream.on('end', () => {
+      resolve(results);
+    });
+  })));
+}
 
 
 /***/ }),
-/* 53 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/call.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapAction", function() { return AsapAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(54);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(37);
-/** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */
 
 
+let call = module.exports = {
+  safe: safeCall,
+  once: callOnce,
+};
 
-var AsapAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapAction, _super);
-    function AsapAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && delay > 0) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        scheduler.actions.push(this);
-        return scheduler.scheduled || (scheduler.scheduled = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].setImmediate(scheduler.flush.bind(scheduler, null)));
-    };
-    AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
-        }
-        if (scheduler.actions.length === 0) {
-            _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].clearImmediate(id);
-            scheduler.scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AsapAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_2__["AsyncAction"]));
+/**
+ * Calls a function with the given arguments, and ensures that the error-first callback is _always_
+ * invoked exactly once, even if the function throws an error.
+ *
+ * @param {function} fn - The function to invoke
+ * @param {...*} args - The arguments to pass to the function. The final argument must be a callback function.
+ */
+function safeCall (fn, args) {
+  // Get the function arguments as an array
+  args = Array.prototype.slice.call(arguments, 1);
 
-//# sourceMappingURL=AsapAction.js.map
+  // Replace the callback function with a wrapper that ensures it will only be called once
+  let callback = call.once(args.pop());
+  args.push(callback);
 
+  try {
+    fn.apply(null, args);
+  }
+  catch (err) {
+    callback(err);
+  }
+}
 
-/***/ }),
-/* 54 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Returns a wrapper function that ensures the given callback function is only called once.
+ * Subsequent calls are ignored, unless the first argument is an Error, in which case the
+ * error is thrown.
+ *
+ * @param {function} fn - The function that should only be called once
+ * @returns {function}
+ */
+function callOnce (fn) {
+  let fulfilled = false;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Immediate", function() { return Immediate; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TestTools", function() { return TestTools; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var nextHandle = 1;
-var RESOLVED = /*@__PURE__*/ (function () { return /*@__PURE__*/ Promise.resolve(); })();
-var activeHandles = {};
-function findAndClearHandle(handle) {
-    if (handle in activeHandles) {
-        delete activeHandles[handle];
-        return true;
+  return function onceWrapper (err) {
+    if (!fulfilled) {
+      fulfilled = true;
+      return fn.apply(this, arguments);
     }
-    return false;
-}
-var Immediate = {
-    setImmediate: function (cb) {
-        var handle = nextHandle++;
-        activeHandles[handle] = true;
-        RESOLVED.then(function () { return findAndClearHandle(handle) && cb(); });
-        return handle;
-    },
-    clearImmediate: function (handle) {
-        findAndClearHandle(handle);
-    },
-};
-var TestTools = {
-    pending: function () {
-        return Object.keys(activeHandles).length;
+    else if (err) {
+      // The callback has already been called, but now an error has occurred
+      // (most likely inside the callback function). So re-throw the error,
+      // so it gets handled further up the call stack
+      throw err;
     }
-};
-//# sourceMappingURL=Immediate.js.map
+  };
+}
 
 
 /***/ }),
-/* 55 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapScheduler", function() { return AsapScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(40);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/directory-reader.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-var AsapScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapScheduler, _super);
-    function AsapScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    AsapScheduler.prototype.flush = function (action) {
-        this.active = true;
-        this.scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        var index = -1;
-        var count = actions.length;
-        action = action || actions.shift();
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (++index < count && (action = actions.shift()));
-        this.active = false;
-        if (error) {
-            while (++index < count && (action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsapScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
 
-//# sourceMappingURL=AsapScheduler.js.map
+const Readable = __webpack_require__("stream").Readable;
+const EventEmitter = __webpack_require__("events").EventEmitter;
+const path = __webpack_require__("path");
+const normalizeOptions = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/normalize-options.js");
+const stat = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/stat.js");
+const call = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/call.js");
 
+/**
+ * Asynchronously reads the contents of a directory and streams the results
+ * via a {@link stream.Readable}.
+ */
+class DirectoryReader {
+  /**
+   * @param {string} dir - The absolute or relative directory path to read
+   * @param {object} [options] - User-specified options, if any (see {@link normalizeOptions})
+   * @param {object} internalOptions - Internal options that aren't part of the public API
+   * @class
+   */
+  constructor (dir, options, internalOptions) {
+    this.options = options = normalizeOptions(options, internalOptions);
 
-/***/ }),
-/* 56 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // Indicates whether we should keep reading
+    // This is set false if stream.Readable.push() returns false.
+    this.shouldRead = true;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return asyncScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "async", function() { return async; });
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(37);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(40);
-/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
+    // The directories to read
+    // (initialized with the top-level directory)
+    this.queue = [{
+      path: dir,
+      basePath: options.basePath,
+      posixBasePath: options.posixBasePath,
+      depth: 0
+    }];
 
+    // The number of directories that are currently being processed
+    this.pending = 0;
 
-var asyncScheduler = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__["AsyncAction"]);
-var async = asyncScheduler;
-//# sourceMappingURL=async.js.map
+    // The data that has been read, but not yet emitted
+    this.buffer = [];
 
+    this.stream = new Readable({ objectMode: true });
+    this.stream._read = () => {
+      // Start (or resume) reading
+      this.shouldRead = true;
 
-/***/ }),
-/* 57 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      // If we have data in the buffer, then send the next chunk
+      if (this.buffer.length > 0) {
+        this.pushFromBuffer();
+      }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return animationFrameScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return animationFrame; });
-/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
-/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59);
-/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */
+      // If we have directories queued, then start processing the next one
+      if (this.queue.length > 0) {
+        if (this.options.facade.sync) {
+          while (this.queue.length > 0) {
+            this.readNextDirectory();
+          }
+        }
+        else {
+          this.readNextDirectory();
+        }
+      }
 
+      this.checkForEOF();
+    };
+  }
 
-var animationFrameScheduler = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__["AnimationFrameScheduler"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__["AnimationFrameAction"]);
-var animationFrame = animationFrameScheduler;
-//# sourceMappingURL=animationFrame.js.map
+  /**
+   * Reads the next directory in the queue
+   */
+  readNextDirectory () {
+    let facade = this.options.facade;
+    let dir = this.queue.shift();
+    this.pending++;
 
+    // Read the directory listing
+    call.safe(facade.fs.readdir, dir.path, (err, items) => {
+      if (err) {
+        // fs.readdir threw an error
+        this.emit('error', err);
+        return this.finishedReadingDirectory();
+      }
 
-/***/ }),
-/* 58 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      try {
+        // Process each item in the directory (simultaneously, if async)
+        facade.forEach(
+          items,
+          this.processItem.bind(this, dir),
+          this.finishedReadingDirectory.bind(this, dir)
+        );
+      }
+      catch (err2) {
+        // facade.forEach threw an error
+        // (probably because fs.readdir returned an invalid result)
+        this.emit('error', err2);
+        this.finishedReadingDirectory();
+      }
+    });
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameAction", function() { return AnimationFrameAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37);
-/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+  /**
+   * This method is called after all items in a directory have been processed.
+   *
+   * NOTE: This does not necessarily mean that the reader is finished, since there may still
+   * be other directories queued or pending.
+   */
+  finishedReadingDirectory () {
+    this.pending--;
 
+    if (this.shouldRead) {
+      // If we have directories queued, then start processing the next one
+      if (this.queue.length > 0 && this.options.facade.async) {
+        this.readNextDirectory();
+      }
 
-var AnimationFrameAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameAction, _super);
-    function AnimationFrameAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
+      this.checkForEOF();
     }
-    AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && delay > 0) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        scheduler.actions.push(this);
-        return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); }));
-    };
-    AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
-        }
-        if (scheduler.actions.length === 0) {
-            cancelAnimationFrame(id);
-            scheduler.scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AnimationFrameAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+  }
 
-//# sourceMappingURL=AnimationFrameAction.js.map
+  /**
+   * Determines whether the reader has finished processing all items in all directories.
+   * If so, then the "end" event is fired (via {@Readable#push})
+   */
+  checkForEOF () {
+    if (this.buffer.length === 0 &&   // The stuff we've already read
+    this.pending === 0 &&             // The stuff we're currently reading
+    this.queue.length === 0) {        // The stuff we haven't read yet
+      // There's no more stuff!
+      this.stream.push(null);
+    }
+  }
 
+  /**
+   * Processes a single item in a directory.
+   *
+   * If the item is a directory, and `option.deep` is enabled, then the item will be added
+   * to the directory queue.
+   *
+   * If the item meets the filter criteria, then it will be emitted to the reader's stream.
+   *
+   * @param {object} dir - A directory object from the queue
+   * @param {string} item - The name of the item (name only, no path)
+   * @param {function} done - A callback function that is called after the item has been processed
+   */
+  processItem (dir, item, done) {
+    let stream = this.stream;
+    let options = this.options;
 
-/***/ }),
-/* 59 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    let itemPath = dir.basePath + item;
+    let posixPath = dir.posixBasePath + item;
+    let fullPath = path.join(dir.path, item);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameScheduler", function() { return AnimationFrameScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(40);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+    // If `options.deep` is a number, and we've already recursed to the max depth,
+    // then there's no need to check fs.Stats to know if it's a directory.
+    // If `options.deep` is a function, then we'll need fs.Stats
+    let maxDepthReached = dir.depth >= options.recurseDepth;
 
+    // Do we need to call `fs.stat`?
+    let needStats =
+      !maxDepthReached ||                                 // we need the fs.Stats to know if it's a directory
+      options.stats ||                                    // the user wants fs.Stats objects returned
+      options.recurseFn ||                                // we need fs.Stats for the recurse function
+      options.filterFn ||                                 // we need fs.Stats for the filter function
+      EventEmitter.listenerCount(stream, 'file') ||       // we need the fs.Stats to know if it's a file
+      EventEmitter.listenerCount(stream, 'directory') ||  // we need the fs.Stats to know if it's a directory
+      EventEmitter.listenerCount(stream, 'symlink');      // we need the fs.Stats to know if it's a symlink
 
-var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameScheduler, _super);
-    function AnimationFrameScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    // If we don't need stats, then exit early
+    if (!needStats) {
+      if (this.filter(itemPath, posixPath)) {
+        this.pushOrBuffer({ data: itemPath });
+      }
+      return done();
     }
-    AnimationFrameScheduler.prototype.flush = function (action) {
-        this.active = true;
-        this.scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        var index = -1;
-        var count = actions.length;
-        action = action || actions.shift();
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (++index < count && (action = actions.shift()));
-        this.active = false;
-        if (error) {
-            while (++index < count && (action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AnimationFrameScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
 
-//# sourceMappingURL=AnimationFrameScheduler.js.map
+    // Get the fs.Stats object for this path
+    stat(options.facade.fs, fullPath, (err, stats) => {
+      if (err) {
+        // fs.stat threw an error
+        this.emit('error', err);
+        return done();
+      }
+
+      try {
+        // Add the item's path to the fs.Stats object
+        // The base of this path, and its separators are determined by the options
+        // (i.e. options.basePath and options.sep)
+        stats.path = itemPath;
 
+        // Add depth of the path to the fs.Stats object for use this in the filter function
+        stats.depth = dir.depth;
 
-/***/ }),
-/* 60 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        if (this.shouldRecurse(stats, posixPath, maxDepthReached)) {
+          // Add this subdirectory to the queue
+          this.queue.push({
+            path: fullPath,
+            basePath: itemPath + options.sep,
+            posixBasePath: posixPath + '/',
+            depth: dir.depth + 1,
+          });
+        }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return VirtualTimeScheduler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return VirtualAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(40);
-/** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
+        // Determine whether this item matches the filter criteria
+        if (this.filter(stats, posixPath)) {
+          this.pushOrBuffer({
+            data: options.stats ? stats : itemPath,
+            file: stats.isFile(),
+            directory: stats.isDirectory(),
+            symlink: stats.isSymbolicLink(),
+          });
+        }
 
+        done();
+      }
+      catch (err2) {
+        // An error occurred while processing the item
+        // (probably during a user-specified function, such as options.deep, options.filter, etc.)
+        this.emit('error', err2);
+        done();
+      }
+    });
+  }
 
+  /**
+   * Pushes the given chunk of data to the stream, or adds it to the buffer,
+   * depending on the state of the stream.
+   *
+   * @param {object} chunk
+   */
+  pushOrBuffer (chunk) {
+    // Add the chunk to the buffer
+    this.buffer.push(chunk);
 
-var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualTimeScheduler, _super);
-    function VirtualTimeScheduler(SchedulerAction, maxFrames) {
-        if (SchedulerAction === void 0) {
-            SchedulerAction = VirtualAction;
-        }
-        if (maxFrames === void 0) {
-            maxFrames = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this;
-        _this.maxFrames = maxFrames;
-        _this.frame = 0;
-        _this.index = -1;
-        return _this;
+    // If we're still reading, then immediately emit the next chunk in the buffer
+    // (which may or may not be the chunk that we just added)
+    if (this.shouldRead) {
+      this.pushFromBuffer();
     }
-    VirtualTimeScheduler.prototype.flush = function () {
-        var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
-        var error, action;
-        while ((action = actions[0]) && action.delay <= maxFrames) {
-            actions.shift();
-            this.frame = action.delay;
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        }
-        if (error) {
-            while (action = actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    VirtualTimeScheduler.frameTimeFactor = 10;
-    return VirtualTimeScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__["AsyncScheduler"]));
-
-var VirtualAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualAction, _super);
-    function VirtualAction(scheduler, work, index) {
-        if (index === void 0) {
-            index = scheduler.index += 1;
-        }
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.index = index;
-        _this.active = true;
-        _this.index = scheduler.index = index;
-        return _this;
-    }
-    VirtualAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (!this.id) {
-            return _super.prototype.schedule.call(this, state, delay);
-        }
-        this.active = false;
-        var action = new VirtualAction(this.scheduler, this.work);
-        this.add(action);
-        return action.schedule(state, delay);
-    };
-    VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        this.delay = scheduler.frame + delay;
-        var actions = scheduler.actions;
-        actions.push(this);
-        actions.sort(VirtualAction.sortActions);
-        return true;
-    };
-    VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return undefined;
-    };
-    VirtualAction.prototype._execute = function (state, delay) {
-        if (this.active === true) {
-            return _super.prototype._execute.call(this, state, delay);
-        }
-    };
-    VirtualAction.sortActions = function (a, b) {
-        if (a.delay === b.delay) {
-            if (a.index === b.index) {
-                return 0;
-            }
-            else if (a.index > b.index) {
-                return 1;
-            }
-            else {
-                return -1;
-            }
-        }
-        else if (a.delay > b.delay) {
-            return 1;
-        }
-        else {
-            return -1;
-        }
-    };
-    return VirtualAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
-
-//# sourceMappingURL=VirtualTimeScheduler.js.map
-
-
-/***/ }),
-/* 61 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return noop; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function noop() { }
-//# sourceMappingURL=noop.js.map
-
-
-/***/ }),
-/* 62 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return isObservable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
-
-function isObservable(obj) {
-    return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function'));
-}
-//# sourceMappingURL=isObservable.js.map
-
+  }
 
-/***/ }),
-/* 63 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  /**
+   * Immediately pushes the next chunk in the buffer to the reader's stream.
+   * The "data" event will always be fired (via {@link Readable#push}).
+   * In addition, the "file", "directory", and/or "symlink" events may be fired,
+   * depending on the type of properties of the chunk.
+   */
+  pushFromBuffer () {
+    let stream = this.stream;
+    let chunk = this.buffer.shift();
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var ArgumentOutOfRangeErrorImpl = /*@__PURE__*/ (function () {
-    function ArgumentOutOfRangeErrorImpl() {
-        Error.call(this);
-        this.message = 'argument out of range';
-        this.name = 'ArgumentOutOfRangeError';
-        return this;
+    // Stream the data
+    try {
+      this.shouldRead = stream.push(chunk.data);
     }
-    ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return ArgumentOutOfRangeErrorImpl;
-})();
-var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl;
-//# sourceMappingURL=ArgumentOutOfRangeError.js.map
-
-
-/***/ }),
-/* 64 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var EmptyErrorImpl = /*@__PURE__*/ (function () {
-    function EmptyErrorImpl() {
-        Error.call(this);
-        this.message = 'no elements in sequence';
-        this.name = 'EmptyError';
-        return this;
+    catch (err) {
+      this.emit('error', err);
     }
-    EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return EmptyErrorImpl;
-})();
-var EmptyError = EmptyErrorImpl;
-//# sourceMappingURL=EmptyError.js.map
 
+    // Also emit specific events, based on the type of chunk
+    chunk.file && this.emit('file', chunk.data);
+    chunk.symlink && this.emit('symlink', chunk.data);
+    chunk.directory && this.emit('directory', chunk.data);
+  }
 
-/***/ }),
-/* 65 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  /**
+   * Determines whether the given directory meets the user-specified recursion criteria.
+   * If the user didn't specify recursion criteria, then this function will default to true.
+   *
+   * @param {fs.Stats} stats - The directory's {@link fs.Stats} object
+   * @param {string} posixPath - The item's POSIX path (used for glob matching)
+   * @param {boolean} maxDepthReached - Whether we've already crawled the user-specified depth
+   * @returns {boolean}
+   */
+  shouldRecurse (stats, posixPath, maxDepthReached) {
+    let options = this.options;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var TimeoutErrorImpl = /*@__PURE__*/ (function () {
-    function TimeoutErrorImpl() {
-        Error.call(this);
-        this.message = 'Timeout has occurred';
-        this.name = 'TimeoutError';
-        return this;
+    if (maxDepthReached) {
+      // We've already crawled to the maximum depth. So no more recursion.
+      return false;
     }
-    TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return TimeoutErrorImpl;
-})();
-var TimeoutError = TimeoutErrorImpl;
-//# sourceMappingURL=TimeoutError.js.map
-
-
-/***/ }),
-/* 66 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return bindCallback; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(67);
-/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(19);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
-
-
-
-
-
-
-function bindCallback(callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-            };
-        }
+    else if (!stats.isDirectory()) {
+      // It's not a directory. So don't try to crawl it.
+      return false;
     }
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var context = this;
-        var subject;
-        var params = {
-            context: context,
-            subject: subject,
-            callbackFunc: callbackFunc,
-            scheduler: scheduler,
-        };
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            if (!scheduler) {
-                if (!subject) {
-                    subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-                    var handler = function () {
-                        var innerArgs = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            innerArgs[_i] = arguments[_i];
-                        }
-                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
-                        subject.complete();
-                    };
-                    try {
-                        callbackFunc.apply(context, args.concat([handler]));
-                    }
-                    catch (err) {
-                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
-                            subject.error(err);
-                        }
-                        else {
-                            console.warn(err);
-                        }
-                    }
-                }
-                return subject.subscribe(subscriber);
-            }
-            else {
-                var state = {
-                    args: args, subscriber: subscriber, params: params,
-                };
-                return scheduler.schedule(dispatch, 0, state);
-            }
-        });
-    };
-}
-function dispatch(state) {
-    var _this = this;
-    var self = this;
-    var args = state.args, subscriber = state.subscriber, params = state.params;
-    var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler;
-    var subject = params.subject;
-    if (!subject) {
-        subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-        var handler = function () {
-            var innerArgs = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                innerArgs[_i] = arguments[_i];
-            }
-            var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
-            _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
-        };
-        try {
-            callbackFunc.apply(context, args.concat([handler]));
-        }
-        catch (err) {
-            subject.error(err);
-        }
+    else if (options.recurseGlob) {
+      // Glob patterns are always tested against the POSIX path, even on Windows
+      // https://github.com/isaacs/node-glob#windows
+      return options.recurseGlob.test(posixPath);
     }
-    this.add(subject.subscribe(subscriber));
-}
-function dispatchNext(state) {
-    var value = state.value, subject = state.subject;
-    subject.next(value);
-    subject.complete();
-}
-function dispatchError(state) {
-    var err = state.err, subject = state.subject;
-    subject.error(err);
-}
-//# sourceMappingURL=bindCallback.js.map
-
-
-/***/ }),
-/* 67 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return map; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MapOperator", function() { return MapOperator; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function map(project, thisArg) {
-    return function mapOperation(source) {
-        if (typeof project !== 'function') {
-            throw new TypeError('argument is not a function. Are you looking for `mapTo()`?');
-        }
-        return source.lift(new MapOperator(project, thisArg));
-    };
-}
-var MapOperator = /*@__PURE__*/ (function () {
-    function MapOperator(project, thisArg) {
-        this.project = project;
-        this.thisArg = thisArg;
+    else if (options.recurseRegExp) {
+      // Regular expressions are tested against the normal path
+      // (based on the OS or options.sep)
+      return options.recurseRegExp.test(stats.path);
     }
-    MapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg));
-    };
-    return MapOperator;
-}());
-
-var MapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapSubscriber, _super);
-    function MapSubscriber(destination, project, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.count = 0;
-        _this.thisArg = thisArg || _this;
-        return _this;
+    else if (options.recurseFn) {
+      try {
+        // Run the user-specified recursion criteria
+        return options.recurseFn.call(null, stats);
+      }
+      catch (err) {
+        // An error occurred in the user's code.
+        // In Sync and Async modes, this will return an error.
+        // In Streaming mode, we emit an "error" event, but continue processing
+        this.emit('error', err);
+      }
     }
-    MapSubscriber.prototype._next = function (value) {
-        var result;
-        try {
-            result = this.project.call(this.thisArg, value, this.count++);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return MapSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=map.js.map
-
-
-/***/ }),
-/* 68 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return bindNodeCallback; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(67);
-/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(46);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(19);
-/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
-
-
+    else {
+      // No recursion function was specified, and we're within the maximum depth.
+      // So crawl this directory.
+      return true;
+    }
+  }
 
+  /**
+   * Determines whether the given item meets the user-specified filter criteria.
+   * If the user didn't specify a filter, then this function will always return true.
+   *
+   * @param {string|fs.Stats} value - Either the item's path, or the item's {@link fs.Stats} object
+   * @param {string} posixPath - The item's POSIX path (used for glob matching)
+   * @returns {boolean}
+   */
+  filter (value, posixPath) {
+    let options = this.options;
 
+    if (options.filterGlob) {
+      // Glob patterns are always tested against the POSIX path, even on Windows
+      // https://github.com/isaacs/node-glob#windows
+      return options.filterGlob.test(posixPath);
+    }
+    else if (options.filterRegExp) {
+      // Regular expressions are tested against the normal path
+      // (based on the OS or options.sep)
+      return options.filterRegExp.test(value.path || value);
+    }
+    else if (options.filterFn) {
+      try {
+        // Run the user-specified filter function
+        return options.filterFn.call(null, value);
+      }
+      catch (err) {
+        // An error occurred in the user's code.
+        // In Sync and Async modes, this will return an error.
+        // In Streaming mode, we emit an "error" event, but continue processing
+        this.emit('error', err);
+      }
+    }
+    else {
+      // No filter was specified, so match everything
+      return true;
+    }
+  }
 
+  /**
+   * Emits an event.  If one of the event listeners throws an error,
+   * then an "error" event is emitted.
+   *
+   * @param {string} eventName
+   * @param {*} data
+   */
+  emit (eventName, data) {
+    let stream = this.stream;
 
-function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-            };
-        }
+    try {
+      stream.emit(eventName, data);
     }
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var params = {
-            subject: undefined,
-            args: args,
-            callbackFunc: callbackFunc,
-            scheduler: scheduler,
-            context: this,
-        };
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var context = params.context;
-            var subject = params.subject;
-            if (!scheduler) {
-                if (!subject) {
-                    subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-                    var handler = function () {
-                        var innerArgs = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            innerArgs[_i] = arguments[_i];
-                        }
-                        var err = innerArgs.shift();
-                        if (err) {
-                            subject.error(err);
-                            return;
-                        }
-                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
-                        subject.complete();
-                    };
-                    try {
-                        callbackFunc.apply(context, args.concat([handler]));
-                    }
-                    catch (err) {
-                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
-                            subject.error(err);
-                        }
-                        else {
-                            console.warn(err);
-                        }
-                    }
-                }
-                return subject.subscribe(subscriber);
-            }
-            else {
-                return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context });
-            }
-        });
-    };
-}
-function dispatch(state) {
-    var _this = this;
-    var params = state.params, subscriber = state.subscriber, context = state.context;
-    var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler;
-    var subject = params.subject;
-    if (!subject) {
-        subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-        var handler = function () {
-            var innerArgs = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                innerArgs[_i] = arguments[_i];
-            }
-            var err = innerArgs.shift();
-            if (err) {
-                _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
-            }
-            else {
-                var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
-                _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
-            }
-        };
-        try {
-            callbackFunc.apply(context, args.concat([handler]));
-        }
-        catch (err) {
-            this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
-        }
+    catch (err) {
+      if (eventName === 'error') {
+        // Don't recursively emit "error" events.
+        // If the first one fails, then just throw
+        throw err;
+      }
+      else {
+        stream.emit('error', err);
+      }
     }
-    this.add(subject.subscribe(subscriber));
-}
-function dispatchNext(arg) {
-    var value = arg.value, subject = arg.subject;
-    subject.next(value);
-    subject.complete();
-}
-function dispatchError(arg) {
-    var err = arg.err, subject = arg.subject;
-    subject.error(err);
+  }
 }
-//# sourceMappingURL=bindNodeCallback.js.map
+
+module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 69 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestOperator", function() { return CombineLatestOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestSubscriber", function() { return CombineLatestSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(46);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(71);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(47);
-/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */
 
 
+const readdirSync = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/sync/index.js");
+const readdirAsync = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/async/index.js");
+const readdirStream = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/stream/index.js");
 
+module.exports = exports = readdirAsyncPath;
+exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
+exports.readdirAsyncStat = exports.async.stat = readdirAsyncStat;
+exports.readdirStream = exports.stream = readdirStreamPath;
+exports.readdirStreamStat = exports.stream.stat = readdirStreamStat;
+exports.readdirSync = exports.sync = readdirSyncPath;
+exports.readdirSyncStat = exports.sync.stat = readdirSyncStat;
 
+/**
+ * Synchronous readdir that returns an array of string paths.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @returns {string[]}
+ */
+function readdirSyncPath (dir, options) {
+  return readdirSync(dir, options, {});
+}
 
+/**
+ * Synchronous readdir that returns results as an array of {@link fs.Stats} objects
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @returns {fs.Stats[]}
+ */
+function readdirSyncStat (dir, options) {
+  return readdirSync(dir, options, { stats: true });
+}
 
-var NONE = {};
-function combineLatest() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var resultSelector = undefined;
-    var scheduler = undefined;
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(observables[observables.length - 1])) {
-        scheduler = observables.pop();
-    }
-    if (typeof observables[observables.length - 1] === 'function') {
-        resultSelector = observables.pop();
-    }
-    if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(observables[0])) {
-        observables = observables[0];
-    }
-    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(observables, scheduler).lift(new CombineLatestOperator(resultSelector));
+/**
+ * Aynchronous readdir (accepts an error-first callback or returns a {@link Promise}).
+ * Results are an array of path strings.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @param {function} [callback]
+ * @returns {Promise<string[]>}
+ */
+function readdirAsyncPath (dir, options, callback) {
+  return readdirAsync(dir, options, callback, {});
 }
-var CombineLatestOperator = /*@__PURE__*/ (function () {
-    function CombineLatestOperator(resultSelector) {
-        this.resultSelector = resultSelector;
-    }
-    CombineLatestOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector));
-    };
-    return CombineLatestOperator;
-}());
 
-var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CombineLatestSubscriber, _super);
-    function CombineLatestSubscriber(destination, resultSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.resultSelector = resultSelector;
-        _this.active = 0;
-        _this.values = [];
-        _this.observables = [];
-        return _this;
-    }
-    CombineLatestSubscriber.prototype._next = function (observable) {
-        this.values.push(NONE);
-        this.observables.push(observable);
-    };
-    CombineLatestSubscriber.prototype._complete = function () {
-        var observables = this.observables;
-        var len = observables.length;
-        if (len === 0) {
-            this.destination.complete();
-        }
-        else {
-            this.active = len;
-            this.toRespond = len;
-            for (var i = 0; i < len; i++) {
-                var observable = observables[i];
-                this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, undefined, i));
-            }
-        }
-    };
-    CombineLatestSubscriber.prototype.notifyComplete = function (unused) {
-        if ((this.active -= 1) === 0) {
-            this.destination.complete();
-        }
-    };
-    CombineLatestSubscriber.prototype.notifyNext = function (_outerValue, innerValue, outerIndex) {
-        var values = this.values;
-        var oldVal = values[outerIndex];
-        var toRespond = !this.toRespond
-            ? 0
-            : oldVal === NONE ? --this.toRespond : this.toRespond;
-        values[outerIndex] = innerValue;
-        if (toRespond === 0) {
-            if (this.resultSelector) {
-                this._tryResultSelector(values);
-            }
-            else {
-                this.destination.next(values.slice());
-            }
-        }
-    };
-    CombineLatestSubscriber.prototype._tryResultSelector = function (values) {
-        var result;
-        try {
-            result = this.resultSelector.apply(this, values);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return CombineLatestSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+/**
+ * Aynchronous readdir (accepts an error-first callback or returns a {@link Promise}).
+ * Results are an array of {@link fs.Stats} objects.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @param {function} [callback]
+ * @returns {Promise<fs.Stats[]>}
+ */
+function readdirAsyncStat (dir, options, callback) {
+  return readdirAsync(dir, options, callback, { stats: true });
+}
 
-//# sourceMappingURL=combineLatest.js.map
+/**
+ * Aynchronous readdir that returns a {@link stream.Readable} (which is also an {@link EventEmitter}).
+ * All stream data events ("data", "file", "directory", "symlink") are passed a path string.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @returns {stream.Readable}
+ */
+function readdirStreamPath (dir, options) {
+  return readdirStream(dir, options, {});
+}
+
+/**
+ * Aynchronous readdir that returns a {@link stream.Readable} (which is also an {@link EventEmitter})
+ * All stream data events ("data", "file", "directory", "symlink") are passed an {@link fs.Stats} object.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @returns {stream.Readable}
+ */
+function readdirStreamStat (dir, options) {
+  return readdirStream(dir, options, { stats: true });
+}
 
 
 /***/ }),
-/* 70 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/normalize-options.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OuterSubscriber", function() { return OuterSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
-var OuterSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OuterSubscriber, _super);
-    function OuterSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    OuterSubscriber.prototype.notifyError = function (error, innerSub) {
-        this.destination.error(error);
-    };
-    OuterSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.destination.complete();
-    };
-    return OuterSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+const path = __webpack_require__("path");
+const globToRegExp = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/node_modules/glob-to-regexp/index.js");
 
-//# sourceMappingURL=OuterSubscriber.js.map
+module.exports = normalizeOptions;
 
+let isWindows = /^win/.test(process.platform);
 
-/***/ }),
-/* 71 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToResult", function() { return subscribeToResult; });
-/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(72);
-/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
-/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo,_Observable PURE_IMPORTS_END */
-
+/**
+ * @typedef {Object} FSFacade
+ * @property {fs.readdir} readdir
+ * @property {fs.stat} stat
+ * @property {fs.lstat} lstat
+ */
 
+/**
+ * Validates and normalizes the options argument
+ *
+ * @param {object} [options] - User-specified options, if any
+ * @param {object} internalOptions - Internal options that aren't part of the public API
+ *
+ * @param {number|boolean|function} [options.deep]
+ * The number of directories to recursively traverse. Any falsy value or negative number will
+ * default to zero, so only the top-level contents will be returned. Set to `true` or `Infinity`
+ * to traverse all subdirectories.  Or provide a function that accepts a {@link fs.Stats} object
+ * and returns a truthy value if the directory's contents should be crawled.
+ *
+ * @param {function|string|RegExp} [options.filter]
+ * A function that accepts a {@link fs.Stats} object and returns a truthy value if the data should
+ * be returned.  Or a RegExp or glob string pattern, to filter by file name.
+ *
+ * @param {string} [options.sep]
+ * The path separator to use. By default, the OS-specific separator will be used, but this can be
+ * set to a specific value to ensure consistency across platforms.
+ *
+ * @param {string} [options.basePath]
+ * The base path to prepend to each result. If empty, then all results will be relative to `dir`.
+ *
+ * @param {FSFacade} [options.fs]
+ * Synchronous or asynchronous facades for Node.js File System module
+ *
+ * @param {object} [internalOptions.facade]
+ * Synchronous or asynchronous facades for various methods, including for the Node.js File System module
+ *
+ * @param {boolean} [internalOptions.emit]
+ * Indicates whether the reader should emit "file", "directory", and "symlink" events
+ *
+ * @param {boolean} [internalOptions.stats]
+ * Indicates whether the reader should emit {@link fs.Stats} objects instead of path strings
+ *
+ * @returns {object}
+ */
+function normalizeOptions (options, internalOptions) {
+  if (options === null || options === undefined) {
+    options = {};
+  }
+  else if (typeof options !== 'object') {
+    throw new TypeError('options must be an object');
+  }
 
-function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, innerSubscriber) {
-    if (innerSubscriber === void 0) {
-        innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex);
+  let recurseDepth, recurseFn, recurseRegExp, recurseGlob, deep = options.deep;
+  if (deep === null || deep === undefined) {
+    recurseDepth = 0;
+  }
+  else if (typeof deep === 'boolean') {
+    recurseDepth = deep ? Infinity : 0;
+  }
+  else if (typeof deep === 'number') {
+    if (deep < 0 || isNaN(deep)) {
+      throw new Error('options.deep must be a positive number');
     }
-    if (innerSubscriber.closed) {
-        return undefined;
+    else if (Math.floor(deep) !== deep) {
+      throw new Error('options.deep must be an integer');
     }
-    if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]) {
-        return result.subscribe(innerSubscriber);
+    else {
+      recurseDepth = deep;
     }
-    return Object(_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(result)(innerSubscriber);
-}
-//# sourceMappingURL=subscribeToResult.js.map
+  }
+  else if (typeof deep === 'function') {
+    recurseDepth = Infinity;
+    recurseFn = deep;
+  }
+  else if (deep instanceof RegExp) {
+    recurseDepth = Infinity;
+    recurseRegExp = deep;
+  }
+  else if (typeof deep === 'string' && deep.length > 0) {
+    recurseDepth = Infinity;
+    recurseGlob = globToRegExp(deep, { extended: true, globstar: true });
+  }
+  else {
+    throw new TypeError('options.deep must be a boolean, number, function, regular expression, or glob pattern');
+  }
 
+  let filterFn, filterRegExp, filterGlob, filter = options.filter;
+  if (filter !== null && filter !== undefined) {
+    if (typeof filter === 'function') {
+      filterFn = filter;
+    }
+    else if (filter instanceof RegExp) {
+      filterRegExp = filter;
+    }
+    else if (typeof filter === 'string' && filter.length > 0) {
+      filterGlob = globToRegExp(filter, { extended: true, globstar: true });
+    }
+    else {
+      throw new TypeError('options.filter must be a function, regular expression, or glob pattern');
+    }
+  }
 
-/***/ }),
-/* 72 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let sep = options.sep;
+  if (sep === null || sep === undefined) {
+    sep = path.sep;
+  }
+  else if (typeof sep !== 'string') {
+    throw new TypeError('options.sep must be a string');
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InnerSubscriber", function() { return InnerSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  let basePath = options.basePath;
+  if (basePath === null || basePath === undefined) {
+    basePath = '';
+  }
+  else if (typeof basePath === 'string') {
+    // Append a path separator to the basePath, if necessary
+    if (basePath && basePath.substr(-1) !== sep) {
+      basePath += sep;
+    }
+  }
+  else {
+    throw new TypeError('options.basePath must be a string');
+  }
 
+  // Convert the basePath to POSIX (forward slashes)
+  // so that glob pattern matching works consistently, even on Windows
+  let posixBasePath = basePath;
+  if (posixBasePath && sep !== '/') {
+    posixBasePath = posixBasePath.replace(new RegExp('\\' + sep, 'g'), '/');
 
-var InnerSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerSubscriber, _super);
-    function InnerSubscriber(parent, outerValue, outerIndex) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.outerValue = outerValue;
-        _this.outerIndex = outerIndex;
-        _this.index = 0;
-        return _this;
+    /* istanbul ignore if */
+    if (isWindows) {
+      // Convert Windows root paths (C:\) and UNCs (\\) to POSIX root paths
+      posixBasePath = posixBasePath.replace(/^([a-zA-Z]\:\/|\/\/)/, '/');
     }
-    InnerSubscriber.prototype._next = function (value) {
-        this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this);
-    };
-    InnerSubscriber.prototype._error = function (error) {
-        this.parent.notifyError(error, this);
-        this.unsubscribe();
-    };
-    InnerSubscriber.prototype._complete = function () {
-        this.parent.notifyComplete(this);
-        this.unsubscribe();
-    };
-    return InnerSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+  }
+
+  // Determine which facade methods to use
+  let facade;
+  if (options.fs === null || options.fs === undefined) {
+    // The user didn't provide their own facades, so use our internal ones
+    facade = internalOptions.facade;
+  }
+  else if (typeof options.fs === 'object') {
+    // Merge the internal facade methods with the user-provided `fs` facades
+    facade = Object.assign({}, internalOptions.facade);
+    facade.fs = Object.assign({}, internalOptions.facade.fs, options.fs);
+  }
+  else {
+    throw new TypeError('options.fs must be an object');
+  }
 
-//# sourceMappingURL=InnerSubscriber.js.map
+  return {
+    recurseDepth,
+    recurseFn,
+    recurseRegExp,
+    recurseGlob,
+    filterFn,
+    filterRegExp,
+    filterGlob,
+    sep,
+    basePath,
+    posixBasePath,
+    facade,
+    emit: !!internalOptions.emit,
+    stats: !!internalOptions.stats,
+  };
+}
 
 
 /***/ }),
-/* 73 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeTo", function() { return subscribeTo; });
-/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(48);
-/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(74);
-/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(75);
-/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(77);
-/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(78);
-/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79);
-/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(20);
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(76);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(24);
-/** PURE_IMPORTS_START _subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
 
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/stat.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+const call = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/call.js");
 
+module.exports = stat;
 
+/**
+ * Retrieves the {@link fs.Stats} for the given path. If the path is a symbolic link,
+ * then the Stats of the symlink's target are returned instead.  If the symlink is broken,
+ * then the Stats of the symlink itself are returned.
+ *
+ * @param {object} fs - Synchronous or Asynchronouse facade for the "fs" module
+ * @param {string} path - The path to return stats for
+ * @param {function} callback
+ */
+function stat (fs, path, callback) {
+  let isSymLink = false;
 
+  call.safe(fs.lstat, path, (err, lstats) => {
+    if (err) {
+      // fs.lstat threw an eror
+      return callback(err);
+    }
 
+    try {
+      isSymLink = lstats.isSymbolicLink();
+    }
+    catch (err2) {
+      // lstats.isSymbolicLink() threw an error
+      // (probably because fs.lstat returned an invalid result)
+      return callback(err2);
+    }
 
-var subscribeTo = function (result) {
-    if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') {
-        return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result);
+    if (isSymLink) {
+      // Try to resolve the symlink
+      symlinkStat(fs, path, lstats, callback);
     }
-    else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) {
-        return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result);
+    else {
+      // It's not a symlink, so return the stats as-is
+      callback(null, lstats);
     }
-    else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) {
-        return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(result);
+  });
+}
+
+/**
+ * Retrieves the {@link fs.Stats} for the target of the given symlink.
+ * If the symlink is broken, then the Stats of the symlink itself are returned.
+ *
+ * @param {object} fs - Synchronous or Asynchronouse facade for the "fs" module
+ * @param {string} path - The path of the symlink to return stats for
+ * @param {object} lstats - The stats of the symlink
+ * @param {function} callback
+ */
+function symlinkStat (fs, path, lstats, callback) {
+  call.safe(fs.stat, path, (err, stats) => {
+    if (err) {
+      // The symlink is broken, so return the stats for the link itself
+      return callback(null, lstats);
     }
-    else if (!!result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_7__["iterator"]] === 'function') {
-        return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__["subscribeToIterable"])(result);
+
+    try {
+      // Return the stats for the resolved symlink target,
+      // and override the `isSymbolicLink` method to indicate that it's a symlink
+      stats.isSymbolicLink = () => true;
     }
-    else {
-        var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_6__["isObject"])(result) ? 'an invalid object' : "'" + result + "'";
-        var msg = "You provided " + value + " where a stream was expected."
-            + ' You can provide an Observable, Promise, Array, or Iterable.';
-        throw new TypeError(msg);
+    catch (err2) {
+      // Setting stats.isSymbolicLink threw an error
+      // (probably because fs.stat returned an invalid result)
+      return callback(err2);
     }
-};
-//# sourceMappingURL=subscribeTo.js.map
+
+    callback(null, stats);
+  });
+}
 
 
 /***/ }),
-/* 74 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToPromise", function() { return subscribeToPromise; });
-/* harmony import */ var _hostReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(17);
-/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var subscribeToPromise = function (promise) {
-    return function (subscriber) {
-        promise.then(function (value) {
-            if (!subscriber.closed) {
-                subscriber.next(value);
-                subscriber.complete();
-            }
-        }, function (err) { return subscriber.error(err); })
-            .then(null, _hostReportError__WEBPACK_IMPORTED_MODULE_0__["hostReportError"]);
-        return subscriber;
-    };
-};
-//# sourceMappingURL=subscribeToPromise.js.map
+"use strict";
 
 
-/***/ }),
-/* 75 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = readdirStream;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToIterable", function() { return subscribeToIterable; });
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(76);
-/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
+const DirectoryReader = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/directory-reader.js");
 
-var subscribeToIterable = function (iterable) {
-    return function (subscriber) {
-        var iterator = iterable[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]]();
-        do {
-            var item = void 0;
-            try {
-                item = iterator.next();
-            }
-            catch (err) {
-                subscriber.error(err);
-                return subscriber;
-            }
-            if (item.done) {
-                subscriber.complete();
-                break;
-            }
-            subscriber.next(item.value);
-            if (subscriber.closed) {
-                break;
-            }
-        } while (true);
-        if (typeof iterator.return === 'function') {
-            subscriber.add(function () {
-                if (iterator.return) {
-                    iterator.return();
-                }
-            });
-        }
-        return subscriber;
-    };
+let streamFacade = {
+  fs: __webpack_require__("fs"),
+  forEach: __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/async/for-each.js"),
+  async: true
 };
-//# sourceMappingURL=subscribeToIterable.js.map
-
 
-/***/ }),
-/* 76 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Returns the {@link stream.Readable} of an asynchronous {@link DirectoryReader}.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @param {object} internalOptions
+ */
+function readdirStream (dir, options, internalOptions) {
+  internalOptions.facade = streamFacade;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSymbolIterator", function() { return getSymbolIterator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iterator", function() { return iterator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$iterator", function() { return $$iterator; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function getSymbolIterator() {
-    if (typeof Symbol !== 'function' || !Symbol.iterator) {
-        return '@@iterator';
-    }
-    return Symbol.iterator;
+  let reader = new DirectoryReader(dir, options, internalOptions);
+  return reader.stream;
 }
-var iterator = /*@__PURE__*/ getSymbolIterator();
-var $$iterator = iterator;
-//# sourceMappingURL=iterator.js.map
 
 
 /***/ }),
-/* 77 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/sync/for-each.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToObservable", function() { return subscribeToObservable; });
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(24);
-/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
 
-var subscribeToObservable = function (obj) {
-    return function (subscriber) {
-        var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]]();
-        if (typeof obs.subscribe !== 'function') {
-            throw new TypeError('Provided object does not correctly implement Symbol.observable');
-        }
-        else {
-            return obs.subscribe(subscriber);
-        }
-    };
-};
-//# sourceMappingURL=subscribeToObservable.js.map
 
+module.exports = syncForEach;
 
-/***/ }),
-/* 78 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * A facade that allows {@link Array.forEach} to be called as though it were asynchronous.
+ *
+ * @param {array} array - The array to iterate over
+ * @param {function} iterator - The function to call for each item in the array
+ * @param {function} done - The function to call when all iterators have completed
+ */
+function syncForEach (array, iterator, done) {
+  array.forEach(item => {
+    iterator(item, () => {
+      // Note: No error-handling here because this is currently only ever called
+      // by DirectoryReader, which never passes an `error` parameter to the callback.
+      // Instead, DirectoryReader emits an "error" event if an error occurs.
+    });
+  });
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayLike", function() { return isArrayLike; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
-//# sourceMappingURL=isArrayLike.js.map
+  done();
+}
 
 
 /***/ }),
-/* 79 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isPromise(value) {
-    return !!value && typeof value.subscribe !== 'function' && typeof value.then === 'function';
-}
-//# sourceMappingURL=isPromise.js.map
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/sync/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-/***/ }),
-/* 80 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; });
-/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(45);
-/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(81);
-/** PURE_IMPORTS_START _of,_operators_concatAll PURE_IMPORTS_END */
+const fs = __webpack_require__("fs");
+const call = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/call.js");
 
+/**
+ * A facade around {@link fs.readdirSync} that allows it to be called
+ * the same way as {@link fs.readdir}.
+ *
+ * @param {string} dir
+ * @param {function} callback
+ */
+exports.readdir = function (dir, callback) {
+  // Make sure the callback is only called once
+  callback = call.once(callback);
 
-function concat() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables));
-}
-//# sourceMappingURL=concat.js.map
+  try {
+    let items = fs.readdirSync(dir);
+    callback(null, items);
+  }
+  catch (err) {
+    callback(err);
+  }
+};
 
+/**
+ * A facade around {@link fs.statSync} that allows it to be called
+ * the same way as {@link fs.stat}.
+ *
+ * @param {string} path
+ * @param {function} callback
+ */
+exports.stat = function (path, callback) {
+  // Make sure the callback is only called once
+  callback = call.once(callback);
 
-/***/ }),
-/* 81 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  try {
+    let stats = fs.statSync(path);
+    callback(null, stats);
+  }
+  catch (err) {
+    callback(err);
+  }
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return concatAll; });
-/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(82);
-/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */
+/**
+ * A facade around {@link fs.lstatSync} that allows it to be called
+ * the same way as {@link fs.lstat}.
+ *
+ * @param {string} path
+ * @param {function} callback
+ */
+exports.lstat = function (path, callback) {
+  // Make sure the callback is only called once
+  callback = call.once(callback);
 
-function concatAll() {
-    return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(1);
-}
-//# sourceMappingURL=concatAll.js.map
+  try {
+    let stats = fs.lstatSync(path);
+    callback(null, stats);
+  }
+  catch (err) {
+    callback(err);
+  }
+};
 
 
 /***/ }),
-/* 82 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return mergeAll; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(83);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
-/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/lib/sync/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-function mergeAll(concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"], concurrent);
-}
-//# sourceMappingURL=mergeAll.js.map
 
+module.exports = readdirSync;
 
-/***/ }),
-/* 83 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const DirectoryReader = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/directory-reader.js");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return mergeMap; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapOperator", function() { return MergeMapOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapSubscriber", function() { return MergeMapSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return flatMap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_map,_observable_from,_innerSubscribe PURE_IMPORTS_END */
+let syncFacade = {
+  fs: __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/sync/fs.js"),
+  forEach: __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/sync/for-each.js"),
+  sync: true
+};
 
+/**
+ * Returns the buffered output from a synchronous {@link DirectoryReader}.
+ *
+ * @param {string} dir
+ * @param {object} [options]
+ * @param {object} internalOptions
+ */
+function readdirSync (dir, options, internalOptions) {
+  internalOptions.facade = syncFacade;
 
+  let reader = new DirectoryReader(dir, options, internalOptions);
+  let stream = reader.stream;
 
+  let results = [];
+  let data = stream.read();
+  while (data !== null) {
+    results.push(data);
+    data = stream.read();
+  }
 
-function mergeMap(project, resultSelector, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (typeof resultSelector === 'function') {
-        return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); };
-    }
-    else if (typeof resultSelector === 'number') {
-        concurrent = resultSelector;
-    }
-    return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); };
+  return results;
 }
-var MergeMapOperator = /*@__PURE__*/ (function () {
-    function MergeMapOperator(project, concurrent) {
-        if (concurrent === void 0) {
-            concurrent = Number.POSITIVE_INFINITY;
-        }
-        this.project = project;
-        this.concurrent = concurrent;
-    }
-    MergeMapOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent));
-    };
-    return MergeMapOperator;
-}());
 
-var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeMapSubscriber, _super);
-    function MergeMapSubscriber(destination, project, concurrent) {
-        if (concurrent === void 0) {
-            concurrent = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.concurrent = concurrent;
-        _this.hasCompleted = false;
-        _this.buffer = [];
-        _this.active = 0;
-        _this.index = 0;
-        return _this;
-    }
-    MergeMapSubscriber.prototype._next = function (value) {
-        if (this.active < this.concurrent) {
-            this._tryNext(value);
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    MergeMapSubscriber.prototype._tryNext = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.active++;
-        this._innerSub(result);
-    };
-    MergeMapSubscriber.prototype._innerSub = function (ish) {
-        var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleInnerSubscriber"](this);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["innerSubscribe"])(ish, innerSubscriber);
-        if (innerSubscription !== innerSubscriber) {
-            destination.add(innerSubscription);
-        }
-    };
-    MergeMapSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (this.active === 0 && this.buffer.length === 0) {
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    MergeMapSubscriber.prototype.notifyNext = function (innerValue) {
-        this.destination.next(innerValue);
-    };
-    MergeMapSubscriber.prototype.notifyComplete = function () {
-        var buffer = this.buffer;
-        this.active--;
-        if (buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        else if (this.active === 0 && this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return MergeMapSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleOuterSubscriber"]));
 
-var flatMap = mergeMap;
-//# sourceMappingURL=mergeMap.js.map
+/***/ }),
 
+/***/ "../../node_modules/@mrmlnc/readdir-enhanced/node_modules/glob-to-regexp/index.js":
+/***/ (function(module, exports) {
 
-/***/ }),
-/* 84 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = function (glob, opts) {
+  if (typeof glob !== 'string') {
+    throw new TypeError('Expected a string');
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73);
-/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(85);
-/** PURE_IMPORTS_START _Observable,_util_subscribeTo,_scheduled_scheduled PURE_IMPORTS_END */
+  var str = String(glob);
 
+  // The regexp we are building, as a string.
+  var reStr = "";
 
+  // Whether we are matching so called "extended" globs (like bash) and should
+  // support single character matching, matching ranges of characters, group
+  // matching, etc.
+  var extended = opts ? !!opts.extended : false;
 
-function from(input, scheduler) {
-    if (!scheduler) {
-        if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
-            return input;
-        }
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(input));
-    }
-    else {
-        return Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__["scheduled"])(input, scheduler);
-    }
-}
-//# sourceMappingURL=from.js.map
+  // When globstar is _false_ (default), '/foo/*' is translated a regexp like
+  // '^\/foo\/.*$' which will match any string beginning with '/foo/'
+  // When globstar is _true_, '/foo/*' is translated to regexp like
+  // '^\/foo\/[^/]*$' which will match any string beginning with '/foo/' BUT
+  // which does not have a '/' to the right of it.
+  // E.g. with '/foo/*' these will match: '/foo/bar', '/foo/bar.txt' but
+  // these will not '/foo/bar/baz', '/foo/bar/baz.txt'
+  // Lastely, when globstar is _true_, '/foo/**' is equivelant to '/foo/*' when
+  // globstar is _false_
+  var globstar = opts ? !!opts.globstar : false;
 
+  // If we are doing extended matching, this boolean is true when we are inside
+  // a group (eg {*.html,*.js}), and false otherwise.
+  var inGroup = false;
 
-/***/ }),
-/* 85 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // RegExp flags (eg "i" ) to pass in to RegExp constructor.
+  var flags = opts && typeof( opts.flags ) === "string" ? opts.flags : "";
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return scheduled; });
-/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86);
-/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(87);
-/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(49);
-/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(88);
-/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(89);
-/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79);
-/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(78);
-/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(90);
-/** PURE_IMPORTS_START _scheduleObservable,_schedulePromise,_scheduleArray,_scheduleIterable,_util_isInteropObservable,_util_isPromise,_util_isArrayLike,_util_isIterable PURE_IMPORTS_END */
+  var c;
+  for (var i = 0, len = str.length; i < len; i++) {
+    c = str[i];
+
+    switch (c) {
+    case "\\":
+    case "/":
+    case "$":
+    case "^":
+    case "+":
+    case ".":
+    case "(":
+    case ")":
+    case "=":
+    case "!":
+    case "|":
+      reStr += "\\" + c;
+      break;
 
+    case "?":
+      if (extended) {
+        reStr += ".";
+	    break;
+      }
 
+    case "[":
+    case "]":
+      if (extended) {
+        reStr += c;
+	    break;
+      }
 
+    case "{":
+      if (extended) {
+        inGroup = true;
+	    reStr += "(";
+	    break;
+      }
 
+    case "}":
+      if (extended) {
+        inGroup = false;
+	    reStr += ")";
+	    break;
+      }
 
+    case ",":
+      if (inGroup) {
+        reStr += "|";
+	    break;
+      }
+      reStr += "\\" + c;
+      break;
 
+    case "*":
+      // Move over all consecutive "*"'s.
+      // Also store the previous and next characters
+      var prevChar = str[i - 1];
+      var starCount = 1;
+      while(str[i + 1] === "*") {
+        starCount++;
+        i++;
+      }
+      var nextChar = str[i + 1];
 
+      if (!globstar) {
+        // globstar is disabled, so treat any number of "*" as one
+        reStr += ".*";
+      } else {
+        // globstar is enabled, so determine if this is a globstar segment
+        var isGlobstar = starCount > 1                      // multiple "*"'s
+          && (prevChar === "/" || prevChar === undefined)   // from the start of the segment
+          && (nextChar === "/" || nextChar === undefined)   // to the end of the segment
 
-function scheduled(input, scheduler) {
-    if (input != null) {
-        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__["isInteropObservable"])(input)) {
-            return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__["scheduleObservable"])(input, scheduler);
-        }
-        else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(input)) {
-            return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__["schedulePromise"])(input, scheduler);
-        }
-        else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__["isArrayLike"])(input)) {
-            return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
-        }
-        else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__["isIterable"])(input) || typeof input === 'string') {
-            return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__["scheduleIterable"])(input, scheduler);
+        if (isGlobstar) {
+          // it's a globstar, so match zero or more path segments
+          reStr += "(?:[^/]*(?:\/|$))*";
+          i++; // move over the "/"
+        } else {
+          // it's not a globstar, so only match one path segment
+          reStr += "[^/]*";
         }
+      }
+      break;
+
+    default:
+      reStr += c;
     }
-    throw new TypeError((input !== null && typeof input || input) + ' is not observable');
-}
-//# sourceMappingURL=scheduled.js.map
+  }
 
+  // When regexp 'g' flag is specified don't
+  // constrain the regular expression with ^ & $
+  if (!flags || !~flags.indexOf('g')) {
+    reStr = "^" + reStr + "$";
+  }
 
-/***/ }),
-/* 86 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return new RegExp(reStr, flags);
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleObservable", function() { return scheduleObservable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
-/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable PURE_IMPORTS_END */
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.scandir/out/adapters/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function scheduleObservable(input, scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        sub.add(scheduler.schedule(function () {
-            var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]]();
-            sub.add(observable.subscribe({
-                next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); },
-                error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); },
-                complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); },
-            }));
-        }));
-        return sub;
-    });
-}
-//# sourceMappingURL=scheduleObservable.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("fs");
+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;
 
 
 /***/ }),
-/* 87 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "schedulePromise", function() { return schedulePromise; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
 
+/***/ "../../node_modules/@nodelib/fs.scandir/out/constants.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function schedulePromise(input, scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        sub.add(scheduler.schedule(function () {
-            return input.then(function (value) {
-                sub.add(scheduler.schedule(function () {
-                    subscriber.next(value);
-                    sub.add(scheduler.schedule(function () { return subscriber.complete(); }));
-                }));
-            }, function (err) {
-                sub.add(scheduler.schedule(function () { return subscriber.error(err); }));
-            });
-        }));
-        return sub;
-    });
-}
-//# sourceMappingURL=schedulePromise.js.map
+"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;
 
 
 /***/ }),
-/* 88 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleIterable", function() { return scheduleIterable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(76);
-/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator PURE_IMPORTS_END */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/providers/async.js");
+const sync = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/settings.js");
+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);
+}
 
 
+/***/ }),
 
-function scheduleIterable(input, scheduler) {
-    if (!input) {
-        throw new Error('Iterable cannot be null');
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        var iterator;
-        sub.add(function () {
-            if (iterator && typeof iterator.return === 'function') {
-                iterator.return();
-            }
-        });
-        sub.add(scheduler.schedule(function () {
-            iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]]();
-            sub.add(scheduler.schedule(function () {
-                if (subscriber.closed) {
-                    return;
-                }
-                var value;
-                var done;
-                try {
-                    var result = iterator.next();
-                    value = result.value;
-                    done = result.done;
-                }
-                catch (err) {
-                    subscriber.error(err);
-                    return;
-                }
-                if (done) {
-                    subscriber.complete();
-                }
-                else {
-                    subscriber.next(value);
-                    this.schedule();
-                }
-            }));
-        }));
-        return sub;
-    });
-}
-//# sourceMappingURL=scheduleIterable.js.map
+/***/ "../../node_modules/@nodelib/fs.scandir/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const rpl = __webpack_require__("../../node_modules/run-parallel/index.js");
+const constants_1 = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/constants.js");
+const utils = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/utils/index.js");
+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);
+}
 
 
 /***/ }),
-/* 89 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; });
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(24);
-/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
+/***/ "../../node_modules/@nodelib/fs.scandir/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function isInteropObservable(input) {
-    return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function';
-}
-//# sourceMappingURL=isInteropObservable.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const constants_1 = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/constants.js");
+const utils = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/utils/index.js");
+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;
 
 
 /***/ }),
-/* 90 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; });
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(76);
-/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
+/***/ "../../node_modules/@nodelib/fs.scandir/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function isIterable(input) {
-    return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function';
-}
-//# sourceMappingURL=isIterable.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fs = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/adapters/fs.js");
+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;
 
 
 /***/ }),
-/* 91 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.scandir/out/utils/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SimpleInnerSubscriber", function() { return SimpleInnerSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ComplexInnerSubscriber", function() { return ComplexInnerSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SimpleOuterSubscriber", function() { return SimpleOuterSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ComplexOuterSubscriber", function() { return ComplexOuterSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "innerSubscribe", function() { return innerSubscribe; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
-/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(73);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_util_subscribeTo PURE_IMPORTS_END */
+
+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;
 
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.scandir/out/utils/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var SimpleInnerSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SimpleInnerSubscriber, _super);
-    function SimpleInnerSubscriber(parent) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        return _this;
-    }
-    SimpleInnerSubscriber.prototype._next = function (value) {
-        this.parent.notifyNext(value);
-    };
-    SimpleInnerSubscriber.prototype._error = function (error) {
-        this.parent.notifyError(error);
-        this.unsubscribe();
-    };
-    SimpleInnerSubscriber.prototype._complete = function () {
-        this.parent.notifyComplete();
-        this.unsubscribe();
-    };
-    return SimpleInnerSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/utils/fs.js");
+exports.fs = fs;
 
-var ComplexInnerSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ComplexInnerSubscriber, _super);
-    function ComplexInnerSubscriber(parent, outerValue, outerIndex) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.outerValue = outerValue;
-        _this.outerIndex = outerIndex;
-        return _this;
-    }
-    ComplexInnerSubscriber.prototype._next = function (value) {
-        this.parent.notifyNext(this.outerValue, value, this.outerIndex, this);
-    };
-    ComplexInnerSubscriber.prototype._error = function (error) {
-        this.parent.notifyError(error);
-        this.unsubscribe();
-    };
-    ComplexInnerSubscriber.prototype._complete = function () {
-        this.parent.notifyComplete(this);
-        this.unsubscribe();
-    };
-    return ComplexInnerSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
 
-var SimpleOuterSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SimpleOuterSubscriber, _super);
-    function SimpleOuterSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    SimpleOuterSubscriber.prototype.notifyNext = function (innerValue) {
-        this.destination.next(innerValue);
-    };
-    SimpleOuterSubscriber.prototype.notifyError = function (err) {
-        this.destination.error(err);
-    };
-    SimpleOuterSubscriber.prototype.notifyComplete = function () {
-        this.destination.complete();
-    };
-    return SimpleOuterSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+/***/ }),
 
-var ComplexOuterSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ComplexOuterSubscriber, _super);
-    function ComplexOuterSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    ComplexOuterSubscriber.prototype.notifyNext = function (_outerValue, innerValue, _outerIndex, _innerSub) {
-        this.destination.next(innerValue);
-    };
-    ComplexOuterSubscriber.prototype.notifyError = function (error) {
-        this.destination.error(error);
-    };
-    ComplexOuterSubscriber.prototype.notifyComplete = function (_innerSub) {
-        this.destination.complete();
-    };
-    return ComplexOuterSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+/***/ "../../node_modules/@nodelib/fs.stat/out/adapters/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function innerSubscribe(result, innerSubscriber) {
-    if (innerSubscriber.closed) {
-        return undefined;
-    }
-    if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]) {
-        return result.subscribe(innerSubscriber);
-    }
-    return Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_3__["subscribeTo"])(result)(innerSubscriber);
-}
-//# sourceMappingURL=innerSubscribe.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("fs");
+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;
 
 
 /***/ }),
-/* 92 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.stat/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return defer; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44);
-/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/providers/async.js");
+const sync = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/settings.js");
+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);
+}
 
 
+/***/ }),
 
-function defer(observableFactory) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var input;
-        try {
-            input = observableFactory();
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var source = input ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(input) : Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])();
-        return source.subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=defer.js.map
-
-
-/***/ }),
-/* 93 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ "../../node_modules/@nodelib/fs.stat/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return forkJoin; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(67);
-/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(20);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(84);
-/** PURE_IMPORTS_START _Observable,_util_isArray,_operators_map,_util_isObject,_from PURE_IMPORTS_END */
-
-
-
-
-
-function forkJoin() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    if (sources.length === 1) {
-        var first_1 = sources[0];
-        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(first_1)) {
-            return forkJoinInternal(first_1, null);
-        }
-        if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_3__["isObject"])(first_1) && Object.getPrototypeOf(first_1) === Object.prototype) {
-            var keys = Object.keys(first_1);
-            return forkJoinInternal(keys.map(function (key) { return first_1[key]; }), keys);
-        }
-    }
-    if (typeof sources[sources.length - 1] === 'function') {
-        var resultSelector_1 = sources.pop();
-        sources = (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(sources[0])) ? sources[0] : sources;
-        return forkJoinInternal(sources, null).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return resultSelector_1.apply(void 0, args); }));
-    }
-    return forkJoinInternal(sources, null);
-}
-function forkJoinInternal(sources, keys) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var len = sources.length;
-        if (len === 0) {
-            subscriber.complete();
-            return;
-        }
-        var values = new Array(len);
-        var completed = 0;
-        var emitted = 0;
-        var _loop_1 = function (i) {
-            var source = Object(_from__WEBPACK_IMPORTED_MODULE_4__["from"])(sources[i]);
-            var hasValue = false;
-            subscriber.add(source.subscribe({
-                next: function (value) {
-                    if (!hasValue) {
-                        hasValue = true;
-                        emitted++;
-                    }
-                    values[i] = value;
-                },
-                error: function (err) { return subscriber.error(err); },
-                complete: function () {
-                    completed++;
-                    if (completed === len || !hasValue) {
-                        if (emitted === len) {
-                            subscriber.next(keys ?
-                                keys.reduce(function (result, key, i) { return (result[key] = values[i], result); }, {}) :
-                                values);
-                        }
-                        subscriber.complete();
-                    }
-                }
-            }));
-        };
-        for (var i = 0; i < len; i++) {
-            _loop_1(i);
-        }
-    });
-}
-//# sourceMappingURL=forkJoin.js.map
+
+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);
+}
 
 
 /***/ }),
-/* 94 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.stat/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return fromEvent; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(67);
-/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
+
+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;
 
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.stat/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var toString = /*@__PURE__*/ (function () { return Object.prototype.toString; })();
-function fromEvent(target, eventName, options, resultSelector) {
-    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(options)) {
-        resultSelector = options;
-        options = undefined;
-    }
-    if (resultSelector) {
-        return fromEvent(target, eventName, options).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        function handler(e) {
-            if (arguments.length > 1) {
-                subscriber.next(Array.prototype.slice.call(arguments));
-            }
-            else {
-                subscriber.next(e);
-            }
-        }
-        setupSubscription(target, eventName, handler, subscriber, options);
-    });
-}
-function setupSubscription(sourceObj, eventName, handler, subscriber, options) {
-    var unsubscribe;
-    if (isEventTarget(sourceObj)) {
-        var source_1 = sourceObj;
-        sourceObj.addEventListener(eventName, handler, options);
-        unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); };
-    }
-    else if (isJQueryStyleEventEmitter(sourceObj)) {
-        var source_2 = sourceObj;
-        sourceObj.on(eventName, handler);
-        unsubscribe = function () { return source_2.off(eventName, handler); };
-    }
-    else if (isNodeStyleEventEmitter(sourceObj)) {
-        var source_3 = sourceObj;
-        sourceObj.addListener(eventName, handler);
-        unsubscribe = function () { return source_3.removeListener(eventName, handler); };
-    }
-    else if (sourceObj && sourceObj.length) {
-        for (var i = 0, len = sourceObj.length; i < len; i++) {
-            setupSubscription(sourceObj[i], eventName, handler, subscriber, options);
-        }
-    }
-    else {
-        throw new TypeError('Invalid event target');
-    }
-    subscriber.add(unsubscribe);
-}
-function isNodeStyleEventEmitter(sourceObj) {
-    return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function';
-}
-function isJQueryStyleEventEmitter(sourceObj) {
-    return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function';
-}
-function isEventTarget(sourceObj) {
-    return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function';
-}
-//# sourceMappingURL=fromEvent.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/adapters/fs.js");
+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;
 
 
 /***/ }),
-/* 95 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.walk/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return fromEventPattern; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(67);
-/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/providers/async.js");
+const stream_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/providers/stream.js");
+const sync_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/settings.js");
+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);
+}
 
 
+/***/ }),
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function fromEventPattern(addHandler, removeHandler, resultSelector) {
-    if (resultSelector) {
-        return fromEventPattern(addHandler, removeHandler).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var handler = function () {
-            var e = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                e[_i] = arguments[_i];
-            }
-            return subscriber.next(e.length === 1 ? e[0] : e);
-        };
-        var retValue;
-        try {
-            retValue = addHandler(handler);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        if (!Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(removeHandler)) {
-            return undefined;
-        }
-        return function () { return removeHandler(handler, retValue); };
-    });
-}
-//# sourceMappingURL=fromEventPattern.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/async.js");
+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);
+}
 
 
 /***/ }),
-/* 96 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return generate; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
-
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/providers/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) {
-    var resultSelector;
-    var initialState;
-    if (arguments.length == 1) {
-        var options = initialStateOrOptions;
-        initialState = options.initialState;
-        condition = options.condition;
-        iterate = options.iterate;
-        resultSelector = options.resultSelector || _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
-        scheduler = options.scheduler;
-    }
-    else if (resultSelectorOrObservable === undefined || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(resultSelectorOrObservable)) {
-        initialState = initialStateOrOptions;
-        resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
-        scheduler = resultSelectorOrObservable;
-    }
-    else {
-        initialState = initialStateOrOptions;
-        resultSelector = resultSelectorOrObservable;
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var state = initialState;
-        if (scheduler) {
-            return scheduler.schedule(dispatch, 0, {
-                subscriber: subscriber,
-                iterate: iterate,
-                condition: condition,
-                resultSelector: resultSelector,
-                state: state
-            });
-        }
-        do {
-            if (condition) {
-                var conditionResult = void 0;
-                try {
-                    conditionResult = condition(state);
-                }
-                catch (err) {
-                    subscriber.error(err);
-                    return undefined;
-                }
-                if (!conditionResult) {
-                    subscriber.complete();
-                    break;
-                }
-            }
-            var value = void 0;
-            try {
-                value = resultSelector(state);
-            }
-            catch (err) {
-                subscriber.error(err);
-                return undefined;
-            }
-            subscriber.next(value);
-            if (subscriber.closed) {
-                break;
-            }
-            try {
-                state = iterate(state);
-            }
-            catch (err) {
-                subscriber.error(err);
-                return undefined;
-            }
-        } while (true);
-        return undefined;
-    });
-}
-function dispatch(state) {
-    var subscriber = state.subscriber, condition = state.condition;
-    if (subscriber.closed) {
-        return undefined;
-    }
-    if (state.needIterate) {
-        try {
-            state.state = state.iterate(state.state);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-    }
-    else {
-        state.needIterate = true;
-    }
-    if (condition) {
-        var conditionResult = void 0;
-        try {
-            conditionResult = condition(state.state);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        if (!conditionResult) {
-            subscriber.complete();
-            return undefined;
-        }
-        if (subscriber.closed) {
-            return undefined;
-        }
-    }
-    var value;
-    try {
-        value = state.resultSelector(state.state);
-    }
-    catch (err) {
-        subscriber.error(err);
-        return undefined;
-    }
-    if (subscriber.closed) {
-        return undefined;
-    }
-    subscriber.next(value);
-    if (subscriber.closed) {
-        return undefined;
-    }
-    return this.schedule(state);
-}
-//# sourceMappingURL=generate.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const async_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/async.js");
+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;
 
 
 /***/ }),
-/* 97 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return iif; });
-/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44);
-/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/providers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function iif(condition, trueResult, falseResult) {
-    if (trueResult === void 0) {
-        trueResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
-    }
-    if (falseResult === void 0) {
-        falseResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
-    }
-    return Object(_defer__WEBPACK_IMPORTED_MODULE_0__["defer"])(function () { return condition() ? trueResult : falseResult; });
-}
-//# sourceMappingURL=iif.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/sync.js");
+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;
 
 
 /***/ }),
-/* 98 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return interval; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(99);
-/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */
-
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function interval(period, scheduler) {
-    if (period === void 0) {
-        period = 0;
-    }
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(period) || period < 0) {
-        period = 0;
-    }
-    if (!scheduler || typeof scheduler.schedule !== 'function') {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period }));
-        return subscriber;
-    });
-}
-function dispatch(state) {
-    var subscriber = state.subscriber, counter = state.counter, period = state.period;
-    subscriber.next(counter);
-    this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period);
-}
-//# sourceMappingURL=interval.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __webpack_require__("events");
+const fsScandir = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/index.js");
+const fastq = __webpack_require__("../../node_modules/fastq/queue.js");
+const common = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/common.js");
+const reader_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/reader.js");
+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;
 
 
 /***/ }),
-/* 99 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isNumeric", function() { return isNumeric; });
-/* harmony import */ var _isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
-/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/common.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function isNumeric(val) {
-    return !Object(_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(val) && (val - parseFloat(val) + 1) >= 0;
-}
-//# sourceMappingURL=isNumeric.js.map
+"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;
 
 
 /***/ }),
-/* 100 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/reader.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(46);
-/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(82);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(47);
-/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const common = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/common.js");
+class Reader {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
+    }
+}
+exports.default = Reader;
 
 
+/***/ }),
 
-
-function merge() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var concurrent = Number.POSITIVE_INFINITY;
-    var scheduler = null;
-    var last = observables[observables.length - 1];
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(last)) {
-        scheduler = observables.pop();
-        if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') {
-            concurrent = observables.pop();
-        }
-    }
-    else if (typeof last === 'number') {
-        concurrent = observables.pop();
-    }
-    if (scheduler === null && observables.length === 1 && observables[0] instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
-        return observables[0];
-    }
-    return Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__["mergeAll"])(concurrent)(Object(_fromArray__WEBPACK_IMPORTED_MODULE_3__["fromArray"])(observables, scheduler));
-}
-//# sourceMappingURL=merge.js.map
-
-
-/***/ }),
-/* 101 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ "../../node_modules/@nodelib/fs.walk/out/readers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return NEVER; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return never; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61);
-/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
-
-
-var NEVER = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](_util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]);
-function never() {
-    return NEVER;
-}
-//# sourceMappingURL=never.js.map
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsScandir = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/index.js");
+const common = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/common.js");
+const reader_1 = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/readers/reader.js");
+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;
 
 
 /***/ }),
-/* 102 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(44);
-/** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */
-
-
 
+/***/ "../../node_modules/@nodelib/fs.walk/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function onErrorResumeNext() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    if (sources.length === 0) {
-        return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"];
-    }
-    var first = sources[0], remainder = sources.slice(1);
-    if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(first)) {
-        return onErrorResumeNext.apply(void 0, first);
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); };
-        return Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(first).subscribe({
-            next: function (value) { subscriber.next(value); },
-            error: subNext,
-            complete: subNext,
-        });
-    });
-}
-//# sourceMappingURL=onErrorResumeNext.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsScandir = __webpack_require__("../../node_modules/@nodelib/fs.scandir/out/index.js");
+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;
 
 
 /***/ }),
-/* 103 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return pairs; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
 
+/***/ "../../node_modules/@yarnpkg/lockfile/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function pairs(obj, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var keys = Object.keys(obj);
-            for (var i = 0; i < keys.length && !subscriber.closed; i++) {
-                var key = keys[i];
-                if (obj.hasOwnProperty(key)) {
-                    subscriber.next([key, obj[key]]);
-                }
-            }
-            subscriber.complete();
-        });
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var keys = Object.keys(obj);
-            var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj }));
-            return subscription;
-        });
-    }
-}
-function dispatch(state) {
-    var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj;
-    if (!subscriber.closed) {
-        if (index < keys.length) {
-            var key = keys[index];
-            subscriber.next([key, obj[key]]);
-            subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj }));
-        }
-        else {
-            subscriber.complete();
-        }
-    }
-}
-//# sourceMappingURL=pairs.js.map
+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) {
 
+module.exports = __webpack_require__("path");
 
 /***/ }),
-/* 104 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; });
-/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(105);
-/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(73);
-/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(106);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10);
-/** PURE_IMPORTS_START _util_not,_util_subscribeTo,_operators_filter,_Observable PURE_IMPORTS_END */
 
 
+exports.__esModule = true;
 
+var _promise = __webpack_require__(173);
 
-function partition(source, predicate, thisArg) {
-    return [
-        Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(predicate, thisArg)(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))),
-        Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source)))
-    ];
-}
-//# sourceMappingURL=partition.js.map
+var _promise2 = _interopRequireDefault(_promise);
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/***/ }),
-/* 105 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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;
+        }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function not(pred, thisArg) {
-    function notPred() {
-        return !(notPred.pred.apply(notPred.thisArg, arguments));
-    }
-    notPred.pred = pred;
-    notPred.thisArg = thisArg;
-    return notPred;
-}
-//# sourceMappingURL=not.js.map
+        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");
+    });
+  };
+};
 
 /***/ }),
-/* 106 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+/* 2 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__("util");
 
-function filter(predicate, thisArg) {
-    return function filterOperatorFunction(source) {
-        return source.lift(new FilterOperator(predicate, thisArg));
-    };
-}
-var FilterOperator = /*@__PURE__*/ (function () {
-    function FilterOperator(predicate, thisArg) {
-        this.predicate = predicate;
-        this.thisArg = thisArg;
-    }
-    FilterOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg));
-    };
-    return FilterOperator;
-}());
-var FilterSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FilterSubscriber, _super);
-    function FilterSubscriber(destination, predicate, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.thisArg = thisArg;
-        _this.count = 0;
-        return _this;
-    }
-    FilterSubscriber.prototype._next = function (value) {
-        var result;
-        try {
-            result = this.predicate.call(this.thisArg, value, this.count++);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (result) {
-            this.destination.next(value);
-        }
-    };
-    return FilterSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=filter.js.map
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__("fs");
 
 /***/ }),
-/* 107 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceOperator", function() { return RaceOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceSubscriber", function() { return RaceSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(47);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(71);
-/** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+class MessageError extends Error {
+  constructor(msg, code) {
+    super(msg);
+    this.code = code;
+  }
 
-function race() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    if (observables.length === 1) {
-        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(observables[0])) {
-            observables = observables[0];
-        }
-        else {
-            return observables[0];
-        }
-    }
-    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_2__["fromArray"])(observables, undefined).lift(new RaceOperator());
 }
-var RaceOperator = /*@__PURE__*/ (function () {
-    function RaceOperator() {
-    }
-    RaceOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RaceSubscriber(subscriber));
-    };
-    return RaceOperator;
-}());
 
-var RaceSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RaceSubscriber, _super);
-    function RaceSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasFirst = false;
-        _this.observables = [];
-        _this.subscriptions = [];
-        return _this;
-    }
-    RaceSubscriber.prototype._next = function (observable) {
-        this.observables.push(observable);
-    };
-    RaceSubscriber.prototype._complete = function () {
-        var observables = this.observables;
-        var len = observables.length;
-        if (len === 0) {
-            this.destination.complete();
-        }
-        else {
-            for (var i = 0; i < len && !this.hasFirst; i++) {
-                var observable = observables[i];
-                var subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, undefined, i);
-                if (this.subscriptions) {
-                    this.subscriptions.push(subscription);
-                }
-                this.add(subscription);
-            }
-            this.observables = null;
-        }
-    };
-    RaceSubscriber.prototype.notifyNext = function (_outerValue, innerValue, outerIndex) {
-        if (!this.hasFirst) {
-            this.hasFirst = true;
-            for (var i = 0; i < this.subscriptions.length; i++) {
-                if (i !== outerIndex) {
-                    var subscription = this.subscriptions[i];
-                    subscription.unsubscribe();
-                    this.remove(subscription);
-                }
-            }
-            this.subscriptions = null;
-        }
-        this.destination.next(innerValue);
-    };
-    return RaceSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+exports.MessageError = MessageError;
+class ProcessSpawnError extends MessageError {
+  constructor(msg, code, process) {
+    super(msg, code);
+    this.process = process;
+  }
 
-//# sourceMappingURL=race.js.map
+}
 
+exports.ProcessSpawnError = ProcessSpawnError;
+class SecurityError extends MessageError {}
 
-/***/ }),
-/* 108 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+exports.SecurityError = SecurityError;
+class ProcessTermError extends MessageError {}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return range; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+exports.ProcessTermError = ProcessTermError;
+class ResponseError extends Error {
+  constructor(msg, responseCode) {
+    super(msg);
+    this.responseCode = responseCode;
+  }
 
-function range(start, count, scheduler) {
-    if (start === void 0) {
-        start = 0;
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        if (count === undefined) {
-            count = start;
-            start = 0;
-        }
-        var index = 0;
-        var current = start;
-        if (scheduler) {
-            return scheduler.schedule(dispatch, 0, {
-                index: index, count: count, start: start, subscriber: subscriber
-            });
-        }
-        else {
-            do {
-                if (index++ >= count) {
-                    subscriber.complete();
-                    break;
-                }
-                subscriber.next(current++);
-                if (subscriber.closed) {
-                    break;
-                }
-            } while (true);
-        }
-        return undefined;
-    });
-}
-function dispatch(state) {
-    var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber;
-    if (index >= count) {
-        subscriber.complete();
-        return;
-    }
-    subscriber.next(start);
-    if (subscriber.closed) {
-        return;
-    }
-    state.index = index + 1;
-    state.start = start + 1;
-    this.schedule(state);
 }
-//# sourceMappingURL=range.js.map
-
+exports.ResponseError = ResponseError;
 
 /***/ }),
-/* 109 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return timer; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(99);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
 
 
+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;
 
+var _asyncToGenerator2;
 
-function timer(dueTime, periodOrScheduler, scheduler) {
-    if (dueTime === void 0) {
-        dueTime = 0;
-    }
-    var period = -1;
-    if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(periodOrScheduler)) {
-        period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler);
-    }
-    else if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(periodOrScheduler)) {
-        scheduler = periodOrScheduler;
-    }
-    if (!Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(scheduler)) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var due = Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(dueTime)
-            ? dueTime
-            : (+dueTime - scheduler.now());
-        return scheduler.schedule(dispatch, due, {
-            index: 0, period: period, subscriber: subscriber
-        });
-    });
-}
-function dispatch(state) {
-    var index = state.index, period = state.period, subscriber = state.subscriber;
-    subscriber.next(index);
-    if (subscriber.closed) {
-        return;
-    }
-    else if (period === -1) {
-        return subscriber.complete();
-    }
-    state.index = index + 1;
-    this.schedule(state, period);
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
 }
-//# sourceMappingURL=timer.js.map
 
+let buildActionsForCopy = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-/***/ }),
-/* 110 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    //
+    let build = (() => {
+      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest,
+              type = data.type;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return using; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(10);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44);
-/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
 
+        // 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());
+        }
 
+        if (type === 'symlink') {
+          yield mkdirp((_path || _load_path()).default.dirname(dest));
+          onFresh();
+          actions.symlink.push({
+            dest,
+            linkname: src
+          });
+          onDone();
+          return;
+        }
 
-function using(resourceFactory, observableFactory) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var resource;
-        try {
-            resource = resourceFactory();
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
         }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
+
+        const srcStat = yield lstat(src);
+        let srcFiles;
+
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
         }
-        var result;
+
+        let destStat;
         try {
-            result = observableFactory(resource);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
+          // try accessing the destination
+          destStat = yield lstat(dest);
+        } catch (e) {
+          // proceed if destination doesn't exist, otherwise error
+          if (e.code !== 'ENOENT') {
+            throw e;
+          }
         }
-        var source = result ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"];
-        var subscription = source.subscribe(subscriber);
-        return function () {
-            subscription.unsubscribe();
-            if (resource) {
-                resource.unsubscribe();
-            }
-        };
-    });
-}
-//# sourceMappingURL=using.js.map
 
+        // if destination exists
+        if (destStat) {
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-/***/ }),
-/* 111 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          // 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.
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipOperator", function() { return ZipOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipSubscriber", function() { return ZipSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12);
-/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(76);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_.._internal_symbol_iterator,_innerSubscribe PURE_IMPORTS_END */
+          /* if (srcStat.mode !== destStat.mode) {
+            try {
+              await access(dest, srcStat.mode);
+            } catch (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;
+          }
 
+          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 (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;
+            }
+          }
 
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
 
+            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+              var _ref6;
 
-function zip() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var resultSelector = observables[observables.length - 1];
-    if (typeof resultSelector === 'function') {
-        observables.pop();
-    }
-    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(observables, undefined).lift(new ZipOperator(resultSelector));
-}
-var ZipOperator = /*@__PURE__*/ (function () {
-    function ZipOperator(resultSelector) {
-        this.resultSelector = resultSelector;
-    }
-    ZipOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector));
-    };
-    return ZipOperator;
-}());
+              if (_isArray4) {
+                if (_i4 >= _iterator4.length) break;
+                _ref6 = _iterator4[_i4++];
+              } else {
+                _i4 = _iterator4.next();
+                if (_i4.done) break;
+                _ref6 = _i4.value;
+              }
 
-var ZipSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipSubscriber, _super);
-    function ZipSubscriber(destination, resultSelector, values) {
-        if (values === void 0) {
-            values = Object.create(null);
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.resultSelector = resultSelector;
-        _this.iterators = [];
-        _this.active = 0;
-        _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : undefined;
-        return _this;
-    }
-    ZipSubscriber.prototype._next = function (value) {
-        var iterators = this.iterators;
-        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(value)) {
-            iterators.push(new StaticArrayIterator(value));
-        }
-        else if (typeof value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_4__["iterator"]] === 'function') {
-            iterators.push(new StaticIterator(value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_4__["iterator"]]()));
-        }
-        else {
-            iterators.push(new ZipBufferIterator(this.destination, this, value));
-        }
-    };
-    ZipSubscriber.prototype._complete = function () {
-        var iterators = this.iterators;
-        var len = iterators.length;
-        this.unsubscribe();
-        if (len === 0) {
-            this.destination.complete();
-            return;
-        }
-        this.active = len;
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            if (iterator.stillUnsubscribed) {
-                var destination = this.destination;
-                destination.add(iterator.subscribe());
-            }
-            else {
-                this.active--;
-            }
-        }
-    };
-    ZipSubscriber.prototype.notifyInactive = function () {
-        this.active--;
-        if (this.active === 0) {
-            this.destination.complete();
-        }
-    };
-    ZipSubscriber.prototype.checkIterators = function () {
-        var iterators = this.iterators;
-        var len = iterators.length;
-        var destination = this.destination;
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) {
-                return;
-            }
-        }
-        var shouldComplete = false;
-        var args = [];
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            var result = iterator.next();
-            if (iterator.hasCompleted()) {
-                shouldComplete = true;
-            }
-            if (result.done) {
-                destination.complete();
-                return;
-            }
-            args.push(result.value);
-        }
-        if (this.resultSelector) {
-            this._tryresultSelector(args);
-        }
-        else {
-            destination.next(args);
-        }
-        if (shouldComplete) {
-            destination.complete();
-        }
-    };
-    ZipSubscriber.prototype._tryresultSelector = function (args) {
-        var result;
-        try {
-            result = this.resultSelector.apply(this, args);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return ZipSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
+              const file = _ref6;
 
-var StaticIterator = /*@__PURE__*/ (function () {
-    function StaticIterator(iterator) {
-        this.iterator = iterator;
-        this.nextResult = iterator.next();
-    }
-    StaticIterator.prototype.hasValue = function () {
-        return true;
-    };
-    StaticIterator.prototype.next = function () {
-        var result = this.nextResult;
-        this.nextResult = this.iterator.next();
-        return result;
-    };
-    StaticIterator.prototype.hasCompleted = function () {
-        var nextResult = this.nextResult;
-        return Boolean(nextResult && nextResult.done);
-    };
-    return StaticIterator;
-}());
-var StaticArrayIterator = /*@__PURE__*/ (function () {
-    function StaticArrayIterator(array) {
-        this.array = array;
-        this.index = 0;
-        this.length = 0;
-        this.length = array.length;
-    }
-    StaticArrayIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_4__["iterator"]] = function () {
-        return this;
-    };
-    StaticArrayIterator.prototype.next = function (value) {
-        var i = this.index++;
-        var array = this.array;
-        return i < this.length ? { value: array[i], done: false } : { value: null, done: true };
-    };
-    StaticArrayIterator.prototype.hasValue = function () {
-        return this.array.length > this.index;
-    };
-    StaticArrayIterator.prototype.hasCompleted = function () {
-        return this.array.length === this.index;
-    };
-    return StaticArrayIterator;
-}());
-var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipBufferIterator, _super);
-    function ZipBufferIterator(destination, parent, observable) {
-        var _this = _super.call(this, destination) || this;
-        _this.parent = parent;
-        _this.observable = observable;
-        _this.stillUnsubscribed = true;
-        _this.buffer = [];
-        _this.isComplete = false;
-        return _this;
-    }
-    ZipBufferIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_4__["iterator"]] = function () {
-        return this;
-    };
-    ZipBufferIterator.prototype.next = function () {
-        var buffer = this.buffer;
-        if (buffer.length === 0 && this.isComplete) {
-            return { value: null, done: true };
-        }
-        else {
-            return { value: buffer.shift(), done: false };
-        }
-    };
-    ZipBufferIterator.prototype.hasValue = function () {
-        return this.buffer.length > 0;
-    };
-    ZipBufferIterator.prototype.hasCompleted = function () {
-        return this.buffer.length === 0 && this.isComplete;
-    };
-    ZipBufferIterator.prototype.notifyComplete = function () {
-        if (this.buffer.length > 0) {
-            this.isComplete = true;
-            this.parent.notifyInactive();
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    ZipBufferIterator.prototype.notifyNext = function (innerValue) {
-        this.buffer.push(innerValue);
-        this.parent.checkIterators();
-    };
-    ZipBufferIterator.prototype.subscribe = function () {
-        return Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_5__["innerSubscribe"])(this.observable, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_5__["SimpleInnerSubscriber"](this));
-    };
-    return ZipBufferIterator;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_5__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=zip.js.map
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
+                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;
 
-/***/ }),
-/* 112 */
-/***/ (function(module, exports, __webpack_require__) {
+                    if (_isArray5) {
+                      if (_i5 >= _iterator5.length) break;
+                      _ref7 = _iterator5[_i5++];
+                    } else {
+                      _i5 = _iterator5.next();
+                      if (_i5.done) break;
+                      _ref7 = _i5.value;
+                    }
 
-"use strict";
+                    const file = _ref7;
 
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
-var _interopRequireDefault = __webpack_require__(7);
+        if (destStat && destStat.isSymbolicLink()) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+          destStat = null;
+        }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ToolingLogTextWriter = void 0;
+        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);
+          }
 
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(8));
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-var _util = __webpack_require__(113);
+          // 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;
 
-var _chalk = _interopRequireDefault(__webpack_require__(114));
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref8 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref8 = _i6.value;
+            }
 
-var _log_levels = __webpack_require__(127);
+            const file = _ref8;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-const {
-  magentaBright,
-  yellow,
-  red,
-  blue,
-  green,
-  dim
-} = _chalk.default;
-const PREFIX_INDENT = ' '.repeat(6);
-const MSG_PREFIXES = {
-  verbose: ` ${magentaBright('sill')} `,
-  debug: ` ${dim('debg')} `,
-  info: ` ${blue('info')} `,
-  success: ` ${green('succ')} `,
-  warning: ` ${yellow('warn')} `,
-  error: `${red('ERROR')} `
-};
+            queue.push({
+              dest: (_path || _load_path()).default.join(dest, file),
+              onFresh,
+              onDone: function (_onDone) {
+                function onDone() {
+                  return _onDone.apply(this, arguments);
+                }
 
-const has = (obj, key) => obj.hasOwnProperty(key);
+                onDone.toString = function () {
+                  return _onDone.toString();
+                };
 
-function shouldWriteType(level, type) {
-  if (type === 'write') {
-    return level.name !== 'silent';
-  }
+                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}`);
+        }
+      });
 
-  return Boolean(level.flags[type === 'success' ? 'info' : type]);
-}
+      return function build(_x5) {
+        return _ref5.apply(this, arguments);
+      };
+    })();
 
-function stringifyError(error) {
-  if (typeof error !== 'string' && !(error instanceof Error)) {
-    error = new Error(`"${error}" thrown`);
-  }
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-  if (typeof error === 'string') {
-    return error;
-  }
+    // initialise events
+    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
 
-  return error.stack || error.message || error;
-}
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
 
-class ToolingLogTextWriter {
-  constructor(config) {
-    (0, _defineProperty2.default)(this, "level", void 0);
-    (0, _defineProperty2.default)(this, "writeTo", void 0);
-    (0, _defineProperty2.default)(this, "ignoreSources", void 0);
-    this.level = (0, _log_levels.parseLogLevel)(config.level);
-    this.writeTo = config.writeTo;
-    this.ignoreSources = config.ignoreSources;
+      const item = _ref2;
 
-    if (!this.writeTo || typeof this.writeTo.write !== 'function') {
-      throw new Error('ToolingLogTextWriter requires the `writeTo` option be set to a stream (like process.stdout)');
+      const onDone = item.onDone;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        if (onDone) {
+          onDone();
+        }
+      };
     }
-  }
+    events.onStart(queue.length);
 
-  write(msg) {
-    if (!shouldWriteType(this.level, msg.type)) {
-      return false;
+    // 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 (this.ignoreSources && msg.source && this.ignoreSources.includes(msg.source)) {
-      if (msg.type === 'write') {
-        const txt = (0, _util.format)(msg.args[0], ...msg.args.slice(1)); // Ensure that Elasticsearch deprecation log messages from Kibana aren't ignored
+    // 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;
 
-        if (!/elasticsearch\.deprecation/.test(txt)) {
-          return false;
-        }
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
       } else {
-        return false;
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
       }
-    }
-
-    const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
-    ToolingLogTextWriter.write(this.writeTo, prefix, msg);
-    return true;
-  }
 
-  static write(writeTo, prefix, msg) {
-    const txt = msg.type === 'error' ? stringifyError(msg.args[0]) : (0, _util.format)(msg.args[0], ...msg.args.slice(1));
-    (prefix + txt).split('\n').forEach((line, i) => {
-      let lineIndent = '';
+      const file = _ref3;
 
-      if (msg.indent > 0) {
-        // if we are indenting write some spaces followed by a symbol
-        lineIndent += ' '.repeat(msg.indent - 1);
-        lineIndent += line.startsWith('-') ? '└' : '│';
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
       }
+    }
 
-      if (line && prefix && i > 0) {
-        // apply additional indentation to lines after
-        // the first if this message gets a prefix
-        lineIndent += PREFIX_INDENT;
+    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
       }
 
-      writeTo.write(`${lineIndent}${line}\n`);
-    });
-  }
+      const loc = _ref4;
 
-}
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
 
-exports.ToolingLogTextWriter = ToolingLogTextWriter;
+    return actions;
+  });
 
-/***/ }),
-/* 113 */
-/***/ (function(module, exports) {
+  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
 
-module.exports = require("util");
+let buildActionsForHardlink = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-/***/ }),
-/* 114 */
-/***/ (function(module, exports, __webpack_require__) {
+    //
+    let build = (() => {
+      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest;
 
-"use strict";
+        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());
 
-const ansiStyles = __webpack_require__(115);
-const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(121);
-const {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-} = __webpack_require__(125);
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
 
-const {isArray} = Array;
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = [
-	'ansi',
-	'ansi',
-	'ansi256',
-	'ansi16m'
-];
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
 
-const styles = Object.create(null);
+        const destExists = yield exists(dest);
+        if (destExists) {
+          const destStat = yield lstat(dest);
 
-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');
-	}
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-	// Detect level if not set manually
-	const colorLevel = stdoutColor ? stdoutColor.level : 0;
-	object.level = options.level === undefined ? colorLevel : options.level;
-};
+          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);
+            }
+          }
 
-class ChalkClass {
-	constructor(options) {
-		// eslint-disable-next-line no-constructor-return
-		return chalkFactory(options);
-	}
-}
+          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;
+          }
 
-const chalkFactory = options => {
-	const chalk = {};
-	applyOptions(chalk, options);
+          // correct hardlink
+          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
+            return;
+          }
 
-	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
+          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;
+            }
+          }
 
-	Object.setPrototypeOf(chalk, Chalk.prototype);
-	Object.setPrototypeOf(chalk.template, chalk);
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
 
-	chalk.template.constructor = () => {
-		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
-	};
+            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+              var _ref14;
 
-	chalk.template.Instance = ChalkClass;
+              if (_isArray10) {
+                if (_i10 >= _iterator10.length) break;
+                _ref14 = _iterator10[_i10++];
+              } else {
+                _i10 = _iterator10.next();
+                if (_i10.done) break;
+                _ref14 = _i10.value;
+              }
 
-	return chalk.template;
-};
+              const file = _ref14;
 
-function Chalk(options) {
-	return chalkFactory(options);
-}
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
-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;
-		}
-	};
-}
+                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;
 
-styles.visible = {
-	get() {
-		const builder = createBuilder(this, this._styler, true);
-		Object.defineProperty(this, 'visible', {value: builder});
-		return builder;
-	}
-};
+                    if (_isArray11) {
+                      if (_i11 >= _iterator11.length) break;
+                      _ref15 = _iterator11[_i11++];
+                    } else {
+                      _i11 = _iterator11.next();
+                      if (_i11.done) break;
+                      _ref15 = _i11.value;
+                    }
 
-const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
+                    const file = _ref15;
 
-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);
-			};
-		}
-	};
-}
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
-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);
-			};
-		}
-	};
-}
+        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 proto = Object.defineProperties(() => {}, {
-	...styles,
-	level: {
-		enumerable: true,
-		get() {
-			return this._generator.level;
-		},
-		set(level) {
-			this._generator.level = level;
-		}
-	}
-});
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-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;
-	}
+          // 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;
 
-	return {
-		open,
-		close,
-		openAll,
-		closeAll,
-		parent
-	};
-};
+            if (_isArray12) {
+              if (_i12 >= _iterator12.length) break;
+              _ref16 = _iterator12[_i12++];
+            } else {
+              _i12 = _iterator12.next();
+              if (_i12.done) break;
+              _ref16 = _i12.value;
+            }
 
-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_));
-		}
+            const file = _ref16;
 
-		// 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(' '));
-	};
+            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);
+                }
 
-	// 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);
+                onDone.toString = function () {
+                  return _onDone2.toString();
+                };
 
-	builder._generator = self;
-	builder._styler = _styler;
-	builder._isEmpty = _isEmpty;
+                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}`);
+        }
+      });
 
-	return builder;
-};
+      return function build(_x10) {
+        return _ref13.apply(this, arguments);
+      };
+    })();
 
-const applyStyle = (self, string) => {
-	if (self.level <= 0 || !string) {
-		return self._isEmpty ? '' : string;
-	}
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-	let styler = self._styler;
+    // initialise events
+    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+      var _ref10;
 
-	if (styler === undefined) {
-		return string;
-	}
+      if (_isArray7) {
+        if (_i7 >= _iterator7.length) break;
+        _ref10 = _iterator7[_i7++];
+      } else {
+        _i7 = _iterator7.next();
+        if (_i7.done) break;
+        _ref10 = _i7.value;
+      }
 
-	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);
+      const item = _ref10;
 
-			styler = styler.parent;
-		}
-	}
+      const onDone = item.onDone || noop;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        onDone();
+      };
+    }
+    events.onStart(queue.length);
 
-	// 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);
-	}
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
-	return openAll + string + closeAll;
-};
+    // 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));
+    }
 
-let template;
-const chalkTag = (chalk, ...strings) => {
-	const [firstString] = strings;
+    // 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;
 
-	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(' ');
-	}
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref11 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref11 = _i8.value;
+      }
 
-	const arguments_ = strings.slice(1);
-	const parts = [firstString.raw[0]];
+      const file = _ref11;
 
-	for (let i = 1; i < firstString.length; i++) {
-		parts.push(
-			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
-			String(firstString.raw[i])
-		);
-	}
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
 
-	if (template === undefined) {
-		template = __webpack_require__(126);
-	}
+    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref12;
 
-	return template(chalk, parts.join(''));
-};
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref12 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref12 = _i9.value;
+      }
 
-Object.defineProperties(Chalk.prototype, styles);
+      const loc = _ref12;
 
-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 (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
 
-module.exports = chalk;
+    return actions;
+  });
 
+  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
+    return _ref9.apply(this, arguments);
+  };
+})();
 
-/***/ }),
-/* 115 */
-/***/ (function(module, exports, __webpack_require__) {
+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 || []
+    };
 
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
+    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-const wrapAnsi16 = (fn, offset) => (...args) => {
-	const code = fn(...args);
-	return `\u001B[${code + offset}m`;
-};
+    const fileActions = actions.file;
 
-const wrapAnsi256 = (fn, offset) => (...args) => {
-	const code = fn(...args);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+    const currentlyWriting = new Map();
 
-const wrapAnsi16m = (fn, offset) => (...args) => {
-	const rgb = fn(...args);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
+    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;
+        }
 
-const ansi2ansi = n => n;
-const rgb2rgb = (r, g, b) => [r, g, b];
+        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;
+      });
 
-const setLazyProperty = (object, property, get) => {
-	Object.defineProperty(object, property, {
-		get: () => {
-			const value = get();
+      return function (_x14) {
+        return _ref18.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
 
-			Object.defineProperty(object, property, {
-				value,
-				enumerable: true,
-				configurable: true
-			});
+    // 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);
+    });
+  });
 
-			return value;
-		},
-		enumerable: true,
-		configurable: true
-	});
-};
+  return function copyBulk(_x11, _x12, _x13) {
+    return _ref17.apply(this, arguments);
+  };
+})();
 
-/** @type {typeof import('color-convert')} */
-let colorConvert;
-const makeDynamicStyles = (wrap, targetSpace, identity, isBackground) => {
-	if (colorConvert === undefined) {
-		colorConvert = __webpack_require__(117);
-	}
+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 offset = isBackground ? 10 : 0;
-	const styles = {};
+    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-	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);
-		}
-	}
+    const fileActions = actions.link;
 
-	return styles;
-};
+    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 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],
+      return function (_x18) {
+        return _ref20.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
 
-			// 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],
+    // 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);
+    });
+  });
 
-			// 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 function hardlinkBulk(_x15, _x16, _x17) {
+    return _ref19.apply(this, arguments);
+  };
+})();
 
-	// 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;
+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;
 
-	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`
-			};
+      if (_isArray13) {
+        if (_i13 >= _iterator13.length) break;
+        _ref22 = _iterator13[_i13++];
+      } else {
+        _i13 = _iterator13.next();
+        if (_i13.done) break;
+        _ref22 = _i13.value;
+      }
 
-			group[styleName] = styles[styleName];
+      const file = _ref22;
 
-			codes.set(style[0], style[1]);
-		}
+      if (yield exists(file)) {
+        return readFile(file);
+      }
+    }
+    return null;
+  });
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
-	}
+  return function readFileAny(_x19) {
+    return _ref21.apply(this, arguments);
+  };
+})();
 
-	Object.defineProperty(styles, 'codes', {
-		value: codes,
-		enumerable: false
-	});
+let readJson = exports.readJson = (() => {
+  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    return (yield readJsonAndFile(loc)).object;
+  });
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+  return function readJson(_x20) {
+    return _ref23.apply(this, arguments);
+  };
+})();
 
-	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;
-}
+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;
+    }
+  });
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+  return function readJsonAndFile(_x21) {
+    return _ref24.apply(this, arguments);
+  };
+})();
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(116)(module)))
+let find = exports.find = (() => {
+  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
+    const parts = dir.split((_path || _load_path()).default.sep);
 
-/***/ }),
-/* 116 */
-/***/ (function(module, exports) {
+    while (parts.length) {
+      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
 
-module.exports = function(module) {
-	if (!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if (!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
-};
+      if (yield exists(loc)) {
+        return loc;
+      } else {
+        parts.pop();
+      }
+    }
 
+    return false;
+  });
 
-/***/ }),
-/* 117 */
-/***/ (function(module, exports, __webpack_require__) {
+  return function find(_x22, _x23) {
+    return _ref25.apply(this, arguments);
+  };
+})();
 
-const conversions = __webpack_require__(118);
-const route = __webpack_require__(120);
+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);
 
-const convert = {};
+    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 models = Object.keys(conversions);
+  return function symlink(_x24, _x25) {
+    return _ref26.apply(this, arguments);
+  };
+})();
 
-function wrapRaw(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
+let walk = exports.walk = (() => {
+  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
+    let files = [];
 
-		if (arg0.length > 1) {
-			args = arg0;
-		}
+    let filenames = yield readdir(dir);
+    if (ignoreBasenames.size) {
+      filenames = filenames.filter(function (name) {
+        return !ignoreBasenames.has(name);
+      });
+    }
 
-		return fn(args);
-	};
+    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+      var _ref28;
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+      if (_isArray14) {
+        if (_i14 >= _iterator14.length) break;
+        _ref28 = _iterator14[_i14++];
+      } else {
+        _i14 = _iterator14.next();
+        if (_i14.done) break;
+        _ref28 = _i14.value;
+      }
 
-	return wrappedFn;
-}
+      const name = _ref28;
 
-function wrapRounded(fn) {
-	const wrappedFn = function (...args) {
-		const arg0 = args[0];
+      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);
 
-		if (arg0 === undefined || arg0 === null) {
-			return arg0;
-		}
+      files.push({
+        relative,
+        basename: name,
+        absolute: loc,
+        mtime: +stat.mtime
+      });
 
-		if (arg0.length > 1) {
-			args = arg0;
-		}
+      if (stat.isDirectory()) {
+        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+      }
+    }
 
-		const result = fn(args);
+    return files;
+  });
 
-		// 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]);
-			}
-		}
+  return function walk(_x26, _x27) {
+    return _ref27.apply(this, arguments);
+  };
+})();
 
-		return result;
-	};
+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;
 
-	// Preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
 
-	return wrappedFn;
-}
+    return Math.ceil(size / blockSize) * blockSize;
+  });
 
-models.forEach(fromModel => {
-	convert[fromModel] = {};
+  return function getFileSizeOnDisk(_x28) {
+    return _ref29.apply(this, arguments);
+  };
+})();
 
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
+let getEolFromFile = (() => {
+  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
+    if (!(yield exists(path))) {
+      return undefined;
+    }
 
-	const routes = route(fromModel);
-	const routeModels = Object.keys(routes);
+    const buffer = yield readFileBuffer(path);
 
-	routeModels.forEach(toModel => {
-		const fn = routes[toModel];
+    for (let i = 0; i < buffer.length; ++i) {
+      if (buffer[i] === cr) {
+        return '\r\n';
+      }
+      if (buffer[i] === lf) {
+        return '\n';
+      }
+    }
+    return undefined;
+  });
 
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
+  return function getEolFromFile(_x29) {
+    return _ref30.apply(this, arguments);
+  };
+})();
 
-module.exports = convert;
+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);
+  });
 
+  return function writeFilePreservingEol(_x30, _x31) {
+    return _ref31.apply(this, arguments);
+  };
+})();
 
-/***/ }),
-/* 118 */
-/***/ (function(module, exports, __webpack_require__) {
+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;
+  });
 
-/* MIT license */
-/* eslint-disable no-mixed-operators */
-const cssKeywords = __webpack_require__(119);
+  return function hardlinksWork(_x32) {
+    return _ref32.apply(this, arguments);
+  };
+})();
 
-// 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.)
+// not a strict polyfill for Node's fs.mkdtemp
 
-const reverseKeywords = {};
-for (const key of Object.keys(cssKeywords)) {
-	reverseKeywords[cssKeywords[key]] = key;
-}
 
-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']}
-};
+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;
+  });
 
-module.exports = convert;
+  return function makeTempDir(_x33) {
+    return _ref33.apply(this, arguments);
+  };
+})();
 
-// Hide .channels and .labels properties
-for (const model of Object.keys(convert)) {
-	if (!('channels' in convert[model])) {
-		throw new Error('missing channels property: ' + model);
-	}
+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;
 
-	if (!('labels' in convert[model])) {
-		throw new Error('missing channel labels property: ' + model);
-	}
+      if (_isArray15) {
+        if (_i15 >= _iterator15.length) break;
+        _ref35 = _iterator15[_i15++];
+      } else {
+        _i15 = _iterator15.next();
+        if (_i15.done) break;
+        _ref35 = _i15.value;
+      }
 
-	if (convert[model].labels.length !== convert[model].channels) {
-		throw new Error('channel and label counts mismatch: ' + model);
-	}
+      const path = _ref35;
 
-	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});
-}
+      try {
+        const fd = yield open(path, 'r');
+        return (_fs || _load_fs()).default.createReadStream(path, { fd });
+      } catch (err) {
+        // Try the next one
+      }
+    }
+    return null;
+  });
 
-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;
+  return function readFirstAvailableStream(_x34) {
+    return _ref34.apply(this, arguments);
+  };
+})();
 
-	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 getFirstSuitableFolder = exports.getFirstSuitableFolder = (() => {
+  var _ref36 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths, mode = constants.W_OK | constants.X_OK) {
+    const result = {
+      skipped: [],
+      folder: null
+    };
 
-	h = Math.min(h * 60, 360);
+    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+      var _ref37;
 
-	if (h < 0) {
-		h += 360;
-	}
+      if (_isArray16) {
+        if (_i16 >= _iterator16.length) break;
+        _ref37 = _iterator16[_i16++];
+      } else {
+        _i16 = _iterator16.next();
+        if (_i16.done) break;
+        _ref37 = _i16.value;
+      }
 
-	const l = (min + max) / 2;
+      const folder = _ref37;
 
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
+      try {
+        yield mkdirp(folder);
+        yield access(folder, mode);
 
-	return [h, s * 100, l * 100];
-};
+        result.folder = folder;
 
-convert.rgb.hsv = function (rgb) {
-	let rdif;
-	let gdif;
-	let bdif;
-	let h;
-	let s;
+        return result;
+      } catch (error) {
+        result.skipped.push({
+          error,
+          folder
+        });
+      }
+    }
+    return result;
+  });
 
-	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 function getFirstSuitableFolder(_x35) {
+    return _ref36.apply(this, arguments);
+  };
+})();
 
-	if (diff === 0) {
-		h = 0;
-		s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
+exports.copy = copy;
+exports.readFile = readFile;
+exports.readFileRaw = readFileRaw;
+exports.normalizeOS = normalizeOS;
 
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
+var _fs;
 
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
+}
 
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
-};
+var _glob;
 
-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));
+function _load_glob() {
+  return _glob = _interopRequireDefault(__webpack_require__(75));
+}
 
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+var _os;
 
-	return [h, w * 100, b * 100];
-};
+function _load_os() {
+  return _os = _interopRequireDefault(__webpack_require__(36));
+}
 
-convert.rgb.cmyk = function (rgb) {
-	const r = rgb[0] / 255;
-	const g = rgb[1] / 255;
-	const b = rgb[2] / 255;
+var _path;
 
-	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;
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
 
-	return [c * 100, m * 100, y * 100, k * 100];
-};
+var _blockingQueue;
 
-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)
-	);
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
 }
 
-convert.rgb.keyword = function (rgb) {
-	const reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
+var _promise;
 
-	let currentClosestDistance = Infinity;
-	let currentClosestKeyword;
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(40));
+}
 
-	for (const keyword of Object.keys(cssKeywords)) {
-		const value = cssKeywords[keyword];
+var _promise2;
 
-		// Compute comparative distance
-		const distance = comparativeDistance(rgb, value);
+function _load_promise2() {
+  return _promise2 = __webpack_require__(40);
+}
 
-		// Check if its less, if so set as closest
-		if (distance < currentClosestDistance) {
-			currentClosestDistance = distance;
-			currentClosestKeyword = keyword;
-		}
-	}
+var _map;
 
-	return currentClosestKeyword;
-};
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
-};
+var _fsNormalized;
 
-convert.rgb.xyz = function (rgb) {
-	let r = rgb[0] / 255;
-	let g = rgb[1] / 255;
-	let b = rgb[2] / 255;
+function _load_fsNormalized() {
+  return _fsNormalized = __webpack_require__(164);
+}
 
-	// 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);
+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; } }
 
-	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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-	return [x * 100, y * 100, z * 100];
+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
 };
 
-convert.rgb.lab = function (rgb) {
-	const xyz = convert.rgb.xyz(rgb);
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	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);
+const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
 
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
+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;
 
-	return [l, a, b];
-};
+// 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.
 
-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;
+const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
 
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
+const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
+const invariant = __webpack_require__(7);
+const stripBOM = __webpack_require__(122);
 
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
+const noop = () => {};
 
-	const t1 = 2 * l - t2;
+function copy(src, dest, reporter) {
+  return copyBulk([{ src, dest }], reporter);
+}
 
-	const rgb = [0, 0, 0];
-	for (let i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
+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);
+      }
+    });
+  });
+}
 
-		if (t3 > 1) {
-			t3--;
-		}
+function readFile(loc) {
+  return _readFile(loc, 'utf8').then(normalizeOS);
+}
 
-		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;
-		}
+function readFileRaw(loc) {
+  return _readFile(loc, 'binary');
+}
 
-		rgb[i] = val * 255;
-	}
+function normalizeOS(body) {
+  return body.replace(/\r\n/g, '\n');
+}
 
-	return rgb;
-};
+const cr = '\r'.charCodeAt(0);
+const lf = '\n'.charCodeAt(0);
 
-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);
+/***/ }),
+/* 6 */
+/***/ (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;
+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;
 
-	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;
+var _require = __webpack_require__(171);
 
-	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 getCacheDir = _require.getCacheDir,
+      getConfigDir = _require.getConfigDir,
+      getDataDir = _require.getDataDir;
 
-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 isWebpackBundle = __webpack_require__(227);
 
-	l = (2 - s) * v;
-	const lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
+const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
+const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
+const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
 
-	return [h, sl * 100, l * 100];
-};
+const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
 
-// 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 YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
 
-	// Wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
+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';
 
-	const i = Math.floor(6 * h);
-	const v = 1 - bl;
-	f = 6 * h - i;
+const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
 
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
+// cache version, bump whenever we make backwards incompatible changes
+const CACHE_VERSION = exports.CACHE_VERSION = 2;
 
-	const n = wh + f * (v - wh); // Linear interpolation
+// lockfile version, bump whenever we make backwards incompatible changes
+const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
 
-	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 */
+// max amount of network requests to perform concurrently
+const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
 
-	return [r * 255, g * 255, b * 255];
-};
+// HTTP timeout used when downloading packages
+const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
 
-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;
+// max amount of child processes to execute concurrently
+const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
 
-	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);
+const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
 
-	return [r * 255, g * 255, b * 255];
-};
+function getPreferredCacheDirectories() {
+  const preferredCacheDirectories = [getCacheDir()];
 
-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;
+  if (process.getuid) {
+    // $FlowFixMe: process.getuid exists, dammit
+    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
+  }
 
-	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);
+  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
 
-	// Assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
-		: r * 12.92;
+  return preferredCacheDirectories;
+}
 
-	g = g > 0.0031308
-		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
-		: g * 12.92;
+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');
 
-	b = b > 0.0031308
-		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
-		: b * 12.92;
+const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
+const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
 
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
+// Webpack needs to be configured with node.__dirname/__filename = false
+function getYarnBinPath() {
+  if (isWebpackBundle) {
+    return __filename;
+  } else {
+    return path.join(__dirname, '..', 'bin', 'yarn.js');
+  }
+}
 
-	return [r * 255, g * 255, b * 255];
-};
+const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
+const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
 
-convert.xyz.lab = function (xyz) {
-	let x = xyz[0];
-	let y = xyz[1];
-	let z = xyz[2];
+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');
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+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';
 
-	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);
+const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
+const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
 
-	const l = (116 * y) - 16;
-	const a = 500 * (x - y);
-	const b = 200 * (y - z);
+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';
 
-	return [l, a, b];
-};
+const ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
 
-convert.lab.xyz = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let x;
-	let y;
-	let z;
+function getPathKey(platform, env) {
+  let pathKey = 'PATH';
 
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
+  // windows calls its path "Path" usually, but this is not guaranteed.
+  if (platform === 'win32') {
+    pathKey = 'Path';
 
-	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;
+    for (const key in env) {
+      if (key.toLowerCase() === 'path') {
+        pathKey = key;
+      }
+    }
+  }
 
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
+  return pathKey;
+}
 
-	return [x, y, z];
+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'
 };
 
-convert.lab.lch = function (lab) {
-	const l = lab[0];
-	const a = lab[1];
-	const b = lab[2];
-	let h;
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
+"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.
+ */
 
-	if (h < 0) {
-		h += 360;
-	}
 
-	const c = Math.sqrt(a * a + b * b);
 
-	return [l, c, h];
-};
+/**
+ * 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.
+ */
 
-convert.lch.lab = function (lch) {
-	const l = lch[0];
-	const c = lch[1];
-	const h = lch[2];
+var NODE_ENV = "production";
 
-	const hr = h / 360 * 2 * Math.PI;
-	const a = c * Math.cos(hr);
-	const b = c * Math.sin(hr);
+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');
+    }
+  }
 
-	return [l, a, b];
+  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';
+    }
+
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
+  }
 };
 
-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
+module.exports = invariant;
 
-	value = Math.round(value / 50);
 
-	if (value === 0) {
-		return 30;
-	}
+/***/ }),
+/* 8 */,
+/* 9 */
+/***/ (function(module, exports) {
 
-	let ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
+module.exports = __webpack_require__("crypto");
 
-	if (value === 2) {
-		ansi += 60;
-	}
+/***/ }),
+/* 10 */,
+/* 11 */
+/***/ (function(module, exports) {
 
-	return ansi;
-};
+// 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
 
-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];
+/***/ }),
+/* 12 */
+/***/ (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;
-		}
 
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
+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 ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
+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;
+}
 
-	return ansi;
-};
+function entries(obj) {
+  const entries = [];
+  if (obj) {
+    for (const key in obj) {
+      entries.push([key, obj[key]]);
+    }
+  }
+  return entries;
+}
 
-convert.ansi16.rgb = function (args) {
-	let color = args % 10;
+function removePrefix(pattern, prefix) {
+  if (pattern.startsWith(prefix)) {
+    pattern = pattern.slice(prefix.length);
+  }
 
-	// Handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
+  return pattern;
+}
 
-		color = color / 10.5 * 255;
+function removeSuffix(pattern, suffix) {
+  if (pattern.endsWith(suffix)) {
+    return pattern.slice(0, -suffix.length);
+  }
 
-		return [color, color, color];
-	}
+  return pattern;
+}
 
-	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 addSuffix(pattern, suffix) {
+  if (!pattern.endsWith(suffix)) {
+    return pattern + suffix;
+  }
 
-	return [r, g, b];
-};
+  return pattern;
+}
 
-convert.ansi256.rgb = function (args) {
-	// Handle greyscale
-	if (args >= 232) {
-		const c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
+function hyphenate(str) {
+  return str.replace(/[A-Z]/g, match => {
+    return '-' + match.charAt(0).toLowerCase();
+  });
+}
 
-	args -= 16;
+function camelCase(str) {
+  if (/[A-Z]/.test(str)) {
+    return null;
+  } else {
+    return _camelCase(str);
+  }
+}
 
-	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;
+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;
+}
 
-	return [r, g, b];
-};
+function sleep(ms) {
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
+}
 
-convert.rgb.hex = function (args) {
-	const integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
+var store = __webpack_require__(107)('wks');
+var uid = __webpack_require__(111);
+var Symbol = __webpack_require__(11).Symbol;
+var USE_SYMBOL = typeof Symbol == 'function';
+
+var $exports = module.exports = function (name) {
+  return store[name] || (store[name] =
+    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
 };
 
-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];
-	}
+$exports.store = store;
 
-	let colorString = match[0];
 
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(char => {
-			return char + char;
-		}).join('');
-	}
+/***/ }),
+/* 14 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	const integer = parseInt(colorString, 16);
-	const r = (integer >> 16) & 0xFF;
-	const g = (integer >> 8) & 0xFF;
-	const b = integer & 0xFF;
+"use strict";
 
-	return [r, g, b];
-};
 
-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;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stringify = exports.parse = undefined;
 
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
+var _asyncToGenerator2;
 
-	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;
-	}
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
 
-	hue /= 6;
-	hue %= 1;
+var _parse;
 
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
+function _load_parse() {
+  return _parse = __webpack_require__(81);
+}
 
-convert.hsl.hcg = function (hsl) {
-	const s = hsl[1] / 100;
-	const l = hsl[2] / 100;
+Object.defineProperty(exports, 'parse', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_parse || _load_parse()).default;
+  }
+});
 
-	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
+var _stringify;
 
-	let f = 0;
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
+function _load_stringify() {
+  return _stringify = __webpack_require__(150);
+}
 
-	return [hsl[0], c * 100, f * 100];
-};
+Object.defineProperty(exports, 'stringify', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_stringify || _load_stringify()).default;
+  }
+});
+exports.implodeEntry = implodeEntry;
+exports.explodeEntry = explodeEntry;
 
-convert.hsv.hcg = function (hsv) {
-	const s = hsv[1] / 100;
-	const v = hsv[2] / 100;
+var _misc;
 
-	const c = s * v;
-	let f = 0;
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
+var _normalizePattern;
 
-	return [hsv[0], c * 100, f * 100];
-};
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(29);
+}
 
-convert.hcg.rgb = function (hcg) {
-	const h = hcg[0] / 360;
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+var _parse2;
 
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
+function _load_parse2() {
+  return _parse2 = _interopRequireDefault(__webpack_require__(81));
+}
 
-	const pure = [0, 0, 0];
-	const hi = (h % 1) * 6;
-	const v = hi % 1;
-	const w = 1 - v;
-	let mg = 0;
+var _constants;
 
-	/* 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 */
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-	mg = (1.0 - c) * g;
+var _fs;
 
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
-};
+function _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
+}
 
-convert.hcg.hsv = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+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; } }
 
-	const v = c + g * (1.0 - c);
-	let f = 0;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-	if (v > 0.0) {
-		f = c / v;
-	}
+const invariant = __webpack_require__(7);
 
-	return [hcg[0], f * 100, v * 100];
-};
+const path = __webpack_require__(0);
+const ssri = __webpack_require__(55);
 
-convert.hcg.hsl = function (hcg) {
-	const c = hcg[1] / 100;
-	const g = hcg[2] / 100;
+function getName(pattern) {
+  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
+}
 
-	const l = g * (1.0 - c) + 0.5 * c;
-	let s = 0;
+function blankObjectUndefined(obj) {
+  return obj && Object.keys(obj).length ? obj : 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));
-	}
+function keyForRemote(remote) {
+  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+}
 
-	return [hcg[0], s * 100, l * 100];
-};
+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(' ');
+}
 
-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];
-};
+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;
+}
 
-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;
+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;
+}
 
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
+class Lockfile {
+  constructor({ cache, source, parseResultType } = {}) {
+    this.source = source || '';
+    this.cache = cache;
+    this.parseResultType = parseResultType;
+  }
 
-	return [hwb[0], c * 100, g * 100];
-};
+  // source string if the `cache` was parsed
 
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
 
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
+  // if true, we're parsing an old yarn file and need to update integrity fields
+  hasEntriesExistWithoutIntegrity() {
+    if (!this.cache) {
+      return false;
+    }
 
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
+    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;
+      }
+    }
 
-convert.gray.hsl = function (args) {
-	return [0, 0, args[0]];
-};
+    return false;
+  }
 
-convert.gray.hsv = convert.gray.hsl;
+  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);
 
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
+      let lockfile;
+      let rawLockfile = '';
+      let parseResult;
 
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
+      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
+        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
+        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
 
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
+        if (reporter) {
+          if (parseResult.type === 'merge') {
+            reporter.info(reporter.lang('lockfileMerged'));
+          } else if (parseResult.type === 'conflict') {
+            reporter.warn(reporter.lang('lockfileConflict'));
+          }
+        }
 
-convert.gray.hex = function (gray) {
-	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	const integer = (val << 16) + (val << 8) + val;
+        lockfile = parseResult.object;
+      } else if (reporter) {
+        reporter.info(reporter.lang('noLockfileFound'));
+      }
 
-	const string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
+    })();
+  }
 
-convert.rgb.gray = function (rgb) {
-	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
-};
+  getLocked(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return undefined;
+    }
 
+    const shrunk = pattern in cache && cache[pattern];
 
-/***/ }),
-/* 119 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (typeof shrunk === 'string') {
+      return this.getLocked(shrunk);
+    } else if (shrunk) {
+      explodeEntry(pattern, shrunk);
+      return shrunk;
+    }
 
-"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]
-};
-
-
-/***/ }),
-/* 120 */
-/***/ (function(module, exports, __webpack_require__) {
-
-const conversions = __webpack_require__(118);
-
-/*
-	This function routes a model to all other models.
-
-	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).
-
-	conversions that are not possible simply are not included.
-*/
+    return undefined;
+  }
 
-function buildGraph() {
-	const graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	const models = Object.keys(conversions);
+  removePattern(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return;
+    }
+    delete cache[pattern];
+  }
 
-	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
-		};
-	}
+  getLockfile(patterns) {
+    const lockfile = {};
+    const seen = new Map();
 
-	return graph;
-}
+    // 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);
 
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	const graph = buildGraph();
-	const queue = [fromModel]; // Unshift -> queue -> pop
+    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
 
-	graph[fromModel].distance = 0;
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
 
-	while (queue.length) {
-		const current = queue.pop();
-		const adjacents = Object.keys(conversions[current]);
+      const pattern = _ref;
 
-		for (let len = adjacents.length, i = 0; i < len; i++) {
-			const adjacent = adjacents[i];
-			const node = graph[adjacent];
+      const pkg = patterns[pattern];
+      const remote = pkg._remote,
+            ref = pkg._reference;
 
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
+      invariant(ref, 'Package is missing a reference');
+      invariant(remote, 'Package is missing a remote');
 
-	return graph;
-}
+      const remoteKey = keyForRemote(remote);
+      const seenPattern = remoteKey && seen.get(remoteKey);
+      if (seenPattern) {
+        // no point in duplicating it
+        lockfile[pattern] = seenPattern;
 
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
+        // 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
+      });
 
-function wrapConversion(toModel, graph) {
-	const path = [graph[toModel].parent, toModel];
-	let fn = conversions[graph[toModel].parent][toModel];
+      lockfile[pattern] = obj;
 
-	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;
-	}
+      if (remoteKey) {
+        seen.set(remoteKey, obj);
+      }
+    }
 
-	fn.conversion = path;
-	return fn;
+    return lockfile;
+  }
 }
+exports.default = Lockfile;
 
-module.exports = function (fromModel) {
-	const graph = deriveBFS(fromModel);
-	const conversion = {};
-
-	const models = Object.keys(graph);
-	for (let len = models.length, i = 0; i < len; i++) {
-		const toModel = models[i];
-		const 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;
-};
-
+/***/ }),
+/* 15 */,
+/* 16 */,
+/* 17 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__("stream");
 
 /***/ }),
-/* 121 */
+/* 18 */,
+/* 19 */,
+/* 20 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const os = __webpack_require__(122);
-const tty = __webpack_require__(123);
-const hasFlag = __webpack_require__(124);
 
-const {env} = process;
+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;
 
-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 (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
 
-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);
-	}
-}
+      const item = _ref;
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+      nullify(item);
+    }
+  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
+    Object.setPrototypeOf(obj, null);
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
+    // for..in can only be applied to 'object', not 'function'
+    if (typeof obj === 'object') {
+      for (const key in obj) {
+        nullify(obj[key]);
+      }
+    }
+  }
+
+  return obj;
 }
 
-function supportsColor(haveStream, streamIsTTY) {
-	if (forceColor === 0) {
-		return 0;
-	}
+/***/ }),
+/* 21 */,
+/* 22 */
+/***/ (function(module, exports) {
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+module.exports = __webpack_require__("assert");
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+/***/ }),
+/* 23 */
+/***/ (function(module, exports) {
 
-	if (haveStream && !streamIsTTY && forceColor === undefined) {
-		return 0;
-	}
+var core = module.exports = { version: '2.5.7' };
+if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
 
-	const min = forceColor || 0;
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
+/***/ }),
+/* 24 */,
+/* 25 */,
+/* 26 */,
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	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;
-		}
+var isObject = __webpack_require__(34);
+module.exports = function (it) {
+  if (!isObject(it)) throw TypeError(it + ' is not an object!');
+  return it;
+};
 
-		return 1;
-	}
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+/***/ }),
+/* 28 */,
+/* 29 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		return min;
-	}
+"use strict";
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
 
-	if ('GITHUB_ACTIONS' in env) {
-		return 1;
-	}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizePattern = normalizePattern;
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+/**
+ * Explode and normalize a pattern into its name and range.
+ */
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+function normalizePattern(pattern) {
+  let hasVersion = false;
+  let range = 'latest';
+  let name = pattern;
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
+  // 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);
+  }
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+  // take first part as the name
+  const parts = name.split('@');
+  if (parts.length > 1) {
+    name = parts.shift();
+    range = parts.join('@');
 
-	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+    if (range) {
+      hasVersion = true;
+    } else {
+      range = '*';
+    }
+  }
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
+  // add back @ scope suffix
+  if (isScoped) {
+    name = `@${name}`;
+  }
 
-	return min;
+  return { name, range, hasVersion };
 }
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream, stream && stream.isTTY);
-	return translateLevel(level);
-}
+/***/ }),
+/* 30 */,
+/* 31 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: translateLevel(supportsColor(true, tty.isatty(1))),
-	stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+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;
 };
 
 
 /***/ }),
-/* 122 */
-/***/ (function(module, exports) {
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = require("os");
+/* eslint-disable node/no-deprecated-api */
+var buffer = __webpack_require__(63)
+var Buffer = buffer.Buffer
 
-/***/ }),
-/* 123 */
-/***/ (function(module, exports) {
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+  for (var key in src) {
+    dst[key] = src[key]
+  }
+}
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+  module.exports = buffer
+} else {
+  // Copy properties from require('buffer')
+  copyProps(buffer, exports)
+  exports.Buffer = SafeBuffer
+}
 
-module.exports = require("tty");
+function SafeBuffer (arg, encodingOrOffset, length) {
+  return Buffer(arg, encodingOrOffset, length)
+}
 
-/***/ }),
-/* 124 */
-/***/ (function(module, exports, __webpack_require__) {
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
 
-"use strict";
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+  if (typeof arg === 'number') {
+    throw new TypeError('Argument must not be a number')
+  }
+  return Buffer(arg, encodingOrOffset, length)
+}
+
+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
+}
 
+SafeBuffer.allocUnsafe = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return Buffer(size)
+}
 
-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);
-};
+SafeBuffer.allocUnsafeSlow = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return buffer.SlowBuffer(size)
+}
 
 
 /***/ }),
-/* 125 */
+/* 33 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-const stringReplaceAll = (string, substring, replacer) => {
-	let index = string.indexOf(substring);
-	if (index === -1) {
-		return string;
-	}
-
-	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);
-
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+// Thank's IE8 for his funny defineProperty
+module.exports = !__webpack_require__(85)(function () {
+  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
+});
 
-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);
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+/***/ }),
+/* 34 */
+/***/ (function(module, exports) {
 
-module.exports = {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
+module.exports = function (it) {
+  return typeof it === 'object' ? it !== null : typeof it === 'function';
 };
 
 
 /***/ }),
-/* 126 */
-/***/ (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;
+/* 35 */
+/***/ (function(module, exports) {
 
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
+module.exports = {};
 
-function unescape(c) {
-	const u = c[0] === 'u';
-	const bracket = c[1] === '{';
 
-	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
+/***/ }),
+/* 36 */
+/***/ (function(module, exports) {
 
-	if (u && bracket) {
-		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
-	}
+module.exports = __webpack_require__("os");
 
-	return ESCAPES.get(c) || c;
-}
+/***/ }),
+/* 37 */,
+/* 38 */,
+/* 39 */,
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function parseArguments(name, arguments_) {
-	const results = [];
-	const chunks = arguments_.trim().split(/\s*,\s*/g);
-	let matches;
+"use strict";
 
-	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}')`);
-		}
-	}
 
-	return results;
+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);
+  });
 }
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+function promisify(fn, firstData) {
+  return function (...args) {
+    return new Promise(function (resolve, reject) {
+      args.push(function (err, ...result) {
+        let res = result;
 
-	const results = [];
-	let matches;
+        if (result.length <= 1) {
+          res = result[0];
+        }
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+        if (firstData) {
+          res = err;
+          err = null;
+        }
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+        if (err) {
+          reject(err);
+        } else {
+          resolve(res);
+        }
+      });
 
-	return results;
+      fn.apply(null, args);
+    });
+  };
 }
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
-
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
-
-	let current = chalk;
-	for (const [styleName, styles] of Object.entries(enabled)) {
-		if (!Array.isArray(styles)) {
-			continue;
-		}
+function queue(arr, promiseProducer, concurrency = Infinity) {
+  concurrency = Math.min(concurrency, arr.length);
 
-		if (!(styleName in current)) {
-			throw new Error(`Unknown Chalk style: ${styleName}`);
-		}
+  // clone
+  arr = arr.slice();
 
-		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
-	}
+  const results = [];
+  let total = arr.length;
+  if (!total) {
+    return Promise.resolve(results);
+  }
 
-	return current;
-}
+  return new Promise((resolve, reject) => {
+    for (let i = 0; i < concurrency; i++) {
+      next();
+    }
 
-module.exports = (chalk, temporary) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+    function next() {
+      const item = arr.shift();
+      const promise = promiseProducer(item);
 
-	// 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');
-			}
+      promise.then(function (result) {
+        results.push(result);
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(character);
-		}
-	});
+        total--;
+        if (total === 0) {
+          resolve(results);
+        } else {
+          if (arr.length) {
+            next();
+          }
+        }
+      }, reject);
+    }
+  });
+}
 
-	chunks.push(chunk.join(''));
+/***/ }),
+/* 41 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (styles.length > 0) {
-		const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMessage);
-	}
+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';
 
-	return chunks.join('');
+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;
 
 
 /***/ }),
-/* 127 */
+/* 42 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LOG_LEVEL_FLAGS = exports.DEFAULT_LOG_LEVEL = void 0;
-exports.getLogLevelFlagsHelp = getLogLevelFlagsHelp;
-exports.parseLogLevel = parseLogLevel;
-exports.pickLevelFromFlags = pickLevelFromFlags;
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-const LEVELS = ['silent', 'error', 'warning', 'success', 'info', 'debug', 'verbose'];
-const DEFAULT_LOG_LEVEL = 'info';
-exports.DEFAULT_LOG_LEVEL = DEFAULT_LOG_LEVEL;
-
-function pickLevelFromFlags(flags, options = {}) {
-  if (flags.verbose) return 'verbose';
-  if (flags.debug) return 'debug';
-  if (flags.info) return 'info';
-  if (flags.quiet) return 'error';
-  if (flags.silent) return 'silent';
-  return options.default || DEFAULT_LOG_LEVEL;
-}
-
-const LOG_LEVEL_FLAGS = [{
-  name: 'verbose',
-  help: '--verbose, -v      Log verbosely'
-}, {
-  name: 'info',
-  help: "--info             Don't log debug messages"
-}, {
-  name: 'debug',
-  help: '--debug            Log debug messages (less than verbose)'
-}, {
-  name: 'quiet',
-  help: '--quiet            Only log errors'
-}, {
-  name: 'silent',
-  help: "--silent           Don't log anything"
-}];
-exports.LOG_LEVEL_FLAGS = LOG_LEVEL_FLAGS;
-
-function getLogLevelFlagsHelp(defaultLogLevel = DEFAULT_LOG_LEVEL) {
-  return LOG_LEVEL_FLAGS.filter(({
-    name
-  }) => name !== defaultLogLevel).map(({
-    help
-  }) => help).join('\n');
+try {
+  var util = __webpack_require__(2);
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  module.exports = __webpack_require__(224);
 }
 
-function parseLogLevel(name) {
-  const i = LEVELS.indexOf(name);
-
-  if (i === -1) {
-    const msg = `Invalid log level "${name}" ` + `(expected one of ${LEVELS.join(',')})`;
-    throw new Error(msg);
-  }
-
-  const flags = {};
-  LEVELS.forEach((level, levelI) => {
-    flags[level] = levelI <= i;
-  });
-  return {
-    name,
-    flags: flags
-  };
-}
 
 /***/ }),
-/* 128 */
+/* 43 */,
+/* 44 */,
+/* 45 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var _interopRequireDefault = __webpack_require__(7);
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ToolingLogCollectingWriter = void 0;
-
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(8));
+exports.home = undefined;
 
-var _tooling_log_text_writer = __webpack_require__(112);
+var _rootUser;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-class ToolingLogCollectingWriter extends _tooling_log_text_writer.ToolingLogTextWriter {
-  constructor(level = 'verbose') {
-    super({
-      level,
-      writeTo: {
-        write: msg => {
-          // trim trailing new line
-          this.messages.push(msg.slice(0, -1));
-        }
-      }
-    });
-    (0, _defineProperty2.default)(this, "messages", []);
-  }
-  /**
-   * Called by ToolingLog, extends messages with the source if message includes one.
-   */
+function _load_rootUser() {
+  return _rootUser = _interopRequireDefault(__webpack_require__(169));
+}
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  write(msg) {
-    if (msg.source) {
-      return super.write({ ...msg,
-        args: [`source[${msg.source}]`, ...msg.args]
-      });
-    }
+const path = __webpack_require__(0);
 
-    return super.write(msg);
-  }
+const home = exports.home = __webpack_require__(36).homedir();
 
-}
+const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
 
-exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter;
+exports.default = userHomeDir;
 
 /***/ }),
-/* 129 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 46 */
+/***/ (function(module, exports) {
 
-"use strict";
-__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__(130);
-/* harmony import */ var _build__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(530);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(531);
-/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(555);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(556);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(558);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+module.exports = function (it) {
+  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
+  return it;
+};
 
 
+/***/ }),
+/* 47 */
+/***/ (function(module, exports) {
 
+var toString = {}.toString;
 
+module.exports = function (it) {
+  return toString.call(it).slice(8, -1);
+};
 
 
-const commands = {
-  bootstrap: _bootstrap__WEBPACK_IMPORTED_MODULE_0__["BootstrapCommand"],
-  build: _build__WEBPACK_IMPORTED_MODULE_1__["BuildCommand"],
-  clean: _clean__WEBPACK_IMPORTED_MODULE_2__["CleanCommand"],
-  reset: _reset__WEBPACK_IMPORTED_MODULE_3__["ResetCommand"],
-  run: _run__WEBPACK_IMPORTED_MODULE_4__["RunCommand"],
-  watch: _watch__WEBPACK_IMPORTED_MODULE_5__["WatchCommand"]
-};
-
 /***/ }),
-/* 130 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BootstrapCommand", function() { return BootstrapCommand; });
-/* 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 _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(131);
-/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(220);
-/* harmony import */ var _utils_child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(221);
-/* harmony import */ var _utils_link_project_executables__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(340);
-/* harmony import */ var _utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(409);
-/* harmony import */ var _utils_sort_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(412);
-/* harmony import */ var _utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(421);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(423);
-/* harmony import */ var _utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(529);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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; }
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-
-
-
-
-
-
-
-
-
-const BootstrapCommand = {
-  description: 'Install dependencies and crosslink projects',
-  name: 'bootstrap',
-  reportTiming: {
-    group: 'scripts/kbn bootstrap',
-    id: 'total'
-  },
-
-  async run(projects, projectGraph, {
-    options,
-    kbn,
-    rootPath
-  }) {
-    var _projects$get;
-
-    const nonBazelProjectsOnly = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__["getNonBazelProjectsOnly"])(projects);
-    const batchedNonBazelProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__["topologicallyBatchProjects"])(nonBazelProjectsOnly, projectGraph);
-    const kibanaProjectPath = ((_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path) || '';
-    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true;
-    const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
-    const timings = [];
-
-    const time = async (id, body) => {
-      const start = Date.now();
-
-      try {
-        return await body();
-      } finally {
-        timings.push({
-          id,
-          ms: Date.now() - start
-        });
-      }
-    }; // Force install is set in case a flag is passed into yarn kbn bootstrap
-
-
-    const forceInstall = !!options && options['force-install'] === true; // Install bazel machinery tools if needed
-
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["installBazelTools"])(rootPath); // Setup remote cache settings in .bazelrc.cache if needed
-
-    await Object(_utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_10__["setupRemoteCache"])(rootPath); // Bootstrap process for Bazel packages
-    // Bazel is now managing dependencies so yarn install
-    // will happen as part of this
-    //
-    // NOTE: Bazel projects will be introduced incrementally
-    // And should begin from the ones with none dependencies forward.
-    // That way non bazel projects could depend on bazel projects but not the other way around
-    // That is only intended during the migration process while non Bazel projects are not removed at all.
-    //
-
-    if (forceInstall) {
-      await time('force install dependencies', async () => {
-        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["removeYarnIntegrityFileIfExists"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(kibanaProjectPath, 'node_modules'));
-        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['clean']);
-        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@yarn//:yarn'], runOffline, {
-          env: {
-            SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
-            RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
-          }
-        });
-      });
-    } // build packages
-
+/* 48 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    await time('build packages', async () => {
-      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['build', '//packages:build', '--show_result=1'], runOffline);
-    }); // Install monorepo npm dependencies outside of the Bazel managed ones
+// 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);
+  };
+};
 
-    for (const batch of batchedNonBazelProjects) {
-      for (const project of batch) {
-        const isExternalPlugin = project.path.includes(`${kibanaProjectPath}${path__WEBPACK_IMPORTED_MODULE_0__["sep"]}plugins`);
 
-        if (!project.hasDependencies()) {
-          continue;
-        }
+/***/ }),
+/* 49 */
+/***/ (function(module, exports) {
 
-        if (isExternalPlugin) {
-          await project.installDependencies();
-          continue;
-        }
+var hasOwnProperty = {}.hasOwnProperty;
+module.exports = function (it, key) {
+  return hasOwnProperty.call(it, key);
+};
 
-        if (!project.isSinglePackageJsonProject && !project.isEveryDependencyLocal() && !isExternalPlugin) {
-          throw new Error(`[${project.name}] is not eligible to hold non local dependencies. Move the non local dependencies into the top level package.json.`);
-        }
-      }
-    }
 
-    await time('sort package json', async () => {
-      await Object(_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_7__["sortPackageJson"])(kbn);
-    });
-    const yarnLock = await time('read yarn.lock', async () => await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__["readYarnLock"])(kbn));
+/***/ }),
+/* 50 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (options.validate) {
-      await time('validate dependencies', async () => {
-        await Object(_utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_8__["validateDependencies"])(kbn, yarnLock);
-      });
-    } // Assure all kbn projects with bin defined scripts
-    // copy those scripts into the top level node_modules folder
-    //
-    // NOTE: We don't probably need this anymore, is actually not being used
+var anObject = __webpack_require__(27);
+var IE8_DOM_DEFINE = __webpack_require__(184);
+var toPrimitive = __webpack_require__(201);
+var dP = Object.defineProperty;
 
+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;
+};
 
-    await time('link project executables', async () => {
-      await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_4__["linkProjectExecutables"])(projects, projectGraph);
-    });
-    await time('update vscode config', async () => {
-      // Update vscode settings
-      await Object(_utils_child_process__WEBPACK_IMPORTED_MODULE_3__["spawnStreaming"])(process.execPath, ['scripts/update_vscode_config'], {
-        cwd: kbn.getAbsolute(),
-        env: process.env
-      }, {
-        prefix: '[vscode]',
-        debug: false
-      });
-    }); // send timings
 
-    await reporter.timings({
-      upstreamBranch: kbn.kibanaProject.json.branch,
-      // prevent loading @kbn/utils by passing null
-      kibanaUuid: kbn.getUuid() || null,
-      timings: timings.map(t => _objectSpread({
-        group: 'scripts/kbn bootstrap'
-      }, t))
-    });
-  }
+/***/ }),
+/* 51 */,
+/* 52 */,
+/* 53 */,
+/* 54 */
+/***/ (function(module, exports) {
 
-};
+module.exports = __webpack_require__("events");
 
 /***/ }),
-/* 131 */
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var _interopRequireDefault = __webpack_require__(7);
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CiStatsReporter = void 0;
-
-var _util = __webpack_require__(113);
-
-var _os = _interopRequireDefault(__webpack_require__(122));
-
-var _fs = _interopRequireDefault(__webpack_require__(132));
-
-var _path = _interopRequireDefault(__webpack_require__(4));
-
-var _crypto = _interopRequireDefault(__webpack_require__(133));
-
-var _execa = _interopRequireDefault(__webpack_require__(134));
+const Buffer = __webpack_require__(32).Buffer
 
-var _axios = _interopRequireDefault(__webpack_require__(177));
+const crypto = __webpack_require__(9)
+const Transform = __webpack_require__(17).Transform
 
-var _http = _interopRequireDefault(__webpack_require__(199));
+const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
 
-var _ci_stats_config = __webpack_require__(218);
+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]+$/
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
-const BASE_URL = 'https://ci-stats.kibana.dev';
-/** A ci-stats metric record */
+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 that helps report data to the ci-stats service */
-class CiStatsReporter {
-  /**
-   * Create a CiStatsReporter by inspecting the ENV for the necessary config
-   */
-  static fromEnv(log) {
-    return new CiStatsReporter((0, _ci_stats_config.parseConfig)(log), log);
+    const rawOpts = match[3]
+    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
   }
-
-  constructor(config, log) {
-    this.config = config;
-    this.log = log;
+  hexDigest () {
+    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
   }
-  /**
-   * Determine if CI_STATS is explicitly disabled by the environment. To determine
-   * if the CiStatsReporter has enough information in the environment to send metrics
-   * for builds use #hasBuildConfig().
-   */
-
-
-  isEnabled() {
-    return process.env.CI_STATS_DISABLED !== 'true';
+  toJSON () {
+    return this.toString()
   }
-  /**
-   * Determines if the CiStatsReporter is disabled by the environment, or properly
-   * configured and able to send stats
-   */
-
-
-  hasBuildConfig() {
-    var _this$config, _this$config2;
-
-    return this.isEnabled() && !!((_this$config = this.config) !== null && _this$config !== void 0 && _this$config.apiToken) && !!((_this$config2 = this.config) !== null && _this$config2 !== void 0 && _this$config2.buildId);
+  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}`
   }
-  /**
-   * Report timings data to the ci-stats service. If running in CI then the reporter
-   * will include the buildId in the report with the access token, otherwise the timings
-   * data will be recorded as anonymous timing data.
-   */
-
-
-  async timings(options) {
-    var _this$config3, _options$upstreamBran, _Os$cpus, _Os$cpus$, _Os$cpus$2;
+}
 
-    if (!this.isEnabled()) {
-      return;
+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, ' ')
     }
-
-    const buildId = (_this$config3 = this.config) === null || _this$config3 === void 0 ? void 0 : _this$config3.buildId;
-    const timings = options.timings;
-    const upstreamBranch = (_options$upstreamBran = options.upstreamBranch) !== null && _options$upstreamBran !== void 0 ? _options$upstreamBran : this.getUpstreamBranch();
-    const kibanaUuid = options.kibanaUuid === undefined ? this.getKibanaUuid() : options.kibanaUuid;
-    let email;
-    let branch;
-
-    try {
-      const {
-        stdout
-      } = await (0, _execa.default)('git', ['config', 'user.email']);
-      email = stdout;
-    } catch (e) {
-      this.log.debug(e.message);
+    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
+    })
+  }
+}
 
-    try {
-      const {
-        stdout
-      } = await (0, _execa.default)('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
-      branch = stdout;
-    } catch (e) {
-      this.log.debug(e.message);
-    }
+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)
+  }
+}
 
-    const memUsage = process.memoryUsage();
-    const isElasticCommitter = email && email.endsWith('@elastic.co') ? true : false;
-    const defaultMeta = {
-      kibanaUuid,
-      isElasticCommitter,
-      committerHash: email ? _crypto.default.createHash('sha256').update(email).digest('hex').substring(0, 20) : undefined,
-      email: isElasticCommitter ? email : undefined,
-      branch: isElasticCommitter ? branch : undefined,
-      cpuCount: (_Os$cpus = _os.default.cpus()) === null || _Os$cpus === void 0 ? void 0 : _Os$cpus.length,
-      cpuModel: (_Os$cpus$ = _os.default.cpus()[0]) === null || _Os$cpus$ === void 0 ? void 0 : _Os$cpus$.model,
-      cpuSpeed: (_Os$cpus$2 = _os.default.cpus()[0]) === null || _Os$cpus$2 === void 0 ? void 0 : _Os$cpus$2.speed,
-      freeMem: _os.default.freemem(),
-      memoryUsageRss: memUsage.rss,
-      memoryUsageHeapTotal: memUsage.heapTotal,
-      memoryUsageHeapUsed: memUsage.heapUsed,
-      memoryUsageExternal: memUsage.external,
-      memoryUsageArrayBuffers: memUsage.arrayBuffers,
-      nestedTiming: process.env.CI_STATS_NESTED_TIMING ? true : false,
-      osArch: _os.default.arch(),
-      osPlatform: _os.default.platform(),
-      osRelease: _os.default.release(),
-      totalMem: _os.default.totalmem()
-    };
-    this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash);
-    return !!(await this.req({
-      auth: !!buildId,
-      path: '/v1/timings',
-      body: {
-        buildId,
-        upstreamBranch,
-        defaultMeta,
-        timings
-      },
-      bodyDesc: timings.length === 1 ? `${timings.length} timing` : `${timings.length} timings`
-    }));
+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)
   }
-  /**
-   * Report metrics data to the ci-stats service. If running outside of CI this method
-   * does nothing as metrics can only be reported when associated with a specific CI build.
-   */
+  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())
+}
 
+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)
+  }
+}
 
-  async metrics(metrics, options) {
-    var _this$config4;
+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
+  )
+}
 
-    if (!this.hasBuildConfig()) {
-      return;
+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())
+}
 
-    const buildId = (_this$config4 = this.config) === null || _this$config4 === void 0 ? void 0 : _this$config4.buildId;
-
-    if (!buildId) {
-      throw new Error(`metrics can't be reported without a buildId`);
-    }
+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', () => {})
+  })
+}
 
-    return !!(await this.req({
-      auth: true,
-      path: '/v1/metrics',
-      body: {
-        buildId,
-        defaultMeta: options === null || options === void 0 ? void 0 : options.defaultMeta,
-        metrics
-      },
-      bodyDesc: `metrics: ${metrics.map(({
-        group,
-        id,
-        value
-      }) => `[${group}/${id}=${value}]`).join(' ')}`
-    }));
+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
+    }
   }
-  /**
-   * Send test reports to ci-stats
-   */
-
+  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
+  }
+}
 
-  async reportTests({
-    group,
-    testRuns
-  }) {
-    var _this$config5, _this$config6, _this$config7;
+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', () => {})
+  })
+}
 
-    if (!((_this$config5 = this.config) !== null && _this$config5 !== void 0 && _this$config5.buildId) || !((_this$config6 = this.config) !== null && _this$config6 !== void 0 && _this$config6.apiToken)) {
-      throw new Error('unable to report tests unless buildId is configured and auth config available');
+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
+}
 
-    return await this.req({
-      auth: true,
-      path: '/v1/test_group',
-      query: {
-        buildId: (_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.buildId
-      },
-      bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
-      body: [JSON.stringify({
-        group
-      }), ...testRuns.map(testRun => JSON.stringify({
-        testRun
-      }))].join('\n')
-    });
-  }
-  /**
-   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
-   * in the upstreamBranch when calling the timings() method. Outside of @kbn/pm
-   * we rely on @kbn/utils to find the package.json file.
-   */
-
+module.exports.create = createIntegrity
+function createIntegrity (opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
 
-  getUpstreamBranch() {
-    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
-    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const hashes = algorithms.map(crypto.createHash)
 
-    const {
-      kibanaPackageJson
-    } = __webpack_require__(219)(hideFromWebpack.join(''));
+  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 kibanaPackageJson.branch;
+      return integrity
+    }
   }
-  /**
-   * In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
-   * in the kibanaUuid when calling the timings() method. Outside of @kbn/pm
-   * we rely on @kbn/utils to find the repo root.
-   */
+}
 
+const NODE_HASHES = new Set(crypto.getHashes())
 
-  getKibanaUuid() {
-    // specify the module id in a way that will keep webpack from bundling extra code into @kbn/pm
-    const hideFromWebpack = ['@', 'kbn/utils']; // eslint-disable-next-line @typescript-eslint/no-var-requires
+// 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))
 
-    const {
-      REPO_ROOT
-    } = __webpack_require__(219)(hideFromWebpack.join(''));
+function getPrioritizedHash (algo1, algo2) {
+  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
+  ? algo1
+  : algo2
+}
 
-    try {
-      return _fs.default.readFileSync(_path.default.resolve(REPO_ROOT, 'data/uuid'), 'utf-8').trim();
-    } catch (error) {
-      if (error.code === 'ENOENT') {
-        return undefined;
-      }
 
-      throw error;
-    }
-  }
+/***/ }),
+/* 56 */,
+/* 57 */,
+/* 58 */,
+/* 59 */,
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  async req({
-    auth,
-    body,
-    bodyDesc,
-    path,
-    query
-  }) {
-    let attempt = 0;
-    const maxAttempts = 5;
-    let headers;
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
 
-    if (auth && this.config) {
-      headers = {
-        Authorization: `token ${this.config.apiToken}`
-      };
-    } else if (auth) {
-      throw new Error('this.req() shouldnt be called with auth=true if this.config is not defined');
-    }
+var path = { sep: '/' }
+try {
+  path = __webpack_require__(0)
+} catch (er) {}
 
-    while (true) {
-      attempt += 1;
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__(175)
 
-      try {
-        const resp = await _axios.default.request({
-          method: 'POST',
-          url: path,
-          baseURL: BASE_URL,
-          headers,
-          data: body,
-          params: query,
-          adapter: _http.default,
-          // if it can be serialized into a string, send it
-          maxBodyLength: Infinity,
-          maxContentLength: Infinity
-        });
-        return resp.data;
-      } catch (error) {
-        var _error$response;
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
 
-        if (!(error !== null && error !== void 0 && error.request)) {
-          // not an axios error, must be a usage error that we should notify user about
-          throw error;
-        }
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
 
-        if (error !== null && error !== void 0 && error.response && error.response.status < 500) {
-          // error response from service was received so warn the user and move on
-          this.log.warning(`error reporting ${bodyDesc} [status=${error.response.status}] [resp=${(0, _util.inspect)(error.response.data)}]`);
-          return;
-        }
+// * => any number of characters
+var star = qmark + '*?'
 
-        if (attempt === maxAttempts) {
-          this.log.warning(`unable to report ${bodyDesc}, failed to reach ci-stats service too many times`);
-          return;
-        } // we failed to reach the backend and we have remaining attempts, lets retry after a short delay
+// ** 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})($|\\\/)).)*?'
 
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
 
-        const reason = error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && _error$response.status ? `${error.response.status} response` : 'no response';
-        const seconds = attempt * 10;
-        this.log.warning(`failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`);
-        await new Promise(resolve => setTimeout(resolve, seconds * 1000));
-      }
-    }
-  }
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
 
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
 }
 
-exports.CiStatsReporter = CiStatsReporter;
+// normalizes slashes.
+var slashSplit = /\/+/
 
-/***/ }),
-/* 132 */
-/***/ (function(module, exports) {
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
 
-module.exports = require("fs");
+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
+}
 
-/***/ }),
-/* 133 */
-/***/ (function(module, exports) {
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
 
-module.exports = require("crypto");
+  var orig = minimatch
 
-/***/ }),
-/* 134 */
-/***/ (function(module, exports, __webpack_require__) {
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
 
-"use strict";
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
 
-const path = __webpack_require__(4);
-const childProcess = __webpack_require__(135);
-const crossSpawn = __webpack_require__(136);
-const stripFinalNewline = __webpack_require__(149);
-const npmRunPath = __webpack_require__(150);
-const onetime = __webpack_require__(152);
-const makeError = __webpack_require__(154);
-const normalizeStdio = __webpack_require__(159);
-const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(160);
-const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(165);
-const {mergePromise, getSpawnedPromise} = __webpack_require__(175);
-const {joinCommand, parseCommand} = __webpack_require__(176);
+  return m
+}
 
-const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
 
-const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
-	const env = extendEnv ? {...process.env, ...envOption} : envOption;
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
-	if (preferLocal) {
-		return npmRunPath.env({env, cwd: localDir, execPath});
-	}
+  if (!options) options = {}
 
-	return env;
-};
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
 
-const handleArguments = (file, args, options = {}) => {
-	const parsed = crossSpawn._parse(file, args, options);
-	file = parsed.command;
-	args = parsed.args;
-	options = parsed.options;
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
 
-	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 new Minimatch(pattern, options).match(p)
+}
 
-	options.env = getEnv(options);
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
+  }
 
-	options.stdio = normalizeStdio(options);
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
-	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
-		// #116
-		args.unshift('/q');
-	}
+  if (!options) options = {}
+  pattern = pattern.trim()
 
-	return {file, args, options, parsed};
-};
+  // windows support: need to use /, not \
+  if (path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
 
-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 : '';
-	}
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
 
-	if (options.stripFinalNewline) {
-		return stripFinalNewline(value);
-	}
+  // make the set of regexps etc.
+  this.make()
+}
 
-	return value;
-};
+Minimatch.prototype.debug = function () {}
 
-const execa = (file, args, options) => {
-	const parsed = handleArguments(file, args, options);
-	const command = joinCommand(file, args);
+Minimatch.prototype.make = make
+function make () {
+  // don't do it more than once.
+  if (this._made) return
 
-	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);
-	}
+  var pattern = this.pattern
+  var options = this.options
 
-	const spawnedPromise = getSpawnedPromise(spawned);
-	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
-	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
+  }
+  if (!pattern) {
+    this.empty = true
+    return
+  }
 
-	const context = {isCanceled: false};
+  // step 1: figure out negation, etc.
+  this.parseNegate()
 
-	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
-	spawned.cancel = spawnedCancel.bind(null, spawned, context);
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
 
-	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 (options.debug) this.debug = console.error
 
-		if (error || exitCode !== 0 || signal !== null) {
-			const returnedError = makeError({
-				error,
-				exitCode,
-				signal,
-				stdout,
-				stderr,
-				all,
-				command,
-				parsed,
-				timedOut,
-				isCanceled: context.isCanceled,
-				killed: spawned.killed
-			});
+  this.debug(this.pattern, set)
 
-			if (!parsed.options.reject) {
-				return returnedError;
-			}
+  // 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)
+  })
 
-			throw returnedError;
-		}
+  this.debug(this.pattern, set)
 
-		return {
-			command,
-			exitCode: 0,
-			stdout,
-			stderr,
-			all,
-			failed: false,
-			timedOut: false,
-			isCanceled: false,
-			killed: false
-		};
-	};
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
 
-	const handlePromiseOnce = onetime(handlePromise);
+  this.debug(this.pattern, set)
 
-	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
 
-	handleInput(spawned, parsed.options.input);
+  this.debug(this.pattern, set)
 
-	spawned.all = makeAllStream(spawned, parsed.options);
+  this.set = set
+}
 
-	return mergePromise(spawned, handlePromiseOnce);
-};
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
 
-module.exports = execa;
+  if (options.nonegate) return
 
-module.exports.sync = (file, args, options) => {
-	const parsed = handleArguments(file, args, options);
-	const command = joinCommand(file, args);
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
+  }
 
-	validateInputSync(parsed.options);
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
 
-	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
-		});
-	}
+// 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)
+}
 
-	const stdout = handleOutput(parsed.options, result.stdout, result.error);
-	const stderr = handleOutput(parsed.options, result.stderr, result.error);
+Minimatch.prototype.braceExpand = braceExpand
 
-	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
-		});
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
+    }
+  }
 
-		if (!parsed.options.reject) {
-			return error;
-		}
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
 
-		throw error;
-	}
+  if (typeof pattern === 'undefined') {
+    throw new TypeError('undefined pattern')
+  }
 
-	return {
-		command,
-		exitCode: 0,
-		stdout,
-		stderr,
-		failed: false,
-		timedOut: false,
-		isCanceled: false,
-		killed: false
-	};
-};
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
 
-module.exports.command = (command, options) => {
-	const [file, ...args] = parseCommand(command);
-	return execa(file, args, options);
-};
+  return expand(pattern)
+}
 
-module.exports.commandSync = (command, options) => {
-	const [file, ...args] = parseCommand(command);
-	return execa.sync(file, args, options);
-};
+// 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')
+  }
 
-module.exports.node = (scriptPath, args, options = {}) => {
-	if (args && !Array.isArray(args) && typeof args === 'object') {
-		options = args;
-		args = [];
-	}
+  var options = this.options
 
-	const stdio = normalizeStdio.node(options);
+  // shortcuts
+  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '') return ''
 
-	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
+  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
 
-	return execa(
-		nodePath,
-		[
-			...nodeOptions,
-			scriptPath,
-			...(Array.isArray(args) ? args : [])
-		],
-		{
-			...options,
-			stdin: undefined,
-			stdout: undefined,
-			stderr: undefined,
-			stdio,
-			shell: 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
+      }
+      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)
 
-/***/ }),
-/* 135 */
-/***/ (function(module, exports) {
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
 
-module.exports = require("child_process");
+    switch (c) {
+      case '/':
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
 
-/***/ }),
-/* 136 */
-/***/ (function(module, exports, __webpack_require__) {
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
 
-"use strict";
+      // 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)
 
+        // 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
+        }
 
-const cp = __webpack_require__(135);
-const parse = __webpack_require__(137);
-const enoent = __webpack_require__(148);
+        // 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
 
-function spawn(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
 
-    // Spawn the child process
-    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
 
-    // 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);
+        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
 
-    return spawned;
-}
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
 
-function spawnSync(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+        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
 
-    // Spawn the child process
-    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
 
-    // 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);
+        clearStateChar()
+        re += '|'
+      continue
 
-    return result;
-}
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
-module.exports = spawn;
-module.exports.spawn = spawn;
-module.exports.sync = spawnSync;
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
 
-module.exports._parse = parse;
-module.exports._enoent = enoent;
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
 
+      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
+        }
 
-/***/ }),
-/* 137 */
-/***/ (function(module, exports, __webpack_require__) {
+        // 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
+          }
+        }
 
-"use strict";
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
 
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
 
-const path = __webpack_require__(4);
-const resolveCommand = __webpack_require__(138);
-const escape = __webpack_require__(144);
-const readShebang = __webpack_require__(145);
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
 
-const isWin = process.platform === 'win32';
-const isExecutableRegExp = /\.(?:com|exe)$/i;
-const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+        re += c
 
-function detectShebang(parsed) {
-    parsed.file = resolveCommand(parsed);
+    } // switch
+  } // for
 
-    const shebang = parsed.file && readShebang(parsed.file);
+  // 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]
+  }
 
-    if (shebang) {
-        parsed.args.unshift(parsed.file);
-        parsed.command = shebang;
+  // 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 = '\\'
+      }
 
-        return resolveCommand(parsed);
-    }
+      // 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 + '|'
+    })
 
-    return parsed.file;
-}
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
 
-function parseNonShell(parsed) {
-    if (!isWin) {
-        return parsed;
-    }
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  }
 
-    // Detect & add support for shebangs
-    const commandFile = detectShebang(parsed);
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
+  }
 
-    // We don't need a shell if the command filename is an executable
-    const needsShell = !isExecutableRegExp.test(commandFile);
+  // 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
+  }
 
-    // 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);
-
-        // 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);
+  // 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]
 
-        // Escape command & arguments
-        parsed.command = escape.command(parsed.command);
-        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
+    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 shellCommand = [parsed.command].concat(parsed.args).join(' ');
+    nlLast += nlAfter
 
-        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
+    // 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
 
-    return parsed;
-}
-
-function parse(command, args, options) {
-    // Normalize arguments, similar to nodejs
-    if (args && !Array.isArray(args)) {
-        options = args;
-        args = null;
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
     }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
 
-    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
-    options = Object.assign({}, options); // Clone object to avoid changing the original
+  // 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
+  }
 
-    // Build our parsed object
-    const parsed = {
-        command,
-        args,
-        options,
-        file: undefined,
-        original: {
-            command,
-            args,
-        },
-    };
+  if (addPatternStart) {
+    re = patternStart + re
+  }
 
-    // Delegate further parsing to shell or non-shell
-    return options.shell ? parsed : parseNonShell(parsed);
-}
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
 
-module.exports = parse;
+  // 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)
+  }
 
+  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('$.')
+  }
 
-/***/ }),
-/* 138 */
-/***/ (function(module, exports, __webpack_require__) {
+  regExp._glob = pattern
+  regExp._src = re
 
-"use strict";
+  return regExp
+}
 
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
 
-const path = __webpack_require__(4);
-const which = __webpack_require__(139);
-const getPathKey = __webpack_require__(143);
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
 
-function resolveCommandAttempt(parsed, withoutPathExt) {
-    const env = parsed.options.env || process.env;
-    const cwd = process.cwd();
-    const hasCustomCwd = parsed.options.cwd != null;
-    // Worker threads do not have process.chdir()
-    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined && !process.chdir.disabled;
+  // 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 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 */
-        }
-    }
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
 
-    let resolved;
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
 
-    try {
-        resolved = which.sync(parsed.command, {
-            path: env[getPathKey({ env })],
-            pathExt: withoutPathExt ? path.delimiter : undefined,
-        });
-    } catch (e) {
-        /* Empty */
-    } finally {
-        if (shouldSwitchCwd) {
-            process.chdir(cwd);
-        }
-    }
+  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 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);
-    }
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
 
-    return resolved;
-}
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
 
-function resolveCommand(parsed) {
-    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) {
+    this.regexp = false
+  }
+  return this.regexp
 }
 
-module.exports = resolveCommand;
+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
+}
 
+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 === ''
 
-/***/ }),
-/* 139 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (f === '/' && partial) return true
 
-const isWindows = process.platform === 'win32' ||
-    process.env.OSTYPE === 'cygwin' ||
-    process.env.OSTYPE === 'msys'
+  var options = this.options
 
-const path = __webpack_require__(4)
-const COLON = isWindows ? ';' : ':'
-const isexe = __webpack_require__(140)
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
 
-const getNotFoundError = (cmd) =>
-  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
 
-const getPathInfo = (cmd, opt) => {
-  const colon = opt.colon || COLON
+  // 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.
 
-  // 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) : ['']
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
 
-  if (isWindows) {
-    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
-      pathExt.unshift('')
+  // 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
   }
 
-  return {
-    pathEnv,
-    pathExt,
-    pathExtExe,
+  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
+    }
   }
+
+  // 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 which = (cmd, opt, cb) => {
-  if (typeof opt === 'function') {
-    cb = opt
-    opt = {}
-  }
-  if (!opt)
-    opt = {}
+// 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
 
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
 
-  const step = i => new Promise((resolve, reject) => {
-    if (i === pathEnv.length)
-      return opt.all && found.length ? resolve(found)
-        : reject(getNotFoundError(cmd))
+  this.debug('matchOne', file.length, pattern.length)
 
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+  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]
 
-    const pCmd = path.join(pathPart, cmd)
-    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
-      : pCmd
+    this.debug(pattern, p, f)
 
-    resolve(subStep(p, i, 0))
-  })
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
 
-  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)
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
+
+      // "**"
+      // 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
       }
-      return resolve(subStep(p, i, ii + 1))
-    })
-  })
 
-  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
-}
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
 
-const whichSync = (cmd, opt) => {
-  opt = opt || {}
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
 
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+        // 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
+          }
 
-  for (let i = 0; i < pathEnv.length; i ++) {
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
+        }
+      }
 
-    const pCmd = path.join(pathPart, cmd)
-    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
-      : pCmd
+      // 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
+    }
 
-    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) {}
+    // 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
   }
 
-  if (opt.all && found.length)
-    return found
+  // 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/*
 
-  if (opt.nothrow)
-    return null
+  // 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
+  }
 
-  throw getNotFoundError(cmd)
+  // should be unreachable.
+  throw new Error('wtf?')
 }
 
-module.exports = which
-which.sync = whichSync
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
+}
+
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+}
 
 
 /***/ }),
-/* 140 */
+/* 61 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(132)
-var core
-if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = __webpack_require__(141)
-} else {
-  core = __webpack_require__(142)
-}
+var wrappy = __webpack_require__(123)
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
 
-module.exports = isexe
-isexe.sync = sync
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
 
-function isexe (path, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
 
-  if (!cb) {
-    if (typeof Promise !== 'function') {
-      throw new TypeError('callback not provided')
-    }
-
-    return new Promise(function (resolve, reject) {
-      isexe(path, options || {}, function (er, is) {
-        if (er) {
-          reject(er)
-        } else {
-          resolve(is)
-        }
-      })
-    })
+function once (fn) {
+  var f = function () {
+    if (f.called) return f.value
+    f.called = true
+    return f.value = fn.apply(this, arguments)
   }
-
-  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)
-  })
+  f.called = false
+  return f
 }
 
-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
-    }
+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
 }
 
 
 /***/ }),
-/* 141 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 62 */,
+/* 63 */
+/***/ (function(module, exports) {
 
-module.exports = isexe
-isexe.sync = sync
+module.exports = __webpack_require__("buffer");
 
-var fs = __webpack_require__(132)
+/***/ }),
+/* 64 */,
+/* 65 */,
+/* 66 */,
+/* 67 */
+/***/ (function(module, exports) {
 
-function checkPathExt (path, options) {
-  var pathext = options.pathExt !== undefined ?
-    options.pathExt : process.env.PATHEXT
+// 7.2.1 RequireObjectCoercible(argument)
+module.exports = function (it) {
+  if (it == undefined) throw TypeError("Can't call method on  " + it);
+  return it;
+};
 
-  if (!pathext) {
-    return true
-  }
 
-  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
-}
+/***/ }),
+/* 68 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function checkStat (stat, path, options) {
-  if (!stat.isSymbolicLink() && !stat.isFile()) {
-    return false
-  }
-  return checkPathExt(path, options)
-}
+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) : {};
+};
 
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, path, options))
-  })
-}
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), path, options)
-}
+/***/ }),
+/* 69 */
+/***/ (function(module, exports) {
+
+module.exports = true;
 
 
 /***/ }),
-/* 142 */
+/* 70 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = isexe
-isexe.sync = sync
-
-var fs = __webpack_require__(132)
-
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, options))
-  })
-}
+"use strict";
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), options)
-}
+// 25.4.1.5 NewPromiseCapability(C)
+var aFunction = __webpack_require__(46);
 
-function checkStat (stat, options) {
-  return stat.isFile() && checkMode(stat, 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 checkMode (stat, options) {
-  var mod = stat.mode
-  var uid = stat.uid
-  var gid = stat.gid
+module.exports.f = function (C) {
+  return new PromiseCapability(C);
+};
 
-  var myUid = options.uid !== undefined ?
-    options.uid : process.getuid && process.getuid()
-  var myGid = options.gid !== undefined ?
-    options.gid : process.getgid && process.getgid()
 
-  var u = parseInt('100', 8)
-  var g = parseInt('010', 8)
-  var o = parseInt('001', 8)
-  var ug = u | g
+/***/ }),
+/* 71 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var ret = (mod & o) ||
-    (mod & g) && gid === myGid ||
-    (mod & u) && uid === myUid ||
-    (mod & ug) && myUid === 0
+var def = __webpack_require__(50).f;
+var has = __webpack_require__(49);
+var TAG = __webpack_require__(13)('toStringTag');
 
-  return ret
-}
+module.exports = function (it, tag, stat) {
+  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
+};
 
 
 /***/ }),
-/* 143 */
+/* 72 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var shared = __webpack_require__(107)('keys');
+var uid = __webpack_require__(111);
+module.exports = function (key) {
+  return shared[key] || (shared[key] = uid(key));
+};
 
-const pathKey = (options = {}) => {
-	const environment = options.env || process.env;
-	const platform = options.platform || process.platform;
 
-	if (platform !== 'win32') {
-		return 'PATH';
-	}
+/***/ }),
+/* 73 */
+/***/ (function(module, exports) {
 
-	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
+// 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);
 };
 
-module.exports = pathKey;
-// TODO: Remove this for the next major release
-module.exports.default = pathKey;
-
 
 /***/ }),
-/* 144 */
+/* 74 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-// See http://www.robvanderwoude.com/escapechars.php
-const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
-
-function escapeCommand(arg) {
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
-
-    return arg;
-}
+// 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));
+};
 
-function escapeArgument(arg, doubleEscapeMetaChars) {
-    // Convert to string
-    arg = `${arg}`;
 
-    // Algorithm below is based on https://qntm.org/cmd
+/***/ }),
+/* 75 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // Sequence of backslashes followed by a double quote:
-    // double up all the backslashes and escape the double quote
-    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+// 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.
 
-    // 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');
+module.exports = glob
 
-    // All other backslashes occur literally
+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
 
-    // Quote the whole thing:
-    arg = `"${arg}"`;
+var once = __webpack_require__(61)
 
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
 
-    // Double escape meta chars if necessary
-    if (doubleEscapeMetaChars) {
-        arg = arg.replace(metaCharsRegExp, '^$1');
-    }
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
+  }
 
-    return arg;
+  return new Glob(pattern, options, cb)
 }
 
-module.exports.command = escapeCommand;
-module.exports.argument = escapeArgument;
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
 
+// old api surface
+glob.glob = glob
 
-/***/ }),
-/* 145 */
-/***/ (function(module, exports, __webpack_require__) {
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
 
-"use strict";
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
 
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
 
-const fs = __webpack_require__(132);
-const shebangCommand = __webpack_require__(146);
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
 
-function readShebang(command) {
-    // Read the first 150 bytes from the file
-    const size = 150;
-    const buffer = Buffer.alloc(size);
+  if (!pattern)
+    return false
 
-    let fd;
+  if (set.length > 1)
+    return true
 
-    try {
-        fd = fs.openSync(command, 'r');
-        fs.readSync(fd, buffer, 0, size, 0);
-        fs.closeSync(fd);
-    } catch (e) { /* Empty */ }
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
 
-    // Attempt to extract shebang (null is returned if not a shebang)
-    return shebangCommand(buffer.toString());
+  return false
 }
 
-module.exports = readShebang;
-
-
-/***/ }),
-/* 146 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const shebangRegex = __webpack_require__(147);
+glob.Glob = Glob
+inherits(Glob, EE)
+function Glob (pattern, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = null
+  }
 
-module.exports = (string = '') => {
-	const match = string.match(shebangRegex);
+  if (options && options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return new GlobSync(pattern, options)
+  }
 
-	if (!match) {
-		return null;
-	}
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
 
-	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
-	const binary = path.split('/').pop();
+  setopts(this, pattern, options)
+  this._didRealPath = false
 
-	if (binary === 'env') {
-		return argument;
-	}
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
 
-	return argument ? `${binary} ${argument}` : binary;
-};
+  // 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 (typeof cb === 'function') {
+    cb = once(cb)
+    this.on('error', cb)
+    this.on('end', function (matches) {
+      cb(null, matches)
+    })
+  }
 
-/***/ }),
-/* 147 */
-/***/ (function(module, exports, __webpack_require__) {
+  var self = this
+  this._processing = 0
 
-"use strict";
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
 
-module.exports = /^#!(.*)/;
+  if (this.noprocess)
+    return this
 
+  if (n === 0)
+    return done()
 
-/***/ }),
-/* 148 */
-/***/ (function(module, exports, __webpack_require__) {
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
+  }
+  sync = false
 
-"use strict";
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
+  }
+}
 
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
 
-const isWin = process.platform === 'win32';
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
 
-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,
-    });
+  common.finish(this)
+  this.emit('end', this.found)
 }
 
-function hookChildProcess(cp, parsed) {
-    if (!isWin) {
-        return;
-    }
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
 
-    const originalEmit = cp.emit;
+  this._didRealpath = true
 
-    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');
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
 
-            if (err) {
-                return originalEmit.call(cp, 'error', err);
-            }
-        }
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
 
-        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
-    };
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
 }
 
-function verifyENOENT(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawn');
-    }
-
-    return null;
-}
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
 
-function verifyENOENTSync(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawnSync');
-    }
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
 
-    return null;
-}
-
-module.exports = {
-    hookChildProcess,
-    verifyENOENT,
-    verifyENOENTSync,
-    notFoundError,
-};
+  if (n === 0)
+    return cb()
 
+  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
 
-/***/ }),
-/* 149 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
+}
 
-"use strict";
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
-module.exports = input => {
-	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
-	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
 
-	if (input[input.length - 1] === LF) {
-		input = input.slice(0, input.length - 1);
-	}
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
+  }
+}
 
-	if (input[input.length - 1] === CR) {
-		input = input.slice(0, input.length - 1);
-	}
+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])
+      }
+    }
+  }
+}
 
-	return input;
-};
+Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
+  assert(this instanceof Glob)
+  assert(typeof cb === 'function')
 
+  if (this.aborted)
+    return
 
-/***/ }),
-/* 150 */
-/***/ (function(module, exports, __webpack_require__) {
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
 
-"use strict";
+  //console.error('PROCESS %d', this._processing, pattern)
 
-const path = __webpack_require__(4);
-const pathKey = __webpack_require__(151);
+  // 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.
 
-const npmRunPath = options => {
-	options = {
-		cwd: process.cwd(),
-		path: process.env[pathKey()],
-		execPath: process.execPath,
-		...options
-	};
+  // 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
 
-	let previous;
-	let cwdPath = path.resolve(options.cwd);
-	const result = [];
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
 
-	while (previous !== cwdPath) {
-		result.push(path.join(cwdPath, 'node_modules/.bin'));
-		previous = cwdPath;
-		cwdPath = path.resolve(cwdPath, '..');
-	}
+    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
+  }
 
-	// Ensure the running `node` binary is used
-	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
-	result.push(execPathDir);
+  var remain = pattern.slice(n)
 
-	return result.concat(options.path).join(path.delimiter);
-};
+  // 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
 
-module.exports = npmRunPath;
-// TODO: Remove this for the next major release
-module.exports.default = npmRunPath;
+  var abs = this._makeAbs(read)
 
-module.exports.env = options => {
-	options = {
-		env: process.env,
-		...options
-	};
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
 
-	const env = {...options.env};
-	const path = pathKey({env});
+  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)
+}
 
-	options.path = env[path];
-	env[path] = module.exports(options);
+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)
+  })
+}
 
-	return env;
-};
+Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
 
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return cb()
 
-/***/ }),
-/* 151 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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) === '.'
 
-"use strict";
+  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)
+    }
+  }
 
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
 
-const pathKey = (options = {}) => {
-	const environment = options.env || process.env;
-	const platform = options.platform || process.platform;
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
 
-	if (platform !== 'win32') {
-		return 'PATH';
-	}
+  // 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.
 
-	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
-};
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-module.exports = pathKey;
-// TODO: Remove this for the next major release
-module.exports.default = pathKey;
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
 
+      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()
+  }
 
-/***/ }),
-/* 152 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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()
+}
 
-"use strict";
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
 
-const mimicFn = __webpack_require__(153);
+  if (isIgnored(this, e))
+    return
 
-const calledFunctions = new WeakMap();
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
+  }
 
-const onetime = (function_, options = {}) => {
-	if (typeof function_ !== 'function') {
-		throw new TypeError('Expected a function');
-	}
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
 
-	let returnValue;
-	let callCount = 0;
-	const functionName = function_.displayName || function_.name || '<anonymous>';
+  if (this.mark)
+    e = this._mark(e)
 
-	const onetime = function (...arguments_) {
-		calledFunctions.set(onetime, ++callCount);
+  if (this.absolute)
+    e = abs
 
-		if (callCount === 1) {
-			returnValue = function_.apply(this, arguments_);
-			function_ = null;
-		} else if (options.throw === true) {
-			throw new Error(`Function \`${functionName}\` can only be called once`);
-		}
+  if (this.matches[index][e])
+    return
 
-		return returnValue;
-	};
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-	mimicFn(onetime, function_);
-	calledFunctions.set(onetime, callCount);
+  this.matches[index][e] = true
 
-	return onetime;
-};
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
 
-module.exports = onetime;
-// TODO: Remove this for the next major release
-module.exports.default = onetime;
+  this.emit('match', e)
+}
 
-module.exports.callCount = function_ => {
-	if (!calledFunctions.has(function_)) {
-		throw new Error(`The given function \`${function_.name}\` is not wrapped by the \`onetime\` package`);
-	}
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
 
-	return calledFunctions.get(function_);
-};
+  // 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 lstatkey = 'lstat\0' + abs
+  var self = this
+  var lstatcb = inflight(lstatkey, lstatcb_)
 
-/***/ }),
-/* 153 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (lstatcb)
+    fs.lstat(abs, lstatcb)
 
-"use strict";
+  function lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
 
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
 
-const mimicFn = (to, from) => {
-	for (const prop of Reflect.ownKeys(from)) {
-		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
-	}
+    // 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)
+  }
+}
 
-	return to;
-};
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
 
-module.exports = mimicFn;
-// TODO: Remove this for the next major release
-module.exports.default = mimicFn;
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
 
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
 
-/***/ }),
-/* 154 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
 
-"use strict";
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
 
-const {signalsByName} = __webpack_require__(155);
+  var self = this
+  fs.readdir(abs, readdirCb(this, abs, cb))
+}
 
-const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
-	if (timedOut) {
-		return `timed out after ${timeout} milliseconds`;
-	}
+function readdirCb (self, abs, cb) {
+  return function (er, entries) {
+    if (er)
+      self._readdirError(abs, er, cb)
+    else
+      self._readdirEntries(abs, entries, cb)
+  }
+}
 
-	if (isCanceled) {
-		return 'was canceled';
-	}
+Glob.prototype._readdirEntries = function (abs, entries, cb) {
+  if (this.aborted)
+    return
 
-	if (errorCode !== undefined) {
-		return `failed with ${errorCode}`;
-	}
+  // 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 (signal !== undefined) {
-		return `was killed with ${signal} (${signalDescription})`;
-	}
+  this.cache[abs] = entries
+  return cb(null, entries)
+}
 
-	if (exitCode !== undefined) {
-		return `failed with exit code ${exitCode}`;
-	}
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
 
-	return 'failed';
-};
+  // 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
 
-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;
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-	const errorCode = error && error.code;
+    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.silent)
+        console.error('glob error', er)
+      break
+  }
 
-	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 cb()
+}
 
-	if (isError) {
-		error.originalMessage = error.message;
-		error.message = message;
-	} else {
-		error = new Error(message);
-	}
+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)
+  })
+}
 
-	error.shortMessage = shortMessage;
-	error.command = command;
-	error.exitCode = exitCode;
-	error.signal = signal;
-	error.signalDescription = signalDescription;
-	error.stdout = stdout;
-	error.stderr = stderr;
 
-	if (all !== undefined) {
-		error.all = all;
-	}
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
 
-	if ('bufferedData' in error) {
-		delete error.bufferedData;
-	}
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return cb()
 
-	error.failed = true;
-	error.timedOut = Boolean(timedOut);
-	error.isCanceled = isCanceled;
-	error.killed = killed && !timedOut;
+  // 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)
 
-	return error;
-};
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
 
-module.exports = makeError;
+  var isSym = this.symlinks[abs]
+  var len = entries.length
 
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return cb()
 
-/***/ }),
-/* 155 */
-/***/ (function(module, exports, __webpack_require__) {
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(122);
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true, cb)
 
-var _signals=__webpack_require__(156);
-var _realtime=__webpack_require__(158);
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true, cb)
+  }
 
+  cb()
+}
 
+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) {
 
-const getSignalsByName=function(){
-const signals=(0,_signals.getSignals)();
-return signals.reduce(getSignalByName,{});
-};
+  //console.error('ps2', prefix, exists)
 
-const getSignalByName=function(
-signalByNameMemo,
-{name,number,description,supported,action,forced,standard})
-{
-return{
-...signalByNameMemo,
-[name]:{name,number,description,supported,action,forced,standard}};
+  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()
 
-const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
+  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 += '/'
+    }
+  }
 
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
 
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
+}
 
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-const getSignalsByNumber=function(){
-const signals=(0,_signals.getSignals)();
-const length=_realtime.SIGRTMAX+1;
-const signalsA=Array.from({length},(value,number)=>
-getSignalByNumber(number,signals));
+  if (f.length > this.maxLength)
+    return cb()
 
-return Object.assign({},...signalsA);
-};
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-const getSignalByNumber=function(number,signals){
-const signal=findSignalByNumber(number,signals);
+    if (Array.isArray(c))
+      c = 'DIR'
 
-if(signal===undefined){
-return{};
-}
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
 
-const{name,description,supported,action,forced,standard}=signal;
-return{
-[number]:{
-name,
-number,
-description,
-supported,
-action,
-forced,
-standard}};
+    if (needDir && c === 'FILE')
+      return cb()
 
+    // 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)
+    }
+  }
 
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    fs.lstat(abs, statcb)
 
+  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)
+    }
+  }
+}
 
-const findSignalByNumber=function(number,signals){
-const signal=signals.find(({name})=>_os.constants.signals[name]===number);
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
 
-if(signal!==undefined){
-return signal;
-}
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
 
-return signals.find(signalA=>signalA.number===number);
-};
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
 
-const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
-//# sourceMappingURL=main.js.map
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+  this.cache[abs] = this.cache[abs] || c
 
-/***/ }),
-/* 156 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (needDir && c === 'FILE')
+    return cb()
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(122);
+  return cb(null, c, stat)
+}
 
-var _core=__webpack_require__(157);
-var _realtime=__webpack_require__(158);
 
+/***/ }),
+/* 76 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-const getSignals=function(){
-const realtimeSignals=(0,_realtime.getRealtimeSignals)();
-const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
-return signals;
-};exports.getSignals=getSignals;
 
+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);
+}
 
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
 
+/***/ }),
+/* 77 */,
+/* 78 */,
+/* 79 */
+/***/ (function(module, exports) {
 
-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
+module.exports = __webpack_require__("tty");
 
 /***/ }),
-/* 157 */
+/* 80 */,
+/* 81 */
 /***/ (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"},
 
-{
-name:"SIGINT",
-number:2,
-action:"terminate",
-description:"User interruption with CTRL-C",
-standard:"ansi"},
 
-{
-name:"SIGQUIT",
-number:3,
-action:"core",
-description:"User interruption with CTRL-\\",
-standard:"posix"},
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-{
-name:"SIGILL",
-number:4,
-action:"core",
-description:"Invalid machine instruction",
-standard:"ansi"},
+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) };
+};
 
-{
-name:"SIGTRAP",
-number:5,
-action:"core",
-description:"Debugger breakpoint",
-standard:"posix"},
+var _util;
 
-{
-name:"SIGABRT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"ansi"},
+function _load_util() {
+  return _util = _interopRequireDefault(__webpack_require__(2));
+}
 
-{
-name:"SIGIOT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"bsd"},
+var _invariant;
 
-{
-name:"SIGBUS",
-number:7,
-action:"core",
-description:
-"Bus error due to misaligned, non-existing address or paging error",
-standard:"bsd"},
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(7));
+}
 
-{
-name:"SIGEMT",
-number:7,
-action:"terminate",
-description:"Command should be emulated but is not implemented",
-standard:"other"},
+var _stripBom;
 
-{
-name:"SIGFPE",
-number:8,
-action:"core",
-description:"Floating point arithmetic error",
-standard:"ansi"},
+function _load_stripBom() {
+  return _stripBom = _interopRequireDefault(__webpack_require__(122));
+}
 
-{
-name:"SIGKILL",
-number:9,
-action:"terminate",
-description:"Forced termination",
-standard:"posix",
-forced:true},
+var _constants;
 
-{
-name:"SIGUSR1",
-number:10,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-{
-name:"SIGSEGV",
-number:11,
-action:"core",
-description:"Segmentation fault",
-standard:"ansi"},
+var _errors;
 
-{
-name:"SIGUSR2",
-number:12,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+function _load_errors() {
+  return _errors = __webpack_require__(4);
+}
 
-{
-name:"SIGPIPE",
-number:13,
-action:"terminate",
-description:"Broken pipe or socket",
-standard:"posix"},
+var _map;
 
-{
-name:"SIGALRM",
-number:14,
-action:"terminate",
-description:"Timeout or timer",
-standard:"posix"},
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-{
-name:"SIGTERM",
-number:15,
-action:"terminate",
-description:"Termination",
-standard:"ansi"},
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-{
-name:"SIGSTKFLT",
-number:16,
-action:"terminate",
-description:"Stack is empty or overflowed",
-standard:"other"},
+/* eslint quotes: 0 */
 
-{
-name:"SIGCHLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"posix"},
+const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
 
-{
-name:"SIGCLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"other"},
+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'
+};
 
-{
-name:"SIGCONT",
-number:18,
-action:"unpause",
-description:"Unpaused",
-standard:"posix",
-forced:true},
+const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
 
-{
-name:"SIGSTOP",
-number:19,
-action:"pause",
-description:"Paused",
-standard:"posix",
-forced:true},
+function isValidPropValueToken(token) {
+  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
+}
 
-{
-name:"SIGTSTP",
-number:20,
-action:"pause",
-description:"Paused using CTRL-Z or \"suspend\"",
-standard:"posix"},
+function* tokenise(input) {
+  let lastNewline = false;
+  let line = 1;
+  let col = 0;
 
-{
-name:"SIGTTIN",
-number:21,
-action:"pause",
-description:"Background process cannot read terminal input",
-standard:"posix"},
+  function buildToken(type, value) {
+    return { line, col, type, value };
+  }
 
-{
-name:"SIGBREAK",
-number:21,
-action:"terminate",
-description:"User interruption with CTRL-BREAK",
-standard:"other"},
+  while (input.length) {
+    let chop = 0;
 
-{
-name:"SIGTTOU",
-number:22,
-action:"pause",
-description:"Background process cannot write to terminal output",
-standard:"posix"},
+    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++;
 
-{
-name:"SIGURG",
-number:23,
-action:"ignore",
-description:"Socket received out-of-band data",
-standard:"bsd"},
+      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];
+        }
 
-{
-name:"SIGXCPU",
-number:24,
-action:"core",
-description:"Process timed out",
-standard:"bsd"},
+        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 = '';
 
-{
-name:"SIGXFSZ",
-number:25,
-action:"core",
-description:"File too big",
-standard:"bsd"},
+      for (let i = 0;; i++) {
+        const currentChar = input[i];
+        val += currentChar;
 
-{
-name:"SIGVTALRM",
-number:26,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+        if (i > 0 && currentChar === '"') {
+          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
+          if (!isEscaped) {
+            break;
+          }
+        }
+      }
 
-{
-name:"SIGPROF",
-number:27,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+      chop = val.length;
 
-{
-name:"SIGWINCH",
-number:28,
-action:"ignore",
-description:"Terminal window size changed",
-standard:"bsd"},
+      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;
 
-{
-name:"SIGIO",
-number:29,
-action:"terminate",
-description:"I/O is available",
-standard:"other"},
+      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;
 
-{
-name:"SIGPOLL",
-number:29,
-action:"terminate",
-description:"Watched event",
-standard:"other"},
+      yield buildToken(TOKEN_TYPES.string, name);
+    } else {
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
 
-{
-name:"SIGINFO",
-number:29,
-action:"ignore",
-description:"Request for process information",
-standard:"other"},
+    if (!chop) {
+      // will trigger infinite recursion
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
 
-{
-name:"SIGPWR",
-number:30,
-action:"terminate",
-description:"Device running out of power",
-standard:"systemv"},
+    col += chop;
+    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
+    input = input.slice(chop);
+  }
 
-{
-name:"SIGSYS",
-number:31,
-action:"core",
-description:"Invalid system call",
-standard:"other"},
+  yield buildToken(TOKEN_TYPES.eof);
+}
 
-{
-name:"SIGUNUSED",
-number:31,
-action:"terminate",
-description:"Invalid system call",
-standard:"other"}];exports.SIGNALS=SIGNALS;
-//# sourceMappingURL=core.js.map
+class Parser {
+  constructor(input, fileLoc = 'lockfile') {
+    this.comments = [];
+    this.tokens = tokenise(input);
+    this.fileLoc = fileLoc;
+  }
 
-/***/ }),
-/* 158 */
-/***/ (function(module, exports, __webpack_require__) {
+  onComment(token) {
+    const value = token.value;
+    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
 
-"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;
+    const comment = value.trim();
 
-const getRealtimeSignal=function(value,index){
-return{
-name:`SIGRT${index+1}`,
-number:SIGRTMIN+index,
-action:"terminate",
-description:"Application-specific signal (realtime)",
-standard:"posix"};
+    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.`);
+      }
+    }
 
-};
+    this.comments.push(comment);
+  }
 
-const SIGRTMIN=34;
-const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
-//# sourceMappingURL=realtime.js.map
+  next() {
+    const item = this.tokens.next();
+    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
 
-/***/ }),
-/* 159 */
-/***/ (function(module, exports, __webpack_require__) {
+    const done = item.done,
+          value = item.value;
 
-"use strict";
+    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;
+    }
+  }
 
-const aliases = ['stdin', 'stdout', 'stderr'];
+  unexpected(msg = 'Unexpected token') {
+    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
+  }
 
-const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
+  expect(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+    } else {
+      this.unexpected();
+    }
+  }
 
-const normalizeStdio = opts => {
-	if (!opts) {
-		return;
-	}
+  eat(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+      return true;
+    } else {
+      return false;
+    }
+  }
 
-	const {stdio} = opts;
+  parse(indent = 0) {
+    const obj = (0, (_map || _load_map()).default)();
 
-	if (stdio === undefined) {
-		return aliases.map(alias => opts[alias]);
-	}
+    while (true) {
+      const propToken = this.token;
 
-	if (hasAlias(opts)) {
-		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
-	}
+      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 (typeof stdio === 'string') {
-		return stdio;
-	}
+        if (nextToken.type !== TOKEN_TYPES.indent) {
+          // if we have no indentation after a newline then we've gone down a level
+          break;
+        }
 
-	if (!Array.isArray(stdio)) {
-		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
-	}
+        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');
 
-	const length = Math.max(stdio.length, aliases.length);
-	return Array.from({length}, (value, index) => stdio[index]);
-};
+        const keys = [key];
+        this.next();
 
-module.exports = normalizeStdio;
+        // support multiple keys
+        while (this.token.type === TOKEN_TYPES.comma) {
+          this.next(); // skip comma
 
-// `ipc` is pushed unless it is already present
-module.exports.node = opts => {
-	const stdio = normalizeStdio(opts);
+          const keyToken = this.token;
+          if (keyToken.type !== TOKEN_TYPES.string) {
+            this.unexpected('Expected string');
+          }
 
-	if (stdio === 'ipc') {
-		return 'ipc';
-	}
+          const key = keyToken.value;
+          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+          keys.push(key);
+          this.next();
+        }
 
-	if (stdio === undefined || typeof stdio === 'string') {
-		return [stdio, stdio, stdio, 'ipc'];
-	}
+        const valToken = this.token;
 
-	if (stdio.includes('ipc')) {
-		return stdio;
-	}
+        if (valToken.type === TOKEN_TYPES.colon) {
+          // object
+          this.next();
 
-	return [...stdio, 'ipc'];
-};
+          // parse object
+          const val = this.parse(indent + 1);
 
+          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+            var _ref;
 
-/***/ }),
-/* 160 */
-/***/ (function(module, exports, __webpack_require__) {
+            if (_isArray) {
+              if (_i >= _iterator.length) break;
+              _ref = _iterator[_i++];
+            } else {
+              _i = _iterator.next();
+              if (_i.done) break;
+              _ref = _i.value;
+            }
 
-"use strict";
+            const key = _ref;
 
-const os = __webpack_require__(122);
-const onExit = __webpack_require__(161);
+            obj[key] = val;
+          }
 
-const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
+          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;
 
-// 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;
-};
+            if (_isArray2) {
+              if (_i2 >= _iterator2.length) break;
+              _ref2 = _iterator2[_i2++];
+            } else {
+              _i2 = _iterator2.next();
+              if (_i2.done) break;
+              _ref2 = _i2.value;
+            }
 
-const setKillTimeout = (kill, signal, options, killResult) => {
-	if (!shouldForceKill(signal, options, killResult)) {
-		return;
-	}
+            const key = _ref2;
 
-	const timeout = getForceKillAfterTimeout(options);
-	const t = setTimeout(() => {
-		kill('SIGKILL');
-	}, timeout);
+            obj[key] = valToken.value;
+          }
 
-	// 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();
-	}
-};
+          this.next();
+        } else {
+          this.unexpected('Invalid value type');
+        }
+      } else {
+        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
+      }
+    }
 
-const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
-	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
-};
+    return obj;
+  }
+}
 
-const isSigterm = signal => {
-	return signal === os.constants.signals.SIGTERM ||
-		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
-};
+const MERGE_CONFLICT_ANCESTOR = '|||||||';
+const MERGE_CONFLICT_END = '>>>>>>>';
+const MERGE_CONFLICT_SEP = '=======';
+const MERGE_CONFLICT_START = '<<<<<<<';
 
-const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
-	if (forceKillAfterTimeout === true) {
-		return DEFAULT_FORCE_KILL_TIMEOUT;
-	}
+/**
+ * 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 (!Number.isFinite(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
-		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
-	}
+  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);
+        }
+      }
 
-	return forceKillAfterTimeout;
-};
+      // 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);
+    }
+  }
 
-// `childProcess.cancel()`
-const spawnedCancel = (spawned, context) => {
-	const killResult = spawned.kill();
+  return [variants[0].join('\n'), variants[1].join('\n')];
+}
 
-	if (killResult) {
-		context.isCanceled = true;
-	}
-};
+/**
+ * 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);
+}
 
-const timeoutKill = (spawned, signal, reject) => {
-	spawned.kill(signal);
-	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
-};
+/**
+ * Parse the lockfile.
+ */
+function parse(str, fileLoc) {
+  const parser = new Parser(str, fileLoc);
+  parser.next();
+  return parser.parse();
+}
 
-// `timeout` option handling
-const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
-	if (timeout === 0 || timeout === undefined) {
-		return spawnedPromise;
-	}
+/**
+ * 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;
+    }
+  }
+}
 
-	if (!Number.isFinite(timeout) || timeout < 0) {
-		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
-	}
+/***/ }),
+/* 82 */,
+/* 83 */,
+/* 84 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	let timeoutId;
-	const timeoutPromise = new Promise((resolve, reject) => {
-		timeoutId = setTimeout(() => {
-			timeoutKill(spawned, killSignal, reject);
-		}, timeout);
-	});
+"use strict";
 
-	const safeSpawnedPromise = spawnedPromise.finally(() => {
-		clearTimeout(timeoutId);
-	});
 
-	return Promise.race([timeoutPromise, safeSpawnedPromise]);
-};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-// `cleanup` option handling
-const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
-	if (!cleanup || detached) {
-		return timedPromise;
-	}
+var _map;
 
-	const removeExitHandler = onExit(() => {
-		spawned.kill();
-	});
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-	return timedPromise.finally(() => {
-		removeExitHandler();
-	});
-};
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = {
-	spawnedKill,
-	spawnedCancel,
-	setupTimeout,
-	setExitHandler
-};
+const debug = __webpack_require__(212)('yarn');
 
+class BlockingQueue {
+  constructor(alias, maxConcurrency = Infinity) {
+    this.concurrencyQueue = [];
+    this.maxConcurrency = maxConcurrency;
+    this.runningCount = 0;
+    this.warnedStuck = false;
+    this.alias = alias;
+    this.first = true;
 
-/***/ }),
-/* 161 */
-/***/ (function(module, exports, __webpack_require__) {
+    this.running = (0, (_map || _load_map()).default)();
+    this.queue = (0, (_map || _load_map()).default)();
 
-// 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.
-// grab a reference to node's real process object right away
-var process = global.process
-
-const processOk = function (process) {
-  return process &&
-    typeof process === 'object' &&
-    typeof process.removeListener === 'function' &&
-    typeof process.emit === 'function' &&
-    typeof process.reallyExit === 'function' &&
-    typeof process.listeners === 'function' &&
-    typeof process.kill === 'function' &&
-    typeof process.pid === 'number' &&
-    typeof process.on === 'function'
-}
-
-// some kind of non-node environment, just no-op
-/* istanbul ignore if */
-if (!processOk(process)) {
-  module.exports = function () {
-    return function () {}
+    this.stuckTick = this.stuckTick.bind(this);
   }
-} else {
-  var assert = __webpack_require__(162)
-  var signals = __webpack_require__(163)
-  var isWin = /^win/i.test(process.platform)
 
-  var EE = __webpack_require__(164)
-  /* istanbul ignore if */
-  if (typeof EE !== 'function') {
-    EE = EE.EventEmitter
-  }
+  stillActive() {
+    if (this.stuckTimer) {
+      clearTimeout(this.stuckTimer);
+    }
 
-  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 = {}
-  }
+    this.stuckTimer = setTimeout(this.stuckTick, 5000);
 
-  // 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
+    // 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();
   }
 
-  module.exports = function (cb, opts) {
-    /* istanbul ignore if */
-    if (!processOk(global.process)) {
-      return function () {}
+  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]}`);
     }
-    assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+  }
 
-    if (loaded === false) {
-      load()
+  push(key, factory) {
+    if (this.first) {
+      this.first = false;
+    } else {
+      this.stillActive();
     }
 
-    var ev = 'exit'
-    if (opts && opts.alwaysLast) {
-      ev = 'afterexit'
-    }
+    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 });
 
-    var remove = function () {
-      emitter.removeListener(ev, cb)
-      if (emitter.listeners('exit').length === 0 &&
-          emitter.listeners('afterexit').length === 0) {
-        unload()
+      if (!this.running[key]) {
+        this.shift(key);
       }
-    }
-    emitter.on(ev, cb)
-
-    return remove
+    });
   }
 
-  var unload = function unload () {
-    if (!loaded || !processOk(global.process)) {
-      return
-    }
-    loaded = false
+  shift(key) {
+    if (this.running[key]) {
+      delete this.running[key];
+      this.runningCount--;
 
-    signals.forEach(function (sig) {
-      try {
-        process.removeListener(sig, sigListeners[sig])
-      } catch (er) {}
-    })
-    process.emit = originalProcessEmit
-    process.reallyExit = originalProcessReallyExit
-    emitter.count -= 1
-  }
-  module.exports.unload = unload
+      if (this.stuckTimer) {
+        clearTimeout(this.stuckTimer);
+        this.stuckTimer = null;
+      }
 
-  var emit = function emit (event, code, signal) {
-    /* istanbul ignore if */
-    if (emitter.emitted[event]) {
-      return
+      if (this.warnedStuck) {
+        this.warnedStuck = false;
+        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
+      }
     }
-    emitter.emitted[event] = true
-    emitter.emit(event, code, signal)
-  }
 
-  // { <signal>: <listener fn>, ... }
-  var sigListeners = {}
-  signals.forEach(function (sig) {
-    sigListeners[sig] = function listener () {
-      /* istanbul ignore if */
-      if (!processOk(global.process)) {
-        return
-      }
-      // 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 */
-        if (isWin && sig === 'SIGHUP') {
-          // "SIGHUP" throws an `ENOSYS` error on Windows,
-          // so use a supported signal instead
-          sig = 'SIGINT'
-        }
-        /* istanbul ignore next */
-        process.kill(process.pid, sig)
-      }
+    const queue = this.queue[key];
+    if (!queue) {
+      return;
     }
-  })
 
-  module.exports.signals = function () {
-    return signals
-  }
+    var _queue$shift = queue.shift();
 
-  var loaded = false
+    const resolve = _queue$shift.resolve,
+          reject = _queue$shift.reject,
+          factory = _queue$shift.factory;
 
-  var load = function load () {
-    if (loaded || !processOk(global.process)) {
-      return
+    if (!queue.length) {
+      delete this.queue[key];
     }
-    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
+    const next = () => {
+      this.shift(key);
+      this.shiftConcurrencyQueue();
+    };
 
-    signals = signals.filter(function (sig) {
-      try {
-        process.on(sig, sigListeners[sig])
-        return true
-      } catch (er) {
-        return false
-      }
-    })
+    const run = () => {
+      this.running[key] = true;
+      this.runningCount++;
 
-    process.emit = processEmit
-    process.reallyExit = processReallyExit
+      factory().then(function (val) {
+        resolve(val);
+        next();
+        return null;
+      }).catch(function (err) {
+        reject(err);
+        next();
+      });
+    };
+
+    this.maybePushConcurrencyQueue(run);
   }
-  module.exports.load = load
 
-  var originalProcessReallyExit = process.reallyExit
-  var processReallyExit = function processReallyExit (code) {
-    /* istanbul ignore if */
-    if (!processOk(global.process)) {
-      return
+  maybePushConcurrencyQueue(run) {
+    if (this.runningCount < this.maxConcurrency) {
+      run();
+    } else {
+      this.concurrencyQueue.push(run);
     }
-    process.exitCode = code || /* istanbul ignore next */ 0
-    emit('exit', process.exitCode, null)
-    /* istanbul ignore next */
-    emit('afterexit', process.exitCode, null)
-    /* istanbul ignore next */
-    originalProcessReallyExit.call(process, process.exitCode)
   }
 
-  var originalProcessEmit = process.emit
-  var processEmit = function processEmit (ev, arg) {
-    if (ev === 'exit' && processOk(global.process)) {
-      /* istanbul ignore else */
-      if (arg !== undefined) {
-        process.exitCode = arg
+  shiftConcurrencyQueue() {
+    if (this.runningCount < this.maxConcurrency) {
+      const fn = this.concurrencyQueue.shift();
+      if (fn) {
+        fn();
       }
-      var ret = originalProcessEmit.apply(this, arguments)
-      /* istanbul ignore next */
-      emit('exit', process.exitCode, null)
-      /* istanbul ignore next */
-      emit('afterexit', process.exitCode, null)
-      /* istanbul ignore next */
-      return ret
-    } else {
-      return originalProcessEmit.apply(this, arguments)
     }
   }
 }
-
+exports.default = BlockingQueue;
 
 /***/ }),
-/* 162 */
+/* 85 */
 /***/ (function(module, exports) {
 
-module.exports = require("assert");
+module.exports = function (exec) {
+  try {
+    return !!exec();
+  } catch (e) {
+    return true;
+  }
+};
+
 
 /***/ }),
-/* 163 */
-/***/ (function(module, exports) {
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */,
+/* 97 */,
+/* 98 */,
+/* 99 */,
+/* 100 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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'
-]
+// 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') {
-  module.exports.push(
-    'SIGVTALRM',
-    'SIGXCPU',
-    'SIGXFSZ',
-    'SIGUSR2',
-    'SIGTRAP',
-    'SIGSYS',
-    'SIGQUIT',
-    'SIGIOT'
-    // should detect profiler and enable/disable accordingly.
-    // see #21
-    // 'SIGPROF'
-  )
-}
+// fallback for IE11 Script Access Denied error
+var tryGet = function (it, key) {
+  try {
+    return it[key];
+  } catch (e) { /* empty */ }
+};
 
-if (process.platform === 'linux') {
-  module.exports.push(
-    'SIGIO',
-    'SIGPOLL',
-    'SIGPWR',
-    'SIGSTKFLT',
-    'SIGUNUSED'
-  )
-}
+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;
+};
 
 
 /***/ }),
-/* 164 */
+/* 101 */
 /***/ (function(module, exports) {
 
-module.exports = require("events");
+// IE 8- don't enum bug keys
+module.exports = (
+  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+).split(',');
+
 
 /***/ }),
-/* 165 */
+/* 102 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var document = __webpack_require__(11).document;
+module.exports = document && document.documentElement;
 
-const isStream = __webpack_require__(166);
-const getStream = __webpack_require__(167);
-const mergeStream = __webpack_require__(174);
 
-// `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;
-	}
+/***/ }),
+/* 103 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (isStream(input)) {
-		input.pipe(spawned.stdin);
-	} else {
-		spawned.stdin.end(input);
-	}
-};
+"use strict";
 
-// `all` interleaves `stdout` and `stderr`
-const makeAllStream = (spawned, {all}) => {
-	if (!all || (!spawned.stdout && !spawned.stderr)) {
-		return;
-	}
+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';
 
-	const mixed = mergeStream();
+var returnThis = function () { return this; };
 
-	if (spawned.stdout) {
-		mixed.add(spawned.stdout);
-	}
+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);
+    }
+  }
+  // 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;
+};
 
-	if (spawned.stderr) {
-		mixed.add(spawned.stderr);
-	}
 
-	return mixed;
+/***/ }),
+/* 104 */
+/***/ (function(module, exports) {
+
+module.exports = function (exec) {
+  try {
+    return { e: false, v: exec() };
+  } catch (e) {
+    return { e: true, v: e };
+  }
 };
 
-// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
-const getBufferedData = async (stream, streamPromise) => {
-	if (!stream) {
-		return;
-	}
 
-	stream.destroy();
+/***/ }),
+/* 105 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	try {
-		return await streamPromise;
-	} catch (error) {
-		return error.bufferedData;
-	}
+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;
 };
 
-const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
-	if (!stream || !buffer) {
-		return;
-	}
 
-	if (encoding) {
-		return getStream(stream, {encoding, maxBuffer});
-	}
+/***/ }),
+/* 106 */
+/***/ (function(module, exports) {
 
-	return getStream.buffer(stream, {maxBuffer});
+module.exports = function (bitmap, value) {
+  return {
+    enumerable: !(bitmap & 1),
+    configurable: !(bitmap & 2),
+    writable: !(bitmap & 4),
+    value: value
+  };
 };
 
-// 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});
 
-	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)
-		]);
-	}
-};
-
-const validateInputSync = ({input}) => {
-	if (isStream(input)) {
-		throw new TypeError('The `input` option cannot be a stream in sync mode');
-	}
-};
+/***/ }),
+/* 107 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = {
-	handleInput,
-	makeAllStream,
-	getSpawnedResult,
-	validateInputSync
-};
+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)'
+});
 
 
 /***/ }),
-/* 166 */
+/* 108 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+// 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);
+};
 
 
-const isStream = stream =>
-	stream !== null &&
-	typeof stream === 'object' &&
-	typeof stream.pipe === 'function';
+/***/ }),
+/* 109 */
+/***/ (function(module, exports, __webpack_require__) {
 
-isStream.writable = stream =>
-	isStream(stream) &&
-	stream.writable !== false &&
-	typeof stream._write === 'function' &&
-	typeof stream._writableState === 'object';
+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
+};
 
-isStream.readable = stream =>
-	isStream(stream) &&
-	stream.readable !== false &&
-	typeof stream._read === 'function' &&
-	typeof stream._readableState === 'object';
 
-isStream.duplex = stream =>
-	isStream.writable(stream) &&
-	isStream.readable(stream);
+/***/ }),
+/* 110 */
+/***/ (function(module, exports, __webpack_require__) {
 
-isStream.transform = stream =>
-	isStream.duplex(stream) &&
-	typeof stream._transform === 'function' &&
-	typeof stream._transformState === 'object';
+// 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
+};
 
-module.exports = isStream;
+
+/***/ }),
+/* 111 */
+/***/ (function(module, exports) {
+
+var id = 0;
+var px = Math.random();
+module.exports = function (key) {
+  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
+};
 
 
 /***/ }),
-/* 167 */
+/* 112 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const pump = __webpack_require__(168);
-const bufferStream = __webpack_require__(172);
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-class MaxBufferError extends Error {
-	constructor() {
-		super('maxBuffer exceeded');
-		this.name = 'MaxBufferError';
-	}
-}
+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);
 
-async function getStream(inputStream, options) {
-	if (!inputStream) {
-		return Promise.reject(new Error('Expected a stream'));
-	}
+/**
+ * Active `debug` instances.
+ */
+exports.instances = [];
 
-	options = {
-		maxBuffer: Infinity,
-		...options
-	};
+/**
+ * The currently active debug mode names, and names to skip.
+ */
 
-	const {maxBuffer} = options;
+exports.names = [];
+exports.skips = [];
 
-	let stream;
-	await new Promise((resolve, reject) => {
-		const rejectPromise = error => {
-			if (error) { // A null check
-				error.bufferedData = stream.getBufferedValue();
-			}
+/**
+ * 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".
+ */
 
-			reject(error);
-		};
+exports.formatters = {};
 
-		stream = pump(inputStream, bufferStream(options), error => {
-			if (error) {
-				rejectPromise(error);
-				return;
-			}
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
 
-			resolve();
-		});
+function selectColor(namespace) {
+  var hash = 0, i;
 
-		stream.on('data', () => {
-			if (stream.getBufferedLength() > maxBuffer) {
-				rejectPromise(new MaxBufferError());
-			}
-		});
-	});
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
 
-	return stream.getBufferedValue();
+  return exports.colors[Math.abs(hash) % exports.colors.length];
 }
 
-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;
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
 
+function createDebug(namespace) {
 
-/***/ }),
-/* 168 */
-/***/ (function(module, exports, __webpack_require__) {
+  var prevTime;
 
-var once = __webpack_require__(169)
-var eos = __webpack_require__(171)
-var fs = __webpack_require__(132) // we only need fs to get the ReadStream and WriteStream prototypes
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
 
-var noop = function () {}
-var ancient = /^v?\.0/.test(process.version)
+    var self = debug;
 
-var isFn = function (fn) {
-  return typeof fn === 'function'
-}
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
 
-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)
-}
+    // 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];
+    }
 
-var isRequest = function (stream) {
-  return stream.setHeader && isFn(stream.abort)
-}
+    args[0] = exports.coerce(args[0]);
 
-var destroyer = function (stream, reading, writing, callback) {
-  callback = once(callback)
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
+    }
 
-  var closed = false
-  stream.on('close', function () {
-    closed = true
-  })
+    // 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);
 
-  eos(stream, {readable: reading, writable: writing}, function (err) {
-    if (err) return callback(err)
-    closed = true
-    callback()
-  })
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
 
-  var destroyed = false
-  return function (err) {
-    if (closed) return
-    if (destroyed) return
-    destroyed = true
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
 
-    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
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
 
-    if (isFn(stream.destroy)) return stream.destroy()
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+  debug.destroy = destroy;
 
-    callback(err || new Error('stream was destroyed'))
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
   }
-}
 
-var call = function (fn) {
-  fn()
-}
+  exports.instances.push(debug);
 
-var pipe = function (from, to) {
-  return from.pipe(to)
+  return debug;
 }
 
-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)
+function destroy () {
+  var index = exports.instances.indexOf(this);
+  if (index !== -1) {
+    exports.instances.splice(index, 1);
+    return true;
+  } else {
+    return false;
+  }
 }
 
-module.exports = pump
-
-
-/***/ }),
-/* 169 */
-/***/ (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
+ */
 
-var wrappy = __webpack_require__(170)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
+function enable(namespaces) {
+  exports.save(namespaces);
 
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
+  exports.names = [];
+  exports.skips = [];
 
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
+  var i;
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
 
-function once (fn) {
-  var f = function () {
-    if (f.called) return f.value
-    f.called = true
-    return f.value = fn.apply(this, arguments)
+  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 + '$'));
+    }
   }
-  f.called = false
-  return f
-}
 
-function onceStrict (fn) {
-  var f = function () {
-    if (f.called)
-      throw new Error(f.onceError)
-    f.called = true
-    return f.value = fn.apply(this, arguments)
+  for (i = 0; i < exports.instances.length; i++) {
+    var instance = exports.instances[i];
+    instance.enabled = exports.enabled(instance.namespace);
   }
-  var name = fn.name || 'Function wrapped with `once`'
-  f.onceError = name + " shouldn't be called more than once"
-  f.called = false
-  return f
 }
 
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
 
-/***/ }),
-/* 170 */
-/***/ (function(module, exports) {
-
-// 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')
-
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
+function disable() {
+  exports.enable('');
+}
 
-  return wrapper
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
 
-  function wrapper() {
-    var args = new Array(arguments.length)
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i]
+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;
     }
-    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]
-      })
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
     }
-    return ret
   }
+  return false;
 }
 
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
 
-/***/ }),
-/* 171 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var once = __webpack_require__(169);
-
-var noop = function() {};
-
-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
-};
-
-var eos = function(stream, opts, callback) {
-	if (typeof opts === 'function') return eos(stream, null, opts);
-	if (!opts) opts = {};
-
-	callback = once(callback || noop);
-
-	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);
-	var cancelled = false;
-
-	var onlegacyfinish = function() {
-		if (!stream.writable) onfinish();
-	};
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
 
-	var onfinish = function() {
-		writable = false;
-		if (!readable) callback.call(stream);
-	};
 
-	var onend = function() {
-		readable = false;
-		if (!writable) callback.call(stream);
-	};
+/***/ }),
+/* 113 */,
+/* 114 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	var onexit = function(exitCode) {
-		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
-	};
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
 
-	var onerror = function(err) {
-		callback.call(stream, err);
-	};
+var fs = __webpack_require__(3)
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
 
-	var onclose = function() {
-		process.nextTick(onclosenexttick);
-	};
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__(217)
 
-	var onclosenexttick = function() {
-		if (cancelled) return;
-		if (readable && !(rs && (rs.ended && !rs.destroyed))) return callback.call(stream, new Error('premature close'));
-		if (writable && !(ws && (ws.ended && !ws.destroyed))) return callback.call(stream, new Error('premature close'));
-	};
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
 
-	var onrequest = function() {
-		stream.req.on('finish', onfinish);
-	};
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
 
-	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);
-	}
+  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 (isChildProcess(stream)) stream.on('exit', onexit);
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
 
-	stream.on('end', onend);
-	stream.on('finish', onfinish);
-	if (opts.error !== false) stream.on('error', onerror);
-	stream.on('close', onclose);
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
+  }
+}
 
-	return function() {
-		cancelled = true;
-		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);
-	};
-};
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
 
-module.exports = eos;
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
 
 
 /***/ }),
-/* 172 */
+/* 115 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const {PassThrough: PassThroughStream} = __webpack_require__(173);
-
-module.exports = options => {
-	options = {...options};
-
-	const {array} = options;
-	let {encoding} = options;
-	const isBuffer = encoding === 'buffer';
-	let objectMode = false;
-
-	if (array) {
-		objectMode = !(encoding || isBuffer);
-	} else {
-		encoding = encoding || 'utf8';
-	}
+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 (isBuffer) {
-		encoding = null;
-	}
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
+}
 
-	const stream = new PassThroughStream({objectMode});
+var path = __webpack_require__(0)
+var minimatch = __webpack_require__(60)
+var isAbsolute = __webpack_require__(76)
+var Minimatch = minimatch.Minimatch
 
-	if (encoding) {
-		stream.setEncoding(encoding);
-	}
+function alphasorti (a, b) {
+  return a.toLowerCase().localeCompare(b.toLowerCase())
+}
 
-	let length = 0;
-	const chunks = [];
+function alphasort (a, b) {
+  return a.localeCompare(b)
+}
 
-	stream.on('data', chunk => {
-		chunks.push(chunk);
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
 
-		if (objectMode) {
-			length = chunks.length;
-		} else {
-			length += chunk.length;
-		}
-	});
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
 
-	stream.getBufferedValue = () => {
-		if (array) {
-			return chunks;
-		}
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
+  }
+}
 
-		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
-	};
+// 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 })
+  }
 
-	stream.getBufferedLength = () => length;
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
 
-	return stream;
-};
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
 
+  // 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
+  }
 
-/***/ }),
-/* 173 */
-/***/ (function(module, exports) {
+  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
 
-module.exports = require("stream");
+  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)
 
-/***/ }),
-/* 174 */
-/***/ (function(module, exports, __webpack_require__) {
+  setupIgnores(self, options)
 
-"use strict";
+  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
+  }
 
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
 
-const { PassThrough } = __webpack_require__(173);
+  // 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 = function (/*streams...*/) {
-  var sources = []
-  var output  = new PassThrough({objectMode: true})
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
 
-  output.setMaxListeners(0)
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
 
-  output.add = add
-  output.isEmpty = isEmpty
+function finish (self) {
+  var nou = self.nounique
+  var all = nou ? [] : Object.create(null)
 
-  output.on('unpipe', remove)
+  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
+        })
+    }
+  }
 
-  Array.prototype.slice.call(arguments).forEach(add)
+  if (!nou)
+    all = Object.keys(all)
 
-  return output
+  if (!self.nosort)
+    all = all.sort(self.nocase ? alphasorti : alphasort)
 
-  function add (source) {
-    if (Array.isArray(source)) {
-      source.forEach(add)
-      return 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
+      })
     }
-
-    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
   }
 
-  function isEmpty () {
-    return sources.length == 0;
-  }
+  if (self.ignore.length)
+    all = all.filter(function(m) {
+      return !isIgnored(self, m)
+    })
 
-  function remove (source) {
-    sources = sources.filter(function (it) { return it !== source })
-    if (!sources.length && output.readable) { output.end() }
-  }
+  self.found = all
 }
 
+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) === '/'
 
-/***/ }),
-/* 175 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
 
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
 
-const nativePromisePrototype = (async () => {})().constructor.prototype;
-const descriptors = ['then', 'catch', 'finally'].map(property => [
-	property,
-	Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)
-]);
+  return m
+}
 
-// 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);
+// 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)
+  }
 
-		Reflect.defineProperty(spawned, property, {...descriptor, value});
-	}
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
 
-	return spawned;
-};
+  return abs
+}
 
-// 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);
-		});
+// 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
 
-		if (spawned.stdin) {
-			spawned.stdin.on('error', error => {
-				reject(error);
-			});
-		}
-	});
-};
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
-module.exports = {
-	mergePromise,
-	getSpawnedPromise
-};
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
 
 /***/ }),
-/* 176 */
+/* 116 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const SPACES_REGEXP = / +/g;
-
-const joinCommand = (file, args = []) => {
-	if (!Array.isArray(args)) {
-		return file;
-	}
-
-	return [file, ...args].join(' ');
-};
-
-// 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];
-
-	if (previousToken.endsWith('\\')) {
-		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
-	}
-
-	return [...tokens, token];
-};
+var path = __webpack_require__(0);
+var fs = __webpack_require__(3);
+var _0777 = parseInt('0777', 8);
 
-// Handle `execa.command()`
-const parseCommand = command => {
-	return command
-		.trim()
-		.split(SPACES_REGEXP)
-		.reduce(handleEscaping, []);
-};
+module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
 
-module.exports = {
-	joinCommand,
-	parseCommand
-};
+function mkdirP (p, opts, f, made) {
+    if (typeof opts === 'function') {
+        f = opts;
+        opts = {};
+    }
+    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;
+        }
+    });
+}
 
-/***/ }),
-/* 177 */
-/***/ (function(module, exports, __webpack_require__) {
+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;
+
+    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;
+};
 
-module.exports = __webpack_require__(178);
 
 /***/ }),
-/* 178 */
+/* 117 */,
+/* 118 */,
+/* 119 */,
+/* 120 */,
+/* 121 */,
+/* 122 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+module.exports = x => {
+	if (typeof x !== 'string') {
+		throw new TypeError('Expected a string, got ' + typeof x);
+	}
 
-var utils = __webpack_require__(179);
-var bind = __webpack_require__(180);
-var Axios = __webpack_require__(181);
-var mergeConfig = __webpack_require__(213);
-var defaults = __webpack_require__(187);
+	// 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);
+	}
 
-/**
- * Create an instance of Axios
- *
- * @param {Object} defaultConfig The default config for the instance
- * @return {Axios} A new instance of Axios
- */
-function createInstance(defaultConfig) {
-  var context = new Axios(defaultConfig);
-  var instance = bind(Axios.prototype.request, context);
+	return x;
+};
 
-  // Copy axios.prototype to instance
-  utils.extend(instance, Axios.prototype, context);
 
-  // Copy context to instance
-  utils.extend(instance, context);
+/***/ }),
+/* 123 */
+/***/ (function(module, exports) {
 
-  return instance;
+// 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')
+
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
+
+  return wrapper
+
+  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
+  }
 }
 
-// Create the default instance to be exported
-var axios = createInstance(defaults);
 
-// Expose Axios class to allow class inheritance
-axios.Axios = Axios;
+/***/ }),
+/* 124 */,
+/* 125 */,
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// Factory for creating new instances
-axios.create = function create(instanceConfig) {
-  return createInstance(mergeConfig(axios.defaults, instanceConfig));
+// 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);
 };
 
-// Expose Cancel & CancelToken
-axios.Cancel = __webpack_require__(214);
-axios.CancelToken = __webpack_require__(215);
-axios.isCancel = __webpack_require__(186);
 
-// Expose all/spread
-axios.all = function all(promises) {
-  return Promise.all(promises);
+/***/ }),
+/* 132 */
+/***/ (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);
+
+module.exports = Object.keys || function keys(O) {
+  return $keys(O, enumBugKeys);
 };
-axios.spread = __webpack_require__(216);
 
-// Expose isAxiosError
-axios.isAxiosError = __webpack_require__(217);
 
-module.exports = axios;
+/***/ }),
+/* 133 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// Allow use of default import syntax in TypeScript
-module.exports.default = axios;
+// 7.1.13 ToObject(argument)
+var defined = __webpack_require__(67);
+module.exports = function (it) {
+  return Object(defined(it));
+};
 
 
 /***/ }),
-/* 179 */
+/* 134 */,
+/* 135 */,
+/* 136 */,
+/* 137 */,
+/* 138 */,
+/* 139 */,
+/* 140 */,
+/* 141 */,
+/* 142 */,
+/* 143 */,
+/* 144 */,
+/* 145 */
+/***/ (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"}}}
+
+/***/ }),
+/* 146 */,
+/* 147 */,
+/* 148 */,
+/* 149 */,
+/* 150 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var bind = __webpack_require__(180);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = stringify;
 
-/*global toString:true*/
+var _misc;
 
-// utils is a library of generic helper functions non-specific to axios
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-var toString = Object.prototype.toString;
+var _constants;
 
-/**
- * Determine if a value is an Array
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is an Array, otherwise false
- */
-function isArray(val) {
-  return toString.call(val) === '[object Array]';
+function _load_constants() {
+  return _constants = __webpack_require__(6);
 }
 
-/**
- * Determine if a value is undefined
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if the value is undefined, otherwise false
- */
-function isUndefined(val) {
-  return typeof val === 'undefined';
-}
+var _package;
 
-/**
- * Determine if a value is a Buffer
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Buffer, otherwise false
- */
-function isBuffer(val) {
-  return val !== null && !isUndefined(val) && val.constructor !== null && !isUndefined(val.constructor)
-    && typeof val.constructor.isBuffer === 'function' && val.constructor.isBuffer(val);
+function _load_package() {
+  return _package = __webpack_require__(145);
 }
 
-/**
- * Determine if a value is an ArrayBuffer
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is an ArrayBuffer, otherwise false
- */
-function isArrayBuffer(val) {
-  return toString.call(val) === '[object ArrayBuffer]';
-}
+const NODE_VERSION = process.version;
 
-/**
- * Determine if a value is a FormData
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is an FormData, otherwise false
- */
-function isFormData(val) {
-  return (typeof FormData !== 'undefined') && (val instanceof FormData);
+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);
 }
 
-/**
- * Determine if a value is a view on an ArrayBuffer
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a view on an ArrayBuffer, otherwise false
- */
-function isArrayBufferView(val) {
-  var result;
-  if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {
-    result = ArrayBuffer.isView(val);
+function maybeWrap(str) {
+  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
+    return JSON.stringify(str);
   } else {
-    result = (val) && (val.buffer) && (val.buffer instanceof ArrayBuffer);
+    return str;
   }
-  return result;
-}
-
-/**
- * Determine if a value is a String
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a String, otherwise false
- */
-function isString(val) {
-  return typeof val === 'string';
 }
 
-/**
- * Determine if a value is a Number
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Number, otherwise false
- */
-function isNumber(val) {
-  return typeof val === 'number';
-}
+const priorities = {
+  name: 1,
+  version: 2,
+  uid: 3,
+  resolved: 4,
+  integrity: 5,
+  registry: 6,
+  dependencies: 7
+};
 
-/**
- * Determine if a value is an Object
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is an Object, otherwise false
- */
-function isObject(val) {
-  return val !== null && typeof val === 'object';
+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);
+  }
 }
 
-/**
- * Determine if a value is a plain Object
- *
- * @param {Object} val The value to test
- * @return {boolean} True if value is a plain Object, otherwise false
- */
-function isPlainObject(val) {
-  if (toString.call(val) !== '[object Object]') {
-    return false;
+function _stringify(obj, options) {
+  if (typeof obj !== 'object') {
+    throw new TypeError();
   }
 
-  var prototype = Object.getPrototypeOf(val);
-  return prototype === null || prototype === Object.prototype;
-}
+  const indent = options.indent;
+  const lines = [];
 
-/**
- * Determine if a value is a Date
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Date, otherwise false
- */
-function isDate(val) {
-  return toString.call(val) === '[object Date]';
-}
+  // 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);
 
-/**
- * Determine if a value is a File
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a File, otherwise false
- */
-function isFile(val) {
-  return toString.call(val) === '[object File]';
-}
+  let addedKeys = [];
 
-/**
- * Determine if a value is a Blob
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Blob, otherwise false
- */
-function isBlob(val) {
-  return toString.call(val) === '[object Blob]';
-}
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const val = obj[key];
+    if (val == null || addedKeys.indexOf(key) >= 0) {
+      continue;
+    }
 
-/**
- * Determine if a value is a Function
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Function, otherwise false
- */
-function isFunction(val) {
-  return toString.call(val) === '[object Function]';
-}
+    const valKeys = [key];
 
-/**
- * Determine if a value is a Stream
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a Stream, otherwise false
- */
-function isStream(val) {
-  return isObject(val) && isFunction(val.pipe);
-}
+    // 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);
+        }
+      }
+    }
 
-/**
- * Determine if a value is a URLSearchParams object
- *
- * @param {Object} val The value to test
- * @returns {boolean} True if value is a URLSearchParams object, otherwise false
- */
-function isURLSearchParams(val) {
-  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
-}
+    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
 
-/**
- * Trim excess whitespace off the beginning and end of a string
- *
- * @param {String} str The String to trim
- * @returns {String} The String freed of excess whitespace
- */
-function trim(str) {
-  return str.replace(/^\s*/, '').replace(/\s*$/, '');
-}
+    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();
+    }
 
-/**
- * Determine if we're running in a standard browser environment
- *
- * This allows axios to run in a web worker, and react-native.
- * Both environments support XMLHttpRequest, but not fully standard globals.
- *
- * web workers:
- *  typeof window -> undefined
- *  typeof document -> undefined
- *
- * react-native:
- *  navigator.product -> 'ReactNative'
- * nativescript
- *  navigator.product -> 'NativeScript' or 'NS'
- */
-function isStandardBrowserEnv() {
-  if (typeof navigator !== 'undefined' && (navigator.product === 'ReactNative' ||
-                                           navigator.product === 'NativeScript' ||
-                                           navigator.product === 'NS')) {
-    return false;
+    addedKeys = addedKeys.concat(valKeys);
   }
-  return (
-    typeof window !== 'undefined' &&
-    typeof document !== 'undefined'
-  );
+
+  return indent + lines.join(`\n${indent}`);
 }
 
-/**
- * Iterate over an Array or an Object invoking a function for each item.
- *
- * If `obj` is an Array callback will be called passing
- * the value, index, and complete array for each item.
- *
- * If 'obj' is an Object callback will be called passing
- * the value, key, and complete object for each property.
- *
- * @param {Object|Array} obj The object to iterate
- * @param {Function} fn The callback to invoke for each item
- */
-function forEach(obj, fn) {
-  // Don't bother if no value provided
-  if (obj === null || typeof obj === 'undefined') {
-    return;
+function stringify(obj, noHeader, enableVersions) {
+  const val = _stringify(obj, {
+    indent: '',
+    topLevel: true
+  });
+  if (noHeader) {
+    return val;
   }
 
-  // Force an array if not already something iterable
-  if (typeof obj !== 'object') {
-    /*eslint no-param-reassign:0*/
-    obj = [obj];
+  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);
 
-  if (isArray(obj)) {
-    // Iterate over array values
-    for (var i = 0, l = obj.length; i < l; i++) {
-      fn.call(null, obj[i], i, obj);
-    }
-  } else {
-    // Iterate over object keys
-    for (var key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key)) {
-        fn.call(null, obj[key], key, obj);
-      }
-    }
-  }
+  return lines.join('\n');
 }
 
-/**
- * Accepts varargs expecting each argument to be an object, then
- * immutably merges the properties of each object and returns result.
- *
- * When multiple objects contain the same key the later object in
- * the arguments list will take precedence.
- *
- * Example:
- *
- * ```js
- * var result = merge({foo: 123}, {foo: 456});
- * console.log(result.foo); // outputs 456
- * ```
- *
- * @param {Object} obj1 Object to merge
- * @returns {Object} Result of all merge properties
- */
-function merge(/* obj1, obj2, obj3, ... */) {
-  var result = {};
-  function assignValue(val, key) {
-    if (isPlainObject(result[key]) && isPlainObject(val)) {
-      result[key] = merge(result[key], val);
-    } else if (isPlainObject(val)) {
-      result[key] = merge({}, val);
-    } else if (isArray(val)) {
-      result[key] = val.slice();
-    } else {
-      result[key] = val;
-    }
-  }
+/***/ }),
+/* 151 */,
+/* 152 */,
+/* 153 */,
+/* 154 */,
+/* 155 */,
+/* 156 */,
+/* 157 */,
+/* 158 */,
+/* 159 */,
+/* 160 */,
+/* 161 */,
+/* 162 */,
+/* 163 */,
+/* 164 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  for (var i = 0, l = arguments.length; i < l; i++) {
-    forEach(arguments[i], assignValue);
-  }
-  return result;
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
 }
 
-/**
- * Extends object a by mutably adding to it the properties of object b.
- *
- * @param {Object} a The object to be extended
- * @param {Object} b The object to copy properties from
- * @param {Object} thisArg The object to bind function to
- * @return {Object} The resulting value of object a
- */
-function extend(a, b, thisArg) {
-  forEach(b, function assignValue(val, key) {
-    if (thisArg && typeof val === 'function') {
-      a[key] = bind(val, thisArg);
-    } else {
-      a[key] = val;
+// 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);
+    }
+
+    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 a;
-}
 
-/**
- * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
- *
- * @param {string} content with BOM
- * @return {string} content value without BOM
- */
-function stripBOM(content) {
-  if (content.charCodeAt(0) === 0xFEFF) {
-    content = content.slice(1);
-  }
-  return content;
-}
+  return function fixTimes(_x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
 
-module.exports = {
-  isArray: isArray,
-  isArrayBuffer: isArrayBuffer,
-  isBuffer: isBuffer,
-  isFormData: isFormData,
-  isArrayBufferView: isArrayBufferView,
-  isString: isString,
-  isNumber: isNumber,
-  isObject: isObject,
-  isPlainObject: isPlainObject,
-  isUndefined: isUndefined,
-  isDate: isDate,
-  isFile: isFile,
-  isBlob: isBlob,
-  isFunction: isFunction,
-  isStream: isStream,
-  isURLSearchParams: isURLSearchParams,
-  isStandardBrowserEnv: isStandardBrowserEnv,
-  forEach: forEach,
-  merge: merge,
-  extend: extend,
-  trim: trim,
-  stripBOM: stripBOM
-};
+// Compare file timestamps.
+// Some versions of Node on windows zero the milliseconds when utime is used.
 
 
-/***/ }),
-/* 180 */
-/***/ (function(module, exports, __webpack_require__) {
+var _fs;
 
-"use strict";
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
+}
 
+var _promise;
 
-module.exports = function bind(fn, thisArg) {
-  return function wrap() {
-    var args = new Array(arguments.length);
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i];
-    }
-    return fn.apply(thisArg, args);
-  };
-};
+function _load_promise() {
+  return _promise = __webpack_require__(40);
+}
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/***/ }),
-/* 181 */
-/***/ (function(module, exports, __webpack_require__) {
+// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
 
-"use strict";
+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);
 
-var utils = __webpack_require__(179);
-var buildURL = __webpack_require__(182);
-var InterceptorManager = __webpack_require__(183);
-var dispatchRequest = __webpack_require__(184);
-var mergeConfig = __webpack_require__(213);
+const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
 
 /**
- * Create a new instance of Axios
- *
- * @param {Object} instanceConfig The default config for the instance
+ * 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).
  */
-function Axios(instanceConfig) {
-  this.defaults = instanceConfig;
-  this.interceptors = {
-    request: new InterceptorManager(),
-    response: new InterceptorManager()
+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();
+      }
+    }
+  });
+
+  return function copyFile(_x, _x2) {
+    return _ref.apply(this, arguments);
   };
-}
+})();
 
-/**
- * Dispatch a request
- *
- * @param {Object} config The config specific for this request (merged with this.defaults)
- */
-Axios.prototype.request = function request(config) {
-  /*eslint no-param-reassign:0*/
-  // Allow for axios('example/url'[, config]) a la fetch API
-  if (typeof config === 'string') {
-    config = arguments[1] || {};
-    config.url = arguments[0];
+// 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 {
-    config = config || {};
+    return copyWithBuffer(src, dest, flags, data);
   }
+};
 
-  config = mergeConfig(this.defaults, config);
+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);
+    }
+  });
 
-  // Set config.method
-  if (config.method) {
-    config.method = config.method.toLowerCase();
-  } else if (this.defaults.method) {
-    config.method = this.defaults.method.toLowerCase();
-  } else {
-    config.method = 'get';
-  }
+  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();
 
-  // Hook up interceptors middleware
-  var chain = [dispatchRequest, undefined];
-  var promise = Promise.resolve(config);
+  if (process.platform !== 'win32') {
+    return aTime === bTime;
+  }
 
-  this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
-    chain.unshift(interceptor.fulfilled, interceptor.rejected);
-  });
+  // 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;
+  }
 
-  this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
-    chain.push(interceptor.fulfilled, interceptor.rejected);
-  });
+  const aTimeSec = Math.floor(aTime / 1000);
+  const bTimeSec = Math.floor(bTime / 1000);
 
-  while (chain.length) {
-    promise = promise.then(chain.shift(), chain.shift());
+  // 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 promise;
+  return aTime === bTime;
 };
 
-Axios.prototype.getUri = function getUri(config) {
-  config = mergeConfig(this.defaults, config);
-  return buildURL(config.url, config.params, config.paramsSerializer).replace(/^\?/, '');
-};
+/***/ }),
+/* 165 */,
+/* 166 */,
+/* 167 */,
+/* 168 */,
+/* 169 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// Provide aliases for supported request methods
-utils.forEach(['delete', 'get', 'head', 'options'], function forEachMethodNoData(method) {
-  /*eslint func-names:0*/
-  Axios.prototype[method] = function(url, config) {
-    return this.request(mergeConfig(config || {}, {
-      method: method,
-      url: url,
-      data: (config || {}).data
-    }));
-  };
-});
+"use strict";
 
-utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
-  /*eslint func-names:0*/
-  Axios.prototype[method] = function(url, data, config) {
-    return this.request(mergeConfig(config || {}, {
-      method: method,
-      url: url,
-      data: data
-    }));
-  };
+
+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;
+}
 
-module.exports = Axios;
+exports.default = isRootUser(getUid()) && !isFakeRoot();
+function isFakeRoot() {
+  return Boolean(process.env.FAKEROOTKEY);
+}
 
+function isRootUser(uid) {
+  return uid === 0;
+}
 
 /***/ }),
-/* 182 */
+/* 170 */,
+/* 171 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(179);
-
-function encode(val) {
-  return encodeURIComponent(val).
-    replace(/%3A/gi, ':').
-    replace(/%24/g, '$').
-    replace(/%2C/gi, ',').
-    replace(/%20/g, '+').
-    replace(/%5B/gi, '[').
-    replace(/%5D/gi, ']');
-}
+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;
 
-/**
- * Build a URL by appending params to the end
- *
- * @param {string} url The base of the url (e.g., http://www.google.com)
- * @param {object} [params] The params to be appended
- * @returns {string} The formatted url
- */
-module.exports = function buildURL(url, params, paramsSerializer) {
-  /*eslint no-param-reassign:0*/
-  if (!params) {
-    return url;
-  }
+const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
+const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
 
-  var serializedParams;
-  if (paramsSerializer) {
-    serializedParams = paramsSerializer(params);
-  } else if (utils.isURLSearchParams(params)) {
-    serializedParams = params.toString();
+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 {
-    var parts = [];
-
-    utils.forEach(params, function serialize(val, key) {
-      if (val === null || typeof val === 'undefined') {
-        return;
-      }
-
-      if (utils.isArray(val)) {
-        key = key + '[]';
-      } else {
-        val = [val];
-      }
-
-      utils.forEach(val, function parseValue(v) {
-        if (utils.isDate(v)) {
-          v = v.toISOString();
-        } else if (utils.isObject(v)) {
-          v = JSON.stringify(v);
-        }
-        parts.push(encode(key) + '=' + encode(v));
-      });
-    });
+    // This could arguably be ~/Library/Application Support/Yarn on Macs,
+    // but that feels unintuitive for a cli tool
 
-    serializedParams = parts.join('&');
+    // 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;
   }
+}
 
-  if (serializedParams) {
-    var hashmarkIndex = url.indexOf('#');
-    if (hashmarkIndex !== -1) {
-      url = url.slice(0, hashmarkIndex);
-    }
+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;
+  }
+}
 
-    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
+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;
   }
+}
 
-  return url;
-};
+function getLocalAppDataDir() {
+  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
+}
+
+/***/ }),
+/* 172 */,
+/* 173 */
+/***/ (function(module, exports, __webpack_require__) {
 
+module.exports = { "default": __webpack_require__(179), __esModule: true };
 
 /***/ }),
-/* 183 */
+/* 174 */
 /***/ (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 utils = __webpack_require__(179);
+  var r = range(a, b, str);
 
-function InterceptorManager() {
-  this.handlers = [];
+  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)
+  };
 }
 
-/**
- * Add a new interceptor to the stack
- *
- * @param {Function} fulfilled The function to handle `then` for a `Promise`
- * @param {Function} rejected The function to handle `reject` for a `Promise`
- *
- * @return {Number} An ID used to remove interceptor later
- */
-InterceptorManager.prototype.use = function use(fulfilled, rejected) {
-  this.handlers.push({
-    fulfilled: fulfilled,
-    rejected: rejected
-  });
-  return this.handlers.length - 1;
-};
-
-/**
- * Remove an interceptor from the stack
- *
- * @param {Number} id The ID that was returned by `use`
- */
-InterceptorManager.prototype.eject = function eject(id) {
-  if (this.handlers[id]) {
-    this.handlers[id] = null;
-  }
-};
-
-/**
- * Iterate over all the registered interceptors
- *
- * This method is particularly useful for skipping over any
- * interceptors that may have become `null` calling `eject`.
- *
- * @param {Function} fn The function to call for each interceptor
- */
-InterceptorManager.prototype.forEach = function forEach(fn) {
-  utils.forEach(this.handlers, function forEachHandler(h) {
-    if (h !== null) {
-      fn(h);
-    }
-  });
-};
-
-module.exports = InterceptorManager;
-
-
-/***/ }),
-/* 184 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = __webpack_require__(179);
-var transformData = __webpack_require__(185);
-var isCancel = __webpack_require__(186);
-var defaults = __webpack_require__(187);
-
-/**
- * Throws a `Cancel` if cancellation has been requested.
- */
-function throwIfCancellationRequested(config) {
-  if (config.cancelToken) {
-    config.cancelToken.throwIfRequested();
-  }
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
 }
 
-/**
- * Dispatch a request to the server using the configured adapter.
- *
- * @param {object} config The config that is to be used for the request
- * @returns {Promise} The Promise to be fulfilled
- */
-module.exports = function dispatchRequest(config) {
-  throwIfCancellationRequested(config);
+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;
 
-  // Ensure headers exist
-  config.headers = config.headers || {};
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
 
-  // Transform request data
-  config.data = transformData(
-    config.data,
-    config.headers,
-    config.transformRequest
-  );
+    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;
+        }
 
-  // Flatten headers
-  config.headers = utils.merge(
-    config.headers.common || {},
-    config.headers[config.method] || {},
-    config.headers
-  );
+        bi = str.indexOf(b, i + 1);
+      }
 
-  utils.forEach(
-    ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'],
-    function cleanHeaderConfig(method) {
-      delete config.headers[method];
+      i = ai < bi && ai >= 0 ? ai : bi;
     }
-  );
-
-  var adapter = config.adapter || defaults.adapter;
-
-  return adapter(config).then(function onAdapterResolution(response) {
-    throwIfCancellationRequested(config);
-
-    // Transform response data
-    response.data = transformData(
-      response.data,
-      response.headers,
-      config.transformResponse
-    );
 
-    return response;
-  }, function onAdapterRejection(reason) {
-    if (!isCancel(reason)) {
-      throwIfCancellationRequested(config);
-
-      // Transform response data
-      if (reason && reason.response) {
-        reason.response.data = transformData(
-          reason.response.data,
-          reason.response.headers,
-          config.transformResponse
-        );
-      }
+    if (begs.length) {
+      result = [ left, right ];
     }
+  }
 
-    return Promise.reject(reason);
-  });
-};
+  return result;
+}
 
 
 /***/ }),
-/* 185 */
+/* 175 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var concatMap = __webpack_require__(178);
+var balanced = __webpack_require__(174);
 
-var utils = __webpack_require__(179);
+module.exports = expandTop;
 
-/**
- * Transform the data for a request or a response
- *
- * @param {Object|String} data The data to be transformed
- * @param {Array} headers The headers for the request or response
- * @param {Array|Function} fns A single function or Array of functions
- * @returns {*} The resulting transformed data
- */
-module.exports = function transformData(data, headers, fns) {
-  /*eslint no-param-reassign:0*/
-  utils.forEach(fns, function transform(fn) {
-    data = fn(data, headers);
-  });
+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';
 
-  return data;
-};
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
 
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
 
-/***/ }),
-/* 186 */
-/***/ (function(module, exports, __webpack_require__) {
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
 
-"use strict";
 
+// 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 = function isCancel(value) {
-  return !!(value && value.__CANCEL__);
-};
+  var parts = [];
+  var m = balanced('{', '}', str);
 
+  if (!m)
+    return str.split(',');
 
-/***/ }),
-/* 187 */
-/***/ (function(module, exports, __webpack_require__) {
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
 
-"use strict";
+  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);
 
-var utils = __webpack_require__(179);
-var normalizeHeaderName = __webpack_require__(188);
+  return parts;
+}
 
-var DEFAULT_CONTENT_TYPE = {
-  'Content-Type': 'application/x-www-form-urlencoded'
-};
+function expandTop(str) {
+  if (!str)
+    return [];
 
-function setContentTypeIfUnset(headers, value) {
-  if (!utils.isUndefined(headers) && utils.isUndefined(headers['Content-Type'])) {
-    headers['Content-Type'] = value;
+  // 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 expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
-function getDefaultAdapter() {
-  var adapter;
-  if (typeof XMLHttpRequest !== 'undefined') {
-    // For browsers use XHR adapter
-    adapter = __webpack_require__(189);
-  } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') {
-    // For node use HTTP adapter
-    adapter = __webpack_require__(199);
-  }
-  return adapter;
+function identity(e) {
+  return e;
 }
 
-var defaults = {
-  adapter: getDefaultAdapter(),
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
 
-  transformRequest: [function transformRequest(data, headers) {
-    normalizeHeaderName(headers, 'Accept');
-    normalizeHeaderName(headers, 'Content-Type');
-    if (utils.isFormData(data) ||
-      utils.isArrayBuffer(data) ||
-      utils.isBuffer(data) ||
-      utils.isStream(data) ||
-      utils.isFile(data) ||
-      utils.isBlob(data)
-    ) {
-      return data;
-    }
-    if (utils.isArrayBufferView(data)) {
-      return data.buffer;
-    }
-    if (utils.isURLSearchParams(data)) {
-      setContentTypeIfUnset(headers, 'application/x-www-form-urlencoded;charset=utf-8');
-      return data.toString();
-    }
-    if (utils.isObject(data)) {
-      setContentTypeIfUnset(headers, 'application/json;charset=utf-8');
-      return JSON.stringify(data);
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
+
+function expand(str, isTop) {
+  var expansions = [];
+
+  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 data;
-  }],
+    return [str];
+  }
 
-  transformResponse: [function transformResponse(data) {
-    /*eslint no-param-reassign:0*/
-    if (typeof data === 'string') {
-      try {
-        data = JSON.parse(data);
-      } catch (e) { /* Ignore */ }
+  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;
+        });
+      }
     }
-    return data;
-  }],
+  }
 
-  /**
-   * A timeout in milliseconds to abort a request. If set to 0 (default) a
-   * timeout is not created.
-   */
-  timeout: 0,
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
 
-  xsrfCookieName: 'XSRF-TOKEN',
-  xsrfHeaderName: 'X-XSRF-TOKEN',
+  // 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)
+    : [''];
 
-  maxContentLength: -1,
-  maxBodyLength: -1,
+  var N;
 
-  validateStatus: function validateStatus(status) {
-    return status >= 200 && status < 300;
-  }
-};
+  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);
 
-defaults.headers = {
-  common: {
-    'Accept': 'application/json, text/plain, */*'
+    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) });
   }
-};
 
-utils.forEach(['delete', 'get', 'head'], function forEachMethodNoData(method) {
-  defaults.headers[method] = {};
-});
+  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);
+    }
+  }
 
-utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
-  defaults.headers[method] = utils.merge(DEFAULT_CONTENT_TYPE);
-});
+  return expansions;
+}
 
-module.exports = defaults;
 
 
 /***/ }),
-/* 188 */
+/* 176 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(179);
-
-module.exports = function normalizeHeaderName(headers, normalizedName) {
-  utils.forEach(headers, function processHeader(value, name) {
-    if (name !== normalizedName && name.toUpperCase() === normalizedName.toUpperCase()) {
-      headers[normalizedName] = value;
-      delete headers[name];
-    }
-  });
-};
+function preserveCamelCase(str) {
+	let isLastCharLower = false;
+	let isLastCharUpper = false;
+	let isLastLastCharUpper = false;
 
+	for (let i = 0; i < str.length; i++) {
+		const c = str[i];
 
-/***/ }),
-/* 189 */
-/***/ (function(module, exports, __webpack_require__) {
+		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;
+		}
+	}
 
-"use strict";
+	return str;
+}
 
+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 utils = __webpack_require__(179);
-var settle = __webpack_require__(190);
-var cookies = __webpack_require__(193);
-var buildURL = __webpack_require__(182);
-var buildFullPath = __webpack_require__(194);
-var parseHeaders = __webpack_require__(197);
-var isURLSameOrigin = __webpack_require__(198);
-var createError = __webpack_require__(191);
+	if (str.length === 0) {
+		return '';
+	}
 
-module.exports = function xhrAdapter(config) {
-  return new Promise(function dispatchXhrRequest(resolve, reject) {
-    var requestData = config.data;
-    var requestHeaders = config.headers;
+	if (str.length === 1) {
+		return str.toLowerCase();
+	}
 
-    if (utils.isFormData(requestData)) {
-      delete requestHeaders['Content-Type']; // Let the browser set it
-    }
+	if (/^[a-z0-9]+$/.test(str)) {
+		return str;
+	}
 
-    var request = new XMLHttpRequest();
+	const hasUpperCase = str !== str.toLowerCase();
 
-    // HTTP basic authentication
-    if (config.auth) {
-      var username = config.auth.username || '';
-      var password = config.auth.password ? unescape(encodeURIComponent(config.auth.password)) : '';
-      requestHeaders.Authorization = 'Basic ' + btoa(username + ':' + password);
-    }
+	if (hasUpperCase) {
+		str = preserveCamelCase(str);
+	}
 
-    var fullPath = buildFullPath(config.baseURL, config.url);
-    request.open(config.method.toUpperCase(), buildURL(fullPath, config.params, config.paramsSerializer), true);
+	return str
+		.replace(/^[_.\- ]+/, '')
+		.toLowerCase()
+		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
+};
 
-    // Set the request timeout in MS
-    request.timeout = config.timeout;
 
-    // Listen for ready state
-    request.onreadystatechange = function handleLoad() {
-      if (!request || request.readyState !== 4) {
-        return;
-      }
-
-      // The request errored out and we didn't get a response, this will be
-      // handled by onerror instead
-      // With one exception: request that using file: protocol, most browsers
-      // will return status as 0 even though it's a successful request
-      if (request.status === 0 && !(request.responseURL && request.responseURL.indexOf('file:') === 0)) {
-        return;
-      }
-
-      // Prepare the response
-      var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null;
-      var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response;
-      var response = {
-        data: responseData,
-        status: request.status,
-        statusText: request.statusText,
-        headers: responseHeaders,
-        config: config,
-        request: request
-      };
-
-      settle(resolve, reject, response);
-
-      // Clean up request
-      request = null;
-    };
-
-    // Handle browser request cancellation (as opposed to a manual cancellation)
-    request.onabort = function handleAbort() {
-      if (!request) {
-        return;
-      }
-
-      reject(createError('Request aborted', config, 'ECONNABORTED', request));
-
-      // Clean up request
-      request = null;
-    };
-
-    // Handle low level network errors
-    request.onerror = function handleError() {
-      // Real errors are hidden from us by the browser
-      // onerror should only fire if it's a network error
-      reject(createError('Network Error', config, null, request));
-
-      // Clean up request
-      request = null;
-    };
-
-    // Handle timeout
-    request.ontimeout = function handleTimeout() {
-      var timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded';
-      if (config.timeoutErrorMessage) {
-        timeoutErrorMessage = config.timeoutErrorMessage;
-      }
-      reject(createError(timeoutErrorMessage, config, 'ECONNABORTED',
-        request));
-
-      // Clean up request
-      request = null;
-    };
-
-    // Add xsrf header
-    // This is only done if running in a standard browser environment.
-    // Specifically not if we're in a web worker, or react-native.
-    if (utils.isStandardBrowserEnv()) {
-      // Add xsrf header
-      var xsrfValue = (config.withCredentials || isURLSameOrigin(fullPath)) && config.xsrfCookieName ?
-        cookies.read(config.xsrfCookieName) :
-        undefined;
+/***/ }),
+/* 177 */,
+/* 178 */
+/***/ (function(module, exports) {
 
-      if (xsrfValue) {
-        requestHeaders[config.xsrfHeaderName] = xsrfValue;
-      }
+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;
+};
 
-    // Add headers to the request
-    if ('setRequestHeader' in request) {
-      utils.forEach(requestHeaders, function setRequestHeader(val, key) {
-        if (typeof requestData === 'undefined' && key.toLowerCase() === 'content-type') {
-          // Remove Content-Type if data is undefined
-          delete requestHeaders[key];
-        } else {
-          // Otherwise add header to the request
-          request.setRequestHeader(key, val);
-        }
-      });
-    }
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
 
-    // Add withCredentials to request if needed
-    if (!utils.isUndefined(config.withCredentials)) {
-      request.withCredentials = !!config.withCredentials;
-    }
 
-    // Add responseType to request if needed
-    if (config.responseType) {
-      try {
-        request.responseType = config.responseType;
-      } catch (e) {
-        // Expected DOMException thrown by browsers not compatible XMLHttpRequest Level 2.
-        // But, this can be suppressed for 'json' type as it can be parsed by default 'transformResponse' function.
-        if (config.responseType !== 'json') {
-          throw e;
-        }
-      }
-    }
+/***/ }),
+/* 179 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // Handle progress if needed
-    if (typeof config.onDownloadProgress === 'function') {
-      request.addEventListener('progress', config.onDownloadProgress);
-    }
+__webpack_require__(205);
+__webpack_require__(207);
+__webpack_require__(210);
+__webpack_require__(206);
+__webpack_require__(208);
+__webpack_require__(209);
+module.exports = __webpack_require__(23).Promise;
 
-    // Not all browsers support upload events
-    if (typeof config.onUploadProgress === 'function' && request.upload) {
-      request.upload.addEventListener('progress', config.onUploadProgress);
-    }
 
-    if (config.cancelToken) {
-      // Handle cancellation
-      config.cancelToken.promise.then(function onCanceled(cancel) {
-        if (!request) {
-          return;
-        }
+/***/ }),
+/* 180 */
+/***/ (function(module, exports) {
 
-        request.abort();
-        reject(cancel);
-        // Clean up request
-        request = null;
-      });
-    }
+module.exports = function () { /* empty */ };
 
-    if (!requestData) {
-      requestData = null;
-    }
 
-    // Send the request
-    request.send(requestData);
-  });
+/***/ }),
+/* 181 */
+/***/ (function(module, exports) {
+
+module.exports = function (it, Constructor, name, forbiddenField) {
+  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
+    throw TypeError(name + ': incorrect invocation!');
+  } return it;
 };
 
 
 /***/ }),
-/* 190 */
+/* 182 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+// 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;
+  };
+};
 
 
-var createError = __webpack_require__(191);
+/***/ }),
+/* 183 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Resolve or reject a Promise based on response status.
- *
- * @param {Function} resolve A function that resolves the promise.
- * @param {Function} reject A function that rejects the promise.
- * @param {object} response The response.
- */
-module.exports = function settle(resolve, reject, response) {
-  var validateStatus = response.config.validateStatus;
-  if (!response.status || !validateStatus || validateStatus(response.status)) {
-    resolve(response);
-  } else {
-    reject(createError(
-      'Request failed with status code ' + response.status,
-      response.config,
-      null,
-      response.request,
-      response
-    ));
+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;
 
 
 /***/ }),
-/* 191 */
+/* 184 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
+  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
+});
 
 
-var enhanceError = __webpack_require__(192);
+/***/ }),
+/* 185 */
+/***/ (function(module, exports) {
 
-/**
- * Create an Error with the specified message, config, error code, request and response.
- *
- * @param {string} message The error message.
- * @param {Object} config The config.
- * @param {string} [code] The error code (for example, 'ECONNABORTED').
- * @param {Object} [request] The request.
- * @param {Object} [response] The response.
- * @returns {Error} The created error.
- */
-module.exports = function createError(message, config, code, request, response) {
-  var error = new Error(message);
-  return enhanceError(error, config, code, request, response);
+// 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);
 };
 
 
 /***/ }),
-/* 192 */
+/* 186 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-/**
- * Update an Error with the specified config, error code, and response.
- *
- * @param {Error} error The error to update.
- * @param {Object} config The config.
- * @param {string} [code] The error code (for example, 'ECONNABORTED').
- * @param {Object} [request] The request.
- * @param {Object} [response] The response.
- * @returns {Error} The error.
- */
-module.exports = function enhanceError(error, config, code, request, response) {
-  error.config = config;
-  if (code) {
-    error.code = code;
-  }
-
-  error.request = request;
-  error.response = response;
-  error.isAxiosError = true;
+// check on default Array iterator
+var Iterators = __webpack_require__(35);
+var ITERATOR = __webpack_require__(13)('iterator');
+var ArrayProto = Array.prototype;
 
-  error.toJSON = function toJSON() {
-    return {
-      // Standard
-      message: this.message,
-      name: this.name,
-      // Microsoft
-      description: this.description,
-      number: this.number,
-      // Mozilla
-      fileName: this.fileName,
-      lineNumber: this.lineNumber,
-      columnNumber: this.columnNumber,
-      stack: this.stack,
-      // Axios
-      config: this.config,
-      code: this.code
-    };
-  };
-  return error;
+module.exports = function (it) {
+  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
 };
 
 
 /***/ }),
-/* 193 */
+/* 187 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-var utils = __webpack_require__(179);
-
-module.exports = (
-  utils.isStandardBrowserEnv() ?
-
-  // Standard browser envs support document.cookie
-    (function standardBrowserEnv() {
-      return {
-        write: function write(name, value, expires, path, domain, secure) {
-          var cookie = [];
-          cookie.push(name + '=' + encodeURIComponent(value));
-
-          if (utils.isNumber(expires)) {
-            cookie.push('expires=' + new Date(expires).toGMTString());
-          }
-
-          if (utils.isString(path)) {
-            cookie.push('path=' + path);
-          }
-
-          if (utils.isString(domain)) {
-            cookie.push('domain=' + domain);
-          }
-
-          if (secure === true) {
-            cookie.push('secure');
-          }
-
-          document.cookie = cookie.join('; ');
-        },
-
-        read: function read(name) {
-          var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)'));
-          return (match ? decodeURIComponent(match[3]) : null);
-        },
-
-        remove: function remove(name) {
-          this.write(name, '', Date.now() - 86400000);
-        }
-      };
-    })() :
-
-  // Non standard browser env (web workers, react-native) lack needed support.
-    (function nonStandardBrowserEnv() {
-      return {
-        write: function write() {},
-        read: function read() { return null; },
-        remove: function remove() {}
-      };
-    })()
-);
+// 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;
+  }
+};
 
 
 /***/ }),
-/* 194 */
+/* 188 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+var create = __webpack_require__(192);
+var descriptor = __webpack_require__(106);
+var setToStringTag = __webpack_require__(71);
+var IteratorPrototype = {};
 
-var isAbsoluteURL = __webpack_require__(195);
-var combineURLs = __webpack_require__(196);
+// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
+__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
 
-/**
- * Creates a new URL by combining the baseURL with the requestedURL,
- * only when the requestedURL is not already an absolute URL.
- * If the requestURL is absolute, this function returns the requestedURL untouched.
- *
- * @param {string} baseURL The base URL
- * @param {string} requestedURL Absolute or relative URL to combine
- * @returns {string} The combined full path
- */
-module.exports = function buildFullPath(baseURL, requestedURL) {
-  if (baseURL && !isAbsoluteURL(requestedURL)) {
-    return combineURLs(baseURL, requestedURL);
-  }
-  return requestedURL;
+module.exports = function (Constructor, NAME, next) {
+  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+  setToStringTag(Constructor, NAME + ' Iterator');
 };
 
 
 /***/ }),
-/* 195 */
+/* 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 */ }
 
-/**
- * Determines whether the specified URL is absolute
- *
- * @param {string} url The URL to test
- * @returns {boolean} True if the specified URL is absolute, otherwise false
- */
-module.exports = function isAbsoluteURL(url) {
-  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
-  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
-  // by any combination of letters, digits, plus, period, or hyphen.
-  return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+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;
 };
 
 
 /***/ }),
-/* 196 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
+/* 190 */
+/***/ (function(module, exports) {
 
-/**
- * Creates a new URL by combining the specified URLs
- *
- * @param {string} baseURL The base URL
- * @param {string} relativeURL The relative URL
- * @returns {string} The combined URL
- */
-module.exports = function combineURLs(baseURL, relativeURL) {
-  return relativeURL
-    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
-    : baseURL;
+module.exports = function (done, value) {
+  return { value: value, done: !!done };
 };
 
 
 /***/ }),
-/* 197 */
+/* 191 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+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';
 
-var utils = __webpack_require__(179);
+module.exports = function () {
+  var head, last, notify;
 
-// Headers whose duplicates are ignored by node
-// c.f. https://nodejs.org/api/http.html#http_message_headers
-var ignoreDuplicateOf = [
-  'age', 'authorization', 'content-length', 'content-type', 'etag',
-  'expires', 'from', 'host', 'if-modified-since', 'if-unmodified-since',
-  'last-modified', 'location', 'max-forwards', 'proxy-authorization',
-  'referer', 'retry-after', 'user-agent'
-];
+  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();
+  };
 
-/**
- * Parse headers into an object
- *
- * ```
- * Date: Wed, 27 Aug 2014 08:58:49 GMT
- * Content-Type: application/json
- * Connection: keep-alive
- * Transfer-Encoding: chunked
- * ```
- *
- * @param {String} headers Headers needing to be parsed
- * @returns {Object} Headers parsed into an object
- */
-module.exports = function parseHeaders(headers) {
-  var parsed = {};
-  var key;
-  var val;
-  var i;
+  // 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);
+    };
+  }
 
-  if (!headers) { return parsed; }
+  return function (fn) {
+    var task = { fn: fn, next: undefined };
+    if (last) last.next = task;
+    if (!head) {
+      head = task;
+      notify();
+    } last = task;
+  };
+};
 
-  utils.forEach(headers.split('\n'), function parser(line) {
-    i = line.indexOf(':');
-    key = utils.trim(line.substr(0, i)).toLowerCase();
-    val = utils.trim(line.substr(i + 1));
 
-    if (key) {
-      if (parsed[key] && ignoreDuplicateOf.indexOf(key) >= 0) {
-        return;
-      }
-      if (key === 'set-cookie') {
-        parsed[key] = (parsed[key] ? parsed[key] : []).concat([val]);
-      } else {
-        parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
-      }
-    }
-  });
+/***/ }),
+/* 192 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return parsed;
+// 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';
+
+// 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();
+};
+
+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);
 };
 
 
 /***/ }),
-/* 198 */
+/* 193 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var dP = __webpack_require__(50);
+var anObject = __webpack_require__(27);
+var getKeys = __webpack_require__(132);
+
+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;
+};
 
 
-var utils = __webpack_require__(179);
+/***/ }),
+/* 194 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (
-  utils.isStandardBrowserEnv() ?
+// 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;
 
-  // Standard browser envs have full support of the APIs needed to test
-  // whether the request URL is of the same origin as current location.
-    (function standardBrowserEnv() {
-      var msie = /(msie|trident)/i.test(navigator.userAgent);
-      var urlParsingNode = document.createElement('a');
-      var originURL;
+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;
+};
 
-      /**
-    * Parse a URL to discover it's components
-    *
-    * @param {String} url The URL to be parsed
-    * @returns {Object}
-    */
-      function resolveURL(url) {
-        var href = url;
 
-        if (msie) {
-        // IE needs attribute set twice to normalize properties
-          urlParsingNode.setAttribute('href', href);
-          href = urlParsingNode.href;
-        }
+/***/ }),
+/* 195 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        urlParsingNode.setAttribute('href', href);
+var has = __webpack_require__(49);
+var toIObject = __webpack_require__(74);
+var arrayIndexOf = __webpack_require__(182)(false);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
 
-        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
-        return {
-          href: urlParsingNode.href,
-          protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
-          host: urlParsingNode.host,
-          search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
-          hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
-          hostname: urlParsingNode.hostname,
-          port: urlParsingNode.port,
-          pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
-            urlParsingNode.pathname :
-            '/' + urlParsingNode.pathname
-        };
-      }
+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 result;
+};
 
-      originURL = resolveURL(window.location.href);
 
-      /**
-    * Determine if a URL shares the same origin as the current location
-    *
-    * @param {String} requestURL The URL to test
-    * @returns {boolean} True if URL shares the same origin, otherwise false
-    */
-      return function isURLSameOrigin(requestURL) {
-        var parsed = (utils.isString(requestURL)) ? resolveURL(requestURL) : requestURL;
-        return (parsed.protocol === originURL.protocol &&
-            parsed.host === originURL.host);
-      };
-    })() :
+/***/ }),
+/* 196 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // Non standard browser envs (web workers, react-native) lack needed support.
-    (function nonStandardBrowserEnv() {
-      return function isURLSameOrigin() {
-        return true;
-      };
-    })()
-);
+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;
+};
 
 
 /***/ }),
-/* 199 */
+/* 197 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = __webpack_require__(31);
 
 
-var utils = __webpack_require__(179);
-var settle = __webpack_require__(190);
-var buildFullPath = __webpack_require__(194);
-var buildURL = __webpack_require__(182);
-var http = __webpack_require__(200);
-var https = __webpack_require__(201);
-var httpFollow = __webpack_require__(202).http;
-var httpsFollow = __webpack_require__(202).https;
-var url = __webpack_require__(203);
-var zlib = __webpack_require__(211);
-var pkg = __webpack_require__(212);
-var createError = __webpack_require__(191);
-var enhanceError = __webpack_require__(192);
+/***/ }),
+/* 198 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var isHttps = /https:?/;
+"use strict";
 
-/**
- *
- * @param {http.ClientRequestArgs} options
- * @param {AxiosProxyConfig} proxy
- * @param {string} location
- */
-function setProxy(options, proxy, location) {
-  options.hostname = proxy.host;
-  options.host = proxy.host;
-  options.port = proxy.port;
-  options.path = location;
+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');
 
-  // Basic proxy authorization
-  if (proxy.auth) {
-    var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64');
-    options.headers['Proxy-Authorization'] = 'Basic ' + base64;
-  }
+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; }
+  });
+};
 
-  // If a proxy is used, any redirects must also pass through the proxy
-  options.beforeRedirect = function beforeRedirect(redirection) {
-    redirection.headers.host = redirection.host;
-    setProxy(redirection, proxy, redirection.href);
+
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
+
+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;
   };
-}
+};
 
-/*eslint consistent-return:0*/
-module.exports = function httpAdapter(config) {
-  return new Promise(function dispatchHttpRequest(resolvePromise, rejectPromise) {
-    var resolve = function resolve(value) {
-      resolvePromise(value);
-    };
-    var reject = function reject(value) {
-      rejectPromise(value);
-    };
-    var data = config.data;
-    var headers = config.headers;
 
-    // Set User-Agent (required by some servers)
-    // Only set header if it hasn't been set in config
-    // See https://github.com/axios/axios/issues/69
-    if (!headers['User-Agent'] && !headers['user-agent']) {
-      headers['User-Agent'] = 'axios/' + pkg.version;
-    }
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (data && !utils.isStream(data)) {
-      if (Buffer.isBuffer(data)) {
-        // Nothing to do...
-      } else if (utils.isArrayBuffer(data)) {
-        data = Buffer.from(new Uint8Array(data));
-      } else if (utils.isString(data)) {
-        data = Buffer.from(data, 'utf-8');
-      } else {
-        return reject(createError(
-          'Data after transformation must be a string, an ArrayBuffer, a Buffer, or a Stream',
-          config
-        ));
-      }
+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);
+};
 
-      // Add Content-Length header if data exists
-      headers['Content-Length'] = data.length;
-    }
 
-    // HTTP basic authentication
-    var auth = undefined;
-    if (config.auth) {
-      var username = config.auth.username || '';
-      var password = config.auth.password || '';
-      auth = username + ':' + password;
-    }
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    // Parse url
-    var fullPath = buildFullPath(config.baseURL, config.url);
-    var parsed = url.parse(fullPath);
-    var protocol = parsed.protocol || 'http:';
+// 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");
+};
 
-    if (!auth && parsed.auth) {
-      var urlAuth = parsed.auth.split(':');
-      var urlUsername = urlAuth[0] || '';
-      var urlPassword = urlAuth[1] || '';
-      auth = urlUsername + ':' + urlPassword;
-    }
 
-    if (auth) {
-      delete headers.Authorization;
-    }
+/***/ }),
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    var isHttpsRequest = isHttps.test(protocol);
-    var agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
+var global = __webpack_require__(11);
+var navigator = global.navigator;
 
-    var options = {
-      path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
-      method: config.method.toUpperCase(),
-      headers: headers,
-      agent: agent,
-      agents: { http: config.httpAgent, https: config.httpsAgent },
-      auth: auth
-    };
+module.exports = navigator && navigator.userAgent || '';
 
-    if (config.socketPath) {
-      options.socketPath = config.socketPath;
-    } else {
-      options.hostname = parsed.hostname;
-      options.port = parsed.port;
-    }
 
-    var proxy = config.proxy;
-    if (!proxy && proxy !== false) {
-      var proxyEnv = protocol.slice(0, -1) + '_proxy';
-      var proxyUrl = process.env[proxyEnv] || process.env[proxyEnv.toUpperCase()];
-      if (proxyUrl) {
-        var parsedProxyUrl = url.parse(proxyUrl);
-        var noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
-        var shouldProxy = true;
+/***/ }),
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (noProxyEnv) {
-          var noProxy = noProxyEnv.split(',').map(function trim(s) {
-            return s.trim();
-          });
+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)];
+};
 
-          shouldProxy = !noProxy.some(function proxyMatch(proxyElement) {
-            if (!proxyElement) {
-              return false;
-            }
-            if (proxyElement === '*') {
-              return true;
-            }
-            if (proxyElement[0] === '.' &&
-                parsed.hostname.substr(parsed.hostname.length - proxyElement.length) === proxyElement) {
-              return true;
-            }
 
-            return parsed.hostname === proxyElement;
-          });
-        }
+/***/ }),
+/* 204 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (shouldProxy) {
-          proxy = {
-            host: parsedProxyUrl.hostname,
-            port: parsedProxyUrl.port,
-            protocol: parsedProxyUrl.protocol
-          };
+"use strict";
 
-          if (parsedProxyUrl.auth) {
-            var proxyUrlAuth = parsedProxyUrl.auth.split(':');
-            proxy.auth = {
-              username: proxyUrlAuth[0],
-              password: proxyUrlAuth[1]
-            };
-          }
-        }
-      }
-    }
+var addToUnscopables = __webpack_require__(180);
+var step = __webpack_require__(190);
+var Iterators = __webpack_require__(35);
+var toIObject = __webpack_require__(74);
 
-    if (proxy) {
-      options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : '');
-      setProxy(options, proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path);
-    }
+// 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');
 
-    var transport;
-    var isHttpsProxy = isHttpsRequest && (proxy ? isHttps.test(proxy.protocol) : true);
-    if (config.transport) {
-      transport = config.transport;
-    } else if (config.maxRedirects === 0) {
-      transport = isHttpsProxy ? https : http;
-    } else {
-      if (config.maxRedirects) {
-        options.maxRedirects = config.maxRedirects;
-      }
-      transport = isHttpsProxy ? httpsFollow : httpFollow;
-    }
+// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
+Iterators.Arguments = Iterators.Array;
 
-    if (config.maxBodyLength > -1) {
-      options.maxBodyLength = config.maxBodyLength;
-    }
+addToUnscopables('keys');
+addToUnscopables('values');
+addToUnscopables('entries');
 
-    // Create the request
-    var req = transport.request(options, function handleResponse(res) {
-      if (req.aborted) return;
 
-      // uncompress the response body transparently if required
-      var stream = res;
+/***/ }),
+/* 205 */
+/***/ (function(module, exports) {
 
-      // return the last request in case of redirects
-      var lastRequest = res.req || req;
 
 
-      // if no content, is HEAD request or decompress disabled we should not decompress
-      if (res.statusCode !== 204 && lastRequest.method !== 'HEAD' && config.decompress !== false) {
-        switch (res.headers['content-encoding']) {
-        /*eslint default-case:0*/
-        case 'gzip':
-        case 'compress':
-        case 'deflate':
-        // add the unzipper to the body stream processing pipeline
-          stream = stream.pipe(zlib.createUnzip());
+/***/ }),
+/* 206 */
+/***/ (function(module, exports, __webpack_require__) {
 
-          // remove the content-encoding in order to not confuse downstream operations
-          delete res.headers['content-encoding'];
-          break;
-        }
-      }
+"use strict";
 
-      var response = {
-        status: res.statusCode,
-        statusText: res.statusMessage,
-        headers: res.headers,
-        config: config,
-        request: lastRequest
-      };
+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;
 
-      if (config.responseType === 'stream') {
-        response.data = stream;
-        settle(resolve, reject, response);
-      } else {
-        var responseBuffer = [];
-        stream.on('data', function handleStreamData(chunk) {
-          responseBuffer.push(chunk);
+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 */ }
+}();
 
-          // make sure the content length is not over the maxContentLength if specified
-          if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
-            stream.destroy();
-            reject(createError('maxContentLength size of ' + config.maxContentLength + ' exceeded',
-              config, null, lastRequest));
+// 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;
           }
-        });
-
-        stream.on('error', function handleStreamError(err) {
-          if (req.aborted) return;
-          reject(enhanceError(err, config, null, lastRequest));
-        });
-
-        stream.on('end', function handleStreamEnd() {
-          var responseData = Buffer.concat(responseBuffer);
-          if (config.responseType !== 'arraybuffer') {
-            responseData = responseData.toString(config.responseEncoding);
-            if (!config.responseEncoding || config.responseEncoding === 'utf8') {
-              responseData = utils.stripBOM(responseData);
+          if (handler === true) result = value;
+          else {
+            if (domain) domain.enter();
+            result = handler(value); // may throw
+            if (domain) {
+              domain.exit();
+              exited = true;
             }
           }
-
-          response.data = responseData;
-          settle(resolve, reject, response);
-        });
+          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);
       }
-    });
-
-    // Handle errors
-    req.on('error', function handleRequestError(err) {
-      if (req.aborted && err.code !== 'ERR_FR_TOO_MANY_REDIRECTS') return;
-      reject(enhanceError(err, config, null, req));
-    });
-
-    // Handle request timeout
-    if (config.timeout) {
-      // Sometime, the response will be very slow, and does not respond, the connect event will be block by event loop system.
-      // And timer callback will be fired, and abort() will be invoked before connection, then get "socket hang up" and code ECONNRESET.
-      // At this time, if we have a large number of request, nodejs will hang up some socket on background. and the number will up and up.
-      // And then these socket which be hang up will devoring CPU little by little.
-      // ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect.
-      req.setTimeout(config.timeout, function handleRequestTimeout() {
-        req.abort();
-        reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED', req));
+    };
+    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 });
     }
-
-    if (config.cancelToken) {
-      // Handle cancellation
-      config.cancelToken.promise.then(function onCanceled(cancel) {
-        if (req.aborted) return;
-
-        req.abort();
-        reject(cancel);
+  });
+};
+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
+  }
+};
 
-    // Send the request
-    if (utils.isStream(data)) {
-      data.on('error', function handleStreamError(err) {
-        reject(enhanceError(err, config, null, req));
-      }).pipe(req);
-    } else {
-      req.end(data);
+// 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;
+  }
+});
 
 
 /***/ }),
-/* 200 */
-/***/ (function(module, exports) {
+/* 207 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var $at = __webpack_require__(199)(true);
+
+// 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 };
+});
 
-module.exports = require("http");
 
 /***/ }),
-/* 201 */
-/***/ (function(module, exports) {
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// https://github.com/tc39/proposal-promise-finally
+
+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);
+
+$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
+  );
+} });
 
-module.exports = require("https");
 
 /***/ }),
-/* 202 */
+/* 209 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var url = __webpack_require__(203);
-var URL = url.URL;
-var http = __webpack_require__(200);
-var https = __webpack_require__(201);
-var Writable = __webpack_require__(173).Writable;
-var assert = __webpack_require__(162);
-var debug = __webpack_require__(204);
+"use strict";
 
-// Create handlers that pass events from native requests
-var events = ["abort", "aborted", "connect", "error", "socket", "timeout"];
-var eventHandlers = Object.create(null);
-events.forEach(function (event) {
-  eventHandlers[event] = function (arg1, arg2, arg3) {
-    this._redirectable.emit(event, arg1, arg2, arg3);
-  };
-});
+// https://github.com/tc39/proposal-promise-try
+var $export = __webpack_require__(41);
+var newPromiseCapability = __webpack_require__(70);
+var perform = __webpack_require__(104);
 
-// Error types with codes
-var RedirectionError = createErrorType(
-  "ERR_FR_REDIRECTION_FAILURE",
-  "Redirected request failed"
-);
-var TooManyRedirectsError = createErrorType(
-  "ERR_FR_TOO_MANY_REDIRECTS",
-  "Maximum number of redirects exceeded"
-);
-var MaxBodyLengthExceededError = createErrorType(
-  "ERR_FR_MAX_BODY_LENGTH_EXCEEDED",
-  "Request body larger than maxBodyLength limit"
-);
-var WriteAfterEndError = createErrorType(
-  "ERR_STREAM_WRITE_AFTER_END",
-  "write after end"
-);
+$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;
+} });
 
-// An HTTP(S) request that can be redirected
-function RedirectableRequest(options, responseCallback) {
-  // Initialize the request
-  Writable.call(this);
-  this._sanitizeOptions(options);
-  this._options = options;
-  this._ended = false;
-  this._ending = false;
-  this._redirectCount = 0;
-  this._redirects = [];
-  this._requestBodyLength = 0;
-  this._requestBodyBuffers = [];
 
-  // Attach a callback if passed
-  if (responseCallback) {
-    this.on("response", responseCallback);
-  }
+/***/ }),
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // React to responses of native requests
-  var self = this;
-  this._onNativeResponse = function (response) {
-    self._processResponse(response);
-  };
+__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');
 
-  // Perform the first request
-  this._performRequest();
+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;
 }
-RedirectableRequest.prototype = Object.create(Writable.prototype);
 
-RedirectableRequest.prototype.abort = function () {
-  abortRequest(this._currentRequest);
-  this.emit("abort");
-};
 
-// Writes buffered data to the current native request
-RedirectableRequest.prototype.write = function (data, encoding, callback) {
-  // Writing is not allowed if end has been called
-  if (this._ending) {
-    throw new WriteAfterEndError();
-  }
+/***/ }),
+/* 211 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // Validate input and shift parameters if necessary
-  if (!(typeof data === "string" || typeof data === "object" && ("length" in data))) {
-    throw new TypeError("data should be a string, Buffer or Uint8Array");
-  }
-  if (typeof encoding === "function") {
-    callback = encoding;
-    encoding = null;
-  }
-
-  // Ignore empty buffers, since writing them doesn't invoke the callback
-  // https://github.com/nodejs/node/issues/22066
-  if (data.length === 0) {
-    if (callback) {
-      callback();
-    }
-    return;
-  }
-  // Only write when we don't exceed the maximum body length
-  if (this._requestBodyLength + data.length <= this._options.maxBodyLength) {
-    this._requestBodyLength += data.length;
-    this._requestBodyBuffers.push({ data: data, encoding: encoding });
-    this._currentRequest.write(data, encoding, callback);
-  }
-  // Error when we exceed the maximum body length
-  else {
-    this.emit("error", new MaxBodyLengthExceededError());
-    this.abort();
-  }
-};
-
-// Ends the current native request
-RedirectableRequest.prototype.end = function (data, encoding, callback) {
-  // Shift parameters if necessary
-  if (typeof data === "function") {
-    callback = data;
-    data = encoding = null;
-  }
-  else if (typeof encoding === "function") {
-    callback = encoding;
-    encoding = null;
-  }
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-  // Write data if needed and end
-  if (!data) {
-    this._ended = this._ending = true;
-    this._currentRequest.end(null, null, callback);
-  }
-  else {
-    var self = this;
-    var currentRequest = this._currentRequest;
-    this.write(data, encoding, function () {
-      self._ended = true;
-      currentRequest.end(null, null, callback);
-    });
-    this._ending = true;
-  }
-};
+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();
 
-// Sets a header value on the current native request
-RedirectableRequest.prototype.setHeader = function (name, value) {
-  this._options.headers[name] = value;
-  this._currentRequest.setHeader(name, value);
-};
+/**
+ * Colors.
+ */
 
-// Clears a header value on the current native request
-RedirectableRequest.prototype.removeHeader = function (name) {
-  delete this._options.headers[name];
-  this._currentRequest.removeHeader(name);
-};
+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'
+];
 
-// Global timeout for all underlying requests
-RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
-  var self = this;
+/**
+ * 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
+ */
 
-  // Destroys the socket on timeout
-  function destroyOnTimeout(socket) {
-    socket.setTimeout(msecs);
-    socket.removeListener("timeout", socket.destroy);
-    socket.addListener("timeout", socket.destroy);
+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;
   }
 
-  // Sets up a timer to trigger a timeout event
-  function startTimer(socket) {
-    if (self._timeout) {
-      clearTimeout(self._timeout);
-    }
-    self._timeout = setTimeout(function () {
-      self.emit("timeout");
-      clearTimer();
-    }, msecs);
-    destroyOnTimeout(socket);
+  // Internet Explorer and Edge do not support colors.
+  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
+    return false;
   }
 
-  // Stops a timeout from triggering
-  function clearTimer() {
-    // Clear the timeout
-    if (self._timeout) {
-      clearTimeout(self._timeout);
-      self._timeout = null;
-    }
+  // 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+)/));
+}
 
-    // Clean up all attached listeners
-    self.removeListener("abort", clearTimer);
-    self.removeListener("error", clearTimer);
-    self.removeListener("response", clearTimer);
-    if (callback) {
-      self.removeListener("timeout", callback);
-    }
-    if (!self.socket) {
-      self._currentRequest.removeListener("socket", startTimer);
-    }
-  }
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
 
-  // Attach callback if passed
-  if (callback) {
-    this.on("timeout", callback);
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
   }
+};
 
-  // Start the timer if or when the socket is opened
-  if (this.socket) {
-    startTimer(this.socket);
-  }
-  else {
-    this._currentRequest.once("socket", startTimer);
-  }
 
-  // Clean up on events
-  this.on("socket", destroyOnTimeout);
-  this.on("abort", clearTimer);
-  this.on("error", clearTimer);
-  this.on("response", clearTimer);
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
 
-  return this;
-};
+function formatArgs(args) {
+  var useColors = this.useColors;
 
-// Proxy all other public ClientRequest methods
-[
-  "flushHeaders", "getHeader",
-  "setNoDelay", "setSocketKeepAlive",
-].forEach(function (method) {
-  RedirectableRequest.prototype[method] = function (a, b) {
-    return this._currentRequest[method](a, b);
-  };
-});
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
 
-// Proxy all public ClientRequest properties
-["aborted", "connection", "socket"].forEach(function (property) {
-  Object.defineProperty(RedirectableRequest.prototype, property, {
-    get: function () { return this._currentRequest[property]; },
-  });
-});
+  if (!useColors) return;
 
-RedirectableRequest.prototype._sanitizeOptions = function (options) {
-  // Ensure headers are always present
-  if (!options.headers) {
-    options.headers = {};
-  }
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
 
-  // Since http.request treats host as an alias of hostname,
-  // but the url module interprets host as hostname plus port,
-  // eliminate the host property to avoid confusion.
-  if (options.host) {
-    // Use hostname if set, because it has precedence
-    if (!options.hostname) {
-      options.hostname = options.host;
+  // 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;
     }
-    delete options.host;
-  }
+  });
 
-  // Complete the URL object when necessary
-  if (!options.pathname && options.path) {
-    var searchPos = options.path.indexOf("?");
-    if (searchPos < 0) {
-      options.pathname = options.path;
-    }
-    else {
-      options.pathname = options.path.substring(0, searchPos);
-      options.search = options.path.substring(searchPos);
-    }
-  }
-};
+  args.splice(lastC, 0, c);
+}
 
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
 
-// Executes the next native request (initial or redirect)
-RedirectableRequest.prototype._performRequest = function () {
-  // Load the native protocol
-  var protocol = this._options.protocol;
-  var nativeProtocol = this._options.nativeProtocols[protocol];
-  if (!nativeProtocol) {
-    this.emit("error", new TypeError("Unsupported protocol " + protocol));
-    return;
-  }
+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);
+}
 
-  // If specified, use the agent corresponding to the protocol
-  // (HTTP and HTTPS use different types of agents)
-  if (this._options.agents) {
-    var scheme = protocol.substr(0, protocol.length - 1);
-    this._options.agent = this._options.agents[scheme];
-  }
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-  // Create the native request
-  var request = this._currentRequest =
-        nativeProtocol.request(this._options, this._onNativeResponse);
-  this._currentUrl = url.format(this._options);
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
 
-  // Set up event handlers
-  request._redirectable = this;
-  for (var e = 0; e < events.length; e++) {
-    request.on(events[e], eventHandlers[events[e]]);
-  }
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-  // End a redirected request
-  // (The first request must be ended explicitly with RedirectableRequest#end)
-  if (this._isRedirect) {
-    // Write the request entity and end.
-    var i = 0;
-    var self = this;
-    var buffers = this._requestBodyBuffers;
-    (function writeNext(error) {
-      // Only write if this request has not been redirected yet
-      /* istanbul ignore else */
-      if (request === self._currentRequest) {
-        // Report any write errors
-        /* istanbul ignore if */
-        if (error) {
-          self.emit("error", error);
-        }
-        // Write the next buffer if there are still left
-        else if (i < buffers.length) {
-          var buffer = buffers[i++];
-          /* istanbul ignore else */
-          if (!request.finished) {
-            request.write(buffer.data, buffer.encoding, writeNext);
-          }
-        }
-        // End the request if `end` has been called on us
-        else if (self._ended) {
-          request.end();
-        }
-      }
-    }());
-  }
-};
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
 
-// Processes a response from the current native request
-RedirectableRequest.prototype._processResponse = function (response) {
-  // Store the redirected response
-  var statusCode = response.statusCode;
-  if (this._options.trackRedirects) {
-    this._redirects.push({
-      url: this._currentUrl,
-      headers: response.headers,
-      statusCode: statusCode,
-    });
+  // 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;
   }
 
-  // RFC7231§6.4: The 3xx (Redirection) class of status code indicates
-  // that further action needs to be taken by the user agent in order to
-  // fulfill the request. If a Location header field is provided,
-  // the user agent MAY automatically redirect its request to the URI
-  // referenced by the Location field value,
-  // even if the specific status code is not understood.
-
-  // If the response is not a redirect; return it as-is
-  var location = response.headers.location;
-  if (!location || this._options.followRedirects === false ||
-      statusCode < 300 || statusCode >= 400) {
-    response.responseUrl = this._currentUrl;
-    response.redirects = this._redirects;
-    this.emit("response", response);
+  return r;
+}
 
-    // Clean up
-    this._requestBodyBuffers = [];
-    return;
-  }
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
 
-  // The response is a redirect, so abort the current request
-  abortRequest(this._currentRequest);
-  // Discard the remainder of the response to avoid waiting for data
-  response.destroy();
+exports.enable(load());
 
-  // RFC7231§6.4: A client SHOULD detect and intervene
-  // in cyclical redirections (i.e., "infinite" redirection loops).
-  if (++this._redirectCount > this._options.maxRedirects) {
-    this.emit("error", new TooManyRedirectsError());
-    return;
-  }
+/**
+ * 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
+ */
 
-  // RFC7231§6.4: Automatic redirection needs to done with
-  // care for methods not known to be safe, […]
-  // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
-  // the request method from POST to GET for the subsequent request.
-  if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" ||
-      // RFC7231§6.4.4: The 303 (See Other) status code indicates that
-      // the server is redirecting the user agent to a different resource […]
-      // A user agent can perform a retrieval request targeting that URI
-      // (a GET or HEAD request if using HTTP) […]
-      (statusCode === 303) && !/^(?:GET|HEAD)$/.test(this._options.method)) {
-    this._options.method = "GET";
-    // Drop a possible entity and headers related to it
-    this._requestBodyBuffers = [];
-    removeMatchingHeaders(/^content-/i, this._options.headers);
-  }
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
 
-  // Drop the Host header, as the redirect might lead to a different host
-  var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
 
-  // If the redirect is relative, carry over the host of the last request
-  var currentUrlParts = url.parse(this._currentUrl);
-  var currentHost = currentHostHeader || currentUrlParts.host;
-  var currentUrl = /^\w+:/.test(location) ? this._currentUrl :
-    url.format(Object.assign(currentUrlParts, { host: currentHost }));
+/***/ }),
+/* 212 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // Determine the URL of the redirection
-  var redirectUrl;
-  try {
-    redirectUrl = url.resolve(currentUrl, location);
-  }
-  catch (cause) {
-    this.emit("error", new RedirectionError(cause));
-    return;
-  }
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
 
-  // Create the redirected request
-  debug("redirecting to", redirectUrl);
-  this._isRedirect = true;
-  var redirectUrlParts = url.parse(redirectUrl);
-  Object.assign(this._options, redirectUrlParts);
+if (typeof process === 'undefined' || process.type === 'renderer') {
+  module.exports = __webpack_require__(211);
+} else {
+  module.exports = __webpack_require__(213);
+}
 
-  // Drop confidential headers when redirecting to a less secure protocol
-  // or to a different domain that is not a superdomain
-  if (redirectUrlParts.protocol !== currentUrlParts.protocol &&
-     redirectUrlParts.protocol !== "https:" ||
-     redirectUrlParts.host !== currentHost &&
-     !isSubdomain(redirectUrlParts.host, currentHost)) {
-    removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
-  }
 
-  // Evaluate the beforeRedirect callback
-  if (typeof this._options.beforeRedirect === "function") {
-    var responseDetails = { headers: response.headers };
-    try {
-      this._options.beforeRedirect.call(null, this._options, responseDetails);
-    }
-    catch (err) {
-      this.emit("error", err);
-      return;
-    }
-    this._sanitizeOptions(this._options);
-  }
+/***/ }),
+/* 213 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // Perform the redirected request
-  try {
-    this._performRequest();
-  }
-  catch (cause) {
-    this.emit("error", new RedirectionError(cause));
-  }
-};
+/**
+ * Module dependencies.
+ */
 
-// Wraps the key/value object of protocols with redirect functionality
-function wrap(protocols) {
-  // Default settings
-  var exports = {
-    maxRedirects: 21,
-    maxBodyLength: 10 * 1024 * 1024,
-  };
+var tty = __webpack_require__(79);
+var util = __webpack_require__(2);
 
-  // Wrap each protocol
-  var nativeProtocols = {};
-  Object.keys(protocols).forEach(function (scheme) {
-    var protocol = scheme + ":";
-    var nativeProtocol = nativeProtocols[protocol] = protocols[scheme];
-    var wrappedProtocol = exports[scheme] = Object.create(nativeProtocol);
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-    // Executes a request, following redirects
-    function request(input, options, callback) {
-      // Parse parameters
-      if (typeof input === "string") {
-        var urlStr = input;
-        try {
-          input = urlToOptions(new URL(urlStr));
-        }
-        catch (err) {
-          /* istanbul ignore next */
-          input = url.parse(urlStr);
-        }
-      }
-      else if (URL && (input instanceof URL)) {
-        input = urlToOptions(input);
-      }
-      else {
-        callback = options;
-        options = input;
-        input = { protocol: protocol };
-      }
-      if (typeof options === "function") {
-        callback = options;
-        options = null;
-      }
-
-      // Set defaults
-      options = Object.assign({
-        maxRedirects: exports.maxRedirects,
-        maxBodyLength: exports.maxBodyLength,
-      }, input, options);
-      options.nativeProtocols = nativeProtocols;
-
-      assert.equal(options.protocol, protocol, "protocol mismatch");
-      debug("options", options);
-      return new RedirectableRequest(options, callback);
-    }
-
-    // Executes a GET request, following redirects
-    function get(input, options, callback) {
-      var wrappedRequest = wrappedProtocol.request(input, options, callback);
-      wrappedRequest.end();
-      return wrappedRequest;
-    }
-
-    // Expose the properties on the wrapped protocol
-    Object.defineProperties(wrappedProtocol, {
-      request: { value: request, configurable: true, enumerable: true, writable: true },
-      get: { value: get, configurable: true, enumerable: true, writable: true },
-    });
-  });
-  return exports;
-}
-
-/* istanbul ignore next */
-function noop() { /* empty */ }
-
-// from https://github.com/nodejs/node/blob/master/lib/internal/url.js
-function urlToOptions(urlObject) {
-  var options = {
-    protocol: urlObject.protocol,
-    hostname: urlObject.hostname.startsWith("[") ?
-      /* istanbul ignore next */
-      urlObject.hostname.slice(1, -1) :
-      urlObject.hostname,
-    hash: urlObject.hash,
-    search: urlObject.search,
-    pathname: urlObject.pathname,
-    path: urlObject.pathname + urlObject.search,
-    href: urlObject.href,
-  };
-  if (urlObject.port !== "") {
-    options.port = Number(urlObject.port);
-  }
-  return options;
-}
-
-function removeMatchingHeaders(regex, headers) {
-  var lastValue;
-  for (var header in headers) {
-    if (regex.test(header)) {
-      lastValue = headers[header];
-      delete headers[header];
-    }
-  }
-  return (lastValue === null || typeof lastValue === "undefined") ?
-    undefined : String(lastValue).trim();
-}
-
-function createErrorType(code, defaultMessage) {
-  function CustomError(cause) {
-    Error.captureStackTrace(this, this.constructor);
-    if (!cause) {
-      this.message = defaultMessage;
-    }
-    else {
-      this.message = defaultMessage + ": " + cause.message;
-      this.cause = cause;
-    }
-  }
-  CustomError.prototype = new Error();
-  CustomError.prototype.constructor = CustomError;
-  CustomError.prototype.name = "Error [" + code + "]";
-  CustomError.prototype.code = code;
-  return CustomError;
-}
-
-function abortRequest(request) {
-  for (var e = 0; e < events.length; e++) {
-    request.removeListener(events[e], eventHandlers[events[e]]);
-  }
-  request.on("error", noop);
-  request.abort();
-}
-
-function isSubdomain(subdomain, domain) {
-  const dot = subdomain.length - domain.length - 1;
-  return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
-}
-
-// Exports
-module.exports = wrap({ http: http, https: https });
-module.exports.wrap = wrap;
-
-
-/***/ }),
-/* 203 */
-/***/ (function(module, exports) {
-
-module.exports = require("url");
-
-/***/ }),
-/* 204 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var debug;
-
-module.exports = function () {
-  if (!debug) {
-    try {
-      /* eslint global-require: off */
-      debug = __webpack_require__(205)("follow-redirects");
-    }
-    catch (error) { /* */ }
-    if (typeof debug !== "function") {
-      debug = function () { /* */ };
-    }
-  }
-  debug.apply(null, arguments);
-};
-
-
-/***/ }),
-/* 205 */
-/***/ (function(module, exports, __webpack_require__) {
+exports = module.exports = __webpack_require__(112);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
 
 /**
- * Detect Electron renderer process, which is node, but we should
- * treat as a browser.
+ * Colors.
  */
 
-if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(206);
-} else {
-  module.exports = __webpack_require__(209);
-}
-
+exports.colors = [ 6, 2, 3, 4, 5, 1 ];
 
-/***/ }),
-/* 206 */
-/***/ (function(module, exports, __webpack_require__) {
+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.
+}
 
 /**
- * This is the web browser implementation of `debug()`.
+ * Build up the default `inspectOpts` object from the environment variables.
  *
- * Expose `debug()` as the module.
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
  */
 
-exports = module.exports = __webpack_require__(207);
-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();
+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() });
 
-/**
- * Colors.
- */
+  // 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);
 
-exports.colors = [
-  'lightseagreen',
-  'forestgreen',
-  'goldenrod',
-  'dodgerblue',
-  'darkorchid',
-  'crimson'
-];
+  obj[prop] = val;
+  return obj;
+}, {});
 
 /**
- * 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
+ * Is stdout a TTY? Colored output is enabled when `true`.
  */
 
 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;
-  }
-
-  // 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+)/));
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(process.stderr.fd);
 }
 
 /**
- * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ * Map %o to `util.inspect()`, all on a single line.
  */
 
-exports.formatters.j = function(v) {
-  try {
-    return JSON.stringify(v);
-  } catch (err) {
-    return '[UnexpectedJSONParseError]: ' + err.message;
-  }
+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(' ');
 };
 
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
+
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
 
 /**
- * Colorize log arguments if enabled.
+ * Adds ANSI color escape codes if enabled.
  *
  * @api public
  */
 
 function formatArgs(args) {
+  var name = this.namespace;
   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')
+  if (useColors) {
+    var c = this.color;
+    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
+    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
 
-  // 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;
-    }
-  });
+    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];
+  }
+}
 
-  args.splice(lastC, 0, c);
+function getDate() {
+  if (exports.inspectOpts.hideDate) {
+    return '';
+  } else {
+    return new Date().toISOString() + ' ';
+  }
 }
 
 /**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
+ * Invokes `util.format()` with the specified arguments and writes to stderr.
  */
 
 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);
+  return process.stderr.write(util.format.apply(util, arguments) + '\n');
 }
 
 /**
@@ -14732,13 +13379,13 @@ function log() {
  */
 
 function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
-    } else {
-      exports.storage.debug = namespaces;
-    }
-  } catch(e) {}
+  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;
+  }
 }
 
 /**
@@ -14749,6261 +13396,5288 @@ function save(namespaces) {
  */
 
 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 r;
+  return process.env.DEBUG;
 }
 
 /**
- * Enable namespaces listed in `localStorage.debug` initially.
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
  */
 
-exports.enable(load());
+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]];
+  }
+}
 
 /**
- * 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
+ * Enable namespaces listed in `process.env.DEBUG` initially.
  */
 
-function localstorage() {
-  try {
-    return window.localStorage;
-  } catch (e) {}
-}
+exports.enable(load());
 
 
 /***/ }),
-/* 207 */
+/* 214 */,
+/* 215 */,
+/* 216 */,
+/* 217 */
 /***/ (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.
 
-/**
- * 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__(208);
-
-/**
- * The currently active debug mode names, and names to skip.
- */
-
-exports.names = [];
-exports.skips = [];
-
-/**
- * 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".
- */
+var pathModule = __webpack_require__(0);
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__(3);
 
-exports.formatters = {};
+// JavaScript implementation of realpath, ported from node pre-v6
 
-/**
- * Previous log timestamp.
- */
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
 
-var prevTime;
+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;
 
-/**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
- */
+  return callback;
 
-function selectColor(namespace) {
-  var hash = 0, i;
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
+    }
+  }
 
-  for (i in namespace) {
-    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
-    hash |= 0; // Convert to 32bit integer
+  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);
+      }
+    }
   }
+}
 
-  return exports.colors[Math.abs(hash) % exports.colors.length];
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
 }
 
-/**
- * Create a debugger with the given `namespace`.
- *
- * @param {String} namespace
- * @return {Function}
- * @api public
- */
+var normalize = pathModule.normalize;
 
-function createDebug(namespace) {
+// 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;
+}
 
-  function debug() {
-    // disabled?
-    if (!debug.enabled) return;
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
+}
 
-    var self = debug;
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
 
-    // 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];
-    }
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-    args[0] = exports.coerce(args[0]);
+  // 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;
 
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %O
-      args.unshift('%O');
+  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.lstatSync(base);
+      knownHard[base] = true;
     }
+  }
 
-    // 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);
+  // 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;
 
-        // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
+
+    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;
       }
-      return match;
-    });
 
-    // apply env-specific formatting (colors, etc.)
-    exports.formatArgs.call(self, args);
+      // 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;
+    }
 
-    var logFn = debug.log || exports.log || console.log.bind(console);
-    logFn.apply(self, args);
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
   }
 
-  debug.namespace = namespace;
-  debug.enabled = exports.enabled(namespace);
-  debug.useColors = exports.useColors();
-  debug.color = selectColor(namespace);
+  if (cache) cache[original] = p;
 
-  // env-specific initialization logic for debug instances
-  if ('function' === typeof exports.init) {
-    exports.init(debug);
+  return p;
+};
+
+
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
   }
 
-  return debug;
-}
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
 
-function enable(namespaces) {
-  exports.save(namespaces);
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-  exports.names = [];
-  exports.skips = [];
+  // 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;
 
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
+  start();
 
-  for (var 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) + '$'));
+  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 {
-      exports.names.push(new RegExp('^' + namespaces + '$'));
+      process.nextTick(LOOP);
     }
   }
-}
-
-/**
- * Disable debug output.
- *
- * @api public
- */
 
-function disable() {
-  exports.enable('');
-}
+  // 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);
+    }
 
-/**
- * Returns true if the given mode name is enabled, false otherwise.
- *
- * @param {String} name
- * @return {Boolean}
- * @api public
- */
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
 
-function enabled(name) {
-  var i, len;
-  for (i = 0, len = exports.skips.length; i < len; i++) {
-    if (exports.skips[i].test(name)) {
-      return false;
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
     }
-  }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
+
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
     }
-  }
-  return false;
-}
 
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
+    return fs.lstat(base, gotStat);
+  }
 
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
+  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);
+    }
 
-/***/ }),
-/* 208 */
-/***/ (function(module, exports) {
+    // 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);
 
-/**
- * Helpers.
- */
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
 
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
 
-/**
- * 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
- */
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
 
-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);
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
   }
-  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
- */
 
-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;
-  }
-}
+/***/ }),
+/* 218 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
+module.exports = globSync
+globSync.GlobSync = GlobSync
 
-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 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
 
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
+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')
 
-function fmtLong(ms) {
-  return plural(ms, d, 'day') ||
-    plural(ms, h, 'hour') ||
-    plural(ms, m, 'minute') ||
-    plural(ms, s, 'second') ||
-    ms + ' ms';
+  return new GlobSync(pattern, options).found
 }
 
-/**
- * Pluralization helper.
- */
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
 
-function plural(ms, n, name) {
-  if (ms < n) {
-    return;
+  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)
   }
-  if (ms < n * 1.5) {
-    return Math.floor(ms / n) + ' ' + name;
+  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
+        }
+      }
+    })
   }
-  return Math.ceil(ms / n) + ' ' + name + 's';
+  common.finish(this)
 }
 
 
-/***/ }),
-/* 209 */
-/***/ (function(module, exports, __webpack_require__) {
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
 
-/**
- * Module dependencies.
- */
+  // 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.
 
-var tty = __webpack_require__(123);
-var util = __webpack_require__(113);
+  // 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
 
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = __webpack_require__(207);
-exports.init = init;
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-
-/**
- * Colors.
- */
-
-exports.colors = [6, 2, 3, 4, 5, 1];
-
-/**
- * Build up the default `inspectOpts` object from the environment variables.
- *
- *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
- */
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
 
-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() });
+    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
+  }
 
-  // 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 remain = pattern.slice(n)
 
-  obj[prop] = val;
-  return obj;
-}, {});
+  // 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
 
-/**
- * The file descriptor to write the `debug()` calls to.
- * Set the `DEBUG_FD` env variable to override with another value. i.e.:
- *
- *   $ DEBUG_FD=3 node script.js 3>debug.log
- */
+  var abs = this._makeAbs(read)
 
-var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
+  //if ignored, skip processing
+  if (childrenIgnored(this, read))
+    return
 
-if (1 !== fd && 2 !== fd) {
-  util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')()
+  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)
 }
 
-var stream = 1 === fd ? process.stdout :
-             2 === fd ? process.stderr :
-             createWritableStdioStream(fd);
 
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
+GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
+  var entries = this._readdir(abs, inGlobStar)
 
-function useColors() {
-  return 'colors' in exports.inspectOpts
-    ? Boolean(exports.inspectOpts.colors)
-    : tty.isatty(fd);
-}
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return
 
-/**
- * Map %o to `util.inspect()`, all on a single line.
- */
+  // 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) === '.'
 
-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(' ');
-};
+  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)
+    }
+  }
 
-/**
- * Map %o to `util.inspect()`, allowing multiple lines if needed.
- */
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
 
-exports.formatters.O = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts);
-};
+  // 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.
 
-/**
- * Adds ANSI color escape codes if enabled.
- *
- * @api public
- */
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-function formatArgs(args) {
-  var name = this.namespace;
-  var useColors = this.useColors;
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix.slice(-1) !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
 
-  if (useColors) {
-    var c = this.color;
-    var prefix = '  \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m';
+      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
+  }
 
-    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
-    args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
-  } else {
-    args[0] = new Date().toUTCString()
-      + ' ' + name + ' ' + args[0];
+  // 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)
   }
 }
 
-/**
- * Invokes `util.format()` with the specified arguments and writes to `stream`.
- */
 
-function log() {
-  return stream.write(util.format.apply(util, arguments) + '\n');
-}
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
 
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
+  var abs = this._makeAbs(e)
 
-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 (this.mark)
+    e = this._mark(e)
+
+  if (this.absolute) {
+    e = abs
   }
-}
 
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
+  if (this.matches[index][e])
+    return
 
-function load() {
-  return process.env.DEBUG;
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
+
+  this.matches[index][e] = true
+
+  if (this.stat)
+    this._stat(e)
 }
 
-/**
- * Copied from `node/src/node.js`.
- *
- * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
- * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
- */
 
-function createWritableStdioStream (fd) {
-  var stream;
-  var tty_wrap = process.binding('tty_wrap');
+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)
 
-  // Note stream._type is used for test-module-load-list.js
+  var entries
+  var lstat
+  var stat
+  try {
+    lstat = fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
+  }
 
-  switch (tty_wrap.guessHandleType(fd)) {
-    case 'TTY':
-      stream = new tty.WriteStream(fd);
-      stream._type = 'tty';
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
 
-      // Hack to have stream not keep the event loop alive.
-      // See https://github.com/joyent/node/issues/1726
-      if (stream._handle && stream._handle.unref) {
-        stream._handle.unref();
-      }
-      break;
+  // 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)
 
-    case 'FILE':
-      var fs = __webpack_require__(132);
-      stream = new fs.SyncWriteStream(fd, { autoClose: false });
-      stream._type = 'fs';
-      break;
+  return entries
+}
 
-    case 'PIPE':
-    case 'TCP':
-      var net = __webpack_require__(210);
-      stream = new net.Socket({
-        fd: fd,
-        readable: false,
-        writable: true
-      });
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-      // FIXME Should probably have an option in net.Socket to create a
-      // stream from an existing fd which is writable only. But for now
-      // we'll just add this hack and set the `readable` member to false.
-      // Test: ./node test/fixtures/echo.js < /etc/passwd
-      stream.readable = false;
-      stream.read = null;
-      stream._type = 'pipe';
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
 
-      // FIXME Hack to have stream not keep the event loop alive.
-      // See https://github.com/joyent/node/issues/1726
-      if (stream._handle && stream._handle.unref) {
-        stream._handle.unref();
-      }
-      break;
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
 
-    default:
-      // Probably an error on in uv_guess_handle()
-      throw new Error('Implement me. Unknown stream file type!');
+    if (Array.isArray(c))
+      return c
   }
 
-  // For supporting legacy API we put the FD here.
-  stream.fd = fd;
+  try {
+    return this._readdirEntries(abs, fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
+  }
+}
 
-  stream._isStdio = true;
+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
+    }
+  }
 
-  return stream;
+  this.cache[abs] = entries
+
+  // mark and cache dir-ness
+  return entries
 }
 
-/**
- * Init logic for `debug` instances.
- *
- * Create a new `inspectOpts` object in case `useColors` is set
- * differently for a particular `debug` instance.
- */
+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
 
-function init (debug) {
-  debug.inspectOpts = {};
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-  var keys = Object.keys(exports.inspectOpts);
-  for (var i = 0; i < keys.length; i++) {
-    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+    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
   }
 }
 
-/**
- * Enable namespaces listed in `process.env.DEBUG` initially.
- */
-
-exports.enable(load());
-
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
 
-/***/ }),
-/* 210 */
-/***/ (function(module, exports) {
+  var entries = this._readdir(abs, inGlobStar)
 
-module.exports = require("net");
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
 
-/***/ }),
-/* 211 */
-/***/ (function(module, exports) {
+  // 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)
 
-module.exports = require("zlib");
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
 
-/***/ }),
-/* 212 */
-/***/ (function(module) {
+  var len = entries.length
+  var isSym = this.symlinks[abs]
 
-module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.21.1\",\"description\":\"Promise based HTTP client for the browser and node.js\",\"main\":\"index.js\",\"scripts\":{\"test\":\"grunt test && bundlesize\",\"start\":\"node ./sandbox/server.js\",\"build\":\"NODE_ENV=production grunt build\",\"preversion\":\"npm test\",\"version\":\"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json\",\"postversion\":\"git push && git push --tags\",\"examples\":\"node ./examples/server.js\",\"coveralls\":\"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js\",\"fix\":\"eslint --fix lib/**/*.js\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/axios/axios.git\"},\"keywords\":[\"xhr\",\"http\",\"ajax\",\"promise\",\"node\"],\"author\":\"Matt Zabriskie\",\"license\":\"MIT\",\"bugs\":{\"url\":\"https://github.com/axios/axios/issues\"},\"homepage\":\"https://github.com/axios/axios\",\"devDependencies\":{\"bundlesize\":\"^0.17.0\",\"coveralls\":\"^3.0.0\",\"es6-promise\":\"^4.2.4\",\"grunt\":\"^1.0.2\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.1.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^20.1.0\",\"grunt-karma\":\"^2.0.0\",\"grunt-mocha-test\":\"^0.13.3\",\"grunt-ts\":\"^6.0.0-beta.19\",\"grunt-webpack\":\"^1.0.18\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^1.3.0\",\"karma-chrome-launcher\":\"^2.2.0\",\"karma-coverage\":\"^1.1.1\",\"karma-firefox-launcher\":\"^1.1.0\",\"karma-jasmine\":\"^1.1.1\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-opera-launcher\":\"^1.0.0\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^1.2.0\",\"karma-sinon\":\"^1.0.5\",\"karma-sourcemap-loader\":\"^0.3.7\",\"karma-webpack\":\"^1.7.0\",\"load-grunt-tasks\":\"^3.5.2\",\"minimist\":\"^1.2.0\",\"mocha\":\"^5.2.0\",\"sinon\":\"^4.5.0\",\"typescript\":\"^2.8.1\",\"url-search-params\":\"^0.10.0\",\"webpack\":\"^1.13.1\",\"webpack-dev-server\":\"^1.14.1\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"jsdelivr\":\"dist/axios.min.js\",\"unpkg\":\"dist/axios.min.js\",\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"^1.10.0\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
 
-/***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-"use strict";
+    // 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)
+  }
+}
 
-var utils = __webpack_require__(179);
+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)
 
-/**
- * Config-specific merge-function which creates a new config-object
- * by merging two configuration objects together.
- *
- * @param {Object} config1
- * @param {Object} config2
- * @returns {Object} New object resulting from merging config2 to config1
- */
-module.exports = function mergeConfig(config1, config2) {
-  // eslint-disable-next-line no-param-reassign
-  config2 = config2 || {};
-  var config = {};
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-  var valueFromConfig2Keys = ['url', 'method', 'data'];
-  var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy', 'params'];
-  var defaultToConfig2Keys = [
-    'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
-    'timeout', 'timeoutMessage', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
-    'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'decompress',
-    'maxContentLength', 'maxBodyLength', 'maxRedirects', 'transport', 'httpAgent',
-    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
-  ];
-  var directMergeKeys = ['validateStatus'];
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
 
-  function getMergedValue(target, source) {
-    if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
-      return utils.merge(target, source);
-    } else if (utils.isPlainObject(source)) {
-      return utils.merge({}, source);
-    } else if (utils.isArray(source)) {
-      return source.slice();
+  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 += '/'
     }
-    return source;
   }
 
-  function mergeDeepProperties(prop) {
-    if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
-    } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
-    }
-  }
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
 
-  utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
-    if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
-    }
-  });
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+}
 
-  utils.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-  utils.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
-    if (!utils.isUndefined(config2[prop])) {
-      config[prop] = getMergedValue(undefined, config2[prop]);
-    } else if (!utils.isUndefined(config1[prop])) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
+  if (f.length > this.maxLength)
+    return false
+
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+
+    if (Array.isArray(c))
+      c = 'DIR'
+
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
+
+    if (needDir && c === 'FILE')
+      return false
+
+    // 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) {
+    var lstat
+    try {
+      lstat = fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
     }
-  });
 
-  utils.forEach(directMergeKeys, function merge(prop) {
-    if (prop in config2) {
-      config[prop] = getMergedValue(config1[prop], config2[prop]);
-    } else if (prop in config1) {
-      config[prop] = getMergedValue(undefined, config1[prop]);
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
     }
-  });
+  }
 
-  var axiosKeys = valueFromConfig2Keys
-    .concat(mergeDeepPropertiesKeys)
-    .concat(defaultToConfig2Keys)
-    .concat(directMergeKeys);
+  this.statCache[abs] = stat
 
-  var otherKeys = Object
-    .keys(config1)
-    .concat(Object.keys(config2))
-    .filter(function filterAxiosKeys(key) {
-      return axiosKeys.indexOf(key) === -1;
-    });
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
 
-  utils.forEach(otherKeys, mergeDeepProperties);
+  this.cache[abs] = this.cache[abs] || c
 
-  return config;
-};
+  if (needDir && c === 'FILE')
+    return false
+
+  return c
+}
+
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
+
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
 
 /***/ }),
-/* 214 */
+/* 219 */,
+/* 220 */,
+/* 221 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+module.exports = function (flag, argv) {
+	argv = argv || process.argv;
 
-/**
- * A `Cancel` is an object that is thrown when an operation is canceled.
- *
- * @class
- * @param {string=} message The message.
- */
-function Cancel(message) {
-  this.message = message;
-}
+	var terminatorPos = argv.indexOf('--');
+	var prefix = /^--/.test(flag) ? '' : '--';
+	var pos = argv.indexOf(prefix + flag);
 
-Cancel.prototype.toString = function toString() {
-  return 'Cancel' + (this.message ? ': ' + this.message : '');
+	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
 };
 
-Cancel.prototype.__CANCEL__ = true;
-
-module.exports = Cancel;
-
 
 /***/ }),
-/* 215 */
+/* 222 */,
+/* 223 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var wrappy = __webpack_require__(123)
+var reqs = Object.create(null)
+var once = __webpack_require__(61)
 
-var Cancel = __webpack_require__(214);
+module.exports = wrappy(inflight)
 
-/**
- * A `CancelToken` is an object that can be used to request cancellation of an operation.
- *
- * @class
- * @param {Function} executor The executor function.
- */
-function CancelToken(executor) {
-  if (typeof executor !== 'function') {
-    throw new TypeError('executor must be a function.');
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
   }
+}
 
-  var resolvePromise;
-  this.promise = new Promise(function promiseExecutor(resolve) {
-    resolvePromise = resolve;
-  });
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
 
-  var token = this;
-  executor(function cancel(message) {
-    if (token.reason) {
-      // Cancellation has already been requested
-      return;
+    // 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]
+      }
     }
-
-    token.reason = new Cancel(message);
-    resolvePromise(token.reason);
-  });
+  })
 }
 
-/**
- * Throws a `Cancel` if cancellation has been requested.
- */
-CancelToken.prototype.throwIfRequested = function throwIfRequested() {
-  if (this.reason) {
-    throw this.reason;
-  }
-};
-
-/**
- * Returns an object that contains a new `CancelToken` and a function that, when called,
- * cancels the `CancelToken`.
- */
-CancelToken.source = function source() {
-  var cancel;
-  var token = new CancelToken(function executor(c) {
-    cancel = c;
-  });
-  return {
-    token: token,
-    cancel: cancel
-  };
-};
+function slice (args) {
+  var length = args.length
+  var array = []
 
-module.exports = CancelToken;
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
 
 
 /***/ }),
-/* 216 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
+/* 224 */
+/***/ (function(module, exports) {
 
-/**
- * Syntactic sugar for invoking a function and expanding an array for arguments.
- *
- * Common use case would be to use `Function.prototype.apply`.
- *
- *  ```js
- *  function f(x, y, z) {}
- *  var args = [1, 2, 3];
- *  f.apply(null, args);
- *  ```
- *
- * With `spread` this example can be re-written.
- *
- *  ```js
- *  spread(function(x, y, z) {})([1, 2, 3]);
- *  ```
- *
- * @param {Function} callback
- * @returns {Function}
- */
-module.exports = function spread(callback) {
-  return function wrap(arr) {
-    return callback.apply(null, arr);
+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 {
+  // 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
+  }
+}
 
 
 /***/ }),
-/* 217 */
+/* 225 */,
+/* 226 */,
+/* 227 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+// @flow
 
+/*::
+declare var __webpack_require__: mixed;
+*/
 
-/**
- * Determines whether the payload is an error thrown by Axios
- *
- * @param {*} payload The value to test
- * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
- */
-module.exports = function isAxiosError(payload) {
-  return (typeof payload === 'object') && (payload.isAxiosError === true);
-};
+module.exports = typeof __webpack_require__ !== "undefined";
 
 
 /***/ }),
-/* 218 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+/* 228 */,
+/* 229 */
+/***/ (function(module, exports) {
 
+/**
+ * Helpers.
+ */
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.parseConfig = parseConfig;
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/**
+ * 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
  */
 
+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)
+  );
+};
+
 /**
- * Information about how CiStatsReporter should talk to the ci-stats service. Normally
- * it is read from a JSON environment variable using the `parseConfig()` function
- * exported by this module.
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
  */
-function validateConfig(log, config) {
-  const validApiToken = typeof config.apiToken === 'string' && config.apiToken.length !== 0;
 
-  if (!validApiToken) {
-    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid api token, stats will not be reported');
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
     return;
   }
-
-  const validId = typeof config.buildId === 'string' && config.buildId.length !== 0;
-
-  if (!validId) {
-    log.warning('KIBANA_CI_STATS_CONFIG is missing a valid build id, stats will not be reported');
+  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;
   }
-
-  return config;
+  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;
+  }
 }
 
-function parseConfig(log) {
-  const configJson = process.env.KIBANA_CI_STATS_CONFIG;
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  if (!configJson) {
-    log.debug('KIBANA_CI_STATS_CONFIG environment variable not found, disabling CiStatsReporter');
-    return;
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
   }
-
-  let config;
-
-  try {
-    config = JSON.parse(configJson);
-  } catch (_) {// handled below
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
   }
-
-  if (typeof config === 'object' && config !== null) {
-    return validateConfig(log, config);
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
   }
-
-  log.warning('KIBANA_CI_STATS_CONFIG is invalid, stats will not be reported');
-  return;
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
 }
 
-/***/ }),
-/* 219 */
-/***/ (function(module, exports) {
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-function webpackEmptyContext(req) {
-	var e = new Error("Cannot find module '" + req + "'");
-	e.code = 'MODULE_NOT_FOUND';
-	throw e;
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
 }
-webpackEmptyContext.keys = function() { return []; };
-webpackEmptyContext.resolve = webpackEmptyContext;
-module.exports = webpackEmptyContext;
-webpackEmptyContext.id = 219;
-
-/***/ }),
-/* 220 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "log", function() { return log; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Log", function() { return Log; });
-/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5);
-/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__);
-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; }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/**
+ * Pluralization helper.
  */
 
-
-class Log extends _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLog"] {
-  constructor() {
-    super();
-
-    _defineProperty(this, "logLevel", void 0);
-
-    this.setLogLevel('info');
-  }
-
-  setLogLevel(level) {
-    this.logLevel = Object(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["parseLogLevel"])(level);
-    this.setWriters([new _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLogTextWriter"]({
-      level: this.logLevel.name,
-      writeTo: process.stdout
-    })]);
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
   }
-
-  wouldLogLevel(level) {
-    return this.logLevel.flags[level];
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
   }
-
+  return Math.ceil(ms / n) + ' ' + name + 's';
 }
 
-const log = new Log();
-
 
 /***/ }),
-/* 221 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"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__(173);
-/* 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__(114);
-/* 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__(134);
-/* 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__(222);
-/* 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__(220);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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; }
-
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/* 230 */,
+/* 231 */,
+/* 232 */,
+/* 233 */
+/***/ (function(module, exports, __webpack_require__) {
 
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
+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)
 
+var defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
+// for EMFILE handling
+var timeout = 0
 
-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];
+var isWindows = (process.platform === "win32")
 
-const getColor = () => {
-  const color = colorWheel.shift();
-  colorWheel.push(color);
-  return color;
-};
+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]
+  })
 
-function spawn(command, args, opts) {
-  return execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
-    stdio: 'inherit',
-    preferLocal: true
-  }, opts));
+  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 streamToLog(debug = true) {
-  return new stream__WEBPACK_IMPORTED_MODULE_0__["Writable"]({
-    objectMode: true,
+function rimraf (p, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-    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);
-      }
+  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')
 
-      cb();
-    }
+  defaults(options)
 
-  });
-}
+  var busyTries = 0
+  var errState = null
+  var n = 0
 
-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)); // TypeScript note: As long as the proc stdio[1] is 'pipe', then stdout will not be null
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-  spawned.stderr.pipe(prefixedStderr).pipe(streamToLog(debug)); // TypeScript note: As long as the proc stdio[2] is 'pipe', then stderr will not be null
+  options.lstat(p, function (er, stat) {
+    if (!er)
+      return afterGlob(null, [p])
 
-  return spawned;
-}
+    glob(p, options.glob, afterGlob)
+  })
 
-/***/ }),
-/* 222 */
-/***/ (function(module, exports, __webpack_require__) {
+  function next (er) {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-// 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
+  function afterGlob (er, results) {
+    if (er)
+      return cb(er)
+
+    n = results.length
+    if (n === 0)
+      return cb()
 
-module.exports = __webpack_require__(223);
-module.exports.cli = __webpack_require__(227);
+    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)
+          }
 
+          // 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 ++)
+          }
 
-/***/ }),
-/* 223 */
-/***/ (function(module, exports, __webpack_require__) {
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
-"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
+        timeout = 0
+        next(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)
 
-var stream = __webpack_require__(173);
-var util = __webpack_require__(113);
-var fs = __webpack_require__(132);
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
 
-var through = __webpack_require__(224);
-var duplexer = __webpack_require__(225);
-var StringDecoder = __webpack_require__(226).StringDecoder;
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
 
-module.exports = Logger;
+    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)
+    })
+  })
+}
 
-Logger.DEFAULTS = {
-  format: 'text',
-  tag: '',
-  mergeMultiline: false,
-  timeStamp: false,
-};
+function fixWinEPERM (p, options, er, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+  if (er)
+    assert(er instanceof Error)
 
-var formatters = {
-  text: textFormatter,
-  json: jsonFormatter,
+  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)
+      })
+  })
 }
 
-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(),
-  ];
+function fixWinEPERMSync (p, options, er) {
+  assert(p)
+  assert(options)
+  if (er)
+    assert(er instanceof Error)
 
-  if (options.tag) {
-    transforms.push(staticTagger(options.tag));
+  try {
+    options.chmodSync(p, _0666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
   }
 
-  if (options.mergeMultiline) {
-    transforms.push(lineMerger());
+  try {
+    var stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
   }
 
-  // TODO
-  // if (options.pidStamp) {
-  //   transforms.push(pidStamper(options.pid));
-  // }
-
-  // TODO
-  // if (options.workerStamp) {
-  //   transforms.push(workerStamper(options.worker));
-  // }
-
-  transforms.push(formatters[options.format](options));
-
-  // restore line endings that were removed by line splitting
-  transforms.push(reLiner());
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
 
-  for (var t in transforms) {
-    emitter = emitter.pipe(transforms[t]);
-  }
+function rmdir (p, options, originalEr, cb) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+  assert(typeof cb === 'function')
 
-  return duplexer(catcher, emitter);
+  // 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)
+  })
 }
 
-function deLiner() {
-  var decoder = new StringDecoder('utf8');
-  var last = '';
+function rmkids(p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-  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();
-    },
-  });
+  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)
+      })
+    })
+  })
 }
 
-function reLiner() {
-  return through(appendNewline);
+// 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)
 
-  function appendNewline(line) {
-    this.emit('data', line + '\n');
-  }
-}
+  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')
 
-function objectifier() {
-  return through(objectify, null, {autoDestroy: false});
+  var results
 
-  function objectify(line) {
-    this.emit('data', {
-      msg: line,
-      time: Date.now(),
-    });
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
   }
-}
 
-function staticTagger(tag) {
-  return through(tagger);
+  if (!results.length)
+    return
 
-  function tagger(logEvent) {
-    logEvent.tag = tag;
-    this.emit('data', logEvent);
-  }
-}
+  for (var i = 0; i < results.length; i++) {
+    var p = results[i]
 
-function textFormatter(options) {
-  return through(textify);
+    try {
+      var st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
 
-  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);
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
     }
-    this.emit('data', line.replace(/\n/g, '\\n'));
-  }
 
-  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] + ' ';
-      }
+    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)
     }
-    return str;
   }
 }
 
-function jsonFormatter(options) {
-  return through(jsonify);
+function rmdirSync (p, options, originalEr) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
 
-  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));
+  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 lineMerger(host) {
-  var previousLine = null;
-  var flushTimer = null;
-  var stream = through(lineMergerWrite, lineMergerEnd);
-  var flush = _flush.bind(stream);
-
-  return stream;
-
-  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);
-  }
+function rmkidsSync (p, options) {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(function (f) {
+    rimrafSync(path.join(p, f), options)
+  })
 
-  function _flush() {
-    if (previousLine) {
-      this.emit('data', previousLine);
-      previousLine = 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
     }
-  }
-
-  function lineMergerEnd() {
-    flush.call(this);
-    this.emit('end');
-  }
+  } while (true)
 }
 
 
 /***/ }),
-/* 224 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var Stream = __webpack_require__(173)
-
-// 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)
+/* 234 */,
+/* 235 */,
+/* 236 */,
+/* 237 */,
+/* 238 */,
+/* 239 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports = module.exports = through
-through.through = through
+"use strict";
 
-//create a readable writable stream.
+var hasFlag = __webpack_require__(221);
 
-function through (write, end, opts) {
-  write = write || function (data) { this.queue(data) }
-  end = end || function () { this.queue(null) }
+var support = function (level) {
+	if (level === 0) {
+		return false;
+	}
 
-  var ended = false, destroyed = false, buffer = [], _ended = false
-  var stream = new Stream()
-  stream.readable = stream.writable = true
-  stream.paused = false
+	return {
+		level: level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+};
 
-//  stream.autoPause   = !(opts && opts.autoPause   === false)
-  stream.autoDestroy = !(opts && opts.autoDestroy === false)
+var supportLevel = (function () {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
+		return 0;
+	}
 
-  stream.write = function (data) {
-    write.call(this, data)
-    return !stream.paused
-  }
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-  function drain() {
-    while(buffer.length && !stream.paused) {
-      var data = buffer.shift()
-      if(null === data)
-        return stream.emit('end')
-      else
-        stream.emit('data', data)
-    }
-  }
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-  stream.queue = stream.push = function (data) {
-//    console.error(ended)
-    if(_ended) return stream
-    if(data === null) _ended = true
-    buffer.push(data)
-    drain()
-    return stream
-  }
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
+		return 1;
+	}
 
-  //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'
+	if (process.stdout && !process.stdout.isTTY) {
+		return 0;
+	}
 
-  stream.on('end', function () {
-    stream.readable = false
-    if(!stream.writable && stream.autoDestroy)
-      process.nextTick(function () {
-        stream.destroy()
-      })
-  })
+	if (process.platform === 'win32') {
+		return 1;
+	}
 
-  function _end () {
-    stream.writable = false
-    end.call(stream)
-    if(!stream.readable && stream.autoDestroy)
-      stream.destroy()
-  }
+	if ('CI' in process.env) {
+		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
+			return 1;
+		}
 
-  stream.end = function (data) {
-    if(ended) return
-    ended = true
-    if(arguments.length) stream.write(data)
-    _end() // will emit or queue
-    return stream
-  }
+		return 0;
+	}
 
-  stream.destroy = function () {
-    if(destroyed) return
-    destroyed = true
-    ended = true
-    buffer.length = 0
-    stream.writable = stream.readable = false
-    stream.emit('close')
-    return stream
-  }
+	if ('TEAMCITY_VERSION' in process.env) {
+		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
+	}
 
-  stream.pause = function () {
-    if(stream.paused) return
-    stream.paused = true
-    return stream
-  }
+	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
+		return 2;
+	}
 
-  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
-}
+	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+		return 1;
+	}
 
+	if ('COLORTERM' in process.env) {
+		return 1;
+	}
 
+	if (process.env.TERM === 'dumb') {
+		return 0;
+	}
 
-/***/ }),
-/* 225 */
-/***/ (function(module, exports, __webpack_require__) {
+	return 0;
+})();
 
-var Stream = __webpack_require__(173)
-var writeMethods = ["write", "end", "destroy"]
-var readMethods = ["resume", "pause"]
-var readEvents = ["data", "close"]
-var slice = Array.prototype.slice
+if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
+	supportLevel = 1;
+}
 
-module.exports = duplex
+module.exports = process && support(supportLevel);
 
-function forEach (arr, fn) {
-    if (arr.forEach) {
-        return arr.forEach(fn)
-    }
 
-    for (var i = 0; i < arr.length; i++) {
-        fn(arr[i], i)
-    }
-}
+/***/ })
+/******/ ]);
 
-function duplex(writer, reader) {
-    var stream = new Stream()
-    var ended = false
+/***/ }),
 
-    forEach(writeMethods, proxyWriter)
+/***/ "../../node_modules/ansi-regex/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    forEach(readMethods, proxyReader)
+"use strict";
 
-    forEach(readEvents, proxyStream)
 
-    reader.on("end", handleEnd)
+module.exports = ({onlyFirst = false} = {}) => {
+	const pattern = [
+		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
+	].join('|');
 
-    writer.on("drain", function() {
-      stream.emit("drain")
-    })
+	return new RegExp(pattern, onlyFirst ? undefined : 'g');
+};
 
-    writer.on("error", reemit)
-    reader.on("error", reemit)
 
-    stream.writable = writer.writable
-    stream.readable = reader.readable
+/***/ }),
 
-    return stream
+/***/ "../../node_modules/ansi-styles/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    function proxyWriter(methodName) {
-        stream[methodName] = method
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
 
-        function method() {
-            return writer[methodName].apply(writer, arguments)
-        }
-    }
+const wrapAnsi16 = (fn, offset) => (...args) => {
+	const code = fn(...args);
+	return `\u001B[${code + offset}m`;
+};
 
-    function proxyReader(methodName) {
-        stream[methodName] = method
+const wrapAnsi256 = (fn, offset) => (...args) => {
+	const code = fn(...args);
+	return `\u001B[${38 + offset};5;${code}m`;
+};
 
-        function method() {
-            stream.emit(methodName)
-            var func = reader[methodName]
-            if (func) {
-                return func.apply(reader, arguments)
-            }
-            reader.emit(methodName)
-        }
-    }
+const wrapAnsi16m = (fn, offset) => (...args) => {
+	const rgb = fn(...args);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
 
-    function proxyStream(methodName) {
-        reader.on(methodName, reemit)
+const ansi2ansi = n => n;
+const rgb2rgb = (r, g, b) => [r, g, b];
 
-        function reemit() {
-            var args = slice.call(arguments)
-            args.unshift(methodName)
-            stream.emit.apply(stream, args)
-        }
-    }
+const setLazyProperty = (object, property, get) => {
+	Object.defineProperty(object, property, {
+		get: () => {
+			const value = get();
 
-    function handleEnd() {
-        if (ended) {
-            return
-        }
-        ended = true
-        var args = slice.call(arguments)
-        args.unshift("end")
-        stream.emit.apply(stream, args)
-    }
+			Object.defineProperty(object, property, {
+				value,
+				enumerable: true,
+				configurable: true
+			});
 
-    function reemit(err) {
-        stream.emit("error", err)
-    }
-}
+			return value;
+		},
+		enumerable: true,
+		configurable: true
+	});
+};
 
+/** @type {typeof import('color-convert')} */
+let colorConvert;
+const makeDynamicStyles = (wrap, targetSpace, identity, isBackground) => {
+	if (colorConvert === undefined) {
+		colorConvert = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/index.js");
+	}
 
-/***/ }),
-/* 226 */
-/***/ (function(module, exports) {
+	const offset = isBackground ? 10 : 0;
+	const styles = {};
 
-module.exports = require("string_decoder");
+	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);
+		}
+	}
 
-/***/ }),
-/* 227 */
-/***/ (function(module, exports, __webpack_require__) {
+	return styles;
+};
 
-"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
+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],
 
+			// 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],
 
+			// 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]
+		}
+	};
 
-var minimist = __webpack_require__(228);
-var path = __webpack_require__(4);
+	// 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;
 
-var Logger = __webpack_require__(223);
-var pkg = __webpack_require__(229);
+	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 = cli;
+			group[styleName] = styles[styleName];
 
-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);
-  }
-}
+			codes.set(style[0], style[1]);
+		}
 
-function version($0, p) {
-  p('%s v%s', pkg.name, pkg.version);
-}
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
+	}
 
-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('');
+	Object.defineProperty(styles, 'codes', {
+		value: codes,
+		enumerable: false
+	});
 
-  function boolOpt(name, def) {
-    name = name + PADDING.slice(0, 20-name.length);
-    p('   --%s default: %s', name, def);
-  }
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-  function stdOpt(name, def) {
-    var value = name.toUpperCase() +
-                PADDING.slice(0, 19 - name.length*2);
-    p('   --%s %s default: %j', name, value, def);
-  }
+	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;
 }
 
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
 /***/ }),
-/* 228 */
-/***/ (function(module, exports) {
 
-module.exports = function (args, opts) {
-    if (!opts) opts = {};
-    
-    var flags = { bools : {}, strings : {}, unknownFn: null };
+/***/ "../../node_modules/ansi-styles/node_modules/color-convert/conversions.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (typeof opts['unknown'] === 'function') {
-        flags.unknownFn = opts['unknown'];
-    }
+/* MIT license */
+/* eslint-disable no-mixed-operators */
+const cssKeywords = __webpack_require__("../../node_modules/color-name/index.js");
 
-    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;
-            }));
-        });
-    });
+// 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.)
 
-    [].concat(opts.string).filter(Boolean).forEach(function (key) {
-        flags.strings[key] = true;
-        if (aliases[key]) {
-            flags.strings[aliases[key]] = true;
-        }
-     });
+const reverseKeywords = {};
+for (const key of Object.keys(cssKeywords)) {
+	reverseKeywords[cssKeywords[key]] = key;
+}
 
-    var defaults = opts['default'] || {};
-    
-    var argv = { _ : [] };
-    Object.keys(flags.bools).forEach(function (key) {
-        setArg(key, defaults[key] === undefined ? false : defaults[key]);
-    });
-    
-    var notFlags = [];
+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 (args.indexOf('--') !== -1) {
-        notFlags = args.slice(args.indexOf('--')+1);
-        args = args.slice(0, args.indexOf('--'));
-    }
+module.exports = convert;
 
-    function argDefined(key, arg) {
-        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
-            flags.strings[key] || flags.bools[key] || aliases[key];
-    }
+// Hide .channels and .labels properties
+for (const model of Object.keys(convert)) {
+	if (!('channels' in convert[model])) {
+		throw new Error('missing channels property: ' + model);
+	}
 
-    function setArg (key, val, arg) {
-        if (arg && flags.unknownFn && !argDefined(key, arg)) {
-            if (flags.unknownFn(arg) === false) return;
-        }
+	if (!('labels' in convert[model])) {
+		throw new Error('missing channel labels property: ' + model);
+	}
 
-        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);
-        });
-    }
+	if (convert[model].labels.length !== convert[model].channels) {
+		throw new Error('channel and label counts mismatch: ' + model);
+	}
 
-    function setKey (obj, keys, value) {
-        var o = obj;
-        for (var i = 0; i < keys.length-1; i++) {
-            var key = keys[i];
-            if (isConstructorOrProto(o, key)) 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 {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});
+}
 
-        var key = keys[keys.length - 1];
-        if (isConstructorOrProto(o, key)) 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];
-      });
-    }
+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;
 
-    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);
-        });
-    }
+	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;
+	}
 
-    return argv;
-};
+	h = Math.min(h * 60, 360);
 
-function hasKey (obj, keys) {
-    var o = obj;
-    keys.slice(0,-1).forEach(function (key) {
-        o = (o[key] || {});
-    });
+	if (h < 0) {
+		h += 360;
+	}
 
-    var key = keys[keys.length - 1];
-    return key in o;
-}
+	const l = (min + max) / 2;
 
-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);
-}
+	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];
+};
 
-function isConstructorOrProto (obj, key) {
-    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
-}
+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;
+	};
 
-/***/ }),
-/* 229 */
-/***/ (function(module) {
+	if (diff === 0) {
+		h = 0;
+		s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
 
-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\"}}");
+		if (r === v) {
+			h = bdif - gdif;
+		} else if (g === v) {
+			h = (1 / 3) + rdif - bdif;
+		} else if (b === v) {
+			h = (2 / 3) + gdif - rdif;
+		}
 
-/***/ }),
-/* 230 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		if (h < 0) {
+			h += 1;
+		} else if (h > 1) {
+			h -= 1;
+		}
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "linkProjectExecutables", function() { return linkProjectExecutables; });
-/* 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 _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(220);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
+};
 
+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));
 
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
 
+	return [h, w * 100, b * 100];
+};
 
-/**
- * Yarn does not link the executables from dependencies that are installed
- * using `link:` https://github.com/yarnpkg/yarn/pull/5046
- *
- * We simulate this functionality by walking through each project's project
- * dependencies, and manually linking their executables if defined. The logic
- * for linking was mostly adapted from lerna: https://github.com/lerna/lerna/blob/1d7eb9eeff65d5a7de64dea73613b1bf6bfa8d57/src/PackageUtilities.js#L348
- */
-async function linkProjectExecutables(projectsByName, projectGraph) {
-  _log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`Linking package executables`); // Find root and generate executables from dependencies for it
+convert.rgb.cmyk = function (rgb) {
+	const r = rgb[0] / 255;
+	const g = rgb[1] / 255;
+	const b = rgb[2] / 255;
 
-  let rootProject = null;
-  let rootProjectDeps = [];
+	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;
 
-  for (const [projectName, projectDeps] of projectGraph) {
-    const project = projectsByName.get(projectName);
+	return [c * 100, m * 100, y * 100, k * 100];
+};
 
-    if (project.isSinglePackageJsonProject) {
-      rootProject = projectsByName.get(projectName);
-      rootProjectDeps = projectDeps;
-      break;
-    }
-  }
+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)
+	);
+}
 
-  if (!rootProject) {
-    throw new Error('Could not finding root project while linking package executables');
-  } // Prepare root project node_modules/.bin
+convert.rgb.keyword = function (rgb) {
+	const reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
+	}
 
+	let currentClosestDistance = Infinity;
+	let currentClosestKeyword;
 
-  const rootBinsDir = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootProject.nodeModulesLocation, '.bin');
+	for (const keyword of Object.keys(cssKeywords)) {
+		const value = cssKeywords[keyword];
 
-  for (const rootProjectDep of rootProjectDeps) {
-    const executables = rootProjectDep.getExecutables();
+		// Compute comparative distance
+		const distance = comparativeDistance(rgb, value);
 
-    for (const name of Object.keys(executables)) {
-      const srcPath = executables[name]; // existing logic from lerna -- ensure that the bin we are going to
-      // point to exists or ignore it
+		// Check if its less, if so set as closest
+		if (distance < currentClosestDistance) {
+			currentClosestDistance = distance;
+			currentClosestKeyword = keyword;
+		}
+	}
 
-      if (!(await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["isFile"])(srcPath))) {
-        continue;
-      }
+	return currentClosestKeyword;
+};
 
-      const dest = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootBinsDir, name); // Get relative project path with normalized path separators.
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
 
-      const rootProjectRelativePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["relative"])(rootProject.path, srcPath).split(path__WEBPACK_IMPORTED_MODULE_0__["sep"]).join('/');
-      _log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`[${rootProject.name}] ${name} -> ${rootProjectRelativePath}`);
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["mkdirp"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(dest));
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["createSymlink"])(srcPath, dest, 'exec');
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["chmod"])(dest, '755');
-    }
-  }
-}
+convert.rgb.xyz = function (rgb) {
+	let r = rgb[0] / 255;
+	let g = rgb[1] / 255;
+	let b = rgb[2] / 255;
 
-/***/ }),
-/* 231 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	// 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);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readFile", function() { return readFile; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writeFile", function() { return writeFile; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "chmod", function() { return chmod; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mkdirp", function() { return mkdirp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rmdirp", function() { return rmdirp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "unlink", function() { return unlink; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "copyDirectory", function() { return copyDirectory; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isSymlink", function() { return isSymlink; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDirectory", function() { return isDirectory; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFile", function() { return isFile; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createSymlink", function() { return createSymlink; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tryRealpath", function() { return tryRealpath; });
-/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(232);
-/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cmd_shim__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(240);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(132);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(339);
-/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(ncp__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(113);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_5__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+	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 [x * 100, y * 100, z * 100];
+};
 
+convert.rgb.lab = function (rgb) {
+	const xyz = convert.rgb.xyz(rgb);
+	let x = xyz[0];
+	let y = xyz[1];
+	let z = xyz[2];
 
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
+	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);
 
+	const l = (116 * y) - 16;
+	const a = 500 * (x - y);
+	const b = 200 * (y - z);
 
-const lstat = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.lstat);
-const readFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.readFile);
-const writeFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.writeFile);
-const symlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.symlink);
-const chmod = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.chmod);
-const cmdShim = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(cmd_shim__WEBPACK_IMPORTED_MODULE_0___default.a);
-const mkdir = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.mkdir);
-const realpathNative = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.realpath.native);
-const mkdirp = async path => await mkdir(path, {
-  recursive: true
-});
-const rmdirp = async path => await del__WEBPACK_IMPORTED_MODULE_1___default()(path, {
-  force: true
-});
-const unlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.unlink);
-const copyDirectory = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(ncp__WEBPACK_IMPORTED_MODULE_3__["ncp"]);
+	return [l, a, b];
+};
 
-async function statTest(path, block) {
-  try {
-    return block(await lstat(path));
-  } catch (e) {
-    if (e.code === 'ENOENT') {
-      return false;
-    }
+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;
 
-    throw e;
-  }
-}
-/**
- * Test if a path points to a symlink.
- * @param path
- */
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
+	}
 
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
+	}
 
-async function isSymlink(path) {
-  return await statTest(path, stats => stats.isSymbolicLink());
-}
-/**
- * Test if a path points to a directory.
- * @param path
- */
+	const t1 = 2 * l - t2;
 
-async function isDirectory(path) {
-  return await statTest(path, stats => stats.isDirectory());
-}
-/**
- * Test if a path points to a regular file.
- * @param path
- */
+	const rgb = [0, 0, 0];
+	for (let i = 0; i < 3; i++) {
+		t3 = h + 1 / 3 * -(i - 1);
+		if (t3 < 0) {
+			t3++;
+		}
 
-async function isFile(path) {
-  return await statTest(path, stats => stats.isFile());
-}
-/**
- * Create a symlink at dest that points to src. Adapted from
- * https://github.com/lerna/lerna/blob/2f1b87d9e2295f587e4ac74269f714271d8ed428/src/FileSystemUtilities.js#L103.
- *
- * @param src
- * @param dest
- * @param type 'dir', 'file', 'junction', or 'exec'. 'exec' on
- *  windows will use the `cmd-shim` module since symlinks can't be used
- *  for executable files on windows.
- */
+		if (t3 > 1) {
+			t3--;
+		}
 
-async function createSymlink(src, dest, type) {
-  if (process.platform === 'win32') {
-    if (type === 'exec') {
-      await cmdShim(src, dest);
-    } else {
-      await forceCreate(src, dest, type);
-    }
-  } else {
-    const posixType = type === 'exec' ? 'file' : type;
-    const relativeSource = Object(path__WEBPACK_IMPORTED_MODULE_4__["relative"])(Object(path__WEBPACK_IMPORTED_MODULE_4__["dirname"])(dest), src);
-    await forceCreate(relativeSource, dest, posixType);
-  }
-}
+		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;
+		}
 
-async function forceCreate(src, dest, type) {
-  try {
-    // If something exists at `dest` we need to remove it first.
-    await unlink(dest);
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
+		rgb[i] = val * 255;
+	}
 
-  await symlink(src, dest, type);
-}
+	return rgb;
+};
 
-async function tryRealpath(path) {
-  let calculatedPath = path;
+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);
 
-  try {
-    calculatedPath = await realpathNative(path);
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
-  }
+	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);
 
-  return calculatedPath;
-}
+	return [h, sv * 100, v * 100];
+};
 
-/***/ }),
-/* 232 */
-/***/ (function(module, exports, __webpack_require__) {
+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;
 
-// On windows, create a .cmd file.
-// Read the #! in the file to see what it uses.  The vast majority
-// of the time, this will be either:
-// "#!/usr/bin/env <prog> <args...>"
-// or:
-// "#!<prog> <args...>"
-//
-// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
-// @<prog> <args...> %~dp0<target> %*
+	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;
 
-module.exports = cmdShim
-cmdShim.ifExists = cmdShimIfExists
+	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];
+	}
+};
 
-var fs = __webpack_require__(233)
+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;
 
-var mkdir = __webpack_require__(238)
-  , path = __webpack_require__(4)
-  , toBatchSyntax = __webpack_require__(239)
-  , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+=[^ \t]+\s+)*\s*([^ \t]+)(.*)$/
+	l = (2 - s) * v;
+	const lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
 
-function cmdShimIfExists (from, to, cb) {
-  fs.stat(from, function (er) {
-    if (er) return cb()
-    cmdShim(from, to, cb)
-  })
-}
+	return [h, sl * 100, l * 100];
+};
 
-// Try to unlink, but ignore errors.
-// Any problems will surface later.
-function rm (path, cb) {
-  fs.unlink(path, function(er) {
-    cb()
-  })
-}
+// 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;
 
-function cmdShim (from, to, cb) {
-  fs.stat(from, function (er, stat) {
-    if (er)
-      return cb(er)
+	// Wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
+	}
 
-    cmdShim_(from, to, cb)
-  })
-}
+	const i = Math.floor(6 * h);
+	const v = 1 - bl;
+	f = 6 * h - i;
 
-function cmdShim_ (from, to, cb) {
-  var then = times(2, next, cb)
-  rm(to, then)
-  rm(to + ".cmd", then)
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
+	}
 
-  function next(er) {
-    writeShim(from, to, cb)
-  }
-}
+	const n = wh + f * (v - wh); // Linear interpolation
 
-function writeShim (from, to, cb) {
-  // make a cmd file and a sh script
-  // First, check if the bin is a #! of some sort.
-  // If not, then assume it's something that'll be compiled, or some other
-  // sort of script, and just call it directly.
-  mkdir(path.dirname(to), function (er) {
-    if (er)
-      return cb(er)
-    fs.readFile(from, "utf8", function (er, data) {
-      if (er) return writeShim_(from, to, null, null, cb)
-      var firstLine = data.trim().split(/\r*\n/)[0]
-        , shebang = firstLine.match(shebangExpr)
-      if (!shebang) return writeShim_(from, to, null, null, null, cb)
-      var vars = shebang[1] || ""
-        , prog = shebang[2]
-        , args = shebang[3] || ""
-      return writeShim_(from, to, prog, args, vars, cb)
-    })
-  })
-}
+	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 [r * 255, g * 255, b * 255];
+};
 
-function writeShim_ (from, to, prog, args, variables, cb) {
-  var shTarget = path.relative(path.dirname(to), from)
-    , target = shTarget.split("/").join("\\")
-    , longProg
-    , shProg = prog && prog.split("\\").join("/")
-    , shLongProg
-    , pwshProg = shProg && "\"" + shProg + "$exe\""
-    , pwshLongProg
-  shTarget = shTarget.split("\\").join("/")
-  args = args || ""
-  variables = variables || ""
-  if (!prog) {
-    prog = "\"%~dp0\\" + target + "\""
-    shProg = "\"$basedir/" + shTarget + "\""
-    pwshProg = shProg
-    args = ""
-    target = ""
-    shTarget = ""
-  } else {
-    longProg = "\"%~dp0\\" + prog + ".exe\""
-    shLongProg = "\"$basedir/" + prog + "\""
-    pwshLongProg = "\"$basedir/" + prog + "$exe\""
-    target = "\"%~dp0\\" + target + "\""
-    shTarget = "\"$basedir/" + shTarget + "\""
-  }
+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;
 
-  // @SETLOCAL
-  //
-  // @IF EXIST "%~dp0\node.exe" (
-  //   @SET "_prog=%~dp0\node.exe"
-  // ) ELSE (
-  //   @SET "_prog=node"
-  //   @SET PATHEXT=%PATHEXT:;.JS;=;%
-  // )
-  //
-  // "%_prog%" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-  // @ENDLOCAL
-  var cmd
-  if (longProg) {
-    shLongProg = shLongProg.trim();
-    args = args.trim();
-    var variableDeclarationsAsBatch = toBatchSyntax.convertToSetCommands(variables)
-    cmd = "@SETLOCAL\r\n"
-        + variableDeclarationsAsBatch
-        + "\r\n"
-        + "@IF EXIST " + longProg + " (\r\n"
-        + "  @SET \"_prog=" + longProg.replace(/(^")|("$)/g, '') + "\"\r\n"
-        + ") ELSE (\r\n"
-        + "  @SET \"_prog=" + prog.replace(/(^")|("$)/g, '') + "\"\r\n"
-        + "  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n"
-        + ")\r\n"
-        + "\r\n"
-        +  "\"%_prog%\" " + args + " " + target + " %*\r\n"
-        + '@ENDLOCAL\r\n'
-  } else {
-    cmd = "@" + prog + " " + args + " " + target + " %*\r\n"
-  }
+	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);
 
-  // #!/bin/sh
-  // basedir=`dirname "$0"`
-  //
-  // case `uname` in
-  //     *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
-  // esac
-  //
-  // if [ -x "$basedir/node.exe" ]; then
-  //   "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-  //   ret=$?
-  // else
-  //   node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
-  //   ret=$?
-  // fi
-  // exit $ret
+	return [r * 255, g * 255, b * 255];
+};
 
-  var sh = "#!/bin/sh\n"
+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;
 
-  sh = sh
-      + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
-      + "\n"
-      + "case `uname` in\n"
-      + "    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;\n"
-      + "esac\n"
-      + "\n"
+	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);
 
-  if (shLongProg) {
-    sh = sh
-       + "if [ -x "+shLongProg+" ]; then\n"
-       + "  " + variables + shLongProg + " " + args + " " + shTarget + " \"$@\"\n"
-       + "  ret=$?\n"
-       + "else \n"
-       + "  " + variables + shProg + " " + args + " " + shTarget + " \"$@\"\n"
-       + "  ret=$?\n"
-       + "fi\n"
-       + "exit $ret\n"
-  } else {
-    sh = sh
-       + shProg + " " + args + " " + shTarget + " \"$@\"\n"
-       + "exit $?\n"
-  }
+	// Assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * (r ** (1.0 / 2.4))) - 0.055)
+		: r * 12.92;
 
-  // #!/usr/bin/env pwsh
-  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
-  //
-  // $ret=0
-  // $exe = ""
-  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
-  //   # Fix case when both the Windows and Linux builds of Node
-  //   # are installed in the same directory
-  //   $exe = ".exe"
-  // }
-  // if (Test-Path "$basedir/node") {
-  //   & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
-  //   $ret=$LASTEXITCODE
-  // } else {
-  //   & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
-  //   $ret=$LASTEXITCODE
-  // }
-  // exit $ret
-  var pwsh = "#!/usr/bin/env pwsh\n"
-           + "$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n"
-           + "\n"
-           + "$exe=\"\"\n"
-           + "if ($PSVersionTable.PSVersion -lt \"6.0\" -or $IsWindows) {\n"
-           + "  # Fix case when both the Windows and Linux builds of Node\n"
-           + "  # are installed in the same directory\n"
-           + "  $exe=\".exe\"\n"
-           + "}\n"
-  if (shLongProg) {
-    pwsh = pwsh
-         + "$ret=0\n"
-         + "if (Test-Path " + pwshLongProg + ") {\n"
-         + "  & " + pwshLongProg + " " + args + " " + shTarget + " $args\n"
-         + "  $ret=$LASTEXITCODE\n"
-         + "} else {\n"
-         + "  & " + pwshProg + " " + args + " " + shTarget + " $args\n"
-         + "  $ret=$LASTEXITCODE\n"
-         + "}\n"
-         + "exit $ret\n"
-  } else {
-    pwsh = pwsh
-         + "& " + pwshProg + " " + args + " " + shTarget + " $args\n"
-         + "exit $LASTEXITCODE\n"
-  }
+	g = g > 0.0031308
+		? ((1.055 * (g ** (1.0 / 2.4))) - 0.055)
+		: g * 12.92;
 
-  var then = times(3, next, cb)
-  fs.writeFile(to + ".ps1", pwsh, "utf8", then)
-  fs.writeFile(to + ".cmd", cmd, "utf8", then)
-  fs.writeFile(to, sh, "utf8", then)
-  function next () {
-    chmodShim(to, cb)
-  }
-}
+	b = b > 0.0031308
+		? ((1.055 * (b ** (1.0 / 2.4))) - 0.055)
+		: b * 12.92;
 
-function chmodShim (to, cb) {
-  var then = times(2, cb, cb)
-  fs.chmod(to, "0755", then)
-  fs.chmod(to + ".cmd", "0755", then)
-  fs.chmod(to + ".ps1", "0755", then)
-}
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
 
-function times(n, ok, cb) {
-  var errState = null
-  return function(er) {
-    if (!errState) {
-      if (er)
-        cb(errState = er)
-      else if (--n === 0)
-        ok()
-    }
-  }
-}
+	return [r * 255, g * 255, b * 255];
+};
 
+convert.xyz.lab = function (xyz) {
+	let x = xyz[0];
+	let y = xyz[1];
+	let z = xyz[2];
 
-/***/ }),
-/* 233 */
-/***/ (function(module, exports, __webpack_require__) {
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-var fs = __webpack_require__(132)
-var polyfills = __webpack_require__(234)
-var legacy = __webpack_require__(236)
-var clone = __webpack_require__(237)
+	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);
 
-var util = __webpack_require__(113)
+	const l = (116 * y) - 16;
+	const a = 500 * (x - y);
+	const b = 200 * (y - z);
 
-/* istanbul ignore next - node 0.x polyfill */
-var gracefulQueue
-var previousSymbol
+	return [l, a, b];
+};
 
-/* istanbul ignore else - node 0.x polyfill */
-if (typeof Symbol === 'function' && typeof Symbol.for === 'function') {
-  gracefulQueue = Symbol.for('graceful-fs.queue')
-  // This is used in testing by future versions
-  previousSymbol = Symbol.for('graceful-fs.previous')
-} else {
-  gracefulQueue = '___graceful-fs.queue'
-  previousSymbol = '___graceful-fs.previous'
-}
+convert.lab.xyz = function (lab) {
+	const l = lab[0];
+	const a = lab[1];
+	const b = lab[2];
+	let x;
+	let y;
+	let z;
 
-function noop () {}
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
 
-function publishQueue(context, queue) {
-  Object.defineProperty(context, gracefulQueue, {
-    get: function() {
-      return queue
-    }
-  })
-}
+	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;
 
-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)
-  }
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
 
-// Once time initialization
-if (!fs[gracefulQueue]) {
-  // This queue can be shared by multiple loaded instances
-  var queue = global[gracefulQueue] || []
-  publishQueue(fs, queue)
+	return [x, y, z];
+};
 
-  // Patch fs.close/closeSync to shared queue version, because we need
-  // 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.
-  fs.close = (function (fs$close) {
-    function close (fd, cb) {
-      return fs$close.call(fs, fd, function (err) {
-        // This function uses the graceful-fs shared queue
-        if (!err) {
-          retry()
-        }
+convert.lab.lch = function (lab) {
+	const l = lab[0];
+	const a = lab[1];
+	const b = lab[2];
+	let h;
 
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-      })
-    }
+	const hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
 
-    Object.defineProperty(close, previousSymbol, {
-      value: fs$close
-    })
-    return close
-  })(fs.close)
+	if (h < 0) {
+		h += 360;
+	}
 
-  fs.closeSync = (function (fs$closeSync) {
-    function closeSync (fd) {
-      // This function uses the graceful-fs shared queue
-      fs$closeSync.apply(fs, arguments)
-      retry()
-    }
+	const c = Math.sqrt(a * a + b * b);
 
-    Object.defineProperty(closeSync, previousSymbol, {
-      value: fs$closeSync
-    })
-    return closeSync
-  })(fs.closeSync)
+	return [l, c, h];
+};
 
-  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-    process.on('exit', function() {
-      debug(fs[gracefulQueue])
-      __webpack_require__(162).equal(fs[gracefulQueue].length, 0)
-    })
-  }
-}
+convert.lch.lab = function (lch) {
+	const l = lch[0];
+	const c = lch[1];
+	const h = lch[2];
 
-if (!global[gracefulQueue]) {
-  publishQueue(global, fs[gracefulQueue]);
-}
+	const hr = h / 360 * 2 * Math.PI;
+	const a = c * Math.cos(hr);
+	const b = c * Math.sin(hr);
 
-module.exports = patch(clone(fs))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
-    module.exports = patch(fs)
-    fs.__patched = true;
-}
+	return [l, a, b];
+};
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
+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
 
-  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
+	value = Math.round(value / 50);
 
-    return go$readFile(path, options, cb)
+	if (value === 0) {
+		return 30;
+	}
 
-    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()
-        }
-      })
-    }
-  }
+	let ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+	if (value === 2) {
+		ansi += 60;
+	}
 
-    return go$writeFile(path, data, options, cb)
+	return ansi;
+};
 
-    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()
-        }
-      })
-    }
-  }
+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]);
+};
 
-  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
+convert.rgb.ansi256 = function (args) {
+	const r = args[0];
+	const g = args[1];
+	const b = args[2];
 
-    return go$appendFile(path, data, options, cb)
+	// 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 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 (r > 248) {
+			return 231;
+		}
 
-  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 Math.round(((r - 8) / 247) * 24) + 232;
+	}
 
-    return go$readdir(args)
+	const ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
 
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
+	return ansi;
+};
 
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
+convert.ansi16.rgb = function (args) {
+	let color = args % 10;
 
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
-      }
-    }
-  }
+	// Handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
+		}
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
-  }
+		color = color / 10.5 * 255;
 
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
-  }
+		return [color, color, color];
+	}
 
-  var fs$ReadStream = fs.ReadStream
-  if (fs$ReadStream) {
-    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-    ReadStream.prototype.open = ReadStream$open
-  }
+	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;
 
-  var fs$WriteStream = fs.WriteStream
-  if (fs$WriteStream) {
-    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-    WriteStream.prototype.open = WriteStream$open
-  }
+	return [r, g, b];
+};
 
-  Object.defineProperty(fs, 'ReadStream', {
-    get: function () {
-      return ReadStream
-    },
-    set: function (val) {
-      ReadStream = val
-    },
-    enumerable: true,
-    configurable: true
-  })
-  Object.defineProperty(fs, 'WriteStream', {
-    get: function () {
-      return WriteStream
-    },
-    set: function (val) {
-      WriteStream = val
-    },
-    enumerable: true,
-    configurable: true
-  })
+convert.ansi256.rgb = function (args) {
+	// Handle greyscale
+	if (args >= 232) {
+		const c = (args - 232) * 10 + 8;
+		return [c, c, c];
+	}
 
-  // legacy names
-  var FileReadStream = ReadStream
-  Object.defineProperty(fs, 'FileReadStream', {
-    get: function () {
-      return FileReadStream
-    },
-    set: function (val) {
-      FileReadStream = val
-    },
-    enumerable: true,
-    configurable: true
-  })
-  var FileWriteStream = WriteStream
-  Object.defineProperty(fs, 'FileWriteStream', {
-    get: function () {
-      return FileWriteStream
-    },
-    set: function (val) {
-      FileWriteStream = val
-    },
-    enumerable: true,
-    configurable: true
-  })
+	args -= 16;
 
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
-  }
+	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;
 
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
+	return [r, g, b];
+};
 
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
+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 WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
+	const string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-  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)
-      }
-    })
-  }
+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];
+	}
 
-  function createReadStream (path, options) {
-    return new fs.ReadStream(path, options)
-  }
+	let colorString = match[0];
 
-  function createWriteStream (path, options) {
-    return new fs.WriteStream(path, options)
-  }
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(char => {
+			return char + char;
+		}).join('');
+	}
 
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
+	const integer = parseInt(colorString, 16);
+	const r = (integer >> 16) & 0xFF;
+	const g = (integer >> 8) & 0xFF;
+	const b = integer & 0xFF;
 
-    return go$open(path, flags, mode, cb)
+	return [r, g, b];
+};
 
-    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()
-        }
-      })
-    }
-  }
+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;
 
-  return fs
-}
+	if (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
+	}
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  fs[gracefulQueue].push(elem)
-}
+	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;
+	}
 
-function retry () {
-  var elem = fs[gracefulQueue].shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
-  }
-}
+	hue /= 6;
+	hue %= 1;
 
+	return [hue * 360, chroma * 100, grayscale * 100];
+};
 
-/***/ }),
-/* 234 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.hsl.hcg = function (hsl) {
+	const s = hsl[1] / 100;
+	const l = hsl[2] / 100;
 
-var constants = __webpack_require__(235)
+	const c = l < 0.5 ? (2.0 * s * l) : (2.0 * s * (1.0 - l));
 
-var origCwd = process.cwd
-var cwd = null
+	let f = 0;
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
+	}
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+	return [hsl[0], c * 100, f * 100];
+};
 
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-try {
-  process.cwd()
-} catch (er) {}
+convert.hsv.hcg = function (hsv) {
+	const s = hsv[1] / 100;
+	const v = hsv[2] / 100;
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
-}
+	const c = s * v;
+	let f = 0;
 
-module.exports = patch
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
+	}
 
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+	return [hsv[0], c * 100, f * 100];
+};
 
-  // 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)
-  }
+convert.hcg.rgb = function (hcg) {
+	const h = hcg[0] / 360;
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
+	if (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
+	}
 
-  // 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.
+	const pure = [0, 0, 0];
+	const hi = (h % 1) * 6;
+	const v = hi % 1;
+	const w = 1 - v;
+	let mg = 0;
 
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
+	/* 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 */
 
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
+	mg = (1.0 - c) * g;
 
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
+};
 
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+convert.hcg.hsv = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
+	const v = c + g * (1.0 - c);
+	let f = 0;
 
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
+	if (v > 0.0) {
+		f = c / v;
+	}
 
-  // 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 () {}
-  }
+	return [hcg[0], f * 100, v * 100];
+};
 
-  // 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.
+convert.hcg.hsl = function (hcg) {
+	const c = hcg[1] / 100;
+	const g = hcg[2] / 100;
 
-  // 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) {
-    function read (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)
-    }
-
-    // This ensures `util.promisify` works as it does for native `fs.read`.
-    read.__proto__ = fs$read
-    return read
-  })(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)
+	const l = g * (1.0 - c) + 0.5 * c;
+	let s = 0;
 
-  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)
-          })
-        })
-      })
-    }
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
+	}
 
-    fs.lchmodSync = function (path, mode) {
-      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+	return [hcg[0], s * 100, l * 100];
+};
 
-      // 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
-    }
-  }
+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];
+};
 
-  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)
-            })
-          })
-        })
-      }
+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;
 
-      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
-      }
+	if (c < 1) {
+		g = (v - c) / (1 - c);
+	}
 
-    } else {
-      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-      fs.lutimesSync = function () {}
-    }
-  }
+	return [hwb[0], c * 100, g * 100];
+};
 
-  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)
-      })
-    }
-  }
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
 
-  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
-      }
-    }
-  }
+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];
+};
 
-  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)
-      })
-    }
-  }
+convert.gray.hsl = function (args) {
+	return [0, 0, args[0]];
+};
 
-  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
-      }
-    }
-  }
+convert.gray.hsv = convert.gray.hsl;
 
-  function statFix (orig) {
-    if (!orig) return orig
-    // Older versions of Node erroneously returned signed integers for
-    // uid + gid.
-    return function (target, options, cb) {
-      if (typeof options === 'function') {
-        cb = options
-        options = null
-      }
-      function callback (er, stats) {
-        if (stats) {
-          if (stats.uid < 0) stats.uid += 0x100000000
-          if (stats.gid < 0) stats.gid += 0x100000000
-        }
-        if (cb) cb.apply(this, arguments)
-      }
-      return options ? orig.call(fs, target, options, callback)
-        : orig.call(fs, target, callback)
-    }
-  }
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
+};
 
-  function statFixSync (orig) {
-    if (!orig) return orig
-    // Older versions of Node erroneously returned signed integers for
-    // uid + gid.
-    return function (target, options) {
-      var stats = options ? orig.call(fs, target, options)
-        : orig.call(fs, target)
-      if (stats.uid < 0) stats.uid += 0x100000000
-      if (stats.gid < 0) stats.gid += 0x100000000
-      return stats;
-    }
-  }
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
 
-  // 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
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
 
-    if (er.code === "ENOSYS")
-      return true
+convert.gray.hex = function (gray) {
+	const val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	const integer = (val << 16) + (val << 8) + val;
 
-    var nonroot = !process.getuid || process.getuid() !== 0
-    if (nonroot) {
-      if (er.code === "EINVAL" || er.code === "EPERM")
-        return true
-    }
+	const string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-    return false
-  }
-}
+convert.rgb.gray = function (rgb) {
+	const val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
 
 
 /***/ }),
-/* 235 */
-/***/ (function(module, exports) {
-
-module.exports = require("constants");
 
-/***/ }),
-/* 236 */
+/***/ "../../node_modules/ansi-styles/node_modules/color-convert/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(173).Stream
+const conversions = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/conversions.js");
+const route = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/route.js");
 
-module.exports = legacy
+const convert = {};
 
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
+const models = Object.keys(conversions);
 
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
+function wrapRaw(fn) {
+	const wrappedFn = function (...args) {
+		const arg0 = args[0];
+		if (arg0 === undefined || arg0 === null) {
+			return arg0;
+		}
 
-    Stream.call(this);
+		if (arg0.length > 1) {
+			args = arg0;
+		}
 
-    var self = this;
+		return fn(args);
+	};
 
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
+	// Preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
+	return wrappedFn;
+}
 
-    options = options || {};
+function wrapRounded(fn) {
+	const wrappedFn = function (...args) {
+		const arg0 = args[0];
 
-    // 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 (arg0 === undefined || arg0 === null) {
+			return arg0;
+		}
 
-    if (this.encoding) this.setEncoding(this.encoding);
+		if (arg0.length > 1) {
+			args = arg0;
+		}
 
-    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 result = fn(args);
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
+		// 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]);
+			}
+		}
 
-      this.pos = this.start;
-    }
+		return result;
+	};
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
+	// Preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
+	return wrappedFn;
+}
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
+models.forEach(fromModel => {
+	convert[fromModel] = {};
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
 
-    Stream.call(this);
+	const routes = route(fromModel);
+	const routeModels = Object.keys(routes);
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
+	routeModels.forEach(toModel => {
+		const fn = routes[toModel];
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
 
-    options = options || {};
+module.exports = convert;
 
-    // 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');
-      }
+/***/ }),
 
-      this.pos = this.start;
-    }
+/***/ "../../node_modules/ansi-styles/node_modules/color-convert/route.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    this.busy = false;
-    this._queue = [];
+const conversions = __webpack_require__("../../node_modules/ansi-styles/node_modules/color-convert/conversions.js");
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
-  }
-}
+/*
+	This function routes a model to all other models.
 
+	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).
 
-/***/ }),
-/* 237 */
-/***/ (function(module, exports, __webpack_require__) {
+	conversions that are not possible simply are not included.
+*/
 
-"use strict";
+function buildGraph() {
+	const graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	const models = Object.keys(conversions);
 
+	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
+		};
+	}
 
-module.exports = clone
+	return graph;
+}
 
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	const graph = buildGraph();
+	const queue = [fromModel]; // Unshift -> queue -> pop
 
-  if (obj instanceof Object)
-    var copy = { __proto__: obj.__proto__ }
-  else
-    var copy = Object.create(null)
+	graph[fromModel].distance = 0;
 
-  Object.getOwnPropertyNames(obj).forEach(function (key) {
-    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
-  })
+	while (queue.length) {
+		const current = queue.pop();
+		const adjacents = Object.keys(conversions[current]);
 
-  return copy
-}
+		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);
+			}
+		}
+	}
 
-/***/ }),
-/* 238 */
-/***/ (function(module, exports, __webpack_require__) {
+	return graph;
+}
 
-var path = __webpack_require__(4);
-var fs = __webpack_require__(132);
-var _0777 = parseInt('0777', 8);
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
+}
 
-module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
+function wrapConversion(toModel, graph) {
+	const path = [graph[toModel].parent, toModel];
+	let fn = conversions[graph[toModel].parent][toModel];
 
-function mkdirP (p, opts, f, made) {
-    if (typeof opts === 'function') {
-        f = opts;
-        opts = {};
-    }
-    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':
-                if (path.dirname(p) === p) return cb(er);
-                mkdirP(path.dirname(p), opts, function (er, made) {
-                    if (er) cb(er, made);
-                    else mkdirP(p, opts, cb, made);
-                });
-                break;
+	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;
+	}
 
-            // 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;
-        }
-    });
+	fn.conversion = path;
+	return fn;
 }
 
-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 (fromModel) {
+	const graph = deriveBFS(fromModel);
+	const conversion = {};
 
-    p = path.resolve(p);
+	const models = Object.keys(graph);
+	for (let len = models.length, i = 0; i < len; i++) {
+		const toModel = models[i];
+		const node = graph[toModel];
 
-    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;
+		if (node.parent === null) {
+			// No possible conversion, or this node is the source model.
+			continue;
+		}
 
-            // 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;
-        }
-    }
+		conversion[toModel] = wrapConversion(toModel, graph);
+	}
 
-    return made;
+	return conversion;
 };
 
 
-/***/ }),
-/* 239 */
-/***/ (function(module, exports) {
-
-exports.replaceDollarWithPercentPair = replaceDollarWithPercentPair
-exports.convertToSetCommand = convertToSetCommand
-exports.convertToSetCommands = convertToSetCommands
-
-function convertToSetCommand(key, value) {
-    var line = ""
-    key = key || ""
-    key = key.trim()
-    value = value || ""
-    value = value.trim()
-    if(key && value && value.length > 0) {
-        line = "@SET " + key + "=" + replaceDollarWithPercentPair(value) + "\r\n"
-    }
-    return line
-}
-
-function extractVariableValuePairs(declarations) {
-    var pairs = {}
-    declarations.map(function(declaration) {
-        var split = declaration.split("=")
-        pairs[split[0]]=split[1]
-    })
-    return pairs
-}
-
-function convertToSetCommands(variableString) {
-    var variableValuePairs = extractVariableValuePairs(variableString.split(" "))
-    var variableDeclarationsAsBatch = ""
-    Object.keys(variableValuePairs).forEach(function (key) {
-        variableDeclarationsAsBatch += convertToSetCommand(key, variableValuePairs[key])
-    })
-    return variableDeclarationsAsBatch
-}
-
-function replaceDollarWithPercentPair(value) {
-    var dollarExpressions = /\$\{?([^\$@#\?\- \t{}:]+)\}?/g
-    var result = ""
-    var startIndex = 0
-    value = value || ""
-    do {
-        var match = dollarExpressions.exec(value)
-        if(match) {
-            var betweenMatches = value.substring(startIndex, match.index) || ""
-            result +=  betweenMatches + "%" + match[1] + "%"
-            startIndex = dollarExpressions.lastIndex
-        }
-    } while (dollarExpressions.lastIndex > 0)
-    result += value.substr(startIndex)
-    return result
-}
-
-
-
 
 /***/ }),
-/* 240 */
+
+/***/ "../../node_modules/arr-diff/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/*!
+ * arr-diff <https://github.com/jonschlinkert/arr-diff>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-const {promisify} = __webpack_require__(113);
-const path = __webpack_require__(4);
-const globby = __webpack_require__(241);
-const isGlob = __webpack_require__(266);
-const slash = __webpack_require__(330);
-const gracefulFs = __webpack_require__(233);
-const isPathCwd = __webpack_require__(332);
-const isPathInside = __webpack_require__(333);
-const rimraf = __webpack_require__(334);
-const pMap = __webpack_require__(335);
 
-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
+module.exports = function diff(arr/*, arrays*/) {
+  var len = arguments.length;
+  var idx = 0;
+  while (++idx < len) {
+    arr = diffArray(arr, arguments[idx]);
+  }
+  return arr;
 };
 
-function safeCheck(file, cwd) {
-	if (isPathCwd(file)) {
-		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
-	}
+function diffArray(one, two) {
+  if (!Array.isArray(two)) {
+    return one.slice();
+  }
 
-	if (!isPathInside(file, cwd)) {
-		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
-	}
-}
+  var tlen = two.length
+  var olen = one.length;
+  var idx = -1;
+  var arr = [];
 
-function normalizePatterns(patterns) {
-	patterns = Array.isArray(patterns) ? patterns : [patterns];
+  while (++idx < olen) {
+    var ele = one[idx];
 
-	patterns = patterns.map(pattern => {
-		if (process.platform === 'win32' && isGlob(pattern) === false) {
-			return slash(pattern);
-		}
+    var hasEle = false;
+    for (var i = 0; i < tlen; i++) {
+      var val = two[i];
 
-		return pattern;
-	});
+      if (ele === val) {
+        hasEle = true;
+        break;
+      }
+    }
 
-	return patterns;
+    if (hasEle === false) {
+      arr.push(ele);
+    }
+  }
+  return arr;
 }
 
-module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
 
-	patterns = normalizePatterns(patterns);
+/***/ }),
 
-	const files = (await globby(patterns, options))
-		.sort((a, b) => b.localeCompare(a));
+/***/ "../../node_modules/arr-flatten/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	const mapper = async file => {
-		file = path.resolve(cwd, file);
+"use strict";
+/*!
+ * arr-flatten <https://github.com/jonschlinkert/arr-flatten>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-		if (!force) {
-			safeCheck(file, cwd);
-		}
 
-		if (!dryRun) {
-			await rimrafP(file, rimrafOptions);
-		}
 
-		return file;
-	};
+module.exports = function (arr) {
+  return flat(arr, []);
+};
 
-	const removedFiles = await pMap(files, mapper, options);
+function flat(arr, res) {
+  var i = 0, cur;
+  var len = arr.length;
+  for (; i < len; i++) {
+    cur = arr[i];
+    Array.isArray(cur) ? flat(cur, res) : res.push(cur);
+  }
+  return res;
+}
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
 
-	return removedFiles;
-};
+/***/ }),
 
-module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
+/***/ "../../node_modules/arr-union/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	patterns = normalizePatterns(patterns);
+"use strict";
 
-	const files = globby.sync(patterns, options)
-		.sort((a, b) => b.localeCompare(a));
 
-	const removedFiles = files.map(file => {
-		file = path.resolve(cwd, file);
+module.exports = function union(init) {
+  if (!Array.isArray(init)) {
+    throw new TypeError('arr-union expects the first argument to be an array.');
+  }
 
-		if (!force) {
-			safeCheck(file, cwd);
-		}
+  var len = arguments.length;
+  var i = 0;
 
-		if (!dryRun) {
-			rimraf.sync(file, rimrafOptions);
-		}
+  while (++i < len) {
+    var arg = arguments[i];
+    if (!arg) continue;
 
-		return file;
-	});
+    if (!Array.isArray(arg)) {
+      arg = [arg];
+    }
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
+    for (var j = 0; j < arg.length; j++) {
+      var ele = arg[j];
 
-	return removedFiles;
+      if (init.indexOf(ele) >= 0) {
+        continue;
+      }
+      init.push(ele);
+    }
+  }
+  return init;
 };
 
 
 /***/ }),
-/* 241 */
+
+/***/ "../../node_modules/array-differ/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const fs = __webpack_require__(132);
-const arrayUnion = __webpack_require__(242);
-const merge2 = __webpack_require__(243);
-const glob = __webpack_require__(244);
-const fastGlob = __webpack_require__(257);
-const dirGlob = __webpack_require__(326);
-const gitignore = __webpack_require__(328);
-const {FilterStream, UniqueStream} = __webpack_require__(331);
-
-const DEFAULT_FILTER = () => false;
-
-const isNegative = pattern => pattern[0] === '!';
 
-const assertPatternsInput = patterns => {
-	if (!patterns.every(pattern => typeof pattern === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
+const arrayDiffer = (array, ...values) => {
+	const rest = new Set([].concat(...values));
+	return array.filter(element => !rest.has(element));
 };
 
-const checkCwdOption = (options = {}) => {
-	if (!options.cwd) {
-		return;
-	}
+module.exports = arrayDiffer;
 
-	let stat;
-	try {
-		stat = fs.statSync(options.cwd);
-	} catch (_) {
-		return;
-	}
 
-	if (!stat.isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
-	}
-};
+/***/ }),
 
-const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
+/***/ "../../node_modules/array-union/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
+"use strict";
 
-	const globTasks = [];
 
-	taskOptions = {
-		ignore: [],
-		expandDirectories: true,
-		...taskOptions
-	};
+module.exports = (...arguments_) => {
+	return [...new Set([].concat(...arguments_))];
+};
 
-	for (const [index, pattern] of patterns.entries()) {
-		if (isNegative(pattern)) {
-			continue;
-		}
 
-		const ignore = patterns
-			.slice(index)
-			.filter(isNegative)
-			.map(pattern => pattern.slice(1));
+/***/ }),
 
-		const options = {
-			...taskOptions,
-			ignore: taskOptions.ignore.concat(ignore)
-		};
+/***/ "../../node_modules/array-uniq/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		globTasks.push({pattern, options});
-	}
+"use strict";
 
-	return globTasks;
-};
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
-	}
+// there's 3 implementations written in increasing order of efficiency
 
-	if (Array.isArray(task.options.expandDirectories)) {
-		options = {
-			...options,
-			files: task.options.expandDirectories
-		};
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = {
-			...options,
-			...task.options.expandDirectories
-		};
+// 1 - no Set type is defined
+function uniqNoSet(arr) {
+	var ret = [];
+
+	for (var i = 0; i < arr.length; i++) {
+		if (ret.indexOf(arr[i]) === -1) {
+			ret.push(arr[i]);
+		}
 	}
 
-	return fn(task.pattern, options);
-};
+	return ret;
+}
 
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+// 2 - a simple Set type is defined
+function uniqSet(arr) {
+	var seen = new Set();
+	return arr.filter(function (el) {
+		if (!seen.has(el)) {
+			seen.add(el);
+			return true;
+		}
 
-const getFilterSync = options => {
-	return options && options.gitignore ?
-		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
-		DEFAULT_FILTER;
-};
+		return false;
+	});
+}
 
-const globToTask = task => glob => {
-	const {options} = task;
-	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
-		options.ignore = dirGlob.sync(options.ignore);
-	}
+// 3 - a standard Set type is defined and it has a forEach method
+function uniqSetWithForEach(arr) {
+	var ret = [];
 
-	return {
-		pattern: glob,
-		options
-	};
-};
+	(new Set(arr)).forEach(function (el) {
+		ret.push(el);
+	});
 
-module.exports = async (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+	return ret;
+}
 
-	const getFilter = async () => {
-		return options && options.gitignore ?
-			gitignore({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+// V8 currently has a broken implementation
+// https://github.com/joyent/node/issues/8449
+function doesForEachActuallyWork() {
+	var ret = false;
 
-	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)));
-		}));
+	(new Set([true])).forEach(function (el) {
+		ret = el;
+	});
 
-		return arrayUnion(...tasks);
-	};
+	return ret === true;
+}
 
-	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
-	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+if ('Set' in global) {
+	if (typeof Set.prototype.forEach === 'function' && doesForEachActuallyWork()) {
+		module.exports = uniqSetWithForEach;
+	} else {
+		module.exports = uniqSet;
+	}
+} else {
+	module.exports = uniqNoSet;
+}
 
-	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
-};
 
-module.exports.sync = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+/***/ }),
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+/***/ "../../node_modules/array-unique/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	const filter = getFilterSync(options);
+"use strict";
+/*!
+ * array-unique <https://github.com/jonschlinkert/array-unique>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-	return tasks.reduce(
-		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
-		[]
-	).filter(path_ => !filter(path_));
-};
 
-module.exports.stream = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+module.exports = function unique(arr) {
+  if (!Array.isArray(arr)) {
+    throw new TypeError('array-unique expects an array.');
+  }
 
-	const filter = getFilterSync(options);
-	const filterStream = new FilterStream(p => !filter(p));
-	const uniqueStream = new UniqueStream();
+  var len = arr.length;
+  var i = -1;
 
-	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
-		.pipe(filterStream)
-		.pipe(uniqueStream);
+  while (i++ < len) {
+    var j = i + 1;
+
+    for (; j < arr.length; ++j) {
+      if (arr[i] === arr[j]) {
+        arr.splice(j--, 1);
+      }
+    }
+  }
+  return arr;
 };
 
-module.exports.generateGlobTasks = generateGlobTasks;
+module.exports.immutable = function uniqueImmutable(arr) {
+  if (!Array.isArray(arr)) {
+    throw new TypeError('array-unique expects an array.');
+  }
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => glob.hasMagic(pattern, options));
+  var arrLen = arr.length;
+  var newArr = new Array(arrLen);
 
-module.exports.gitignore = gitignore;
+  for (var i = 0; i < arrLen; i++) {
+    newArr[i] = arr[i];
+  }
+
+  return module.exports(newArr);
+};
 
 
 /***/ }),
-/* 242 */
+
+/***/ "../../node_modules/arrify/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = (...arguments_) => {
-	return [...new Set([].concat(...arguments_))];
+const arrify = value => {
+	if (value === null || value === undefined) {
+		return [];
+	}
+
+	if (Array.isArray(value)) {
+		return value;
+	}
+
+	if (typeof value === 'string') {
+		return [value];
+	}
+
+	if (typeof value[Symbol.iterator] === 'function') {
+		return [...value];
+	}
+
+	return [value];
 };
 
+module.exports = arrify;
+
 
 /***/ }),
-/* 243 */
+
+/***/ "../../node_modules/assign-symbols/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-/*
- * merge2
- * https://github.com/teambition/merge2
+/*!
+ * assign-symbols <https://github.com/jonschlinkert/assign-symbols>
  *
- * Copyright (c) 2014-2020 Teambition
- * Licensed under the MIT license.
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
-const Stream = __webpack_require__(173)
-const PassThrough = Stream.PassThrough
-const slice = Array.prototype.slice
 
-module.exports = merge2
 
-function merge2 () {
-  const streamsQueue = []
-  const args = slice.call(arguments)
-  let merging = false
-  let options = args[args.length - 1]
 
-  if (options && !Array.isArray(options) && options.pipe == null) {
-    args.pop()
-  } else {
-    options = {}
+module.exports = function(receiver, objects) {
+  if (receiver === null || typeof receiver === 'undefined') {
+    throw new TypeError('expected first argument to be an object.');
   }
 
-  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
+  if (typeof objects === 'undefined' || typeof Symbol === 'undefined') {
+    return receiver;
   }
-  const mergedStream = PassThrough(options)
 
-  function addStream () {
-    for (let i = 0, len = arguments.length; i < len; i++) {
-      streamsQueue.push(pauseStreams(arguments[i], options))
-    }
-    mergeStream()
-    return this
+  if (typeof Object.getOwnPropertySymbols !== 'function') {
+    return receiver;
   }
 
-  function mergeStream () {
-    if (merging) {
-      return
-    }
-    merging = true
+  var isEnumerable = Object.prototype.propertyIsEnumerable;
+  var target = Object(receiver);
+  var len = arguments.length, i = 0;
 
-    let streams = streamsQueue.shift()
-    if (!streams) {
-      process.nextTick(endStream)
-      return
-    }
-    if (!Array.isArray(streams)) {
-      streams = [streams]
-    }
+  while (++i < len) {
+    var provider = Object(arguments[i]);
+    var names = Object.getOwnPropertySymbols(provider);
 
-    let pipesCount = streams.length + 1
+    for (var j = 0; j < names.length; j++) {
+      var key = names[j];
 
-    function next () {
-      if (--pipesCount > 0) {
-        return
+      if (isEnumerable.call(provider, key)) {
+        target[key] = provider[key];
       }
-      merging = false
-      mergeStream()
     }
+  }
+  return target;
+};
 
-    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()
-      }
-
-      stream.on('merge2UnpipeEnd', onend)
-      stream.on('end', onend)
-
-      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()
-  }
+/***/ "../../node_modules/atob/node-atob.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  function endStream () {
-    merging = false
-    // emit 'queueDrain' when all streams merged.
-    mergedStream.emit('queueDrain')
-    if (doEnd) {
-      mergedStream.end()
-    }
-  }
+"use strict";
 
-  mergedStream.setMaxListeners(0)
-  mergedStream.add = addStream
-  mergedStream.on('unpipe', function (stream) {
-    stream.emit('merge2UnpipeEnd')
-  })
 
-  if (args.length) {
-    addStream.apply(null, args)
-  }
-  return mergedStream
+function atob(str) {
+  return Buffer.from(str, 'base64').toString('binary');
 }
 
-// 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
-}
+module.exports = atob.atob = atob;
 
 
 /***/ }),
-/* 244 */
-/***/ (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.
+/***/ "../../node_modules/axios/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = glob
+module.exports = __webpack_require__("../../node_modules/axios/lib/axios.js");
 
-var rp = __webpack_require__(245)
-var minimatch = __webpack_require__(247)
-var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(251)
-var EE = __webpack_require__(164).EventEmitter
-var path = __webpack_require__(4)
-var assert = __webpack_require__(162)
-var isAbsolute = __webpack_require__(253)
-var globSync = __webpack_require__(254)
-var common = __webpack_require__(255)
-var setopts = common.setopts
-var ownProp = common.ownProp
-var inflight = __webpack_require__(256)
-var util = __webpack_require__(113)
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+/***/ }),
 
-var once = __webpack_require__(169)
+/***/ "../../node_modules/axios/lib/adapters/http.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
+"use strict";
 
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
-  }
 
-  return new Glob(pattern, options, cb)
-}
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var settle = __webpack_require__("../../node_modules/axios/lib/core/settle.js");
+var buildFullPath = __webpack_require__("../../node_modules/axios/lib/core/buildFullPath.js");
+var buildURL = __webpack_require__("../../node_modules/axios/lib/helpers/buildURL.js");
+var http = __webpack_require__("http");
+var https = __webpack_require__("https");
+var httpFollow = __webpack_require__("../../node_modules/follow-redirects/index.js").http;
+var httpsFollow = __webpack_require__("../../node_modules/follow-redirects/index.js").https;
+var url = __webpack_require__("url");
+var zlib = __webpack_require__("zlib");
+var pkg = __webpack_require__("../../node_modules/axios/package.json");
+var createError = __webpack_require__("../../node_modules/axios/lib/core/createError.js");
+var enhanceError = __webpack_require__("../../node_modules/axios/lib/core/enhanceError.js");
 
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
+var isHttps = /https:?/;
 
-// old api surface
-glob.glob = glob
+/**
+ *
+ * @param {http.ClientRequestArgs} options
+ * @param {AxiosProxyConfig} proxy
+ * @param {string} location
+ */
+function setProxy(options, proxy, location) {
+  options.hostname = proxy.host;
+  options.host = proxy.host;
+  options.port = proxy.port;
+  options.path = location;
 
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
+  // Basic proxy authorization
+  if (proxy.auth) {
+    var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64');
+    options.headers['Proxy-Authorization'] = 'Basic ' + base64;
   }
 
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
-  }
-  return origin
+  // If a proxy is used, any redirects must also pass through the proxy
+  options.beforeRedirect = function beforeRedirect(redirection) {
+    redirection.headers.host = redirection.host;
+    setProxy(redirection, proxy, redirection.href);
+  };
 }
 
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
+/*eslint consistent-return:0*/
+module.exports = function httpAdapter(config) {
+  return new Promise(function dispatchHttpRequest(resolvePromise, rejectPromise) {
+    var resolve = function resolve(value) {
+      resolvePromise(value);
+    };
+    var reject = function reject(value) {
+      rejectPromise(value);
+    };
+    var data = config.data;
+    var headers = config.headers;
 
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
+    // Set User-Agent (required by some servers)
+    // Only set header if it hasn't been set in config
+    // See https://github.com/axios/axios/issues/69
+    if (!headers['User-Agent'] && !headers['user-agent']) {
+      headers['User-Agent'] = 'axios/' + pkg.version;
+    }
 
-  if (!pattern)
-    return false
+    if (data && !utils.isStream(data)) {
+      if (Buffer.isBuffer(data)) {
+        // Nothing to do...
+      } else if (utils.isArrayBuffer(data)) {
+        data = Buffer.from(new Uint8Array(data));
+      } else if (utils.isString(data)) {
+        data = Buffer.from(data, 'utf-8');
+      } else {
+        return reject(createError(
+          'Data after transformation must be a string, an ArrayBuffer, a Buffer, or a Stream',
+          config
+        ));
+      }
 
-  if (set.length > 1)
-    return true
+      // Add Content-Length header if data exists
+      headers['Content-Length'] = data.length;
+    }
 
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
-  }
+    // HTTP basic authentication
+    var auth = undefined;
+    if (config.auth) {
+      var username = config.auth.username || '';
+      var password = config.auth.password || '';
+      auth = username + ':' + password;
+    }
 
-  return false
-}
+    // Parse url
+    var fullPath = buildFullPath(config.baseURL, config.url);
+    var parsed = url.parse(fullPath);
+    var protocol = parsed.protocol || 'http:';
 
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
-  }
+    if (!auth && parsed.auth) {
+      var urlAuth = parsed.auth.split(':');
+      var urlUsername = urlAuth[0] || '';
+      var urlPassword = urlAuth[1] || '';
+      auth = urlUsername + ':' + urlPassword;
+    }
 
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
-  }
+    if (auth) {
+      delete headers.Authorization;
+    }
 
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
+    var isHttpsRequest = isHttps.test(protocol);
+    var agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
 
-  setopts(this, pattern, options)
-  this._didRealPath = false
+    var options = {
+      path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
+      method: config.method.toUpperCase(),
+      headers: headers,
+      agent: agent,
+      agents: { http: config.httpAgent, https: config.httpsAgent },
+      auth: auth
+    };
 
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
+    if (config.socketPath) {
+      options.socketPath = config.socketPath;
+    } else {
+      options.hostname = parsed.hostname;
+      options.port = parsed.port;
+    }
 
-  // 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)
+    var proxy = config.proxy;
+    if (!proxy && proxy !== false) {
+      var proxyEnv = protocol.slice(0, -1) + '_proxy';
+      var proxyUrl = process.env[proxyEnv] || process.env[proxyEnv.toUpperCase()];
+      if (proxyUrl) {
+        var parsedProxyUrl = url.parse(proxyUrl);
+        var noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
+        var shouldProxy = true;
 
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
-  }
+        if (noProxyEnv) {
+          var noProxy = noProxyEnv.split(',').map(function trim(s) {
+            return s.trim();
+          });
 
-  var self = this
-  this._processing = 0
+          shouldProxy = !noProxy.some(function proxyMatch(proxyElement) {
+            if (!proxyElement) {
+              return false;
+            }
+            if (proxyElement === '*') {
+              return true;
+            }
+            if (proxyElement[0] === '.' &&
+                parsed.hostname.substr(parsed.hostname.length - proxyElement.length) === proxyElement) {
+              return true;
+            }
 
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
+            return parsed.hostname === proxyElement;
+          });
+        }
 
-  if (this.noprocess)
-    return this
+        if (shouldProxy) {
+          proxy = {
+            host: parsedProxyUrl.hostname,
+            port: parsedProxyUrl.port,
+            protocol: parsedProxyUrl.protocol
+          };
 
-  if (n === 0)
-    return done()
+          if (parsedProxyUrl.auth) {
+            var proxyUrlAuth = parsedProxyUrl.auth.split(':');
+            proxy.auth = {
+              username: proxyUrlAuth[0],
+              password: proxyUrlAuth[1]
+            };
+          }
+        }
+      }
+    }
 
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
-  }
-  sync = false
+    if (proxy) {
+      options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : '');
+      setProxy(options, proxy, protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path);
+    }
 
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
-      } else {
-        self._finish()
+    var transport;
+    var isHttpsProxy = isHttpsRequest && (proxy ? isHttps.test(proxy.protocol) : true);
+    if (config.transport) {
+      transport = config.transport;
+    } else if (config.maxRedirects === 0) {
+      transport = isHttpsProxy ? https : http;
+    } else {
+      if (config.maxRedirects) {
+        options.maxRedirects = config.maxRedirects;
       }
+      transport = isHttpsProxy ? httpsFollow : httpFollow;
     }
-  }
-}
 
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
+    if (config.maxBodyLength > -1) {
+      options.maxBodyLength = config.maxBodyLength;
+    }
 
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
+    // Create the request
+    var req = transport.request(options, function handleResponse(res) {
+      if (req.aborted) return;
 
-  common.finish(this)
-  this.emit('end', this.found)
-}
+      // uncompress the response body transparently if required
+      var stream = res;
 
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
+      // return the last request in case of redirects
+      var lastRequest = res.req || req;
 
-  this._didRealpath = true
 
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
+      // if no content, is HEAD request or decompress disabled we should not decompress
+      if (res.statusCode !== 204 && lastRequest.method !== 'HEAD' && config.decompress !== false) {
+        switch (res.headers['content-encoding']) {
+        /*eslint default-case:0*/
+        case 'gzip':
+        case 'compress':
+        case 'deflate':
+        // add the unzipper to the body stream processing pipeline
+          stream = stream.pipe(zlib.createUnzip());
 
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
+          // remove the content-encoding in order to not confuse downstream operations
+          delete res.headers['content-encoding'];
+          break;
+        }
+      }
 
-  function next () {
-    if (--n === 0)
-      self._finish()
-  }
-}
+      var response = {
+        status: res.statusCode,
+        statusText: res.statusMessage,
+        headers: res.headers,
+        config: config,
+        request: lastRequest
+      };
 
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
+      if (config.responseType === 'stream') {
+        response.data = stream;
+        settle(resolve, reject, response);
+      } else {
+        var responseBuffer = [];
+        stream.on('data', function handleStreamData(chunk) {
+          responseBuffer.push(chunk);
 
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
+          // make sure the content length is not over the maxContentLength if specified
+          if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
+            stream.destroy();
+            reject(createError('maxContentLength size of ' + config.maxContentLength + ' exceeded',
+              config, null, lastRequest));
+          }
+        });
 
-  if (n === 0)
-    return cb()
+        stream.on('error', function handleStreamError(err) {
+          if (req.aborted) return;
+          reject(enhanceError(err, config, null, lastRequest));
+        });
 
-  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
+        stream.on('end', function handleStreamEnd() {
+          var responseData = Buffer.concat(responseBuffer);
+          if (config.responseType !== 'arraybuffer') {
+            responseData = responseData.toString(config.responseEncoding);
+            if (!config.responseEncoding || config.responseEncoding === 'utf8') {
+              responseData = utils.stripBOM(responseData);
+            }
+          }
 
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
+          response.data = responseData;
+          settle(resolve, reject, response);
+        });
       }
-    })
-  })
-}
-
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+    });
 
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+    // Handle errors
+    req.on('error', function handleRequestError(err) {
+      if (req.aborted && err.code !== 'ERR_FR_TOO_MANY_REDIRECTS') return;
+      reject(enhanceError(err, config, null, req));
+    });
 
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
+    // Handle request timeout
+    if (config.timeout) {
+      // Sometime, the response will be very slow, and does not respond, the connect event will be block by event loop system.
+      // And timer callback will be fired, and abort() will be invoked before connection, then get "socket hang up" and code ECONNRESET.
+      // At this time, if we have a large number of request, nodejs will hang up some socket on background. and the number will up and up.
+      // And then these socket which be hang up will devoring CPU little by little.
+      // ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect.
+      req.setTimeout(config.timeout, function handleRequestTimeout() {
+        req.abort();
+        reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED', req));
+      });
+    }
 
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
-  }
-}
+    if (config.cancelToken) {
+      // Handle cancellation
+      config.cancelToken.promise.then(function onCanceled(cancel) {
+        if (req.aborted) return;
 
-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])
-      }
+        req.abort();
+        reject(cancel);
+      });
     }
-    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])
-      }
+
+    // Send the request
+    if (utils.isStream(data)) {
+      data.on('error', function handleStreamError(err) {
+        reject(enhanceError(err, config, null, req));
+      }).pipe(req);
+    } else {
+      req.end(data);
     }
-  }
-}
+  });
+};
 
-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
-  }
+/***/ "../../node_modules/axios/lib/adapters/xhr.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  //console.error('PROCESS %d', this._processing, pattern)
+"use strict";
 
-  // 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.
 
-  // 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
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var settle = __webpack_require__("../../node_modules/axios/lib/core/settle.js");
+var cookies = __webpack_require__("../../node_modules/axios/lib/helpers/cookies.js");
+var buildURL = __webpack_require__("../../node_modules/axios/lib/helpers/buildURL.js");
+var buildFullPath = __webpack_require__("../../node_modules/axios/lib/core/buildFullPath.js");
+var parseHeaders = __webpack_require__("../../node_modules/axios/lib/helpers/parseHeaders.js");
+var isURLSameOrigin = __webpack_require__("../../node_modules/axios/lib/helpers/isURLSameOrigin.js");
+var createError = __webpack_require__("../../node_modules/axios/lib/core/createError.js");
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+module.exports = function xhrAdapter(config) {
+  return new Promise(function dispatchXhrRequest(resolve, reject) {
+    var requestData = config.data;
+    var requestHeaders = config.headers;
 
-    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 (utils.isFormData(requestData)) {
+      delete requestHeaders['Content-Type']; // Let the browser set it
+    }
 
-  var remain = pattern.slice(n)
+    var request = new XMLHttpRequest();
 
-  // 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
+    // HTTP basic authentication
+    if (config.auth) {
+      var username = config.auth.username || '';
+      var password = config.auth.password ? unescape(encodeURIComponent(config.auth.password)) : '';
+      requestHeaders.Authorization = 'Basic ' + btoa(username + ':' + password);
+    }
 
-  var abs = this._makeAbs(read)
+    var fullPath = buildFullPath(config.baseURL, config.url);
+    request.open(config.method.toUpperCase(), buildURL(fullPath, config.params, config.paramsSerializer), true);
 
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
+    // Set the request timeout in MS
+    request.timeout = config.timeout;
 
-  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)
-}
+    // Listen for ready state
+    request.onreadystatechange = function handleLoad() {
+      if (!request || request.readyState !== 4) {
+        return;
+      }
 
-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)
-  })
-}
+      // The request errored out and we didn't get a response, this will be
+      // handled by onerror instead
+      // With one exception: request that using file: protocol, most browsers
+      // will return status as 0 even though it's a successful request
+      if (request.status === 0 && !(request.responseURL && request.responseURL.indexOf('file:') === 0)) {
+        return;
+      }
 
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+      // Prepare the response
+      var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null;
+      var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response;
+      var response = {
+        data: responseData,
+        status: request.status,
+        statusText: request.statusText,
+        headers: responseHeaders,
+        config: config,
+        request: request
+      };
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
+      settle(resolve, reject, response);
 
-  // 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) === '.'
+      // Clean up request
+      request = null;
+    };
 
-  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)
+    // Handle browser request cancellation (as opposed to a manual cancellation)
+    request.onabort = function handleAbort() {
+      if (!request) {
+        return;
       }
-      if (m)
-        matchedEntries.push(e)
-    }
-  }
 
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+      reject(createError('Request aborted', config, 'ECONNABORTED', request));
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
+      // Clean up request
+      request = null;
+    };
 
-  // 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.
+    // Handle low level network errors
+    request.onerror = function handleError() {
+      // Real errors are hidden from us by the browser
+      // onerror should only fire if it's a network error
+      reject(createError('Network Error', config, null, request));
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+      // Clean up request
+      request = null;
+    };
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
+    // Handle timeout
+    request.ontimeout = function handleTimeout() {
+      var timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded';
+      if (config.timeoutErrorMessage) {
+        timeoutErrorMessage = config.timeoutErrorMessage;
       }
+      reject(createError(timeoutErrorMessage, config, 'ECONNABORTED',
+        request));
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
+      // Clean up request
+      request = null;
+    };
+
+    // Add xsrf header
+    // This is only done if running in a standard browser environment.
+    // Specifically not if we're in a web worker, or react-native.
+    if (utils.isStandardBrowserEnv()) {
+      // Add xsrf header
+      var xsrfValue = (config.withCredentials || isURLSameOrigin(fullPath)) && config.xsrfCookieName ?
+        cookies.read(config.xsrfCookieName) :
+        undefined;
+
+      if (xsrfValue) {
+        requestHeaders[config.xsrfHeaderName] = xsrfValue;
       }
-      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
+    // Add headers to the request
+    if ('setRequestHeader' in request) {
+      utils.forEach(requestHeaders, function setRequestHeader(val, key) {
+        if (typeof requestData === 'undefined' && key.toLowerCase() === 'content-type') {
+          // Remove Content-Type if data is undefined
+          delete requestHeaders[key];
+        } else {
+          // Otherwise add header to the request
+          request.setRequestHeader(key, val);
+        }
+      });
     }
-    this._process([e].concat(remain), index, inGlobStar, cb)
-  }
-  cb()
-}
 
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
+    // Add withCredentials to request if needed
+    if (!utils.isUndefined(config.withCredentials)) {
+      request.withCredentials = !!config.withCredentials;
+    }
 
-  if (isIgnored(this, e))
-    return
+    // Add responseType to request if needed
+    if (config.responseType) {
+      try {
+        request.responseType = config.responseType;
+      } catch (e) {
+        // Expected DOMException thrown by browsers not compatible XMLHttpRequest Level 2.
+        // But, this can be suppressed for 'json' type as it can be parsed by default 'transformResponse' function.
+        if (config.responseType !== 'json') {
+          throw e;
+        }
+      }
+    }
 
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
-  }
+    // Handle progress if needed
+    if (typeof config.onDownloadProgress === 'function') {
+      request.addEventListener('progress', config.onDownloadProgress);
+    }
 
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+    // Not all browsers support upload events
+    if (typeof config.onUploadProgress === 'function' && request.upload) {
+      request.upload.addEventListener('progress', config.onUploadProgress);
+    }
 
-  if (this.mark)
-    e = this._mark(e)
+    if (config.cancelToken) {
+      // Handle cancellation
+      config.cancelToken.promise.then(function onCanceled(cancel) {
+        if (!request) {
+          return;
+        }
 
-  if (this.absolute)
-    e = abs
+        request.abort();
+        reject(cancel);
+        // Clean up request
+        request = null;
+      });
+    }
 
-  if (this.matches[index][e])
-    return
+    if (!requestData) {
+      requestData = null;
+    }
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+    // Send the request
+    request.send(requestData);
+  });
+};
 
-  this.matches[index][e] = true
 
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
+/***/ }),
 
-  this.emit('match', e)
-}
+/***/ "../../node_modules/axios/lib/axios.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
+"use strict";
 
-  // 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 lstatkey = 'lstat\0' + abs
-  var self = this
-  var lstatcb = inflight(lstatkey, lstatcb_)
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var bind = __webpack_require__("../../node_modules/axios/lib/helpers/bind.js");
+var Axios = __webpack_require__("../../node_modules/axios/lib/core/Axios.js");
+var mergeConfig = __webpack_require__("../../node_modules/axios/lib/core/mergeConfig.js");
+var defaults = __webpack_require__("../../node_modules/axios/lib/defaults.js");
 
-  if (lstatcb)
-    self.fs.lstat(abs, lstatcb)
+/**
+ * Create an instance of Axios
+ *
+ * @param {Object} defaultConfig The default config for the instance
+ * @return {Axios} A new instance of Axios
+ */
+function createInstance(defaultConfig) {
+  var context = new Axios(defaultConfig);
+  var instance = bind(Axios.prototype.request, context);
 
-  function lstatcb_ (er, lstat) {
-    if (er && er.code === 'ENOENT')
-      return cb()
+  // Copy axios.prototype to instance
+  utils.extend(instance, Axios.prototype, context);
 
-    var isSym = lstat && lstat.isSymbolicLink()
-    self.symlinks[abs] = isSym
+  // Copy context to instance
+  utils.extend(instance, context);
 
-    // 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)
-  }
+  return instance;
 }
 
-Glob.prototype._readdir = function (abs, inGlobStar, cb) {
-  if (this.aborted)
-    return
-
-  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
-  if (!cb)
-    return
-
-  //console.error('RD %j %j', +inGlobStar, abs)
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs, cb)
+// Create the default instance to be exported
+var axios = createInstance(defaults);
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return cb()
+// Expose Axios class to allow class inheritance
+axios.Axios = Axios;
 
-    if (Array.isArray(c))
-      return cb(null, c)
-  }
+// Factory for creating new instances
+axios.create = function create(instanceConfig) {
+  return createInstance(mergeConfig(axios.defaults, instanceConfig));
+};
 
-  var self = this
-  self.fs.readdir(abs, readdirCb(this, abs, cb))
-}
+// Expose Cancel & CancelToken
+axios.Cancel = __webpack_require__("../../node_modules/axios/lib/cancel/Cancel.js");
+axios.CancelToken = __webpack_require__("../../node_modules/axios/lib/cancel/CancelToken.js");
+axios.isCancel = __webpack_require__("../../node_modules/axios/lib/cancel/isCancel.js");
 
-function readdirCb (self, abs, cb) {
-  return function (er, entries) {
-    if (er)
-      self._readdirError(abs, er, cb)
-    else
-      self._readdirEntries(abs, entries, cb)
-  }
-}
+// Expose all/spread
+axios.all = function all(promises) {
+  return Promise.all(promises);
+};
+axios.spread = __webpack_require__("../../node_modules/axios/lib/helpers/spread.js");
 
-Glob.prototype._readdirEntries = function (abs, entries, cb) {
-  if (this.aborted)
-    return
+// Expose isAxiosError
+axios.isAxiosError = __webpack_require__("../../node_modules/axios/lib/helpers/isAxiosError.js");
 
-  // 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
-    }
-  }
+module.exports = axios;
 
-  this.cache[abs] = entries
-  return cb(null, entries)
-}
+// Allow use of default import syntax in TypeScript
+module.exports.default = axios;
 
-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
+/***/ }),
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+/***/ "../../node_modules/axios/lib/cancel/Cancel.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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.silent)
-        console.error('glob error', er)
-      break
-  }
+"use strict";
 
-  return cb()
-}
 
-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)
-  })
+/**
+ * A `Cancel` is an object that is thrown when an operation is canceled.
+ *
+ * @class
+ * @param {string=} message The message.
+ */
+function Cancel(message) {
+  this.message = message;
 }
 
+Cancel.prototype.toString = function toString() {
+  return 'Cancel' + (this.message ? ': ' + this.message : '');
+};
 
-Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-  //console.error('pgs2', prefix, remain[0], entries)
+Cancel.prototype.__CANCEL__ = true;
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return cb()
+module.exports = Cancel;
 
-  // 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)
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false, cb)
+/***/ }),
 
-  var isSym = this.symlinks[abs]
-  var len = entries.length
+/***/ "../../node_modules/axios/lib/cancel/CancelToken.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return cb()
+"use strict";
 
-  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 Cancel = __webpack_require__("../../node_modules/axios/lib/cancel/Cancel.js");
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true, cb)
+/**
+ * A `CancelToken` is an object that can be used to request cancellation of an operation.
+ *
+ * @class
+ * @param {Function} executor The executor function.
+ */
+function CancelToken(executor) {
+  if (typeof executor !== 'function') {
+    throw new TypeError('executor must be a function.');
   }
 
-  cb()
-}
+  var resolvePromise;
+  this.promise = new Promise(function promiseExecutor(resolve) {
+    resolvePromise = resolve;
+  });
 
-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)
-  })
+  var token = this;
+  executor(function cancel(message) {
+    if (token.reason) {
+      // Cancellation has already been requested
+      return;
+    }
+
+    token.reason = new Cancel(message);
+    resolvePromise(token.reason);
+  });
 }
-Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
 
-  //console.error('ps2', prefix, exists)
+/**
+ * Throws a `Cancel` if cancellation has been requested.
+ */
+CancelToken.prototype.throwIfRequested = function throwIfRequested() {
+  if (this.reason) {
+    throw this.reason;
+  }
+};
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+/**
+ * Returns an object that contains a new `CancelToken` and a function that, when called,
+ * cancels the `CancelToken`.
+ */
+CancelToken.source = function source() {
+  var cancel;
+  var token = new CancelToken(function executor(c) {
+    cancel = c;
+  });
+  return {
+    token: token,
+    cancel: cancel
+  };
+};
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return cb()
+module.exports = CancelToken;
 
-  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 += '/'
-    }
-  }
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+/***/ }),
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-  cb()
-}
+/***/ "../../node_modules/axios/lib/cancel/isCancel.js":
+/***/ (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) === '/'
+"use strict";
 
-  if (f.length > this.maxLength)
-    return cb()
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+module.exports = function isCancel(value) {
+  return !!(value && value.__CANCEL__);
+};
 
-    if (Array.isArray(c))
-      c = 'DIR'
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return cb(null, c)
+/***/ }),
 
-    if (needDir && c === 'FILE')
-      return cb()
+/***/ "../../node_modules/axios/lib/core/Axios.js":
+/***/ (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)
-    }
+
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var buildURL = __webpack_require__("../../node_modules/axios/lib/helpers/buildURL.js");
+var InterceptorManager = __webpack_require__("../../node_modules/axios/lib/core/InterceptorManager.js");
+var dispatchRequest = __webpack_require__("../../node_modules/axios/lib/core/dispatchRequest.js");
+var mergeConfig = __webpack_require__("../../node_modules/axios/lib/core/mergeConfig.js");
+
+/**
+ * Create a new instance of Axios
+ *
+ * @param {Object} instanceConfig The default config for the instance
+ */
+function Axios(instanceConfig) {
+  this.defaults = instanceConfig;
+  this.interceptors = {
+    request: new InterceptorManager(),
+    response: new InterceptorManager()
+  };
+}
+
+/**
+ * Dispatch a request
+ *
+ * @param {Object} config The config specific for this request (merged with this.defaults)
+ */
+Axios.prototype.request = function request(config) {
+  /*eslint no-param-reassign:0*/
+  // Allow for axios('example/url'[, config]) a la fetch API
+  if (typeof config === 'string') {
+    config = arguments[1] || {};
+    config.url = arguments[0];
+  } else {
+    config = config || {};
   }
 
-  var self = this
-  var statcb = inflight('stat\0' + abs, lstatcb_)
-  if (statcb)
-    self.fs.lstat(abs, statcb)
+  config = mergeConfig(this.defaults, config);
 
-  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 self.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)
-    }
+  // Set config.method
+  if (config.method) {
+    config.method = config.method.toLowerCase();
+  } else if (this.defaults.method) {
+    config.method = this.defaults.method.toLowerCase();
+  } else {
+    config.method = 'get';
   }
-}
 
-Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
-  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-    this.statCache[abs] = false
-    return cb()
+  // Hook up interceptors middleware
+  var chain = [dispatchRequest, undefined];
+  var promise = Promise.resolve(config);
+
+  this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+    chain.unshift(interceptor.fulfilled, interceptor.rejected);
+  });
+
+  this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+    chain.push(interceptor.fulfilled, interceptor.rejected);
+  });
+
+  while (chain.length) {
+    promise = promise.then(chain.shift(), chain.shift());
   }
 
-  var needDir = f.slice(-1) === '/'
-  this.statCache[abs] = stat
+  return promise;
+};
 
-  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
-    return cb(null, false, stat)
+Axios.prototype.getUri = function getUri(config) {
+  config = mergeConfig(this.defaults, config);
+  return buildURL(config.url, config.params, config.paramsSerializer).replace(/^\?/, '');
+};
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-  this.cache[abs] = this.cache[abs] || c
+// Provide aliases for supported request methods
+utils.forEach(['delete', 'get', 'head', 'options'], function forEachMethodNoData(method) {
+  /*eslint func-names:0*/
+  Axios.prototype[method] = function(url, config) {
+    return this.request(mergeConfig(config || {}, {
+      method: method,
+      url: url,
+      data: (config || {}).data
+    }));
+  };
+});
 
-  if (needDir && c === 'FILE')
-    return cb()
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  /*eslint func-names:0*/
+  Axios.prototype[method] = function(url, data, config) {
+    return this.request(mergeConfig(config || {}, {
+      method: method,
+      url: url,
+      data: data
+    }));
+  };
+});
 
-  return cb(null, c, stat)
-}
+module.exports = Axios;
 
 
 /***/ }),
-/* 245 */
+
+/***/ "../../node_modules/axios/lib/core/InterceptorManager.js":
 /***/ (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__(132)
-var origRealpath = fs.realpath
-var origRealpathSync = fs.realpathSync
 
-var version = process.version
-var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(246)
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
+function InterceptorManager() {
+  this.handlers = [];
 }
 
-function realpath (p, cache, cb) {
-  if (ok) {
-    return origRealpath(p, cache, cb)
-  }
-
-  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)
-    }
-  })
-}
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  });
+  return this.handlers.length - 1;
+};
 
-function realpathSync (p, cache) {
-  if (ok) {
-    return origRealpathSync(p, cache)
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null;
   }
+};
 
-  try {
-    return origRealpathSync(p, cache)
-  } catch (er) {
-    if (newError(er)) {
-      return old.realpathSync(p, cache)
-    } else {
-      throw er
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  utils.forEach(this.handlers, function forEachHandler(h) {
+    if (h !== null) {
+      fn(h);
     }
-  }
-}
-
-function monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
-}
+  });
+};
 
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
-}
+module.exports = InterceptorManager;
 
 
 /***/ }),
-/* 246 */
-/***/ (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.
+/***/ "../../node_modules/axios/lib/core/buildFullPath.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var pathModule = __webpack_require__(4);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(132);
+"use strict";
 
-// JavaScript implementation of realpath, ported from node pre-v6
 
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+var isAbsoluteURL = __webpack_require__("../../node_modules/axios/lib/helpers/isAbsoluteURL.js");
+var combineURLs = __webpack_require__("../../node_modules/axios/lib/helpers/combineURLs.js");
 
-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;
+/**
+ * Creates a new URL by combining the baseURL with the requestedURL,
+ * only when the requestedURL is not already an absolute URL.
+ * If the requestURL is absolute, this function returns the requestedURL untouched.
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} requestedURL Absolute or relative URL to combine
+ * @returns {string} The combined full path
+ */
+module.exports = function buildFullPath(baseURL, requestedURL) {
+  if (baseURL && !isAbsoluteURL(requestedURL)) {
+    return combineURLs(baseURL, requestedURL);
+  }
+  return requestedURL;
+};
 
-  return callback;
 
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
-    }
-  }
+/***/ }),
 
-  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);
-      }
-    }
-  }
-}
+/***/ "../../node_modules/axios/lib/core/createError.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function maybeCallback(cb) {
-  return typeof cb === 'function' ? cb : rethrow();
-}
+"use strict";
 
-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;
-}
+var enhanceError = __webpack_require__("../../node_modules/axios/lib/core/enhanceError.js");
 
-// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
-if (isWindows) {
-  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
-} else {
-  var splitRootRe = /^[\/]*/;
-}
+/**
+ * Create an Error with the specified message, config, error code, request and response.
+ *
+ * @param {string} message The error message.
+ * @param {Object} config The config.
+ * @param {string} [code] The error code (for example, 'ECONNABORTED').
+ * @param {Object} [request] The request.
+ * @param {Object} [response] The response.
+ * @returns {Error} The created error.
+ */
+module.exports = function createError(message, config, code, request, response) {
+  var error = new Error(message);
+  return enhanceError(error, config, code, request, response);
+};
 
-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 = {};
+/***/ "../../node_modules/axios/lib/core/dispatchRequest.js":
+/***/ (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;
+"use strict";
 
-  start();
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var transformData = __webpack_require__("../../node_modules/axios/lib/core/transformData.js");
+var isCancel = __webpack_require__("../../node_modules/axios/lib/cancel/isCancel.js");
+var defaults = __webpack_require__("../../node_modules/axios/lib/defaults.js");
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstatSync(base);
-      knownHard[base] = true;
-    }
+/**
+ * Throws a `Cancel` if cancellation has been requested.
+ */
+function throwIfCancellationRequested(config) {
+  if (config.cancelToken) {
+    config.cancelToken.throwIfRequested();
   }
+}
 
-  // 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;
+/**
+ * Dispatch a request to the server using the configured adapter.
+ *
+ * @param {object} config The config that is to be used for the request
+ * @returns {Promise} The Promise to be fulfilled
+ */
+module.exports = function dispatchRequest(config) {
+  throwIfCancellationRequested(config);
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
+  // Ensure headers exist
+  config.headers = config.headers || {};
+
+  // Transform request data
+  config.data = transformData(
+    config.data,
+    config.headers,
+    config.transformRequest
+  );
+
+  // Flatten headers
+  config.headers = utils.merge(
+    config.headers.common || {},
+    config.headers[config.method] || {},
+    config.headers
+  );
+
+  utils.forEach(
+    ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'],
+    function cleanHeaderConfig(method) {
+      delete config.headers[method];
     }
+  );
 
-    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 adapter = config.adapter || defaults.adapter;
 
-      // 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);
+  return adapter(config).then(function onAdapterResolution(response) {
+    throwIfCancellationRequested(config);
+
+    // Transform response data
+    response.data = transformData(
+      response.data,
+      response.headers,
+      config.transformResponse
+    );
+
+    return response;
+  }, function onAdapterRejection(reason) {
+    if (!isCancel(reason)) {
+      throwIfCancellationRequested(config);
+
+      // Transform response data
+      if (reason && reason.response) {
+        reason.response.data = transformData(
+          reason.response.data,
+          reason.response.headers,
+          config.transformResponse
+        );
       }
-      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();
+    return Promise.reject(reason);
+  });
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/axios/lib/core/enhanceError.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Update an Error with the specified config, error code, and response.
+ *
+ * @param {Error} error The error to update.
+ * @param {Object} config The config.
+ * @param {string} [code] The error code (for example, 'ECONNABORTED').
+ * @param {Object} [request] The request.
+ * @param {Object} [response] The response.
+ * @returns {Error} The error.
+ */
+module.exports = function enhanceError(error, config, code, request, response) {
+  error.config = config;
+  if (code) {
+    error.code = code;
   }
 
-  if (cache) cache[original] = p;
+  error.request = request;
+  error.response = response;
+  error.isAxiosError = true;
 
-  return p;
+  error.toJSON = function toJSON() {
+    return {
+      // Standard
+      message: this.message,
+      name: this.name,
+      // Microsoft
+      description: this.description,
+      number: this.number,
+      // Mozilla
+      fileName: this.fileName,
+      lineNumber: this.lineNumber,
+      columnNumber: this.columnNumber,
+      stack: this.stack,
+      // Axios
+      config: this.config,
+      code: this.code
+    };
+  };
+  return error;
 };
 
 
-exports.realpath = function realpath(p, cache, cb) {
-  if (typeof cb !== 'function') {
-    cb = maybeCallback(cache);
-    cache = null;
-  }
+/***/ }),
 
-  // make p is absolute
-  p = pathModule.resolve(p);
+/***/ "../../node_modules/axios/lib/core/mergeConfig.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return process.nextTick(cb.bind(null, null, cache[p]));
-  }
+"use strict";
 
-  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;
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-  start();
+/**
+ * Config-specific merge-function which creates a new config-object
+ * by merging two configuration objects together.
+ *
+ * @param {Object} config1
+ * @param {Object} config2
+ * @returns {Object} New object resulting from merging config2 to config1
+ */
+module.exports = function mergeConfig(config1, config2) {
+  // eslint-disable-next-line no-param-reassign
+  config2 = config2 || {};
+  var config = {};
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+  var valueFromConfig2Keys = ['url', 'method', 'data'];
+  var mergeDeepPropertiesKeys = ['headers', 'auth', 'proxy', 'params'];
+  var defaultToConfig2Keys = [
+    'baseURL', 'transformRequest', 'transformResponse', 'paramsSerializer',
+    'timeout', 'timeoutMessage', 'withCredentials', 'adapter', 'responseType', 'xsrfCookieName',
+    'xsrfHeaderName', 'onUploadProgress', 'onDownloadProgress', 'decompress',
+    'maxContentLength', 'maxBodyLength', 'maxRedirects', 'transport', 'httpAgent',
+    'httpsAgent', 'cancelToken', 'socketPath', 'responseEncoding'
+  ];
+  var directMergeKeys = ['validateStatus'];
 
-    // 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 getMergedValue(target, source) {
+    if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
+      return utils.merge(target, source);
+    } else if (utils.isPlainObject(source)) {
+      return utils.merge({}, source);
+    } else if (utils.isArray(source)) {
+      return source.slice();
     }
+    return source;
   }
 
-  // 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);
+  function mergeDeepProperties(prop) {
+    if (!utils.isUndefined(config2[prop])) {
+      config[prop] = getMergedValue(config1[prop], config2[prop]);
+    } else if (!utils.isUndefined(config1[prop])) {
+      config[prop] = getMergedValue(undefined, config1[prop]);
     }
+  }
 
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
+  utils.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
+    if (!utils.isUndefined(config2[prop])) {
+      config[prop] = getMergedValue(undefined, config2[prop]);
+    }
+  });
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      return process.nextTick(LOOP);
+  utils.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
+
+  utils.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
+    if (!utils.isUndefined(config2[prop])) {
+      config[prop] = getMergedValue(undefined, config2[prop]);
+    } else if (!utils.isUndefined(config1[prop])) {
+      config[prop] = getMergedValue(undefined, config1[prop]);
     }
+  });
 
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
+  utils.forEach(directMergeKeys, function merge(prop) {
+    if (prop in config2) {
+      config[prop] = getMergedValue(config1[prop], config2[prop]);
+    } else if (prop in config1) {
+      config[prop] = getMergedValue(undefined, config1[prop]);
     }
+  });
 
-    return fs.lstat(base, gotStat);
-  }
+  var axiosKeys = valueFromConfig2Keys
+    .concat(mergeDeepPropertiesKeys)
+    .concat(defaultToConfig2Keys)
+    .concat(directMergeKeys);
 
-  function gotStat(err, stat) {
-    if (err) return cb(err);
+  var otherKeys = Object
+    .keys(config1)
+    .concat(Object.keys(config2))
+    .filter(function filterAxiosKeys(key) {
+      return axiosKeys.indexOf(key) === -1;
+    });
 
-    // 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);
-    }
+  utils.forEach(otherKeys, mergeDeepProperties);
 
-    // 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);
+  return config;
+};
 
-      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);
-  }
+/***/ "../../node_modules/axios/lib/core/settle.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  function gotResolvedLink(resolvedLink) {
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
+"use strict";
+
+
+var createError = __webpack_require__("../../node_modules/axios/lib/core/createError.js");
+
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+module.exports = function settle(resolve, reject, response) {
+  var validateStatus = response.config.validateStatus;
+  if (!response.status || !validateStatus || validateStatus(response.status)) {
+    resolve(response);
+  } else {
+    reject(createError(
+      'Request failed with status code ' + response.status,
+      response.config,
+      null,
+      response.request,
+      response
+    ));
   }
 };
 
 
 /***/ }),
-/* 247 */
+
+/***/ "../../node_modules/axios/lib/core/transformData.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
+"use strict";
 
-var path = (function () { try { return __webpack_require__(4) } catch (e) {}}()) || {
-  sep: '/'
-}
-minimatch.sep = path.sep
 
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(248)
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-var plTypes = {
-  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
-  '?': { open: '(?:', close: ')?' },
-  '+': { open: '(?:', close: ')+' },
-  '*': { open: '(?:', close: ')*' },
-  '@': { open: '(?:', close: ')' }
-}
+/**
+ * Transform the data for a request or a response
+ *
+ * @param {Object|String} data The data to be transformed
+ * @param {Array} headers The headers for the request or response
+ * @param {Array|Function} fns A single function or Array of functions
+ * @returns {*} The resulting transformed data
+ */
+module.exports = function transformData(data, headers, fns) {
+  /*eslint no-param-reassign:0*/
+  utils.forEach(fns, function transform(fn) {
+    data = fn(data, headers);
+  });
 
-// any single thing other than /
-// don't need to escape / when using new RegExp()
-var qmark = '[^/]'
+  return data;
+};
 
-// * => any number of characters
-var star = qmark + '*?'
 
-// ** 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})($|\\\/)).)*?'
+/***/ }),
 
-// not a ^ or / followed by a dot,
-// followed by anything, any number of times.
-var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+/***/ "../../node_modules/axios/lib/defaults.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// characters that need to be escaped in RegExp.
-var reSpecials = charSet('().*{}+?[]^$\\!')
+"use strict";
 
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
-}
 
-// normalizes slashes.
-var slashSplit = /\/+/
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
+var normalizeHeaderName = __webpack_require__("../../node_modules/axios/lib/helpers/normalizeHeaderName.js");
 
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
-  }
-}
+var DEFAULT_CONTENT_TYPE = {
+  'Content-Type': 'application/x-www-form-urlencoded'
+};
 
-function ext (a, b) {
-  b = b || {}
-  var t = {}
-  Object.keys(a).forEach(function (k) {
-    t[k] = a[k]
-  })
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k]
-  })
-  return t
+function setContentTypeIfUnset(headers, value) {
+  if (!utils.isUndefined(headers) && utils.isUndefined(headers['Content-Type'])) {
+    headers['Content-Type'] = value;
+  }
 }
 
-minimatch.defaults = function (def) {
-  if (!def || typeof def !== 'object' || !Object.keys(def).length) {
-    return minimatch
+function getDefaultAdapter() {
+  var adapter;
+  if (typeof XMLHttpRequest !== 'undefined') {
+    // For browsers use XHR adapter
+    adapter = __webpack_require__("../../node_modules/axios/lib/adapters/xhr.js");
+  } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') {
+    // For node use HTTP adapter
+    adapter = __webpack_require__("../../node_modules/axios/lib/adapters/http.js");
   }
+  return adapter;
+}
 
-  var orig = minimatch
+var defaults = {
+  adapter: getDefaultAdapter(),
 
-  var m = function minimatch (p, pattern, options) {
-    return orig(p, pattern, ext(def, options))
-  }
+  transformRequest: [function transformRequest(data, headers) {
+    normalizeHeaderName(headers, 'Accept');
+    normalizeHeaderName(headers, 'Content-Type');
+    if (utils.isFormData(data) ||
+      utils.isArrayBuffer(data) ||
+      utils.isBuffer(data) ||
+      utils.isStream(data) ||
+      utils.isFile(data) ||
+      utils.isBlob(data)
+    ) {
+      return data;
+    }
+    if (utils.isArrayBufferView(data)) {
+      return data.buffer;
+    }
+    if (utils.isURLSearchParams(data)) {
+      setContentTypeIfUnset(headers, 'application/x-www-form-urlencoded;charset=utf-8');
+      return data.toString();
+    }
+    if (utils.isObject(data)) {
+      setContentTypeIfUnset(headers, 'application/json;charset=utf-8');
+      return JSON.stringify(data);
+    }
+    return data;
+  }],
 
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
-  }
-  m.Minimatch.defaults = function defaults (options) {
-    return orig.defaults(ext(def, options)).Minimatch
-  }
+  transformResponse: [function transformResponse(data) {
+    /*eslint no-param-reassign:0*/
+    if (typeof data === 'string') {
+      try {
+        data = JSON.parse(data);
+      } catch (e) { /* Ignore */ }
+    }
+    return data;
+  }],
 
-  m.filter = function filter (pattern, options) {
-    return orig.filter(pattern, ext(def, options))
-  }
+  /**
+   * A timeout in milliseconds to abort a request. If set to 0 (default) a
+   * timeout is not created.
+   */
+  timeout: 0,
 
-  m.defaults = function defaults (options) {
-    return orig.defaults(ext(def, options))
-  }
+  xsrfCookieName: 'XSRF-TOKEN',
+  xsrfHeaderName: 'X-XSRF-TOKEN',
 
-  m.makeRe = function makeRe (pattern, options) {
-    return orig.makeRe(pattern, ext(def, options))
-  }
+  maxContentLength: -1,
+  maxBodyLength: -1,
 
-  m.braceExpand = function braceExpand (pattern, options) {
-    return orig.braceExpand(pattern, ext(def, options))
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300;
   }
+};
 
-  m.match = function (list, pattern, options) {
-    return orig.match(list, pattern, ext(def, options))
+defaults.headers = {
+  common: {
+    'Accept': 'application/json, text/plain, */*'
   }
+};
 
-  return m
-}
+utils.forEach(['delete', 'get', 'head'], function forEachMethodNoData(method) {
+  defaults.headers[method] = {};
+});
 
-Minimatch.defaults = function (def) {
-  return minimatch.defaults(def).Minimatch
-}
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  defaults.headers[method] = utils.merge(DEFAULT_CONTENT_TYPE);
+});
 
-function minimatch (p, pattern, options) {
-  assertValidPattern(pattern)
+module.exports = defaults;
 
-  if (!options) options = {}
 
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
-  }
+/***/ }),
 
-  return new Minimatch(pattern, options).match(p)
-}
+/***/ "../../node_modules/axios/lib/helpers/bind.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
-  }
+"use strict";
 
-  assertValidPattern(pattern)
 
-  if (!options) options = {}
+module.exports = function bind(fn, thisArg) {
+  return function wrap() {
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }
+    return fn.apply(thisArg, args);
+  };
+};
 
-  pattern = pattern.trim()
 
-  // windows support: need to use /, not \
-  if (!options.allowWindowsEscape && 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
-  this.partial = !!options.partial
+/***/ "../../node_modules/axios/lib/helpers/buildURL.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // make the set of regexps etc.
-  this.make()
-}
+"use strict";
 
-Minimatch.prototype.debug = function () {}
 
-Minimatch.prototype.make = make
-function make () {
-  var pattern = this.pattern
-  var options = this.options
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-  // empty patterns and comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    this.comment = true
-    return
-  }
-  if (!pattern) {
-    this.empty = true
-    return
+function encode(val) {
+  return encodeURIComponent(val).
+    replace(/%3A/gi, ':').
+    replace(/%24/g, '$').
+    replace(/%2C/gi, ',').
+    replace(/%20/g, '+').
+    replace(/%5B/gi, '[').
+    replace(/%5D/gi, ']');
+}
+
+/**
+ * Build a URL by appending params to the end
+ *
+ * @param {string} url The base of the url (e.g., http://www.google.com)
+ * @param {object} [params] The params to be appended
+ * @returns {string} The formatted url
+ */
+module.exports = function buildURL(url, params, paramsSerializer) {
+  /*eslint no-param-reassign:0*/
+  if (!params) {
+    return url;
   }
 
-  // step 1: figure out negation, etc.
-  this.parseNegate()
+  var serializedParams;
+  if (paramsSerializer) {
+    serializedParams = paramsSerializer(params);
+  } else if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString();
+  } else {
+    var parts = [];
 
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return;
+      }
 
-  if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
+      if (utils.isArray(val)) {
+        key = key + '[]';
+      } else {
+        val = [val];
+      }
 
-  this.debug(this.pattern, set)
+      utils.forEach(val, function parseValue(v) {
+        if (utils.isDate(v)) {
+          v = v.toISOString();
+        } else if (utils.isObject(v)) {
+          v = JSON.stringify(v);
+        }
+        parts.push(encode(key) + '=' + encode(v));
+      });
+    });
 
-  // 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)
-  })
+    serializedParams = parts.join('&');
+  }
 
-  this.debug(this.pattern, set)
+  if (serializedParams) {
+    var hashmarkIndex = url.indexOf('#');
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex);
+    }
 
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
+  }
 
-  this.debug(this.pattern, set)
+  return url;
+};
 
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
-  })
 
-  this.debug(this.pattern, set)
+/***/ }),
 
-  this.set = set
-}
+/***/ "../../node_modules/axios/lib/helpers/combineURLs.js":
+/***/ (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
+"use strict";
 
-  if (options.nonegate) return
 
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
-  }
+/**
+ * Creates a new URL by combining the specified URLs
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} relativeURL The relative URL
+ * @returns {string} The combined URL
+ */
+module.exports = function combineURLs(baseURL, relativeURL) {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL;
+};
 
-  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)
-}
+/***/ }),
 
-Minimatch.prototype.braceExpand = braceExpand
+/***/ "../../node_modules/axios/lib/helpers/cookies.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
-    } else {
-      options = {}
-    }
-  }
+"use strict";
 
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
 
-  assertValidPattern(pattern)
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-  // Thanks to Yeting Li <https://github.com/yetingli> for
-  // improving this regexp to avoid a ReDOS vulnerability.
-  if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
-    // shortcut. no need to expand.
-    return [pattern]
-  }
+module.exports = (
+  utils.isStandardBrowserEnv() ?
 
-  return expand(pattern)
-}
+  // Standard browser envs support document.cookie
+    (function standardBrowserEnv() {
+      return {
+        write: function write(name, value, expires, path, domain, secure) {
+          var cookie = [];
+          cookie.push(name + '=' + encodeURIComponent(value));
 
-var MAX_PATTERN_LENGTH = 1024 * 64
-var assertValidPattern = function (pattern) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('invalid pattern')
-  }
+          if (utils.isNumber(expires)) {
+            cookie.push('expires=' + new Date(expires).toGMTString());
+          }
 
-  if (pattern.length > MAX_PATTERN_LENGTH) {
-    throw new TypeError('pattern is too long')
-  }
-}
+          if (utils.isString(path)) {
+            cookie.push('path=' + path);
+          }
 
-// 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) {
-  assertValidPattern(pattern)
+          if (utils.isString(domain)) {
+            cookie.push('domain=' + domain);
+          }
 
-  var options = this.options
+          if (secure === true) {
+            cookie.push('secure');
+          }
 
-  // shortcuts
-  if (pattern === '**') {
-    if (!options.noglobstar)
-      return GLOBSTAR
-    else
-      pattern = '*'
-  }
-  if (pattern === '') return ''
+          document.cookie = cookie.join('; ');
+        },
 
-  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
+        read: function read(name) {
+          var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)'));
+          return (match ? decodeURIComponent(match[3]) : null);
+        },
 
-  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
-    }
-  }
+        remove: function remove(name) {
+          this.write(name, '', Date.now() - 86400000);
+        }
+      };
+    })() :
 
-  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)
+  // Non standard browser env (web workers, react-native) lack needed support.
+    (function nonStandardBrowserEnv() {
+      return {
+        write: function write() {},
+        read: function read() { return null; },
+        remove: function remove() {}
+      };
+    })()
+);
 
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
-    }
 
-    switch (c) {
-      /* istanbul ignore next */
-      case '/': {
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
-      }
+/***/ }),
 
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
+/***/ "../../node_modules/axios/lib/helpers/isAbsoluteURL.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      // 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)
+"use strict";
 
-        // 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
-        }
 
-        // 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
+/**
+ * Determines whether the specified URL is absolute
+ *
+ * @param {string} url The URL to test
+ * @returns {boolean} True if the specified URL is absolute, otherwise false
+ */
+module.exports = function isAbsoluteURL(url) {
+  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+  // by any combination of letters, digits, plus, period, or hyphen.
+  return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+};
 
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
-        }
 
-        if (!stateChar) {
-          re += '\\('
-          continue
-        }
+/***/ }),
 
-        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
-
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
-        }
+/***/ "../../node_modules/axios/lib/helpers/isAxiosError.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        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
+"use strict";
 
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
-        }
 
-        clearStateChar()
-        re += '|'
-      continue
+/**
+ * Determines whether the payload is an error thrown by Axios
+ *
+ * @param {*} payload The value to test
+ * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
+ */
+module.exports = function isAxiosError(payload) {
+  return (typeof payload === 'object') && (payload.isAxiosError === true);
+};
 
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
 
-        if (inClass) {
-          re += '\\' + c
-          continue
-        }
+/***/ }),
 
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
+/***/ "../../node_modules/axios/lib/helpers/isURLSameOrigin.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      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
-        }
+"use strict";
 
-        // handle the case where we left a class open.
-        // "[z-a]" is valid, equivalent to "\[z-a\]"
-        // 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
-        }
 
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
+module.exports = (
+  utils.isStandardBrowserEnv() ?
 
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
-        }
+  // Standard browser envs have full support of the APIs needed to test
+  // whether the request URL is of the same origin as current location.
+    (function standardBrowserEnv() {
+      var msie = /(msie|trident)/i.test(navigator.userAgent);
+      var urlParsingNode = document.createElement('a');
+      var originURL;
 
-        re += c
+      /**
+    * Parse a URL to discover it's components
+    *
+    * @param {String} url The URL to be parsed
+    * @returns {Object}
+    */
+      function resolveURL(url) {
+        var href = url;
 
-    } // switch
-  } // for
+        if (msie) {
+        // IE needs attribute set twice to normalize properties
+          urlParsingNode.setAttribute('href', href);
+          href = urlParsingNode.href;
+        }
 
-  // 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]
-  }
+        urlParsingNode.setAttribute('href', href);
 
-  // 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 = '\\'
+        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+        return {
+          href: urlParsingNode.href,
+          protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+          host: urlParsingNode.host,
+          search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+          hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+          hostname: urlParsingNode.hostname,
+          port: urlParsingNode.port,
+          pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
+            urlParsingNode.pathname :
+            '/' + urlParsingNode.pathname
+        };
       }
 
-      // 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 + '|'
-    })
+      originURL = resolveURL(window.location.href);
 
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
+      /**
+    * Determine if a URL shares the same origin as the current location
+    *
+    * @param {String} requestURL The URL to test
+    * @returns {boolean} True if URL shares the same origin, otherwise false
+    */
+      return function isURLSameOrigin(requestURL) {
+        var parsed = (utils.isString(requestURL)) ? resolveURL(requestURL) : requestURL;
+        return (parsed.protocol === originURL.protocol &&
+            parsed.host === originURL.host);
+      };
+    })() :
 
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
-  }
+  // Non standard browser envs (web workers, react-native) lack needed support.
+    (function nonStandardBrowserEnv() {
+      return function isURLSameOrigin() {
+        return true;
+      };
+    })()
+);
 
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
-  }
 
-  // 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
-  }
+/***/ }),
 
-  // 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]
+/***/ "../../node_modules/axios/lib/helpers/normalizeHeaderName.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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)
+"use strict";
 
-    nlLast += nlAfter
 
-    // 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
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
+module.exports = function normalizeHeaderName(headers, normalizedName) {
+  utils.forEach(headers, function processHeader(value, name) {
+    if (name !== normalizedName && name.toUpperCase() === normalizedName.toUpperCase()) {
+      headers[normalizedName] = value;
+      delete headers[name];
     }
-    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
-  }
+/***/ }),
 
-  // parsing just a piece of a larger pattern.
-  if (isSub === SUBPARSE) {
-    return [re, hasMagic]
-  }
+/***/ "../../node_modules/axios/lib/helpers/parseHeaders.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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)
-  }
+"use strict";
 
-  var flags = options.nocase ? 'i' : ''
-  try {
-    var regExp = new RegExp('^' + re + '$', flags)
-  } catch (er) /* istanbul ignore next - should be impossible */ {
-    // 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('$.')
-  }
 
-  regExp._glob = pattern
-  regExp._src = re
+var utils = __webpack_require__("../../node_modules/axios/lib/utils.js");
 
-  return regExp
-}
+// Headers whose duplicates are ignored by node
+// c.f. https://nodejs.org/api/http.html#http_message_headers
+var ignoreDuplicateOf = [
+  'age', 'authorization', 'content-length', 'content-type', 'etag',
+  'expires', 'from', 'host', 'if-modified-since', 'if-unmodified-since',
+  'last-modified', 'location', 'max-forwards', 'proxy-authorization',
+  'referer', 'retry-after', 'user-agent'
+];
 
-minimatch.makeRe = function (pattern, options) {
-  return new Minimatch(pattern, options || {}).makeRe()
-}
+/**
+ * Parse headers into an object
+ *
+ * ```
+ * Date: Wed, 27 Aug 2014 08:58:49 GMT
+ * Content-Type: application/json
+ * Connection: keep-alive
+ * Transfer-Encoding: chunked
+ * ```
+ *
+ * @param {String} headers Headers needing to be parsed
+ * @returns {Object} Headers parsed into an object
+ */
+module.exports = function parseHeaders(headers) {
+  var parsed = {};
+  var key;
+  var val;
+  var i;
 
-Minimatch.prototype.makeRe = makeRe
-function makeRe () {
-  if (this.regexp || this.regexp === false) return this.regexp
+  if (!headers) { return parsed; }
 
-  // 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
+  utils.forEach(headers.split('\n'), function parser(line) {
+    i = line.indexOf(':');
+    key = utils.trim(line.substr(0, i)).toLowerCase();
+    val = utils.trim(line.substr(i + 1));
 
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
-  }
-  var options = this.options
+    if (key) {
+      if (parsed[key] && ignoreDuplicateOf.indexOf(key) >= 0) {
+        return;
+      }
+      if (key === 'set-cookie') {
+        parsed[key] = (parsed[key] ? parsed[key] : []).concat([val]);
+      } else {
+        parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+      }
+    }
+  });
 
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
+  return parsed;
+};
 
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
 
-  // 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 + ').*$'
+/***/ "../../node_modules/axios/lib/helpers/spread.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) /* istanbul ignore next - should be impossible */ {
-    this.regexp = false
-  }
-  return this.regexp
-}
+"use strict";
 
-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
-}
 
-Minimatch.prototype.match = function match (f, partial) {
-  if (typeof partial === 'undefined') partial = this.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 === ''
+/**
+ * Syntactic sugar for invoking a function and expanding an array for arguments.
+ *
+ * Common use case would be to use `Function.prototype.apply`.
+ *
+ *  ```js
+ *  function f(x, y, z) {}
+ *  var args = [1, 2, 3];
+ *  f.apply(null, args);
+ *  ```
+ *
+ * With `spread` this example can be re-written.
+ *
+ *  ```js
+ *  spread(function(x, y, z) {})([1, 2, 3]);
+ *  ```
+ *
+ * @param {Function} callback
+ * @returns {Function}
+ */
+module.exports = function spread(callback) {
+  return function wrap(arr) {
+    return callback.apply(null, arr);
+  };
+};
 
-  if (f === '/' && partial) return true
 
-  var options = this.options
+/***/ }),
 
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
+/***/ "../../node_modules/axios/lib/utils.js":
+/***/ (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)
+var bind = __webpack_require__("../../node_modules/axios/lib/helpers/bind.js");
 
-  // 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
-  }
+/*global toString:true*/
 
-  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
-    }
-  }
+// utils is a library of generic helper functions non-specific to axios
 
-  // didn't get any hits.  this is success if it's a negative
-  // pattern, failure otherwise.
-  if (options.flipNegate) return false
-  return this.negate
-}
+var toString = Object.prototype.toString;
 
-// 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
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+function isArray(val) {
+  return toString.call(val) === '[object Array]';
+}
 
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
+/**
+ * Determine if a value is undefined
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if the value is undefined, otherwise false
+ */
+function isUndefined(val) {
+  return typeof val === 'undefined';
+}
 
-  this.debug('matchOne', file.length, pattern.length)
+/**
+ * Determine if a value is a Buffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Buffer, otherwise false
+ */
+function isBuffer(val) {
+  return val !== null && !isUndefined(val) && val.constructor !== null && !isUndefined(val.constructor)
+    && typeof val.constructor.isBuffer === 'function' && val.constructor.isBuffer(val);
+}
 
-  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]
-
-    this.debug(pattern, p, f)
-
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    /* istanbul ignore if */
-    if (p === false) return false
+/**
+ * Determine if a value is an ArrayBuffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an ArrayBuffer, otherwise false
+ */
+function isArrayBuffer(val) {
+  return toString.call(val) === '[object ArrayBuffer]';
+}
 
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
+/**
+ * Determine if a value is a FormData
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an FormData, otherwise false
+ */
+function isFormData(val) {
+  return (typeof FormData !== 'undefined') && (val instanceof FormData);
+}
 
-      // "**"
-      // 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
-      }
+/**
+ * Determine if a value is a view on an ArrayBuffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a view on an ArrayBuffer, otherwise false
+ */
+function isArrayBufferView(val) {
+  var result;
+  if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {
+    result = ArrayBuffer.isView(val);
+  } else {
+    result = (val) && (val.buffer) && (val.buffer instanceof ArrayBuffer);
+  }
+  return result;
+}
 
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
+/**
+ * Determine if a value is a String
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a String, otherwise false
+ */
+function isString(val) {
+  return typeof val === 'string';
+}
 
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+/**
+ * Determine if a value is a Number
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Number, otherwise false
+ */
+function isNumber(val) {
+  return typeof val === 'number';
+}
 
-        // 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
-          }
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+function isObject(val) {
+  return val !== null && typeof val === 'object';
+}
 
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
-        }
-      }
+/**
+ * Determine if a value is a plain Object
+ *
+ * @param {Object} val The value to test
+ * @return {boolean} True if value is a plain Object, otherwise false
+ */
+function isPlainObject(val) {
+  if (toString.call(val) !== '[object Object]') {
+    return false;
+  }
 
-      // no match was found.
-      // However, in partial mode, we can't say this is necessarily over.
-      // If there's more *pattern* left, then
-      /* istanbul ignore if */
-      if (partial) {
-        // ran out of file
-        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
-        if (fr === fl) return true
-      }
-      return false
-    }
+  var prototype = Object.getPrototypeOf(val);
+  return prototype === null || prototype === Object.prototype;
+}
 
-    // 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') {
-      hit = f === p
-      this.debug('string match', p, f, hit)
-    } else {
-      hit = f.match(p)
-      this.debug('pattern match', p, f, hit)
-    }
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+function isDate(val) {
+  return toString.call(val) === '[object Date]';
+}
 
-    if (!hit) return false
-  }
+/**
+ * Determine if a value is a File
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a File, otherwise false
+ */
+function isFile(val) {
+  return toString.call(val) === '[object File]';
+}
 
-  // 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/*
+/**
+ * Determine if a value is a Blob
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Blob, otherwise false
+ */
+function isBlob(val) {
+  return toString.call(val) === '[object Blob]';
+}
 
-  // 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 /* istanbul ignore 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/
-    return (fi === fl - 1) && (file[fi] === '')
-  }
+/**
+ * Determine if a value is a Function
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Function, otherwise false
+ */
+function isFunction(val) {
+  return toString.call(val) === '[object Function]';
+}
 
-  // should be unreachable.
-  /* istanbul ignore next */
-  throw new Error('wtf?')
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */
+function isStream(val) {
+  return isObject(val) && isFunction(val.pipe);
 }
 
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+function isURLSearchParams(val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
 }
 
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+/**
+ * Trim excess whitespace off the beginning and end of a string
+ *
+ * @param {String} str The String to trim
+ * @returns {String} The String freed of excess whitespace
+ */
+function trim(str) {
+  return str.replace(/^\s*/, '').replace(/\s*$/, '');
 }
 
+/**
+ * Determine if we're running in a standard browser environment
+ *
+ * This allows axios to run in a web worker, and react-native.
+ * Both environments support XMLHttpRequest, but not fully standard globals.
+ *
+ * web workers:
+ *  typeof window -> undefined
+ *  typeof document -> undefined
+ *
+ * react-native:
+ *  navigator.product -> 'ReactNative'
+ * nativescript
+ *  navigator.product -> 'NativeScript' or 'NS'
+ */
+function isStandardBrowserEnv() {
+  if (typeof navigator !== 'undefined' && (navigator.product === 'ReactNative' ||
+                                           navigator.product === 'NativeScript' ||
+                                           navigator.product === 'NS')) {
+    return false;
+  }
+  return (
+    typeof window !== 'undefined' &&
+    typeof document !== 'undefined'
+  );
+}
 
-/***/ }),
-/* 248 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Iterate over an Array or an Object invoking a function for each item.
+ *
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
+ *
+ * If 'obj' is an Object callback will be called passing
+ * the value, key, and complete object for each property.
+ *
+ * @param {Object|Array} obj The object to iterate
+ * @param {Function} fn The callback to invoke for each item
+ */
+function forEach(obj, fn) {
+  // Don't bother if no value provided
+  if (obj === null || typeof obj === 'undefined') {
+    return;
+  }
 
-var concatMap = __webpack_require__(249);
-var balanced = __webpack_require__(250);
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj];
+  }
 
-module.exports = expandTop;
+  if (isArray(obj)) {
+    // Iterate over array values
+    for (var i = 0, l = obj.length; i < l; i++) {
+      fn.call(null, obj[i], i, obj);
+    }
+  } else {
+    // Iterate over object keys
+    for (var key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        fn.call(null, obj[key], key, obj);
+      }
+    }
+  }
+}
 
-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';
+/**
+ * Accepts varargs expecting each argument to be an object, then
+ * immutably merges the properties of each object and returns result.
+ *
+ * When multiple objects contain the same key the later object in
+ * the arguments list will take precedence.
+ *
+ * Example:
+ *
+ * ```js
+ * var result = merge({foo: 123}, {foo: 456});
+ * console.log(result.foo); // outputs 456
+ * ```
+ *
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
+ */
+function merge(/* obj1, obj2, obj3, ... */) {
+  var result = {};
+  function assignValue(val, key) {
+    if (isPlainObject(result[key]) && isPlainObject(val)) {
+      result[key] = merge(result[key], val);
+    } else if (isPlainObject(val)) {
+      result[key] = merge({}, val);
+    } else if (isArray(val)) {
+      result[key] = val.slice();
+    } else {
+      result[key] = val;
+    }
+  }
 
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
+  for (var i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue);
+  }
+  return result;
 }
 
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
+/**
+ * Extends object a by mutably adding to it the properties of object b.
+ *
+ * @param {Object} a The object to be extended
+ * @param {Object} b The object to copy properties from
+ * @param {Object} thisArg The object to bind function to
+ * @return {Object} The resulting value of object a
+ */
+function extend(a, b, thisArg) {
+  forEach(b, function assignValue(val, key) {
+    if (thisArg && typeof val === 'function') {
+      a[key] = bind(val, thisArg);
+    } else {
+      a[key] = val;
+    }
+  });
+  return a;
 }
 
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
+/**
+ * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
+ *
+ * @param {string} content with BOM
+ * @return {string} content value without BOM
+ */
+function stripBOM(content) {
+  if (content.charCodeAt(0) === 0xFEFF) {
+    content = content.slice(1);
+  }
+  return content;
 }
 
+module.exports = {
+  isArray: isArray,
+  isArrayBuffer: isArrayBuffer,
+  isBuffer: isBuffer,
+  isFormData: isFormData,
+  isArrayBufferView: isArrayBufferView,
+  isString: isString,
+  isNumber: isNumber,
+  isObject: isObject,
+  isPlainObject: isPlainObject,
+  isUndefined: isUndefined,
+  isDate: isDate,
+  isFile: isFile,
+  isBlob: isBlob,
+  isFunction: isFunction,
+  isStream: isStream,
+  isURLSearchParams: isURLSearchParams,
+  isStandardBrowserEnv: isStandardBrowserEnv,
+  forEach: forEach,
+  merge: merge,
+  extend: extend,
+  trim: trim,
+  stripBOM: stripBOM
+};
 
-// 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 [''];
 
-  var parts = [];
-  var m = balanced('{', '}', str);
+/***/ }),
 
-  if (!m)
-    return str.split(',');
+/***/ "../../node_modules/axios/package.json":
+/***/ (function(module) {
 
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
+module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.21.1\",\"description\":\"Promise based HTTP client for the browser and node.js\",\"main\":\"index.js\",\"scripts\":{\"test\":\"grunt test && bundlesize\",\"start\":\"node ./sandbox/server.js\",\"build\":\"NODE_ENV=production grunt build\",\"preversion\":\"npm test\",\"version\":\"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json\",\"postversion\":\"git push && git push --tags\",\"examples\":\"node ./examples/server.js\",\"coveralls\":\"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js\",\"fix\":\"eslint --fix lib/**/*.js\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/axios/axios.git\"},\"keywords\":[\"xhr\",\"http\",\"ajax\",\"promise\",\"node\"],\"author\":\"Matt Zabriskie\",\"license\":\"MIT\",\"bugs\":{\"url\":\"https://github.com/axios/axios/issues\"},\"homepage\":\"https://github.com/axios/axios\",\"devDependencies\":{\"bundlesize\":\"^0.17.0\",\"coveralls\":\"^3.0.0\",\"es6-promise\":\"^4.2.4\",\"grunt\":\"^1.0.2\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.1.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^20.1.0\",\"grunt-karma\":\"^2.0.0\",\"grunt-mocha-test\":\"^0.13.3\",\"grunt-ts\":\"^6.0.0-beta.19\",\"grunt-webpack\":\"^1.0.18\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^1.3.0\",\"karma-chrome-launcher\":\"^2.2.0\",\"karma-coverage\":\"^1.1.1\",\"karma-firefox-launcher\":\"^1.1.0\",\"karma-jasmine\":\"^1.1.1\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-opera-launcher\":\"^1.0.0\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^1.2.0\",\"karma-sinon\":\"^1.0.5\",\"karma-sourcemap-loader\":\"^0.3.7\",\"karma-webpack\":\"^1.7.0\",\"load-grunt-tasks\":\"^3.5.2\",\"minimist\":\"^1.2.0\",\"mocha\":\"^5.2.0\",\"sinon\":\"^4.5.0\",\"typescript\":\"^2.8.1\",\"url-search-params\":\"^0.10.0\",\"webpack\":\"^1.13.1\",\"webpack-dev-server\":\"^1.14.1\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"jsdelivr\":\"dist/axios.min.js\",\"unpkg\":\"dist/axios.min.js\",\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"^1.10.0\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
 
-  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);
+/***/ "../../node_modules/balanced-match/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return parts;
-}
+"use strict";
 
-function expandTop(str) {
-  if (!str)
-    return [];
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
 
-  // 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);
-  }
+  var r = range(a, b, str);
 
-  return expand(escapeBraces(str), true).map(unescapeBraces);
+  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 identity(e) {
-  return e;
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
 }
 
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
-
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
-
-function expand(str, isTop) {
-  var expansions = [];
-
-  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;
-        });
-      }
-    }
-  }
-
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
-
-  // 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 N;
-
-  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;
-          }
-        }
-      }
-      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;
-}
-
-
-
-/***/ }),
-/* 249 */
-/***/ (function(module, exports) {
-
-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;
-};
-
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
-
-
-/***/ }),
-/* 250 */
-/***/ (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;
+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 = [];
@@ -21038,70109 +18712,70845 @@ function range(a, b, str) {
 
 
 /***/ }),
-/* 251 */
-/***/ (function(module, exports, __webpack_require__) {
-
-try {
-  var util = __webpack_require__(113);
-  /* istanbul ignore next */
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  /* istanbul ignore next */
-  module.exports = __webpack_require__(252);
-}
-
-
-/***/ }),
-/* 252 */
-/***/ (function(module, exports) {
-
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    if (superCtor) {
-      ctor.super_ = superCtor
-      ctor.prototype = Object.create(superCtor.prototype, {
-        constructor: {
-          value: ctor,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      })
-    }
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    if (superCtor) {
-      ctor.super_ = superCtor
-      var TempCtor = function () {}
-      TempCtor.prototype = superCtor.prototype
-      ctor.prototype = new TempCtor()
-      ctor.prototype.constructor = ctor
-    }
-  }
-}
 
-
-/***/ }),
-/* 253 */
+/***/ "../../node_modules/base/index.js":
 /***/ (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 util = __webpack_require__("util");
+var define = __webpack_require__("../../node_modules/base/node_modules/define-property/index.js");
+var CacheBase = __webpack_require__("../../node_modules/cache-base/index.js");
+var Emitter = __webpack_require__("../../node_modules/component-emitter/index.js");
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
+var merge = __webpack_require__("../../node_modules/mixin-deep/index.js");
+var pascal = __webpack_require__("../../node_modules/pascalcase/index.js");
+var cu = __webpack_require__("../../node_modules/class-utils/index.js");
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
+/**
+ * Optionally define a custom `cache` namespace to use.
+ */
 
+function namespace(name) {
+  var Cache = name ? CacheBase.namespace(name) : CacheBase;
+  var fns = [];
 
-/***/ }),
-/* 254 */
-/***/ (function(module, exports, __webpack_require__) {
+  /**
+   * Create an instance of `Base` with the given `config` and `options`.
+   *
+   * ```js
+   * // initialize with `config` and `options`
+   * var app = new Base({isApp: true}, {abc: true});
+   * app.set('foo', 'bar');
+   *
+   * // values defined with the given `config` object will be on the root of the instance
+   * console.log(app.baz); //=> undefined
+   * console.log(app.foo); //=> 'bar'
+   * // or use `.get`
+   * console.log(app.get('isApp')); //=> true
+   * console.log(app.get('foo')); //=> 'bar'
+   *
+   * // values defined with the given `options` object will be on `app.options
+   * console.log(app.options.abc); //=> true
+   * ```
+   *
+   * @param {Object} `config` If supplied, this object is passed to [cache-base][] to merge onto the the instance upon instantiation.
+   * @param {Object} `options` If supplied, this object is used to initialize the `base.options` object.
+   * @api public
+   */
 
-module.exports = globSync
-globSync.GlobSync = GlobSync
+  function Base(config, options) {
+    if (!(this instanceof Base)) {
+      return new Base(config, options);
+    }
+    Cache.call(this, config);
+    this.is('base');
+    this.initBase(config, options);
+  }
 
-var rp = __webpack_require__(245)
-var minimatch = __webpack_require__(247)
-var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(244).Glob
-var util = __webpack_require__(113)
-var path = __webpack_require__(4)
-var assert = __webpack_require__(162)
-var isAbsolute = __webpack_require__(253)
-var common = __webpack_require__(255)
-var setopts = common.setopts
-var ownProp = common.ownProp
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+  /**
+   * Inherit cache-base
+   */
 
-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')
+  util.inherits(Base, Cache);
 
-  return new GlobSync(pattern, options).found
-}
+  /**
+   * Add static emitter methods
+   */
 
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
+  Emitter(Base);
 
-  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')
+  /**
+   * Initialize `Base` defaults with the given `config` object
+   */
 
-  if (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
+  Base.prototype.initBase = function(config, options) {
+    this.options = merge({}, this.options, options);
+    this.cache = this.cache || {};
+    this.define('registered', {});
+    if (name) this[name] = {};
 
-  setopts(this, pattern, options)
+    // make `app._callbacks` non-enumerable
+    this.define('_callbacks', this._callbacks);
+    if (isObject(config)) {
+      this.visit('set', config);
+    }
+    Base.run(this, 'use', fns);
+  };
 
-  if (this.noprocess)
-    return this
+  /**
+   * Set the given `name` on `app._name` and `app.is*` properties. Used for doing
+   * lookups in plugins.
+   *
+   * ```js
+   * app.is('foo');
+   * console.log(app._name);
+   * //=> 'foo'
+   * console.log(app.isFoo);
+   * //=> true
+   * app.is('bar');
+   * console.log(app.isFoo);
+   * //=> true
+   * console.log(app.isBar);
+   * //=> true
+   * console.log(app._name);
+   * //=> 'bar'
+   * ```
+   * @name .is
+   * @param {String} `name`
+   * @return {Boolean}
+   * @api public
+   */
 
-  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()
-}
+  Base.prototype.is = function(name) {
+    if (typeof name !== 'string') {
+      throw new TypeError('expected name to be a string');
+    }
+    this.define('is' + pascal(name), true);
+    this.define('_name', name);
+    this.define('_appname', name);
+    return this;
+  };
 
-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
-        }
-      }
-    })
-  }
-  common.finish(this)
-}
+  /**
+   * Returns true if a plugin has already been registered on an instance.
+   *
+   * Plugin implementors are encouraged to use this first thing in a plugin
+   * to prevent the plugin from being called more than once on the same
+   * instance.
+   *
+   * ```js
+   * var base = new Base();
+   * base.use(function(app) {
+   *   if (app.isRegistered('myPlugin')) return;
+   *   // do stuff to `app`
+   * });
+   *
+   * // to also record the plugin as being registered
+   * base.use(function(app) {
+   *   if (app.isRegistered('myPlugin', true)) return;
+   *   // do stuff to `app`
+   * });
+   * ```
+   * @name .isRegistered
+   * @emits `plugin` Emits the name of the plugin being registered. Useful for unit tests, to ensure plugins are only registered once.
+   * @param {String} `name` The plugin name.
+   * @param {Boolean} `register` If the plugin if not already registered, to record it as being registered pass `true` as the second argument.
+   * @return {Boolean} Returns true if a plugin is already registered.
+   * @api public
+   */
 
+  Base.prototype.isRegistered = function(name, register) {
+    if (this.registered.hasOwnProperty(name)) {
+      return true;
+    }
+    if (register !== false) {
+      this.registered[name] = true;
+      this.emit('plugin', name);
+    }
+    return false;
+  };
 
-GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+  /**
+   * Define a plugin function to be called immediately upon init. Plugins are chainable
+   * and expose the following arguments to the plugin function:
+   *
+   * - `app`: the current instance of `Base`
+   * - `base`: the [first ancestor instance](#base) of `Base`
+   *
+   * ```js
+   * var app = new Base()
+   *   .use(foo)
+   *   .use(bar)
+   *   .use(baz)
+   * ```
+   * @name .use
+   * @param {Function} `fn` plugin function to call
+   * @return {Object} Returns the item instance for chaining.
+   * @api public
+   */
 
-  // 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.
+  Base.prototype.use = function(fn) {
+    fn.call(this, this);
+    return this;
+  };
 
-  // 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
+  /**
+   * The `.define` method is used for adding non-enumerable property on the instance.
+   * Dot-notation is **not supported** with `define`.
+   *
+   * ```js
+   * // arbitrary `render` function using lodash `template`
+   * app.define('render', function(str, locals) {
+   *   return _.template(str)(locals);
+   * });
+   * ```
+   * @name .define
+   * @param {String} `key` The name of the property to define.
+   * @param {any} `value`
+   * @return {Object} Returns the instance for chaining.
+   * @api public
+   */
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+  Base.prototype.define = function(key, val) {
+    if (isObject(key)) {
+      return this.visit('define', key);
+    }
+    define(this, key, val);
+    return this;
+  };
 
-    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
-  }
+  /**
+   * Mix property `key` onto the Base prototype. If base is inherited using
+   * `Base.extend` this method will be overridden by a new `mixin` method that will
+   * only add properties to the prototype of the inheriting application.
+   *
+   * ```js
+   * app.mixin('foo', function() {
+   *   // do stuff
+   * });
+   * ```
+   * @name .mixin
+   * @param {String} `key`
+   * @param {Object|Array} `val`
+   * @return {Object} Returns the `base` instance for chaining.
+   * @api public
+   */
 
-  var remain = pattern.slice(n)
+  Base.prototype.mixin = function(key, val) {
+    Base.prototype[key] = val;
+    return this;
+  };
 
-  // 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
+  /**
+   * Non-enumberable mixin array, used by the static [Base.mixin]() method.
+   */
 
-  var abs = this._makeAbs(read)
+  Base.prototype.mixins = Base.prototype.mixins || [];
 
-  //if ignored, skip processing
-  if (childrenIgnored(this, read))
-    return
-
-  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)
-}
+  /**
+   * Getter/setter used when creating nested instances of `Base`, for storing a reference
+   * to the first ancestor instance. This works by setting an instance of `Base` on the `parent`
+   * property of a "child" instance. The `base` property defaults to the current instance if
+   * no `parent` property is defined.
+   *
+   * ```js
+   * // create an instance of `Base`, this is our first ("base") instance
+   * var first = new Base();
+   * first.foo = 'bar'; // arbitrary property, to make it easier to see what's happening later
+   *
+   * // create another instance
+   * var second = new Base();
+   * // create a reference to the first instance (`first`)
+   * second.parent = first;
+   *
+   * // create another instance
+   * var third = new Base();
+   * // create a reference to the previous instance (`second`)
+   * // repeat this pattern every time a "child" instance is created
+   * third.parent = second;
+   *
+   * // we can always access the first instance using the `base` property
+   * console.log(first.base.foo);
+   * //=> 'bar'
+   * console.log(second.base.foo);
+   * //=> 'bar'
+   * console.log(third.base.foo);
+   * //=> 'bar'
+   * // and now you know how to get to third base ;)
+   * ```
+   * @name .base
+   * @api public
+   */
 
+  Object.defineProperty(Base.prototype, 'base', {
+    configurable: true,
+    get: function() {
+      return this.parent ? this.parent.base : this;
+    }
+  });
 
-GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
-  var entries = this._readdir(abs, inGlobStar)
+  /**
+   * Static method for adding global plugin functions that will
+   * be added to an instance when created.
+   *
+   * ```js
+   * Base.use(function(app) {
+   *   app.foo = 'bar';
+   * });
+   * var app = new Base();
+   * console.log(app.foo);
+   * //=> 'bar'
+   * ```
+   * @name #use
+   * @param {Function} `fn` Plugin function to use on each instance.
+   * @return {Object} Returns the `Base` constructor for chaining
+   * @api public
+   */
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return
+  define(Base, 'use', function(fn) {
+    fns.push(fn);
+    return Base;
+  });
 
-  // 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) === '.'
+  /**
+   * Run an array of functions by passing each function
+   * to a method on the given object specified by the given property.
+   *
+   * @param  {Object} `obj` Object containing method to use.
+   * @param  {String} `prop` Name of the method on the object to use.
+   * @param  {Array} `arr` Array of functions to pass to the method.
+   */
 
-  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)
+  define(Base, 'run', function(obj, prop, arr) {
+    var len = arr.length, i = 0;
+    while (len--) {
+      obj[prop](arr[i++]);
     }
-  }
-
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    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.
+    return Base;
+  });
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+  /**
+   * Static method for inheriting the prototype and static methods of the `Base` class.
+   * This method greatly simplifies the process of creating inheritance-based applications.
+   * See [static-extend][] for more details.
+   *
+   * ```js
+   * var extend = cu.extend(Parent);
+   * Parent.extend(Child);
+   *
+   * // optional methods
+   * Parent.extend(Child, {
+   *   foo: function() {},
+   *   bar: function() {}
+   * });
+   * ```
+   * @name #extend
+   * @param {Function} `Ctor` constructor to extend
+   * @param {Object} `methods` Optional prototype properties to mix in.
+   * @return {Object} Returns the `Base` constructor for chaining
+   * @api public
+   */
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix.slice(-1) !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+  define(Base, 'extend', cu.extend(Base, function(Ctor, Parent) {
+    Ctor.prototype.mixins = Ctor.prototype.mixins || [];
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
+    define(Ctor, 'mixin', function(fn) {
+      var mixin = fn(Ctor.prototype, Ctor);
+      if (typeof mixin === 'function') {
+        Ctor.prototype.mixins.push(mixin);
       }
-      this._emitMatch(index, e)
-    }
-    // This was the last one, and no stats were needed
-    return
-  }
+      return Ctor;
+    });
 
-  // 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)
-  }
-}
+    define(Ctor, 'mixins', function(Child) {
+      Base.run(Child, 'mixin', Ctor.prototype.mixins);
+      return Ctor;
+    });
 
+    Ctor.prototype.mixin = function(key, value) {
+      Ctor.prototype[key] = value;
+      return this;
+    };
+    return Base;
+  }));
 
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
+  /**
+   * Used for adding methods to the `Base` prototype, and/or to the prototype of child instances.
+   * When a mixin function returns a function, the returned function is pushed onto the `.mixins`
+   * array, making it available to be used on inheriting classes whenever `Base.mixins()` is
+   * called (e.g. `Base.mixins(Child)`).
+   *
+   * ```js
+   * Base.mixin(function(proto) {
+   *   proto.foo = function(msg) {
+   *     return 'foo ' + msg;
+   *   };
+   * });
+   * ```
+   * @name #mixin
+   * @param {Function} `fn` Function to call
+   * @return {Object} Returns the `Base` constructor for chaining
+   * @api public
+   */
 
-  var abs = this._makeAbs(e)
+  define(Base, 'mixin', function(fn) {
+    var mixin = fn(Base.prototype, Base);
+    if (typeof mixin === 'function') {
+      Base.prototype.mixins.push(mixin);
+    }
+    return Base;
+  });
 
-  if (this.mark)
-    e = this._mark(e)
+  /**
+   * Static method for running global mixin functions against a child constructor.
+   * Mixins must be registered before calling this method.
+   *
+   * ```js
+   * Base.extend(Child);
+   * Base.mixins(Child);
+   * ```
+   * @name #mixins
+   * @param {Function} `Child` Constructor function of a child class
+   * @return {Object} Returns the `Base` constructor for chaining
+   * @api public
+   */
 
-  if (this.absolute) {
-    e = abs
-  }
+  define(Base, 'mixins', function(Child) {
+    Base.run(Child, 'mixin', Base.prototype.mixins);
+    return Base;
+  });
 
-  if (this.matches[index][e])
-    return
+  /**
+   * Similar to `util.inherit`, but copies all static properties, prototype properties, and
+   * getters/setters from `Provider` to `Receiver`. See [class-utils][]{#inherit} for more details.
+   *
+   * ```js
+   * Base.inherit(Foo, Bar);
+   * ```
+   * @name #inherit
+   * @param {Function} `Receiver` Receiving (child) constructor
+   * @param {Function} `Provider` Providing (parent) constructor
+   * @return {Object} Returns the `Base` constructor for chaining
+   * @api public
+   */
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+  define(Base, 'inherit', cu.inherit);
+  define(Base, 'bubble', cu.bubble);
+  return Base;
+}
 
-  this.matches[index][e] = true
+/**
+ * Expose `Base` with default settings
+ */
 
-  if (this.stat)
-    this._stat(e)
-}
+module.exports = namespace();
 
+/**
+ * Allow users to define a namespace
+ */
 
-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)
+module.exports.namespace = namespace;
 
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = this.fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
-    }
-  }
 
-  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)
+/***/ "../../node_modules/base/node_modules/define-property/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return entries
-}
+"use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
 
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs)
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return null
+var isDescriptor = __webpack_require__("../../node_modules/is-descriptor/index.js");
 
-    if (Array.isArray(c))
-      return c
+module.exports = function defineProperty(obj, prop, val) {
+  if (typeof obj !== 'object' && typeof obj !== 'function') {
+    throw new TypeError('expected an object or function.');
   }
 
-  try {
-    return this._readdirEntries(abs, this.fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
+  if (typeof prop !== 'string') {
+    throw new TypeError('expected `prop` to be a string.');
   }
-}
 
-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 (isDescriptor(val) && ('set' in val || 'get' in val)) {
+    return Object.defineProperty(obj, prop, val);
   }
 
-  this.cache[abs] = entries
+  return Object.defineProperty(obj, prop, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
+};
 
-  // 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
+/***/ }),
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+/***/ "../../node_modules/brace-expansion/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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
-  }
-}
+var concatMap = __webpack_require__("../../node_modules/concat-map/index.js");
+var balanced = __webpack_require__("../../node_modules/balanced-match/index.js");
 
-GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
+module.exports = expandTop;
 
-  var entries = this._readdir(abs, inGlobStar)
+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';
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
 
-  // 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)
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
 
-  var len = entries.length
-  var isSym = this.symlinks[abs]
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return
+// 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 [''];
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+  var parts = [];
+  var m = balanced('{', '}', str);
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true)
+  if (!m)
+    return str.split(',');
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true)
+  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);
   }
-}
 
-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)
+  parts.push.apply(parts, p);
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+  return parts;
+}
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return
+function expandTop(str) {
+  if (!str)
+    return [];
 
-  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 += '/'
-    }
+  // 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);
   }
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
-
-  // Mark this as a match
-  this._emitMatch(index, prefix)
+  return expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
-// Returns either 'DIR', 'FILE', or false
-GlobSync.prototype._stat = function (f) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+function identity(e) {
+  return e;
+}
 
-  if (f.length > this.maxLength)
-    return false
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-
-    if (Array.isArray(c))
-      c = 'DIR'
-
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
 
-    if (needDir && c === 'FILE')
-      return false
+function expand(str, isTop) {
+  var expansions = [];
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
 
-  var exists
-  var stat = this.statCache[abs]
-  if (!stat) {
-    var lstat
-    try {
-      lstat = this.fs.lstatSync(abs)
-    } catch (er) {
-      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-        this.statCache[abs] = false
-        return false
-      }
+  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];
+  }
 
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = this.fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
+  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;
+        });
       }
-    } else {
-      stat = lstat
     }
   }
 
-  this.statCache[abs] = stat
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
+  // 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)
+    : [''];
 
-  this.cache[abs] = this.cache[abs] || c
+  var N;
 
-  if (needDir && c === 'FILE')
-    return false
+  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);
 
-  return c
-}
+    N = [];
 
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+    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) });
+  }
 
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
+  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;
 }
 
 
-/***/ }),
-/* 255 */
-/***/ (function(module, exports, __webpack_require__) {
 
-exports.setopts = setopts
-exports.ownProp = ownProp
-exports.makeAbs = makeAbs
-exports.finish = finish
-exports.mark = mark
-exports.isIgnored = isIgnored
-exports.childrenIgnored = childrenIgnored
+/***/ }),
 
-function ownProp (obj, field) {
-  return Object.prototype.hasOwnProperty.call(obj, field)
-}
+/***/ "../../node_modules/braces/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(132)
-var path = __webpack_require__(4)
-var minimatch = __webpack_require__(247)
-var isAbsolute = __webpack_require__(253)
-var Minimatch = minimatch.Minimatch
+"use strict";
 
-function alphasort (a, b) {
-  return a.localeCompare(b, 'en')
-}
 
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
+const stringify = __webpack_require__("../../node_modules/braces/lib/stringify.js");
+const compile = __webpack_require__("../../node_modules/braces/lib/compile.js");
+const expand = __webpack_require__("../../node_modules/braces/lib/expand.js");
+const parse = __webpack_require__("../../node_modules/braces/lib/parse.js");
 
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
+/**
+ * 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
+ */
 
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
-}
+const braces = (input, options = {}) => {
+  let output = [];
 
-// 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 })
+  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));
   }
 
-  return {
-    matcher: new Minimatch(pattern, { dot: true }),
-    gmatcher: gmatcher
+  if (options && options.expand === true && options.nodupes === true) {
+    output = [...new Set(output)];
   }
-}
+  return output;
+};
 
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
+/**
+ * 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
+ */
 
-  // 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
-  }
+braces.parse = (input, options = {}) => parse(input, options);
 
-  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.fs = options.fs || fs
+/**
+ * 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
+ */
 
-  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)
+braces.stringify = (input, options = {}) => {
+  if (typeof input === 'string') {
+    return stringify(braces.parse(input, options), options);
+  }
+  return stringify(input, options);
+};
 
-  setupIgnores(self, 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
+ */
 
-  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
+braces.compile = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
   }
+  return compile(input, options);
+};
 
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
-
-  // 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
+/**
+ * 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
+ */
 
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
+braces.expand = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
 
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
-}
+  let result = expand(input, options);
 
-function finish (self) {
-  var nou = self.nounique
-  var all = nou ? [] : Object.create(null)
+  // filter out empty strings if specified
+  if (options.noempty === true) {
+    result = result.filter(Boolean);
+  }
 
-  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
-        })
-    }
+  // filter out duplicates if specified
+  if (options.nodupes === true) {
+    result = [...new Set(result)];
   }
 
-  if (!nou)
-    all = Object.keys(all)
+  return result;
+};
 
-  if (!self.nosort)
-    all = all.sort(alphasort)
+/**
+ * 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
+ */
 
-  // 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
-      })
-    }
+braces.create = (input, options = {}) => {
+  if (input === '' || input.length < 3) {
+    return [input];
   }
 
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
-
-  self.found = all
-}
+ return options.expand !== true
+    ? braces.compile(input, options)
+    : braces.expand(input, options);
+};
 
-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) === '/'
+/**
+ * Expose "braces"
+ */
 
-    if (isDir && !slash)
-      m += '/'
-    else if (!isDir && slash)
-      m = m.slice(0, -1)
+module.exports = braces;
 
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
-    }
-  }
 
-  return m
-}
+/***/ }),
 
-// 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)
-  }
+/***/ "../../node_modules/braces/lib/compile.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
+"use strict";
 
-  return abs
-}
 
+const fill = __webpack_require__("../../node_modules/fill-range/index.js");
+const utils = __webpack_require__("../../node_modules/braces/lib/utils.js");
 
-// 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
+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 = '';
 
-  return self.ignore.some(function(item) {
-    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
+    if (node.isOpen === true) {
+      return prefix + node.value;
+    }
+    if (node.isClose === true) {
+      return prefix + node.value;
+    }
 
-function childrenIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
+    if (node.type === 'open') {
+      return invalid ? (prefix + node.value) : '(';
+    }
 
-  return self.ignore.some(function(item) {
-    return !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
+    if (node.type === 'close') {
+      return invalid ? (prefix + node.value) : ')';
+    }
 
+    if (node.type === 'comma') {
+      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
+    }
 
-/***/ }),
-/* 256 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (node.value) {
+      return node.value;
+    }
 
-var wrappy = __webpack_require__(170)
-var reqs = Object.create(null)
-var once = __webpack_require__(169)
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
+      let range = fill(...args, { ...options, wrap: false, toRegex: true });
 
-module.exports = wrappy(inflight)
+      if (range.length !== 0) {
+        return args.length > 1 && range.length > 1 ? `(${range})` : range;
+      }
+    }
 
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
-
-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]
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += walk(child, node);
       }
     }
-  })
-}
+    return output;
+  };
 
-function slice (args) {
-  var length = args.length
-  var array = []
+  return walk(ast);
+};
 
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
+module.exports = compile;
 
 
 /***/ }),
-/* 257 */
+
+/***/ "../../node_modules/braces/lib/constants.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const taskManager = __webpack_require__(258);
-const async_1 = __webpack_require__(287);
-const stream_1 = __webpack_require__(322);
-const sync_1 = __webpack_require__(323);
-const settings_1 = __webpack_require__(325);
-const utils = __webpack_require__(259);
-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;
+
+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 */
+
+  CHAR_LEFT_PARENTHESES: '(', /* ( */
+  CHAR_RIGHT_PARENTHESES: ')', /* ) */
+
+  CHAR_ASTERISK: '*', /* * */
+
+  // 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 */
+};
 
 
 /***/ }),
-/* 258 */
+
+/***/ "../../node_modules/braces/lib/expand.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
-const utils = __webpack_require__(259);
-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;
-/**
- * Returns tasks grouped by basic pattern directories.
- *
- * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
- * This is necessary because directory traversal starts at the base directory and goes deeper.
- */
-function convertPatternsToTasks(positive, negative, dynamic) {
-    const tasks = [];
-    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
-    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
-    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
-    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
-    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
-    /*
-     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
-     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
-     */
-    if ('.' in insideCurrentDirectoryGroup) {
-        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
+
+const fill = __webpack_require__("../../node_modules/fill-range/index.js");
+const stringify = __webpack_require__("../../node_modules/braces/lib/stringify.js");
+const utils = __webpack_require__("../../node_modules/braces/lib/utils.js");
+
+const append = (queue = '', stash = '', enclose = false) => {
+  let result = [];
+
+  queue = [].concat(queue);
+  stash = [].concat(stash);
+
+  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));
+      }
     }
-    else {
-        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
+  }
+  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;
     }
-    return tasks;
-}
-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;
 
+    if (node.invalid || node.dollar) {
+      q.push(append(q.pop(), stringify(node, options)));
+      return;
+    }
 
-/***/ }),
-/* 259 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
+      q.push(append(q.pop(), ['{}']));
+      return;
+    }
 
-"use strict";
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
-const array = __webpack_require__(260);
-exports.array = array;
-const errno = __webpack_require__(261);
-exports.errno = errno;
-const fs = __webpack_require__(262);
-exports.fs = fs;
-const path = __webpack_require__(263);
-exports.path = path;
-const pattern = __webpack_require__(264);
-exports.pattern = pattern;
-const stream = __webpack_require__(285);
-exports.stream = stream;
-const string = __webpack_require__(286);
-exports.string = string;
+      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);
+      }
 
-/***/ }),
-/* 260 */
-/***/ (function(module, exports, __webpack_require__) {
+      q.push(append(q.pop(), range));
+      node.nodes = [];
+      return;
+    }
 
-"use strict";
+    let enclose = utils.encloseBrace(node);
+    let queue = node.queue;
+    let block = node;
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitWhen = exports.flatten = void 0;
-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);
-        }
+    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
+      block = block.parent;
+      queue = block.queue;
     }
-    return result;
-}
-exports.splitWhen = splitWhen;
 
+    for (let i = 0; i < node.nodes.length; i++) {
+      let child = node.nodes[i];
 
-/***/ }),
-/* 261 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (child.type === 'comma' && node.type === 'brace') {
+        if (i === 1) queue.push('');
+        queue.push('');
+        continue;
+      }
 
-"use strict";
+      if (child.type === 'close') {
+        q.push(append(q.pop(), queue, enclose));
+        continue;
+      }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnoentCodeError = void 0;
-function isEnoentCodeError(error) {
-    return error.code === 'ENOENT';
-}
-exports.isEnoentCodeError = isEnoentCodeError;
+      if (child.value && child.type !== 'open') {
+        queue.push(append(queue.pop(), child.value));
+        continue;
+      }
 
+      if (child.nodes) {
+        walk(child, node);
+      }
+    }
 
-/***/ }),
-/* 262 */
-/***/ (function(module, exports, __webpack_require__) {
+    return queue;
+  };
 
-"use strict";
+  return utils.flatten(walk(ast));
+};
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDirentFromStats = void 0;
-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;
+module.exports = expand;
 
 
 /***/ }),
-/* 263 */
+
+/***/ "../../node_modules/braces/lib/parse.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
-const path = __webpack_require__(4);
-const LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; // ./ or .\\
-const UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
+
+const stringify = __webpack_require__("../../node_modules/braces/lib/stringify.js");
+
 /**
- * Designed to work only with simple paths: `dir\\file`.
+ * Constants
  */
-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;
 
+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__("../../node_modules/braces/lib/constants.js");
+
+/**
+ * parse
+ */
 
-/***/ }),
-/* 264 */
-/***/ (function(module, exports, __webpack_require__) {
+const parse = (input, options = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
 
-"use strict";
+  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})`);
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
-const path = __webpack_require__(4);
-const globParent = __webpack_require__(265);
-const micromatch = __webpack_require__(268);
-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 = {}) {
-    /**
-     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
-     * An empty string cannot be a dynamic pattern.
-     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
-     */
-    if (pattern === '') {
-        return false;
+  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 = {};
+
+  /**
+   * Helpers
+   */
+
+  const advance = () => input[index++];
+  const push = node => {
+    if (node.type === 'text' && prev.type === 'dot') {
+      prev.type = 'text';
     }
-    /**
-     * 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;
+
+    if (prev && prev.type === 'text' && node.type === 'text') {
+      prev.value += node.value;
+      return;
     }
-    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;
-/**
- * Returns patterns that can be applied inside the current directory.
- *
- * @example
- * // ['./*', '*', 'a/*']
- * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
- */
-function getPatternsInsideCurrentDirectory(patterns) {
-    return patterns.filter((pattern) => !isPatternRelatedToParentDirectory(pattern));
-}
-exports.getPatternsInsideCurrentDirectory = getPatternsInsideCurrentDirectory;
-/**
- * Returns patterns to be expanded relative to (outside) the current directory.
- *
- * @example
- * // ['../*', './../*']
- * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
- */
-function getPatternsOutsideCurrentDirectory(patterns) {
-    return patterns.filter(isPatternRelatedToParentDirectory);
-}
-exports.getPatternsOutsideCurrentDirectory = getPatternsOutsideCurrentDirectory;
-function isPatternRelatedToParentDirectory(pattern) {
-    return pattern.startsWith('..') || pattern.startsWith('./..');
-}
-exports.isPatternRelatedToParentDirectory = isPatternRelatedToParentDirectory;
-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) {
-    let { parts } = micromatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
+
+    block.nodes.push(node);
+    node.parent = block;
+    node.prev = prev;
+    prev = node;
+    return node;
+  };
+
+  push({ type: 'bos' });
+
+  while (index < length) {
+    block = stack[stack.length - 1];
+    value = advance();
+
     /**
-     * The scan method returns an empty array in some cases.
-     * See micromatch/picomatch#58 for more details.
+     * Invalid chars
      */
-    if (parts.length === 0) {
-        parts = [pattern];
+
+    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
+      continue;
     }
+
     /**
-     * The scan method does not return an empty part for the pattern with a forward slash.
-     * This is another part of micromatch/picomatch#58.
+     * Escaped chars
      */
-    if (parts[0].startsWith('/')) {
-        parts[0] = parts[0].slice(1);
-        parts.unshift('');
-    }
-    return 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;
-
 
-/***/ }),
-/* 265 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+    if (value === CHAR_BACKSLASH) {
+      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
+      continue;
+    }
 
+    /**
+     * Right square bracket (literal): ']'
+     */
 
-var isGlob = __webpack_require__(266);
-var pathPosixDirname = __webpack_require__(4).posix.dirname;
-var isWin32 = __webpack_require__(122).platform() === 'win32';
+    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
+      push({ type: 'text', value: '\\' + value });
+      continue;
+    }
 
-var slash = '/';
-var backslash = /\\/g;
-var enclosure = /[\{\[].*[\}\]]$/;
-var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
-var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
+    /**
+     * Left square bracket: '['
+     */
 
-/**
- * @param {string} str
- * @param {Object} opts
- * @param {boolean} [opts.flipBackslashes=true]
- * @returns {string}
- */
-module.exports = function globParent(str, opts) {
-  var options = Object.assign({ flipBackslashes: true }, opts);
+    if (value === CHAR_LEFT_SQUARE_BRACKET) {
+      brackets++;
 
-  // flip windows path separators
-  if (options.flipBackslashes && isWin32 && str.indexOf(slash) < 0) {
-    str = str.replace(backslash, slash);
-  }
+      let closed = true;
+      let next;
 
-  // special case for strings ending in enclosure containing path separator
-  if (enclosure.test(str)) {
-    str += slash;
-  }
+      while (index < length && (next = advance())) {
+        value += next;
 
-  // preserves full path in case of trailing path separator
-  str += 'a';
+        if (next === CHAR_LEFT_SQUARE_BRACKET) {
+          brackets++;
+          continue;
+        }
 
-  // remove path parts that are globby
-  do {
-    str = pathPosixDirname(str);
-  } while (isGlob(str) || globby.test(str));
+        if (next === CHAR_BACKSLASH) {
+          value += advance();
+          continue;
+        }
 
-  // remove escape chars and return result
-  return str.replace(escaped, '$1');
-};
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          brackets--;
 
+          if (brackets === 0) {
+            break;
+          }
+        }
+      }
 
-/***/ }),
-/* 266 */
-/***/ (function(module, exports, __webpack_require__) {
+      push({ type: 'text', value });
+      continue;
+    }
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+    /**
+     * Parentheses
+     */
 
-var isExtglob = __webpack_require__(267);
-var chars = { '{': '}', '(': ')', '[': ']'};
-var strictCheck = function(str) {
-  if (str[0] === '!') {
-    return true;
-  }
-  var index = 0;
-  var pipeIndex = -2;
-  var closeSquareIndex = -2;
-  var closeCurlyIndex = -2;
-  var closeParenIndex = -2;
-  var backSlashIndex = -2;
-  while (index < str.length) {
-    if (str[index] === '*') {
-      return true;
+    if (value === CHAR_LEFT_PARENTHESES) {
+      block = push({ type: 'paren', nodes: [] });
+      stack.push(block);
+      push({ type: 'text', value });
+      continue;
     }
 
-    if (str[index + 1] === '?' && /[\].+)]/.test(str[index])) {
-      return true;
+    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;
     }
 
-    if (closeSquareIndex !== -1 && str[index] === '[' && str[index + 1] !== ']') {
-      if (closeSquareIndex < index) {
-        closeSquareIndex = str.indexOf(']', index);
-      }
-      if (closeSquareIndex > index) {
-        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
-          return true;
-        }
-        backSlashIndex = str.indexOf('\\', index);
-        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
-          return true;
-        }
+    /**
+     * Quotes: '|"|`
+     */
+
+    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
+      let open = value;
+      let next;
+
+      if (options.keepQuotes !== true) {
+        value = '';
       }
-    }
 
-    if (closeCurlyIndex !== -1 && str[index] === '{' && str[index + 1] !== '}') {
-      closeCurlyIndex = str.indexOf('}', index);
-      if (closeCurlyIndex > index) {
-        backSlashIndex = str.indexOf('\\', index);
-        if (backSlashIndex === -1 || backSlashIndex > closeCurlyIndex) {
-          return true;
+      while (index < length && (next = advance())) {
+        if (next === CHAR_BACKSLASH) {
+          value += next + advance();
+          continue;
         }
-      }
-    }
 
-    if (closeParenIndex !== -1 && str[index] === '(' && str[index + 1] === '?' && /[:!=]/.test(str[index + 2]) && str[index + 3] !== ')') {
-      closeParenIndex = str.indexOf(')', index);
-      if (closeParenIndex > index) {
-        backSlashIndex = str.indexOf('\\', index);
-        if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
-          return true;
+        if (next === open) {
+          if (options.keepQuotes === true) value += next;
+          break;
         }
+
+        value += next;
       }
+
+      push({ type: 'text', value });
+      continue;
     }
 
-    if (pipeIndex !== -1 && str[index] === '(' && str[index + 1] !== '|') {
-      if (pipeIndex < index) {
-        pipeIndex = str.indexOf('|', index);
-      }
-      if (pipeIndex !== -1 && str[pipeIndex + 1] !== ')') {
-        closeParenIndex = str.indexOf(')', pipeIndex);
-        if (closeParenIndex > pipeIndex) {
-          backSlashIndex = str.indexOf('\\', pipeIndex);
-          if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
-            return true;
-          }
-        }
-      }
+    /**
+     * Left curly brace: '{'
+     */
+
+    if (value === CHAR_LEFT_CURLY_BRACE) {
+      depth++;
+
+      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: []
+      };
+
+      block = push(brace);
+      stack.push(block);
+      push({ type: 'open', value });
+      continue;
     }
 
-    if (str[index] === '\\') {
-      var open = str[index + 1];
-      index += 2;
-      var close = chars[open];
+    /**
+     * Right curly brace: '}'
+     */
 
-      if (close) {
-        var n = str.indexOf(close, index);
-        if (n !== -1) {
-          index = n + 1;
-        }
+    if (value === CHAR_RIGHT_CURLY_BRACE) {
+      if (block.type !== 'brace') {
+        push({ type: 'text', value });
+        continue;
       }
 
-      if (str[index] === '!') {
-        return true;
-      }
-    } else {
-      index++;
-    }
-  }
-  return false;
-};
+      let type = 'close';
+      block = stack.pop();
+      block.close = true;
 
-var relaxedCheck = function(str) {
-  if (str[0] === '!') {
-    return true;
-  }
-  var index = 0;
-  while (index < str.length) {
-    if (/[*?{}()[\]]/.test(str[index])) {
-      return true;
+      push({ type, value });
+      depth--;
+
+      block = stack[stack.length - 1];
+      continue;
     }
 
-    if (str[index] === '\\') {
-      var open = str[index + 1];
-      index += 2;
-      var close = chars[open];
+    /**
+     * Comma: ','
+     */
 
-      if (close) {
-        var n = str.indexOf(close, index);
-        if (n !== -1) {
-          index = n + 1;
-        }
+    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) }];
       }
 
-      if (str[index] === '!') {
-        return true;
-      }
-    } else {
-      index++;
+      push({ type: 'comma', value });
+      block.commas++;
+      continue;
     }
-  }
-  return false;
-};
 
-module.exports = function isGlob(str, options) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+    /**
+     * Dot: '.'
+     */
 
-  if (isExtglob(str)) {
-    return true;
-  }
+    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
+      let siblings = block.nodes;
 
-  var check = strictCheck;
+      if (depth === 0 || siblings.length === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
 
-  // optionally relax check
-  if (options && options.strict === false) {
-    check = relaxedCheck;
-  }
+      if (prev.type === 'dot') {
+        block.range = [];
+        prev.value += value;
+        prev.type = 'range';
 
-  return check(str);
-};
+        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
+          block.invalid = true;
+          block.ranges = 0;
+          prev.type = 'text';
+          continue;
+        }
+
+        block.ranges++;
+        block.args = [];
+        continue;
+      }
 
+      if (prev.type === 'range') {
+        siblings.pop();
 
-/***/ }),
-/* 267 */
-/***/ (function(module, exports) {
+        let before = siblings[siblings.length - 1];
+        before.value += prev.value + value;
+        prev = before;
+        block.ranges--;
+        continue;
+      }
 
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+      push({ type: 'dot', value });
+      continue;
+    }
 
-module.exports = function isExtglob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+    /**
+     * Text
+     */
 
-  var match;
-  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
+    push({ type: 'text', value });
   }
 
-  return false;
+  // 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;
 };
 
+module.exports = parse;
+
 
 /***/ }),
-/* 268 */
+
+/***/ "../../node_modules/braces/lib/stringify.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const util = __webpack_require__(113);
-const braces = __webpack_require__(269);
-const picomatch = __webpack_require__(279);
-const utils = __webpack_require__(282);
-const isEmptyString = val => val === '' || val === './';
+const utils = __webpack_require__("../../node_modules/braces/lib/utils.js");
 
-/**
- * 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);
-
-  let omit = new Set();
-  let keep = new Set();
-  let items = new Set();
-  let negatives = 0;
-
-  let onResult = state => {
-    items.add(state.output);
-    if (options && options.onResult) {
-      options.onResult(state);
-    }
-  };
-
-  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++;
-
-    for (let item of list) {
-      let matched = isMatch(item, true);
-
-      let match = negated ? !matched.isMatch : matched.isMatch;
-      if (!match) continue;
+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 (negated) {
-        omit.add(matched.output);
-      } else {
-        omit.delete(matched.output);
-        keep.add(matched.output);
+    if (node.value) {
+      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
+        return '\\' + node.value;
       }
+      return node.value;
     }
-  }
 
-  let result = negatives === patterns.length ? [...items] : [...keep];
-  let matches = result.filter(item => !omit.has(item));
-
-  if (options && matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+    if (node.value) {
+      return node.value;
     }
 
-    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 += stringify(child);
+      }
     }
-  }
+    return output;
+  };
 
-  return matches;
+  return stringify(ast);
 };
 
-/**
- * Backwards compatibility
- */
-
-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]);
- *
- * 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
- */
-
-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);
-
-/**
- * Backwards compatibility
- */
-
-micromatch.any = micromatch.isMatch;
-
-/**
- * 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
- */
-
-micromatch.not = (list, patterns, options = {}) => {
-  patterns = [].concat(patterns).map(String);
-  let result = new Set();
-  let items = [];
 
-  let onResult = state => {
-    if (options.onResult) options.onResult(state);
-    items.push(state.output);
-  };
 
-  let matches = micromatch(list, patterns, { ...options, onResult });
+/***/ }),
 
-  for (let item of items) {
-    if (!matches.includes(item)) {
-      result.add(item);
-    }
-  }
-  return [...result];
-};
+/***/ "../../node_modules/braces/lib/utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * 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 any of the patterns matches any part of `str`.
- * @api public
- */
+"use strict";
 
-micromatch.contains = (str, pattern, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
-  }
 
-  if (Array.isArray(pattern)) {
-    return pattern.some(p => micromatch.contains(str, p, options));
+exports.isInteger = num => {
+  if (typeof num === 'number') {
+    return Number.isInteger(num);
   }
-
-  if (typeof pattern === 'string') {
-    if (isEmptyString(str) || isEmptyString(pattern)) {
-      return false;
-    }
-
-    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
-      return true;
-    }
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isInteger(Number(num));
   }
-
-  return micromatch.isMatch(str, pattern, { ...options, contains: true });
+  return false;
 };
 
 /**
- * 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
+ * Find a node of the given type
  */
 
-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;
-};
+exports.find = (node, type) => node.nodes.find(node => node.type === type);
 
 /**
- * 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` matches any of the strings in `list`
- * @api public
+ * Find a node of the given type
  */
 
-micromatch.some = (list, patterns, options) => {
-  let items = [].concat(list);
-
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (items.some(item => isMatch(item))) {
-      return true;
-    }
-  }
-  return false;
+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;
 };
 
 /**
- * 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 all `patterns` matches all of the strings in `list`
- * @api public
+ * Escape the given node with '\\' before node.value
  */
 
-micromatch.every = (list, patterns, options) => {
-  let items = [].concat(list);
+exports.escapeNode = (block, n = 0, type) => {
+  let node = block.nodes[n];
+  if (!node) return;
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (!items.every(item => isMatch(item))) {
-      return false;
+  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
+    if (node.escaped !== true) {
+      node.value = '\\' + node.value;
+      node.escaped = true;
     }
   }
-  return true;
 };
 
 /**
- * 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
+ * Returns true if the given brace node should be enclosed in literal braces
  */
 
-micromatch.all = (str, patterns, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+exports.encloseBrace = node => {
+  if (node.type !== 'brace') return false;
+  if ((node.commas >> 0 + node.ranges >> 0) === 0) {
+    node.invalid = true;
+    return true;
   }
-
-  return [].concat(patterns).every(p => picomatch(p, options)(str));
+  return false;
 };
 
 /**
- * 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 {Array|null} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
- * @api public
+ * Returns true if a brace node is invalid.
  */
 
-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);
-
-  if (match) {
-    return match.slice(1).map(v => v === void 0 ? '' : v);
+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;
   }
-};
-
-/**
- * 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
- */
-
-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
- */
-
-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));
-    }
+  if (block.open !== true || block.close !== true) {
+    block.invalid = true;
+    return true;
   }
-  return res;
+  return false;
 };
 
 /**
- * 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
+ * Returns true if a node is an open or close node
  */
 
-micromatch.braces = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  if ((options && options.nobrace === true) || !/\{.*\}/.test(pattern)) {
-    return [pattern];
+exports.isOpenOrClose = node => {
+  if (node.type === 'open' || node.type === 'close') {
+    return true;
   }
-  return braces(pattern, options);
+  return node.open === true || node.close === true;
 };
 
 /**
- * Expand braces
+ * Reduce an array of text nodes.
  */
 
-micromatch.braceExpand = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  return micromatch.braces(pattern, { ...options, expand: true });
-};
+exports.reduce = nodes => nodes.reduce((acc, node) => {
+  if (node.type === 'text') acc.push(node.value);
+  if (node.type === 'range') node.type = 'text';
+  return acc;
+}, []);
 
 /**
- * Expose micromatch
+ * Flatten an array
  */
 
-module.exports = micromatch;
+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;
+};
 
 
 /***/ }),
-/* 269 */
+
+/***/ "../../node_modules/cache-base/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(270);
-const compile = __webpack_require__(272);
-const expand = __webpack_require__(276);
-const parse = __webpack_require__(277);
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
+var Emitter = __webpack_require__("../../node_modules/component-emitter/index.js");
+var visit = __webpack_require__("../../node_modules/collection-visit/index.js");
+var toPath = __webpack_require__("../../node_modules/to-object-path/index.js");
+var union = __webpack_require__("../../node_modules/union-value/index.js");
+var del = __webpack_require__("../../node_modules/unset-value/index.js");
+var get = __webpack_require__("../../node_modules/get-value/index.js");
+var has = __webpack_require__("../../node_modules/has-value/index.js");
+var set = __webpack_require__("../../node_modules/cache-base/node_modules/set-value/index.js");
 
 /**
- * Expand the given pattern or create a regex-compatible string.
+ * Create a `Cache` constructor that when instantiated will
+ * store values on the given `prop`.
  *
  * ```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']
+ * var Cache = require('cache-base').namespace('data');
+ * var cache = new Cache();
+ *
+ * cache.set('foo', 'bar');
+ * //=> {data: {foo: 'bar'}}
  * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
+ * @param {String} `prop` The property name to use for storing values.
+ * @return {Function} Returns a custom `Cache` constructor
  * @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);
-      }
-    }
-  } else {
-    output = [].concat(braces.create(input, options));
-  }
+function namespace(prop) {
 
-  if (options && options.expand === true && options.nodupes === true) {
-    output = [...new Set(output)];
-  }
-  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);
-
-/**
- * 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
- */
-
-braces.stringify = (input, options = {}) => {
-  if (typeof input === 'string') {
-    return stringify(braces.parse(input, options), options);
-  }
-  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
- */
-
-braces.compile = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
-  }
-  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
- */
+  /**
+   * Create a new `Cache`. Internally the `Cache` constructor is created using
+   * the `namespace` function, with `cache` defined as the storage object.
+   *
+   * ```js
+   * var app = new Cache();
+   * ```
+   * @param {Object} `cache` Optionally pass an object to initialize with.
+   * @constructor
+   * @api public
+   */
 
-braces.expand = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
+  function Cache(cache) {
+    if (prop) {
+      this[prop] = {};
+    }
+    if (cache) {
+      this.set(cache);
+    }
   }
 
-  let result = expand(input, options);
+  /**
+   * Inherit Emitter
+   */
 
-  // filter out empty strings if specified
-  if (options.noempty === true) {
-    result = result.filter(Boolean);
-  }
+  Emitter(Cache.prototype);
 
-  // filter out duplicates if specified
-  if (options.nodupes === true) {
-    result = [...new Set(result)];
-  }
+  /**
+   * Assign `value` to `key`. Also emits `set` with
+   * the key and value.
+   *
+   * ```js
+   * app.on('set', function(key, val) {
+   *   // do something when `set` is emitted
+   * });
+   *
+   * app.set(key, value);
+   *
+   * // also takes an object or array
+   * app.set({name: 'Halle'});
+   * app.set([{foo: 'bar'}, {baz: 'quux'}]);
+   * console.log(app);
+   * //=> {name: 'Halle', foo: 'bar', baz: 'quux'}
+   * ```
+   *
+   * @name .set
+   * @emits `set` with `key` and `value` as arguments.
+   * @param {String} `key`
+   * @param {any} `value`
+   * @return {Object} Returns the instance for chaining.
+   * @api public
+   */
 
-  return result;
-};
+  Cache.prototype.set = function(key, val) {
+    if (Array.isArray(key) && arguments.length === 2) {
+      key = toPath(key);
+    }
+    if (isObject(key) || Array.isArray(key)) {
+      this.visit('set', key);
+    } else {
+      set(prop ? this[prop] : this, key, val);
+      this.emit('set', key, val);
+    }
+    return this;
+  };
 
-/**
- * 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
- */
+  /**
+   * Union `array` to `key`. Also emits `set` with
+   * the key and value.
+   *
+   * ```js
+   * app.union('a.b', ['foo']);
+   * app.union('a.b', ['bar']);
+   * console.log(app.get('a'));
+   * //=> {b: ['foo', 'bar']}
+   * ```
+   * @name .union
+   * @param {String} `key`
+   * @param {any} `value`
+   * @return {Object} Returns the instance for chaining.
+   * @api public
+   */
 
-braces.create = (input, options = {}) => {
-  if (input === '' || input.length < 3) {
-    return [input];
-  }
+  Cache.prototype.union = function(key, val) {
+    if (Array.isArray(key) && arguments.length === 2) {
+      key = toPath(key);
+    }
+    var ctx = prop ? this[prop] : this;
+    union(ctx, key, arrayify(val));
+    this.emit('union', val);
+    return this;
+  };
 
- return options.expand !== true
-    ? braces.compile(input, options)
-    : braces.expand(input, options);
-};
+  /**
+   * Return the value of `key`. Dot notation may be used
+   * to get [nested property values][get-value].
+   *
+   * ```js
+   * app.set('a.b.c', 'd');
+   * app.get('a.b');
+   * //=> {c: 'd'}
+   *
+   * app.get(['a', 'b']);
+   * //=> {c: 'd'}
+   * ```
+   *
+   * @name .get
+   * @emits `get` with `key` and `value` as arguments.
+   * @param {String} `key` The name of the property to get. Dot-notation may be used.
+   * @return {any} Returns the value of `key`
+   * @api public
+   */
 
-/**
- * Expose "braces"
- */
+  Cache.prototype.get = function(key) {
+    key = toPath(arguments);
 
-module.exports = braces;
+    var ctx = prop ? this[prop] : this;
+    var val = get(ctx, key);
 
+    this.emit('get', key, val);
+    return val;
+  };
 
-/***/ }),
-/* 270 */
-/***/ (function(module, exports, __webpack_require__) {
+  /**
+   * Return true if app has a stored value for `key`,
+   * false only if value is `undefined`.
+   *
+   * ```js
+   * app.set('foo', 'bar');
+   * app.has('foo');
+   * //=> true
+   * ```
+   *
+   * @name .has
+   * @emits `has` with `key` and true or false as arguments.
+   * @param {String} `key`
+   * @return {Boolean}
+   * @api public
+   */
 
-"use strict";
+  Cache.prototype.has = function(key) {
+    key = toPath(arguments);
 
+    var ctx = prop ? this[prop] : this;
+    var val = get(ctx, key);
 
-const utils = __webpack_require__(271);
+    var has = typeof val !== 'undefined';
+    this.emit('has', key, has);
+    return has;
+  };
 
-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 = '';
+  /**
+   * Delete one or more properties from the instance.
+   *
+   * ```js
+   * app.del(); // delete all
+   * // or
+   * app.del('foo');
+   * // or
+   * app.del(['foo', 'bar']);
+   * ```
+   * @name .del
+   * @emits `del` with the `key` as the only argument.
+   * @param {String|Array} `key` Property name or array of property names.
+   * @return {Object} Returns the instance for chaining.
+   * @api public
+   */
 
-    if (node.value) {
-      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
-        return '\\' + node.value;
-      }
-      return node.value;
+  Cache.prototype.del = function(key) {
+    if (Array.isArray(key)) {
+      this.visit('del', key);
+    } else {
+      del(prop ? this[prop] : this, key);
+      this.emit('del', key);
     }
+    return this;
+  };
 
-    if (node.value) {
-      return node.value;
-    }
+  /**
+   * Reset the entire cache to an empty object.
+   *
+   * ```js
+   * app.clear();
+   * ```
+   * @api public
+   */
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += stringify(child);
-      }
+  Cache.prototype.clear = function() {
+    if (prop) {
+      this[prop] = {};
     }
-    return output;
   };
 
-  return stringify(ast);
-};
-
-
-
-/***/ }),
-/* 271 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  /**
+   * Visit `method` over the properties in the given object, or map
+   * visit over the object-elements in an array.
+   *
+   * @name .visit
+   * @param {String} `method` The name of the `base` method to call.
+   * @param {Object|Array} `val` The object or array to iterate over.
+   * @return {Object} Returns the instance for chaining.
+   * @api public
+   */
 
+  Cache.prototype.visit = function(method, val) {
+    visit(this, method, val);
+    return this;
+  };
 
-exports.isInteger = num => {
-  if (typeof num === 'number') {
-    return Number.isInteger(num);
-  }
-  if (typeof num === 'string' && num.trim() !== '') {
-    return Number.isInteger(Number(num));
-  }
-  return false;
-};
+  return Cache;
+}
 
 /**
- * Find a node of the given type
+ * Cast val to an array
  */
 
-exports.find = (node, type) => node.nodes.find(node => node.type === type);
+function arrayify(val) {
+  return val ? (Array.isArray(val) ? val : [val]) : [];
+}
 
 /**
- * Find a node of the given type
+ * Expose `Cache`
  */
 
-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;
-};
+module.exports = namespace();
 
 /**
- * Escape the given node with '\\' before node.value
+ * Expose `Cache.namespace`
  */
 
-exports.escapeNode = (block, n = 0, type) => {
-  let node = block.nodes[n];
-  if (!node) return;
+module.exports.namespace = namespace;
 
-  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
-    if (node.escaped !== true) {
-      node.value = '\\' + node.value;
-      node.escaped = true;
-    }
-  }
-};
 
-/**
- * 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;
-};
+/***/ "../../node_modules/cache-base/node_modules/set-value/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Returns true if a brace node is invalid.
+"use strict";
+/*!
+ * set-value <https://github.com/jonschlinkert/set-value>
+ *
+ * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-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;
-  }
-  return false;
-};
 
-/**
- * Returns true if a node is an open or close node
- */
 
-exports.isOpenOrClose = node => {
-  if (node.type === 'open' || node.type === 'close') {
-    return true;
+var split = __webpack_require__("../../node_modules/split-string/index.js");
+var extend = __webpack_require__("../../node_modules/extend-shallow/index.js");
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
+var isObject = __webpack_require__("../../node_modules/is-extendable/index.js");
+
+module.exports = function(obj, prop, val) {
+  if (!isObject(obj)) {
+    return obj;
   }
-  return node.open === true || node.close === true;
-};
 
-/**
- * Reduce an array of text nodes.
- */
+  if (Array.isArray(prop)) {
+    prop = [].concat.apply([], prop).join('.');
+  }
 
-exports.reduce = nodes => nodes.reduce((acc, node) => {
-  if (node.type === 'text') acc.push(node.value);
-  if (node.type === 'range') node.type = 'text';
-  return acc;
-}, []);
+  if (typeof prop !== 'string') {
+    return obj;
+  }
 
-/**
- * Flatten an array
- */
+  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
+  var len = keys.length;
+  var idx = -1;
+  var current = obj;
 
-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);
+  while (++idx < len) {
+    var key = keys[idx];
+    if (idx !== len - 1) {
+      if (!isObject(current[key])) {
+        current[key] = {};
+      }
+      current = current[key];
+      continue;
     }
-    return result;
-  };
-  flat(args);
-  return result;
+
+    if (isPlainObject(current[key]) && isPlainObject(val)) {
+      current[key] = extend({}, current[key], val);
+    } else {
+      current[key] = val;
+    }
+  }
+
+  return obj;
 };
 
+function isValidKey(key) {
+  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
+}
+
 
 /***/ }),
-/* 272 */
+
+/***/ "../../node_modules/call-me-maybe/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const fill = __webpack_require__(273);
-const utils = __webpack_require__(271);
+var next = (global.process && process.nextTick) || global.setImmediate || function (f) {
+  setTimeout(f, 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 = '';
+module.exports = function maybe (cb, promise) {
+  if (cb) {
+    promise
+      .then(function (result) {
+        next(function () { cb(null, result) })
+      }, function (err) {
+        next(function () { cb(err) })
+      })
+    return undefined
+  }
+  else {
+    return promise
+  }
+}
 
-    if (node.isOpen === true) {
-      return prefix + node.value;
-    }
-    if (node.isClose === true) {
-      return prefix + node.value;
-    }
 
-    if (node.type === 'open') {
-      return invalid ? (prefix + node.value) : '(';
-    }
+/***/ }),
 
-    if (node.type === 'close') {
-      return invalid ? (prefix + node.value) : ')';
-    }
+/***/ "../../node_modules/chalk/source/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (node.type === 'comma') {
-      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
-    }
+"use strict";
 
-    if (node.value) {
-      return node.value;
-    }
+const ansiStyles = __webpack_require__("../../node_modules/ansi-styles/index.js");
+const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__("../../node_modules/supports-color/index.js");
+const {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+} = __webpack_require__("../../node_modules/chalk/source/util.js");
 
-    if (node.nodes && node.ranges > 0) {
-      let args = utils.reduce(node.nodes);
-      let range = fill(...args, { ...options, wrap: false, toRegex: true });
+const {isArray} = Array;
 
-      if (range.length !== 0) {
-        return args.length > 1 && range.length > 1 ? `(${range})` : range;
-      }
-    }
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = [
+	'ansi',
+	'ansi',
+	'ansi256',
+	'ansi16m'
+];
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += walk(child, node);
-      }
-    }
-    return output;
-  };
+const styles = Object.create(null);
 
-  return walk(ast);
+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');
+	}
+
+	// Detect level if not set manually
+	const colorLevel = stdoutColor ? stdoutColor.level : 0;
+	object.level = options.level === undefined ? colorLevel : options.level;
 };
 
-module.exports = compile;
+class ChalkClass {
+	constructor(options) {
+		// eslint-disable-next-line no-constructor-return
+		return chalkFactory(options);
+	}
+}
 
+const chalkFactory = options => {
+	const chalk = {};
+	applyOptions(chalk, options);
 
-/***/ }),
-/* 273 */
-/***/ (function(module, exports, __webpack_require__) {
+	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
 
-"use strict";
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+	Object.setPrototypeOf(chalk, Chalk.prototype);
+	Object.setPrototypeOf(chalk.template, chalk);
 
+	chalk.template.constructor = () => {
+		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
+	};
 
+	chalk.template.Instance = ChalkClass;
 
-const util = __webpack_require__(113);
-const toRegexRange = __webpack_require__(274);
+	return chalk.template;
+};
 
-const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+function Chalk(options) {
+	return chalkFactory(options);
+}
 
-const transform = toNumber => {
-  return value => toNumber === true ? Number(value) : String(value);
-};
+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 isValidValue = value => {
-  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+styles.visible = {
+	get() {
+		const builder = createBuilder(this, this._styler, true);
+		Object.defineProperty(this, 'visible', {value: builder});
+		return builder;
+	}
 };
 
-const isNumber = num => Number.isInteger(+num);
+const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
 
-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;
-};
+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);
+			};
+		}
+	};
+}
 
-const stringify = (start, end, options) => {
-  if (typeof start === 'string' || typeof end === 'string') {
-    return true;
-  }
-  return options.stringify === true;
-};
+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 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 proto = Object.defineProperties(() => {}, {
+	...styles,
+	level: {
+		enumerable: true,
+		get() {
+			return this._generator.level;
+		},
+		set(level) {
+			this._generator.level = level;
+		}
+	}
+});
 
-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 createStyler = (open, close, parent) => {
+	let openAll;
+	let closeAll;
+	if (parent === undefined) {
+		openAll = open;
+		closeAll = close;
+	} else {
+		openAll = parent.openAll + open;
+		closeAll = close + parent.closeAll;
+	}
+
+	return {
+		open,
+		close,
+		openAll,
+		closeAll,
+		parent
+	};
 };
 
-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);
+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_));
+		}
 
-  let prefix = options.capture ? '' : '?:';
-  let positives = '';
-  let negatives = '';
-  let result;
+		// 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(' '));
+	};
 
-  if (parts.positives.length) {
-    positives = parts.positives.join('|');
-  }
+	// 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);
 
-  if (parts.negatives.length) {
-    negatives = `-(${prefix}${parts.negatives.join('|')})`;
-  }
+	builder._generator = self;
+	builder._styler = _styler;
+	builder._isEmpty = _isEmpty;
 
-  if (positives && negatives) {
-    result = `${positives}|${negatives}`;
-  } else {
-    result = positives || negatives;
-  }
+	return builder;
+};
 
-  if (options.wrap) {
-    return `(${prefix}${result})`;
-  }
+const applyStyle = (self, string) => {
+	if (self.level <= 0 || !string) {
+		return self._isEmpty ? '' : string;
+	}
 
-  return result;
-};
+	let styler = self._styler;
 
-const toRange = (a, b, isNumbers, options) => {
-  if (isNumbers) {
-    return toRegexRange(a, b, { wrap: false, ...options });
-  }
+	if (styler === undefined) {
+		return string;
+	}
 
-  let start = String.fromCharCode(a);
-  if (a === b) return start;
+	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);
 
-  let stop = String.fromCharCode(b);
-  return `[${start}-${stop}]`;
-};
+			styler = styler.parent;
+		}
+	}
 
-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);
-};
+	// 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);
+	}
 
-const rangeError = (...args) => {
-  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
+	return openAll + string + closeAll;
 };
 
-const invalidRange = (start, end, options) => {
-  if (options.strictRanges === true) throw rangeError([start, end]);
-  return [];
-};
+let template;
+const chalkTag = (chalk, ...strings) => {
+	const [firstString] = strings;
 
-const invalidStep = (step, options) => {
-  if (options.strictRanges === true) {
-    throw new TypeError(`Expected step "${step}" to be a number`);
-  }
-  return [];
-};
+	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(' ');
+	}
 
-const fillNumbers = (start, end, step = 1, options = {}) => {
-  let a = Number(start);
-  let b = Number(end);
+	const arguments_ = strings.slice(1);
+	const parts = [firstString.raw[0]];
 
-  if (!Number.isInteger(a) || !Number.isInteger(b)) {
-    if (options.strictRanges === true) throw rangeError([start, end]);
-    return [];
-  }
+	for (let i = 1; i < firstString.length; i++) {
+		parts.push(
+			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
+			String(firstString.raw[i])
+		);
+	}
 
-  // fix negative zero
-  if (a === 0) a = 0;
-  if (b === 0) b = 0;
+	if (template === undefined) {
+		template = __webpack_require__("../../node_modules/chalk/source/templates.js");
+	}
 
-  let descending = a > b;
-  let startString = String(start);
-  let endString = String(end);
-  let stepString = String(step);
-  step = Math.max(Math.abs(step), 1);
+	return template(chalk, parts.join(''));
+};
 
-  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);
+Object.defineProperties(Chalk.prototype, styles);
 
-  if (options.toRegex && step === 1) {
-    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
-  }
+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;
 
-  let parts = { negatives: [], positives: [] };
-  let push = num => parts[num < 0 ? 'negatives' : 'positives'].push(Math.abs(num));
-  let range = [];
-  let index = 0;
+module.exports = chalk;
 
-  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;
-};
+/***/ "../../node_modules/chalk/source/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const fillLetters = (start, end, step = 1, options = {}) => {
-  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
-    return invalidRange(start, end, options);
-  }
+"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;
 
-  let format = options.transform || (val => String.fromCharCode(val));
-  let a = `${start}`.charCodeAt(0);
-  let b = `${end}`.charCodeAt(0);
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
-  let descending = a > b;
-  let min = Math.min(a, b);
-  let max = Math.max(a, b);
+function unescape(c) {
+	const u = c[0] === 'u';
+	const bracket = c[1] === '{';
 
-  if (options.toRegex && step === 1) {
-    return toRange(min, max, false, options);
-  }
+	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-  let range = [];
-  let index = 0;
+	if (u && bracket) {
+		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
+	}
 
-  while (descending ? a >= b : a <= b) {
-    range.push(format(a, index));
-    a = descending ? a - step : a + step;
-    index++;
-  }
+	return ESCAPES.get(c) || c;
+}
 
-  if (options.toRegex === true) {
-    return toRegex(range, null, { wrap: false, options });
-  }
+function parseArguments(name, arguments_) {
+	const results = [];
+	const chunks = arguments_.trim().split(/\s*,\s*/g);
+	let matches;
 
-  return range;
-};
+	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}')`);
+		}
+	}
 
-const fill = (start, end, step, options = {}) => {
-  if (end == null && isValidValue(start)) {
-    return [start];
-  }
+	return results;
+}
 
-  if (!isValidValue(start) || !isValidValue(end)) {
-    return invalidRange(start, end, options);
-  }
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-  if (typeof step === 'function') {
-    return fill(start, end, 1, { transform: step });
-  }
+	const results = [];
+	let matches;
 
-  if (isObject(step)) {
-    return fill(start, end, 0, step);
-  }
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-  let opts = { ...options };
-  if (opts.capture === true) opts.wrap = true;
-  step = step || opts.step || 1;
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-  if (!isNumber(step)) {
-    if (step != null && !isObject(step)) return invalidStep(step, opts);
-    return fill(start, end, 1, step);
-  }
+	return results;
+}
 
-  if (isNumber(start) && isNumber(end)) {
-    return fillNumbers(start, end, step, opts);
-  }
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
-};
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-module.exports = fill;
+	let current = chalk;
+	for (const [styleName, styles] of Object.entries(enabled)) {
+		if (!Array.isArray(styles)) {
+			continue;
+		}
 
+		if (!(styleName in current)) {
+			throw new Error(`Unknown Chalk style: ${styleName}`);
+		}
 
-/***/ }),
-/* 274 */
-/***/ (function(module, exports, __webpack_require__) {
+		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
+	}
 
-"use strict";
-/*!
- * to-regex-range <https://github.com/micromatch/to-regex-range>
- *
- * Copyright (c) 2015-present, Jon Schlinkert.
- * Released under the MIT License.
- */
+	return current;
+}
 
+module.exports = (chalk, temporary) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
+	// 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');
+			}
 
-const isNumber = __webpack_require__(275);
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(character);
+		}
+	});
 
-const toRegexRange = (min, max, options) => {
-  if (isNumber(min) === false) {
-    throw new TypeError('toRegexRange: expected the first argument to be a number');
-  }
+	chunks.push(chunk.join(''));
 
-  if (max === void 0 || min === max) {
-    return String(min);
-  }
-
-  if (isNumber(max) === false) {
-    throw new TypeError('toRegexRange: expected the second argument to be a number.');
-  }
-
-  let opts = { relaxZeros: true, ...options };
-  if (typeof opts.strictZeros === 'boolean') {
-    opts.relaxZeros = opts.strictZeros === false;
-  }
+	if (styles.length > 0) {
+		const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMessage);
+	}
 
-  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;
+	return chunks.join('');
+};
 
-  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
-    return toRegexRange.cache[cacheKey].result;
-  }
 
-  let a = Math.min(min, max);
-  let b = Math.max(min, max);
+/***/ }),
 
-  if (Math.abs(a - b) === 1) {
-    let result = min + '|' + max;
-    if (opts.capture) {
-      return `(${result})`;
-    }
-    if (opts.wrap === false) {
-      return result;
-    }
-    return `(?:${result})`;
-  }
+/***/ "../../node_modules/chalk/source/util.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  let isPadded = hasPadding(min) || hasPadding(max);
-  let state = { min, max, a, b };
-  let positives = [];
-  let negatives = [];
+"use strict";
 
-  if (isPadded) {
-    state.isPadded = isPadded;
-    state.maxLen = String(state.max).length;
-  }
 
-  if (a < 0) {
-    let newMin = b < 0 ? Math.abs(b) : 1;
-    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
-    a = state.a = 0;
-  }
+const stringReplaceAll = (string, substring, replacer) => {
+	let index = string.indexOf(substring);
+	if (index === -1) {
+		return string;
+	}
 
-  if (b >= 0) {
-    positives = splitToPatterns(a, b, state, opts);
-  }
+	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);
 
-  state.negatives = negatives;
-  state.positives = positives;
-  state.result = collatePatterns(negatives, positives, opts);
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-  if (opts.capture === true) {
-    state.result = `(${state.result})`;
-  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
-    state.result = `(?:${state.result})`;
-  }
+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);
 
-  toRegexRange.cache[cacheKey] = state;
-  return state.result;
+	returnValue += string.substr(endIndex);
+	return returnValue;
 };
 
-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 = {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+};
 
-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);
-  }
+/***/ "../../node_modules/class-utils/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  stop = countZeros(max + 1, zeros) - 1;
+"use strict";
 
-  while (min < stop && stop <= max) {
-    stops.add(stop);
-    zeros += 1;
-    stop = countZeros(max + 1, zeros) - 1;
-  }
 
-  stops = [...stops];
-  stops.sort(compare);
-  return stops;
-}
+var util = __webpack_require__("util");
+var utils = __webpack_require__("../../node_modules/class-utils/utils.js");
 
 /**
- * Convert a range to a regex pattern
- * @param {Number} `start`
- * @param {Number} `stop`
- * @return {String}
+ * Expose class utils
  */
 
-function rangeToPattern(start, stop, options) {
-  if (start === stop) {
-    return { pattern: start, count: [], digits: 0 };
-  }
+var cu = module.exports;
 
-  let zipped = zip(start, stop);
-  let digits = zipped.length;
-  let pattern = '';
-  let count = 0;
+/**
+ * Expose class utils: `cu`
+ */
 
-  for (let i = 0; i < digits; i++) {
-    let [startDigit, stopDigit] = zipped[i];
+cu.isObject = function isObject(val) {
+  return utils.isObj(val) || typeof val === 'function';
+};
 
-    if (startDigit === stopDigit) {
-      pattern += startDigit;
+/**
+ * Returns true if an array has any of the given elements, or an
+ * object has any of the give keys.
+ *
+ * ```js
+ * cu.has(['a', 'b', 'c'], 'c');
+ * //=> true
+ *
+ * cu.has(['a', 'b', 'c'], ['c', 'z']);
+ * //=> true
+ *
+ * cu.has({a: 'b', c: 'd'}, ['c', 'z']);
+ * //=> true
+ * ```
+ * @param {Object} `obj`
+ * @param {String|Array} `val`
+ * @return {Boolean}
+ * @api public
+ */
 
-    } else if (startDigit !== '0' || stopDigit !== '9') {
-      pattern += toCharacterClass(startDigit, stopDigit, options);
+cu.has = function has(obj, val) {
+  val = cu.arrayify(val);
+  var len = val.length;
 
-    } else {
-      count++;
+  if (cu.isObject(obj)) {
+    for (var key in obj) {
+      if (val.indexOf(key) > -1) {
+        return true;
+      }
     }
-  }
 
-  if (count) {
-    pattern += options.shorthand === true ? '\\d' : '[0-9]';
+    var keys = cu.nativeKeys(obj);
+    return cu.has(keys, val);
   }
 
-  return { pattern, count: [count], digits };
-}
-
-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 = '';
-
-    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
-      if (prev.count.length > 1) {
-        prev.count.pop();
+  if (Array.isArray(obj)) {
+    var arr = obj;
+    while (len--) {
+      if (arr.indexOf(val[len]) > -1) {
+        return true;
       }
-
-      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);
     }
-
-    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
-    tokens.push(obj);
-    start = max + 1;
-    prev = obj;
+    return false;
   }
 
-  return tokens;
-}
-
-function filterPatterns(arr, comparison, prefix, intersection, options) {
-  let result = [];
-
-  for (let ele of arr) {
-    let { string } = ele;
+  throw new TypeError('expected an array or object.');
+};
 
-    // only push if _both_ are negative...
-    if (!intersection && !contains(comparison, 'string', string)) {
-      result.push(prefix + string);
-    }
+/**
+ * Returns true if an array or object has all of the given values.
+ *
+ * ```js
+ * cu.hasAll(['a', 'b', 'c'], 'c');
+ * //=> true
+ *
+ * cu.hasAll(['a', 'b', 'c'], ['c', 'z']);
+ * //=> false
+ *
+ * cu.hasAll({a: 'b', c: 'd'}, ['c', 'z']);
+ * //=> false
+ * ```
+ * @param {Object|Array} `val`
+ * @param {String|Array} `values`
+ * @return {Boolean}
+ * @api public
+ */
 
-    // or _both_ are positive
-    if (intersection && contains(comparison, 'string', string)) {
-      result.push(prefix + string);
+cu.hasAll = function hasAll(val, values) {
+  values = cu.arrayify(values);
+  var len = values.length;
+  while (len--) {
+    if (!cu.has(val, values[len])) {
+      return false;
     }
   }
-  return result;
-}
+  return true;
+};
 
 /**
- * Zip strings
+ * Cast the given value to an array.
+ *
+ * ```js
+ * cu.arrayify('foo');
+ * //=> ['foo']
+ *
+ * cu.arrayify(['foo']);
+ * //=> ['foo']
+ * ```
+ *
+ * @param {String|Array} `val`
+ * @return {Array}
+ * @api public
  */
 
-function zip(a, b) {
-  let arr = [];
-  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
-  return arr;
-}
-
-function compare(a, b) {
-  return a > b ? 1 : b > a ? -1 : 0;
-}
-
-function contains(arr, key, val) {
-  return arr.some(ele => ele[key] === val);
-}
-
-function countNines(min, len) {
-  return Number(String(min).slice(0, -len) + '9'.repeat(len));
-}
-
-function countZeros(integer, zeros) {
-  return integer - (integer % Math.pow(10, zeros));
-}
-
-function toQuantifier(digits) {
-  let [start = 0, stop = ''] = digits;
-  if (stop || start > 1) {
-    return `{${start + (stop ? ',' + stop : '')}}`;
-  }
-  return '';
-}
-
-function toCharacterClass(a, b, options) {
-  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
-}
-
-function hasPadding(str) {
-  return /^-?(0+)\d/.test(str);
-}
-
-function padZeros(value, tok, options) {
-  if (!tok.isPadded) {
-    return value;
-  }
-
-  let diff = Math.abs(tok.maxLen - String(value).length);
-  let relax = options.relaxZeros !== false;
-
-  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}}`;
-    }
-  }
-}
+cu.arrayify = function arrayify(val) {
+  return val ? (Array.isArray(val) ? val : [val]) : [];
+};
 
 /**
- * Cache
+ * Noop
  */
 
-toRegexRange.cache = {};
-toRegexRange.clearCache = () => (toRegexRange.cache = {});
+cu.noop = function noop() {
+  return;
+};
 
 /**
- * Expose `toRegexRange`
+ * Returns the first argument passed to the function.
  */
 
-module.exports = toRegexRange;
+cu.identity = function identity(val) {
+  return val;
+};
 
+/**
+ * Returns true if a value has a `contructor`
+ *
+ * ```js
+ * cu.hasConstructor({});
+ * //=> true
+ *
+ * cu.hasConstructor(Object.create(null));
+ * //=> false
+ * ```
+ * @param  {Object} `value`
+ * @return {Boolean}
+ * @api public
+ */
 
-/***/ }),
-/* 275 */
-/***/ (function(module, exports, __webpack_require__) {
+cu.hasConstructor = function hasConstructor(val) {
+  return cu.isObject(val) && typeof val.constructor !== 'undefined';
+};
 
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
+/**
+ * Get the native `ownPropertyNames` from the constructor of the
+ * given `object`. An empty array is returned if the object does
+ * not have a constructor.
  *
- * Copyright (c) 2014-present, Jon Schlinkert.
- * Released under the MIT License.
+ * ```js
+ * cu.nativeKeys({a: 'b', b: 'c', c: 'd'})
+ * //=> ['a', 'b', 'c']
+ *
+ * cu.nativeKeys(function(){})
+ * //=> ['length', 'caller']
+ * ```
+ *
+ * @param  {Object} `obj` Object that has a `constructor`.
+ * @return {Array} Array of keys.
+ * @api public
  */
 
+cu.nativeKeys = function nativeKeys(val) {
+  if (!cu.hasConstructor(val)) return [];
+  return Object.getOwnPropertyNames(val);
+};
 
+/**
+ * Returns property descriptor `key` if it's an "own" property
+ * of the given object.
+ *
+ * ```js
+ * function App() {}
+ * Object.defineProperty(App.prototype, 'count', {
+ *   get: function() {
+ *     return Object.keys(this).length;
+ *   }
+ * });
+ * cu.getDescriptor(App.prototype, 'count');
+ * // returns:
+ * // {
+ * //   get: [Function],
+ * //   set: undefined,
+ * //   enumerable: false,
+ * //   configurable: false
+ * // }
+ * ```
+ *
+ * @param {Object} `obj`
+ * @param {String} `key`
+ * @return {Object} Returns descriptor `key`
+ * @api public
+ */
 
-module.exports = function(num) {
-  if (typeof num === 'number') {
-    return num - num === 0;
+cu.getDescriptor = function getDescriptor(obj, key) {
+  if (!cu.isObject(obj)) {
+    throw new TypeError('expected an object.');
   }
-  if (typeof num === 'string' && num.trim() !== '') {
-    return Number.isFinite ? Number.isFinite(+num) : isFinite(+num);
+  if (typeof key !== 'string') {
+    throw new TypeError('expected key to be a string.');
   }
-  return false;
+  return Object.getOwnPropertyDescriptor(obj, key);
 };
 
+/**
+ * Copy a descriptor from one object to another.
+ *
+ * ```js
+ * function App() {}
+ * Object.defineProperty(App.prototype, 'count', {
+ *   get: function() {
+ *     return Object.keys(this).length;
+ *   }
+ * });
+ * var obj = {};
+ * cu.copyDescriptor(obj, App.prototype, 'count');
+ * ```
+ * @param {Object} `receiver`
+ * @param {Object} `provider`
+ * @param {String} `name`
+ * @return {Object}
+ * @api public
+ */
 
-/***/ }),
-/* 276 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+cu.copyDescriptor = function copyDescriptor(receiver, provider, name) {
+  if (!cu.isObject(receiver)) {
+    throw new TypeError('expected receiving object to be an object.');
+  }
+  if (!cu.isObject(provider)) {
+    throw new TypeError('expected providing object to be an object.');
+  }
+  if (typeof name !== 'string') {
+    throw new TypeError('expected name to be a string.');
+  }
 
+  var val = cu.getDescriptor(provider, name);
+  if (val) Object.defineProperty(receiver, name, val);
+};
 
-const fill = __webpack_require__(273);
-const stringify = __webpack_require__(270);
-const utils = __webpack_require__(271);
+/**
+ * Copy static properties, prototype properties, and descriptors
+ * from one object to another.
+ *
+ * @param {Object} `receiver`
+ * @param {Object} `provider`
+ * @param {String|Array} `omit` One or more properties to omit
+ * @return {Object}
+ * @api public
+ */
 
-const append = (queue = '', stash = '', enclose = false) => {
-  let result = [];
+cu.copy = function copy(receiver, provider, omit) {
+  if (!cu.isObject(receiver)) {
+    throw new TypeError('expected receiving object to be an object.');
+  }
+  if (!cu.isObject(provider)) {
+    throw new TypeError('expected providing object to be an object.');
+  }
+  var props = Object.getOwnPropertyNames(provider);
+  var keys = Object.keys(provider);
+  var len = props.length,
+    key;
+  omit = cu.arrayify(omit);
 
-  queue = [].concat(queue);
-  stash = [].concat(stash);
+  while (len--) {
+    key = props[len];
 
-  if (!stash.length) return queue;
-  if (!queue.length) {
-    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
+    if (cu.has(keys, key)) {
+      utils.define(receiver, key, provider[key]);
+    } else if (!(key in receiver) && !cu.has(omit, key)) {
+      cu.copyDescriptor(receiver, provider, key);
+    }
   }
+};
 
-  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);
-};
-
-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;
-    }
+/**
+ * Inherit the static properties, prototype properties, and descriptors
+ * from of an object.
+ *
+ * @param {Object} `receiver`
+ * @param {Object} `provider`
+ * @param {String|Array} `omit` One or more properties to omit
+ * @return {Object}
+ * @api public
+ */
 
-    if (node.invalid || node.dollar) {
-      q.push(append(q.pop(), stringify(node, options)));
-      return;
-    }
+cu.inherit = function inherit(receiver, provider, omit) {
+  if (!cu.isObject(receiver)) {
+    throw new TypeError('expected receiving object to be an object.');
+  }
+  if (!cu.isObject(provider)) {
+    throw new TypeError('expected providing object to be an object.');
+  }
 
-    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
-      q.push(append(q.pop(), ['{}']));
-      return;
-    }
+  var keys = [];
+  for (var key in provider) {
+    keys.push(key);
+    receiver[key] = provider[key];
+  }
 
-    if (node.nodes && node.ranges > 0) {
-      let args = utils.reduce(node.nodes);
+  keys = keys.concat(cu.arrayify(omit));
 
-      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.');
-      }
+  var a = provider.prototype || provider;
+  var b = receiver.prototype || receiver;
+  cu.copy(b, a, keys);
+};
 
-      let range = fill(...args, options);
-      if (range.length === 0) {
-        range = stringify(node, options);
-      }
+/**
+ * Returns a function for extending the static properties,
+ * prototype properties, and descriptors from the `Parent`
+ * constructor onto `Child` constructors.
+ *
+ * ```js
+ * var extend = cu.extend(Parent);
+ * Parent.extend(Child);
+ *
+ * // optional methods
+ * Parent.extend(Child, {
+ *   foo: function() {},
+ *   bar: function() {}
+ * });
+ * ```
+ * @param {Function} `Parent` Parent ctor
+ * @param {Function} `extend` Optional extend function to handle custom extensions. Useful when updating methods that require a specific prototype.
+ *   @param {Function} `Child` Child ctor
+ *   @param {Object} `proto` Optionally pass additional prototype properties to inherit.
+ *   @return {Object}
+ * @api public
+ */
 
-      q.push(append(q.pop(), range));
-      node.nodes = [];
-      return;
-    }
+cu.extend = function() {
+  // keep it lazy, instead of assigning to `cu.extend`
+  return utils.staticExtend.apply(null, arguments);
+};
 
-    let enclose = utils.encloseBrace(node);
-    let queue = node.queue;
-    let block = node;
+/**
+ * Bubble up events emitted from static methods on the Parent ctor.
+ *
+ * @param {Object} `Parent`
+ * @param {Array} `events` Event names to bubble up
+ * @api public
+ */
 
-    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
-      block = block.parent;
-      queue = block.queue;
+cu.bubble = function(Parent, events) {
+  events = events || [];
+  Parent.bubble = function(Child, arr) {
+    if (Array.isArray(arr)) {
+      events = utils.union([], events, arr);
     }
-
-    for (let i = 0; i < node.nodes.length; i++) {
-      let child = node.nodes[i];
-
-      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;
-      }
-
-      if (child.nodes) {
-        walk(child, node);
-      }
+    var len = events.length;
+    var idx = -1;
+    while (++idx < len) {
+      var name = events[idx];
+      Parent.on(name, Child.emit.bind(Child, name));
     }
-
-    return queue;
+    cu.bubble(Child, events);
   };
-
-  return utils.flatten(walk(ast));
 };
 
-module.exports = expand;
-
 
 /***/ }),
-/* 277 */
+
+/***/ "../../node_modules/class-utils/utils.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const stringify = __webpack_require__(270);
+var utils = {};
 
-/**
- * Constants
- */
 
-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__(278);
 
 /**
- * parse
+ * Lazily required module dependencies
  */
 
-const parse = (input, options = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+utils.union = __webpack_require__("../../node_modules/arr-union/index.js");
+utils.define = __webpack_require__("../../node_modules/define-property/index.js");
+utils.isObj = __webpack_require__("../../node_modules/isobject/index.js");
+utils.staticExtend = __webpack_require__("../../node_modules/static-extend/index.js");
 
-  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})`);
-  }
 
-  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 = {};
+/**
+ * Expose `utils`
+ */
 
-  /**
-   * Helpers
-   */
+module.exports = utils;
 
-  const advance = () => input[index++];
-  const push = node => {
-    if (node.type === 'text' && prev.type === 'dot') {
-      prev.type = 'text';
-    }
 
-    if (prev && prev.type === 'text' && node.type === 'text') {
-      prev.value += node.value;
-      return;
-    }
+/***/ }),
 
-    block.nodes.push(node);
-    node.parent = block;
-    node.prev = prev;
-    prev = node;
-    return node;
-  };
+/***/ "../../node_modules/clean-stack/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  push({ type: 'bos' });
+"use strict";
 
-  while (index < length) {
-    block = stack[stack.length - 1];
-    value = advance();
+const os = __webpack_require__("os");
 
-    /**
-     * Invalid chars
-     */
+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();
 
-    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
-      continue;
-    }
+module.exports = (stack, options) => {
+	options = Object.assign({pretty: false}, options);
 
-    /**
-     * Escaped chars
-     */
+	return stack.replace(/\\/g, '/')
+		.split('\n')
+		.filter(line => {
+			const pathMatches = line.match(extractPathRegex);
+			if (pathMatches === null || !pathMatches[1]) {
+				return true;
+			}
 
-    if (value === CHAR_BACKSLASH) {
-      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
-      continue;
-    }
+			const match = pathMatches[1];
 
-    /**
-     * Right square bracket (literal): ']'
-     */
+			// Electron
+			if (
+				match.includes('.app/Contents/Resources/electron.asar') ||
+				match.includes('.app/Contents/Resources/default_app.asar')
+			) {
+				return false;
+			}
 
-    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
-      push({ type: 'text', value: '\\' + value });
-      continue;
-    }
+			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, '~')));
+			}
 
-    /**
-     * Left square bracket: '['
-     */
+			return line;
+		})
+		.join('\n');
+};
 
-    if (value === CHAR_LEFT_SQUARE_BRACKET) {
-      brackets++;
 
-      let closed = true;
-      let next;
+/***/ }),
 
-      while (index < length && (next = advance())) {
-        value += next;
+/***/ "../../node_modules/cli-cursor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (next === CHAR_LEFT_SQUARE_BRACKET) {
-          brackets++;
-          continue;
-        }
+"use strict";
 
-        if (next === CHAR_BACKSLASH) {
-          value += advance();
-          continue;
-        }
+const restoreCursor = __webpack_require__("../../node_modules/restore-cursor/index.js");
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          brackets--;
+let isHidden = false;
 
-          if (brackets === 0) {
-            break;
-          }
-        }
-      }
+exports.show = (writableStream = process.stderr) => {
+	if (!writableStream.isTTY) {
+		return;
+	}
 
-      push({ type: 'text', value });
-      continue;
-    }
+	isHidden = false;
+	writableStream.write('\u001B[?25h');
+};
 
-    /**
-     * Parentheses
-     */
+exports.hide = (writableStream = process.stderr) => {
+	if (!writableStream.isTTY) {
+		return;
+	}
 
-    if (value === CHAR_LEFT_PARENTHESES) {
-      block = push({ type: 'paren', nodes: [] });
-      stack.push(block);
-      push({ type: 'text', value });
-      continue;
-    }
+	restoreCursor();
+	isHidden = true;
+	writableStream.write('\u001B[?25l');
+};
 
-    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;
-    }
+exports.toggle = (force, writableStream) => {
+	if (force !== undefined) {
+		isHidden = force;
+	}
 
-    /**
-     * Quotes: '|"|`
-     */
+	if (isHidden) {
+		exports.show(writableStream);
+	} else {
+		exports.hide(writableStream);
+	}
+};
 
-    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
-      let open = value;
-      let next;
 
-      if (options.keepQuotes !== true) {
-        value = '';
-      }
+/***/ }),
 
-      while (index < length && (next = advance())) {
-        if (next === CHAR_BACKSLASH) {
-          value += next + advance();
-          continue;
-        }
+/***/ "../../node_modules/cli-spinners/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (next === open) {
-          if (options.keepQuotes === true) value += next;
-          break;
-        }
+"use strict";
 
-        value += next;
-      }
 
-      push({ type: 'text', value });
-      continue;
-    }
+const spinners = Object.assign({}, __webpack_require__("../../node_modules/cli-spinners/spinners.json"));
 
-    /**
-     * Left curly brace: '{'
-     */
+const spinnersList = Object.keys(spinners);
 
-    if (value === CHAR_LEFT_CURLY_BRACE) {
-      depth++;
+Object.defineProperty(spinners, 'random', {
+	get() {
+		const randomIndex = Math.floor(Math.random() * spinnersList.length);
+		const spinnerName = spinnersList[randomIndex];
+		return spinners[spinnerName];
+	}
+});
 
-      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: []
-      };
+module.exports = spinners;
+// TODO: Remove this for the next major release
+module.exports.default = spinners;
 
-      block = push(brace);
-      stack.push(block);
-      push({ type: 'open', value });
-      continue;
-    }
 
-    /**
-     * Right curly brace: '}'
-     */
+/***/ }),
 
-    if (value === CHAR_RIGHT_CURLY_BRACE) {
-      if (block.type !== 'brace') {
-        push({ type: 'text', value });
-        continue;
-      }
+/***/ "../../node_modules/cli-spinners/spinners.json":
+/***/ (function(module) {
 
-      let type = 'close';
-      block = stack.pop();
-      block.close = true;
+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\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"dots8Bit\":{\"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\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"material\":{\"interval\":17,\"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\":[\"🌲\",\"🎄\"]},\"grenade\":{\"interval\":80,\"frames\":[\"،   \",\"′   \",\" ´ \",\" ‾ \",\"  ⸌\",\"  ⸊\",\"  |\",\"  ⁎\",\"  ⁕\",\" ෴ \",\"  ⁓\",\"   \",\"   \",\"   \"]},\"point\":{\"interval\":125,\"frames\":[\"∙∙∙\",\"●∙∙\",\"∙●∙\",\"∙∙●\",\"∙∙∙\"]},\"layer\":{\"interval\":150,\"frames\":[\"-\",\"=\",\"≡\"]},\"betaWave\":{\"interval\":80,\"frames\":[\"ρββββββ\",\"βρβββββ\",\"ββρββββ\",\"βββρβββ\",\"ββββρββ\",\"βββββρβ\",\"ββββββρ\"]},\"aesthetic\":{\"interval\":80,\"frames\":[\"▰▱▱▱▱▱▱\",\"▰▰▱▱▱▱▱\",\"▰▰▰▱▱▱▱\",\"▰▰▰▰▱▱▱\",\"▰▰▰▰▰▱▱\",\"▰▰▰▰▰▰▱\",\"▰▰▰▰▰▰▰\",\"▰▱▱▱▱▱▱\"]}}");
 
-      push({ type, value });
-      depth--;
+/***/ }),
 
-      block = stack[stack.length - 1];
-      continue;
-    }
+/***/ "../../node_modules/clone/clone.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    /**
-     * Comma: ','
-     */
+var clone = (function() {
+'use strict';
 
-    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) }];
-      }
+/**
+ * Clones (copies) an Object using deep copying.
+ *
+ * This function supports circular references by default, but if you are certain
+ * there are no circular references in your object, you can save some CPU time
+ * by calling clone(obj, false).
+ *
+ * Caution: if `circular` is false and `parent` contains circular references,
+ * your program may enter an infinite loop and crash.
+ *
+ * @param `parent` - the object to be cloned
+ * @param `circular` - set to true if the object to be cloned may contain
+ *    circular references. (optional - true by default)
+ * @param `depth` - set to a number if the object is only to be cloned to
+ *    a particular depth. (optional - defaults to Infinity)
+ * @param `prototype` - sets the prototype to be used when cloning an object.
+ *    (optional - defaults to parent prototype).
+*/
+function clone(parent, circular, depth, prototype) {
+  var filter;
+  if (typeof circular === 'object') {
+    depth = circular.depth;
+    prototype = circular.prototype;
+    filter = circular.filter;
+    circular = circular.circular
+  }
+  // maintain two arrays for circular references, where corresponding parents
+  // and children have the same index
+  var allParents = [];
+  var allChildren = [];
 
-      push({ type: 'comma', value });
-      block.commas++;
-      continue;
-    }
+  var useBuffer = typeof Buffer != 'undefined';
 
-    /**
-     * Dot: '.'
-     */
+  if (typeof circular == 'undefined')
+    circular = true;
 
-    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
-      let siblings = block.nodes;
+  if (typeof depth == 'undefined')
+    depth = Infinity;
 
-      if (depth === 0 || siblings.length === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
+  // recurse this function so we don't reset allParents and allChildren
+  function _clone(parent, depth) {
+    // cloning null always returns null
+    if (parent === null)
+      return null;
 
-      if (prev.type === 'dot') {
-        block.range = [];
-        prev.value += value;
-        prev.type = 'range';
+    if (depth == 0)
+      return parent;
 
-        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
-          block.invalid = true;
-          block.ranges = 0;
-          prev.type = 'text';
-          continue;
-        }
+    var child;
+    var proto;
+    if (typeof parent != 'object') {
+      return parent;
+    }
 
-        block.ranges++;
-        block.args = [];
-        continue;
+    if (clone.__isArray(parent)) {
+      child = [];
+    } else if (clone.__isRegExp(parent)) {
+      child = new RegExp(parent.source, __getRegExpFlags(parent));
+      if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+    } else if (clone.__isDate(parent)) {
+      child = new Date(parent.getTime());
+    } else if (useBuffer && Buffer.isBuffer(parent)) {
+      if (Buffer.allocUnsafe) {
+        // Node.js >= 4.5.0
+        child = Buffer.allocUnsafe(parent.length);
+      } else {
+        // Older Node.js versions
+        child = new Buffer(parent.length);
       }
-
-      if (prev.type === 'range') {
-        siblings.pop();
-
-        let before = siblings[siblings.length - 1];
-        before.value += prev.value + value;
-        prev = before;
-        block.ranges--;
-        continue;
+      parent.copy(child);
+      return child;
+    } else {
+      if (typeof prototype == 'undefined') {
+        proto = Object.getPrototypeOf(parent);
+        child = Object.create(proto);
+      }
+      else {
+        child = Object.create(prototype);
+        proto = prototype;
       }
-
-      push({ type: 'dot', value });
-      continue;
     }
 
-    /**
-     * Text
-     */
-
-    push({ type: 'text', value });
-  }
+    if (circular) {
+      var index = allParents.indexOf(parent);
 
-  // Mark imbalanced braces and brackets as invalid
-  do {
-    block = stack.pop();
+      if (index != -1) {
+        return allChildren[index];
+      }
+      allParents.push(parent);
+      allChildren.push(child);
+    }
 
-    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;
-        }
-      });
+    for (var i in parent) {
+      var attrs;
+      if (proto) {
+        attrs = Object.getOwnPropertyDescriptor(proto, i);
+      }
 
-      // 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);
+      if (attrs && attrs.set == null) {
+        continue;
+      }
+      child[i] = _clone(parent[i], depth - 1);
     }
-  } while (stack.length > 0);
 
-  push({ type: 'eos' });
-  return ast;
-};
+    return child;
+  }
 
-module.exports = parse;
+  return _clone(parent, depth);
+}
 
+/**
+ * Simple flat clone using prototype, accepts only objects, usefull for property
+ * override on FLAT configuration object (no nested props).
+ *
+ * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+ * works.
+ */
+clone.clonePrototype = function clonePrototype(parent) {
+  if (parent === null)
+    return null;
 
-/***/ }),
-/* 278 */
-/***/ (function(module, exports, __webpack_require__) {
+  var c = function () {};
+  c.prototype = parent;
+  return new c();
+};
 
-"use strict";
+// private utility functions
 
+function __objToStr(o) {
+  return Object.prototype.toString.call(o);
+};
+clone.__objToStr = __objToStr;
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
+function __isDate(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Date]';
+};
+clone.__isDate = __isDate;
 
-  // Digits
-  CHAR_0: '0', /* 0 */
-  CHAR_9: '9', /* 9 */
+function __isArray(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Array]';
+};
+clone.__isArray = __isArray;
 
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 'A', /* A */
-  CHAR_LOWERCASE_A: 'a', /* a */
-  CHAR_UPPERCASE_Z: 'Z', /* Z */
-  CHAR_LOWERCASE_Z: 'z', /* z */
+function __isRegExp(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+};
+clone.__isRegExp = __isRegExp;
 
-  CHAR_LEFT_PARENTHESES: '(', /* ( */
-  CHAR_RIGHT_PARENTHESES: ')', /* ) */
+function __getRegExpFlags(re) {
+  var flags = '';
+  if (re.global) flags += 'g';
+  if (re.ignoreCase) flags += 'i';
+  if (re.multiline) flags += 'm';
+  return flags;
+};
+clone.__getRegExpFlags = __getRegExpFlags;
 
-  CHAR_ASTERISK: '*', /* * */
+return clone;
+})();
 
-  // 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 ( true && module.exports) {
+  module.exports = clone;
+}
 
 
 /***/ }),
-/* 279 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "../../node_modules/cmd-shim/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(280);
+// On windows, create a .cmd file.
+// Read the #! in the file to see what it uses.  The vast majority
+// of the time, this will be either:
+// "#!/usr/bin/env <prog> <args...>"
+// or:
+// "#!<prog> <args...>"
+//
+// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
+// @<prog> <args...> %~dp0<target> %*
 
+module.exports = cmdShim
+cmdShim.ifExists = cmdShimIfExists
 
-/***/ }),
-/* 280 */
-/***/ (function(module, exports, __webpack_require__) {
+var fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js")
 
-"use strict";
+var mkdir = __webpack_require__("../../node_modules/cmd-shim/node_modules/mkdirp/index.js")
+  , path = __webpack_require__("path")
+  , toBatchSyntax = __webpack_require__("../../node_modules/cmd-shim/lib/to-batch-syntax.js")
+  , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+=[^ \t]+\s+)*\s*([^ \t]+)(.*)$/
 
+function cmdShimIfExists (from, to, cb) {
+  fs.stat(from, function (er) {
+    if (er) return cb()
+    cmdShim(from, to, cb)
+  })
+}
 
-const path = __webpack_require__(4);
-const scan = __webpack_require__(281);
-const parse = __webpack_require__(284);
-const utils = __webpack_require__(282);
-const constants = __webpack_require__(283);
-const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
+// Try to unlink, but ignore errors.
+// Any problems will surface later.
+function rm (path, cb) {
+  fs.unlink(path, function(er) {
+    cb()
+  })
+}
 
-/**
- * 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
- */
+function cmdShim (from, to, cb) {
+  fs.stat(from, function (er, stat) {
+    if (er)
+      return cb(er)
 
-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;
-  }
+    cmdShim_(from, to, cb)
+  })
+}
 
-  const isState = isObject(glob) && glob.tokens && glob.input;
+function cmdShim_ (from, to, cb) {
+  var then = times(2, next, cb)
+  rm(to, then)
+  rm(to + ".cmd", then)
 
-  if (glob === '' || (typeof glob !== 'string' && !isState)) {
-    throw new TypeError('Expected pattern to be a non-empty string');
+  function next(er) {
+    writeShim(from, to, cb)
   }
+}
 
-  const opts = options || {};
-  const posix = utils.isWindows(options);
-  const regex = isState
-    ? picomatch.compileRe(glob, options)
-    : picomatch.makeRe(glob, options, false, true);
+function writeShim (from, to, cb) {
+  // make a cmd file and a sh script
+  // First, check if the bin is a #! of some sort.
+  // If not, then assume it's something that'll be compiled, or some other
+  // sort of script, and just call it directly.
+  mkdir(path.dirname(to), function (er) {
+    if (er)
+      return cb(er)
+    fs.readFile(from, "utf8", function (er, data) {
+      if (er) return writeShim_(from, to, null, null, cb)
+      var firstLine = data.trim().split(/\r*\n/)[0]
+        , shebang = firstLine.match(shebangExpr)
+      if (!shebang) return writeShim_(from, to, null, null, null, cb)
+      var vars = shebang[1] || ""
+        , prog = shebang[2]
+        , args = shebang[3] || ""
+      return writeShim_(from, to, prog, args, vars, cb)
+    })
+  })
+}
 
-  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);
+function writeShim_ (from, to, prog, args, variables, cb) {
+  var shTarget = path.relative(path.dirname(to), from)
+    , target = shTarget.split("/").join("\\")
+    , longProg
+    , shProg = prog && prog.split("\\").join("/")
+    , shLongProg
+    , pwshProg = shProg && "\"" + shProg + "$exe\""
+    , pwshLongProg
+  shTarget = shTarget.split("\\").join("/")
+  args = args || ""
+  variables = variables || ""
+  if (!prog) {
+    prog = "\"%~dp0\\" + target + "\""
+    shProg = "\"$basedir/" + shTarget + "\""
+    pwshProg = shProg
+    args = ""
+    target = ""
+    shTarget = ""
+  } else {
+    longProg = "\"%~dp0\\" + prog + ".exe\""
+    shLongProg = "\"$basedir/" + prog + "\""
+    pwshLongProg = "\"$basedir/" + prog + "$exe\""
+    target = "\"%~dp0\\" + target + "\""
+    shTarget = "\"$basedir/" + shTarget + "\""
   }
 
-  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);
-    }
+  // @SETLOCAL
+  //
+  // @IF EXIST "%~dp0\node.exe" (
+  //   @SET "_prog=%~dp0\node.exe"
+  // ) ELSE (
+  //   @SET "_prog=node"
+  //   @SET PATHEXT=%PATHEXT:;.JS;=;%
+  // )
+  //
+  // "%_prog%" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+  // @ENDLOCAL
+  var cmd
+  if (longProg) {
+    shLongProg = shLongProg.trim();
+    args = args.trim();
+    var variableDeclarationsAsBatch = toBatchSyntax.convertToSetCommands(variables)
+    cmd = "@SETLOCAL\r\n"
+        + variableDeclarationsAsBatch
+        + "\r\n"
+        + "@IF EXIST " + longProg + " (\r\n"
+        + "  @SET \"_prog=" + longProg.replace(/(^")|("$)/g, '') + "\"\r\n"
+        + ") ELSE (\r\n"
+        + "  @SET \"_prog=" + prog.replace(/(^")|("$)/g, '') + "\"\r\n"
+        + "  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n"
+        + ")\r\n"
+        + "\r\n"
+        +  "\"%_prog%\" " + args + " " + target + " %*\r\n"
+        + '@ENDLOCAL\r\n'
+  } else {
+    cmd = "@" + prog + " " + args + " " + target + " %*\r\n"
+  }
 
-    if (isMatch === false) {
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+  // #!/bin/sh
+  // basedir=`dirname "$0"`
+  //
+  // case `uname` in
+  //     *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+  // esac
+  //
+  // if [ -x "$basedir/node.exe" ]; then
+  //   "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+  //   ret=$?
+  // else
+  //   node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
+  //   ret=$?
+  // fi
+  // exit $ret
 
-    if (isIgnored(input)) {
-      if (typeof opts.onIgnore === 'function') {
-        opts.onIgnore(result);
-      }
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+  var sh = "#!/bin/sh\n"
 
-    if (typeof opts.onMatch === 'function') {
-      opts.onMatch(result);
-    }
-    return returnObject ? result : true;
-  };
+  sh = sh
+      + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
+      + "\n"
+      + "case `uname` in\n"
+      + "    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w \"$basedir\"`;;\n"
+      + "esac\n"
+      + "\n"
 
-  if (returnState) {
-    matcher.state = state;
+  if (shLongProg) {
+    sh = sh
+       + "if [ -x "+shLongProg+" ]; then\n"
+       + "  " + variables + shLongProg + " " + args + " " + shTarget + " \"$@\"\n"
+       + "  ret=$?\n"
+       + "else \n"
+       + "  " + variables + shProg + " " + args + " " + shTarget + " \"$@\"\n"
+       + "  ret=$?\n"
+       + "fi\n"
+       + "exit $ret\n"
+  } else {
+    sh = sh
+       + shProg + " " + args + " " + shTarget + " \"$@\"\n"
+       + "exit $?\n"
   }
 
-  return matcher;
-};
-
-/**
- * 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
- */
-
-picomatch.test = (input, regex, options, { glob, posix } = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected input to be a string');
+  // #!/usr/bin/env pwsh
+  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+  //
+  // $ret=0
+  // $exe = ""
+  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  //   # Fix case when both the Windows and Linux builds of Node
+  //   # are installed in the same directory
+  //   $exe = ".exe"
+  // }
+  // if (Test-Path "$basedir/node") {
+  //   & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
+  //   $ret=$LASTEXITCODE
+  // } else {
+  //   & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
+  //   $ret=$LASTEXITCODE
+  // }
+  // exit $ret
+  var pwsh = "#!/usr/bin/env pwsh\n"
+           + "$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n"
+           + "\n"
+           + "$exe=\"\"\n"
+           + "if ($PSVersionTable.PSVersion -lt \"6.0\" -or $IsWindows) {\n"
+           + "  # Fix case when both the Windows and Linux builds of Node\n"
+           + "  # are installed in the same directory\n"
+           + "  $exe=\".exe\"\n"
+           + "}\n"
+  if (shLongProg) {
+    pwsh = pwsh
+         + "$ret=0\n"
+         + "if (Test-Path " + pwshLongProg + ") {\n"
+         + "  & " + pwshLongProg + " " + args + " " + shTarget + " $args\n"
+         + "  $ret=$LASTEXITCODE\n"
+         + "} else {\n"
+         + "  & " + pwshProg + " " + args + " " + shTarget + " $args\n"
+         + "  $ret=$LASTEXITCODE\n"
+         + "}\n"
+         + "exit $ret\n"
+  } else {
+    pwsh = pwsh
+         + "& " + pwshProg + " " + args + " " + shTarget + " $args\n"
+         + "exit $LASTEXITCODE\n"
   }
 
-  if (input === '') {
-    return { isMatch: false, output: '' };
+  var then = times(3, next, cb)
+  fs.writeFile(to + ".ps1", pwsh, "utf8", then)
+  fs.writeFile(to + ".cmd", cmd, "utf8", then)
+  fs.writeFile(to, sh, "utf8", then)
+  function next () {
+    chmodShim(to, cb)
   }
+}
 
-  const opts = options || {};
-  const format = opts.format || (posix ? utils.toPosixSlashes : null);
-  let match = input === glob;
-  let output = (match && format) ? format(input) : input;
+function chmodShim (to, cb) {
+  var then = times(2, cb, cb)
+  fs.chmod(to, "0755", then)
+  fs.chmod(to + ".cmd", "0755", then)
+  fs.chmod(to + ".ps1", "0755", then)
+}
 
-  if (match === false) {
-    output = format ? format(input) : input;
-    match = output === glob;
+function times(n, ok, cb) {
+  var errState = null
+  return function(er) {
+    if (!errState) {
+      if (er)
+        cb(errState = er)
+      else if (--n === 0)
+        ok()
+    }
   }
+}
 
-  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 };
-};
+/***/ }),
 
-/**
- * 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
- */
+/***/ "../../node_modules/cmd-shim/lib/to-batch-syntax.js":
+/***/ (function(module, exports) {
 
-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));
-};
+exports.replaceDollarWithPercentPair = replaceDollarWithPercentPair
+exports.convertToSetCommand = convertToSetCommand
+exports.convertToSetCommands = convertToSetCommands
+
+function convertToSetCommand(key, value) {
+    var line = ""
+    key = key || ""
+    key = key.trim()
+    value = value || ""
+    value = value.trim()
+    if(key && value && value.length > 0) {
+        line = "@SET " + key + "=" + replaceDollarWithPercentPair(value) + "\r\n"
+    }
+    return line
+}
+
+function extractVariableValuePairs(declarations) {
+    var pairs = {}
+    declarations.map(function(declaration) {
+        var split = declaration.split("=")
+        pairs[split[0]]=split[1]
+    })
+    return pairs
+}
+
+function convertToSetCommands(variableString) {
+    var variableValuePairs = extractVariableValuePairs(variableString.split(" "))
+    var variableDeclarationsAsBatch = ""
+    Object.keys(variableValuePairs).forEach(function (key) {
+        variableDeclarationsAsBatch += convertToSetCommand(key, variableValuePairs[key])
+    })
+    return variableDeclarationsAsBatch
+}
+
+function replaceDollarWithPercentPair(value) {
+    var dollarExpressions = /\$\{?([^\$@#\?\- \t{}:]+)\}?/g
+    var result = ""
+    var startIndex = 0
+    value = value || ""
+    do {
+        var match = dollarExpressions.exec(value)
+        if(match) {
+            var betweenMatches = value.substring(startIndex, match.index) || ""
+            result +=  betweenMatches + "%" + match[1] + "%"
+            startIndex = dollarExpressions.lastIndex
+        }
+    } while (dollarExpressions.lastIndex > 0)
+    result += value.substr(startIndex)
+    return result
+}
+
+
 
-/**
- * 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
- */
 
-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
- */
+/***/ "../../node_modules/cmd-shim/node_modules/mkdirp/index.js":
+/***/ (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 });
-};
+var path = __webpack_require__("path");
+var fs = __webpack_require__("fs");
+var _0777 = parseInt('0777', 8);
 
-/**
- * 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
- */
+module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
 
-picomatch.scan = (input, options) => scan(input, options);
+function mkdirP (p, opts, f, made) {
+    if (typeof opts === 'function') {
+        f = opts;
+        opts = {};
+    }
+    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':
+                if (path.dirname(p) === p) return cb(er);
+                mkdirP(path.dirname(p), opts, function (er, made) {
+                    if (er) cb(er, made);
+                    else mkdirP(p, opts, cb, made);
+                });
+                break;
 
-/**
- * Compile a regular expression from the `state` object returned by the
- * [parse()](#parse) method.
- *
- * @param {Object} `state`
- * @param {Object} `options`
- * @param {Boolean} `returnOutput` Intended for implementors, this argument allows you to return the raw output from the parser.
- * @param {Boolean} `returnState` Adds the state to a `state` property on the returned regex. Useful for implementors and debugging.
- * @return {RegExp}
- * @api public
- */
+            // 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;
+        }
+    });
+}
 
-picomatch.compileRe = (state, options, returnOutput = false, returnState = false) => {
-  if (returnOutput === true) {
-    return state.output;
-  }
+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;
 
-  const opts = options || {};
-  const prepend = opts.contains ? '' : '^';
-  const append = opts.contains ? '' : '$';
+    p = path.resolve(p);
 
-  let source = `${prepend}(?:${state.output})${append}`;
-  if (state && state.negated === true) {
-    source = `^(?!${source}).*$`;
-  }
+    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;
 
-  const regex = picomatch.toRegex(source, options);
-  if (returnState === true) {
-    regex.state = state;
-  }
+            // 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 regex;
+    return made;
 };
 
-/**
- * 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`
- * @param {Boolean} `returnOutput` Implementors may use this argument to return the compiled output, instead of a regular expression. This is not exposed on the options to prevent end-users from mutating the result.
- * @param {Boolean} `returnState` Implementors may use this argument to return the state from the parsed glob with the returned regular expression.
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
-
-picomatch.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
-  if (!input || typeof input !== 'string') {
-    throw new TypeError('Expected a non-empty string');
-  }
-
-  let parsed = { negated: false, fastpaths: true };
-
-  if (options.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
-    parsed.output = parse.fastpaths(input, options);
-  }
 
-  if (!parsed.output) {
-    parsed = parse(input, options);
-  }
+/***/ }),
 
-  return picomatch.compileRe(parsed, options, returnOutput, returnState);
-};
+/***/ "../../node_modules/collection-visit/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Create a regular expression from the given regex source string.
- *
- * ```js
- * const picomatch = require('picomatch');
- * // picomatch.toRegex(source[, options]);
+"use strict";
+/*!
+ * collection-visit <https://github.com/jonschlinkert/collection-visit>
  *
- * 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
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-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 /$^/;
-  }
-};
 
-/**
- * Picomatch constants.
- * @return {Object}
- */
 
-picomatch.constants = constants;
+var visit = __webpack_require__("../../node_modules/object-visit/index.js");
+var mapVisit = __webpack_require__("../../node_modules/map-visit/index.js");
 
-/**
- * Expose "picomatch"
- */
+module.exports = function(collection, method, val) {
+  var result;
 
-module.exports = picomatch;
+  if (typeof val === 'string' && (method in collection)) {
+    var args = [].slice.call(arguments, 2);
+    result = collection[method].apply(collection, args);
+  } else if (Array.isArray(val)) {
+    result = mapVisit.apply(null, arguments);
+  } else {
+    result = visit.apply(null, arguments);
+  }
+
+  if (typeof result !== 'undefined') {
+    return result;
+  }
+
+  return collection;
+};
 
 
 /***/ }),
-/* 281 */
+
+/***/ "../../node_modules/color-convert/conversions.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/* MIT license */
+var cssKeywords = __webpack_require__("../../node_modules/color-convert/node_modules/color-name/index.js");
 
+// 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.)
 
-const utils = __webpack_require__(282);
-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__(283);
+var reverseKeywords = {};
+for (var key in cssKeywords) {
+	if (cssKeywords.hasOwnProperty(key)) {
+		reverseKeywords[cssKeywords[key]] = key;
+	}
+}
 
-const isPathSeparator = code => {
-  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
+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 depth = token => {
-  if (token.isPrefix !== true) {
-    token.depth = token.isGlobstar ? Infinity : 1;
-  }
-};
+// 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);
+		}
 
-/**
- * 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), `negated` (true if the path starts with `!` but not
- * with `!(`) and `negatedExtglob` (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
- */
+		if (!('labels' in convert[model])) {
+			throw new Error('missing channel labels property: ' + model);
+		}
 
-const scan = (input, options) => {
-  const opts = options || {};
+		if (convert[model].labels.length !== convert[model].channels) {
+			throw new Error('channel and label counts mismatch: ' + model);
+		}
 
-  const length = input.length - 1;
-  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
-  const slashes = [];
-  const tokens = [];
-  const parts = [];
+		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});
+	}
+}
 
-  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 negatedExtglob = false;
-  let finished = false;
-  let braces = 0;
-  let prev;
-  let code;
-  let token = { value: '', depth: 0, isGlob: false };
+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;
 
-  const eos = () => index >= length;
-  const peek = () => str.charCodeAt(index + 1);
-  const advance = () => {
-    prev = code;
-    return str.charCodeAt(++index);
-  };
+	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;
+	}
 
-  while (index < length) {
-    code = advance();
-    let next;
+	h = Math.min(h * 60, 360);
 
-    if (code === CHAR_BACKWARD_SLASH) {
-      backslashes = token.backslashes = true;
-      code = advance();
+	if (h < 0) {
+		h += 360;
+	}
 
-      if (code === CHAR_LEFT_CURLY_BRACE) {
-        braceEscaped = true;
-      }
-      continue;
-    }
+	l = (min + max) / 2;
 
-    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
-      braces++;
+	if (max === min) {
+		s = 0;
+	} else if (l <= 0.5) {
+		s = delta / (max + min);
+	} else {
+		s = delta / (2 - max - min);
+	}
 
-      while (eos() !== true && (code = advance())) {
-        if (code === CHAR_BACKWARD_SLASH) {
-          backslashes = token.backslashes = true;
-          advance();
-          continue;
-        }
-
-        if (code === CHAR_LEFT_CURLY_BRACE) {
-          braces++;
-          continue;
-        }
+	return [h, s * 100, l * 100];
+};
 
-        if (braceEscaped !== true && code === CHAR_DOT && (code = advance()) === CHAR_DOT) {
-          isBrace = token.isBrace = true;
-          isGlob = token.isGlob = true;
-          finished = true;
+convert.rgb.hsv = function (rgb) {
+	var rdif;
+	var gdif;
+	var bdif;
+	var h;
+	var s;
 
-          if (scanToEnd === true) {
-            continue;
-          }
+	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;
+	};
 
-          break;
-        }
+	if (diff === 0) {
+		h = s = 0;
+	} else {
+		s = diff / v;
+		rdif = diffc(r);
+		gdif = diffc(g);
+		bdif = diffc(b);
 
-        if (braceEscaped !== true && code === CHAR_COMMA) {
-          isBrace = token.isBrace = true;
-          isGlob = token.isGlob = true;
-          finished = true;
+		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;
+		}
+	}
 
-          if (scanToEnd === true) {
-            continue;
-          }
+	return [
+		h * 360,
+		s * 100,
+		v * 100
+	];
+};
 
-          break;
-        }
+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));
 
-        if (code === CHAR_RIGHT_CURLY_BRACE) {
-          braces--;
+	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
 
-          if (braces === 0) {
-            braceEscaped = false;
-            isBrace = token.isBrace = true;
-            finished = true;
-            break;
-          }
-        }
-      }
+	return [h, w * 100, b * 100];
+};
 
-      if (scanToEnd === true) {
-        continue;
-      }
+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;
 
-      break;
-    }
+	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 (code === CHAR_FORWARD_SLASH) {
-      slashes.push(index);
-      tokens.push(token);
-      token = { value: '', depth: 0, isGlob: false };
+	return [c * 100, m * 100, y * 100, k * 100];
+};
 
-      if (finished === true) continue;
-      if (prev === CHAR_DOT && index === (start + 1)) {
-        start += 2;
-        continue;
-      }
+/**
+ * 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)
+	);
+}
 
-      lastIndex = index + 1;
-      continue;
-    }
+convert.rgb.keyword = function (rgb) {
+	var reversed = reverseKeywords[rgb];
+	if (reversed) {
+		return reversed;
+	}
 
-    if (opts.noext !== true) {
-      const isExtglobChar = code === CHAR_PLUS
-        || code === CHAR_AT
-        || code === CHAR_ASTERISK
-        || code === CHAR_QUESTION_MARK
-        || code === CHAR_EXCLAMATION_MARK;
+	var currentClosestDistance = Infinity;
+	var currentClosestKeyword;
 
-      if (isExtglobChar === true && peek() === CHAR_LEFT_PARENTHESES) {
-        isGlob = token.isGlob = true;
-        isExtglob = token.isExtglob = true;
-        finished = true;
-        if (code === CHAR_EXCLAMATION_MARK && index === start) {
-          negatedExtglob = true;
-        }
+	for (var keyword in cssKeywords) {
+		if (cssKeywords.hasOwnProperty(keyword)) {
+			var value = cssKeywords[keyword];
 
-        if (scanToEnd === true) {
-          while (eos() !== true && (code = advance())) {
-            if (code === CHAR_BACKWARD_SLASH) {
-              backslashes = token.backslashes = true;
-              code = advance();
-              continue;
-            }
+			// Compute comparative distance
+			var distance = comparativeDistance(rgb, value);
 
-            if (code === CHAR_RIGHT_PARENTHESES) {
-              isGlob = token.isGlob = true;
-              finished = true;
-              break;
-            }
-          }
-          continue;
-        }
-        break;
-      }
-    }
+			// Check if its less, if so set as closest
+			if (distance < currentClosestDistance) {
+				currentClosestDistance = distance;
+				currentClosestKeyword = keyword;
+			}
+		}
+	}
 
-    if (code === CHAR_ASTERISK) {
-      if (prev === CHAR_ASTERISK) isGlobstar = token.isGlobstar = true;
-      isGlob = token.isGlob = true;
-      finished = true;
+	return currentClosestKeyword;
+};
 
-      if (scanToEnd === true) {
-        continue;
-      }
-      break;
-    }
+convert.keyword.rgb = function (keyword) {
+	return cssKeywords[keyword];
+};
 
-    if (code === CHAR_QUESTION_MARK) {
-      isGlob = token.isGlob = true;
-      finished = true;
+convert.rgb.xyz = function (rgb) {
+	var r = rgb[0] / 255;
+	var g = rgb[1] / 255;
+	var b = rgb[2] / 255;
 
-      if (scanToEnd === true) {
-        continue;
-      }
-      break;
-    }
+	// 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);
 
-    if (code === CHAR_LEFT_SQUARE_BRACKET) {
-      while (eos() !== true && (next = advance())) {
-        if (next === CHAR_BACKWARD_SLASH) {
-          backslashes = token.backslashes = true;
-          advance();
-          continue;
-        }
+	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);
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          isBracket = token.isBracket = true;
-          isGlob = token.isGlob = true;
-          finished = true;
-          break;
-        }
-      }
+	return [x * 100, y * 100, z * 100];
+};
 
-      if (scanToEnd === true) {
-        continue;
-      }
+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;
 
-      break;
-    }
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
-    if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {
-      negated = token.negated = true;
-      start++;
-      continue;
-    }
+	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);
 
-    if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
-      isGlob = token.isGlob = true;
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
 
-      if (scanToEnd === true) {
-        while (eos() !== true && (code = advance())) {
-          if (code === CHAR_LEFT_PARENTHESES) {
-            backslashes = token.backslashes = true;
-            code = advance();
-            continue;
-          }
+	return [l, a, b];
+};
 
-          if (code === CHAR_RIGHT_PARENTHESES) {
-            finished = true;
-            break;
-          }
-        }
-        continue;
-      }
-      break;
-    }
+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;
 
-    if (isGlob === true) {
-      finished = true;
+	if (s === 0) {
+		val = l * 255;
+		return [val, val, val];
+	}
 
-      if (scanToEnd === true) {
-        continue;
-      }
+	if (l < 0.5) {
+		t2 = l * (1 + s);
+	} else {
+		t2 = l + s - l * s;
+	}
 
-      break;
-    }
-  }
+	t1 = 2 * l - t2;
 
-  if (opts.noext === true) {
-    isExtglob = false;
-    isGlob = false;
-  }
+	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--;
+		}
 
-  let base = str;
-  let prefix = '';
-  let glob = '';
+		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;
+		}
 
-  if (start > 0) {
-    prefix = str.slice(0, start);
-    str = str.slice(start);
-    lastIndex -= start;
-  }
+		rgb[i] = val * 255;
+	}
 
-  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;
-  }
+	return rgb;
+};
 
-  if (base && base !== '' && base !== '/' && base !== str) {
-    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
-      base = base.slice(0, -1);
-    }
-  }
+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;
 
-  if (opts.unescape === true) {
-    if (glob) glob = utils.removeBackslashes(glob);
+	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);
 
-    if (base && backslashes === true) {
-      base = utils.removeBackslashes(base);
-    }
-  }
+	return [h, sv * 100, v * 100];
+};
 
-  const state = {
-    prefix,
-    input,
-    start,
-    base,
-    glob,
-    isBrace,
-    isBracket,
-    isGlob,
-    isExtglob,
-    isGlobstar,
-    negated,
-    negatedExtglob
-  };
+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;
 
-  if (opts.tokens === true) {
-    state.maxDepth = 0;
-    if (!isPathSeparator(code)) {
-      tokens.push(token);
-    }
-    state.tokens = tokens;
-  }
+	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 (opts.parts === true || opts.tokens === true) {
-    let prevIndex;
+	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];
+	}
+};
 
-    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;
-    }
+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;
 
-    if (prevIndex && prevIndex + 1 < input.length) {
-      const value = input.slice(prevIndex + 1);
-      parts.push(value);
+	l = (2 - s) * v;
+	lmin = (2 - s) * vmin;
+	sl = s * vmin;
+	sl /= (lmin <= 1) ? lmin : 2 - lmin;
+	sl = sl || 0;
+	l /= 2;
 
-      if (opts.tokens) {
-        tokens[tokens.length - 1].value = value;
-        depth(tokens[tokens.length - 1]);
-        state.maxDepth += tokens[tokens.length - 1].depth;
-      }
-    }
+	return [h, sl * 100, l * 100];
+};
 
-    state.slashes = slashes;
-    state.parts = parts;
-  }
+// 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;
 
-  return state;
-};
+	// wh + bl cant be > 1
+	if (ratio > 1) {
+		wh /= ratio;
+		bl /= ratio;
+	}
 
-module.exports = scan;
+	i = Math.floor(6 * h);
+	v = 1 - bl;
+	f = 6 * h - i;
 
+	if ((i & 0x01) !== 0) {
+		f = 1 - f;
+	}
 
-/***/ }),
-/* 282 */
-/***/ (function(module, exports, __webpack_require__) {
+	n = wh + f * (v - wh); // linear interpolation
 
-"use strict";
+	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;
+	}
 
+	return [r * 255, g * 255, b * 255];
+};
 
-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__(283);
+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;
 
-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, '/');
+	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);
 
-exports.removeBackslashes = str => {
-  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
-    return match === '\\' ? '' : match;
-  });
+	return [r * 255, g * 255, b * 255];
 };
 
-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;
-};
+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;
 
-exports.isWindows = options => {
-  if (options && typeof options.windows === 'boolean') {
-    return options.windows;
-  }
-  return win32 === true || path.sep === '\\';
-};
+	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);
 
-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)}`;
-};
+	// assume sRGB
+	r = r > 0.0031308
+		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
+		: r * 12.92;
 
-exports.removePrefix = (input, state = {}) => {
-  let output = input;
-  if (output.startsWith('./')) {
-    output = output.slice(2);
-    state.prefix = './';
-  }
-  return output;
-};
+	g = g > 0.0031308
+		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
+		: g * 12.92;
 
-exports.wrapOutput = (input, state = {}, options = {}) => {
-  const prepend = options.contains ? '' : '^';
-  const append = options.contains ? '' : '$';
+	b = b > 0.0031308
+		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
+		: b * 12.92;
 
-  let output = `${prepend}(?:${input})${append}`;
-  if (state.negated === true) {
-    output = `(?:^(?!${output}).*$)`;
-  }
-  return output;
-};
+	r = Math.min(Math.max(0, r), 1);
+	g = Math.min(Math.max(0, g), 1);
+	b = Math.min(Math.max(0, b), 1);
 
+	return [r * 255, g * 255, b * 255];
+};
 
-/***/ }),
-/* 283 */
-/***/ (function(module, exports, __webpack_require__) {
+convert.xyz.lab = function (xyz) {
+	var x = xyz[0];
+	var y = xyz[1];
+	var z = xyz[2];
+	var l;
+	var a;
+	var b;
 
-"use strict";
+	x /= 95.047;
+	y /= 100;
+	z /= 108.883;
 
+	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);
 
-const path = __webpack_require__(4);
-const WIN_SLASH = '\\\\/';
-const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
+	l = (116 * y) - 16;
+	a = 500 * (x - y);
+	b = 200 * (y - z);
 
-/**
- * Posix glob regex
- */
+	return [l, a, b];
+};
 
-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}*?`;
+convert.lab.xyz = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var x;
+	var y;
+	var z;
 
-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
-};
+	y = (l + 16) / 116;
+	x = a / 500 + y;
+	z = y - b / 200;
 
-/**
- * Windows glob regex
- */
+	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;
 
-const WINDOWS_CHARS = {
-  ...POSIX_CHARS,
+	x *= 95.047;
+	y *= 100;
+	z *= 108.883;
 
-  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}]|$)`
+	return [x, y, z];
 };
 
-/**
- * POSIX Bracket Regex
- */
+convert.lab.lch = function (lab) {
+	var l = lab[0];
+	var a = lab[1];
+	var b = lab[2];
+	var hr;
+	var h;
+	var c;
 
-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'
-};
+	hr = Math.atan2(b, a);
+	h = hr * 360 / 2 / Math.PI;
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
-  POSIX_REGEX_SOURCE,
+	if (h < 0) {
+		h += 360;
+	}
 
-  // 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,
+	c = Math.sqrt(a * a + b * b);
 
-  // Replace globs with equivalent patterns to reduce parsing time.
-  REPLACEMENTS: {
-    '***': '*',
-    '**/**': '**',
-    '**/**/**': '**'
-  },
+	return [l, c, h];
+};
 
-  // Digits
-  CHAR_0: 48, /* 0 */
-  CHAR_9: 57, /* 9 */
+convert.lch.lab = function (lch) {
+	var l = lch[0];
+	var c = lch[1];
+	var h = lch[2];
+	var a;
+	var b;
+	var hr;
 
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 65, /* A */
-  CHAR_LOWERCASE_A: 97, /* a */
-  CHAR_UPPERCASE_Z: 90, /* Z */
-  CHAR_LOWERCASE_Z: 122, /* z */
+	hr = h / 360 * 2 * Math.PI;
+	a = c * Math.cos(hr);
+	b = c * Math.sin(hr);
 
-  CHAR_LEFT_PARENTHESES: 40, /* ( */
-  CHAR_RIGHT_PARENTHESES: 41, /* ) */
+	return [l, a, b];
+};
 
-  CHAR_ASTERISK: 42, /* * */
+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
 
-  // 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 */
+	value = Math.round(value / 50);
 
-  SEP: path.sep,
+	if (value === 0) {
+		return 30;
+	}
 
-  /**
-   * Create EXTGLOB_CHARS
-   */
+	var ansi = 30
+		+ ((Math.round(b / 255) << 2)
+		| (Math.round(g / 255) << 1)
+		| Math.round(r / 255));
 
-  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 (value === 2) {
+		ansi += 60;
+	}
 
-  /**
-   * Create GLOB_CHARS
-   */
+	return ansi;
+};
 
-  globChars(win32) {
-    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
-  }
+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];
 
-/***/ }),
-/* 284 */
-/***/ (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;
+		}
 
+		return Math.round(((r - 8) / 247) * 24) + 232;
+	}
 
-const constants = __webpack_require__(283);
-const utils = __webpack_require__(282);
+	var ansi = 16
+		+ (36 * Math.round(r / 255 * 5))
+		+ (6 * Math.round(g / 255 * 5))
+		+ Math.round(b / 255 * 5);
 
-/**
- * Constants
- */
+	return ansi;
+};
 
-const {
-  MAX_LENGTH,
-  POSIX_REGEX_SOURCE,
-  REGEX_NON_SPECIAL_CHARS,
-  REGEX_SPECIAL_CHARS_BACKREF,
-  REPLACEMENTS
-} = constants;
+convert.ansi16.rgb = function (args) {
+	var color = args % 10;
 
-/**
- * Helpers
- */
+	// handle greyscale
+	if (color === 0 || color === 7) {
+		if (args > 50) {
+			color += 3.5;
+		}
 
-const expandRange = (args, options) => {
-  if (typeof options.expandRange === 'function') {
-    return options.expandRange(...args, options);
-  }
+		color = color / 10.5 * 255;
 
-  args.sort();
-  const value = `[${args.join('-')}]`;
+		return [color, color, color];
+	}
 
-  try {
-    /* eslint-disable-next-line no-new */
-    new RegExp(value);
-  } catch (ex) {
-    return args.map(v => utils.escapeRegex(v)).join('..');
-  }
+	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;
 
-  return value;
+	return [r, g, b];
 };
 
-/**
- * Create the message for a syntax error
- */
+convert.ansi256.rgb = function (args) {
+	// handle greyscale
+	if (args >= 232) {
+		var c = (args - 232) * 10 + 8;
+		return [c, c, c];
+	}
 
-const syntaxError = (type, char) => {
-  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
+	args -= 16;
+
+	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 [r, g, b];
 };
 
-/**
- * Parse the given input string.
- * @param {String} input
- * @param {Object} options
- * @return {Object}
- */
+convert.rgb.hex = function (args) {
+	var integer = ((Math.round(args[0]) & 0xFF) << 16)
+		+ ((Math.round(args[1]) & 0xFF) << 8)
+		+ (Math.round(args[2]) & 0xFF);
 
-const parse = (input, options) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-  input = REPLACEMENTS[input] || input;
+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];
+	}
 
-  const opts = { ...options };
-  const max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+	var colorString = match[0];
 
-  let len = input.length;
-  if (len > max) {
-    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
-  }
+	if (match[0].length === 3) {
+		colorString = colorString.split('').map(function (char) {
+			return char + char;
+		}).join('');
+	}
 
-  const bos = { type: 'bos', value: '', output: opts.prepend || '' };
-  const tokens = [bos];
+	var integer = parseInt(colorString, 16);
+	var r = (integer >> 16) & 0xFF;
+	var g = (integer >> 8) & 0xFF;
+	var b = integer & 0xFF;
 
-  const capture = opts.capture ? '' : '?:';
-  const win32 = utils.isWindows(options);
+	return [r, g, b];
+};
 
-  // create constants based on platform, for windows or posix
-  const PLATFORM_CHARS = constants.globChars(win32);
-  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
+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;
 
-  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 (chroma < 1) {
+		grayscale = min / (1 - chroma);
+	} else {
+		grayscale = 0;
+	}
 
-  const globstar = opts => {
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+	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;
+	}
 
-  const nodot = opts.dot ? '' : NO_DOT;
-  const qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
-  let star = opts.bash === true ? globstar(opts) : STAR;
+	hue /= 6;
+	hue %= 1;
 
-  if (opts.capture) {
-    star = `(${star})`;
-  }
+	return [hue * 360, chroma * 100, grayscale * 100];
+};
 
-  // minimatch options support
-  if (typeof opts.noext === 'boolean') {
-    opts.noextglob = opts.noext;
-  }
-
-  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
-  };
-
-  input = utils.removePrefix(input, state);
-  len = input.length;
-
-  const extglobs = [];
-  const braces = [];
-  const stack = [];
-  let prev = bos;
-  let value;
-
-  /**
-   * 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);
-  };
-
-  const negate = () => {
-    let count = 1;
-
-    while (peek() === '!' && (peek(2) !== '(' || peek(3) === '?')) {
-      advance();
-      state.start++;
-      count++;
-    }
+convert.hsl.hcg = function (hsl) {
+	var s = hsl[1] / 100;
+	var l = hsl[2] / 100;
+	var c = 1;
+	var f = 0;
 
-    if (count % 2 === 0) {
-      return false;
-    }
+	if (l < 0.5) {
+		c = 2.0 * s * l;
+	} else {
+		c = 2.0 * s * (1.0 - l);
+	}
 
-    state.negated = true;
-    state.start++;
-    return true;
-  };
+	if (c < 1.0) {
+		f = (l - 0.5 * c) / (1.0 - c);
+	}
 
-  const increment = type => {
-    state[type]++;
-    stack.push(type);
-  };
+	return [hsl[0], c * 100, f * 100];
+};
 
-  const decrement = type => {
-    state[type]--;
-    stack.pop();
-  };
+convert.hsv.hcg = function (hsv) {
+	var s = hsv[1] / 100;
+	var v = hsv[2] / 100;
 
-  /**
-   * 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.
-   */
+	var c = s * v;
+	var f = 0;
 
-  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'));
+	if (c < 1.0) {
+		f = (v - c) / (1 - c);
+	}
 
-      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;
-      }
-    }
+	return [hsv[0], c * 100, f * 100];
+};
 
-    if (extglobs.length && tok.type !== 'paren') {
-      extglobs[extglobs.length - 1].inner += tok.value;
-    }
+convert.hcg.rgb = function (hcg) {
+	var h = hcg[0] / 360;
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-    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 (c === 0.0) {
+		return [g * 255, g * 255, g * 255];
+	}
 
-    tok.prev = prev;
-    tokens.push(tok);
-    prev = tok;
-  };
+	var pure = [0, 0, 0];
+	var hi = (h % 1) * 6;
+	var v = hi % 1;
+	var w = 1 - v;
+	var mg = 0;
 
-  const extglobOpen = (type, value) => {
-    const token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
+	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;
+	}
 
-    token.prev = prev;
-    token.parens = state.parens;
-    token.output = state.output;
-    const output = (opts.capture ? '(' : '') + token.open;
+	mg = (1.0 - c) * g;
 
-    increment('parens');
-    push({ type, value, output: state.output ? '' : ONE_CHAR });
-    push({ type: 'paren', extglob: true, value: advance(), output });
-    extglobs.push(token);
-  };
+	return [
+		(c * pure[0] + mg) * 255,
+		(c * pure[1] + mg) * 255,
+		(c * pure[2] + mg) * 255
+	];
+};
 
-  const extglobClose = token => {
-    let output = token.close + (opts.capture ? ')' : '');
-    let rest;
+convert.hcg.hsv = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-    if (token.type === 'negate') {
-      let extglobStar = star;
+	var v = c + g * (1.0 - c);
+	var f = 0;
 
-      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
-        extglobStar = globstar(opts);
-      }
+	if (v > 0.0) {
+		f = c / v;
+	}
 
-      if (extglobStar !== star || eos() || /^\)+$/.test(remaining())) {
-        output = token.close = `)$))${extglobStar}`;
-      }
+	return [hcg[0], f * 100, v * 100];
+};
 
-      if (token.inner.includes('*') && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-        output = token.close = `)${rest})${extglobStar})`;
-      }
+convert.hcg.hsl = function (hcg) {
+	var c = hcg[1] / 100;
+	var g = hcg[2] / 100;
 
-      if (token.prev.type === 'bos') {
-        state.negatedExtglob = true;
-      }
-    }
+	var l = g * (1.0 - c) + 0.5 * c;
+	var s = 0;
 
-    push({ type: 'paren', extglob: true, value, output });
-    decrement('parens');
-  };
+	if (l > 0.0 && l < 0.5) {
+		s = c / (2 * l);
+	} else
+	if (l >= 0.5 && l < 1.0) {
+		s = c / (2 * (1 - l));
+	}
 
-  /**
-   * Fast paths
-   */
+	return [hcg[0], s * 100, l * 100];
+};
 
-  if (opts.fastpaths !== false && !/(^[*!]|[/()[\]{}"])/.test(input)) {
-    let backslashes = false;
+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];
+};
 
-    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
-      if (first === '\\') {
-        backslashes = true;
-        return m;
-      }
+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 (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 (c < 1) {
+		g = (v - c) / (1 - c);
+	}
 
-      if (first === '.') {
-        return DOT_LITERAL.repeat(chars.length);
-      }
+	return [hwb[0], c * 100, g * 100];
+};
 
-      if (first === '*') {
-        if (esc) {
-          return esc + first + (rest ? star : '');
-        }
-        return star;
-      }
-      return esc ? m : `\\${m}`;
-    });
+convert.apple.rgb = function (apple) {
+	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
+};
 
-    if (backslashes === true) {
-      if (opts.unescape === true) {
-        output = output.replace(/\\/g, '');
-      } else {
-        output = output.replace(/\\+/g, m => {
-          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
-        });
-      }
-    }
+convert.rgb.apple = function (rgb) {
+	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
+};
 
-    if (output === input && opts.contains === true) {
-      state.output = input;
-      return state;
-    }
+convert.gray.rgb = function (args) {
+	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
+};
 
-    state.output = utils.wrapOutput(output, state, options);
-    return state;
-  }
+convert.gray.hsl = convert.gray.hsv = function (args) {
+	return [0, 0, args[0]];
+};
 
-  /**
-   * Tokenize input until we reach end-of-string
-   */
+convert.gray.hwb = function (gray) {
+	return [0, 100, gray[0]];
+};
 
-  while (!eos()) {
-    value = advance();
+convert.gray.cmyk = function (gray) {
+	return [0, 0, 0, gray[0]];
+};
 
-    if (value === '\u0000') {
-      continue;
-    }
+convert.gray.lab = function (gray) {
+	return [gray[0], 0, 0];
+};
 
-    /**
-     * Escaped characters
-     */
+convert.gray.hex = function (gray) {
+	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
+	var integer = (val << 16) + (val << 8) + val;
 
-    if (value === '\\') {
-      const next = peek();
+	var string = integer.toString(16).toUpperCase();
+	return '000000'.substring(string.length) + string;
+};
 
-      if (next === '/' && opts.bash !== true) {
-        continue;
-      }
+convert.rgb.gray = function (rgb) {
+	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
+	return [val / 255 * 100];
+};
 
-      if (next === '.' || next === ';') {
-        continue;
-      }
 
-      if (!next) {
-        value += '\\';
-        push({ type: 'text', value });
-        continue;
-      }
+/***/ }),
 
-      // collapse slashes to reduce potential for exploits
-      const match = /^\\+/.exec(remaining());
-      let slashes = 0;
+/***/ "../../node_modules/color-convert/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (match && match[0].length > 2) {
-        slashes = match[0].length;
-        state.index += slashes;
-        if (slashes % 2 !== 0) {
-          value += '\\';
-        }
-      }
+var conversions = __webpack_require__("../../node_modules/color-convert/conversions.js");
+var route = __webpack_require__("../../node_modules/color-convert/route.js");
 
-      if (opts.unescape === true) {
-        value = advance();
-      } else {
-        value += advance();
-      }
+var convert = {};
 
-      if (state.brackets === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
-    }
+var models = Object.keys(conversions);
 
-    /**
-     * If we're inside a regex character class, continue
-     * until we reach the closing bracket.
-     */
+function wrapRaw(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
 
-    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 (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
 
-          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();
+		return fn(args);
+	};
 
-              if (!bos.output && tokens.indexOf(prev) === 1) {
-                bos.output = ONE_CHAR;
-              }
-              continue;
-            }
-          }
-        }
-      }
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
-        value = `\\${value}`;
-      }
+	return wrappedFn;
+}
 
-      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
-        value = `\\${value}`;
-      }
+function wrapRounded(fn) {
+	var wrappedFn = function (args) {
+		if (args === undefined || args === null) {
+			return args;
+		}
 
-      if (opts.posix === true && value === '!' && prev.value === '[') {
-        value = '^';
-      }
+		if (arguments.length > 1) {
+			args = Array.prototype.slice.call(arguments);
+		}
 
-      prev.value += value;
-      append({ value });
-      continue;
-    }
+		var result = fn(args);
 
-    /**
-     * If we're inside a quoted string, continue
-     * until we reach the closing double quote.
-     */
+		// 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]);
+			}
+		}
 
-    if (state.quotes === 1 && value !== '"') {
-      value = utils.escapeRegex(value);
-      prev.value += value;
-      append({ value });
-      continue;
-    }
+		return result;
+	};
 
-    /**
-     * Double quotes
-     */
+	// preserve .conversion property if there is one
+	if ('conversion' in fn) {
+		wrappedFn.conversion = fn.conversion;
+	}
 
-    if (value === '"') {
-      state.quotes = state.quotes === 1 ? 0 : 1;
-      if (opts.keepQuotes === true) {
-        push({ type: 'text', value });
-      }
-      continue;
-    }
+	return wrappedFn;
+}
 
-    /**
-     * Parentheses
-     */
+models.forEach(function (fromModel) {
+	convert[fromModel] = {};
 
-    if (value === '(') {
-      increment('parens');
-      push({ type: 'paren', value });
-      continue;
-    }
+	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
+	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
 
-    if (value === ')') {
-      if (state.parens === 0 && opts.strictBrackets === true) {
-        throw new SyntaxError(syntaxError('opening', '('));
-      }
+	var routes = route(fromModel);
+	var routeModels = Object.keys(routes);
 
-      const extglob = extglobs[extglobs.length - 1];
-      if (extglob && state.parens === extglob.parens + 1) {
-        extglobClose(extglobs.pop());
-        continue;
-      }
+	routeModels.forEach(function (toModel) {
+		var fn = routes[toModel];
 
-      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
-      decrement('parens');
-      continue;
-    }
+		convert[fromModel][toModel] = wrapRounded(fn);
+		convert[fromModel][toModel].raw = wrapRaw(fn);
+	});
+});
 
-    /**
-     * Square brackets
-     */
+module.exports = convert;
 
-    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;
-    }
+/***/ "../../node_modules/color-convert/node_modules/color-name/index.js":
+/***/ (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;
-      }
-
-      if (state.brackets === 0) {
-        if (opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('opening', '['));
-        }
-
-        push({ type: 'text', value, output: `\\${value}` });
-        continue;
-      }
-
-      decrement('brackets');
-
-      const prevValue = prev.value.slice(1);
-      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
-        value = `/${value}`;
-      }
-
-      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 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;
-      }
-
-      // when the user specifies nothing, try to match both
-      prev.value = `(${capture}${escaped}|${prev.value})`;
-      state.output += prev.value;
-      continue;
-    }
-
-    /**
-     * Braces
-     */
-
-    if (value === '{' && opts.nobrace !== true) {
-      increment('braces');
-
-      const open = {
-        type: 'brace',
-        value,
-        output: '(',
-        outputIndex: state.output.length,
-        tokensIndex: state.tokens.length
-      };
-
-      braces.push(open);
-      push(open);
-      continue;
-    }
-
-    if (value === '}') {
-      const brace = braces[braces.length - 1];
-
-      if (opts.nobrace === true || !brace) {
-        push({ type: 'text', value, output: value });
-        continue;
-      }
-
-      let output = ')';
-
-      if (brace.dots === true) {
-        const arr = tokens.slice();
-        const range = [];
-
-        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;
-      }
-
-      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);
-        }
-      }
-
-      push({ type: 'brace', value, output });
-      decrement('braces');
-      braces.pop();
-      continue;
-    }
-
-    /**
-     * Pipes
-     */
-
-    if (value === '|') {
-      if (extglobs.length > 0) {
-        extglobs[extglobs.length - 1].conditions++;
-      }
-      push({ type: 'text', value });
-      continue;
-    }
-
-    /**
-     * Commas
-     */
-
-    if (value === ',') {
-      let output = value;
-
-      const brace = braces[braces.length - 1];
-      if (brace && stack[stack.length - 1] === 'braces') {
-        brace.comma = true;
-        output = '|';
-      }
-
-      push({ type: 'comma', value, output });
-      continue;
-    }
-
-    /**
-     * 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;
-      }
+"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]
+};
 
-      push({ type: 'slash', value, output: SLASH_LITERAL });
-      continue;
-    }
 
-    /**
-     * 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;
-      }
+/***/ "../../node_modules/color-convert/route.js":
+/***/ (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;
-      }
+var conversions = __webpack_require__("../../node_modules/color-convert/conversions.js");
 
-      push({ type: 'dot', value, output: DOT_LITERAL });
-      continue;
-    }
+/*
+	this function routes a model to all other models.
 
-    /**
-     * Question marks
-     */
+	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 (value === '?') {
-      const isGroup = prev && prev.value === '(';
-      if (!isGroup && opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('qmark', value);
-        continue;
-      }
+	conversions that are not possible simply are not included.
+*/
 
-      if (prev && prev.type === 'paren') {
-        const next = peek();
-        let output = value;
+function buildGraph() {
+	var graph = {};
+	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
+	var models = Object.keys(conversions);
 
-        if (next === '<' && !utils.supportsLookbehinds()) {
-          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
-        }
+	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
+		};
+	}
 
-        if ((prev.value === '(' && !/[!=<:]/.test(next)) || (next === '<' && !/<([!=]|\w+>)/.test(remaining()))) {
-          output = `\\${value}`;
-        }
+	return graph;
+}
 
-        push({ type: 'text', value, output });
-        continue;
-      }
+// https://en.wikipedia.org/wiki/Breadth-first_search
+function deriveBFS(fromModel) {
+	var graph = buildGraph();
+	var queue = [fromModel]; // unshift -> queue -> pop
 
-      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
-        push({ type: 'qmark', value, output: QMARK_NO_DOT });
-        continue;
-      }
+	graph[fromModel].distance = 0;
 
-      push({ type: 'qmark', value, output: QMARK });
-      continue;
-    }
+	while (queue.length) {
+		var current = queue.pop();
+		var adjacents = Object.keys(conversions[current]);
 
-    /**
-     * Exclamation
-     */
+		for (var len = adjacents.length, i = 0; i < len; i++) {
+			var adjacent = adjacents[i];
+			var node = graph[adjacent];
 
-    if (value === '!') {
-      if (opts.noextglob !== true && peek() === '(') {
-        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
-          extglobOpen('negate', value);
-          continue;
-        }
-      }
+			if (node.distance === -1) {
+				node.distance = graph[current].distance + 1;
+				node.parent = current;
+				queue.unshift(adjacent);
+			}
+		}
+	}
 
-      if (opts.nonegate !== true && state.index === 0) {
-        negate();
-        continue;
-      }
-    }
+	return graph;
+}
 
-    /**
-     * Plus
-     */
+function link(from, to) {
+	return function (args) {
+		return to(from(args));
+	};
+}
 
-    if (value === '+') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('plus', value);
-        continue;
-      }
+function wrapConversion(toModel, graph) {
+	var path = [graph[toModel].parent, toModel];
+	var fn = conversions[graph[toModel].parent][toModel];
 
-      if ((prev && prev.value === '(') || opts.regex === false) {
-        push({ type: 'plus', value, output: PLUS_LITERAL });
-        continue;
-      }
+	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;
+	}
 
-      if ((prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) || state.parens > 0) {
-        push({ type: 'plus', value });
-        continue;
-      }
+	fn.conversion = path;
+	return fn;
+}
 
-      push({ type: 'plus', value: PLUS_LITERAL });
-      continue;
-    }
+module.exports = function (fromModel) {
+	var graph = deriveBFS(fromModel);
+	var conversion = {};
 
-    /**
-     * Plain text
-     */
+	var models = Object.keys(graph);
+	for (var len = models.length, i = 0; i < len; i++) {
+		var toModel = models[i];
+		var node = graph[toModel];
 
-    if (value === '@') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        push({ type: 'at', extglob: true, value, output: '' });
-        continue;
-      }
+		if (node.parent === null) {
+			// no possible conversion, or this node is the source model.
+			continue;
+		}
 
-      push({ type: 'text', value });
-      continue;
-    }
+		conversion[toModel] = wrapConversion(toModel, graph);
+	}
 
-    /**
-     * Plain text
-     */
+	return conversion;
+};
 
-    if (value !== '*') {
-      if (value === '$' || value === '^') {
-        value = `\\${value}`;
-      }
 
-      const match = REGEX_NON_SPECIAL_CHARS.exec(remaining());
-      if (match) {
-        value += match[0];
-        state.index += match[0].length;
-      }
 
-      push({ type: 'text', value });
-      continue;
-    }
+/***/ }),
 
-    /**
-     * Stars
-     */
+/***/ "../../node_modules/color-name/index.js":
+/***/ (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";
+
+
+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]
+};
 
-    let rest = remaining();
-    if (opts.noextglob !== true && /^\([^?]/.test(rest)) {
-      extglobOpen('star', value);
-      continue;
-    }
 
-    if (prev.type === 'star') {
-      if (opts.noglobstar === true) {
-        consume(value);
-        continue;
-      }
+/***/ }),
 
-      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');
+/***/ "../../node_modules/component-emitter/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (opts.bash === true && (!isStart || (rest[0] && rest[0] !== '/'))) {
-        push({ type: 'star', value, output: '' });
-        continue;
-      }
+
+/**
+ * Expose `Emitter`.
+ */
+
+if (true) {
+  module.exports = Emitter;
+}
+
+/**
+ * Initialize a new `Emitter`.
+ *
+ * @api public
+ */
+
+function Emitter(obj) {
+  if (obj) return mixin(obj);
+};
+
+/**
+ * Mixin the emitter properties.
+ *
+ * @param {Object} obj
+ * @return {Object}
+ * @api private
+ */
+
+function mixin(obj) {
+  for (var key in Emitter.prototype) {
+    obj[key] = Emitter.prototype[key];
+  }
+  return obj;
+}
+
+/**
+ * Listen on the given `event` with `fn`.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.on =
+Emitter.prototype.addEventListener = function(event, fn){
+  this._callbacks = this._callbacks || {};
+  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
+    .push(fn);
+  return this;
+};
+
+/**
+ * Adds an `event` listener that will be invoked a single
+ * time then automatically removed.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.once = function(event, fn){
+  function on() {
+    this.off(event, on);
+    fn.apply(this, arguments);
+  }
+
+  on.fn = fn;
+  this.on(event, on);
+  return this;
+};
+
+/**
+ * Remove the given callback for `event` or all
+ * registered callbacks.
+ *
+ * @param {String} event
+ * @param {Function} fn
+ * @return {Emitter}
+ * @api public
+ */
+
+Emitter.prototype.off =
+Emitter.prototype.removeListener =
+Emitter.prototype.removeAllListeners =
+Emitter.prototype.removeEventListener = function(event, fn){
+  this._callbacks = this._callbacks || {};
+
+  // all
+  if (0 == arguments.length) {
+    this._callbacks = {};
+    return this;
+  }
+
+  // specific event
+  var callbacks = this._callbacks['$' + event];
+  if (!callbacks) return this;
+
+  // remove all handlers
+  if (1 == arguments.length) {
+    delete this._callbacks['$' + event];
+    return this;
+  }
+
+  // remove specific handler
+  var cb;
+  for (var i = 0; i < callbacks.length; i++) {
+    cb = callbacks[i];
+    if (cb === fn || cb.fn === fn) {
+      callbacks.splice(i, 1);
+      break;
+    }
+  }
+  return this;
+};
+
+/**
+ * Emit `event` with the given args.
+ *
+ * @param {String} event
+ * @param {Mixed} ...
+ * @return {Emitter}
+ */
+
+Emitter.prototype.emit = function(event){
+  this._callbacks = this._callbacks || {};
+  var args = [].slice.call(arguments, 1)
+    , callbacks = this._callbacks['$' + event];
+
+  if (callbacks) {
+    callbacks = callbacks.slice(0);
+    for (var i = 0, len = callbacks.length; i < len; ++i) {
+      callbacks[i].apply(this, args);
+    }
+  }
+
+  return this;
+};
+
+/**
+ * Return array of callbacks for `event`.
+ *
+ * @param {String} event
+ * @return {Array}
+ * @api public
+ */
+
+Emitter.prototype.listeners = function(event){
+  this._callbacks = this._callbacks || {};
+  return this._callbacks['$' + event] || [];
+};
+
+/**
+ * Check if this emitter has `event` handlers.
+ *
+ * @param {String} event
+ * @return {Boolean}
+ * @api public
+ */
+
+Emitter.prototype.hasListeners = function(event){
+  return !! this.listeners(event).length;
+};
 
-      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;
-      }
 
-      // strip consecutive `/**/`
-      while (rest.slice(0, 3) === '/**') {
-        const after = input[state.index + 4];
-        if (after && after !== '/') {
-          break;
-        }
-        rest = rest.slice(3);
-        consume('/**', 3);
-      }
+/***/ }),
 
-      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;
-      }
+/***/ "../../node_modules/concat-map/index.js":
+/***/ (function(module, exports) {
 
-      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}`;
+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;
+};
 
-        prev.type = 'globstar';
-        prev.output = globstar(opts) + (opts.strictSlashes ? ')' : '|$)');
-        prev.value += value;
-        state.globstar = true;
-        state.output += prior.output + prev.output;
-        consume(value);
-        continue;
-      }
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
 
-      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}`;
+/***/ }),
 
-        prev.type = 'globstar';
-        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
-        prev.value += value;
+/***/ "../../node_modules/copy-descriptor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        state.output += prior.output + prev.output;
-        state.globstar = true;
+"use strict";
+/*!
+ * copy-descriptor <https://github.com/jonschlinkert/copy-descriptor>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-        consume(value + advance());
 
-        push({ type: 'slash', value: '/', output: '' });
-        continue;
-      }
 
-      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;
-      }
+/**
+ * Copy a descriptor from one object to another.
+ *
+ * ```js
+ * function App() {
+ *   this.cache = {};
+ * }
+ * App.prototype.set = function(key, val) {
+ *   this.cache[key] = val;
+ *   return this;
+ * };
+ * Object.defineProperty(App.prototype, 'count', {
+ *   get: function() {
+ *     return Object.keys(this.cache).length;
+ *   }
+ * });
+ *
+ * copy(App.prototype, 'count', 'len');
+ *
+ * // create an instance
+ * var app = new App();
+ *
+ * app.set('a', true);
+ * app.set('b', true);
+ * app.set('c', true);
+ *
+ * console.log(app.count);
+ * //=> 3
+ * console.log(app.len);
+ * //=> 3
+ * ```
+ * @name copy
+ * @param {Object} `receiver` The target object
+ * @param {Object} `provider` The provider object
+ * @param {String} `from` The key to copy on provider.
+ * @param {String} `to` Optionally specify a new key name to use.
+ * @return {Object}
+ * @api public
+ */
 
-      // remove single star from output
-      state.output = state.output.slice(0, -prev.output.length);
+module.exports = function copyDescriptor(receiver, provider, from, to) {
+  if (!isObject(provider) && typeof provider !== 'function') {
+    to = from;
+    from = provider;
+    provider = receiver;
+  }
+  if (!isObject(receiver) && typeof receiver !== 'function') {
+    throw new TypeError('expected the first argument to be an object');
+  }
+  if (!isObject(provider) && typeof provider !== 'function') {
+    throw new TypeError('expected provider to be an object');
+  }
 
-      // reset previous token to globstar
-      prev.type = 'globstar';
-      prev.output = globstar(opts);
-      prev.value += value;
+  if (typeof to !== 'string') {
+    to = from;
+  }
+  if (typeof from !== 'string') {
+    throw new TypeError('expected key to be a string');
+  }
 
-      // reset output with globstar
-      state.output += prev.output;
-      state.globstar = true;
-      consume(value);
-      continue;
-    }
+  if (!(from in provider)) {
+    throw new Error('property "' + from + '" does not exist');
+  }
 
-    const token = { type: 'star', value, output: star };
+  var val = Object.getOwnPropertyDescriptor(provider, from);
+  if (val) Object.defineProperty(receiver, to, val);
+};
 
-    if (opts.bash === true) {
-      token.output = '.*?';
-      if (prev.type === 'bos' || prev.type === 'slash') {
-        token.output = nodot + token.output;
-      }
-      push(token);
-      continue;
-    }
+function isObject(val) {
+  return {}.toString.call(val) === '[object Object]';
+}
 
-    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
-      token.output = value;
-      push(token);
-      continue;
-    }
 
-    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;
 
-      } else if (opts.dot === true) {
-        state.output += NO_DOTS_SLASH;
-        prev.output += NO_DOTS_SLASH;
+/***/ }),
 
-      } else {
-        state.output += nodot;
-        prev.output += nodot;
-      }
+/***/ "../../node_modules/cp-file/cp-file-error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (peek() !== '*') {
-        state.output += ONE_CHAR;
-        prev.output += ONE_CHAR;
-      }
-    }
+"use strict";
 
-    push(token);
-  }
+const NestedError = __webpack_require__("../../node_modules/nested-error-stacks/index.js");
 
-  while (state.brackets > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
-    state.output = utils.escapeLast(state.output, '[');
-    decrement('brackets');
-  }
+class CpFileError extends NestedError {
+	constructor(message, nested) {
+		super(message, nested);
+		Object.assign(this, nested);
+		this.name = 'CpFileError';
+	}
+}
 
-  while (state.parens > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
-    state.output = utils.escapeLast(state.output, '(');
-    decrement('parens');
-  }
+module.exports = CpFileError;
 
-  while (state.braces > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
-    state.output = utils.escapeLast(state.output, '{');
-    decrement('braces');
-  }
 
-  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
-    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
-  }
+/***/ }),
 
-  // rebuild the output if we had to backtrack at any point
-  if (state.backtrack === true) {
-    state.output = '';
+/***/ "../../node_modules/cp-file/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    for (const token of state.tokens) {
-      state.output += token.output != null ? token.output : token.value;
+"use strict";
 
-      if (token.suffix) {
-        state.output += token.suffix;
-      }
-    }
-  }
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const makeDir = __webpack_require__("../../node_modules/make-dir/index.js");
+const pEvent = __webpack_require__("../../node_modules/p-event/index.js");
+const CpFileError = __webpack_require__("../../node_modules/cp-file/cp-file-error.js");
 
-  return state;
+const stat = promisify(fs.stat);
+const lstat = promisify(fs.lstat);
+const utimes = promisify(fs.utimes);
+const chmod = promisify(fs.chmod);
+const chown = promisify(fs.chown);
+
+exports.closeSync = fs.closeSync.bind(fs);
+exports.createWriteStream = fs.createWriteStream.bind(fs);
+
+exports.createReadStream = async (path, options) => {
+	const read = fs.createReadStream(path, options);
+
+	try {
+		await pEvent(read, ['readable', 'end']);
+	} catch (error) {
+		throw new CpFileError(`Cannot read from \`${path}\`: ${error.message}`, error);
+	}
+
+	return read;
 };
 
-/**
- * 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.
- */
+exports.stat = path => stat(path).catch(error => {
+	throw new CpFileError(`Cannot stat path \`${path}\`: ${error.message}`, error);
+});
 
-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}`);
-  }
+exports.lstat = path => lstat(path).catch(error => {
+	throw new CpFileError(`lstat \`${path}\` failed: ${error.message}`, error);
+});
 
-  input = REPLACEMENTS[input] || input;
-  const win32 = utils.isWindows(options);
+exports.utimes = (path, atime, mtime) => utimes(path, atime, mtime).catch(error => {
+	throw new CpFileError(`utimes \`${path}\` failed: ${error.message}`, error);
+});
 
-  // 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);
+exports.chmod = (path, mode) => chmod(path, mode).catch(error => {
+	throw new CpFileError(`chmod \`${path}\` failed: ${error.message}`, error);
+});
 
-  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;
+exports.chown = (path, uid, gid) => chown(path, uid, gid).catch(error => {
+	throw new CpFileError(`chown \`${path}\` failed: ${error.message}`, error);
+});
 
-  if (opts.capture) {
-    star = `(${star})`;
-  }
+exports.statSync = path => {
+	try {
+		return fs.statSync(path);
+	} catch (error) {
+		throw new CpFileError(`stat \`${path}\` failed: ${error.message}`, error);
+	}
+};
 
-  const globstar = opts => {
-    if (opts.noglobstar === true) return star;
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+exports.utimesSync = (path, atime, mtime) => {
+	try {
+		return fs.utimesSync(path, atime, mtime);
+	} catch (error) {
+		throw new CpFileError(`utimes \`${path}\` failed: ${error.message}`, error);
+	}
+};
 
-  const create = str => {
-    switch (str) {
-      case '*':
-        return `${nodot}${ONE_CHAR}${star}`;
+exports.chmodSync = (path, mode) => {
+	try {
+		return fs.chmodSync(path, mode);
+	} catch (error) {
+		throw new CpFileError(`chmod \`${path}\` failed: ${error.message}`, error);
+	}
+};
 
-      case '.*':
-        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
+exports.chownSync = (path, uid, gid) => {
+	try {
+		return fs.chownSync(path, uid, gid);
+	} catch (error) {
+		throw new CpFileError(`chown \`${path}\` failed: ${error.message}`, error);
+	}
+};
 
-      case '*.*':
-        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+exports.makeDir = path => makeDir(path, {fs}).catch(error => {
+	throw new CpFileError(`Cannot create directory \`${path}\`: ${error.message}`, error);
+});
 
-      case '*/*':
-        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
+exports.makeDirSync = path => {
+	try {
+		makeDir.sync(path, {fs});
+	} catch (error) {
+		throw new CpFileError(`Cannot create directory \`${path}\`: ${error.message}`, error);
+	}
+};
 
-      case '**':
-        return nodot + globstar(opts);
+exports.copyFileSync = (source, destination, flags) => {
+	try {
+		fs.copyFileSync(source, destination, flags);
+	} catch (error) {
+		throw new CpFileError(`Cannot copy from \`${source}\` to \`${destination}\`: ${error.message}`, error);
+	}
+};
 
-      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}`;
+/***/ }),
 
-      case '**/.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
+/***/ "../../node_modules/cp-file/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      default: {
-        const match = /^(.*?)\.(\w+)$/.exec(str);
-        if (!match) return;
+"use strict";
 
-        const source = create(match[1]);
-        if (!source) return;
+const path = __webpack_require__("path");
+const {constants: fsConstants} = __webpack_require__("fs");
+const pEvent = __webpack_require__("../../node_modules/p-event/index.js");
+const CpFileError = __webpack_require__("../../node_modules/cp-file/cp-file-error.js");
+const fs = __webpack_require__("../../node_modules/cp-file/fs.js");
+const ProgressEmitter = __webpack_require__("../../node_modules/cp-file/progress-emitter.js");
 
-        return source + DOT_LITERAL + match[2];
-      }
-    }
-  };
+const cpFileAsync = async (source, destination, options, progressEmitter) => {
+	let readError;
+	const stat = await fs.stat(source);
+	progressEmitter.size = stat.size;
 
-  const output = utils.removePrefix(input, state);
-  let source = create(output);
+	const read = await fs.createReadStream(source);
+	await fs.makeDir(path.dirname(destination));
+	const write = fs.createWriteStream(destination, {flags: options.overwrite ? 'w' : 'wx'});
+	read.on('data', () => {
+		progressEmitter.written = write.bytesWritten;
+	});
+	read.once('error', error => {
+		readError = new CpFileError(`Cannot read from \`${source}\`: ${error.message}`, error);
+		write.end();
+	});
 
-  if (source && opts.strictSlashes !== true) {
-    source += `${SLASH_LITERAL}?`;
-  }
+	let updateStats = false;
+	try {
+		const writePromise = pEvent(write, 'close');
+		read.pipe(write);
+		await writePromise;
+		progressEmitter.written = progressEmitter.size;
+		updateStats = true;
+	} catch (error) {
+		if (options.overwrite || error.code !== 'EEXIST') {
+			throw new CpFileError(`Cannot write to \`${destination}\`: ${error.message}`, error);
+		}
+	}
 
-  return source;
+	if (readError) {
+		throw readError;
+	}
+
+	if (updateStats) {
+		const stats = await fs.lstat(source);
+
+		return Promise.all([
+			fs.utimes(destination, stats.atime, stats.mtime),
+			fs.chmod(destination, stats.mode),
+			fs.chown(destination, stats.uid, stats.gid)
+		]);
+	}
 };
 
-module.exports = parse;
+const cpFile = (source, destination, options) => {
+	if (!source || !destination) {
+		return Promise.reject(new CpFileError('`source` and `destination` required'));
+	}
 
+	options = {
+		overwrite: true,
+		...options
+	};
 
-/***/ }),
-/* 285 */
-/***/ (function(module, exports, __webpack_require__) {
+	const progressEmitter = new ProgressEmitter(path.resolve(source), path.resolve(destination));
+	const promise = cpFileAsync(source, destination, options, progressEmitter);
+	promise.on = (...args) => {
+		progressEmitter.on(...args);
+		return promise;
+	};
 
-"use strict";
+	return promise;
+};
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = void 0;
-const merge2 = __webpack_require__(243);
-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'));
-}
+module.exports = cpFile;
 
+const checkSourceIsFile = (stat, source) => {
+	if (stat.isDirectory()) {
+		throw Object.assign(new CpFileError(`EISDIR: illegal operation on a directory '${source}'`), {
+			errno: -21,
+			code: 'EISDIR',
+			source
+		});
+	}
+};
 
-/***/ }),
-/* 286 */
-/***/ (function(module, exports, __webpack_require__) {
+const fixupAttributes = (destination, stat) => {
+	fs.chmodSync(destination, stat.mode);
+	fs.chownSync(destination, stat.uid, stat.gid);
+};
 
-"use strict";
+module.exports.sync = (source, destination, options) => {
+	if (!source || !destination) {
+		throw new CpFileError('`source` and `destination` required');
+	}
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.isString = void 0;
-function isString(input) {
-    return typeof input === 'string';
-}
-exports.isString = isString;
-function isEmpty(input) {
-    return input === '';
-}
-exports.isEmpty = isEmpty;
+	options = {
+		overwrite: true,
+		...options
+	};
 
+	const stat = fs.statSync(source);
+	checkSourceIsFile(stat, source);
+	fs.makeDirSync(path.dirname(destination));
 
-/***/ }),
-/* 287 */
-/***/ (function(module, exports, __webpack_require__) {
+	const flags = options.overwrite ? null : fsConstants.COPYFILE_EXCL;
+	try {
+		fs.copyFileSync(source, destination, flags);
+	} catch (error) {
+		if (!options.overwrite && error.code === 'EEXIST') {
+			return;
+		}
 
-"use strict";
+		throw error;
+	}
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(288);
-const provider_1 = __webpack_require__(315);
-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;
+	fs.utimesSync(destination, stat.atime, stat.mtime);
+	fixupAttributes(destination, stat);
+};
 
 
 /***/ }),
-/* 288 */
+
+/***/ "../../node_modules/cp-file/progress-emitter.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(173);
-const fsStat = __webpack_require__(289);
-const fsWalk = __webpack_require__(294);
-const reader_1 = __webpack_require__(314);
-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);
-            });
-        });
-    }
+const EventEmitter = __webpack_require__("events");
+
+const written = new WeakMap();
+
+class ProgressEmitter extends EventEmitter {
+	constructor(source, destination) {
+		super();
+		this._source = source;
+		this._destination = destination;
+	}
+
+	set written(value) {
+		written.set(this, value);
+		this.emitProgress();
+	}
+
+	get written() {
+		return written.get(this);
+	}
+
+	emitProgress() {
+		const {size, written} = this;
+		this.emit('progress', {
+			src: this._source,
+			dest: this._destination,
+			size,
+			written,
+			percent: written === size ? 1 : written / size
+		});
+	}
 }
-exports.default = ReaderStream;
+
+module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 289 */
+
+/***/ "../../node_modules/cpy/cpy-error.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(290);
-const sync = __webpack_require__(291);
-const settings_1 = __webpack_require__(292);
-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);
-}
 
+const NestedError = __webpack_require__("../../node_modules/nested-error-stacks/index.js");
 
-/***/ }),
-/* 290 */
-/***/ (function(module, exports, __webpack_require__) {
+class CpyError extends NestedError {
+	constructor(message, nested) {
+		super(message, nested);
+		Object.assign(this, nested);
+		this.name = 'CpyError';
+	}
+}
 
-"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);
-}
+module.exports = CpyError;
 
 
 /***/ }),
-/* 291 */
+
+/***/ "../../node_modules/cpy/index.js":
 /***/ (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;
-    }
-    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;
 
+const EventEmitter = __webpack_require__("events");
+const path = __webpack_require__("path");
+const os = __webpack_require__("os");
+const pMap = __webpack_require__("../../node_modules/cpy/node_modules/p-map/index.js");
+const arrify = __webpack_require__("../../node_modules/arrify/index.js");
+const globby = __webpack_require__("../../node_modules/cpy/node_modules/globby/index.js");
+const hasGlob = __webpack_require__("../../node_modules/has-glob/index.js");
+const cpFile = __webpack_require__("../../node_modules/cp-file/index.js");
+const junk = __webpack_require__("../../node_modules/junk/index.js");
+const pFilter = __webpack_require__("../../node_modules/p-filter/index.js");
+const CpyError = __webpack_require__("../../node_modules/cpy/cpy-error.js");
 
-/***/ }),
-/* 292 */
-/***/ (function(module, exports, __webpack_require__) {
+const defaultOptions = {
+	ignoreJunk: true
+};
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(293);
-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;
+class SourceFile {
+	constructor(relativePath, path) {
+		this.path = path;
+		this.relativePath = relativePath;
+		Object.freeze(this);
+	}
 
+	get name() {
+		return path.basename(this.relativePath);
+	}
 
-/***/ }),
-/* 293 */
-/***/ (function(module, exports, __webpack_require__) {
+	get nameWithoutExtension() {
+		return path.basename(this.relativePath, path.extname(this.relativePath));
+	}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(132);
-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;
+	get extension() {
+		return path.extname(this.relativePath).slice(1);
+	}
+}
 
+const preprocessSourcePath = (source, options) => path.resolve(options.cwd ? options.cwd : process.cwd(), source);
 
-/***/ }),
-/* 294 */
-/***/ (function(module, exports, __webpack_require__) {
+const preprocessDestinationPath = (source, destination, options) => {
+	let basename = path.basename(source);
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(295);
-const stream_1 = __webpack_require__(310);
-const sync_1 = __webpack_require__(311);
-const settings_1 = __webpack_require__(313);
-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 (typeof options.rename === 'string') {
+		basename = options.rename;
+	} else if (typeof options.rename === 'function') {
+		basename = options.rename(basename);
+	}
 
+	if (options.cwd) {
+		destination = path.resolve(options.cwd, destination);
+	}
 
-/***/ }),
-/* 295 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (options.parents) {
+		const dirname = path.dirname(source);
+		const parsedDirectory = path.parse(dirname);
+		return path.join(destination, dirname.replace(parsedDirectory.root, path.sep), basename);
+	}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __webpack_require__(296);
-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);
-}
+	return path.join(destination, basename);
+};
 
+module.exports = (source, destination, {
+	concurrency = (os.cpus().length || 1) * 2,
+	...options
+} = {}) => {
+	const progressEmitter = new EventEmitter();
 
-/***/ }),
-/* 296 */
-/***/ (function(module, exports, __webpack_require__) {
+	options = {
+		...defaultOptions,
+		...options
+	};
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = __webpack_require__(164);
-const fsScandir = __webpack_require__(297);
-const fastq = __webpack_require__(306);
-const common = __webpack_require__(308);
-const reader_1 = __webpack_require__(309);
-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;
+	const promise = (async () => {
+		source = arrify(source);
 
+		if (source.length === 0 || !destination) {
+			throw new CpyError('`source` and `destination` required');
+		}
 
-/***/ }),
-/* 297 */
-/***/ (function(module, exports, __webpack_require__) {
+		const copyStatus = new Map();
+		let completedFiles = 0;
+		let completedSize = 0;
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const async = __webpack_require__(298);
-const sync = __webpack_require__(303);
-const settings_1 = __webpack_require__(304);
-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);
-}
+		let files;
+		try {
+			files = await globby(source, options);
 
+			if (options.ignoreJunk) {
+				files = files.filter(file => junk.not(path.basename(file)));
+			}
+		} catch (error) {
+			throw new CpyError(`Cannot glob \`${source}\`: ${error.message}`, error);
+		}
 
-/***/ }),
-/* 298 */
-/***/ (function(module, exports, __webpack_require__) {
+		if (files.length === 0 && !hasGlob(source)) {
+			throw new CpyError(`Cannot copy \`${source}\`: the file doesn't exist`);
+		}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(289);
-const rpl = __webpack_require__(299);
-const constants_1 = __webpack_require__(300);
-const utils = __webpack_require__(301);
-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);
-}
+		let sources = files.map(sourcePath => new SourceFile(sourcePath, preprocessSourcePath(sourcePath, options)));
 
+		if (options.filter !== undefined) {
+			const filteredSources = await pFilter(sources, options.filter, {concurrency: 1024});
+			sources = filteredSources;
+		}
 
-/***/ }),
-/* 299 */
-/***/ (function(module, exports) {
+		if (sources.length === 0) {
+			progressEmitter.emit('progress', {
+				totalFiles: 0,
+				percent: 1,
+				completedFiles: 0,
+				completedSize: 0
+			});
+		}
 
-module.exports = runParallel
+		const fileProgressHandler = event => {
+			const fileStatus = copyStatus.get(event.src) || {written: 0, percent: 0};
 
-function runParallel (tasks, cb) {
-  var results, pending, keys
-  var isSync = true
+			if (fileStatus.written !== event.written || fileStatus.percent !== event.percent) {
+				completedSize -= fileStatus.written;
+				completedSize += event.written;
 
-  if (Array.isArray(tasks)) {
-    results = []
-    pending = tasks.length
-  } else {
-    keys = Object.keys(tasks)
-    results = {}
-    pending = keys.length
-  }
+				if (event.percent === 1 && fileStatus.percent !== 1) {
+					completedFiles++;
+				}
 
-  function done (err) {
-    function end () {
-      if (cb) cb(err, results)
-      cb = null
-    }
-    if (isSync) process.nextTick(end)
-    else end()
-  }
+				copyStatus.set(event.src, {
+					written: event.written,
+					percent: event.percent
+				});
 
-  function each (i, err, result) {
-    results[i] = result
-    if (--pending === 0 || err) {
-      done(err)
-    }
-  }
+				progressEmitter.emit('progress', {
+					totalFiles: files.length,
+					percent: completedFiles / files.length,
+					completedFiles,
+					completedSize
+				});
+			}
+		};
 
-  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) })
-    })
-  }
+		return pMap(sources, async source => {
+			const to = preprocessDestinationPath(source.relativePath, destination, options);
 
-  isSync = false
-}
+			try {
+				await cpFile(source.path, to, options).on('progress', fileProgressHandler);
+			} catch (error) {
+				throw new CpyError(`Cannot copy from \`${source.relativePath}\` to \`${to}\`: ${error.message}`, error);
+			}
 
+			return to;
+		}, {concurrency});
+	})();
 
-/***/ }),
-/* 300 */
-/***/ (function(module, exports, __webpack_require__) {
+	promise.on = (...arguments_) => {
+		progressEmitter.on(...arguments_);
+		return promise;
+	};
 
-"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;
+	return promise;
+};
 
 
 /***/ }),
-/* 301 */
+
+/***/ "../../node_modules/cpy/node_modules/aggregate-error/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(302);
-exports.fs = fs;
 
+const indentString = __webpack_require__("../../node_modules/cpy/node_modules/indent-string/index.js");
+const cleanStack = __webpack_require__("../../node_modules/clean-stack/index.js");
 
-/***/ }),
-/* 302 */
-/***/ (function(module, exports, __webpack_require__) {
+const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
-"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;
+class AggregateError extends Error {
+	constructor(errors) {
+		if (!Array.isArray(errors)) {
+			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
+		}
 
+		errors = [...errors].map(error => {
+			if (error instanceof Error) {
+				return error;
+			}
 
-/***/ }),
-/* 303 */
-/***/ (function(module, exports, __webpack_require__) {
+			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);
+			}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(289);
-const constants_1 = __webpack_require__(300);
-const utils = __webpack_require__(301);
-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;
+			return new Error(error);
+		});
 
+		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);
 
-/***/ }),
-/* 304 */
-/***/ (function(module, exports, __webpack_require__) {
+		this.name = 'AggregateError';
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(289);
-const fs = __webpack_require__(305);
-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;
+		Object.defineProperty(this, '_errors', {value: errors});
+	}
+
+	* [Symbol.iterator]() {
+		for (const error of this._errors) {
+			yield error;
+		}
+	}
+}
+
+module.exports = AggregateError;
 
 
 /***/ }),
-/* 305 */
+
+/***/ "../../node_modules/cpy/node_modules/array-union/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(132);
-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;
+
+var arrayUniq = __webpack_require__("../../node_modules/array-uniq/index.js");
+
+module.exports = function () {
+	return arrayUniq([].concat.apply([], arguments));
+};
 
 
 /***/ }),
-/* 306 */
+
+/***/ "../../node_modules/cpy/node_modules/dir-glob/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const path = __webpack_require__("path");
+const pathType = __webpack_require__("../../node_modules/cpy/node_modules/path-type/index.js");
 
-var reusify = __webpack_require__(307)
+const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
-function fastqueue (context, worker, concurrency) {
-  if (typeof context === 'function') {
-    concurrency = worker
-    worker = context
-    context = null
-  }
+const getPath = (filepath, cwd) => {
+	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
+	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
+};
 
-  var cache = reusify(Task)
-  var queueHead = null
-  var queueTail = null
-  var _running = 0
+const addExtensions = (file, extensions) => {
+	if (path.extname(file)) {
+		return `**/${file}`;
+	}
 
-  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
-  }
+	return `**/${file}.${getExtensions(extensions)}`;
+};
 
-  return self
+const getGlob = (dir, opts) => {
+	if (opts.files && !Array.isArray(opts.files)) {
+		throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof opts.files}\``);
+	}
 
-  function running () {
-    return _running
-  }
+	if (opts.extensions && !Array.isArray(opts.extensions)) {
+		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof opts.extensions}\``);
+	}
 
-  function pause () {
-    self.paused = true
-  }
+	if (opts.files && opts.extensions) {
+		return opts.files.map(x => path.join(dir, addExtensions(x, opts.extensions)));
+	}
 
-  function length () {
-    var current = queueHead
-    var counter = 0
+	if (opts.files) {
+		return opts.files.map(x => path.join(dir, `**/${x}`));
+	}
 
-    while (current) {
-      current = current.next
-      counter++
-    }
+	if (opts.extensions) {
+		return [path.join(dir, `**/*.${getExtensions(opts.extensions)}`)];
+	}
 
-    return counter
-  }
+	return [path.join(dir, '**')];
+};
 
-  function resume () {
-    if (!self.paused) return
-    self.paused = false
-    for (var i = 0; i < self.concurrency; i++) {
-      _running++
-      release()
-    }
-  }
+module.exports = (input, opts) => {
+	opts = Object.assign({cwd: process.cwd()}, opts);
 
-  function idle () {
-    return _running === 0 && self.length() === 0
-  }
+	if (typeof opts.cwd !== 'string') {
+		return Promise.reject(new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof opts.cwd}\``));
+	}
 
-  function push (value, done) {
-    var current = cache.get()
+	return Promise.all([].concat(input).map(x => pathType.dir(getPath(x, opts.cwd))
+		.then(isDir => isDir ? getGlob(x, opts) : x)))
+		.then(globs => [].concat.apply([], globs));
+};
 
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+module.exports.sync = (input, opts) => {
+	opts = Object.assign({cwd: process.cwd()}, opts);
 
-    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)
-    }
-  }
+	if (typeof opts.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof opts.cwd}\``);
+	}
 
-  function unshift (value, done) {
-    var current = cache.get()
+	const globs = [].concat(input).map(x => pathType.dirSync(getPath(x, opts.cwd)) ? getGlob(x, opts) : x);
+	return [].concat.apply([], globs);
+};
 
-    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)
-    }
-  }
+/***/ }),
 
-  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()
-    }
-  }
+/***/ "../../node_modules/cpy/node_modules/globby/gitignore.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  function kill () {
-    queueHead = null
-    queueTail = null
-    self.drain = noop
-  }
+"use strict";
 
-  function killAndDrain () {
-    queueHead = null
-    queueTail = null
-    self.drain()
-    self.drain = noop
-  }
-}
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const fastGlob = __webpack_require__("../../node_modules/fast-glob/index.js");
+const gitIgnore = __webpack_require__("../../node_modules/cpy/node_modules/ignore/index.js");
+const pify = __webpack_require__("../../node_modules/pify/index.js");
+const slash = __webpack_require__("../../node_modules/cpy/node_modules/slash/index.js");
 
-function noop () {}
+const DEFAULT_IGNORE = [
+	'**/node_modules/**',
+	'**/bower_components/**',
+	'**/flow-typed/**',
+	'**/coverage/**',
+	'**/.git'
+];
 
-function Task () {
-  this.value = null
-  this.callback = noop
-  this.next = null
-  this.release = noop
-  this.context = null
+const readFileP = pify(fs.readFile);
 
-  var self = this
+const mapGitIgnorePatternTo = base => ignore => {
+	if (ignore.startsWith('!')) {
+		return '!' + path.posix.join(base, ignore.slice(1));
+	}
 
-  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 path.posix.join(base, ignore);
+};
 
-module.exports = fastqueue
+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.charAt(0) !== '#')
+		.map(mapGitIgnorePatternTo(base));
+};
 
-/***/ }),
-/* 307 */
-/***/ (function(module, exports, __webpack_require__) {
+const reduceIgnore = files => {
+	return files.reduce((ignores, file) => {
+		ignores.add(parseGitIgnore(file.content, {
+			cwd: file.cwd,
+			fileName: file.filePath
+		}));
+		return ignores;
+	}, gitIgnore());
+};
 
-"use strict";
+const getIsIgnoredPredecate = (ignores, cwd) => {
+	return p => ignores.ignores(slash(path.relative(cwd, p)));
+};
 
+const getFile = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	return readFileP(filePath, 'utf8')
+		.then(content => ({
+			content,
+			cwd,
+			filePath
+		}));
+};
 
-function reusify (Constructor) {
-  var head = new Constructor()
-  var tail = head
+const getFileSync = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = fs.readFileSync(filePath, 'utf8');
 
-  function get () {
-    var current = head
+	return {
+		content,
+		cwd,
+		filePath
+	};
+};
 
-    if (current.next) {
-      head = current.next
-    } else {
-      head = new Constructor()
-      tail = head
-    }
+const normalizeOptions = (options = {}) => {
+	const ignore = options.ignore || [];
+	const cwd = options.cwd || process.cwd();
+	return {ignore, cwd};
+};
 
-    current.next = null
+module.exports = options => {
+	options = normalizeOptions(options);
 
-    return current
-  }
+	return fastGlob('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	})
+		.then(paths => Promise.all(paths.map(file => getFile(file, options.cwd))))
+		.then(files => reduceIgnore(files))
+		.then(ignores => getIsIgnoredPredecate(ignores, options.cwd));
+};
 
-  function release (obj) {
-    tail.next = obj
-    tail = obj
-  }
+module.exports.sync = options => {
+	options = normalizeOptions(options);
 
-  return {
-    get: get,
-    release: release
-  }
-}
+	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);
 
-module.exports = reusify
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
 
 
 /***/ }),
-/* 308 */
+
+/***/ "../../node_modules/cpy/node_modules/globby/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "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;
 
+const fs = __webpack_require__("fs");
+const arrayUnion = __webpack_require__("../../node_modules/cpy/node_modules/array-union/index.js");
+const glob = __webpack_require__("../../node_modules/glob/glob.js");
+const fastGlob = __webpack_require__("../../node_modules/fast-glob/index.js");
+const dirGlob = __webpack_require__("../../node_modules/cpy/node_modules/dir-glob/index.js");
+const gitignore = __webpack_require__("../../node_modules/cpy/node_modules/globby/gitignore.js");
 
-/***/ }),
-/* 309 */
-/***/ (function(module, exports, __webpack_require__) {
+const DEFAULT_FILTER = () => false;
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const common = __webpack_require__(308);
-class Reader {
-    constructor(_root, _settings) {
-        this._root = _root;
-        this._settings = _settings;
-        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
-    }
-}
-exports.default = Reader;
+const isNegative = pattern => pattern[0] === '!';
 
+const assertPatternsInput = patterns => {
+	if (!patterns.every(x => typeof x === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
 
-/***/ }),
-/* 310 */
-/***/ (function(module, exports, __webpack_require__) {
+const checkCwdOption = options => {
+	if (options && options.cwd && !fs.statSync(options.cwd).isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(173);
-const async_1 = __webpack_require__(296);
-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;
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
 
+	const globTasks = [];
 
-/***/ }),
-/* 311 */
-/***/ (function(module, exports, __webpack_require__) {
+	taskOptions = Object.assign({
+		ignore: [],
+		expandDirectories: true
+	}, taskOptions);
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(312);
-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;
+	patterns.forEach((pattern, i) => {
+		if (isNegative(pattern)) {
+			return;
+		}
 
+		const ignore = patterns
+			.slice(i)
+			.filter(isNegative)
+			.map(pattern => pattern.slice(1));
 
-/***/ }),
-/* 312 */
-/***/ (function(module, exports, __webpack_require__) {
+		const options = Object.assign({}, taskOptions, {
+			ignore: taskOptions.ignore.concat(ignore)
+		});
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsScandir = __webpack_require__(297);
-const common = __webpack_require__(308);
-const reader_1 = __webpack_require__(309);
-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;
+		globTasks.push({pattern, options});
+	});
 
+	return globTasks;
+};
 
-/***/ }),
-/* 313 */
-/***/ (function(module, exports, __webpack_require__) {
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
+	}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsScandir = __webpack_require__(297);
-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;
+	if (Array.isArray(task.options.expandDirectories)) {
+		options = Object.assign(options, {files: task.options.expandDirectories});
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = Object.assign(options, task.options.expandDirectories);
+	}
 
+	return fn(task.pattern, options);
+};
 
-/***/ }),
-/* 314 */
-/***/ (function(module, exports, __webpack_require__) {
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
 
-"use strict";
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
+	}
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(289);
-const utils = __webpack_require__(259);
-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;
+	return {
+		pattern: glob,
+		options
+	};
+};
 
+const globby = (patterns, options) => {
+	let globTasks;
 
-/***/ }),
-/* 315 */
-/***/ (function(module, exports, __webpack_require__) {
+	try {
+		globTasks = generateGlobTasks(patterns, options);
+	} catch (error) {
+		return Promise.reject(error);
+	}
 
-"use strict";
+	const getTasks = Promise.all(globTasks.map(task => Promise.resolve(getPattern(task, dirGlob))
+		.then(globs => Promise.all(globs.map(globToTask(task))))
+	))
+		.then(tasks => arrayUnion(...tasks));
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const deep_1 = __webpack_require__(316);
-const entry_1 = __webpack_require__(319);
-const error_1 = __webpack_require__(320);
-const entry_2 = __webpack_require__(321);
-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;
+	const getFilter = () => {
+		return Promise.resolve(
+			options && options.gitignore ?
+				gitignore({cwd: options.cwd, ignore: options.ignore}) :
+				DEFAULT_FILTER
+		);
+	};
 
+	return getFilter()
+		.then(filter => {
+			return getTasks
+				.then(tasks => Promise.all(tasks.map(task => fastGlob(task.pattern, task.options))))
+				.then(paths => arrayUnion(...paths))
+				.then(paths => paths.filter(p => !filter(p)));
+		});
+};
 
-/***/ }),
-/* 316 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = globby;
+// TODO: Remove this for the next major release
+module.exports.default = globby;
 
-"use strict";
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(259);
-const partial_1 = __webpack_require__(317);
-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) {
-        if (this._isSkippedByDeep(basePath, entry.path)) {
-            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(basePath, entryPath) {
-        /**
-         * Avoid unnecessary depth calculations when it doesn't matter.
-         */
-        if (this._settings.deep === Infinity) {
-            return false;
-        }
-        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
-    }
-    _getEntryLevel(basePath, entryPath) {
-        const entryPathDepth = entryPath.split('/').length;
-        if (basePath === '') {
-            return entryPathDepth;
-        }
-        const basePathDepth = basePath.split('/').length;
-        return entryPathDepth - basePathDepth;
-    }
-    _isSkippedSymbolicLink(entry) {
-        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
-    }
-    _isSkippedByPositivePatterns(entryPath, matcher) {
-        return !this._settings.baseNameMatch && !matcher.match(entryPath);
-    }
-    _isSkippedByNegativePatterns(entryPath, patternsRe) {
-        return !utils.pattern.matchAny(entryPath, patternsRe);
-    }
-}
-exports.default = DeepFilter;
+	const getFilter = () => {
+		return options && options.gitignore ?
+			gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
+	};
 
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
 
-/***/ }),
-/* 317 */
-/***/ (function(module, exports, __webpack_require__) {
+	const filter = getFilter();
+	return tasks.reduce(
+		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
+		[]
+	).filter(p => !filter(p));
+};
 
-"use strict";
+module.exports.generateGlobTasks = generateGlobTasks;
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const matcher_1 = __webpack_require__(318);
-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.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => glob.hasMagic(pattern, options));
+
+module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 318 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/cpy/node_modules/ignore/index.js":
+/***/ (function(module, exports) {
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(259);
-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));
-    }
+// A simple implementation of make-array
+function make_array (subject) {
+  return Array.isArray(subject)
+    ? subject
+    : [subject]
 }
-exports.default = Matcher;
 
+const REGEX_BLANK_LINE = /^\s+$/
+const REGEX_LEADING_EXCAPED_EXCLAMATION = /^\\!/
+const REGEX_LEADING_EXCAPED_HASH = /^\\#/
+const SLASH = '/'
+const KEY_IGNORE = typeof Symbol !== 'undefined'
+  ? Symbol.for('node-ignore')
+  /* istanbul ignore next */
+  : 'node-ignore'
 
-/***/ }),
-/* 319 */
-/***/ (function(module, exports, __webpack_require__) {
+const define = (object, key, value) =>
+  Object.defineProperty(object, key, {value})
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(259);
-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 && this._isDuplicateEntry(entry)) {
-            return false;
-        }
-        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
-            return false;
-        }
-        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
-        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
-        if (this._settings.unique && isMatched) {
-            this._createIndexRecord(entry);
-        }
-        return isMatched;
-    }
-    _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(entryPath, patternsRe) {
-        if (!this._settings.absolute) {
-            return false;
-        }
-        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
-        return utils.pattern.matchAny(fullpath, patternsRe);
-    }
-    _isMatchToPatterns(entryPath, patternsRe) {
-        const filepath = utils.path.removeLeadingDotSegment(entryPath);
-        return utils.pattern.matchAny(filepath, patternsRe);
-    }
-}
-exports.default = EntryFilter;
+const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
 
+// 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.
+    : ''
+)
 
-/***/ }),
-/* 320 */
-/***/ (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 DEFAULT_REPLACER_PREFIX = [
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(259);
-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;
+  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
+  [
+    // (a\ ) -> (a )
+    // (a  ) -> (a)
+    // (a \ ) -> (a  )
+    /\\?\s+$/,
+    match => match.indexOf('\\') === 0
+      ? ' '
+      : ''
+  ],
 
+  // replace (\ ) with ' '
+  [
+    /\\\s/g,
+    () => ' '
+  ],
 
-/***/ }),
-/* 321 */
-/***/ (function(module, exports, __webpack_require__) {
+  // Escape metacharacters
+  // which is written down by users but means special for regular expressions.
 
-"use strict";
+  // > 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}`
+  ],
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(259);
-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;
+  [
+    // > [abc] matches any character inside the brackets
+    // >    (in this case a, b, or c);
+    /\[([^\]/]*)($|\])/g,
+    (match, p1, p2) => p2 === ']'
+      ? `[${sanitizeRange(p1)}]`
+      : `\\${match}`
+  ],
 
+  [
+    // > a question mark (?) matches a single character
+    /(?!\\)\?/g,
+    () => '[^/]'
+  ],
 
-/***/ }),
-/* 322 */
-/***/ (function(module, exports, __webpack_require__) {
+  // leading slash
+  [
 
-"use strict";
+    // > 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
+    /^\//,
+    () => '^'
+  ],
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(173);
-const stream_2 = __webpack_require__(288);
-const provider_1 = __webpack_require__(315);
-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;
+  // 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 '\\*'
+    /^\^*\\\*\\\*\\\//,
 
-/***/ }),
-/* 323 */
-/***/ (function(module, exports, __webpack_require__) {
+    // '**/foo' <-> 'foo'
+    () => '^(?:.*\\/)?'
+  ]
+]
 
-"use strict";
+const DEFAULT_REPLACER_SUFFIX = [
+  // 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 () {
+      return !/\/(?!$)/.test(this)
+        // > 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
+        ? '(?:^|\\/)'
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(324);
-const provider_1 = __webpack_require__(315);
-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);
+        // > Otherwise, Git treats the pattern as a shell glob suitable for
+        // >   consumption by fnmatch(3)
+        : '^'
     }
-}
-exports.default = ProviderSync;
-
+  ],
 
-/***/ }),
-/* 324 */
-/***/ (function(module, exports, __webpack_require__) {
+  // two globstars
+  [
+    // Use lookahead assertions so that we could match more than one `'/**'`
+    /\\\/\\\*\\\*(?=\\\/|$)/g,
 
-"use strict";
+    // Zero, one or several directories
+    // should not use '*', or it will be replaced by the next replacer
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(289);
-const fsWalk = __webpack_require__(294);
-const reader_1 = __webpack_require__(314);
-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;
+    // Check if it is not the last `'/**'`
+    (match, 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.
+      // '/**/'
+      ? '(?:\\/[^\\/]+)*'
 
-/***/ }),
-/* 325 */
-/***/ (function(module, exports, __webpack_require__) {
+      // case: /**
+      // > A trailing `"/**"` matches everything inside.
 
-"use strict";
+      // #21: everything inside but it should not include the current folder
+      : '\\/.+'
+  ],
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
-const fs = __webpack_require__(132);
-const os = __webpack_require__(122);
-/**
- * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
- * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
- */
-const CPU_COUNT = Math.max(os.cpus().length, 1);
-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;
+  // intermediate wildcards
+  [
+    // Never replace escaped '*'
+    // ignore rule '\*' will match the path '*'
 
+    // 'abc.*/' -> go
+    // 'abc.*'  -> skip this rule
+    /(^|[^\\]+)\\\*(?=.+)/g,
 
-/***/ }),
-/* 326 */
-/***/ (function(module, exports, __webpack_require__) {
+    // '*.js' matches '.js'
+    // '*.js' doesn't match 'abc'
+    (match, p1) => `${p1}[^\\/]*`
+  ],
 
-"use strict";
+  // trailing wildcard
+  [
+    /(\^|\\\/)?\\\*$/,
+    (match, p1) => {
+      const prefix = p1
+        // '\^':
+        // '/*' does not match ''
+        // '/*' does not match everything
 
-const path = __webpack_require__(4);
-const pathType = __webpack_require__(327);
+        // '\\\/':
+        // 'abc/*' does not match 'abc/'
+        ? `${p1}[^/]+`
 
-const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+        // 'a*' matches 'a'
+        // 'a*' matches 'aa'
+        : '[^/]*'
 
-const getPath = (filepath, cwd) => {
-	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
-	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
-};
+      return `${prefix}(?=$|\\/$)`
+    }
+  ],
 
-const addExtensions = (file, extensions) => {
-	if (path.extname(file)) {
-		return `**/${file}`;
-	}
+  [
+    // unescape
+    /\\\\\\/g,
+    () => '\\'
+  ]
+]
 
-	return `**/${file}.${getExtensions(extensions)}`;
-};
+const POSITIVE_REPLACERS = [
+  ...DEFAULT_REPLACER_PREFIX,
 
-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}\``);
-	}
+  // 'f'
+  // matches
+  // - /f(end)
+  // - /f/
+  // - (start)f(end)
+  // - (start)f/
+  // doesn't match
+  // - oof
+  // - foo
+  // pseudo:
+  // -> (^|/)f(/|$)
 
-	if (options.extensions && !Array.isArray(options.extensions)) {
-		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
-	}
+  // ending
+  [
+    // 'js' will not match 'js.'
+    // 'ab' will not match 'abc'
+    /(?:[^*/])$/,
 
-	if (options.files && options.extensions) {
-		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
-	}
+    // 'js*' will not match 'a.js'
+    // 'js/' will not match 'a.js'
+    // 'js' will match 'a.js' and 'a.js/'
+    match => `${match}(?=$|\\/)`
+  ],
 
-	if (options.files) {
-		return options.files.map(x => path.posix.join(directory, `**/${x}`));
-	}
+  ...DEFAULT_REPLACER_SUFFIX
+]
 
-	if (options.extensions) {
-		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
-	}
+const NEGATIVE_REPLACERS = [
+  ...DEFAULT_REPLACER_PREFIX,
 
-	return [path.posix.join(directory, '**')];
-};
+  // #24, #38
+  // The MISSING rule of [gitignore docs](https://git-scm.com/docs/gitignore)
+  // A negative pattern without a trailing wildcard should not
+  // re-include the things inside that directory.
 
-module.exports = async (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+  // eg:
+  // ['node_modules/*', '!node_modules']
+  // should ignore `node_modules/a.js`
+  [
+    /(?:[^*])$/,
+    match => `${match}(?=$|\\/$)`
+  ],
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+  ...DEFAULT_REPLACER_SUFFIX
+]
 
-	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;
-	}));
+// A simple cache, because an ignore rule only has only one certain meaning
+const cache = Object.create(null)
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+// @param {pattern}
+const make_regex = (pattern, negative, ignorecase) => {
+  const r = cache[pattern]
+  if (r) {
+    return r
+  }
 
-module.exports.sync = (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+  const replacers = negative
+    ? NEGATIVE_REPLACERS
+    : POSITIVE_REPLACERS
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+  const source = replacers.reduce(
+    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
+    pattern
+  )
 
-	const globs = [].concat(input).map(x => pathType.isDirectorySync(getPath(x, options.cwd)) ? getGlob(x, options) : x);
+  return cache[pattern] = ignorecase
+    ? new RegExp(source, 'i')
+    : new RegExp(source)
+}
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+// > A blank line matches no files, so it can serve as a separator for readability.
+const checkPattern = pattern => pattern
+  && typeof pattern === 'string'
+  && !REGEX_BLANK_LINE.test(pattern)
 
+  // > A line starting with # serves as a comment.
+  && pattern.indexOf('#') !== 0
 
-/***/ }),
-/* 327 */
-/***/ (function(module, exports, __webpack_require__) {
+const createRule = (pattern, ignorecase) => {
+  const origin = pattern
+  let negative = false
 
-"use strict";
+  // > An optional prefix "!" which negates the pattern;
+  if (pattern.indexOf('!') === 0) {
+    negative = true
+    pattern = pattern.substr(1)
+  }
 
-const {promisify} = __webpack_require__(113);
-const fs = __webpack_require__(132);
+  pattern = pattern
+  // > Put a backslash ("\") in front of the first "!" for patterns that
+  // >   begin with a literal "!", for example, `"\!important!.txt"`.
+  .replace(REGEX_LEADING_EXCAPED_EXCLAMATION, '!')
+  // > Put a backslash ("\") in front of the first hash for patterns that
+  // >   begin with a hash.
+  .replace(REGEX_LEADING_EXCAPED_HASH, '#')
 
-async function isType(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
+  const regex = make_regex(pattern, negative, ignorecase)
 
-	try {
-		const stats = await promisify(fs[fsStatType])(filePath);
-		return stats[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
-
-		throw error;
-	}
+  return {
+    origin,
+    pattern,
+    negative,
+    regex
+  }
 }
 
-function isTypeSync(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
+class IgnoreBase {
+  constructor ({
+    ignorecase = true
+  } = {}) {
+    this._rules = []
+    this._ignorecase = ignorecase
+    define(this, KEY_IGNORE, true)
+    this._initCache()
+  }
 
-	try {
-		return fs[fsStatType](filePath)[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+  _initCache () {
+    this._cache = Object.create(null)
+  }
 
-		throw error;
-	}
-}
+  // @param {Array.<string>|string|Ignore} pattern
+  add (pattern) {
+    this._added = false
 
-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');
+    if (typeof pattern === 'string') {
+      pattern = pattern.split(/\r?\n/g)
+    }
 
+    make_array(pattern).forEach(this._addPattern, this)
 
-/***/ }),
-/* 328 */
-/***/ (function(module, exports, __webpack_require__) {
+    // Some rules have just added to the ignore,
+    // making the behavior changed.
+    if (this._added) {
+      this._initCache()
+    }
 
-"use strict";
+    return this
+  }
 
-const {promisify} = __webpack_require__(113);
-const fs = __webpack_require__(132);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(257);
-const gitIgnore = __webpack_require__(329);
-const slash = __webpack_require__(330);
+  // legacy
+  addPattern (pattern) {
+    return this.add(pattern)
+  }
 
-const DEFAULT_IGNORE = [
-	'**/node_modules/**',
-	'**/flow-typed/**',
-	'**/coverage/**',
-	'**/.git'
-];
+  _addPattern (pattern) {
+    // #32
+    if (pattern && pattern[KEY_IGNORE]) {
+      this._rules = this._rules.concat(pattern._rules)
+      this._added = true
+      return
+    }
 
-const readFileP = promisify(fs.readFile);
+    if (checkPattern(pattern)) {
+      const rule = createRule(pattern, this._ignorecase)
+      this._added = true
+      this._rules.push(rule)
+    }
+  }
 
-const mapGitIgnorePatternTo = base => ignore => {
-	if (ignore.startsWith('!')) {
-		return '!' + path.posix.join(base, ignore.slice(1));
-	}
+  filter (paths) {
+    return make_array(paths).filter(path => this._filter(path))
+  }
 
-	return path.posix.join(base, ignore);
-};
+  createFilter () {
+    return path => this._filter(path)
+  }
 
-const parseGitIgnore = (content, options) => {
-	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+  ignores (path) {
+    return !this._filter(path)
+  }
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => !line.startsWith('#'))
-		.map(mapGitIgnorePatternTo(base));
-};
+  // @returns `Boolean` true if the `path` is NOT ignored
+  _filter (path, slices) {
+    if (!path) {
+      return false
+    }
 
-const reduceIgnore = files => {
-	return files.reduce((ignores, file) => {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-		return ignores;
-	}, gitIgnore());
-};
+    if (path in this._cache) {
+      return this._cache[path]
+    }
 
-const ensureAbsolutePathForCwd = (cwd, p) => {
-	if (path.isAbsolute(p)) {
-		if (p.startsWith(cwd)) {
-			return p;
-		}
+    if (!slices) {
+      // path/to/a.js
+      // ['path', 'to', 'a.js']
+      slices = path.split(SLASH)
+    }
 
-		throw new Error(`Path ${p} is not in cwd ${cwd}`);
-	}
+    slices.pop()
 
-	return path.join(cwd, p);
-};
+    return this._cache[path] = slices.length
+      // > It is not possible to re-include a file if a parent directory of
+      // >   that file is excluded.
+      // If the path contains a parent directory, check the parent first
+      ? this._filter(slices.join(SLASH) + SLASH, slices)
+        && this._test(path)
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
-};
+      // Or only test the path
+      : this._test(path)
+  }
 
-const getFile = async (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = await readFileP(filePath, 'utf8');
+  // @returns {Boolean} true if a file is NOT ignored
+  _test (path) {
+    // Explicitly define variable type by setting matched to `0`
+    let matched = 0
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+    this._rules.forEach(rule => {
+      // if matched = true, then we only test negative rules
+      // if matched = false, then we test non-negative rules
+      if (!(matched ^ rule.negative)) {
+        matched = rule.negative ^ rule.regex.test(path)
+      }
+    })
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
+    return !matched
+  }
+}
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+// 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'
+  )
+) {
+  const filter = IgnoreBase.prototype._filter
 
-const normalizeOptions = ({
-	ignore = [],
-	cwd = slash(process.cwd())
-} = {}) => {
-	return {ignore, cwd};
-};
+  /* eslint no-control-regex: "off" */
+  const make_posix = str => /^\\\\\?\\/.test(str)
+  || /[^\x00-\x80]+/.test(str)
+    ? str
+    : str.replace(/\\/g, '/')
 
-module.exports = async options => {
-	options = normalizeOptions(options);
+  IgnoreBase.prototype._filter = function filterWin32 (path, slices) {
+    path = make_posix(path)
+    return filter.call(this, path, slices)
+  }
+}
 
-	const paths = await fastGlob('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+module.exports = options => new IgnoreBase(options)
 
-	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);
+/***/ "../../node_modules/cpy/node_modules/indent-string/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	const paths = fastGlob.sync('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+"use strict";
 
-	const files = paths.map(file => getFileSync(file, options.cwd));
-	const ignores = reduceIgnore(files);
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+module.exports = (string, count = 1, options) => {
+	options = {
+		indent: ' ',
+		includeEmptyLines: false,
+		...options
+	};
 
+	if (typeof string !== 'string') {
+		throw new TypeError(
+			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
+		);
+	}
 
-/***/ }),
-/* 329 */
-/***/ (function(module, exports) {
+	if (typeof count !== 'number') {
+		throw new TypeError(
+			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
+		);
+	}
 
-// A simple implementation of make-array
-function makeArray (subject) {
-  return Array.isArray(subject)
-    ? subject
-    : [subject]
-}
+	if (typeof options.indent !== 'string') {
+		throw new TypeError(
+			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
+		);
+	}
 
-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 (count === 0) {
+		return string;
+	}
 
-const SLASH = '/'
-const KEY_IGNORE = typeof Symbol !== 'undefined'
-  ? Symbol.for('node-ignore')
-  /* istanbul ignore next */
-  : 'node-ignore'
+	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
 
-const define = (object, key, value) =>
-  Object.defineProperty(object, key, {value})
+	return string.replace(regex, options.indent.repeat(count));
+};
 
-const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
 
-// 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)
-}
+/***/ "../../node_modules/cpy/node_modules/p-map/index.js":
+/***/ (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 = [
+const AggregateError = __webpack_require__("../../node_modules/cpy/node_modules/aggregate-error/index.js");
 
-  // > 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 = async (
+	iterable,
+	mapper,
+	{
+		concurrency = Infinity,
+		stopOnError = true
+	} = {}
+) => {
+	return new Promise((resolve, reject) => {
+		if (typeof mapper !== 'function') {
+			throw new TypeError('Mapper function is required');
+		}
 
-  // replace (\ ) with ' '
-  [
-    /\\\s/g,
-    () => SPACE
-  ],
+		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+		}
 
-  // Escape metacharacters
-  // which is written down by users but means special for regular expressions.
+		const ret = [];
+		const errors = [];
+		const iterator = iterable[Symbol.iterator]();
+		let isRejected = false;
+		let isIterableDone = false;
+		let resolvingCount = 0;
+		let currentIndex = 0;
 
-  // > 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}`
-  ],
+		const next = () => {
+			if (isRejected) {
+				return;
+			}
 
-  [
-    // > a question mark (?) matches a single character
-    /(?!\\)\?/g,
-    () => '[^/]'
-  ],
+			const nextItem = iterator.next();
+			const i = currentIndex;
+			currentIndex++;
 
-  // leading slash
-  [
+			if (nextItem.done) {
+				isIterableDone = true;
 
-    // > 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
-    /^\//,
-    () => '^'
-  ],
+				if (resolvingCount === 0) {
+					if (!stopOnError && errors.length !== 0) {
+						reject(new AggregateError(errors));
+					} else {
+						resolve(ret);
+					}
+				}
 
-  // replace special metacharacter slash after the leading slash
-  [
-    /\//g,
-    () => '\\/'
-  ],
+				return;
+			}
 
-  [
-    // > 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 '\\*'
-    /^\^*\\\*\\\*\\\//,
+			resolvingCount++;
 
-    // '**/foo' <-> 'foo'
-    () => '^(?:.*\\/)?'
-  ],
+			(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();
+					}
+				}
+			})();
+		};
 
-  // 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
+		for (let i = 0; i < concurrency; i++) {
+			next();
 
-        // 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.
-        ? '(?:^|\\/)'
+			if (isIterableDone) {
+				break;
+			}
+		}
+	});
+};
 
-        // > 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,
+/***/ }),
 
-    // Zero, one or several directories
-    // should not use '*', or it will be replaced by the next replacer
+/***/ "../../node_modules/cpy/node_modules/path-type/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // Check if it is not the last `'/**'`
-    (_, index, str) => index + 6 < str.length
+"use strict";
 
-      // 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.
-      // '/**/'
-      ? '(?:\\/[^\\/]+)*'
+const fs = __webpack_require__("fs");
+const pify = __webpack_require__("../../node_modules/cpy/node_modules/path-type/node_modules/pify/index.js");
 
-      // case: /**
-      // > A trailing `"/**"` matches everything inside.
+function type(fn, fn2, fp) {
+	if (typeof fp !== 'string') {
+		return Promise.reject(new TypeError(`Expected a string, got ${typeof fp}`));
+	}
 
-      // #21: everything inside but it should not include the current folder
-      : '\\/.+'
-  ],
+	return pify(fs[fn])(fp)
+		.then(stats => stats[fn2]())
+		.catch(err => {
+			if (err.code === 'ENOENT') {
+				return false;
+			}
 
-  // intermediate wildcards
-  [
-    // Never replace escaped '*'
-    // ignore rule '\*' will match the path '*'
+			throw err;
+		});
+}
 
-    // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+function typeSync(fn, fn2, fp) {
+	if (typeof fp !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof fp}`);
+	}
 
-    // '*.js' matches '.js'
-    // '*.js' doesn't match 'abc'
-    (_, p1) => `${p1}[^\\/]*`
-  ],
+	try {
+		return fs[fn](fp)[fn2]();
+	} catch (err) {
+		if (err.code === 'ENOENT') {
+			return false;
+		}
 
-  [
-    // unescape, revert step 3 except for back slash
-    // For example, if a user escape a '\\*',
-    // after step 3, the result will be '\\\\\\*'
-    /\\\\\\(?=[$.|*+(){^])/g,
-    () => ESCAPE
-  ],
+		throw err;
+	}
+}
 
-  [
-    // '\\\\' -> '\\'
-    /\\\\/g,
-    () => ESCAPE
-  ],
+exports.file = type.bind(null, 'stat', 'isFile');
+exports.dir = type.bind(null, 'stat', 'isDirectory');
+exports.symlink = type.bind(null, 'lstat', 'isSymbolicLink');
+exports.fileSync = typeSync.bind(null, 'statSync', 'isFile');
+exports.dirSync = typeSync.bind(null, 'statSync', 'isDirectory');
+exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
-  [
-    // > 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'
-    /(?:[^*])$/,
+/***/ "../../node_modules/cpy/node_modules/path-type/node_modules/pify/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // 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
+"use strict";
 
-    // > 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}(?=$|\\/$)`
-  ],
+const processFn = (fn, opts) => function () {
+	const P = opts.promiseModule;
+	const args = new Array(arguments.length);
 
-  // trailing wildcard
-  [
-    /(\^|\\\/)?\\\*$/,
-    (_, p1) => {
-      const prefix = p1
-        // '\^':
-        // '/*' does not match EMPTY
-        // '/*' does not match everything
+	for (let i = 0; i < arguments.length; i++) {
+		args[i] = arguments[i];
+	}
 
-        // '\\\/':
-        // 'abc/*' does not match 'abc/'
-        ? `${p1}[^/]+`
+	return new P((resolve, reject) => {
+		if (opts.errorFirst) {
+			args.push(function (err, result) {
+				if (opts.multiArgs) {
+					const results = new Array(arguments.length - 1);
 
-        // 'a*' matches 'a'
-        // 'a*' matches 'aa'
-        : '[^/]*'
+					for (let i = 1; i < arguments.length; i++) {
+						results[i - 1] = arguments[i];
+					}
 
-      return `${prefix}(?=$|\\/$)`
-    }
-  ],
-]
+					if (err) {
+						results.unshift(err);
+						reject(results);
+					} else {
+						resolve(results);
+					}
+				} else if (err) {
+					reject(err);
+				} else {
+					resolve(result);
+				}
+			});
+		} else {
+			args.push(function (result) {
+				if (opts.multiArgs) {
+					const results = new Array(arguments.length - 1);
 
-// A simple cache, because an ignore rule only has only one certain meaning
-const regexCache = Object.create(null)
+					for (let i = 0; i < arguments.length; i++) {
+						results[i] = arguments[i];
+					}
 
-// @param {pattern}
-const makeRegex = (pattern, negative, ignorecase) => {
-  const r = regexCache[pattern]
-  if (r) {
-    return r
-  }
+					resolve(results);
+				} else {
+					resolve(result);
+				}
+			});
+		}
 
-  // const replacers = negative
-  //   ? NEGATIVE_REPLACERS
-  //   : POSITIVE_REPLACERS
+		fn.apply(this, args);
+	});
+};
 
-  const source = REPLACERS.reduce(
-    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
-    pattern
-  )
+module.exports = (obj, opts) => {
+	opts = Object.assign({
+		exclude: [/.+(Sync|Stream)$/],
+		errorFirst: true,
+		promiseModule: Promise
+	}, opts);
 
-  return regexCache[pattern] = ignorecase
-    ? new RegExp(source, 'i')
-    : new RegExp(source)
-}
+	const filter = key => {
+		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
+		return opts.include ? opts.include.some(match) : !opts.exclude.some(match);
+	};
 
-const isString = subject => typeof subject === 'string'
+	let ret;
+	if (typeof obj === 'function') {
+		ret = function () {
+			if (opts.excludeMain) {
+				return obj.apply(this, arguments);
+			}
 
-// > 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)
+			return processFn(obj, opts).apply(this, arguments);
+		};
+	} else {
+		ret = Object.create(Object.getPrototypeOf(obj));
+	}
 
-  // > A line starting with # serves as a comment.
-  && pattern.indexOf('#') !== 0
+	for (const key in obj) { // eslint-disable-line guard-for-in
+		const x = obj[key];
+		ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x;
+	}
 
-const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
+	return ret;
+};
 
-class IgnoreRule {
-  constructor (
-    origin,
-    pattern,
-    negative,
-    regex
-  ) {
-    this.origin = origin
-    this.pattern = pattern
-    this.negative = negative
-    this.regex = regex
-  }
-}
 
-const createRule = (pattern, ignorecase) => {
-  const origin = pattern
-  let negative = false
+/***/ }),
 
-  // > An optional prefix "!" which negates the pattern;
-  if (pattern.indexOf('!') === 0) {
-    negative = true
-    pattern = pattern.substr(1)
-  }
+/***/ "../../node_modules/cpy/node_modules/slash/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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, '#')
+"use strict";
 
-  const regex = makeRegex(pattern, negative, ignorecase)
+module.exports = input => {
+	const isExtendedLengthPath = /^\\\\\?\\/.test(input);
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(input); // eslint-disable-line no-control-regex
 
-  return new IgnoreRule(
-    origin,
-    pattern,
-    negative,
-    regex
-  )
-}
+	if (isExtendedLengthPath || hasNonAscii) {
+		return input;
+	}
 
-const throwError = (message, Ctor) => {
-  throw new Ctor(message)
-}
+	return input.replace(/\\/g, '/');
+};
 
-const checkPath = (path, originalPath, doThrow) => {
-  if (!isString(path)) {
-    return doThrow(
-      `path must be a string, but got \`${originalPath}\``,
-      TypeError
-    )
-  }
 
-  // We don't know if we should ignore EMPTY, so throw
-  if (!path) {
-    return doThrow(`path must not be empty`, TypeError)
-  }
+/***/ }),
 
-  // 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
-    )
-  }
+/***/ "../../node_modules/cross-spawn/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return true
-}
+"use strict";
 
-const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
-checkPath.isNotRelative = isNotRelative
-checkPath.convert = p => p
+const cp = __webpack_require__("child_process");
+const parse = __webpack_require__("../../node_modules/cross-spawn/lib/parse.js");
+const enoent = __webpack_require__("../../node_modules/cross-spawn/lib/enoent.js");
 
-class Ignore {
-  constructor ({
-    ignorecase = true
-  } = {}) {
-    this._rules = []
-    this._ignorecase = ignorecase
-    define(this, KEY_IGNORE, true)
-    this._initCache()
-  }
+function spawn(command, args, options) {
+    // Parse the arguments
+    const parsed = parse(command, args, options);
 
-  _initCache () {
-    this._ignoreCache = Object.create(null)
-    this._testCache = Object.create(null)
-  }
+    // Spawn the child process
+    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
 
-  _addPattern (pattern) {
-    // #32
-    if (pattern && pattern[KEY_IGNORE]) {
-      this._rules = this._rules.concat(pattern._rules)
-      this._added = true
-      return
-    }
+    // 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);
 
-    if (checkPattern(pattern)) {
-      const rule = createRule(pattern, this._ignorecase)
-      this._added = true
-      this._rules.push(rule)
-    }
-  }
+    return spawned;
+}
 
-  // @param {Array<string> | string | Ignore} pattern
-  add (pattern) {
-    this._added = false
+function spawnSync(command, args, options) {
+    // Parse the arguments
+    const parsed = parse(command, args, options);
 
-    makeArray(
-      isString(pattern)
-        ? splitPattern(pattern)
-        : pattern
-    ).forEach(this._addPattern, this)
+    // Spawn the child process
+    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
 
-    // Some rules have just added to the ignore,
-    // making the behavior changed.
-    if (this._added) {
-      this._initCache()
-    }
+    // 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);
 
-    return this
-  }
+    return result;
+}
 
-  // legacy
-  addPattern (pattern) {
-    return this.add(pattern)
-  }
+module.exports = spawn;
+module.exports.spawn = spawn;
+module.exports.sync = spawnSync;
 
-  //          |           ignored : unignored
-  // negative |   0:0   |   0:1   |   1:0   |   1:1
-  // -------- | ------- | ------- | ------- | --------
-  //     0    |  TEST   |  TEST   |  SKIP   |    X
-  //     1    |  TESTIF |  SKIP   |  TEST   |    X
+module.exports._parse = parse;
+module.exports._enoent = enoent;
 
-  // - 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.
+/***/ }),
 
-  // @returns {TestResult} true if a file is ignored
-  _testOne (path, checkUnignored) {
-    let ignored = false
-    let unignored = false
+/***/ "../../node_modules/cross-spawn/lib/enoent.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    this._rules.forEach(rule => {
-      const {negative} = rule
-      if (
-        unignored === negative && ignored !== unignored
-        || negative && !ignored && !unignored && !checkUnignored
-      ) {
-        return
-      }
+"use strict";
 
-      const matched = rule.regex.test(path)
 
-      if (matched) {
-        ignored = !negative
-        unignored = negative
-      }
-    })
+const isWin = process.platform === 'win32';
 
-    return {
-      ignored,
-      unignored
+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 hookChildProcess(cp, parsed) {
+    if (!isWin) {
+        return;
     }
-  }
 
-  // @returns {TestResult}
-  _test (originalPath, cache, checkUnignored, slices) {
-    const path = originalPath
-      // Supports nullable path
-      && checkPath.convert(originalPath)
+    const originalEmit = cp.emit;
 
-    checkPath(path, originalPath, throwError)
+    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');
 
-    return this._t(path, cache, checkUnignored, slices)
-  }
+            if (err) {
+                return originalEmit.call(cp, 'error', err);
+            }
+        }
 
-  _t (path, cache, checkUnignored, slices) {
-    if (path in cache) {
-      return cache[path]
-    }
+        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
+    };
+}
 
-    if (!slices) {
-      // path/to/a.js
-      // ['path', 'to', 'a.js']
-      slices = path.split(SLASH)
+function verifyENOENT(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawn');
     }
 
-    slices.pop()
+    return null;
+}
 
-    // If the path has no parent directory, just test it
-    if (!slices.length) {
-      return cache[path] = this._testOne(path, checkUnignored)
+function verifyENOENTSync(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawnSync');
     }
 
-    const parent = this._t(
-      slices.join(SLASH) + SLASH,
-      cache,
-      checkUnignored,
-      slices
-    )
-
-    // 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)
-  }
+    return null;
+}
 
-  ignores (path) {
-    return this._test(path, this._ignoreCache, false).ignored
-  }
+module.exports = {
+    hookChildProcess,
+    verifyENOENT,
+    verifyENOENTSync,
+    notFoundError,
+};
 
-  createFilter () {
-    return path => !this.ignores(path)
-  }
 
-  filter (paths) {
-    return makeArray(paths).filter(this.createFilter())
-  }
+/***/ }),
 
-  // @returns {TestResult}
-  test (path) {
-    return this._test(path, this._testCache, true)
-  }
-}
+/***/ "../../node_modules/cross-spawn/lib/parse.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const factory = options => new Ignore(options)
+"use strict";
 
-const returnFalse = () => false
 
-const isPathValid = path =>
-  checkPath(path && checkPath.convert(path), path, returnFalse)
+const path = __webpack_require__("path");
+const resolveCommand = __webpack_require__("../../node_modules/cross-spawn/lib/util/resolveCommand.js");
+const escape = __webpack_require__("../../node_modules/cross-spawn/lib/util/escape.js");
+const readShebang = __webpack_require__("../../node_modules/cross-spawn/lib/util/readShebang.js");
 
-factory.isPathValid = isPathValid
+const isWin = process.platform === 'win32';
+const isExecutableRegExp = /\.(?:com|exe)$/i;
+const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
 
-// Fixes typescript
-factory.default = factory
+function detectShebang(parsed) {
+    parsed.file = resolveCommand(parsed);
 
-module.exports = factory
+    const shebang = parsed.file && readShebang(parsed.file);
 
-// 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, '/')
+    if (shebang) {
+        parsed.args.unshift(parsed.file);
+        parsed.command = shebang;
 
-  checkPath.convert = makePosix
+        return resolveCommand(parsed);
+    }
 
-  // '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)
+    return parsed.file;
 }
 
+function parseNonShell(parsed) {
+    if (!isWin) {
+        return parsed;
+    }
 
-/***/ }),
-/* 330 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = path => {
-	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
+    // Detect & add support for shebangs
+    const commandFile = detectShebang(parsed);
 
-	if (isExtendedLengthPath || hasNonAscii) {
-		return path;
-	}
+    // We don't need a shell if the command filename is an executable
+    const needsShell = !isExecutableRegExp.test(commandFile);
 
-	return path.replace(/\\/g, '/');
-};
+    // 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);
 
+        // 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);
 
-/***/ }),
-/* 331 */
-/***/ (function(module, exports, __webpack_require__) {
+        // Escape command & arguments
+        parsed.command = escape.command(parsed.command);
+        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
 
-"use strict";
+        const shellCommand = [parsed.command].concat(parsed.args).join(' ');
 
-const {Transform} = __webpack_require__(173);
+        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
+    }
 
-class ObjectTransform extends Transform {
-	constructor() {
-		super({
-			objectMode: true
-		});
-	}
+    return parsed;
 }
 
-class FilterStream extends ObjectTransform {
-	constructor(filter) {
-		super();
-		this._filter = filter;
-	}
-
-	_transform(data, encoding, callback) {
-		if (this._filter(data)) {
-			this.push(data);
-		}
-
-		callback();
-	}
-}
+function parse(command, args, options) {
+    // Normalize arguments, similar to nodejs
+    if (args && !Array.isArray(args)) {
+        options = args;
+        args = null;
+    }
 
-class UniqueStream extends ObjectTransform {
-	constructor() {
-		super();
-		this._pushed = new Set();
-	}
+    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
+    options = Object.assign({}, options); // Clone object to avoid changing the original
 
-	_transform(data, encoding, callback) {
-		if (!this._pushed.has(data)) {
-			this.push(data);
-			this._pushed.add(data);
-		}
+    // Build our parsed object
+    const parsed = {
+        command,
+        args,
+        options,
+        file: undefined,
+        original: {
+            command,
+            args,
+        },
+    };
 
-		callback();
-	}
+    // Delegate further parsing to shell or non-shell
+    return options.shell ? parsed : parseNonShell(parsed);
 }
 
-module.exports = {
-	FilterStream,
-	UniqueStream
-};
+module.exports = parse;
 
 
 /***/ }),
-/* 332 */
+
+/***/ "../../node_modules/cross-spawn/lib/util/escape.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(4);
 
-module.exports = path_ => {
-	let cwd = process.cwd();
+// See http://www.robvanderwoude.com/escapechars.php
+const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
 
-	path_ = path.resolve(path_);
+function escapeCommand(arg) {
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
 
-	if (process.platform === 'win32') {
-		cwd = cwd.toLowerCase();
-		path_ = path_.toLowerCase();
-	}
+    return arg;
+}
 
-	return path_ === cwd;
-};
+function escapeArgument(arg, doubleEscapeMetaChars) {
+    // Convert to string
+    arg = `${arg}`;
 
+    // Algorithm below is based on https://qntm.org/cmd
 
-/***/ }),
-/* 333 */
-/***/ (function(module, exports, __webpack_require__) {
+    // Sequence of backslashes followed by a double quote:
+    // double up all the backslashes and escape the double quote
+    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
 
-"use strict";
+    // 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 path = __webpack_require__(4);
+    // All other backslashes occur literally
 
-module.exports = (childPath, parentPath) => {
-	childPath = path.resolve(childPath);
-	parentPath = path.resolve(parentPath);
+    // Quote the whole thing:
+    arg = `"${arg}"`;
 
-	if (process.platform === 'win32') {
-		childPath = childPath.toLowerCase();
-		parentPath = parentPath.toLowerCase();
-	}
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
 
-	if (childPath === parentPath) {
-		return false;
-	}
+    // Double escape meta chars if necessary
+    if (doubleEscapeMetaChars) {
+        arg = arg.replace(metaCharsRegExp, '^$1');
+    }
 
-	childPath += path.sep;
-	parentPath += path.sep;
+    return arg;
+}
 
-	return childPath.startsWith(parentPath);
-};
+module.exports.command = escapeCommand;
+module.exports.argument = escapeArgument;
 
 
 /***/ }),
-/* 334 */
+
+/***/ "../../node_modules/cross-spawn/lib/util/readShebang.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-const assert = __webpack_require__(162)
-const path = __webpack_require__(4)
-const fs = __webpack_require__(132)
-let glob = undefined
-try {
-  glob = __webpack_require__(244)
-} catch (_err) {
-  // treat glob as optional.
-}
+"use strict";
 
-const defaultGlobOpts = {
-  nosort: true,
-  silent: true
-}
 
-// for EMFILE handling
-let timeout = 0
+const fs = __webpack_require__("fs");
+const shebangCommand = __webpack_require__("../../node_modules/shebang-command/index.js");
 
-const isWindows = (process.platform === "win32")
+function readShebang(command) {
+    // Read the first 150 bytes from the file
+    const size = 150;
+    const buffer = Buffer.alloc(size);
 
-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]
-  })
+    let fd;
 
-  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
-}
+    try {
+        fd = fs.openSync(command, 'r');
+        fs.readSync(fd, buffer, 0, size, 0);
+        fs.closeSync(fd);
+    } catch (e) { /* Empty */ }
 
-const rimraf = (p, options, cb) => {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+    // Attempt to extract shebang (null is returned if not a shebang)
+    return shebangCommand(buffer.toString());
+}
 
-  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 = readShebang;
 
-  defaults(options)
 
-  let busyTries = 0
-  let errState = null
-  let n = 0
+/***/ }),
 
-  const next = (er) => {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
+/***/ "../../node_modules/cross-spawn/lib/util/resolveCommand.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  const afterGlob = (er, results) => {
-    if (er)
-      return cb(er)
+"use strict";
 
-    n = results.length
-    if (n === 0)
-      return cb()
 
-    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)
-          }
+const path = __webpack_require__("path");
+const which = __webpack_require__("../../node_modules/which/which.js");
+const getPathKey = __webpack_require__("../../node_modules/cross-spawn/node_modules/path-key/index.js");
 
-          // this one won't happen if graceful-fs is used.
-          if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
-          }
+function resolveCommandAttempt(parsed, withoutPathExt) {
+    const env = parsed.options.env || process.env;
+    const cwd = process.cwd();
+    const hasCustomCwd = parsed.options.cwd != null;
+    // Worker threads do not have process.chdir()
+    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined && !process.chdir.disabled;
 
-          // already gone
-          if (er.code === "ENOENT") er = null
+    // 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 */
         }
+    }
 
-        timeout = 0
-        next(er)
-      }
-      rimraf_(p, options, CB)
-    })
-  }
-
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+    let resolved;
 
-  options.lstat(p, (er, stat) => {
-    if (!er)
-      return afterGlob(null, [p])
+    try {
+        resolved = which.sync(parsed.command, {
+            path: env[getPathKey({ env })],
+            pathExt: withoutPathExt ? path.delimiter : undefined,
+        });
+    } catch (e) {
+        /* Empty */
+    } finally {
+        if (shouldSwitchCwd) {
+            process.chdir(cwd);
+        }
+    }
 
-    glob(p, options.glob, afterGlob)
-  })
+    // 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;
 }
 
-// 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)
+function resolveCommand(parsed) {
+    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+}
 
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
+module.exports = resolveCommand;
 
-    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')
+/***/ "../../node_modules/cross-spawn/node_modules/path-key/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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)
-      })
-  })
-}
+"use strict";
 
-const fixWinEPERMSync = (p, options, er) => {
-  assert(p)
-  assert(options)
 
-  try {
-    options.chmodSync(p, 0o666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+const pathKey = (options = {}) => {
+	const environment = options.env || process.env;
+	const platform = options.platform || process.platform;
 
-  let stats
-  try {
-    stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+	if (platform !== 'win32') {
+		return 'PATH';
+	}
 
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
-}
+	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
+};
 
-const rmdir = (p, options, originalEr, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+module.exports = pathKey;
+// TODO: Remove this for the next major release
+module.exports.default = pathKey;
 
-  // 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)
-      })
-    })
-  })
-}
+/***/ "../../node_modules/debug/node_modules/ms/index.js":
+/***/ (function(module, exports) {
 
-// 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)
+/**
+ * Helpers.
+ */
 
-  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 s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
 
-  let results
+/**
+ * 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
+ */
 
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
+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)
+  );
+};
 
-  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
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
 
-      rmdirSync(p, options, er)
-    }
+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;
   }
 }
 
-const rmdirSync = (p, options, originalEr) => {
-  assert(p)
-  assert(options)
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  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 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';
 }
 
-const rmkidsSync = (p, options) => {
-  assert(p)
-  assert(options)
-  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-  // 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)
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
 }
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
+/**
+ * Pluralization helper.
+ */
+
+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';
+}
 
 
 /***/ }),
-/* 335 */
+
+/***/ "../../node_modules/debug/src/browser.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-const AggregateError = __webpack_require__(336);
+exports = module.exports = __webpack_require__("../../node_modules/debug/src/debug.js");
+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();
 
-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');
-		}
+/**
+ * Colors.
+ */
 
-		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
-			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-		}
+exports.colors = [
+  'lightseagreen',
+  'forestgreen',
+  'goldenrod',
+  'dodgerblue',
+  'darkorchid',
+  'crimson'
+];
 
-		const ret = [];
-		const errors = [];
-		const iterator = iterable[Symbol.iterator]();
-		let isRejected = false;
-		let isIterableDone = false;
-		let resolvingCount = 0;
-		let currentIndex = 0;
+/**
+ * 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
+ */
 
-		const next = () => {
-			if (isRejected) {
-				return;
-			}
+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;
+  }
 
-			const nextItem = iterator.next();
-			const i = currentIndex;
-			currentIndex++;
+  // 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+)/));
+}
 
-			if (nextItem.done) {
-				isIterableDone = true;
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
 
-				if (resolvingCount === 0) {
-					if (!stopOnError && errors.length !== 0) {
-						reject(new AggregateError(errors));
-					} else {
-						resolve(ret);
-					}
-				}
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
+};
 
-				return;
-			}
 
-			resolvingCount++;
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
 
-			(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();
-					}
-				}
-			})();
-		};
+function formatArgs(args) {
+  var useColors = this.useColors;
 
-		for (let i = 0; i < concurrency; i++) {
-			next();
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
 
-			if (isIterableDone) {
-				break;
-			}
-		}
-	});
-};
+  if (!useColors) return;
 
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
 
-/***/ }),
-/* 336 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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;
+    }
+  });
 
-"use strict";
+  args.splice(lastC, 0, c);
+}
 
-const indentString = __webpack_require__(337);
-const cleanStack = __webpack_require__(338);
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
 
-const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
+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);
+}
 
-class AggregateError extends Error {
-	constructor(errors) {
-		if (!Array.isArray(errors)) {
-			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
-		}
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-		errors = [...errors].map(error => {
-			if (error instanceof Error) {
-				return error;
-			}
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
 
-			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);
-			}
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-			return new Error(error);
-		});
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
 
-		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);
+  // 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;
+  }
 
-		this.name = 'AggregateError';
+  return r;
+}
 
-		Object.defineProperty(this, '_errors', {value: errors});
-	}
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
 
-	* [Symbol.iterator]() {
-		for (const error of this._errors) {
-			yield error;
-		}
-	}
-}
+exports.enable(load());
 
-module.exports = AggregateError;
+/**
+ * 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
+ */
+
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
 
 
 /***/ }),
-/* 337 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "../../node_modules/debug/src/debug.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (string, count = 1, options) => {
-	options = {
-		indent: ' ',
-		includeEmptyLines: false,
-		...options
-	};
 
-	if (typeof string !== 'string') {
-		throw new TypeError(
-			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
-		);
-	}
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-	if (typeof count !== 'number') {
-		throw new TypeError(
-			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
-		);
-	}
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__("../../node_modules/debug/node_modules/ms/index.js");
 
-	if (typeof options.indent !== 'string') {
-		throw new TypeError(
-			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
-		);
-	}
+/**
+ * The currently active debug mode names, and names to skip.
+ */
 
-	if (count === 0) {
-		return string;
-	}
+exports.names = [];
+exports.skips = [];
 
-	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+/**
+ * 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".
+ */
 
-	return string.replace(regex, options.indent.repeat(count));
-};
+exports.formatters = {};
 
+/**
+ * Previous log timestamp.
+ */
 
-/***/ }),
-/* 338 */
-/***/ (function(module, exports, __webpack_require__) {
+var prevTime;
 
-"use strict";
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
 
-const os = __webpack_require__(122);
+function selectColor(namespace) {
+  var hash = 0, i;
 
-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();
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
 
-module.exports = (stack, options) => {
-	options = Object.assign({pretty: false}, options);
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
 
-	return stack.replace(/\\/g, '/')
-		.split('\n')
-		.filter(line => {
-			const pathMatches = line.match(extractPathRegex);
-			if (pathMatches === null || !pathMatches[1]) {
-				return true;
-			}
-
-			const match = pathMatches[1];
-
-			// Electron
-			if (
-				match.includes('.app/Contents/Resources/electron.asar') ||
-				match.includes('.app/Contents/Resources/default_app.asar')
-			) {
-				return false;
-			}
-
-			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 line;
-		})
-		.join('\n');
-};
-
-
-/***/ }),
-/* 339 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var fs = __webpack_require__(132),
-    path = __webpack_require__(4);
-
-module.exports = ncp;
-ncp.ncp = ncp;
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
 
-function ncp (source, dest, options, callback) {
-  var cback = callback;
+function createDebug(namespace) {
 
-  if (!callback) {
-    cback = options;
-    options = {};
-  }
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
 
-  var basePath = process.cwd(),
-      currentPath = path.resolve(basePath, source),
-      targetPath = path.resolve(basePath, dest),
-      filter = options.filter,
-      rename = options.rename,
-      transform = options.transform,
-      clobber = options.clobber !== false,
-      modified = options.modified,
-      dereference = options.dereference,
-      errs = null,
-      started = 0,
-      finished = 0,
-      running = 0,
-      limit = options.limit || ncp.limit || 16;
+    var self = debug;
 
-  limit = (limit < 1) ? 1 : (limit > 512) ? 512 : limit;
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
 
-  startCopy(currentPath);
-  
-  function startCopy(source) {
-    started++;
-    if (filter) {
-      if (filter instanceof RegExp) {
-        if (!filter.test(source)) {
-          return cb(true);
-        }
-      }
-      else if (typeof filter === 'function') {
-        if (!filter(source)) {
-          return cb(true);
-        }
-      }
+    // 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];
     }
-    return getStats(source);
-  }
 
-  function getStats(source) {
-    var stat = dereference ? fs.stat : fs.lstat;
-    if (running >= limit) {
-      return setImmediate(function () {
-        getStats(source);
-      });
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
     }
-    running++;
-    stat(source, function (err, stats) {
-      var item = {};
-      if (err) {
-        return onError(err);
-      }
 
-      // We need to get the mode from the stats object and preserve it.
-      item.name = source;
-      item.mode = stats.mode;
-      item.mtime = stats.mtime; //modified time
-      item.atime = stats.atime; //access time
+    // 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);
 
-      if (stats.isDirectory()) {
-        return onDir(item);
-      }
-      else if (stats.isFile()) {
-        return onFile(item);
-      }
-      else if (stats.isSymbolicLink()) {
-        // Symlinks don't really need to know about the mode.
-        return onLink(source);
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
       }
+      return match;
     });
-  }
 
-  function onFile(file) {
-    var target = file.name.replace(currentPath, targetPath);
-    if(rename) {
-      target =  rename(target);
-    }
-    isWritable(target, function (writable) {
-      if (writable) {
-        return copyFile(file, target);
-      }
-      if(clobber) {
-        rmFile(target, function () {
-          copyFile(file, target);
-        });
-      }
-      if (modified) {
-        var stat = dereference ? fs.stat : fs.lstat;
-        stat(target, function(err, stats) {
-            //if souce modified time greater to target modified time copy file
-            if (file.mtime.getTime()>stats.mtime.getTime())
-                copyFile(file, target);
-            else return cb();
-        });
-      }
-      else {
-        return cb();
-      }
-    });
-  }
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
 
-  function copyFile(file, target) {
-    var readStream = fs.createReadStream(file.name),
-        writeStream = fs.createWriteStream(target, { mode: file.mode });
-    
-    readStream.on('error', onError);
-    writeStream.on('error', onError);
-    
-    if(transform) {
-      transform(readStream, writeStream, file);
-    } else {
-      writeStream.on('open', function() {
-        readStream.pipe(writeStream);
-      });
-    }
-    writeStream.once('finish', function() {
-        if (modified) {
-            //target file modified date sync.
-            fs.utimesSync(target, file.atime, file.mtime);
-            cb();
-        }
-        else cb();
-    });
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
   }
 
-  function rmFile(file, done) {
-    fs.unlink(file, function (err) {
-      if (err) {
-        return onError(err);
-      }
-      return done();
-    });
-  }
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
 
-  function onDir(dir) {
-    var target = dir.name.replace(currentPath, targetPath);
-    isWritable(target, function (writable) {
-      if (writable) {
-        return mkDir(dir, target);
-      }
-      copyDir(dir.name);
-    });
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
   }
 
-  function mkDir(dir, target) {
-    fs.mkdir(target, dir.mode, function (err) {
-      if (err) {
-        return onError(err);
-      }
-      copyDir(dir.name);
-    });
-  }
+  return debug;
+}
 
-  function copyDir(dir) {
-    fs.readdir(dir, function (err, items) {
-      if (err) {
-        return onError(err);
-      }
-      items.forEach(function (item) {
-        startCopy(path.join(dir, item));
-      });
-      return cb();
-    });
-  }
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
 
-  function onLink(link) {
-    var target = link.replace(currentPath, targetPath);
-    fs.readlink(link, function (err, resolvedPath) {
-      if (err) {
-        return onError(err);
-      }
-      checkLink(resolvedPath, target);
-    });
-  }
+function enable(namespaces) {
+  exports.save(namespaces);
 
-  function checkLink(resolvedPath, target) {
-    if (dereference) {
-      resolvedPath = path.resolve(basePath, resolvedPath);
+  exports.names = [];
+  exports.skips = [];
+
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (var 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 + '$'));
     }
-    isWritable(target, function (writable) {
-      if (writable) {
-        return makeLink(resolvedPath, target);
-      }
-      fs.readlink(target, function (err, targetDest) {
-        if (err) {
-          return onError(err);
-        }
-        if (dereference) {
-          targetDest = path.resolve(basePath, targetDest);
-        }
-        if (targetDest === resolvedPath) {
-          return cb();
-        }
-        return rmFile(target, function () {
-          makeLink(resolvedPath, target);
-        });
-      });
-    });
   }
+}
 
-  function makeLink(linkPath, target) {
-    fs.symlink(linkPath, target, function (err) {
-      if (err) {
-        return onError(err);
-      }
-      return cb();
-    });
-  }
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
 
-  function isWritable(path, done) {
-    fs.lstat(path, function (err) {
-      if (err) {
-        if (err.code === 'ENOENT') return done(true);
-        return done(false);
-      }
-      return done(false);
-    });
-  }
+function disable() {
+  exports.enable('');
+}
 
-  function onError(err) {
-    if (options.stopOnError) {
-      return cback(err);
-    }
-    else if (!errs && options.errs) {
-      errs = fs.createWriteStream(options.errs);
-    }
-    else if (!errs) {
-      errs = [];
-    }
-    if (typeof errs.write === 'undefined') {
-      errs.push(err);
-    }
-    else { 
-      errs.write(err.stack + '\n\n');
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
     }
-    return cb();
   }
-
-  function cb(skipped) {
-    if (!skipped) running--;
-    finished++;
-    if ((started === finished) && (running === 0)) {
-      if (cback !== undefined ) {
-        return errs ? cback(errs) : cback(null);
-      }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
     }
   }
+  return false;
 }
 
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
 
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
 
 
 /***/ }),
-/* 340 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return getProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getNonBazelProjectsOnly", function() { return getNonBazelProjectsOnly; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelProjectsOnly", function() { return getBazelProjectsOnly; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProjectGraph", function() { return buildProjectGraph; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "topologicallyBatchProjects", function() { return topologicallyBatchProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "includeTransitiveProjects", function() { return includeTransitiveProjects; });
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(244);
-/* 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__(113);
-/* 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__(341);
-/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(342);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/***/ "../../node_modules/debug/src/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
  */
 
+if (typeof process !== 'undefined' && process.type === 'renderer') {
+  module.exports = __webpack_require__("../../node_modules/debug/src/browser.js");
+} else {
+  module.exports = __webpack_require__("../../node_modules/debug/src/node.js");
+}
 
 
+/***/ }),
 
+/***/ "../../node_modules/debug/src/node.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
-/** a Map of project names to Project instances */
+/**
+ * Module dependencies.
+ */
 
-async function getProjects(rootPath, projectsPathsPatterns, {
-  include = [],
-  exclude = []
-} = {}, bazelOnly = false) {
-  const projects = new Map();
+var tty = __webpack_require__("tty");
+var util = __webpack_require__("util");
 
-  for (const pattern of projectsPathsPatterns) {
-    const pathsToProcess = await packagesFromGlobPattern({
-      pattern,
-      rootPath
-    });
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-    for (const filePath of pathsToProcess) {
-      const projectConfigPath = normalize(filePath);
-      const projectDir = path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(projectConfigPath);
-      const project = await _project__WEBPACK_IMPORTED_MODULE_4__["Project"].fromPath(projectDir);
-      const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name) || bazelOnly && !project.isBazelPackage();
+exports = module.exports = __webpack_require__("../../node_modules/debug/src/debug.js");
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
 
-      if (excludeProject) {
-        continue;
-      }
+/**
+ * Colors.
+ */
 
-      if (projects.has(project.name)) {
-        throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`There are multiple projects with the same name [${project.name}]`, {
-          name: project.name,
-          paths: [project.path, projects.get(project.name).path]
-        });
-      }
+exports.colors = [6, 2, 3, 4, 5, 1];
 
-      projects.set(project.name, project);
-    }
-  }
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
 
-  return projects;
-}
-async function getNonBazelProjectsOnly(projects) {
-  const bazelProjectsOnly = new Map();
+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() });
 
-  for (const project of projects.values()) {
-    if (!project.isBazelPackage()) {
-      bazelProjectsOnly.set(project.name, project);
-    }
-  }
+  // 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);
 
-  return bazelProjectsOnly;
+  obj[prop] = val;
+  return obj;
+}, {});
+
+/**
+ * The file descriptor to write the `debug()` calls to.
+ * Set the `DEBUG_FD` env variable to override with another value. i.e.:
+ *
+ *   $ DEBUG_FD=3 node script.js 3>debug.log
+ */
+
+var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
+
+if (1 !== fd && 2 !== fd) {
+  util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')()
 }
-async function getBazelProjectsOnly(projects) {
-  const bazelProjectsOnly = new Map();
 
-  for (const project of projects.values()) {
-    if (project.isBazelPackage()) {
-      bazelProjectsOnly.set(project.name, project);
-    }
-  }
+var stream = 1 === fd ? process.stdout :
+             2 === fd ? process.stderr :
+             createWritableStdioStream(fd);
 
-  return bazelProjectsOnly;
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
+
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(fd);
 }
 
-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);
-} // https://github.com/isaacs/node-glob/blob/master/common.js#L104
-// glob always returns "\\" as "/" in windows, so everyone
-// gets normalized because we can't have nice things.
+/**
+ * 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(' ');
+};
+
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
 
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
 
-function normalize(dir) {
-  return path__WEBPACK_IMPORTED_MODULE_1___default.a.normalize(dir);
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
+
+  if (useColors) {
+    var c = this.color;
+    var prefix = '  \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m';
+
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = new Date().toUTCString()
+      + ' ' + name + ' ' + args[0];
+  }
 }
 
-function buildProjectGraph(projects) {
-  const projectGraph = new Map();
+/**
+ * Invokes `util.format()` with the specified arguments and writes to `stream`.
+ */
 
-  for (const project of projects.values()) {
-    const projectDeps = [];
-    const dependencies = project.allDependencies;
+function log() {
+  return stream.write(util.format.apply(util, arguments) + '\n');
+}
 
-    for (const depName of Object.keys(dependencies)) {
-      if (projects.has(depName)) {
-        const dep = projects.get(depName);
-        project.ensureValidProjectDependency(dep);
-        projectDeps.push(dep);
-      }
-    }
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-    projectGraph.set(project.name, projectDeps);
+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;
   }
+}
 
-  return projectGraph;
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  return process.env.DEBUG;
 }
-function topologicallyBatchProjects(projectsToBatch, projectGraph) {
-  // We're going to be chopping stuff out of this list, so copy it.
-  const projectsLeftToBatch = new Set(projectsToBatch.keys());
-  const batches = [];
 
-  while (projectsLeftToBatch.size > 0) {
-    // Get all projects that have no remaining dependencies within the repo
-    // that haven't yet been picked.
-    const batch = [];
+/**
+ * Copied from `node/src/node.js`.
+ *
+ * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
+ * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
+ */
 
-    for (const projectName of projectsLeftToBatch) {
-      const projectDeps = projectGraph.get(projectName);
-      const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name));
+function createWritableStdioStream (fd) {
+  var stream;
+  var tty_wrap = process.binding('tty_wrap');
 
-      if (!needsDependenciesBatched) {
-        batch.push(projectsToBatch.get(projectName));
+  // Note stream._type is used for test-module-load-list.js
+
+  switch (tty_wrap.guessHandleType(fd)) {
+    case 'TTY':
+      stream = new tty.WriteStream(fd);
+      stream._type = 'tty';
+
+      // Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
       }
-    } // If we weren't able to find a project with no remaining dependencies,
-    // then we've encountered a cycle in the dependency graph.
+      break;
 
+    case 'FILE':
+      var fs = __webpack_require__("fs");
+      stream = new fs.SyncWriteStream(fd, { autoClose: false });
+      stream._type = 'fs';
+      break;
 
-    const hasCycles = batch.length === 0;
+    case 'PIPE':
+    case 'TCP':
+      var net = __webpack_require__("net");
+      stream = new net.Socket({
+        fd: fd,
+        readable: false,
+        writable: true
+      });
 
-    if (hasCycles) {
-      const cycleProjectNames = [...projectsLeftToBatch];
-      const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', ');
-      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](message);
-    }
+      // FIXME Should probably have an option in net.Socket to create a
+      // stream from an existing fd which is writable only. But for now
+      // we'll just add this hack and set the `readable` member to false.
+      // Test: ./node test/fixtures/echo.js < /etc/passwd
+      stream.readable = false;
+      stream.read = null;
+      stream._type = 'pipe';
 
-    batches.push(batch);
-    batch.forEach(project => projectsLeftToBatch.delete(project.name));
+      // FIXME Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
+
+    default:
+      // Probably an error on in uv_guess_handle()
+      throw new Error('Implement me. Unknown stream file type!');
   }
 
-  return batches;
+  // For supporting legacy API we put the FD here.
+  stream.fd = fd;
+
+  stream._isStdio = true;
+
+  return stream;
 }
-function includeTransitiveProjects(subsetOfProjects, allProjects, {
-  onlyProductionDependencies = false
-} = {}) {
-  const projectsWithDependents = new Map(); // the current list of packages we are expanding using breadth-first-search
 
-  const toProcess = [...subsetOfProjects];
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
 
-  while (toProcess.length > 0) {
-    const project = toProcess.shift();
-    const dependencies = onlyProductionDependencies ? project.productionDependencies : project.allDependencies;
-    Object.keys(dependencies).forEach(dep => {
-      if (allProjects.has(dep)) {
-        toProcess.push(allProjects.get(dep));
-      }
-    });
-    projectsWithDependents.set(project.name, project);
-  }
+function init (debug) {
+  debug.inspectOpts = {};
 
-  return projectsWithDependents;
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+  }
 }
 
-/***/ }),
-/* 341 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CliError", function() { return CliError; });
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
  */
-class CliError extends Error {
-  constructor(message, meta = {}) {
-    super(message);
-    this.meta = meta;
-  }
 
-}
+exports.enable(load());
+
 
 /***/ }),
-/* 342 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/decode-uri-component/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return Project; });
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(132);
-/* 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__);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(113);
-/* 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__(341);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(220);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(343);
-/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(408);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var token = '%[a-f0-9]{2}';
+var singleMatcher = new RegExp(token, 'gi');
+var multiMatcher = new RegExp('(' + token + ')+', 'gi');
 
-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; }
+function decodeComponents(components, split) {
+	try {
+		// Try to decode the entire string first
+		return decodeURIComponent(components.join(''));
+	} catch (err) {
+		// Do nothing
+	}
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+	if (components.length === 1) {
+		return components;
+	}
+
+	split = split || 1;
+
+	// Split the array in 2 parts
+	var left = components.slice(0, split);
+	var right = components.slice(split);
 
+	return Array.prototype.concat.call([], decodeComponents(left), decodeComponents(right));
+}
 
+function decode(input) {
+	try {
+		return decodeURIComponent(input);
+	} catch (err) {
+		var tokens = input.match(singleMatcher);
 
+		for (var i = 1; i < tokens.length; i++) {
+			input = decodeComponents(tokens, i).join('');
 
+			tokens = input.match(singleMatcher);
+		}
 
+		return input;
+	}
+}
 
+function customDecodeURIComponent(input) {
+	// Keep track of all the replacements and prefill the map with the `BOM`
+	var replaceMap = {
+		'%FE%FF': '\uFFFD\uFFFD',
+		'%FF%FE': '\uFFFD\uFFFD'
+	};
 
-class Project {
-  static async fromPath(path) {
-    const pkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["readPackageJson"])(path);
-    return new Project(pkgJson, path);
-  }
-  /** parsed package.json */
+	var match = multiMatcher.exec(input);
+	while (match) {
+		try {
+			// Decode as big chunks as possible
+			replaceMap[match[0]] = decodeURIComponent(match[0]);
+		} catch (err) {
+			var result = decode(match[0]);
 
+			if (result !== match[0]) {
+				replaceMap[match[0]] = result;
+			}
+		}
 
-  constructor(packageJson, projectPath) {
-    _defineProperty(this, "json", void 0);
+		match = multiMatcher.exec(input);
+	}
 
-    _defineProperty(this, "packageJsonLocation", void 0);
+	// Add `%C2` at the end of the map to make sure it does not replace the combinator before everything else
+	replaceMap['%C2'] = '\uFFFD';
 
-    _defineProperty(this, "nodeModulesLocation", void 0);
+	var entries = Object.keys(replaceMap);
 
-    _defineProperty(this, "targetLocation", void 0);
+	for (var i = 0; i < entries.length; i++) {
+		// Replace all decoded components
+		var key = entries[i];
+		input = input.replace(new RegExp(key, 'g'), replaceMap[key]);
+	}
 
-    _defineProperty(this, "path", void 0);
+	return input;
+}
 
-    _defineProperty(this, "version", void 0);
+module.exports = function (encodedURI) {
+	if (typeof encodedURI !== 'string') {
+		throw new TypeError('Expected `encodedURI` to be of type `string`, got `' + typeof encodedURI + '`');
+	}
 
-    _defineProperty(this, "allDependencies", void 0);
+	try {
+		encodedURI = encodedURI.replace(/\+/g, ' ');
 
-    _defineProperty(this, "productionDependencies", void 0);
+		// Try the built in decoder first
+		return decodeURIComponent(encodedURI);
+	} catch (err) {
+		// Fallback to a more advanced decoder
+		return customDecodeURIComponent(encodedURI);
+	}
+};
 
-    _defineProperty(this, "devDependencies", void 0);
 
-    _defineProperty(this, "scripts", void 0);
+/***/ }),
 
-    _defineProperty(this, "bazelPackage", void 0);
+/***/ "../../node_modules/dedent/dist/dedent.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    _defineProperty(this, "isSinglePackageJsonProject", false);
+"use strict";
 
-    this.json = Object.freeze(packageJson);
-    this.path = projectPath;
-    this.packageJsonLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'package.json');
-    this.nodeModulesLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'node_modules');
-    this.targetLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'target');
-    this.version = this.json.version;
-    this.productionDependencies = this.json.dependencies || {};
-    this.devDependencies = this.json.devDependencies || {};
-    this.allDependencies = _objectSpread(_objectSpread({}, this.devDependencies), this.productionDependencies);
-    this.isSinglePackageJsonProject = this.json.name === 'kibana';
-    this.scripts = this.json.scripts || {};
-    this.bazelPackage = !this.isSinglePackageJsonProject && fs__WEBPACK_IMPORTED_MODULE_0___default.a.existsSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'BUILD.bazel'));
-  }
 
-  get name() {
-    return this.json.name;
+function dedent(strings) {
+
+  var raw = void 0;
+  if (typeof strings === "string") {
+    // dedent can be used as a plain function
+    raw = [strings];
+  } else {
+    raw = strings.raw;
   }
 
-  ensureValidProjectDependency(project) {
-    const relativePathToProject = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, project.path));
-    const relativePathToProjectIfBazelPkg = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, `${__dirname}/../../../bazel-bin/packages/${path__WEBPACK_IMPORTED_MODULE_1___default.a.basename(project.path)}`));
-    const versionInPackageJson = this.allDependencies[project.name];
-    const expectedVersionInPackageJson = `link:${relativePathToProject}`;
-    const expectedVersionInPackageJsonIfBazelPkg = `link:${relativePathToProjectIfBazelPkg}`; // TODO: after introduce bazel to build all the packages and completely remove the support for kbn packages
-    //  do not allow child projects to hold dependencies, unless they are meant to be published externally
+  // first, perform interpolation
+  var result = "";
+  for (var i = 0; i < raw.length; i++) {
+    result += raw[i].
+    // join lines when there is a suppressed newline
+    replace(/\\\n[ \t]*/g, "").
 
-    if (versionInPackageJson === expectedVersionInPackageJson || versionInPackageJson === expectedVersionInPackageJsonIfBazelPkg) {
-      return;
-    }
+    // handle escaped backticks
+    replace(/\\`/g, "`");
 
-    const updateMsg = 'Update its package.json to the expected value below.';
-    const meta = {
-      actual: `"${project.name}": "${versionInPackageJson}"`,
-      expected: `"${project.name}": "${expectedVersionInPackageJson}" or "${project.name}": "${expectedVersionInPackageJsonIfBazelPkg}"`,
-      package: `${this.name} (${this.packageJsonLocation})`
-    };
+    if (i < (arguments.length <= 1 ? 0 : arguments.length - 1)) {
+      result += arguments.length <= i + 1 ? undefined : arguments[i + 1];
+    }
+  }
 
-    if (Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["isLinkDependency"])(versionInPackageJson)) {
-      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`[${this.name}] depends on [${project.name}] using 'link:', but the path is wrong. ${updateMsg}`, meta);
+  // now strip indentation
+  var lines = result.split("\n");
+  var mindent = null;
+  lines.forEach(function (l) {
+    var m = l.match(/^(\s+)\S+/);
+    if (m) {
+      var indent = m[1].length;
+      if (!mindent) {
+        // this is the first indented line
+        mindent = indent;
+      } else {
+        mindent = Math.min(mindent, indent);
+      }
     }
+  });
 
-    throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`[${this.name}] depends on [${project.name}] but it's not using the local package. ${updateMsg}`, meta);
+  if (mindent !== null) {
+    result = lines.map(function (l) {
+      return l[0] === " " ? l.slice(mindent) : l;
+    }).join("\n");
   }
 
-  getBuildConfig() {
-    return this.json.kibana && this.json.kibana.build || {};
-  }
-  /**
-   * Returns the directory that should be copied into the Kibana build artifact.
-   * This config can be specified to only include the project's build artifacts
-   * instead of everything located in the project directory.
-   */
+  // dedent eats leading and trailing whitespace too
+  result = result.trim();
 
+  // handle escaped newlines at the end to ensure they don't get stripped too
+  return result.replace(/\\n/g, "\n");
+}
 
-  getIntermediateBuildDirectory() {
-    return path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
-  }
+if (true) {
+  module.exports = dedent;
+}
 
-  getCleanConfig() {
-    return this.json.kibana && this.json.kibana.clean || {};
-  }
 
-  isBazelPackage() {
-    return this.bazelPackage;
-  }
+/***/ }),
 
-  isFlaggedAsDevOnly() {
-    return !!(this.json.kibana && this.json.kibana.devOnly);
-  }
+/***/ "../../node_modules/defaults/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  hasScript(name) {
-    return name in this.scripts;
-  }
+var clone = __webpack_require__("../../node_modules/clone/clone.js");
 
-  getExecutables() {
-    const raw = this.json.bin;
+module.exports = function(options, defaults) {
+  options = options || {};
 
-    if (!raw) {
-      return {};
+  Object.keys(defaults).forEach(function(key) {
+    if (typeof options[key] === 'undefined') {
+      options[key] = clone(defaults[key]);
     }
+  });
 
-    if (typeof raw === 'string') {
-      return {
-        [this.name]: path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw)
-      };
-    }
+  return options;
+};
 
-    if (typeof raw === 'object') {
-      const binsConfig = {};
+/***/ }),
 
-      for (const binName of Object.keys(raw)) {
-        binsConfig[binName] = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw[binName]);
-      }
+/***/ "../../node_modules/define-property/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      return binsConfig;
-    }
+"use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-    throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, {
-      binConfig: Object(util__WEBPACK_IMPORTED_MODULE_2__["inspect"])(raw),
-      package: `${this.name} (${this.packageJsonLocation})`
-    });
-  }
 
-  async runScript(scriptName, args = []) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`Running script [${scriptName}] in [${this.name}]:`);
-    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__["runScriptInPackage"])(scriptName, args, this);
-  }
 
-  runScriptStreaming(scriptName, options = {}) {
-    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__["runScriptInPackageStreaming"])({
-      script: scriptName,
-      args: options.args || [],
-      pkg: this,
-      debug: options.debug
-    });
-  }
+var isDescriptor = __webpack_require__("../../node_modules/define-property/node_modules/is-descriptor/index.js");
 
-  hasDependencies() {
-    return Object.keys(this.allDependencies).length > 0;
+module.exports = function defineProperty(obj, prop, val) {
+  if (typeof obj !== 'object' && typeof obj !== 'function') {
+    throw new TypeError('expected an object or function.');
   }
 
-  isEveryDependencyLocal() {
-    return Object.values(this.allDependencies).every(dep => Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["isLinkDependency"])(dep));
+  if (typeof prop !== 'string') {
+    throw new TypeError('expected `prop` to be a string.');
   }
 
-  async installDependencies(options = {}) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[${this.name}] running yarn`);
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].write('');
-    await Object(_scripts__WEBPACK_IMPORTED_MODULE_6__["installInDir"])(this.path, options === null || options === void 0 ? void 0 : options.extraArgs);
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].write('');
+  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
+    return Object.defineProperty(obj, prop, val);
   }
 
-} // We normalize all path separators to `/` in generated files
+  return Object.defineProperty(obj, prop, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
+};
 
-function normalizePath(path) {
-  return path.replace(/[\\\/]+/g, '/');
-}
 
 /***/ }),
-/* 343 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readPackageJson", function() { return readPackageJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writePackageJson", function() { return writePackageJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createProductionPackageJson", function() { return createProductionPackageJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isLinkDependency", function() { return isLinkDependency; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isBazelPackageDependency", function() { return isBazelPackageDependency; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "transformDependencies", function() { return transformDependencies; });
-/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(344);
-/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(read_pkg__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(397);
-/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+/***/ "../../node_modules/define-property/node_modules/is-accessor-descriptor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+"use strict";
+/*!
+ * is-accessor-descriptor <https://github.com/jonschlinkert/is-accessor-descriptor>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-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; }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
+var typeOf = __webpack_require__("../../node_modules/define-property/node_modules/is-accessor-descriptor/node_modules/kind-of/index.js");
 
-function readPackageJson(cwd) {
-  return read_pkg__WEBPACK_IMPORTED_MODULE_0___default()({
-    cwd,
-    normalize: false
-  });
-}
-function writePackageJson(path, json) {
-  return write_pkg__WEBPACK_IMPORTED_MODULE_1___default()(path, json);
-}
-const createProductionPackageJson = pkgJson => _objectSpread(_objectSpread({}, pkgJson), {}, {
-  dependencies: transformDependencies(pkgJson.dependencies)
-});
-const isLinkDependency = depVersion => depVersion.startsWith('link:');
-const isBazelPackageDependency = depVersion => depVersion.startsWith('link:bazel-bin/');
-/**
- * Replaces `link:` dependencies with `file:` dependencies. When installing
- * dependencies, these `file:` dependencies will be copied into `node_modules`
- * instead of being symlinked.
- *
- * This will allow us to copy packages into the build and run `yarn`, which
- * will then _copy_ the `file:` dependencies into `node_modules` instead of
- * symlinking like we do in development.
- *
- * Additionally it also taken care of replacing `link:bazel-bin/` with
- * `file:` so we can also support the copy of the Bazel packages dist already into
- * build/packages to be copied into the node_modules
- */
+// accessor descriptor properties
+var accessor = {
+  get: 'function',
+  set: 'function',
+  configurable: 'boolean',
+  enumerable: 'boolean'
+};
 
-function transformDependencies(dependencies = {}) {
-  const newDeps = {};
+function isAccessorDescriptor(obj, prop) {
+  if (typeof prop === 'string') {
+    var val = Object.getOwnPropertyDescriptor(obj, prop);
+    return typeof val !== 'undefined';
+  }
 
-  for (const name of Object.keys(dependencies)) {
-    const depVersion = dependencies[name];
+  if (typeOf(obj) !== 'object') {
+    return false;
+  }
 
-    if (!isLinkDependency(depVersion)) {
-      newDeps[name] = depVersion;
+  if (has(obj, 'value') || has(obj, 'writable')) {
+    return false;
+  }
+
+  if (!has(obj, 'get') || typeof obj.get !== 'function') {
+    return false;
+  }
+
+  // tldr: it's valid to have "set" be undefined
+  // "set" might be undefined if `Object.getOwnPropertyDescriptor`
+  // was used to get the value, and only `get` was defined by the user
+  if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') {
+    return false;
+  }
+
+  for (var key in obj) {
+    if (!accessor.hasOwnProperty(key)) {
       continue;
     }
 
-    if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
+    if (typeOf(obj[key]) === accessor[key]) {
       continue;
     }
 
-    newDeps[name] = depVersion.replace('link:', 'file:');
+    if (typeof obj[key] !== 'undefined') {
+      return false;
+    }
   }
+  return true;
+}
 
-  return newDeps;
+function has(obj, key) {
+  return {}.hasOwnProperty.call(obj, key);
 }
 
+/**
+ * Expose `isAccessorDescriptor`
+ */
+
+module.exports = isAccessorDescriptor;
+
+
 /***/ }),
-/* 344 */
+
+/***/ "../../node_modules/define-property/node_modules/is-accessor-descriptor/node_modules/kind-of/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
 
-const {promisify} = __webpack_require__(113);
-const fs = __webpack_require__(132);
-const path = __webpack_require__(4);
-const parseJson = __webpack_require__(345);
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
 
-const readFileAsync = promisify(fs.readFile);
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
+  }
 
-module.exports = async options => {
-	options = {
-		cwd: process.cwd(),
-		normalize: true,
-		...options
-	};
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
 
-	const filePath = path.resolve(options.cwd, 'package.json');
-	const json = parseJson(await readFileAsync(filePath, 'utf8'));
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
-	if (options.normalize) {
-		__webpack_require__(366)(json);
-	}
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-	return json;
-};
+  // other objects
+  var type = toString.call(val);
 
-module.exports.sync = options => {
-	options = {
-		cwd: process.cwd(),
-		normalize: true,
-		...options
-	};
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
 
-	const filePath = path.resolve(options.cwd, 'package.json');
-	const json = parseJson(fs.readFileSync(filePath, 'utf8'));
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-	if (options.normalize) {
-		__webpack_require__(366)(json);
-	}
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
 
-	return json;
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
+
+  // must be a plain object
+  return 'object';
 };
 
 
 /***/ }),
-/* 345 */
+
+/***/ "../../node_modules/define-property/node_modules/is-data-descriptor/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/*!
+ * is-data-descriptor <https://github.com/jonschlinkert/is-data-descriptor>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-const errorEx = __webpack_require__(346);
-const fallback = __webpack_require__(348);
-const {default: LinesAndColumns} = __webpack_require__(349);
-const {codeFrameColumns} = __webpack_require__(350);
 
-const JSONError = errorEx('JSONError', {
-	fileName: errorEx.append('in %s'),
-	codeFrame: errorEx.append('\n\n%s\n')
-});
 
-module.exports = (string, reviver, filename) => {
-	if (typeof reviver === 'string') {
-		filename = reviver;
-		reviver = null;
-	}
+var typeOf = __webpack_require__("../../node_modules/define-property/node_modules/is-data-descriptor/node_modules/kind-of/index.js");
 
-	try {
-		try {
-			return JSON.parse(string, reviver);
-		} catch (error) {
-			fallback(string, reviver);
-			throw error;
-		}
-	} catch (error) {
-		error.message = error.message.replace(/\n/g, '');
-		const indexMatch = error.message.match(/in JSON at position (\d+) while parsing near/);
+// data descriptor properties
+var data = {
+  configurable: 'boolean',
+  enumerable: 'boolean',
+  writable: 'boolean'
+};
 
-		const jsonError = new JSONError(error);
-		if (filename) {
-			jsonError.fileName = filename;
-		}
+function isDataDescriptor(obj, prop) {
+  if (typeOf(obj) !== 'object') {
+    return false;
+  }
 
-		if (indexMatch && indexMatch.length > 0) {
-			const lines = new LinesAndColumns(string);
-			const index = Number(indexMatch[1]);
-			const location = lines.locationForIndex(index);
+  if (typeof prop === 'string') {
+    var val = Object.getOwnPropertyDescriptor(obj, prop);
+    return typeof val !== 'undefined';
+  }
 
-			const codeFrame = codeFrameColumns(
-				string,
-				{start: {line: location.line + 1, column: location.column + 1}},
-				{highlightCode: true}
-			);
+  if (!('value' in obj) && !('writable' in obj)) {
+    return false;
+  }
 
-			jsonError.codeFrame = codeFrame;
-		}
+  for (var key in obj) {
+    if (key === 'value') continue;
 
-		throw jsonError;
-	}
-};
+    if (!data.hasOwnProperty(key)) {
+      continue;
+    }
 
+    if (typeOf(obj[key]) === data[key]) {
+      continue;
+    }
 
-/***/ }),
-/* 346 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (typeof obj[key] !== 'undefined') {
+      return false;
+    }
+  }
+  return true;
+}
 
-"use strict";
+/**
+ * Expose `isDataDescriptor`
+ */
 
+module.exports = isDataDescriptor;
 
-var util = __webpack_require__(113);
-var isArrayish = __webpack_require__(347);
 
-var errorEx = function errorEx(name, properties) {
-	if (!name || name.constructor !== String) {
-		properties = name || {};
-		name = Error.name;
-	}
+/***/ }),
 
-	var errorExError = function ErrorEXError(message) {
-		if (!this) {
-			return new ErrorEXError(message);
-		}
+/***/ "../../node_modules/define-property/node_modules/is-data-descriptor/node_modules/kind-of/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		message = message instanceof Error
-			? message.message
-			: (message || this.message);
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
 
-		Error.call(this, message);
-		Error.captureStackTrace(this, errorExError);
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
 
-		this.name = name;
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
+  }
 
-		Object.defineProperty(this, 'message', {
-			configurable: true,
-			enumerable: false,
-			get: function () {
-				var newMessage = message.split(/\r?\n/g);
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
 
-				for (var key in properties) {
-					if (!properties.hasOwnProperty(key)) {
-						continue;
-					}
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
-					var modifier = properties[key];
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-					if ('message' in modifier) {
-						newMessage = modifier.message(this[key], newMessage) || newMessage;
-						if (!isArrayish(newMessage)) {
-							newMessage = [newMessage];
-						}
-					}
-				}
+  // other objects
+  var type = toString.call(val);
 
-				return newMessage.join('\n');
-			},
-			set: function (v) {
-				message = v;
-			}
-		});
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
 
-		var stackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
-		var stackGetter = stackDescriptor.get;
-		var stackValue = stackDescriptor.value;
-		delete stackDescriptor.value;
-		delete stackDescriptor.writable;
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-		stackDescriptor.get = function () {
-			var stack = (stackGetter)
-				? stackGetter.call(this).split(/\r?\n+/g)
-				: stackValue.split(/\r?\n+/g);
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
 
-			// starting in Node 7, the stack builder caches the message.
-			// just replace it.
-			stack[0] = this.name + ': ' + this.message;
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
 
-			var lineCount = 1;
-			for (var key in properties) {
-				if (!properties.hasOwnProperty(key)) {
-					continue;
-				}
+  // must be a plain object
+  return 'object';
+};
 
-				var modifier = properties[key];
 
-				if ('line' in modifier) {
-					var line = modifier.line(this[key]);
-					if (line) {
-						stack.splice(lineCount++, 0, '    ' + line);
-					}
-				}
+/***/ }),
 
-				if ('stack' in modifier) {
-					modifier.stack(this[key], stack);
-				}
-			}
+/***/ "../../node_modules/define-property/node_modules/is-descriptor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-			return stack.join('\n');
-		};
+"use strict";
+/*!
+ * is-descriptor <https://github.com/jonschlinkert/is-descriptor>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-		Object.defineProperty(this, 'stack', stackDescriptor);
-	};
 
-	if (Object.setPrototypeOf) {
-		Object.setPrototypeOf(errorExError.prototype, Error.prototype);
-		Object.setPrototypeOf(errorExError, Error);
-	} else {
-		util.inherits(errorExError, Error);
-	}
 
-	return errorExError;
+var typeOf = __webpack_require__("../../node_modules/define-property/node_modules/kind-of/index.js");
+var isAccessor = __webpack_require__("../../node_modules/define-property/node_modules/is-accessor-descriptor/index.js");
+var isData = __webpack_require__("../../node_modules/define-property/node_modules/is-data-descriptor/index.js");
+
+module.exports = function isDescriptor(obj, key) {
+  if (typeOf(obj) !== 'object') {
+    return false;
+  }
+  if ('get' in obj) {
+    return isAccessor(obj, key);
+  }
+  return isData(obj, key);
 };
 
-errorEx.append = function (str, def) {
-	return {
-		message: function (v, message) {
-			v = v || def;
-
-			if (v) {
-				message[0] += ' ' + str.replace('%s', v.toString());
-			}
 
-			return message;
-		}
-	};
-};
+/***/ }),
 
-errorEx.line = function (str, def) {
-	return {
-		line: function (v) {
-			v = v || def;
+/***/ "../../node_modules/define-property/node_modules/kind-of/index.js":
+/***/ (function(module, exports) {
 
-			if (v) {
-				return str.replace('%s', v.toString());
-			}
+var toString = Object.prototype.toString;
 
-			return null;
-		}
-	};
-};
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
 
-module.exports = errorEx;
+module.exports = function kindOf(val) {
+  var type = typeof val;
 
+  // primitivies
+  if (type === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (type === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (type === 'number' || val instanceof Number) {
+    return 'number';
+  }
 
-/***/ }),
-/* 347 */
-/***/ (function(module, exports, __webpack_require__) {
+  // functions
+  if (type === 'function' || val instanceof Function) {
+    if (typeof val.constructor.name !== 'undefined' && val.constructor.name.slice(0, 9) === 'Generator') {
+      return 'generatorfunction';
+    }
+    return 'function';
+  }
 
-"use strict";
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-module.exports = function isArrayish(obj) {
-	if (!obj) {
-		return false;
-	}
+  // other objects
+  type = toString.call(val);
 
-	return obj instanceof Array || Array.isArray(obj) ||
-		(obj.length >= 0 && obj.splice instanceof Function);
-};
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
+  if (type === '[object Promise]') {
+    return 'promise';
+  }
 
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-/***/ }),
-/* 348 */
-/***/ (function(module, exports, __webpack_require__) {
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
+  
+  if (type === '[object Map Iterator]') {
+    return 'mapiterator';
+  }
+  if (type === '[object Set Iterator]') {
+    return 'setiterator';
+  }
+  if (type === '[object String Iterator]') {
+    return 'stringiterator';
+  }
+  if (type === '[object Array Iterator]') {
+    return 'arrayiterator';
+  }
+  
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
 
-"use strict";
+  // must be a plain object
+  return 'object';
+};
 
+/**
+ * If you need to support Safari 5-7 (8-10 yr-old browser),
+ * take a look at https://github.com/feross/is-buffer
+ */
 
-module.exports = parseJson
-function parseJson (txt, reviver, context) {
-  context = context || 20
-  try {
-    return JSON.parse(txt, reviver)
-  } catch (e) {
-    if (typeof txt !== 'string') {
-      const isEmptyArray = Array.isArray(txt) && txt.length === 0
-      const errorMessage = 'Cannot parse ' +
-      (isEmptyArray ? 'an empty array' : String(txt))
-      throw new TypeError(errorMessage)
-    }
-    const syntaxErr = e.message.match(/^Unexpected token.*position\s+(\d+)/i)
-    const errIdx = syntaxErr
-    ? +syntaxErr[1]
-    : e.message.match(/^Unexpected end of JSON.*/i)
-    ? txt.length - 1
-    : null
-    if (errIdx != null) {
-      const start = errIdx <= context
-      ? 0
-      : errIdx - context
-      const end = errIdx + context >= txt.length
-      ? txt.length
-      : errIdx + context
-      e.message += ` while parsing near '${
-        start === 0 ? '' : '...'
-      }${txt.slice(start, end)}${
-        end === txt.length ? '' : '...'
-      }'`
-    } else {
-      e.message += ` while parsing '${txt.slice(0, context * 2)}'`
-    }
-    throw e
-  }
+function isBuffer(val) {
+  return val.constructor
+    && typeof val.constructor.isBuffer === 'function'
+    && val.constructor.isBuffer(val);
 }
 
 
 /***/ }),
-/* 349 */
-/***/ (function(__webpack_module__, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/del/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-var LF = '\n';
-var CR = '\r';
-var LinesAndColumns = (function () {
-    function LinesAndColumns(string) {
-        this.string = string;
-        var offsets = [0];
-        for (var offset = 0; offset < string.length;) {
-            switch (string[offset]) {
-                case LF:
-                    offset += LF.length;
-                    offsets.push(offset);
-                    break;
-                case CR:
-                    offset += CR.length;
-                    if (string[offset] === LF) {
-                        offset += LF.length;
-                    }
-                    offsets.push(offset);
-                    break;
-                default:
-                    offset++;
-                    break;
-            }
-        }
-        this.offsets = offsets;
-    }
-    LinesAndColumns.prototype.locationForIndex = function (index) {
-        if (index < 0 || index > this.string.length) {
-            return null;
-        }
-        var line = 0;
-        var offsets = this.offsets;
-        while (offsets[line + 1] <= index) {
-            line++;
-        }
-        var column = index - offsets[line];
-        return { line: line, column: column };
-    };
-    LinesAndColumns.prototype.indexForLocation = function (location) {
-        var line = location.line, column = location.column;
-        if (line < 0 || line >= this.offsets.length) {
-            return null;
-        }
-        if (column < 0 || column > this.lengthOfLine(line)) {
-            return null;
-        }
-        return this.offsets[line] + column;
-    };
-    LinesAndColumns.prototype.lengthOfLine = function (line) {
-        var offset = this.offsets[line];
-        var nextOffset = line === this.offsets.length - 1 ? this.string.length : this.offsets[line + 1];
-        return nextOffset - offset;
-    };
-    return LinesAndColumns;
-}());
-/* harmony default export */ __webpack_exports__["default"] = (LinesAndColumns);
 
+const {promisify} = __webpack_require__("util");
+const path = __webpack_require__("path");
+const globby = __webpack_require__("../../node_modules/del/node_modules/globby/index.js");
+const isGlob = __webpack_require__("../../node_modules/is-glob/index.js");
+const slash = __webpack_require__("../../node_modules/slash/index.js");
+const gracefulFs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const isPathCwd = __webpack_require__("../../node_modules/is-path-cwd/index.js");
+const isPathInside = __webpack_require__("../../node_modules/is-path-inside/index.js");
+const rimraf = __webpack_require__("../../node_modules/rimraf/rimraf.js");
+const pMap = __webpack_require__("../../node_modules/del/node_modules/p-map/index.js");
 
-/***/ }),
-/* 350 */
-/***/ (function(module, exports, __webpack_require__) {
+const rimrafP = promisify(rimraf);
 
-"use strict";
+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
+};
+
+function safeCheck(file, cwd) {
+	if (isPathCwd(file)) {
+		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
+	}
 
+	if (!isPathInside(file, cwd)) {
+		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
+	}
+}
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.codeFrameColumns = codeFrameColumns;
-exports.default = _default;
+function normalizePatterns(patterns) {
+	patterns = Array.isArray(patterns) ? patterns : [patterns];
 
-var _highlight = __webpack_require__(351);
+	patterns = patterns.map(pattern => {
+		if (process.platform === 'win32' && isGlob(pattern) === false) {
+			return slash(pattern);
+		}
 
-let deprecationWarningShown = false;
+		return pattern;
+	});
 
-function getDefs(chalk) {
-  return {
-    gutter: chalk.grey,
-    marker: chalk.red.bold,
-    message: chalk.red.bold
-  };
+	return patterns;
 }
 
-const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-function getMarkerLines(loc, source, opts) {
-  const startLoc = Object.assign({
-    column: 0,
-    line: -1
-  }, loc.start);
-  const endLoc = Object.assign({}, startLoc, loc.end);
-  const {
-    linesAbove = 2,
-    linesBelow = 3
-  } = opts || {};
-  const startLine = startLoc.line;
-  const startColumn = startLoc.column;
-  const endLine = endLoc.line;
-  const endColumn = endLoc.column;
-  let start = Math.max(startLine - (linesAbove + 1), 0);
-  let end = Math.min(source.length, endLine + linesBelow);
+	patterns = normalizePatterns(patterns);
 
-  if (startLine === -1) {
-    start = 0;
-  }
+	const files = (await globby(patterns, options))
+		.sort((a, b) => b.localeCompare(a));
 
-  if (endLine === -1) {
-    end = source.length;
-  }
+	const mapper = async file => {
+		file = path.resolve(cwd, file);
 
-  const lineDiff = endLine - startLine;
-  const markerLines = {};
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-  if (lineDiff) {
-    for (let i = 0; i <= lineDiff; i++) {
-      const lineNumber = i + startLine;
+		if (!dryRun) {
+			await rimrafP(file, rimrafOptions);
+		}
 
-      if (!startColumn) {
-        markerLines[lineNumber] = true;
-      } else if (i === 0) {
-        const sourceLength = source[lineNumber - 1].length;
-        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
-      } else if (i === lineDiff) {
-        markerLines[lineNumber] = [0, endColumn];
-      } else {
-        const sourceLength = source[lineNumber - i].length;
-        markerLines[lineNumber] = [0, sourceLength];
-      }
-    }
-  } else {
-    if (startColumn === endColumn) {
-      if (startColumn) {
-        markerLines[startLine] = [startColumn, 0];
-      } else {
-        markerLines[startLine] = true;
-      }
-    } else {
-      markerLines[startLine] = [startColumn, endColumn - startColumn];
-    }
-  }
+		return file;
+	};
 
-  return {
-    start,
-    end,
-    markerLines
-  };
-}
+	const removedFiles = await pMap(files, mapper, options);
 
-function codeFrameColumns(rawLines, loc, opts = {}) {
-  const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight.shouldHighlight)(opts);
-  const chalk = (0, _highlight.getChalk)(opts);
-  const defs = getDefs(chalk);
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-  const maybeHighlight = (chalkFn, string) => {
-    return highlighted ? chalkFn(string) : string;
-  };
+	return removedFiles;
+};
 
-  const lines = rawLines.split(NEWLINE);
-  const {
-    start,
-    end,
-    markerLines
-  } = getMarkerLines(loc, lines, opts);
-  const hasColumns = loc.start && typeof loc.start.column === "number";
-  const numberMaxWidth = String(end).length;
-  const highlightedLines = highlighted ? (0, _highlight.default)(rawLines, opts) : rawLines;
-  let frame = highlightedLines.split(NEWLINE, end).slice(start, end).map((line, index) => {
-    const number = start + 1 + index;
-    const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
-    const gutter = ` ${paddedNumber} |`;
-    const hasMarker = markerLines[number];
-    const lastMarkerLine = !markerLines[number + 1];
+module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-    if (hasMarker) {
-      let markerLine = "";
+	patterns = normalizePatterns(patterns);
 
-      if (Array.isArray(hasMarker)) {
-        const markerSpacing = line.slice(0, Math.max(hasMarker[0] - 1, 0)).replace(/[^\t]/g, " ");
-        const numberOfMarkers = hasMarker[1] || 1;
-        markerLine = ["\n ", maybeHighlight(defs.gutter, gutter.replace(/\d/g, " ")), " ", markerSpacing, maybeHighlight(defs.marker, "^").repeat(numberOfMarkers)].join("");
+	const files = globby.sync(patterns, options)
+		.sort((a, b) => b.localeCompare(a));
 
-        if (lastMarkerLine && opts.message) {
-          markerLine += " " + maybeHighlight(defs.message, opts.message);
-        }
-      }
+	const removedFiles = files.map(file => {
+		file = path.resolve(cwd, file);
 
-      return [maybeHighlight(defs.marker, ">"), maybeHighlight(defs.gutter, gutter), line.length > 0 ? ` ${line}` : "", markerLine].join("");
-    } else {
-      return ` ${maybeHighlight(defs.gutter, gutter)}${line.length > 0 ? ` ${line}` : ""}`;
-    }
-  }).join("\n");
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-  if (opts.message && !hasColumns) {
-    frame = `${" ".repeat(numberMaxWidth + 1)}${opts.message}\n${frame}`;
-  }
+		if (!dryRun) {
+			rimraf.sync(file, rimrafOptions);
+		}
 
-  if (highlighted) {
-    return chalk.reset(frame);
-  } else {
-    return frame;
-  }
-}
+		return file;
+	});
 
-function _default(rawLines, lineNumber, colNumber, opts = {}) {
-  if (!deprecationWarningShown) {
-    deprecationWarningShown = true;
-    const message = "Passing lineNumber and colNumber is deprecated to @babel/code-frame. Please use `codeFrameColumns`.";
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-    if (process.emitWarning) {
-      process.emitWarning(message, "DeprecationWarning");
-    } else {
-      const deprecationError = new Error(message);
-      deprecationError.name = "DeprecationWarning";
-      console.warn(new Error(message));
-    }
-  }
+	return removedFiles;
+};
 
-  colNumber = Math.max(colNumber, 0);
-  const location = {
-    start: {
-      column: colNumber,
-      line: lineNumber
-    }
-  };
-  return codeFrameColumns(rawLines, location, opts);
-}
 
 /***/ }),
-/* 351 */
+
+/***/ "../../node_modules/del/node_modules/aggregate-error/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const indentString = __webpack_require__("../../node_modules/del/node_modules/indent-string/index.js");
+const cleanStack = __webpack_require__("../../node_modules/clean-stack/index.js");
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = highlight;
-exports.getChalk = getChalk;
-exports.shouldHighlight = shouldHighlight;
-
-var _jsTokens = __webpack_require__(352);
+const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
-var _helperValidatorIdentifier = __webpack_require__(353);
+class AggregateError extends Error {
+	constructor(errors) {
+		if (!Array.isArray(errors)) {
+			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
+		}
 
-var _chalk = __webpack_require__(356);
+		errors = [...errors].map(error => {
+			if (error instanceof Error) {
+				return error;
+			}
 
-const sometimesKeywords = new Set(["as", "async", "from", "get", "of", "set"]);
+			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);
+			}
 
-function getDefs(chalk) {
-  return {
-    keyword: chalk.cyan,
-    capitalized: chalk.yellow,
-    jsxIdentifier: chalk.yellow,
-    punctuator: chalk.yellow,
-    number: chalk.magenta,
-    string: chalk.green,
-    regex: chalk.magenta,
-    comment: chalk.grey,
-    invalid: chalk.white.bgRed.bold
-  };
-}
+			return new Error(error);
+		});
 
-const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
-const BRACKET = /^[()[\]{}]$/;
-let tokenize;
-{
-  const JSX_TAG = /^[a-z][\w-]*$/i;
+		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);
 
-  const getTokenType = function (token, offset, text) {
-    if (token.type === "name") {
-      if ((0, _helperValidatorIdentifier.isKeyword)(token.value) || (0, _helperValidatorIdentifier.isStrictReservedWord)(token.value, true) || sometimesKeywords.has(token.value)) {
-        return "keyword";
-      }
+		this.name = 'AggregateError';
 
-      if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
-        return "jsxIdentifier";
-      }
+		Object.defineProperty(this, '_errors', {value: errors});
+	}
 
-      if (token.value[0] !== token.value[0].toLowerCase()) {
-        return "capitalized";
-      }
-    }
+	* [Symbol.iterator]() {
+		for (const error of this._errors) {
+			yield error;
+		}
+	}
+}
 
-    if (token.type === "punctuator" && BRACKET.test(token.value)) {
-      return "bracket";
-    }
+module.exports = AggregateError;
 
-    if (token.type === "invalid" && (token.value === "@" || token.value === "#")) {
-      return "punctuator";
-    }
 
-    return token.type;
-  };
+/***/ }),
 
-  tokenize = function* (text) {
-    let match;
+/***/ "../../node_modules/del/node_modules/fast-glob/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    while (match = _jsTokens.default.exec(text)) {
-      const token = _jsTokens.matchToToken(match);
+"use strict";
 
-      yield {
-        type: getTokenType(token, match.index, text),
-        value: token.value
-      };
+const taskManager = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/managers/tasks.js");
+const async_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/async.js");
+const stream_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/stream.js");
+const sync_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/settings.js");
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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;
 
-function highlightTokens(defs, text) {
-  let highlighted = "";
 
-  for (const {
-    type,
-    value
-  } of tokenize(text)) {
-    const colorize = defs[type];
+/***/ }),
 
-    if (colorize) {
-      highlighted += value.split(NEWLINE).map(str => colorize(str)).join("\n");
-    } else {
-      highlighted += value;
-    }
-  }
+/***/ "../../node_modules/del/node_modules/fast-glob/out/managers/tasks.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return highlighted;
-}
+"use strict";
 
-function shouldHighlight(options) {
-  return !!_chalk.supportsColor || options.forceColor;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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);
 }
-
-function getChalk(options) {
-  return options.forceColor ? new _chalk.constructor({
-    enabled: true,
-    level: 1
-  }) : _chalk;
+exports.generate = generate;
+/**
+ * Returns tasks grouped by basic pattern directories.
+ *
+ * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
+ * This is necessary because directory traversal starts at the base directory and goes deeper.
+ */
+function convertPatternsToTasks(positive, negative, dynamic) {
+    const tasks = [];
+    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
+    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
+    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
+    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
+    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
+    /*
+     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
+     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
+     */
+    if ('.' in insideCurrentDirectoryGroup) {
+        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
+    }
+    else {
+        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
+    }
+    return tasks;
 }
-
-function highlight(code, options = {}) {
-  if (code !== "" && shouldHighlight(options)) {
-    const chalk = getChalk(options);
-    const defs = getDefs(chalk);
-    return highlightTokens(defs, code);
-  } else {
-    return code;
-  }
+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;
 
-/***/ }),
-/* 352 */
-/***/ (function(module, exports) {
 
-// Copyright 2014, 2015, 2016, 2017, 2018 Simon Lydell
-// License: MIT. (See LICENSE.)
+/***/ }),
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-})
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// This regex comes from regex.coffee, and is inserted here by generate-index.js
-// (run `npm run build`).
-exports.default = /((['"])(?:(?!\2|\\).|\\(?:\r\n|[\s\S]))*(\2)?|`(?:[^`\\$]|\\[\s\S]|\$(?!\{)|\$\{(?:[^{}]|\{[^}]*\}?)*\}?)*(`)?)|(\/\/.*)|(\/\*(?:[^*]|\*(?!\/))*(\*\/)?)|(\/(?!\*)(?:\[(?:(?![\]\\]).|\\.)*\]|(?![\/\]\\]).|\\.)+\/(?:(?!\s*(?:\b|[\u0080-\uFFFF$\\'"~({]|[+\-!](?!=)|\.?\d))|[gmiyus]{1,6}\b(?![\u0080-\uFFFF$\\]|\s*(?:[+\-*%&|^<>!=?({]|\/(?![\/*])))))|(0[xX][\da-fA-F]+|0[oO][0-7]+|0[bB][01]+|(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?)|((?!\d)(?:(?!\s)[$\w\u0080-\uFFFF]|\\u[\da-fA-F]{4}|\\u\{[\da-fA-F]+\})+)|(--|\+\+|&&|\|\||=>|\.{3}|(?:[+\-\/%&|^]|\*{1,2}|<{1,2}|>{1,3}|!=?|={1,2})=?|[?~.,:;[\](){}])|(\s+)|(^$|[\s\S])/g
+"use strict";
 
-exports.matchToToken = function(match) {
-  var token = {type: "invalid", value: match[0], closed: undefined}
-       if (match[ 1]) token.type = "string" , token.closed = !!(match[3] || match[4])
-  else if (match[ 5]) token.type = "comment"
-  else if (match[ 6]) token.type = "comment", token.closed = !!match[7]
-  else if (match[ 8]) token.type = "regex"
-  else if (match[ 9]) token.type = "number"
-  else if (match[10]) token.type = "name"
-  else if (match[11]) token.type = "punctuator"
-  else if (match[12]) token.type = "whitespace"
-  return token
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/provider.js");
+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;
 
 
 /***/ }),
-/* 353 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/filters/deep.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+const partial_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/matchers/partial.js");
+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) {
+        if (this._isSkippedByDeep(basePath, entry.path)) {
+            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(basePath, entryPath) {
+        /**
+         * Avoid unnecessary depth calculations when it doesn't matter.
+         */
+        if (this._settings.deep === Infinity) {
+            return false;
+        }
+        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
+    }
+    _getEntryLevel(basePath, entryPath) {
+        const entryPathDepth = entryPath.split('/').length;
+        if (basePath === '') {
+            return entryPathDepth;
+        }
+        const basePathDepth = basePath.split('/').length;
+        return entryPathDepth - basePathDepth;
+    }
+    _isSkippedSymbolicLink(entry) {
+        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
+    }
+    _isSkippedByPositivePatterns(entryPath, matcher) {
+        return !this._settings.baseNameMatch && !matcher.match(entryPath);
+    }
+    _isSkippedByNegativePatterns(entryPath, patternsRe) {
+        return !utils.pattern.matchAny(entryPath, patternsRe);
+    }
+}
+exports.default = DeepFilter;
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "isIdentifierChar", {
-  enumerable: true,
-  get: function () {
-    return _identifier.isIdentifierChar;
-  }
-});
-Object.defineProperty(exports, "isIdentifierName", {
-  enumerable: true,
-  get: function () {
-    return _identifier.isIdentifierName;
-  }
-});
-Object.defineProperty(exports, "isIdentifierStart", {
-  enumerable: true,
-  get: function () {
-    return _identifier.isIdentifierStart;
-  }
-});
-Object.defineProperty(exports, "isKeyword", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isKeyword;
-  }
-});
-Object.defineProperty(exports, "isReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isReservedWord;
-  }
-});
-Object.defineProperty(exports, "isStrictBindOnlyReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isStrictBindOnlyReservedWord;
-  }
-});
-Object.defineProperty(exports, "isStrictBindReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isStrictBindReservedWord;
-  }
-});
-Object.defineProperty(exports, "isStrictReservedWord", {
-  enumerable: true,
-  get: function () {
-    return _keyword.isStrictReservedWord;
-  }
-});
-
-var _identifier = __webpack_require__(354);
-
-var _keyword = __webpack_require__(355);
 
 /***/ }),
-/* 354 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/filters/entry.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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 && this._isDuplicateEntry(entry)) {
+            return false;
+        }
+        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
+            return false;
+        }
+        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
+        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
+        if (this._settings.unique && isMatched) {
+            this._createIndexRecord(entry);
+        }
+        return isMatched;
+    }
+    _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(entryPath, patternsRe) {
+        if (!this._settings.absolute) {
+            return false;
+        }
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
+        return utils.pattern.matchAny(fullpath, patternsRe);
+    }
+    _isMatchToPatterns(entryPath, patternsRe) {
+        const filepath = utils.path.removeLeadingDotSegment(entryPath);
+        return utils.pattern.matchAny(filepath, patternsRe);
+    }
+}
+exports.default = EntryFilter;
+
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isIdentifierChar = isIdentifierChar;
-exports.isIdentifierName = isIdentifierName;
-exports.isIdentifierStart = isIdentifierStart;
-let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088e\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ca\ua7d0\ua7d1\ua7d3\ua7d5-\ua7d9\ua7f2-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
-let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0898-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1ace\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
-const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
-const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
-nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
-const astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1070, 4050, 582, 8634, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 46, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 482, 44, 11, 6, 17, 0, 322, 29, 19, 43, 1269, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4152, 8, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
-const astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
+/***/ }),
 
-function isInAstralSet(code, set) {
-  let pos = 0x10000;
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/filters/error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  for (let i = 0, length = set.length; i < length; i += 2) {
-    pos += set[i];
-    if (pos > code) return false;
-    pos += set[i + 1];
-    if (pos >= code) return true;
-  }
+"use strict";
 
-  return false;
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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;
 
-function isIdentifierStart(code) {
-  if (code < 65) return code === 36;
-  if (code <= 90) return true;
-  if (code < 97) return code === 95;
-  if (code <= 122) return true;
 
-  if (code <= 0xffff) {
-    return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
-  }
+/***/ }),
 
-  return isInAstralSet(code, astralIdentifierStartCodes);
-}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/matchers/matcher.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function isIdentifierChar(code) {
-  if (code < 48) return code === 36;
-  if (code < 58) return true;
-  if (code < 65) return false;
-  if (code <= 90) return true;
-  if (code < 97) return code === 95;
-  if (code <= 122) return true;
+"use strict";
 
-  if (code <= 0xffff) {
-    return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
-  }
-
-  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes);
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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;
 
-function isIdentifierName(name) {
-  let isFirst = true;
-
-  for (let i = 0; i < name.length; i++) {
-    let cp = name.charCodeAt(i);
 
-    if ((cp & 0xfc00) === 0xd800 && i + 1 < name.length) {
-      const trail = name.charCodeAt(++i);
+/***/ }),
 
-      if ((trail & 0xfc00) === 0xdc00) {
-        cp = 0x10000 + ((cp & 0x3ff) << 10) + (trail & 0x3ff);
-      }
-    }
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/matchers/partial.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (isFirst) {
-      isFirst = false;
+"use strict";
 
-      if (!isIdentifierStart(cp)) {
+Object.defineProperty(exports, "__esModule", { value: true });
+const matcher_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/matchers/matcher.js");
+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;
-      }
-    } else if (!isIdentifierChar(cp)) {
-      return false;
     }
-  }
-
-  return !isFirst;
 }
+exports.default = PartialMatcher;
+
 
 /***/ }),
-/* 355 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/provider.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const deep_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/filters/deep.js");
+const entry_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/filters/entry.js");
+const error_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/filters/error.js");
+const entry_2 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/transformers/entry.js");
+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;
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isKeyword = isKeyword;
-exports.isReservedWord = isReservedWord;
-exports.isStrictBindOnlyReservedWord = isStrictBindOnlyReservedWord;
-exports.isStrictBindReservedWord = isStrictBindReservedWord;
-exports.isStrictReservedWord = isStrictReservedWord;
-const reservedWords = {
-  keyword: ["break", "case", "catch", "continue", "debugger", "default", "do", "else", "finally", "for", "function", "if", "return", "switch", "throw", "try", "var", "const", "while", "with", "new", "this", "super", "class", "extends", "export", "import", "null", "true", "false", "in", "instanceof", "typeof", "void", "delete"],
-  strict: ["implements", "interface", "let", "package", "private", "protected", "public", "static", "yield"],
-  strictBind: ["eval", "arguments"]
-};
-const keywords = new Set(reservedWords.keyword);
-const reservedWordsStrictSet = new Set(reservedWords.strict);
-const reservedWordsStrictBindSet = new Set(reservedWords.strictBind);
 
-function isReservedWord(word, inModule) {
-  return inModule && word === "await" || word === "enum";
-}
+/***/ }),
 
-function isStrictReservedWord(word, inModule) {
-  return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
-}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function isStrictBindOnlyReservedWord(word) {
-  return reservedWordsStrictBindSet.has(word);
-}
+"use strict";
 
-function isStrictBindReservedWord(word, inModule) {
-  return isStrictReservedWord(word, inModule) || isStrictBindOnlyReservedWord(word);
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const stream_2 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/provider.js");
+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;
 
-function isKeyword(word) {
-  return keywords.has(word);
-}
 
 /***/ }),
-/* 356 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/sync.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const escapeStringRegexp = __webpack_require__(357);
-const ansiStyles = __webpack_require__(358);
-const stdoutColor = __webpack_require__(363).stdout;
-
-const template = __webpack_require__(365);
-
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/sync.js");
+const provider_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/providers/provider.js");
+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;
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
+/***/ }),
 
-const styles = Object.create(null);
+/***/ "../../node_modules/del/node_modules/fast-glob/out/providers/transformers/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function applyOptions(obj, options) {
-	options = options || {};
+"use strict";
 
-	// 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;
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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;
 
-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);
-
-		chalk.template = function () {
-			const args = [].slice.call(arguments);
-			return chalkTag.apply(null, [chalk.template].concat(args));
-		};
-
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
-
-		chalk.template.constructor = Chalk;
-
-		return chalk.template;
-	}
 
-	applyOptions(this, options);
-}
+/***/ }),
 
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/readers/reader.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-for (const key of Object.keys(ansiStyles)) {
-	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+"use strict";
 
-	styles[key] = {
-		get() {
-			const codes = ansiStyles[key];
-			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
-		}
-	};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const utils = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/index.js");
+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;
 
-styles.visible = {
-	get() {
-		return build.call(this, this._styles || [], true, 'visible');
-	}
-};
 
-ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
-for (const model of Object.keys(ansiStyles.color.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+/***/ }),
 
-	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);
-			};
-		}
-	};
-}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/readers/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
-for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+"use strict";
 
-	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);
-			};
-		}
-	};
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/reader.js");
+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 proto = Object.defineProperties(() => {}, styles);
 
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
+/***/ }),
 
-	builder._styles = _styles;
-	builder._empty = _empty;
+/***/ "../../node_modules/del/node_modules/fast-glob/out/readers/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	const self = this;
+"use strict";
 
-	Object.defineProperty(builder, 'level', {
-		enumerable: true,
-		get() {
-			return self.level;
-		},
-		set(level) {
-			self.level = level;
-		}
-	});
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/readers/reader.js");
+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;
 
-	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';
+/***/ }),
 
-	// `__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
+/***/ "../../node_modules/del/node_modules/fast-glob/out/settings.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return builder;
-}
+"use strict";
 
-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]);
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
+const fs = __webpack_require__("fs");
+const os = __webpack_require__("os");
+/**
+ * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
+ * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
+ */
+const CPU_COUNT = Math.max(os.cpus().length, 1);
+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;
 
-	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];
-		}
-	}
+/***/ }),
 
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
-	}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/array.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	// 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 = '';
-	}
+"use strict";
 
-	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;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitWhen = exports.flatten = void 0;
+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;
 
-		// 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}`);
-	}
 
-	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	ansiStyles.dim.open = originalDim;
+/***/ }),
 
-	return str;
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/errno.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEnoentCodeError = void 0;
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
 }
+exports.isEnoentCodeError = isEnoentCodeError;
 
-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(' ');
-	}
 
-	const args = [].slice.call(arguments, 2);
-	const parts = [strings.raw[0]];
+/***/ }),
 
-	for (let i = 1; i < strings.length; i++) {
-		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
-		parts.push(String(strings.raw[i]));
-	}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return template(chalk, parts.join(''));
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDirentFromStats = void 0;
+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;
 
-Object.defineProperties(Chalk.prototype, styles);
 
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
+/***/ }),
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
+const array = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/array.js");
+exports.array = array;
+const errno = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/errno.js");
+exports.errno = errno;
+const fs = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/fs.js");
+exports.fs = fs;
+const path = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/path.js");
+exports.path = path;
+const pattern = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/pattern.js");
+exports.pattern = pattern;
+const stream = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/stream.js");
+exports.stream = stream;
+const string = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/utils/string.js");
+exports.string = string;
 
 
 /***/ }),
-/* 357 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/path.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
+const path = __webpack_require__("path");
+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;
+
 
-var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+/***/ }),
 
-module.exports = function (str) {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/pattern.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return str.replace(matchOperatorsRe, '\\$&');
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
+const path = __webpack_require__("path");
+const globParent = __webpack_require__("../../node_modules/glob-parent/index.js");
+const micromatch = __webpack_require__("../../node_modules/del/node_modules/micromatch/index.js");
+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 = {}) {
+    /**
+     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
+     * An empty string cannot be a dynamic pattern.
+     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
+     */
+    if (pattern === '') {
+        return false;
+    }
+    /**
+     * 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;
+/**
+ * Returns patterns that can be applied inside the current directory.
+ *
+ * @example
+ * // ['./*', '*', 'a/*']
+ * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
+ */
+function getPatternsInsideCurrentDirectory(patterns) {
+    return patterns.filter((pattern) => !isPatternRelatedToParentDirectory(pattern));
+}
+exports.getPatternsInsideCurrentDirectory = getPatternsInsideCurrentDirectory;
+/**
+ * Returns patterns to be expanded relative to (outside) the current directory.
+ *
+ * @example
+ * // ['../*', './../*']
+ * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
+ */
+function getPatternsOutsideCurrentDirectory(patterns) {
+    return patterns.filter(isPatternRelatedToParentDirectory);
+}
+exports.getPatternsOutsideCurrentDirectory = getPatternsOutsideCurrentDirectory;
+function isPatternRelatedToParentDirectory(pattern) {
+    return pattern.startsWith('..') || pattern.startsWith('./..');
+}
+exports.isPatternRelatedToParentDirectory = isPatternRelatedToParentDirectory;
+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) {
+    let { parts } = micromatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
+    /**
+     * The scan method returns an empty array in some cases.
+     * See micromatch/picomatch#58 for more details.
+     */
+    if (parts.length === 0) {
+        parts = [pattern];
+    }
+    /**
+     * The scan method does not return an empty part for the pattern with a forward slash.
+     * This is another part of micromatch/picomatch#58.
+     */
+    if (parts[0].startsWith('/')) {
+        parts[0] = parts[0].slice(1);
+        parts.unshift('');
+    }
+    return 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;
 
 
 /***/ }),
-/* 358 */
+
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/stream.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(359);
 
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = void 0;
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+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'));
+}
 
-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`;
-};
+/***/ }),
 
-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],
+/***/ "../../node_modules/del/node_modules/fast-glob/out/utils/string.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-			// 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],
+"use strict";
 
-			// 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]
-		}
-	};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmpty = exports.isString = void 0;
+function isString(input) {
+    return typeof input === 'string';
+}
+exports.isString = isString;
+function isEmpty(input) {
+    return input === '';
+}
+exports.isEmpty = isEmpty;
 
-	// Fix humans
-	styles.color.grey = styles.color.gray;
 
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
+/***/ }),
 
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
+/***/ "../../node_modules/del/node_modules/globby/gitignore.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+"use strict";
 
-			group[styleName] = styles[styleName];
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const fastGlob = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/index.js");
+const gitIgnore = __webpack_require__("../../node_modules/ignore/index.js");
+const slash = __webpack_require__("../../node_modules/slash/index.js");
 
-			codes.set(style[0], style[1]);
-		}
+const DEFAULT_IGNORE = [
+	'**/node_modules/**',
+	'**/flow-typed/**',
+	'**/coverage/**',
+	'**/.git'
+];
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
+const readFileP = promisify(fs.readFile);
 
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
+const mapGitIgnorePatternTo = base => ignore => {
+	if (ignore.startsWith('!')) {
+		return '!' + path.posix.join(base, ignore.slice(1));
 	}
 
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
+	return path.posix.join(base, ignore);
+};
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+const parseGitIgnore = (content, options) => {
+	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
+	return content
+		.split(/\r?\n/)
+		.filter(Boolean)
+		.filter(line => !line.startsWith('#'))
+		.map(mapGitIgnorePatternTo(base));
+};
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+const reduceIgnore = files => {
+	return files.reduce((ignores, file) => {
+		ignores.add(parseGitIgnore(file.content, {
+			cwd: file.cwd,
+			fileName: file.filePath
+		}));
+		return ignores;
+	}, gitIgnore());
+};
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
+const ensureAbsolutePathForCwd = (cwd, p) => {
+	if (path.isAbsolute(p)) {
+		if (p.startsWith(cwd)) {
+			return p;
 		}
 
-		const suite = colorConvert[key];
+		throw new Error(`Path ${p} is not in cwd ${cwd}`);
+	}
 
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
+	return path.join(cwd, p);
+};
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+const getIsIgnoredPredecate = (ignores, cwd) => {
+	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
+};
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+const getFile = async (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = await readFileP(filePath, 'utf8');
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
 
-	return styles;
-}
+const getFileSync = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = fs.readFileSync(filePath, 'utf8');
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(116)(module)))
+const normalizeOptions = ({
+	ignore = [],
+	cwd = slash(process.cwd())
+} = {}) => {
+	return {ignore, cwd};
+};
 
-/***/ }),
-/* 359 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = async options => {
+	options = normalizeOptions(options);
 
-var conversions = __webpack_require__(360);
-var route = __webpack_require__(362);
+	const paths = await fastGlob('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
 
-var convert = {};
+	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
+	const ignores = reduceIgnore(files);
 
-var models = Object.keys(conversions);
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
 
-function wrapRaw(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
+module.exports.sync = options => {
+	options = normalizeOptions(options);
 
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
+	const paths = fastGlob.sync('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
 
-		return fn(args);
-	};
+	const files = paths.map(file => getFileSync(file, options.cwd));
+	const ignores = reduceIgnore(files);
 
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
 
-	return wrappedFn;
-}
 
-function wrapRounded(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
+/***/ }),
 
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
+/***/ "../../node_modules/del/node_modules/globby/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		var result = fn(args);
+"use strict";
 
-		// 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]);
-			}
-		}
+const fs = __webpack_require__("fs");
+const arrayUnion = __webpack_require__("../../node_modules/array-union/index.js");
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+const glob = __webpack_require__("../../node_modules/glob/glob.js");
+const fastGlob = __webpack_require__("../../node_modules/del/node_modules/fast-glob/out/index.js");
+const dirGlob = __webpack_require__("../../node_modules/dir-glob/index.js");
+const gitignore = __webpack_require__("../../node_modules/del/node_modules/globby/gitignore.js");
+const {FilterStream, UniqueStream} = __webpack_require__("../../node_modules/del/node_modules/globby/stream-utils.js");
 
-		return result;
-	};
+const DEFAULT_FILTER = () => false;
 
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
+const isNegative = pattern => pattern[0] === '!';
 
-	return wrappedFn;
-}
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
 
-models.forEach(function (fromModel) {
-	convert[fromModel] = {};
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
 
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch (_) {
+		return;
+	}
 
-	var routes = route(fromModel);
-	var routeModels = Object.keys(routes);
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
 
-	routeModels.forEach(function (toModel) {
-		var fn = routes[toModel];
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
 
-module.exports = convert;
+	const globTasks = [];
 
+	taskOptions = {
+		ignore: [],
+		expandDirectories: true,
+		...taskOptions
+	};
 
-/***/ }),
-/* 360 */
-/***/ (function(module, exports, __webpack_require__) {
+	for (const [index, pattern] of patterns.entries()) {
+		if (isNegative(pattern)) {
+			continue;
+		}
 
-/* MIT license */
-var cssKeywords = __webpack_require__(361);
+		const ignore = patterns
+			.slice(index)
+			.filter(isNegative)
+			.map(pattern => pattern.slice(1));
 
-// 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.)
+		const options = {
+			...taskOptions,
+			ignore: taskOptions.ignore.concat(ignore)
+		};
 
-var reverseKeywords = {};
-for (var key in cssKeywords) {
-	if (cssKeywords.hasOwnProperty(key)) {
-		reverseKeywords[cssKeywords[key]] = key;
+		globTasks.push({pattern, options});
 	}
-}
 
-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']}
+	return globTasks;
 };
 
-// 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);
-		}
-
-		if (!('labels' in convert[model])) {
-			throw new Error('missing channel labels property: ' + model);
-		}
-
-		if (convert[model].labels.length !== convert[model].channels) {
-			throw new Error('channel and label counts mismatch: ' + model);
-		}
-
-		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});
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
 	}
-}
-
-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;
 
-	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;
+	if (Array.isArray(task.options.expandDirectories)) {
+		options = {
+			...options,
+			files: task.options.expandDirectories
+		};
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = {
+			...options,
+			...task.options.expandDirectories
+		};
 	}
 
-	h = Math.min(h * 60, 360);
+	return fn(task.pattern, options);
+};
 
-	if (h < 0) {
-		h += 360;
-	}
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
 
-	l = (min + max) / 2;
+const getFilterSync = options => {
+	return options && options.gitignore ?
+		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+		DEFAULT_FILTER;
+};
 
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
 	}
 
-	return [h, s * 100, l * 100];
+	return {
+		pattern: glob,
+		options
+	};
 };
 
-convert.rgb.hsv = function (rgb) {
-	var rdif;
-	var gdif;
-	var bdif;
-	var h;
-	var s;
+module.exports = async (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-	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;
+	const getFilter = async () => {
+		return options && options.gitignore ?
+			gitignore({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
 	};
 
-	if (diff === 0) {
-		h = s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
+	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 (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;
-		}
-	}
+		return arrayUnion(...tasks);
+	};
 
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
+	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
+	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+
+	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
 };
 
-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));
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
 
-	return [h, w * 100, b * 100];
+	const filter = getFilterSync(options);
+
+	return tasks.reduce(
+		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
+		[]
+	).filter(path_ => !filter(path_));
 };
 
-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;
+module.exports.stream = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-	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;
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
 
-	return [c * 100, m * 100, y * 100, k * 100];
+	const filter = getFilterSync(options);
+	const filterStream = new FilterStream(p => !filter(p));
+	const uniqueStream = new UniqueStream();
+
+	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
+		.pipe(filterStream)
+		.pipe(uniqueStream);
 };
 
-/**
- * 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)
-	);
+module.exports.generateGlobTasks = generateGlobTasks;
+
+module.exports.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => glob.hasMagic(pattern, options));
+
+module.exports.gitignore = gitignore;
+
+
+/***/ }),
+
+/***/ "../../node_modules/del/node_modules/globby/stream-utils.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {Transform} = __webpack_require__("stream");
+
+class ObjectTransform extends Transform {
+	constructor() {
+		super({
+			objectMode: true
+		});
+	}
 }
 
-convert.rgb.keyword = function (rgb) {
-	var reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
+class FilterStream extends ObjectTransform {
+	constructor(filter) {
+		super();
+		this._filter = filter;
 	}
 
-	var currentClosestDistance = Infinity;
-	var currentClosestKeyword;
+	_transform(data, encoding, callback) {
+		if (this._filter(data)) {
+			this.push(data);
+		}
 
-	for (var keyword in cssKeywords) {
-		if (cssKeywords.hasOwnProperty(keyword)) {
-			var value = cssKeywords[keyword];
+		callback();
+	}
+}
 
-			// Compute comparative distance
-			var distance = comparativeDistance(rgb, value);
+class UniqueStream extends ObjectTransform {
+	constructor() {
+		super();
+		this._pushed = new Set();
+	}
 
-			// Check if its less, if so set as closest
-			if (distance < currentClosestDistance) {
-				currentClosestDistance = distance;
-				currentClosestKeyword = keyword;
-			}
+	_transform(data, encoding, callback) {
+		if (!this._pushed.has(data)) {
+			this.push(data);
+			this._pushed.add(data);
 		}
+
+		callback();
 	}
+}
 
-	return currentClosestKeyword;
+module.exports = {
+	FilterStream,
+	UniqueStream
 };
 
-convert.keyword.rgb = function (keyword) {
-	return cssKeywords[keyword];
-};
 
-convert.rgb.xyz = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-
-	// 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);
-
-	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);
-
-	return [x * 100, y * 100, z * 100];
-};
-
-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;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+/***/ }),
 
-	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);
+/***/ "../../node_modules/del/node_modules/indent-string/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
+"use strict";
 
-	return [l, a, b];
-};
 
-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;
+module.exports = (string, count = 1, options) => {
+	options = {
+		indent: ' ',
+		includeEmptyLines: false,
+		...options
+	};
 
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
+	if (typeof string !== 'string') {
+		throw new TypeError(
+			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
+		);
 	}
 
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
+	if (typeof count !== 'number') {
+		throw new TypeError(
+			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
+		);
 	}
 
-	t1 = 2 * l - t2;
-
-	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--;
-		}
-
-		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;
-		}
+	if (typeof options.indent !== 'string') {
+		throw new TypeError(
+			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
+		);
+	}
 
-		rgb[i] = val * 255;
+	if (count === 0) {
+		return string;
 	}
 
-	return rgb;
-};
+	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
 
-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;
+	return string.replace(regex, options.indent.repeat(count));
+};
 
-	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);
 
-	return [h, sv * 100, v * 100];
-};
+/***/ }),
 
-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;
+/***/ "../../node_modules/del/node_modules/micromatch/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	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;
+"use strict";
 
-	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];
-	}
-};
 
-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 util = __webpack_require__("util");
+const braces = __webpack_require__("../../node_modules/braces/index.js");
+const picomatch = __webpack_require__("../../node_modules/picomatch/index.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+const isEmptyString = val => val === '' || val === './';
 
-	l = (2 - s) * v;
-	lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
+/**
+ * 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
+ */
 
-	return [h, sl * 100, l * 100];
-};
+const micromatch = (list, patterns, options) => {
+  patterns = [].concat(patterns);
+  list = [].concat(list);
 
-// 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;
+  let omit = new Set();
+  let keep = new Set();
+  let items = new Set();
+  let negatives = 0;
 
-	// wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
+  let onResult = state => {
+    items.add(state.output);
+    if (options && options.onResult) {
+      options.onResult(state);
+    }
+  };
 
-	i = Math.floor(6 * h);
-	v = 1 - bl;
-	f = 6 * h - i;
+  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 ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
+    for (let item of list) {
+      let matched = isMatch(item, true);
 
-	n = wh + f * (v - wh); // linear interpolation
+      let match = negated ? !matched.isMatch : matched.isMatch;
+      if (!match) continue;
 
-	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 (negated) {
+        omit.add(matched.output);
+      } else {
+        omit.delete(matched.output);
+        keep.add(matched.output);
+      }
+    }
+  }
 
-	return [r * 255, g * 255, b * 255];
-};
+  let result = negatives === patterns.length ? [...items] : [...keep];
+  let matches = result.filter(item => !omit.has(item));
 
-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;
+  if (options && matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+    }
 
-	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);
+    if (options.nonull === true || options.nullglob === true) {
+      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
+    }
+  }
 
-	return [r * 255, g * 255, b * 255];
+  return matches;
 };
 
-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;
+/**
+ * Backwards compatibility
+ */
 
-	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);
+micromatch.match = micromatch;
 
-	// assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
-		: r * 12.92;
+/**
+ * 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
+ */
 
-	g = g > 0.0031308
-		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
-		: g * 12.92;
+micromatch.matcher = (pattern, options) => picomatch(pattern, options);
 
-	b = b > 0.0031308
-		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
-		: b * 12.92;
+/**
+ * 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
+ */
 
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
+micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
-	return [r * 255, g * 255, b * 255];
-};
+/**
+ * Backwards compatibility
+ */
 
-convert.xyz.lab = function (xyz) {
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
+micromatch.any = micromatch.isMatch;
 
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
+/**
+ * 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
+ */
 
-	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);
+micromatch.not = (list, patterns, options = {}) => {
+  patterns = [].concat(patterns).map(String);
+  let result = new Set();
+  let items = [];
 
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
+  let onResult = state => {
+    if (options.onResult) options.onResult(state);
+    items.push(state.output);
+  };
 
-	return [l, a, b];
+  let matches = micromatch(list, patterns, { ...options, onResult });
+
+  for (let item of items) {
+    if (!matches.includes(item)) {
+      result.add(item);
+    }
+  }
+  return [...result];
 };
 
-convert.lab.xyz = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var x;
-	var y;
-	var z;
+/**
+ * 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 any of the patterns matches any part of `str`.
+ * @api public
+ */
 
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
+micromatch.contains = (str, pattern, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
 
-	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;
+  if (Array.isArray(pattern)) {
+    return pattern.some(p => micromatch.contains(str, p, options));
+  }
 
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
+  if (typeof pattern === 'string') {
+    if (isEmptyString(str) || isEmptyString(pattern)) {
+      return false;
+    }
 
-	return [x, y, z];
+    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
+      return true;
+    }
+  }
+
+  return micromatch.isMatch(str, pattern, { ...options, contains: true });
 };
 
-convert.lab.lch = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var hr;
-	var h;
-	var c;
+/**
+ * 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
+ */
 
-	hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
+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;
+};
 
-	if (h < 0) {
-		h += 360;
-	}
+/**
+ * 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` matches any of the strings in `list`
+ * @api public
+ */
 
-	c = Math.sqrt(a * a + b * b);
+micromatch.some = (list, patterns, options) => {
+  let items = [].concat(list);
 
-	return [l, c, h];
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (items.some(item => isMatch(item))) {
+      return true;
+    }
+  }
+  return false;
 };
 
-convert.lch.lab = function (lch) {
-	var l = lch[0];
-	var c = lch[1];
-	var h = lch[2];
-	var a;
-	var b;
-	var hr;
+/**
+ * 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 all `patterns` matches all of the strings in `list`
+ * @api public
+ */
 
-	hr = h / 360 * 2 * Math.PI;
-	a = c * Math.cos(hr);
-	b = c * Math.sin(hr);
+micromatch.every = (list, patterns, options) => {
+  let items = [].concat(list);
 
-	return [l, a, b];
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (!items.every(item => isMatch(item))) {
+      return false;
+    }
+  }
+  return true;
 };
 
-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
-
-	value = Math.round(value / 50);
+/**
+ * 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
+ */
 
-	if (value === 0) {
-		return 30;
-	}
+micromatch.all = (str, patterns, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
 
-	var ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
+  return [].concat(patterns).every(p => picomatch(p, options)(str));
+};
 
-	if (value === 2) {
-		ansi += 60;
-	}
+/**
+ * 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 {Array|null} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
+ * @api public
+ */
 
-	return ansi;
-};
+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);
 
-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]);
+  if (match) {
+    return match.slice(1).map(v => v === void 0 ? '' : v);
+  }
 };
 
-convert.rgb.ansi256 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
+/**
+ * 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
+ */
 
-	// 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;
-		}
+micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-		if (r > 248) {
-			return 231;
-		}
+/**
+ * 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
+ */
 
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
+micromatch.scan = (...args) => picomatch.scan(...args);
 
-	var ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
+/**
+ * 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
+ */
 
-	return ansi;
+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;
 };
 
-convert.ansi16.rgb = function (args) {
-	var color = args % 10;
-
-	// handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
-
-		color = color / 10.5 * 255;
+/**
+ * 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
+ */
 
-		return [color, color, color];
-	}
+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);
+};
 
-	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;
+/**
+ * Expand braces
+ */
 
-	return [r, g, b];
+micromatch.braceExpand = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  return micromatch.braces(pattern, { ...options, expand: true });
 };
 
-convert.ansi256.rgb = function (args) {
-	// handle greyscale
-	if (args >= 232) {
-		var c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
-
-	args -= 16;
+/**
+ * Expose micromatch
+ */
 
-	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;
+module.exports = micromatch;
 
-	return [r, g, b];
-};
 
-convert.rgb.hex = function (args) {
-	var integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
+/***/ }),
 
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+/***/ "../../node_modules/del/node_modules/p-map/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-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];
-	}
+"use strict";
 
-	var colorString = match[0];
+const AggregateError = __webpack_require__("../../node_modules/del/node_modules/aggregate-error/index.js");
 
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(function (char) {
-			return char + char;
-		}).join('');
-	}
+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 integer = parseInt(colorString, 16);
-	var r = (integer >> 16) & 0xFF;
-	var g = (integer >> 8) & 0xFF;
-	var b = integer & 0xFF;
+		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+		}
 
-	return [r, g, b];
-};
+		const ret = [];
+		const errors = [];
+		const iterator = iterable[Symbol.iterator]();
+		let isRejected = false;
+		let isIterableDone = false;
+		let resolvingCount = 0;
+		let currentIndex = 0;
 
-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;
+		const next = () => {
+			if (isRejected) {
+				return;
+			}
 
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
+			const nextItem = iterator.next();
+			const i = currentIndex;
+			currentIndex++;
 
-	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;
-	}
+			if (nextItem.done) {
+				isIterableDone = true;
 
-	hue /= 6;
-	hue %= 1;
+				if (resolvingCount === 0) {
+					if (!stopOnError && errors.length !== 0) {
+						reject(new AggregateError(errors));
+					} else {
+						resolve(ret);
+					}
+				}
 
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
+				return;
+			}
 
-convert.hsl.hcg = function (hsl) {
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var c = 1;
-	var f = 0;
+			resolvingCount++;
 
-	if (l < 0.5) {
-		c = 2.0 * s * l;
-	} else {
-		c = 2.0 * s * (1.0 - l);
-	}
+			(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();
+					}
+				}
+			})();
+		};
 
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
+		for (let i = 0; i < concurrency; i++) {
+			next();
 
-	return [hsl[0], c * 100, f * 100];
+			if (isIterableDone) {
+				break;
+			}
+		}
+	});
 };
 
-convert.hsv.hcg = function (hsv) {
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
 
-	var c = s * v;
-	var f = 0;
+/***/ }),
 
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
+/***/ "../../node_modules/detect-indent/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [hsv[0], c * 100, f * 100];
-};
+"use strict";
 
-convert.hcg.rgb = function (hcg) {
-	var h = hcg[0] / 360;
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
 
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
+// Detect either spaces or tabs but not both to properly handle tabs for indentation and spaces for alignment
+const INDENT_REGEX = /^(?:( )+|\t+)/;
 
-	var pure = [0, 0, 0];
-	var hi = (h % 1) * 6;
-	var v = hi % 1;
-	var w = 1 - v;
-	var mg = 0;
+const INDENT_TYPE_SPACE = 'space';
+const INDENT_TYPE_TAB = 'tab';
 
-	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;
-	}
+// Make a Map that counts how many indents/unindents have occurred for a given size and how many lines follow a given indentation.
+// The key is a concatenation of the indentation type (s = space and t = tab) and the size of the indents/unindents.
+//
+// indents = {
+//    t3: [1, 0],
+//    t4: [1, 5],
+//    s5: [1, 0],
+//   s12: [1, 0],
+// }
+function makeIndentsMap(string, ignoreSingleSpaces) {
+	const indents = new Map();
 
-	mg = (1.0 - c) * g;
+	// Remember the size of previous line's indentation
+	let previousSize = 0;
+	let previousIndentType;
 
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
-};
+	// Indents key (ident type + size of the indents/unindents)
+	let key;
 
-convert.hcg.hsv = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
+	for (const line of string.split(/\n/g)) {
+		if (!line) {
+			// Ignore empty lines
+			continue;
+		}
 
-	var v = c + g * (1.0 - c);
-	var f = 0;
+		let indent;
+		let indentType;
+		let weight;
+		let entry;
+		const matches = line.match(INDENT_REGEX);
 
-	if (v > 0.0) {
-		f = c / v;
-	}
+		if (matches === null) {
+			previousSize = 0;
+			previousIndentType = '';
+		} else {
+			indent = matches[0].length;
 
-	return [hcg[0], f * 100, v * 100];
-};
+			if (matches[1]) {
+				indentType = INDENT_TYPE_SPACE;
+			} else {
+				indentType = INDENT_TYPE_TAB;
+			}
 
-convert.hcg.hsl = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
+			// Ignore single space unless it's the only indent detected to prevent common false positives
+			if (ignoreSingleSpaces && indentType === INDENT_TYPE_SPACE && indent === 1) {
+				continue;
+			}
 
-	var l = g * (1.0 - c) + 0.5 * c;
-	var s = 0;
+			if (indentType !== previousIndentType) {
+				previousSize = 0;
+			}
 
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
+			previousIndentType = indentType;
 
-	return [hcg[0], s * 100, l * 100];
-};
+			weight = 0;
 
-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];
-};
+			const indentDifference = indent - previousSize;
+			previousSize = indent;
 
-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;
+			// Previous line have same indent?
+			if (indentDifference === 0) {
+				weight++;
+				// We use the key from previous loop
+			} else {
+				const absoluteIndentDifference = indentDifference > 0 ? indentDifference : -indentDifference;
+				key = encodeIndentsKey(indentType, absoluteIndentDifference);
+			}
 
-	if (c < 1) {
-		g = (v - c) / (1 - c);
+			// Update the stats
+			entry = indents.get(key);
+
+			if (entry === undefined) {
+				entry = [1, 0]; // Init
+			} else {
+				entry = [++entry[0], entry[1] + weight];
+			}
+
+			indents.set(key, entry);
+		}
 	}
 
-	return [hwb[0], c * 100, g * 100];
-};
+	return indents;
+}
 
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
+// Encode the indent type and amount as a string (e.g. 's4') for use as a compound key in the indents Map.
+function encodeIndentsKey(indentType, indentAmount) {
+	const typeCharacter = indentType === INDENT_TYPE_SPACE ? 's' : 't';
+	return typeCharacter + String(indentAmount);
+}
 
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
+// Extract the indent type and amount from a key of the indents Map.
+function decodeIndentsKey(indentsKey) {
+	const keyHasTypeSpace = indentsKey[0] === 's';
+	const type = keyHasTypeSpace ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
 
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
+	const amount = Number(indentsKey.slice(1));
 
-convert.gray.hsl = convert.gray.hsv = function (args) {
-	return [0, 0, args[0]];
-};
+	return {type, amount};
+}
 
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
+// Return the key (e.g. 's4') from the indents Map that represents the most common indent,
+// or return undefined if there are no indents.
+function getMostUsedKey(indents) {
+	let result;
+	let maxUsed = 0;
+	let maxWeight = 0;
 
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
+	for (const [key, [usedCount, weight]] of indents) {
+		if (usedCount > maxUsed || (usedCount === maxUsed && weight > maxWeight)) {
+			maxUsed = usedCount;
+			maxWeight = weight;
+			result = key;
+		}
+	}
 
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
+	return result;
+}
 
-convert.gray.hex = function (gray) {
-	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	var integer = (val << 16) + (val << 8) + val;
+function makeIndentString(type, amount) {
+	const indentCharacter = type === INDENT_TYPE_SPACE ? ' ' : '\t';
+	return indentCharacter.repeat(amount);
+}
 
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
+module.exports = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-convert.rgb.gray = function (rgb) {
-	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
+	// Identify indents while skipping single space indents to avoid common edge cases (e.g. code comments)
+	// If no indents are identified, run again and include all indents for comprehensive detection
+	let indents = makeIndentsMap(string, true);
+	if (indents.size === 0) {
+		indents = makeIndentsMap(string, false);
+	}
+
+	const keyOfMostUsedIndent = getMostUsedKey(indents);
+
+	let type;
+	let amount = 0;
+	let indent = '';
+
+	if (keyOfMostUsedIndent !== undefined) {
+		({type, amount} = decodeIndentsKey(keyOfMostUsedIndent));
+		indent = makeIndentString(type, amount);
+	}
+
+	return {
+		amount,
+		type,
+		indent
+	};
 };
 
 
 /***/ }),
-/* 361 */
+
+/***/ "../../node_modules/detect-newline/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "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]
-};
 
 
-/***/ }),
-/* 362 */
-/***/ (function(module, exports, __webpack_require__) {
+const detectNewline = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-var conversions = __webpack_require__(360);
+	const newlines = string.match(/(?:\r?\n)/g) || [];
 
-/*
-	this function routes a model to all other models.
+	if (newlines.length === 0) {
+		return;
+	}
 
-	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 crlf = newlines.filter(newline => newline === '\r\n').length;
+	const lf = newlines.length - crlf;
 
-	conversions that are not possible simply are not included.
-*/
+	return crlf > lf ? '\r\n' : '\n';
+};
 
-function buildGraph() {
-	var graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	var models = Object.keys(conversions);
+module.exports = detectNewline;
+module.exports.graceful = string => (typeof string === 'string' && detectNewline(string)) || '\n';
 
-	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
-		};
-	}
 
-	return graph;
-}
+/***/ }),
 
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	var graph = buildGraph();
-	var queue = [fromModel]; // unshift -> queue -> pop
+/***/ "../../node_modules/dir-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	graph[fromModel].distance = 0;
+"use strict";
 
-	while (queue.length) {
-		var current = queue.pop();
-		var adjacents = Object.keys(conversions[current]);
+const path = __webpack_require__("path");
+const pathType = __webpack_require__("../../node_modules/path-type/index.js");
 
-		for (var len = adjacents.length, i = 0; i < len; i++) {
-			var adjacent = adjacents[i];
-			var node = graph[adjacent];
+const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
+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 graph;
-}
+	return `**/${file}.${getExtensions(extensions)}`;
+};
 
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
+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}\``);
+	}
 
-function wrapConversion(toModel, graph) {
-	var path = [graph[toModel].parent, toModel];
-	var fn = conversions[graph[toModel].parent][toModel];
+	if (options.extensions && !Array.isArray(options.extensions)) {
+		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
+	}
 
-	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;
+	if (options.files && options.extensions) {
+		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
 	}
 
-	fn.conversion = path;
-	return fn;
-}
+	if (options.files) {
+		return options.files.map(x => path.posix.join(directory, `**/${x}`));
+	}
 
-module.exports = function (fromModel) {
-	var graph = deriveBFS(fromModel);
-	var conversion = {};
+	if (options.extensions) {
+		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
+	}
 
-	var models = Object.keys(graph);
-	for (var len = models.length, i = 0; i < len; i++) {
-		var toModel = models[i];
-		var node = graph[toModel];
+	return [path.posix.join(directory, '**')];
+};
 
-		if (node.parent === null) {
-			// no possible conversion, or this node is the source model.
-			continue;
-		}
+module.exports = async (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
 
-		conversion[toModel] = wrapConversion(toModel, graph);
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
 	}
 
-	return conversion;
+	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
+};
 
 
 /***/ }),
-/* 363 */
+
+/***/ "../../node_modules/duplexer/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var Stream = __webpack_require__("stream")
+var writeMethods = ["write", "end", "destroy"]
+var readMethods = ["resume", "pause"]
+var readEvents = ["data", "close"]
+var slice = Array.prototype.slice
 
-const os = __webpack_require__(122);
-const hasFlag = __webpack_require__(364);
+module.exports = duplex
 
-const env = process.env;
+function forEach (arr, fn) {
+    if (arr.forEach) {
+        return arr.forEach(fn)
+    }
 
-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;
+    for (var i = 0; i < arr.length; i++) {
+        fn(arr[i], i)
+    }
 }
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+function duplex(writer, reader) {
+    var stream = new Stream()
+    var ended = false
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-}
+    forEach(writeMethods, proxyWriter)
 
-function supportsColor(stream) {
-	if (forceColor === false) {
-		return 0;
-	}
+    forEach(readMethods, proxyReader)
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+    forEach(readEvents, proxyStream)
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+    reader.on("end", handleEnd)
 
-	if (stream && !stream.isTTY && forceColor !== true) {
-		return 0;
-	}
+    writer.on("drain", function() {
+      stream.emit("drain")
+    })
 
-	const min = forceColor ? 1 : 0;
+    writer.on("error", reemit)
+    reader.on("error", reemit)
 
-	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;
-		}
+    stream.writable = writer.writable
+    stream.readable = reader.readable
 
-		return 1;
-	}
+    return stream
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+    function proxyWriter(methodName) {
+        stream[methodName] = method
 
-		return min;
-	}
+        function method() {
+            return writer[methodName].apply(writer, arguments)
+        }
+    }
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+    function proxyReader(methodName) {
+        stream[methodName] = method
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+        function method() {
+            stream.emit(methodName)
+            var func = reader[methodName]
+            if (func) {
+                return func.apply(reader, arguments)
+            }
+            reader.emit(methodName)
+        }
+    }
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+    function proxyStream(methodName) {
+        reader.on(methodName, reemit)
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
+        function reemit() {
+            var args = slice.call(arguments)
+            args.unshift(methodName)
+            stream.emit.apply(stream, args)
+        }
+    }
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+    function handleEnd() {
+        if (ended) {
+            return
+        }
+        ended = true
+        var args = slice.call(arguments)
+        args.unshift("end")
+        stream.emit.apply(stream, args)
+    }
 
-	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+    function reemit(err) {
+        stream.emit("error", err)
+    }
+}
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
+/***/ }),
 
-	return min;
-}
+/***/ "../../node_modules/end-of-stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
-}
+var once = __webpack_require__("../../node_modules/once/once.js");
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
+var noop = function() {};
+
+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
+};
 
-/***/ }),
-/* 364 */
-/***/ (function(module, exports, __webpack_require__) {
+var eos = function(stream, opts, callback) {
+	if (typeof opts === 'function') return eos(stream, null, opts);
+	if (!opts) opts = {};
 
-"use strict";
+	callback = once(callback || noop);
 
-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);
+	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);
+	var cancelled = false;
+
+	var onlegacyfinish = function() {
+		if (!stream.writable) onfinish();
+	};
+
+	var onfinish = function() {
+		writable = false;
+		if (!readable) callback.call(stream);
+	};
+
+	var onend = function() {
+		readable = false;
+		if (!writable) callback.call(stream);
+	};
+
+	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() {
+		process.nextTick(onclosenexttick);
+	};
+
+	var onclosenexttick = function() {
+		if (cancelled) return;
+		if (readable && !(rs && (rs.ended && !rs.destroyed))) return callback.call(stream, new Error('premature close'));
+		if (writable && !(ws && (ws.ended && !ws.destroyed))) 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);
+	}
+
+	if (isChildProcess(stream)) stream.on('exit', onexit);
+
+	stream.on('end', onend);
+	stream.on('finish', onfinish);
+	if (opts.error !== false) stream.on('error', onerror);
+	stream.on('close', onclose);
+
+	return function() {
+		cancelled = true;
+		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);
+	};
 };
 
+module.exports = eos;
+
 
 /***/ }),
-/* 365 */
+
+/***/ "../../node_modules/error-ex/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|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}|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']
-]);
+var util = __webpack_require__("util");
+var isArrayish = __webpack_require__("../../node_modules/is-arrayish/index.js");
 
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
+var errorEx = function errorEx(name, properties) {
+	if (!name || name.constructor !== String) {
+		properties = name || {};
+		name = Error.name;
 	}
 
-	return ESCAPES.get(c) || c;
-}
+	var errorExError = function ErrorEXError(message) {
+		if (!this) {
+			return new ErrorEXError(message);
+		}
 
-function parseArguments(name, args) {
-	const results = [];
-	const chunks = args.trim().split(/\s*,\s*/g);
-	let matches;
+		message = message instanceof Error
+			? message.message
+			: (message || this.message);
 
-	for (const chunk of chunks) {
-		if (!isNaN(chunk)) {
-			results.push(Number(chunk));
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
+		Error.call(this, message);
+		Error.captureStackTrace(this, errorExError);
 
-	return results;
-}
+		this.name = name;
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+		Object.defineProperty(this, 'message', {
+			configurable: true,
+			enumerable: false,
+			get: function () {
+				var newMessage = message.split(/\r?\n/g);
 
-	const results = [];
-	let matches;
+				for (var key in properties) {
+					if (!properties.hasOwnProperty(key)) {
+						continue;
+					}
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+					var modifier = properties[key];
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+					if ('message' in modifier) {
+						newMessage = modifier.message(this[key], newMessage) || newMessage;
+						if (!isArrayish(newMessage)) {
+							newMessage = [newMessage];
+						}
+					}
+				}
 
-	return results;
-}
+				return newMessage.join('\n');
+			},
+			set: function (v) {
+				message = v;
+			}
+		});
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
+		var stackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
+		var stackGetter = stackDescriptor.get;
+		var stackValue = stackDescriptor.value;
+		delete stackDescriptor.value;
+		delete stackDescriptor.writable;
 
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
+		stackDescriptor.get = function () {
+			var stack = (stackGetter)
+				? stackGetter.call(this).split(/\r?\n+/g)
+				: stackValue.split(/\r?\n+/g);
 
-	let current = chalk;
-	for (const styleName of Object.keys(enabled)) {
-		if (Array.isArray(enabled[styleName])) {
-			if (!(styleName in current)) {
-				throw new Error(`Unknown Chalk style: ${styleName}`);
-			}
+			// starting in Node 7, the stack builder caches the message.
+			// just replace it.
+			stack[0] = this.name + ': ' + this.message;
 
-			if (enabled[styleName].length > 0) {
-				current = current[styleName].apply(current, enabled[styleName]);
-			} else {
-				current = current[styleName];
+			var lineCount = 1;
+			for (var key in properties) {
+				if (!properties.hasOwnProperty(key)) {
+					continue;
+				}
+
+				var modifier = properties[key];
+
+				if ('line' in modifier) {
+					var line = modifier.line(this[key]);
+					if (line) {
+						stack.splice(lineCount++, 0, '    ' + line);
+					}
+				}
+
+				if ('stack' in modifier) {
+					modifier.stack(this[key], stack);
+				}
 			}
-		}
+
+			return stack.join('\n');
+		};
+
+		Object.defineProperty(this, 'stack', stackDescriptor);
+	};
+
+	if (Object.setPrototypeOf) {
+		Object.setPrototypeOf(errorExError.prototype, Error.prototype);
+		Object.setPrototypeOf(errorExError, Error);
+	} else {
+		util.inherits(errorExError, Error);
 	}
 
-	return current;
-}
+	return errorExError;
+};
 
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+errorEx.append = function (str, def) {
+	return {
+		message: function (v, message) {
+			v = v || def;
 
-	// eslint-disable-next-line max-params
-	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
-		if (escapeChar) {
-			chunk.push(unescape(escapeChar));
-		} else if (style) {
-			const str = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
+			if (v) {
+				message[0] += ' ' + str.replace('%s', v.toString());
 			}
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(chr);
+			return message;
 		}
-	});
+	};
+};
 
-	chunks.push(chunk.join(''));
+errorEx.line = function (str, def) {
+	return {
+		line: function (v) {
+			v = v || def;
 
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
-	}
+			if (v) {
+				return str.replace('%s', v.toString());
+			}
 
-	return chunks.join('');
+			return null;
+		}
+	};
 };
 
+module.exports = errorEx;
 
-/***/ }),
-/* 366 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = normalize
 
-var fixer = __webpack_require__(367)
-normalize.fixer = fixer
+/***/ }),
 
-var makeWarning = __webpack_require__(395)
+/***/ "../../node_modules/escape-string-regexp/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var fieldsToFix = ['name','version','description','repository','modules','scripts'
-                  ,'files','bin','man','bugs','keywords','readme','homepage','license']
-var otherThingsToFix = ['dependencies','people', 'typos']
+"use strict";
 
-var thingsToFix = fieldsToFix.map(function(fieldName) {
-  return ucFirst(fieldName) + "Field"
-})
-// two ways to do this in CoffeeScript on only one line, sub-70 chars:
-// thingsToFix = fieldsToFix.map (name) -> ucFirst(name) + "Field"
-// thingsToFix = (ucFirst(name) + "Field" for name in fieldsToFix)
-thingsToFix = thingsToFix.concat(otherThingsToFix)
 
-function normalize (data, warn, strict) {
-  if(warn === true) warn = null, strict = true
-  if(!strict) strict = false
-  if(!warn || data.private) warn = function(msg) { /* noop */ }
+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
 
-  if (data.scripts &&
-      data.scripts.install === "node-gyp rebuild" &&
-      !data.scripts.preinstall) {
-    data.gypfile = true
-  }
-  fixer.warn = function() { warn(makeWarning.apply(null, arguments)) }
-  thingsToFix.forEach(function(thingName) {
-    fixer["fix" + ucFirst(thingName)](data, strict)
-  })
-  data._id = data.name + "@" + data.version
-}
+module.exports = function (str) {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-function ucFirst (string) {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
+	return str.replace(matchOperatorsRe, '\\$&');
+};
 
 
 /***/ }),
-/* 367 */
+
+/***/ "../../node_modules/execa/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var semver = __webpack_require__(368)
-var validateLicense = __webpack_require__(369);
-var hostedGitInfo = __webpack_require__(374)
-var isBuiltinModule = __webpack_require__(377).isCore
-var depTypes = ["dependencies","devDependencies","optionalDependencies"]
-var extractDescription = __webpack_require__(393)
-var url = __webpack_require__(203)
-var typos = __webpack_require__(394)
+"use strict";
 
-var fixer = module.exports = {
-  // default warning function
-  warn: function() {},
+const path = __webpack_require__("path");
+const childProcess = __webpack_require__("child_process");
+const crossSpawn = __webpack_require__("../../node_modules/cross-spawn/index.js");
+const stripFinalNewline = __webpack_require__("../../node_modules/strip-final-newline/index.js");
+const npmRunPath = __webpack_require__("../../node_modules/npm-run-path/index.js");
+const onetime = __webpack_require__("../../node_modules/onetime/index.js");
+const makeError = __webpack_require__("../../node_modules/execa/lib/error.js");
+const normalizeStdio = __webpack_require__("../../node_modules/execa/lib/stdio.js");
+const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__("../../node_modules/execa/lib/kill.js");
+const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__("../../node_modules/execa/lib/stream.js");
+const {mergePromise, getSpawnedPromise} = __webpack_require__("../../node_modules/execa/lib/promise.js");
+const {joinCommand, parseCommand} = __webpack_require__("../../node_modules/execa/lib/command.js");
 
-  fixRepositoryField: function(data) {
-    if (data.repositories) {
-      this.warn("repositories");
-      data.repository = data.repositories[0]
-    }
-    if (!data.repository) return this.warn("missingRepository")
-    if (typeof data.repository === "string") {
-      data.repository = {
-        type: "git",
-        url: data.repository
-      }
-    }
-    var r = data.repository.url || ""
-    if (r) {
-      var hosted = hostedGitInfo.fromUrl(r)
-      if (hosted) {
-        r = data.repository.url
-          = hosted.getDefaultRepresentation() == "shortcut" ? hosted.https() : hosted.toString()
-      }
-    }
+const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
 
-    if (r.match(/github.com\/[^\/]+\/[^\/]+\.git\.git$/)) {
-      this.warn("brokenGitUrl", r)
-    }
-  }
+const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
+	const env = extendEnv ? {...process.env, ...envOption} : envOption;
 
-, fixTypos: function(data) {
-    Object.keys(typos.topLevel).forEach(function (d) {
-      if (data.hasOwnProperty(d)) {
-        this.warn("typo", d, typos.topLevel[d])
-      }
-    }, this)
-  }
+	if (preferLocal) {
+		return npmRunPath.env({env, cwd: localDir, execPath});
+	}
 
-, fixScriptsField: function(data) {
-    if (!data.scripts) return
-    if (typeof data.scripts !== "object") {
-      this.warn("nonObjectScripts")
-      delete data.scripts
-      return
-    }
-    Object.keys(data.scripts).forEach(function (k) {
-      if (typeof data.scripts[k] !== "string") {
-        this.warn("nonStringScript")
-        delete data.scripts[k]
-      } else if (typos.script[k] && !data.scripts[typos.script[k]]) {
-        this.warn("typo", k, typos.script[k], "scripts")
-      }
-    }, this)
-  }
+	return env;
+};
 
-, fixFilesField: function(data) {
-    var files = data.files
-    if (files && !Array.isArray(files)) {
-      this.warn("nonArrayFiles")
-      delete data.files
-    } else if (data.files) {
-      data.files = data.files.filter(function(file) {
-        if (!file || typeof file !== "string") {
-          this.warn("invalidFilename", file)
-          return false
-        } else {
-          return true
-        }
-      }, this)
-    }
-  }
+const handleArguments = (file, args, options = {}) => {
+	const parsed = crossSpawn._parse(file, args, options);
+	file = parsed.command;
+	args = parsed.args;
+	options = parsed.options;
 
-, fixBinField: function(data) {
-    if (!data.bin) return;
-    if (typeof data.bin === "string") {
-      var b = {}
-      var match
-      if (match = data.name.match(/^@[^/]+[/](.*)$/)) {
-        b[match[1]] = data.bin
-      } else {
-        b[data.name] = data.bin
-      }
-      data.bin = b
-    }
-  }
-
-, fixManField: function(data) {
-    if (!data.man) return;
-    if (typeof data.man === "string") {
-      data.man = [ data.man ]
-    }
-  }
-, fixBundleDependenciesField: function(data) {
-    var bdd = "bundledDependencies"
-    var bd = "bundleDependencies"
-    if (data[bdd] && !data[bd]) {
-      data[bd] = data[bdd]
-      delete data[bdd]
-    }
-    if (data[bd] && !Array.isArray(data[bd])) {
-      this.warn("nonArrayBundleDependencies")
-      delete data[bd]
-    } else if (data[bd]) {
-      data[bd] = data[bd].filter(function(bd) {
-        if (!bd || typeof bd !== 'string') {
-          this.warn("nonStringBundleDependency", bd)
-          return false
-        } else {
-          if (!data.dependencies) {
-            data.dependencies = {}
-          }
-          if (!data.dependencies.hasOwnProperty(bd)) {
-            this.warn("nonDependencyBundleDependency", bd)
-            data.dependencies[bd] = "*"
-          }
-          return true
-        }
-      }, this)
-    }
-  }
-
-, fixDependencies: function(data, strict) {
-    var loose = !strict
-    objectifyDeps(data, this.warn)
-    addOptionalDepsToDeps(data, this.warn)
-    this.fixBundleDependenciesField(data)
+	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
+	};
 
-    ;['dependencies','devDependencies'].forEach(function(deps) {
-      if (!(deps in data)) return
-      if (!data[deps] || typeof data[deps] !== "object") {
-        this.warn("nonObjectDependencies", deps)
-        delete data[deps]
-        return
-      }
-      Object.keys(data[deps]).forEach(function (d) {
-        var r = data[deps][d]
-        if (typeof r !== 'string') {
-          this.warn("nonStringDependency", d, JSON.stringify(r))
-          delete data[deps][d]
-        }
-        var hosted = hostedGitInfo.fromUrl(data[deps][d])
-        if (hosted) data[deps][d] = hosted.toString()
-      }, this)
-    }, this)
-  }
+	options.env = getEnv(options);
 
-, fixModulesField: function (data) {
-    if (data.modules) {
-      this.warn("deprecatedModules")
-      delete data.modules
-    }
-  }
+	options.stdio = normalizeStdio(options);
 
-, fixKeywordsField: function (data) {
-    if (typeof data.keywords === "string") {
-      data.keywords = data.keywords.split(/,\s+/)
-    }
-    if (data.keywords && !Array.isArray(data.keywords)) {
-      delete data.keywords
-      this.warn("nonArrayKeywords")
-    } else if (data.keywords) {
-      data.keywords = data.keywords.filter(function(kw) {
-        if (typeof kw !== "string" || !kw) {
-          this.warn("nonStringKeyword");
-          return false
-        } else {
-          return true
-        }
-      }, this)
-    }
-  }
+	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
+		// #116
+		args.unshift('/q');
+	}
 
-, fixVersionField: function(data, strict) {
-    // allow "loose" semver 1.0 versions in non-strict mode
-    // enforce strict semver 2.0 compliance in strict mode
-    var loose = !strict
-    if (!data.version) {
-      data.version = ""
-      return true
-    }
-    if (!semver.valid(data.version, loose)) {
-      throw new Error('Invalid version: "'+ data.version + '"')
-    }
-    data.version = semver.clean(data.version, loose)
-    return true
-  }
+	return {file, args, options, parsed};
+};
 
-, fixPeople: function(data) {
-    modifyPeople(data, unParsePerson)
-    modifyPeople(data, parsePerson)
-  }
+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 : '';
+	}
 
-, fixNameField: function(data, options) {
-    if (typeof options === "boolean") options = {strict: options}
-    else if (typeof options === "undefined") options = {}
-    var strict = options.strict
-    if (!data.name && !strict) {
-      data.name = ""
-      return
-    }
-    if (typeof data.name !== "string") {
-      throw new Error("name field must be a string.")
-    }
-    if (!strict)
-      data.name = data.name.trim()
-    ensureValidName(data.name, strict, options.allowLegacyCase)
-    if (isBuiltinModule(data.name))
-      this.warn("conflictingName", data.name)
-  }
+	if (options.stripFinalNewline) {
+		return stripFinalNewline(value);
+	}
 
+	return value;
+};
 
-, fixDescriptionField: function (data) {
-    if (data.description && typeof data.description !== 'string') {
-      this.warn("nonStringDescription")
-      delete data.description
-    }
-    if (data.readme && !data.description)
-      data.description = extractDescription(data.readme)
-      if(data.description === undefined) delete data.description;
-    if (!data.description) this.warn("missingDescription")
-  }
+const execa = (file, args, options) => {
+	const parsed = handleArguments(file, args, options);
+	const command = joinCommand(file, args);
 
-, fixReadmeField: function (data) {
-    if (!data.readme) {
-      this.warn("missingReadme")
-      data.readme = "ERROR: No README data found!"
-    }
-  }
+	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);
+	}
 
-, fixBugsField: function(data) {
-    if (!data.bugs && data.repository && data.repository.url) {
-      var hosted = hostedGitInfo.fromUrl(data.repository.url)
-      if(hosted && hosted.bugs()) {
-        data.bugs = {url: hosted.bugs()}
-      }
-    }
-    else if(data.bugs) {
-      var emailRe = /^.+@.*\..+$/
-      if(typeof data.bugs == "string") {
-        if(emailRe.test(data.bugs))
-          data.bugs = {email:data.bugs}
-        else if(url.parse(data.bugs).protocol)
-          data.bugs = {url: data.bugs}
-        else
-          this.warn("nonEmailUrlBugsString")
-      }
-      else {
-        bugsTypos(data.bugs, this.warn)
-        var oldBugs = data.bugs
-        data.bugs = {}
-        if(oldBugs.url) {
-          if(typeof(oldBugs.url) == "string" && url.parse(oldBugs.url).protocol)
-            data.bugs.url = oldBugs.url
-          else
-            this.warn("nonUrlBugsUrlField")
-        }
-        if(oldBugs.email) {
-          if(typeof(oldBugs.email) == "string" && emailRe.test(oldBugs.email))
-            data.bugs.email = oldBugs.email
-          else
-            this.warn("nonEmailBugsEmailField")
-        }
-      }
-      if(!data.bugs.email && !data.bugs.url) {
-        delete data.bugs
-        this.warn("emptyNormalizedBugs")
-      }
-    }
-  }
+	const spawnedPromise = getSpawnedPromise(spawned);
+	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
+	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
 
-, fixHomepageField: function(data) {
-    if (!data.homepage && data.repository && data.repository.url) {
-      var hosted = hostedGitInfo.fromUrl(data.repository.url)
-      if (hosted && hosted.docs()) data.homepage = hosted.docs()
-    }
-    if (!data.homepage) return
+	const context = {isCanceled: false};
 
-    if(typeof data.homepage !== "string") {
-      this.warn("nonUrlHomepage")
-      return delete data.homepage
-    }
-    if(!url.parse(data.homepage).protocol) {
-      data.homepage = "http://" + data.homepage
-    }
-  }
+	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
+	spawned.cancel = spawnedCancel.bind(null, spawned, context);
 
-, fixLicenseField: function(data) {
-    if (!data.license) {
-      return this.warn("missingLicense")
-    } else{
-      if (
-        typeof(data.license) !== 'string' ||
-        data.license.length < 1 ||
-        data.license.trim() === ''
-      ) {
-        this.warn("invalidLicense")
-      } else {
-        if (!validateLicense(data.license).validForNewPackages)
-          this.warn("invalidLicense")
-      }
-    }
-  }
-}
+	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);
 
-function isValidScopedPackageName(spec) {
-  if (spec.charAt(0) !== '@') return false
+		if (error || exitCode !== 0 || signal !== null) {
+			const returnedError = makeError({
+				error,
+				exitCode,
+				signal,
+				stdout,
+				stderr,
+				all,
+				command,
+				parsed,
+				timedOut,
+				isCanceled: context.isCanceled,
+				killed: spawned.killed
+			});
 
-  var rest = spec.slice(1).split('/')
-  if (rest.length !== 2) return false
+			if (!parsed.options.reject) {
+				return returnedError;
+			}
 
-  return rest[0] && rest[1] &&
-    rest[0] === encodeURIComponent(rest[0]) &&
-    rest[1] === encodeURIComponent(rest[1])
-}
+			throw returnedError;
+		}
 
-function isCorrectlyEncodedName(spec) {
-  return !spec.match(/[\/@\s\+%:]/) &&
-    spec === encodeURIComponent(spec)
-}
+		return {
+			command,
+			exitCode: 0,
+			stdout,
+			stderr,
+			all,
+			failed: false,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		};
+	};
 
-function ensureValidName (name, strict, allowLegacyCase) {
-  if (name.charAt(0) === "." ||
-      !(isValidScopedPackageName(name) || isCorrectlyEncodedName(name)) ||
-      (strict && (!allowLegacyCase) && name !== name.toLowerCase()) ||
-      name.toLowerCase() === "node_modules" ||
-      name.toLowerCase() === "favicon.ico") {
-        throw new Error("Invalid name: " + JSON.stringify(name))
-  }
-}
+	const handlePromiseOnce = onetime(handlePromise);
 
-function modifyPeople (data, fn) {
-  if (data.author) data.author = fn(data.author)
-  ;["maintainers", "contributors"].forEach(function (set) {
-    if (!Array.isArray(data[set])) return;
-    data[set] = data[set].map(fn)
-  })
-  return data
-}
+	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
 
-function unParsePerson (person) {
-  if (typeof person === "string") return person
-  var name = person.name || ""
-  var u = person.url || person.web
-  var url = u ? (" ("+u+")") : ""
-  var e = person.email || person.mail
-  var email = e ? (" <"+e+">") : ""
-  return name+email+url
-}
+	handleInput(spawned, parsed.options.input);
 
-function parsePerson (person) {
-  if (typeof person !== "string") return person
-  var name = person.match(/^([^\(<]+)/)
-  var url = person.match(/\(([^\)]+)\)/)
-  var email = person.match(/<([^>]+)>/)
-  var obj = {}
-  if (name && name[0].trim()) obj.name = name[0].trim()
-  if (email) obj.email = email[1];
-  if (url) obj.url = url[1];
-  return obj
-}
+	spawned.all = makeAllStream(spawned, parsed.options);
 
-function addOptionalDepsToDeps (data, warn) {
-  var o = data.optionalDependencies
-  if (!o) return;
-  var d = data.dependencies || {}
-  Object.keys(o).forEach(function (k) {
-    d[k] = o[k]
-  })
-  data.dependencies = d
-}
+	return mergePromise(spawned, handlePromiseOnce);
+};
 
-function depObjectify (deps, type, warn) {
-  if (!deps) return {}
-  if (typeof deps === "string") {
-    deps = deps.trim().split(/[\n\r\s\t ,]+/)
-  }
-  if (!Array.isArray(deps)) return deps
-  warn("deprecatedArrayDependencies", type)
-  var o = {}
-  deps.filter(function (d) {
-    return typeof d === "string"
-  }).forEach(function(d) {
-    d = d.trim().split(/(:?[@\s><=])/)
-    var dn = d.shift()
-    var dv = d.join("")
-    dv = dv.trim()
-    dv = dv.replace(/^@/, "")
-    o[dn] = dv
-  })
-  return o
-}
+module.exports = execa;
 
-function objectifyDeps (data, warn) {
-  depTypes.forEach(function (type) {
-    if (!data[type]) return;
-    data[type] = depObjectify(data[type], type, warn)
-  })
-}
+module.exports.sync = (file, args, options) => {
+	const parsed = handleArguments(file, args, options);
+	const command = joinCommand(file, args);
 
-function bugsTypos(bugs, warn) {
-  if (!bugs) return
-  Object.keys(bugs).forEach(function (k) {
-    if (typos.bugs[k]) {
-      warn("typo", k, typos.bugs[k], "bugs")
-      bugs[typos.bugs[k]] = bugs[k]
-      delete bugs[k]
-    }
-  })
-}
+	validateInputSync(parsed.options);
 
+	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
+		});
+	}
 
-/***/ }),
-/* 368 */
-/***/ (function(module, exports) {
+	const stdout = handleOutput(parsed.options, result.stdout, result.error);
+	const stderr = handleOutput(parsed.options, result.stderr, result.error);
 
-exports = module.exports = SemVer
+	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
+		});
 
-var debug
-/* istanbul ignore next */
-if (typeof process === 'object' &&
-    process.env &&
-    process.env.NODE_DEBUG &&
-    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
-  debug = function () {
-    var args = Array.prototype.slice.call(arguments, 0)
-    args.unshift('SEMVER')
-    console.log.apply(console, args)
-  }
-} else {
-  debug = function () {}
-}
+		if (!parsed.options.reject) {
+			return error;
+		}
 
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0'
+		throw error;
+	}
 
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
+	return {
+		command,
+		exitCode: 0,
+		stdout,
+		stderr,
+		failed: false,
+		timedOut: false,
+		isCanceled: false,
+		killed: false
+	};
+};
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16
+module.exports.command = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa(file, args, options);
+};
 
-// The actual regexps go on exports.re
-var re = exports.re = []
-var src = exports.src = []
-var R = 0
+module.exports.commandSync = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa.sync(file, args, options);
+};
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
+module.exports.node = (scriptPath, args, options = {}) => {
+	if (args && !Array.isArray(args) && typeof args === 'object') {
+		options = args;
+		args = [];
+	}
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
+	const stdio = normalizeStdio.node(options);
 
-var NUMERICIDENTIFIER = R++
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-var NUMERICIDENTIFIERLOOSE = R++
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
+	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+	return execa(
+		nodePath,
+		[
+			...nodeOptions,
+			scriptPath,
+			...(Array.isArray(args) ? args : [])
+		],
+		{
+			...options,
+			stdin: undefined,
+			stdout: undefined,
+			stderr: undefined,
+			stdio,
+			shell: false
+		}
+	);
+};
 
-var NONNUMERICIDENTIFIER = R++
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+/***/ }),
 
-var MAINVERSION = R++
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')'
+/***/ "../../node_modules/execa/lib/command.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var MAINVERSIONLOOSE = R++
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
+"use strict";
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+const SPACES_REGEXP = / +/g;
 
-var PRERELEASEIDENTIFIER = R++
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')'
+const joinCommand = (file, args = []) => {
+	if (!Array.isArray(args)) {
+		return file;
+	}
 
-var PRERELEASEIDENTIFIERLOOSE = R++
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
+	return [file, ...args].join(' ');
+};
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+// Allow spaces to be escaped by a backslash if not meant as a delimiter
+const handleEscaping = (tokens, token, index) => {
+	if (index === 0) {
+		return [token];
+	}
 
-var PRERELEASE = R++
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
+	const previousToken = tokens[tokens.length - 1];
 
-var PRERELEASELOOSE = R++
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
+	if (previousToken.endsWith('\\')) {
+		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
+	}
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+	return [...tokens, token];
+};
 
-var BUILDIDENTIFIER = R++
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
+// Handle `execa.command()`
+const parseCommand = command => {
+	return command
+		.trim()
+		.split(SPACES_REGEXP)
+		.reduce(handleEscaping, []);
+};
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+module.exports = {
+	joinCommand,
+	parseCommand
+};
 
-var BUILD = R++
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+/***/ }),
 
-// Note that the only major, minor, patch, and pre-release sections of
-// the version string are capturing groups.  The build metadata is not a
-// capturing group, because it should not ever be used in version
-// comparison.
+/***/ "../../node_modules/execa/lib/error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var FULL = R++
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?'
+"use strict";
 
-src[FULL] = '^' + FULLPLAIN + '$'
+const {signalsByName} = __webpack_require__("../../node_modules/human-signals/build/src/main.js");
 
-// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-// common in the npm registry.
-var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
-                 src[PRERELEASELOOSE] + '?' +
-                 src[BUILD] + '?'
+const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
+	if (timedOut) {
+		return `timed out after ${timeout} milliseconds`;
+	}
 
-var LOOSE = R++
-src[LOOSE] = '^' + LOOSEPLAIN + '$'
+	if (isCanceled) {
+		return 'was canceled';
+	}
 
-var GTLT = R++
-src[GTLT] = '((?:<|>)?=?)'
+	if (errorCode !== undefined) {
+		return `failed with ${errorCode}`;
+	}
 
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-var XRANGEIDENTIFIERLOOSE = R++
-src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
-var XRANGEIDENTIFIER = R++
-src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*'
+	if (signal !== undefined) {
+		return `was killed with ${signal} (${signalDescription})`;
+	}
 
-var XRANGEPLAIN = R++
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?'
+	if (exitCode !== undefined) {
+		return `failed with exit code ${exitCode}`;
+	}
 
-var XRANGEPLAINLOOSE = R++
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?'
+	return 'failed';
+};
 
-var XRANGE = R++
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
-var XRANGELOOSE = R++
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
+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;
 
-// Coercion.
-// Extract anything that could conceivably be a part of a valid semver
-var COERCE = R++
-src[COERCE] = '(?:^|[^\\d])' +
-              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:$|[^\\d])'
+	const errorCode = error && error.code;
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++
-src[LONETILDE] = '(?:~>?)'
+	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');
 
-var TILDETRIM = R++
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
+	if (isError) {
+		error.originalMessage = error.message;
+		error.message = message;
+	} else {
+		error = new Error(message);
+	}
 
-var TILDE = R++
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
-var TILDELOOSE = R++
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
+	error.shortMessage = shortMessage;
+	error.command = command;
+	error.exitCode = exitCode;
+	error.signal = signal;
+	error.signalDescription = signalDescription;
+	error.stdout = stdout;
+	error.stderr = stderr;
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++
-src[LONECARET] = '(?:\\^)'
+	if (all !== undefined) {
+		error.all = all;
+	}
 
-var CARETTRIM = R++
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
+	if ('bufferedData' in error) {
+		delete error.bufferedData;
+	}
 
-var CARET = R++
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
-var CARETLOOSE = R++
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
+	error.failed = true;
+	error.timedOut = Boolean(timedOut);
+	error.isCanceled = isCanceled;
+	error.killed = killed && !timedOut;
 
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-var COMPARATORLOOSE = R++
-src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$'
-var COMPARATOR = R++
-src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$'
+	return error;
+};
 
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-var COMPARATORTRIM = R++
-src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
-                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')'
+module.exports = makeError;
 
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
 
-// Something like `1.2.3 - 1.2.4`
-// Note that these all use the loose form, because they'll be
-// checked against either the strict or loose comparator form
-// later.
-var HYPHENRANGE = R++
-src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[XRANGEPLAIN] + ')' +
-                   '\\s*$'
+/***/ }),
 
-var HYPHENRANGELOOSE = R++
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
+/***/ "../../node_modules/execa/lib/kill.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// Star ranges basically just allow anything at all.
-var STAR = R++
-src[STAR] = '(<|>)?=?\\s*\\*'
+"use strict";
 
-// Compile to actual regexp objects.
-// All are flag-free, unless they were created above with a flag.
-for (var i = 0; i < R; i++) {
-  debug(i, src[i])
-  if (!re[i]) {
-    re[i] = new RegExp(src[i])
-  }
-}
+const os = __webpack_require__("os");
+const onExit = __webpack_require__("../../node_modules/signal-exit/index.js");
 
-exports.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
 
-  if (version instanceof SemVer) {
-    return version
-  }
+// 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;
+};
 
-  if (typeof version !== 'string') {
-    return null
-  }
+const setKillTimeout = (kill, signal, options, killResult) => {
+	if (!shouldForceKill(signal, options, killResult)) {
+		return;
+	}
 
-  if (version.length > MAX_LENGTH) {
-    return null
-  }
+	const timeout = getForceKillAfterTimeout(options);
+	const t = setTimeout(() => {
+		kill('SIGKILL');
+	}, timeout);
 
-  var r = options.loose ? re[LOOSE] : re[FULL]
-  if (!r.test(version)) {
-    return null
-  }
+	// 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();
+	}
+};
 
-  try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
-  }
-}
+const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
+	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
+};
 
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
-}
+const isSigterm = signal => {
+	return signal === os.constants.signals.SIGTERM ||
+		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
+};
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
-}
+const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
+	if (forceKillAfterTimeout === true) {
+		return DEFAULT_FORCE_KILL_TIMEOUT;
+	}
 
-exports.SemVer = SemVer
+	if (!Number.isFinite(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
+		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
+	}
 
-function SemVer (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
-  if (version instanceof SemVer) {
-    if (version.loose === options.loose) {
-      return version
-    } else {
-      version = version.version
-    }
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version)
-  }
+	return forceKillAfterTimeout;
+};
 
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-  }
+// `childProcess.cancel()`
+const spawnedCancel = (spawned, context) => {
+	const killResult = spawned.kill();
 
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
-  }
+	if (killResult) {
+		context.isCanceled = true;
+	}
+};
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
+const timeoutKill = (spawned, signal, reject) => {
+	spawned.kill(signal);
+	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
+};
 
-  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
+// `timeout` option handling
+const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
+	if (timeout === 0 || timeout === undefined) {
+		return spawnedPromise;
+	}
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
-  }
+	if (!Number.isFinite(timeout) || timeout < 0) {
+		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
+	}
 
-  this.raw = version
+	let timeoutId;
+	const timeoutPromise = new Promise((resolve, reject) => {
+		timeoutId = setTimeout(() => {
+			timeoutKill(spawned, killSignal, reject);
+		}, timeout);
+	});
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
+	const safeSpawnedPromise = spawnedPromise.finally(() => {
+		clearTimeout(timeoutId);
+	});
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-    throw new TypeError('Invalid major version')
-  }
+	return Promise.race([timeoutPromise, safeSpawnedPromise]);
+};
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-    throw new TypeError('Invalid minor version')
-  }
+// `cleanup` option handling
+const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
+	if (!cleanup || detached) {
+		return timedPromise;
+	}
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
-  }
+	const removeExitHandler = onExit(() => {
+		spawned.kill();
+	});
 
-  // numberify any prerelease numeric ids
-  if (!m[4]) {
-    this.prerelease = []
-  } else {
-    this.prerelease = m[4].split('.').map(function (id) {
-      if (/^[0-9]+$/.test(id)) {
-        var num = +id
-        if (num >= 0 && num < MAX_SAFE_INTEGER) {
-          return num
-        }
-      }
-      return id
-    })
-  }
+	return timedPromise.finally(() => {
+		removeExitHandler();
+	});
+};
 
-  this.build = m[5] ? m[5].split('.') : []
-  this.format()
-}
+module.exports = {
+	spawnedKill,
+	spawnedCancel,
+	setupTimeout,
+	setExitHandler
+};
 
-SemVer.prototype.format = function () {
-  this.version = this.major + '.' + this.minor + '.' + this.patch
-  if (this.prerelease.length) {
-    this.version += '-' + this.prerelease.join('.')
-  }
-  return this.version
-}
 
-SemVer.prototype.toString = function () {
-  return this.version
-}
+/***/ }),
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+/***/ "../../node_modules/execa/lib/promise.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return this.compareMain(other) || this.comparePre(other)
-}
+"use strict";
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+const nativePromisePrototype = (async () => {})().constructor.prototype;
+const descriptors = ['then', 'catch', 'finally'].map(property => [
+	property,
+	Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)
+]);
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+// 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);
 
-  // NOT having a prerelease is > having one
-  if (this.prerelease.length && !other.prerelease.length) {
-    return -1
-  } else if (!this.prerelease.length && other.prerelease.length) {
-    return 1
-  } else if (!this.prerelease.length && !other.prerelease.length) {
-    return 0
-  }
+		Reflect.defineProperty(spawned, property, {...descriptor, value});
+	}
 
-  var i = 0
-  do {
-    var a = this.prerelease[i]
-    var b = other.prerelease[i]
-    debug('prerelease compare', i, a, b)
-    if (a === undefined && b === undefined) {
-      return 0
-    } else if (b === undefined) {
-      return 1
-    } else if (a === undefined) {
-      return -1
-    } else if (a === b) {
-      continue
-    } else {
-      return compareIdentifiers(a, b)
-    }
-  } while (++i)
-}
+	return spawned;
+};
 
-// preminor will bump the version up to the next minor release, and immediately
-// down to pre-release. premajor and prepatch work the same way.
-SemVer.prototype.inc = function (release, identifier) {
-  switch (release) {
-    case 'premajor':
-      this.prerelease.length = 0
-      this.patch = 0
-      this.minor = 0
-      this.major++
-      this.inc('pre', identifier)
-      break
-    case 'preminor':
-      this.prerelease.length = 0
-      this.patch = 0
-      this.minor++
-      this.inc('pre', identifier)
-      break
-    case 'prepatch':
-      // If this is already a prerelease, it will bump to the next version
-      // drop any prereleases that might already exist, since they are not
-      // relevant at this point.
-      this.prerelease.length = 0
-      this.inc('patch', identifier)
-      this.inc('pre', identifier)
-      break
-    // If the input is a non-prerelease version, this acts the same as
-    // prepatch.
-    case 'prerelease':
-      if (this.prerelease.length === 0) {
-        this.inc('patch', identifier)
-      }
-      this.inc('pre', identifier)
-      break
+// Use promises instead of `child_process` events
+const getSpawnedPromise = spawned => {
+	return new Promise((resolve, reject) => {
+		spawned.on('exit', (exitCode, signal) => {
+			resolve({exitCode, signal});
+		});
 
-    case 'major':
-      // If this is a pre-major version, bump up to the same major version.
-      // Otherwise increment major.
-      // 1.0.0-5 bumps to 1.0.0
-      // 1.1.0 bumps to 2.0.0
-      if (this.minor !== 0 ||
-          this.patch !== 0 ||
-          this.prerelease.length === 0) {
-        this.major++
-      }
-      this.minor = 0
-      this.patch = 0
-      this.prerelease = []
-      break
-    case 'minor':
-      // If this is a pre-minor version, bump up to the same minor version.
-      // Otherwise increment minor.
-      // 1.2.0-5 bumps to 1.2.0
-      // 1.2.1 bumps to 1.3.0
-      if (this.patch !== 0 || this.prerelease.length === 0) {
-        this.minor++
-      }
-      this.patch = 0
-      this.prerelease = []
-      break
-    case 'patch':
-      // If this is not a pre-release version, it will increment the patch.
-      // If it is a pre-release it will bump up to the same patch version.
-      // 1.2.0-5 patches to 1.2.0
-      // 1.2.0 patches to 1.2.1
-      if (this.prerelease.length === 0) {
-        this.patch++
-      }
-      this.prerelease = []
-      break
-    // This probably shouldn't be used publicly.
-    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
-    case 'pre':
-      if (this.prerelease.length === 0) {
-        this.prerelease = [0]
-      } else {
-        var i = this.prerelease.length
-        while (--i >= 0) {
-          if (typeof this.prerelease[i] === 'number') {
-            this.prerelease[i]++
-            i = -2
-          }
-        }
-        if (i === -1) {
-          // didn't increment anything
-          this.prerelease.push(0)
-        }
-      }
-      if (identifier) {
-        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-        if (this.prerelease[0] === identifier) {
-          if (isNaN(this.prerelease[1])) {
-            this.prerelease = [identifier, 0]
-          }
-        } else {
-          this.prerelease = [identifier, 0]
-        }
-      }
-      break
+		spawned.on('error', error => {
+			reject(error);
+		});
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
-  }
-  this.format()
-  this.raw = this.version
-  return this
-}
+		if (spawned.stdin) {
+			spawned.stdin.on('error', error => {
+				reject(error);
+			});
+		}
+	});
+};
 
-exports.inc = inc
-function inc (version, release, loose, identifier) {
-  if (typeof (loose) === 'string') {
-    identifier = loose
-    loose = undefined
-  }
+module.exports = {
+	mergePromise,
+	getSpawnedPromise
+};
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version
-  } catch (er) {
-    return null
-  }
-}
 
-exports.diff = diff
-function diff (version1, version2) {
-  if (eq(version1, version2)) {
-    return null
-  } else {
-    var v1 = parse(version1)
-    var v2 = parse(version2)
-    var prefix = ''
-    if (v1.prerelease.length || v2.prerelease.length) {
-      prefix = 'pre'
-      var defaultResult = 'prerelease'
-    }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return prefix + key
-        }
-      }
-    }
-    return defaultResult // may be undefined
-  }
-}
 
-exports.compareIdentifiers = compareIdentifiers
+/***/ }),
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+/***/ "../../node_modules/execa/lib/stdio.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
-  }
+"use strict";
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
-}
+const aliases = ['stdin', 'stdout', 'stderr'];
 
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
-}
+const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
 
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
-}
+const normalizeStdio = opts => {
+	if (!opts) {
+		return;
+	}
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
-}
+	const {stdio} = opts;
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
-}
+	if (stdio === undefined) {
+		return aliases.map(alias => opts[alias]);
+	}
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
-}
+	if (hasAlias(opts)) {
+		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
+	}
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
-}
+	if (typeof stdio === 'string') {
+		return stdio;
+	}
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
-}
+	if (!Array.isArray(stdio)) {
+		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	}
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compare(a, b, loose)
-  })
-}
+	const length = Math.max(stdio.length, aliases.length);
+	return Array.from({length}, (value, index) => stdio[index]);
+};
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.rcompare(a, b, loose)
-  })
-}
+module.exports = normalizeStdio;
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
-}
+// `ipc` is pushed unless it is already present
+module.exports.node = opts => {
+	const stdio = normalizeStdio(opts);
 
-exports.lt = lt
-function lt (a, b, loose) {
-  return compare(a, b, loose) < 0
-}
+	if (stdio === 'ipc') {
+		return 'ipc';
+	}
 
-exports.eq = eq
-function eq (a, b, loose) {
-  return compare(a, b, loose) === 0
-}
+	if (stdio === undefined || typeof stdio === 'string') {
+		return [stdio, stdio, stdio, 'ipc'];
+	}
 
-exports.neq = neq
-function neq (a, b, loose) {
-  return compare(a, b, loose) !== 0
-}
+	if (stdio.includes('ipc')) {
+		return stdio;
+	}
 
-exports.gte = gte
-function gte (a, b, loose) {
-  return compare(a, b, loose) >= 0
-}
+	return [...stdio, 'ipc'];
+};
 
-exports.lte = lte
-function lte (a, b, loose) {
-  return compare(a, b, loose) <= 0
-}
 
-exports.cmp = cmp
-function cmp (a, op, b, loose) {
-  switch (op) {
-    case '===':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a === b
+/***/ }),
 
-    case '!==':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a !== b
+/***/ "../../node_modules/execa/lib/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+"use strict";
 
-    case '!=':
-      return neq(a, b, loose)
+const isStream = __webpack_require__("../../node_modules/is-stream/index.js");
+const getStream = __webpack_require__("../../node_modules/get-stream/index.js");
+const mergeStream = __webpack_require__("../../node_modules/merge-stream/index.js");
 
-    case '>':
-      return gt(a, b, loose)
+// `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;
+	}
 
-    case '>=':
-      return gte(a, b, loose)
+	if (isStream(input)) {
+		input.pipe(spawned.stdin);
+	} else {
+		spawned.stdin.end(input);
+	}
+};
 
-    case '<':
-      return lt(a, b, loose)
+// `all` interleaves `stdout` and `stderr`
+const makeAllStream = (spawned, {all}) => {
+	if (!all || (!spawned.stdout && !spawned.stderr)) {
+		return;
+	}
 
-    case '<=':
-      return lte(a, b, loose)
+	const mixed = mergeStream();
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
-  }
-}
+	if (spawned.stdout) {
+		mixed.add(spawned.stdout);
+	}
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+	if (spawned.stderr) {
+		mixed.add(spawned.stderr);
+	}
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
-    }
-  }
+	return mixed;
+};
 
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
-  }
+// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
+const getBufferedData = async (stream, streamPromise) => {
+	if (!stream) {
+		return;
+	}
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
+	stream.destroy();
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
-  }
+	try {
+		return await streamPromise;
+	} catch (error) {
+		return error.bufferedData;
+	}
+};
 
-  debug('comp', this)
-}
+const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
+	if (!stream || !buffer) {
+		return;
+	}
 
-var ANY = {}
-Comparator.prototype.parse = function (comp) {
-  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var m = comp.match(r)
+	if (encoding) {
+		return getStream(stream, {encoding, maxBuffer});
+	}
 
-  if (!m) {
-    throw new TypeError('Invalid comparator: ' + comp)
-  }
+	return getStream.buffer(stream, {maxBuffer});
+};
 
-  this.operator = m[1]
-  if (this.operator === '=') {
-    this.operator = ''
-  }
+// 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});
 
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2]) {
-    this.semver = ANY
-  } else {
-    this.semver = new SemVer(m[2], this.options.loose)
-  }
-}
+	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)
+		]);
+	}
+};
 
-Comparator.prototype.toString = function () {
-  return this.value
-}
+const validateInputSync = ({input}) => {
+	if (isStream(input)) {
+		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	}
+};
 
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
+module.exports = {
+	handleInput,
+	makeAllStream,
+	getSpawnedResult,
+	validateInputSync
+};
 
-  if (this.semver === ANY) {
-    return true
-  }
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
 
-  return cmp(version, this.operator, this.semver, this.options)
-}
+/***/ }),
 
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
-  }
+/***/ "../../node_modules/expand-brackets/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+"use strict";
 
-  var rangeTmp
 
-  if (this.operator === '') {
-    rangeTmp = new Range(comp.value, options)
-    return satisfies(this.value, rangeTmp, options)
-  } else if (comp.operator === '') {
-    rangeTmp = new Range(this.value, options)
-    return satisfies(comp.semver, rangeTmp, options)
-  }
+/**
+ * Local dependencies
+ */
 
-  var sameDirectionIncreasing =
-    (this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '>=' || comp.operator === '>')
-  var sameDirectionDecreasing =
-    (this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '<=' || comp.operator === '<')
-  var sameSemVer = this.semver.version === comp.semver.version
-  var differentDirectionsInclusive =
-    (this.operator === '>=' || this.operator === '<=') &&
-    (comp.operator === '>=' || comp.operator === '<=')
-  var oppositeDirectionsLessThan =
-    cmp(this.semver, '<', comp.semver, options) &&
-    ((this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '<=' || comp.operator === '<'))
-  var oppositeDirectionsGreaterThan =
-    cmp(this.semver, '>', comp.semver, options) &&
-    ((this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '>=' || comp.operator === '>'))
+var compilers = __webpack_require__("../../node_modules/expand-brackets/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/expand-brackets/lib/parsers.js");
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+/**
+ * Module dependencies
+ */
+
+var debug = __webpack_require__("../../node_modules/debug/src/index.js")('expand-brackets');
+var extend = __webpack_require__("../../node_modules/extend-shallow/index.js");
+var Snapdragon = __webpack_require__("../../node_modules/snapdragon/index.js");
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+
+/**
+ * Parses the given POSIX character class `pattern` and returns a
+ * string that can be used for creating regular expressions for matching.
+ *
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {Object}
+ * @api public
+ */
+
+function brackets(pattern, options) {
+  debug('initializing from <%s>', __filename);
+  var res = brackets.create(pattern, options);
+  return res.output;
 }
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+/**
+ * Takes an array of strings and a POSIX character class pattern, and returns a new
+ * array with only the strings that matched the pattern.
+ *
+ * ```js
+ * var brackets = require('expand-brackets');
+ * console.log(brackets.match(['1', 'a', 'ab'], '[[:alpha:]]'));
+ * //=> ['a']
+ *
+ * console.log(brackets.match(['1', 'a', 'ab'], '[[:alpha:]]+'));
+ * //=> ['a', 'ab']
+ * ```
+ * @param {Array} `arr` Array of strings to match
+ * @param {String} `pattern` POSIX character class pattern(s)
+ * @param {Object} `options`
+ * @return {Array}
+ * @api public
+ */
+
+brackets.match = function(arr, pattern, options) {
+  arr = [].concat(arr);
+  var opts = extend({}, options);
+  var isMatch = brackets.matcher(pattern, opts);
+  var len = arr.length;
+  var idx = -1;
+  var res = [];
+
+  while (++idx < len) {
+    var ele = arr[idx];
+    if (isMatch(ele)) {
+      res.push(ele);
     }
   }
 
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
+  if (res.length === 0) {
+    if (opts.failglob === true) {
+      throw new Error('no matches found for "' + pattern + '"');
     }
-  }
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, options)
+    if (opts.nonull === true || opts.nullglob === true) {
+      return [pattern.split('\\').join('')];
+    }
   }
+  return res;
+};
 
-  if (!(this instanceof Range)) {
-    return new Range(range, options)
-  }
+/**
+ * Returns true if the specified `string` matches the given
+ * brackets `pattern`.
+ *
+ * ```js
+ * var brackets = require('expand-brackets');
+ *
+ * console.log(brackets.isMatch('a.a', '[[:alpha:]].[[:alpha:]]'));
+ * //=> true
+ * console.log(brackets.isMatch('1.2', '[[:alpha:]].[[:alpha:]]'));
+ * //=> false
+ * ```
+ * @param {String} `string` String to match
+ * @param {String} `pattern` Poxis pattern
+ * @param {String} `options`
+ * @return {Boolean}
+ * @api public
+ */
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
+brackets.isMatch = function(str, pattern, options) {
+  return brackets.matcher(pattern, options)(str);
+};
 
-  // First, split based on boolean or ||
-  this.raw = range
-  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
-    return this.parseRange(range.trim())
-  }, this).filter(function (c) {
-    // throw out any that are not relevant for whatever reason
-    return c.length
-  })
+/**
+ * Takes a POSIX character class pattern and returns a matcher function. The returned
+ * function takes the string to match as its only argument.
+ *
+ * ```js
+ * var brackets = require('expand-brackets');
+ * var isMatch = brackets.matcher('[[:lower:]].[[:upper:]]');
+ *
+ * console.log(isMatch('a.a'));
+ * //=> false
+ * console.log(isMatch('a.A'));
+ * //=> true
+ * ```
+ * @param {String} `pattern` Poxis pattern
+ * @param {String} `options`
+ * @return {Boolean}
+ * @api public
+ */
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range)
-  }
+brackets.matcher = function(pattern, options) {
+  var re = brackets.makeRe(pattern, options);
+  return function(str) {
+    return re.test(str);
+  };
+};
 
-  this.format()
-}
+/**
+ * Create a regular expression from the given `pattern`.
+ *
+ * ```js
+ * var brackets = require('expand-brackets');
+ * var re = brackets.makeRe('[[:alpha:]]');
+ * console.log(re);
+ * //=> /^(?:[a-zA-Z])$/
+ * ```
+ * @param {String} `pattern` The pattern to convert to regex.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
+ */
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
-}
+brackets.makeRe = function(pattern, options) {
+  var res = brackets.create(pattern, options);
+  var opts = extend({strictErrors: false}, options);
+  return toRegex(res.output, opts);
+};
 
-Range.prototype.toString = function () {
-  return this.range
-}
+/**
+ * Parses the given POSIX character class `pattern` and returns an object
+ * with the compiled `output` and optional source `map`.
+ *
+ * ```js
+ * var brackets = require('expand-brackets');
+ * console.log(brackets('[[:alpha:]]'));
+ * // { options: { source: 'string' },
+ * //   input: '[[:alpha:]]',
+ * //   state: {},
+ * //   compilers:
+ * //    { eos: [Function],
+ * //      noop: [Function],
+ * //      bos: [Function],
+ * //      not: [Function],
+ * //      escape: [Function],
+ * //      text: [Function],
+ * //      posix: [Function],
+ * //      bracket: [Function],
+ * //      'bracket.open': [Function],
+ * //      'bracket.inner': [Function],
+ * //      'bracket.literal': [Function],
+ * //      'bracket.close': [Function] },
+ * //   output: '[a-zA-Z]',
+ * //   ast:
+ * //    { type: 'root',
+ * //      errors: [],
+ * //      nodes: [ [Object], [Object], [Object] ] },
+ * //   parsingErrors: [] }
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {Object}
+ * @api public
+ */
 
-Range.prototype.parseRange = function (range) {
-  var loose = this.options.loose
-  range = range.trim()
-  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE]
-  range = range.replace(hr, hyphenReplace)
-  debug('hyphen replace', range)
-  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace)
-  debug('comparator trim', range, re[COMPARATORTRIM])
+brackets.create = function(pattern, options) {
+  var snapdragon = (options && options.snapdragon) || new Snapdragon(options);
+  compilers(snapdragon);
+  parsers(snapdragon);
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace)
+  var ast = snapdragon.parse(pattern, options);
+  ast.input = pattern;
+  var res = snapdragon.compile(ast, options);
+  res.input = pattern;
+  return res;
+};
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace)
+/**
+ * Expose `brackets` constructor, parsers and compilers
+ */
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+brackets.compilers = compilers;
+brackets.parsers = parsers;
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+/**
+ * Expose `brackets`
+ * @type {Function}
+ */
 
-  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var set = range.split(' ').map(function (comp) {
-    return parseComparator(comp, this.options)
-  }, this).join(' ').split(/\s+/)
-  if (this.options.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function (comp) {
-      return !!comp.match(compRe)
-    })
-  }
-  set = set.map(function (comp) {
-    return new Comparator(comp, this.options)
-  }, this)
+module.exports = brackets;
 
-  return set
-}
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
-  }
+/***/ }),
 
-  return this.set.some(function (thisComparators) {
-    return thisComparators.every(function (thisComparator) {
-      return range.set.some(function (rangeComparators) {
-        return rangeComparators.every(function (rangeComparator) {
-          return thisComparator.intersects(rangeComparator, options)
-        })
-      })
-    })
-  })
-}
+/***/ "../../node_modules/expand-brackets/lib/compilers.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators
-function toComparators (range, options) {
-  return new Range(range, options).set.map(function (comp) {
-    return comp.map(function (c) {
-      return c.value
-    }).join(' ').trim().split(' ')
-  })
-}
+"use strict";
 
-// comprised of xranges, tildes, stars, and gtlt's at this point.
-// already replaced the hyphen ranges
-// turn into a set of JUST comparators.
-function parseComparator (comp, options) {
-  debug('comp', comp, options)
-  comp = replaceCarets(comp, options)
-  debug('caret', comp)
-  comp = replaceTildes(comp, options)
-  debug('tildes', comp)
-  comp = replaceXRanges(comp, options)
-  debug('xrange', comp)
-  comp = replaceStars(comp, options)
-  debug('stars', comp)
-  return comp
-}
 
-function isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+var posix = __webpack_require__("../../node_modules/posix-character-classes/index.js");
 
-// ~, ~> --> * (any, kinda silly)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-function replaceTildes (comp, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceTilde(comp, options)
-  }).join(' ')
-}
+module.exports = function(brackets) {
+  brackets.compiler
 
-function replaceTilde (comp, options) {
-  var r = options.loose ? re[TILDELOOSE] : re[TILDE]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr)
-    var ret
+    /**
+     * Escaped characters
+     */
 
-    if (isX(M)) {
-      ret = ''
-    } else if (isX(m)) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (isX(p)) {
-      // ~1.2 == >=1.2.0 <1.3.0
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-    } else if (pr) {
-      debug('replaceTilde pr', pr)
-      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-            ' <' + M + '.' + (+m + 1) + '.0'
-    } else {
-      // ~1.2.3 == >=1.2.3 <1.3.0
-      ret = '>=' + M + '.' + m + '.' + p +
-            ' <' + M + '.' + (+m + 1) + '.0'
-    }
+    .set('escape', function(node) {
+      return this.emit('\\' + node.val.replace(/^\\/, ''), node);
+    })
 
-    debug('tilde return', ret)
-    return ret
-  })
-}
+    /**
+     * Text
+     */
 
-// ^ --> * (any, kinda silly)
-// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2.0 --> >=1.2.0 <2.0.0
-function replaceCarets (comp, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceCaret(comp, options)
-  }).join(' ')
-}
+    .set('text', function(node) {
+      return this.emit(node.val.replace(/([{}])/g, '\\$1'), node);
+    })
 
-function replaceCaret (comp, options) {
-  debug('caret', comp, options)
-  var r = options.loose ? re[CARETLOOSE] : re[CARET]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr)
-    var ret
+    /**
+     * POSIX character classes
+     */
 
-    if (isX(M)) {
-      ret = ''
-    } else if (isX(m)) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (isX(p)) {
-      if (M === '0') {
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-      } else {
-        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'
-      }
-    } else if (pr) {
-      debug('replaceCaret pr', pr)
-      if (M === '0') {
-        if (m === '0') {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-                ' <' + M + '.' + m + '.' + (+p + 1)
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-                ' <' + M + '.' + (+m + 1) + '.0'
-        }
-      } else {
-        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-              ' <' + (+M + 1) + '.0.0'
-      }
-    } else {
-      debug('no pr')
-      if (M === '0') {
-        if (m === '0') {
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + m + '.' + (+p + 1)
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + (+m + 1) + '.0'
-        }
-      } else {
-        ret = '>=' + M + '.' + m + '.' + p +
-              ' <' + (+M + 1) + '.0.0'
+    .set('posix', function(node) {
+      if (node.val === '[::]') {
+        return this.emit('\\[::\\]', node);
       }
-    }
 
-    debug('caret return', ret)
-    return ret
-  })
-}
-
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
-}
+      var val = posix[node.inner];
+      if (typeof val === 'undefined') {
+        val = '[' + node.inner + ']';
+      }
+      return this.emit(val, node);
+    })
 
-function replaceXRange (comp, options) {
-  comp = comp.trim()
-  var r = options.loose ? re[XRANGELOOSE] : re[XRANGE]
-  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
-    debug('xRange', comp, ret, gtlt, M, m, p, pr)
-    var xM = isX(M)
-    var xm = xM || isX(m)
-    var xp = xm || isX(p)
-    var anyX = xp
+    /**
+     * Non-posix brackets
+     */
 
-    if (gtlt === '=' && anyX) {
-      gtlt = ''
-    }
+    .set('bracket', function(node) {
+      return this.mapVisit(node.nodes);
+    })
+    .set('bracket.open', function(node) {
+      return this.emit(node.val, node);
+    })
+    .set('bracket.inner', function(node) {
+      var inner = node.val;
 
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0'
-      } else {
-        // nothing is forbidden
-        ret = '*'
+      if (inner === '[' || inner === ']') {
+        return this.emit('\\' + node.val, node);
       }
-    } else if (gtlt && anyX) {
-      // we know patch is an x, because we have any x at all.
-      // replace X with 0
-      if (xm) {
-        m = 0
+      if (inner === '^]') {
+        return this.emit('^\\]', node);
       }
-      p = 0
-
-      if (gtlt === '>') {
-        // >1 => >=2.0.0
-        // >1.2 => >=1.3.0
-        // >1.2.3 => >= 1.2.4
-        gtlt = '>='
-        if (xm) {
-          M = +M + 1
-          m = 0
-          p = 0
-        } else {
-          m = +m + 1
-          p = 0
-        }
-      } else if (gtlt === '<=') {
-        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-        gtlt = '<'
-        if (xm) {
-          M = +M + 1
-        } else {
-          m = +m + 1
-        }
+      if (inner === '^') {
+        return this.emit('^', node);
       }
 
-      ret = gtlt + M + '.' + m + '.' + p
-    } else if (xm) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-    }
-
-    debug('xRange return', ret)
+      if (/-/.test(inner) && !/(\d-\d|\w-\w)/.test(inner)) {
+        inner = inner.split('-').join('\\-');
+      }
 
-    return ret
-  })
-}
-
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars (comp, options) {
-  debug('replaceStars', comp, options)
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[STAR], '')
-}
+      var isNegated = inner.charAt(0) === '^';
+      // add slashes to negated brackets, per spec
+      if (isNegated && inner.indexOf('/') === -1) {
+        inner += '/';
+      }
+      if (isNegated && inner.indexOf('.') === -1) {
+        inner += '.';
+      }
 
-// This function is passed to string.replace(re[HYPHENRANGE])
-// M, m, patch, prerelease, build
-// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
-// 1.2 - 3.4 => >=1.2.0 <3.5.0
-function hyphenReplace ($0,
-  from, fM, fm, fp, fpr, fb,
-  to, tM, tm, tp, tpr, tb) {
-  if (isX(fM)) {
-    from = ''
-  } else if (isX(fm)) {
-    from = '>=' + fM + '.0.0'
-  } else if (isX(fp)) {
-    from = '>=' + fM + '.' + fm + '.0'
-  } else {
-    from = '>=' + from
-  }
+      // don't unescape `0` (octal literal)
+      inner = inner.replace(/\\([1-9])/g, '$1');
+      return this.emit(inner, node);
+    })
+    .set('bracket.close', function(node) {
+      var val = node.val.replace(/^\\/, '');
+      if (node.parent.escaped === true) {
+        return this.emit('\\' + val, node);
+      }
+      return this.emit(val, node);
+    });
+};
 
-  if (isX(tM)) {
-    to = ''
-  } else if (isX(tm)) {
-    to = '<' + (+tM + 1) + '.0.0'
-  } else if (isX(tp)) {
-    to = '<' + tM + '.' + (+tm + 1) + '.0'
-  } else if (tpr) {
-    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr
-  } else {
-    to = '<=' + to
-  }
 
-  return (from + ' ' + to).trim()
-}
+/***/ }),
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
-  }
+/***/ "../../node_modules/expand-brackets/lib/parsers.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+"use strict";
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
-    }
-  }
-  return false
-}
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
-    }
-  }
+var utils = __webpack_require__("../../node_modules/expand-brackets/lib/utils.js");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
 
-  if (version.prerelease.length && !options.includePrerelease) {
-    // Find the set of versions that are allowed to have prereleases
-    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-    // That should allow `1.2.3-pr.2` to pass.
-    // However, `1.2.4-alpha.notready` should NOT be allowed,
-    // even though it's within the range set by the comparators.
-    for (i = 0; i < set.length; i++) {
-      debug(set[i].semver)
-      if (set[i].semver === ANY) {
-        continue
-      }
+/**
+ * Text regex
+ */
 
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch) {
-          return true
-        }
-      }
-    }
+var TEXT_REGEX = '(\\[(?=.*\\])|\\])+';
+var not = utils.createRegex(TEXT_REGEX);
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
-  }
+/**
+ * Brackets parsers
+ */
 
-  return true
-}
+function parsers(brackets) {
+  brackets.state = brackets.state || {};
+  brackets.parser.sets.bracket = brackets.parser.sets.bracket || [];
+  brackets.parser
 
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
-}
+    .capture('escape', function() {
+      if (this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(/^\\(.)/);
+      if (!m) return;
 
-exports.maxSatisfying = maxSatisfying
-function maxSatisfying (versions, range, options) {
-  var max = null
-  var maxSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!max || maxSV.compare(v) === -1) {
-        // compare(max, v, true)
-        max = v
-        maxSV = new SemVer(max, options)
-      }
-    }
-  })
-  return max
-}
+      return pos({
+        type: 'escape',
+        val: m[0]
+      });
+    })
 
-exports.minSatisfying = minSatisfying
-function minSatisfying (versions, range, options) {
-  var min = null
-  var minSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!min || minSV.compare(v) === 1) {
-        // compare(min, v, true)
-        min = v
-        minSV = new SemVer(min, options)
-      }
-    }
-  })
-  return min
-}
+    /**
+     * Text parser
+     */
 
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
+    .capture('text', function() {
+      if (this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(not);
+      if (!m || !m[0]) return;
 
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
-  }
+      return pos({
+        type: 'text',
+        val: m[0]
+      });
+    })
 
-  minver = new SemVer('0.0.0-0')
-  if (range.test(minver)) {
-    return minver
-  }
+    /**
+     * POSIX character classes: "[[:alpha:][:digits:]]"
+     */
 
-  minver = null
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+    .capture('posix', function() {
+      var pos = this.position();
+      var m = this.match(/^\[:(.*?):\](?=.*\])/);
+      if (!m) return;
 
-    comparators.forEach(function (comparator) {
-      // Clone to avoid manipulating the comparator's semver object.
-      var compver = new SemVer(comparator.semver.version)
-      switch (comparator.operator) {
-        case '>':
-          if (compver.prerelease.length === 0) {
-            compver.patch++
-          } else {
-            compver.prerelease.push(0)
-          }
-          compver.raw = compver.format()
-          /* fallthrough */
-        case '':
-        case '>=':
-          if (!minver || gt(minver, compver)) {
-            minver = compver
-          }
-          break
-        case '<':
-        case '<=':
-          /* Ignore maximum versions */
-          break
-        /* istanbul ignore next */
-        default:
-          throw new Error('Unexpected operation: ' + comparator.operator)
+      var inside = this.isInside('bracket');
+      if (inside) {
+        brackets.posix++;
       }
+
+      return pos({
+        type: 'posix',
+        insideBracket: inside,
+        inner: m[1],
+        val: m[0]
+      });
     })
-  }
 
-  if (minver && range.test(minver)) {
-    return minver
-  }
+    /**
+     * Bracket (noop)
+     */
 
-  return null
-}
+    .capture('bracket', function() {})
 
-exports.validRange = validRange
-function validRange (range, options) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, options).range || '*'
-  } catch (er) {
-    return null
-  }
-}
+    /**
+     * Open: '['
+     */
 
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr
-function ltr (version, range, options) {
-  return outside(version, range, '<', options)
-}
+    .capture('bracket.open', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\[(?=.*\])/);
+      if (!m) return;
 
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr
-function gtr (version, range, options) {
-  return outside(version, range, '>', options)
-}
+      var prev = this.prev();
+      var last = utils.last(prev.nodes);
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
+      if (parsed.slice(-1) === '\\' && !this.isInside('bracket')) {
+        last.val = last.val.slice(0, last.val.length - 1);
+        return pos({
+          type: 'escape',
+          val: m[0]
+        });
+      }
 
-  var gtfn, ltefn, ltfn, comp, ecomp
-  switch (hilo) {
-    case '>':
-      gtfn = gt
-      ltefn = lte
-      ltfn = lt
-      comp = '>'
-      ecomp = '>='
-      break
-    case '<':
-      gtfn = lt
-      ltefn = gte
-      ltfn = gt
-      comp = '<'
-      ecomp = '<='
-      break
-    default:
-      throw new TypeError('Must provide a hilo val of "<" or ">"')
-  }
+      var open = pos({
+        type: 'bracket.open',
+        val: m[0]
+      });
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
-  }
+      if (last.type === 'bracket.open' || this.isInside('bracket')) {
+        open.val = '\\' + open.val;
+        open.type = 'bracket.inner';
+        open.escaped = true;
+        return open;
+      }
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+      var node = pos({
+        type: 'bracket',
+        nodes: [open]
+      });
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+      define(node, 'parent', prev);
+      define(open, 'parent', node);
+      this.push('bracket', node);
+      prev.nodes.push(node);
+    })
 
-    var high = null
-    var low = null
+    /**
+     * Bracket text
+     */
 
-    comparators.forEach(function (comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
+    .capture('bracket.inner', function() {
+      if (!this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(not);
+      if (!m || !m[0]) return;
+
+      var next = this.input.charAt(0);
+      var val = m[0];
+
+      var node = pos({
+        type: 'bracket.inner',
+        val: val
+      });
+
+      if (val === '\\\\') {
+        return node;
       }
-      high = high || comparator
-      low = low || comparator
-      if (gtfn(comparator.semver, high.semver, options)) {
-        high = comparator
-      } else if (ltfn(comparator.semver, low.semver, options)) {
-        low = comparator
+
+      var first = val.charAt(0);
+      var last = val.slice(-1);
+
+      if (first === '!') {
+        val = '^' + val.slice(1);
+      }
+
+      if (last === '\\' || (val === '^' && next === ']')) {
+        val += this.input[0];
+        this.consume(1);
       }
+
+      node.val = val;
+      return node;
     })
 
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false
-    }
+    /**
+     * Close: ']'
+     */
 
-    // If the lowest version comparator has an operator and our version
-    // is less than it then it isn't higher than the range
-    if ((!low.operator || low.operator === comp) &&
-        ltefn(version, low.semver)) {
-      return false
-    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-      return false
-    }
-  }
-  return true
-}
+    .capture('bracket.close', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\]/);
+      if (!m) return;
 
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
-}
+      var prev = this.prev();
+      var last = utils.last(prev.nodes);
 
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
-}
+      if (parsed.slice(-1) === '\\' && !this.isInside('bracket')) {
+        last.val = last.val.slice(0, last.val.length - 1);
 
-exports.coerce = coerce
-function coerce (version) {
-  if (version instanceof SemVer) {
-    return version
-  }
+        return pos({
+          type: 'escape',
+          val: m[0]
+        });
+      }
 
-  if (typeof version !== 'string') {
-    return null
-  }
+      var node = pos({
+        type: 'bracket.close',
+        rest: this.input,
+        val: m[0]
+      });
 
-  var match = version.match(re[COERCE])
+      if (last.type === 'bracket.open') {
+        node.type = 'bracket.inner';
+        node.escaped = true;
+        return node;
+      }
 
-  if (match == null) {
-    return null
-  }
+      var bracket = this.pop('bracket');
+      if (!this.isType(bracket, 'bracket')) {
+        if (this.options.strict) {
+          throw new Error('missing opening "["');
+        }
+        node.type = 'bracket.inner';
+        node.escaped = true;
+        return node;
+      }
 
-  return parse(match[1] +
-    '.' + (match[2] || '0') +
-    '.' + (match[3] || '0'))
+      bracket.nodes.push(node);
+      define(node, 'parent', bracket);
+    });
 }
 
+/**
+ * Brackets parsers
+ */
 
-/***/ }),
-/* 369 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = parsers;
 
-var parse = __webpack_require__(370);
-var correct = __webpack_require__(372);
+/**
+ * Expose text regex
+ */
 
-var genericWarning = (
-  'license should be ' +
-  'a valid SPDX license expression (without "LicenseRef"), ' +
-  '"UNLICENSED", or ' +
-  '"SEE LICENSE IN <filename>"'
-);
+module.exports.TEXT_REGEX = TEXT_REGEX;
 
-var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
 
-function startsWith(prefix, string) {
-  return string.slice(0, prefix.length) === prefix;
-}
+/***/ }),
 
-function usesLicenseRef(ast) {
-  if (ast.hasOwnProperty('license')) {
-    var license = ast.license;
-    return (
-      startsWith('LicenseRef', license) ||
-      startsWith('DocumentRef', license)
-    );
-  } else {
-    return (
-      usesLicenseRef(ast.left) ||
-      usesLicenseRef(ast.right)
-    );
-  }
-}
+/***/ "../../node_modules/expand-brackets/lib/utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = function(argument) {
-  var ast;
+"use strict";
 
-  try {
-    ast = parse(argument);
-  } catch (e) {
-    var match
-    if (
-      argument === 'UNLICENSED' ||
-      argument === 'UNLICENCED'
-    ) {
-      return {
-        validForOldPackages: true,
-        validForNewPackages: true,
-        unlicensed: true
-      };
-    } else if (match = fileReferenceRE.exec(argument)) {
-      return {
-        validForOldPackages: true,
-        validForNewPackages: true,
-        inFile: match[1]
-      };
-    } else {
-      var result = {
-        validForOldPackages: false,
-        validForNewPackages: false,
-        warnings: [genericWarning]
-      };
-      var corrected = correct(argument);
-      if (corrected) {
-        result.warnings.push(
-          'license is similar to the valid expression "' + corrected + '"'
-        );
-      }
-      return result;
-    }
-  }
 
-  if (usesLicenseRef(ast)) {
-    return {
-      validForNewPackages: false,
-      validForOldPackages: false,
-      spdx: true,
-      warnings: [genericWarning]
-    };
-  } else {
-    return {
-      validForNewPackages: true,
-      validForOldPackages: true,
-      spdx: true
-    };
-  }
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+var regexNot = __webpack_require__("../../node_modules/regex-not/index.js");
+var cached;
+
+/**
+ * Get the last element from `array`
+ * @param {Array} `array`
+ * @return {*}
+ */
+
+exports.last = function(arr) {
+  return arr[arr.length - 1];
 };
 
+/**
+ * Create and cache regex to use for text nodes
+ */
 
-/***/ }),
-/* 370 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.createRegex = function(pattern, include) {
+  if (cached) return cached;
+  var opts = {contains: true, strictClose: false};
+  var not = regexNot.create(pattern, opts);
+  var re;
 
-var parser = __webpack_require__(371).parser
+  if (typeof include === 'string') {
+    re = toRegex('^(?:' + include + '|' + not + ')', opts);
+  } else {
+    re = toRegex(not, opts);
+  }
 
-module.exports = function (argument) {
-  return parser.parse(argument)
-}
+  return (cached = re);
+};
 
 
 /***/ }),
-/* 371 */
+
+/***/ "../../node_modules/extend-shallow/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
-/*
-  Returns a Parser object of the following structure:
+"use strict";
 
-  Parser: {
-    yy: {}
-  }
 
-  Parser.prototype: {
-    yy: {},
-    trace: function(),
-    symbols_: {associative list: name ==> number},
-    terminals_: {associative list: number ==> name},
-    productions_: [...],
-    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$),
-    table: [...],
-    defaultActions: {...},
-    parseError: function(str, hash),
-    parse: function(input),
+var isObject = __webpack_require__("../../node_modules/is-extendable/index.js");
 
-    lexer: {
-        EOF: 1,
-        parseError: function(str, hash),
-        setInput: function(input),
-        input: function(),
-        unput: function(str),
-        more: function(),
-        less: function(n),
-        pastInput: function(),
-        upcomingInput: function(),
-        showPosition: function(),
-        test_match: function(regex_match_array, rule_index),
-        next: function(),
-        lex: function(),
-        begin: function(condition),
-        popState: function(),
-        _currentRules: function(),
-        topState: function(),
-        pushState: function(condition),
+module.exports = function extend(o/*, objects*/) {
+  if (!isObject(o)) { o = {}; }
 
-        options: {
-            ranges: boolean           (optional: true ==> token location info will include a .range[] member)
-            flex: boolean             (optional: true ==> flex-like lexing behaviour where the rules are tested exhaustively to find the longest match)
-            backtrack_lexer: boolean  (optional: true ==> lexer regexes are tested in order and for each matching regex the action code is invoked; the lexer terminates the scan when a token is returned by the action code)
-        },
+  var len = arguments.length;
+  for (var i = 1; i < len; i++) {
+    var obj = arguments[i];
 
-        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
-        rules: [...],
-        conditions: {associative list: name ==> set},
+    if (isObject(obj)) {
+      assign(o, obj);
     }
   }
+  return o;
+};
 
-
-  token location info (@$, _$, etc.): {
-    first_line: n,
-    last_line: n,
-    first_column: n,
-    last_column: n,
-    range: [start_number, end_number]       (where the numbers are indexes into the input string, regular zero-based)
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
   }
+}
 
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-  the parseError function receives a 'hash' object with these members for lexer and parser errors: {
-    text:        (matched text)
-    token:       (the produced terminal token, if any)
-    line:        (yylineno)
-  }
-  while parser (grammar) errors will also provide these members, i.e. parser errors deliver a superset of attributes: {
-    loc:         (yylloc)
-    expected:    (string describing the set of expected tokens)
-    recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
-  }
-*/
-var spdxparse = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,7],$V3=[1,4],$V4=[1,9],$V5=[1,10],$V6=[5,14,15,17],$V7=[5,12,14,15,17];
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"start":3,"expression":4,"EOS":5,"simpleExpression":6,"LICENSE":7,"PLUS":8,"LICENSEREF":9,"DOCUMENTREF":10,"COLON":11,"WITH":12,"EXCEPTION":13,"AND":14,"OR":15,"OPEN":16,"CLOSE":17,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOS",7:"LICENSE",8:"PLUS",9:"LICENSEREF",10:"DOCUMENTREF",11:"COLON",12:"WITH",13:"EXCEPTION",14:"AND",15:"OR",16:"OPEN",17:"CLOSE"},
-productions_: [0,[3,2],[6,1],[6,2],[6,1],[6,3],[4,1],[4,3],[4,3],[4,3],[4,3]],
-performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
-/* this == yyval */
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1:
-return this.$ = $$[$0-1]
-break;
-case 2: case 4: case 5:
-this.$ = {license: yytext}
-break;
-case 3:
-this.$ = {license: $$[$0-1], plus: true}
-break;
-case 6:
-this.$ = $$[$0]
-break;
-case 7:
-this.$ = {exception: $$[$0]}
-this.$.license = $$[$0-2].license
-if ($$[$0-2].hasOwnProperty('plus')) {
-  this.$.plus = $$[$0-2].plus
-}
-break;
-case 8:
-this.$ = {conjunction: 'and', left: $$[$0-2], right: $$[$0]}
-break;
-case 9:
-this.$ = {conjunction: 'or', left: $$[$0-2], right: $$[$0]}
-break;
-case 10:
-this.$ = $$[$0-1]
-break;
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
 }
-},
-table: [{3:1,4:2,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{1:[3]},{5:[1,8],14:$V4,15:$V5},o($V6,[2,6],{12:[1,11]}),{4:12,6:3,7:$V0,9:$V1,10:$V2,16:$V3},o($V7,[2,2],{8:[1,13]}),o($V7,[2,4]),{11:[1,14]},{1:[2,1]},{4:15,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{4:16,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{13:[1,17]},{14:$V4,15:$V5,17:[1,18]},o($V7,[2,3]),{9:[1,19]},o($V6,[2,8]),o([5,15,17],[2,9],{14:$V4}),o($V6,[2,7]),o($V6,[2,10]),o($V7,[2,5])],
-defaultActions: {8:[2,1]},
-parseError: function parseError(str, hash) {
-    if (hash.recoverable) {
-        this.trace(str);
-    } else {
-        function _parseError (msg, hash) {
-            this.message = msg;
-            this.hash = hash;
-        }
-        _parseError.prototype = Error;
 
-        throw new _parseError(str, hash);
-    }
-},
-parse: function parse(input) {
-    var self = this, stack = [0], tstack = [], vstack = [null], lstack = [], table = this.table, yytext = '', yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    var args = lstack.slice.call(arguments, 1);
-    var lexer = Object.create(this.lexer);
-    var sharedState = { yy: {} };
-    for (var k in this.yy) {
-        if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
-            sharedState.yy[k] = this.yy[k];
-        }
-    }
-    lexer.setInput(input, sharedState.yy);
-    sharedState.yy.lexer = lexer;
-    sharedState.yy.parser = this;
-    if (typeof lexer.yylloc == 'undefined') {
-        lexer.yylloc = {};
-    }
-    var yyloc = lexer.yylloc;
-    lstack.push(yyloc);
-    var ranges = lexer.options && lexer.options.ranges;
-    if (typeof sharedState.yy.parseError === 'function') {
-        this.parseError = sharedState.yy.parseError;
-    } else {
-        this.parseError = Object.getPrototypeOf(this).parseError;
-    }
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    _token_stack:
-        var lex = function () {
-            var token;
-            token = lexer.lex() || EOF;
-            if (typeof token !== 'number') {
-                token = self.symbols_[token] || token;
-            }
-            return token;
-        };
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol === null || typeof symbol == 'undefined') {
-                symbol = lex();
-            }
-            action = table[state] && table[state][symbol];
-        }
-                    if (typeof action === 'undefined' || !action.length || !action[0]) {
-                var errStr = '';
-                expected = [];
-                for (p in table[state]) {
-                    if (this.terminals_[p] && p > TERROR) {
-                        expected.push('\'' + this.terminals_[p] + '\'');
-                    }
-                }
-                if (lexer.showPosition) {
-                    errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
-                } else {
-                    errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
-                }
-                this.parseError(errStr, {
-                    text: lexer.match,
-                    token: this.terminals_[symbol] || symbol,
-                    line: lexer.yylineno,
-                    loc: yyloc,
-                    expected: expected
-                });
-            }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(lexer.yytext);
-            lstack.push(lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = lexer.yyleng;
-                yytext = lexer.yytext;
-                yylineno = lexer.yylineno;
-                yyloc = lexer.yylloc;
-                if (recovering > 0) {
-                    recovering--;
-                }
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {
-                first_line: lstack[lstack.length - (len || 1)].first_line,
-                last_line: lstack[lstack.length - 1].last_line,
-                first_column: lstack[lstack.length - (len || 1)].first_column,
-                last_column: lstack[lstack.length - 1].last_column
-            };
-            if (ranges) {
-                yyval._$.range = [
-                    lstack[lstack.length - (len || 1)].range[0],
-                    lstack[lstack.length - 1].range[1]
-                ];
-            }
-            r = this.performAction.apply(yyval, [
-                yytext,
-                yyleng,
-                yylineno,
-                sharedState.yy,
-                action[1],
-                vstack,
-                lstack
-            ].concat(args));
-            if (typeof r !== 'undefined') {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}};
-/* generated by jison-lex 0.3.4 */
-var lexer = (function(){
-var lexer = ({
 
-EOF:1,
+/***/ }),
 
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
+/***/ "../../node_modules/extglob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// resets the lexer, sets new input
-setInput:function (input, yy) {
-        this.yy = yy || this.yy || {};
-        this._input = input;
-        this._more = this._backtrack = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {
-            first_line: 1,
-            first_column: 0,
-            last_line: 1,
-            last_column: 0
-        };
-        if (this.options.ranges) {
-            this.yylloc.range = [0,0];
-        }
-        this.offset = 0;
-        return this;
-    },
+"use strict";
 
-// consumes and returns one char from the input
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
-        }
-        if (this.options.ranges) {
-            this.yylloc.range[1]++;
-        }
 
-        this._input = this._input.slice(1);
-        return ch;
-    },
+/**
+ * Module dependencies
+ */
 
-// unshifts one char (or a string) into the input
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
+var extend = __webpack_require__("../../node_modules/extend-shallow/index.js");
+var unique = __webpack_require__("../../node_modules/array-unique/index.js");
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
 
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length - len);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length - 1);
-        this.matched = this.matched.substr(0, this.matched.length - 1);
+/**
+ * Local dependencies
+ */
 
-        if (lines.length - 1) {
-            this.yylineno -= lines.length - 1;
-        }
-        var r = this.yylloc.range;
+var compilers = __webpack_require__("../../node_modules/extglob/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/extglob/lib/parsers.js");
+var Extglob = __webpack_require__("../../node_modules/extglob/lib/extglob.js");
+var utils = __webpack_require__("../../node_modules/extglob/lib/utils.js");
+var MAX_LENGTH = 1024 * 64;
 
-        this.yylloc = {
-            first_line: this.yylloc.first_line,
-            last_line: this.yylineno + 1,
-            first_column: this.yylloc.first_column,
-            last_column: lines ?
-                (lines.length === oldLines.length ? this.yylloc.first_column : 0)
-                 + oldLines[oldLines.length - lines.length].length - lines[0].length :
-              this.yylloc.first_column - len
-        };
+/**
+ * Convert the given `extglob` pattern into a regex-compatible string. Returns
+ * an object with the compiled result and the parsed AST.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * console.log(extglob('*.!(*a)'));
+ * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {String}
+ * @api public
+ */
 
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        this.yyleng = this.yytext.length;
-        return this;
-    },
+function extglob(pattern, options) {
+  return extglob.create(pattern, options).output;
+}
 
-// When called from action, caches matched text and appends it on next action
-more:function () {
-        this._more = true;
-        return this;
-    },
+/**
+ * Takes an array of strings and an extglob pattern and returns a new
+ * array that contains only the strings that match the pattern.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * console.log(extglob.match(['a.a', 'a.b', 'a.c'], '*.!(*a)'));
+ * //=> ['a.b', 'a.c']
+ * ```
+ * @param {Array} `list` Array of strings to match
+ * @param {String} `pattern` Extglob pattern
+ * @param {Object} `options`
+ * @return {Array} Returns an array of matches
+ * @api public
+ */
 
-// When called from action, signals the lexer that this rule fails to match the input, so the next matching rule (regex) should be tested instead.
-reject:function () {
-        if (this.options.backtrack_lexer) {
-            this._backtrack = true;
-        } else {
-            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
+extglob.match = function(list, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
 
-        }
-        return this;
-    },
+  list = utils.arrayify(list);
+  var isMatch = extglob.matcher(pattern, options);
+  var len = list.length;
+  var idx = -1;
+  var matches = [];
 
-// retain first n characters of the match
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
+  while (++idx < len) {
+    var ele = list[idx];
 
-// displays already matched input, i.e. for error messages
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
+    if (isMatch(ele)) {
+      matches.push(ele);
+    }
+  }
 
-// displays upcoming input, i.e. for error messages
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
-        }
-        return (next.substr(0,20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
-    },
+  // if no options were passed, uniquify results and return
+  if (typeof options === 'undefined') {
+    return unique(matches);
+  }
 
-// displays the character position where the lexing error occurred, i.e. for error messages
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c + "^";
-    },
+  if (matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error('no matches found for "' + pattern + '"');
+    }
+    if (options.nonull === true || options.nullglob === true) {
+      return [pattern.split('\\').join('')];
+    }
+  }
 
-// test the lexed token: return FALSE when not a match, otherwise return token
-test_match:function (match, indexed_rule) {
-        var token,
-            lines,
-            backup;
+  return options.nodupes !== false ? unique(matches) : matches;
+};
 
-        if (this.options.backtrack_lexer) {
-            // save context
-            backup = {
-                yylineno: this.yylineno,
-                yylloc: {
-                    first_line: this.yylloc.first_line,
-                    last_line: this.last_line,
-                    first_column: this.yylloc.first_column,
-                    last_column: this.yylloc.last_column
-                },
-                yytext: this.yytext,
-                match: this.match,
-                matches: this.matches,
-                matched: this.matched,
-                yyleng: this.yyleng,
-                offset: this.offset,
-                _more: this._more,
-                _input: this._input,
-                yy: this.yy,
-                conditionStack: this.conditionStack.slice(0),
-                done: this.done
-            };
-            if (this.options.ranges) {
-                backup.yylloc.range = this.yylloc.range.slice(0);
-            }
-        }
+/**
+ * Returns true if the specified `string` matches the given
+ * extglob `pattern`.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ *
+ * console.log(extglob.isMatch('a.a', '*.!(*a)'));
+ * //=> false
+ * console.log(extglob.isMatch('a.b', '*.!(*a)'));
+ * //=> true
+ * ```
+ * @param {String} `string` String to match
+ * @param {String} `pattern` Extglob pattern
+ * @param {String} `options`
+ * @return {Boolean}
+ * @api public
+ */
 
-        lines = match[0].match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno += lines.length;
-        }
-        this.yylloc = {
-            first_line: this.yylloc.last_line,
-            last_line: this.yylineno + 1,
-            first_column: this.yylloc.last_column,
-            last_column: lines ?
-                         lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length :
-                         this.yylloc.last_column + match[0].length
-        };
-        this.yytext += match[0];
-        this.match += match[0];
-        this.matches = match;
-        this.yyleng = this.yytext.length;
-        if (this.options.ranges) {
-            this.yylloc.range = [this.offset, this.offset += this.yyleng];
-        }
-        this._more = false;
-        this._backtrack = false;
-        this._input = this._input.slice(match[0].length);
-        this.matched += match[0];
-        token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
-        if (this.done && this._input) {
-            this.done = false;
-        }
-        if (token) {
-            return token;
-        } else if (this._backtrack) {
-            // recover context
-            for (var k in backup) {
-                this[k] = backup[k];
-            }
-            return false; // rule action called reject() implying the next rule should be tested instead.
-        }
-        return false;
-    },
+extglob.isMatch = function(str, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
 
-// return next match in input
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) {
-            this.done = true;
-        }
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-        var token,
-            match,
-            tempMatch,
-            index;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i = 0; i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (this.options.backtrack_lexer) {
-                    token = this.test_match(tempMatch, rules[i]);
-                    if (token !== false) {
-                        return token;
-                    } else if (this._backtrack) {
-                        match = false;
-                        continue; // rule action called reject() implying a rule MISmatch.
-                    } else {
-                        // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-                        return false;
-                    }
-                } else if (!this.options.flex) {
-                    break;
-                }
-            }
-        }
-        if (match) {
-            token = this.test_match(match, rules[index]);
-            if (token !== false) {
-                return token;
-            }
-            // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-            return false;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
-        }
-    },
+  if (pattern === str) {
+    return true;
+  }
 
-// return next match that has a token
-lex:function lex() {
-        var r = this.next();
-        if (r) {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
+  if (pattern === '' || pattern === ' ' || pattern === '.') {
+    return pattern === str;
+  }
 
-// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
+  var isMatch = utils.memoize('isMatch', pattern, options, extglob.matcher);
+  return isMatch(str);
+};
 
-// pop the previously active lexer condition state off the condition stack
-popState:function popState() {
-        var n = this.conditionStack.length - 1;
-        if (n > 0) {
-            return this.conditionStack.pop();
-        } else {
-            return this.conditionStack[0];
-        }
-    },
+/**
+ * Returns true if the given `string` contains the given pattern. Similar to `.isMatch` but
+ * the pattern can match any part of the string.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * console.log(extglob.contains('aa/bb/cc', '*b'));
+ * //=> true
+ * console.log(extglob.contains('aa/bb/cc', '*d'));
+ * //=> false
+ * ```
+ * @param {String} `str` The string to match.
+ * @param {String} `pattern` Glob pattern to use for matching.
+ * @param {Object} `options`
+ * @return {Boolean} Returns true if the patter matches any part of `str`.
+ * @api public
+ */
 
-// produce the lexer rule set which is active for the currently active lexer condition state
-_currentRules:function _currentRules() {
-        if (this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1]) {
-            return this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules;
-        } else {
-            return this.conditions["INITIAL"].rules;
-        }
-    },
+extglob.contains = function(str, pattern, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-// return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
-topState:function topState(n) {
-        n = this.conditionStack.length - 1 - Math.abs(n || 0);
-        if (n >= 0) {
-            return this.conditionStack[n];
-        } else {
-            return "INITIAL";
+  if (pattern === '' || pattern === ' ' || pattern === '.') {
+    return pattern === str;
+  }
+
+  var opts = extend({}, options, {contains: true});
+  opts.strictClose = false;
+  opts.strictOpen = false;
+  return extglob.isMatch(str, pattern, opts);
+};
+
+/**
+ * Takes an extglob pattern and returns a matcher function. The returned
+ * function takes the string to match as its only argument.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * var isMatch = extglob.matcher('*.!(*a)');
+ *
+ * console.log(isMatch('a.a'));
+ * //=> false
+ * console.log(isMatch('a.b'));
+ * //=> true
+ * ```
+ * @param {String} `pattern` Extglob pattern
+ * @param {String} `options`
+ * @return {Boolean}
+ * @api public
+ */
+
+extglob.matcher = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
+
+  function matcher() {
+    var re = extglob.makeRe(pattern, options);
+    return function(str) {
+      return re.test(str);
+    };
+  }
+
+  return utils.memoize('matcher', pattern, options, matcher);
+};
+
+/**
+ * Convert the given `extglob` pattern into a regex-compatible string. Returns
+ * an object with the compiled result and the parsed AST.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * console.log(extglob.create('*.!(*a)').output);
+ * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {String}
+ * @api public
+ */
+
+extglob.create = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
+
+  function create() {
+    var ext = new Extglob(options);
+    var ast = ext.parse(pattern, options);
+    return ext.compile(ast, options);
+  }
+
+  return utils.memoize('create', pattern, options, create);
+};
+
+/**
+ * Returns an array of matches captured by `pattern` in `string`, or `null`
+ * if the pattern did not match.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * extglob.capture(pattern, string[, options]);
+ *
+ * console.log(extglob.capture('test/*.js', 'test/foo.js'));
+ * //=> ['foo']
+ * console.log(extglob.capture('test/*.js', 'foo/bar.css'));
+ * //=> null
+ * ```
+ * @param {String} `pattern` Glob pattern to use for matching.
+ * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
+ * @api public
+ */
+
+extglob.capture = function(pattern, str, options) {
+  var re = extglob.makeRe(pattern, extend({capture: true}, options));
+
+  function match() {
+    return function(string) {
+      var match = re.exec(string);
+      if (!match) {
+        return null;
+      }
+
+      return match.slice(1);
+    };
+  }
+
+  var capture = utils.memoize('capture', pattern, options, match);
+  return capture(str);
+};
+
+/**
+ * Create a regular expression from the given `pattern` and `options`.
+ *
+ * ```js
+ * var extglob = require('extglob');
+ * var re = extglob.makeRe('*.!(*a)');
+ * console.log(re);
+ * //=> /^[^\/]*?\.(?![^\/]*?a)[^\/]*?$/
+ * ```
+ * @param {String} `pattern` The pattern to convert to regex.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
+ */
+
+extglob.makeRe = function(pattern, options) {
+  if (pattern instanceof RegExp) {
+    return pattern;
+  }
+
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
+
+  if (pattern.length > MAX_LENGTH) {
+    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
+  }
+
+  function makeRe() {
+    var opts = extend({strictErrors: false}, options);
+    if (opts.strictErrors === true) opts.strict = true;
+    var res = extglob.create(pattern, opts);
+    return toRegex(res.output, opts);
+  }
+
+  var regex = utils.memoize('makeRe', pattern, options, makeRe);
+  if (regex.source.length > MAX_LENGTH) {
+    throw new SyntaxError('potentially malicious regex detected');
+  }
+
+  return regex;
+};
+
+/**
+ * Cache
+ */
+
+extglob.cache = utils.cache;
+extglob.clearCache = function() {
+  extglob.cache.__data__ = {};
+};
+
+/**
+ * Expose `Extglob` constructor, parsers and compilers
+ */
+
+extglob.Extglob = Extglob;
+extglob.compilers = compilers;
+extglob.parsers = parsers;
+
+/**
+ * Expose `extglob`
+ * @type {Function}
+ */
+
+module.exports = extglob;
+
+
+/***/ }),
+
+/***/ "../../node_modules/extglob/lib/compilers.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var brackets = __webpack_require__("../../node_modules/expand-brackets/index.js");
+
+/**
+ * Extglob compilers
+ */
+
+module.exports = function(extglob) {
+  function star() {
+    if (typeof extglob.options.star === 'function') {
+      return extglob.options.star.apply(this, arguments);
+    }
+    if (typeof extglob.options.star === 'string') {
+      return extglob.options.star;
+    }
+    return '.*?';
+  }
+
+  /**
+   * Use `expand-brackets` compilers
+   */
+
+  extglob.use(brackets.compilers);
+  extglob.compiler
+
+    /**
+     * Escaped: "\\*"
+     */
+
+    .set('escape', function(node) {
+      return this.emit(node.val, node);
+    })
+
+    /**
+     * Dot: "."
+     */
+
+    .set('dot', function(node) {
+      return this.emit('\\' + node.val, node);
+    })
+
+    /**
+     * Question mark: "?"
+     */
+
+    .set('qmark', function(node) {
+      var val = '[^\\\\/.]';
+      var prev = this.prev();
+
+      if (node.parsed.slice(-1) === '(') {
+        var ch = node.rest.charAt(0);
+        if (ch !== '!' && ch !== '=' && ch !== ':') {
+          return this.emit(val, node);
         }
-    },
+        return this.emit(node.val, node);
+      }
 
-// alias for begin(condition)
-pushState:function pushState(condition) {
-        this.begin(condition);
-    },
+      if (prev.type === 'text' && prev.val) {
+        return this.emit(val, node);
+      }
 
-// return the number of states currently on the stack
-stateStackSize:function stateStackSize() {
-        return this.conditionStack.length;
-    },
-options: {},
-performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-var YYSTATE=YY_START;
-switch($avoiding_name_collisions) {
-case 0:return 5
-break;
-case 1:/* skip whitespace */
-break;
-case 2:return 8
-break;
-case 3:return 16
-break;
-case 4:return 17
-break;
-case 5:return 11
-break;
-case 6:return 10
-break;
-case 7:return 9
-break;
-case 8:return 14
-break;
-case 9:return 15
-break;
-case 10:return 12
-break;
-case 11:return 7
-break;
-case 12:return 7
-break;
-case 13:return 7
-break;
-case 14:return 7
-break;
-case 15:return 7
-break;
-case 16:return 7
-break;
-case 17:return 7
-break;
-case 18:return 7
-break;
-case 19:return 7
-break;
-case 20:return 7
-break;
-case 21:return 7
-break;
-case 22:return 7
-break;
-case 23:return 7
-break;
-case 24:return 13
-break;
-case 25:return 13
-break;
-case 26:return 13
-break;
-case 27:return 13
-break;
-case 28:return 13
-break;
-case 29:return 13
-break;
-case 30:return 13
-break;
-case 31:return 13
-break;
-case 32:return 7
-break;
-case 33:return 13
-break;
-case 34:return 7
-break;
-case 35:return 13
-break;
-case 36:return 7
-break;
-case 37:return 13
-break;
-case 38:return 13
-break;
-case 39:return 7
-break;
-case 40:return 13
-break;
-case 41:return 13
-break;
-case 42:return 13
-break;
-case 43:return 13
-break;
-case 44:return 13
-break;
-case 45:return 7
-break;
-case 46:return 13
-break;
-case 47:return 7
-break;
-case 48:return 7
-break;
-case 49:return 7
-break;
-case 50:return 7
-break;
-case 51:return 7
-break;
-case 52:return 7
-break;
-case 53:return 7
-break;
-case 54:return 7
-break;
-case 55:return 7
-break;
-case 56:return 7
-break;
-case 57:return 7
-break;
-case 58:return 7
-break;
-case 59:return 7
-break;
-case 60:return 7
-break;
-case 61:return 7
-break;
-case 62:return 7
-break;
-case 63:return 13
-break;
-case 64:return 7
-break;
-case 65:return 7
-break;
-case 66:return 13
-break;
-case 67:return 7
-break;
-case 68:return 7
-break;
-case 69:return 7
-break;
-case 70:return 7
-break;
-case 71:return 7
-break;
-case 72:return 7
-break;
-case 73:return 13
-break;
-case 74:return 7
-break;
-case 75:return 13
-break;
-case 76:return 7
-break;
-case 77:return 7
-break;
-case 78:return 7
-break;
-case 79:return 7
-break;
-case 80:return 7
-break;
-case 81:return 7
-break;
-case 82:return 7
-break;
-case 83:return 7
-break;
-case 84:return 7
-break;
-case 85:return 7
-break;
-case 86:return 7
-break;
-case 87:return 7
-break;
-case 88:return 7
-break;
-case 89:return 7
-break;
-case 90:return 7
-break;
-case 91:return 7
-break;
-case 92:return 7
-break;
-case 93:return 7
-break;
-case 94:return 7
-break;
-case 95:return 7
-break;
-case 96:return 7
-break;
-case 97:return 7
-break;
-case 98:return 7
-break;
-case 99:return 7
-break;
-case 100:return 7
-break;
-case 101:return 7
-break;
-case 102:return 7
-break;
-case 103:return 7
-break;
-case 104:return 7
-break;
-case 105:return 7
-break;
-case 106:return 7
-break;
-case 107:return 7
-break;
-case 108:return 7
-break;
-case 109:return 7
-break;
-case 110:return 7
-break;
-case 111:return 7
-break;
-case 112:return 7
-break;
-case 113:return 7
-break;
-case 114:return 7
-break;
-case 115:return 7
-break;
-case 116:return 7
-break;
-case 117:return 7
-break;
-case 118:return 7
-break;
-case 119:return 7
-break;
-case 120:return 7
-break;
-case 121:return 7
-break;
-case 122:return 7
-break;
-case 123:return 7
-break;
-case 124:return 7
-break;
-case 125:return 7
-break;
-case 126:return 7
-break;
-case 127:return 7
-break;
-case 128:return 7
-break;
-case 129:return 7
-break;
-case 130:return 7
-break;
-case 131:return 7
-break;
-case 132:return 7
-break;
-case 133:return 7
-break;
-case 134:return 7
-break;
-case 135:return 7
-break;
-case 136:return 7
-break;
-case 137:return 7
-break;
-case 138:return 7
-break;
-case 139:return 7
-break;
-case 140:return 7
-break;
-case 141:return 7
-break;
-case 142:return 7
-break;
-case 143:return 7
-break;
-case 144:return 7
-break;
-case 145:return 7
-break;
-case 146:return 7
-break;
-case 147:return 7
-break;
-case 148:return 7
-break;
-case 149:return 7
-break;
-case 150:return 7
-break;
-case 151:return 7
-break;
-case 152:return 7
-break;
-case 153:return 7
-break;
-case 154:return 7
-break;
-case 155:return 7
-break;
-case 156:return 7
-break;
-case 157:return 7
-break;
-case 158:return 7
-break;
-case 159:return 7
-break;
-case 160:return 7
-break;
-case 161:return 7
-break;
-case 162:return 7
-break;
-case 163:return 7
-break;
-case 164:return 7
-break;
-case 165:return 7
-break;
-case 166:return 7
-break;
-case 167:return 7
-break;
-case 168:return 7
-break;
-case 169:return 7
-break;
-case 170:return 7
-break;
-case 171:return 7
-break;
-case 172:return 7
-break;
-case 173:return 7
-break;
-case 174:return 7
-break;
-case 175:return 7
-break;
-case 176:return 7
-break;
-case 177:return 7
-break;
-case 178:return 7
-break;
-case 179:return 7
-break;
-case 180:return 7
-break;
-case 181:return 7
-break;
-case 182:return 7
-break;
-case 183:return 7
-break;
-case 184:return 7
-break;
-case 185:return 7
-break;
-case 186:return 7
-break;
-case 187:return 7
-break;
-case 188:return 7
-break;
-case 189:return 7
-break;
-case 190:return 7
-break;
-case 191:return 7
-break;
-case 192:return 7
-break;
-case 193:return 7
-break;
-case 194:return 7
-break;
-case 195:return 7
-break;
-case 196:return 7
-break;
-case 197:return 7
-break;
-case 198:return 7
-break;
-case 199:return 7
-break;
-case 200:return 7
-break;
-case 201:return 7
-break;
-case 202:return 7
-break;
-case 203:return 7
-break;
-case 204:return 7
-break;
-case 205:return 7
-break;
-case 206:return 7
-break;
-case 207:return 7
-break;
-case 208:return 7
-break;
-case 209:return 7
-break;
-case 210:return 7
-break;
-case 211:return 7
-break;
-case 212:return 7
-break;
-case 213:return 7
-break;
-case 214:return 7
-break;
-case 215:return 7
-break;
-case 216:return 7
-break;
-case 217:return 7
-break;
-case 218:return 7
-break;
-case 219:return 7
-break;
-case 220:return 7
-break;
-case 221:return 7
-break;
-case 222:return 7
-break;
-case 223:return 7
-break;
-case 224:return 7
-break;
-case 225:return 7
-break;
-case 226:return 7
-break;
-case 227:return 7
-break;
-case 228:return 7
-break;
-case 229:return 7
-break;
-case 230:return 7
-break;
-case 231:return 7
-break;
-case 232:return 7
-break;
-case 233:return 7
-break;
-case 234:return 7
-break;
-case 235:return 7
-break;
-case 236:return 7
-break;
-case 237:return 7
-break;
-case 238:return 7
-break;
-case 239:return 7
-break;
-case 240:return 7
-break;
-case 241:return 7
-break;
-case 242:return 7
-break;
-case 243:return 7
-break;
-case 244:return 7
-break;
-case 245:return 7
-break;
-case 246:return 7
-break;
-case 247:return 7
-break;
-case 248:return 7
-break;
-case 249:return 7
-break;
-case 250:return 7
-break;
-case 251:return 7
-break;
-case 252:return 7
-break;
-case 253:return 7
-break;
-case 254:return 7
-break;
-case 255:return 7
-break;
-case 256:return 7
-break;
-case 257:return 7
-break;
-case 258:return 7
-break;
-case 259:return 7
-break;
-case 260:return 7
-break;
-case 261:return 7
-break;
-case 262:return 7
-break;
-case 263:return 7
-break;
-case 264:return 7
-break;
-case 265:return 7
-break;
-case 266:return 7
-break;
-case 267:return 7
-break;
-case 268:return 7
-break;
-case 269:return 7
-break;
-case 270:return 7
-break;
-case 271:return 7
-break;
-case 272:return 7
-break;
-case 273:return 7
-break;
-case 274:return 7
-break;
-case 275:return 7
-break;
-case 276:return 7
-break;
-case 277:return 7
-break;
-case 278:return 7
-break;
-case 279:return 7
-break;
-case 280:return 7
-break;
-case 281:return 7
-break;
-case 282:return 7
-break;
-case 283:return 7
-break;
-case 284:return 7
-break;
-case 285:return 7
-break;
-case 286:return 7
-break;
-case 287:return 7
-break;
-case 288:return 7
-break;
-case 289:return 7
-break;
-case 290:return 7
-break;
-case 291:return 7
-break;
-case 292:return 7
-break;
-case 293:return 7
-break;
-case 294:return 7
-break;
-case 295:return 7
-break;
-case 296:return 7
-break;
-case 297:return 7
-break;
-case 298:return 7
-break;
-case 299:return 7
-break;
-case 300:return 7
-break;
-case 301:return 7
-break;
-case 302:return 7
-break;
-case 303:return 7
-break;
-case 304:return 7
-break;
-case 305:return 7
-break;
-case 306:return 7
-break;
-case 307:return 7
-break;
-case 308:return 7
-break;
-case 309:return 7
-break;
-case 310:return 7
-break;
-case 311:return 7
-break;
-case 312:return 7
-break;
-case 313:return 7
-break;
-case 314:return 7
-break;
-case 315:return 7
-break;
-case 316:return 7
-break;
-case 317:return 7
-break;
-case 318:return 7
-break;
-case 319:return 7
-break;
-case 320:return 7
-break;
-case 321:return 7
-break;
-case 322:return 7
-break;
-case 323:return 7
-break;
-case 324:return 7
-break;
-case 325:return 7
-break;
-case 326:return 7
-break;
-case 327:return 7
-break;
-case 328:return 7
-break;
-case 329:return 7
-break;
-case 330:return 7
-break;
-case 331:return 7
-break;
-case 332:return 7
-break;
-case 333:return 7
-break;
-case 334:return 7
-break;
-case 335:return 7
-break;
-case 336:return 7
-break;
-case 337:return 7
-break;
-case 338:return 7
-break;
-case 339:return 7
-break;
-case 340:return 7
-break;
-case 341:return 7
-break;
-case 342:return 7
-break;
-case 343:return 7
-break;
-case 344:return 7
-break;
-case 345:return 7
-break;
-case 346:return 7
-break;
-case 347:return 7
-break;
-case 348:return 7
-break;
-case 349:return 7
-break;
-case 350:return 7
-break;
-case 351:return 7
-break;
-case 352:return 7
-break;
-case 353:return 7
-break;
-case 354:return 7
-break;
-case 355:return 7
-break;
-case 356:return 7
-break;
-case 357:return 7
-break;
-case 358:return 7
-break;
-case 359:return 7
-break;
-case 360:return 7
-break;
-case 361:return 7
-break;
-case 362:return 7
-break;
-case 363:return 7
-break;
-case 364:return 7
-break;
+      if (node.val.length > 1) {
+        val += '{' + node.val.length + '}';
+      }
+      return this.emit(val, node);
+    })
+
+    /**
+     * Plus: "+"
+     */
+
+    .set('plus', function(node) {
+      var prev = node.parsed.slice(-1);
+      if (prev === ']' || prev === ')') {
+        return this.emit(node.val, node);
+      }
+      var ch = this.output.slice(-1);
+      if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
+        return this.emit('\\+', node);
+      }
+      if (/\w/.test(ch) && !node.inside) {
+        return this.emit('+\\+?', node);
+      }
+      return this.emit('+', node);
+    })
+
+    /**
+     * Star: "*"
+     */
+
+    .set('star', function(node) {
+      var prev = this.prev();
+      var prefix = prev.type !== 'text' && prev.type !== 'escape'
+        ? '(?!\\.)'
+        : '';
+
+      return this.emit(prefix + star.call(this, node), node);
+    })
+
+    /**
+     * Parens
+     */
+
+    .set('paren', function(node) {
+      return this.mapVisit(node.nodes);
+    })
+    .set('paren.open', function(node) {
+      var capture = this.options.capture ? '(' : '';
+
+      switch (node.parent.prefix) {
+        case '!':
+        case '^':
+          return this.emit(capture + '(?:(?!(?:', node);
+        case '*':
+        case '+':
+        case '?':
+        case '@':
+          return this.emit(capture + '(?:', node);
+        default: {
+          var val = node.val;
+          if (this.options.bash === true) {
+            val = '\\' + val;
+          } else if (!this.options.capture && val === '(' && node.parent.rest[0] !== '?') {
+            val += '?:';
+          }
+
+          return this.emit(val, node);
+        }
+      }
+    })
+    .set('paren.close', function(node) {
+      var capture = this.options.capture ? ')' : '';
+
+      switch (node.prefix) {
+        case '!':
+        case '^':
+          var prefix = /^(\)|$)/.test(node.rest) ? '$' : '';
+          var str = star.call(this, node);
+
+          // if the extglob has a slash explicitly defined, we know the user wants
+          // to match slashes, so we need to ensure the "star" regex allows for it
+          if (node.parent.hasSlash && !this.options.star && this.options.slash !== false) {
+            str = '.*?';
+          }
+
+          return this.emit(prefix + ('))' + str + ')') + capture, node);
+        case '*':
+        case '+':
+        case '?':
+          return this.emit(')' + node.prefix + capture, node);
+        case '@':
+          return this.emit(')' + capture, node);
+        default: {
+          var val = (this.options.bash === true ? '\\' : '') + ')';
+          return this.emit(val, node);
+        }
+      }
+    })
+
+    /**
+     * Text
+     */
+
+    .set('text', function(node) {
+      var val = node.val.replace(/[\[\]]/g, '\\$&');
+      return this.emit(val, node);
+    });
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/extglob/lib/extglob.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Module dependencies
+ */
+
+var Snapdragon = __webpack_require__("../../node_modules/snapdragon/index.js");
+var define = __webpack_require__("../../node_modules/extglob/node_modules/define-property/index.js");
+var extend = __webpack_require__("../../node_modules/extend-shallow/index.js");
+
+/**
+ * Local dependencies
+ */
+
+var compilers = __webpack_require__("../../node_modules/extglob/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/extglob/lib/parsers.js");
+
+/**
+ * Customize Snapdragon parser and renderer
+ */
+
+function Extglob(options) {
+  this.options = extend({source: 'extglob'}, options);
+  this.snapdragon = this.options.snapdragon || new Snapdragon(this.options);
+  this.snapdragon.patterns = this.snapdragon.patterns || {};
+  this.compiler = this.snapdragon.compiler;
+  this.parser = this.snapdragon.parser;
+
+  compilers(this.snapdragon);
+  parsers(this.snapdragon);
+
+  /**
+   * Override Snapdragon `.parse` method
+   */
+
+  define(this.snapdragon, 'parse', function(str, options) {
+    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
+    parsed.input = str;
+
+    // escape unmatched brace/bracket/parens
+    var last = this.parser.stack.pop();
+    if (last && this.options.strict !== true) {
+      var node = last.nodes[0];
+      node.val = '\\' + node.val;
+      var sibling = node.parent.nodes[1];
+      if (sibling.type === 'star') {
+        sibling.loose = true;
+      }
+    }
+
+    // add non-enumerable parser reference
+    define(parsed, 'parser', this.parser);
+    return parsed;
+  });
+
+  /**
+   * Decorate `.parse` method
+   */
+
+  define(this, 'parse', function(ast, options) {
+    return this.snapdragon.parse.apply(this.snapdragon, arguments);
+  });
+
+  /**
+   * Decorate `.compile` method
+   */
+
+  define(this, 'compile', function(ast, options) {
+    return this.snapdragon.compile.apply(this.snapdragon, arguments);
+  });
+
+}
+
+/**
+ * Expose `Extglob`
+ */
+
+module.exports = Extglob;
+
+
+/***/ }),
+
+/***/ "../../node_modules/extglob/lib/parsers.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var brackets = __webpack_require__("../../node_modules/expand-brackets/index.js");
+var define = __webpack_require__("../../node_modules/extglob/node_modules/define-property/index.js");
+var utils = __webpack_require__("../../node_modules/extglob/lib/utils.js");
+
+/**
+ * Characters to use in text regex (we want to "not" match
+ * characters that are matched by other parsers)
+ */
+
+var TEXT_REGEX = '([!@*?+]?\\(|\\)|[*?.+\\\\]|\\[:?(?=.*\\])|:?\\])+';
+var not = utils.createRegex(TEXT_REGEX);
+
+/**
+ * Extglob parsers
+ */
+
+function parsers(extglob) {
+  extglob.state = extglob.state || {};
+
+  /**
+   * Use `expand-brackets` parsers
+   */
+
+  extglob.use(brackets.parsers);
+  extglob.parser.sets.paren = extglob.parser.sets.paren || [];
+  extglob.parser
+
+    /**
+     * Extglob open: "*("
+     */
+
+    .capture('paren.open', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^([!@*?+])?\(/);
+      if (!m) return;
+
+      var prev = this.prev();
+      var prefix = m[1];
+      var val = m[0];
+
+      var open = pos({
+        type: 'paren.open',
+        parsed: parsed,
+        val: val
+      });
+
+      var node = pos({
+        type: 'paren',
+        prefix: prefix,
+        nodes: [open]
+      });
+
+      // if nested negation extglobs, just cancel them out to simplify
+      if (prefix === '!' && prev.type === 'paren' && prev.prefix === '!') {
+        prev.prefix = '@';
+        node.prefix = '@';
+      }
+
+      define(node, 'rest', this.input);
+      define(node, 'parsed', parsed);
+      define(node, 'parent', prev);
+      define(open, 'parent', node);
+
+      this.push('paren', node);
+      prev.nodes.push(node);
+    })
+
+    /**
+     * Extglob close: ")"
+     */
+
+    .capture('paren.close', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\)/);
+      if (!m) return;
+
+      var parent = this.pop('paren');
+      var node = pos({
+        type: 'paren.close',
+        rest: this.input,
+        parsed: parsed,
+        val: m[0]
+      });
+
+      if (!this.isType(parent, 'paren')) {
+        if (this.options.strict) {
+          throw new Error('missing opening paren: "("');
+        }
+        node.escaped = true;
+        return node;
+      }
+
+      node.prefix = parent.prefix;
+      parent.nodes.push(node);
+      define(node, 'parent', parent);
+    })
+
+    /**
+     * Escape: "\\."
+     */
+
+    .capture('escape', function() {
+      var pos = this.position();
+      var m = this.match(/^\\(.)/);
+      if (!m) return;
+
+      return pos({
+        type: 'escape',
+        val: m[0],
+        ch: m[1]
+      });
+    })
+
+    /**
+     * Question marks: "?"
+     */
+
+    .capture('qmark', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\?+(?!\()/);
+      if (!m) return;
+      extglob.state.metachar = true;
+      return pos({
+        type: 'qmark',
+        rest: this.input,
+        parsed: parsed,
+        val: m[0]
+      });
+    })
+
+    /**
+     * Character parsers
+     */
+
+    .capture('star', /^\*(?!\()/)
+    .capture('plus', /^\+(?!\()/)
+    .capture('dot', /^\./)
+    .capture('text', not);
+};
+
+/**
+ * Expose text regex string
+ */
+
+module.exports.TEXT_REGEX = TEXT_REGEX;
+
+/**
+ * Extglob parsers
+ */
+
+module.exports = parsers;
+
+
+/***/ }),
+
+/***/ "../../node_modules/extglob/lib/utils.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var regex = __webpack_require__("../../node_modules/regex-not/index.js");
+var Cache = __webpack_require__("../../node_modules/fragment-cache/index.js");
+
+/**
+ * Utils
+ */
+
+var utils = module.exports;
+var cache = utils.cache = new Cache();
+
+/**
+ * Cast `val` to an array
+ * @return {Array}
+ */
+
+utils.arrayify = function(val) {
+  if (!Array.isArray(val)) {
+    return [val];
+  }
+  return val;
+};
+
+/**
+ * Memoize a generated regex or function
+ */
+
+utils.memoize = function(type, pattern, options, fn) {
+  var key = utils.createKey(type + pattern, options);
+
+  if (cache.has(type, key)) {
+    return cache.get(type, key);
+  }
+
+  var val = fn(pattern, options);
+  if (options && options.cache === false) {
+    return val;
+  }
+
+  cache.set(type, key, val);
+  return val;
+};
+
+/**
+ * Create the key to use for memoization. The key is generated
+ * by iterating over the options and concatenating key-value pairs
+ * to the pattern string.
+ */
+
+utils.createKey = function(pattern, options) {
+  var key = pattern;
+  if (typeof options === 'undefined') {
+    return key;
+  }
+  for (var prop in options) {
+    key += ';' + prop + '=' + String(options[prop]);
+  }
+  return key;
+};
+
+/**
+ * Create the regex to use for matching text
+ */
+
+utils.createRegex = function(str) {
+  var opts = {contains: true, strictClose: false};
+  return regex(str, opts);
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/extglob/node_modules/define-property/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+var isDescriptor = __webpack_require__("../../node_modules/is-descriptor/index.js");
+
+module.exports = function defineProperty(obj, prop, val) {
+  if (typeof obj !== 'object' && typeof obj !== 'function') {
+    throw new TypeError('expected an object or function.');
+  }
+
+  if (typeof prop !== 'string') {
+    throw new TypeError('expected `prop` to be a string.');
+  }
+
+  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
+    return Object.defineProperty(obj, prop, val);
+  }
+
+  return Object.defineProperty(obj, prop, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+const pkg = __webpack_require__("../../node_modules/fast-glob/out/index.js");
+
+module.exports = pkg.async;
+module.exports.default = pkg.async;
+
+module.exports.async = pkg.async;
+module.exports.sync = pkg.sync;
+module.exports.stream = pkg.stream;
+
+module.exports.generateTasks = pkg.generateTasks;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/adapters/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__("fs");
+exports.FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    stat: fs.stat,
+    lstatSync: fs.lstatSync,
+    statSync: fs.statSync
+};
+function getFileSystemAdapter(fsMethods) {
+    if (!fsMethods) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign({}, exports.FILE_SYSTEM_ADAPTER, fsMethods);
+}
+exports.getFileSystemAdapter = getFileSystemAdapter;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const optionsManager = __webpack_require__("../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/managers/options.js");
+const statProvider = __webpack_require__("../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/providers/stat.js");
+/**
+ * Asynchronous API.
+ */
+function stat(path, opts) {
+    return new Promise((resolve, reject) => {
+        statProvider.async(path, optionsManager.prepare(opts), (err, stats) => err ? reject(err) : resolve(stats));
+    });
+}
+exports.stat = stat;
+function statCallback(path, optsOrCallback, callback) {
+    if (typeof optsOrCallback === 'function') {
+        callback = optsOrCallback; /* tslint:disable-line: no-parameter-reassignment */
+        optsOrCallback = undefined; /* tslint:disable-line: no-parameter-reassignment */
+    }
+    if (typeof callback === 'undefined') {
+        throw new TypeError('The "callback" argument must be of type Function.');
+    }
+    statProvider.async(path, optionsManager.prepare(optsOrCallback), callback);
+}
+exports.statCallback = statCallback;
+/**
+ * Synchronous API.
+ */
+function statSync(path, opts) {
+    return statProvider.sync(path, optionsManager.prepare(opts));
+}
+exports.statSync = statSync;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/managers/options.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsAdapter = __webpack_require__("../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/adapters/fs.js");
+function prepare(opts) {
+    const options = Object.assign({
+        fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
+        throwErrorOnBrokenSymlinks: true,
+        followSymlinks: true
+    }, opts);
+    return options;
+}
+exports.prepare = prepare;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/providers/stat.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function sync(path, options) {
+    const lstat = options.fs.lstatSync(path);
+    if (!isFollowedSymlink(lstat, options)) {
+        return lstat;
+    }
+    try {
+        const stat = options.fs.statSync(path);
+        stat.isSymbolicLink = () => true;
+        return stat;
+    }
+    catch (err) {
+        if (!options.throwErrorOnBrokenSymlinks) {
+            return lstat;
+        }
+        throw err;
+    }
+}
+exports.sync = sync;
+function async(path, options, callback) {
+    options.fs.lstat(path, (err0, lstat) => {
+        if (err0) {
+            return callback(err0, undefined);
+        }
+        if (!isFollowedSymlink(lstat, options)) {
+            return callback(null, lstat);
+        }
+        options.fs.stat(path, (err1, stat) => {
+            if (err1) {
+                return options.throwErrorOnBrokenSymlinks ? callback(err1) : callback(null, lstat);
+            }
+            stat.isSymbolicLink = () => true;
+            callback(null, stat);
+        });
+    });
+}
+exports.async = async;
+/**
+ * Returns `true` for followed symlink.
+ */
+function isFollowedSymlink(stat, options) {
+    return stat.isSymbolicLink() && options.followSymlinks;
+}
+exports.isFollowedSymlink = isFollowedSymlink;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/node_modules/glob-parent/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var path = __webpack_require__("path");
+var isglob = __webpack_require__("../../node_modules/fast-glob/node_modules/glob-parent/node_modules/is-glob/index.js");
+var pathDirname = __webpack_require__("../../node_modules/path-dirname/index.js");
+var isWin32 = __webpack_require__("os").platform() === 'win32';
+
+module.exports = function globParent(str) {
+	// flip windows path separators
+	if (isWin32 && str.indexOf('/') < 0) str = str.split('\\').join('/');
+
+	// special case for strings ending in enclosure containing path separator
+	if (/[\{\[].*[\/]*.*[\}\]]$/.test(str)) str += '/';
+
+	// preserves full path in case of trailing path separator
+	str += 'a';
+
+	// remove path parts that are globby
+	do {str = pathDirname.posix(str)}
+	while (isglob(str) || /(^|[^\\])([\{\[]|\([^\)]+$)/.test(str));
+
+	// remove escape chars and return result
+	return str.replace(/\\([\*\?\|\[\]\(\)\{\}])/g, '$1');
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/node_modules/glob-parent/node_modules/is-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+var isExtglob = __webpack_require__("../../node_modules/is-extglob/index.js");
+
+module.exports = function isGlob(str) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
+
+  if (isExtglob(str)) return true;
+
+  var regex = /(\\).|([*?]|\[.*\]|\{.*\}|\(.*\|.*\)|^!)/;
+  var match;
+
+  while ((match = regex.exec(str))) {
+    if (match[2]) return true;
+    str = str.slice(match.index + match[0].length);
+  }
+  return false;
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/adapters/fs-stream.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var stream = __webpack_require__("stream");
+var fsStat = __webpack_require__("../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/index.js");
+var fs_1 = __webpack_require__("../../node_modules/fast-glob/out/adapters/fs.js");
+var FileSystemStream = /** @class */ (function (_super) {
+    __extends(FileSystemStream, _super);
+    function FileSystemStream() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Use stream API to read entries for Task.
+     */
+    FileSystemStream.prototype.read = function (patterns, filter) {
+        var _this = this;
+        var filepaths = patterns.map(this.getFullEntryPath, this);
+        var transform = new stream.Transform({ objectMode: true });
+        transform._transform = function (index, _enc, done) {
+            return _this.getEntry(filepaths[index], patterns[index]).then(function (entry) {
+                if (entry !== null && filter(entry)) {
+                    transform.push(entry);
+                }
+                if (index === filepaths.length - 1) {
+                    transform.end();
+                }
+                done();
+            });
+        };
+        for (var i = 0; i < filepaths.length; i++) {
+            transform.write(i);
+        }
+        return transform;
+    };
+    /**
+     * Return entry for the provided path.
+     */
+    FileSystemStream.prototype.getEntry = function (filepath, pattern) {
+        var _this = this;
+        return this.getStat(filepath)
+            .then(function (stat) { return _this.makeEntry(stat, pattern); })
+            .catch(function () { return null; });
+    };
+    /**
+     * Return fs.Stats for the provided path.
+     */
+    FileSystemStream.prototype.getStat = function (filepath) {
+        return fsStat.stat(filepath, { throwErrorOnBrokenSymlinks: false });
+    };
+    return FileSystemStream;
+}(fs_1.default));
+exports.default = FileSystemStream;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/adapters/fs-sync.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var fsStat = __webpack_require__("../../node_modules/fast-glob/node_modules/@nodelib/fs.stat/out/index.js");
+var fs_1 = __webpack_require__("../../node_modules/fast-glob/out/adapters/fs.js");
+var FileSystemSync = /** @class */ (function (_super) {
+    __extends(FileSystemSync, _super);
+    function FileSystemSync() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Use sync API to read entries for Task.
+     */
+    FileSystemSync.prototype.read = function (patterns, filter) {
+        var _this = this;
+        var entries = [];
+        patterns.forEach(function (pattern) {
+            var filepath = _this.getFullEntryPath(pattern);
+            var entry = _this.getEntry(filepath, pattern);
+            if (entry === null || !filter(entry)) {
+                return;
+            }
+            entries.push(entry);
+        });
+        return entries;
+    };
+    /**
+     * Return entry for the provided path.
+     */
+    FileSystemSync.prototype.getEntry = function (filepath, pattern) {
+        try {
+            var stat = this.getStat(filepath);
+            return this.makeEntry(stat, pattern);
+        }
+        catch (err) {
+            return null;
+        }
+    };
+    /**
+     * Return fs.Stats for the provided path.
+     */
+    FileSystemSync.prototype.getStat = function (filepath) {
+        return fsStat.statSync(filepath, { throwErrorOnBrokenSymlinks: false });
+    };
+    return FileSystemSync;
+}(fs_1.default));
+exports.default = FileSystemSync;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/adapters/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var path = __webpack_require__("path");
+var FileSystem = /** @class */ (function () {
+    function FileSystem(options) {
+        this.options = options;
+    }
+    /**
+     * Return full path to entry.
+     */
+    FileSystem.prototype.getFullEntryPath = function (filepath) {
+        return path.resolve(this.options.cwd, filepath);
+    };
+    /**
+     * Return an implementation of the Entry interface.
+     */
+    FileSystem.prototype.makeEntry = function (stat, pattern) {
+        stat.path = pattern;
+        stat.depth = pattern.split('/').length;
+        return stat;
+    };
+    return FileSystem;
+}());
+exports.default = FileSystem;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var optionsManager = __webpack_require__("../../node_modules/fast-glob/out/managers/options.js");
+var taskManager = __webpack_require__("../../node_modules/fast-glob/out/managers/tasks.js");
+var reader_async_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/reader-async.js");
+var reader_stream_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/reader-stream.js");
+var reader_sync_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/reader-sync.js");
+var arrayUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/array.js");
+var streamUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/stream.js");
+/**
+ * Synchronous API.
+ */
+function sync(source, opts) {
+    assertPatternsInput(source);
+    var works = getWorks(source, reader_sync_1.default, opts);
+    return arrayUtils.flatten(works);
+}
+exports.sync = sync;
+/**
+ * Asynchronous API.
+ */
+function async(source, opts) {
+    try {
+        assertPatternsInput(source);
+    }
+    catch (error) {
+        return Promise.reject(error);
+    }
+    var works = getWorks(source, reader_async_1.default, opts);
+    return Promise.all(works).then(arrayUtils.flatten);
+}
+exports.async = async;
+/**
+ * Stream API.
+ */
+function stream(source, opts) {
+    assertPatternsInput(source);
+    var works = getWorks(source, reader_stream_1.default, opts);
+    return streamUtils.merge(works);
+}
+exports.stream = stream;
+/**
+ * Return a set of tasks based on provided patterns.
+ */
+function generateTasks(source, opts) {
+    assertPatternsInput(source);
+    var patterns = [].concat(source);
+    var options = optionsManager.prepare(opts);
+    return taskManager.generate(patterns, options);
+}
+exports.generateTasks = generateTasks;
+/**
+ * Returns a set of works based on provided tasks and class of the reader.
+ */
+function getWorks(source, _Reader, opts) {
+    var patterns = [].concat(source);
+    var options = optionsManager.prepare(opts);
+    var tasks = taskManager.generate(patterns, options);
+    var reader = new _Reader(options);
+    return tasks.map(reader.read, reader);
+}
+function assertPatternsInput(source) {
+    if ([].concat(source).every(isString)) {
+        return;
+    }
+    throw new TypeError('Patterns must be a string or an array of strings');
+}
+function isString(source) {
+    /* tslint:disable-next-line strict-type-predicates */
+    return typeof source === 'string';
+}
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/managers/options.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+function prepare(options) {
+    var opts = __assign({ cwd: process.cwd(), deep: true, ignore: [], dot: false, stats: false, onlyFiles: true, onlyDirectories: false, followSymlinkedDirectories: true, unique: true, markDirectories: false, absolute: false, nobrace: false, brace: true, noglobstar: false, globstar: true, noext: false, extension: true, nocase: false, case: true, matchBase: false, transform: null }, options);
+    if (opts.onlyDirectories) {
+        opts.onlyFiles = false;
+    }
+    opts.brace = !opts.nobrace;
+    opts.globstar = !opts.noglobstar;
+    opts.extension = !opts.noext;
+    opts.case = !opts.nocase;
+    if (options) {
+        opts.brace = ('brace' in options ? options.brace : opts.brace);
+        opts.globstar = ('globstar' in options ? options.globstar : opts.globstar);
+        opts.extension = ('extension' in options ? options.extension : opts.extension);
+        opts.case = ('case' in options ? options.case : opts.case);
+    }
+    return opts;
+}
+exports.prepare = prepare;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/managers/tasks.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var patternUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/pattern.js");
+/**
+ * Generate tasks based on parent directory of each pattern.
+ */
+function generate(patterns, options) {
+    var unixPatterns = patterns.map(patternUtils.unixifyPattern);
+    var unixIgnore = options.ignore.map(patternUtils.unixifyPattern);
+    var positivePatterns = getPositivePatterns(unixPatterns);
+    var negativePatterns = getNegativePatternsAsPositive(unixPatterns, unixIgnore);
+    /**
+     * When the `case` option is disabled, all patterns must be marked as dynamic, because we cannot check filepath
+     * directly (without read directory).
+     */
+    var staticPatterns = !options.case ? [] : positivePatterns.filter(patternUtils.isStaticPattern);
+    var dynamicPatterns = !options.case ? positivePatterns : positivePatterns.filter(patternUtils.isDynamicPattern);
+    var staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
+    var dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
+    return staticTasks.concat(dynamicTasks);
+}
+exports.generate = generate;
+/**
+ * Convert patterns to tasks based on parent directory of each pattern.
+ */
+function convertPatternsToTasks(positive, negative, dynamic) {
+    var 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) {
+        var task = convertPatternGroupToTask('.', positive, negative, dynamic);
+        return [task];
+    }
+    return convertPatternGroupsToTasks(positivePatternsGroup, negative, dynamic);
+}
+exports.convertPatternsToTasks = convertPatternsToTasks;
+/**
+ * Return only positive patterns.
+ */
+function getPositivePatterns(patterns) {
+    return patternUtils.getPositivePatterns(patterns);
+}
+exports.getPositivePatterns = getPositivePatterns;
+/**
+ * Return only negative patterns.
+ */
+function getNegativePatternsAsPositive(patterns, ignore) {
+    var negative = patternUtils.getNegativePatterns(patterns).concat(ignore);
+    var positive = negative.map(patternUtils.convertToPositivePattern);
+    return positive;
+}
+exports.getNegativePatternsAsPositive = getNegativePatternsAsPositive;
+/**
+ * Group patterns by base directory of each pattern.
+ */
+function groupPatternsByBaseDirectory(patterns) {
+    return patterns.reduce(function (collection, pattern) {
+        var base = patternUtils.getBaseDirectory(pattern);
+        if (base in collection) {
+            collection[base].push(pattern);
+        }
+        else {
+            collection[base] = [pattern];
+        }
+        return collection;
+    }, {});
+}
+exports.groupPatternsByBaseDirectory = groupPatternsByBaseDirectory;
+/**
+ * Convert group of patterns to tasks.
+ */
+function convertPatternGroupsToTasks(positive, negative, dynamic) {
+    return Object.keys(positive).map(function (base) {
+        return convertPatternGroupToTask(base, positive[base], negative, dynamic);
+    });
+}
+exports.convertPatternGroupsToTasks = convertPatternGroupsToTasks;
+/**
+ * Create a task for positive and negative patterns.
+ */
+function convertPatternGroupToTask(base, positive, negative, dynamic) {
+    return {
+        base: base,
+        dynamic: dynamic,
+        positive: positive,
+        negative: negative,
+        patterns: [].concat(positive, negative.map(patternUtils.convertToNegativePattern))
+    };
+}
+exports.convertPatternGroupToTask = convertPatternGroupToTask;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/providers/filters/deep.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var pathUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/path.js");
+var patternUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/pattern.js");
+var DeepFilter = /** @class */ (function () {
+    function DeepFilter(options, micromatchOptions) {
+        this.options = options;
+        this.micromatchOptions = micromatchOptions;
+    }
+    /**
+     * Returns filter for directories.
+     */
+    DeepFilter.prototype.getFilter = function (positive, negative) {
+        var _this = this;
+        var maxPatternDepth = this.getMaxPatternDepth(positive);
+        var negativeRe = this.getNegativePatternsRe(negative);
+        return function (entry) { return _this.filter(entry, negativeRe, maxPatternDepth); };
+    };
+    /**
+     * Returns max depth of the provided patterns.
+     */
+    DeepFilter.prototype.getMaxPatternDepth = function (patterns) {
+        var globstar = patterns.some(patternUtils.hasGlobStar);
+        return globstar ? Infinity : patternUtils.getMaxNaivePatternsDepth(patterns);
+    };
+    /**
+     * Returns RegExp's for patterns that can affect the depth of reading.
+     */
+    DeepFilter.prototype.getNegativePatternsRe = function (patterns) {
+        var affectDepthOfReadingPatterns = patterns.filter(patternUtils.isAffectDepthOfReadingPattern);
+        return patternUtils.convertPatternsToRe(affectDepthOfReadingPatterns, this.micromatchOptions);
+    };
+    /**
+     * Returns «true» for directory that should be read.
+     */
+    DeepFilter.prototype.filter = function (entry, negativeRe, maxPatternDepth) {
+        if (this.isSkippedByDeepOption(entry.depth)) {
+            return false;
+        }
+        if (this.isSkippedByMaxPatternDepth(entry.depth, maxPatternDepth)) {
+            return false;
+        }
+        if (this.isSkippedSymlinkedDirectory(entry)) {
+            return false;
+        }
+        if (this.isSkippedDotDirectory(entry)) {
+            return false;
+        }
+        return this.isSkippedByNegativePatterns(entry, negativeRe);
+    };
+    /**
+     * Returns «true» when the «deep» option is disabled or number and depth of the entry is greater that the option value.
+     */
+    DeepFilter.prototype.isSkippedByDeepOption = function (entryDepth) {
+        return !this.options.deep || (typeof this.options.deep === 'number' && entryDepth >= this.options.deep);
+    };
+    /**
+     * Returns «true» when depth parameter is not an Infinity and entry depth greater that the parameter value.
+     */
+    DeepFilter.prototype.isSkippedByMaxPatternDepth = function (entryDepth, maxPatternDepth) {
+        return maxPatternDepth !== Infinity && entryDepth >= maxPatternDepth;
+    };
+    /**
+     * Returns «true» for symlinked directory if the «followSymlinkedDirectories» option is disabled.
+     */
+    DeepFilter.prototype.isSkippedSymlinkedDirectory = function (entry) {
+        return !this.options.followSymlinkedDirectories && entry.isSymbolicLink();
+    };
+    /**
+     * Returns «true» for a directory whose name starts with a period if «dot» option is disabled.
+     */
+    DeepFilter.prototype.isSkippedDotDirectory = function (entry) {
+        return !this.options.dot && pathUtils.isDotDirectory(entry.path);
+    };
+    /**
+     * Returns «true» for a directory whose path math to any negative pattern.
+     */
+    DeepFilter.prototype.isSkippedByNegativePatterns = function (entry, negativeRe) {
+        return !patternUtils.matchAny(entry.path, negativeRe);
+    };
+    return DeepFilter;
+}());
+exports.default = DeepFilter;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/providers/filters/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var pathUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/path.js");
+var patternUtils = __webpack_require__("../../node_modules/fast-glob/out/utils/pattern.js");
+var EntryFilter = /** @class */ (function () {
+    function EntryFilter(options, micromatchOptions) {
+        this.options = options;
+        this.micromatchOptions = micromatchOptions;
+        this.index = new Map();
+    }
+    /**
+     * Returns filter for directories.
+     */
+    EntryFilter.prototype.getFilter = function (positive, negative) {
+        var _this = this;
+        var positiveRe = patternUtils.convertPatternsToRe(positive, this.micromatchOptions);
+        var negativeRe = patternUtils.convertPatternsToRe(negative, this.micromatchOptions);
+        return function (entry) { return _this.filter(entry, positiveRe, negativeRe); };
+    };
+    /**
+     * Returns true if entry must be added to result.
+     */
+    EntryFilter.prototype.filter = function (entry, positiveRe, negativeRe) {
+        // Exclude duplicate results
+        if (this.options.unique) {
+            if (this.isDuplicateEntry(entry)) {
+                return false;
+            }
+            this.createIndexRecord(entry);
+        }
+        // Filter files and directories by options
+        if (this.onlyFileFilter(entry) || this.onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this.isSkippedByAbsoluteNegativePatterns(entry, negativeRe)) {
+            return false;
+        }
+        return this.isMatchToPatterns(entry.path, positiveRe) && !this.isMatchToPatterns(entry.path, negativeRe);
+    };
+    /**
+     * Return true if the entry already has in the cross reader index.
+     */
+    EntryFilter.prototype.isDuplicateEntry = function (entry) {
+        return this.index.has(entry.path);
+    };
+    /**
+     * Create record in the cross reader index.
+     */
+    EntryFilter.prototype.createIndexRecord = function (entry) {
+        this.index.set(entry.path, undefined);
+    };
+    /**
+     * Returns true for non-files if the «onlyFiles» option is enabled.
+     */
+    EntryFilter.prototype.onlyFileFilter = function (entry) {
+        return this.options.onlyFiles && !entry.isFile();
+    };
+    /**
+     * Returns true for non-directories if the «onlyDirectories» option is enabled.
+     */
+    EntryFilter.prototype.onlyDirectoryFilter = function (entry) {
+        return this.options.onlyDirectories && !entry.isDirectory();
+    };
+    /**
+     * Return true when `absolute` option is enabled and matched to the negative patterns.
+     */
+    EntryFilter.prototype.isSkippedByAbsoluteNegativePatterns = function (entry, negativeRe) {
+        if (!this.options.absolute) {
+            return false;
+        }
+        var fullpath = pathUtils.makeAbsolute(this.options.cwd, entry.path);
+        return this.isMatchToPatterns(fullpath, negativeRe);
+    };
+    /**
+     * Return true when entry match to provided patterns.
+     *
+     * First, just trying to apply patterns to the path.
+     * Second, trying to apply patterns to the path with final slash (need to micromatch to support «directory/**» patterns).
+     */
+    EntryFilter.prototype.isMatchToPatterns = function (filepath, patternsRe) {
+        return patternUtils.matchAny(filepath, patternsRe) || patternUtils.matchAny(filepath + '/', patternsRe);
+    };
+    return EntryFilter;
+}());
+exports.default = EntryFilter;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/providers/reader-async.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var readdir = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/index.js");
+var reader_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/reader.js");
+var fs_stream_1 = __webpack_require__("../../node_modules/fast-glob/out/adapters/fs-stream.js");
+var ReaderAsync = /** @class */ (function (_super) {
+    __extends(ReaderAsync, _super);
+    function ReaderAsync() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(ReaderAsync.prototype, "fsAdapter", {
+        /**
+         * Returns FileSystem adapter.
+         */
+        get: function () {
+            return new fs_stream_1.default(this.options);
+        },
+        enumerable: true,
+        configurable: true
+    });
+    /**
+     * Use async API to read entries for Task.
+     */
+    ReaderAsync.prototype.read = function (task) {
+        var _this = this;
+        var root = this.getRootDirectory(task);
+        var options = this.getReaderOptions(task);
+        var entries = [];
+        return new Promise(function (resolve, reject) {
+            var stream = _this.api(root, task, options);
+            stream.on('error', function (err) {
+                _this.isEnoentCodeError(err) ? resolve([]) : reject(err);
+                stream.pause();
+            });
+            stream.on('data', function (entry) { return entries.push(_this.transform(entry)); });
+            stream.on('end', function () { return resolve(entries); });
+        });
+    };
+    /**
+     * Returns founded paths.
+     */
+    ReaderAsync.prototype.api = function (root, task, options) {
+        if (task.dynamic) {
+            return this.dynamicApi(root, options);
+        }
+        return this.staticApi(task, options);
+    };
+    /**
+     * Api for dynamic tasks.
+     */
+    ReaderAsync.prototype.dynamicApi = function (root, options) {
+        return readdir.readdirStreamStat(root, options);
+    };
+    /**
+     * Api for static tasks.
+     */
+    ReaderAsync.prototype.staticApi = function (task, options) {
+        return this.fsAdapter.read(task.patterns, options.filter);
+    };
+    return ReaderAsync;
+}(reader_1.default));
+exports.default = ReaderAsync;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/providers/reader-stream.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var stream = __webpack_require__("stream");
+var readdir = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/index.js");
+var reader_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/reader.js");
+var fs_stream_1 = __webpack_require__("../../node_modules/fast-glob/out/adapters/fs-stream.js");
+var TransformStream = /** @class */ (function (_super) {
+    __extends(TransformStream, _super);
+    function TransformStream(reader) {
+        var _this = _super.call(this, { objectMode: true }) || this;
+        _this.reader = reader;
+        return _this;
+    }
+    TransformStream.prototype._transform = function (entry, _encoding, callback) {
+        callback(null, this.reader.transform(entry));
+    };
+    return TransformStream;
+}(stream.Transform));
+var ReaderStream = /** @class */ (function (_super) {
+    __extends(ReaderStream, _super);
+    function ReaderStream() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(ReaderStream.prototype, "fsAdapter", {
+        /**
+         * Returns FileSystem adapter.
+         */
+        get: function () {
+            return new fs_stream_1.default(this.options);
+        },
+        enumerable: true,
+        configurable: true
+    });
+    /**
+     * Use stream API to read entries for Task.
+     */
+    ReaderStream.prototype.read = function (task) {
+        var _this = this;
+        var root = this.getRootDirectory(task);
+        var options = this.getReaderOptions(task);
+        var transform = new TransformStream(this);
+        var readable = this.api(root, task, options);
+        return readable
+            .on('error', function (err) { return _this.isEnoentCodeError(err) ? null : transform.emit('error', err); })
+            .pipe(transform);
+    };
+    /**
+     * Returns founded paths.
+     */
+    ReaderStream.prototype.api = function (root, task, options) {
+        if (task.dynamic) {
+            return this.dynamicApi(root, options);
+        }
+        return this.staticApi(task, options);
+    };
+    /**
+     * Api for dynamic tasks.
+     */
+    ReaderStream.prototype.dynamicApi = function (root, options) {
+        return readdir.readdirStreamStat(root, options);
+    };
+    /**
+     * Api for static tasks.
+     */
+    ReaderStream.prototype.staticApi = function (task, options) {
+        return this.fsAdapter.read(task.patterns, options.filter);
+    };
+    return ReaderStream;
+}(reader_1.default));
+exports.default = ReaderStream;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/providers/reader-sync.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var readdir = __webpack_require__("../../node_modules/@mrmlnc/readdir-enhanced/lib/index.js");
+var reader_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/reader.js");
+var fs_sync_1 = __webpack_require__("../../node_modules/fast-glob/out/adapters/fs-sync.js");
+var ReaderSync = /** @class */ (function (_super) {
+    __extends(ReaderSync, _super);
+    function ReaderSync() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(ReaderSync.prototype, "fsAdapter", {
+        /**
+         * Returns FileSystem adapter.
+         */
+        get: function () {
+            return new fs_sync_1.default(this.options);
+        },
+        enumerable: true,
+        configurable: true
+    });
+    /**
+     * Use sync API to read entries for Task.
+     */
+    ReaderSync.prototype.read = function (task) {
+        var root = this.getRootDirectory(task);
+        var options = this.getReaderOptions(task);
+        try {
+            var entries = this.api(root, task, options);
+            return entries.map(this.transform, this);
+        }
+        catch (err) {
+            if (this.isEnoentCodeError(err)) {
+                return [];
+            }
+            throw err;
+        }
+    };
+    /**
+     * Returns founded paths.
+     */
+    ReaderSync.prototype.api = function (root, task, options) {
+        if (task.dynamic) {
+            return this.dynamicApi(root, options);
+        }
+        return this.staticApi(task, options);
+    };
+    /**
+     * Api for dynamic tasks.
+     */
+    ReaderSync.prototype.dynamicApi = function (root, options) {
+        return readdir.readdirSyncStat(root, options);
+    };
+    /**
+     * Api for static tasks.
+     */
+    ReaderSync.prototype.staticApi = function (task, options) {
+        return this.fsAdapter.read(task.patterns, options.filter);
+    };
+    return ReaderSync;
+}(reader_1.default));
+exports.default = ReaderSync;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/providers/reader.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var path = __webpack_require__("path");
+var deep_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/filters/deep.js");
+var entry_1 = __webpack_require__("../../node_modules/fast-glob/out/providers/filters/entry.js");
+var pathUtil = __webpack_require__("../../node_modules/fast-glob/out/utils/path.js");
+var Reader = /** @class */ (function () {
+    function Reader(options) {
+        this.options = options;
+        this.micromatchOptions = this.getMicromatchOptions();
+        this.entryFilter = new entry_1.default(options, this.micromatchOptions);
+        this.deepFilter = new deep_1.default(options, this.micromatchOptions);
+    }
+    /**
+     * Returns root path to scanner.
+     */
+    Reader.prototype.getRootDirectory = function (task) {
+        return path.resolve(this.options.cwd, task.base);
+    };
+    /**
+     * Returns options for reader.
+     */
+    Reader.prototype.getReaderOptions = function (task) {
+        return {
+            basePath: task.base === '.' ? '' : task.base,
+            filter: this.entryFilter.getFilter(task.positive, task.negative),
+            deep: this.deepFilter.getFilter(task.positive, task.negative),
+            sep: '/'
+        };
+    };
+    /**
+     * Returns options for micromatch.
+     */
+    Reader.prototype.getMicromatchOptions = function () {
+        return {
+            dot: this.options.dot,
+            nobrace: !this.options.brace,
+            noglobstar: !this.options.globstar,
+            noext: !this.options.extension,
+            nocase: !this.options.case,
+            matchBase: this.options.matchBase
+        };
+    };
+    /**
+     * Returns transformed entry.
+     */
+    Reader.prototype.transform = function (entry) {
+        if (this.options.absolute) {
+            entry.path = pathUtil.makeAbsolute(this.options.cwd, entry.path);
+        }
+        if (this.options.markDirectories && entry.isDirectory()) {
+            entry.path += '/';
+        }
+        var item = this.options.stats ? entry : entry.path;
+        if (this.options.transform === null) {
+            return item;
+        }
+        return this.options.transform(item);
+    };
+    /**
+     * Returns true if error has ENOENT code.
+     */
+    Reader.prototype.isEnoentCodeError = function (err) {
+        return err.code === 'ENOENT';
+    };
+    return Reader;
+}());
+exports.default = Reader;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/utils/array.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Flatten nested arrays (max depth is 2) into a non-nested array of non-array items.
+ */
+function flatten(items) {
+    return items.reduce(function (collection, item) { return [].concat(collection, item); }, []);
+}
+exports.flatten = flatten;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/utils/path.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var path = __webpack_require__("path");
+/**
+ * Returns «true» if the last partial of the path starting with a period.
+ */
+function isDotDirectory(filepath) {
+    return path.basename(filepath).startsWith('.');
+}
+exports.isDotDirectory = isDotDirectory;
+/**
+ * Convert a windows-like path to a unix-style path.
+ */
+function normalize(filepath) {
+    return filepath.replace(/\\/g, '/');
+}
+exports.normalize = normalize;
+/**
+ * Returns normalized absolute path of provided filepath.
+ */
+function makeAbsolute(cwd, filepath) {
+    return normalize(path.resolve(cwd, filepath));
+}
+exports.makeAbsolute = makeAbsolute;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/utils/pattern.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var path = __webpack_require__("path");
+var globParent = __webpack_require__("../../node_modules/fast-glob/node_modules/glob-parent/index.js");
+var isGlob = __webpack_require__("../../node_modules/is-glob/index.js");
+var micromatch = __webpack_require__("../../node_modules/micromatch/index.js");
+var GLOBSTAR = '**';
+/**
+ * Return true for static pattern.
+ */
+function isStaticPattern(pattern) {
+    return !isDynamicPattern(pattern);
+}
+exports.isStaticPattern = isStaticPattern;
+/**
+ * Return true for pattern that looks like glob.
+ */
+function isDynamicPattern(pattern) {
+    return isGlob(pattern, { strict: false });
+}
+exports.isDynamicPattern = isDynamicPattern;
+/**
+ * Convert a windows «path» to a unix-style «path».
+ */
+function unixifyPattern(pattern) {
+    return pattern.replace(/\\/g, '/');
+}
+exports.unixifyPattern = unixifyPattern;
+/**
+ * Returns negative pattern as positive pattern.
+ */
+function convertToPositivePattern(pattern) {
+    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
+}
+exports.convertToPositivePattern = convertToPositivePattern;
+/**
+ * Returns positive pattern as negative pattern.
+ */
+function convertToNegativePattern(pattern) {
+    return '!' + pattern;
+}
+exports.convertToNegativePattern = convertToNegativePattern;
+/**
+ * Return true if provided pattern is negative pattern.
+ */
+function isNegativePattern(pattern) {
+    return pattern.startsWith('!') && pattern[1] !== '(';
+}
+exports.isNegativePattern = isNegativePattern;
+/**
+ * Return true if provided pattern is positive pattern.
+ */
+function isPositivePattern(pattern) {
+    return !isNegativePattern(pattern);
+}
+exports.isPositivePattern = isPositivePattern;
+/**
+ * Extracts negative patterns from array of patterns.
+ */
+function getNegativePatterns(patterns) {
+    return patterns.filter(isNegativePattern);
+}
+exports.getNegativePatterns = getNegativePatterns;
+/**
+ * Extracts positive patterns from array of patterns.
+ */
+function getPositivePatterns(patterns) {
+    return patterns.filter(isPositivePattern);
+}
+exports.getPositivePatterns = getPositivePatterns;
+/**
+ * Extract base directory from provided pattern.
+ */
+function getBaseDirectory(pattern) {
+    return globParent(pattern);
+}
+exports.getBaseDirectory = getBaseDirectory;
+/**
+ * Return true if provided pattern has globstar.
+ */
+function hasGlobStar(pattern) {
+    return pattern.indexOf(GLOBSTAR) !== -1;
+}
+exports.hasGlobStar = hasGlobStar;
+/**
+ * Return true if provided pattern ends with slash and globstar.
+ */
+function endsWithSlashGlobStar(pattern) {
+    return pattern.endsWith('/' + GLOBSTAR);
+}
+exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
+/**
+ * Returns «true» when pattern ends with a slash and globstar or the last partial of the pattern is static pattern.
+ */
+function isAffectDepthOfReadingPattern(pattern) {
+    var basename = path.basename(pattern);
+    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
+}
+exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
+/**
+ * Return naive depth of provided pattern without depth of the base directory.
+ */
+function getNaiveDepth(pattern) {
+    var base = getBaseDirectory(pattern);
+    var patternDepth = pattern.split('/').length;
+    var patternBaseDepth = base.split('/').length;
+    /**
+     * This is a hack for pattern that has no base directory.
+     *
+     * This is related to the `*\something\*` pattern.
+     */
+    if (base === '.') {
+        return patternDepth - patternBaseDepth;
+    }
+    return patternDepth - patternBaseDepth - 1;
+}
+exports.getNaiveDepth = getNaiveDepth;
+/**
+ * Return max naive depth of provided patterns without depth of the base directory.
+ */
+function getMaxNaivePatternsDepth(patterns) {
+    return patterns.reduce(function (max, pattern) {
+        var depth = getNaiveDepth(pattern);
+        return depth > max ? depth : max;
+    }, 0);
+}
+exports.getMaxNaivePatternsDepth = getMaxNaivePatternsDepth;
+/**
+ * Make RegExp for provided pattern.
+ */
+function makeRe(pattern, options) {
+    return micromatch.makeRe(pattern, options);
+}
+exports.makeRe = makeRe;
+/**
+ * Convert patterns to regexps.
+ */
+function convertPatternsToRe(patterns, options) {
+    return patterns.map(function (pattern) { return makeRe(pattern, options); });
+}
+exports.convertPatternsToRe = convertPatternsToRe;
+/**
+ * Returns true if the entry match any of the given RegExp's.
+ */
+function matchAny(entry, patternsRe) {
+    return patternsRe.some(function (patternRe) { return patternRe.test(entry); });
+}
+exports.matchAny = matchAny;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fast-glob/out/utils/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+/**
+ * Merge multiple streams and propagate their errors into one stream in parallel.
+ */
+function merge(streams) {
+    var mergedStream = merge2(streams);
+    streams.forEach(function (stream) {
+        stream.on('error', function (err) { return mergedStream.emit('error', err); });
+    });
+    return mergedStream;
+}
+exports.merge = merge;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fastq/queue.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var reusify = __webpack_require__("../../node_modules/reusify/reusify.js")
+
+function fastqueue (context, worker, concurrency) {
+  if (typeof context === 'function') {
+    concurrency = worker
+    worker = context
+    context = null
+  }
+
+  var cache = reusify(Task)
+  var queueHead = null
+  var queueTail = null
+  var _running = 0
+
+  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
+  }
+
+  return self
+
+  function running () {
+    return _running
+  }
+
+  function pause () {
+    self.paused = true
+  }
+
+  function length () {
+    var current = queueHead
+    var counter = 0
+
+    while (current) {
+      current = current.next
+      counter++
+    }
+
+    return counter
+  }
+
+  function resume () {
+    if (!self.paused) return
+    self.paused = false
+    for (var i = 0; i < self.concurrency; i++) {
+      _running++
+      release()
+    }
+  }
+
+  function idle () {
+    return _running === 0 && self.length() === 0
+  }
+
+  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 {
+        queueHead = current
+        queueTail = current
+        self.saturated()
+      }
+    } else {
+      _running++
+      worker.call(context, current.value, current.worked)
+    }
+  }
+
+  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)
+    }
+  }
+
+  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()
+    }
+  }
+
+  function kill () {
+    queueHead = null
+    queueTail = null
+    self.drain = noop
+  }
+
+  function killAndDrain () {
+    queueHead = null
+    queueTail = null
+    self.drain()
+    self.drain = noop
+  }
+}
+
+function noop () {}
+
+function Task () {
+  this.value = null
+  this.callback = noop
+  this.next = null
+  this.release = noop
+  this.context = null
+
+  var self = this
+
+  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)
+  }
+}
+
+module.exports = fastqueue
+
+
+/***/ }),
+
+/***/ "../../node_modules/fill-range/index.js":
+/***/ (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.
+ */
+
+
+
+const util = __webpack_require__("util");
+const toRegexRange = __webpack_require__("../../node_modules/to-regex-range/index.js");
+
+const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+
+const transform = toNumber => {
+  return value => toNumber === true ? Number(value) : String(value);
+};
+
+const isValidValue = value => {
+  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+};
+
+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;
+};
+
+const stringify = (start, end, options) => {
+  if (typeof start === 'string' || typeof end === 'string') {
+    return true;
+  }
+  return options.stringify === true;
+};
+
+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 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 (parts.negatives.length) {
+    negatives = `-(${prefix}${parts.negatives.join('|')})`;
+  }
+
+  if (positives && negatives) {
+    result = `${positives}|${negatives}`;
+  } else {
+    result = positives || negatives;
+  }
+
+  if (options.wrap) {
+    return `(${prefix}${result})`;
+  }
+
+  return result;
+};
+
+const toRange = (a, b, isNumbers, options) => {
+  if (isNumbers) {
+    return toRegexRange(a, b, { wrap: false, ...options });
+  }
+
+  let start = String.fromCharCode(a);
+  if (a === b) return start;
+
+  let stop = String.fromCharCode(b);
+  return `[${start}-${stop}]`;
+};
+
+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);
+};
+
+const rangeError = (...args) => {
+  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
+};
+
+const invalidRange = (start, end, options) => {
+  if (options.strictRanges === true) throw rangeError([start, end]);
+  return [];
+};
+
+const invalidStep = (step, options) => {
+  if (options.strictRanges === true) {
+    throw new TypeError(`Expected step "${step}" to be a number`);
+  }
+  return [];
+};
+
+const fillNumbers = (start, end, step = 1, options = {}) => {
+  let a = Number(start);
+  let b = Number(end);
+
+  if (!Number.isInteger(a) || !Number.isInteger(b)) {
+    if (options.strictRanges === true) throw rangeError([start, end]);
+    return [];
+  }
+
+  // fix negative zero
+  if (a === 0) a = 0;
+  if (b === 0) b = 0;
+
+  let descending = a > b;
+  let startString = String(start);
+  let endString = String(end);
+  let stepString = String(step);
+  step = Math.max(Math.abs(step), 1);
+
+  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 (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;
+};
+
+const fillLetters = (start, end, step = 1, options = {}) => {
+  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
+    return invalidRange(start, end, options);
+  }
+
+
+  let format = options.transform || (val => String.fromCharCode(val));
+  let a = `${start}`.charCodeAt(0);
+  let b = `${end}`.charCodeAt(0);
+
+  let descending = a > b;
+  let min = Math.min(a, b);
+  let max = Math.max(a, b);
+
+  if (options.toRegex && step === 1) {
+    return toRange(min, max, false, options);
+  }
+
+  let range = [];
+  let index = 0;
+
+  while (descending ? a >= b : a <= b) {
+    range.push(format(a, index));
+    a = descending ? a - step : a + step;
+    index++;
+  }
+
+  if (options.toRegex === true) {
+    return toRegex(range, null, { wrap: false, options });
+  }
+
+  return range;
+};
+
+const fill = (start, end, step, options = {}) => {
+  if (end == null && isValidValue(start)) {
+    return [start];
+  }
+
+  if (!isValidValue(start) || !isValidValue(end)) {
+    return invalidRange(start, end, options);
+  }
+
+  if (typeof step === 'function') {
+    return fill(start, end, 1, { transform: step });
+  }
+
+  if (isObject(step)) {
+    return fill(start, end, 0, step);
+  }
+
+  let opts = { ...options };
+  if (opts.capture === true) opts.wrap = true;
+  step = step || opts.step || 1;
+
+  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;
+
+
+/***/ }),
+
+/***/ "../../node_modules/follow-redirects/debug.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var debug;
+
+module.exports = function () {
+  if (!debug) {
+    try {
+      /* eslint global-require: off */
+      debug = __webpack_require__("../../node_modules/debug/src/index.js")("follow-redirects");
+    }
+    catch (error) { /* */ }
+    if (typeof debug !== "function") {
+      debug = function () { /* */ };
+    }
+  }
+  debug.apply(null, arguments);
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/follow-redirects/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var url = __webpack_require__("url");
+var URL = url.URL;
+var http = __webpack_require__("http");
+var https = __webpack_require__("https");
+var Writable = __webpack_require__("stream").Writable;
+var assert = __webpack_require__("assert");
+var debug = __webpack_require__("../../node_modules/follow-redirects/debug.js");
+
+// Create handlers that pass events from native requests
+var events = ["abort", "aborted", "connect", "error", "socket", "timeout"];
+var eventHandlers = Object.create(null);
+events.forEach(function (event) {
+  eventHandlers[event] = function (arg1, arg2, arg3) {
+    this._redirectable.emit(event, arg1, arg2, arg3);
+  };
+});
+
+// Error types with codes
+var RedirectionError = createErrorType(
+  "ERR_FR_REDIRECTION_FAILURE",
+  "Redirected request failed"
+);
+var TooManyRedirectsError = createErrorType(
+  "ERR_FR_TOO_MANY_REDIRECTS",
+  "Maximum number of redirects exceeded"
+);
+var MaxBodyLengthExceededError = createErrorType(
+  "ERR_FR_MAX_BODY_LENGTH_EXCEEDED",
+  "Request body larger than maxBodyLength limit"
+);
+var WriteAfterEndError = createErrorType(
+  "ERR_STREAM_WRITE_AFTER_END",
+  "write after end"
+);
+
+// An HTTP(S) request that can be redirected
+function RedirectableRequest(options, responseCallback) {
+  // Initialize the request
+  Writable.call(this);
+  this._sanitizeOptions(options);
+  this._options = options;
+  this._ended = false;
+  this._ending = false;
+  this._redirectCount = 0;
+  this._redirects = [];
+  this._requestBodyLength = 0;
+  this._requestBodyBuffers = [];
+
+  // Attach a callback if passed
+  if (responseCallback) {
+    this.on("response", responseCallback);
+  }
+
+  // React to responses of native requests
+  var self = this;
+  this._onNativeResponse = function (response) {
+    self._processResponse(response);
+  };
+
+  // Perform the first request
+  this._performRequest();
+}
+RedirectableRequest.prototype = Object.create(Writable.prototype);
+
+RedirectableRequest.prototype.abort = function () {
+  abortRequest(this._currentRequest);
+  this.emit("abort");
+};
+
+// Writes buffered data to the current native request
+RedirectableRequest.prototype.write = function (data, encoding, callback) {
+  // Writing is not allowed if end has been called
+  if (this._ending) {
+    throw new WriteAfterEndError();
+  }
+
+  // Validate input and shift parameters if necessary
+  if (!(typeof data === "string" || typeof data === "object" && ("length" in data))) {
+    throw new TypeError("data should be a string, Buffer or Uint8Array");
+  }
+  if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
+  }
+
+  // Ignore empty buffers, since writing them doesn't invoke the callback
+  // https://github.com/nodejs/node/issues/22066
+  if (data.length === 0) {
+    if (callback) {
+      callback();
+    }
+    return;
+  }
+  // Only write when we don't exceed the maximum body length
+  if (this._requestBodyLength + data.length <= this._options.maxBodyLength) {
+    this._requestBodyLength += data.length;
+    this._requestBodyBuffers.push({ data: data, encoding: encoding });
+    this._currentRequest.write(data, encoding, callback);
+  }
+  // Error when we exceed the maximum body length
+  else {
+    this.emit("error", new MaxBodyLengthExceededError());
+    this.abort();
+  }
+};
+
+// Ends the current native request
+RedirectableRequest.prototype.end = function (data, encoding, callback) {
+  // Shift parameters if necessary
+  if (typeof data === "function") {
+    callback = data;
+    data = encoding = null;
+  }
+  else if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
+  }
+
+  // Write data if needed and end
+  if (!data) {
+    this._ended = this._ending = true;
+    this._currentRequest.end(null, null, callback);
+  }
+  else {
+    var self = this;
+    var currentRequest = this._currentRequest;
+    this.write(data, encoding, function () {
+      self._ended = true;
+      currentRequest.end(null, null, callback);
+    });
+    this._ending = true;
+  }
+};
+
+// Sets a header value on the current native request
+RedirectableRequest.prototype.setHeader = function (name, value) {
+  this._options.headers[name] = value;
+  this._currentRequest.setHeader(name, value);
+};
+
+// Clears a header value on the current native request
+RedirectableRequest.prototype.removeHeader = function (name) {
+  delete this._options.headers[name];
+  this._currentRequest.removeHeader(name);
+};
+
+// Global timeout for all underlying requests
+RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
+  var self = this;
+
+  // Destroys the socket on timeout
+  function destroyOnTimeout(socket) {
+    socket.setTimeout(msecs);
+    socket.removeListener("timeout", socket.destroy);
+    socket.addListener("timeout", socket.destroy);
+  }
+
+  // Sets up a timer to trigger a timeout event
+  function startTimer(socket) {
+    if (self._timeout) {
+      clearTimeout(self._timeout);
+    }
+    self._timeout = setTimeout(function () {
+      self.emit("timeout");
+      clearTimer();
+    }, msecs);
+    destroyOnTimeout(socket);
+  }
+
+  // Stops a timeout from triggering
+  function clearTimer() {
+    // Clear the timeout
+    if (self._timeout) {
+      clearTimeout(self._timeout);
+      self._timeout = null;
+    }
+
+    // Clean up all attached listeners
+    self.removeListener("abort", clearTimer);
+    self.removeListener("error", clearTimer);
+    self.removeListener("response", clearTimer);
+    if (callback) {
+      self.removeListener("timeout", callback);
+    }
+    if (!self.socket) {
+      self._currentRequest.removeListener("socket", startTimer);
+    }
+  }
+
+  // Attach callback if passed
+  if (callback) {
+    this.on("timeout", callback);
+  }
+
+  // Start the timer if or when the socket is opened
+  if (this.socket) {
+    startTimer(this.socket);
+  }
+  else {
+    this._currentRequest.once("socket", startTimer);
+  }
+
+  // Clean up on events
+  this.on("socket", destroyOnTimeout);
+  this.on("abort", clearTimer);
+  this.on("error", clearTimer);
+  this.on("response", clearTimer);
+
+  return this;
+};
+
+// Proxy all other public ClientRequest methods
+[
+  "flushHeaders", "getHeader",
+  "setNoDelay", "setSocketKeepAlive",
+].forEach(function (method) {
+  RedirectableRequest.prototype[method] = function (a, b) {
+    return this._currentRequest[method](a, b);
+  };
+});
+
+// Proxy all public ClientRequest properties
+["aborted", "connection", "socket"].forEach(function (property) {
+  Object.defineProperty(RedirectableRequest.prototype, property, {
+    get: function () { return this._currentRequest[property]; },
+  });
+});
+
+RedirectableRequest.prototype._sanitizeOptions = function (options) {
+  // Ensure headers are always present
+  if (!options.headers) {
+    options.headers = {};
+  }
+
+  // Since http.request treats host as an alias of hostname,
+  // but the url module interprets host as hostname plus port,
+  // eliminate the host property to avoid confusion.
+  if (options.host) {
+    // Use hostname if set, because it has precedence
+    if (!options.hostname) {
+      options.hostname = options.host;
+    }
+    delete options.host;
+  }
+
+  // Complete the URL object when necessary
+  if (!options.pathname && options.path) {
+    var searchPos = options.path.indexOf("?");
+    if (searchPos < 0) {
+      options.pathname = options.path;
+    }
+    else {
+      options.pathname = options.path.substring(0, searchPos);
+      options.search = options.path.substring(searchPos);
+    }
+  }
+};
+
+
+// Executes the next native request (initial or redirect)
+RedirectableRequest.prototype._performRequest = function () {
+  // Load the native protocol
+  var protocol = this._options.protocol;
+  var nativeProtocol = this._options.nativeProtocols[protocol];
+  if (!nativeProtocol) {
+    this.emit("error", new TypeError("Unsupported protocol " + protocol));
+    return;
+  }
+
+  // If specified, use the agent corresponding to the protocol
+  // (HTTP and HTTPS use different types of agents)
+  if (this._options.agents) {
+    var scheme = protocol.substr(0, protocol.length - 1);
+    this._options.agent = this._options.agents[scheme];
+  }
+
+  // Create the native request
+  var request = this._currentRequest =
+        nativeProtocol.request(this._options, this._onNativeResponse);
+  this._currentUrl = url.format(this._options);
+
+  // Set up event handlers
+  request._redirectable = this;
+  for (var e = 0; e < events.length; e++) {
+    request.on(events[e], eventHandlers[events[e]]);
+  }
+
+  // End a redirected request
+  // (The first request must be ended explicitly with RedirectableRequest#end)
+  if (this._isRedirect) {
+    // Write the request entity and end.
+    var i = 0;
+    var self = this;
+    var buffers = this._requestBodyBuffers;
+    (function writeNext(error) {
+      // Only write if this request has not been redirected yet
+      /* istanbul ignore else */
+      if (request === self._currentRequest) {
+        // Report any write errors
+        /* istanbul ignore if */
+        if (error) {
+          self.emit("error", error);
+        }
+        // Write the next buffer if there are still left
+        else if (i < buffers.length) {
+          var buffer = buffers[i++];
+          /* istanbul ignore else */
+          if (!request.finished) {
+            request.write(buffer.data, buffer.encoding, writeNext);
+          }
+        }
+        // End the request if `end` has been called on us
+        else if (self._ended) {
+          request.end();
+        }
+      }
+    }());
+  }
+};
+
+// Processes a response from the current native request
+RedirectableRequest.prototype._processResponse = function (response) {
+  // Store the redirected response
+  var statusCode = response.statusCode;
+  if (this._options.trackRedirects) {
+    this._redirects.push({
+      url: this._currentUrl,
+      headers: response.headers,
+      statusCode: statusCode,
+    });
+  }
+
+  // RFC7231§6.4: The 3xx (Redirection) class of status code indicates
+  // that further action needs to be taken by the user agent in order to
+  // fulfill the request. If a Location header field is provided,
+  // the user agent MAY automatically redirect its request to the URI
+  // referenced by the Location field value,
+  // even if the specific status code is not understood.
+
+  // If the response is not a redirect; return it as-is
+  var location = response.headers.location;
+  if (!location || this._options.followRedirects === false ||
+      statusCode < 300 || statusCode >= 400) {
+    response.responseUrl = this._currentUrl;
+    response.redirects = this._redirects;
+    this.emit("response", response);
+
+    // Clean up
+    this._requestBodyBuffers = [];
+    return;
+  }
+
+  // The response is a redirect, so abort the current request
+  abortRequest(this._currentRequest);
+  // Discard the remainder of the response to avoid waiting for data
+  response.destroy();
+
+  // RFC7231§6.4: A client SHOULD detect and intervene
+  // in cyclical redirections (i.e., "infinite" redirection loops).
+  if (++this._redirectCount > this._options.maxRedirects) {
+    this.emit("error", new TooManyRedirectsError());
+    return;
+  }
+
+  // RFC7231§6.4: Automatic redirection needs to done with
+  // care for methods not known to be safe, […]
+  // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
+  // the request method from POST to GET for the subsequent request.
+  if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" ||
+      // RFC7231§6.4.4: The 303 (See Other) status code indicates that
+      // the server is redirecting the user agent to a different resource […]
+      // A user agent can perform a retrieval request targeting that URI
+      // (a GET or HEAD request if using HTTP) […]
+      (statusCode === 303) && !/^(?:GET|HEAD)$/.test(this._options.method)) {
+    this._options.method = "GET";
+    // Drop a possible entity and headers related to it
+    this._requestBodyBuffers = [];
+    removeMatchingHeaders(/^content-/i, this._options.headers);
+  }
+
+  // Drop the Host header, as the redirect might lead to a different host
+  var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
+
+  // If the redirect is relative, carry over the host of the last request
+  var currentUrlParts = url.parse(this._currentUrl);
+  var currentHost = currentHostHeader || currentUrlParts.host;
+  var currentUrl = /^\w+:/.test(location) ? this._currentUrl :
+    url.format(Object.assign(currentUrlParts, { host: currentHost }));
+
+  // Determine the URL of the redirection
+  var redirectUrl;
+  try {
+    redirectUrl = url.resolve(currentUrl, location);
+  }
+  catch (cause) {
+    this.emit("error", new RedirectionError(cause));
+    return;
+  }
+
+  // Create the redirected request
+  debug("redirecting to", redirectUrl);
+  this._isRedirect = true;
+  var redirectUrlParts = url.parse(redirectUrl);
+  Object.assign(this._options, redirectUrlParts);
+
+  // Drop confidential headers when redirecting to a less secure protocol
+  // or to a different domain that is not a superdomain
+  if (redirectUrlParts.protocol !== currentUrlParts.protocol &&
+     redirectUrlParts.protocol !== "https:" ||
+     redirectUrlParts.host !== currentHost &&
+     !isSubdomain(redirectUrlParts.host, currentHost)) {
+    removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
+  }
+
+  // Evaluate the beforeRedirect callback
+  if (typeof this._options.beforeRedirect === "function") {
+    var responseDetails = { headers: response.headers };
+    try {
+      this._options.beforeRedirect.call(null, this._options, responseDetails);
+    }
+    catch (err) {
+      this.emit("error", err);
+      return;
+    }
+    this._sanitizeOptions(this._options);
+  }
+
+  // Perform the redirected request
+  try {
+    this._performRequest();
+  }
+  catch (cause) {
+    this.emit("error", new RedirectionError(cause));
+  }
+};
+
+// Wraps the key/value object of protocols with redirect functionality
+function wrap(protocols) {
+  // Default settings
+  var exports = {
+    maxRedirects: 21,
+    maxBodyLength: 10 * 1024 * 1024,
+  };
+
+  // Wrap each protocol
+  var nativeProtocols = {};
+  Object.keys(protocols).forEach(function (scheme) {
+    var protocol = scheme + ":";
+    var nativeProtocol = nativeProtocols[protocol] = protocols[scheme];
+    var wrappedProtocol = exports[scheme] = Object.create(nativeProtocol);
+
+    // Executes a request, following redirects
+    function request(input, options, callback) {
+      // Parse parameters
+      if (typeof input === "string") {
+        var urlStr = input;
+        try {
+          input = urlToOptions(new URL(urlStr));
+        }
+        catch (err) {
+          /* istanbul ignore next */
+          input = url.parse(urlStr);
+        }
+      }
+      else if (URL && (input instanceof URL)) {
+        input = urlToOptions(input);
+      }
+      else {
+        callback = options;
+        options = input;
+        input = { protocol: protocol };
+      }
+      if (typeof options === "function") {
+        callback = options;
+        options = null;
+      }
+
+      // Set defaults
+      options = Object.assign({
+        maxRedirects: exports.maxRedirects,
+        maxBodyLength: exports.maxBodyLength,
+      }, input, options);
+      options.nativeProtocols = nativeProtocols;
+
+      assert.equal(options.protocol, protocol, "protocol mismatch");
+      debug("options", options);
+      return new RedirectableRequest(options, callback);
+    }
+
+    // Executes a GET request, following redirects
+    function get(input, options, callback) {
+      var wrappedRequest = wrappedProtocol.request(input, options, callback);
+      wrappedRequest.end();
+      return wrappedRequest;
+    }
+
+    // Expose the properties on the wrapped protocol
+    Object.defineProperties(wrappedProtocol, {
+      request: { value: request, configurable: true, enumerable: true, writable: true },
+      get: { value: get, configurable: true, enumerable: true, writable: true },
+    });
+  });
+  return exports;
+}
+
+/* istanbul ignore next */
+function noop() { /* empty */ }
+
+// from https://github.com/nodejs/node/blob/master/lib/internal/url.js
+function urlToOptions(urlObject) {
+  var options = {
+    protocol: urlObject.protocol,
+    hostname: urlObject.hostname.startsWith("[") ?
+      /* istanbul ignore next */
+      urlObject.hostname.slice(1, -1) :
+      urlObject.hostname,
+    hash: urlObject.hash,
+    search: urlObject.search,
+    pathname: urlObject.pathname,
+    path: urlObject.pathname + urlObject.search,
+    href: urlObject.href,
+  };
+  if (urlObject.port !== "") {
+    options.port = Number(urlObject.port);
+  }
+  return options;
+}
+
+function removeMatchingHeaders(regex, headers) {
+  var lastValue;
+  for (var header in headers) {
+    if (regex.test(header)) {
+      lastValue = headers[header];
+      delete headers[header];
+    }
+  }
+  return (lastValue === null || typeof lastValue === "undefined") ?
+    undefined : String(lastValue).trim();
+}
+
+function createErrorType(code, defaultMessage) {
+  function CustomError(cause) {
+    Error.captureStackTrace(this, this.constructor);
+    if (!cause) {
+      this.message = defaultMessage;
+    }
+    else {
+      this.message = defaultMessage + ": " + cause.message;
+      this.cause = cause;
+    }
+  }
+  CustomError.prototype = new Error();
+  CustomError.prototype.constructor = CustomError;
+  CustomError.prototype.name = "Error [" + code + "]";
+  CustomError.prototype.code = code;
+  return CustomError;
+}
+
+function abortRequest(request) {
+  for (var e = 0; e < events.length; e++) {
+    request.removeListener(events[e], eventHandlers[events[e]]);
+  }
+  request.on("error", noop);
+  request.abort();
+}
+
+function isSubdomain(subdomain, domain) {
+  const dot = subdomain.length - domain.length - 1;
+  return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
+}
+
+// Exports
+module.exports = wrap({ http: http, https: https });
+module.exports.wrap = wrap;
+
+
+/***/ }),
+
+/***/ "../../node_modules/for-in/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * for-in <https://github.com/jonschlinkert/for-in>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+module.exports = function forIn(obj, fn, thisArg) {
+  for (var key in obj) {
+    if (fn.call(thisArg, obj[key], key, obj) === false) {
+      break;
+    }
+  }
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/fragment-cache/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * fragment-cache <https://github.com/jonschlinkert/fragment-cache>
+ *
+ * Copyright (c) 2016-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+var MapCache = __webpack_require__("../../node_modules/map-cache/index.js");
+
+/**
+ * Create a new `FragmentCache` with an optional object to use for `caches`.
+ *
+ * ```js
+ * var fragment = new FragmentCache();
+ * ```
+ * @name FragmentCache
+ * @param {String} `cacheName`
+ * @return {Object} Returns the [map-cache][] instance.
+ * @api public
+ */
+
+function FragmentCache(caches) {
+  this.caches = caches || {};
+}
+
+/**
+ * Prototype
+ */
+
+FragmentCache.prototype = {
+
+  /**
+   * Get cache `name` from the `fragment.caches` object. Creates a new
+   * `MapCache` if it doesn't already exist.
+   *
+   * ```js
+   * var cache = fragment.cache('files');
+   * console.log(fragment.caches.hasOwnProperty('files'));
+   * //=> true
+   * ```
+   * @name .cache
+   * @param {String} `cacheName`
+   * @return {Object} Returns the [map-cache][] instance.
+   * @api public
+   */
+
+  cache: function(cacheName) {
+    return this.caches[cacheName] || (this.caches[cacheName] = new MapCache());
+  },
+
+  /**
+   * Set a value for property `key` on cache `name`
+   *
+   * ```js
+   * fragment.set('files', 'somefile.js', new File({path: 'somefile.js'}));
+   * ```
+   * @name .set
+   * @param {String} `name`
+   * @param {String} `key` Property name to set
+   * @param {any} `val` The value of `key`
+   * @return {Object} The cache instance for chaining
+   * @api public
+   */
+
+  set: function(cacheName, key, val) {
+    var cache = this.cache(cacheName);
+    cache.set(key, val);
+    return cache;
+  },
+
+  /**
+   * Returns true if a non-undefined value is set for `key` on fragment cache `name`.
+   *
+   * ```js
+   * var cache = fragment.cache('files');
+   * cache.set('somefile.js');
+   *
+   * console.log(cache.has('somefile.js'));
+   * //=> true
+   *
+   * console.log(cache.has('some-other-file.js'));
+   * //=> false
+   * ```
+   * @name .has
+   * @param {String} `name` Cache name
+   * @param {String} `key` Optionally specify a property to check for on cache `name`
+   * @return {Boolean}
+   * @api public
+   */
+
+  has: function(cacheName, key) {
+    return typeof this.get(cacheName, key) !== 'undefined';
+  },
+
+  /**
+   * Get `name`, or if specified, the value of `key`. Invokes the [cache]() method,
+   * so that cache `name` will be created it doesn't already exist. If `key` is not passed,
+   * the entire cache (`name`) is returned.
+   *
+   * ```js
+   * var Vinyl = require('vinyl');
+   * var cache = fragment.cache('files');
+   * cache.set('somefile.js', new Vinyl({path: 'somefile.js'}));
+   * console.log(cache.get('somefile.js'));
+   * //=> <File "somefile.js">
+   * ```
+   * @name .get
+   * @param {String} `name`
+   * @return {Object} Returns cache `name`, or the value of `key` if specified
+   * @api public
+   */
+
+  get: function(name, key) {
+    var cache = this.cache(name);
+    if (typeof key === 'string') {
+      return cache.get(key);
+    }
+    return cache;
+  }
+};
+
+/**
+ * Expose `FragmentCache`
+ */
+
+exports = module.exports = FragmentCache;
+
+
+/***/ }),
+
+/***/ "../../node_modules/fs.realpath/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
+
+var fs = __webpack_require__("fs")
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
+
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__("../../node_modules/fs.realpath/old.js")
+
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
+
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
+
+  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)
+    }
+  })
+}
+
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
+
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
+  }
+}
+
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
+
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
+
+
+/***/ }),
+
+/***/ "../../node_modules/fs.realpath/old.js":
+/***/ (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__("path");
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__("fs");
+
+// 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;
+
+  return callback;
+
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
+    }
+  }
+
+  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 maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
+}
+
+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;
+}
+
+// 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);
+
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
+
+  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.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;
+
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
+
+    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();
+  }
+
+  if (cache) cache[original] = p;
+
+  return p;
+};
+
+
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
+
+  // make p is absolute
+  p = pathModule.resolve(p);
+
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
+
+  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);
+    }
+  }
+
+  // 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;
+
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
+    }
+
+    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();
+  }
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/function-bind/implementation.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/* eslint no-invalid-this: 1 */
+
+var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
+var slice = Array.prototype.slice;
+var toStr = Object.prototype.toString;
+var funcType = '[object Function]';
+
+module.exports = function bind(that) {
+    var target = this;
+    if (typeof target !== 'function' || toStr.call(target) !== funcType) {
+        throw new TypeError(ERROR_MESSAGE + target);
+    }
+    var args = slice.call(arguments, 1);
+
+    var bound;
+    var binder = function () {
+        if (this instanceof bound) {
+            var result = target.apply(
+                this,
+                args.concat(slice.call(arguments))
+            );
+            if (Object(result) === result) {
+                return result;
+            }
+            return this;
+        } else {
+            return target.apply(
+                that,
+                args.concat(slice.call(arguments))
+            );
+        }
+    };
+
+    var boundLength = Math.max(0, target.length - args.length);
+    var boundArgs = [];
+    for (var i = 0; i < boundLength; i++) {
+        boundArgs.push('$' + i);
+    }
+
+    bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
+
+    if (target.prototype) {
+        var Empty = function Empty() {};
+        Empty.prototype = target.prototype;
+        bound.prototype = new Empty();
+        Empty.prototype = null;
+    }
+
+    return bound;
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/function-bind/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var implementation = __webpack_require__("../../node_modules/function-bind/implementation.js");
+
+module.exports = Function.prototype.bind || implementation;
+
+
+/***/ }),
+
+/***/ "../../node_modules/get-stream/buffer-stream.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {PassThrough: PassThroughStream} = __webpack_require__("stream");
+
+module.exports = options => {
+	options = {...options};
+
+	const {array} = options;
+	let {encoding} = options;
+	const isBuffer = encoding === 'buffer';
+	let objectMode = false;
+
+	if (array) {
+		objectMode = !(encoding || isBuffer);
+	} else {
+		encoding = encoding || 'utf8';
+	}
+
+	if (isBuffer) {
+		encoding = null;
+	}
+
+	const stream = new PassThroughStream({objectMode});
+
+	if (encoding) {
+		stream.setEncoding(encoding);
+	}
+
+	let length = 0;
+	const chunks = [];
+
+	stream.on('data', chunk => {
+		chunks.push(chunk);
+
+		if (objectMode) {
+			length = chunks.length;
+		} else {
+			length += chunk.length;
+		}
+	});
+
+	stream.getBufferedValue = () => {
+		if (array) {
+			return chunks;
+		}
+
+		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
+	};
+
+	stream.getBufferedLength = () => length;
+
+	return stream;
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/get-stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const pump = __webpack_require__("../../node_modules/pump/index.js");
+const bufferStream = __webpack_require__("../../node_modules/get-stream/buffer-stream.js");
+
+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'));
+	}
+
+	options = {
+		maxBuffer: Infinity,
+		...options
+	};
+
+	const {maxBuffer} = options;
+
+	let stream;
+	await new Promise((resolve, reject) => {
+		const rejectPromise = error => {
+			if (error) { // A null check
+				error.bufferedData = stream.getBufferedValue();
+			}
+
+			reject(error);
+		};
+
+		stream = pump(inputStream, bufferStream(options), error => {
+			if (error) {
+				rejectPromise(error);
+				return;
+			}
+
+			resolve();
+		});
+
+		stream.on('data', () => {
+			if (stream.getBufferedLength() > maxBuffer) {
+				rejectPromise(new MaxBufferError());
+			}
+		});
+	});
+
+	return stream.getBufferedValue();
+}
+
+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;
+
+
+/***/ }),
+
+/***/ "../../node_modules/get-value/index.js":
+/***/ (function(module, exports) {
+
+/*!
+ * get-value <https://github.com/jonschlinkert/get-value>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+module.exports = function(obj, prop, a, b, c) {
+  if (!isObject(obj) || !prop) {
+    return obj;
+  }
+
+  prop = toString(prop);
+
+  // allowing for multiple properties to be passed as
+  // a string or array, but much faster (3-4x) than doing
+  // `[].slice.call(arguments)`
+  if (a) prop += '.' + toString(a);
+  if (b) prop += '.' + toString(b);
+  if (c) prop += '.' + toString(c);
+
+  if (prop in obj) {
+    return obj[prop];
+  }
+
+  var segs = prop.split('.');
+  var len = segs.length;
+  var i = -1;
+
+  while (obj && (++i < len)) {
+    var key = segs[i];
+    while (key[key.length - 1] === '\\') {
+      key = key.slice(0, -1) + '.' + segs[++i];
+    }
+    obj = obj[key];
+  }
+  return obj;
+};
+
+function isObject(val) {
+  return val !== null && (typeof val === 'object' || typeof val === 'function');
+}
+
+function toString(val) {
+  if (!val) return '';
+  if (Array.isArray(val)) {
+    return val.join('.');
+  }
+  return val;
+}
+
+
+/***/ }),
+
+/***/ "../../node_modules/getopts/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const EMPTYARR = []
+const SHORTSPLIT = /$|[!-@[-`{-~][\s\S]*/g
+const isArray = Array.isArray
+
+const parseValue = function(any) {
+  if (any === "") return ""
+  if (any === "false") return false
+  const maybe = Number(any)
+  return maybe * 0 === 0 ? maybe : any
+}
+
+const parseAlias = function(aliases) {
+  let out = {},
+    key,
+    alias,
+    prev,
+    len,
+    any,
+    i,
+    k
+
+  for (key in aliases) {
+    any = aliases[key]
+    alias = out[key] = isArray(any) ? any : [any]
+
+    for (i = 0, len = alias.length; i < len; i++) {
+      prev = out[alias[i]] = [key]
+
+      for (k = 0; k < len; k++) {
+        if (i !== k) prev.push(alias[k])
+      }
+    }
+  }
+
+  return out
+}
+
+const parseDefault = function(aliases, defaults) {
+  let out = {},
+    key,
+    alias,
+    value,
+    len,
+    i
+
+  for (key in defaults) {
+    value = defaults[key]
+    alias = aliases[key]
+
+    out[key] = value
+
+    if (alias === undefined) {
+      aliases[key] = EMPTYARR
+    } else {
+      for (i = 0, len = alias.length; i < len; i++) {
+        out[alias[i]] = value
+      }
+    }
+  }
+
+  return out
+}
+
+const parseOptions = function(aliases, options, value) {
+  let out = {},
+    key,
+    alias,
+    len,
+    end,
+    i,
+    k
+
+  if (options !== undefined) {
+    for (i = 0, len = options.length; i < len; i++) {
+      key = options[i]
+      alias = aliases[key]
+
+      out[key] = value
+
+      if (alias === undefined) {
+        aliases[key] = EMPTYARR
+      } else {
+        for (k = 0, end = alias.length; k < end; k++) {
+          out[alias[k]] = value
+        }
+      }
+    }
+  }
+
+  return out
+}
+
+const write = function(out, key, value, aliases, unknown) {
+  let i,
+    prev,
+    alias = aliases[key],
+    len = alias === undefined ? -1 : alias.length
+
+  if (len >= 0 || unknown === undefined || unknown(key)) {
+    prev = out[key]
+
+    if (prev === undefined) {
+      out[key] = value
+    } else {
+      if (isArray(prev)) {
+        prev.push(value)
+      } else {
+        out[key] = [prev, value]
+      }
+    }
+
+    for (i = 0; i < len; i++) {
+      out[alias[i]] = out[key]
+    }
+  }
+}
+
+const getopts = function(argv, opts) {
+  let unknown = (opts = opts || {}).unknown,
+    aliases = parseAlias(opts.alias),
+    strings = parseOptions(aliases, opts.string, ""),
+    values = parseDefault(aliases, opts.default),
+    bools = parseOptions(aliases, opts.boolean, false),
+    stopEarly = opts.stopEarly,
+    _ = [],
+    out = { _ },
+    i = 0,
+    k = 0,
+    len = argv.length,
+    key,
+    arg,
+    end,
+    match,
+    value
+
+  for (; i < len; i++) {
+    arg = argv[i]
+
+    if (arg[0] !== "-" || arg === "-") {
+      if (stopEarly) while (i < len) _.push(argv[i++])
+      else _.push(arg)
+    } else if (arg === "--") {
+      while (++i < len) _.push(argv[i])
+    } else if (arg[1] === "-") {
+      end = arg.indexOf("=", 2)
+      if (arg[2] === "n" && arg[3] === "o" && arg[4] === "-") {
+        key = arg.slice(5, end >= 0 ? end : undefined)
+        value = false
+      } else if (end >= 0) {
+        key = arg.slice(2, end)
+        value =
+          bools[key] !== undefined ||
+          (strings[key] === undefined
+            ? parseValue(arg.slice(end + 1))
+            : arg.slice(end + 1))
+      } else {
+        key = arg.slice(2)
+        value =
+          bools[key] !== undefined ||
+          (len === i + 1 || argv[i + 1][0] === "-"
+            ? strings[key] === undefined
+              ? true
+              : ""
+            : strings[key] === undefined
+            ? parseValue(argv[++i])
+            : argv[++i])
+      }
+      write(out, key, value, aliases, unknown)
+    } else {
+      SHORTSPLIT.lastIndex = 2
+      match = SHORTSPLIT.exec(arg)
+      end = match.index
+      value = match[0]
+
+      for (k = 1; k < end; k++) {
+        write(
+          out,
+          (key = arg[k]),
+          k + 1 < end
+            ? strings[key] === undefined ||
+                arg.substring(k + 1, (k = end)) + value
+            : value === ""
+            ? len === i + 1 || argv[i + 1][0] === "-"
+              ? strings[key] === undefined || ""
+              : bools[key] !== undefined ||
+                (strings[key] === undefined ? parseValue(argv[++i]) : argv[++i])
+            : bools[key] !== undefined ||
+              (strings[key] === undefined ? parseValue(value) : value),
+          aliases,
+          unknown
+        )
+      }
+    }
+  }
+
+  for (key in values) if (out[key] === undefined) out[key] = values[key]
+  for (key in bools) if (out[key] === undefined) out[key] = false
+  for (key in strings) if (out[key] === undefined) out[key] = ""
+
+  return out
+}
+
+module.exports = getopts
+
+
+/***/ }),
+
+/***/ "../../node_modules/git-hooks-list/index.json":
+/***/ (function(module) {
+
+module.exports = JSON.parse("[\"applypatch-msg\",\"pre-applypatch\",\"post-applypatch\",\"pre-commit\",\"pre-merge-commit\",\"prepare-commit-msg\",\"commit-msg\",\"post-commit\",\"pre-rebase\",\"post-checkout\",\"post-merge\",\"pre-push\",\"pre-receive\",\"update\",\"post-receive\",\"post-update\",\"push-to-checkout\",\"pre-auto-gc\",\"post-rewrite\",\"sendemail-validate\",\"fsmonitor-watchman\",\"p4-pre-submit\",\"post-index-change\"]");
+
+/***/ }),
+
+/***/ "../../node_modules/glob-parent/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isGlob = __webpack_require__("../../node_modules/is-glob/index.js");
+var pathPosixDirname = __webpack_require__("path").posix.dirname;
+var isWin32 = __webpack_require__("os").platform() === 'win32';
+
+var slash = '/';
+var backslash = /\\/g;
+var enclosure = /[\{\[].*[\}\]]$/;
+var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
+var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
+
+/**
+ * @param {string} str
+ * @param {Object} opts
+ * @param {boolean} [opts.flipBackslashes=true]
+ * @returns {string}
+ */
+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';
+
+  // remove path parts that are globby
+  do {
+    str = pathPosixDirname(str);
+  } while (isGlob(str) || globby.test(str));
+
+  // remove escape chars and return result
+  return str.replace(escaped, '$1');
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/glob/common.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+exports.setopts = setopts
+exports.ownProp = ownProp
+exports.makeAbs = makeAbs
+exports.finish = finish
+exports.mark = mark
+exports.isIgnored = isIgnored
+exports.childrenIgnored = childrenIgnored
+
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
+}
+
+var fs = __webpack_require__("fs")
+var path = __webpack_require__("path")
+var minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js")
+var isAbsolute = __webpack_require__("../../node_modules/path-is-absolute/index.js")
+var Minimatch = minimatch.Minimatch
+
+function alphasort (a, b) {
+  return a.localeCompare(b, 'en')
+}
+
+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)
+  }
+}
+
+// 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 })
+  }
+
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
+
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
+
+  // 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
+  }
+
+  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.fs = options.fs || fs
+
+  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)
+
+  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
+  }
+
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
+
+  // 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
+
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
+
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
+
+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(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)
+    })
+
+  self.found = all
+}
+
+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)
+
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
+
+  return m
+}
+
+// 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)
+  }
+
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
+
+  return abs
+}
+
+
+// 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
+
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
+
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
+
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
+
+
+/***/ }),
+
+/***/ "../../node_modules/glob/glob.js":
+/***/ (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
+
+var rp = __webpack_require__("../../node_modules/fs.realpath/index.js")
+var minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js")
+var Minimatch = minimatch.Minimatch
+var inherits = __webpack_require__("../../node_modules/inherits/inherits.js")
+var EE = __webpack_require__("events").EventEmitter
+var path = __webpack_require__("path")
+var assert = __webpack_require__("assert")
+var isAbsolute = __webpack_require__("../../node_modules/path-is-absolute/index.js")
+var globSync = __webpack_require__("../../node_modules/glob/sync.js")
+var common = __webpack_require__("../../node_modules/glob/common.js")
+var setopts = common.setopts
+var ownProp = common.ownProp
+var inflight = __webpack_require__("../../node_modules/inflight/inflight.js")
+var util = __webpack_require__("util")
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
+
+var once = __webpack_require__("../../node_modules/once/once.js")
+
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
+
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
+  }
+
+  return new Glob(pattern, options, cb)
+}
+
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
+
+// old api surface
+glob.glob = glob
+
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
+
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
+
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
+
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
+
+  if (!pattern)
+    return false
+
+  if (set.length > 1)
+    return true
+
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
+
+  return false
+}
+
+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)
+  }
+
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
+
+  setopts(this, pattern, options)
+  this._didRealPath = false
+
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
+
+  // 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 (typeof cb === 'function') {
+    cb = once(cb)
+    this.on('error', cb)
+    this.on('end', function (matches) {
+      cb(null, matches)
+    })
+  }
+
+  var self = this
+  this._processing = 0
+
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
+
+  if (this.noprocess)
+    return this
+
+  if (n === 0)
+    return done()
+
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
+  }
+  sync = false
+
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
+  }
+}
+
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
+
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
+
+  common.finish(this)
+  this.emit('end', this.found)
 }
-},
-rules: [/^(?:$)/,/^(?:\s+)/,/^(?:\+)/,/^(?:\()/,/^(?:\))/,/^(?::)/,/^(?:DocumentRef-([0-9A-Za-z-+.]+))/,/^(?:LicenseRef-([0-9A-Za-z-+.]+))/,/^(?:AND)/,/^(?:OR)/,/^(?:WITH)/,/^(?:BSD-3-Clause-No-Nuclear-License-2014)/,/^(?:BSD-3-Clause-No-Nuclear-Warranty)/,/^(?:GPL-2\.0-with-classpath-exception)/,/^(?:GPL-3\.0-with-autoconf-exception)/,/^(?:GPL-2\.0-with-autoconf-exception)/,/^(?:BSD-3-Clause-No-Nuclear-License)/,/^(?:MPL-2\.0-no-copyleft-exception)/,/^(?:GPL-2\.0-with-bison-exception)/,/^(?:GPL-2\.0-with-font-exception)/,/^(?:GPL-2\.0-with-GCC-exception)/,/^(?:CNRI-Python-GPL-Compatible)/,/^(?:GPL-3\.0-with-GCC-exception)/,/^(?:BSD-3-Clause-Attribution)/,/^(?:Classpath-exception-2\.0)/,/^(?:WxWindows-exception-3\.1)/,/^(?:freertos-exception-2\.0)/,/^(?:Autoconf-exception-3\.0)/,/^(?:i2p-gpl-java-exception)/,/^(?:gnu-javamail-exception)/,/^(?:Nokia-Qt-exception-1\.1)/,/^(?:Autoconf-exception-2\.0)/,/^(?:BSD-2-Clause-FreeBSD)/,/^(?:u-boot-exception-2\.0)/,/^(?:zlib-acknowledgement)/,/^(?:Bison-exception-2\.2)/,/^(?:BSD-2-Clause-NetBSD)/,/^(?:CLISP-exception-2\.0)/,/^(?:eCos-exception-2\.0)/,/^(?:BSD-3-Clause-Clear)/,/^(?:Font-exception-2\.0)/,/^(?:FLTK-exception-2\.0)/,/^(?:GCC-exception-2\.0)/,/^(?:Qwt-exception-1\.0)/,/^(?:Libtool-exception)/,/^(?:BSD-3-Clause-LBNL)/,/^(?:GCC-exception-3\.1)/,/^(?:Artistic-1\.0-Perl)/,/^(?:Artistic-1\.0-cl8)/,/^(?:CC-BY-NC-SA-2\.5)/,/^(?:MIT-advertising)/,/^(?:BSD-Source-Code)/,/^(?:CC-BY-NC-SA-4\.0)/,/^(?:LiLiQ-Rplus-1\.1)/,/^(?:CC-BY-NC-SA-3\.0)/,/^(?:BSD-4-Clause-UC)/,/^(?:CC-BY-NC-SA-2\.0)/,/^(?:CC-BY-NC-SA-1\.0)/,/^(?:CC-BY-NC-ND-4\.0)/,/^(?:CC-BY-NC-ND-3\.0)/,/^(?:CC-BY-NC-ND-2\.5)/,/^(?:CC-BY-NC-ND-2\.0)/,/^(?:CC-BY-NC-ND-1\.0)/,/^(?:LZMA-exception)/,/^(?:BitTorrent-1\.1)/,/^(?:CrystalStacker)/,/^(?:FLTK-exception)/,/^(?:SugarCRM-1\.1\.3)/,/^(?:BSD-Protection)/,/^(?:BitTorrent-1\.0)/,/^(?:HaskellReport)/,/^(?:Interbase-1\.0)/,/^(?:StandardML-NJ)/,/^(?:mif-exception)/,/^(?:Frameworx-1\.0)/,/^(?:389-exception)/,/^(?:CC-BY-NC-2\.0)/,/^(?:CC-BY-NC-2\.5)/,/^(?:CC-BY-NC-3\.0)/,/^(?:CC-BY-NC-4\.0)/,/^(?:W3C-19980720)/,/^(?:CC-BY-SA-1\.0)/,/^(?:CC-BY-SA-2\.0)/,/^(?:CC-BY-SA-2\.5)/,/^(?:CC-BY-ND-2\.0)/,/^(?:CC-BY-SA-4\.0)/,/^(?:CC-BY-SA-3\.0)/,/^(?:Artistic-1\.0)/,/^(?:Artistic-2\.0)/,/^(?:CC-BY-ND-2\.5)/,/^(?:CC-BY-ND-3\.0)/,/^(?:CC-BY-ND-4\.0)/,/^(?:CC-BY-ND-1\.0)/,/^(?:BSD-4-Clause)/,/^(?:BSD-3-Clause)/,/^(?:BSD-2-Clause)/,/^(?:CC-BY-NC-1\.0)/,/^(?:bzip2-1\.0\.6)/,/^(?:Unicode-TOU)/,/^(?:CNRI-Jython)/,/^(?:ImageMagick)/,/^(?:Adobe-Glyph)/,/^(?:CUA-OPL-1\.0)/,/^(?:OLDAP-2\.2\.2)/,/^(?:LiLiQ-R-1\.1)/,/^(?:bzip2-1\.0\.5)/,/^(?:LiLiQ-P-1\.1)/,/^(?:OLDAP-2\.0\.1)/,/^(?:OLDAP-2\.2\.1)/,/^(?:CNRI-Python)/,/^(?:XFree86-1\.1)/,/^(?:OSET-PL-2\.1)/,/^(?:Apache-2\.0)/,/^(?:Watcom-1\.0)/,/^(?:PostgreSQL)/,/^(?:Python-2\.0)/,/^(?:RHeCos-1\.1)/,/^(?:EUDatagrid)/,/^(?:Spencer-99)/,/^(?:Intel-ACPI)/,/^(?:CECILL-1\.0)/,/^(?:CECILL-1\.1)/,/^(?:JasPer-2\.0)/,/^(?:CECILL-2\.0)/,/^(?:CECILL-2\.1)/,/^(?:gSOAP-1\.3b)/,/^(?:Spencer-94)/,/^(?:Apache-1\.1)/,/^(?:Spencer-86)/,/^(?:Apache-1\.0)/,/^(?:ClArtistic)/,/^(?:TORQUE-1\.1)/,/^(?:CATOSL-1\.1)/,/^(?:Adobe-2006)/,/^(?:Zimbra-1\.4)/,/^(?:Zimbra-1\.3)/,/^(?:Condor-1\.1)/,/^(?:CC-BY-3\.0)/,/^(?:CC-BY-2\.5)/,/^(?:OLDAP-2\.4)/,/^(?:SGI-B-1\.1)/,/^(?:SISSL-1\.2)/,/^(?:SGI-B-1\.0)/,/^(?:OLDAP-2\.3)/,/^(?:CC-BY-4\.0)/,/^(?:Crossword)/,/^(?:SimPL-2\.0)/,/^(?:OLDAP-2\.2)/,/^(?:OLDAP-2\.1)/,/^(?:ErlPL-1\.1)/,/^(?:LPPL-1\.3a)/,/^(?:LPPL-1\.3c)/,/^(?:OLDAP-2\.0)/,/^(?:Leptonica)/,/^(?:CPOL-1\.02)/,/^(?:OLDAP-1\.4)/,/^(?:OLDAP-1\.3)/,/^(?:CC-BY-2\.0)/,/^(?:Unlicense)/,/^(?:OLDAP-2\.8)/,/^(?:OLDAP-1\.2)/,/^(?:MakeIndex)/,/^(?:OLDAP-2\.7)/,/^(?:OLDAP-1\.1)/,/^(?:Sleepycat)/,/^(?:D-FSL-1\.0)/,/^(?:CC-BY-1\.0)/,/^(?:OLDAP-2\.6)/,/^(?:WXwindows)/,/^(?:NPOSL-3\.0)/,/^(?:FreeImage)/,/^(?:SGI-B-2\.0)/,/^(?:OLDAP-2\.5)/,/^(?:Beerware)/,/^(?:Newsletr)/,/^(?:NBPL-1\.0)/,/^(?:NASA-1\.3)/,/^(?:NLOD-1\.0)/,/^(?:AGPL-1\.0)/,/^(?:OCLC-2\.0)/,/^(?:ODbL-1\.0)/,/^(?:PDDL-1\.0)/,/^(?:Motosoto)/,/^(?:Afmparse)/,/^(?:ANTLR-PD)/,/^(?:LPL-1\.02)/,/^(?:Abstyles)/,/^(?:eCos-2\.0)/,/^(?:APSL-1\.0)/,/^(?:LPPL-1\.2)/,/^(?:LPPL-1\.1)/,/^(?:LPPL-1\.0)/,/^(?:APSL-1\.1)/,/^(?:APSL-2\.0)/,/^(?:Info-ZIP)/,/^(?:Zend-2\.0)/,/^(?:IBM-pibs)/,/^(?:LGPL-2\.0)/,/^(?:LGPL-3\.0)/,/^(?:LGPL-2\.1)/,/^(?:GFDL-1\.3)/,/^(?:PHP-3\.01)/,/^(?:GFDL-1\.2)/,/^(?:GFDL-1\.1)/,/^(?:AGPL-3\.0)/,/^(?:Giftware)/,/^(?:EUPL-1\.1)/,/^(?:RPSL-1\.0)/,/^(?:EUPL-1\.0)/,/^(?:MIT-enna)/,/^(?:CECILL-B)/,/^(?:diffmark)/,/^(?:CECILL-C)/,/^(?:CDDL-1\.0)/,/^(?:Sendmail)/,/^(?:CDDL-1\.1)/,/^(?:CPAL-1\.0)/,/^(?:APSL-1\.2)/,/^(?:NPL-1\.1)/,/^(?:AFL-1\.2)/,/^(?:Caldera)/,/^(?:AFL-2\.0)/,/^(?:FSFULLR)/,/^(?:AFL-2\.1)/,/^(?:VSL-1\.0)/,/^(?:VOSTROM)/,/^(?:UPL-1\.0)/,/^(?:Dotseqn)/,/^(?:CPL-1\.0)/,/^(?:dvipdfm)/,/^(?:EPL-1\.0)/,/^(?:OCCT-PL)/,/^(?:ECL-1\.0)/,/^(?:Latex2e)/,/^(?:ECL-2\.0)/,/^(?:GPL-1\.0)/,/^(?:GPL-2\.0)/,/^(?:GPL-3\.0)/,/^(?:AFL-3\.0)/,/^(?:LAL-1\.2)/,/^(?:LAL-1\.3)/,/^(?:EFL-1\.0)/,/^(?:EFL-2\.0)/,/^(?:gnuplot)/,/^(?:Aladdin)/,/^(?:LPL-1\.0)/,/^(?:libtiff)/,/^(?:Entessa)/,/^(?:AMDPLPA)/,/^(?:IPL-1\.0)/,/^(?:OPL-1\.0)/,/^(?:OSL-1\.0)/,/^(?:OSL-1\.1)/,/^(?:OSL-2\.0)/,/^(?:OSL-2\.1)/,/^(?:OSL-3\.0)/,/^(?:OpenSSL)/,/^(?:ZPL-2\.1)/,/^(?:PHP-3\.0)/,/^(?:ZPL-2\.0)/,/^(?:ZPL-1\.1)/,/^(?:CC0-1\.0)/,/^(?:SPL-1\.0)/,/^(?:psutils)/,/^(?:MPL-1\.0)/,/^(?:QPL-1\.0)/,/^(?:MPL-1\.1)/,/^(?:MPL-2\.0)/,/^(?:APL-1\.0)/,/^(?:RPL-1\.1)/,/^(?:RPL-1\.5)/,/^(?:MIT-CMU)/,/^(?:Multics)/,/^(?:Eurosym)/,/^(?:BSL-1\.0)/,/^(?:MIT-feh)/,/^(?:Saxpath)/,/^(?:Borceux)/,/^(?:OFL-1\.1)/,/^(?:OFL-1\.0)/,/^(?:AFL-1\.1)/,/^(?:YPL-1\.1)/,/^(?:YPL-1\.0)/,/^(?:NPL-1\.0)/,/^(?:iMatix)/,/^(?:mpich2)/,/^(?:APAFML)/,/^(?:Bahyph)/,/^(?:RSA-MD)/,/^(?:psfrag)/,/^(?:Plexus)/,/^(?:eGenix)/,/^(?:Glulxe)/,/^(?:SAX-PD)/,/^(?:Imlib2)/,/^(?:Wsuipa)/,/^(?:LGPLLR)/,/^(?:Libpng)/,/^(?:xinetd)/,/^(?:MITNFA)/,/^(?:NetCDF)/,/^(?:Naumen)/,/^(?:SMPPL)/,/^(?:Nunit)/,/^(?:FSFUL)/,/^(?:GL2PS)/,/^(?:SMLNJ)/,/^(?:Rdisc)/,/^(?:Noweb)/,/^(?:Nokia)/,/^(?:SISSL)/,/^(?:Qhull)/,/^(?:Intel)/,/^(?:Glide)/,/^(?:Xerox)/,/^(?:AMPAS)/,/^(?:WTFPL)/,/^(?:MS-PL)/,/^(?:XSkat)/,/^(?:MS-RL)/,/^(?:MirOS)/,/^(?:RSCPL)/,/^(?:TMate)/,/^(?:OGTSL)/,/^(?:FSFAP)/,/^(?:NCSA)/,/^(?:Zlib)/,/^(?:SCEA)/,/^(?:SNIA)/,/^(?:NGPL)/,/^(?:NOSL)/,/^(?:ADSL)/,/^(?:MTLL)/,/^(?:NLPL)/,/^(?:Ruby)/,/^(?:JSON)/,/^(?:Barr)/,/^(?:0BSD)/,/^(?:Xnet)/,/^(?:Cube)/,/^(?:curl)/,/^(?:DSDP)/,/^(?:Fair)/,/^(?:HPND)/,/^(?:TOSL)/,/^(?:IJG)/,/^(?:SWL)/,/^(?:Vim)/,/^(?:FTL)/,/^(?:ICU)/,/^(?:OML)/,/^(?:NRL)/,/^(?:DOC)/,/^(?:TCL)/,/^(?:W3C)/,/^(?:NTP)/,/^(?:IPA)/,/^(?:ISC)/,/^(?:X11)/,/^(?:AAL)/,/^(?:AML)/,/^(?:xpp)/,/^(?:Zed)/,/^(?:MIT)/,/^(?:Mup)/],
-conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364],"inclusive":true}}
-});
-return lexer;
-})();
-parser.lexer = lexer;
-function Parser () {
-  this.yy = {};
+
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
+
+  this._didRealpath = true
+
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
+
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
+
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
+}
+
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
+
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
+
+  if (n === 0)
+    return cb()
+
+  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
+
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
+}
+
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
+
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
+
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
+
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
+  }
+}
+
+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])
+      }
+    }
+  }
+}
+
+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
+  }
+
+  //console.error('PROCESS %d', this._processing, pattern)
+
+  // 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.
+
+  // 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
+
+    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)
+
+  // 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
+
+  var abs = this._makeAbs(read)
+
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
+
+  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)
+}
+
+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)
+  })
+}
+
+Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return cb()
+
+  // 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 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)
+    }
+  }
+
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
+
+  // 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 < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
+
+      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()
+  }
+
+  // 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()
+}
+
+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)
+
+  if (this.absolute)
+    e = abs
+
+  if (this.matches[index][e])
+    return
+
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
+
+  this.matches[index][e] = true
+
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
+
+  this.emit('match', e)
+}
+
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
+
+  // 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 lstatkey = 'lstat\0' + abs
+  var self = this
+  var lstatcb = inflight(lstatkey, lstatcb_)
+
+  if (lstatcb)
+    self.fs.lstat(abs, lstatcb)
+
+  function lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
+
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.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()) {
+      self.cache[abs] = 'FILE'
+      cb()
+    } else
+      self._readdir(abs, false, cb)
+  }
+}
+
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
+
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
+
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
+
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
+
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
+
+  var self = this
+  self.fs.readdir(abs, readdirCb(this, abs, cb))
+}
+
+function readdirCb (self, abs, cb) {
+  return function (er, entries) {
+    if (er)
+      self._readdirError(abs, er, cb)
+    else
+      self._readdirEntries(abs, entries, cb)
+  }
+}
+
+Glob.prototype._readdirEntries = function (abs, entries, cb) {
+  if (this.aborted)
+    return
+
+  // 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.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
+
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
+
+    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.silent)
+        console.error('glob error', er)
+      break
+  }
+
+  return cb()
+}
+
+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)
+  })
+}
+
+
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
+
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return cb()
+
+  // 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)
+
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
+
+  var isSym = this.symlinks[abs]
+  var len = entries.length
+
+  // 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)
+  }
+
+  cb()
+}
+
+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)
+
+  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()
+
+  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 += '/'
+    }
+  }
+
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
 }
-Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();
 
+// 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()
 
-if (true) {
-exports.parser = spdxparse;
-exports.Parser = spdxparse.Parser;
-exports.parse = function () { return spdxparse.parse.apply(spdxparse, arguments); };
-exports.main = function commonjsMain(args) {
-    if (!args[1]) {
-        console.log('Usage: '+args[0]+' FILE');
-        process.exit(1);
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+
+    if (Array.isArray(c))
+      c = 'DIR'
+
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
+
+    if (needDir && c === 'FILE')
+      return cb()
+
+    // 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)
     }
-    var source = __webpack_require__(132).readFileSync(__webpack_require__(4).normalize(args[1]), "utf8");
-    return exports.parser.parse(source);
-};
-if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
-  exports.main(process.argv.slice(1));
+  }
+
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    self.fs.lstat(abs, statcb)
+
+  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 self.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)
+    }
+  }
 }
+
+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
+
+  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()
+
+  return cb(null, c, stat)
 }
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(116)(module)))
 
 /***/ }),
-/* 372 */
+
+/***/ "../../node_modules/glob/sync.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var licenseIDs = __webpack_require__(373);
+module.exports = globSync
+globSync.GlobSync = GlobSync
 
-function valid(string) {
-  return licenseIDs.indexOf(string) > -1;
+var rp = __webpack_require__("../../node_modules/fs.realpath/index.js")
+var minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js")
+var Minimatch = minimatch.Minimatch
+var Glob = __webpack_require__("../../node_modules/glob/glob.js").Glob
+var util = __webpack_require__("util")
+var path = __webpack_require__("path")
+var assert = __webpack_require__("assert")
+var isAbsolute = __webpack_require__("../../node_modules/path-is-absolute/index.js")
+var common = __webpack_require__("../../node_modules/glob/common.js")
+var setopts = common.setopts
+var ownProp = common.ownProp
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
+
+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')
+
+  return new GlobSync(pattern, options).found
 }
 
-// Common transpositions of license identifier acronyms
-var transpositions = [
-  ['APGL', 'AGPL'],
-  ['Gpl', 'GPL'],
-  ['GLP', 'GPL'],
-  ['APL', 'Apache'],
-  ['ISD', 'ISC'],
-  ['GLP', 'GPL'],
-  ['IST', 'ISC'],
-  ['Claude', 'Clause'],
-  [' or later', '+'],
-  [' International', ''],
-  ['GNU', 'GPL'],
-  ['GUN', 'GPL'],
-  ['+', ''],
-  ['GNU GPL', 'GPL'],
-  ['GNU/GPL', 'GPL'],
-  ['GNU GLP', 'GPL'],
-  ['GNU General Public License', 'GPL'],
-  ['Gnu public license', 'GPL'],
-  ['GNU Public License', 'GPL'],
-  ['GNU GENERAL PUBLIC LICENSE', 'GPL'],
-  ['MTI', 'MIT'],
-  ['Mozilla Public License', 'MPL'],
-  ['WTH', 'WTF'],
-  ['-License', '']
-];
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
 
-var TRANSPOSED = 0;
-var CORRECT = 1;
+  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')
 
-// Simple corrections to nearly valid identifiers.
-var transforms = [
-  // e.g. 'mit'
-  function(argument) {
-    return argument.toUpperCase();
-  },
-  // e.g. 'MIT '
-  function(argument) {
-    return argument.trim();
-  },
-  // e.g. 'M.I.T.'
-  function(argument) {
-    return argument.replace(/\./g, '');
-  },
-  // e.g. 'Apache- 2.0'
-  function(argument) {
-    return argument.replace(/\s+/g, '');
-  },
-  // e.g. 'CC BY 4.0''
-  function(argument) {
-    return argument.replace(/\s+/g, '-');
-  },
-  // e.g. 'LGPLv2.1'
-  function(argument) {
-    return argument.replace('v', '-');
-  },
-  // e.g. 'Apache 2.0'
-  function(argument) {
-    return argument.replace(/,?\s*(\d)/, '-$1');
-  },
-  // e.g. 'GPL 2'
-  function(argument) {
-    return argument.replace(/,?\s*(\d)/, '-$1.0');
-  },
-  // e.g. 'Apache Version 2.0'
-  function(argument) {
-    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2');
-  },
-  // e.g. 'Apache Version 2'
-  function(argument) {
-    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0');
-  },
-  // e.g. 'ZLIB'
-  function(argument) {
-    return argument[0].toUpperCase() + argument.slice(1);
-  },
-  // e.g. 'MPL/2.0'
-  function(argument) {
-    return argument.replace('/', '-');
-  },
-  // e.g. 'Apache 2'
-  function(argument) {
-    return argument
-      .replace(/\s*V\s*(\d)/, '-$1')
-      .replace(/(\d)$/, '$1.0');
-  },
-  // e.g. 'GPL-2.0-'
-  function(argument) {
-    return argument.slice(0, argument.length - 1);
-  },
-  // e.g. 'GPL2'
-  function(argument) {
-    return argument.replace(/(\d)$/, '-$1.0');
-  },
-  // e.g. 'BSD 3'
-  function(argument) {
-    return argument.replace(/(-| )?(\d)$/, '-$2-Clause');
-  },
-  // e.g. 'BSD clause 3'
-  function(argument) {
-    return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause');
-  },
-  // e.g. 'BY-NC-4.0'
-  function(argument) {
-    return 'CC-' + argument;
-  },
-  // e.g. 'BY-NC'
-  function(argument) {
-    return 'CC-' + argument + '-4.0';
-  },
-  // e.g. 'Attribution-NonCommercial'
-  function(argument) {
-    return argument
-      .replace('Attribution', 'BY')
-      .replace('NonCommercial', 'NC')
-      .replace('NoDerivatives', 'ND')
-      .replace(/ (\d)/, '-$1')
-      .replace(/ ?International/, '');
-  },
-  // e.g. 'Attribution-NonCommercial'
-  function(argument) {
-    return 'CC-' +
-      argument
-      .replace('Attribution', 'BY')
-      .replace('NonCommercial', 'NC')
-      .replace('NoDerivatives', 'ND')
-      .replace(/ (\d)/, '-$1')
-      .replace(/ ?International/, '') +
-      '-4.0';
+  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()
+}
 
-// If all else fails, guess that strings containing certain substrings
-// meant to identify certain licenses.
-var lastResorts = [
-  ['UNLI', 'Unlicense'],
-  ['WTF', 'WTFPL'],
-  ['2 CLAUSE', 'BSD-2-Clause'],
-  ['2-CLAUSE', 'BSD-2-Clause'],
-  ['3 CLAUSE', 'BSD-3-Clause'],
-  ['3-CLAUSE', 'BSD-3-Clause'],
-  ['AFFERO', 'AGPL-3.0'],
-  ['AGPL', 'AGPL-3.0'],
-  ['APACHE', 'Apache-2.0'],
-  ['ARTISTIC', 'Artistic-2.0'],
-  ['Affero', 'AGPL-3.0'],
-  ['BEER', 'Beerware'],
-  ['BOOST', 'BSL-1.0'],
-  ['BSD', 'BSD-2-Clause'],
-  ['ECLIPSE', 'EPL-1.0'],
-  ['FUCK', 'WTFPL'],
-  ['GNU', 'GPL-3.0'],
-  ['LGPL', 'LGPL-3.0'],
-  ['GPL', 'GPL-3.0'],
-  ['MIT', 'MIT'],
-  ['MPL', 'MPL-2.0'],
-  ['X11', 'X11'],
-  ['ZLIB', 'Zlib']
-];
+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
+        }
+      }
+    })
+  }
+  common.finish(this)
+}
+
+
+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 ++
+  }
+  // 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)
+
+  // 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
+
+  var abs = this._makeAbs(read)
+
+  //if ignored, skip processing
+  if (childrenIgnored(this, read))
+    return
+
+  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)
+}
+
+
+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
+
+  // 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 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
+
+  // 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 < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix.slice(-1) !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
+
+      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)
+  }
+}
+
+
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
+
+  var abs = this._makeAbs(e)
+
+  if (this.mark)
+    e = this._mark(e)
+
+  if (this.absolute) {
+    e = abs
+  }
+
+  if (this.matches[index][e])
+    return
+
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
+
+  this.matches[index][e] = true
+
+  if (this.stat)
+    this._stat(e)
+}
+
+
+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 = this.fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
+  }
+
+  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)
 
-var SUBSTRING = 0;
-var IDENTIFIER = 1;
+  return entries
+}
 
-var validTransformation = function(identifier) {
-  for (var i = 0; i < transforms.length; i++) {
-    var transformed = transforms[i](identifier);
-    if (transformed !== identifier && valid(transformed)) {
-      return transformed;
-    }
-  }
-  return null;
-};
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-var validLastResort = function(identifier) {
-  var upperCased = identifier.toUpperCase();
-  for (var i = 0; i < lastResorts.length; i++) {
-    var lastResort = lastResorts[i];
-    if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) {
-      return lastResort[IDENTIFIER];
-    }
-  }
-  return null;
-};
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
 
-var anyCorrection = function(identifier, check) {
-  for (var i = 0; i < transpositions.length; i++) {
-    var transposition = transpositions[i];
-    var transposed = transposition[TRANSPOSED];
-    if (identifier.indexOf(transposed) > -1) {
-      var corrected = identifier.replace(
-        transposed,
-        transposition[CORRECT]
-      );
-      var checked = check(corrected);
-      if (checked !== null) {
-        return checked;
-      }
-    }
-  }
-  return null;
-};
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
 
-module.exports = function(identifier) {
-  identifier = identifier.replace(/\+$/, '');
-  if (valid(identifier)) {
-    return identifier;
+    if (Array.isArray(c))
+      return c
   }
-  var transformed = validTransformation(identifier);
-  if (transformed !== null) {
-    return transformed;
+
+  try {
+    return this._readdirEntries(abs, this.fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
   }
-  transformed = anyCorrection(identifier, function(argument) {
-    if (valid(argument)) {
-      return argument;
+}
+
+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
     }
-    return validTransformation(argument);
-  });
-  if (transformed !== null) {
-    return transformed;
-  }
-  transformed = validLastResort(identifier);
-  if (transformed !== null) {
-    return transformed;
   }
-  transformed = anyCorrection(identifier, validLastResort);
-  if (transformed !== null) {
-    return transformed;
+
+  this.cache[abs] = entries
+
+  // 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
+
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
+
+    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 null;
-};
+}
 
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
 
-/***/ }),
-/* 373 */
-/***/ (function(module) {
+  var entries = this._readdir(abs, inGlobStar)
 
-module.exports = JSON.parse("[\"Glide\",\"Abstyles\",\"AFL-1.1\",\"AFL-1.2\",\"AFL-2.0\",\"AFL-2.1\",\"AFL-3.0\",\"AMPAS\",\"APL-1.0\",\"Adobe-Glyph\",\"APAFML\",\"Adobe-2006\",\"AGPL-1.0\",\"Afmparse\",\"Aladdin\",\"ADSL\",\"AMDPLPA\",\"ANTLR-PD\",\"Apache-1.0\",\"Apache-1.1\",\"Apache-2.0\",\"AML\",\"APSL-1.0\",\"APSL-1.1\",\"APSL-1.2\",\"APSL-2.0\",\"Artistic-1.0\",\"Artistic-1.0-Perl\",\"Artistic-1.0-cl8\",\"Artistic-2.0\",\"AAL\",\"Bahyph\",\"Barr\",\"Beerware\",\"BitTorrent-1.0\",\"BitTorrent-1.1\",\"BSL-1.0\",\"Borceux\",\"BSD-2-Clause\",\"BSD-2-Clause-FreeBSD\",\"BSD-2-Clause-NetBSD\",\"BSD-3-Clause\",\"BSD-3-Clause-Clear\",\"BSD-4-Clause\",\"BSD-Protection\",\"BSD-Source-Code\",\"BSD-3-Clause-Attribution\",\"0BSD\",\"BSD-4-Clause-UC\",\"bzip2-1.0.5\",\"bzip2-1.0.6\",\"Caldera\",\"CECILL-1.0\",\"CECILL-1.1\",\"CECILL-2.0\",\"CECILL-2.1\",\"CECILL-B\",\"CECILL-C\",\"ClArtistic\",\"MIT-CMU\",\"CNRI-Jython\",\"CNRI-Python\",\"CNRI-Python-GPL-Compatible\",\"CPOL-1.02\",\"CDDL-1.0\",\"CDDL-1.1\",\"CPAL-1.0\",\"CPL-1.0\",\"CATOSL-1.1\",\"Condor-1.1\",\"CC-BY-1.0\",\"CC-BY-2.0\",\"CC-BY-2.5\",\"CC-BY-3.0\",\"CC-BY-4.0\",\"CC-BY-ND-1.0\",\"CC-BY-ND-2.0\",\"CC-BY-ND-2.5\",\"CC-BY-ND-3.0\",\"CC-BY-ND-4.0\",\"CC-BY-NC-1.0\",\"CC-BY-NC-2.0\",\"CC-BY-NC-2.5\",\"CC-BY-NC-3.0\",\"CC-BY-NC-4.0\",\"CC-BY-NC-ND-1.0\",\"CC-BY-NC-ND-2.0\",\"CC-BY-NC-ND-2.5\",\"CC-BY-NC-ND-3.0\",\"CC-BY-NC-ND-4.0\",\"CC-BY-NC-SA-1.0\",\"CC-BY-NC-SA-2.0\",\"CC-BY-NC-SA-2.5\",\"CC-BY-NC-SA-3.0\",\"CC-BY-NC-SA-4.0\",\"CC-BY-SA-1.0\",\"CC-BY-SA-2.0\",\"CC-BY-SA-2.5\",\"CC-BY-SA-3.0\",\"CC-BY-SA-4.0\",\"CC0-1.0\",\"Crossword\",\"CrystalStacker\",\"CUA-OPL-1.0\",\"Cube\",\"curl\",\"D-FSL-1.0\",\"diffmark\",\"WTFPL\",\"DOC\",\"Dotseqn\",\"DSDP\",\"dvipdfm\",\"EPL-1.0\",\"ECL-1.0\",\"ECL-2.0\",\"eGenix\",\"EFL-1.0\",\"EFL-2.0\",\"MIT-advertising\",\"MIT-enna\",\"Entessa\",\"ErlPL-1.1\",\"EUDatagrid\",\"EUPL-1.0\",\"EUPL-1.1\",\"Eurosym\",\"Fair\",\"MIT-feh\",\"Frameworx-1.0\",\"FreeImage\",\"FTL\",\"FSFAP\",\"FSFUL\",\"FSFULLR\",\"Giftware\",\"GL2PS\",\"Glulxe\",\"AGPL-3.0\",\"GFDL-1.1\",\"GFDL-1.2\",\"GFDL-1.3\",\"GPL-1.0\",\"GPL-2.0\",\"GPL-3.0\",\"LGPL-2.1\",\"LGPL-3.0\",\"LGPL-2.0\",\"gnuplot\",\"gSOAP-1.3b\",\"HaskellReport\",\"HPND\",\"IBM-pibs\",\"IPL-1.0\",\"ICU\",\"ImageMagick\",\"iMatix\",\"Imlib2\",\"IJG\",\"Info-ZIP\",\"Intel-ACPI\",\"Intel\",\"Interbase-1.0\",\"IPA\",\"ISC\",\"JasPer-2.0\",\"JSON\",\"LPPL-1.0\",\"LPPL-1.1\",\"LPPL-1.2\",\"LPPL-1.3a\",\"LPPL-1.3c\",\"Latex2e\",\"BSD-3-Clause-LBNL\",\"Leptonica\",\"LGPLLR\",\"Libpng\",\"libtiff\",\"LAL-1.2\",\"LAL-1.3\",\"LiLiQ-P-1.1\",\"LiLiQ-Rplus-1.1\",\"LiLiQ-R-1.1\",\"LPL-1.02\",\"LPL-1.0\",\"MakeIndex\",\"MTLL\",\"MS-PL\",\"MS-RL\",\"MirOS\",\"MITNFA\",\"MIT\",\"Motosoto\",\"MPL-1.0\",\"MPL-1.1\",\"MPL-2.0\",\"MPL-2.0-no-copyleft-exception\",\"mpich2\",\"Multics\",\"Mup\",\"NASA-1.3\",\"Naumen\",\"NBPL-1.0\",\"NetCDF\",\"NGPL\",\"NOSL\",\"NPL-1.0\",\"NPL-1.1\",\"Newsletr\",\"NLPL\",\"Nokia\",\"NPOSL-3.0\",\"NLOD-1.0\",\"Noweb\",\"NRL\",\"NTP\",\"Nunit\",\"OCLC-2.0\",\"ODbL-1.0\",\"PDDL-1.0\",\"OCCT-PL\",\"OGTSL\",\"OLDAP-2.2.2\",\"OLDAP-1.1\",\"OLDAP-1.2\",\"OLDAP-1.3\",\"OLDAP-1.4\",\"OLDAP-2.0\",\"OLDAP-2.0.1\",\"OLDAP-2.1\",\"OLDAP-2.2\",\"OLDAP-2.2.1\",\"OLDAP-2.3\",\"OLDAP-2.4\",\"OLDAP-2.5\",\"OLDAP-2.6\",\"OLDAP-2.7\",\"OLDAP-2.8\",\"OML\",\"OPL-1.0\",\"OSL-1.0\",\"OSL-1.1\",\"OSL-2.0\",\"OSL-2.1\",\"OSL-3.0\",\"OpenSSL\",\"OSET-PL-2.1\",\"PHP-3.0\",\"PHP-3.01\",\"Plexus\",\"PostgreSQL\",\"psfrag\",\"psutils\",\"Python-2.0\",\"QPL-1.0\",\"Qhull\",\"Rdisc\",\"RPSL-1.0\",\"RPL-1.1\",\"RPL-1.5\",\"RHeCos-1.1\",\"RSCPL\",\"RSA-MD\",\"Ruby\",\"SAX-PD\",\"Saxpath\",\"SCEA\",\"SWL\",\"SMPPL\",\"Sendmail\",\"SGI-B-1.0\",\"SGI-B-1.1\",\"SGI-B-2.0\",\"OFL-1.0\",\"OFL-1.1\",\"SimPL-2.0\",\"Sleepycat\",\"SNIA\",\"Spencer-86\",\"Spencer-94\",\"Spencer-99\",\"SMLNJ\",\"SugarCRM-1.1.3\",\"SISSL\",\"SISSL-1.2\",\"SPL-1.0\",\"Watcom-1.0\",\"TCL\",\"Unlicense\",\"TMate\",\"TORQUE-1.1\",\"TOSL\",\"Unicode-TOU\",\"UPL-1.0\",\"NCSA\",\"Vim\",\"VOSTROM\",\"VSL-1.0\",\"W3C-19980720\",\"W3C\",\"Wsuipa\",\"Xnet\",\"X11\",\"Xerox\",\"XFree86-1.1\",\"xinetd\",\"xpp\",\"XSkat\",\"YPL-1.0\",\"YPL-1.1\",\"Zed\",\"Zend-2.0\",\"Zimbra-1.3\",\"Zimbra-1.4\",\"Zlib\",\"zlib-acknowledgement\",\"ZPL-1.1\",\"ZPL-2.0\",\"ZPL-2.1\",\"BSD-3-Clause-No-Nuclear-License\",\"BSD-3-Clause-No-Nuclear-Warranty\",\"BSD-3-Clause-No-Nuclear-License-2014\",\"eCos-2.0\",\"GPL-2.0-with-autoconf-exception\",\"GPL-2.0-with-bison-exception\",\"GPL-2.0-with-classpath-exception\",\"GPL-2.0-with-font-exception\",\"GPL-2.0-with-GCC-exception\",\"GPL-3.0-with-autoconf-exception\",\"GPL-3.0-with-GCC-exception\",\"StandardML-NJ\",\"WXwindows\"]");
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
 
-/***/ }),
-/* 374 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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)
 
-"use strict";
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
 
-var url = __webpack_require__(203)
-var gitHosts = __webpack_require__(375)
-var GitHost = module.exports = __webpack_require__(376)
+  var len = entries.length
+  var isSym = this.symlinks[abs]
 
-var protocolToRepresentationMap = {
-  'git+ssh:': 'sshurl',
-  'git+https:': 'https',
-  'ssh:': 'sshurl',
-  'git:': 'git'
-}
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
 
-function protocolToRepresentation (protocol) {
-  return protocolToRepresentationMap[protocol] || protocol.slice(0, -1)
-}
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-var authProtocols = {
-  'git:': true,
-  'https:': true,
-  'git+https:': true,
-  'http:': true,
-  'git+http:': true
+    // 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)
+  }
 }
 
-var cache = {}
+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)
 
-module.exports.fromUrl = function (giturl, opts) {
-  if (typeof giturl !== 'string') return
-  var key = giturl + JSON.stringify(opts || {})
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-  if (!(key in cache)) {
-    cache[key] = fromUrl(giturl, opts)
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
+
+  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 += '/'
+    }
   }
 
-  return cache[key]
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
 }
 
-function fromUrl (giturl, opts) {
-  if (giturl == null || giturl === '') return
-  var url = fixupUnqualifiedGist(
-    isGitHubShorthand(giturl) ? 'github:' + giturl : giturl
-  )
-  var parsed = parseGitUrl(url)
-  var shortcutMatch = url.match(/^([^:]+):(?:[^@]+@)?(?:([^/]*)\/)?([^#]+)/)
-  var matches = Object.keys(gitHosts).map(function (gitHostName) {
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
+
+  if (f.length > this.maxLength)
+    return false
+
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+
+    if (Array.isArray(c))
+      c = 'DIR'
+
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
+
+    if (needDir && c === 'FILE')
+      return false
+
+    // 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) {
+    var lstat
     try {
-      var gitHostInfo = gitHosts[gitHostName]
-      var auth = null
-      if (parsed.auth && authProtocols[parsed.protocol]) {
-        auth = parsed.auth
+      lstat = this.fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
       }
-      var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null
-      var user = null
-      var project = null
-      var defaultRepresentation = null
-      if (shortcutMatch && shortcutMatch[1] === gitHostName) {
-        user = shortcutMatch[2] && decodeURIComponent(shortcutMatch[2])
-        project = decodeURIComponent(shortcutMatch[3].replace(/\.git$/, ''))
-        defaultRepresentation = 'shortcut'
-      } else {
-        if (parsed.host && parsed.host !== gitHostInfo.domain && parsed.host.replace(/^www[.]/, '') !== gitHostInfo.domain) return
-        if (!gitHostInfo.protocols_re.test(parsed.protocol)) return
-        if (!parsed.path) return
-        var pathmatch = gitHostInfo.pathmatch
-        var matched = parsed.path.match(pathmatch)
-        if (!matched) return
-        /* istanbul ignore else */
-        if (matched[1] !== null && matched[1] !== undefined) {
-          user = decodeURIComponent(matched[1].replace(/^:/, ''))
-        }
-        project = decodeURIComponent(matched[2])
-        defaultRepresentation = protocolToRepresentation(parsed.protocol)
+    }
+
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = this.fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
       }
-      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation, opts)
-    } catch (ex) {
-      /* istanbul ignore else */
-      if (ex instanceof URIError) {
-      } else throw ex
+    } else {
+      stat = lstat
     }
-  }).filter(function (gitHostInfo) { return gitHostInfo })
-  if (matches.length !== 1) return
-  return matches[0]
-}
+  }
 
-function isGitHubShorthand (arg) {
-  // Note: This does not fully test the git ref format.
-  // See https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
-  //
-  // The only way to do this properly would be to shell out to
-  // git-check-ref-format, and as this is a fast sync function,
-  // we don't want to do that.  Just let git fail if it turns
-  // out that the commit-ish is invalid.
-  // GH usernames cannot start with . or -
-  return /^[^:@%/\s.-][^:@%/\s]*[/][^:@\s/%]+(?:#.*)?$/.test(arg)
+  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
 }
 
-function fixupUnqualifiedGist (giturl) {
-  // necessary for round-tripping gists
-  var parsed = url.parse(giturl)
-  if (parsed.protocol === 'gist:' && parsed.host && !parsed.path) {
-    return parsed.protocol + '/' + parsed.host
-  } else {
-    return giturl
-  }
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
 }
 
-function parseGitUrl (giturl) {
-  var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/)
-  if (!matched) {
-    var legacy = url.parse(giturl)
-    // If we don't have url.URL, then sorry, this is just not fixable.
-    // This affects Node <= 6.12.
-    if (legacy.auth && typeof url.URL === 'function') {
-      // git urls can be in the form of scp-style/ssh-connect strings, like
-      // git+ssh://user@host.com:some/path, which the legacy url parser
-      // supports, but WhatWG url.URL class does not.  However, the legacy
-      // parser de-urlencodes the username and password, so something like
-      // https://user%3An%40me:p%40ss%3Aword@x.com/ becomes
-      // https://user:n@me:p@ss:word@x.com/ which is all kinds of wrong.
-      // Pull off just the auth and host, so we dont' get the confusing
-      // scp-style URL, then pass that to the WhatWG parser to get the
-      // auth properly escaped.
-      var authmatch = giturl.match(/[^@]+@[^:/]+/)
-      /* istanbul ignore else - this should be impossible */
-      if (authmatch) {
-        var whatwg = new url.URL(authmatch[0])
-        legacy.auth = whatwg.username || ''
-        if (whatwg.password) legacy.auth += ':' + whatwg.password
-      }
-    }
-    return legacy
-  }
-  return {
-    protocol: 'git+ssh:',
-    slashes: true,
-    auth: matched[1],
-    host: matched[2],
-    port: null,
-    hostname: matched[2],
-    hash: matched[4],
-    search: null,
-    query: null,
-    pathname: '/' + matched[3],
-    path: '/' + matched[3],
-    href: 'git+ssh://' + matched[1] + '@' + matched[2] +
-          '/' + matched[3] + (matched[4] || '')
-  }
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
 }
 
 
 /***/ }),
-/* 375 */
+
+/***/ "../../node_modules/globby/gitignore.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const fastGlob = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/index.js");
+const gitIgnore = __webpack_require__("../../node_modules/ignore/index.js");
+const slash = __webpack_require__("../../node_modules/slash/index.js");
 
-var gitHosts = module.exports = {
-  github: {
-    // First two are insecure and generally shouldn't be used any more, but
-    // they are still supported.
-    'protocols': [ 'git', 'http', 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'github.com',
-    'treepath': 'tree',
-    'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}',
-    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
-    'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}',
-    'tarballtemplate': 'https://codeload.{domain}/{user}/{project}/tar.gz/{committish}'
-  },
-  bitbucket: {
-    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'bitbucket.org',
-    'treepath': 'src',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz'
-  },
-  gitlab: {
-    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'gitlab.com',
-    'treepath': 'tree',
-    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
-    'httpstemplate': 'git+https://{auth@}{domain}/{user}/{projectPath}.git{#committish}',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}',
-    'pathmatch': /^[/]([^/]+)[/]((?!.*(\/-\/|\/repository\/archive\.tar\.gz\?=.*|\/repository\/[^/]+\/archive.tar.gz$)).*?)(?:[.]git|[/])?$/
-  },
-  gist: {
-    'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'gist.github.com',
-    'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]{32,})(?:[.]git)?$/,
-    'filetemplate': 'https://gist.githubusercontent.com/{user}/{project}/raw{/committish}/{path}',
-    'bugstemplate': 'https://{domain}/{project}',
-    'gittemplate': 'git://{domain}/{project}.git{#committish}',
-    'sshtemplate': 'git@{domain}:/{project}.git{#committish}',
-    'sshurltemplate': 'git+ssh://git@{domain}/{project}.git{#committish}',
-    'browsetemplate': 'https://{domain}/{project}{/committish}',
-    'browsefiletemplate': 'https://{domain}/{project}{/committish}{#path}',
-    'docstemplate': 'https://{domain}/{project}{/committish}',
-    'httpstemplate': 'git+https://{domain}/{project}.git{#committish}',
-    'shortcuttemplate': '{type}:{project}{#committish}',
-    'pathtemplate': '{project}{#committish}',
-    'tarballtemplate': 'https://codeload.github.com/gist/{project}/tar.gz/{committish}',
-    'hashformat': function (fragment) {
-      return 'file-' + formatHashFragment(fragment)
-    }
-  }
-}
+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 => {
+	const ignores = gitIgnore();
+	for (const file of files) {
+		ignores.add(parseGitIgnore(file.content, {
+			cwd: file.cwd,
+			fileName: file.filePath
+		}));
+	}
+
+	return ignores;
+};
+
+const ensureAbsolutePathForCwd = (cwd, p) => {
+	cwd = slash(cwd);
+	if (path.isAbsolute(p)) {
+		if (slash(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.path || 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
+	});
 
-var gitHostDefaults = {
-  'sshtemplate': 'git@{domain}:{user}/{project}.git{#committish}',
-  'sshurltemplate': 'git+ssh://git@{domain}/{user}/{project}.git{#committish}',
-  'browsetemplate': 'https://{domain}/{user}/{project}{/tree/committish}',
-  'browsefiletemplate': 'https://{domain}/{user}/{project}/{treepath}/{committish}/{path}{#fragment}',
-  'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#readme',
-  'httpstemplate': 'git+https://{auth@}{domain}/{user}/{project}.git{#committish}',
-  'filetemplate': 'https://{domain}/{user}/{project}/raw/{committish}/{path}',
-  'shortcuttemplate': '{type}:{user}/{project}{#committish}',
-  'pathtemplate': '{user}/{project}{#committish}',
-  'pathmatch': /^[/]([^/]+)[/]([^/]+?)(?:[.]git|[/])?$/,
-  'hashformat': formatHashFragment
-}
+	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
+	const ignores = reduceIgnore(files);
 
-Object.keys(gitHosts).forEach(function (name) {
-  Object.keys(gitHostDefaults).forEach(function (key) {
-    if (gitHosts[name][key]) return
-    gitHosts[name][key] = gitHostDefaults[key]
-  })
-  gitHosts[name].protocols_re = RegExp('^(' +
-    gitHosts[name].protocols.map(function (protocol) {
-      return protocol.replace(/([\\+*{}()[\]$^|])/g, '\\$1')
-    }).join('|') + '):$')
-})
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
 
-function formatHashFragment (fragment) {
-  return fragment.toLowerCase().replace(/^\W+|\/|\W+$/g, '').replace(/\W+/g, '-')
-}
+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);
+};
 
 
 /***/ }),
-/* 376 */
+
+/***/ "../../node_modules/globby/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var gitHosts = __webpack_require__(375)
-/* eslint-disable node/no-deprecated-api */
+const fs = __webpack_require__("fs");
+const arrayUnion = __webpack_require__("../../node_modules/array-union/index.js");
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+const fastGlob = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/index.js");
+const dirGlob = __webpack_require__("../../node_modules/dir-glob/index.js");
+const gitignore = __webpack_require__("../../node_modules/globby/gitignore.js");
+const {FilterStream, UniqueStream} = __webpack_require__("../../node_modules/globby/stream-utils.js");
 
-// copy-pasta util._extend from node's source, to avoid pulling
-// the whole util module into peoples' webpack bundles.
-/* istanbul ignore next */
-var extend = Object.assign || function _extend (target, source) {
-  // Don't do anything if source isn't an object
-  if (source === null || typeof source !== 'object') return target
+const DEFAULT_FILTER = () => false;
 
-  var keys = Object.keys(source)
-  var i = keys.length
-  while (i--) {
-    target[keys[i]] = source[keys[i]]
-  }
-  return target
-}
+const isNegative = pattern => pattern[0] === '!';
 
-module.exports = GitHost
-function GitHost (type, user, auth, project, committish, defaultRepresentation, opts) {
-  var gitHostInfo = this
-  gitHostInfo.type = type
-  Object.keys(gitHosts[type]).forEach(function (key) {
-    gitHostInfo[key] = gitHosts[type][key]
-  })
-  gitHostInfo.user = user
-  gitHostInfo.auth = auth
-  gitHostInfo.project = project
-  gitHostInfo.committish = committish
-  gitHostInfo.default = defaultRepresentation
-  gitHostInfo.opts = opts || {}
-}
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
 
-GitHost.prototype.hash = function () {
-  return this.committish ? '#' + this.committish : ''
-}
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
 
-GitHost.prototype._fill = function (template, opts) {
-  if (!template) return
-  var vars = extend({}, opts)
-  vars.path = vars.path ? vars.path.replace(/^[/]+/g, '') : ''
-  opts = extend(extend({}, this.opts), opts)
-  var self = this
-  Object.keys(this).forEach(function (key) {
-    if (self[key] != null && vars[key] == null) vars[key] = self[key]
-  })
-  var rawAuth = vars.auth
-  var rawcommittish = vars.committish
-  var rawFragment = vars.fragment
-  var rawPath = vars.path
-  var rawProject = vars.project
-  Object.keys(vars).forEach(function (key) {
-    var value = vars[key]
-    if ((key === 'path' || key === 'project') && typeof value === 'string') {
-      vars[key] = value.split('/').map(function (pathComponent) {
-        return encodeURIComponent(pathComponent)
-      }).join('/')
-    } else {
-      vars[key] = encodeURIComponent(value)
-    }
-  })
-  vars['auth@'] = rawAuth ? rawAuth + '@' : ''
-  vars['#fragment'] = rawFragment ? '#' + this.hashformat(rawFragment) : ''
-  vars.fragment = vars.fragment ? vars.fragment : ''
-  vars['#path'] = rawPath ? '#' + this.hashformat(rawPath) : ''
-  vars['/path'] = vars.path ? '/' + vars.path : ''
-  vars.projectPath = rawProject.split('/').map(encodeURIComponent).join('/')
-  if (opts.noCommittish) {
-    vars['#committish'] = ''
-    vars['/tree/committish'] = ''
-    vars['/committish'] = ''
-    vars.committish = ''
-  } else {
-    vars['#committish'] = rawcommittish ? '#' + rawcommittish : ''
-    vars['/tree/committish'] = vars.committish
-      ? '/' + vars.treepath + '/' + vars.committish
-      : ''
-    vars['/committish'] = vars.committish ? '/' + vars.committish : ''
-    vars.committish = vars.committish || 'master'
-  }
-  var res = template
-  Object.keys(vars).forEach(function (key) {
-    res = res.replace(new RegExp('[{]' + key + '[}]', 'g'), vars[key])
-  })
-  if (opts.noGitPlus) {
-    return res.replace(/^git[+]/, '')
-  } else {
-    return res
-  }
-}
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch {
+		return;
+	}
 
-GitHost.prototype.ssh = function (opts) {
-  return this._fill(this.sshtemplate, opts)
-}
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
 
-GitHost.prototype.sshurl = function (opts) {
-  return this._fill(this.sshurltemplate, opts)
-}
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-GitHost.prototype.browse = function (P, F, opts) {
-  if (typeof P === 'string') {
-    if (typeof F !== 'string') {
-      opts = F
-      F = null
-    }
-    return this._fill(this.browsefiletemplate, extend({
-      fragment: F,
-      path: P
-    }, opts))
-  } else {
-    return this._fill(this.browsetemplate, P)
-  }
-}
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
 
-GitHost.prototype.docs = function (opts) {
-  return this._fill(this.docstemplate, opts)
-}
+	const globTasks = [];
 
-GitHost.prototype.bugs = function (opts) {
-  return this._fill(this.bugstemplate, opts)
-}
+	taskOptions = {
+		ignore: [],
+		expandDirectories: true,
+		...taskOptions
+	};
 
-GitHost.prototype.https = function (opts) {
-  return this._fill(this.httpstemplate, opts)
-}
+	for (const [index, pattern] of patterns.entries()) {
+		if (isNegative(pattern)) {
+			continue;
+		}
 
-GitHost.prototype.git = function (opts) {
-  return this._fill(this.gittemplate, opts)
-}
+		const ignore = patterns
+			.slice(index)
+			.filter(pattern => isNegative(pattern))
+			.map(pattern => pattern.slice(1));
 
-GitHost.prototype.shortcut = function (opts) {
-  return this._fill(this.shortcuttemplate, opts)
-}
+		const options = {
+			...taskOptions,
+			ignore: taskOptions.ignore.concat(ignore)
+		};
 
-GitHost.prototype.path = function (opts) {
-  return this._fill(this.pathtemplate, opts)
-}
+		globTasks.push({pattern, options});
+	}
 
-GitHost.prototype.tarball = function (opts_) {
-  var opts = extend({}, opts_, { noCommittish: false })
-  return this._fill(this.tarballtemplate, opts)
-}
+	return globTasks;
+};
 
-GitHost.prototype.file = function (P, opts) {
-  return this._fill(this.filetemplate, extend({ path: P }, opts))
-}
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
+	}
 
-GitHost.prototype.getDefaultRepresentation = function () {
-  return this.default
-}
+	if (Array.isArray(task.options.expandDirectories)) {
+		options = {
+			...options,
+			files: task.options.expandDirectories
+		};
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = {
+			...options,
+			...task.options.expandDirectories
+		};
+	}
 
-GitHost.prototype.toString = function (opts) {
-  if (this.default && typeof this[this.default] === 'function') return this[this.default](opts)
-  return this.sshurl(opts)
-}
+	return fn(task.pattern, options);
+};
+
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
 
+const getFilterSync = options => {
+	return options && options.gitignore ?
+		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+		DEFAULT_FILTER;
+};
 
-/***/ }),
-/* 377 */
-/***/ (function(module, exports, __webpack_require__) {
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
+	}
 
-var async = __webpack_require__(378);
-async.core = __webpack_require__(389);
-async.isCore = __webpack_require__(391);
-async.sync = __webpack_require__(392);
+	return {
+		pattern: glob,
+		options
+	};
+};
 
-module.exports = async;
+module.exports = async (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
+	const getFilter = async () => {
+		return options && options.gitignore ?
+			gitignore({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
+	};
 
-/***/ }),
-/* 378 */
-/***/ (function(module, exports, __webpack_require__) {
+	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)));
+		}));
 
-var fs = __webpack_require__(132);
-var getHomedir = __webpack_require__(379);
-var path = __webpack_require__(4);
-var caller = __webpack_require__(380);
-var nodeModulesPaths = __webpack_require__(381);
-var normalizeOptions = __webpack_require__(383);
-var isCore = __webpack_require__(384);
+		return arrayUnion(...tasks);
+	};
 
-var realpathFS = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
+	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
+	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
 
-var homedir = getHomedir();
-var defaultPaths = function () {
-    return [
-        path.join(homedir, '.node_modules'),
-        path.join(homedir, '.node_libraries')
-    ];
+	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
 };
 
-var defaultIsFile = function isFile(file, cb) {
-    fs.stat(file, function (err, stat) {
-        if (!err) {
-            return cb(null, stat.isFile() || stat.isFIFO());
-        }
-        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
-        return cb(err);
-    });
-};
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
 
-var defaultIsDir = function isDirectory(dir, cb) {
-    fs.stat(dir, function (err, stat) {
-        if (!err) {
-            return cb(null, stat.isDirectory());
-        }
-        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
-        return cb(err);
-    });
+	const tasks = [];
+	for (const task of globTasks) {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		tasks.push(...newTask);
+	}
+
+	const filter = getFilterSync(options);
+
+	let matches = [];
+	for (const task of tasks) {
+		matches = arrayUnion(matches, fastGlob.sync(task.pattern, task.options));
+	}
+
+	return matches.filter(path_ => !filter(path_));
 };
 
-var defaultRealpath = function realpath(x, cb) {
-    realpathFS(x, function (realpathErr, realPath) {
-        if (realpathErr && realpathErr.code !== 'ENOENT') cb(realpathErr);
-        else cb(null, realpathErr ? x : realPath);
-    });
+module.exports.stream = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const tasks = [];
+	for (const task of globTasks) {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		tasks.push(...newTask);
+	}
+
+	const filter = getFilterSync(options);
+	const filterStream = new FilterStream(p => !filter(p));
+	const uniqueStream = new UniqueStream();
+
+	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
+		.pipe(filterStream)
+		.pipe(uniqueStream);
 };
 
-var maybeRealpath = function maybeRealpath(realpath, x, opts, cb) {
-    if (opts && opts.preserveSymlinks === false) {
-        realpath(x, cb);
-    } else {
-        cb(null, x);
+module.exports.generateGlobTasks = generateGlobTasks;
+
+module.exports.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => fastGlob.isDynamicPattern(pattern, options));
+
+module.exports.gitignore = gitignore;
+
+
+/***/ }),
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const taskManager = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/managers/tasks.js");
+const async_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/async.js");
+const stream_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/stream.js");
+const sync_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/sync.js");
+const settings_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/settings.js");
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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;
 
-var defaultReadPackage = function defaultReadPackage(readFile, pkgfile, cb) {
-    readFile(pkgfile, function (readFileErr, body) {
-        if (readFileErr) cb(readFileErr);
+
+/***/ }),
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/managers/tasks.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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;
+/**
+ * Returns tasks grouped by basic pattern directories.
+ *
+ * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
+ * This is necessary because directory traversal starts at the base directory and goes deeper.
+ */
+function convertPatternsToTasks(positive, negative, dynamic) {
+    const tasks = [];
+    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
+    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
+    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
+    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
+    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
+    /*
+     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
+     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
+     */
+    if ('.' in insideCurrentDirectoryGroup) {
+        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
+    }
+    else {
+        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
+    }
+    return tasks;
+}
+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 {
-            try {
-                var pkg = JSON.parse(body);
-                cb(null, pkg);
-            } catch (jsonErr) {
-                cb(null);
-            }
+            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;
 
-var getPackageCandidates = function getPackageCandidates(x, start, opts) {
-    var dirs = nodeModulesPaths(start, opts, x);
-    for (var i = 0; i < dirs.length; i++) {
-        dirs[i] = path.join(dirs[i], x);
-    }
-    return dirs;
-};
 
-module.exports = function resolve(x, options, callback) {
-    var cb = callback;
-    var opts = options;
-    if (typeof options === 'function') {
-        cb = opts;
-        opts = {};
-    }
-    if (typeof x !== 'string') {
-        var err = new TypeError('Path must be a string.');
-        return process.nextTick(function () {
-            cb(err);
-        });
-    }
+/***/ }),
 
-    opts = normalizeOptions(x, opts);
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/async.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    var isFile = opts.isFile || defaultIsFile;
-    var isDirectory = opts.isDirectory || defaultIsDir;
-    var readFile = opts.readFile || fs.readFile;
-    var realpath = opts.realpath || defaultRealpath;
-    var readPackage = opts.readPackage || defaultReadPackage;
-    if (opts.readFile && opts.readPackage) {
-        var conflictErr = new TypeError('`readFile` and `readPackage` are mutually exclusive.');
-        return process.nextTick(function () {
-            cb(conflictErr);
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js");
+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));
         });
     }
-    var packageIterator = opts.packageIterator;
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
+}
+exports.default = ProviderAsync;
 
-    var extensions = opts.extensions || ['.js'];
-    var includeCoreModules = opts.includeCoreModules !== false;
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
 
-    opts.paths = opts.paths || defaultPaths();
+/***/ }),
 
-    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
-    var absoluteStart = path.resolve(basedir);
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/filters/deep.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    maybeRealpath(
-        realpath,
-        absoluteStart,
-        opts,
-        function (err, realStart) {
-            if (err) cb(err);
-            else init(realStart);
-        }
-    );
+"use strict";
 
-    var res;
-    function init(basedir) {
-        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
-            res = path.resolve(basedir, x);
-            if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
-            if ((/\/$/).test(x) && res === basedir) {
-                loadAsDirectory(res, opts.package, onfile);
-            } else loadAsFile(res, opts.package, onfile);
-        } else if (includeCoreModules && isCore(x)) {
-            return cb(null, x);
-        } else loadNodeModules(x, basedir, function (err, n, pkg) {
-            if (err) cb(err);
-            else if (n) {
-                return maybeRealpath(realpath, n, opts, function (err, realN) {
-                    if (err) {
-                        cb(err);
-                    } else {
-                        cb(null, realN, pkg);
-                    }
-                });
-            } else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+const partial_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/partial.js");
+class DeepFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
     }
-
-    function onfile(err, m, pkg) {
-        if (err) cb(err);
-        else if (m) cb(null, m, pkg);
-        else loadAsDirectory(res, function (err, d, pkg) {
-            if (err) cb(err);
-            else if (d) {
-                maybeRealpath(realpath, d, opts, function (err, realD) {
-                    if (err) {
-                        cb(err);
-                    } else {
-                        cb(null, realD, pkg);
-                    }
-                });
-            } else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
+    getFilter(basePath, positive, negative) {
+        const matcher = this._getMatcher(positive);
+        const negativeRe = this._getNegativePatternsRe(negative);
+        return (entry) => this._filter(basePath, entry, matcher, negativeRe);
     }
-
-    function loadAsFile(x, thePackage, callback) {
-        var loadAsFilePackage = thePackage;
-        var cb = callback;
-        if (typeof loadAsFilePackage === 'function') {
-            cb = loadAsFilePackage;
-            loadAsFilePackage = undefined;
+    _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) {
+        if (this._isSkippedByDeep(basePath, entry.path)) {
+            return false;
         }
-
-        var exts = [''].concat(extensions);
-        load(exts, x, loadAsFilePackage);
-
-        function load(exts, x, loadPackage) {
-            if (exts.length === 0) return cb(null, undefined, loadPackage);
-            var file = x + exts[0];
-
-            var pkg = loadPackage;
-            if (pkg) onpkg(null, pkg);
-            else loadpkg(path.dirname(file), onpkg);
-
-            function onpkg(err, pkg_, dir) {
-                pkg = pkg_;
-                if (err) return cb(err);
-                if (dir && pkg && opts.pathFilter) {
-                    var rfile = path.relative(dir, file);
-                    var rel = rfile.slice(0, rfile.length - exts[0].length);
-                    var r = opts.pathFilter(pkg, x, rel);
-                    if (r) return load(
-                        [''].concat(extensions.slice()),
-                        path.resolve(dir, r),
-                        pkg
-                    );
-                }
-                isFile(file, onex);
-            }
-            function onex(err, ex) {
-                if (err) return cb(err);
-                if (ex) return cb(null, file, pkg);
-                load(exts.slice(1), x, pkg);
-            }
+        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);
     }
-
-    function loadpkg(dir, cb) {
-        if (dir === '' || dir === '/') return cb(null);
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return cb(null);
+    _isSkippedByDeep(basePath, entryPath) {
+        /**
+         * Avoid unnecessary depth calculations when it doesn't matter.
+         */
+        if (this._settings.deep === Infinity) {
+            return false;
         }
-        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return cb(null);
+        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
+    }
+    _getEntryLevel(basePath, entryPath) {
+        const entryPathDepth = entryPath.split('/').length;
+        if (basePath === '') {
+            return entryPathDepth;
+        }
+        const basePathDepth = basePath.split('/').length;
+        return entryPathDepth - basePathDepth;
+    }
+    _isSkippedSymbolicLink(entry) {
+        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
+    }
+    _isSkippedByPositivePatterns(entryPath, matcher) {
+        return !this._settings.baseNameMatch && !matcher.match(entryPath);
+    }
+    _isSkippedByNegativePatterns(entryPath, patternsRe) {
+        return !utils.pattern.matchAny(entryPath, patternsRe);
+    }
+}
+exports.default = DeepFilter;
 
-        maybeRealpath(realpath, dir, opts, function (unwrapErr, pkgdir) {
-            if (unwrapErr) return loadpkg(path.dirname(dir), cb);
-            var pkgfile = path.join(pkgdir, 'package.json');
-            isFile(pkgfile, function (err, ex) {
-                // on err, ex is false
-                if (!ex) return loadpkg(path.dirname(dir), cb);
 
-                readPackage(readFile, pkgfile, function (err, pkgParam) {
-                    if (err) cb(err);
+/***/ }),
 
-                    var pkg = pkgParam;
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/filters/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-                    if (pkg && opts.packageFilter) {
-                        pkg = opts.packageFilter(pkg, pkgfile);
-                    }
-                    cb(null, pkg, dir);
-                });
-            });
-        });
-    }
+"use strict";
 
-    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
-        var cb = callback;
-        var fpkg = loadAsDirectoryPackage;
-        if (typeof fpkg === 'function') {
-            cb = fpkg;
-            fpkg = opts.package;
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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 && this._isDuplicateEntry(entry)) {
+            return false;
         }
+        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
+            return false;
+        }
+        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
+        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
+        if (this._settings.unique && isMatched) {
+            this._createIndexRecord(entry);
+        }
+        return isMatched;
+    }
+    _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(entryPath, patternsRe) {
+        if (!this._settings.absolute) {
+            return false;
+        }
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
+        return utils.pattern.matchAny(fullpath, patternsRe);
+    }
+    _isMatchToPatterns(entryPath, patternsRe) {
+        const filepath = utils.path.removeLeadingDotSegment(entryPath);
+        return utils.pattern.matchAny(filepath, patternsRe);
+    }
+}
+exports.default = EntryFilter;
 
-        maybeRealpath(realpath, x, opts, function (unwrapErr, pkgdir) {
-            if (unwrapErr) return cb(unwrapErr);
-            var pkgfile = path.join(pkgdir, 'package.json');
-            isFile(pkgfile, function (err, ex) {
-                if (err) return cb(err);
-                if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
-
-                readPackage(readFile, pkgfile, function (err, pkgParam) {
-                    if (err) return cb(err);
-
-                    var pkg = pkgParam;
 
-                    if (pkg && opts.packageFilter) {
-                        pkg = opts.packageFilter(pkg, pkgfile);
-                    }
+/***/ }),
 
-                    if (pkg && pkg.main) {
-                        if (typeof pkg.main !== 'string') {
-                            var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
-                            mainError.code = 'INVALID_PACKAGE_MAIN';
-                            return cb(mainError);
-                        }
-                        if (pkg.main === '.' || pkg.main === './') {
-                            pkg.main = 'index';
-                        }
-                        loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
-                            if (err) return cb(err);
-                            if (m) return cb(null, m, pkg);
-                            if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/filters/error.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-                            var dir = path.resolve(x, pkg.main);
-                            loadAsDirectory(dir, pkg, function (err, n, pkg) {
-                                if (err) return cb(err);
-                                if (n) return cb(null, n, pkg);
-                                loadAsFile(path.join(x, 'index'), pkg, cb);
-                            });
-                        });
-                        return;
-                    }
+"use strict";
 
-                    loadAsFile(path.join(x, '/index'), pkg, cb);
-                });
-            });
-        });
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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;
 
-    function processDirs(cb, dirs) {
-        if (dirs.length === 0) return cb(null, undefined);
-        var dir = dirs[0];
 
-        isDirectory(path.dirname(dir), isdir);
+/***/ }),
 
-        function isdir(err, isdir) {
-            if (err) return cb(err);
-            if (!isdir) return processDirs(cb, dirs.slice(1));
-            loadAsFile(dir, opts.package, onfile);
-        }
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/matcher.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        function onfile(err, m, pkg) {
-            if (err) return cb(err);
-            if (m) return cb(null, m, pkg);
-            loadAsDirectory(dir, opts.package, ondir);
-        }
+"use strict";
 
-        function ondir(err, n, pkg) {
-            if (err) return cb(err);
-            if (n) return cb(null, n, pkg);
-            processDirs(cb, dirs.slice(1));
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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
+            });
         }
     }
-    function loadNodeModules(x, start, cb) {
-        var thunk = function () { return getPackageCandidates(x, start, opts); };
-        processDirs(
-            cb,
-            packageIterator ? packageIterator(x, start, thunk, opts) : thunk()
-        );
+    _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;
 
 
 /***/ }),
-/* 379 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/partial.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+Object.defineProperty(exports, "__esModule", { value: true });
+const matcher_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/matchers/matcher.js");
+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;
+
 
-var os = __webpack_require__(122);
+/***/ }),
 
-// adapted from https://github.com/sindresorhus/os-homedir/blob/11e089f4754db38bb535e5a8416320c4446e8cfd/index.js
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = os.homedir || function homedir() {
-    var home = process.env.HOME;
-    var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME;
+"use strict";
 
-    if (process.platform === 'win32') {
-        return process.env.USERPROFILE || process.env.HOMEDRIVE + process.env.HOMEPATH || home || null;
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const deep_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/filters/deep.js");
+const entry_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/filters/entry.js");
+const error_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/filters/error.js");
+const entry_2 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/transformers/entry.js");
+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);
     }
-
-    if (process.platform === 'darwin') {
-        return home || (user ? '/Users/' + user : null);
+    _getRootDirectory(task) {
+        return path.resolve(this._settings.cwd, task.base);
     }
-
-    if (process.platform === 'linux') {
-        return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null)); // eslint-disable-line no-extra-parens
+    _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()
+        };
     }
-
-    return home || null;
-};
+    _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;
 
 
 /***/ }),
-/* 380 */
-/***/ (function(module, exports) {
-
-module.exports = function () {
-    // see https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-    var origPrepareStackTrace = Error.prepareStackTrace;
-    Error.prepareStackTrace = function (_, stack) { return stack; };
-    var stack = (new Error()).stack;
-    Error.prepareStackTrace = origPrepareStackTrace;
-    return stack[2].getFileName();
-};
 
-
-/***/ }),
-/* 381 */
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/stream.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var path = __webpack_require__(4);
-var parse = path.parse || __webpack_require__(382); // eslint-disable-line global-require
+"use strict";
 
-var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
-    var prefix = '/';
-    if ((/^([A-Za-z]:)/).test(absoluteStart)) {
-        prefix = '';
-    } else if ((/^\\\\/).test(absoluteStart)) {
-        prefix = '\\\\';
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const stream_2 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/stream.js");
+const provider_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js");
+class ProviderStream extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new stream_2.default(this._settings);
     }
-
-    var paths = [absoluteStart];
-    var parsed = parse(absoluteStart);
-    while (parsed.dir !== paths[paths.length - 1]) {
-        paths.push(parsed.dir);
-        parsed = parse(parsed.dir);
+    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;
     }
-
-    return paths.reduce(function (dirs, aPath) {
-        return dirs.concat(modules.map(function (moduleDir) {
-            return path.resolve(prefix, aPath, moduleDir);
-        }));
-    }, []);
-};
-
-module.exports = function nodeModulesPaths(start, opts, request) {
-    var modules = opts && opts.moduleDirectory
-        ? [].concat(opts.moduleDirectory)
-        : ['node_modules'];
-
-    if (opts && typeof opts.paths === 'function') {
-        return opts.paths(
-            request,
-            start,
-            function () { return getNodeModulesDirs(start, modules); },
-            opts
-        );
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
     }
-
-    var dirs = getNodeModulesDirs(start, modules);
-    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
-};
+}
+exports.default = ProviderStream;
 
 
 /***/ }),
-/* 382 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/sync.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-
-var isWindows = process.platform === 'win32';
-
-// Regex to split a windows path into into [dir, root, basename, name, ext]
-var splitWindowsRe =
-    /^(((?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?[\\\/]?)(?:[^\\\/]*[\\\/])*)((\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))[\\\/]*$/;
-
-var win32 = {};
-
-function win32SplitPath(filename) {
-  return splitWindowsRe.exec(filename).slice(1);
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/sync.js");
+const provider_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/providers/provider.js");
+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);
+    }
 }
-
-win32.parse = function(pathString) {
-  if (typeof pathString !== 'string') {
-    throw new TypeError(
-        "Parameter 'pathString' must be a string, not " + typeof pathString
-    );
-  }
-  var allParts = win32SplitPath(pathString);
-  if (!allParts || allParts.length !== 5) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  return {
-    root: allParts[1],
-    dir: allParts[0] === allParts[1] ? allParts[0] : allParts[0].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[4],
-    name: allParts[3]
-  };
-};
+exports.default = ProviderSync;
 
 
+/***/ }),
 
-// Split a filename into [dir, root, basename, name, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^((\/?)(?:[^\/]*\/)*)((\.{1,2}|[^\/]+?|)(\.[^.\/]*|))[\/]*$/;
-var posix = {};
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/providers/transformers/entry.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-function posixSplitPath(filename) {
-  return splitPathRe.exec(filename).slice(1);
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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 });
+    }
 }
-
-
-posix.parse = function(pathString) {
-  if (typeof pathString !== 'string') {
-    throw new TypeError(
-        "Parameter 'pathString' must be a string, not " + typeof pathString
-    );
-  }
-  var allParts = posixSplitPath(pathString);
-  if (!allParts || allParts.length !== 5) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  
-  return {
-    root: allParts[1],
-    dir: allParts[0].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[4],
-    name: allParts[3],
-  };
-};
-
-
-if (isWindows)
-  module.exports = win32.parse;
-else /* posix */
-  module.exports = posix.parse;
-
-module.exports.posix = posix.parse;
-module.exports.win32 = win32.parse;
+exports.default = EntryTransformer;
 
 
 /***/ }),
-/* 383 */
-/***/ (function(module, exports) {
-
-module.exports = function (x, opts) {
-    /**
-     * This file is purposefully a passthrough. It's expected that third-party
-     * environments will override it at runtime in order to inject special logic
-     * into `resolve` (by manipulating the options). One such example is the PnP
-     * code path in Yarn.
-     */
-
-    return opts || {};
-};
 
-
-/***/ }),
-/* 384 */
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/readers/reader.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-
-var has = __webpack_require__(385);
-
-function specifierIncluded(current, specifier) {
-	var nodeParts = current.split('.');
-	var parts = specifier.split(' ');
-	var op = parts.length > 1 ? parts[0] : '=';
-	var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
-
-	for (var i = 0; i < 3; ++i) {
-		var cur = parseInt(nodeParts[i] || 0, 10);
-		var ver = parseInt(versionParts[i] || 0, 10);
-		if (cur === ver) {
-			continue; // eslint-disable-line no-restricted-syntax, no-continue
-		}
-		if (op === '<') {
-			return cur < ver;
-		}
-		if (op === '>=') {
-			return cur >= ver;
-		}
-		return false;
-	}
-	return op === '>=';
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__("path");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const utils = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/index.js");
+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;
 
-function matchesRange(current, range) {
-	var specifiers = range.split(/ ?&& ?/);
-	if (specifiers.length === 0) {
-		return false;
-	}
-	for (var i = 0; i < specifiers.length; ++i) {
-		if (!specifierIncluded(current, specifiers[i])) {
-			return false;
-		}
-	}
-	return true;
-}
 
-function versionIncluded(nodeVersion, specifierValue) {
-	if (typeof specifierValue === 'boolean') {
-		return specifierValue;
-	}
+/***/ }),
 
-	var current = typeof nodeVersion === 'undefined'
-		? process.versions && process.versions.node
-		: nodeVersion;
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/readers/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (typeof current !== 'string') {
-		throw new TypeError(typeof nodeVersion === 'undefined' ? 'Unable to determine current node version' : 'If provided, a valid node version is required');
-	}
+"use strict";
 
-	if (specifierValue && typeof specifierValue === 'object') {
-		for (var i = 0; i < specifierValue.length; ++i) {
-			if (matchesRange(current, specifierValue[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	return matchesRange(current, specifierValue);
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__("stream");
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/reader.js");
+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);
+            });
+        });
+    }
 }
-
-var data = __webpack_require__(388);
-
-module.exports = function isCore(x, nodeVersion) {
-	return has(data, x) && versionIncluded(nodeVersion, data[x]);
-};
+exports.default = ReaderStream;
 
 
 /***/ }),
-/* 385 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/readers/sync.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-
-var bind = __webpack_require__(386);
-
-module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__("../../node_modules/@nodelib/fs.stat/out/index.js");
+const fsWalk = __webpack_require__("../../node_modules/@nodelib/fs.walk/out/index.js");
+const reader_1 = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/readers/reader.js");
+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;
 
 
 /***/ }),
-/* 386 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/settings.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-
-var implementation = __webpack_require__(387);
-
-module.exports = Function.prototype.bind || implementation;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
+const fs = __webpack_require__("fs");
+const os = __webpack_require__("os");
+/**
+ * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
+ * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
+ */
+const CPU_COUNT = Math.max(os.cpus().length, 1);
+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;
 
 
 /***/ }),
-/* 387 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/array.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-
-/* eslint no-invalid-this: 1 */
-
-var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
-var slice = Array.prototype.slice;
-var toStr = Object.prototype.toString;
-var funcType = '[object Function]';
-
-module.exports = function bind(that) {
-    var target = this;
-    if (typeof target !== 'function' || toStr.call(target) !== funcType) {
-        throw new TypeError(ERROR_MESSAGE + target);
-    }
-    var args = slice.call(arguments, 1);
-
-    var bound;
-    var binder = function () {
-        if (this instanceof bound) {
-            var result = target.apply(
-                this,
-                args.concat(slice.call(arguments))
-            );
-            if (Object(result) === result) {
-                return result;
-            }
-            return this;
-        } else {
-            return target.apply(
-                that,
-                args.concat(slice.call(arguments))
-            );
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitWhen = exports.flatten = void 0;
+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);
         }
-    };
-
-    var boundLength = Math.max(0, target.length - args.length);
-    var boundArgs = [];
-    for (var i = 0; i < boundLength; i++) {
-        boundArgs.push('$' + i);
     }
+    return result;
+}
+exports.splitWhen = splitWhen;
 
-    bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
 
-    if (target.prototype) {
-        var Empty = function Empty() {};
-        Empty.prototype = target.prototype;
-        bound.prototype = new Empty();
-        Empty.prototype = null;
-    }
+/***/ }),
 
-    return bound;
-};
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/errno.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-/***/ }),
-/* 388 */
-/***/ (function(module) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEnoentCodeError = void 0;
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
+}
+exports.isEnoentCodeError = isEnoentCodeError;
 
-module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
 
 /***/ }),
-/* 389 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function specifierIncluded(specifier) {
-    var parts = specifier.split(' ');
-    var op = parts.length > 1 ? parts[0] : '=';
-    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+"use strict";
 
-    for (var i = 0; i < 3; ++i) {
-        var cur = parseInt(current[i] || 0, 10);
-        var ver = parseInt(versionParts[i] || 0, 10);
-        if (cur === ver) {
-            continue; // eslint-disable-line no-restricted-syntax, no-continue
-        }
-        if (op === '<') {
-            return cur < ver;
-        } else if (op === '>=') {
-            return cur >= ver;
-        }
-        return false;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDirentFromStats = void 0;
+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);
     }
-    return op === '>=';
 }
-
-function matchesRange(range) {
-    var specifiers = range.split(/ ?&& ?/);
-    if (specifiers.length === 0) { return false; }
-    for (var i = 0; i < specifiers.length; ++i) {
-        if (!specifierIncluded(specifiers[i])) { return false; }
-    }
-    return true;
+function createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
 }
+exports.createDirentFromStats = createDirentFromStats;
 
-function versionIncluded(specifierValue) {
-    if (typeof specifierValue === 'boolean') { return specifierValue; }
-    if (specifierValue && typeof specifierValue === 'object') {
-        for (var i = 0; i < specifierValue.length; ++i) {
-            if (matchesRange(specifierValue[i])) { return true; }
-        }
-        return false;
-    }
-    return matchesRange(specifierValue);
-}
 
-var data = __webpack_require__(390);
+/***/ }),
 
-var core = {};
-for (var mod in data) { // eslint-disable-line no-restricted-syntax
-    if (Object.prototype.hasOwnProperty.call(data, mod)) {
-        core[mod] = versionIncluded(data[mod]);
-    }
-}
-module.exports = core;
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-/***/ }),
-/* 390 */
-/***/ (function(module) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
+const array = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/array.js");
+exports.array = array;
+const errno = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/errno.js");
+exports.errno = errno;
+const fs = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/fs.js");
+exports.fs = fs;
+const path = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/path.js");
+exports.path = path;
+const pattern = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/pattern.js");
+exports.pattern = pattern;
+const stream = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/stream.js");
+exports.stream = stream;
+const string = __webpack_require__("../../node_modules/globby/node_modules/fast-glob/out/utils/string.js");
+exports.string = string;
 
-module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
 
 /***/ }),
-/* 391 */
+
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/path.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var isCoreModule = __webpack_require__(384);
+"use strict";
 
-module.exports = function isCore(x) {
-    return isCoreModule(x);
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
+const path = __webpack_require__("path");
+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;
 
 
 /***/ }),
-/* 392 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isCore = __webpack_require__(384);
-var fs = __webpack_require__(132);
-var path = __webpack_require__(4);
-var getHomedir = __webpack_require__(379);
-var caller = __webpack_require__(380);
-var nodeModulesPaths = __webpack_require__(381);
-var normalizeOptions = __webpack_require__(383);
 
-var realpathFS = fs.realpathSync && typeof fs.realpathSync.native === 'function' ? fs.realpathSync.native : fs.realpathSync;
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/pattern.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var homedir = getHomedir();
-var defaultPaths = function () {
-    return [
-        path.join(homedir, '.node_modules'),
-        path.join(homedir, '.node_libraries')
-    ];
-};
+"use strict";
 
-var defaultIsFile = function isFile(file) {
-    try {
-        var stat = fs.statSync(file, { throwIfNoEntry: false });
-    } catch (e) {
-        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
-        throw e;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
+const path = __webpack_require__("path");
+const globParent = __webpack_require__("../../node_modules/glob-parent/index.js");
+const micromatch = __webpack_require__("../../node_modules/globby/node_modules/micromatch/index.js");
+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 = {}) {
+    /**
+     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
+     * An empty string cannot be a dynamic pattern.
+     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
+     */
+    if (pattern === '') {
+        return false;
     }
-    return !!stat && (stat.isFile() || stat.isFIFO());
-};
-
-var defaultIsDir = function isDirectory(dir) {
-    try {
-        var stat = fs.statSync(dir, { throwIfNoEntry: false });
-    } catch (e) {
-        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
-        throw e;
+    /**
+     * 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;
     }
-    return !!stat && stat.isDirectory();
-};
-
-var defaultRealpathSync = function realpathSync(x) {
-    try {
-        return realpathFS(x);
-    } catch (realpathErr) {
-        if (realpathErr.code !== 'ENOENT') {
-            throw realpathErr;
-        }
+    if (COMMON_GLOB_SYMBOLS_RE.test(pattern) || REGEX_CHARACTER_CLASS_SYMBOLS_RE.test(pattern) || REGEX_GROUP_SYMBOLS_RE.test(pattern)) {
+        return true;
     }
-    return x;
-};
-
-var maybeRealpathSync = function maybeRealpathSync(realpathSync, x, opts) {
-    if (opts && opts.preserveSymlinks === false) {
-        return realpathSync(x);
+    if (options.extglob !== false && GLOB_EXTENSION_SYMBOLS_RE.test(pattern)) {
+        return true;
     }
-    return x;
-};
+    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;
+/**
+ * Returns patterns that can be applied inside the current directory.
+ *
+ * @example
+ * // ['./*', '*', 'a/*']
+ * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
+ */
+function getPatternsInsideCurrentDirectory(patterns) {
+    return patterns.filter((pattern) => !isPatternRelatedToParentDirectory(pattern));
+}
+exports.getPatternsInsideCurrentDirectory = getPatternsInsideCurrentDirectory;
+/**
+ * Returns patterns to be expanded relative to (outside) the current directory.
+ *
+ * @example
+ * // ['../*', './../*']
+ * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
+ */
+function getPatternsOutsideCurrentDirectory(patterns) {
+    return patterns.filter(isPatternRelatedToParentDirectory);
+}
+exports.getPatternsOutsideCurrentDirectory = getPatternsOutsideCurrentDirectory;
+function isPatternRelatedToParentDirectory(pattern) {
+    return pattern.startsWith('..') || pattern.startsWith('./..');
+}
+exports.isPatternRelatedToParentDirectory = isPatternRelatedToParentDirectory;
+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) {
+    let { parts } = micromatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
+    /**
+     * The scan method returns an empty array in some cases.
+     * See micromatch/picomatch#58 for more details.
+     */
+    if (parts.length === 0) {
+        parts = [pattern];
+    }
+    /**
+     * The scan method does not return an empty part for the pattern with a forward slash.
+     * This is another part of micromatch/picomatch#58.
+     */
+    if (parts[0].startsWith('/')) {
+        parts[0] = parts[0].slice(1);
+        parts.unshift('');
+    }
+    return 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;
 
-var defaultReadPackageSync = function defaultReadPackageSync(readFileSync, pkgfile) {
-    var body = readFileSync(pkgfile);
-    try {
-        var pkg = JSON.parse(body);
-        return pkg;
-    } catch (jsonErr) {}
-};
 
-var getPackageCandidates = function getPackageCandidates(x, start, opts) {
-    var dirs = nodeModulesPaths(start, opts, x);
-    for (var i = 0; i < dirs.length; i++) {
-        dirs[i] = path.join(dirs[i], x);
-    }
-    return dirs;
-};
+/***/ }),
 
-module.exports = function resolveSync(x, options) {
-    if (typeof x !== 'string') {
-        throw new TypeError('Path must be a string.');
-    }
-    var opts = normalizeOptions(x, options);
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/stream.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    var isFile = opts.isFile || defaultIsFile;
-    var readFileSync = opts.readFileSync || fs.readFileSync;
-    var isDirectory = opts.isDirectory || defaultIsDir;
-    var realpathSync = opts.realpathSync || defaultRealpathSync;
-    var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
-    if (opts.readFileSync && opts.readPackageSync) {
-        throw new TypeError('`readFileSync` and `readPackageSync` are mutually exclusive.');
-    }
-    var packageIterator = opts.packageIterator;
+"use strict";
 
-    var extensions = opts.extensions || ['.js'];
-    var includeCoreModules = opts.includeCoreModules !== false;
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = void 0;
+const merge2 = __webpack_require__("../../node_modules/merge2/index.js");
+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'));
+}
 
-    opts.paths = opts.paths || defaultPaths();
 
-    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
-    var absoluteStart = maybeRealpathSync(realpathSync, path.resolve(basedir), opts);
+/***/ }),
 
-    if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
-        var res = path.resolve(absoluteStart, x);
-        if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
-        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
-        if (m) return maybeRealpathSync(realpathSync, m, opts);
-    } else if (includeCoreModules && isCore(x)) {
-        return x;
-    } else {
-        var n = loadNodeModulesSync(x, absoluteStart);
-        if (n) return maybeRealpathSync(realpathSync, n, opts);
-    }
+/***/ "../../node_modules/globby/node_modules/fast-glob/out/utils/string.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-    err.code = 'MODULE_NOT_FOUND';
-    throw err;
+"use strict";
 
-    function loadAsFileSync(x) {
-        var pkg = loadpkg(path.dirname(x));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEmpty = exports.isString = void 0;
+function isString(input) {
+    return typeof input === 'string';
+}
+exports.isString = isString;
+function isEmpty(input) {
+    return input === '';
+}
+exports.isEmpty = isEmpty;
 
-        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
-            var rfile = path.relative(pkg.dir, x);
-            var r = opts.pathFilter(pkg.pkg, x, rfile);
-            if (r) {
-                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
-            }
-        }
 
-        if (isFile(x)) {
-            return x;
-        }
+/***/ }),
 
-        for (var i = 0; i < extensions.length; i++) {
-            var file = x + extensions[i];
-            if (isFile(file)) {
-                return file;
-            }
-        }
-    }
+/***/ "../../node_modules/globby/node_modules/micromatch/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    function loadpkg(dir) {
-        if (dir === '' || dir === '/') return;
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return;
-        }
-        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
+"use strict";
 
-        var pkgfile = path.join(maybeRealpathSync(realpathSync, dir, opts), 'package.json');
 
-        if (!isFile(pkgfile)) {
-            return loadpkg(path.dirname(dir));
-        }
+const util = __webpack_require__("util");
+const braces = __webpack_require__("../../node_modules/braces/index.js");
+const picomatch = __webpack_require__("../../node_modules/picomatch/index.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+const isEmptyString = val => val === '' || val === './';
 
-        var pkg = readPackageSync(readFileSync, pkgfile);
+/**
+ * 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
+ */
 
-        if (pkg && opts.packageFilter) {
-            // v2 will pass pkgfile
-            pkg = opts.packageFilter(pkg, /*pkgfile,*/ dir); // eslint-disable-line spaced-comment
-        }
+const micromatch = (list, patterns, options) => {
+  patterns = [].concat(patterns);
+  list = [].concat(list);
 
-        return { pkg: pkg, dir: dir };
-    }
+  let omit = new Set();
+  let keep = new Set();
+  let items = new Set();
+  let negatives = 0;
 
-    function loadAsDirectorySync(x) {
-        var pkgfile = path.join(maybeRealpathSync(realpathSync, x, opts), '/package.json');
-        if (isFile(pkgfile)) {
-            try {
-                var pkg = readPackageSync(readFileSync, pkgfile);
-            } catch (e) {}
+  let onResult = state => {
+    items.add(state.output);
+    if (options && options.onResult) {
+      options.onResult(state);
+    }
+  };
 
-            if (pkg && opts.packageFilter) {
-                // v2 will pass pkgfile
-                pkg = opts.packageFilter(pkg, /*pkgfile,*/ x); // eslint-disable-line spaced-comment
-            }
+  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 (pkg && pkg.main) {
-                if (typeof pkg.main !== 'string') {
-                    var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
-                    mainError.code = 'INVALID_PACKAGE_MAIN';
-                    throw mainError;
-                }
-                if (pkg.main === '.' || pkg.main === './') {
-                    pkg.main = 'index';
-                }
-                try {
-                    var m = loadAsFileSync(path.resolve(x, pkg.main));
-                    if (m) return m;
-                    var n = loadAsDirectorySync(path.resolve(x, pkg.main));
-                    if (n) return n;
-                } catch (e) {}
-            }
-        }
+    for (let item of list) {
+      let matched = isMatch(item, true);
 
-        return loadAsFileSync(path.join(x, '/index'));
+      let match = negated ? !matched.isMatch : matched.isMatch;
+      if (!match) continue;
+
+      if (negated) {
+        omit.add(matched.output);
+      } else {
+        omit.delete(matched.output);
+        keep.add(matched.output);
+      }
     }
+  }
 
-    function loadNodeModulesSync(x, start) {
-        var thunk = function () { return getPackageCandidates(x, start, opts); };
-        var dirs = packageIterator ? packageIterator(x, start, thunk, opts) : thunk();
+  let result = negatives === patterns.length ? [...items] : [...keep];
+  let matches = result.filter(item => !omit.has(item));
 
-        for (var i = 0; i < dirs.length; i++) {
-            var dir = dirs[i];
-            if (isDirectory(path.dirname(dir))) {
-                var m = loadAsFileSync(dir);
-                if (m) return m;
-                var n = loadAsDirectorySync(dir);
-                if (n) return n;
-            }
-        }
+  if (options && matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+    }
+
+    if (options.nonull === true || options.nullglob === true) {
+      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
     }
+  }
+
+  return matches;
 };
 
+/**
+ * Backwards compatibility
+ */
 
-/***/ }),
-/* 393 */
-/***/ (function(module, exports) {
+micromatch.match = micromatch;
 
-module.exports = extractDescription
+/**
+ * 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
+ */
 
-// Extracts description from contents of a readme file in markdown format
-function extractDescription (d) {
-  if (!d) return;
-  if (d === "ERROR: No README data found!") return;
-  // the first block of text before the first heading
-  // that isn't the first line heading
-  d = d.trim().split('\n')
-  for (var s = 0; d[s] && d[s].trim().match(/^(#|$)/); s ++);
-  var l = d.length
-  for (var e = s + 1; e < l && d[e].trim(); e ++);
-  return d.slice(s, e).join(' ').trim()
-}
+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
+ */
 
-/***/ }),
-/* 394 */
-/***/ (function(module) {
+micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
-module.exports = JSON.parse("{\"topLevel\":{\"dependancies\":\"dependencies\",\"dependecies\":\"dependencies\",\"depdenencies\":\"dependencies\",\"devEependencies\":\"devDependencies\",\"depends\":\"dependencies\",\"dev-dependencies\":\"devDependencies\",\"devDependences\":\"devDependencies\",\"devDepenencies\":\"devDependencies\",\"devdependencies\":\"devDependencies\",\"repostitory\":\"repository\",\"repo\":\"repository\",\"prefereGlobal\":\"preferGlobal\",\"hompage\":\"homepage\",\"hampage\":\"homepage\",\"autohr\":\"author\",\"autor\":\"author\",\"contributers\":\"contributors\",\"publicationConfig\":\"publishConfig\",\"script\":\"scripts\"},\"bugs\":{\"web\":\"url\",\"name\":\"url\"},\"script\":{\"server\":\"start\",\"tests\":\"test\"}}");
+/**
+ * Backwards compatibility
+ */
 
-/***/ }),
-/* 395 */
-/***/ (function(module, exports, __webpack_require__) {
+micromatch.any = micromatch.isMatch;
+
+/**
+ * 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
+ */
 
-var util = __webpack_require__(113)
-var messages = __webpack_require__(396)
+micromatch.not = (list, patterns, options = {}) => {
+  patterns = [].concat(patterns).map(String);
+  let result = new Set();
+  let items = [];
 
-module.exports = function() {
-  var args = Array.prototype.slice.call(arguments, 0)
-  var warningName = args.shift()
-  if (warningName == "typo") {
-    return makeTypoWarning.apply(null,args)
+  let onResult = state => {
+    if (options.onResult) options.onResult(state);
+    items.push(state.output);
+  };
+
+  let matches = micromatch(list, patterns, { ...options, onResult });
+
+  for (let item of items) {
+    if (!matches.includes(item)) {
+      result.add(item);
+    }
   }
-  else {
-    var msgTemplate = messages[warningName] ? messages[warningName] : warningName + ": '%s'"
-    args.unshift(msgTemplate)
-    return util.format.apply(null, args)
+  return [...result];
+};
+
+/**
+ * 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 any of the patterns matches any part of `str`.
+ * @api public
+ */
+
+micromatch.contains = (str, pattern, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
   }
-}
 
-function makeTypoWarning (providedName, probableName, field) {
-  if (field) {
-    providedName = field + "['" + providedName + "']"
-    probableName = field + "['" + probableName + "']"
+  if (Array.isArray(pattern)) {
+    return pattern.some(p => micromatch.contains(str, p, options));
   }
-  return util.format(messages.typo, providedName, probableName)
-}
 
+  if (typeof pattern === 'string') {
+    if (isEmptyString(str) || isEmptyString(pattern)) {
+      return false;
+    }
 
-/***/ }),
-/* 396 */
-/***/ (function(module) {
+    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
+      return true;
+    }
+  }
 
-module.exports = JSON.parse("{\"repositories\":\"'repositories' (plural) Not supported. Please pick one as the 'repository' field\",\"missingRepository\":\"No repository field.\",\"brokenGitUrl\":\"Probably broken git url: %s\",\"nonObjectScripts\":\"scripts must be an object\",\"nonStringScript\":\"script values must be string commands\",\"nonArrayFiles\":\"Invalid 'files' member\",\"invalidFilename\":\"Invalid filename in 'files' list: %s\",\"nonArrayBundleDependencies\":\"Invalid 'bundleDependencies' list. Must be array of package names\",\"nonStringBundleDependency\":\"Invalid bundleDependencies member: %s\",\"nonDependencyBundleDependency\":\"Non-dependency in bundleDependencies: %s\",\"nonObjectDependencies\":\"%s field must be an object\",\"nonStringDependency\":\"Invalid dependency: %s %s\",\"deprecatedArrayDependencies\":\"specifying %s as array is deprecated\",\"deprecatedModules\":\"modules field is deprecated\",\"nonArrayKeywords\":\"keywords should be an array of strings\",\"nonStringKeyword\":\"keywords should be an array of strings\",\"conflictingName\":\"%s is also the name of a node core module.\",\"nonStringDescription\":\"'description' field should be a string\",\"missingDescription\":\"No description\",\"missingReadme\":\"No README data\",\"missingLicense\":\"No license field.\",\"nonEmailUrlBugsString\":\"Bug string field must be url, email, or {email,url}\",\"nonUrlBugsUrlField\":\"bugs.url field must be a string url. Deleted.\",\"nonEmailBugsEmailField\":\"bugs.email field must be a string email. Deleted.\",\"emptyNormalizedBugs\":\"Normalized value of bugs field is an empty object. Deleted.\",\"nonUrlHomepage\":\"homepage field must be a string url. Deleted.\",\"invalidLicense\":\"license should be a valid SPDX license expression\",\"typo\":\"%s should probably be %s.\"}");
+  return micromatch.isMatch(str, pattern, { ...options, contains: true });
+};
 
-/***/ }),
-/* 397 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * 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
+ */
 
-"use strict";
+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;
+};
 
-const path = __webpack_require__(4);
-const writeJsonFile = __webpack_require__(398);
-const sortKeys = __webpack_require__(402);
+/**
+ * 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` matches any of the strings in `list`
+ * @api public
+ */
 
-const dependencyKeys = new Set([
-	'dependencies',
-	'devDependencies',
-	'optionalDependencies',
-	'peerDependencies'
-]);
+micromatch.some = (list, patterns, options) => {
+  let items = [].concat(list);
 
-function normalize(packageJson) {
-	const result = {};
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (items.some(item => isMatch(item))) {
+      return true;
+    }
+  }
+  return false;
+};
 
-	for (const key of Object.keys(packageJson)) {
-		if (!dependencyKeys.has(key)) {
-			result[key] = packageJson[key];
-		} else if (Object.keys(packageJson[key]).length !== 0) {
-			result[key] = sortKeys(packageJson[key]);
-		}
-	}
+/**
+ * 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 all `patterns` matches all of the strings in `list`
+ * @api public
+ */
 
-	return result;
-}
+micromatch.every = (list, patterns, options) => {
+  let items = [].concat(list);
 
-module.exports = async (filePath, data, options) => {
-	if (typeof filePath !== 'string') {
-		options = data;
-		data = filePath;
-		filePath = '.';
-	}
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (!items.every(item => isMatch(item))) {
+      return false;
+    }
+  }
+  return true;
+};
 
-	options = {
-		normalize: true,
-		...options,
-		detectIndent: true
-	};
+/**
+ * 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
+ */
 
-	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
+micromatch.all = (str, patterns, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
 
-	data = options.normalize ? normalize(data) : data;
+  return [].concat(patterns).every(p => picomatch(p, options)(str));
+};
 
-	return writeJsonFile(filePath, data, 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 {Array|null} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
+ * @api public
+ */
+
+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);
+
+  if (match) {
+    return match.slice(1).map(v => v === void 0 ? '' : v);
+  }
 };
 
-module.exports.sync = (filePath, data, options) => {
-	if (typeof filePath !== 'string') {
-		options = data;
-		data = filePath;
-		filePath = '.';
-	}
+/**
+ * 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
+ */
 
-	options = {
-		normalize: true,
-		...options,
-		detectIndent: true
-	};
+micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
+/**
+ * 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
+ */
 
-	data = options.normalize ? normalize(data) : data;
+micromatch.scan = (...args) => picomatch.scan(...args);
 
-	writeJsonFile.sync(filePath, data, options);
+/**
+ * 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;
 };
 
+/**
+ * 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
+ */
 
-/***/ }),
-/* 398 */
-/***/ (function(module, exports, __webpack_require__) {
+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);
+};
 
-"use strict";
+/**
+ * Expand braces
+ */
 
-const path = __webpack_require__(4);
-const fs = __webpack_require__(233);
-const writeFileAtomic = __webpack_require__(399);
-const sortKeys = __webpack_require__(402);
-const makeDir = __webpack_require__(404);
-const pify = __webpack_require__(405);
-const detectIndent = __webpack_require__(407);
+micromatch.braceExpand = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  return micromatch.braces(pattern, { ...options, expand: true });
+};
 
-const init = (fn, filePath, data, options) => {
-	if (!filePath) {
-		throw new TypeError('Expected a filepath');
-	}
+/**
+ * Expose micromatch
+ */
 
-	if (data === undefined) {
-		throw new TypeError('Expected data to stringify');
-	}
+module.exports = micromatch;
 
-	options = Object.assign({
-		indent: '\t',
-		sortKeys: false
-	}, options);
 
-	if (options.sortKeys) {
-		data = sortKeys(data, {
-			deep: true,
-			compare: typeof options.sortKeys === 'function' ? options.sortKeys : undefined
-		});
-	}
+/***/ }),
 
-	return fn(filePath, data, options);
-};
+/***/ "../../node_modules/globby/stream-utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const readFile = filePath => pify(fs.readFile)(filePath, 'utf8').catch(() => {});
+"use strict";
 
-const main = (filePath, data, options) => {
-	return (options.detectIndent ? readFile(filePath) : Promise.resolve())
-		.then(string => {
-			const indent = string ? detectIndent(string).indent : options.indent;
-			const json = JSON.stringify(data, options.replacer, indent);
+const {Transform} = __webpack_require__("stream");
 
-			return pify(writeFileAtomic)(filePath, `${json}\n`, {mode: options.mode});
+class ObjectTransform extends Transform {
+	constructor() {
+		super({
+			objectMode: true
 		});
-};
+	}
+}
 
-const mainSync = (filePath, data, options) => {
-	let {indent} = options;
+class FilterStream extends ObjectTransform {
+	constructor(filter) {
+		super();
+		this._filter = filter;
+	}
 
-	if (options.detectIndent) {
-		try {
-			const file = fs.readFileSync(filePath, 'utf8');
-			indent = detectIndent(file).indent;
-		} catch (error) {
-			if (error.code !== 'ENOENT') {
-				throw error;
-			}
+	_transform(data, encoding, callback) {
+		if (this._filter(data)) {
+			this.push(data);
 		}
+
+		callback();
 	}
+}
 
-	const json = JSON.stringify(data, options.replacer, indent);
+class UniqueStream extends ObjectTransform {
+	constructor() {
+		super();
+		this._pushed = new Set();
+	}
 
-	return writeFileAtomic.sync(filePath, `${json}\n`, {mode: options.mode});
-};
+	_transform(data, encoding, callback) {
+		if (!this._pushed.has(data)) {
+			this.push(data);
+			this._pushed.add(data);
+		}
 
-const writeJsonFile = (filePath, data, options) => {
-	return makeDir(path.dirname(filePath), {fs})
-		.then(() => init(main, filePath, data, options));
-};
+		callback();
+	}
+}
 
-module.exports = writeJsonFile;
-// TODO: Remove this for the next major release
-module.exports.default = writeJsonFile;
-module.exports.sync = (filePath, data, options) => {
-	makeDir.sync(path.dirname(filePath), {fs});
-	init(mainSync, filePath, data, options);
+module.exports = {
+	FilterStream,
+	UniqueStream
 };
 
 
 /***/ }),
-/* 399 */
+
+/***/ "../../node_modules/graceful-fs/clone.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = writeFile
-module.exports.sync = writeFileSync
-module.exports._getTmpname = getTmpname // for testing
-module.exports._cleanupOnExit = cleanupOnExit
 
-var fs = __webpack_require__(233)
-var MurmurHash3 = __webpack_require__(400)
-var onExit = __webpack_require__(161)
-var path = __webpack_require__(4)
-var activeFiles = {}
+module.exports = clone
 
-// 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__(401)
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
 
-    /// 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 (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
 
-var invocations = 0
-function getTmpname (filename) {
-  return filename + '.' +
-    MurmurHash3(__filename)
-      .hash(String(process.pid))
-      .hash(String(threadId))
-      .hash(String(++invocations))
-      .result()
-}
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
 
-function cleanupOnExit (tmpfile) {
-  return function () {
-    try {
-      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
-    } catch (_) {}
-  }
+  return copy
 }
 
-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 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)
+/***/ }),
 
-  new Promise(function serializeSameFile (resolve) {
-    // make a queue if it doesn't already exist
-    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
+/***/ "../../node_modules/graceful-fs/graceful-fs.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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)
+var fs = __webpack_require__("fs")
+var polyfills = __webpack_require__("../../node_modules/graceful-fs/polyfills.js")
+var legacy = __webpack_require__("../../node_modules/graceful-fs/legacy-streams.js")
+var clone = __webpack_require__("../../node_modules/graceful-fs/clone.js")
 
-            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()
-        })
-      })
+var util = __webpack_require__("util")
+
+/* istanbul ignore next - node 0.x polyfill */
+var gracefulQueue
+var previousSymbol
+
+/* istanbul ignore else - node 0.x polyfill */
+if (typeof Symbol === 'function' && typeof Symbol.for === 'function') {
+  gracefulQueue = Symbol.for('graceful-fs.queue')
+  // This is used in testing by future versions
+  previousSymbol = Symbol.for('graceful-fs.previous')
+} else {
+  gracefulQueue = '___graceful-fs.queue'
+  previousSymbol = '___graceful-fs.previous'
+}
+
+function noop () {}
+
+function publishQueue(context, queue) {
+  Object.defineProperty(context, gracefulQueue, {
+    get: function() {
+      return queue
     }
-  }).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]
   })
 }
 
-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 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)
   }
-  var tmpfile = getTmpname(filename)
 
-  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
-    }
-  }
+// Once time initialization
+if (!fs[gracefulQueue]) {
+  // This queue can be shared by multiple loaded instances
+  var queue = global[gracefulQueue] || []
+  publishQueue(fs, queue)
 
-  var fd
-  var cleanup = cleanupOnExit(tmpfile)
-  var removeOnExitHandler = onExit(cleanup)
+  // Patch fs.close/closeSync to shared queue version, because we need
+  // 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.
+  fs.close = (function (fs$close) {
+    function close (fd, cb) {
+      return fs$close.call(fs, fd, function (err) {
+        // This function uses the graceful-fs shared queue
+        if (!err) {
+          retry()
+        }
 
-  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.
-      }
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+      })
     }
-    removeOnExitHandler()
-    cleanup()
-    throw err
-  }
-}
-
 
-/***/ }),
-/* 400 */
-/***/ (function(module, exports, __webpack_require__) {
+    Object.defineProperty(close, previousSymbol, {
+      value: fs$close
+    })
+    return close
+  })(fs.close)
 
-/**
- * @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;
+  fs.closeSync = (function (fs$closeSync) {
+    function closeSync (fd) {
+      // This function uses the graceful-fs shared queue
+      fs$closeSync.apply(fs, arguments)
+      retry()
+    }
 
-    // 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);
-        }
+    Object.defineProperty(closeSync, previousSymbol, {
+      value: fs$closeSync
+    })
+    return closeSync
+  })(fs.closeSync)
 
-        if (m !== this) {
-            return m;
-        }
-    };
+  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+    process.on('exit', function() {
+      debug(fs[gracefulQueue])
+      __webpack_require__("assert").equal(fs[gracefulQueue].length, 0)
+    })
+  }
+}
 
-    // 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;
+if (!global[gracefulQueue]) {
+  publishQueue(global, fs[gracefulQueue]);
+}
 
-        len = key.length;
-        this.len += len;
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
+}
 
-        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 patch (fs) {
+  // Everything that references the open() function needs to be in here
+  polyfills(fs)
+  fs.gracefulify = patch
 
-        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;
+  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
 
-                h1 ^= k1;
-                h1 = (h1 << 13) | (h1 >>> 19);
-                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
+    return go$readFile(path, options, cb)
 
-                if (i >= len) {
-                    break;
-                }
+    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()
+        }
+      })
+    }
+  }
 
-                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);
-            }
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
 
-            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);
-            }
+    return go$writeFile(path, data, options, cb)
 
-            this.h1 = h1;
+    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()
         }
+      })
+    }
+  }
 
-        this.k1 = k1;
-        return this;
-    };
+  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
 
-    // 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 go$appendFile(path, data, options, cb)
 
-        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 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()
         }
+      })
+    }
+  }
+
+  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)
 
-        h1 ^= this.len;
+    return go$readdir(args)
 
-        h1 ^= h1 >>> 16;
-        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
-        h1 ^= h1 >>> 13;
-        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
-        h1 ^= h1 >>> 16;
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
 
-        return h1 >>> 0;
-    };
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
 
-    // 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;
-    };
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
+    }
+  }
 
-    // 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();
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
 
-    if (true) {
-        module.exports = MurmurHash3;
-    } else {}
-}());
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
 
+  var fs$ReadStream = fs.ReadStream
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
 
-/***/ }),
-/* 401 */
-/***/ (function(module, exports) {
+  var fs$WriteStream = fs.WriteStream
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
 
-module.exports = require(undefined);
+  Object.defineProperty(fs, 'ReadStream', {
+    get: function () {
+      return ReadStream
+    },
+    set: function (val) {
+      ReadStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
+  Object.defineProperty(fs, 'WriteStream', {
+    get: function () {
+      return WriteStream
+    },
+    set: function (val) {
+      WriteStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
 
-/***/ }),
-/* 402 */
-/***/ (function(module, exports, __webpack_require__) {
+  // legacy names
+  var FileReadStream = ReadStream
+  Object.defineProperty(fs, 'FileReadStream', {
+    get: function () {
+      return FileReadStream
+    },
+    set: function (val) {
+      FileReadStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
+  var FileWriteStream = WriteStream
+  Object.defineProperty(fs, 'FileWriteStream', {
+    get: function () {
+      return FileWriteStream
+    },
+    set: function (val) {
+      FileWriteStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
 
-"use strict";
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
 
-const isPlainObj = __webpack_require__(403);
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
 
-module.exports = (obj, opts) => {
-	if (!isPlainObj(obj)) {
-		throw new TypeError('Expected a plain object');
-	}
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
 
-	opts = opts || {};
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
 
-	// DEPRECATED
-	if (typeof opts === 'function') {
-		throw new TypeError('Specify the compare function as an option instead');
-	}
+  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)
+      }
+    })
+  }
 
-	const deep = opts.deep;
-	const seenInput = [];
-	const seenOutput = [];
+  function createReadStream (path, options) {
+    return new fs.ReadStream(path, options)
+  }
 
-	const sortKeys = x => {
-		const seenIndex = seenInput.indexOf(x);
+  function createWriteStream (path, options) {
+    return new fs.WriteStream(path, options)
+  }
 
-		if (seenIndex !== -1) {
-			return seenOutput[seenIndex];
-		}
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
 
-		const ret = {};
-		const keys = Object.keys(x).sort(opts.compare);
+    return go$open(path, flags, mode, cb)
 
-		seenInput.push(x);
-		seenOutput.push(ret);
+    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()
+        }
+      })
+    }
+  }
 
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			const val = x[key];
+  return fs
+}
 
-			if (deep && Array.isArray(val)) {
-				const retArr = [];
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  fs[gracefulQueue].push(elem)
+}
 
-				for (let j = 0; j < val.length; j++) {
-					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
-				}
+function retry () {
+  var elem = fs[gracefulQueue].shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
 
-				ret[key] = retArr;
-				continue;
-			}
 
-			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
-		}
+/***/ }),
 
-		return ret;
-	};
+/***/ "../../node_modules/graceful-fs/legacy-streams.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return sortKeys(obj);
-};
+var Stream = __webpack_require__("stream").Stream
 
+module.exports = legacy
 
-/***/ }),
-/* 403 */
-/***/ (function(module, exports, __webpack_require__) {
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
 
-"use strict";
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
 
-var toString = Object.prototype.toString;
+    Stream.call(this);
 
-module.exports = function (x) {
-	var prototype;
-	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
-};
+    var self = this;
 
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
 
-/***/ }),
-/* 404 */
-/***/ (function(module, exports, __webpack_require__) {
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
 
-"use strict";
+    options = options || {};
 
-const fs = __webpack_require__(132);
-const path = __webpack_require__(4);
-const pify = __webpack_require__(405);
-const semver = __webpack_require__(406);
+    // 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];
+    }
 
-const defaults = {
-	mode: 0o777 & (~process.umask()),
-	fs
-};
+    if (this.encoding) this.setEncoding(this.encoding);
 
-const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
+    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');
+      }
 
-// 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, ''));
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
 
-		if (pathHasInvalidWinCharacters) {
-			const error = new Error(`Path contains invalid characters: ${pth}`);
-			error.code = 'EINVAL';
-			throw error;
-		}
-	}
-};
+      this.pos = this.start;
+    }
 
-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;
-};
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
 
-const makeDir = (input, options) => Promise.resolve().then(() => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
 
-	// TODO: Use util.promisify when targeting Node.js 8
-	const mkdir = pify(options.fs.mkdir);
-	const stat = pify(options.fs.stat);
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
 
-	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
-		const pth = path.resolve(input);
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-		return mkdir(pth, {
-			mode: options.mode,
-			recursive: true
-		}).then(() => pth);
-	}
+    Stream.call(this);
 
-	const make = pth => {
-		return mkdir(pth, options.mode)
-			.then(() => pth)
-			.catch(error => {
-				if (error.code === 'EPERM') {
-					throw error;
-				}
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
 
-				if (error.code === 'ENOENT') {
-					if (path.dirname(pth) === pth) {
-						throw permissionError(pth);
-					}
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
 
-					if (error.message.includes('null bytes')) {
-						throw error;
-					}
+    options = options || {};
 
-					return make(path.dirname(pth)).then(() => make(pth));
-				}
+    // 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];
+    }
 
-				return stat(pth)
-					.then(stats => stats.isDirectory() ? pth : Promise.reject())
-					.catch(() => {
-						throw error;
-					});
-			});
-	};
+    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 make(path.resolve(input));
-});
+      this.pos = this.start;
+    }
 
-module.exports = makeDir;
-module.exports.default = makeDir;
+    this.busy = false;
+    this._queue = [];
 
-module.exports.sync = (input, options) => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
+}
 
-	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
-		const pth = path.resolve(input);
 
-		fs.mkdirSync(pth, {
-			mode: options.mode,
-			recursive: true
-		});
+/***/ }),
 
-		return pth;
-	}
+/***/ "../../node_modules/graceful-fs/polyfills.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	const make = pth => {
-		try {
-			options.fs.mkdirSync(pth, options.mode);
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
+var constants = __webpack_require__("constants")
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
+var origCwd = process.cwd
+var cwd = null
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
 
-				make(path.dirname(pth));
-				return make(pth);
-			}
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
+}
+try {
+  process.cwd()
+} catch (er) {}
 
-			try {
-				if (!options.fs.statSync(pth).isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
-		}
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
 
-		return pth;
-	};
+module.exports = patch
 
-	return make(path.resolve(input));
-};
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
 
+  // 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)
+  }
 
-/***/ }),
-/* 405 */
-/***/ (function(module, exports, __webpack_require__) {
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
+  }
 
-"use strict";
+  // 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.
 
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
 
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
 
-	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);
-		}
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
 
-		fn.apply(this, args);
-	});
-};
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
 
-	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}\``);
-	}
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
 
-	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);
-	};
+  // 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 () {}
+  }
 
-	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));
-	}
+  // 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.
 
-	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;
-	}
+  // 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)
+  }
 
-	return ret;
-};
+  // if read() returns EAGAIN, then just try it again.
+  fs.read = (function (fs$read) {
+    function read (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)
+    }
 
+    // This ensures `util.promisify` works as it does for native `fs.read`.
+    read.__proto__ = fs$read
+    return read
+  })(fs.read)
 
-/***/ }),
-/* 406 */
-/***/ (function(module, exports) {
+  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)
 
-exports = module.exports = SemVer
+  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)
+          })
+        })
+      })
+    }
 
-var debug
-/* istanbul ignore next */
-if (typeof process === 'object' &&
-    process.env &&
-    process.env.NODE_DEBUG &&
-    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
-  debug = function () {
-    var args = Array.prototype.slice.call(arguments, 0)
-    args.unshift('SEMVER')
-    console.log.apply(console, args)
+    fs.lchmodSync = function (path, mode) {
+      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+
+      // 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
+    }
   }
-} else {
-  debug = function () {}
-}
 
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0'
+  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)
+            })
+          })
+        })
+      }
 
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
+      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
+      }
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
+  }
 
-// The actual regexps go on exports.re
-var re = exports.re = []
-var src = exports.src = []
-var R = 0
+  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)
+      })
+    }
+  }
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
+  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
+      }
+    }
+  }
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
 
-var NUMERICIDENTIFIER = R++
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-var NUMERICIDENTIFIERLOOSE = R++
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
+  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)
+      })
+    }
+  }
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+  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
+      }
+    }
+  }
 
-var NONNUMERICIDENTIFIER = R++
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
+  function statFix (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target, options, cb) {
+      if (typeof options === 'function') {
+        cb = options
+        options = null
+      }
+      function callback (er, stats) {
+        if (stats) {
+          if (stats.uid < 0) stats.uid += 0x100000000
+          if (stats.gid < 0) stats.gid += 0x100000000
+        }
+        if (cb) cb.apply(this, arguments)
+      }
+      return options ? orig.call(fs, target, options, callback)
+        : orig.call(fs, target, callback)
+    }
+  }
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+  function statFixSync (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target, options) {
+      var stats = options ? orig.call(fs, target, options)
+        : orig.call(fs, target)
+      if (stats.uid < 0) stats.uid += 0x100000000
+      if (stats.gid < 0) stats.gid += 0x100000000
+      return stats;
+    }
+  }
 
-var MAINVERSION = R++
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')'
+  // 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
 
-var MAINVERSIONLOOSE = R++
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
+    if (er.code === "ENOSYS")
+      return true
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
 
-var PRERELEASEIDENTIFIER = R++
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')'
+    return false
+  }
+}
 
-var PRERELEASEIDENTIFIERLOOSE = R++
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+/***/ }),
 
-var PRERELEASE = R++
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
+/***/ "../../node_modules/has-flag/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var PRERELEASELOOSE = R++
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
+"use strict";
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
 
-var BUILDIDENTIFIER = R++
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
+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);
+};
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
 
-var BUILD = R++
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
+/***/ }),
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+/***/ "../../node_modules/has-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// Note that the only major, minor, patch, and pre-release sections of
-// the version string are capturing groups.  The build metadata is not a
-// capturing group, because it should not ever be used in version
-// comparison.
+"use strict";
+/*!
+ * has-glob <https://github.com/jonschlinkert/has-glob>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-var FULL = R++
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?'
 
-src[FULL] = '^' + FULLPLAIN + '$'
 
-// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-// common in the npm registry.
-var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
-                 src[PRERELEASELOOSE] + '?' +
-                 src[BUILD] + '?'
+var isGlob = __webpack_require__("../../node_modules/has-glob/node_modules/is-glob/index.js");
 
-var LOOSE = R++
-src[LOOSE] = '^' + LOOSEPLAIN + '$'
+module.exports = function hasGlob(val) {
+  if (val == null) return false;
+  if (typeof val === 'string') {
+    return isGlob(val);
+  }
+  if (Array.isArray(val)) {
+    var len = val.length;
+    while (len--) {
+      if (isGlob(val[len])) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 
-var GTLT = R++
-src[GTLT] = '((?:<|>)?=?)'
 
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-var XRANGEIDENTIFIERLOOSE = R++
-src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
-var XRANGEIDENTIFIER = R++
-src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*'
+/***/ }),
 
-var XRANGEPLAIN = R++
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?'
+/***/ "../../node_modules/has-glob/node_modules/is-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var XRANGEPLAINLOOSE = R++
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?'
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-var XRANGE = R++
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
-var XRANGELOOSE = R++
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
+var isExtglob = __webpack_require__("../../node_modules/is-extglob/index.js");
 
-// Coercion.
-// Extract anything that could conceivably be a part of a valid semver
-var COERCE = R++
-src[COERCE] = '(?:^|[^\\d])' +
-              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:$|[^\\d])'
+module.exports = function isGlob(str) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++
-src[LONETILDE] = '(?:~>?)'
+  if (isExtglob(str)) return true;
 
-var TILDETRIM = R++
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
+  var regex = /(\\).|([*?]|\[.*\]|\{.*\}|\(.*\|.*\)|^!)/;
+  var match;
 
-var TILDE = R++
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
-var TILDELOOSE = R++
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
+  while ((match = regex.exec(str))) {
+    if (match[2]) return true;
+    str = str.slice(match.index + match[0].length);
+  }
+  return false;
+};
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++
-src[LONECARET] = '(?:\\^)'
 
-var CARETTRIM = R++
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
+/***/ }),
 
-var CARET = R++
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
-var CARETLOOSE = R++
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
+/***/ "../../node_modules/has-value/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * has-value <https://github.com/jonschlinkert/has-value>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-var COMPARATORLOOSE = R++
-src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$'
-var COMPARATOR = R++
-src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$'
 
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-var COMPARATORTRIM = R++
-src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
-                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')'
 
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
+var hasValues = __webpack_require__("../../node_modules/has-values/index.js");
+var get = __webpack_require__("../../node_modules/get-value/index.js");
 
-// Something like `1.2.3 - 1.2.4`
-// Note that these all use the loose form, because they'll be
-// checked against either the strict or loose comparator form
-// later.
-var HYPHENRANGE = R++
-src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[XRANGEPLAIN] + ')' +
-                   '\\s*$'
+module.exports = function(val, prop) {
+  return hasValues(isObject(val) && prop ? get(val, prop) : val);
+};
 
-var HYPHENRANGELOOSE = R++
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
 
-// Star ranges basically just allow anything at all.
-var STAR = R++
-src[STAR] = '(<|>)?=?\\s*\\*'
+/***/ }),
 
-// Compile to actual regexp objects.
-// All are flag-free, unless they were created above with a flag.
-for (var i = 0; i < R; i++) {
-  debug(i, src[i])
-  if (!re[i]) {
-    re[i] = new RegExp(src[i])
-  }
-}
+/***/ "../../node_modules/has-values/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+"use strict";
+/*!
+ * has-values <https://github.com/jonschlinkert/has-values>
+ *
+ * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-  if (version instanceof SemVer) {
-    return version
-  }
 
-  if (typeof version !== 'string') {
-    return null
-  }
 
-  if (version.length > MAX_LENGTH) {
-    return null
-  }
+var typeOf = __webpack_require__("../../node_modules/has-values/node_modules/kind-of/index.js");
+var isNumber = __webpack_require__("../../node_modules/is-number/index.js");
 
-  var r = options.loose ? re[LOOSE] : re[FULL]
-  if (!r.test(version)) {
-    return null
+module.exports = function hasValue(val) {
+  // is-number checks for NaN and other edge cases
+  if (isNumber(val)) {
+    return true;
   }
 
-  try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
+  switch (typeOf(val)) {
+    case 'null':
+    case 'boolean':
+    case 'function':
+      return true;
+    case 'string':
+    case 'arguments':
+      return val.length !== 0;
+    case 'error':
+      return val.message !== '';
+    case 'array':
+      var len = val.length;
+      if (len === 0) {
+        return false;
+      }
+      for (var i = 0; i < len; i++) {
+        if (hasValue(val[i])) {
+          return true;
+        }
+      }
+      return false;
+    case 'file':
+    case 'map':
+    case 'set':
+      return val.size !== 0;
+    case 'object':
+      var keys = Object.keys(val);
+      if (keys.length === 0) {
+        return false;
+      }
+      for (var i = 0; i < keys.length; i++) {
+        var key = keys[i];
+        if (hasValue(val[key])) {
+          return true;
+        }
+      }
+      return false;
+    default: {
+      return false;
+    }
   }
-}
+};
 
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
-}
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
-}
+/***/ }),
 
-exports.SemVer = SemVer
+/***/ "../../node_modules/has-values/node_modules/kind-of/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function SemVer (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
+
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
+
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
   }
-  if (version instanceof SemVer) {
-    if (version.loose === options.loose) {
-      return version
-    } else {
-      version = version.version
-    }
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version)
+  if (val === null) {
+    return 'null';
   }
-
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
   }
-
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
   }
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
-
-  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
   }
 
-  this.raw = version
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
+  // other objects
+  var type = toString.call(val);
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-    throw new TypeError('Invalid major version')
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
+  if (type === '[object Promise]') {
+    return 'promise';
   }
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-    throw new TypeError('Invalid minor version')
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
   }
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
   }
 
-  // numberify any prerelease numeric ids
-  if (!m[4]) {
-    this.prerelease = []
-  } else {
-    this.prerelease = m[4].split('.').map(function (id) {
-      if (/^[0-9]+$/.test(id)) {
-        var num = +id
-        if (num >= 0 && num < MAX_SAFE_INTEGER) {
-          return num
-        }
-      }
-      return id
-    })
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
   }
 
-  this.build = m[5] ? m[5].split('.') : []
-  this.format()
-}
+  // must be a plain object
+  return 'object';
+};
 
-SemVer.prototype.format = function () {
-  this.version = this.major + '.' + this.minor + '.' + this.patch
-  if (this.prerelease.length) {
-    this.version += '-' + this.prerelease.join('.')
-  }
-  return this.version
-}
 
-SemVer.prototype.toString = function () {
-  return this.version
-}
+/***/ }),
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+/***/ "../../node_modules/has/src/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return this.compareMain(other) || this.comparePre(other)
-}
+"use strict";
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+var bind = __webpack_require__("../../node_modules/function-bind/index.js");
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
 
-  // NOT having a prerelease is > having one
-  if (this.prerelease.length && !other.prerelease.length) {
-    return -1
-  } else if (!this.prerelease.length && other.prerelease.length) {
-    return 1
-  } else if (!this.prerelease.length && !other.prerelease.length) {
-    return 0
-  }
 
-  var i = 0
-  do {
-    var a = this.prerelease[i]
-    var b = other.prerelease[i]
-    debug('prerelease compare', i, a, b)
-    if (a === undefined && b === undefined) {
-      return 0
-    } else if (b === undefined) {
-      return 1
-    } else if (a === undefined) {
-      return -1
-    } else if (a === b) {
-      continue
-    } else {
-      return compareIdentifiers(a, b)
+/***/ }),
+
+/***/ "../../node_modules/hosted-git-info/git-host-info.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var gitHosts = module.exports = {
+  github: {
+    // First two are insecure and generally shouldn't be used any more, but
+    // they are still supported.
+    'protocols': [ 'git', 'http', 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'github.com',
+    'treepath': 'tree',
+    'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}',
+    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
+    'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}',
+    'tarballtemplate': 'https://codeload.{domain}/{user}/{project}/tar.gz/{committish}'
+  },
+  bitbucket: {
+    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'bitbucket.org',
+    'treepath': 'src',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz'
+  },
+  gitlab: {
+    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'gitlab.com',
+    'treepath': 'tree',
+    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
+    'httpstemplate': 'git+https://{auth@}{domain}/{user}/{projectPath}.git{#committish}',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}',
+    'pathmatch': /^[/]([^/]+)[/]((?!.*(\/-\/|\/repository\/archive\.tar\.gz\?=.*|\/repository\/[^/]+\/archive.tar.gz$)).*?)(?:[.]git|[/])?$/
+  },
+  gist: {
+    'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'gist.github.com',
+    'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]{32,})(?:[.]git)?$/,
+    'filetemplate': 'https://gist.githubusercontent.com/{user}/{project}/raw{/committish}/{path}',
+    'bugstemplate': 'https://{domain}/{project}',
+    'gittemplate': 'git://{domain}/{project}.git{#committish}',
+    'sshtemplate': 'git@{domain}:/{project}.git{#committish}',
+    'sshurltemplate': 'git+ssh://git@{domain}/{project}.git{#committish}',
+    'browsetemplate': 'https://{domain}/{project}{/committish}',
+    'browsefiletemplate': 'https://{domain}/{project}{/committish}{#path}',
+    'docstemplate': 'https://{domain}/{project}{/committish}',
+    'httpstemplate': 'git+https://{domain}/{project}.git{#committish}',
+    'shortcuttemplate': '{type}:{project}{#committish}',
+    'pathtemplate': '{project}{#committish}',
+    'tarballtemplate': 'https://codeload.github.com/gist/{project}/tar.gz/{committish}',
+    'hashformat': function (fragment) {
+      return 'file-' + formatHashFragment(fragment)
     }
-  } while (++i)
+  }
 }
 
-// preminor will bump the version up to the next minor release, and immediately
-// down to pre-release. premajor and prepatch work the same way.
-SemVer.prototype.inc = function (release, identifier) {
-  switch (release) {
-    case 'premajor':
-      this.prerelease.length = 0
-      this.patch = 0
-      this.minor = 0
-      this.major++
-      this.inc('pre', identifier)
-      break
-    case 'preminor':
-      this.prerelease.length = 0
-      this.patch = 0
-      this.minor++
-      this.inc('pre', identifier)
-      break
-    case 'prepatch':
-      // If this is already a prerelease, it will bump to the next version
-      // drop any prereleases that might already exist, since they are not
-      // relevant at this point.
-      this.prerelease.length = 0
-      this.inc('patch', identifier)
-      this.inc('pre', identifier)
-      break
-    // If the input is a non-prerelease version, this acts the same as
-    // prepatch.
-    case 'prerelease':
-      if (this.prerelease.length === 0) {
-        this.inc('patch', identifier)
-      }
-      this.inc('pre', identifier)
-      break
+var gitHostDefaults = {
+  'sshtemplate': 'git@{domain}:{user}/{project}.git{#committish}',
+  'sshurltemplate': 'git+ssh://git@{domain}/{user}/{project}.git{#committish}',
+  'browsetemplate': 'https://{domain}/{user}/{project}{/tree/committish}',
+  'browsefiletemplate': 'https://{domain}/{user}/{project}/{treepath}/{committish}/{path}{#fragment}',
+  'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#readme',
+  'httpstemplate': 'git+https://{auth@}{domain}/{user}/{project}.git{#committish}',
+  'filetemplate': 'https://{domain}/{user}/{project}/raw/{committish}/{path}',
+  'shortcuttemplate': '{type}:{user}/{project}{#committish}',
+  'pathtemplate': '{user}/{project}{#committish}',
+  'pathmatch': /^[/]([^/]+)[/]([^/]+?)(?:[.]git|[/])?$/,
+  'hashformat': formatHashFragment
+}
 
-    case 'major':
-      // If this is a pre-major version, bump up to the same major version.
-      // Otherwise increment major.
-      // 1.0.0-5 bumps to 1.0.0
-      // 1.1.0 bumps to 2.0.0
-      if (this.minor !== 0 ||
-          this.patch !== 0 ||
-          this.prerelease.length === 0) {
-        this.major++
-      }
-      this.minor = 0
-      this.patch = 0
-      this.prerelease = []
-      break
-    case 'minor':
-      // If this is a pre-minor version, bump up to the same minor version.
-      // Otherwise increment minor.
-      // 1.2.0-5 bumps to 1.2.0
-      // 1.2.1 bumps to 1.3.0
-      if (this.patch !== 0 || this.prerelease.length === 0) {
-        this.minor++
-      }
-      this.patch = 0
-      this.prerelease = []
-      break
-    case 'patch':
-      // If this is not a pre-release version, it will increment the patch.
-      // If it is a pre-release it will bump up to the same patch version.
-      // 1.2.0-5 patches to 1.2.0
-      // 1.2.0 patches to 1.2.1
-      if (this.prerelease.length === 0) {
-        this.patch++
-      }
-      this.prerelease = []
-      break
-    // This probably shouldn't be used publicly.
-    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
-    case 'pre':
-      if (this.prerelease.length === 0) {
-        this.prerelease = [0]
-      } else {
-        var i = this.prerelease.length
-        while (--i >= 0) {
-          if (typeof this.prerelease[i] === 'number') {
-            this.prerelease[i]++
-            i = -2
-          }
-        }
-        if (i === -1) {
-          // didn't increment anything
-          this.prerelease.push(0)
-        }
-      }
-      if (identifier) {
-        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-        if (this.prerelease[0] === identifier) {
-          if (isNaN(this.prerelease[1])) {
-            this.prerelease = [identifier, 0]
-          }
-        } else {
-          this.prerelease = [identifier, 0]
-        }
-      }
-      break
+Object.keys(gitHosts).forEach(function (name) {
+  Object.keys(gitHostDefaults).forEach(function (key) {
+    if (gitHosts[name][key]) return
+    gitHosts[name][key] = gitHostDefaults[key]
+  })
+  gitHosts[name].protocols_re = RegExp('^(' +
+    gitHosts[name].protocols.map(function (protocol) {
+      return protocol.replace(/([\\+*{}()[\]$^|])/g, '\\$1')
+    }).join('|') + '):$')
+})
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
-  }
-  this.format()
-  this.raw = this.version
-  return this
+function formatHashFragment (fragment) {
+  return fragment.toLowerCase().replace(/^\W+|\/|\W+$/g, '').replace(/\W+/g, '-')
 }
 
-exports.inc = inc
-function inc (version, release, loose, identifier) {
-  if (typeof (loose) === 'string') {
-    identifier = loose
-    loose = undefined
-  }
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version
-  } catch (er) {
-    return null
-  }
-}
+/***/ }),
 
-exports.diff = diff
-function diff (version1, version2) {
-  if (eq(version1, version2)) {
-    return null
-  } else {
-    var v1 = parse(version1)
-    var v2 = parse(version2)
-    var prefix = ''
-    if (v1.prerelease.length || v2.prerelease.length) {
-      prefix = 'pre'
-      var defaultResult = 'prerelease'
-    }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return prefix + key
-        }
-      }
-    }
-    return defaultResult // may be undefined
-  }
-}
+/***/ "../../node_modules/hosted-git-info/git-host.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.compareIdentifiers = compareIdentifiers
+"use strict";
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+var gitHosts = __webpack_require__("../../node_modules/hosted-git-info/git-host-info.js")
+/* eslint-disable node/no-deprecated-api */
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
+// copy-pasta util._extend from node's source, to avoid pulling
+// the whole util module into peoples' webpack bundles.
+/* istanbul ignore next */
+var extend = Object.assign || function _extend (target, source) {
+  // Don't do anything if source isn't an object
+  if (source === null || typeof source !== 'object') return target
+
+  var keys = Object.keys(source)
+  var i = keys.length
+  while (i--) {
+    target[keys[i]] = source[keys[i]]
   }
+  return target
+}
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
+module.exports = GitHost
+function GitHost (type, user, auth, project, committish, defaultRepresentation, opts) {
+  var gitHostInfo = this
+  gitHostInfo.type = type
+  Object.keys(gitHosts[type]).forEach(function (key) {
+    gitHostInfo[key] = gitHosts[type][key]
+  })
+  gitHostInfo.user = user
+  gitHostInfo.auth = auth
+  gitHostInfo.project = project
+  gitHostInfo.committish = committish
+  gitHostInfo.default = defaultRepresentation
+  gitHostInfo.opts = opts || {}
 }
 
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
+GitHost.prototype.hash = function () {
+  return this.committish ? '#' + this.committish : ''
 }
 
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
+GitHost.prototype._fill = function (template, opts) {
+  if (!template) return
+  var vars = extend({}, opts)
+  vars.path = vars.path ? vars.path.replace(/^[/]+/g, '') : ''
+  opts = extend(extend({}, this.opts), opts)
+  var self = this
+  Object.keys(this).forEach(function (key) {
+    if (self[key] != null && vars[key] == null) vars[key] = self[key]
+  })
+  var rawAuth = vars.auth
+  var rawcommittish = vars.committish
+  var rawFragment = vars.fragment
+  var rawPath = vars.path
+  var rawProject = vars.project
+  Object.keys(vars).forEach(function (key) {
+    var value = vars[key]
+    if ((key === 'path' || key === 'project') && typeof value === 'string') {
+      vars[key] = value.split('/').map(function (pathComponent) {
+        return encodeURIComponent(pathComponent)
+      }).join('/')
+    } else {
+      vars[key] = encodeURIComponent(value)
+    }
+  })
+  vars['auth@'] = rawAuth ? rawAuth + '@' : ''
+  vars['#fragment'] = rawFragment ? '#' + this.hashformat(rawFragment) : ''
+  vars.fragment = vars.fragment ? vars.fragment : ''
+  vars['#path'] = rawPath ? '#' + this.hashformat(rawPath) : ''
+  vars['/path'] = vars.path ? '/' + vars.path : ''
+  vars.projectPath = rawProject.split('/').map(encodeURIComponent).join('/')
+  if (opts.noCommittish) {
+    vars['#committish'] = ''
+    vars['/tree/committish'] = ''
+    vars['/committish'] = ''
+    vars.committish = ''
+  } else {
+    vars['#committish'] = rawcommittish ? '#' + rawcommittish : ''
+    vars['/tree/committish'] = vars.committish
+      ? '/' + vars.treepath + '/' + vars.committish
+      : ''
+    vars['/committish'] = vars.committish ? '/' + vars.committish : ''
+    vars.committish = vars.committish || 'master'
+  }
+  var res = template
+  Object.keys(vars).forEach(function (key) {
+    res = res.replace(new RegExp('[{]' + key + '[}]', 'g'), vars[key])
+  })
+  if (opts.noGitPlus) {
+    return res.replace(/^git[+]/, '')
+  } else {
+    return res
+  }
 }
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
+GitHost.prototype.ssh = function (opts) {
+  return this._fill(this.sshtemplate, opts)
 }
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
+GitHost.prototype.sshurl = function (opts) {
+  return this._fill(this.sshurltemplate, opts)
 }
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
+GitHost.prototype.browse = function (P, F, opts) {
+  if (typeof P === 'string') {
+    if (typeof F !== 'string') {
+      opts = F
+      F = null
+    }
+    return this._fill(this.browsefiletemplate, extend({
+      fragment: F,
+      path: P
+    }, opts))
+  } else {
+    return this._fill(this.browsetemplate, P)
+  }
 }
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
+GitHost.prototype.docs = function (opts) {
+  return this._fill(this.docstemplate, opts)
 }
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
+GitHost.prototype.bugs = function (opts) {
+  return this._fill(this.bugstemplate, opts)
 }
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compare(a, b, loose)
-  })
+GitHost.prototype.https = function (opts) {
+  return this._fill(this.httpstemplate, opts)
 }
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.rcompare(a, b, loose)
-  })
+GitHost.prototype.git = function (opts) {
+  return this._fill(this.gittemplate, opts)
 }
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
+GitHost.prototype.shortcut = function (opts) {
+  return this._fill(this.shortcuttemplate, opts)
 }
 
-exports.lt = lt
-function lt (a, b, loose) {
-  return compare(a, b, loose) < 0
+GitHost.prototype.path = function (opts) {
+  return this._fill(this.pathtemplate, opts)
 }
 
-exports.eq = eq
-function eq (a, b, loose) {
-  return compare(a, b, loose) === 0
+GitHost.prototype.tarball = function (opts_) {
+  var opts = extend({}, opts_, { noCommittish: false })
+  return this._fill(this.tarballtemplate, opts)
 }
 
-exports.neq = neq
-function neq (a, b, loose) {
-  return compare(a, b, loose) !== 0
+GitHost.prototype.file = function (P, opts) {
+  return this._fill(this.filetemplate, extend({ path: P }, opts))
 }
 
-exports.gte = gte
-function gte (a, b, loose) {
-  return compare(a, b, loose) >= 0
+GitHost.prototype.getDefaultRepresentation = function () {
+  return this.default
 }
 
-exports.lte = lte
-function lte (a, b, loose) {
-  return compare(a, b, loose) <= 0
+GitHost.prototype.toString = function (opts) {
+  if (this.default && typeof this[this.default] === 'function') return this[this.default](opts)
+  return this.sshurl(opts)
 }
 
-exports.cmp = cmp
-function cmp (a, op, b, loose) {
-  switch (op) {
-    case '===':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a === b
 
-    case '!==':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a !== b
+/***/ }),
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+/***/ "../../node_modules/hosted-git-info/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    case '!=':
-      return neq(a, b, loose)
+"use strict";
 
-    case '>':
-      return gt(a, b, loose)
+var url = __webpack_require__("url")
+var gitHosts = __webpack_require__("../../node_modules/hosted-git-info/git-host-info.js")
+var GitHost = module.exports = __webpack_require__("../../node_modules/hosted-git-info/git-host.js")
 
-    case '>=':
-      return gte(a, b, loose)
+var protocolToRepresentationMap = {
+  'git+ssh:': 'sshurl',
+  'git+https:': 'https',
+  'ssh:': 'sshurl',
+  'git:': 'git'
+}
 
-    case '<':
-      return lt(a, b, loose)
+function protocolToRepresentation (protocol) {
+  return protocolToRepresentationMap[protocol] || protocol.slice(0, -1)
+}
 
-    case '<=':
-      return lte(a, b, loose)
+var authProtocols = {
+  'git:': true,
+  'https:': true,
+  'git+https:': true,
+  'http:': true,
+  'git+http:': true
+}
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
+var cache = {}
+
+module.exports.fromUrl = function (giturl, opts) {
+  if (typeof giturl !== 'string') return
+  var key = giturl + JSON.stringify(opts || {})
+
+  if (!(key in cache)) {
+    cache[key] = fromUrl(giturl, opts)
   }
+
+  return cache[key]
 }
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+function fromUrl (giturl, opts) {
+  if (giturl == null || giturl === '') return
+  var url = fixupUnqualifiedGist(
+    isGitHubShorthand(giturl) ? 'github:' + giturl : giturl
+  )
+  var parsed = parseGitUrl(url)
+  var shortcutMatch = url.match(/^([^:]+):(?:[^@]+@)?(?:([^/]*)\/)?([^#]+)/)
+  var matches = Object.keys(gitHosts).map(function (gitHostName) {
+    try {
+      var gitHostInfo = gitHosts[gitHostName]
+      var auth = null
+      if (parsed.auth && authProtocols[parsed.protocol]) {
+        auth = parsed.auth
+      }
+      var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null
+      var user = null
+      var project = null
+      var defaultRepresentation = null
+      if (shortcutMatch && shortcutMatch[1] === gitHostName) {
+        user = shortcutMatch[2] && decodeURIComponent(shortcutMatch[2])
+        project = decodeURIComponent(shortcutMatch[3].replace(/\.git$/, ''))
+        defaultRepresentation = 'shortcut'
+      } else {
+        if (parsed.host && parsed.host !== gitHostInfo.domain && parsed.host.replace(/^www[.]/, '') !== gitHostInfo.domain) return
+        if (!gitHostInfo.protocols_re.test(parsed.protocol)) return
+        if (!parsed.path) return
+        var pathmatch = gitHostInfo.pathmatch
+        var matched = parsed.path.match(pathmatch)
+        if (!matched) return
+        /* istanbul ignore else */
+        if (matched[1] !== null && matched[1] !== undefined) {
+          user = decodeURIComponent(matched[1].replace(/^:/, ''))
+        }
+        project = decodeURIComponent(matched[2])
+        defaultRepresentation = protocolToRepresentation(parsed.protocol)
+      }
+      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation, opts)
+    } catch (ex) {
+      /* istanbul ignore else */
+      if (ex instanceof URIError) {
+      } else throw ex
     }
+  }).filter(function (gitHostInfo) { return gitHostInfo })
+  if (matches.length !== 1) return
+  return matches[0]
+}
+
+function isGitHubShorthand (arg) {
+  // Note: This does not fully test the git ref format.
+  // See https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
+  //
+  // The only way to do this properly would be to shell out to
+  // git-check-ref-format, and as this is a fast sync function,
+  // we don't want to do that.  Just let git fail if it turns
+  // out that the commit-ish is invalid.
+  // GH usernames cannot start with . or -
+  return /^[^:@%/\s.-][^:@%/\s]*[/][^:@\s/%]+(?:#.*)?$/.test(arg)
+}
+
+function fixupUnqualifiedGist (giturl) {
+  // necessary for round-tripping gists
+  var parsed = url.parse(giturl)
+  if (parsed.protocol === 'gist:' && parsed.host && !parsed.path) {
+    return parsed.protocol + '/' + parsed.host
+  } else {
+    return giturl
   }
+}
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
+function parseGitUrl (giturl) {
+  var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/)
+  if (!matched) {
+    var legacy = url.parse(giturl)
+    // If we don't have url.URL, then sorry, this is just not fixable.
+    // This affects Node <= 6.12.
+    if (legacy.auth && typeof url.URL === 'function') {
+      // git urls can be in the form of scp-style/ssh-connect strings, like
+      // git+ssh://user@host.com:some/path, which the legacy url parser
+      // supports, but WhatWG url.URL class does not.  However, the legacy
+      // parser de-urlencodes the username and password, so something like
+      // https://user%3An%40me:p%40ss%3Aword@x.com/ becomes
+      // https://user:n@me:p@ss:word@x.com/ which is all kinds of wrong.
+      // Pull off just the auth and host, so we dont' get the confusing
+      // scp-style URL, then pass that to the WhatWG parser to get the
+      // auth properly escaped.
+      var authmatch = giturl.match(/[^@]+@[^:/]+/)
+      /* istanbul ignore else - this should be impossible */
+      if (authmatch) {
+        var whatwg = new url.URL(authmatch[0])
+        legacy.auth = whatwg.username || ''
+        if (whatwg.password) legacy.auth += ':' + whatwg.password
+      }
     }
+    return legacy
   }
-
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
+  return {
+    protocol: 'git+ssh:',
+    slashes: true,
+    auth: matched[1],
+    host: matched[2],
+    port: null,
+    hostname: matched[2],
+    hash: matched[4],
+    search: null,
+    query: null,
+    pathname: '/' + matched[3],
+    path: '/' + matched[3],
+    href: 'git+ssh://' + matched[1] + '@' + matched[2] +
+          '/' + matched[3] + (matched[4] || '')
   }
+}
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
-  }
+/***/ }),
 
-  debug('comp', this)
-}
+/***/ "../../node_modules/human-signals/build/src/core.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var ANY = {}
-Comparator.prototype.parse = function (comp) {
-  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var m = comp.match(r)
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0;
 
-  if (!m) {
-    throw new TypeError('Invalid comparator: ' + comp)
-  }
+const SIGNALS=[
+{
+name:"SIGHUP",
+number:1,
+action:"terminate",
+description:"Terminal closed",
+standard:"posix"},
 
-  this.operator = m[1]
-  if (this.operator === '=') {
-    this.operator = ''
-  }
+{
+name:"SIGINT",
+number:2,
+action:"terminate",
+description:"User interruption with CTRL-C",
+standard:"ansi"},
 
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2]) {
-    this.semver = ANY
-  } else {
-    this.semver = new SemVer(m[2], this.options.loose)
-  }
-}
+{
+name:"SIGQUIT",
+number:3,
+action:"core",
+description:"User interruption with CTRL-\\",
+standard:"posix"},
 
-Comparator.prototype.toString = function () {
-  return this.value
-}
+{
+name:"SIGILL",
+number:4,
+action:"core",
+description:"Invalid machine instruction",
+standard:"ansi"},
 
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
+{
+name:"SIGTRAP",
+number:5,
+action:"core",
+description:"Debugger breakpoint",
+standard:"posix"},
 
-  if (this.semver === ANY) {
-    return true
-  }
+{
+name:"SIGABRT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"ansi"},
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+{
+name:"SIGIOT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"bsd"},
+
+{
+name:"SIGBUS",
+number:7,
+action:"core",
+description:
+"Bus error due to misaligned, non-existing address or paging error",
+standard:"bsd"},
+
+{
+name:"SIGEMT",
+number:7,
+action:"terminate",
+description:"Command should be emulated but is not implemented",
+standard:"other"},
+
+{
+name:"SIGFPE",
+number:8,
+action:"core",
+description:"Floating point arithmetic error",
+standard:"ansi"},
 
-  return cmp(version, this.operator, this.semver, this.options)
-}
+{
+name:"SIGKILL",
+number:9,
+action:"terminate",
+description:"Forced termination",
+standard:"posix",
+forced:true},
 
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
-  }
+{
+name:"SIGUSR1",
+number:10,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+{
+name:"SIGSEGV",
+number:11,
+action:"core",
+description:"Segmentation fault",
+standard:"ansi"},
 
-  var rangeTmp
+{
+name:"SIGUSR2",
+number:12,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
 
-  if (this.operator === '') {
-    rangeTmp = new Range(comp.value, options)
-    return satisfies(this.value, rangeTmp, options)
-  } else if (comp.operator === '') {
-    rangeTmp = new Range(this.value, options)
-    return satisfies(comp.semver, rangeTmp, options)
-  }
+{
+name:"SIGPIPE",
+number:13,
+action:"terminate",
+description:"Broken pipe or socket",
+standard:"posix"},
 
-  var sameDirectionIncreasing =
-    (this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '>=' || comp.operator === '>')
-  var sameDirectionDecreasing =
-    (this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '<=' || comp.operator === '<')
-  var sameSemVer = this.semver.version === comp.semver.version
-  var differentDirectionsInclusive =
-    (this.operator === '>=' || this.operator === '<=') &&
-    (comp.operator === '>=' || comp.operator === '<=')
-  var oppositeDirectionsLessThan =
-    cmp(this.semver, '<', comp.semver, options) &&
-    ((this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '<=' || comp.operator === '<'))
-  var oppositeDirectionsGreaterThan =
-    cmp(this.semver, '>', comp.semver, options) &&
-    ((this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '>=' || comp.operator === '>'))
+{
+name:"SIGALRM",
+number:14,
+action:"terminate",
+description:"Timeout or timer",
+standard:"posix"},
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
-}
+{
+name:"SIGTERM",
+number:15,
+action:"terminate",
+description:"Termination",
+standard:"ansi"},
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+{
+name:"SIGSTKFLT",
+number:16,
+action:"terminate",
+description:"Stack is empty or overflowed",
+standard:"other"},
 
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
-    }
-  }
+{
+name:"SIGCHLD",
+number:17,
+action:"ignore",
+description:"Child process terminated, paused or unpaused",
+standard:"posix"},
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, options)
-  }
+{
+name:"SIGCLD",
+number:17,
+action:"ignore",
+description:"Child process terminated, paused or unpaused",
+standard:"other"},
 
-  if (!(this instanceof Range)) {
-    return new Range(range, options)
-  }
+{
+name:"SIGCONT",
+number:18,
+action:"unpause",
+description:"Unpaused",
+standard:"posix",
+forced:true},
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
+{
+name:"SIGSTOP",
+number:19,
+action:"pause",
+description:"Paused",
+standard:"posix",
+forced:true},
 
-  // First, split based on boolean or ||
-  this.raw = range
-  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
-    return this.parseRange(range.trim())
-  }, this).filter(function (c) {
-    // throw out any that are not relevant for whatever reason
-    return c.length
-  })
+{
+name:"SIGTSTP",
+number:20,
+action:"pause",
+description:"Paused using CTRL-Z or \"suspend\"",
+standard:"posix"},
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range)
-  }
+{
+name:"SIGTTIN",
+number:21,
+action:"pause",
+description:"Background process cannot read terminal input",
+standard:"posix"},
 
-  this.format()
-}
+{
+name:"SIGBREAK",
+number:21,
+action:"terminate",
+description:"User interruption with CTRL-BREAK",
+standard:"other"},
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
-}
+{
+name:"SIGTTOU",
+number:22,
+action:"pause",
+description:"Background process cannot write to terminal output",
+standard:"posix"},
 
-Range.prototype.toString = function () {
-  return this.range
-}
+{
+name:"SIGURG",
+number:23,
+action:"ignore",
+description:"Socket received out-of-band data",
+standard:"bsd"},
 
-Range.prototype.parseRange = function (range) {
-  var loose = this.options.loose
-  range = range.trim()
-  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE]
-  range = range.replace(hr, hyphenReplace)
-  debug('hyphen replace', range)
-  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace)
-  debug('comparator trim', range, re[COMPARATORTRIM])
+{
+name:"SIGXCPU",
+number:24,
+action:"core",
+description:"Process timed out",
+standard:"bsd"},
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace)
+{
+name:"SIGXFSZ",
+number:25,
+action:"core",
+description:"File too big",
+standard:"bsd"},
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace)
+{
+name:"SIGVTALRM",
+number:26,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+{
+name:"SIGPROF",
+number:27,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+{
+name:"SIGWINCH",
+number:28,
+action:"ignore",
+description:"Terminal window size changed",
+standard:"bsd"},
 
-  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var set = range.split(' ').map(function (comp) {
-    return parseComparator(comp, this.options)
-  }, this).join(' ').split(/\s+/)
-  if (this.options.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function (comp) {
-      return !!comp.match(compRe)
-    })
-  }
-  set = set.map(function (comp) {
-    return new Comparator(comp, this.options)
-  }, this)
+{
+name:"SIGIO",
+number:29,
+action:"terminate",
+description:"I/O is available",
+standard:"other"},
 
-  return set
-}
+{
+name:"SIGPOLL",
+number:29,
+action:"terminate",
+description:"Watched event",
+standard:"other"},
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
-  }
+{
+name:"SIGINFO",
+number:29,
+action:"ignore",
+description:"Request for process information",
+standard:"other"},
 
-  return this.set.some(function (thisComparators) {
-    return thisComparators.every(function (thisComparator) {
-      return range.set.some(function (rangeComparators) {
-        return rangeComparators.every(function (rangeComparator) {
-          return thisComparator.intersects(rangeComparator, options)
-        })
-      })
-    })
-  })
-}
+{
+name:"SIGPWR",
+number:30,
+action:"terminate",
+description:"Device running out of power",
+standard:"systemv"},
 
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators
-function toComparators (range, options) {
-  return new Range(range, options).set.map(function (comp) {
-    return comp.map(function (c) {
-      return c.value
-    }).join(' ').trim().split(' ')
-  })
-}
+{
+name:"SIGSYS",
+number:31,
+action:"core",
+description:"Invalid system call",
+standard:"other"},
 
-// comprised of xranges, tildes, stars, and gtlt's at this point.
-// already replaced the hyphen ranges
-// turn into a set of JUST comparators.
-function parseComparator (comp, options) {
-  debug('comp', comp, options)
-  comp = replaceCarets(comp, options)
-  debug('caret', comp)
-  comp = replaceTildes(comp, options)
-  debug('tildes', comp)
-  comp = replaceXRanges(comp, options)
-  debug('xrange', comp)
-  comp = replaceStars(comp, options)
-  debug('stars', comp)
-  return comp
-}
+{
+name:"SIGUNUSED",
+number:31,
+action:"terminate",
+description:"Invalid system call",
+standard:"other"}];exports.SIGNALS=SIGNALS;
+//# sourceMappingURL=core.js.map
 
-function isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+/***/ }),
 
-// ~, ~> --> * (any, kinda silly)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-function replaceTildes (comp, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceTilde(comp, options)
-  }).join(' ')
-}
+/***/ "../../node_modules/human-signals/build/src/main.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function replaceTilde (comp, options) {
-  var r = options.loose ? re[TILDELOOSE] : re[TILDE]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr)
-    var ret
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__("os");
 
-    if (isX(M)) {
-      ret = ''
-    } else if (isX(m)) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (isX(p)) {
-      // ~1.2 == >=1.2.0 <1.3.0
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-    } else if (pr) {
-      debug('replaceTilde pr', pr)
-      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-            ' <' + M + '.' + (+m + 1) + '.0'
-    } else {
-      // ~1.2.3 == >=1.2.3 <1.3.0
-      ret = '>=' + M + '.' + m + '.' + p +
-            ' <' + M + '.' + (+m + 1) + '.0'
-    }
+var _signals=__webpack_require__("../../node_modules/human-signals/build/src/signals.js");
+var _realtime=__webpack_require__("../../node_modules/human-signals/build/src/realtime.js");
 
-    debug('tilde return', ret)
-    return ret
-  })
-}
 
-// ^ --> * (any, kinda silly)
-// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2.0 --> >=1.2.0 <2.0.0
-function replaceCarets (comp, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceCaret(comp, options)
-  }).join(' ')
-}
 
-function replaceCaret (comp, options) {
-  debug('caret', comp, options)
-  var r = options.loose ? re[CARETLOOSE] : re[CARET]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr)
-    var ret
+const getSignalsByName=function(){
+const signals=(0,_signals.getSignals)();
+return signals.reduce(getSignalByName,{});
+};
 
-    if (isX(M)) {
-      ret = ''
-    } else if (isX(m)) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (isX(p)) {
-      if (M === '0') {
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-      } else {
-        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'
-      }
-    } else if (pr) {
-      debug('replaceCaret pr', pr)
-      if (M === '0') {
-        if (m === '0') {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-                ' <' + M + '.' + m + '.' + (+p + 1)
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-                ' <' + M + '.' + (+m + 1) + '.0'
-        }
-      } else {
-        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-              ' <' + (+M + 1) + '.0.0'
-      }
-    } else {
-      debug('no pr')
-      if (M === '0') {
-        if (m === '0') {
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + m + '.' + (+p + 1)
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + (+m + 1) + '.0'
-        }
-      } else {
-        ret = '>=' + M + '.' + m + '.' + p +
-              ' <' + (+M + 1) + '.0.0'
-      }
-    }
+const getSignalByName=function(
+signalByNameMemo,
+{name,number,description,supported,action,forced,standard})
+{
+return{
+...signalByNameMemo,
+[name]:{name,number,description,supported,action,forced,standard}};
 
-    debug('caret return', ret)
-    return ret
-  })
-}
+};
 
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
-}
+const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
 
-function replaceXRange (comp, options) {
-  comp = comp.trim()
-  var r = options.loose ? re[XRANGELOOSE] : re[XRANGE]
-  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
-    debug('xRange', comp, ret, gtlt, M, m, p, pr)
-    var xM = isX(M)
-    var xm = xM || isX(m)
-    var xp = xm || isX(p)
-    var anyX = xp
 
-    if (gtlt === '=' && anyX) {
-      gtlt = ''
-    }
 
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0'
-      } else {
-        // nothing is forbidden
-        ret = '*'
-      }
-    } else if (gtlt && anyX) {
-      // we know patch is an x, because we have any x at all.
-      // replace X with 0
-      if (xm) {
-        m = 0
-      }
-      p = 0
 
-      if (gtlt === '>') {
-        // >1 => >=2.0.0
-        // >1.2 => >=1.3.0
-        // >1.2.3 => >= 1.2.4
-        gtlt = '>='
-        if (xm) {
-          M = +M + 1
-          m = 0
-          p = 0
-        } else {
-          m = +m + 1
-          p = 0
-        }
-      } else if (gtlt === '<=') {
-        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-        gtlt = '<'
-        if (xm) {
-          M = +M + 1
-        } else {
-          m = +m + 1
-        }
-      }
+const getSignalsByNumber=function(){
+const signals=(0,_signals.getSignals)();
+const length=_realtime.SIGRTMAX+1;
+const signalsA=Array.from({length},(value,number)=>
+getSignalByNumber(number,signals));
 
-      ret = gtlt + M + '.' + m + '.' + p
-    } else if (xm) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-    }
+return Object.assign({},...signalsA);
+};
 
-    debug('xRange return', ret)
+const getSignalByNumber=function(number,signals){
+const signal=findSignalByNumber(number,signals);
 
-    return ret
-  })
+if(signal===undefined){
+return{};
 }
 
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars (comp, options) {
-  debug('replaceStars', comp, options)
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[STAR], '')
-}
+const{name,description,supported,action,forced,standard}=signal;
+return{
+[number]:{
+name,
+number,
+description,
+supported,
+action,
+forced,
+standard}};
 
-// This function is passed to string.replace(re[HYPHENRANGE])
-// M, m, patch, prerelease, build
-// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
-// 1.2 - 3.4 => >=1.2.0 <3.5.0
-function hyphenReplace ($0,
-  from, fM, fm, fp, fpr, fb,
-  to, tM, tm, tp, tpr, tb) {
-  if (isX(fM)) {
-    from = ''
-  } else if (isX(fm)) {
-    from = '>=' + fM + '.0.0'
-  } else if (isX(fp)) {
-    from = '>=' + fM + '.' + fm + '.0'
-  } else {
-    from = '>=' + from
-  }
 
-  if (isX(tM)) {
-    to = ''
-  } else if (isX(tm)) {
-    to = '<' + (+tM + 1) + '.0.0'
-  } else if (isX(tp)) {
-    to = '<' + tM + '.' + (+tm + 1) + '.0'
-  } else if (tpr) {
-    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr
-  } else {
-    to = '<=' + to
-  }
+};
 
-  return (from + ' ' + to).trim()
-}
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
-  }
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+const findSignalByNumber=function(number,signals){
+const signal=signals.find(({name})=>_os.constants.signals[name]===number);
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
-    }
-  }
-  return false
+if(signal!==undefined){
+return signal;
 }
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
-    }
-  }
+return signals.find(signalA=>signalA.number===number);
+};
 
-  if (version.prerelease.length && !options.includePrerelease) {
-    // Find the set of versions that are allowed to have prereleases
-    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-    // That should allow `1.2.3-pr.2` to pass.
-    // However, `1.2.4-alpha.notready` should NOT be allowed,
-    // even though it's within the range set by the comparators.
-    for (i = 0; i < set.length; i++) {
-      debug(set[i].semver)
-      if (set[i].semver === ANY) {
-        continue
-      }
+const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
+//# sourceMappingURL=main.js.map
 
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch) {
-          return true
-        }
-      }
-    }
+/***/ }),
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
-  }
+/***/ "../../node_modules/human-signals/build/src/realtime.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return true
-}
+"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;
 
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
-}
+const getRealtimeSignal=function(value,index){
+return{
+name:`SIGRT${index+1}`,
+number:SIGRTMIN+index,
+action:"terminate",
+description:"Application-specific signal (realtime)",
+standard:"posix"};
 
-exports.maxSatisfying = maxSatisfying
-function maxSatisfying (versions, range, options) {
-  var max = null
-  var maxSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!max || maxSV.compare(v) === -1) {
-        // compare(max, v, true)
-        max = v
-        maxSV = new SemVer(max, options)
-      }
-    }
-  })
-  return max
-}
+};
 
-exports.minSatisfying = minSatisfying
-function minSatisfying (versions, range, options) {
-  var min = null
-  var minSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!min || minSV.compare(v) === 1) {
-        // compare(min, v, true)
-        min = v
-        minSV = new SemVer(min, options)
-      }
-    }
-  })
-  return min
-}
+const SIGRTMIN=34;
+const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
+//# sourceMappingURL=realtime.js.map
 
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
+/***/ }),
 
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
-  }
+/***/ "../../node_modules/human-signals/build/src/signals.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  minver = new SemVer('0.0.0-0')
-  if (range.test(minver)) {
-    return minver
-  }
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__("os");
 
-  minver = null
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+var _core=__webpack_require__("../../node_modules/human-signals/build/src/core.js");
+var _realtime=__webpack_require__("../../node_modules/human-signals/build/src/realtime.js");
 
-    comparators.forEach(function (comparator) {
-      // Clone to avoid manipulating the comparator's semver object.
-      var compver = new SemVer(comparator.semver.version)
-      switch (comparator.operator) {
-        case '>':
-          if (compver.prerelease.length === 0) {
-            compver.patch++
-          } else {
-            compver.prerelease.push(0)
-          }
-          compver.raw = compver.format()
-          /* fallthrough */
-        case '':
-        case '>=':
-          if (!minver || gt(minver, compver)) {
-            minver = compver
-          }
-          break
-        case '<':
-        case '<=':
-          /* Ignore maximum versions */
-          break
-        /* istanbul ignore next */
-        default:
-          throw new Error('Unexpected operation: ' + comparator.operator)
-      }
-    })
-  }
 
-  if (minver && range.test(minver)) {
-    return minver
-  }
 
-  return null
-}
+const getSignals=function(){
+const realtimeSignals=(0,_realtime.getRealtimeSignals)();
+const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
+return signals;
+};exports.getSignals=getSignals;
 
-exports.validRange = validRange
-function validRange (range, options) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, options).range || '*'
-  } catch (er) {
-    return null
-  }
-}
 
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr
-function ltr (version, range, options) {
-  return outside(version, range, '<', options)
-}
 
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr
-function gtr (version, range, options) {
-  return outside(version, range, '>', options)
-}
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
 
-  var gtfn, ltefn, ltfn, comp, ecomp
-  switch (hilo) {
-    case '>':
-      gtfn = gt
-      ltefn = lte
-      ltfn = lt
-      comp = '>'
-      ecomp = '>='
-      break
-    case '<':
-      gtfn = lt
-      ltefn = gte
-      ltfn = gt
-      comp = '<'
-      ecomp = '<='
-      break
-    default:
-      throw new TypeError('Must provide a hilo val of "<" or ">"')
-  }
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
-  }
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+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
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+/***/ }),
 
-    var high = null
-    var low = null
+/***/ "../../node_modules/ignore/index.js":
+/***/ (function(module, exports) {
 
-    comparators.forEach(function (comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
-      }
-      high = high || comparator
-      low = low || comparator
-      if (gtfn(comparator.semver, high.semver, options)) {
-        high = comparator
-      } else if (ltfn(comparator.semver, low.semver, options)) {
-        low = comparator
-      }
-    })
+// A simple implementation of make-array
+function makeArray (subject) {
+  return Array.isArray(subject)
+    ? subject
+    : [subject]
+}
 
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false
-    }
+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 the lowest version comparator has an operator and our version
-    // is less than it then it isn't higher than the range
-    if ((!low.operator || low.operator === comp) &&
-        ltefn(version, low.semver)) {
-      return false
-    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-      return false
-    }
-  }
-  return true
-}
+const SLASH = '/'
+const KEY_IGNORE = typeof Symbol !== 'undefined'
+  ? Symbol.for('node-ignore')
+  /* istanbul ignore next */
+  : 'node-ignore'
 
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
-}
+const define = (object, key, value) =>
+  Object.defineProperty(object, key, {value})
 
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
+const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
+
+// 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)
 }
 
-exports.coerce = coerce
-function coerce (version) {
-  if (version instanceof SemVer) {
-    return version
-  }
+// > 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`
 
-  if (typeof version !== 'string') {
-    return null
-  }
+// '`foo/`' should not continue with the '`..`'
+const REPLACERS = [
 
-  var match = version.match(re[COERCE])
+  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
+  [
+    // (a\ ) -> (a )
+    // (a  ) -> (a)
+    // (a \ ) -> (a  )
+    /\\?\s+$/,
+    match => match.indexOf('\\') === 0
+      ? SPACE
+      : EMPTY
+  ],
 
-  if (match == null) {
-    return null
-  }
+  // replace (\ ) with ' '
+  [
+    /\\\s/g,
+    () => SPACE
+  ],
 
-  return parse(match[1] +
-    '.' + (match[2] || '0') +
-    '.' + (match[3] || '0'))
-}
+  // Escape metacharacters
+  // which is written down by users but means special for regular expressions.
 
+  // > 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}`
+  ],
 
-/***/ }),
-/* 407 */
-/***/ (function(module, exports, __webpack_require__) {
+  [
+    // > a question mark (?) matches a single character
+    /(?!\\)\?/g,
+    () => '[^/]'
+  ],
 
-"use strict";
+  // leading slash
+  [
 
+    // > 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
+    /^\//,
+    () => '^'
+  ],
 
-// detect either spaces or tabs but not both to properly handle tabs
-// for indentation and spaces for alignment
-const INDENT_RE = /^(?:( )+|\t+)/;
+  // replace special metacharacter slash after the leading slash
+  [
+    /\//g,
+    () => '\\/'
+  ],
 
-function getMostUsed(indents) {
-	let result = 0;
-	let maxUsed = 0;
-	let maxWeight = 0;
+  [
+    // > 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 '\\*'
+    /^\^*\\\*\\\*\\\//,
 
-	for (const entry of indents) {
-		// TODO: use destructuring when targeting Node.js 6
-		const key = entry[0];
-		const val = entry[1];
+    // '**/foo' <-> 'foo'
+    () => '^(?:.*\\/)?'
+  ],
 
-		const u = val[0];
-		const w = val[1];
+  // 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
 
-		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
-			maxUsed = u;
-			maxWeight = w;
-			result = Number(key);
-		}
-	}
+        // 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.
+        ? '(?:^|\\/)'
 
-	return result;
-}
+        // > Otherwise, Git treats the pattern as a shell glob suitable for
+        // >   consumption by fnmatch(3)
+        : '^'
+    }
+  ],
 
-module.exports = str => {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
+  // two globstars
+  [
+    // Use lookahead assertions so that we could match more than one `'/**'`
+    /\\\/\\\*\\\*(?=\\\/|$)/g,
 
-	// used to see if tabs or spaces are the most used
-	let tabs = 0;
-	let spaces = 0;
+    // Zero, one or several directories
+    // should not use '*', or it will be replaced by the next replacer
 
-	// remember the size of previous line's indentation
-	let prev = 0;
+    // Check if it is not the last `'/**'`
+    (_, index, str) => index + 6 < str.length
 
-	// 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();
+      // 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.
+      // '/**/'
+      ? '(?:\\/[^\\/]+)*'
 
-	// pointer to the array of last used indent
-	let current;
+      // case: /**
+      // > A trailing `"/**"` matches everything inside.
 
-	// whether the last action was an indent (opposed to an unindent)
-	let isIndent;
+      // #21: everything inside but it should not include the current folder
+      : '\\/.+'
+  ],
 
-	for (const line of str.split(/\n/g)) {
-		if (!line) {
-			// ignore empty lines
-			continue;
-		}
+  // intermediate wildcards
+  [
+    // Never replace escaped '*'
+    // ignore rule '\*' will match the path '*'
 
-		let indent;
-		const matches = line.match(INDENT_RE);
+    // 'abc.*/' -> go
+    // 'abc.*'  -> skip this rule
+    /(^|[^\\]+)\\\*(?=.+)/g,
 
-		if (matches) {
-			indent = matches[0].length;
+    // '*.js' matches '.js'
+    // '*.js' doesn't match 'abc'
+    (_, p1) => `${p1}[^\\/]*`
+  ],
 
-			if (matches[1]) {
-				spaces++;
-			} else {
-				tabs++;
-			}
-		} else {
-			indent = 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
+  ],
 
-		const diff = indent - prev;
-		prev = indent;
+  [
+    // '\\\\' -> '\\'
+    /\\\\/g,
+    () => ESCAPE
+  ],
 
-		if (diff) {
-			// an indent or unindent has been detected
+  [
+    // > The range notation, e.g. [a-zA-Z],
+    // > can be used to match one of the characters in a range.
 
-			isIndent = diff > 0;
+    // `\` 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\\\\]'
+          : '[]'
+        : '[]'
+  ],
 
-			current = indents.get(isIndent ? diff : -diff);
+  // ending
+  [
+    // 'js' will not match 'js.'
+    // 'ab' will not match 'abc'
+    /(?:[^*])$/,
 
-			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);
-		}
-	}
+    // 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
 
-	const amount = getMostUsed(indents);
+    // > 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.
 
-	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);
-	}
+    // '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 {
-		amount,
-		type,
-		indent
-	};
-};
+  // trailing wildcard
+  [
+    /(\^|\\\/)?\\\*$/,
+    (_, p1) => {
+      const prefix = p1
+        // '\^':
+        // '/*' does not match EMPTY
+        // '/*' does not match everything
 
+        // '\\\/':
+        // 'abc/*' does not match 'abc/'
+        ? `${p1}[^/]+`
 
-/***/ }),
-/* 408 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        // 'a*' matches 'a'
+        // 'a*' matches 'aa'
+        : '[^/]*'
 
-"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 import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(221);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+      return `${prefix}(?=$|\\/$)`
+    }
+  ],
+]
 
-const YARN_EXEC = process.env.npm_execpath || 'yarn';
-/**
- * Install all dependencies in the given directory
- */
+// A simple cache, because an ignore rule only has only one certain meaning
+const regexCache = Object.create(null)
 
-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).
+// @param {pattern}
+const makeRegex = (pattern, negative, ignorecase) => {
+  const r = regexCache[pattern]
+  if (r) {
+    return r
+  }
 
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, options, {
-    cwd: directory,
-    env: {
-      SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
-      RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
-    }
-  });
-}
-/**
- * Run script in the given directory
- */
+  // const replacers = negative
+  //   ? NEGATIVE_REPLACERS
+  //   : POSITIVE_REPLACERS
 
-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
- */
+  const source = REPLACERS.reduce(
+    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
+    pattern
+  )
 
-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
-  });
+  return regexCache[pattern] = ignorecase
+    ? new RegExp(source, 'i')
+    : new RegExp(source)
 }
 
-/***/ }),
-/* 409 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "resolveDepsForProject", function() { return resolveDepsForProject; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(410);
-/* 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__(231);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-// @ts-expect-error published types are worthless
+const isString = subject => typeof subject === 'string'
 
+// > 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)
 
-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);
+  // > A line starting with # serves as a comment.
+  && pattern.indexOf('#') !== 0
 
-    if (yarnLock.type === 'success') {
-      return yarnLock.object;
-    }
+const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
 
-    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
-  } catch (error) {
-    if (error.code !== 'ENOENT') {
-      throw error;
-    }
+class IgnoreRule {
+  constructor (
+    origin,
+    pattern,
+    negative,
+    regex
+  ) {
+    this.origin = origin
+    this.pattern = pattern
+    this.negative = negative
+    this.regex = regex
   }
-
-  return {};
 }
-/**
- * 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
- */
 
-function resolveDepsForProject({
-  project: rootProject,
-  yarnLock,
-  kbn,
-  log,
-  productionDepsOnly,
-  includeDependentProject
-}) {
-  /** map of [name@range, { name, version }] */
-  const resolved = new Map();
-  const seenProjects = new Set();
-  const projectQueue = [rootProject];
-  const depQueue = [];
+const createRule = (pattern, ignorecase) => {
+  const origin = pattern
+  let negative = false
 
-  while (projectQueue.length) {
-    const project = projectQueue.shift();
+  // > An optional prefix "!" which negates the pattern;
+  if (pattern.indexOf('!') === 0) {
+    negative = true
+    pattern = pattern.substr(1)
+  }
 
-    if (seenProjects.has(project)) {
-      continue;
-    }
+  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, '#')
 
-    seenProjects.add(project);
-    const projectDeps = Object.entries(productionDepsOnly ? project.productionDependencies : project.allDependencies);
+  const regex = makeRegex(pattern, negative, ignorecase)
 
-    for (const [name, versionRange] of projectDeps) {
-      depQueue.push([name, versionRange]);
-    }
+  return new IgnoreRule(
+    origin,
+    pattern,
+    negative,
+    regex
+  )
+}
 
-    while (depQueue.length) {
-      const [name, versionRange] = depQueue.shift();
-      const req = `${name}@${versionRange}`;
+const throwError = (message, Ctor) => {
+  throw new Ctor(message)
+}
 
-      if (resolved.has(req)) {
-        continue;
-      }
+const checkPath = (path, originalPath, doThrow) => {
+  if (!isString(path)) {
+    return doThrow(
+      `path must be a string, but got \`${originalPath}\``,
+      TypeError
+    )
+  }
 
-      if (includeDependentProject && kbn.hasProject(name)) {
-        projectQueue.push(kbn.getProject(name));
-      }
+  // We don't know if we should ignore EMPTY, so throw
+  if (!path) {
+    return doThrow(`path must not be empty`, TypeError)
+  }
 
-      if (!kbn.hasProject(name)) {
-        const pkg = yarnLock[req];
+  // 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
+    )
+  }
 
-        if (!pkg) {
-          log.warning('yarn.lock file is out of date, please run `yarn kbn bootstrap` to re-enable caching');
-          return;
-        }
+  return true
+}
 
-        resolved.set(req, {
-          name,
-          version: pkg.version
-        });
-        const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
+const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
-        for (const [childName, childVersionRange] of allDepsEntries) {
-          depQueue.push([childName, childVersionRange]);
-        }
-      }
-    }
+checkPath.isNotRelative = isNotRelative
+checkPath.convert = p => p
+
+class Ignore {
+  constructor ({
+    ignorecase = true
+  } = {}) {
+    this._rules = []
+    this._ignorecase = ignorecase
+    define(this, KEY_IGNORE, true)
+    this._initCache()
   }
 
-  return resolved;
-}
+  _initCache () {
+    this._ignoreCache = Object.create(null)
+    this._testCache = Object.create(null)
+  }
 
-/***/ }),
-/* 410 */
-/***/ (function(module, exports, __webpack_require__) {
+  _addPattern (pattern) {
+    // #32
+    if (pattern && pattern[KEY_IGNORE]) {
+      this._rules = this._rules.concat(pattern._rules)
+      this._added = true
+      return
+    }
 
-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) {
+    if (checkPattern(pattern)) {
+      const rule = createRule(pattern, this._ignorecase)
+      this._added = true
+      this._rules.push(rule)
+    }
+  }
 
-module.exports = __webpack_require__(4);
+  // @param {Array<string> | string | Ignore} pattern
+  add (pattern) {
+    this._added = false
 
-/***/ }),
-/* 1 */
-/***/ (function(module, exports, __webpack_require__) {
+    makeArray(
+      isString(pattern)
+        ? splitPattern(pattern)
+        : pattern
+    ).forEach(this._addPattern, this)
 
-"use strict";
+    // Some rules have just added to the ignore,
+    // making the behavior changed.
+    if (this._added) {
+      this._initCache()
+    }
 
+    return this
+  }
 
-exports.__esModule = true;
+  // legacy
+  addPattern (pattern) {
+    return this.add(pattern)
+  }
 
-var _promise = __webpack_require__(173);
+  //          |           ignored : unignored
+  // negative |   0:0   |   0:1   |   1:0   |   1:1
+  // -------- | ------- | ------- | ------- | --------
+  //     0    |  TEST   |  TEST   |  SKIP   |    X
+  //     1    |  TESTIF |  SKIP   |  TEST   |    X
 
-var _promise2 = _interopRequireDefault(_promise);
+  // - SKIP: always skip
+  // - TEST: always test
+  // - TESTIF: only test if checkUnignored
+  // - X: that never happen
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  // @param {boolean} whether should check if the path is unignored,
+  //   setting `checkUnignored` to `false` could reduce additional
+  //   path matching.
 
-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;
-        }
+  // @returns {TestResult} true if a file is ignored
+  _testOne (path, checkUnignored) {
+    let ignored = false
+    let unignored = false
 
-        if (info.done) {
-          resolve(value);
-        } else {
-          return _promise2.default.resolve(value).then(function (value) {
-            step("next", value);
-          }, function (err) {
-            step("throw", err);
-          });
-        }
+    this._rules.forEach(rule => {
+      const {negative} = rule
+      if (
+        unignored === negative && ignored !== unignored
+        || negative && !ignored && !unignored && !checkUnignored
+      ) {
+        return
       }
 
-      return step("next");
-    });
-  };
-};
+      const matched = rule.regex.test(path)
 
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
+      if (matched) {
+        ignored = !negative
+        unignored = negative
+      }
+    })
 
-module.exports = __webpack_require__(113);
+    return {
+      ignored,
+      unignored
+    }
+  }
 
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
+  // @returns {TestResult}
+  _test (originalPath, cache, checkUnignored, slices) {
+    const path = originalPath
+      // Supports nullable path
+      && checkPath.convert(originalPath)
 
-module.exports = __webpack_require__(132);
+    checkPath(path, originalPath, throwError)
 
-/***/ }),
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
+    return this._t(path, cache, checkUnignored, slices)
+  }
 
-"use strict";
+  _t (path, cache, checkUnignored, slices) {
+    if (path in cache) {
+      return cache[path]
+    }
 
+    if (!slices) {
+      // path/to/a.js
+      // ['path', 'to', 'a.js']
+      slices = path.split(SLASH)
+    }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-class MessageError extends Error {
-  constructor(msg, code) {
-    super(msg);
-    this.code = code;
-  }
+    slices.pop()
 
-}
+    // If the path has no parent directory, just test it
+    if (!slices.length) {
+      return cache[path] = this._testOne(path, checkUnignored)
+    }
 
-exports.MessageError = MessageError;
-class ProcessSpawnError extends MessageError {
-  constructor(msg, code, process) {
-    super(msg, code);
-    this.process = process;
-  }
+    const parent = this._t(
+      slices.join(SLASH) + SLASH,
+      cache,
+      checkUnignored,
+      slices
+    )
 
-}
+    // 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)
+  }
 
-exports.ProcessSpawnError = ProcessSpawnError;
-class SecurityError extends MessageError {}
+  ignores (path) {
+    return this._test(path, this._ignoreCache, false).ignored
+  }
 
-exports.SecurityError = SecurityError;
-class ProcessTermError extends MessageError {}
+  createFilter () {
+    return path => !this.ignores(path)
+  }
 
-exports.ProcessTermError = ProcessTermError;
-class ResponseError extends Error {
-  constructor(msg, responseCode) {
-    super(msg);
-    this.responseCode = responseCode;
+  filter (paths) {
+    return makeArray(paths).filter(this.createFilter())
   }
 
+  // @returns {TestResult}
+  test (path) {
+    return this._test(path, this._testCache, true)
+  }
 }
-exports.ResponseError = ResponseError;
 
-/***/ }),
-/* 5 */
-/***/ (function(module, exports, __webpack_require__) {
+const factory = options => new Ignore(options)
 
-"use strict";
+const returnFalse = () => false
 
+const isPathValid = path =>
+  checkPath(path && checkPath.convert(path), path, returnFalse)
 
-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;
+factory.isPathValid = isPathValid
 
-var _asyncToGenerator2;
+// Fixes typescript
+factory.default = factory
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+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, '/')
+
+  checkPath.convert = makePosix
+
+  // '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)
 }
 
-let buildActionsForCopy = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-    //
-    let build = (() => {
-      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest,
-              type = data.type;
+/***/ }),
 
-        const onFresh = data.onFresh || noop;
-        const onDone = data.onDone || noop;
+/***/ "../../node_modules/imurmurhash/imurmurhash.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        // 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());
-        }
+/**
+ * @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;
 
-        if (type === 'symlink') {
-          yield mkdirp((_path || _load_path()).default.dirname(dest));
-          onFresh();
-          actions.symlink.push({
-            dest,
-            linkname: src
-          });
-          onDone();
-          return;
+    // 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);
         }
 
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
+        if (m !== this) {
+            return m;
         }
+    };
 
-        const srcStat = yield lstat(src);
-        let srcFiles;
+    // 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;
 
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
+        len = key.length;
+        this.len += len;
+
+        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;
         }
 
-        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;
-          }
+        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;
+                }
+
+                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);
+            }
+
+            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;
         }
 
-        // if destination exists
-        if (destStat) {
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
+        this.k1 = k1;
+        return this;
+    };
 
-          // 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.
+    // 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;
 
-          /* if (srcStat.mode !== destStat.mode) {
-            try {
-              await access(dest, srcStat.mode);
-            } catch (err) {}
-          } */
+        if (k1 > 0) {
+            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
+            k1 = (k1 << 15) | (k1 >>> 17);
+            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
+            h1 ^= k1;
+        }
 
-          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;
-          }
+        h1 ^= this.len;
 
-          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;
-          }
+        h1 ^= h1 >>> 16;
+        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
+        h1 ^= h1 >>> 13;
+        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
+        h1 ^= h1 >>> 16;
 
-          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;
-            }
-          }
+        return h1 >>> 0;
+    };
 
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
+    // 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 (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
-              var _ref6;
+    // 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();
 
-              if (_isArray4) {
-                if (_i4 >= _iterator4.length) break;
-                _ref6 = _iterator4[_i4++];
-              } else {
-                _i4 = _iterator4.next();
-                if (_i4.done) break;
-                _ref6 = _i4.value;
-              }
+    if (true) {
+        module.exports = MurmurHash3;
+    } else {}
+}());
 
-              const file = _ref6;
 
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
+/***/ }),
 
-                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;
+/***/ "../../node_modules/inflight/inflight.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-                    if (_isArray5) {
-                      if (_i5 >= _iterator5.length) break;
-                      _ref7 = _iterator5[_i5++];
-                    } else {
-                      _i5 = _iterator5.next();
-                      if (_i5.done) break;
-                      _ref7 = _i5.value;
-                    }
+var wrappy = __webpack_require__("../../node_modules/wrappy/wrappy.js")
+var reqs = Object.create(null)
+var once = __webpack_require__("../../node_modules/once/once.js")
 
-                    const file = _ref7;
+module.exports = wrappy(inflight)
 
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
+  }
+}
 
-        if (destStat && destStat.isSymbolicLink()) {
-          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
-          destStat = null;
-        }
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
 
-        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);
-          }
+    // 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 slice (args) {
+  var length = args.length
+  var array = []
 
-          const destParts = dest.split((_path || _load_path()).default.sep);
-          while (destParts.length) {
-            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
-            destParts.pop();
-          }
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
 
-          // 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;
-            }
+/***/ }),
 
-            const file = _ref8;
+/***/ "../../node_modules/inherits/inherits.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-            queue.push({
-              dest: (_path || _load_path()).default.join(dest, file),
-              onFresh,
-              onDone: function (_onDone) {
-                function onDone() {
-                  return _onDone.apply(this, arguments);
-                }
+try {
+  var util = __webpack_require__("util");
+  /* istanbul ignore next */
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  /* istanbul ignore next */
+  module.exports = __webpack_require__("../../node_modules/inherits/inherits_browser.js");
+}
 
-                onDone.toString = function () {
-                  return _onDone.toString();
-                };
 
-                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}`);
+/***/ }),
+
+/***/ "../../node_modules/inherits/inherits_browser.js":
+/***/ (function(module, exports) {
+
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    if (superCtor) {
+      ctor.super_ = superCtor
+      ctor.prototype = Object.create(superCtor.prototype, {
+        constructor: {
+          value: ctor,
+          enumerable: false,
+          writable: true,
+          configurable: true
         }
-      });
+      })
+    }
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    if (superCtor) {
+      ctor.super_ = superCtor
+      var TempCtor = function () {}
+      TempCtor.prototype = superCtor.prototype
+      ctor.prototype = new TempCtor()
+      ctor.prototype.constructor = ctor
+    }
+  }
+}
 
-      return function build(_x5) {
-        return _ref5.apply(this, arguments);
-      };
-    })();
 
-    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;
+/***/ "../../node_modules/is-accessor-descriptor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref2 = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref2 = _i.value;
-      }
+"use strict";
+/*!
+ * is-accessor-descriptor <https://github.com/jonschlinkert/is-accessor-descriptor>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-      const item = _ref2;
 
-      const onDone = item.onDone;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        if (onDone) {
-          onDone();
-        }
-      };
-    }
-    events.onStart(queue.length);
 
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
+var typeOf = __webpack_require__("../../node_modules/kind-of/index.js");
 
-    // 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));
-    }
+// accessor descriptor properties
+var accessor = {
+  get: 'function',
+  set: 'function',
+  configurable: 'boolean',
+  enumerable: 'boolean'
+};
 
-    // 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;
+function isAccessorDescriptor(obj, prop) {
+  if (typeof prop === 'string') {
+    var val = Object.getOwnPropertyDescriptor(obj, prop);
+    return typeof val !== 'undefined';
+  }
 
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref3 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref3 = _i2.value;
-      }
+  if (typeOf(obj) !== 'object') {
+    return false;
+  }
 
-      const file = _ref3;
+  if (has(obj, 'value') || has(obj, 'writable')) {
+    return false;
+  }
 
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
+  if (!has(obj, 'get') || typeof obj.get !== 'function') {
+    return false;
+  }
 
-    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
-      var _ref4;
+  // tldr: it's valid to have "set" be undefined
+  // "set" might be undefined if `Object.getOwnPropertyDescriptor`
+  // was used to get the value, and only `get` was defined by the user
+  if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') {
+    return false;
+  }
 
-      if (_isArray3) {
-        if (_i3 >= _iterator3.length) break;
-        _ref4 = _iterator3[_i3++];
-      } else {
-        _i3 = _iterator3.next();
-        if (_i3.done) break;
-        _ref4 = _i3.value;
-      }
+  for (var key in obj) {
+    if (!accessor.hasOwnProperty(key)) {
+      continue;
+    }
 
-      const loc = _ref4;
+    if (typeOf(obj[key]) === accessor[key]) {
+      continue;
+    }
 
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
-      }
+    if (typeof obj[key] !== 'undefined') {
+      return false;
     }
+  }
+  return true;
+}
 
-    return actions;
-  });
+function has(obj, key) {
+  return {}.hasOwnProperty.call(obj, key);
+}
 
-  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
-    return _ref.apply(this, arguments);
-  };
-})();
+/**
+ * Expose `isAccessorDescriptor`
+ */
 
-let buildActionsForHardlink = (() => {
-  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
+module.exports = isAccessorDescriptor;
 
-    //
-    let build = (() => {
-      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
-        const src = data.src,
-              dest = data.dest;
 
-        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());
+/***/ }),
 
-        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
-          // ignored file
-          return;
-        }
+/***/ "../../node_modules/is-arrayish/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        const srcStat = yield lstat(src);
-        let srcFiles;
+"use strict";
 
-        if (srcStat.isDirectory()) {
-          srcFiles = yield readdir(src);
-        }
 
-        const destExists = yield exists(dest);
-        if (destExists) {
-          const destStat = yield lstat(dest);
+module.exports = function isArrayish(obj) {
+	if (!obj) {
+		return false;
+	}
 
-          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
-          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
-          const bothFiles = srcStat.isFile() && destStat.isFile();
+	return obj instanceof Array || Array.isArray(obj) ||
+		(obj.length >= 0 && obj.splice instanceof Function);
+};
 
-          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;
-          }
+/***/ "../../node_modules/is-buffer/index.js":
+/***/ (function(module, exports) {
 
-          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;
-            }
-          }
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
 
-          if (bothFolders) {
-            // mark files that aren't in this folder as possibly extraneous
-            const destFiles = yield readdir(dest);
-            invariant(srcFiles, 'src files not initialised');
+// The _isBuffer check is for Safari 5-7 support, because it's missing
+// Object.prototype.constructor. Remove this eventually
+module.exports = function (obj) {
+  return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
+}
 
-            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
-              var _ref14;
+function isBuffer (obj) {
+  return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
+}
 
-              if (_isArray10) {
-                if (_i10 >= _iterator10.length) break;
-                _ref14 = _iterator10[_i10++];
-              } else {
-                _i10 = _iterator10.next();
-                if (_i10.done) break;
-                _ref14 = _i10.value;
-              }
+// For Node v0.10 support. Remove this eventually.
+function isSlowBuffer (obj) {
+  return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
+}
 
-              const file = _ref14;
 
-              if (srcFiles.indexOf(file) < 0) {
-                const loc = (_path || _load_path()).default.join(dest, file);
-                possibleExtraneous.add(loc);
+/***/ }),
 
-                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;
+/***/ "../../node_modules/is-core-module/core.json":
+/***/ (function(module) {
 
-                    if (_isArray11) {
-                      if (_i11 >= _iterator11.length) break;
-                      _ref15 = _iterator11[_i11++];
-                    } else {
-                      _i11 = _iterator11.next();
-                      if (_i11.done) break;
-                      _ref15 = _i11.value;
-                    }
+module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
 
-                    const file = _ref15;
+/***/ }),
 
-                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
-                  }
-                }
-              }
-            }
-          }
-        }
+/***/ "../../node_modules/is-core-module/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        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);
+"use strict";
 
-          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 _iterator12 = srcFiles, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
-            var _ref16;
+var has = __webpack_require__("../../node_modules/has/src/index.js");
 
-            if (_isArray12) {
-              if (_i12 >= _iterator12.length) break;
-              _ref16 = _iterator12[_i12++];
-            } else {
-              _i12 = _iterator12.next();
-              if (_i12.done) break;
-              _ref16 = _i12.value;
-            }
+function specifierIncluded(current, specifier) {
+	var nodeParts = current.split('.');
+	var parts = specifier.split(' ');
+	var op = parts.length > 1 ? parts[0] : '=';
+	var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
 
-            const file = _ref16;
+	for (var i = 0; i < 3; ++i) {
+		var cur = parseInt(nodeParts[i] || 0, 10);
+		var ver = parseInt(versionParts[i] || 0, 10);
+		if (cur === ver) {
+			continue; // eslint-disable-line no-restricted-syntax, no-continue
+		}
+		if (op === '<') {
+			return cur < ver;
+		}
+		if (op === '>=') {
+			return cur >= ver;
+		}
+		return false;
+	}
+	return op === '>=';
+}
 
-            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 matchesRange(current, range) {
+	var specifiers = range.split(/ ?&& ?/);
+	if (specifiers.length === 0) {
+		return false;
+	}
+	for (var i = 0; i < specifiers.length; ++i) {
+		if (!specifierIncluded(current, specifiers[i])) {
+			return false;
+		}
+	}
+	return true;
+}
 
-                onDone.toString = function () {
-                  return _onDone2.toString();
-                };
+function versionIncluded(nodeVersion, specifierValue) {
+	if (typeof specifierValue === 'boolean') {
+		return specifierValue;
+	}
 
-                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 current = typeof nodeVersion === 'undefined'
+		? process.versions && process.versions.node
+		: nodeVersion;
 
-      return function build(_x10) {
-        return _ref13.apply(this, arguments);
-      };
-    })();
+	if (typeof current !== 'string') {
+		throw new TypeError(typeof nodeVersion === 'undefined' ? 'Unable to determine current node version' : 'If provided, a valid node version is required');
+	}
 
-    const artifactFiles = new Set(events.artifactFiles || []);
-    const files = new Set();
+	if (specifierValue && typeof specifierValue === 'object') {
+		for (var i = 0; i < specifierValue.length; ++i) {
+			if (matchesRange(current, specifierValue[i])) {
+				return true;
+			}
+		}
+		return false;
+	}
+	return matchesRange(current, specifierValue);
+}
 
-    // initialise events
-    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
-      var _ref10;
+var data = __webpack_require__("../../node_modules/is-core-module/core.json");
 
-      if (_isArray7) {
-        if (_i7 >= _iterator7.length) break;
-        _ref10 = _iterator7[_i7++];
-      } else {
-        _i7 = _iterator7.next();
-        if (_i7.done) break;
-        _ref10 = _i7.value;
-      }
+module.exports = function isCore(x, nodeVersion) {
+	return has(data, x) && versionIncluded(nodeVersion, data[x]);
+};
 
-      const item = _ref10;
 
-      const onDone = item.onDone || noop;
-      item.onDone = function () {
-        events.onProgress(item.dest);
-        onDone();
-      };
-    }
-    events.onStart(queue.length);
+/***/ }),
+
+/***/ "../../node_modules/is-data-descriptor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // start building actions
-    const actions = {
-      file: [],
-      symlink: [],
-      link: []
-    };
+"use strict";
+/*!
+ * is-data-descriptor <https://github.com/jonschlinkert/is-data-descriptor>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-    // 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;
 
-      if (_isArray8) {
-        if (_i8 >= _iterator8.length) break;
-        _ref11 = _iterator8[_i8++];
-      } else {
-        _i8 = _iterator8.next();
-        if (_i8.done) break;
-        _ref11 = _i8.value;
-      }
+var typeOf = __webpack_require__("../../node_modules/kind-of/index.js");
 
-      const file = _ref11;
+module.exports = function isDataDescriptor(obj, prop) {
+  // data descriptor properties
+  var data = {
+    configurable: 'boolean',
+    enumerable: 'boolean',
+    writable: 'boolean'
+  };
 
-      if (possibleExtraneous.has(file)) {
-        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
-        possibleExtraneous.delete(file);
-      }
-    }
+  if (typeOf(obj) !== 'object') {
+    return false;
+  }
 
-    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
-      var _ref12;
+  if (typeof prop === 'string') {
+    var val = Object.getOwnPropertyDescriptor(obj, prop);
+    return typeof val !== 'undefined';
+  }
 
-      if (_isArray9) {
-        if (_i9 >= _iterator9.length) break;
-        _ref12 = _iterator9[_i9++];
-      } else {
-        _i9 = _iterator9.next();
-        if (_i9.done) break;
-        _ref12 = _i9.value;
-      }
+  if (!('value' in obj) && !('writable' in obj)) {
+    return false;
+  }
 
-      const loc = _ref12;
+  for (var key in obj) {
+    if (key === 'value') continue;
 
-      if (files.has(loc.toLowerCase())) {
-        possibleExtraneous.delete(loc);
-      }
+    if (!data.hasOwnProperty(key)) {
+      continue;
     }
 
-    return actions;
-  });
-
-  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
-    return _ref9.apply(this, arguments);
-  };
-})();
+    if (typeOf(obj[key]) === data[key]) {
+      continue;
+    }
 
-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 || []
-    };
+    if (typeof obj[key] !== 'undefined') {
+      return false;
+    }
+  }
+  return true;
+};
 
-    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
-    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-    const fileActions = actions.file;
+/***/ }),
 
-    const currentlyWriting = new Map();
+/***/ "../../node_modules/is-descriptor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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;
-        }
+"use strict";
+/*!
+ * is-descriptor <https://github.com/jonschlinkert/is-descriptor>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-        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;
-      });
 
-      return function (_x14) {
-        return _ref18.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
 
-    // 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);
-    });
-  });
+var typeOf = __webpack_require__("../../node_modules/kind-of/index.js");
+var isAccessor = __webpack_require__("../../node_modules/is-accessor-descriptor/index.js");
+var isData = __webpack_require__("../../node_modules/is-data-descriptor/index.js");
 
-  return function copyBulk(_x11, _x12, _x13) {
-    return _ref17.apply(this, arguments);
-  };
-})();
+module.exports = function isDescriptor(obj, key) {
+  if (typeOf(obj) !== 'object') {
+    return false;
+  }
+  if ('get' in obj) {
+    return isAccessor(obj, key);
+  }
+  return isData(obj, key);
+};
 
-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);
+/***/ }),
 
-    const fileActions = actions.link;
+/***/ "../../node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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);
-      });
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-      return function (_x18) {
-        return _ref20.apply(this, arguments);
-      };
-    })(), CONCURRENT_QUEUE_ITEMS);
 
-    // 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);
-    });
-  });
 
-  return function hardlinkBulk(_x15, _x16, _x17) {
-    return _ref19.apply(this, arguments);
-  };
-})();
+module.exports = function isExtendable(val) {
+  return typeof val !== 'undefined' && val !== null
+    && (typeof val === 'object' || typeof val === 'function');
+};
 
-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 (_isArray13) {
-        if (_i13 >= _iterator13.length) break;
-        _ref22 = _iterator13[_i13++];
-      } else {
-        _i13 = _iterator13.next();
-        if (_i13.done) break;
-        _ref22 = _i13.value;
-      }
+/***/ }),
 
-      const file = _ref22;
+/***/ "../../node_modules/is-extglob/index.js":
+/***/ (function(module, exports) {
 
-      if (yield exists(file)) {
-        return readFile(file);
-      }
-    }
-    return null;
-  });
+/*!
+ * is-extglob <https://github.com/jonschlinkert/is-extglob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-  return function readFileAny(_x19) {
-    return _ref21.apply(this, arguments);
-  };
-})();
+module.exports = function isExtglob(str) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
 
-let readJson = exports.readJson = (() => {
-  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-    return (yield readJsonAndFile(loc)).object;
-  });
+  var match;
+  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
+    if (match[2]) return true;
+    str = str.slice(match.index + match[0].length);
+  }
 
-  return function readJson(_x20) {
-    return _ref23.apply(this, arguments);
-  };
-})();
+  return false;
+};
 
-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);
+/***/ "../../node_modules/is-glob/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    while (parts.length) {
-      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-      if (yield exists(loc)) {
-        return loc;
-      } else {
-        parts.pop();
-      }
+var isExtglob = __webpack_require__("../../node_modules/is-extglob/index.js");
+var chars = { '{': '}', '(': ')', '[': ']'};
+var strictCheck = function(str) {
+  if (str[0] === '!') {
+    return true;
+  }
+  var index = 0;
+  var pipeIndex = -2;
+  var closeSquareIndex = -2;
+  var closeCurlyIndex = -2;
+  var closeParenIndex = -2;
+  var backSlashIndex = -2;
+  while (index < str.length) {
+    if (str[index] === '*') {
+      return true;
     }
 
-    return false;
-  });
-
-  return function find(_x22, _x23) {
-    return _ref25.apply(this, arguments);
-  };
-})();
+    if (str[index + 1] === '?' && /[\].+)]/.test(str[index])) {
+      return true;
+    }
 
-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;
-        }
+    if (closeSquareIndex !== -1 && str[index] === '[' && str[index + 1] !== ']') {
+      if (closeSquareIndex < index) {
+        closeSquareIndex = str.indexOf(']', index);
       }
-    } catch (err) {
-      if (err.code !== 'ENOENT') {
-        throw err;
+      if (closeSquareIndex > index) {
+        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
+          return true;
+        }
+        backSlashIndex = str.indexOf('\\', index);
+        if (backSlashIndex === -1 || backSlashIndex > closeSquareIndex) {
+          return true;
+        }
       }
     }
-    // We use rimraf for unlink which never throws an ENOENT on missing target
-    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
 
-    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;
+    if (closeCurlyIndex !== -1 && str[index] === '{' && str[index + 1] !== '}') {
+      closeCurlyIndex = str.indexOf('}', index);
+      if (closeCurlyIndex > index) {
+        backSlashIndex = str.indexOf('\\', index);
+        if (backSlashIndex === -1 || backSlashIndex > closeCurlyIndex) {
+          return true;
         }
-        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);
     }
-  });
-
-  return function symlink(_x24, _x25) {
-    return _ref26.apply(this, arguments);
-  };
-})();
-
-let walk = exports.walk = (() => {
-  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
-    let files = [];
 
-    let filenames = yield readdir(dir);
-    if (ignoreBasenames.size) {
-      filenames = filenames.filter(function (name) {
-        return !ignoreBasenames.has(name);
-      });
+    if (closeParenIndex !== -1 && str[index] === '(' && str[index + 1] === '?' && /[:!=]/.test(str[index + 2]) && str[index + 3] !== ')') {
+      closeParenIndex = str.indexOf(')', index);
+      if (closeParenIndex > index) {
+        backSlashIndex = str.indexOf('\\', index);
+        if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
+          return true;
+        }
+      }
     }
 
-    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
-      var _ref28;
-
-      if (_isArray14) {
-        if (_i14 >= _iterator14.length) break;
-        _ref28 = _iterator14[_i14++];
-      } else {
-        _i14 = _iterator14.next();
-        if (_i14.done) break;
-        _ref28 = _i14.value;
+    if (pipeIndex !== -1 && str[index] === '(' && str[index + 1] !== '|') {
+      if (pipeIndex < index) {
+        pipeIndex = str.indexOf('|', index);
       }
-
-      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);
-
-      files.push({
-        relative,
-        basename: name,
-        absolute: loc,
-        mtime: +stat.mtime
-      });
-
-      if (stat.isDirectory()) {
-        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+      if (pipeIndex !== -1 && str[pipeIndex + 1] !== ')') {
+        closeParenIndex = str.indexOf(')', pipeIndex);
+        if (closeParenIndex > pipeIndex) {
+          backSlashIndex = str.indexOf('\\', pipeIndex);
+          if (backSlashIndex === -1 || backSlashIndex > closeParenIndex) {
+            return true;
+          }
+        }
       }
     }
 
-    return files;
-  });
-
-  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;
-
-
-    return Math.ceil(size / blockSize) * blockSize;
-  });
-
-  return function getFileSizeOnDisk(_x28) {
-    return _ref29.apply(this, arguments);
-  };
-})();
-
-let getEolFromFile = (() => {
-  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
-    if (!(yield exists(path))) {
-      return undefined;
-    }
-
-    const buffer = yield readFileBuffer(path);
+    if (str[index] === '\\') {
+      var open = str[index + 1];
+      index += 2;
+      var close = chars[open];
 
-    for (let i = 0; i < buffer.length; ++i) {
-      if (buffer[i] === cr) {
-        return '\r\n';
+      if (close) {
+        var n = str.indexOf(close, index);
+        if (n !== -1) {
+          index = n + 1;
+        }
       }
-      if (buffer[i] === lf) {
-        return '\n';
+
+      if (str[index] === '!') {
+        return true;
       }
+    } else {
+      index++;
     }
-    return undefined;
-  });
-
-  return function getEolFromFile(_x29) {
-    return _ref30.apply(this, arguments);
-  };
-})();
+  }
+  return false;
+};
 
-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);
+var relaxedCheck = function(str) {
+  if (str[0] === '!') {
+    return true;
+  }
+  var index = 0;
+  while (index < str.length) {
+    if (/[*?{}()[\]]/.test(str[index])) {
+      return true;
     }
-    yield writeFile(path, data);
-  });
 
-  return function writeFilePreservingEol(_x30, _x31) {
-    return _ref31.apply(this, arguments);
-  };
-})();
+    if (str[index] === '\\') {
+      var open = str[index + 1];
+      index += 2;
+      var close = chars[open];
 
-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);
+      if (close) {
+        var n = str.indexOf(close, index);
+        if (n !== -1) {
+          index = n + 1;
+        }
+      }
+
+      if (str[index] === '!') {
+        return true;
+      }
+    } else {
+      index++;
     }
+  }
+  return false;
+};
+
+module.exports = function isGlob(str, options) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
+
+  if (isExtglob(str)) {
     return true;
-  });
+  }
 
-  return function hardlinksWork(_x32) {
-    return _ref32.apply(this, arguments);
-  };
-})();
+  var check = strictCheck;
 
-// not a strict polyfill for Node's fs.mkdtemp
+  // optionally relax check
+  if (options && options.strict === false) {
+    check = relaxedCheck;
+  }
 
+  return check(str);
+};
 
-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;
-  });
 
-  return function makeTempDir(_x33) {
-    return _ref33.apply(this, arguments);
-  };
-})();
+/***/ }),
 
-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;
+/***/ "../../node_modules/is-interactive/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (_isArray15) {
-        if (_i15 >= _iterator15.length) break;
-        _ref35 = _iterator15[_i15++];
-      } else {
-        _i15 = _iterator15.next();
-        if (_i15.done) break;
-        _ref35 = _i15.value;
-      }
+"use strict";
 
-      const path = _ref35;
 
-      try {
-        const fd = yield open(path, 'r');
-        return (_fs || _load_fs()).default.createReadStream(path, { fd });
-      } catch (err) {
-        // Try the next one
-      }
-    }
-    return null;
-  });
+module.exports = ({stream = process.stdout} = {}) => {
+	return Boolean(
+		stream && stream.isTTY &&
+		process.env.TERM !== 'dumb' &&
+		!('CI' in process.env)
+	);
+};
 
-  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;
+/***/ "../../node_modules/is-number/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (_isArray16) {
-        if (_i16 >= _iterator16.length) break;
-        _ref37 = _iterator16[_i16++];
-      } else {
-        _i16 = _iterator16.next();
-        if (_i16.done) break;
-        _ref37 = _i16.value;
-      }
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-      const folder = _ref37;
 
-      try {
-        yield mkdirp(folder);
-        yield access(folder, mode);
 
-        result.folder = folder;
+var typeOf = __webpack_require__("../../node_modules/is-number/node_modules/kind-of/index.js");
 
-        return result;
-      } catch (error) {
-        result.skipped.push({
-          error,
-          folder
-        });
-      }
-    }
-    return result;
-  });
+module.exports = function isNumber(num) {
+  var type = typeOf(num);
 
-  return function getFirstSuitableFolder(_x35) {
-    return _ref36.apply(this, arguments);
-  };
-})();
+  if (type === 'string') {
+    if (!num.trim()) return false;
+  } else if (type !== 'number') {
+    return false;
+  }
 
-exports.copy = copy;
-exports.readFile = readFile;
-exports.readFileRaw = readFileRaw;
-exports.normalizeOS = normalizeOS;
+  return (num - num + 1) >= 0;
+};
 
-var _fs;
 
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(3));
-}
+/***/ }),
 
-var _glob;
+/***/ "../../node_modules/is-number/node_modules/kind-of/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function _load_glob() {
-  return _glob = _interopRequireDefault(__webpack_require__(75));
-}
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
 
-var _os;
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
 
-function _load_os() {
-  return _os = _interopRequireDefault(__webpack_require__(36));
-}
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
+  }
 
-var _path;
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
 
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
-var _blockingQueue;
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
-}
+  // other objects
+  var type = toString.call(val);
 
-var _promise;
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
 
-function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(40));
-}
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-var _promise2;
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
 
-function _load_promise2() {
-  return _promise2 = __webpack_require__(40);
-}
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
 
-var _map;
+  // must be a plain object
+  return 'object';
+};
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
 
-var _fsNormalized;
+/***/ }),
 
-function _load_fsNormalized() {
-  return _fsNormalized = __webpack_require__(164);
-}
+/***/ "../../node_modules/is-odd/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-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; } }
+"use strict";
+/*!
+ * is-odd <https://github.com/jonschlinkert/is-odd>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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
-};
 
-const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
+var isNumber = __webpack_require__("../../node_modules/is-odd/node_modules/is-number/index.js");
 
-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;
+module.exports = function isOdd(i) {
+  if (!isNumber(i)) {
+    throw new TypeError('is-odd expects a number.');
+  }
+  if (Number(i) !== Math.floor(i)) {
+    throw new RangeError('is-odd expects an integer.');
+  }
+  return !!(~~i & 1);
+};
 
-// 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);
+/***/ "../../node_modules/is-odd/node_modules/is-number/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const noop = () => {};
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-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);
-      }
-    });
-  });
-}
 
-function readFile(loc) {
-  return _readFile(loc, 'utf8').then(normalizeOS);
-}
+module.exports = function isNumber(num) {
+  var type = typeof num;
 
-function readFileRaw(loc) {
-  return _readFile(loc, 'binary');
-}
+  if (type === 'string' || num instanceof String) {
+    // an empty string would be coerced to true with the below logic
+    if (!num.trim()) return false;
+  } else if (type !== 'number' && !(num instanceof Number)) {
+    return false;
+  }
 
-function normalizeOS(body) {
-  return body.replace(/\r\n/g, '\n');
-}
+  return (num - num + 1) >= 0;
+};
 
-const cr = '\r'.charCodeAt(0);
-const lf = '\n'.charCodeAt(0);
 
 /***/ }),
-/* 6 */
+
+/***/ "../../node_modules/is-path-cwd/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const path = __webpack_require__("path");
 
-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;
+module.exports = path_ => {
+	let cwd = process.cwd();
 
-var _require = __webpack_require__(171);
+	path_ = path.resolve(path_);
 
-const getCacheDir = _require.getCacheDir,
-      getConfigDir = _require.getConfigDir,
-      getDataDir = _require.getDataDir;
+	if (process.platform === 'win32') {
+		cwd = cwd.toLowerCase();
+		path_ = path_.toLowerCase();
+	}
 
-const isWebpackBundle = __webpack_require__(227);
+	return path_ === cwd;
+};
 
-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';
+/***/ "../../node_modules/is-path-inside/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-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';
+"use strict";
 
-const SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
+const path = __webpack_require__("path");
 
-// cache version, bump whenever we make backwards incompatible changes
-const CACHE_VERSION = exports.CACHE_VERSION = 2;
+module.exports = (childPath, parentPath) => {
+	childPath = path.resolve(childPath);
+	parentPath = path.resolve(parentPath);
 
-// lockfile version, bump whenever we make backwards incompatible changes
-const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
+	if (process.platform === 'win32') {
+		childPath = childPath.toLowerCase();
+		parentPath = parentPath.toLowerCase();
+	}
 
-// max amount of network requests to perform concurrently
-const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
+	if (childPath === parentPath) {
+		return false;
+	}
 
-// HTTP timeout used when downloading packages
-const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
+	childPath += path.sep;
+	parentPath += path.sep;
 
-// max amount of child processes to execute concurrently
-const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
+	return childPath.startsWith(parentPath);
+};
 
-const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
 
-function getPreferredCacheDirectories() {
-  const preferredCacheDirectories = [getCacheDir()];
+/***/ }),
 
-  if (process.getuid) {
-    // $FlowFixMe: process.getuid exists, dammit
-    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
-  }
+/***/ "../../node_modules/is-plain-obj/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
+"use strict";
 
-  return preferredCacheDirectories;
-}
 
-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');
+module.exports = value => {
+	if (Object.prototype.toString.call(value) !== '[object Object]') {
+		return false;
+	}
 
-const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
-const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
+	const prototype = Object.getPrototypeOf(value);
+	return prototype === null || prototype === Object.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');
-  }
-}
 
-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');
+/***/ "../../node_modules/is-plain-object/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-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';
+"use strict";
+/*!
+ * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-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);
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
 
-function getPathKey(platform, env) {
-  let pathKey = 'PATH';
+function isObjectObject(o) {
+  return isObject(o) === true
+    && Object.prototype.toString.call(o) === '[object Object]';
+}
 
-  // windows calls its path "Path" usually, but this is not guaranteed.
-  if (platform === 'win32') {
-    pathKey = 'Path';
+module.exports = function isPlainObject(o) {
+  var ctor,prot;
 
-    for (const key in env) {
-      if (key.toLowerCase() === 'path') {
-        pathKey = key;
-      }
-    }
-  }
+  if (isObjectObject(o) === false) return false;
+
+  // If has modified constructor
+  ctor = o.constructor;
+  if (typeof ctor !== 'function') return false;
 
-  return pathKey;
-}
+  // If has modified prototype
+  prot = ctor.prototype;
+  if (isObjectObject(prot) === false) return false;
 
-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'
+  // If constructor does not have an Object-specific method
+  if (prot.hasOwnProperty('isPrototypeOf') === false) {
+    return false;
+  }
+
+  // Most likely a plain Object
+  return true;
 };
 
+
 /***/ }),
-/* 7 */
+
+/***/ "../../node_modules/is-stream/index.js":
 /***/ (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.
- */
-
 
 
-/**
- * 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 isStream = stream =>
+	stream !== null &&
+	typeof stream === 'object' &&
+	typeof stream.pipe === 'function';
 
-var NODE_ENV = "none";
+isStream.writable = stream =>
+	isStream(stream) &&
+	stream.writable !== false &&
+	typeof stream._write === 'function' &&
+	typeof stream._writableState === 'object';
 
-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');
-    }
-  }
+isStream.readable = stream =>
+	isStream(stream) &&
+	stream.readable !== false &&
+	typeof stream._read === 'function' &&
+	typeof stream._readableState === 'object';
 
-  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';
-    }
+isStream.duplex = stream =>
+	isStream.writable(stream) &&
+	isStream.readable(stream);
 
-    error.framesToPop = 1; // we don't care about invariant's own frame
-    throw error;
-  }
-};
+isStream.transform = stream =>
+	isStream.duplex(stream) &&
+	typeof stream._transform === 'function' &&
+	typeof stream._transformState === 'object';
 
-module.exports = invariant;
+module.exports = isStream;
 
 
 /***/ }),
-/* 8 */,
-/* 9 */
-/***/ (function(module, exports) {
 
-module.exports = __webpack_require__(133);
+/***/ "../../node_modules/is-windows/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/***/ }),
-/* 10 */,
-/* 11 */
-/***/ (function(module, exports) {
+var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
+ * is-windows <https://github.com/jonschlinkert/is-windows>
+ *
+ * Copyright © 2015-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-// 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
+(function(factory) {
+  if (exports && typeof exports === 'object' && typeof module !== 'undefined') {
+    module.exports = factory();
+  } else if (true) {
+    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+  } else {}
+})(function() {
+  'use strict';
+  return function isWindows() {
+    return process && (process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE));
+  };
+});
 
 
 /***/ }),
-/* 12 */
+
+/***/ "../../node_modules/isexe/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var fs = __webpack_require__("fs")
+var core
+if (process.platform === 'win32' || global.TESTING_WINDOWS) {
+  core = __webpack_require__("../../node_modules/isexe/windows.js")
+} else {
+  core = __webpack_require__("../../node_modules/isexe/mode.js")
+}
 
+module.exports = isexe
+isexe.sync = sync
 
-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 isexe (path, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-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;
+  if (!cb) {
+    if (typeof Promise !== 'function') {
+      throw new TypeError('callback not provided')
     }
+
+    return new Promise(function (resolve, reject) {
+      isexe(path, options || {}, function (er, is) {
+        if (er) {
+          reject(er)
+        } else {
+          resolve(is)
+        }
+      })
+    })
   }
-  return a.length - b.length;
+
+  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 entries(obj) {
-  const entries = [];
-  if (obj) {
-    for (const key in obj) {
-      entries.push([key, obj[key]]);
+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
     }
   }
-  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);
-  }
+/***/ "../../node_modules/isexe/mode.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return pattern;
+module.exports = isexe
+isexe.sync = sync
+
+var fs = __webpack_require__("fs")
+
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, options))
+  })
 }
 
-function addSuffix(pattern, suffix) {
-  if (!pattern.endsWith(suffix)) {
-    return pattern + suffix;
-  }
+function sync (path, options) {
+  return checkStat(fs.statSync(path), options)
+}
 
-  return pattern;
+function checkStat (stat, options) {
+  return stat.isFile() && checkMode(stat, options)
 }
 
-function hyphenate(str) {
-  return str.replace(/[A-Z]/g, match => {
-    return '-' + match.charAt(0).toLowerCase();
-  });
+function checkMode (stat, options) {
+  var mod = stat.mode
+  var uid = stat.uid
+  var gid = stat.gid
+
+  var myUid = options.uid !== undefined ?
+    options.uid : process.getuid && process.getuid()
+  var myGid = options.gid !== undefined ?
+    options.gid : process.getgid && process.getgid()
+
+  var u = parseInt('100', 8)
+  var g = parseInt('010', 8)
+  var o = parseInt('001', 8)
+  var ug = u | g
+
+  var ret = (mod & o) ||
+    (mod & g) && gid === myGid ||
+    (mod & u) && uid === myUid ||
+    (mod & ug) && myUid === 0
+
+  return ret
 }
 
-function camelCase(str) {
-  if (/[A-Z]/.test(str)) {
-    return null;
-  } else {
-    return _camelCase(str);
+
+/***/ }),
+
+/***/ "../../node_modules/isexe/windows.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = isexe
+isexe.sync = sync
+
+var fs = __webpack_require__("fs")
+
+function checkPathExt (path, options) {
+  var pathext = options.pathExt !== undefined ?
+    options.pathExt : process.env.PATHEXT
+
+  if (!pathext) {
+    return true
   }
-}
 
-function compareSortedArrays(array1, array2) {
-  if (array1.length !== array2.length) {
-    return false;
+  pathext = pathext.split(';')
+  if (pathext.indexOf('') !== -1) {
+    return true
   }
-  for (let i = 0, len = array1.length; i < len; i++) {
-    if (array1[i] !== array2[i]) {
-      return false;
+  for (var i = 0; i < pathext.length; i++) {
+    var p = pathext[i].toLowerCase()
+    if (p && path.substr(-p.length).toLowerCase() === p) {
+      return true
     }
   }
-  return true;
+  return false
 }
 
-function sleep(ms) {
-  return new Promise(resolve => {
-    setTimeout(resolve, ms);
-  });
+function checkStat (stat, path, options) {
+  if (!stat.isSymbolicLink() && !stat.isFile()) {
+    return false
+  }
+  return checkPathExt(path, options)
+}
+
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, path, options))
+  })
+}
+
+function sync (path, options) {
+  return checkStat(fs.statSync(path), path, options)
 }
 
+
 /***/ }),
-/* 13 */
+
+/***/ "../../node_modules/isobject/index.js":
 /***/ (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';
+"use strict";
+/*!
+ * isobject <https://github.com/jonschlinkert/isobject>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-var $exports = module.exports = function (name) {
-  return store[name] || (store[name] =
-    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
+
+
+module.exports = function isObject(val) {
+  return val != null && typeof val === 'object' && Array.isArray(val) === false;
 };
 
-$exports.store = store;
+
+/***/ }),
+
+/***/ "../../node_modules/json-parse-better-errors/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = parseJson
+function parseJson (txt, reviver, context) {
+  context = context || 20
+  try {
+    return JSON.parse(txt, reviver)
+  } catch (e) {
+    if (typeof txt !== 'string') {
+      const isEmptyArray = Array.isArray(txt) && txt.length === 0
+      const errorMessage = 'Cannot parse ' +
+      (isEmptyArray ? 'an empty array' : String(txt))
+      throw new TypeError(errorMessage)
+    }
+    const syntaxErr = e.message.match(/^Unexpected token.*position\s+(\d+)/i)
+    const errIdx = syntaxErr
+    ? +syntaxErr[1]
+    : e.message.match(/^Unexpected end of JSON.*/i)
+    ? txt.length - 1
+    : null
+    if (errIdx != null) {
+      const start = errIdx <= context
+      ? 0
+      : errIdx - context
+      const end = errIdx + context >= txt.length
+      ? txt.length
+      : errIdx + context
+      e.message += ` while parsing near '${
+        start === 0 ? '' : '...'
+      }${txt.slice(start, end)}${
+        end === txt.length ? '' : '...'
+      }'`
+    } else {
+      e.message += ` while parsing '${txt.slice(0, context * 2)}'`
+    }
+    throw e
+  }
+}
 
 
 /***/ }),
-/* 14 */
+
+/***/ "../../node_modules/junk/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.stringify = exports.parse = undefined;
+const blacklist = [
+	// # All
+	'^npm-debug\\.log$', // Error log for npm
+	'^\\..*\\.swp$', // Swap file for vim state
 
-var _asyncToGenerator2;
+	// # macOS
+	'^\\.DS_Store$', // Stores custom folder attributes
+	'^\\.AppleDouble$', // Stores additional file resources
+	'^\\.LSOverride$', // Contains the absolute path to the app to be used
+	'^Icon\\r$', // Custom Finder icon: http://superuser.com/questions/298785/icon-file-on-os-x-desktop
+	'^\\._.*', // Thumbnail
+	'^\\.Spotlight-V100(?:$|\\/)', // Directory that might appear on external disk
+	'\\.Trashes', // File that might appear on external disk
+	'^__MACOSX$', // Resource fork
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+	// # Linux
+	'~$', // Backup file
 
-var _parse;
+	// # Windows
+	'^Thumbs\\.db$', // Image file cache
+	'^ehthumbs\\.db$', // Folder config file
+	'^Desktop\\.ini$', // Stores custom folder attributes
+	'@eaDir$' // Synology Diskstation "hidden" folder where the server stores thumbnails
+];
 
-function _load_parse() {
-  return _parse = __webpack_require__(81);
-}
+exports.re = () => {
+	throw new Error('`junk.re` was renamed to `junk.regex`');
+};
 
-Object.defineProperty(exports, 'parse', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_parse || _load_parse()).default;
-  }
-});
+exports.regex = new RegExp(blacklist.join('|'));
 
-var _stringify;
+exports.is = filename => exports.regex.test(filename);
 
-function _load_stringify() {
-  return _stringify = __webpack_require__(150);
-}
+exports.not = filename => !exports.is(filename);
 
-Object.defineProperty(exports, 'stringify', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_stringify || _load_stringify()).default;
-  }
-});
-exports.implodeEntry = implodeEntry;
-exports.explodeEntry = explodeEntry;
+// TODO: Remove this for the next major release
+exports.default = module.exports;
 
-var _misc;
 
-function _load_misc() {
-  return _misc = __webpack_require__(12);
-}
+/***/ }),
 
-var _normalizePattern;
+/***/ "../../node_modules/kind-of/index.js":
+/***/ (function(module, exports) {
 
-function _load_normalizePattern() {
-  return _normalizePattern = __webpack_require__(29);
-}
+var toString = Object.prototype.toString;
 
-var _parse2;
+module.exports = function kindOf(val) {
+  if (val === void 0) return 'undefined';
+  if (val === null) return 'null';
 
-function _load_parse2() {
-  return _parse2 = _interopRequireDefault(__webpack_require__(81));
-}
+  var type = typeof val;
+  if (type === 'boolean') return 'boolean';
+  if (type === 'string') return 'string';
+  if (type === 'number') return 'number';
+  if (type === 'symbol') return 'symbol';
+  if (type === 'function') {
+    return isGeneratorFn(val) ? 'generatorfunction' : 'function';
+  }
 
-var _constants;
+  if (isArray(val)) return 'array';
+  if (isBuffer(val)) return 'buffer';
+  if (isArguments(val)) return 'arguments';
+  if (isDate(val)) return 'date';
+  if (isError(val)) return 'error';
+  if (isRegexp(val)) return 'regexp';
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
+  switch (ctorName(val)) {
+    case 'Symbol': return 'symbol';
+    case 'Promise': return 'promise';
 
-var _fs;
+    // Set, Map, WeakSet, WeakMap
+    case 'WeakMap': return 'weakmap';
+    case 'WeakSet': return 'weakset';
+    case 'Map': return 'map';
+    case 'Set': return 'set';
 
-function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(5));
-}
+    // 8-bit typed arrays
+    case 'Int8Array': return 'int8array';
+    case 'Uint8Array': return 'uint8array';
+    case 'Uint8ClampedArray': return 'uint8clampedarray';
 
-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; } }
+    // 16-bit typed arrays
+    case 'Int16Array': return 'int16array';
+    case 'Uint16Array': return 'uint16array';
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+    // 32-bit typed arrays
+    case 'Int32Array': return 'int32array';
+    case 'Uint32Array': return 'uint32array';
+    case 'Float32Array': return 'float32array';
+    case 'Float64Array': return 'float64array';
+  }
 
-const invariant = __webpack_require__(7);
+  if (isGeneratorObj(val)) {
+    return 'generator';
+  }
+
+  // Non-plain objects
+  type = toString.call(val);
+  switch (type) {
+    case '[object Object]': return 'object';
+    // iterators
+    case '[object Map Iterator]': return 'mapiterator';
+    case '[object Set Iterator]': return 'setiterator';
+    case '[object String Iterator]': return 'stringiterator';
+    case '[object Array Iterator]': return 'arrayiterator';
+  }
 
-const path = __webpack_require__(0);
-const ssri = __webpack_require__(55);
+  // other
+  return type.slice(8, -1).toLowerCase().replace(/\s/g, '');
+};
 
-function getName(pattern) {
-  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
+function ctorName(val) {
+  return typeof val.constructor === 'function' ? val.constructor.name : null;
 }
 
-function blankObjectUndefined(obj) {
-  return obj && Object.keys(obj).length ? obj : undefined;
+function isArray(val) {
+  if (Array.isArray) return Array.isArray(val);
+  return val instanceof Array;
 }
 
-function keyForRemote(remote) {
-  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+function isError(val) {
+  return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number');
 }
 
-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(' ');
+function isDate(val) {
+  if (val instanceof Date) return true;
+  return typeof val.toDateString === 'function'
+    && typeof val.getDate === 'function'
+    && typeof val.setDate === 'function';
 }
 
-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;
+function isRegexp(val) {
+  if (val instanceof RegExp) return true;
+  return typeof val.flags === 'string'
+    && typeof val.ignoreCase === 'boolean'
+    && typeof val.multiline === 'boolean'
+    && typeof val.global === 'boolean';
 }
 
-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;
+function isGeneratorFn(name, val) {
+  return ctorName(name) === 'GeneratorFunction';
 }
 
-class Lockfile {
-  constructor({ cache, source, parseResultType } = {}) {
-    this.source = source || '';
-    this.cache = cache;
-    this.parseResultType = parseResultType;
-  }
-
-  // source string if the `cache` was parsed
-
+function isGeneratorObj(val) {
+  return typeof val.throw === 'function'
+    && typeof val.return === 'function'
+    && typeof val.next === 'function';
+}
 
-  // if true, we're parsing an old yarn file and need to update integrity fields
-  hasEntriesExistWithoutIntegrity() {
-    if (!this.cache) {
-      return false;
+function isArguments(val) {
+  try {
+    if (typeof val.length === 'number' && typeof val.callee === 'function') {
+      return true;
     }
-
-    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;
-      }
+  } catch (err) {
+    if (err.message.indexOf('callee') !== -1) {
+      return true;
     }
-
-    return false;
   }
+  return false;
+}
 
-  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);
-
-      let lockfile;
-      let rawLockfile = '';
-      let parseResult;
+/**
+ * If you need to support Safari 5-7 (8-10 yr-old browser),
+ * take a look at https://github.com/feross/is-buffer
+ */
 
-      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
-        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
-        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
+function isBuffer(val) {
+  if (val.constructor && typeof val.constructor.isBuffer === 'function') {
+    return val.constructor.isBuffer(val);
+  }
+  return false;
+}
 
-        if (reporter) {
-          if (parseResult.type === 'merge') {
-            reporter.info(reporter.lang('lockfileMerged'));
-          } else if (parseResult.type === 'conflict') {
-            reporter.warn(reporter.lang('lockfileConflict'));
-          }
-        }
 
-        lockfile = parseResult.object;
-      } else if (reporter) {
-        reporter.info(reporter.lang('noLockfileFound'));
-      }
+/***/ }),
 
-      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
-    })();
-  }
+/***/ "../../node_modules/lines-and-columns/dist/index.mjs":
+/***/ (function(__webpack_module__, __webpack_exports__, __webpack_require__) {
 
-  getLocked(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return undefined;
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+var LF = '\n';
+var CR = '\r';
+var LinesAndColumns = (function () {
+    function LinesAndColumns(string) {
+        this.string = string;
+        var offsets = [0];
+        for (var offset = 0; offset < string.length;) {
+            switch (string[offset]) {
+                case LF:
+                    offset += LF.length;
+                    offsets.push(offset);
+                    break;
+                case CR:
+                    offset += CR.length;
+                    if (string[offset] === LF) {
+                        offset += LF.length;
+                    }
+                    offsets.push(offset);
+                    break;
+                default:
+                    offset++;
+                    break;
+            }
+        }
+        this.offsets = offsets;
     }
+    LinesAndColumns.prototype.locationForIndex = function (index) {
+        if (index < 0 || index > this.string.length) {
+            return null;
+        }
+        var line = 0;
+        var offsets = this.offsets;
+        while (offsets[line + 1] <= index) {
+            line++;
+        }
+        var column = index - offsets[line];
+        return { line: line, column: column };
+    };
+    LinesAndColumns.prototype.indexForLocation = function (location) {
+        var line = location.line, column = location.column;
+        if (line < 0 || line >= this.offsets.length) {
+            return null;
+        }
+        if (column < 0 || column > this.lengthOfLine(line)) {
+            return null;
+        }
+        return this.offsets[line] + column;
+    };
+    LinesAndColumns.prototype.lengthOfLine = function (line) {
+        var offset = this.offsets[line];
+        var nextOffset = line === this.offsets.length - 1 ? this.string.length : this.offsets[line + 1];
+        return nextOffset - offset;
+    };
+    return LinesAndColumns;
+}());
+/* harmony default export */ __webpack_exports__["default"] = (LinesAndColumns);
 
-    const shrunk = pattern in cache && cache[pattern];
 
-    if (typeof shrunk === 'string') {
-      return this.getLocked(shrunk);
-    } else if (shrunk) {
-      explodeEntry(pattern, shrunk);
-      return shrunk;
-    }
+/***/ }),
 
-    return undefined;
-  }
+/***/ "../../node_modules/load-json-file/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  removePattern(pattern) {
-    const cache = this.cache;
-    if (!cache) {
-      return;
-    }
-    delete cache[pattern];
-  }
+"use strict";
 
-  getLockfile(patterns) {
-    const lockfile = {};
-    const seen = new Map();
+const path = __webpack_require__("path");
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const stripBom = __webpack_require__("../../node_modules/strip-bom/index.js");
+const parseJson = __webpack_require__("../../node_modules/parse-json/index.js");
 
-    // 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);
+const parse = (data, filePath, options = {}) => {
+	data = stripBom(data);
 
-    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-      var _ref;
+	if (typeof options.beforeParse === 'function') {
+		data = options.beforeParse(data);
+	}
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
+	return parseJson(data, options.reviver, path.relative(process.cwd(), filePath));
+};
 
-      const pattern = _ref;
+module.exports = async (filePath, options) => parse(await promisify(fs.readFile)(filePath, 'utf8'), filePath, options);
+module.exports.sync = (filePath, options) => parse(fs.readFileSync(filePath, 'utf8'), filePath, options);
 
-      const pkg = patterns[pattern];
-      const remote = pkg._remote,
-            ref = pkg._reference;
 
-      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;
+/***/ "../../node_modules/make-dir/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        // 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
-      });
+"use strict";
 
-      lockfile[pattern] = obj;
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const {promisify} = __webpack_require__("util");
+const semver = __webpack_require__("../../node_modules/make-dir/node_modules/semver/semver.js");
 
-      if (remoteKey) {
-        seen.set(remoteKey, obj);
-      }
-    }
+const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
 
-    return lockfile;
-  }
-}
-exports.default = Lockfile;
+// 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, ''));
 
-/***/ }),
-/* 15 */,
-/* 16 */,
-/* 17 */
-/***/ (function(module, exports) {
+		if (pathHasInvalidWinCharacters) {
+			const error = new Error(`Path contains invalid characters: ${pth}`);
+			error.code = 'EINVAL';
+			throw error;
+		}
+	}
+};
 
-module.exports = __webpack_require__(173);
+const processOptions = options => {
+	// https://github.com/sindresorhus/make-dir/issues/18
+	const defaults = {
+		mode: 0o777,
+		fs
+	};
 
-/***/ }),
-/* 18 */,
-/* 19 */,
-/* 20 */
-/***/ (function(module, exports, __webpack_require__) {
+	return {
+		...defaults,
+		...options
+	};
+};
 
-"use strict";
+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;
+};
 
+const makeDir = async (input, options) => {
+	checkPath(input);
+	options = processOptions(options);
 
-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;
+	const mkdir = promisify(options.fs.mkdir);
+	const stat = promisify(options.fs.stat);
 
-      if (_isArray) {
-        if (_i >= _iterator.length) break;
-        _ref = _iterator[_i++];
-      } else {
-        _i = _iterator.next();
-        if (_i.done) break;
-        _ref = _i.value;
-      }
+	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
+		const pth = path.resolve(input);
 
-      const item = _ref;
+		await mkdir(pth, {
+			mode: options.mode,
+			recursive: true
+		});
 
-      nullify(item);
-    }
-  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
-    Object.setPrototypeOf(obj, null);
+		return pth;
+	}
 
-    // for..in can only be applied to 'object', not 'function'
-    if (typeof obj === 'object') {
-      for (const key in obj) {
-        nullify(obj[key]);
-      }
-    }
-  }
+	const make = async pth => {
+		try {
+			await mkdir(pth, options.mode);
 
-  return obj;
-}
+			return pth;
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
+			}
 
-/***/ }),
-/* 21 */,
-/* 22 */
-/***/ (function(module, exports) {
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
 
-module.exports = __webpack_require__(162);
+				if (error.message.includes('null bytes')) {
+					throw error;
+				}
 
-/***/ }),
-/* 23 */
-/***/ (function(module, exports) {
+				await make(path.dirname(pth));
 
-var core = module.exports = { version: '2.5.7' };
-if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
+				return make(pth);
+			}
 
+			try {
+				const stats = await stat(pth);
+				if (!stats.isDirectory()) {
+					throw new Error('The path is not a directory');
+				}
+			} catch (_) {
+				throw error;
+			}
 
-/***/ }),
-/* 24 */,
-/* 25 */,
-/* 26 */,
-/* 27 */
-/***/ (function(module, exports, __webpack_require__) {
+			return pth;
+		}
+	};
 
-var isObject = __webpack_require__(34);
-module.exports = function (it) {
-  if (!isObject(it)) throw TypeError(it + ' is not an object!');
-  return it;
+	return make(path.resolve(input));
 };
 
+module.exports = makeDir;
 
-/***/ }),
-/* 28 */,
-/* 29 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
+module.exports.sync = (input, options) => {
+	checkPath(input);
+	options = processOptions(options);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.normalizePattern = normalizePattern;
+	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
+		const pth = path.resolve(input);
 
-/**
- * Explode and normalize a pattern into its name and range.
- */
+		fs.mkdirSync(pth, {
+			mode: options.mode,
+			recursive: true
+		});
 
-function normalizePattern(pattern) {
-  let hasVersion = false;
-  let range = 'latest';
-  let name = pattern;
+		return pth;
+	}
 
-  // 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 make = pth => {
+		try {
+			options.fs.mkdirSync(pth, options.mode);
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
+			}
 
-  // take first part as the name
-  const parts = name.split('@');
-  if (parts.length > 1) {
-    name = parts.shift();
-    range = parts.join('@');
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
 
-    if (range) {
-      hasVersion = true;
-    } else {
-      range = '*';
-    }
-  }
+				if (error.message.includes('null bytes')) {
+					throw error;
+				}
 
-  // add back @ scope suffix
-  if (isScoped) {
-    name = `@${name}`;
-  }
+				make(path.dirname(pth));
+				return make(pth);
+			}
 
-  return { name, range, hasVersion };
-}
+			try {
+				if (!options.fs.statSync(pth).isDirectory()) {
+					throw new Error('The path is not a directory');
+				}
+			} catch (_) {
+				throw error;
+			}
+		}
 
-/***/ }),
-/* 30 */,
-/* 31 */
-/***/ (function(module, exports, __webpack_require__) {
+		return pth;
+	};
 
-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 make(path.resolve(input));
 };
 
 
 /***/ }),
-/* 32 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/* eslint-disable node/no-deprecated-api */
-var buffer = __webpack_require__(63)
-var Buffer = buffer.Buffer
+/***/ "../../node_modules/make-dir/node_modules/semver/semver.js":
+/***/ (function(module, exports) {
 
-// alternative to using Object.keys for old browsers
-function copyProps (src, dst) {
-  for (var key in src) {
-    dst[key] = src[key]
+exports = module.exports = SemVer
+
+var debug
+/* istanbul ignore next */
+if (typeof process === 'object' &&
+    process.env &&
+    process.env.NODE_DEBUG &&
+    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
+  debug = function () {
+    var args = Array.prototype.slice.call(arguments, 0)
+    args.unshift('SEMVER')
+    console.log.apply(console, args)
   }
-}
-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)
+  debug = function () {}
 }
 
-// Copy static methods from Buffer
-copyProps(Buffer, SafeBuffer)
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+exports.SEMVER_SPEC_VERSION = '2.0.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 MAX_LENGTH = 256
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+  /* istanbul ignore next */ 9007199254740991
 
-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
-}
+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16
 
-SafeBuffer.allocUnsafe = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return Buffer(size)
-}
+// The actual regexps go on exports.re
+var re = exports.re = []
+var src = exports.src = []
+var t = exports.tokens = {}
+var R = 0
 
-SafeBuffer.allocUnsafeSlow = function (size) {
-  if (typeof size !== 'number') {
-    throw new TypeError('Argument must be a number')
-  }
-  return buffer.SlowBuffer(size)
+function tok (n) {
+  t[n] = R++
 }
 
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
-/***/ }),
-/* 33 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Thank's IE8 for his funny defineProperty
-module.exports = !__webpack_require__(85)(function () {
-  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
-});
-
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-/***/ }),
-/* 34 */
-/***/ (function(module, exports) {
+tok('NUMERICIDENTIFIER')
+src[t.NUMERICIDENTIFIER] = '0|[1-9]\\d*'
+tok('NUMERICIDENTIFIERLOOSE')
+src[t.NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
-module.exports = function (it) {
-  return typeof it === 'object' ? it !== null : typeof it === 'function';
-};
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
+tok('NONNUMERICIDENTIFIER')
+src[t.NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports) {
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
-module.exports = {};
+tok('MAINVERSION')
+src[t.MAINVERSION] = '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[t.NUMERICIDENTIFIER] + ')'
 
+tok('MAINVERSIONLOOSE')
+src[t.MAINVERSIONLOOSE] = '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')'
 
-/***/ }),
-/* 36 */
-/***/ (function(module, exports) {
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
-module.exports = __webpack_require__(122);
+tok('PRERELEASEIDENTIFIER')
+src[t.PRERELEASEIDENTIFIER] = '(?:' + src[t.NUMERICIDENTIFIER] +
+                            '|' + src[t.NONNUMERICIDENTIFIER] + ')'
 
-/***/ }),
-/* 37 */,
-/* 38 */,
-/* 39 */,
-/* 40 */
-/***/ (function(module, exports, __webpack_require__) {
+tok('PRERELEASEIDENTIFIERLOOSE')
+src[t.PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[t.NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[t.NONNUMERICIDENTIFIER] + ')'
 
-"use strict";
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
+tok('PRERELEASE')
+src[t.PRERELEASE] = '(?:-(' + src[t.PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[t.PRERELEASEIDENTIFIER] + ')*))'
 
-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);
-  });
-}
+tok('PRERELEASELOOSE')
+src[t.PRERELEASELOOSE] = '(?:-?(' + src[t.PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[t.PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-function promisify(fn, firstData) {
-  return function (...args) {
-    return new Promise(function (resolve, reject) {
-      args.push(function (err, ...result) {
-        let res = result;
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-        if (result.length <= 1) {
-          res = result[0];
-        }
+tok('BUILDIDENTIFIER')
+src[t.BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-        if (firstData) {
-          res = err;
-          err = null;
-        }
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
-        }
-      });
+tok('BUILD')
+src[t.BUILD] = '(?:\\+(' + src[t.BUILDIDENTIFIER] +
+             '(?:\\.' + src[t.BUILDIDENTIFIER] + ')*))'
 
-      fn.apply(null, args);
-    });
-  };
-}
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
 
-function queue(arr, promiseProducer, concurrency = Infinity) {
-  concurrency = Math.min(concurrency, arr.length);
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups.  The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
 
-  // clone
-  arr = arr.slice();
+tok('FULL')
+tok('FULLPLAIN')
+src[t.FULLPLAIN] = 'v?' + src[t.MAINVERSION] +
+                  src[t.PRERELEASE] + '?' +
+                  src[t.BUILD] + '?'
 
-  const results = [];
-  let total = arr.length;
-  if (!total) {
-    return Promise.resolve(results);
-  }
+src[t.FULL] = '^' + src[t.FULLPLAIN] + '$'
 
-  return new Promise((resolve, reject) => {
-    for (let i = 0; i < concurrency; i++) {
-      next();
-    }
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+tok('LOOSEPLAIN')
+src[t.LOOSEPLAIN] = '[v=\\s]*' + src[t.MAINVERSIONLOOSE] +
+                  src[t.PRERELEASELOOSE] + '?' +
+                  src[t.BUILD] + '?'
 
-    function next() {
-      const item = arr.shift();
-      const promise = promiseProducer(item);
+tok('LOOSE')
+src[t.LOOSE] = '^' + src[t.LOOSEPLAIN] + '$'
 
-      promise.then(function (result) {
-        results.push(result);
+tok('GTLT')
+src[t.GTLT] = '((?:<|>)?=?)'
 
-        total--;
-        if (total === 0) {
-          resolve(results);
-        } else {
-          if (arr.length) {
-            next();
-          }
-        }
-      }, reject);
-    }
-  });
-}
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+tok('XRANGEIDENTIFIERLOOSE')
+src[t.XRANGEIDENTIFIERLOOSE] = src[t.NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
+tok('XRANGEIDENTIFIER')
+src[t.XRANGEIDENTIFIER] = src[t.NUMERICIDENTIFIER] + '|x|X|\\*'
 
-/***/ }),
-/* 41 */
-/***/ (function(module, exports, __webpack_require__) {
+tok('XRANGEPLAIN')
+src[t.XRANGEPLAIN] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[t.PRERELEASE] + ')?' +
+                   src[t.BUILD] + '?' +
+                   ')?)?'
 
-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';
+tok('XRANGEPLAINLOOSE')
+src[t.XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[t.PRERELEASELOOSE] + ')?' +
+                        src[t.BUILD] + '?' +
+                        ')?)?'
 
-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;
+tok('XRANGE')
+src[t.XRANGE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAIN] + '$'
+tok('XRANGELOOSE')
+src[t.XRANGELOOSE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAINLOOSE] + '$'
 
+// Coercion.
+// Extract anything that could conceivably be a part of a valid semver
+tok('COERCE')
+src[t.COERCE] = '(^|[^\\d])' +
+              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:$|[^\\d])'
+tok('COERCERTL')
+re[t.COERCERTL] = new RegExp(src[t.COERCE], 'g')
 
-/***/ }),
-/* 42 */
-/***/ (function(module, exports, __webpack_require__) {
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+tok('LONETILDE')
+src[t.LONETILDE] = '(?:~>?)'
 
-try {
-  var util = __webpack_require__(2);
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  module.exports = __webpack_require__(224);
-}
+tok('TILDETRIM')
+src[t.TILDETRIM] = '(\\s*)' + src[t.LONETILDE] + '\\s+'
+re[t.TILDETRIM] = new RegExp(src[t.TILDETRIM], 'g')
+var tildeTrimReplace = '$1~'
 
+tok('TILDE')
+src[t.TILDE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAIN] + '$'
+tok('TILDELOOSE')
+src[t.TILDELOOSE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAINLOOSE] + '$'
 
-/***/ }),
-/* 43 */,
-/* 44 */,
-/* 45 */
-/***/ (function(module, exports, __webpack_require__) {
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+tok('LONECARET')
+src[t.LONECARET] = '(?:\\^)'
 
-"use strict";
+tok('CARETTRIM')
+src[t.CARETTRIM] = '(\\s*)' + src[t.LONECARET] + '\\s+'
+re[t.CARETTRIM] = new RegExp(src[t.CARETTRIM], 'g')
+var caretTrimReplace = '$1^'
 
+tok('CARET')
+src[t.CARET] = '^' + src[t.LONECARET] + src[t.XRANGEPLAIN] + '$'
+tok('CARETLOOSE')
+src[t.CARETLOOSE] = '^' + src[t.LONECARET] + src[t.XRANGEPLAINLOOSE] + '$'
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.home = undefined;
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+tok('COMPARATORLOOSE')
+src[t.COMPARATORLOOSE] = '^' + src[t.GTLT] + '\\s*(' + src[t.LOOSEPLAIN] + ')$|^$'
+tok('COMPARATOR')
+src[t.COMPARATOR] = '^' + src[t.GTLT] + '\\s*(' + src[t.FULLPLAIN] + ')$|^$'
 
-var _rootUser;
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+tok('COMPARATORTRIM')
+src[t.COMPARATORTRIM] = '(\\s*)' + src[t.GTLT] +
+                      '\\s*(' + src[t.LOOSEPLAIN] + '|' + src[t.XRANGEPLAIN] + ')'
 
-function _load_rootUser() {
-  return _rootUser = _interopRequireDefault(__webpack_require__(169));
-}
+// this one has to use the /g flag
+re[t.COMPARATORTRIM] = new RegExp(src[t.COMPARATORTRIM], 'g')
+var comparatorTrimReplace = '$1$2$3'
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+tok('HYPHENRANGE')
+src[t.HYPHENRANGE] = '^\\s*(' + src[t.XRANGEPLAIN] + ')' +
+                   '\\s+-\\s+' +
+                   '(' + src[t.XRANGEPLAIN] + ')' +
+                   '\\s*$'
 
-const path = __webpack_require__(0);
+tok('HYPHENRANGELOOSE')
+src[t.HYPHENRANGELOOSE] = '^\\s*(' + src[t.XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[t.XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$'
 
-const home = exports.home = __webpack_require__(36).homedir();
+// Star ranges basically just allow anything at all.
+tok('STAR')
+src[t.STAR] = '(<|>)?=?\\s*\\*'
 
-const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
+// Compile to actual regexp objects.
+// All are flag-free, unless they were created above with a flag.
+for (var i = 0; i < R; i++) {
+  debug(i, src[i])
+  if (!re[i]) {
+    re[i] = new RegExp(src[i])
+  }
+}
 
-exports.default = userHomeDir;
+exports.parse = parse
+function parse (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-/***/ }),
-/* 46 */
-/***/ (function(module, exports) {
+  if (version instanceof SemVer) {
+    return version
+  }
 
-module.exports = function (it) {
-  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
-  return it;
-};
+  if (typeof version !== 'string') {
+    return null
+  }
 
+  if (version.length > MAX_LENGTH) {
+    return null
+  }
 
-/***/ }),
-/* 47 */
-/***/ (function(module, exports) {
+  var r = options.loose ? re[t.LOOSE] : re[t.FULL]
+  if (!r.test(version)) {
+    return null
+  }
 
-var toString = {}.toString;
+  try {
+    return new SemVer(version, options)
+  } catch (er) {
+    return null
+  }
+}
 
-module.exports = function (it) {
-  return toString.call(it).slice(8, -1);
-};
+exports.valid = valid
+function valid (version, options) {
+  var v = parse(version, options)
+  return v ? v.version : null
+}
 
+exports.clean = clean
+function clean (version, options) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
+  return s ? s.version : null
+}
 
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.SemVer = SemVer
 
-// 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);
-    };
+function SemVer (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
+  if (version instanceof SemVer) {
+    if (version.loose === options.loose) {
+      return version
+    } else {
+      version = version.version
+    }
+  } else if (typeof version !== 'string') {
+    throw new TypeError('Invalid Version: ' + version)
   }
-  return function (/* ...args */) {
-    return fn.apply(that, arguments);
-  };
-};
 
+  if (version.length > MAX_LENGTH) {
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  }
 
-/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
+  if (!(this instanceof SemVer)) {
+    return new SemVer(version, options)
+  }
 
-var hasOwnProperty = {}.hasOwnProperty;
-module.exports = function (it, key) {
-  return hasOwnProperty.call(it, key);
-};
+  debug('SemVer', version, options)
+  this.options = options
+  this.loose = !!options.loose
 
+  var m = version.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL])
 
-/***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!m) {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-var anObject = __webpack_require__(27);
-var IE8_DOM_DEFINE = __webpack_require__(184);
-var toPrimitive = __webpack_require__(201);
-var dP = Object.defineProperty;
+  this.raw = version
 
-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;
-};
+  // these are actually numbers
+  this.major = +m[1]
+  this.minor = +m[2]
+  this.patch = +m[3]
 
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
+    throw new TypeError('Invalid major version')
+  }
 
-/***/ }),
-/* 51 */,
-/* 52 */,
-/* 53 */,
-/* 54 */
-/***/ (function(module, exports) {
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+    throw new TypeError('Invalid minor version')
+  }
 
-module.exports = __webpack_require__(164);
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+    throw new TypeError('Invalid patch version')
+  }
 
-/***/ }),
-/* 55 */
-/***/ (function(module, exports, __webpack_require__) {
+  // numberify any prerelease numeric ids
+  if (!m[4]) {
+    this.prerelease = []
+  } else {
+    this.prerelease = m[4].split('.').map(function (id) {
+      if (/^[0-9]+$/.test(id)) {
+        var num = +id
+        if (num >= 0 && num < MAX_SAFE_INTEGER) {
+          return num
+        }
+      }
+      return id
+    })
+  }
 
-"use strict";
+  this.build = m[5] ? m[5].split('.') : []
+  this.format()
+}
 
+SemVer.prototype.format = function () {
+  this.version = this.major + '.' + this.minor + '.' + this.patch
+  if (this.prerelease.length) {
+    this.version += '-' + this.prerelease.join('.')
+  }
+  return this.version
+}
 
-const Buffer = __webpack_require__(32).Buffer
+SemVer.prototype.toString = function () {
+  return this.version
+}
 
-const crypto = __webpack_require__(9)
-const Transform = __webpack_require__(17).Transform
+SemVer.prototype.compare = function (other) {
+  debug('SemVer.compare', this.version, this.options, other)
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
+  return this.compareMain(other) || this.comparePre(other)
+}
 
-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]+$/
+SemVer.prototype.compareMain = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, 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]
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch)
+}
 
-    const rawOpts = match[3]
-    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
-  }
-  hexDigest () {
-    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
+SemVer.prototype.comparePre = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
   }
-  toJSON () {
-    return this.toString()
+
+  // NOT having a prerelease is > having one
+  if (this.prerelease.length && !other.prerelease.length) {
+    return -1
+  } else if (!this.prerelease.length && other.prerelease.length) {
+    return 1
+  } else if (!this.prerelease.length && !other.prerelease.length) {
+    return 0
   }
-  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 ''
-      }
+
+  var i = 0
+  do {
+    var a = this.prerelease[i]
+    var b = other.prerelease[i]
+    debug('prerelease compare', i, a, b)
+    if (a === undefined && b === undefined) {
+      return 0
+    } else if (b === undefined) {
+      return 1
+    } else if (a === undefined) {
+      return -1
+    } else if (a === b) {
+      continue
+    } else {
+      return compareIdentifiers(a, b)
     }
-    const options = this.options && this.options.length
-    ? `?${this.options.join('?')}`
-    : ''
-    return `${this.algorithm}-${this.digest}${options}`
-  }
+  } while (++i)
 }
 
-class Integrity {
-  get isIntegrity () { return true }
-  toJSON () {
-    return this.toString()
+SemVer.prototype.compareBuild = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
   }
-  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, ' ')
+
+  var i = 0
+  do {
+    var a = this.build[i]
+    var b = other.build[i]
+    debug('prerelease compare', i, a, b)
+    if (a === undefined && b === undefined) {
+      return 0
+    } else if (b === undefined) {
+      return 1
+    } else if (a === undefined) {
+      return -1
+    } else if (a === b) {
+      continue
+    } else {
+      return compareIdentifiers(a, b)
     }
-    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()
+  } while (++i)
+}
+
+// preminor will bump the version up to the next minor release, and immediately
+// down to pre-release. premajor and prepatch work the same way.
+SemVer.prototype.inc = function (release, identifier) {
+  switch (release) {
+    case 'premajor':
+      this.prerelease.length = 0
+      this.patch = 0
+      this.minor = 0
+      this.major++
+      this.inc('pre', identifier)
+      break
+    case 'preminor':
+      this.prerelease.length = 0
+      this.patch = 0
+      this.minor++
+      this.inc('pre', identifier)
+      break
+    case 'prepatch':
+      // If this is already a prerelease, it will bump to the next version
+      // drop any prereleases that might already exist, since they are not
+      // relevant at this point.
+      this.prerelease.length = 0
+      this.inc('patch', identifier)
+      this.inc('pre', identifier)
+      break
+    // If the input is a non-prerelease version, this acts the same as
+    // prepatch.
+    case 'prerelease':
+      if (this.prerelease.length === 0) {
+        this.inc('patch', identifier)
+      }
+      this.inc('pre', identifier)
+      break
+
+    case 'major':
+      // If this is a pre-major version, bump up to the same major version.
+      // Otherwise increment major.
+      // 1.0.0-5 bumps to 1.0.0
+      // 1.1.0 bumps to 2.0.0
+      if (this.minor !== 0 ||
+          this.patch !== 0 ||
+          this.prerelease.length === 0) {
+        this.major++
+      }
+      this.minor = 0
+      this.patch = 0
+      this.prerelease = []
+      break
+    case 'minor':
+      // If this is a pre-minor version, bump up to the same minor version.
+      // Otherwise increment minor.
+      // 1.2.0-5 bumps to 1.2.0
+      // 1.2.1 bumps to 1.3.0
+      if (this.patch !== 0 || this.prerelease.length === 0) {
+        this.minor++
+      }
+      this.patch = 0
+      this.prerelease = []
+      break
+    case 'patch':
+      // If this is not a pre-release version, it will increment the patch.
+      // If it is a pre-release it will bump up to the same patch version.
+      // 1.2.0-5 patches to 1.2.0
+      // 1.2.0 patches to 1.2.1
+      if (this.prerelease.length === 0) {
+        this.patch++
+      }
+      this.prerelease = []
+      break
+    // This probably shouldn't be used publicly.
+    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
+    case 'pre':
+      if (this.prerelease.length === 0) {
+        this.prerelease = [0]
+      } else {
+        var i = this.prerelease.length
+        while (--i >= 0) {
+          if (typeof this.prerelease[i] === 'number') {
+            this.prerelease[i]++
+            i = -2
+          }
+        }
+        if (i === -1) {
+          // didn't increment anything
+          this.prerelease.push(0)
+        }
+      }
+      if (identifier) {
+        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
+        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
+        if (this.prerelease[0] === identifier) {
+          if (isNaN(this.prerelease[1])) {
+            this.prerelease = [identifier, 0]
+          }
+        } else {
+          this.prerelease = [identifier, 0]
+        }
+      }
+      break
+
+    default:
+      throw new Error('invalid increment argument: ' + release)
   }
-  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
+  this.format()
+  this.raw = this.version
+  return this
+}
+
+exports.inc = inc
+function inc (version, release, loose, identifier) {
+  if (typeof (loose) === 'string') {
+    identifier = loose
+    loose = undefined
   }
-  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
-    })
+
+  try {
+    return new SemVer(version, loose).inc(release, identifier).version
+  } catch (er) {
+    return null
   }
 }
 
-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)
+exports.diff = diff
+function diff (version1, version2) {
+  if (eq(version1, version2)) {
+    return null
   } else {
-    return _parse(stringify(sri, opts), opts)
+    var v1 = parse(version1)
+    var v2 = parse(version2)
+    var prefix = ''
+    if (v1.prerelease.length || v2.prerelease.length) {
+      prefix = 'pre'
+      var defaultResult = 'prerelease'
+    }
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return prefix + key
+        }
+      }
+    }
+    return defaultResult // may be undefined
   }
 }
 
-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)
+exports.compareIdentifiers = compareIdentifiers
+
+var numeric = /^[0-9]+$/
+function compareIdentifiers (a, b) {
+  var anum = numeric.test(a)
+  var bnum = numeric.test(b)
+
+  if (anum && bnum) {
+    a = +a
+    b = +b
   }
-  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())
+
+  return a === b ? 0
+    : (anum && !bnum) ? -1
+    : (bnum && !anum) ? 1
+    : a < b ? -1
+    : 1
 }
 
-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)
-  }
+exports.rcompareIdentifiers = rcompareIdentifiers
+function rcompareIdentifiers (a, b) {
+  return compareIdentifiers(b, a)
 }
 
-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
-  )
+exports.major = major
+function major (a, loose) {
+  return new SemVer(a, loose).major
 }
 
-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())
+exports.minor = minor
+function minor (a, loose) {
+  return new SemVer(a, loose).minor
+}
+
+exports.patch = patch
+function patch (a, loose) {
+  return new SemVer(a, loose).patch
+}
+
+exports.compare = compare
+function compare (a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose))
+}
+
+exports.compareLoose = compareLoose
+function compareLoose (a, b) {
+  return compare(a, b, true)
 }
 
-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', () => {})
-  })
+exports.compareBuild = compareBuild
+function compareBuild (a, b, loose) {
+  var versionA = new SemVer(a, loose)
+  var versionB = new SemVer(b, loose)
+  return versionA.compare(versionB) || versionA.compareBuild(versionB)
 }
 
-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
-  }
+exports.rcompare = rcompare
+function rcompare (a, b, loose) {
+  return compare(b, a, loose)
 }
 
-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', () => {})
+exports.sort = sort
+function sort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.compareBuild(a, b, loose)
   })
 }
 
-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)
-    }
+exports.rsort = rsort
+function rsort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.compareBuild(b, a, loose)
   })
-  return stream
 }
 
-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)
+exports.gt = gt
+function gt (a, b, loose) {
+  return compare(a, b, loose) > 0
+}
 
-  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())
+exports.lt = lt
+function lt (a, b, loose) {
+  return compare(a, b, loose) < 0
+}
 
-      return integrity
-    }
-  }
+exports.eq = eq
+function eq (a, b, loose) {
+  return compare(a, b, loose) === 0
 }
 
-const NODE_HASHES = new Set(crypto.getHashes())
+exports.neq = neq
+function neq (a, b, loose) {
+  return compare(a, b, loose) !== 0
+}
 
-// 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))
+exports.gte = gte
+function gte (a, b, loose) {
+  return compare(a, b, loose) >= 0
+}
 
-function getPrioritizedHash (algo1, algo2) {
-  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
-  ? algo1
-  : algo2
+exports.lte = lte
+function lte (a, b, loose) {
+  return compare(a, b, loose) <= 0
 }
 
+exports.cmp = cmp
+function cmp (a, op, b, loose) {
+  switch (op) {
+    case '===':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a === b
 
-/***/ }),
-/* 56 */,
-/* 57 */,
-/* 58 */,
-/* 59 */,
-/* 60 */
-/***/ (function(module, exports, __webpack_require__) {
+    case '!==':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a !== b
 
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
+    case '':
+    case '=':
+    case '==':
+      return eq(a, b, loose)
 
-var path = { sep: '/' }
-try {
-  path = __webpack_require__(0)
-} catch (er) {}
+    case '!=':
+      return neq(a, b, loose)
 
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(175)
+    case '>':
+      return gt(a, b, loose)
 
-var plTypes = {
-  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
-  '?': { open: '(?:', close: ')?' },
-  '+': { open: '(?:', close: ')+' },
-  '*': { open: '(?:', close: ')*' },
-  '@': { open: '(?:', close: ')' }
+    case '>=':
+      return gte(a, b, loose)
+
+    case '<':
+      return lt(a, b, loose)
+
+    case '<=':
+      return lte(a, b, loose)
+
+    default:
+      throw new TypeError('Invalid operator: ' + op)
+  }
 }
 
-// any single thing other than /
-// don't need to escape / when using new RegExp()
-var qmark = '[^/]'
+exports.Comparator = Comparator
+function Comparator (comp, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-// * => any number of characters
-var star = qmark + '*?'
+  if (comp instanceof Comparator) {
+    if (comp.loose === !!options.loose) {
+      return comp
+    } else {
+      comp = comp.value
+    }
+  }
 
-// ** 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})($|\\\/)).)*?'
+  if (!(this instanceof Comparator)) {
+    return new Comparator(comp, options)
+  }
 
-// not a ^ or / followed by a dot,
-// followed by anything, any number of times.
-var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+  debug('comparator', comp, options)
+  this.options = options
+  this.loose = !!options.loose
+  this.parse(comp)
 
-// characters that need to be escaped in RegExp.
-var reSpecials = charSet('().*{}+?[]^$\\!')
+  if (this.semver === ANY) {
+    this.value = ''
+  } else {
+    this.value = this.operator + this.semver.version
+  }
 
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
+  debug('comp', this)
 }
 
-// normalizes slashes.
-var slashSplit = /\/+/
+var ANY = {}
+Comparator.prototype.parse = function (comp) {
+  var r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
+  var m = comp.match(r)
 
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
+  if (!m) {
+    throw new TypeError('Invalid comparator: ' + comp)
   }
-}
 
-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
+  this.operator = m[1] !== undefined ? m[1] : ''
+  if (this.operator === '=') {
+    this.operator = ''
+  }
+
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2]) {
+    this.semver = ANY
+  } else {
+    this.semver = new SemVer(m[2], this.options.loose)
+  }
 }
 
-minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return minimatch
+Comparator.prototype.toString = function () {
+  return this.value
+}
 
-  var orig = minimatch
+Comparator.prototype.test = function (version) {
+  debug('Comparator.test', version, this.options.loose)
 
-  var m = function minimatch (p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options))
+  if (this.semver === ANY || version === ANY) {
+    return true
   }
 
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
+  if (typeof version === 'string') {
+    try {
+      version = new SemVer(version, this.options)
+    } catch (er) {
+      return false
+    }
   }
 
-  return m
+  return cmp(version, this.operator, this.semver, this.options)
 }
 
-Minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return Minimatch
-  return minimatch.defaults(def).Minimatch
-}
+Comparator.prototype.intersects = function (comp, options) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required')
+  }
 
-function minimatch (p, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
   }
 
-  if (!options) options = {}
+  var rangeTmp
 
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
+  if (this.operator === '') {
+    if (this.value === '') {
+      return true
+    }
+    rangeTmp = new Range(comp.value, options)
+    return satisfies(this.value, rangeTmp, options)
+  } else if (comp.operator === '') {
+    if (comp.value === '') {
+      return true
+    }
+    rangeTmp = new Range(this.value, options)
+    return satisfies(comp.semver, rangeTmp, options)
   }
 
-  // "" only matches ""
-  if (pattern.trim() === '') return p === ''
+  var sameDirectionIncreasing =
+    (this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '>=' || comp.operator === '>')
+  var sameDirectionDecreasing =
+    (this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '<=' || comp.operator === '<')
+  var sameSemVer = this.semver.version === comp.semver.version
+  var differentDirectionsInclusive =
+    (this.operator === '>=' || this.operator === '<=') &&
+    (comp.operator === '>=' || comp.operator === '<=')
+  var oppositeDirectionsLessThan =
+    cmp(this.semver, '<', comp.semver, options) &&
+    ((this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '<=' || comp.operator === '<'))
+  var oppositeDirectionsGreaterThan =
+    cmp(this.semver, '>', comp.semver, options) &&
+    ((this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '>=' || comp.operator === '>'))
 
-  return new Minimatch(pattern, options).match(p)
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
 }
 
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
+exports.Range = Range
+function Range (range, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
   }
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
+  if (range instanceof Range) {
+    if (range.loose === !!options.loose &&
+        range.includePrerelease === !!options.includePrerelease) {
+      return range
+    } else {
+      return new Range(range.raw, options)
+    }
   }
 
-  if (!options) options = {}
-  pattern = pattern.trim()
+  if (range instanceof Comparator) {
+    return new Range(range.value, options)
+  }
 
-  // windows support: need to use /, not \
-  if (path.sep !== '/') {
-    pattern = pattern.split(path.sep).join('/')
+  if (!(this instanceof Range)) {
+    return new Range(range, options)
   }
 
   this.options = options
-  this.set = []
-  this.pattern = pattern
-  this.regexp = null
-  this.negate = false
-  this.comment = false
-  this.empty = false
+  this.loose = !!options.loose
+  this.includePrerelease = !!options.includePrerelease
 
-  // make the set of regexps etc.
-  this.make()
+  // First, split based on boolean or ||
+  this.raw = range
+  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
+    return this.parseRange(range.trim())
+  }, this).filter(function (c) {
+    // throw out any that are not relevant for whatever reason
+    return c.length
+  })
+
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range)
+  }
+
+  this.format()
 }
 
-Minimatch.prototype.debug = function () {}
+Range.prototype.format = function () {
+  this.range = this.set.map(function (comps) {
+    return comps.join(' ').trim()
+  }).join('||').trim()
+  return this.range
+}
 
-Minimatch.prototype.make = make
-function make () {
-  // don't do it more than once.
-  if (this._made) return
+Range.prototype.toString = function () {
+  return this.range
+}
 
-  var pattern = this.pattern
-  var options = this.options
+Range.prototype.parseRange = function (range) {
+  var loose = this.options.loose
+  range = range.trim()
+  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+  var hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE]
+  range = range.replace(hr, hyphenReplace)
+  debug('hyphen replace', range)
+  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+  range = range.replace(re[t.COMPARATORTRIM], comparatorTrimReplace)
+  debug('comparator trim', range, re[t.COMPARATORTRIM])
 
-  // empty patterns and comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    this.comment = true
-    return
-  }
-  if (!pattern) {
-    this.empty = true
-    return
-  }
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[t.TILDETRIM], tildeTrimReplace)
+
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[t.CARETTRIM], caretTrimReplace)
 
-  // step 1: figure out negation, etc.
-  this.parseNegate()
+  // normalize spaces
+  range = range.split(/\s+/).join(' ')
 
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
-  if (options.debug) this.debug = console.error
+  var compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
+  var set = range.split(' ').map(function (comp) {
+    return parseComparator(comp, this.options)
+  }, this).join(' ').split(/\s+/)
+  if (this.options.loose) {
+    // in loose mode, throw out any that are not valid comparators
+    set = set.filter(function (comp) {
+      return !!comp.match(compRe)
+    })
+  }
+  set = set.map(function (comp) {
+    return new Comparator(comp, this.options)
+  }, this)
 
-  this.debug(this.pattern, set)
+  return set
+}
 
-  // 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)
+Range.prototype.intersects = function (range, options) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required')
+  }
+
+  return this.set.some(function (thisComparators) {
+    return (
+      isSatisfiable(thisComparators, options) &&
+      range.set.some(function (rangeComparators) {
+        return (
+          isSatisfiable(rangeComparators, options) &&
+          thisComparators.every(function (thisComparator) {
+            return rangeComparators.every(function (rangeComparator) {
+              return thisComparator.intersects(rangeComparator, options)
+            })
+          })
+        )
+      })
+    )
   })
+}
 
-  this.debug(this.pattern, set)
+// take a set of comparators and determine whether there
+// exists a version which can satisfy it
+function isSatisfiable (comparators, options) {
+  var result = true
+  var remainingComparators = comparators.slice()
+  var testComparator = remainingComparators.pop()
 
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
+  while (result && remainingComparators.length) {
+    result = remainingComparators.every(function (otherComparator) {
+      return testComparator.intersects(otherComparator, options)
+    })
 
-  this.debug(this.pattern, set)
+    testComparator = remainingComparators.pop()
+  }
 
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
+  return result
+}
+
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators
+function toComparators (range, options) {
+  return new Range(range, options).set.map(function (comp) {
+    return comp.map(function (c) {
+      return c.value
+    }).join(' ').trim().split(' ')
   })
+}
 
-  this.debug(this.pattern, set)
+// comprised of xranges, tildes, stars, and gtlt's at this point.
+// already replaced the hyphen ranges
+// turn into a set of JUST comparators.
+function parseComparator (comp, options) {
+  debug('comp', comp, options)
+  comp = replaceCarets(comp, options)
+  debug('caret', comp)
+  comp = replaceTildes(comp, options)
+  debug('tildes', comp)
+  comp = replaceXRanges(comp, options)
+  debug('xrange', comp)
+  comp = replaceStars(comp, options)
+  debug('stars', comp)
+  return comp
+}
 
-  this.set = set
+function isX (id) {
+  return !id || id.toLowerCase() === 'x' || id === '*'
 }
 
-Minimatch.prototype.parseNegate = parseNegate
-function parseNegate () {
-  var pattern = this.pattern
-  var negate = false
-  var options = this.options
-  var negateOffset = 0
+// ~, ~> --> * (any, kinda silly)
+// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
+// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+function replaceTildes (comp, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceTilde(comp, options)
+  }).join(' ')
+}
 
-  if (options.nonegate) return
+function replaceTilde (comp, options) {
+  var r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('tilde', comp, _, M, m, p, pr)
+    var ret
 
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
-  }
+    if (isX(M)) {
+      ret = ''
+    } else if (isX(m)) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (isX(p)) {
+      // ~1.2 == >=1.2.0 <1.3.0
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+    } else if (pr) {
+      debug('replaceTilde pr', pr)
+      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+            ' <' + M + '.' + (+m + 1) + '.0'
+    } else {
+      // ~1.2.3 == >=1.2.3 <1.3.0
+      ret = '>=' + M + '.' + m + '.' + p +
+            ' <' + M + '.' + (+m + 1) + '.0'
+    }
 
-  if (negateOffset) this.pattern = pattern.substr(negateOffset)
-  this.negate = negate
+    debug('tilde return', ret)
+    return ret
+  })
 }
 
-// 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)
+// ^ --> * (any, kinda silly)
+// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+// ^1.2.3 --> >=1.2.3 <2.0.0
+// ^1.2.0 --> >=1.2.0 <2.0.0
+function replaceCarets (comp, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceCaret(comp, options)
+  }).join(' ')
 }
 
-Minimatch.prototype.braceExpand = braceExpand
+function replaceCaret (comp, options) {
+  debug('caret', comp, options)
+  var r = options.loose ? re[t.CARETLOOSE] : re[t.CARET]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('caret', comp, _, M, m, p, pr)
+    var ret
 
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
+    if (isX(M)) {
+      ret = ''
+    } else if (isX(m)) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (isX(p)) {
+      if (M === '0') {
+        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+      } else {
+        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'
+      }
+    } else if (pr) {
+      debug('replaceCaret pr', pr)
+      if (M === '0') {
+        if (m === '0') {
+          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+                ' <' + M + '.' + m + '.' + (+p + 1)
+        } else {
+          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+                ' <' + M + '.' + (+m + 1) + '.0'
+        }
+      } else {
+        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+              ' <' + (+M + 1) + '.0.0'
+      }
     } else {
-      options = {}
+      debug('no pr')
+      if (M === '0') {
+        if (m === '0') {
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + m + '.' + (+p + 1)
+        } else {
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + (+m + 1) + '.0'
+        }
+      } else {
+        ret = '>=' + M + '.' + m + '.' + p +
+              ' <' + (+M + 1) + '.0.0'
+      }
     }
-  }
-
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
-
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern')
-  }
 
-  if (options.nobrace ||
-    !pattern.match(/\{.*\}/)) {
-    // shortcut. no need to expand.
-    return [pattern]
-  }
+    debug('caret return', ret)
+    return ret
+  })
+}
 
-  return expand(pattern)
+function replaceXRanges (comp, options) {
+  debug('replaceXRanges', comp, options)
+  return comp.split(/\s+/).map(function (comp) {
+    return replaceXRange(comp, options)
+  }).join(' ')
 }
 
-// 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')
-  }
+function replaceXRange (comp, options) {
+  comp = comp.trim()
+  var r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE]
+  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
+    debug('xRange', comp, ret, gtlt, M, m, p, pr)
+    var xM = isX(M)
+    var xm = xM || isX(m)
+    var xp = xm || isX(p)
+    var anyX = xp
 
-  var options = this.options
+    if (gtlt === '=' && anyX) {
+      gtlt = ''
+    }
 
-  // shortcuts
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR
-  if (pattern === '') return ''
+    // if we're including prereleases in the match, then we need
+    // to fix this to -0, the lowest possible prerelease value
+    pr = options.includePrerelease ? '-0' : ''
 
-  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
+    if (xM) {
+      if (gtlt === '>' || gtlt === '<') {
+        // nothing is allowed
+        ret = '<0.0.0-0'
+      } else {
+        // nothing is forbidden
+        ret = '*'
+      }
+    } else if (gtlt && anyX) {
+      // we know patch is an x, because we have any x at all.
+      // replace X with 0
+      if (xm) {
+        m = 0
+      }
+      p = 0
 
-  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
+      if (gtlt === '>') {
+        // >1 => >=2.0.0
+        // >1.2 => >=1.3.0
+        // >1.2.3 => >= 1.2.4
+        gtlt = '>='
+        if (xm) {
+          M = +M + 1
+          m = 0
+          p = 0
+        } else {
+          m = +m + 1
+          p = 0
+        }
+      } else if (gtlt === '<=') {
+        // <=0.7.x is actually <0.8.0, since any 0.7.x should
+        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
+        gtlt = '<'
+        if (xm) {
+          M = +M + 1
+        } else {
+          m = +m + 1
+        }
       }
-      self.debug('clearStateChar %j %j', stateChar, re)
-      stateChar = false
+
+      ret = gtlt + M + '.' + m + '.' + p + pr
+    } else if (xm) {
+      ret = '>=' + M + '.0.0' + pr + ' <' + (+M + 1) + '.0.0' + pr
+    } else if (xp) {
+      ret = '>=' + M + '.' + m + '.0' + pr +
+        ' <' + M + '.' + (+m + 1) + '.0' + pr
     }
-  }
 
-  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)
+    debug('xRange return', ret)
 
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
-    }
+    return ret
+  })
+}
 
-    switch (c) {
-      case '/':
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars (comp, options) {
+  debug('replaceStars', comp, options)
+  // Looseness is ignored here.  star is always as loose as it gets!
+  return comp.trim().replace(re[t.STAR], '')
+}
 
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
+// This function is passed to string.replace(re[t.HYPHENRANGE])
+// M, m, patch, prerelease, build
+// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
+// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
+// 1.2 - 3.4 => >=1.2.0 <3.5.0
+function hyphenReplace ($0,
+  from, fM, fm, fp, fpr, fb,
+  to, tM, tm, tp, tpr, tb) {
+  if (isX(fM)) {
+    from = ''
+  } else if (isX(fm)) {
+    from = '>=' + fM + '.0.0'
+  } else if (isX(fp)) {
+    from = '>=' + fM + '.' + fm + '.0'
+  } else {
+    from = '>=' + from
+  }
 
-      // 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)
+  if (isX(tM)) {
+    to = ''
+  } else if (isX(tm)) {
+    to = '<' + (+tM + 1) + '.0.0'
+  } else if (isX(tp)) {
+    to = '<' + tM + '.' + (+tm + 1) + '.0'
+  } else if (tpr) {
+    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr
+  } else {
+    to = '<=' + to
+  }
 
-        // 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
-        }
+  return (from + ' ' + to).trim()
+}
 
-        // 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
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function (version) {
+  if (!version) {
+    return false
+  }
 
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
-        }
+  if (typeof version === 'string') {
+    try {
+      version = new SemVer(version, this.options)
+    } catch (er) {
+      return false
+    }
+  }
 
-        if (!stateChar) {
-          re += '\\('
-          continue
-        }
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version, this.options)) {
+      return true
+    }
+  }
+  return false
+}
 
-        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
+function testSet (set, version, options) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version)) {
+      return false
+    }
+  }
 
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
-        }
+  if (version.prerelease.length && !options.includePrerelease) {
+    // Find the set of versions that are allowed to have prereleases
+    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
+    // That should allow `1.2.3-pr.2` to pass.
+    // However, `1.2.4-alpha.notready` should NOT be allowed,
+    // even though it's within the range set by the comparators.
+    for (i = 0; i < set.length; i++) {
+      debug(set[i].semver)
+      if (set[i].semver === ANY) {
+        continue
+      }
 
-        clearStateChar()
-        hasMagic = true
-        var pl = patternListStack.pop()
-        // negation is (?:(?!js)[^/]*)
-        // The others are (?:<pattern>)<type>
-        re += pl.close
-        if (pl.type === '!') {
-          negativeLists.push(pl)
+      if (set[i].semver.prerelease.length > 0) {
+        var allowed = set[i].semver
+        if (allowed.major === version.major &&
+            allowed.minor === version.minor &&
+            allowed.patch === version.patch) {
+          return true
         }
-        pl.reEnd = re.length
-      continue
+      }
+    }
 
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
-        }
+    // Version has a -pre, but it's not one of the ones we like.
+    return false
+  }
 
-        clearStateChar()
-        re += '|'
-      continue
+  return true
+}
 
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
+exports.satisfies = satisfies
+function satisfies (version, range, options) {
+  try {
+    range = new Range(range, options)
+  } catch (er) {
+    return false
+  }
+  return range.test(version)
+}
 
-        if (inClass) {
-          re += '\\' + c
-          continue
-        }
+exports.maxSatisfying = maxSatisfying
+function maxSatisfying (versions, range, options) {
+  var max = null
+  var maxSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!max || maxSV.compare(v) === -1) {
+        // compare(max, v, true)
+        max = v
+        maxSV = new SemVer(max, options)
+      }
+    }
+  })
+  return max
+}
 
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
+exports.minSatisfying = minSatisfying
+function minSatisfying (versions, range, options) {
+  var min = null
+  var minSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!min || minSV.compare(v) === 1) {
+        // compare(min, v, true)
+        min = v
+        minSV = new SemVer(min, options)
+      }
+    }
+  })
+  return min
+}
 
-      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
-        }
+exports.minVersion = minVersion
+function minVersion (range, loose) {
+  range = new Range(range, loose)
 
-        // 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
-          }
-        }
+  var minver = new SemVer('0.0.0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
+  minver = new SemVer('0.0.0-0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
+  minver = null
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
-        }
+    comparators.forEach(function (comparator) {
+      // Clone to avoid manipulating the comparator's semver object.
+      var compver = new SemVer(comparator.semver.version)
+      switch (comparator.operator) {
+        case '>':
+          if (compver.prerelease.length === 0) {
+            compver.patch++
+          } else {
+            compver.prerelease.push(0)
+          }
+          compver.raw = compver.format()
+          /* fallthrough */
+        case '':
+        case '>=':
+          if (!minver || gt(minver, compver)) {
+            minver = compver
+          }
+          break
+        case '<':
+        case '<=':
+          /* Ignore maximum versions */
+          break
+        /* istanbul ignore next */
+        default:
+          throw new Error('Unexpected operation: ' + comparator.operator)
+      }
+    })
+  }
 
-        re += c
+  if (minver && range.test(minver)) {
+    return minver
+  }
 
-    } // switch
-  } // for
+  return null
+}
 
-  // 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]
+exports.validRange = validRange
+function validRange (range, options) {
+  try {
+    // Return '*' instead of '' so that truthiness works.
+    // This will throw if it's invalid anyway
+    return new Range(range, options).range || '*'
+  } catch (er) {
+    return null
   }
+}
 
-  // 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 = '\\'
-      }
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr
+function ltr (version, range, options) {
+  return outside(version, range, '<', options)
+}
 
-      // 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 + '|'
-    })
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr
+function gtr (version, range, options) {
+  return outside(version, range, '>', options)
+}
 
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
+exports.outside = outside
+function outside (version, range, hilo, options) {
+  version = new SemVer(version, options)
+  range = new Range(range, options)
 
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  var gtfn, ltefn, ltfn, comp, ecomp
+  switch (hilo) {
+    case '>':
+      gtfn = gt
+      ltefn = lte
+      ltfn = lt
+      comp = '>'
+      ecomp = '>='
+      break
+    case '<':
+      gtfn = lt
+      ltefn = gte
+      ltfn = gt
+      comp = '<'
+      ecomp = '<='
+      break
+    default:
+      throw new TypeError('Must provide a hilo val of "<" or ">"')
   }
 
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, options)) {
+    return false
   }
 
-  // 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
-  }
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
 
-  // 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]
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-    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)
+    var high = null
+    var low = null
 
-    nlLast += nlAfter
+    comparators.forEach(function (comparator) {
+      if (comparator.semver === ANY) {
+        comparator = new Comparator('>=0.0.0')
+      }
+      high = high || comparator
+      low = low || comparator
+      if (gtfn(comparator.semver, high.semver, options)) {
+        high = comparator
+      } else if (ltfn(comparator.semver, low.semver, options)) {
+        low = comparator
+      }
+    })
 
-    // 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(/\)[+*?]?/, '')
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false
     }
-    nlAfter = cleanAfter
 
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
+    // If the lowest version comparator has an operator and our version
+    // is less than it then it isn't higher than the range
+    if ((!low.operator || low.operator === comp) &&
+        ltefn(version, low.semver)) {
+      return false
+    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+      return false
     }
-    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
-    re = newRe
   }
+  return true
+}
 
-  // 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
-  }
+exports.prerelease = prerelease
+function prerelease (version, options) {
+  var parsed = parse(version, options)
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+}
 
-  if (addPatternStart) {
-    re = patternStart + re
+exports.intersects = intersects
+function intersects (r1, r2, options) {
+  r1 = new Range(r1, options)
+  r2 = new Range(r2, options)
+  return r1.intersects(r2)
+}
+
+exports.coerce = coerce
+function coerce (version, options) {
+  if (version instanceof SemVer) {
+    return version
   }
 
-  // parsing just a piece of a larger pattern.
-  if (isSub === SUBPARSE) {
-    return [re, hasMagic]
+  if (typeof version === 'number') {
+    version = String(version)
   }
 
-  // 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 (typeof version !== 'string') {
+    return null
   }
 
-  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('$.')
+  options = options || {}
+
+  var match = null
+  if (!options.rtl) {
+    match = version.match(re[t.COERCE])
+  } else {
+    // Find the right-most coercible string that does not share
+    // a terminus with a more left-ward coercible string.
+    // Eg, '1.2.3.4' wants to coerce '2.3.4', not '3.4' or '4'
+    //
+    // Walk through the string checking with a /g regexp
+    // Manually set the index so as to pick up overlapping matches.
+    // Stop when we get a match that ends at the string end, since no
+    // coercible string can be more right-ward without the same terminus.
+    var next
+    while ((next = re[t.COERCERTL].exec(version)) &&
+      (!match || match.index + match[0].length !== version.length)
+    ) {
+      if (!match ||
+          next.index + next[0].length !== match.index + match[0].length) {
+        match = next
+      }
+      re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length
+    }
+    // leave it in a clean state
+    re[t.COERCERTL].lastIndex = -1
   }
 
-  regExp._glob = pattern
-  regExp._src = re
+  if (match === null) {
+    return null
+  }
 
-  return regExp
+  return parse(match[2] +
+    '.' + (match[3] || '0') +
+    '.' + (match[4] || '0'), options)
 }
 
-minimatch.makeRe = function (pattern, options) {
-  return new Minimatch(pattern, options || {}).makeRe()
-}
 
-Minimatch.prototype.makeRe = makeRe
-function makeRe () {
-  if (this.regexp || this.regexp === false) return this.regexp
+/***/ }),
 
-  // 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
+/***/ "../../node_modules/map-cache/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
+"use strict";
+/*!
+ * map-cache <https://github.com/jonschlinkert/map-cache>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+var hasOwn = Object.prototype.hasOwnProperty;
+
+/**
+ * Expose `MapCache`
+ */
+
+module.exports = MapCache;
+
+/**
+ * Creates a cache object to store key/value pairs.
+ *
+ * ```js
+ * var cache = new MapCache();
+ * ```
+ *
+ * @api public
+ */
+
+function MapCache(data) {
+  this.__data__ = data || {};
+}
+
+/**
+ * Adds `value` to `key` on the cache.
+ *
+ * ```js
+ * cache.set('foo', 'bar');
+ * ```
+ *
+ * @param {String} `key` The key of the value to cache.
+ * @param {*} `value` The value to cache.
+ * @returns {Object} Returns the `Cache` object for chaining.
+ * @api public
+ */
+
+MapCache.prototype.set = function mapSet(key, value) {
+  if (key !== '__proto__') {
+    this.__data__[key] = value;
   }
-  var options = this.options
+  return this;
+};
 
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
+/**
+ * Gets the cached value for `key`.
+ *
+ * ```js
+ * cache.get('foo');
+ * //=> 'bar'
+ * ```
+ *
+ * @param {String} `key` The key of the value to get.
+ * @returns {*} Returns the cached value.
+ * @api public
+ */
 
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
+MapCache.prototype.get = function mapGet(key) {
+  return key === '__proto__' ? undefined : this.__data__[key];
+};
 
-  // must match entire pattern
-  // ending in a * or ** will make it less strict.
-  re = '^(?:' + re + ')$'
+/**
+ * Checks if a cached value for `key` exists.
+ *
+ * ```js
+ * cache.has('foo');
+ * //=> true
+ * ```
+ *
+ * @param {String} `key` The key of the entry to check.
+ * @returns {Boolean} Returns `true` if an entry for `key` exists, else `false`.
+ * @api public
+ */
 
-  // can match anything, as long as it's not this.
-  if (this.negate) re = '^(?!' + re + ').*$'
+MapCache.prototype.has = function mapHas(key) {
+  return key !== '__proto__' && hasOwn.call(this.__data__, key);
+};
 
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) {
-    this.regexp = false
-  }
-  return this.regexp
-}
+/**
+ * Removes `key` and its value from the cache.
+ *
+ * ```js
+ * cache.del('foo');
+ * ```
+ * @title .del
+ * @param {String} `key` The key of the value to remove.
+ * @returns {Boolean} Returns `true` if the entry was removed successfully, else `false`.
+ * @api public
+ */
 
-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
-}
+MapCache.prototype.del = function mapDelete(key) {
+  return this.has(key) && delete this.__data__[key];
+};
 
-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
+/***/ }),
 
-  var options = this.options
+/***/ "../../node_modules/map-visit/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
+"use strict";
 
-  // treat the test path as a set of pathparts.
-  f = f.split(slashSplit)
-  this.debug(this.pattern, 'split', f)
 
-  // 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 util = __webpack_require__("util");
+var visit = __webpack_require__("../../node_modules/object-visit/index.js");
 
-  var set = this.set
-  this.debug(this.pattern, 'set', set)
+/**
+ * Map `visit` over an array of objects.
+ *
+ * @param  {Object} `collection` The context in which to invoke `method`
+ * @param  {String} `method` Name of the method to call on `collection`
+ * @param  {Object} `arr` Array of objects.
+ */
 
-  // 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
+module.exports = function mapVisit(collection, method, val) {
+  if (isObject(val)) {
+    return visit.apply(null, arguments);
   }
 
-  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 (!Array.isArray(val)) {
+    throw new TypeError('expected an array: ' + util.inspect(val));
+  }
+
+  var args = [].slice.call(arguments, 3);
+
+  for (var i = 0; i < val.length; i++) {
+    var ele = val[i];
+    if (isObject(ele)) {
+      visit.apply(null, [collection, method, ele].concat(args));
+    } else {
+      collection[method].apply(collection, [ele].concat(args));
     }
   }
+};
 
-  // didn't get any hits.  this is success if it's a negative
-  // pattern, failure otherwise.
-  if (options.flipNegate) return false
-  return this.negate
+function isObject(val) {
+  return val && (typeof val === 'function' || (!Array.isArray(val) && typeof val === 'object'));
 }
 
-// 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
-
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
 
-  this.debug('matchOne', file.length, pattern.length)
+/***/ }),
 
-  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]
+/***/ "../../node_modules/merge-stream/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    this.debug(pattern, p, f)
+"use strict";
 
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    if (p === false) return false
 
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
+const { PassThrough } = __webpack_require__("stream");
 
-      // "**"
-      // 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 = function (/*streams...*/) {
+  var sources = []
+  var output  = new PassThrough({objectMode: true})
 
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
+  output.setMaxListeners(0)
 
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+  output.add = add
+  output.isEmpty = isEmpty
 
-        // 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
-          }
+  output.on('unpipe', remove)
 
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
-        }
-      }
+  Array.prototype.slice.call(arguments).forEach(add)
 
-      // 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
-    }
+  return output
 
-    // 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)
+  function add (source) {
+    if (Array.isArray(source)) {
+      source.forEach(add)
+      return this
     }
 
-    if (!hit) return false
+    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
   }
 
-  // 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
+  function isEmpty () {
+    return sources.length == 0;
   }
 
-  // should be unreachable.
-  throw new Error('wtf?')
-}
-
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
-}
-
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+  function remove (source) {
+    sources = sources.filter(function (it) { return it !== source })
+    if (!sources.length && output.readable) { output.end() }
+  }
 }
 
 
 /***/ }),
-/* 61 */
+
+/***/ "../../node_modules/merge2/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var wrappy = __webpack_require__(123)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
+"use strict";
 
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
+/*
+ * merge2
+ * https://github.com/teambition/merge2
+ *
+ * Copyright (c) 2014-2020 Teambition
+ * Licensed under the MIT license.
+ */
+const Stream = __webpack_require__("stream")
+const PassThrough = Stream.PassThrough
+const slice = Array.prototype.slice
 
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
+module.exports = merge2
 
-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
-}
+function merge2 () {
+  const streamsQueue = []
+  const args = slice.call(arguments)
+  let merging = false
+  let options = args[args.length - 1]
 
-function onceStrict (fn) {
-  var f = function () {
-    if (f.called)
-      throw new Error(f.onceError)
-    f.called = true
-    return f.value = fn.apply(this, arguments)
+  if (options && !Array.isArray(options) && options.pipe == null) {
+    args.pop()
+  } else {
+    options = {}
   }
-  var name = fn.name || 'Function wrapped with `once`'
-  f.onceError = name + " shouldn't be called more than once"
-  f.called = false
-  return f
-}
 
+  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)
 
-/***/ }),
-/* 62 */,
-/* 63 */
-/***/ (function(module, exports) {
+  function addStream () {
+    for (let i = 0, len = arguments.length; i < len; i++) {
+      streamsQueue.push(pauseStreams(arguments[i], options))
+    }
+    mergeStream()
+    return this
+  }
 
-module.exports = __webpack_require__(411);
+  function mergeStream () {
+    if (merging) {
+      return
+    }
+    merging = true
 
-/***/ }),
-/* 64 */,
-/* 65 */,
-/* 66 */,
-/* 67 */
-/***/ (function(module, exports) {
+    let streams = streamsQueue.shift()
+    if (!streams) {
+      process.nextTick(endStream)
+      return
+    }
+    if (!Array.isArray(streams)) {
+      streams = [streams]
+    }
 
-// 7.2.1 RequireObjectCoercible(argument)
-module.exports = function (it) {
-  if (it == undefined) throw TypeError("Can't call method on  " + it);
-  return it;
-};
+    let pipesCount = streams.length + 1
 
+    function next () {
+      if (--pipesCount > 0) {
+        return
+      }
+      merging = false
+      mergeStream()
+    }
 
-/***/ }),
-/* 68 */
-/***/ (function(module, exports, __webpack_require__) {
+    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()
+      }
 
-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) : {};
-};
+      stream.on('merge2UnpipeEnd', onend)
+      stream.on('end', onend)
 
+      if (doPipeError) {
+        stream.on('error', onerror)
+      }
 
-/***/ }),
-/* 69 */
-/***/ (function(module, exports) {
+      stream.pipe(mergedStream, { end: false })
+      // compatible for old stream
+      stream.resume()
+    }
 
-module.exports = true;
+    for (let i = 0; i < streams.length; i++) {
+      pipe(streams[i])
+    }
 
+    next()
+  }
 
-/***/ }),
-/* 70 */
-/***/ (function(module, exports, __webpack_require__) {
+  function endStream () {
+    merging = false
+    // emit 'queueDrain' when all streams merged.
+    mergedStream.emit('queueDrain')
+    if (doEnd) {
+      mergedStream.end()
+    }
+  }
 
-"use strict";
+  mergedStream.setMaxListeners(0)
+  mergedStream.add = addStream
+  mergedStream.on('unpipe', function (stream) {
+    stream.emit('merge2UnpipeEnd')
+  })
 
-// 25.4.1.5 NewPromiseCapability(C)
-var aFunction = __webpack_require__(46);
+  if (args.length) {
+    addStream.apply(null, args)
+  }
+  return mergedStream
+}
 
-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);
+// 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
 }
 
-module.exports.f = function (C) {
-  return new PromiseCapability(C);
-};
-
 
 /***/ }),
-/* 71 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var def = __webpack_require__(50).f;
-var has = __webpack_require__(49);
-var TAG = __webpack_require__(13)('toStringTag');
-
-module.exports = function (it, tag, stat) {
-  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
-};
-
 
-/***/ }),
-/* 72 */
+/***/ "../../node_modules/micromatch/index.js":
 /***/ (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) {
 
-// 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);
-};
+/**
+ * Module dependencies
+ */
 
+var util = __webpack_require__("util");
+var braces = __webpack_require__("../../node_modules/micromatch/node_modules/braces/index.js");
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+var extend = __webpack_require__("../../node_modules/micromatch/node_modules/extend-shallow/index.js");
 
-/***/ }),
-/* 74 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Local dependencies
+ */
 
-// 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));
-};
+var compilers = __webpack_require__("../../node_modules/micromatch/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/micromatch/lib/parsers.js");
+var cache = __webpack_require__("../../node_modules/micromatch/lib/cache.js");
+var utils = __webpack_require__("../../node_modules/micromatch/lib/utils.js");
+var MAX_LENGTH = 1024 * 64;
 
+/**
+ * The main function takes a list of strings and one or more
+ * glob patterns to use for matching.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm(list, patterns[, options]);
+ *
+ * console.log(mm(['a.js', 'a.txt'], ['*.js']));
+ * //=> [ 'a.js' ]
+ * ```
+ * @param {Array} `list` A list of strings to match
+ * @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 {Array} Returns an array of matches
+ * @summary false
+ * @api public
+ */
 
-/***/ }),
-/* 75 */
-/***/ (function(module, exports, __webpack_require__) {
+function micromatch(list, patterns, options) {
+  patterns = utils.arrayify(patterns);
+  list = utils.arrayify(list);
 
-// 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.
+  var len = patterns.length;
+  if (list.length === 0 || len === 0) {
+    return [];
+  }
 
-module.exports = glob
+  if (len === 1) {
+    return micromatch.match(list, patterns[0], options);
+  }
 
-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 omit = [];
+  var keep = [];
+  var idx = -1;
 
-var once = __webpack_require__(61)
+  while (++idx < len) {
+    var pattern = patterns[idx];
 
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
+    if (typeof pattern === 'string' && pattern.charCodeAt(0) === 33 /* ! */) {
+      omit.push.apply(omit, micromatch.match(list, pattern.slice(1), options));
+    } else {
+      keep.push.apply(keep, micromatch.match(list, pattern, options));
+    }
+  }
 
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
+  var matches = utils.diff(keep, omit);
+  if (!options || options.nodupes !== false) {
+    return utils.unique(matches);
   }
 
-  return new Glob(pattern, options, cb)
+  return matches;
 }
 
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
+/**
+ * Similar to the main function, but `pattern` must be a string.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm.match(list, pattern[, options]);
+ *
+ * console.log(mm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
+ * //=> ['a.a', 'a.aa']
+ * ```
+ * @param {Array} `list` Array of strings to match
+ * @param {String} `pattern` 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 matches
+ * @api public
+ */
 
-// old api surface
-glob.glob = glob
+micromatch.match = function(list, pattern, options) {
+  if (Array.isArray(pattern)) {
+    throw new TypeError('expected pattern to be a string');
+  }
 
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
+  var unixify = utils.unixify(options);
+  var isMatch = memoize('match', pattern, options, micromatch.matcher);
+  var matches = [];
+
+  list = utils.arrayify(list);
+  var len = list.length;
+  var idx = -1;
+
+  while (++idx < len) {
+    var ele = list[idx];
+    if (ele === pattern || isMatch(ele)) {
+      matches.push(utils.value(ele, unixify, options));
+    }
   }
 
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
+  // if no options were passed, uniquify results and return
+  if (typeof options === 'undefined') {
+    return utils.unique(matches);
   }
-  return origin
-}
 
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
+  if (matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error('no matches found for "' + pattern + '"');
+    }
+    if (options.nonull === true || options.nullglob === true) {
+      return [options.unescape ? utils.unescape(pattern) : pattern];
+    }
+  }
 
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
+  // if `opts.ignore` was defined, diff ignored list
+  if (options.ignore) {
+    matches = micromatch.not(matches, options.ignore, options);
+  }
 
-  if (!pattern)
-    return false
+  return options.nodupes !== false ? utils.unique(matches) : matches;
+};
 
-  if (set.length > 1)
-    return true
+/**
+ * Returns true if the specified `string` matches the given glob `pattern`.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm.isMatch(string, pattern[, options]);
+ *
+ * console.log(mm.isMatch('a.a', '*.a'));
+ * //=> true
+ * console.log(mm.isMatch('a.b', '*.a'));
+ * //=> false
+ * ```
+ * @param {String} `string` String to match
+ * @param {String} `pattern` 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 string matches the glob pattern.
+ * @api public
+ */
 
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
+micromatch.isMatch = function(str, pattern, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
   }
 
-  return false
-}
-
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
+  if (isEmptyString(str) || isEmptyString(pattern)) {
+    return false;
   }
 
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
+  var equals = utils.equalsPattern(options);
+  if (equals(str)) {
+    return true;
   }
 
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
+  var isMatch = memoize('isMatch', pattern, options, micromatch.matcher);
+  return isMatch(str);
+};
 
-  setopts(this, pattern, options)
-  this._didRealPath = false
+/**
+ * Returns true if some of the strings in the given `list` match any of the
+ * given glob `patterns`.
+ *
+ * ```js
+ * var 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
+ */
 
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
+micromatch.some = function(list, patterns, options) {
+  if (typeof list === 'string') {
+    list = [list];
+  }
+  for (var i = 0; i < list.length; i++) {
+    if (micromatch(list[i], patterns, options).length === 1) {
+      return true;
+    }
+  }
+  return false;
+};
 
-  // 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)
+/**
+ * Returns true if every string in the given `list` matches
+ * any of the given glob `patterns`.
+ *
+ * ```js
+ * var 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
+ */
 
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
+micromatch.every = function(list, patterns, options) {
+  if (typeof list === 'string') {
+    list = [list];
+  }
+  for (var i = 0; i < list.length; i++) {
+    if (micromatch(list[i], patterns, options).length !== 1) {
+      return false;
+    }
   }
+  return true;
+};
 
-  var self = this
-  this._processing = 0
+/**
+ * Returns true if **any** of the given glob `patterns`
+ * match the specified `string`.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm.any(string, patterns[, options]);
+ *
+ * console.log(mm.any('a.a', ['b.*', '*.a']));
+ * //=> true
+ * console.log(mm.any('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) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
 
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
+micromatch.any = function(str, patterns, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
+  }
 
-  if (this.noprocess)
-    return this
+  if (isEmptyString(str) || isEmptyString(patterns)) {
+    return false;
+  }
 
-  if (n === 0)
-    return done()
+  if (typeof patterns === 'string') {
+    patterns = [patterns];
+  }
 
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
+  for (var i = 0; i < patterns.length; i++) {
+    if (micromatch.isMatch(str, patterns[i], options)) {
+      return true;
+    }
   }
-  sync = false
+  return false;
+};
 
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
-      } else {
-        self._finish()
-      }
+/**
+ * Returns true if **all** of the given `patterns` match
+ * the specified string.
+ *
+ * ```js
+ * var 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
+ */
+
+micromatch.all = function(str, patterns, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
+  }
+  if (typeof patterns === 'string') {
+    patterns = [patterns];
+  }
+  for (var i = 0; i < patterns.length; i++) {
+    if (!micromatch.isMatch(str, patterns[i], options)) {
+      return false;
     }
   }
-}
+  return true;
+};
 
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
+/**
+ * Returns a list of strings that _**do not match any**_ of the given `patterns`.
+ *
+ * ```js
+ * var 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
+ */
 
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
+micromatch.not = function(list, patterns, options) {
+  var opts = extend({}, options);
+  var ignore = opts.ignore;
+  delete opts.ignore;
 
-  common.finish(this)
-  this.emit('end', this.found)
-}
+  var unixify = utils.unixify(opts);
+  list = utils.arrayify(list).map(unixify);
 
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
+  var matches = utils.diff(list, micromatch(list, patterns, opts));
+  if (ignore) {
+    matches = utils.diff(matches, micromatch(list, ignore));
+  }
 
-  this._didRealpath = true
+  return opts.nodupes !== false ? utils.unique(matches) : matches;
+};
+
+/**
+ * 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
+ */
 
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
+micromatch.contains = function(str, patterns, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
+  }
 
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
+  if (typeof patterns === 'string') {
+    if (isEmptyString(str) || isEmptyString(patterns)) {
+      return false;
+    }
 
-  function next () {
-    if (--n === 0)
-      self._finish()
+    var equals = utils.equalsPattern(patterns, options);
+    if (equals(str)) {
+      return true;
+    }
+    var contains = utils.containsPattern(patterns, options);
+    if (contains(str)) {
+      return true;
+    }
   }
-}
 
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
+  var opts = extend({}, options, {contains: true});
+  return micromatch.any(str, patterns, opts);
+};
 
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
+/**
+ * Returns true if the given pattern and options should enable
+ * the `matchBase` option.
+ * @return {Boolean}
+ * @api private
+ */
 
-  if (n === 0)
-    return cb()
+micromatch.matchBase = function(pattern, options) {
+  if (pattern && pattern.indexOf('/') !== -1 || !options) return false;
+  return options.basename === true || options.matchBase === true;
+};
 
-  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
+/**
+ * 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
+ * var mm = require('micromatch');
+ * mm.matchKeys(object, patterns[, options]);
+ *
+ * var 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
+ */
 
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
-      }
-    })
-  })
-}
+micromatch.matchKeys = function(obj, patterns, options) {
+  if (!utils.isObject(obj)) {
+    throw new TypeError('expected the first argument to be an object');
+  }
+  var keys = micromatch(Object.keys(obj), patterns, options);
+  return utils.pick(obj, keys);
+};
 
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+/**
+ * Returns a memoized 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
+ * var mm = require('micromatch');
+ * mm.matcher(pattern[, options]);
+ *
+ * var isMatch = mm.matcher('*.!(*a)');
+ * console.log(isMatch('a.a'));
+ * //=> false
+ * console.log(isMatch('a.b'));
+ * //=> true
+ * ```
+ * @param {String} `pattern` Glob pattern
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed.
+ * @return {Function} Returns a matcher function.
+ * @api public
+ */
 
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+micromatch.matcher = function matcher(pattern, options) {
+  if (Array.isArray(pattern)) {
+    return compose(pattern, options, matcher);
+  }
 
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
+  // if pattern is a regex
+  if (pattern instanceof RegExp) {
+    return test(pattern);
+  }
 
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
+  // if pattern is invalid
+  if (!utils.isString(pattern)) {
+    throw new TypeError('expected pattern to be an array, string or regex');
   }
-}
 
-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 pattern is a non-glob string
+  if (!utils.hasSpecialChars(pattern)) {
+    if (options && options.nocase === true) {
+      pattern = pattern.toLowerCase();
     }
+    return utils.matchPath(pattern, options);
   }
-}
 
-Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
-  assert(this instanceof Glob)
-  assert(typeof cb === 'function')
-
-  if (this.aborted)
-    return
+  // if pattern is a glob string
+  var re = micromatch.makeRe(pattern, options);
 
-  this._processing++
-  if (this.paused) {
-    this._processQueue.push([pattern, index, inGlobStar, cb])
-    return
+  // if `options.matchBase` or `options.basename` is defined
+  if (micromatch.matchBase(pattern, options)) {
+    return utils.matchBasename(re, options);
   }
 
-  //console.error('PROCESS %d', this._processing, pattern)
+  function test(regex) {
+    var equals = utils.equalsPattern(options);
+    var unixify = utils.unixify(options);
 
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
+    return function(str) {
+      if (equals(str)) {
+        return true;
+      }
+
+      if (regex.test(unixify(str))) {
+        return true;
+      }
+      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
+  var fn = test(re);
+  Object.defineProperty(fn, 'result', {
+    configurable: true,
+    enumerable: false,
+    value: re.result
+  });
+  return fn;
+};
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+/**
+ * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
+ *
+ * ```js
+ * var 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} `pattern` Glob pattern to use for matching.
+ * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
+ * @api public
+ */
 
-    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
+micromatch.capture = function(pattern, str, options) {
+  var re = micromatch.makeRe(pattern, extend({capture: true}, options));
+  var unixify = utils.unixify(options);
+
+  function match() {
+    return function(string) {
+      var match = re.exec(unixify(string));
+      if (!match) {
+        return null;
+      }
+
+      return match.slice(1);
+    };
   }
 
-  var remain = pattern.slice(n)
+  var capture = memoize('capture', pattern, options, match);
+  return capture(str);
+};
 
-  // 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
+/**
+ * Create a regular expression from the given glob `pattern`.
+ *
+ * ```js
+ * var 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` See available [options](#options) for changing how matches are performed.
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
 
-  var abs = this._makeAbs(read)
+micromatch.makeRe = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
 
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
+  if (pattern.length > MAX_LENGTH) {
+    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
+  }
 
-  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)
-}
+  function makeRe() {
+    var result = micromatch.create(pattern, options);
+    var ast_array = [];
+    var output = result.map(function(obj) {
+      obj.ast.state = obj.state;
+      ast_array.push(obj.ast);
+      return obj.output;
+    });
 
-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 regex = toRegex(output.join('|'), options);
+    Object.defineProperty(regex, 'result', {
+      configurable: true,
+      enumerable: false,
+      value: ast_array
+    });
+    return regex;
+  }
 
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  return memoize('makeRe', pattern, options, makeRe);
+};
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
+/**
+ * Expand the given brace `pattern`.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * console.log(mm.braces('foo/{a,b}/bar'));
+ * //=> ['foo/(a|b)/bar']
+ *
+ * console.log(mm.braces('foo/{a,b}/bar', {expand: true}));
+ * //=> ['foo/(a|b)/bar']
+ * ```
+ * @param {String} `pattern` String with brace pattern to expand.
+ * @param {Object} `options` Any [options](#options) to change how expansion is performed. See the [braces][] library for all available options.
+ * @return {Array}
+ * @api public
+ */
 
-  // 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) === '.'
+micromatch.braces = function(pattern, options) {
+  if (typeof pattern !== 'string' && !Array.isArray(pattern)) {
+    throw new TypeError('expected pattern to be an array or string');
+  }
 
-  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)
+  function expand() {
+    if (options && options.nobrace === true || !/\{.*\}/.test(pattern)) {
+      return utils.arrayify(pattern);
     }
+    return braces(pattern, options);
   }
 
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
-
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
+  return memoize('braces', pattern, options, expand);
+};
 
-  // 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.
+/**
+ * Proxy to the [micromatch.braces](#method), for parity with
+ * minimatch.
+ */
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+micromatch.braceExpand = function(pattern, options) {
+  var opts = extend({}, options, {expand: true});
+  return micromatch.braces(pattern, opts);
+};
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+/**
+ * Parses the given glob `pattern` and returns an array of abstract syntax
+ * trees (ASTs), with the compiled `output` and optional source `map` on
+ * each AST.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm.create(pattern[, options]);
+ *
+ * console.log(mm.create('abc/*.js'));
+ * // [{ options: { source: 'string', sourcemap: true },
+ * //   state: {},
+ * //   compilers:
+ * //    { ... },
+ * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
+ * //   ast:
+ * //    { type: 'root',
+ * //      errors: [],
+ * //      nodes:
+ * //       [ ... ],
+ * //      dot: false,
+ * //      input: 'abc/*.js' },
+ * //   parsingErrors: [],
+ * //   map:
+ * //    { version: 3,
+ * //      sources: [ 'string' ],
+ * //      names: [],
+ * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
+ * //      sourcesContent: [ 'abc/*.js' ] },
+ * //   position: { line: 1, column: 28 },
+ * //   content: {},
+ * //   files: {},
+ * //   idx: 6 }]
+ * ```
+ * @param {String} `pattern` Glob pattern to parse and compile.
+ * @param {Object} `options` Any [options](#options) to change how parsing and compiling is performed.
+ * @return {Object} Returns an object with the parsed AST, compiled string and optional source map.
+ * @api public
+ */
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
+micromatch.create = function(pattern, options) {
+  return memoize('create', pattern, options, function() {
+    function create(str, opts) {
+      return micromatch.compile(micromatch.parse(str, opts), opts);
     }
-    // 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)
-  }
-  cb()
-}
+    pattern = micromatch.braces(pattern, options);
+    var len = pattern.length;
+    var idx = -1;
+    var res = [];
 
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
+    while (++idx < len) {
+      res.push(create(pattern[idx], options));
+    }
+    return res;
+  });
+};
 
-  if (isIgnored(this, e))
-    return
+/**
+ * Parse the given `str` with the given `options`.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm.parse(pattern[, options]);
+ *
+ * var ast = mm.parse('a/{b,c}/d');
+ * console.log(ast);
+ * // { type: 'root',
+ * //   errors: [],
+ * //   input: 'a/{b,c}/d',
+ * //   nodes:
+ * //    [ { type: 'bos', val: '' },
+ * //      { type: 'text', val: 'a/' },
+ * //      { type: 'brace',
+ * //        nodes:
+ * //         [ { type: 'brace.open', val: '{' },
+ * //           { type: 'text', val: 'b,c' },
+ * //           { type: 'brace.close', val: '}' } ] },
+ * //      { type: 'text', val: '/d' },
+ * //      { type: 'eos', val: '' } ] }
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {Object} Returns an AST
+ * @api public
+ */
 
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
+micromatch.parse = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
   }
 
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+  function parse() {
+    var snapdragon = utils.instantiate(null, options);
+    parsers(snapdragon, options);
 
-  if (this.mark)
-    e = this._mark(e)
+    var ast = snapdragon.parse(pattern, options);
+    utils.define(ast, 'snapdragon', snapdragon);
+    ast.input = pattern;
+    return ast;
+  }
 
-  if (this.absolute)
-    e = abs
+  return memoize('parse', pattern, options, parse);
+};
 
-  if (this.matches[index][e])
-    return
+/**
+ * Compile the given `ast` or string with the given `options`.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * mm.compile(ast[, options]);
+ *
+ * var ast = mm.parse('a/{b,c}/d');
+ * console.log(mm.compile(ast));
+ * // { options: { source: 'string' },
+ * //   state: {},
+ * //   compilers:
+ * //    { eos: [Function],
+ * //      noop: [Function],
+ * //      bos: [Function],
+ * //      brace: [Function],
+ * //      'brace.open': [Function],
+ * //      text: [Function],
+ * //      'brace.close': [Function] },
+ * //   output: [ 'a/(b|c)/d' ],
+ * //   ast:
+ * //    { ... },
+ * //   parsingErrors: [] }
+ * ```
+ * @param {Object|String} `ast`
+ * @param {Object} `options`
+ * @return {Object} Returns an object that has an `output` property with the compiled string.
+ * @api public
+ */
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
+micromatch.compile = function(ast, options) {
+  if (typeof ast === 'string') {
+    ast = micromatch.parse(ast, options);
   }
 
-  this.matches[index][e] = true
-
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
+  return memoize('compile', ast.input, options, function() {
+    var snapdragon = utils.instantiate(ast, options);
+    compilers(snapdragon, options);
+    return snapdragon.compile(ast, options);
+  });
+};
 
-  this.emit('match', e)
-}
+/**
+ * Clear the regex cache.
+ *
+ * ```js
+ * mm.clearCache();
+ * ```
+ * @api public
+ */
 
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
+micromatch.clearCache = function() {
+  micromatch.cache.caches = {};
+};
 
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false, cb)
+/**
+ * Returns true if the given value is effectively an empty string
+ */
 
-  var lstatkey = 'lstat\0' + abs
-  var self = this
-  var lstatcb = inflight(lstatkey, lstatcb_)
+function isEmptyString(val) {
+  return String(val) === '' || String(val) === './';
+}
 
-  if (lstatcb)
-    fs.lstat(abs, lstatcb)
+/**
+ * Compose a matcher function with the given patterns.
+ * This allows matcher functions to be compiled once and
+ * called multiple times.
+ */
 
-  function lstatcb_ (er, lstat) {
-    if (er && er.code === 'ENOENT')
-      return cb()
+function compose(patterns, options, matcher) {
+  var matchers;
 
-    var isSym = lstat && lstat.isSymbolicLink()
-    self.symlinks[abs] = isSym
+  return memoize('compose', String(patterns), options, function() {
+    return function(file) {
+      // delay composition until it's invoked the first time,
+      // after that it won't be called again
+      if (!matchers) {
+        matchers = [];
+        for (var i = 0; i < patterns.length; i++) {
+          matchers.push(matcher(patterns[i], options));
+        }
+      }
 
-    // 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)
-  }
+      var len = matchers.length;
+      while (len--) {
+        if (matchers[len](file) === true) {
+          return true;
+        }
+      }
+      return false;
+    };
+  });
 }
 
-Glob.prototype._readdir = function (abs, inGlobStar, cb) {
-  if (this.aborted)
-    return
-
-  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
-  if (!cb)
-    return
+/**
+ * Memoize a generated regex or function. A unique key is generated
+ * from the `type` (usually method name), the `pattern`, and
+ * user-defined options.
+ */
 
-  //console.error('RD %j %j', +inGlobStar, abs)
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs, cb)
+function memoize(type, pattern, options, fn) {
+  var key = utils.createKey(type + '=' + pattern, options);
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return cb()
+  if (options && options.cache === false) {
+    return fn(pattern, options);
+  }
 
-    if (Array.isArray(c))
-      return cb(null, c)
+  if (cache.has(type, key)) {
+    return cache.get(type, key);
   }
 
-  var self = this
-  fs.readdir(abs, readdirCb(this, abs, cb))
+  var val = fn(pattern, options);
+  cache.set(type, key, val);
+  return val;
 }
 
-function readdirCb (self, abs, cb) {
-  return function (er, entries) {
-    if (er)
-      self._readdirError(abs, er, cb)
-    else
-      self._readdirEntries(abs, entries, cb)
-  }
-}
+/**
+ * Expose compiler, parser and cache on `micromatch`
+ */
 
-Glob.prototype._readdirEntries = function (abs, entries, cb) {
-  if (this.aborted)
-    return
+micromatch.compilers = compilers;
+micromatch.parsers = parsers;
+micromatch.caches = cache.caches;
 
-  // 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
-    }
-  }
+/**
+ * Expose `micromatch`
+ * @type {Function}
+ */
 
-  this.cache[abs] = entries
-  return cb(null, entries)
-}
+module.exports = micromatch;
 
-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
+/***/ }),
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+/***/ "../../node_modules/micromatch/lib/cache.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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.silent)
-        console.error('glob error', er)
-      break
-  }
+module.exports = new (__webpack_require__("../../node_modules/fragment-cache/index.js"))();
 
-  return cb()
-}
 
-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)
-  })
-}
+/***/ }),
 
+/***/ "../../node_modules/micromatch/lib/compilers.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-  //console.error('pgs2', prefix, remain[0], entries)
+"use strict";
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return cb()
 
-  // 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)
+var nanomatch = __webpack_require__("../../node_modules/nanomatch/index.js");
+var extglob = __webpack_require__("../../node_modules/extglob/index.js");
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false, cb)
+module.exports = function(snapdragon) {
+  var compilers = snapdragon.compiler.compilers;
+  var opts = snapdragon.options;
 
-  var isSym = this.symlinks[abs]
-  var len = entries.length
+  // register nanomatch compilers
+  snapdragon.use(nanomatch.compilers);
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return cb()
+  // get references to some specific nanomatch compilers before they
+  // are overridden by the extglob and/or custom compilers
+  var escape = compilers.escape;
+  var qmark = compilers.qmark;
+  var slash = compilers.slash;
+  var star = compilers.star;
+  var text = compilers.text;
+  var plus = compilers.plus;
+  var dot = compilers.dot;
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+  // register extglob compilers or escape exglobs if disabled
+  if (opts.extglob === false || opts.noext === true) {
+    snapdragon.compiler.use(escapeExtglobs);
+  } else {
+    snapdragon.use(extglob.compilers);
+  }
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true, cb)
+  snapdragon.use(function() {
+    this.options.star = this.options.star || function(/*node*/) {
+      return '[^\\\\/]*?';
+    };
+  });
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true, cb)
-  }
+  // custom micromatch compilers
+  snapdragon.compiler
 
-  cb()
-}
+    // reset referenced compiler
+    .set('dot', dot)
+    .set('escape', escape)
+    .set('plus', plus)
+    .set('slash', slash)
+    .set('qmark', qmark)
+    .set('star', star)
+    .set('text', text);
+};
 
-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) {
+function escapeExtglobs(compiler) {
+  compiler.set('paren', function(node) {
+    var val = '';
+    visit(node, function(tok) {
+      if (tok.val) val += (/^\W/.test(tok.val) ? '\\' : '') + tok.val;
+    });
+    return this.emit(val, node);
+  });
 
-  //console.error('ps2', prefix, exists)
+  /**
+   * Visit `node` with the given `fn`
+   */
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+  function visit(node, fn) {
+    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
+  }
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return cb()
+  /**
+   * Map visit over array of `nodes`.
+   */
 
-  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 += '/'
+  function mapVisit(nodes, fn) {
+    var len = nodes.length;
+    var idx = -1;
+    while (++idx < len) {
+      visit(nodes[idx], fn);
     }
   }
+}
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-  cb()
-}
+/***/ }),
 
-// Returns either 'DIR', 'FILE', or false
-Glob.prototype._stat = function (f, cb) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+/***/ "../../node_modules/micromatch/lib/parsers.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (f.length > this.maxLength)
-    return cb()
+"use strict";
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
 
-    if (Array.isArray(c))
-      c = 'DIR'
+var extglob = __webpack_require__("../../node_modules/extglob/index.js");
+var nanomatch = __webpack_require__("../../node_modules/nanomatch/index.js");
+var regexNot = __webpack_require__("../../node_modules/regex-not/index.js");
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+var not;
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return cb(null, c)
+/**
+ * Characters to use in negation regex (we want to "not" match
+ * characters that are matched by other parsers)
+ */
 
-    if (needDir && c === 'FILE')
-      return cb()
+var TEXT = '([!@*?+]?\\(|\\)|\\[:?(?=.*?:?\\])|:?\\]|[*+?!^$.\\\\/])+';
+var createNotRegex = function(opts) {
+  return not || (not = textRegex(TEXT));
+};
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+/**
+ * Parsers
+ */
 
-  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)
-    }
-  }
+module.exports = function(snapdragon) {
+  var parsers = snapdragon.parser.parsers;
 
-  var self = this
-  var statcb = inflight('stat\0' + abs, lstatcb_)
-  if (statcb)
-    fs.lstat(abs, statcb)
+  // register nanomatch parsers
+  snapdragon.use(nanomatch.parsers);
 
-  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)
-    }
-  }
-}
+  // get references to some specific nanomatch parsers before they
+  // are overridden by the extglob and/or parsers
+  var escape = parsers.escape;
+  var slash = parsers.slash;
+  var qmark = parsers.qmark;
+  var plus = parsers.plus;
+  var star = parsers.star;
+  var dot = parsers.dot;
 
-Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
-  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-    this.statCache[abs] = false
-    return cb()
-  }
+  // register extglob parsers
+  snapdragon.use(extglob.parsers);
 
-  var needDir = f.slice(-1) === '/'
-  this.statCache[abs] = stat
+  // custom micromatch parsers
+  snapdragon.parser
+    .use(function() {
+      // override "notRegex" created in nanomatch parser
+      this.notRegex = /^\!+(?!\()/;
+    })
+    // reset the referenced parsers
+    .capture('escape', escape)
+    .capture('slash', slash)
+    .capture('qmark', qmark)
+    .capture('star', star)
+    .capture('plus', plus)
+    .capture('dot', dot)
 
-  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
-    return cb(null, false, stat)
+    /**
+     * Override `text` parser
+     */
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-  this.cache[abs] = this.cache[abs] || c
+    .capture('text', function() {
+      if (this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(createNotRegex(this.options));
+      if (!m || !m[0]) return;
 
-  if (needDir && c === 'FILE')
-    return cb()
+      // escape regex boundary characters and simple brackets
+      var val = m[0].replace(/([[\]^$])/g, '\\$1');
+
+      return pos({
+        type: 'text',
+        val: val
+      });
+    });
+};
 
-  return cb(null, c, stat)
+/**
+ * Create text regex
+ */
+
+function textRegex(pattern) {
+  var notStr = regexNot.create(pattern, {contains: true, strictClose: false});
+  var prefix = '(?:[\\^]|\\\\|';
+  return toRegex(prefix + notStr + ')', {strictClose: false});
 }
 
 
 /***/ }),
-/* 76 */
+
+/***/ "../../node_modules/micromatch/lib/utils.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-function posix(path) {
-	return path.charAt(0) === '/';
-}
+var utils = module.exports;
+var path = __webpack_require__("path");
 
-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) !== ':');
+/**
+ * Module dependencies
+ */
 
-	// UNC paths are always absolute
-	return Boolean(result[2] || isUnc);
-}
+var Snapdragon = __webpack_require__("../../node_modules/snapdragon/index.js");
+utils.define = __webpack_require__("../../node_modules/micromatch/node_modules/define-property/index.js");
+utils.diff = __webpack_require__("../../node_modules/arr-diff/index.js");
+utils.extend = __webpack_require__("../../node_modules/micromatch/node_modules/extend-shallow/index.js");
+utils.pick = __webpack_require__("../../node_modules/object.pick/index.js");
+utils.typeOf = __webpack_require__("../../node_modules/kind-of/index.js");
+utils.unique = __webpack_require__("../../node_modules/array-unique/index.js");
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
+/**
+ * Returns true if the platform is windows, or `path.sep` is `\\`.
+ * This is defined as a function to allow `path.sep` to be set in unit tests,
+ * or by the user, if there is a reason to do so.
+ * @return {Boolean}
+ */
 
+utils.isWindows = function() {
+  return path.sep === '\\' || process.platform === 'win32';
+};
 
-/***/ }),
-/* 77 */,
-/* 78 */,
-/* 79 */
-/***/ (function(module, exports) {
+/**
+ * Get the `Snapdragon` instance to use
+ */
 
-module.exports = __webpack_require__(123);
+utils.instantiate = function(ast, options) {
+  var snapdragon;
+  // if an instance was created by `.parse`, use that instance
+  if (utils.typeOf(ast) === 'object' && ast.snapdragon) {
+    snapdragon = ast.snapdragon;
+  // if the user supplies an instance on options, use that instance
+  } else if (utils.typeOf(options) === 'object' && options.snapdragon) {
+    snapdragon = options.snapdragon;
+  // create a new instance
+  } else {
+    snapdragon = new Snapdragon(options);
+  }
 
-/***/ }),
-/* 80 */,
-/* 81 */
-/***/ (function(module, exports, __webpack_require__) {
+  utils.define(snapdragon, 'parse', function(str, options) {
+    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
+    parsed.input = str;
 
-"use strict";
+    // escape unmatched brace/bracket/parens
+    var last = this.parser.stack.pop();
+    if (last && this.options.strictErrors !== true) {
+      var open = last.nodes[0];
+      var inner = last.nodes[1];
+      if (last.type === 'bracket') {
+        if (inner.val.charAt(0) === '[') {
+          inner.val = '\\' + inner.val;
+        }
 
+      } else {
+        open.val = '\\' + open.val;
+        var sibling = open.parent.nodes[1];
+        if (sibling.type === 'star') {
+          sibling.loose = true;
+        }
+      }
+    }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+    // add non-enumerable parser reference
+    utils.define(parsed, 'parser', this.parser);
+    return parsed;
+  });
 
-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) };
+  return snapdragon;
 };
 
-var _util;
-
-function _load_util() {
-  return _util = _interopRequireDefault(__webpack_require__(2));
-}
-
-var _invariant;
+/**
+ * Create the key to use for memoization. The key is generated
+ * by iterating over the options and concatenating key-value pairs
+ * to the pattern string.
+ */
 
-function _load_invariant() {
-  return _invariant = _interopRequireDefault(__webpack_require__(7));
-}
+utils.createKey = function(pattern, options) {
+  if (utils.typeOf(options) !== 'object') {
+    return pattern;
+  }
+  var val = pattern;
+  var keys = Object.keys(options);
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    val += ';' + key + '=' + String(options[key]);
+  }
+  return val;
+};
 
-var _stripBom;
+/**
+ * Cast `val` to an array
+ * @return {Array}
+ */
 
-function _load_stripBom() {
-  return _stripBom = _interopRequireDefault(__webpack_require__(122));
-}
+utils.arrayify = function(val) {
+  if (typeof val === 'string') return [val];
+  return val ? (Array.isArray(val) ? val : [val]) : [];
+};
 
-var _constants;
+/**
+ * Return true if `val` is a non-empty string
+ */
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
-}
+utils.isString = function(val) {
+  return typeof val === 'string';
+};
 
-var _errors;
+/**
+ * Return true if `val` is a non-empty string
+ */
 
-function _load_errors() {
-  return _errors = __webpack_require__(4);
-}
+utils.isObject = function(val) {
+  return utils.typeOf(val) === 'object';
+};
 
-var _map;
+/**
+ * Returns true if the given `str` has special characters
+ */
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
-}
+utils.hasSpecialChars = function(str) {
+  return /(?:(?:(^|\/)[!.])|[*?+()|\[\]{}]|[+@]\()/.test(str);
+};
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Escape regex characters in the given string
+ */
 
-/* eslint quotes: 0 */
+utils.escapeRegex = function(str) {
+  return str.replace(/[-[\]{}()^$|*+?.\\\/\s]/g, '\\$&');
+};
 
-const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
+/**
+ * Normalize slashes in the given filepath.
+ *
+ * @param {String} `filepath`
+ * @return {String}
+ */
 
-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'
+utils.toPosixPath = function(str) {
+  return str.replace(/\\+/g, '/');
 };
 
-const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
+/**
+ * Strip backslashes before special characters in a string.
+ *
+ * @param {String} `str`
+ * @return {String}
+ */
 
-function isValidPropValueToken(token) {
-  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
-}
+utils.unescape = function(str) {
+  return utils.toPosixPath(str.replace(/\\(?=[*+?!.])/g, ''));
+};
 
-function* tokenise(input) {
-  let lastNewline = false;
-  let line = 1;
-  let col = 0;
+/**
+ * Strip the prefix from a filepath
+ * @param {String} `fp`
+ * @return {String}
+ */
 
-  function buildToken(type, value) {
-    return { line, col, type, value };
+utils.stripPrefix = function(str) {
+  if (str.charAt(0) !== '.') {
+    return str;
+  }
+  var ch = str.charAt(1);
+  if (utils.isSlash(ch)) {
+    return str.slice(2);
   }
+  return str;
+};
 
-  while (input.length) {
-    let chop = 0;
+/**
+ * Returns true if the given str is an escaped or
+ * unescaped path character
+ */
 
-    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++;
+utils.isSlash = function(str) {
+  return str === '/' || str === '\\/' || str === '\\' || str === '\\\\';
+};
 
-      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];
-        }
+/**
+ * Returns a function that returns true if the given
+ * pattern matches or contains a `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
 
-        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 = '';
+utils.matchPath = function(pattern, options) {
+  return (options && options.contains)
+    ? utils.containsPattern(pattern, options)
+    : utils.equalsPattern(pattern, options);
+};
 
-      for (let i = 0;; i++) {
-        const currentChar = input[i];
-        val += currentChar;
+/**
+ * Returns true if the given (original) filepath or unixified path are equal
+ * to the given pattern.
+ */
 
-        if (i > 0 && currentChar === '"') {
-          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
-          if (!isEscaped) {
-            break;
-          }
-        }
-      }
+utils._equals = function(filepath, unixPath, pattern) {
+  return pattern === filepath || pattern === unixPath;
+};
 
-      chop = val.length;
+/**
+ * Returns true if the given (original) filepath or unixified path contain
+ * the given pattern.
+ */
 
-      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;
+utils._contains = function(filepath, unixPath, pattern) {
+  return filepath.indexOf(pattern) !== -1 || unixPath.indexOf(pattern) !== -1;
+};
 
-      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;
+/**
+ * Returns a function that returns true if the given
+ * pattern is the same as a given `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
 
-      yield buildToken(TOKEN_TYPES.string, name);
-    } else {
-      yield buildToken(TOKEN_TYPES.invalid);
+utils.equalsPattern = function(pattern, options) {
+  var unixify = utils.unixify(options);
+  options = options || {};
+
+  return function fn(filepath) {
+    var equal = utils._equals(filepath, unixify(filepath), pattern);
+    if (equal === true || options.nocase !== true) {
+      return equal;
     }
+    var lower = filepath.toLowerCase();
+    return utils._equals(lower, unixify(lower), pattern);
+  };
+};
 
-    if (!chop) {
-      // will trigger infinite recursion
-      yield buildToken(TOKEN_TYPES.invalid);
+/**
+ * Returns a function that returns true if the given
+ * pattern contains a `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
+
+utils.containsPattern = function(pattern, options) {
+  var unixify = utils.unixify(options);
+  options = options || {};
+
+  return function(filepath) {
+    var contains = utils._contains(filepath, unixify(filepath), pattern);
+    if (contains === true || options.nocase !== true) {
+      return contains;
     }
+    var lower = filepath.toLowerCase();
+    return utils._contains(lower, unixify(lower), pattern);
+  };
+};
 
-    col += chop;
-    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
-    input = input.slice(chop);
-  }
+/**
+ * Returns a function that returns true if the given
+ * regex matches the `filename` of a file path.
+ *
+ * @param {RegExp} `re` Matching regex
+ * @return {Function}
+ */
 
-  yield buildToken(TOKEN_TYPES.eof);
-}
+utils.matchBasename = function(re) {
+  return function(filepath) {
+    return re.test(path.basename(filepath));
+  };
+};
 
-class Parser {
-  constructor(input, fileLoc = 'lockfile') {
-    this.comments = [];
-    this.tokens = tokenise(input);
-    this.fileLoc = fileLoc;
-  }
+/**
+ * Determines the filepath to return based on the provided options.
+ * @return {any}
+ */
 
-  onComment(token) {
-    const value = token.value;
-    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
+utils.value = function(str, unixify, options) {
+  if (options && options.unixify === false) {
+    return str;
+  }
+  return unixify(str);
+};
 
-    const comment = value.trim();
+/**
+ * Returns a function that normalizes slashes in a string to forward
+ * slashes, strips `./` from beginning of paths, and optionally unescapes
+ * special characters.
+ * @return {Function}
+ */
 
-    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.`);
-      }
+utils.unixify = function(options) {
+  options = options || {};
+  return function(filepath) {
+    if (utils.isWindows() || options.unixify === true) {
+      filepath = utils.toPosixPath(filepath);
+    }
+    if (options.stripPrefix !== false) {
+      filepath = utils.stripPrefix(filepath);
     }
+    if (options.unescape === true) {
+      filepath = utils.unescape(filepath);
+    }
+    return filepath;
+  };
+};
 
-    this.comments.push(comment);
-  }
 
-  next() {
-    const item = this.tokens.next();
-    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
+/***/ }),
 
-    const done = item.done,
-          value = item.value;
+/***/ "../../node_modules/micromatch/node_modules/braces/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    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;
-    }
-  }
+"use strict";
 
-  unexpected(msg = 'Unexpected token') {
-    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
+
+/**
+ * Module dependencies
+ */
+
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+var unique = __webpack_require__("../../node_modules/array-unique/index.js");
+var extend = __webpack_require__("../../node_modules/micromatch/node_modules/braces/node_modules/extend-shallow/index.js");
+
+/**
+ * Local dependencies
+ */
+
+var compilers = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/parsers.js");
+var Braces = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/braces.js");
+var utils = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/utils.js");
+var MAX_LENGTH = 1024 * 64;
+var cache = {};
+
+/**
+ * Convert the given `braces` pattern into a regex-compatible string. By default, only one string is generated for every input string. Set `options.expand` to true to return an array of patterns (similar to Bash or minimatch. Before using `options.expand`, it's recommended that you read the [performance notes](#performance)).
+ *
+ * ```js
+ * var braces = require('braces');
+ * console.log(braces('{a,b,c}'));
+ * //=> ['(a|b|c)']
+ *
+ * console.log(braces('{a,b,c}', {expand: true}));
+ * //=> ['a', 'b', 'c']
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {String}
+ * @api public
+ */
+
+function braces(pattern, options) {
+  var key = utils.createKey(String(pattern), options);
+  var arr = [];
+
+  var disabled = options && options.cache === false;
+  if (!disabled && cache.hasOwnProperty(key)) {
+    return cache[key];
   }
 
-  expect(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
-    } else {
-      this.unexpected();
+  if (Array.isArray(pattern)) {
+    for (var i = 0; i < pattern.length; i++) {
+      arr.push.apply(arr, braces.create(pattern[i], options));
     }
+  } else {
+    arr = braces.create(pattern, options);
   }
 
-  eat(tokType) {
-    if (this.token.type === tokType) {
-      this.next();
-      return true;
-    } else {
-      return false;
-    }
+  if (options && options.nodupes === true) {
+    arr = unique(arr);
   }
 
-  parse(indent = 0) {
-    const obj = (0, (_map || _load_map()).default)();
-
-    while (true) {
-      const propToken = this.token;
-
-      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;
-        }
-
-        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');
-
-        const keys = [key];
-        this.next();
-
-        // support multiple keys
-        while (this.token.type === TOKEN_TYPES.comma) {
-          this.next(); // skip comma
+  if (!disabled) {
+    cache[key] = arr;
+  }
+  return arr;
+}
 
-          const keyToken = this.token;
-          if (keyToken.type !== TOKEN_TYPES.string) {
-            this.unexpected('Expected string');
-          }
+/**
+ * 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 [.optimize](#optimize) instead.
+ *
+ * ```js
+ * var 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
+ */
 
-          const key = keyToken.value;
-          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
-          keys.push(key);
-          this.next();
-        }
+braces.expand = function(pattern, options) {
+  return braces.create(pattern, extend({}, options, {expand: true}));
+};
 
-        const valToken = this.token;
+/**
+ * Expands a brace pattern into a regex-compatible, optimized string. This method is called by the main [braces](#braces) function by default.
+ *
+ * ```js
+ * var braces = require('braces');
+ * console.log(braces.expand('a/{b,c}/d'));
+ * //=> ['a/(b|c)/d']
+ * ```
+ * @param {String} `pattern` Brace pattern
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
 
-        if (valToken.type === TOKEN_TYPES.colon) {
-          // object
-          this.next();
+braces.optimize = function(pattern, options) {
+  return braces.create(pattern, options);
+};
 
-          // parse object
-          const val = this.parse(indent + 1);
+/**
+ * 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
+ * var 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
+ */
 
-          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-            var _ref;
+braces.create = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-            if (_isArray) {
-              if (_i >= _iterator.length) break;
-              _ref = _iterator[_i++];
-            } else {
-              _i = _iterator.next();
-              if (_i.done) break;
-              _ref = _i.value;
-            }
+  var maxLength = (options && options.maxLength) || MAX_LENGTH;
+  if (pattern.length >= maxLength) {
+    throw new Error('expected pattern to be less than ' + maxLength + ' characters');
+  }
 
-            const key = _ref;
+  function create() {
+    if (pattern === '' || pattern.length < 3) {
+      return [pattern];
+    }
 
-            obj[key] = val;
-          }
+    if (utils.isEmptySets(pattern)) {
+      return [];
+    }
 
-          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;
+    if (utils.isQuotedString(pattern)) {
+      return [pattern.slice(1, -1)];
+    }
 
-            if (_isArray2) {
-              if (_i2 >= _iterator2.length) break;
-              _ref2 = _iterator2[_i2++];
-            } else {
-              _i2 = _iterator2.next();
-              if (_i2.done) break;
-              _ref2 = _i2.value;
-            }
+    var proto = new Braces(options);
+    var result = !options || options.expand !== true
+      ? proto.optimize(pattern, options)
+      : proto.expand(pattern, options);
 
-            const key = _ref2;
+    // get the generated pattern(s)
+    var arr = result.output;
 
-            obj[key] = valToken.value;
-          }
+    // filter out empty strings if specified
+    if (options && options.noempty === true) {
+      arr = arr.filter(Boolean);
+    }
 
-          this.next();
-        } else {
-          this.unexpected('Invalid value type');
-        }
-      } else {
-        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
-      }
+    // filter out duplicates if specified
+    if (options && options.nodupes === true) {
+      arr = unique(arr);
     }
 
-    return obj;
+    Object.defineProperty(arr, 'result', {
+      enumerable: false,
+      value: result
+    });
+
+    return arr;
   }
-}
 
-const MERGE_CONFLICT_ANCESTOR = '|||||||';
-const MERGE_CONFLICT_END = '>>>>>>>';
-const MERGE_CONFLICT_SEP = '=======';
-const MERGE_CONFLICT_START = '<<<<<<<';
+  return memoize('create', pattern, options, create);
+};
 
 /**
- * Extract the two versions of the lockfile from a merge conflict.
+ * Create a regular expression from the given string `pattern`.
+ *
+ * ```js
+ * var braces = require('braces');
+ *
+ * console.log(braces.makeRe('id-{200..300}'));
+ * //=> /^(?:id-(20[0-9]|2[1-9][0-9]|300))$/
+ * ```
+ * @param {String} `pattern` The pattern to convert to regex.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
  */
-function extractConflictVariants(str) {
-  const variants = [[], []];
-  const lines = str.split(/\r?\n/g);
-  let skip = false;
 
-  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);
-        }
-      }
+braces.makeRe = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-      // 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);
-    }
+  var maxLength = (options && options.maxLength) || MAX_LENGTH;
+  if (pattern.length >= maxLength) {
+    throw new Error('expected pattern to be less than ' + maxLength + ' characters');
   }
 
-  return [variants[0].join('\n'), variants[1].join('\n')];
-}
+  function makeRe() {
+    var arr = braces(pattern, options);
+    var opts = extend({strictErrors: false}, options);
+    return toRegex(arr, opts);
+  }
+
+  return memoize('makeRe', pattern, options, makeRe);
+};
 
 /**
- * Check if a lockfile has merge conflicts.
+ * Parse the given `str` with the given `options`.
+ *
+ * ```js
+ * var braces = require('braces');
+ * var ast = braces.parse('a/{b,c}/d');
+ * console.log(ast);
+ * // { type: 'root',
+ * //   errors: [],
+ * //   input: 'a/{b,c}/d',
+ * //   nodes:
+ * //    [ { type: 'bos', val: '' },
+ * //      { type: 'text', val: 'a/' },
+ * //      { type: 'brace',
+ * //        nodes:
+ * //         [ { type: 'brace.open', val: '{' },
+ * //           { type: 'text', val: 'b,c' },
+ * //           { type: 'brace.close', val: '}' } ] },
+ * //      { type: 'text', val: '/d' },
+ * //      { type: 'eos', val: '' } ] }
+ * ```
+ * @param {String} `pattern` Brace pattern to parse
+ * @param {Object} `options`
+ * @return {Object} Returns an AST
+ * @api public
  */
-function hasMergeConflicts(str) {
-  return str.includes(MERGE_CONFLICT_START) && str.includes(MERGE_CONFLICT_SEP) && str.includes(MERGE_CONFLICT_END);
-}
+
+braces.parse = function(pattern, options) {
+  var proto = new Braces(options);
+  return proto.parse(pattern, options);
+};
 
 /**
- * Parse the lockfile.
+ * Compile the given `ast` or string with the given `options`.
+ *
+ * ```js
+ * var braces = require('braces');
+ * var ast = braces.parse('a/{b,c}/d');
+ * console.log(braces.compile(ast));
+ * // { options: { source: 'string' },
+ * //   state: {},
+ * //   compilers:
+ * //    { eos: [Function],
+ * //      noop: [Function],
+ * //      bos: [Function],
+ * //      brace: [Function],
+ * //      'brace.open': [Function],
+ * //      text: [Function],
+ * //      'brace.close': [Function] },
+ * //   output: [ 'a/(b|c)/d' ],
+ * //   ast:
+ * //    { ... },
+ * //   parsingErrors: [] }
+ * ```
+ * @param {Object|String} `ast` AST from [.parse](#parse). If a string is passed it will be parsed first.
+ * @param {Object} `options`
+ * @return {Object} Returns an object that has an `output` property with the compiled string.
+ * @api public
  */
-function parse(str, fileLoc) {
-  const parser = new Parser(str, fileLoc);
-  parser.next();
-  return parser.parse();
-}
+
+braces.compile = function(ast, options) {
+  var proto = new Braces(options);
+  return proto.compile(ast, options);
+};
 
 /**
- * Parse and merge the two variants in a conflicted lockfile.
+ * Clear the regex cache.
+ *
+ * ```js
+ * braces.clearCache();
+ * ```
+ * @api public
  */
-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;
-    }
-  }
-}
-
-/***/ }),
-/* 82 */,
-/* 83 */,
-/* 84 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+braces.clearCache = function() {
+  cache = braces.cache = {};
+};
 
+/**
+ * Memoize a generated regex or function. A unique key is generated
+ * from the method name, pattern, and user-defined options. Set
+ * options.memoize to false to disable.
+ */
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+function memoize(type, pattern, options, fn) {
+  var key = utils.createKey(type + ':' + pattern, options);
+  var disabled = options && options.cache === false;
+  if (disabled) {
+    braces.clearCache();
+    return fn(pattern, options);
+  }
 
-var _map;
+  if (cache.hasOwnProperty(key)) {
+    return cache[key];
+  }
 
-function _load_map() {
-  return _map = _interopRequireDefault(__webpack_require__(20));
+  var res = fn(pattern, options);
+  cache[key] = res;
+  return res;
 }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Expose `Braces` constructor and methods
+ * @type {Function}
+ */
 
-const debug = __webpack_require__(212)('yarn');
+braces.Braces = Braces;
+braces.compilers = compilers;
+braces.parsers = parsers;
+braces.cache = cache;
 
-class BlockingQueue {
-  constructor(alias, maxConcurrency = Infinity) {
-    this.concurrencyQueue = [];
-    this.maxConcurrency = maxConcurrency;
-    this.runningCount = 0;
-    this.warnedStuck = false;
-    this.alias = alias;
-    this.first = true;
+/**
+ * Expose `braces`
+ * @type {Function}
+ */
 
-    this.running = (0, (_map || _load_map()).default)();
-    this.queue = (0, (_map || _load_map()).default)();
+module.exports = braces;
 
-    this.stuckTick = this.stuckTick.bind(this);
-  }
 
-  stillActive() {
-    if (this.stuckTimer) {
-      clearTimeout(this.stuckTimer);
-    }
+/***/ }),
 
-    this.stuckTimer = setTimeout(this.stuckTick, 5000);
+/***/ "../../node_modules/micromatch/node_modules/braces/lib/braces.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // 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();
-  }
+"use strict";
 
-  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]}`);
-    }
-  }
 
-  push(key, factory) {
-    if (this.first) {
-      this.first = false;
-    } else {
-      this.stillActive();
-    }
+var extend = __webpack_require__("../../node_modules/micromatch/node_modules/braces/node_modules/extend-shallow/index.js");
+var Snapdragon = __webpack_require__("../../node_modules/snapdragon/index.js");
+var compilers = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/parsers.js");
+var utils = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/utils.js");
 
-    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 });
+/**
+ * Customize Snapdragon parser and renderer
+ */
 
-      if (!this.running[key]) {
-        this.shift(key);
-      }
-    });
-  }
+function Braces(options) {
+  this.options = extend({}, options);
+}
 
-  shift(key) {
-    if (this.running[key]) {
-      delete this.running[key];
-      this.runningCount--;
+/**
+ * Initialize braces
+ */
 
-      if (this.stuckTimer) {
-        clearTimeout(this.stuckTimer);
-        this.stuckTimer = null;
-      }
+Braces.prototype.init = function(options) {
+  if (this.isInitialized) return;
+  this.isInitialized = true;
+  var opts = utils.createOptions({}, this.options, options);
+  this.snapdragon = this.options.snapdragon || new Snapdragon(opts);
+  this.compiler = this.snapdragon.compiler;
+  this.parser = this.snapdragon.parser;
 
-      if (this.warnedStuck) {
-        this.warnedStuck = false;
-        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
-      }
-    }
+  compilers(this.snapdragon, opts);
+  parsers(this.snapdragon, opts);
 
-    const queue = this.queue[key];
-    if (!queue) {
-      return;
-    }
+  /**
+   * Call Snapdragon `.parse` method. When AST is returned, we check to
+   * see if any unclosed braces are left on the stack and, if so, we iterate
+   * over the stack and correct the AST so that compilers are called in the correct
+   * order and unbalance braces are properly escaped.
+   */
 
-    var _queue$shift = queue.shift();
+  utils.define(this.snapdragon, 'parse', function(pattern, options) {
+    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
+    this.parser.ast.input = pattern;
 
-    const resolve = _queue$shift.resolve,
-          reject = _queue$shift.reject,
-          factory = _queue$shift.factory;
+    var stack = this.parser.stack;
+    while (stack.length) {
+      addParent({type: 'brace.close', val: ''}, stack.pop());
+    }
 
-    if (!queue.length) {
-      delete this.queue[key];
+    function addParent(node, parent) {
+      utils.define(node, 'parent', parent);
+      parent.nodes.push(node);
     }
 
-    const next = () => {
-      this.shift(key);
-      this.shiftConcurrencyQueue();
-    };
+    // add non-enumerable parser reference
+    utils.define(parsed, 'parser', this.parser);
+    return parsed;
+  });
+};
 
-    const run = () => {
-      this.running[key] = true;
-      this.runningCount++;
+/**
+ * Decorate `.parse` method
+ */
 
-      factory().then(function (val) {
-        resolve(val);
-        next();
-        return null;
-      }).catch(function (err) {
-        reject(err);
-        next();
-      });
-    };
+Braces.prototype.parse = function(ast, options) {
+  if (ast && typeof ast === 'object' && ast.nodes) return ast;
+  this.init(options);
+  return this.snapdragon.parse(ast, options);
+};
 
-    this.maybePushConcurrencyQueue(run);
-  }
+/**
+ * Decorate `.compile` method
+ */
 
-  maybePushConcurrencyQueue(run) {
-    if (this.runningCount < this.maxConcurrency) {
-      run();
-    } else {
-      this.concurrencyQueue.push(run);
-    }
+Braces.prototype.compile = function(ast, options) {
+  if (typeof ast === 'string') {
+    ast = this.parse(ast, options);
+  } else {
+    this.init(options);
   }
+  return this.snapdragon.compile(ast, options);
+};
 
-  shiftConcurrencyQueue() {
-    if (this.runningCount < this.maxConcurrency) {
-      const fn = this.concurrencyQueue.shift();
-      if (fn) {
-        fn();
-      }
-    }
-  }
-}
-exports.default = BlockingQueue;
+/**
+ * Expand
+ */
 
-/***/ }),
-/* 85 */
-/***/ (function(module, exports) {
+Braces.prototype.expand = function(pattern) {
+  var ast = this.parse(pattern, {expand: true});
+  return this.compile(ast, {expand: true});
+};
 
-module.exports = function (exec) {
-  try {
-    return !!exec();
-  } catch (e) {
-    return true;
-  }
+/**
+ * Optimize
+ */
+
+Braces.prototype.optimize = function(pattern) {
+  var ast = this.parse(pattern, {optimize: true});
+  return this.compile(ast, {optimize: true});
 };
 
+/**
+ * Expose `Braces`
+ */
+
+module.exports = Braces;
+
 
 /***/ }),
-/* 86 */,
-/* 87 */,
-/* 88 */,
-/* 89 */,
-/* 90 */,
-/* 91 */,
-/* 92 */,
-/* 93 */,
-/* 94 */,
-/* 95 */,
-/* 96 */,
-/* 97 */,
-/* 98 */,
-/* 99 */,
-/* 100 */
+
+/***/ "../../node_modules/micromatch/node_modules/braces/lib/compilers.js":
 /***/ (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 = 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;
-};
+var utils = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/utils.js");
 
+module.exports = function(braces, options) {
+  braces.compiler
 
-/***/ }),
-/* 101 */
-/***/ (function(module, exports) {
+    /**
+     * bos
+     */
 
-// IE 8- don't enum bug keys
-module.exports = (
-  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
-).split(',');
+    .set('bos', function() {
+      if (this.output) return;
+      this.ast.queue = isEscaped(this.ast) ? [this.ast.val] : [];
+      this.ast.count = 1;
+    })
 
+    /**
+     * Square brackets
+     */
 
-/***/ }),
-/* 102 */
-/***/ (function(module, exports, __webpack_require__) {
+    .set('bracket', function(node) {
+      var close = node.close;
+      var open = !node.escaped ? '[' : '\\[';
+      var negated = node.negated;
+      var inner = node.inner;
 
-var document = __webpack_require__(11).document;
-module.exports = document && document.documentElement;
+      inner = inner.replace(/\\(?=[\\\w]|$)/g, '\\\\');
+      if (inner === ']-') {
+        inner = '\\]\\-';
+      }
 
+      if (negated && inner.indexOf('.') === -1) {
+        inner += '.';
+      }
+      if (negated && inner.indexOf('/') === -1) {
+        inner += '/';
+      }
 
-/***/ }),
-/* 103 */
-/***/ (function(module, exports, __webpack_require__) {
+      var val = open + negated + inner + close;
+      var queue = node.parent.queue;
+      var last = utils.arrayify(queue.pop());
 
-"use strict";
+      queue.push(utils.join(last, val));
+      queue.push.apply(queue, []);
+    })
 
-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';
+    /**
+     * Brace
+     */
 
-var returnThis = function () { return this; };
+    .set('brace', function(node) {
+      node.queue = isEscaped(node) ? [node.val] : [];
+      node.count = 1;
+      return this.mapVisit(node.nodes);
+    })
 
-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);
-    }
-  }
-  // 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;
-};
+    /**
+     * Open
+     */
 
+    .set('brace.open', function(node) {
+      node.parent.open = node.val;
+    })
 
-/***/ }),
-/* 104 */
-/***/ (function(module, exports) {
+    /**
+     * Inner
+     */
 
-module.exports = function (exec) {
-  try {
-    return { e: false, v: exec() };
-  } catch (e) {
-    return { e: true, v: e };
-  }
-};
+    .set('text', function(node) {
+      var queue = node.parent.queue;
+      var escaped = node.escaped;
+      var segs = [node.val];
 
+      if (node.optimize === false) {
+        options = utils.extend({}, options, {optimize: false});
+      }
 
-/***/ }),
-/* 105 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (node.multiplier > 1) {
+        node.parent.count *= node.multiplier;
+      }
 
-var anObject = __webpack_require__(27);
-var isObject = __webpack_require__(34);
-var newPromiseCapability = __webpack_require__(70);
+      if (options.quantifiers === true && utils.isQuantifier(node.val)) {
+        escaped = true;
 
-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;
-};
+      } else if (node.val.length > 1) {
+        if (isType(node.parent, 'brace') && !isEscaped(node)) {
+          var expanded = utils.expand(node.val, options);
+          segs = expanded.segs;
 
+          if (expanded.isOptimized) {
+            node.parent.isOptimized = true;
+          }
 
-/***/ }),
-/* 106 */
-/***/ (function(module, exports) {
+          // if nothing was expanded, we probably have a literal brace
+          if (!segs.length) {
+            var val = (expanded.val || node.val);
+            if (options.unescape !== false) {
+              // unescape unexpanded brace sequence/set separators
+              val = val.replace(/\\([,.])/g, '$1');
+              // strip quotes
+              val = val.replace(/["'`]/g, '');
+            }
 
-module.exports = function (bitmap, value) {
-  return {
-    enumerable: !(bitmap & 1),
-    configurable: !(bitmap & 2),
-    writable: !(bitmap & 4),
-    value: value
-  };
-};
+            segs = [val];
+            escaped = true;
+          }
+        }
 
+      } else if (node.val === ',') {
+        if (options.expand) {
+          node.parent.queue.push(['']);
+          segs = [''];
+        } else {
+          segs = ['|'];
+        }
+      } else {
+        escaped = true;
+      }
 
-/***/ }),
-/* 107 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (escaped && isType(node.parent, 'brace')) {
+        if (node.parent.nodes.length <= 4 && node.parent.count === 1) {
+          node.parent.escaped = true;
+        } else if (node.parent.length <= 3) {
+          node.parent.escaped = true;
+        }
+      }
 
-var core = __webpack_require__(23);
-var global = __webpack_require__(11);
-var SHARED = '__core-js_shared__';
-var store = global[SHARED] || (global[SHARED] = {});
+      if (!hasQueue(node.parent)) {
+        node.parent.queue = segs;
+        return;
+      }
 
-(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)'
-});
+      var last = utils.arrayify(queue.pop());
+      if (node.parent.count > 1 && options.expand) {
+        last = multiply(last, node.parent.count);
+        node.parent.count = 1;
+      }
 
+      queue.push(utils.join(utils.flatten(last), segs.shift()));
+      queue.push.apply(queue, segs);
+    })
 
-/***/ }),
-/* 108 */
-/***/ (function(module, exports, __webpack_require__) {
+    /**
+     * Close
+     */
 
-// 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);
-};
+    .set('brace.close', function(node) {
+      var queue = node.parent.queue;
+      var prev = node.parent.parent;
+      var last = prev.queue.pop();
+      var open = node.parent.open;
+      var close = node.val;
 
+      if (open && close && isOptimized(node, options)) {
+        open = '(';
+        close = ')';
+      }
 
-/***/ }),
-/* 109 */
-/***/ (function(module, exports, __webpack_require__) {
+      // if a close brace exists, and the previous segment is one character
+      // don't wrap the result in braces or parens
+      var ele = utils.last(queue);
+      if (node.parent.count > 1 && options.expand) {
+        ele = multiply(queue.pop(), node.parent.count);
+        node.parent.count = 1;
+        queue.push(ele);
+      }
 
-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
-};
+      if (close && typeof ele === 'string' && ele.length === 1) {
+        open = '';
+        close = '';
+      }
+
+      if ((isLiteralBrace(node, options) || noInner(node)) && !node.parent.hasEmpty) {
+        queue.push(utils.join(open, queue.pop() || ''));
+        queue = utils.flatten(utils.join(queue, close));
+      }
 
+      if (typeof last === 'undefined') {
+        prev.queue = [queue];
+      } else {
+        prev.queue.push(utils.flatten(utils.join(last, queue)));
+      }
+    })
 
-/***/ }),
-/* 110 */
-/***/ (function(module, exports, __webpack_require__) {
+    /**
+     * eos
+     */
+
+    .set('eos', function(node) {
+      if (this.input) return;
 
-// 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
-};
+      if (options.optimize !== false) {
+        this.output = utils.last(utils.flatten(this.ast.queue));
+      } else if (Array.isArray(utils.last(this.ast.queue))) {
+        this.output = utils.flatten(this.ast.queue.pop());
+      } else {
+        this.output = utils.flatten(this.ast.queue);
+      }
 
+      if (node.parent.count > 1 && options.expand) {
+        this.output = multiply(this.output, node.parent.count);
+      }
 
-/***/ }),
-/* 111 */
-/***/ (function(module, exports) {
+      this.output = utils.arrayify(this.output);
+      this.ast.queue = [];
+    });
 
-var id = 0;
-var px = Math.random();
-module.exports = function (key) {
-  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
 };
 
+/**
+ * Multiply the segments in the current brace level
+ */
 
-/***/ }),
-/* 112 */
-/***/ (function(module, exports, __webpack_require__) {
-
+function multiply(queue, n, options) {
+  return utils.flatten(utils.repeat(utils.arrayify(queue), n));
+}
 
 /**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- *
- * Expose `debug()` as the module.
+ * Return true if `node` is escaped
  */
 
-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);
+function isEscaped(node) {
+  return node.escaped === true;
+}
 
 /**
- * Active `debug` instances.
+ * Returns true if regex parens should be used for sets. If the parent `type`
+ * is not `brace`, then we're on a root node, which means we should never
+ * expand segments and open/close braces should be `{}` (since this indicates
+ * a brace is missing from the set)
  */
-exports.instances = [];
+
+function isOptimized(node, options) {
+  if (node.parent.isOptimized) return true;
+  return isType(node.parent, 'brace')
+    && !isEscaped(node.parent)
+    && options.expand !== true;
+}
 
 /**
- * The currently active debug mode names, and names to skip.
+ * Returns true if the value in `node` should be wrapped in a literal brace.
+ * @return {Boolean}
  */
 
-exports.names = [];
-exports.skips = [];
+function isLiteralBrace(node, options) {
+  return isEscaped(node.parent) || options.optimize !== false;
+}
 
 /**
- * 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".
+ * Returns true if the given `node` does not have an inner value.
+ * @return {Boolean}
  */
 
-exports.formatters = {};
+function noInner(node, type) {
+  if (node.parent.queue.length === 1) {
+    return true;
+  }
+  var nodes = node.parent.nodes;
+  return nodes.length === 3
+    && isType(nodes[0], 'brace.open')
+    && !isType(nodes[1], 'text')
+    && isType(nodes[2], 'brace.close');
+}
 
 /**
- * Select a color.
- * @param {String} namespace
- * @return {Number}
- * @api private
+ * Returns true if the given `node` is the given `type`
+ * @return {Boolean}
  */
 
-function selectColor(namespace) {
-  var hash = 0, i;
+function isType(node, type) {
+  return typeof node !== 'undefined' && node.type === type;
+}
 
-  for (i in namespace) {
-    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
-    hash |= 0; // Convert to 32bit integer
-  }
+/**
+ * Returns true if the given `node` has a non-empty queue.
+ * @return {Boolean}
+ */
 
-  return exports.colors[Math.abs(hash) % exports.colors.length];
+function hasQueue(node) {
+  return Array.isArray(node.queue) && node.queue.length;
 }
 
+
+/***/ }),
+
+/***/ "../../node_modules/micromatch/node_modules/braces/lib/parsers.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Node = __webpack_require__("../../node_modules/snapdragon-node/index.js");
+var utils = __webpack_require__("../../node_modules/micromatch/node_modules/braces/lib/utils.js");
+
 /**
- * Create a debugger with the given `namespace`.
- *
- * @param {String} namespace
- * @return {Function}
- * @api public
+ * Braces parsers
  */
 
-function createDebug(namespace) {
+module.exports = function(braces, options) {
+  braces.parser
+    .set('bos', function() {
+      if (!this.parsed) {
+        this.ast = this.nodes[0] = new Node(this.ast);
+      }
+    })
 
-  var prevTime;
+    /**
+     * Character parsers
+     */
 
-  function debug() {
-    // disabled?
-    if (!debug.enabled) return;
+    .set('escape', function() {
+      var pos = this.position();
+      var m = this.match(/^(?:\\(.)|\$\{)/);
+      if (!m) return;
 
-    var self = debug;
+      var prev = this.prev();
+      var last = utils.last(prev.nodes);
 
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
+      var node = pos(new Node({
+        type: 'text',
+        multiplier: 1,
+        val: m[0]
+      }));
 
-    // 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];
-    }
+      if (node.val === '\\\\') {
+        return node;
+      }
 
-    args[0] = exports.coerce(args[0]);
+      if (node.val === '${') {
+        var str = this.input;
+        var idx = -1;
+        var ch;
 
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %O
-      args.unshift('%O');
-    }
+        while ((ch = str[++idx])) {
+          this.consume(1);
+          node.val += ch;
+          if (ch === '\\') {
+            node.val += str[++idx];
+            continue;
+          }
+          if (ch === '}') {
+            break;
+          }
+        }
+      }
 
-    // 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);
+      if (this.options.unescape !== false) {
+        node.val = node.val.replace(/\\([{}])/g, '$1');
+      }
 
-        // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
+      if (last.val === '"' && this.input.charAt(0) === '"') {
+        last.val = node.val;
+        this.consume(1);
+        return;
       }
-      return match;
-    });
 
-    // apply env-specific formatting (colors, etc.)
-    exports.formatArgs.call(self, args);
+      return concatNodes.call(this, pos, node, prev, options);
+    })
 
-    var logFn = debug.log || exports.log || console.log.bind(console);
-    logFn.apply(self, args);
-  }
+    /**
+     * Brackets: "[...]" (basic, this is overridden by
+     * other parsers in more advanced implementations)
+     */
 
-  debug.namespace = namespace;
-  debug.enabled = exports.enabled(namespace);
-  debug.useColors = exports.useColors();
-  debug.color = selectColor(namespace);
-  debug.destroy = destroy;
+    .set('bracket', function() {
+      var isInside = this.isInside('brace');
+      var pos = this.position();
+      var m = this.match(/^(?:\[([!^]?)([^\]]{2,}|\]-)(\]|[^*+?]+)|\[)/);
+      if (!m) return;
 
-  // env-specific initialization logic for debug instances
-  if ('function' === typeof exports.init) {
-    exports.init(debug);
-  }
+      var prev = this.prev();
+      var val = m[0];
+      var negated = m[1] ? '^' : '';
+      var inner = m[2] || '';
+      var close = m[3] || '';
 
-  exports.instances.push(debug);
+      if (isInside && prev.type === 'brace') {
+        prev.text = prev.text || '';
+        prev.text += val;
+      }
 
-  return debug;
-}
+      var esc = this.input.slice(0, 2);
+      if (inner === '' && esc === '\\]') {
+        inner += esc;
+        this.consume(2);
 
-function destroy () {
-  var index = exports.instances.indexOf(this);
-  if (index !== -1) {
-    exports.instances.splice(index, 1);
-    return true;
-  } else {
-    return false;
-  }
-}
+        var str = this.input;
+        var idx = -1;
+        var ch;
 
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
+        while ((ch = str[++idx])) {
+          this.consume(1);
+          if (ch === ']') {
+            close = ch;
+            break;
+          }
+          inner += ch;
+        }
+      }
 
-function enable(namespaces) {
-  exports.save(namespaces);
+      return pos(new Node({
+        type: 'bracket',
+        val: val,
+        escaped: close !== ']',
+        negated: negated,
+        inner: inner,
+        close: close
+      }));
+    })
 
-  exports.names = [];
-  exports.skips = [];
+    /**
+     * Empty braces (we capture these early to
+     * speed up processing in the compiler)
+     */
 
-  var i;
-  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-  var len = split.length;
+    .set('multiplier', function() {
+      var isInside = this.isInside('brace');
+      var pos = this.position();
+      var m = this.match(/^\{((?:,|\{,+\})+)\}/);
+      if (!m) return;
 
-  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 + '$'));
-    }
-  }
+      this.multiplier = true;
+      var prev = this.prev();
+      var val = m[0];
 
-  for (i = 0; i < exports.instances.length; i++) {
-    var instance = exports.instances[i];
-    instance.enabled = exports.enabled(instance.namespace);
-  }
-}
+      if (isInside && prev.type === 'brace') {
+        prev.text = prev.text || '';
+        prev.text += val;
+      }
 
-/**
- * Disable debug output.
- *
- * @api public
- */
+      var node = pos(new Node({
+        type: 'text',
+        multiplier: 1,
+        match: m,
+        val: val
+      }));
 
-function disable() {
-  exports.enable('');
-}
+      return concatNodes.call(this, pos, node, prev, options);
+    })
 
-/**
- * Returns true if the given mode name is enabled, false otherwise.
- *
- * @param {String} name
- * @return {Boolean}
- * @api public
- */
+    /**
+     * Open
+     */
 
-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;
-    }
-  }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
-    }
-  }
-  return false;
-}
+    .set('brace.open', function() {
+      var pos = this.position();
+      var m = this.match(/^\{(?!(?:[^\\}]?|,+)\})/);
+      if (!m) return;
+
+      var prev = this.prev();
+      var last = utils.last(prev.nodes);
+
+      // if the last parsed character was an extglob character
+      // we need to _not optimize_ the brace pattern because
+      // it might be mistaken for an extglob by a downstream parser
+      if (last && last.val && isExtglobChar(last.val.slice(-1))) {
+        last.optimize = false;
+      }
+
+      var open = pos(new Node({
+        type: 'brace.open',
+        val: m[0]
+      }));
+
+      var node = pos(new Node({
+        type: 'brace',
+        nodes: []
+      }));
+
+      node.push(open);
+      prev.push(node);
+      this.push('brace', node);
+    })
+
+    /**
+     * Close
+     */
+
+    .set('brace.close', function() {
+      var pos = this.position();
+      var m = this.match(/^\}/);
+      if (!m || !m[0]) return;
+
+      var brace = this.pop('brace');
+      var node = pos(new Node({
+        type: 'brace.close',
+        val: m[0]
+      }));
+
+      if (!this.isType(brace, 'brace')) {
+        if (this.options.strict) {
+          throw new Error('missing opening "{"');
+        }
+        node.type = 'text';
+        node.multiplier = 0;
+        node.escaped = true;
+        return node;
+      }
+
+      var prev = this.prev();
+      var last = utils.last(prev.nodes);
+      if (last.text) {
+        var lastNode = utils.last(last.nodes);
+        if (lastNode.val === ')' && /[!@*?+]\(/.test(last.text)) {
+          var open = last.nodes[0];
+          var text = last.nodes[1];
+          if (open.type === 'brace.open' && text && text.type === 'text') {
+            text.optimize = false;
+          }
+        }
+      }
+
+      if (brace.nodes.length > 2) {
+        var first = brace.nodes[1];
+        if (first.type === 'text' && first.val === ',') {
+          brace.nodes.splice(1, 1);
+          brace.nodes.push(first);
+        }
+      }
+
+      brace.push(node);
+    })
+
+    /**
+     * Capture boundary characters
+     */
+
+    .set('boundary', function() {
+      var pos = this.position();
+      var m = this.match(/^[$^](?!\{)/);
+      if (!m) return;
+      return pos(new Node({
+        type: 'text',
+        val: m[0]
+      }));
+    })
+
+    /**
+     * One or zero, non-comma characters wrapped in braces
+     */
+
+    .set('nobrace', function() {
+      var isInside = this.isInside('brace');
+      var pos = this.position();
+      var m = this.match(/^\{[^,]?\}/);
+      if (!m) return;
+
+      var prev = this.prev();
+      var val = m[0];
+
+      if (isInside && prev.type === 'brace') {
+        prev.text = prev.text || '';
+        prev.text += val;
+      }
+
+      return pos(new Node({
+        type: 'text',
+        multiplier: 0,
+        val: val
+      }));
+    })
+
+    /**
+     * Text
+     */
+
+    .set('text', function() {
+      var isInside = this.isInside('brace');
+      var pos = this.position();
+      var m = this.match(/^((?!\\)[^${}[\]])+/);
+      if (!m) return;
+
+      var prev = this.prev();
+      var val = m[0];
+
+      if (isInside && prev.type === 'brace') {
+        prev.text = prev.text || '';
+        prev.text += val;
+      }
+
+      var node = pos(new Node({
+        type: 'text',
+        multiplier: 1,
+        val: val
+      }));
+
+      return concatNodes.call(this, pos, node, prev, options);
+    });
+};
 
 /**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
+ * Returns true if the character is an extglob character.
  */
 
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
+function isExtglobChar(ch) {
+  return ch === '!' || ch === '@' || ch === '*' || ch === '?' || ch === '+';
 }
 
+/**
+ * Combine text nodes, and calculate empty sets (`{,,}`)
+ * @param {Function} `pos` Function to calculate node position
+ * @param {Object} `node` AST node
+ * @return {Object}
+ */
 
-/***/ }),
-/* 113 */,
-/* 114 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = realpath
-realpath.realpath = realpath
-realpath.sync = realpathSync
-realpath.realpathSync = realpathSync
-realpath.monkeypatch = monkeypatch
-realpath.unmonkeypatch = unmonkeypatch
-
-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)
+function concatNodes(pos, node, parent, options) {
+  node.orig = node.val;
+  var prev = this.prev();
+  var last = utils.last(prev.nodes);
+  var isEscaped = false;
 
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
-}
+  if (node.val.length > 1) {
+    var a = node.val.charAt(0);
+    var b = node.val.slice(-1);
 
-function realpath (p, cache, cb) {
-  if (ok) {
-    return origRealpath(p, cache, cb)
+    isEscaped = (a === '"' && b === '"')
+      || (a === "'" && b === "'")
+      || (a === '`' && b === '`');
   }
 
-  if (typeof cache === 'function') {
-    cb = cache
-    cache = null
+  if (isEscaped && options.unescape !== false) {
+    node.val = node.val.slice(1, node.val.length - 1);
+    node.escaped = true;
   }
-  origRealpath(p, cache, function (er, result) {
-    if (newError(er)) {
-      old.realpath(p, cache, cb)
-    } else {
-      cb(er, result)
+
+  if (node.match) {
+    var match = node.match[1];
+    if (!match || match.indexOf('}') === -1) {
+      match = node.match[0];
     }
-  })
-}
 
-function realpathSync (p, cache) {
-  if (ok) {
-    return origRealpathSync(p, cache)
+    // replace each set with a single ","
+    var val = match.replace(/\{/g, ',').replace(/\}/g, '');
+    node.multiplier *= val.length;
+    node.val = '';
   }
 
-  try {
-    return origRealpathSync(p, cache)
-  } catch (er) {
-    if (newError(er)) {
-      return old.realpathSync(p, cache)
-    } else {
-      throw er
-    }
-  }
-}
+  var simpleText = last.type === 'text'
+    && last.multiplier === 1
+    && node.multiplier === 1
+    && node.val;
 
-function monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
-}
+  if (simpleText) {
+    last.val += node.val;
+    return;
+  }
 
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
+  prev.push(node);
 }
 
 
 /***/ }),
-/* 115 */
+
+/***/ "../../node_modules/micromatch/node_modules/braces/lib/utils.js":
 /***/ (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)
-}
 
-var path = __webpack_require__(0)
-var minimatch = __webpack_require__(60)
-var isAbsolute = __webpack_require__(76)
-var Minimatch = minimatch.Minimatch
+var splitString = __webpack_require__("../../node_modules/split-string/index.js");
+var utils = module.exports;
 
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
-}
+/**
+ * Module dependencies
+ */
 
-function alphasort (a, b) {
-  return a.localeCompare(b)
-}
+utils.extend = __webpack_require__("../../node_modules/micromatch/node_modules/braces/node_modules/extend-shallow/index.js");
+utils.flatten = __webpack_require__("../../node_modules/arr-flatten/index.js");
+utils.isObject = __webpack_require__("../../node_modules/isobject/index.js");
+utils.fillRange = __webpack_require__("../../node_modules/micromatch/node_modules/fill-range/index.js");
+utils.repeat = __webpack_require__("../../node_modules/repeat-element/index.js");
+utils.unique = __webpack_require__("../../node_modules/array-unique/index.js");
 
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
+utils.define = function(obj, key, val) {
+  Object.defineProperty(obj, key, {
+    writable: true,
+    configurable: true,
+    enumerable: false,
+    value: val
+  });
+};
 
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
+/**
+ * Returns true if the given string contains only empty brace sets.
+ */
 
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
-}
+utils.isEmptySets = function(str) {
+  return /^(?:\{,\})+$/.test(str);
+};
 
-// 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 })
-  }
+/**
+ * Returns true if the given string contains only empty brace sets.
+ */
 
-  return {
-    matcher: new Minimatch(pattern, { dot: true }),
-    gmatcher: gmatcher
+utils.isQuotedString = function(str) {
+  var open = str.charAt(0);
+  if (open === '\'' || open === '"' || open === '`') {
+    return str.slice(-1) === open;
   }
-}
+  return false;
+};
 
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
+/**
+ * Create the key to use for memoization. The unique key is generated
+ * by iterating over the options and concatenating key-value pairs
+ * to the pattern string.
+ */
 
-  // 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
+utils.createKey = function(pattern, options) {
+  var id = pattern;
+  if (typeof options === 'undefined') {
+    return id;
   }
+  var keys = Object.keys(options);
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    id += ';' + key + '=' + String(options[key]);
+  }
+  return id;
+};
 
-  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)
-
-  setupIgnores(self, options)
+/**
+ * Normalize 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
+utils.createOptions = function(options) {
+  var opts = utils.extend.apply(null, arguments);
+  if (typeof opts.expand === 'boolean') {
+    opts.optimize = !opts.expand;
   }
+  if (typeof opts.optimize === 'boolean') {
+    opts.expand = !opts.optimize;
+  }
+  if (opts.optimize === true) {
+    opts.makeRe = true;
+  }
+  return opts;
+};
 
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
-
-  // 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
+/**
+ * Join patterns in `a` to patterns in `b`
+ */
 
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
+utils.join = function(a, b, options) {
+  options = options || {};
+  a = utils.arrayify(a);
+  b = utils.arrayify(b);
 
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
-}
+  if (!a.length) return b;
+  if (!b.length) return a;
 
-function finish (self) {
-  var nou = self.nounique
-  var all = nou ? [] : Object.create(null)
+  var len = a.length;
+  var idx = -1;
+  var arr = [];
 
-  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
+  while (++idx < len) {
+    var val = a[idx];
+    if (Array.isArray(val)) {
+      for (var i = 0; i < val.length; i++) {
+        val[i] = utils.join(val[i], b, options);
       }
-    } else {
-      // had matches
-      var m = Object.keys(matches)
-      if (nou)
-        all.push.apply(all, m)
-      else
-        m.forEach(function (m) {
-          all[m] = true
-        })
+      arr.push(val);
+      continue;
     }
-  }
 
-  if (!nou)
-    all = Object.keys(all)
-
-  if (!self.nosort)
-    all = all.sort(self.nocase ? alphasorti : alphasort)
+    for (var j = 0; j < b.length; j++) {
+      var bval = b[j];
 
-  // 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 (Array.isArray(bval)) {
+        arr.push(utils.join(val, bval, options));
+      } else {
+        arr.push(val + bval);
+      }
     }
   }
+  return arr;
+};
 
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
-
-  self.found = all
-}
-
-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)
+/**
+ * Split the given string on `,` if not escaped.
+ */
 
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
-    }
+utils.split = function(str, options) {
+  var opts = utils.extend({sep: ','}, options);
+  if (typeof opts.keepQuotes !== 'boolean') {
+    opts.keepQuotes = true;
   }
-
-  return m
-}
-
-// 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)
+  if (opts.unescape === false) {
+    opts.keepEscaping = true;
   }
+  return splitString(str, opts, utils.escapeBrackets(opts));
+};
 
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
-
-  return abs
-}
-
-
-// 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
-
-  return self.ignore.some(function(item) {
-    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
-
-function childrenIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
-
-  return self.ignore.some(function(item) {
-    return !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
-
-
-/***/ }),
-/* 116 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var path = __webpack_require__(0);
-var fs = __webpack_require__(3);
-var _0777 = parseInt('0777', 8);
+/**
+ * Expand ranges or sets in the given `pattern`.
+ *
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {Object}
+ */
 
-module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
+utils.expand = function(str, options) {
+  var opts = utils.extend({rangeLimit: 10000}, options);
+  var segs = utils.split(str, opts);
+  var tok = { segs: segs };
 
-function mkdirP (p, opts, f, made) {
-    if (typeof opts === 'function') {
-        f = opts;
-        opts = {};
-    }
-    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;
+  if (utils.isQuotedString(str)) {
+    return tok;
+  }
 
-            // 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;
-        }
-    });
-}
+  if (opts.rangeLimit === true) {
+    opts.rangeLimit = 10000;
+  }
 
-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 (segs.length > 1) {
+    if (opts.optimize === false) {
+      tok.val = segs[0];
+      return tok;
     }
-    if (!made) made = null;
 
-    p = path.resolve(p);
+    tok.segs = utils.stringifyArray(tok.segs);
+  } else if (segs.length === 1) {
+    var arr = str.split('..');
 
-    try {
-        xfs.mkdirSync(p, mode);
-        made = made || p;
+    if (arr.length === 1) {
+      tok.val = tok.segs[tok.segs.length - 1] || tok.val || str;
+      tok.segs = [];
+      return tok;
     }
-    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;
-        }
+    if (arr.length === 2 && arr[0] === arr[1]) {
+      tok.escaped = true;
+      tok.val = arr[0];
+      tok.segs = [];
+      return tok;
     }
 
-    return made;
-};
+    if (arr.length > 1) {
+      if (opts.optimize !== false) {
+        opts.optimize = true;
+        delete opts.expand;
+      }
 
+      if (opts.optimize !== true) {
+        var min = Math.min(arr[0], arr[1]);
+        var max = Math.max(arr[0], arr[1]);
+        var step = arr[2] || 1;
 
-/***/ }),
-/* 117 */,
-/* 118 */,
-/* 119 */,
-/* 120 */,
-/* 121 */,
-/* 122 */
-/***/ (function(module, exports, __webpack_require__) {
+        if (opts.rangeLimit !== false && ((max - min) / step >= opts.rangeLimit)) {
+          throw new RangeError('expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.');
+        }
+      }
 
-"use strict";
+      arr.push(opts);
+      tok.segs = utils.fillRange.apply(null, arr);
 
-module.exports = x => {
-	if (typeof x !== 'string') {
-		throw new TypeError('Expected a string, got ' + typeof x);
-	}
+      if (!tok.segs.length) {
+        tok.escaped = true;
+        tok.val = str;
+        return tok;
+      }
 
-	// 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);
-	}
+      if (opts.optimize === true) {
+        tok.segs = utils.stringifyArray(tok.segs);
+      }
 
-	return x;
+      if (tok.segs === '') {
+        tok.val = str;
+      } else {
+        tok.val = tok.segs[0];
+      }
+      return tok;
+    }
+  } else {
+    tok.val = str;
+  }
+  return tok;
 };
 
+/**
+ * Ensure commas inside brackets and parens are not split.
+ * @param {Object} `tok` Token from the `split-string` module
+ * @return {undefined}
+ */
 
-/***/ }),
-/* 123 */
-/***/ (function(module, exports) {
+utils.escapeBrackets = function(options) {
+  return function(tok) {
+    if (tok.escaped && tok.val === 'b') {
+      tok.val = '\\b';
+      return;
+    }
 
-// 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 (tok.val !== '(' && tok.val !== '[') return;
+    var opts = utils.extend({}, options);
+    var brackets = [];
+    var parens = [];
+    var stack = [];
+    var val = tok.val;
+    var str = tok.str;
+    var i = tok.idx - 1;
 
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
+    while (++i < str.length) {
+      var ch = str[i];
 
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
+      if (ch === '\\') {
+        val += (opts.keepEscaping === false ? '' : ch) + str[++i];
+        continue;
+      }
 
-  return wrapper
+      if (ch === '(') {
+        parens.push(ch);
+        stack.push(ch);
+      }
 
-  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 (ch === '[') {
+        brackets.push(ch);
+        stack.push(ch);
+      }
 
+      if (ch === ')') {
+        parens.pop();
+        stack.pop();
+        if (!stack.length) {
+          val += ch;
+          break;
+        }
+      }
 
-/***/ }),
-/* 124 */,
-/* 125 */,
-/* 126 */,
-/* 127 */,
-/* 128 */,
-/* 129 */,
-/* 130 */,
-/* 131 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (ch === ']') {
+        brackets.pop();
+        stack.pop();
+        if (!stack.length) {
+          val += ch;
+          break;
+        }
+      }
+      val += ch;
+    }
 
-// 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);
+    tok.split = false;
+    tok.val = val.slice(1);
+    tok.idx = i;
+  };
 };
 
+/**
+ * Returns true if the given string looks like a regex quantifier
+ * @return {Boolean}
+ */
 
-/***/ }),
-/* 132 */
-/***/ (function(module, exports, __webpack_require__) {
+utils.isQuantifier = function(str) {
+  return /^(?:[0-9]?,[0-9]|[0-9],)$/.test(str);
+};
 
-// 19.1.2.14 / 15.2.3.14 Object.keys(O)
-var $keys = __webpack_require__(195);
-var enumBugKeys = __webpack_require__(101);
+/**
+ * Cast `val` to an array.
+ * @param {*} `val`
+ */
 
-module.exports = Object.keys || function keys(O) {
-  return $keys(O, enumBugKeys);
+utils.stringifyArray = function(arr) {
+  return [utils.arrayify(arr).join('|')];
 };
 
+/**
+ * Cast `val` to an array.
+ * @param {*} `val`
+ */
 
-/***/ }),
-/* 133 */
-/***/ (function(module, exports, __webpack_require__) {
+utils.arrayify = function(arr) {
+  if (typeof arr === 'undefined') {
+    return [];
+  }
+  if (typeof arr === 'string') {
+    return [arr];
+  }
+  return arr;
+};
 
-// 7.1.13 ToObject(argument)
-var defined = __webpack_require__(67);
-module.exports = function (it) {
-  return Object(defined(it));
+/**
+ * Returns true if the given `str` is a non-empty string
+ * @return {Boolean}
+ */
+
+utils.isString = function(str) {
+  return str != null && typeof str === 'string';
 };
 
+/**
+ * Get the last element from `array`
+ * @param {Array} `array`
+ * @return {*}
+ */
 
-/***/ }),
-/* 134 */,
-/* 135 */,
-/* 136 */,
-/* 137 */,
-/* 138 */,
-/* 139 */,
-/* 140 */,
-/* 141 */,
-/* 142 */,
-/* 143 */,
-/* 144 */,
-/* 145 */
-/***/ (function(module, exports) {
+utils.last = function(arr, n) {
+  return arr[arr.length - (n || 1)];
+};
+
+utils.escapeRegex = function(str) {
+  return str.replace(/\\?([!^*?()[\]{}+?/])/g, '\\$1');
+};
 
-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"}}}
 
 /***/ }),
-/* 146 */,
-/* 147 */,
-/* 148 */,
-/* 149 */,
-/* 150 */
+
+/***/ "../../node_modules/micromatch/node_modules/braces/node_modules/extend-shallow/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = stringify;
+var isObject = __webpack_require__("../../node_modules/micromatch/node_modules/braces/node_modules/is-extendable/index.js");
 
-var _misc;
+module.exports = function extend(o/*, objects*/) {
+  if (!isObject(o)) { o = {}; }
 
-function _load_misc() {
-  return _misc = __webpack_require__(12);
-}
+  var len = arguments.length;
+  for (var i = 1; i < len; i++) {
+    var obj = arguments[i];
 
-var _constants;
+    if (isObject(obj)) {
+      assign(o, obj);
+    }
+  }
+  return o;
+};
 
-function _load_constants() {
-  return _constants = __webpack_require__(6);
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
+  }
 }
 
-var _package;
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-function _load_package() {
-  return _package = __webpack_require__(145);
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
 }
 
-const NODE_VERSION = process.version;
 
-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;
-  }
-}
+/***/ "../../node_modules/micromatch/node_modules/braces/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const priorities = {
-  name: 1,
-  version: 2,
-  uid: 3,
-  resolved: 4,
-  integrity: 5,
-  registry: 6,
-  dependencies: 7
-};
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-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 = [];
+module.exports = function isExtendable(val) {
+  return typeof val !== 'undefined' && val !== null
+    && (typeof val === 'object' || typeof val === 'function');
+};
 
-  // 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);
 
-  let addedKeys = [];
+/***/ }),
 
-  for (let i = 0; i < keys.length; i++) {
-    const key = keys[i];
-    const val = obj[key];
-    if (val == null || addedKeys.indexOf(key) >= 0) {
-      continue;
-    }
+/***/ "../../node_modules/micromatch/node_modules/define-property/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    const valKeys = [key];
+"use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-    // 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);
-        }
-      }
-    }
 
-    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();
-    }
+var isobject = __webpack_require__("../../node_modules/isobject/index.js");
+var isDescriptor = __webpack_require__("../../node_modules/is-descriptor/index.js");
+var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
+  ? Reflect.defineProperty
+  : Object.defineProperty;
 
-    addedKeys = addedKeys.concat(valKeys);
+module.exports = function defineProperty(obj, key, val) {
+  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
+    throw new TypeError('expected an object, function, or array');
   }
 
-  return indent + lines.join(`\n${indent}`);
-}
-
-function stringify(obj, noHeader, enableVersions) {
-  const val = _stringify(obj, {
-    indent: '',
-    topLevel: true
-  });
-  if (noHeader) {
-    return val;
+  if (typeof key !== 'string') {
+    throw new TypeError('expected "key" to be a string');
   }
 
-  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}`);
+  if (isDescriptor(val)) {
+    define(obj, key, val);
+    return obj;
   }
-  lines.push('\n');
-  lines.push(val);
 
-  return lines.join('\n');
-}
-
-/***/ }),
-/* 151 */,
-/* 152 */,
-/* 153 */,
-/* 154 */,
-/* 155 */,
-/* 156 */,
-/* 157 */,
-/* 158 */,
-/* 159 */,
-/* 160 */,
-/* 161 */,
-/* 162 */,
-/* 163 */,
-/* 164 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  define(obj, key, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
 
+  return obj;
+};
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
 
-var _asyncToGenerator2;
+/***/ }),
 
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
-}
+/***/ "../../node_modules/micromatch/node_modules/extend-shallow/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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;
+"use strict";
 
-    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;
-    }
+var isExtendable = __webpack_require__("../../node_modules/micromatch/node_modules/is-extendable/index.js");
+var assignSymbols = __webpack_require__("../../node_modules/assign-symbols/index.js");
 
-    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;
-        }
-      }
+module.exports = Object.assign || function(obj/*, objects*/) {
+  if (obj === null || typeof obj === 'undefined') {
+    throw new TypeError('Cannot convert undefined or null to object');
+  }
+  if (!isObject(obj)) {
+    obj = {};
+  }
+  for (var i = 1; i < arguments.length; i++) {
+    var val = arguments[i];
+    if (isString(val)) {
+      val = toObject(val);
     }
-
-    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);
-      }
+    if (isObject(val)) {
+      assign(obj, val);
+      assignSymbols(obj, val);
     }
-  });
-
-  return function fixTimes(_x7, _x8, _x9) {
-    return _ref3.apply(this, arguments);
-  };
-})();
+  }
+  return obj;
+};
 
-// Compare file timestamps.
-// Some versions of Node on windows zero the milliseconds when utime is used.
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
+  }
+}
 
+function isString(val) {
+  return (val && typeof val === 'string');
+}
 
-var _fs;
+function toObject(str) {
+  var obj = {};
+  for (var i in str) {
+    obj[i] = str[i];
+  }
+  return obj;
+}
 
-function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(3));
+function isObject(val) {
+  return (val && typeof val === 'object') || isExtendable(val);
 }
 
-var _promise;
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-function _load_promise() {
-  return _promise = __webpack_require__(40);
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
 }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function isEnum(obj, key) {
+  return Object.prototype.propertyIsEnumerable.call(obj, key);
+}
 
-// 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);
+/***/ "../../node_modules/micromatch/node_modules/fill-range/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * fill-range <https://github.com/jonschlinkert/fill-range>
+ *
+ * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
 
-const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
+
+var util = __webpack_require__("util");
+var isNumber = __webpack_require__("../../node_modules/is-number/index.js");
+var extend = __webpack_require__("../../node_modules/micromatch/node_modules/fill-range/node_modules/extend-shallow/index.js");
+var repeat = __webpack_require__("../../node_modules/repeat-string/index.js");
+var toRegex = __webpack_require__("../../node_modules/micromatch/node_modules/to-regex-range/index.js");
 
 /**
- * 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).
+ * Return a range of numbers or letters.
+ *
+ * @param  {String} `start` Start of the range
+ * @param  {String} `stop` End of the range
+ * @param  {String} `step` Increment or decrement to use.
+ * @param  {Function} `fn` Custom function to modify each element in the range.
+ * @return {Array}
  */
-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();
-      }
-    }
-  });
-
-  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);
+function fillRange(start, stop, step, options) {
+  if (typeof start === 'undefined') {
+    return [];
   }
-};
 
-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);
+  if (typeof stop === 'undefined' || start === stop) {
+    // special case, for handling negative zero
+    var isString = typeof start === 'string';
+    if (isNumber(start) && !toNumber(start)) {
+      return [isString ? '0' : 0];
     }
-  });
-
-  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();
+    return [start];
+  }
 
-  if (process.platform !== 'win32') {
-    return aTime === bTime;
+  if (typeof step !== 'number' && typeof step !== 'string') {
+    options = step;
+    step = undefined;
   }
 
-  // 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;
+  if (typeof options === 'function') {
+    options = { transform: options };
   }
 
-  const aTimeSec = Math.floor(aTime / 1000);
-  const bTimeSec = Math.floor(bTime / 1000);
+  var opts = extend({step: step}, options);
+  if (opts.step && !isValidNumber(opts.step)) {
+    if (opts.strictRanges === true) {
+      throw new TypeError('expected options.step to be a number');
+    }
+    return [];
+  }
 
-  // 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;
+  opts.isNumber = isValidNumber(start) && isValidNumber(stop);
+  if (!opts.isNumber && !isValid(start, stop)) {
+    if (opts.strictRanges === true) {
+      throw new RangeError('invalid range arguments: ' + util.inspect([start, stop]));
+    }
+    return [];
   }
 
-  return aTime === bTime;
-};
+  opts.isPadded = isPadded(start) || isPadded(stop);
+  opts.toString = opts.stringify
+    || typeof opts.step === 'string'
+    || typeof start === 'string'
+    || typeof stop === 'string'
+    || !opts.isNumber;
 
-/***/ }),
-/* 165 */,
-/* 166 */,
-/* 167 */,
-/* 168 */,
-/* 169 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (opts.isPadded) {
+    opts.maxLength = Math.max(String(start).length, String(stop).length);
+  }
 
-"use strict";
+  // support legacy minimatch/fill-range options
+  if (typeof opts.optimize === 'boolean') opts.toRegex = opts.optimize;
+  if (typeof opts.makeRe === 'boolean') opts.toRegex = opts.makeRe;
+  return expand(start, stop, opts);
+}
 
+function expand(start, stop, options) {
+  var a = options.isNumber ? toNumber(start) : start.charCodeAt(0);
+  var b = options.isNumber ? toNumber(stop) : stop.charCodeAt(0);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isFakeRoot = isFakeRoot;
-exports.isRootUser = isRootUser;
-function getUid() {
-  if (process.platform !== 'win32' && process.getuid) {
-    return process.getuid();
+  var step = Math.abs(toNumber(options.step)) || 1;
+  if (options.toRegex && step === 1) {
+    return toRange(a, b, start, stop, options);
   }
-  return null;
-}
 
-exports.default = isRootUser(getUid()) && !isFakeRoot();
-function isFakeRoot() {
-  return Boolean(process.env.FAKEROOTKEY);
-}
+  var zero = {greater: [], lesser: []};
+  var asc = a < b;
+  var arr = new Array(Math.round((asc ? b - a : a - b) / step));
+  var idx = 0;
 
-function isRootUser(uid) {
-  return uid === 0;
-}
+  while (asc ? a <= b : a >= b) {
+    var val = options.isNumber ? a : String.fromCharCode(a);
+    if (options.toRegex && (val >= 0 || !options.isNumber)) {
+      zero.greater.push(val);
+    } else {
+      zero.lesser.push(Math.abs(val));
+    }
 
-/***/ }),
-/* 170 */,
-/* 171 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (options.isPadded) {
+      val = zeros(val, options);
+    }
 
-"use strict";
+    if (options.toString) {
+      val = String(val);
+    }
 
+    if (typeof options.transform === 'function') {
+      arr[idx++] = options.transform(val, a, b, step, idx, arr, options);
+    } else {
+      arr[idx++] = val;
+    }
 
-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;
+    if (asc) {
+      a += step;
+    } else {
+      a -= step;
+    }
+  }
 
-const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
-const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
+  if (options.toRegex === true) {
+    return toSequence(arr, zero, options);
+  }
+  return arr;
+}
 
-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
+function toRange(a, b, start, stop, options) {
+  if (options.isPadded) {
+    return toRegex(start, stop, options);
+  }
 
-    // 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;
+  if (options.isNumber) {
+    return toRegex(Math.min(a, b), Math.max(a, b), options);
   }
+
+  var start = String.fromCharCode(Math.min(a, b));
+  var stop = String.fromCharCode(Math.max(a, b));
+  return '[' + start + '-' + stop + ']';
 }
 
-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 toSequence(arr, zeros, options) {
+  var greater = '', lesser = '';
+  if (zeros.greater.length) {
+    greater = zeros.greater.join('|');
+  }
+  if (zeros.lesser.length) {
+    lesser = '-(' + zeros.lesser.join('|') + ')';
   }
+  var res = greater && lesser
+    ? greater + '|' + lesser
+    : greater || lesser;
+
+  if (options.capture) {
+    return '(' + res + ')';
+  }
+  return res;
 }
 
-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 zeros(val, options) {
+  if (options.isPadded) {
+    var str = String(val);
+    var len = str.length;
+    var dash = '';
+    if (str.charAt(0) === '-') {
+      dash = '-';
+      str = str.slice(1);
+    }
+    var diff = options.maxLength - len;
+    var pad = repeat('0', diff);
+    val = (dash + pad + str);
+  }
+  if (options.stringify) {
+    return String(val);
   }
+  return val;
 }
 
-function getLocalAppDataDir() {
-  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
+function toNumber(val) {
+  return Number(val) || 0;
 }
 
-/***/ }),
-/* 172 */,
-/* 173 */
-/***/ (function(module, exports, __webpack_require__) {
+function isPadded(str) {
+  return /^-?0\d/.test(str);
+}
 
-module.exports = { "default": __webpack_require__(179), __esModule: true };
+function isValid(min, max) {
+  return (isValidNumber(min) || isValidLetter(min))
+      && (isValidNumber(max) || isValidLetter(max));
+}
 
-/***/ }),
-/* 174 */
-/***/ (function(module, exports, __webpack_require__) {
+function isValidLetter(ch) {
+  return typeof ch === 'string' && ch.length === 1 && /^\w+$/.test(ch);
+}
 
-"use strict";
+function isValidNumber(n) {
+  return isNumber(n) && !/\./.test(n);
+}
 
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
+/**
+ * Expose `fillRange`
+ * @type {Function}
+ */
 
-  var r = range(a, b, str);
+module.exports = fillRange;
 
-  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;
+/***/ "../../node_modules/micromatch/node_modules/fill-range/node_modules/extend-shallow/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (ai >= 0 && bi > 0) {
-    begs = [];
-    left = str.length;
+"use strict";
 
-    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;
-        }
 
-        bi = str.indexOf(b, i + 1);
-      }
+var isObject = __webpack_require__("../../node_modules/micromatch/node_modules/fill-range/node_modules/is-extendable/index.js");
 
-      i = ai < bi && ai >= 0 ? ai : bi;
-    }
+module.exports = function extend(o/*, objects*/) {
+  if (!isObject(o)) { o = {}; }
 
-    if (begs.length) {
-      result = [ left, right ];
+  var len = arguments.length;
+  for (var i = 1; i < len; i++) {
+    var obj = arguments[i];
+
+    if (isObject(obj)) {
+      assign(o, obj);
     }
   }
+  return o;
+};
 
-  return result;
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
+  }
 }
 
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-/***/ }),
-/* 175 */
-/***/ (function(module, exports, __webpack_require__) {
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
 
-var concatMap = __webpack_require__(178);
-var balanced = __webpack_require__(174);
 
-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';
+/***/ "../../node_modules/micromatch/node_modules/fill-range/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-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('.');
-}
 
+module.exports = function isExtendable(val) {
+  return typeof val !== 'undefined' && val !== null
+    && (typeof val === 'object' || typeof val === 'function');
+};
 
-// 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 [''];
 
-  var parts = [];
-  var m = balanced('{', '}', str);
+/***/ }),
 
-  if (!m)
-    return str.split(',');
+/***/ "../../node_modules/micromatch/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-  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);
 
-  return parts;
-}
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
 
-function expandTop(str) {
-  if (!str)
-    return [];
+module.exports = function isExtendable(val) {
+  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
+};
 
-  // 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 expand(escapeBraces(str), true).map(unescapeBraces);
-}
+/***/ }),
 
-function identity(e) {
-  return e;
-}
+/***/ "../../node_modules/micromatch/node_modules/to-regex-range/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
+"use strict";
+/*!
+ * to-regex-range <https://github.com/jonschlinkert/to-regex-range>
+ *
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
 
-function expand(str, isTop) {
-  var expansions = [];
 
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
+var repeat = __webpack_require__("../../node_modules/repeat-string/index.js");
+var isNumber = __webpack_require__("../../node_modules/is-number/index.js");
+var cache = {};
 
-  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];
+function toRegexRange(min, max, options) {
+  if (isNumber(min) === false) {
+    throw new RangeError('toRegexRange: first argument is invalid.');
   }
 
-  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 (typeof max === 'undefined' || min === max) {
+    return String(min);
   }
 
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
+  if (isNumber(max) === false) {
+    throw new RangeError('toRegexRange: second argument is invalid.');
+  }
 
-  // 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)
-    : [''];
+  options = options || {};
+  var relax = String(options.relaxZeros);
+  var shorthand = String(options.shorthand);
+  var capture = String(options.capture);
+  var key = min + ':' + max + '=' + relax + shorthand + capture;
+  if (cache.hasOwnProperty(key)) {
+    return cache[key].result;
+  }
 
-  var N;
+  var a = Math.min(min, max);
+  var b = Math.max(min, max);
 
-  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;
+  if (Math.abs(a - b) === 1) {
+    var result = min + '|' + max;
+    if (options.capture) {
+      return '(' + result + ')';
     }
-    var pad = n.some(isPadded);
+    return result;
+  }
 
-    N = [];
+  var isPadded = padding(min) || padding(max);
+  var positives = [];
+  var negatives = [];
 
-    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) });
+  var tok = {min: min, max: max, a: a, b: b};
+  if (isPadded) {
+    tok.isPadded = isPadded;
+    tok.maxLen = String(tok.max).length;
   }
 
-  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);
-    }
+  if (a < 0) {
+    var newMin = b < 0 ? Math.abs(b) : 1;
+    var newMax = Math.abs(a);
+    negatives = splitToPatterns(newMin, newMax, tok, options);
+    a = tok.a = 0;
   }
 
-  return expansions;
-}
+  if (b >= 0) {
+    positives = splitToPatterns(a, b, tok, options);
+  }
 
+  tok.negatives = negatives;
+  tok.positives = positives;
+  tok.result = siftPatterns(negatives, positives, options);
 
+  if (options.capture && (positives.length + negatives.length) > 1) {
+    tok.result = '(' + tok.result + ')';
+  }
 
-/***/ }),
-/* 176 */
-/***/ (function(module, exports, __webpack_require__) {
+  cache[key] = tok;
+  return tok.result;
+}
 
-"use strict";
+function siftPatterns(neg, pos, options) {
+  var onlyNegative = filterPatterns(neg, pos, '-', false, options) || [];
+  var onlyPositive = filterPatterns(pos, neg, '', false, options) || [];
+  var intersected = filterPatterns(neg, pos, '-?', true, options) || [];
+  var subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
+  return subpatterns.join('|');
+}
 
+function splitToRanges(min, max) {
+  min = Number(min);
+  max = Number(max);
 
-function preserveCamelCase(str) {
-	let isLastCharLower = false;
-	let isLastCharUpper = false;
-	let isLastLastCharUpper = false;
+  var nines = 1;
+  var stops = [max];
+  var stop = +countNines(min, nines);
 
-	for (let i = 0; i < str.length; i++) {
-		const c = str[i];
+  while (min <= stop && stop <= max) {
+    stops = push(stops, stop);
+    nines += 1;
+    stop = +countNines(min, nines);
+  }
 
-		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;
-		}
-	}
+  var zeros = 1;
+  stop = countZeros(max + 1, zeros) - 1;
 
-	return str;
+  while (min < stop && stop <= max) {
+    stops = push(stops, stop);
+    zeros += 1;
+    stop = countZeros(max + 1, zeros) - 1;
+  }
+
+  stops.sort(compare);
+  return stops;
 }
 
-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();
-	}
+/**
+ * Convert a range to a regex pattern
+ * @param {Number} `start`
+ * @param {Number} `stop`
+ * @return {String}
+ */
 
-	if (str.length === 0) {
-		return '';
-	}
+function rangeToPattern(start, stop, options) {
+  if (start === stop) {
+    return {pattern: String(start), digits: []};
+  }
 
-	if (str.length === 1) {
-		return str.toLowerCase();
-	}
+  var zipped = zip(String(start), String(stop));
+  var len = zipped.length, i = -1;
 
-	if (/^[a-z0-9]+$/.test(str)) {
-		return str;
-	}
+  var pattern = '';
+  var digits = 0;
 
-	const hasUpperCase = str !== str.toLowerCase();
+  while (++i < len) {
+    var numbers = zipped[i];
+    var startDigit = numbers[0];
+    var stopDigit = numbers[1];
 
-	if (hasUpperCase) {
-		str = preserveCamelCase(str);
-	}
+    if (startDigit === stopDigit) {
+      pattern += startDigit;
 
-	return str
-		.replace(/^[_.\- ]+/, '')
-		.toLowerCase()
-		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
-};
+    } else if (startDigit !== '0' || stopDigit !== '9') {
+      pattern += toCharacterClass(startDigit, stopDigit);
 
+    } else {
+      digits += 1;
+    }
+  }
 
-/***/ }),
-/* 177 */,
-/* 178 */
-/***/ (function(module, exports) {
+  if (digits) {
+    pattern += options.shorthand ? '\\d' : '[0-9]';
+  }
 
-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;
-};
+  return { pattern: pattern, digits: [digits] };
+}
 
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
+function splitToPatterns(min, max, tok, options) {
+  var ranges = splitToRanges(min, max);
+  var len = ranges.length;
+  var idx = -1;
 
+  var tokens = [];
+  var start = min;
+  var prev;
 
-/***/ }),
-/* 179 */
-/***/ (function(module, exports, __webpack_require__) {
+  while (++idx < len) {
+    var range = ranges[idx];
+    var obj = rangeToPattern(start, range, options);
+    var zeros = '';
 
-__webpack_require__(205);
-__webpack_require__(207);
-__webpack_require__(210);
-__webpack_require__(206);
-__webpack_require__(208);
-__webpack_require__(209);
-module.exports = __webpack_require__(23).Promise;
+    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
+      if (prev.digits.length > 1) {
+        prev.digits.pop();
+      }
+      prev.digits.push(obj.digits[0]);
+      prev.string = prev.pattern + toQuantifier(prev.digits);
+      start = range + 1;
+      continue;
+    }
 
+    if (tok.isPadded) {
+      zeros = padZeros(range, tok);
+    }
 
-/***/ }),
-/* 180 */
-/***/ (function(module, exports) {
+    obj.string = zeros + obj.pattern + toQuantifier(obj.digits);
+    tokens.push(obj);
+    start = range + 1;
+    prev = obj;
+  }
 
-module.exports = function () { /* empty */ };
+  return tokens;
+}
 
+function filterPatterns(arr, comparison, prefix, intersection, options) {
+  var res = [];
 
-/***/ }),
-/* 181 */
-/***/ (function(module, exports) {
+  for (var i = 0; i < arr.length; i++) {
+    var tok = arr[i];
+    var ele = tok.string;
 
-module.exports = function (it, Constructor, name, forbiddenField) {
-  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
-    throw TypeError(name + ': incorrect invocation!');
-  } return it;
-};
+    if (options.relaxZeros !== false) {
+      if (prefix === '-' && ele.charAt(0) === '0') {
+        if (ele.charAt(1) === '{') {
+          ele = '0*' + ele.replace(/^0\{\d+\}/, '');
+        } else {
+          ele = '0*' + ele.slice(1);
+        }
+      }
+    }
 
+    if (!intersection && !contains(comparison, 'string', ele)) {
+      res.push(prefix + ele);
+    }
 
-/***/ }),
-/* 182 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (intersection && contains(comparison, 'string', ele)) {
+      res.push(prefix + ele);
+    }
+  }
+  return res;
+}
 
-// 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;
-  };
-};
+/**
+ * Zip strings (`for in` can be used on string characters)
+ */
+
+function zip(a, b) {
+  var arr = [];
+  for (var ch in a) arr.push([a[ch], b[ch]]);
+  return arr;
+}
 
+function compare(a, b) {
+  return a > b ? 1 : b > a ? -1 : 0;
+}
 
-/***/ }),
-/* 183 */
-/***/ (function(module, exports, __webpack_require__) {
+function push(arr, ele) {
+  if (arr.indexOf(ele) === -1) arr.push(ele);
+  return arr;
+}
 
-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;
+function contains(arr, key, val) {
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i][key] === val) {
+      return true;
+    }
   }
-};
-exports.BREAK = BREAK;
-exports.RETURN = RETURN;
+  return false;
+}
 
+function countNines(min, len) {
+  return String(min).slice(0, -len) + repeat('9', len);
+}
 
-/***/ }),
-/* 184 */
-/***/ (function(module, exports, __webpack_require__) {
+function countZeros(integer, zeros) {
+  return integer - (integer % Math.pow(10, zeros));
+}
 
-module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
-  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
-});
+function toQuantifier(digits) {
+  var start = digits[0];
+  var stop = digits[1] ? (',' + digits[1]) : '';
+  if (!stop && (!start || start === 1)) {
+    return '';
+  }
+  return '{' + start + stop + '}';
+}
 
+function toCharacterClass(a, b) {
+  return '[' + a + ((b - a === 1) ? '' : '-') + b + ']';
+}
 
-/***/ }),
-/* 185 */
-/***/ (function(module, exports) {
+function padding(str) {
+  return /^-?(0+)\d/.exec(str);
+}
 
-// 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 padZeros(val, tok) {
+  if (tok.isPadded) {
+    var diff = Math.abs(tok.maxLen - String(val).length);
+    switch (diff) {
+      case 0:
+        return '';
+      case 1:
+        return '0';
+      default: {
+        return '0{' + diff + '}';
+      }
+    }
+  }
+  return val;
+}
+
+/**
+ * Expose `toRegexRange`
+ */
+
+module.exports = toRegexRange;
 
 
 /***/ }),
-/* 186 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// check on default Array iterator
-var Iterators = __webpack_require__(35);
-var ITERATOR = __webpack_require__(13)('iterator');
-var ArrayProto = Array.prototype;
+/***/ "../../node_modules/mimic-fn/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = function (it) {
-  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
-};
+"use strict";
 
 
-/***/ }),
-/* 187 */
-/***/ (function(module, exports, __webpack_require__) {
+const mimicFn = (to, from) => {
+	for (const prop of Reflect.ownKeys(from)) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
 
-// 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;
-  }
+	return to;
 };
 
+module.exports = mimicFn;
+// TODO: Remove this for the next major release
+module.exports.default = mimicFn;
+
 
 /***/ }),
-/* 188 */
+
+/***/ "../../node_modules/minimatch/minimatch.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
 
-var create = __webpack_require__(192);
-var descriptor = __webpack_require__(106);
-var setToStringTag = __webpack_require__(71);
-var IteratorPrototype = {};
+var path = (function () { try { return __webpack_require__("path") } catch (e) {}}()) || {
+  sep: '/'
+}
+minimatch.sep = path.sep
 
-// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
-__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__("../../node_modules/brace-expansion/index.js")
 
-module.exports = function (Constructor, NAME, next) {
-  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
-  setToStringTag(Constructor, NAME + ' Iterator');
-};
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
 
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
 
-/***/ }),
-/* 189 */
-/***/ (function(module, exports, __webpack_require__) {
+// * => any number of characters
+var star = qmark + '*?'
 
-var ITERATOR = __webpack_require__(13)('iterator');
-var SAFE_CLOSING = false;
+// ** 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})($|\\\/)).)*?'
 
-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 */ }
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
 
-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;
-};
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
 
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
 
-/***/ }),
-/* 190 */
-/***/ (function(module, exports) {
+// normalizes slashes.
+var slashSplit = /\/+/
 
-module.exports = function (done, value) {
-  return { value: value, done: !!done };
-};
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
 
+function ext (a, b) {
+  b = b || {}
+  var t = {}
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  return t
+}
 
-/***/ }),
-/* 191 */
-/***/ (function(module, exports, __webpack_require__) {
+minimatch.defaults = function (def) {
+  if (!def || typeof def !== 'object' || !Object.keys(def).length) {
+    return minimatch
+  }
 
-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';
+  var orig = minimatch
 
-module.exports = function () {
-  var head, last, notify;
+  var m = function minimatch (p, pattern, options) {
+    return orig(p, pattern, ext(def, options))
+  }
 
-  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();
-  };
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
+  m.Minimatch.defaults = function defaults (options) {
+    return orig.defaults(ext(def, options)).Minimatch
+  }
 
-  // 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);
-    };
+  m.filter = function filter (pattern, options) {
+    return orig.filter(pattern, ext(def, options))
   }
 
-  return function (fn) {
-    var task = { fn: fn, next: undefined };
-    if (last) last.next = task;
-    if (!head) {
-      head = task;
-      notify();
-    } last = task;
-  };
-};
+  m.defaults = function defaults (options) {
+    return orig.defaults(ext(def, options))
+  }
 
+  m.makeRe = function makeRe (pattern, options) {
+    return orig.makeRe(pattern, ext(def, options))
+  }
 
-/***/ }),
-/* 192 */
-/***/ (function(module, exports, __webpack_require__) {
+  m.braceExpand = function braceExpand (pattern, options) {
+    return orig.braceExpand(pattern, ext(def, options))
+  }
 
-// 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';
+  m.match = function (list, pattern, options) {
+    return orig.match(list, pattern, ext(def, options))
+  }
 
-// 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();
-};
+  return m
+}
 
-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);
-};
+Minimatch.defaults = function (def) {
+  return minimatch.defaults(def).Minimatch
+}
 
+function minimatch (p, pattern, options) {
+  assertValidPattern(pattern)
 
-/***/ }),
-/* 193 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!options) options = {}
 
-var dP = __webpack_require__(50);
-var anObject = __webpack_require__(27);
-var getKeys = __webpack_require__(132);
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
 
-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;
-};
+  return new Minimatch(pattern, options).match(p)
+}
 
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
+  }
 
-/***/ }),
-/* 194 */
-/***/ (function(module, exports, __webpack_require__) {
+  assertValidPattern(pattern)
 
-// 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;
+  if (!options) options = {}
 
-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;
-};
+  pattern = pattern.trim()
 
+  // windows support: need to use /, not \
+  if (!options.allowWindowsEscape && path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
 
-/***/ }),
-/* 195 */
-/***/ (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
+  this.partial = !!options.partial
 
-var has = __webpack_require__(49);
-var toIObject = __webpack_require__(74);
-var arrayIndexOf = __webpack_require__(182)(false);
-var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+  // make the set of regexps etc.
+  this.make()
+}
 
-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);
+Minimatch.prototype.debug = function () {}
+
+Minimatch.prototype.make = make
+function make () {
+  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
   }
-  return result;
-};
 
+  // step 1: figure out negation, etc.
+  this.parseNegate()
 
-/***/ }),
-/* 196 */
-/***/ (function(module, exports, __webpack_require__) {
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
 
-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;
-};
+  if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
 
+  this.debug(this.pattern, set)
 
-/***/ }),
-/* 197 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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)
+  })
 
-module.exports = __webpack_require__(31);
+  this.debug(this.pattern, set)
 
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
 
-/***/ }),
-/* 198 */
-/***/ (function(module, exports, __webpack_require__) {
+  this.debug(this.pattern, set)
 
-"use strict";
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
 
-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');
+  this.debug(this.pattern, set)
 
-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; }
-  });
-};
+  this.set = set
+}
 
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
 
-/***/ }),
-/* 199 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (options.nonegate) return
 
-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;
-  };
-};
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
+  }
 
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
 
-/***/ }),
-/* 200 */
-/***/ (function(module, exports, __webpack_require__) {
+// 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)
+}
 
-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);
-};
+Minimatch.prototype.braceExpand = braceExpand
+
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
+    }
+  }
+
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
+
+  assertValidPattern(pattern)
+
+  // Thanks to Yeting Li <https://github.com/yetingli> for
+  // improving this regexp to avoid a ReDOS vulnerability.
+  if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
 
+  return expand(pattern)
+}
 
-/***/ }),
-/* 201 */
-/***/ (function(module, exports, __webpack_require__) {
+var MAX_PATTERN_LENGTH = 1024 * 64
+var assertValidPattern = function (pattern) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('invalid pattern')
+  }
 
-// 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");
-};
+  if (pattern.length > MAX_PATTERN_LENGTH) {
+    throw new TypeError('pattern is too long')
+  }
+}
 
+// 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) {
+  assertValidPattern(pattern)
 
-/***/ }),
-/* 202 */
-/***/ (function(module, exports, __webpack_require__) {
+  var options = this.options
 
-var global = __webpack_require__(11);
-var navigator = global.navigator;
+  // shortcuts
+  if (pattern === '**') {
+    if (!options.noglobstar)
+      return GLOBSTAR
+    else
+      pattern = '*'
+  }
+  if (pattern === '') return ''
 
-module.exports = navigator && navigator.userAgent || '';
+  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
+    }
+  }
 
-/***/ }),
-/* 203 */
-/***/ (function(module, exports, __webpack_require__) {
+  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)
 
-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)];
-};
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
 
+    switch (c) {
+      /* istanbul ignore next */
+      case '/': {
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
+      }
 
-/***/ }),
-/* 204 */
-/***/ (function(module, exports, __webpack_require__) {
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
 
-"use strict";
+      // 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)
 
-var addToUnscopables = __webpack_require__(180);
-var step = __webpack_require__(190);
-var Iterators = __webpack_require__(35);
-var toIObject = __webpack_require__(74);
+        // 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
+        }
 
-// 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');
+        // 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
 
-// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
-Iterators.Arguments = Iterators.Array;
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
 
-addToUnscopables('keys');
-addToUnscopables('values');
-addToUnscopables('entries');
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
 
+        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
 
-/***/ }),
-/* 205 */
-/***/ (function(module, exports) {
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
 
+        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
 
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
 
-/***/ }),
-/* 206 */
-/***/ (function(module, exports, __webpack_require__) {
+        clearStateChar()
+        re += '|'
+      continue
 
-"use strict";
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
-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;
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
 
-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 */ }
-}();
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
 
-// 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);
+      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
         }
-      });
-      // 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
+
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        // 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 {
-          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
-        } catch (e) {
-          $reject.call(wrapper, e);
+          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
         }
-      });
-    } 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);
-  };
-}
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
+
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
+
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
 
-$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];
+        re += c
 
-// 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;
+    } // switch
+  } // for
+
+  // 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]
   }
-});
-$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);
+
+  // 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 = '\\'
+      }
+
+      // 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 + '|'
+    })
+
+    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
   }
-});
-$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;
+
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
   }
-});
 
+  // 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
+  }
 
-/***/ }),
-/* 207 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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]
 
-"use strict";
+    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)
 
-var $at = __webpack_require__(199)(true);
+    nlLast += nlAfter
 
-// 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 };
-});
+    // 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
 
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
+    }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
 
-/***/ }),
-/* 208 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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
+  }
 
-"use strict";
-// https://github.com/tc39/proposal-promise-finally
+  if (addPatternStart) {
+    re = patternStart + re
+  }
 
-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);
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
 
-$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
-  );
-} });
+  // 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)
+  }
 
+  var flags = options.nocase ? 'i' : ''
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) /* istanbul ignore next - should be impossible */ {
+    // 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('$.')
+  }
 
-/***/ }),
-/* 209 */
-/***/ (function(module, exports, __webpack_require__) {
+  regExp._glob = pattern
+  regExp._src = re
 
-"use strict";
+  return regExp
+}
 
-// https://github.com/tc39/proposal-promise-try
-var $export = __webpack_require__(41);
-var newPromiseCapability = __webpack_require__(70);
-var perform = __webpack_require__(104);
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
 
-$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;
-} });
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
 
+  // 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
 
-/***/ }),
-/* 210 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
 
-__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 twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
 
-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 re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
 
-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;
+  // 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 + ').*$'
+
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) /* istanbul ignore next - should be impossible */ {
+    this.regexp = false
+  }
+  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
+}
 
-/***/ }),
-/* 211 */
-/***/ (function(module, exports, __webpack_require__) {
+Minimatch.prototype.match = function match (f, partial) {
+  if (typeof partial === 'undefined') partial = this.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 === ''
 
-/**
- * This is the web browser implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+  if (f === '/' && partial) return true
 
-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();
+  var options = this.options
 
-/**
- * Colors.
- */
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
 
-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'
-];
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
 
-/**
- * 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
- */
+  // 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.
 
-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;
+  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
   }
 
-  // Internet Explorer and Edge do not support colors.
-  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
-    return false;
+  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
+    }
   }
 
-  // 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+)/));
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
 }
 
-/**
- * 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;
-  }
-};
+// 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
 
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
 
-/**
- * Colorize log arguments if enabled.
- *
- * @api public
- */
+  this.debug('matchOne', file.length, pattern.length)
 
-function formatArgs(args) {
-  var useColors = this.useColors;
+  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]
 
-  args[0] = (useColors ? '%c' : '')
-    + this.namespace
-    + (useColors ? ' %c' : ' ')
-    + args[0]
-    + (useColors ? '%c ' : ' ')
-    + '+' + exports.humanize(this.diff);
+    this.debug(pattern, p, f)
 
-  if (!useColors) return;
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    /* istanbul ignore if */
+    if (p === false) return false
 
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit')
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
 
-  // 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;
-    }
-  });
+      // "**"
+      // 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
+      }
 
-  args.splice(lastC, 0, c);
-}
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
 
-/**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
- */
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
 
-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);
-}
+        // 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
+          }
 
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
+        }
+      }
 
-function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      /* istanbul ignore if */
+      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') {
+      hit = f === p
+      this.debug('string match', p, f, hit)
     } else {
-      exports.storage.debug = namespaces;
+      hit = f.match(p)
+      this.debug('pattern match', p, f, hit)
     }
-  } catch(e) {}
-}
 
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
+    if (!hit) return false
+  }
 
-function load() {
-  var r;
-  try {
-    r = exports.storage.debug;
-  } catch(e) {}
+  // 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/*
 
-  // 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;
+  // 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 /* istanbul ignore 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/
+    return (fi === fl - 1) && (file[fi] === '')
   }
 
-  return r;
+  // should be unreachable.
+  /* istanbul ignore next */
+  throw new Error('wtf?')
 }
 
-/**
- * Enable namespaces listed in `localStorage.debug` initially.
- */
-
-exports.enable(load());
-
-/**
- * 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
- */
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
+}
 
-function localstorage() {
-  try {
-    return window.localStorage;
-  } catch (e) {}
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
 }
 
 
 /***/ }),
-/* 212 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Detect Electron renderer process, which is node, but we should
- * treat as a browser.
- */
+/***/ "../../node_modules/minimist/index.js":
+/***/ (function(module, exports) {
 
-if (typeof process === 'undefined' || process.type === 'renderer') {
-  module.exports = __webpack_require__(211);
-} else {
-  module.exports = __webpack_require__(213);
-}
+module.exports = function (args, opts) {
+    if (!opts) opts = {};
+    
+    var flags = { bools : {}, strings : {}, unknownFn: null };
 
+    if (typeof opts['unknown'] === 'function') {
+        flags.unknownFn = opts['unknown'];
+    }
 
-/***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
+    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;
+            }));
+        });
+    });
 
-/**
- * Module dependencies.
- */
+    [].concat(opts.string).filter(Boolean).forEach(function (key) {
+        flags.strings[key] = true;
+        if (aliases[key]) {
+            flags.strings[aliases[key]] = true;
+        }
+     });
 
-var tty = __webpack_require__(79);
-var util = __webpack_require__(2);
+    var defaults = opts['default'] || {};
+    
+    var argv = { _ : [] };
+    Object.keys(flags.bools).forEach(function (key) {
+        setArg(key, defaults[key] === undefined ? false : defaults[key]);
+    });
+    
+    var notFlags = [];
 
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
+    if (args.indexOf('--') !== -1) {
+        notFlags = args.slice(args.indexOf('--')+1);
+        args = args.slice(0, args.indexOf('--'));
+    }
 
-exports = module.exports = __webpack_require__(112);
-exports.init = init;
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
+    function argDefined(key, arg) {
+        return (flags.allBools && /^--[^=]+$/.test(arg)) ||
+            flags.strings[key] || flags.bools[key] || aliases[key];
+    }
 
-/**
- * Colors.
- */
+    function setArg (key, val, arg) {
+        if (arg && flags.unknownFn && !argDefined(key, arg)) {
+            if (flags.unknownFn(arg) === false) return;
+        }
 
-exports.colors = [ 6, 2, 3, 4, 5, 1 ];
+        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);
+        });
+    }
 
-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.
-}
+    function setKey (obj, keys, value) {
+        var o = obj;
+        for (var i = 0; i < keys.length-1; i++) {
+            var key = keys[i];
+            if (isConstructorOrProto(o, key)) 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];
+        }
 
-/**
- * Build up the default `inspectOpts` object from the environment variables.
- *
- *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
- */
+        var key = keys[keys.length - 1];
+        if (isConstructorOrProto(o, key)) 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];
+      });
+    }
 
-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() });
+    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);
+        });
+    }
 
-  // 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);
+    return argv;
+};
 
-  obj[prop] = val;
-  return obj;
-}, {});
+function hasKey (obj, keys) {
+    var o = obj;
+    keys.slice(0,-1).forEach(function (key) {
+        o = (o[key] || {});
+    });
 
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
+    var key = keys[keys.length - 1];
+    return key in o;
+}
 
-function useColors() {
-  return 'colors' in exports.inspectOpts
-    ? Boolean(exports.inspectOpts.colors)
-    : tty.isatty(process.stderr.fd);
+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);
 }
 
-/**
- * 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(' ');
-};
+function isConstructorOrProto (obj, key) {
+    return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
+}
 
-/**
- * Map %o to `util.inspect()`, allowing multiple lines if needed.
- */
 
-exports.formatters.O = function(v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts);
-};
+/***/ }),
+
+/***/ "../../node_modules/mixin-deep/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isExtendable = __webpack_require__("../../node_modules/mixin-deep/node_modules/is-extendable/index.js");
+var forIn = __webpack_require__("../../node_modules/for-in/index.js");
+
+function mixinDeep(target, objects) {
+  var len = arguments.length, i = 0;
+  while (++i < len) {
+    var obj = arguments[i];
+    if (isObject(obj)) {
+      forIn(obj, copy, target);
+    }
+  }
+  return target;
+}
 
 /**
- * Adds ANSI color escape codes if enabled.
+ * Copy properties from the source object to the
+ * target object.
  *
- * @api public
+ * @param  {*} `val`
+ * @param  {String} `key`
  */
 
-function formatArgs(args) {
-  var name = this.namespace;
-  var useColors = this.useColors;
-
-  if (useColors) {
-    var c = this.color;
-    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
-    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
-
-    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];
+function copy(val, key) {
+  if (!isValidKey(key)) {
+    return;
   }
-}
 
-function getDate() {
-  if (exports.inspectOpts.hideDate) {
-    return '';
+  var obj = this[key];
+  if (isObject(val) && isObject(obj)) {
+    mixinDeep(obj, val);
   } else {
-    return new Date().toISOString() + ' ';
+    this[key] = val;
   }
 }
 
 /**
- * Invokes `util.format()` with the specified arguments and writes to stderr.
+ * Returns true if `val` is an object or function.
+ *
+ * @param  {any} val
+ * @return {Boolean}
  */
 
-function log() {
-  return process.stderr.write(util.format.apply(util, arguments) + '\n');
+function isObject(val) {
+  return isExtendable(val) && !Array.isArray(val);
 }
 
 /**
- * Save `namespaces`.
+ * Returns true if `key` is a valid key to use when extending objects.
  *
- * @param {String} namespaces
- * @api private
+ * @param  {String} `key`
+ * @return {Boolean}
  */
 
-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;
-  }
-}
+function isValidKey(key) {
+  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
+};
 
 /**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
+ * Expose `mixinDeep`
  */
 
-function load() {
-  return process.env.DEBUG;
-}
+module.exports = mixinDeep;
 
-/**
- * Init logic for `debug` instances.
+
+/***/ }),
+
+/***/ "../../node_modules/mixin-deep/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
  *
- * Create a new `inspectOpts` object in case `useColors` is set
- * differently for a particular `debug` instance.
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-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]];
-  }
-}
 
-/**
- * Enable namespaces listed in `process.env.DEBUG` initially.
- */
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
 
-exports.enable(load());
+module.exports = function isExtendable(val) {
+  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
+};
 
 
 /***/ }),
-/* 214 */,
-/* 215 */,
-/* 216 */,
-/* 217 */
+
+/***/ "../../node_modules/multimatch/index.js":
 /***/ (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.
+"use strict";
 
-var pathModule = __webpack_require__(0);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(3);
+const minimatch = __webpack_require__("../../node_modules/minimatch/minimatch.js");
+const arrayUnion = __webpack_require__("../../node_modules/array-union/index.js");
+const arrayDiffer = __webpack_require__("../../node_modules/array-differ/index.js");
+const arrify = __webpack_require__("../../node_modules/arrify/index.js");
 
-// JavaScript implementation of realpath, ported from node pre-v6
+module.exports = (list, patterns, options = {}) => {
+	list = arrify(list);
+	patterns = arrify(patterns);
 
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+	if (list.length === 0 || patterns.length === 0) {
+		return [];
+	}
 
-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;
+	return patterns.reduce((result, pattern) => {
+		let process = arrayUnion;
 
-  return callback;
+		if (pattern[0] === '!') {
+			pattern = pattern.slice(1);
+			process = arrayDiffer;
+		}
 
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
-    }
-  }
+		return process(result, minimatch.match(list, pattern, options));
+	}, []);
+};
 
-  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 maybeCallback(cb) {
-  return typeof cb === 'function' ? cb : rethrow();
+/***/ }),
+
+/***/ "../../node_modules/mute-stream/mute.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__("stream")
+
+module.exports = MuteStream
+
+// var out = new MuteStream(process.stdout)
+// argument auto-pipes
+function MuteStream (opts) {
+  Stream.apply(this)
+  opts = opts || {}
+  this.writable = this.readable = true
+  this.muted = false
+  this.on('pipe', this._onpipe)
+  this.replace = opts.replace
+
+  // For readline-type situations
+  // This much at the start of a line being redrawn after a ctrl char
+  // is seen (such as backspace) won't be redrawn as the replacement
+  this._prompt = opts.prompt || null
+  this._hadControl = false
 }
 
-var normalize = pathModule.normalize;
+MuteStream.prototype = Object.create(Stream.prototype)
 
-// 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;
+Object.defineProperty(MuteStream.prototype, 'constructor', {
+  value: MuteStream,
+  enumerable: false
+})
+
+MuteStream.prototype.mute = function () {
+  this.muted = true
 }
 
-// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
-if (isWindows) {
-  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
-} else {
-  var splitRootRe = /^[\/]*/;
+MuteStream.prototype.unmute = function () {
+  this.muted = false
 }
 
-exports.realpathSync = function realpathSync(p, cache) {
-  // make p is absolute
-  p = pathModule.resolve(p);
+Object.defineProperty(MuteStream.prototype, '_onpipe', {
+  value: onPipe,
+  enumerable: false,
+  writable: true,
+  configurable: true
+})
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return cache[p];
-  }
+function onPipe (src) {
+  this._src = src
+}
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+Object.defineProperty(MuteStream.prototype, 'isTTY', {
+  get: getIsTTY,
+  set: setIsTTY,
+  enumerable: true,
+  configurable: true
+})
 
-  // 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;
+function getIsTTY () {
+  return( (this._dest) ? this._dest.isTTY
+        : (this._src) ? this._src.isTTY
+        : false
+        )
+}
 
-  start();
+// basically just get replace the getter/setter with a regular value
+function setIsTTY (isTTY) {
+  Object.defineProperty(this, 'isTTY', {
+    value: isTTY,
+    enumerable: true,
+    writable: true,
+    configurable: true
+  })
+}
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+Object.defineProperty(MuteStream.prototype, 'rows', {
+  get: function () {
+    return( this._dest ? this._dest.rows
+          : this._src ? this._src.rows
+          : undefined )
+  }, enumerable: true, configurable: true })
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstatSync(base);
-      knownHard[base] = true;
-    }
-  }
+Object.defineProperty(MuteStream.prototype, 'columns', {
+  get: function () {
+    return( this._dest ? this._dest.columns
+          : this._src ? this._src.columns
+          : undefined )
+  }, enumerable: true, configurable: 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;
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
-    }
+MuteStream.prototype.pipe = function (dest, options) {
+  this._dest = dest
+  return Stream.prototype.pipe.call(this, dest, options)
+}
 
-    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;
-      }
+MuteStream.prototype.pause = function () {
+  if (this._src) return this._src.pause()
+}
 
-      // 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];
-        }
+MuteStream.prototype.resume = function () {
+  if (this._src) return this._src.resume()
+}
+
+MuteStream.prototype.write = function (c) {
+  if (this.muted) {
+    if (!this.replace) return true
+    if (c.match(/^\u001b/)) {
+      if(c.indexOf(this._prompt) === 0) {
+        c = c.substr(this._prompt.length);
+        c = c.replace(/./g, this.replace);
+        c = this._prompt + c;
       }
-      if (linkTarget === null) {
-        fs.statSync(base);
-        linkTarget = fs.readlinkSync(base);
+      this._hadControl = true
+      return this.emit('data', c)
+    } else {
+      if (this._prompt && this._hadControl &&
+          c.indexOf(this._prompt) === 0) {
+        this._hadControl = false
+        this.emit('data', this._prompt)
+        c = c.substr(this._prompt.length)
       }
-      resolvedLink = pathModule.resolve(previous, linkTarget);
-      // track this, if given a cache.
-      if (cache) cache[base] = resolvedLink;
-      if (!isWindows) seenLinks[id] = linkTarget;
+      c = c.toString().replace(/./g, this.replace)
     }
+  }
+  this.emit('data', c)
+}
 
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
+MuteStream.prototype.end = function (c) {
+  if (this.muted) {
+    if (c && this.replace) {
+      c = c.toString().replace(/./g, this.replace)
+    } else {
+      c = null
+    }
   }
+  if (c) this.emit('data', c)
+  this.emit('end')
+}
 
-  if (cache) cache[original] = p;
+function proxy (fn) { return function () {
+  var d = this._dest
+  var s = this._src
+  if (d && d[fn]) d[fn].apply(d, arguments)
+  if (s && s[fn]) s[fn].apply(s, arguments)
+}}
 
-  return p;
-};
+MuteStream.prototype.destroy = proxy('destroy')
+MuteStream.prototype.destroySoon = proxy('destroySoon')
+MuteStream.prototype.close = proxy('close')
 
 
-exports.realpath = function realpath(p, cache, cb) {
-  if (typeof cb !== 'function') {
-    cb = maybeCallback(cache);
-    cache = null;
-  }
+/***/ }),
 
-  // make p is absolute
-  p = pathModule.resolve(p);
+/***/ "../../node_modules/nanomatch/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return process.nextTick(cb.bind(null, null, cache[p]));
-  }
+"use strict";
 
-  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;
+/**
+ * Module dependencies
+ */
 
-  start();
+var util = __webpack_require__("util");
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+var extend = __webpack_require__("../../node_modules/nanomatch/node_modules/extend-shallow/index.js");
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+/**
+ * Local dependencies
+ */
 
-    // 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();
-      });
+var compilers = __webpack_require__("../../node_modules/nanomatch/lib/compilers.js");
+var parsers = __webpack_require__("../../node_modules/nanomatch/lib/parsers.js");
+var cache = __webpack_require__("../../node_modules/nanomatch/lib/cache.js");
+var utils = __webpack_require__("../../node_modules/nanomatch/lib/utils.js");
+var MAX_LENGTH = 1024 * 64;
+
+/**
+ * The main function takes a list of strings and one or more
+ * glob patterns to use for matching.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm(list, patterns[, options]);
+ *
+ * console.log(nm(['a.js', 'a.txt'], ['*.js']));
+ * //=> [ 'a.js' ]
+ * ```
+ * @param {Array} `list` A list of strings to match
+ * @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 {Array} Returns an array of matches
+ * @summary false
+ * @api public
+ */
+
+function nanomatch(list, patterns, options) {
+  patterns = utils.arrayify(patterns);
+  list = utils.arrayify(list);
+
+  var len = patterns.length;
+  if (list.length === 0 || len === 0) {
+    return [];
+  }
+
+  if (len === 1) {
+    return nanomatch.match(list, patterns[0], options);
+  }
+
+  var negated = false;
+  var omit = [];
+  var keep = [];
+  var idx = -1;
+
+  while (++idx < len) {
+    var pattern = patterns[idx];
+
+    if (typeof pattern === 'string' && pattern.charCodeAt(0) === 33 /* ! */) {
+      omit.push.apply(omit, nanomatch.match(list, pattern.slice(1), options));
+      negated = true;
     } else {
-      process.nextTick(LOOP);
+      keep.push.apply(keep, nanomatch.match(list, pattern, options));
     }
   }
 
-  // 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);
+  // minimatch.match parity
+  if (negated && keep.length === 0) {
+    if (options && options.unixify === false) {
+      keep = list.slice();
+    } else {
+      var unixify = utils.unixify(options);
+      for (var i = 0; i < list.length; i++) {
+        keep.push(unixify(list[i]));
+      }
     }
+  }
+
+  var matches = utils.diff(keep, omit);
+  if (!options || options.nodupes !== false) {
+    return utils.unique(matches);
+  }
+
+  return matches;
+}
+
+/**
+ * Similar to the main function, but `pattern` must be a string.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.match(list, pattern[, options]);
+ *
+ * console.log(nm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
+ * //=> ['a.a', 'a.aa']
+ * ```
+ * @param {Array} `list` Array of strings to match
+ * @param {String} `pattern` 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 matches
+ * @api public
+ */
+
+nanomatch.match = function(list, pattern, options) {
+  if (Array.isArray(pattern)) {
+    throw new TypeError('expected pattern to be a string');
+  }
 
-    // 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 unixify = utils.unixify(options);
+  var isMatch = memoize('match', pattern, options, nanomatch.matcher);
+  var matches = [];
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      return process.nextTick(LOOP);
-    }
+  list = utils.arrayify(list);
+  var len = list.length;
+  var idx = -1;
 
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
+  while (++idx < len) {
+    var ele = list[idx];
+    if (ele === pattern || isMatch(ele)) {
+      matches.push(utils.value(ele, unixify, options));
     }
-
-    return fs.lstat(base, gotStat);
   }
 
-  function gotStat(err, stat) {
-    if (err) return cb(err);
+  // if no options were passed, uniquify results and return
+  if (typeof options === 'undefined') {
+    return utils.unique(matches);
+  }
 
-    // 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);
+  if (matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error('no matches found for "' + pattern + '"');
     }
-
-    // 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);
-      }
+    if (options.nonull === true || options.nullglob === true) {
+      return [options.unescape ? utils.unescape(pattern) : pattern];
     }
-    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);
+  // if `opts.ignore` was defined, diff ignored list
+  if (options.ignore) {
+    matches = nanomatch.not(matches, options.ignore, options);
   }
 
-  function gotResolvedLink(resolvedLink) {
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
+  return options.nodupes !== false ? utils.unique(matches) : matches;
 };
 
+/**
+ * Returns true if the specified `string` matches the given glob `pattern`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.isMatch(string, pattern[, options]);
+ *
+ * console.log(nm.isMatch('a.a', '*.a'));
+ * //=> true
+ * console.log(nm.isMatch('a.b', '*.a'));
+ * //=> false
+ * ```
+ * @param {String} `string` String to match
+ * @param {String} `pattern` 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 string matches the glob pattern.
+ * @api public
+ */
 
-/***/ }),
-/* 218 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = globSync
-globSync.GlobSync = GlobSync
+nanomatch.isMatch = function(str, pattern, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
+  }
 
-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
+  if (utils.isEmptyString(str) || utils.isEmptyString(pattern)) {
+    return false;
+  }
 
-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')
+  var equals = utils.equalsPattern(options);
+  if (equals(str)) {
+    return true;
+  }
 
-  return new GlobSync(pattern, options).found
-}
+  var isMatch = memoize('isMatch', pattern, options, nanomatch.matcher);
+  return isMatch(str);
+};
 
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
+/**
+ * Returns true if some of the elements in the given `list` match any of the
+ * given glob `patterns`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.some(list, patterns[, options]);
+ *
+ * console.log(nm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+ * // true
+ * console.log(nm.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
+ */
 
-  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')
+nanomatch.some = function(list, patterns, options) {
+  if (typeof list === 'string') {
+    list = [list];
+  }
 
-  if (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
+  for (var i = 0; i < list.length; i++) {
+    if (nanomatch(list[i], patterns, options).length === 1) {
+      return true;
+    }
+  }
 
-  setopts(this, pattern, options)
+  return false;
+};
 
-  if (this.noprocess)
-    return this
+/**
+ * Returns true if every element in the given `list` matches
+ * at least one of the given glob `patterns`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.every(list, patterns[, options]);
+ *
+ * console.log(nm.every('foo.js', ['foo.js']));
+ * // true
+ * console.log(nm.every(['foo.js', 'bar.js'], ['*.js']));
+ * // true
+ * console.log(nm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+ * // false
+ * console.log(nm.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
+ */
 
-  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)
+nanomatch.every = function(list, patterns, options) {
+  if (typeof list === 'string') {
+    list = [list];
   }
-  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
-        }
-      }
-    })
+  for (var i = 0; i < list.length; i++) {
+    if (nanomatch(list[i], patterns, options).length !== 1) {
+      return false;
+    }
   }
-  common.finish(this)
-}
 
+  return true;
+};
 
-GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+/**
+ * Returns true if **any** of the given glob `patterns`
+ * match the specified `string`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.any(string, patterns[, options]);
+ *
+ * console.log(nm.any('a.a', ['b.*', '*.a']));
+ * //=> true
+ * console.log(nm.any('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) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
 
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
+nanomatch.any = function(str, patterns, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
   }
-  // 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
+  if (utils.isEmptyString(str) || utils.isEmptyString(patterns)) {
+    return false;
   }
 
-  var remain = pattern.slice(n)
+  if (typeof patterns === 'string') {
+    patterns = [patterns];
+  }
 
-  // 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
+  for (var i = 0; i < patterns.length; i++) {
+    if (nanomatch.isMatch(str, patterns[i], options)) {
+      return true;
+    }
+  }
+  return false;
+};
 
-  var abs = this._makeAbs(read)
+/**
+ * Returns true if **all** of the given `patterns`
+ * match the specified string.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.all(string, patterns[, options]);
+ *
+ * console.log(nm.all('foo.js', ['foo.js']));
+ * // true
+ *
+ * console.log(nm.all('foo.js', ['*.js', '!foo.js']));
+ * // false
+ *
+ * console.log(nm.all('foo.js', ['*.js', 'foo.js']));
+ * // true
+ *
+ * console.log(nm.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
+ */
 
-  //if ignored, skip processing
-  if (childrenIgnored(this, read))
-    return
+nanomatch.all = function(str, patterns, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
+  }
 
-  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)
-}
+  if (typeof patterns === 'string') {
+    patterns = [patterns];
+  }
 
+  for (var i = 0; i < patterns.length; i++) {
+    if (!nanomatch.isMatch(str, patterns[i], options)) {
+      return false;
+    }
+  }
+  return true;
+};
 
-GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
-  var entries = this._readdir(abs, inGlobStar)
+/**
+ * Returns a list of strings that _**do not match any**_ of the given `patterns`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.not(list, patterns[, options]);
+ *
+ * console.log(nm.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
+ */
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return
+nanomatch.not = function(list, patterns, options) {
+  var opts = extend({}, options);
+  var ignore = opts.ignore;
+  delete opts.ignore;
 
-  // 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) === '.'
+  list = utils.arrayify(list);
 
-  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 matches = utils.diff(list, nanomatch(list, patterns, opts));
+  if (ignore) {
+    matches = utils.diff(matches, nanomatch(list, ignore));
   }
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    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.
+  return opts.nodupes !== false ? utils.unique(matches) : matches;
+};
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+/**
+ * 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 nm = require('nanomatch');
+ * nm.contains(string, pattern[, options]);
+ *
+ * console.log(nm.contains('aa/bb/cc', '*b'));
+ * //=> true
+ * console.log(nm.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
+ */
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix.slice(-1) !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+nanomatch.contains = function(str, patterns, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
+  }
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
+  if (typeof patterns === 'string') {
+    if (utils.isEmptyString(str) || utils.isEmptyString(patterns)) {
+      return false;
     }
-    // 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)
+    var equals = utils.equalsPattern(patterns, options);
+    if (equals(str)) {
+      return true;
+    }
+    var contains = utils.containsPattern(patterns, options);
+    if (contains(str)) {
+      return true;
+    }
   }
-}
 
+  var opts = extend({}, options, {contains: true});
+  return nanomatch.any(str, patterns, opts);
+};
 
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
+/**
+ * Returns true if the given pattern and options should enable
+ * the `matchBase` option.
+ * @return {Boolean}
+ * @api private
+ */
 
-  var abs = this._makeAbs(e)
+nanomatch.matchBase = function(pattern, options) {
+  if (pattern && pattern.indexOf('/') !== -1 || !options) return false;
+  return options.basename === true || options.matchBase === true;
+};
 
-  if (this.mark)
-    e = this._mark(e)
+/**
+ * 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
+ * var nm = require('nanomatch');
+ * nm.matchKeys(object, patterns[, options]);
+ *
+ * var obj = { aa: 'a', ab: 'b', ac: 'c' };
+ * console.log(nm.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
+ */
 
-  if (this.absolute) {
-    e = abs
+nanomatch.matchKeys = function(obj, patterns, options) {
+  if (!utils.isObject(obj)) {
+    throw new TypeError('expected the first argument to be an object');
   }
+  var keys = nanomatch(Object.keys(obj), patterns, options);
+  return utils.pick(obj, keys);
+};
 
-  if (this.matches[index][e])
-    return
+/**
+ * Returns a memoized 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
+ * var nm = require('nanomatch');
+ * nm.matcher(pattern[, options]);
+ *
+ * var isMatch = nm.matcher('*.!(*a)');
+ * console.log(isMatch('a.a'));
+ * //=> false
+ * console.log(isMatch('a.b'));
+ * //=> true
+ * ```
+ * @param {String} `pattern` Glob pattern
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed.
+ * @return {Function} Returns a matcher function.
+ * @api public
+ */
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
+nanomatch.matcher = function matcher(pattern, options) {
+  if (utils.isEmptyString(pattern)) {
+    return function() {
+      return false;
+    };
   }
 
-  this.matches[index][e] = true
-
-  if (this.stat)
-    this._stat(e)
-}
+  if (Array.isArray(pattern)) {
+    return compose(pattern, options, matcher);
+  }
 
+  // if pattern is a regex
+  if (pattern instanceof RegExp) {
+    return test(pattern);
+  }
 
-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)
+  // if pattern is invalid
+  if (!utils.isString(pattern)) {
+    throw new TypeError('expected pattern to be an array, string or regex');
+  }
 
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
+  // if pattern is a non-glob string
+  if (!utils.hasSpecialChars(pattern)) {
+    if (options && options.nocase === true) {
+      pattern = pattern.toLowerCase();
     }
+    return utils.matchPath(pattern, options);
   }
 
-  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)
-
-  return entries
-}
-
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
+  // if pattern is a glob string
+  var re = nanomatch.makeRe(pattern, options);
 
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs)
+  // if `options.matchBase` or `options.basename` is defined
+  if (nanomatch.matchBase(pattern, options)) {
+    return utils.matchBasename(re, options);
+  }
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return null
+  function test(regex) {
+    var equals = utils.equalsPattern(options);
+    var unixify = utils.unixify(options);
 
-    if (Array.isArray(c))
-      return c
-  }
+    return function(str) {
+      if (equals(str)) {
+        return true;
+      }
 
-  try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
+      if (regex.test(unixify(str))) {
+        return true;
+      }
+      return false;
+    };
   }
-}
 
-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
-    }
-  }
+  // create matcher function
+  var matcherFn = test(re);
+  // set result object from compiler on matcher function,
+  // as a non-enumerable property. useful for debugging
+  utils.define(matcherFn, 'result', re.result);
+  return matcherFn;
+};
 
-  this.cache[abs] = entries
+/**
+ * Returns an array of matches captured by `pattern` in `string, or
+ * `null` if the pattern did not match.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.capture(pattern, string[, options]);
+ *
+ * console.log(nm.capture('test/*.js', 'test/foo.js'));
+ * //=> ['foo']
+ * console.log(nm.capture('test/*.js', 'foo/bar.css'));
+ * //=> null
+ * ```
+ * @param {String} `pattern` Glob pattern to use for matching.
+ * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
+ * @api public
+ */
 
-  // mark and cache dir-ness
-  return entries
-}
+nanomatch.capture = function(pattern, str, options) {
+  var re = nanomatch.makeRe(pattern, extend({capture: true}, options));
+  var unixify = utils.unixify(options);
 
-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
+  function match() {
+    return function(string) {
+      var match = re.exec(unixify(string));
+      if (!match) {
+        return null;
       }
-      break
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
-
-    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 match.slice(1);
+    };
   }
-}
-
-GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
 
-  var entries = this._readdir(abs, inGlobStar)
+  var capture = memoize('capture', pattern, options, match);
+  return capture(str);
+};
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return
+/**
+ * Create a regular expression from the given glob `pattern`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.makeRe(pattern[, options]);
+ *
+ * console.log(nm.makeRe('*.js'));
+ * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
+ * ```
+ * @param {String} `pattern` A glob pattern to convert to regex.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed.
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
 
-  // 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)
+nanomatch.makeRe = function(pattern, options) {
+  if (pattern instanceof RegExp) {
+    return pattern;
+  }
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected pattern to be a string');
+  }
 
-  var len = entries.length
-  var isSym = this.symlinks[abs]
+  if (pattern.length > MAX_LENGTH) {
+    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
+  }
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return
+  function makeRe() {
+    var opts = utils.extend({wrap: false}, options);
+    var result = nanomatch.create(pattern, opts);
+    var regex = toRegex(result.output, opts);
+    utils.define(regex, 'result', result);
+    return regex;
+  }
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+  return memoize('makeRe', pattern, options, makeRe);
+};
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true)
+/**
+ * Parses the given glob `pattern` and returns an object with the compiled `output`
+ * and optional source `map`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.create(pattern[, options]);
+ *
+ * console.log(nm.create('abc/*.js'));
+ * // { options: { source: 'string', sourcemap: true },
+ * //   state: {},
+ * //   compilers:
+ * //    { ... },
+ * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
+ * //   ast:
+ * //    { type: 'root',
+ * //      errors: [],
+ * //      nodes:
+ * //       [ ... ],
+ * //      dot: false,
+ * //      input: 'abc/*.js' },
+ * //   parsingErrors: [],
+ * //   map:
+ * //    { version: 3,
+ * //      sources: [ 'string' ],
+ * //      names: [],
+ * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
+ * //      sourcesContent: [ 'abc/*.js' ] },
+ * //   position: { line: 1, column: 28 },
+ * //   content: {},
+ * //   files: {},
+ * //   idx: 6 }
+ * ```
+ * @param {String} `pattern` Glob pattern to parse and compile.
+ * @param {Object} `options` Any [options](#options) to change how parsing and compiling is performed.
+ * @return {Object} Returns an object with the parsed AST, compiled string and optional source map.
+ * @api public
+ */
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true)
+nanomatch.create = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
   }
-}
+  function create() {
+    return nanomatch.compile(nanomatch.parse(pattern, options), options);
+  }
+  return memoize('create', pattern, options, create);
+};
 
-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)
+/**
+ * Parse the given `str` with the given `options`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.parse(pattern[, options]);
+ *
+ * var ast = nm.parse('a/{b,c}/d');
+ * console.log(ast);
+ * // { type: 'root',
+ * //   errors: [],
+ * //   input: 'a/{b,c}/d',
+ * //   nodes:
+ * //    [ { type: 'bos', val: '' },
+ * //      { type: 'text', val: 'a/' },
+ * //      { type: 'brace',
+ * //        nodes:
+ * //         [ { type: 'brace.open', val: '{' },
+ * //           { type: 'text', val: 'b,c' },
+ * //           { type: 'brace.close', val: '}' } ] },
+ * //      { type: 'text', val: '/d' },
+ * //      { type: 'eos', val: '' } ] }
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {Object} Returns an AST
+ * @api public
+ */
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+nanomatch.parse = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return
+  function parse() {
+    var snapdragon = utils.instantiate(null, options);
+    parsers(snapdragon, options);
 
-  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 += '/'
-    }
+    var ast = snapdragon.parse(pattern, options);
+    utils.define(ast, 'snapdragon', snapdragon);
+    ast.input = pattern;
+    return ast;
   }
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+  return memoize('parse', pattern, options, parse);
+};
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-}
+/**
+ * Compile the given `ast` or string with the given `options`.
+ *
+ * ```js
+ * var nm = require('nanomatch');
+ * nm.compile(ast[, options]);
+ *
+ * var ast = nm.parse('a/{b,c}/d');
+ * console.log(nm.compile(ast));
+ * // { options: { source: 'string' },
+ * //   state: {},
+ * //   compilers:
+ * //    { eos: [Function],
+ * //      noop: [Function],
+ * //      bos: [Function],
+ * //      brace: [Function],
+ * //      'brace.open': [Function],
+ * //      text: [Function],
+ * //      'brace.close': [Function] },
+ * //   output: [ 'a/(b|c)/d' ],
+ * //   ast:
+ * //    { ... },
+ * //   parsingErrors: [] }
+ * ```
+ * @param {Object|String} `ast`
+ * @param {Object} `options`
+ * @return {Object} Returns an object that has an `output` property with the compiled string.
+ * @api public
+ */
 
-// Returns either 'DIR', 'FILE', or false
-GlobSync.prototype._stat = function (f) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+nanomatch.compile = function(ast, options) {
+  if (typeof ast === 'string') {
+    ast = nanomatch.parse(ast, options);
+  }
 
-  if (f.length > this.maxLength)
-    return false
+  function compile() {
+    var snapdragon = utils.instantiate(ast, options);
+    compilers(snapdragon, options);
+    return snapdragon.compile(ast, options);
+  }
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+  return memoize('compile', ast.input, options, compile);
+};
 
-    if (Array.isArray(c))
-      c = 'DIR'
+/**
+ * Clear the regex cache.
+ *
+ * ```js
+ * nm.clearCache();
+ * ```
+ * @api public
+ */
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
+nanomatch.clearCache = function() {
+  nanomatch.cache.__data__ = {};
+};
 
-    if (needDir && c === 'FILE')
-      return false
+/**
+ * Compose a matcher function with the given patterns.
+ * This allows matcher functions to be compiled once and
+ * called multiple times.
+ */
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+function compose(patterns, options, matcher) {
+  var matchers;
 
-  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
+  return memoize('compose', String(patterns), options, function() {
+    return function(file) {
+      // delay composition until it's invoked the first time,
+      // after that it won't be called again
+      if (!matchers) {
+        matchers = [];
+        for (var i = 0; i < patterns.length; i++) {
+          matchers.push(matcher(patterns[i], options));
+        }
       }
-    }
 
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
+      var len = matchers.length;
+      while (len--) {
+        if (matchers[len](file) === true) {
+          return true;
+        }
       }
-    } else {
-      stat = lstat
-    }
-  }
+      return false;
+    };
+  });
+}
 
-  this.statCache[abs] = stat
+/**
+ * Memoize a generated regex or function. A unique key is generated
+ * from the `type` (usually method name), the `pattern`, and
+ * user-defined options.
+ */
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
+function memoize(type, pattern, options, fn) {
+  var key = utils.createKey(type + '=' + pattern, options);
 
-  this.cache[abs] = this.cache[abs] || c
+  if (options && options.cache === false) {
+    return fn(pattern, options);
+  }
 
-  if (needDir && c === 'FILE')
-    return false
+  if (cache.has(type, key)) {
+    return cache.get(type, key);
+  }
 
-  return c
+  var val = fn(pattern, options);
+  cache.set(type, key, val);
+  return val;
 }
 
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+/**
+ * Expose compiler, parser and cache on `nanomatch`
+ */
 
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+nanomatch.compilers = compilers;
+nanomatch.parsers = parsers;
+nanomatch.cache = cache;
 
+/**
+ * Expose `nanomatch`
+ * @type {Function}
+ */
 
-/***/ }),
-/* 219 */,
-/* 220 */,
-/* 221 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = nanomatch;
 
-"use strict";
 
-module.exports = function (flag, argv) {
-	argv = argv || process.argv;
+/***/ }),
 
-	var terminatorPos = argv.indexOf('--');
-	var prefix = /^--/.test(flag) ? '' : '--';
-	var pos = argv.indexOf(prefix + flag);
+/***/ "../../node_modules/nanomatch/lib/cache.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
-};
+module.exports = new (__webpack_require__("../../node_modules/fragment-cache/index.js"))();
 
 
 /***/ }),
-/* 222 */,
-/* 223 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var wrappy = __webpack_require__(123)
-var reqs = Object.create(null)
-var once = __webpack_require__(61)
+/***/ "../../node_modules/nanomatch/lib/compilers.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = wrappy(inflight)
+"use strict";
 
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
 
-function makeres (key) {
-  return once(function RES () {
-    var cbs = reqs[key]
-    var len = cbs.length
-    var args = slice(arguments)
+/**
+* Nanomatch compilers
+*/
 
-    // 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]
-      }
+module.exports = function(nanomatch, options) {
+  function slash() {
+    if (options && typeof options.slash === 'string') {
+      return options.slash;
     }
-  })
-}
-
-function slice (args) {
-  var length = args.length
-  var array = []
+    if (options && typeof options.slash === 'function') {
+      return options.slash.call(nanomatch);
+    }
+    return '\\\\/';
+  }
 
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
+  function star() {
+    if (options && typeof options.star === 'string') {
+      return options.star;
+    }
+    if (options && typeof options.star === 'function') {
+      return options.star.call(nanomatch);
+    }
+    return '[^' + slash() + ']*?';
+  }
 
+  var ast = nanomatch.ast = nanomatch.parser.ast;
+  ast.state = nanomatch.parser.state;
+  nanomatch.compiler.state = ast.state;
+  nanomatch.compiler
 
-/***/ }),
-/* 224 */
-/***/ (function(module, exports) {
+    /**
+     * Negation / escaping
+     */
 
-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
+    .set('not', function(node) {
+      var prev = this.prev();
+      if (this.options.nonegate === true || prev.type !== 'bos') {
+        return this.emit('\\' + node.val, node);
       }
-    });
-  };
-} 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
-  }
-}
+      return this.emit(node.val, node);
+    })
+    .set('escape', function(node) {
+      if (this.options.unescape && /^[-\w_.]/.test(node.val)) {
+        return this.emit(node.val, node);
+      }
+      return this.emit('\\' + node.val, node);
+    })
+    .set('quoted', function(node) {
+      return this.emit(node.val, node);
+    })
 
+    /**
+     * Regex
+     */
 
-/***/ }),
-/* 225 */,
-/* 226 */,
-/* 227 */
-/***/ (function(module, exports, __webpack_require__) {
+    .set('dollar', function(node) {
+      if (node.parent.type === 'bracket') {
+        return this.emit(node.val, node);
+      }
+      return this.emit('\\' + node.val, node);
+    })
 
-// @flow
+    /**
+     * Dot: "."
+     */
 
-/*::
-declare var __webpack_require__: mixed;
-*/
+    .set('dot', function(node) {
+      if (node.dotfiles === true) this.dotfiles = true;
+      return this.emit('\\' + node.val, node);
+    })
 
-module.exports = typeof __webpack_require__ !== "undefined";
+    /**
+     * Slashes: "/" and "\"
+     */
 
+    .set('backslash', function(node) {
+      return this.emit(node.val, node);
+    })
+    .set('slash', function(node, nodes, i) {
+      var val = '[' + slash() + ']';
+      var parent = node.parent;
+      var prev = this.prev();
 
-/***/ }),
-/* 228 */,
-/* 229 */
-/***/ (function(module, exports) {
+      // set "node.hasSlash" to true on all ancestor parens nodes
+      while (parent.type === 'paren' && !parent.hasSlash) {
+        parent.hasSlash = true;
+        parent = parent.parent;
+      }
 
-/**
- * Helpers.
- */
+      if (prev.addQmark) {
+        val += '?';
+      }
 
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var y = d * 365.25;
+      // word boundary
+      if (node.rest.slice(0, 2) === '\\b') {
+        return this.emit(val, node);
+      }
 
-/**
- * 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
- */
+      // globstars
+      if (node.parsed === '**' || node.parsed === './**') {
+        this.output = '(?:' + this.output;
+        return this.emit(val + ')?', node);
+      }
 
-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)
-  );
-};
+      // negation
+      if (node.parsed === '!**' && this.options.nonegate !== true) {
+        return this.emit(val + '?\\b', node);
+      }
+      return this.emit(val, node);
+    })
 
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
+    /**
+     * Square brackets
+     */
 
-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;
-  }
-}
+    .set('bracket', function(node) {
+      var close = node.close;
+      var open = !node.escaped ? '[' : '\\[';
+      var negated = node.negated;
+      var inner = node.inner;
+      var val = node.val;
 
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
+      if (node.escaped === true) {
+        inner = inner.replace(/\\?(\W)/g, '\\$1');
+        negated = '';
+      }
 
-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';
-}
+      if (inner === ']-') {
+        inner = '\\]\\-';
+      }
 
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
+      if (negated && inner.indexOf('.') === -1) {
+        inner += '.';
+      }
+      if (negated && inner.indexOf('/') === -1) {
+        inner += '/';
+      }
 
-function fmtLong(ms) {
-  return plural(ms, d, 'day') ||
-    plural(ms, h, 'hour') ||
-    plural(ms, m, 'minute') ||
-    plural(ms, s, 'second') ||
-    ms + ' ms';
-}
+      val = open + negated + inner + close;
+      return this.emit(val, node);
+    })
 
-/**
- * Pluralization helper.
- */
+    /**
+     * Square: "[.]" (only matches a single character in brackets)
+     */
 
-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';
-}
+    .set('square', function(node) {
+      var val = (/^\W/.test(node.val) ? '\\' : '') + node.val;
+      return this.emit(val, node);
+    })
 
+    /**
+     * Question mark: "?"
+     */
 
-/***/ }),
-/* 230 */,
-/* 231 */,
-/* 232 */,
-/* 233 */
-/***/ (function(module, exports, __webpack_require__) {
+    .set('qmark', function(node) {
+      var prev = this.prev();
+      // don't use "slash" variable so that we always avoid
+      // matching backslashes and slashes with a qmark
+      var val = '[^.\\\\/]';
+      if (this.options.dot || (prev.type !== 'bos' && prev.type !== 'slash')) {
+        val = '[^\\\\/]';
+      }
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
+      if (node.parsed.slice(-1) === '(') {
+        var ch = node.rest.charAt(0);
+        if (ch === '!' || ch === '=' || ch === ':') {
+          return this.emit(node.val, node);
+        }
+      }
 
-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)
+      if (node.val.length > 1) {
+        val += '{' + node.val.length + '}';
+      }
+      return this.emit(val, node);
+    })
 
-var defaultGlobOpts = {
-  nosort: true,
-  silent: true
-}
+    /**
+     * Plus
+     */
 
-// for EMFILE handling
-var timeout = 0
+    .set('plus', function(node) {
+      var prev = node.parsed.slice(-1);
+      if (prev === ']' || prev === ')') {
+        return this.emit(node.val, node);
+      }
+      if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
+        return this.emit('\\+', node);
+      }
+      var ch = this.output.slice(-1);
+      if (/\w/.test(ch) && !node.inside) {
+        return this.emit('+\\+?', node);
+      }
+      return this.emit('+', node);
+    })
 
-var isWindows = (process.platform === "win32")
+    /**
+     * globstar: '**'
+     */
 
-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]
-  })
+    .set('globstar', function(node, nodes, i) {
+      if (!this.output) {
+        this.state.leadingGlobstar = true;
+      }
 
-  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
-}
+      var prev = this.prev();
+      var before = this.prev(2);
+      var next = this.next();
+      var after = this.next(2);
+      var type = prev.type;
+      var val = node.val;
 
-function rimraf (p, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+      if (prev.type === 'slash' && next.type === 'slash') {
+        if (before.type === 'text') {
+          this.output += '?';
 
-  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 (after.type !== 'text') {
+            this.output += '\\b';
+          }
+        }
+      }
 
-  defaults(options)
+      var parsed = node.parsed;
+      if (parsed.charAt(0) === '!') {
+        parsed = parsed.slice(1);
+      }
 
-  var busyTries = 0
-  var errState = null
-  var n = 0
+      var isInside = node.isInside.paren || node.isInside.brace;
+      if (parsed && type !== 'slash' && type !== 'bos' && !isInside) {
+        val = star();
+      } else {
+        val = this.options.dot !== true
+          ? '(?:(?!(?:[' + slash() + ']|^)\\.).)*?'
+          : '(?:(?!(?:[' + slash() + ']|^)(?:\\.{1,2})($|[' + slash() + ']))(?!\\.{2}).)*?';
+      }
 
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+      if ((type === 'slash' || type === 'bos') && this.options.dot !== true) {
+        val = '(?!\\.)' + val;
+      }
 
-  options.lstat(p, function (er, stat) {
-    if (!er)
-      return afterGlob(null, [p])
+      if (prev.type === 'slash' && next.type === 'slash' && before.type !== 'text') {
+        if (after.type === 'text' || after.type === 'star') {
+          node.addQmark = true;
+        }
+      }
 
-    glob(p, options.glob, afterGlob)
-  })
+      if (this.options.capture) {
+        val = '(' + val + ')';
+      }
 
-  function next (er) {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
-  }
+      return this.emit(val, node);
+    })
 
-  function afterGlob (er, results) {
-    if (er)
-      return cb(er)
+    /**
+     * Star: "*"
+     */
 
-    n = results.length
-    if (n === 0)
-      return cb()
+    .set('star', function(node, nodes, i) {
+      var prior = nodes[i - 2] || {};
+      var prev = this.prev();
+      var next = this.next();
+      var type = prev.type;
 
-    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)
-          }
+      function isStart(n) {
+        return n.type === 'bos' || n.type === 'slash';
+      }
 
-          // 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.output === '' && this.options.contains !== true) {
+        this.output = '(?![' + slash() + '])';
+      }
 
-          // already gone
-          if (er.code === "ENOENT") er = null
+      if (type === 'bracket' && this.options.bash === false) {
+        var str = next && next.type === 'bracket' ? star() : '*?';
+        if (!prev.nodes || prev.nodes[1].type !== 'posix') {
+          return this.emit(str, node);
         }
+      }
 
-        timeout = 0
-        next(er)
-      })
-    })
-  }
-}
+      var prefix = !this.dotfiles && type !== 'text' && type !== 'escape'
+        ? (this.options.dot ? '(?!(?:^|[' + slash() + '])\\.{1,2}(?:$|[' + slash() + ']))' : '(?!\\.)')
+        : '';
 
-// 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 (isStart(prev) || (isStart(prior) && type === 'not')) {
+        if (prefix !== '(?!\\.)') {
+          prefix += '(?!(\\.{2}|\\.[' + slash() + ']))(?=.)';
+        } else {
+          prefix += '(?=.)';
+        }
+      } else if (prefix === '(?!\\.)') {
+        prefix = '';
+      }
 
-  // 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)
+      if (prev.type === 'not' && prior.type === 'bos' && this.options.dot === true) {
+        this.output = '(?!\\.)' + this.output;
+      }
 
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
+      var output = prefix + star();
+      if (this.options.capture) {
+        output = '(' + output + ')';
+      }
 
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
+      return this.emit(output, node);
+    })
 
-    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)
+    /**
+     * Text
+     */
+
+    .set('text', function(node) {
+      return this.emit(node.val, node);
     })
-  })
-}
 
-function fixWinEPERM (p, options, er, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-  if (er)
-    assert(er instanceof Error)
+    /**
+     * End-of-string
+     */
 
-  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)
-      })
-  })
-}
+    .set('eos', function(node) {
+      var prev = this.prev();
+      var val = node.val;
 
-function fixWinEPERMSync (p, options, er) {
-  assert(p)
-  assert(options)
-  if (er)
-    assert(er instanceof Error)
+      this.output = '(?:\\.[' + slash() + '](?=.))?' + this.output;
+      if (this.state.metachar && prev.type !== 'qmark' && prev.type !== 'slash') {
+        val += (this.options.contains ? '[' + slash() + ']?' : '(?:[' + slash() + ']|$)');
+      }
 
-  try {
-    options.chmodSync(p, _0666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+      return this.emit(val, node);
+    });
 
-  try {
-    var stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+  /**
+   * Allow custom compilers to be passed on options
+   */
 
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
-}
+  if (options && typeof options.compilers === 'function') {
+    options.compilers(nanomatch.compiler);
+  }
+};
 
-function rmdir (p, options, originalEr, cb) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-  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, 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)
-  })
-}
 
-function rmkids(p, options, cb) {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+/***/ }),
 
-  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)
-      })
-    })
-  })
-}
+/***/ "../../node_modules/nanomatch/lib/parsers.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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)
+"use strict";
 
-  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
+var regexNot = __webpack_require__("../../node_modules/regex-not/index.js");
+var toRegex = __webpack_require__("../../node_modules/to-regex/index.js");
+var isOdd = __webpack_require__("../../node_modules/is-odd/index.js");
 
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
-  }
+/**
+ * Characters to use in negation regex (we want to "not" match
+ * characters that are matched by other parsers)
+ */
 
-  if (!results.length)
-    return
+var cached;
+var NOT_REGEX = '[\\[!*+?$^"\'.\\\\/]+';
+var not = createTextRegex(NOT_REGEX);
 
-  for (var i = 0; i < results.length; i++) {
-    var p = results[i]
+/**
+ * Nanomatch parsers
+ */
 
-    try {
-      var st = options.lstatSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
+module.exports = function(nanomatch, options) {
+  var parser = nanomatch.parser;
+  var opts = parser.options;
 
-      // Windows can EPERM on stat.  Life is suffering.
-      if (er.code === "EPERM" && isWindows)
-        fixWinEPERMSync(p, options, er)
-    }
+  parser.state = {
+    slashes: 0,
+    paths: []
+  };
 
-    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
+  parser.ast.state = parser.state;
+  parser
 
-      rmdirSync(p, options, er)
-    }
-  }
-}
+    /**
+     * Beginning-of-string
+     */
 
-function rmdirSync (p, options, originalEr) {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
+    .capture('prefix', function() {
+      if (this.parsed) return;
+      var m = this.match(/^\.[\\/]/);
+      if (!m) return;
+      this.state.strictOpen = !!this.options.strictOpen;
+      this.state.addPrefix = true;
+    })
 
-  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)
-  }
-}
+    /**
+     * Escape: "\\."
+     */
 
-function rmkidsSync (p, options) {
-  assert(p)
-  assert(options)
-  options.readdirSync(p).forEach(function (f) {
-    rimrafSync(path.join(p, f), options)
-  })
+    .capture('escape', function() {
+      if (this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(/^(?:\\(.)|([$^]))/);
+      if (!m) return;
 
-  // 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)
-}
+      return pos({
+        type: 'escape',
+        val: m[2] || m[1]
+      });
+    })
 
+    /**
+     * Quoted strings
+     */
 
-/***/ }),
-/* 234 */,
-/* 235 */,
-/* 236 */,
-/* 237 */,
-/* 238 */,
-/* 239 */
-/***/ (function(module, exports, __webpack_require__) {
+    .capture('quoted', function() {
+      var pos = this.position();
+      var m = this.match(/^["']/);
+      if (!m) return;
 
-"use strict";
+      var quote = m[0];
+      if (this.input.indexOf(quote) === -1) {
+        return pos({
+          type: 'escape',
+          val: quote
+        });
+      }
 
-var hasFlag = __webpack_require__(221);
+      var tok = advanceTo(this.input, quote);
+      this.consume(tok.len);
 
-var support = function (level) {
-	if (level === 0) {
-		return false;
-	}
+      return pos({
+        type: 'quoted',
+        val: tok.esc
+      });
+    })
 
-	return {
-		level: level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-};
+    /**
+     * Negations: "!"
+     */
 
-var supportLevel = (function () {
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
-		return 0;
-	}
+    .capture('not', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(this.notRegex || /^!+/);
+      if (!m) return;
+      var val = m[0];
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+      var isNegated = isOdd(val.length);
+      if (parsed === '' && !isNegated) {
+        val = '';
+      }
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+      // if nothing has been parsed, we know `!` is at the start,
+      // so we need to wrap the result in a negation regex
+      if (parsed === '' && isNegated && this.options.nonegate !== true) {
+        this.bos.val = '(?!^(?:';
+        this.append = ')$).*';
+        val = '';
+      }
+      return pos({
+        type: 'not',
+        val: val
+      });
+    })
 
-	if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		return 1;
-	}
+    /**
+     * Dot: "."
+     */
 
-	if (process.stdout && !process.stdout.isTTY) {
-		return 0;
-	}
+    .capture('dot', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\.+/);
+      if (!m) return;
 
-	if (process.platform === 'win32') {
-		return 1;
-	}
+      var val = m[0];
+      this.state.dot = val === '.' && (parsed === '' || parsed.slice(-1) === '/');
 
-	if ('CI' in process.env) {
-		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
-			return 1;
-		}
+      return pos({
+        type: 'dot',
+        dotfiles: this.state.dot,
+        val: val
+      });
+    })
 
-		return 0;
-	}
+    /**
+     * Plus: "+"
+     */
 
-	if ('TEAMCITY_VERSION' in process.env) {
-		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
-	}
+    .capture('plus', /^\+(?!\()/)
 
-	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
-		return 2;
-	}
+    /**
+     * Question mark: "?"
+     */
 
-	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
-		return 1;
-	}
+    .capture('qmark', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\?+(?!\()/);
+      if (!m) return;
 
-	if ('COLORTERM' in process.env) {
-		return 1;
-	}
+      this.state.metachar = true;
+      this.state.qmark = true;
 
-	if (process.env.TERM === 'dumb') {
-		return 0;
-	}
+      return pos({
+        type: 'qmark',
+        parsed: parsed,
+        val: m[0]
+      });
+    })
 
-	return 0;
-})();
+    /**
+     * Globstar: "**"
+     */
 
-if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
-	supportLevel = 1;
-}
+    .capture('globstar', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(/^\*{2}(?![*(])(?=[,)/]|$)/);
+      if (!m) return;
 
-module.exports = process && support(supportLevel);
+      var type = opts.noglobstar !== true ? 'globstar' : 'star';
+      var node = pos({type: type, parsed: parsed});
+      this.state.metachar = true;
 
+      while (this.input.slice(0, 4) === '/**/') {
+        this.input = this.input.slice(3);
+      }
 
-/***/ })
-/******/ ]);
+      node.isInside = {
+        brace: this.isInside('brace'),
+        paren: this.isInside('paren')
+      };
 
-/***/ }),
-/* 411 */
-/***/ (function(module, exports) {
+      if (type === 'globstar') {
+        this.state.globstar = true;
+        node.val = '**';
 
-module.exports = require("buffer");
+      } else {
+        this.state.star = true;
+        node.val = '*';
+      }
 
-/***/ }),
-/* 412 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      return node;
+    })
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sortPackageJson", function() { return sortPackageJson; });
-/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(413);
-/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(414);
-/* harmony import */ var _kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+    /**
+     * Star: "*"
+     */
 
+    .capture('star', function() {
+      var pos = this.position();
+      var starRe = /^(?:\*(?![*(])|[*]{3,}(?!\()|[*]{2}(?![(/]|$)|\*(?=\*\())/;
+      var m = this.match(starRe);
+      if (!m) return;
 
-async function sortPackageJson(kbn) {
-  const packageJsonPath = kbn.getAbsolute('package.json');
-  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(packageJsonPath, Object(_kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_1__["sortPackageJson"])(await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(packageJsonPath, 'utf-8')));
-}
+      this.state.metachar = true;
+      this.state.star = true;
+      return pos({
+        type: 'star',
+        val: m[0]
+      });
+    })
 
-/***/ }),
-/* 413 */
-/***/ (function(module, exports) {
+    /**
+     * Slash: "/"
+     */
 
-module.exports = require("fs/promises");
+    .capture('slash', function() {
+      var pos = this.position();
+      var m = this.match(/^\//);
+      if (!m) return;
 
-/***/ }),
-/* 414 */
-/***/ (function(module, exports, __webpack_require__) {
+      this.state.slashes++;
+      return pos({
+        type: 'slash',
+        val: m[0]
+      });
+    })
 
-"use strict";
+    /**
+     * Backslash: "\\"
+     */
 
+    .capture('backslash', function() {
+      var pos = this.position();
+      var m = this.match(/^\\(?![*+?(){}[\]'"])/);
+      if (!m) return;
 
-var _interopRequireDefault = __webpack_require__(7);
+      var val = m[0];
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortPackageJson = sortPackageJson;
+      if (this.isInside('bracket')) {
+        val = '\\';
+      } else if (val.length > 1) {
+        val = '\\\\';
+      }
 
-var _sortPackageJson = _interopRequireDefault(__webpack_require__(415));
+      return pos({
+        type: 'backslash',
+        val: val
+      });
+    })
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-function sortPackageJson(json) {
-  return JSON.stringify((0, _sortPackageJson.default)(JSON.parse(json), {
-    // top level keys in the order they were written when this was implemented
-    sortOrder: ['name', 'description', 'keywords', 'private', 'version', 'branch', 'main', 'browser', 'types', 'tsdocMetadata', 'build', 'homepage', 'bugs', 'license', 'kibana', 'author', 'scripts', 'repository', 'engines', 'resolutions']
-  }), null, 2) + '\n';
-}
+    /**
+     * Square: "[.]"
+     */
 
-/***/ }),
-/* 415 */
-/***/ (function(module, exports, __webpack_require__) {
+    .capture('square', function() {
+      if (this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(/^\[([^!^\\])\]/);
+      if (!m) return;
 
-const sortObjectKeys = __webpack_require__(416)
-const detectIndent = __webpack_require__(417)
-const detectNewline = __webpack_require__(418).graceful
-const gitHooks = __webpack_require__(419)
-const isPlainObject = __webpack_require__(420)
+      return pos({
+        type: 'square',
+        val: m[1]
+      });
+    })
 
-const hasOwnProperty = (object, property) =>
-  Object.prototype.hasOwnProperty.call(object, property)
-const pipe = (fns) => (x, ...args) =>
-  fns.reduce((result, fn) => fn(result, ...args), x)
-const onArray = (fn) => (x) => (Array.isArray(x) ? fn(x) : x)
-const onStringArray = (fn) => (x) =>
-  Array.isArray(x) && x.every((item) => typeof item === 'string') ? fn(x) : x
-const uniq = onStringArray((xs) => xs.filter((x, i) => i === xs.indexOf(x)))
-const sortArray = onStringArray((array) => [...array].sort())
-const uniqAndSortArray = pipe([uniq, sortArray])
-const onObject = (fn) => (x, ...args) => (isPlainObject(x) ? fn(x, ...args) : x)
-const sortObjectBy = (comparator, deep) => {
-  const over = onObject((object) => {
-    object = sortObjectKeys(object, comparator)
-    if (deep) {
-      for (const [key, value] of Object.entries(object)) {
-        object[key] = over(value)
-      }
-    }
-    return object
-  })
+    /**
+     * Brackets: "[...]" (basic, this can be overridden by other parsers)
+     */
 
-  return over
-}
-const sortObject = sortObjectBy()
-const sortURLObject = sortObjectBy(['type', 'url'])
-const sortPeopleObject = sortObjectBy(['name', 'email', 'url'])
-const sortDirectories = sortObjectBy([
-  'lib',
-  'bin',
-  'man',
-  'doc',
-  'example',
-  'test',
-])
-const overProperty = (property, over) => (object, ...args) =>
-  hasOwnProperty(object, property)
-    ? Object.assign(object, { [property]: over(object[property], ...args) })
-    : object
-const sortGitHooks = sortObjectBy(gitHooks)
+    .capture('bracket', function() {
+      var pos = this.position();
+      var m = this.match(/^(?:\[([!^]?)([^\]]+|\]-)(\]|[^*+?]+)|\[)/);
+      if (!m) return;
 
-// https://github.com/eslint/eslint/blob/acc0e47572a9390292b4e313b4a4bf360d236358/conf/config-schema.js
-const eslintBaseConfigProperties = [
-  // `files` and `excludedFiles` are only on `overrides[]`
-  // for easier sort `overrides[]`,
-  // add them to here, so we don't need sort `overrides[]` twice
-  'files',
-  'excludedFiles',
-  // baseConfig
-  'env',
-  'parser',
-  'parserOptions',
-  'settings',
-  'plugins',
-  'extends',
-  'rules',
-  'overrides',
-  'globals',
-  'processor',
-  'noInlineConfig',
-  'reportUnusedDisableDirectives',
-]
-const sortEslintConfig = onObject(
-  pipe([
-    sortObjectBy(eslintBaseConfigProperties),
-    overProperty('env', sortObject),
-    overProperty('globals', sortObject),
-    overProperty(
-      'overrides',
-      onArray((overrides) => overrides.map(sortEslintConfig)),
-    ),
-    overProperty('parserOptions', sortObject),
-    overProperty(
-      'rules',
-      sortObjectBy(
-        (rule1, rule2) =>
-          rule1.split('/').length - rule2.split('/').length ||
-          rule1.localeCompare(rule2),
-      ),
-    ),
-    overProperty('settings', sortObject),
-  ]),
-)
-const sortVSCodeBadgeObject = sortObjectBy(['description', 'url', 'href'])
+      var val = m[0];
+      var negated = m[1] ? '^' : '';
+      var inner = (m[2] || '').replace(/\\\\+/, '\\\\');
+      var close = m[3] || '';
 
-const sortPrettierConfig = onObject(
-  pipe([
-    // sort keys alphabetically, but put `overrides` at bottom
-    (config) =>
-      sortObjectKeys(config, [
-        ...Object.keys(config)
-          .filter((key) => key !== 'overrides')
-          .sort(),
-        'overrides',
-      ]),
-    // if `config.overrides` exists
-    overProperty(
-      'overrides',
-      // and `config.overrides` is an array
-      onArray((overrides) =>
-        overrides.map(
-          pipe([
-            // sort `config.overrides[]` alphabetically
-            sortObject,
-            // sort `config.overrides[].options` alphabetically
-            overProperty('options', sortObject),
-          ]),
-        ),
-      ),
-    ),
-  ]),
-)
+      if (m[2] && inner.length < m[2].length) {
+        val = val.replace(/\\\\+/, '\\\\');
+      }
 
-// See https://docs.npmjs.com/misc/scripts
-const defaultNpmScripts = new Set([
-  'install',
-  'pack',
-  'prepare',
-  'publish',
-  'restart',
-  'shrinkwrap',
-  'start',
-  'stop',
-  'test',
-  'uninstall',
-  'version',
-])
+      var esc = this.input.slice(0, 2);
+      if (inner === '' && esc === '\\]') {
+        inner += esc;
+        this.consume(2);
 
-const hasDevDependency = (dependency, packageJson) => {
-  return (
-    'devDependencies' in packageJson &&
-    !!packageJson.devDependencies[dependency]
-  )
-}
+        var str = this.input;
+        var idx = -1;
+        var ch;
 
-const sortScripts = onObject((scripts, packageJson) => {
-  const names = Object.keys(scripts)
-  const prefixable = new Set()
+        while ((ch = str[++idx])) {
+          this.consume(1);
+          if (ch === ']') {
+            close = ch;
+            break;
+          }
+          inner += ch;
+        }
+      }
 
-  const keys = names.map((name) => {
-    const omitted = name.replace(/^(?:pre|post)/, '')
-    if (defaultNpmScripts.has(omitted) || names.includes(omitted)) {
-      prefixable.add(omitted)
-      return omitted
-    }
-    return name
-  })
+      return pos({
+        type: 'bracket',
+        val: val,
+        escaped: close !== ']',
+        negated: negated,
+        inner: inner,
+        close: close
+      });
+    })
 
-  if (!hasDevDependency('npm-run-all', packageJson)) {
-    keys.sort()
-  }
+    /**
+     * Text
+     */
 
-  const order = keys.reduce(
-    (order, key) =>
-      order.concat(
-        prefixable.has(key) ? [`pre${key}`, key, `post${key}`] : [key],
-      ),
-    [],
-  )
+    .capture('text', function() {
+      if (this.isInside('bracket')) return;
+      var pos = this.position();
+      var m = this.match(not);
+      if (!m || !m[0]) return;
 
-  return sortObjectKeys(scripts, order)
-})
+      return pos({
+        type: 'text',
+        val: m[0]
+      });
+    });
 
-// fields marked `vscode` are for `Visual Studio Code extension manifest` only
-// https://code.visualstudio.com/api/references/extension-manifest
-// Supported fields:
-// publisher, displayName, categories, galleryBanner, preview, contributes,
-// activationEvents, badges, markdown, qna, extensionPack,
-// extensionDependencies, icon
+  /**
+   * Allow custom parsers to be passed on options
+   */
 
-// field.key{string}: field name
-// field.over{function}: sort field subKey
-const fields = [
-  { key: '$schema' },
-  { key: 'name' },
-  /* vscode */ { key: 'displayName' },
-  { key: 'version' },
-  { key: 'private' },
-  { key: 'description' },
-  /* vscode */ { key: 'categories', over: uniq },
-  { key: 'keywords', over: uniq },
-  { key: 'homepage' },
-  { key: 'bugs', over: sortObjectBy(['url', 'email']) },
-  { key: 'repository', over: sortURLObject },
-  { key: 'funding', over: sortURLObject },
-  { key: 'license', over: sortURLObject },
-  /* vscode */ { key: 'qna' },
-  { key: 'author', over: sortPeopleObject },
-  {
-    key: 'maintainers',
-    over: onArray((maintainers) => maintainers.map(sortPeopleObject)),
-  },
-  {
-    key: 'contributors',
-    over: onArray((contributors) => contributors.map(sortPeopleObject)),
-  },
-  /* vscode */ { key: 'publisher' },
-  { key: 'sideEffects' },
-  { key: 'type' },
-  { key: 'imports' },
-  { key: 'exports' },
-  { key: 'main' },
-  { key: 'umd:main' },
-  { key: 'jsdelivr' },
-  { key: 'unpkg' },
-  { key: 'module' },
-  { key: 'source' },
-  { key: 'jsnext:main' },
-  { key: 'browser' },
-  { key: 'types' },
-  { key: 'typesVersions' },
-  { key: 'typings' },
-  { key: 'style' },
-  { key: 'example' },
-  { key: 'examplestyle' },
-  { key: 'assets' },
-  { key: 'bin', over: sortObject },
-  { key: 'man' },
-  { key: 'directories', over: sortDirectories },
-  { key: 'files', over: uniq },
-  { key: 'workspaces' },
-  // node-pre-gyp https://www.npmjs.com/package/node-pre-gyp#1-add-new-entries-to-your-packagejson
-  {
-    key: 'binary',
-    over: sortObjectBy([
-      'module_name',
-      'module_path',
-      'remote_path',
-      'package_name',
-      'host',
-    ]),
-  },
-  { key: 'scripts', over: sortScripts },
-  { key: 'betterScripts', over: sortScripts },
-  /* vscode */ { key: 'contributes', over: sortObject },
-  /* vscode */ { key: 'activationEvents', over: uniq },
-  { key: 'husky', over: overProperty('hooks', sortGitHooks) },
-  { key: 'simple-git-hooks', over: sortGitHooks },
-  { key: 'pre-commit' },
-  { key: 'commitlint', over: sortObject },
-  { key: 'lint-staged' },
-  { key: 'config', over: sortObject },
-  { key: 'nodemonConfig', over: sortObject },
-  { key: 'browserify', over: sortObject },
-  { key: 'babel', over: sortObject },
-  { key: 'browserslist' },
-  { key: 'xo', over: sortObject },
-  { key: 'prettier', over: sortPrettierConfig },
-  { key: 'eslintConfig', over: sortEslintConfig },
-  { key: 'eslintIgnore' },
-  { key: 'npmpkgjsonlint', over: sortObject },
-  { key: 'npmPackageJsonLintConfig', over: sortObject },
-  { key: 'npmpackagejsonlint', over: sortObject },
-  { key: 'release', over: sortObject },
-  { key: 'remarkConfig', over: sortObject },
-  { key: 'stylelint' },
-  { key: 'ava', over: sortObject },
-  { key: 'jest', over: sortObject },
-  { key: 'mocha', over: sortObject },
-  { key: 'nyc', over: sortObject },
-  { key: 'c8', over: sortObject },
-  { key: 'tap', over: sortObject },
-  { key: 'resolutions', over: sortObject },
-  { key: 'dependencies', over: sortObject },
-  { key: 'devDependencies', over: sortObject },
-  { key: 'dependenciesMeta', over: sortObjectBy(undefined, true) },
-  { key: 'peerDependencies', over: sortObject },
-  // TODO: only sort depth = 2
-  { key: 'peerDependenciesMeta', over: sortObjectBy(undefined, true) },
-  { key: 'optionalDependencies', over: sortObject },
-  { key: 'bundledDependencies', over: uniqAndSortArray },
-  { key: 'bundleDependencies', over: uniqAndSortArray },
-  /* vscode */ { key: 'extensionPack', over: uniqAndSortArray },
-  /* vscode */ { key: 'extensionDependencies', over: uniqAndSortArray },
-  { key: 'flat' },
-  { key: 'engines', over: sortObject },
-  { key: 'engineStrict', over: sortObject },
-  { key: 'languageName' },
-  { key: 'os' },
-  { key: 'cpu' },
-  { key: 'preferGlobal', over: sortObject },
-  { key: 'publishConfig', over: sortObject },
-  /* vscode */ { key: 'icon' },
-  /* vscode */ {
-    key: 'badges',
-    over: onArray((badge) => badge.map(sortVSCodeBadgeObject)),
-  },
-  /* vscode */ { key: 'galleryBanner', over: sortObject },
-  /* vscode */ { key: 'preview' },
-  /* vscode */ { key: 'markdown' },
-]
+  if (options && typeof options.parsers === 'function') {
+    options.parsers(nanomatch.parser);
+  }
+};
 
-const defaultSortOrder = fields.map(({ key }) => key)
-const overFields = pipe(
-  fields.reduce((fns, { key, over }) => {
-    if (over) {
-      fns.push(overProperty(key, over))
+/**
+ * Advance to the next non-escaped character
+ */
+
+function advanceTo(input, endChar) {
+  var ch = input.charAt(0);
+  var tok = { len: 1, val: '', esc: '' };
+  var idx = 0;
+
+  function advance() {
+    if (ch !== '\\') {
+      tok.esc += '\\' + ch;
+      tok.val += ch;
     }
-    return fns
-  }, []),
-)
 
-function editStringJSON(json, over) {
-  if (typeof json === 'string') {
-    const { indent } = detectIndent(json)
-    const endCharacters = json.slice(-1) === '\n' ? '\n' : ''
-    const newline = detectNewline(json)
-    json = JSON.parse(json)
+    ch = input.charAt(++idx);
+    tok.len++;
 
-    let result = JSON.stringify(over(json), null, indent) + endCharacters
-    if (newline === '\r\n') {
-      result = result.replace(/\n/g, newline)
+    if (ch === '\\') {
+      advance();
+      advance();
     }
-    return result
   }
 
-  return over(json)
+  while (ch && ch !== endChar) {
+    advance();
+  }
+  return tok;
 }
 
-const isPrivateKey = (key) => key[0] === '_'
-const partition = (array, predicate) =>
-  array.reduce(
-    (result, value) => {
-      result[predicate(value) ? 0 : 1].push(value)
-      return result
-    },
-    [[], []],
-  )
-function sortPackageJson(jsonIsh, options = {}) {
-  return editStringJSON(
-    jsonIsh,
-    onObject((json) => {
-      let sortOrder = options.sortOrder ? options.sortOrder : defaultSortOrder
-
-      if (Array.isArray(sortOrder)) {
-        const keys = Object.keys(json)
-        const [privateKeys, publicKeys] = partition(keys, isPrivateKey)
-        sortOrder = [
-          ...sortOrder,
-          ...defaultSortOrder,
-          ...publicKeys.sort(),
-          ...privateKeys.sort(),
-        ]
-      }
+/**
+ * Create text regex
+ */
 
-      return overFields(sortObjectKeys(json, sortOrder), json)
-    }),
-  )
+function createTextRegex(pattern) {
+  if (cached) return cached;
+  var opts = {contains: true, strictClose: false};
+  var not = regexNot.create(pattern, opts);
+  var re = toRegex('^(?:[*]\\((?=.)|' + not + ')', opts);
+  return (cached = re);
 }
 
-module.exports = sortPackageJson
-module.exports.sortPackageJson = sortPackageJson
-module.exports.sortOrder = defaultSortOrder
-module.exports.default = sortPackageJson
+/**
+ * Expose negation string
+ */
+
+module.exports.not = NOT_REGEX;
 
 
 /***/ }),
-/* 416 */
-/***/ (function(module, exports) {
 
-module.exports = function sortObjectByKeyNameList(object, sortWith) {
-  var keys;
-  var sortFn;
+/***/ "../../node_modules/nanomatch/lib/utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (typeof sortWith === 'function') {
-    sortFn = sortWith;
+"use strict";
+
+
+var utils = module.exports;
+var path = __webpack_require__("path");
+
+/**
+ * Module dependencies
+ */
+
+var isWindows = __webpack_require__("../../node_modules/is-windows/index.js")();
+var Snapdragon = __webpack_require__("../../node_modules/snapdragon/index.js");
+utils.define = __webpack_require__("../../node_modules/nanomatch/node_modules/define-property/index.js");
+utils.diff = __webpack_require__("../../node_modules/arr-diff/index.js");
+utils.extend = __webpack_require__("../../node_modules/nanomatch/node_modules/extend-shallow/index.js");
+utils.pick = __webpack_require__("../../node_modules/object.pick/index.js");
+utils.typeOf = __webpack_require__("../../node_modules/kind-of/index.js");
+utils.unique = __webpack_require__("../../node_modules/array-unique/index.js");
+
+/**
+ * Returns true if the given value is effectively an empty string
+ */
+
+utils.isEmptyString = function(val) {
+  return String(val) === '' || String(val) === './';
+};
+
+/**
+ * Returns true if the platform is windows, or `path.sep` is `\\`.
+ * This is defined as a function to allow `path.sep` to be set in unit tests,
+ * or by the user, if there is a reason to do so.
+ * @return {Boolean}
+ */
+
+utils.isWindows = function() {
+  return path.sep === '\\' || isWindows === true;
+};
+
+/**
+ * Return the last element from an array
+ */
+
+utils.last = function(arr, n) {
+  return arr[arr.length - (n || 1)];
+};
+
+/**
+ * Get the `Snapdragon` instance to use
+ */
+
+utils.instantiate = function(ast, options) {
+  var snapdragon;
+  // if an instance was created by `.parse`, use that instance
+  if (utils.typeOf(ast) === 'object' && ast.snapdragon) {
+    snapdragon = ast.snapdragon;
+  // if the user supplies an instance on options, use that instance
+  } else if (utils.typeOf(options) === 'object' && options.snapdragon) {
+    snapdragon = options.snapdragon;
+  // create a new instance
   } else {
-    keys = sortWith;
+    snapdragon = new Snapdragon(options);
   }
 
-  var objectKeys = Object.keys(object);
-  return (keys || []).concat(objectKeys.sort(sortFn)).reduce(function(total, key) {
-    if (objectKeys.indexOf(key) !== -1) {
-      total[key] = object[key];
+  utils.define(snapdragon, 'parse', function(str, options) {
+    var parsed = Snapdragon.prototype.parse.call(this, str, options);
+    parsed.input = str;
+
+    // escape unmatched brace/bracket/parens
+    var last = this.parser.stack.pop();
+    if (last && this.options.strictErrors !== true) {
+      var open = last.nodes[0];
+      var inner = last.nodes[1];
+      if (last.type === 'bracket') {
+        if (inner.val.charAt(0) === '[') {
+          inner.val = '\\' + inner.val;
+        }
+
+      } else {
+        open.val = '\\' + open.val;
+        var sibling = open.parent.nodes[1];
+        if (sibling.type === 'star') {
+          sibling.loose = true;
+        }
+      }
     }
-    return total;
-  }, Object.create(null));
-}
 
+    // add non-enumerable parser reference
+    utils.define(parsed, 'parser', this.parser);
+    return parsed;
+  });
 
-/***/ }),
-/* 417 */
-/***/ (function(module, exports, __webpack_require__) {
+  return snapdragon;
+};
 
-"use strict";
+/**
+ * Create the key to use for memoization. The key is generated
+ * by iterating over the options and concatenating key-value pairs
+ * to the pattern string.
+ */
 
+utils.createKey = function(pattern, options) {
+  if (typeof options === 'undefined') {
+    return pattern;
+  }
+  var key = pattern;
+  for (var prop in options) {
+    if (options.hasOwnProperty(prop)) {
+      key += ';' + prop + '=' + String(options[prop]);
+    }
+  }
+  return key;
+};
 
-// Detect either spaces or tabs but not both to properly handle tabs for indentation and spaces for alignment
-const INDENT_REGEX = /^(?:( )+|\t+)/;
+/**
+ * Cast `val` to an array
+ * @return {Array}
+ */
 
-const INDENT_TYPE_SPACE = 'space';
-const INDENT_TYPE_TAB = 'tab';
+utils.arrayify = function(val) {
+  if (typeof val === 'string') return [val];
+  return val ? (Array.isArray(val) ? val : [val]) : [];
+};
 
-// Make a Map that counts how many indents/unindents have occurred for a given size and how many lines follow a given indentation.
-// The key is a concatenation of the indentation type (s = space and t = tab) and the size of the indents/unindents.
-//
-// indents = {
-//    t3: [1, 0],
-//    t4: [1, 5],
-//    s5: [1, 0],
-//   s12: [1, 0],
-// }
-function makeIndentsMap(string, ignoreSingleSpaces) {
-	const indents = new Map();
+/**
+ * Return true if `val` is a non-empty string
+ */
 
-	// Remember the size of previous line's indentation
-	let previousSize = 0;
-	let previousIndentType;
+utils.isString = function(val) {
+  return typeof val === 'string';
+};
 
-	// Indents key (ident type + size of the indents/unindents)
-	let key;
+/**
+ * Return true if `val` is a non-empty string
+ */
 
-	for (const line of string.split(/\n/g)) {
-		if (!line) {
-			// Ignore empty lines
-			continue;
-		}
+utils.isRegex = function(val) {
+  return utils.typeOf(val) === 'regexp';
+};
 
-		let indent;
-		let indentType;
-		let weight;
-		let entry;
-		const matches = line.match(INDENT_REGEX);
+/**
+ * Return true if `val` is a non-empty string
+ */
 
-		if (matches === null) {
-			previousSize = 0;
-			previousIndentType = '';
-		} else {
-			indent = matches[0].length;
+utils.isObject = function(val) {
+  return utils.typeOf(val) === 'object';
+};
 
-			if (matches[1]) {
-				indentType = INDENT_TYPE_SPACE;
-			} else {
-				indentType = INDENT_TYPE_TAB;
-			}
+/**
+ * Escape regex characters in the given string
+ */
 
-			// Ignore single space unless it's the only indent detected to prevent common false positives
-			if (ignoreSingleSpaces && indentType === INDENT_TYPE_SPACE && indent === 1) {
-				continue;
-			}
+utils.escapeRegex = function(str) {
+  return str.replace(/[-[\]{}()^$|*+?.\\/\s]/g, '\\$&');
+};
 
-			if (indentType !== previousIndentType) {
-				previousSize = 0;
-			}
+/**
+ * Combines duplicate characters in the provided `input` string.
+ * @param {String} `input`
+ * @returns {String}
+ */
 
-			previousIndentType = indentType;
+utils.combineDupes = function(input, patterns) {
+  patterns = utils.arrayify(patterns).join('|').split('|');
+  patterns = patterns.map(function(s) {
+    return s.replace(/\\?([+*\\/])/g, '\\$1');
+  });
+  var substr = patterns.join('|');
+  var regex = new RegExp('(' + substr + ')(?=\\1)', 'g');
+  return input.replace(regex, '');
+};
 
-			weight = 0;
+/**
+ * Returns true if the given `str` has special characters
+ */
 
-			const indentDifference = indent - previousSize;
-			previousSize = indent;
+utils.hasSpecialChars = function(str) {
+  return /(?:(?:(^|\/)[!.])|[*?+()|[\]{}]|[+@]\()/.test(str);
+};
 
-			// Previous line have same indent?
-			if (indentDifference === 0) {
-				weight++;
-				// We use the key from previous loop
-			} else {
-				const absoluteIndentDifference = indentDifference > 0 ? indentDifference : -indentDifference;
-				key = encodeIndentsKey(indentType, absoluteIndentDifference);
-			}
+/**
+ * Normalize slashes in the given filepath.
+ *
+ * @param {String} `filepath`
+ * @return {String}
+ */
 
-			// Update the stats
-			entry = indents.get(key);
+utils.toPosixPath = function(str) {
+  return str.replace(/\\+/g, '/');
+};
 
-			if (entry === undefined) {
-				entry = [1, 0]; // Init
-			} else {
-				entry = [++entry[0], entry[1] + weight];
-			}
+/**
+ * Strip backslashes before special characters in a string.
+ *
+ * @param {String} `str`
+ * @return {String}
+ */
 
-			indents.set(key, entry);
-		}
-	}
+utils.unescape = function(str) {
+  return utils.toPosixPath(str.replace(/\\(?=[*+?!.])/g, ''));
+};
 
-	return indents;
-}
+/**
+ * Strip the drive letter from a windows filepath
+ * @param {String} `fp`
+ * @return {String}
+ */
 
-// Encode the indent type and amount as a string (e.g. 's4') for use as a compound key in the indents Map.
-function encodeIndentsKey(indentType, indentAmount) {
-	const typeCharacter = indentType === INDENT_TYPE_SPACE ? 's' : 't';
-	return typeCharacter + String(indentAmount);
-}
+utils.stripDrive = function(fp) {
+  return utils.isWindows() ? fp.replace(/^[a-z]:[\\/]+?/i, '/') : fp;
+};
 
-// Extract the indent type and amount from a key of the indents Map.
-function decodeIndentsKey(indentsKey) {
-	const keyHasTypeSpace = indentsKey[0] === 's';
-	const type = keyHasTypeSpace ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
+/**
+ * Strip the prefix from a filepath
+ * @param {String} `fp`
+ * @return {String}
+ */
 
-	const amount = Number(indentsKey.slice(1));
+utils.stripPrefix = function(str) {
+  if (str.charAt(0) === '.' && (str.charAt(1) === '/' || str.charAt(1) === '\\')) {
+    return str.slice(2);
+  }
+  return str;
+};
 
-	return {type, amount};
-}
+/**
+ * Returns true if `str` is a common character that doesn't need
+ * to be processed to be used for matching.
+ * @param {String} `str`
+ * @return {Boolean}
+ */
 
-// Return the key (e.g. 's4') from the indents Map that represents the most common indent,
-// or return undefined if there are no indents.
-function getMostUsedKey(indents) {
-	let result;
-	let maxUsed = 0;
-	let maxWeight = 0;
+utils.isSimpleChar = function(str) {
+  return str.trim() === '' || str === '.';
+};
 
-	for (const [key, [usedCount, weight]] of indents) {
-		if (usedCount > maxUsed || (usedCount === maxUsed && weight > maxWeight)) {
-			maxUsed = usedCount;
-			maxWeight = weight;
-			result = key;
-		}
-	}
+/**
+ * Returns true if the given str is an escaped or
+ * unescaped path character
+ */
 
-	return result;
-}
+utils.isSlash = function(str) {
+  return str === '/' || str === '\\/' || str === '\\' || str === '\\\\';
+};
 
-function makeIndentString(type, amount) {
-	const indentCharacter = type === INDENT_TYPE_SPACE ? ' ' : '\t';
-	return indentCharacter.repeat(amount);
-}
+/**
+ * Returns a function that returns true if the given
+ * pattern matches or contains a `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
 
-module.exports = string => {
-	if (typeof string !== 'string') {
-		throw new TypeError('Expected a string');
-	}
+utils.matchPath = function(pattern, options) {
+  return (options && options.contains)
+    ? utils.containsPattern(pattern, options)
+    : utils.equalsPattern(pattern, options);
+};
 
-	// Identify indents while skipping single space indents to avoid common edge cases (e.g. code comments)
-	// If no indents are identified, run again and include all indents for comprehensive detection
-	let indents = makeIndentsMap(string, true);
-	if (indents.size === 0) {
-		indents = makeIndentsMap(string, false);
-	}
+/**
+ * Returns true if the given (original) filepath or unixified path are equal
+ * to the given pattern.
+ */
+
+utils._equals = function(filepath, unixPath, pattern) {
+  return pattern === filepath || pattern === unixPath;
+};
+
+/**
+ * Returns true if the given (original) filepath or unixified path contain
+ * the given pattern.
+ */
+
+utils._contains = function(filepath, unixPath, pattern) {
+  return filepath.indexOf(pattern) !== -1 || unixPath.indexOf(pattern) !== -1;
+};
+
+/**
+ * Returns a function that returns true if the given
+ * pattern is the same as a given `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
+
+utils.equalsPattern = function(pattern, options) {
+  var unixify = utils.unixify(options);
+  options = options || {};
+
+  return function fn(filepath) {
+    var equal = utils._equals(filepath, unixify(filepath), pattern);
+    if (equal === true || options.nocase !== true) {
+      return equal;
+    }
+    var lower = filepath.toLowerCase();
+    return utils._equals(lower, unixify(lower), pattern);
+  };
+};
+
+/**
+ * Returns a function that returns true if the given
+ * pattern contains a `filepath`
+ *
+ * @param {String} `pattern`
+ * @return {Function}
+ */
+
+utils.containsPattern = function(pattern, options) {
+  var unixify = utils.unixify(options);
+  options = options || {};
+
+  return function(filepath) {
+    var contains = utils._contains(filepath, unixify(filepath), pattern);
+    if (contains === true || options.nocase !== true) {
+      return contains;
+    }
+    var lower = filepath.toLowerCase();
+    return utils._contains(lower, unixify(lower), pattern);
+  };
+};
+
+/**
+ * Returns a function that returns true if the given
+ * regex matches the `filename` of a file path.
+ *
+ * @param {RegExp} `re` Matching regex
+ * @return {Function}
+ */
+
+utils.matchBasename = function(re) {
+  return function(filepath) {
+    return re.test(filepath) || re.test(path.basename(filepath));
+  };
+};
+
+/**
+ * Returns the given value unchanced.
+ * @return {any}
+ */
+
+utils.identity = function(val) {
+  return val;
+};
 
-	const keyOfMostUsedIndent = getMostUsedKey(indents);
+/**
+ * Determines the filepath to return based on the provided options.
+ * @return {any}
+ */
 
-	let type;
-	let amount = 0;
-	let indent = '';
+utils.value = function(str, unixify, options) {
+  if (options && options.unixify === false) {
+    return str;
+  }
+  if (options && typeof options.unixify === 'function') {
+    return options.unixify(str);
+  }
+  return unixify(str);
+};
 
-	if (keyOfMostUsedIndent !== undefined) {
-		({type, amount} = decodeIndentsKey(keyOfMostUsedIndent));
-		indent = makeIndentString(type, amount);
-	}
+/**
+ * Returns a function that normalizes slashes in a string to forward
+ * slashes, strips `./` from beginning of paths, and optionally unescapes
+ * special characters.
+ * @return {Function}
+ */
 
-	return {
-		amount,
-		type,
-		indent
-	};
+utils.unixify = function(options) {
+  var opts = options || {};
+  return function(filepath) {
+    if (opts.stripPrefix !== false) {
+      filepath = utils.stripPrefix(filepath);
+    }
+    if (opts.unescape === true) {
+      filepath = utils.unescape(filepath);
+    }
+    if (opts.unixify === true || utils.isWindows()) {
+      filepath = utils.toPosixPath(filepath);
+    }
+    return filepath;
+  };
 };
 
 
 /***/ }),
-/* 418 */
+
+/***/ "../../node_modules/nanomatch/node_modules/define-property/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
 
-const detectNewline = string => {
-	if (typeof string !== 'string') {
-		throw new TypeError('Expected a string');
-	}
-
-	const newlines = string.match(/(?:\r?\n)/g) || [];
 
-	if (newlines.length === 0) {
-		return;
-	}
+var isobject = __webpack_require__("../../node_modules/isobject/index.js");
+var isDescriptor = __webpack_require__("../../node_modules/is-descriptor/index.js");
+var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
+  ? Reflect.defineProperty
+  : Object.defineProperty;
 
-	const crlf = newlines.filter(newline => newline === '\r\n').length;
-	const lf = newlines.length - crlf;
+module.exports = function defineProperty(obj, key, val) {
+  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
+    throw new TypeError('expected an object, function, or array');
+  }
 
-	return crlf > lf ? '\r\n' : '\n';
-};
+  if (typeof key !== 'string') {
+    throw new TypeError('expected "key" to be a string');
+  }
 
-module.exports = detectNewline;
-module.exports.graceful = string => (typeof string === 'string' && detectNewline(string)) || '\n';
+  if (isDescriptor(val)) {
+    define(obj, key, val);
+    return obj;
+  }
 
+  define(obj, key, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
 
-/***/ }),
-/* 419 */
-/***/ (function(module) {
+  return obj;
+};
 
-module.exports = JSON.parse("[\"applypatch-msg\",\"pre-applypatch\",\"post-applypatch\",\"pre-commit\",\"pre-merge-commit\",\"prepare-commit-msg\",\"commit-msg\",\"post-commit\",\"pre-rebase\",\"post-checkout\",\"post-merge\",\"pre-push\",\"pre-receive\",\"update\",\"post-receive\",\"post-update\",\"push-to-checkout\",\"pre-auto-gc\",\"post-rewrite\",\"sendemail-validate\",\"fsmonitor-watchman\",\"p4-pre-submit\",\"post-index-change\"]");
 
 /***/ }),
-/* 420 */
+
+/***/ "../../node_modules/nanomatch/node_modules/extend-shallow/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = value => {
-	if (Object.prototype.toString.call(value) !== '[object Object]') {
-		return false;
-	}
+var isExtendable = __webpack_require__("../../node_modules/nanomatch/node_modules/is-extendable/index.js");
+var assignSymbols = __webpack_require__("../../node_modules/assign-symbols/index.js");
 
-	const prototype = Object.getPrototypeOf(value);
-	return prototype === null || prototype === Object.prototype;
+module.exports = Object.assign || function(obj/*, objects*/) {
+  if (obj === null || typeof obj === 'undefined') {
+    throw new TypeError('Cannot convert undefined or null to object');
+  }
+  if (!isObject(obj)) {
+    obj = {};
+  }
+  for (var i = 1; i < arguments.length; i++) {
+    var val = arguments[i];
+    if (isString(val)) {
+      val = toObject(val);
+    }
+    if (isObject(val)) {
+      assign(obj, val);
+      assignSymbols(obj, val);
+    }
+  }
+  return obj;
 };
 
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
+  }
+}
 
-/***/ }),
-/* 421 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function isString(val) {
+  return (val && typeof val === 'string');
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "validateDependencies", function() { return validateDependencies; });
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(410);
-/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(114);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(343);
-/* harmony import */ var _projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(422);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-// @ts-expect-error published types are useless
+function toObject(str) {
+  var obj = {};
+  for (var i in str) {
+    obj[i] = str[i];
+  }
+  return obj;
+}
 
+function isObject(val) {
+  return (val && typeof val === 'object') || isExtendable(val);
+}
 
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
 
+function isEnum(obj, key) {
+  return Object.prototype.propertyIsEnumerable.call(obj, key);
+}
 
 
+/***/ }),
 
+/***/ "../../node_modules/nanomatch/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-async function validateDependencies(kbn, yarnLock) {
-  // look through all of the packages in the yarn.lock file to see if
-  // we have accidentally installed multiple lodash v4 versions
-  const lodash4Versions = new Set();
-  const lodash4Reqs = new Set();
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-  for (const [req, dep] of Object.entries(yarnLock)) {
-    if (req.startsWith('lodash@') && dep.version.startsWith('4.')) {
-      lodash4Reqs.add(req);
-      lodash4Versions.add(dep.version);
-    }
-  } // if we find more than one lodash v4 version installed then delete
-  // lodash v4 requests from the yarn.lock file and prompt the user to
-  // retry bootstrap so that a single v4 version will be installed
 
 
-  if (lodash4Versions.size > 1) {
-    for (const req of lodash4Reqs) {
-      delete yarnLock[req];
-    }
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
 
-    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["writeFile"])(kbn.getAbsolute('yarn.lock'), Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["stringify"])(yarnLock), 'utf8');
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
+module.exports = function isExtendable(val) {
+  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
+};
 
-      Multiple version of lodash v4 were detected, so they have been removed
-      from the yarn.lock file. Please rerun yarn kbn bootstrap to coalese the
-      lodash versions installed.
 
-      If you still see this error when you re-bootstrap then you might need
-      to force a new dependency to use the latest version of lodash via the
-      "resolutions" field in package.json.
+/***/ }),
 
-      If you have questions about this please reach out to the operations team.
+/***/ "../../node_modules/ncp/lib/ncp.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    `);
-    process.exit(1);
-  } // look through all the dependencies of production packages and production
-  // dependencies of those packages to determine if we're shipping any versions
-  // of lodash v3 in the distributable
+var fs = __webpack_require__("fs"),
+    path = __webpack_require__("path");
 
+module.exports = ncp;
+ncp.ncp = ncp;
 
-  const prodDependencies = kbn.resolveAllProductionDependencies(yarnLock, _log__WEBPACK_IMPORTED_MODULE_5__["log"]);
-  const lodash3Versions = new Set();
+function ncp (source, dest, options, callback) {
+  var cback = callback;
 
-  for (const dep of prodDependencies.values()) {
-    if (dep.name === 'lodash' && dep.version.startsWith('3.')) {
-      lodash3Versions.add(dep.version);
-    }
-  } // if any lodash v3 packages were found we abort and tell the user to fix things
+  if (!callback) {
+    cback = options;
+    options = {};
+  }
 
+  var basePath = process.cwd(),
+      currentPath = path.resolve(basePath, source),
+      targetPath = path.resolve(basePath, dest),
+      filter = options.filter,
+      rename = options.rename,
+      transform = options.transform,
+      clobber = options.clobber !== false,
+      modified = options.modified,
+      dereference = options.dereference,
+      errs = null,
+      started = 0,
+      finished = 0,
+      running = 0,
+      limit = options.limit || ncp.limit || 16;
 
-  if (lodash3Versions.size) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
+  limit = (limit < 1) ? 1 : (limit > 512) ? 512 : limit;
 
-      Due to changes in the yarn.lock file and/or package.json files a version of
-      lodash 3 is now included in the production dependencies. To reduce the size of
-      our distributable and especially our front-end bundles we have decided to
-      prevent adding any new instances of lodash 3.
+  startCopy(currentPath);
+  
+  function startCopy(source) {
+    started++;
+    if (filter) {
+      if (filter instanceof RegExp) {
+        if (!filter.test(source)) {
+          return cb(true);
+        }
+      }
+      else if (typeof filter === 'function') {
+        if (!filter(source)) {
+          return cb(true);
+        }
+      }
+    }
+    return getStats(source);
+  }
 
-      Please inspect the changes to yarn.lock or package.json files to identify where
-      the lodash 3 version is coming from and remove it.
+  function getStats(source) {
+    var stat = dereference ? fs.stat : fs.lstat;
+    if (running >= limit) {
+      return setImmediate(function () {
+        getStats(source);
+      });
+    }
+    running++;
+    stat(source, function (err, stats) {
+      var item = {};
+      if (err) {
+        return onError(err);
+      }
 
-      If you have questions about this please reack out to the operations team.
+      // We need to get the mode from the stats object and preserve it.
+      item.name = source;
+      item.mode = stats.mode;
+      item.mtime = stats.mtime; //modified time
+      item.atime = stats.atime; //access time
 
-    `);
-    process.exit(1);
-  } // TODO: remove this once we move into a single package.json
-  // look through all the package.json files to find packages which have mismatched version ranges
+      if (stats.isDirectory()) {
+        return onDir(item);
+      }
+      else if (stats.isFile()) {
+        return onFile(item);
+      }
+      else if (stats.isSymbolicLink()) {
+        // Symlinks don't really need to know about the mode.
+        return onLink(source);
+      }
+    });
+  }
 
+  function onFile(file) {
+    var target = file.name.replace(currentPath, targetPath);
+    if(rename) {
+      target =  rename(target);
+    }
+    isWritable(target, function (writable) {
+      if (writable) {
+        return copyFile(file, target);
+      }
+      if(clobber) {
+        rmFile(target, function () {
+          copyFile(file, target);
+        });
+      }
+      if (modified) {
+        var stat = dereference ? fs.stat : fs.lstat;
+        stat(target, function(err, stats) {
+            //if souce modified time greater to target modified time copy file
+            if (file.mtime.getTime()>stats.mtime.getTime())
+                copyFile(file, target);
+            else return cb();
+        });
+      }
+      else {
+        return cb();
+      }
+    });
+  }
 
-  const depRanges = new Map();
+  function copyFile(file, target) {
+    var readStream = fs.createReadStream(file.name),
+        writeStream = fs.createWriteStream(target, { mode: file.mode });
+    
+    readStream.on('error', onError);
+    writeStream.on('error', onError);
+    
+    if(transform) {
+      transform(readStream, writeStream, file);
+    } else {
+      writeStream.on('open', function() {
+        readStream.pipe(writeStream);
+      });
+    }
+    writeStream.once('finish', function() {
+        if (modified) {
+            //target file modified date sync.
+            fs.utimesSync(target, file.atime, file.mtime);
+            cb();
+        }
+        else cb();
+    });
+  }
 
-  for (const project of kbn.getAllProjects().values()) {
-    var _kbn$kibanaProject;
+  function rmFile(file, done) {
+    fs.unlink(file, function (err) {
+      if (err) {
+        return onError(err);
+      }
+      return done();
+    });
+  }
 
-    // Skip if this is an external plugin
-    if (project.path.includes(`${(_kbn$kibanaProject = kbn.kibanaProject) === null || _kbn$kibanaProject === void 0 ? void 0 : _kbn$kibanaProject.path}${path__WEBPACK_IMPORTED_MODULE_3__["sep"]}plugins`)) {
-      continue;
-    }
+  function onDir(dir) {
+    var target = dir.name.replace(currentPath, targetPath);
+    isWritable(target, function (writable) {
+      if (writable) {
+        return mkDir(dir, target);
+      }
+      copyDir(dir.name);
+    });
+  }
 
-    for (const [dep, range] of Object.entries(project.allDependencies)) {
-      const existingDep = depRanges.get(dep);
+  function mkDir(dir, target) {
+    fs.mkdir(target, dir.mode, function (err) {
+      if (err) {
+        return onError(err);
+      }
+      copyDir(dir.name);
+    });
+  }
 
-      if (!existingDep) {
-        depRanges.set(dep, [{
-          range,
-          projects: [project]
-        }]);
-        continue;
+  function copyDir(dir) {
+    fs.readdir(dir, function (err, items) {
+      if (err) {
+        return onError(err);
       }
+      items.forEach(function (item) {
+        startCopy(path.join(dir, item));
+      });
+      return cb();
+    });
+  }
 
-      const existingRange = existingDep.find(existing => existing.range === range);
+  function onLink(link) {
+    var target = link.replace(currentPath, targetPath);
+    fs.readlink(link, function (err, resolvedPath) {
+      if (err) {
+        return onError(err);
+      }
+      checkLink(resolvedPath, target);
+    });
+  }
 
-      if (!existingRange) {
-        existingDep.push({
-          range,
-          projects: [project]
+  function checkLink(resolvedPath, target) {
+    if (dereference) {
+      resolvedPath = path.resolve(basePath, resolvedPath);
+    }
+    isWritable(target, function (writable) {
+      if (writable) {
+        return makeLink(resolvedPath, target);
+      }
+      fs.readlink(target, function (err, targetDest) {
+        if (err) {
+          return onError(err);
+        }
+        if (dereference) {
+          targetDest = path.resolve(basePath, targetDest);
+        }
+        if (targetDest === resolvedPath) {
+          return cb();
+        }
+        return rmFile(target, function () {
+          makeLink(resolvedPath, target);
         });
-        continue;
+      });
+    });
+  }
+
+  function makeLink(linkPath, target) {
+    fs.symlink(linkPath, target, function (err) {
+      if (err) {
+        return onError(err);
       }
+      return cb();
+    });
+  }
 
-      existingRange.projects.push(project);
+  function isWritable(path, done) {
+    fs.lstat(path, function (err) {
+      if (err) {
+        if (err.code === 'ENOENT') return done(true);
+        return done(false);
+      }
+      return done(false);
+    });
+  }
+
+  function onError(err) {
+    if (options.stopOnError) {
+      return cback(err);
+    }
+    else if (!errs && options.errs) {
+      errs = fs.createWriteStream(options.errs);
+    }
+    else if (!errs) {
+      errs = [];
     }
+    if (typeof errs.write === 'undefined') {
+      errs.push(err);
+    }
+    else { 
+      errs.write(err.stack + '\n\n');
+    }
+    return cb();
   }
 
-  const duplicateRanges = Array.from(depRanges.entries()).filter(([, ranges]) => ranges.length > 1 && !ranges.every(rng => Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["isLinkDependency"])(rng.range))).reduce((acc, [dep, ranges]) => [...acc, dep, ...ranges.map(({
-    range,
-    projects
-  }) => `  ${range} => ${projects.map(p => p.name).join(', ')}`)], []).join('\n        ');
+  function cb(skipped) {
+    if (!skipped) running--;
+    finished++;
+    if ((started === finished) && (running === 0)) {
+      if (cback !== undefined ) {
+        return errs ? cback(errs) : cback(null);
+      }
+    }
+  }
+}
 
-  if (duplicateRanges) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-      [single_version_dependencies] Multiple version ranges for the same dependency
-      were found declared across different package.json files. Please consolidate
-      those to match across all package.json files. Different versions for the
-      same dependency is not supported.
 
-      If you have questions about this please reach out to the operations team.
 
-      The conflicting dependencies are:
+/***/ }),
 
-        ${duplicateRanges}
-    `);
-    process.exit(1);
-  } // look for packages that have the the `kibana.devOnly` flag in their package.json
-  // and make sure they aren't included in the production dependencies of Kibana
+/***/ "../../node_modules/nested-error-stacks/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+var inherits = __webpack_require__("util").inherits;
 
-  const devOnlyProjectsInProduction = getDevOnlyProductionDepsTree(kbn, 'kibana');
+var NestedError = function (message, nested) {
+    this.nested = nested;
 
-  if (devOnlyProjectsInProduction) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
-      Some of the packages in the production dependency chain for Kibana and X-Pack are
-      flagged with "kibana.devOnly" in their package.json. Please check changes made to
-      packages and their dependencies to ensure they don't end up in production.
+    if (message instanceof Error) {
+        nested = message;
+    } else if (typeof message !== 'undefined') {
+        Object.defineProperty(this, 'message', {
+            value: message,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+    }
 
-      The devOnly dependencies that are being dependend on in production are:
+    Error.captureStackTrace(this, this.constructor);
+    var oldStackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
+    var stackDescriptor = buildStackDescriptor(oldStackDescriptor, nested);
+    Object.defineProperty(this, 'stack', stackDescriptor);
+};
 
-        ${Object(_projects_tree__WEBPACK_IMPORTED_MODULE_7__["treeToString"])(devOnlyProjectsInProduction).split('\n').join('\n        ')}
-    `);
-    process.exit(1);
-  }
+function buildStackDescriptor(oldStackDescriptor, nested) {
+    if (oldStackDescriptor.get) {
+        return {
+            get: function () {
+                var stack = oldStackDescriptor.get.call(this);
+                return buildCombinedStacks(stack, this.nested);
+            }
+        };
+    } else {
+        var stack = oldStackDescriptor.value;
+        return {
+            value: buildCombinedStacks(stack, nested)
+        };
+    }
+}
 
-  _log__WEBPACK_IMPORTED_MODULE_5__["log"].success('yarn.lock analysis completed without any issues');
+function buildCombinedStacks(stack, nested) {
+    if (nested) {
+        stack += '\nCaused By: ' + nested.stack;
+    }
+    return stack;
 }
 
-function getDevOnlyProductionDepsTree(kbn, projectName) {
-  const project = kbn.getProject(projectName);
-  const childProjectNames = [...Object.keys(project.productionDependencies).filter(name => kbn.hasProject(name)), ...(projectName === 'kibana' ? ['x-pack'] : [])];
-  const children = childProjectNames.map(n => getDevOnlyProductionDepsTree(kbn, n)).filter(t => !!t);
+inherits(NestedError, Error);
+NestedError.prototype.name = 'NestedError';
 
-  if (!children.length && !project.isFlaggedAsDevOnly()) {
-    return;
-  }
 
-  const tree = {
-    name: project.isFlaggedAsDevOnly() ? chalk__WEBPACK_IMPORTED_MODULE_2___default.a.red.bold(projectName) : projectName,
-    children
-  };
-  return tree;
-}
+module.exports = NestedError;
+
 
 /***/ }),
-/* 422 */
-/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "treeToString", function() { return treeToString; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(114);
-/* 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__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/***/ "../../node_modules/normalize-package-data/lib/extract_description.js":
+/***/ (function(module, exports) {
 
+module.exports = extractDescription
 
-const projectKey = Symbol('__project');
-function renderProjectsTree(rootPath, projects) {
-  const projectsTree = buildProjectsTree(rootPath, projects);
-  return treeToString(createTreeStructure(projectsTree));
-}
-function treeToString(tree) {
-  return [tree.name].concat(childrenToStrings(tree.children, '')).join('\n');
+// Extracts description from contents of a readme file in markdown format
+function extractDescription (d) {
+  if (!d) return;
+  if (d === "ERROR: No README data found!") return;
+  // the first block of text before the first heading
+  // that isn't the first line heading
+  d = d.trim().split('\n')
+  for (var s = 0; d[s] && d[s].trim().match(/^(#|$)/); s ++);
+  var l = d.length
+  for (var e = s + 1; e < l && d[e].trim(); e ++);
+  return d.slice(s, e).join(' ').trim()
 }
 
-function childrenToStrings(tree, treePrefix) {
-  if (tree === undefined) {
-    return [];
-  }
 
-  let strings = [];
-  tree.forEach((node, index) => {
-    const isLastNode = tree.length - 1 === index;
-    const nodePrefix = isLastNode ? '└── ' : '├── ';
-    const childPrefix = isLastNode ? '    ' : '│   ';
-    const childrenPrefix = treePrefix + childPrefix;
-    strings.push(`${treePrefix}${nodePrefix}${node.name}`);
-    strings = strings.concat(childrenToStrings(node.children, childrenPrefix));
-  });
-  return strings;
-}
+/***/ }),
 
-function createTreeStructure(tree) {
-  let name;
-  const children = [];
+/***/ "../../node_modules/normalize-package-data/lib/fixer.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  for (const [dir, project] of tree.entries()) {
-    // This is a leaf node (aka a project)
-    if (typeof project === 'string') {
-      name = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(project);
-      continue;
-    } // If there's only one project and the key indicates it's a leaf node, we
-    // know that we're at a package folder that contains a package.json, so we
-    // "inline it" so we don't get unnecessary levels, i.e. we'll just see
-    // `foo` instead of `foo -> foo`.
+var semver = __webpack_require__("../../node_modules/normalize-package-data/node_modules/semver/semver.js")
+var validateLicense = __webpack_require__("../../node_modules/validate-npm-package-license/index.js");
+var hostedGitInfo = __webpack_require__("../../node_modules/hosted-git-info/index.js")
+var isBuiltinModule = __webpack_require__("../../node_modules/resolve/index.js").isCore
+var depTypes = ["dependencies","devDependencies","optionalDependencies"]
+var extractDescription = __webpack_require__("../../node_modules/normalize-package-data/lib/extract_description.js")
+var url = __webpack_require__("url")
+var typos = __webpack_require__("../../node_modules/normalize-package-data/lib/typos.json")
 
+var fixer = module.exports = {
+  // default warning function
+  warn: function() {},
 
-    if (project.size === 1 && project.has(projectKey)) {
-      const projectName = project.get(projectKey);
-      children.push({
-        children: [],
-        name: dirOrProjectName(dir, projectName)
-      });
-      continue;
+  fixRepositoryField: function(data) {
+    if (data.repositories) {
+      this.warn("repositories");
+      data.repository = data.repositories[0]
+    }
+    if (!data.repository) return this.warn("missingRepository")
+    if (typeof data.repository === "string") {
+      data.repository = {
+        type: "git",
+        url: data.repository
+      }
+    }
+    var r = data.repository.url || ""
+    if (r) {
+      var hosted = hostedGitInfo.fromUrl(r)
+      if (hosted) {
+        r = data.repository.url
+          = hosted.getDefaultRepresentation() == "shortcut" ? hosted.https() : hosted.toString()
+      }
     }
 
-    const subtree = createTreeStructure(project); // If the name is specified, we know there's a package at the "root" of the
-    // subtree itself.
-
-    if (subtree.name !== undefined) {
-      const projectName = subtree.name;
-      children.push({
-        children: subtree.children,
-        name: dirOrProjectName(dir, projectName)
-      });
-      continue;
-    } // Special-case whenever we have one child, so we don't get unnecessary
-    // folders in the output. E.g. instead of `foo -> bar -> baz` we get
-    // `foo/bar/baz` instead.
-
-
-    if (subtree.children && subtree.children.length === 1) {
-      const child = subtree.children[0];
-      const newName = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(dir.toString(), child.name));
-      children.push({
-        children: child.children,
-        name: newName
-      });
-      continue;
+    if (r.match(/github.com\/[^\/]+\/[^\/]+\.git\.git$/)) {
+      this.warn("brokenGitUrl", r)
     }
+  }
 
-    children.push({
-      children: subtree.children,
-      name: chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(dir.toString())
-    });
+, fixTypos: function(data) {
+    Object.keys(typos.topLevel).forEach(function (d) {
+      if (data.hasOwnProperty(d)) {
+        this.warn("typo", d, typos.topLevel[d])
+      }
+    }, this)
   }
 
-  return {
-    name,
-    children
-  };
-}
+, fixScriptsField: function(data) {
+    if (!data.scripts) return
+    if (typeof data.scripts !== "object") {
+      this.warn("nonObjectScripts")
+      delete data.scripts
+      return
+    }
+    Object.keys(data.scripts).forEach(function (k) {
+      if (typeof data.scripts[k] !== "string") {
+        this.warn("nonStringScript")
+        delete data.scripts[k]
+      } else if (typos.script[k] && !data.scripts[typos.script[k]]) {
+        this.warn("typo", k, typos.script[k], "scripts")
+      }
+    }, this)
+  }
 
-function dirOrProjectName(dir, projectName) {
-  return dir === projectName ? chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(dir) : chalk__WEBPACK_IMPORTED_MODULE_0___default.a`{dim ${dir.toString()} ({reset.green ${projectName}})}`;
-}
+, fixFilesField: function(data) {
+    var files = data.files
+    if (files && !Array.isArray(files)) {
+      this.warn("nonArrayFiles")
+      delete data.files
+    } else if (data.files) {
+      data.files = data.files.filter(function(file) {
+        if (!file || typeof file !== "string") {
+          this.warn("invalidFilename", file)
+          return false
+        } else {
+          return true
+        }
+      }, this)
+    }
+  }
 
-function buildProjectsTree(rootPath, projects) {
-  const tree = new Map();
+, fixBinField: function(data) {
+    if (!data.bin) return;
+    if (typeof data.bin === "string") {
+      var b = {}
+      var match
+      if (match = data.name.match(/^@[^/]+[/](.*)$/)) {
+        b[match[1]] = data.bin
+      } else {
+        b[data.name] = data.bin
+      }
+      data.bin = b
+    }
+  }
 
-  for (const project of projects.values()) {
-    if (rootPath === project.path) {
-      tree.set(projectKey, project.name);
-    } else {
-      const relativeProjectPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(rootPath, project.path);
-      addProjectToTree(tree, relativeProjectPath.split(path__WEBPACK_IMPORTED_MODULE_1___default.a.sep), project);
+, fixManField: function(data) {
+    if (!data.man) return;
+    if (typeof data.man === "string") {
+      data.man = [ data.man ]
+    }
+  }
+, fixBundleDependenciesField: function(data) {
+    var bdd = "bundledDependencies"
+    var bd = "bundleDependencies"
+    if (data[bdd] && !data[bd]) {
+      data[bd] = data[bdd]
+      delete data[bdd]
+    }
+    if (data[bd] && !Array.isArray(data[bd])) {
+      this.warn("nonArrayBundleDependencies")
+      delete data[bd]
+    } else if (data[bd]) {
+      data[bd] = data[bd].filter(function(bd) {
+        if (!bd || typeof bd !== 'string') {
+          this.warn("nonStringBundleDependency", bd)
+          return false
+        } else {
+          if (!data.dependencies) {
+            data.dependencies = {}
+          }
+          if (!data.dependencies.hasOwnProperty(bd)) {
+            this.warn("nonDependencyBundleDependency", bd)
+            data.dependencies[bd] = "*"
+          }
+          return true
+        }
+      }, this)
     }
   }
 
-  return tree;
-}
+, fixDependencies: function(data, strict) {
+    var loose = !strict
+    objectifyDeps(data, this.warn)
+    addOptionalDepsToDeps(data, this.warn)
+    this.fixBundleDependenciesField(data)
 
-function addProjectToTree(tree, pathParts, project) {
-  if (pathParts.length === 0) {
-    tree.set(projectKey, project.name);
-  } else {
-    const [currentDir, ...rest] = pathParts;
+    ;['dependencies','devDependencies'].forEach(function(deps) {
+      if (!(deps in data)) return
+      if (!data[deps] || typeof data[deps] !== "object") {
+        this.warn("nonObjectDependencies", deps)
+        delete data[deps]
+        return
+      }
+      Object.keys(data[deps]).forEach(function (d) {
+        var r = data[deps][d]
+        if (typeof r !== 'string') {
+          this.warn("nonStringDependency", d, JSON.stringify(r))
+          delete data[deps][d]
+        }
+        var hosted = hostedGitInfo.fromUrl(data[deps][d])
+        if (hosted) data[deps][d] = hosted.toString()
+      }, this)
+    }, this)
+  }
 
-    if (!tree.has(currentDir)) {
-      tree.set(currentDir, new Map());
+, fixModulesField: function (data) {
+    if (data.modules) {
+      this.warn("deprecatedModules")
+      delete data.modules
     }
-
-    const subtree = tree.get(currentDir);
-    addProjectToTree(subtree, rest, project);
   }
-}
 
-/***/ }),
-/* 423 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+, fixKeywordsField: function (data) {
+    if (typeof data.keywords === "string") {
+      data.keywords = data.keywords.split(/,\s+/)
+    }
+    if (data.keywords && !Array.isArray(data.keywords)) {
+      delete data.keywords
+      this.warn("nonArrayKeywords")
+    } else if (data.keywords) {
+      data.keywords = data.keywords.filter(function(kw) {
+        if (typeof kw !== "string" || !kw) {
+          this.warn("nonStringKeyword");
+          return false
+        } else {
+          return true
+        }
+      }, this)
+    }
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(424);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelDiskCacheFolder"]; });
+, fixVersionField: function(data, strict) {
+    // allow "loose" semver 1.0 versions in non-strict mode
+    // enforce strict semver 2.0 compliance in strict mode
+    var loose = !strict
+    if (!data.version) {
+      data.version = ""
+      return true
+    }
+    if (!semver.valid(data.version, loose)) {
+      throw new Error('Invalid version: "'+ data.version + '"')
+    }
+    data.version = semver.clean(data.version, loose)
+    return true
+  }
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelRepositoryCacheFolder"]; });
+, fixPeople: function(data) {
+    modifyPeople(data, unParsePerson)
+    modifyPeople(data, parsePerson)
+  }
 
-/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(425);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["isBazelBinAvailable"]; });
+, fixNameField: function(data, options) {
+    if (typeof options === "boolean") options = {strict: options}
+    else if (typeof options === "undefined") options = {}
+    var strict = options.strict
+    if (!data.name && !strict) {
+      data.name = ""
+      return
+    }
+    if (typeof data.name !== "string") {
+      throw new Error("name field must be a string.")
+    }
+    if (!strict)
+      data.name = data.name.trim()
+    ensureValidName(data.name, strict, options.allowLegacyCase)
+    if (isBuiltinModule(data.name))
+      this.warn("conflictingName", data.name)
+  }
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["installBazelTools"]; });
 
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(426);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["runBazel"]; });
+, fixDescriptionField: function (data) {
+    if (data.description && typeof data.description !== 'string') {
+      this.warn("nonStringDescription")
+      delete data.description
+    }
+    if (data.readme && !data.description)
+      data.description = extractDescription(data.readme)
+      if(data.description === undefined) delete data.description;
+    if (!data.description) this.warn("missingDescription")
+  }
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runIBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["runIBazel"]; });
+, fixReadmeField: function (data) {
+    if (!data.readme) {
+      this.warn("missingReadme")
+      data.readme = "ERROR: No README data found!"
+    }
+  }
 
-/* harmony import */ var _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(528);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "removeYarnIntegrityFileIfExists", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__["removeYarnIntegrityFileIfExists"]; });
+, fixBugsField: function(data) {
+    if (!data.bugs && data.repository && data.repository.url) {
+      var hosted = hostedGitInfo.fromUrl(data.repository.url)
+      if(hosted && hosted.bugs()) {
+        data.bugs = {url: hosted.bugs()}
+      }
+    }
+    else if(data.bugs) {
+      var emailRe = /^.+@.*\..+$/
+      if(typeof data.bugs == "string") {
+        if(emailRe.test(data.bugs))
+          data.bugs = {email:data.bugs}
+        else if(url.parse(data.bugs).protocol)
+          data.bugs = {url: data.bugs}
+        else
+          this.warn("nonEmailUrlBugsString")
+      }
+      else {
+        bugsTypos(data.bugs, this.warn)
+        var oldBugs = data.bugs
+        data.bugs = {}
+        if(oldBugs.url) {
+          if(typeof(oldBugs.url) == "string" && url.parse(oldBugs.url).protocol)
+            data.bugs.url = oldBugs.url
+          else
+            this.warn("nonUrlBugsUrlField")
+        }
+        if(oldBugs.email) {
+          if(typeof(oldBugs.email) == "string" && emailRe.test(oldBugs.email))
+            data.bugs.email = oldBugs.email
+          else
+            this.warn("nonEmailBugsEmailField")
+        }
+      }
+      if(!data.bugs.email && !data.bugs.url) {
+        delete data.bugs
+        this.warn("emptyNormalizedBugs")
+      }
+    }
+  }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+, fixHomepageField: function(data) {
+    if (!data.homepage && data.repository && data.repository.url) {
+      var hosted = hostedGitInfo.fromUrl(data.repository.url)
+      if (hosted && hosted.docs()) data.homepage = hosted.docs()
+    }
+    if (!data.homepage) return
 
+    if(typeof data.homepage !== "string") {
+      this.warn("nonUrlHomepage")
+      return delete data.homepage
+    }
+    if(!url.parse(data.homepage).protocol) {
+      data.homepage = "http://" + data.homepage
+    }
+  }
 
+, fixLicenseField: function(data) {
+    if (!data.license) {
+      return this.warn("missingLicense")
+    } else{
+      if (
+        typeof(data.license) !== 'string' ||
+        data.license.length < 1 ||
+        data.license.trim() === ''
+      ) {
+        this.warn("invalidLicense")
+      } else {
+        if (!validateLicense(data.license).validForNewPackages)
+          this.warn("invalidLicense")
+      }
+    }
+  }
+}
 
+function isValidScopedPackageName(spec) {
+  if (spec.charAt(0) !== '@') return false
 
+  var rest = spec.slice(1).split('/')
+  if (rest.length !== 2) return false
 
-/***/ }),
-/* 424 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return rest[0] && rest[1] &&
+    rest[0] === encodeURIComponent(rest[0]) &&
+    rest[1] === encodeURIComponent(rest[1])
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return getBazelDiskCacheFolder; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return getBazelRepositoryCacheFolder; });
-/* 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 _child_process__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(221);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+function isCorrectlyEncodedName(spec) {
+  return !spec.match(/[\/@\s\+%:]/) &&
+    spec === encodeURIComponent(spec)
+}
 
+function ensureValidName (name, strict, allowLegacyCase) {
+  if (name.charAt(0) === "." ||
+      !(isValidScopedPackageName(name) || isCorrectlyEncodedName(name)) ||
+      (strict && (!allowLegacyCase) && name !== name.toLowerCase()) ||
+      name.toLowerCase() === "node_modules" ||
+      name.toLowerCase() === "favicon.ico") {
+        throw new Error("Invalid name: " + JSON.stringify(name))
+  }
+}
 
+function modifyPeople (data, fn) {
+  if (data.author) data.author = fn(data.author)
+  ;["maintainers", "contributors"].forEach(function (set) {
+    if (!Array.isArray(data[set])) return;
+    data[set] = data[set].map(fn)
+  })
+  return data
+}
 
-async function rawRunBazelInfoRepoCache() {
-  const {
-    stdout: bazelRepositoryCachePath
-  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_1__["spawn"])('bazel', ['info', 'repository_cache'], {
-    stdio: 'pipe'
-  });
-  return bazelRepositoryCachePath;
+function unParsePerson (person) {
+  if (typeof person === "string") return person
+  var name = person.name || ""
+  var u = person.url || person.web
+  var url = u ? (" ("+u+")") : ""
+  var e = person.email || person.mail
+  var email = e ? (" <"+e+">") : ""
+  return name+email+url
 }
 
-async function getBazelDiskCacheFolder() {
-  return Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(await rawRunBazelInfoRepoCache()), 'disk-cache');
-}
-async function getBazelRepositoryCacheFolder() {
-  return await rawRunBazelInfoRepoCache();
+function parsePerson (person) {
+  if (typeof person !== "string") return person
+  var name = person.match(/^([^\(<]+)/)
+  var url = person.match(/\(([^\)]+)\)/)
+  var email = person.match(/<([^>]+)>/)
+  var obj = {}
+  if (name && name[0].trim()) obj.name = name[0].trim()
+  if (email) obj.email = email[1];
+  if (url) obj.url = url[1];
+  return obj
 }
 
-/***/ }),
-/* 425 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function addOptionalDepsToDeps (data, warn) {
+  var o = data.optionalDependencies
+  if (!o) return;
+  var d = data.dependencies || {}
+  Object.keys(o).forEach(function (k) {
+    d[k] = o[k]
+  })
+  data.dependencies = d
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return isBazelBinAvailable; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return installBazelTools; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__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 _child_process__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(221);
-/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(220);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+function depObjectify (deps, type, warn) {
+  if (!deps) return {}
+  if (typeof deps === "string") {
+    deps = deps.trim().split(/[\n\r\s\t ,]+/)
+  }
+  if (!Array.isArray(deps)) return deps
+  warn("deprecatedArrayDependencies", type)
+  var o = {}
+  deps.filter(function (d) {
+    return typeof d === "string"
+  }).forEach(function(d) {
+    d = d.trim().split(/(:?[@\s><=])/)
+    var dn = d.shift()
+    var dv = d.join("")
+    dv = dv.trim()
+    dv = dv.replace(/^@/, "")
+    o[dn] = dv
+  })
+  return o
+}
 
+function objectifyDeps (data, warn) {
+  depTypes.forEach(function (type) {
+    if (!data[type]) return;
+    data[type] = depObjectify(data[type], type, warn)
+  })
+}
 
+function bugsTypos(bugs, warn) {
+  if (!bugs) return
+  Object.keys(bugs).forEach(function (k) {
+    if (typos.bugs[k]) {
+      warn("typo", k, typos.bugs[k], "bugs")
+      bugs[typos.bugs[k]] = bugs[k]
+      delete bugs[k]
+    }
+  })
+}
 
 
+/***/ }),
 
+/***/ "../../node_modules/normalize-package-data/lib/make_warning.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-async function readBazelToolsVersionFile(repoRootPath, versionFilename) {
-  const version = (await Object(_fs__WEBPACK_IMPORTED_MODULE_3__["readFile"])(Object(path__WEBPACK_IMPORTED_MODULE_1__["resolve"])(repoRootPath, versionFilename))).toString().split('\n')[0];
+var util = __webpack_require__("util")
+var messages = __webpack_require__("../../node_modules/normalize-package-data/lib/warning_messages.json")
 
-  if (!version) {
-    throw new Error(`[bazel_tools] Failed on reading bazel tools versions\n ${versionFilename} file do not contain any version set`);
+module.exports = function() {
+  var args = Array.prototype.slice.call(arguments, 0)
+  var warningName = args.shift()
+  if (warningName == "typo") {
+    return makeTypoWarning.apply(null,args)
   }
-
-  return version;
-}
-
-async function isBazelBinAvailable() {
-  try {
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('bazel', ['--version'], {
-      stdio: 'pipe'
-    });
-    return true;
-  } catch {
-    return false;
+  else {
+    var msgTemplate = messages[warningName] ? messages[warningName] : warningName + ": '%s'"
+    args.unshift(msgTemplate)
+    return util.format.apply(null, args)
   }
 }
 
-async function isBazeliskInstalled(bazeliskVersion) {
-  try {
-    const {
-      stdout: bazeliskPkgInstallStdout
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`], {
-      stdio: 'pipe'
-    });
-    return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`);
-  } catch {
-    return false;
+function makeTypoWarning (providedName, probableName, field) {
+  if (field) {
+    providedName = field + "['" + providedName + "']"
+    probableName = field + "['" + probableName + "']"
   }
+  return util.format(messages.typo, providedName, probableName)
 }
 
-async function tryRemoveBazeliskFromYarnGlobal() {
-  try {
-    // Check if Bazelisk is installed on the yarn global scope
-    const {
-      stdout: bazeliskPkgInstallStdout
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'list'], {
-      stdio: 'pipe'
-    }); // Bazelisk was found on yarn global scope so lets remove it
 
-    if (bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@`)) {
-      await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'remove', `@bazel/bazelisk`], {
-        stdio: 'pipe'
-      });
-      _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] bazelisk was installed on Yarn global packages and is now removed`);
-      return true;
-    }
+/***/ }),
 
-    return false;
-  } catch {
-    return false;
-  }
-}
+/***/ "../../node_modules/normalize-package-data/lib/normalize.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-async function installBazelTools(repoRootPath) {
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] reading bazel tools versions from version files`);
-  const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
-  const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed
+module.exports = normalize
 
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); // Check if we need to remove bazelisk from yarn
+var fixer = __webpack_require__("../../node_modules/normalize-package-data/lib/fixer.js")
+normalize.fixer = fixer
 
-  await tryRemoveBazeliskFromYarnGlobal(); // Test if bazelisk is already installed in the correct version
+var makeWarning = __webpack_require__("../../node_modules/normalize-package-data/lib/make_warning.js")
 
-  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available
+var fieldsToFix = ['name','version','description','repository','modules','scripts'
+                  ,'files','bin','man','bugs','keywords','readme','homepage','license']
+var otherThingsToFix = ['dependencies','people', 'typos']
 
-  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed
+var thingsToFix = fieldsToFix.map(function(fieldName) {
+  return ucFirst(fieldName) + "Field"
+})
+// two ways to do this in CoffeeScript on only one line, sub-70 chars:
+// thingsToFix = fieldsToFix.map (name) -> ucFirst(name) + "Field"
+// thingsToFix = (ucFirst(name) + "Field" for name in fieldsToFix)
+thingsToFix = thingsToFix.concat(otherThingsToFix)
 
-  if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] installing Bazel tools`);
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`);
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], {
-      env: {
-        USE_BAZEL_VERSION: bazelVersion
-      },
-      stdio: 'pipe'
-    });
-    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable();
+function normalize (data, warn, strict) {
+  if(warn === true) warn = null, strict = true
+  if(!strict) strict = false
+  if(!warn || data.private) warn = function(msg) { /* noop */ }
 
-    if (!isBazelBinAvailableAfterInstall) {
-      throw new Error(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
-      `);
-    }
+  if (data.scripts &&
+      data.scripts.install === "node-gyp rebuild" &&
+      !data.scripts.preinstall) {
+    data.gypfile = true
   }
-
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].success(`[bazel_tools] all bazel tools are correctly installed`);
+  fixer.warn = function() { warn(makeWarning.apply(null, arguments)) }
+  thingsToFix.forEach(function(thingName) {
+    fixer["fix" + ucFirst(thingName)](data, strict)
+  })
+  data._id = data.name + "@" + data.version
 }
 
-/***/ }),
-/* 426 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runBazel", function() { return runBazel; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runIBazel", function() { return runIBazel; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(114);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(427);
-/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(525);
-/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(221);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220);
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(341);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ucFirst (string) {
+  return string.charAt(0).toUpperCase() + string.slice(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; }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/***/ }),
 
+/***/ "../../node_modules/normalize-package-data/lib/typos.json":
+/***/ (function(module) {
 
+module.exports = JSON.parse("{\"topLevel\":{\"dependancies\":\"dependencies\",\"dependecies\":\"dependencies\",\"depdenencies\":\"dependencies\",\"devEependencies\":\"devDependencies\",\"depends\":\"dependencies\",\"dev-dependencies\":\"devDependencies\",\"devDependences\":\"devDependencies\",\"devDepenencies\":\"devDependencies\",\"devdependencies\":\"devDependencies\",\"repostitory\":\"repository\",\"repo\":\"repository\",\"prefereGlobal\":\"preferGlobal\",\"hompage\":\"homepage\",\"hampage\":\"homepage\",\"autohr\":\"author\",\"autor\":\"author\",\"contributers\":\"contributors\",\"publicationConfig\":\"publishConfig\",\"script\":\"scripts\"},\"bugs\":{\"web\":\"url\",\"name\":\"url\"},\"script\":{\"server\":\"start\",\"tests\":\"test\"}}");
 
+/***/ }),
 
+/***/ "../../node_modules/normalize-package-data/lib/warning_messages.json":
+/***/ (function(module) {
 
+module.exports = JSON.parse("{\"repositories\":\"'repositories' (plural) Not supported. Please pick one as the 'repository' field\",\"missingRepository\":\"No repository field.\",\"brokenGitUrl\":\"Probably broken git url: %s\",\"nonObjectScripts\":\"scripts must be an object\",\"nonStringScript\":\"script values must be string commands\",\"nonArrayFiles\":\"Invalid 'files' member\",\"invalidFilename\":\"Invalid filename in 'files' list: %s\",\"nonArrayBundleDependencies\":\"Invalid 'bundleDependencies' list. Must be array of package names\",\"nonStringBundleDependency\":\"Invalid bundleDependencies member: %s\",\"nonDependencyBundleDependency\":\"Non-dependency in bundleDependencies: %s\",\"nonObjectDependencies\":\"%s field must be an object\",\"nonStringDependency\":\"Invalid dependency: %s %s\",\"deprecatedArrayDependencies\":\"specifying %s as array is deprecated\",\"deprecatedModules\":\"modules field is deprecated\",\"nonArrayKeywords\":\"keywords should be an array of strings\",\"nonStringKeyword\":\"keywords should be an array of strings\",\"conflictingName\":\"%s is also the name of a node core module.\",\"nonStringDescription\":\"'description' field should be a string\",\"missingDescription\":\"No description\",\"missingReadme\":\"No README data\",\"missingLicense\":\"No license field.\",\"nonEmailUrlBugsString\":\"Bug string field must be url, email, or {email,url}\",\"nonUrlBugsUrlField\":\"bugs.url field must be a string url. Deleted.\",\"nonEmailBugsEmailField\":\"bugs.email field must be a string email. Deleted.\",\"emptyNormalizedBugs\":\"Normalized value of bugs field is an empty object. Deleted.\",\"nonUrlHomepage\":\"homepage field must be a string url. Deleted.\",\"invalidLicense\":\"license should be a valid SPDX license expression\",\"typo\":\"%s should probably be %s.\"}");
 
+/***/ }),
 
+/***/ "../../node_modules/normalize-package-data/node_modules/semver/semver.js":
+/***/ (function(module, exports) {
 
-async function runBazelCommandWithRunner(bazelCommandRunner, bazelArgs, offline = false, runOpts = {}) {
-  // Force logs to pipe in order to control the output of them
-  const bazelOpts = _objectSpread(_objectSpread({}, runOpts), {}, {
-    stdio: 'pipe'
-  });
+exports = module.exports = SemVer
 
-  if (offline) {
-    bazelArgs = [...bazelArgs, '--config=offline'];
+var debug
+/* istanbul ignore next */
+if (typeof process === 'object' &&
+    process.env &&
+    process.env.NODE_DEBUG &&
+    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
+  debug = function () {
+    var args = Array.prototype.slice.call(arguments, 0)
+    args.unshift('SEMVER')
+    console.log.apply(console, args)
   }
+} else {
+  debug = function () {}
+}
 
-  const bazelProc = Object(_child_process__WEBPACK_IMPORTED_MODULE_4__["spawn"])(bazelCommandRunner, bazelArgs, bazelOpts);
-  const bazelLogs$ = new rxjs__WEBPACK_IMPORTED_MODULE_1__["Subject"](); // Bazel outputs machine readable output into stdout and human readable output goes to stderr.
-  // Therefore we need to get both. In order to get errors we need to parse the actual text line
-
-  const bazelLogSubscription = rxjs__WEBPACK_IMPORTED_MODULE_1__["merge"](Object(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__["observeLines"])(bazelProc.stdout).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_2__["tap"])(line => _log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan(`[${bazelCommandRunner}]`)} ${line}`))), Object(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__["observeLines"])(bazelProc.stderr).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_2__["tap"])(line => _log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan(`[${bazelCommandRunner}]`)} ${line}`)))).subscribe(bazelLogs$); // Wait for process and logs to finish, unsubscribing in the end
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+exports.SEMVER_SPEC_VERSION = '2.0.0'
 
-  try {
-    await bazelProc;
-  } catch {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].error('HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`');
-    throw new _errors__WEBPACK_IMPORTED_MODULE_6__["CliError"](`The bazel command that was running failed to complete.`);
-  }
+var MAX_LENGTH = 256
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+  /* istanbul ignore next */ 9007199254740991
 
-  await bazelLogs$.toPromise();
-  await bazelLogSubscription.unsubscribe();
-}
+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16
 
-async function runBazel(bazelArgs, offline = false, runOpts = {}) {
-  await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
-}
-async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
-  const extendedEnv = _objectSpread({
-    IBAZEL_USE_LEGACY_WATCHER: '0'
-  }, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);
+// The actual regexps go on exports.re
+var re = exports.re = []
+var src = exports.src = []
+var R = 0
 
-  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
-    env: extendedEnv
-  }));
-}
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
-/***/ }),
-/* 427 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(428);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; });
+var NUMERICIDENTIFIER = R++
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
+var NUMERICIDENTIFIERLOOSE = R++
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
-/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(429);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; });
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
-/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(430);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; });
+var NONNUMERICIDENTIFIER = R++
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(431);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; });
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
-/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(432);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; });
+var MAINVERSION = R++
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')'
 
-/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(433);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; });
+var MAINVERSIONLOOSE = R++
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
 
-/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(434);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; });
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
-/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(435);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; });
+var PRERELEASEIDENTIFIER = R++
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(436);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; });
+var PRERELEASEIDENTIFIERLOOSE = R++
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(437);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; });
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
-/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(438);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; });
+var PRERELEASE = R++
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
 
-/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(81);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; });
+var PRERELEASELOOSE = R++
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(439);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; });
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(440);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; });
+var BUILDIDENTIFIER = R++
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(441);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; });
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(442);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; });
+var BUILD = R++
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
 
-/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(443);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; });
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
 
-/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(444);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; });
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups.  The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
 
-/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(445);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; });
+var FULL = R++
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?'
 
-/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(447);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; });
+src[FULL] = '^' + FULLPLAIN + '$'
 
-/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(448);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; });
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
+                 src[PRERELEASELOOSE] + '?' +
+                 src[BUILD] + '?'
 
-/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(449);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; });
+var LOOSE = R++
+src[LOOSE] = '^' + LOOSEPLAIN + '$'
 
-/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(450);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; });
+var GTLT = R++
+src[GTLT] = '((?:<|>)?=?)'
 
-/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(451);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; });
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+var XRANGEIDENTIFIERLOOSE = R++
+src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
+var XRANGEIDENTIFIER = R++
+src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*'
 
-/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(452);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; });
+var XRANGEPLAIN = R++
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?'
 
-/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(455);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; });
+var XRANGEPLAINLOOSE = R++
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?'
 
-/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(456);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; });
+var XRANGE = R++
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
+var XRANGELOOSE = R++
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
 
-/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(457);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; });
+// Coercion.
+// Extract anything that could conceivably be a part of a valid semver
+var COERCE = R++
+src[COERCE] = '(?:^|[^\\d])' +
+              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:$|[^\\d])'
 
-/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(458);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; });
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++
+src[LONETILDE] = '(?:~>?)'
 
-/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(459);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; });
+var TILDETRIM = R++
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
+var tildeTrimReplace = '$1~'
 
-/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(106);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; });
+var TILDE = R++
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
+var TILDELOOSE = R++
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
 
-/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(460);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; });
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++
+src[LONECARET] = '(?:\\^)'
 
-/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(461);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; });
+var CARETTRIM = R++
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
+var caretTrimReplace = '$1^'
 
-/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(462);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; });
+var CARET = R++
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
+var CARETLOOSE = R++
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
 
-/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(463);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; });
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+var COMPARATORLOOSE = R++
+src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$'
+var COMPARATOR = R++
+src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$'
 
-/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(32);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; });
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+var COMPARATORTRIM = R++
+src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
+                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')'
 
-/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(464);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; });
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
+var comparatorTrimReplace = '$1$2$3'
 
-/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(465);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; });
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+var HYPHENRANGE = R++
+src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
+                   '\\s+-\\s+' +
+                   '(' + src[XRANGEPLAIN] + ')' +
+                   '\\s*$'
 
-/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(466);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; });
+var HYPHENRANGELOOSE = R++
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$'
 
-/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(67);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; });
+// Star ranges basically just allow anything at all.
+var STAR = R++
+src[STAR] = '(<|>)?=?\\s*\\*'
 
-/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(468);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; });
+// Compile to actual regexp objects.
+// All are flag-free, unless they were created above with a flag.
+for (var i = 0; i < R; i++) {
+  debug(i, src[i])
+  if (!re[i]) {
+    re[i] = new RegExp(src[i])
+  }
+}
 
-/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(469);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; });
+exports.parse = parse
+function parse (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(470);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; });
+  if (version instanceof SemVer) {
+    return version
+  }
 
-/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(473);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; });
+  if (typeof version !== 'string') {
+    return null
+  }
 
-/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(82);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__["mergeAll"]; });
+  if (version.length > MAX_LENGTH) {
+    return null
+  }
 
-/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(83);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; });
+  var r = options.loose ? re[LOOSE] : re[FULL]
+  if (!r.test(version)) {
+    return null
+  }
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["flatMap"]; });
+  try {
+    return new SemVer(version, options)
+  } catch (er) {
+    return null
+  }
+}
 
-/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(474);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; });
+exports.valid = valid
+function valid (version, options) {
+  var v = parse(version, options)
+  return v ? v.version : null
+}
 
-/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(475);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; });
+exports.clean = clean
+function clean (version, options) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
+  return s ? s.version : null
+}
 
-/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(476);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; });
+exports.SemVer = SemVer
 
-/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(477);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; });
+function SemVer (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
+  if (version instanceof SemVer) {
+    if (version.loose === options.loose) {
+      return version
+    } else {
+      version = version.version
+    }
+  } else if (typeof version !== 'string') {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(42);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; });
+  if (version.length > MAX_LENGTH) {
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  }
 
-/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(478);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; });
+  if (!(this instanceof SemVer)) {
+    return new SemVer(version, options)
+  }
 
-/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(479);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; });
+  debug('SemVer', version, options)
+  this.options = options
+  this.loose = !!options.loose
 
-/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(480);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; });
+  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
 
-/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(481);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__["pluck"]; });
+  if (!m) {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(482);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; });
+  this.raw = version
 
-/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(483);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__["publishBehavior"]; });
+  // these are actually numbers
+  this.major = +m[1]
+  this.minor = +m[2]
+  this.patch = +m[3]
 
-/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(484);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__["publishLast"]; });
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
+    throw new TypeError('Invalid major version')
+  }
 
-/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(485);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; });
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+    throw new TypeError('Invalid minor version')
+  }
 
-/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(486);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; });
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+    throw new TypeError('Invalid patch version')
+  }
 
-/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(471);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; });
+  // numberify any prerelease numeric ids
+  if (!m[4]) {
+    this.prerelease = []
+  } else {
+    this.prerelease = m[4].split('.').map(function (id) {
+      if (/^[0-9]+$/.test(id)) {
+        var num = +id
+        if (num >= 0 && num < MAX_SAFE_INTEGER) {
+          return num
+        }
+      }
+      return id
+    })
+  }
 
-/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(487);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; });
+  this.build = m[5] ? m[5].split('.') : []
+  this.format()
+}
 
-/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(488);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__["repeatWhen"]; });
+SemVer.prototype.format = function () {
+  this.version = this.major + '.' + this.minor + '.' + this.patch
+  if (this.prerelease.length) {
+    this.version += '-' + this.prerelease.join('.')
+  }
+  return this.version
+}
 
-/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(489);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__["retry"]; });
+SemVer.prototype.toString = function () {
+  return this.version
+}
 
-/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(490);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; });
+SemVer.prototype.compare = function (other) {
+  debug('SemVer.compare', this.version, this.options, other)
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(31);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; });
+  return this.compareMain(other) || this.comparePre(other)
+}
 
-/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(491);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__["sample"]; });
+SemVer.prototype.compareMain = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(492);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; });
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch)
+}
 
-/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(472);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; });
+SemVer.prototype.comparePre = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(493);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__["sequenceEqual"]; });
+  // NOT having a prerelease is > having one
+  if (this.prerelease.length && !other.prerelease.length) {
+    return -1
+  } else if (!this.prerelease.length && other.prerelease.length) {
+    return 1
+  } else if (!this.prerelease.length && !other.prerelease.length) {
+    return 0
+  }
 
-/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(494);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; });
+  var i = 0
+  do {
+    var a = this.prerelease[i]
+    var b = other.prerelease[i]
+    debug('prerelease compare', i, a, b)
+    if (a === undefined && b === undefined) {
+      return 0
+    } else if (b === undefined) {
+      return 1
+    } else if (a === undefined) {
+      return -1
+    } else if (a === b) {
+      continue
+    } else {
+      return compareIdentifiers(a, b)
+    }
+  } while (++i)
+}
 
-/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(495);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__["shareReplay"]; });
+// preminor will bump the version up to the next minor release, and immediately
+// down to pre-release. premajor and prepatch work the same way.
+SemVer.prototype.inc = function (release, identifier) {
+  switch (release) {
+    case 'premajor':
+      this.prerelease.length = 0
+      this.patch = 0
+      this.minor = 0
+      this.major++
+      this.inc('pre', identifier)
+      break
+    case 'preminor':
+      this.prerelease.length = 0
+      this.patch = 0
+      this.minor++
+      this.inc('pre', identifier)
+      break
+    case 'prepatch':
+      // If this is already a prerelease, it will bump to the next version
+      // drop any prereleases that might already exist, since they are not
+      // relevant at this point.
+      this.prerelease.length = 0
+      this.inc('patch', identifier)
+      this.inc('pre', identifier)
+      break
+    // If the input is a non-prerelease version, this acts the same as
+    // prepatch.
+    case 'prerelease':
+      if (this.prerelease.length === 0) {
+        this.inc('patch', identifier)
+      }
+      this.inc('pre', identifier)
+      break
 
-/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(496);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__["single"]; });
+    case 'major':
+      // If this is a pre-major version, bump up to the same major version.
+      // Otherwise increment major.
+      // 1.0.0-5 bumps to 1.0.0
+      // 1.1.0 bumps to 2.0.0
+      if (this.minor !== 0 ||
+          this.patch !== 0 ||
+          this.prerelease.length === 0) {
+        this.major++
+      }
+      this.minor = 0
+      this.patch = 0
+      this.prerelease = []
+      break
+    case 'minor':
+      // If this is a pre-minor version, bump up to the same minor version.
+      // Otherwise increment minor.
+      // 1.2.0-5 bumps to 1.2.0
+      // 1.2.1 bumps to 1.3.0
+      if (this.patch !== 0 || this.prerelease.length === 0) {
+        this.minor++
+      }
+      this.patch = 0
+      this.prerelease = []
+      break
+    case 'patch':
+      // If this is not a pre-release version, it will increment the patch.
+      // If it is a pre-release it will bump up to the same patch version.
+      // 1.2.0-5 patches to 1.2.0
+      // 1.2.0 patches to 1.2.1
+      if (this.prerelease.length === 0) {
+        this.patch++
+      }
+      this.prerelease = []
+      break
+    // This probably shouldn't be used publicly.
+    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
+    case 'pre':
+      if (this.prerelease.length === 0) {
+        this.prerelease = [0]
+      } else {
+        var i = this.prerelease.length
+        while (--i >= 0) {
+          if (typeof this.prerelease[i] === 'number') {
+            this.prerelease[i]++
+            i = -2
+          }
+        }
+        if (i === -1) {
+          // didn't increment anything
+          this.prerelease.push(0)
+        }
+      }
+      if (identifier) {
+        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
+        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
+        if (this.prerelease[0] === identifier) {
+          if (isNaN(this.prerelease[1])) {
+            this.prerelease = [identifier, 0]
+          }
+        } else {
+          this.prerelease = [identifier, 0]
+        }
+      }
+      break
 
-/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(497);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__["skip"]; });
+    default:
+      throw new Error('invalid increment argument: ' + release)
+  }
+  this.format()
+  this.raw = this.version
+  return this
+}
 
-/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(498);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__["skipLast"]; });
+exports.inc = inc
+function inc (version, release, loose, identifier) {
+  if (typeof (loose) === 'string') {
+    identifier = loose
+    loose = undefined
+  }
 
-/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(499);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__["skipUntil"]; });
+  try {
+    return new SemVer(version, loose).inc(release, identifier).version
+  } catch (er) {
+    return null
+  }
+}
 
-/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(500);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__["skipWhile"]; });
+exports.diff = diff
+function diff (version1, version2) {
+  if (eq(version1, version2)) {
+    return null
+  } else {
+    var v1 = parse(version1)
+    var v2 = parse(version2)
+    var prefix = ''
+    if (v1.prerelease.length || v2.prerelease.length) {
+      prefix = 'pre'
+      var defaultResult = 'prerelease'
+    }
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return prefix + key
+        }
+      }
+    }
+    return defaultResult // may be undefined
+  }
+}
 
-/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(501);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__["startWith"]; });
+exports.compareIdentifiers = compareIdentifiers
 
-/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(502);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__["subscribeOn"]; });
+var numeric = /^[0-9]+$/
+function compareIdentifiers (a, b) {
+  var anum = numeric.test(a)
+  var bnum = numeric.test(b)
 
-/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(504);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; });
+  if (anum && bnum) {
+    a = +a
+    b = +b
+  }
 
-/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(505);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__["switchMap"]; });
+  return a === b ? 0
+    : (anum && !bnum) ? -1
+    : (bnum && !anum) ? 1
+    : a < b ? -1
+    : 1
+}
 
-/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(506);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; });
+exports.rcompareIdentifiers = rcompareIdentifiers
+function rcompareIdentifiers (a, b) {
+  return compareIdentifiers(b, a)
+}
 
-/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(454);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; });
+exports.major = major
+function major (a, loose) {
+  return new SemVer(a, loose).major
+}
 
-/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(467);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; });
+exports.minor = minor
+function minor (a, loose) {
+  return new SemVer(a, loose).minor
+}
 
-/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(507);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__["takeUntil"]; });
+exports.patch = patch
+function patch (a, loose) {
+  return new SemVer(a, loose).patch
+}
 
-/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(508);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; });
+exports.compare = compare
+function compare (a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose))
+}
 
-/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(509);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; });
+exports.compareLoose = compareLoose
+function compareLoose (a, b) {
+  return compare(a, b, true)
+}
 
-/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(510);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; });
+exports.rcompare = rcompare
+function rcompare (a, b, loose) {
+  return compare(b, a, loose)
+}
 
-/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(511);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; });
+exports.sort = sort
+function sort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.compare(a, b, loose)
+  })
+}
 
-/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(453);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; });
+exports.rsort = rsort
+function rsort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.rcompare(a, b, loose)
+  })
+}
 
-/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(512);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; });
+exports.gt = gt
+function gt (a, b, loose) {
+  return compare(a, b, loose) > 0
+}
 
-/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(513);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; });
+exports.lt = lt
+function lt (a, b, loose) {
+  return compare(a, b, loose) < 0
+}
 
-/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(514);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; });
+exports.eq = eq
+function eq (a, b, loose) {
+  return compare(a, b, loose) === 0
+}
 
-/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(515);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; });
+exports.neq = neq
+function neq (a, b, loose) {
+  return compare(a, b, loose) !== 0
+}
 
-/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(516);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; });
+exports.gte = gte
+function gte (a, b, loose) {
+  return compare(a, b, loose) >= 0
+}
 
-/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(517);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; });
+exports.lte = lte
+function lte (a, b, loose) {
+  return compare(a, b, loose) <= 0
+}
 
-/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(518);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; });
+exports.cmp = cmp
+function cmp (a, op, b, loose) {
+  switch (op) {
+    case '===':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a === b
 
-/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(519);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; });
+    case '!==':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a !== b
 
-/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(520);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; });
+    case '':
+    case '=':
+    case '==':
+      return eq(a, b, loose)
 
-/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(521);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; });
+    case '!=':
+      return neq(a, b, loose)
 
-/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(522);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; });
+    case '>':
+      return gt(a, b, loose)
 
-/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(523);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; });
+    case '>=':
+      return gte(a, b, loose)
 
-/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(524);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; });
+    case '<':
+      return lt(a, b, loose)
 
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+    case '<=':
+      return lte(a, b, loose)
 
+    default:
+      throw new TypeError('Invalid operator: ' + op)
+  }
+}
 
+exports.Comparator = Comparator
+function Comparator (comp, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
+  if (comp instanceof Comparator) {
+    if (comp.loose === !!options.loose) {
+      return comp
+    } else {
+      comp = comp.value
+    }
+  }
 
+  if (!(this instanceof Comparator)) {
+    return new Comparator(comp, options)
+  }
 
+  debug('comparator', comp, options)
+  this.options = options
+  this.loose = !!options.loose
+  this.parse(comp)
 
+  if (this.semver === ANY) {
+    this.value = ''
+  } else {
+    this.value = this.operator + this.semver.version
+  }
 
+  debug('comp', this)
+}
 
+var ANY = {}
+Comparator.prototype.parse = function (comp) {
+  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var m = comp.match(r)
 
+  if (!m) {
+    throw new TypeError('Invalid comparator: ' + comp)
+  }
 
+  this.operator = m[1]
+  if (this.operator === '=') {
+    this.operator = ''
+  }
 
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2]) {
+    this.semver = ANY
+  } else {
+    this.semver = new SemVer(m[2], this.options.loose)
+  }
+}
 
+Comparator.prototype.toString = function () {
+  return this.value
+}
 
+Comparator.prototype.test = function (version) {
+  debug('Comparator.test', version, this.options.loose)
 
+  if (this.semver === ANY) {
+    return true
+  }
 
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
+  return cmp(version, this.operator, this.semver, this.options)
+}
 
+Comparator.prototype.intersects = function (comp, options) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required')
+  }
 
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
+  var rangeTmp
 
+  if (this.operator === '') {
+    rangeTmp = new Range(comp.value, options)
+    return satisfies(this.value, rangeTmp, options)
+  } else if (comp.operator === '') {
+    rangeTmp = new Range(this.value, options)
+    return satisfies(comp.semver, rangeTmp, options)
+  }
 
+  var sameDirectionIncreasing =
+    (this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '>=' || comp.operator === '>')
+  var sameDirectionDecreasing =
+    (this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '<=' || comp.operator === '<')
+  var sameSemVer = this.semver.version === comp.semver.version
+  var differentDirectionsInclusive =
+    (this.operator === '>=' || this.operator === '<=') &&
+    (comp.operator === '>=' || comp.operator === '<=')
+  var oppositeDirectionsLessThan =
+    cmp(this.semver, '<', comp.semver, options) &&
+    ((this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '<=' || comp.operator === '<'))
+  var oppositeDirectionsGreaterThan =
+    cmp(this.semver, '>', comp.semver, options) &&
+    ((this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '>=' || comp.operator === '>'))
 
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+}
 
+exports.Range = Range
+function Range (range, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
+  if (range instanceof Range) {
+    if (range.loose === !!options.loose &&
+        range.includePrerelease === !!options.includePrerelease) {
+      return range
+    } else {
+      return new Range(range.raw, options)
+    }
+  }
 
+  if (range instanceof Comparator) {
+    return new Range(range.value, options)
+  }
 
+  if (!(this instanceof Range)) {
+    return new Range(range, options)
+  }
 
+  this.options = options
+  this.loose = !!options.loose
+  this.includePrerelease = !!options.includePrerelease
 
+  // First, split based on boolean or ||
+  this.raw = range
+  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
+    return this.parseRange(range.trim())
+  }, this).filter(function (c) {
+    // throw out any that are not relevant for whatever reason
+    return c.length
+  })
 
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range)
+  }
 
+  this.format()
+}
 
+Range.prototype.format = function () {
+  this.range = this.set.map(function (comps) {
+    return comps.join(' ').trim()
+  }).join('||').trim()
+  return this.range
+}
 
+Range.prototype.toString = function () {
+  return this.range
+}
 
+Range.prototype.parseRange = function (range) {
+  var loose = this.options.loose
+  range = range.trim()
+  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE]
+  range = range.replace(hr, hyphenReplace)
+  debug('hyphen replace', range)
+  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace)
+  debug('comparator trim', range, re[COMPARATORTRIM])
 
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace)
 
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace)
 
+  // normalize spaces
+  range = range.split(/\s+/).join(' ')
 
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
+  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var set = range.split(' ').map(function (comp) {
+    return parseComparator(comp, this.options)
+  }, this).join(' ').split(/\s+/)
+  if (this.options.loose) {
+    // in loose mode, throw out any that are not valid comparators
+    set = set.filter(function (comp) {
+      return !!comp.match(compRe)
+    })
+  }
+  set = set.map(function (comp) {
+    return new Comparator(comp, this.options)
+  }, this)
 
+  return set
+}
 
+Range.prototype.intersects = function (range, options) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required')
+  }
 
+  return this.set.some(function (thisComparators) {
+    return thisComparators.every(function (thisComparator) {
+      return range.set.some(function (rangeComparators) {
+        return rangeComparators.every(function (rangeComparator) {
+          return thisComparator.intersects(rangeComparator, options)
+        })
+      })
+    })
+  })
+}
 
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators
+function toComparators (range, options) {
+  return new Range(range, options).set.map(function (comp) {
+    return comp.map(function (c) {
+      return c.value
+    }).join(' ').trim().split(' ')
+  })
+}
 
+// comprised of xranges, tildes, stars, and gtlt's at this point.
+// already replaced the hyphen ranges
+// turn into a set of JUST comparators.
+function parseComparator (comp, options) {
+  debug('comp', comp, options)
+  comp = replaceCarets(comp, options)
+  debug('caret', comp)
+  comp = replaceTildes(comp, options)
+  debug('tildes', comp)
+  comp = replaceXRanges(comp, options)
+  debug('xrange', comp)
+  comp = replaceStars(comp, options)
+  debug('stars', comp)
+  return comp
+}
 
+function isX (id) {
+  return !id || id.toLowerCase() === 'x' || id === '*'
+}
 
+// ~, ~> --> * (any, kinda silly)
+// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
+// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+function replaceTildes (comp, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceTilde(comp, options)
+  }).join(' ')
+}
 
+function replaceTilde (comp, options) {
+  var r = options.loose ? re[TILDELOOSE] : re[TILDE]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('tilde', comp, _, M, m, p, pr)
+    var ret
 
+    if (isX(M)) {
+      ret = ''
+    } else if (isX(m)) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (isX(p)) {
+      // ~1.2 == >=1.2.0 <1.3.0
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+    } else if (pr) {
+      debug('replaceTilde pr', pr)
+      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+            ' <' + M + '.' + (+m + 1) + '.0'
+    } else {
+      // ~1.2.3 == >=1.2.3 <1.3.0
+      ret = '>=' + M + '.' + m + '.' + p +
+            ' <' + M + '.' + (+m + 1) + '.0'
+    }
 
+    debug('tilde return', ret)
+    return ret
+  })
+}
 
+// ^ --> * (any, kinda silly)
+// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+// ^1.2.3 --> >=1.2.3 <2.0.0
+// ^1.2.0 --> >=1.2.0 <2.0.0
+function replaceCarets (comp, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceCaret(comp, options)
+  }).join(' ')
+}
 
+function replaceCaret (comp, options) {
+  debug('caret', comp, options)
+  var r = options.loose ? re[CARETLOOSE] : re[CARET]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('caret', comp, _, M, m, p, pr)
+    var ret
 
+    if (isX(M)) {
+      ret = ''
+    } else if (isX(m)) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (isX(p)) {
+      if (M === '0') {
+        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+      } else {
+        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'
+      }
+    } else if (pr) {
+      debug('replaceCaret pr', pr)
+      if (M === '0') {
+        if (m === '0') {
+          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+                ' <' + M + '.' + m + '.' + (+p + 1)
+        } else {
+          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+                ' <' + M + '.' + (+m + 1) + '.0'
+        }
+      } else {
+        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+              ' <' + (+M + 1) + '.0.0'
+      }
+    } else {
+      debug('no pr')
+      if (M === '0') {
+        if (m === '0') {
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + m + '.' + (+p + 1)
+        } else {
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + (+m + 1) + '.0'
+        }
+      } else {
+        ret = '>=' + M + '.' + m + '.' + p +
+              ' <' + (+M + 1) + '.0.0'
+      }
+    }
 
+    debug('caret return', ret)
+    return ret
+  })
+}
 
+function replaceXRanges (comp, options) {
+  debug('replaceXRanges', comp, options)
+  return comp.split(/\s+/).map(function (comp) {
+    return replaceXRange(comp, options)
+  }).join(' ')
+}
 
+function replaceXRange (comp, options) {
+  comp = comp.trim()
+  var r = options.loose ? re[XRANGELOOSE] : re[XRANGE]
+  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
+    debug('xRange', comp, ret, gtlt, M, m, p, pr)
+    var xM = isX(M)
+    var xm = xM || isX(m)
+    var xp = xm || isX(p)
+    var anyX = xp
 
+    if (gtlt === '=' && anyX) {
+      gtlt = ''
+    }
 
+    if (xM) {
+      if (gtlt === '>' || gtlt === '<') {
+        // nothing is allowed
+        ret = '<0.0.0'
+      } else {
+        // nothing is forbidden
+        ret = '*'
+      }
+    } else if (gtlt && anyX) {
+      // we know patch is an x, because we have any x at all.
+      // replace X with 0
+      if (xm) {
+        m = 0
+      }
+      p = 0
 
+      if (gtlt === '>') {
+        // >1 => >=2.0.0
+        // >1.2 => >=1.3.0
+        // >1.2.3 => >= 1.2.4
+        gtlt = '>='
+        if (xm) {
+          M = +M + 1
+          m = 0
+          p = 0
+        } else {
+          m = +m + 1
+          p = 0
+        }
+      } else if (gtlt === '<=') {
+        // <=0.7.x is actually <0.8.0, since any 0.7.x should
+        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
+        gtlt = '<'
+        if (xm) {
+          M = +M + 1
+        } else {
+          m = +m + 1
+        }
+      }
 
+      ret = gtlt + M + '.' + m + '.' + p
+    } else if (xm) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (xp) {
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+    }
 
+    debug('xRange return', ret)
 
+    return ret
+  })
+}
 
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars (comp, options) {
+  debug('replaceStars', comp, options)
+  // Looseness is ignored here.  star is always as loose as it gets!
+  return comp.trim().replace(re[STAR], '')
+}
 
+// This function is passed to string.replace(re[HYPHENRANGE])
+// M, m, patch, prerelease, build
+// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
+// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
+// 1.2 - 3.4 => >=1.2.0 <3.5.0
+function hyphenReplace ($0,
+  from, fM, fm, fp, fpr, fb,
+  to, tM, tm, tp, tpr, tb) {
+  if (isX(fM)) {
+    from = ''
+  } else if (isX(fm)) {
+    from = '>=' + fM + '.0.0'
+  } else if (isX(fp)) {
+    from = '>=' + fM + '.' + fm + '.0'
+  } else {
+    from = '>=' + from
+  }
 
+  if (isX(tM)) {
+    to = ''
+  } else if (isX(tm)) {
+    to = '<' + (+tM + 1) + '.0.0'
+  } else if (isX(tp)) {
+    to = '<' + tM + '.' + (+tm + 1) + '.0'
+  } else if (tpr) {
+    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr
+  } else {
+    to = '<=' + to
+  }
 
+  return (from + ' ' + to).trim()
+}
 
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function (version) {
+  if (!version) {
+    return false
+  }
 
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version, this.options)) {
+      return true
+    }
+  }
+  return false
+}
 
+function testSet (set, version, options) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version)) {
+      return false
+    }
+  }
 
+  if (version.prerelease.length && !options.includePrerelease) {
+    // Find the set of versions that are allowed to have prereleases
+    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
+    // That should allow `1.2.3-pr.2` to pass.
+    // However, `1.2.4-alpha.notready` should NOT be allowed,
+    // even though it's within the range set by the comparators.
+    for (i = 0; i < set.length; i++) {
+      debug(set[i].semver)
+      if (set[i].semver === ANY) {
+        continue
+      }
 
+      if (set[i].semver.prerelease.length > 0) {
+        var allowed = set[i].semver
+        if (allowed.major === version.major &&
+            allowed.minor === version.minor &&
+            allowed.patch === version.patch) {
+          return true
+        }
+      }
+    }
 
+    // Version has a -pre, but it's not one of the ones we like.
+    return false
+  }
 
+  return true
+}
 
+exports.satisfies = satisfies
+function satisfies (version, range, options) {
+  try {
+    range = new Range(range, options)
+  } catch (er) {
+    return false
+  }
+  return range.test(version)
+}
 
+exports.maxSatisfying = maxSatisfying
+function maxSatisfying (versions, range, options) {
+  var max = null
+  var maxSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!max || maxSV.compare(v) === -1) {
+        // compare(max, v, true)
+        max = v
+        maxSV = new SemVer(max, options)
+      }
+    }
+  })
+  return max
+}
 
+exports.minSatisfying = minSatisfying
+function minSatisfying (versions, range, options) {
+  var min = null
+  var minSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!min || minSV.compare(v) === 1) {
+        // compare(min, v, true)
+        min = v
+        minSV = new SemVer(min, options)
+      }
+    }
+  })
+  return min
+}
 
+exports.minVersion = minVersion
+function minVersion (range, loose) {
+  range = new Range(range, loose)
 
+  var minver = new SemVer('0.0.0')
+  if (range.test(minver)) {
+    return minver
+  }
 
+  minver = new SemVer('0.0.0-0')
+  if (range.test(minver)) {
+    return minver
+  }
 
+  minver = null
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
+    comparators.forEach(function (comparator) {
+      // Clone to avoid manipulating the comparator's semver object.
+      var compver = new SemVer(comparator.semver.version)
+      switch (comparator.operator) {
+        case '>':
+          if (compver.prerelease.length === 0) {
+            compver.patch++
+          } else {
+            compver.prerelease.push(0)
+          }
+          compver.raw = compver.format()
+          /* fallthrough */
+        case '':
+        case '>=':
+          if (!minver || gt(minver, compver)) {
+            minver = compver
+          }
+          break
+        case '<':
+        case '<=':
+          /* Ignore maximum versions */
+          break
+        /* istanbul ignore next */
+        default:
+          throw new Error('Unexpected operation: ' + comparator.operator)
+      }
+    })
+  }
 
+  if (minver && range.test(minver)) {
+    return minver
+  }
 
+  return null
+}
 
+exports.validRange = validRange
+function validRange (range, options) {
+  try {
+    // Return '*' instead of '' so that truthiness works.
+    // This will throw if it's invalid anyway
+    return new Range(range, options).range || '*'
+  } catch (er) {
+    return null
+  }
+}
 
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr
+function ltr (version, range, options) {
+  return outside(version, range, '<', options)
+}
 
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr
+function gtr (version, range, options) {
+  return outside(version, range, '>', options)
+}
 
+exports.outside = outside
+function outside (version, range, hilo, options) {
+  version = new SemVer(version, options)
+  range = new Range(range, options)
 
+  var gtfn, ltefn, ltfn, comp, ecomp
+  switch (hilo) {
+    case '>':
+      gtfn = gt
+      ltefn = lte
+      ltfn = lt
+      comp = '>'
+      ecomp = '>='
+      break
+    case '<':
+      gtfn = lt
+      ltefn = gte
+      ltfn = gt
+      comp = '<'
+      ecomp = '<='
+      break
+    default:
+      throw new TypeError('Must provide a hilo val of "<" or ">"')
+  }
 
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, options)) {
+    return false
+  }
 
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
 
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
+    var high = null
+    var low = null
 
+    comparators.forEach(function (comparator) {
+      if (comparator.semver === ANY) {
+        comparator = new Comparator('>=0.0.0')
+      }
+      high = high || comparator
+      low = low || comparator
+      if (gtfn(comparator.semver, high.semver, options)) {
+        high = comparator
+      } else if (ltfn(comparator.semver, low.semver, options)) {
+        low = comparator
+      }
+    })
 
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false
+    }
 
+    // If the lowest version comparator has an operator and our version
+    // is less than it then it isn't higher than the range
+    if ((!low.operator || low.operator === comp) &&
+        ltefn(version, low.semver)) {
+      return false
+    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+      return false
+    }
+  }
+  return true
+}
 
+exports.prerelease = prerelease
+function prerelease (version, options) {
+  var parsed = parse(version, options)
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+}
 
+exports.intersects = intersects
+function intersects (r1, r2, options) {
+  r1 = new Range(r1, options)
+  r2 = new Range(r2, options)
+  return r1.intersects(r2)
+}
 
+exports.coerce = coerce
+function coerce (version) {
+  if (version instanceof SemVer) {
+    return version
+  }
 
+  if (typeof version !== 'string') {
+    return null
+  }
 
+  var match = version.match(re[COERCE])
 
+  if (match == null) {
+    return null
+  }
 
+  return parse(match[1] +
+    '.' + (match[2] || '0') +
+    '.' + (match[3] || '0'))
+}
 
 
-//# sourceMappingURL=index.js.map
+/***/ }),
 
+/***/ "../../node_modules/normalize-path/index.js":
+/***/ (function(module, exports) {
 
-/***/ }),
-/* 428 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/*!
+ * normalize-path <https://github.com/jonschlinkert/normalize-path>
+ *
+ * Copyright (c) 2014-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return audit; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+module.exports = function(path, stripTrailing) {
+  if (typeof path !== 'string') {
+    throw new TypeError('expected path to be a string');
+  }
 
+  if (path === '\\' || path === '/') return '/';
 
-function audit(durationSelector) {
-    return function auditOperatorFunction(source) {
-        return source.lift(new AuditOperator(durationSelector));
-    };
-}
-var AuditOperator = /*@__PURE__*/ (function () {
-    function AuditOperator(durationSelector) {
-        this.durationSelector = durationSelector;
-    }
-    AuditOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector));
-    };
-    return AuditOperator;
-}());
-var AuditSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AuditSubscriber, _super);
-    function AuditSubscriber(destination, durationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.durationSelector = durationSelector;
-        _this.hasValue = false;
-        return _this;
-    }
-    AuditSubscriber.prototype._next = function (value) {
-        this.value = value;
-        this.hasValue = true;
-        if (!this.throttled) {
-            var duration = void 0;
-            try {
-                var durationSelector = this.durationSelector;
-                duration = durationSelector(value);
-            }
-            catch (err) {
-                return this.destination.error(err);
-            }
-            var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(duration, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this));
-            if (!innerSubscription || innerSubscription.closed) {
-                this.clearThrottle();
-            }
-            else {
-                this.add(this.throttled = innerSubscription);
-            }
-        }
-    };
-    AuditSubscriber.prototype.clearThrottle = function () {
-        var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled;
-        if (throttled) {
-            this.remove(throttled);
-            this.throttled = undefined;
-            throttled.unsubscribe();
-        }
-        if (hasValue) {
-            this.value = undefined;
-            this.hasValue = false;
-            this.destination.next(value);
-        }
-    };
-    AuditSubscriber.prototype.notifyNext = function () {
-        this.clearThrottle();
-    };
-    AuditSubscriber.prototype.notifyComplete = function () {
-        this.clearThrottle();
-    };
-    return AuditSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=audit.js.map
+  var len = path.length;
+  if (len <= 1) return path;
+
+  // ensure that win32 namespaces has two leading slashes, so that the path is
+  // handled properly by the win32 version of path.parse() after being normalized
+  // https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+  var prefix = '';
+  if (len > 4 && path[3] === '\\') {
+    var ch = path[2];
+    if ((ch === '?' || ch === '.') && path.slice(0, 2) === '\\\\') {
+      path = path.slice(2);
+      prefix = '//';
+    }
+  }
+
+  var segs = path.split(/[/\\]+/);
+  if (stripTrailing !== false && segs[segs.length - 1] === '') {
+    segs.pop();
+  }
+  return prefix + segs.join('/');
+};
 
 
 /***/ }),
-/* 429 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/npm-run-path/index.js":
+/***/ (function(module, 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__(56);
-/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(428);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(109);
-/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
 
+const path = __webpack_require__("path");
+const pathKey = __webpack_require__("../../node_modules/npm-run-path/node_modules/path-key/index.js");
 
+const npmRunPath = options => {
+	options = {
+		cwd: process.cwd(),
+		path: process.env[pathKey()],
+		execPath: process.execPath,
+		...options
+	};
 
-function auditTime(duration, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return Object(_audit__WEBPACK_IMPORTED_MODULE_1__["audit"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler); });
-}
-//# sourceMappingURL=auditTime.js.map
+	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, '..');
+	}
 
-/***/ }),
-/* 430 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	// Ensure the running `node` binary is used
+	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
+	result.push(execPathDir);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return buffer; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+	return result.concat(options.path).join(path.delimiter);
+};
 
+module.exports = npmRunPath;
+// TODO: Remove this for the next major release
+module.exports.default = npmRunPath;
 
-function buffer(closingNotifier) {
-    return function bufferOperatorFunction(source) {
-        return source.lift(new BufferOperator(closingNotifier));
-    };
-}
-var BufferOperator = /*@__PURE__*/ (function () {
-    function BufferOperator(closingNotifier) {
-        this.closingNotifier = closingNotifier;
-    }
-    BufferOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier));
-    };
-    return BufferOperator;
-}());
-var BufferSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSubscriber, _super);
-    function BufferSubscriber(destination, closingNotifier) {
-        var _this = _super.call(this, destination) || this;
-        _this.buffer = [];
-        _this.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(closingNotifier, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](_this)));
-        return _this;
-    }
-    BufferSubscriber.prototype._next = function (value) {
-        this.buffer.push(value);
-    };
-    BufferSubscriber.prototype.notifyNext = function () {
-        var buffer = this.buffer;
-        this.buffer = [];
-        this.destination.next(buffer);
-    };
-    return BufferSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=buffer.js.map
+module.exports.env = options => {
+	options = {
+		env: process.env,
+		...options
+	};
+
+	const env = {...options.env};
+	const path = pathKey({env});
+
+	options.path = env[path];
+	env[path] = module.exports(options);
+
+	return env;
+};
 
 
 /***/ }),
-/* 431 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/npm-run-path/node_modules/path-key/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return bufferCount; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
-function bufferCount(bufferSize, startBufferEvery) {
-    if (startBufferEvery === void 0) {
-        startBufferEvery = null;
-    }
-    return function bufferCountOperatorFunction(source) {
-        return source.lift(new BufferCountOperator(bufferSize, startBufferEvery));
-    };
-}
-var BufferCountOperator = /*@__PURE__*/ (function () {
-    function BufferCountOperator(bufferSize, startBufferEvery) {
-        this.bufferSize = bufferSize;
-        this.startBufferEvery = startBufferEvery;
-        if (!startBufferEvery || bufferSize === startBufferEvery) {
-            this.subscriberClass = BufferCountSubscriber;
-        }
-        else {
-            this.subscriberClass = BufferSkipCountSubscriber;
-        }
-    }
-    BufferCountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery));
-    };
-    return BufferCountOperator;
-}());
-var BufferCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferCountSubscriber, _super);
-    function BufferCountSubscriber(destination, bufferSize) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferSize = bufferSize;
-        _this.buffer = [];
-        return _this;
-    }
-    BufferCountSubscriber.prototype._next = function (value) {
-        var buffer = this.buffer;
-        buffer.push(value);
-        if (buffer.length == this.bufferSize) {
-            this.destination.next(buffer);
-            this.buffer = [];
-        }
-    };
-    BufferCountSubscriber.prototype._complete = function () {
-        var buffer = this.buffer;
-        if (buffer.length > 0) {
-            this.destination.next(buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    return BufferCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSkipCountSubscriber, _super);
-    function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferSize = bufferSize;
-        _this.startBufferEvery = startBufferEvery;
-        _this.buffers = [];
-        _this.count = 0;
-        return _this;
-    }
-    BufferSkipCountSubscriber.prototype._next = function (value) {
-        var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count;
-        this.count++;
-        if (count % startBufferEvery === 0) {
-            buffers.push([]);
-        }
-        for (var i = buffers.length; i--;) {
-            var buffer = buffers[i];
-            buffer.push(value);
-            if (buffer.length === bufferSize) {
-                buffers.splice(i, 1);
-                this.destination.next(buffer);
-            }
-        }
-    };
-    BufferSkipCountSubscriber.prototype._complete = function () {
-        var _a = this, buffers = _a.buffers, destination = _a.destination;
-        while (buffers.length > 0) {
-            var buffer = buffers.shift();
-            if (buffer.length > 0) {
-                destination.next(buffer);
-            }
-        }
-        _super.prototype._complete.call(this);
-    };
-    return BufferSkipCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=bufferCount.js.map
+const pathKey = (options = {}) => {
+	const environment = options.env || process.env;
+	const platform = options.platform || process.platform;
+
+	if (platform !== 'win32') {
+		return 'PATH';
+	}
+
+	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;
 
 
 /***/ }),
-/* 432 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/object-copy/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return bufferTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(46);
-/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
 
 
+var typeOf = __webpack_require__("../../node_modules/object-copy/node_modules/kind-of/index.js");
+var copyDescriptor = __webpack_require__("../../node_modules/copy-descriptor/index.js");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
+
+/**
+ * Copy static properties, prototype properties, and descriptors from one object to another.
+ *
+ * ```js
+ * function App() {}
+ * var proto = App.prototype;
+ * App.prototype.set = function() {};
+ * App.prototype.get = function() {};
+ *
+ * var obj = {};
+ * copy(obj, proto);
+ * ```
+ * @param {Object} `receiver`
+ * @param {Object} `provider`
+ * @param {String|Array} `omit` One or more properties to omit
+ * @return {Object}
+ * @api public
+ */
 
+function copy(receiver, provider, omit) {
+  if (!isObject(receiver)) {
+    throw new TypeError('expected receiving object to be an object.');
+  }
+  if (!isObject(provider)) {
+    throw new TypeError('expected providing object to be an object.');
+  }
 
-function bufferTime(bufferTimeSpan) {
-    var length = arguments.length;
-    var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(arguments[arguments.length - 1])) {
-        scheduler = arguments[arguments.length - 1];
-        length--;
-    }
-    var bufferCreationInterval = null;
-    if (length >= 2) {
-        bufferCreationInterval = arguments[1];
-    }
-    var maxBufferSize = Number.POSITIVE_INFINITY;
-    if (length >= 3) {
-        maxBufferSize = arguments[2];
-    }
-    return function bufferTimeOperatorFunction(source) {
-        return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler));
-    };
-}
-var BufferTimeOperator = /*@__PURE__*/ (function () {
-    function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
-        this.bufferTimeSpan = bufferTimeSpan;
-        this.bufferCreationInterval = bufferCreationInterval;
-        this.maxBufferSize = maxBufferSize;
-        this.scheduler = scheduler;
-    }
-    BufferTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler));
-    };
-    return BufferTimeOperator;
-}());
-var Context = /*@__PURE__*/ (function () {
-    function Context() {
-        this.buffer = [];
-    }
-    return Context;
-}());
-var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferTimeSubscriber, _super);
-    function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferTimeSpan = bufferTimeSpan;
-        _this.bufferCreationInterval = bufferCreationInterval;
-        _this.maxBufferSize = maxBufferSize;
-        _this.scheduler = scheduler;
-        _this.contexts = [];
-        var context = _this.openContext();
-        _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0;
-        if (_this.timespanOnly) {
-            var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan };
-            _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
-        }
-        else {
-            var closeState = { subscriber: _this, context: context };
-            var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler };
-            _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState));
-            _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState));
-        }
-        return _this;
-    }
-    BufferTimeSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        var len = contexts.length;
-        var filledBufferContext;
-        for (var i = 0; i < len; i++) {
-            var context_1 = contexts[i];
-            var buffer = context_1.buffer;
-            buffer.push(value);
-            if (buffer.length == this.maxBufferSize) {
-                filledBufferContext = context_1;
-            }
-        }
-        if (filledBufferContext) {
-            this.onBufferFull(filledBufferContext);
-        }
-    };
-    BufferTimeSubscriber.prototype._error = function (err) {
-        this.contexts.length = 0;
-        _super.prototype._error.call(this, err);
-    };
-    BufferTimeSubscriber.prototype._complete = function () {
-        var _a = this, contexts = _a.contexts, destination = _a.destination;
-        while (contexts.length > 0) {
-            var context_2 = contexts.shift();
-            destination.next(context_2.buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    BufferTimeSubscriber.prototype._unsubscribe = function () {
-        this.contexts = null;
-    };
-    BufferTimeSubscriber.prototype.onBufferFull = function (context) {
-        this.closeContext(context);
-        var closeAction = context.closeAction;
-        closeAction.unsubscribe();
-        this.remove(closeAction);
-        if (!this.closed && this.timespanOnly) {
-            context = this.openContext();
-            var bufferTimeSpan = this.bufferTimeSpan;
-            var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan };
-            this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
-        }
-    };
-    BufferTimeSubscriber.prototype.openContext = function () {
-        var context = new Context();
-        this.contexts.push(context);
-        return context;
-    };
-    BufferTimeSubscriber.prototype.closeContext = function (context) {
-        this.destination.next(context.buffer);
-        var contexts = this.contexts;
-        var spliceIndex = contexts ? contexts.indexOf(context) : -1;
-        if (spliceIndex >= 0) {
-            contexts.splice(contexts.indexOf(context), 1);
-        }
-    };
-    return BufferTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
-function dispatchBufferTimeSpanOnly(state) {
-    var subscriber = state.subscriber;
-    var prevContext = state.context;
-    if (prevContext) {
-        subscriber.closeContext(prevContext);
-    }
-    if (!subscriber.closed) {
-        state.context = subscriber.openContext();
-        state.context.closeAction = this.schedule(state, state.bufferTimeSpan);
-    }
-}
-function dispatchBufferCreation(state) {
-    var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler;
-    var context = subscriber.openContext();
-    var action = this;
-    if (!subscriber.closed) {
-        subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context }));
-        action.schedule(state, bufferCreationInterval);
-    }
-}
-function dispatchBufferClose(arg) {
-    var subscriber = arg.subscriber, context = arg.context;
-    subscriber.closeContext(context);
-}
-//# sourceMappingURL=bufferTime.js.map
+  var props = nativeKeys(provider);
+  var keys = Object.keys(provider);
+  var len = props.length;
+  omit = arrayify(omit);
 
+  while (len--) {
+    var key = props[len];
 
-/***/ }),
-/* 433 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (has(keys, key)) {
+      define(receiver, key, provider[key]);
+    } else if (!(key in receiver) && !has(omit, key)) {
+      copyDescriptor(receiver, provider, key);
+    }
+  }
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return bufferToggle; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(71);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
-/** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */
+/**
+ * Return true if the given value is an object or function
+ */
 
+function isObject(val) {
+  return typeOf(val) === 'object' || typeof val === 'function';
+}
 
+/**
+ * Returns true if an array has any of the given elements, or an
+ * object has any of the give keys.
+ *
+ * ```js
+ * has(['a', 'b', 'c'], 'c');
+ * //=> true
+ *
+ * has(['a', 'b', 'c'], ['c', 'z']);
+ * //=> true
+ *
+ * has({a: 'b', c: 'd'}, ['c', 'z']);
+ * //=> true
+ * ```
+ * @param {Object} `obj`
+ * @param {String|Array} `val`
+ * @return {Boolean}
+ */
 
+function has(obj, val) {
+  val = arrayify(val);
+  var len = val.length;
 
-function bufferToggle(openings, closingSelector) {
-    return function bufferToggleOperatorFunction(source) {
-        return source.lift(new BufferToggleOperator(openings, closingSelector));
-    };
-}
-var BufferToggleOperator = /*@__PURE__*/ (function () {
-    function BufferToggleOperator(openings, closingSelector) {
-        this.openings = openings;
-        this.closingSelector = closingSelector;
-    }
-    BufferToggleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector));
-    };
-    return BufferToggleOperator;
-}());
-var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferToggleSubscriber, _super);
-    function BufferToggleSubscriber(destination, openings, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.closingSelector = closingSelector;
-        _this.contexts = [];
-        _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, openings));
-        return _this;
+  if (isObject(obj)) {
+    for (var key in obj) {
+      if (val.indexOf(key) > -1) {
+        return true;
+      }
     }
-    BufferToggleSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        var len = contexts.length;
-        for (var i = 0; i < len; i++) {
-            contexts[i].buffer.push(value);
-        }
-    };
-    BufferToggleSubscriber.prototype._error = function (err) {
-        var contexts = this.contexts;
-        while (contexts.length > 0) {
-            var context_1 = contexts.shift();
-            context_1.subscription.unsubscribe();
-            context_1.buffer = null;
-            context_1.subscription = null;
-        }
-        this.contexts = null;
-        _super.prototype._error.call(this, err);
-    };
-    BufferToggleSubscriber.prototype._complete = function () {
-        var contexts = this.contexts;
-        while (contexts.length > 0) {
-            var context_2 = contexts.shift();
-            this.destination.next(context_2.buffer);
-            context_2.subscription.unsubscribe();
-            context_2.buffer = null;
-            context_2.subscription = null;
-        }
-        this.contexts = null;
-        _super.prototype._complete.call(this);
-    };
-    BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue) {
-        outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue);
-    };
-    BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.closeBuffer(innerSub.context);
-    };
-    BufferToggleSubscriber.prototype.openBuffer = function (value) {
-        try {
-            var closingSelector = this.closingSelector;
-            var closingNotifier = closingSelector.call(this, value);
-            if (closingNotifier) {
-                this.trySubscribe(closingNotifier);
-            }
-        }
-        catch (err) {
-            this._error(err);
-        }
-    };
-    BufferToggleSubscriber.prototype.closeBuffer = function (context) {
-        var contexts = this.contexts;
-        if (contexts && context) {
-            var buffer = context.buffer, subscription = context.subscription;
-            this.destination.next(buffer);
-            contexts.splice(contexts.indexOf(context), 1);
-            this.remove(subscription);
-            subscription.unsubscribe();
-        }
-    };
-    BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) {
-        var contexts = this.contexts;
-        var buffer = [];
-        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        var context = { buffer: buffer, subscription: subscription };
-        contexts.push(context);
-        var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, closingNotifier, context);
-        if (!innerSubscription || innerSubscription.closed) {
-            this.closeBuffer(context);
-        }
-        else {
-            innerSubscription.context = context;
-            this.add(innerSubscription);
-            subscription.add(innerSubscription);
-        }
-    };
-    return BufferToggleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-//# sourceMappingURL=bufferToggle.js.map
 
+    var keys = nativeKeys(obj);
+    return has(keys, val);
+  }
 
-/***/ }),
-/* 434 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (Array.isArray(obj)) {
+    var arr = obj;
+    while (len--) {
+      if (arr.indexOf(val[len]) > -1) {
+        return true;
+      }
+    }
+    return false;
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return bufferWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_Subscription,_innerSubscribe PURE_IMPORTS_END */
+  throw new TypeError('expected an array or object.');
+}
+
+/**
+ * Cast the given value to an array.
+ *
+ * ```js
+ * arrayify('foo');
+ * //=> ['foo']
+ *
+ * arrayify(['foo']);
+ * //=> ['foo']
+ * ```
+ *
+ * @param {String|Array} `val`
+ * @return {Array}
+ */
 
+function arrayify(val) {
+  return val ? (Array.isArray(val) ? val : [val]) : [];
+}
 
+/**
+ * Returns true if a value has a `contructor`
+ *
+ * ```js
+ * hasConstructor({});
+ * //=> true
+ *
+ * hasConstructor(Object.create(null));
+ * //=> false
+ * ```
+ * @param  {Object} `value`
+ * @return {Boolean}
+ */
 
-function bufferWhen(closingSelector) {
-    return function (source) {
-        return source.lift(new BufferWhenOperator(closingSelector));
-    };
+function hasConstructor(val) {
+  return isObject(val) && typeof val.constructor !== 'undefined';
 }
-var BufferWhenOperator = /*@__PURE__*/ (function () {
-    function BufferWhenOperator(closingSelector) {
-        this.closingSelector = closingSelector;
-    }
-    BufferWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector));
-    };
-    return BufferWhenOperator;
-}());
-var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferWhenSubscriber, _super);
-    function BufferWhenSubscriber(destination, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.closingSelector = closingSelector;
-        _this.subscribing = false;
-        _this.openBuffer();
-        return _this;
-    }
-    BufferWhenSubscriber.prototype._next = function (value) {
-        this.buffer.push(value);
-    };
-    BufferWhenSubscriber.prototype._complete = function () {
-        var buffer = this.buffer;
-        if (buffer) {
-            this.destination.next(buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    BufferWhenSubscriber.prototype._unsubscribe = function () {
-        this.buffer = undefined;
-        this.subscribing = false;
-    };
-    BufferWhenSubscriber.prototype.notifyNext = function () {
-        this.openBuffer();
-    };
-    BufferWhenSubscriber.prototype.notifyComplete = function () {
-        if (this.subscribing) {
-            this.complete();
-        }
-        else {
-            this.openBuffer();
-        }
-    };
-    BufferWhenSubscriber.prototype.openBuffer = function () {
-        var closingSubscription = this.closingSubscription;
-        if (closingSubscription) {
-            this.remove(closingSubscription);
-            closingSubscription.unsubscribe();
-        }
-        var buffer = this.buffer;
-        if (this.buffer) {
-            this.destination.next(buffer);
-        }
-        this.buffer = [];
-        var closingNotifier;
-        try {
-            var closingSelector = this.closingSelector;
-            closingNotifier = closingSelector();
-        }
-        catch (err) {
-            return this.error(err);
-        }
-        closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        this.closingSubscription = closingSubscription;
-        this.add(closingSubscription);
-        this.subscribing = true;
-        closingSubscription.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["innerSubscribe"])(closingNotifier, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleInnerSubscriber"](this)));
-        this.subscribing = false;
-    };
-    return BufferWhenSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=bufferWhen.js.map
 
+/**
+ * Get the native `ownPropertyNames` from the constructor of the
+ * given `object`. An empty array is returned if the object does
+ * not have a constructor.
+ *
+ * ```js
+ * nativeKeys({a: 'b', b: 'c', c: 'd'})
+ * //=> ['a', 'b', 'c']
+ *
+ * nativeKeys(function(){})
+ * //=> ['length', 'caller']
+ * ```
+ *
+ * @param  {Object} `obj` Object that has a `constructor`.
+ * @return {Array} Array of keys.
+ */
 
-/***/ }),
-/* 435 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function nativeKeys(val) {
+  if (!hasConstructor(val)) return [];
+  return Object.getOwnPropertyNames(val);
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return catchError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+/**
+ * Expose `copy`
+ */
 
+module.exports = copy;
 
-function catchError(selector) {
-    return function catchErrorOperatorFunction(source) {
-        var operator = new CatchOperator(selector);
-        var caught = source.lift(operator);
-        return (operator.caught = caught);
-    };
-}
-var CatchOperator = /*@__PURE__*/ (function () {
-    function CatchOperator(selector) {
-        this.selector = selector;
-    }
-    CatchOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught));
-    };
-    return CatchOperator;
-}());
-var CatchSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CatchSubscriber, _super);
-    function CatchSubscriber(destination, selector, caught) {
-        var _this = _super.call(this, destination) || this;
-        _this.selector = selector;
-        _this.caught = caught;
-        return _this;
-    }
-    CatchSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var result = void 0;
-            try {
-                result = this.selector(err, this.caught);
-            }
-            catch (err2) {
-                _super.prototype.error.call(this, err2);
-                return;
-            }
-            this._unsubscribeAndRecycle();
-            var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this);
-            this.add(innerSubscriber);
-            var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(result, innerSubscriber);
-            if (innerSubscription !== innerSubscriber) {
-                this.add(innerSubscription);
-            }
-        }
-    };
-    return CatchSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=catchError.js.map
+/**
+ * Expose `copy.has` for tests
+ */
+
+module.exports.has = has;
 
 
 /***/ }),
-/* 436 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return combineAll; });
-/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(69);
-/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */
+/***/ "../../node_modules/object-copy/node_modules/kind-of/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function combineAll(project) {
-    return function (source) { return source.lift(new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__["CombineLatestOperator"](project)); };
-}
-//# sourceMappingURL=combineAll.js.map
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
 
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
 
-/***/ }),
-/* 437 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; });
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
-/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(69);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84);
-/** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
 
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-var none = {};
-function combineLatest() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var project = null;
-    if (typeof observables[observables.length - 1] === 'function') {
-        project = observables.pop();
-    }
-    if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) {
-        observables = observables[0].slice();
-    }
-    return function (source) { return source.lift.call(Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])([source].concat(observables)), new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__["CombineLatestOperator"](project)); };
-}
-//# sourceMappingURL=combineLatest.js.map
+  // other objects
+  var type = toString.call(val);
+
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
 
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-/***/ }),
-/* 438 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; });
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80);
-/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
 
-function concat() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function (source) { return source.lift.call(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"].apply(void 0, [source].concat(observables))); };
-}
-//# sourceMappingURL=concat.js.map
+  // must be a plain object
+  return 'object';
+};
 
 
 /***/ }),
-/* 439 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/object-visit/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return concatMap; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(83);
-/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+/*!
+ * object-visit <https://github.com/jonschlinkert/object-visit>
+ *
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-function concatMap(project, resultSelector) {
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, resultSelector, 1);
-}
-//# sourceMappingURL=concatMap.js.map
 
 
-/***/ }),
-/* 440 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
 
-"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__(439);
-/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
+module.exports = function visit(thisArg, method, target, val) {
+  if (!isObject(thisArg) && typeof thisArg !== 'function') {
+    throw new Error('object-visit expects `thisArg` to be an object.');
+  }
 
-function concatMapTo(innerObservable, resultSelector) {
-    return Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; }, resultSelector);
-}
-//# sourceMappingURL=concatMapTo.js.map
+  if (typeof method !== 'string') {
+    throw new Error('object-visit expects `method` name to be a string');
+  }
+
+  if (typeof thisArg[method] !== 'function') {
+    return thisArg;
+  }
+
+  var args = [].slice.call(arguments, 3);
+  target = target || {};
+
+  for (var key in target) {
+    var arr = [key, target[key]].concat(args);
+    thisArg[method].apply(thisArg, arr);
+  }
+  return thisArg;
+};
 
 
 /***/ }),
-/* 441 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/object.pick/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return count; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+/*!
+ * object.pick <https://github.com/jonschlinkert/object.pick>
+ *
+ * Copyright (c) 2014-2015 Jon Schlinkert, contributors.
+ * Licensed under the MIT License
+ */
 
 
-function count(predicate) {
-    return function (source) { return source.lift(new CountOperator(predicate, source)); };
-}
-var CountOperator = /*@__PURE__*/ (function () {
-    function CountOperator(predicate, source) {
-        this.predicate = predicate;
-        this.source = source;
-    }
-    CountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source));
-    };
-    return CountOperator;
-}());
-var CountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountSubscriber, _super);
-    function CountSubscriber(destination, predicate, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.count = 0;
-        _this.index = 0;
-        return _this;
-    }
-    CountSubscriber.prototype._next = function (value) {
-        if (this.predicate) {
-            this._tryPredicate(value);
-        }
-        else {
-            this.count++;
-        }
-    };
-    CountSubscriber.prototype._tryPredicate = function (value) {
-        var result;
-        try {
-            result = this.predicate(value, this.index++, this.source);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (result) {
-            this.count++;
-        }
-    };
-    CountSubscriber.prototype._complete = function () {
-        this.destination.next(this.count);
-        this.destination.complete();
-    };
-    return CountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=count.js.map
 
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
 
-/***/ }),
-/* 442 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = function pick(obj, keys) {
+  if (!isObject(obj) && typeof obj !== 'function') {
+    return {};
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return debounce; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+  var res = {};
+  if (typeof keys === 'string') {
+    if (keys in obj) {
+      res[keys] = obj[keys];
+    }
+    return res;
+  }
 
+  var len = keys.length;
+  var idx = -1;
 
-function debounce(durationSelector) {
-    return function (source) { return source.lift(new DebounceOperator(durationSelector)); };
-}
-var DebounceOperator = /*@__PURE__*/ (function () {
-    function DebounceOperator(durationSelector) {
-        this.durationSelector = durationSelector;
-    }
-    DebounceOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector));
-    };
-    return DebounceOperator;
-}());
-var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceSubscriber, _super);
-    function DebounceSubscriber(destination, durationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.durationSelector = durationSelector;
-        _this.hasValue = false;
-        return _this;
+  while (++idx < len) {
+    var key = keys[idx];
+    if (key in obj) {
+      res[key] = obj[key];
     }
-    DebounceSubscriber.prototype._next = function (value) {
-        try {
-            var result = this.durationSelector.call(this, value);
-            if (result) {
-                this._tryNext(value, result);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    DebounceSubscriber.prototype._complete = function () {
-        this.emitValue();
-        this.destination.complete();
-    };
-    DebounceSubscriber.prototype._tryNext = function (value, duration) {
-        var subscription = this.durationSubscription;
-        this.value = value;
-        this.hasValue = true;
-        if (subscription) {
-            subscription.unsubscribe();
-            this.remove(subscription);
-        }
-        subscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(duration, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this));
-        if (subscription && !subscription.closed) {
-            this.add(this.durationSubscription = subscription);
-        }
-    };
-    DebounceSubscriber.prototype.notifyNext = function () {
-        this.emitValue();
-    };
-    DebounceSubscriber.prototype.notifyComplete = function () {
-        this.emitValue();
-    };
-    DebounceSubscriber.prototype.emitValue = function () {
-        if (this.hasValue) {
-            var value = this.value;
-            var subscription = this.durationSubscription;
-            if (subscription) {
-                this.durationSubscription = undefined;
-                subscription.unsubscribe();
-                this.remove(subscription);
-            }
-            this.value = undefined;
-            this.hasValue = false;
-            _super.prototype._next.call(this, value);
-        }
-    };
-    return DebounceSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=debounce.js.map
+  }
+  return res;
+};
 
 
 /***/ }),
-/* 443 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return debounceTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(56);
-/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
+/***/ "../../node_modules/once/once.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var wrappy = __webpack_require__("../../node_modules/wrappy/wrappy.js")
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
 
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
 
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
 
-function debounceTime(dueTime, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    }
-    return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); };
+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
 }
-var DebounceTimeOperator = /*@__PURE__*/ (function () {
-    function DebounceTimeOperator(dueTime, scheduler) {
-        this.dueTime = dueTime;
-        this.scheduler = scheduler;
-    }
-    DebounceTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler));
-    };
-    return DebounceTimeOperator;
-}());
-var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceTimeSubscriber, _super);
-    function DebounceTimeSubscriber(destination, dueTime, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.dueTime = dueTime;
-        _this.scheduler = scheduler;
-        _this.debouncedSubscription = null;
-        _this.lastValue = null;
-        _this.hasValue = false;
-        return _this;
-    }
-    DebounceTimeSubscriber.prototype._next = function (value) {
-        this.clearDebounce();
-        this.lastValue = value;
-        this.hasValue = true;
-        this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this));
-    };
-    DebounceTimeSubscriber.prototype._complete = function () {
-        this.debouncedNext();
-        this.destination.complete();
-    };
-    DebounceTimeSubscriber.prototype.debouncedNext = function () {
-        this.clearDebounce();
-        if (this.hasValue) {
-            var lastValue = this.lastValue;
-            this.lastValue = null;
-            this.hasValue = false;
-            this.destination.next(lastValue);
-        }
-    };
-    DebounceTimeSubscriber.prototype.clearDebounce = function () {
-        var debouncedSubscription = this.debouncedSubscription;
-        if (debouncedSubscription !== null) {
-            this.remove(debouncedSubscription);
-            debouncedSubscription.unsubscribe();
-            this.debouncedSubscription = null;
-        }
-    };
-    return DebounceTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-function dispatchNext(subscriber) {
-    subscriber.debouncedNext();
+
+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
 }
-//# sourceMappingURL=debounceTime.js.map
 
 
 /***/ }),
-/* 444 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/onetime/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return defaultIfEmpty; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
+const mimicFn = __webpack_require__("../../node_modules/mimic-fn/index.js");
 
-function defaultIfEmpty(defaultValue) {
-    if (defaultValue === void 0) {
-        defaultValue = null;
-    }
-    return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); };
-}
-var DefaultIfEmptyOperator = /*@__PURE__*/ (function () {
-    function DefaultIfEmptyOperator(defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-    DefaultIfEmptyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue));
-    };
-    return DefaultIfEmptyOperator;
-}());
-var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DefaultIfEmptySubscriber, _super);
-    function DefaultIfEmptySubscriber(destination, defaultValue) {
-        var _this = _super.call(this, destination) || this;
-        _this.defaultValue = defaultValue;
-        _this.isEmpty = true;
-        return _this;
-    }
-    DefaultIfEmptySubscriber.prototype._next = function (value) {
-        this.isEmpty = false;
-        this.destination.next(value);
-    };
-    DefaultIfEmptySubscriber.prototype._complete = function () {
-        if (this.isEmpty) {
-            this.destination.next(this.defaultValue);
-        }
-        this.destination.complete();
-    };
-    return DefaultIfEmptySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=defaultIfEmpty.js.map
+const calledFunctions = new WeakMap();
 
+const onetime = (function_, options = {}) => {
+	if (typeof function_ !== 'function') {
+		throw new TypeError('Expected a function');
+	}
 
-/***/ }),
-/* 445 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	let returnValue;
+	let callCount = 0;
+	const functionName = function_.displayName || function_.name || '<anonymous>';
 
-"use strict";
-__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__(13);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(446);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12);
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(43);
-/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
+	const onetime = function (...arguments_) {
+		calledFunctions.set(onetime, ++callCount);
+
+		if (callCount === 1) {
+			returnValue = function_.apply(this, arguments_);
+			function_ = null;
+		} else if (options.throw === true) {
+			throw new Error(`Function \`${functionName}\` can only be called once`);
+		}
 
+		return returnValue;
+	};
 
+	mimicFn(onetime, function_);
+	calledFunctions.set(onetime, callCount);
 
+	return onetime;
+};
 
+module.exports = onetime;
+// TODO: Remove this for the next major release
+module.exports.default = onetime;
 
-function delay(delay, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    var absoluteDelay = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(delay);
-    var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay);
-    return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); };
-}
-var DelayOperator = /*@__PURE__*/ (function () {
-    function DelayOperator(delay, scheduler) {
-        this.delay = delay;
-        this.scheduler = scheduler;
-    }
-    DelayOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler));
-    };
-    return DelayOperator;
-}());
-var DelaySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelaySubscriber, _super);
-    function DelaySubscriber(destination, delay, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.delay = delay;
-        _this.scheduler = scheduler;
-        _this.queue = [];
-        _this.active = false;
-        _this.errored = false;
-        return _this;
-    }
-    DelaySubscriber.dispatch = function (state) {
-        var source = state.source;
-        var queue = source.queue;
-        var scheduler = state.scheduler;
-        var destination = state.destination;
-        while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) {
-            queue.shift().notification.observe(destination);
-        }
-        if (queue.length > 0) {
-            var delay_1 = Math.max(0, queue[0].time - scheduler.now());
-            this.schedule(state, delay_1);
-        }
-        else {
-            this.unsubscribe();
-            source.active = false;
-        }
-    };
-    DelaySubscriber.prototype._schedule = function (scheduler) {
-        this.active = true;
-        var destination = this.destination;
-        destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
-            source: this, destination: this.destination, scheduler: scheduler
-        }));
-    };
-    DelaySubscriber.prototype.scheduleNotification = function (notification) {
-        if (this.errored === true) {
-            return;
-        }
-        var scheduler = this.scheduler;
-        var message = new DelayMessage(scheduler.now() + this.delay, notification);
-        this.queue.push(message);
-        if (this.active === false) {
-            this._schedule(scheduler);
-        }
-    };
-    DelaySubscriber.prototype._next = function (value) {
-        this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createNext(value));
-    };
-    DelaySubscriber.prototype._error = function (err) {
-        this.errored = true;
-        this.queue = [];
-        this.destination.error(err);
-        this.unsubscribe();
-    };
-    DelaySubscriber.prototype._complete = function () {
-        this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createComplete());
-        this.unsubscribe();
-    };
-    return DelaySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
-var DelayMessage = /*@__PURE__*/ (function () {
-    function DelayMessage(time, notification) {
-        this.time = time;
-        this.notification = notification;
-    }
-    return DelayMessage;
-}());
-//# sourceMappingURL=delay.js.map
+module.exports.callCount = function_ => {
+	if (!calledFunctions.has(function_)) {
+		throw new Error(`The given function \`${function_.name}\` is not wrapped by the \`onetime\` package`);
+	}
+
+	return calledFunctions.get(function_);
+};
 
 
 /***/ }),
-/* 446 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDate", function() { return isDate; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isDate(value) {
-    return value instanceof Date && !isNaN(+value);
-}
-//# sourceMappingURL=isDate.js.map
 
+const readline = __webpack_require__("readline");
+const chalk = __webpack_require__("../../node_modules/ora/node_modules/chalk/source/index.js");
+const cliCursor = __webpack_require__("../../node_modules/cli-cursor/index.js");
+const cliSpinners = __webpack_require__("../../node_modules/cli-spinners/index.js");
+const logSymbols = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/index.js");
+const stripAnsi = __webpack_require__("../../node_modules/strip-ansi/index.js");
+const wcwidth = __webpack_require__("../../node_modules/wcwidth/index.js");
+const isInteractive = __webpack_require__("../../node_modules/is-interactive/index.js");
+const MuteStream = __webpack_require__("../../node_modules/mute-stream/mute.js");
 
-/***/ }),
-/* 447 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const TEXT = Symbol('text');
+const PREFIX_TEXT = Symbol('prefixText');
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return delayWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(71);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+const ASCII_ETX_CODE = 0x03; // Ctrl+C emits this code
 
+class StdinDiscarder {
+	constructor() {
+		this.requests = 0;
 
+		this.mutedStream = new MuteStream();
+		this.mutedStream.pipe(process.stdout);
+		this.mutedStream.mute();
 
+		const self = this;
+		this.ourEmit = function (event, data, ...args) {
+			const {stdin} = process;
+			if (self.requests > 0 || stdin.emit === self.ourEmit) {
+				if (event === 'keypress') { // Fixes readline behavior
+					return;
+				}
 
+				if (event === 'data' && data.includes(ASCII_ETX_CODE)) {
+					process.emit('SIGINT');
+				}
 
-function delayWhen(delayDurationSelector, subscriptionDelay) {
-    if (subscriptionDelay) {
-        return function (source) {
-            return new SubscriptionDelayObservable(source, subscriptionDelay)
-                .lift(new DelayWhenOperator(delayDurationSelector));
-        };
-    }
-    return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); };
-}
-var DelayWhenOperator = /*@__PURE__*/ (function () {
-    function DelayWhenOperator(delayDurationSelector) {
-        this.delayDurationSelector = delayDurationSelector;
-    }
-    DelayWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector));
-    };
-    return DelayWhenOperator;
-}());
-var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelayWhenSubscriber, _super);
-    function DelayWhenSubscriber(destination, delayDurationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.delayDurationSelector = delayDurationSelector;
-        _this.completed = false;
-        _this.delayNotifierSubscriptions = [];
-        _this.index = 0;
-        return _this;
-    }
-    DelayWhenSubscriber.prototype.notifyNext = function (outerValue, _innerValue, _outerIndex, _innerIndex, innerSub) {
-        this.destination.next(outerValue);
-        this.removeSubscription(innerSub);
-        this.tryComplete();
-    };
-    DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) {
-        var value = this.removeSubscription(innerSub);
-        if (value) {
-            this.destination.next(value);
-        }
-        this.tryComplete();
-    };
-    DelayWhenSubscriber.prototype._next = function (value) {
-        var index = this.index++;
-        try {
-            var delayNotifier = this.delayDurationSelector(value, index);
-            if (delayNotifier) {
-                this.tryDelay(delayNotifier, value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    DelayWhenSubscriber.prototype._complete = function () {
-        this.completed = true;
-        this.tryComplete();
-        this.unsubscribe();
-    };
-    DelayWhenSubscriber.prototype.removeSubscription = function (subscription) {
-        subscription.unsubscribe();
-        var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription);
-        if (subscriptionIdx !== -1) {
-            this.delayNotifierSubscriptions.splice(subscriptionIdx, 1);
-        }
-        return subscription.outerValue;
-    };
-    DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) {
-        var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value);
-        if (notifierSubscription && !notifierSubscription.closed) {
-            var destination = this.destination;
-            destination.add(notifierSubscription);
-            this.delayNotifierSubscriptions.push(notifierSubscription);
-        }
-    };
-    DelayWhenSubscriber.prototype.tryComplete = function () {
-        if (this.completed && this.delayNotifierSubscriptions.length === 0) {
-            this.destination.complete();
-        }
-    };
-    return DelayWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelayObservable, _super);
-    function SubscriptionDelayObservable(source, subscriptionDelay) {
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.subscriptionDelay = subscriptionDelay;
-        return _this;
-    }
-    SubscriptionDelayObservable.prototype._subscribe = function (subscriber) {
-        this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source));
-    };
-    return SubscriptionDelayObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
-var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelaySubscriber, _super);
-    function SubscriptionDelaySubscriber(parent, source) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.source = source;
-        _this.sourceSubscribed = false;
-        return _this;
-    }
-    SubscriptionDelaySubscriber.prototype._next = function (unused) {
-        this.subscribeToSource();
-    };
-    SubscriptionDelaySubscriber.prototype._error = function (err) {
-        this.unsubscribe();
-        this.parent.error(err);
-    };
-    SubscriptionDelaySubscriber.prototype._complete = function () {
-        this.unsubscribe();
-        this.subscribeToSource();
-    };
-    SubscriptionDelaySubscriber.prototype.subscribeToSource = function () {
-        if (!this.sourceSubscribed) {
-            this.sourceSubscribed = true;
-            this.unsubscribe();
-            this.source.subscribe(this.parent);
-        }
-    };
-    return SubscriptionDelaySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=delayWhen.js.map
+				Reflect.apply(self.oldEmit, this, [event, data, ...args]);
+			} else {
+				Reflect.apply(process.stdin.emit, this, [event, data, ...args]);
+			}
+		};
+	}
 
+	start() {
+		this.requests++;
 
-/***/ }),
-/* 448 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		if (this.requests === 1) {
+			this.realStart();
+		}
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return dematerialize; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	stop() {
+		if (this.requests <= 0) {
+			throw new Error('`stop` called more times than `start`');
+		}
 
+		this.requests--;
 
-function dematerialize() {
-    return function dematerializeOperatorFunction(source) {
-        return source.lift(new DeMaterializeOperator());
-    };
-}
-var DeMaterializeOperator = /*@__PURE__*/ (function () {
-    function DeMaterializeOperator() {
-    }
-    DeMaterializeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DeMaterializeSubscriber(subscriber));
-    };
-    return DeMaterializeOperator;
-}());
-var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DeMaterializeSubscriber, _super);
-    function DeMaterializeSubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    DeMaterializeSubscriber.prototype._next = function (value) {
-        value.observe(this.destination);
-    };
-    return DeMaterializeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=dematerialize.js.map
+		if (this.requests === 0) {
+			this.realStop();
+		}
+	}
 
+	realStart() {
+		// No known way to make it work reliably on Windows
+		if (process.platform === 'win32') {
+			return;
+		}
 
-/***/ }),
-/* 449 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		this.rl = readline.createInterface({
+			input: process.stdin,
+			output: this.mutedStream
+		});
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return distinct; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DistinctSubscriber", function() { return DistinctSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+		this.rl.on('SIGINT', () => {
+			if (process.listenerCount('SIGINT') === 0) {
+				process.emit('SIGINT');
+			} else {
+				this.rl.close();
+				process.kill(process.pid, 'SIGINT');
+			}
+		});
+	}
 
+	realStop() {
+		if (process.platform === 'win32') {
+			return;
+		}
 
-function distinct(keySelector, flushes) {
-    return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); };
+		this.rl.close();
+		this.rl = undefined;
+	}
 }
-var DistinctOperator = /*@__PURE__*/ (function () {
-    function DistinctOperator(keySelector, flushes) {
-        this.keySelector = keySelector;
-        this.flushes = flushes;
-    }
-    DistinctOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes));
-    };
-    return DistinctOperator;
-}());
-var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctSubscriber, _super);
-    function DistinctSubscriber(destination, keySelector, flushes) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.values = new Set();
-        if (flushes) {
-            _this.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(flushes, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](_this)));
-        }
-        return _this;
-    }
-    DistinctSubscriber.prototype.notifyNext = function () {
-        this.values.clear();
-    };
-    DistinctSubscriber.prototype.notifyError = function (error) {
-        this._error(error);
-    };
-    DistinctSubscriber.prototype._next = function (value) {
-        if (this.keySelector) {
-            this._useKeySelector(value);
-        }
-        else {
-            this._finalizeNext(value, value);
-        }
-    };
-    DistinctSubscriber.prototype._useKeySelector = function (value) {
-        var key;
-        var destination = this.destination;
-        try {
-            key = this.keySelector(value);
-        }
-        catch (err) {
-            destination.error(err);
-            return;
-        }
-        this._finalizeNext(key, value);
-    };
-    DistinctSubscriber.prototype._finalizeNext = function (key, value) {
-        var values = this.values;
-        if (!values.has(key)) {
-            values.add(key);
-            this.destination.next(value);
-        }
-    };
-    return DistinctSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-
-//# sourceMappingURL=distinct.js.map
 
+let stdinDiscarder;
 
-/***/ }),
-/* 450 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+class Ora {
+	constructor(options) {
+		if (!stdinDiscarder) {
+			stdinDiscarder = new StdinDiscarder();
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return distinctUntilChanged; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+		if (typeof options === 'string') {
+			options = {
+				text: options
+			};
+		}
 
+		this.options = {
+			text: '',
+			color: 'cyan',
+			stream: process.stderr,
+			discardStdin: true,
+			...options
+		};
 
-function distinctUntilChanged(compare, keySelector) {
-    return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); };
-}
-var DistinctUntilChangedOperator = /*@__PURE__*/ (function () {
-    function DistinctUntilChangedOperator(compare, keySelector) {
-        this.compare = compare;
-        this.keySelector = keySelector;
-    }
-    DistinctUntilChangedOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector));
-    };
-    return DistinctUntilChangedOperator;
-}());
-var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctUntilChangedSubscriber, _super);
-    function DistinctUntilChangedSubscriber(destination, compare, keySelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.hasKey = false;
-        if (typeof compare === 'function') {
-            _this.compare = compare;
-        }
-        return _this;
-    }
-    DistinctUntilChangedSubscriber.prototype.compare = function (x, y) {
-        return x === y;
-    };
-    DistinctUntilChangedSubscriber.prototype._next = function (value) {
-        var key;
-        try {
-            var keySelector = this.keySelector;
-            key = keySelector ? keySelector(value) : value;
-        }
-        catch (err) {
-            return this.destination.error(err);
-        }
-        var result = false;
-        if (this.hasKey) {
-            try {
-                var compare = this.compare;
-                result = compare(this.key, key);
-            }
-            catch (err) {
-                return this.destination.error(err);
-            }
-        }
-        else {
-            this.hasKey = true;
-        }
-        if (!result) {
-            this.key = key;
-            this.destination.next(value);
-        }
-    };
-    return DistinctUntilChangedSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=distinctUntilChanged.js.map
+		this.spinner = this.options.spinner;
 
+		this.color = this.options.color;
+		this.hideCursor = this.options.hideCursor !== false;
+		this.interval = this.options.interval || this.spinner.interval || 100;
+		this.stream = this.options.stream;
+		this.id = undefined;
+		this.isEnabled = typeof this.options.isEnabled === 'boolean' ? this.options.isEnabled : isInteractive({stream: this.stream});
 
-/***/ }),
-/* 451 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		// Set *after* `this.stream`
+		this.text = this.options.text;
+		this.prefixText = this.options.prefixText;
+		this.linesToClear = 0;
+		this.indent = this.options.indent;
+		this.discardStdin = this.options.discardStdin;
+		this.isDiscardingStdin = false;
+	}
 
-"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__(450);
-/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
+	get indent() {
+		return this._indent;
+	}
 
-function distinctUntilKeyChanged(key, compare) {
-    return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__["distinctUntilChanged"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
-}
-//# sourceMappingURL=distinctUntilKeyChanged.js.map
+	set indent(indent = 0) {
+		if (!(indent >= 0 && Number.isInteger(indent))) {
+			throw new Error('The `indent` option must be an integer from 0 and up');
+		}
 
+		this._indent = indent;
+	}
 
-/***/ }),
-/* 452 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	_updateInterval(interval) {
+		if (interval !== undefined) {
+			this.interval = interval;
+		}
+	}
 
-"use strict";
-__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__(63);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(453);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(444);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(454);
-/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
+	get spinner() {
+		return this._spinner;
+	}
 
+	set spinner(spinner) {
+		this.frameIndex = 0;
 
+		if (typeof spinner === 'object') {
+			if (spinner.frames === undefined) {
+				throw new Error('The given spinner must have a `frames` property');
+			}
 
+			this._spinner = spinner;
+		} else if (process.platform === 'win32') {
+			this._spinner = cliSpinners.line;
+		} else if (spinner === undefined) {
+			// Set default spinner
+			this._spinner = cliSpinners.dots;
+		} else if (cliSpinners[spinner]) {
+			this._spinner = cliSpinners[spinner];
+		} else {
+			throw new Error(`There is no built-in spinner named '${spinner}'. See https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json for a full list.`);
+		}
 
+		this._updateInterval(this._spinner.interval);
+	}
 
-function elementAt(index, defaultValue) {
-    if (index < 0) {
-        throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"]();
-    }
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) {
-        return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__["take"])(1), hasDefaultValue
-            ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue)
-            : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__["throwIfEmpty"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); }));
-    };
-}
-//# sourceMappingURL=elementAt.js.map
+	get text() {
+		return this[TEXT];
+	}
 
+	get prefixText() {
+		return this[PREFIX_TEXT];
+	}
 
-/***/ }),
-/* 453 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	get isSpinning() {
+		return this.id !== undefined;
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return throwIfEmpty; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(64);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_util_EmptyError,_Subscriber PURE_IMPORTS_END */
+	updateLineCount() {
+		const columns = this.stream.columns || 80;
+		const fullPrefixText = (typeof this[PREFIX_TEXT] === 'string') ? this[PREFIX_TEXT] + '-' : '';
+		this.lineCount = stripAnsi(fullPrefixText + '--' + this[TEXT]).split('\n').reduce((count, line) => {
+			return count + Math.max(1, Math.ceil(wcwidth(line) / columns));
+		}, 0);
+	}
 
+	set text(value) {
+		this[TEXT] = value;
+		this.updateLineCount();
+	}
 
+	set prefixText(value) {
+		this[PREFIX_TEXT] = value;
+		this.updateLineCount();
+	}
 
-function throwIfEmpty(errorFactory) {
-    if (errorFactory === void 0) {
-        errorFactory = defaultErrorFactory;
-    }
-    return function (source) {
-        return source.lift(new ThrowIfEmptyOperator(errorFactory));
-    };
-}
-var ThrowIfEmptyOperator = /*@__PURE__*/ (function () {
-    function ThrowIfEmptyOperator(errorFactory) {
-        this.errorFactory = errorFactory;
-    }
-    ThrowIfEmptyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory));
-    };
-    return ThrowIfEmptyOperator;
-}());
-var ThrowIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrowIfEmptySubscriber, _super);
-    function ThrowIfEmptySubscriber(destination, errorFactory) {
-        var _this = _super.call(this, destination) || this;
-        _this.errorFactory = errorFactory;
-        _this.hasValue = false;
-        return _this;
-    }
-    ThrowIfEmptySubscriber.prototype._next = function (value) {
-        this.hasValue = true;
-        this.destination.next(value);
-    };
-    ThrowIfEmptySubscriber.prototype._complete = function () {
-        if (!this.hasValue) {
-            var err = void 0;
-            try {
-                err = this.errorFactory();
-            }
-            catch (e) {
-                err = e;
-            }
-            this.destination.error(err);
-        }
-        else {
-            return this.destination.complete();
-        }
-    };
-    return ThrowIfEmptySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
-function defaultErrorFactory() {
-    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"]();
-}
-//# sourceMappingURL=throwIfEmpty.js.map
+	frame() {
+		const {frames} = this.spinner;
+		let frame = frames[this.frameIndex];
 
+		if (this.color) {
+			frame = chalk[this.color](frame);
+		}
 
-/***/ }),
-/* 454 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		this.frameIndex = ++this.frameIndex % frames.length;
+		const fullPrefixText = (typeof this.prefixText === 'string' && this.prefixText !== '') ? this.prefixText + ' ' : '';
+		const fullText = typeof this.text === 'string' ? ' ' + this.text : '';
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return take; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(63);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(44);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
+		return fullPrefixText + frame + fullText;
+	}
 
+	clear() {
+		if (!this.isEnabled || !this.stream.isTTY) {
+			return this;
+		}
 
+		for (let i = 0; i < this.linesToClear; i++) {
+			if (i > 0) {
+				this.stream.moveCursor(0, -1);
+			}
 
+			this.stream.clearLine();
+			this.stream.cursorTo(this.indent);
+		}
 
-function take(count) {
-    return function (source) {
-        if (count === 0) {
-            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])();
-        }
-        else {
-            return source.lift(new TakeOperator(count));
-        }
-    };
-}
-var TakeOperator = /*@__PURE__*/ (function () {
-    function TakeOperator(total) {
-        this.total = total;
-        if (this.total < 0) {
-            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
-        }
-    }
-    TakeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeSubscriber(subscriber, this.total));
-    };
-    return TakeOperator;
-}());
-var TakeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeSubscriber, _super);
-    function TakeSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.count = 0;
-        return _this;
-    }
-    TakeSubscriber.prototype._next = function (value) {
-        var total = this.total;
-        var count = ++this.count;
-        if (count <= total) {
-            this.destination.next(value);
-            if (count === total) {
-                this.destination.complete();
-                this.unsubscribe();
-            }
-        }
-    };
-    return TakeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=take.js.map
+		this.linesToClear = 0;
 
+		return this;
+	}
 
-/***/ }),
-/* 455 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	render() {
+		this.clear();
+		this.stream.write(this.frame());
+		this.linesToClear = this.lineCount;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return endWith; });
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80);
-/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(45);
-/** PURE_IMPORTS_START _observable_concat,_observable_of PURE_IMPORTS_END */
+		return this;
+	}
 
+	start(text) {
+		if (text) {
+			this.text = text;
+		}
 
-function endWith() {
-    var array = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        array[_i] = arguments[_i];
-    }
-    return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, array)); };
-}
-//# sourceMappingURL=endWith.js.map
+		if (!this.isEnabled) {
+			if (this.text) {
+				this.stream.write(`- ${this.text}\n`);
+			}
 
+			return this;
+		}
 
-/***/ }),
-/* 456 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		if (this.isSpinning) {
+			return this;
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return every; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+		if (this.hideCursor) {
+			cliCursor.hide(this.stream);
+		}
 
+		if (this.discardStdin && process.stdin.isTTY) {
+			this.isDiscardingStdin = true;
+			stdinDiscarder.start();
+		}
 
-function every(predicate, thisArg) {
-    return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); };
-}
-var EveryOperator = /*@__PURE__*/ (function () {
-    function EveryOperator(predicate, thisArg, source) {
-        this.predicate = predicate;
-        this.thisArg = thisArg;
-        this.source = source;
-    }
-    EveryOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source));
-    };
-    return EveryOperator;
-}());
-var EverySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](EverySubscriber, _super);
-    function EverySubscriber(destination, predicate, thisArg, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.thisArg = thisArg;
-        _this.source = source;
-        _this.index = 0;
-        _this.thisArg = thisArg || _this;
-        return _this;
-    }
-    EverySubscriber.prototype.notifyComplete = function (everyValueMatch) {
-        this.destination.next(everyValueMatch);
-        this.destination.complete();
-    };
-    EverySubscriber.prototype._next = function (value) {
-        var result = false;
-        try {
-            result = this.predicate.call(this.thisArg, value, this.index++, this.source);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (!result) {
-            this.notifyComplete(false);
-        }
-    };
-    EverySubscriber.prototype._complete = function () {
-        this.notifyComplete(true);
-    };
-    return EverySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=every.js.map
+		this.render();
+		this.id = setInterval(this.render.bind(this), this.interval);
 
+		return this;
+	}
 
-/***/ }),
-/* 457 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	stop() {
+		if (!this.isEnabled) {
+			return this;
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return exhaust; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+		clearInterval(this.id);
+		this.id = undefined;
+		this.frameIndex = 0;
+		this.clear();
+		if (this.hideCursor) {
+			cliCursor.show(this.stream);
+		}
 
+		if (this.discardStdin && process.stdin.isTTY && this.isDiscardingStdin) {
+			stdinDiscarder.stop();
+			this.isDiscardingStdin = false;
+		}
 
-function exhaust() {
-    return function (source) { return source.lift(new SwitchFirstOperator()); };
-}
-var SwitchFirstOperator = /*@__PURE__*/ (function () {
-    function SwitchFirstOperator() {
-    }
-    SwitchFirstOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SwitchFirstSubscriber(subscriber));
-    };
-    return SwitchFirstOperator;
-}());
-var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchFirstSubscriber, _super);
-    function SwitchFirstSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasCompleted = false;
-        _this.hasSubscription = false;
-        return _this;
-    }
-    SwitchFirstSubscriber.prototype._next = function (value) {
-        if (!this.hasSubscription) {
-            this.hasSubscription = true;
-            this.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(value, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this)));
-        }
-    };
-    SwitchFirstSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (!this.hasSubscription) {
-            this.destination.complete();
-        }
-    };
-    SwitchFirstSubscriber.prototype.notifyComplete = function () {
-        this.hasSubscription = false;
-        if (this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return SwitchFirstSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=exhaust.js.map
+		return this;
+	}
 
+	succeed(text) {
+		return this.stopAndPersist({symbol: logSymbols.success, text});
+	}
 
-/***/ }),
-/* 458 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	fail(text) {
+		return this.stopAndPersist({symbol: logSymbols.error, text});
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return exhaustMap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_map,_observable_from,_innerSubscribe PURE_IMPORTS_END */
+	warn(text) {
+		return this.stopAndPersist({symbol: logSymbols.warning, text});
+	}
 
+	info(text) {
+		return this.stopAndPersist({symbol: logSymbols.info, text});
+	}
 
+	stopAndPersist(options = {}) {
+		const prefixText = options.prefixText || this.prefixText;
+		const fullPrefixText = (typeof prefixText === 'string' && prefixText !== '') ? prefixText + ' ' : '';
+		const text = options.text || this.text;
+		const fullText = (typeof text === 'string') ? ' ' + text : '';
 
+		this.stop();
+		this.stream.write(`${fullPrefixText}${options.symbol || ' '}${fullText}\n`);
 
-function exhaustMap(project, resultSelector) {
-    if (resultSelector) {
-        return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
-    }
-    return function (source) {
-        return source.lift(new ExhaustMapOperator(project));
-    };
+		return this;
+	}
 }
-var ExhaustMapOperator = /*@__PURE__*/ (function () {
-    function ExhaustMapOperator(project) {
-        this.project = project;
-    }
-    ExhaustMapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project));
-    };
-    return ExhaustMapOperator;
-}());
-var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super);
-    function ExhaustMapSubscriber(destination, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.hasSubscription = false;
-        _this.hasCompleted = false;
-        _this.index = 0;
-        return _this;
-    }
-    ExhaustMapSubscriber.prototype._next = function (value) {
-        if (!this.hasSubscription) {
-            this.tryNext(value);
-        }
-    };
-    ExhaustMapSubscriber.prototype.tryNext = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.hasSubscription = true;
-        this._innerSub(result);
-    };
-    ExhaustMapSubscriber.prototype._innerSub = function (result) {
-        var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleInnerSubscriber"](this);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["innerSubscribe"])(result, innerSubscriber);
-        if (innerSubscription !== innerSubscriber) {
-            destination.add(innerSubscription);
-        }
-    };
-    ExhaustMapSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (!this.hasSubscription) {
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    ExhaustMapSubscriber.prototype.notifyNext = function (innerValue) {
-        this.destination.next(innerValue);
-    };
-    ExhaustMapSubscriber.prototype.notifyError = function (err) {
-        this.destination.error(err);
-    };
-    ExhaustMapSubscriber.prototype.notifyComplete = function () {
-        this.hasSubscription = false;
-        if (this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return ExhaustMapSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=exhaustMap.js.map
 
+const oraFactory = function (options) {
+	return new Ora(options);
+};
 
-/***/ }),
-/* 459 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return expand; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandOperator", function() { return ExpandOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandSubscriber", function() { return ExpandSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+module.exports = oraFactory;
 
+module.exports.promise = (action, options) => {
+	// eslint-disable-next-line promise/prefer-await-to-then
+	if (typeof action.then !== 'function') {
+		throw new TypeError('Parameter `action` must be a Promise');
+	}
 
-function expand(project, concurrent, scheduler) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent;
-    return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); };
-}
-var ExpandOperator = /*@__PURE__*/ (function () {
-    function ExpandOperator(project, concurrent, scheduler) {
-        this.project = project;
-        this.concurrent = concurrent;
-        this.scheduler = scheduler;
-    }
-    ExpandOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler));
-    };
-    return ExpandOperator;
-}());
+	const spinner = new Ora(options);
+	spinner.start();
 
-var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExpandSubscriber, _super);
-    function ExpandSubscriber(destination, project, concurrent, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.concurrent = concurrent;
-        _this.scheduler = scheduler;
-        _this.index = 0;
-        _this.active = 0;
-        _this.hasCompleted = false;
-        if (concurrent < Number.POSITIVE_INFINITY) {
-            _this.buffer = [];
-        }
-        return _this;
-    }
-    ExpandSubscriber.dispatch = function (arg) {
-        var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index;
-        subscriber.subscribeToProjection(result, value, index);
-    };
-    ExpandSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        if (destination.closed) {
-            this._complete();
-            return;
-        }
-        var index = this.index++;
-        if (this.active < this.concurrent) {
-            destination.next(value);
-            try {
-                var project = this.project;
-                var result = project(value, index);
-                if (!this.scheduler) {
-                    this.subscribeToProjection(result, value, index);
-                }
-                else {
-                    var state = { subscriber: this, result: result, value: value, index: index };
-                    var destination_1 = this.destination;
-                    destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state));
-                }
-            }
-            catch (e) {
-                destination.error(e);
-            }
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) {
-        this.active++;
-        var destination = this.destination;
-        destination.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(result, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this)));
-    };
-    ExpandSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (this.hasCompleted && this.active === 0) {
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    ExpandSubscriber.prototype.notifyNext = function (innerValue) {
-        this._next(innerValue);
-    };
-    ExpandSubscriber.prototype.notifyComplete = function () {
-        var buffer = this.buffer;
-        this.active--;
-        if (buffer && buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        if (this.hasCompleted && this.active === 0) {
-            this.destination.complete();
-        }
-    };
-    return ExpandSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
+	(async () => {
+		try {
+			await action;
+			spinner.succeed();
+		} catch (_) {
+			spinner.fail();
+		}
+	})();
 
-//# sourceMappingURL=expand.js.map
+	return spinner;
+};
 
 
 /***/ }),
-/* 460 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/chalk/source/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return finalize; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */
 
+const ansiStyles = __webpack_require__("../../node_modules/ansi-styles/index.js");
+const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__("../../node_modules/supports-color/index.js");
+const {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+} = __webpack_require__("../../node_modules/ora/node_modules/chalk/source/util.js");
 
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = [
+	'ansi',
+	'ansi',
+	'ansi256',
+	'ansi16m'
+];
 
-function finalize(callback) {
-    return function (source) { return source.lift(new FinallyOperator(callback)); };
-}
-var FinallyOperator = /*@__PURE__*/ (function () {
-    function FinallyOperator(callback) {
-        this.callback = callback;
-    }
-    FinallyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new FinallySubscriber(subscriber, this.callback));
-    };
-    return FinallyOperator;
-}());
-var FinallySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FinallySubscriber, _super);
-    function FinallySubscriber(destination, callback) {
-        var _this = _super.call(this, destination) || this;
-        _this.add(new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](callback));
-        return _this;
-    }
-    return FinallySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=finalize.js.map
+const styles = Object.create(null);
 
+const applyOptions = (object, options = {}) => {
+	if (options.level > 3 || options.level < 0) {
+		throw new Error('The `level` option should be an integer from 0 to 3');
+	}
 
-/***/ }),
-/* 461 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	// Detect level if not set manually
+	const colorLevel = stdoutColor ? stdoutColor.level : 0;
+	object.level = options.level === undefined ? colorLevel : options.level;
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return find; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueOperator", function() { return FindValueOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueSubscriber", function() { return FindValueSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+class ChalkClass {
+	constructor(options) {
+		return chalkFactory(options);
+	}
+}
 
+const chalkFactory = options => {
+	const chalk = {};
+	applyOptions(chalk, options);
 
-function find(predicate, thisArg) {
-    if (typeof predicate !== 'function') {
-        throw new TypeError('predicate is not a function');
-    }
-    return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); };
-}
-var FindValueOperator = /*@__PURE__*/ (function () {
-    function FindValueOperator(predicate, source, yieldIndex, thisArg) {
-        this.predicate = predicate;
-        this.source = source;
-        this.yieldIndex = yieldIndex;
-        this.thisArg = thisArg;
-    }
-    FindValueOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg));
-    };
-    return FindValueOperator;
-}());
+	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
 
-var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FindValueSubscriber, _super);
-    function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.yieldIndex = yieldIndex;
-        _this.thisArg = thisArg;
-        _this.index = 0;
-        return _this;
-    }
-    FindValueSubscriber.prototype.notifyComplete = function (value) {
-        var destination = this.destination;
-        destination.next(value);
-        destination.complete();
-        this.unsubscribe();
-    };
-    FindValueSubscriber.prototype._next = function (value) {
-        var _a = this, predicate = _a.predicate, thisArg = _a.thisArg;
-        var index = this.index++;
-        try {
-            var result = predicate.call(thisArg || this, value, index, this.source);
-            if (result) {
-                this.notifyComplete(this.yieldIndex ? index : value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    FindValueSubscriber.prototype._complete = function () {
-        this.notifyComplete(this.yieldIndex ? -1 : undefined);
-    };
-    return FindValueSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+	Object.setPrototypeOf(chalk, Chalk.prototype);
+	Object.setPrototypeOf(chalk.template, chalk);
 
-//# sourceMappingURL=find.js.map
+	chalk.template.constructor = () => {
+		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
+	};
 
+	chalk.template.Instance = ChalkClass;
 
-/***/ }),
-/* 462 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	return chalk.template;
+};
 
-"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__(461);
-/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
+function Chalk(options) {
+	return chalkFactory(options);
+}
 
-function findIndex(predicate, thisArg) {
-    return function (source) { return source.lift(new _operators_find__WEBPACK_IMPORTED_MODULE_0__["FindValueOperator"](predicate, source, true, thisArg)); };
+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;
+		}
+	};
 }
-//# sourceMappingURL=findIndex.js.map
 
+styles.visible = {
+	get() {
+		const builder = createBuilder(this, this._styler, true);
+		Object.defineProperty(this, 'visible', {value: builder});
+		return builder;
+	}
+};
 
-/***/ }),
-/* 463 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
 
-"use strict";
-__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__(64);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(454);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(444);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(453);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
-/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
+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);
+			};
+		}
+	};
+}
 
+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 proto = Object.defineProperties(() => {}, {
+	...styles,
+	level: {
+		enumerable: true,
+		get() {
+			return this._generator.level;
+		},
+		set(level) {
+			this._generator.level = level;
+		}
+	}
+});
 
+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;
+	}
 
+	return {
+		open,
+		close,
+		openAll,
+		closeAll,
+		parent
+	};
+};
 
+const createBuilder = (self, _styler, _isEmpty) => {
+	const 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(' '));
+	};
 
-function first(predicate, defaultValue) {
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_take__WEBPACK_IMPORTED_MODULE_2__["take"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); };
-}
-//# sourceMappingURL=first.js.map
+	// `__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
 
+	builder._generator = self;
+	builder._styler = _styler;
+	builder._isEmpty = _isEmpty;
 
-/***/ }),
-/* 464 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	return builder;
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return ignoreElements; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+const applyStyle = (self, string) => {
+	if (self.level <= 0 || !string) {
+		return self._isEmpty ? '' : string;
+	}
 
+	let styler = self._styler;
 
-function ignoreElements() {
-    return function ignoreElementsOperatorFunction(source) {
-        return source.lift(new IgnoreElementsOperator());
-    };
-}
-var IgnoreElementsOperator = /*@__PURE__*/ (function () {
-    function IgnoreElementsOperator() {
-    }
-    IgnoreElementsOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new IgnoreElementsSubscriber(subscriber));
-    };
-    return IgnoreElementsOperator;
-}());
-var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IgnoreElementsSubscriber, _super);
-    function IgnoreElementsSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    IgnoreElementsSubscriber.prototype._next = function (unused) {
-    };
-    return IgnoreElementsSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=ignoreElements.js.map
+	if (styler === undefined) {
+		return string;
+	}
 
+	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);
 
-/***/ }),
-/* 465 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+			styler = styler.parent;
+		}
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return isEmpty; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	// 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);
+	}
 
+	return openAll + string + closeAll;
+};
 
-function isEmpty() {
-    return function (source) { return source.lift(new IsEmptyOperator()); };
-}
-var IsEmptyOperator = /*@__PURE__*/ (function () {
-    function IsEmptyOperator() {
-    }
-    IsEmptyOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new IsEmptySubscriber(observer));
-    };
-    return IsEmptyOperator;
-}());
-var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IsEmptySubscriber, _super);
-    function IsEmptySubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) {
-        var destination = this.destination;
-        destination.next(isEmpty);
-        destination.complete();
-    };
-    IsEmptySubscriber.prototype._next = function (value) {
-        this.notifyComplete(false);
-    };
-    IsEmptySubscriber.prototype._complete = function () {
-        this.notifyComplete(true);
-    };
-    return IsEmptySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=isEmpty.js.map
+let template;
+const chalkTag = (chalk, ...strings) => {
+	const [firstString] = strings;
 
+	if (!Array.isArray(firstString)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return strings.join(' ');
+	}
 
-/***/ }),
-/* 466 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const arguments_ = strings.slice(1);
+	const parts = [firstString.raw[0]];
 
-"use strict";
-__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__(64);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(467);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(453);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(444);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
-/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
+	for (let i = 1; i < firstString.length; i++) {
+		parts.push(
+			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
+			String(firstString.raw[i])
+		);
+	}
 
+	if (template === undefined) {
+		template = __webpack_require__("../../node_modules/ora/node_modules/chalk/source/templates.js");
+	}
 
+	return template(chalk, parts.join(''));
+};
 
+Object.defineProperties(Chalk.prototype, styles);
 
+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;
 
+// For TypeScript
+chalk.Level = {
+	None: 0,
+	Basic: 1,
+	Ansi256: 2,
+	TrueColor: 3,
+	0: 'None',
+	1: 'Basic',
+	2: 'Ansi256',
+	3: 'TrueColor'
+};
 
-function last(predicate, defaultValue) {
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__["takeLast"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); };
-}
-//# sourceMappingURL=last.js.map
+module.exports = chalk;
 
 
 /***/ }),
-/* 467 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/chalk/source/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return takeLast; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(63);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(44);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
 
+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']
+]);
 
+function unescape(c) {
+	const u = c[0] === 'u';
+	const bracket = c[1] === '{';
 
-function takeLast(count) {
-    return function takeLastOperatorFunction(source) {
-        if (count === 0) {
-            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])();
-        }
-        else {
-            return source.lift(new TakeLastOperator(count));
-        }
-    };
-}
-var TakeLastOperator = /*@__PURE__*/ (function () {
-    function TakeLastOperator(total) {
-        this.total = total;
-        if (this.total < 0) {
-            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
-        }
-    }
-    TakeLastOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeLastSubscriber(subscriber, this.total));
-    };
-    return TakeLastOperator;
-}());
-var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeLastSubscriber, _super);
-    function TakeLastSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.ring = new Array();
-        _this.count = 0;
-        return _this;
-    }
-    TakeLastSubscriber.prototype._next = function (value) {
-        var ring = this.ring;
-        var total = this.total;
-        var count = this.count++;
-        if (ring.length < total) {
-            ring.push(value);
-        }
-        else {
-            var index = count % total;
-            ring[index] = value;
-        }
-    };
-    TakeLastSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        var count = this.count;
-        if (count > 0) {
-            var total = this.count >= this.total ? this.total : this.count;
-            var ring = this.ring;
-            for (var i = 0; i < total; i++) {
-                var idx = (count++) % total;
-                destination.next(ring[idx]);
-            }
-        }
-        destination.complete();
-    };
-    return TakeLastSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=takeLast.js.map
+	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
+	if (u && bracket) {
+		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
+	}
 
-/***/ }),
-/* 468 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	return ESCAPES.get(c) || c;
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return mapTo; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+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}')`);
+		}
+	}
 
-function mapTo(value) {
-    return function (source) { return source.lift(new MapToOperator(value)); };
+	return results;
 }
-var MapToOperator = /*@__PURE__*/ (function () {
-    function MapToOperator(value) {
-        this.value = value;
-    }
-    MapToOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MapToSubscriber(subscriber, this.value));
-    };
-    return MapToOperator;
-}());
-var MapToSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapToSubscriber, _super);
-    function MapToSubscriber(destination, value) {
-        var _this = _super.call(this, destination) || this;
-        _this.value = value;
-        return _this;
-    }
-    MapToSubscriber.prototype._next = function (x) {
-        this.destination.next(this.value);
-    };
-    return MapToSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=mapTo.js.map
 
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-/***/ }),
-/* 469 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return materialize; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(43);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
+	const results = [];
+	let matches;
 
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
-function materialize() {
-    return function materializeOperatorFunction(source) {
-        return source.lift(new MaterializeOperator());
-    };
+	return results;
 }
-var MaterializeOperator = /*@__PURE__*/ (function () {
-    function MaterializeOperator() {
-    }
-    MaterializeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MaterializeSubscriber(subscriber));
-    };
-    return MaterializeOperator;
-}());
-var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MaterializeSubscriber, _super);
-    function MaterializeSubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    MaterializeSubscriber.prototype._next = function (value) {
-        this.destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value));
-    };
-    MaterializeSubscriber.prototype._error = function (err) {
-        var destination = this.destination;
-        destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err));
-        destination.complete();
-    };
-    MaterializeSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete());
-        destination.complete();
-    };
-    return MaterializeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=materialize.js.map
 
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-/***/ }),
-/* 470 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-"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__(471);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+	let current = chalk;
+	for (const [styleName, styles] of Object.entries(enabled)) {
+		if (!Array.isArray(styles)) {
+			continue;
+		}
 
-function max(comparer) {
-    var max = (typeof comparer === 'function')
-        ? function (x, y) { return comparer(x, y) > 0 ? x : y; }
-        : function (x, y) { return x > y ? x : y; };
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(max);
-}
-//# sourceMappingURL=max.js.map
+		if (!(styleName in current)) {
+			throw new Error(`Unknown Chalk style: ${styleName}`);
+		}
+
+		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
+	}
 
+	return current;
+}
 
-/***/ }),
-/* 471 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = (chalk, temporary) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-"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__(472);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(467);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(444);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
-/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
+	// 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');
+			}
 
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(character);
+		}
+	});
 
+	chunks.push(chunk.join(''));
 
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-function reduce(accumulator, seed) {
-    if (arguments.length >= 2) {
-        return function reduceOperatorFunctionWithSeed(source) {
-            return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(accumulator, seed), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1), Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__["defaultIfEmpty"])(seed))(source);
-        };
-    }
-    return function reduceOperatorFunction(source) {
-        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source);
-    };
-}
-//# sourceMappingURL=reduce.js.map
+	return chunks.join('');
+};
 
 
 /***/ }),
-/* 472 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/chalk/source/util.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return scan; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
-function scan(accumulator, seed) {
-    var hasSeed = false;
-    if (arguments.length >= 2) {
-        hasSeed = true;
-    }
-    return function scanOperatorFunction(source) {
-        return source.lift(new ScanOperator(accumulator, seed, hasSeed));
-    };
-}
-var ScanOperator = /*@__PURE__*/ (function () {
-    function ScanOperator(accumulator, seed, hasSeed) {
-        if (hasSeed === void 0) {
-            hasSeed = false;
-        }
-        this.accumulator = accumulator;
-        this.seed = seed;
-        this.hasSeed = hasSeed;
-    }
-    ScanOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed));
-    };
-    return ScanOperator;
-}());
-var ScanSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ScanSubscriber, _super);
-    function ScanSubscriber(destination, accumulator, _seed, hasSeed) {
-        var _this = _super.call(this, destination) || this;
-        _this.accumulator = accumulator;
-        _this._seed = _seed;
-        _this.hasSeed = hasSeed;
-        _this.index = 0;
-        return _this;
-    }
-    Object.defineProperty(ScanSubscriber.prototype, "seed", {
-        get: function () {
-            return this._seed;
-        },
-        set: function (value) {
-            this.hasSeed = true;
-            this._seed = value;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    ScanSubscriber.prototype._next = function (value) {
-        if (!this.hasSeed) {
-            this.seed = value;
-            this.destination.next(value);
-        }
-        else {
-            return this._tryNext(value);
-        }
-    };
-    ScanSubscriber.prototype._tryNext = function (value) {
-        var index = this.index++;
-        var result;
-        try {
-            result = this.accumulator(this.seed, value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-        this.seed = result;
-        this.destination.next(result);
-    };
-    return ScanSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=scan.js.map
+const stringReplaceAll = (string, substring, replacer) => {
+	let index = string.indexOf(substring);
+	if (index === -1) {
+		return string;
+	}
 
+	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);
 
-/***/ }),
-/* 473 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; });
-/* harmony import */ var _observable_merge__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(100);
-/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */
+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);
 
-function merge() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function (source) { return source.lift.call(_observable_merge__WEBPACK_IMPORTED_MODULE_0__["merge"].apply(void 0, [source].concat(observables))); };
-}
-//# sourceMappingURL=merge.js.map
+	returnValue += string.substr(endIndex);
+	return returnValue;
+};
+
+module.exports = {
+	stringReplaceAll,
+	stringEncaseCRLFWithFirstIndex
+};
 
 
 /***/ }),
-/* 474 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/has-flag/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return mergeMapTo; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(83);
-/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
 
-function mergeMapTo(innerObservable, resultSelector, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (typeof resultSelector === 'function') {
-        return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, resultSelector, concurrent);
-    }
-    if (typeof resultSelector === 'number') {
-        concurrent = resultSelector;
-    }
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, concurrent);
-}
-//# sourceMappingURL=mergeMapTo.js.map
+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);
+};
 
 
 /***/ }),
-/* 475 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/log-symbols/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return mergeScan; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanOperator", function() { return MergeScanOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanSubscriber", function() { return MergeScanSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
 
+const chalk = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/index.js");
 
-function mergeScan(accumulator, seed, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); };
-}
-var MergeScanOperator = /*@__PURE__*/ (function () {
-    function MergeScanOperator(accumulator, seed, concurrent) {
-        this.accumulator = accumulator;
-        this.seed = seed;
-        this.concurrent = concurrent;
-    }
-    MergeScanOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent));
-    };
-    return MergeScanOperator;
-}());
+const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
-var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeScanSubscriber, _super);
-    function MergeScanSubscriber(destination, accumulator, acc, concurrent) {
-        var _this = _super.call(this, destination) || this;
-        _this.accumulator = accumulator;
-        _this.acc = acc;
-        _this.concurrent = concurrent;
-        _this.hasValue = false;
-        _this.hasCompleted = false;
-        _this.buffer = [];
-        _this.active = 0;
-        _this.index = 0;
-        return _this;
-    }
-    MergeScanSubscriber.prototype._next = function (value) {
-        if (this.active < this.concurrent) {
-            var index = this.index++;
-            var destination = this.destination;
-            var ish = void 0;
-            try {
-                var accumulator = this.accumulator;
-                ish = accumulator(this.acc, value, index);
-            }
-            catch (e) {
-                return destination.error(e);
-            }
-            this.active++;
-            this._innerSub(ish);
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    MergeScanSubscriber.prototype._innerSub = function (ish) {
-        var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(ish, innerSubscriber);
-        if (innerSubscription !== innerSubscriber) {
-            destination.add(innerSubscription);
-        }
-    };
-    MergeScanSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (this.active === 0 && this.buffer.length === 0) {
-            if (this.hasValue === false) {
-                this.destination.next(this.acc);
-            }
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    MergeScanSubscriber.prototype.notifyNext = function (innerValue) {
-        var destination = this.destination;
-        this.acc = innerValue;
-        this.hasValue = true;
-        destination.next(innerValue);
-    };
-    MergeScanSubscriber.prototype.notifyComplete = function () {
-        var buffer = this.buffer;
-        this.active--;
-        if (buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        else if (this.active === 0 && this.hasCompleted) {
-            if (this.hasValue === false) {
-                this.destination.next(this.acc);
-            }
-            this.destination.complete();
-        }
-    };
-    return MergeScanSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
+const main = {
+	info: chalk.blue('ℹ'),
+	success: chalk.green('✔'),
+	warning: chalk.yellow('⚠'),
+	error: chalk.red('✖')
+};
 
-//# sourceMappingURL=mergeScan.js.map
+const fallbacks = {
+	info: chalk.blue('i'),
+	success: chalk.green('√'),
+	warning: chalk.yellow('‼'),
+	error: chalk.red('×')
+};
+
+module.exports = isSupported ? main : fallbacks;
 
 
 /***/ }),
-/* 476 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/ansi-styles/index.js":
+/***/ (function(module, 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__(471);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__("../../node_modules/color-convert/index.js");
 
-function min(comparer) {
-    var min = (typeof comparer === 'function')
-        ? function (x, y) { return comparer(x, y) < 0 ? x : y; }
-        : function (x, y) { return x < y ? x : y; };
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(min);
-}
-//# sourceMappingURL=min.js.map
+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`;
+};
 
-/***/ }),
-/* 477 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const wrapAnsi16m = (fn, offset) => function () {
+	const rgb = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return multicast; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MulticastOperator", function() { return MulticastOperator; });
-/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
-/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */
+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],
 
-function multicast(subjectOrSubjectFactory, selector) {
-    return function multicastOperatorFunction(source) {
-        var subjectFactory;
-        if (typeof subjectOrSubjectFactory === 'function') {
-            subjectFactory = subjectOrSubjectFactory;
-        }
-        else {
-            subjectFactory = function subjectFactory() {
-                return subjectOrSubjectFactory;
-            };
-        }
-        if (typeof selector === 'function') {
-            return source.lift(new MulticastOperator(subjectFactory, selector));
-        }
-        var connectable = Object.create(source, _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__["connectableObservableDescriptor"]);
-        connectable.source = source;
-        connectable.subjectFactory = subjectFactory;
-        return connectable;
-    };
-}
-var MulticastOperator = /*@__PURE__*/ (function () {
-    function MulticastOperator(subjectFactory, selector) {
-        this.subjectFactory = subjectFactory;
-        this.selector = selector;
-    }
-    MulticastOperator.prototype.call = function (subscriber, source) {
-        var selector = this.selector;
-        var subject = this.subjectFactory();
-        var subscription = selector(subject).subscribe(subscriber);
-        subscription.add(source.subscribe(subject));
-        return subscription;
-    };
-    return MulticastOperator;
-}());
+			// 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],
+
+			// 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]
+		}
+	};
 
-//# sourceMappingURL=multicast.js.map
+	// Fix humans
+	styles.color.grey = styles.color.gray;
 
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
 
-/***/ }),
-/* 478 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNextStatic", function() { return onErrorResumeNextStatic; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(84);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_innerSubscribe PURE_IMPORTS_END */
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
+			group[styleName] = styles[styleName];
 
+			codes.set(style[0], style[1]);
+		}
 
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
 
-function onErrorResumeNext() {
-    var nextSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        nextSources[_i] = arguments[_i];
-    }
-    if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) {
-        nextSources = nextSources[0];
-    }
-    return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); };
-}
-function onErrorResumeNextStatic() {
-    var nextSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        nextSources[_i] = arguments[_i];
-    }
-    var source = undefined;
-    if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) {
-        nextSources = nextSources[0];
-    }
-    source = nextSources.shift();
-    return Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(source).lift(new OnErrorResumeNextOperator(nextSources));
-}
-var OnErrorResumeNextOperator = /*@__PURE__*/ (function () {
-    function OnErrorResumeNextOperator(nextSources) {
-        this.nextSources = nextSources;
-    }
-    OnErrorResumeNextOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources));
-    };
-    return OnErrorResumeNextOperator;
-}());
-var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OnErrorResumeNextSubscriber, _super);
-    function OnErrorResumeNextSubscriber(destination, nextSources) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.nextSources = nextSources;
-        return _this;
-    }
-    OnErrorResumeNextSubscriber.prototype.notifyError = function () {
-        this.subscribeToNextSource();
-    };
-    OnErrorResumeNextSubscriber.prototype.notifyComplete = function () {
-        this.subscribeToNextSource();
-    };
-    OnErrorResumeNextSubscriber.prototype._error = function (err) {
-        this.subscribeToNextSource();
-        this.unsubscribe();
-    };
-    OnErrorResumeNextSubscriber.prototype._complete = function () {
-        this.subscribeToNextSource();
-        this.unsubscribe();
-    };
-    OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () {
-        var next = this.nextSources.shift();
-        if (!!next) {
-            var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleInnerSubscriber"](this);
-            var destination = this.destination;
-            destination.add(innerSubscriber);
-            var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["innerSubscribe"])(next, innerSubscriber);
-            if (innerSubscription !== innerSubscriber) {
-                destination.add(innerSubscription);
-            }
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    return OnErrorResumeNextSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=onErrorResumeNext.js.map
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
 
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
 
-/***/ }),
-/* 479 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return pairwise; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
 
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
 
-function pairwise() {
-    return function (source) { return source.lift(new PairwiseOperator()); };
-}
-var PairwiseOperator = /*@__PURE__*/ (function () {
-    function PairwiseOperator() {
-    }
-    PairwiseOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new PairwiseSubscriber(subscriber));
-    };
-    return PairwiseOperator;
-}());
-var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](PairwiseSubscriber, _super);
-    function PairwiseSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasPrev = false;
-        return _this;
-    }
-    PairwiseSubscriber.prototype._next = function (value) {
-        var pair;
-        if (this.hasPrev) {
-            pair = [this.prev, value];
-        }
-        else {
-            this.hasPrev = true;
-        }
-        this.prev = value;
-        if (pair) {
-            this.destination.next(pair);
-        }
-    };
-    return PairwiseSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=pairwise.js.map
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
 
+		const suite = colorConvert[key];
 
-/***/ }),
-/* 480 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; });
-/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(105);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
 
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
 
-function partition(predicate, thisArg) {
-    return function (source) {
-        return [
-            Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(predicate, thisArg)(source),
-            Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(source)
-        ];
-    };
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
+
+	return styles;
 }
-//# sourceMappingURL=partition.js.map
 
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
 /***/ }),
-/* 481 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return pluck; });
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(67);
-/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function pluck() {
-    var properties = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        properties[_i] = arguments[_i];
-    }
-    var length = properties.length;
-    if (length === 0) {
-        throw new Error('list of properties cannot be empty.');
-    }
-    return function (source) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(plucker(properties, length))(source); };
-}
-function plucker(props, length) {
-    var mapper = function (x) {
-        var currentProp = x;
-        for (var i = 0; i < length; i++) {
-            var p = currentProp != null ? currentProp[props[i]] : undefined;
-            if (p !== void 0) {
-                currentProp = p;
-            }
-            else {
-                return undefined;
-            }
-        }
-        return currentProp;
-    };
-    return mapper;
-}
-//# sourceMappingURL=pluck.js.map
+"use strict";
 
+const escapeStringRegexp = __webpack_require__("../../node_modules/escape-string-regexp/index.js");
+const ansiStyles = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/ansi-styles/index.js");
+const stdoutColor = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/supports-color/index.js").stdout;
 
-/***/ }),
-/* 482 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const template = __webpack_require__("../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/templates.js");
 
-"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__(28);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(477);
-/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-function publish(selector) {
-    return selector ?
-        Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); }, selector) :
-        Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]());
-}
-//# sourceMappingURL=publish.js.map
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
 
+const styles = Object.create(null);
 
-/***/ }),
-/* 483 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function applyOptions(obj, options) {
+	options = options || {};
 
-"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__(33);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(477);
-/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
+	// 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;
+}
 
+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);
 
-function publishBehavior(value) {
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__["BehaviorSubject"](value))(source); };
-}
-//# sourceMappingURL=publishBehavior.js.map
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
 
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
 
-/***/ }),
-/* 484 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		chalk.template.constructor = Chalk;
 
-"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__(51);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(477);
-/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
+		return chalk.template;
+	}
 
+	applyOptions(this, options);
+}
 
-function publishLast() {
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__["AsyncSubject"]())(source); };
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
 }
-//# sourceMappingURL=publishLast.js.map
 
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
 
-/***/ }),
-/* 485 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
+}
 
-"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__(34);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(477);
-/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
 
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
-    if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') {
-        scheduler = selectorOrScheduler;
-    }
-    var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined;
-    var subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler);
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return subject; }, selector)(source); };
+	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);
+			};
+		}
+	};
 }
-//# sourceMappingURL=publishReplay.js.map
 
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-/***/ }),
-/* 486 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	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);
+			};
+		}
+	};
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; });
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
-/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(107);
-/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */
+const proto = Object.defineProperties(() => {}, styles);
 
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
 
-function race() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function raceOperatorFunction(source) {
-        if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) {
-            observables = observables[0];
-        }
-        return source.lift.call(_observable_race__WEBPACK_IMPORTED_MODULE_1__["race"].apply(void 0, [source].concat(observables)));
-    };
-}
-//# sourceMappingURL=race.js.map
+	builder._styles = _styles;
+	builder._empty = _empty;
 
+	const self = this;
 
-/***/ }),
-/* 487 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return repeat; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44);
-/** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */
+	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';
 
+	// `__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
 
-function repeat(count) {
-    if (count === void 0) {
-        count = -1;
-    }
-    return function (source) {
-        if (count === 0) {
-            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])();
-        }
-        else if (count < 0) {
-            return source.lift(new RepeatOperator(-1, source));
-        }
-        else {
-            return source.lift(new RepeatOperator(count - 1, source));
-        }
-    };
+	return builder;
 }
-var RepeatOperator = /*@__PURE__*/ (function () {
-    function RepeatOperator(count, source) {
-        this.count = count;
-        this.source = source;
-    }
-    RepeatOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source));
-    };
-    return RepeatOperator;
-}());
-var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatSubscriber, _super);
-    function RepeatSubscriber(destination, count, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.count = count;
-        _this.source = source;
-        return _this;
-    }
-    RepeatSubscriber.prototype.complete = function () {
-        if (!this.isStopped) {
-            var _a = this, source = _a.source, count = _a.count;
-            if (count === 0) {
-                return _super.prototype.complete.call(this);
-            }
-            else if (count > -1) {
-                this.count = count - 1;
-            }
-            source.subscribe(this._unsubscribeAndRecycle());
-        }
-    };
-    return RepeatSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=repeat.js.map
 
+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]);
 
-/***/ }),
-/* 488 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (argsLen === 0) {
+		return '';
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return repeatWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_Subject,_innerSubscribe PURE_IMPORTS_END */
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
 
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
 
+	// 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 = '';
+	}
 
-function repeatWhen(notifier) {
-    return function (source) { return source.lift(new RepeatWhenOperator(notifier)); };
-}
-var RepeatWhenOperator = /*@__PURE__*/ (function () {
-    function RepeatWhenOperator(notifier) {
-        this.notifier = notifier;
-    }
-    RepeatWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source));
-    };
-    return RepeatWhenOperator;
-}());
-var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatWhenSubscriber, _super);
-    function RepeatWhenSubscriber(destination, notifier, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.notifier = notifier;
-        _this.source = source;
-        _this.sourceIsBeingSubscribedTo = true;
-        return _this;
-    }
-    RepeatWhenSubscriber.prototype.notifyNext = function () {
-        this.sourceIsBeingSubscribedTo = true;
-        this.source.subscribe(this);
-    };
-    RepeatWhenSubscriber.prototype.notifyComplete = function () {
-        if (this.sourceIsBeingSubscribedTo === false) {
-            return _super.prototype.complete.call(this);
-        }
-    };
-    RepeatWhenSubscriber.prototype.complete = function () {
-        this.sourceIsBeingSubscribedTo = false;
-        if (!this.isStopped) {
-            if (!this.retries) {
-                this.subscribeToRetries();
-            }
-            if (!this.retriesSubscription || this.retriesSubscription.closed) {
-                return _super.prototype.complete.call(this);
-            }
-            this._unsubscribeAndRecycle();
-            this.notifications.next(undefined);
-        }
-    };
-    RepeatWhenSubscriber.prototype._unsubscribe = function () {
-        var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription;
-        if (notifications) {
-            notifications.unsubscribe();
-            this.notifications = undefined;
-        }
-        if (retriesSubscription) {
-            retriesSubscription.unsubscribe();
-            this.retriesSubscription = undefined;
-        }
-        this.retries = undefined;
-    };
-    RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () {
-        var _unsubscribe = this._unsubscribe;
-        this._unsubscribe = null;
-        _super.prototype._unsubscribeAndRecycle.call(this);
-        this._unsubscribe = _unsubscribe;
-        return this;
-    };
-    RepeatWhenSubscriber.prototype.subscribeToRetries = function () {
-        this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        var retries;
-        try {
-            var notifier = this.notifier;
-            retries = notifier(this.notifications);
-        }
-        catch (e) {
-            return _super.prototype.complete.call(this);
-        }
-        this.retries = retries;
-        this.retriesSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["innerSubscribe"])(retries, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleInnerSubscriber"](this));
-    };
-    return RepeatWhenSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=repeatWhen.js.map
+	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;
 
+		// 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}`);
+	}
 
-/***/ }),
-/* 489 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return retry; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	return str;
+}
+
+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(' ');
+	}
 
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
 
-function retry(count) {
-    if (count === void 0) {
-        count = -1;
-    }
-    return function (source) { return source.lift(new RetryOperator(count, source)); };
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
+
+	return template(chalk, parts.join(''));
 }
-var RetryOperator = /*@__PURE__*/ (function () {
-    function RetryOperator(count, source) {
-        this.count = count;
-        this.source = source;
-    }
-    RetryOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source));
-    };
-    return RetryOperator;
-}());
-var RetrySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetrySubscriber, _super);
-    function RetrySubscriber(destination, count, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.count = count;
-        _this.source = source;
-        return _this;
-    }
-    RetrySubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var _a = this, source = _a.source, count = _a.count;
-            if (count === 0) {
-                return _super.prototype.error.call(this, err);
-            }
-            else if (count > -1) {
-                this.count = count - 1;
-            }
-            source.subscribe(this._unsubscribeAndRecycle());
-        }
-    };
-    return RetrySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=retry.js.map
+
+Object.defineProperties(Chalk.prototype, styles);
+
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 490 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/chalk/templates.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return retryWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_Subject,_innerSubscribe PURE_IMPORTS_END */
 
+const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|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}|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']
+]);
 
+function unescape(c) {
+	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-function retryWhen(notifier) {
-    return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); };
+	return ESCAPES.get(c) || c;
 }
-var RetryWhenOperator = /*@__PURE__*/ (function () {
-    function RetryWhenOperator(notifier, source) {
-        this.notifier = notifier;
-        this.source = source;
-    }
-    RetryWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
-    };
-    return RetryWhenOperator;
-}());
-var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetryWhenSubscriber, _super);
-    function RetryWhenSubscriber(destination, notifier, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.notifier = notifier;
-        _this.source = source;
-        return _this;
-    }
-    RetryWhenSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var errors = this.errors;
-            var retries = this.retries;
-            var retriesSubscription = this.retriesSubscription;
-            if (!retries) {
-                errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-                try {
-                    var notifier = this.notifier;
-                    retries = notifier(errors);
-                }
-                catch (e) {
-                    return _super.prototype.error.call(this, e);
-                }
-                retriesSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["innerSubscribe"])(retries, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleInnerSubscriber"](this));
-            }
-            else {
-                this.errors = undefined;
-                this.retriesSubscription = undefined;
-            }
-            this._unsubscribeAndRecycle();
-            this.errors = errors;
-            this.retries = retries;
-            this.retriesSubscription = retriesSubscription;
-            errors.next(err);
-        }
-    };
-    RetryWhenSubscriber.prototype._unsubscribe = function () {
-        var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription;
-        if (errors) {
-            errors.unsubscribe();
-            this.errors = undefined;
-        }
-        if (retriesSubscription) {
-            retriesSubscription.unsubscribe();
-            this.retriesSubscription = undefined;
-        }
-        this.retries = undefined;
-    };
-    RetryWhenSubscriber.prototype.notifyNext = function () {
-        var _unsubscribe = this._unsubscribe;
-        this._unsubscribe = null;
-        this._unsubscribeAndRecycle();
-        this._unsubscribe = _unsubscribe;
-        this.source.subscribe(this);
-    };
-    return RetryWhenSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=retryWhen.js.map
 
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
+
+	for (const chunk of chunks) {
+		if (!isNaN(chunk)) {
+			results.push(Number(chunk));
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
+
+	return results;
+}
 
-/***/ }),
-/* 491 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return sample; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+	const results = [];
+	let matches;
 
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-function sample(notifier) {
-    return function (source) { return source.lift(new SampleOperator(notifier)); };
-}
-var SampleOperator = /*@__PURE__*/ (function () {
-    function SampleOperator(notifier) {
-        this.notifier = notifier;
-    }
-    SampleOperator.prototype.call = function (subscriber, source) {
-        var sampleSubscriber = new SampleSubscriber(subscriber);
-        var subscription = source.subscribe(sampleSubscriber);
-        subscription.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(this.notifier, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](sampleSubscriber)));
-        return subscription;
-    };
-    return SampleOperator;
-}());
-var SampleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleSubscriber, _super);
-    function SampleSubscriber() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.hasValue = false;
-        return _this;
-    }
-    SampleSubscriber.prototype._next = function (value) {
-        this.value = value;
-        this.hasValue = true;
-    };
-    SampleSubscriber.prototype.notifyNext = function () {
-        this.emitValue();
-    };
-    SampleSubscriber.prototype.notifyComplete = function () {
-        this.emitValue();
-    };
-    SampleSubscriber.prototype.emitValue = function () {
-        if (this.hasValue) {
-            this.hasValue = false;
-            this.destination.next(this.value);
-        }
-    };
-    return SampleSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=sample.js.map
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
 
+	return results;
+}
 
-/***/ }),
-/* 492 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return sampleTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(56);
-/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
+	let current = chalk;
+	for (const styleName of Object.keys(enabled)) {
+		if (Array.isArray(enabled[styleName])) {
+			if (!(styleName in current)) {
+				throw new Error(`Unknown Chalk style: ${styleName}`);
+			}
 
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
 
-function sampleTime(period, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    }
-    return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); };
-}
-var SampleTimeOperator = /*@__PURE__*/ (function () {
-    function SampleTimeOperator(period, scheduler) {
-        this.period = period;
-        this.scheduler = scheduler;
-    }
-    SampleTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler));
-    };
-    return SampleTimeOperator;
-}());
-var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleTimeSubscriber, _super);
-    function SampleTimeSubscriber(destination, period, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.period = period;
-        _this.scheduler = scheduler;
-        _this.hasValue = false;
-        _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period }));
-        return _this;
-    }
-    SampleTimeSubscriber.prototype._next = function (value) {
-        this.lastValue = value;
-        this.hasValue = true;
-    };
-    SampleTimeSubscriber.prototype.notifyNext = function () {
-        if (this.hasValue) {
-            this.hasValue = false;
-            this.destination.next(this.lastValue);
-        }
-    };
-    return SampleTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-function dispatchNotification(state) {
-    var subscriber = state.subscriber, period = state.period;
-    subscriber.notifyNext();
-    this.schedule(state, period);
+	return current;
 }
-//# sourceMappingURL=sampleTime.js.map
 
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
 
-/***/ }),
-/* 493 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return sequenceEqual; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualOperator", function() { return SequenceEqualOperator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualSubscriber", function() { return SequenceEqualSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	// eslint-disable-next-line max-params
+	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
+		if (escapeChar) {
+			chunk.push(unescape(escapeChar));
+		} else if (style) {
+			const str = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
 
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
 
-function sequenceEqual(compareTo, comparator) {
-    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); };
-}
-var SequenceEqualOperator = /*@__PURE__*/ (function () {
-    function SequenceEqualOperator(compareTo, comparator) {
-        this.compareTo = compareTo;
-        this.comparator = comparator;
-    }
-    SequenceEqualOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparator));
-    };
-    return SequenceEqualOperator;
-}());
+	chunks.push(chunk.join(''));
 
-var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualSubscriber, _super);
-    function SequenceEqualSubscriber(destination, compareTo, comparator) {
-        var _this = _super.call(this, destination) || this;
-        _this.compareTo = compareTo;
-        _this.comparator = comparator;
-        _this._a = [];
-        _this._b = [];
-        _this._oneComplete = false;
-        _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
-        return _this;
-    }
-    SequenceEqualSubscriber.prototype._next = function (value) {
-        if (this._oneComplete && this._b.length === 0) {
-            this.emit(false);
-        }
-        else {
-            this._a.push(value);
-            this.checkValues();
-        }
-    };
-    SequenceEqualSubscriber.prototype._complete = function () {
-        if (this._oneComplete) {
-            this.emit(this._a.length === 0 && this._b.length === 0);
-        }
-        else {
-            this._oneComplete = true;
-        }
-        this.unsubscribe();
-    };
-    SequenceEqualSubscriber.prototype.checkValues = function () {
-        var _c = this, _a = _c._a, _b = _c._b, comparator = _c.comparator;
-        while (_a.length > 0 && _b.length > 0) {
-            var a = _a.shift();
-            var b = _b.shift();
-            var areEqual = false;
-            try {
-                areEqual = comparator ? comparator(a, b) : a === b;
-            }
-            catch (e) {
-                this.destination.error(e);
-            }
-            if (!areEqual) {
-                this.emit(false);
-            }
-        }
-    };
-    SequenceEqualSubscriber.prototype.emit = function (value) {
-        var destination = this.destination;
-        destination.next(value);
-        destination.complete();
-    };
-    SequenceEqualSubscriber.prototype.nextB = function (value) {
-        if (this._oneComplete && this._a.length === 0) {
-            this.emit(false);
-        }
-        else {
-            this._b.push(value);
-            this.checkValues();
-        }
-    };
-    SequenceEqualSubscriber.prototype.completeB = function () {
-        if (this._oneComplete) {
-            this.emit(this._a.length === 0 && this._b.length === 0);
-        }
-        else {
-            this._oneComplete = true;
-        }
-    };
-    return SequenceEqualSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualCompareToSubscriber, _super);
-    function SequenceEqualCompareToSubscriber(destination, parent) {
-        var _this = _super.call(this, destination) || this;
-        _this.parent = parent;
-        return _this;
-    }
-    SequenceEqualCompareToSubscriber.prototype._next = function (value) {
-        this.parent.nextB(value);
-    };
-    SequenceEqualCompareToSubscriber.prototype._error = function (err) {
-        this.parent.error(err);
-        this.unsubscribe();
-    };
-    SequenceEqualCompareToSubscriber.prototype._complete = function () {
-        this.parent.completeB();
-        this.unsubscribe();
-    };
-    return SequenceEqualCompareToSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=sequenceEqual.js.map
+	return chunks.join('');
+};
 
 
 /***/ }),
-/* 494 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/ora/node_modules/log-symbols/node_modules/supports-color/index.js":
+/***/ (function(module, 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__(477);
-/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28);
-/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
 
+const os = __webpack_require__("os");
+const hasFlag = __webpack_require__("../../node_modules/ora/node_modules/has-flag/index.js");
 
+const env = process.env;
 
-function shareSubjectFactory() {
-    return new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]();
+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;
 }
-function share() {
-    return function (source) { return Object(_refCount__WEBPACK_IMPORTED_MODULE_1__["refCount"])()(Object(_multicast__WEBPACK_IMPORTED_MODULE_0__["multicast"])(shareSubjectFactory)(source)); };
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
 }
-//# sourceMappingURL=share.js.map
 
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
-/***/ }),
-/* 495 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return shareReplay; });
-/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(34);
-/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
 
-function shareReplay(configOrBufferSize, windowTime, scheduler) {
-    var config;
-    if (configOrBufferSize && typeof configOrBufferSize === 'object') {
-        config = configOrBufferSize;
-    }
-    else {
-        config = {
-            bufferSize: configOrBufferSize,
-            windowTime: windowTime,
-            refCount: false,
-            scheduler: scheduler
-        };
-    }
-    return function (source) { return source.lift(shareReplayOperator(config)); };
-}
-function shareReplayOperator(_a) {
-    var _b = _a.bufferSize, bufferSize = _b === void 0 ? Number.POSITIVE_INFINITY : _b, _c = _a.windowTime, windowTime = _c === void 0 ? Number.POSITIVE_INFINITY : _c, useRefCount = _a.refCount, scheduler = _a.scheduler;
-    var subject;
-    var refCount = 0;
-    var subscription;
-    var hasError = false;
-    var isComplete = false;
-    return function shareReplayOperation(source) {
-        refCount++;
-        var innerSub;
-        if (!subject || hasError) {
-            hasError = false;
-            subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler);
-            innerSub = subject.subscribe(this);
-            subscription = source.subscribe({
-                next: function (value) { subject.next(value); },
-                error: function (err) {
-                    hasError = true;
-                    subject.error(err);
-                },
-                complete: function () {
-                    isComplete = true;
-                    subscription = undefined;
-                    subject.complete();
-                },
-            });
-        }
-        else {
-            innerSub = subject.subscribe(this);
-        }
-        this.add(function () {
-            refCount--;
-            innerSub.unsubscribe();
-            if (subscription && !isComplete && useRefCount && refCount === 0) {
-                subscription.unsubscribe();
-                subscription = undefined;
-                subject = undefined;
-            }
-        });
-    };
-}
-//# sourceMappingURL=shareReplay.js.map
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-/***/ }),
-/* 496 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (stream && !stream.isTTY && forceColor !== true) {
+		return 0;
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return single; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(64);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */
+	const min = forceColor ? 1 : 0;
 
+	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;
+		}
 
+		return 1;
+	}
 
-function single(predicate) {
-    return function (source) { return source.lift(new SingleOperator(predicate, source)); };
-}
-var SingleOperator = /*@__PURE__*/ (function () {
-    function SingleOperator(predicate, source) {
-        this.predicate = predicate;
-        this.source = source;
-    }
-    SingleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source));
-    };
-    return SingleOperator;
-}());
-var SingleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SingleSubscriber, _super);
-    function SingleSubscriber(destination, predicate, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.seenValue = false;
-        _this.index = 0;
-        return _this;
-    }
-    SingleSubscriber.prototype.applySingleValue = function (value) {
-        if (this.seenValue) {
-            this.destination.error('Sequence contains more than one element');
-        }
-        else {
-            this.seenValue = true;
-            this.singleValue = value;
-        }
-    };
-    SingleSubscriber.prototype._next = function (value) {
-        var index = this.index++;
-        if (this.predicate) {
-            this.tryNext(value, index);
-        }
-        else {
-            this.applySingleValue(value);
-        }
-    };
-    SingleSubscriber.prototype.tryNext = function (value, index) {
-        try {
-            if (this.predicate(value, index, this.source)) {
-                this.applySingleValue(value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    SingleSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        if (this.index > 0) {
-            destination.next(this.seenValue ? this.singleValue : undefined);
-            destination.complete();
-        }
-        else {
-            destination.error(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__["EmptyError"]);
-        }
-    };
-    return SingleSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=single.js.map
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
+		return min;
+	}
 
-/***/ }),
-/* 497 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return skip; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-function skip(count) {
-    return function (source) { return source.lift(new SkipOperator(count)); };
-}
-var SkipOperator = /*@__PURE__*/ (function () {
-    function SkipOperator(total) {
-        this.total = total;
-    }
-    SkipOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SkipSubscriber(subscriber, this.total));
-    };
-    return SkipOperator;
-}());
-var SkipSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipSubscriber, _super);
-    function SkipSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.count = 0;
-        return _this;
-    }
-    SkipSubscriber.prototype._next = function (x) {
-        if (++this.count > this.total) {
-            this.destination.next(x);
-        }
-    };
-    return SkipSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=skip.js.map
+		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;
+	}
 
-/***/ }),
-/* 498 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return skipLast; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(63);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */
+	if ('COLORTERM' in env) {
+		return 1;
+	}
 
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
+	return min;
+}
 
-function skipLast(count) {
-    return function (source) { return source.lift(new SkipLastOperator(count)); };
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
 }
-var SkipLastOperator = /*@__PURE__*/ (function () {
-    function SkipLastOperator(_skipCount) {
-        this._skipCount = _skipCount;
-        if (this._skipCount < 0) {
-            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
-        }
-    }
-    SkipLastOperator.prototype.call = function (subscriber, source) {
-        if (this._skipCount === 0) {
-            return source.subscribe(new _Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"](subscriber));
-        }
-        else {
-            return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount));
-        }
-    };
-    return SkipLastOperator;
-}());
-var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipLastSubscriber, _super);
-    function SkipLastSubscriber(destination, _skipCount) {
-        var _this = _super.call(this, destination) || this;
-        _this._skipCount = _skipCount;
-        _this._count = 0;
-        _this._ring = new Array(_skipCount);
-        return _this;
-    }
-    SkipLastSubscriber.prototype._next = function (value) {
-        var skipCount = this._skipCount;
-        var count = this._count++;
-        if (count < skipCount) {
-            this._ring[count] = value;
-        }
-        else {
-            var currentIndex = count % skipCount;
-            var ring = this._ring;
-            var oldValue = ring[currentIndex];
-            ring[currentIndex] = value;
-            this.destination.next(oldValue);
-        }
-    };
-    return SkipLastSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=skipLast.js.map
+
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
 
 
 /***/ }),
-/* 499 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/p-event/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return skipUntil; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
 
+const pTimeout = __webpack_require__("../../node_modules/p-event/node_modules/p-timeout/index.js");
 
-function skipUntil(notifier) {
-    return function (source) { return source.lift(new SkipUntilOperator(notifier)); };
-}
-var SkipUntilOperator = /*@__PURE__*/ (function () {
-    function SkipUntilOperator(notifier) {
-        this.notifier = notifier;
-    }
-    SkipUntilOperator.prototype.call = function (destination, source) {
-        return source.subscribe(new SkipUntilSubscriber(destination, this.notifier));
-    };
-    return SkipUntilOperator;
-}());
-var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipUntilSubscriber, _super);
-    function SkipUntilSubscriber(destination, notifier) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasValue = false;
-        var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](_this);
-        _this.add(innerSubscriber);
-        _this.innerSubscription = innerSubscriber;
-        var innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(notifier, innerSubscriber);
-        if (innerSubscription !== innerSubscriber) {
-            _this.add(innerSubscription);
-            _this.innerSubscription = innerSubscription;
-        }
-        return _this;
-    }
-    SkipUntilSubscriber.prototype._next = function (value) {
-        if (this.hasValue) {
-            _super.prototype._next.call(this, value);
-        }
-    };
-    SkipUntilSubscriber.prototype.notifyNext = function () {
-        this.hasValue = true;
-        if (this.innerSubscription) {
-            this.innerSubscription.unsubscribe();
-        }
-    };
-    SkipUntilSubscriber.prototype.notifyComplete = function () {
-    };
-    return SkipUntilSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=skipUntil.js.map
+const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
 
+const normalizeEmitter = emitter => {
+	const addListener = emitter.on || emitter.addListener || emitter.addEventListener;
+	const removeListener = emitter.off || emitter.removeListener || emitter.removeEventListener;
 
-/***/ }),
-/* 500 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (!addListener || !removeListener) {
+		throw new TypeError('Emitter is not compatible');
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return skipWhile; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	return {
+		addListener: addListener.bind(emitter),
+		removeListener: removeListener.bind(emitter)
+	};
+};
 
+const normalizeEvents = event => Array.isArray(event) ? event : [event];
 
-function skipWhile(predicate) {
-    return function (source) { return source.lift(new SkipWhileOperator(predicate)); };
-}
-var SkipWhileOperator = /*@__PURE__*/ (function () {
-    function SkipWhileOperator(predicate) {
-        this.predicate = predicate;
-    }
-    SkipWhileOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate));
-    };
-    return SkipWhileOperator;
-}());
-var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipWhileSubscriber, _super);
-    function SkipWhileSubscriber(destination, predicate) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.skipping = true;
-        _this.index = 0;
-        return _this;
-    }
-    SkipWhileSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        if (this.skipping) {
-            this.tryCallPredicate(value);
-        }
-        if (!this.skipping) {
-            destination.next(value);
-        }
-    };
-    SkipWhileSubscriber.prototype.tryCallPredicate = function (value) {
-        try {
-            var result = this.predicate(value, this.index++);
-            this.skipping = Boolean(result);
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    return SkipWhileSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=skipWhile.js.map
+const multiple = (emitter, event, options) => {
+	let cancel;
+	const ret = new Promise((resolve, reject) => {
+		options = {
+			rejectionEvents: ['error'],
+			multiArgs: false,
+			resolveImmediately: false,
+			...options
+		};
 
+		if (!(options.count >= 0 && (options.count === Infinity || Number.isInteger(options.count)))) {
+			throw new TypeError('The `count` option should be at least 0 or more');
+		}
 
-/***/ }),
-/* 501 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		// Allow multiple events
+		const events = normalizeEvents(event);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return startWith; });
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(46);
-/** PURE_IMPORTS_START _observable_concat,_util_isScheduler PURE_IMPORTS_END */
+		const items = [];
+		const {addListener, removeListener} = normalizeEmitter(emitter);
 
+		const onItem = (...args) => {
+			const value = options.multiArgs ? args : args[0];
 
-function startWith() {
-    var array = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        array[_i] = arguments[_i];
-    }
-    var scheduler = array[array.length - 1];
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(scheduler)) {
-        array.pop();
-        return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source, scheduler); };
-    }
-    else {
-        return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source); };
-    }
-}
-//# sourceMappingURL=startWith.js.map
+			if (options.filter && !options.filter(value)) {
+				return;
+			}
 
+			items.push(value);
 
-/***/ }),
-/* 502 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+			if (options.count === items.length) {
+				cancel();
+				resolve(items);
+			}
+		};
 
-"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__(503);
-/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
+		const rejectHandler = error => {
+			cancel();
+			reject(error);
+		};
 
-function subscribeOn(scheduler, delay) {
-    if (delay === void 0) {
-        delay = 0;
-    }
-    return function subscribeOnOperatorFunction(source) {
-        return source.lift(new SubscribeOnOperator(scheduler, delay));
-    };
-}
-var SubscribeOnOperator = /*@__PURE__*/ (function () {
-    function SubscribeOnOperator(scheduler, delay) {
-        this.scheduler = scheduler;
-        this.delay = delay;
-    }
-    SubscribeOnOperator.prototype.call = function (subscriber, source) {
-        return new _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__["SubscribeOnObservable"](source, this.delay, this.scheduler).subscribe(subscriber);
-    };
-    return SubscribeOnOperator;
-}());
-//# sourceMappingURL=subscribeOn.js.map
+		cancel = () => {
+			for (const event of events) {
+				removeListener(event, onItem);
+			}
 
+			for (const rejectionEvent of options.rejectionEvents) {
+				removeListener(rejectionEvent, rejectHandler);
+			}
+		};
 
-/***/ }),
-/* 503 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		for (const event of events) {
+			addListener(event, onItem);
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubscribeOnObservable", function() { return SubscribeOnObservable; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10);
-/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(99);
-/** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */
+		for (const rejectionEvent of options.rejectionEvents) {
+			addListener(rejectionEvent, rejectHandler);
+		}
 
+		if (options.resolveImmediately) {
+			resolve(items);
+		}
+	});
 
+	ret.cancel = cancel;
 
+	if (typeof options.timeout === 'number') {
+		const timeout = pTimeout(ret, options.timeout);
+		timeout.cancel = cancel;
+		return timeout;
+	}
 
-var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscribeOnObservable, _super);
-    function SubscribeOnObservable(source, delayTime, scheduler) {
-        if (delayTime === void 0) {
-            delayTime = 0;
-        }
-        if (scheduler === void 0) {
-            scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
-        }
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.delayTime = delayTime;
-        _this.scheduler = scheduler;
-        if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_3__["isNumeric"])(delayTime) || delayTime < 0) {
-            _this.delayTime = 0;
-        }
-        if (!scheduler || typeof scheduler.schedule !== 'function') {
-            _this.scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
-        }
-        return _this;
-    }
-    SubscribeOnObservable.create = function (source, delay, scheduler) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (scheduler === void 0) {
-            scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
-        }
-        return new SubscribeOnObservable(source, delay, scheduler);
-    };
-    SubscribeOnObservable.dispatch = function (arg) {
-        var source = arg.source, subscriber = arg.subscriber;
-        return this.add(source.subscribe(subscriber));
-    };
-    SubscribeOnObservable.prototype._subscribe = function (subscriber) {
-        var delay = this.delayTime;
-        var source = this.source;
-        var scheduler = this.scheduler;
-        return scheduler.schedule(SubscribeOnObservable.dispatch, delay, {
-            source: source, subscriber: subscriber
-        });
-    };
-    return SubscribeOnObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+	return ret;
+};
+
+const pEvent = (emitter, event, options) => {
+	if (typeof options === 'function') {
+		options = {filter: options};
+	}
 
-//# sourceMappingURL=SubscribeOnObservable.js.map
+	options = {
+		...options,
+		count: 1,
+		resolveImmediately: false
+	};
 
+	const arrayPromise = multiple(emitter, event, options);
+	const promise = arrayPromise.then(array => array[0]); // eslint-disable-line promise/prefer-await-to-then
+	promise.cancel = arrayPromise.cancel;
 
-/***/ }),
-/* 504 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	return promise;
+};
 
-"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__(505);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
-/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
+module.exports = pEvent;
+// TODO: Remove this for the next major release
+module.exports.default = pEvent;
 
+module.exports.multiple = multiple;
 
-function switchAll() {
-    return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]);
-}
-//# sourceMappingURL=switchAll.js.map
+module.exports.iterator = (emitter, event, options) => {
+	if (typeof options === 'function') {
+		options = {filter: options};
+	}
 
+	// Allow multiple events
+	const events = normalizeEvents(event);
 
-/***/ }),
-/* 505 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	options = {
+		rejectionEvents: ['error'],
+		resolutionEvents: [],
+		limit: Infinity,
+		multiArgs: false,
+		...options
+	};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return switchMap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(84);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_map,_observable_from,_innerSubscribe PURE_IMPORTS_END */
+	const {limit} = options;
+	const isValidLimit = limit >= 0 && (limit === Infinity || Number.isInteger(limit));
+	if (!isValidLimit) {
+		throw new TypeError('The `limit` option should be a non-negative integer or Infinity');
+	}
 
+	if (limit === 0) {
+		// Return an empty async iterator to avoid any further cost
+		return {
+			[Symbol.asyncIterator]() {
+				return this;
+			},
+			async next() {
+				return {
+					done: true,
+					value: undefined
+				};
+			}
+		};
+	}
 
+	const {addListener, removeListener} = normalizeEmitter(emitter);
 
+	let isDone = false;
+	let error;
+	let hasPendingError = false;
+	const nextQueue = [];
+	const valueQueue = [];
+	let eventCount = 0;
+	let isLimitReached = false;
 
-function switchMap(project, resultSelector) {
-    if (typeof resultSelector === 'function') {
-        return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
-    }
-    return function (source) { return source.lift(new SwitchMapOperator(project)); };
-}
-var SwitchMapOperator = /*@__PURE__*/ (function () {
-    function SwitchMapOperator(project) {
-        this.project = project;
-    }
-    SwitchMapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SwitchMapSubscriber(subscriber, this.project));
-    };
-    return SwitchMapOperator;
-}());
-var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchMapSubscriber, _super);
-    function SwitchMapSubscriber(destination, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.index = 0;
-        return _this;
-    }
-    SwitchMapSubscriber.prototype._next = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (error) {
-            this.destination.error(error);
-            return;
-        }
-        this._innerSub(result);
-    };
-    SwitchMapSubscriber.prototype._innerSub = function (result) {
-        var innerSubscription = this.innerSubscription;
-        if (innerSubscription) {
-            innerSubscription.unsubscribe();
-        }
-        var innerSubscriber = new _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleInnerSubscriber"](this);
-        var destination = this.destination;
-        destination.add(innerSubscriber);
-        this.innerSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["innerSubscribe"])(result, innerSubscriber);
-        if (this.innerSubscription !== innerSubscriber) {
-            destination.add(this.innerSubscription);
-        }
-    };
-    SwitchMapSubscriber.prototype._complete = function () {
-        var innerSubscription = this.innerSubscription;
-        if (!innerSubscription || innerSubscription.closed) {
-            _super.prototype._complete.call(this);
-        }
-        this.unsubscribe();
-    };
-    SwitchMapSubscriber.prototype._unsubscribe = function () {
-        this.innerSubscription = undefined;
-    };
-    SwitchMapSubscriber.prototype.notifyComplete = function () {
-        this.innerSubscription = undefined;
-        if (this.isStopped) {
-            _super.prototype._complete.call(this);
-        }
-    };
-    SwitchMapSubscriber.prototype.notifyNext = function (innerValue) {
-        this.destination.next(innerValue);
-    };
-    return SwitchMapSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=switchMap.js.map
+	const valueHandler = (...args) => {
+		eventCount++;
+		isLimitReached = eventCount === limit;
 
+		const value = options.multiArgs ? args : args[0];
 
-/***/ }),
-/* 506 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		if (nextQueue.length > 0) {
+			const {resolve} = nextQueue.shift();
 
-"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__(505);
-/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
+			resolve({done: false, value});
 
-function switchMapTo(innerObservable, resultSelector) {
-    return resultSelector ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; });
-}
-//# sourceMappingURL=switchMapTo.js.map
+			if (isLimitReached) {
+				cancel();
+			}
 
+			return;
+		}
 
-/***/ }),
-/* 507 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		valueQueue.push(value);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return takeUntil; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
+		if (isLimitReached) {
+			cancel();
+		}
+	};
 
+	const cancel = () => {
+		isDone = true;
+		for (const event of events) {
+			removeListener(event, valueHandler);
+		}
 
-function takeUntil(notifier) {
-    return function (source) { return source.lift(new TakeUntilOperator(notifier)); };
-}
-var TakeUntilOperator = /*@__PURE__*/ (function () {
-    function TakeUntilOperator(notifier) {
-        this.notifier = notifier;
-    }
-    TakeUntilOperator.prototype.call = function (subscriber, source) {
-        var takeUntilSubscriber = new TakeUntilSubscriber(subscriber);
-        var notifierSubscription = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(this.notifier, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](takeUntilSubscriber));
-        if (notifierSubscription && !takeUntilSubscriber.seenValue) {
-            takeUntilSubscriber.add(notifierSubscription);
-            return source.subscribe(takeUntilSubscriber);
-        }
-        return takeUntilSubscriber;
-    };
-    return TakeUntilOperator;
-}());
-var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super);
-    function TakeUntilSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.seenValue = false;
-        return _this;
-    }
-    TakeUntilSubscriber.prototype.notifyNext = function () {
-        this.seenValue = true;
-        this.complete();
-    };
-    TakeUntilSubscriber.prototype.notifyComplete = function () {
-    };
-    return TakeUntilSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=takeUntil.js.map
+		for (const rejectionEvent of options.rejectionEvents) {
+			removeListener(rejectionEvent, rejectHandler);
+		}
 
+		for (const resolutionEvent of options.resolutionEvents) {
+			removeListener(resolutionEvent, resolveHandler);
+		}
 
-/***/ }),
-/* 508 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		while (nextQueue.length > 0) {
+			const {resolve} = nextQueue.shift();
+			resolve({done: true, value: undefined});
+		}
+	};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return takeWhile; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	const rejectHandler = (...args) => {
+		error = options.multiArgs ? args : args[0];
 
+		if (nextQueue.length > 0) {
+			const {reject} = nextQueue.shift();
+			reject(error);
+		} else {
+			hasPendingError = true;
+		}
 
-function takeWhile(predicate, inclusive) {
-    if (inclusive === void 0) {
-        inclusive = false;
-    }
-    return function (source) {
-        return source.lift(new TakeWhileOperator(predicate, inclusive));
-    };
-}
-var TakeWhileOperator = /*@__PURE__*/ (function () {
-    function TakeWhileOperator(predicate, inclusive) {
-        this.predicate = predicate;
-        this.inclusive = inclusive;
-    }
-    TakeWhileOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate, this.inclusive));
-    };
-    return TakeWhileOperator;
-}());
-var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeWhileSubscriber, _super);
-    function TakeWhileSubscriber(destination, predicate, inclusive) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.inclusive = inclusive;
-        _this.index = 0;
-        return _this;
-    }
-    TakeWhileSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        var result;
-        try {
-            result = this.predicate(value, this.index++);
-        }
-        catch (err) {
-            destination.error(err);
-            return;
-        }
-        this.nextOrComplete(value, result);
-    };
-    TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) {
-        var destination = this.destination;
-        if (Boolean(predicateResult)) {
-            destination.next(value);
-        }
-        else {
-            if (this.inclusive) {
-                destination.next(value);
-            }
-            destination.complete();
-        }
-    };
-    return TakeWhileSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=takeWhile.js.map
+		cancel();
+	};
 
+	const resolveHandler = (...args) => {
+		const value = options.multiArgs ? args : args[0];
 
-/***/ }),
-/* 509 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		if (options.filter && !options.filter(value)) {
+			return;
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(61);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(14);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */
+		if (nextQueue.length > 0) {
+			const {resolve} = nextQueue.shift();
+			resolve({done: true, value});
+		} else {
+			valueQueue.push(value);
+		}
 
+		cancel();
+	};
 
+	for (const event of events) {
+		addListener(event, valueHandler);
+	}
 
+	for (const rejectionEvent of options.rejectionEvents) {
+		addListener(rejectionEvent, rejectHandler);
+	}
 
-function tap(nextOrObserver, error, complete) {
-    return function tapOperatorFunction(source) {
-        return source.lift(new DoOperator(nextOrObserver, error, complete));
-    };
-}
-var DoOperator = /*@__PURE__*/ (function () {
-    function DoOperator(nextOrObserver, error, complete) {
-        this.nextOrObserver = nextOrObserver;
-        this.error = error;
-        this.complete = complete;
-    }
-    DoOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete));
-    };
-    return DoOperator;
-}());
-var TapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super);
-    function TapSubscriber(destination, observerOrNext, error, complete) {
-        var _this = _super.call(this, destination) || this;
-        _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) {
-            _this._context = _this;
-            _this._tapNext = observerOrNext;
-        }
-        else if (observerOrNext) {
-            _this._context = observerOrNext;
-            _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-            _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-            _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        }
-        return _this;
-    }
-    TapSubscriber.prototype._next = function (value) {
-        try {
-            this._tapNext.call(this._context, value);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(value);
-    };
-    TapSubscriber.prototype._error = function (err) {
-        try {
-            this._tapError.call(this._context, err);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.error(err);
-    };
-    TapSubscriber.prototype._complete = function () {
-        try {
-            this._tapComplete.call(this._context);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        return this.destination.complete();
-    };
-    return TapSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=tap.js.map
+	for (const resolutionEvent of options.resolutionEvents) {
+		addListener(resolutionEvent, resolveHandler);
+	}
+
+	return {
+		[symbolAsyncIterator]() {
+			return this;
+		},
+		async next() {
+			if (valueQueue.length > 0) {
+				const value = valueQueue.shift();
+				return {
+					done: isDone && valueQueue.length === 0 && !isLimitReached,
+					value
+				};
+			}
+
+			if (hasPendingError) {
+				hasPendingError = false;
+				throw error;
+			}
+
+			if (isDone) {
+				return {
+					done: true,
+					value: undefined
+				};
+			}
+
+			return new Promise((resolve, reject) => nextQueue.push({resolve, reject}));
+		},
+		async return(value) {
+			cancel();
+			return {
+				done: isDone,
+				value
+			};
+		}
+	};
+};
 
 
 /***/ }),
-/* 510 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/p-event/node_modules/p-timeout/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultThrottleConfig", function() { return defaultThrottleConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return throttle; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
 
+const pFinally = __webpack_require__("../../node_modules/p-finally/index.js");
 
-var defaultThrottleConfig = {
-    leading: true,
-    trailing: false
-};
-function throttle(durationSelector, config) {
-    if (config === void 0) {
-        config = defaultThrottleConfig;
-    }
-    return function (source) { return source.lift(new ThrottleOperator(durationSelector, !!config.leading, !!config.trailing)); };
+class TimeoutError extends Error {
+	constructor(message) {
+		super(message);
+		this.name = 'TimeoutError';
+	}
 }
-var ThrottleOperator = /*@__PURE__*/ (function () {
-    function ThrottleOperator(durationSelector, leading, trailing) {
-        this.durationSelector = durationSelector;
-        this.leading = leading;
-        this.trailing = trailing;
-    }
-    ThrottleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing));
-    };
-    return ThrottleOperator;
-}());
-var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleSubscriber, _super);
-    function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.durationSelector = durationSelector;
-        _this._leading = _leading;
-        _this._trailing = _trailing;
-        _this._hasValue = false;
-        return _this;
-    }
-    ThrottleSubscriber.prototype._next = function (value) {
-        this._hasValue = true;
-        this._sendValue = value;
-        if (!this._throttled) {
-            if (this._leading) {
-                this.send();
-            }
-            else {
-                this.throttle(value);
-            }
-        }
-    };
-    ThrottleSubscriber.prototype.send = function () {
-        var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue;
-        if (_hasValue) {
-            this.destination.next(_sendValue);
-            this.throttle(_sendValue);
-        }
-        this._hasValue = false;
-        this._sendValue = undefined;
-    };
-    ThrottleSubscriber.prototype.throttle = function (value) {
-        var duration = this.tryDurationSelector(value);
-        if (!!duration) {
-            this.add(this._throttled = Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["innerSubscribe"])(duration, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleInnerSubscriber"](this)));
-        }
-    };
-    ThrottleSubscriber.prototype.tryDurationSelector = function (value) {
-        try {
-            return this.durationSelector(value);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return null;
-        }
-    };
-    ThrottleSubscriber.prototype.throttlingDone = function () {
-        var _a = this, _throttled = _a._throttled, _trailing = _a._trailing;
-        if (_throttled) {
-            _throttled.unsubscribe();
-        }
-        this._throttled = undefined;
-        if (_trailing) {
-            this.send();
-        }
-    };
-    ThrottleSubscriber.prototype.notifyNext = function () {
-        this.throttlingDone();
-    };
-    ThrottleSubscriber.prototype.notifyComplete = function () {
-        this.throttlingDone();
-    };
-    return ThrottleSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_1__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=throttle.js.map
 
+module.exports = (promise, ms, fallback) => new Promise((resolve, reject) => {
+	if (typeof ms !== 'number' || ms < 0) {
+		throw new TypeError('Expected `ms` to be a positive number');
+	}
 
-/***/ }),
-/* 511 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const timer = setTimeout(() => {
+		if (typeof fallback === 'function') {
+			try {
+				resolve(fallback());
+			} catch (err) {
+				reject(err);
+			}
+			return;
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return throttleTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(56);
-/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(510);
-/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
+		const message = typeof fallback === 'string' ? fallback : `Promise timed out after ${ms} milliseconds`;
+		const err = fallback instanceof Error ? fallback : new TimeoutError(message);
 
+		if (typeof promise.cancel === 'function') {
+			promise.cancel();
+		}
 
+		reject(err);
+	}, ms);
 
+	pFinally(
+		promise.then(resolve, reject),
+		() => {
+			clearTimeout(timer);
+		}
+	);
+});
 
-function throttleTime(duration, scheduler, config) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    }
-    if (config === void 0) {
-        config = _throttle__WEBPACK_IMPORTED_MODULE_3__["defaultThrottleConfig"];
-    }
-    return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); };
-}
-var ThrottleTimeOperator = /*@__PURE__*/ (function () {
-    function ThrottleTimeOperator(duration, scheduler, leading, trailing) {
-        this.duration = duration;
-        this.scheduler = scheduler;
-        this.leading = leading;
-        this.trailing = trailing;
-    }
-    ThrottleTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing));
-    };
-    return ThrottleTimeOperator;
-}());
-var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleTimeSubscriber, _super);
-    function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) {
-        var _this = _super.call(this, destination) || this;
-        _this.duration = duration;
-        _this.scheduler = scheduler;
-        _this.leading = leading;
-        _this.trailing = trailing;
-        _this._hasTrailingValue = false;
-        _this._trailingValue = null;
-        return _this;
-    }
-    ThrottleTimeSubscriber.prototype._next = function (value) {
-        if (this.throttled) {
-            if (this.trailing) {
-                this._trailingValue = value;
-                this._hasTrailingValue = true;
-            }
-        }
-        else {
-            this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this }));
-            if (this.leading) {
-                this.destination.next(value);
-            }
-            else if (this.trailing) {
-                this._trailingValue = value;
-                this._hasTrailingValue = true;
-            }
-        }
-    };
-    ThrottleTimeSubscriber.prototype._complete = function () {
-        if (this._hasTrailingValue) {
-            this.destination.next(this._trailingValue);
-            this.destination.complete();
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    ThrottleTimeSubscriber.prototype.clearThrottle = function () {
-        var throttled = this.throttled;
-        if (throttled) {
-            if (this.trailing && this._hasTrailingValue) {
-                this.destination.next(this._trailingValue);
-                this._trailingValue = null;
-                this._hasTrailingValue = false;
-            }
-            throttled.unsubscribe();
-            this.remove(throttled);
-            this.throttled = null;
-        }
-    };
-    return ThrottleTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-function dispatchNext(arg) {
-    var subscriber = arg.subscriber;
-    subscriber.clearThrottle();
-}
-//# sourceMappingURL=throttleTime.js.map
+module.exports.TimeoutError = TimeoutError;
 
 
 /***/ }),
-/* 512 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__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__(56);
-/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(472);
-/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(92);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(67);
-/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
 
+/***/ "../../node_modules/p-filter/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
+const pMap = __webpack_require__("../../node_modules/p-filter/node_modules/p-map/index.js");
 
-function timeInterval(scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return function (source) {
-        return Object(_observable_defer__WEBPACK_IMPORTED_MODULE_2__["defer"])(function () {
-            return source.pipe(Object(_scan__WEBPACK_IMPORTED_MODULE_1__["scan"])(function (_a, value) {
-                var current = _a.current;
-                return ({ value: value, current: scheduler.now(), last: current });
-            }, { current: scheduler.now(), value: undefined, last: undefined }), Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (_a) {
-                var current = _a.current, last = _a.last, value = _a.value;
-                return new TimeInterval(value, current - last);
-            }));
-        });
-    };
-}
-var TimeInterval = /*@__PURE__*/ (function () {
-    function TimeInterval(value, interval) {
-        this.value = value;
-        this.interval = interval;
-    }
-    return TimeInterval;
-}());
+const pFilter = async (iterable, filterer, options) => {
+	const values = await pMap(
+		iterable,
+		(element, index) => Promise.all([filterer(element, index), element]),
+		options
+	);
+	return values.filter(value => Boolean(value[0])).map(value => value[1]);
+};
 
-//# sourceMappingURL=timeInterval.js.map
+module.exports = pFilter;
+// TODO: Remove this for the next major release
+module.exports.default = pFilter;
 
 
 /***/ }),
-/* 513 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__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__(56);
-/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65);
-/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(514);
-/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(50);
-/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
+/***/ "../../node_modules/p-filter/node_modules/p-map/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+const pMap = (iterable, mapper, options) => new Promise((resolve, reject) => {
+	options = Object.assign({
+		concurrency: Infinity
+	}, options);
 
-function timeout(due, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return Object(_timeoutWith__WEBPACK_IMPORTED_MODULE_2__["timeoutWith"])(due, Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_3__["throwError"])(new _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]()), scheduler);
-}
-//# sourceMappingURL=timeout.js.map
+	if (typeof mapper !== 'function') {
+		throw new TypeError('Mapper function is required');
+	}
 
+	const {concurrency} = options;
 
-/***/ }),
-/* 514 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+		throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+	}
 
-"use strict";
-__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__(13);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(446);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_innerSubscribe PURE_IMPORTS_END */
+	const ret = [];
+	const iterator = iterable[Symbol.iterator]();
+	let isRejected = false;
+	let isIterableDone = false;
+	let resolvingCount = 0;
+	let currentIndex = 0;
 
+	const next = () => {
+		if (isRejected) {
+			return;
+		}
 
+		const nextItem = iterator.next();
+		const i = currentIndex;
+		currentIndex++;
 
+		if (nextItem.done) {
+			isIterableDone = true;
 
-function timeoutWith(due, withObservable, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    return function (source) {
-        var absoluteTimeout = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(due);
-        var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due);
-        return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler));
-    };
-}
-var TimeoutWithOperator = /*@__PURE__*/ (function () {
-    function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) {
-        this.waitFor = waitFor;
-        this.absoluteTimeout = absoluteTimeout;
-        this.withObservable = withObservable;
-        this.scheduler = scheduler;
-    }
-    TimeoutWithOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler));
-    };
-    return TimeoutWithOperator;
-}());
-var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutWithSubscriber, _super);
-    function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.absoluteTimeout = absoluteTimeout;
-        _this.waitFor = waitFor;
-        _this.withObservable = withObservable;
-        _this.scheduler = scheduler;
-        _this.scheduleTimeout();
-        return _this;
-    }
-    TimeoutWithSubscriber.dispatchTimeout = function (subscriber) {
-        var withObservable = subscriber.withObservable;
-        subscriber._unsubscribeAndRecycle();
-        subscriber.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["innerSubscribe"])(withObservable, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleInnerSubscriber"](subscriber)));
-    };
-    TimeoutWithSubscriber.prototype.scheduleTimeout = function () {
-        var action = this.action;
-        if (action) {
-            this.action = action.schedule(this, this.waitFor);
-        }
-        else {
-            this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this));
-        }
-    };
-    TimeoutWithSubscriber.prototype._next = function (value) {
-        if (!this.absoluteTimeout) {
-            this.scheduleTimeout();
-        }
-        _super.prototype._next.call(this, value);
-    };
-    TimeoutWithSubscriber.prototype._unsubscribe = function () {
-        this.action = undefined;
-        this.scheduler = null;
-        this.withObservable = null;
-    };
-    return TimeoutWithSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_3__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=timeoutWith.js.map
+			if (resolvingCount === 0) {
+				resolve(ret);
+			}
 
+			return;
+		}
 
-/***/ }),
-/* 515 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		resolvingCount++;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return timestamp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Timestamp", function() { return Timestamp; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67);
-/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
+		Promise.resolve(nextItem.value)
+			.then(element => mapper(element, i))
+			.then(
+				value => {
+					ret[i] = value;
+					resolvingCount--;
+					next();
+				},
+				error => {
+					isRejected = true;
+					reject(error);
+				}
+			);
+	};
 
+	for (let i = 0; i < concurrency; i++) {
+		next();
 
-function timestamp(scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (value) { return new Timestamp(value, scheduler.now()); });
-}
-var Timestamp = /*@__PURE__*/ (function () {
-    function Timestamp(value, timestamp) {
-        this.value = value;
-        this.timestamp = timestamp;
-    }
-    return Timestamp;
-}());
+		if (isIterableDone) {
+			break;
+		}
+	}
+});
 
-//# sourceMappingURL=timestamp.js.map
+module.exports = pMap;
+// TODO: Remove this for the next major release
+module.exports.default = pMap;
 
 
 /***/ }),
-/* 516 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/p-finally/index.js":
+/***/ (function(module, 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__(471);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
-function toArrayReducer(arr, item, index) {
-    if (index === 0) {
-        return [item];
-    }
-    arr.push(item);
-    return arr;
-}
-function toArray() {
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(toArrayReducer, []);
-}
-//# sourceMappingURL=toArray.js.map
+module.exports = (promise, onFinally) => {
+	onFinally = onFinally || (() => {});
+
+	return promise.then(
+		val => new Promise(resolve => {
+			resolve(onFinally());
+		}).then(() => val),
+		err => new Promise(resolve => {
+			resolve(onFinally());
+		}).then(() => {
+			throw err;
+		})
+	);
+};
 
 
 /***/ }),
-/* 517 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/parse-json/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return window; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(91);
-/** PURE_IMPORTS_START tslib,_Subject,_innerSubscribe PURE_IMPORTS_END */
 
+const errorEx = __webpack_require__("../../node_modules/error-ex/index.js");
+const fallback = __webpack_require__("../../node_modules/json-parse-better-errors/index.js");
+const {default: LinesAndColumns} = __webpack_require__("../../node_modules/lines-and-columns/dist/index.mjs");
+const {codeFrameColumns} = __webpack_require__("../../node_modules/@babel/code-frame/lib/index.js");
 
+const JSONError = errorEx('JSONError', {
+	fileName: errorEx.append('in %s'),
+	codeFrame: errorEx.append('\n\n%s\n')
+});
 
-function window(windowBoundaries) {
-    return function windowOperatorFunction(source) {
-        return source.lift(new WindowOperator(windowBoundaries));
-    };
-}
-var WindowOperator = /*@__PURE__*/ (function () {
-    function WindowOperator(windowBoundaries) {
-        this.windowBoundaries = windowBoundaries;
-    }
-    WindowOperator.prototype.call = function (subscriber, source) {
-        var windowSubscriber = new WindowSubscriber(subscriber);
-        var sourceSubscription = source.subscribe(windowSubscriber);
-        if (!sourceSubscription.closed) {
-            windowSubscriber.add(Object(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["innerSubscribe"])(this.windowBoundaries, new _innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleInnerSubscriber"](windowSubscriber)));
-        }
-        return sourceSubscription;
-    };
-    return WindowOperator;
-}());
-var WindowSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super);
-    function WindowSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        destination.next(_this.window);
-        return _this;
-    }
-    WindowSubscriber.prototype.notifyNext = function () {
-        this.openWindow();
-    };
-    WindowSubscriber.prototype.notifyError = function (error) {
-        this._error(error);
-    };
-    WindowSubscriber.prototype.notifyComplete = function () {
-        this._complete();
-    };
-    WindowSubscriber.prototype._next = function (value) {
-        this.window.next(value);
-    };
-    WindowSubscriber.prototype._error = function (err) {
-        this.window.error(err);
-        this.destination.error(err);
-    };
-    WindowSubscriber.prototype._complete = function () {
-        this.window.complete();
-        this.destination.complete();
-    };
-    WindowSubscriber.prototype._unsubscribe = function () {
-        this.window = null;
-    };
-    WindowSubscriber.prototype.openWindow = function () {
-        var prevWindow = this.window;
-        if (prevWindow) {
-            prevWindow.complete();
-        }
-        var destination = this.destination;
-        var newWindow = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        destination.next(newWindow);
-    };
-    return WindowSubscriber;
-}(_innerSubscribe__WEBPACK_IMPORTED_MODULE_2__["SimpleOuterSubscriber"]));
-//# sourceMappingURL=window.js.map
+module.exports = (string, reviver, filename) => {
+	if (typeof reviver === 'string') {
+		filename = reviver;
+		reviver = null;
+	}
 
+	try {
+		try {
+			return JSON.parse(string, reviver);
+		} catch (error) {
+			fallback(string, reviver);
+			throw error;
+		}
+	} catch (error) {
+		error.message = error.message.replace(/\n/g, '');
+		const indexMatch = error.message.match(/in JSON at position (\d+) while parsing near/);
 
-/***/ }),
-/* 518 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		const jsonError = new JSONError(error);
+		if (filename) {
+			jsonError.fileName = filename;
+		}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return windowCount; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28);
-/** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */
+		if (indexMatch && indexMatch.length > 0) {
+			const lines = new LinesAndColumns(string);
+			const index = Number(indexMatch[1]);
+			const location = lines.locationForIndex(index);
 
+			const codeFrame = codeFrameColumns(
+				string,
+				{start: {line: location.line + 1, column: location.column + 1}},
+				{highlightCode: true}
+			);
 
+			jsonError.codeFrame = codeFrame;
+		}
 
-function windowCount(windowSize, startWindowEvery) {
-    if (startWindowEvery === void 0) {
-        startWindowEvery = 0;
-    }
-    return function windowCountOperatorFunction(source) {
-        return source.lift(new WindowCountOperator(windowSize, startWindowEvery));
-    };
-}
-var WindowCountOperator = /*@__PURE__*/ (function () {
-    function WindowCountOperator(windowSize, startWindowEvery) {
-        this.windowSize = windowSize;
-        this.startWindowEvery = startWindowEvery;
-    }
-    WindowCountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery));
-    };
-    return WindowCountOperator;
-}());
-var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowCountSubscriber, _super);
-    function WindowCountSubscriber(destination, windowSize, startWindowEvery) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.windowSize = windowSize;
-        _this.startWindowEvery = startWindowEvery;
-        _this.windows = [new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]()];
-        _this.count = 0;
-        destination.next(_this.windows[0]);
-        return _this;
-    }
-    WindowCountSubscriber.prototype._next = function (value) {
-        var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize;
-        var destination = this.destination;
-        var windowSize = this.windowSize;
-        var windows = this.windows;
-        var len = windows.length;
-        for (var i = 0; i < len && !this.closed; i++) {
-            windows[i].next(value);
-        }
-        var c = this.count - windowSize + 1;
-        if (c >= 0 && c % startWindowEvery === 0 && !this.closed) {
-            windows.shift().complete();
-        }
-        if (++this.count % startWindowEvery === 0 && !this.closed) {
-            var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]();
-            windows.push(window_1);
-            destination.next(window_1);
-        }
-    };
-    WindowCountSubscriber.prototype._error = function (err) {
-        var windows = this.windows;
-        if (windows) {
-            while (windows.length > 0 && !this.closed) {
-                windows.shift().error(err);
-            }
-        }
-        this.destination.error(err);
-    };
-    WindowCountSubscriber.prototype._complete = function () {
-        var windows = this.windows;
-        if (windows) {
-            while (windows.length > 0 && !this.closed) {
-                windows.shift().complete();
-            }
-        }
-        this.destination.complete();
-    };
-    WindowCountSubscriber.prototype._unsubscribe = function () {
-        this.count = 0;
-        this.windows = null;
-    };
-    return WindowCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=windowCount.js.map
+		throw jsonError;
+	}
+};
 
 
 /***/ }),
-/* 519 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return windowTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(56);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(99);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(46);
-/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
-
-
-
 
+/***/ "../../node_modules/pascalcase/index.js":
+/***/ (function(module, exports) {
 
+/*!
+ * pascalcase <https://github.com/jonschlinkert/pascalcase>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
 
-function windowTime(windowTimeSpan) {
-    var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    var windowCreationInterval = null;
-    var maxWindowSize = Number.POSITIVE_INFINITY;
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[3])) {
-        scheduler = arguments[3];
-    }
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[2])) {
-        scheduler = arguments[2];
-    }
-    else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[2])) {
-        maxWindowSize = Number(arguments[2]);
-    }
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[1])) {
-        scheduler = arguments[1];
-    }
-    else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[1])) {
-        windowCreationInterval = Number(arguments[1]);
-    }
-    return function windowTimeOperatorFunction(source) {
-        return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler));
-    };
-}
-var WindowTimeOperator = /*@__PURE__*/ (function () {
-    function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
-        this.windowTimeSpan = windowTimeSpan;
-        this.windowCreationInterval = windowCreationInterval;
-        this.maxWindowSize = maxWindowSize;
-        this.scheduler = scheduler;
-    }
-    WindowTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler));
-    };
-    return WindowTimeOperator;
-}());
-var CountedSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountedSubject, _super);
-    function CountedSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this._numberOfNextedValues = 0;
-        return _this;
-    }
-    CountedSubject.prototype.next = function (value) {
-        this._numberOfNextedValues++;
-        _super.prototype.next.call(this, value);
-    };
-    Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", {
-        get: function () {
-            return this._numberOfNextedValues;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return CountedSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
-var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowTimeSubscriber, _super);
-    function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.windowTimeSpan = windowTimeSpan;
-        _this.windowCreationInterval = windowCreationInterval;
-        _this.maxWindowSize = maxWindowSize;
-        _this.scheduler = scheduler;
-        _this.windows = [];
-        var window = _this.openWindow();
-        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
-            var closeState = { subscriber: _this, window: window, context: null };
-            var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler };
-            _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState));
-            _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState));
-        }
-        else {
-            var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan };
-            _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState));
-        }
-        return _this;
-    }
-    WindowTimeSubscriber.prototype._next = function (value) {
-        var windows = this.windows;
-        var len = windows.length;
-        for (var i = 0; i < len; i++) {
-            var window_1 = windows[i];
-            if (!window_1.closed) {
-                window_1.next(value);
-                if (window_1.numberOfNextedValues >= this.maxWindowSize) {
-                    this.closeWindow(window_1);
-                }
-            }
-        }
-    };
-    WindowTimeSubscriber.prototype._error = function (err) {
-        var windows = this.windows;
-        while (windows.length > 0) {
-            windows.shift().error(err);
-        }
-        this.destination.error(err);
-    };
-    WindowTimeSubscriber.prototype._complete = function () {
-        var windows = this.windows;
-        while (windows.length > 0) {
-            var window_2 = windows.shift();
-            if (!window_2.closed) {
-                window_2.complete();
-            }
-        }
-        this.destination.complete();
-    };
-    WindowTimeSubscriber.prototype.openWindow = function () {
-        var window = new CountedSubject();
-        this.windows.push(window);
-        var destination = this.destination;
-        destination.next(window);
-        return window;
-    };
-    WindowTimeSubscriber.prototype.closeWindow = function (window) {
-        window.complete();
-        var windows = this.windows;
-        windows.splice(windows.indexOf(window), 1);
-    };
-    return WindowTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
-function dispatchWindowTimeSpanOnly(state) {
-    var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window;
-    if (window) {
-        subscriber.closeWindow(window);
-    }
-    state.window = subscriber.openWindow();
-    this.schedule(state, windowTimeSpan);
-}
-function dispatchWindowCreation(state) {
-    var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval;
-    var window = subscriber.openWindow();
-    var action = this;
-    var context = { action: action, subscription: null };
-    var timeSpanState = { subscriber: subscriber, window: window, context: context };
-    context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState);
-    action.add(context.subscription);
-    action.schedule(state, windowCreationInterval);
-}
-function dispatchWindowClose(state) {
-    var subscriber = state.subscriber, window = state.window, context = state.context;
-    if (context && context.action && context.subscription) {
-        context.action.remove(context.subscription);
-    }
-    subscriber.closeWindow(window);
+function pascalcase(str) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string.');
+  }
+  str = str.replace(/([A-Z])/g, ' $1');
+  if (str.length === 1) { return str.toUpperCase(); }
+  str = str.replace(/^[\W_]+|[\W_]+$/g, '').toLowerCase();
+  str = str.charAt(0).toUpperCase() + str.slice(1);
+  return str.replace(/[\W_]+(\w|$)/g, function (_, ch) {
+    return ch.toUpperCase();
+  });
 }
-//# sourceMappingURL=windowTime.js.map
+
+module.exports = pascalcase;
 
 
 /***/ }),
-/* 520 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/path-dirname/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return windowToggle; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(71);
-/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
+var path = __webpack_require__("path");
+var inspect = __webpack_require__("util").inspect;
 
+function assertPath(path) {
+  if (typeof path !== 'string') {
+    throw new TypeError('Path must be a string. Received ' + inspect(path));
+  }
+}
 
+function posix(path) {
+  assertPath(path);
+  if (path.length === 0)
+    return '.';
+  var code = path.charCodeAt(0);
+  var hasRoot = (code === 47/*/*/);
+  var end = -1;
+  var matchedSlash = true;
+  for (var i = path.length - 1; i >= 1; --i) {
+    code = path.charCodeAt(i);
+    if (code === 47/*/*/) {
+      if (!matchedSlash) {
+        end = i;
+        break;
+      }
+    } else {
+      // We saw the first non-path separator
+      matchedSlash = false;
+    }
+  }
 
-function windowToggle(openings, closingSelector) {
-    return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); };
+  if (end === -1)
+    return hasRoot ? '/' : '.';
+  if (hasRoot && end === 1)
+    return '//';
+  return path.slice(0, end);
 }
-var WindowToggleOperator = /*@__PURE__*/ (function () {
-    function WindowToggleOperator(openings, closingSelector) {
-        this.openings = openings;
-        this.closingSelector = closingSelector;
-    }
-    WindowToggleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector));
-    };
-    return WindowToggleOperator;
-}());
-var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowToggleSubscriber, _super);
-    function WindowToggleSubscriber(destination, openings, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.openings = openings;
-        _this.closingSelector = closingSelector;
-        _this.contexts = [];
-        _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings));
-        return _this;
-    }
-    WindowToggleSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        if (contexts) {
-            var len = contexts.length;
-            for (var i = 0; i < len; i++) {
-                contexts[i].window.next(value);
-            }
-        }
-    };
-    WindowToggleSubscriber.prototype._error = function (err) {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_1 = contexts[index];
-                context_1.window.error(err);
-                context_1.subscription.unsubscribe();
-            }
-        }
-        _super.prototype._error.call(this, err);
-    };
-    WindowToggleSubscriber.prototype._complete = function () {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_2 = contexts[index];
-                context_2.window.complete();
-                context_2.subscription.unsubscribe();
-            }
-        }
-        _super.prototype._complete.call(this);
-    };
-    WindowToggleSubscriber.prototype._unsubscribe = function () {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_3 = contexts[index];
-                context_3.window.unsubscribe();
-                context_3.subscription.unsubscribe();
-            }
+
+function win32(path) {
+  assertPath(path);
+  var len = path.length;
+  if (len === 0)
+    return '.';
+  var rootEnd = -1;
+  var end = -1;
+  var matchedSlash = true;
+  var offset = 0;
+  var code = path.charCodeAt(0);
+
+  // Try to match a root
+  if (len > 1) {
+    if (code === 47/*/*/ || code === 92/*\*/) {
+      // Possible UNC root
+
+      rootEnd = offset = 1;
+
+      code = path.charCodeAt(1);
+      if (code === 47/*/*/ || code === 92/*\*/) {
+        // Matched double path separator at beginning
+        var j = 2;
+        var last = j;
+        // Match 1 or more non-path separators
+        for (; j < len; ++j) {
+          code = path.charCodeAt(j);
+          if (code === 47/*/*/ || code === 92/*\*/)
+            break;
         }
-    };
-    WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        if (outerValue === this.openings) {
-            var closingNotifier = void 0;
-            try {
-                var closingSelector = this.closingSelector;
-                closingNotifier = closingSelector(innerValue);
-            }
-            catch (e) {
-                return this.error(e);
+        if (j < len && j !== last) {
+          // Matched!
+          last = j;
+          // Match 1 or more path separators
+          for (; j < len; ++j) {
+            code = path.charCodeAt(j);
+            if (code !== 47/*/*/ && code !== 92/*\*/)
+              break;
+          }
+          if (j < len && j !== last) {
+            // Matched!
+            last = j;
+            // Match 1 or more non-path separators
+            for (; j < len; ++j) {
+              code = path.charCodeAt(j);
+              if (code === 47/*/*/ || code === 92/*\*/)
+                break;
             }
-            var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-            var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-            var context_4 = { window: window_1, subscription: subscription };
-            this.contexts.push(context_4);
-            var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, closingNotifier, context_4);
-            if (innerSubscription.closed) {
-                this.closeWindow(this.contexts.length - 1);
+            if (j === len) {
+              // We matched a UNC root only
+              return path;
             }
-            else {
-                innerSubscription.context = context_4;
-                subscription.add(innerSubscription);
+            if (j !== last) {
+              // We matched a UNC root with leftovers
+
+              // Offset by 1 to include the separator after the UNC root to
+              // treat it as a "normal root" on top of a (UNC) root
+              rootEnd = offset = j + 1;
             }
-            this.destination.next(window_1);
-        }
-        else {
-            this.closeWindow(this.contexts.indexOf(outerValue));
-        }
-    };
-    WindowToggleSubscriber.prototype.notifyError = function (err) {
-        this.error(err);
-    };
-    WindowToggleSubscriber.prototype.notifyComplete = function (inner) {
-        if (inner !== this.openSubscription) {
-            this.closeWindow(this.contexts.indexOf(inner.context));
+          }
         }
-    };
-    WindowToggleSubscriber.prototype.closeWindow = function (index) {
-        if (index === -1) {
-            return;
+      }
+    } else if ((code >= 65/*A*/ && code <= 90/*Z*/) ||
+               (code >= 97/*a*/ && code <= 122/*z*/)) {
+      // Possible device root
+
+      code = path.charCodeAt(1);
+      if (path.charCodeAt(1) === 58/*:*/) {
+        rootEnd = offset = 2;
+        if (len > 2) {
+          code = path.charCodeAt(2);
+          if (code === 47/*/*/ || code === 92/*\*/)
+            rootEnd = offset = 3;
         }
-        var contexts = this.contexts;
-        var context = contexts[index];
-        var window = context.window, subscription = context.subscription;
-        contexts.splice(index, 1);
-        window.complete();
-        subscription.unsubscribe();
-    };
-    return WindowToggleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-//# sourceMappingURL=windowToggle.js.map
+      }
+    }
+  } else if (code === 47/*/*/ || code === 92/*\*/) {
+    return path[0];
+  }
+
+  for (var i = len - 1; i >= offset; --i) {
+    code = path.charCodeAt(i);
+    if (code === 47/*/*/ || code === 92/*\*/) {
+      if (!matchedSlash) {
+        end = i;
+        break;
+      }
+    } else {
+      // We saw the first non-path separator
+      matchedSlash = false;
+    }
+  }
+
+  if (end === -1) {
+    if (rootEnd === -1)
+      return '.';
+    else
+      end = rootEnd;
+  }
+  return path.slice(0, end);
+}
+
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
 
 /***/ }),
-/* 521 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/path-is-absolute/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return windowWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(70);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(71);
-/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
+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) !== ':');
 
-function windowWhen(closingSelector) {
-    return function windowWhenOperatorFunction(source) {
-        return source.lift(new WindowOperator(closingSelector));
-    };
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
 }
-var WindowOperator = /*@__PURE__*/ (function () {
-    function WindowOperator(closingSelector) {
-        this.closingSelector = closingSelector;
-    }
-    WindowOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector));
-    };
-    return WindowOperator;
-}());
-var WindowSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super);
-    function WindowSubscriber(destination, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.closingSelector = closingSelector;
-        _this.openWindow();
-        return _this;
-    }
-    WindowSubscriber.prototype.notifyNext = function (_outerValue, _innerValue, _outerIndex, _innerIndex, innerSub) {
-        this.openWindow(innerSub);
-    };
-    WindowSubscriber.prototype.notifyError = function (error) {
-        this._error(error);
-    };
-    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.openWindow(innerSub);
-    };
-    WindowSubscriber.prototype._next = function (value) {
-        this.window.next(value);
-    };
-    WindowSubscriber.prototype._error = function (err) {
-        this.window.error(err);
-        this.destination.error(err);
-        this.unsubscribeClosingNotification();
-    };
-    WindowSubscriber.prototype._complete = function () {
-        this.window.complete();
-        this.destination.complete();
-        this.unsubscribeClosingNotification();
-    };
-    WindowSubscriber.prototype.unsubscribeClosingNotification = function () {
-        if (this.closingNotification) {
-            this.closingNotification.unsubscribe();
-        }
-    };
-    WindowSubscriber.prototype.openWindow = function (innerSub) {
-        if (innerSub === void 0) {
-            innerSub = null;
-        }
-        if (innerSub) {
-            this.remove(innerSub);
-            innerSub.unsubscribe();
-        }
-        var prevWindow = this.window;
-        if (prevWindow) {
-            prevWindow.complete();
-        }
-        var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        this.destination.next(window);
-        var closingNotifier;
-        try {
-            var closingSelector = this.closingSelector;
-            closingNotifier = closingSelector();
-        }
-        catch (e) {
-            this.destination.error(e);
-            this.window.error(e);
-            return;
-        }
-        this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier));
-    };
-    return WindowSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
-//# sourceMappingURL=windowWhen.js.map
+
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
 
 /***/ }),
-/* 522 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return withLatestFrom; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(70);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(71);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
+/***/ "../../node_modules/path-parse/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-function withLatestFrom() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    return function (source) {
-        var project;
-        if (typeof args[args.length - 1] === 'function') {
-            project = args.pop();
-        }
-        var observables = args;
-        return source.lift(new WithLatestFromOperator(observables, project));
-    };
-}
-var WithLatestFromOperator = /*@__PURE__*/ (function () {
-    function WithLatestFromOperator(observables, project) {
-        this.observables = observables;
-        this.project = project;
-    }
-    WithLatestFromOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project));
-    };
-    return WithLatestFromOperator;
-}());
-var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WithLatestFromSubscriber, _super);
-    function WithLatestFromSubscriber(destination, observables, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.observables = observables;
-        _this.project = project;
-        _this.toRespond = [];
-        var len = observables.length;
-        _this.values = new Array(len);
-        for (var i = 0; i < len; i++) {
-            _this.toRespond.push(i);
-        }
-        for (var i = 0; i < len; i++) {
-            var observable = observables[i];
-            _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, observable, undefined, i));
-        }
-        return _this;
-    }
-    WithLatestFromSubscriber.prototype.notifyNext = function (_outerValue, innerValue, outerIndex) {
-        this.values[outerIndex] = innerValue;
-        var toRespond = this.toRespond;
-        if (toRespond.length > 0) {
-            var found = toRespond.indexOf(outerIndex);
-            if (found !== -1) {
-                toRespond.splice(found, 1);
-            }
-        }
-    };
-    WithLatestFromSubscriber.prototype.notifyComplete = function () {
-    };
-    WithLatestFromSubscriber.prototype._next = function (value) {
-        if (this.toRespond.length === 0) {
-            var args = [value].concat(this.values);
-            if (this.project) {
-                this._tryProject(args);
-            }
-            else {
-                this.destination.next(args);
-            }
-        }
-    };
-    WithLatestFromSubscriber.prototype._tryProject = function (args) {
-        var result;
-        try {
-            result = this.project.apply(this, args);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return WithLatestFromSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=withLatestFrom.js.map
 
+var isWindows = process.platform === 'win32';
 
-/***/ }),
-/* 523 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// Regex to split a windows path into into [dir, root, basename, name, ext]
+var splitWindowsRe =
+    /^(((?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?[\\\/]?)(?:[^\\\/]*[\\\/])*)((\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))[\\\/]*$/;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; });
-/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(111);
-/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+var win32 = {};
 
-function zip() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function zipOperatorFunction(source) {
-        return source.lift.call(_observable_zip__WEBPACK_IMPORTED_MODULE_0__["zip"].apply(void 0, [source].concat(observables)));
-    };
+function win32SplitPath(filename) {
+  return splitWindowsRe.exec(filename).slice(1);
 }
-//# sourceMappingURL=zip.js.map
-
 
-/***/ }),
-/* 524 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+win32.parse = function(pathString) {
+  if (typeof pathString !== 'string') {
+    throw new TypeError(
+        "Parameter 'pathString' must be a string, not " + typeof pathString
+    );
+  }
+  var allParts = win32SplitPath(pathString);
+  if (!allParts || allParts.length !== 5) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  return {
+    root: allParts[1],
+    dir: allParts[0] === allParts[1] ? allParts[0] : allParts[0].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[4],
+    name: allParts[3]
+  };
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return zipAll; });
-/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(111);
-/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
 
-function zipAll(project) {
-    return function (source) { return source.lift(new _observable_zip__WEBPACK_IMPORTED_MODULE_0__["ZipOperator"](project)); };
-}
-//# sourceMappingURL=zipAll.js.map
 
+// Split a filename into [dir, root, basename, name, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^((\/?)(?:[^\/]*\/)*)((\.{1,2}|[^\/]+?|)(\.[^.\/]*|))[\/]*$/;
+var posix = {};
 
-/***/ }),
-/* 525 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+function posixSplitPath(filename) {
+  return splitPathRe.exec(filename).slice(1);
+}
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+posix.parse = function(pathString) {
+  if (typeof pathString !== 'string') {
+    throw new TypeError(
+        "Parameter 'pathString' must be a string, not " + typeof pathString
+    );
+  }
+  var allParts = posixSplitPath(pathString);
+  if (!allParts || allParts.length !== 5) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  
+  return {
+    root: allParts[1],
+    dir: allParts[0].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[4],
+    name: allParts[3],
+  };
+};
 
-var _observe_lines = __webpack_require__(526);
 
-Object.keys(_observe_lines).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _observe_lines[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _observe_lines[key];
-    }
-  });
-});
+if (isWindows)
+  module.exports = win32.parse;
+else /* posix */
+  module.exports = posix.parse;
 
-var _observe_readable = __webpack_require__(527);
+module.exports.posix = posix.parse;
+module.exports.win32 = win32.parse;
 
-Object.keys(_observe_readable).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _observe_readable[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _observe_readable[key];
-    }
-  });
-});
 
 /***/ }),
-/* 526 */
+
+/***/ "../../node_modules/path-type/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.observeLines = observeLines;
-
-var Rx = _interopRequireWildcard(__webpack_require__(9));
-
-var _operators = __webpack_require__(427);
-
-var _observe_readable = __webpack_require__(527);
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+async function isType(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+	try {
+		const stats = await promisify(fs[fsStatType])(filePath);
+		return stats[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-const SEP = /\r?\n/;
+		throw error;
+	}
+}
 
-/**
- *  Creates an Observable from a Readable Stream that:
- *   - splits data from `readable` into lines
- *   - completes when `readable` emits "end"
- *   - fails if `readable` emits "errors"
- *
- *  @param  {ReadableStream} readable
- *  @return {Rx.Observable}
- */
-function observeLines(readable) {
-  const done$ = (0, _observe_readable.observeReadable)(readable).pipe((0, _operators.share)());
-  const scan$ = Rx.fromEvent(readable, 'data').pipe((0, _operators.scan)(({
-    buffer
-  }, chunk) => {
-    buffer += chunk;
-    const lines = [];
+function isTypeSync(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
 
-    while (true) {
-      const match = buffer.match(SEP);
+	try {
+		return fs[fsStatType](filePath)[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
 
-      if (!match || match.index === undefined) {
-        break;
-      }
+		throw error;
+	}
+}
 
-      lines.push(buffer.slice(0, match.index));
-      buffer = buffer.slice(match.index + match[0].length);
-    }
+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');
 
-    return {
-      buffer,
-      lines
-    };
-  }, {
-    buffer: ''
-  }), // stop if done completes or errors
-  (0, _operators.takeUntil)(done$.pipe((0, _operators.materialize)())), (0, _operators.share)());
-  return Rx.merge( // use done$ to provide completion/errors
-  done$, // merge in the "lines" from each step
-  scan$.pipe((0, _operators.mergeMap)(({
-    lines
-  }) => lines || [])), // inject the "unsplit" data at the end
-  scan$.pipe((0, _operators.last)(), (0, _operators.mergeMap)(({
-    buffer
-  }) => buffer ? [buffer] : []), // if there were no lines, last() will error, so catch and complete
-  (0, _operators.catchError)(() => Rx.empty())));
-}
 
 /***/ }),
-/* 527 */
+
+/***/ "../../node_modules/picomatch/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.observeReadable = observeReadable;
+module.exports = __webpack_require__("../../node_modules/picomatch/lib/picomatch.js");
 
-var Rx = _interopRequireWildcard(__webpack_require__(9));
 
-var _operators = __webpack_require__(427);
+/***/ }),
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+/***/ "../../node_modules/picomatch/lib/constants.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+"use strict";
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+
+const path = __webpack_require__("path");
+const WIN_SLASH = '\\\\/';
+const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
 /**
- *  Produces an Observable from a ReadableSteam that:
- *   - completes on the first "end" event
- *   - fails on the first "error" event
+ * Posix glob regex
  */
-function observeReadable(readable) {
-  return Rx.race(Rx.fromEvent(readable, 'end').pipe((0, _operators.first)(), (0, _operators.ignoreElements)()), Rx.fromEvent(readable, 'error').pipe((0, _operators.first)(), (0, _operators.mergeMap)(err => Rx.throwError(err))));
-}
-
-/***/ }),
-/* 528 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removeYarnIntegrityFileIfExists", function() { return removeYarnIntegrityFileIfExists; });
-/* 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 _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+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
+};
 
-async function removeYarnIntegrityFileIfExists(nodeModulesPath) {
-  try {
-    const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["tryRealpath"])(nodeModulesPath);
-    const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // check if the file exists and delete it in that case
+/**
+ * Windows glob regex
+ */
 
-    if (await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["isFile"])(yarnIntegrityFilePath)) {
-      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["unlink"])(yarnIntegrityFilePath);
-    }
-  } catch {// no-op
-  }
-}
+const WINDOWS_CHARS = {
+  ...POSIX_CHARS,
 
-/***/ }),
-/* 529 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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}]|$)`
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setupRemoteCache", function() { return setupRemoteCache; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(132);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__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 _child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(221);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(220);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/**
+ * POSIX Bracket Regex
  */
 
+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'
+};
+
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
+  POSIX_REGEX_SOURCE,
 
+  // 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,
 
+  // Replace globs with equivalent patterns to reduce parsing time.
+  REPLACEMENTS: {
+    '***': '*',
+    '**/**': '**',
+    '**/**/**': '**'
+  },
 
+  // Digits
+  CHAR_0: 48, /* 0 */
+  CHAR_9: 57, /* 9 */
 
+  // Alphabet chars.
+  CHAR_UPPERCASE_A: 65, /* A */
+  CHAR_LOWERCASE_A: 97, /* a */
+  CHAR_UPPERCASE_Z: 90, /* Z */
+  CHAR_LOWERCASE_Z: 122, /* z */
 
-async function isVaultAvailable() {
-  try {
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('vault', ['--version'], {
-      stdio: 'pipe'
-    });
-    return true;
-  } catch {
-    return false;
-  }
-}
+  CHAR_LEFT_PARENTHESES: 40, /* ( */
+  CHAR_RIGHT_PARENTHESES: 41, /* ) */
 
-async function isElasticCommitter() {
-  try {
-    const {
-      stdout: email
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('git', ['config', 'user.email'], {
-      stdio: 'pipe'
-    });
-    return email.trim().endsWith('@elastic.co');
-  } catch {
-    return false;
-  }
-}
+  CHAR_ASTERISK: 42, /* * */
 
-async function setupRemoteCache(repoRootPath) {
-  // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
-  if (process.env.CI || !(await isElasticCommitter())) {
-    return;
-  }
+  // 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 */
 
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] setting up remote cache settings if necessary`);
-  const settingsPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(repoRootPath, '.bazelrc.cache');
+  SEP: path.sep,
 
-  if (Object(fs__WEBPACK_IMPORTED_MODULE_1__["existsSync"])(settingsPath)) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] remote cache settings already exist, skipping`);
-    return;
-  }
+  /**
+   * Create EXTGLOB_CHARS
+   */
 
-  if (!(await isVaultAvailable())) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
-    return;
-  }
+  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: ')' }
+    };
+  },
 
-  let apiKey = '';
+  /**
+   * Create GLOB_CHARS
+   */
 
-  try {
-    const {
-      stdout
-    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('vault', ['read', '-field=readonly-key', 'secret/ui-team/kibana-bazel-remote-cache'], {
-      stdio: 'pipe'
-    });
-    apiKey = stdout.trim();
-  } catch (ex) {
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] unable to read bazel remote cache key from vault, are you authenticated?');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
-    _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] ${ex}`);
-    return;
+  globChars(win32) {
+    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
   }
+};
 
-  const contents = dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-    # V1 - This file is automatically generated by 'yarn kbn bootstrap'
-    # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
-    build --bes_results_url=https://app.buildbuddy.io/invocation/
-    build --bes_backend=grpcs://cloud.buildbuddy.io
-    build --remote_cache=grpcs://cloud.buildbuddy.io
-    build --remote_timeout=3600
-    build --remote_header=${apiKey}
-  `;
-  Object(fs__WEBPACK_IMPORTED_MODULE_1__["writeFileSync"])(settingsPath, contents);
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] remote cache settings written to ${settingsPath}`);
-}
 
 /***/ }),
-/* 530 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BuildCommand", function() { return BuildCommand; });
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(423);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/***/ "../../node_modules/picomatch/lib/parse.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const BuildCommand = {
-  description: 'Runs a build in the Bazel built packages',
-  name: 'build',
-  reportTiming: {
-    group: 'scripts/kbn build',
-    id: 'total'
-  },
+"use strict";
 
-  async run(projects, projectGraph, {
-    options
-  }) {
-    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages
 
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runBazel"])(['build', '//packages:build', '--show_result=1'], runOffline);
-  }
+const constants = __webpack_require__("../../node_modules/picomatch/lib/constants.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
 
-};
+/**
+ * Constants
+ */
 
-/***/ }),
-/* 531 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const {
+  MAX_LENGTH,
+  POSIX_REGEX_SOURCE,
+  REGEX_NON_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_BACKREF,
+  REPLACEMENTS
+} = constants;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(240);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(532);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(423);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(231);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(220);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/**
+ * Helpers
  */
 
+const expandRange = (args, options) => {
+  if (typeof options.expandRange === 'function') {
+    return options.expandRange(...args, options);
+  }
 
+  args.sort();
+  const value = `[${args.join('-')}]`;
 
+  try {
+    /* eslint-disable-next-line no-new */
+    new RegExp(value);
+  } catch (ex) {
+    return args.map(v => utils.escapeRegex(v)).join('..');
+  }
 
+  return value;
+};
 
+/**
+ * Create the message for a syntax error
+ */
 
+const syntaxError = (type, char) => {
+  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
+};
 
-const CleanCommand = {
-  description: 'Deletes output directories and resets internal caches.',
-  name: 'clean',
-  reportTiming: {
-    group: 'scripts/kbn clean',
-    id: 'total'
-  },
-
-  async run(projects) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      This command is only necessary for the circumstance where you need to recover a consistent
-      state when problems arise. If you need to run this command often, please let us know by
-      filling out this form: https://ela.st/yarn-kbn-clean.
-      Please not it might not solve problems with node_modules. To solve problems around node_modules
-      you might need to run 'yarn kbn reset'.
-    `);
-    const toDelete = [];
+/**
+ * Parse the given input string.
+ * @param {String} input
+ * @param {Object} options
+ * @return {Object}
+ */
 
-    for (const project of projects.values()) {
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(project.targetLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
-        });
-      }
+const parse = (input, options) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
 
-      const {
-        extraPatterns
-      } = project.getCleanConfig();
+  input = REPLACEMENTS[input] || input;
 
-      if (extraPatterns) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: extraPatterns
-        });
-      }
-    } // Runs Bazel soft clean
+  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}`);
+  }
 
-    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["isBazelBinAvailable"])()) {
-      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean']);
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Soft cleaned bazel');
-    }
+  const bos = { type: 'bos', value: '', output: opts.prepend || '' };
+  const tokens = [bos];
 
-    if (toDelete.length === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["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();
+  const capture = opts.capture ? '' : '?:';
+  const win32 = utils.isWindows(options);
 
-      try {
-        for (const {
-          pattern,
-          cwd
-        } of toDelete) {
-          process.chdir(cwd);
-          const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
+  // create constants based on platform, for windows or posix
+  const PLATFORM_CHARS = constants.globChars(win32);
+  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
 
-          if (_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].wouldLogLevel('info')) {
-            ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
-          }
+  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;
 
-          await promise;
-        }
-      } finally {
-        process.chdir(originalCwd);
-      }
-    }
-  }
+  const globstar = opts => {
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
-};
+  const nodot = opts.dot ? '' : NO_DOT;
+  const qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
+  let star = opts.bash === true ? globstar(opts) : STAR;
 
-/***/ }),
-/* 532 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (opts.capture) {
+    star = `(${star})`;
+  }
 
-"use strict";
+  // minimatch options support
+  if (typeof opts.noext === 'boolean') {
+    opts.noextglob = opts.noext;
+  }
 
-const readline = __webpack_require__(533);
-const chalk = __webpack_require__(534);
-const cliCursor = __webpack_require__(537);
-const cliSpinners = __webpack_require__(539);
-const logSymbols = __webpack_require__(541);
-const stripAnsi = __webpack_require__(547);
-const wcwidth = __webpack_require__(549);
-const isInteractive = __webpack_require__(553);
-const MuteStream = __webpack_require__(554);
+  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 TEXT = Symbol('text');
-const PREFIX_TEXT = Symbol('prefixText');
+  input = utils.removePrefix(input, state);
+  len = input.length;
 
-const ASCII_ETX_CODE = 0x03; // Ctrl+C emits this code
+  const extglobs = [];
+  const braces = [];
+  const stack = [];
+  let prev = bos;
+  let value;
 
-class StdinDiscarder {
-	constructor() {
-		this.requests = 0;
+  /**
+   * Tokenizing helpers
+   */
 
-		this.mutedStream = new MuteStream();
-		this.mutedStream.pipe(process.stdout);
-		this.mutedStream.mute();
+  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 self = this;
-		this.ourEmit = function (event, data, ...args) {
-			const {stdin} = process;
-			if (self.requests > 0 || stdin.emit === self.ourEmit) {
-				if (event === 'keypress') { // Fixes readline behavior
-					return;
-				}
+  const append = token => {
+    state.output += token.output != null ? token.output : token.value;
+    consume(token.value);
+  };
 
-				if (event === 'data' && data.includes(ASCII_ETX_CODE)) {
-					process.emit('SIGINT');
-				}
+  const negate = () => {
+    let count = 1;
 
-				Reflect.apply(self.oldEmit, this, [event, data, ...args]);
-			} else {
-				Reflect.apply(process.stdin.emit, this, [event, data, ...args]);
-			}
-		};
-	}
+    while (peek() === '!' && (peek(2) !== '(' || peek(3) === '?')) {
+      advance();
+      state.start++;
+      count++;
+    }
 
-	start() {
-		this.requests++;
+    if (count % 2 === 0) {
+      return false;
+    }
 
-		if (this.requests === 1) {
-			this.realStart();
-		}
-	}
+    state.negated = true;
+    state.start++;
+    return true;
+  };
 
-	stop() {
-		if (this.requests <= 0) {
-			throw new Error('`stop` called more times than `start`');
-		}
+  const increment = type => {
+    state[type]++;
+    stack.push(type);
+  };
 
-		this.requests--;
+  const decrement = type => {
+    state[type]--;
+    stack.pop();
+  };
 
-		if (this.requests === 0) {
-			this.realStop();
-		}
-	}
+  /**
+   * 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.
+   */
 
-	realStart() {
-		// No known way to make it work reliably on Windows
-		if (process.platform === 'win32') {
-			return;
-		}
+  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'));
 
-		this.rl = readline.createInterface({
-			input: process.stdin,
-			output: this.mutedStream
-		});
+      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;
+      }
+    }
 
-		this.rl.on('SIGINT', () => {
-			if (process.listenerCount('SIGINT') === 0) {
-				process.emit('SIGINT');
-			} else {
-				this.rl.close();
-				process.kill(process.pid, 'SIGINT');
-			}
-		});
-	}
+    if (extglobs.length && tok.type !== 'paren') {
+      extglobs[extglobs.length - 1].inner += tok.value;
+    }
 
-	realStop() {
-		if (process.platform === 'win32') {
-			return;
-		}
+    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;
+    }
 
-		this.rl.close();
-		this.rl = undefined;
-	}
-}
+    tok.prev = prev;
+    tokens.push(tok);
+    prev = tok;
+  };
 
-let stdinDiscarder;
+  const extglobOpen = (type, value) => {
+    const token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
 
-class Ora {
-	constructor(options) {
-		if (!stdinDiscarder) {
-			stdinDiscarder = new StdinDiscarder();
-		}
+    token.prev = prev;
+    token.parens = state.parens;
+    token.output = state.output;
+    const output = (opts.capture ? '(' : '') + token.open;
 
-		if (typeof options === 'string') {
-			options = {
-				text: options
-			};
-		}
+    increment('parens');
+    push({ type, value, output: state.output ? '' : ONE_CHAR });
+    push({ type: 'paren', extglob: true, value: advance(), output });
+    extglobs.push(token);
+  };
 
-		this.options = {
-			text: '',
-			color: 'cyan',
-			stream: process.stderr,
-			discardStdin: true,
-			...options
-		};
+  const extglobClose = token => {
+    let output = token.close + (opts.capture ? ')' : '');
+    let rest;
 
-		this.spinner = this.options.spinner;
+    if (token.type === 'negate') {
+      let extglobStar = star;
 
-		this.color = this.options.color;
-		this.hideCursor = this.options.hideCursor !== false;
-		this.interval = this.options.interval || this.spinner.interval || 100;
-		this.stream = this.options.stream;
-		this.id = undefined;
-		this.isEnabled = typeof this.options.isEnabled === 'boolean' ? this.options.isEnabled : isInteractive({stream: this.stream});
+      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
+        extglobStar = globstar(opts);
+      }
 
-		// Set *after* `this.stream`
-		this.text = this.options.text;
-		this.prefixText = this.options.prefixText;
-		this.linesToClear = 0;
-		this.indent = this.options.indent;
-		this.discardStdin = this.options.discardStdin;
-		this.isDiscardingStdin = false;
-	}
+      if (extglobStar !== star || eos() || /^\)+$/.test(remaining())) {
+        output = token.close = `)$))${extglobStar}`;
+      }
 
-	get indent() {
-		return this._indent;
-	}
+      if (token.inner.includes('*') && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
+        output = token.close = `)${rest})${extglobStar})`;
+      }
 
-	set indent(indent = 0) {
-		if (!(indent >= 0 && Number.isInteger(indent))) {
-			throw new Error('The `indent` option must be an integer from 0 and up');
-		}
+      if (token.prev.type === 'bos') {
+        state.negatedExtglob = true;
+      }
+    }
 
-		this._indent = indent;
-	}
+    push({ type: 'paren', extglob: true, value, output });
+    decrement('parens');
+  };
 
-	_updateInterval(interval) {
-		if (interval !== undefined) {
-			this.interval = interval;
-		}
-	}
+  /**
+   * Fast paths
+   */
 
-	get spinner() {
-		return this._spinner;
-	}
+  if (opts.fastpaths !== false && !/(^[*!]|[/()[\]{}"])/.test(input)) {
+    let backslashes = false;
 
-	set spinner(spinner) {
-		this.frameIndex = 0;
+    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
+      if (first === '\\') {
+        backslashes = true;
+        return m;
+      }
 
-		if (typeof spinner === 'object') {
-			if (spinner.frames === undefined) {
-				throw new Error('The given spinner must have a `frames` property');
-			}
+      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);
+      }
 
-			this._spinner = spinner;
-		} else if (process.platform === 'win32') {
-			this._spinner = cliSpinners.line;
-		} else if (spinner === undefined) {
-			// Set default spinner
-			this._spinner = cliSpinners.dots;
-		} else if (cliSpinners[spinner]) {
-			this._spinner = cliSpinners[spinner];
-		} else {
-			throw new Error(`There is no built-in spinner named '${spinner}'. See https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json for a full list.`);
-		}
+      if (first === '.') {
+        return DOT_LITERAL.repeat(chars.length);
+      }
 
-		this._updateInterval(this._spinner.interval);
-	}
+      if (first === '*') {
+        if (esc) {
+          return esc + first + (rest ? star : '');
+        }
+        return star;
+      }
+      return esc ? m : `\\${m}`;
+    });
 
-	get text() {
-		return this[TEXT];
-	}
+    if (backslashes === true) {
+      if (opts.unescape === true) {
+        output = output.replace(/\\/g, '');
+      } else {
+        output = output.replace(/\\+/g, m => {
+          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
+        });
+      }
+    }
 
-	get prefixText() {
-		return this[PREFIX_TEXT];
-	}
+    if (output === input && opts.contains === true) {
+      state.output = input;
+      return state;
+    }
 
-	get isSpinning() {
-		return this.id !== undefined;
-	}
+    state.output = utils.wrapOutput(output, state, options);
+    return state;
+  }
 
-	updateLineCount() {
-		const columns = this.stream.columns || 80;
-		const fullPrefixText = (typeof this[PREFIX_TEXT] === 'string') ? this[PREFIX_TEXT] + '-' : '';
-		this.lineCount = stripAnsi(fullPrefixText + '--' + this[TEXT]).split('\n').reduce((count, line) => {
-			return count + Math.max(1, Math.ceil(wcwidth(line) / columns));
-		}, 0);
-	}
+  /**
+   * Tokenize input until we reach end-of-string
+   */
 
-	set text(value) {
-		this[TEXT] = value;
-		this.updateLineCount();
-	}
+  while (!eos()) {
+    value = advance();
 
-	set prefixText(value) {
-		this[PREFIX_TEXT] = value;
-		this.updateLineCount();
-	}
+    if (value === '\u0000') {
+      continue;
+    }
 
-	frame() {
-		const {frames} = this.spinner;
-		let frame = frames[this.frameIndex];
+    /**
+     * Escaped characters
+     */
 
-		if (this.color) {
-			frame = chalk[this.color](frame);
-		}
+    if (value === '\\') {
+      const next = peek();
 
-		this.frameIndex = ++this.frameIndex % frames.length;
-		const fullPrefixText = (typeof this.prefixText === 'string' && this.prefixText !== '') ? this.prefixText + ' ' : '';
-		const fullText = typeof this.text === 'string' ? ' ' + this.text : '';
+      if (next === '/' && opts.bash !== true) {
+        continue;
+      }
 
-		return fullPrefixText + frame + fullText;
-	}
+      if (next === '.' || next === ';') {
+        continue;
+      }
 
-	clear() {
-		if (!this.isEnabled || !this.stream.isTTY) {
-			return this;
-		}
+      if (!next) {
+        value += '\\';
+        push({ type: 'text', value });
+        continue;
+      }
 
-		for (let i = 0; i < this.linesToClear; i++) {
-			if (i > 0) {
-				this.stream.moveCursor(0, -1);
-			}
+      // collapse slashes to reduce potential for exploits
+      const match = /^\\+/.exec(remaining());
+      let slashes = 0;
 
-			this.stream.clearLine();
-			this.stream.cursorTo(this.indent);
-		}
+      if (match && match[0].length > 2) {
+        slashes = match[0].length;
+        state.index += slashes;
+        if (slashes % 2 !== 0) {
+          value += '\\';
+        }
+      }
 
-		this.linesToClear = 0;
+      if (opts.unescape === true) {
+        value = advance();
+      } else {
+        value += advance();
+      }
 
-		return this;
-	}
+      if (state.brackets === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
+    }
 
-	render() {
-		this.clear();
-		this.stream.write(this.frame());
-		this.linesToClear = this.lineCount;
+    /**
+     * If we're inside a regex character class, continue
+     * until we reach the closing bracket.
+     */
 
-		return this;
-	}
+    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;
 
-	start(text) {
-		if (text) {
-			this.text = text;
-		}
+          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 (!this.isEnabled) {
-			if (this.text) {
-				this.stream.write(`- ${this.text}\n`);
-			}
+              if (!bos.output && tokens.indexOf(prev) === 1) {
+                bos.output = ONE_CHAR;
+              }
+              continue;
+            }
+          }
+        }
+      }
 
-			return this;
-		}
+      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
+        value = `\\${value}`;
+      }
 
-		if (this.isSpinning) {
-			return this;
-		}
+      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
+        value = `\\${value}`;
+      }
 
-		if (this.hideCursor) {
-			cliCursor.hide(this.stream);
-		}
+      if (opts.posix === true && value === '!' && prev.value === '[') {
+        value = '^';
+      }
+
+      prev.value += value;
+      append({ value });
+      continue;
+    }
 
-		if (this.discardStdin && process.stdin.isTTY) {
-			this.isDiscardingStdin = true;
-			stdinDiscarder.start();
-		}
+    /**
+     * If we're inside a quoted string, continue
+     * until we reach the closing double quote.
+     */
 
-		this.render();
-		this.id = setInterval(this.render.bind(this), this.interval);
+    if (state.quotes === 1 && value !== '"') {
+      value = utils.escapeRegex(value);
+      prev.value += value;
+      append({ value });
+      continue;
+    }
 
-		return this;
-	}
+    /**
+     * Double quotes
+     */
 
-	stop() {
-		if (!this.isEnabled) {
-			return this;
-		}
+    if (value === '"') {
+      state.quotes = state.quotes === 1 ? 0 : 1;
+      if (opts.keepQuotes === true) {
+        push({ type: 'text', value });
+      }
+      continue;
+    }
 
-		clearInterval(this.id);
-		this.id = undefined;
-		this.frameIndex = 0;
-		this.clear();
-		if (this.hideCursor) {
-			cliCursor.show(this.stream);
-		}
+    /**
+     * Parentheses
+     */
 
-		if (this.discardStdin && process.stdin.isTTY && this.isDiscardingStdin) {
-			stdinDiscarder.stop();
-			this.isDiscardingStdin = false;
-		}
+    if (value === '(') {
+      increment('parens');
+      push({ type: 'paren', value });
+      continue;
+    }
 
-		return this;
-	}
+    if (value === ')') {
+      if (state.parens === 0 && opts.strictBrackets === true) {
+        throw new SyntaxError(syntaxError('opening', '('));
+      }
 
-	succeed(text) {
-		return this.stopAndPersist({symbol: logSymbols.success, text});
-	}
+      const extglob = extglobs[extglobs.length - 1];
+      if (extglob && state.parens === extglob.parens + 1) {
+        extglobClose(extglobs.pop());
+        continue;
+      }
 
-	fail(text) {
-		return this.stopAndPersist({symbol: logSymbols.error, text});
-	}
+      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
+      decrement('parens');
+      continue;
+    }
 
-	warn(text) {
-		return this.stopAndPersist({symbol: logSymbols.warning, text});
-	}
+    /**
+     * Square brackets
+     */
 
-	info(text) {
-		return this.stopAndPersist({symbol: logSymbols.info, text});
-	}
+    if (value === '[') {
+      if (opts.nobracket === true || !remaining().includes(']')) {
+        if (opts.nobracket !== true && opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('closing', ']'));
+        }
 
-	stopAndPersist(options = {}) {
-		const prefixText = options.prefixText || this.prefixText;
-		const fullPrefixText = (typeof prefixText === 'string' && prefixText !== '') ? prefixText + ' ' : '';
-		const text = options.text || this.text;
-		const fullText = (typeof text === 'string') ? ' ' + text : '';
+        value = `\\${value}`;
+      } else {
+        increment('brackets');
+      }
 
-		this.stop();
-		this.stream.write(`${fullPrefixText}${options.symbol || ' '}${fullText}\n`);
+      push({ type: 'bracket', value });
+      continue;
+    }
 
-		return this;
-	}
-}
+    if (value === ']') {
+      if (opts.nobracket === true || (prev && prev.type === 'bracket' && prev.value.length === 1)) {
+        push({ type: 'text', value, output: `\\${value}` });
+        continue;
+      }
 
-const oraFactory = function (options) {
-	return new Ora(options);
-};
+      if (state.brackets === 0) {
+        if (opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('opening', '['));
+        }
 
-module.exports = oraFactory;
+        push({ type: 'text', value, output: `\\${value}` });
+        continue;
+      }
 
-module.exports.promise = (action, options) => {
-	// eslint-disable-next-line promise/prefer-await-to-then
-	if (typeof action.then !== 'function') {
-		throw new TypeError('Parameter `action` must be a Promise');
-	}
+      decrement('brackets');
 
-	const spinner = new Ora(options);
-	spinner.start();
+      const prevValue = prev.value.slice(1);
+      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
+        value = `/${value}`;
+      }
 
-	(async () => {
-		try {
-			await action;
-			spinner.succeed();
-		} catch (_) {
-			spinner.fail();
-		}
-	})();
+      prev.value += value;
+      append({ value });
 
-	return spinner;
-};
+      // when literal brackets are explicitly disabled
+      // assume we should match with a regex character class
+      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
+        continue;
+      }
 
+      const escaped = utils.escapeRegex(prev.value);
+      state.output = state.output.slice(0, -prev.value.length);
 
-/***/ }),
-/* 533 */
-/***/ (function(module, exports) {
+      // 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;
+      }
 
-module.exports = require("readline");
+      // when the user specifies nothing, try to match both
+      prev.value = `(${capture}${escaped}|${prev.value})`;
+      state.output += prev.value;
+      continue;
+    }
 
-/***/ }),
-/* 534 */
-/***/ (function(module, exports, __webpack_require__) {
+    /**
+     * Braces
+     */
 
-"use strict";
+    if (value === '{' && opts.nobrace !== true) {
+      increment('braces');
 
-const ansiStyles = __webpack_require__(115);
-const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(121);
-const {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-} = __webpack_require__(535);
+      const open = {
+        type: 'brace',
+        value,
+        output: '(',
+        outputIndex: state.output.length,
+        tokensIndex: state.tokens.length
+      };
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = [
-	'ansi',
-	'ansi',
-	'ansi256',
-	'ansi16m'
-];
+      braces.push(open);
+      push(open);
+      continue;
+    }
 
-const styles = Object.create(null);
+    if (value === '}') {
+      const brace = braces[braces.length - 1];
 
-const applyOptions = (object, options = {}) => {
-	if (options.level > 3 || options.level < 0) {
-		throw new Error('The `level` option should be an integer from 0 to 3');
-	}
+      if (opts.nobrace === true || !brace) {
+        push({ type: 'text', value, output: value });
+        continue;
+      }
 
-	// Detect level if not set manually
-	const colorLevel = stdoutColor ? stdoutColor.level : 0;
-	object.level = options.level === undefined ? colorLevel : options.level;
-};
+      let output = ')';
 
-class ChalkClass {
-	constructor(options) {
-		return chalkFactory(options);
-	}
-}
+      if (brace.dots === true) {
+        const arr = tokens.slice();
+        const range = [];
 
-const chalkFactory = options => {
-	const chalk = {};
-	applyOptions(chalk, options);
+        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);
+          }
+        }
 
-	chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
+        output = expandRange(range, opts);
+        state.backtrack = true;
+      }
 
-	Object.setPrototypeOf(chalk, Chalk.prototype);
-	Object.setPrototypeOf(chalk.template, chalk);
+      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);
+        }
+      }
 
-	chalk.template.constructor = () => {
-		throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
-	};
+      push({ type: 'brace', value, output });
+      decrement('braces');
+      braces.pop();
+      continue;
+    }
 
-	chalk.template.Instance = ChalkClass;
+    /**
+     * Pipes
+     */
 
-	return chalk.template;
-};
+    if (value === '|') {
+      if (extglobs.length > 0) {
+        extglobs[extglobs.length - 1].conditions++;
+      }
+      push({ type: 'text', value });
+      continue;
+    }
 
-function Chalk(options) {
-	return chalkFactory(options);
-}
+    /**
+     * Commas
+     */
 
-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;
-		}
-	};
-}
+    if (value === ',') {
+      let output = value;
 
-styles.visible = {
-	get() {
-		const builder = createBuilder(this, this._styler, true);
-		Object.defineProperty(this, 'visible', {value: builder});
-		return builder;
-	}
-};
+      const brace = braces[braces.length - 1];
+      if (brace && stack[stack.length - 1] === 'braces') {
+        brace.comma = true;
+        output = '|';
+      }
 
-const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256'];
+      push({ type: 'comma', value, output });
+      continue;
+    }
 
-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);
-			};
-		}
-	};
-}
+    /**
+     * Slashes
+     */
 
-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);
-			};
-		}
-	};
-}
+    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;
+      }
 
-const proto = Object.defineProperties(() => {}, {
-	...styles,
-	level: {
-		enumerable: true,
-		get() {
-			return this._generator.level;
-		},
-		set(level) {
-			this._generator.level = level;
-		}
-	}
-});
+      push({ type: 'slash', value, output: SLASH_LITERAL });
+      continue;
+    }
 
-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;
-	}
+    /**
+     * Dots
+     */
 
-	return {
-		open,
-		close,
-		openAll,
-		closeAll,
-		parent
-	};
-};
+    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;
+      }
 
-const createBuilder = (self, _styler, _isEmpty) => {
-	const 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(' '));
-	};
+      if ((state.braces + state.parens) === 0 && prev.type !== 'bos' && prev.type !== 'slash') {
+        push({ type: 'text', value, output: DOT_LITERAL });
+        continue;
+      }
 
-	// `__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
+      push({ type: 'dot', value, output: DOT_LITERAL });
+      continue;
+    }
 
-	builder._generator = self;
-	builder._styler = _styler;
-	builder._isEmpty = _isEmpty;
+    /**
+     * Question marks
+     */
 
-	return builder;
-};
+    if (value === '?') {
+      const isGroup = prev && prev.value === '(';
+      if (!isGroup && opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('qmark', value);
+        continue;
+      }
 
-const applyStyle = (self, string) => {
-	if (self.level <= 0 || !string) {
-		return self._isEmpty ? '' : string;
-	}
+      if (prev && prev.type === 'paren') {
+        const next = peek();
+        let output = value;
 
-	let styler = self._styler;
+        if (next === '<' && !utils.supportsLookbehinds()) {
+          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
+        }
 
-	if (styler === undefined) {
-		return string;
-	}
+        if ((prev.value === '(' && !/[!=<:]/.test(next)) || (next === '<' && !/<([!=]|\w+>)/.test(remaining()))) {
+          output = `\\${value}`;
+        }
 
-	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);
+        push({ type: 'text', value, output });
+        continue;
+      }
 
-			styler = styler.parent;
-		}
-	}
+      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
+        push({ type: 'qmark', value, output: QMARK_NO_DOT });
+        continue;
+      }
 
-	// 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);
-	}
+      push({ type: 'qmark', value, output: QMARK });
+      continue;
+    }
 
-	return openAll + string + closeAll;
-};
+    /**
+     * Exclamation
+     */
 
-let template;
-const chalkTag = (chalk, ...strings) => {
-	const [firstString] = strings;
+    if (value === '!') {
+      if (opts.noextglob !== true && peek() === '(') {
+        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
+          extglobOpen('negate', value);
+          continue;
+        }
+      }
 
-	if (!Array.isArray(firstString)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return strings.join(' ');
-	}
+      if (opts.nonegate !== true && state.index === 0) {
+        negate();
+        continue;
+      }
+    }
 
-	const arguments_ = strings.slice(1);
-	const parts = [firstString.raw[0]];
+    /**
+     * Plus
+     */
 
-	for (let i = 1; i < firstString.length; i++) {
-		parts.push(
-			String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
-			String(firstString.raw[i])
-		);
-	}
+    if (value === '+') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('plus', value);
+        continue;
+      }
 
-	if (template === undefined) {
-		template = __webpack_require__(536);
-	}
+      if ((prev && prev.value === '(') || opts.regex === false) {
+        push({ type: 'plus', value, output: PLUS_LITERAL });
+        continue;
+      }
 
-	return template(chalk, parts.join(''));
-};
+      if ((prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) || state.parens > 0) {
+        push({ type: 'plus', value });
+        continue;
+      }
 
-Object.defineProperties(Chalk.prototype, styles);
+      push({ type: 'plus', value: PLUS_LITERAL });
+      continue;
+    }
 
-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;
+    /**
+     * Plain text
+     */
 
-// For TypeScript
-chalk.Level = {
-	None: 0,
-	Basic: 1,
-	Ansi256: 2,
-	TrueColor: 3,
-	0: 'None',
-	1: 'Basic',
-	2: 'Ansi256',
-	3: 'TrueColor'
-};
+    if (value === '@') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        push({ type: 'at', extglob: true, value, output: '' });
+        continue;
+      }
 
-module.exports = chalk;
+      push({ type: 'text', value });
+      continue;
+    }
 
+    /**
+     * Plain text
+     */
 
-/***/ }),
-/* 535 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (value !== '*') {
+      if (value === '$' || value === '^') {
+        value = `\\${value}`;
+      }
 
-"use strict";
+      const match = REGEX_NON_SPECIAL_CHARS.exec(remaining());
+      if (match) {
+        value += match[0];
+        state.index += match[0].length;
+      }
 
+      push({ type: 'text', value });
+      continue;
+    }
 
-const stringReplaceAll = (string, substring, replacer) => {
-	let index = string.indexOf(substring);
-	if (index === -1) {
-		return string;
-	}
+    /**
+     * Stars
+     */
 
-	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);
+    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;
+    }
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+    let rest = remaining();
+    if (opts.noextglob !== true && /^\([^?]/.test(rest)) {
+      extglobOpen('star', value);
+      continue;
+    }
 
-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);
+    if (prev.type === 'star') {
+      if (opts.noglobstar === true) {
+        consume(value);
+        continue;
+      }
 
-	returnValue += string.substr(endIndex);
-	return returnValue;
-};
+      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');
 
-module.exports = {
-	stringReplaceAll,
-	stringEncaseCRLFWithFirstIndex
-};
+      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;
+      }
 
-/***/ }),
-/* 536 */
-/***/ (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";
+      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;
+      }
 
-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;
+      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 ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
+        prev.type = 'globstar';
+        prev.output = globstar(opts) + (opts.strictSlashes ? ')' : '|$)');
+        prev.value += value;
+        state.globstar = true;
+        state.output += prior.output + prev.output;
+        consume(value);
+        continue;
+      }
 
-function unescape(c) {
-	const u = c[0] === 'u';
-	const bracket = c[1] === '{';
+      if (prior.type === 'slash' && prior.prev.type !== 'bos' && rest[0] === '/') {
+        const end = rest[1] !== void 0 ? '|$' : '';
 
-	if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
+        state.output = state.output.slice(0, -(prior.output + prev.output).length);
+        prior.output = `(?:${prior.output}`;
 
-	if (u && bracket) {
-		return String.fromCodePoint(parseInt(c.slice(2, -1), 16));
-	}
+        prev.type = 'globstar';
+        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
+        prev.value += value;
 
-	return ESCAPES.get(c) || c;
-}
+        state.output += prior.output + prev.output;
+        state.globstar = true;
 
-function parseArguments(name, arguments_) {
-	const results = [];
-	const chunks = arguments_.trim().split(/\s*,\s*/g);
-	let matches;
+        consume(value + advance());
 
-	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}')`);
-		}
-	}
+        push({ type: 'slash', value: '/', output: '' });
+        continue;
+      }
 
-	return results;
-}
+      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;
+      }
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+      // remove single star from output
+      state.output = state.output.slice(0, -prev.output.length);
 
-	const results = [];
-	let matches;
+      // reset previous token to globstar
+      prev.type = 'globstar';
+      prev.output = globstar(opts);
+      prev.value += value;
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+      // reset output with globstar
+      state.output += prev.output;
+      state.globstar = true;
+      consume(value);
+      continue;
+    }
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+    const token = { type: 'star', value, output: star };
 
-	return results;
-}
+    if (opts.bash === true) {
+      token.output = '.*?';
+      if (prev.type === 'bos' || prev.type === 'slash') {
+        token.output = nodot + token.output;
+      }
+      push(token);
+      continue;
+    }
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
+    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
+      token.output = value;
+      push(token);
+      continue;
+    }
 
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
+    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;
 
-	let current = chalk;
-	for (const [styleName, styles] of Object.entries(enabled)) {
-		if (!Array.isArray(styles)) {
-			continue;
-		}
+      } else if (opts.dot === true) {
+        state.output += NO_DOTS_SLASH;
+        prev.output += NO_DOTS_SLASH;
 
-		if (!(styleName in current)) {
-			throw new Error(`Unknown Chalk style: ${styleName}`);
-		}
+      } else {
+        state.output += nodot;
+        prev.output += nodot;
+      }
 
-		current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
-	}
+      if (peek() !== '*') {
+        state.output += ONE_CHAR;
+        prev.output += ONE_CHAR;
+      }
+    }
 
-	return current;
-}
+    push(token);
+  }
 
-module.exports = (chalk, temporary) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+  while (state.brackets > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
+    state.output = utils.escapeLast(state.output, '[');
+    decrement('brackets');
+  }
 
-	// 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');
-			}
+  while (state.parens > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
+    state.output = utils.escapeLast(state.output, '(');
+    decrement('parens');
+  }
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(character);
-		}
-	});
+  while (state.braces > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
+    state.output = utils.escapeLast(state.output, '{');
+    decrement('braces');
+  }
 
-	chunks.push(chunk.join(''));
+  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
+    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
+  }
 
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
-	}
+  // rebuild the output if we had to backtrack at any point
+  if (state.backtrack === true) {
+    state.output = '';
 
-	return chunks.join('');
-};
+    for (const token of state.tokens) {
+      state.output += token.output != null ? token.output : token.value;
 
+      if (token.suffix) {
+        state.output += token.suffix;
+      }
+    }
+  }
 
-/***/ }),
-/* 537 */
-/***/ (function(module, exports, __webpack_require__) {
+  return state;
+};
 
-"use strict";
+/**
+ * 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.
+ */
 
-const restoreCursor = __webpack_require__(538);
+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}`);
+  }
 
-let isHidden = false;
+  input = REPLACEMENTS[input] || input;
+  const win32 = utils.isWindows(options);
 
-exports.show = (writableStream = process.stderr) => {
-	if (!writableStream.isTTY) {
-		return;
-	}
+  // 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);
 
-	isHidden = false;
-	writableStream.write('\u001B[?25h');
-};
+  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;
 
-exports.hide = (writableStream = process.stderr) => {
-	if (!writableStream.isTTY) {
-		return;
-	}
+  if (opts.capture) {
+    star = `(${star})`;
+  }
 
-	restoreCursor();
-	isHidden = true;
-	writableStream.write('\u001B[?25l');
-};
+  const globstar = opts => {
+    if (opts.noglobstar === true) return star;
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
-exports.toggle = (force, writableStream) => {
-	if (force !== undefined) {
-		isHidden = force;
-	}
+  const create = str => {
+    switch (str) {
+      case '*':
+        return `${nodot}${ONE_CHAR}${star}`;
 
-	if (isHidden) {
-		exports.show(writableStream);
-	} else {
-		exports.hide(writableStream);
-	}
-};
+      case '.*':
+        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
 
+      case '*.*':
+        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-/***/ }),
-/* 538 */
-/***/ (function(module, exports, __webpack_require__) {
+      case '*/*':
+        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
 
-"use strict";
+      case '**':
+        return nodot + globstar(opts);
 
-const onetime = __webpack_require__(152);
-const signalExit = __webpack_require__(161);
+      case '**/*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
 
-module.exports = onetime(() => {
-	signalExit(() => {
-		process.stderr.write('\u001B[?25h');
-	}, {alwaysLast: true});
-});
+      case '**/*.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
+      case '**/.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-/***/ }),
-/* 539 */
-/***/ (function(module, exports, __webpack_require__) {
+      default: {
+        const match = /^(.*?)\.(\w+)$/.exec(str);
+        if (!match) return;
 
-"use strict";
+        const source = create(match[1]);
+        if (!source) return;
 
+        return source + DOT_LITERAL + match[2];
+      }
+    }
+  };
 
-const spinners = Object.assign({}, __webpack_require__(540));
+  const output = utils.removePrefix(input, state);
+  let source = create(output);
 
-const spinnersList = Object.keys(spinners);
+  if (source && opts.strictSlashes !== true) {
+    source += `${SLASH_LITERAL}?`;
+  }
 
-Object.defineProperty(spinners, 'random', {
-	get() {
-		const randomIndex = Math.floor(Math.random() * spinnersList.length);
-		const spinnerName = spinnersList[randomIndex];
-		return spinners[spinnerName];
-	}
-});
+  return source;
+};
 
-module.exports = spinners;
-// TODO: Remove this for the next major release
-module.exports.default = spinners;
+module.exports = parse;
 
 
 /***/ }),
-/* 540 */
-/***/ (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\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"dots8Bit\":{\"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\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"material\":{\"interval\":17,\"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\":[\"🌲\",\"🎄\"]},\"grenade\":{\"interval\":80,\"frames\":[\"،   \",\"′   \",\" ´ \",\" ‾ \",\"  ⸌\",\"  ⸊\",\"  |\",\"  ⁎\",\"  ⁕\",\" ෴ \",\"  ⁓\",\"   \",\"   \",\"   \"]},\"point\":{\"interval\":125,\"frames\":[\"∙∙∙\",\"●∙∙\",\"∙●∙\",\"∙∙●\",\"∙∙∙\"]},\"layer\":{\"interval\":150,\"frames\":[\"-\",\"=\",\"≡\"]},\"betaWave\":{\"interval\":80,\"frames\":[\"ρββββββ\",\"βρβββββ\",\"ββρββββ\",\"βββρβββ\",\"ββββρββ\",\"βββββρβ\",\"ββββββρ\"]},\"aesthetic\":{\"interval\":80,\"frames\":[\"▰▱▱▱▱▱▱\",\"▰▰▱▱▱▱▱\",\"▰▰▰▱▱▱▱\",\"▰▰▰▰▱▱▱\",\"▰▰▰▰▰▱▱\",\"▰▰▰▰▰▰▱\",\"▰▰▰▰▰▰▰\",\"▰▱▱▱▱▱▱\"]}}");
 
-/***/ }),
-/* 541 */
+/***/ "../../node_modules/picomatch/lib/picomatch.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(542);
-
-const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
-
-const main = {
-	info: chalk.blue('ℹ'),
-	success: chalk.green('✔'),
-	warning: chalk.yellow('⚠'),
-	error: chalk.red('✖')
-};
-
-const fallbacks = {
-	info: chalk.blue('i'),
-	success: chalk.green('√'),
-	warning: chalk.yellow('‼'),
-	error: chalk.red('×')
-};
 
-module.exports = isSupported ? main : fallbacks;
+const path = __webpack_require__("path");
+const scan = __webpack_require__("../../node_modules/picomatch/lib/scan.js");
+const parse = __webpack_require__("../../node_modules/picomatch/lib/parse.js");
+const utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+const constants = __webpack_require__("../../node_modules/picomatch/lib/constants.js");
+const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
 
+/**
+ * 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
+ */
 
-/***/ }),
-/* 542 */
-/***/ (function(module, exports, __webpack_require__) {
+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;
+  }
 
-"use strict";
+  const isState = isObject(glob) && glob.tokens && glob.input;
 
-const escapeStringRegexp = __webpack_require__(357);
-const ansiStyles = __webpack_require__(543);
-const stdoutColor = __webpack_require__(544).stdout;
+  if (glob === '' || (typeof glob !== 'string' && !isState)) {
+    throw new TypeError('Expected pattern to be a non-empty string');
+  }
 
-const template = __webpack_require__(546);
+  const opts = options || {};
+  const posix = utils.isWindows(options);
+  const regex = isState
+    ? picomatch.compileRe(glob, options)
+    : picomatch.makeRe(glob, options, false, true);
 
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
+  const state = regex.state;
+  delete regex.state;
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+  let isIgnored = () => false;
+  if (opts.ignore) {
+    const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
+    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
+  }
 
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
+  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 };
 
-const styles = Object.create(null);
+    if (typeof opts.onResult === 'function') {
+      opts.onResult(result);
+    }
 
-function applyOptions(obj, options) {
-	options = options || {};
+    if (isMatch === false) {
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
 
-	// 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;
-}
+    if (isIgnored(input)) {
+      if (typeof opts.onIgnore === 'function') {
+        opts.onIgnore(result);
+      }
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
 
-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 (typeof opts.onMatch === 'function') {
+      opts.onMatch(result);
+    }
+    return returnObject ? result : true;
+  };
 
-		chalk.template = function () {
-			const args = [].slice.call(arguments);
-			return chalkTag.apply(null, [chalk.template].concat(args));
-		};
+  if (returnState) {
+    matcher.state = state;
+  }
 
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
+  return matcher;
+};
 
-		chalk.template.constructor = Chalk;
+/**
+ * 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
+ */
 
-		return chalk.template;
-	}
+picomatch.test = (input, regex, options, { glob, posix } = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected input to be a string');
+  }
 
-	applyOptions(this, options);
-}
+  if (input === '') {
+    return { isMatch: false, output: '' };
+  }
 
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
+  const opts = options || {};
+  const format = opts.format || (posix ? utils.toPosixSlashes : null);
+  let match = input === glob;
+  let output = (match && format) ? format(input) : input;
 
-for (const key of Object.keys(ansiStyles)) {
-	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+  if (match === false) {
+    output = format ? format(input) : input;
+    match = output === glob;
+  }
 
-	styles[key] = {
-		get() {
-			const codes = ansiStyles[key];
-			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
-		}
-	};
-}
+  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);
+    }
+  }
 
-styles.visible = {
-	get() {
-		return build.call(this, this._styles || [], true, 'visible');
-	}
+  return { isMatch: Boolean(match), match, output };
 };
 
-ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
-for (const model of Object.keys(ansiStyles.color.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
-
-	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);
-			};
-		}
-	};
-}
-
-ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
-for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+/**
+ * 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
+ */
 
-	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);
-			};
-		}
-	};
-}
+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));
+};
 
-const proto = Object.defineProperties(() => {}, styles);
+/**
+ * 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
+ */
 
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
+picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
-	builder._styles = _styles;
-	builder._empty = _empty;
+/**
+ * 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
+ */
 
-	const self = this;
+picomatch.parse = (pattern, options) => {
+  if (Array.isArray(pattern)) return pattern.map(p => picomatch.parse(p, options));
+  return parse(pattern, { ...options, fastpaths: false });
+};
 
-	Object.defineProperty(builder, 'level', {
-		enumerable: true,
-		get() {
-			return self.level;
-		},
-		set(level) {
-			self.level = level;
-		}
-	});
+/**
+ * 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
+ */
 
-	Object.defineProperty(builder, 'enabled', {
-		enumerable: true,
-		get() {
-			return self.enabled;
-		},
-		set(enabled) {
-			self.enabled = enabled;
-		}
-	});
+picomatch.scan = (input, options) => scan(input, options);
 
-	// See below for fix regarding invisible grey/dim combination on Windows
-	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+/**
+ * Compile a regular expression from the `state` object returned by the
+ * [parse()](#parse) method.
+ *
+ * @param {Object} `state`
+ * @param {Object} `options`
+ * @param {Boolean} `returnOutput` Intended for implementors, this argument allows you to return the raw output from the parser.
+ * @param {Boolean} `returnState` Adds the state to a `state` property on the returned regex. Useful for implementors and debugging.
+ * @return {RegExp}
+ * @api public
+ */
 
-	// `__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
+picomatch.compileRe = (state, options, returnOutput = false, returnState = false) => {
+  if (returnOutput === true) {
+    return state.output;
+  }
 
-	return builder;
-}
+  const opts = options || {};
+  const prepend = opts.contains ? '' : '^';
+  const append = opts.contains ? '' : '$';
 
-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]);
+  let source = `${prepend}(?:${state.output})${append}`;
+  if (state && state.negated === true) {
+    source = `^(?!${source}).*$`;
+  }
 
-	if (argsLen === 0) {
-		return '';
-	}
+  const regex = picomatch.toRegex(source, options);
+  if (returnState === true) {
+    regex.state = state;
+  }
 
-	if (argsLen > 1) {
-		// Don't slice `arguments`, it prevents V8 optimizations
-		for (let a = 1; a < argsLen; a++) {
-			str += ' ' + args[a];
-		}
-	}
+  return regex;
+};
 
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
-	}
+/**
+ * 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`
+ * @param {Boolean} `returnOutput` Implementors may use this argument to return the compiled output, instead of a regular expression. This is not exposed on the options to prevent end-users from mutating the result.
+ * @param {Boolean} `returnState` Implementors may use this argument to return the state from the parsed glob with the returned regular expression.
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
 
-	// 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 = '';
-	}
+picomatch.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
+  if (!input || typeof input !== 'string') {
+    throw new TypeError('Expected a non-empty string');
+  }
 
-	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;
+  let parsed = { negated: false, fastpaths: true };
 
-		// 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}`);
-	}
+  if (options.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
+    parsed.output = parse.fastpaths(input, options);
+  }
 
-	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	ansiStyles.dim.open = originalDim;
+  if (!parsed.output) {
+    parsed = parse(input, options);
+  }
 
-	return str;
-}
+  return picomatch.compileRe(parsed, options, returnOutput, returnState);
+};
 
-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(' ');
-	}
+/**
+ * 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
+ */
 
-	const args = [].slice.call(arguments, 2);
-	const parts = [strings.raw[0]];
+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 /$^/;
+  }
+};
 
-	for (let i = 1; i < strings.length; i++) {
-		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
-		parts.push(String(strings.raw[i]));
-	}
+/**
+ * Picomatch constants.
+ * @return {Object}
+ */
 
-	return template(chalk, parts.join(''));
-}
+picomatch.constants = constants;
 
-Object.defineProperties(Chalk.prototype, styles);
+/**
+ * Expose "picomatch"
+ */
 
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
+module.exports = picomatch;
 
 
 /***/ }),
-/* 543 */
+
+/***/ "../../node_modules/picomatch/lib/scan.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(359);
 
-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 utils = __webpack_require__("../../node_modules/picomatch/lib/utils.js");
+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__("../../node_modules/picomatch/lib/constants.js");
+
+const isPathSeparator = code => {
+  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
 };
 
-const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+const depth = token => {
+  if (token.isPrefix !== true) {
+    token.depth = token.isGlobstar ? Infinity : 1;
+  }
 };
 
-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],
+/**
+ * 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), `negated` (true if the path starts with `!` but not
+ * with `!(`) and `negatedExtglob` (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
+ */
+
+const scan = (input, options) => {
+  const opts = options || {};
+
+  const length = input.length - 1;
+  const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+  const slashes = [];
+  const tokens = [];
+  const parts = [];
 
-			// 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],
+  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 negatedExtglob = false;
+  let finished = false;
+  let braces = 0;
+  let prev;
+  let code;
+  let token = { value: '', depth: 0, isGlob: 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]
-		}
-	};
+  const eos = () => index >= length;
+  const peek = () => str.charCodeAt(index + 1);
+  const advance = () => {
+    prev = code;
+    return str.charCodeAt(++index);
+  };
 
-	// Fix humans
-	styles.color.grey = styles.color.gray;
+  while (index < length) {
+    code = advance();
+    let next;
 
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
+    if (code === CHAR_BACKWARD_SLASH) {
+      backslashes = token.backslashes = true;
+      code = advance();
 
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
+      if (code === CHAR_LEFT_CURLY_BRACE) {
+        braceEscaped = true;
+      }
+      continue;
+    }
 
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
+      braces++;
 
-			group[styleName] = styles[styleName];
+      while (eos() !== true && (code = advance())) {
+        if (code === CHAR_BACKWARD_SLASH) {
+          backslashes = token.backslashes = true;
+          advance();
+          continue;
+        }
 
-			codes.set(style[0], style[1]);
-		}
+        if (code === CHAR_LEFT_CURLY_BRACE) {
+          braces++;
+          continue;
+        }
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
+        if (braceEscaped !== true && code === CHAR_DOT && (code = advance()) === CHAR_DOT) {
+          isBrace = token.isBrace = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
-	}
+          if (scanToEnd === true) {
+            continue;
+          }
 
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
+          break;
+        }
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+        if (braceEscaped !== true && code === CHAR_COMMA) {
+          isBrace = token.isBrace = true;
+          isGlob = token.isGlob = true;
+          finished = true;
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
+          if (scanToEnd === true) {
+            continue;
+          }
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+          break;
+        }
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
+        if (code === CHAR_RIGHT_CURLY_BRACE) {
+          braces--;
 
-		const suite = colorConvert[key];
+          if (braces === 0) {
+            braceEscaped = false;
+            isBrace = token.isBrace = true;
+            finished = true;
+            break;
+          }
+        }
+      }
 
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
+      if (scanToEnd === true) {
+        continue;
+      }
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+      break;
+    }
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+    if (code === CHAR_FORWARD_SLASH) {
+      slashes.push(index);
+      tokens.push(token);
+      token = { value: '', depth: 0, isGlob: false };
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
+      if (finished === true) continue;
+      if (prev === CHAR_DOT && index === (start + 1)) {
+        start += 2;
+        continue;
+      }
 
-	return styles;
-}
+      lastIndex = index + 1;
+      continue;
+    }
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+    if (opts.noext !== true) {
+      const isExtglobChar = code === CHAR_PLUS
+        || code === CHAR_AT
+        || code === CHAR_ASTERISK
+        || code === CHAR_QUESTION_MARK
+        || code === CHAR_EXCLAMATION_MARK;
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(116)(module)))
+      if (isExtglobChar === true && peek() === CHAR_LEFT_PARENTHESES) {
+        isGlob = token.isGlob = true;
+        isExtglob = token.isExtglob = true;
+        finished = true;
+        if (code === CHAR_EXCLAMATION_MARK && index === start) {
+          negatedExtglob = true;
+        }
 
-/***/ }),
-/* 544 */
-/***/ (function(module, exports, __webpack_require__) {
+        if (scanToEnd === true) {
+          while (eos() !== true && (code = advance())) {
+            if (code === CHAR_BACKWARD_SLASH) {
+              backslashes = token.backslashes = true;
+              code = advance();
+              continue;
+            }
 
-"use strict";
+            if (code === CHAR_RIGHT_PARENTHESES) {
+              isGlob = token.isGlob = true;
+              finished = true;
+              break;
+            }
+          }
+          continue;
+        }
+        break;
+      }
+    }
 
-const os = __webpack_require__(122);
-const hasFlag = __webpack_require__(545);
+    if (code === CHAR_ASTERISK) {
+      if (prev === CHAR_ASTERISK) isGlobstar = token.isGlobstar = true;
+      isGlob = token.isGlob = true;
+      finished = true;
 
-const env = process.env;
+      if (scanToEnd === true) {
+        continue;
+      }
+      break;
+    }
 
-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;
-}
+    if (code === CHAR_QUESTION_MARK) {
+      isGlob = token.isGlob = true;
+      finished = true;
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+      if (scanToEnd === true) {
+        continue;
+      }
+      break;
+    }
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-}
+    if (code === CHAR_LEFT_SQUARE_BRACKET) {
+      while (eos() !== true && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = token.backslashes = true;
+          advance();
+          continue;
+        }
 
-function supportsColor(stream) {
-	if (forceColor === false) {
-		return 0;
-	}
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          isBracket = token.isBracket = true;
+          isGlob = token.isGlob = true;
+          finished = true;
+          break;
+        }
+      }
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+      if (scanToEnd === true) {
+        continue;
+      }
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+      break;
+    }
 
-	if (stream && !stream.isTTY && forceColor !== true) {
-		return 0;
-	}
+    if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {
+      negated = token.negated = true;
+      start++;
+      continue;
+    }
 
-	const min = forceColor ? 1 : 0;
+    if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
+      isGlob = token.isGlob = true;
 
-	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;
-		}
+      if (scanToEnd === true) {
+        while (eos() !== true && (code = advance())) {
+          if (code === CHAR_LEFT_PARENTHESES) {
+            backslashes = token.backslashes = true;
+            code = advance();
+            continue;
+          }
 
-		return 1;
-	}
+          if (code === CHAR_RIGHT_PARENTHESES) {
+            finished = true;
+            break;
+          }
+        }
+        continue;
+      }
+      break;
+    }
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+    if (isGlob === true) {
+      finished = true;
 
-		return min;
-	}
+      if (scanToEnd === true) {
+        continue;
+      }
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+      break;
+    }
+  }
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+  if (opts.noext === true) {
+    isExtglob = false;
+    isGlob = false;
+  }
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+  let base = str;
+  let prefix = '';
+  let glob = '';
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
+  if (start > 0) {
+    prefix = str.slice(0, start);
+    str = str.slice(start);
+    lastIndex -= start;
+  }
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+  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 (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+  if (base && base !== '' && base !== '/' && base !== str) {
+    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
+      base = base.slice(0, -1);
+    }
+  }
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
+  if (opts.unescape === true) {
+    if (glob) glob = utils.removeBackslashes(glob);
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
+    if (base && backslashes === true) {
+      base = utils.removeBackslashes(base);
+    }
+  }
 
-	return min;
-}
+  const state = {
+    prefix,
+    input,
+    start,
+    base,
+    glob,
+    isBrace,
+    isBracket,
+    isGlob,
+    isExtglob,
+    isGlobstar,
+    negated,
+    negatedExtglob
+  };
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
-}
+  if (opts.tokens === true) {
+    state.maxDepth = 0;
+    if (!isPathSeparator(code)) {
+      tokens.push(token);
+    }
+    state.tokens = tokens;
+  }
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
-};
+  if (opts.parts === true || opts.tokens === true) {
+    let prevIndex;
+
+    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 (prevIndex && prevIndex + 1 < input.length) {
+      const value = input.slice(prevIndex + 1);
+      parts.push(value);
 
-/***/ }),
-/* 545 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (opts.tokens) {
+        tokens[tokens.length - 1].value = value;
+        depth(tokens[tokens.length - 1]);
+        state.maxDepth += tokens[tokens.length - 1].depth;
+      }
+    }
 
-"use strict";
+    state.slashes = slashes;
+    state.parts = parts;
+  }
 
-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);
+  return state;
 };
 
+module.exports = scan;
+
 
 /***/ }),
-/* 546 */
+
+/***/ "../../node_modules/picomatch/lib/utils.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|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}|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']
-]);
-
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
-
-	return ESCAPES.get(c) || c;
-}
 
-function parseArguments(name, args) {
-	const results = [];
-	const chunks = args.trim().split(/\s*,\s*/g);
-	let matches;
+const path = __webpack_require__("path");
+const win32 = process.platform === 'win32';
+const {
+  REGEX_BACKSLASH,
+  REGEX_REMOVE_BACKSLASH,
+  REGEX_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_GLOBAL
+} = __webpack_require__("../../node_modules/picomatch/lib/constants.js");
 
-	for (const chunk of chunks) {
-		if (!isNaN(chunk)) {
-			results.push(Number(chunk));
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
+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, '/');
 
-	return results;
-}
+exports.removeBackslashes = str => {
+  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
+    return match === '\\' ? '' : match;
+  });
+};
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+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;
+};
 
-	const results = [];
-	let matches;
+exports.isWindows = options => {
+  if (options && typeof options.windows === 'boolean') {
+    return options.windows;
+  }
+  return win32 === true || path.sep === '\\';
+};
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+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)}`;
+};
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+exports.removePrefix = (input, state = {}) => {
+  let output = input;
+  if (output.startsWith('./')) {
+    output = output.slice(2);
+    state.prefix = './';
+  }
+  return output;
+};
 
-	return results;
-}
+exports.wrapOutput = (input, state = {}, options = {}) => {
+  const prepend = options.contains ? '' : '^';
+  const append = options.contains ? '' : '$';
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
+  let output = `${prepend}(?:${input})${append}`;
+  if (state.negated === true) {
+    output = `(?:^(?!${output}).*$)`;
+  }
+  return output;
+};
 
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
 
-	let current = chalk;
-	for (const styleName of Object.keys(enabled)) {
-		if (Array.isArray(enabled[styleName])) {
-			if (!(styleName in current)) {
-				throw new Error(`Unknown Chalk style: ${styleName}`);
-			}
+/***/ }),
 
-			if (enabled[styleName].length > 0) {
-				current = current[styleName].apply(current, enabled[styleName]);
-			} else {
-				current = current[styleName];
-			}
-		}
-	}
+/***/ "../../node_modules/pify/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	return current;
-}
+"use strict";
 
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
 
-	// eslint-disable-next-line max-params
-	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
-		if (escapeChar) {
-			chunk.push(unescape(escapeChar));
-		} else if (style) {
-			const str = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
-			}
+const processFn = (fn, options) => function (...args) {
+	const P = options.promiseModule;
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
+	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 {
-			chunk.push(chr);
+			args.push(resolve);
 		}
+
+		fn.apply(this, args);
 	});
+};
 
-	chunks.push(chunk.join(''));
+module.exports = (input, options) => {
+	options = Object.assign({
+		exclude: [/.+(Sync|Stream)$/],
+		errorFirst: true,
+		promiseModule: Promise
+	}, options);
 
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
+	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}\``);
 	}
 
-	return chunks.join('');
-};
-
-
-/***/ }),
-/* 547 */
-/***/ (function(module, exports, __webpack_require__) {
+	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);
+	};
 
-"use strict";
+	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));
+	}
 
-const ansiRegex = __webpack_require__(548);
+	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;
+	}
 
-module.exports = string => typeof string === 'string' ? string.replace(ansiRegex(), '') : string;
+	return ret;
+};
 
 
 /***/ }),
-/* 548 */
+
+/***/ "../../node_modules/posix-character-classes/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = ({onlyFirst = false} = {}) => {
-	const pattern = [
-		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
-	].join('|');
+/**
+ * POSIX character classes
+ */
 
-	return new RegExp(pattern, onlyFirst ? undefined : 'g');
+module.exports = {
+  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'
 };
 
 
 /***/ }),
-/* 549 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/pump/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+var once = __webpack_require__("../../node_modules/once/once.js")
+var eos = __webpack_require__("../../node_modules/end-of-stream/index.js")
+var fs = __webpack_require__("fs") // we only need fs to get the ReadStream and WriteStream prototypes
 
-var defaults = __webpack_require__(550)
-var combining = __webpack_require__(552)
+var noop = function () {}
+var ancient = /^v?\.0/.test(process.version)
 
-var DEFAULTS = {
-  nul: 0,
-  control: 0
+var isFn = function (fn) {
+  return typeof fn === 'function'
 }
 
-module.exports = function wcwidth(str) {
-  return wcswidth(str, DEFAULTS)
+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)
 }
 
-module.exports.config = function(opts) {
-  opts = defaults(opts || {}, DEFAULTS)
-  return function wcwidth(str) {
-    return wcswidth(str, opts)
-  }
+var isRequest = function (stream) {
+  return stream.setHeader && isFn(stream.abort)
 }
 
-/*
- *  The following functions define the column width of an ISO 10646
- *  character as follows:
- *  - The null character (U+0000) has a column width of 0.
- *  - Other C0/C1 control characters and DEL will lead to a return value
- *    of -1.
- *  - Non-spacing and enclosing combining characters (general category
- *    code Mn or Me in the
- *    Unicode database) have a column width of 0.
- *  - SOFT HYPHEN (U+00AD) has a column width of 1.
- *  - Other format characters (general category code Cf in the Unicode
- *    database) and ZERO WIDTH
- *    SPACE (U+200B) have a column width of 0.
- *  - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
- *    have a column width of 0.
- *  - Spacing characters in the East Asian Wide (W) or East Asian
- *    Full-width (F) category as
- *    defined in Unicode Technical Report #11 have a column width of 2.
- *  - All remaining characters (including all printable ISO 8859-1 and
- *    WGL4 characters, Unicode control characters, etc.) have a column
- *    width of 1.
- *  This implementation assumes that characters are encoded in ISO 10646.
-*/
+var destroyer = function (stream, reading, writing, callback) {
+  callback = once(callback)
 
-function wcswidth(str, opts) {
-  if (typeof str !== 'string') return wcwidth(str, opts)
+  var closed = false
+  stream.on('close', function () {
+    closed = true
+  })
 
-  var s = 0
-  for (var i = 0; i < str.length; i++) {
-    var n = wcwidth(str.charCodeAt(i), opts)
-    if (n < 0) return -1
-    s += n
-  }
+  eos(stream, {readable: reading, writable: writing}, function (err) {
+    if (err) return callback(err)
+    closed = true
+    callback()
+  })
 
-  return s
-}
+  var destroyed = false
+  return function (err) {
+    if (closed) return
+    if (destroyed) return
+    destroyed = true
 
-function wcwidth(ucs, opts) {
-  // test for 8-bit control characters
-  if (ucs === 0) return opts.nul
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return opts.control
+    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
 
-  // binary search in table of non-spacing characters
-  if (bisearch(ucs)) return 0
+    if (isFn(stream.destroy)) return stream.destroy()
 
-  // if we arrive here, ucs is not a combining or C0/C1 control character
-  return 1 +
-      (ucs >= 0x1100 &&
-       (ucs <= 0x115f ||                       // Hangul Jamo init. consonants
-        ucs == 0x2329 || ucs == 0x232a ||
-        (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-         ucs != 0x303f) ||                     // CJK ... Yi
-        (ucs >= 0xac00 && ucs <= 0xd7a3) ||    // Hangul Syllables
-        (ucs >= 0xf900 && ucs <= 0xfaff) ||    // CJK Compatibility Ideographs
-        (ucs >= 0xfe10 && ucs <= 0xfe19) ||    // Vertical forms
-        (ucs >= 0xfe30 && ucs <= 0xfe6f) ||    // CJK Compatibility Forms
-        (ucs >= 0xff00 && ucs <= 0xff60) ||    // Fullwidth Forms
-        (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-        (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-        (ucs >= 0x30000 && ucs <= 0x3fffd)));
+    callback(err || new Error('stream was destroyed'))
+  }
 }
 
-function bisearch(ucs) {
-  var min = 0
-  var max = combining.length - 1
-  var mid
-
-  if (ucs < combining[0][0] || ucs > combining[max][1]) return false
-
-  while (max >= min) {
-    mid = Math.floor((min + max) / 2)
-    if (ucs > combining[mid][1]) min = mid + 1
-    else if (ucs < combining[mid][0]) max = mid - 1
-    else return true
-  }
+var call = function (fn) {
+  fn()
+}
 
-  return false
+var pipe = function (from, to) {
+  return from.pipe(to)
 }
 
+var pump = function () {
+  var streams = Array.prototype.slice.call(arguments)
+  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
 
-/***/ }),
-/* 550 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (Array.isArray(streams[0])) streams = streams[0]
+  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
 
-var clone = __webpack_require__(551);
+  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)
+    })
+  })
 
-module.exports = function(options, defaults) {
-  options = options || {};
+  return streams.reduce(pipe)
+}
 
-  Object.keys(defaults).forEach(function(key) {
-    if (typeof options[key] === 'undefined') {
-      options[key] = clone(defaults[key]);
-    }
-  });
+module.exports = pump
 
-  return options;
-};
 
 /***/ }),
-/* 551 */
+
+/***/ "../../node_modules/read-pkg/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-var clone = (function() {
-'use strict';
+"use strict";
 
-/**
- * Clones (copies) an Object using deep copying.
- *
- * This function supports circular references by default, but if you are certain
- * there are no circular references in your object, you can save some CPU time
- * by calling clone(obj, false).
- *
- * Caution: if `circular` is false and `parent` contains circular references,
- * your program may enter an infinite loop and crash.
- *
- * @param `parent` - the object to be cloned
- * @param `circular` - set to true if the object to be cloned may contain
- *    circular references. (optional - true by default)
- * @param `depth` - set to a number if the object is only to be cloned to
- *    a particular depth. (optional - defaults to Infinity)
- * @param `prototype` - sets the prototype to be used when cloning an object.
- *    (optional - defaults to parent prototype).
-*/
-function clone(parent, circular, depth, prototype) {
-  var filter;
-  if (typeof circular === 'object') {
-    depth = circular.depth;
-    prototype = circular.prototype;
-    filter = circular.filter;
-    circular = circular.circular
-  }
-  // maintain two arrays for circular references, where corresponding parents
-  // and children have the same index
-  var allParents = [];
-  var allChildren = [];
+const {promisify} = __webpack_require__("util");
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const parseJson = __webpack_require__("../../node_modules/parse-json/index.js");
 
-  var useBuffer = typeof Buffer != 'undefined';
+const readFileAsync = promisify(fs.readFile);
 
-  if (typeof circular == 'undefined')
-    circular = true;
+module.exports = async options => {
+	options = {
+		cwd: process.cwd(),
+		normalize: true,
+		...options
+	};
 
-  if (typeof depth == 'undefined')
-    depth = Infinity;
+	const filePath = path.resolve(options.cwd, 'package.json');
+	const json = parseJson(await readFileAsync(filePath, 'utf8'));
 
-  // recurse this function so we don't reset allParents and allChildren
-  function _clone(parent, depth) {
-    // cloning null always returns null
-    if (parent === null)
-      return null;
+	if (options.normalize) {
+		__webpack_require__("../../node_modules/normalize-package-data/lib/normalize.js")(json);
+	}
 
-    if (depth == 0)
-      return parent;
+	return json;
+};
 
-    var child;
-    var proto;
-    if (typeof parent != 'object') {
-      return parent;
-    }
+module.exports.sync = options => {
+	options = {
+		cwd: process.cwd(),
+		normalize: true,
+		...options
+	};
 
-    if (clone.__isArray(parent)) {
-      child = [];
-    } else if (clone.__isRegExp(parent)) {
-      child = new RegExp(parent.source, __getRegExpFlags(parent));
-      if (parent.lastIndex) child.lastIndex = parent.lastIndex;
-    } else if (clone.__isDate(parent)) {
-      child = new Date(parent.getTime());
-    } else if (useBuffer && Buffer.isBuffer(parent)) {
-      if (Buffer.allocUnsafe) {
-        // Node.js >= 4.5.0
-        child = Buffer.allocUnsafe(parent.length);
-      } else {
-        // Older Node.js versions
-        child = new Buffer(parent.length);
-      }
-      parent.copy(child);
-      return child;
-    } else {
-      if (typeof prototype == 'undefined') {
-        proto = Object.getPrototypeOf(parent);
-        child = Object.create(proto);
-      }
-      else {
-        child = Object.create(prototype);
-        proto = prototype;
-      }
-    }
+	const filePath = path.resolve(options.cwd, 'package.json');
+	const json = parseJson(fs.readFileSync(filePath, 'utf8'));
+
+	if (options.normalize) {
+		__webpack_require__("../../node_modules/normalize-package-data/lib/normalize.js")(json);
+	}
+
+	return json;
+};
 
-    if (circular) {
-      var index = allParents.indexOf(parent);
 
-      if (index != -1) {
-        return allChildren[index];
-      }
-      allParents.push(parent);
-      allChildren.push(child);
-    }
+/***/ }),
 
-    for (var i in parent) {
-      var attrs;
-      if (proto) {
-        attrs = Object.getOwnPropertyDescriptor(proto, i);
-      }
+/***/ "../../node_modules/regex-not/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (attrs && attrs.set == null) {
-        continue;
-      }
-      child[i] = _clone(parent[i], depth - 1);
-    }
+"use strict";
 
-    return child;
-  }
 
-  return _clone(parent, depth);
-}
+var extend = __webpack_require__("../../node_modules/regex-not/node_modules/extend-shallow/index.js");
+var safe = __webpack_require__("../../node_modules/safe-regex/index.js");
 
 /**
- * Simple flat clone using prototype, accepts only objects, usefull for property
- * override on FLAT configuration object (no nested props).
+ * The main export is a function that takes a `pattern` string and an `options` object.
  *
- * USE WITH CAUTION! This may not behave as you wish if you do not know how this
- * works.
+ * ```js
+ & var not = require('regex-not');
+ & console.log(not('foo'));
+ & //=> /^(?:(?!^(?:foo)$).)*$/
+ * ```
+ *
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {RegExp} Converts the given `pattern` to a regex using the specified `options`.
+ * @api public
  */
-clone.clonePrototype = function clonePrototype(parent) {
-  if (parent === null)
-    return null;
 
-  var c = function () {};
-  c.prototype = parent;
-  return new c();
-};
+function toRegex(pattern, options) {
+  return new RegExp(toRegex.create(pattern, options));
+}
 
-// private utility functions
+/**
+ * Create a regex-compatible string from the given `pattern` and `options`.
+ *
+ * ```js
+ & var not = require('regex-not');
+ & console.log(not.create('foo'));
+ & //=> '^(?:(?!^(?:foo)$).)*$'
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {String}
+ * @api public
+ */
 
-function __objToStr(o) {
-  return Object.prototype.toString.call(o);
-};
-clone.__objToStr = __objToStr;
+toRegex.create = function(pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-function __isDate(o) {
-  return typeof o === 'object' && __objToStr(o) === '[object Date]';
-};
-clone.__isDate = __isDate;
+  var opts = extend({}, options);
+  if (opts.contains === true) {
+    opts.strictNegate = false;
+  }
 
-function __isArray(o) {
-  return typeof o === 'object' && __objToStr(o) === '[object Array]';
-};
-clone.__isArray = __isArray;
+  var open = opts.strictOpen !== false ? '^' : '';
+  var close = opts.strictClose !== false ? '$' : '';
+  var endChar = opts.endChar ? opts.endChar : '+';
+  var str = pattern;
 
-function __isRegExp(o) {
-  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
-};
-clone.__isRegExp = __isRegExp;
+  if (opts.strictNegate === false) {
+    str = '(?:(?!(?:' + pattern + ')).)' + endChar;
+  } else {
+    str = '(?:(?!^(?:' + pattern + ')$).)' + endChar;
+  }
 
-function __getRegExpFlags(re) {
-  var flags = '';
-  if (re.global) flags += 'g';
-  if (re.ignoreCase) flags += 'i';
-  if (re.multiline) flags += 'm';
-  return flags;
+  var res = open + str + close;
+  if (opts.safe === true && safe(res) === false) {
+    throw new Error('potentially unsafe regular expression: ' + res);
+  }
+
+  return res;
 };
-clone.__getRegExpFlags = __getRegExpFlags;
 
-return clone;
-})();
+/**
+ * Expose `toRegex`
+ */
 
-if ( true && module.exports) {
-  module.exports = clone;
-}
+module.exports = toRegex;
 
 
 /***/ }),
-/* 552 */
-/***/ (function(module, exports) {
-
-module.exports = [
-    [ 0x0300, 0x036F ], [ 0x0483, 0x0486 ], [ 0x0488, 0x0489 ],
-    [ 0x0591, 0x05BD ], [ 0x05BF, 0x05BF ], [ 0x05C1, 0x05C2 ],
-    [ 0x05C4, 0x05C5 ], [ 0x05C7, 0x05C7 ], [ 0x0600, 0x0603 ],
-    [ 0x0610, 0x0615 ], [ 0x064B, 0x065E ], [ 0x0670, 0x0670 ],
-    [ 0x06D6, 0x06E4 ], [ 0x06E7, 0x06E8 ], [ 0x06EA, 0x06ED ],
-    [ 0x070F, 0x070F ], [ 0x0711, 0x0711 ], [ 0x0730, 0x074A ],
-    [ 0x07A6, 0x07B0 ], [ 0x07EB, 0x07F3 ], [ 0x0901, 0x0902 ],
-    [ 0x093C, 0x093C ], [ 0x0941, 0x0948 ], [ 0x094D, 0x094D ],
-    [ 0x0951, 0x0954 ], [ 0x0962, 0x0963 ], [ 0x0981, 0x0981 ],
-    [ 0x09BC, 0x09BC ], [ 0x09C1, 0x09C4 ], [ 0x09CD, 0x09CD ],
-    [ 0x09E2, 0x09E3 ], [ 0x0A01, 0x0A02 ], [ 0x0A3C, 0x0A3C ],
-    [ 0x0A41, 0x0A42 ], [ 0x0A47, 0x0A48 ], [ 0x0A4B, 0x0A4D ],
-    [ 0x0A70, 0x0A71 ], [ 0x0A81, 0x0A82 ], [ 0x0ABC, 0x0ABC ],
-    [ 0x0AC1, 0x0AC5 ], [ 0x0AC7, 0x0AC8 ], [ 0x0ACD, 0x0ACD ],
-    [ 0x0AE2, 0x0AE3 ], [ 0x0B01, 0x0B01 ], [ 0x0B3C, 0x0B3C ],
-    [ 0x0B3F, 0x0B3F ], [ 0x0B41, 0x0B43 ], [ 0x0B4D, 0x0B4D ],
-    [ 0x0B56, 0x0B56 ], [ 0x0B82, 0x0B82 ], [ 0x0BC0, 0x0BC0 ],
-    [ 0x0BCD, 0x0BCD ], [ 0x0C3E, 0x0C40 ], [ 0x0C46, 0x0C48 ],
-    [ 0x0C4A, 0x0C4D ], [ 0x0C55, 0x0C56 ], [ 0x0CBC, 0x0CBC ],
-    [ 0x0CBF, 0x0CBF ], [ 0x0CC6, 0x0CC6 ], [ 0x0CCC, 0x0CCD ],
-    [ 0x0CE2, 0x0CE3 ], [ 0x0D41, 0x0D43 ], [ 0x0D4D, 0x0D4D ],
-    [ 0x0DCA, 0x0DCA ], [ 0x0DD2, 0x0DD4 ], [ 0x0DD6, 0x0DD6 ],
-    [ 0x0E31, 0x0E31 ], [ 0x0E34, 0x0E3A ], [ 0x0E47, 0x0E4E ],
-    [ 0x0EB1, 0x0EB1 ], [ 0x0EB4, 0x0EB9 ], [ 0x0EBB, 0x0EBC ],
-    [ 0x0EC8, 0x0ECD ], [ 0x0F18, 0x0F19 ], [ 0x0F35, 0x0F35 ],
-    [ 0x0F37, 0x0F37 ], [ 0x0F39, 0x0F39 ], [ 0x0F71, 0x0F7E ],
-    [ 0x0F80, 0x0F84 ], [ 0x0F86, 0x0F87 ], [ 0x0F90, 0x0F97 ],
-    [ 0x0F99, 0x0FBC ], [ 0x0FC6, 0x0FC6 ], [ 0x102D, 0x1030 ],
-    [ 0x1032, 0x1032 ], [ 0x1036, 0x1037 ], [ 0x1039, 0x1039 ],
-    [ 0x1058, 0x1059 ], [ 0x1160, 0x11FF ], [ 0x135F, 0x135F ],
-    [ 0x1712, 0x1714 ], [ 0x1732, 0x1734 ], [ 0x1752, 0x1753 ],
-    [ 0x1772, 0x1773 ], [ 0x17B4, 0x17B5 ], [ 0x17B7, 0x17BD ],
-    [ 0x17C6, 0x17C6 ], [ 0x17C9, 0x17D3 ], [ 0x17DD, 0x17DD ],
-    [ 0x180B, 0x180D ], [ 0x18A9, 0x18A9 ], [ 0x1920, 0x1922 ],
-    [ 0x1927, 0x1928 ], [ 0x1932, 0x1932 ], [ 0x1939, 0x193B ],
-    [ 0x1A17, 0x1A18 ], [ 0x1B00, 0x1B03 ], [ 0x1B34, 0x1B34 ],
-    [ 0x1B36, 0x1B3A ], [ 0x1B3C, 0x1B3C ], [ 0x1B42, 0x1B42 ],
-    [ 0x1B6B, 0x1B73 ], [ 0x1DC0, 0x1DCA ], [ 0x1DFE, 0x1DFF ],
-    [ 0x200B, 0x200F ], [ 0x202A, 0x202E ], [ 0x2060, 0x2063 ],
-    [ 0x206A, 0x206F ], [ 0x20D0, 0x20EF ], [ 0x302A, 0x302F ],
-    [ 0x3099, 0x309A ], [ 0xA806, 0xA806 ], [ 0xA80B, 0xA80B ],
-    [ 0xA825, 0xA826 ], [ 0xFB1E, 0xFB1E ], [ 0xFE00, 0xFE0F ],
-    [ 0xFE20, 0xFE23 ], [ 0xFEFF, 0xFEFF ], [ 0xFFF9, 0xFFFB ],
-    [ 0x10A01, 0x10A03 ], [ 0x10A05, 0x10A06 ], [ 0x10A0C, 0x10A0F ],
-    [ 0x10A38, 0x10A3A ], [ 0x10A3F, 0x10A3F ], [ 0x1D167, 0x1D169 ],
-    [ 0x1D173, 0x1D182 ], [ 0x1D185, 0x1D18B ], [ 0x1D1AA, 0x1D1AD ],
-    [ 0x1D242, 0x1D244 ], [ 0xE0001, 0xE0001 ], [ 0xE0020, 0xE007F ],
-    [ 0xE0100, 0xE01EF ]
-]
-
 
-/***/ }),
-/* 553 */
+/***/ "../../node_modules/regex-not/node_modules/extend-shallow/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-module.exports = ({stream = process.stdout} = {}) => {
-	return Boolean(
-		stream && stream.isTTY &&
-		process.env.TERM !== 'dumb' &&
-		!('CI' in process.env)
-	);
+var isExtendable = __webpack_require__("../../node_modules/regex-not/node_modules/is-extendable/index.js");
+var assignSymbols = __webpack_require__("../../node_modules/assign-symbols/index.js");
+
+module.exports = Object.assign || function(obj/*, objects*/) {
+  if (obj === null || typeof obj === 'undefined') {
+    throw new TypeError('Cannot convert undefined or null to object');
+  }
+  if (!isObject(obj)) {
+    obj = {};
+  }
+  for (var i = 1; i < arguments.length; i++) {
+    var val = arguments[i];
+    if (isString(val)) {
+      val = toObject(val);
+    }
+    if (isObject(val)) {
+      assign(obj, val);
+      assignSymbols(obj, val);
+    }
+  }
+  return obj;
 };
 
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
+  }
+}
 
-/***/ }),
-/* 554 */
-/***/ (function(module, exports, __webpack_require__) {
+function isString(val) {
+  return (val && typeof val === 'string');
+}
 
-var Stream = __webpack_require__(173)
+function toObject(str) {
+  var obj = {};
+  for (var i in str) {
+    obj[i] = str[i];
+  }
+  return obj;
+}
 
-module.exports = MuteStream
+function isObject(val) {
+  return (val && typeof val === 'object') || isExtendable(val);
+}
 
-// var out = new MuteStream(process.stdout)
-// argument auto-pipes
-function MuteStream (opts) {
-  Stream.apply(this)
-  opts = opts || {}
-  this.writable = this.readable = true
-  this.muted = false
-  this.on('pipe', this._onpipe)
-  this.replace = opts.replace
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-  // For readline-type situations
-  // This much at the start of a line being redrawn after a ctrl char
-  // is seen (such as backspace) won't be redrawn as the replacement
-  this._prompt = opts.prompt || null
-  this._hadControl = false
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
 }
 
-MuteStream.prototype = Object.create(Stream.prototype)
+function isEnum(obj, key) {
+  return Object.prototype.propertyIsEnumerable.call(obj, key);
+}
 
-Object.defineProperty(MuteStream.prototype, 'constructor', {
-  value: MuteStream,
-  enumerable: false
-})
 
-MuteStream.prototype.mute = function () {
-  this.muted = true
-}
+/***/ }),
 
-MuteStream.prototype.unmute = function () {
-  this.muted = false
-}
+/***/ "../../node_modules/regex-not/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-Object.defineProperty(MuteStream.prototype, '_onpipe', {
-  value: onPipe,
-  enumerable: false,
-  writable: true,
-  configurable: true
-})
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-function onPipe (src) {
-  this._src = src
-}
 
-Object.defineProperty(MuteStream.prototype, 'isTTY', {
-  get: getIsTTY,
-  set: setIsTTY,
-  enumerable: true,
-  configurable: true
-})
 
-function getIsTTY () {
-  return( (this._dest) ? this._dest.isTTY
-        : (this._src) ? this._src.isTTY
-        : false
-        )
-}
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
 
-// basically just get replace the getter/setter with a regular value
-function setIsTTY (isTTY) {
-  Object.defineProperty(this, 'isTTY', {
-    value: isTTY,
-    enumerable: true,
-    writable: true,
-    configurable: true
-  })
-}
+module.exports = function isExtendable(val) {
+  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
+};
 
-Object.defineProperty(MuteStream.prototype, 'rows', {
-  get: function () {
-    return( this._dest ? this._dest.rows
-          : this._src ? this._src.rows
-          : undefined )
-  }, enumerable: true, configurable: true })
 
-Object.defineProperty(MuteStream.prototype, 'columns', {
-  get: function () {
-    return( this._dest ? this._dest.columns
-          : this._src ? this._src.columns
-          : undefined )
-  }, enumerable: true, configurable: true })
+/***/ }),
 
+/***/ "../../node_modules/repeat-element/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-MuteStream.prototype.pipe = function (dest, options) {
-  this._dest = dest
-  return Stream.prototype.pipe.call(this, dest, options)
-}
+"use strict";
+/*!
+ * repeat-element <https://github.com/jonschlinkert/repeat-element>
+ *
+ * Copyright (c) 2015 Jon Schlinkert.
+ * Licensed under the MIT license.
+ */
 
-MuteStream.prototype.pause = function () {
-  if (this._src) return this._src.pause()
-}
 
-MuteStream.prototype.resume = function () {
-  if (this._src) return this._src.resume()
-}
 
-MuteStream.prototype.write = function (c) {
-  if (this.muted) {
-    if (!this.replace) return true
-    if (c.match(/^\u001b/)) {
-      if(c.indexOf(this._prompt) === 0) {
-        c = c.substr(this._prompt.length);
-        c = c.replace(/./g, this.replace);
-        c = this._prompt + c;
-      }
-      this._hadControl = true
-      return this.emit('data', c)
-    } else {
-      if (this._prompt && this._hadControl &&
-          c.indexOf(this._prompt) === 0) {
-        this._hadControl = false
-        this.emit('data', this._prompt)
-        c = c.substr(this._prompt.length)
-      }
-      c = c.toString().replace(/./g, this.replace)
-    }
-  }
-  this.emit('data', c)
-}
+module.exports = function repeat(ele, num) {
+  var arr = new Array(num);
 
-MuteStream.prototype.end = function (c) {
-  if (this.muted) {
-    if (c && this.replace) {
-      c = c.toString().replace(/./g, this.replace)
-    } else {
-      c = null
-    }
+  for (var i = 0; i < num; i++) {
+    arr[i] = ele;
   }
-  if (c) this.emit('data', c)
-  this.emit('end')
-}
-
-function proxy (fn) { return function () {
-  var d = this._dest
-  var s = this._src
-  if (d && d[fn]) d[fn].apply(d, arguments)
-  if (s && s[fn]) s[fn].apply(s, arguments)
-}}
 
-MuteStream.prototype.destroy = proxy('destroy')
-MuteStream.prototype.destroySoon = proxy('destroySoon')
-MuteStream.prototype.close = proxy('close')
+  return arr;
+};
 
 
 /***/ }),
-/* 555 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/***/ "../../node_modules/repeat-string/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ResetCommand", function() { return ResetCommand; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(240);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(532);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(423);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(231);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(220);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+/*!
+ * repeat-string <https://github.com/jonschlinkert/repeat-string>
+ *
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
 
 
+/**
+ * Results cache
+ */
 
+var res = '';
+var cache;
 
+/**
+ * Expose `repeat`
+ */
 
+module.exports = repeat;
 
-const ResetCommand = {
-  description: 'Deletes node_modules and output directories, resets internal and disk caches, and stops Bazel server',
-  name: 'reset',
-  reportTiming: {
-    group: 'scripts/kbn reset',
-    id: 'total'
-  },
+/**
+ * Repeat the given `string` the specified `number`
+ * of times.
+ *
+ * **Example:**
+ *
+ * ```js
+ * var repeat = require('repeat-string');
+ * repeat('A', 5);
+ * //=> AAAAA
+ * ```
+ *
+ * @param {String} `string` The string to repeat
+ * @param {Number} `number` The number of times to repeat the string
+ * @return {String} Repeated string
+ * @api public
+ */
 
-  async run(projects) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
-      problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
-      If you think you need to use this command very often (which is not normal), please let us know.
-    `);
-    const toDelete = [];
+function repeat(str, num) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
+  }
 
-    for (const project of projects.values()) {
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(project.nodeModulesLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.nodeModulesLocation)
-        });
-      }
+  // cover common, quick use cases
+  if (num === 1) return str;
+  if (num === 2) return str + str;
 
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(project.targetLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
-        });
-      }
+  var max = str.length * num;
+  if (cache !== str || typeof cache === 'undefined') {
+    cache = str;
+    res = '';
+  } else if (res.length >= max) {
+    return res.substr(0, max);
+  }
 
-      const {
-        extraPatterns
-      } = project.getCleanConfig();
+  while (max > res.length && num > 1) {
+    if (num & 1) {
+      res += str;
+    }
 
-      if (extraPatterns) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: extraPatterns
-        });
-      }
-    } // Runs Bazel hard clean and deletes Bazel Cache Folders
+    num >>= 1;
+    str += str;
+  }
+
+  res += str;
+  res = res.substr(0, max);
+  return res;
+}
 
 
-    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["isBazelBinAvailable"])()) {
-      // Hard cleaning bazel
-      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['clean', '--expunge']);
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Hard cleaned bazel'); // Deletes Bazel Cache Folders
+/***/ }),
 
-      await del__WEBPACK_IMPORTED_MODULE_1___default()([await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelDiskCacheFolder"])(), await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["getBazelRepositoryCacheFolder"])()], {
-        force: true
-      });
-      _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].success('Removed disk caches');
-    }
+/***/ "../../node_modules/resolve/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (toDelete.length === 0) {
-      return;
-    }
-    /**
-     * 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.
-     */
+var async = __webpack_require__("../../node_modules/resolve/lib/async.js");
+async.core = __webpack_require__("../../node_modules/resolve/lib/core.js");
+async.isCore = __webpack_require__("../../node_modules/resolve/lib/is-core.js");
+async.sync = __webpack_require__("../../node_modules/resolve/lib/sync.js");
+
+module.exports = async;
+
+
+/***/ }),
+
+/***/ "../../node_modules/resolve/lib/async.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var fs = __webpack_require__("fs");
+var getHomedir = __webpack_require__("../../node_modules/resolve/lib/homedir.js");
+var path = __webpack_require__("path");
+var caller = __webpack_require__("../../node_modules/resolve/lib/caller.js");
+var nodeModulesPaths = __webpack_require__("../../node_modules/resolve/lib/node-modules-paths.js");
+var normalizeOptions = __webpack_require__("../../node_modules/resolve/lib/normalize-options.js");
+var isCore = __webpack_require__("../../node_modules/is-core-module/index.js");
+
+var realpathFS = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
+
+var homedir = getHomedir();
+var defaultPaths = function () {
+    return [
+        path.join(homedir, '.node_modules'),
+        path.join(homedir, '.node_libraries')
+    ];
+};
 
+var defaultIsFile = function isFile(file, cb) {
+    fs.stat(file, function (err, stat) {
+        if (!err) {
+            return cb(null, stat.isFile() || stat.isFIFO());
+        }
+        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
+        return cb(err);
+    });
+};
 
-    const originalCwd = process.cwd();
+var defaultIsDir = function isDirectory(dir, cb) {
+    fs.stat(dir, function (err, stat) {
+        if (!err) {
+            return cb(null, stat.isDirectory());
+        }
+        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
+        return cb(err);
+    });
+};
 
-    try {
-      for (const {
-        pattern,
-        cwd
-      } of toDelete) {
-        process.chdir(cwd);
-        const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
+var defaultRealpath = function realpath(x, cb) {
+    realpathFS(x, function (realpathErr, realPath) {
+        if (realpathErr && realpathErr.code !== 'ENOENT') cb(realpathErr);
+        else cb(null, realpathErr ? x : realPath);
+    });
+};
 
-        if (_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].wouldLogLevel('info')) {
-          ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
+var maybeRealpath = function maybeRealpath(realpath, x, opts, cb) {
+    if (opts && opts.preserveSymlinks === false) {
+        realpath(x, cb);
+    } else {
+        cb(null, x);
+    }
+};
+
+var defaultReadPackage = function defaultReadPackage(readFile, pkgfile, cb) {
+    readFile(pkgfile, function (readFileErr, body) {
+        if (readFileErr) cb(readFileErr);
+        else {
+            try {
+                var pkg = JSON.parse(body);
+                cb(null, pkg);
+            } catch (jsonErr) {
+                cb(null);
+            }
         }
+    });
+};
 
-        await promise;
-      }
-    } finally {
-      process.chdir(originalCwd);
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
     }
-  }
-
+    return dirs;
 };
 
-/***/ }),
-/* 556 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = function resolve(x, options, callback) {
+    var cb = callback;
+    var opts = options;
+    if (typeof options === 'function') {
+        cb = opts;
+        opts = {};
+    }
+    if (typeof x !== 'string') {
+        var err = new TypeError('Path must be a string.');
+        return process.nextTick(function () {
+            cb(err);
+        });
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RunCommand", function() { return RunCommand; });
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(341);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(220);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(557);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(340);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+    opts = normalizeOptions(x, opts);
 
+    var isFile = opts.isFile || defaultIsFile;
+    var isDirectory = opts.isDirectory || defaultIsDir;
+    var readFile = opts.readFile || fs.readFile;
+    var realpath = opts.realpath || defaultRealpath;
+    var readPackage = opts.readPackage || defaultReadPackage;
+    if (opts.readFile && opts.readPackage) {
+        var conflictErr = new TypeError('`readFile` and `readPackage` are mutually exclusive.');
+        return process.nextTick(function () {
+            cb(conflictErr);
+        });
+    }
+    var packageIterator = opts.packageIterator;
 
+    var extensions = opts.extensions || ['.js'];
+    var includeCoreModules = opts.includeCoreModules !== false;
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
+    opts.paths = opts.paths || defaultPaths();
 
+    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
+    var absoluteStart = path.resolve(basedir);
 
-const RunCommand = {
-  description: 'Run script defined in package.json in each package that contains that script (only works on packages not using Bazel yet)',
-  name: 'run',
-  reportTiming: {
-    group: 'scripts/kbn run',
-    id: 'total'
-  },
+    maybeRealpath(
+        realpath,
+        absoluteStart,
+        opts,
+        function (err, realStart) {
+            if (err) cb(err);
+            else init(realStart);
+        }
+    );
 
-  async run(projects, projectGraph, {
-    extraArgs,
-    options
-  }) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-      We are migrating packages into the Bazel build system and we will no longer support running npm scripts on
-      packages using 'yarn kbn run' on Bazel built packages. If the package you are trying to act on contains a
-      BUILD.bazel file please just use 'yarn kbn build' to build it or 'yarn kbn watch' to watch it
-    `);
-    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__["topologicallyBatchProjects"])(projects, projectGraph);
+    var res;
+    function init(basedir) {
+        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
+            res = path.resolve(basedir, x);
+            if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
+            if ((/\/$/).test(x) && res === basedir) {
+                loadAsDirectory(res, opts.package, onfile);
+            } else loadAsFile(res, opts.package, onfile);
+        } else if (includeCoreModules && isCore(x)) {
+            return cb(null, x);
+        } else loadNodeModules(x, basedir, function (err, n, pkg) {
+            if (err) cb(err);
+            else if (n) {
+                return maybeRealpath(realpath, n, opts, function (err, realN) {
+                    if (err) {
+                        cb(err);
+                    } else {
+                        cb(null, realN, pkg);
+                    }
+                });
+            } else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
+    }
 
-    if (extraArgs.length === 0) {
-      throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__["CliError"]('No script specified');
+    function onfile(err, m, pkg) {
+        if (err) cb(err);
+        else if (m) cb(null, m, pkg);
+        else loadAsDirectory(res, function (err, d, pkg) {
+            if (err) cb(err);
+            else if (d) {
+                maybeRealpath(realpath, d, opts, function (err, realD) {
+                    if (err) {
+                        cb(err);
+                    } else {
+                        cb(null, realD, pkg);
+                    }
+                });
+            } else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
     }
 
-    const scriptName = extraArgs[0];
-    const scriptArgs = extraArgs.slice(1);
-    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_3__["parallelizeBatches"])(batchedProjects, async project => {
-      if (!project.hasScript(scriptName)) {
-        if (!!options['skip-missing']) {
-          return;
+    function loadAsFile(x, thePackage, callback) {
+        var loadAsFilePackage = thePackage;
+        var cb = callback;
+        if (typeof loadAsFilePackage === 'function') {
+            cb = loadAsFilePackage;
+            loadAsFilePackage = undefined;
         }
 
-        throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__["CliError"](`[${project.name}] no "${scriptName}" script defined. To skip packages without the "${scriptName}" script pass --skip-missing`);
-      }
+        var exts = [''].concat(extensions);
+        load(exts, x, loadAsFilePackage);
 
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].info(`[${project.name}] running "${scriptName}" script`);
-      await project.runScriptStreaming(scriptName, {
-        args: scriptArgs
-      });
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].success(`[${project.name}] complete`);
-    });
-  }
+        function load(exts, x, loadPackage) {
+            if (exts.length === 0) return cb(null, undefined, loadPackage);
+            var file = x + exts[0];
 
-};
+            var pkg = loadPackage;
+            if (pkg) onpkg(null, pkg);
+            else loadpkg(path.dirname(file), onpkg);
 
-/***/ }),
-/* 557 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+            function onpkg(err, pkg_, dir) {
+                pkg = pkg_;
+                if (err) return cb(err);
+                if (dir && pkg && opts.pathFilter) {
+                    var rfile = path.relative(dir, file);
+                    var rel = rfile.slice(0, rfile.length - exts[0].length);
+                    var r = opts.pathFilter(pkg, x, rel);
+                    if (r) return load(
+                        [''].concat(extensions.slice()),
+                        path.resolve(dir, r),
+                        pkg
+                    );
+                }
+                isFile(file, onex);
+            }
+            function onex(err, ex) {
+                if (err) return cb(err);
+                if (ex) return cb(null, file, pkg);
+                load(exts.slice(1), x, pkg);
+            }
+        }
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parallelizeBatches", function() { return parallelizeBatches; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parallelize", function() { return parallelize; });
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-async function parallelizeBatches(batches, fn) {
-  for (const batch of batches) {
-    // We need to make sure the entire batch has completed before we can move on
-    // to the next batch
-    await parallelize(batch, fn);
-  }
-}
-async function parallelize(items, fn, concurrency = 4) {
-  if (items.length === 0) {
-    return;
-  }
+    function loadpkg(dir, cb) {
+        if (dir === '' || dir === '/') return cb(null);
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return cb(null);
+        }
+        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return cb(null);
 
-  return new Promise((resolve, reject) => {
-    let activePromises = 0;
-    const values = items.slice(0);
+        maybeRealpath(realpath, dir, opts, function (unwrapErr, pkgdir) {
+            if (unwrapErr) return loadpkg(path.dirname(dir), cb);
+            var pkgfile = path.join(pkgdir, 'package.json');
+            isFile(pkgfile, function (err, ex) {
+                // on err, ex is false
+                if (!ex) return loadpkg(path.dirname(dir), cb);
 
-    async function scheduleItem(item) {
-      activePromises++;
+                readPackage(readFile, pkgfile, function (err, pkgParam) {
+                    if (err) cb(err);
 
-      try {
-        await fn(item);
-        activePromises--;
+                    var pkg = pkgParam;
 
-        if (values.length > 0) {
-          // We have more work to do, so we schedule the next promise
-          scheduleItem(values.shift());
-        } else if (activePromises === 0) {
-          // We have no more values left, and all items have completed, so we've
-          // completed all the work.
-          resolve();
-        }
-      } catch (error) {
-        reject(error);
-      }
+                    if (pkg && opts.packageFilter) {
+                        pkg = opts.packageFilter(pkg, pkgfile);
+                    }
+                    cb(null, pkg, dir);
+                });
+            });
+        });
     }
 
-    values.splice(0, concurrency).map(scheduleItem);
-  });
-}
+    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
+        var cb = callback;
+        var fpkg = loadAsDirectoryPackage;
+        if (typeof fpkg === 'function') {
+            cb = fpkg;
+            fpkg = opts.package;
+        }
 
-/***/ }),
-/* 558 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        maybeRealpath(realpath, x, opts, function (unwrapErr, pkgdir) {
+            if (unwrapErr) return cb(unwrapErr);
+            var pkgfile = path.join(pkgdir, 'package.json');
+            isFile(pkgfile, function (err, ex) {
+                if (err) return cb(err);
+                if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WatchCommand", function() { return WatchCommand; });
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(423);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+                readPackage(readFile, pkgfile, function (err, pkgParam) {
+                    if (err) return cb(err);
 
-const WatchCommand = {
-  description: 'Runs a build in the Bazel built packages and keeps watching them for changes',
-  name: 'watch',
-  reportTiming: {
-    group: 'scripts/kbn watch',
-    id: 'total'
-  },
+                    var pkg = pkgParam;
 
-  async run(projects, projectGraph, {
-    options
-  }) {
-    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages and run it through iBazel to watch it for changes
-    //
-    // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
-    // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
+                    if (pkg && opts.packageFilter) {
+                        pkg = opts.packageFilter(pkg, pkgfile);
+                    }
 
-    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
-  }
+                    if (pkg && pkg.main) {
+                        if (typeof pkg.main !== 'string') {
+                            var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
+                            mainError.code = 'INVALID_PACKAGE_MAIN';
+                            return cb(mainError);
+                        }
+                        if (pkg.main === '.' || pkg.main === './') {
+                            pkg.main = 'index';
+                        }
+                        loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
+                            if (err) return cb(err);
+                            if (m) return cb(null, m, pkg);
+                            if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
 
-};
+                            var dir = path.resolve(x, pkg.main);
+                            loadAsDirectory(dir, pkg, function (err, n, pkg) {
+                                if (err) return cb(err);
+                                if (n) return cb(null, n, pkg);
+                                loadAsFile(path.join(x, 'index'), pkg, cb);
+                            });
+                        });
+                        return;
+                    }
 
-/***/ }),
-/* 559 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+                    loadAsFile(path.join(x, '/index'), pkg, cb);
+                });
+            });
+        });
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runCommand", function() { return runCommand; });
-/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(131);
-/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(341);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(220);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(340);
-/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(422);
-/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(560);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+    function processDirs(cb, dirs) {
+        if (dirs.length === 0) return cb(null, undefined);
+        var dir = dirs[0];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+        isDirectory(path.dirname(dir), isdir);
 
-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; }
+        function isdir(err, isdir) {
+            if (err) return cb(err);
+            if (!isdir) return processDirs(cb, dirs.slice(1));
+            loadAsFile(dir, opts.package, onfile);
+        }
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+        function onfile(err, m, pkg) {
+            if (err) return cb(err);
+            if (m) return cb(null, m, pkg);
+            loadAsDirectory(dir, opts.package, ondir);
+        }
 
+        function ondir(err, n, pkg) {
+            if (err) return cb(err);
+            if (n) return cb(null, n, pkg);
+            processDirs(cb, dirs.slice(1));
+        }
+    }
+    function loadNodeModules(x, start, cb) {
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        processDirs(
+            cb,
+            packageIterator ? packageIterator(x, start, thunk, opts) : thunk()
+        );
+    }
+};
 
 
+/***/ }),
 
+/***/ "../../node_modules/resolve/lib/caller.js":
+/***/ (function(module, exports) {
 
+module.exports = function () {
+    // see https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
+    var origPrepareStackTrace = Error.prepareStackTrace;
+    Error.prepareStackTrace = function (_, stack) { return stack; };
+    var stack = (new Error()).stack;
+    Error.prepareStackTrace = origPrepareStackTrace;
+    return stack[2].getFileName();
+};
 
-process.env.CI_STATS_NESTED_TIMING = 'true';
-async function runCommand(command, config) {
-  const runStartTime = Date.now();
-  let kbn;
 
-  try {
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`Running [${command.name}] command from [${config.rootPath}]`);
-    kbn = await _utils_kibana__WEBPACK_IMPORTED_MODULE_5__["Kibana"].loadFrom(config.rootPath);
-    const projects = kbn.getFilteredProjects({
-      skipKibanaPlugins: Boolean(config.options['skip-kibana-plugins']),
-      ossOnly: Boolean(config.options.oss),
-      exclude: toArray(config.options.exclude),
-      include: toArray(config.options.include)
-    });
+/***/ }),
 
-    if (projects.size === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(`There are no projects found. Double check project name(s) in '-i/--include' and '-e/--exclude' filters.`);
-      return process.exit(1);
-    }
+/***/ "../../node_modules/resolve/lib/core.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_3__["buildProjectGraph"])(projects);
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(`Found ${projects.size.toString()} projects`);
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].debug(Object(_utils_projects_tree__WEBPACK_IMPORTED_MODULE_4__["renderProjectsTree"])(config.rootPath, projects));
-    await command.run(projects, projectGraph, _objectSpread(_objectSpread({}, config), {}, {
-      kbn
-    }));
+var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
 
-    if (command.reportTiming) {
-      const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
-      await reporter.timings({
-        upstreamBranch: kbn.kibanaProject.json.branch,
-        // prevent loading @kbn/utils by passing null
-        kibanaUuid: kbn.getUuid() || null,
-        timings: [{
-          group: command.reportTiming.group,
-          id: command.reportTiming.id,
-          ms: Date.now() - runStartTime,
-          meta: {
-            success: true
-          }
-        }]
-      });
-    }
-  } catch (error) {
-    if (command.reportTiming) {
-      // if we don't have a kbn object then things are too broken to report on
-      if (kbn) {
-        try {
-          const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
-          await reporter.timings({
-            upstreamBranch: kbn.kibanaProject.json.branch,
-            // prevent loading @kbn/utils by passing null
-            kibanaUuid: kbn.getUuid() || null,
-            timings: [{
-              group: command.reportTiming.group,
-              id: command.reportTiming.id,
-              ms: Date.now() - runStartTime,
-              meta: {
-                success: false
-              }
-            }]
-          });
-        } catch (e) {
-          // prevent hiding bootstrap errors
-          _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error('failed to report timings:');
-          _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(e);
+function specifierIncluded(specifier) {
+    var parts = specifier.split(' ');
+    var op = parts.length > 1 ? parts[0] : '=';
+    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+
+    for (var i = 0; i < 3; ++i) {
+        var cur = parseInt(current[i] || 0, 10);
+        var ver = parseInt(versionParts[i] || 0, 10);
+        if (cur === ver) {
+            continue; // eslint-disable-line no-restricted-syntax, no-continue
         }
-      }
+        if (op === '<') {
+            return cur < ver;
+        } else if (op === '>=') {
+            return cur >= ver;
+        }
+        return false;
     }
+    return op === '>=';
+}
 
-    _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(`[${command.name}] failed:`);
-
-    if (error instanceof _utils_errors__WEBPACK_IMPORTED_MODULE_1__["CliError"]) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(error.message);
-      const metaOutput = Object.entries(error.meta).map(([key, value]) => `${key}: ${value}`).join('\n');
-
-      if (metaOutput) {
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].info('Additional debugging info:\n');
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].indent(2);
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].info(metaOutput);
-        _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].indent(-2);
-      }
-    } else {
-      _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].error(error);
+function matchesRange(range) {
+    var specifiers = range.split(/ ?&& ?/);
+    if (specifiers.length === 0) { return false; }
+    for (var i = 0; i < specifiers.length; ++i) {
+        if (!specifierIncluded(specifiers[i])) { return false; }
     }
+    return true;
+}
 
-    process.exit(1);
-  }
+function versionIncluded(specifierValue) {
+    if (typeof specifierValue === 'boolean') { return specifierValue; }
+    if (specifierValue && typeof specifierValue === 'object') {
+        for (var i = 0; i < specifierValue.length; ++i) {
+            if (matchesRange(specifierValue[i])) { return true; }
+        }
+        return false;
+    }
+    return matchesRange(specifierValue);
 }
 
-function toArray(value) {
-  if (value == null) {
-    return [];
-  }
+var data = __webpack_require__("../../node_modules/resolve/lib/core.json");
 
-  return Array.isArray(value) ? value : [value];
+var core = {};
+for (var mod in data) { // eslint-disable-line no-restricted-syntax
+    if (Object.prototype.hasOwnProperty.call(data, mod)) {
+        core[mod] = versionIncluded(data[mod]);
+    }
 }
+module.exports = core;
 
-/***/ }),
-/* 560 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__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 fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(132);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(561);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333);
-/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(409);
-/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(340);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(564);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+/***/ "../../node_modules/resolve/lib/core.json":
+/***/ (function(module) {
 
-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; }
+module.exports = JSON.parse("{\"assert\":true,\"node:assert\":[\">= 14.18 && < 15\",\">= 16\"],\"assert/strict\":\">= 15\",\"node:assert/strict\":\">= 16\",\"async_hooks\":\">= 8\",\"node:async_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"buffer_ieee754\":\">= 0.5 && < 0.9.7\",\"buffer\":true,\"node:buffer\":[\">= 14.18 && < 15\",\">= 16\"],\"child_process\":true,\"node:child_process\":[\">= 14.18 && < 15\",\">= 16\"],\"cluster\":\">= 0.5\",\"node:cluster\":[\">= 14.18 && < 15\",\">= 16\"],\"console\":true,\"node:console\":[\">= 14.18 && < 15\",\">= 16\"],\"constants\":true,\"node:constants\":[\">= 14.18 && < 15\",\">= 16\"],\"crypto\":true,\"node:crypto\":[\">= 14.18 && < 15\",\">= 16\"],\"_debug_agent\":\">= 1 && < 8\",\"_debugger\":\"< 8\",\"dgram\":true,\"node:dgram\":[\">= 14.18 && < 15\",\">= 16\"],\"diagnostics_channel\":[\">= 14.17 && < 15\",\">= 15.1\"],\"node:diagnostics_channel\":[\">= 14.18 && < 15\",\">= 16\"],\"dns\":true,\"node:dns\":[\">= 14.18 && < 15\",\">= 16\"],\"dns/promises\":\">= 15\",\"node:dns/promises\":\">= 16\",\"domain\":\">= 0.7.12\",\"node:domain\":[\">= 14.18 && < 15\",\">= 16\"],\"events\":true,\"node:events\":[\">= 14.18 && < 15\",\">= 16\"],\"freelist\":\"< 6\",\"fs\":true,\"node:fs\":[\">= 14.18 && < 15\",\">= 16\"],\"fs/promises\":[\">= 10 && < 10.1\",\">= 14\"],\"node:fs/promises\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_agent\":\">= 0.11.1\",\"node:_http_agent\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_client\":\">= 0.11.1\",\"node:_http_client\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_common\":\">= 0.11.1\",\"node:_http_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_incoming\":\">= 0.11.1\",\"node:_http_incoming\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_outgoing\":\">= 0.11.1\",\"node:_http_outgoing\":[\">= 14.18 && < 15\",\">= 16\"],\"_http_server\":\">= 0.11.1\",\"node:_http_server\":[\">= 14.18 && < 15\",\">= 16\"],\"http\":true,\"node:http\":[\">= 14.18 && < 15\",\">= 16\"],\"http2\":\">= 8.8\",\"node:http2\":[\">= 14.18 && < 15\",\">= 16\"],\"https\":true,\"node:https\":[\">= 14.18 && < 15\",\">= 16\"],\"inspector\":\">= 8\",\"node:inspector\":[\">= 14.18 && < 15\",\">= 16\"],\"_linklist\":\"< 8\",\"module\":true,\"node:module\":[\">= 14.18 && < 15\",\">= 16\"],\"net\":true,\"node:net\":[\">= 14.18 && < 15\",\">= 16\"],\"node-inspect/lib/_inspect\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6 && < 12\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6 && < 12\",\"os\":true,\"node:os\":[\">= 14.18 && < 15\",\">= 16\"],\"path\":true,\"node:path\":[\">= 14.18 && < 15\",\">= 16\"],\"path/posix\":\">= 15.3\",\"node:path/posix\":\">= 16\",\"path/win32\":\">= 15.3\",\"node:path/win32\":\">= 16\",\"perf_hooks\":\">= 8.5\",\"node:perf_hooks\":[\">= 14.18 && < 15\",\">= 16\"],\"process\":\">= 1\",\"node:process\":[\">= 14.18 && < 15\",\">= 16\"],\"punycode\":\">= 0.5\",\"node:punycode\":[\">= 14.18 && < 15\",\">= 16\"],\"querystring\":true,\"node:querystring\":[\">= 14.18 && < 15\",\">= 16\"],\"readline\":true,\"node:readline\":[\">= 14.18 && < 15\",\">= 16\"],\"readline/promises\":\">= 17\",\"node:readline/promises\":\">= 17\",\"repl\":true,\"node:repl\":[\">= 14.18 && < 15\",\">= 16\"],\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"node:_stream_duplex\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_transform\":\">= 0.9.4\",\"node:_stream_transform\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_wrap\":\">= 1.4.1\",\"node:_stream_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_passthrough\":\">= 0.9.4\",\"node:_stream_passthrough\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_readable\":\">= 0.9.4\",\"node:_stream_readable\":[\">= 14.18 && < 15\",\">= 16\"],\"_stream_writable\":\">= 0.9.4\",\"node:_stream_writable\":[\">= 14.18 && < 15\",\">= 16\"],\"stream\":true,\"node:stream\":[\">= 14.18 && < 15\",\">= 16\"],\"stream/consumers\":\">= 16.7\",\"node:stream/consumers\":\">= 16.7\",\"stream/promises\":\">= 15\",\"node:stream/promises\":\">= 16\",\"stream/web\":\">= 16.5\",\"node:stream/web\":\">= 16.5\",\"string_decoder\":true,\"node:string_decoder\":[\">= 14.18 && < 15\",\">= 16\"],\"sys\":[\">= 0.4 && < 0.7\",\">= 0.8\"],\"node:sys\":[\">= 14.18 && < 15\",\">= 16\"],\"timers\":true,\"node:timers\":[\">= 14.18 && < 15\",\">= 16\"],\"timers/promises\":\">= 15\",\"node:timers/promises\":\">= 16\",\"_tls_common\":\">= 0.11.13\",\"node:_tls_common\":[\">= 14.18 && < 15\",\">= 16\"],\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"node:_tls_wrap\":[\">= 14.18 && < 15\",\">= 16\"],\"tls\":true,\"node:tls\":[\">= 14.18 && < 15\",\">= 16\"],\"trace_events\":\">= 10\",\"node:trace_events\":[\">= 14.18 && < 15\",\">= 16\"],\"tty\":true,\"node:tty\":[\">= 14.18 && < 15\",\">= 16\"],\"url\":true,\"node:url\":[\">= 14.18 && < 15\",\">= 16\"],\"util\":true,\"node:util\":[\">= 14.18 && < 15\",\">= 16\"],\"util/types\":\">= 15.3\",\"node:util/types\":\">= 16\",\"v8/tools/arguments\":\">= 10 && < 12\",\"v8/tools/codemap\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/consarray\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/csvparser\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/logreader\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/profile_view\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8/tools/splaytree\":[\">= 4.4 && < 5\",\">= 5.2 && < 12\"],\"v8\":\">= 1\",\"node:v8\":[\">= 14.18 && < 15\",\">= 16\"],\"vm\":true,\"node:vm\":[\">= 14.18 && < 15\",\">= 16\"],\"wasi\":\">= 13.4 && < 13.5\",\"worker_threads\":\">= 11.7\",\"node:worker_threads\":[\">= 14.18 && < 15\",\">= 16\"],\"zlib\":\">= 0.5\",\"node:zlib\":[\">= 14.18 && < 15\",\">= 16\"]}");
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+/***/ }),
 
+/***/ "../../node_modules/resolve/lib/homedir.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+var os = __webpack_require__("os");
 
+// adapted from https://github.com/sindresorhus/os-homedir/blob/11e089f4754db38bb535e5a8416320c4446e8cfd/index.js
 
+module.exports = os.homedir || function homedir() {
+    var home = process.env.HOME;
+    var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME;
 
-/**
- * Helper class for dealing with a set of projects as children of
- * the Kibana project. The kbn/pm is currently implemented to be
- * more generic, where everything is an operation of generic projects,
- * but that leads to exceptions where we need the kibana project and
- * do things like `project.get('kibana')!`.
- *
- * Using this helper we can restructre the generic list of projects
- * as a Kibana object which encapulates all the projects in the
- * workspace and knows about the root Kibana project.
- */
+    if (process.platform === 'win32') {
+        return process.env.USERPROFILE || process.env.HOMEDRIVE + process.env.HOMEPATH || home || null;
+    }
 
-class Kibana {
-  static async loadFrom(rootPath) {
-    return new Kibana(await Object(_projects__WEBPACK_IMPORTED_MODULE_5__["getProjects"])(rootPath, Object(_config__WEBPACK_IMPORTED_MODULE_6__["getProjectPaths"])({
-      rootPath
-    })));
-  }
+    if (process.platform === 'darwin') {
+        return home || (user ? '/Users/' + user : null);
+    }
 
-  constructor(allWorkspaceProjects) {
-    this.allWorkspaceProjects = allWorkspaceProjects;
+    if (process.platform === 'linux') {
+        return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null)); // eslint-disable-line no-extra-parens
+    }
 
-    _defineProperty(this, "kibanaProject", void 0);
+    return home || null;
+};
 
-    const kibanaProject = allWorkspaceProjects.get('kibana');
 
-    if (!kibanaProject) {
-      throw new TypeError('Unable to create Kibana object without all projects, including the Kibana project.');
-    }
+/***/ }),
 
-    this.kibanaProject = kibanaProject;
-  }
-  /** make an absolute path by resolving subPath relative to the kibana repo */
+/***/ "../../node_modules/resolve/lib/is-core.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+var isCoreModule = __webpack_require__("../../node_modules/is-core-module/index.js");
 
-  getAbsolute(...subPath) {
-    return path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(this.kibanaProject.path, ...subPath);
-  }
-  /** convert an absolute path to a relative path, relative to the kibana repo */
+module.exports = function isCore(x) {
+    return isCoreModule(x);
+};
 
 
-  getRelative(absolute) {
-    return path__WEBPACK_IMPORTED_MODULE_0___default.a.relative(this.kibanaProject.path, absolute);
-  }
-  /** get a copy of the map of all projects in the kibana workspace */
+/***/ }),
 
+/***/ "../../node_modules/resolve/lib/node-modules-paths.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  getAllProjects() {
-    return new Map(this.allWorkspaceProjects);
-  }
-  /** determine if a project with the given name exists */
+var path = __webpack_require__("path");
+var parse = path.parse || __webpack_require__("../../node_modules/path-parse/index.js"); // eslint-disable-line global-require
 
+var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
+    var prefix = '/';
+    if ((/^([A-Za-z]:)/).test(absoluteStart)) {
+        prefix = '';
+    } else if ((/^\\\\/).test(absoluteStart)) {
+        prefix = '\\\\';
+    }
 
-  hasProject(name) {
-    return this.allWorkspaceProjects.has(name);
-  }
-  /** get a specific project, throws if the name is not known (use hasProject() first) */
+    var paths = [absoluteStart];
+    var parsed = parse(absoluteStart);
+    while (parsed.dir !== paths[paths.length - 1]) {
+        paths.push(parsed.dir);
+        parsed = parse(parsed.dir);
+    }
 
+    return paths.reduce(function (dirs, aPath) {
+        return dirs.concat(modules.map(function (moduleDir) {
+            return path.resolve(prefix, aPath, moduleDir);
+        }));
+    }, []);
+};
 
-  getProject(name) {
-    const project = this.allWorkspaceProjects.get(name);
+module.exports = function nodeModulesPaths(start, opts, request) {
+    var modules = opts && opts.moduleDirectory
+        ? [].concat(opts.moduleDirectory)
+        : ['node_modules'];
 
-    if (!project) {
-      throw new Error(`No package with name "${name}" in the workspace`);
+    if (opts && typeof opts.paths === 'function') {
+        return opts.paths(
+            request,
+            start,
+            function () { return getNodeModulesDirs(start, modules); },
+            opts
+        );
     }
 
-    return project;
-  }
-  /** get a project and all of the projects it depends on in a ProjectMap */
+    var dirs = getNodeModulesDirs(start, modules);
+    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
+};
 
 
-  getProjectAndDeps(name) {
-    const project = this.getProject(name);
-    return Object(_projects__WEBPACK_IMPORTED_MODULE_5__["includeTransitiveProjects"])([project], this.allWorkspaceProjects);
-  }
-  /** filter the projects to just those matching certain paths/include/exclude tags */
+/***/ }),
 
+/***/ "../../node_modules/resolve/lib/normalize-options.js":
+/***/ (function(module, exports) {
 
-  getFilteredProjects(options) {
-    const allProjects = this.getAllProjects();
-    const filteredProjects = new Map();
-    const pkgJsonPaths = Array.from(allProjects.values()).map(p => p.packageJsonLocation);
-    const filteredPkgJsonGlobs = Object(_config__WEBPACK_IMPORTED_MODULE_6__["getProjectPaths"])(_objectSpread(_objectSpread({}, options), {}, {
-      rootPath: this.kibanaProject.path
-    })).map(g => path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(g, 'package.json'));
-    const matchingPkgJsonPaths = multimatch__WEBPACK_IMPORTED_MODULE_2___default()(pkgJsonPaths, filteredPkgJsonGlobs);
+module.exports = function (x, opts) {
+    /**
+     * This file is purposefully a passthrough. It's expected that third-party
+     * environments will override it at runtime in order to inject special logic
+     * into `resolve` (by manipulating the options). One such example is the PnP
+     * code path in Yarn.
+     */
 
-    for (const project of allProjects.values()) {
-      const pathMatches = matchingPkgJsonPaths.includes(project.packageJsonLocation);
-      const notExcluded = !options.exclude.includes(project.name);
-      const isIncluded = !options.include.length || options.include.includes(project.name);
+    return opts || {};
+};
 
-      if (pathMatches && notExcluded && isIncluded) {
-        filteredProjects.set(project.name, project);
-      }
-    }
 
-    return filteredProjects;
-  }
+/***/ }),
 
-  isPartOfRepo(project) {
-    return project.path === this.kibanaProject.path || is_path_inside__WEBPACK_IMPORTED_MODULE_3___default()(project.path, this.kibanaProject.path);
-  }
+/***/ "../../node_modules/resolve/lib/sync.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  isOutsideRepo(project) {
-    return !this.isPartOfRepo(project);
-  }
+var isCore = __webpack_require__("../../node_modules/is-core-module/index.js");
+var fs = __webpack_require__("fs");
+var path = __webpack_require__("path");
+var getHomedir = __webpack_require__("../../node_modules/resolve/lib/homedir.js");
+var caller = __webpack_require__("../../node_modules/resolve/lib/caller.js");
+var nodeModulesPaths = __webpack_require__("../../node_modules/resolve/lib/node-modules-paths.js");
+var normalizeOptions = __webpack_require__("../../node_modules/resolve/lib/normalize-options.js");
 
-  resolveAllProductionDependencies(yarnLock, log) {
-    const kibanaDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["resolveDepsForProject"])({
-      project: this.kibanaProject,
-      yarnLock,
-      kbn: this,
-      includeDependentProject: true,
-      productionDepsOnly: true,
-      log
-    });
-    const xpackDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["resolveDepsForProject"])({
-      project: this.getProject('x-pack'),
-      yarnLock,
-      kbn: this,
-      includeDependentProject: true,
-      productionDepsOnly: true,
-      log
-    });
-    return new Map([...kibanaDeps.entries(), ...xpackDeps.entries()]);
-  }
+var realpathFS = fs.realpathSync && typeof fs.realpathSync.native === 'function' ? fs.realpathSync.native : fs.realpathSync;
 
-  getUuid() {
+var homedir = getHomedir();
+var defaultPaths = function () {
+    return [
+        path.join(homedir, '.node_modules'),
+        path.join(homedir, '.node_libraries')
+    ];
+};
+
+var defaultIsFile = function isFile(file) {
     try {
-      return fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFileSync(this.getAbsolute('data/uuid'), 'utf-8').trim();
-    } catch (error) {
-      if (error.code === 'ENOENT') {
-        return undefined;
-      }
+        var stat = fs.statSync(file, { throwIfNoEntry: false });
+    } catch (e) {
+        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+        throw e;
+    }
+    return !!stat && (stat.isFile() || stat.isFIFO());
+};
 
-      throw error;
+var defaultIsDir = function isDirectory(dir) {
+    try {
+        var stat = fs.statSync(dir, { throwIfNoEntry: false });
+    } catch (e) {
+        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+        throw e;
     }
-  }
+    return !!stat && stat.isDirectory();
+};
 
-}
+var defaultRealpathSync = function realpathSync(x) {
+    try {
+        return realpathFS(x);
+    } catch (realpathErr) {
+        if (realpathErr.code !== 'ENOENT') {
+            throw realpathErr;
+        }
+    }
+    return x;
+};
 
-/***/ }),
-/* 561 */
-/***/ (function(module, exports, __webpack_require__) {
+var maybeRealpathSync = function maybeRealpathSync(realpathSync, x, opts) {
+    if (opts && opts.preserveSymlinks === false) {
+        return realpathSync(x);
+    }
+    return x;
+};
 
-"use strict";
+var defaultReadPackageSync = function defaultReadPackageSync(readFileSync, pkgfile) {
+    var body = readFileSync(pkgfile);
+    try {
+        var pkg = JSON.parse(body);
+        return pkg;
+    } catch (jsonErr) {}
+};
 
-const minimatch = __webpack_require__(247);
-const arrayUnion = __webpack_require__(242);
-const arrayDiffer = __webpack_require__(562);
-const arrify = __webpack_require__(563);
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
+    }
+    return dirs;
+};
 
-module.exports = (list, patterns, options = {}) => {
-	list = arrify(list);
-	patterns = arrify(patterns);
+module.exports = function resolveSync(x, options) {
+    if (typeof x !== 'string') {
+        throw new TypeError('Path must be a string.');
+    }
+    var opts = normalizeOptions(x, options);
 
-	if (list.length === 0 || patterns.length === 0) {
-		return [];
-	}
+    var isFile = opts.isFile || defaultIsFile;
+    var readFileSync = opts.readFileSync || fs.readFileSync;
+    var isDirectory = opts.isDirectory || defaultIsDir;
+    var realpathSync = opts.realpathSync || defaultRealpathSync;
+    var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
+    if (opts.readFileSync && opts.readPackageSync) {
+        throw new TypeError('`readFileSync` and `readPackageSync` are mutually exclusive.');
+    }
+    var packageIterator = opts.packageIterator;
 
-	return patterns.reduce((result, pattern) => {
-		let process = arrayUnion;
+    var extensions = opts.extensions || ['.js'];
+    var includeCoreModules = opts.includeCoreModules !== false;
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
-		if (pattern[0] === '!') {
-			pattern = pattern.slice(1);
-			process = arrayDiffer;
-		}
+    opts.paths = opts.paths || defaultPaths();
 
-		return process(result, minimatch.match(list, pattern, options));
-	}, []);
-};
+    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
+    var absoluteStart = maybeRealpathSync(realpathSync, path.resolve(basedir), opts);
 
+    if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
+        var res = path.resolve(absoluteStart, x);
+        if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
+        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
+        if (m) return maybeRealpathSync(realpathSync, m, opts);
+    } else if (includeCoreModules && isCore(x)) {
+        return x;
+    } else {
+        var n = loadNodeModulesSync(x, absoluteStart);
+        if (n) return maybeRealpathSync(realpathSync, n, opts);
+    }
 
-/***/ }),
-/* 562 */
-/***/ (function(module, exports, __webpack_require__) {
+    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
 
-"use strict";
+    function loadAsFileSync(x) {
+        var pkg = loadpkg(path.dirname(x));
 
+        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
+            var rfile = path.relative(pkg.dir, x);
+            var r = opts.pathFilter(pkg.pkg, x, rfile);
+            if (r) {
+                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
+            }
+        }
 
-const arrayDiffer = (array, ...values) => {
-	const rest = new Set([].concat(...values));
-	return array.filter(element => !rest.has(element));
-};
+        if (isFile(x)) {
+            return x;
+        }
 
-module.exports = arrayDiffer;
+        for (var i = 0; i < extensions.length; i++) {
+            var file = x + extensions[i];
+            if (isFile(file)) {
+                return file;
+            }
+        }
+    }
 
+    function loadpkg(dir) {
+        if (dir === '' || dir === '/') return;
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return;
+        }
+        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
 
-/***/ }),
-/* 563 */
-/***/ (function(module, exports, __webpack_require__) {
+        var pkgfile = path.join(maybeRealpathSync(realpathSync, dir, opts), 'package.json');
 
-"use strict";
+        if (!isFile(pkgfile)) {
+            return loadpkg(path.dirname(dir));
+        }
 
+        var pkg = readPackageSync(readFileSync, pkgfile);
 
-const arrify = value => {
-	if (value === null || value === undefined) {
-		return [];
-	}
+        if (pkg && opts.packageFilter) {
+            // v2 will pass pkgfile
+            pkg = opts.packageFilter(pkg, /*pkgfile,*/ dir); // eslint-disable-line spaced-comment
+        }
 
-	if (Array.isArray(value)) {
-		return value;
-	}
+        return { pkg: pkg, dir: dir };
+    }
 
-	if (typeof value === 'string') {
-		return [value];
-	}
+    function loadAsDirectorySync(x) {
+        var pkgfile = path.join(maybeRealpathSync(realpathSync, x, opts), '/package.json');
+        if (isFile(pkgfile)) {
+            try {
+                var pkg = readPackageSync(readFileSync, pkgfile);
+            } catch (e) {}
 
-	if (typeof value[Symbol.iterator] === 'function') {
-		return [...value];
-	}
+            if (pkg && opts.packageFilter) {
+                // v2 will pass pkgfile
+                pkg = opts.packageFilter(pkg, /*pkgfile,*/ x); // eslint-disable-line spaced-comment
+            }
 
-	return [value];
-};
+            if (pkg && pkg.main) {
+                if (typeof pkg.main !== 'string') {
+                    var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
+                    mainError.code = 'INVALID_PACKAGE_MAIN';
+                    throw mainError;
+                }
+                if (pkg.main === '.' || pkg.main === './') {
+                    pkg.main = 'index';
+                }
+                try {
+                    var m = loadAsFileSync(path.resolve(x, pkg.main));
+                    if (m) return m;
+                    var n = loadAsDirectorySync(path.resolve(x, pkg.main));
+                    if (n) return n;
+                } catch (e) {}
+            }
+        }
 
-module.exports = arrify;
+        return loadAsFileSync(path.join(x, '/index'));
+    }
 
+    function loadNodeModulesSync(x, start) {
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        var dirs = packageIterator ? packageIterator(x, start, thunk, opts) : thunk();
 
-/***/ }),
-/* 564 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        for (var i = 0; i < dirs.length; i++) {
+            var dir = dirs[i];
+            if (isDirectory(path.dirname(dir))) {
+                var m = loadAsFileSync(dir);
+                if (m) return m;
+                var n = loadAsDirectorySync(dir);
+                if (n) return n;
+            }
+        }
+    }
+};
 
-"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__);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
+/***/ }),
 
-/**
- * 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.
+/***/ "../../node_modules/restore-cursor/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  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, 'test/server_integration/__fixtures__/plugins/*'));
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
+"use strict";
 
-  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/*'));
-  }
+const onetime = __webpack_require__("../../node_modules/onetime/index.js");
+const signalExit = __webpack_require__("../../node_modules/signal-exit/index.js");
 
-  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/*'));
-  }
+module.exports = onetime(() => {
+	signalExit(() => {
+		process.stderr.write('\u001B[?25h');
+	}, {alwaysLast: true});
+});
 
-  return projectPaths;
-}
 
 /***/ }),
-/* 565 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(566);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildBazelProductionProjects"]; });
+/***/ "../../node_modules/ret/lib/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(807);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__["buildNonBazelProductionProjects"]; });
+var util      = __webpack_require__("../../node_modules/ret/lib/util.js");
+var types     = __webpack_require__("../../node_modules/ret/lib/types.js");
+var sets      = __webpack_require__("../../node_modules/ret/lib/sets.js");
+var positions = __webpack_require__("../../node_modules/ret/lib/positions.js");
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
+module.exports = function(regexpStr) {
+  var i = 0, l, c,
+      start = { type: types.ROOT, stack: []},
 
+      // Keep track of last clause/group and stack.
+      lastGroup = start,
+      last = start.stack,
+      groupStack = [];
 
-/***/ }),
-/* 566 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return buildBazelProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(567);
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(779);
-/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(globby__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 _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(807);
-/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(423);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(231);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(220);
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(343);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(340);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
+  var repeatErr = function(i) {
+    util.error(regexpStr, 'Nothing to repeat at column ' + (i - 1));
+  };
+
+  // Decode a few escaped characters.
+  var str = util.strToChars(regexpStr);
+  l = str.length;
 
+  // Iterate through each character in string.
+  while (i < l) {
+    c = str[i++];
 
+    switch (c) {
+      // Handle escaped characters, inclues a few sets.
+      case '\\':
+        c = str[i++];
 
+        switch (c) {
+          case 'b':
+            last.push(positions.wordBoundary());
+            break;
 
+          case 'B':
+            last.push(positions.nonWordBoundary());
+            break;
 
+          case 'w':
+            last.push(sets.words());
+            break;
 
+          case 'W':
+            last.push(sets.notWords());
+            break;
 
+          case 'd':
+            last.push(sets.ints());
+            break;
 
+          case 'D':
+            last.push(sets.notInts());
+            break;
 
-async function buildBazelProductionProjects({
-  kibanaRoot,
-  buildRoot,
-  onlyOSS
-}) {
-  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_8__["getBazelProjectsOnly"])(await Object(_build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__["getProductionProjects"])(kibanaRoot, onlyOSS));
-  const projectNames = [...projects.values()].map(project => project.name);
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`);
-  await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['build', '//packages:build']);
-  _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(`All Bazel projects production builds for [${projectNames.join(', ')}] are complete`);
+          case 's':
+            last.push(sets.whitespace());
+            break;
 
-  for (const project of projects.values()) {
-    await copyToBuild(project, kibanaRoot, buildRoot);
-    await applyCorrectPermissions(project, kibanaRoot, buildRoot);
-  }
-}
-/**
- * Copy all the project's files from its Bazel dist directory into the
- * project build folder.
- *
- * When copying all the files into the build, we exclude `node_modules` because
- * we want the Kibana build to be responsible for actually installing all
- * dependencies. The primary reason for allowing the Kibana build process to
- * manage dependencies is that it will "dedupe" them, so we don't include
- * unnecessary copies of dependencies. We also exclude every related Bazel build
- * files in order to get the most cleaner package module we can in the final distributable.
- */
+          case 'S':
+            last.push(sets.notWhitespace());
+            break;
 
-async function copyToBuild(project, kibanaRoot, buildRoot) {
-  // We want the package to have the same relative location within the build
-  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
-  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
-  await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*'], buildProjectPath, {
-    cwd: Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(kibanaRoot, 'bazel-bin', 'packages', Object(path__WEBPACK_IMPORTED_MODULE_2__["basename"])(buildProjectPath), 'npm_module'),
-    dot: true,
-    onlyFiles: true,
-    parents: true
-  }); // If a project is using an intermediate build directory, we special-case our
-  // handling of `package.json`, as the project build process might have copied
-  // (a potentially modified) `package.json` into the intermediate build
-  // directory already. If so, we want to use that `package.json` as the basis
-  // for creating the production-ready `package.json`. If it's not present in
-  // the intermediate build, we fall back to using the project's already defined
-  // `package.json`.
+          default:
+            // Check if c is integer.
+            // In which case it's a reference.
+            if (/\d/.test(c)) {
+              last.push({ type: types.REFERENCE, value: parseInt(c, 10) });
 
-  const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isFile"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["readPackageJson"])(buildProjectPath) : project.json;
-  const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["createProductionPackageJson"])(packageJson);
-  await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["writePackageJson"])(buildProjectPath, preparedPackageJson);
-}
+            // Escaped character.
+            } else {
+              last.push({ type: types.CHAR, value: c.charCodeAt(0) });
+            }
+        }
 
-async function applyCorrectPermissions(project, kibanaRoot, buildRoot) {
-  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
-  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
-  const allPluginPaths = await globby__WEBPACK_IMPORTED_MODULE_1___default()([`**/*`], {
-    onlyFiles: false,
-    cwd: buildProjectPath,
-    dot: true
-  });
+        break;
 
-  for (const pluginPath of allPluginPaths) {
-    const resolvedPluginPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildProjectPath, pluginPath);
 
-    if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isFile"])(resolvedPluginPath)) {
-      await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["chmod"])(resolvedPluginPath, 0o644);
-    }
+      // Positionals.
+      case '^':
+          last.push(positions.begin());
+        break;
 
-    if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(resolvedPluginPath)) {
-      await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["chmod"])(resolvedPluginPath, 0o755);
-    }
-  }
-}
+      case '$':
+          last.push(positions.end());
+        break;
 
-/***/ }),
-/* 567 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+      // Handle custom sets.
+      case '[':
+        // Check if this class is 'anti' i.e. [^abc].
+        var not;
+        if (str[i] === '^') {
+          not = true;
+          i++;
+        } else {
+          not = false;
+        }
 
-const EventEmitter = __webpack_require__(164);
-const path = __webpack_require__(4);
-const os = __webpack_require__(122);
-const pMap = __webpack_require__(568);
-const arrify = __webpack_require__(563);
-const globby = __webpack_require__(571);
-const hasGlob = __webpack_require__(763);
-const cpFile = __webpack_require__(765);
-const junk = __webpack_require__(775);
-const pFilter = __webpack_require__(776);
-const CpyError = __webpack_require__(778);
+        // Get all the characters in class.
+        var classTokens = util.tokenizeClass(str.slice(i), regexpStr);
 
-const defaultOptions = {
-	ignoreJunk: true
-};
+        // Increase index by length of class.
+        i += classTokens[1];
+        last.push({
+          type: types.SET,
+          set: classTokens[0],
+          not: not,
+        });
 
-class SourceFile {
-	constructor(relativePath, path) {
-		this.path = path;
-		this.relativePath = relativePath;
-		Object.freeze(this);
-	}
+        break;
 
-	get name() {
-		return path.basename(this.relativePath);
-	}
 
-	get nameWithoutExtension() {
-		return path.basename(this.relativePath, path.extname(this.relativePath));
-	}
+      // Class of any character except \n.
+      case '.':
+        last.push(sets.anyChar());
+        break;
 
-	get extension() {
-		return path.extname(this.relativePath).slice(1);
-	}
-}
 
-const preprocessSourcePath = (source, options) => path.resolve(options.cwd ? options.cwd : process.cwd(), source);
+      // Push group onto stack.
+      case '(':
+        // Create group.
+        var group = {
+          type: types.GROUP,
+          stack: [],
+          remember: true,
+        };
 
-const preprocessDestinationPath = (source, destination, options) => {
-	let basename = path.basename(source);
+        c = str[i];
 
-	if (typeof options.rename === 'string') {
-		basename = options.rename;
-	} else if (typeof options.rename === 'function') {
-		basename = options.rename(basename);
-	}
+        // If if this is a special kind of group.
+        if (c === '?') {
+          c = str[i + 1];
+          i += 2;
 
-	if (options.cwd) {
-		destination = path.resolve(options.cwd, destination);
-	}
+          // Match if followed by.
+          if (c === '=') {
+            group.followedBy = true;
 
-	if (options.parents) {
-		const dirname = path.dirname(source);
-		const parsedDirectory = path.parse(dirname);
-		return path.join(destination, dirname.replace(parsedDirectory.root, path.sep), basename);
-	}
+          // Match if not followed by.
+          } else if (c === '!') {
+            group.notFollowedBy = true;
 
-	return path.join(destination, basename);
-};
+          } else if (c !== ':') {
+            util.error(regexpStr,
+              'Invalid group, character \'' + c +
+              '\' after \'?\' at column ' + (i - 1));
+          }
 
-module.exports = (source, destination, {
-	concurrency = (os.cpus().length || 1) * 2,
-	...options
-} = {}) => {
-	const progressEmitter = new EventEmitter();
+          group.remember = false;
+        }
 
-	options = {
-		...defaultOptions,
-		...options
-	};
+        // Insert subgroup into current group stack.
+        last.push(group);
 
-	const promise = (async () => {
-		source = arrify(source);
+        // Remember the current group for when the group closes.
+        groupStack.push(lastGroup);
 
-		if (source.length === 0 || !destination) {
-			throw new CpyError('`source` and `destination` required');
-		}
+        // Make this new group the current group.
+        lastGroup = group;
+        last = group.stack;
+        break;
 
-		const copyStatus = new Map();
-		let completedFiles = 0;
-		let completedSize = 0;
 
-		let files;
-		try {
-			files = await globby(source, options);
+      // Pop group out of stack.
+      case ')':
+        if (groupStack.length === 0) {
+          util.error(regexpStr, 'Unmatched ) at column ' + (i - 1));
+        }
+        lastGroup = groupStack.pop();
 
-			if (options.ignoreJunk) {
-				files = files.filter(file => junk.not(path.basename(file)));
-			}
-		} catch (error) {
-			throw new CpyError(`Cannot glob \`${source}\`: ${error.message}`, error);
-		}
+        // Check if this group has a PIPE.
+        // To get back the correct last stack.
+        last = lastGroup.options ?
+          lastGroup.options[lastGroup.options.length - 1] : lastGroup.stack;
+        break;
 
-		if (files.length === 0 && !hasGlob(source)) {
-			throw new CpyError(`Cannot copy \`${source}\`: the file doesn't exist`);
-		}
 
-		let sources = files.map(sourcePath => new SourceFile(sourcePath, preprocessSourcePath(sourcePath, options)));
+      // Use pipe character to give more choices.
+      case '|':
+        // Create array where options are if this is the first PIPE
+        // in this clause.
+        if (!lastGroup.options) {
+          lastGroup.options = [lastGroup.stack];
+          delete lastGroup.stack;
+        }
 
-		if (options.filter !== undefined) {
-			const filteredSources = await pFilter(sources, options.filter, {concurrency: 1024});
-			sources = filteredSources;
-		}
+        // Create a new stack and add to options for rest of clause.
+        var stack = [];
+        lastGroup.options.push(stack);
+        last = stack;
+        break;
 
-		if (sources.length === 0) {
-			progressEmitter.emit('progress', {
-				totalFiles: 0,
-				percent: 1,
-				completedFiles: 0,
-				completedSize: 0
-			});
-		}
 
-		const fileProgressHandler = event => {
-			const fileStatus = copyStatus.get(event.src) || {written: 0, percent: 0};
+      // Repetition.
+      // For every repetition, remove last element from last stack
+      // then insert back a RANGE object.
+      // This design is chosen because there could be more than
+      // one repetition symbols in a regex i.e. `a?+{2,3}`.
+      case '{':
+        var rs = /^(\d+)(,(\d+)?)?\}/.exec(str.slice(i)), min, max;
+        if (rs !== null) {
+          if (last.length === 0) {
+            repeatErr(i);
+          }
+          min = parseInt(rs[1], 10);
+          max = rs[2] ? rs[3] ? parseInt(rs[3], 10) : Infinity : min;
+          i += rs[0].length;
 
-			if (fileStatus.written !== event.written || fileStatus.percent !== event.percent) {
-				completedSize -= fileStatus.written;
-				completedSize += event.written;
+          last.push({
+            type: types.REPETITION,
+            min: min,
+            max: max,
+            value: last.pop(),
+          });
+        } else {
+          last.push({
+            type: types.CHAR,
+            value: 123,
+          });
+        }
+        break;
 
-				if (event.percent === 1 && fileStatus.percent !== 1) {
-					completedFiles++;
-				}
+      case '?':
+        if (last.length === 0) {
+          repeatErr(i);
+        }
+        last.push({
+          type: types.REPETITION,
+          min: 0,
+          max: 1,
+          value: last.pop(),
+        });
+        break;
 
-				copyStatus.set(event.src, {
-					written: event.written,
-					percent: event.percent
-				});
+      case '+':
+        if (last.length === 0) {
+          repeatErr(i);
+        }
+        last.push({
+          type: types.REPETITION,
+          min: 1,
+          max: Infinity,
+          value: last.pop(),
+        });
+        break;
 
-				progressEmitter.emit('progress', {
-					totalFiles: files.length,
-					percent: completedFiles / files.length,
-					completedFiles,
-					completedSize
-				});
-			}
-		};
+      case '*':
+        if (last.length === 0) {
+          repeatErr(i);
+        }
+        last.push({
+          type: types.REPETITION,
+          min: 0,
+          max: Infinity,
+          value: last.pop(),
+        });
+        break;
 
-		return pMap(sources, async source => {
-			const to = preprocessDestinationPath(source.relativePath, destination, options);
 
-			try {
-				await cpFile(source.path, to, options).on('progress', fileProgressHandler);
-			} catch (error) {
-				throw new CpyError(`Cannot copy from \`${source.relativePath}\` to \`${to}\`: ${error.message}`, error);
-			}
+      // Default is a character that is not `\[](){}?+*^$`.
+      default:
+        last.push({
+          type: types.CHAR,
+          value: c.charCodeAt(0),
+        });
+    }
 
-			return to;
-		}, {concurrency});
-	})();
+  }
 
-	promise.on = (...arguments_) => {
-		progressEmitter.on(...arguments_);
-		return promise;
-	};
+  // Check if any groups have not been closed.
+  if (groupStack.length !== 0) {
+    util.error(regexpStr, 'Unterminated group');
+  }
 
-	return promise;
+  return start;
 };
 
+module.exports.types = types;
+
 
 /***/ }),
-/* 568 */
+
+/***/ "../../node_modules/ret/lib/positions.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var types = __webpack_require__("../../node_modules/ret/lib/types.js");
 
-const AggregateError = __webpack_require__(569);
+exports.wordBoundary = function() {
+  return { type: types.POSITION, value: 'b' };
+};
 
-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');
-		}
+exports.nonWordBoundary = function() {
+  return { type: types.POSITION, value: 'B' };
+};
 
-		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
-			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-		}
+exports.begin = function() {
+  return { type: types.POSITION, value: '^' };
+};
 
-		const ret = [];
-		const errors = [];
-		const iterator = iterable[Symbol.iterator]();
-		let isRejected = false;
-		let isIterableDone = false;
-		let resolvingCount = 0;
-		let currentIndex = 0;
+exports.end = function() {
+  return { type: types.POSITION, value: '$' };
+};
 
-		const next = () => {
-			if (isRejected) {
-				return;
-			}
 
-			const nextItem = iterator.next();
-			const i = currentIndex;
-			currentIndex++;
+/***/ }),
 
-			if (nextItem.done) {
-				isIterableDone = true;
+/***/ "../../node_modules/ret/lib/sets.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-				if (resolvingCount === 0) {
-					if (!stopOnError && errors.length !== 0) {
-						reject(new AggregateError(errors));
-					} else {
-						resolve(ret);
-					}
-				}
+var types = __webpack_require__("../../node_modules/ret/lib/types.js");
 
-				return;
-			}
+var INTS = function() {
+ return [{ type: types.RANGE , from: 48, to: 57 }];
+};
 
-			resolvingCount++;
+var WORDS = function() {
+ return [
+    { type: types.CHAR, value: 95 },
+    { type: types.RANGE, from: 97, to: 122 },
+    { type: types.RANGE, from: 65, to: 90 }
+  ].concat(INTS());
+};
 
-			(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();
-					}
-				}
-			})();
-		};
+var WHITESPACE = function() {
+ return [
+    { type: types.CHAR, value: 9 },
+    { type: types.CHAR, value: 10 },
+    { type: types.CHAR, value: 11 },
+    { type: types.CHAR, value: 12 },
+    { type: types.CHAR, value: 13 },
+    { type: types.CHAR, value: 32 },
+    { type: types.CHAR, value: 160 },
+    { type: types.CHAR, value: 5760 },
+    { type: types.CHAR, value: 6158 },
+    { type: types.CHAR, value: 8192 },
+    { type: types.CHAR, value: 8193 },
+    { type: types.CHAR, value: 8194 },
+    { type: types.CHAR, value: 8195 },
+    { type: types.CHAR, value: 8196 },
+    { type: types.CHAR, value: 8197 },
+    { type: types.CHAR, value: 8198 },
+    { type: types.CHAR, value: 8199 },
+    { type: types.CHAR, value: 8200 },
+    { type: types.CHAR, value: 8201 },
+    { type: types.CHAR, value: 8202 },
+    { type: types.CHAR, value: 8232 },
+    { type: types.CHAR, value: 8233 },
+    { type: types.CHAR, value: 8239 },
+    { type: types.CHAR, value: 8287 },
+    { type: types.CHAR, value: 12288 },
+    { type: types.CHAR, value: 65279 }
+  ];
+};
 
-		for (let i = 0; i < concurrency; i++) {
-			next();
+var NOTANYCHAR = function() {
+  return [
+    { type: types.CHAR, value: 10 },
+    { type: types.CHAR, value: 13 },
+    { type: types.CHAR, value: 8232 },
+    { type: types.CHAR, value: 8233 },
+  ];
+};
+
+// Predefined class objects.
+exports.words = function() {
+  return { type: types.SET, set: WORDS(), not: false };
+};
+
+exports.notWords = function() {
+  return { type: types.SET, set: WORDS(), not: true };
+};
+
+exports.ints = function() {
+  return { type: types.SET, set: INTS(), not: false };
+};
 
-			if (isIterableDone) {
-				break;
-			}
-		}
-	});
+exports.notInts = function() {
+  return { type: types.SET, set: INTS(), not: true };
 };
 
+exports.whitespace = function() {
+  return { type: types.SET, set: WHITESPACE(), not: false };
+};
 
-/***/ }),
-/* 569 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.notWhitespace = function() {
+  return { type: types.SET, set: WHITESPACE(), not: true };
+};
 
-"use strict";
+exports.anyChar = function() {
+  return { type: types.SET, set: NOTANYCHAR(), not: true };
+};
 
-const indentString = __webpack_require__(570);
-const cleanStack = __webpack_require__(338);
 
-const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
+/***/ }),
 
-class AggregateError extends Error {
-	constructor(errors) {
-		if (!Array.isArray(errors)) {
-			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
-		}
+/***/ "../../node_modules/ret/lib/types.js":
+/***/ (function(module, exports) {
 
-		errors = [...errors].map(error => {
-			if (error instanceof Error) {
-				return error;
-			}
+module.exports = {
+  ROOT       : 0,
+  GROUP      : 1,
+  POSITION   : 2,
+  SET        : 3,
+  RANGE      : 4,
+  REPETITION : 5,
+  REFERENCE  : 6,
+  CHAR       : 7,
+};
 
-			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);
-			}
 
-			return new Error(error);
-		});
+/***/ }),
 
-		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);
+/***/ "../../node_modules/ret/lib/util.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-		this.name = 'AggregateError';
+var types = __webpack_require__("../../node_modules/ret/lib/types.js");
+var sets  = __webpack_require__("../../node_modules/ret/lib/sets.js");
 
-		Object.defineProperty(this, '_errors', {value: errors});
-	}
 
-	* [Symbol.iterator]() {
-		for (const error of this._errors) {
-			yield error;
-		}
-	}
-}
+// All of these are private and only used by randexp.
+// It's assumed that they will always be called with the correct input.
 
-module.exports = AggregateError;
+var CTRL = '@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^ ?';
+var SLSH = { '0': 0, 't': 9, 'n': 10, 'v': 11, 'f': 12, 'r': 13 };
 
+/**
+ * Finds character representations in str and convert all to
+ * their respective characters
+ *
+ * @param {String} str
+ * @return {String}
+ */
+exports.strToChars = function(str) {
+  /* jshint maxlen: false */
+  var chars_regex = /(\[\\b\])|(\\)?\\(?:u([A-F0-9]{4})|x([A-F0-9]{2})|(0?[0-7]{2})|c([@A-Z\[\\\]\^?])|([0tnvfr]))/g;
+  str = str.replace(chars_regex, function(s, b, lbs, a16, b16, c8, dctrl, eslsh) {
+    if (lbs) {
+      return s;
+    }
 
-/***/ }),
-/* 570 */
-/***/ (function(module, exports, __webpack_require__) {
+    var code = b     ? 8 :
+               a16   ? parseInt(a16, 16) :
+               b16   ? parseInt(b16, 16) :
+               c8    ? parseInt(c8,   8) :
+               dctrl ? CTRL.indexOf(dctrl) :
+               SLSH[eslsh];
 
-"use strict";
+    var c = String.fromCharCode(code);
 
+    // Escape special regex characters.
+    if (/[\[\]{}\^$.|?*+()]/.test(c)) {
+      c = '\\' + c;
+    }
 
-module.exports = (string, count = 1, options) => {
-	options = {
-		indent: ' ',
-		includeEmptyLines: false,
-		...options
-	};
+    return c;
+  });
 
-	if (typeof string !== 'string') {
-		throw new TypeError(
-			`Expected \`input\` to be a \`string\`, got \`${typeof string}\``
-		);
-	}
+  return str;
+};
 
-	if (typeof count !== 'number') {
-		throw new TypeError(
-			`Expected \`count\` to be a \`number\`, got \`${typeof count}\``
-		);
-	}
 
-	if (typeof options.indent !== 'string') {
-		throw new TypeError(
-			`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``
-		);
-	}
+/**
+ * turns class into tokens
+ * reads str until it encounters a ] not preceeded by a \
+ *
+ * @param {String} str
+ * @param {String} regexpStr
+ * @return {Array.<Array.<Object>, Number>}
+ */
+exports.tokenizeClass = function(str, regexpStr) {
+  /* jshint maxlen: false */
+  var tokens = [];
+  var regexp = /\\(?:(w)|(d)|(s)|(W)|(D)|(S))|((?:(?:\\)(.)|([^\]\\]))-(?:\\)?([^\]]))|(\])|(?:\\)?(.)/g;
+  var rs, c;
 
-	if (count === 0) {
-		return string;
-	}
 
-	const regex = options.includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+  while ((rs = regexp.exec(str)) != null) {
+    if (rs[1]) {
+      tokens.push(sets.words());
 
-	return string.replace(regex, options.indent.repeat(count));
-};
+    } else if (rs[2]) {
+      tokens.push(sets.ints());
 
+    } else if (rs[3]) {
+      tokens.push(sets.whitespace());
 
-/***/ }),
-/* 571 */
-/***/ (function(module, exports, __webpack_require__) {
+    } else if (rs[4]) {
+      tokens.push(sets.notWords());
 
-"use strict";
+    } else if (rs[5]) {
+      tokens.push(sets.notInts());
 
-const fs = __webpack_require__(132);
-const arrayUnion = __webpack_require__(572);
-const glob = __webpack_require__(244);
-const fastGlob = __webpack_require__(574);
-const dirGlob = __webpack_require__(757);
-const gitignore = __webpack_require__(760);
+    } else if (rs[6]) {
+      tokens.push(sets.notWhitespace());
 
-const DEFAULT_FILTER = () => false;
+    } else if (rs[7]) {
+      tokens.push({
+        type: types.RANGE,
+        from: (rs[8] || rs[9]).charCodeAt(0),
+          to: rs[10].charCodeAt(0),
+      });
 
-const isNegative = pattern => pattern[0] === '!';
+    } else if (c = rs[12]) {
+      tokens.push({
+        type: types.CHAR,
+        value: c.charCodeAt(0),
+      });
 
-const assertPatternsInput = patterns => {
-	if (!patterns.every(x => typeof x === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
+    } else {
+      return [tokens, regexp.lastIndex];
+    }
+  }
+
+  exports.error(regexpStr, 'Unterminated character class');
 };
 
-const checkCwdOption = options => {
-	if (options && options.cwd && !fs.statSync(options.cwd).isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
-	}
+
+/**
+ * Shortcut to throw errors.
+ *
+ * @param {String} regexp
+ * @param {String} msg
+ */
+exports.error = function(regexp, msg) {
+  throw new SyntaxError('Invalid regular expression: /' + regexp + '/: ' + msg);
 };
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
 
-	const globTasks = [];
+/***/ }),
 
-	taskOptions = Object.assign({
-		ignore: [],
-		expandDirectories: true
-	}, taskOptions);
+/***/ "../../node_modules/reusify/reusify.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	patterns.forEach((pattern, i) => {
-		if (isNegative(pattern)) {
-			return;
-		}
+"use strict";
 
-		const ignore = patterns
-			.slice(i)
-			.filter(isNegative)
-			.map(pattern => pattern.slice(1));
 
-		const options = Object.assign({}, taskOptions, {
-			ignore: taskOptions.ignore.concat(ignore)
-		});
+function reusify (Constructor) {
+  var head = new Constructor()
+  var tail = head
 
-		globTasks.push({pattern, options});
-	});
+  function get () {
+    var current = head
 
-	return globTasks;
-};
+    if (current.next) {
+      head = current.next
+    } else {
+      head = new Constructor()
+      tail = head
+    }
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
-	}
+    current.next = null
 
-	if (Array.isArray(task.options.expandDirectories)) {
-		options = Object.assign(options, {files: task.options.expandDirectories});
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = Object.assign(options, task.options.expandDirectories);
-	}
+    return current
+  }
 
-	return fn(task.pattern, options);
-};
+  function release (obj) {
+    tail.next = obj
+    tail = obj
+  }
 
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+  return {
+    get: get,
+    release: release
+  }
+}
 
-const globToTask = task => glob => {
-	const {options} = task;
-	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
-		options.ignore = dirGlob.sync(options.ignore);
-	}
+module.exports = reusify
 
-	return {
-		pattern: glob,
-		options
-	};
-};
 
-const globby = (patterns, options) => {
-	let globTasks;
+/***/ }),
 
-	try {
-		globTasks = generateGlobTasks(patterns, options);
-	} catch (error) {
-		return Promise.reject(error);
-	}
+/***/ "../../node_modules/rimraf/rimraf.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-	const getTasks = Promise.all(globTasks.map(task => Promise.resolve(getPattern(task, dirGlob))
-		.then(globs => Promise.all(globs.map(globToTask(task))))
-	))
-		.then(tasks => arrayUnion(...tasks));
+const assert = __webpack_require__("assert")
+const path = __webpack_require__("path")
+const fs = __webpack_require__("fs")
+let glob = undefined
+try {
+  glob = __webpack_require__("../../node_modules/glob/glob.js")
+} catch (_err) {
+  // treat glob as optional.
+}
 
-	const getFilter = () => {
-		return Promise.resolve(
-			options && options.gitignore ?
-				gitignore({cwd: options.cwd, ignore: options.ignore}) :
-				DEFAULT_FILTER
-		);
-	};
+const defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
-	return getFilter()
-		.then(filter => {
-			return getTasks
-				.then(tasks => Promise.all(tasks.map(task => fastGlob(task.pattern, task.options))))
-				.then(paths => arrayUnion(...paths))
-				.then(paths => paths.filter(p => !filter(p)));
-		});
-};
+// for EMFILE handling
+let timeout = 0
 
-module.exports = globby;
-// TODO: Remove this for the next major release
-module.exports.default = globby;
+const isWindows = (process.platform === "win32")
 
-module.exports.sync = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, 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]
+  })
 
-	const getFilter = () => {
-		return options && options.gitignore ?
-			gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+  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 tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+const rimraf = (p, options, cb) => {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-	const filter = getFilter();
-	return tasks.reduce(
-		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
-		[]
-	).filter(p => !filter(p));
-};
+  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.generateGlobTasks = generateGlobTasks;
+  defaults(options)
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => glob.hasMagic(pattern, options));
+  let busyTries = 0
+  let errState = null
+  let n = 0
 
-module.exports.gitignore = gitignore;
+  const next = (er) => {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
+  const afterGlob = (er, results) => {
+    if (er)
+      return cb(er)
 
-/***/ }),
-/* 572 */
-/***/ (function(module, exports, __webpack_require__) {
+    n = results.length
+    if (n === 0)
+      return cb()
 
-"use strict";
+    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)
+          }
 
-var arrayUniq = __webpack_require__(573);
+          // this one won't happen if graceful-fs is used.
+          if (er.code === "EMFILE" && timeout < options.emfileWait) {
+            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
+          }
 
-module.exports = function () {
-	return arrayUniq([].concat.apply([], arguments));
-};
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
+        timeout = 0
+        next(er)
+      }
+      rimraf_(p, options, CB)
+    })
+  }
 
-/***/ }),
-/* 573 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-"use strict";
+  options.lstat(p, (er, stat) => {
+    if (!er)
+      return afterGlob(null, [p])
 
+    glob(p, options.glob, afterGlob)
+  })
 
-// there's 3 implementations written in increasing order of efficiency
+}
 
-// 1 - no Set type is defined
-function uniqNoSet(arr) {
-	var ret = [];
+// 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')
 
-	for (var i = 0; i < arr.length; i++) {
-		if (ret.indexOf(arr[i]) === -1) {
-			ret.push(arr[i]);
-		}
-	}
+  // 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)
 
-	return ret;
-}
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
 
-// 2 - a simple Set type is defined
-function uniqSet(arr) {
-	var seen = new Set();
-	return arr.filter(function (el) {
-		if (!seen.has(el)) {
-			seen.add(el);
-			return true;
-		}
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
 
-		return false;
-	});
+    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)
+    })
+  })
 }
 
-// 3 - a standard Set type is defined and it has a forEach method
-function uniqSetWithForEach(arr) {
-	var ret = [];
-
-	(new Set(arr)).forEach(function (el) {
-		ret.push(el);
-	});
+const fixWinEPERM = (p, options, er, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-	return ret;
+  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)
+      })
+  })
 }
 
-// V8 currently has a broken implementation
-// https://github.com/joyent/node/issues/8449
-function doesForEachActuallyWork() {
-	var ret = false;
+const fixWinEPERMSync = (p, options, er) => {
+  assert(p)
+  assert(options)
 
-	(new Set([true])).forEach(function (el) {
-		ret = el;
-	});
+  try {
+    options.chmodSync(p, 0o666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-	return ret === true;
-}
+  let stats
+  try {
+    stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-if ('Set' in global) {
-	if (typeof Set.prototype.forEach === 'function' && doesForEachActuallyWork()) {
-		module.exports = uniqSetWithForEach;
-	} else {
-		module.exports = uniqSet;
-	}
-} else {
-	module.exports = uniqNoSet;
+  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')
 
-/***/ }),
-/* 574 */
-/***/ (function(module, exports, __webpack_require__) {
+  // 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 pkg = __webpack_require__(575);
+const rmkids = (p, options, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-module.exports = pkg.async;
-module.exports.default = pkg.async;
+  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)
+      })
+    })
+  })
+}
 
-module.exports.async = pkg.async;
-module.exports.sync = pkg.sync;
-module.exports.stream = pkg.stream;
+// 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)
 
-module.exports.generateTasks = pkg.generateTasks;
+  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
 
-/***/ }),
-/* 575 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
+  }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(576);
-var taskManager = __webpack_require__(577);
-var reader_async_1 = __webpack_require__(728);
-var reader_stream_1 = __webpack_require__(752);
-var reader_sync_1 = __webpack_require__(753);
-var arrayUtils = __webpack_require__(755);
-var streamUtils = __webpack_require__(756);
-/**
- * Synchronous API.
- */
-function sync(source, opts) {
-    assertPatternsInput(source);
-    var works = getWorks(source, reader_sync_1.default, opts);
-    return arrayUtils.flatten(works);
-}
-exports.sync = sync;
-/**
- * Asynchronous API.
- */
-function async(source, opts) {
-    try {
-        assertPatternsInput(source);
-    }
-    catch (error) {
-        return Promise.reject(error);
-    }
-    var works = getWorks(source, reader_async_1.default, opts);
-    return Promise.all(works).then(arrayUtils.flatten);
-}
-exports.async = async;
-/**
- * Stream API.
- */
-function stream(source, opts) {
-    assertPatternsInput(source);
-    var works = getWorks(source, reader_stream_1.default, opts);
-    return streamUtils.merge(works);
-}
-exports.stream = stream;
-/**
- * Return a set of tasks based on provided patterns.
- */
-function generateTasks(source, opts) {
-    assertPatternsInput(source);
-    var patterns = [].concat(source);
-    var options = optionsManager.prepare(opts);
-    return taskManager.generate(patterns, options);
-}
-exports.generateTasks = generateTasks;
-/**
- * Returns a set of works based on provided tasks and class of the reader.
- */
-function getWorks(source, _Reader, opts) {
-    var patterns = [].concat(source);
-    var options = optionsManager.prepare(opts);
-    var tasks = taskManager.generate(patterns, options);
-    var reader = new _Reader(options);
-    return tasks.map(reader.read, reader);
-}
-function assertPatternsInput(source) {
-    if ([].concat(source).every(isString)) {
-        return;
-    }
-    throw new TypeError('Patterns must be a string or an array of strings');
-}
-function isString(source) {
-    /* tslint:disable-next-line strict-type-predicates */
-    return typeof source === 'string';
-}
+  if (!results.length)
+    return
 
+  for (let i = 0; i < results.length; i++) {
+    const p = results[i]
 
-/***/ }),
-/* 576 */
-/***/ (function(module, exports, __webpack_require__) {
+    let st
+    try {
+      st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
 
-"use strict";
-
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-function prepare(options) {
-    var opts = __assign({ cwd: process.cwd(), deep: true, ignore: [], dot: false, stats: false, onlyFiles: true, onlyDirectories: false, followSymlinkedDirectories: true, unique: true, markDirectories: false, absolute: false, nobrace: false, brace: true, noglobstar: false, globstar: true, noext: false, extension: true, nocase: false, case: true, matchBase: false, transform: null }, options);
-    if (opts.onlyDirectories) {
-        opts.onlyFiles = false;
-    }
-    opts.brace = !opts.nobrace;
-    opts.globstar = !opts.noglobstar;
-    opts.extension = !opts.noext;
-    opts.case = !opts.nocase;
-    if (options) {
-        opts.brace = ('brace' in options ? options.brace : opts.brace);
-        opts.globstar = ('globstar' in options ? options.globstar : opts.globstar);
-        opts.extension = ('extension' in options ? options.extension : opts.extension);
-        opts.case = ('case' in options ? options.case : opts.case);
-    }
-    return opts;
-}
-exports.prepare = prepare;
+      // 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
 
-/***/ }),
-/* 577 */
-/***/ (function(module, exports, __webpack_require__) {
+      rmdirSync(p, options, er)
+    }
+  }
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(578);
-/**
- * Generate tasks based on parent directory of each pattern.
- */
-function generate(patterns, options) {
-    var unixPatterns = patterns.map(patternUtils.unixifyPattern);
-    var unixIgnore = options.ignore.map(patternUtils.unixifyPattern);
-    var positivePatterns = getPositivePatterns(unixPatterns);
-    var negativePatterns = getNegativePatternsAsPositive(unixPatterns, unixIgnore);
-    /**
-     * When the `case` option is disabled, all patterns must be marked as dynamic, because we cannot check filepath
-     * directly (without read directory).
-     */
-    var staticPatterns = !options.case ? [] : positivePatterns.filter(patternUtils.isStaticPattern);
-    var dynamicPatterns = !options.case ? positivePatterns : positivePatterns.filter(patternUtils.isDynamicPattern);
-    var staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
-    var dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
-    return staticTasks.concat(dynamicTasks);
-}
-exports.generate = generate;
-/**
- * Convert patterns to tasks based on parent directory of each pattern.
- */
-function convertPatternsToTasks(positive, negative, dynamic) {
-    var 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) {
-        var task = convertPatternGroupToTask('.', positive, negative, dynamic);
-        return [task];
-    }
-    return convertPatternGroupsToTasks(positivePatternsGroup, negative, dynamic);
-}
-exports.convertPatternsToTasks = convertPatternsToTasks;
-/**
- * Return only positive patterns.
- */
-function getPositivePatterns(patterns) {
-    return patternUtils.getPositivePatterns(patterns);
-}
-exports.getPositivePatterns = getPositivePatterns;
-/**
- * Return only negative patterns.
- */
-function getNegativePatternsAsPositive(patterns, ignore) {
-    var negative = patternUtils.getNegativePatterns(patterns).concat(ignore);
-    var positive = negative.map(patternUtils.convertToPositivePattern);
-    return positive;
-}
-exports.getNegativePatternsAsPositive = getNegativePatternsAsPositive;
-/**
- * Group patterns by base directory of each pattern.
- */
-function groupPatternsByBaseDirectory(patterns) {
-    return patterns.reduce(function (collection, pattern) {
-        var base = patternUtils.getBaseDirectory(pattern);
-        if (base in collection) {
-            collection[base].push(pattern);
-        }
-        else {
-            collection[base] = [pattern];
-        }
-        return collection;
-    }, {});
-}
-exports.groupPatternsByBaseDirectory = groupPatternsByBaseDirectory;
-/**
- * Convert group of patterns to tasks.
- */
-function convertPatternGroupsToTasks(positive, negative, dynamic) {
-    return Object.keys(positive).map(function (base) {
-        return convertPatternGroupToTask(base, positive[base], negative, dynamic);
-    });
-}
-exports.convertPatternGroupsToTasks = convertPatternGroupsToTasks;
-/**
- * Create a task for positive and negative patterns.
- */
-function convertPatternGroupToTask(base, positive, negative, dynamic) {
-    return {
-        base: base,
-        dynamic: dynamic,
-        positive: positive,
-        negative: negative,
-        patterns: [].concat(positive, negative.map(patternUtils.convertToNegativePattern))
-    };
-}
-exports.convertPatternGroupToTask = convertPatternGroupToTask;
+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)
+  }
+}
 
-/***/ }),
-/* 578 */
-/***/ (function(module, exports, __webpack_require__) {
+const rmkidsSync = (p, options) => {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-var globParent = __webpack_require__(579);
-var isGlob = __webpack_require__(266);
-var micromatch = __webpack_require__(582);
-var GLOBSTAR = '**';
-/**
- * Return true for static pattern.
- */
-function isStaticPattern(pattern) {
-    return !isDynamicPattern(pattern);
-}
-exports.isStaticPattern = isStaticPattern;
-/**
- * Return true for pattern that looks like glob.
- */
-function isDynamicPattern(pattern) {
-    return isGlob(pattern, { strict: false });
-}
-exports.isDynamicPattern = isDynamicPattern;
-/**
- * Convert a windows «path» to a unix-style «path».
- */
-function unixifyPattern(pattern) {
-    return pattern.replace(/\\/g, '/');
-}
-exports.unixifyPattern = unixifyPattern;
-/**
- * Returns negative pattern as positive pattern.
- */
-function convertToPositivePattern(pattern) {
-    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
-}
-exports.convertToPositivePattern = convertToPositivePattern;
-/**
- * Returns positive pattern as negative pattern.
- */
-function convertToNegativePattern(pattern) {
-    return '!' + pattern;
-}
-exports.convertToNegativePattern = convertToNegativePattern;
-/**
- * Return true if provided pattern is negative pattern.
- */
-function isNegativePattern(pattern) {
-    return pattern.startsWith('!') && pattern[1] !== '(';
-}
-exports.isNegativePattern = isNegativePattern;
-/**
- * Return true if provided pattern is positive pattern.
- */
-function isPositivePattern(pattern) {
-    return !isNegativePattern(pattern);
-}
-exports.isPositivePattern = isPositivePattern;
-/**
- * Extracts negative patterns from array of patterns.
- */
-function getNegativePatterns(patterns) {
-    return patterns.filter(isNegativePattern);
-}
-exports.getNegativePatterns = getNegativePatterns;
-/**
- * Extracts positive patterns from array of patterns.
- */
-function getPositivePatterns(patterns) {
-    return patterns.filter(isPositivePattern);
-}
-exports.getPositivePatterns = getPositivePatterns;
-/**
- * Extract base directory from provided pattern.
- */
-function getBaseDirectory(pattern) {
-    return globParent(pattern);
-}
-exports.getBaseDirectory = getBaseDirectory;
-/**
- * Return true if provided pattern has globstar.
- */
-function hasGlobStar(pattern) {
-    return pattern.indexOf(GLOBSTAR) !== -1;
-}
-exports.hasGlobStar = hasGlobStar;
-/**
- * Return true if provided pattern ends with slash and globstar.
- */
-function endsWithSlashGlobStar(pattern) {
-    return pattern.endsWith('/' + GLOBSTAR);
-}
-exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
-/**
- * Returns «true» when pattern ends with a slash and globstar or the last partial of the pattern is static pattern.
- */
-function isAffectDepthOfReadingPattern(pattern) {
-    var basename = path.basename(pattern);
-    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
-}
-exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
-/**
- * Return naive depth of provided pattern without depth of the base directory.
- */
-function getNaiveDepth(pattern) {
-    var base = getBaseDirectory(pattern);
-    var patternDepth = pattern.split('/').length;
-    var patternBaseDepth = base.split('/').length;
-    /**
-     * This is a hack for pattern that has no base directory.
-     *
-     * This is related to the `*\something\*` pattern.
-     */
-    if (base === '.') {
-        return patternDepth - patternBaseDepth;
-    }
-    return patternDepth - patternBaseDepth - 1;
-}
-exports.getNaiveDepth = getNaiveDepth;
-/**
- * Return max naive depth of provided patterns without depth of the base directory.
- */
-function getMaxNaivePatternsDepth(patterns) {
-    return patterns.reduce(function (max, pattern) {
-        var depth = getNaiveDepth(pattern);
-        return depth > max ? depth : max;
-    }, 0);
-}
-exports.getMaxNaivePatternsDepth = getMaxNaivePatternsDepth;
-/**
- * Make RegExp for provided pattern.
- */
-function makeRe(pattern, options) {
-    return micromatch.makeRe(pattern, options);
-}
-exports.makeRe = makeRe;
-/**
- * Convert patterns to regexps.
- */
-function convertPatternsToRe(patterns, options) {
-    return patterns.map(function (pattern) { return makeRe(pattern, options); });
-}
-exports.convertPatternsToRe = convertPatternsToRe;
-/**
- * Returns true if the entry match any of the given RegExp's.
- */
-function matchAny(entry, patternsRe) {
-    return patternsRe.some(function (patternRe) { return patternRe.test(entry); });
-}
-exports.matchAny = matchAny;
+  // 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)
+}
+
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
 
 /***/ }),
-/* 579 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/run-parallel/index.js":
+/***/ (function(module, exports) {
 
+module.exports = runParallel
 
-var path = __webpack_require__(4);
-var isglob = __webpack_require__(580);
-var pathDirname = __webpack_require__(581);
-var isWin32 = __webpack_require__(122).platform() === 'win32';
+function runParallel (tasks, cb) {
+  var results, pending, keys
+  var isSync = true
 
-module.exports = function globParent(str) {
-	// flip windows path separators
-	if (isWin32 && str.indexOf('/') < 0) str = str.split('\\').join('/');
+  if (Array.isArray(tasks)) {
+    results = []
+    pending = tasks.length
+  } else {
+    keys = Object.keys(tasks)
+    results = {}
+    pending = keys.length
+  }
 
-	// special case for strings ending in enclosure containing path separator
-	if (/[\{\[].*[\/]*.*[\}\]]$/.test(str)) str += '/';
+  function done (err) {
+    function end () {
+      if (cb) cb(err, results)
+      cb = null
+    }
+    if (isSync) process.nextTick(end)
+    else end()
+  }
 
-	// preserves full path in case of trailing path separator
-	str += 'a';
+  function each (i, err, result) {
+    results[i] = result
+    if (--pending === 0 || err) {
+      done(err)
+    }
+  }
 
-	// remove path parts that are globby
-	do {str = pathDirname.posix(str)}
-	while (isglob(str) || /(^|[^\\])([\{\[]|\([^\)]+$)/.test(str));
+  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) })
+    })
+  }
 
-	// remove escape chars and return result
-	return str.replace(/\\([\*\?\|\[\]\(\)\{\}])/g, '$1');
-};
+  isSync = false
+}
 
 
 /***/ }),
-/* 580 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/index.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var isExtglob = __webpack_require__(267);
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-module.exports = function isGlob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-  if (isExtglob(str)) return true;
+/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-  var regex = /(\\).|([*?]|\[.*\]|\{.*\}|\(.*\|.*\)|^!)/;
-  var match;
+/* harmony import */ var _internal_observable_dom_animationFrames__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/dom/animationFrames.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrames", function() { return _internal_observable_dom_animationFrames__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
-  return false;
-};
+/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["a"]; });
 
+/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/BehaviorSubject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["a"]; });
 
-/***/ }),
-/* 581 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["a"]; });
 
-"use strict";
+/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["a"]; });
 
+/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/asap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["a"]; });
 
-var path = __webpack_require__(4);
-var inspect = __webpack_require__(113).inspect;
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["b"]; });
 
-function assertPath(path) {
-  if (typeof path !== 'string') {
-    throw new TypeError('Path must be a string. Received ' + inspect(path));
-  }
-}
+/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "async", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["a"]; });
 
-function posix(path) {
-  assertPath(path);
-  if (path.length === 0)
-    return '.';
-  var code = path.charCodeAt(0);
-  var hasRoot = (code === 47/*/*/);
-  var end = -1;
-  var matchedSlash = true;
-  for (var i = path.length - 1; i >= 1; --i) {
-    code = path.charCodeAt(i);
-    if (code === 47/*/*/) {
-      if (!matchedSlash) {
-        end = i;
-        break;
-      }
-    } else {
-      // We saw the first non-path separator
-      matchedSlash = false;
-    }
-  }
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["b"]; });
 
-  if (end === -1)
-    return hasRoot ? '/' : '.';
-  if (hasRoot && end === 1)
-    return '//';
-  return path.slice(0, end);
-}
+/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/queue.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["a"]; });
 
-function win32(path) {
-  assertPath(path);
-  var len = path.length;
-  if (len === 0)
-    return '.';
-  var rootEnd = -1;
-  var end = -1;
-  var matchedSlash = true;
-  var offset = 0;
-  var code = path.charCodeAt(0);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["b"]; });
 
-  // Try to match a root
-  if (len > 1) {
-    if (code === 47/*/*/ || code === 92/*\*/) {
-      // Possible UNC root
+/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrame.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["a"]; });
 
-      rootEnd = offset = 1;
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["b"]; });
 
-      code = path.charCodeAt(1);
-      if (code === 47/*/*/ || code === 92/*\*/) {
-        // Matched double path separator at beginning
-        var j = 2;
-        var last = j;
-        // Match 1 or more non-path separators
-        for (; j < len; ++j) {
-          code = path.charCodeAt(j);
-          if (code === 47/*/*/ || code === 92/*\*/)
-            break;
-        }
-        if (j < len && j !== last) {
-          // Matched!
-          last = j;
-          // Match 1 or more path separators
-          for (; j < len; ++j) {
-            code = path.charCodeAt(j);
-            if (code !== 47/*/*/ && code !== 92/*\*/)
-              break;
-          }
-          if (j < len && j !== last) {
-            // Matched!
-            last = j;
-            // Match 1 or more non-path separators
-            for (; j < len; ++j) {
-              code = path.charCodeAt(j);
-              if (code === 47/*/*/ || code === 92/*\*/)
-                break;
-            }
-            if (j === len) {
-              // We matched a UNC root only
-              return path;
-            }
-            if (j !== last) {
-              // We matched a UNC root with leftovers
+/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/VirtualTimeScheduler.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["b"]; });
 
-              // Offset by 1 to include the separator after the UNC root to
-              // treat it as a "normal root" on top of a (UNC) root
-              rootEnd = offset = j + 1;
-            }
-          }
-        }
-      }
-    } else if ((code >= 65/*A*/ && code <= 90/*Z*/) ||
-               (code >= 97/*a*/ && code <= 122/*z*/)) {
-      // Possible device root
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["a"]; });
 
-      code = path.charCodeAt(1);
-      if (path.charCodeAt(1) === 58/*:*/) {
-        rootEnd = offset = 2;
-        if (len > 2) {
-          code = path.charCodeAt(2);
-          if (code === 47/*/*/ || code === 92/*\*/)
-            rootEnd = offset = 3;
-        }
-      }
-    }
-  } else if (code === 47/*/*/ || code === 92/*\*/) {
-    return path[0];
-  }
+/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Scheduler.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["a"]; });
 
-  for (var i = len - 1; i >= offset; --i) {
-    code = path.charCodeAt(i);
-    if (code === 47/*/*/ || code === 92/*\*/) {
-      if (!matchedSlash) {
-        end = i;
-        break;
-      }
-    } else {
-      // We saw the first non-path separator
-      matchedSlash = false;
-    }
-  }
+/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["b"]; });
 
-  if (end === -1) {
-    if (rootEnd === -1)
-      return '.';
-    else
-      end = rootEnd;
-  }
-  return path.slice(0, end);
-}
+/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["b"]; });
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
+/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Notification.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["a"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["b"]; });
 
-/***/ }),
-/* 582 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["a"]; });
 
-"use strict";
+/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["a"]; });
 
+/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["a"]; });
 
-/**
- * Module dependencies
- */
+/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isObservable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["a"]; });
 
-var util = __webpack_require__(113);
-var braces = __webpack_require__(583);
-var toRegex = __webpack_require__(584);
-var extend = __webpack_require__(696);
+/* harmony import */ var _internal_lastValueFrom__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/lastValueFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "lastValueFrom", function() { return _internal_lastValueFrom__WEBPACK_IMPORTED_MODULE_21__["a"]; });
 
-/**
- * Local dependencies
- */
+/* harmony import */ var _internal_firstValueFrom__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/firstValueFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "firstValueFrom", function() { return _internal_firstValueFrom__WEBPACK_IMPORTED_MODULE_22__["a"]; });
 
-var compilers = __webpack_require__(698);
-var parsers = __webpack_require__(724);
-var cache = __webpack_require__(725);
-var utils = __webpack_require__(726);
-var MAX_LENGTH = 1024 * 64;
+/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ArgumentOutOfRangeError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_23__["a"]; });
 
-/**
- * The main function takes a list of strings and one or more
- * glob patterns to use for matching.
- *
- * ```js
- * var mm = require('micromatch');
- * mm(list, patterns[, options]);
- *
- * console.log(mm(['a.js', 'a.txt'], ['*.js']));
- * //=> [ 'a.js' ]
- * ```
- * @param {Array} `list` A list of strings to match
- * @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 {Array} Returns an array of matches
- * @summary false
- * @api public
- */
+/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_24__["a"]; });
 
-function micromatch(list, patterns, options) {
-  patterns = utils.arrayify(patterns);
-  list = utils.arrayify(list);
+/* harmony import */ var _internal_util_NotFoundError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/NotFoundError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotFoundError", function() { return _internal_util_NotFoundError__WEBPACK_IMPORTED_MODULE_25__["a"]; });
 
-  var len = patterns.length;
-  if (list.length === 0 || len === 0) {
-    return [];
-  }
+/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ObjectUnsubscribedError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_26__["a"]; });
 
-  if (len === 1) {
-    return micromatch.match(list, patterns[0], options);
-  }
+/* harmony import */ var _internal_util_SequenceError__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/SequenceError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "SequenceError", function() { return _internal_util_SequenceError__WEBPACK_IMPORTED_MODULE_27__["a"]; });
 
-  var omit = [];
-  var keep = [];
-  var idx = -1;
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__["a"]; });
 
-  while (++idx < len) {
-    var pattern = patterns[idx];
+/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_29__["a"]; });
 
-    if (typeof pattern === 'string' && pattern.charCodeAt(0) === 33 /* ! */) {
-      omit.push.apply(omit, micromatch.match(list, pattern.slice(1), options));
-    } else {
-      keep.push.apply(keep, micromatch.match(list, pattern, options));
-    }
-  }
+/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindCallback.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_30__["a"]; });
 
-  var matches = utils.diff(keep, omit);
-  if (!options || options.nodupes !== false) {
-    return utils.unique(matches);
-  }
+/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindNodeCallback.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_31__["a"]; });
 
-  return matches;
-}
+/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_32__["a"]; });
 
-/**
- * Similar to the main function, but `pattern` must be a string.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.match(list, pattern[, options]);
- *
- * console.log(mm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
- * //=> ['a.a', 'a.aa']
- * ```
- * @param {Array} `list` Array of strings to match
- * @param {String} `pattern` 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 matches
- * @api public
- */
+/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_33__["a"]; });
 
-micromatch.match = function(list, pattern, options) {
-  if (Array.isArray(pattern)) {
-    throw new TypeError('expected pattern to be a string');
-  }
+/* harmony import */ var _internal_observable_connectable__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/connectable.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connectable", function() { return _internal_observable_connectable__WEBPACK_IMPORTED_MODULE_34__["a"]; });
 
-  var unixify = utils.unixify(options);
-  var isMatch = memoize('match', pattern, options, micromatch.matcher);
-  var matches = [];
+/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_35__["a"]; });
 
-  list = utils.arrayify(list);
-  var len = list.length;
-  var idx = -1;
+/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__["b"]; });
 
-  while (++idx < len) {
-    var ele = list[idx];
-    if (ele === pattern || isMatch(ele)) {
-      matches.push(utils.value(ele, unixify, options));
-    }
-  }
+/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/forkJoin.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_37__["a"]; });
 
-  // if no options were passed, uniquify results and return
-  if (typeof options === 'undefined') {
-    return utils.unique(matches);
-  }
+/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_38__["a"]; });
 
-  if (matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
-    if (options.nonull === true || options.nullglob === true) {
-      return [options.unescape ? utils.unescape(pattern) : pattern];
-    }
-  }
+/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_39__["a"]; });
 
-  // if `opts.ignore` was defined, diff ignored list
-  if (options.ignore) {
-    matches = micromatch.not(matches, options.ignore, options);
-  }
+/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/fromEventPattern.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_40__["a"]; });
 
-  return options.nodupes !== false ? utils.unique(matches) : matches;
-};
+/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/generate.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_41__["a"]; });
 
-/**
- * Returns true if the specified `string` matches the given glob `pattern`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.isMatch(string, pattern[, options]);
- *
- * console.log(mm.isMatch('a.a', '*.a'));
- * //=> true
- * console.log(mm.isMatch('a.b', '*.a'));
- * //=> false
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` 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 string matches the glob pattern.
- * @api public
- */
+/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/iif.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_42__["a"]; });
 
-micromatch.isMatch = function(str, pattern, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
+/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/interval.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_43__["a"]; });
 
-  if (isEmptyString(str) || isEmptyString(pattern)) {
-    return false;
-  }
+/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/merge.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_44__["a"]; });
 
-  var equals = utils.equalsPattern(options);
-  if (equals(str)) {
-    return true;
-  }
+/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/never.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__["b"]; });
 
-  var isMatch = memoize('isMatch', pattern, options, micromatch.matcher);
-  return isMatch(str);
-};
+/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/of.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_46__["a"]; });
 
-/**
- * Returns true if some of the strings in the given `list` match any of the
- * given glob `patterns`.
- *
- * ```js
- * var 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
- */
+/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/onErrorResumeNext.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_47__["a"]; });
 
-micromatch.some = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
-  for (var i = 0; i < list.length; i++) {
-    if (micromatch(list[i], patterns, options).length === 1) {
-      return true;
-    }
-  }
-  return false;
-};
+/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/pairs.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_48__["a"]; });
 
-/**
- * Returns true if every string in the given `list` matches
- * any of the given glob `patterns`.
- *
- * ```js
- * var 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
- */
+/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/partition.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_49__["a"]; });
 
-micromatch.every = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
-  for (var i = 0; i < list.length; i++) {
-    if (micromatch(list[i], patterns, options).length !== 1) {
-      return false;
-    }
-  }
-  return true;
-};
+/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/race.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_50__["a"]; });
 
-/**
- * Returns true if **any** of the given glob `patterns`
- * match the specified `string`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.any(string, patterns[, options]);
- *
- * console.log(mm.any('a.a', ['b.*', '*.a']));
- * //=> true
- * console.log(mm.any('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) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
+/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/range.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_51__["a"]; });
 
-micromatch.any = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
+/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/throwError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_52__["a"]; });
 
-  if (isEmptyString(str) || isEmptyString(patterns)) {
-    return false;
-  }
+/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_53__["a"]; });
 
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
+/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/using.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_54__["a"]; });
 
-  for (var i = 0; i < patterns.length; i++) {
-    if (micromatch.isMatch(str, patterns[i], options)) {
-      return true;
-    }
-  }
-  return false;
-};
+/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/zip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_55__["a"]; });
 
-/**
- * Returns true if **all** of the given `patterns` match
- * the specified string.
- *
- * ```js
- * var 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
- */
+/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduled.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_56__["a"]; });
 
-micromatch.all = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
-  for (var i = 0; i < patterns.length; i++) {
-    if (!micromatch.isMatch(str, patterns[i], options)) {
-      return false;
-    }
-  }
-  return true;
-};
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_36__["a"]; });
 
-/**
- * Returns a list of strings that _**do not match any**_ of the given `patterns`.
- *
- * ```js
- * var 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
- */
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_45__["a"]; });
+
+/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_57__["a"]; });
+
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/audit.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_58__["a"]; });
+
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/auditTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_59__["a"]; });
 
-micromatch.not = function(list, patterns, options) {
-  var opts = extend({}, options);
-  var ignore = opts.ignore;
-  delete opts.ignore;
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/buffer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_60__["a"]; });
 
-  var unixify = utils.unixify(opts);
-  list = utils.arrayify(list).map(unixify);
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_61__["a"]; });
 
-  var matches = utils.diff(list, micromatch(list, patterns, opts));
-  if (ignore) {
-    matches = utils.diff(matches, micromatch(list, ignore));
-  }
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_62__["a"]; });
 
-  return opts.nodupes !== false ? utils.unique(matches) : matches;
-};
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_63__["a"]; });
 
-/**
- * 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
- */
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_64__["a"]; });
 
-micromatch.contains = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/catchError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_65__["a"]; });
 
-  if (typeof patterns === 'string') {
-    if (isEmptyString(str) || isEmptyString(patterns)) {
-      return false;
-    }
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_66__["a"]; });
 
-    var equals = utils.equalsPattern(patterns, options);
-    if (equals(str)) {
-      return true;
-    }
-    var contains = utils.containsPattern(patterns, options);
-    if (contains(str)) {
-      return true;
-    }
-  }
+/* harmony import */ var _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_67__["a"]; });
 
-  var opts = extend({}, options, {contains: true});
-  return micromatch.any(str, patterns, opts);
-};
+/* harmony import */ var _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_68__["a"]; });
 
-/**
- * Returns true if the given pattern and options should enable
- * the `matchBase` option.
- * @return {Boolean}
- * @api private
- */
+/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_69__["a"]; });
 
-micromatch.matchBase = function(pattern, options) {
-  if (pattern && pattern.indexOf('/') !== -1 || !options) return false;
-  return options.basename === true || options.matchBase === true;
-};
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_70__["a"]; });
 
-/**
- * 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
- * var mm = require('micromatch');
- * mm.matchKeys(object, patterns[, options]);
- *
- * var 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
- */
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_71__["a"]; });
 
-micromatch.matchKeys = function(obj, patterns, options) {
-  if (!utils.isObject(obj)) {
-    throw new TypeError('expected the first argument to be an object');
-  }
-  var keys = micromatch(Object.keys(obj), patterns, options);
-  return utils.pick(obj, keys);
-};
+/* harmony import */ var _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_72__["a"]; });
 
-/**
- * Returns a memoized 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
- * var mm = require('micromatch');
- * mm.matcher(pattern[, options]);
- *
- * var isMatch = mm.matcher('*.!(*a)');
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.b'));
- * //=> true
- * ```
- * @param {String} `pattern` Glob pattern
- * @param {Object} `options` See available [options](#options) for changing how matches are performed.
- * @return {Function} Returns a matcher function.
- * @api public
- */
+/* harmony import */ var _internal_operators_connect__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return _internal_operators_connect__WEBPACK_IMPORTED_MODULE_73__["a"]; });
 
-micromatch.matcher = function matcher(pattern, options) {
-  if (Array.isArray(pattern)) {
-    return compose(pattern, options, matcher);
-  }
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/count.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_74__["a"]; });
 
-  // if pattern is a regex
-  if (pattern instanceof RegExp) {
-    return test(pattern);
-  }
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_75__["a"]; });
 
-  // if pattern is invalid
-  if (!utils.isString(pattern)) {
-    throw new TypeError('expected pattern to be an array, string or regex');
-  }
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounceTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_76__["a"]; });
 
-  // if pattern is a non-glob string
-  if (!utils.hasSpecialChars(pattern)) {
-    if (options && options.nocase === true) {
-      pattern = pattern.toLowerCase();
-    }
-    return utils.matchPath(pattern, options);
-  }
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_77__["a"]; });
 
-  // if pattern is a glob string
-  var re = micromatch.makeRe(pattern, options);
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_78__["a"]; });
 
-  // if `options.matchBase` or `options.basename` is defined
-  if (micromatch.matchBase(pattern, options)) {
-    return utils.matchBasename(re, options);
-  }
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_79__["a"]; });
 
-  function test(regex) {
-    var equals = utils.equalsPattern(options);
-    var unixify = utils.unixify(options);
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/dematerialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_80__["a"]; });
 
-    return function(str) {
-      if (equals(str)) {
-        return true;
-      }
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinct.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_81__["a"]; });
 
-      if (regex.test(unixify(str))) {
-        return true;
-      }
-      return false;
-    };
-  }
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_82__["a"]; });
 
-  var fn = test(re);
-  Object.defineProperty(fn, 'result', {
-    configurable: true,
-    enumerable: false,
-    value: re.result
-  });
-  return fn;
-};
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilKeyChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_83__["a"]; });
 
-/**
- * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
- *
- * ```js
- * var 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} `pattern` Glob pattern to use for matching.
- * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
- * @api public
- */
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/elementAt.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_84__["a"]; });
 
-micromatch.capture = function(pattern, str, options) {
-  var re = micromatch.makeRe(pattern, extend({capture: true}, options));
-  var unixify = utils.unixify(options);
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/endWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_85__["a"]; });
 
-  function match() {
-    return function(string) {
-      var match = re.exec(unixify(string));
-      if (!match) {
-        return null;
-      }
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/every.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_86__["a"]; });
 
-      return match.slice(1);
-    };
-  }
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaust.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_87__["a"]; });
 
-  var capture = memoize('capture', pattern, options, match);
-  return capture(str);
-};
+/* harmony import */ var _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_88__["a"]; });
 
-/**
- * Create a regular expression from the given glob `pattern`.
- *
- * ```js
- * var 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` See available [options](#options) for changing how matches are performed.
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
- */
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_89__["a"]; });
 
-micromatch.makeRe = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/expand.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_90__["a"]; });
 
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
-  }
+/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_91__["a"]; });
 
-  function makeRe() {
-    var result = micromatch.create(pattern, options);
-    var ast_array = [];
-    var output = result.map(function(obj) {
-      obj.ast.state = obj.state;
-      ast_array.push(obj.ast);
-      return obj.output;
-    });
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/finalize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_92__["a"]; });
 
-    var regex = toRegex(output.join('|'), options);
-    Object.defineProperty(regex, 'result', {
-      configurable: true,
-      enumerable: false,
-      value: ast_array
-    });
-    return regex;
-  }
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/find.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_93__["b"]; });
 
-  return memoize('makeRe', pattern, options, makeRe);
-};
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/findIndex.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_94__["a"]; });
 
-/**
- * Expand the given brace `pattern`.
- *
- * ```js
- * var mm = require('micromatch');
- * console.log(mm.braces('foo/{a,b}/bar'));
- * //=> ['foo/(a|b)/bar']
- *
- * console.log(mm.braces('foo/{a,b}/bar', {expand: true}));
- * //=> ['foo/(a|b)/bar']
- * ```
- * @param {String} `pattern` String with brace pattern to expand.
- * @param {Object} `options` Any [options](#options) to change how expansion is performed. See the [braces][] library for all available options.
- * @return {Array}
- * @api public
- */
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/first.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_95__["a"]; });
 
-micromatch.braces = function(pattern, options) {
-  if (typeof pattern !== 'string' && !Array.isArray(pattern)) {
-    throw new TypeError('expected pattern to be an array or string');
-  }
+/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/groupBy.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_96__["a"]; });
 
-  function expand() {
-    if (options && options.nobrace === true || !/\{.*\}/.test(pattern)) {
-      return utils.arrayify(pattern);
-    }
-    return braces(pattern, options);
-  }
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_97__["a"]; });
 
-  return memoize('braces', pattern, options, expand);
-};
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/isEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_98__["a"]; });
 
-/**
- * Proxy to the [micromatch.braces](#method), for parity with
- * minimatch.
- */
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/last.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_99__["a"]; });
 
-micromatch.braceExpand = function(pattern, options) {
-  var opts = extend({}, options, {expand: true});
-  return micromatch.braces(pattern, opts);
-};
+/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_100__["a"]; });
 
-/**
- * Parses the given glob `pattern` and returns an array of abstract syntax
- * trees (ASTs), with the compiled `output` and optional source `map` on
- * each AST.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.create(pattern[, options]);
- *
- * console.log(mm.create('abc/*.js'));
- * // [{ options: { source: 'string', sourcemap: true },
- * //   state: {},
- * //   compilers:
- * //    { ... },
- * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
- * //   ast:
- * //    { type: 'root',
- * //      errors: [],
- * //      nodes:
- * //       [ ... ],
- * //      dot: false,
- * //      input: 'abc/*.js' },
- * //   parsingErrors: [],
- * //   map:
- * //    { version: 3,
- * //      sources: [ 'string' ],
- * //      names: [],
- * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
- * //      sourcesContent: [ 'abc/*.js' ] },
- * //   position: { line: 1, column: 28 },
- * //   content: {},
- * //   files: {},
- * //   idx: 6 }]
- * ```
- * @param {String} `pattern` Glob pattern to parse and compile.
- * @param {Object} `options` Any [options](#options) to change how parsing and compiling is performed.
- * @return {Object} Returns an object with the parsed AST, compiled string and optional source map.
- * @api public
- */
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_101__["a"]; });
 
-micromatch.create = function(pattern, options) {
-  return memoize('create', pattern, options, function() {
-    function create(str, opts) {
-      return micromatch.compile(micromatch.parse(str, opts), opts);
-    }
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/materialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_102__["a"]; });
 
-    pattern = micromatch.braces(pattern, options);
-    var len = pattern.length;
-    var idx = -1;
-    var res = [];
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_103__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/max.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_103__["a"]; });
 
-    while (++idx < len) {
-      res.push(create(pattern[idx], options));
-    }
-    return res;
-  });
-};
+/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_104__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_104__["a"]; });
 
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.parse(pattern[, options]);
- *
- * var ast = mm.parse('a/{b,c}/d');
- * console.log(ast);
- * // { type: 'root',
- * //   errors: [],
- * //   input: 'a/{b,c}/d',
- * //   nodes:
- * //    [ { type: 'bos', val: '' },
- * //      { type: 'text', val: 'a/' },
- * //      { type: 'brace',
- * //        nodes:
- * //         [ { type: 'brace.open', val: '{' },
- * //           { type: 'text', val: 'b,c' },
- * //           { type: 'brace.close', val: '}' } ] },
- * //      { type: 'text', val: '/d' },
- * //      { type: 'eos', val: '' } ] }
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object} Returns an AST
- * @api public
- */
+/* harmony import */ var _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_105__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/flatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_105__["a"]; });
 
-micromatch.parse = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
+/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_106__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_106__["a"]; });
 
-  function parse() {
-    var snapdragon = utils.instantiate(null, options);
-    parsers(snapdragon, options);
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_107__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_107__["a"]; });
 
-    var ast = snapdragon.parse(pattern, options);
-    utils.define(ast, 'snapdragon', snapdragon);
-    ast.input = pattern;
-    return ast;
-  }
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_108__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_108__["a"]; });
 
-  return memoize('parse', pattern, options, parse);
-};
+/* harmony import */ var _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_109__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_109__["a"]; });
 
-/**
- * Compile the given `ast` or string with the given `options`.
- *
- * ```js
- * var mm = require('micromatch');
- * mm.compile(ast[, options]);
- *
- * var ast = mm.parse('a/{b,c}/d');
- * console.log(mm.compile(ast));
- * // { options: { source: 'string' },
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      brace: [Function],
- * //      'brace.open': [Function],
- * //      text: [Function],
- * //      'brace.close': [Function] },
- * //   output: [ 'a/(b|c)/d' ],
- * //   ast:
- * //    { ... },
- * //   parsingErrors: [] }
- * ```
- * @param {Object|String} `ast`
- * @param {Object} `options`
- * @return {Object} Returns an object that has an `output` property with the compiled string.
- * @api public
- */
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_110__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/min.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_110__["a"]; });
 
-micromatch.compile = function(ast, options) {
-  if (typeof ast === 'string') {
-    ast = micromatch.parse(ast, options);
-  }
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_111__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_111__["a"]; });
 
-  return memoize('compile', ast.input, options, function() {
-    var snapdragon = utils.instantiate(ast, options);
-    compilers(snapdragon, options);
-    return snapdragon.compile(ast, options);
-  });
-};
+/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_112__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_112__["a"]; });
 
-/**
- * Clear the regex cache.
- *
- * ```js
- * mm.clearCache();
- * ```
- * @api public
- */
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_113__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pairwise.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_113__["a"]; });
 
-micromatch.clearCache = function() {
-  micromatch.cache.caches = {};
-};
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_114__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pluck.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_114__["a"]; });
 
-/**
- * Returns true if the given value is effectively an empty string
- */
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_115__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publish.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_115__["a"]; });
 
-function isEmptyString(val) {
-  return String(val) === '' || String(val) === './';
-}
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_116__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishBehavior.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_116__["a"]; });
 
-/**
- * Compose a matcher function with the given patterns.
- * This allows matcher functions to be compiled once and
- * called multiple times.
- */
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_117__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_117__["a"]; });
 
-function compose(patterns, options, matcher) {
-  var matchers;
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_118__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_118__["a"]; });
 
-  return memoize('compose', String(patterns), options, function() {
-    return function(file) {
-      // delay composition until it's invoked the first time,
-      // after that it won't be called again
-      if (!matchers) {
-        matchers = [];
-        for (var i = 0; i < patterns.length; i++) {
-          matchers.push(matcher(patterns[i], options));
-        }
-      }
+/* harmony import */ var _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_119__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_119__["a"]; });
 
-      var len = matchers.length;
-      while (len--) {
-        if (matchers[len](file) === true) {
-          return true;
-        }
-      }
-      return false;
-    };
-  });
-}
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_120__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_120__["a"]; });
 
-/**
- * Memoize a generated regex or function. A unique key is generated
- * from the `type` (usually method name), the `pattern`, and
- * user-defined options.
- */
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_121__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_121__["a"]; });
 
-function memoize(type, pattern, options, fn) {
-  var key = utils.createKey(type + '=' + pattern, options);
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_122__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeatWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_122__["a"]; });
 
-  if (options && options.cache === false) {
-    return fn(pattern, options);
-  }
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_123__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retry.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_123__["a"]; });
 
-  if (cache.has(type, key)) {
-    return cache.get(type, key);
-  }
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_124__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retryWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_124__["a"]; });
 
-  var val = fn(pattern, options);
-  cache.set(type, key, val);
-  return val;
-}
+/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_125__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_125__["a"]; });
 
-/**
- * Expose compiler, parser and cache on `micromatch`
- */
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_126__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sample.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_126__["a"]; });
 
-micromatch.compilers = compilers;
-micromatch.parsers = parsers;
-micromatch.caches = cache.caches;
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_127__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sampleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_127__["a"]; });
 
-/**
- * Expose `micromatch`
- * @type {Function}
- */
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_128__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_128__["a"]; });
 
-module.exports = micromatch;
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_129__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sequenceEqual.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_129__["a"]; });
 
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_130__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/share.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_130__["a"]; });
 
-/***/ }),
-/* 583 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_131__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/shareReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_131__["a"]; });
 
-"use strict";
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_132__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/single.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_132__["a"]; });
 
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_133__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_133__["a"]; });
 
-/**
- * Module dependencies
- */
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_134__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_134__["a"]; });
 
-var toRegex = __webpack_require__(584);
-var unique = __webpack_require__(604);
-var extend = __webpack_require__(605);
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_135__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_135__["a"]; });
 
-/**
- * Local dependencies
- */
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_136__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_136__["a"]; });
 
-var compilers = __webpack_require__(607);
-var parsers = __webpack_require__(622);
-var Braces = __webpack_require__(627);
-var utils = __webpack_require__(608);
-var MAX_LENGTH = 1024 * 64;
-var cache = {};
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_137__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/startWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_137__["a"]; });
 
-/**
- * Convert the given `braces` pattern into a regex-compatible string. By default, only one string is generated for every input string. Set `options.expand` to true to return an array of patterns (similar to Bash or minimatch. Before using `options.expand`, it's recommended that you read the [performance notes](#performance)).
- *
- * ```js
- * var braces = require('braces');
- * console.log(braces('{a,b,c}'));
- * //=> ['(a|b|c)']
- *
- * console.log(braces('{a,b,c}', {expand: true}));
- * //=> ['a', 'b', 'c']
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_138__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_138__["a"]; });
 
-function braces(pattern, options) {
-  var key = utils.createKey(String(pattern), options);
-  var arr = [];
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_139__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_139__["a"]; });
 
-  var disabled = options && options.cache === false;
-  if (!disabled && cache.hasOwnProperty(key)) {
-    return cache[key];
-  }
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_140__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_140__["a"]; });
 
-  if (Array.isArray(pattern)) {
-    for (var i = 0; i < pattern.length; i++) {
-      arr.push.apply(arr, braces.create(pattern[i], options));
-    }
-  } else {
-    arr = braces.create(pattern, options);
-  }
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_141__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_141__["a"]; });
+
+/* harmony import */ var _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_142__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_142__["a"]; });
+
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_143__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_143__["a"]; });
 
-  if (options && options.nodupes === true) {
-    arr = unique(arr);
-  }
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_144__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_144__["a"]; });
 
-  if (!disabled) {
-    cache[key] = arr;
-  }
-  return arr;
-}
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_145__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_145__["a"]; });
 
-/**
- * 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 [.optimize](#optimize) instead.
- *
- * ```js
- * var 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
- */
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_146__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_146__["a"]; });
 
-braces.expand = function(pattern, options) {
-  return braces.create(pattern, extend({}, options, {expand: true}));
-};
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_147__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/tap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_147__["a"]; });
 
-/**
- * Expands a brace pattern into a regex-compatible, optimized string. This method is called by the main [braces](#braces) function by default.
- *
- * ```js
- * var braces = require('braces');
- * console.log(braces.expand('a/{b,c}/d'));
- * //=> ['a/(b|c)/d']
- * ```
- * @param {String} `pattern` Brace pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of expanded values.
- * @api public
- */
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_148__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_148__["b"]; });
 
-braces.optimize = function(pattern, options) {
-  return braces.create(pattern, options);
-};
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_149__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_149__["a"]; });
 
-/**
- * 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
- * var 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
- */
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_150__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_150__["a"]; });
 
-braces.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_151__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeInterval.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_151__["a"]; });
 
-  var maxLength = (options && options.maxLength) || MAX_LENGTH;
-  if (pattern.length >= maxLength) {
-    throw new Error('expected pattern to be less than ' + maxLength + ' characters');
-  }
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_28__["b"]; });
 
-  function create() {
-    if (pattern === '' || pattern.length < 3) {
-      return [pattern];
-    }
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_152__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeoutWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_152__["a"]; });
 
-    if (utils.isEmptySets(pattern)) {
-      return [];
-    }
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_153__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timestamp.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_153__["a"]; });
 
-    if (utils.isQuotedString(pattern)) {
-      return [pattern.slice(1, -1)];
-    }
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_154__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_154__["a"]; });
 
-    var proto = new Braces(options);
-    var result = !options || options.expand !== true
-      ? proto.optimize(pattern, options)
-      : proto.expand(pattern, options);
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_155__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/window.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_155__["a"]; });
 
-    // get the generated pattern(s)
-    var arr = result.output;
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_156__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_156__["a"]; });
 
-    // filter out empty strings if specified
-    if (options && options.noempty === true) {
-      arr = arr.filter(Boolean);
-    }
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_157__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_157__["a"]; });
 
-    // filter out duplicates if specified
-    if (options && options.nodupes === true) {
-      arr = unique(arr);
-    }
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_158__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_158__["a"]; });
 
-    Object.defineProperty(arr, 'result', {
-      enumerable: false,
-      value: result
-    });
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_159__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_159__["a"]; });
 
-    return arr;
-  }
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_160__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_160__["a"]; });
 
-  return memoize('create', pattern, options, create);
-};
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_161__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_161__["a"]; });
+
+/* harmony import */ var _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_162__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_162__["a"]; });
 
-/**
- * Create a regular expression from the given string `pattern`.
- *
- * ```js
- * var braces = require('braces');
- *
- * console.log(braces.makeRe('id-{200..300}'));
- * //=> /^(?:id-(20[0-9]|2[1-9][0-9]|300))$/
- * ```
- * @param {String} `pattern` The pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
 
-braces.makeRe = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
 
-  var maxLength = (options && options.maxLength) || MAX_LENGTH;
-  if (pattern.length >= maxLength) {
-    throw new Error('expected pattern to be less than ' + maxLength + ' characters');
-  }
 
-  function makeRe() {
-    var arr = braces(pattern, options);
-    var opts = extend({strictErrors: false}, options);
-    return toRegex(arr, opts);
-  }
 
-  return memoize('makeRe', pattern, options, makeRe);
-};
 
-/**
- * Parse the given `str` with the given `options`.
- *
- * ```js
- * var braces = require('braces');
- * var ast = braces.parse('a/{b,c}/d');
- * console.log(ast);
- * // { type: 'root',
- * //   errors: [],
- * //   input: 'a/{b,c}/d',
- * //   nodes:
- * //    [ { type: 'bos', val: '' },
- * //      { type: 'text', val: 'a/' },
- * //      { type: 'brace',
- * //        nodes:
- * //         [ { type: 'brace.open', val: '{' },
- * //           { type: 'text', val: 'b,c' },
- * //           { type: 'brace.close', val: '}' } ] },
- * //      { type: 'text', val: '/d' },
- * //      { type: 'eos', val: '' } ] }
- * ```
- * @param {String} `pattern` Brace pattern to parse
- * @param {Object} `options`
- * @return {Object} Returns an AST
- * @api public
- */
 
-braces.parse = function(pattern, options) {
-  var proto = new Braces(options);
-  return proto.parse(pattern, options);
-};
 
-/**
- * Compile the given `ast` or string with the given `options`.
- *
- * ```js
- * var braces = require('braces');
- * var ast = braces.parse('a/{b,c}/d');
- * console.log(braces.compile(ast));
- * // { options: { source: 'string' },
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      brace: [Function],
- * //      'brace.open': [Function],
- * //      text: [Function],
- * //      'brace.close': [Function] },
- * //   output: [ 'a/(b|c)/d' ],
- * //   ast:
- * //    { ... },
- * //   parsingErrors: [] }
- * ```
- * @param {Object|String} `ast` AST from [.parse](#parse). If a string is passed it will be parsed first.
- * @param {Object} `options`
- * @return {Object} Returns an object that has an `output` property with the compiled string.
- * @api public
- */
 
-braces.compile = function(ast, options) {
-  var proto = new Braces(options);
-  return proto.compile(ast, options);
-};
 
-/**
- * Clear the regex cache.
- *
- * ```js
- * braces.clearCache();
- * ```
- * @api public
- */
 
-braces.clearCache = function() {
-  cache = braces.cache = {};
-};
 
-/**
- * Memoize a generated regex or function. A unique key is generated
- * from the method name, pattern, and user-defined options. Set
- * options.memoize to false to disable.
- */
 
-function memoize(type, pattern, options, fn) {
-  var key = utils.createKey(type + ':' + pattern, options);
-  var disabled = options && options.cache === false;
-  if (disabled) {
-    braces.clearCache();
-    return fn(pattern, options);
-  }
 
-  if (cache.hasOwnProperty(key)) {
-    return cache[key];
-  }
 
-  var res = fn(pattern, options);
-  cache[key] = res;
-  return res;
-}
 
-/**
- * Expose `Braces` constructor and methods
- * @type {Function}
- */
 
-braces.Braces = Braces;
-braces.compilers = compilers;
-braces.parsers = parsers;
-braces.cache = cache;
 
-/**
- * Expose `braces`
- * @type {Function}
- */
 
-module.exports = braces;
 
 
-/***/ }),
-/* 584 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-var safe = __webpack_require__(585);
-var define = __webpack_require__(591);
-var extend = __webpack_require__(597);
-var not = __webpack_require__(601);
-var MAX_LENGTH = 1024 * 64;
 
-/**
- * Session cache
- */
 
-var cache = {};
 
-/**
- * Create a regular expression from the given `pattern` string.
- *
- * @param {String|RegExp} `pattern` Pattern can be a string or regular expression.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
 
-module.exports = function(patterns, options) {
-  if (!Array.isArray(patterns)) {
-    return makeRe(patterns, options);
-  }
-  return makeRe(patterns.join('|'), options);
-};
 
-/**
- * Create a regular expression from the given `pattern` string.
- *
- * @param {String|RegExp} `pattern` Pattern can be a string or regular expression.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
 
-function makeRe(pattern, options) {
-  if (pattern instanceof RegExp) {
-    return pattern;
-  }
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
 
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
-  }
 
-  var key = pattern;
-  // do this before shallow cloning options, it's a lot faster
-  if (!options || (options && options.cache !== false)) {
-    key = createKey(pattern, options);
 
-    if (cache.hasOwnProperty(key)) {
-      return cache[key];
-    }
-  }
 
-  var opts = extend({}, options);
-  if (opts.contains === true) {
-    if (opts.negate === true) {
-      opts.strictNegate = false;
-    } else {
-      opts.strict = false;
-    }
-  }
 
-  if (opts.strict === false) {
-    opts.strictOpen = false;
-    opts.strictClose = false;
-  }
 
-  var open = opts.strictOpen !== false ? '^' : '';
-  var close = opts.strictClose !== false ? '$' : '';
-  var flags = opts.flags || '';
-  var regex;
 
-  if (opts.nocase === true && !/i/.test(flags)) {
-    flags += 'i';
-  }
 
-  try {
-    if (opts.negate || typeof opts.strictNegate === 'boolean') {
-      pattern = not.create(pattern, opts);
-    }
 
-    var str = open + '(?:' + pattern + ')' + close;
-    regex = new RegExp(str, flags);
 
-    if (opts.safe === true && safe(regex) === false) {
-      throw new Error('potentially unsafe regular expression: ' + regex.source);
-    }
 
-  } catch (err) {
-    if (opts.strictErrors === true || opts.safe === true) {
-      err.key = key;
-      err.pattern = pattern;
-      err.originalOptions = options;
-      err.createdOptions = opts;
-      throw err;
-    }
 
-    try {
-      regex = new RegExp('^' + pattern.replace(/(\W)/g, '\\$1') + '$');
-    } catch (err) {
-      regex = /.^/; //<= match nothing
-    }
-  }
 
-  if (opts.cache !== false) {
-    memoize(regex, key, pattern, opts);
-  }
-  return regex;
-}
 
-/**
- * Memoize generated regex. This can result in dramatic speed improvements
- * and simplify debugging by adding options and pattern to the regex. It can be
- * disabled by passing setting `options.cache` to false.
- */
 
-function memoize(regex, key, pattern, options) {
-  define(regex, 'cached', true);
-  define(regex, 'pattern', pattern);
-  define(regex, 'options', options);
-  define(regex, 'key', key);
-  cache[key] = regex;
-}
 
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
 
-function createKey(pattern, options) {
-  if (!options) return pattern;
-  var key = pattern;
-  for (var prop in options) {
-    if (options.hasOwnProperty(prop)) {
-      key += ';' + prop + '=' + String(options[prop]);
-    }
-  }
-  return key;
-}
 
-/**
- * Expose `makeRe`
- */
 
-module.exports.makeRe = makeRe;
 
 
-/***/ }),
-/* 585 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(586);
-var types = parse.types;
 
-module.exports = function (re, opts) {
-    if (!opts) opts = {};
-    var replimit = opts.limit === undefined ? 25 : opts.limit;
-    
-    if (isRegExp(re)) re = re.source;
-    else if (typeof re !== 'string') re = String(re);
-    
-    try { re = parse(re) }
-    catch (err) { return false }
-    
-    var reps = 0;
-    return (function walk (node, starHeight) {
-        if (node.type === types.REPETITION) {
-            starHeight ++;
-            reps ++;
-            if (starHeight > 1) return false;
-            if (reps > replimit) return false;
-        }
-        
-        if (node.options) {
-            for (var i = 0, len = node.options.length; i < len; i++) {
-                var ok = walk({ stack: node.options[i] }, starHeight);
-                if (!ok) return false;
-            }
-        }
-        var stack = node.stack || (node.value && node.value.stack);
-        if (!stack) return true;
-        
-        for (var i = 0; i < stack.length; i++) {
-            var ok = walk(stack[i], starHeight);
-            if (!ok) return false;
-        }
-        
-        return true;
-    })(re, 0);
-};
 
-function isRegExp (x) {
-    return {}.toString.call(x) === '[object RegExp]';
-}
 
 
-/***/ }),
-/* 586 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var util      = __webpack_require__(587);
-var types     = __webpack_require__(588);
-var sets      = __webpack_require__(589);
-var positions = __webpack_require__(590);
 
 
-module.exports = function(regexpStr) {
-  var i = 0, l, c,
-      start = { type: types.ROOT, stack: []},
 
-      // Keep track of last clause/group and stack.
-      lastGroup = start,
-      last = start.stack,
-      groupStack = [];
 
 
-  var repeatErr = function(i) {
-    util.error(regexpStr, 'Nothing to repeat at column ' + (i - 1));
-  };
 
-  // Decode a few escaped characters.
-  var str = util.strToChars(regexpStr);
-  l = str.length;
 
-  // Iterate through each character in string.
-  while (i < l) {
-    c = str[i++];
 
-    switch (c) {
-      // Handle escaped characters, inclues a few sets.
-      case '\\':
-        c = str[i++];
 
-        switch (c) {
-          case 'b':
-            last.push(positions.wordBoundary());
-            break;
 
-          case 'B':
-            last.push(positions.nonWordBoundary());
-            break;
 
-          case 'w':
-            last.push(sets.words());
-            break;
 
-          case 'W':
-            last.push(sets.notWords());
-            break;
 
-          case 'd':
-            last.push(sets.ints());
-            break;
 
-          case 'D':
-            last.push(sets.notInts());
-            break;
 
-          case 's':
-            last.push(sets.whitespace());
-            break;
 
-          case 'S':
-            last.push(sets.notWhitespace());
-            break;
 
-          default:
-            // Check if c is integer.
-            // In which case it's a reference.
-            if (/\d/.test(c)) {
-              last.push({ type: types.REFERENCE, value: parseInt(c, 10) });
 
-            // Escaped character.
-            } else {
-              last.push({ type: types.CHAR, value: c.charCodeAt(0) });
-            }
-        }
 
-        break;
 
 
-      // Positionals.
-      case '^':
-          last.push(positions.begin());
-        break;
 
-      case '$':
-          last.push(positions.end());
-        break;
 
 
-      // Handle custom sets.
-      case '[':
-        // Check if this class is 'anti' i.e. [^abc].
-        var not;
-        if (str[i] === '^') {
-          not = true;
-          i++;
-        } else {
-          not = false;
-        }
 
-        // Get all the characters in class.
-        var classTokens = util.tokenizeClass(str.slice(i), regexpStr);
 
-        // Increase index by length of class.
-        i += classTokens[1];
-        last.push({
-          type: types.SET,
-          set: classTokens[0],
-          not: not,
-        });
 
-        break;
 
 
-      // Class of any character except \n.
-      case '.':
-        last.push(sets.anyChar());
-        break;
 
 
-      // Push group onto stack.
-      case '(':
-        // Create group.
-        var group = {
-          type: types.GROUP,
-          stack: [],
-          remember: true,
-        };
 
-        c = str[i];
 
-        // If if this is a special kind of group.
-        if (c === '?') {
-          c = str[i + 1];
-          i += 2;
 
-          // Match if followed by.
-          if (c === '=') {
-            group.followedBy = true;
 
-          // Match if not followed by.
-          } else if (c === '!') {
-            group.notFollowedBy = true;
 
-          } else if (c !== ':') {
-            util.error(regexpStr,
-              'Invalid group, character \'' + c +
-              '\' after \'?\' at column ' + (i - 1));
-          }
 
-          group.remember = false;
-        }
 
-        // Insert subgroup into current group stack.
-        last.push(group);
 
-        // Remember the current group for when the group closes.
-        groupStack.push(lastGroup);
 
-        // Make this new group the current group.
-        lastGroup = group;
-        last = group.stack;
-        break;
 
 
-      // Pop group out of stack.
-      case ')':
-        if (groupStack.length === 0) {
-          util.error(regexpStr, 'Unmatched ) at column ' + (i - 1));
-        }
-        lastGroup = groupStack.pop();
 
-        // Check if this group has a PIPE.
-        // To get back the correct last stack.
-        last = lastGroup.options ?
-          lastGroup.options[lastGroup.options.length - 1] : lastGroup.stack;
-        break;
 
 
-      // Use pipe character to give more choices.
-      case '|':
-        // Create array where options are if this is the first PIPE
-        // in this clause.
-        if (!lastGroup.options) {
-          lastGroup.options = [lastGroup.stack];
-          delete lastGroup.stack;
-        }
 
-        // Create a new stack and add to options for rest of clause.
-        var stack = [];
-        lastGroup.options.push(stack);
-        last = stack;
-        break;
 
 
-      // Repetition.
-      // For every repetition, remove last element from last stack
-      // then insert back a RANGE object.
-      // This design is chosen because there could be more than
-      // one repetition symbols in a regex i.e. `a?+{2,3}`.
-      case '{':
-        var rs = /^(\d+)(,(\d+)?)?\}/.exec(str.slice(i)), min, max;
-        if (rs !== null) {
-          if (last.length === 0) {
-            repeatErr(i);
-          }
-          min = parseInt(rs[1], 10);
-          max = rs[2] ? rs[3] ? parseInt(rs[3], 10) : Infinity : min;
-          i += rs[0].length;
 
-          last.push({
-            type: types.REPETITION,
-            min: min,
-            max: max,
-            value: last.pop(),
-          });
-        } else {
-          last.push({
-            type: types.CHAR,
-            value: 123,
-          });
-        }
-        break;
 
-      case '?':
-        if (last.length === 0) {
-          repeatErr(i);
-        }
-        last.push({
-          type: types.REPETITION,
-          min: 0,
-          max: 1,
-          value: last.pop(),
-        });
-        break;
 
-      case '+':
-        if (last.length === 0) {
-          repeatErr(i);
-        }
-        last.push({
-          type: types.REPETITION,
-          min: 1,
-          max: Infinity,
-          value: last.pop(),
-        });
-        break;
 
-      case '*':
-        if (last.length === 0) {
-          repeatErr(i);
-        }
-        last.push({
-          type: types.REPETITION,
-          min: 0,
-          max: Infinity,
-          value: last.pop(),
-        });
-        break;
 
 
-      // Default is a character that is not `\[](){}?+*^$`.
-      default:
-        last.push({
-          type: types.CHAR,
-          value: c.charCodeAt(0),
-        });
-    }
 
-  }
 
-  // Check if any groups have not been closed.
-  if (groupStack.length !== 0) {
-    util.error(regexpStr, 'Unterminated group');
-  }
 
-  return start;
-};
 
-module.exports.types = types;
 
 
-/***/ }),
-/* 587 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(588);
-var sets  = __webpack_require__(589);
 
 
-// All of these are private and only used by randexp.
-// It's assumed that they will always be called with the correct input.
 
-var CTRL = '@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^ ?';
-var SLSH = { '0': 0, 't': 9, 'n': 10, 'v': 11, 'f': 12, 'r': 13 };
 
-/**
- * Finds character representations in str and convert all to
- * their respective characters
- *
- * @param {String} str
- * @return {String}
- */
-exports.strToChars = function(str) {
-  /* jshint maxlen: false */
-  var chars_regex = /(\[\\b\])|(\\)?\\(?:u([A-F0-9]{4})|x([A-F0-9]{2})|(0?[0-7]{2})|c([@A-Z\[\\\]\^?])|([0tnvfr]))/g;
-  str = str.replace(chars_regex, function(s, b, lbs, a16, b16, c8, dctrl, eslsh) {
-    if (lbs) {
-      return s;
-    }
 
-    var code = b     ? 8 :
-               a16   ? parseInt(a16, 16) :
-               b16   ? parseInt(b16, 16) :
-               c8    ? parseInt(c8,   8) :
-               dctrl ? CTRL.indexOf(dctrl) :
-               SLSH[eslsh];
 
-    var c = String.fromCharCode(code);
 
-    // Escape special regex characters.
-    if (/[\[\]{}\^$.|?*+()]/.test(c)) {
-      c = '\\' + c;
-    }
 
-    return c;
-  });
 
-  return str;
-};
 
 
-/**
- * turns class into tokens
- * reads str until it encounters a ] not preceeded by a \
- *
- * @param {String} str
- * @param {String} regexpStr
- * @return {Array.<Array.<Object>, Number>}
- */
-exports.tokenizeClass = function(str, regexpStr) {
-  /* jshint maxlen: false */
-  var tokens = [];
-  var regexp = /\\(?:(w)|(d)|(s)|(W)|(D)|(S))|((?:(?:\\)(.)|([^\]\\]))-(?:\\)?([^\]]))|(\])|(?:\\)?(.)/g;
-  var rs, c;
 
 
-  while ((rs = regexp.exec(str)) != null) {
-    if (rs[1]) {
-      tokens.push(sets.words());
 
-    } else if (rs[2]) {
-      tokens.push(sets.ints());
 
-    } else if (rs[3]) {
-      tokens.push(sets.whitespace());
 
-    } else if (rs[4]) {
-      tokens.push(sets.notWords());
 
-    } else if (rs[5]) {
-      tokens.push(sets.notInts());
 
-    } else if (rs[6]) {
-      tokens.push(sets.notWhitespace());
 
-    } else if (rs[7]) {
-      tokens.push({
-        type: types.RANGE,
-        from: (rs[8] || rs[9]).charCodeAt(0),
-          to: rs[10].charCodeAt(0),
-      });
 
-    } else if (c = rs[12]) {
-      tokens.push({
-        type: types.CHAR,
-        value: c.charCodeAt(0),
-      });
 
-    } else {
-      return [tokens, regexp.lastIndex];
-    }
-  }
 
-  exports.error(regexpStr, 'Unterminated character class');
-};
 
 
-/**
- * Shortcut to throw errors.
- *
- * @param {String} regexp
- * @param {String} msg
- */
-exports.error = function(regexp, msg) {
-  throw new SyntaxError('Invalid regular expression: /' + regexp + '/: ' + msg);
-};
 
 
-/***/ }),
-/* 588 */
-/***/ (function(module, exports) {
 
-module.exports = {
-  ROOT       : 0,
-  GROUP      : 1,
-  POSITION   : 2,
-  SET        : 3,
-  RANGE      : 4,
-  REPETITION : 5,
-  REFERENCE  : 6,
-  CHAR       : 7,
-};
 
 
-/***/ }),
-/* 589 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(588);
 
-var INTS = function() {
- return [{ type: types.RANGE , from: 48, to: 57 }];
-};
 
-var WORDS = function() {
- return [
-    { type: types.CHAR, value: 95 },
-    { type: types.RANGE, from: 97, to: 122 },
-    { type: types.RANGE, from: 65, to: 90 }
-  ].concat(INTS());
-};
 
-var WHITESPACE = function() {
- return [
-    { type: types.CHAR, value: 9 },
-    { type: types.CHAR, value: 10 },
-    { type: types.CHAR, value: 11 },
-    { type: types.CHAR, value: 12 },
-    { type: types.CHAR, value: 13 },
-    { type: types.CHAR, value: 32 },
-    { type: types.CHAR, value: 160 },
-    { type: types.CHAR, value: 5760 },
-    { type: types.CHAR, value: 6158 },
-    { type: types.CHAR, value: 8192 },
-    { type: types.CHAR, value: 8193 },
-    { type: types.CHAR, value: 8194 },
-    { type: types.CHAR, value: 8195 },
-    { type: types.CHAR, value: 8196 },
-    { type: types.CHAR, value: 8197 },
-    { type: types.CHAR, value: 8198 },
-    { type: types.CHAR, value: 8199 },
-    { type: types.CHAR, value: 8200 },
-    { type: types.CHAR, value: 8201 },
-    { type: types.CHAR, value: 8202 },
-    { type: types.CHAR, value: 8232 },
-    { type: types.CHAR, value: 8233 },
-    { type: types.CHAR, value: 8239 },
-    { type: types.CHAR, value: 8287 },
-    { type: types.CHAR, value: 12288 },
-    { type: types.CHAR, value: 65279 }
-  ];
-};
 
-var NOTANYCHAR = function() {
-  return [
-    { type: types.CHAR, value: 10 },
-    { type: types.CHAR, value: 13 },
-    { type: types.CHAR, value: 8232 },
-    { type: types.CHAR, value: 8233 },
-  ];
-};
 
-// Predefined class objects.
-exports.words = function() {
-  return { type: types.SET, set: WORDS(), not: false };
-};
 
-exports.notWords = function() {
-  return { type: types.SET, set: WORDS(), not: true };
-};
 
-exports.ints = function() {
-  return { type: types.SET, set: INTS(), not: false };
-};
 
-exports.notInts = function() {
-  return { type: types.SET, set: INTS(), not: true };
-};
 
-exports.whitespace = function() {
-  return { type: types.SET, set: WHITESPACE(), not: false };
-};
 
-exports.notWhitespace = function() {
-  return { type: types.SET, set: WHITESPACE(), not: true };
-};
 
-exports.anyChar = function() {
-  return { type: types.SET, set: NOTANYCHAR(), not: true };
-};
 
 
-/***/ }),
-/* 590 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(588);
 
-exports.wordBoundary = function() {
-  return { type: types.POSITION, value: 'b' };
-};
 
-exports.nonWordBoundary = function() {
-  return { type: types.POSITION, value: 'B' };
-};
 
-exports.begin = function() {
-  return { type: types.POSITION, value: '^' };
-};
 
-exports.end = function() {
-  return { type: types.POSITION, value: '$' };
-};
 
+//# sourceMappingURL=index.js.map
 
 /***/ }),
-/* 591 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncSubject; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
 
 
+var AsyncSubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsyncSubject, _super);
+    function AsyncSubject() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this._value = null;
+        _this._hasValue = false;
+        _this._isComplete = false;
+        return _this;
+    }
+    AsyncSubject.prototype._checkFinalizedStatuses = function (subscriber) {
+        var _a = this, hasError = _a.hasError, _hasValue = _a._hasValue, _value = _a._value, thrownError = _a.thrownError, isStopped = _a.isStopped, _isComplete = _a._isComplete;
+        if (hasError) {
+            subscriber.error(thrownError);
+        }
+        else if (isStopped || _isComplete) {
+            _hasValue && subscriber.next(_value);
+            subscriber.complete();
+        }
+    };
+    AsyncSubject.prototype.next = function (value) {
+        if (!this.isStopped) {
+            this._value = value;
+            this._hasValue = true;
+        }
+    };
+    AsyncSubject.prototype.complete = function () {
+        var _a = this, _hasValue = _a._hasValue, _value = _a._value, _isComplete = _a._isComplete;
+        if (!_isComplete) {
+            this._isComplete = true;
+            _hasValue && _super.prototype.next.call(this, _value);
+            _super.prototype.complete.call(this);
+        }
+    };
+    return AsyncSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]));
 
-var isobject = __webpack_require__(592);
-var isDescriptor = __webpack_require__(593);
-var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
-  ? Reflect.defineProperty
-  : Object.defineProperty;
+//# sourceMappingURL=AsyncSubject.js.map
 
-module.exports = function defineProperty(obj, key, val) {
-  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
-    throw new TypeError('expected an object, function, or array');
-  }
+/***/ }),
 
-  if (typeof key !== 'string') {
-    throw new TypeError('expected "key" to be a string');
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/BehaviorSubject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (isDescriptor(val)) {
-    define(obj, key, val);
-    return obj;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BehaviorSubject; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
 
-  define(obj, key, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
 
-  return obj;
-};
+var BehaviorSubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(BehaviorSubject, _super);
+    function BehaviorSubject(_value) {
+        var _this = _super.call(this) || this;
+        _this._value = _value;
+        return _this;
+    }
+    Object.defineProperty(BehaviorSubject.prototype, "value", {
+        get: function () {
+            return this.getValue();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    BehaviorSubject.prototype._subscribe = function (subscriber) {
+        var subscription = _super.prototype._subscribe.call(this, subscriber);
+        !subscription.closed && subscriber.next(this._value);
+        return subscription;
+    };
+    BehaviorSubject.prototype.getValue = function () {
+        var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, _value = _a._value;
+        if (hasError) {
+            throw thrownError;
+        }
+        this._throwIfClosed();
+        return _value;
+    };
+    BehaviorSubject.prototype.next = function (value) {
+        _super.prototype.next.call(this, (this._value = value));
+    };
+    return BehaviorSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]));
 
+//# sourceMappingURL=BehaviorSubject.js.map
 
 /***/ }),
-/* 592 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Notification.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * isobject <https://github.com/jonschlinkert/isobject>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return NotificationKind; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Notification; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return observeNotification; });
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/of.js");
+/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/throwError.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
 
 
-module.exports = function isObject(val) {
-  return val != null && typeof val === 'object' && Array.isArray(val) === false;
-};
 
+var NotificationKind;
+(function (NotificationKind) {
+    NotificationKind["NEXT"] = "N";
+    NotificationKind["ERROR"] = "E";
+    NotificationKind["COMPLETE"] = "C";
+})(NotificationKind || (NotificationKind = {}));
+var Notification = (function () {
+    function Notification(kind, value, error) {
+        this.kind = kind;
+        this.value = value;
+        this.error = error;
+        this.hasValue = kind === 'N';
+    }
+    Notification.prototype.observe = function (observer) {
+        return observeNotification(this, observer);
+    };
+    Notification.prototype.do = function (nextHandler, errorHandler, completeHandler) {
+        var _a = this, kind = _a.kind, value = _a.value, error = _a.error;
+        return kind === 'N' ? nextHandler === null || nextHandler === void 0 ? void 0 : nextHandler(value) : kind === 'E' ? errorHandler === null || errorHandler === void 0 ? void 0 : errorHandler(error) : completeHandler === null || completeHandler === void 0 ? void 0 : completeHandler();
+    };
+    Notification.prototype.accept = function (nextOrObserver, error, complete) {
+        var _a;
+        return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__[/* isFunction */ "a"])((_a = nextOrObserver) === null || _a === void 0 ? void 0 : _a.next)
+            ? this.observe(nextOrObserver)
+            : this.do(nextOrObserver, error, complete);
+    };
+    Notification.prototype.toObservable = function () {
+        var _a = this, kind = _a.kind, value = _a.value, error = _a.error;
+        var result = kind === 'N'
+            ?
+                Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__[/* of */ "a"])(value)
+            :
+                kind === 'E'
+                    ?
+                        Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__[/* throwError */ "a"])(function () { return error; })
+                    :
+                        kind === 'C'
+                            ?
+                                _observable_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]
+                            :
+                                0;
+        if (!result) {
+            throw new TypeError("Unexpected notification kind " + kind);
+        }
+        return result;
+    };
+    Notification.createNext = function (value) {
+        return new Notification('N', value);
+    };
+    Notification.createError = function (err) {
+        return new Notification('E', undefined, err);
+    };
+    Notification.createComplete = function () {
+        return Notification.completeNotification;
+    };
+    Notification.completeNotification = new Notification('C');
+    return Notification;
+}());
+
+function observeNotification(notification, observer) {
+    var _a, _b, _c;
+    var _d = notification, kind = _d.kind, value = _d.value, error = _d.error;
+    if (typeof kind !== 'string') {
+        throw new TypeError('Invalid notification, missing "kind"');
+    }
+    kind === 'N' ? (_a = observer.next) === null || _a === void 0 ? void 0 : _a.call(observer, value) : kind === 'E' ? (_b = observer.error) === null || _b === void 0 ? void 0 : _b.call(observer, error) : (_c = observer.complete) === null || _c === void 0 ? void 0 : _c.call(observer);
+}
+//# sourceMappingURL=Notification.js.map
 
 /***/ }),
-/* 593 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/NotificationFactories.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * is-descriptor <https://github.com/jonschlinkert/is-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return COMPLETE_NOTIFICATION; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return errorNotification; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return nextNotification; });
+/* unused harmony export createNotification */
+var COMPLETE_NOTIFICATION = (function () { return createNotification('C', undefined, undefined); })();
+function errorNotification(error) {
+    return createNotification('E', undefined, error);
+}
+function nextNotification(value) {
+    return createNotification('N', value, undefined);
+}
+function createNotification(kind, value, error) {
+    return {
+        kind: kind,
+        value: value,
+        error: error,
+    };
+}
+//# sourceMappingURL=NotificationFactories.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Observable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; });
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js");
 
 
-var typeOf = __webpack_require__(594);
-var isAccessor = __webpack_require__(595);
-var isData = __webpack_require__(596);
 
-module.exports = function isDescriptor(obj, key) {
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-  if ('get' in obj) {
-    return isAccessor(obj, key);
-  }
-  return isData(obj, key);
-};
 
 
+
+
+var Observable = (function () {
+    function Observable(subscribe) {
+        if (subscribe) {
+            this._subscribe = subscribe;
+        }
+    }
+    Observable.prototype.lift = function (operator) {
+        var observable = new Observable();
+        observable.source = this;
+        observable.operator = operator;
+        return observable;
+    };
+    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
+        var _this = this;
+        var subscriber = isSubscriber(observerOrNext) ? observerOrNext : new _Subscriber__WEBPACK_IMPORTED_MODULE_0__[/* SafeSubscriber */ "a"](observerOrNext, error, complete);
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_6__[/* errorContext */ "b"])(function () {
+            var _a = _this, operator = _a.operator, source = _a.source;
+            subscriber.add(operator
+                ?
+                    operator.call(subscriber, source)
+                : source
+                    ?
+                        _this._subscribe(subscriber)
+                    :
+                        _this._trySubscribe(subscriber));
+        });
+        return subscriber;
+    };
+    Observable.prototype._trySubscribe = function (sink) {
+        try {
+            return this._subscribe(sink);
+        }
+        catch (err) {
+            sink.error(err);
+        }
+    };
+    Observable.prototype.forEach = function (next, promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var subscriber = new _Subscriber__WEBPACK_IMPORTED_MODULE_0__[/* SafeSubscriber */ "a"]({
+                next: function (value) {
+                    try {
+                        next(value);
+                    }
+                    catch (err) {
+                        reject(err);
+                        subscriber.unsubscribe();
+                    }
+                },
+                error: reject,
+                complete: resolve,
+            });
+            _this.subscribe(subscriber);
+        });
+    };
+    Observable.prototype._subscribe = function (subscriber) {
+        var _a;
+        return (_a = this.source) === null || _a === void 0 ? void 0 : _a.subscribe(subscriber);
+    };
+    Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__[/* observable */ "a"]] = function () {
+        return this;
+    };
+    Observable.prototype.pipe = function () {
+        var operations = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            operations[_i] = arguments[_i];
+        }
+        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__[/* pipeFromArray */ "b"])(operations)(this);
+    };
+    Observable.prototype.toPromise = function (promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var value;
+            _this.subscribe(function (x) { return (value = x); }, function (err) { return reject(err); }, function () { return resolve(value); });
+        });
+    };
+    Observable.create = function (subscribe) {
+        return new Observable(subscribe);
+    };
+    return Observable;
+}());
+
+function getPromiseCtor(promiseCtor) {
+    var _a;
+    return (_a = promiseCtor !== null && promiseCtor !== void 0 ? promiseCtor : _config__WEBPACK_IMPORTED_MODULE_4__[/* config */ "a"].Promise) !== null && _a !== void 0 ? _a : Promise;
+}
+function isObserver(value) {
+    return value && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(value.next) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(value.error) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(value.complete);
+}
+function isSubscriber(value) {
+    return (value && value instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__[/* Subscriber */ "b"]) || (isObserver(value) && Object(_Subscription__WEBPACK_IMPORTED_MODULE_1__[/* isSubscription */ "c"])(value));
+}
+//# sourceMappingURL=Observable.js.map
+
 /***/ }),
-/* 594 */
-/***/ (function(module, exports) {
 
-var toString = Object.prototype.toString;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function kindOf(val) {
-  if (val === void 0) return 'undefined';
-  if (val === null) return 'null';
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ReplaySubject; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js");
 
-  var type = typeof val;
-  if (type === 'boolean') return 'boolean';
-  if (type === 'string') return 'string';
-  if (type === 'number') return 'number';
-  if (type === 'symbol') return 'symbol';
-  if (type === 'function') {
-    return isGeneratorFn(val) ? 'generatorfunction' : 'function';
-  }
 
-  if (isArray(val)) return 'array';
-  if (isBuffer(val)) return 'buffer';
-  if (isArguments(val)) return 'arguments';
-  if (isDate(val)) return 'date';
-  if (isError(val)) return 'error';
-  if (isRegexp(val)) return 'regexp';
 
-  switch (ctorName(val)) {
-    case 'Symbol': return 'symbol';
-    case 'Promise': return 'promise';
+var ReplaySubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(ReplaySubject, _super);
+    function ReplaySubject(_bufferSize, _windowTime, _timestampProvider) {
+        if (_bufferSize === void 0) { _bufferSize = Infinity; }
+        if (_windowTime === void 0) { _windowTime = Infinity; }
+        if (_timestampProvider === void 0) { _timestampProvider = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_2__[/* dateTimestampProvider */ "a"]; }
+        var _this = _super.call(this) || this;
+        _this._bufferSize = _bufferSize;
+        _this._windowTime = _windowTime;
+        _this._timestampProvider = _timestampProvider;
+        _this._buffer = [];
+        _this._infiniteTimeWindow = true;
+        _this._infiniteTimeWindow = _windowTime === Infinity;
+        _this._bufferSize = Math.max(1, _bufferSize);
+        _this._windowTime = Math.max(1, _windowTime);
+        return _this;
+    }
+    ReplaySubject.prototype.next = function (value) {
+        var _a = this, isStopped = _a.isStopped, _buffer = _a._buffer, _infiniteTimeWindow = _a._infiniteTimeWindow, _timestampProvider = _a._timestampProvider, _windowTime = _a._windowTime;
+        if (!isStopped) {
+            _buffer.push(value);
+            !_infiniteTimeWindow && _buffer.push(_timestampProvider.now() + _windowTime);
+        }
+        this._trimBuffer();
+        _super.prototype.next.call(this, value);
+    };
+    ReplaySubject.prototype._subscribe = function (subscriber) {
+        this._throwIfClosed();
+        this._trimBuffer();
+        var subscription = this._innerSubscribe(subscriber);
+        var _a = this, _infiniteTimeWindow = _a._infiniteTimeWindow, _buffer = _a._buffer;
+        var copy = _buffer.slice();
+        for (var i = 0; i < copy.length && !subscriber.closed; i += _infiniteTimeWindow ? 1 : 2) {
+            subscriber.next(copy[i]);
+        }
+        this._checkFinalizedStatuses(subscriber);
+        return subscription;
+    };
+    ReplaySubject.prototype._trimBuffer = function () {
+        var _a = this, _bufferSize = _a._bufferSize, _timestampProvider = _a._timestampProvider, _buffer = _a._buffer, _infiniteTimeWindow = _a._infiniteTimeWindow;
+        var adjustedBufferSize = (_infiniteTimeWindow ? 1 : 2) * _bufferSize;
+        _bufferSize < Infinity && adjustedBufferSize < _buffer.length && _buffer.splice(0, _buffer.length - adjustedBufferSize);
+        if (!_infiniteTimeWindow) {
+            var now = _timestampProvider.now();
+            var last = 0;
+            for (var i = 1; i < _buffer.length && _buffer[i] <= now; i += 2) {
+                last = i;
+            }
+            last && _buffer.splice(0, last + 1);
+        }
+    };
+    return ReplaySubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]));
 
-    // Set, Map, WeakSet, WeakMap
-    case 'WeakMap': return 'weakmap';
-    case 'WeakSet': return 'weakset';
-    case 'Map': return 'map';
-    case 'Set': return 'set';
+//# sourceMappingURL=ReplaySubject.js.map
 
-    // 8-bit typed arrays
-    case 'Int8Array': return 'int8array';
-    case 'Uint8Array': return 'uint8array';
-    case 'Uint8ClampedArray': return 'uint8clampedarray';
+/***/ }),
 
-    // 16-bit typed arrays
-    case 'Int16Array': return 'int16array';
-    case 'Uint16Array': return 'uint16array';
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Scheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    // 32-bit typed arrays
-    case 'Int32Array': return 'int32array';
-    case 'Uint32Array': return 'uint32array';
-    case 'Float32Array': return 'float32array';
-    case 'Float64Array': return 'float64array';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Scheduler; });
+/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js");
 
-  if (isGeneratorObj(val)) {
-    return 'generator';
-  }
+var Scheduler = (function () {
+    function Scheduler(schedulerActionCtor, now) {
+        if (now === void 0) { now = Scheduler.now; }
+        this.schedulerActionCtor = schedulerActionCtor;
+        this.now = now;
+    }
+    Scheduler.prototype.schedule = function (work, delay, state) {
+        if (delay === void 0) { delay = 0; }
+        return new this.schedulerActionCtor(this, work).schedule(state, delay);
+    };
+    Scheduler.now = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__[/* dateTimestampProvider */ "a"].now;
+    return Scheduler;
+}());
 
-  // Non-plain objects
-  type = toString.call(val);
-  switch (type) {
-    case '[object Object]': return 'object';
-    // iterators
-    case '[object Map Iterator]': return 'mapiterator';
-    case '[object Set Iterator]': return 'setiterator';
-    case '[object String Iterator]': return 'stringiterator';
-    case '[object Array Iterator]': return 'arrayiterator';
-  }
+//# sourceMappingURL=Scheduler.js.map
 
-  // other
-  return type.slice(8, -1).toLowerCase().replace(/\s/g, '');
-};
+/***/ }),
 
-function ctorName(val) {
-  return typeof val.constructor === 'function' ? val.constructor.name : null;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Subject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isArray(val) {
-  if (Array.isArray) return Array.isArray(val);
-  return val instanceof Array;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subject; });
+/* unused harmony export AnonymousSubject */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ObjectUnsubscribedError.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
+/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js");
 
-function isError(val) {
-  return val instanceof Error || (typeof val.message === 'string' && val.constructor && typeof val.constructor.stackTraceLimit === 'number');
-}
 
-function isDate(val) {
-  if (val instanceof Date) return true;
-  return typeof val.toDateString === 'function'
-    && typeof val.getDate === 'function'
-    && typeof val.setDate === 'function';
-}
 
-function isRegexp(val) {
-  if (val instanceof RegExp) return true;
-  return typeof val.flags === 'string'
-    && typeof val.ignoreCase === 'boolean'
-    && typeof val.multiline === 'boolean'
-    && typeof val.global === 'boolean';
-}
 
-function isGeneratorFn(name, val) {
-  return ctorName(name) === 'GeneratorFunction';
-}
 
-function isGeneratorObj(val) {
-  return typeof val.throw === 'function'
-    && typeof val.return === 'function'
-    && typeof val.next === 'function';
-}
 
-function isArguments(val) {
-  try {
-    if (typeof val.length === 'number' && typeof val.callee === 'function') {
-      return true;
-    }
-  } catch (err) {
-    if (err.message.indexOf('callee') !== -1) {
-      return true;
+var Subject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(Subject, _super);
+    function Subject() {
+        var _this = _super.call(this) || this;
+        _this.closed = false;
+        _this.currentObservers = null;
+        _this.observers = [];
+        _this.isStopped = false;
+        _this.hasError = false;
+        _this.thrownError = null;
+        return _this;
     }
-  }
-  return false;
-}
-
-/**
- * If you need to support Safari 5-7 (8-10 yr-old browser),
- * take a look at https://github.com/feross/is-buffer
- */
+    Subject.prototype.lift = function (operator) {
+        var subject = new AnonymousSubject(this, this);
+        subject.operator = operator;
+        return subject;
+    };
+    Subject.prototype._throwIfClosed = function () {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_3__[/* ObjectUnsubscribedError */ "a"]();
+        }
+    };
+    Subject.prototype.next = function (value) {
+        var _this = this;
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__[/* errorContext */ "b"])(function () {
+            var e_1, _a;
+            _this._throwIfClosed();
+            if (!_this.isStopped) {
+                if (!_this.currentObservers) {
+                    _this.currentObservers = Array.from(_this.observers);
+                }
+                try {
+                    for (var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(_this.currentObservers), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var observer = _c.value;
+                        observer.next(value);
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+            }
+        });
+    };
+    Subject.prototype.error = function (err) {
+        var _this = this;
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__[/* errorContext */ "b"])(function () {
+            _this._throwIfClosed();
+            if (!_this.isStopped) {
+                _this.hasError = _this.isStopped = true;
+                _this.thrownError = err;
+                var observers = _this.observers;
+                while (observers.length) {
+                    observers.shift().error(err);
+                }
+            }
+        });
+    };
+    Subject.prototype.complete = function () {
+        var _this = this;
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_5__[/* errorContext */ "b"])(function () {
+            _this._throwIfClosed();
+            if (!_this.isStopped) {
+                _this.isStopped = true;
+                var observers = _this.observers;
+                while (observers.length) {
+                    observers.shift().complete();
+                }
+            }
+        });
+    };
+    Subject.prototype.unsubscribe = function () {
+        this.isStopped = this.closed = true;
+        this.observers = this.currentObservers = null;
+    };
+    Object.defineProperty(Subject.prototype, "observed", {
+        get: function () {
+            var _a;
+            return ((_a = this.observers) === null || _a === void 0 ? void 0 : _a.length) > 0;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Subject.prototype._trySubscribe = function (subscriber) {
+        this._throwIfClosed();
+        return _super.prototype._trySubscribe.call(this, subscriber);
+    };
+    Subject.prototype._subscribe = function (subscriber) {
+        this._throwIfClosed();
+        this._checkFinalizedStatuses(subscriber);
+        return this._innerSubscribe(subscriber);
+    };
+    Subject.prototype._innerSubscribe = function (subscriber) {
+        var _this = this;
+        var _a = this, hasError = _a.hasError, isStopped = _a.isStopped, observers = _a.observers;
+        if (hasError || isStopped) {
+            return _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY_SUBSCRIPTION */ "a"];
+        }
+        this.currentObservers = null;
+        observers.push(subscriber);
+        return new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"](function () {
+            _this.currentObservers = null;
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_4__[/* arrRemove */ "a"])(observers, subscriber);
+        });
+    };
+    Subject.prototype._checkFinalizedStatuses = function (subscriber) {
+        var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, isStopped = _a.isStopped;
+        if (hasError) {
+            subscriber.error(thrownError);
+        }
+        else if (isStopped) {
+            subscriber.complete();
+        }
+    };
+    Subject.prototype.asObservable = function () {
+        var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"]();
+        observable.source = this;
+        return observable;
+    };
+    Subject.create = function (destination, source) {
+        return new AnonymousSubject(destination, source);
+    };
+    return Subject;
+}(_Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"]));
 
-function isBuffer(val) {
-  if (val.constructor && typeof val.constructor.isBuffer === 'function') {
-    return val.constructor.isBuffer(val);
-  }
-  return false;
-}
+var AnonymousSubject = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AnonymousSubject, _super);
+    function AnonymousSubject(destination, source) {
+        var _this = _super.call(this) || this;
+        _this.destination = destination;
+        _this.source = source;
+        return _this;
+    }
+    AnonymousSubject.prototype.next = function (value) {
+        var _a, _b;
+        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.next) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+    };
+    AnonymousSubject.prototype.error = function (err) {
+        var _a, _b;
+        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.call(_a, err);
+    };
+    AnonymousSubject.prototype.complete = function () {
+        var _a, _b;
+        (_b = (_a = this.destination) === null || _a === void 0 ? void 0 : _a.complete) === null || _b === void 0 ? void 0 : _b.call(_a);
+    };
+    AnonymousSubject.prototype._subscribe = function (subscriber) {
+        var _a, _b;
+        return (_b = (_a = this.source) === null || _a === void 0 ? void 0 : _a.subscribe(subscriber)) !== null && _b !== void 0 ? _b : _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY_SUBSCRIPTION */ "a"];
+    };
+    return AnonymousSubject;
+}(Subject));
 
+//# sourceMappingURL=Subject.js.map
 
 /***/ }),
-/* 595 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * is-accessor-descriptor <https://github.com/jonschlinkert/is-accessor-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Subscriber.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return Subscriber; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SafeSubscriber; });
+/* unused harmony export EMPTY_OBSERVER */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony import */ var _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _NotificationFactories__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/NotificationFactories.js");
+/* harmony import */ var _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js");
+/* harmony import */ var _util_errorContext__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js");
 
 
-var typeOf = __webpack_require__(594);
 
-// accessor descriptor properties
-var accessor = {
-  get: 'function',
-  set: 'function',
-  configurable: 'boolean',
-  enumerable: 'boolean'
-};
 
-function isAccessorDescriptor(obj, prop) {
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
 
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
 
-  if (has(obj, 'value') || has(obj, 'writable')) {
-    return false;
-  }
 
-  if (!has(obj, 'get') || typeof obj.get !== 'function') {
-    return false;
-  }
 
-  // tldr: it's valid to have "set" be undefined
-  // "set" might be undefined if `Object.getOwnPropertyDescriptor`
-  // was used to get the value, and only `get` was defined by the user
-  if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') {
-    return false;
-  }
 
-  for (var key in obj) {
-    if (!accessor.hasOwnProperty(key)) {
-      continue;
+var Subscriber = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(Subscriber, _super);
+    function Subscriber(destination) {
+        var _this = _super.call(this) || this;
+        _this.isStopped = false;
+        if (destination) {
+            _this.destination = destination;
+            if (Object(_Subscription__WEBPACK_IMPORTED_MODULE_2__[/* isSubscription */ "c"])(destination)) {
+                destination.add(_this);
+            }
+        }
+        else {
+            _this.destination = EMPTY_OBSERVER;
+        }
+        return _this;
     }
+    Subscriber.create = function (next, error, complete) {
+        return new SafeSubscriber(next, error, complete);
+    };
+    Subscriber.prototype.next = function (value) {
+        if (this.isStopped) {
+            handleStoppedNotification(Object(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__[/* nextNotification */ "c"])(value), this);
+        }
+        else {
+            this._next(value);
+        }
+    };
+    Subscriber.prototype.error = function (err) {
+        if (this.isStopped) {
+            handleStoppedNotification(Object(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__[/* errorNotification */ "b"])(err), this);
+        }
+        else {
+            this.isStopped = true;
+            this._error(err);
+        }
+    };
+    Subscriber.prototype.complete = function () {
+        if (this.isStopped) {
+            handleStoppedNotification(_NotificationFactories__WEBPACK_IMPORTED_MODULE_6__[/* COMPLETE_NOTIFICATION */ "a"], this);
+        }
+        else {
+            this.isStopped = true;
+            this._complete();
+        }
+    };
+    Subscriber.prototype.unsubscribe = function () {
+        if (!this.closed) {
+            this.isStopped = true;
+            _super.prototype.unsubscribe.call(this);
+            this.destination = null;
+        }
+    };
+    Subscriber.prototype._next = function (value) {
+        this.destination.next(value);
+    };
+    Subscriber.prototype._error = function (err) {
+        try {
+            this.destination.error(err);
+        }
+        finally {
+            this.unsubscribe();
+        }
+    };
+    Subscriber.prototype._complete = function () {
+        try {
+            this.destination.complete();
+        }
+        finally {
+            this.unsubscribe();
+        }
+    };
+    return Subscriber;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]));
 
-    if (typeOf(obj[key]) === accessor[key]) {
-      continue;
+var _bind = Function.prototype.bind;
+function bind(fn, thisArg) {
+    return _bind.call(fn, thisArg);
+}
+var ConsumerObserver = (function () {
+    function ConsumerObserver(partialObserver) {
+        this.partialObserver = partialObserver;
+    }
+    ConsumerObserver.prototype.next = function (value) {
+        var partialObserver = this.partialObserver;
+        if (partialObserver.next) {
+            try {
+                partialObserver.next(value);
+            }
+            catch (error) {
+                handleUnhandledError(error);
+            }
+        }
+    };
+    ConsumerObserver.prototype.error = function (err) {
+        var partialObserver = this.partialObserver;
+        if (partialObserver.error) {
+            try {
+                partialObserver.error(err);
+            }
+            catch (error) {
+                handleUnhandledError(error);
+            }
+        }
+        else {
+            handleUnhandledError(err);
+        }
+    };
+    ConsumerObserver.prototype.complete = function () {
+        var partialObserver = this.partialObserver;
+        if (partialObserver.complete) {
+            try {
+                partialObserver.complete();
+            }
+            catch (error) {
+                handleUnhandledError(error);
+            }
+        }
+    };
+    return ConsumerObserver;
+}());
+var SafeSubscriber = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(SafeSubscriber, _super);
+    function SafeSubscriber(observerOrNext, error, complete) {
+        var _this = _super.call(this) || this;
+        var partialObserver;
+        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(observerOrNext) || !observerOrNext) {
+            partialObserver = {
+                next: observerOrNext !== null && observerOrNext !== void 0 ? observerOrNext : undefined,
+                error: error !== null && error !== void 0 ? error : undefined,
+                complete: complete !== null && complete !== void 0 ? complete : undefined,
+            };
+        }
+        else {
+            var context_1;
+            if (_this && _config__WEBPACK_IMPORTED_MODULE_3__[/* config */ "a"].useDeprecatedNextContext) {
+                context_1 = Object.create(observerOrNext);
+                context_1.unsubscribe = function () { return _this.unsubscribe(); };
+                partialObserver = {
+                    next: observerOrNext.next && bind(observerOrNext.next, context_1),
+                    error: observerOrNext.error && bind(observerOrNext.error, context_1),
+                    complete: observerOrNext.complete && bind(observerOrNext.complete, context_1),
+                };
+            }
+            else {
+                partialObserver = observerOrNext;
+            }
+        }
+        _this.destination = new ConsumerObserver(partialObserver);
+        return _this;
     }
+    return SafeSubscriber;
+}(Subscriber));
 
-    if (typeof obj[key] !== 'undefined') {
-      return false;
+function handleUnhandledError(error) {
+    if (_config__WEBPACK_IMPORTED_MODULE_3__[/* config */ "a"].useDeprecatedSynchronousErrorHandling) {
+        Object(_util_errorContext__WEBPACK_IMPORTED_MODULE_8__[/* captureError */ "a"])(error);
+    }
+    else {
+        Object(_util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_4__[/* reportUnhandledError */ "a"])(error);
     }
-  }
-  return true;
 }
-
-function has(obj, key) {
-  return {}.hasOwnProperty.call(obj, key);
+function defaultErrorHandler(err) {
+    throw err;
 }
-
-/**
- * Expose `isAccessorDescriptor`
- */
-
-module.exports = isAccessorDescriptor;
-
+function handleStoppedNotification(notification, subscriber) {
+    var onStoppedNotification = _config__WEBPACK_IMPORTED_MODULE_3__[/* config */ "a"].onStoppedNotification;
+    onStoppedNotification && _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_7__[/* timeoutProvider */ "a"].setTimeout(function () { return onStoppedNotification(notification, subscriber); });
+}
+var EMPTY_OBSERVER = {
+    closed: true,
+    next: _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"],
+    error: defaultErrorHandler,
+    complete: _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"],
+};
+//# sourceMappingURL=Subscriber.js.map
 
 /***/ }),
-/* 596 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-data-descriptor <https://github.com/jonschlinkert/is-data-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/Subscription.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var typeOf = __webpack_require__(594);
-
-module.exports = function isDataDescriptor(obj, prop) {
-  // data descriptor properties
-  var data = {
-    configurable: 'boolean',
-    enumerable: 'boolean',
-    writable: 'boolean'
-  };
-
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return Subscription; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EMPTY_SUBSCRIPTION; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return isSubscription; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
 
-  if (!('value' in obj) && !('writable' in obj)) {
-    return false;
-  }
 
-  for (var key in obj) {
-    if (key === 'value') continue;
 
-    if (!data.hasOwnProperty(key)) {
-      continue;
+var Subscription = (function () {
+    function Subscription(initialTeardown) {
+        this.initialTeardown = initialTeardown;
+        this.closed = false;
+        this._parentage = null;
+        this._finalizers = null;
     }
+    Subscription.prototype.unsubscribe = function () {
+        var e_1, _a, e_2, _b;
+        var errors;
+        if (!this.closed) {
+            this.closed = true;
+            var _parentage = this._parentage;
+            if (_parentage) {
+                this._parentage = null;
+                if (Array.isArray(_parentage)) {
+                    try {
+                        for (var _parentage_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(_parentage), _parentage_1_1 = _parentage_1.next(); !_parentage_1_1.done; _parentage_1_1 = _parentage_1.next()) {
+                            var parent_1 = _parentage_1_1.value;
+                            parent_1.remove(this);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_parentage_1_1 && !_parentage_1_1.done && (_a = _parentage_1.return)) _a.call(_parentage_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                }
+                else {
+                    _parentage.remove(this);
+                }
+            }
+            var initialFinalizer = this.initialTeardown;
+            if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(initialFinalizer)) {
+                try {
+                    initialFinalizer();
+                }
+                catch (e) {
+                    errors = e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__[/* UnsubscriptionError */ "a"] ? e.errors : [e];
+                }
+            }
+            var _finalizers = this._finalizers;
+            if (_finalizers) {
+                this._finalizers = null;
+                try {
+                    for (var _finalizers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(_finalizers), _finalizers_1_1 = _finalizers_1.next(); !_finalizers_1_1.done; _finalizers_1_1 = _finalizers_1.next()) {
+                        var finalizer = _finalizers_1_1.value;
+                        try {
+                            execFinalizer(finalizer);
+                        }
+                        catch (err) {
+                            errors = errors !== null && errors !== void 0 ? errors : [];
+                            if (err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__[/* UnsubscriptionError */ "a"]) {
+                                errors = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(errors)), Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(err.errors));
+                            }
+                            else {
+                                errors.push(err);
+                            }
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_finalizers_1_1 && !_finalizers_1_1.done && (_b = _finalizers_1.return)) _b.call(_finalizers_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+            if (errors) {
+                throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_2__[/* UnsubscriptionError */ "a"](errors);
+            }
+        }
+    };
+    Subscription.prototype.add = function (teardown) {
+        var _a;
+        if (teardown && teardown !== this) {
+            if (this.closed) {
+                execFinalizer(teardown);
+            }
+            else {
+                if (teardown instanceof Subscription) {
+                    if (teardown.closed || teardown._hasParent(this)) {
+                        return;
+                    }
+                    teardown._addParent(this);
+                }
+                (this._finalizers = (_a = this._finalizers) !== null && _a !== void 0 ? _a : []).push(teardown);
+            }
+        }
+    };
+    Subscription.prototype._hasParent = function (parent) {
+        var _parentage = this._parentage;
+        return _parentage === parent || (Array.isArray(_parentage) && _parentage.includes(parent));
+    };
+    Subscription.prototype._addParent = function (parent) {
+        var _parentage = this._parentage;
+        this._parentage = Array.isArray(_parentage) ? (_parentage.push(parent), _parentage) : _parentage ? [_parentage, parent] : parent;
+    };
+    Subscription.prototype._removeParent = function (parent) {
+        var _parentage = this._parentage;
+        if (_parentage === parent) {
+            this._parentage = null;
+        }
+        else if (Array.isArray(_parentage)) {
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(_parentage, parent);
+        }
+    };
+    Subscription.prototype.remove = function (teardown) {
+        var _finalizers = this._finalizers;
+        _finalizers && Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(_finalizers, teardown);
+        if (teardown instanceof Subscription) {
+            teardown._removeParent(this);
+        }
+    };
+    Subscription.EMPTY = (function () {
+        var empty = new Subscription();
+        empty.closed = true;
+        return empty;
+    })();
+    return Subscription;
+}());
 
-    if (typeOf(obj[key]) === data[key]) {
-      continue;
+var EMPTY_SUBSCRIPTION = Subscription.EMPTY;
+function isSubscription(value) {
+    return (value instanceof Subscription ||
+        (value && 'closed' in value && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(value.remove) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(value.add) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(value.unsubscribe)));
+}
+function execFinalizer(finalizer) {
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(finalizer)) {
+        finalizer();
     }
-
-    if (typeof obj[key] !== 'undefined') {
-      return false;
+    else {
+        finalizer.unsubscribe();
     }
-  }
-  return true;
-};
-
+}
+//# sourceMappingURL=Subscription.js.map
 
 /***/ }),
-/* 597 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/config.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; });
+var config = {
+    onUnhandledError: null,
+    onStoppedNotification: null,
+    Promise: undefined,
+    useDeprecatedSynchronousErrorHandling: false,
+    useDeprecatedNextContext: false,
+};
+//# sourceMappingURL=config.js.map
 
+/***/ }),
 
-var isExtendable = __webpack_require__(598);
-var assignSymbols = __webpack_require__(600);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/firstValueFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return firstValueFrom; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
+
+function firstValueFrom(source, config) {
+    var hasConfig = typeof config === 'object';
+    return new Promise(function (resolve, reject) {
+        var subscriber = new _Subscriber__WEBPACK_IMPORTED_MODULE_1__[/* SafeSubscriber */ "a"]({
+            next: function (value) {
+                resolve(value);
+                subscriber.unsubscribe();
+            },
+            error: reject,
+            complete: function () {
+                if (hasConfig) {
+                    resolve(config.defaultValue);
+                }
+                else {
+                    reject(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]());
+                }
+            },
+        });
+        source.subscribe(subscriber);
+    });
 }
+//# sourceMappingURL=firstValueFrom.js.map
 
-function isString(val) {
-  return (val && typeof val === 'string');
-}
+/***/ }),
 
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/lastValueFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return lastValueFrom; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+
+function lastValueFrom(source, config) {
+    var hasConfig = typeof config === 'object';
+    return new Promise(function (resolve, reject) {
+        var _hasValue = false;
+        var _value;
+        source.subscribe({
+            next: function (value) {
+                _value = value;
+                _hasValue = true;
+            },
+            error: reject,
+            complete: function () {
+                if (_hasValue) {
+                    resolve(_value);
+                }
+                else if (hasConfig) {
+                    resolve(config.defaultValue);
+                }
+                else {
+                    reject(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]());
+                }
+            },
+        });
+    });
 }
+//# sourceMappingURL=lastValueFrom.js.map
 
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
+/***/ }),
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ConnectableObservable; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
 
-/***/ }),
-/* 598 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
 
 
 
-var isPlainObject = __webpack_require__(599);
+var ConnectableObservable = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(ConnectableObservable, _super);
+    function ConnectableObservable(source, subjectFactory) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.subjectFactory = subjectFactory;
+        _this._subject = null;
+        _this._refCount = 0;
+        _this._connection = null;
+        if (Object(_util_lift__WEBPACK_IMPORTED_MODULE_5__[/* hasLift */ "a"])(source)) {
+            _this.lift = source.lift;
+        }
+        return _this;
+    }
+    ConnectableObservable.prototype._subscribe = function (subscriber) {
+        return this.getSubject().subscribe(subscriber);
+    };
+    ConnectableObservable.prototype.getSubject = function () {
+        var subject = this._subject;
+        if (!subject || subject.isStopped) {
+            this._subject = this.subjectFactory();
+        }
+        return this._subject;
+    };
+    ConnectableObservable.prototype._teardown = function () {
+        this._refCount = 0;
+        var _connection = this._connection;
+        this._subject = this._connection = null;
+        _connection === null || _connection === void 0 ? void 0 : _connection.unsubscribe();
+    };
+    ConnectableObservable.prototype.connect = function () {
+        var _this = this;
+        var connection = this._connection;
+        if (!connection) {
+            connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]();
+            var subject_1 = this.getSubject();
+            connection.add(this.source.subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subject_1, undefined, function () {
+                _this._teardown();
+                subject_1.complete();
+            }, function (err) {
+                _this._teardown();
+                subject_1.error(err);
+            }, function () { return _this._teardown(); })));
+            if (connection.closed) {
+                this._connection = null;
+                connection = _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"].EMPTY;
+            }
+        }
+        return connection;
+    };
+    ConnectableObservable.prototype.refCount = function () {
+        return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_3__[/* refCount */ "a"])()(this);
+    };
+    return ConnectableObservable;
+}(_Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"]));
+
+//# sourceMappingURL=ConnectableObservable.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/bindCallback.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bindCallback; });
+/* harmony import */ var _bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindCallbackInternals.js");
 
+function bindCallback(callbackFunc, resultSelector, scheduler) {
+    return Object(_bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__[/* bindCallbackInternals */ "a"])(false, callbackFunc, resultSelector, scheduler);
+}
+//# sourceMappingURL=bindCallback.js.map
 
 /***/ }),
-/* 599 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/bindCallbackInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bindCallbackInternals; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js");
 
 
 
-var isObject = __webpack_require__(592);
 
-function isObjectObject(o) {
-  return isObject(o) === true
-    && Object.prototype.toString.call(o) === '[object Object]';
-}
 
-module.exports = function isPlainObject(o) {
-  var ctor,prot;
 
-  if (isObjectObject(o) === false) return false;
 
-  // If has modified constructor
-  ctor = o.constructor;
-  if (typeof ctor !== 'function') return false;
+function bindCallbackInternals(isNodeStyle, callbackFunc, resultSelector, scheduler) {
+    if (resultSelector) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__[/* isScheduler */ "a"])(resultSelector)) {
+            scheduler = resultSelector;
+        }
+        else {
+            return function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return bindCallbackInternals(isNodeStyle, callbackFunc, scheduler)
+                    .apply(this, args)
+                    .pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__[/* mapOneOrManyArgs */ "a"])(resultSelector));
+            };
+        }
+    }
+    if (scheduler) {
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return bindCallbackInternals(isNodeStyle, callbackFunc)
+                .apply(this, args)
+                .pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_3__[/* subscribeOn */ "a"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_5__[/* observeOn */ "a"])(scheduler));
+        };
+    }
+    return function () {
+        var _this = this;
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_6__[/* AsyncSubject */ "a"]();
+        var uninitialized = true;
+        return new _Observable__WEBPACK_IMPORTED_MODULE_2__[/* Observable */ "a"](function (subscriber) {
+            var subs = subject.subscribe(subscriber);
+            if (uninitialized) {
+                uninitialized = false;
+                var isAsync_1 = false;
+                var isComplete_1 = false;
+                callbackFunc.apply(_this, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)), [
+                    function () {
+                        var results = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            results[_i] = arguments[_i];
+                        }
+                        if (isNodeStyle) {
+                            var err = results.shift();
+                            if (err != null) {
+                                subject.error(err);
+                                return;
+                            }
+                        }
+                        subject.next(1 < results.length ? results : results[0]);
+                        isComplete_1 = true;
+                        if (isAsync_1) {
+                            subject.complete();
+                        }
+                    },
+                ]));
+                if (isComplete_1) {
+                    subject.complete();
+                }
+                isAsync_1 = true;
+            }
+            return subs;
+        });
+    };
+}
+//# sourceMappingURL=bindCallbackInternals.js.map
 
-  // If has modified prototype
-  prot = ctor.prototype;
-  if (isObjectObject(prot) === false) return false;
+/***/ }),
 
-  // If constructor does not have an Object-specific method
-  if (prot.hasOwnProperty('isPrototypeOf') === false) {
-    return false;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/bindNodeCallback.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // Most likely a plain Object
-  return true;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bindNodeCallback; });
+/* harmony import */ var _bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/bindCallbackInternals.js");
 
+function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
+    return Object(_bindCallbackInternals__WEBPACK_IMPORTED_MODULE_0__[/* bindCallbackInternals */ "a"])(true, callbackFunc, resultSelector, scheduler);
+}
+//# sourceMappingURL=bindNodeCallback.js.map
 
 /***/ }),
-/* 600 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * assign-symbols <https://github.com/jonschlinkert/assign-symbols>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatest; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return combineLatestInit; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsArgArrayOrObject.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_createObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createObject.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
 
 
-module.exports = function(receiver, objects) {
-  if (receiver === null || typeof receiver === 'undefined') {
-    throw new TypeError('expected first argument to be an object.');
-  }
 
-  if (typeof objects === 'undefined' || typeof Symbol === 'undefined') {
-    return receiver;
-  }
 
-  if (typeof Object.getOwnPropertySymbols !== 'function') {
-    return receiver;
-  }
 
-  var isEnumerable = Object.prototype.propertyIsEnumerable;
-  var target = Object(receiver);
-  var len = arguments.length, i = 0;
 
-  while (++i < len) {
-    var provider = Object(arguments[i]);
-    var names = Object.getOwnPropertySymbols(provider);
 
-    for (var j = 0; j < names.length; j++) {
-      var key = names[j];
 
-      if (isEnumerable.call(provider, key)) {
-        target[key] = provider[key];
-      }
+function combineLatest() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
-  }
-  return target;
-};
-
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_5__[/* popScheduler */ "c"])(args);
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_5__[/* popResultSelector */ "b"])(args);
+    var _a = Object(_util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__[/* argsArgArrayOrObject */ "a"])(args), observables = _a.args, keys = _a.keys;
+    if (observables.length === 0) {
+        return Object(_from__WEBPACK_IMPORTED_MODULE_2__[/* from */ "a"])([], scheduler);
+    }
+    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](combineLatestInit(observables, scheduler, keys
+        ?
+            function (values) { return Object(_util_createObject__WEBPACK_IMPORTED_MODULE_6__[/* createObject */ "a"])(keys, values); }
+        :
+            _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"]));
+    return resultSelector ? result.pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__[/* mapOneOrManyArgs */ "a"])(resultSelector)) : result;
+}
+function combineLatestInit(observables, scheduler, valueTransform) {
+    if (valueTransform === void 0) { valueTransform = _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"]; }
+    return function (subscriber) {
+        maybeSchedule(scheduler, function () {
+            var length = observables.length;
+            var values = new Array(length);
+            var active = length;
+            var remainingFirstValues = length;
+            var _loop_1 = function (i) {
+                maybeSchedule(scheduler, function () {
+                    var source = Object(_from__WEBPACK_IMPORTED_MODULE_2__[/* from */ "a"])(observables[i], scheduler);
+                    var hasFirstValue = false;
+                    source.subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_7__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                        values[i] = value;
+                        if (!hasFirstValue) {
+                            hasFirstValue = true;
+                            remainingFirstValues--;
+                        }
+                        if (!remainingFirstValues) {
+                            subscriber.next(valueTransform(values.slice()));
+                        }
+                    }, function () {
+                        if (!--active) {
+                            subscriber.complete();
+                        }
+                    }));
+                }, subscriber);
+            };
+            for (var i = 0; i < length; i++) {
+                _loop_1(i);
+            }
+        }, subscriber);
+    };
+}
+function maybeSchedule(scheduler, execute, subscription) {
+    if (scheduler) {
+        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_8__[/* executeSchedule */ "a"])(subscription, scheduler, execute);
+    }
+    else {
+        execute();
+    }
+}
+//# sourceMappingURL=combineLatest.js.map
 
 /***/ }),
-/* 601 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/concat.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concat; });
+/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
-var extend = __webpack_require__(602);
-var safe = __webpack_require__(585);
 
-/**
- * The main export is a function that takes a `pattern` string and an `options` object.
- *
- * ```js
- & var not = require('regex-not');
- & console.log(not('foo'));
- & //=> /^(?:(?!^(?:foo)$).)*$/
- * ```
- *
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {RegExp} Converts the given `pattern` to a regex using the specified `options`.
- * @api public
- */
 
-function toRegex(pattern, options) {
-  return new RegExp(toRegex.create(pattern, options));
+function concat() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_0__[/* concatAll */ "a"])()(Object(_from__WEBPACK_IMPORTED_MODULE_2__[/* from */ "a"])(args, Object(_util_args__WEBPACK_IMPORTED_MODULE_1__[/* popScheduler */ "c"])(args)));
 }
+//# sourceMappingURL=concat.js.map
 
-/**
- * Create a regex-compatible string from the given `pattern` and `options`.
- *
- * ```js
- & var not = require('regex-not');
- & console.log(not.create('foo'));
- & //=> '^(?:(?!^(?:foo)$).)*$'
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-toRegex.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
-  }
+/***/ }),
 
-  var opts = extend({}, options);
-  if (opts.contains === true) {
-    opts.strictNegate = false;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/connectable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var open = opts.strictOpen !== false ? '^' : '';
-  var close = opts.strictClose !== false ? '$' : '';
-  var endChar = opts.endChar ? opts.endChar : '+';
-  var str = pattern;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return connectable; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
 
-  if (opts.strictNegate === false) {
-    str = '(?:(?!(?:' + pattern + ')).)' + endChar;
-  } else {
-    str = '(?:(?!^(?:' + pattern + ')$).)' + endChar;
-  }
 
-  var res = open + str + close;
-  if (opts.safe === true && safe(res) === false) {
-    throw new Error('potentially unsafe regular expression: ' + res);
-  }
 
-  return res;
+var DEFAULT_CONFIG = {
+    connector: function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"](); },
+    resetOnDisconnect: true,
 };
+function connectable(source, config) {
+    if (config === void 0) { config = DEFAULT_CONFIG; }
+    var connection = null;
+    var connector = config.connector, _a = config.resetOnDisconnect, resetOnDisconnect = _a === void 0 ? true : _a;
+    var subject = connector();
+    var result = new _Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"](function (subscriber) {
+        return subject.subscribe(subscriber);
+    });
+    result.connect = function () {
+        if (!connection || connection.closed) {
+            connection = Object(_defer__WEBPACK_IMPORTED_MODULE_2__[/* defer */ "a"])(function () { return source; }).subscribe(subject);
+            if (resetOnDisconnect) {
+                connection.add(function () { return (subject = connector()); });
+            }
+        }
+        return connection;
+    };
+    return result;
+}
+//# sourceMappingURL=connectable.js.map
 
-/**
- * Expose `toRegex`
- */
+/***/ }),
 
-module.exports = toRegex;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/defer.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defer; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
 
+function defer(observableFactory) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(observableFactory()).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=defer.js.map
+
 /***/ }),
-/* 602 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/dom/animationFrames.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrames; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _scheduler_performanceTimestampProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/performanceTimestampProvider.js");
+/* harmony import */ var _scheduler_animationFrameProvider__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrameProvider.js");
 
 
-var isExtendable = __webpack_require__(603);
-var assignSymbols = __webpack_require__(600);
 
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
+function animationFrames(timestampProvider) {
+    return timestampProvider ? animationFramesFactory(timestampProvider) : DEFAULT_ANIMATION_FRAMES;
 }
-
-function isString(val) {
-  return (val && typeof val === 'string');
+function animationFramesFactory(timestampProvider) {
+    var schedule = _scheduler_animationFrameProvider__WEBPACK_IMPORTED_MODULE_3__[/* animationFrameProvider */ "a"].schedule;
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]();
+        var provider = timestampProvider || _scheduler_performanceTimestampProvider__WEBPACK_IMPORTED_MODULE_2__[/* performanceTimestampProvider */ "a"];
+        var start = provider.now();
+        var run = function (timestamp) {
+            var now = provider.now();
+            subscriber.next({
+                timestamp: timestampProvider ? now : timestamp,
+                elapsed: now - start,
+            });
+            if (!subscriber.closed) {
+                subscription.add(schedule(run));
+            }
+        };
+        subscription.add(schedule(run));
+        return subscription;
+    });
 }
+var DEFAULT_ANIMATION_FRAMES = animationFramesFactory();
+//# sourceMappingURL=animationFrames.js.map
 
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
+/***/ }),
 
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/empty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EMPTY; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return empty; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
+var EMPTY = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) { return subscriber.complete(); });
+function empty(scheduler) {
+    return scheduler ? emptyScheduled(scheduler) : EMPTY;
 }
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
+function emptyScheduled(scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
 }
-
+//# sourceMappingURL=empty.js.map
 
 /***/ }),
-/* 603 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/forkJoin.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return forkJoin; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsArgArrayOrObject.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_createObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createObject.js");
 
 
 
-var isPlainObject = __webpack_require__(599);
 
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
 
 
+
+function forkJoin() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popResultSelector */ "b"])(args);
+    var _a = Object(_util_argsArgArrayOrObject__WEBPACK_IMPORTED_MODULE_1__[/* argsArgArrayOrObject */ "a"])(args), sources = _a.args, keys = _a.keys;
+    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var length = sources.length;
+        if (!length) {
+            subscriber.complete();
+            return;
+        }
+        var values = new Array(length);
+        var remainingCompletions = length;
+        var remainingEmissions = length;
+        var _loop_1 = function (sourceIndex) {
+            var hasValue = false;
+            Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(sources[sourceIndex]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                if (!hasValue) {
+                    hasValue = true;
+                    remainingEmissions--;
+                }
+                values[sourceIndex] = value;
+            }, function () { return remainingCompletions--; }, undefined, function () {
+                if (!remainingCompletions || !hasValue) {
+                    if (!remainingEmissions) {
+                        subscriber.next(keys ? Object(_util_createObject__WEBPACK_IMPORTED_MODULE_6__[/* createObject */ "a"])(keys, values) : values);
+                    }
+                    subscriber.complete();
+                }
+            }));
+        };
+        for (var sourceIndex = 0; sourceIndex < length; sourceIndex++) {
+            _loop_1(sourceIndex);
+        }
+    });
+    return resultSelector ? result.pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_5__[/* mapOneOrManyArgs */ "a"])(resultSelector)) : result;
+}
+//# sourceMappingURL=forkJoin.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/from.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return from; });
+/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduled.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+
+
+function from(input, scheduler) {
+    return scheduler ? Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_0__[/* scheduled */ "a"])(input, scheduler) : Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(input);
+}
+//# sourceMappingURL=from.js.map
+
 /***/ }),
-/* 604 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * array-unique <https://github.com/jonschlinkert/array-unique>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromEvent; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _operators_mergeMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
 
 
 
-module.exports = function unique(arr) {
-  if (!Array.isArray(arr)) {
-    throw new TypeError('array-unique expects an array.');
-  }
 
-  var len = arr.length;
-  var i = -1;
 
-  while (i++ < len) {
-    var j = i + 1;
 
-    for (; j < arr.length; ++j) {
-      if (arr[i] === arr[j]) {
-        arr.splice(j--, 1);
-      }
+
+var nodeEventEmitterMethods = ['addListener', 'removeListener'];
+var eventTargetMethods = ['addEventListener', 'removeEventListener'];
+var jqueryMethods = ['on', 'off'];
+function fromEvent(target, eventName, options, resultSelector) {
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(options)) {
+        resultSelector = options;
+        options = undefined;
     }
-  }
-  return arr;
-};
+    if (resultSelector) {
+        return fromEvent(target, eventName, options).pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_6__[/* mapOneOrManyArgs */ "a"])(resultSelector));
+    }
+    var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(isEventTarget(target)
+        ? eventTargetMethods.map(function (methodName) { return function (handler) { return target[methodName](eventName, handler, options); }; })
+        :
+            isNodeStyleEventEmitter(target)
+                ? nodeEventEmitterMethods.map(toCommonHandlerRegistry(target, eventName))
+                : isJQueryStyleEventEmitter(target)
+                    ? jqueryMethods.map(toCommonHandlerRegistry(target, eventName))
+                    : [], 2), add = _a[0], remove = _a[1];
+    if (!add) {
+        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_4__[/* isArrayLike */ "a"])(target)) {
+            return Object(_operators_mergeMap__WEBPACK_IMPORTED_MODULE_3__[/* mergeMap */ "a"])(function (subTarget) { return fromEvent(subTarget, eventName, options); })(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(target));
+        }
+    }
+    if (!add) {
+        throw new TypeError('Invalid event target');
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_2__[/* Observable */ "a"](function (subscriber) {
+        var handler = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return subscriber.next(1 < args.length ? args : args[0]);
+        };
+        add(handler);
+        return function () { return remove(handler); };
+    });
+}
+function toCommonHandlerRegistry(target, eventName) {
+    return function (methodName) { return function (handler) { return target[methodName](eventName, handler); }; };
+}
+function isNodeStyleEventEmitter(target) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.addListener) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.removeListener);
+}
+function isJQueryStyleEventEmitter(target) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.on) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.off);
+}
+function isEventTarget(target) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.addEventListener) && Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_5__[/* isFunction */ "a"])(target.removeEventListener);
+}
+//# sourceMappingURL=fromEvent.js.map
 
-module.exports.immutable = function uniqueImmutable(arr) {
-  if (!Array.isArray(arr)) {
-    throw new TypeError('array-unique expects an array.');
-  }
+/***/ }),
 
-  var arrLen = arr.length;
-  var newArr = new Array(arrLen);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/fromEventPattern.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  for (var i = 0; i < arrLen; i++) {
-    newArr[i] = arr[i];
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromEventPattern; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
 
-  return module.exports(newArr);
-};
 
 
+function fromEventPattern(addHandler, removeHandler, resultSelector) {
+    if (resultSelector) {
+        return fromEventPattern(addHandler, removeHandler).pipe(Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_2__[/* mapOneOrManyArgs */ "a"])(resultSelector));
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var handler = function () {
+            var e = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                e[_i] = arguments[_i];
+            }
+            return subscriber.next(e.length === 1 ? e[0] : e);
+        };
+        var retValue = addHandler(handler);
+        return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(removeHandler) ? function () { return removeHandler(handler, retValue); } : undefined;
+    });
+}
+//# sourceMappingURL=fromEventPattern.js.map
+
 /***/ }),
-/* 605 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/fromSubscribable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromSubscribable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
 
+function fromSubscribable(subscribable) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) { return subscribable.subscribe(subscriber); });
+}
+//# sourceMappingURL=fromSubscribable.js.map
 
-var isObject = __webpack_require__(606);
+/***/ }),
 
-module.exports = function extend(o/*, objects*/) {
-  if (!isObject(o)) { o = {}; }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/generate.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var len = arguments.length;
-  for (var i = 1; i < len; i++) {
-    var obj = arguments[i];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return generate; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
+/* harmony import */ var _scheduled_scheduleIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleIterable.js");
 
-    if (isObject(obj)) {
-      assign(o, obj);
-    }
-  }
-  return o;
-};
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
-  }
-}
 
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
+
+function generate(initialStateOrOptions, condition, iterate, resultSelectorOrScheduler, scheduler) {
+    var _a, _b;
+    var resultSelector;
+    var initialState;
+    if (arguments.length === 1) {
+        (_a = initialStateOrOptions, initialState = _a.initialState, condition = _a.condition, iterate = _a.iterate, _b = _a.resultSelector, resultSelector = _b === void 0 ? _util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"] : _b, scheduler = _a.scheduler);
+    }
+    else {
+        initialState = initialStateOrOptions;
+        if (!resultSelectorOrScheduler || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__[/* isScheduler */ "a"])(resultSelectorOrScheduler)) {
+            resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"];
+            scheduler = resultSelectorOrScheduler;
+        }
+        else {
+            resultSelector = resultSelectorOrScheduler;
+        }
+    }
+    function gen() {
+        var state;
+        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __generator */ "f"])(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    state = initialState;
+                    _a.label = 1;
+                case 1:
+                    if (!(!condition || condition(state))) return [3, 4];
+                    return [4, resultSelector(state)];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    state = iterate(state);
+                    return [3, 1];
+                case 4: return [2];
+            }
+        });
+    }
+    return Object(_defer__WEBPACK_IMPORTED_MODULE_3__[/* defer */ "a"])((scheduler
+        ?
+            function () { return Object(_scheduled_scheduleIterable__WEBPACK_IMPORTED_MODULE_4__[/* scheduleIterable */ "a"])(gen(), scheduler); }
+        :
+            gen));
 }
-
+//# sourceMappingURL=generate.js.map
 
 /***/ }),
-/* 606 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/iif.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iif; });
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/defer.js");
 
+function iif(condition, trueResult, falseResult) {
+    return Object(_defer__WEBPACK_IMPORTED_MODULE_0__[/* defer */ "a"])(function () { return (condition() ? trueResult : falseResult); });
+}
+//# sourceMappingURL=iif.js.map
 
 /***/ }),
-/* 607 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return innerFrom; });
+/* unused harmony export fromInteropObservable */
+/* unused harmony export fromArrayLike */
+/* unused harmony export fromPromise */
+/* unused harmony export fromIterable */
+/* unused harmony export fromAsyncIterable */
+/* unused harmony export fromReadableStreamLike */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js");
+/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isPromise.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js");
+/* harmony import */ var _util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js");
+/* harmony import */ var _util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js");
+/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isIterable.js");
+/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js");
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
 
 
-var utils = __webpack_require__(608);
 
-module.exports = function(braces, options) {
-  braces.compiler
 
-    /**
-     * bos
-     */
 
-    .set('bos', function() {
-      if (this.output) return;
-      this.ast.queue = isEscaped(this.ast) ? [this.ast.val] : [];
-      this.ast.count = 1;
-    })
 
-    /**
-     * Square brackets
-     */
 
-    .set('bracket', function(node) {
-      var close = node.close;
-      var open = !node.escaped ? '[' : '\\[';
-      var negated = node.negated;
-      var inner = node.inner;
 
-      inner = inner.replace(/\\(?=[\\\w]|$)/g, '\\\\');
-      if (inner === ']-') {
-        inner = '\\]\\-';
-      }
 
-      if (negated && inner.indexOf('.') === -1) {
-        inner += '.';
-      }
-      if (negated && inner.indexOf('/') === -1) {
-        inner += '/';
-      }
 
-      var val = open + negated + inner + close;
-      var queue = node.parent.queue;
-      var last = utils.arrayify(queue.pop());
 
-      queue.push(utils.join(last, val));
-      queue.push.apply(queue, []);
-    })
 
-    /**
-     * Brace
-     */
+function innerFrom(input) {
+    if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"]) {
+        return input;
+    }
+    if (input != null) {
+        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__[/* isInteropObservable */ "a"])(input)) {
+            return fromInteropObservable(input);
+        }
+        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_1__[/* isArrayLike */ "a"])(input)) {
+            return fromArrayLike(input);
+        }
+        if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_2__[/* isPromise */ "a"])(input)) {
+            return fromPromise(input);
+        }
+        if (Object(_util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_5__[/* isAsyncIterable */ "a"])(input)) {
+            return fromAsyncIterable(input);
+        }
+        if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__[/* isIterable */ "a"])(input)) {
+            return fromIterable(input);
+        }
+        if (Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__[/* isReadableStreamLike */ "a"])(input)) {
+            return fromReadableStreamLike(input);
+        }
+    }
+    throw Object(_util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_6__[/* createInvalidObservableTypeError */ "a"])(input);
+}
+function fromInteropObservable(obj) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_11__[/* observable */ "a"]]();
+        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_9__[/* isFunction */ "a"])(obs.subscribe)) {
+            return obs.subscribe(subscriber);
+        }
+        throw new TypeError('Provided object does not correctly implement Symbol.observable');
+    });
+}
+function fromArrayLike(array) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        for (var i = 0; i < array.length && !subscriber.closed; i++) {
+            subscriber.next(array[i]);
+        }
+        subscriber.complete();
+    });
+}
+function fromPromise(promise) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        promise
+            .then(function (value) {
+            if (!subscriber.closed) {
+                subscriber.next(value);
+                subscriber.complete();
+            }
+        }, function (err) { return subscriber.error(err); })
+            .then(null, _util_reportUnhandledError__WEBPACK_IMPORTED_MODULE_10__[/* reportUnhandledError */ "a"]);
+    });
+}
+function fromIterable(iterable) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        var e_1, _a;
+        try {
+            for (var iterable_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(iterable), iterable_1_1 = iterable_1.next(); !iterable_1_1.done; iterable_1_1 = iterable_1.next()) {
+                var value = iterable_1_1.value;
+                subscriber.next(value);
+                if (subscriber.closed) {
+                    return;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (iterable_1_1 && !iterable_1_1.done && (_a = iterable_1.return)) _a.call(iterable_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        subscriber.complete();
+    });
+}
+function fromAsyncIterable(asyncIterable) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_3__[/* Observable */ "a"](function (subscriber) {
+        process(asyncIterable, subscriber).catch(function (err) { return subscriber.error(err); });
+    });
+}
+function fromReadableStreamLike(readableStream) {
+    return fromAsyncIterable(Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_8__[/* readableStreamLikeToAsyncGenerator */ "b"])(readableStream));
+}
+function process(asyncIterable, subscriber) {
+    var asyncIterable_1, asyncIterable_1_1;
+    var e_2, _a;
+    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "d"])(this, void 0, void 0, function () {
+        var value, e_2_1;
+        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __generator */ "f"])(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 5, 6, 11]);
+                    asyncIterable_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __asyncValues */ "b"])(asyncIterable);
+                    _b.label = 1;
+                case 1: return [4, asyncIterable_1.next()];
+                case 2:
+                    if (!(asyncIterable_1_1 = _b.sent(), !asyncIterable_1_1.done)) return [3, 4];
+                    value = asyncIterable_1_1.value;
+                    subscriber.next(value);
+                    if (subscriber.closed) {
+                        return [2];
+                    }
+                    _b.label = 3;
+                case 3: return [3, 1];
+                case 4: return [3, 11];
+                case 5:
+                    e_2_1 = _b.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3, 11];
+                case 6:
+                    _b.trys.push([6, , 9, 10]);
+                    if (!(asyncIterable_1_1 && !asyncIterable_1_1.done && (_a = asyncIterable_1.return))) return [3, 8];
+                    return [4, _a.call(asyncIterable_1)];
+                case 7:
+                    _b.sent();
+                    _b.label = 8;
+                case 8: return [3, 10];
+                case 9:
+                    if (e_2) throw e_2.error;
+                    return [7];
+                case 10: return [7];
+                case 11:
+                    subscriber.complete();
+                    return [2];
+            }
+        });
+    });
+}
+//# sourceMappingURL=innerFrom.js.map
 
-    .set('brace', function(node) {
-      node.queue = isEscaped(node) ? [node.val] : [];
-      node.count = 1;
-      return this.mapVisit(node.nodes);
-    })
+/***/ }),
 
-    /**
-     * Open
-     */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/interval.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    .set('brace.open', function(node) {
-      node.parent.open = node.val;
-    })
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return interval; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _timer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-    /**
-     * Inner
-     */
 
-    .set('text', function(node) {
-      var queue = node.parent.queue;
-      var escaped = node.escaped;
-      var segs = [node.val];
+function interval(period, scheduler) {
+    if (period === void 0) { period = 0; }
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    if (period < 0) {
+        period = 0;
+    }
+    return Object(_timer__WEBPACK_IMPORTED_MODULE_1__[/* timer */ "a"])(period, period, scheduler);
+}
+//# sourceMappingURL=interval.js.map
 
-      if (node.optimize === false) {
-        options = utils.extend({}, options, {optimize: false});
-      }
+/***/ }),
 
-      if (node.multiplier > 1) {
-        node.parent.count *= node.multiplier;
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/merge.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      if (options.quantifiers === true && utils.isQuantifier(node.val)) {
-        escaped = true;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return merge; });
+/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
-      } else if (node.val.length > 1) {
-        if (isType(node.parent, 'brace') && !isEscaped(node)) {
-          var expanded = utils.expand(node.val, options);
-          segs = expanded.segs;
 
-          if (expanded.isOptimized) {
-            node.parent.isOptimized = true;
-          }
 
-          // if nothing was expanded, we probably have a literal brace
-          if (!segs.length) {
-            var val = (expanded.val || node.val);
-            if (options.unescape !== false) {
-              // unescape unexpanded brace sequence/set separators
-              val = val.replace(/\\([,.])/g, '$1');
-              // strip quotes
-              val = val.replace(/["'`]/g, '');
-            }
 
-            segs = [val];
-            escaped = true;
-          }
-        }
 
-      } else if (node.val === ',') {
-        if (options.expand) {
-          node.parent.queue.push(['']);
-          segs = [''];
-        } else {
-          segs = ['|'];
-        }
-      } else {
-        escaped = true;
-      }
+function merge() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popScheduler */ "c"])(args);
+    var concurrent = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popNumber */ "a"])(args, Infinity);
+    var sources = args;
+    return !sources.length
+        ?
+            _empty__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY */ "a"]
+        : sources.length === 1
+            ?
+                Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(sources[0])
+            :
+                Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_0__[/* mergeAll */ "a"])(concurrent)(Object(_from__WEBPACK_IMPORTED_MODULE_4__[/* from */ "a"])(sources, scheduler));
+}
+//# sourceMappingURL=merge.js.map
 
-      if (escaped && isType(node.parent, 'brace')) {
-        if (node.parent.nodes.length <= 4 && node.parent.count === 1) {
-          node.parent.escaped = true;
-        } else if (node.parent.length <= 3) {
-          node.parent.escaped = true;
-        }
-      }
+/***/ }),
 
-      if (!hasQueue(node.parent)) {
-        node.parent.queue = segs;
-        return;
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/never.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      var last = utils.arrayify(queue.pop());
-      if (node.parent.count > 1 && options.expand) {
-        last = multiply(last, node.parent.count);
-        node.parent.count = 1;
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return NEVER; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return never; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-      queue.push(utils.join(utils.flatten(last), segs.shift()));
-      queue.push.apply(queue, segs);
-    })
 
-    /**
-     * Close
-     */
+var NEVER = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](_util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]);
+function never() {
+    return NEVER;
+}
+//# sourceMappingURL=never.js.map
 
-    .set('brace.close', function(node) {
-      var queue = node.parent.queue;
-      var prev = node.parent.parent;
-      var last = prev.queue.pop();
-      var open = node.parent.open;
-      var close = node.val;
+/***/ }),
 
-      if (open && close && isOptimized(node, options)) {
-        open = '(';
-        close = ')';
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/of.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      // if a close brace exists, and the previous segment is one character
-      // don't wrap the result in braces or parens
-      var ele = utils.last(queue);
-      if (node.parent.count > 1 && options.expand) {
-        ele = multiply(queue.pop(), node.parent.count);
-        node.parent.count = 1;
-        queue.push(ele);
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return of; });
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
-      if (close && typeof ele === 'string' && ele.length === 1) {
-        open = '';
-        close = '';
-      }
 
-      if ((isLiteralBrace(node, options) || noInner(node)) && !node.parent.hasEmpty) {
-        queue.push(utils.join(open, queue.pop() || ''));
-        queue = utils.flatten(utils.join(queue, close));
-      }
+function of() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_0__[/* popScheduler */ "c"])(args);
+    return Object(_from__WEBPACK_IMPORTED_MODULE_1__[/* from */ "a"])(args, scheduler);
+}
+//# sourceMappingURL=of.js.map
 
-      if (typeof last === 'undefined') {
-        prev.queue = [queue];
-      } else {
-        prev.queue.push(utils.flatten(utils.join(last, queue)));
-      }
-    })
+/***/ }),
 
-    /**
-     * eos
-     */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/onErrorResumeNext.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    .set('eos', function(node) {
-      if (this.input) return;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return onErrorResumeNext; });
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/onErrorResumeNext.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
 
-      if (options.optimize !== false) {
-        this.output = utils.last(utils.flatten(this.ast.queue));
-      } else if (Array.isArray(utils.last(this.ast.queue))) {
-        this.output = utils.flatten(this.ast.queue.pop());
-      } else {
-        this.output = utils.flatten(this.ast.queue);
-      }
 
-      if (node.parent.count > 1 && options.expand) {
-        this.output = multiply(this.output, node.parent.count);
-      }
 
-      this.output = utils.arrayify(this.output);
-      this.ast.queue = [];
-    });
+function onErrorResumeNext() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    return Object(_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_1__[/* onErrorResumeNext */ "a"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__[/* argsOrArgArray */ "a"])(sources))(_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]);
+}
+//# sourceMappingURL=onErrorResumeNext.js.map
 
-};
+/***/ }),
 
-/**
- * Multiply the segments in the current brace level
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/pairs.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function multiply(queue, n, options) {
-  return utils.flatten(utils.repeat(utils.arrayify(queue), n));
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pairs; });
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+
+function pairs(obj, scheduler) {
+    return Object(_from__WEBPACK_IMPORTED_MODULE_0__[/* from */ "a"])(Object.entries(obj), scheduler);
 }
+//# sourceMappingURL=pairs.js.map
 
-/**
- * Return true if `node` is escaped
- */
+/***/ }),
 
-function isEscaped(node) {
-  return node.escaped === true;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/partition.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Returns true if regex parens should be used for sets. If the parent `type`
- * is not `brace`, then we're on a root node, which means we should never
- * expand segments and open/close braces should be `{}` (since this indicates
- * a brace is missing from the set)
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return partition; });
+/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/not.js");
+/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-function isOptimized(node, options) {
-  if (node.parent.isOptimized) return true;
-  return isType(node.parent, 'brace')
-    && !isEscaped(node.parent)
-    && options.expand !== true;
-}
 
-/**
- * Returns true if the value in `node` should be wrapped in a literal brace.
- * @return {Boolean}
- */
 
-function isLiteralBrace(node, options) {
-  return isEscaped(node.parent) || options.optimize !== false;
+function partition(source, predicate, thisArg) {
+    return [Object(_operators_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(predicate, thisArg)(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(source)), Object(_operators_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__[/* not */ "a"])(predicate, thisArg))(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(source))];
 }
+//# sourceMappingURL=partition.js.map
 
-/**
- * Returns true if the given `node` does not have an inner value.
- * @return {Boolean}
- */
+/***/ }),
 
-function noInner(node, type) {
-  if (node.parent.queue.length === 1) {
-    return true;
-  }
-  var nodes = node.parent.nodes;
-  return nodes.length === 3
-    && isType(nodes[0], 'brace.open')
-    && !isType(nodes[1], 'text')
-    && isType(nodes[2], 'brace.close');
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/race.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Returns true if the given `node` is the given `type`
- * @return {Boolean}
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return race; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return raceInit; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function isType(node, type) {
-  return typeof node !== 'undefined' && node.type === type;
-}
 
-/**
- * Returns true if the given `node` has a non-empty queue.
- * @return {Boolean}
- */
 
-function hasQueue(node) {
-  return Array.isArray(node.queue) && node.queue.length;
-}
 
+function race() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    sources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__[/* argsOrArgArray */ "a"])(sources);
+    return sources.length === 1 ? Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(sources[0]) : new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](raceInit(sources));
+}
+function raceInit(sources) {
+    return function (subscriber) {
+        var subscriptions = [];
+        var _loop_1 = function (i) {
+            subscriptions.push(Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(sources[i]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                if (subscriptions) {
+                    for (var s = 0; s < subscriptions.length; s++) {
+                        s !== i && subscriptions[s].unsubscribe();
+                    }
+                    subscriptions = null;
+                }
+                subscriber.next(value);
+            })));
+        };
+        for (var i = 0; subscriptions && !subscriber.closed && i < sources.length; i++) {
+            _loop_1(i);
+        }
+    };
+}
+//# sourceMappingURL=race.js.map
 
 /***/ }),
-/* 608 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/range.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return range; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
 
 
-var splitString = __webpack_require__(609);
-var utils = module.exports;
+function range(start, count, scheduler) {
+    if (count == null) {
+        count = start;
+        start = 0;
+    }
+    if (count <= 0) {
+        return _empty__WEBPACK_IMPORTED_MODULE_1__[/* EMPTY */ "a"];
+    }
+    var end = count + start;
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](scheduler
+        ?
+            function (subscriber) {
+                var n = start;
+                return scheduler.schedule(function () {
+                    if (n < end) {
+                        subscriber.next(n++);
+                        this.schedule();
+                    }
+                    else {
+                        subscriber.complete();
+                    }
+                });
+            }
+        :
+            function (subscriber) {
+                var n = start;
+                while (n < end && !subscriber.closed) {
+                    subscriber.next(n++);
+                }
+                subscriber.complete();
+            });
+}
+//# sourceMappingURL=range.js.map
 
-/**
- * Module dependencies
- */
+/***/ }),
 
-utils.extend = __webpack_require__(605);
-utils.flatten = __webpack_require__(612);
-utils.isObject = __webpack_require__(592);
-utils.fillRange = __webpack_require__(613);
-utils.repeat = __webpack_require__(621);
-utils.unique = __webpack_require__(604);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/throwError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.define = function(obj, key, val) {
-  Object.defineProperty(obj, key, {
-    writable: true,
-    configurable: true,
-    enumerable: false,
-    value: val
-  });
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwError; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-/**
- * Returns true if the given string contains only empty brace sets.
- */
 
-utils.isEmptySets = function(str) {
-  return /^(?:\{,\})+$/.test(str);
-};
+function throwError(errorOrErrorFactory, scheduler) {
+    var errorFactory = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(errorOrErrorFactory) ? errorOrErrorFactory : function () { return errorOrErrorFactory; };
+    var init = function (subscriber) { return subscriber.error(errorFactory()); };
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](scheduler ? function (subscriber) { return scheduler.schedule(init, 0, subscriber); } : init);
+}
+//# sourceMappingURL=throwError.js.map
 
-/**
- * Returns true if the given string contains only empty brace sets.
- */
+/***/ }),
 
-utils.isQuotedString = function(str) {
-  var open = str.charAt(0);
-  if (open === '\'' || open === '"' || open === '`') {
-    return str.slice(-1) === open;
-  }
-  return false;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/timer.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Create the key to use for memoization. The unique key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timer; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isDate.js");
 
-utils.createKey = function(pattern, options) {
-  var id = pattern;
-  if (typeof options === 'undefined') {
-    return id;
-  }
-  var keys = Object.keys(options);
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    id += ';' + key + '=' + String(options[key]);
-  }
-  return id;
-};
 
-/**
- * Normalize options
- */
 
-utils.createOptions = function(options) {
-  var opts = utils.extend.apply(null, arguments);
-  if (typeof opts.expand === 'boolean') {
-    opts.optimize = !opts.expand;
-  }
-  if (typeof opts.optimize === 'boolean') {
-    opts.expand = !opts.optimize;
-  }
-  if (opts.optimize === true) {
-    opts.makeRe = true;
-  }
-  return opts;
-};
 
-/**
- * Join patterns in `a` to patterns in `b`
- */
+function timer(dueTime, intervalOrScheduler, scheduler) {
+    if (dueTime === void 0) { dueTime = 0; }
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__[/* async */ "a"]; }
+    var intervalDuration = -1;
+    if (intervalOrScheduler != null) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__[/* isScheduler */ "a"])(intervalOrScheduler)) {
+            scheduler = intervalOrScheduler;
+        }
+        else {
+            intervalDuration = intervalOrScheduler;
+        }
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var due = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_3__[/* isValidDate */ "a"])(dueTime) ? +dueTime - scheduler.now() : dueTime;
+        if (due < 0) {
+            due = 0;
+        }
+        var n = 0;
+        return scheduler.schedule(function () {
+            if (!subscriber.closed) {
+                subscriber.next(n++);
+                if (0 <= intervalDuration) {
+                    this.schedule(undefined, intervalDuration);
+                }
+                else {
+                    subscriber.complete();
+                }
+            }
+        }, due);
+    });
+}
+//# sourceMappingURL=timer.js.map
 
-utils.join = function(a, b, options) {
-  options = options || {};
-  a = utils.arrayify(a);
-  b = utils.arrayify(b);
+/***/ }),
 
-  if (!a.length) return b;
-  if (!b.length) return a;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/using.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var len = a.length;
-  var idx = -1;
-  var arr = [];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return using; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
 
-  while (++idx < len) {
-    var val = a[idx];
-    if (Array.isArray(val)) {
-      for (var i = 0; i < val.length; i++) {
-        val[i] = utils.join(val[i], b, options);
-      }
-      arr.push(val);
-      continue;
-    }
 
-    for (var j = 0; j < b.length; j++) {
-      var bval = b[j];
 
-      if (Array.isArray(bval)) {
-        arr.push(utils.join(val, bval, options));
-      } else {
-        arr.push(val + bval);
-      }
-    }
-  }
-  return arr;
-};
+function using(resourceFactory, observableFactory) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var resource = resourceFactory();
+        var result = observableFactory(resource);
+        var source = result ? Object(_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__[/* EMPTY */ "a"];
+        source.subscribe(subscriber);
+        return function () {
+            if (resource) {
+                resource.unsubscribe();
+            }
+        };
+    });
+}
+//# sourceMappingURL=using.js.map
 
-/**
- * Split the given string on `,` if not escaped.
- */
+/***/ }),
 
-utils.split = function(str, options) {
-  var opts = utils.extend({sep: ','}, options);
-  if (typeof opts.keepQuotes !== 'boolean') {
-    opts.keepQuotes = true;
-  }
-  if (opts.unescape === false) {
-    opts.keepEscaping = true;
-  }
-  return splitString(str, opts, utils.escapeBrackets(opts));
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/observable/zip.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Expand ranges or sets in the given `pattern`.
- *
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object}
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zip; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
 
-utils.expand = function(str, options) {
-  var opts = utils.extend({rangeLimit: 10000}, options);
-  var segs = utils.split(str, opts);
-  var tok = { segs: segs };
 
-  if (utils.isQuotedString(str)) {
-    return tok;
-  }
 
-  if (opts.rangeLimit === true) {
-    opts.rangeLimit = 10000;
-  }
 
-  if (segs.length > 1) {
-    if (opts.optimize === false) {
-      tok.val = segs[0];
-      return tok;
-    }
 
-    tok.segs = utils.stringifyArray(tok.segs);
-  } else if (segs.length === 1) {
-    var arr = str.split('..');
 
-    if (arr.length === 1) {
-      tok.val = tok.segs[tok.segs.length - 1] || tok.val || str;
-      tok.segs = [];
-      return tok;
-    }
 
-    if (arr.length === 2 && arr[0] === arr[1]) {
-      tok.escaped = true;
-      tok.val = arr[0];
-      tok.segs = [];
-      return tok;
+function zip() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popResultSelector */ "b"])(args);
+    var sources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__[/* argsOrArgArray */ "a"])(args);
+    return sources.length
+        ? new _Observable__WEBPACK_IMPORTED_MODULE_1__[/* Observable */ "a"](function (subscriber) {
+            var buffers = sources.map(function () { return []; });
+            var completed = sources.map(function () { return false; });
+            subscriber.add(function () {
+                buffers = completed = null;
+            });
+            var _loop_1 = function (sourceIndex) {
+                Object(_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(sources[sourceIndex]).subscribe(Object(_operators_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                    buffers[sourceIndex].push(value);
+                    if (buffers.every(function (buffer) { return buffer.length; })) {
+                        var result = buffers.map(function (buffer) { return buffer.shift(); });
+                        subscriber.next(resultSelector ? resultSelector.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(result))) : result);
+                        if (buffers.some(function (buffer, i) { return !buffer.length && completed[i]; })) {
+                            subscriber.complete();
+                        }
+                    }
+                }, function () {
+                    completed[sourceIndex] = true;
+                    !buffers[sourceIndex].length && subscriber.complete();
+                }));
+            };
+            for (var sourceIndex = 0; !subscriber.closed && sourceIndex < sources.length; sourceIndex++) {
+                _loop_1(sourceIndex);
+            }
+            return function () {
+                buffers = completed = null;
+            };
+        })
+        : _empty__WEBPACK_IMPORTED_MODULE_4__[/* EMPTY */ "a"];
+}
+//# sourceMappingURL=zip.js.map
 
-    if (arr.length > 1) {
-      if (opts.optimize !== false) {
-        opts.optimize = true;
-        delete opts.expand;
-      }
+/***/ }),
 
-      if (opts.optimize !== true) {
-        var min = Math.min(arr[0], arr[1]);
-        var max = Math.max(arr[0], arr[1]);
-        var step = arr[2] || 1;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-        if (opts.rangeLimit !== false && ((max - min) / step >= opts.rangeLimit)) {
-          throw new RangeError('expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return createOperatorSubscriber; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OperatorSubscriber; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+
+
+function createOperatorSubscriber(destination, onNext, onComplete, onError, onFinalize) {
+    return new OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize);
+}
+var OperatorSubscriber = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(OperatorSubscriber, _super);
+    function OperatorSubscriber(destination, onNext, onComplete, onError, onFinalize, shouldUnsubscribe) {
+        var _this = _super.call(this, destination) || this;
+        _this.onFinalize = onFinalize;
+        _this.shouldUnsubscribe = shouldUnsubscribe;
+        _this._next = onNext
+            ? function (value) {
+                try {
+                    onNext(value);
+                }
+                catch (err) {
+                    destination.error(err);
+                }
+            }
+            : _super.prototype._next;
+        _this._error = onError
+            ? function (err) {
+                try {
+                    onError(err);
+                }
+                catch (err) {
+                    destination.error(err);
+                }
+                finally {
+                    this.unsubscribe();
+                }
+            }
+            : _super.prototype._error;
+        _this._complete = onComplete
+            ? function () {
+                try {
+                    onComplete();
+                }
+                catch (err) {
+                    destination.error(err);
+                }
+                finally {
+                    this.unsubscribe();
+                }
+            }
+            : _super.prototype._complete;
+        return _this;
+    }
+    OperatorSubscriber.prototype.unsubscribe = function () {
+        var _a;
+        if (!this.shouldUnsubscribe || this.shouldUnsubscribe()) {
+            var closed_1 = this.closed;
+            _super.prototype.unsubscribe.call(this);
+            !closed_1 && ((_a = this.onFinalize) === null || _a === void 0 ? void 0 : _a.call(this));
         }
-      }
+    };
+    return OperatorSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__[/* Subscriber */ "b"]));
 
-      arr.push(opts);
-      tok.segs = utils.fillRange.apply(null, arr);
+//# sourceMappingURL=OperatorSubscriber.js.map
 
-      if (!tok.segs.length) {
-        tok.escaped = true;
-        tok.val = str;
-        return tok;
-      }
+/***/ }),
 
-      if (opts.optimize === true) {
-        tok.segs = utils.stringifyArray(tok.segs);
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/audit.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      if (tok.segs === '') {
-        tok.val = str;
-      } else {
-        tok.val = tok.segs[0];
-      }
-      return tok;
-    }
-  } else {
-    tok.val = str;
-  }
-  return tok;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return audit; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Ensure commas inside brackets and parens are not split.
- * @param {Object} `tok` Token from the `split-string` module
- * @return {undefined}
- */
 
-utils.escapeBrackets = function(options) {
-  return function(tok) {
-    if (tok.escaped && tok.val === 'b') {
-      tok.val = '\\b';
-      return;
-    }
 
-    if (tok.val !== '(' && tok.val !== '[') return;
-    var opts = utils.extend({}, options);
-    var brackets = [];
-    var parens = [];
-    var stack = [];
-    var val = tok.val;
-    var str = tok.str;
-    var i = tok.idx - 1;
+function audit(durationSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var lastValue = null;
+        var durationSubscriber = null;
+        var isComplete = false;
+        var endDuration = function () {
+            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
+            durationSubscriber = null;
+            if (hasValue) {
+                hasValue = false;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+            isComplete && subscriber.complete();
+        };
+        var cleanupDuration = function () {
+            durationSubscriber = null;
+            isComplete && subscriber.complete();
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            lastValue = value;
+            if (!durationSubscriber) {
+                Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(durationSelector(value)).subscribe((durationSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, endDuration, cleanupDuration)));
+            }
+        }, function () {
+            isComplete = true;
+            (!hasValue || !durationSubscriber || durationSubscriber.closed) && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=audit.js.map
 
-    while (++i < str.length) {
-      var ch = str[i];
+/***/ }),
 
-      if (ch === '\\') {
-        val += (opts.keepEscaping === false ? '' : ch) + str[++i];
-        continue;
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/auditTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      if (ch === '(') {
-        parens.push(ch);
-        stack.push(ch);
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return auditTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/audit.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-      if (ch === '[') {
-        brackets.push(ch);
-        stack.push(ch);
-      }
 
-      if (ch === ')') {
-        parens.pop();
-        stack.pop();
-        if (!stack.length) {
-          val += ch;
-          break;
-        }
-      }
 
-      if (ch === ']') {
-        brackets.pop();
-        stack.pop();
-        if (!stack.length) {
-          val += ch;
-          break;
-        }
-      }
-      val += ch;
-    }
+function auditTime(duration, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_audit__WEBPACK_IMPORTED_MODULE_1__[/* audit */ "a"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__[/* timer */ "a"])(duration, scheduler); });
+}
+//# sourceMappingURL=auditTime.js.map
 
-    tok.split = false;
-    tok.val = val.slice(1);
-    tok.idx = i;
-  };
-};
+/***/ }),
 
-/**
- * Returns true if the given string looks like a regex quantifier
- * @return {Boolean}
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/buffer.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.isQuantifier = function(str) {
-  return /^(?:[0-9]?,[0-9]|[0-9],)$/.test(str);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return buffer; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Cast `val` to an array.
- * @param {*} `val`
- */
 
-utils.stringifyArray = function(arr) {
-  return [utils.arrayify(arr).join('|')];
-};
 
-/**
- * Cast `val` to an array.
- * @param {*} `val`
- */
+function buffer(closingNotifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var currentBuffer = [];
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return currentBuffer.push(value); }, function () {
+            subscriber.next(currentBuffer);
+            subscriber.complete();
+        }));
+        closingNotifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            var b = currentBuffer;
+            currentBuffer = [];
+            subscriber.next(b);
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]));
+        return function () {
+            currentBuffer = null;
+        };
+    });
+}
+//# sourceMappingURL=buffer.js.map
 
-utils.arrayify = function(arr) {
-  if (typeof arr === 'undefined') {
-    return [];
-  }
-  if (typeof arr === 'string') {
-    return [arr];
-  }
-  return arr;
-};
+/***/ }),
 
-/**
- * Returns true if the given `str` is a non-empty string
- * @return {Boolean}
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferCount.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.isString = function(str) {
-  return str != null && typeof str === 'string';
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferCount; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-/**
- * Get the last element from `array`
- * @param {Array} `array`
- * @return {*}
- */
 
-utils.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
 
-utils.escapeRegex = function(str) {
-  return str.replace(/\\?([!^*?()[\]{}+?/])/g, '\\$1');
-};
 
+function bufferCount(bufferSize, startBufferEvery) {
+    if (startBufferEvery === void 0) { startBufferEvery = null; }
+    startBufferEvery = startBufferEvery !== null && startBufferEvery !== void 0 ? startBufferEvery : bufferSize;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var buffers = [];
+        var count = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a, e_2, _b;
+            var toEmit = null;
+            if (count++ % startBufferEvery === 0) {
+                buffers.push([]);
+            }
+            try {
+                for (var buffers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffers), buffers_1_1 = buffers_1.next(); !buffers_1_1.done; buffers_1_1 = buffers_1.next()) {
+                    var buffer = buffers_1_1.value;
+                    buffer.push(value);
+                    if (bufferSize <= buffer.length) {
+                        toEmit = toEmit !== null && toEmit !== void 0 ? toEmit : [];
+                        toEmit.push(buffer);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (buffers_1_1 && !buffers_1_1.done && (_a = buffers_1.return)) _a.call(buffers_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (toEmit) {
+                try {
+                    for (var toEmit_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(toEmit), toEmit_1_1 = toEmit_1.next(); !toEmit_1_1.done; toEmit_1_1 = toEmit_1.next()) {
+                        var buffer = toEmit_1_1.value;
+                        Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(buffers, buffer);
+                        subscriber.next(buffer);
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (toEmit_1_1 && !toEmit_1_1.done && (_b = toEmit_1.return)) _b.call(toEmit_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+        }, function () {
+            var e_3, _a;
+            try {
+                for (var buffers_2 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffers), buffers_2_1 = buffers_2.next(); !buffers_2_1.done; buffers_2_1 = buffers_2.next()) {
+                    var buffer = buffers_2_1.value;
+                    subscriber.next(buffer);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (buffers_2_1 && !buffers_2_1.done && (_a = buffers_2.return)) _a.call(buffers_2);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            subscriber.complete();
+        }, undefined, function () {
+            buffers = null;
+        }));
+    });
+}
+//# sourceMappingURL=bufferCount.js.map
 
 /***/ }),
-/* 609 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * split-string <https://github.com/jonschlinkert/split-string>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferTime; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
 
 
-var extend = __webpack_require__(610);
 
-module.exports = function(str, options, fn) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
 
-  if (typeof options === 'function') {
-    fn = options;
-    options = null;
-  }
 
-  // allow separator to be defined as a string
-  if (typeof options === 'string') {
-    options = { sep: options };
-  }
 
-  var opts = extend({sep: '.'}, options);
-  var quotes = opts.quotes || ['"', "'", '`'];
-  var brackets;
 
-  if (opts.brackets === true) {
-    brackets = {
-      '<': '>',
-      '(': ')',
-      '[': ']',
-      '{': '}'
-    };
-  } else if (opts.brackets) {
-    brackets = opts.brackets;
-  }
+function bufferTime(bufferTimeSpan) {
+    var _a, _b;
+    var otherArgs = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        otherArgs[_i - 1] = arguments[_i];
+    }
+    var scheduler = (_a = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popScheduler */ "c"])(otherArgs)) !== null && _a !== void 0 ? _a : _scheduler_async__WEBPACK_IMPORTED_MODULE_5__[/* asyncScheduler */ "b"];
+    var bufferCreationInterval = (_b = otherArgs[0]) !== null && _b !== void 0 ? _b : null;
+    var maxBufferSize = otherArgs[1] || Infinity;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var bufferRecords = [];
+        var restartOnEmit = false;
+        var emit = function (record) {
+            var buffer = record.buffer, subs = record.subs;
+            subs.unsubscribe();
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_4__[/* arrRemove */ "a"])(bufferRecords, record);
+            subscriber.next(buffer);
+            restartOnEmit && startBuffer();
+        };
+        var startBuffer = function () {
+            if (bufferRecords) {
+                var subs = new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]();
+                subscriber.add(subs);
+                var buffer = [];
+                var record_1 = {
+                    buffer: buffer,
+                    subs: subs,
+                };
+                bufferRecords.push(record_1);
+                Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subs, scheduler, function () { return emit(record_1); }, bufferTimeSpan);
+            }
+        };
+        if (bufferCreationInterval !== null && bufferCreationInterval >= 0) {
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subscriber, scheduler, startBuffer, bufferCreationInterval, true);
+        }
+        else {
+            restartOnEmit = true;
+        }
+        startBuffer();
+        var bufferTimeSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            var recordsCopy = bufferRecords.slice();
+            try {
+                for (var recordsCopy_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(recordsCopy), recordsCopy_1_1 = recordsCopy_1.next(); !recordsCopy_1_1.done; recordsCopy_1_1 = recordsCopy_1.next()) {
+                    var record = recordsCopy_1_1.value;
+                    var buffer = record.buffer;
+                    buffer.push(value);
+                    maxBufferSize <= buffer.length && emit(record);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (recordsCopy_1_1 && !recordsCopy_1_1.done && (_a = recordsCopy_1.return)) _a.call(recordsCopy_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }, function () {
+            while (bufferRecords === null || bufferRecords === void 0 ? void 0 : bufferRecords.length) {
+                subscriber.next(bufferRecords.shift().buffer);
+            }
+            bufferTimeSubscriber === null || bufferTimeSubscriber === void 0 ? void 0 : bufferTimeSubscriber.unsubscribe();
+            subscriber.complete();
+            subscriber.unsubscribe();
+        }, undefined, function () { return (bufferRecords = null); });
+        source.subscribe(bufferTimeSubscriber);
+    });
+}
+//# sourceMappingURL=bufferTime.js.map
 
-  var tokens = [];
-  var stack = [];
-  var arr = [''];
-  var sep = opts.sep;
-  var len = str.length;
-  var idx = -1;
-  var closeIdx;
+/***/ }),
 
-  function expected() {
-    if (brackets && stack.length) {
-      return brackets[stack[stack.length - 1]];
-    }
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferToggle.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  while (++idx < len) {
-    var ch = str[idx];
-    var next = str[idx + 1];
-    var tok = { val: ch, idx: idx, arr: arr, str: str };
-    tokens.push(tok);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferToggle; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-    if (ch === '\\') {
-      tok.val = keepEscaping(opts, str, idx) === true ? (ch + next) : next;
-      tok.escaped = true;
-      if (typeof fn === 'function') {
-        fn(tok);
-      }
-      arr[arr.length - 1] += tok.val;
-      idx++;
-      continue;
-    }
 
-    if (brackets && brackets[ch]) {
-      stack.push(ch);
-      var e = expected();
-      var i = idx + 1;
 
-      if (str.indexOf(e, i + 1) !== -1) {
-        while (stack.length && i < len) {
-          var s = str[++i];
-          if (s === '\\') {
-            s++;
-            continue;
-          }
 
-          if (quotes.indexOf(s) !== -1) {
-            i = getClosingQuote(str, s, i + 1);
-            continue;
-          }
 
-          e = expected();
-          if (stack.length && str.indexOf(e, i + 1) === -1) {
-            break;
-          }
 
-          if (brackets[s]) {
-            stack.push(s);
-            continue;
-          }
 
-          if (e === s) {
-            stack.pop();
-          }
-        }
-      }
+function bufferToggle(openings, closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var buffers = [];
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(openings).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (openValue) {
+            var buffer = [];
+            buffers.push(buffer);
+            var closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]();
+            var emitBuffer = function () {
+                Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_6__[/* arrRemove */ "a"])(buffers, buffer);
+                subscriber.next(buffer);
+                closingSubscription.unsubscribe();
+            };
+            closingSubscription.add(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(closingSelector(openValue)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, emitBuffer, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"])));
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"]));
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            try {
+                for (var buffers_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffers), buffers_1_1 = buffers_1.next(); !buffers_1_1.done; buffers_1_1 = buffers_1.next()) {
+                    var buffer = buffers_1_1.value;
+                    buffer.push(value);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (buffers_1_1 && !buffers_1_1.done && (_a = buffers_1.return)) _a.call(buffers_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }, function () {
+            while (buffers.length > 0) {
+                subscriber.next(buffers.shift());
+            }
+            subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=bufferToggle.js.map
 
-      closeIdx = i;
-      if (closeIdx === -1) {
-        arr[arr.length - 1] += ch;
-        continue;
-      }
+/***/ }),
 
-      ch = str.slice(idx, closeIdx + 1);
-      tok.val = ch;
-      tok.idx = idx = closeIdx;
-    }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/bufferWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (quotes.indexOf(ch) !== -1) {
-      closeIdx = getClosingQuote(str, ch, idx + 1);
-      if (closeIdx === -1) {
-        arr[arr.length - 1] += ch;
-        continue;
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return bufferWhen; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-      if (keepQuotes(ch, opts) === true) {
-        ch = str.slice(idx, closeIdx + 1);
-      } else {
-        ch = str.slice(idx + 1, closeIdx);
-      }
 
-      tok.val = ch;
-      tok.idx = idx = closeIdx;
-    }
 
-    if (typeof fn === 'function') {
-      fn(tok, tokens);
-      ch = tok.val;
-      idx = tok.idx;
-    }
 
-    if (tok.val === sep && tok.split !== false) {
-      arr.push('');
-      continue;
-    }
+function bufferWhen(closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var buffer = null;
+        var closingSubscriber = null;
+        var openBuffer = function () {
+            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
+            var b = buffer;
+            buffer = [];
+            b && subscriber.next(b);
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(closingSelector()).subscribe((closingSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, openBuffer, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"])));
+        };
+        openBuffer();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return buffer === null || buffer === void 0 ? void 0 : buffer.push(value); }, function () {
+            buffer && subscriber.next(buffer);
+            subscriber.complete();
+        }, undefined, function () { return (buffer = closingSubscriber = null); }));
+    });
+}
+//# sourceMappingURL=bufferWhen.js.map
 
-    arr[arr.length - 1] += tok.val;
-  }
+/***/ }),
 
-  return arr;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/catchError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function getClosingQuote(str, ch, i, brackets) {
-  var idx = str.indexOf(ch, i);
-  if (str.charAt(idx - 1) === '\\') {
-    return getClosingQuote(str, ch, idx + 1);
-  }
-  return idx;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return catchError; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-function keepQuotes(ch, opts) {
-  if (opts.keepDoubleQuotes === true && ch === '"') return true;
-  if (opts.keepSingleQuotes === true && ch === "'") return true;
-  return opts.keepQuotes;
-}
 
-function keepEscaping(opts, str, idx) {
-  if (typeof opts.keepEscaping === 'function') {
-    return opts.keepEscaping(str, idx);
-  }
-  return opts.keepEscaping === true || str[idx + 1] === '\\';
+
+function catchError(selector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSub = null;
+        var syncUnsub = false;
+        var handledResult;
+        innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, undefined, function (err) {
+            handledResult = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(selector(err, catchError(selector)(source)));
+            if (innerSub) {
+                innerSub.unsubscribe();
+                innerSub = null;
+                handledResult.subscribe(subscriber);
+            }
+            else {
+                syncUnsub = true;
+            }
+        }));
+        if (syncUnsub) {
+            innerSub.unsubscribe();
+            innerSub = null;
+            handledResult.subscribe(subscriber);
+        }
+    });
 }
+//# sourceMappingURL=catchError.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineAll; });
+/* harmony import */ var _combineLatestAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js");
 
+var combineAll = _combineLatestAll__WEBPACK_IMPORTED_MODULE_0__[/* combineLatestAll */ "a"];
+//# sourceMappingURL=combineAll.js.map
 
 /***/ }),
-/* 610 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineLatest.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatest; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+
+
 
 
-var isExtendable = __webpack_require__(611);
-var assignSymbols = __webpack_require__(600);
 
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
-  }
-  return obj;
-};
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
+
+function combineLatest() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
     }
-  }
+    var resultSelector = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popResultSelector */ "b"])(args);
+    return resultSelector
+        ? Object(_util_pipe__WEBPACK_IMPORTED_MODULE_5__[/* pipe */ "a"])(combineLatest.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args))), Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_4__[/* mapOneOrManyArgs */ "a"])(resultSelector))
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+            Object(_observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__[/* combineLatestInit */ "b"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__[/* argsOrArgArray */ "a"])(args))))(subscriber);
+        });
 }
+//# sourceMappingURL=combineLatest.js.map
 
-function isString(val) {
-  return (val && typeof val === 'string');
-}
+/***/ }),
 
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatestAll; });
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/combineLatest.js");
+/* harmony import */ var _joinAllInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/joinAllInternals.js");
 
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
+function combineLatestAll(project) {
+    return Object(_joinAllInternals__WEBPACK_IMPORTED_MODULE_1__[/* joinAllInternals */ "a"])(_observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__[/* combineLatest */ "a"], project);
 }
+//# sourceMappingURL=combineLatestAll.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineLatestWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatest.js");
 
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
 
+function combineLatestWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
+    }
+    return _combineLatest__WEBPACK_IMPORTED_MODULE_1__[/* combineLatest */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)));
+}
+//# sourceMappingURL=combineLatestWith.js.map
 
 /***/ }),
-/* 611 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concat.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concat; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _concatAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
 
 
-var isPlainObject = __webpack_require__(599);
 
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
 
+function concat() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_3__[/* popScheduler */ "c"])(args);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_concatAll__WEBPACK_IMPORTED_MODULE_2__[/* concatAll */ "a"])()(Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__[/* from */ "a"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)), scheduler)).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=concat.js.map
 
 /***/ }),
-/* 612 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * arr-flatten <https://github.com/jonschlinkert/arr-flatten>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatAll; });
+/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+
+function concatAll() {
+    return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__[/* mergeAll */ "a"])(1);
+}
+//# sourceMappingURL=concatAll.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function (arr) {
-  return flat(arr, []);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatMap; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-function flat(arr, res) {
-  var i = 0, cur;
-  var len = arr.length;
-  for (; i < len; i++) {
-    cur = arr[i];
-    Array.isArray(cur) ? flat(cur, res) : res.push(cur);
-  }
-  return res;
-}
 
+function concatMap(project, resultSelector) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector) ? Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(project, resultSelector, 1) : Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(project, 1);
+}
+//# sourceMappingURL=concatMap.js.map
 
 /***/ }),
-/* 613 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatMapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * fill-range <https://github.com/jonschlinkert/fill-range>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatMapTo; });
+/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+
 
+function concatMapTo(innerObservable, resultSelector) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector) ? Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__[/* concatMap */ "a"])(function () { return innerObservable; }, resultSelector) : Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__[/* concatMap */ "a"])(function () { return innerObservable; });
+}
+//# sourceMappingURL=concatMapTo.js.map
 
+/***/ }),
 
-var util = __webpack_require__(113);
-var isNumber = __webpack_require__(614);
-var extend = __webpack_require__(617);
-var repeat = __webpack_require__(619);
-var toRegex = __webpack_require__(620);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/concatWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Return a range of numbers or letters.
- *
- * @param  {String} `start` Start of the range
- * @param  {String} `stop` End of the range
- * @param  {String} `step` Increment or decrement to use.
- * @param  {Function} `fn` Custom function to modify each element in the range.
- * @return {Array}
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return concatWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _concat__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concat.js");
 
-function fillRange(start, stop, step, options) {
-  if (typeof start === 'undefined') {
-    return [];
-  }
 
-  if (typeof stop === 'undefined' || start === stop) {
-    // special case, for handling negative zero
-    var isString = typeof start === 'string';
-    if (isNumber(start) && !toNumber(start)) {
-      return [isString ? '0' : 0];
+function concatWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
     }
-    return [start];
-  }
+    return _concat__WEBPACK_IMPORTED_MODULE_1__[/* concat */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)));
+}
+//# sourceMappingURL=concatWith.js.map
 
-  if (typeof step !== 'number' && typeof step !== 'string') {
-    options = step;
-    step = undefined;
-  }
+/***/ }),
 
-  if (typeof options === 'function') {
-    options = { transform: options };
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/connect.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var opts = extend({step: step}, options);
-  if (opts.step && !isValidNumber(opts.step)) {
-    if (opts.strictRanges === true) {
-      throw new TypeError('expected options.step to be a number');
-    }
-    return [];
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return connect; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_fromSubscribable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/fromSubscribable.js");
 
-  opts.isNumber = isValidNumber(start) && isValidNumber(stop);
-  if (!opts.isNumber && !isValid(start, stop)) {
-    if (opts.strictRanges === true) {
-      throw new RangeError('invalid range arguments: ' + util.inspect([start, stop]));
-    }
-    return [];
-  }
 
-  opts.isPadded = isPadded(start) || isPadded(stop);
-  opts.toString = opts.stringify
-    || typeof opts.step === 'string'
-    || typeof start === 'string'
-    || typeof stop === 'string'
-    || !opts.isNumber;
 
-  if (opts.isPadded) {
-    opts.maxLength = Math.max(String(start).length, String(stop).length);
-  }
 
-  // support legacy minimatch/fill-range options
-  if (typeof opts.optimize === 'boolean') opts.toRegex = opts.optimize;
-  if (typeof opts.makeRe === 'boolean') opts.toRegex = opts.makeRe;
-  return expand(start, stop, opts);
+var DEFAULT_CONFIG = {
+    connector: function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"](); },
+};
+function connect(selector, config) {
+    if (config === void 0) { config = DEFAULT_CONFIG; }
+    var connector = config.connector;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var subject = connector();
+        Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__[/* from */ "a"])(selector(Object(_observable_fromSubscribable__WEBPACK_IMPORTED_MODULE_3__[/* fromSubscribable */ "a"])(subject))).subscribe(subscriber);
+        subscriber.add(source.subscribe(subject));
+    });
 }
+//# sourceMappingURL=connect.js.map
 
-function expand(start, stop, options) {
-  var a = options.isNumber ? toNumber(start) : start.charCodeAt(0);
-  var b = options.isNumber ? toNumber(stop) : stop.charCodeAt(0);
+/***/ }),
 
-  var step = Math.abs(toNumber(options.step)) || 1;
-  if (options.toRegex && step === 1) {
-    return toRange(a, b, start, stop, options);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/count.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var zero = {greater: [], lesser: []};
-  var asc = a < b;
-  var arr = new Array(Math.round((asc ? b - a : a - b) / step));
-  var idx = 0;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return count; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
 
-  while (asc ? a <= b : a >= b) {
-    var val = options.isNumber ? a : String.fromCharCode(a);
-    if (options.toRegex && (val >= 0 || !options.isNumber)) {
-      zero.greater.push(val);
-    } else {
-      zero.lesser.push(Math.abs(val));
-    }
+function count(predicate) {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(function (total, value, i) { return (!predicate || predicate(value, i) ? total + 1 : total); }, 0);
+}
+//# sourceMappingURL=count.js.map
 
-    if (options.isPadded) {
-      val = zeros(val, options);
-    }
+/***/ }),
 
-    if (options.toString) {
-      val = String(val);
-    }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/debounce.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (typeof options.transform === 'function') {
-      arr[idx++] = options.transform(val, a, b, step, idx, arr, options);
-    } else {
-      arr[idx++] = val;
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return debounce; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-    if (asc) {
-      a += step;
-    } else {
-      a -= step;
-    }
-  }
 
-  if (options.toRegex === true) {
-    return toSequence(arr, zero, options);
-  }
-  return arr;
+
+
+function debounce(durationSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var lastValue = null;
+        var durationSubscriber = null;
+        var emit = function () {
+            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
+            durationSubscriber = null;
+            if (hasValue) {
+                hasValue = false;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            durationSubscriber === null || durationSubscriber === void 0 ? void 0 : durationSubscriber.unsubscribe();
+            hasValue = true;
+            lastValue = value;
+            durationSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, emit, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]);
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(durationSelector(value)).subscribe(durationSubscriber);
+        }, function () {
+            emit();
+            subscriber.complete();
+        }, undefined, function () {
+            lastValue = durationSubscriber = null;
+        }));
+    });
 }
+//# sourceMappingURL=debounce.js.map
 
-function toRange(a, b, start, stop, options) {
-  if (options.isPadded) {
-    return toRegex(start, stop, options);
-  }
+/***/ }),
 
-  if (options.isNumber) {
-    return toRegex(Math.min(a, b), Math.max(a, b), options);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/debounceTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var start = String.fromCharCode(Math.min(a, b));
-  var stop = String.fromCharCode(Math.max(a, b));
-  return '[' + start + '-' + stop + ']';
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return debounceTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function toSequence(arr, zeros, options) {
-  var greater = '', lesser = '';
-  if (zeros.greater.length) {
-    greater = zeros.greater.join('|');
-  }
-  if (zeros.lesser.length) {
-    lesser = '-(' + zeros.lesser.join('|') + ')';
-  }
-  var res = greater && lesser
-    ? greater + '|' + lesser
-    : greater || lesser;
 
-  if (options.capture) {
-    return '(' + res + ')';
-  }
-  return res;
-}
 
-function zeros(val, options) {
-  if (options.isPadded) {
-    var str = String(val);
-    var len = str.length;
-    var dash = '';
-    if (str.charAt(0) === '-') {
-      dash = '-';
-      str = str.slice(1);
-    }
-    var diff = options.maxLength - len;
-    var pad = repeat('0', diff);
-    val = (dash + pad + str);
-  }
-  if (options.stringify) {
-    return String(val);
-  }
-  return val;
+function debounceTime(dueTime, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var activeTask = null;
+        var lastValue = null;
+        var lastTime = null;
+        var emit = function () {
+            if (activeTask) {
+                activeTask.unsubscribe();
+                activeTask = null;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+        };
+        function emitWhenIdle() {
+            var targetTime = lastTime + dueTime;
+            var now = scheduler.now();
+            if (now < targetTime) {
+                activeTask = this.schedule(undefined, targetTime - now);
+                subscriber.add(activeTask);
+                return;
+            }
+            emit();
+        }
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            lastValue = value;
+            lastTime = scheduler.now();
+            if (!activeTask) {
+                activeTask = scheduler.schedule(emitWhenIdle, dueTime);
+                subscriber.add(activeTask);
+            }
+        }, function () {
+            emit();
+            subscriber.complete();
+        }, undefined, function () {
+            lastValue = activeTask = null;
+        }));
+    });
 }
+//# sourceMappingURL=debounceTime.js.map
 
-function toNumber(val) {
-  return Number(val) || 0;
-}
+/***/ }),
 
-function isPadded(str) {
-  return /^-?0\d/.test(str);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isValid(min, max) {
-  return (isValidNumber(min) || isValidLetter(min))
-      && (isValidNumber(max) || isValidLetter(max));
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defaultIfEmpty; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function isValidLetter(ch) {
-  return typeof ch === 'string' && ch.length === 1 && /^\w+$/.test(ch);
-}
 
-function isValidNumber(n) {
-  return isNumber(n) && !/\./.test(n);
+function defaultIfEmpty(defaultValue) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            subscriber.next(value);
+        }, function () {
+            if (!hasValue) {
+                subscriber.next(defaultValue);
+            }
+            subscriber.complete();
+        }));
+    });
 }
+//# sourceMappingURL=defaultIfEmpty.js.map
 
-/**
- * Expose `fillRange`
- * @type {Function}
- */
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/delay.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return delay; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _delayWhen__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-module.exports = fillRange;
 
 
+function delay(due, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    var duration = Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__[/* timer */ "a"])(due, scheduler);
+    return Object(_delayWhen__WEBPACK_IMPORTED_MODULE_1__[/* delayWhen */ "a"])(function () { return duration; });
+}
+//# sourceMappingURL=delay.js.map
+
 /***/ }),
-/* 614 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return delayWhen; });
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony import */ var _ignoreElements__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js");
+/* harmony import */ var _mapTo__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js");
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
 
 
 
-var typeOf = __webpack_require__(615);
 
-module.exports = function isNumber(num) {
-  var type = typeOf(num);
 
-  if (type === 'string') {
-    if (!num.trim()) return false;
-  } else if (type !== 'number') {
-    return false;
-  }
+function delayWhen(delayDurationSelector, subscriptionDelay) {
+    if (subscriptionDelay) {
+        return function (source) {
+            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__[/* concat */ "a"])(subscriptionDelay.pipe(Object(_take__WEBPACK_IMPORTED_MODULE_1__[/* take */ "a"])(1), Object(_ignoreElements__WEBPACK_IMPORTED_MODULE_2__[/* ignoreElements */ "a"])()), source.pipe(delayWhen(delayDurationSelector)));
+        };
+    }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_4__[/* mergeMap */ "a"])(function (value, index) { return delayDurationSelector(value, index).pipe(Object(_take__WEBPACK_IMPORTED_MODULE_1__[/* take */ "a"])(1), Object(_mapTo__WEBPACK_IMPORTED_MODULE_3__[/* mapTo */ "a"])(value)); });
+}
+//# sourceMappingURL=delayWhen.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/dematerialize.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return dematerialize; });
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Notification.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  return (num - num + 1) >= 0;
-};
 
 
+function dematerialize() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (notification) { return Object(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* observeNotification */ "c"])(notification, subscriber); }));
+    });
+}
+//# sourceMappingURL=dematerialize.js.map
+
 /***/ }),
-/* 615 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/distinct.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return distinct; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
+function distinct(keySelector, flushes) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var distinctKeys = new Set();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var key = keySelector ? keySelector(value) : value;
+            if (!distinctKeys.has(key)) {
+                distinctKeys.add(key);
+                subscriber.next(value);
+            }
+        }));
+        flushes === null || flushes === void 0 ? void 0 : flushes.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () { return distinctKeys.clear(); }, _util_noop__WEBPACK_IMPORTED_MODULE_2__[/* noop */ "a"]));
+    });
+}
+//# sourceMappingURL=distinct.js.map
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
+/***/ }),
 
-  // other objects
-  var type = toString.call(val);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return distinctUntilChanged; });
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
+function distinctUntilChanged(comparator, keySelector) {
+    if (keySelector === void 0) { keySelector = _util_identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"]; }
+    comparator = comparator !== null && comparator !== void 0 ? comparator : defaultCompare;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var previousKey;
+        var first = true;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var currentKey = keySelector(value);
+            if (first || !comparator(previousKey, currentKey)) {
+                first = false;
+                previousKey = currentKey;
+                subscriber.next(value);
+            }
+        }));
+    });
+}
+function defaultCompare(a, b) {
+    return a === b;
+}
+//# sourceMappingURL=distinctUntilChanged.js.map
 
-  // must be a plain object
-  return 'object';
-};
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilKeyChanged.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return distinctUntilKeyChanged; });
+/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js");
 
+function distinctUntilKeyChanged(key, compare) {
+    return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__[/* distinctUntilChanged */ "a"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
+}
+//# sourceMappingURL=distinctUntilKeyChanged.js.map
 
 /***/ }),
-/* 616 */
-/***/ (function(module, exports) {
 
-/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/elementAt.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// The _isBuffer check is for Safari 5-7 support, because it's missing
-// Object.prototype.constructor. Remove this eventually
-module.exports = function (obj) {
-  return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return elementAt; });
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/ArgumentOutOfRangeError.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
 
-function isBuffer (obj) {
-  return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
-}
 
-// For Node v0.10 support. Remove this eventually.
-function isSlowBuffer (obj) {
-  return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
-}
 
 
-/***/ }),
-/* 617 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+function elementAt(index, defaultValue) {
+    if (index < 0) {
+        throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__[/* ArgumentOutOfRangeError */ "a"]();
+    }
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__[/* take */ "a"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__[/* defaultIfEmpty */ "a"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__[/* throwIfEmpty */ "a"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__[/* ArgumentOutOfRangeError */ "a"](); }));
+    };
+}
+//# sourceMappingURL=elementAt.js.map
 
+/***/ }),
 
-var isObject = __webpack_require__(618);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/endWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function extend(o/*, objects*/) {
-  if (!isObject(o)) { o = {}; }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return endWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/of.js");
 
-  var len = arguments.length;
-  for (var i = 1; i < len; i++) {
-    var obj = arguments[i];
 
-    if (isObject(obj)) {
-      assign(o, obj);
-    }
-  }
-  return o;
-};
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
+function endWith() {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
     }
-  }
+    return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_1__[/* concat */ "a"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_2__[/* of */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(values)))); };
 }
+//# sourceMappingURL=endWith.js.map
 
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
+/***/ }),
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/every.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return every; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/***/ }),
-/* 618 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+function every(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            if (!predicate.call(thisArg, value, index++, source)) {
+                subscriber.next(false);
+                subscriber.complete();
+            }
+        }, function () {
+            subscriber.next(true);
+            subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=every.js.map
 
+/***/ }),
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/exhaust.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exhaust; });
+/* harmony import */ var _exhaustAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js");
 
+var exhaust = _exhaustAll__WEBPACK_IMPORTED_MODULE_0__[/* exhaustAll */ "a"];
+//# sourceMappingURL=exhaust.js.map
 
 /***/ }),
-/* 619 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * repeat-string <https://github.com/jonschlinkert/repeat-string>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exhaustAll; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
 
-/**
- * Results cache
- */
 
-var res = '';
-var cache;
+function exhaustAll() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var isComplete = false;
+        var innerSub = null;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (inner) {
+            if (!innerSub) {
+                innerSub = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(inner).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                    innerSub = null;
+                    isComplete && subscriber.complete();
+                }));
+            }
+        }, function () {
+            isComplete = true;
+            !innerSub && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=exhaustAll.js.map
 
-/**
- * Expose `repeat`
- */
+/***/ }),
 
-module.exports = repeat;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Repeat the given `string` the specified `number`
- * of times.
- *
- * **Example:**
- *
- * ```js
- * var repeat = require('repeat-string');
- * repeat('A', 5);
- * //=> AAAAA
- * ```
- *
- * @param {String} `string` The string to repeat
- * @param {Number} `number` The number of times to repeat the string
- * @return {String} Repeated string
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return exhaustMap; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function repeat(str, num) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
 
-  // cover common, quick use cases
-  if (num === 1) return str;
-  if (num === 2) return str + str;
 
-  var max = str.length * num;
-  if (cache !== str || typeof cache === 'undefined') {
-    cache = str;
-    res = '';
-  } else if (res.length >= max) {
-    return res.substr(0, max);
-  }
 
-  while (max > res.length && num > 1) {
-    if (num & 1) {
-      res += str;
+function exhaustMap(project, resultSelector) {
+    if (resultSelector) {
+        return function (source) {
+            return source.pipe(exhaustMap(function (a, i) { return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }));
+        };
     }
-
-    num >>= 1;
-    str += str;
-  }
-
-  res += str;
-  res = res.substr(0, max);
-  return res;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        var innerSub = null;
+        var isComplete = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (outerValue) {
+            if (!innerSub) {
+                innerSub = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                    innerSub = null;
+                    isComplete && subscriber.complete();
+                });
+                Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(project(outerValue, index++)).subscribe(innerSub);
+            }
+        }, function () {
+            isComplete = true;
+            !innerSub && subscriber.complete();
+        }));
+    });
 }
-
+//# sourceMappingURL=exhaustMap.js.map
 
 /***/ }),
-/* 620 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/expand.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * to-regex-range <https://github.com/jonschlinkert/to-regex-range>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return expand; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js");
 
 
+function expand(project, concurrent, scheduler) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    concurrent = (concurrent || 0) < 1 ? Infinity : concurrent;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_1__[/* mergeInternals */ "a"])(source, subscriber, project, concurrent, undefined, true, scheduler);
+    });
+}
+//# sourceMappingURL=expand.js.map
 
-var repeat = __webpack_require__(619);
-var isNumber = __webpack_require__(614);
-var cache = {};
+/***/ }),
 
-function toRegexRange(min, max, options) {
-  if (isNumber(min) === false) {
-    throw new RangeError('toRegexRange: first argument is invalid.');
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/filter.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (typeof max === 'undefined' || min === max) {
-    return String(min);
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return filter; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  if (isNumber(max) === false) {
-    throw new RangeError('toRegexRange: second argument is invalid.');
-  }
 
-  options = options || {};
-  var relax = String(options.relaxZeros);
-  var shorthand = String(options.shorthand);
-  var capture = String(options.capture);
-  var key = min + ':' + max + '=' + relax + shorthand + capture;
-  if (cache.hasOwnProperty(key)) {
-    return cache[key].result;
-  }
+function filter(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return predicate.call(thisArg, value, index++) && subscriber.next(value); }));
+    });
+}
+//# sourceMappingURL=filter.js.map
 
-  var a = Math.min(min, max);
-  var b = Math.max(min, max);
+/***/ }),
 
-  if (Math.abs(a - b) === 1) {
-    var result = min + '|' + max;
-    if (options.capture) {
-      return '(' + result + ')';
-    }
-    return result;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/finalize.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var isPadded = padding(min) || padding(max);
-  var positives = [];
-  var negatives = [];
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return finalize; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-  var tok = {min: min, max: max, a: a, b: b};
-  if (isPadded) {
-    tok.isPadded = isPadded;
-    tok.maxLen = String(tok.max).length;
-  }
+function finalize(callback) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        try {
+            source.subscribe(subscriber);
+        }
+        finally {
+            subscriber.add(callback);
+        }
+    });
+}
+//# sourceMappingURL=finalize.js.map
 
-  if (a < 0) {
-    var newMin = b < 0 ? Math.abs(b) : 1;
-    var newMax = Math.abs(a);
-    negatives = splitToPatterns(newMin, newMax, tok, options);
-    a = tok.a = 0;
-  }
+/***/ }),
 
-  if (b >= 0) {
-    positives = splitToPatterns(a, b, tok, options);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/find.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  tok.negatives = negatives;
-  tok.positives = positives;
-  tok.result = siftPatterns(negatives, positives, options);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return find; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createFind; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  if (options.capture && (positives.length + negatives.length) > 1) {
-    tok.result = '(' + tok.result + ')';
-  }
 
-  cache[key] = tok;
-  return tok.result;
+function find(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(createFind(predicate, thisArg, 'value'));
 }
-
-function siftPatterns(neg, pos, options) {
-  var onlyNegative = filterPatterns(neg, pos, '-', false, options) || [];
-  var onlyPositive = filterPatterns(pos, neg, '', false, options) || [];
-  var intersected = filterPatterns(neg, pos, '-?', true, options) || [];
-  var subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
-  return subpatterns.join('|');
+function createFind(predicate, thisArg, emit) {
+    var findIndex = emit === 'index';
+    return function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var i = index++;
+            if (predicate.call(thisArg, value, i, source)) {
+                subscriber.next(findIndex ? i : value);
+                subscriber.complete();
+            }
+        }, function () {
+            subscriber.next(findIndex ? -1 : undefined);
+            subscriber.complete();
+        }));
+    };
 }
+//# sourceMappingURL=find.js.map
 
-function splitToRanges(min, max) {
-  min = Number(min);
-  max = Number(max);
-
-  var nines = 1;
-  var stops = [max];
-  var stop = +countNines(min, nines);
+/***/ }),
 
-  while (min <= stop && stop <= max) {
-    stops = push(stops, stop);
-    nines += 1;
-    stop = +countNines(min, nines);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/findIndex.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var zeros = 1;
-  stop = countZeros(max + 1, zeros) - 1;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return findIndex; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _find__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/find.js");
 
-  while (min < stop && stop <= max) {
-    stops = push(stops, stop);
-    zeros += 1;
-    stop = countZeros(max + 1, zeros) - 1;
-  }
 
-  stops.sort(compare);
-  return stops;
+function findIndex(predicate, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(Object(_find__WEBPACK_IMPORTED_MODULE_1__[/* createFind */ "a"])(predicate, thisArg, 'index'));
 }
+//# sourceMappingURL=findIndex.js.map
 
-/**
- * Convert a range to a regex pattern
- * @param {Number} `start`
- * @param {Number} `stop`
- * @return {String}
- */
-
-function rangeToPattern(start, stop, options) {
-  if (start === stop) {
-    return {pattern: String(start), digits: []};
-  }
+/***/ }),
 
-  var zipped = zip(String(start), String(stop));
-  var len = zipped.length, i = -1;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/first.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var pattern = '';
-  var digits = 0;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return first; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-  while (++i < len) {
-    var numbers = zipped[i];
-    var startDigit = numbers[0];
-    var stopDigit = numbers[1];
 
-    if (startDigit === stopDigit) {
-      pattern += startDigit;
 
-    } else if (startDigit !== '0' || stopDigit !== '9') {
-      pattern += toCharacterClass(startDigit, stopDigit);
 
-    } else {
-      digits += 1;
-    }
-  }
 
-  if (digits) {
-    pattern += options.shorthand ? '\\d' : '[0-9]';
-  }
 
-  return { pattern: pattern, digits: [digits] };
+function first(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__[/* identity */ "a"], Object(_take__WEBPACK_IMPORTED_MODULE_2__[/* take */ "a"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__[/* defaultIfEmpty */ "a"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__[/* throwIfEmpty */ "a"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"](); }));
+    };
 }
+//# sourceMappingURL=first.js.map
 
-function splitToPatterns(min, max, tok, options) {
-  var ranges = splitToRanges(min, max);
-  var len = ranges.length;
-  var idx = -1;
+/***/ }),
 
-  var tokens = [];
-  var start = min;
-  var prev;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/flatMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  while (++idx < len) {
-    var range = ranges[idx];
-    var obj = rangeToPattern(start, range, options);
-    var zeros = '';
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return flatMap; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
 
-    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
-      if (prev.digits.length > 1) {
-        prev.digits.pop();
-      }
-      prev.digits.push(obj.digits[0]);
-      prev.string = prev.pattern + toQuantifier(prev.digits);
-      start = range + 1;
-      continue;
-    }
+var flatMap = _mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"];
+//# sourceMappingURL=flatMap.js.map
 
-    if (tok.isPadded) {
-      zeros = padZeros(range, tok);
-    }
+/***/ }),
 
-    obj.string = zeros + obj.pattern + toQuantifier(obj.digits);
-    tokens.push(obj);
-    start = range + 1;
-    prev = obj;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/groupBy.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  return tokens;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return groupBy; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function filterPatterns(arr, comparison, prefix, intersection, options) {
-  var res = [];
 
-  for (var i = 0; i < arr.length; i++) {
-    var tok = arr[i];
-    var ele = tok.string;
 
-    if (options.relaxZeros !== false) {
-      if (prefix === '-' && ele.charAt(0) === '0') {
-        if (ele.charAt(1) === '{') {
-          ele = '0*' + ele.replace(/^0\{\d+\}/, '');
-        } else {
-          ele = '0*' + ele.slice(1);
-        }
-      }
-    }
 
-    if (!intersection && !contains(comparison, 'string', ele)) {
-      res.push(prefix + ele);
-    }
 
-    if (intersection && contains(comparison, 'string', ele)) {
-      res.push(prefix + ele);
-    }
-  }
-  return res;
+function groupBy(keySelector, elementOrOptions, duration, connector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var element;
+        if (!elementOrOptions || typeof elementOrOptions === 'function') {
+            element = elementOrOptions;
+        }
+        else {
+            (duration = elementOrOptions.duration, element = elementOrOptions.element, connector = elementOrOptions.connector);
+        }
+        var groups = new Map();
+        var notify = function (cb) {
+            groups.forEach(cb);
+            cb(subscriber);
+        };
+        var handleError = function (err) { return notify(function (consumer) { return consumer.error(err); }); };
+        var activeGroups = 0;
+        var teardownAttempted = false;
+        var groupBySourceSubscriber = new _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* OperatorSubscriber */ "a"](subscriber, function (value) {
+            try {
+                var key_1 = keySelector(value);
+                var group_1 = groups.get(key_1);
+                if (!group_1) {
+                    groups.set(key_1, (group_1 = connector ? connector() : new _Subject__WEBPACK_IMPORTED_MODULE_2__[/* Subject */ "a"]()));
+                    var grouped = createGroupedObservable(key_1, group_1);
+                    subscriber.next(grouped);
+                    if (duration) {
+                        var durationSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(group_1, function () {
+                            group_1.complete();
+                            durationSubscriber_1 === null || durationSubscriber_1 === void 0 ? void 0 : durationSubscriber_1.unsubscribe();
+                        }, undefined, undefined, function () { return groups.delete(key_1); });
+                        groupBySourceSubscriber.add(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(duration(grouped)).subscribe(durationSubscriber_1));
+                    }
+                }
+                group_1.next(element ? element(value) : value);
+            }
+            catch (err) {
+                handleError(err);
+            }
+        }, function () { return notify(function (consumer) { return consumer.complete(); }); }, handleError, function () { return groups.clear(); }, function () {
+            teardownAttempted = true;
+            return activeGroups === 0;
+        });
+        source.subscribe(groupBySourceSubscriber);
+        function createGroupedObservable(key, groupSubject) {
+            var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (groupSubscriber) {
+                activeGroups++;
+                var innerSub = groupSubject.subscribe(groupSubscriber);
+                return function () {
+                    innerSub.unsubscribe();
+                    --activeGroups === 0 && teardownAttempted && groupBySourceSubscriber.unsubscribe();
+                };
+            });
+            result.key = key;
+            return result;
+        }
+    });
 }
+//# sourceMappingURL=groupBy.js.map
 
-/**
- * Zip strings (`for in` can be used on string characters)
- */
+/***/ }),
 
-function zip(a, b) {
-  var arr = [];
-  for (var ch in a) arr.push([a[ch], b[ch]]);
-  return arr;
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function compare(a, b) {
-  return a > b ? 1 : b > a ? -1 : 0;
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ignoreElements; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-function push(arr, ele) {
-  if (arr.indexOf(ele) === -1) arr.push(ele);
-  return arr;
-}
 
-function contains(arr, key, val) {
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i][key] === val) {
-      return true;
-    }
-  }
-  return false;
-}
 
-function countNines(min, len) {
-  return String(min).slice(0, -len) + repeat('9', len);
+function ignoreElements() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, _util_noop__WEBPACK_IMPORTED_MODULE_2__[/* noop */ "a"]));
+    });
 }
+//# sourceMappingURL=ignoreElements.js.map
 
-function countZeros(integer, zeros) {
-  return integer - (integer % Math.pow(10, zeros));
-}
+/***/ }),
 
-function toQuantifier(digits) {
-  var start = digits[0];
-  var stop = digits[1] ? (',' + digits[1]) : '';
-  if (!stop && (!start || start === 1)) {
-    return '';
-  }
-  return '{' + start + stop + '}';
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/isEmpty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function toCharacterClass(a, b) {
-  return '[' + a + ((b - a === 1) ? '' : '-') + b + ']';
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isEmpty; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function padding(str) {
-  return /^-?(0+)\d/.exec(str);
-}
 
-function padZeros(val, tok) {
-  if (tok.isPadded) {
-    var diff = Math.abs(tok.maxLen - String(val).length);
-    switch (diff) {
-      case 0:
-        return '';
-      case 1:
-        return '0';
-      default: {
-        return '0{' + diff + '}';
-      }
-    }
-  }
-  return val;
+function isEmpty() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            subscriber.next(false);
+            subscriber.complete();
+        }, function () {
+            subscriber.next(true);
+            subscriber.complete();
+        }));
+    });
 }
-
-/**
- * Expose `toRegexRange`
- */
-
-module.exports = toRegexRange;
-
+//# sourceMappingURL=isEmpty.js.map
 
 /***/ }),
-/* 621 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * repeat-element <https://github.com/jonschlinkert/repeat-element>
- *
- * Copyright (c) 2015 Jon Schlinkert.
- * Licensed under the MIT license.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/joinAllInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return joinAllInternals; });
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js");
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/pipe.js");
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _toArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js");
 
 
-module.exports = function repeat(ele, num) {
-  var arr = new Array(num);
 
-  for (var i = 0; i < num; i++) {
-    arr[i] = ele;
-  }
 
-  return arr;
-};
 
+function joinAllInternals(joinFn, project) {
+    return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_2__[/* pipe */ "a"])(Object(_toArray__WEBPACK_IMPORTED_MODULE_4__[/* toArray */ "a"])(), Object(_mergeMap__WEBPACK_IMPORTED_MODULE_3__[/* mergeMap */ "a"])(function (sources) { return joinFn(sources); }), project ? Object(_util_mapOneOrManyArgs__WEBPACK_IMPORTED_MODULE_1__[/* mapOneOrManyArgs */ "a"])(project) : _util_identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"]);
+}
+//# sourceMappingURL=joinAllInternals.js.map
 
 /***/ }),
-/* 622 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/last.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return last; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js");
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
 
-var Node = __webpack_require__(623);
-var utils = __webpack_require__(608);
 
-/**
- * Braces parsers
- */
 
-module.exports = function(braces, options) {
-  braces.parser
-    .set('bos', function() {
-      if (!this.parsed) {
-        this.ast = this.nodes[0] = new Node(this.ast);
-      }
-    })
 
-    /**
-     * Character parsers
-     */
 
-    .set('escape', function() {
-      var pos = this.position();
-      var m = this.match(/^(?:\\(.)|\$\{)/);
-      if (!m) return;
+function last(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__[/* identity */ "a"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__[/* takeLast */ "a"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__[/* defaultIfEmpty */ "a"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__[/* throwIfEmpty */ "a"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"](); }));
+    };
+}
+//# sourceMappingURL=last.js.map
 
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
+/***/ }),
 
-      var node = pos(new Node({
-        type: 'text',
-        multiplier: 1,
-        val: m[0]
-      }));
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/map.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      if (node.val === '\\\\') {
-        return node;
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return map; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-      if (node.val === '${') {
-        var str = this.input;
-        var idx = -1;
-        var ch;
 
-        while ((ch = str[++idx])) {
-          this.consume(1);
-          node.val += ch;
-          if (ch === '\\') {
-            node.val += str[++idx];
-            continue;
-          }
-          if (ch === '}') {
-            break;
-          }
-        }
-      }
+function map(project, thisArg) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            subscriber.next(project.call(thisArg, value, index++));
+        }));
+    });
+}
+//# sourceMappingURL=map.js.map
 
-      if (this.options.unescape !== false) {
-        node.val = node.val.replace(/\\([{}])/g, '$1');
-      }
+/***/ }),
 
-      if (last.val === '"' && this.input.charAt(0) === '"') {
-        last.val = node.val;
-        this.consume(1);
-        return;
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      return concatNodes.call(this, pos, node, prev, options);
-    })
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mapTo; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
-    /**
-     * Brackets: "[...]" (basic, this is overridden by
-     * other parsers in more advanced implementations)
-     */
+function mapTo(value) {
+    return Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function () { return value; });
+}
+//# sourceMappingURL=mapTo.js.map
 
-    .set('bracket', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^(?:\[([!^]?)([^\]]{2,}|\]-)(\]|[^*+?]+)|\[)/);
-      if (!m) return;
+/***/ }),
 
-      var prev = this.prev();
-      var val = m[0];
-      var negated = m[1] ? '^' : '';
-      var inner = m[2] || '';
-      var close = m[3] || '';
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/materialize.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return materialize; });
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Notification.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-      var esc = this.input.slice(0, 2);
-      if (inner === '' && esc === '\\]') {
-        inner += esc;
-        this.consume(2);
 
-        var str = this.input;
-        var idx = -1;
-        var ch;
 
-        while ((ch = str[++idx])) {
-          this.consume(1);
-          if (ch === ']') {
-            close = ch;
-            break;
-          }
-          inner += ch;
-        }
-      }
+function materialize() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* Notification */ "a"].createNext(value));
+        }, function () {
+            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* Notification */ "a"].createComplete());
+            subscriber.complete();
+        }, function (err) {
+            subscriber.next(_Notification__WEBPACK_IMPORTED_MODULE_0__[/* Notification */ "a"].createError(err));
+            subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=materialize.js.map
 
-      return pos(new Node({
-        type: 'bracket',
-        val: val,
-        escaped: close !== ']',
-        negated: negated,
-        inner: inner,
-        close: close
-      }));
-    })
+/***/ }),
 
-    /**
-     * Empty braces (we capture these early to
-     * speed up processing in the compiler)
-     */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/max.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    .set('multiplier', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^\{((?:,|\{,+\})+)\}/);
-      if (!m) return;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return max; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-      this.multiplier = true;
-      var prev = this.prev();
-      var val = m[0];
 
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
+function max(comparer) {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(comparer) ? function (x, y) { return (comparer(x, y) > 0 ? x : y); } : function (x, y) { return (x > y ? x : y); });
+}
+//# sourceMappingURL=max.js.map
 
-      var node = pos(new Node({
-        type: 'text',
-        multiplier: 1,
-        match: m,
-        val: val
-      }));
+/***/ }),
 
-      return concatNodes.call(this, pos, node, prev, options);
-    })
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/merge.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    /**
-     * Open
-     */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return merge; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
 
-    .set('brace.open', function() {
-      var pos = this.position();
-      var m = this.match(/^\{(?!(?:[^\\}]?|,+)\})/);
-      if (!m) return;
 
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
 
-      // if the last parsed character was an extglob character
-      // we need to _not optimize_ the brace pattern because
-      // it might be mistaken for an extglob by a downstream parser
-      if (last && last.val && isExtglobChar(last.val.slice(-1))) {
-        last.optimize = false;
-      }
 
-      var open = pos(new Node({
-        type: 'brace.open',
-        val: m[0]
-      }));
 
-      var node = pos(new Node({
-        type: 'brace',
-        nodes: []
-      }));
 
-      node.push(open);
-      prev.push(node);
-      this.push('brace', node);
-    })
+function merge() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_4__[/* popScheduler */ "c"])(args);
+    var concurrent = Object(_util_args__WEBPACK_IMPORTED_MODULE_4__[/* popNumber */ "a"])(args, Infinity);
+    args = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_2__[/* argsOrArgArray */ "a"])(args);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_mergeAll__WEBPACK_IMPORTED_MODULE_3__[/* mergeAll */ "a"])(concurrent)(Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__[/* from */ "a"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)), scheduler)).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=merge.js.map
 
-    /**
-     * Close
-     */
+/***/ }),
 
-    .set('brace.close', function() {
-      var pos = this.position();
-      var m = this.match(/^\}/);
-      if (!m || !m[0]) return;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      var brace = this.pop('brace');
-      var node = pos(new Node({
-        type: 'brace.close',
-        val: m[0]
-      }));
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeAll; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-      if (!this.isType(brace, 'brace')) {
-        if (this.options.strict) {
-          throw new Error('missing opening "{"');
-        }
-        node.type = 'text';
-        node.multiplier = 0;
-        node.escaped = true;
-        return node;
-      }
 
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
-      if (last.text) {
-        var lastNode = utils.last(last.nodes);
-        if (lastNode.val === ')' && /[!@*?+]\(/.test(last.text)) {
-          var open = last.nodes[0];
-          var text = last.nodes[1];
-          if (open.type === 'brace.open' && text && text.type === 'text') {
-            text.optimize = false;
-          }
-        }
-      }
+function mergeAll(concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"], concurrent);
+}
+//# sourceMappingURL=mergeAll.js.map
 
-      if (brace.nodes.length > 2) {
-        var first = brace.nodes[1];
-        if (first.type === 'text' && first.val === ',') {
-          brace.nodes.splice(1, 1);
-          brace.nodes.push(first);
-        }
-      }
+/***/ }),
 
-      brace.push(node);
-    })
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    /**
-     * Capture boundary characters
-     */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeInternals; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-    .set('boundary', function() {
-      var pos = this.position();
-      var m = this.match(/^[$^](?!\{)/);
-      if (!m) return;
-      return pos(new Node({
-        type: 'text',
-        val: m[0]
-      }));
-    })
 
-    /**
-     * One or zero, non-comma characters wrapped in braces
-     */
 
-    .set('nobrace', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^\{[^,]?\}/);
-      if (!m) return;
+function mergeInternals(source, subscriber, project, concurrent, onBeforeNext, expand, innerSubScheduler, additionalFinalizer) {
+    var buffer = [];
+    var active = 0;
+    var index = 0;
+    var isComplete = false;
+    var checkComplete = function () {
+        if (isComplete && !buffer.length && !active) {
+            subscriber.complete();
+        }
+    };
+    var outerNext = function (value) { return (active < concurrent ? doInnerSub(value) : buffer.push(value)); };
+    var doInnerSub = function (value) {
+        expand && subscriber.next(value);
+        active++;
+        var innerComplete = false;
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(project(value, index++)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (innerValue) {
+            onBeforeNext === null || onBeforeNext === void 0 ? void 0 : onBeforeNext(innerValue);
+            if (expand) {
+                outerNext(innerValue);
+            }
+            else {
+                subscriber.next(innerValue);
+            }
+        }, function () {
+            innerComplete = true;
+        }, undefined, function () {
+            if (innerComplete) {
+                try {
+                    active--;
+                    var _loop_1 = function () {
+                        var bufferedValue = buffer.shift();
+                        if (innerSubScheduler) {
+                            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__[/* executeSchedule */ "a"])(subscriber, innerSubScheduler, function () { return doInnerSub(bufferedValue); });
+                        }
+                        else {
+                            doInnerSub(bufferedValue);
+                        }
+                    };
+                    while (buffer.length && active < concurrent) {
+                        _loop_1();
+                    }
+                    checkComplete();
+                }
+                catch (err) {
+                    subscriber.error(err);
+                }
+            }
+        }));
+    };
+    source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, outerNext, function () {
+        isComplete = true;
+        checkComplete();
+    }));
+    return function () {
+        additionalFinalizer === null || additionalFinalizer === void 0 ? void 0 : additionalFinalizer();
+    };
+}
+//# sourceMappingURL=mergeInternals.js.map
 
-      var prev = this.prev();
-      var val = m[0];
+/***/ }),
 
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      return pos(new Node({
-        type: 'text',
-        multiplier: 0,
-        val: val
-      }));
-    })
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeMap; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-    /**
-     * Text
-     */
 
-    .set('text', function() {
-      var isInside = this.isInside('brace');
-      var pos = this.position();
-      var m = this.match(/^((?!\\)[^${}[\]])+/);
-      if (!m) return;
 
-      var prev = this.prev();
-      var val = m[0];
 
-      if (isInside && prev.type === 'brace') {
-        prev.text = prev.text || '';
-        prev.text += val;
-      }
 
-      var node = pos(new Node({
-        type: 'text',
-        multiplier: 1,
-        val: val
-      }));
+function mergeMap(project, resultSelector, concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_4__[/* isFunction */ "a"])(resultSelector)) {
+        return mergeMap(function (a, i) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function (b, ii) { return resultSelector(a, b, i, ii); })(Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_1__[/* innerFrom */ "a"])(project(a, i))); }, concurrent);
+    }
+    else if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) { return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_3__[/* mergeInternals */ "a"])(source, subscriber, project, concurrent); });
+}
+//# sourceMappingURL=mergeMap.js.map
 
-      return concatNodes.call(this, pos, node, prev, options);
-    });
-};
+/***/ }),
 
-/**
- * Returns true if the character is an extglob character.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeMapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isExtglobChar(ch) {
-  return ch === '!' || ch === '@' || ch === '*' || ch === '?' || ch === '+';
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeMapTo; });
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+
+
+function mergeMapTo(innerObservable, resultSelector, concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector)) {
+        return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(function () { return innerObservable; }, resultSelector, concurrent);
+    }
+    if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__[/* mergeMap */ "a"])(function () { return innerObservable; }, concurrent);
 }
+//# sourceMappingURL=mergeMapTo.js.map
 
-/**
- * Combine text nodes, and calculate empty sets (`{,,}`)
- * @param {Function} `pos` Function to calculate node position
- * @param {Object} `node` AST node
- * @return {Object}
- */
+/***/ }),
 
-function concatNodes(pos, node, parent, options) {
-  node.orig = node.val;
-  var prev = this.prev();
-  var last = utils.last(prev.nodes);
-  var isEscaped = false;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeScan.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (node.val.length > 1) {
-    var a = node.val.charAt(0);
-    var b = node.val.slice(-1);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeScan; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _mergeInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeInternals.js");
 
-    isEscaped = (a === '"' && b === '"')
-      || (a === "'" && b === "'")
-      || (a === '`' && b === '`');
-  }
 
-  if (isEscaped && options.unescape !== false) {
-    node.val = node.val.slice(1, node.val.length - 1);
-    node.escaped = true;
-  }
+function mergeScan(accumulator, seed, concurrent) {
+    if (concurrent === void 0) { concurrent = Infinity; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var state = seed;
+        return Object(_mergeInternals__WEBPACK_IMPORTED_MODULE_1__[/* mergeInternals */ "a"])(source, subscriber, function (value, index) { return accumulator(state, value, index); }, concurrent, function (value) {
+            state = value;
+        }, false, undefined, function () { return (state = null); });
+    });
+}
+//# sourceMappingURL=mergeScan.js.map
 
-  if (node.match) {
-    var match = node.match[1];
-    if (!match || match.indexOf('}') === -1) {
-      match = node.match[0];
-    }
+/***/ }),
 
-    // replace each set with a single ","
-    var val = match.replace(/\{/g, ',').replace(/\}/g, '');
-    node.multiplier *= val.length;
-    node.val = '';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/mergeWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var simpleText = last.type === 'text'
-    && last.multiplier === 1
-    && node.multiplier === 1
-    && node.val;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mergeWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _merge__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/merge.js");
 
-  if (simpleText) {
-    last.val += node.val;
-    return;
-  }
 
-  prev.push(node);
+function mergeWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
+    }
+    return _merge__WEBPACK_IMPORTED_MODULE_1__[/* merge */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)));
 }
-
+//# sourceMappingURL=mergeWith.js.map
 
 /***/ }),
-/* 623 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/min.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return min; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
 
-var isObject = __webpack_require__(592);
-var define = __webpack_require__(624);
-var utils = __webpack_require__(625);
-var ownNames;
+function min(comparer) {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(comparer) ? function (x, y) { return (comparer(x, y) < 0 ? x : y); } : function (x, y) { return (x < y ? x : y); });
+}
+//# sourceMappingURL=min.js.map
 
-/**
- * Create a new AST `Node` with the given `val` and `type`.
- *
- * ```js
- * var node = new Node('*', 'Star');
- * var node = new Node({type: 'star', val: '*'});
- * ```
- * @name Node
- * @param {String|Object} `val` Pass a matched substring, or an object to merge onto the node.
- * @param {String} `type` The node type to use when `val` is a string.
- * @return {Object} node instance
- * @api public
- */
+/***/ }),
 
-function Node(val, type, parent) {
-  if (typeof type !== 'string') {
-    parent = type;
-    type = null;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  define(this, 'parent', parent);
-  define(this, 'isNode', true);
-  define(this, 'expect', null);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return multicast; });
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _connect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
 
-  if (typeof type !== 'string' && isObject(val)) {
-    lazyKeys();
-    var keys = Object.keys(val);
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (ownNames.indexOf(key) === -1) {
-        this[key] = val[key];
-      }
+
+
+function multicast(subjectOrSubjectFactory, selector) {
+    var subjectFactory = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(subjectOrSubjectFactory) ? subjectOrSubjectFactory : function () { return subjectOrSubjectFactory; };
+    if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(selector)) {
+        return Object(_connect__WEBPACK_IMPORTED_MODULE_2__[/* connect */ "a"])(selector, {
+            connector: subjectFactory,
+        });
     }
-  } else {
-    this.type = type;
-    this.val = val;
-  }
+    return function (source) { return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__[/* ConnectableObservable */ "a"](source, subjectFactory); };
 }
+//# sourceMappingURL=multicast.js.map
 
-/**
- * Returns true if the given value is a node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({type: 'foo'});
- * console.log(Node.isNode(node)); //=> true
- * console.log(Node.isNode({})); //=> false
- * ```
- * @param {Object} `node`
- * @returns {Boolean}
- * @api public
- */
+/***/ }),
 
-Node.isNode = function(node) {
-  return utils.isNode(node);
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Define a non-enumberable property on the node instance.
- * Useful for adding properties that shouldn't be extended
- * or visible during debugging.
- *
- * ```js
- * var node = new Node();
- * node.define('foo', 'something non-enumerable');
- * ```
- * @param {String} `name`
- * @param {any} `val`
- * @return {Object} returns the node instance
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observeOn; });
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-Node.prototype.define = function(name, val) {
-  define(this, name, val);
-  return this;
-};
 
-/**
- * Returns true if `node.val` is an empty string, or `node.nodes` does
- * not contain any non-empty text nodes.
- *
- * ```js
- * var node = new Node({type: 'text'});
- * node.isEmpty(); //=> true
- * node.val = 'foo';
- * node.isEmpty(); //=> false
- * ```
- * @param {Function} `fn` (optional) Filter function that is called on `node` and/or child nodes. `isEmpty` will return false immediately when the filter function returns false on any nodes.
- * @return {Boolean}
- * @api public
- */
 
-Node.prototype.isEmpty = function(fn) {
-  return utils.isEmpty(this, fn);
-};
+function observeOn(scheduler, delay) {
+    if (delay === void 0) { delay = 0; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__[/* executeSchedule */ "a"])(subscriber, scheduler, function () { return subscriber.next(value); }, delay); }, function () { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__[/* executeSchedule */ "a"])(subscriber, scheduler, function () { return subscriber.complete(); }, delay); }, function (err) { return Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_0__[/* executeSchedule */ "a"])(subscriber, scheduler, function () { return subscriber.error(err); }, delay); }));
+    });
+}
+//# sourceMappingURL=observeOn.js.map
 
-/**
- * Given node `foo` and node `bar`, push node `bar` onto `foo.nodes`, and
- * set `foo` as `bar.parent`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * foo.push(bar);
- * ```
- * @param {Object} `node`
- * @return {Number} Returns the length of `node.nodes`
- * @api public
- */
+/***/ }),
 
-Node.prototype.push = function(node) {
-  assert(Node.isNode(node), 'expected node to be an instance of Node');
-  define(node, 'parent', this);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/onErrorResumeNext.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  this.nodes = this.nodes || [];
-  return this.nodes.push(node);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return onErrorResumeNext; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-/**
- * Given node `foo` and node `bar`, unshift node `bar` onto `foo.nodes`, and
- * set `foo` as `bar.parent`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * foo.unshift(bar);
- * ```
- * @param {Object} `node`
- * @return {Number} Returns the length of `node.nodes`
- * @api public
- */
 
-Node.prototype.unshift = function(node) {
-  assert(Node.isNode(node), 'expected node to be an instance of Node');
-  define(node, 'parent', this);
 
-  this.nodes = this.nodes || [];
-  return this.nodes.unshift(node);
-};
 
-/**
- * Pop a node from `node.nodes`.
- *
- * ```js
- * var node = new Node({type: 'foo'});
- * node.push(new Node({type: 'a'}));
- * node.push(new Node({type: 'b'}));
- * node.push(new Node({type: 'c'}));
- * node.push(new Node({type: 'd'}));
- * console.log(node.nodes.length);
- * //=> 4
- * node.pop();
- * console.log(node.nodes.length);
- * //=> 3
- * ```
- * @return {Number} Returns the popped `node`
- * @api public
- */
 
-Node.prototype.pop = function() {
-  return this.nodes && this.nodes.pop();
-};
 
-/**
- * Shift a node from `node.nodes`.
- *
- * ```js
- * var node = new Node({type: 'foo'});
- * node.push(new Node({type: 'a'}));
- * node.push(new Node({type: 'b'}));
- * node.push(new Node({type: 'c'}));
- * node.push(new Node({type: 'd'}));
- * console.log(node.nodes.length);
- * //=> 4
- * node.shift();
- * console.log(node.nodes.length);
- * //=> 3
- * ```
- * @return {Object} Returns the shifted `node`
- * @api public
- */
+function onErrorResumeNext() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    var nextSources = Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_3__[/* argsOrArgArray */ "a"])(sources);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var remaining = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(nextSources));
+        var subscribeNext = function () {
+            if (!subscriber.closed) {
+                if (remaining.length > 0) {
+                    var nextSource = void 0;
+                    try {
+                        nextSource = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(remaining.shift());
+                    }
+                    catch (err) {
+                        subscribeNext();
+                        return;
+                    }
+                    var innerSub = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"], _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"]);
+                    nextSource.subscribe(innerSub);
+                    innerSub.add(subscribeNext);
+                }
+                else {
+                    subscriber.complete();
+                }
+            }
+        };
+        subscribeNext();
+    });
+}
+//# sourceMappingURL=onErrorResumeNext.js.map
 
-Node.prototype.shift = function() {
-  return this.nodes && this.nodes.shift();
-};
+/***/ }),
 
-/**
- * Remove `node` from `node.nodes`.
- *
- * ```js
- * node.remove(childNode);
- * ```
- * @param {Object} `node`
- * @return {Object} Returns the removed node.
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/pairwise.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Node.prototype.remove = function(node) {
-  assert(Node.isNode(node), 'expected node to be an instance of Node');
-  this.nodes = this.nodes || [];
-  var idx = node.index;
-  if (idx !== -1) {
-    node.index = -1;
-    return this.nodes.splice(idx, 1);
-  }
-  return null;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pairwise; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Get the first child node from `node.nodes` that matches the given `type`.
- * If `type` is a number, the child node at that index is returned.
- *
- * ```js
- * var child = node.find(1); //<= index of the node to get
- * var child = node.find('foo'); //<= node.type of a child node
- * var child = node.find(/^(foo|bar)$/); //<= regex to match node.type
- * var child = node.find(['foo', 'bar']); //<= array of node.type(s)
- * ```
- * @param {String} `type`
- * @return {Object} Returns a child node or undefined.
- * @api public
- */
 
-Node.prototype.find = function(type) {
-  return utils.findNode(this.nodes, type);
-};
+function pairwise() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var prev;
+        var hasPrev = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var p = prev;
+            prev = value;
+            hasPrev && subscriber.next([p, value]);
+            hasPrev = true;
+        }));
+    });
+}
+//# sourceMappingURL=pairwise.js.map
 
-/**
- * Return true if the node is the given `type`.
- *
- * ```js
- * var node = new Node({type: 'bar'});
- * cosole.log(node.isType('foo'));          // false
- * cosole.log(node.isType(/^(foo|bar)$/));  // true
- * cosole.log(node.isType(['foo', 'bar'])); // true
- * ```
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
+/***/ }),
 
-Node.prototype.isType = function(type) {
-  return utils.isType(this, type);
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/partition.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Return true if the `node.nodes` has the given `type`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * foo.push(bar);
- *
- * cosole.log(foo.hasType('qux'));          // false
- * cosole.log(foo.hasType(/^(qux|bar)$/));  // true
- * cosole.log(foo.hasType(['qux', 'bar'])); // true
- * ```
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return partition; });
+/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/not.js");
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
 
-Node.prototype.hasType = function(type) {
-  return utils.hasType(this, type);
-};
 
-/**
- * Get the siblings array, or `null` if it doesn't exist.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * foo.push(bar);
- * foo.push(baz);
- *
- * console.log(bar.siblings.length) // 2
- * console.log(baz.siblings.length) // 2
- * ```
- * @return {Array}
- * @api public
- */
+function partition(predicate, thisArg) {
+    return function (source) {
+        return [Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(predicate, thisArg)(source), Object(_filter__WEBPACK_IMPORTED_MODULE_1__[/* filter */ "a"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__[/* not */ "a"])(predicate, thisArg))(source)];
+    };
+}
+//# sourceMappingURL=partition.js.map
 
-Object.defineProperty(Node.prototype, 'siblings', {
-  set: function() {
-    throw new Error('node.siblings is a getter and cannot be defined');
-  },
-  get: function() {
-    return this.parent ? this.parent.nodes : null;
-  }
-});
+/***/ }),
 
-/**
- * Get the node's current index from `node.parent.nodes`.
- * This should always be correct, even when the parent adds nodes.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.unshift(qux);
- *
- * console.log(bar.index) // 1
- * console.log(baz.index) // 2
- * console.log(qux.index) // 0
- * ```
- * @return {Number}
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/pluck.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Object.defineProperty(Node.prototype, 'index', {
-  set: function(index) {
-    define(this, 'idx', index);
-  },
-  get: function() {
-    if (!Array.isArray(this.siblings)) {
-      return -1;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pluck; });
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+
+function pluck() {
+    var properties = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        properties[_i] = arguments[_i];
     }
-    var tok = this.idx !== -1 ? this.siblings[this.idx] : null;
-    if (tok !== this) {
-      this.idx = this.siblings.indexOf(this);
+    var length = properties.length;
+    if (length === 0) {
+        throw new Error('list of properties cannot be empty.');
     }
-    return this.idx;
-  }
-});
-
-/**
- * Get the previous node from the siblings array or `null`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * foo.push(bar);
- * foo.push(baz);
- *
- * console.log(baz.prev.type) // 'bar'
- * ```
- * @return {Object}
- * @api public
- */
+    return Object(_map__WEBPACK_IMPORTED_MODULE_0__[/* map */ "a"])(function (x) {
+        var currentProp = x;
+        for (var i = 0; i < length; i++) {
+            var p = currentProp === null || currentProp === void 0 ? void 0 : currentProp[properties[i]];
+            if (typeof p !== 'undefined') {
+                currentProp = p;
+            }
+            else {
+                return undefined;
+            }
+        }
+        return currentProp;
+    });
+}
+//# sourceMappingURL=pluck.js.map
 
-Object.defineProperty(Node.prototype, 'prev', {
-  set: function() {
-    throw new Error('node.prev is a getter and cannot be defined');
-  },
-  get: function() {
-    if (Array.isArray(this.siblings)) {
-      return this.siblings[this.index - 1] || this.parent.prev;
-    }
-    return null;
-  }
-});
+/***/ }),
 
-/**
- * Get the siblings array, or `null` if it doesn't exist.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * foo.push(bar);
- * foo.push(baz);
- *
- * console.log(bar.siblings.length) // 2
- * console.log(baz.siblings.length) // 2
- * ```
- * @return {Object}
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publish.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Object.defineProperty(Node.prototype, 'next', {
-  set: function() {
-    throw new Error('node.next is a getter and cannot be defined');
-  },
-  get: function() {
-    if (Array.isArray(this.siblings)) {
-      return this.siblings[this.index + 1] || this.parent.next;
-    }
-    return null;
-  }
-});
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publish; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony import */ var _connect__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
 
-/**
- * Get the first node from `node.nodes`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.push(qux);
- *
- * console.log(foo.first.type) // 'bar'
- * ```
- * @return {Object} The first node, or undefiend
- * @api public
- */
 
-Object.defineProperty(Node.prototype, 'first', {
-  get: function() {
-    return this.nodes ? this.nodes[0] : null;
-  }
-});
 
-/**
- * Get the last node from `node.nodes`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.push(qux);
- *
- * console.log(foo.last.type) // 'qux'
- * ```
- * @return {Object} The last node, or undefiend
- * @api public
- */
+function publish(selector) {
+    return selector ? function (source) { return Object(_connect__WEBPACK_IMPORTED_MODULE_2__[/* connect */ "a"])(selector)(source); } : function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__[/* multicast */ "a"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]())(source); };
+}
+//# sourceMappingURL=publish.js.map
 
-Object.defineProperty(Node.prototype, 'last', {
-  get: function() {
-    return this.nodes ? utils.last(this.nodes) : null;
-  }
-});
+/***/ }),
 
-/**
- * Get the last node from `node.nodes`.
- *
- * ```js
- * var foo = new Node({type: 'foo'});
- * var bar = new Node({type: 'bar'});
- * var baz = new Node({type: 'baz'});
- * var qux = new Node({type: 'qux'});
- * foo.push(bar);
- * foo.push(baz);
- * foo.push(qux);
- *
- * console.log(foo.last.type) // 'qux'
- * ```
- * @return {Object} The last node, or undefiend
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publishBehavior.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Object.defineProperty(Node.prototype, 'scope', {
-  get: function() {
-    if (this.isScope !== true) {
-      return this.parent ? this.parent.scope : this;
-    }
-    return this;
-  }
-});
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publishBehavior; });
+/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/BehaviorSubject.js");
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
 
-/**
- * Get own property names from Node prototype, but only the
- * first time `Node` is instantiated
- */
 
-function lazyKeys() {
-  if (!ownNames) {
-    ownNames = Object.getOwnPropertyNames(Node.prototype);
-  }
+function publishBehavior(initialValue) {
+    return function (source) {
+        var subject = new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__[/* BehaviorSubject */ "a"](initialValue);
+        return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__[/* ConnectableObservable */ "a"](source, function () { return subject; });
+    };
 }
+//# sourceMappingURL=publishBehavior.js.map
 
-/**
- * Simplified assertion. Throws an error is `val` is falsey.
- */
+/***/ }),
 
-function assert(val, message) {
-  if (!val) throw new Error(message);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publishLast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Expose `Node`
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publishLast; });
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/AsyncSubject.js");
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/ConnectableObservable.js");
 
-exports = module.exports = Node;
 
+function publishLast() {
+    return function (source) {
+        var subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__[/* AsyncSubject */ "a"]();
+        return new _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__[/* ConnectableObservable */ "a"](source, function () { return subject; });
+    };
+}
+//# sourceMappingURL=publishLast.js.map
 
 /***/ }),
-/* 624 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/publishReplay.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return publishReplay; });
+/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js");
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
 
 
-var isDescriptor = __webpack_require__(593);
+function publishReplay(bufferSize, windowTime, selectorOrScheduler, timestampProvider) {
+    if (selectorOrScheduler && !Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__[/* isFunction */ "a"])(selectorOrScheduler)) {
+        timestampProvider = selectorOrScheduler;
+    }
+    var selector = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__[/* isFunction */ "a"])(selectorOrScheduler) ? selectorOrScheduler : undefined;
+    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__[/* multicast */ "a"])(new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__[/* ReplaySubject */ "a"](bufferSize, windowTime, timestampProvider), selector)(source); };
+}
+//# sourceMappingURL=publishReplay.js.map
 
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
+/***/ }),
 
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/race.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return race; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js");
+/* harmony import */ var _raceWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js");
 
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
 
 
+function race() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return _raceWith__WEBPACK_IMPORTED_MODULE_2__[/* raceWith */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(Object(_util_argsOrArgArray__WEBPACK_IMPORTED_MODULE_1__[/* argsOrArgArray */ "a"])(args))));
+}
+//# sourceMappingURL=race.js.map
+
 /***/ }),
-/* 625 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return raceWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/race.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
 
-var typeOf = __webpack_require__(626);
-var utils = module.exports;
 
-/**
- * Returns true if the given value is a node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({type: 'foo'});
- * console.log(utils.isNode(node)); //=> true
- * console.log(utils.isNode({})); //=> false
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {Boolean}
- * @api public
- */
 
-utils.isNode = function(node) {
-  return typeOf(node) === 'object' && node.isNode === true;
-};
+function raceWith() {
+    var otherSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherSources[_i] = arguments[_i];
+    }
+    return !otherSources.length
+        ? _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"]
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+            Object(_observable_race__WEBPACK_IMPORTED_MODULE_1__[/* raceInit */ "b"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherSources)))(subscriber);
+        });
+}
+//# sourceMappingURL=raceWith.js.map
 
-/**
- * Emit an empty string for the given `node`.
- *
- * ```js
- * // do nothing for beginning-of-string
- * snapdragon.compiler.set('bos', utils.noop);
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {undefined}
- * @api public
- */
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return reduce; });
+/* harmony import */ var _scanInternals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scanInternals.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-utils.noop = function(node) {
-  append(this, '', node);
-};
 
-/**
- * Appdend `node.val` to `compiler.output`, exactly as it was created
- * by the parser.
- *
- * ```js
- * snapdragon.compiler.set('text', utils.identity);
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {undefined}
- * @api public
- */
+function reduce(accumulator, seed) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(Object(_scanInternals__WEBPACK_IMPORTED_MODULE_0__[/* scanInternals */ "a"])(accumulator, seed, arguments.length >= 2, false, true));
+}
+//# sourceMappingURL=reduce.js.map
 
-utils.identity = function(node) {
-  append(this, node.val, node);
-};
+/***/ }),
 
-/**
- * Previously named `.emit`, this method appends the given `val`
- * to `compiler.output` for the given node. Useful when you know
- * what value should be appended advance, regardless of the actual
- * value of `node.val`.
- *
- * ```js
- * snapdragon.compiler
- *   .set('i', function(node) {
- *     this.mapVisit(node);
- *   })
- *   .set('i.open', utils.append('<i>'))
- *   .set('i.close', utils.append('</i>'))
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @returns {Function} Returns a compiler middleware function.
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.append = function(val) {
-  return function(node) {
-    append(this, val, node);
-  };
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return refCount; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Used in compiler middleware, this onverts an AST node into
- * an empty `text` node and deletes `node.nodes` if it exists.
- * The advantage of this method is that, as opposed to completely
- * removing the node, indices will not need to be re-calculated
- * in sibling nodes, and nothing is appended to the output.
- *
- * ```js
- * utils.toNoop(node);
- * // convert `node.nodes` to the given value instead of deleting it
- * utils.toNoop(node, []);
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Array} `nodes` Optionally pass a new `nodes` value, to replace the existing `node.nodes` array.
- * @api public
- */
 
-utils.toNoop = function(node, nodes) {
-  if (nodes) {
-    node.nodes = nodes;
-  } else {
-    delete node.nodes;
-    node.type = 'text';
-    node.val = '';
-  }
-};
+function refCount() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var connection = null;
+        source._refCount++;
+        var refCounter = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, undefined, undefined, function () {
+            if (!source || source._refCount <= 0 || 0 < --source._refCount) {
+                connection = null;
+                return;
+            }
+            var sharedConnection = source._connection;
+            var conn = connection;
+            connection = null;
+            if (sharedConnection && (!conn || sharedConnection === conn)) {
+                sharedConnection.unsubscribe();
+            }
+            subscriber.unsubscribe();
+        });
+        source.subscribe(refCounter);
+        if (!refCounter.closed) {
+            connection = source.connect();
+        }
+    });
+}
+//# sourceMappingURL=refCount.js.map
 
-/**
- * Visit `node` with the given `fn`. The built-in `.visit` method in snapdragon
- * automatically calls registered compilers, this allows you to pass a visitor
- * function.
- *
- * ```js
- * snapdragon.compiler.set('i', function(node) {
- *   utils.visit(node, function(childNode) {
- *     // do stuff with "childNode"
- *     return childNode;
- *   });
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `fn`
- * @return {Object} returns the node after recursively visiting all child nodes.
- * @api public
- */
+/***/ }),
 
-utils.visit = function(node, fn) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(fn), 'expected a visitor function');
-  fn(node);
-  return node.nodes ? utils.mapVisit(node, fn) : node;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/repeat.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Map [visit](#visit) the given `fn` over `node.nodes`. This is called by
- * [visit](#visit), use this method if you do not want `fn` to be called on
- * the first node.
- *
- * ```js
- * snapdragon.compiler.set('i', function(node) {
- *   utils.mapVisit(node, function(childNode) {
- *     // do stuff with "childNode"
- *     return childNode;
- *   });
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Object} `options`
- * @param {Function} `fn`
- * @return {Object} returns the node
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return repeat; });
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-utils.mapVisit = function(node, fn) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isArray(node.nodes), 'expected node.nodes to be an array');
-  assert(isFunction(fn), 'expected a visitor function');
 
-  for (var i = 0; i < node.nodes.length; i++) {
-    utils.visit(node.nodes[i], fn);
-  }
-  return node;
-};
 
-/**
- * Unshift an `*.open` node onto `node.nodes`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * snapdragon.parser.set('brace', function(node) {
- *   var match = this.match(/^{/);
- *   if (match) {
- *     var parent = new Node({type: 'brace'});
- *     utils.addOpen(parent, Node);
- *     console.log(parent.nodes[0]):
- *     // { type: 'brace.open', val: '' };
- *
- *     // push the parent "brace" node onto the stack
- *     this.push(parent);
- *
- *     // return the parent node, so it's also added to the AST
- *     return brace;
- *   }
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
- * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
- * @return {Object} Returns the created opening node.
- * @api public
- */
 
-utils.addOpen = function(node, Node, val, filter) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(Node), 'expected Node to be a constructor function');
 
-  if (typeof val === 'function') {
-    filter = val;
-    val = '';
-  }
+function repeat(countOrConfig) {
+    var _a;
+    var count = Infinity;
+    var delay;
+    if (countOrConfig != null) {
+        if (typeof countOrConfig === 'object') {
+            (_a = countOrConfig.count, count = _a === void 0 ? Infinity : _a, delay = countOrConfig.delay);
+        }
+        else {
+            count = countOrConfig;
+        }
+    }
+    return count <= 0
+        ? function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]; }
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var soFar = 0;
+            var sourceSub;
+            var resubscribe = function () {
+                sourceSub === null || sourceSub === void 0 ? void 0 : sourceSub.unsubscribe();
+                sourceSub = null;
+                if (delay != null) {
+                    var notifier = typeof delay === 'number' ? Object(_observable_timer__WEBPACK_IMPORTED_MODULE_4__[/* timer */ "a"])(delay) : Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(delay(soFar));
+                    var notifierSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                        notifierSubscriber_1.unsubscribe();
+                        subscribeToSource();
+                    });
+                    notifier.subscribe(notifierSubscriber_1);
+                }
+                else {
+                    subscribeToSource();
+                }
+            };
+            var subscribeToSource = function () {
+                var syncUnsub = false;
+                sourceSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                    if (++soFar < count) {
+                        if (sourceSub) {
+                            resubscribe();
+                        }
+                        else {
+                            syncUnsub = true;
+                        }
+                    }
+                    else {
+                        subscriber.complete();
+                    }
+                }));
+                if (syncUnsub) {
+                    resubscribe();
+                }
+            };
+            subscribeToSource();
+        });
+}
+//# sourceMappingURL=repeat.js.map
 
-  if (typeof filter === 'function' && !filter(node)) return;
-  var open = new Node({ type: node.type + '.open', val: val});
-  var unshift = node.unshift || node.unshiftNode;
-  if (typeof unshift === 'function') {
-    unshift.call(node, open);
-  } else {
-    utils.unshiftNode(node, open);
-  }
-  return open;
-};
+/***/ }),
 
-/**
- * Push a `*.close` node onto `node.nodes`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * snapdragon.parser.set('brace', function(node) {
- *   var match = this.match(/^}/);
- *   if (match) {
- *     var parent = this.parent();
- *     if (parent.type !== 'brace') {
- *       throw new Error('missing opening: ' + '}');
- *     }
- *
- *     utils.addClose(parent, Node);
- *     console.log(parent.nodes[parent.nodes.length - 1]):
- *     // { type: 'brace.close', val: '' };
- *
- *     // no need to return a node, since the parent
- *     // was already added to the AST
- *     return;
- *   }
- * });
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
- * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
- * @return {Object} Returns the created closing node.
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/repeatWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.addClose = function(node, Node, val, filter) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(Node), 'expected Node to be a constructor function');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return repeatWhen; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  if (typeof val === 'function') {
-    filter = val;
-    val = '';
-  }
 
-  if (typeof filter === 'function' && !filter(node)) return;
-  var close = new Node({ type: node.type + '.close', val: val});
-  var push = node.push || node.pushNode;
-  if (typeof push === 'function') {
-    push.call(node, close);
-  } else {
-    utils.pushNode(node, close);
-  }
-  return close;
-};
 
-/**
- * Wraps the given `node` with `*.open` and `*.close` nodes.
- *
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
- * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
- * @return {Object} Returns the node
- * @api public
- */
+function repeatWhen(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSub;
+        var syncResub = false;
+        var completions$;
+        var isNotifierComplete = false;
+        var isMainComplete = false;
+        var checkComplete = function () { return isMainComplete && isNotifierComplete && (subscriber.complete(), true); };
+        var getCompletionSubject = function () {
+            if (!completions$) {
+                completions$ = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+                notifier(completions$).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                    if (innerSub) {
+                        subscribeForRepeatWhen();
+                    }
+                    else {
+                        syncResub = true;
+                    }
+                }, function () {
+                    isNotifierComplete = true;
+                    checkComplete();
+                }));
+            }
+            return completions$;
+        };
+        var subscribeForRepeatWhen = function () {
+            isMainComplete = false;
+            innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, function () {
+                isMainComplete = true;
+                !checkComplete() && getCompletionSubject().next();
+            }));
+            if (syncResub) {
+                innerSub.unsubscribe();
+                innerSub = null;
+                syncResub = false;
+                subscribeForRepeatWhen();
+            }
+        };
+        subscribeForRepeatWhen();
+    });
+}
+//# sourceMappingURL=repeatWhen.js.map
 
-utils.wrapNodes = function(node, Node, filter) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isFunction(Node), 'expected Node to be a constructor function');
+/***/ }),
 
-  utils.addOpen(node, Node, filter);
-  utils.addClose(node, Node, filter);
-  return node;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/retry.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Push the given `node` onto `parent.nodes`, and set `parent` as `node.parent.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * var node = new Node({type: 'bar'});
- * utils.pushNode(parent, node);
- * console.log(parent.nodes[0].type) // 'bar'
- * console.log(node.parent.type) // 'foo'
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Object} Returns the child node
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return retry; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-utils.pushNode = function(parent, node) {
-  assert(utils.isNode(parent), 'expected parent node to be an instance of Node');
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-  node.define('parent', parent);
-  parent.nodes = parent.nodes || [];
-  parent.nodes.push(node);
-  return node;
-};
 
-/**
- * Unshift `node` onto `parent.nodes`, and set `parent` as `node.parent.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * var node = new Node({type: 'bar'});
- * utils.unshiftNode(parent, node);
- * console.log(parent.nodes[0].type) // 'bar'
- * console.log(node.parent.type) // 'foo'
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {undefined}
- * @api public
- */
 
-utils.unshiftNode = function(parent, node) {
-  assert(utils.isNode(parent), 'expected parent node to be an instance of Node');
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-  node.define('parent', parent);
-  parent.nodes = parent.nodes || [];
-  parent.nodes.unshift(node);
-};
+function retry(configOrCount) {
+    if (configOrCount === void 0) { configOrCount = Infinity; }
+    var config;
+    if (configOrCount && typeof configOrCount === 'object') {
+        config = configOrCount;
+    }
+    else {
+        config = {
+            count: configOrCount,
+        };
+    }
+    var _a = config.count, count = _a === void 0 ? Infinity : _a, delay = config.delay, _b = config.resetOnSuccess, resetOnSuccess = _b === void 0 ? false : _b;
+    return count <= 0
+        ? _util_identity__WEBPACK_IMPORTED_MODULE_2__[/* identity */ "a"]
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+            var soFar = 0;
+            var innerSub;
+            var subscribeForRetry = function () {
+                var syncUnsub = false;
+                innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                    if (resetOnSuccess) {
+                        soFar = 0;
+                    }
+                    subscriber.next(value);
+                }, undefined, function (err) {
+                    if (soFar++ < count) {
+                        var resub_1 = function () {
+                            if (innerSub) {
+                                innerSub.unsubscribe();
+                                innerSub = null;
+                                subscribeForRetry();
+                            }
+                            else {
+                                syncUnsub = true;
+                            }
+                        };
+                        if (delay != null) {
+                            var notifier = typeof delay === 'number' ? Object(_observable_timer__WEBPACK_IMPORTED_MODULE_3__[/* timer */ "a"])(delay) : Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__[/* innerFrom */ "a"])(delay(err, soFar));
+                            var notifierSubscriber_1 = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                                notifierSubscriber_1.unsubscribe();
+                                resub_1();
+                            }, function () {
+                                subscriber.complete();
+                            });
+                            notifier.subscribe(notifierSubscriber_1);
+                        }
+                        else {
+                            resub_1();
+                        }
+                    }
+                    else {
+                        subscriber.error(err);
+                    }
+                }));
+                if (syncUnsub) {
+                    innerSub.unsubscribe();
+                    innerSub = null;
+                    subscribeForRetry();
+                }
+            };
+            subscribeForRetry();
+        });
+}
+//# sourceMappingURL=retry.js.map
 
-/**
- * Pop the last `node` off of `parent.nodes`. The advantage of
- * using this method is that it checks for `node.nodes` and works
- * with any version of `snapdragon-node`.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * utils.pushNode(parent, new Node({type: 'foo'}));
- * utils.pushNode(parent, new Node({type: 'bar'}));
- * utils.pushNode(parent, new Node({type: 'baz'}));
- * console.log(parent.nodes.length); //=> 3
- * utils.popNode(parent);
- * console.log(parent.nodes.length); //=> 2
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Number|Undefined} Returns the length of `node.nodes` or undefined.
- * @api public
- */
+/***/ }),
 
-utils.popNode = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  if (typeof node.pop === 'function') {
-    return node.pop();
-  }
-  return node.nodes && node.nodes.pop();
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/retryWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Shift the first `node` off of `parent.nodes`. The advantage of
- * using this method is that it checks for `node.nodes` and works
- * with any version of `snapdragon-node`.
- *
- * ```js
- * var parent = new Node({type: 'foo'});
- * utils.pushNode(parent, new Node({type: 'foo'}));
- * utils.pushNode(parent, new Node({type: 'bar'}));
- * utils.pushNode(parent, new Node({type: 'baz'}));
- * console.log(parent.nodes.length); //=> 3
- * utils.shiftNode(parent);
- * console.log(parent.nodes.length); //=> 2
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Number|Undefined} Returns the length of `node.nodes` or undefined.
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return retryWhen; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-utils.shiftNode = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  if (typeof node.shift === 'function') {
-    return node.shift();
-  }
-  return node.nodes && node.nodes.shift();
-};
 
-/**
- * Remove the specified `node` from `parent.nodes`.
- *
- * ```js
- * var parent = new Node({type: 'abc'});
- * var foo = new Node({type: 'foo'});
- * utils.pushNode(parent, foo);
- * utils.pushNode(parent, new Node({type: 'bar'}));
- * utils.pushNode(parent, new Node({type: 'baz'}));
- * console.log(parent.nodes.length); //=> 3
- * utils.removeNode(parent, foo);
- * console.log(parent.nodes.length); //=> 2
- * ```
- * @param {Object} `parent`
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Object|undefined} Returns the removed node, if successful, or undefined if it does not exist on `parent.nodes`.
- * @api public
- */
 
-utils.removeNode = function(parent, node) {
-  assert(utils.isNode(parent), 'expected parent.node to be an instance of Node');
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
+function retryWhen(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSub;
+        var syncResub = false;
+        var errors$;
+        var subscribeForRetryWhen = function () {
+            innerSub = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, undefined, undefined, function (err) {
+                if (!errors$) {
+                    errors$ = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+                    notifier(errors$).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+                        return innerSub ? subscribeForRetryWhen() : (syncResub = true);
+                    }));
+                }
+                if (errors$) {
+                    errors$.next(err);
+                }
+            }));
+            if (syncResub) {
+                innerSub.unsubscribe();
+                innerSub = null;
+                syncResub = false;
+                subscribeForRetryWhen();
+            }
+        };
+        subscribeForRetryWhen();
+    });
+}
+//# sourceMappingURL=retryWhen.js.map
 
-  if (!parent.nodes) {
-    return null;
-  }
+/***/ }),
 
-  if (typeof parent.remove === 'function') {
-    return parent.remove(node);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/sample.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var idx = parent.nodes.indexOf(node);
-  if (idx !== -1) {
-    return parent.nodes.splice(idx, 1);
-  }
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return sample; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Returns true if `node.type` matches the given `type`. Throws a
- * `TypeError` if `node` is not an instance of `Node`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({type: 'foo'});
- * console.log(utils.isType(node, 'foo')); // false
- * console.log(utils.isType(node, 'bar')); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
 
-utils.isType = function(node, type) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  switch (typeOf(type)) {
-    case 'array':
-      var types = type.slice();
-      for (var i = 0; i < types.length; i++) {
-        if (utils.isType(node, types[i])) {
-          return true;
-        }
-      }
-      return false;
-    case 'string':
-      return node.type === type;
-    case 'regexp':
-      return type.test(node.type);
-    default: {
-      throw new TypeError('expected "type" to be an array, string or regexp');
-    }
-  }
-};
 
-/**
- * Returns true if the given `node` has the given `type` in `node.nodes`.
- * Throws a `TypeError` if `node` is not an instance of `Node`.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var node = new Node({
- *   type: 'foo',
- *   nodes: [
- *     new Node({type: 'bar'}),
- *     new Node({type: 'baz'})
- *   ]
- * });
- * console.log(utils.hasType(node, 'xyz')); // false
- * console.log(utils.hasType(node, 'baz')); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
+function sample(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var lastValue = null;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            lastValue = value;
+        }));
+        notifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            if (hasValue) {
+                hasValue = false;
+                var value = lastValue;
+                lastValue = null;
+                subscriber.next(value);
+            }
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_1__[/* noop */ "a"]));
+    });
+}
+//# sourceMappingURL=sample.js.map
+
+/***/ }),
 
-utils.hasType = function(node, type) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  if (!Array.isArray(node.nodes)) return false;
-  for (var i = 0; i < node.nodes.length; i++) {
-    if (utils.isType(node.nodes[i], type)) {
-      return true;
-    }
-  }
-  return false;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/sampleTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Returns the first node from `node.nodes` of the given `type`
- *
- * ```js
- * var node = new Node({
- *   type: 'foo',
- *   nodes: [
- *     new Node({type: 'text', val: 'abc'}),
- *     new Node({type: 'text', val: 'xyz'})
- *   ]
- * });
- *
- * var textNode = utils.firstOfType(node.nodes, 'text');
- * console.log(textNode.val);
- * //=> 'abc'
- * ```
- * @param {Array} `nodes`
- * @param {String} `type`
- * @return {Object|undefined} Returns the first matching node or undefined.
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return sampleTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _sample__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sample.js");
+/* harmony import */ var _observable_interval__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/interval.js");
 
-utils.firstOfType = function(nodes, type) {
-  for (var i = 0; i < nodes.length; i++) {
-    var node = nodes[i];
-    if (utils.isType(node, type)) {
-      return node;
-    }
-  }
-};
 
-/**
- * Returns the node at the specified index, or the first node of the
- * given `type` from `node.nodes`.
- *
- * ```js
- * var node = new Node({
- *   type: 'foo',
- *   nodes: [
- *     new Node({type: 'text', val: 'abc'}),
- *     new Node({type: 'text', val: 'xyz'})
- *   ]
- * });
- *
- * var nodeOne = utils.findNode(node.nodes, 'text');
- * console.log(nodeOne.val);
- * //=> 'abc'
- *
- * var nodeTwo = utils.findNode(node.nodes, 1);
- * console.log(nodeTwo.val);
- * //=> 'xyz'
- * ```
- *
- * @param {Array} `nodes`
- * @param {String|Number} `type` Node type or index.
- * @return {Object} Returns a node or undefined.
- * @api public
- */
 
-utils.findNode = function(nodes, type) {
-  if (!Array.isArray(nodes)) {
-    return null;
-  }
-  if (typeof type === 'number') {
-    return nodes[type];
-  }
-  return utils.firstOfType(nodes, type);
-};
+function sampleTime(period, scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_sample__WEBPACK_IMPORTED_MODULE_1__[/* sample */ "a"])(Object(_observable_interval__WEBPACK_IMPORTED_MODULE_2__[/* interval */ "a"])(period, scheduler));
+}
+//# sourceMappingURL=sampleTime.js.map
 
-/**
- * Returns true if the given node is an "*.open" node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({type: 'brace'});
- * var open = new Node({type: 'brace.open'});
- * var close = new Node({type: 'brace.close'});
- *
- * console.log(utils.isOpen(brace)); // false
- * console.log(utils.isOpen(open)); // true
- * console.log(utils.isOpen(close)); // false
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
+/***/ }),
 
-utils.isOpen = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  return node.type.slice(-5) === '.open';
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/scan.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Returns true if the given node is a "*.close" node.
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({type: 'brace'});
- * var open = new Node({type: 'brace.open'});
- * var close = new Node({type: 'brace.close'});
- *
- * console.log(utils.isClose(brace)); // false
- * console.log(utils.isClose(open)); // false
- * console.log(utils.isClose(close)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scan; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _scanInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scanInternals.js");
 
-utils.isClose = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  return node.type.slice(-6) === '.close';
-};
 
-/**
- * Returns true if `node.nodes` **has** an `.open` node
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({
- *   type: 'brace',
- *   nodes: []
- * });
- *
- * var open = new Node({type: 'brace.open'});
- * console.log(utils.hasOpen(brace)); // false
- *
- * brace.pushNode(open);
- * console.log(utils.hasOpen(brace)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
+function scan(accumulator, seed) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(Object(_scanInternals__WEBPACK_IMPORTED_MODULE_1__[/* scanInternals */ "a"])(accumulator, seed, arguments.length >= 2, true));
+}
+//# sourceMappingURL=scan.js.map
 
-utils.hasOpen = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  var first = node.first || node.nodes ? node.nodes[0] : null;
-  if (utils.isNode(first)) {
-    return first.type === node.type + '.open';
-  }
-  return false;
-};
+/***/ }),
 
-/**
- * Returns true if `node.nodes` **has** a `.close` node
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({
- *   type: 'brace',
- *   nodes: []
- * });
- *
- * var close = new Node({type: 'brace.close'});
- * console.log(utils.hasClose(brace)); // false
- *
- * brace.pushNode(close);
- * console.log(utils.hasClose(brace)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/scanInternals.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.hasClose = function(node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  var last = node.last || node.nodes ? node.nodes[node.nodes.length - 1] : null;
-  if (utils.isNode(last)) {
-    return last.type === node.type + '.close';
-  }
-  return false;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scanInternals; });
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Returns true if `node.nodes` has both `.open` and `.close` nodes
- *
- * ```js
- * var Node = require('snapdragon-node');
- * var brace = new Node({
- *   type: 'brace',
- *   nodes: []
- * });
- *
- * var open = new Node({type: 'brace.open'});
- * var close = new Node({type: 'brace.close'});
- * console.log(utils.hasOpen(brace)); // false
- * console.log(utils.hasClose(brace)); // false
- *
- * brace.pushNode(open);
- * brace.pushNode(close);
- * console.log(utils.hasOpen(brace)); // true
- * console.log(utils.hasClose(brace)); // true
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Boolean}
- * @api public
- */
+function scanInternals(accumulator, seed, hasSeed, emitOnNext, emitBeforeComplete) {
+    return function (source, subscriber) {
+        var hasState = hasSeed;
+        var state = seed;
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_0__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var i = index++;
+            state = hasState
+                ?
+                    accumulator(state, value, i)
+                :
+                    ((hasState = true), value);
+            emitOnNext && subscriber.next(state);
+        }, emitBeforeComplete &&
+            (function () {
+                hasState && subscriber.next(state);
+                subscriber.complete();
+            })));
+    };
+}
+//# sourceMappingURL=scanInternals.js.map
 
-utils.hasOpenAndClose = function(node) {
-  return utils.hasOpen(node) && utils.hasClose(node);
-};
+/***/ }),
 
-/**
- * Push the given `node` onto the `state.inside` array for the
- * given type. This array is used as a specialized "stack" for
- * only the given `node.type`.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * utils.addType(state, node);
- * console.log(state.inside);
- * //=> { brace: [{type: 'brace'}] }
- * ```
- * @param {Object} `state` The `compiler.state` object or custom state object.
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Array} Returns the `state.inside` stack for the given type.
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/sequenceEqual.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.addType = function(state, node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isObject(state), 'expected state to be an object');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return sequenceEqual; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  var type = node.parent
-    ? node.parent.type
-    : node.type.replace(/\.open$/, '');
 
-  if (!state.hasOwnProperty('inside')) {
-    state.inside = {};
-  }
-  if (!state.inside.hasOwnProperty(type)) {
-    state.inside[type] = [];
-  }
+function sequenceEqual(compareTo, comparator) {
+    if (comparator === void 0) { comparator = function (a, b) { return a === b; }; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var aState = createState();
+        var bState = createState();
+        var emit = function (isEqual) {
+            subscriber.next(isEqual);
+            subscriber.complete();
+        };
+        var createSubscriber = function (selfState, otherState) {
+            var sequenceEqualSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (a) {
+                var buffer = otherState.buffer, complete = otherState.complete;
+                if (buffer.length === 0) {
+                    complete ? emit(false) : selfState.buffer.push(a);
+                }
+                else {
+                    !comparator(a, buffer.shift()) && emit(false);
+                }
+            }, function () {
+                selfState.complete = true;
+                var complete = otherState.complete, buffer = otherState.buffer;
+                complete && emit(buffer.length === 0);
+                sequenceEqualSubscriber === null || sequenceEqualSubscriber === void 0 ? void 0 : sequenceEqualSubscriber.unsubscribe();
+            });
+            return sequenceEqualSubscriber;
+        };
+        source.subscribe(createSubscriber(aState, bState));
+        compareTo.subscribe(createSubscriber(bState, aState));
+    });
+}
+function createState() {
+    return {
+        buffer: [],
+        complete: false,
+    };
+}
+//# sourceMappingURL=sequenceEqual.js.map
 
-  var arr = state.inside[type];
-  arr.push(node);
-  return arr;
-};
+/***/ }),
 
-/**
- * Remove the given `node` from the `state.inside` array for the
- * given type. This array is used as a specialized "stack" for
- * only the given `node.type`.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * utils.addType(state, node);
- * console.log(state.inside);
- * //=> { brace: [{type: 'brace'}] }
- * utils.removeType(state, node);
- * //=> { brace: [] }
- * ```
- * @param {Object} `state` The `compiler.state` object or custom state object.
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @return {Array} Returns the `state.inside` stack for the given type.
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/share.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.removeType = function(state, node) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isObject(state), 'expected state to be an object');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return share; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/from.js");
+/* harmony import */ var _operators_take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscriber.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-  var type = node.parent
-    ? node.parent.type
-    : node.type.replace(/\.close$/, '');
 
-  if (state.inside.hasOwnProperty(type)) {
-    return state.inside[type].pop();
-  }
-};
 
-/**
- * Returns true if `node.val` is an empty string, or `node.nodes` does
- * not contain any non-empty text nodes.
- *
- * ```js
- * var node = new Node({type: 'text'});
- * utils.isEmpty(node); //=> true
- * node.val = 'foo';
- * utils.isEmpty(node); //=> false
- * ```
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {Function} `fn`
- * @return {Boolean}
- * @api public
- */
 
-utils.isEmpty = function(node, fn) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-  if (!Array.isArray(node.nodes)) {
-    if (node.type !== 'text') {
-      return true;
+
+function share(options) {
+    if (options === void 0) { options = {}; }
+    var _a = options.connector, connector = _a === void 0 ? function () { return new _Subject__WEBPACK_IMPORTED_MODULE_3__[/* Subject */ "a"](); } : _a, _b = options.resetOnError, resetOnError = _b === void 0 ? true : _b, _c = options.resetOnComplete, resetOnComplete = _c === void 0 ? true : _c, _d = options.resetOnRefCountZero, resetOnRefCountZero = _d === void 0 ? true : _d;
+    return function (wrapperSource) {
+        var connection = null;
+        var resetConnection = null;
+        var subject = null;
+        var refCount = 0;
+        var hasCompleted = false;
+        var hasErrored = false;
+        var cancelReset = function () {
+            resetConnection === null || resetConnection === void 0 ? void 0 : resetConnection.unsubscribe();
+            resetConnection = null;
+        };
+        var reset = function () {
+            cancelReset();
+            connection = subject = null;
+            hasCompleted = hasErrored = false;
+        };
+        var resetAndUnsubscribe = function () {
+            var conn = connection;
+            reset();
+            conn === null || conn === void 0 ? void 0 : conn.unsubscribe();
+        };
+        return Object(_util_lift__WEBPACK_IMPORTED_MODULE_5__[/* operate */ "b"])(function (source, subscriber) {
+            refCount++;
+            if (!hasErrored && !hasCompleted) {
+                cancelReset();
+            }
+            var dest = (subject = subject !== null && subject !== void 0 ? subject : connector());
+            subscriber.add(function () {
+                refCount--;
+                if (refCount === 0 && !hasErrored && !hasCompleted) {
+                    resetConnection = handleReset(resetAndUnsubscribe, resetOnRefCountZero);
+                }
+            });
+            dest.subscribe(subscriber);
+            if (!connection) {
+                connection = new _Subscriber__WEBPACK_IMPORTED_MODULE_4__[/* SafeSubscriber */ "a"]({
+                    next: function (value) { return dest.next(value); },
+                    error: function (err) {
+                        hasErrored = true;
+                        cancelReset();
+                        resetConnection = handleReset(reset, resetOnError, err);
+                        dest.error(err);
+                    },
+                    complete: function () {
+                        hasCompleted = true;
+                        cancelReset();
+                        resetConnection = handleReset(reset, resetOnComplete);
+                        dest.complete();
+                    },
+                });
+                Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__[/* from */ "a"])(source).subscribe(connection);
+            }
+        })(wrapperSource);
+    };
+}
+function handleReset(reset, on) {
+    var args = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        args[_i - 2] = arguments[_i];
     }
-    if (typeof fn === 'function') {
-      return fn(node, node.parent);
+    if (on === true) {
+        reset();
+        return null;
     }
-    return !utils.trim(node.val);
-  }
+    if (on === false) {
+        return null;
+    }
+    return on.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args))).pipe(Object(_operators_take__WEBPACK_IMPORTED_MODULE_2__[/* take */ "a"])(1))
+        .subscribe(function () { return reset(); });
+}
+//# sourceMappingURL=share.js.map
 
-  for (var i = 0; i < node.nodes.length; i++) {
-    var child = node.nodes[i];
-    if (utils.isOpen(child) || utils.isClose(child)) {
-      continue;
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/shareReplay.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return shareReplay; });
+/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/ReplaySubject.js");
+/* harmony import */ var _share__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/share.js");
+
+
+function shareReplay(configOrBufferSize, windowTime, scheduler) {
+    var _a, _b, _c;
+    var bufferSize;
+    var refCount = false;
+    if (configOrBufferSize && typeof configOrBufferSize === 'object') {
+        (_a = configOrBufferSize.bufferSize, bufferSize = _a === void 0 ? Infinity : _a, _b = configOrBufferSize.windowTime, windowTime = _b === void 0 ? Infinity : _b, _c = configOrBufferSize.refCount, refCount = _c === void 0 ? false : _c, scheduler = configOrBufferSize.scheduler);
     }
-    if (!utils.isEmpty(child, fn)) {
-      return false;
+    else {
+        bufferSize = configOrBufferSize !== null && configOrBufferSize !== void 0 ? configOrBufferSize : Infinity;
     }
-  }
+    return Object(_share__WEBPACK_IMPORTED_MODULE_1__[/* share */ "a"])({
+        connector: function () { return new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__[/* ReplaySubject */ "a"](bufferSize, windowTime, scheduler); },
+        resetOnError: true,
+        resetOnComplete: false,
+        resetOnRefCountZero: refCount,
+    });
+}
+//# sourceMappingURL=shareReplay.js.map
 
-  return true;
-};
+/***/ }),
 
-/**
- * Returns true if the `state.inside` stack for the given type exists
- * and has one or more nodes on it.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * console.log(utils.isInsideType(state, 'brace')); //=> false
- * utils.addType(state, node);
- * console.log(utils.isInsideType(state, 'brace')); //=> true
- * utils.removeType(state, node);
- * console.log(utils.isInsideType(state, 'brace')); //=> false
- * ```
- * @param {Object} `state`
- * @param {String} `type`
- * @return {Boolean}
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/single.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.isInsideType = function(state, type) {
-  assert(isObject(state), 'expected state to be an object');
-  assert(isString(type), 'expected type to be a string');
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return single; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _util_SequenceError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/SequenceError.js");
+/* harmony import */ var _util_NotFoundError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/NotFoundError.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  if (!state.hasOwnProperty('inside')) {
-    return false;
-  }
 
-  if (!state.inside.hasOwnProperty(type)) {
-    return false;
-  }
 
-  return state.inside[type].length > 0;
-};
 
-/**
- * Returns true if `node` is either a child or grand-child of the given `type`,
- * or `state.inside[type]` is a non-empty array.
- *
- * ```js
- * var state = { inside: {}};
- * var node = new Node({type: 'brace'});
- * var open = new Node({type: 'brace.open'});
- * console.log(utils.isInside(state, open, 'brace')); //=> false
- * utils.pushNode(node, open);
- * console.log(utils.isInside(state, open, 'brace')); //=> true
- * ```
- * @param {Object} `state` Either the `compiler.state` object, if it exists, or a user-supplied state object.
- * @param {Object} `node` Instance of [snapdragon-node][]
- * @param {String} `type` The `node.type` to check for.
- * @return {Boolean}
- * @api public
- */
 
-utils.isInside = function(state, node, type) {
-  assert(utils.isNode(node), 'expected node to be an instance of Node');
-  assert(isObject(state), 'expected state to be an object');
+function single(predicate) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        var singleValue;
+        var seenValue = false;
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            seenValue = true;
+            if (!predicate || predicate(value, index++, source)) {
+                hasValue && subscriber.error(new _util_SequenceError__WEBPACK_IMPORTED_MODULE_1__[/* SequenceError */ "a"]('Too many matching values'));
+                hasValue = true;
+                singleValue = value;
+            }
+        }, function () {
+            if (hasValue) {
+                subscriber.next(singleValue);
+                subscriber.complete();
+            }
+            else {
+                subscriber.error(seenValue ? new _util_NotFoundError__WEBPACK_IMPORTED_MODULE_2__[/* NotFoundError */ "a"]('No matching values') : new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]());
+            }
+        }));
+    });
+}
+//# sourceMappingURL=single.js.map
 
-  if (Array.isArray(type)) {
-    for (var i = 0; i < type.length; i++) {
-      if (utils.isInside(state, node, type[i])) {
-        return true;
-      }
-    }
-    return false;
-  }
+/***/ }),
 
-  var parent = node.parent;
-  if (typeof type === 'string') {
-    return (parent && parent.type === type) || utils.isInsideType(state, type);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skip.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (typeOf(type) === 'regexp') {
-    if (parent && parent.type && type.test(parent.type)) {
-      return true;
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skip; });
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
 
-    var keys = Object.keys(state.inside);
-    var len = keys.length;
-    var idx = -1;
-    while (++idx < len) {
-      var key = keys[idx];
-      var val = state.inside[key];
+function skip(count) {
+    return Object(_filter__WEBPACK_IMPORTED_MODULE_0__[/* filter */ "a"])(function (_, index) { return count <= index; });
+}
+//# sourceMappingURL=skip.js.map
 
-      if (Array.isArray(val) && val.length !== 0 && type.test(key)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
+/***/ }),
 
-/**
- * Get the last `n` element from the given `array`. Used for getting
- * a node from `node.nodes.`
- *
- * @param {Array} `array`
- * @param {Number} `n`
- * @return {undefined}
- * @api public
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skipLast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-utils.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skipLast; });
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Cast the given `val` to an array.
- *
- * ```js
- * console.log(utils.arrayify(''));
- * //=> []
- * console.log(utils.arrayify('foo'));
- * //=> ['foo']
- * console.log(utils.arrayify(['foo']));
- * //=> ['foo']
- * ```
- * @param {any} `val`
- * @return {Array}
- * @api public
- */
 
-utils.arrayify = function(val) {
-  if (typeof val === 'string' && val !== '') {
-    return [val];
-  }
-  if (!Array.isArray(val)) {
-    return [];
-  }
-  return val;
-};
 
-/**
- * Convert the given `val` to a string by joining with `,`. Useful
- * for creating a cheerio/CSS/DOM-style selector from a list of strings.
- *
- * @param {any} `val`
- * @return {Array}
- * @api public
- */
+function skipLast(skipCount) {
+    return skipCount <= 0
+        ?
+            _util_identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"]
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var ring = new Array(skipCount);
+            var seen = 0;
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                var valueIndex = seen++;
+                if (valueIndex < skipCount) {
+                    ring[valueIndex] = value;
+                }
+                else {
+                    var index = valueIndex % skipCount;
+                    var oldValue = ring[index];
+                    ring[index] = value;
+                    subscriber.next(oldValue);
+                }
+            }));
+            return function () {
+                ring = null;
+            };
+        });
+}
+//# sourceMappingURL=skipLast.js.map
+
+/***/ }),
 
-utils.stringify = function(val) {
-  return utils.arrayify(val).join(',');
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skipUntil.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Ensure that the given value is a string and call `.trim()` on it,
- * or return an empty string.
- *
- * @param {String} `str`
- * @return {String}
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skipUntil; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-utils.trim = function(str) {
-  return typeof str === 'string' ? str.trim() : '';
-};
 
-/**
- * Return true if val is an object
- */
 
-function isObject(val) {
-  return typeOf(val) === 'object';
+
+function skipUntil(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var taking = false;
+        var skipSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            skipSubscriber === null || skipSubscriber === void 0 ? void 0 : skipSubscriber.unsubscribe();
+            taking = true;
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_3__[/* noop */ "a"]);
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(notifier).subscribe(skipSubscriber);
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return taking && subscriber.next(value); }));
+    });
 }
+//# sourceMappingURL=skipUntil.js.map
 
-/**
- * Return true if val is a string
- */
+/***/ }),
 
-function isString(val) {
-  return typeof val === 'string';
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/skipWhile.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Return true if val is a function
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return skipWhile; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-function isFunction(val) {
-  return typeof val === 'function';
+
+function skipWhile(predicate) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var taking = false;
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return (taking || (taking = !predicate(value, index++))) && subscriber.next(value); }));
+    });
 }
+//# sourceMappingURL=skipWhile.js.map
 
-/**
- * Return true if val is an array
- */
+/***/ }),
 
-function isArray(val) {
-  return Array.isArray(val);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/startWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Shim to ensure the `.append` methods work with any version of snapdragon
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return startWith; });
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/concat.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-function append(compiler, val, node) {
-  if (typeof compiler.append !== 'function') {
-    return compiler.emit(val, node);
-  }
-  return compiler.append(val, node);
-}
 
-/**
- * Simplified assertion. Throws an error is `val` is falsey.
- */
 
-function assert(val, message) {
-  if (!val) throw new Error(message);
+function startWith() {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
+    }
+    var scheduler = Object(_util_args__WEBPACK_IMPORTED_MODULE_1__[/* popScheduler */ "c"])(values);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        (scheduler ? Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__[/* concat */ "a"])(values, source, scheduler) : Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__[/* concat */ "a"])(values, source)).subscribe(subscriber);
+    });
 }
-
+//# sourceMappingURL=startWith.js.map
 
 /***/ }),
-/* 626 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeOn; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
+function subscribeOn(scheduler, delay) {
+    if (delay === void 0) { delay = 0; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        subscriber.add(scheduler.schedule(function () { return source.subscribe(subscriber); }, delay));
+    });
+}
+//# sourceMappingURL=subscribeOn.js.map
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
+/***/ }),
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchAll; });
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-  // other objects
-  var type = toString.call(val);
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
+function switchAll() {
+    return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__[/* identity */ "a"]);
+}
+//# sourceMappingURL=switchAll.js.map
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
+/***/ }),
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchMap; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  // must be a plain object
-  return 'object';
-};
 
 
+function switchMap(project, resultSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var innerSubscriber = null;
+        var index = 0;
+        var isComplete = false;
+        var checkComplete = function () { return isComplete && !innerSubscriber && subscriber.complete(); };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            innerSubscriber === null || innerSubscriber === void 0 ? void 0 : innerSubscriber.unsubscribe();
+            var innerIndex = 0;
+            var outerIndex = index++;
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(project(value, outerIndex)).subscribe((innerSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (innerValue) { return subscriber.next(resultSelector ? resultSelector(value, innerValue, outerIndex, innerIndex++) : innerValue); }, function () {
+                innerSubscriber = null;
+                checkComplete();
+            })));
+        }, function () {
+            isComplete = true;
+            checkComplete();
+        }));
+    });
+}
+//# sourceMappingURL=switchMap.js.map
+
 /***/ }),
-/* 627 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchMapTo.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchMapTo; });
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
 
-var extend = __webpack_require__(605);
-var Snapdragon = __webpack_require__(628);
-var compilers = __webpack_require__(607);
-var parsers = __webpack_require__(622);
-var utils = __webpack_require__(608);
+function switchMapTo(innerObservable, resultSelector) {
+    return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(resultSelector) ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(function () { return innerObservable; });
+}
+//# sourceMappingURL=switchMapTo.js.map
 
-/**
- * Customize Snapdragon parser and renderer
- */
+/***/ }),
 
-function Braces(options) {
-  this.options = extend({}, options);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/switchScan.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return switchScan; });
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+
+
+function switchScan(accumulator, seed) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var state = seed;
+        Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__[/* switchMap */ "a"])(function (value, index) { return accumulator(state, value, index); }, function (_, innerValue) { return ((state = innerValue), innerValue); })(source).subscribe(subscriber);
+        return function () {
+            state = null;
+        };
+    });
 }
+//# sourceMappingURL=switchScan.js.map
 
-/**
- * Initialize braces
- */
+/***/ }),
 
-Braces.prototype.init = function(options) {
-  if (this.isInitialized) return;
-  this.isInitialized = true;
-  var opts = utils.createOptions({}, this.options, options);
-  this.snapdragon = this.options.snapdragon || new Snapdragon(opts);
-  this.compiler = this.snapdragon.compiler;
-  this.parser = this.snapdragon.parser;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/take.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  compilers(this.snapdragon, opts);
-  parsers(this.snapdragon, opts);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return take; });
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  /**
-   * Call Snapdragon `.parse` method. When AST is returned, we check to
-   * see if any unclosed braces are left on the stack and, if so, we iterate
-   * over the stack and correct the AST so that compilers are called in the correct
-   * order and unbalance braces are properly escaped.
-   */
 
-  utils.define(this.snapdragon, 'parse', function(pattern, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
-    this.parser.ast.input = pattern;
 
-    var stack = this.parser.stack;
-    while (stack.length) {
-      addParent({type: 'brace.close', val: ''}, stack.pop());
-    }
+function take(count) {
+    return count <= 0
+        ?
+            function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_0__[/* EMPTY */ "a"]; }
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var seen = 0;
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                if (++seen <= count) {
+                    subscriber.next(value);
+                    if (count <= seen) {
+                        subscriber.complete();
+                    }
+                }
+            }));
+        });
+}
+//# sourceMappingURL=take.js.map
 
-    function addParent(node, parent) {
-      utils.define(node, 'parent', parent);
-      parent.nodes.push(node);
-    }
+/***/ }),
 
-    // add non-enumerable parser reference
-    utils.define(parsed, 'parser', this.parser);
-    return parsed;
-  });
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Decorate `.parse` method
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return takeLast; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/empty.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-Braces.prototype.parse = function(ast, options) {
-  if (ast && typeof ast === 'object' && ast.nodes) return ast;
-  this.init(options);
-  return this.snapdragon.parse(ast, options);
-};
 
-/**
- * Decorate `.compile` method
- */
 
-Braces.prototype.compile = function(ast, options) {
-  if (typeof ast === 'string') {
-    ast = this.parse(ast, options);
-  } else {
-    this.init(options);
-  }
-  return this.snapdragon.compile(ast, options);
-};
 
-/**
- * Expand
- */
+function takeLast(count) {
+    return count <= 0
+        ? function () { return _observable_empty__WEBPACK_IMPORTED_MODULE_1__[/* EMPTY */ "a"]; }
+        : Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+            var buffer = [];
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                buffer.push(value);
+                count < buffer.length && buffer.shift();
+            }, function () {
+                var e_1, _a;
+                try {
+                    for (var buffer_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(buffer), buffer_1_1 = buffer_1.next(); !buffer_1_1.done; buffer_1_1 = buffer_1.next()) {
+                        var value = buffer_1_1.value;
+                        subscriber.next(value);
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (buffer_1_1 && !buffer_1_1.done && (_a = buffer_1.return)) _a.call(buffer_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                subscriber.complete();
+            }, undefined, function () {
+                buffer = null;
+            }));
+        });
+}
+//# sourceMappingURL=takeLast.js.map
 
-Braces.prototype.expand = function(pattern) {
-  var ast = this.parse(pattern, {expand: true});
-  return this.compile(ast, {expand: true});
-};
+/***/ }),
 
-/**
- * Optimize
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-Braces.prototype.optimize = function(pattern) {
-  var ast = this.parse(pattern, {optimize: true});
-  return this.compile(ast, {optimize: true});
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return takeUntil; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-/**
- * Expose `Braces`
- */
 
-module.exports = Braces;
 
 
+function takeUntil(notifier) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(notifier).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function () { return subscriber.complete(); }, _util_noop__WEBPACK_IMPORTED_MODULE_3__[/* noop */ "a"]));
+        !subscriber.closed && source.subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=takeUntil.js.map
+
 /***/ }),
-/* 628 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/takeWhile.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return takeWhile; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
 
-var Base = __webpack_require__(629);
-var define = __webpack_require__(659);
-var Compiler = __webpack_require__(670);
-var Parser = __webpack_require__(693);
-var utils = __webpack_require__(673);
-var regexCache = {};
-var cache = {};
+function takeWhile(predicate, inclusive) {
+    if (inclusive === void 0) { inclusive = false; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var index = 0;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var result = predicate(value, index++);
+            (result || inclusive) && subscriber.next(value);
+            !result && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=takeWhile.js.map
 
-/**
- * Create a new instance of `Snapdragon` with the given `options`.
- *
- * ```js
- * var snapdragon = new Snapdragon();
- * ```
- *
- * @param {Object} `options`
- * @api public
- */
+/***/ }),
 
-function Snapdragon(options) {
-  Base.call(this, null, options);
-  this.options = utils.extend({source: 'string'}, this.options);
-  this.compiler = new Compiler(this.options);
-  this.parser = new Parser(this.options);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/tap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  Object.defineProperty(this, 'compilers', {
-    get: function() {
-      return this.compiler.compilers;
-    }
-  });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return tap; });
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
-  Object.defineProperty(this, 'parsers', {
-    get: function() {
-      return this.parser.parsers;
-    }
-  });
 
-  Object.defineProperty(this, 'regex', {
-    get: function() {
-      return this.parser.regex;
-    }
-  });
+
+
+function tap(observerOrNext, error, complete) {
+    var tapObserver = Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(observerOrNext) || error || complete
+        ?
+            { next: observerOrNext, error: error, complete: complete }
+        : observerOrNext;
+    return tapObserver
+        ? Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+            var _a;
+            (_a = tapObserver.subscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
+            var isUnsub = true;
+            source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                var _a;
+                (_a = tapObserver.next) === null || _a === void 0 ? void 0 : _a.call(tapObserver, value);
+                subscriber.next(value);
+            }, function () {
+                var _a;
+                isUnsub = false;
+                (_a = tapObserver.complete) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
+                subscriber.complete();
+            }, function (err) {
+                var _a;
+                isUnsub = false;
+                (_a = tapObserver.error) === null || _a === void 0 ? void 0 : _a.call(tapObserver, err);
+                subscriber.error(err);
+            }, function () {
+                var _a, _b;
+                if (isUnsub) {
+                    (_a = tapObserver.unsubscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
+                }
+                (_b = tapObserver.finalize) === null || _b === void 0 ? void 0 : _b.call(tapObserver);
+            }));
+        })
+        :
+            _util_identity__WEBPACK_IMPORTED_MODULE_3__[/* identity */ "a"];
 }
+//# sourceMappingURL=tap.js.map
 
-/**
- * Inherit Base
- */
+/***/ }),
 
-Base.extend(Snapdragon);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Add a parser to `snapdragon.parsers` for capturing the given `type` using
- * the specified regex or parser function. A function is useful if you need
- * to customize how the token is created and/or have access to the parser
- * instance to check options, etc.
- *
- * ```js
- * snapdragon
- *   .capture('slash', /^\//)
- *   .capture('dot', function() {
- *     var pos = this.position();
- *     var m = this.match(/^\./);
- *     if (!m) return;
- *     return pos({
- *       type: 'dot',
- *       val: m[0]
- *     });
- *   });
- * ```
- * @param {String} `type`
- * @param {RegExp|Function} `regex`
- * @return {Object} Returns the parser instance for chaining
- * @api public
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defaultThrottleConfig; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return throttle; });
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-Snapdragon.prototype.capture = function() {
-  return this.parser.capture.apply(this.parser, arguments);
-};
 
-/**
- * Register a plugin `fn`.
- *
- * ```js
- * var snapdragon = new Snapdgragon([options]);
- * snapdragon.use(function() {
- *   console.log(this);          //<= snapdragon instance
- *   console.log(this.parser);   //<= parser instance
- *   console.log(this.compiler); //<= compiler instance
- * });
- * ```
- * @param {Object} `fn`
- * @api public
- */
 
-Snapdragon.prototype.use = function(fn) {
-  fn.call(this, this);
-  return this;
+var defaultThrottleConfig = {
+    leading: true,
+    trailing: false,
 };
+function throttle(durationSelector, config) {
+    if (config === void 0) { config = defaultThrottleConfig; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_0__[/* operate */ "b"])(function (source, subscriber) {
+        var leading = config.leading, trailing = config.trailing;
+        var hasValue = false;
+        var sendValue = null;
+        var throttled = null;
+        var isComplete = false;
+        var endThrottling = function () {
+            throttled === null || throttled === void 0 ? void 0 : throttled.unsubscribe();
+            throttled = null;
+            if (trailing) {
+                send();
+                isComplete && subscriber.complete();
+            }
+        };
+        var cleanupThrottling = function () {
+            throttled = null;
+            isComplete && subscriber.complete();
+        };
+        var startThrottle = function (value) {
+            return (throttled = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_2__[/* innerFrom */ "a"])(durationSelector(value)).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, endThrottling, cleanupThrottling)));
+        };
+        var send = function () {
+            if (hasValue) {
+                hasValue = false;
+                var value = sendValue;
+                sendValue = null;
+                subscriber.next(value);
+                !isComplete && startThrottle(value);
+            }
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_1__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            sendValue = value;
+            !(throttled && !throttled.closed) && (leading ? send() : startThrottle(value));
+        }, function () {
+            isComplete = true;
+            !(trailing && hasValue && throttled && !throttled.closed) && subscriber.complete();
+        }));
+    });
+}
+//# sourceMappingURL=throttle.js.map
 
-/**
- * Parse the given `str`.
- *
- * ```js
- * var snapdragon = new Snapdgragon([options]);
- * // register parsers
- * snapdragon.parser.use(function() {});
- *
- * // parse
- * var ast = snapdragon.parse('foo/bar');
- * console.log(ast);
- * ```
- * @param {String} `str`
- * @param {Object} `options` Set `options.sourcemap` to true to enable source maps.
- * @return {Object} Returns an AST.
- * @api public
- */
+/***/ }),
 
-Snapdragon.prototype.parse = function(str, options) {
-  this.options = utils.extend({}, this.options, options);
-  var parsed = this.parser.parse(str, this.options);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/throttleTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // add non-enumerable parser reference
-  define(parsed, 'parser', this.parser);
-  return parsed;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throttleTime; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js");
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/timer.js");
 
-/**
- * Compile the given `AST`.
- *
- * ```js
- * var snapdragon = new Snapdgragon([options]);
- * // register plugins
- * snapdragon.use(function() {});
- * // register parser plugins
- * snapdragon.parser.use(function() {});
- * // register compiler plugins
- * snapdragon.compiler.use(function() {});
- *
- * // parse
- * var ast = snapdragon.parse('foo/bar');
- *
- * // compile
- * var res = snapdragon.compile(ast);
- * console.log(res.output);
- * ```
- * @param {Object} `ast`
- * @param {Object} `options`
- * @return {Object} Returns an object with an `output` property with the rendered string.
- * @api public
- */
 
-Snapdragon.prototype.compile = function(ast, options) {
-  this.options = utils.extend({}, this.options, options);
-  var compiled = this.compiler.compile(ast, this.options);
 
-  // add non-enumerable compiler reference
-  define(compiled, 'compiler', this.compiler);
-  return compiled;
-};
+function throttleTime(duration, scheduler, config) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    if (config === void 0) { config = _throttle__WEBPACK_IMPORTED_MODULE_1__[/* defaultThrottleConfig */ "a"]; }
+    var duration$ = Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__[/* timer */ "a"])(duration, scheduler);
+    return Object(_throttle__WEBPACK_IMPORTED_MODULE_1__[/* throttle */ "b"])(function () { return duration$; }, config);
+}
+//# sourceMappingURL=throttleTime.js.map
+
+/***/ }),
 
-/**
- * Expose `Snapdragon`
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = Snapdragon;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwIfEmpty; });
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-/**
- * Expose `Parser` and `Compiler`
- */
 
-module.exports.Compiler = Compiler;
-module.exports.Parser = Parser;
 
+function throwIfEmpty(errorFactory) {
+    if (errorFactory === void 0) { errorFactory = defaultErrorFactory; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var hasValue = false;
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            hasValue = true;
+            subscriber.next(value);
+        }, function () { return (hasValue ? subscriber.complete() : subscriber.error(errorFactory())); }));
+    });
+}
+function defaultErrorFactory() {
+    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__[/* EmptyError */ "a"]();
+}
+//# sourceMappingURL=throwIfEmpty.js.map
 
 /***/ }),
-/* 629 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timeInterval.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timeInterval; });
+/* unused harmony export TimeInterval */
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
 
-var util = __webpack_require__(113);
-var define = __webpack_require__(630);
-var CacheBase = __webpack_require__(631);
-var Emitter = __webpack_require__(632);
-var isObject = __webpack_require__(592);
-var merge = __webpack_require__(653);
-var pascal = __webpack_require__(656);
-var cu = __webpack_require__(657);
 
-/**
- * Optionally define a custom `cache` namespace to use.
- */
+function timeInterval(scheduler) {
+    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"]; }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var last = scheduler.now();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var now = scheduler.now();
+            var interval = now - last;
+            last = now;
+            subscriber.next(new TimeInterval(value, interval));
+        }));
+    });
+}
+var TimeInterval = (function () {
+    function TimeInterval(value, interval) {
+        this.value = value;
+        this.interval = interval;
+    }
+    return TimeInterval;
+}());
 
-function namespace(name) {
-  var Cache = name ? CacheBase.namespace(name) : CacheBase;
-  var fns = [];
+//# sourceMappingURL=timeInterval.js.map
 
-  /**
-   * Create an instance of `Base` with the given `config` and `options`.
-   *
-   * ```js
-   * // initialize with `config` and `options`
-   * var app = new Base({isApp: true}, {abc: true});
-   * app.set('foo', 'bar');
-   *
-   * // values defined with the given `config` object will be on the root of the instance
-   * console.log(app.baz); //=> undefined
-   * console.log(app.foo); //=> 'bar'
-   * // or use `.get`
-   * console.log(app.get('isApp')); //=> true
-   * console.log(app.get('foo')); //=> 'bar'
-   *
-   * // values defined with the given `options` object will be on `app.options
-   * console.log(app.options.abc); //=> true
-   * ```
-   *
-   * @param {Object} `config` If supplied, this object is passed to [cache-base][] to merge onto the the instance upon instantiation.
-   * @param {Object} `options` If supplied, this object is used to initialize the `base.options` object.
-   * @api public
-   */
+/***/ }),
 
-  function Base(config, options) {
-    if (!(this instanceof Base)) {
-      return new Base(config, options);
-    }
-    Cache.call(this, config);
-    this.is('base');
-    this.initBase(config, options);
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  /**
-   * Inherit cache-base
-   */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TimeoutError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return timeout; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isDate.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_createErrorClass__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-  util.inherits(Base, Cache);
 
-  /**
-   * Add static emitter methods
-   */
 
-  Emitter(Base);
 
-  /**
-   * Initialize `Base` defaults with the given `config` object
-   */
 
-  Base.prototype.initBase = function(config, options) {
-    this.options = merge({}, this.options, options);
-    this.cache = this.cache || {};
-    this.define('registered', {});
-    if (name) this[name] = {};
 
-    // make `app._callbacks` non-enumerable
-    this.define('_callbacks', this._callbacks);
-    if (isObject(config)) {
-      this.visit('set', config);
-    }
-    Base.run(this, 'use', fns);
-  };
 
-  /**
-   * Set the given `name` on `app._name` and `app.is*` properties. Used for doing
-   * lookups in plugins.
-   *
-   * ```js
-   * app.is('foo');
-   * console.log(app._name);
-   * //=> 'foo'
-   * console.log(app.isFoo);
-   * //=> true
-   * app.is('bar');
-   * console.log(app.isFoo);
-   * //=> true
-   * console.log(app.isBar);
-   * //=> true
-   * console.log(app._name);
-   * //=> 'bar'
-   * ```
-   * @name .is
-   * @param {String} `name`
-   * @return {Boolean}
-   * @api public
-   */
+var TimeoutError = Object(_util_createErrorClass__WEBPACK_IMPORTED_MODULE_4__[/* createErrorClass */ "a"])(function (_super) {
+    return function TimeoutErrorImpl(info) {
+        if (info === void 0) { info = null; }
+        _super(this);
+        this.message = 'Timeout has occurred';
+        this.name = 'TimeoutError';
+        this.info = info;
+    };
+});
+function timeout(config, schedulerArg) {
+    var _a = (Object(_util_isDate__WEBPACK_IMPORTED_MODULE_1__[/* isValidDate */ "a"])(config) ? { first: config } : typeof config === 'number' ? { each: config } : config), first = _a.first, each = _a.each, _b = _a.with, _with = _b === void 0 ? timeoutErrorFactory : _b, _c = _a.scheduler, scheduler = _c === void 0 ? schedulerArg !== null && schedulerArg !== void 0 ? schedulerArg : _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* asyncScheduler */ "b"] : _c, _d = _a.meta, meta = _d === void 0 ? null : _d;
+    if (first == null && each == null) {
+        throw new TypeError('No timeout provided.');
+    }
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var originalSourceSubscription;
+        var timerSubscription;
+        var lastValue = null;
+        var seen = 0;
+        var startTimer = function (delay) {
+            timerSubscription = Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_6__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+                try {
+                    originalSourceSubscription.unsubscribe();
+                    Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(_with({
+                        meta: meta,
+                        lastValue: lastValue,
+                        seen: seen,
+                    })).subscribe(subscriber);
+                }
+                catch (err) {
+                    subscriber.error(err);
+                }
+            }, delay);
+        };
+        originalSourceSubscription = source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
+            seen++;
+            subscriber.next((lastValue = value));
+            each > 0 && startTimer(each);
+        }, undefined, undefined, function () {
+            if (!(timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.closed)) {
+                timerSubscription === null || timerSubscription === void 0 ? void 0 : timerSubscription.unsubscribe();
+            }
+            lastValue = null;
+        }));
+        !seen && startTimer(first != null ? (typeof first === 'number' ? first : +first - scheduler.now()) : each);
+    });
+}
+function timeoutErrorFactory(info) {
+    throw new TimeoutError(info);
+}
+//# sourceMappingURL=timeout.js.map
 
-  Base.prototype.is = function(name) {
-    if (typeof name !== 'string') {
-      throw new TypeError('expected name to be a string');
-    }
-    this.define('is' + pascal(name), true);
-    this.define('_name', name);
-    this.define('_appname', name);
-    return this;
-  };
+/***/ }),
 
-  /**
-   * Returns true if a plugin has already been registered on an instance.
-   *
-   * Plugin implementors are encouraged to use this first thing in a plugin
-   * to prevent the plugin from being called more than once on the same
-   * instance.
-   *
-   * ```js
-   * var base = new Base();
-   * base.use(function(app) {
-   *   if (app.isRegistered('myPlugin')) return;
-   *   // do stuff to `app`
-   * });
-   *
-   * // to also record the plugin as being registered
-   * base.use(function(app) {
-   *   if (app.isRegistered('myPlugin', true)) return;
-   *   // do stuff to `app`
-   * });
-   * ```
-   * @name .isRegistered
-   * @emits `plugin` Emits the name of the plugin being registered. Useful for unit tests, to ensure plugins are only registered once.
-   * @param {String} `name` The plugin name.
-   * @param {Boolean} `register` If the plugin if not already registered, to record it as being registered pass `true` as the second argument.
-   * @return {Boolean} Returns true if a plugin is already registered.
-   * @api public
-   */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timeoutWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  Base.prototype.isRegistered = function(name, register) {
-    if (this.registered.hasOwnProperty(name)) {
-      return true;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timeoutWith; });
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isDate.js");
+/* harmony import */ var _timeout__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js");
+
+
+
+function timeoutWith(due, withObservable, scheduler) {
+    var first;
+    var each;
+    var _with;
+    scheduler = scheduler !== null && scheduler !== void 0 ? scheduler : _scheduler_async__WEBPACK_IMPORTED_MODULE_0__[/* async */ "a"];
+    if (Object(_util_isDate__WEBPACK_IMPORTED_MODULE_1__[/* isValidDate */ "a"])(due)) {
+        first = due;
     }
-    if (register !== false) {
-      this.registered[name] = true;
-      this.emit('plugin', name);
+    else if (typeof due === 'number') {
+        each = due;
     }
-    return false;
-  };
-
-  /**
-   * Define a plugin function to be called immediately upon init. Plugins are chainable
-   * and expose the following arguments to the plugin function:
-   *
-   * - `app`: the current instance of `Base`
-   * - `base`: the [first ancestor instance](#base) of `Base`
-   *
-   * ```js
-   * var app = new Base()
-   *   .use(foo)
-   *   .use(bar)
-   *   .use(baz)
-   * ```
-   * @name .use
-   * @param {Function} `fn` plugin function to call
-   * @return {Object} Returns the item instance for chaining.
-   * @api public
-   */
+    if (withObservable) {
+        _with = function () { return withObservable; };
+    }
+    else {
+        throw new TypeError('No observable provided to switch to');
+    }
+    if (first == null && each == null) {
+        throw new TypeError('No timeout provided.');
+    }
+    return Object(_timeout__WEBPACK_IMPORTED_MODULE_2__[/* timeout */ "b"])({
+        first: first,
+        each: each,
+        scheduler: scheduler,
+        with: _with,
+    });
+}
+//# sourceMappingURL=timeoutWith.js.map
 
-  Base.prototype.use = function(fn) {
-    fn.call(this, this);
-    return this;
-  };
+/***/ }),
 
-  /**
-   * The `.define` method is used for adding non-enumerable property on the instance.
-   * Dot-notation is **not supported** with `define`.
-   *
-   * ```js
-   * // arbitrary `render` function using lodash `template`
-   * app.define('render', function(str, locals) {
-   *   return _.template(str)(locals);
-   * });
-   * ```
-   * @name .define
-   * @param {String} `key` The name of the property to define.
-   * @param {any} `value`
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/timestamp.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  Base.prototype.define = function(key, val) {
-    if (isObject(key)) {
-      return this.visit('define', key);
-    }
-    define(this, key, val);
-    return this;
-  };
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timestamp; });
+/* harmony import */ var _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js");
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
-  /**
-   * Mix property `key` onto the Base prototype. If base is inherited using
-   * `Base.extend` this method will be overridden by a new `mixin` method that will
-   * only add properties to the prototype of the inheriting application.
-   *
-   * ```js
-   * app.mixin('foo', function() {
-   *   // do stuff
-   * });
-   * ```
-   * @name .mixin
-   * @param {String} `key`
-   * @param {Object|Array} `val`
-   * @return {Object} Returns the `base` instance for chaining.
-   * @api public
-   */
 
-  Base.prototype.mixin = function(key, val) {
-    Base.prototype[key] = val;
-    return this;
-  };
+function timestamp(timestampProvider) {
+    if (timestampProvider === void 0) { timestampProvider = _scheduler_dateTimestampProvider__WEBPACK_IMPORTED_MODULE_0__[/* dateTimestampProvider */ "a"]; }
+    return Object(_map__WEBPACK_IMPORTED_MODULE_1__[/* map */ "a"])(function (value) { return ({ value: value, timestamp: timestampProvider.now() }); });
+}
+//# sourceMappingURL=timestamp.js.map
 
-  /**
-   * Non-enumberable mixin array, used by the static [Base.mixin]() method.
-   */
+/***/ }),
 
-  Base.prototype.mixins = Base.prototype.mixins || [];
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  /**
-   * Getter/setter used when creating nested instances of `Base`, for storing a reference
-   * to the first ancestor instance. This works by setting an instance of `Base` on the `parent`
-   * property of a "child" instance. The `base` property defaults to the current instance if
-   * no `parent` property is defined.
-   *
-   * ```js
-   * // create an instance of `Base`, this is our first ("base") instance
-   * var first = new Base();
-   * first.foo = 'bar'; // arbitrary property, to make it easier to see what's happening later
-   *
-   * // create another instance
-   * var second = new Base();
-   * // create a reference to the first instance (`first`)
-   * second.parent = first;
-   *
-   * // create another instance
-   * var third = new Base();
-   * // create a reference to the previous instance (`second`)
-   * // repeat this pattern every time a "child" instance is created
-   * third.parent = second;
-   *
-   * // we can always access the first instance using the `base` property
-   * console.log(first.base.foo);
-   * //=> 'bar'
-   * console.log(second.base.foo);
-   * //=> 'bar'
-   * console.log(third.base.foo);
-   * //=> 'bar'
-   * // and now you know how to get to third base ;)
-   * ```
-   * @name .base
-   * @api public
-   */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return toArray; });
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-  Object.defineProperty(Base.prototype, 'base', {
-    configurable: true,
-    get: function() {
-      return this.parent ? this.parent.base : this;
-    }
-  });
 
-  /**
-   * Static method for adding global plugin functions that will
-   * be added to an instance when created.
-   *
-   * ```js
-   * Base.use(function(app) {
-   *   app.foo = 'bar';
-   * });
-   * var app = new Base();
-   * console.log(app.foo);
-   * //=> 'bar'
-   * ```
-   * @name #use
-   * @param {Function} `fn` Plugin function to use on each instance.
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
+var arrReducer = function (arr, value) { return (arr.push(value), arr); };
+function toArray() {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        Object(_reduce__WEBPACK_IMPORTED_MODULE_0__[/* reduce */ "a"])(arrReducer, [])(source).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=toArray.js.map
 
-  define(Base, 'use', function(fn) {
-    fns.push(fn);
-    return Base;
-  });
+/***/ }),
 
-  /**
-   * Run an array of functions by passing each function
-   * to a method on the given object specified by the given property.
-   *
-   * @param  {Object} `obj` Object containing method to use.
-   * @param  {String} `prop` Name of the method on the object to use.
-   * @param  {Array} `arr` Array of functions to pass to the method.
-   */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/window.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  define(Base, 'run', function(obj, prop, arr) {
-    var len = arr.length, i = 0;
-    while (len--) {
-      obj[prop](arr[i++]);
-    }
-    return Base;
-  });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return window; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
 
-  /**
-   * Static method for inheriting the prototype and static methods of the `Base` class.
-   * This method greatly simplifies the process of creating inheritance-based applications.
-   * See [static-extend][] for more details.
-   *
-   * ```js
-   * var extend = cu.extend(Parent);
-   * Parent.extend(Child);
-   *
-   * // optional methods
-   * Parent.extend(Child, {
-   *   foo: function() {},
-   *   bar: function() {}
-   * });
-   * ```
-   * @name #extend
-   * @param {Function} `Ctor` constructor to extend
-   * @param {Object} `methods` Optional prototype properties to mix in.
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
 
-  define(Base, 'extend', cu.extend(Base, function(Ctor, Parent) {
-    Ctor.prototype.mixins = Ctor.prototype.mixins || [];
 
-    define(Ctor, 'mixin', function(fn) {
-      var mixin = fn(Ctor.prototype, Ctor);
-      if (typeof mixin === 'function') {
-        Ctor.prototype.mixins.push(mixin);
-      }
-      return Ctor;
-    });
 
-    define(Ctor, 'mixins', function(Child) {
-      Base.run(Child, 'mixin', Ctor.prototype.mixins);
-      return Ctor;
+function window(windowBoundaries) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var windowSubject = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+        subscriber.next(windowSubject.asObservable());
+        var errorHandler = function (err) {
+            windowSubject.error(err);
+            subscriber.error(err);
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return windowSubject === null || windowSubject === void 0 ? void 0 : windowSubject.next(value); }, function () {
+            windowSubject.complete();
+            subscriber.complete();
+        }, errorHandler));
+        windowBoundaries.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function () {
+            windowSubject.complete();
+            subscriber.next((windowSubject = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]()));
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_3__[/* noop */ "a"], errorHandler));
+        return function () {
+            windowSubject === null || windowSubject === void 0 ? void 0 : windowSubject.unsubscribe();
+            windowSubject = null;
+        };
     });
+}
+//# sourceMappingURL=window.js.map
 
-    Ctor.prototype.mixin = function(key, value) {
-      Ctor.prototype[key] = value;
-      return this;
-    };
-    return Base;
-  }));
+/***/ }),
 
-  /**
-   * Used for adding methods to the `Base` prototype, and/or to the prototype of child instances.
-   * When a mixin function returns a function, the returned function is pushed onto the `.mixins`
-   * array, making it available to be used on inheriting classes whenever `Base.mixins()` is
-   * called (e.g. `Base.mixins(Child)`).
-   *
-   * ```js
-   * Base.mixin(function(proto) {
-   *   proto.foo = function(msg) {
-   *     return 'foo ' + msg;
-   *   };
-   * });
-   * ```
-   * @name #mixin
-   * @param {Function} `fn` Function to call
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowCount.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  define(Base, 'mixin', function(fn) {
-    var mixin = fn(Base.prototype, Base);
-    if (typeof mixin === 'function') {
-      Base.prototype.mixins.push(mixin);
-    }
-    return Base;
-  });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowCount; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
 
-  /**
-   * Static method for running global mixin functions against a child constructor.
-   * Mixins must be registered before calling this method.
-   *
-   * ```js
-   * Base.extend(Child);
-   * Base.mixins(Child);
-   * ```
-   * @name #mixins
-   * @param {Function} `Child` Constructor function of a child class
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
 
-  define(Base, 'mixins', function(Child) {
-    Base.run(Child, 'mixin', Base.prototype.mixins);
-    return Base;
-  });
 
-  /**
-   * Similar to `util.inherit`, but copies all static properties, prototype properties, and
-   * getters/setters from `Provider` to `Receiver`. See [class-utils][]{#inherit} for more details.
-   *
-   * ```js
-   * Base.inherit(Foo, Bar);
-   * ```
-   * @name #inherit
-   * @param {Function} `Receiver` Receiving (child) constructor
-   * @param {Function} `Provider` Providing (parent) constructor
-   * @return {Object} Returns the `Base` constructor for chaining
-   * @api public
-   */
 
-  define(Base, 'inherit', cu.inherit);
-  define(Base, 'bubble', cu.bubble);
-  return Base;
+function windowCount(windowSize, startWindowEvery) {
+    if (startWindowEvery === void 0) { startWindowEvery = 0; }
+    var startEvery = startWindowEvery > 0 ? startWindowEvery : windowSize;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        var windows = [new _Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]()];
+        var starts = [];
+        var count = 0;
+        subscriber.next(windows[0].asObservable());
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_3__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            try {
+                for (var windows_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(windows), windows_1_1 = windows_1.next(); !windows_1_1.done; windows_1_1 = windows_1.next()) {
+                    var window_1 = windows_1_1.value;
+                    window_1.next(value);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (windows_1_1 && !windows_1_1.done && (_a = windows_1.return)) _a.call(windows_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            var c = count - windowSize + 1;
+            if (c >= 0 && c % startEvery === 0) {
+                windows.shift().complete();
+            }
+            if (++count % startEvery === 0) {
+                var window_2 = new _Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]();
+                windows.push(window_2);
+                subscriber.next(window_2.asObservable());
+            }
+        }, function () {
+            while (windows.length > 0) {
+                windows.shift().complete();
+            }
+            subscriber.complete();
+        }, function (err) {
+            while (windows.length > 0) {
+                windows.shift().error(err);
+            }
+            subscriber.error(err);
+        }, function () {
+            starts = null;
+            windows = null;
+        }));
+    });
 }
+//# sourceMappingURL=windowCount.js.map
 
-/**
- * Expose `Base` with default settings
- */
+/***/ }),
 
-module.exports = namespace();
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowTime.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Allow users to define a namespace
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowTime; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
-module.exports.namespace = namespace;
 
 
+
+
+
+
+
+function windowTime(windowTimeSpan) {
+    var _a, _b;
+    var otherArgs = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        otherArgs[_i - 1] = arguments[_i];
+    }
+    var scheduler = (_a = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popScheduler */ "c"])(otherArgs)) !== null && _a !== void 0 ? _a : _scheduler_async__WEBPACK_IMPORTED_MODULE_1__[/* asyncScheduler */ "b"];
+    var windowCreationInterval = (_b = otherArgs[0]) !== null && _b !== void 0 ? _b : null;
+    var maxWindowSize = otherArgs[1] || Infinity;
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var windowRecords = [];
+        var restartOnClose = false;
+        var closeWindow = function (record) {
+            var window = record.window, subs = record.subs;
+            window.complete();
+            subs.unsubscribe();
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_5__[/* arrRemove */ "a"])(windowRecords, record);
+            restartOnClose && startWindow();
+        };
+        var startWindow = function () {
+            if (windowRecords) {
+                var subs = new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]();
+                subscriber.add(subs);
+                var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+                var record_1 = {
+                    window: window_1,
+                    subs: subs,
+                    seen: 0,
+                };
+                windowRecords.push(record_1);
+                subscriber.next(window_1.asObservable());
+                Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subs, scheduler, function () { return closeWindow(record_1); }, windowTimeSpan);
+            }
+        };
+        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_7__[/* executeSchedule */ "a"])(subscriber, scheduler, startWindow, windowCreationInterval, true);
+        }
+        else {
+            restartOnClose = true;
+        }
+        startWindow();
+        var loop = function (cb) { return windowRecords.slice().forEach(cb); };
+        var terminate = function (cb) {
+            loop(function (_a) {
+                var window = _a.window;
+                return cb(window);
+            });
+            cb(subscriber);
+            subscriber.unsubscribe();
+        };
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_4__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            loop(function (record) {
+                record.window.next(value);
+                maxWindowSize <= ++record.seen && closeWindow(record);
+            });
+        }, function () { return terminate(function (consumer) { return consumer.complete(); }); }, function (err) { return terminate(function (consumer) { return consumer.error(err); }); }));
+        return function () {
+            windowRecords = null;
+        };
+    });
+}
+//# sourceMappingURL=windowTime.js.map
+
 /***/ }),
-/* 630 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowToggle.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowToggle; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
 
 
-var isDescriptor = __webpack_require__(593);
 
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
 
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
 
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
 
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
 
+function windowToggle(openings, closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_3__[/* operate */ "b"])(function (source, subscriber) {
+        var windows = [];
+        var handleError = function (err) {
+            while (0 < windows.length) {
+                windows.shift().error(err);
+            }
+            subscriber.error(err);
+        };
+        Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__[/* innerFrom */ "a"])(openings).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (openValue) {
+            var window = new _Subject__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"]();
+            windows.push(window);
+            var closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"]();
+            var closeWindow = function () {
+                Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_7__[/* arrRemove */ "a"])(windows, window);
+                window.complete();
+                closingSubscription.unsubscribe();
+            };
+            var closingNotifier;
+            try {
+                closingNotifier = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_4__[/* innerFrom */ "a"])(closingSelector(openValue));
+            }
+            catch (err) {
+                handleError(err);
+                return;
+            }
+            subscriber.next(window.asObservable());
+            closingSubscription.add(closingNotifier.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, closeWindow, _util_noop__WEBPACK_IMPORTED_MODULE_6__[/* noop */ "a"], handleError)));
+        }, _util_noop__WEBPACK_IMPORTED_MODULE_6__[/* noop */ "a"]));
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_5__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            var e_1, _a;
+            var windowsCopy = windows.slice();
+            try {
+                for (var windowsCopy_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __values */ "i"])(windowsCopy), windowsCopy_1_1 = windowsCopy_1.next(); !windowsCopy_1_1.done; windowsCopy_1_1 = windowsCopy_1.next()) {
+                    var window_1 = windowsCopy_1_1.value;
+                    window_1.next(value);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (windowsCopy_1_1 && !windowsCopy_1_1.done && (_a = windowsCopy_1.return)) _a.call(windowsCopy_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }, function () {
+            while (0 < windows.length) {
+                windows.shift().complete();
+            }
+            subscriber.complete();
+        }, handleError, function () {
+            while (0 < windows.length) {
+                windows.shift().unsubscribe();
+            }
+        }));
+    });
+}
+//# sourceMappingURL=windowToggle.js.map
 
 /***/ }),
-/* 631 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/windowWhen.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var isObject = __webpack_require__(592);
-var Emitter = __webpack_require__(632);
-var visit = __webpack_require__(633);
-var toPath = __webpack_require__(636);
-var union = __webpack_require__(638);
-var del = __webpack_require__(644);
-var get = __webpack_require__(641);
-var has = __webpack_require__(649);
-var set = __webpack_require__(652);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return windowWhen; });
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
 
-/**
- * Create a `Cache` constructor that when instantiated will
- * store values on the given `prop`.
- *
- * ```js
- * var Cache = require('cache-base').namespace('data');
- * var cache = new Cache();
- *
- * cache.set('foo', 'bar');
- * //=> {data: {foo: 'bar'}}
- * ```
- * @param {String} `prop` The property name to use for storing values.
- * @return {Function} Returns a custom `Cache` constructor
- * @api public
- */
 
-function namespace(prop) {
 
-  /**
-   * Create a new `Cache`. Internally the `Cache` constructor is created using
-   * the `namespace` function, with `cache` defined as the storage object.
-   *
-   * ```js
-   * var app = new Cache();
-   * ```
-   * @param {Object} `cache` Optionally pass an object to initialize with.
-   * @constructor
-   * @api public
-   */
 
-  function Cache(cache) {
-    if (prop) {
-      this[prop] = {};
-    }
-    if (cache) {
-      this.set(cache);
-    }
-  }
+function windowWhen(closingSelector) {
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var window;
+        var closingSubscriber;
+        var handleError = function (err) {
+            window.error(err);
+            subscriber.error(err);
+        };
+        var openWindow = function () {
+            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
+            window === null || window === void 0 ? void 0 : window.complete();
+            window = new _Subject__WEBPACK_IMPORTED_MODULE_0__[/* Subject */ "a"]();
+            subscriber.next(window.asObservable());
+            var closingNotifier;
+            try {
+                closingNotifier = Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(closingSelector());
+            }
+            catch (err) {
+                handleError(err);
+                return;
+            }
+            closingNotifier.subscribe((closingSubscriber = Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, openWindow, openWindow, handleError)));
+        };
+        openWindow();
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) { return window.next(value); }, function () {
+            window.complete();
+            subscriber.complete();
+        }, handleError, function () {
+            closingSubscriber === null || closingSubscriber === void 0 ? void 0 : closingSubscriber.unsubscribe();
+            window = null;
+        }));
+    });
+}
+//# sourceMappingURL=windowWhen.js.map
 
-  /**
-   * Inherit Emitter
-   */
+/***/ }),
 
-  Emitter(Cache.prototype);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  /**
-   * Assign `value` to `key`. Also emits `set` with
-   * the key and value.
-   *
-   * ```js
-   * app.on('set', function(key, val) {
-   *   // do something when `set` is emitted
-   * });
-   *
-   * app.set(key, value);
-   *
-   * // also takes an object or array
-   * app.set({name: 'Halle'});
-   * app.set([{foo: 'bar'}, {baz: 'quux'}]);
-   * console.log(app);
-   * //=> {name: 'Halle', foo: 'bar', baz: 'quux'}
-   * ```
-   *
-   * @name .set
-   * @emits `set` with `key` and `value` as arguments.
-   * @param {String} `key`
-   * @param {any} `value`
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return withLatestFrom; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
+/* harmony import */ var _OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js");
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/noop.js");
+/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/args.js");
 
-  Cache.prototype.set = function(key, val) {
-    if (Array.isArray(key) && arguments.length === 2) {
-      key = toPath(key);
-    }
-    if (isObject(key) || Array.isArray(key)) {
-      this.visit('set', key);
-    } else {
-      set(prop ? this[prop] : this, key, val);
-      this.emit('set', key, val);
-    }
-    return this;
-  };
 
-  /**
-   * Union `array` to `key`. Also emits `set` with
-   * the key and value.
-   *
-   * ```js
-   * app.union('a.b', ['foo']);
-   * app.union('a.b', ['bar']);
-   * console.log(app.get('a'));
-   * //=> {b: ['foo', 'bar']}
-   * ```
-   * @name .union
-   * @param {String} `key`
-   * @param {any} `value`
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
 
-  Cache.prototype.union = function(key, val) {
-    if (Array.isArray(key) && arguments.length === 2) {
-      key = toPath(key);
-    }
-    var ctx = prop ? this[prop] : this;
-    union(ctx, key, arrayify(val));
-    this.emit('union', val);
-    return this;
-  };
 
-  /**
-   * Return the value of `key`. Dot notation may be used
-   * to get [nested property values][get-value].
-   *
-   * ```js
-   * app.set('a.b.c', 'd');
-   * app.get('a.b');
-   * //=> {c: 'd'}
-   *
-   * app.get(['a', 'b']);
-   * //=> {c: 'd'}
-   * ```
-   *
-   * @name .get
-   * @emits `get` with `key` and `value` as arguments.
-   * @param {String} `key` The name of the property to get. Dot-notation may be used.
-   * @return {any} Returns the value of `key`
-   * @api public
-   */
 
-  Cache.prototype.get = function(key) {
-    key = toPath(arguments);
 
-    var ctx = prop ? this[prop] : this;
-    var val = get(ctx, key);
 
-    this.emit('get', key, val);
-    return val;
-  };
+function withLatestFrom() {
+    var inputs = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        inputs[_i] = arguments[_i];
+    }
+    var project = Object(_util_args__WEBPACK_IMPORTED_MODULE_6__[/* popResultSelector */ "b"])(inputs);
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_1__[/* operate */ "b"])(function (source, subscriber) {
+        var len = inputs.length;
+        var otherValues = new Array(len);
+        var hasValue = inputs.map(function () { return false; });
+        var ready = false;
+        var _loop_1 = function (i) {
+            Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_3__[/* innerFrom */ "a"])(inputs[i]).subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+                otherValues[i] = value;
+                if (!ready && !hasValue[i]) {
+                    hasValue[i] = true;
+                    (ready = hasValue.every(_util_identity__WEBPACK_IMPORTED_MODULE_4__[/* identity */ "a"])) && (hasValue = null);
+                }
+            }, _util_noop__WEBPACK_IMPORTED_MODULE_5__[/* noop */ "a"]));
+        };
+        for (var i = 0; i < len; i++) {
+            _loop_1(i);
+        }
+        source.subscribe(Object(_OperatorSubscriber__WEBPACK_IMPORTED_MODULE_2__[/* createOperatorSubscriber */ "b"])(subscriber, function (value) {
+            if (ready) {
+                var values = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([value], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherValues));
+                subscriber.next(project ? project.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(values))) : values);
+            }
+        }));
+    });
+}
+//# sourceMappingURL=withLatestFrom.js.map
 
-  /**
-   * Return true if app has a stored value for `key`,
-   * false only if value is `undefined`.
-   *
-   * ```js
-   * app.set('foo', 'bar');
-   * app.has('foo');
-   * //=> true
-   * ```
-   *
-   * @name .has
-   * @emits `has` with `key` and true or false as arguments.
-   * @param {String} `key`
-   * @return {Boolean}
-   * @api public
-   */
+/***/ }),
 
-  Cache.prototype.has = function(key) {
-    key = toPath(arguments);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/zip.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    var ctx = prop ? this[prop] : this;
-    var val = get(ctx, key);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zip; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/zip.js");
+/* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/lift.js");
 
-    var has = typeof val !== 'undefined';
-    this.emit('has', key, has);
-    return has;
-  };
 
-  /**
-   * Delete one or more properties from the instance.
-   *
-   * ```js
-   * app.del(); // delete all
-   * // or
-   * app.del('foo');
-   * // or
-   * app.del(['foo', 'bar']);
-   * ```
-   * @name .del
-   * @emits `del` with the `key` as the only argument.
-   * @param {String|Array} `key` Property name or array of property names.
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
 
-  Cache.prototype.del = function(key) {
-    if (Array.isArray(key)) {
-      this.visit('del', key);
-    } else {
-      del(prop ? this[prop] : this, key);
-      this.emit('del', key);
+function zip() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
     }
-    return this;
-  };
+    return Object(_util_lift__WEBPACK_IMPORTED_MODULE_2__[/* operate */ "b"])(function (source, subscriber) {
+        _observable_zip__WEBPACK_IMPORTED_MODULE_1__[/* zip */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([source], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(sources))).subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=zip.js.map
 
-  /**
-   * Reset the entire cache to an empty object.
-   *
-   * ```js
-   * app.clear();
-   * ```
-   * @api public
-   */
+/***/ }),
 
-  Cache.prototype.clear = function() {
-    if (prop) {
-      this[prop] = {};
-    }
-  };
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/zipAll.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  /**
-   * Visit `method` over the properties in the given object, or map
-   * visit over the object-elements in an array.
-   *
-   * @name .visit
-   * @param {String} `method` The name of the `base` method to call.
-   * @param {Object|Array} `val` The object or array to iterate over.
-   * @return {Object} Returns the instance for chaining.
-   * @api public
-   */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zipAll; });
+/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/zip.js");
+/* harmony import */ var _joinAllInternals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/joinAllInternals.js");
 
-  Cache.prototype.visit = function(method, val) {
-    visit(this, method, val);
-    return this;
-  };
 
-  return Cache;
+function zipAll(project) {
+    return Object(_joinAllInternals__WEBPACK_IMPORTED_MODULE_1__[/* joinAllInternals */ "a"])(_observable_zip__WEBPACK_IMPORTED_MODULE_0__[/* zip */ "a"], project);
 }
+//# sourceMappingURL=zipAll.js.map
 
-/**
- * Cast val to an array
- */
+/***/ }),
 
-function arrayify(val) {
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/operators/zipWith.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Expose `Cache`
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return zipWith; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _zip__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zip.js");
 
-module.exports = namespace();
 
-/**
- * Expose `Cache.namespace`
- */
+function zipWith() {
+    var otherInputs = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        otherInputs[_i] = arguments[_i];
+    }
+    return _zip__WEBPACK_IMPORTED_MODULE_1__[/* zip */ "a"].apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(otherInputs)));
+}
+//# sourceMappingURL=zipWith.js.map
 
-module.exports.namespace = namespace;
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleArray.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleArray; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
 
+function scheduleArray(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var i = 0;
+        return scheduler.schedule(function () {
+            if (i === input.length) {
+                subscriber.complete();
+            }
+            else {
+                subscriber.next(input[i++]);
+                if (!subscriber.closed) {
+                    this.schedule();
+                }
+            }
+        });
+    });
+}
+//# sourceMappingURL=scheduleArray.js.map
 
 /***/ }),
-/* 632 */
-/***/ (function(module, exports, __webpack_require__) {
 
-
-/**
- * Expose `Emitter`.
- */
-
-if (true) {
-  module.exports = Emitter;
-}
-
-/**
- * Initialize a new `Emitter`.
- *
- * @api public
- */
-
-function Emitter(obj) {
-  if (obj) return mixin(obj);
-};
-
-/**
- * Mixin the emitter properties.
- *
- * @param {Object} obj
- * @return {Object}
- * @api private
- */
-
-function mixin(obj) {
-  for (var key in Emitter.prototype) {
-    obj[key] = Emitter.prototype[key];
-  }
-  return obj;
-}
-
-/**
- * Listen on the given `event` with `fn`.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.on =
-Emitter.prototype.addEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-  (this._callbacks['$' + event] = this._callbacks['$' + event] || [])
-    .push(fn);
-  return this;
-};
-
-/**
- * Adds an `event` listener that will be invoked a single
- * time then automatically removed.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.once = function(event, fn){
-  function on() {
-    this.off(event, on);
-    fn.apply(this, arguments);
-  }
-
-  on.fn = fn;
-  this.on(event, on);
-  return this;
-};
-
-/**
- * Remove the given callback for `event` or all
- * registered callbacks.
- *
- * @param {String} event
- * @param {Function} fn
- * @return {Emitter}
- * @api public
- */
-
-Emitter.prototype.off =
-Emitter.prototype.removeListener =
-Emitter.prototype.removeAllListeners =
-Emitter.prototype.removeEventListener = function(event, fn){
-  this._callbacks = this._callbacks || {};
-
-  // all
-  if (0 == arguments.length) {
-    this._callbacks = {};
-    return this;
-  }
-
-  // specific event
-  var callbacks = this._callbacks['$' + event];
-  if (!callbacks) return this;
-
-  // remove all handlers
-  if (1 == arguments.length) {
-    delete this._callbacks['$' + event];
-    return this;
-  }
-
-  // remove specific handler
-  var cb;
-  for (var i = 0; i < callbacks.length; i++) {
-    cb = callbacks[i];
-    if (cb === fn || cb.fn === fn) {
-      callbacks.splice(i, 1);
-      break;
-    }
-  }
-  return this;
-};
-
-/**
- * Emit `event` with the given args.
- *
- * @param {String} event
- * @param {Mixed} ...
- * @return {Emitter}
- */
-
-Emitter.prototype.emit = function(event){
-  this._callbacks = this._callbacks || {};
-  var args = [].slice.call(arguments, 1)
-    , callbacks = this._callbacks['$' + event];
-
-  if (callbacks) {
-    callbacks = callbacks.slice(0);
-    for (var i = 0, len = callbacks.length; i < len; ++i) {
-      callbacks[i].apply(this, args);
-    }
-  }
-
-  return this;
-};
-
-/**
- * Return array of callbacks for `event`.
- *
- * @param {String} event
- * @return {Array}
- * @api public
- */
-
-Emitter.prototype.listeners = function(event){
-  this._callbacks = this._callbacks || {};
-  return this._callbacks['$' + event] || [];
-};
-
-/**
- * Check if this emitter has `event` handlers.
- *
- * @param {String} event
- * @return {Boolean}
- * @api public
- */
-
-Emitter.prototype.hasListeners = function(event){
-  return !! this.listeners(event).length;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleAsyncIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleAsyncIterable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
+
 
+function scheduleAsyncIterable(input, scheduler) {
+    if (!input) {
+        throw new Error('Iterable cannot be null');
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+            var iterator = input[Symbol.asyncIterator]();
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_1__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+                iterator.next().then(function (result) {
+                    if (result.done) {
+                        subscriber.complete();
+                    }
+                    else {
+                        subscriber.next(result.value);
+                    }
+                });
+            }, 0, true);
+        });
+    });
+}
+//# sourceMappingURL=scheduleAsyncIterable.js.map
 
 /***/ }),
-/* 633 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * collection-visit <https://github.com/jonschlinkert/collection-visit>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleIterable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/iterator.js");
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js");
 
 
 
-var visit = __webpack_require__(634);
-var mapVisit = __webpack_require__(635);
 
-module.exports = function(collection, method, val) {
-  var result;
+function scheduleIterable(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"](function (subscriber) {
+        var iterator;
+        Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+            iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_1__[/* iterator */ "a"]]();
+            Object(_util_executeSchedule__WEBPACK_IMPORTED_MODULE_3__[/* executeSchedule */ "a"])(subscriber, scheduler, function () {
+                var _a;
+                var value;
+                var done;
+                try {
+                    (_a = iterator.next(), value = _a.value, done = _a.done);
+                }
+                catch (err) {
+                    subscriber.error(err);
+                    return;
+                }
+                if (done) {
+                    subscriber.complete();
+                }
+                else {
+                    subscriber.next(value);
+                }
+            }, 0, true);
+        });
+        return function () { return Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__[/* isFunction */ "a"])(iterator === null || iterator === void 0 ? void 0 : iterator.return) && iterator.return(); };
+    });
+}
+//# sourceMappingURL=scheduleIterable.js.map
 
-  if (typeof val === 'string' && (method in collection)) {
-    var args = [].slice.call(arguments, 2);
-    result = collection[method].apply(collection, args);
-  } else if (Array.isArray(val)) {
-    result = mapVisit.apply(null, arguments);
-  } else {
-    result = visit.apply(null, arguments);
-  }
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleObservable; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
 
-  if (typeof result !== 'undefined') {
-    return result;
-  }
 
-  return collection;
-};
 
+function scheduleObservable(input, scheduler) {
+    return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(input).pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__[/* subscribeOn */ "a"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_1__[/* observeOn */ "a"])(scheduler));
+}
+//# sourceMappingURL=scheduleObservable.js.map
 
 /***/ }),
-/* 634 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/schedulePromise.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * object-visit <https://github.com/jonschlinkert/object-visit>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return schedulePromise; });
+/* harmony import */ var _observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js");
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony import */ var _operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
 
 
 
-var isObject = __webpack_require__(592);
+function schedulePromise(input, scheduler) {
+    return Object(_observable_innerFrom__WEBPACK_IMPORTED_MODULE_0__[/* innerFrom */ "a"])(input).pipe(Object(_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_2__[/* subscribeOn */ "a"])(scheduler), Object(_operators_observeOn__WEBPACK_IMPORTED_MODULE_1__[/* observeOn */ "a"])(scheduler));
+}
+//# sourceMappingURL=schedulePromise.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleReadableStreamLike.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleReadableStreamLike; });
+/* harmony import */ var _scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleAsyncIterable.js");
+/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js");
+
+
+function scheduleReadableStreamLike(input, scheduler) {
+    return Object(_scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_0__[/* scheduleAsyncIterable */ "a"])(Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_1__[/* readableStreamLikeToAsyncGenerator */ "b"])(input), scheduler);
+}
+//# sourceMappingURL=scheduleReadableStreamLike.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduled.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduled; });
+/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleObservable.js");
+/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/schedulePromise.js");
+/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleArray.js");
+/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleIterable.js");
+/* harmony import */ var _scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleAsyncIterable.js");
+/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js");
+/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isPromise.js");
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js");
+/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isIterable.js");
+/* harmony import */ var _util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js");
+/* harmony import */ var _util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js");
+/* harmony import */ var _util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js");
+/* harmony import */ var _scheduleReadableStreamLike__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduled/scheduleReadableStreamLike.js");
 
-module.exports = function visit(thisArg, method, target, val) {
-  if (!isObject(thisArg) && typeof thisArg !== 'function') {
-    throw new Error('object-visit expects `thisArg` to be an object.');
-  }
 
-  if (typeof method !== 'string') {
-    throw new Error('object-visit expects `method` name to be a string');
-  }
 
-  if (typeof thisArg[method] !== 'function') {
-    return thisArg;
-  }
 
-  var args = [].slice.call(arguments, 3);
-  target = target || {};
 
-  for (var key in target) {
-    var arr = [key, target[key]].concat(args);
-    thisArg[method].apply(thisArg, arr);
-  }
-  return thisArg;
-};
 
 
+
+
+
+
+
+
+function scheduled(input, scheduler) {
+    if (input != null) {
+        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_5__[/* isInteropObservable */ "a"])(input)) {
+            return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__[/* scheduleObservable */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_7__[/* isArrayLike */ "a"])(input)) {
+            return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__[/* scheduleArray */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_6__[/* isPromise */ "a"])(input)) {
+            return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__[/* schedulePromise */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isAsyncIterable__WEBPACK_IMPORTED_MODULE_9__[/* isAsyncIterable */ "a"])(input)) {
+            return Object(_scheduleAsyncIterable__WEBPACK_IMPORTED_MODULE_4__[/* scheduleAsyncIterable */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_8__[/* isIterable */ "a"])(input)) {
+            return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__[/* scheduleIterable */ "a"])(input, scheduler);
+        }
+        if (Object(_util_isReadableStreamLike__WEBPACK_IMPORTED_MODULE_11__[/* isReadableStreamLike */ "a"])(input)) {
+            return Object(_scheduleReadableStreamLike__WEBPACK_IMPORTED_MODULE_12__[/* scheduleReadableStreamLike */ "a"])(input, scheduler);
+        }
+    }
+    throw Object(_util_throwUnobservableError__WEBPACK_IMPORTED_MODULE_10__[/* createInvalidObservableTypeError */ "a"])(input);
+}
+//# sourceMappingURL=scheduled.js.map
+
 /***/ }),
-/* 635 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/Action.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Action; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
 
 
-var util = __webpack_require__(113);
-var visit = __webpack_require__(634);
+var Action = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(Action, _super);
+    function Action(scheduler, work) {
+        return _super.call(this) || this;
+    }
+    Action.prototype.schedule = function (state, delay) {
+        if (delay === void 0) { delay = 0; }
+        return this;
+    };
+    return Action;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"]));
 
-/**
- * Map `visit` over an array of objects.
- *
- * @param  {Object} `collection` The context in which to invoke `method`
- * @param  {String} `method` Name of the method to call on `collection`
- * @param  {Object} `arr` Array of objects.
- */
+//# sourceMappingURL=Action.js.map
 
-module.exports = function mapVisit(collection, method, val) {
-  if (isObject(val)) {
-    return visit.apply(null, arguments);
-  }
+/***/ }),
 
-  if (!Array.isArray(val)) {
-    throw new TypeError('expected an array: ' + util.inspect(val));
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var args = [].slice.call(arguments, 3);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrameProvider.js");
 
-  for (var i = 0; i < val.length; i++) {
-    var ele = val[i];
-    if (isObject(ele)) {
-      visit.apply(null, [collection, method, ele].concat(args));
-    } else {
-      collection[method].apply(collection, [ele].concat(args));
+
+
+var AnimationFrameAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AnimationFrameAction, _super);
+    function AnimationFrameAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
     }
-  }
-};
+    AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        if (delay !== null && delay > 0) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        scheduler.actions.push(this);
+        return scheduler._scheduled || (scheduler._scheduled = _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__[/* animationFrameProvider */ "a"].requestAnimationFrame(function () { return scheduler.flush(undefined); }));
+    };
+    AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        if ((delay != null && delay > 0) || (delay == null && this.delay > 0)) {
+            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
+        }
+        if (!scheduler.actions.some(function (action) { return action.id === id; })) {
+            _animationFrameProvider__WEBPACK_IMPORTED_MODULE_2__[/* animationFrameProvider */ "a"].cancelAnimationFrame(id);
+            scheduler._scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AnimationFrameAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__[/* AsyncAction */ "a"]));
 
-function isObject(val) {
-  return val && (typeof val === 'function' || (!Array.isArray(val) && typeof val === 'object'));
-}
+//# sourceMappingURL=AnimationFrameAction.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
+
+
+var AnimationFrameScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AnimationFrameScheduler, _super);
+    function AnimationFrameScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AnimationFrameScheduler.prototype.flush = function (action) {
+        this._active = true;
+        var flushId = this._scheduled;
+        this._scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        action = action || actions.shift();
+        do {
+            if ((error = action.execute(action.state, action.delay))) {
+                break;
+            }
+        } while ((action = actions[0]) && action.id === flushId && actions.shift());
+        this._active = false;
+        if (error) {
+            while ((action = actions[0]) && action.id === flushId && actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AnimationFrameScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"]));
 
+//# sourceMappingURL=AnimationFrameScheduler.js.map
 
 /***/ }),
-/* 636 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * to-object-path <https://github.com/jonschlinkert/to-object-path>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _immediateProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/immediateProvider.js");
 
 
 
-var typeOf = __webpack_require__(637);
+var AsapAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsapAction, _super);
+    function AsapAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        if (delay !== null && delay > 0) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        scheduler.actions.push(this);
+        return scheduler._scheduled || (scheduler._scheduled = _immediateProvider__WEBPACK_IMPORTED_MODULE_2__[/* immediateProvider */ "a"].setImmediate(scheduler.flush.bind(scheduler, undefined)));
+    };
+    AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        if ((delay != null && delay > 0) || (delay == null && this.delay > 0)) {
+            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
+        }
+        if (!scheduler.actions.some(function (action) { return action.id === id; })) {
+            _immediateProvider__WEBPACK_IMPORTED_MODULE_2__[/* immediateProvider */ "a"].clearImmediate(id);
+            scheduler._scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AsapAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__[/* AsyncAction */ "a"]));
 
-module.exports = function toPath(args) {
-  if (typeOf(args) !== 'arguments') {
-    args = arguments;
-  }
-  return filter(args).join('.');
-};
+//# sourceMappingURL=AsapAction.js.map
 
-function filter(arr) {
-  var len = arr.length;
-  var idx = -1;
-  var res = [];
+/***/ }),
 
-  while (++idx < len) {
-    var ele = arr[idx];
-    if (typeOf(ele) === 'arguments' || Array.isArray(ele)) {
-      res.push.apply(res, filter(ele));
-    } else if (typeof ele === 'string') {
-      res.push(ele);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
+
+
+var AsapScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsapScheduler, _super);
+    function AsapScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-  }
-  return res;
-}
+    AsapScheduler.prototype.flush = function (action) {
+        this._active = true;
+        var flushId = this._scheduled;
+        this._scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        action = action || actions.shift();
+        do {
+            if ((error = action.execute(action.state, action.delay))) {
+                break;
+            }
+        } while ((action = actions[0]) && action.id === flushId && actions.shift());
+        this._active = false;
+        if (error) {
+            while ((action = actions[0]) && action.id === flushId && actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsapScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"]));
 
+//# sourceMappingURL=AsapScheduler.js.map
 
 /***/ }),
-/* 637 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/Action.js");
+/* harmony import */ var _intervalProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/intervalProvider.js");
+/* harmony import */ var _util_arrRemove__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js");
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
+var AsyncAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsyncAction, _super);
+    function AsyncAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        _this.pending = false;
+        return _this;
+    }
+    AsyncAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) { delay = 0; }
+        if (this.closed) {
+            return this;
+        }
+        this.state = state;
+        var id = this.id;
+        var scheduler = this.scheduler;
+        if (id != null) {
+            this.id = this.recycleAsyncId(scheduler, id, delay);
+        }
+        this.pending = true;
+        this.delay = delay;
+        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
+        return this;
+    };
+    AsyncAction.prototype.requestAsyncId = function (scheduler, _id, delay) {
+        if (delay === void 0) { delay = 0; }
+        return _intervalProvider__WEBPACK_IMPORTED_MODULE_2__[/* intervalProvider */ "a"].setInterval(scheduler.flush.bind(scheduler, this), delay);
+    };
+    AsyncAction.prototype.recycleAsyncId = function (_scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        if (delay != null && this.delay === delay && this.pending === false) {
+            return id;
+        }
+        _intervalProvider__WEBPACK_IMPORTED_MODULE_2__[/* intervalProvider */ "a"].clearInterval(id);
+        return undefined;
+    };
+    AsyncAction.prototype.execute = function (state, delay) {
+        if (this.closed) {
+            return new Error('executing a cancelled action');
+        }
+        this.pending = false;
+        var error = this._execute(state, delay);
+        if (error) {
+            return error;
+        }
+        else if (this.pending === false && this.id != null) {
+            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
+        }
+    };
+    AsyncAction.prototype._execute = function (state, _delay) {
+        var errored = false;
+        var errorValue;
+        try {
+            this.work(state);
+        }
+        catch (e) {
+            errored = true;
+            errorValue = e ? e : new Error('Scheduled action threw falsy error');
+        }
+        if (errored) {
+            this.unsubscribe();
+            return errorValue;
+        }
+    };
+    AsyncAction.prototype.unsubscribe = function () {
+        if (!this.closed) {
+            var _a = this, id = _a.id, scheduler = _a.scheduler;
+            var actions = scheduler.actions;
+            this.work = this.state = this.scheduler = null;
+            this.pending = false;
+            Object(_util_arrRemove__WEBPACK_IMPORTED_MODULE_3__[/* arrRemove */ "a"])(actions, this);
+            if (id != null) {
+                this.id = this.recycleAsyncId(scheduler, id, null);
+            }
+            this.delay = null;
+            _super.prototype.unsubscribe.call(this);
+        }
+    };
+    return AsyncAction;
+}(_Action__WEBPACK_IMPORTED_MODULE_1__[/* Action */ "a"]));
 
-  // other objects
-  var type = toString.call(val);
+//# sourceMappingURL=AsyncAction.js.map
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
+/***/ }),
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Scheduler.js");
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
 
-  // must be a plain object
-  return 'object';
-};
+var AsyncScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(AsyncScheduler, _super);
+    function AsyncScheduler(SchedulerAction, now) {
+        if (now === void 0) { now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__[/* Scheduler */ "a"].now; }
+        var _this = _super.call(this, SchedulerAction, now) || this;
+        _this.actions = [];
+        _this._active = false;
+        _this._scheduled = undefined;
+        return _this;
+    }
+    AsyncScheduler.prototype.flush = function (action) {
+        var actions = this.actions;
+        if (this._active) {
+            actions.push(action);
+            return;
+        }
+        var error;
+        this._active = true;
+        do {
+            if ((error = action.execute(action.state, action.delay))) {
+                break;
+            }
+        } while ((action = actions.shift()));
+        this._active = false;
+        if (error) {
+            while ((action = actions.shift())) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsyncScheduler;
+}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__[/* Scheduler */ "a"]));
+
+//# sourceMappingURL=AsyncScheduler.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueAction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+
+
+var QueueAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(QueueAction, _super);
+    function QueueAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    QueueAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) { delay = 0; }
+        if (delay > 0) {
+            return _super.prototype.schedule.call(this, state, delay);
+        }
+        this.delay = delay;
+        this.state = state;
+        this.scheduler.flush(this);
+        return this;
+    };
+    QueueAction.prototype.execute = function (state, delay) {
+        return (delay > 0 || this.closed) ?
+            _super.prototype.execute.call(this, state, delay) :
+            this._execute(state, delay);
+    };
+    QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        if ((delay != null && delay > 0) || (delay == null && this.delay > 0)) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        return scheduler.flush(this);
+    };
+    return QueueAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__[/* AsyncAction */ "a"]));
 
+//# sourceMappingURL=QueueAction.js.map
 
 /***/ }),
-/* 638 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueScheduler; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
-var isObject = __webpack_require__(639);
-var union = __webpack_require__(640);
-var get = __webpack_require__(641);
-var set = __webpack_require__(642);
 
-module.exports = function unionValue(obj, prop, value) {
-  if (!isObject(obj)) {
-    throw new TypeError('union-value expects the first argument to be an object.');
-  }
+var QueueScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(QueueScheduler, _super);
+    function QueueScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return QueueScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"]));
 
-  if (typeof prop !== 'string') {
-    throw new TypeError('union-value expects `prop` to be a string.');
-  }
+//# sourceMappingURL=QueueScheduler.js.map
 
-  var arr = arrayify(get(obj, prop));
-  set(obj, prop, union(arr, arrayify(value)));
-  return obj;
-};
+/***/ }),
 
-function arrayify(val) {
-  if (val === null || typeof val === 'undefined') {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val;
-  }
-  return [val];
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/VirtualTimeScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return VirtualTimeScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VirtualAction; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
-/***/ }),
-/* 639 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
 
+var VirtualTimeScheduler = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(VirtualTimeScheduler, _super);
+    function VirtualTimeScheduler(schedulerActionCtor, maxFrames) {
+        if (schedulerActionCtor === void 0) { schedulerActionCtor = VirtualAction; }
+        if (maxFrames === void 0) { maxFrames = Infinity; }
+        var _this = _super.call(this, schedulerActionCtor, function () { return _this.frame; }) || this;
+        _this.maxFrames = maxFrames;
+        _this.frame = 0;
+        _this.index = -1;
+        return _this;
+    }
+    VirtualTimeScheduler.prototype.flush = function () {
+        var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
+        var error;
+        var action;
+        while ((action = actions[0]) && action.delay <= maxFrames) {
+            actions.shift();
+            this.frame = action.delay;
+            if ((error = action.execute(action.state, action.delay))) {
+                break;
+            }
+        }
+        if (error) {
+            while ((action = actions.shift())) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    VirtualTimeScheduler.frameTimeFactor = 10;
+    return VirtualTimeScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_3__[/* AsyncScheduler */ "a"]));
 
-module.exports = function isExtendable(val) {
-  return typeof val !== 'undefined' && val !== null
-    && (typeof val === 'object' || typeof val === 'function');
-};
+var VirtualAction = (function (_super) {
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __extends */ "e"])(VirtualAction, _super);
+    function VirtualAction(scheduler, work, index) {
+        if (index === void 0) { index = (scheduler.index += 1); }
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        _this.index = index;
+        _this.active = true;
+        _this.index = scheduler.index = index;
+        return _this;
+    }
+    VirtualAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) { delay = 0; }
+        if (Number.isFinite(delay)) {
+            if (!this.id) {
+                return _super.prototype.schedule.call(this, state, delay);
+            }
+            this.active = false;
+            var action = new VirtualAction(this.scheduler, this.work);
+            this.add(action);
+            return action.schedule(state, delay);
+        }
+        else {
+            return _Subscription__WEBPACK_IMPORTED_MODULE_2__[/* Subscription */ "b"].EMPTY;
+        }
+    };
+    VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        this.delay = scheduler.frame + delay;
+        var actions = scheduler.actions;
+        actions.push(this);
+        actions.sort(VirtualAction.sortActions);
+        return true;
+    };
+    VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) { delay = 0; }
+        return undefined;
+    };
+    VirtualAction.prototype._execute = function (state, delay) {
+        if (this.active === true) {
+            return _super.prototype._execute.call(this, state, delay);
+        }
+    };
+    VirtualAction.sortActions = function (a, b) {
+        if (a.delay === b.delay) {
+            if (a.index === b.index) {
+                return 0;
+            }
+            else if (a.index > b.index) {
+                return 1;
+            }
+            else {
+                return -1;
+            }
+        }
+        else if (a.delay > b.delay) {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    };
+    return VirtualAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__[/* AsyncAction */ "a"]));
 
+//# sourceMappingURL=VirtualTimeScheduler.js.map
 
 /***/ }),
-/* 640 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrame.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return animationFrameScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrame; });
+/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameAction.js");
+/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AnimationFrameScheduler.js");
 
 
-module.exports = function union(init) {
-  if (!Array.isArray(init)) {
-    throw new TypeError('arr-union expects the first argument to be an array.');
-  }
+var animationFrameScheduler = new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AnimationFrameScheduler */ "a"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__[/* AnimationFrameAction */ "a"]);
+var animationFrame = animationFrameScheduler;
+//# sourceMappingURL=animationFrame.js.map
 
-  var len = arguments.length;
-  var i = 0;
+/***/ }),
 
-  while (++i < len) {
-    var arg = arguments[i];
-    if (!arg) continue;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/animationFrameProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (!Array.isArray(arg)) {
-      arg = [arg];
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrameProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subscription.js");
 
-    for (var j = 0; j < arg.length; j++) {
-      var ele = arg[j];
 
-      if (init.indexOf(ele) >= 0) {
-        continue;
-      }
-      init.push(ele);
-    }
-  }
-  return init;
+var animationFrameProvider = {
+    schedule: function (callback) {
+        var request = requestAnimationFrame;
+        var cancel = cancelAnimationFrame;
+        var delegate = animationFrameProvider.delegate;
+        if (delegate) {
+            request = delegate.requestAnimationFrame;
+            cancel = delegate.cancelAnimationFrame;
+        }
+        var handle = request(function (timestamp) {
+            cancel = undefined;
+            callback(timestamp);
+        });
+        return new _Subscription__WEBPACK_IMPORTED_MODULE_1__[/* Subscription */ "b"](function () { return cancel === null || cancel === void 0 ? void 0 : cancel(handle); });
+    },
+    requestAnimationFrame: function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var delegate = animationFrameProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.requestAnimationFrame) || requestAnimationFrame).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    cancelAnimationFrame: function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var delegate = animationFrameProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.cancelAnimationFrame) || cancelAnimationFrame).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    delegate: undefined,
 };
-
+//# sourceMappingURL=animationFrameProvider.js.map
 
 /***/ }),
-/* 641 */
-/***/ (function(module, exports) {
-
-/*!
- * get-value <https://github.com/jonschlinkert/get-value>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
-module.exports = function(obj, prop, a, b, c) {
-  if (!isObject(obj) || !prop) {
-    return obj;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/asap.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  prop = toString(prop);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return asapScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return asap; });
+/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapAction.js");
+/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsapScheduler.js");
 
-  // allowing for multiple properties to be passed as
-  // a string or array, but much faster (3-4x) than doing
-  // `[].slice.call(arguments)`
-  if (a) prop += '.' + toString(a);
-  if (b) prop += '.' + toString(b);
-  if (c) prop += '.' + toString(c);
 
-  if (prop in obj) {
-    return obj[prop];
-  }
+var asapScheduler = new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsapScheduler */ "a"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__[/* AsapAction */ "a"]);
+var asap = asapScheduler;
+//# sourceMappingURL=asap.js.map
 
-  var segs = prop.split('.');
-  var len = segs.length;
-  var i = -1;
+/***/ }),
 
-  while (obj && (++i < len)) {
-    var key = segs[i];
-    while (key[key.length - 1] === '\\') {
-      key = key.slice(0, -1) + '.' + segs[++i];
-    }
-    obj = obj[key];
-  }
-  return obj;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/async.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isObject(val) {
-  return val !== null && (typeof val === 'object' || typeof val === 'function');
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return asyncScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return async; });
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncAction.js");
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/AsyncScheduler.js");
 
-function toString(val) {
-  if (!val) return '';
-  if (Array.isArray(val)) {
-    return val.join('.');
-  }
-  return val;
-}
 
+var asyncScheduler = new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__[/* AsyncScheduler */ "a"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__[/* AsyncAction */ "a"]);
+var async = asyncScheduler;
+//# sourceMappingURL=async.js.map
 
 /***/ }),
-/* 642 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * set-value <https://github.com/jonschlinkert/set-value>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/dateTimestampProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return dateTimestampProvider; });
+var dateTimestampProvider = {
+    now: function () {
+        return (dateTimestampProvider.delegate || Date).now();
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=dateTimestampProvider.js.map
 
+/***/ }),
 
-var split = __webpack_require__(609);
-var extend = __webpack_require__(643);
-var isPlainObject = __webpack_require__(599);
-var isObject = __webpack_require__(639);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/immediateProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function(obj, prop, val) {
-  if (!isObject(obj)) {
-    return obj;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return immediateProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/Immediate.js");
 
-  if (Array.isArray(prop)) {
-    prop = [].concat.apply([], prop).join('.');
-  }
 
-  if (typeof prop !== 'string') {
-    return obj;
-  }
+var setImmediate = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__[/* Immediate */ "a"].setImmediate, clearImmediate = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__[/* Immediate */ "a"].clearImmediate;
+var immediateProvider = {
+    setImmediate: function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var delegate = immediateProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.setImmediate) || setImmediate).apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    clearImmediate: function (handle) {
+        var delegate = immediateProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearImmediate) || clearImmediate)(handle);
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=immediateProvider.js.map
 
-  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
-  var len = keys.length;
-  var idx = -1;
-  var current = obj;
+/***/ }),
 
-  while (++idx < len) {
-    var key = keys[idx];
-    if (idx !== len - 1) {
-      if (!isObject(current[key])) {
-        current[key] = {};
-      }
-      current = current[key];
-      continue;
-    }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/intervalProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (isPlainObject(current[key]) && isPlainObject(val)) {
-      current[key] = extend({}, current[key], val);
-    } else {
-      current[key] = val;
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return intervalProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
 
-  return obj;
+var intervalProvider = {
+    setInterval: function (handler, timeout) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        var delegate = intervalProvider.delegate;
+        if (delegate === null || delegate === void 0 ? void 0 : delegate.setInterval) {
+            return delegate.setInterval.apply(delegate, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+        }
+        return setInterval.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    clearInterval: function (handle) {
+        var delegate = intervalProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearInterval) || clearInterval)(handle);
+    },
+    delegate: undefined,
 };
+//# sourceMappingURL=intervalProvider.js.map
 
-function isValidKey(key) {
-  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
-}
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/performanceTimestampProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return performanceTimestampProvider; });
+var performanceTimestampProvider = {
+    now: function () {
+        return (performanceTimestampProvider.delegate || performance).now();
+    },
+    delegate: undefined,
+};
+//# sourceMappingURL=performanceTimestampProvider.js.map
 
 /***/ }),
-/* 643 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/queue.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return queueScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return queue; });
+/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueAction.js");
+/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/QueueScheduler.js");
 
 
-var isObject = __webpack_require__(639);
+var queueScheduler = new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__[/* QueueScheduler */ "a"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__[/* QueueAction */ "a"]);
+var queue = queueScheduler;
+//# sourceMappingURL=queue.js.map
 
-module.exports = function extend(o/*, objects*/) {
-  if (!isObject(o)) { o = {}; }
+/***/ }),
 
-  var len = arguments.length;
-  for (var i = 1; i < len; i++) {
-    var obj = arguments[i];
+/***/ "../../node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (isObject(obj)) {
-      assign(o, obj);
-    }
-  }
-  return o;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return timeoutProvider; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+
+var timeoutProvider = {
+    setTimeout: function (handler, timeout) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        var delegate = timeoutProvider.delegate;
+        if (delegate === null || delegate === void 0 ? void 0 : delegate.setTimeout) {
+            return delegate.setTimeout.apply(delegate, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+        }
+        return setTimeout.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([handler, timeout], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args)));
+    },
+    clearTimeout: function (handle) {
+        var delegate = timeoutProvider.delegate;
+        return ((delegate === null || delegate === void 0 ? void 0 : delegate.clearTimeout) || clearTimeout)(handle);
+    },
+    delegate: undefined,
 };
+//# sourceMappingURL=timeoutProvider.js.map
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/symbol/iterator.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* unused harmony export getSymbolIterator */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iterator; });
+function getSymbolIterator() {
+    if (typeof Symbol !== 'function' || !Symbol.iterator) {
+        return '@@iterator';
     }
-  }
+    return Symbol.iterator;
 }
+var iterator = getSymbolIterator();
+//# sourceMappingURL=iterator.js.map
 
-/**
- * Returns true if the given `key` is an own property of `obj`.
- */
+/***/ }),
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
+/***/ "../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observable; });
+var observable = (function () { return (typeof Symbol === 'function' && Symbol.observable) || '@@observable'; })();
+//# sourceMappingURL=observable.js.map
 
 /***/ }),
-/* 644 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * unset-value <https://github.com/jonschlinkert/unset-value>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/ArgumentOutOfRangeError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ArgumentOutOfRangeError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var ArgumentOutOfRangeError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function ArgumentOutOfRangeErrorImpl() {
+        _super(this);
+        this.name = 'ArgumentOutOfRangeError';
+        this.message = 'argument out of range';
+    };
+});
+//# sourceMappingURL=ArgumentOutOfRangeError.js.map
 
-var isObject = __webpack_require__(592);
-var has = __webpack_require__(645);
+/***/ }),
 
-module.exports = function unset(obj, prop) {
-  if (!isObject(obj)) {
-    throw new TypeError('expected an object.');
-  }
-  if (obj.hasOwnProperty(prop)) {
-    delete obj[prop];
-    return true;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/EmptyError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (has(obj, prop)) {
-    var segs = prop.split('.');
-    var last = segs.pop();
-    while (segs.length && segs[segs.length - 1].slice(-1) === '\\') {
-      last = segs.pop().slice(0, -1) + '.' + last;
-    }
-    while (segs.length) obj = obj[prop = segs.shift()];
-    return (delete obj[last]);
-  }
-  return true;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EmptyError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var EmptyError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) { return function EmptyErrorImpl() {
+    _super(this);
+    this.name = 'EmptyError';
+    this.message = 'no elements in sequence';
+}; });
+//# sourceMappingURL=EmptyError.js.map
 
 /***/ }),
-/* 645 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * has-value <https://github.com/jonschlinkert/has-value>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/Immediate.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Immediate; });
+/* unused harmony export TestTools */
+var nextHandle = 1;
+var resolved;
+var activeHandles = {};
+function findAndClearHandle(handle) {
+    if (handle in activeHandles) {
+        delete activeHandles[handle];
+        return true;
+    }
+    return false;
+}
+var Immediate = {
+    setImmediate: function (cb) {
+        var handle = nextHandle++;
+        activeHandles[handle] = true;
+        if (!resolved) {
+            resolved = Promise.resolve();
+        }
+        resolved.then(function () { return findAndClearHandle(handle) && cb(); });
+        return handle;
+    },
+    clearImmediate: function (handle) {
+        findAndClearHandle(handle);
+    },
+};
+var TestTools = {
+    pending: function () {
+        return Object.keys(activeHandles).length;
+    }
+};
+//# sourceMappingURL=Immediate.js.map
 
+/***/ }),
 
-var isObject = __webpack_require__(646);
-var hasValues = __webpack_require__(648);
-var get = __webpack_require__(641);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/NotFoundError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function(obj, prop, noZero) {
-  if (isObject(obj)) {
-    return hasValues(get(obj, prop), noZero);
-  }
-  return hasValues(obj, prop);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return NotFoundError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var NotFoundError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function NotFoundErrorImpl(message) {
+        _super(this);
+        this.name = 'NotFoundError';
+        this.message = message;
+    };
+});
+//# sourceMappingURL=NotFoundError.js.map
 
 /***/ }),
-/* 646 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/ObjectUnsubscribedError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * isobject <https://github.com/jonschlinkert/isobject>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObjectUnsubscribedError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var ObjectUnsubscribedError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function ObjectUnsubscribedErrorImpl() {
+        _super(this);
+        this.name = 'ObjectUnsubscribedError';
+        this.message = 'object unsubscribed';
+    };
+});
+//# sourceMappingURL=ObjectUnsubscribedError.js.map
 
+/***/ }),
 
-var isArray = __webpack_require__(647);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/SequenceError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function isObject(val) {
-  return val != null && typeof val === 'object' && isArray(val) === false;
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SequenceError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var SequenceError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function SequenceErrorImpl(message) {
+        _super(this);
+        this.name = 'SequenceError';
+        this.message = message;
+    };
+});
+//# sourceMappingURL=SequenceError.js.map
 
 /***/ }),
-/* 647 */
-/***/ (function(module, exports) {
 
-var toString = {}.toString;
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = Array.isArray || function (arr) {
-  return toString.call(arr) == '[object Array]';
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return UnsubscriptionError; });
+/* harmony import */ var _createErrorClass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js");
 
+var UnsubscriptionError = Object(_createErrorClass__WEBPACK_IMPORTED_MODULE_0__[/* createErrorClass */ "a"])(function (_super) {
+    return function UnsubscriptionErrorImpl(errors) {
+        _super(this);
+        this.message = errors
+            ? errors.length + " errors occurred during unsubscription:\n" + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n  ')
+            : '';
+        this.name = 'UnsubscriptionError';
+        this.errors = errors;
+    };
+});
+//# sourceMappingURL=UnsubscriptionError.js.map
 
 /***/ }),
-/* 648 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/args.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * has-values <https://github.com/jonschlinkert/has-values>
- *
- * Copyright (c) 2014-2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return popResultSelector; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return popScheduler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return popNumber; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+/* harmony import */ var _isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js");
 
 
+function last(arr) {
+    return arr[arr.length - 1];
+}
+function popResultSelector(args) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(last(args)) ? args.pop() : undefined;
+}
+function popScheduler(args) {
+    return Object(_isScheduler__WEBPACK_IMPORTED_MODULE_1__[/* isScheduler */ "a"])(last(args)) ? args.pop() : undefined;
+}
+function popNumber(args, defaultValue) {
+    return typeof last(args) === 'number' ? args.pop() : defaultValue;
+}
+//# sourceMappingURL=args.js.map
 
-module.exports = function hasValue(o, noZero) {
-  if (o === null || o === undefined) {
-    return false;
-  }
+/***/ }),
 
-  if (typeof o === 'boolean') {
-    return true;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/argsArgArrayOrObject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (typeof o === 'number') {
-    if (o === 0 && noZero === true) {
-      return false;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return argsArgArrayOrObject; });
+var isArray = Array.isArray;
+var getPrototypeOf = Object.getPrototypeOf, objectProto = Object.prototype, getKeys = Object.keys;
+function argsArgArrayOrObject(args) {
+    if (args.length === 1) {
+        var first_1 = args[0];
+        if (isArray(first_1)) {
+            return { args: first_1, keys: null };
+        }
+        if (isPOJO(first_1)) {
+            var keys = getKeys(first_1);
+            return {
+                args: keys.map(function (key) { return first_1[key]; }),
+                keys: keys,
+            };
+        }
     }
-    return true;
-  }
+    return { args: args, keys: null };
+}
+function isPOJO(obj) {
+    return obj && typeof obj === 'object' && getPrototypeOf(obj) === objectProto;
+}
+//# sourceMappingURL=argsArgArrayOrObject.js.map
 
-  if (o.length !== undefined) {
-    return o.length !== 0;
-  }
+/***/ }),
 
-  for (var key in o) {
-    if (o.hasOwnProperty(key)) {
-      return true;
-    }
-  }
-  return false;
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/argsOrArgArray.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return argsOrArgArray; });
+var isArray = Array.isArray;
+function argsOrArgArray(args) {
+    return args.length === 1 && isArray(args[0]) ? args[0] : args;
+}
+//# sourceMappingURL=argsOrArgArray.js.map
 
 /***/ }),
-/* 649 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * has-value <https://github.com/jonschlinkert/has-value>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/arrRemove.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return arrRemove; });
+function arrRemove(arr, item) {
+    if (arr) {
+        var index = arr.indexOf(item);
+        0 <= index && arr.splice(index, 1);
+    }
+}
+//# sourceMappingURL=arrRemove.js.map
 
-var isObject = __webpack_require__(592);
-var hasValues = __webpack_require__(650);
-var get = __webpack_require__(641);
+/***/ }),
 
-module.exports = function(val, prop) {
-  return hasValues(isObject(val) && prop ? get(val, prop) : val);
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createErrorClass; });
+function createErrorClass(createImpl) {
+    var _super = function (instance) {
+        Error.call(instance);
+        instance.stack = new Error().stack;
+    };
+    var ctorFunc = createImpl(_super);
+    ctorFunc.prototype = Object.create(Error.prototype);
+    ctorFunc.prototype.constructor = ctorFunc;
+    return ctorFunc;
+}
+//# sourceMappingURL=createErrorClass.js.map
 
 /***/ }),
-/* 650 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * has-values <https://github.com/jonschlinkert/has-values>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/createObject.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createObject; });
+function createObject(keys, values) {
+    return keys.reduce(function (result, key, i) { return ((result[key] = values[i]), result); }, {});
+}
+//# sourceMappingURL=createObject.js.map
 
+/***/ }),
 
-var typeOf = __webpack_require__(651);
-var isNumber = __webpack_require__(614);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/errorContext.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function hasValue(val) {
-  // is-number checks for NaN and other edge cases
-  if (isNumber(val)) {
-    return true;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return errorContext; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return captureError; });
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
 
-  switch (typeOf(val)) {
-    case 'null':
-    case 'boolean':
-    case 'function':
-      return true;
-    case 'string':
-    case 'arguments':
-      return val.length !== 0;
-    case 'error':
-      return val.message !== '';
-    case 'array':
-      var len = val.length;
-      if (len === 0) {
-        return false;
-      }
-      for (var i = 0; i < len; i++) {
-        if (hasValue(val[i])) {
-          return true;
+var context = null;
+function errorContext(cb) {
+    if (_config__WEBPACK_IMPORTED_MODULE_0__[/* config */ "a"].useDeprecatedSynchronousErrorHandling) {
+        var isRoot = !context;
+        if (isRoot) {
+            context = { errorThrown: false, error: null };
         }
-      }
-      return false;
-    case 'file':
-    case 'map':
-    case 'set':
-      return val.size !== 0;
-    case 'object':
-      var keys = Object.keys(val);
-      if (keys.length === 0) {
-        return false;
-      }
-      for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (hasValue(val[key])) {
-          return true;
+        cb();
+        if (isRoot) {
+            var _a = context, errorThrown = _a.errorThrown, error = _a.error;
+            context = null;
+            if (errorThrown) {
+                throw error;
+            }
         }
-      }
-      return false;
-    default: {
-      return false;
     }
-  }
-};
-
+    else {
+        cb();
+    }
+}
+function captureError(err) {
+    if (_config__WEBPACK_IMPORTED_MODULE_0__[/* config */ "a"].useDeprecatedSynchronousErrorHandling && context) {
+        context.errorThrown = true;
+        context.error = err;
+    }
+}
+//# sourceMappingURL=errorContext.js.map
 
 /***/ }),
-/* 651 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/executeSchedule.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return executeSchedule; });
+function executeSchedule(parentSubscription, scheduler, work, delay, repeat) {
+    if (delay === void 0) { delay = 0; }
+    if (repeat === void 0) { repeat = false; }
+    var scheduleSubscription = scheduler.schedule(function () {
+        work();
+        if (repeat) {
+            parentSubscription.add(this.schedule(null, delay));
+        }
+        else {
+            this.unsubscribe();
+        }
+    }, delay);
+    parentSubscription.add(scheduleSubscription);
+    if (!repeat) {
+        return scheduleSubscription;
+    }
+}
+//# sourceMappingURL=executeSchedule.js.map
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
+/***/ }),
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/identity.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return identity; });
+function identity(x) {
+    return x;
+}
+//# sourceMappingURL=identity.js.map
 
-  // other objects
-  var type = toString.call(val);
+/***/ }),
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-  if (type === '[object Promise]') {
-    return 'promise';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArrayLike; });
+var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
+//# sourceMappingURL=isArrayLike.js.map
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
+/***/ }),
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  // must be a plain object
-  return 'object';
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isAsyncIterable; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
+function isAsyncIterable(obj) {
+    return Symbol.asyncIterator && Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(obj === null || obj === void 0 ? void 0 : obj[Symbol.asyncIterator]);
+}
+//# sourceMappingURL=isAsyncIterable.js.map
 
 /***/ }),
-/* 652 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * set-value <https://github.com/jonschlinkert/set-value>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
 
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isDate.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-var split = __webpack_require__(609);
-var extend = __webpack_require__(643);
-var isPlainObject = __webpack_require__(599);
-var isObject = __webpack_require__(639);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isValidDate; });
+function isValidDate(value) {
+    return value instanceof Date && !isNaN(value);
+}
+//# sourceMappingURL=isDate.js.map
 
-module.exports = function(obj, prop, val) {
-  if (!isObject(obj)) {
-    return obj;
-  }
+/***/ }),
 
-  if (Array.isArray(prop)) {
-    prop = [].concat.apply([], prop).join('.');
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (typeof prop !== 'string') {
-    return obj;
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isFunction; });
+function isFunction(value) {
+    return typeof value === 'function';
+}
+//# sourceMappingURL=isFunction.js.map
 
-  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
-  var len = keys.length;
-  var idx = -1;
-  var current = obj;
+/***/ }),
 
-  while (++idx < len) {
-    var key = keys[idx];
-    if (idx !== len - 1) {
-      if (!isObject(current[key])) {
-        current[key] = {};
-      }
-      current = current[key];
-      continue;
-    }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    if (isPlainObject(current[key]) && isPlainObject(val)) {
-      current[key] = extend({}, current[key], val);
-    } else {
-      current[key] = val;
-    }
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isInteropObservable; });
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/observable.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-  return obj;
-};
 
-function isValidKey(key) {
-  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
+function isInteropObservable(input) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__[/* observable */ "a"]]);
 }
-
+//# sourceMappingURL=isInteropObservable.js.map
 
 /***/ }),
-/* 653 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isIterable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isIterable; });
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/symbol/iterator.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-var isExtendable = __webpack_require__(654);
-var forIn = __webpack_require__(655);
 
-function mixinDeep(target, objects) {
-  var len = arguments.length, i = 0;
-  while (++i < len) {
-    var obj = arguments[i];
-    if (isObject(obj)) {
-      forIn(obj, copy, target);
-    }
-  }
-  return target;
+function isIterable(input) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(input === null || input === void 0 ? void 0 : input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__[/* iterator */ "a"]]);
 }
+//# sourceMappingURL=isIterable.js.map
 
-/**
- * Copy properties from the source object to the
- * target object.
- *
- * @param  {*} `val`
- * @param  {String} `key`
- */
+/***/ }),
 
-function copy(val, key) {
-  if (!isValidKey(key)) {
-    return;
-  }
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isObservable.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var obj = this[key];
-  if (isObject(val) && isObject(obj)) {
-    mixinDeep(obj, val);
-  } else {
-    this[key] = val;
-  }
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isObservable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Observable.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-/**
- * Returns true if `val` is an object or function.
- *
- * @param  {any} val
- * @return {Boolean}
- */
 
-function isObject(val) {
-  return isExtendable(val) && !Array.isArray(val);
+function isObservable(obj) {
+    return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__[/* Observable */ "a"] || (Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(obj.lift) && Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(obj.subscribe)));
 }
+//# sourceMappingURL=isObservable.js.map
 
-/**
- * Returns true if `key` is a valid key to use when extending objects.
- *
- * @param  {String} `key`
- * @return {Boolean}
- */
+/***/ }),
 
-function isValidKey(key) {
-  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
-};
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isPromise.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Expose `mixinDeep`
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isPromise; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
-module.exports = mixinDeep;
+function isPromise(value) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(value === null || value === void 0 ? void 0 : value.then);
+}
+//# sourceMappingURL=isPromise.js.map
+
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return readableStreamLikeToAsyncGenerator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isReadableStreamLike; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
+
+
+function readableStreamLikeToAsyncGenerator(readableStream) {
+    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __asyncGenerator */ "a"])(this, arguments, function readableStreamLikeToAsyncGenerator_1() {
+        var reader, _a, value, done;
+        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __generator */ "f"])(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    reader = readableStream.getReader();
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, , 9, 10]);
+                    _b.label = 2;
+                case 2:
+                    if (false) {}
+                    return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __await */ "c"])(reader.read())];
+                case 3:
+                    _a = _b.sent(), value = _a.value, done = _a.done;
+                    if (!done) return [3, 5];
+                    return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __await */ "c"])(void 0)];
+                case 4: return [2, _b.sent()];
+                case 5: return [4, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __await */ "c"])(value)];
+                case 6: return [4, _b.sent()];
+                case 7:
+                    _b.sent();
+                    return [3, 2];
+                case 8: return [3, 10];
+                case 9:
+                    reader.releaseLock();
+                    return [7];
+                case 10: return [2];
+            }
+        });
+    });
+}
+function isReadableStreamLike(obj) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_1__[/* isFunction */ "a"])(obj === null || obj === void 0 ? void 0 : obj.getReader);
+}
+//# sourceMappingURL=isReadableStreamLike.js.map
 
 /***/ }),
-/* 654 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/isScheduler.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isScheduler; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
+function isScheduler(value) {
+    return value && Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(value.schedule);
+}
+//# sourceMappingURL=isScheduler.js.map
 
+/***/ }),
 
-var isPlainObject = __webpack_require__(599);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/lift.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return hasLift; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return operate; });
+/* harmony import */ var _isFunction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/isFunction.js");
 
+function hasLift(source) {
+    return Object(_isFunction__WEBPACK_IMPORTED_MODULE_0__[/* isFunction */ "a"])(source === null || source === void 0 ? void 0 : source.lift);
+}
+function operate(init) {
+    return function (source) {
+        if (hasLift(source)) {
+            return source.lift(function (liftedSource) {
+                try {
+                    return init(liftedSource, this);
+                }
+                catch (err) {
+                    this.error(err);
+                }
+            });
+        }
+        throw new TypeError('Unable to lift unknown Observable type');
+    };
+}
+//# sourceMappingURL=lift.js.map
 
 /***/ }),
-/* 655 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/mapOneOrManyArgs.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * for-in <https://github.com/jonschlinkert/for-in>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mapOneOrManyArgs; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/node_modules/tslib/tslib.es6.js");
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
 
 
+var isArray = Array.isArray;
+function callOrApply(fn, args) {
+    return isArray(args) ? fn.apply(void 0, Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __spreadArray */ "h"])([], Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __read */ "g"])(args))) : fn(args);
+}
+function mapOneOrManyArgs(fn) {
+    return Object(_operators_map__WEBPACK_IMPORTED_MODULE_1__[/* map */ "a"])(function (args) { return callOrApply(fn, args); });
+}
+//# sourceMappingURL=mapOneOrManyArgs.js.map
 
-module.exports = function forIn(obj, fn, thisArg) {
-  for (var key in obj) {
-    if (fn.call(thisArg, obj[key], key, obj) === false) {
-      break;
-    }
-  }
-};
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/noop.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return noop; });
+function noop() { }
+//# sourceMappingURL=noop.js.map
 
 /***/ }),
-/* 656 */
-/***/ (function(module, exports) {
 
-/*!
- * pascalcase <https://github.com/jonschlinkert/pascalcase>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/not.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function pascalcase(str) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string.');
-  }
-  str = str.replace(/([A-Z])/g, ' $1');
-  if (str.length === 1) { return str.toUpperCase(); }
-  str = str.replace(/^[\W_]+|[\W_]+$/g, '').toLowerCase();
-  str = str.charAt(0).toUpperCase() + str.slice(1);
-  return str.replace(/[\W_]+(\w|$)/g, function (_, ch) {
-    return ch.toUpperCase();
-  });
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return not; });
+function not(pred, thisArg) {
+    return function (value, index) { return !pred.call(thisArg, value, index); };
 }
+//# sourceMappingURL=not.js.map
 
-module.exports = pascalcase;
+/***/ }),
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/pipe.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return pipe; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return pipeFromArray; });
+/* harmony import */ var _identity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/util/identity.js");
 
+function pipe() {
+    var fns = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        fns[_i] = arguments[_i];
+    }
+    return pipeFromArray(fns);
+}
+function pipeFromArray(fns) {
+    if (fns.length === 0) {
+        return _identity__WEBPACK_IMPORTED_MODULE_0__[/* identity */ "a"];
+    }
+    if (fns.length === 1) {
+        return fns[0];
+    }
+    return function piped(input) {
+        return fns.reduce(function (prev, fn) { return fn(prev); }, input);
+    };
+}
+//# sourceMappingURL=pipe.js.map
 
 /***/ }),
-/* 657 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return reportUnhandledError; });
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/config.js");
+/* harmony import */ var _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/scheduler/timeoutProvider.js");
+
+
+function reportUnhandledError(err) {
+    _scheduler_timeoutProvider__WEBPACK_IMPORTED_MODULE_1__[/* timeoutProvider */ "a"].setTimeout(function () {
+        var onUnhandledError = _config__WEBPACK_IMPORTED_MODULE_0__[/* config */ "a"].onUnhandledError;
+        if (onUnhandledError) {
+            onUnhandledError(err);
+        }
+        else {
+            throw err;
+        }
+    });
+}
+//# sourceMappingURL=reportUnhandledError.js.map
 
+/***/ }),
 
-var util = __webpack_require__(113);
-var utils = __webpack_require__(658);
+/***/ "../../node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Expose class utils
- */
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createInvalidObservableTypeError; });
+function createInvalidObservableTypeError(input) {
+    return new TypeError("You provided " + (input !== null && typeof input === 'object' ? 'an invalid object' : "'" + input + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
+}
+//# sourceMappingURL=throwUnobservableError.js.map
 
-var cu = module.exports;
+/***/ }),
 
-/**
- * Expose class utils: `cu`
- */
+/***/ "../../node_modules/rxjs/dist/esm5/operators/index.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-cu.isObject = function isObject(val) {
-  return utils.isObj(val) || typeof val === 'function';
-};
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/audit.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-/**
- * Returns true if an array has any of the given elements, or an
- * object has any of the give keys.
- *
- * ```js
- * cu.has(['a', 'b', 'c'], 'c');
- * //=> true
- *
- * cu.has(['a', 'b', 'c'], ['c', 'z']);
- * //=> true
- *
- * cu.has({a: 'b', c: 'd'}, ['c', 'z']);
- * //=> true
- * ```
- * @param {Object} `obj`
- * @param {String|Array} `val`
- * @return {Boolean}
- * @api public
- */
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/auditTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-cu.has = function has(obj, val) {
-  val = cu.arrayify(val);
-  var len = val.length;
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/buffer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-  if (cu.isObject(obj)) {
-    for (var key in obj) {
-      if (val.indexOf(key) > -1) {
-        return true;
-      }
-    }
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-    var keys = cu.nativeKeys(obj);
-    return cu.has(keys, val);
-  }
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["a"]; });
 
-  if (Array.isArray(obj)) {
-    var arr = obj;
-    while (len--) {
-      if (arr.indexOf(val[len]) > -1) {
-        return true;
-      }
-    }
-    return false;
-  }
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["a"]; });
 
-  throw new TypeError('expected an array or object.');
-};
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/bufferWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["a"]; });
 
-/**
- * Returns true if an array or object has all of the given values.
- *
- * ```js
- * cu.hasAll(['a', 'b', 'c'], 'c');
- * //=> true
- *
- * cu.hasAll(['a', 'b', 'c'], ['c', 'z']);
- * //=> false
- *
- * cu.hasAll({a: 'b', c: 'd'}, ['c', 'z']);
- * //=> false
- * ```
- * @param {Object|Array} `val`
- * @param {String|Array} `values`
- * @return {Boolean}
- * @api public
- */
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/catchError.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["a"]; });
 
-cu.hasAll = function hasAll(val, values) {
-  values = cu.arrayify(values);
-  var len = values.length;
-  while (len--) {
-    if (!cu.has(val, values[len])) {
-      return false;
-    }
-  }
-  return true;
-};
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["a"]; });
 
-/**
- * Cast the given value to an array.
- *
- * ```js
- * cu.arrayify('foo');
- * //=> ['foo']
- *
- * cu.arrayify(['foo']);
- * //=> ['foo']
- * ```
- *
- * @param {String|Array} `val`
- * @return {Array}
- * @api public
- */
+/* harmony import */ var _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestAll", function() { return _internal_operators_combineLatestAll__WEBPACK_IMPORTED_MODULE_9__["a"]; });
 
-cu.arrayify = function arrayify(val) {
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
+/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatest.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_10__["a"]; });
 
-/**
- * Noop
- */
+/* harmony import */ var _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/combineLatestWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatestWith", function() { return _internal_operators_combineLatestWith__WEBPACK_IMPORTED_MODULE_11__["a"]; });
 
-cu.noop = function noop() {
-  return;
-};
+/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_12__["a"]; });
 
-/**
- * Returns the first argument passed to the function.
- */
+/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_13__["a"]; });
 
-cu.identity = function identity(val) {
-  return val;
-};
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_14__["a"]; });
 
-/**
- * Returns true if a value has a `contructor`
- *
- * ```js
- * cu.hasConstructor({});
- * //=> true
- *
- * cu.hasConstructor(Object.create(null));
- * //=> false
- * ```
- * @param  {Object} `value`
- * @return {Boolean}
- * @api public
- */
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_15__["a"]; });
 
-cu.hasConstructor = function hasConstructor(val) {
-  return cu.isObject(val) && typeof val.constructor !== 'undefined';
-};
+/* harmony import */ var _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/concatWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatWith", function() { return _internal_operators_concatWith__WEBPACK_IMPORTED_MODULE_16__["a"]; });
 
-/**
- * Get the native `ownPropertyNames` from the constructor of the
- * given `object`. An empty array is returned if the object does
- * not have a constructor.
- *
- * ```js
- * cu.nativeKeys({a: 'b', b: 'c', c: 'd'})
- * //=> ['a', 'b', 'c']
- *
- * cu.nativeKeys(function(){})
- * //=> ['length', 'caller']
- * ```
- *
- * @param  {Object} `obj` Object that has a `constructor`.
- * @return {Array} Array of keys.
- * @api public
- */
+/* harmony import */ var _internal_operators_connect__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/connect.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "connect", function() { return _internal_operators_connect__WEBPACK_IMPORTED_MODULE_17__["a"]; });
 
-cu.nativeKeys = function nativeKeys(val) {
-  if (!cu.hasConstructor(val)) return [];
-  return Object.getOwnPropertyNames(val);
-};
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/count.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_18__["a"]; });
 
-/**
- * Returns property descriptor `key` if it's an "own" property
- * of the given object.
- *
- * ```js
- * function App() {}
- * Object.defineProperty(App.prototype, 'count', {
- *   get: function() {
- *     return Object.keys(this).length;
- *   }
- * });
- * cu.getDescriptor(App.prototype, 'count');
- * // returns:
- * // {
- * //   get: [Function],
- * //   set: undefined,
- * //   enumerable: false,
- * //   configurable: false
- * // }
- * ```
- *
- * @param {Object} `obj`
- * @param {String} `key`
- * @return {Object} Returns descriptor `key`
- * @api public
- */
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_19__["a"]; });
 
-cu.getDescriptor = function getDescriptor(obj, key) {
-  if (!cu.isObject(obj)) {
-    throw new TypeError('expected an object.');
-  }
-  if (typeof key !== 'string') {
-    throw new TypeError('expected key to be a string.');
-  }
-  return Object.getOwnPropertyDescriptor(obj, key);
-};
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/debounceTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_20__["a"]; });
 
-/**
- * Copy a descriptor from one object to another.
- *
- * ```js
- * function App() {}
- * Object.defineProperty(App.prototype, 'count', {
- *   get: function() {
- *     return Object.keys(this).length;
- *   }
- * });
- * var obj = {};
- * cu.copyDescriptor(obj, App.prototype, 'count');
- * ```
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String} `name`
- * @return {Object}
- * @api public
- */
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/defaultIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_21__["a"]; });
 
-cu.copyDescriptor = function copyDescriptor(receiver, provider, name) {
-  if (!cu.isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!cu.isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
-  if (typeof name !== 'string') {
-    throw new TypeError('expected name to be a string.');
-  }
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_22__["a"]; });
 
-  var val = cu.getDescriptor(provider, name);
-  if (val) Object.defineProperty(receiver, name, val);
-};
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/delayWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_23__["a"]; });
 
-/**
- * Copy static properties, prototype properties, and descriptors
- * from one object to another.
- *
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String|Array} `omit` One or more properties to omit
- * @return {Object}
- * @api public
- */
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/dematerialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_24__["a"]; });
 
-cu.copy = function copy(receiver, provider, omit) {
-  if (!cu.isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!cu.isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
-  var props = Object.getOwnPropertyNames(provider);
-  var keys = Object.keys(provider);
-  var len = props.length,
-    key;
-  omit = cu.arrayify(omit);
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinct.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_25__["a"]; });
 
-  while (len--) {
-    key = props[len];
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_26__["a"]; });
 
-    if (cu.has(keys, key)) {
-      utils.define(receiver, key, provider[key]);
-    } else if (!(key in receiver) && !cu.has(omit, key)) {
-      cu.copyDescriptor(receiver, provider, key);
-    }
-  }
-};
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/distinctUntilKeyChanged.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_27__["a"]; });
 
-/**
- * Inherit the static properties, prototype properties, and descriptors
- * from of an object.
- *
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String|Array} `omit` One or more properties to omit
- * @return {Object}
- * @api public
- */
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/elementAt.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_28__["a"]; });
 
-cu.inherit = function inherit(receiver, provider, omit) {
-  if (!cu.isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!cu.isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/endWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_29__["a"]; });
 
-  var keys = [];
-  for (var key in provider) {
-    keys.push(key);
-    receiver[key] = provider[key];
-  }
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/every.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_30__["a"]; });
 
-  keys = keys.concat(cu.arrayify(omit));
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaust.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_31__["a"]; });
 
-  var a = provider.prototype || provider;
-  var b = receiver.prototype || receiver;
-  cu.copy(b, a, keys);
-};
+/* harmony import */ var _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustAll", function() { return _internal_operators_exhaustAll__WEBPACK_IMPORTED_MODULE_32__["a"]; });
 
-/**
- * Returns a function for extending the static properties,
- * prototype properties, and descriptors from the `Parent`
- * constructor onto `Child` constructors.
- *
- * ```js
- * var extend = cu.extend(Parent);
- * Parent.extend(Child);
- *
- * // optional methods
- * Parent.extend(Child, {
- *   foo: function() {},
- *   bar: function() {}
- * });
- * ```
- * @param {Function} `Parent` Parent ctor
- * @param {Function} `extend` Optional extend function to handle custom extensions. Useful when updating methods that require a specific prototype.
- *   @param {Function} `Child` Child ctor
- *   @param {Object} `proto` Optionally pass additional prototype properties to inherit.
- *   @return {Object}
- * @api public
- */
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_33__["a"]; });
 
-cu.extend = function() {
-  // keep it lazy, instead of assigning to `cu.extend`
-  return utils.staticExtend.apply(null, arguments);
-};
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/expand.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_34__["a"]; });
 
-/**
- * Bubble up events emitted from static methods on the Parent ctor.
- *
- * @param {Object} `Parent`
- * @param {Array} `events` Event names to bubble up
- * @api public
- */
+/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/filter.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_35__["a"]; });
 
-cu.bubble = function(Parent, events) {
-  events = events || [];
-  Parent.bubble = function(Child, arr) {
-    if (Array.isArray(arr)) {
-      events = utils.union([], events, arr);
-    }
-    var len = events.length;
-    var idx = -1;
-    while (++idx < len) {
-      var name = events[idx];
-      Parent.on(name, Child.emit.bind(Child, name));
-    }
-    cu.bubble(Child, events);
-  };
-};
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/finalize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_36__["a"]; });
 
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/find.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_37__["b"]; });
 
-/***/ }),
-/* 658 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/findIndex.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_38__["a"]; });
 
-"use strict";
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/first.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_39__["a"]; });
 
+/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/groupBy.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_40__["a"]; });
 
-var utils = {};
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_41__["a"]; });
 
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/isEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_42__["a"]; });
 
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/last.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_43__["a"]; });
 
-/**
- * Lazily required module dependencies
- */
+/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/map.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_44__["a"]; });
 
-utils.union = __webpack_require__(640);
-utils.define = __webpack_require__(659);
-utils.isObj = __webpack_require__(592);
-utils.staticExtend = __webpack_require__(666);
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_45__["a"]; });
 
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/materialize.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_46__["a"]; });
 
-/**
- * Expose `utils`
- */
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/max.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_47__["a"]; });
 
-module.exports = utils;
+/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/merge.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_48__["a"]; });
 
+/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_49__["a"]; });
 
-/***/ }),
-/* 659 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/flatMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_flatMap__WEBPACK_IMPORTED_MODULE_50__["a"]; });
 
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_51__["a"]; });
 
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_52__["a"]; });
 
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_53__["a"]; });
 
-var isDescriptor = __webpack_require__(660);
+/* harmony import */ var _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/mergeWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeWith", function() { return _internal_operators_mergeWith__WEBPACK_IMPORTED_MODULE_54__["a"]; });
 
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/min.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_55__["a"]; });
 
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
-  }
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/multicast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_56__["a"]; });
 
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
-  }
+/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/observeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_57__["a"]; });
 
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
-};
+/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/onErrorResumeNext.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_58__["a"]; });
 
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pairwise.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_59__["a"]; });
 
-/***/ }),
-/* 660 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/partition.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_60__["a"]; });
 
-"use strict";
-/*!
- * is-descriptor <https://github.com/jonschlinkert/is-descriptor>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/pluck.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_61__["a"]; });
 
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publish.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_62__["a"]; });
 
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishBehavior.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_63__["a"]; });
 
-var typeOf = __webpack_require__(661);
-var isAccessor = __webpack_require__(662);
-var isData = __webpack_require__(664);
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_64__["a"]; });
 
-module.exports = function isDescriptor(obj, key) {
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
-  if ('get' in obj) {
-    return isAccessor(obj, key);
-  }
-  return isData(obj, key);
-};
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/publishReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_65__["a"]; });
 
+/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/race.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_66__["a"]; });
 
-/***/ }),
-/* 661 */
-/***/ (function(module, exports) {
+/* harmony import */ var _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/raceWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "raceWith", function() { return _internal_operators_raceWith__WEBPACK_IMPORTED_MODULE_67__["a"]; });
 
-var toString = Object.prototype.toString;
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/reduce.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_68__["a"]; });
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeat.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_69__["a"]; });
 
-module.exports = function kindOf(val) {
-  var type = typeof val;
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/repeatWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_70__["a"]; });
 
-  // primitivies
-  if (type === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (type === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (type === 'number' || val instanceof Number) {
-    return 'number';
-  }
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retry.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_71__["a"]; });
 
-  // functions
-  if (type === 'function' || val instanceof Function) {
-    if (typeof val.constructor.name !== 'undefined' && val.constructor.name.slice(0, 9) === 'Generator') {
-      return 'generatorfunction';
-    }
-    return 'function';
-  }
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/retryWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_72__["a"]; });
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
+/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/refCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_73__["a"]; });
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sample.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_74__["a"]; });
 
-  // other objects
-  type = toString.call(val);
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sampleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_75__["a"]; });
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
-  if (type === '[object Promise]') {
-    return 'promise';
-  }
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/scan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_76__["a"]; });
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/sequenceEqual.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_77__["a"]; });
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
-  
-  if (type === '[object Map Iterator]') {
-    return 'mapiterator';
-  }
-  if (type === '[object Set Iterator]') {
-    return 'setiterator';
-  }
-  if (type === '[object String Iterator]') {
-    return 'stringiterator';
-  }
-  if (type === '[object Array Iterator]') {
-    return 'arrayiterator';
-  }
-  
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/share.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_78__["a"]; });
 
-  // must be a plain object
-  return 'object';
-};
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/shareReplay.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_79__["a"]; });
 
-/**
- * If you need to support Safari 5-7 (8-10 yr-old browser),
- * take a look at https://github.com/feross/is-buffer
- */
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/single.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_80__["a"]; });
 
-function isBuffer(val) {
-  return val.constructor
-    && typeof val.constructor.isBuffer === 'function'
-    && val.constructor.isBuffer(val);
-}
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_81__["a"]; });
 
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_82__["a"]; });
 
-/***/ }),
-/* 662 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_83__["a"]; });
 
-"use strict";
-/*!
- * is-accessor-descriptor <https://github.com/jonschlinkert/is-accessor-descriptor>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/skipWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_84__["a"]; });
 
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/startWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_85__["a"]; });
 
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/subscribeOn.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_86__["a"]; });
 
-var typeOf = __webpack_require__(663);
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_87__["a"]; });
 
-// accessor descriptor properties
-var accessor = {
-  get: 'function',
-  set: 'function',
-  configurable: 'boolean',
-  enumerable: 'boolean'
-};
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_88__["a"]; });
 
-function isAccessorDescriptor(obj, prop) {
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchMapTo.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_89__["a"]; });
 
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
+/* harmony import */ var _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/switchScan.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchScan", function() { return _internal_operators_switchScan__WEBPACK_IMPORTED_MODULE_90__["a"]; });
 
-  if (has(obj, 'value') || has(obj, 'writable')) {
-    return false;
-  }
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/take.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_91__["a"]; });
 
-  if (!has(obj, 'get') || typeof obj.get !== 'function') {
-    return false;
-  }
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeLast.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_92__["a"]; });
 
-  // tldr: it's valid to have "set" be undefined
-  // "set" might be undefined if `Object.getOwnPropertyDescriptor`
-  // was used to get the value, and only `get` was defined by the user
-  if (has(obj, 'set') && typeof obj[key] !== 'function' && typeof obj[key] !== 'undefined') {
-    return false;
-  }
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_93__["a"]; });
 
-  for (var key in obj) {
-    if (!accessor.hasOwnProperty(key)) {
-      continue;
-    }
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/takeWhile.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_94__["a"]; });
 
-    if (typeOf(obj[key]) === accessor[key]) {
-      continue;
-    }
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/tap.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_95__["a"]; });
 
-    if (typeof obj[key] !== 'undefined') {
-      return false;
-    }
-  }
-  return true;
-}
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_96__["b"]; });
 
-function has(obj, key) {
-  return {}.hasOwnProperty.call(obj, key);
-}
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throttleTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_97__["a"]; });
 
-/**
- * Expose `isAccessorDescriptor`
- */
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/throwIfEmpty.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_98__["a"]; });
 
-module.exports = isAccessorDescriptor;
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeInterval.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_99__["a"]; });
 
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeout.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_100__["b"]; });
 
-/***/ }),
-/* 663 */
-/***/ (function(module, exports, __webpack_require__) {
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timeoutWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_101__["a"]; });
 
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/timestamp.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_102__["a"]; });
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_103__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/toArray.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_103__["a"]; });
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_104__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/window.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_104__["a"]; });
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_105__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowCount.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_105__["a"]; });
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_106__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowTime.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_106__["a"]; });
+
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_107__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowToggle.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_107__["a"]; });
+
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_108__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/windowWhen.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_108__["a"]; });
+
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_109__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_109__["a"]; });
+
+/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_110__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zip.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_110__["a"]; });
+
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_111__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipAll.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_111__["a"]; });
+
+/* harmony import */ var _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_112__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/zipWith.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipWith", function() { return _internal_operators_zipWith__WEBPACK_IMPORTED_MODULE_112__["a"]; });
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
 
-  // other objects
-  var type = toString.call(val);
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
 
-  // must be a plain object
-  return 'object';
-};
 
 
-/***/ }),
-/* 664 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * is-data-descriptor <https://github.com/jonschlinkert/is-data-descriptor>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
 
 
-var typeOf = __webpack_require__(665);
 
-// data descriptor properties
-var data = {
-  configurable: 'boolean',
-  enumerable: 'boolean',
-  writable: 'boolean'
-};
 
-function isDataDescriptor(obj, prop) {
-  if (typeOf(obj) !== 'object') {
-    return false;
-  }
 
-  if (typeof prop === 'string') {
-    var val = Object.getOwnPropertyDescriptor(obj, prop);
-    return typeof val !== 'undefined';
-  }
 
-  if (!('value' in obj) && !('writable' in obj)) {
-    return false;
-  }
 
-  for (var key in obj) {
-    if (key === 'value') continue;
 
-    if (!data.hasOwnProperty(key)) {
-      continue;
-    }
 
-    if (typeOf(obj[key]) === data[key]) {
-      continue;
-    }
 
-    if (typeof obj[key] !== 'undefined') {
-      return false;
-    }
-  }
-  return true;
-}
 
-/**
- * Expose `isDataDescriptor`
- */
 
-module.exports = isDataDescriptor;
 
 
-/***/ }),
-/* 665 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
 
-  // other objects
-  var type = toString.call(val);
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
 
-  // must be a plain object
-  return 'object';
-};
 
 
-/***/ }),
-/* 666 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * static-extend <https://github.com/jonschlinkert/static-extend>
- *
- * Copyright (c) 2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
 
 
-var copy = __webpack_require__(667);
-var define = __webpack_require__(659);
-var util = __webpack_require__(113);
 
-/**
- * Returns a function for extending the static properties,
- * prototype properties, and descriptors from the `Parent`
- * constructor onto `Child` constructors.
- *
- * ```js
- * var extend = require('static-extend');
- * Parent.extend = extend(Parent);
- *
- * // optionally pass a custom merge function as the second arg
- * Parent.extend = extend(Parent, function(Child) {
- *   Child.prototype.mixin = function(key, val) {
- *     Child.prototype[key] = val;
- *   };
- * });
- *
- * // extend "child" constructors
- * Parent.extend(Child);
- *
- * // optionally define prototype methods as the second arg
- * Parent.extend(Child, {
- *   foo: function() {},
- *   bar: function() {}
- * });
- * ```
- * @param {Function} `Parent` Parent ctor
- * @param {Function} `extendFn` Optional extend function for handling any necessary custom merging. Useful when updating methods that require a specific prototype.
- *   @param {Function} `Child` Child ctor
- *   @param {Object} `proto` Optionally pass additional prototype properties to inherit.
- *   @return {Object}
- * @api public
- */
 
-function extend(Parent, extendFn) {
-  if (typeof Parent !== 'function') {
-    throw new TypeError('expected Parent to be a function.');
-  }
 
-  return function(Ctor, proto) {
-    if (typeof Ctor !== 'function') {
-      throw new TypeError('expected Ctor to be a function.');
-    }
 
-    util.inherits(Ctor, Parent);
-    copy(Ctor, Parent);
 
-    // proto can be null or a plain object
-    if (typeof proto === 'object') {
-      var obj = Object.create(proto);
 
-      for (var k in obj) {
-        Ctor.prototype[k] = obj[k];
-      }
-    }
 
-    // keep a reference to the parent prototype
-    define(Ctor.prototype, '_parent_', {
-      configurable: true,
-      set: function() {},
-      get: function() {
-        return Parent.prototype;
-      }
-    });
 
-    if (typeof extendFn === 'function') {
-      extendFn(Ctor, Parent);
-    }
 
-    Ctor.extend = extend(Ctor, extendFn);
-  };
-};
 
-/**
- * Expose `extend`
- */
 
-module.exports = extend;
 
 
-/***/ }),
-/* 667 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
 
-var typeOf = __webpack_require__(668);
-var copyDescriptor = __webpack_require__(669);
-var define = __webpack_require__(659);
 
-/**
- * Copy static properties, prototype properties, and descriptors from one object to another.
- *
- * ```js
- * function App() {}
- * var proto = App.prototype;
- * App.prototype.set = function() {};
- * App.prototype.get = function() {};
- *
- * var obj = {};
- * copy(obj, proto);
- * ```
- * @param {Object} `receiver`
- * @param {Object} `provider`
- * @param {String|Array} `omit` One or more properties to omit
- * @return {Object}
- * @api public
- */
 
-function copy(receiver, provider, omit) {
-  if (!isObject(receiver)) {
-    throw new TypeError('expected receiving object to be an object.');
-  }
-  if (!isObject(provider)) {
-    throw new TypeError('expected providing object to be an object.');
-  }
 
-  var props = nativeKeys(provider);
-  var keys = Object.keys(provider);
-  var len = props.length;
-  omit = arrayify(omit);
 
-  while (len--) {
-    var key = props[len];
 
-    if (has(keys, key)) {
-      define(receiver, key, provider[key]);
-    } else if (!(key in receiver) && !has(omit, key)) {
-      copyDescriptor(receiver, provider, key);
-    }
-  }
-};
 
-/**
- * Return true if the given value is an object or function
- */
 
-function isObject(val) {
-  return typeOf(val) === 'object' || typeof val === 'function';
-}
 
-/**
- * Returns true if an array has any of the given elements, or an
- * object has any of the give keys.
- *
- * ```js
- * has(['a', 'b', 'c'], 'c');
- * //=> true
- *
- * has(['a', 'b', 'c'], ['c', 'z']);
- * //=> true
- *
- * has({a: 'b', c: 'd'}, ['c', 'z']);
- * //=> true
- * ```
- * @param {Object} `obj`
- * @param {String|Array} `val`
- * @return {Boolean}
- */
 
-function has(obj, val) {
-  val = arrayify(val);
-  var len = val.length;
 
-  if (isObject(obj)) {
-    for (var key in obj) {
-      if (val.indexOf(key) > -1) {
-        return true;
-      }
-    }
 
-    var keys = nativeKeys(obj);
-    return has(keys, val);
-  }
 
-  if (Array.isArray(obj)) {
-    var arr = obj;
-    while (len--) {
-      if (arr.indexOf(val[len]) > -1) {
-        return true;
-      }
-    }
-    return false;
-  }
 
-  throw new TypeError('expected an array or object.');
-}
 
-/**
- * Cast the given value to an array.
- *
- * ```js
- * arrayify('foo');
- * //=> ['foo']
- *
- * arrayify(['foo']);
- * //=> ['foo']
- * ```
- *
- * @param {String|Array} `val`
- * @return {Array}
- */
 
-function arrayify(val) {
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-}
 
-/**
- * Returns true if a value has a `contructor`
- *
- * ```js
- * hasConstructor({});
- * //=> true
- *
- * hasConstructor(Object.create(null));
- * //=> false
- * ```
- * @param  {Object} `value`
- * @return {Boolean}
- */
 
-function hasConstructor(val) {
-  return isObject(val) && typeof val.constructor !== 'undefined';
-}
 
-/**
- * Get the native `ownPropertyNames` from the constructor of the
- * given `object`. An empty array is returned if the object does
- * not have a constructor.
- *
- * ```js
- * nativeKeys({a: 'b', b: 'c', c: 'd'})
- * //=> ['a', 'b', 'c']
- *
- * nativeKeys(function(){})
- * //=> ['length', 'caller']
- * ```
- *
- * @param  {Object} `obj` Object that has a `constructor`.
- * @return {Array} Array of keys.
- */
 
-function nativeKeys(val) {
-  if (!hasConstructor(val)) return [];
-  return Object.getOwnPropertyNames(val);
-}
 
-/**
- * Expose `copy`
- */
 
-module.exports = copy;
 
-/**
- * Expose `copy.has` for tests
- */
 
-module.exports.has = has;
 
 
-/***/ }),
-/* 668 */
-/***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(616);
-var toString = Object.prototype.toString;
 
-/**
- * Get the native `typeof` a value.
- *
- * @param  {*} `val`
- * @return {*} Native javascript type
- */
 
-module.exports = function kindOf(val) {
-  // primitivies
-  if (typeof val === 'undefined') {
-    return 'undefined';
-  }
-  if (val === null) {
-    return 'null';
-  }
-  if (val === true || val === false || val instanceof Boolean) {
-    return 'boolean';
-  }
-  if (typeof val === 'string' || val instanceof String) {
-    return 'string';
-  }
-  if (typeof val === 'number' || val instanceof Number) {
-    return 'number';
-  }
 
-  // functions
-  if (typeof val === 'function' || val instanceof Function) {
-    return 'function';
-  }
 
-  // array
-  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
-    return 'array';
-  }
 
-  // check for instances of RegExp and Date before calling `toString`
-  if (val instanceof RegExp) {
-    return 'regexp';
-  }
-  if (val instanceof Date) {
-    return 'date';
-  }
 
-  // other objects
-  var type = toString.call(val);
 
-  if (type === '[object RegExp]') {
-    return 'regexp';
-  }
-  if (type === '[object Date]') {
-    return 'date';
-  }
-  if (type === '[object Arguments]') {
-    return 'arguments';
-  }
-  if (type === '[object Error]') {
-    return 'error';
-  }
 
-  // buffer
-  if (isBuffer(val)) {
-    return 'buffer';
-  }
 
-  // es6: Map, WeakMap, Set, WeakSet
-  if (type === '[object Set]') {
-    return 'set';
-  }
-  if (type === '[object WeakSet]') {
-    return 'weakset';
-  }
-  if (type === '[object Map]') {
-    return 'map';
-  }
-  if (type === '[object WeakMap]') {
-    return 'weakmap';
-  }
-  if (type === '[object Symbol]') {
-    return 'symbol';
-  }
 
-  // typed arrays
-  if (type === '[object Int8Array]') {
-    return 'int8array';
-  }
-  if (type === '[object Uint8Array]') {
-    return 'uint8array';
-  }
-  if (type === '[object Uint8ClampedArray]') {
-    return 'uint8clampedarray';
-  }
-  if (type === '[object Int16Array]') {
-    return 'int16array';
-  }
-  if (type === '[object Uint16Array]') {
-    return 'uint16array';
-  }
-  if (type === '[object Int32Array]') {
-    return 'int32array';
-  }
-  if (type === '[object Uint32Array]') {
-    return 'uint32array';
-  }
-  if (type === '[object Float32Array]') {
-    return 'float32array';
-  }
-  if (type === '[object Float64Array]') {
-    return 'float64array';
-  }
 
-  // must be a plain object
-  return 'object';
-};
 
 
-/***/ }),
-/* 669 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/*!
- * copy-descriptor <https://github.com/jonschlinkert/copy-descriptor>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
 
 
-/**
- * Copy a descriptor from one object to another.
- *
- * ```js
- * function App() {
- *   this.cache = {};
- * }
- * App.prototype.set = function(key, val) {
- *   this.cache[key] = val;
- *   return this;
- * };
- * Object.defineProperty(App.prototype, 'count', {
- *   get: function() {
- *     return Object.keys(this.cache).length;
- *   }
- * });
- *
- * copy(App.prototype, 'count', 'len');
- *
- * // create an instance
- * var app = new App();
- *
- * app.set('a', true);
- * app.set('b', true);
- * app.set('c', true);
- *
- * console.log(app.count);
- * //=> 3
- * console.log(app.len);
- * //=> 3
- * ```
- * @name copy
- * @param {Object} `receiver` The target object
- * @param {Object} `provider` The provider object
- * @param {String} `from` The key to copy on provider.
- * @param {String} `to` Optionally specify a new key name to use.
- * @return {Object}
- * @api public
- */
 
-module.exports = function copyDescriptor(receiver, provider, from, to) {
-  if (!isObject(provider) && typeof provider !== 'function') {
-    to = from;
-    from = provider;
-    provider = receiver;
-  }
-  if (!isObject(receiver) && typeof receiver !== 'function') {
-    throw new TypeError('expected the first argument to be an object');
-  }
-  if (!isObject(provider) && typeof provider !== 'function') {
-    throw new TypeError('expected provider to be an object');
-  }
 
-  if (typeof to !== 'string') {
-    to = from;
-  }
-  if (typeof from !== 'string') {
-    throw new TypeError('expected key to be a string');
-  }
 
-  if (!(from in provider)) {
-    throw new Error('property "' + from + '" does not exist');
-  }
 
-  var val = Object.getOwnPropertyDescriptor(provider, from);
-  if (val) Object.defineProperty(receiver, to, val);
-};
 
-function isObject(val) {
-  return {}.toString.call(val) === '[object Object]';
-}
 
 
+
+
+
+
+
+//# sourceMappingURL=index.js.map
 
 /***/ }),
-/* 670 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "../../node_modules/rxjs/node_modules/tslib/tslib.es6.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return __extends; });
+/* unused harmony export __assign */
+/* unused harmony export __rest */
+/* unused harmony export __decorate */
+/* unused harmony export __param */
+/* unused harmony export __metadata */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return __awaiter; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return __generator; });
+/* unused harmony export __createBinding */
+/* unused harmony export __exportStar */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return __values; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return __read; });
+/* unused harmony export __spread */
+/* unused harmony export __spreadArrays */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return __spreadArray; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return __await; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __asyncGenerator; });
+/* unused harmony export __asyncDelegator */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return __asyncValues; });
+/* unused harmony export __makeTemplateObject */
+/* unused harmony export __importStar */
+/* unused harmony export __importDefault */
+/* unused harmony export __classPrivateFieldGet */
+/* unused harmony export __classPrivateFieldSet */
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    }
+    return __assign.apply(this, arguments);
+}
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __param(paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+var __createBinding = Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+});
+
+function __exportStar(m, o) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
+}
+
+function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+
+function __read(o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+}
+
+/** @deprecated */
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
+/** @deprecated */
+function __spreadArrays() {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+}
+
+function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+}
+
+function __await(v) {
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
+}
+
+function __asyncGenerator(thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+}
+
+function __asyncDelegator(o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+}
+
+function __asyncValues(o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+}
+
+function __makeTemplateObject(cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+
+var __setModuleDefault = Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+};
+
+function __importStar(mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+}
+
+function __importDefault(mod) {
+    return (mod && mod.__esModule) ? mod : { default: mod };
+}
+
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+}
 
 
-var use = __webpack_require__(671);
-var define = __webpack_require__(659);
-var debug = __webpack_require__(205)('snapdragon:compiler');
-var utils = __webpack_require__(673);
+/***/ }),
 
-/**
- * Create a new `Compiler` with the given `options`.
- * @param {Object} `options`
- */
+/***/ "../../node_modules/safe-regex/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function Compiler(options, state) {
-  debug('initializing', __filename);
-  this.options = utils.extend({source: 'string'}, options);
-  this.state = state || {};
-  this.compilers = {};
-  this.output = '';
-  this.set('eos', function(node) {
-    return this.emit(node.val, node);
-  });
-  this.set('noop', function(node) {
-    return this.emit(node.val, node);
-  });
-  this.set('bos', function(node) {
-    return this.emit(node.val, node);
-  });
-  use(this);
+var parse = __webpack_require__("../../node_modules/ret/lib/index.js");
+var types = parse.types;
+
+module.exports = function (re, opts) {
+    if (!opts) opts = {};
+    var replimit = opts.limit === undefined ? 25 : opts.limit;
+    
+    if (isRegExp(re)) re = re.source;
+    else if (typeof re !== 'string') re = String(re);
+    
+    try { re = parse(re) }
+    catch (err) { return false }
+    
+    var reps = 0;
+    return (function walk (node, starHeight) {
+        if (node.type === types.REPETITION) {
+            starHeight ++;
+            reps ++;
+            if (starHeight > 1) return false;
+            if (reps > replimit) return false;
+        }
+        
+        if (node.options) {
+            for (var i = 0, len = node.options.length; i < len; i++) {
+                var ok = walk({ stack: node.options[i] }, starHeight);
+                if (!ok) return false;
+            }
+        }
+        var stack = node.stack || (node.value && node.value.stack);
+        if (!stack) return true;
+        
+        for (var i = 0; i < stack.length; i++) {
+            var ok = walk(stack[i], starHeight);
+            if (!ok) return false;
+        }
+        
+        return true;
+    })(re, 0);
+};
+
+function isRegExp (x) {
+    return {}.toString.call(x) === '[object RegExp]';
 }
 
-/**
- * Prototype methods
- */
 
-Compiler.prototype = {
+/***/ }),
 
-  /**
-   * Throw an error message with details including the cursor position.
-   * @param {String} `msg` Message to use in the Error.
-   */
+/***/ "../../node_modules/shebang-command/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  error: function(msg, node) {
-    var pos = node.position || {start: {column: 0}};
-    var message = this.options.source + ' column:' + pos.start.column + ': ' + msg;
+"use strict";
 
-    var err = new Error(message);
-    err.reason = msg;
-    err.column = pos.start.column;
-    err.source = this.pattern;
+const shebangRegex = __webpack_require__("../../node_modules/shebang-regex/index.js");
 
-    if (this.options.silent) {
-      this.errors.push(err);
-    } else {
-      throw err;
-    }
-  },
+module.exports = (string = '') => {
+	const match = string.match(shebangRegex);
 
-  /**
-   * Define a non-enumberable property on the `Compiler` instance.
-   *
-   * ```js
-   * compiler.define('foo', 'bar');
-   * ```
-   * @name .define
-   * @param {String} `key` propery name
-   * @param {any} `val` property value
-   * @return {Object} Returns the Compiler instance for chaining.
-   * @api public
-   */
+	if (!match) {
+		return null;
+	}
 
-  define: function(key, val) {
-    define(this, key, val);
-    return this;
-  },
+	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
+	const binary = path.split('/').pop();
 
-  /**
-   * Emit `node.val`
-   */
+	if (binary === 'env') {
+		return argument;
+	}
 
-  emit: function(str, node) {
-    this.output += str;
-    return str;
-  },
+	return argument ? `${binary} ${argument}` : binary;
+};
 
-  /**
-   * Add a compiler `fn` with the given `name`
-   */
 
-  set: function(name, fn) {
-    this.compilers[name] = fn;
-    return this;
-  },
+/***/ }),
+
+/***/ "../../node_modules/shebang-regex/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = /^#!(.*)/;
 
-  /**
-   * Get compiler `name`.
-   */
 
-  get: function(name) {
-    return this.compilers[name];
-  },
+/***/ }),
 
-  /**
-   * Get the previous AST node.
-   */
+/***/ "../../node_modules/signal-exit/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  prev: function(n) {
-    return this.ast.nodes[this.idx - (n || 1)] || { type: 'bos', val: '' };
-  },
+// 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.
+// grab a reference to node's real process object right away
+var process = global.process
 
-  /**
-   * Get the next AST node.
-   */
+const processOk = function (process) {
+  return process &&
+    typeof process === 'object' &&
+    typeof process.removeListener === 'function' &&
+    typeof process.emit === 'function' &&
+    typeof process.reallyExit === 'function' &&
+    typeof process.listeners === 'function' &&
+    typeof process.kill === 'function' &&
+    typeof process.pid === 'number' &&
+    typeof process.on === 'function'
+}
 
-  next: function(n) {
-    return this.ast.nodes[this.idx + (n || 1)] || { type: 'eos', val: '' };
-  },
+// some kind of non-node environment, just no-op
+/* istanbul ignore if */
+if (!processOk(process)) {
+  module.exports = function () {
+    return function () {}
+  }
+} else {
+  var assert = __webpack_require__("assert")
+  var signals = __webpack_require__("../../node_modules/signal-exit/signals.js")
+  var isWin = /^win/i.test(process.platform)
 
-  /**
-   * Visit `node`.
-   */
+  var EE = __webpack_require__("events")
+  /* istanbul ignore if */
+  if (typeof EE !== 'function') {
+    EE = EE.EventEmitter
+  }
 
-  visit: function(node, nodes, i) {
-    var fn = this.compilers[node.type];
-    this.idx = i;
+  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 = {}
+  }
 
-    if (typeof fn !== 'function') {
-      throw this.error('compiler "' + node.type + '" is not registered', node);
-    }
-    return fn.call(this, node, nodes, i);
-  },
+  // 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
+  }
 
-  /**
-   * Map visit over array of `nodes`.
-   */
+  module.exports = function (cb, opts) {
+    /* istanbul ignore if */
+    if (!processOk(global.process)) {
+      return function () {}
+    }
+    assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
 
-  mapVisit: function(nodes) {
-    if (!Array.isArray(nodes)) {
-      throw new TypeError('expected an array');
+    if (loaded === false) {
+      load()
     }
-    var len = nodes.length;
-    var idx = -1;
-    while (++idx < len) {
-      this.visit(nodes[idx], nodes, idx);
+
+    var ev = 'exit'
+    if (opts && opts.alwaysLast) {
+      ev = 'afterexit'
     }
-    return this;
-  },
 
-  /**
-   * Compile `ast`.
-   */
+    var remove = function () {
+      emitter.removeListener(ev, cb)
+      if (emitter.listeners('exit').length === 0 &&
+          emitter.listeners('afterexit').length === 0) {
+        unload()
+      }
+    }
+    emitter.on(ev, cb)
 
-  compile: function(ast, options) {
-    var opts = utils.extend({}, this.options, options);
-    this.ast = ast;
-    this.parsingErrors = this.ast.errors;
-    this.output = '';
+    return remove
+  }
 
-    // source map support
-    if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(692);
-      sourcemaps(this);
-      this.mapVisit(this.ast.nodes);
-      this.applySourceMaps();
-      this.map = opts.sourcemap === 'generator' ? this.map : this.map.toJSON();
-      return this;
+  var unload = function unload () {
+    if (!loaded || !processOk(global.process)) {
+      return
     }
+    loaded = false
 
-    this.mapVisit(this.ast.nodes);
-    return this;
+    signals.forEach(function (sig) {
+      try {
+        process.removeListener(sig, sigListeners[sig])
+      } catch (er) {}
+    })
+    process.emit = originalProcessEmit
+    process.reallyExit = originalProcessReallyExit
+    emitter.count -= 1
   }
-};
-
-/**
- * Expose `Compiler`
- */
+  module.exports.unload = unload
 
-module.exports = Compiler;
+  var emit = function emit (event, code, signal) {
+    /* istanbul ignore if */
+    if (emitter.emitted[event]) {
+      return
+    }
+    emitter.emitted[event] = true
+    emitter.emit(event, code, signal)
+  }
 
+  // { <signal>: <listener fn>, ... }
+  var sigListeners = {}
+  signals.forEach(function (sig) {
+    sigListeners[sig] = function listener () {
+      /* istanbul ignore if */
+      if (!processOk(global.process)) {
+        return
+      }
+      // 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 */
+        if (isWin && sig === 'SIGHUP') {
+          // "SIGHUP" throws an `ENOSYS` error on Windows,
+          // so use a supported signal instead
+          sig = 'SIGINT'
+        }
+        /* istanbul ignore next */
+        process.kill(process.pid, sig)
+      }
+    }
+  })
 
-/***/ }),
-/* 671 */
-/***/ (function(module, exports, __webpack_require__) {
+  module.exports.signals = function () {
+    return signals
+  }
 
-"use strict";
-/*!
- * use <https://github.com/jonschlinkert/use>
- *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+  var loaded = false
 
+  var load = function load () {
+    if (loaded || !processOk(global.process)) {
+      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
 
-var utils = __webpack_require__(672);
+    signals = signals.filter(function (sig) {
+      try {
+        process.on(sig, sigListeners[sig])
+        return true
+      } catch (er) {
+        return false
+      }
+    })
 
-module.exports = function base(app, opts) {
-  if (!utils.isObject(app) && typeof app !== 'function') {
-    throw new TypeError('use: expect `app` be an object or function');
+    process.emit = processEmit
+    process.reallyExit = processReallyExit
   }
+  module.exports.load = load
 
-  if (!utils.isObject(opts)) {
-    opts = {};
+  var originalProcessReallyExit = process.reallyExit
+  var processReallyExit = function processReallyExit (code) {
+    /* istanbul ignore if */
+    if (!processOk(global.process)) {
+      return
+    }
+    process.exitCode = code || /* istanbul ignore next */ 0
+    emit('exit', process.exitCode, null)
+    /* istanbul ignore next */
+    emit('afterexit', process.exitCode, null)
+    /* istanbul ignore next */
+    originalProcessReallyExit.call(process, process.exitCode)
   }
 
-  var prop = utils.isString(opts.prop) ? opts.prop : 'fns';
-  if (!Array.isArray(app[prop])) {
-    utils.define(app, prop, []);
+  var originalProcessEmit = process.emit
+  var processEmit = function processEmit (ev, arg) {
+    if (ev === 'exit' && processOk(global.process)) {
+      /* istanbul ignore else */
+      if (arg !== undefined) {
+        process.exitCode = arg
+      }
+      var ret = originalProcessEmit.apply(this, arguments)
+      /* istanbul ignore next */
+      emit('exit', process.exitCode, null)
+      /* istanbul ignore next */
+      emit('afterexit', process.exitCode, null)
+      /* istanbul ignore next */
+      return ret
+    } else {
+      return originalProcessEmit.apply(this, arguments)
+    }
   }
+}
 
-  /**
-   * Define a plugin function to be passed to use. The only
-   * parameter exposed to the plugin is `app`, the object or function.
-   * passed to `use(app)`. `app` is also exposed as `this` in plugins.
-   *
-   * Additionally, **if a plugin returns a function, the function will
-   * be pushed onto the `fns` array**, allowing the plugin to be
-   * called at a later point by the `run` method.
-   *
-   * ```js
-   * var use = require('use');
-   *
-   * // define a plugin
-   * function foo(app) {
-   *   // do stuff
-   * }
-   *
-   * var app = function(){};
-   * use(app);
-   *
-   * // register plugins
-   * app.use(foo);
-   * app.use(bar);
-   * app.use(baz);
-   * ```
-   * @name .use
-   * @param {Function} `fn` plugin function to call
-   * @api public
-   */
 
-  utils.define(app, 'use', use);
+/***/ }),
 
-  /**
-   * Run all plugins on `fns`. Any plugin that returns a function
-   * when called by `use` is pushed onto the `fns` array.
-   *
-   * ```js
-   * var config = {};
-   * app.run(config);
-   * ```
-   * @name .run
-   * @param {Object} `value` Object to be modified by plugins.
-   * @return {Object} Returns the object passed to `run`
-   * @api public
-   */
+/***/ "../../node_modules/signal-exit/signals.js":
+/***/ (function(module, exports) {
 
-  utils.define(app, 'run', function(val) {
-    if (!utils.isObject(val)) return;
-    decorate(val);
+// 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 self = this || app;
-    var fns = self[prop];
-    var len = fns.length;
-    var idx = -1;
+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'
+  )
+}
 
-    while (++idx < len) {
-      val.use(fns[idx]);
-    }
-    return val;
-  });
+if (process.platform === 'linux') {
+  module.exports.push(
+    'SIGIO',
+    'SIGPOLL',
+    'SIGPWR',
+    'SIGSTKFLT',
+    'SIGUNUSED'
+  )
+}
 
-  /**
-   * Call plugin `fn`. If a function is returned push it into the
-   * `fns` array to be called by the `run` method.
-   */
 
-  function use(fn, options) {
-    if (typeof fn !== 'function') {
-      throw new TypeError('.use expects `fn` be a function');
-    }
+/***/ }),
 
-    var self = this || app;
-    if (typeof opts.fn === 'function') {
-      opts.fn.call(self, self, options);
-    }
+/***/ "../../node_modules/slash/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    var plugin = fn.call(self, self);
-    if (typeof plugin === 'function') {
-      var fns = self[prop];
-      fns.push(plugin);
-    }
-    return self;
-  }
+"use strict";
 
-  /**
-   * Ensure the `.use` method exists on `val`
-   */
+module.exports = path => {
+	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
 
-  function decorate(val) {
-    if (!val.use || !val.run) {
-      base(val);
-    }
-  }
+	if (isExtendedLengthPath || hasNonAscii) {
+		return path;
+	}
 
-  return app;
+	return path.replace(/\\/g, '/');
 };
 
 
 /***/ }),
-/* 672 */
+
+/***/ "../../node_modules/snapdragon-node/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = {};
-
-
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
+var define = __webpack_require__("../../node_modules/snapdragon-node/node_modules/define-property/index.js");
+var utils = __webpack_require__("../../node_modules/snapdragon-util/index.js");
+var ownNames;
 
 /**
- * Lazily required module dependencies
+ * Create a new AST `Node` with the given `val` and `type`.
+ *
+ * ```js
+ * var node = new Node('*', 'Star');
+ * var node = new Node({type: 'star', val: '*'});
+ * ```
+ * @name Node
+ * @param {String|Object} `val` Pass a matched substring, or an object to merge onto the node.
+ * @param {String} `type` The node type to use when `val` is a string.
+ * @return {Object} node instance
+ * @api public
  */
 
-utils.define = __webpack_require__(659);
-utils.isObject = __webpack_require__(592);
+function Node(val, type, parent) {
+  if (typeof type !== 'string') {
+    parent = type;
+    type = null;
+  }
 
+  define(this, 'parent', parent);
+  define(this, 'isNode', true);
+  define(this, 'expect', null);
 
-utils.isString = function(val) {
-  return val && typeof val === 'string';
-};
+  if (typeof type !== 'string' && isObject(val)) {
+    lazyKeys();
+    var keys = Object.keys(val);
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i];
+      if (ownNames.indexOf(key) === -1) {
+        this[key] = val[key];
+      }
+    }
+  } else {
+    this.type = type;
+    this.val = val;
+  }
+}
 
 /**
- * Expose `utils` modules
+ * Returns true if the given value is a node.
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var node = new Node({type: 'foo'});
+ * console.log(Node.isNode(node)); //=> true
+ * console.log(Node.isNode({})); //=> false
+ * ```
+ * @param {Object} `node`
+ * @returns {Boolean}
+ * @api public
  */
 
-module.exports = utils;
+Node.isNode = function(node) {
+  return utils.isNode(node);
+};
 
+/**
+ * Define a non-enumberable property on the node instance.
+ * Useful for adding properties that shouldn't be extended
+ * or visible during debugging.
+ *
+ * ```js
+ * var node = new Node();
+ * node.define('foo', 'something non-enumerable');
+ * ```
+ * @param {String} `name`
+ * @param {any} `val`
+ * @return {Object} returns the node instance
+ * @api public
+ */
 
-/***/ }),
-/* 673 */
-/***/ (function(module, exports, __webpack_require__) {
+Node.prototype.define = function(name, val) {
+  define(this, name, val);
+  return this;
+};
 
-"use strict";
+/**
+ * Returns true if `node.val` is an empty string, or `node.nodes` does
+ * not contain any non-empty text nodes.
+ *
+ * ```js
+ * var node = new Node({type: 'text'});
+ * node.isEmpty(); //=> true
+ * node.val = 'foo';
+ * node.isEmpty(); //=> false
+ * ```
+ * @param {Function} `fn` (optional) Filter function that is called on `node` and/or child nodes. `isEmpty` will return false immediately when the filter function returns false on any nodes.
+ * @return {Boolean}
+ * @api public
+ */
 
+Node.prototype.isEmpty = function(fn) {
+  return utils.isEmpty(this, fn);
+};
 
 /**
- * Module dependencies
+ * Given node `foo` and node `bar`, push node `bar` onto `foo.nodes`, and
+ * set `foo` as `bar.parent`.
+ *
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * foo.push(bar);
+ * ```
+ * @param {Object} `node`
+ * @return {Number} Returns the length of `node.nodes`
+ * @api public
  */
 
-exports.extend = __webpack_require__(643);
-exports.SourceMap = __webpack_require__(674);
-exports.sourceMapResolve = __webpack_require__(685);
+Node.prototype.push = function(node) {
+  assert(Node.isNode(node), 'expected node to be an instance of Node');
+  define(node, 'parent', this);
+
+  this.nodes = this.nodes || [];
+  return this.nodes.push(node);
+};
 
 /**
- * Convert backslash in the given string to forward slashes
+ * Given node `foo` and node `bar`, unshift node `bar` onto `foo.nodes`, and
+ * set `foo` as `bar.parent`.
+ *
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * foo.unshift(bar);
+ * ```
+ * @param {Object} `node`
+ * @return {Number} Returns the length of `node.nodes`
+ * @api public
  */
 
-exports.unixify = function(fp) {
-  return fp.split(/\\+/).join('/');
+Node.prototype.unshift = function(node) {
+  assert(Node.isNode(node), 'expected node to be an instance of Node');
+  define(node, 'parent', this);
+
+  this.nodes = this.nodes || [];
+  return this.nodes.unshift(node);
 };
 
 /**
- * Return true if `val` is a non-empty string
+ * Pop a node from `node.nodes`.
  *
- * @param {String} `str`
- * @return {Boolean}
+ * ```js
+ * var node = new Node({type: 'foo'});
+ * node.push(new Node({type: 'a'}));
+ * node.push(new Node({type: 'b'}));
+ * node.push(new Node({type: 'c'}));
+ * node.push(new Node({type: 'd'}));
+ * console.log(node.nodes.length);
+ * //=> 4
+ * node.pop();
+ * console.log(node.nodes.length);
+ * //=> 3
+ * ```
+ * @return {Number} Returns the popped `node`
+ * @api public
  */
 
-exports.isString = function(str) {
-  return str && typeof str === 'string';
+Node.prototype.pop = function() {
+  return this.nodes && this.nodes.pop();
 };
 
 /**
- * Cast `val` to an array
- * @return {Array}
+ * Shift a node from `node.nodes`.
+ *
+ * ```js
+ * var node = new Node({type: 'foo'});
+ * node.push(new Node({type: 'a'}));
+ * node.push(new Node({type: 'b'}));
+ * node.push(new Node({type: 'c'}));
+ * node.push(new Node({type: 'd'}));
+ * console.log(node.nodes.length);
+ * //=> 4
+ * node.shift();
+ * console.log(node.nodes.length);
+ * //=> 3
+ * ```
+ * @return {Object} Returns the shifted `node`
+ * @api public
  */
 
-exports.arrayify = function(val) {
-  if (typeof val === 'string') return [val];
-  return val ? (Array.isArray(val) ? val : [val]) : [];
+Node.prototype.shift = function() {
+  return this.nodes && this.nodes.shift();
 };
 
 /**
- * Get the last `n` element from the given `array`
- * @param {Array} `array`
- * @return {*}
+ * Remove `node` from `node.nodes`.
+ *
+ * ```js
+ * node.remove(childNode);
+ * ```
+ * @param {Object} `node`
+ * @return {Object} Returns the removed node.
+ * @api public
  */
 
-exports.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
+Node.prototype.remove = function(node) {
+  assert(Node.isNode(node), 'expected node to be an instance of Node');
+  this.nodes = this.nodes || [];
+  var idx = node.index;
+  if (idx !== -1) {
+    node.index = -1;
+    return this.nodes.splice(idx, 1);
+  }
+  return null;
 };
 
-
-/***/ }),
-/* 674 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
+/**
+ * Get the first child node from `node.nodes` that matches the given `type`.
+ * If `type` is a number, the child node at that index is returned.
+ *
+ * ```js
+ * var child = node.find(1); //<= index of the node to get
+ * var child = node.find('foo'); //<= node.type of a child node
+ * var child = node.find(/^(foo|bar)$/); //<= regex to match node.type
+ * var child = node.find(['foo', 'bar']); //<= array of node.type(s)
+ * ```
+ * @param {String} `type`
+ * @return {Object} Returns a child node or undefined.
+ * @api public
  */
-exports.SourceMapGenerator = __webpack_require__(675).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(681).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(684).SourceNode;
-
 
-/***/ }),
-/* 675 */
-/***/ (function(module, exports, __webpack_require__) {
+Node.prototype.find = function(type) {
+  return utils.findNode(this.nodes, type);
+};
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
+/**
+ * Return true if the node is the given `type`.
+ *
+ * ```js
+ * var node = new Node({type: 'bar'});
+ * cosole.log(node.isType('foo'));          // false
+ * cosole.log(node.isType(/^(foo|bar)$/));  // true
+ * cosole.log(node.isType(['foo', 'bar'])); // true
+ * ```
+ * @param {String} `type`
+ * @return {Boolean}
+ * @api public
  */
 
-var base64VLQ = __webpack_require__(676);
-var util = __webpack_require__(678);
-var ArraySet = __webpack_require__(679).ArraySet;
-var MappingList = __webpack_require__(680).MappingList;
+Node.prototype.isType = function(type) {
+  return utils.isType(this, type);
+};
 
 /**
- * An instance of the SourceMapGenerator represents a source map which is
- * being built incrementally. You may pass an object with the following
- * properties:
+ * Return true if the `node.nodes` has the given `type`.
  *
- *   - file: The filename of the generated source.
- *   - sourceRoot: A root for all relative URLs in this source map.
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * foo.push(bar);
+ *
+ * cosole.log(foo.hasType('qux'));          // false
+ * cosole.log(foo.hasType(/^(qux|bar)$/));  // true
+ * cosole.log(foo.hasType(['qux', 'bar'])); // true
+ * ```
+ * @param {String} `type`
+ * @return {Boolean}
+ * @api public
  */
-function SourceMapGenerator(aArgs) {
-  if (!aArgs) {
-    aArgs = {};
-  }
-  this._file = util.getArg(aArgs, 'file', null);
-  this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null);
-  this._skipValidation = util.getArg(aArgs, 'skipValidation', false);
-  this._sources = new ArraySet();
-  this._names = new ArraySet();
-  this._mappings = new MappingList();
-  this._sourcesContents = null;
-}
 
-SourceMapGenerator.prototype._version = 3;
+Node.prototype.hasType = function(type) {
+  return utils.hasType(this, type);
+};
 
 /**
- * Creates a new SourceMapGenerator based on a SourceMapConsumer
+ * Get the siblings array, or `null` if it doesn't exist.
  *
- * @param aSourceMapConsumer The SourceMap.
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * foo.push(bar);
+ * foo.push(baz);
+ *
+ * console.log(bar.siblings.length) // 2
+ * console.log(baz.siblings.length) // 2
+ * ```
+ * @return {Array}
+ * @api public
  */
-SourceMapGenerator.fromSourceMap =
-  function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
-    var sourceRoot = aSourceMapConsumer.sourceRoot;
-    var generator = new SourceMapGenerator({
-      file: aSourceMapConsumer.file,
-      sourceRoot: sourceRoot
-    });
-    aSourceMapConsumer.eachMapping(function (mapping) {
-      var newMapping = {
-        generated: {
-          line: mapping.generatedLine,
-          column: mapping.generatedColumn
-        }
-      };
-
-      if (mapping.source != null) {
-        newMapping.source = mapping.source;
-        if (sourceRoot != null) {
-          newMapping.source = util.relative(sourceRoot, newMapping.source);
-        }
-
-        newMapping.original = {
-          line: mapping.originalLine,
-          column: mapping.originalColumn
-        };
-
-        if (mapping.name != null) {
-          newMapping.name = mapping.name;
-        }
-      }
 
-      generator.addMapping(newMapping);
-    });
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        generator.setSourceContent(sourceFile, content);
-      }
-    });
-    return generator;
-  };
+Object.defineProperty(Node.prototype, 'siblings', {
+  set: function() {
+    throw new Error('node.siblings is a getter and cannot be defined');
+  },
+  get: function() {
+    return this.parent ? this.parent.nodes : null;
+  }
+});
 
 /**
- * Add a single mapping from original source line and column to the generated
- * source's line and column for this source map being created. The mapping
- * object should have the following properties:
+ * Get the node's current index from `node.parent.nodes`.
+ * This should always be correct, even when the parent adds nodes.
  *
- *   - generated: An object with the generated line and column positions.
- *   - original: An object with the original line and column positions.
- *   - source: The original source file (relative to the sourceRoot).
- *   - name: An optional original token name for this mapping.
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * var qux = new Node({type: 'qux'});
+ * foo.push(bar);
+ * foo.push(baz);
+ * foo.unshift(qux);
+ *
+ * console.log(bar.index) // 1
+ * console.log(baz.index) // 2
+ * console.log(qux.index) // 0
+ * ```
+ * @return {Number}
+ * @api public
  */
-SourceMapGenerator.prototype.addMapping =
-  function SourceMapGenerator_addMapping(aArgs) {
-    var generated = util.getArg(aArgs, 'generated');
-    var original = util.getArg(aArgs, 'original', null);
-    var source = util.getArg(aArgs, 'source', null);
-    var name = util.getArg(aArgs, 'name', null);
 
-    if (!this._skipValidation) {
-      this._validateMapping(generated, original, source, name);
-    }
-
-    if (source != null) {
-      source = String(source);
-      if (!this._sources.has(source)) {
-        this._sources.add(source);
-      }
+Object.defineProperty(Node.prototype, 'index', {
+  set: function(index) {
+    define(this, 'idx', index);
+  },
+  get: function() {
+    if (!Array.isArray(this.siblings)) {
+      return -1;
     }
-
-    if (name != null) {
-      name = String(name);
-      if (!this._names.has(name)) {
-        this._names.add(name);
-      }
+    var tok = this.idx !== -1 ? this.siblings[this.idx] : null;
+    if (tok !== this) {
+      this.idx = this.siblings.indexOf(this);
     }
-
-    this._mappings.add({
-      generatedLine: generated.line,
-      generatedColumn: generated.column,
-      originalLine: original != null && original.line,
-      originalColumn: original != null && original.column,
-      source: source,
-      name: name
-    });
-  };
+    return this.idx;
+  }
+});
 
 /**
- * Set the source content for a source file.
+ * Get the previous node from the siblings array or `null`.
+ *
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * foo.push(bar);
+ * foo.push(baz);
+ *
+ * console.log(baz.prev.type) // 'bar'
+ * ```
+ * @return {Object}
+ * @api public
  */
-SourceMapGenerator.prototype.setSourceContent =
-  function SourceMapGenerator_setSourceContent(aSourceFile, aSourceContent) {
-    var source = aSourceFile;
-    if (this._sourceRoot != null) {
-      source = util.relative(this._sourceRoot, source);
-    }
 
-    if (aSourceContent != null) {
-      // Add the source content to the _sourcesContents map.
-      // Create a new _sourcesContents map if the property is null.
-      if (!this._sourcesContents) {
-        this._sourcesContents = Object.create(null);
-      }
-      this._sourcesContents[util.toSetString(source)] = aSourceContent;
-    } else if (this._sourcesContents) {
-      // Remove the source file from the _sourcesContents map.
-      // If the _sourcesContents map is empty, set the property to null.
-      delete this._sourcesContents[util.toSetString(source)];
-      if (Object.keys(this._sourcesContents).length === 0) {
-        this._sourcesContents = null;
-      }
+Object.defineProperty(Node.prototype, 'prev', {
+  set: function() {
+    throw new Error('node.prev is a getter and cannot be defined');
+  },
+  get: function() {
+    if (Array.isArray(this.siblings)) {
+      return this.siblings[this.index - 1] || this.parent.prev;
     }
-  };
+    return null;
+  }
+});
 
 /**
- * Applies the mappings of a sub-source-map for a specific source file to the
- * source map being generated. Each mapping to the supplied source file is
- * rewritten using the supplied source map. Note: The resolution for the
- * resulting mappings is the minimium of this map and the supplied map.
+ * Get the siblings array, or `null` if it doesn't exist.
  *
- * @param aSourceMapConsumer The source map to be applied.
- * @param aSourceFile Optional. The filename of the source file.
- *        If omitted, SourceMapConsumer's file property will be used.
- * @param aSourceMapPath Optional. The dirname of the path to the source map
- *        to be applied. If relative, it is relative to the SourceMapConsumer.
- *        This parameter is needed when the two source maps aren't in the same
- *        directory, and the source map to be applied contains relative source
- *        paths. If so, those relative source paths need to be rewritten
- *        relative to the SourceMapGenerator.
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * foo.push(bar);
+ * foo.push(baz);
+ *
+ * console.log(bar.siblings.length) // 2
+ * console.log(baz.siblings.length) // 2
+ * ```
+ * @return {Object}
+ * @api public
  */
-SourceMapGenerator.prototype.applySourceMap =
-  function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile, aSourceMapPath) {
-    var sourceFile = aSourceFile;
-    // If aSourceFile is omitted, we will use the file property of the SourceMap
-    if (aSourceFile == null) {
-      if (aSourceMapConsumer.file == null) {
-        throw new Error(
-          'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' +
-          'or the source map\'s "file" property. Both were omitted.'
-        );
-      }
-      sourceFile = aSourceMapConsumer.file;
-    }
-    var sourceRoot = this._sourceRoot;
-    // Make "sourceFile" relative if an absolute Url is passed.
-    if (sourceRoot != null) {
-      sourceFile = util.relative(sourceRoot, sourceFile);
-    }
-    // Applying the SourceMap can add and remove items from the sources and
-    // the names array.
-    var newSources = new ArraySet();
-    var newNames = new ArraySet();
 
-    // Find mappings for the "sourceFile"
-    this._mappings.unsortedForEach(function (mapping) {
-      if (mapping.source === sourceFile && mapping.originalLine != null) {
-        // Check if it can be mapped by the source map, then update the mapping.
-        var original = aSourceMapConsumer.originalPositionFor({
-          line: mapping.originalLine,
-          column: mapping.originalColumn
-        });
-        if (original.source != null) {
-          // Copy mapping
-          mapping.source = original.source;
-          if (aSourceMapPath != null) {
-            mapping.source = util.join(aSourceMapPath, mapping.source)
-          }
-          if (sourceRoot != null) {
-            mapping.source = util.relative(sourceRoot, mapping.source);
-          }
-          mapping.originalLine = original.line;
-          mapping.originalColumn = original.column;
-          if (original.name != null) {
-            mapping.name = original.name;
-          }
-        }
-      }
+Object.defineProperty(Node.prototype, 'next', {
+  set: function() {
+    throw new Error('node.next is a getter and cannot be defined');
+  },
+  get: function() {
+    if (Array.isArray(this.siblings)) {
+      return this.siblings[this.index + 1] || this.parent.next;
+    }
+    return null;
+  }
+});
 
-      var source = mapping.source;
-      if (source != null && !newSources.has(source)) {
-        newSources.add(source);
-      }
+/**
+ * Get the first node from `node.nodes`.
+ *
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * var qux = new Node({type: 'qux'});
+ * foo.push(bar);
+ * foo.push(baz);
+ * foo.push(qux);
+ *
+ * console.log(foo.first.type) // 'bar'
+ * ```
+ * @return {Object} The first node, or undefiend
+ * @api public
+ */
 
-      var name = mapping.name;
-      if (name != null && !newNames.has(name)) {
-        newNames.add(name);
-      }
+Object.defineProperty(Node.prototype, 'first', {
+  get: function() {
+    return this.nodes ? this.nodes[0] : null;
+  }
+});
 
-    }, this);
-    this._sources = newSources;
-    this._names = newNames;
+/**
+ * Get the last node from `node.nodes`.
+ *
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * var qux = new Node({type: 'qux'});
+ * foo.push(bar);
+ * foo.push(baz);
+ * foo.push(qux);
+ *
+ * console.log(foo.last.type) // 'qux'
+ * ```
+ * @return {Object} The last node, or undefiend
+ * @api public
+ */
 
-    // Copy sourcesContents of applied map.
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        if (aSourceMapPath != null) {
-          sourceFile = util.join(aSourceMapPath, sourceFile);
-        }
-        if (sourceRoot != null) {
-          sourceFile = util.relative(sourceRoot, sourceFile);
-        }
-        this.setSourceContent(sourceFile, content);
-      }
-    }, this);
-  };
+Object.defineProperty(Node.prototype, 'last', {
+  get: function() {
+    return this.nodes ? utils.last(this.nodes) : null;
+  }
+});
 
 /**
- * A mapping can have one of the three levels of data:
+ * Get the last node from `node.nodes`.
  *
- *   1. Just the generated position.
- *   2. The Generated position, original position, and original source.
- *   3. Generated and original position, original source, as well as a name
- *      token.
+ * ```js
+ * var foo = new Node({type: 'foo'});
+ * var bar = new Node({type: 'bar'});
+ * var baz = new Node({type: 'baz'});
+ * var qux = new Node({type: 'qux'});
+ * foo.push(bar);
+ * foo.push(baz);
+ * foo.push(qux);
  *
- * To maintain consistency, we validate that any new mapping being added falls
- * in to one of these categories.
+ * console.log(foo.last.type) // 'qux'
+ * ```
+ * @return {Object} The last node, or undefiend
+ * @api public
  */
-SourceMapGenerator.prototype._validateMapping =
-  function SourceMapGenerator_validateMapping(aGenerated, aOriginal, aSource,
-                                              aName) {
-    // When aOriginal is truthy but has empty values for .line and .column,
-    // it is most likely a programmer error. In this case we throw a very
-    // specific error message to try to guide them the right way.
-    // For example: https://github.com/Polymer/polymer-bundler/pull/519
-    if (aOriginal && typeof aOriginal.line !== 'number' && typeof aOriginal.column !== 'number') {
-        throw new Error(
-            'original.line and original.column are not numbers -- you probably meant to omit ' +
-            'the original mapping entirely and only map the generated position. If so, pass ' +
-            'null for the original mapping instead of an object with empty or null values.'
-        );
-    }
 
-    if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
-        && aGenerated.line > 0 && aGenerated.column >= 0
-        && !aOriginal && !aSource && !aName) {
-      // Case 1.
-      return;
-    }
-    else if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
-             && aOriginal && 'line' in aOriginal && 'column' in aOriginal
-             && aGenerated.line > 0 && aGenerated.column >= 0
-             && aOriginal.line > 0 && aOriginal.column >= 0
-             && aSource) {
-      // Cases 2 and 3.
-      return;
-    }
-    else {
-      throw new Error('Invalid mapping: ' + JSON.stringify({
-        generated: aGenerated,
-        source: aSource,
-        original: aOriginal,
-        name: aName
-      }));
+Object.defineProperty(Node.prototype, 'scope', {
+  get: function() {
+    if (this.isScope !== true) {
+      return this.parent ? this.parent.scope : this;
     }
-  };
+    return this;
+  }
+});
 
 /**
- * Serialize the accumulated mappings in to the stream of base 64 VLQs
- * specified by the source map format.
+ * Get own property names from Node prototype, but only the
+ * first time `Node` is instantiated
  */
-SourceMapGenerator.prototype._serializeMappings =
-  function SourceMapGenerator_serializeMappings() {
-    var previousGeneratedColumn = 0;
-    var previousGeneratedLine = 1;
-    var previousOriginalColumn = 0;
-    var previousOriginalLine = 0;
-    var previousName = 0;
-    var previousSource = 0;
-    var result = '';
-    var next;
-    var mapping;
-    var nameIdx;
-    var sourceIdx;
 
-    var mappings = this._mappings.toArray();
-    for (var i = 0, len = mappings.length; i < len; i++) {
-      mapping = mappings[i];
-      next = ''
+function lazyKeys() {
+  if (!ownNames) {
+    ownNames = Object.getOwnPropertyNames(Node.prototype);
+  }
+}
 
-      if (mapping.generatedLine !== previousGeneratedLine) {
-        previousGeneratedColumn = 0;
-        while (mapping.generatedLine !== previousGeneratedLine) {
-          next += ';';
-          previousGeneratedLine++;
-        }
-      }
-      else {
-        if (i > 0) {
-          if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) {
-            continue;
-          }
-          next += ',';
-        }
-      }
+/**
+ * Simplified assertion. Throws an error is `val` is falsey.
+ */
 
-      next += base64VLQ.encode(mapping.generatedColumn
-                                 - previousGeneratedColumn);
-      previousGeneratedColumn = mapping.generatedColumn;
+function assert(val, message) {
+  if (!val) throw new Error(message);
+}
 
-      if (mapping.source != null) {
-        sourceIdx = this._sources.indexOf(mapping.source);
-        next += base64VLQ.encode(sourceIdx - previousSource);
-        previousSource = sourceIdx;
+/**
+ * Expose `Node`
+ */
 
-        // lines are stored 0-based in SourceMap spec version 3
-        next += base64VLQ.encode(mapping.originalLine - 1
-                                   - previousOriginalLine);
-        previousOriginalLine = mapping.originalLine - 1;
+exports = module.exports = Node;
 
-        next += base64VLQ.encode(mapping.originalColumn
-                                   - previousOriginalColumn);
-        previousOriginalColumn = mapping.originalColumn;
 
-        if (mapping.name != null) {
-          nameIdx = this._names.indexOf(mapping.name);
-          next += base64VLQ.encode(nameIdx - previousName);
-          previousName = nameIdx;
-        }
-      }
+/***/ }),
 
-      result += next;
-    }
+/***/ "../../node_modules/snapdragon-node/node_modules/define-property/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    return result;
-  };
+"use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-SourceMapGenerator.prototype._generateSourcesContent =
-  function SourceMapGenerator_generateSourcesContent(aSources, aSourceRoot) {
-    return aSources.map(function (source) {
-      if (!this._sourcesContents) {
-        return null;
-      }
-      if (aSourceRoot != null) {
-        source = util.relative(aSourceRoot, source);
-      }
-      var key = util.toSetString(source);
-      return Object.prototype.hasOwnProperty.call(this._sourcesContents, key)
-        ? this._sourcesContents[key]
-        : null;
-    }, this);
-  };
 
-/**
- * Externalize the source map.
- */
-SourceMapGenerator.prototype.toJSON =
-  function SourceMapGenerator_toJSON() {
-    var map = {
-      version: this._version,
-      sources: this._sources.toArray(),
-      names: this._names.toArray(),
-      mappings: this._serializeMappings()
-    };
-    if (this._file != null) {
-      map.file = this._file;
-    }
-    if (this._sourceRoot != null) {
-      map.sourceRoot = this._sourceRoot;
-    }
-    if (this._sourcesContents) {
-      map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot);
-    }
 
-    return map;
-  };
+var isDescriptor = __webpack_require__("../../node_modules/is-descriptor/index.js");
 
-/**
- * Render the source map being generated to a string.
- */
-SourceMapGenerator.prototype.toString =
-  function SourceMapGenerator_toString() {
-    return JSON.stringify(this.toJSON());
-  };
+module.exports = function defineProperty(obj, prop, val) {
+  if (typeof obj !== 'object' && typeof obj !== 'function') {
+    throw new TypeError('expected an object or function.');
+  }
 
-exports.SourceMapGenerator = SourceMapGenerator;
+  if (typeof prop !== 'string') {
+    throw new TypeError('expected `prop` to be a string.');
+  }
+
+  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
+    return Object.defineProperty(obj, prop, val);
+  }
+
+  return Object.defineProperty(obj, prop, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
+};
 
 
 /***/ }),
-/* 676 */
+
+/***/ "../../node_modules/snapdragon-util/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Based on the Base 64 VLQ implementation in Closure Compiler:
- * https://code.google.com/p/closure-compiler/source/browse/trunk/src/com/google/debugging/sourcemap/Base64VLQ.java
- *
- * Copyright 2011 The Closure Compiler Authors. All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials provided
- *    with the distribution.
- *  * Neither the name of Google Inc. nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
+"use strict";
+
+
+var typeOf = __webpack_require__("../../node_modules/snapdragon-util/node_modules/kind-of/index.js");
+var utils = module.exports;
+
+/**
+ * Returns true if the given value is a node.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var node = new Node({type: 'foo'});
+ * console.log(utils.isNode(node)); //=> true
+ * console.log(utils.isNode({})); //=> false
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @returns {Boolean}
+ * @api public
  */
 
-var base64 = __webpack_require__(677);
-
-// 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,
-// the next four bits are the actual value, and the 6th bit is the
-// continuation bit. The continuation bit tells us whether there are more
-// digits in this value following this digit.
-//
-//   Continuation
-//   |    Sign
-//   |    |
-//   V    V
-//   101011
+utils.isNode = function(node) {
+  return typeOf(node) === 'object' && node.isNode === true;
+};
 
-var VLQ_BASE_SHIFT = 5;
+/**
+ * Emit an empty string for the given `node`.
+ *
+ * ```js
+ * // do nothing for beginning-of-string
+ * snapdragon.compiler.set('bos', utils.noop);
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @returns {undefined}
+ * @api public
+ */
 
-// binary: 100000
-var VLQ_BASE = 1 << VLQ_BASE_SHIFT;
+utils.noop = function(node) {
+  append(this, '', node);
+};
 
-// binary: 011111
-var VLQ_BASE_MASK = VLQ_BASE - 1;
+/**
+ * Appdend `node.val` to `compiler.output`, exactly as it was created
+ * by the parser.
+ *
+ * ```js
+ * snapdragon.compiler.set('text', utils.identity);
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @returns {undefined}
+ * @api public
+ */
 
-// binary: 100000
-var VLQ_CONTINUATION_BIT = VLQ_BASE;
+utils.identity = function(node) {
+  append(this, node.val, node);
+};
 
 /**
- * Converts from a two-complement value to a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
- *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
+ * Previously named `.emit`, this method appends the given `val`
+ * to `compiler.output` for the given node. Useful when you know
+ * what value should be appended advance, regardless of the actual
+ * value of `node.val`.
+ *
+ * ```js
+ * snapdragon.compiler
+ *   .set('i', function(node) {
+ *     this.mapVisit(node);
+ *   })
+ *   .set('i.open', utils.append('<i>'))
+ *   .set('i.close', utils.append('</i>'))
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @returns {Function} Returns a compiler middleware function.
+ * @api public
  */
-function toVLQSigned(aValue) {
-  return aValue < 0
-    ? ((-aValue) << 1) + 1
-    : (aValue << 1) + 0;
-}
+
+utils.append = function(val) {
+  return function(node) {
+    append(this, val, node);
+  };
+};
 
 /**
- * Converts to a two-complement value from a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
- *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
+ * Used in compiler middleware, this onverts an AST node into
+ * an empty `text` node and deletes `node.nodes` if it exists.
+ * The advantage of this method is that, as opposed to completely
+ * removing the node, indices will not need to be re-calculated
+ * in sibling nodes, and nothing is appended to the output.
+ *
+ * ```js
+ * utils.toNoop(node);
+ * // convert `node.nodes` to the given value instead of deleting it
+ * utils.toNoop(node, []);
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Array} `nodes` Optionally pass a new `nodes` value, to replace the existing `node.nodes` array.
+ * @api public
  */
-function fromVLQSigned(aValue) {
-  var isNegative = (aValue & 1) === 1;
-  var shifted = aValue >> 1;
-  return isNegative
-    ? -shifted
-    : shifted;
-}
+
+utils.toNoop = function(node, nodes) {
+  if (nodes) {
+    node.nodes = nodes;
+  } else {
+    delete node.nodes;
+    node.type = 'text';
+    node.val = '';
+  }
+};
 
 /**
- * Returns the base 64 VLQ encoded value.
+ * Visit `node` with the given `fn`. The built-in `.visit` method in snapdragon
+ * automatically calls registered compilers, this allows you to pass a visitor
+ * function.
+ *
+ * ```js
+ * snapdragon.compiler.set('i', function(node) {
+ *   utils.visit(node, function(childNode) {
+ *     // do stuff with "childNode"
+ *     return childNode;
+ *   });
+ * });
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Function} `fn`
+ * @return {Object} returns the node after recursively visiting all child nodes.
+ * @api public
  */
-exports.encode = function base64VLQ_encode(aValue) {
-  var encoded = "";
-  var digit;
 
-  var vlq = toVLQSigned(aValue);
+utils.visit = function(node, fn) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isFunction(fn), 'expected a visitor function');
+  fn(node);
+  return node.nodes ? utils.mapVisit(node, fn) : node;
+};
 
-  do {
-    digit = vlq & VLQ_BASE_MASK;
-    vlq >>>= VLQ_BASE_SHIFT;
-    if (vlq > 0) {
-      // There are still more digits in this value, so we must make sure the
-      // continuation bit is marked.
-      digit |= VLQ_CONTINUATION_BIT;
-    }
-    encoded += base64.encode(digit);
-  } while (vlq > 0);
+/**
+ * Map [visit](#visit) the given `fn` over `node.nodes`. This is called by
+ * [visit](#visit), use this method if you do not want `fn` to be called on
+ * the first node.
+ *
+ * ```js
+ * snapdragon.compiler.set('i', function(node) {
+ *   utils.mapVisit(node, function(childNode) {
+ *     // do stuff with "childNode"
+ *     return childNode;
+ *   });
+ * });
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Object} `options`
+ * @param {Function} `fn`
+ * @return {Object} returns the node
+ * @api public
+ */
 
-  return encoded;
+utils.mapVisit = function(node, fn) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isArray(node.nodes), 'expected node.nodes to be an array');
+  assert(isFunction(fn), 'expected a visitor function');
+
+  for (var i = 0; i < node.nodes.length; i++) {
+    utils.visit(node.nodes[i], fn);
+  }
+  return node;
 };
 
 /**
- * Decodes the next base 64 VLQ value from the given string and returns the
- * value and the rest of the string via the out parameter.
+ * Unshift an `*.open` node onto `node.nodes`.
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * snapdragon.parser.set('brace', function(node) {
+ *   var match = this.match(/^{/);
+ *   if (match) {
+ *     var parent = new Node({type: 'brace'});
+ *     utils.addOpen(parent, Node);
+ *     console.log(parent.nodes[0]):
+ *     // { type: 'brace.open', val: '' };
+ *
+ *     // push the parent "brace" node onto the stack
+ *     this.push(parent);
+ *
+ *     // return the parent node, so it's also added to the AST
+ *     return brace;
+ *   }
+ * });
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
+ * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
+ * @return {Object} Returns the created opening node.
+ * @api public
  */
-exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
-  var strLen = aStr.length;
-  var result = 0;
-  var shift = 0;
-  var continuation, digit;
 
-  do {
-    if (aIndex >= strLen) {
-      throw new Error("Expected more digits in base 64 VLQ value.");
-    }
+utils.addOpen = function(node, Node, val, filter) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isFunction(Node), 'expected Node to be a constructor function');
+
+  if (typeof val === 'function') {
+    filter = val;
+    val = '';
+  }
+
+  if (typeof filter === 'function' && !filter(node)) return;
+  var open = new Node({ type: node.type + '.open', val: val});
+  var unshift = node.unshift || node.unshiftNode;
+  if (typeof unshift === 'function') {
+    unshift.call(node, open);
+  } else {
+    utils.unshiftNode(node, open);
+  }
+  return open;
+};
+
+/**
+ * Push a `*.close` node onto `node.nodes`.
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * snapdragon.parser.set('brace', function(node) {
+ *   var match = this.match(/^}/);
+ *   if (match) {
+ *     var parent = this.parent();
+ *     if (parent.type !== 'brace') {
+ *       throw new Error('missing opening: ' + '}');
+ *     }
+ *
+ *     utils.addClose(parent, Node);
+ *     console.log(parent.nodes[parent.nodes.length - 1]):
+ *     // { type: 'brace.close', val: '' };
+ *
+ *     // no need to return a node, since the parent
+ *     // was already added to the AST
+ *     return;
+ *   }
+ * });
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
+ * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
+ * @return {Object} Returns the created closing node.
+ * @api public
+ */
 
-    digit = base64.decode(aStr.charCodeAt(aIndex++));
-    if (digit === -1) {
-      throw new Error("Invalid base64 digit: " + aStr.charAt(aIndex - 1));
-    }
+utils.addClose = function(node, Node, val, filter) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isFunction(Node), 'expected Node to be a constructor function');
 
-    continuation = !!(digit & VLQ_CONTINUATION_BIT);
-    digit &= VLQ_BASE_MASK;
-    result = result + (digit << shift);
-    shift += VLQ_BASE_SHIFT;
-  } while (continuation);
+  if (typeof val === 'function') {
+    filter = val;
+    val = '';
+  }
 
-  aOutParam.value = fromVLQSigned(result);
-  aOutParam.rest = aIndex;
+  if (typeof filter === 'function' && !filter(node)) return;
+  var close = new Node({ type: node.type + '.close', val: val});
+  var push = node.push || node.pushNode;
+  if (typeof push === 'function') {
+    push.call(node, close);
+  } else {
+    utils.pushNode(node, close);
+  }
+  return close;
 };
 
-
-/***/ }),
-/* 677 */
-/***/ (function(module, exports) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
+/**
+ * Wraps the given `node` with `*.open` and `*.close` nodes.
+ *
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Function} `Node` (required) Node constructor function from [snapdragon-node][].
+ * @param {Function} `filter` Optionaly specify a filter function to exclude the node.
+ * @return {Object} Returns the node
+ * @api public
  */
 
-var intToCharMap = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
+utils.wrapNodes = function(node, Node, filter) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isFunction(Node), 'expected Node to be a constructor function');
 
-/**
- * Encode an integer in the range of 0 to 63 to a single base 64 digit.
- */
-exports.encode = function (number) {
-  if (0 <= number && number < intToCharMap.length) {
-    return intToCharMap[number];
-  }
-  throw new TypeError("Must be between 0 and 63: " + number);
+  utils.addOpen(node, Node, filter);
+  utils.addClose(node, Node, filter);
+  return node;
 };
 
 /**
- * Decode a single base 64 character code digit to an integer. Returns -1 on
- * failure.
+ * Push the given `node` onto `parent.nodes`, and set `parent` as `node.parent.
+ *
+ * ```js
+ * var parent = new Node({type: 'foo'});
+ * var node = new Node({type: 'bar'});
+ * utils.pushNode(parent, node);
+ * console.log(parent.nodes[0].type) // 'bar'
+ * console.log(node.parent.type) // 'foo'
+ * ```
+ * @param {Object} `parent`
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Object} Returns the child node
+ * @api public
  */
-exports.decode = function (charCode) {
-  var bigA = 65;     // 'A'
-  var bigZ = 90;     // 'Z'
 
-  var littleA = 97;  // 'a'
-  var littleZ = 122; // 'z'
+utils.pushNode = function(parent, node) {
+  assert(utils.isNode(parent), 'expected parent node to be an instance of Node');
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-  var zero = 48;     // '0'
-  var nine = 57;     // '9'
+  node.define('parent', parent);
+  parent.nodes = parent.nodes || [];
+  parent.nodes.push(node);
+  return node;
+};
 
-  var plus = 43;     // '+'
-  var slash = 47;    // '/'
+/**
+ * Unshift `node` onto `parent.nodes`, and set `parent` as `node.parent.
+ *
+ * ```js
+ * var parent = new Node({type: 'foo'});
+ * var node = new Node({type: 'bar'});
+ * utils.unshiftNode(parent, node);
+ * console.log(parent.nodes[0].type) // 'bar'
+ * console.log(node.parent.type) // 'foo'
+ * ```
+ * @param {Object} `parent`
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {undefined}
+ * @api public
+ */
 
-  var littleOffset = 26;
-  var numberOffset = 52;
+utils.unshiftNode = function(parent, node) {
+  assert(utils.isNode(parent), 'expected parent node to be an instance of Node');
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-  // 0 - 25: ABCDEFGHIJKLMNOPQRSTUVWXYZ
-  if (bigA <= charCode && charCode <= bigZ) {
-    return (charCode - bigA);
-  }
+  node.define('parent', parent);
+  parent.nodes = parent.nodes || [];
+  parent.nodes.unshift(node);
+};
 
-  // 26 - 51: abcdefghijklmnopqrstuvwxyz
-  if (littleA <= charCode && charCode <= littleZ) {
-    return (charCode - littleA + littleOffset);
-  }
+/**
+ * Pop the last `node` off of `parent.nodes`. The advantage of
+ * using this method is that it checks for `node.nodes` and works
+ * with any version of `snapdragon-node`.
+ *
+ * ```js
+ * var parent = new Node({type: 'foo'});
+ * utils.pushNode(parent, new Node({type: 'foo'}));
+ * utils.pushNode(parent, new Node({type: 'bar'}));
+ * utils.pushNode(parent, new Node({type: 'baz'}));
+ * console.log(parent.nodes.length); //=> 3
+ * utils.popNode(parent);
+ * console.log(parent.nodes.length); //=> 2
+ * ```
+ * @param {Object} `parent`
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Number|Undefined} Returns the length of `node.nodes` or undefined.
+ * @api public
+ */
 
-  // 52 - 61: 0123456789
-  if (zero <= charCode && charCode <= nine) {
-    return (charCode - zero + numberOffset);
+utils.popNode = function(node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  if (typeof node.pop === 'function') {
+    return node.pop();
   }
+  return node.nodes && node.nodes.pop();
+};
 
-  // 62: +
-  if (charCode == plus) {
-    return 62;
-  }
+/**
+ * Shift the first `node` off of `parent.nodes`. The advantage of
+ * using this method is that it checks for `node.nodes` and works
+ * with any version of `snapdragon-node`.
+ *
+ * ```js
+ * var parent = new Node({type: 'foo'});
+ * utils.pushNode(parent, new Node({type: 'foo'}));
+ * utils.pushNode(parent, new Node({type: 'bar'}));
+ * utils.pushNode(parent, new Node({type: 'baz'}));
+ * console.log(parent.nodes.length); //=> 3
+ * utils.shiftNode(parent);
+ * console.log(parent.nodes.length); //=> 2
+ * ```
+ * @param {Object} `parent`
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Number|Undefined} Returns the length of `node.nodes` or undefined.
+ * @api public
+ */
 
-  // 63: /
-  if (charCode == slash) {
-    return 63;
+utils.shiftNode = function(node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  if (typeof node.shift === 'function') {
+    return node.shift();
   }
-
-  // Invalid base64 digit.
-  return -1;
+  return node.nodes && node.nodes.shift();
 };
 
-
-/***/ }),
-/* 678 */
-/***/ (function(module, exports) {
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
 /**
- * This is a helper function for getting values from parameter/options
- * objects.
+ * Remove the specified `node` from `parent.nodes`.
  *
- * @param args The object we are extracting values from
- * @param name The name of the property we are getting.
- * @param defaultValue An optional value to return if the property is missing
- * from the object. If this is not specified and the property is missing, an
- * error will be thrown.
+ * ```js
+ * var parent = new Node({type: 'abc'});
+ * var foo = new Node({type: 'foo'});
+ * utils.pushNode(parent, foo);
+ * utils.pushNode(parent, new Node({type: 'bar'}));
+ * utils.pushNode(parent, new Node({type: 'baz'}));
+ * console.log(parent.nodes.length); //=> 3
+ * utils.removeNode(parent, foo);
+ * console.log(parent.nodes.length); //=> 2
+ * ```
+ * @param {Object} `parent`
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Object|undefined} Returns the removed node, if successful, or undefined if it does not exist on `parent.nodes`.
+ * @api public
  */
-function getArg(aArgs, aName, aDefaultValue) {
-  if (aName in aArgs) {
-    return aArgs[aName];
-  } else if (arguments.length === 3) {
-    return aDefaultValue;
-  } else {
-    throw new Error('"' + aName + '" is a required argument.');
-  }
-}
-exports.getArg = getArg;
 
-var urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.]*)(?::(\d+))?(\S*)$/;
-var dataUrlRegexp = /^data:.+\,.+$/;
+utils.removeNode = function(parent, node) {
+  assert(utils.isNode(parent), 'expected parent.node to be an instance of Node');
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-function urlParse(aUrl) {
-  var match = aUrl.match(urlRegexp);
-  if (!match) {
+  if (!parent.nodes) {
     return null;
   }
-  return {
-    scheme: match[1],
-    auth: match[2],
-    host: match[3],
-    port: match[4],
-    path: match[5]
-  };
-}
-exports.urlParse = urlParse;
 
-function urlGenerate(aParsedUrl) {
-  var url = '';
-  if (aParsedUrl.scheme) {
-    url += aParsedUrl.scheme + ':';
-  }
-  url += '//';
-  if (aParsedUrl.auth) {
-    url += aParsedUrl.auth + '@';
-  }
-  if (aParsedUrl.host) {
-    url += aParsedUrl.host;
-  }
-  if (aParsedUrl.port) {
-    url += ":" + aParsedUrl.port
+  if (typeof parent.remove === 'function') {
+    return parent.remove(node);
   }
-  if (aParsedUrl.path) {
-    url += aParsedUrl.path;
+
+  var idx = parent.nodes.indexOf(node);
+  if (idx !== -1) {
+    return parent.nodes.splice(idx, 1);
   }
-  return url;
-}
-exports.urlGenerate = urlGenerate;
+};
 
 /**
- * Normalizes a path, or the path portion of a URL:
- *
- * - Replaces consecutive slashes with one slash.
- * - Removes unnecessary '.' parts.
- * - Removes unnecessary '<dir>/..' parts.
- *
- * Based on code in the Node.js 'path' core module.
+ * Returns true if `node.type` matches the given `type`. Throws a
+ * `TypeError` if `node` is not an instance of `Node`.
  *
- * @param aPath The path or url to normalize.
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var node = new Node({type: 'foo'});
+ * console.log(utils.isType(node, 'foo')); // false
+ * console.log(utils.isType(node, 'bar')); // true
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {String} `type`
+ * @return {Boolean}
+ * @api public
  */
-function normalize(aPath) {
-  var path = aPath;
-  var url = urlParse(aPath);
-  if (url) {
-    if (!url.path) {
-      return aPath;
-    }
-    path = url.path;
-  }
-  var isAbsolute = exports.isAbsolute(path);
 
-  var parts = path.split(/\/+/);
-  for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
-    part = parts[i];
-    if (part === '.') {
-      parts.splice(i, 1);
-    } else if (part === '..') {
-      up++;
-    } else if (up > 0) {
-      if (part === '') {
-        // The first part is blank if the path is absolute. Trying to go
-        // above the root is a no-op. Therefore we can remove all '..' parts
-        // directly after the root.
-        parts.splice(i + 1, up);
-        up = 0;
-      } else {
-        parts.splice(i, 2);
-        up--;
+utils.isType = function(node, type) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  switch (typeOf(type)) {
+    case 'array':
+      var types = type.slice();
+      for (var i = 0; i < types.length; i++) {
+        if (utils.isType(node, types[i])) {
+          return true;
+        }
       }
+      return false;
+    case 'string':
+      return node.type === type;
+    case 'regexp':
+      return type.test(node.type);
+    default: {
+      throw new TypeError('expected "type" to be an array, string or regexp');
     }
   }
-  path = parts.join('/');
+};
 
-  if (path === '') {
-    path = isAbsolute ? '/' : '.';
-  }
+/**
+ * Returns true if the given `node` has the given `type` in `node.nodes`.
+ * Throws a `TypeError` if `node` is not an instance of `Node`.
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var node = new Node({
+ *   type: 'foo',
+ *   nodes: [
+ *     new Node({type: 'bar'}),
+ *     new Node({type: 'baz'})
+ *   ]
+ * });
+ * console.log(utils.hasType(node, 'xyz')); // false
+ * console.log(utils.hasType(node, 'baz')); // true
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {String} `type`
+ * @return {Boolean}
+ * @api public
+ */
 
-  if (url) {
-    url.path = path;
-    return urlGenerate(url);
+utils.hasType = function(node, type) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  if (!Array.isArray(node.nodes)) return false;
+  for (var i = 0; i < node.nodes.length; i++) {
+    if (utils.isType(node.nodes[i], type)) {
+      return true;
+    }
   }
-  return path;
-}
-exports.normalize = normalize;
+  return false;
+};
 
 /**
- * Joins two paths/URLs.
+ * Returns the first node from `node.nodes` of the given `type`
  *
- * @param aRoot The root path or URL.
- * @param aPath The path or URL to be joined with the root.
+ * ```js
+ * var node = new Node({
+ *   type: 'foo',
+ *   nodes: [
+ *     new Node({type: 'text', val: 'abc'}),
+ *     new Node({type: 'text', val: 'xyz'})
+ *   ]
+ * });
  *
- * - If aPath is a URL or a data URI, aPath is returned, unless aPath is a
- *   scheme-relative URL: Then the scheme of aRoot, if any, is prepended
- *   first.
- * - Otherwise aPath is a path. If aRoot is a URL, then its path portion
- *   is updated with the result and aRoot is returned. Otherwise the result
- *   is returned.
- *   - If aPath is absolute, the result is aPath.
- *   - Otherwise the two paths are joined with a slash.
- * - Joining for example 'http://' and 'www.example.com' is also supported.
+ * var textNode = utils.firstOfType(node.nodes, 'text');
+ * console.log(textNode.val);
+ * //=> 'abc'
+ * ```
+ * @param {Array} `nodes`
+ * @param {String} `type`
+ * @return {Object|undefined} Returns the first matching node or undefined.
+ * @api public
  */
-function join(aRoot, aPath) {
-  if (aRoot === "") {
-    aRoot = ".";
-  }
-  if (aPath === "") {
-    aPath = ".";
-  }
-  var aPathUrl = urlParse(aPath);
-  var aRootUrl = urlParse(aRoot);
-  if (aRootUrl) {
-    aRoot = aRootUrl.path || '/';
-  }
 
-  // `join(foo, '//www.example.org')`
-  if (aPathUrl && !aPathUrl.scheme) {
-    if (aRootUrl) {
-      aPathUrl.scheme = aRootUrl.scheme;
+utils.firstOfType = function(nodes, type) {
+  for (var i = 0; i < nodes.length; i++) {
+    var node = nodes[i];
+    if (utils.isType(node, type)) {
+      return node;
     }
-    return urlGenerate(aPathUrl);
-  }
-
-  if (aPathUrl || aPath.match(dataUrlRegexp)) {
-    return aPath;
-  }
-
-  // `join('http://', 'www.example.com')`
-  if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
-    aRootUrl.host = aPath;
-    return urlGenerate(aRootUrl);
-  }
-
-  var joined = aPath.charAt(0) === '/'
-    ? aPath
-    : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath);
-
-  if (aRootUrl) {
-    aRootUrl.path = joined;
-    return urlGenerate(aRootUrl);
   }
-  return joined;
-}
-exports.join = join;
-
-exports.isAbsolute = function (aPath) {
-  return aPath.charAt(0) === '/' || !!aPath.match(urlRegexp);
 };
 
 /**
- * Make a path relative to a URL or another path.
+ * Returns the node at the specified index, or the first node of the
+ * given `type` from `node.nodes`.
  *
- * @param aRoot The root path or URL.
- * @param aPath The path or URL to be made relative to aRoot.
+ * ```js
+ * var node = new Node({
+ *   type: 'foo',
+ *   nodes: [
+ *     new Node({type: 'text', val: 'abc'}),
+ *     new Node({type: 'text', val: 'xyz'})
+ *   ]
+ * });
+ *
+ * var nodeOne = utils.findNode(node.nodes, 'text');
+ * console.log(nodeOne.val);
+ * //=> 'abc'
+ *
+ * var nodeTwo = utils.findNode(node.nodes, 1);
+ * console.log(nodeTwo.val);
+ * //=> 'xyz'
+ * ```
+ *
+ * @param {Array} `nodes`
+ * @param {String|Number} `type` Node type or index.
+ * @return {Object} Returns a node or undefined.
+ * @api public
  */
-function relative(aRoot, aPath) {
-  if (aRoot === "") {
-    aRoot = ".";
-  }
-
-  aRoot = aRoot.replace(/\/$/, '');
-
-  // It is possible for the path to be above the root. In this case, simply
-  // checking whether the root is a prefix of the path won't work. Instead, we
-  // need to remove components from the root one by one, until either we find
-  // a prefix that fits, or we run out of components to remove.
-  var level = 0;
-  while (aPath.indexOf(aRoot + '/') !== 0) {
-    var index = aRoot.lastIndexOf("/");
-    if (index < 0) {
-      return aPath;
-    }
-
-    // If the only part of the root that is left is the scheme (i.e. http://,
-    // file:///, etc.), one or more slashes (/), or simply nothing at all, we
-    // have exhausted all components, so the path is not relative to the root.
-    aRoot = aRoot.slice(0, index);
-    if (aRoot.match(/^([^\/]+:\/)?\/*$/)) {
-      return aPath;
-    }
 
-    ++level;
+utils.findNode = function(nodes, type) {
+  if (!Array.isArray(nodes)) {
+    return null;
   }
+  if (typeof type === 'number') {
+    return nodes[type];
+  }
+  return utils.firstOfType(nodes, type);
+};
 
-  // Make sure we add a "../" for each component we removed from the root.
-  return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
-}
-exports.relative = relative;
-
-var supportsNullProto = (function () {
-  var obj = Object.create(null);
-  return !('__proto__' in obj);
-}());
+/**
+ * Returns true if the given node is an "*.open" node.
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var brace = new Node({type: 'brace'});
+ * var open = new Node({type: 'brace.open'});
+ * var close = new Node({type: 'brace.close'});
+ *
+ * console.log(utils.isOpen(brace)); // false
+ * console.log(utils.isOpen(open)); // true
+ * console.log(utils.isOpen(close)); // false
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Boolean}
+ * @api public
+ */
 
-function identity (s) {
-  return s;
-}
+utils.isOpen = function(node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  return node.type.slice(-5) === '.open';
+};
 
 /**
- * Because behavior goes wacky when you set `__proto__` on objects, we
- * have to prefix all the strings in our set with an arbitrary character.
+ * Returns true if the given node is a "*.close" node.
  *
- * See https://github.com/mozilla/source-map/pull/31 and
- * https://github.com/mozilla/source-map/issues/30
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var brace = new Node({type: 'brace'});
+ * var open = new Node({type: 'brace.open'});
+ * var close = new Node({type: 'brace.close'});
  *
- * @param String aStr
+ * console.log(utils.isClose(brace)); // false
+ * console.log(utils.isClose(open)); // false
+ * console.log(utils.isClose(close)); // true
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Boolean}
+ * @api public
  */
-function toSetString(aStr) {
-  if (isProtoString(aStr)) {
-    return '$' + aStr;
-  }
-
-  return aStr;
-}
-exports.toSetString = supportsNullProto ? identity : toSetString;
 
-function fromSetString(aStr) {
-  if (isProtoString(aStr)) {
-    return aStr.slice(1);
-  }
+utils.isClose = function(node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  return node.type.slice(-6) === '.close';
+};
 
-  return aStr;
-}
-exports.fromSetString = supportsNullProto ? identity : fromSetString;
+/**
+ * Returns true if `node.nodes` **has** an `.open` node
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var brace = new Node({
+ *   type: 'brace',
+ *   nodes: []
+ * });
+ *
+ * var open = new Node({type: 'brace.open'});
+ * console.log(utils.hasOpen(brace)); // false
+ *
+ * brace.pushNode(open);
+ * console.log(utils.hasOpen(brace)); // true
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Boolean}
+ * @api public
+ */
 
-function isProtoString(s) {
-  if (!s) {
-    return false;
+utils.hasOpen = function(node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  var first = node.first || node.nodes ? node.nodes[0] : null;
+  if (utils.isNode(first)) {
+    return first.type === node.type + '.open';
   }
+  return false;
+};
 
-  var length = s.length;
-
-  if (length < 9 /* "__proto__".length */) {
-    return false;
-  }
+/**
+ * Returns true if `node.nodes` **has** a `.close` node
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var brace = new Node({
+ *   type: 'brace',
+ *   nodes: []
+ * });
+ *
+ * var close = new Node({type: 'brace.close'});
+ * console.log(utils.hasClose(brace)); // false
+ *
+ * brace.pushNode(close);
+ * console.log(utils.hasClose(brace)); // true
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Boolean}
+ * @api public
+ */
 
-  if (s.charCodeAt(length - 1) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 2) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 3) !== 111 /* 'o' */ ||
-      s.charCodeAt(length - 4) !== 116 /* 't' */ ||
-      s.charCodeAt(length - 5) !== 111 /* 'o' */ ||
-      s.charCodeAt(length - 6) !== 114 /* 'r' */ ||
-      s.charCodeAt(length - 7) !== 112 /* 'p' */ ||
-      s.charCodeAt(length - 8) !== 95  /* '_' */ ||
-      s.charCodeAt(length - 9) !== 95  /* '_' */) {
-    return false;
+utils.hasClose = function(node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  var last = node.last || node.nodes ? node.nodes[node.nodes.length - 1] : null;
+  if (utils.isNode(last)) {
+    return last.type === node.type + '.close';
   }
+  return false;
+};
 
-  for (var i = length - 10; i >= 0; i--) {
-    if (s.charCodeAt(i) !== 36 /* '$' */) {
-      return false;
-    }
-  }
+/**
+ * Returns true if `node.nodes` has both `.open` and `.close` nodes
+ *
+ * ```js
+ * var Node = require('snapdragon-node');
+ * var brace = new Node({
+ *   type: 'brace',
+ *   nodes: []
+ * });
+ *
+ * var open = new Node({type: 'brace.open'});
+ * var close = new Node({type: 'brace.close'});
+ * console.log(utils.hasOpen(brace)); // false
+ * console.log(utils.hasClose(brace)); // false
+ *
+ * brace.pushNode(open);
+ * brace.pushNode(close);
+ * console.log(utils.hasOpen(brace)); // true
+ * console.log(utils.hasClose(brace)); // true
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Boolean}
+ * @api public
+ */
 
-  return true;
-}
+utils.hasOpenAndClose = function(node) {
+  return utils.hasOpen(node) && utils.hasClose(node);
+};
 
 /**
- * Comparator between two mappings where the original positions are compared.
+ * Push the given `node` onto the `state.inside` array for the
+ * given type. This array is used as a specialized "stack" for
+ * only the given `node.type`.
  *
- * Optionally pass in `true` as `onlyCompareGenerated` to consider two
- * mappings with the same original source/line/column, but different generated
- * line and column the same. Useful when searching for a mapping with a
- * stubbed out mapping.
+ * ```js
+ * var state = { inside: {}};
+ * var node = new Node({type: 'brace'});
+ * utils.addType(state, node);
+ * console.log(state.inside);
+ * //=> { brace: [{type: 'brace'}] }
+ * ```
+ * @param {Object} `state` The `compiler.state` object or custom state object.
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Array} Returns the `state.inside` stack for the given type.
+ * @api public
  */
-function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) {
-  var cmp = mappingA.source - mappingB.source;
-  if (cmp !== 0) {
-    return cmp;
-  }
 
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
+utils.addType = function(state, node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isObject(state), 'expected state to be an object');
 
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0 || onlyCompareOriginal) {
-    return cmp;
-  }
+  var type = node.parent
+    ? node.parent.type
+    : node.type.replace(/\.open$/, '');
 
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0) {
-    return cmp;
+  if (!state.hasOwnProperty('inside')) {
+    state.inside = {};
   }
-
-  cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
+  if (!state.inside.hasOwnProperty(type)) {
+    state.inside[type] = [];
   }
 
-  return mappingA.name - mappingB.name;
-}
-exports.compareByOriginalPositions = compareByOriginalPositions;
+  var arr = state.inside[type];
+  arr.push(node);
+  return arr;
+};
 
 /**
- * Comparator between two mappings with deflated source and name indices where
- * the generated positions are compared.
+ * Remove the given `node` from the `state.inside` array for the
+ * given type. This array is used as a specialized "stack" for
+ * only the given `node.type`.
  *
- * Optionally pass in `true` as `onlyCompareGenerated` to consider two
- * mappings with the same generated line and column, but different
- * source/name/original line and column the same. Useful when searching for a
- * mapping with a stubbed out mapping.
+ * ```js
+ * var state = { inside: {}};
+ * var node = new Node({type: 'brace'});
+ * utils.addType(state, node);
+ * console.log(state.inside);
+ * //=> { brace: [{type: 'brace'}] }
+ * utils.removeType(state, node);
+ * //=> { brace: [] }
+ * ```
+ * @param {Object} `state` The `compiler.state` object or custom state object.
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @return {Array} Returns the `state.inside` stack for the given type.
+ * @api public
  */
-function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) {
-  var cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
 
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0 || onlyCompareGenerated) {
-    return cmp;
-  }
+utils.removeType = function(state, node) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isObject(state), 'expected state to be an object');
 
-  cmp = mappingA.source - mappingB.source;
-  if (cmp !== 0) {
-    return cmp;
-  }
+  var type = node.parent
+    ? node.parent.type
+    : node.type.replace(/\.close$/, '');
 
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
+  if (state.inside.hasOwnProperty(type)) {
+    return state.inside[type].pop();
   }
+};
 
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
+/**
+ * Returns true if `node.val` is an empty string, or `node.nodes` does
+ * not contain any non-empty text nodes.
+ *
+ * ```js
+ * var node = new Node({type: 'text'});
+ * utils.isEmpty(node); //=> true
+ * node.val = 'foo';
+ * utils.isEmpty(node); //=> false
+ * ```
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {Function} `fn`
+ * @return {Boolean}
+ * @api public
+ */
 
-  return mappingA.name - mappingB.name;
-}
-exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated;
+utils.isEmpty = function(node, fn) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
 
-function strcmp(aStr1, aStr2) {
-  if (aStr1 === aStr2) {
-    return 0;
+  if (!Array.isArray(node.nodes)) {
+    if (node.type !== 'text') {
+      return true;
+    }
+    if (typeof fn === 'function') {
+      return fn(node, node.parent);
+    }
+    return !utils.trim(node.val);
   }
 
-  if (aStr1 > aStr2) {
-    return 1;
+  for (var i = 0; i < node.nodes.length; i++) {
+    var child = node.nodes[i];
+    if (utils.isOpen(child) || utils.isClose(child)) {
+      continue;
+    }
+    if (!utils.isEmpty(child, fn)) {
+      return false;
+    }
   }
 
-  return -1;
-}
+  return true;
+};
 
 /**
- * Comparator between two mappings with inflated source and name strings where
- * the generated positions are compared.
+ * Returns true if the `state.inside` stack for the given type exists
+ * and has one or more nodes on it.
+ *
+ * ```js
+ * var state = { inside: {}};
+ * var node = new Node({type: 'brace'});
+ * console.log(utils.isInsideType(state, 'brace')); //=> false
+ * utils.addType(state, node);
+ * console.log(utils.isInsideType(state, 'brace')); //=> true
+ * utils.removeType(state, node);
+ * console.log(utils.isInsideType(state, 'brace')); //=> false
+ * ```
+ * @param {Object} `state`
+ * @param {String} `type`
+ * @return {Boolean}
+ * @api public
  */
-function compareByGeneratedPositionsInflated(mappingA, mappingB) {
-  var cmp = mappingA.generatedLine - mappingB.generatedLine;
-  if (cmp !== 0) {
-    return cmp;
-  }
 
-  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
+utils.isInsideType = function(state, type) {
+  assert(isObject(state), 'expected state to be an object');
+  assert(isString(type), 'expected type to be a string');
 
-  cmp = strcmp(mappingA.source, mappingB.source);
-  if (cmp !== 0) {
-    return cmp;
+  if (!state.hasOwnProperty('inside')) {
+    return false;
   }
 
-  cmp = mappingA.originalLine - mappingB.originalLine;
-  if (cmp !== 0) {
-    return cmp;
+  if (!state.inside.hasOwnProperty(type)) {
+    return false;
   }
 
-  cmp = mappingA.originalColumn - mappingB.originalColumn;
-  if (cmp !== 0) {
-    return cmp;
-  }
+  return state.inside[type].length > 0;
+};
 
-  return strcmp(mappingA.name, mappingB.name);
-}
-exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated;
+/**
+ * Returns true if `node` is either a child or grand-child of the given `type`,
+ * or `state.inside[type]` is a non-empty array.
+ *
+ * ```js
+ * var state = { inside: {}};
+ * var node = new Node({type: 'brace'});
+ * var open = new Node({type: 'brace.open'});
+ * console.log(utils.isInside(state, open, 'brace')); //=> false
+ * utils.pushNode(node, open);
+ * console.log(utils.isInside(state, open, 'brace')); //=> true
+ * ```
+ * @param {Object} `state` Either the `compiler.state` object, if it exists, or a user-supplied state object.
+ * @param {Object} `node` Instance of [snapdragon-node][]
+ * @param {String} `type` The `node.type` to check for.
+ * @return {Boolean}
+ * @api public
+ */
 
+utils.isInside = function(state, node, type) {
+  assert(utils.isNode(node), 'expected node to be an instance of Node');
+  assert(isObject(state), 'expected state to be an object');
 
-/***/ }),
-/* 679 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (Array.isArray(type)) {
+    for (var i = 0; i < type.length; i++) {
+      if (utils.isInside(state, node, type[i])) {
+        return true;
+      }
+    }
+    return false;
+  }
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
+  var parent = node.parent;
+  if (typeof type === 'string') {
+    return (parent && parent.type === type) || utils.isInsideType(state, type);
+  }
 
-var util = __webpack_require__(678);
-var has = Object.prototype.hasOwnProperty;
-var hasNativeMap = typeof Map !== "undefined";
+  if (typeOf(type) === 'regexp') {
+    if (parent && parent.type && type.test(parent.type)) {
+      return true;
+    }
 
-/**
- * A data structure which is a combination of an array and a set. Adding a new
- * member is O(1), testing for membership is O(1), and finding the index of an
- * element is O(1). Removing elements from the set is not supported. Only
- * strings are supported for membership.
- */
-function ArraySet() {
-  this._array = [];
-  this._set = hasNativeMap ? new Map() : Object.create(null);
-}
+    var keys = Object.keys(state.inside);
+    var len = keys.length;
+    var idx = -1;
+    while (++idx < len) {
+      var key = keys[idx];
+      var val = state.inside[key];
 
-/**
- * Static method for creating ArraySet instances from an existing array.
- */
-ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
-  var set = new ArraySet();
-  for (var i = 0, len = aArray.length; i < len; i++) {
-    set.add(aArray[i], aAllowDuplicates);
+      if (Array.isArray(val) && val.length !== 0 && type.test(key)) {
+        return true;
+      }
+    }
   }
-  return set;
+  return false;
 };
 
 /**
- * Return how many unique items are in this ArraySet. If duplicates have been
- * added, than those do not count towards the size.
+ * Get the last `n` element from the given `array`. Used for getting
+ * a node from `node.nodes.`
  *
- * @returns Number
+ * @param {Array} `array`
+ * @param {Number} `n`
+ * @return {undefined}
+ * @api public
  */
-ArraySet.prototype.size = function ArraySet_size() {
-  return hasNativeMap ? this._set.size : Object.getOwnPropertyNames(this._set).length;
-};
 
-/**
- * Add the given string to this set.
- *
- * @param String aStr
- */
-ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
-  var sStr = hasNativeMap ? aStr : util.toSetString(aStr);
-  var isDuplicate = hasNativeMap ? this.has(aStr) : has.call(this._set, sStr);
-  var idx = this._array.length;
-  if (!isDuplicate || aAllowDuplicates) {
-    this._array.push(aStr);
-  }
-  if (!isDuplicate) {
-    if (hasNativeMap) {
-      this._set.set(aStr, idx);
-    } else {
-      this._set[sStr] = idx;
-    }
-  }
+utils.last = function(arr, n) {
+  return arr[arr.length - (n || 1)];
 };
 
 /**
- * Is the given string a member of this set?
+ * Cast the given `val` to an array.
  *
- * @param String aStr
- */
-ArraySet.prototype.has = function ArraySet_has(aStr) {
-  if (hasNativeMap) {
-    return this._set.has(aStr);
-  } else {
-    var sStr = util.toSetString(aStr);
-    return has.call(this._set, sStr);
+ * ```js
+ * console.log(utils.arrayify(''));
+ * //=> []
+ * console.log(utils.arrayify('foo'));
+ * //=> ['foo']
+ * console.log(utils.arrayify(['foo']));
+ * //=> ['foo']
+ * ```
+ * @param {any} `val`
+ * @return {Array}
+ * @api public
+ */
+
+utils.arrayify = function(val) {
+  if (typeof val === 'string' && val !== '') {
+    return [val];
+  }
+  if (!Array.isArray(val)) {
+    return [];
   }
+  return val;
 };
 
 /**
- * What is the index of the given string in the array?
+ * Convert the given `val` to a string by joining with `,`. Useful
+ * for creating a cheerio/CSS/DOM-style selector from a list of strings.
  *
- * @param String aStr
+ * @param {any} `val`
+ * @return {Array}
+ * @api public
  */
-ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
-  if (hasNativeMap) {
-    var idx = this._set.get(aStr);
-    if (idx >= 0) {
-        return idx;
-    }
-  } else {
-    var sStr = util.toSetString(aStr);
-    if (has.call(this._set, sStr)) {
-      return this._set[sStr];
-    }
-  }
 
-  throw new Error('"' + aStr + '" is not in the set.');
+utils.stringify = function(val) {
+  return utils.arrayify(val).join(',');
 };
 
 /**
- * What is the element at the given index?
+ * Ensure that the given value is a string and call `.trim()` on it,
+ * or return an empty string.
  *
- * @param Number aIdx
+ * @param {String} `str`
+ * @return {String}
+ * @api public
  */
-ArraySet.prototype.at = function ArraySet_at(aIdx) {
-  if (aIdx >= 0 && aIdx < this._array.length) {
-    return this._array[aIdx];
-  }
-  throw new Error('No element indexed by ' + aIdx);
+
+utils.trim = function(str) {
+  return typeof str === 'string' ? str.trim() : '';
 };
 
 /**
- * Returns the array representation of this set (which has the proper indices
- * indicated by indexOf). Note that this is a copy of the internal array used
- * for storing the members so that no one can mess with internal state.
+ * Return true if val is an object
  */
-ArraySet.prototype.toArray = function ArraySet_toArray() {
-  return this._array.slice();
-};
 
-exports.ArraySet = ArraySet;
+function isObject(val) {
+  return typeOf(val) === 'object';
+}
 
+/**
+ * Return true if val is a string
+ */
 
-/***/ }),
-/* 680 */
-/***/ (function(module, exports, __webpack_require__) {
+function isString(val) {
+  return typeof val === 'string';
+}
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2014 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
+/**
+ * Return true if val is a function
  */
 
-var util = __webpack_require__(678);
+function isFunction(val) {
+  return typeof val === 'function';
+}
 
 /**
- * Determine whether mappingB is after mappingA with respect to generated
- * position.
+ * Return true if val is an array
  */
-function generatedPositionAfter(mappingA, mappingB) {
-  // Optimized for most common case
-  var lineA = mappingA.generatedLine;
-  var lineB = mappingB.generatedLine;
-  var columnA = mappingA.generatedColumn;
-  var columnB = mappingB.generatedColumn;
-  return lineB > lineA || lineB == lineA && columnB >= columnA ||
-         util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0;
+
+function isArray(val) {
+  return Array.isArray(val);
 }
 
 /**
- * A data structure to provide a sorted view of accumulated mappings in a
- * performance conscious manner. It trades a neglibable overhead in general
- * case for a large speedup in case of mappings being added in order.
+ * Shim to ensure the `.append` methods work with any version of snapdragon
  */
-function MappingList() {
-  this._array = [];
-  this._sorted = true;
-  // Serves as infimum
-  this._last = {generatedLine: -1, generatedColumn: 0};
+
+function append(compiler, val, node) {
+  if (typeof compiler.append !== 'function') {
+    return compiler.emit(val, node);
+  }
+  return compiler.append(val, node);
 }
 
 /**
- * Iterate through internal items. This method takes the same arguments that
- * `Array.prototype.forEach` takes.
- *
- * NOTE: The order of the mappings is NOT guaranteed.
+ * Simplified assertion. Throws an error is `val` is falsey.
  */
-MappingList.prototype.unsortedForEach =
-  function MappingList_forEach(aCallback, aThisArg) {
-    this._array.forEach(aCallback, aThisArg);
-  };
+
+function assert(val, message) {
+  if (!val) throw new Error(message);
+}
+
+
+/***/ }),
+
+/***/ "../../node_modules/snapdragon-util/node_modules/kind-of/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
 
 /**
- * Add the given source mapping.
+ * Get the native `typeof` a value.
  *
- * @param Object aMapping
+ * @param  {*} `val`
+ * @return {*} Native javascript type
  */
-MappingList.prototype.add = function MappingList_add(aMapping) {
-  if (generatedPositionAfter(this._last, aMapping)) {
-    this._last = aMapping;
-    this._array.push(aMapping);
-  } else {
-    this._sorted = false;
-    this._array.push(aMapping);
+
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
   }
-};
 
-/**
- * Returns the flat, sorted array of mappings. The mappings are sorted by
- * generated position.
- *
- * WARNING: This method returns internal data without copying, for
- * performance. The return value must NOT be mutated, and should be treated as
- * an immutable borrow. If you want to take ownership, you must make your own
- * copy.
- */
-MappingList.prototype.toArray = function MappingList_toArray() {
-  if (!this._sorted) {
-    this._array.sort(util.compareByGeneratedPositionsInflated);
-    this._sorted = true;
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
   }
-  return this._array;
-};
 
-exports.MappingList = MappingList;
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-/***/ }),
-/* 681 */
-/***/ (function(module, exports, __webpack_require__) {
+  // other objects
+  var type = toString.call(val);
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
 
-var util = __webpack_require__(678);
-var binarySearch = __webpack_require__(682);
-var ArraySet = __webpack_require__(679).ArraySet;
-var base64VLQ = __webpack_require__(676);
-var quickSort = __webpack_require__(683).quickSort;
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-function SourceMapConsumer(aSourceMap) {
-  var sourceMap = aSourceMap;
-  if (typeof aSourceMap === 'string') {
-    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
   }
 
-  return sourceMap.sections != null
-    ? new IndexedSourceMapConsumer(sourceMap)
-    : new BasicSourceMapConsumer(sourceMap);
-}
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
 
-SourceMapConsumer.fromSourceMap = function(aSourceMap) {
-  return BasicSourceMapConsumer.fromSourceMap(aSourceMap);
-}
+  // must be a plain object
+  return 'object';
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/snapdragon/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Base = __webpack_require__("../../node_modules/base/index.js");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
+var Compiler = __webpack_require__("../../node_modules/snapdragon/lib/compiler.js");
+var Parser = __webpack_require__("../../node_modules/snapdragon/lib/parser.js");
+var utils = __webpack_require__("../../node_modules/snapdragon/lib/utils.js");
+var regexCache = {};
+var cache = {};
 
 /**
- * The version of the source mapping spec that we are consuming.
+ * Create a new instance of `Snapdragon` with the given `options`.
+ *
+ * ```js
+ * var snapdragon = new Snapdragon();
+ * ```
+ *
+ * @param {Object} `options`
+ * @api public
  */
-SourceMapConsumer.prototype._version = 3;
 
-// `__generatedMappings` and `__originalMappings` are arrays that hold the
-// parsed mapping coordinates from the source map's "mappings" attribute. They
-// are lazily instantiated, accessed via the `_generatedMappings` and
-// `_originalMappings` getters respectively, and we only parse the mappings
-// and create these arrays once queried for a source location. We jump through
-// these hoops because there can be many thousands of mappings, and parsing
-// them is expensive, so we only want to do it if we must.
-//
-// Each object in the arrays is of the form:
-//
-//     {
-//       generatedLine: The line number in the generated code,
-//       generatedColumn: The column number in the generated code,
-//       source: The path to the original source file that generated this
-//               chunk of code,
-//       originalLine: The line number in the original source that
-//                     corresponds to this chunk of generated code,
-//       originalColumn: The column number in the original source that
-//                       corresponds to this chunk of generated code,
-//       name: The name of the original symbol which generated this chunk of
-//             code.
-//     }
-//
-// All properties except for `generatedLine` and `generatedColumn` can be
-// `null`.
-//
-// `_generatedMappings` is ordered by the generated positions.
-//
-// `_originalMappings` is ordered by the original positions.
+function Snapdragon(options) {
+  Base.call(this, null, options);
+  this.options = utils.extend({source: 'string'}, this.options);
+  this.compiler = new Compiler(this.options);
+  this.parser = new Parser(this.options);
 
-SourceMapConsumer.prototype.__generatedMappings = null;
-Object.defineProperty(SourceMapConsumer.prototype, '_generatedMappings', {
-  get: function () {
-    if (!this.__generatedMappings) {
-      this._parseMappings(this._mappings, this.sourceRoot);
+  Object.defineProperty(this, 'compilers', {
+    get: function() {
+      return this.compiler.compilers;
     }
+  });
 
-    return this.__generatedMappings;
-  }
-});
+  Object.defineProperty(this, 'parsers', {
+    get: function() {
+      return this.parser.parsers;
+    }
+  });
 
-SourceMapConsumer.prototype.__originalMappings = null;
-Object.defineProperty(SourceMapConsumer.prototype, '_originalMappings', {
-  get: function () {
-    if (!this.__originalMappings) {
-      this._parseMappings(this._mappings, this.sourceRoot);
+  Object.defineProperty(this, 'regex', {
+    get: function() {
+      return this.parser.regex;
     }
+  });
+}
 
-    return this.__originalMappings;
-  }
-});
+/**
+ * Inherit Base
+ */
 
-SourceMapConsumer.prototype._charIsMappingSeparator =
-  function SourceMapConsumer_charIsMappingSeparator(aStr, index) {
-    var c = aStr.charAt(index);
-    return c === ";" || c === ",";
-  };
+Base.extend(Snapdragon);
 
 /**
- * Parse the mappings in a string in to a data structure which we can easily
- * query (the ordered arrays in the `this.__generatedMappings` and
- * `this.__originalMappings` properties).
+ * Add a parser to `snapdragon.parsers` for capturing the given `type` using
+ * the specified regex or parser function. A function is useful if you need
+ * to customize how the token is created and/or have access to the parser
+ * instance to check options, etc.
+ *
+ * ```js
+ * snapdragon
+ *   .capture('slash', /^\//)
+ *   .capture('dot', function() {
+ *     var pos = this.position();
+ *     var m = this.match(/^\./);
+ *     if (!m) return;
+ *     return pos({
+ *       type: 'dot',
+ *       val: m[0]
+ *     });
+ *   });
+ * ```
+ * @param {String} `type`
+ * @param {RegExp|Function} `regex`
+ * @return {Object} Returns the parser instance for chaining
+ * @api public
  */
-SourceMapConsumer.prototype._parseMappings =
-  function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
-    throw new Error("Subclasses must implement _parseMappings");
-  };
 
-SourceMapConsumer.GENERATED_ORDER = 1;
-SourceMapConsumer.ORIGINAL_ORDER = 2;
+Snapdragon.prototype.capture = function() {
+  return this.parser.capture.apply(this.parser, arguments);
+};
 
-SourceMapConsumer.GREATEST_LOWER_BOUND = 1;
-SourceMapConsumer.LEAST_UPPER_BOUND = 2;
+/**
+ * Register a plugin `fn`.
+ *
+ * ```js
+ * var snapdragon = new Snapdgragon([options]);
+ * snapdragon.use(function() {
+ *   console.log(this);          //<= snapdragon instance
+ *   console.log(this.parser);   //<= parser instance
+ *   console.log(this.compiler); //<= compiler instance
+ * });
+ * ```
+ * @param {Object} `fn`
+ * @api public
+ */
+
+Snapdragon.prototype.use = function(fn) {
+  fn.call(this, this);
+  return this;
+};
 
 /**
- * Iterate over each mapping between an original source/line/column and a
- * generated line/column in this source map.
+ * Parse the given `str`.
  *
- * @param Function aCallback
- *        The function that is called with each mapping.
- * @param Object aContext
- *        Optional. If specified, this object will be the value of `this` every
- *        time that `aCallback` is called.
- * @param aOrder
- *        Either `SourceMapConsumer.GENERATED_ORDER` or
- *        `SourceMapConsumer.ORIGINAL_ORDER`. Specifies whether you want to
- *        iterate over the mappings sorted by the generated file's line/column
- *        order or the original's source/line/column order, respectively. Defaults to
- *        `SourceMapConsumer.GENERATED_ORDER`.
+ * ```js
+ * var snapdragon = new Snapdgragon([options]);
+ * // register parsers
+ * snapdragon.parser.use(function() {});
+ *
+ * // parse
+ * var ast = snapdragon.parse('foo/bar');
+ * console.log(ast);
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options` Set `options.sourcemap` to true to enable source maps.
+ * @return {Object} Returns an AST.
+ * @api public
  */
-SourceMapConsumer.prototype.eachMapping =
-  function SourceMapConsumer_eachMapping(aCallback, aContext, aOrder) {
-    var context = aContext || null;
-    var order = aOrder || SourceMapConsumer.GENERATED_ORDER;
 
-    var mappings;
-    switch (order) {
-    case SourceMapConsumer.GENERATED_ORDER:
-      mappings = this._generatedMappings;
-      break;
-    case SourceMapConsumer.ORIGINAL_ORDER:
-      mappings = this._originalMappings;
-      break;
-    default:
-      throw new Error("Unknown order of iteration.");
-    }
+Snapdragon.prototype.parse = function(str, options) {
+  this.options = utils.extend({}, this.options, options);
+  var parsed = this.parser.parse(str, this.options);
 
-    var sourceRoot = this.sourceRoot;
-    mappings.map(function (mapping) {
-      var source = mapping.source === null ? null : this._sources.at(mapping.source);
-      if (source != null && sourceRoot != null) {
-        source = util.join(sourceRoot, source);
-      }
-      return {
-        source: source,
-        generatedLine: mapping.generatedLine,
-        generatedColumn: mapping.generatedColumn,
-        originalLine: mapping.originalLine,
-        originalColumn: mapping.originalColumn,
-        name: mapping.name === null ? null : this._names.at(mapping.name)
-      };
-    }, this).forEach(aCallback, context);
-  };
+  // add non-enumerable parser reference
+  define(parsed, 'parser', this.parser);
+  return parsed;
+};
 
 /**
- * Returns all generated line and column information for the original source,
- * line, and column provided. If no column is provided, returns all mappings
- * corresponding to a either the line we are searching for or the next
- * closest line that has any mappings. Otherwise, returns all mappings
- * corresponding to the given line and either the column we are searching for
- * or the next closest column that has any offsets.
- *
- * The only argument is an object with the following properties:
+ * Compile the given `AST`.
  *
- *   - source: The filename of the original source.
- *   - line: The line number in the original source.
- *   - column: Optional. the column number in the original source.
+ * ```js
+ * var snapdragon = new Snapdgragon([options]);
+ * // register plugins
+ * snapdragon.use(function() {});
+ * // register parser plugins
+ * snapdragon.parser.use(function() {});
+ * // register compiler plugins
+ * snapdragon.compiler.use(function() {});
  *
- * and an array of objects is returned, each with the following properties:
+ * // parse
+ * var ast = snapdragon.parse('foo/bar');
  *
- *   - line: The line number in the generated source, or null.
- *   - column: The column number in the generated source, or null.
+ * // compile
+ * var res = snapdragon.compile(ast);
+ * console.log(res.output);
+ * ```
+ * @param {Object} `ast`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with an `output` property with the rendered string.
+ * @api public
  */
-SourceMapConsumer.prototype.allGeneratedPositionsFor =
-  function SourceMapConsumer_allGeneratedPositionsFor(aArgs) {
-    var line = util.getArg(aArgs, 'line');
 
-    // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
-    // returns the index of the closest mapping less than the needle. By
-    // setting needle.originalColumn to 0, we thus find the last mapping for
-    // the given line, provided such a mapping exists.
-    var needle = {
-      source: util.getArg(aArgs, 'source'),
-      originalLine: line,
-      originalColumn: util.getArg(aArgs, 'column', 0)
-    };
+Snapdragon.prototype.compile = function(ast, options) {
+  this.options = utils.extend({}, this.options, options);
+  var compiled = this.compiler.compile(ast, this.options);
 
-    if (this.sourceRoot != null) {
-      needle.source = util.relative(this.sourceRoot, needle.source);
-    }
-    if (!this._sources.has(needle.source)) {
-      return [];
-    }
-    needle.source = this._sources.indexOf(needle.source);
+  // add non-enumerable compiler reference
+  define(compiled, 'compiler', this.compiler);
+  return compiled;
+};
 
-    var mappings = [];
+/**
+ * Expose `Snapdragon`
+ */
 
-    var index = this._findMapping(needle,
-                                  this._originalMappings,
-                                  "originalLine",
-                                  "originalColumn",
-                                  util.compareByOriginalPositions,
-                                  binarySearch.LEAST_UPPER_BOUND);
-    if (index >= 0) {
-      var mapping = this._originalMappings[index];
+module.exports = Snapdragon;
 
-      if (aArgs.column === undefined) {
-        var originalLine = mapping.originalLine;
+/**
+ * Expose `Parser` and `Compiler`
+ */
 
-        // Iterate until either we run out of mappings, or we run into
-        // a mapping for a different line than the one we found. Since
-        // mappings are sorted, this is guaranteed to find all mappings for
-        // the line we found.
-        while (mapping && mapping.originalLine === originalLine) {
-          mappings.push({
-            line: util.getArg(mapping, 'generatedLine', null),
-            column: util.getArg(mapping, 'generatedColumn', null),
-            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-          });
+module.exports.Compiler = Compiler;
+module.exports.Parser = Parser;
 
-          mapping = this._originalMappings[++index];
-        }
-      } else {
-        var originalColumn = mapping.originalColumn;
 
-        // Iterate until either we run out of mappings, or we run into
-        // a mapping for a different line than the one we were searching for.
-        // Since mappings are sorted, this is guaranteed to find all mappings for
-        // the line we are searching for.
-        while (mapping &&
-               mapping.originalLine === line &&
-               mapping.originalColumn == originalColumn) {
-          mappings.push({
-            line: util.getArg(mapping, 'generatedLine', null),
-            column: util.getArg(mapping, 'generatedColumn', null),
-            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-          });
+/***/ }),
 
-          mapping = this._originalMappings[++index];
-        }
-      }
-    }
+/***/ "../../node_modules/snapdragon/lib/compiler.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    return mappings;
-  };
+"use strict";
 
-exports.SourceMapConsumer = SourceMapConsumer;
+
+var use = __webpack_require__("../../node_modules/use/index.js");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
+var debug = __webpack_require__("../../node_modules/debug/src/index.js")('snapdragon:compiler');
+var utils = __webpack_require__("../../node_modules/snapdragon/lib/utils.js");
 
 /**
- * A BasicSourceMapConsumer instance represents a parsed source map which we can
- * query for information about the original file positions by giving it a file
- * position in the generated source.
- *
- * The only parameter is the raw source map (either as a JSON string, or
- * already parsed to an object). According to the spec, source maps have the
- * following attributes:
- *
- *   - version: Which version of the source map spec this map is following.
- *   - sources: An array of URLs to the original source files.
- *   - names: An array of identifiers which can be referrenced by individual mappings.
- *   - sourceRoot: Optional. The URL root from which all sources are relative.
- *   - sourcesContent: Optional. An array of contents of the original source files.
- *   - mappings: A string of base64 VLQs which contain the actual mappings.
- *   - file: Optional. The generated file this source map is associated with.
- *
- * Here is an example source map, taken from the source map spec[0]:
- *
- *     {
- *       version : 3,
- *       file: "out.js",
- *       sourceRoot : "",
- *       sources: ["foo.js", "bar.js"],
- *       names: ["src", "maps", "are", "fun"],
- *       mappings: "AA,AB;;ABCDE;"
- *     }
- *
- * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit?pli=1#
+ * Create a new `Compiler` with the given `options`.
+ * @param {Object} `options`
  */
-function BasicSourceMapConsumer(aSourceMap) {
-  var sourceMap = aSourceMap;
-  if (typeof aSourceMap === 'string') {
-    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
-  }
 
-  var version = util.getArg(sourceMap, 'version');
-  var sources = util.getArg(sourceMap, 'sources');
-  // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which
-  // requires the array) to play nice here.
-  var names = util.getArg(sourceMap, 'names', []);
-  var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
-  var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
-  var mappings = util.getArg(sourceMap, 'mappings');
-  var file = util.getArg(sourceMap, 'file', null);
+function Compiler(options, state) {
+  debug('initializing', __filename);
+  this.options = utils.extend({source: 'string'}, options);
+  this.state = state || {};
+  this.compilers = {};
+  this.output = '';
+  this.set('eos', function(node) {
+    return this.emit(node.val, node);
+  });
+  this.set('noop', function(node) {
+    return this.emit(node.val, node);
+  });
+  this.set('bos', function(node) {
+    return this.emit(node.val, node);
+  });
+  use(this);
+}
 
-  // Once again, Sass deviates from the spec and supplies the version as a
-  // string rather than a number, so we use loose equality checking here.
-  if (version != this._version) {
-    throw new Error('Unsupported version: ' + version);
-  }
+/**
+ * Prototype methods
+ */
 
-  sources = sources
-    .map(String)
-    // Some source maps produce relative source paths like "./foo.js" instead of
-    // "foo.js".  Normalize these first so that future comparisons will succeed.
-    // See bugzil.la/1090768.
-    .map(util.normalize)
-    // Always ensure that absolute sources are internally stored relative to
-    // the source root, if the source root is absolute. Not doing this would
-    // be particularly problematic when the source root is a prefix of the
-    // source (valid, but why??). See github issue #199 and bugzil.la/1188982.
-    .map(function (source) {
-      return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source)
-        ? util.relative(sourceRoot, source)
-        : source;
-    });
+Compiler.prototype = {
 
-  // Pass `true` below to allow duplicate names and sources. While source maps
-  // are intended to be compressed and deduplicated, the TypeScript compiler
-  // sometimes generates source maps with duplicates in them. See Github issue
-  // #72 and bugzil.la/889492.
-  this._names = ArraySet.fromArray(names.map(String), true);
-  this._sources = ArraySet.fromArray(sources, true);
+  /**
+   * Throw an error message with details including the cursor position.
+   * @param {String} `msg` Message to use in the Error.
+   */
 
-  this.sourceRoot = sourceRoot;
-  this.sourcesContent = sourcesContent;
-  this._mappings = mappings;
-  this.file = file;
-}
+  error: function(msg, node) {
+    var pos = node.position || {start: {column: 0}};
+    var message = this.options.source + ' column:' + pos.start.column + ': ' + msg;
 
-BasicSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
-BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer;
+    var err = new Error(message);
+    err.reason = msg;
+    err.column = pos.start.column;
+    err.source = this.pattern;
 
-/**
- * Create a BasicSourceMapConsumer from a SourceMapGenerator.
- *
- * @param SourceMapGenerator aSourceMap
- *        The source map that will be consumed.
- * @returns BasicSourceMapConsumer
- */
-BasicSourceMapConsumer.fromSourceMap =
-  function SourceMapConsumer_fromSourceMap(aSourceMap) {
-    var smc = Object.create(BasicSourceMapConsumer.prototype);
+    if (this.options.silent) {
+      this.errors.push(err);
+    } else {
+      throw err;
+    }
+  },
 
-    var names = smc._names = ArraySet.fromArray(aSourceMap._names.toArray(), true);
-    var sources = smc._sources = ArraySet.fromArray(aSourceMap._sources.toArray(), true);
-    smc.sourceRoot = aSourceMap._sourceRoot;
-    smc.sourcesContent = aSourceMap._generateSourcesContent(smc._sources.toArray(),
-                                                            smc.sourceRoot);
-    smc.file = aSourceMap._file;
+  /**
+   * Define a non-enumberable property on the `Compiler` instance.
+   *
+   * ```js
+   * compiler.define('foo', 'bar');
+   * ```
+   * @name .define
+   * @param {String} `key` propery name
+   * @param {any} `val` property value
+   * @return {Object} Returns the Compiler instance for chaining.
+   * @api public
+   */
 
-    // Because we are modifying the entries (by converting string sources and
-    // names to indices into the sources and names ArraySets), we have to make
-    // a copy of the entry or else bad things happen. Shared mutable state
-    // strikes again! See github issue #191.
+  define: function(key, val) {
+    define(this, key, val);
+    return this;
+  },
 
-    var generatedMappings = aSourceMap._mappings.toArray().slice();
-    var destGeneratedMappings = smc.__generatedMappings = [];
-    var destOriginalMappings = smc.__originalMappings = [];
+  /**
+   * Emit `node.val`
+   */
 
-    for (var i = 0, length = generatedMappings.length; i < length; i++) {
-      var srcMapping = generatedMappings[i];
-      var destMapping = new Mapping;
-      destMapping.generatedLine = srcMapping.generatedLine;
-      destMapping.generatedColumn = srcMapping.generatedColumn;
+  emit: function(str, node) {
+    this.output += str;
+    return str;
+  },
 
-      if (srcMapping.source) {
-        destMapping.source = sources.indexOf(srcMapping.source);
-        destMapping.originalLine = srcMapping.originalLine;
-        destMapping.originalColumn = srcMapping.originalColumn;
+  /**
+   * Add a compiler `fn` with the given `name`
+   */
 
-        if (srcMapping.name) {
-          destMapping.name = names.indexOf(srcMapping.name);
-        }
+  set: function(name, fn) {
+    this.compilers[name] = fn;
+    return this;
+  },
 
-        destOriginalMappings.push(destMapping);
-      }
+  /**
+   * Get compiler `name`.
+   */
 
-      destGeneratedMappings.push(destMapping);
-    }
+  get: function(name) {
+    return this.compilers[name];
+  },
 
-    quickSort(smc.__originalMappings, util.compareByOriginalPositions);
+  /**
+   * Get the previous AST node.
+   */
 
-    return smc;
-  };
+  prev: function(n) {
+    return this.ast.nodes[this.idx - (n || 1)] || { type: 'bos', val: '' };
+  },
 
-/**
- * The version of the source mapping spec that we are consuming.
- */
-BasicSourceMapConsumer.prototype._version = 3;
+  /**
+   * Get the next AST node.
+   */
 
-/**
- * The list of original sources.
- */
-Object.defineProperty(BasicSourceMapConsumer.prototype, 'sources', {
-  get: function () {
-    return this._sources.toArray().map(function (s) {
-      return this.sourceRoot != null ? util.join(this.sourceRoot, s) : s;
-    }, this);
-  }
-});
+  next: function(n) {
+    return this.ast.nodes[this.idx + (n || 1)] || { type: 'eos', val: '' };
+  },
 
-/**
- * Provide the JIT with a nice shape / hidden class.
- */
-function Mapping() {
-  this.generatedLine = 0;
-  this.generatedColumn = 0;
-  this.source = null;
-  this.originalLine = null;
-  this.originalColumn = null;
-  this.name = null;
-}
+  /**
+   * Visit `node`.
+   */
 
-/**
- * Parse the mappings in a string in to a data structure which we can easily
- * query (the ordered arrays in the `this.__generatedMappings` and
- * `this.__originalMappings` properties).
- */
-BasicSourceMapConsumer.prototype._parseMappings =
-  function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
-    var generatedLine = 1;
-    var previousGeneratedColumn = 0;
-    var previousOriginalLine = 0;
-    var previousOriginalColumn = 0;
-    var previousSource = 0;
-    var previousName = 0;
-    var length = aStr.length;
-    var index = 0;
-    var cachedSegments = {};
-    var temp = {};
-    var originalMappings = [];
-    var generatedMappings = [];
-    var mapping, str, segment, end, value;
+  visit: function(node, nodes, i) {
+    var fn = this.compilers[node.type];
+    this.idx = i;
 
-    while (index < length) {
-      if (aStr.charAt(index) === ';') {
-        generatedLine++;
-        index++;
-        previousGeneratedColumn = 0;
-      }
-      else if (aStr.charAt(index) === ',') {
-        index++;
-      }
-      else {
-        mapping = new Mapping();
-        mapping.generatedLine = generatedLine;
+    if (typeof fn !== 'function') {
+      throw this.error('compiler "' + node.type + '" is not registered', node);
+    }
+    return fn.call(this, node, nodes, i);
+  },
 
-        // Because each offset is encoded relative to the previous one,
-        // many segments often have the same encoding. We can exploit this
-        // fact by caching the parsed variable length fields of each segment,
-        // allowing us to avoid a second parse if we encounter the same
-        // segment again.
-        for (end = index; end < length; end++) {
-          if (this._charIsMappingSeparator(aStr, end)) {
-            break;
-          }
-        }
-        str = aStr.slice(index, end);
+  /**
+   * Map visit over array of `nodes`.
+   */
 
-        segment = cachedSegments[str];
-        if (segment) {
-          index += str.length;
-        } else {
-          segment = [];
-          while (index < end) {
-            base64VLQ.decode(aStr, index, temp);
-            value = temp.value;
-            index = temp.rest;
-            segment.push(value);
-          }
+  mapVisit: function(nodes) {
+    if (!Array.isArray(nodes)) {
+      throw new TypeError('expected an array');
+    }
+    var len = nodes.length;
+    var idx = -1;
+    while (++idx < len) {
+      this.visit(nodes[idx], nodes, idx);
+    }
+    return this;
+  },
 
-          if (segment.length === 2) {
-            throw new Error('Found a source, but no line and column');
-          }
+  /**
+   * Compile `ast`.
+   */
 
-          if (segment.length === 3) {
-            throw new Error('Found a source and line, but no column');
-          }
+  compile: function(ast, options) {
+    var opts = utils.extend({}, this.options, options);
+    this.ast = ast;
+    this.parsingErrors = this.ast.errors;
+    this.output = '';
 
-          cachedSegments[str] = segment;
-        }
+    // source map support
+    if (opts.sourcemap) {
+      var sourcemaps = __webpack_require__("../../node_modules/snapdragon/lib/source-maps.js");
+      sourcemaps(this);
+      this.mapVisit(this.ast.nodes);
+      this.applySourceMaps();
+      this.map = opts.sourcemap === 'generator' ? this.map : this.map.toJSON();
+      return this;
+    }
 
-        // Generated column.
-        mapping.generatedColumn = previousGeneratedColumn + segment[0];
-        previousGeneratedColumn = mapping.generatedColumn;
+    this.mapVisit(this.ast.nodes);
+    return this;
+  }
+};
 
-        if (segment.length > 1) {
-          // Original source.
-          mapping.source = previousSource + segment[1];
-          previousSource += segment[1];
+/**
+ * Expose `Compiler`
+ */
 
-          // Original line.
-          mapping.originalLine = previousOriginalLine + segment[2];
-          previousOriginalLine = mapping.originalLine;
-          // Lines are stored 0-based
-          mapping.originalLine += 1;
+module.exports = Compiler;
 
-          // Original column.
-          mapping.originalColumn = previousOriginalColumn + segment[3];
-          previousOriginalColumn = mapping.originalColumn;
 
-          if (segment.length > 4) {
-            // Original name.
-            mapping.name = previousName + segment[4];
-            previousName += segment[4];
-          }
-        }
+/***/ }),
 
-        generatedMappings.push(mapping);
-        if (typeof mapping.originalLine === 'number') {
-          originalMappings.push(mapping);
-        }
-      }
-    }
+/***/ "../../node_modules/snapdragon/lib/parser.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    quickSort(generatedMappings, util.compareByGeneratedPositionsDeflated);
-    this.__generatedMappings = generatedMappings;
+"use strict";
 
-    quickSort(originalMappings, util.compareByOriginalPositions);
-    this.__originalMappings = originalMappings;
-  };
+
+var use = __webpack_require__("../../node_modules/use/index.js");
+var util = __webpack_require__("util");
+var Cache = __webpack_require__("../../node_modules/map-cache/index.js");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
+var debug = __webpack_require__("../../node_modules/debug/src/index.js")('snapdragon:parser');
+var Position = __webpack_require__("../../node_modules/snapdragon/lib/position.js");
+var utils = __webpack_require__("../../node_modules/snapdragon/lib/utils.js");
 
 /**
- * Find the mapping that best matches the hypothetical "needle" mapping that
- * we are searching for in the given "haystack" of mappings.
+ * Create a new `Parser` with the given `input` and `options`.
+ * @param {String} `input`
+ * @param {Object} `options`
+ * @api public
  */
-BasicSourceMapConsumer.prototype._findMapping =
-  function SourceMapConsumer_findMapping(aNeedle, aMappings, aLineName,
-                                         aColumnName, aComparator, aBias) {
-    // To return the position we are searching for, we must first find the
-    // mapping for the given position and then return the opposite position it
-    // points to. Because the mappings are sorted, we can use binary search to
-    // find the best mapping.
 
-    if (aNeedle[aLineName] <= 0) {
-      throw new TypeError('Line must be greater than or equal to 1, got '
-                          + aNeedle[aLineName]);
-    }
-    if (aNeedle[aColumnName] < 0) {
-      throw new TypeError('Column must be greater than or equal to 0, got '
-                          + aNeedle[aColumnName]);
-    }
+function Parser(options) {
+  debug('initializing', __filename);
+  this.options = utils.extend({source: 'string'}, options);
+  this.init(this.options);
+  use(this);
+}
 
-    return binarySearch.search(aNeedle, aMappings, aComparator, aBias);
-  };
+/**
+ * Prototype methods
+ */
+
+Parser.prototype = {
+  constructor: Parser,
+
+  init: function(options) {
+    this.orig = '';
+    this.input = '';
+    this.parsed = '';
+
+    this.column = 1;
+    this.line = 1;
+
+    this.regex = new Cache();
+    this.errors = this.errors || [];
+    this.parsers = this.parsers || {};
+    this.types = this.types || [];
+    this.sets = this.sets || {};
+    this.fns = this.fns || [];
+    this.currentType = 'root';
 
-/**
- * Compute the last column for each generated mapping. The last column is
- * inclusive.
- */
-BasicSourceMapConsumer.prototype.computeColumnSpans =
-  function SourceMapConsumer_computeColumnSpans() {
-    for (var index = 0; index < this._generatedMappings.length; ++index) {
-      var mapping = this._generatedMappings[index];
+    var pos = this.position();
+    this.bos = pos({type: 'bos', val: ''});
 
-      // Mappings do not contain a field for the last generated columnt. We
-      // can come up with an optimistic estimate, however, by assuming that
-      // mappings are contiguous (i.e. given two consecutive mappings, the
-      // first mapping ends where the second one starts).
-      if (index + 1 < this._generatedMappings.length) {
-        var nextMapping = this._generatedMappings[index + 1];
+    this.ast = {
+      type: 'root',
+      errors: this.errors,
+      nodes: [this.bos]
+    };
 
-        if (mapping.generatedLine === nextMapping.generatedLine) {
-          mapping.lastGeneratedColumn = nextMapping.generatedColumn - 1;
-          continue;
-        }
-      }
+    define(this.bos, 'parent', this.ast);
+    this.nodes = [this.ast];
 
-      // The last mapping for each line spans the entire line.
-      mapping.lastGeneratedColumn = Infinity;
-    }
-  };
+    this.count = 0;
+    this.setCount = 0;
+    this.stack = [];
+  },
 
-/**
- * Returns the original source, line, and column information for the generated
- * source's line and column positions provided. The only argument is an object
- * with the following properties:
- *
- *   - line: The line number in the generated source.
- *   - column: The column number in the generated source.
- *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
- *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
- *
- * and an object is returned with the following properties:
- *
- *   - source: The original source file, or null.
- *   - line: The line number in the original source, or null.
- *   - column: The column number in the original source, or null.
- *   - name: The original identifier, or null.
- */
-BasicSourceMapConsumer.prototype.originalPositionFor =
-  function SourceMapConsumer_originalPositionFor(aArgs) {
-    var needle = {
-      generatedLine: util.getArg(aArgs, 'line'),
-      generatedColumn: util.getArg(aArgs, 'column')
-    };
+  /**
+   * Throw a formatted error with the cursor column and `msg`.
+   * @param {String} `msg` Message to use in the Error.
+   */
 
-    var index = this._findMapping(
-      needle,
-      this._generatedMappings,
-      "generatedLine",
-      "generatedColumn",
-      util.compareByGeneratedPositionsDeflated,
-      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
-    );
+  error: function(msg, node) {
+    var pos = node.position || {start: {column: 0, line: 0}};
+    var line = pos.start.line;
+    var column = pos.start.column;
+    var source = this.options.source;
 
-    if (index >= 0) {
-      var mapping = this._generatedMappings[index];
+    var message = source + ' <line:' + line + ' column:' + column + '>: ' + msg;
+    var err = new Error(message);
+    err.source = source;
+    err.reason = msg;
+    err.pos = pos;
 
-      if (mapping.generatedLine === needle.generatedLine) {
-        var source = util.getArg(mapping, 'source', null);
-        if (source !== null) {
-          source = this._sources.at(source);
-          if (this.sourceRoot != null) {
-            source = util.join(this.sourceRoot, source);
-          }
-        }
-        var name = util.getArg(mapping, 'name', null);
-        if (name !== null) {
-          name = this._names.at(name);
-        }
-        return {
-          source: source,
-          line: util.getArg(mapping, 'originalLine', null),
-          column: util.getArg(mapping, 'originalColumn', null),
-          name: name
-        };
-      }
+    if (this.options.silent) {
+      this.errors.push(err);
+    } else {
+      throw err;
     }
+  },
 
-    return {
-      source: null,
-      line: null,
-      column: null,
-      name: null
-    };
-  };
+  /**
+   * Define a non-enumberable property on the `Parser` instance.
+   *
+   * ```js
+   * parser.define('foo', 'bar');
+   * ```
+   * @name .define
+   * @param {String} `key` propery name
+   * @param {any} `val` property value
+   * @return {Object} Returns the Parser instance for chaining.
+   * @api public
+   */
 
-/**
- * Return true if we have the source content for every source in the source
- * map, false otherwise.
- */
-BasicSourceMapConsumer.prototype.hasContentsOfAllSources =
-  function BasicSourceMapConsumer_hasContentsOfAllSources() {
-    if (!this.sourcesContent) {
-      return false;
-    }
-    return this.sourcesContent.length >= this._sources.size() &&
-      !this.sourcesContent.some(function (sc) { return sc == null; });
-  };
+  define: function(key, val) {
+    define(this, key, val);
+    return this;
+  },
 
-/**
- * Returns the original source content. The only argument is the url of the
- * original source file. Returns null if no original source content is
- * available.
- */
-BasicSourceMapConsumer.prototype.sourceContentFor =
-  function SourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
-    if (!this.sourcesContent) {
-      return null;
-    }
+  /**
+   * Mark position and patch `node.position`.
+   */
 
-    if (this.sourceRoot != null) {
-      aSource = util.relative(this.sourceRoot, aSource);
-    }
+  position: function() {
+    var start = { line: this.line, column: this.column };
+    var self = this;
 
-    if (this._sources.has(aSource)) {
-      return this.sourcesContent[this._sources.indexOf(aSource)];
-    }
+    return function(node) {
+      define(node, 'position', new Position(start, self));
+      return node;
+    };
+  },
 
-    var url;
-    if (this.sourceRoot != null
-        && (url = util.urlParse(this.sourceRoot))) {
-      // XXX: file:// URIs and absolute paths lead to unexpected behavior for
-      // many users. We can help them out when they expect file:// URIs to
-      // behave like it would if they were running a local HTTP server. See
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=885597.
-      var fileUriAbsPath = aSource.replace(/^file:\/\//, "");
-      if (url.scheme == "file"
-          && this._sources.has(fileUriAbsPath)) {
-        return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)]
-      }
+  /**
+   * Set parser `name` with the given `fn`
+   * @param {String} `name`
+   * @param {Function} `fn`
+   * @api public
+   */
 
-      if ((!url.path || url.path == "/")
-          && this._sources.has("/" + aSource)) {
-        return this.sourcesContent[this._sources.indexOf("/" + aSource)];
-      }
+  set: function(type, fn) {
+    if (this.types.indexOf(type) === -1) {
+      this.types.push(type);
     }
+    this.parsers[type] = fn.bind(this);
+    return this;
+  },
 
-    // This function is used recursively from
-    // IndexedSourceMapConsumer.prototype.sourceContentFor. In that case, we
-    // don't want to throw if we can't find the source - we just want to
-    // return null, so we provide a flag to exit gracefully.
-    if (nullOnMissing) {
-      return null;
-    }
-    else {
-      throw new Error('"' + aSource + '" is not in the SourceMap.');
-    }
-  };
+  /**
+   * Get parser `name`
+   * @param {String} `name`
+   * @api public
+   */
 
-/**
- * Returns the generated line and column information for the original source,
- * line, and column positions provided. The only argument is an object with
- * the following properties:
- *
- *   - source: The filename of the original source.
- *   - line: The line number in the original source.
- *   - column: The column number in the original source.
- *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
- *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
- *
- * and an object is returned with the following properties:
- *
- *   - line: The line number in the generated source, or null.
- *   - column: The column number in the generated source, or null.
- */
-BasicSourceMapConsumer.prototype.generatedPositionFor =
-  function SourceMapConsumer_generatedPositionFor(aArgs) {
-    var source = util.getArg(aArgs, 'source');
-    if (this.sourceRoot != null) {
-      source = util.relative(this.sourceRoot, source);
-    }
-    if (!this._sources.has(source)) {
-      return {
-        line: null,
-        column: null,
-        lastColumn: null
-      };
-    }
-    source = this._sources.indexOf(source);
+  get: function(name) {
+    return this.parsers[name];
+  },
 
-    var needle = {
-      source: source,
-      originalLine: util.getArg(aArgs, 'line'),
-      originalColumn: util.getArg(aArgs, 'column')
-    };
+  /**
+   * Push a `token` onto the `type` stack.
+   *
+   * @param {String} `type`
+   * @return {Object} `token`
+   * @api public
+   */
 
-    var index = this._findMapping(
-      needle,
-      this._originalMappings,
-      "originalLine",
-      "originalColumn",
-      util.compareByOriginalPositions,
-      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
-    );
+  push: function(type, token) {
+    this.sets[type] = this.sets[type] || [];
+    this.count++;
+    this.stack.push(token);
+    return this.sets[type].push(token);
+  },
 
-    if (index >= 0) {
-      var mapping = this._originalMappings[index];
+  /**
+   * Pop a token off of the `type` stack
+   * @param {String} `type`
+   * @returns {Object} Returns a token
+   * @api public
+   */
 
-      if (mapping.source === needle.source) {
-        return {
-          line: util.getArg(mapping, 'generatedLine', null),
-          column: util.getArg(mapping, 'generatedColumn', null),
-          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-        };
-      }
-    }
+  pop: function(type) {
+    this.sets[type] = this.sets[type] || [];
+    this.count--;
+    this.stack.pop();
+    return this.sets[type].pop();
+  },
 
-    return {
-      line: null,
-      column: null,
-      lastColumn: null
-    };
-  };
+  /**
+   * Return true if inside a `stack` node. Types are `braces`, `parens` or `brackets`.
+   *
+   * @param {String} `type`
+   * @return {Boolean}
+   * @api public
+   */
 
-exports.BasicSourceMapConsumer = BasicSourceMapConsumer;
+  isInside: function(type) {
+    this.sets[type] = this.sets[type] || [];
+    return this.sets[type].length > 0;
+  },
 
-/**
- * An IndexedSourceMapConsumer instance represents a parsed source map which
- * we can query for information. It differs from BasicSourceMapConsumer in
- * that it takes "indexed" source maps (i.e. ones with a "sections" field) as
- * input.
- *
- * The only parameter is a raw source map (either as a JSON string, or already
- * parsed to an object). According to the spec for indexed source maps, they
- * have the following attributes:
- *
- *   - version: Which version of the source map spec this map is following.
- *   - file: Optional. The generated file this source map is associated with.
- *   - sections: A list of section definitions.
- *
- * Each value under the "sections" field has two fields:
- *   - offset: The offset into the original specified at which this section
- *       begins to apply, defined as an object with a "line" and "column"
- *       field.
- *   - map: A source map definition. This source map could also be indexed,
- *       but doesn't have to be.
- *
- * Instead of the "map" field, it's also possible to have a "url" field
- * specifying a URL to retrieve a source map from, but that's currently
- * unsupported.
- *
- * Here's an example source map, taken from the source map spec[0], but
- * modified to omit a section which uses the "url" field.
- *
- *  {
- *    version : 3,
- *    file: "app.js",
- *    sections: [{
- *      offset: {line:100, column:10},
- *      map: {
- *        version : 3,
- *        file: "section.js",
- *        sources: ["foo.js", "bar.js"],
- *        names: ["src", "maps", "are", "fun"],
- *        mappings: "AAAA,E;;ABCDE;"
- *      }
- *    }],
- *  }
- *
- * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.535es3xeprgt
- */
-function IndexedSourceMapConsumer(aSourceMap) {
-  var sourceMap = aSourceMap;
-  if (typeof aSourceMap === 'string') {
-    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
-  }
+  /**
+   * Return true if `node` is the given `type`.
+   *
+   * ```js
+   * parser.isType(node, 'brace');
+   * ```
+   * @param {Object} `node`
+   * @param {String} `type`
+   * @return {Boolean}
+   * @api public
+   */
 
-  var version = util.getArg(sourceMap, 'version');
-  var sections = util.getArg(sourceMap, 'sections');
+  isType: function(node, type) {
+    return node && node.type === type;
+  },
 
-  if (version != this._version) {
-    throw new Error('Unsupported version: ' + version);
-  }
+  /**
+   * Get the previous AST node
+   * @return {Object}
+   */
 
-  this._sources = new ArraySet();
-  this._names = new ArraySet();
+  prev: function(n) {
+    return this.stack.length > 0
+      ? utils.last(this.stack, n)
+      : utils.last(this.nodes, n);
+  },
 
-  var lastOffset = {
-    line: -1,
-    column: 0
-  };
-  this._sections = sections.map(function (s) {
-    if (s.url) {
-      // The url field will require support for asynchronicity.
-      // See https://github.com/mozilla/source-map/issues/16
-      throw new Error('Support for url field in sections not implemented.');
-    }
-    var offset = util.getArg(s, 'offset');
-    var offsetLine = util.getArg(offset, 'line');
-    var offsetColumn = util.getArg(offset, 'column');
+  /**
+   * Update line and column based on `str`.
+   */
 
-    if (offsetLine < lastOffset.line ||
-        (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) {
-      throw new Error('Section offsets must be ordered and non-overlapping.');
-    }
-    lastOffset = offset;
+  consume: function(len) {
+    this.input = this.input.substr(len);
+  },
 
-    return {
-      generatedOffset: {
-        // The offset fields are 0-based, but we use 1-based indices when
-        // encoding/decoding from VLQ.
-        generatedLine: offsetLine + 1,
-        generatedColumn: offsetColumn + 1
-      },
-      consumer: new SourceMapConsumer(util.getArg(s, 'map'))
-    }
-  });
-}
+  /**
+   * Update column based on `str`.
+   */
 
-IndexedSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
-IndexedSourceMapConsumer.prototype.constructor = SourceMapConsumer;
+  updatePosition: function(str, len) {
+    var lines = str.match(/\n/g);
+    if (lines) this.line += lines.length;
+    var i = str.lastIndexOf('\n');
+    this.column = ~i ? len - i : this.column + len;
+    this.parsed += str;
+    this.consume(len);
+  },
 
-/**
- * The version of the source mapping spec that we are consuming.
- */
-IndexedSourceMapConsumer.prototype._version = 3;
+  /**
+   * Match `regex`, return captures, and update the cursor position by `match[0]` length.
+   * @param {RegExp} `regex`
+   * @return {Object}
+   */
 
-/**
- * The list of original sources.
- */
-Object.defineProperty(IndexedSourceMapConsumer.prototype, 'sources', {
-  get: function () {
-    var sources = [];
-    for (var i = 0; i < this._sections.length; i++) {
-      for (var j = 0; j < this._sections[i].consumer.sources.length; j++) {
-        sources.push(this._sections[i].consumer.sources[j]);
-      }
+  match: function(regex) {
+    var m = regex.exec(this.input);
+    if (m) {
+      this.updatePosition(m[0], m[0].length);
+      return m;
     }
-    return sources;
-  }
-});
+  },
 
-/**
- * Returns the original source, line, and column information for the generated
- * source's line and column positions provided. The only argument is an object
- * with the following properties:
- *
- *   - line: The line number in the generated source.
- *   - column: The column number in the generated source.
- *
- * and an object is returned with the following properties:
- *
- *   - source: The original source file, or null.
- *   - line: The line number in the original source, or null.
- *   - column: The column number in the original source, or null.
- *   - name: The original identifier, or null.
- */
-IndexedSourceMapConsumer.prototype.originalPositionFor =
-  function IndexedSourceMapConsumer_originalPositionFor(aArgs) {
-    var needle = {
-      generatedLine: util.getArg(aArgs, 'line'),
-      generatedColumn: util.getArg(aArgs, 'column')
-    };
+  /**
+   * Capture `type` with the given regex.
+   * @param {String} `type`
+   * @param {RegExp} `regex`
+   * @return {Function}
+   */
 
-    // Find the section containing the generated position we're trying to map
-    // to an original position.
-    var sectionIndex = binarySearch.search(needle, this._sections,
-      function(needle, section) {
-        var cmp = needle.generatedLine - section.generatedOffset.generatedLine;
-        if (cmp) {
-          return cmp;
-        }
+  capture: function(type, regex) {
+    if (typeof regex === 'function') {
+      return this.set.apply(this, arguments);
+    }
 
-        return (needle.generatedColumn -
-                section.generatedOffset.generatedColumn);
+    this.regex.set(type, regex);
+    this.set(type, function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(regex);
+      if (!m || !m[0]) return;
+
+      var prev = this.prev();
+      var node = pos({
+        type: type,
+        val: m[0],
+        parsed: parsed,
+        rest: this.input
       });
-    var section = this._sections[sectionIndex];
 
-    if (!section) {
-      return {
-        source: null,
-        line: null,
-        column: null,
-        name: null
-      };
-    }
+      if (m[1]) {
+        node.inner = m[1];
+      }
 
-    return section.consumer.originalPositionFor({
-      line: needle.generatedLine -
-        (section.generatedOffset.generatedLine - 1),
-      column: needle.generatedColumn -
-        (section.generatedOffset.generatedLine === needle.generatedLine
-         ? section.generatedOffset.generatedColumn - 1
-         : 0),
-      bias: aArgs.bias
-    });
-  };
+      define(node, 'inside', this.stack.length > 0);
+      define(node, 'parent', prev);
+      prev.nodes.push(node);
+    }.bind(this));
+    return this;
+  },
 
-/**
- * Return true if we have the source content for every source in the source
- * map, false otherwise.
- */
-IndexedSourceMapConsumer.prototype.hasContentsOfAllSources =
-  function IndexedSourceMapConsumer_hasContentsOfAllSources() {
-    return this._sections.every(function (s) {
-      return s.consumer.hasContentsOfAllSources();
-    });
-  };
+  /**
+   * Create a parser with open and close for parens,
+   * brackets or braces
+   */
 
-/**
- * Returns the original source content. The only argument is the url of the
- * original source file. Returns null if no original source content is
- * available.
- */
-IndexedSourceMapConsumer.prototype.sourceContentFor =
-  function IndexedSourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
-    for (var i = 0; i < this._sections.length; i++) {
-      var section = this._sections[i];
+  capturePair: function(type, openRegex, closeRegex, fn) {
+    this.sets[type] = this.sets[type] || [];
 
-      var content = section.consumer.sourceContentFor(aSource, true);
-      if (content) {
-        return content;
-      }
-    }
-    if (nullOnMissing) {
-      return null;
-    }
-    else {
-      throw new Error('"' + aSource + '" is not in the SourceMap.');
-    }
-  };
+    /**
+     * Open
+     */
 
-/**
- * Returns the generated line and column information for the original source,
- * line, and column positions provided. The only argument is an object with
- * the following properties:
- *
- *   - source: The filename of the original source.
- *   - line: The line number in the original source.
- *   - column: The column number in the original source.
- *
- * and an object is returned with the following properties:
- *
- *   - line: The line number in the generated source, or null.
- *   - column: The column number in the generated source, or null.
- */
-IndexedSourceMapConsumer.prototype.generatedPositionFor =
-  function IndexedSourceMapConsumer_generatedPositionFor(aArgs) {
-    for (var i = 0; i < this._sections.length; i++) {
-      var section = this._sections[i];
+    this.set(type + '.open', function() {
+      var parsed = this.parsed;
+      var pos = this.position();
+      var m = this.match(openRegex);
+      if (!m || !m[0]) return;
 
-      // Only consider this section if the requested source is in the list of
-      // sources of the consumer.
-      if (section.consumer.sources.indexOf(util.getArg(aArgs, 'source')) === -1) {
-        continue;
-      }
-      var generatedPosition = section.consumer.generatedPositionFor(aArgs);
-      if (generatedPosition) {
-        var ret = {
-          line: generatedPosition.line +
-            (section.generatedOffset.generatedLine - 1),
-          column: generatedPosition.column +
-            (section.generatedOffset.generatedLine === generatedPosition.line
-             ? section.generatedOffset.generatedColumn - 1
-             : 0)
-        };
-        return ret;
+      var val = m[0];
+      this.setCount++;
+      this.specialChars = true;
+      var open = pos({
+        type: type + '.open',
+        val: val,
+        rest: this.input
+      });
+
+      if (typeof m[1] !== 'undefined') {
+        open.inner = m[1];
       }
-    }
 
-    return {
-      line: null,
-      column: null
-    };
-  };
+      var prev = this.prev();
+      var node = pos({
+        type: type,
+        nodes: [open]
+      });
 
-/**
- * Parse the mappings in a string in to a data structure which we can easily
- * query (the ordered arrays in the `this.__generatedMappings` and
- * `this.__originalMappings` properties).
- */
-IndexedSourceMapConsumer.prototype._parseMappings =
-  function IndexedSourceMapConsumer_parseMappings(aStr, aSourceRoot) {
-    this.__generatedMappings = [];
-    this.__originalMappings = [];
-    for (var i = 0; i < this._sections.length; i++) {
-      var section = this._sections[i];
-      var sectionMappings = section.consumer._generatedMappings;
-      for (var j = 0; j < sectionMappings.length; j++) {
-        var mapping = sectionMappings[j];
+      define(node, 'rest', this.input);
+      define(node, 'parsed', parsed);
+      define(node, 'prefix', m[1]);
+      define(node, 'parent', prev);
+      define(open, 'parent', node);
 
-        var source = section.consumer._sources.at(mapping.source);
-        if (section.consumer.sourceRoot !== null) {
-          source = util.join(section.consumer.sourceRoot, source);
-        }
-        this._sources.add(source);
-        source = this._sources.indexOf(source);
+      if (typeof fn === 'function') {
+        fn.call(this, open, node);
+      }
 
-        var name = section.consumer._names.at(mapping.name);
-        this._names.add(name);
-        name = this._names.indexOf(name);
+      this.push(type, node);
+      prev.nodes.push(node);
+    });
 
-        // The mappings coming from the consumer for the section have
-        // generated positions relative to the start of the section, so we
-        // need to offset them to be relative to the start of the concatenated
-        // generated file.
-        var adjustedMapping = {
-          source: source,
-          generatedLine: mapping.generatedLine +
-            (section.generatedOffset.generatedLine - 1),
-          generatedColumn: mapping.generatedColumn +
-            (section.generatedOffset.generatedLine === mapping.generatedLine
-            ? section.generatedOffset.generatedColumn - 1
-            : 0),
-          originalLine: mapping.originalLine,
-          originalColumn: mapping.originalColumn,
-          name: name
-        };
+    /**
+     * Close
+     */
 
-        this.__generatedMappings.push(adjustedMapping);
-        if (typeof adjustedMapping.originalLine === 'number') {
-          this.__originalMappings.push(adjustedMapping);
-        }
-      }
-    }
+    this.set(type + '.close', function() {
+      var pos = this.position();
+      var m = this.match(closeRegex);
+      if (!m || !m[0]) return;
 
-    quickSort(this.__generatedMappings, util.compareByGeneratedPositionsDeflated);
-    quickSort(this.__originalMappings, util.compareByOriginalPositions);
-  };
+      var parent = this.pop(type);
+      var node = pos({
+        type: type + '.close',
+        rest: this.input,
+        suffix: m[1],
+        val: m[0]
+      });
 
-exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
+      if (!this.isType(parent, type)) {
+        if (this.options.strict) {
+          throw new Error('missing opening "' + type + '"');
+        }
 
+        this.setCount--;
+        node.escaped = true;
+        return node;
+      }
 
-/***/ }),
-/* 682 */
-/***/ (function(module, exports) {
+      if (node.suffix === '\\') {
+        parent.escaped = true;
+        node.escaped = true;
+      }
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
+      parent.nodes.push(node);
+      define(node, 'parent', parent);
+    });
 
-exports.GREATEST_LOWER_BOUND = 1;
-exports.LEAST_UPPER_BOUND = 2;
+    return this;
+  },
 
-/**
- * Recursive implementation of binary search.
- *
- * @param aLow Indices here and lower do not contain the needle.
- * @param aHigh Indices here and higher do not contain the needle.
- * @param aNeedle The element being searched for.
- * @param aHaystack The non-empty array being searched.
- * @param aCompare Function which takes two elements and returns -1, 0, or 1.
- * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
- *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- */
-function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
-  // This function terminates when one of the following is true:
-  //
-  //   1. We find the exact element we are looking for.
-  //
-  //   2. We did not find the exact element, but we can return the index of
-  //      the next-closest element.
-  //
-  //   3. We did not find the exact element, and there is no next-closest
-  //      element than the one we are searching for, so we return -1.
-  var mid = Math.floor((aHigh - aLow) / 2) + aLow;
-  var cmp = aCompare(aNeedle, aHaystack[mid], true);
-  if (cmp === 0) {
-    // Found the element we are looking for.
-    return mid;
-  }
-  else if (cmp > 0) {
-    // Our needle is greater than aHaystack[mid].
-    if (aHigh - mid > 1) {
-      // The element is in the upper half.
-      return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias);
-    }
+  /**
+   * Capture end-of-string
+   */
 
-    // The exact needle element was not found in this haystack. Determine if
-    // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
-      return aHigh < aHaystack.length ? aHigh : -1;
-    } else {
-      return mid;
-    }
-  }
-  else {
-    // Our needle is less than aHaystack[mid].
-    if (mid - aLow > 1) {
-      // The element is in the lower half.
-      return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias);
-    }
+  eos: function() {
+    var pos = this.position();
+    if (this.input) return;
+    var prev = this.prev();
 
-    // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
-      return mid;
-    } else {
-      return aLow < 0 ? -1 : aLow;
-    }
-  }
-}
+    while (prev.type !== 'root' && !prev.visited) {
+      if (this.options.strict === true) {
+        throw new SyntaxError('invalid syntax:' + util.inspect(prev, null, 2));
+      }
 
-/**
- * This is an implementation of binary search which will always try and return
- * the index of the closest element if there is no exact hit. This is because
- * mappings between original and generated line/col pairs are single points,
- * and there is an implicit region between each of them, so a miss just means
- * that you aren't on the very start of a region.
- *
- * @param aNeedle The element you are looking for.
- * @param aHaystack The array that is being searched.
- * @param aCompare A function which takes the needle and an element in the
- *     array and returns -1, 0, or 1 depending on whether the needle is less
- *     than, equal to, or greater than the element, respectively.
- * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
- *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
- */
-exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
-  if (aHaystack.length === 0) {
-    return -1;
-  }
+      if (!hasDelims(prev)) {
+        prev.parent.escaped = true;
+        prev.escaped = true;
+      }
 
-  var index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
-                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
-  if (index < 0) {
-    return -1;
-  }
+      visit(prev, function(node) {
+        if (!hasDelims(node.parent)) {
+          node.parent.escaped = true;
+          node.escaped = true;
+        }
+      });
 
-  // We have found either the exact element, or the next-closest element than
-  // the one we are searching for. However, there may be more than one such
-  // element. Make sure we always return the smallest of these.
-  while (index - 1 >= 0) {
-    if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) {
-      break;
+      prev = prev.parent;
     }
-    --index;
-  }
 
-  return index;
-};
+    var tok = pos({
+      type: 'eos',
+      val: this.append || ''
+    });
 
+    define(tok, 'parent', this.ast);
+    return tok;
+  },
 
-/***/ }),
-/* 683 */
-/***/ (function(module, exports) {
+  /**
+   * Run parsers to advance the cursor position
+   */
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
+  next: function() {
+    var parsed = this.parsed;
+    var len = this.types.length;
+    var idx = -1;
+    var tok;
 
-// It turns out that some (most?) JavaScript engines don't self-host
-// `Array.prototype.sort`. This makes sense because C++ will likely remain
-// faster than JS when doing raw CPU-intensive sorting. However, when using a
-// custom comparator function, calling back and forth between the VM's C++ and
-// JIT'd JS is rather slow *and* loses JIT type information, resulting in
-// worse generated code for the comparator function than would be optimal. In
-// fact, when sorting with a comparator, these costs outweigh the benefits of
-// sorting in C++. By using our own JS-implemented Quick Sort (below), we get
-// a ~3500ms mean speed-up in `bench/bench.html`.
+    while (++idx < len) {
+      if ((tok = this.parsers[this.types[idx]].call(this))) {
+        define(tok, 'rest', this.input);
+        define(tok, 'parsed', parsed);
+        this.last = tok;
+        return tok;
+      }
+    }
+  },
 
-/**
- * Swap the elements indexed by `x` and `y` in the array `ary`.
- *
- * @param {Array} ary
- *        The array.
- * @param {Number} x
- *        The index of the first item.
- * @param {Number} y
- *        The index of the second item.
- */
-function swap(ary, x, y) {
-  var temp = ary[x];
-  ary[x] = ary[y];
-  ary[y] = temp;
-}
+  /**
+   * Parse the given string.
+   * @return {Array}
+   */
 
-/**
- * Returns a random integer within the range `low .. high` inclusive.
- *
- * @param {Number} low
- *        The lower bound on the range.
- * @param {Number} high
- *        The upper bound on the range.
- */
-function randomIntInRange(low, high) {
-  return Math.round(low + (Math.random() * (high - low)));
-}
+  parse: function(input) {
+    if (typeof input !== 'string') {
+      throw new TypeError('expected a string');
+    }
 
-/**
- * The Quick Sort algorithm.
- *
- * @param {Array} ary
- *        An array to sort.
- * @param {function} comparator
- *        Function to use to compare two items.
- * @param {Number} p
- *        Start index of the array
- * @param {Number} r
- *        End index of the array
- */
-function doQuickSort(ary, comparator, p, r) {
-  // If our lower bound is less than our upper bound, we (1) partition the
-  // array into two pieces and (2) recurse on each half. If it is not, this is
-  // the empty array and our base case.
+    this.init(this.options);
+    this.orig = input;
+    this.input = input;
+    var self = this;
 
-  if (p < r) {
-    // (1) Partitioning.
-    //
-    // The partitioning chooses a pivot between `p` and `r` and moves all
-    // elements that are less than or equal to the pivot to the before it, and
-    // all the elements that are greater than it after it. The effect is that
-    // once partition is done, the pivot is in the exact place it will be when
-    // the array is put in sorted order, and it will not need to be moved
-    // again. This runs in O(n) time.
+    function parse() {
+      // check input before calling `.next()`
+      input = self.input;
 
-    // Always choose a random pivot so that an input array which is reverse
-    // sorted does not cause O(n^2) running time.
-    var pivotIndex = randomIntInRange(p, r);
-    var i = p - 1;
+      // get the next AST ndoe
+      var node = self.next();
+      if (node) {
+        var prev = self.prev();
+        if (prev) {
+          define(node, 'parent', prev);
+          if (prev.nodes) {
+            prev.nodes.push(node);
+          }
+        }
 
-    swap(ary, pivotIndex, r);
-    var pivot = ary[r];
+        if (self.sets.hasOwnProperty(prev.type)) {
+          self.currentType = prev.type;
+        }
+      }
 
-    // Immediately after `j` is incremented in this loop, the following hold
-    // true:
-    //
-    //   * Every element in `ary[p .. i]` is less than or equal to the pivot.
-    //
-    //   * Every element in `ary[i+1 .. j-1]` is greater than the pivot.
-    for (var j = p; j < r; j++) {
-      if (comparator(ary[j], pivot) <= 0) {
-        i += 1;
-        swap(ary, i, j);
+      // if we got here but input is not changed, throw an error
+      if (self.input && input === self.input) {
+        throw new Error('no parsers registered for: "' + self.input.slice(0, 5) + '"');
       }
     }
 
-    swap(ary, i + 1, j);
-    var q = i + 1;
+    while (this.input) parse();
+    if (this.stack.length && this.options.strict) {
+      var node = this.stack.pop();
+      throw this.error('missing opening ' + node.type + ': "' + this.orig + '"');
+    }
+
+    var eos = this.eos();
+    var tok = this.prev();
+    if (tok.type !== 'eos') {
+      this.ast.nodes.push(eos);
+    }
+
+    return this.ast;
+  }
+};
 
-    // (2) Recurse on each half.
+/**
+ * Visit `node` with the given `fn`
+ */
 
-    doQuickSort(ary, comparator, p, q - 1);
-    doQuickSort(ary, comparator, q + 1, r);
+function visit(node, fn) {
+  if (!node.visited) {
+    define(node, 'visited', true);
+    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
   }
+  return node;
 }
 
 /**
- * Sort the given array in-place with the given comparator function.
- *
- * @param {Array} ary
- *        An array to sort.
- * @param {function} comparator
- *        Function to use to compare two items.
+ * Map visit over array of `nodes`.
  */
-exports.quickSort = function (ary, comparator) {
-  doQuickSort(ary, comparator, 0, ary.length - 1);
-};
 
+function mapVisit(nodes, fn) {
+  var len = nodes.length;
+  var idx = -1;
+  while (++idx < len) {
+    visit(nodes[idx], fn);
+  }
+}
+
+function hasOpen(node) {
+  return node.nodes && node.nodes[0].type === (node.type + '.open');
+}
 
-/***/ }),
-/* 684 */
-/***/ (function(module, exports, __webpack_require__) {
+function hasClose(node) {
+  return node.nodes && utils.last(node.nodes).type === (node.type + '.close');
+}
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
+function hasDelims(node) {
+  return hasOpen(node) && hasClose(node);
+}
+
+/**
+ * Expose `Parser`
  */
 
-var SourceMapGenerator = __webpack_require__(675).SourceMapGenerator;
-var util = __webpack_require__(678);
+module.exports = Parser;
 
-// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
-// operating systems these days (capturing the result).
-var REGEX_NEWLINE = /(\r?\n)/;
 
-// Newline character code for charCodeAt() comparisons
-var NEWLINE_CODE = 10;
+/***/ }),
 
-// Private symbol for identifying `SourceNode`s when multiple versions of
-// the source-map library are loaded. This MUST NOT CHANGE across
-// versions!
-var isSourceNode = "$$$isSourceNode$$$";
+/***/ "../../node_modules/snapdragon/lib/position.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
 
-/**
- * SourceNodes provide a way to abstract over interpolating/concatenating
- * snippets of generated JavaScript source code while maintaining the line and
- * column information associated with the original source code.
- *
- * @param aLine The original line number.
- * @param aColumn The original column number.
- * @param aSource The original source's filename.
- * @param aChunks Optional. An array of strings which are snippets of
- *        generated JS, or other SourceNodes.
- * @param aName The original identifier.
- */
-function SourceNode(aLine, aColumn, aSource, aChunks, aName) {
-  this.children = [];
-  this.sourceContents = {};
-  this.line = aLine == null ? null : aLine;
-  this.column = aColumn == null ? null : aColumn;
-  this.source = aSource == null ? null : aSource;
-  this.name = aName == null ? null : aName;
-  this[isSourceNode] = true;
-  if (aChunks != null) this.add(aChunks);
-}
+
+var define = __webpack_require__("../../node_modules/define-property/index.js");
 
 /**
- * Creates a SourceNode from generated code and a SourceMapConsumer.
- *
- * @param aGeneratedCode The generated code
- * @param aSourceMapConsumer The SourceMap for the generated code
- * @param aRelativePath Optional. The path that relative sources in the
- *        SourceMapConsumer should be relative to.
+ * Store position for a node
  */
-SourceNode.fromStringWithSourceMap =
-  function SourceNode_fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) {
-    // The SourceNode we want to fill with the generated code
-    // and the SourceMap
-    var node = new SourceNode();
 
-    // All even indices of this array are one line of the generated code,
-    // while all odd indices are the newlines between two adjacent lines
-    // (since `REGEX_NEWLINE` captures its match).
-    // Processed fragments are accessed by calling `shiftNextLine`.
-    var remainingLines = aGeneratedCode.split(REGEX_NEWLINE);
-    var remainingLinesIndex = 0;
-    var shiftNextLine = function() {
-      var lineContents = getNextLine();
-      // The last line of a file might not have a newline.
-      var newLine = getNextLine() || "";
-      return lineContents + newLine;
+module.exports = function Position(start, parser) {
+  this.start = start;
+  this.end = { line: parser.line, column: parser.column };
+  define(this, 'content', parser.orig);
+  define(this, 'source', parser.options.source);
+};
 
-      function getNextLine() {
-        return remainingLinesIndex < remainingLines.length ?
-            remainingLines[remainingLinesIndex++] : undefined;
-      }
-    };
 
-    // We need to remember the position of "remainingLines"
-    var lastGeneratedLine = 1, lastGeneratedColumn = 0;
+/***/ }),
 
-    // The generate SourceNodes we need a code range.
-    // To extract it current and last mapping is used.
-    // Here we store the last mapping.
-    var lastMapping = null;
+/***/ "../../node_modules/snapdragon/lib/source-maps.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    aSourceMapConsumer.eachMapping(function (mapping) {
-      if (lastMapping !== null) {
-        // We add the code from "lastMapping" to "mapping":
-        // First check if there is a new line in between.
-        if (lastGeneratedLine < mapping.generatedLine) {
-          // Associate first line with "lastMapping"
-          addMappingWithCode(lastMapping, shiftNextLine());
-          lastGeneratedLine++;
-          lastGeneratedColumn = 0;
-          // The remaining code is added without mapping
-        } else {
-          // There is no new line in between.
-          // Associate the code between "lastGeneratedColumn" and
-          // "mapping.generatedColumn" with "lastMapping"
-          var nextLine = remainingLines[remainingLinesIndex];
-          var code = nextLine.substr(0, mapping.generatedColumn -
-                                        lastGeneratedColumn);
-          remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
-                                              lastGeneratedColumn);
-          lastGeneratedColumn = mapping.generatedColumn;
-          addMappingWithCode(lastMapping, code);
-          // No more remaining code, continue
-          lastMapping = mapping;
-          return;
-        }
-      }
-      // We add the generated code until the first mapping
-      // to the SourceNode without any mapping.
-      // Each line is added as separate string.
-      while (lastGeneratedLine < mapping.generatedLine) {
-        node.add(shiftNextLine());
-        lastGeneratedLine++;
-      }
-      if (lastGeneratedColumn < mapping.generatedColumn) {
-        var nextLine = remainingLines[remainingLinesIndex];
-        node.add(nextLine.substr(0, mapping.generatedColumn));
-        remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
-        lastGeneratedColumn = mapping.generatedColumn;
-      }
-      lastMapping = mapping;
-    }, this);
-    // We have processed all mappings.
-    if (remainingLinesIndex < remainingLines.length) {
-      if (lastMapping) {
-        // Associate the remaining code in the current line with "lastMapping"
-        addMappingWithCode(lastMapping, shiftNextLine());
-      }
-      // and add the remaining lines without any mapping
-      node.add(remainingLines.splice(remainingLinesIndex).join(""));
-    }
+"use strict";
 
-    // Copy sourcesContent into SourceNode
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        if (aRelativePath != null) {
-          sourceFile = util.join(aRelativePath, sourceFile);
-        }
-        node.setSourceContent(sourceFile, content);
-      }
-    });
 
-    return node;
+var fs = __webpack_require__("fs");
+var path = __webpack_require__("path");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
+var utils = __webpack_require__("../../node_modules/snapdragon/lib/utils.js");
 
-    function addMappingWithCode(mapping, code) {
-      if (mapping === null || mapping.source === undefined) {
-        node.add(code);
-      } else {
-        var source = aRelativePath
-          ? util.join(aRelativePath, mapping.source)
-          : mapping.source;
-        node.add(new SourceNode(mapping.originalLine,
-                                mapping.originalColumn,
-                                source,
-                                code,
-                                mapping.name));
-      }
-    }
-  };
+/**
+ * Expose `mixin()`.
+ * This code is based on `source-maps-support.js` in reworkcss/css
+ * https://github.com/reworkcss/css/blob/master/lib/stringify/source-map-support.js
+ * Copyright (c) 2012 TJ Holowaychuk <tj@vision-media.ca>
+ */
+
+module.exports = mixin;
 
 /**
- * Add a chunk of generated JS to this source node.
+ * Mixin source map support into `compiler`.
  *
- * @param aChunk A string snippet of generated JS code, another instance of
- *        SourceNode, or an array where each member is one of those things.
+ * @param {Object} `compiler`
+ * @api public
  */
-SourceNode.prototype.add = function SourceNode_add(aChunk) {
-  if (Array.isArray(aChunk)) {
-    aChunk.forEach(function (chunk) {
-      this.add(chunk);
-    }, this);
-  }
-  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
-    if (aChunk) {
-      this.children.push(aChunk);
-    }
-  }
-  else {
-    throw new TypeError(
-      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
-    );
+
+function mixin(compiler) {
+  define(compiler, '_comment', compiler.comment);
+  compiler.map = new utils.SourceMap.SourceMapGenerator();
+  compiler.position = { line: 1, column: 1 };
+  compiler.content = {};
+  compiler.files = {};
+
+  for (var key in exports) {
+    define(compiler, key, exports[key]);
   }
-  return this;
-};
+}
 
 /**
- * Add a chunk of generated JS to the beginning of this source node.
+ * Update position.
  *
- * @param aChunk A string snippet of generated JS code, another instance of
- *        SourceNode, or an array where each member is one of those things.
+ * @param {String} str
  */
-SourceNode.prototype.prepend = function SourceNode_prepend(aChunk) {
-  if (Array.isArray(aChunk)) {
-    for (var i = aChunk.length-1; i >= 0; i--) {
-      this.prepend(aChunk[i]);
-    }
-  }
-  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
-    this.children.unshift(aChunk);
-  }
-  else {
-    throw new TypeError(
-      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
-    );
-  }
-  return this;
+
+exports.updatePosition = function(str) {
+  var lines = str.match(/\n/g);
+  if (lines) this.position.line += lines.length;
+  var i = str.lastIndexOf('\n');
+  this.position.column = ~i ? str.length - i : this.position.column + str.length;
 };
 
 /**
- * Walk over the tree of JS snippets in this node and its children. The
- * walking function is called once for each snippet of JS and is passed that
- * snippet and the its original associated source's line/column location.
+ * Emit `str` with `position`.
  *
- * @param aFn The traversal function.
+ * @param {String} str
+ * @param {Object} [pos]
+ * @return {String}
  */
-SourceNode.prototype.walk = function SourceNode_walk(aFn) {
-  var chunk;
-  for (var i = 0, len = this.children.length; i < len; i++) {
-    chunk = this.children[i];
-    if (chunk[isSourceNode]) {
-      chunk.walk(aFn);
+
+exports.emit = function(str, node) {
+  var position = node.position || {};
+  var source = position.source;
+  if (source) {
+    if (position.filepath) {
+      source = utils.unixify(position.filepath);
     }
-    else {
-      if (chunk !== '') {
-        aFn(chunk, { source: this.source,
-                     line: this.line,
-                     column: this.column,
-                     name: this.name });
+
+    this.map.addMapping({
+      source: source,
+      generated: {
+        line: this.position.line,
+        column: Math.max(this.position.column - 1, 0)
+      },
+      original: {
+        line: position.start.line,
+        column: position.start.column - 1
       }
+    });
+
+    if (position.content) {
+      this.addContent(source, position);
+    }
+    if (position.filepath) {
+      this.addFile(source, position);
     }
+
+    this.updatePosition(str);
+    this.output += str;
   }
+  return str;
 };
 
 /**
- * Like `String.prototype.join` except for SourceNodes. Inserts `aStr` between
- * each of `this.children`.
- *
- * @param aSep The separator.
+ * Adds a file to the source map output if it has not already been added
+ * @param {String} `file`
+ * @param {Object} `pos`
  */
-SourceNode.prototype.join = function SourceNode_join(aSep) {
-  var newChildren;
-  var i;
-  var len = this.children.length;
-  if (len > 0) {
-    newChildren = [];
-    for (i = 0; i < len-1; i++) {
-      newChildren.push(this.children[i]);
-      newChildren.push(aSep);
-    }
-    newChildren.push(this.children[i]);
-    this.children = newChildren;
-  }
-  return this;
+
+exports.addFile = function(file, position) {
+  if (typeof position.content !== 'string') return;
+  if (Object.prototype.hasOwnProperty.call(this.files, file)) return;
+  this.files[file] = position.content;
 };
 
 /**
- * Call String.prototype.replace on the very right-most source snippet. Useful
- * for trimming whitespace from the end of a source node, etc.
- *
- * @param aPattern The pattern to replace.
- * @param aReplacement The thing to replace the pattern with.
+ * Adds a content source to the source map output if it has not already been added
+ * @param {String} `source`
+ * @param {Object} `position`
  */
-SourceNode.prototype.replaceRight = function SourceNode_replaceRight(aPattern, aReplacement) {
-  var lastChild = this.children[this.children.length - 1];
-  if (lastChild[isSourceNode]) {
-    lastChild.replaceRight(aPattern, aReplacement);
-  }
-  else if (typeof lastChild === 'string') {
-    this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement);
-  }
-  else {
-    this.children.push(''.replace(aPattern, aReplacement));
-  }
-  return this;
+
+exports.addContent = function(source, position) {
+  if (typeof position.content !== 'string') return;
+  if (Object.prototype.hasOwnProperty.call(this.content, source)) return;
+  this.map.setSourceContent(source, position.content);
 };
 
 /**
- * Set the source content for a source file. This will be added to the SourceMapGenerator
- * in the sourcesContent field.
- *
- * @param aSourceFile The filename of the source file
- * @param aSourceContent The content of the source file
+ * Applies any original source maps to the output and embeds the source file
+ * contents in the source map.
  */
-SourceNode.prototype.setSourceContent =
-  function SourceNode_setSourceContent(aSourceFile, aSourceContent) {
-    this.sourceContents[util.toSetString(aSourceFile)] = aSourceContent;
-  };
 
-/**
- * Walk over the tree of SourceNodes. The walking function is called for each
- * source file content and is passed the filename and source content.
- *
- * @param aFn The traversal function.
- */
-SourceNode.prototype.walkSourceContents =
-  function SourceNode_walkSourceContents(aFn) {
-    for (var i = 0, len = this.children.length; i < len; i++) {
-      if (this.children[i][isSourceNode]) {
-        this.children[i].walkSourceContents(aFn);
-      }
-    }
+exports.applySourceMaps = function() {
+  Object.keys(this.files).forEach(function(file) {
+    var content = this.files[file];
+    this.map.setSourceContent(file, content);
 
-    var sources = Object.keys(this.sourceContents);
-    for (var i = 0, len = sources.length; i < len; i++) {
-      aFn(util.fromSetString(sources[i]), this.sourceContents[sources[i]]);
+    if (this.options.inputSourcemaps === true) {
+      var originalMap = utils.sourceMapResolve.resolveSync(content, file, fs.readFileSync);
+      if (originalMap) {
+        var map = new utils.SourceMap.SourceMapConsumer(originalMap.map);
+        var relativeTo = originalMap.sourcesRelativeTo;
+        this.map.applySourceMap(map, file, utils.unixify(path.dirname(relativeTo)));
+      }
     }
-  };
-
-/**
- * Return the string representation of this source node. Walks over the tree
- * and concatenates all the various snippets together to one string.
- */
-SourceNode.prototype.toString = function SourceNode_toString() {
-  var str = "";
-  this.walk(function (chunk) {
-    str += chunk;
-  });
-  return str;
+  }, this);
 };
 
 /**
- * Returns the string representation of this source node along with a source
- * map.
- */
-SourceNode.prototype.toStringWithSourceMap = function SourceNode_toStringWithSourceMap(aArgs) {
-  var generated = {
-    code: "",
-    line: 1,
-    column: 0
-  };
-  var map = new SourceMapGenerator(aArgs);
-  var sourceMappingActive = false;
-  var lastOriginalSource = null;
-  var lastOriginalLine = null;
-  var lastOriginalColumn = null;
-  var lastOriginalName = null;
-  this.walk(function (chunk, original) {
-    generated.code += chunk;
-    if (original.source !== null
-        && original.line !== null
-        && original.column !== null) {
-      if(lastOriginalSource !== original.source
-         || lastOriginalLine !== original.line
-         || lastOriginalColumn !== original.column
-         || lastOriginalName !== original.name) {
-        map.addMapping({
-          source: original.source,
-          original: {
-            line: original.line,
-            column: original.column
-          },
-          generated: {
-            line: generated.line,
-            column: generated.column
-          },
-          name: original.name
-        });
-      }
-      lastOriginalSource = original.source;
-      lastOriginalLine = original.line;
-      lastOriginalColumn = original.column;
-      lastOriginalName = original.name;
-      sourceMappingActive = true;
-    } else if (sourceMappingActive) {
-      map.addMapping({
-        generated: {
-          line: generated.line,
-          column: generated.column
-        }
-      });
-      lastOriginalSource = null;
-      sourceMappingActive = false;
-    }
-    for (var idx = 0, length = chunk.length; idx < length; idx++) {
-      if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
-        generated.line++;
-        generated.column = 0;
-        // Mappings end at eol
-        if (idx + 1 === length) {
-          lastOriginalSource = null;
-          sourceMappingActive = false;
-        } else if (sourceMappingActive) {
-          map.addMapping({
-            source: original.source,
-            original: {
-              line: original.line,
-              column: original.column
-            },
-            generated: {
-              line: generated.line,
-              column: generated.column
-            },
-            name: original.name
-          });
-        }
-      } else {
-        generated.column++;
-      }
-    }
-  });
-  this.walkSourceContents(function (sourceFile, sourceContent) {
-    map.setSourceContent(sourceFile, sourceContent);
-  });
+ * Process comments, drops sourceMap comments.
+ * @param {Object} node
+ */
 
-  return { code: generated.code, map: map };
+exports.comment = function(node) {
+  if (/^# sourceMappingURL=/.test(node.comment)) {
+    return this.emit('', node.position);
+  }
+  return this._comment(node);
 };
 
-exports.SourceNode = SourceNode;
-
 
 /***/ }),
-/* 685 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2014, 2015, 2016, 2017 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var sourceMappingURL   = __webpack_require__(686)
-var resolveUrl         = __webpack_require__(687)
-var decodeUriComponent = __webpack_require__(688)
-var urix               = __webpack_require__(690)
-var atob               = __webpack_require__(691)
-
 
+/***/ "../../node_modules/snapdragon/lib/utils.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-function callbackAsync(callback, error, result) {
-  setImmediate(function() { callback(error, result) })
-}
+"use strict";
 
-function parseMapToJSON(string, data) {
-  try {
-    return JSON.parse(string.replace(/^\)\]\}'/, ""))
-  } catch (error) {
-    error.sourceMapData = data
-    throw error
-  }
-}
 
-function readSync(read, url, data) {
-  var readUrl = decodeUriComponent(url)
-  try {
-    return String(read(readUrl))
-  } catch (error) {
-    error.sourceMapData = data
-    throw error
-  }
-}
+/**
+ * Module dependencies
+ */
 
+exports.extend = __webpack_require__("../../node_modules/extend-shallow/index.js");
+exports.SourceMap = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/source-map.js");
+exports.sourceMapResolve = __webpack_require__("../../node_modules/source-map-resolve/lib/source-map-resolve-node.js");
 
+/**
+ * Convert backslash in the given string to forward slashes
+ */
 
-function resolveSourceMap(code, codeUrl, read, callback) {
-  var mapData
-  try {
-    mapData = resolveSourceMapHelper(code, codeUrl)
-  } catch (error) {
-    return callbackAsync(callback, error)
-  }
-  if (!mapData || mapData.map) {
-    return callbackAsync(callback, null, mapData)
-  }
-  var readUrl = decodeUriComponent(mapData.url)
-  read(readUrl, function(error, result) {
-    if (error) {
-      error.sourceMapData = mapData
-      return callback(error)
-    }
-    mapData.map = String(result)
-    try {
-      mapData.map = parseMapToJSON(mapData.map, mapData)
-    } catch (error) {
-      return callback(error)
-    }
-    callback(null, mapData)
-  })
-}
+exports.unixify = function(fp) {
+  return fp.split(/\\+/).join('/');
+};
 
-function resolveSourceMapSync(code, codeUrl, read) {
-  var mapData = resolveSourceMapHelper(code, codeUrl)
-  if (!mapData || mapData.map) {
-    return mapData
-  }
-  mapData.map = readSync(read, mapData.url, mapData)
-  mapData.map = parseMapToJSON(mapData.map, mapData)
-  return mapData
-}
+/**
+ * Return true if `val` is a non-empty string
+ *
+ * @param {String} `str`
+ * @return {Boolean}
+ */
 
-var dataUriRegex = /^data:([^,;]*)(;[^,;]*)*(?:,(.*))?$/
-var jsonMimeTypeRegex = /^(?:application|text)\/json$/
+exports.isString = function(str) {
+  return str && typeof str === 'string';
+};
 
-function resolveSourceMapHelper(code, codeUrl) {
-  codeUrl = urix(codeUrl)
+/**
+ * Cast `val` to an array
+ * @return {Array}
+ */
 
-  var url = sourceMappingURL.getFrom(code)
-  if (!url) {
-    return null
-  }
+exports.arrayify = function(val) {
+  if (typeof val === 'string') return [val];
+  return val ? (Array.isArray(val) ? val : [val]) : [];
+};
 
-  var dataUri = url.match(dataUriRegex)
-  if (dataUri) {
-    var mimeType = dataUri[1]
-    var lastParameter = dataUri[2] || ""
-    var encoded = dataUri[3] || ""
-    var data = {
-      sourceMappingURL: url,
-      url: null,
-      sourcesRelativeTo: codeUrl,
-      map: encoded
-    }
-    if (!jsonMimeTypeRegex.test(mimeType)) {
-      var error = new Error("Unuseful data uri mime type: " + (mimeType || "text/plain"))
-      error.sourceMapData = data
-      throw error
-    }
-    data.map = parseMapToJSON(
-      lastParameter === ";base64" ? atob(encoded) : decodeURIComponent(encoded),
-      data
-    )
-    return data
-  }
+/**
+ * Get the last `n` element from the given `array`
+ * @param {Array} `array`
+ * @return {*}
+ */
 
-  var mapUrl = resolveUrl(codeUrl, url)
-  return {
-    sourceMappingURL: url,
-    url: mapUrl,
-    sourcesRelativeTo: mapUrl,
-    map: null
-  }
-}
+exports.last = function(arr, n) {
+  return arr[arr.length - (n || 1)];
+};
 
 
+/***/ }),
 
-function resolveSources(map, mapUrl, read, options, callback) {
-  if (typeof options === "function") {
-    callback = options
-    options = {}
-  }
-  var pending = map.sources ? map.sources.length : 0
-  var result = {
-    sourcesResolved: [],
-    sourcesContent:  []
-  }
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/array-set.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (pending === 0) {
-    callbackAsync(callback, null, result)
-    return
-  }
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
-  var done = function() {
-    pending--
-    if (pending === 0) {
-      callback(null, result)
-    }
-  }
+var util = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/util.js");
+var has = Object.prototype.hasOwnProperty;
+var hasNativeMap = typeof Map !== "undefined";
 
-  resolveSourcesHelper(map, mapUrl, options, function(fullUrl, sourceContent, index) {
-    result.sourcesResolved[index] = fullUrl
-    if (typeof sourceContent === "string") {
-      result.sourcesContent[index] = sourceContent
-      callbackAsync(done, null)
-    } else {
-      var readUrl = decodeUriComponent(fullUrl)
-      read(readUrl, function(error, source) {
-        result.sourcesContent[index] = error ? error : String(source)
-        done()
-      })
-    }
-  })
+/**
+ * A data structure which is a combination of an array and a set. Adding a new
+ * member is O(1), testing for membership is O(1), and finding the index of an
+ * element is O(1). Removing elements from the set is not supported. Only
+ * strings are supported for membership.
+ */
+function ArraySet() {
+  this._array = [];
+  this._set = hasNativeMap ? new Map() : Object.create(null);
 }
 
-function resolveSourcesSync(map, mapUrl, read, options) {
-  var result = {
-    sourcesResolved: [],
-    sourcesContent:  []
-  }
-
-  if (!map.sources || map.sources.length === 0) {
-    return result
+/**
+ * Static method for creating ArraySet instances from an existing array.
+ */
+ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
+  var set = new ArraySet();
+  for (var i = 0, len = aArray.length; i < len; i++) {
+    set.add(aArray[i], aAllowDuplicates);
   }
+  return set;
+};
 
-  resolveSourcesHelper(map, mapUrl, options, function(fullUrl, sourceContent, index) {
-    result.sourcesResolved[index] = fullUrl
-    if (read !== null) {
-      if (typeof sourceContent === "string") {
-        result.sourcesContent[index] = sourceContent
-      } else {
-        var readUrl = decodeUriComponent(fullUrl)
-        try {
-          result.sourcesContent[index] = String(read(readUrl))
-        } catch (error) {
-          result.sourcesContent[index] = error
-        }
-      }
-    }
-  })
-
-  return result
-}
-
-var endingSlash = /\/?$/
+/**
+ * Return how many unique items are in this ArraySet. If duplicates have been
+ * added, than those do not count towards the size.
+ *
+ * @returns Number
+ */
+ArraySet.prototype.size = function ArraySet_size() {
+  return hasNativeMap ? this._set.size : Object.getOwnPropertyNames(this._set).length;
+};
 
-function resolveSourcesHelper(map, mapUrl, options, fn) {
-  options = options || {}
-  mapUrl = urix(mapUrl)
-  var fullUrl
-  var sourceContent
-  var sourceRoot
-  for (var index = 0, len = map.sources.length; index < len; index++) {
-    sourceRoot = null
-    if (typeof options.sourceRoot === "string") {
-      sourceRoot = options.sourceRoot
-    } else if (typeof map.sourceRoot === "string" && options.sourceRoot !== false) {
-      sourceRoot = map.sourceRoot
-    }
-    // If the sourceRoot is the empty string, it is equivalent to not setting
-    // the property at all.
-    if (sourceRoot === null || sourceRoot === '') {
-      fullUrl = resolveUrl(mapUrl, map.sources[index])
+/**
+ * Add the given string to this set.
+ *
+ * @param String aStr
+ */
+ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
+  var sStr = hasNativeMap ? aStr : util.toSetString(aStr);
+  var isDuplicate = hasNativeMap ? this.has(aStr) : has.call(this._set, sStr);
+  var idx = this._array.length;
+  if (!isDuplicate || aAllowDuplicates) {
+    this._array.push(aStr);
+  }
+  if (!isDuplicate) {
+    if (hasNativeMap) {
+      this._set.set(aStr, idx);
     } else {
-      // Make sure that the sourceRoot ends with a slash, so that `/scripts/subdir` becomes
-      // `/scripts/subdir/<source>`, not `/scripts/<source>`. Pointing to a file as source root
-      // does not make sense.
-      fullUrl = resolveUrl(mapUrl, sourceRoot.replace(endingSlash, "/"), map.sources[index])
+      this._set[sStr] = idx;
     }
-    sourceContent = (map.sourcesContent || [])[index]
-    fn(fullUrl, sourceContent, index)
   }
-}
-
-
+};
 
-function resolve(code, codeUrl, read, options, callback) {
-  if (typeof options === "function") {
-    callback = options
-    options = {}
-  }
-  if (code === null) {
-    var mapUrl = codeUrl
-    var data = {
-      sourceMappingURL: null,
-      url: mapUrl,
-      sourcesRelativeTo: mapUrl,
-      map: null
-    }
-    var readUrl = decodeUriComponent(mapUrl)
-    read(readUrl, function(error, result) {
-      if (error) {
-        error.sourceMapData = data
-        return callback(error)
-      }
-      data.map = String(result)
-      try {
-        data.map = parseMapToJSON(data.map, data)
-      } catch (error) {
-        return callback(error)
-      }
-      _resolveSources(data)
-    })
+/**
+ * Is the given string a member of this set?
+ *
+ * @param String aStr
+ */
+ArraySet.prototype.has = function ArraySet_has(aStr) {
+  if (hasNativeMap) {
+    return this._set.has(aStr);
   } else {
-    resolveSourceMap(code, codeUrl, read, function(error, mapData) {
-      if (error) {
-        return callback(error)
-      }
-      if (!mapData) {
-        return callback(null, null)
-      }
-      _resolveSources(mapData)
-    })
-  }
-
-  function _resolveSources(mapData) {
-    resolveSources(mapData.map, mapData.sourcesRelativeTo, read, options, function(error, result) {
-      if (error) {
-        return callback(error)
-      }
-      mapData.sourcesResolved = result.sourcesResolved
-      mapData.sourcesContent  = result.sourcesContent
-      callback(null, mapData)
-    })
+    var sStr = util.toSetString(aStr);
+    return has.call(this._set, sStr);
   }
-}
+};
 
-function resolveSync(code, codeUrl, read, options) {
-  var mapData
-  if (code === null) {
-    var mapUrl = codeUrl
-    mapData = {
-      sourceMappingURL: null,
-      url: mapUrl,
-      sourcesRelativeTo: mapUrl,
-      map: null
+/**
+ * What is the index of the given string in the array?
+ *
+ * @param String aStr
+ */
+ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
+  if (hasNativeMap) {
+    var idx = this._set.get(aStr);
+    if (idx >= 0) {
+        return idx;
     }
-    mapData.map = readSync(read, mapUrl, mapData)
-    mapData.map = parseMapToJSON(mapData.map, mapData)
   } else {
-    mapData = resolveSourceMapSync(code, codeUrl, read)
-    if (!mapData) {
-      return null
+    var sStr = util.toSetString(aStr);
+    if (has.call(this._set, sStr)) {
+      return this._set[sStr];
     }
   }
-  var result = resolveSourcesSync(mapData.map, mapData.sourcesRelativeTo, read, options)
-  mapData.sourcesResolved = result.sourcesResolved
-  mapData.sourcesContent  = result.sourcesContent
-  return mapData
-}
-
-
-
-module.exports = {
-  resolveSourceMap:     resolveSourceMap,
-  resolveSourceMapSync: resolveSourceMapSync,
-  resolveSources:       resolveSources,
-  resolveSourcesSync:   resolveSourcesSync,
-  resolve:              resolve,
-  resolveSync:          resolveSync,
-  parseMapToJSON:       parseMapToJSON
-}
-
-
-/***/ }),
-/* 686 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
 
-void (function(root, factory) {
-  if (true) {
-    !(__WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) :
-				__WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))
-  } else {}
-}(this, function() {
+  throw new Error('"' + aStr + '" is not in the set.');
+};
 
-  var innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/
+/**
+ * What is the element at the given index?
+ *
+ * @param Number aIdx
+ */
+ArraySet.prototype.at = function ArraySet_at(aIdx) {
+  if (aIdx >= 0 && aIdx < this._array.length) {
+    return this._array[aIdx];
+  }
+  throw new Error('No element indexed by ' + aIdx);
+};
 
-  var regex = RegExp(
-    "(?:" +
-      "/\\*" +
-      "(?:\\s*\r?\n(?://)?)?" +
-      "(?:" + innerRegex.source + ")" +
-      "\\s*" +
-      "\\*/" +
-      "|" +
-      "//(?:" + innerRegex.source + ")" +
-    ")" +
-    "\\s*"
-  )
+/**
+ * Returns the array representation of this set (which has the proper indices
+ * indicated by indexOf). Note that this is a copy of the internal array used
+ * for storing the members so that no one can mess with internal state.
+ */
+ArraySet.prototype.toArray = function ArraySet_toArray() {
+  return this._array.slice();
+};
 
-  return {
+exports.ArraySet = ArraySet;
 
-    regex: regex,
-    _innerRegex: innerRegex,
 
-    getFrom: function(code) {
-      var match = code.match(regex)
-      return (match ? match[1] || match[2] || "" : null)
-    },
+/***/ }),
 
-    existsIn: function(code) {
-      return regex.test(code)
-    },
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/base64-vlq.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    removeFrom: function(code) {
-      return code.replace(regex, "")
-    },
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Based on the Base 64 VLQ implementation in Closure Compiler:
+ * https://code.google.com/p/closure-compiler/source/browse/trunk/src/com/google/debugging/sourcemap/Base64VLQ.java
+ *
+ * Copyright 2011 The Closure Compiler Authors. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials provided
+ *    with the distribution.
+ *  * Neither the name of Google Inc. nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
-    insertBefore: function(code, string) {
-      var match = code.match(regex)
-      if (match) {
-        return code.slice(0, match.index) + string + code.slice(match.index)
-      } else {
-        return code + string
-      }
-    }
-  }
+var base64 = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/base64.js");
 
-}));
+// 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,
+// the next four bits are the actual value, and the 6th bit is the
+// continuation bit. The continuation bit tells us whether there are more
+// digits in this value following this digit.
+//
+//   Continuation
+//   |    Sign
+//   |    |
+//   V    V
+//   101011
 
+var VLQ_BASE_SHIFT = 5;
 
-/***/ }),
-/* 687 */
-/***/ (function(module, exports, __webpack_require__) {
+// binary: 100000
+var VLQ_BASE = 1 << VLQ_BASE_SHIFT;
 
-// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
+// binary: 011111
+var VLQ_BASE_MASK = VLQ_BASE - 1;
 
-var url = __webpack_require__(203)
+// binary: 100000
+var VLQ_CONTINUATION_BIT = VLQ_BASE;
 
-function resolveUrl(/* ...urls */) {
-  return Array.prototype.reduce.call(arguments, function(resolved, nextUrl) {
-    return url.resolve(resolved, nextUrl)
-  })
+/**
+ * Converts from a two-complement value to a value where the sign bit is
+ * placed in the least significant bit.  For example, as decimals:
+ *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
+ *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
+ */
+function toVLQSigned(aValue) {
+  return aValue < 0
+    ? ((-aValue) << 1) + 1
+    : (aValue << 1) + 0;
 }
 
-module.exports = resolveUrl
-
-
-/***/ }),
-/* 688 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Copyright 2017 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var decodeUriComponent = __webpack_require__(689)
-
-function customDecodeUriComponent(string) {
-  // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
-  return decodeUriComponent(string.replace(/\+/g, "%2B"))
+/**
+ * Converts to a two-complement value from a value where the sign bit is
+ * placed in the least significant bit.  For example, as decimals:
+ *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
+ *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
+ */
+function fromVLQSigned(aValue) {
+  var isNegative = (aValue & 1) === 1;
+  var shifted = aValue >> 1;
+  return isNegative
+    ? -shifted
+    : shifted;
 }
 
-module.exports = customDecodeUriComponent
+/**
+ * Returns the base 64 VLQ encoded value.
+ */
+exports.encode = function base64VLQ_encode(aValue) {
+  var encoded = "";
+  var digit;
 
+  var vlq = toVLQSigned(aValue);
 
-/***/ }),
-/* 689 */
-/***/ (function(module, exports, __webpack_require__) {
+  do {
+    digit = vlq & VLQ_BASE_MASK;
+    vlq >>>= VLQ_BASE_SHIFT;
+    if (vlq > 0) {
+      // There are still more digits in this value, so we must make sure the
+      // continuation bit is marked.
+      digit |= VLQ_CONTINUATION_BIT;
+    }
+    encoded += base64.encode(digit);
+  } while (vlq > 0);
 
-"use strict";
+  return encoded;
+};
 
-var token = '%[a-f0-9]{2}';
-var singleMatcher = new RegExp(token, 'gi');
-var multiMatcher = new RegExp('(' + token + ')+', 'gi');
+/**
+ * Decodes the next base 64 VLQ value from the given string and returns the
+ * value and the rest of the string via the out parameter.
+ */
+exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
+  var strLen = aStr.length;
+  var result = 0;
+  var shift = 0;
+  var continuation, digit;
 
-function decodeComponents(components, split) {
-	try {
-		// Try to decode the entire string first
-		return decodeURIComponent(components.join(''));
-	} catch (err) {
-		// Do nothing
-	}
+  do {
+    if (aIndex >= strLen) {
+      throw new Error("Expected more digits in base 64 VLQ value.");
+    }
 
-	if (components.length === 1) {
-		return components;
-	}
+    digit = base64.decode(aStr.charCodeAt(aIndex++));
+    if (digit === -1) {
+      throw new Error("Invalid base64 digit: " + aStr.charAt(aIndex - 1));
+    }
 
-	split = split || 1;
+    continuation = !!(digit & VLQ_CONTINUATION_BIT);
+    digit &= VLQ_BASE_MASK;
+    result = result + (digit << shift);
+    shift += VLQ_BASE_SHIFT;
+  } while (continuation);
 
-	// Split the array in 2 parts
-	var left = components.slice(0, split);
-	var right = components.slice(split);
+  aOutParam.value = fromVLQSigned(result);
+  aOutParam.rest = aIndex;
+};
 
-	return Array.prototype.concat.call([], decodeComponents(left), decodeComponents(right));
-}
 
-function decode(input) {
-	try {
-		return decodeURIComponent(input);
-	} catch (err) {
-		var tokens = input.match(singleMatcher);
+/***/ }),
 
-		for (var i = 1; i < tokens.length; i++) {
-			input = decodeComponents(tokens, i).join('');
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/base64.js":
+/***/ (function(module, exports) {
 
-			tokens = input.match(singleMatcher);
-		}
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
-		return input;
-	}
-}
+var intToCharMap = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
 
-function customDecodeURIComponent(input) {
-	// Keep track of all the replacements and prefill the map with the `BOM`
-	var replaceMap = {
-		'%FE%FF': '\uFFFD\uFFFD',
-		'%FF%FE': '\uFFFD\uFFFD'
-	};
+/**
+ * Encode an integer in the range of 0 to 63 to a single base 64 digit.
+ */
+exports.encode = function (number) {
+  if (0 <= number && number < intToCharMap.length) {
+    return intToCharMap[number];
+  }
+  throw new TypeError("Must be between 0 and 63: " + number);
+};
 
-	var match = multiMatcher.exec(input);
-	while (match) {
-		try {
-			// Decode as big chunks as possible
-			replaceMap[match[0]] = decodeURIComponent(match[0]);
-		} catch (err) {
-			var result = decode(match[0]);
+/**
+ * Decode a single base 64 character code digit to an integer. Returns -1 on
+ * failure.
+ */
+exports.decode = function (charCode) {
+  var bigA = 65;     // 'A'
+  var bigZ = 90;     // 'Z'
 
-			if (result !== match[0]) {
-				replaceMap[match[0]] = result;
-			}
-		}
+  var littleA = 97;  // 'a'
+  var littleZ = 122; // 'z'
 
-		match = multiMatcher.exec(input);
-	}
+  var zero = 48;     // '0'
+  var nine = 57;     // '9'
 
-	// Add `%C2` at the end of the map to make sure it does not replace the combinator before everything else
-	replaceMap['%C2'] = '\uFFFD';
+  var plus = 43;     // '+'
+  var slash = 47;    // '/'
 
-	var entries = Object.keys(replaceMap);
+  var littleOffset = 26;
+  var numberOffset = 52;
 
-	for (var i = 0; i < entries.length; i++) {
-		// Replace all decoded components
-		var key = entries[i];
-		input = input.replace(new RegExp(key, 'g'), replaceMap[key]);
-	}
+  // 0 - 25: ABCDEFGHIJKLMNOPQRSTUVWXYZ
+  if (bigA <= charCode && charCode <= bigZ) {
+    return (charCode - bigA);
+  }
 
-	return input;
-}
+  // 26 - 51: abcdefghijklmnopqrstuvwxyz
+  if (littleA <= charCode && charCode <= littleZ) {
+    return (charCode - littleA + littleOffset);
+  }
 
-module.exports = function (encodedURI) {
-	if (typeof encodedURI !== 'string') {
-		throw new TypeError('Expected `encodedURI` to be of type `string`, got `' + typeof encodedURI + '`');
-	}
+  // 52 - 61: 0123456789
+  if (zero <= charCode && charCode <= nine) {
+    return (charCode - zero + numberOffset);
+  }
 
-	try {
-		encodedURI = encodedURI.replace(/\+/g, ' ');
+  // 62: +
+  if (charCode == plus) {
+    return 62;
+  }
 
-		// Try the built in decoder first
-		return decodeURIComponent(encodedURI);
-	} catch (err) {
-		// Fallback to a more advanced decoder
-		return customDecodeURIComponent(encodedURI);
-	}
+  // 63: /
+  if (charCode == slash) {
+    return 63;
+  }
+
+  // Invalid base64 digit.
+  return -1;
 };
 
 
 /***/ }),
-/* 690 */
-/***/ (function(module, exports, __webpack_require__) {
 
-// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-var path = __webpack_require__(4)
-
-"use strict"
-
-function urix(aPath) {
-  if (path.sep === "\\") {
-    return aPath
-      .replace(/\\/g, "/")
-      .replace(/^[a-z]:\/?/i, "/")
-  }
-  return aPath
-}
-
-module.exports = urix
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/binary-search.js":
+/***/ (function(module, exports) {
 
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
-/***/ }),
-/* 691 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.GREATEST_LOWER_BOUND = 1;
+exports.LEAST_UPPER_BOUND = 2;
 
-"use strict";
+/**
+ * Recursive implementation of binary search.
+ *
+ * @param aLow Indices here and lower do not contain the needle.
+ * @param aHigh Indices here and higher do not contain the needle.
+ * @param aNeedle The element being searched for.
+ * @param aHaystack The non-empty array being searched.
+ * @param aCompare Function which takes two elements and returns -1, 0, or 1.
+ * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
+ *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
+ *     closest element that is smaller than or greater than the one we are
+ *     searching for, respectively, if the exact element cannot be found.
+ */
+function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
+  // This function terminates when one of the following is true:
+  //
+  //   1. We find the exact element we are looking for.
+  //
+  //   2. We did not find the exact element, but we can return the index of
+  //      the next-closest element.
+  //
+  //   3. We did not find the exact element, and there is no next-closest
+  //      element than the one we are searching for, so we return -1.
+  var mid = Math.floor((aHigh - aLow) / 2) + aLow;
+  var cmp = aCompare(aNeedle, aHaystack[mid], true);
+  if (cmp === 0) {
+    // Found the element we are looking for.
+    return mid;
+  }
+  else if (cmp > 0) {
+    // Our needle is greater than aHaystack[mid].
+    if (aHigh - mid > 1) {
+      // The element is in the upper half.
+      return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias);
+    }
 
+    // The exact needle element was not found in this haystack. Determine if
+    // we are in termination case (3) or (2) and return the appropriate thing.
+    if (aBias == exports.LEAST_UPPER_BOUND) {
+      return aHigh < aHaystack.length ? aHigh : -1;
+    } else {
+      return mid;
+    }
+  }
+  else {
+    // Our needle is less than aHaystack[mid].
+    if (mid - aLow > 1) {
+      // The element is in the lower half.
+      return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias);
+    }
 
-function atob(str) {
-  return Buffer.from(str, 'base64').toString('binary');
+    // we are in termination case (3) or (2) and return the appropriate thing.
+    if (aBias == exports.LEAST_UPPER_BOUND) {
+      return mid;
+    } else {
+      return aLow < 0 ? -1 : aLow;
+    }
+  }
 }
 
-module.exports = atob.atob = atob;
+/**
+ * This is an implementation of binary search which will always try and return
+ * the index of the closest element if there is no exact hit. This is because
+ * mappings between original and generated line/col pairs are single points,
+ * and there is an implicit region between each of them, so a miss just means
+ * that you aren't on the very start of a region.
+ *
+ * @param aNeedle The element you are looking for.
+ * @param aHaystack The array that is being searched.
+ * @param aCompare A function which takes the needle and an element in the
+ *     array and returns -1, 0, or 1 depending on whether the needle is less
+ *     than, equal to, or greater than the element, respectively.
+ * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
+ *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
+ *     closest element that is smaller than or greater than the one we are
+ *     searching for, respectively, if the exact element cannot be found.
+ *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
+ */
+exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
+  if (aHaystack.length === 0) {
+    return -1;
+  }
 
+  var index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
+                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
+  if (index < 0) {
+    return -1;
+  }
 
-/***/ }),
-/* 692 */
-/***/ (function(module, exports, __webpack_require__) {
+  // We have found either the exact element, or the next-closest element than
+  // the one we are searching for. However, there may be more than one such
+  // element. Make sure we always return the smallest of these.
+  while (index - 1 >= 0) {
+    if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) {
+      break;
+    }
+    --index;
+  }
 
-"use strict";
+  return index;
+};
 
 
-var fs = __webpack_require__(132);
-var path = __webpack_require__(4);
-var define = __webpack_require__(659);
-var utils = __webpack_require__(673);
+/***/ }),
 
-/**
- * Expose `mixin()`.
- * This code is based on `source-maps-support.js` in reworkcss/css
- * https://github.com/reworkcss/css/blob/master/lib/stringify/source-map-support.js
- * Copyright (c) 2012 TJ Holowaychuk <tj@vision-media.ca>
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/mapping-list.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2014 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
  */
 
-module.exports = mixin;
+var util = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/util.js");
 
 /**
- * Mixin source map support into `compiler`.
- *
- * @param {Object} `compiler`
- * @api public
+ * Determine whether mappingB is after mappingA with respect to generated
+ * position.
  */
+function generatedPositionAfter(mappingA, mappingB) {
+  // Optimized for most common case
+  var lineA = mappingA.generatedLine;
+  var lineB = mappingB.generatedLine;
+  var columnA = mappingA.generatedColumn;
+  var columnB = mappingB.generatedColumn;
+  return lineB > lineA || lineB == lineA && columnB >= columnA ||
+         util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0;
+}
 
-function mixin(compiler) {
-  define(compiler, '_comment', compiler.comment);
-  compiler.map = new utils.SourceMap.SourceMapGenerator();
-  compiler.position = { line: 1, column: 1 };
-  compiler.content = {};
-  compiler.files = {};
-
-  for (var key in exports) {
-    define(compiler, key, exports[key]);
-  }
+/**
+ * A data structure to provide a sorted view of accumulated mappings in a
+ * performance conscious manner. It trades a neglibable overhead in general
+ * case for a large speedup in case of mappings being added in order.
+ */
+function MappingList() {
+  this._array = [];
+  this._sorted = true;
+  // Serves as infimum
+  this._last = {generatedLine: -1, generatedColumn: 0};
 }
 
 /**
- * Update position.
+ * Iterate through internal items. This method takes the same arguments that
+ * `Array.prototype.forEach` takes.
  *
- * @param {String} str
+ * NOTE: The order of the mappings is NOT guaranteed.
  */
+MappingList.prototype.unsortedForEach =
+  function MappingList_forEach(aCallback, aThisArg) {
+    this._array.forEach(aCallback, aThisArg);
+  };
 
-exports.updatePosition = function(str) {
-  var lines = str.match(/\n/g);
-  if (lines) this.position.line += lines.length;
-  var i = str.lastIndexOf('\n');
-  this.position.column = ~i ? str.length - i : this.position.column + str.length;
+/**
+ * Add the given source mapping.
+ *
+ * @param Object aMapping
+ */
+MappingList.prototype.add = function MappingList_add(aMapping) {
+  if (generatedPositionAfter(this._last, aMapping)) {
+    this._last = aMapping;
+    this._array.push(aMapping);
+  } else {
+    this._sorted = false;
+    this._array.push(aMapping);
+  }
 };
 
 /**
- * Emit `str` with `position`.
+ * Returns the flat, sorted array of mappings. The mappings are sorted by
+ * generated position.
  *
- * @param {String} str
- * @param {Object} [pos]
- * @return {String}
+ * WARNING: This method returns internal data without copying, for
+ * performance. The return value must NOT be mutated, and should be treated as
+ * an immutable borrow. If you want to take ownership, you must make your own
+ * copy.
  */
+MappingList.prototype.toArray = function MappingList_toArray() {
+  if (!this._sorted) {
+    this._array.sort(util.compareByGeneratedPositionsInflated);
+    this._sorted = true;
+  }
+  return this._array;
+};
 
-exports.emit = function(str, node) {
-  var position = node.position || {};
-  var source = position.source;
-  if (source) {
-    if (position.filepath) {
-      source = utils.unixify(position.filepath);
-    }
+exports.MappingList = MappingList;
 
-    this.map.addMapping({
-      source: source,
-      generated: {
-        line: this.position.line,
-        column: Math.max(this.position.column - 1, 0)
-      },
-      original: {
-        line: position.start.line,
-        column: position.start.column - 1
-      }
-    });
 
-    if (position.content) {
-      this.addContent(source, position);
-    }
-    if (position.filepath) {
-      this.addFile(source, position);
-    }
+/***/ }),
 
-    this.updatePosition(str);
-    this.output += str;
-  }
-  return str;
-};
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/quick-sort.js":
+/***/ (function(module, exports) {
 
-/**
- * Adds a file to the source map output if it has not already been added
- * @param {String} `file`
- * @param {Object} `pos`
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
  */
 
-exports.addFile = function(file, position) {
-  if (typeof position.content !== 'string') return;
-  if (Object.prototype.hasOwnProperty.call(this.files, file)) return;
-  this.files[file] = position.content;
-};
+// It turns out that some (most?) JavaScript engines don't self-host
+// `Array.prototype.sort`. This makes sense because C++ will likely remain
+// faster than JS when doing raw CPU-intensive sorting. However, when using a
+// custom comparator function, calling back and forth between the VM's C++ and
+// JIT'd JS is rather slow *and* loses JIT type information, resulting in
+// worse generated code for the comparator function than would be optimal. In
+// fact, when sorting with a comparator, these costs outweigh the benefits of
+// sorting in C++. By using our own JS-implemented Quick Sort (below), we get
+// a ~3500ms mean speed-up in `bench/bench.html`.
+
+/**
+ * Swap the elements indexed by `x` and `y` in the array `ary`.
+ *
+ * @param {Array} ary
+ *        The array.
+ * @param {Number} x
+ *        The index of the first item.
+ * @param {Number} y
+ *        The index of the second item.
+ */
+function swap(ary, x, y) {
+  var temp = ary[x];
+  ary[x] = ary[y];
+  ary[y] = temp;
+}
 
 /**
- * Adds a content source to the source map output if it has not already been added
- * @param {String} `source`
- * @param {Object} `position`
+ * Returns a random integer within the range `low .. high` inclusive.
+ *
+ * @param {Number} low
+ *        The lower bound on the range.
+ * @param {Number} high
+ *        The upper bound on the range.
  */
-
-exports.addContent = function(source, position) {
-  if (typeof position.content !== 'string') return;
-  if (Object.prototype.hasOwnProperty.call(this.content, source)) return;
-  this.map.setSourceContent(source, position.content);
-};
+function randomIntInRange(low, high) {
+  return Math.round(low + (Math.random() * (high - low)));
+}
 
 /**
- * Applies any original source maps to the output and embeds the source file
- * contents in the source map.
+ * The Quick Sort algorithm.
+ *
+ * @param {Array} ary
+ *        An array to sort.
+ * @param {function} comparator
+ *        Function to use to compare two items.
+ * @param {Number} p
+ *        Start index of the array
+ * @param {Number} r
+ *        End index of the array
  */
+function doQuickSort(ary, comparator, p, r) {
+  // If our lower bound is less than our upper bound, we (1) partition the
+  // array into two pieces and (2) recurse on each half. If it is not, this is
+  // the empty array and our base case.
 
-exports.applySourceMaps = function() {
-  Object.keys(this.files).forEach(function(file) {
-    var content = this.files[file];
-    this.map.setSourceContent(file, content);
+  if (p < r) {
+    // (1) Partitioning.
+    //
+    // The partitioning chooses a pivot between `p` and `r` and moves all
+    // elements that are less than or equal to the pivot to the before it, and
+    // all the elements that are greater than it after it. The effect is that
+    // once partition is done, the pivot is in the exact place it will be when
+    // the array is put in sorted order, and it will not need to be moved
+    // again. This runs in O(n) time.
 
-    if (this.options.inputSourcemaps === true) {
-      var originalMap = utils.sourceMapResolve.resolveSync(content, file, fs.readFileSync);
-      if (originalMap) {
-        var map = new utils.SourceMap.SourceMapConsumer(originalMap.map);
-        var relativeTo = originalMap.sourcesRelativeTo;
-        this.map.applySourceMap(map, file, utils.unixify(path.dirname(relativeTo)));
+    // Always choose a random pivot so that an input array which is reverse
+    // sorted does not cause O(n^2) running time.
+    var pivotIndex = randomIntInRange(p, r);
+    var i = p - 1;
+
+    swap(ary, pivotIndex, r);
+    var pivot = ary[r];
+
+    // Immediately after `j` is incremented in this loop, the following hold
+    // true:
+    //
+    //   * Every element in `ary[p .. i]` is less than or equal to the pivot.
+    //
+    //   * Every element in `ary[i+1 .. j-1]` is greater than the pivot.
+    for (var j = p; j < r; j++) {
+      if (comparator(ary[j], pivot) <= 0) {
+        i += 1;
+        swap(ary, i, j);
       }
     }
-  }, this);
-};
 
-/**
- * Process comments, drops sourceMap comments.
- * @param {Object} node
- */
+    swap(ary, i + 1, j);
+    var q = i + 1;
 
-exports.comment = function(node) {
-  if (/^# sourceMappingURL=/.test(node.comment)) {
-    return this.emit('', node.position);
+    // (2) Recurse on each half.
+
+    doQuickSort(ary, comparator, p, q - 1);
+    doQuickSort(ary, comparator, q + 1, r);
   }
-  return this._comment(node);
+}
+
+/**
+ * Sort the given array in-place with the given comparator function.
+ *
+ * @param {Array} ary
+ *        An array to sort.
+ * @param {function} comparator
+ *        Function to use to compare two items.
+ */
+exports.quickSort = function (ary, comparator) {
+  doQuickSort(ary, comparator, 0, ary.length - 1);
 };
 
 
 /***/ }),
-/* 693 */
+
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/source-map-consumer.js":
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
+var util = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/util.js");
+var binarySearch = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/binary-search.js");
+var ArraySet = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/array-set.js").ArraySet;
+var base64VLQ = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/base64-vlq.js");
+var quickSort = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/quick-sort.js").quickSort;
 
-var use = __webpack_require__(671);
-var util = __webpack_require__(113);
-var Cache = __webpack_require__(694);
-var define = __webpack_require__(659);
-var debug = __webpack_require__(205)('snapdragon:parser');
-var Position = __webpack_require__(695);
-var utils = __webpack_require__(673);
+function SourceMapConsumer(aSourceMap) {
+  var sourceMap = aSourceMap;
+  if (typeof aSourceMap === 'string') {
+    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+  }
 
-/**
- * Create a new `Parser` with the given `input` and `options`.
- * @param {String} `input`
- * @param {Object} `options`
- * @api public
- */
+  return sourceMap.sections != null
+    ? new IndexedSourceMapConsumer(sourceMap)
+    : new BasicSourceMapConsumer(sourceMap);
+}
 
-function Parser(options) {
-  debug('initializing', __filename);
-  this.options = utils.extend({source: 'string'}, options);
-  this.init(this.options);
-  use(this);
+SourceMapConsumer.fromSourceMap = function(aSourceMap) {
+  return BasicSourceMapConsumer.fromSourceMap(aSourceMap);
 }
 
 /**
- * Prototype methods
+ * The version of the source mapping spec that we are consuming.
  */
+SourceMapConsumer.prototype._version = 3;
 
-Parser.prototype = {
-  constructor: Parser,
-
-  init: function(options) {
-    this.orig = '';
-    this.input = '';
-    this.parsed = '';
+// `__generatedMappings` and `__originalMappings` are arrays that hold the
+// parsed mapping coordinates from the source map's "mappings" attribute. They
+// are lazily instantiated, accessed via the `_generatedMappings` and
+// `_originalMappings` getters respectively, and we only parse the mappings
+// and create these arrays once queried for a source location. We jump through
+// these hoops because there can be many thousands of mappings, and parsing
+// them is expensive, so we only want to do it if we must.
+//
+// Each object in the arrays is of the form:
+//
+//     {
+//       generatedLine: The line number in the generated code,
+//       generatedColumn: The column number in the generated code,
+//       source: The path to the original source file that generated this
+//               chunk of code,
+//       originalLine: The line number in the original source that
+//                     corresponds to this chunk of generated code,
+//       originalColumn: The column number in the original source that
+//                       corresponds to this chunk of generated code,
+//       name: The name of the original symbol which generated this chunk of
+//             code.
+//     }
+//
+// All properties except for `generatedLine` and `generatedColumn` can be
+// `null`.
+//
+// `_generatedMappings` is ordered by the generated positions.
+//
+// `_originalMappings` is ordered by the original positions.
 
-    this.column = 1;
-    this.line = 1;
+SourceMapConsumer.prototype.__generatedMappings = null;
+Object.defineProperty(SourceMapConsumer.prototype, '_generatedMappings', {
+  get: function () {
+    if (!this.__generatedMappings) {
+      this._parseMappings(this._mappings, this.sourceRoot);
+    }
 
-    this.regex = new Cache();
-    this.errors = this.errors || [];
-    this.parsers = this.parsers || {};
-    this.types = this.types || [];
-    this.sets = this.sets || {};
-    this.fns = this.fns || [];
-    this.currentType = 'root';
+    return this.__generatedMappings;
+  }
+});
 
-    var pos = this.position();
-    this.bos = pos({type: 'bos', val: ''});
+SourceMapConsumer.prototype.__originalMappings = null;
+Object.defineProperty(SourceMapConsumer.prototype, '_originalMappings', {
+  get: function () {
+    if (!this.__originalMappings) {
+      this._parseMappings(this._mappings, this.sourceRoot);
+    }
 
-    this.ast = {
-      type: 'root',
-      errors: this.errors,
-      nodes: [this.bos]
-    };
+    return this.__originalMappings;
+  }
+});
 
-    define(this.bos, 'parent', this.ast);
-    this.nodes = [this.ast];
+SourceMapConsumer.prototype._charIsMappingSeparator =
+  function SourceMapConsumer_charIsMappingSeparator(aStr, index) {
+    var c = aStr.charAt(index);
+    return c === ";" || c === ",";
+  };
 
-    this.count = 0;
-    this.setCount = 0;
-    this.stack = [];
-  },
+/**
+ * Parse the mappings in a string in to a data structure which we can easily
+ * query (the ordered arrays in the `this.__generatedMappings` and
+ * `this.__originalMappings` properties).
+ */
+SourceMapConsumer.prototype._parseMappings =
+  function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
+    throw new Error("Subclasses must implement _parseMappings");
+  };
 
-  /**
-   * Throw a formatted error with the cursor column and `msg`.
-   * @param {String} `msg` Message to use in the Error.
-   */
+SourceMapConsumer.GENERATED_ORDER = 1;
+SourceMapConsumer.ORIGINAL_ORDER = 2;
 
-  error: function(msg, node) {
-    var pos = node.position || {start: {column: 0, line: 0}};
-    var line = pos.start.line;
-    var column = pos.start.column;
-    var source = this.options.source;
+SourceMapConsumer.GREATEST_LOWER_BOUND = 1;
+SourceMapConsumer.LEAST_UPPER_BOUND = 2;
 
-    var message = source + ' <line:' + line + ' column:' + column + '>: ' + msg;
-    var err = new Error(message);
-    err.source = source;
-    err.reason = msg;
-    err.pos = pos;
+/**
+ * Iterate over each mapping between an original source/line/column and a
+ * generated line/column in this source map.
+ *
+ * @param Function aCallback
+ *        The function that is called with each mapping.
+ * @param Object aContext
+ *        Optional. If specified, this object will be the value of `this` every
+ *        time that `aCallback` is called.
+ * @param aOrder
+ *        Either `SourceMapConsumer.GENERATED_ORDER` or
+ *        `SourceMapConsumer.ORIGINAL_ORDER`. Specifies whether you want to
+ *        iterate over the mappings sorted by the generated file's line/column
+ *        order or the original's source/line/column order, respectively. Defaults to
+ *        `SourceMapConsumer.GENERATED_ORDER`.
+ */
+SourceMapConsumer.prototype.eachMapping =
+  function SourceMapConsumer_eachMapping(aCallback, aContext, aOrder) {
+    var context = aContext || null;
+    var order = aOrder || SourceMapConsumer.GENERATED_ORDER;
 
-    if (this.options.silent) {
-      this.errors.push(err);
-    } else {
-      throw err;
+    var mappings;
+    switch (order) {
+    case SourceMapConsumer.GENERATED_ORDER:
+      mappings = this._generatedMappings;
+      break;
+    case SourceMapConsumer.ORIGINAL_ORDER:
+      mappings = this._originalMappings;
+      break;
+    default:
+      throw new Error("Unknown order of iteration.");
     }
-  },
-
-  /**
-   * Define a non-enumberable property on the `Parser` instance.
-   *
-   * ```js
-   * parser.define('foo', 'bar');
-   * ```
-   * @name .define
-   * @param {String} `key` propery name
-   * @param {any} `val` property value
-   * @return {Object} Returns the Parser instance for chaining.
-   * @api public
-   */
-
-  define: function(key, val) {
-    define(this, key, val);
-    return this;
-  },
 
-  /**
-   * Mark position and patch `node.position`.
-   */
+    var sourceRoot = this.sourceRoot;
+    mappings.map(function (mapping) {
+      var source = mapping.source === null ? null : this._sources.at(mapping.source);
+      if (source != null && sourceRoot != null) {
+        source = util.join(sourceRoot, source);
+      }
+      return {
+        source: source,
+        generatedLine: mapping.generatedLine,
+        generatedColumn: mapping.generatedColumn,
+        originalLine: mapping.originalLine,
+        originalColumn: mapping.originalColumn,
+        name: mapping.name === null ? null : this._names.at(mapping.name)
+      };
+    }, this).forEach(aCallback, context);
+  };
 
-  position: function() {
-    var start = { line: this.line, column: this.column };
-    var self = this;
+/**
+ * Returns all generated line and column information for the original source,
+ * line, and column provided. If no column is provided, returns all mappings
+ * corresponding to a either the line we are searching for or the next
+ * closest line that has any mappings. Otherwise, returns all mappings
+ * corresponding to the given line and either the column we are searching for
+ * or the next closest column that has any offsets.
+ *
+ * The only argument is an object with the following properties:
+ *
+ *   - source: The filename of the original source.
+ *   - line: The line number in the original source.
+ *   - column: Optional. the column number in the original source.
+ *
+ * and an array of objects is returned, each with the following properties:
+ *
+ *   - line: The line number in the generated source, or null.
+ *   - column: The column number in the generated source, or null.
+ */
+SourceMapConsumer.prototype.allGeneratedPositionsFor =
+  function SourceMapConsumer_allGeneratedPositionsFor(aArgs) {
+    var line = util.getArg(aArgs, 'line');
 
-    return function(node) {
-      define(node, 'position', new Position(start, self));
-      return node;
+    // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
+    // returns the index of the closest mapping less than the needle. By
+    // setting needle.originalColumn to 0, we thus find the last mapping for
+    // the given line, provided such a mapping exists.
+    var needle = {
+      source: util.getArg(aArgs, 'source'),
+      originalLine: line,
+      originalColumn: util.getArg(aArgs, 'column', 0)
     };
-  },
-
-  /**
-   * Set parser `name` with the given `fn`
-   * @param {String} `name`
-   * @param {Function} `fn`
-   * @api public
-   */
 
-  set: function(type, fn) {
-    if (this.types.indexOf(type) === -1) {
-      this.types.push(type);
+    if (this.sourceRoot != null) {
+      needle.source = util.relative(this.sourceRoot, needle.source);
     }
-    this.parsers[type] = fn.bind(this);
-    return this;
-  },
+    if (!this._sources.has(needle.source)) {
+      return [];
+    }
+    needle.source = this._sources.indexOf(needle.source);
 
-  /**
-   * Get parser `name`
-   * @param {String} `name`
-   * @api public
-   */
+    var mappings = [];
 
-  get: function(name) {
-    return this.parsers[name];
-  },
+    var index = this._findMapping(needle,
+                                  this._originalMappings,
+                                  "originalLine",
+                                  "originalColumn",
+                                  util.compareByOriginalPositions,
+                                  binarySearch.LEAST_UPPER_BOUND);
+    if (index >= 0) {
+      var mapping = this._originalMappings[index];
 
-  /**
-   * Push a `token` onto the `type` stack.
-   *
-   * @param {String} `type`
-   * @return {Object} `token`
-   * @api public
-   */
+      if (aArgs.column === undefined) {
+        var originalLine = mapping.originalLine;
 
-  push: function(type, token) {
-    this.sets[type] = this.sets[type] || [];
-    this.count++;
-    this.stack.push(token);
-    return this.sets[type].push(token);
-  },
+        // Iterate until either we run out of mappings, or we run into
+        // a mapping for a different line than the one we found. Since
+        // mappings are sorted, this is guaranteed to find all mappings for
+        // the line we found.
+        while (mapping && mapping.originalLine === originalLine) {
+          mappings.push({
+            line: util.getArg(mapping, 'generatedLine', null),
+            column: util.getArg(mapping, 'generatedColumn', null),
+            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+          });
 
-  /**
-   * Pop a token off of the `type` stack
-   * @param {String} `type`
-   * @returns {Object} Returns a token
-   * @api public
-   */
+          mapping = this._originalMappings[++index];
+        }
+      } else {
+        var originalColumn = mapping.originalColumn;
 
-  pop: function(type) {
-    this.sets[type] = this.sets[type] || [];
-    this.count--;
-    this.stack.pop();
-    return this.sets[type].pop();
-  },
+        // Iterate until either we run out of mappings, or we run into
+        // a mapping for a different line than the one we were searching for.
+        // Since mappings are sorted, this is guaranteed to find all mappings for
+        // the line we are searching for.
+        while (mapping &&
+               mapping.originalLine === line &&
+               mapping.originalColumn == originalColumn) {
+          mappings.push({
+            line: util.getArg(mapping, 'generatedLine', null),
+            column: util.getArg(mapping, 'generatedColumn', null),
+            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+          });
 
-  /**
-   * Return true if inside a `stack` node. Types are `braces`, `parens` or `brackets`.
-   *
-   * @param {String} `type`
-   * @return {Boolean}
-   * @api public
-   */
+          mapping = this._originalMappings[++index];
+        }
+      }
+    }
 
-  isInside: function(type) {
-    this.sets[type] = this.sets[type] || [];
-    return this.sets[type].length > 0;
-  },
+    return mappings;
+  };
 
-  /**
-   * Return true if `node` is the given `type`.
-   *
-   * ```js
-   * parser.isType(node, 'brace');
-   * ```
-   * @param {Object} `node`
-   * @param {String} `type`
-   * @return {Boolean}
-   * @api public
-   */
+exports.SourceMapConsumer = SourceMapConsumer;
 
-  isType: function(node, type) {
-    return node && node.type === type;
-  },
+/**
+ * A BasicSourceMapConsumer instance represents a parsed source map which we can
+ * query for information about the original file positions by giving it a file
+ * position in the generated source.
+ *
+ * The only parameter is the raw source map (either as a JSON string, or
+ * already parsed to an object). According to the spec, source maps have the
+ * following attributes:
+ *
+ *   - version: Which version of the source map spec this map is following.
+ *   - sources: An array of URLs to the original source files.
+ *   - names: An array of identifiers which can be referrenced by individual mappings.
+ *   - sourceRoot: Optional. The URL root from which all sources are relative.
+ *   - sourcesContent: Optional. An array of contents of the original source files.
+ *   - mappings: A string of base64 VLQs which contain the actual mappings.
+ *   - file: Optional. The generated file this source map is associated with.
+ *
+ * Here is an example source map, taken from the source map spec[0]:
+ *
+ *     {
+ *       version : 3,
+ *       file: "out.js",
+ *       sourceRoot : "",
+ *       sources: ["foo.js", "bar.js"],
+ *       names: ["src", "maps", "are", "fun"],
+ *       mappings: "AA,AB;;ABCDE;"
+ *     }
+ *
+ * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit?pli=1#
+ */
+function BasicSourceMapConsumer(aSourceMap) {
+  var sourceMap = aSourceMap;
+  if (typeof aSourceMap === 'string') {
+    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+  }
 
-  /**
-   * Get the previous AST node
-   * @return {Object}
-   */
+  var version = util.getArg(sourceMap, 'version');
+  var sources = util.getArg(sourceMap, 'sources');
+  // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which
+  // requires the array) to play nice here.
+  var names = util.getArg(sourceMap, 'names', []);
+  var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
+  var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
+  var mappings = util.getArg(sourceMap, 'mappings');
+  var file = util.getArg(sourceMap, 'file', null);
 
-  prev: function(n) {
-    return this.stack.length > 0
-      ? utils.last(this.stack, n)
-      : utils.last(this.nodes, n);
-  },
+  // Once again, Sass deviates from the spec and supplies the version as a
+  // string rather than a number, so we use loose equality checking here.
+  if (version != this._version) {
+    throw new Error('Unsupported version: ' + version);
+  }
 
-  /**
-   * Update line and column based on `str`.
-   */
+  sources = sources
+    .map(String)
+    // Some source maps produce relative source paths like "./foo.js" instead of
+    // "foo.js".  Normalize these first so that future comparisons will succeed.
+    // See bugzil.la/1090768.
+    .map(util.normalize)
+    // Always ensure that absolute sources are internally stored relative to
+    // the source root, if the source root is absolute. Not doing this would
+    // be particularly problematic when the source root is a prefix of the
+    // source (valid, but why??). See github issue #199 and bugzil.la/1188982.
+    .map(function (source) {
+      return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source)
+        ? util.relative(sourceRoot, source)
+        : source;
+    });
 
-  consume: function(len) {
-    this.input = this.input.substr(len);
-  },
+  // Pass `true` below to allow duplicate names and sources. While source maps
+  // are intended to be compressed and deduplicated, the TypeScript compiler
+  // sometimes generates source maps with duplicates in them. See Github issue
+  // #72 and bugzil.la/889492.
+  this._names = ArraySet.fromArray(names.map(String), true);
+  this._sources = ArraySet.fromArray(sources, true);
 
-  /**
-   * Update column based on `str`.
-   */
+  this.sourceRoot = sourceRoot;
+  this.sourcesContent = sourcesContent;
+  this._mappings = mappings;
+  this.file = file;
+}
 
-  updatePosition: function(str, len) {
-    var lines = str.match(/\n/g);
-    if (lines) this.line += lines.length;
-    var i = str.lastIndexOf('\n');
-    this.column = ~i ? len - i : this.column + len;
-    this.parsed += str;
-    this.consume(len);
-  },
+BasicSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
+BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer;
 
-  /**
-   * Match `regex`, return captures, and update the cursor position by `match[0]` length.
-   * @param {RegExp} `regex`
-   * @return {Object}
-   */
+/**
+ * Create a BasicSourceMapConsumer from a SourceMapGenerator.
+ *
+ * @param SourceMapGenerator aSourceMap
+ *        The source map that will be consumed.
+ * @returns BasicSourceMapConsumer
+ */
+BasicSourceMapConsumer.fromSourceMap =
+  function SourceMapConsumer_fromSourceMap(aSourceMap) {
+    var smc = Object.create(BasicSourceMapConsumer.prototype);
 
-  match: function(regex) {
-    var m = regex.exec(this.input);
-    if (m) {
-      this.updatePosition(m[0], m[0].length);
-      return m;
-    }
-  },
+    var names = smc._names = ArraySet.fromArray(aSourceMap._names.toArray(), true);
+    var sources = smc._sources = ArraySet.fromArray(aSourceMap._sources.toArray(), true);
+    smc.sourceRoot = aSourceMap._sourceRoot;
+    smc.sourcesContent = aSourceMap._generateSourcesContent(smc._sources.toArray(),
+                                                            smc.sourceRoot);
+    smc.file = aSourceMap._file;
 
-  /**
-   * Capture `type` with the given regex.
-   * @param {String} `type`
-   * @param {RegExp} `regex`
-   * @return {Function}
-   */
+    // Because we are modifying the entries (by converting string sources and
+    // names to indices into the sources and names ArraySets), we have to make
+    // a copy of the entry or else bad things happen. Shared mutable state
+    // strikes again! See github issue #191.
 
-  capture: function(type, regex) {
-    if (typeof regex === 'function') {
-      return this.set.apply(this, arguments);
-    }
+    var generatedMappings = aSourceMap._mappings.toArray().slice();
+    var destGeneratedMappings = smc.__generatedMappings = [];
+    var destOriginalMappings = smc.__originalMappings = [];
 
-    this.regex.set(type, regex);
-    this.set(type, function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(regex);
-      if (!m || !m[0]) return;
+    for (var i = 0, length = generatedMappings.length; i < length; i++) {
+      var srcMapping = generatedMappings[i];
+      var destMapping = new Mapping;
+      destMapping.generatedLine = srcMapping.generatedLine;
+      destMapping.generatedColumn = srcMapping.generatedColumn;
 
-      var prev = this.prev();
-      var node = pos({
-        type: type,
-        val: m[0],
-        parsed: parsed,
-        rest: this.input
-      });
+      if (srcMapping.source) {
+        destMapping.source = sources.indexOf(srcMapping.source);
+        destMapping.originalLine = srcMapping.originalLine;
+        destMapping.originalColumn = srcMapping.originalColumn;
 
-      if (m[1]) {
-        node.inner = m[1];
+        if (srcMapping.name) {
+          destMapping.name = names.indexOf(srcMapping.name);
+        }
+
+        destOriginalMappings.push(destMapping);
       }
 
-      define(node, 'inside', this.stack.length > 0);
-      define(node, 'parent', prev);
-      prev.nodes.push(node);
-    }.bind(this));
-    return this;
-  },
+      destGeneratedMappings.push(destMapping);
+    }
 
-  /**
-   * Create a parser with open and close for parens,
-   * brackets or braces
-   */
+    quickSort(smc.__originalMappings, util.compareByOriginalPositions);
 
-  capturePair: function(type, openRegex, closeRegex, fn) {
-    this.sets[type] = this.sets[type] || [];
+    return smc;
+  };
 
-    /**
-     * Open
-     */
+/**
+ * The version of the source mapping spec that we are consuming.
+ */
+BasicSourceMapConsumer.prototype._version = 3;
 
-    this.set(type + '.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(openRegex);
-      if (!m || !m[0]) return;
+/**
+ * The list of original sources.
+ */
+Object.defineProperty(BasicSourceMapConsumer.prototype, 'sources', {
+  get: function () {
+    return this._sources.toArray().map(function (s) {
+      return this.sourceRoot != null ? util.join(this.sourceRoot, s) : s;
+    }, this);
+  }
+});
 
-      var val = m[0];
-      this.setCount++;
-      this.specialChars = true;
-      var open = pos({
-        type: type + '.open',
-        val: val,
-        rest: this.input
-      });
+/**
+ * Provide the JIT with a nice shape / hidden class.
+ */
+function Mapping() {
+  this.generatedLine = 0;
+  this.generatedColumn = 0;
+  this.source = null;
+  this.originalLine = null;
+  this.originalColumn = null;
+  this.name = null;
+}
 
-      if (typeof m[1] !== 'undefined') {
-        open.inner = m[1];
+/**
+ * Parse the mappings in a string in to a data structure which we can easily
+ * query (the ordered arrays in the `this.__generatedMappings` and
+ * `this.__originalMappings` properties).
+ */
+BasicSourceMapConsumer.prototype._parseMappings =
+  function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
+    var generatedLine = 1;
+    var previousGeneratedColumn = 0;
+    var previousOriginalLine = 0;
+    var previousOriginalColumn = 0;
+    var previousSource = 0;
+    var previousName = 0;
+    var length = aStr.length;
+    var index = 0;
+    var cachedSegments = {};
+    var temp = {};
+    var originalMappings = [];
+    var generatedMappings = [];
+    var mapping, str, segment, end, value;
+
+    while (index < length) {
+      if (aStr.charAt(index) === ';') {
+        generatedLine++;
+        index++;
+        previousGeneratedColumn = 0;
       }
+      else if (aStr.charAt(index) === ',') {
+        index++;
+      }
+      else {
+        mapping = new Mapping();
+        mapping.generatedLine = generatedLine;
 
-      var prev = this.prev();
-      var node = pos({
-        type: type,
-        nodes: [open]
-      });
+        // Because each offset is encoded relative to the previous one,
+        // many segments often have the same encoding. We can exploit this
+        // fact by caching the parsed variable length fields of each segment,
+        // allowing us to avoid a second parse if we encounter the same
+        // segment again.
+        for (end = index; end < length; end++) {
+          if (this._charIsMappingSeparator(aStr, end)) {
+            break;
+          }
+        }
+        str = aStr.slice(index, end);
 
-      define(node, 'rest', this.input);
-      define(node, 'parsed', parsed);
-      define(node, 'prefix', m[1]);
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
+        segment = cachedSegments[str];
+        if (segment) {
+          index += str.length;
+        } else {
+          segment = [];
+          while (index < end) {
+            base64VLQ.decode(aStr, index, temp);
+            value = temp.value;
+            index = temp.rest;
+            segment.push(value);
+          }
 
-      if (typeof fn === 'function') {
-        fn.call(this, open, node);
-      }
+          if (segment.length === 2) {
+            throw new Error('Found a source, but no line and column');
+          }
 
-      this.push(type, node);
-      prev.nodes.push(node);
-    });
+          if (segment.length === 3) {
+            throw new Error('Found a source and line, but no column');
+          }
 
-    /**
-     * Close
-     */
+          cachedSegments[str] = segment;
+        }
 
-    this.set(type + '.close', function() {
-      var pos = this.position();
-      var m = this.match(closeRegex);
-      if (!m || !m[0]) return;
+        // Generated column.
+        mapping.generatedColumn = previousGeneratedColumn + segment[0];
+        previousGeneratedColumn = mapping.generatedColumn;
 
-      var parent = this.pop(type);
-      var node = pos({
-        type: type + '.close',
-        rest: this.input,
-        suffix: m[1],
-        val: m[0]
-      });
+        if (segment.length > 1) {
+          // Original source.
+          mapping.source = previousSource + segment[1];
+          previousSource += segment[1];
 
-      if (!this.isType(parent, type)) {
-        if (this.options.strict) {
-          throw new Error('missing opening "' + type + '"');
+          // Original line.
+          mapping.originalLine = previousOriginalLine + segment[2];
+          previousOriginalLine = mapping.originalLine;
+          // Lines are stored 0-based
+          mapping.originalLine += 1;
+
+          // Original column.
+          mapping.originalColumn = previousOriginalColumn + segment[3];
+          previousOriginalColumn = mapping.originalColumn;
+
+          if (segment.length > 4) {
+            // Original name.
+            mapping.name = previousName + segment[4];
+            previousName += segment[4];
+          }
         }
 
-        this.setCount--;
-        node.escaped = true;
-        return node;
+        generatedMappings.push(mapping);
+        if (typeof mapping.originalLine === 'number') {
+          originalMappings.push(mapping);
+        }
       }
+    }
 
-      if (node.suffix === '\\') {
-        parent.escaped = true;
-        node.escaped = true;
-      }
+    quickSort(generatedMappings, util.compareByGeneratedPositionsDeflated);
+    this.__generatedMappings = generatedMappings;
 
-      parent.nodes.push(node);
-      define(node, 'parent', parent);
-    });
+    quickSort(originalMappings, util.compareByOriginalPositions);
+    this.__originalMappings = originalMappings;
+  };
 
-    return this;
-  },
+/**
+ * Find the mapping that best matches the hypothetical "needle" mapping that
+ * we are searching for in the given "haystack" of mappings.
+ */
+BasicSourceMapConsumer.prototype._findMapping =
+  function SourceMapConsumer_findMapping(aNeedle, aMappings, aLineName,
+                                         aColumnName, aComparator, aBias) {
+    // To return the position we are searching for, we must first find the
+    // mapping for the given position and then return the opposite position it
+    // points to. Because the mappings are sorted, we can use binary search to
+    // find the best mapping.
 
-  /**
-   * Capture end-of-string
-   */
+    if (aNeedle[aLineName] <= 0) {
+      throw new TypeError('Line must be greater than or equal to 1, got '
+                          + aNeedle[aLineName]);
+    }
+    if (aNeedle[aColumnName] < 0) {
+      throw new TypeError('Column must be greater than or equal to 0, got '
+                          + aNeedle[aColumnName]);
+    }
 
-  eos: function() {
-    var pos = this.position();
-    if (this.input) return;
-    var prev = this.prev();
+    return binarySearch.search(aNeedle, aMappings, aComparator, aBias);
+  };
 
-    while (prev.type !== 'root' && !prev.visited) {
-      if (this.options.strict === true) {
-        throw new SyntaxError('invalid syntax:' + util.inspect(prev, null, 2));
-      }
+/**
+ * Compute the last column for each generated mapping. The last column is
+ * inclusive.
+ */
+BasicSourceMapConsumer.prototype.computeColumnSpans =
+  function SourceMapConsumer_computeColumnSpans() {
+    for (var index = 0; index < this._generatedMappings.length; ++index) {
+      var mapping = this._generatedMappings[index];
 
-      if (!hasDelims(prev)) {
-        prev.parent.escaped = true;
-        prev.escaped = true;
-      }
+      // Mappings do not contain a field for the last generated columnt. We
+      // can come up with an optimistic estimate, however, by assuming that
+      // mappings are contiguous (i.e. given two consecutive mappings, the
+      // first mapping ends where the second one starts).
+      if (index + 1 < this._generatedMappings.length) {
+        var nextMapping = this._generatedMappings[index + 1];
 
-      visit(prev, function(node) {
-        if (!hasDelims(node.parent)) {
-          node.parent.escaped = true;
-          node.escaped = true;
+        if (mapping.generatedLine === nextMapping.generatedLine) {
+          mapping.lastGeneratedColumn = nextMapping.generatedColumn - 1;
+          continue;
         }
-      });
+      }
 
-      prev = prev.parent;
+      // The last mapping for each line spans the entire line.
+      mapping.lastGeneratedColumn = Infinity;
     }
+  };
 
-    var tok = pos({
-      type: 'eos',
-      val: this.append || ''
-    });
-
-    define(tok, 'parent', this.ast);
-    return tok;
-  },
+/**
+ * Returns the original source, line, and column information for the generated
+ * source's line and column positions provided. The only argument is an object
+ * with the following properties:
+ *
+ *   - line: The line number in the generated source.
+ *   - column: The column number in the generated source.
+ *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
+ *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
+ *     closest element that is smaller than or greater than the one we are
+ *     searching for, respectively, if the exact element cannot be found.
+ *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
+ *
+ * and an object is returned with the following properties:
+ *
+ *   - source: The original source file, or null.
+ *   - line: The line number in the original source, or null.
+ *   - column: The column number in the original source, or null.
+ *   - name: The original identifier, or null.
+ */
+BasicSourceMapConsumer.prototype.originalPositionFor =
+  function SourceMapConsumer_originalPositionFor(aArgs) {
+    var needle = {
+      generatedLine: util.getArg(aArgs, 'line'),
+      generatedColumn: util.getArg(aArgs, 'column')
+    };
 
-  /**
-   * Run parsers to advance the cursor position
-   */
+    var index = this._findMapping(
+      needle,
+      this._generatedMappings,
+      "generatedLine",
+      "generatedColumn",
+      util.compareByGeneratedPositionsDeflated,
+      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
+    );
 
-  next: function() {
-    var parsed = this.parsed;
-    var len = this.types.length;
-    var idx = -1;
-    var tok;
+    if (index >= 0) {
+      var mapping = this._generatedMappings[index];
 
-    while (++idx < len) {
-      if ((tok = this.parsers[this.types[idx]].call(this))) {
-        define(tok, 'rest', this.input);
-        define(tok, 'parsed', parsed);
-        this.last = tok;
-        return tok;
+      if (mapping.generatedLine === needle.generatedLine) {
+        var source = util.getArg(mapping, 'source', null);
+        if (source !== null) {
+          source = this._sources.at(source);
+          if (this.sourceRoot != null) {
+            source = util.join(this.sourceRoot, source);
+          }
+        }
+        var name = util.getArg(mapping, 'name', null);
+        if (name !== null) {
+          name = this._names.at(name);
+        }
+        return {
+          source: source,
+          line: util.getArg(mapping, 'originalLine', null),
+          column: util.getArg(mapping, 'originalColumn', null),
+          name: name
+        };
       }
     }
-  },
-
-  /**
-   * Parse the given string.
-   * @return {Array}
-   */
 
-  parse: function(input) {
-    if (typeof input !== 'string') {
-      throw new TypeError('expected a string');
+    return {
+      source: null,
+      line: null,
+      column: null,
+      name: null
+    };
+  };
+
+/**
+ * Return true if we have the source content for every source in the source
+ * map, false otherwise.
+ */
+BasicSourceMapConsumer.prototype.hasContentsOfAllSources =
+  function BasicSourceMapConsumer_hasContentsOfAllSources() {
+    if (!this.sourcesContent) {
+      return false;
+    }
+    return this.sourcesContent.length >= this._sources.size() &&
+      !this.sourcesContent.some(function (sc) { return sc == null; });
+  };
+
+/**
+ * Returns the original source content. The only argument is the url of the
+ * original source file. Returns null if no original source content is
+ * available.
+ */
+BasicSourceMapConsumer.prototype.sourceContentFor =
+  function SourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
+    if (!this.sourcesContent) {
+      return null;
+    }
+
+    if (this.sourceRoot != null) {
+      aSource = util.relative(this.sourceRoot, aSource);
     }
 
-    this.init(this.options);
-    this.orig = input;
-    this.input = input;
-    var self = this;
-
-    function parse() {
-      // check input before calling `.next()`
-      input = self.input;
-
-      // get the next AST ndoe
-      var node = self.next();
-      if (node) {
-        var prev = self.prev();
-        if (prev) {
-          define(node, 'parent', prev);
-          if (prev.nodes) {
-            prev.nodes.push(node);
-          }
-        }
+    if (this._sources.has(aSource)) {
+      return this.sourcesContent[this._sources.indexOf(aSource)];
+    }
 
-        if (self.sets.hasOwnProperty(prev.type)) {
-          self.currentType = prev.type;
-        }
+    var url;
+    if (this.sourceRoot != null
+        && (url = util.urlParse(this.sourceRoot))) {
+      // XXX: file:// URIs and absolute paths lead to unexpected behavior for
+      // many users. We can help them out when they expect file:// URIs to
+      // behave like it would if they were running a local HTTP server. See
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=885597.
+      var fileUriAbsPath = aSource.replace(/^file:\/\//, "");
+      if (url.scheme == "file"
+          && this._sources.has(fileUriAbsPath)) {
+        return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)]
       }
 
-      // if we got here but input is not changed, throw an error
-      if (self.input && input === self.input) {
-        throw new Error('no parsers registered for: "' + self.input.slice(0, 5) + '"');
+      if ((!url.path || url.path == "/")
+          && this._sources.has("/" + aSource)) {
+        return this.sourcesContent[this._sources.indexOf("/" + aSource)];
       }
     }
 
-    while (this.input) parse();
-    if (this.stack.length && this.options.strict) {
-      var node = this.stack.pop();
-      throw this.error('missing opening ' + node.type + ': "' + this.orig + '"');
+    // This function is used recursively from
+    // IndexedSourceMapConsumer.prototype.sourceContentFor. In that case, we
+    // don't want to throw if we can't find the source - we just want to
+    // return null, so we provide a flag to exit gracefully.
+    if (nullOnMissing) {
+      return null;
     }
-
-    var eos = this.eos();
-    var tok = this.prev();
-    if (tok.type !== 'eos') {
-      this.ast.nodes.push(eos);
+    else {
+      throw new Error('"' + aSource + '" is not in the SourceMap.');
     }
-
-    return this.ast;
-  }
-};
+  };
 
 /**
- * Visit `node` with the given `fn`
+ * Returns the generated line and column information for the original source,
+ * line, and column positions provided. The only argument is an object with
+ * the following properties:
+ *
+ *   - source: The filename of the original source.
+ *   - line: The line number in the original source.
+ *   - column: The column number in the original source.
+ *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
+ *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
+ *     closest element that is smaller than or greater than the one we are
+ *     searching for, respectively, if the exact element cannot be found.
+ *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
+ *
+ * and an object is returned with the following properties:
+ *
+ *   - line: The line number in the generated source, or null.
+ *   - column: The column number in the generated source, or null.
  */
+BasicSourceMapConsumer.prototype.generatedPositionFor =
+  function SourceMapConsumer_generatedPositionFor(aArgs) {
+    var source = util.getArg(aArgs, 'source');
+    if (this.sourceRoot != null) {
+      source = util.relative(this.sourceRoot, source);
+    }
+    if (!this._sources.has(source)) {
+      return {
+        line: null,
+        column: null,
+        lastColumn: null
+      };
+    }
+    source = this._sources.indexOf(source);
 
-function visit(node, fn) {
-  if (!node.visited) {
-    define(node, 'visited', true);
-    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
-  }
-  return node;
-}
+    var needle = {
+      source: source,
+      originalLine: util.getArg(aArgs, 'line'),
+      originalColumn: util.getArg(aArgs, 'column')
+    };
 
-/**
- * Map visit over array of `nodes`.
- */
+    var index = this._findMapping(
+      needle,
+      this._originalMappings,
+      "originalLine",
+      "originalColumn",
+      util.compareByOriginalPositions,
+      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
+    );
 
-function mapVisit(nodes, fn) {
-  var len = nodes.length;
-  var idx = -1;
-  while (++idx < len) {
-    visit(nodes[idx], fn);
-  }
-}
+    if (index >= 0) {
+      var mapping = this._originalMappings[index];
 
-function hasOpen(node) {
-  return node.nodes && node.nodes[0].type === (node.type + '.open');
-}
+      if (mapping.source === needle.source) {
+        return {
+          line: util.getArg(mapping, 'generatedLine', null),
+          column: util.getArg(mapping, 'generatedColumn', null),
+          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+        };
+      }
+    }
 
-function hasClose(node) {
-  return node.nodes && utils.last(node.nodes).type === (node.type + '.close');
-}
+    return {
+      line: null,
+      column: null,
+      lastColumn: null
+    };
+  };
 
-function hasDelims(node) {
-  return hasOpen(node) && hasClose(node);
-}
+exports.BasicSourceMapConsumer = BasicSourceMapConsumer;
 
 /**
- * Expose `Parser`
- */
-
-module.exports = Parser;
-
-
-/***/ }),
-/* 694 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * map-cache <https://github.com/jonschlinkert/map-cache>
+ * An IndexedSourceMapConsumer instance represents a parsed source map which
+ * we can query for information. It differs from BasicSourceMapConsumer in
+ * that it takes "indexed" source maps (i.e. ones with a "sections" field) as
+ * input.
  *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
+ * The only parameter is a raw source map (either as a JSON string, or already
+ * parsed to an object). According to the spec for indexed source maps, they
+ * have the following attributes:
+ *
+ *   - version: Which version of the source map spec this map is following.
+ *   - file: Optional. The generated file this source map is associated with.
+ *   - sections: A list of section definitions.
+ *
+ * Each value under the "sections" field has two fields:
+ *   - offset: The offset into the original specified at which this section
+ *       begins to apply, defined as an object with a "line" and "column"
+ *       field.
+ *   - map: A source map definition. This source map could also be indexed,
+ *       but doesn't have to be.
+ *
+ * Instead of the "map" field, it's also possible to have a "url" field
+ * specifying a URL to retrieve a source map from, but that's currently
+ * unsupported.
+ *
+ * Here's an example source map, taken from the source map spec[0], but
+ * modified to omit a section which uses the "url" field.
+ *
+ *  {
+ *    version : 3,
+ *    file: "app.js",
+ *    sections: [{
+ *      offset: {line:100, column:10},
+ *      map: {
+ *        version : 3,
+ *        file: "section.js",
+ *        sources: ["foo.js", "bar.js"],
+ *        names: ["src", "maps", "are", "fun"],
+ *        mappings: "AAAA,E;;ABCDE;"
+ *      }
+ *    }],
+ *  }
+ *
+ * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.535es3xeprgt
  */
+function IndexedSourceMapConsumer(aSourceMap) {
+  var sourceMap = aSourceMap;
+  if (typeof aSourceMap === 'string') {
+    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+  }
 
+  var version = util.getArg(sourceMap, 'version');
+  var sections = util.getArg(sourceMap, 'sections');
 
+  if (version != this._version) {
+    throw new Error('Unsupported version: ' + version);
+  }
 
-var hasOwn = Object.prototype.hasOwnProperty;
-
-/**
- * Expose `MapCache`
- */
+  this._sources = new ArraySet();
+  this._names = new ArraySet();
 
-module.exports = MapCache;
+  var lastOffset = {
+    line: -1,
+    column: 0
+  };
+  this._sections = sections.map(function (s) {
+    if (s.url) {
+      // The url field will require support for asynchronicity.
+      // See https://github.com/mozilla/source-map/issues/16
+      throw new Error('Support for url field in sections not implemented.');
+    }
+    var offset = util.getArg(s, 'offset');
+    var offsetLine = util.getArg(offset, 'line');
+    var offsetColumn = util.getArg(offset, 'column');
 
-/**
- * Creates a cache object to store key/value pairs.
- *
- * ```js
- * var cache = new MapCache();
- * ```
- *
- * @api public
- */
+    if (offsetLine < lastOffset.line ||
+        (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) {
+      throw new Error('Section offsets must be ordered and non-overlapping.');
+    }
+    lastOffset = offset;
 
-function MapCache(data) {
-  this.__data__ = data || {};
+    return {
+      generatedOffset: {
+        // The offset fields are 0-based, but we use 1-based indices when
+        // encoding/decoding from VLQ.
+        generatedLine: offsetLine + 1,
+        generatedColumn: offsetColumn + 1
+      },
+      consumer: new SourceMapConsumer(util.getArg(s, 'map'))
+    }
+  });
 }
 
+IndexedSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
+IndexedSourceMapConsumer.prototype.constructor = SourceMapConsumer;
+
 /**
- * Adds `value` to `key` on the cache.
- *
- * ```js
- * cache.set('foo', 'bar');
- * ```
- *
- * @param {String} `key` The key of the value to cache.
- * @param {*} `value` The value to cache.
- * @returns {Object} Returns the `Cache` object for chaining.
- * @api public
+ * The version of the source mapping spec that we are consuming.
  */
-
-MapCache.prototype.set = function mapSet(key, value) {
-  if (key !== '__proto__') {
-    this.__data__[key] = value;
-  }
-  return this;
-};
+IndexedSourceMapConsumer.prototype._version = 3;
 
 /**
- * Gets the cached value for `key`.
- *
- * ```js
- * cache.get('foo');
- * //=> 'bar'
- * ```
- *
- * @param {String} `key` The key of the value to get.
- * @returns {*} Returns the cached value.
- * @api public
+ * The list of original sources.
  */
-
-MapCache.prototype.get = function mapGet(key) {
-  return key === '__proto__' ? undefined : this.__data__[key];
-};
+Object.defineProperty(IndexedSourceMapConsumer.prototype, 'sources', {
+  get: function () {
+    var sources = [];
+    for (var i = 0; i < this._sections.length; i++) {
+      for (var j = 0; j < this._sections[i].consumer.sources.length; j++) {
+        sources.push(this._sections[i].consumer.sources[j]);
+      }
+    }
+    return sources;
+  }
+});
 
 /**
- * Checks if a cached value for `key` exists.
+ * Returns the original source, line, and column information for the generated
+ * source's line and column positions provided. The only argument is an object
+ * with the following properties:
  *
- * ```js
- * cache.has('foo');
- * //=> true
- * ```
+ *   - line: The line number in the generated source.
+ *   - column: The column number in the generated source.
  *
- * @param {String} `key` The key of the entry to check.
- * @returns {Boolean} Returns `true` if an entry for `key` exists, else `false`.
- * @api public
- */
-
-MapCache.prototype.has = function mapHas(key) {
-  return key !== '__proto__' && hasOwn.call(this.__data__, key);
-};
-
-/**
- * Removes `key` and its value from the cache.
+ * and an object is returned with the following properties:
  *
- * ```js
- * cache.del('foo');
- * ```
- * @title .del
- * @param {String} `key` The key of the value to remove.
- * @returns {Boolean} Returns `true` if the entry was removed successfully, else `false`.
- * @api public
+ *   - source: The original source file, or null.
+ *   - line: The line number in the original source, or null.
+ *   - column: The column number in the original source, or null.
+ *   - name: The original identifier, or null.
  */
+IndexedSourceMapConsumer.prototype.originalPositionFor =
+  function IndexedSourceMapConsumer_originalPositionFor(aArgs) {
+    var needle = {
+      generatedLine: util.getArg(aArgs, 'line'),
+      generatedColumn: util.getArg(aArgs, 'column')
+    };
 
-MapCache.prototype.del = function mapDelete(key) {
-  return this.has(key) && delete this.__data__[key];
-};
-
-
-/***/ }),
-/* 695 */
-/***/ (function(module, exports, __webpack_require__) {
+    // Find the section containing the generated position we're trying to map
+    // to an original position.
+    var sectionIndex = binarySearch.search(needle, this._sections,
+      function(needle, section) {
+        var cmp = needle.generatedLine - section.generatedOffset.generatedLine;
+        if (cmp) {
+          return cmp;
+        }
 
-"use strict";
+        return (needle.generatedColumn -
+                section.generatedOffset.generatedColumn);
+      });
+    var section = this._sections[sectionIndex];
 
+    if (!section) {
+      return {
+        source: null,
+        line: null,
+        column: null,
+        name: null
+      };
+    }
 
-var define = __webpack_require__(659);
+    return section.consumer.originalPositionFor({
+      line: needle.generatedLine -
+        (section.generatedOffset.generatedLine - 1),
+      column: needle.generatedColumn -
+        (section.generatedOffset.generatedLine === needle.generatedLine
+         ? section.generatedOffset.generatedColumn - 1
+         : 0),
+      bias: aArgs.bias
+    });
+  };
 
 /**
- * Store position for a node
+ * Return true if we have the source content for every source in the source
+ * map, false otherwise.
  */
+IndexedSourceMapConsumer.prototype.hasContentsOfAllSources =
+  function IndexedSourceMapConsumer_hasContentsOfAllSources() {
+    return this._sections.every(function (s) {
+      return s.consumer.hasContentsOfAllSources();
+    });
+  };
 
-module.exports = function Position(start, parser) {
-  this.start = start;
-  this.end = { line: parser.line, column: parser.column };
-  define(this, 'content', parser.orig);
-  define(this, 'source', parser.options.source);
-};
-
-
-/***/ }),
-/* 696 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isExtendable = __webpack_require__(697);
-var assignSymbols = __webpack_require__(600);
+/**
+ * Returns the original source content. The only argument is the url of the
+ * original source file. Returns null if no original source content is
+ * available.
+ */
+IndexedSourceMapConsumer.prototype.sourceContentFor =
+  function IndexedSourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
+    for (var i = 0; i < this._sections.length; i++) {
+      var section = this._sections[i];
 
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
-  }
-  if (!isObject(obj)) {
-    obj = {};
-  }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
+      var content = section.consumer.sourceContentFor(aSource, true);
+      if (content) {
+        return content;
+      }
     }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
+    if (nullOnMissing) {
+      return null;
     }
-  }
-  return obj;
-};
-
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
+    else {
+      throw new Error('"' + aSource + '" is not in the SourceMap.');
     }
-  }
-}
+  };
 
-function isString(val) {
-  return (val && typeof val === 'string');
-}
+/**
+ * Returns the generated line and column information for the original source,
+ * line, and column positions provided. The only argument is an object with
+ * the following properties:
+ *
+ *   - source: The filename of the original source.
+ *   - line: The line number in the original source.
+ *   - column: The column number in the original source.
+ *
+ * and an object is returned with the following properties:
+ *
+ *   - line: The line number in the generated source, or null.
+ *   - column: The column number in the generated source, or null.
+ */
+IndexedSourceMapConsumer.prototype.generatedPositionFor =
+  function IndexedSourceMapConsumer_generatedPositionFor(aArgs) {
+    for (var i = 0; i < this._sections.length; i++) {
+      var section = this._sections[i];
 
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
-  }
-  return obj;
-}
+      // Only consider this section if the requested source is in the list of
+      // sources of the consumer.
+      if (section.consumer.sources.indexOf(util.getArg(aArgs, 'source')) === -1) {
+        continue;
+      }
+      var generatedPosition = section.consumer.generatedPositionFor(aArgs);
+      if (generatedPosition) {
+        var ret = {
+          line: generatedPosition.line +
+            (section.generatedOffset.generatedLine - 1),
+          column: generatedPosition.column +
+            (section.generatedOffset.generatedLine === generatedPosition.line
+             ? section.generatedOffset.generatedColumn - 1
+             : 0)
+        };
+        return ret;
+      }
+    }
 
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
-}
+    return {
+      line: null,
+      column: null
+    };
+  };
 
 /**
- * Returns true if the given `key` is an own property of `obj`.
+ * Parse the mappings in a string in to a data structure which we can easily
+ * query (the ordered arrays in the `this.__generatedMappings` and
+ * `this.__originalMappings` properties).
  */
+IndexedSourceMapConsumer.prototype._parseMappings =
+  function IndexedSourceMapConsumer_parseMappings(aStr, aSourceRoot) {
+    this.__generatedMappings = [];
+    this.__originalMappings = [];
+    for (var i = 0; i < this._sections.length; i++) {
+      var section = this._sections[i];
+      var sectionMappings = section.consumer._generatedMappings;
+      for (var j = 0; j < sectionMappings.length; j++) {
+        var mapping = sectionMappings[j];
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
-
-
-/***/ }),
-/* 697 */
-/***/ (function(module, exports, __webpack_require__) {
+        var source = section.consumer._sources.at(mapping.source);
+        if (section.consumer.sourceRoot !== null) {
+          source = util.join(section.consumer.sourceRoot, source);
+        }
+        this._sources.add(source);
+        source = this._sources.indexOf(source);
 
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+        var name = section.consumer._names.at(mapping.name);
+        this._names.add(name);
+        name = this._names.indexOf(name);
 
+        // The mappings coming from the consumer for the section have
+        // generated positions relative to the start of the section, so we
+        // need to offset them to be relative to the start of the concatenated
+        // generated file.
+        var adjustedMapping = {
+          source: source,
+          generatedLine: mapping.generatedLine +
+            (section.generatedOffset.generatedLine - 1),
+          generatedColumn: mapping.generatedColumn +
+            (section.generatedOffset.generatedLine === mapping.generatedLine
+            ? section.generatedOffset.generatedColumn - 1
+            : 0),
+          originalLine: mapping.originalLine,
+          originalColumn: mapping.originalColumn,
+          name: name
+        };
 
+        this.__generatedMappings.push(adjustedMapping);
+        if (typeof adjustedMapping.originalLine === 'number') {
+          this.__originalMappings.push(adjustedMapping);
+        }
+      }
+    }
 
-var isPlainObject = __webpack_require__(599);
+    quickSort(this.__generatedMappings, util.compareByGeneratedPositionsDeflated);
+    quickSort(this.__originalMappings, util.compareByOriginalPositions);
+  };
 
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
+exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 
 /***/ }),
-/* 698 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/source-map-generator.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-var nanomatch = __webpack_require__(699);
-var extglob = __webpack_require__(713);
-
-module.exports = function(snapdragon) {
-  var compilers = snapdragon.compiler.compilers;
-  var opts = snapdragon.options;
-
-  // register nanomatch compilers
-  snapdragon.use(nanomatch.compilers);
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
-  // get references to some specific nanomatch compilers before they
-  // are overridden by the extglob and/or custom compilers
-  var escape = compilers.escape;
-  var qmark = compilers.qmark;
-  var slash = compilers.slash;
-  var star = compilers.star;
-  var text = compilers.text;
-  var plus = compilers.plus;
-  var dot = compilers.dot;
+var base64VLQ = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/base64-vlq.js");
+var util = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/util.js");
+var ArraySet = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/array-set.js").ArraySet;
+var MappingList = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/mapping-list.js").MappingList;
 
-  // register extglob compilers or escape exglobs if disabled
-  if (opts.extglob === false || opts.noext === true) {
-    snapdragon.compiler.use(escapeExtglobs);
-  } else {
-    snapdragon.use(extglob.compilers);
+/**
+ * An instance of the SourceMapGenerator represents a source map which is
+ * being built incrementally. You may pass an object with the following
+ * properties:
+ *
+ *   - file: The filename of the generated source.
+ *   - sourceRoot: A root for all relative URLs in this source map.
+ */
+function SourceMapGenerator(aArgs) {
+  if (!aArgs) {
+    aArgs = {};
   }
+  this._file = util.getArg(aArgs, 'file', null);
+  this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null);
+  this._skipValidation = util.getArg(aArgs, 'skipValidation', false);
+  this._sources = new ArraySet();
+  this._names = new ArraySet();
+  this._mappings = new MappingList();
+  this._sourcesContents = null;
+}
 
-  snapdragon.use(function() {
-    this.options.star = this.options.star || function(/*node*/) {
-      return '[^\\\\/]*?';
-    };
-  });
+SourceMapGenerator.prototype._version = 3;
 
-  // custom micromatch compilers
-  snapdragon.compiler
+/**
+ * Creates a new SourceMapGenerator based on a SourceMapConsumer
+ *
+ * @param aSourceMapConsumer The SourceMap.
+ */
+SourceMapGenerator.fromSourceMap =
+  function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
+    var sourceRoot = aSourceMapConsumer.sourceRoot;
+    var generator = new SourceMapGenerator({
+      file: aSourceMapConsumer.file,
+      sourceRoot: sourceRoot
+    });
+    aSourceMapConsumer.eachMapping(function (mapping) {
+      var newMapping = {
+        generated: {
+          line: mapping.generatedLine,
+          column: mapping.generatedColumn
+        }
+      };
 
-    // reset referenced compiler
-    .set('dot', dot)
-    .set('escape', escape)
-    .set('plus', plus)
-    .set('slash', slash)
-    .set('qmark', qmark)
-    .set('star', star)
-    .set('text', text);
-};
+      if (mapping.source != null) {
+        newMapping.source = mapping.source;
+        if (sourceRoot != null) {
+          newMapping.source = util.relative(sourceRoot, newMapping.source);
+        }
 
-function escapeExtglobs(compiler) {
-  compiler.set('paren', function(node) {
-    var val = '';
-    visit(node, function(tok) {
-      if (tok.val) val += (/^\W/.test(tok.val) ? '\\' : '') + tok.val;
-    });
-    return this.emit(val, node);
-  });
+        newMapping.original = {
+          line: mapping.originalLine,
+          column: mapping.originalColumn
+        };
 
-  /**
-   * Visit `node` with the given `fn`
-   */
+        if (mapping.name != null) {
+          newMapping.name = mapping.name;
+        }
+      }
 
-  function visit(node, fn) {
-    return node.nodes ? mapVisit(node.nodes, fn) : fn(node);
-  }
+      generator.addMapping(newMapping);
+    });
+    aSourceMapConsumer.sources.forEach(function (sourceFile) {
+      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+      if (content != null) {
+        generator.setSourceContent(sourceFile, content);
+      }
+    });
+    return generator;
+  };
 
-  /**
-   * Map visit over array of `nodes`.
-   */
+/**
+ * Add a single mapping from original source line and column to the generated
+ * source's line and column for this source map being created. The mapping
+ * object should have the following properties:
+ *
+ *   - generated: An object with the generated line and column positions.
+ *   - original: An object with the original line and column positions.
+ *   - source: The original source file (relative to the sourceRoot).
+ *   - name: An optional original token name for this mapping.
+ */
+SourceMapGenerator.prototype.addMapping =
+  function SourceMapGenerator_addMapping(aArgs) {
+    var generated = util.getArg(aArgs, 'generated');
+    var original = util.getArg(aArgs, 'original', null);
+    var source = util.getArg(aArgs, 'source', null);
+    var name = util.getArg(aArgs, 'name', null);
 
-  function mapVisit(nodes, fn) {
-    var len = nodes.length;
-    var idx = -1;
-    while (++idx < len) {
-      visit(nodes[idx], fn);
+    if (!this._skipValidation) {
+      this._validateMapping(generated, original, source, name);
     }
-  }
-}
 
+    if (source != null) {
+      source = String(source);
+      if (!this._sources.has(source)) {
+        this._sources.add(source);
+      }
+    }
 
-/***/ }),
-/* 699 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+    if (name != null) {
+      name = String(name);
+      if (!this._names.has(name)) {
+        this._names.add(name);
+      }
+    }
 
+    this._mappings.add({
+      generatedLine: generated.line,
+      generatedColumn: generated.column,
+      originalLine: original != null && original.line,
+      originalColumn: original != null && original.column,
+      source: source,
+      name: name
+    });
+  };
 
 /**
- * Module dependencies
+ * Set the source content for a source file.
  */
+SourceMapGenerator.prototype.setSourceContent =
+  function SourceMapGenerator_setSourceContent(aSourceFile, aSourceContent) {
+    var source = aSourceFile;
+    if (this._sourceRoot != null) {
+      source = util.relative(this._sourceRoot, source);
+    }
 
-var util = __webpack_require__(113);
-var toRegex = __webpack_require__(584);
-var extend = __webpack_require__(700);
+    if (aSourceContent != null) {
+      // Add the source content to the _sourcesContents map.
+      // Create a new _sourcesContents map if the property is null.
+      if (!this._sourcesContents) {
+        this._sourcesContents = Object.create(null);
+      }
+      this._sourcesContents[util.toSetString(source)] = aSourceContent;
+    } else if (this._sourcesContents) {
+      // Remove the source file from the _sourcesContents map.
+      // If the _sourcesContents map is empty, set the property to null.
+      delete this._sourcesContents[util.toSetString(source)];
+      if (Object.keys(this._sourcesContents).length === 0) {
+        this._sourcesContents = null;
+      }
+    }
+  };
 
 /**
- * Local dependencies
+ * Applies the mappings of a sub-source-map for a specific source file to the
+ * source map being generated. Each mapping to the supplied source file is
+ * rewritten using the supplied source map. Note: The resolution for the
+ * resulting mappings is the minimium of this map and the supplied map.
+ *
+ * @param aSourceMapConsumer The source map to be applied.
+ * @param aSourceFile Optional. The filename of the source file.
+ *        If omitted, SourceMapConsumer's file property will be used.
+ * @param aSourceMapPath Optional. The dirname of the path to the source map
+ *        to be applied. If relative, it is relative to the SourceMapConsumer.
+ *        This parameter is needed when the two source maps aren't in the same
+ *        directory, and the source map to be applied contains relative source
+ *        paths. If so, those relative source paths need to be rewritten
+ *        relative to the SourceMapGenerator.
  */
+SourceMapGenerator.prototype.applySourceMap =
+  function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile, aSourceMapPath) {
+    var sourceFile = aSourceFile;
+    // If aSourceFile is omitted, we will use the file property of the SourceMap
+    if (aSourceFile == null) {
+      if (aSourceMapConsumer.file == null) {
+        throw new Error(
+          'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' +
+          'or the source map\'s "file" property. Both were omitted.'
+        );
+      }
+      sourceFile = aSourceMapConsumer.file;
+    }
+    var sourceRoot = this._sourceRoot;
+    // Make "sourceFile" relative if an absolute Url is passed.
+    if (sourceRoot != null) {
+      sourceFile = util.relative(sourceRoot, sourceFile);
+    }
+    // Applying the SourceMap can add and remove items from the sources and
+    // the names array.
+    var newSources = new ArraySet();
+    var newNames = new ArraySet();
 
-var compilers = __webpack_require__(702);
-var parsers = __webpack_require__(703);
-var cache = __webpack_require__(706);
-var utils = __webpack_require__(708);
-var MAX_LENGTH = 1024 * 64;
+    // Find mappings for the "sourceFile"
+    this._mappings.unsortedForEach(function (mapping) {
+      if (mapping.source === sourceFile && mapping.originalLine != null) {
+        // Check if it can be mapped by the source map, then update the mapping.
+        var original = aSourceMapConsumer.originalPositionFor({
+          line: mapping.originalLine,
+          column: mapping.originalColumn
+        });
+        if (original.source != null) {
+          // Copy mapping
+          mapping.source = original.source;
+          if (aSourceMapPath != null) {
+            mapping.source = util.join(aSourceMapPath, mapping.source)
+          }
+          if (sourceRoot != null) {
+            mapping.source = util.relative(sourceRoot, mapping.source);
+          }
+          mapping.originalLine = original.line;
+          mapping.originalColumn = original.column;
+          if (original.name != null) {
+            mapping.name = original.name;
+          }
+        }
+      }
+
+      var source = mapping.source;
+      if (source != null && !newSources.has(source)) {
+        newSources.add(source);
+      }
+
+      var name = mapping.name;
+      if (name != null && !newNames.has(name)) {
+        newNames.add(name);
+      }
+
+    }, this);
+    this._sources = newSources;
+    this._names = newNames;
+
+    // Copy sourcesContents of applied map.
+    aSourceMapConsumer.sources.forEach(function (sourceFile) {
+      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+      if (content != null) {
+        if (aSourceMapPath != null) {
+          sourceFile = util.join(aSourceMapPath, sourceFile);
+        }
+        if (sourceRoot != null) {
+          sourceFile = util.relative(sourceRoot, sourceFile);
+        }
+        this.setSourceContent(sourceFile, content);
+      }
+    }, this);
+  };
 
 /**
- * The main function takes a list of strings and one or more
- * glob patterns to use for matching.
+ * A mapping can have one of the three levels of data:
  *
- * ```js
- * var nm = require('nanomatch');
- * nm(list, patterns[, options]);
+ *   1. Just the generated position.
+ *   2. The Generated position, original position, and original source.
+ *   3. Generated and original position, original source, as well as a name
+ *      token.
  *
- * console.log(nm(['a.js', 'a.txt'], ['*.js']));
- * //=> [ 'a.js' ]
- * ```
- * @param {Array} `list` A list of strings to match
- * @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 {Array} Returns an array of matches
- * @summary false
- * @api public
+ * To maintain consistency, we validate that any new mapping being added falls
+ * in to one of these categories.
  */
+SourceMapGenerator.prototype._validateMapping =
+  function SourceMapGenerator_validateMapping(aGenerated, aOriginal, aSource,
+                                              aName) {
+    // When aOriginal is truthy but has empty values for .line and .column,
+    // it is most likely a programmer error. In this case we throw a very
+    // specific error message to try to guide them the right way.
+    // For example: https://github.com/Polymer/polymer-bundler/pull/519
+    if (aOriginal && typeof aOriginal.line !== 'number' && typeof aOriginal.column !== 'number') {
+        throw new Error(
+            'original.line and original.column are not numbers -- you probably meant to omit ' +
+            'the original mapping entirely and only map the generated position. If so, pass ' +
+            'null for the original mapping instead of an object with empty or null values.'
+        );
+    }
 
-function nanomatch(list, patterns, options) {
-  patterns = utils.arrayify(patterns);
-  list = utils.arrayify(list);
+    if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
+        && aGenerated.line > 0 && aGenerated.column >= 0
+        && !aOriginal && !aSource && !aName) {
+      // Case 1.
+      return;
+    }
+    else if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
+             && aOriginal && 'line' in aOriginal && 'column' in aOriginal
+             && aGenerated.line > 0 && aGenerated.column >= 0
+             && aOriginal.line > 0 && aOriginal.column >= 0
+             && aSource) {
+      // Cases 2 and 3.
+      return;
+    }
+    else {
+      throw new Error('Invalid mapping: ' + JSON.stringify({
+        generated: aGenerated,
+        source: aSource,
+        original: aOriginal,
+        name: aName
+      }));
+    }
+  };
 
-  var len = patterns.length;
-  if (list.length === 0 || len === 0) {
-    return [];
-  }
+/**
+ * Serialize the accumulated mappings in to the stream of base 64 VLQs
+ * specified by the source map format.
+ */
+SourceMapGenerator.prototype._serializeMappings =
+  function SourceMapGenerator_serializeMappings() {
+    var previousGeneratedColumn = 0;
+    var previousGeneratedLine = 1;
+    var previousOriginalColumn = 0;
+    var previousOriginalLine = 0;
+    var previousName = 0;
+    var previousSource = 0;
+    var result = '';
+    var next;
+    var mapping;
+    var nameIdx;
+    var sourceIdx;
 
-  if (len === 1) {
-    return nanomatch.match(list, patterns[0], options);
-  }
+    var mappings = this._mappings.toArray();
+    for (var i = 0, len = mappings.length; i < len; i++) {
+      mapping = mappings[i];
+      next = ''
 
-  var negated = false;
-  var omit = [];
-  var keep = [];
-  var idx = -1;
+      if (mapping.generatedLine !== previousGeneratedLine) {
+        previousGeneratedColumn = 0;
+        while (mapping.generatedLine !== previousGeneratedLine) {
+          next += ';';
+          previousGeneratedLine++;
+        }
+      }
+      else {
+        if (i > 0) {
+          if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) {
+            continue;
+          }
+          next += ',';
+        }
+      }
 
-  while (++idx < len) {
-    var pattern = patterns[idx];
+      next += base64VLQ.encode(mapping.generatedColumn
+                                 - previousGeneratedColumn);
+      previousGeneratedColumn = mapping.generatedColumn;
 
-    if (typeof pattern === 'string' && pattern.charCodeAt(0) === 33 /* ! */) {
-      omit.push.apply(omit, nanomatch.match(list, pattern.slice(1), options));
-      negated = true;
-    } else {
-      keep.push.apply(keep, nanomatch.match(list, pattern, options));
-    }
-  }
+      if (mapping.source != null) {
+        sourceIdx = this._sources.indexOf(mapping.source);
+        next += base64VLQ.encode(sourceIdx - previousSource);
+        previousSource = sourceIdx;
 
-  // minimatch.match parity
-  if (negated && keep.length === 0) {
-    if (options && options.unixify === false) {
-      keep = list.slice();
-    } else {
-      var unixify = utils.unixify(options);
-      for (var i = 0; i < list.length; i++) {
-        keep.push(unixify(list[i]));
+        // lines are stored 0-based in SourceMap spec version 3
+        next += base64VLQ.encode(mapping.originalLine - 1
+                                   - previousOriginalLine);
+        previousOriginalLine = mapping.originalLine - 1;
+
+        next += base64VLQ.encode(mapping.originalColumn
+                                   - previousOriginalColumn);
+        previousOriginalColumn = mapping.originalColumn;
+
+        if (mapping.name != null) {
+          nameIdx = this._names.indexOf(mapping.name);
+          next += base64VLQ.encode(nameIdx - previousName);
+          previousName = nameIdx;
+        }
       }
+
+      result += next;
     }
-  }
 
-  var matches = utils.diff(keep, omit);
-  if (!options || options.nodupes !== false) {
-    return utils.unique(matches);
-  }
+    return result;
+  };
 
-  return matches;
-}
+SourceMapGenerator.prototype._generateSourcesContent =
+  function SourceMapGenerator_generateSourcesContent(aSources, aSourceRoot) {
+    return aSources.map(function (source) {
+      if (!this._sourcesContents) {
+        return null;
+      }
+      if (aSourceRoot != null) {
+        source = util.relative(aSourceRoot, source);
+      }
+      var key = util.toSetString(source);
+      return Object.prototype.hasOwnProperty.call(this._sourcesContents, key)
+        ? this._sourcesContents[key]
+        : null;
+    }, this);
+  };
 
 /**
- * Similar to the main function, but `pattern` must be a string.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.match(list, pattern[, options]);
- *
- * console.log(nm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
- * //=> ['a.a', 'a.aa']
- * ```
- * @param {Array} `list` Array of strings to match
- * @param {String} `pattern` 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 matches
- * @api public
+ * Externalize the source map.
  */
-
-nanomatch.match = function(list, pattern, options) {
-  if (Array.isArray(pattern)) {
-    throw new TypeError('expected pattern to be a string');
-  }
-
-  var unixify = utils.unixify(options);
-  var isMatch = memoize('match', pattern, options, nanomatch.matcher);
-  var matches = [];
-
-  list = utils.arrayify(list);
-  var len = list.length;
-  var idx = -1;
-
-  while (++idx < len) {
-    var ele = list[idx];
-    if (ele === pattern || isMatch(ele)) {
-      matches.push(utils.value(ele, unixify, options));
+SourceMapGenerator.prototype.toJSON =
+  function SourceMapGenerator_toJSON() {
+    var map = {
+      version: this._version,
+      sources: this._sources.toArray(),
+      names: this._names.toArray(),
+      mappings: this._serializeMappings()
+    };
+    if (this._file != null) {
+      map.file = this._file;
     }
-  }
-
-  // if no options were passed, uniquify results and return
-  if (typeof options === 'undefined') {
-    return utils.unique(matches);
-  }
-
-  if (matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
+    if (this._sourceRoot != null) {
+      map.sourceRoot = this._sourceRoot;
     }
-    if (options.nonull === true || options.nullglob === true) {
-      return [options.unescape ? utils.unescape(pattern) : pattern];
+    if (this._sourcesContents) {
+      map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot);
     }
-  }
 
-  // if `opts.ignore` was defined, diff ignored list
-  if (options.ignore) {
-    matches = nanomatch.not(matches, options.ignore, options);
-  }
-
-  return options.nodupes !== false ? utils.unique(matches) : matches;
-};
+    return map;
+  };
 
 /**
- * Returns true if the specified `string` matches the given glob `pattern`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.isMatch(string, pattern[, options]);
- *
- * console.log(nm.isMatch('a.a', '*.a'));
- * //=> true
- * console.log(nm.isMatch('a.b', '*.a'));
- * //=> false
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` 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 string matches the glob pattern.
- * @api public
+ * Render the source map being generated to a string.
  */
+SourceMapGenerator.prototype.toString =
+  function SourceMapGenerator_toString() {
+    return JSON.stringify(this.toJSON());
+  };
 
-nanomatch.isMatch = function(str, pattern, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
+exports.SourceMapGenerator = SourceMapGenerator;
 
-  if (utils.isEmptyString(str) || utils.isEmptyString(pattern)) {
-    return false;
-  }
 
-  var equals = utils.equalsPattern(options);
-  if (equals(str)) {
-    return true;
-  }
+/***/ }),
 
-  var isMatch = memoize('isMatch', pattern, options, nanomatch.matcher);
-  return isMatch(str);
-};
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/source-node.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Returns true if some of the elements in the given `list` match any of the
- * given glob `patterns`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.some(list, patterns[, options]);
- *
- * console.log(nm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
- * // true
- * console.log(nm.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
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
  */
 
-nanomatch.some = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
+var SourceMapGenerator = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/source-map-generator.js").SourceMapGenerator;
+var util = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/util.js");
 
-  for (var i = 0; i < list.length; i++) {
-    if (nanomatch(list[i], patterns, options).length === 1) {
-      return true;
-    }
-  }
+// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
+// operating systems these days (capturing the result).
+var REGEX_NEWLINE = /(\r?\n)/;
 
-  return false;
-};
+// Newline character code for charCodeAt() comparisons
+var NEWLINE_CODE = 10;
+
+// Private symbol for identifying `SourceNode`s when multiple versions of
+// the source-map library are loaded. This MUST NOT CHANGE across
+// versions!
+var isSourceNode = "$$$isSourceNode$$$";
 
 /**
- * Returns true if every element in the given `list` matches
- * at least one of the given glob `patterns`.
+ * SourceNodes provide a way to abstract over interpolating/concatenating
+ * snippets of generated JavaScript source code while maintaining the line and
+ * column information associated with the original source code.
  *
- * ```js
- * var nm = require('nanomatch');
- * nm.every(list, patterns[, options]);
+ * @param aLine The original line number.
+ * @param aColumn The original column number.
+ * @param aSource The original source's filename.
+ * @param aChunks Optional. An array of strings which are snippets of
+ *        generated JS, or other SourceNodes.
+ * @param aName The original identifier.
+ */
+function SourceNode(aLine, aColumn, aSource, aChunks, aName) {
+  this.children = [];
+  this.sourceContents = {};
+  this.line = aLine == null ? null : aLine;
+  this.column = aColumn == null ? null : aColumn;
+  this.source = aSource == null ? null : aSource;
+  this.name = aName == null ? null : aName;
+  this[isSourceNode] = true;
+  if (aChunks != null) this.add(aChunks);
+}
+
+/**
+ * Creates a SourceNode from generated code and a SourceMapConsumer.
  *
- * console.log(nm.every('foo.js', ['foo.js']));
- * // true
- * console.log(nm.every(['foo.js', 'bar.js'], ['*.js']));
- * // true
- * console.log(nm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
- * // false
- * console.log(nm.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
+ * @param aGeneratedCode The generated code
+ * @param aSourceMapConsumer The SourceMap for the generated code
+ * @param aRelativePath Optional. The path that relative sources in the
+ *        SourceMapConsumer should be relative to.
  */
+SourceNode.fromStringWithSourceMap =
+  function SourceNode_fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) {
+    // The SourceNode we want to fill with the generated code
+    // and the SourceMap
+    var node = new SourceNode();
 
-nanomatch.every = function(list, patterns, options) {
-  if (typeof list === 'string') {
-    list = [list];
-  }
+    // All even indices of this array are one line of the generated code,
+    // while all odd indices are the newlines between two adjacent lines
+    // (since `REGEX_NEWLINE` captures its match).
+    // Processed fragments are accessed by calling `shiftNextLine`.
+    var remainingLines = aGeneratedCode.split(REGEX_NEWLINE);
+    var remainingLinesIndex = 0;
+    var shiftNextLine = function() {
+      var lineContents = getNextLine();
+      // The last line of a file might not have a newline.
+      var newLine = getNextLine() || "";
+      return lineContents + newLine;
 
-  for (var i = 0; i < list.length; i++) {
-    if (nanomatch(list[i], patterns, options).length !== 1) {
-      return false;
-    }
-  }
+      function getNextLine() {
+        return remainingLinesIndex < remainingLines.length ?
+            remainingLines[remainingLinesIndex++] : undefined;
+      }
+    };
 
-  return true;
-};
+    // We need to remember the position of "remainingLines"
+    var lastGeneratedLine = 1, lastGeneratedColumn = 0;
 
-/**
- * Returns true if **any** of the given glob `patterns`
- * match the specified `string`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.any(string, patterns[, options]);
- *
- * console.log(nm.any('a.a', ['b.*', '*.a']));
- * //=> true
- * console.log(nm.any('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) for changing how matches are performed
- * @return {Boolean} Returns true if any patterns match `str`
- * @api public
- */
+    // The generate SourceNodes we need a code range.
+    // To extract it current and last mapping is used.
+    // Here we store the last mapping.
+    var lastMapping = null;
 
-nanomatch.any = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
+    aSourceMapConsumer.eachMapping(function (mapping) {
+      if (lastMapping !== null) {
+        // We add the code from "lastMapping" to "mapping":
+        // First check if there is a new line in between.
+        if (lastGeneratedLine < mapping.generatedLine) {
+          // Associate first line with "lastMapping"
+          addMappingWithCode(lastMapping, shiftNextLine());
+          lastGeneratedLine++;
+          lastGeneratedColumn = 0;
+          // The remaining code is added without mapping
+        } else {
+          // There is no new line in between.
+          // Associate the code between "lastGeneratedColumn" and
+          // "mapping.generatedColumn" with "lastMapping"
+          var nextLine = remainingLines[remainingLinesIndex];
+          var code = nextLine.substr(0, mapping.generatedColumn -
+                                        lastGeneratedColumn);
+          remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
+                                              lastGeneratedColumn);
+          lastGeneratedColumn = mapping.generatedColumn;
+          addMappingWithCode(lastMapping, code);
+          // No more remaining code, continue
+          lastMapping = mapping;
+          return;
+        }
+      }
+      // We add the generated code until the first mapping
+      // to the SourceNode without any mapping.
+      // Each line is added as separate string.
+      while (lastGeneratedLine < mapping.generatedLine) {
+        node.add(shiftNextLine());
+        lastGeneratedLine++;
+      }
+      if (lastGeneratedColumn < mapping.generatedColumn) {
+        var nextLine = remainingLines[remainingLinesIndex];
+        node.add(nextLine.substr(0, mapping.generatedColumn));
+        remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
+        lastGeneratedColumn = mapping.generatedColumn;
+      }
+      lastMapping = mapping;
+    }, this);
+    // We have processed all mappings.
+    if (remainingLinesIndex < remainingLines.length) {
+      if (lastMapping) {
+        // Associate the remaining code in the current line with "lastMapping"
+        addMappingWithCode(lastMapping, shiftNextLine());
+      }
+      // and add the remaining lines without any mapping
+      node.add(remainingLines.splice(remainingLinesIndex).join(""));
+    }
 
-  if (utils.isEmptyString(str) || utils.isEmptyString(patterns)) {
-    return false;
-  }
+    // Copy sourcesContent into SourceNode
+    aSourceMapConsumer.sources.forEach(function (sourceFile) {
+      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+      if (content != null) {
+        if (aRelativePath != null) {
+          sourceFile = util.join(aRelativePath, sourceFile);
+        }
+        node.setSourceContent(sourceFile, content);
+      }
+    });
 
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
-  }
+    return node;
 
-  for (var i = 0; i < patterns.length; i++) {
-    if (nanomatch.isMatch(str, patterns[i], options)) {
-      return true;
+    function addMappingWithCode(mapping, code) {
+      if (mapping === null || mapping.source === undefined) {
+        node.add(code);
+      } else {
+        var source = aRelativePath
+          ? util.join(aRelativePath, mapping.source)
+          : mapping.source;
+        node.add(new SourceNode(mapping.originalLine,
+                                mapping.originalColumn,
+                                source,
+                                code,
+                                mapping.name));
+      }
     }
-  }
-  return false;
-};
+  };
 
 /**
- * Returns true if **all** of the given `patterns`
- * match the specified string.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.all(string, patterns[, options]);
- *
- * console.log(nm.all('foo.js', ['foo.js']));
- * // true
- *
- * console.log(nm.all('foo.js', ['*.js', '!foo.js']));
- * // false
- *
- * console.log(nm.all('foo.js', ['*.js', 'foo.js']));
- * // true
+ * Add a chunk of generated JS to this source node.
  *
- * console.log(nm.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
+ * @param aChunk A string snippet of generated JS code, another instance of
+ *        SourceNode, or an array where each member is one of those things.
  */
-
-nanomatch.all = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (typeof patterns === 'string') {
-    patterns = [patterns];
+SourceNode.prototype.add = function SourceNode_add(aChunk) {
+  if (Array.isArray(aChunk)) {
+    aChunk.forEach(function (chunk) {
+      this.add(chunk);
+    }, this);
   }
-
-  for (var i = 0; i < patterns.length; i++) {
-    if (!nanomatch.isMatch(str, patterns[i], options)) {
-      return false;
+  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
+    if (aChunk) {
+      this.children.push(aChunk);
     }
   }
-  return true;
+  else {
+    throw new TypeError(
+      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
+    );
+  }
+  return this;
 };
 
 /**
- * Returns a list of strings that _**do not match any**_ of the given `patterns`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.not(list, patterns[, options]);
+ * Add a chunk of generated JS to the beginning of this source node.
  *
- * console.log(nm.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
+ * @param aChunk A string snippet of generated JS code, another instance of
+ *        SourceNode, or an array where each member is one of those things.
  */
-
-nanomatch.not = function(list, patterns, options) {
-  var opts = extend({}, options);
-  var ignore = opts.ignore;
-  delete opts.ignore;
-
-  list = utils.arrayify(list);
-
-  var matches = utils.diff(list, nanomatch(list, patterns, opts));
-  if (ignore) {
-    matches = utils.diff(matches, nanomatch(list, ignore));
+SourceNode.prototype.prepend = function SourceNode_prepend(aChunk) {
+  if (Array.isArray(aChunk)) {
+    for (var i = aChunk.length-1; i >= 0; i--) {
+      this.prepend(aChunk[i]);
+    }
   }
-
-  return opts.nodupes !== false ? utils.unique(matches) : matches;
+  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
+    this.children.unshift(aChunk);
+  }
+  else {
+    throw new TypeError(
+      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
+    );
+  }
+  return this;
 };
 
 /**
- * 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 nm = require('nanomatch');
- * nm.contains(string, pattern[, options]);
+ * Walk over the tree of JS snippets in this node and its children. The
+ * walking function is called once for each snippet of JS and is passed that
+ * snippet and the its original associated source's line/column location.
  *
- * console.log(nm.contains('aa/bb/cc', '*b'));
- * //=> true
- * console.log(nm.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
+ * @param aFn The traversal function.
  */
-
-nanomatch.contains = function(str, patterns, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string: "' + util.inspect(str) + '"');
-  }
-
-  if (typeof patterns === 'string') {
-    if (utils.isEmptyString(str) || utils.isEmptyString(patterns)) {
-      return false;
-    }
-
-    var equals = utils.equalsPattern(patterns, options);
-    if (equals(str)) {
-      return true;
+SourceNode.prototype.walk = function SourceNode_walk(aFn) {
+  var chunk;
+  for (var i = 0, len = this.children.length; i < len; i++) {
+    chunk = this.children[i];
+    if (chunk[isSourceNode]) {
+      chunk.walk(aFn);
     }
-    var contains = utils.containsPattern(patterns, options);
-    if (contains(str)) {
-      return true;
+    else {
+      if (chunk !== '') {
+        aFn(chunk, { source: this.source,
+                     line: this.line,
+                     column: this.column,
+                     name: this.name });
+      }
     }
   }
-
-  var opts = extend({}, options, {contains: true});
-  return nanomatch.any(str, patterns, opts);
-};
-
-/**
- * Returns true if the given pattern and options should enable
- * the `matchBase` option.
- * @return {Boolean}
- * @api private
- */
-
-nanomatch.matchBase = function(pattern, options) {
-  if (pattern && pattern.indexOf('/') !== -1 || !options) return false;
-  return options.basename === true || options.matchBase === 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
- * var nm = require('nanomatch');
- * nm.matchKeys(object, patterns[, options]);
+ * Like `String.prototype.join` except for SourceNodes. Inserts `aStr` between
+ * each of `this.children`.
  *
- * var obj = { aa: 'a', ab: 'b', ac: 'c' };
- * console.log(nm.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
+ * @param aSep The separator.
  */
-
-nanomatch.matchKeys = function(obj, patterns, options) {
-  if (!utils.isObject(obj)) {
-    throw new TypeError('expected the first argument to be an object');
+SourceNode.prototype.join = function SourceNode_join(aSep) {
+  var newChildren;
+  var i;
+  var len = this.children.length;
+  if (len > 0) {
+    newChildren = [];
+    for (i = 0; i < len-1; i++) {
+      newChildren.push(this.children[i]);
+      newChildren.push(aSep);
+    }
+    newChildren.push(this.children[i]);
+    this.children = newChildren;
   }
-  var keys = nanomatch(Object.keys(obj), patterns, options);
-  return utils.pick(obj, keys);
+  return this;
 };
 
 /**
- * Returns a memoized 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
- * var nm = require('nanomatch');
- * nm.matcher(pattern[, options]);
+ * Call String.prototype.replace on the very right-most source snippet. Useful
+ * for trimming whitespace from the end of a source node, etc.
  *
- * var isMatch = nm.matcher('*.!(*a)');
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.b'));
- * //=> true
- * ```
- * @param {String} `pattern` Glob pattern
- * @param {Object} `options` See available [options](#options) for changing how matches are performed.
- * @return {Function} Returns a matcher function.
- * @api public
+ * @param aPattern The pattern to replace.
+ * @param aReplacement The thing to replace the pattern with.
  */
-
-nanomatch.matcher = function matcher(pattern, options) {
-  if (utils.isEmptyString(pattern)) {
-    return function() {
-      return false;
-    };
+SourceNode.prototype.replaceRight = function SourceNode_replaceRight(aPattern, aReplacement) {
+  var lastChild = this.children[this.children.length - 1];
+  if (lastChild[isSourceNode]) {
+    lastChild.replaceRight(aPattern, aReplacement);
   }
-
-  if (Array.isArray(pattern)) {
-    return compose(pattern, options, matcher);
+  else if (typeof lastChild === 'string') {
+    this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement);
   }
-
-  // if pattern is a regex
-  if (pattern instanceof RegExp) {
-    return test(pattern);
+  else {
+    this.children.push(''.replace(aPattern, aReplacement));
   }
+  return this;
+};
 
-  // if pattern is invalid
-  if (!utils.isString(pattern)) {
-    throw new TypeError('expected pattern to be an array, string or regex');
-  }
+/**
+ * Set the source content for a source file. This will be added to the SourceMapGenerator
+ * in the sourcesContent field.
+ *
+ * @param aSourceFile The filename of the source file
+ * @param aSourceContent The content of the source file
+ */
+SourceNode.prototype.setSourceContent =
+  function SourceNode_setSourceContent(aSourceFile, aSourceContent) {
+    this.sourceContents[util.toSetString(aSourceFile)] = aSourceContent;
+  };
 
-  // if pattern is a non-glob string
-  if (!utils.hasSpecialChars(pattern)) {
-    if (options && options.nocase === true) {
-      pattern = pattern.toLowerCase();
+/**
+ * Walk over the tree of SourceNodes. The walking function is called for each
+ * source file content and is passed the filename and source content.
+ *
+ * @param aFn The traversal function.
+ */
+SourceNode.prototype.walkSourceContents =
+  function SourceNode_walkSourceContents(aFn) {
+    for (var i = 0, len = this.children.length; i < len; i++) {
+      if (this.children[i][isSourceNode]) {
+        this.children[i].walkSourceContents(aFn);
+      }
     }
-    return utils.matchPath(pattern, options);
-  }
-
-  // if pattern is a glob string
-  var re = nanomatch.makeRe(pattern, options);
 
-  // if `options.matchBase` or `options.basename` is defined
-  if (nanomatch.matchBase(pattern, options)) {
-    return utils.matchBasename(re, options);
-  }
+    var sources = Object.keys(this.sourceContents);
+    for (var i = 0, len = sources.length; i < len; i++) {
+      aFn(util.fromSetString(sources[i]), this.sourceContents[sources[i]]);
+    }
+  };
 
-  function test(regex) {
-    var equals = utils.equalsPattern(options);
-    var unixify = utils.unixify(options);
+/**
+ * Return the string representation of this source node. Walks over the tree
+ * and concatenates all the various snippets together to one string.
+ */
+SourceNode.prototype.toString = function SourceNode_toString() {
+  var str = "";
+  this.walk(function (chunk) {
+    str += chunk;
+  });
+  return str;
+};
 
-    return function(str) {
-      if (equals(str)) {
-        return true;
+/**
+ * Returns the string representation of this source node along with a source
+ * map.
+ */
+SourceNode.prototype.toStringWithSourceMap = function SourceNode_toStringWithSourceMap(aArgs) {
+  var generated = {
+    code: "",
+    line: 1,
+    column: 0
+  };
+  var map = new SourceMapGenerator(aArgs);
+  var sourceMappingActive = false;
+  var lastOriginalSource = null;
+  var lastOriginalLine = null;
+  var lastOriginalColumn = null;
+  var lastOriginalName = null;
+  this.walk(function (chunk, original) {
+    generated.code += chunk;
+    if (original.source !== null
+        && original.line !== null
+        && original.column !== null) {
+      if(lastOriginalSource !== original.source
+         || lastOriginalLine !== original.line
+         || lastOriginalColumn !== original.column
+         || lastOriginalName !== original.name) {
+        map.addMapping({
+          source: original.source,
+          original: {
+            line: original.line,
+            column: original.column
+          },
+          generated: {
+            line: generated.line,
+            column: generated.column
+          },
+          name: original.name
+        });
       }
-
-      if (regex.test(unixify(str))) {
-        return true;
+      lastOriginalSource = original.source;
+      lastOriginalLine = original.line;
+      lastOriginalColumn = original.column;
+      lastOriginalName = original.name;
+      sourceMappingActive = true;
+    } else if (sourceMappingActive) {
+      map.addMapping({
+        generated: {
+          line: generated.line,
+          column: generated.column
+        }
+      });
+      lastOriginalSource = null;
+      sourceMappingActive = false;
+    }
+    for (var idx = 0, length = chunk.length; idx < length; idx++) {
+      if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
+        generated.line++;
+        generated.column = 0;
+        // Mappings end at eol
+        if (idx + 1 === length) {
+          lastOriginalSource = null;
+          sourceMappingActive = false;
+        } else if (sourceMappingActive) {
+          map.addMapping({
+            source: original.source,
+            original: {
+              line: original.line,
+              column: original.column
+            },
+            generated: {
+              line: generated.line,
+              column: generated.column
+            },
+            name: original.name
+          });
+        }
+      } else {
+        generated.column++;
       }
-      return false;
-    };
-  }
+    }
+  });
+  this.walkSourceContents(function (sourceFile, sourceContent) {
+    map.setSourceContent(sourceFile, sourceContent);
+  });
 
-  // create matcher function
-  var matcherFn = test(re);
-  // set result object from compiler on matcher function,
-  // as a non-enumerable property. useful for debugging
-  utils.define(matcherFn, 'result', re.result);
-  return matcherFn;
+  return { code: generated.code, map: map };
 };
 
-/**
- * Returns an array of matches captured by `pattern` in `string, or
- * `null` if the pattern did not match.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.capture(pattern, string[, options]);
- *
- * console.log(nm.capture('test/*.js', 'test/foo.js'));
- * //=> ['foo']
- * console.log(nm.capture('test/*.js', 'foo/bar.css'));
- * //=> null
- * ```
- * @param {String} `pattern` Glob pattern to use for matching.
- * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
- * @api public
- */
+exports.SourceNode = SourceNode;
 
-nanomatch.capture = function(pattern, str, options) {
-  var re = nanomatch.makeRe(pattern, extend({capture: true}, options));
-  var unixify = utils.unixify(options);
 
-  function match() {
-    return function(string) {
-      var match = re.exec(unixify(string));
-      if (!match) {
-        return null;
-      }
+/***/ }),
 
-      return match.slice(1);
-    };
-  }
+/***/ "../../node_modules/snapdragon/node_modules/source-map/lib/util.js":
+/***/ (function(module, exports) {
 
-  var capture = memoize('capture', pattern, options, match);
-  return capture(str);
-};
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
 /**
- * Create a regular expression from the given glob `pattern`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.makeRe(pattern[, options]);
+ * This is a helper function for getting values from parameter/options
+ * objects.
  *
- * console.log(nm.makeRe('*.js'));
- * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
- * ```
- * @param {String} `pattern` A glob pattern to convert to regex.
- * @param {Object} `options` See available [options](#options) for changing how matches are performed.
- * @return {RegExp} Returns a regex created from the given pattern.
- * @api public
+ * @param args The object we are extracting values from
+ * @param name The name of the property we are getting.
+ * @param defaultValue An optional value to return if the property is missing
+ * from the object. If this is not specified and the property is missing, an
+ * error will be thrown.
  */
-
-nanomatch.makeRe = function(pattern, options) {
-  if (pattern instanceof RegExp) {
-    return pattern;
+function getArg(aArgs, aName, aDefaultValue) {
+  if (aName in aArgs) {
+    return aArgs[aName];
+  } else if (arguments.length === 3) {
+    return aDefaultValue;
+  } else {
+    throw new Error('"' + aName + '" is a required argument.');
   }
+}
+exports.getArg = getArg;
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
+var urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.]*)(?::(\d+))?(\S*)$/;
+var dataUrlRegexp = /^data:.+\,.+$/;
 
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
+function urlParse(aUrl) {
+  var match = aUrl.match(urlRegexp);
+  if (!match) {
+    return null;
   }
+  return {
+    scheme: match[1],
+    auth: match[2],
+    host: match[3],
+    port: match[4],
+    path: match[5]
+  };
+}
+exports.urlParse = urlParse;
 
-  function makeRe() {
-    var opts = utils.extend({wrap: false}, options);
-    var result = nanomatch.create(pattern, opts);
-    var regex = toRegex(result.output, opts);
-    utils.define(regex, 'result', result);
-    return regex;
+function urlGenerate(aParsedUrl) {
+  var url = '';
+  if (aParsedUrl.scheme) {
+    url += aParsedUrl.scheme + ':';
   }
-
-  return memoize('makeRe', pattern, options, makeRe);
-};
+  url += '//';
+  if (aParsedUrl.auth) {
+    url += aParsedUrl.auth + '@';
+  }
+  if (aParsedUrl.host) {
+    url += aParsedUrl.host;
+  }
+  if (aParsedUrl.port) {
+    url += ":" + aParsedUrl.port
+  }
+  if (aParsedUrl.path) {
+    url += aParsedUrl.path;
+  }
+  return url;
+}
+exports.urlGenerate = urlGenerate;
 
 /**
- * Parses the given glob `pattern` and returns an object with the compiled `output`
- * and optional source `map`.
+ * Normalizes a path, or the path portion of a URL:
  *
- * ```js
- * var nm = require('nanomatch');
- * nm.create(pattern[, options]);
+ * - Replaces consecutive slashes with one slash.
+ * - Removes unnecessary '.' parts.
+ * - Removes unnecessary '<dir>/..' parts.
  *
- * console.log(nm.create('abc/*.js'));
- * // { options: { source: 'string', sourcemap: true },
- * //   state: {},
- * //   compilers:
- * //    { ... },
- * //   output: '(\\.[\\\\\\/])?abc\\/(?!\\.)(?=.)[^\\/]*?\\.js',
- * //   ast:
- * //    { type: 'root',
- * //      errors: [],
- * //      nodes:
- * //       [ ... ],
- * //      dot: false,
- * //      input: 'abc/*.js' },
- * //   parsingErrors: [],
- * //   map:
- * //    { version: 3,
- * //      sources: [ 'string' ],
- * //      names: [],
- * //      mappings: 'AAAA,GAAG,EAAC,kBAAC,EAAC,EAAE',
- * //      sourcesContent: [ 'abc/*.js' ] },
- * //   position: { line: 1, column: 28 },
- * //   content: {},
- * //   files: {},
- * //   idx: 6 }
- * ```
- * @param {String} `pattern` Glob pattern to parse and compile.
- * @param {Object} `options` Any [options](#options) to change how parsing and compiling is performed.
- * @return {Object} Returns an object with the parsed AST, compiled string and optional source map.
- * @api public
+ * Based on code in the Node.js 'path' core module.
+ *
+ * @param aPath The path or url to normalize.
  */
+function normalize(aPath) {
+  var path = aPath;
+  var url = urlParse(aPath);
+  if (url) {
+    if (!url.path) {
+      return aPath;
+    }
+    path = url.path;
+  }
+  var isAbsolute = exports.isAbsolute(path);
 
-nanomatch.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
+  var parts = path.split(/\/+/);
+  for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
+    part = parts[i];
+    if (part === '.') {
+      parts.splice(i, 1);
+    } else if (part === '..') {
+      up++;
+    } else if (up > 0) {
+      if (part === '') {
+        // The first part is blank if the path is absolute. Trying to go
+        // above the root is a no-op. Therefore we can remove all '..' parts
+        // directly after the root.
+        parts.splice(i + 1, up);
+        up = 0;
+      } else {
+        parts.splice(i, 2);
+        up--;
+      }
+    }
   }
-  function create() {
-    return nanomatch.compile(nanomatch.parse(pattern, options), options);
+  path = parts.join('/');
+
+  if (path === '') {
+    path = isAbsolute ? '/' : '.';
   }
-  return memoize('create', pattern, options, create);
-};
+
+  if (url) {
+    url.path = path;
+    return urlGenerate(url);
+  }
+  return path;
+}
+exports.normalize = normalize;
 
 /**
- * Parse the given `str` with the given `options`.
+ * Joins two paths/URLs.
  *
- * ```js
- * var nm = require('nanomatch');
- * nm.parse(pattern[, options]);
+ * @param aRoot The root path or URL.
+ * @param aPath The path or URL to be joined with the root.
  *
- * var ast = nm.parse('a/{b,c}/d');
- * console.log(ast);
- * // { type: 'root',
- * //   errors: [],
- * //   input: 'a/{b,c}/d',
- * //   nodes:
- * //    [ { type: 'bos', val: '' },
- * //      { type: 'text', val: 'a/' },
- * //      { type: 'brace',
- * //        nodes:
- * //         [ { type: 'brace.open', val: '{' },
- * //           { type: 'text', val: 'b,c' },
- * //           { type: 'brace.close', val: '}' } ] },
- * //      { type: 'text', val: '/d' },
- * //      { type: 'eos', val: '' } ] }
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {Object} Returns an AST
- * @api public
+ * - If aPath is a URL or a data URI, aPath is returned, unless aPath is a
+ *   scheme-relative URL: Then the scheme of aRoot, if any, is prepended
+ *   first.
+ * - Otherwise aPath is a path. If aRoot is a URL, then its path portion
+ *   is updated with the result and aRoot is returned. Otherwise the result
+ *   is returned.
+ *   - If aPath is absolute, the result is aPath.
+ *   - Otherwise the two paths are joined with a slash.
+ * - Joining for example 'http://' and 'www.example.com' is also supported.
  */
+function join(aRoot, aPath) {
+  if (aRoot === "") {
+    aRoot = ".";
+  }
+  if (aPath === "") {
+    aPath = ".";
+  }
+  var aPathUrl = urlParse(aPath);
+  var aRootUrl = urlParse(aRoot);
+  if (aRootUrl) {
+    aRoot = aRootUrl.path || '/';
+  }
 
-nanomatch.parse = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected a string');
+  // `join(foo, '//www.example.org')`
+  if (aPathUrl && !aPathUrl.scheme) {
+    if (aRootUrl) {
+      aPathUrl.scheme = aRootUrl.scheme;
+    }
+    return urlGenerate(aPathUrl);
   }
 
-  function parse() {
-    var snapdragon = utils.instantiate(null, options);
-    parsers(snapdragon, options);
+  if (aPathUrl || aPath.match(dataUrlRegexp)) {
+    return aPath;
+  }
 
-    var ast = snapdragon.parse(pattern, options);
-    utils.define(ast, 'snapdragon', snapdragon);
-    ast.input = pattern;
-    return ast;
+  // `join('http://', 'www.example.com')`
+  if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
+    aRootUrl.host = aPath;
+    return urlGenerate(aRootUrl);
   }
 
-  return memoize('parse', pattern, options, parse);
+  var joined = aPath.charAt(0) === '/'
+    ? aPath
+    : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath);
+
+  if (aRootUrl) {
+    aRootUrl.path = joined;
+    return urlGenerate(aRootUrl);
+  }
+  return joined;
+}
+exports.join = join;
+
+exports.isAbsolute = function (aPath) {
+  return aPath.charAt(0) === '/' || !!aPath.match(urlRegexp);
 };
 
 /**
- * Compile the given `ast` or string with the given `options`.
- *
- * ```js
- * var nm = require('nanomatch');
- * nm.compile(ast[, options]);
+ * Make a path relative to a URL or another path.
  *
- * var ast = nm.parse('a/{b,c}/d');
- * console.log(nm.compile(ast));
- * // { options: { source: 'string' },
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      brace: [Function],
- * //      'brace.open': [Function],
- * //      text: [Function],
- * //      'brace.close': [Function] },
- * //   output: [ 'a/(b|c)/d' ],
- * //   ast:
- * //    { ... },
- * //   parsingErrors: [] }
- * ```
- * @param {Object|String} `ast`
- * @param {Object} `options`
- * @return {Object} Returns an object that has an `output` property with the compiled string.
- * @api public
+ * @param aRoot The root path or URL.
+ * @param aPath The path or URL to be made relative to aRoot.
  */
-
-nanomatch.compile = function(ast, options) {
-  if (typeof ast === 'string') {
-    ast = nanomatch.parse(ast, options);
+function relative(aRoot, aPath) {
+  if (aRoot === "") {
+    aRoot = ".";
   }
 
-  function compile() {
-    var snapdragon = utils.instantiate(ast, options);
-    compilers(snapdragon, options);
-    return snapdragon.compile(ast, options);
+  aRoot = aRoot.replace(/\/$/, '');
+
+  // It is possible for the path to be above the root. In this case, simply
+  // checking whether the root is a prefix of the path won't work. Instead, we
+  // need to remove components from the root one by one, until either we find
+  // a prefix that fits, or we run out of components to remove.
+  var level = 0;
+  while (aPath.indexOf(aRoot + '/') !== 0) {
+    var index = aRoot.lastIndexOf("/");
+    if (index < 0) {
+      return aPath;
+    }
+
+    // If the only part of the root that is left is the scheme (i.e. http://,
+    // file:///, etc.), one or more slashes (/), or simply nothing at all, we
+    // have exhausted all components, so the path is not relative to the root.
+    aRoot = aRoot.slice(0, index);
+    if (aRoot.match(/^([^\/]+:\/)?\/*$/)) {
+      return aPath;
+    }
+
+    ++level;
   }
 
-  return memoize('compile', ast.input, options, compile);
-};
+  // Make sure we add a "../" for each component we removed from the root.
+  return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
+}
+exports.relative = relative;
 
-/**
- * Clear the regex cache.
- *
- * ```js
- * nm.clearCache();
- * ```
- * @api public
- */
+var supportsNullProto = (function () {
+  var obj = Object.create(null);
+  return !('__proto__' in obj);
+}());
 
-nanomatch.clearCache = function() {
-  nanomatch.cache.__data__ = {};
-};
+function identity (s) {
+  return s;
+}
 
 /**
- * Compose a matcher function with the given patterns.
- * This allows matcher functions to be compiled once and
- * called multiple times.
+ * Because behavior goes wacky when you set `__proto__` on objects, we
+ * have to prefix all the strings in our set with an arbitrary character.
+ *
+ * See https://github.com/mozilla/source-map/pull/31 and
+ * https://github.com/mozilla/source-map/issues/30
+ *
+ * @param String aStr
  */
+function toSetString(aStr) {
+  if (isProtoString(aStr)) {
+    return '$' + aStr;
+  }
 
-function compose(patterns, options, matcher) {
-  var matchers;
+  return aStr;
+}
+exports.toSetString = supportsNullProto ? identity : toSetString;
 
-  return memoize('compose', String(patterns), options, function() {
-    return function(file) {
-      // delay composition until it's invoked the first time,
-      // after that it won't be called again
-      if (!matchers) {
-        matchers = [];
-        for (var i = 0; i < patterns.length; i++) {
-          matchers.push(matcher(patterns[i], options));
-        }
-      }
+function fromSetString(aStr) {
+  if (isProtoString(aStr)) {
+    return aStr.slice(1);
+  }
 
-      var len = matchers.length;
-      while (len--) {
-        if (matchers[len](file) === true) {
-          return true;
-        }
-      }
-      return false;
-    };
-  });
+  return aStr;
 }
+exports.fromSetString = supportsNullProto ? identity : fromSetString;
 
-/**
- * Memoize a generated regex or function. A unique key is generated
- * from the `type` (usually method name), the `pattern`, and
- * user-defined options.
- */
+function isProtoString(s) {
+  if (!s) {
+    return false;
+  }
 
-function memoize(type, pattern, options, fn) {
-  var key = utils.createKey(type + '=' + pattern, options);
+  var length = s.length;
 
-  if (options && options.cache === false) {
-    return fn(pattern, options);
+  if (length < 9 /* "__proto__".length */) {
+    return false;
   }
 
-  if (cache.has(type, key)) {
-    return cache.get(type, key);
+  if (s.charCodeAt(length - 1) !== 95  /* '_' */ ||
+      s.charCodeAt(length - 2) !== 95  /* '_' */ ||
+      s.charCodeAt(length - 3) !== 111 /* 'o' */ ||
+      s.charCodeAt(length - 4) !== 116 /* 't' */ ||
+      s.charCodeAt(length - 5) !== 111 /* 'o' */ ||
+      s.charCodeAt(length - 6) !== 114 /* 'r' */ ||
+      s.charCodeAt(length - 7) !== 112 /* 'p' */ ||
+      s.charCodeAt(length - 8) !== 95  /* '_' */ ||
+      s.charCodeAt(length - 9) !== 95  /* '_' */) {
+    return false;
   }
 
-  var val = fn(pattern, options);
-  cache.set(type, key, val);
-  return val;
-}
-
-/**
- * Expose compiler, parser and cache on `nanomatch`
- */
+  for (var i = length - 10; i >= 0; i--) {
+    if (s.charCodeAt(i) !== 36 /* '$' */) {
+      return false;
+    }
+  }
 
-nanomatch.compilers = compilers;
-nanomatch.parsers = parsers;
-nanomatch.cache = cache;
+  return true;
+}
 
 /**
- * Expose `nanomatch`
- * @type {Function}
+ * Comparator between two mappings where the original positions are compared.
+ *
+ * Optionally pass in `true` as `onlyCompareGenerated` to consider two
+ * mappings with the same original source/line/column, but different generated
+ * line and column the same. Useful when searching for a mapping with a
+ * stubbed out mapping.
  */
+function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) {
+  var cmp = mappingA.source - mappingB.source;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-module.exports = nanomatch;
+  cmp = mappingA.originalLine - mappingB.originalLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
+  cmp = mappingA.originalColumn - mappingB.originalColumn;
+  if (cmp !== 0 || onlyCompareOriginal) {
+    return cmp;
+  }
 
-/***/ }),
-/* 700 */
-/***/ (function(module, exports, __webpack_require__) {
+  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-"use strict";
+  cmp = mappingA.generatedLine - mappingB.generatedLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
+  return mappingA.name - mappingB.name;
+}
+exports.compareByOriginalPositions = compareByOriginalPositions;
 
-var isExtendable = __webpack_require__(701);
-var assignSymbols = __webpack_require__(600);
+/**
+ * Comparator between two mappings with deflated source and name indices where
+ * the generated positions are compared.
+ *
+ * Optionally pass in `true` as `onlyCompareGenerated` to consider two
+ * mappings with the same generated line and column, but different
+ * source/name/original line and column the same. Useful when searching for a
+ * mapping with a stubbed out mapping.
+ */
+function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) {
+  var cmp = mappingA.generatedLine - mappingB.generatedLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-module.exports = Object.assign || function(obj/*, objects*/) {
-  if (obj === null || typeof obj === 'undefined') {
-    throw new TypeError('Cannot convert undefined or null to object');
+  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+  if (cmp !== 0 || onlyCompareGenerated) {
+    return cmp;
   }
-  if (!isObject(obj)) {
-    obj = {};
+
+  cmp = mappingA.source - mappingB.source;
+  if (cmp !== 0) {
+    return cmp;
   }
-  for (var i = 1; i < arguments.length; i++) {
-    var val = arguments[i];
-    if (isString(val)) {
-      val = toObject(val);
-    }
-    if (isObject(val)) {
-      assign(obj, val);
-      assignSymbols(obj, val);
-    }
+
+  cmp = mappingA.originalLine - mappingB.originalLine;
+  if (cmp !== 0) {
+    return cmp;
   }
-  return obj;
-};
 
-function assign(a, b) {
-  for (var key in b) {
-    if (hasOwn(b, key)) {
-      a[key] = b[key];
-    }
+  cmp = mappingA.originalColumn - mappingB.originalColumn;
+  if (cmp !== 0) {
+    return cmp;
   }
-}
 
-function isString(val) {
-  return (val && typeof val === 'string');
+  return mappingA.name - mappingB.name;
 }
+exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated;
 
-function toObject(str) {
-  var obj = {};
-  for (var i in str) {
-    obj[i] = str[i];
+function strcmp(aStr1, aStr2) {
+  if (aStr1 === aStr2) {
+    return 0;
   }
-  return obj;
-}
 
-function isObject(val) {
-  return (val && typeof val === 'object') || isExtendable(val);
+  if (aStr1 > aStr2) {
+    return 1;
+  }
+
+  return -1;
 }
 
 /**
- * Returns true if the given `key` is an own property of `obj`.
+ * Comparator between two mappings with inflated source and name strings where
+ * the generated positions are compared.
  */
+function compareByGeneratedPositionsInflated(mappingA, mappingB) {
+  var cmp = mappingA.generatedLine - mappingB.generatedLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-function hasOwn(obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
+  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-function isEnum(obj, key) {
-  return Object.prototype.propertyIsEnumerable.call(obj, key);
-}
+  cmp = strcmp(mappingA.source, mappingB.source);
+  if (cmp !== 0) {
+    return cmp;
+  }
 
+  cmp = mappingA.originalLine - mappingB.originalLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-/***/ }),
-/* 701 */
-/***/ (function(module, exports, __webpack_require__) {
+  cmp = mappingA.originalColumn - mappingB.originalColumn;
+  if (cmp !== 0) {
+    return cmp;
+  }
 
-"use strict";
-/*!
- * is-extendable <https://github.com/jonschlinkert/is-extendable>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+  return strcmp(mappingA.name, mappingB.name);
+}
+exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated;
 
 
+/***/ }),
 
-var isPlainObject = __webpack_require__(599);
+/***/ "../../node_modules/snapdragon/node_modules/source-map/source-map.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = function isExtendable(val) {
-  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
-};
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+exports.SourceMapGenerator = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/source-map-generator.js").SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/source-map-consumer.js").SourceMapConsumer;
+exports.SourceNode = __webpack_require__("../../node_modules/snapdragon/node_modules/source-map/lib/source-node.js").SourceNode;
 
 
 /***/ }),
-/* 702 */
+
+/***/ "../../node_modules/sort-keys/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const isPlainObj = __webpack_require__("../../node_modules/sort-keys/node_modules/is-plain-obj/index.js");
 
-/**
-* Nanomatch compilers
-*/
-
-module.exports = function(nanomatch, options) {
-  function slash() {
-    if (options && typeof options.slash === 'string') {
-      return options.slash;
-    }
-    if (options && typeof options.slash === 'function') {
-      return options.slash.call(nanomatch);
-    }
-    return '\\\\/';
-  }
-
-  function star() {
-    if (options && typeof options.star === 'string') {
-      return options.star;
-    }
-    if (options && typeof options.star === 'function') {
-      return options.star.call(nanomatch);
-    }
-    return '[^' + slash() + ']*?';
-  }
-
-  var ast = nanomatch.ast = nanomatch.parser.ast;
-  ast.state = nanomatch.parser.state;
-  nanomatch.compiler.state = ast.state;
-  nanomatch.compiler
-
-    /**
-     * Negation / escaping
-     */
-
-    .set('not', function(node) {
-      var prev = this.prev();
-      if (this.options.nonegate === true || prev.type !== 'bos') {
-        return this.emit('\\' + node.val, node);
-      }
-      return this.emit(node.val, node);
-    })
-    .set('escape', function(node) {
-      if (this.options.unescape && /^[-\w_.]/.test(node.val)) {
-        return this.emit(node.val, node);
-      }
-      return this.emit('\\' + node.val, node);
-    })
-    .set('quoted', function(node) {
-      return this.emit(node.val, node);
-    })
-
-    /**
-     * Regex
-     */
-
-    .set('dollar', function(node) {
-      if (node.parent.type === 'bracket') {
-        return this.emit(node.val, node);
-      }
-      return this.emit('\\' + node.val, node);
-    })
-
-    /**
-     * Dot: "."
-     */
-
-    .set('dot', function(node) {
-      if (node.dotfiles === true) this.dotfiles = true;
-      return this.emit('\\' + node.val, node);
-    })
+module.exports = (obj, opts) => {
+	if (!isPlainObj(obj)) {
+		throw new TypeError('Expected a plain object');
+	}
 
-    /**
-     * Slashes: "/" and "\"
-     */
+	opts = opts || {};
 
-    .set('backslash', function(node) {
-      return this.emit(node.val, node);
-    })
-    .set('slash', function(node, nodes, i) {
-      var val = '[' + slash() + ']';
-      var parent = node.parent;
-      var prev = this.prev();
+	// DEPRECATED
+	if (typeof opts === 'function') {
+		throw new TypeError('Specify the compare function as an option instead');
+	}
 
-      // set "node.hasSlash" to true on all ancestor parens nodes
-      while (parent.type === 'paren' && !parent.hasSlash) {
-        parent.hasSlash = true;
-        parent = parent.parent;
-      }
+	const deep = opts.deep;
+	const seenInput = [];
+	const seenOutput = [];
 
-      if (prev.addQmark) {
-        val += '?';
-      }
+	const sortKeys = x => {
+		const seenIndex = seenInput.indexOf(x);
 
-      // word boundary
-      if (node.rest.slice(0, 2) === '\\b') {
-        return this.emit(val, node);
-      }
+		if (seenIndex !== -1) {
+			return seenOutput[seenIndex];
+		}
 
-      // globstars
-      if (node.parsed === '**' || node.parsed === './**') {
-        this.output = '(?:' + this.output;
-        return this.emit(val + ')?', node);
-      }
+		const ret = {};
+		const keys = Object.keys(x).sort(opts.compare);
 
-      // negation
-      if (node.parsed === '!**' && this.options.nonegate !== true) {
-        return this.emit(val + '?\\b', node);
-      }
-      return this.emit(val, node);
-    })
+		seenInput.push(x);
+		seenOutput.push(ret);
 
-    /**
-     * Square brackets
-     */
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i];
+			const val = x[key];
 
-    .set('bracket', function(node) {
-      var close = node.close;
-      var open = !node.escaped ? '[' : '\\[';
-      var negated = node.negated;
-      var inner = node.inner;
-      var val = node.val;
+			if (deep && Array.isArray(val)) {
+				const retArr = [];
 
-      if (node.escaped === true) {
-        inner = inner.replace(/\\?(\W)/g, '\\$1');
-        negated = '';
-      }
+				for (let j = 0; j < val.length; j++) {
+					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
+				}
 
-      if (inner === ']-') {
-        inner = '\\]\\-';
-      }
+				ret[key] = retArr;
+				continue;
+			}
 
-      if (negated && inner.indexOf('.') === -1) {
-        inner += '.';
-      }
-      if (negated && inner.indexOf('/') === -1) {
-        inner += '/';
-      }
+			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
+		}
 
-      val = open + negated + inner + close;
-      return this.emit(val, node);
-    })
+		return ret;
+	};
 
-    /**
-     * Square: "[.]" (only matches a single character in brackets)
-     */
+	return sortKeys(obj);
+};
 
-    .set('square', function(node) {
-      var val = (/^\W/.test(node.val) ? '\\' : '') + node.val;
-      return this.emit(val, node);
-    })
 
-    /**
-     * Question mark: "?"
-     */
+/***/ }),
 
-    .set('qmark', function(node) {
-      var prev = this.prev();
-      // don't use "slash" variable so that we always avoid
-      // matching backslashes and slashes with a qmark
-      var val = '[^.\\\\/]';
-      if (this.options.dot || (prev.type !== 'bos' && prev.type !== 'slash')) {
-        val = '[^\\\\/]';
-      }
+/***/ "../../node_modules/sort-keys/node_modules/is-plain-obj/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (node.parsed.slice(-1) === '(') {
-        var ch = node.rest.charAt(0);
-        if (ch === '!' || ch === '=' || ch === ':') {
-          return this.emit(node.val, node);
-        }
-      }
+"use strict";
 
-      if (node.val.length > 1) {
-        val += '{' + node.val.length + '}';
-      }
-      return this.emit(val, node);
-    })
+var toString = Object.prototype.toString;
 
-    /**
-     * Plus
-     */
+module.exports = function (x) {
+	var prototype;
+	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
+};
 
-    .set('plus', function(node) {
-      var prev = node.parsed.slice(-1);
-      if (prev === ']' || prev === ')') {
-        return this.emit(node.val, node);
-      }
-      if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
-        return this.emit('\\+', node);
-      }
-      var ch = this.output.slice(-1);
-      if (/\w/.test(ch) && !node.inside) {
-        return this.emit('+\\+?', node);
-      }
-      return this.emit('+', node);
-    })
 
-    /**
-     * globstar: '**'
-     */
+/***/ }),
 
-    .set('globstar', function(node, nodes, i) {
-      if (!this.output) {
-        this.state.leadingGlobstar = true;
-      }
+/***/ "../../node_modules/sort-object-keys/index.js":
+/***/ (function(module, exports) {
 
-      var prev = this.prev();
-      var before = this.prev(2);
-      var next = this.next();
-      var after = this.next(2);
-      var type = prev.type;
-      var val = node.val;
+module.exports = function sortObjectByKeyNameList(object, sortWith) {
+  var keys;
+  var sortFn;
 
-      if (prev.type === 'slash' && next.type === 'slash') {
-        if (before.type === 'text') {
-          this.output += '?';
+  if (typeof sortWith === 'function') {
+    sortFn = sortWith;
+  } else {
+    keys = sortWith;
+  }
 
-          if (after.type !== 'text') {
-            this.output += '\\b';
-          }
-        }
-      }
+  var objectKeys = Object.keys(object);
+  return (keys || []).concat(objectKeys.sort(sortFn)).reduce(function(total, key) {
+    if (objectKeys.indexOf(key) !== -1) {
+      total[key] = object[key];
+    }
+    return total;
+  }, Object.create(null));
+}
 
-      var parsed = node.parsed;
-      if (parsed.charAt(0) === '!') {
-        parsed = parsed.slice(1);
-      }
 
-      var isInside = node.isInside.paren || node.isInside.brace;
-      if (parsed && type !== 'slash' && type !== 'bos' && !isInside) {
-        val = star();
-      } else {
-        val = this.options.dot !== true
-          ? '(?:(?!(?:[' + slash() + ']|^)\\.).)*?'
-          : '(?:(?!(?:[' + slash() + ']|^)(?:\\.{1,2})($|[' + slash() + ']))(?!\\.{2}).)*?';
-      }
+/***/ }),
 
-      if ((type === 'slash' || type === 'bos') && this.options.dot !== true) {
-        val = '(?!\\.)' + val;
-      }
+/***/ "../../node_modules/sort-package-json/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (prev.type === 'slash' && next.type === 'slash' && before.type !== 'text') {
-        if (after.type === 'text' || after.type === 'star') {
-          node.addQmark = true;
-        }
-      }
+const sortObjectKeys = __webpack_require__("../../node_modules/sort-object-keys/index.js")
+const detectIndent = __webpack_require__("../../node_modules/detect-indent/index.js")
+const detectNewline = __webpack_require__("../../node_modules/detect-newline/index.js").graceful
+const gitHooks = __webpack_require__("../../node_modules/git-hooks-list/index.json")
+const isPlainObject = __webpack_require__("../../node_modules/is-plain-obj/index.js")
 
-      if (this.options.capture) {
-        val = '(' + val + ')';
+const hasOwnProperty = (object, property) =>
+  Object.prototype.hasOwnProperty.call(object, property)
+const pipe = (fns) => (x, ...args) =>
+  fns.reduce((result, fn) => fn(result, ...args), x)
+const onArray = (fn) => (x) => (Array.isArray(x) ? fn(x) : x)
+const onStringArray = (fn) => (x) =>
+  Array.isArray(x) && x.every((item) => typeof item === 'string') ? fn(x) : x
+const uniq = onStringArray((xs) => xs.filter((x, i) => i === xs.indexOf(x)))
+const sortArray = onStringArray((array) => [...array].sort())
+const uniqAndSortArray = pipe([uniq, sortArray])
+const onObject = (fn) => (x, ...args) => (isPlainObject(x) ? fn(x, ...args) : x)
+const sortObjectBy = (comparator, deep) => {
+  const over = onObject((object) => {
+    object = sortObjectKeys(object, comparator)
+    if (deep) {
+      for (const [key, value] of Object.entries(object)) {
+        object[key] = over(value)
       }
+    }
+    return object
+  })
 
-      return this.emit(val, node);
-    })
+  return over
+}
+const sortObject = sortObjectBy()
+const sortURLObject = sortObjectBy(['type', 'url'])
+const sortPeopleObject = sortObjectBy(['name', 'email', 'url'])
+const sortDirectories = sortObjectBy([
+  'lib',
+  'bin',
+  'man',
+  'doc',
+  'example',
+  'test',
+])
+const overProperty = (property, over) => (object, ...args) =>
+  hasOwnProperty(object, property)
+    ? Object.assign(object, { [property]: over(object[property], ...args) })
+    : object
+const sortGitHooks = sortObjectBy(gitHooks)
 
-    /**
-     * Star: "*"
-     */
+// https://github.com/eslint/eslint/blob/acc0e47572a9390292b4e313b4a4bf360d236358/conf/config-schema.js
+const eslintBaseConfigProperties = [
+  // `files` and `excludedFiles` are only on `overrides[]`
+  // for easier sort `overrides[]`,
+  // add them to here, so we don't need sort `overrides[]` twice
+  'files',
+  'excludedFiles',
+  // baseConfig
+  'env',
+  'parser',
+  'parserOptions',
+  'settings',
+  'plugins',
+  'extends',
+  'rules',
+  'overrides',
+  'globals',
+  'processor',
+  'noInlineConfig',
+  'reportUnusedDisableDirectives',
+]
+const sortEslintConfig = onObject(
+  pipe([
+    sortObjectBy(eslintBaseConfigProperties),
+    overProperty('env', sortObject),
+    overProperty('globals', sortObject),
+    overProperty(
+      'overrides',
+      onArray((overrides) => overrides.map(sortEslintConfig)),
+    ),
+    overProperty('parserOptions', sortObject),
+    overProperty(
+      'rules',
+      sortObjectBy(
+        (rule1, rule2) =>
+          rule1.split('/').length - rule2.split('/').length ||
+          rule1.localeCompare(rule2),
+      ),
+    ),
+    overProperty('settings', sortObject),
+  ]),
+)
+const sortVSCodeBadgeObject = sortObjectBy(['description', 'url', 'href'])
 
-    .set('star', function(node, nodes, i) {
-      var prior = nodes[i - 2] || {};
-      var prev = this.prev();
-      var next = this.next();
-      var type = prev.type;
+const sortPrettierConfig = onObject(
+  pipe([
+    // sort keys alphabetically, but put `overrides` at bottom
+    (config) =>
+      sortObjectKeys(config, [
+        ...Object.keys(config)
+          .filter((key) => key !== 'overrides')
+          .sort(),
+        'overrides',
+      ]),
+    // if `config.overrides` exists
+    overProperty(
+      'overrides',
+      // and `config.overrides` is an array
+      onArray((overrides) =>
+        overrides.map(
+          pipe([
+            // sort `config.overrides[]` alphabetically
+            sortObject,
+            // sort `config.overrides[].options` alphabetically
+            overProperty('options', sortObject),
+          ]),
+        ),
+      ),
+    ),
+  ]),
+)
 
-      function isStart(n) {
-        return n.type === 'bos' || n.type === 'slash';
-      }
+// See https://docs.npmjs.com/misc/scripts
+const defaultNpmScripts = new Set([
+  'install',
+  'pack',
+  'prepare',
+  'publish',
+  'restart',
+  'shrinkwrap',
+  'start',
+  'stop',
+  'test',
+  'uninstall',
+  'version',
+])
 
-      if (this.output === '' && this.options.contains !== true) {
-        this.output = '(?![' + slash() + '])';
-      }
+const hasDevDependency = (dependency, packageJson) => {
+  return (
+    'devDependencies' in packageJson &&
+    !!packageJson.devDependencies[dependency]
+  )
+}
 
-      if (type === 'bracket' && this.options.bash === false) {
-        var str = next && next.type === 'bracket' ? star() : '*?';
-        if (!prev.nodes || prev.nodes[1].type !== 'posix') {
-          return this.emit(str, node);
-        }
-      }
+const sortScripts = onObject((scripts, packageJson) => {
+  const names = Object.keys(scripts)
+  const prefixable = new Set()
 
-      var prefix = !this.dotfiles && type !== 'text' && type !== 'escape'
-        ? (this.options.dot ? '(?!(?:^|[' + slash() + '])\\.{1,2}(?:$|[' + slash() + ']))' : '(?!\\.)')
-        : '';
+  const keys = names.map((name) => {
+    const omitted = name.replace(/^(?:pre|post)/, '')
+    if (defaultNpmScripts.has(omitted) || names.includes(omitted)) {
+      prefixable.add(omitted)
+      return omitted
+    }
+    return name
+  })
 
-      if (isStart(prev) || (isStart(prior) && type === 'not')) {
-        if (prefix !== '(?!\\.)') {
-          prefix += '(?!(\\.{2}|\\.[' + slash() + ']))(?=.)';
-        } else {
-          prefix += '(?=.)';
-        }
-      } else if (prefix === '(?!\\.)') {
-        prefix = '';
-      }
+  if (!hasDevDependency('npm-run-all', packageJson)) {
+    keys.sort()
+  }
 
-      if (prev.type === 'not' && prior.type === 'bos' && this.options.dot === true) {
-        this.output = '(?!\\.)' + this.output;
-      }
+  const order = keys.reduce(
+    (order, key) =>
+      order.concat(
+        prefixable.has(key) ? [`pre${key}`, key, `post${key}`] : [key],
+      ),
+    [],
+  )
 
-      var output = prefix + star();
-      if (this.options.capture) {
-        output = '(' + output + ')';
-      }
+  return sortObjectKeys(scripts, order)
+})
 
-      return this.emit(output, node);
-    })
+// fields marked `vscode` are for `Visual Studio Code extension manifest` only
+// https://code.visualstudio.com/api/references/extension-manifest
+// Supported fields:
+// publisher, displayName, categories, galleryBanner, preview, contributes,
+// activationEvents, badges, markdown, qna, extensionPack,
+// extensionDependencies, icon
 
-    /**
-     * Text
-     */
+// field.key{string}: field name
+// field.over{function}: sort field subKey
+const fields = [
+  { key: '$schema' },
+  { key: 'name' },
+  /* vscode */ { key: 'displayName' },
+  { key: 'version' },
+  { key: 'private' },
+  { key: 'description' },
+  /* vscode */ { key: 'categories', over: uniq },
+  { key: 'keywords', over: uniq },
+  { key: 'homepage' },
+  { key: 'bugs', over: sortObjectBy(['url', 'email']) },
+  { key: 'repository', over: sortURLObject },
+  { key: 'funding', over: sortURLObject },
+  { key: 'license', over: sortURLObject },
+  /* vscode */ { key: 'qna' },
+  { key: 'author', over: sortPeopleObject },
+  {
+    key: 'maintainers',
+    over: onArray((maintainers) => maintainers.map(sortPeopleObject)),
+  },
+  {
+    key: 'contributors',
+    over: onArray((contributors) => contributors.map(sortPeopleObject)),
+  },
+  /* vscode */ { key: 'publisher' },
+  { key: 'sideEffects' },
+  { key: 'type' },
+  { key: 'imports' },
+  { key: 'exports' },
+  { key: 'main' },
+  { key: 'umd:main' },
+  { key: 'jsdelivr' },
+  { key: 'unpkg' },
+  { key: 'module' },
+  { key: 'source' },
+  { key: 'jsnext:main' },
+  { key: 'browser' },
+  { key: 'types' },
+  { key: 'typesVersions' },
+  { key: 'typings' },
+  { key: 'style' },
+  { key: 'example' },
+  { key: 'examplestyle' },
+  { key: 'assets' },
+  { key: 'bin', over: sortObject },
+  { key: 'man' },
+  { key: 'directories', over: sortDirectories },
+  { key: 'files', over: uniq },
+  { key: 'workspaces' },
+  // node-pre-gyp https://www.npmjs.com/package/node-pre-gyp#1-add-new-entries-to-your-packagejson
+  {
+    key: 'binary',
+    over: sortObjectBy([
+      'module_name',
+      'module_path',
+      'remote_path',
+      'package_name',
+      'host',
+    ]),
+  },
+  { key: 'scripts', over: sortScripts },
+  { key: 'betterScripts', over: sortScripts },
+  /* vscode */ { key: 'contributes', over: sortObject },
+  /* vscode */ { key: 'activationEvents', over: uniq },
+  { key: 'husky', over: overProperty('hooks', sortGitHooks) },
+  { key: 'simple-git-hooks', over: sortGitHooks },
+  { key: 'pre-commit' },
+  { key: 'commitlint', over: sortObject },
+  { key: 'lint-staged' },
+  { key: 'config', over: sortObject },
+  { key: 'nodemonConfig', over: sortObject },
+  { key: 'browserify', over: sortObject },
+  { key: 'babel', over: sortObject },
+  { key: 'browserslist' },
+  { key: 'xo', over: sortObject },
+  { key: 'prettier', over: sortPrettierConfig },
+  { key: 'eslintConfig', over: sortEslintConfig },
+  { key: 'eslintIgnore' },
+  { key: 'npmpkgjsonlint', over: sortObject },
+  { key: 'npmPackageJsonLintConfig', over: sortObject },
+  { key: 'npmpackagejsonlint', over: sortObject },
+  { key: 'release', over: sortObject },
+  { key: 'remarkConfig', over: sortObject },
+  { key: 'stylelint' },
+  { key: 'ava', over: sortObject },
+  { key: 'jest', over: sortObject },
+  { key: 'mocha', over: sortObject },
+  { key: 'nyc', over: sortObject },
+  { key: 'c8', over: sortObject },
+  { key: 'tap', over: sortObject },
+  { key: 'resolutions', over: sortObject },
+  { key: 'dependencies', over: sortObject },
+  { key: 'devDependencies', over: sortObject },
+  { key: 'dependenciesMeta', over: sortObjectBy(undefined, true) },
+  { key: 'peerDependencies', over: sortObject },
+  // TODO: only sort depth = 2
+  { key: 'peerDependenciesMeta', over: sortObjectBy(undefined, true) },
+  { key: 'optionalDependencies', over: sortObject },
+  { key: 'bundledDependencies', over: uniqAndSortArray },
+  { key: 'bundleDependencies', over: uniqAndSortArray },
+  /* vscode */ { key: 'extensionPack', over: uniqAndSortArray },
+  /* vscode */ { key: 'extensionDependencies', over: uniqAndSortArray },
+  { key: 'flat' },
+  { key: 'engines', over: sortObject },
+  { key: 'engineStrict', over: sortObject },
+  { key: 'languageName' },
+  { key: 'os' },
+  { key: 'cpu' },
+  { key: 'preferGlobal', over: sortObject },
+  { key: 'publishConfig', over: sortObject },
+  /* vscode */ { key: 'icon' },
+  /* vscode */ {
+    key: 'badges',
+    over: onArray((badge) => badge.map(sortVSCodeBadgeObject)),
+  },
+  /* vscode */ { key: 'galleryBanner', over: sortObject },
+  /* vscode */ { key: 'preview' },
+  /* vscode */ { key: 'markdown' },
+]
 
-    .set('text', function(node) {
-      return this.emit(node.val, node);
-    })
+const defaultSortOrder = fields.map(({ key }) => key)
+const overFields = pipe(
+  fields.reduce((fns, { key, over }) => {
+    if (over) {
+      fns.push(overProperty(key, over))
+    }
+    return fns
+  }, []),
+)
 
-    /**
-     * End-of-string
-     */
+function editStringJSON(json, over) {
+  if (typeof json === 'string') {
+    const { indent } = detectIndent(json)
+    const endCharacters = json.slice(-1) === '\n' ? '\n' : ''
+    const newline = detectNewline(json)
+    json = JSON.parse(json)
 
-    .set('eos', function(node) {
-      var prev = this.prev();
-      var val = node.val;
+    let result = JSON.stringify(over(json), null, indent) + endCharacters
+    if (newline === '\r\n') {
+      result = result.replace(/\n/g, newline)
+    }
+    return result
+  }
 
-      this.output = '(?:\\.[' + slash() + '](?=.))?' + this.output;
-      if (this.state.metachar && prev.type !== 'qmark' && prev.type !== 'slash') {
-        val += (this.options.contains ? '[' + slash() + ']?' : '(?:[' + slash() + ']|$)');
-      }
+  return over(json)
+}
 
-      return this.emit(val, node);
-    });
+const isPrivateKey = (key) => key[0] === '_'
+const partition = (array, predicate) =>
+  array.reduce(
+    (result, value) => {
+      result[predicate(value) ? 0 : 1].push(value)
+      return result
+    },
+    [[], []],
+  )
+function sortPackageJson(jsonIsh, options = {}) {
+  return editStringJSON(
+    jsonIsh,
+    onObject((json) => {
+      let sortOrder = options.sortOrder ? options.sortOrder : defaultSortOrder
 
-  /**
-   * Allow custom compilers to be passed on options
-   */
+      if (Array.isArray(sortOrder)) {
+        const keys = Object.keys(json)
+        const [privateKeys, publicKeys] = partition(keys, isPrivateKey)
+        sortOrder = [
+          ...sortOrder,
+          ...defaultSortOrder,
+          ...publicKeys.sort(),
+          ...privateKeys.sort(),
+        ]
+      }
 
-  if (options && typeof options.compilers === 'function') {
-    options.compilers(nanomatch.compiler);
-  }
-};
+      return overFields(sortObjectKeys(json, sortOrder), json)
+    }),
+  )
+}
 
+module.exports = sortPackageJson
+module.exports.sortPackageJson = sortPackageJson
+module.exports.sortOrder = defaultSortOrder
+module.exports.default = sortPackageJson
 
 
 /***/ }),
-/* 703 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/source-map-resolve/lib/decode-uri-component.js":
+/***/ (function(module, exports, __webpack_require__) {
 
+// Copyright 2017 Simon Lydell
+// X11 (“MIT”) Licensed. (See LICENSE.)
 
-var regexNot = __webpack_require__(601);
-var toRegex = __webpack_require__(584);
-var isOdd = __webpack_require__(704);
+var decodeUriComponent = __webpack_require__("../../node_modules/decode-uri-component/index.js")
 
-/**
- * Characters to use in negation regex (we want to "not" match
- * characters that are matched by other parsers)
- */
+function customDecodeUriComponent(string) {
+  // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
+  return decodeUriComponent(string.replace(/\+/g, "%2B"))
+}
 
-var cached;
-var NOT_REGEX = '[\\[!*+?$^"\'.\\\\/]+';
-var not = createTextRegex(NOT_REGEX);
+module.exports = customDecodeUriComponent
 
-/**
- * Nanomatch parsers
- */
 
-module.exports = function(nanomatch, options) {
-  var parser = nanomatch.parser;
-  var opts = parser.options;
+/***/ }),
 
-  parser.state = {
-    slashes: 0,
-    paths: []
-  };
+/***/ "../../node_modules/source-map-resolve/lib/resolve-url.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  parser.ast.state = parser.state;
-  parser
+// Copyright 2014 Simon Lydell
+// X11 (“MIT”) Licensed. (See LICENSE.)
 
-    /**
-     * Beginning-of-string
-     */
+var url = __webpack_require__("url")
 
-    .capture('prefix', function() {
-      if (this.parsed) return;
-      var m = this.match(/^\.[\\/]/);
-      if (!m) return;
-      this.state.strictOpen = !!this.options.strictOpen;
-      this.state.addPrefix = true;
-    })
+function resolveUrl(/* ...urls */) {
+  return Array.prototype.reduce.call(arguments, function(resolved, nextUrl) {
+    return url.resolve(resolved, nextUrl)
+  })
+}
 
-    /**
-     * Escape: "\\."
-     */
+module.exports = resolveUrl
 
-    .capture('escape', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(/^(?:\\(.)|([$^]))/);
-      if (!m) return;
 
-      return pos({
-        type: 'escape',
-        val: m[2] || m[1]
-      });
-    })
+/***/ }),
 
-    /**
-     * Quoted strings
-     */
+/***/ "../../node_modules/source-map-resolve/lib/source-map-resolve-node.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    .capture('quoted', function() {
-      var pos = this.position();
-      var m = this.match(/^["']/);
-      if (!m) return;
+// Copyright 2014, 2015, 2016, 2017 Simon Lydell
+// X11 (“MIT”) Licensed. (See LICENSE.)
 
-      var quote = m[0];
-      if (this.input.indexOf(quote) === -1) {
-        return pos({
-          type: 'escape',
-          val: quote
-        });
-      }
+var sourceMappingURL   = __webpack_require__("../../node_modules/source-map-url/source-map-url.js")
+var resolveUrl         = __webpack_require__("../../node_modules/source-map-resolve/lib/resolve-url.js")
+var decodeUriComponent = __webpack_require__("../../node_modules/source-map-resolve/lib/decode-uri-component.js")
+var urix               = __webpack_require__("../../node_modules/urix/index.js")
+var atob               = __webpack_require__("../../node_modules/atob/node-atob.js")
 
-      var tok = advanceTo(this.input, quote);
-      this.consume(tok.len);
 
-      return pos({
-        type: 'quoted',
-        val: tok.esc
-      });
-    })
 
-    /**
-     * Negations: "!"
-     */
+function callbackAsync(callback, error, result) {
+  setImmediate(function() { callback(error, result) })
+}
 
-    .capture('not', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(this.notRegex || /^!+/);
-      if (!m) return;
-      var val = m[0];
+function parseMapToJSON(string, data) {
+  try {
+    return JSON.parse(string.replace(/^\)\]\}'/, ""))
+  } catch (error) {
+    error.sourceMapData = data
+    throw error
+  }
+}
 
-      var isNegated = isOdd(val.length);
-      if (parsed === '' && !isNegated) {
-        val = '';
-      }
+function readSync(read, url, data) {
+  var readUrl = decodeUriComponent(url)
+  try {
+    return String(read(readUrl))
+  } catch (error) {
+    error.sourceMapData = data
+    throw error
+  }
+}
 
-      // if nothing has been parsed, we know `!` is at the start,
-      // so we need to wrap the result in a negation regex
-      if (parsed === '' && isNegated && this.options.nonegate !== true) {
-        this.bos.val = '(?!^(?:';
-        this.append = ')$).*';
-        val = '';
-      }
-      return pos({
-        type: 'not',
-        val: val
-      });
-    })
 
-    /**
-     * Dot: "."
-     */
 
-    .capture('dot', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\.+/);
-      if (!m) return;
+function resolveSourceMap(code, codeUrl, read, callback) {
+  var mapData
+  try {
+    mapData = resolveSourceMapHelper(code, codeUrl)
+  } catch (error) {
+    return callbackAsync(callback, error)
+  }
+  if (!mapData || mapData.map) {
+    return callbackAsync(callback, null, mapData)
+  }
+  var readUrl = decodeUriComponent(mapData.url)
+  read(readUrl, function(error, result) {
+    if (error) {
+      error.sourceMapData = mapData
+      return callback(error)
+    }
+    mapData.map = String(result)
+    try {
+      mapData.map = parseMapToJSON(mapData.map, mapData)
+    } catch (error) {
+      return callback(error)
+    }
+    callback(null, mapData)
+  })
+}
 
-      var val = m[0];
-      this.state.dot = val === '.' && (parsed === '' || parsed.slice(-1) === '/');
+function resolveSourceMapSync(code, codeUrl, read) {
+  var mapData = resolveSourceMapHelper(code, codeUrl)
+  if (!mapData || mapData.map) {
+    return mapData
+  }
+  mapData.map = readSync(read, mapData.url, mapData)
+  mapData.map = parseMapToJSON(mapData.map, mapData)
+  return mapData
+}
 
-      return pos({
-        type: 'dot',
-        dotfiles: this.state.dot,
-        val: val
-      });
-    })
+var dataUriRegex = /^data:([^,;]*)(;[^,;]*)*(?:,(.*))?$/
+var jsonMimeTypeRegex = /^(?:application|text)\/json$/
 
-    /**
-     * Plus: "+"
-     */
+function resolveSourceMapHelper(code, codeUrl) {
+  codeUrl = urix(codeUrl)
 
-    .capture('plus', /^\+(?!\()/)
+  var url = sourceMappingURL.getFrom(code)
+  if (!url) {
+    return null
+  }
 
-    /**
-     * Question mark: "?"
-     */
+  var dataUri = url.match(dataUriRegex)
+  if (dataUri) {
+    var mimeType = dataUri[1]
+    var lastParameter = dataUri[2] || ""
+    var encoded = dataUri[3] || ""
+    var data = {
+      sourceMappingURL: url,
+      url: null,
+      sourcesRelativeTo: codeUrl,
+      map: encoded
+    }
+    if (!jsonMimeTypeRegex.test(mimeType)) {
+      var error = new Error("Unuseful data uri mime type: " + (mimeType || "text/plain"))
+      error.sourceMapData = data
+      throw error
+    }
+    data.map = parseMapToJSON(
+      lastParameter === ";base64" ? atob(encoded) : decodeURIComponent(encoded),
+      data
+    )
+    return data
+  }
 
-    .capture('qmark', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\?+(?!\()/);
-      if (!m) return;
+  var mapUrl = resolveUrl(codeUrl, url)
+  return {
+    sourceMappingURL: url,
+    url: mapUrl,
+    sourcesRelativeTo: mapUrl,
+    map: null
+  }
+}
 
-      this.state.metachar = true;
-      this.state.qmark = true;
 
-      return pos({
-        type: 'qmark',
-        parsed: parsed,
-        val: m[0]
-      });
-    })
 
-    /**
-     * Globstar: "**"
-     */
+function resolveSources(map, mapUrl, read, options, callback) {
+  if (typeof options === "function") {
+    callback = options
+    options = {}
+  }
+  var pending = map.sources ? map.sources.length : 0
+  var result = {
+    sourcesResolved: [],
+    sourcesContent:  []
+  }
 
-    .capture('globstar', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\*{2}(?![*(])(?=[,)/]|$)/);
-      if (!m) return;
+  if (pending === 0) {
+    callbackAsync(callback, null, result)
+    return
+  }
 
-      var type = opts.noglobstar !== true ? 'globstar' : 'star';
-      var node = pos({type: type, parsed: parsed});
-      this.state.metachar = true;
+  var done = function() {
+    pending--
+    if (pending === 0) {
+      callback(null, result)
+    }
+  }
 
-      while (this.input.slice(0, 4) === '/**/') {
-        this.input = this.input.slice(3);
-      }
+  resolveSourcesHelper(map, mapUrl, options, function(fullUrl, sourceContent, index) {
+    result.sourcesResolved[index] = fullUrl
+    if (typeof sourceContent === "string") {
+      result.sourcesContent[index] = sourceContent
+      callbackAsync(done, null)
+    } else {
+      var readUrl = decodeUriComponent(fullUrl)
+      read(readUrl, function(error, source) {
+        result.sourcesContent[index] = error ? error : String(source)
+        done()
+      })
+    }
+  })
+}
 
-      node.isInside = {
-        brace: this.isInside('brace'),
-        paren: this.isInside('paren')
-      };
+function resolveSourcesSync(map, mapUrl, read, options) {
+  var result = {
+    sourcesResolved: [],
+    sourcesContent:  []
+  }
 
-      if (type === 'globstar') {
-        this.state.globstar = true;
-        node.val = '**';
+  if (!map.sources || map.sources.length === 0) {
+    return result
+  }
 
+  resolveSourcesHelper(map, mapUrl, options, function(fullUrl, sourceContent, index) {
+    result.sourcesResolved[index] = fullUrl
+    if (read !== null) {
+      if (typeof sourceContent === "string") {
+        result.sourcesContent[index] = sourceContent
       } else {
-        this.state.star = true;
-        node.val = '*';
+        var readUrl = decodeUriComponent(fullUrl)
+        try {
+          result.sourcesContent[index] = String(read(readUrl))
+        } catch (error) {
+          result.sourcesContent[index] = error
+        }
       }
+    }
+  })
 
-      return node;
-    })
-
-    /**
-     * Star: "*"
-     */
+  return result
+}
 
-    .capture('star', function() {
-      var pos = this.position();
-      var starRe = /^(?:\*(?![*(])|[*]{3,}(?!\()|[*]{2}(?![(/]|$)|\*(?=\*\())/;
-      var m = this.match(starRe);
-      if (!m) return;
+var endingSlash = /\/?$/
 
-      this.state.metachar = true;
-      this.state.star = true;
-      return pos({
-        type: 'star',
-        val: m[0]
-      });
-    })
+function resolveSourcesHelper(map, mapUrl, options, fn) {
+  options = options || {}
+  mapUrl = urix(mapUrl)
+  var fullUrl
+  var sourceContent
+  var sourceRoot
+  for (var index = 0, len = map.sources.length; index < len; index++) {
+    sourceRoot = null
+    if (typeof options.sourceRoot === "string") {
+      sourceRoot = options.sourceRoot
+    } else if (typeof map.sourceRoot === "string" && options.sourceRoot !== false) {
+      sourceRoot = map.sourceRoot
+    }
+    // If the sourceRoot is the empty string, it is equivalent to not setting
+    // the property at all.
+    if (sourceRoot === null || sourceRoot === '') {
+      fullUrl = resolveUrl(mapUrl, map.sources[index])
+    } else {
+      // Make sure that the sourceRoot ends with a slash, so that `/scripts/subdir` becomes
+      // `/scripts/subdir/<source>`, not `/scripts/<source>`. Pointing to a file as source root
+      // does not make sense.
+      fullUrl = resolveUrl(mapUrl, sourceRoot.replace(endingSlash, "/"), map.sources[index])
+    }
+    sourceContent = (map.sourcesContent || [])[index]
+    fn(fullUrl, sourceContent, index)
+  }
+}
 
-    /**
-     * Slash: "/"
-     */
 
-    .capture('slash', function() {
-      var pos = this.position();
-      var m = this.match(/^\//);
-      if (!m) return;
 
-      this.state.slashes++;
-      return pos({
-        type: 'slash',
-        val: m[0]
-      });
+function resolve(code, codeUrl, read, options, callback) {
+  if (typeof options === "function") {
+    callback = options
+    options = {}
+  }
+  if (code === null) {
+    var mapUrl = codeUrl
+    var data = {
+      sourceMappingURL: null,
+      url: mapUrl,
+      sourcesRelativeTo: mapUrl,
+      map: null
+    }
+    var readUrl = decodeUriComponent(mapUrl)
+    read(readUrl, function(error, result) {
+      if (error) {
+        error.sourceMapData = data
+        return callback(error)
+      }
+      data.map = String(result)
+      try {
+        data.map = parseMapToJSON(data.map, data)
+      } catch (error) {
+        return callback(error)
+      }
+      _resolveSources(data)
     })
-
-    /**
-     * Backslash: "\\"
-     */
-
-    .capture('backslash', function() {
-      var pos = this.position();
-      var m = this.match(/^\\(?![*+?(){}[\]'"])/);
-      if (!m) return;
-
-      var val = m[0];
-
-      if (this.isInside('bracket')) {
-        val = '\\';
-      } else if (val.length > 1) {
-        val = '\\\\';
+  } else {
+    resolveSourceMap(code, codeUrl, read, function(error, mapData) {
+      if (error) {
+        return callback(error)
+      }
+      if (!mapData) {
+        return callback(null, null)
       }
+      _resolveSources(mapData)
+    })
+  }
 
-      return pos({
-        type: 'backslash',
-        val: val
-      });
+  function _resolveSources(mapData) {
+    resolveSources(mapData.map, mapData.sourcesRelativeTo, read, options, function(error, result) {
+      if (error) {
+        return callback(error)
+      }
+      mapData.sourcesResolved = result.sourcesResolved
+      mapData.sourcesContent  = result.sourcesContent
+      callback(null, mapData)
     })
+  }
+}
 
-    /**
-     * Square: "[.]"
-     */
+function resolveSync(code, codeUrl, read, options) {
+  var mapData
+  if (code === null) {
+    var mapUrl = codeUrl
+    mapData = {
+      sourceMappingURL: null,
+      url: mapUrl,
+      sourcesRelativeTo: mapUrl,
+      map: null
+    }
+    mapData.map = readSync(read, mapUrl, mapData)
+    mapData.map = parseMapToJSON(mapData.map, mapData)
+  } else {
+    mapData = resolveSourceMapSync(code, codeUrl, read)
+    if (!mapData) {
+      return null
+    }
+  }
+  var result = resolveSourcesSync(mapData.map, mapData.sourcesRelativeTo, read, options)
+  mapData.sourcesResolved = result.sourcesResolved
+  mapData.sourcesContent  = result.sourcesContent
+  return mapData
+}
 
-    .capture('square', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(/^\[([^!^\\])\]/);
-      if (!m) return;
 
-      return pos({
-        type: 'square',
-        val: m[1]
-      });
-    })
 
-    /**
-     * Brackets: "[...]" (basic, this can be overridden by other parsers)
-     */
+module.exports = {
+  resolveSourceMap:     resolveSourceMap,
+  resolveSourceMapSync: resolveSourceMapSync,
+  resolveSources:       resolveSources,
+  resolveSourcesSync:   resolveSourcesSync,
+  resolve:              resolve,
+  resolveSync:          resolveSync,
+  parseMapToJSON:       parseMapToJSON
+}
 
-    .capture('bracket', function() {
-      var pos = this.position();
-      var m = this.match(/^(?:\[([!^]?)([^\]]+|\]-)(\]|[^*+?]+)|\[)/);
-      if (!m) return;
 
-      var val = m[0];
-      var negated = m[1] ? '^' : '';
-      var inner = (m[2] || '').replace(/\\\\+/, '\\\\');
-      var close = m[3] || '';
+/***/ }),
 
-      if (m[2] && inner.length < m[2].length) {
-        val = val.replace(/\\\\+/, '\\\\');
-      }
+/***/ "../../node_modules/source-map-url/source-map-url.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      var esc = this.input.slice(0, 2);
-      if (inner === '' && esc === '\\]') {
-        inner += esc;
-        this.consume(2);
+var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
+// X11 (“MIT”) Licensed. (See LICENSE.)
 
-        var str = this.input;
-        var idx = -1;
-        var ch;
+void (function(root, factory) {
+  if (true) {
+    !(__WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) :
+				__WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))
+  } else {}
+}(this, function() {
 
-        while ((ch = str[++idx])) {
-          this.consume(1);
-          if (ch === ']') {
-            close = ch;
-            break;
-          }
-          inner += ch;
-        }
-      }
+  var innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/
 
-      return pos({
-        type: 'bracket',
-        val: val,
-        escaped: close !== ']',
-        negated: negated,
-        inner: inner,
-        close: close
-      });
-    })
+  var regex = RegExp(
+    "(?:" +
+      "/\\*" +
+      "(?:\\s*\r?\n(?://)?)?" +
+      "(?:" + innerRegex.source + ")" +
+      "\\s*" +
+      "\\*/" +
+      "|" +
+      "//(?:" + innerRegex.source + ")" +
+    ")" +
+    "\\s*"
+  )
 
-    /**
-     * Text
-     */
+  return {
 
-    .capture('text', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(not);
-      if (!m || !m[0]) return;
+    regex: regex,
+    _innerRegex: innerRegex,
 
-      return pos({
-        type: 'text',
-        val: m[0]
-      });
-    });
+    getFrom: function(code) {
+      var match = code.match(regex)
+      return (match ? match[1] || match[2] || "" : null)
+    },
 
-  /**
-   * Allow custom parsers to be passed on options
-   */
+    existsIn: function(code) {
+      return regex.test(code)
+    },
 
-  if (options && typeof options.parsers === 'function') {
-    options.parsers(nanomatch.parser);
+    removeFrom: function(code) {
+      return code.replace(regex, "")
+    },
+
+    insertBefore: function(code, string) {
+      var match = code.match(regex)
+      if (match) {
+        return code.slice(0, match.index) + string + code.slice(match.index)
+      } else {
+        return code + string
+      }
+    }
   }
-};
 
-/**
- * Advance to the next non-escaped character
- */
+}));
 
-function advanceTo(input, endChar) {
-  var ch = input.charAt(0);
-  var tok = { len: 1, val: '', esc: '' };
-  var idx = 0;
 
-  function advance() {
-    if (ch !== '\\') {
-      tok.esc += '\\' + ch;
-      tok.val += ch;
-    }
+/***/ }),
 
-    ch = input.charAt(++idx);
-    tok.len++;
+/***/ "../../node_modules/spdx-expression-parse/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (ch === '\\') {
-      advance();
-      advance();
-    }
-  }
+var parser = __webpack_require__("../../node_modules/spdx-expression-parse/parser.js").parser
 
-  while (ch && ch !== endChar) {
-    advance();
-  }
-  return tok;
+module.exports = function (argument) {
+  return parser.parse(argument)
 }
 
-/**
- * Create text regex
- */
 
-function createTextRegex(pattern) {
-  if (cached) return cached;
-  var opts = {contains: true, strictClose: false};
-  var not = regexNot.create(pattern, opts);
-  var re = toRegex('^(?:[*]\\((?=.)|' + not + ')', opts);
-  return (cached = re);
-}
+/***/ }),
 
-/**
- * Expose negation string
- */
+/***/ "../../node_modules/spdx-expression-parse/parser.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports.not = NOT_REGEX;
+/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
+/*
+  Returns a Parser object of the following structure:
 
+  Parser: {
+    yy: {}
+  }
 
-/***/ }),
-/* 704 */
-/***/ (function(module, exports, __webpack_require__) {
+  Parser.prototype: {
+    yy: {},
+    trace: function(),
+    symbols_: {associative list: name ==> number},
+    terminals_: {associative list: number ==> name},
+    productions_: [...],
+    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$),
+    table: [...],
+    defaultActions: {...},
+    parseError: function(str, hash),
+    parse: function(input),
 
-"use strict";
-/*!
- * is-odd <https://github.com/jonschlinkert/is-odd>
- *
- * Copyright (c) 2015-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+    lexer: {
+        EOF: 1,
+        parseError: function(str, hash),
+        setInput: function(input),
+        input: function(),
+        unput: function(str),
+        more: function(),
+        less: function(n),
+        pastInput: function(),
+        upcomingInput: function(),
+        showPosition: function(),
+        test_match: function(regex_match_array, rule_index),
+        next: function(),
+        lex: function(),
+        begin: function(condition),
+        popState: function(),
+        _currentRules: function(),
+        topState: function(),
+        pushState: function(condition),
+
+        options: {
+            ranges: boolean           (optional: true ==> token location info will include a .range[] member)
+            flex: boolean             (optional: true ==> flex-like lexing behaviour where the rules are tested exhaustively to find the longest match)
+            backtrack_lexer: boolean  (optional: true ==> lexer regexes are tested in order and for each matching regex the action code is invoked; the lexer terminates the scan when a token is returned by the action code)
+        },
+
+        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
+        rules: [...],
+        conditions: {associative list: name ==> set},
+    }
+  }
 
 
+  token location info (@$, _$, etc.): {
+    first_line: n,
+    last_line: n,
+    first_column: n,
+    last_column: n,
+    range: [start_number, end_number]       (where the numbers are indexes into the input string, regular zero-based)
+  }
 
-var isNumber = __webpack_require__(705);
 
-module.exports = function isOdd(i) {
-  if (!isNumber(i)) {
-    throw new TypeError('is-odd expects a number.');
+  the parseError function receives a 'hash' object with these members for lexer and parser errors: {
+    text:        (matched text)
+    token:       (the produced terminal token, if any)
+    line:        (yylineno)
   }
-  if (Number(i) !== Math.floor(i)) {
-    throw new RangeError('is-odd expects an integer.');
+  while parser (grammar) errors will also provide these members, i.e. parser errors deliver a superset of attributes: {
+    loc:         (yylloc)
+    expected:    (string describing the set of expected tokens)
+    recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
   }
-  return !!(~~i & 1);
-};
+*/
+var spdxparse = (function(){
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,7],$V3=[1,4],$V4=[1,9],$V5=[1,10],$V6=[5,14,15,17],$V7=[5,12,14,15,17];
+var parser = {trace: function trace() { },
+yy: {},
+symbols_: {"error":2,"start":3,"expression":4,"EOS":5,"simpleExpression":6,"LICENSE":7,"PLUS":8,"LICENSEREF":9,"DOCUMENTREF":10,"COLON":11,"WITH":12,"EXCEPTION":13,"AND":14,"OR":15,"OPEN":16,"CLOSE":17,"$accept":0,"$end":1},
+terminals_: {2:"error",5:"EOS",7:"LICENSE",8:"PLUS",9:"LICENSEREF",10:"DOCUMENTREF",11:"COLON",12:"WITH",13:"EXCEPTION",14:"AND",15:"OR",16:"OPEN",17:"CLOSE"},
+productions_: [0,[3,2],[6,1],[6,2],[6,1],[6,3],[4,1],[4,3],[4,3],[4,3],[4,3]],
+performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
+/* this == yyval */
 
+var $0 = $$.length - 1;
+switch (yystate) {
+case 1:
+return this.$ = $$[$0-1]
+break;
+case 2: case 4: case 5:
+this.$ = {license: yytext}
+break;
+case 3:
+this.$ = {license: $$[$0-1], plus: true}
+break;
+case 6:
+this.$ = $$[$0]
+break;
+case 7:
+this.$ = {exception: $$[$0]}
+this.$.license = $$[$0-2].license
+if ($$[$0-2].hasOwnProperty('plus')) {
+  this.$.plus = $$[$0-2].plus
+}
+break;
+case 8:
+this.$ = {conjunction: 'and', left: $$[$0-2], right: $$[$0]}
+break;
+case 9:
+this.$ = {conjunction: 'or', left: $$[$0-2], right: $$[$0]}
+break;
+case 10:
+this.$ = $$[$0-1]
+break;
+}
+},
+table: [{3:1,4:2,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{1:[3]},{5:[1,8],14:$V4,15:$V5},o($V6,[2,6],{12:[1,11]}),{4:12,6:3,7:$V0,9:$V1,10:$V2,16:$V3},o($V7,[2,2],{8:[1,13]}),o($V7,[2,4]),{11:[1,14]},{1:[2,1]},{4:15,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{4:16,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{13:[1,17]},{14:$V4,15:$V5,17:[1,18]},o($V7,[2,3]),{9:[1,19]},o($V6,[2,8]),o([5,15,17],[2,9],{14:$V4}),o($V6,[2,7]),o($V6,[2,10]),o($V7,[2,5])],
+defaultActions: {8:[2,1]},
+parseError: function parseError(str, hash) {
+    if (hash.recoverable) {
+        this.trace(str);
+    } else {
+        function _parseError (msg, hash) {
+            this.message = msg;
+            this.hash = hash;
+        }
+        _parseError.prototype = Error;
 
-/***/ }),
-/* 705 */
-/***/ (function(module, exports, __webpack_require__) {
+        throw new _parseError(str, hash);
+    }
+},
+parse: function parse(input) {
+    var self = this, stack = [0], tstack = [], vstack = [null], lstack = [], table = this.table, yytext = '', yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
+    var args = lstack.slice.call(arguments, 1);
+    var lexer = Object.create(this.lexer);
+    var sharedState = { yy: {} };
+    for (var k in this.yy) {
+        if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
+            sharedState.yy[k] = this.yy[k];
+        }
+    }
+    lexer.setInput(input, sharedState.yy);
+    sharedState.yy.lexer = lexer;
+    sharedState.yy.parser = this;
+    if (typeof lexer.yylloc == 'undefined') {
+        lexer.yylloc = {};
+    }
+    var yyloc = lexer.yylloc;
+    lstack.push(yyloc);
+    var ranges = lexer.options && lexer.options.ranges;
+    if (typeof sharedState.yy.parseError === 'function') {
+        this.parseError = sharedState.yy.parseError;
+    } else {
+        this.parseError = Object.getPrototypeOf(this).parseError;
+    }
+    function popStack(n) {
+        stack.length = stack.length - 2 * n;
+        vstack.length = vstack.length - n;
+        lstack.length = lstack.length - n;
+    }
+    _token_stack:
+        var lex = function () {
+            var token;
+            token = lexer.lex() || EOF;
+            if (typeof token !== 'number') {
+                token = self.symbols_[token] || token;
+            }
+            return token;
+        };
+    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
+    while (true) {
+        state = stack[stack.length - 1];
+        if (this.defaultActions[state]) {
+            action = this.defaultActions[state];
+        } else {
+            if (symbol === null || typeof symbol == 'undefined') {
+                symbol = lex();
+            }
+            action = table[state] && table[state][symbol];
+        }
+                    if (typeof action === 'undefined' || !action.length || !action[0]) {
+                var errStr = '';
+                expected = [];
+                for (p in table[state]) {
+                    if (this.terminals_[p] && p > TERROR) {
+                        expected.push('\'' + this.terminals_[p] + '\'');
+                    }
+                }
+                if (lexer.showPosition) {
+                    errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
+                } else {
+                    errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
+                }
+                this.parseError(errStr, {
+                    text: lexer.match,
+                    token: this.terminals_[symbol] || symbol,
+                    line: lexer.yylineno,
+                    loc: yyloc,
+                    expected: expected
+                });
+            }
+        if (action[0] instanceof Array && action.length > 1) {
+            throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
+        }
+        switch (action[0]) {
+        case 1:
+            stack.push(symbol);
+            vstack.push(lexer.yytext);
+            lstack.push(lexer.yylloc);
+            stack.push(action[1]);
+            symbol = null;
+            if (!preErrorSymbol) {
+                yyleng = lexer.yyleng;
+                yytext = lexer.yytext;
+                yylineno = lexer.yylineno;
+                yyloc = lexer.yylloc;
+                if (recovering > 0) {
+                    recovering--;
+                }
+            } else {
+                symbol = preErrorSymbol;
+                preErrorSymbol = null;
+            }
+            break;
+        case 2:
+            len = this.productions_[action[1]][1];
+            yyval.$ = vstack[vstack.length - len];
+            yyval._$ = {
+                first_line: lstack[lstack.length - (len || 1)].first_line,
+                last_line: lstack[lstack.length - 1].last_line,
+                first_column: lstack[lstack.length - (len || 1)].first_column,
+                last_column: lstack[lstack.length - 1].last_column
+            };
+            if (ranges) {
+                yyval._$.range = [
+                    lstack[lstack.length - (len || 1)].range[0],
+                    lstack[lstack.length - 1].range[1]
+                ];
+            }
+            r = this.performAction.apply(yyval, [
+                yytext,
+                yyleng,
+                yylineno,
+                sharedState.yy,
+                action[1],
+                vstack,
+                lstack
+            ].concat(args));
+            if (typeof r !== 'undefined') {
+                return r;
+            }
+            if (len) {
+                stack = stack.slice(0, -1 * len * 2);
+                vstack = vstack.slice(0, -1 * len);
+                lstack = lstack.slice(0, -1 * len);
+            }
+            stack.push(this.productions_[action[1]][0]);
+            vstack.push(yyval.$);
+            lstack.push(yyval._$);
+            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
+            stack.push(newState);
+            break;
+        case 3:
+            return true;
+        }
+    }
+    return true;
+}};
+/* generated by jison-lex 0.3.4 */
+var lexer = (function(){
+var lexer = ({
 
-"use strict";
-/*!
- * is-number <https://github.com/jonschlinkert/is-number>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+EOF:1,
+
+parseError:function parseError(str, hash) {
+        if (this.yy.parser) {
+            this.yy.parser.parseError(str, hash);
+        } else {
+            throw new Error(str);
+        }
+    },
+
+// resets the lexer, sets new input
+setInput:function (input, yy) {
+        this.yy = yy || this.yy || {};
+        this._input = input;
+        this._more = this._backtrack = this.done = false;
+        this.yylineno = this.yyleng = 0;
+        this.yytext = this.matched = this.match = '';
+        this.conditionStack = ['INITIAL'];
+        this.yylloc = {
+            first_line: 1,
+            first_column: 0,
+            last_line: 1,
+            last_column: 0
+        };
+        if (this.options.ranges) {
+            this.yylloc.range = [0,0];
+        }
+        this.offset = 0;
+        return this;
+    },
+
+// consumes and returns one char from the input
+input:function () {
+        var ch = this._input[0];
+        this.yytext += ch;
+        this.yyleng++;
+        this.offset++;
+        this.match += ch;
+        this.matched += ch;
+        var lines = ch.match(/(?:\r\n?|\n).*/g);
+        if (lines) {
+            this.yylineno++;
+            this.yylloc.last_line++;
+        } else {
+            this.yylloc.last_column++;
+        }
+        if (this.options.ranges) {
+            this.yylloc.range[1]++;
+        }
+
+        this._input = this._input.slice(1);
+        return ch;
+    },
 
+// unshifts one char (or a string) into the input
+unput:function (ch) {
+        var len = ch.length;
+        var lines = ch.split(/(?:\r\n?|\n)/g);
 
+        this._input = ch + this._input;
+        this.yytext = this.yytext.substr(0, this.yytext.length - len);
+        //this.yyleng -= len;
+        this.offset -= len;
+        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
+        this.match = this.match.substr(0, this.match.length - 1);
+        this.matched = this.matched.substr(0, this.matched.length - 1);
 
-module.exports = function isNumber(num) {
-  var type = typeof num;
+        if (lines.length - 1) {
+            this.yylineno -= lines.length - 1;
+        }
+        var r = this.yylloc.range;
 
-  if (type === 'string' || num instanceof String) {
-    // an empty string would be coerced to true with the below logic
-    if (!num.trim()) return false;
-  } else if (type !== 'number' && !(num instanceof Number)) {
-    return false;
-  }
+        this.yylloc = {
+            first_line: this.yylloc.first_line,
+            last_line: this.yylineno + 1,
+            first_column: this.yylloc.first_column,
+            last_column: lines ?
+                (lines.length === oldLines.length ? this.yylloc.first_column : 0)
+                 + oldLines[oldLines.length - lines.length].length - lines[0].length :
+              this.yylloc.first_column - len
+        };
 
-  return (num - num + 1) >= 0;
-};
+        if (this.options.ranges) {
+            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+        }
+        this.yyleng = this.yytext.length;
+        return this;
+    },
 
+// When called from action, caches matched text and appends it on next action
+more:function () {
+        this._more = true;
+        return this;
+    },
 
-/***/ }),
-/* 706 */
-/***/ (function(module, exports, __webpack_require__) {
+// When called from action, signals the lexer that this rule fails to match the input, so the next matching rule (regex) should be tested instead.
+reject:function () {
+        if (this.options.backtrack_lexer) {
+            this._backtrack = true;
+        } else {
+            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n' + this.showPosition(), {
+                text: "",
+                token: null,
+                line: this.yylineno
+            });
 
-module.exports = new (__webpack_require__(707))();
+        }
+        return this;
+    },
 
+// retain first n characters of the match
+less:function (n) {
+        this.unput(this.match.slice(n));
+    },
 
-/***/ }),
-/* 707 */
-/***/ (function(module, exports, __webpack_require__) {
+// displays already matched input, i.e. for error messages
+pastInput:function () {
+        var past = this.matched.substr(0, this.matched.length - this.match.length);
+        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
+    },
 
-"use strict";
-/*!
- * fragment-cache <https://github.com/jonschlinkert/fragment-cache>
- *
- * Copyright (c) 2016-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+// displays upcoming input, i.e. for error messages
+upcomingInput:function () {
+        var next = this.match;
+        if (next.length < 20) {
+            next += this._input.substr(0, 20-next.length);
+        }
+        return (next.substr(0,20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
+    },
 
+// displays the character position where the lexing error occurred, i.e. for error messages
+showPosition:function () {
+        var pre = this.pastInput();
+        var c = new Array(pre.length + 1).join("-");
+        return pre + this.upcomingInput() + "\n" + c + "^";
+    },
 
+// test the lexed token: return FALSE when not a match, otherwise return token
+test_match:function (match, indexed_rule) {
+        var token,
+            lines,
+            backup;
 
-var MapCache = __webpack_require__(694);
+        if (this.options.backtrack_lexer) {
+            // save context
+            backup = {
+                yylineno: this.yylineno,
+                yylloc: {
+                    first_line: this.yylloc.first_line,
+                    last_line: this.last_line,
+                    first_column: this.yylloc.first_column,
+                    last_column: this.yylloc.last_column
+                },
+                yytext: this.yytext,
+                match: this.match,
+                matches: this.matches,
+                matched: this.matched,
+                yyleng: this.yyleng,
+                offset: this.offset,
+                _more: this._more,
+                _input: this._input,
+                yy: this.yy,
+                conditionStack: this.conditionStack.slice(0),
+                done: this.done
+            };
+            if (this.options.ranges) {
+                backup.yylloc.range = this.yylloc.range.slice(0);
+            }
+        }
 
-/**
- * Create a new `FragmentCache` with an optional object to use for `caches`.
- *
- * ```js
- * var fragment = new FragmentCache();
- * ```
- * @name FragmentCache
- * @param {String} `cacheName`
- * @return {Object} Returns the [map-cache][] instance.
- * @api public
- */
+        lines = match[0].match(/(?:\r\n?|\n).*/g);
+        if (lines) {
+            this.yylineno += lines.length;
+        }
+        this.yylloc = {
+            first_line: this.yylloc.last_line,
+            last_line: this.yylineno + 1,
+            first_column: this.yylloc.last_column,
+            last_column: lines ?
+                         lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length :
+                         this.yylloc.last_column + match[0].length
+        };
+        this.yytext += match[0];
+        this.match += match[0];
+        this.matches = match;
+        this.yyleng = this.yytext.length;
+        if (this.options.ranges) {
+            this.yylloc.range = [this.offset, this.offset += this.yyleng];
+        }
+        this._more = false;
+        this._backtrack = false;
+        this._input = this._input.slice(match[0].length);
+        this.matched += match[0];
+        token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
+        if (this.done && this._input) {
+            this.done = false;
+        }
+        if (token) {
+            return token;
+        } else if (this._backtrack) {
+            // recover context
+            for (var k in backup) {
+                this[k] = backup[k];
+            }
+            return false; // rule action called reject() implying the next rule should be tested instead.
+        }
+        return false;
+    },
 
-function FragmentCache(caches) {
-  this.caches = caches || {};
-}
+// return next match in input
+next:function () {
+        if (this.done) {
+            return this.EOF;
+        }
+        if (!this._input) {
+            this.done = true;
+        }
 
-/**
- * Prototype
- */
+        var token,
+            match,
+            tempMatch,
+            index;
+        if (!this._more) {
+            this.yytext = '';
+            this.match = '';
+        }
+        var rules = this._currentRules();
+        for (var i = 0; i < rules.length; i++) {
+            tempMatch = this._input.match(this.rules[rules[i]]);
+            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
+                match = tempMatch;
+                index = i;
+                if (this.options.backtrack_lexer) {
+                    token = this.test_match(tempMatch, rules[i]);
+                    if (token !== false) {
+                        return token;
+                    } else if (this._backtrack) {
+                        match = false;
+                        continue; // rule action called reject() implying a rule MISmatch.
+                    } else {
+                        // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
+                        return false;
+                    }
+                } else if (!this.options.flex) {
+                    break;
+                }
+            }
+        }
+        if (match) {
+            token = this.test_match(match, rules[index]);
+            if (token !== false) {
+                return token;
+            }
+            // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
+            return false;
+        }
+        if (this._input === "") {
+            return this.EOF;
+        } else {
+            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), {
+                text: "",
+                token: null,
+                line: this.yylineno
+            });
+        }
+    },
 
-FragmentCache.prototype = {
+// return next match that has a token
+lex:function lex() {
+        var r = this.next();
+        if (r) {
+            return r;
+        } else {
+            return this.lex();
+        }
+    },
 
-  /**
-   * Get cache `name` from the `fragment.caches` object. Creates a new
-   * `MapCache` if it doesn't already exist.
-   *
-   * ```js
-   * var cache = fragment.cache('files');
-   * console.log(fragment.caches.hasOwnProperty('files'));
-   * //=> true
-   * ```
-   * @name .cache
-   * @param {String} `cacheName`
-   * @return {Object} Returns the [map-cache][] instance.
-   * @api public
-   */
+// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
+begin:function begin(condition) {
+        this.conditionStack.push(condition);
+    },
 
-  cache: function(cacheName) {
-    return this.caches[cacheName] || (this.caches[cacheName] = new MapCache());
-  },
+// pop the previously active lexer condition state off the condition stack
+popState:function popState() {
+        var n = this.conditionStack.length - 1;
+        if (n > 0) {
+            return this.conditionStack.pop();
+        } else {
+            return this.conditionStack[0];
+        }
+    },
 
-  /**
-   * Set a value for property `key` on cache `name`
-   *
-   * ```js
-   * fragment.set('files', 'somefile.js', new File({path: 'somefile.js'}));
-   * ```
-   * @name .set
-   * @param {String} `name`
-   * @param {String} `key` Property name to set
-   * @param {any} `val` The value of `key`
-   * @return {Object} The cache instance for chaining
-   * @api public
-   */
+// produce the lexer rule set which is active for the currently active lexer condition state
+_currentRules:function _currentRules() {
+        if (this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1]) {
+            return this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules;
+        } else {
+            return this.conditions["INITIAL"].rules;
+        }
+    },
 
-  set: function(cacheName, key, val) {
-    var cache = this.cache(cacheName);
-    cache.set(key, val);
-    return cache;
-  },
+// return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
+topState:function topState(n) {
+        n = this.conditionStack.length - 1 - Math.abs(n || 0);
+        if (n >= 0) {
+            return this.conditionStack[n];
+        } else {
+            return "INITIAL";
+        }
+    },
 
-  /**
-   * Returns true if a non-undefined value is set for `key` on fragment cache `name`.
-   *
-   * ```js
-   * var cache = fragment.cache('files');
-   * cache.set('somefile.js');
-   *
-   * console.log(cache.has('somefile.js'));
-   * //=> true
-   *
-   * console.log(cache.has('some-other-file.js'));
-   * //=> false
-   * ```
-   * @name .has
-   * @param {String} `name` Cache name
-   * @param {String} `key` Optionally specify a property to check for on cache `name`
-   * @return {Boolean}
-   * @api public
-   */
+// alias for begin(condition)
+pushState:function pushState(condition) {
+        this.begin(condition);
+    },
 
-  has: function(cacheName, key) {
-    return typeof this.get(cacheName, key) !== 'undefined';
-  },
+// return the number of states currently on the stack
+stateStackSize:function stateStackSize() {
+        return this.conditionStack.length;
+    },
+options: {},
+performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
+var YYSTATE=YY_START;
+switch($avoiding_name_collisions) {
+case 0:return 5
+break;
+case 1:/* skip whitespace */
+break;
+case 2:return 8
+break;
+case 3:return 16
+break;
+case 4:return 17
+break;
+case 5:return 11
+break;
+case 6:return 10
+break;
+case 7:return 9
+break;
+case 8:return 14
+break;
+case 9:return 15
+break;
+case 10:return 12
+break;
+case 11:return 7
+break;
+case 12:return 7
+break;
+case 13:return 7
+break;
+case 14:return 7
+break;
+case 15:return 7
+break;
+case 16:return 7
+break;
+case 17:return 7
+break;
+case 18:return 7
+break;
+case 19:return 7
+break;
+case 20:return 7
+break;
+case 21:return 7
+break;
+case 22:return 7
+break;
+case 23:return 7
+break;
+case 24:return 13
+break;
+case 25:return 13
+break;
+case 26:return 13
+break;
+case 27:return 13
+break;
+case 28:return 13
+break;
+case 29:return 13
+break;
+case 30:return 13
+break;
+case 31:return 13
+break;
+case 32:return 7
+break;
+case 33:return 13
+break;
+case 34:return 7
+break;
+case 35:return 13
+break;
+case 36:return 7
+break;
+case 37:return 13
+break;
+case 38:return 13
+break;
+case 39:return 7
+break;
+case 40:return 13
+break;
+case 41:return 13
+break;
+case 42:return 13
+break;
+case 43:return 13
+break;
+case 44:return 13
+break;
+case 45:return 7
+break;
+case 46:return 13
+break;
+case 47:return 7
+break;
+case 48:return 7
+break;
+case 49:return 7
+break;
+case 50:return 7
+break;
+case 51:return 7
+break;
+case 52:return 7
+break;
+case 53:return 7
+break;
+case 54:return 7
+break;
+case 55:return 7
+break;
+case 56:return 7
+break;
+case 57:return 7
+break;
+case 58:return 7
+break;
+case 59:return 7
+break;
+case 60:return 7
+break;
+case 61:return 7
+break;
+case 62:return 7
+break;
+case 63:return 13
+break;
+case 64:return 7
+break;
+case 65:return 7
+break;
+case 66:return 13
+break;
+case 67:return 7
+break;
+case 68:return 7
+break;
+case 69:return 7
+break;
+case 70:return 7
+break;
+case 71:return 7
+break;
+case 72:return 7
+break;
+case 73:return 13
+break;
+case 74:return 7
+break;
+case 75:return 13
+break;
+case 76:return 7
+break;
+case 77:return 7
+break;
+case 78:return 7
+break;
+case 79:return 7
+break;
+case 80:return 7
+break;
+case 81:return 7
+break;
+case 82:return 7
+break;
+case 83:return 7
+break;
+case 84:return 7
+break;
+case 85:return 7
+break;
+case 86:return 7
+break;
+case 87:return 7
+break;
+case 88:return 7
+break;
+case 89:return 7
+break;
+case 90:return 7
+break;
+case 91:return 7
+break;
+case 92:return 7
+break;
+case 93:return 7
+break;
+case 94:return 7
+break;
+case 95:return 7
+break;
+case 96:return 7
+break;
+case 97:return 7
+break;
+case 98:return 7
+break;
+case 99:return 7
+break;
+case 100:return 7
+break;
+case 101:return 7
+break;
+case 102:return 7
+break;
+case 103:return 7
+break;
+case 104:return 7
+break;
+case 105:return 7
+break;
+case 106:return 7
+break;
+case 107:return 7
+break;
+case 108:return 7
+break;
+case 109:return 7
+break;
+case 110:return 7
+break;
+case 111:return 7
+break;
+case 112:return 7
+break;
+case 113:return 7
+break;
+case 114:return 7
+break;
+case 115:return 7
+break;
+case 116:return 7
+break;
+case 117:return 7
+break;
+case 118:return 7
+break;
+case 119:return 7
+break;
+case 120:return 7
+break;
+case 121:return 7
+break;
+case 122:return 7
+break;
+case 123:return 7
+break;
+case 124:return 7
+break;
+case 125:return 7
+break;
+case 126:return 7
+break;
+case 127:return 7
+break;
+case 128:return 7
+break;
+case 129:return 7
+break;
+case 130:return 7
+break;
+case 131:return 7
+break;
+case 132:return 7
+break;
+case 133:return 7
+break;
+case 134:return 7
+break;
+case 135:return 7
+break;
+case 136:return 7
+break;
+case 137:return 7
+break;
+case 138:return 7
+break;
+case 139:return 7
+break;
+case 140:return 7
+break;
+case 141:return 7
+break;
+case 142:return 7
+break;
+case 143:return 7
+break;
+case 144:return 7
+break;
+case 145:return 7
+break;
+case 146:return 7
+break;
+case 147:return 7
+break;
+case 148:return 7
+break;
+case 149:return 7
+break;
+case 150:return 7
+break;
+case 151:return 7
+break;
+case 152:return 7
+break;
+case 153:return 7
+break;
+case 154:return 7
+break;
+case 155:return 7
+break;
+case 156:return 7
+break;
+case 157:return 7
+break;
+case 158:return 7
+break;
+case 159:return 7
+break;
+case 160:return 7
+break;
+case 161:return 7
+break;
+case 162:return 7
+break;
+case 163:return 7
+break;
+case 164:return 7
+break;
+case 165:return 7
+break;
+case 166:return 7
+break;
+case 167:return 7
+break;
+case 168:return 7
+break;
+case 169:return 7
+break;
+case 170:return 7
+break;
+case 171:return 7
+break;
+case 172:return 7
+break;
+case 173:return 7
+break;
+case 174:return 7
+break;
+case 175:return 7
+break;
+case 176:return 7
+break;
+case 177:return 7
+break;
+case 178:return 7
+break;
+case 179:return 7
+break;
+case 180:return 7
+break;
+case 181:return 7
+break;
+case 182:return 7
+break;
+case 183:return 7
+break;
+case 184:return 7
+break;
+case 185:return 7
+break;
+case 186:return 7
+break;
+case 187:return 7
+break;
+case 188:return 7
+break;
+case 189:return 7
+break;
+case 190:return 7
+break;
+case 191:return 7
+break;
+case 192:return 7
+break;
+case 193:return 7
+break;
+case 194:return 7
+break;
+case 195:return 7
+break;
+case 196:return 7
+break;
+case 197:return 7
+break;
+case 198:return 7
+break;
+case 199:return 7
+break;
+case 200:return 7
+break;
+case 201:return 7
+break;
+case 202:return 7
+break;
+case 203:return 7
+break;
+case 204:return 7
+break;
+case 205:return 7
+break;
+case 206:return 7
+break;
+case 207:return 7
+break;
+case 208:return 7
+break;
+case 209:return 7
+break;
+case 210:return 7
+break;
+case 211:return 7
+break;
+case 212:return 7
+break;
+case 213:return 7
+break;
+case 214:return 7
+break;
+case 215:return 7
+break;
+case 216:return 7
+break;
+case 217:return 7
+break;
+case 218:return 7
+break;
+case 219:return 7
+break;
+case 220:return 7
+break;
+case 221:return 7
+break;
+case 222:return 7
+break;
+case 223:return 7
+break;
+case 224:return 7
+break;
+case 225:return 7
+break;
+case 226:return 7
+break;
+case 227:return 7
+break;
+case 228:return 7
+break;
+case 229:return 7
+break;
+case 230:return 7
+break;
+case 231:return 7
+break;
+case 232:return 7
+break;
+case 233:return 7
+break;
+case 234:return 7
+break;
+case 235:return 7
+break;
+case 236:return 7
+break;
+case 237:return 7
+break;
+case 238:return 7
+break;
+case 239:return 7
+break;
+case 240:return 7
+break;
+case 241:return 7
+break;
+case 242:return 7
+break;
+case 243:return 7
+break;
+case 244:return 7
+break;
+case 245:return 7
+break;
+case 246:return 7
+break;
+case 247:return 7
+break;
+case 248:return 7
+break;
+case 249:return 7
+break;
+case 250:return 7
+break;
+case 251:return 7
+break;
+case 252:return 7
+break;
+case 253:return 7
+break;
+case 254:return 7
+break;
+case 255:return 7
+break;
+case 256:return 7
+break;
+case 257:return 7
+break;
+case 258:return 7
+break;
+case 259:return 7
+break;
+case 260:return 7
+break;
+case 261:return 7
+break;
+case 262:return 7
+break;
+case 263:return 7
+break;
+case 264:return 7
+break;
+case 265:return 7
+break;
+case 266:return 7
+break;
+case 267:return 7
+break;
+case 268:return 7
+break;
+case 269:return 7
+break;
+case 270:return 7
+break;
+case 271:return 7
+break;
+case 272:return 7
+break;
+case 273:return 7
+break;
+case 274:return 7
+break;
+case 275:return 7
+break;
+case 276:return 7
+break;
+case 277:return 7
+break;
+case 278:return 7
+break;
+case 279:return 7
+break;
+case 280:return 7
+break;
+case 281:return 7
+break;
+case 282:return 7
+break;
+case 283:return 7
+break;
+case 284:return 7
+break;
+case 285:return 7
+break;
+case 286:return 7
+break;
+case 287:return 7
+break;
+case 288:return 7
+break;
+case 289:return 7
+break;
+case 290:return 7
+break;
+case 291:return 7
+break;
+case 292:return 7
+break;
+case 293:return 7
+break;
+case 294:return 7
+break;
+case 295:return 7
+break;
+case 296:return 7
+break;
+case 297:return 7
+break;
+case 298:return 7
+break;
+case 299:return 7
+break;
+case 300:return 7
+break;
+case 301:return 7
+break;
+case 302:return 7
+break;
+case 303:return 7
+break;
+case 304:return 7
+break;
+case 305:return 7
+break;
+case 306:return 7
+break;
+case 307:return 7
+break;
+case 308:return 7
+break;
+case 309:return 7
+break;
+case 310:return 7
+break;
+case 311:return 7
+break;
+case 312:return 7
+break;
+case 313:return 7
+break;
+case 314:return 7
+break;
+case 315:return 7
+break;
+case 316:return 7
+break;
+case 317:return 7
+break;
+case 318:return 7
+break;
+case 319:return 7
+break;
+case 320:return 7
+break;
+case 321:return 7
+break;
+case 322:return 7
+break;
+case 323:return 7
+break;
+case 324:return 7
+break;
+case 325:return 7
+break;
+case 326:return 7
+break;
+case 327:return 7
+break;
+case 328:return 7
+break;
+case 329:return 7
+break;
+case 330:return 7
+break;
+case 331:return 7
+break;
+case 332:return 7
+break;
+case 333:return 7
+break;
+case 334:return 7
+break;
+case 335:return 7
+break;
+case 336:return 7
+break;
+case 337:return 7
+break;
+case 338:return 7
+break;
+case 339:return 7
+break;
+case 340:return 7
+break;
+case 341:return 7
+break;
+case 342:return 7
+break;
+case 343:return 7
+break;
+case 344:return 7
+break;
+case 345:return 7
+break;
+case 346:return 7
+break;
+case 347:return 7
+break;
+case 348:return 7
+break;
+case 349:return 7
+break;
+case 350:return 7
+break;
+case 351:return 7
+break;
+case 352:return 7
+break;
+case 353:return 7
+break;
+case 354:return 7
+break;
+case 355:return 7
+break;
+case 356:return 7
+break;
+case 357:return 7
+break;
+case 358:return 7
+break;
+case 359:return 7
+break;
+case 360:return 7
+break;
+case 361:return 7
+break;
+case 362:return 7
+break;
+case 363:return 7
+break;
+case 364:return 7
+break;
+}
+},
+rules: [/^(?:$)/,/^(?:\s+)/,/^(?:\+)/,/^(?:\()/,/^(?:\))/,/^(?::)/,/^(?:DocumentRef-([0-9A-Za-z-+.]+))/,/^(?:LicenseRef-([0-9A-Za-z-+.]+))/,/^(?:AND)/,/^(?:OR)/,/^(?:WITH)/,/^(?:BSD-3-Clause-No-Nuclear-License-2014)/,/^(?:BSD-3-Clause-No-Nuclear-Warranty)/,/^(?:GPL-2\.0-with-classpath-exception)/,/^(?:GPL-3\.0-with-autoconf-exception)/,/^(?:GPL-2\.0-with-autoconf-exception)/,/^(?:BSD-3-Clause-No-Nuclear-License)/,/^(?:MPL-2\.0-no-copyleft-exception)/,/^(?:GPL-2\.0-with-bison-exception)/,/^(?:GPL-2\.0-with-font-exception)/,/^(?:GPL-2\.0-with-GCC-exception)/,/^(?:CNRI-Python-GPL-Compatible)/,/^(?:GPL-3\.0-with-GCC-exception)/,/^(?:BSD-3-Clause-Attribution)/,/^(?:Classpath-exception-2\.0)/,/^(?:WxWindows-exception-3\.1)/,/^(?:freertos-exception-2\.0)/,/^(?:Autoconf-exception-3\.0)/,/^(?:i2p-gpl-java-exception)/,/^(?:gnu-javamail-exception)/,/^(?:Nokia-Qt-exception-1\.1)/,/^(?:Autoconf-exception-2\.0)/,/^(?:BSD-2-Clause-FreeBSD)/,/^(?:u-boot-exception-2\.0)/,/^(?:zlib-acknowledgement)/,/^(?:Bison-exception-2\.2)/,/^(?:BSD-2-Clause-NetBSD)/,/^(?:CLISP-exception-2\.0)/,/^(?:eCos-exception-2\.0)/,/^(?:BSD-3-Clause-Clear)/,/^(?:Font-exception-2\.0)/,/^(?:FLTK-exception-2\.0)/,/^(?:GCC-exception-2\.0)/,/^(?:Qwt-exception-1\.0)/,/^(?:Libtool-exception)/,/^(?:BSD-3-Clause-LBNL)/,/^(?:GCC-exception-3\.1)/,/^(?:Artistic-1\.0-Perl)/,/^(?:Artistic-1\.0-cl8)/,/^(?:CC-BY-NC-SA-2\.5)/,/^(?:MIT-advertising)/,/^(?:BSD-Source-Code)/,/^(?:CC-BY-NC-SA-4\.0)/,/^(?:LiLiQ-Rplus-1\.1)/,/^(?:CC-BY-NC-SA-3\.0)/,/^(?:BSD-4-Clause-UC)/,/^(?:CC-BY-NC-SA-2\.0)/,/^(?:CC-BY-NC-SA-1\.0)/,/^(?:CC-BY-NC-ND-4\.0)/,/^(?:CC-BY-NC-ND-3\.0)/,/^(?:CC-BY-NC-ND-2\.5)/,/^(?:CC-BY-NC-ND-2\.0)/,/^(?:CC-BY-NC-ND-1\.0)/,/^(?:LZMA-exception)/,/^(?:BitTorrent-1\.1)/,/^(?:CrystalStacker)/,/^(?:FLTK-exception)/,/^(?:SugarCRM-1\.1\.3)/,/^(?:BSD-Protection)/,/^(?:BitTorrent-1\.0)/,/^(?:HaskellReport)/,/^(?:Interbase-1\.0)/,/^(?:StandardML-NJ)/,/^(?:mif-exception)/,/^(?:Frameworx-1\.0)/,/^(?:389-exception)/,/^(?:CC-BY-NC-2\.0)/,/^(?:CC-BY-NC-2\.5)/,/^(?:CC-BY-NC-3\.0)/,/^(?:CC-BY-NC-4\.0)/,/^(?:W3C-19980720)/,/^(?:CC-BY-SA-1\.0)/,/^(?:CC-BY-SA-2\.0)/,/^(?:CC-BY-SA-2\.5)/,/^(?:CC-BY-ND-2\.0)/,/^(?:CC-BY-SA-4\.0)/,/^(?:CC-BY-SA-3\.0)/,/^(?:Artistic-1\.0)/,/^(?:Artistic-2\.0)/,/^(?:CC-BY-ND-2\.5)/,/^(?:CC-BY-ND-3\.0)/,/^(?:CC-BY-ND-4\.0)/,/^(?:CC-BY-ND-1\.0)/,/^(?:BSD-4-Clause)/,/^(?:BSD-3-Clause)/,/^(?:BSD-2-Clause)/,/^(?:CC-BY-NC-1\.0)/,/^(?:bzip2-1\.0\.6)/,/^(?:Unicode-TOU)/,/^(?:CNRI-Jython)/,/^(?:ImageMagick)/,/^(?:Adobe-Glyph)/,/^(?:CUA-OPL-1\.0)/,/^(?:OLDAP-2\.2\.2)/,/^(?:LiLiQ-R-1\.1)/,/^(?:bzip2-1\.0\.5)/,/^(?:LiLiQ-P-1\.1)/,/^(?:OLDAP-2\.0\.1)/,/^(?:OLDAP-2\.2\.1)/,/^(?:CNRI-Python)/,/^(?:XFree86-1\.1)/,/^(?:OSET-PL-2\.1)/,/^(?:Apache-2\.0)/,/^(?:Watcom-1\.0)/,/^(?:PostgreSQL)/,/^(?:Python-2\.0)/,/^(?:RHeCos-1\.1)/,/^(?:EUDatagrid)/,/^(?:Spencer-99)/,/^(?:Intel-ACPI)/,/^(?:CECILL-1\.0)/,/^(?:CECILL-1\.1)/,/^(?:JasPer-2\.0)/,/^(?:CECILL-2\.0)/,/^(?:CECILL-2\.1)/,/^(?:gSOAP-1\.3b)/,/^(?:Spencer-94)/,/^(?:Apache-1\.1)/,/^(?:Spencer-86)/,/^(?:Apache-1\.0)/,/^(?:ClArtistic)/,/^(?:TORQUE-1\.1)/,/^(?:CATOSL-1\.1)/,/^(?:Adobe-2006)/,/^(?:Zimbra-1\.4)/,/^(?:Zimbra-1\.3)/,/^(?:Condor-1\.1)/,/^(?:CC-BY-3\.0)/,/^(?:CC-BY-2\.5)/,/^(?:OLDAP-2\.4)/,/^(?:SGI-B-1\.1)/,/^(?:SISSL-1\.2)/,/^(?:SGI-B-1\.0)/,/^(?:OLDAP-2\.3)/,/^(?:CC-BY-4\.0)/,/^(?:Crossword)/,/^(?:SimPL-2\.0)/,/^(?:OLDAP-2\.2)/,/^(?:OLDAP-2\.1)/,/^(?:ErlPL-1\.1)/,/^(?:LPPL-1\.3a)/,/^(?:LPPL-1\.3c)/,/^(?:OLDAP-2\.0)/,/^(?:Leptonica)/,/^(?:CPOL-1\.02)/,/^(?:OLDAP-1\.4)/,/^(?:OLDAP-1\.3)/,/^(?:CC-BY-2\.0)/,/^(?:Unlicense)/,/^(?:OLDAP-2\.8)/,/^(?:OLDAP-1\.2)/,/^(?:MakeIndex)/,/^(?:OLDAP-2\.7)/,/^(?:OLDAP-1\.1)/,/^(?:Sleepycat)/,/^(?:D-FSL-1\.0)/,/^(?:CC-BY-1\.0)/,/^(?:OLDAP-2\.6)/,/^(?:WXwindows)/,/^(?:NPOSL-3\.0)/,/^(?:FreeImage)/,/^(?:SGI-B-2\.0)/,/^(?:OLDAP-2\.5)/,/^(?:Beerware)/,/^(?:Newsletr)/,/^(?:NBPL-1\.0)/,/^(?:NASA-1\.3)/,/^(?:NLOD-1\.0)/,/^(?:AGPL-1\.0)/,/^(?:OCLC-2\.0)/,/^(?:ODbL-1\.0)/,/^(?:PDDL-1\.0)/,/^(?:Motosoto)/,/^(?:Afmparse)/,/^(?:ANTLR-PD)/,/^(?:LPL-1\.02)/,/^(?:Abstyles)/,/^(?:eCos-2\.0)/,/^(?:APSL-1\.0)/,/^(?:LPPL-1\.2)/,/^(?:LPPL-1\.1)/,/^(?:LPPL-1\.0)/,/^(?:APSL-1\.1)/,/^(?:APSL-2\.0)/,/^(?:Info-ZIP)/,/^(?:Zend-2\.0)/,/^(?:IBM-pibs)/,/^(?:LGPL-2\.0)/,/^(?:LGPL-3\.0)/,/^(?:LGPL-2\.1)/,/^(?:GFDL-1\.3)/,/^(?:PHP-3\.01)/,/^(?:GFDL-1\.2)/,/^(?:GFDL-1\.1)/,/^(?:AGPL-3\.0)/,/^(?:Giftware)/,/^(?:EUPL-1\.1)/,/^(?:RPSL-1\.0)/,/^(?:EUPL-1\.0)/,/^(?:MIT-enna)/,/^(?:CECILL-B)/,/^(?:diffmark)/,/^(?:CECILL-C)/,/^(?:CDDL-1\.0)/,/^(?:Sendmail)/,/^(?:CDDL-1\.1)/,/^(?:CPAL-1\.0)/,/^(?:APSL-1\.2)/,/^(?:NPL-1\.1)/,/^(?:AFL-1\.2)/,/^(?:Caldera)/,/^(?:AFL-2\.0)/,/^(?:FSFULLR)/,/^(?:AFL-2\.1)/,/^(?:VSL-1\.0)/,/^(?:VOSTROM)/,/^(?:UPL-1\.0)/,/^(?:Dotseqn)/,/^(?:CPL-1\.0)/,/^(?:dvipdfm)/,/^(?:EPL-1\.0)/,/^(?:OCCT-PL)/,/^(?:ECL-1\.0)/,/^(?:Latex2e)/,/^(?:ECL-2\.0)/,/^(?:GPL-1\.0)/,/^(?:GPL-2\.0)/,/^(?:GPL-3\.0)/,/^(?:AFL-3\.0)/,/^(?:LAL-1\.2)/,/^(?:LAL-1\.3)/,/^(?:EFL-1\.0)/,/^(?:EFL-2\.0)/,/^(?:gnuplot)/,/^(?:Aladdin)/,/^(?:LPL-1\.0)/,/^(?:libtiff)/,/^(?:Entessa)/,/^(?:AMDPLPA)/,/^(?:IPL-1\.0)/,/^(?:OPL-1\.0)/,/^(?:OSL-1\.0)/,/^(?:OSL-1\.1)/,/^(?:OSL-2\.0)/,/^(?:OSL-2\.1)/,/^(?:OSL-3\.0)/,/^(?:OpenSSL)/,/^(?:ZPL-2\.1)/,/^(?:PHP-3\.0)/,/^(?:ZPL-2\.0)/,/^(?:ZPL-1\.1)/,/^(?:CC0-1\.0)/,/^(?:SPL-1\.0)/,/^(?:psutils)/,/^(?:MPL-1\.0)/,/^(?:QPL-1\.0)/,/^(?:MPL-1\.1)/,/^(?:MPL-2\.0)/,/^(?:APL-1\.0)/,/^(?:RPL-1\.1)/,/^(?:RPL-1\.5)/,/^(?:MIT-CMU)/,/^(?:Multics)/,/^(?:Eurosym)/,/^(?:BSL-1\.0)/,/^(?:MIT-feh)/,/^(?:Saxpath)/,/^(?:Borceux)/,/^(?:OFL-1\.1)/,/^(?:OFL-1\.0)/,/^(?:AFL-1\.1)/,/^(?:YPL-1\.1)/,/^(?:YPL-1\.0)/,/^(?:NPL-1\.0)/,/^(?:iMatix)/,/^(?:mpich2)/,/^(?:APAFML)/,/^(?:Bahyph)/,/^(?:RSA-MD)/,/^(?:psfrag)/,/^(?:Plexus)/,/^(?:eGenix)/,/^(?:Glulxe)/,/^(?:SAX-PD)/,/^(?:Imlib2)/,/^(?:Wsuipa)/,/^(?:LGPLLR)/,/^(?:Libpng)/,/^(?:xinetd)/,/^(?:MITNFA)/,/^(?:NetCDF)/,/^(?:Naumen)/,/^(?:SMPPL)/,/^(?:Nunit)/,/^(?:FSFUL)/,/^(?:GL2PS)/,/^(?:SMLNJ)/,/^(?:Rdisc)/,/^(?:Noweb)/,/^(?:Nokia)/,/^(?:SISSL)/,/^(?:Qhull)/,/^(?:Intel)/,/^(?:Glide)/,/^(?:Xerox)/,/^(?:AMPAS)/,/^(?:WTFPL)/,/^(?:MS-PL)/,/^(?:XSkat)/,/^(?:MS-RL)/,/^(?:MirOS)/,/^(?:RSCPL)/,/^(?:TMate)/,/^(?:OGTSL)/,/^(?:FSFAP)/,/^(?:NCSA)/,/^(?:Zlib)/,/^(?:SCEA)/,/^(?:SNIA)/,/^(?:NGPL)/,/^(?:NOSL)/,/^(?:ADSL)/,/^(?:MTLL)/,/^(?:NLPL)/,/^(?:Ruby)/,/^(?:JSON)/,/^(?:Barr)/,/^(?:0BSD)/,/^(?:Xnet)/,/^(?:Cube)/,/^(?:curl)/,/^(?:DSDP)/,/^(?:Fair)/,/^(?:HPND)/,/^(?:TOSL)/,/^(?:IJG)/,/^(?:SWL)/,/^(?:Vim)/,/^(?:FTL)/,/^(?:ICU)/,/^(?:OML)/,/^(?:NRL)/,/^(?:DOC)/,/^(?:TCL)/,/^(?:W3C)/,/^(?:NTP)/,/^(?:IPA)/,/^(?:ISC)/,/^(?:X11)/,/^(?:AAL)/,/^(?:AML)/,/^(?:xpp)/,/^(?:Zed)/,/^(?:MIT)/,/^(?:Mup)/],
+conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364],"inclusive":true}}
+});
+return lexer;
+})();
+parser.lexer = lexer;
+function Parser () {
+  this.yy = {};
+}
+Parser.prototype = parser;parser.Parser = Parser;
+return new Parser;
+})();
 
-  /**
-   * Get `name`, or if specified, the value of `key`. Invokes the [cache]() method,
-   * so that cache `name` will be created it doesn't already exist. If `key` is not passed,
-   * the entire cache (`name`) is returned.
-   *
-   * ```js
-   * var Vinyl = require('vinyl');
-   * var cache = fragment.cache('files');
-   * cache.set('somefile.js', new Vinyl({path: 'somefile.js'}));
-   * console.log(cache.get('somefile.js'));
-   * //=> <File "somefile.js">
-   * ```
-   * @name .get
-   * @param {String} `name`
-   * @return {Object} Returns cache `name`, or the value of `key` if specified
-   * @api public
-   */
 
-  get: function(name, key) {
-    var cache = this.cache(name);
-    if (typeof key === 'string') {
-      return cache.get(key);
+if (true) {
+exports.parser = spdxparse;
+exports.Parser = spdxparse.Parser;
+exports.parse = function () { return spdxparse.parse.apply(spdxparse, arguments); };
+exports.main = function commonjsMain(args) {
+    if (!args[1]) {
+        console.log('Usage: '+args[0]+' FILE');
+        process.exit(1);
     }
-    return cache;
-  }
+    var source = __webpack_require__("fs").readFileSync(__webpack_require__("path").normalize(args[1]), "utf8");
+    return exports.parser.parse(source);
 };
+if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
+  exports.main(process.argv.slice(1));
+}
+}
 
-/**
- * Expose `FragmentCache`
- */
-
-exports = module.exports = FragmentCache;
-
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("../../node_modules/webpack/buildin/module.js")(module)))
 
 /***/ }),
-/* 708 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var utils = module.exports;
-var path = __webpack_require__(4);
 
-/**
- * Module dependencies
- */
+/***/ "../../node_modules/spdx-license-ids/spdx-license-ids.json":
+/***/ (function(module) {
 
-var isWindows = __webpack_require__(709)();
-var Snapdragon = __webpack_require__(628);
-utils.define = __webpack_require__(710);
-utils.diff = __webpack_require__(711);
-utils.extend = __webpack_require__(700);
-utils.pick = __webpack_require__(712);
-utils.typeOf = __webpack_require__(594);
-utils.unique = __webpack_require__(604);
+module.exports = JSON.parse("[\"Glide\",\"Abstyles\",\"AFL-1.1\",\"AFL-1.2\",\"AFL-2.0\",\"AFL-2.1\",\"AFL-3.0\",\"AMPAS\",\"APL-1.0\",\"Adobe-Glyph\",\"APAFML\",\"Adobe-2006\",\"AGPL-1.0\",\"Afmparse\",\"Aladdin\",\"ADSL\",\"AMDPLPA\",\"ANTLR-PD\",\"Apache-1.0\",\"Apache-1.1\",\"Apache-2.0\",\"AML\",\"APSL-1.0\",\"APSL-1.1\",\"APSL-1.2\",\"APSL-2.0\",\"Artistic-1.0\",\"Artistic-1.0-Perl\",\"Artistic-1.0-cl8\",\"Artistic-2.0\",\"AAL\",\"Bahyph\",\"Barr\",\"Beerware\",\"BitTorrent-1.0\",\"BitTorrent-1.1\",\"BSL-1.0\",\"Borceux\",\"BSD-2-Clause\",\"BSD-2-Clause-FreeBSD\",\"BSD-2-Clause-NetBSD\",\"BSD-3-Clause\",\"BSD-3-Clause-Clear\",\"BSD-4-Clause\",\"BSD-Protection\",\"BSD-Source-Code\",\"BSD-3-Clause-Attribution\",\"0BSD\",\"BSD-4-Clause-UC\",\"bzip2-1.0.5\",\"bzip2-1.0.6\",\"Caldera\",\"CECILL-1.0\",\"CECILL-1.1\",\"CECILL-2.0\",\"CECILL-2.1\",\"CECILL-B\",\"CECILL-C\",\"ClArtistic\",\"MIT-CMU\",\"CNRI-Jython\",\"CNRI-Python\",\"CNRI-Python-GPL-Compatible\",\"CPOL-1.02\",\"CDDL-1.0\",\"CDDL-1.1\",\"CPAL-1.0\",\"CPL-1.0\",\"CATOSL-1.1\",\"Condor-1.1\",\"CC-BY-1.0\",\"CC-BY-2.0\",\"CC-BY-2.5\",\"CC-BY-3.0\",\"CC-BY-4.0\",\"CC-BY-ND-1.0\",\"CC-BY-ND-2.0\",\"CC-BY-ND-2.5\",\"CC-BY-ND-3.0\",\"CC-BY-ND-4.0\",\"CC-BY-NC-1.0\",\"CC-BY-NC-2.0\",\"CC-BY-NC-2.5\",\"CC-BY-NC-3.0\",\"CC-BY-NC-4.0\",\"CC-BY-NC-ND-1.0\",\"CC-BY-NC-ND-2.0\",\"CC-BY-NC-ND-2.5\",\"CC-BY-NC-ND-3.0\",\"CC-BY-NC-ND-4.0\",\"CC-BY-NC-SA-1.0\",\"CC-BY-NC-SA-2.0\",\"CC-BY-NC-SA-2.5\",\"CC-BY-NC-SA-3.0\",\"CC-BY-NC-SA-4.0\",\"CC-BY-SA-1.0\",\"CC-BY-SA-2.0\",\"CC-BY-SA-2.5\",\"CC-BY-SA-3.0\",\"CC-BY-SA-4.0\",\"CC0-1.0\",\"Crossword\",\"CrystalStacker\",\"CUA-OPL-1.0\",\"Cube\",\"curl\",\"D-FSL-1.0\",\"diffmark\",\"WTFPL\",\"DOC\",\"Dotseqn\",\"DSDP\",\"dvipdfm\",\"EPL-1.0\",\"ECL-1.0\",\"ECL-2.0\",\"eGenix\",\"EFL-1.0\",\"EFL-2.0\",\"MIT-advertising\",\"MIT-enna\",\"Entessa\",\"ErlPL-1.1\",\"EUDatagrid\",\"EUPL-1.0\",\"EUPL-1.1\",\"Eurosym\",\"Fair\",\"MIT-feh\",\"Frameworx-1.0\",\"FreeImage\",\"FTL\",\"FSFAP\",\"FSFUL\",\"FSFULLR\",\"Giftware\",\"GL2PS\",\"Glulxe\",\"AGPL-3.0\",\"GFDL-1.1\",\"GFDL-1.2\",\"GFDL-1.3\",\"GPL-1.0\",\"GPL-2.0\",\"GPL-3.0\",\"LGPL-2.1\",\"LGPL-3.0\",\"LGPL-2.0\",\"gnuplot\",\"gSOAP-1.3b\",\"HaskellReport\",\"HPND\",\"IBM-pibs\",\"IPL-1.0\",\"ICU\",\"ImageMagick\",\"iMatix\",\"Imlib2\",\"IJG\",\"Info-ZIP\",\"Intel-ACPI\",\"Intel\",\"Interbase-1.0\",\"IPA\",\"ISC\",\"JasPer-2.0\",\"JSON\",\"LPPL-1.0\",\"LPPL-1.1\",\"LPPL-1.2\",\"LPPL-1.3a\",\"LPPL-1.3c\",\"Latex2e\",\"BSD-3-Clause-LBNL\",\"Leptonica\",\"LGPLLR\",\"Libpng\",\"libtiff\",\"LAL-1.2\",\"LAL-1.3\",\"LiLiQ-P-1.1\",\"LiLiQ-Rplus-1.1\",\"LiLiQ-R-1.1\",\"LPL-1.02\",\"LPL-1.0\",\"MakeIndex\",\"MTLL\",\"MS-PL\",\"MS-RL\",\"MirOS\",\"MITNFA\",\"MIT\",\"Motosoto\",\"MPL-1.0\",\"MPL-1.1\",\"MPL-2.0\",\"MPL-2.0-no-copyleft-exception\",\"mpich2\",\"Multics\",\"Mup\",\"NASA-1.3\",\"Naumen\",\"NBPL-1.0\",\"NetCDF\",\"NGPL\",\"NOSL\",\"NPL-1.0\",\"NPL-1.1\",\"Newsletr\",\"NLPL\",\"Nokia\",\"NPOSL-3.0\",\"NLOD-1.0\",\"Noweb\",\"NRL\",\"NTP\",\"Nunit\",\"OCLC-2.0\",\"ODbL-1.0\",\"PDDL-1.0\",\"OCCT-PL\",\"OGTSL\",\"OLDAP-2.2.2\",\"OLDAP-1.1\",\"OLDAP-1.2\",\"OLDAP-1.3\",\"OLDAP-1.4\",\"OLDAP-2.0\",\"OLDAP-2.0.1\",\"OLDAP-2.1\",\"OLDAP-2.2\",\"OLDAP-2.2.1\",\"OLDAP-2.3\",\"OLDAP-2.4\",\"OLDAP-2.5\",\"OLDAP-2.6\",\"OLDAP-2.7\",\"OLDAP-2.8\",\"OML\",\"OPL-1.0\",\"OSL-1.0\",\"OSL-1.1\",\"OSL-2.0\",\"OSL-2.1\",\"OSL-3.0\",\"OpenSSL\",\"OSET-PL-2.1\",\"PHP-3.0\",\"PHP-3.01\",\"Plexus\",\"PostgreSQL\",\"psfrag\",\"psutils\",\"Python-2.0\",\"QPL-1.0\",\"Qhull\",\"Rdisc\",\"RPSL-1.0\",\"RPL-1.1\",\"RPL-1.5\",\"RHeCos-1.1\",\"RSCPL\",\"RSA-MD\",\"Ruby\",\"SAX-PD\",\"Saxpath\",\"SCEA\",\"SWL\",\"SMPPL\",\"Sendmail\",\"SGI-B-1.0\",\"SGI-B-1.1\",\"SGI-B-2.0\",\"OFL-1.0\",\"OFL-1.1\",\"SimPL-2.0\",\"Sleepycat\",\"SNIA\",\"Spencer-86\",\"Spencer-94\",\"Spencer-99\",\"SMLNJ\",\"SugarCRM-1.1.3\",\"SISSL\",\"SISSL-1.2\",\"SPL-1.0\",\"Watcom-1.0\",\"TCL\",\"Unlicense\",\"TMate\",\"TORQUE-1.1\",\"TOSL\",\"Unicode-TOU\",\"UPL-1.0\",\"NCSA\",\"Vim\",\"VOSTROM\",\"VSL-1.0\",\"W3C-19980720\",\"W3C\",\"Wsuipa\",\"Xnet\",\"X11\",\"Xerox\",\"XFree86-1.1\",\"xinetd\",\"xpp\",\"XSkat\",\"YPL-1.0\",\"YPL-1.1\",\"Zed\",\"Zend-2.0\",\"Zimbra-1.3\",\"Zimbra-1.4\",\"Zlib\",\"zlib-acknowledgement\",\"ZPL-1.1\",\"ZPL-2.0\",\"ZPL-2.1\",\"BSD-3-Clause-No-Nuclear-License\",\"BSD-3-Clause-No-Nuclear-Warranty\",\"BSD-3-Clause-No-Nuclear-License-2014\",\"eCos-2.0\",\"GPL-2.0-with-autoconf-exception\",\"GPL-2.0-with-bison-exception\",\"GPL-2.0-with-classpath-exception\",\"GPL-2.0-with-font-exception\",\"GPL-2.0-with-GCC-exception\",\"GPL-3.0-with-autoconf-exception\",\"GPL-3.0-with-GCC-exception\",\"StandardML-NJ\",\"WXwindows\"]");
 
-/**
- * Returns true if the given value is effectively an empty string
- */
+/***/ }),
 
-utils.isEmptyString = function(val) {
-  return String(val) === '' || String(val) === './';
-};
+/***/ "../../node_modules/split-string/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Returns true if the platform is windows, or `path.sep` is `\\`.
- * This is defined as a function to allow `path.sep` to be set in unit tests,
- * or by the user, if there is a reason to do so.
- * @return {Boolean}
+"use strict";
+/*!
+ * split-string <https://github.com/jonschlinkert/split-string>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-utils.isWindows = function() {
-  return path.sep === '\\' || isWindows === true;
-};
-
-/**
- * Return the last element from an array
- */
 
-utils.last = function(arr, n) {
-  return arr[arr.length - (n || 1)];
-};
 
-/**
- * Get the `Snapdragon` instance to use
- */
+var extend = __webpack_require__("../../node_modules/split-string/node_modules/extend-shallow/index.js");
 
-utils.instantiate = function(ast, options) {
-  var snapdragon;
-  // if an instance was created by `.parse`, use that instance
-  if (utils.typeOf(ast) === 'object' && ast.snapdragon) {
-    snapdragon = ast.snapdragon;
-  // if the user supplies an instance on options, use that instance
-  } else if (utils.typeOf(options) === 'object' && options.snapdragon) {
-    snapdragon = options.snapdragon;
-  // create a new instance
-  } else {
-    snapdragon = new Snapdragon(options);
+module.exports = function(str, options, fn) {
+  if (typeof str !== 'string') {
+    throw new TypeError('expected a string');
   }
 
-  utils.define(snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.call(this, str, options);
-    parsed.input = str;
-
-    // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
-    if (last && this.options.strictErrors !== true) {
-      var open = last.nodes[0];
-      var inner = last.nodes[1];
-      if (last.type === 'bracket') {
-        if (inner.val.charAt(0) === '[') {
-          inner.val = '\\' + inner.val;
-        }
-
-      } else {
-        open.val = '\\' + open.val;
-        var sibling = open.parent.nodes[1];
-        if (sibling.type === 'star') {
-          sibling.loose = true;
-        }
-      }
-    }
-
-    // add non-enumerable parser reference
-    utils.define(parsed, 'parser', this.parser);
-    return parsed;
-  });
-
-  return snapdragon;
-};
-
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
-
-utils.createKey = function(pattern, options) {
-  if (typeof options === 'undefined') {
-    return pattern;
-  }
-  var key = pattern;
-  for (var prop in options) {
-    if (options.hasOwnProperty(prop)) {
-      key += ';' + prop + '=' + String(options[prop]);
-    }
+  if (typeof options === 'function') {
+    fn = options;
+    options = null;
   }
-  return key;
-};
-
-/**
- * Cast `val` to an array
- * @return {Array}
- */
-
-utils.arrayify = function(val) {
-  if (typeof val === 'string') return [val];
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
-
-/**
- * Return true if `val` is a non-empty string
- */
-
-utils.isString = function(val) {
-  return typeof val === 'string';
-};
-
-/**
- * Return true if `val` is a non-empty string
- */
-
-utils.isRegex = function(val) {
-  return utils.typeOf(val) === 'regexp';
-};
-
-/**
- * Return true if `val` is a non-empty string
- */
-
-utils.isObject = function(val) {
-  return utils.typeOf(val) === 'object';
-};
-
-/**
- * Escape regex characters in the given string
- */
-
-utils.escapeRegex = function(str) {
-  return str.replace(/[-[\]{}()^$|*+?.\\/\s]/g, '\\$&');
-};
-
-/**
- * Combines duplicate characters in the provided `input` string.
- * @param {String} `input`
- * @returns {String}
- */
-
-utils.combineDupes = function(input, patterns) {
-  patterns = utils.arrayify(patterns).join('|').split('|');
-  patterns = patterns.map(function(s) {
-    return s.replace(/\\?([+*\\/])/g, '\\$1');
-  });
-  var substr = patterns.join('|');
-  var regex = new RegExp('(' + substr + ')(?=\\1)', 'g');
-  return input.replace(regex, '');
-};
-
-/**
- * Returns true if the given `str` has special characters
- */
-
-utils.hasSpecialChars = function(str) {
-  return /(?:(?:(^|\/)[!.])|[*?+()|[\]{}]|[+@]\()/.test(str);
-};
-
-/**
- * Normalize slashes in the given filepath.
- *
- * @param {String} `filepath`
- * @return {String}
- */
-
-utils.toPosixPath = function(str) {
-  return str.replace(/\\+/g, '/');
-};
-
-/**
- * Strip backslashes before special characters in a string.
- *
- * @param {String} `str`
- * @return {String}
- */
-
-utils.unescape = function(str) {
-  return utils.toPosixPath(str.replace(/\\(?=[*+?!.])/g, ''));
-};
-
-/**
- * Strip the drive letter from a windows filepath
- * @param {String} `fp`
- * @return {String}
- */
-
-utils.stripDrive = function(fp) {
-  return utils.isWindows() ? fp.replace(/^[a-z]:[\\/]+?/i, '/') : fp;
-};
-
-/**
- * Strip the prefix from a filepath
- * @param {String} `fp`
- * @return {String}
- */
 
-utils.stripPrefix = function(str) {
-  if (str.charAt(0) === '.' && (str.charAt(1) === '/' || str.charAt(1) === '\\')) {
-    return str.slice(2);
+  // allow separator to be defined as a string
+  if (typeof options === 'string') {
+    options = { sep: options };
   }
-  return str;
-};
-
-/**
- * Returns true if `str` is a common character that doesn't need
- * to be processed to be used for matching.
- * @param {String} `str`
- * @return {Boolean}
- */
-
-utils.isSimpleChar = function(str) {
-  return str.trim() === '' || str === '.';
-};
-
-/**
- * Returns true if the given str is an escaped or
- * unescaped path character
- */
-
-utils.isSlash = function(str) {
-  return str === '/' || str === '\\/' || str === '\\' || str === '\\\\';
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern matches or contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
-
-utils.matchPath = function(pattern, options) {
-  return (options && options.contains)
-    ? utils.containsPattern(pattern, options)
-    : utils.equalsPattern(pattern, options);
-};
-
-/**
- * Returns true if the given (original) filepath or unixified path are equal
- * to the given pattern.
- */
-
-utils._equals = function(filepath, unixPath, pattern) {
-  return pattern === filepath || pattern === unixPath;
-};
-
-/**
- * Returns true if the given (original) filepath or unixified path contain
- * the given pattern.
- */
 
-utils._contains = function(filepath, unixPath, pattern) {
-  return filepath.indexOf(pattern) !== -1 || unixPath.indexOf(pattern) !== -1;
-};
+  var opts = extend({sep: '.'}, options);
+  var quotes = opts.quotes || ['"', "'", '`'];
+  var brackets;
 
-/**
- * Returns a function that returns true if the given
- * pattern is the same as a given `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
+  if (opts.brackets === true) {
+    brackets = {
+      '<': '>',
+      '(': ')',
+      '[': ']',
+      '{': '}'
+    };
+  } else if (opts.brackets) {
+    brackets = opts.brackets;
+  }
 
-utils.equalsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
+  var tokens = [];
+  var stack = [];
+  var arr = [''];
+  var sep = opts.sep;
+  var len = str.length;
+  var idx = -1;
+  var closeIdx;
 
-  return function fn(filepath) {
-    var equal = utils._equals(filepath, unixify(filepath), pattern);
-    if (equal === true || options.nocase !== true) {
-      return equal;
+  function expected() {
+    if (brackets && stack.length) {
+      return brackets[stack[stack.length - 1]];
     }
-    var lower = filepath.toLowerCase();
-    return utils._equals(lower, unixify(lower), pattern);
-  };
-};
-
-/**
- * Returns a function that returns true if the given
- * pattern contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
+  }
 
-utils.containsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
+  while (++idx < len) {
+    var ch = str[idx];
+    var next = str[idx + 1];
+    var tok = { val: ch, idx: idx, arr: arr, str: str };
+    tokens.push(tok);
 
-  return function(filepath) {
-    var contains = utils._contains(filepath, unixify(filepath), pattern);
-    if (contains === true || options.nocase !== true) {
-      return contains;
+    if (ch === '\\') {
+      tok.val = keepEscaping(opts, str, idx) === true ? (ch + next) : next;
+      tok.escaped = true;
+      if (typeof fn === 'function') {
+        fn(tok);
+      }
+      arr[arr.length - 1] += tok.val;
+      idx++;
+      continue;
     }
-    var lower = filepath.toLowerCase();
-    return utils._contains(lower, unixify(lower), pattern);
-  };
-};
-
-/**
- * Returns a function that returns true if the given
- * regex matches the `filename` of a file path.
- *
- * @param {RegExp} `re` Matching regex
- * @return {Function}
- */
-
-utils.matchBasename = function(re) {
-  return function(filepath) {
-    return re.test(filepath) || re.test(path.basename(filepath));
-  };
-};
-
-/**
- * Returns the given value unchanced.
- * @return {any}
- */
-
-utils.identity = function(val) {
-  return val;
-};
-
-/**
- * Determines the filepath to return based on the provided options.
- * @return {any}
- */
-
-utils.value = function(str, unixify, options) {
-  if (options && options.unixify === false) {
-    return str;
-  }
-  if (options && typeof options.unixify === 'function') {
-    return options.unixify(str);
-  }
-  return unixify(str);
-};
 
-/**
- * Returns a function that normalizes slashes in a string to forward
- * slashes, strips `./` from beginning of paths, and optionally unescapes
- * special characters.
- * @return {Function}
- */
+    if (brackets && brackets[ch]) {
+      stack.push(ch);
+      var e = expected();
+      var i = idx + 1;
 
-utils.unixify = function(options) {
-  var opts = options || {};
-  return function(filepath) {
-    if (opts.stripPrefix !== false) {
-      filepath = utils.stripPrefix(filepath);
-    }
-    if (opts.unescape === true) {
-      filepath = utils.unescape(filepath);
-    }
-    if (opts.unixify === true || utils.isWindows()) {
-      filepath = utils.toPosixPath(filepath);
-    }
-    return filepath;
-  };
-};
+      if (str.indexOf(e, i + 1) !== -1) {
+        while (stack.length && i < len) {
+          var s = str[++i];
+          if (s === '\\') {
+            s++;
+            continue;
+          }
 
+          if (quotes.indexOf(s) !== -1) {
+            i = getClosingQuote(str, s, i + 1);
+            continue;
+          }
 
-/***/ }),
-/* 709 */
-/***/ (function(module, exports, __webpack_require__) {
+          e = expected();
+          if (stack.length && str.indexOf(e, i + 1) === -1) {
+            break;
+          }
 
-var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * is-windows <https://github.com/jonschlinkert/is-windows>
- *
- * Copyright © 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
+          if (brackets[s]) {
+            stack.push(s);
+            continue;
+          }
 
-(function(factory) {
-  if (exports && typeof exports === 'object' && typeof module !== 'undefined') {
-    module.exports = factory();
-  } else if (true) {
-    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
-				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-  } else {}
-})(function() {
-  'use strict';
-  return function isWindows() {
-    return process && (process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE));
-  };
-});
+          if (e === s) {
+            stack.pop();
+          }
+        }
+      }
 
+      closeIdx = i;
+      if (closeIdx === -1) {
+        arr[arr.length - 1] += ch;
+        continue;
+      }
 
-/***/ }),
-/* 710 */
-/***/ (function(module, exports, __webpack_require__) {
+      ch = str.slice(idx, closeIdx + 1);
+      tok.val = ch;
+      tok.idx = idx = closeIdx;
+    }
 
-"use strict";
-/*!
- * define-property <https://github.com/jonschlinkert/define-property>
- *
- * Copyright (c) 2015-2018, Jon Schlinkert.
- * Released under the MIT License.
- */
+    if (quotes.indexOf(ch) !== -1) {
+      closeIdx = getClosingQuote(str, ch, idx + 1);
+      if (closeIdx === -1) {
+        arr[arr.length - 1] += ch;
+        continue;
+      }
 
+      if (keepQuotes(ch, opts) === true) {
+        ch = str.slice(idx, closeIdx + 1);
+      } else {
+        ch = str.slice(idx + 1, closeIdx);
+      }
 
+      tok.val = ch;
+      tok.idx = idx = closeIdx;
+    }
 
-var isobject = __webpack_require__(592);
-var isDescriptor = __webpack_require__(593);
-var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
-  ? Reflect.defineProperty
-  : Object.defineProperty;
+    if (typeof fn === 'function') {
+      fn(tok, tokens);
+      ch = tok.val;
+      idx = tok.idx;
+    }
 
-module.exports = function defineProperty(obj, key, val) {
-  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
-    throw new TypeError('expected an object, function, or array');
-  }
+    if (tok.val === sep && tok.split !== false) {
+      arr.push('');
+      continue;
+    }
 
-  if (typeof key !== 'string') {
-    throw new TypeError('expected "key" to be a string');
+    arr[arr.length - 1] += tok.val;
   }
 
-  if (isDescriptor(val)) {
-    define(obj, key, val);
-    return obj;
+  return arr;
+};
+
+function getClosingQuote(str, ch, i, brackets) {
+  var idx = str.indexOf(ch, i);
+  if (str.charAt(idx - 1) === '\\') {
+    return getClosingQuote(str, ch, idx + 1);
   }
+  return idx;
+}
 
-  define(obj, key, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
+function keepQuotes(ch, opts) {
+  if (opts.keepDoubleQuotes === true && ch === '"') return true;
+  if (opts.keepSingleQuotes === true && ch === "'") return true;
+  return opts.keepQuotes;
+}
 
-  return obj;
-};
+function keepEscaping(opts, str, idx) {
+  if (typeof opts.keepEscaping === 'function') {
+    return opts.keepEscaping(str, idx);
+  }
+  return opts.keepEscaping === true || str[idx + 1] === '\\';
+}
 
 
 /***/ }),
-/* 711 */
+
+/***/ "../../node_modules/split-string/node_modules/extend-shallow/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/*!
- * arr-diff <https://github.com/jonschlinkert/arr-diff>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
 
 
+var isExtendable = __webpack_require__("../../node_modules/split-string/node_modules/is-extendable/index.js");
+var assignSymbols = __webpack_require__("../../node_modules/assign-symbols/index.js");
 
-module.exports = function diff(arr/*, arrays*/) {
-  var len = arguments.length;
-  var idx = 0;
-  while (++idx < len) {
-    arr = diffArray(arr, arguments[idx]);
+module.exports = Object.assign || function(obj/*, objects*/) {
+  if (obj === null || typeof obj === 'undefined') {
+    throw new TypeError('Cannot convert undefined or null to object');
   }
-  return arr;
+  if (!isObject(obj)) {
+    obj = {};
+  }
+  for (var i = 1; i < arguments.length; i++) {
+    var val = arguments[i];
+    if (isString(val)) {
+      val = toObject(val);
+    }
+    if (isObject(val)) {
+      assign(obj, val);
+      assignSymbols(obj, val);
+    }
+  }
+  return obj;
 };
 
-function diffArray(one, two) {
-  if (!Array.isArray(two)) {
-    return one.slice();
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
   }
+}
 
-  var tlen = two.length
-  var olen = one.length;
-  var idx = -1;
-  var arr = [];
+function isString(val) {
+  return (val && typeof val === 'string');
+}
 
-  while (++idx < olen) {
-    var ele = one[idx];
+function toObject(str) {
+  var obj = {};
+  for (var i in str) {
+    obj[i] = str[i];
+  }
+  return obj;
+}
 
-    var hasEle = false;
-    for (var i = 0; i < tlen; i++) {
-      var val = two[i];
+function isObject(val) {
+  return (val && typeof val === 'object') || isExtendable(val);
+}
 
-      if (ele === val) {
-        hasEle = true;
-        break;
-      }
-    }
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-    if (hasEle === false) {
-      arr.push(ele);
-    }
-  }
-  return arr;
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
+
+function isEnum(obj, key) {
+  return Object.prototype.propertyIsEnumerable.call(obj, key);
 }
 
 
 /***/ }),
-/* 712 */
+
+/***/ "../../node_modules/split-string/node_modules/is-extendable/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 /*!
- * object.pick <https://github.com/jonschlinkert/object.pick>
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
  *
- * Copyright (c) 2014-2015 Jon Schlinkert, contributors.
- * Licensed under the MIT License
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
 
 
-var isObject = __webpack_require__(592);
-
-module.exports = function pick(obj, keys) {
-  if (!isObject(obj) && typeof obj !== 'function') {
-    return {};
-  }
-
-  var res = {};
-  if (typeof keys === 'string') {
-    if (keys in obj) {
-      res[keys] = obj[keys];
-    }
-    return res;
-  }
-
-  var len = keys.length;
-  var idx = -1;
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
 
-  while (++idx < len) {
-    var key = keys[idx];
-    if (key in obj) {
-      res[key] = obj[key];
-    }
-  }
-  return res;
+module.exports = function isExtendable(val) {
+  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
 };
 
 
 /***/ }),
-/* 713 */
+
+/***/ "../../node_modules/static-extend/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-
-/**
- * Module dependencies
+/*!
+ * static-extend <https://github.com/jonschlinkert/static-extend>
+ *
+ * Copyright (c) 2016, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
-var extend = __webpack_require__(643);
-var unique = __webpack_require__(604);
-var toRegex = __webpack_require__(584);
 
-/**
- * Local dependencies
- */
 
-var compilers = __webpack_require__(714);
-var parsers = __webpack_require__(720);
-var Extglob = __webpack_require__(723);
-var utils = __webpack_require__(722);
-var MAX_LENGTH = 1024 * 64;
+var copy = __webpack_require__("../../node_modules/object-copy/index.js");
+var define = __webpack_require__("../../node_modules/define-property/index.js");
+var util = __webpack_require__("util");
 
 /**
- * Convert the given `extglob` pattern into a regex-compatible string. Returns
- * an object with the compiled result and the parsed AST.
+ * Returns a function for extending the static properties,
+ * prototype properties, and descriptors from the `Parent`
+ * constructor onto `Child` constructors.
  *
  * ```js
- * var extglob = require('extglob');
- * console.log(extglob('*.!(*a)'));
- * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
-
-function extglob(pattern, options) {
-  return extglob.create(pattern, options).output;
-}
-
-/**
- * Takes an array of strings and an extglob pattern and returns a new
- * array that contains only the strings that match the pattern.
+ * var extend = require('static-extend');
+ * Parent.extend = extend(Parent);
  *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob.match(['a.a', 'a.b', 'a.c'], '*.!(*a)'));
- * //=> ['a.b', 'a.c']
+ * // optionally pass a custom merge function as the second arg
+ * Parent.extend = extend(Parent, function(Child) {
+ *   Child.prototype.mixin = function(key, val) {
+ *     Child.prototype[key] = val;
+ *   };
+ * });
+ *
+ * // extend "child" constructors
+ * Parent.extend(Child);
+ *
+ * // optionally define prototype methods as the second arg
+ * Parent.extend(Child, {
+ *   foo: function() {},
+ *   bar: function() {}
+ * });
  * ```
- * @param {Array} `list` Array of strings to match
- * @param {String} `pattern` Extglob pattern
- * @param {Object} `options`
- * @return {Array} Returns an array of matches
+ * @param {Function} `Parent` Parent ctor
+ * @param {Function} `extendFn` Optional extend function for handling any necessary custom merging. Useful when updating methods that require a specific prototype.
+ *   @param {Function} `Child` Child ctor
+ *   @param {Object} `proto` Optionally pass additional prototype properties to inherit.
+ *   @return {Object}
  * @api public
  */
 
-extglob.match = function(list, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
+function extend(Parent, extendFn) {
+  if (typeof Parent !== 'function') {
+    throw new TypeError('expected Parent to be a function.');
   }
 
-  list = utils.arrayify(list);
-  var isMatch = extglob.matcher(pattern, options);
-  var len = list.length;
-  var idx = -1;
-  var matches = [];
+  return function(Ctor, proto) {
+    if (typeof Ctor !== 'function') {
+      throw new TypeError('expected Ctor to be a function.');
+    }
 
-  while (++idx < len) {
-    var ele = list[idx];
+    util.inherits(Ctor, Parent);
+    copy(Ctor, Parent);
 
-    if (isMatch(ele)) {
-      matches.push(ele);
+    // proto can be null or a plain object
+    if (typeof proto === 'object') {
+      var obj = Object.create(proto);
+
+      for (var k in obj) {
+        Ctor.prototype[k] = obj[k];
+      }
     }
-  }
 
-  // if no options were passed, uniquify results and return
-  if (typeof options === 'undefined') {
-    return unique(matches);
-  }
+    // keep a reference to the parent prototype
+    define(Ctor.prototype, '_parent_', {
+      configurable: true,
+      set: function() {},
+      get: function() {
+        return Parent.prototype;
+      }
+    });
 
-  if (matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
-    if (options.nonull === true || options.nullglob === true) {
-      return [pattern.split('\\').join('')];
+    if (typeof extendFn === 'function') {
+      extendFn(Ctor, Parent);
     }
-  }
 
-  return options.nodupes !== false ? unique(matches) : matches;
+    Ctor.extend = extend(Ctor, extendFn);
+  };
 };
 
 /**
- * Returns true if the specified `string` matches the given
- * extglob `pattern`.
- *
- * ```js
- * var extglob = require('extglob');
- *
- * console.log(extglob.isMatch('a.a', '*.!(*a)'));
- * //=> false
- * console.log(extglob.isMatch('a.b', '*.!(*a)'));
- * //=> true
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` Extglob pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
+ * Expose `extend`
  */
 
-extglob.isMatch = function(str, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
+module.exports = extend;
 
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
 
-  if (pattern === str) {
-    return true;
-  }
+/***/ }),
 
-  if (pattern === '' || pattern === ' ' || pattern === '.') {
-    return pattern === str;
-  }
+/***/ "../../node_modules/strip-ansi/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  var isMatch = utils.memoize('isMatch', pattern, options, extglob.matcher);
-  return isMatch(str);
-};
+"use strict";
 
-/**
- * Returns true if the given `string` contains the given pattern. Similar to `.isMatch` but
- * the pattern can match any part of the string.
- *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob.contains('aa/bb/cc', '*b'));
- * //=> true
- * console.log(extglob.contains('aa/bb/cc', '*d'));
- * //=> false
- * ```
- * @param {String} `str` The string to match.
- * @param {String} `pattern` Glob pattern to use for matching.
- * @param {Object} `options`
- * @return {Boolean} Returns true if the patter matches any part of `str`.
- * @api public
- */
+const ansiRegex = __webpack_require__("../../node_modules/ansi-regex/index.js");
 
-extglob.contains = function(str, pattern, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('expected a string');
-  }
+module.exports = string => typeof string === 'string' ? string.replace(ansiRegex(), '') : string;
 
-  if (pattern === '' || pattern === ' ' || pattern === '.') {
-    return pattern === str;
-  }
 
-  var opts = extend({}, options, {contains: true});
-  opts.strictClose = false;
-  opts.strictOpen = false;
-  return extglob.isMatch(str, pattern, opts);
+/***/ }),
+
+/***/ "../../node_modules/strip-bom/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof string}`);
+	}
+
+	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
+	// conversion translates it to FEFF (UTF-16 BOM)
+	if (string.charCodeAt(0) === 0xFEFF) {
+		return string.slice(1);
+	}
+
+	return string;
 };
 
-/**
- * Takes an extglob pattern and returns a matcher function. The returned
- * function takes the string to match as its only argument.
- *
- * ```js
- * var extglob = require('extglob');
- * var isMatch = extglob.matcher('*.!(*a)');
- *
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.b'));
- * //=> true
- * ```
- * @param {String} `pattern` Extglob pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
 
-extglob.matcher = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
+/***/ }),
 
-  function matcher() {
-    var re = extglob.makeRe(pattern, options);
-    return function(str) {
-      return re.test(str);
-    };
-  }
+/***/ "../../node_modules/strip-final-newline/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  return utils.memoize('matcher', pattern, options, matcher);
+"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);
+	}
+
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, input.length - 1);
+	}
+
+	return input;
 };
 
-/**
- * Convert the given `extglob` pattern into a regex-compatible string. Returns
- * an object with the compiled result and the parsed AST.
- *
- * ```js
- * var extglob = require('extglob');
- * console.log(extglob.create('*.!(*a)').output);
- * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
- * ```
- * @param {String} `str`
- * @param {Object} `options`
- * @return {String}
- * @api public
- */
 
-extglob.create = function(pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
+/***/ }),
+
+/***/ "../../node_modules/strong-log-transformer/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+// 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__("../../node_modules/strong-log-transformer/lib/logger.js");
+module.exports.cli = __webpack_require__("../../node_modules/strong-log-transformer/lib/cli.js");
+
 
-  function create() {
-    var ext = new Extglob(options);
-    var ast = ext.parse(pattern, options);
-    return ext.compile(ast, options);
-  }
+/***/ }),
 
-  return utils.memoize('create', pattern, options, create);
-};
+/***/ "../../node_modules/strong-log-transformer/lib/cli.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Returns an array of matches captured by `pattern` in `string`, or `null`
- * if the pattern did not match.
- *
- * ```js
- * var extglob = require('extglob');
- * extglob.capture(pattern, string[, options]);
- *
- * console.log(extglob.capture('test/*.js', 'test/foo.js'));
- * //=> ['foo']
- * console.log(extglob.capture('test/*.js', 'foo/bar.css'));
- * //=> null
- * ```
- * @param {String} `pattern` Glob pattern to use for matching.
- * @param {String} `string` 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 string matches the glob pattern, otherwise `null`.
- * @api public
- */
+"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
 
-extglob.capture = function(pattern, str, options) {
-  var re = extglob.makeRe(pattern, extend({capture: true}, options));
 
-  function match() {
-    return function(string) {
-      var match = re.exec(string);
-      if (!match) {
-        return null;
-      }
 
-      return match.slice(1);
-    };
-  }
+var minimist = __webpack_require__("../../node_modules/minimist/index.js");
+var path = __webpack_require__("path");
 
-  var capture = utils.memoize('capture', pattern, options, match);
-  return capture(str);
-};
+var Logger = __webpack_require__("../../node_modules/strong-log-transformer/lib/logger.js");
+var pkg = __webpack_require__("../../node_modules/strong-log-transformer/package.json");
 
-/**
- * Create a regular expression from the given `pattern` and `options`.
- *
- * ```js
- * var extglob = require('extglob');
- * var re = extglob.makeRe('*.!(*a)');
- * console.log(re);
- * //=> /^[^\/]*?\.(?![^\/]*?a)[^\/]*?$/
- * ```
- * @param {String} `pattern` The pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
+module.exports = cli;
 
-extglob.makeRe = function(pattern, options) {
-  if (pattern instanceof RegExp) {
-    return pattern;
+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 (typeof pattern !== 'string') {
-    throw new TypeError('expected pattern to be a string');
-  }
+function version($0, p) {
+  p('%s v%s', pkg.name, pkg.version);
+}
 
-  if (pattern.length > MAX_LENGTH) {
-    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
+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 makeRe() {
-    var opts = extend({strictErrors: false}, options);
-    if (opts.strictErrors === true) opts.strict = true;
-    var res = extglob.create(pattern, opts);
-    return toRegex(res.output, opts);
+  function boolOpt(name, def) {
+    name = name + PADDING.slice(0, 20-name.length);
+    p('   --%s default: %s', name, def);
   }
 
-  var regex = utils.memoize('makeRe', pattern, options, makeRe);
-  if (regex.source.length > MAX_LENGTH) {
-    throw new SyntaxError('potentially malicious regex detected');
+  function stdOpt(name, def) {
+    var value = name.toUpperCase() +
+                PADDING.slice(0, 19 - name.length*2);
+    p('   --%s %s default: %j', name, value, def);
   }
+}
 
-  return regex;
-};
-
-/**
- * Cache
- */
 
-extglob.cache = utils.cache;
-extglob.clearCache = function() {
-  extglob.cache.__data__ = {};
-};
+/***/ }),
 
-/**
- * Expose `Extglob` constructor, parsers and compilers
- */
+/***/ "../../node_modules/strong-log-transformer/lib/logger.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-extglob.Extglob = Extglob;
-extglob.compilers = compilers;
-extglob.parsers = parsers;
+"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
 
-/**
- * Expose `extglob`
- * @type {Function}
- */
 
-module.exports = extglob;
 
+var stream = __webpack_require__("stream");
+var util = __webpack_require__("util");
+var fs = __webpack_require__("fs");
 
-/***/ }),
-/* 714 */
-/***/ (function(module, exports, __webpack_require__) {
+var through = __webpack_require__("../../node_modules/through/index.js");
+var duplexer = __webpack_require__("../../node_modules/duplexer/index.js");
+var StringDecoder = __webpack_require__("string_decoder").StringDecoder;
 
-"use strict";
+module.exports = Logger;
 
+Logger.DEFAULTS = {
+  format: 'text',
+  tag: '',
+  mergeMultiline: false,
+  timeStamp: false,
+};
 
-var brackets = __webpack_require__(715);
+var formatters = {
+  text: textFormatter,
+  json: jsonFormatter,
+}
 
-/**
- * Extglob compilers
- */
+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(),
+  ];
 
-module.exports = function(extglob) {
-  function star() {
-    if (typeof extglob.options.star === 'function') {
-      return extglob.options.star.apply(this, arguments);
-    }
-    if (typeof extglob.options.star === 'string') {
-      return extglob.options.star;
-    }
-    return '.*?';
+  if (options.tag) {
+    transforms.push(staticTagger(options.tag));
   }
 
-  /**
-   * Use `expand-brackets` compilers
-   */
+  if (options.mergeMultiline) {
+    transforms.push(lineMerger());
+  }
 
-  extglob.use(brackets.compilers);
-  extglob.compiler
+  // TODO
+  // if (options.pidStamp) {
+  //   transforms.push(pidStamper(options.pid));
+  // }
 
-    /**
-     * Escaped: "\\*"
-     */
+  // TODO
+  // if (options.workerStamp) {
+  //   transforms.push(workerStamper(options.worker));
+  // }
 
-    .set('escape', function(node) {
-      return this.emit(node.val, node);
-    })
+  transforms.push(formatters[options.format](options));
 
-    /**
-     * Dot: "."
-     */
+  // restore line endings that were removed by line splitting
+  transforms.push(reLiner());
 
-    .set('dot', function(node) {
-      return this.emit('\\' + node.val, node);
-    })
+  for (var t in transforms) {
+    emitter = emitter.pipe(transforms[t]);
+  }
 
-    /**
-     * Question mark: "?"
-     */
+  return duplexer(catcher, emitter);
+}
 
-    .set('qmark', function(node) {
-      var val = '[^\\\\/.]';
-      var prev = this.prev();
+function deLiner() {
+  var decoder = new StringDecoder('utf8');
+  var last = '';
 
-      if (node.parsed.slice(-1) === '(') {
-        var ch = node.rest.charAt(0);
-        if (ch !== '!' && ch !== '=' && ch !== ':') {
-          return this.emit(val, node);
+  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]);
         }
-        return this.emit(node.val, node);
       }
-
-      if (prev.type === 'text' && prev.val) {
-        return this.emit(val, node);
-      }
-
-      if (node.val.length > 1) {
-        val += '{' + node.val.length + '}';
+      callback();
+    },
+    flush(callback) {
+      // incomplete UTF8 sequences become UTF8 replacement characters
+      last += decoder.end();
+      if (last) {
+        this.push(last);
       }
-      return this.emit(val, node);
-    })
+      callback();
+    },
+  });
+}
 
-    /**
-     * Plus: "+"
-     */
+function reLiner() {
+  return through(appendNewline);
 
-    .set('plus', function(node) {
-      var prev = node.parsed.slice(-1);
-      if (prev === ']' || prev === ')') {
-        return this.emit(node.val, node);
-      }
-      var ch = this.output.slice(-1);
-      if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
-        return this.emit('\\+', node);
-      }
-      if (/\w/.test(ch) && !node.inside) {
-        return this.emit('+\\+?', node);
-      }
-      return this.emit('+', node);
-    })
+  function appendNewline(line) {
+    this.emit('data', line + '\n');
+  }
+}
 
-    /**
-     * Star: "*"
-     */
+function objectifier() {
+  return through(objectify, null, {autoDestroy: false});
 
-    .set('star', function(node) {
-      var prev = this.prev();
-      var prefix = prev.type !== 'text' && prev.type !== 'escape'
-        ? '(?!\\.)'
-        : '';
+  function objectify(line) {
+    this.emit('data', {
+      msg: line,
+      time: Date.now(),
+    });
+  }
+}
 
-      return this.emit(prefix + star.call(this, node), node);
-    })
+function staticTagger(tag) {
+  return through(tagger);
 
-    /**
-     * Parens
-     */
+  function tagger(logEvent) {
+    logEvent.tag = tag;
+    this.emit('data', logEvent);
+  }
+}
 
-    .set('paren', function(node) {
-      return this.mapVisit(node.nodes);
-    })
-    .set('paren.open', function(node) {
-      var capture = this.options.capture ? '(' : '';
+function textFormatter(options) {
+  return through(textify);
 
-      switch (node.parent.prefix) {
-        case '!':
-        case '^':
-          return this.emit(capture + '(?:(?!(?:', node);
-        case '*':
-        case '+':
-        case '?':
-        case '@':
-          return this.emit(capture + '(?:', node);
-        default: {
-          var val = node.val;
-          if (this.options.bash === true) {
-            val = '\\' + val;
-          } else if (!this.options.capture && val === '(' && node.parent.rest[0] !== '?') {
-            val += '?:';
-          }
+  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'));
+  }
 
-          return this.emit(val, node);
-        }
+  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] + ' ';
       }
-    })
-    .set('paren.close', function(node) {
-      var capture = this.options.capture ? ')' : '';
+    }
+    return str;
+  }
+}
 
-      switch (node.prefix) {
-        case '!':
-        case '^':
-          var prefix = /^(\)|$)/.test(node.rest) ? '$' : '';
-          var str = star.call(this, node);
+function jsonFormatter(options) {
+  return through(jsonify);
 
-          // if the extglob has a slash explicitly defined, we know the user wants
-          // to match slashes, so we need to ensure the "star" regex allows for it
-          if (node.parent.hasSlash && !this.options.star && this.options.slash !== false) {
-            str = '.*?';
-          }
+  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));
+  }
+}
 
-          return this.emit(prefix + ('))' + str + ')') + capture, node);
-        case '*':
-        case '+':
-        case '?':
-          return this.emit(')' + node.prefix + capture, node);
-        case '@':
-          return this.emit(')' + capture, node);
-        default: {
-          var val = (this.options.bash === true ? '\\' : '') + ')';
-          return this.emit(val, node);
-        }
+function lineMerger(host) {
+  var previousLine = null;
+  var flushTimer = null;
+  var stream = through(lineMergerWrite, lineMergerEnd);
+  var flush = _flush.bind(stream);
+
+  return stream;
+
+  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);
+  }
 
-    /**
-     * Text
-     */
+  function _flush() {
+    if (previousLine) {
+      this.emit('data', previousLine);
+      previousLine = null;
+    }
+  }
 
-    .set('text', function(node) {
-      var val = node.val.replace(/[\[\]]/g, '\\$&');
-      return this.emit(val, node);
-    });
-};
+  function lineMergerEnd() {
+    flush.call(this);
+    this.emit('end');
+  }
+}
 
 
 /***/ }),
-/* 715 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/strong-log-transformer/package.json":
+/***/ (function(module) {
 
+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\"}}");
 
-/**
- * Local dependencies
- */
+/***/ }),
 
-var compilers = __webpack_require__(716);
-var parsers = __webpack_require__(718);
+/***/ "../../node_modules/supports-color/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Module dependencies
- */
+"use strict";
 
-var debug = __webpack_require__(205)('expand-brackets');
-var extend = __webpack_require__(643);
-var Snapdragon = __webpack_require__(628);
-var toRegex = __webpack_require__(584);
+const os = __webpack_require__("os");
+const tty = __webpack_require__("tty");
+const hasFlag = __webpack_require__("../../node_modules/has-flag/index.js");
 
-/**
- * Parses the given POSIX character class `pattern` and returns a
- * string that can be used for creating regular expressions for matching.
- *
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object}
- * @api public
- */
+const {env} = process;
 
-function brackets(pattern, options) {
-  debug('initializing from <%s>', __filename);
-  var res = brackets.create(pattern, options);
-  return res.output;
+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;
 }
 
-/**
- * Takes an array of strings and a POSIX character class pattern, and returns a new
- * array with only the strings that matched the pattern.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * console.log(brackets.match(['1', 'a', 'ab'], '[[:alpha:]]'));
- * //=> ['a']
- *
- * console.log(brackets.match(['1', 'a', 'ab'], '[[:alpha:]]+'));
- * //=> ['a', 'ab']
- * ```
- * @param {Array} `arr` Array of strings to match
- * @param {String} `pattern` POSIX character class pattern(s)
- * @param {Object} `options`
- * @return {Array}
- * @api public
- */
+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);
+	}
+}
+
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
+
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
 
-brackets.match = function(arr, pattern, options) {
-  arr = [].concat(arr);
-  var opts = extend({}, options);
-  var isMatch = brackets.matcher(pattern, opts);
-  var len = arr.length;
-  var idx = -1;
-  var res = [];
+function supportsColor(haveStream, streamIsTTY) {
+	if (forceColor === 0) {
+		return 0;
+	}
 
-  while (++idx < len) {
-    var ele = arr[idx];
-    if (isMatch(ele)) {
-      res.push(ele);
-    }
-  }
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
-  if (res.length === 0) {
-    if (opts.failglob === true) {
-      throw new Error('no matches found for "' + pattern + '"');
-    }
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-    if (opts.nonull === true || opts.nullglob === true) {
-      return [pattern.split('\\').join('')];
-    }
-  }
-  return res;
-};
+	if (haveStream && !streamIsTTY && forceColor === undefined) {
+		return 0;
+	}
 
-/**
- * Returns true if the specified `string` matches the given
- * brackets `pattern`.
- *
- * ```js
- * var brackets = require('expand-brackets');
- *
- * console.log(brackets.isMatch('a.a', '[[:alpha:]].[[:alpha:]]'));
- * //=> true
- * console.log(brackets.isMatch('1.2', '[[:alpha:]].[[:alpha:]]'));
- * //=> false
- * ```
- * @param {String} `string` String to match
- * @param {String} `pattern` Poxis pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
+	const min = forceColor || 0;
 
-brackets.isMatch = function(str, pattern, options) {
-  return brackets.matcher(pattern, options)(str);
-};
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
-/**
- * Takes a POSIX character class pattern and returns a matcher function. The returned
- * function takes the string to match as its only argument.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * var isMatch = brackets.matcher('[[:lower:]].[[:upper:]]');
- *
- * console.log(isMatch('a.a'));
- * //=> false
- * console.log(isMatch('a.A'));
- * //=> true
- * ```
- * @param {String} `pattern` Poxis pattern
- * @param {String} `options`
- * @return {Boolean}
- * @api public
- */
+	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;
+		}
 
-brackets.matcher = function(pattern, options) {
-  var re = brackets.makeRe(pattern, options);
-  return function(str) {
-    return re.test(str);
-  };
-};
+		return 1;
+	}
 
-/**
- * Create a regular expression from the given `pattern`.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * var re = brackets.makeRe('[[:alpha:]]');
- * console.log(re);
- * //=> /^(?:[a-zA-Z])$/
- * ```
- * @param {String} `pattern` The pattern to convert to regex.
- * @param {Object} `options`
- * @return {RegExp}
- * @api public
- */
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
-brackets.makeRe = function(pattern, options) {
-  var res = brackets.create(pattern, options);
-  var opts = extend({strictErrors: false}, options);
-  return toRegex(res.output, opts);
-};
+		return min;
+	}
 
-/**
- * Parses the given POSIX character class `pattern` and returns an object
- * with the compiled `output` and optional source `map`.
- *
- * ```js
- * var brackets = require('expand-brackets');
- * console.log(brackets('[[:alpha:]]'));
- * // { options: { source: 'string' },
- * //   input: '[[:alpha:]]',
- * //   state: {},
- * //   compilers:
- * //    { eos: [Function],
- * //      noop: [Function],
- * //      bos: [Function],
- * //      not: [Function],
- * //      escape: [Function],
- * //      text: [Function],
- * //      posix: [Function],
- * //      bracket: [Function],
- * //      'bracket.open': [Function],
- * //      'bracket.inner': [Function],
- * //      'bracket.literal': [Function],
- * //      'bracket.close': [Function] },
- * //   output: '[a-zA-Z]',
- * //   ast:
- * //    { type: 'root',
- * //      errors: [],
- * //      nodes: [ [Object], [Object], [Object] ] },
- * //   parsingErrors: [] }
- * ```
- * @param {String} `pattern`
- * @param {Object} `options`
- * @return {Object}
- * @api public
- */
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
-brackets.create = function(pattern, options) {
-  var snapdragon = (options && options.snapdragon) || new Snapdragon(options);
-  compilers(snapdragon);
-  parsers(snapdragon);
+	if ('GITHUB_ACTIONS' in env) {
+		return 1;
+	}
 
-  var ast = snapdragon.parse(pattern, options);
-  ast.input = pattern;
-  var res = snapdragon.compile(ast, options);
-  res.input = pattern;
-  return res;
-};
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
-/**
- * Expose `brackets` constructor, parsers and compilers
- */
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-brackets.compilers = compilers;
-brackets.parsers = parsers;
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
 
-/**
- * Expose `brackets`
- * @type {Function}
- */
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
 
-module.exports = brackets;
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
+	if ('COLORTERM' in env) {
+		return 1;
+	}
 
-/***/ }),
-/* 716 */
-/***/ (function(module, exports, __webpack_require__) {
+	return min;
+}
 
-"use strict";
+function getSupportLevel(stream) {
+	const level = supportsColor(stream, stream && stream.isTTY);
+	return translateLevel(level);
+}
 
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+	stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+};
 
-var posix = __webpack_require__(717);
 
-module.exports = function(brackets) {
-  brackets.compiler
+/***/ }),
 
-    /**
-     * Escaped characters
-     */
+/***/ "../../node_modules/through/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    .set('escape', function(node) {
-      return this.emit('\\' + node.val.replace(/^\\/, ''), node);
-    })
+var Stream = __webpack_require__("stream")
 
-    /**
-     * Text
-     */
+// 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)
 
-    .set('text', function(node) {
-      return this.emit(node.val.replace(/([{}])/g, '\\$1'), node);
-    })
+exports = module.exports = through
+through.through = through
 
-    /**
-     * POSIX character classes
-     */
+//create a readable writable stream.
 
-    .set('posix', function(node) {
-      if (node.val === '[::]') {
-        return this.emit('\\[::\\]', node);
-      }
+function through (write, end, opts) {
+  write = write || function (data) { this.queue(data) }
+  end = end || function () { this.queue(null) }
 
-      var val = posix[node.inner];
-      if (typeof val === 'undefined') {
-        val = '[' + node.inner + ']';
-      }
-      return this.emit(val, node);
-    })
+  var ended = false, destroyed = false, buffer = [], _ended = false
+  var stream = new Stream()
+  stream.readable = stream.writable = true
+  stream.paused = false
 
-    /**
-     * Non-posix brackets
-     */
+//  stream.autoPause   = !(opts && opts.autoPause   === false)
+  stream.autoDestroy = !(opts && opts.autoDestroy === false)
 
-    .set('bracket', function(node) {
-      return this.mapVisit(node.nodes);
-    })
-    .set('bracket.open', function(node) {
-      return this.emit(node.val, node);
-    })
-    .set('bracket.inner', function(node) {
-      var inner = node.val;
+  stream.write = function (data) {
+    write.call(this, data)
+    return !stream.paused
+  }
 
-      if (inner === '[' || inner === ']') {
-        return this.emit('\\' + node.val, node);
-      }
-      if (inner === '^]') {
-        return this.emit('^\\]', node);
-      }
-      if (inner === '^') {
-        return this.emit('^', node);
-      }
+  function drain() {
+    while(buffer.length && !stream.paused) {
+      var data = buffer.shift()
+      if(null === data)
+        return stream.emit('end')
+      else
+        stream.emit('data', data)
+    }
+  }
 
-      if (/-/.test(inner) && !/(\d-\d|\w-\w)/.test(inner)) {
-        inner = inner.split('-').join('\\-');
-      }
+  stream.queue = stream.push = function (data) {
+//    console.error(ended)
+    if(_ended) return stream
+    if(data === null) _ended = true
+    buffer.push(data)
+    drain()
+    return stream
+  }
 
-      var isNegated = inner.charAt(0) === '^';
-      // add slashes to negated brackets, per spec
-      if (isNegated && inner.indexOf('/') === -1) {
-        inner += '/';
-      }
-      if (isNegated && inner.indexOf('.') === -1) {
-        inner += '.';
-      }
+  //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'
 
-      // don't unescape `0` (octal literal)
-      inner = inner.replace(/\\([1-9])/g, '$1');
-      return this.emit(inner, node);
-    })
-    .set('bracket.close', function(node) {
-      var val = node.val.replace(/^\\/, '');
-      if (node.parent.escaped === true) {
-        return this.emit('\\' + val, node);
-      }
-      return this.emit(val, node);
-    });
-};
+  stream.on('end', function () {
+    stream.readable = false
+    if(!stream.writable && stream.autoDestroy)
+      process.nextTick(function () {
+        stream.destroy()
+      })
+  })
 
+  function _end () {
+    stream.writable = false
+    end.call(stream)
+    if(!stream.readable && stream.autoDestroy)
+      stream.destroy()
+  }
 
-/***/ }),
-/* 717 */
-/***/ (function(module, exports, __webpack_require__) {
+  stream.end = function (data) {
+    if(ended) return
+    ended = true
+    if(arguments.length) stream.write(data)
+    _end() // will emit or queue
+    return stream
+  }
 
-"use strict";
+  stream.destroy = function () {
+    if(destroyed) return
+    destroyed = true
+    ended = true
+    buffer.length = 0
+    stream.writable = stream.readable = false
+    stream.emit('close')
+    return stream
+  }
 
+  stream.pause = function () {
+    if(stream.paused) return
+    stream.paused = true
+    return stream
+  }
 
-/**
- * POSIX character classes
- */
+  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
+}
 
-module.exports = {
-  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'
-};
 
 
 /***/ }),
-/* 718 */
+
+/***/ "../../node_modules/to-object-path/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
-
-var utils = __webpack_require__(719);
-var define = __webpack_require__(659);
-
-/**
- * Text regex
+/*!
+ * to-object-path <https://github.com/jonschlinkert/to-object-path>
+ *
+ * Copyright (c) 2015, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
-var TEXT_REGEX = '(\\[(?=.*\\])|\\])+';
-var not = utils.createRegex(TEXT_REGEX);
-
-/**
- * Brackets parsers
- */
 
-function parsers(brackets) {
-  brackets.state = brackets.state || {};
-  brackets.parser.sets.bracket = brackets.parser.sets.bracket || [];
-  brackets.parser
 
-    .capture('escape', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(/^\\(.)/);
-      if (!m) return;
+var typeOf = __webpack_require__("../../node_modules/to-object-path/node_modules/kind-of/index.js");
 
-      return pos({
-        type: 'escape',
-        val: m[0]
-      });
-    })
+module.exports = function toPath(args) {
+  if (typeOf(args) !== 'arguments') {
+    args = arguments;
+  }
+  return filter(args).join('.');
+};
 
-    /**
-     * Text parser
-     */
+function filter(arr) {
+  var len = arr.length;
+  var idx = -1;
+  var res = [];
 
-    .capture('text', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(not);
-      if (!m || !m[0]) return;
+  while (++idx < len) {
+    var ele = arr[idx];
+    if (typeOf(ele) === 'arguments' || Array.isArray(ele)) {
+      res.push.apply(res, filter(ele));
+    } else if (typeof ele === 'string') {
+      res.push(ele);
+    }
+  }
+  return res;
+}
 
-      return pos({
-        type: 'text',
-        val: m[0]
-      });
-    })
 
-    /**
-     * POSIX character classes: "[[:alpha:][:digits:]]"
-     */
+/***/ }),
 
-    .capture('posix', function() {
-      var pos = this.position();
-      var m = this.match(/^\[:(.*?):\](?=.*\])/);
-      if (!m) return;
+/***/ "../../node_modules/to-object-path/node_modules/kind-of/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      var inside = this.isInside('bracket');
-      if (inside) {
-        brackets.posix++;
-      }
+var isBuffer = __webpack_require__("../../node_modules/is-buffer/index.js");
+var toString = Object.prototype.toString;
 
-      return pos({
-        type: 'posix',
-        insideBracket: inside,
-        inner: m[1],
-        val: m[0]
-      });
-    })
+/**
+ * Get the native `typeof` a value.
+ *
+ * @param  {*} `val`
+ * @return {*} Native javascript type
+ */
 
-    /**
-     * Bracket (noop)
-     */
+module.exports = function kindOf(val) {
+  // primitivies
+  if (typeof val === 'undefined') {
+    return 'undefined';
+  }
+  if (val === null) {
+    return 'null';
+  }
+  if (val === true || val === false || val instanceof Boolean) {
+    return 'boolean';
+  }
+  if (typeof val === 'string' || val instanceof String) {
+    return 'string';
+  }
+  if (typeof val === 'number' || val instanceof Number) {
+    return 'number';
+  }
 
-    .capture('bracket', function() {})
+  // functions
+  if (typeof val === 'function' || val instanceof Function) {
+    return 'function';
+  }
 
-    /**
-     * Open: '['
-     */
+  // array
+  if (typeof Array.isArray !== 'undefined' && Array.isArray(val)) {
+    return 'array';
+  }
 
-    .capture('bracket.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\[(?=.*\])/);
-      if (!m) return;
+  // check for instances of RegExp and Date before calling `toString`
+  if (val instanceof RegExp) {
+    return 'regexp';
+  }
+  if (val instanceof Date) {
+    return 'date';
+  }
 
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
+  // other objects
+  var type = toString.call(val);
 
-      if (parsed.slice(-1) === '\\' && !this.isInside('bracket')) {
-        last.val = last.val.slice(0, last.val.length - 1);
-        return pos({
-          type: 'escape',
-          val: m[0]
-        });
-      }
+  if (type === '[object RegExp]') {
+    return 'regexp';
+  }
+  if (type === '[object Date]') {
+    return 'date';
+  }
+  if (type === '[object Arguments]') {
+    return 'arguments';
+  }
+  if (type === '[object Error]') {
+    return 'error';
+  }
 
-      var open = pos({
-        type: 'bracket.open',
-        val: m[0]
-      });
+  // buffer
+  if (isBuffer(val)) {
+    return 'buffer';
+  }
 
-      if (last.type === 'bracket.open' || this.isInside('bracket')) {
-        open.val = '\\' + open.val;
-        open.type = 'bracket.inner';
-        open.escaped = true;
-        return open;
-      }
+  // es6: Map, WeakMap, Set, WeakSet
+  if (type === '[object Set]') {
+    return 'set';
+  }
+  if (type === '[object WeakSet]') {
+    return 'weakset';
+  }
+  if (type === '[object Map]') {
+    return 'map';
+  }
+  if (type === '[object WeakMap]') {
+    return 'weakmap';
+  }
+  if (type === '[object Symbol]') {
+    return 'symbol';
+  }
 
-      var node = pos({
-        type: 'bracket',
-        nodes: [open]
-      });
+  // typed arrays
+  if (type === '[object Int8Array]') {
+    return 'int8array';
+  }
+  if (type === '[object Uint8Array]') {
+    return 'uint8array';
+  }
+  if (type === '[object Uint8ClampedArray]') {
+    return 'uint8clampedarray';
+  }
+  if (type === '[object Int16Array]') {
+    return 'int16array';
+  }
+  if (type === '[object Uint16Array]') {
+    return 'uint16array';
+  }
+  if (type === '[object Int32Array]') {
+    return 'int32array';
+  }
+  if (type === '[object Uint32Array]') {
+    return 'uint32array';
+  }
+  if (type === '[object Float32Array]') {
+    return 'float32array';
+  }
+  if (type === '[object Float64Array]') {
+    return 'float64array';
+  }
 
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
-      this.push('bracket', node);
-      prev.nodes.push(node);
-    })
+  // must be a plain object
+  return 'object';
+};
 
-    /**
-     * Bracket text
-     */
 
-    .capture('bracket.inner', function() {
-      if (!this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(not);
-      if (!m || !m[0]) return;
+/***/ }),
 
-      var next = this.input.charAt(0);
-      var val = m[0];
+/***/ "../../node_modules/to-regex-range/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-      var node = pos({
-        type: 'bracket.inner',
-        val: val
-      });
+"use strict";
+/*!
+ * to-regex-range <https://github.com/micromatch/to-regex-range>
+ *
+ * Copyright (c) 2015-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-      if (val === '\\\\') {
-        return node;
-      }
 
-      var first = val.charAt(0);
-      var last = val.slice(-1);
 
-      if (first === '!') {
-        val = '^' + val.slice(1);
-      }
+const isNumber = __webpack_require__("../../node_modules/to-regex-range/node_modules/is-number/index.js");
 
-      if (last === '\\' || (val === '^' && next === ']')) {
-        val += this.input[0];
-        this.consume(1);
-      }
+const toRegexRange = (min, max, options) => {
+  if (isNumber(min) === false) {
+    throw new TypeError('toRegexRange: expected the first argument to be a number');
+  }
 
-      node.val = val;
-      return node;
-    })
+  if (max === void 0 || min === max) {
+    return String(min);
+  }
 
-    /**
-     * Close: ']'
-     */
+  if (isNumber(max) === false) {
+    throw new TypeError('toRegexRange: expected the second argument to be a number.');
+  }
 
-    .capture('bracket.close', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\]/);
-      if (!m) return;
+  let opts = { relaxZeros: true, ...options };
+  if (typeof opts.strictZeros === 'boolean') {
+    opts.relaxZeros = opts.strictZeros === false;
+  }
 
-      var prev = this.prev();
-      var last = utils.last(prev.nodes);
+  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 (parsed.slice(-1) === '\\' && !this.isInside('bracket')) {
-        last.val = last.val.slice(0, last.val.length - 1);
+  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
+    return toRegexRange.cache[cacheKey].result;
+  }
 
-        return pos({
-          type: 'escape',
-          val: m[0]
-        });
-      }
+  let a = Math.min(min, max);
+  let b = Math.max(min, max);
 
-      var node = pos({
-        type: 'bracket.close',
-        rest: this.input,
-        val: m[0]
-      });
+  if (Math.abs(a - b) === 1) {
+    let result = min + '|' + max;
+    if (opts.capture) {
+      return `(${result})`;
+    }
+    if (opts.wrap === false) {
+      return result;
+    }
+    return `(?:${result})`;
+  }
 
-      if (last.type === 'bracket.open') {
-        node.type = 'bracket.inner';
-        node.escaped = true;
-        return node;
-      }
+  let isPadded = hasPadding(min) || hasPadding(max);
+  let state = { min, max, a, b };
+  let positives = [];
+  let negatives = [];
 
-      var bracket = this.pop('bracket');
-      if (!this.isType(bracket, 'bracket')) {
-        if (this.options.strict) {
-          throw new Error('missing opening "["');
-        }
-        node.type = 'bracket.inner';
-        node.escaped = true;
-        return node;
-      }
+  if (isPadded) {
+    state.isPadded = isPadded;
+    state.maxLen = String(state.max).length;
+  }
 
-      bracket.nodes.push(node);
-      define(node, 'parent', bracket);
-    });
-}
+  if (a < 0) {
+    let newMin = b < 0 ? Math.abs(b) : 1;
+    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
+    a = state.a = 0;
+  }
 
-/**
- * Brackets parsers
- */
+  if (b >= 0) {
+    positives = splitToPatterns(a, b, state, opts);
+  }
 
-module.exports = parsers;
+  state.negatives = negatives;
+  state.positives = positives;
+  state.result = collatePatterns(negatives, positives, opts);
 
-/**
- * Expose text regex
- */
+  if (opts.capture === true) {
+    state.result = `(${state.result})`;
+  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
+    state.result = `(?:${state.result})`;
+  }
 
-module.exports.TEXT_REGEX = TEXT_REGEX;
+  toRegexRange.cache[cacheKey] = state;
+  return state.result;
+};
 
+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('|');
+}
 
-/***/ }),
-/* 719 */
-/***/ (function(module, exports, __webpack_require__) {
+function splitToRanges(min, max) {
+  let nines = 1;
+  let zeros = 1;
 
-"use strict";
+  let stop = countNines(min, nines);
+  let stops = new Set([max]);
 
+  while (min <= stop && stop <= max) {
+    stops.add(stop);
+    nines += 1;
+    stop = countNines(min, nines);
+  }
 
-var toRegex = __webpack_require__(584);
-var regexNot = __webpack_require__(601);
-var cached;
+  stop = countZeros(max + 1, zeros) - 1;
 
-/**
- * Get the last element from `array`
- * @param {Array} `array`
- * @return {*}
- */
+  while (min < stop && stop <= max) {
+    stops.add(stop);
+    zeros += 1;
+    stop = countZeros(max + 1, zeros) - 1;
+  }
 
-exports.last = function(arr) {
-  return arr[arr.length - 1];
-};
+  stops = [...stops];
+  stops.sort(compare);
+  return stops;
+}
 
 /**
- * Create and cache regex to use for text nodes
+ * Convert a range to a regex pattern
+ * @param {Number} `start`
+ * @param {Number} `stop`
+ * @return {String}
  */
 
-exports.createRegex = function(pattern, include) {
-  if (cached) return cached;
-  var opts = {contains: true, strictClose: false};
-  var not = regexNot.create(pattern, opts);
-  var re;
-
-  if (typeof include === 'string') {
-    re = toRegex('^(?:' + include + '|' + not + ')', opts);
-  } else {
-    re = toRegex(not, opts);
+function rangeToPattern(start, stop, options) {
+  if (start === stop) {
+    return { pattern: start, count: [], digits: 0 };
   }
 
-  return (cached = re);
-};
-
-
-/***/ }),
-/* 720 */
-/***/ (function(module, exports, __webpack_require__) {
+  let zipped = zip(start, stop);
+  let digits = zipped.length;
+  let pattern = '';
+  let count = 0;
 
-"use strict";
+  for (let i = 0; i < digits; i++) {
+    let [startDigit, stopDigit] = zipped[i];
 
+    if (startDigit === stopDigit) {
+      pattern += startDigit;
 
-var brackets = __webpack_require__(715);
-var define = __webpack_require__(721);
-var utils = __webpack_require__(722);
+    } else if (startDigit !== '0' || stopDigit !== '9') {
+      pattern += toCharacterClass(startDigit, stopDigit, options);
 
-/**
- * Characters to use in text regex (we want to "not" match
- * characters that are matched by other parsers)
- */
+    } else {
+      count++;
+    }
+  }
 
-var TEXT_REGEX = '([!@*?+]?\\(|\\)|[*?.+\\\\]|\\[:?(?=.*\\])|:?\\])+';
-var not = utils.createRegex(TEXT_REGEX);
+  if (count) {
+    pattern += options.shorthand === true ? '\\d' : '[0-9]';
+  }
 
-/**
- * Extglob parsers
- */
+  return { pattern, count: [count], digits };
+}
 
-function parsers(extglob) {
-  extglob.state = extglob.state || {};
+function splitToPatterns(min, max, tok, options) {
+  let ranges = splitToRanges(min, max);
+  let tokens = [];
+  let start = min;
+  let prev;
 
-  /**
-   * Use `expand-brackets` parsers
-   */
+  for (let i = 0; i < ranges.length; i++) {
+    let max = ranges[i];
+    let obj = rangeToPattern(String(start), String(max), options);
+    let zeros = '';
 
-  extglob.use(brackets.parsers);
-  extglob.parser.sets.paren = extglob.parser.sets.paren || [];
-  extglob.parser
+    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
+      if (prev.count.length > 1) {
+        prev.count.pop();
+      }
 
-    /**
-     * Extglob open: "*("
-     */
+      prev.count.push(obj.count[0]);
+      prev.string = prev.pattern + toQuantifier(prev.count);
+      start = max + 1;
+      continue;
+    }
 
-    .capture('paren.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^([!@*?+])?\(/);
-      if (!m) return;
+    if (tok.isPadded) {
+      zeros = padZeros(max, tok, options);
+    }
 
-      var prev = this.prev();
-      var prefix = m[1];
-      var val = m[0];
+    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
+    tokens.push(obj);
+    start = max + 1;
+    prev = obj;
+  }
 
-      var open = pos({
-        type: 'paren.open',
-        parsed: parsed,
-        val: val
-      });
+  return tokens;
+}
 
-      var node = pos({
-        type: 'paren',
-        prefix: prefix,
-        nodes: [open]
-      });
+function filterPatterns(arr, comparison, prefix, intersection, options) {
+  let result = [];
 
-      // if nested negation extglobs, just cancel them out to simplify
-      if (prefix === '!' && prev.type === 'paren' && prev.prefix === '!') {
-        prev.prefix = '@';
-        node.prefix = '@';
-      }
+  for (let ele of arr) {
+    let { string } = ele;
 
-      define(node, 'rest', this.input);
-      define(node, 'parsed', parsed);
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
+    // only push if _both_ are negative...
+    if (!intersection && !contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
 
-      this.push('paren', node);
-      prev.nodes.push(node);
-    })
+    // or _both_ are positive
+    if (intersection && contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
+  }
+  return result;
+}
 
-    /**
-     * Extglob close: ")"
-     */
+/**
+ * Zip strings
+ */
 
-    .capture('paren.close', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\)/);
-      if (!m) return;
+function zip(a, b) {
+  let arr = [];
+  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
+  return arr;
+}
 
-      var parent = this.pop('paren');
-      var node = pos({
-        type: 'paren.close',
-        rest: this.input,
-        parsed: parsed,
-        val: m[0]
-      });
+function compare(a, b) {
+  return a > b ? 1 : b > a ? -1 : 0;
+}
 
-      if (!this.isType(parent, 'paren')) {
-        if (this.options.strict) {
-          throw new Error('missing opening paren: "("');
-        }
-        node.escaped = true;
-        return node;
-      }
+function contains(arr, key, val) {
+  return arr.some(ele => ele[key] === val);
+}
 
-      node.prefix = parent.prefix;
-      parent.nodes.push(node);
-      define(node, 'parent', parent);
-    })
+function countNines(min, len) {
+  return Number(String(min).slice(0, -len) + '9'.repeat(len));
+}
 
-    /**
-     * Escape: "\\."
-     */
+function countZeros(integer, zeros) {
+  return integer - (integer % Math.pow(10, zeros));
+}
 
-    .capture('escape', function() {
-      var pos = this.position();
-      var m = this.match(/^\\(.)/);
-      if (!m) return;
+function toQuantifier(digits) {
+  let [start = 0, stop = ''] = digits;
+  if (stop || start > 1) {
+    return `{${start + (stop ? ',' + stop : '')}}`;
+  }
+  return '';
+}
 
-      return pos({
-        type: 'escape',
-        val: m[0],
-        ch: m[1]
-      });
-    })
+function toCharacterClass(a, b, options) {
+  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
+}
 
-    /**
-     * Question marks: "?"
-     */
+function hasPadding(str) {
+  return /^-?(0+)\d/.test(str);
+}
 
-    .capture('qmark', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\?+(?!\()/);
-      if (!m) return;
-      extglob.state.metachar = true;
-      return pos({
-        type: 'qmark',
-        rest: this.input,
-        parsed: parsed,
-        val: m[0]
-      });
-    })
+function padZeros(value, tok, options) {
+  if (!tok.isPadded) {
+    return value;
+  }
 
-    /**
-     * Character parsers
-     */
+  let diff = Math.abs(tok.maxLen - String(value).length);
+  let relax = options.relaxZeros !== false;
 
-    .capture('star', /^\*(?!\()/)
-    .capture('plus', /^\+(?!\()/)
-    .capture('dot', /^\./)
-    .capture('text', not);
-};
+  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}}`;
+    }
+  }
+}
 
 /**
- * Expose text regex string
+ * Cache
  */
 
-module.exports.TEXT_REGEX = TEXT_REGEX;
+toRegexRange.cache = {};
+toRegexRange.clearCache = () => (toRegexRange.cache = {});
 
 /**
- * Extglob parsers
+ * Expose `toRegexRange`
  */
 
-module.exports = parsers;
+module.exports = toRegexRange;
 
 
 /***/ }),
-/* 721 */
+
+/***/ "../../node_modules/to-regex-range/node_modules/is-number/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 /*!
- * define-property <https://github.com/jonschlinkert/define-property>
+ * is-number <https://github.com/jonschlinkert/is-number>
  *
- * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Copyright (c) 2014-present, Jon Schlinkert.
  * Released under the MIT License.
  */
 
 
 
-var isDescriptor = __webpack_require__(593);
-
-module.exports = function defineProperty(obj, prop, val) {
-  if (typeof obj !== 'object' && typeof obj !== 'function') {
-    throw new TypeError('expected an object or function.');
-  }
-
-  if (typeof prop !== 'string') {
-    throw new TypeError('expected `prop` to be a string.');
+module.exports = function(num) {
+  if (typeof num === 'number') {
+    return num - num === 0;
   }
-
-  if (isDescriptor(val) && ('set' in val || 'get' in val)) {
-    return Object.defineProperty(obj, prop, val);
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isFinite ? Number.isFinite(+num) : isFinite(+num);
   }
-
-  return Object.defineProperty(obj, prop, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
-  });
+  return false;
 };
 
 
 /***/ }),
-/* 722 */
+
+/***/ "../../node_modules/to-regex/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regex = __webpack_require__(601);
-var Cache = __webpack_require__(707);
+var safe = __webpack_require__("../../node_modules/safe-regex/index.js");
+var define = __webpack_require__("../../node_modules/to-regex/node_modules/define-property/index.js");
+var extend = __webpack_require__("../../node_modules/to-regex/node_modules/extend-shallow/index.js");
+var not = __webpack_require__("../../node_modules/regex-not/index.js");
+var MAX_LENGTH = 1024 * 64;
 
 /**
- * Utils
+ * Session cache
  */
 
-var utils = module.exports;
-var cache = utils.cache = new Cache();
+var cache = {};
 
 /**
- * Cast `val` to an array
- * @return {Array}
+ * Create a regular expression from the given `pattern` string.
+ *
+ * @param {String|RegExp} `pattern` Pattern can be a string or regular expression.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
  */
 
-utils.arrayify = function(val) {
-  if (!Array.isArray(val)) {
-    return [val];
+module.exports = function(patterns, options) {
+  if (!Array.isArray(patterns)) {
+    return makeRe(patterns, options);
   }
-  return val;
+  return makeRe(patterns.join('|'), options);
 };
 
 /**
- * Memoize a generated regex or function
+ * Create a regular expression from the given `pattern` string.
+ *
+ * @param {String|RegExp} `pattern` Pattern can be a string or regular expression.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
  */
 
-utils.memoize = function(type, pattern, options, fn) {
-  var key = utils.createKey(type + pattern, options);
+function makeRe(pattern, options) {
+  if (pattern instanceof RegExp) {
+    return pattern;
+  }
 
-  if (cache.has(type, key)) {
-    return cache.get(type, key);
+  if (typeof pattern !== 'string') {
+    throw new TypeError('expected a string');
   }
 
-  var val = fn(pattern, options);
-  if (options && options.cache === false) {
-    return val;
+  if (pattern.length > MAX_LENGTH) {
+    throw new Error('expected pattern to be less than ' + MAX_LENGTH + ' characters');
   }
 
-  cache.set(type, key, val);
-  return val;
-};
+  var key = pattern;
+  // do this before shallow cloning options, it's a lot faster
+  if (!options || (options && options.cache !== false)) {
+    key = createKey(pattern, options);
 
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
- */
+    if (cache.hasOwnProperty(key)) {
+      return cache[key];
+    }
+  }
 
-utils.createKey = function(pattern, options) {
-  var key = pattern;
-  if (typeof options === 'undefined') {
-    return key;
+  var opts = extend({}, options);
+  if (opts.contains === true) {
+    if (opts.negate === true) {
+      opts.strictNegate = false;
+    } else {
+      opts.strict = false;
+    }
   }
-  for (var prop in options) {
-    key += ';' + prop + '=' + String(options[prop]);
+
+  if (opts.strict === false) {
+    opts.strictOpen = false;
+    opts.strictClose = false;
   }
-  return key;
-};
 
-/**
- * Create the regex to use for matching text
- */
+  var open = opts.strictOpen !== false ? '^' : '';
+  var close = opts.strictClose !== false ? '$' : '';
+  var flags = opts.flags || '';
+  var regex;
 
-utils.createRegex = function(str) {
-  var opts = {contains: true, strictClose: false};
-  return regex(str, opts);
-};
+  if (opts.nocase === true && !/i/.test(flags)) {
+    flags += 'i';
+  }
 
+  try {
+    if (opts.negate || typeof opts.strictNegate === 'boolean') {
+      pattern = not.create(pattern, opts);
+    }
 
-/***/ }),
-/* 723 */
-/***/ (function(module, exports, __webpack_require__) {
+    var str = open + '(?:' + pattern + ')' + close;
+    regex = new RegExp(str, flags);
 
-"use strict";
+    if (opts.safe === true && safe(regex) === false) {
+      throw new Error('potentially unsafe regular expression: ' + regex.source);
+    }
+
+  } catch (err) {
+    if (opts.strictErrors === true || opts.safe === true) {
+      err.key = key;
+      err.pattern = pattern;
+      err.originalOptions = options;
+      err.createdOptions = opts;
+      throw err;
+    }
+
+    try {
+      regex = new RegExp('^' + pattern.replace(/(\W)/g, '\\$1') + '$');
+    } catch (err) {
+      regex = /.^/; //<= match nothing
+    }
+  }
 
+  if (opts.cache !== false) {
+    memoize(regex, key, pattern, opts);
+  }
+  return regex;
+}
 
 /**
- * Module dependencies
+ * Memoize generated regex. This can result in dramatic speed improvements
+ * and simplify debugging by adding options and pattern to the regex. It can be
+ * disabled by passing setting `options.cache` to false.
  */
 
-var Snapdragon = __webpack_require__(628);
-var define = __webpack_require__(721);
-var extend = __webpack_require__(643);
+function memoize(regex, key, pattern, options) {
+  define(regex, 'cached', true);
+  define(regex, 'pattern', pattern);
+  define(regex, 'options', options);
+  define(regex, 'key', key);
+  cache[key] = regex;
+}
 
 /**
- * Local dependencies
+ * Create the key to use for memoization. The key is generated
+ * by iterating over the options and concatenating key-value pairs
+ * to the pattern string.
  */
 
-var compilers = __webpack_require__(714);
-var parsers = __webpack_require__(720);
+function createKey(pattern, options) {
+  if (!options) return pattern;
+  var key = pattern;
+  for (var prop in options) {
+    if (options.hasOwnProperty(prop)) {
+      key += ';' + prop + '=' + String(options[prop]);
+    }
+  }
+  return key;
+}
 
 /**
- * Customize Snapdragon parser and renderer
+ * Expose `makeRe`
  */
 
-function Extglob(options) {
-  this.options = extend({source: 'extglob'}, options);
-  this.snapdragon = this.options.snapdragon || new Snapdragon(this.options);
-  this.snapdragon.patterns = this.snapdragon.patterns || {};
-  this.compiler = this.snapdragon.compiler;
-  this.parser = this.snapdragon.parser;
+module.exports.makeRe = makeRe;
 
-  compilers(this.snapdragon);
-  parsers(this.snapdragon);
 
-  /**
-   * Override Snapdragon `.parse` method
-   */
+/***/ }),
 
-  define(this.snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
-    parsed.input = str;
+/***/ "../../node_modules/to-regex/node_modules/define-property/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
-    if (last && this.options.strict !== true) {
-      var node = last.nodes[0];
-      node.val = '\\' + node.val;
-      var sibling = node.parent.nodes[1];
-      if (sibling.type === 'star') {
-        sibling.loose = true;
-      }
-    }
+"use strict";
+/*!
+ * define-property <https://github.com/jonschlinkert/define-property>
+ *
+ * Copyright (c) 2015-2018, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-    // add non-enumerable parser reference
-    define(parsed, 'parser', this.parser);
-    return parsed;
-  });
 
-  /**
-   * Decorate `.parse` method
-   */
 
-  define(this, 'parse', function(ast, options) {
-    return this.snapdragon.parse.apply(this.snapdragon, arguments);
-  });
+var isobject = __webpack_require__("../../node_modules/isobject/index.js");
+var isDescriptor = __webpack_require__("../../node_modules/is-descriptor/index.js");
+var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
+  ? Reflect.defineProperty
+  : Object.defineProperty;
 
-  /**
-   * Decorate `.compile` method
-   */
+module.exports = function defineProperty(obj, key, val) {
+  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
+    throw new TypeError('expected an object, function, or array');
+  }
 
-  define(this, 'compile', function(ast, options) {
-    return this.snapdragon.compile.apply(this.snapdragon, arguments);
-  });
+  if (typeof key !== 'string') {
+    throw new TypeError('expected "key" to be a string');
+  }
 
-}
+  if (isDescriptor(val)) {
+    define(obj, key, val);
+    return obj;
+  }
 
-/**
- * Expose `Extglob`
- */
+  define(obj, key, {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: val
+  });
 
-module.exports = Extglob;
+  return obj;
+};
 
 
 /***/ }),
-/* 724 */
+
+/***/ "../../node_modules/to-regex/node_modules/extend-shallow/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(713);
-var nanomatch = __webpack_require__(699);
-var regexNot = __webpack_require__(601);
-var toRegex = __webpack_require__(584);
-var not;
-
-/**
- * Characters to use in negation regex (we want to "not" match
- * characters that are matched by other parsers)
- */
+var isExtendable = __webpack_require__("../../node_modules/to-regex/node_modules/is-extendable/index.js");
+var assignSymbols = __webpack_require__("../../node_modules/assign-symbols/index.js");
 
-var TEXT = '([!@*?+]?\\(|\\)|\\[:?(?=.*?:?\\])|:?\\]|[*+?!^$.\\\\/])+';
-var createNotRegex = function(opts) {
-  return not || (not = textRegex(TEXT));
+module.exports = Object.assign || function(obj/*, objects*/) {
+  if (obj === null || typeof obj === 'undefined') {
+    throw new TypeError('Cannot convert undefined or null to object');
+  }
+  if (!isObject(obj)) {
+    obj = {};
+  }
+  for (var i = 1; i < arguments.length; i++) {
+    var val = arguments[i];
+    if (isString(val)) {
+      val = toObject(val);
+    }
+    if (isObject(val)) {
+      assign(obj, val);
+      assignSymbols(obj, val);
+    }
+  }
+  return obj;
 };
 
-/**
- * Parsers
- */
+function assign(a, b) {
+  for (var key in b) {
+    if (hasOwn(b, key)) {
+      a[key] = b[key];
+    }
+  }
+}
 
-module.exports = function(snapdragon) {
-  var parsers = snapdragon.parser.parsers;
+function isString(val) {
+  return (val && typeof val === 'string');
+}
 
-  // register nanomatch parsers
-  snapdragon.use(nanomatch.parsers);
+function toObject(str) {
+  var obj = {};
+  for (var i in str) {
+    obj[i] = str[i];
+  }
+  return obj;
+}
 
-  // get references to some specific nanomatch parsers before they
-  // are overridden by the extglob and/or parsers
-  var escape = parsers.escape;
-  var slash = parsers.slash;
-  var qmark = parsers.qmark;
-  var plus = parsers.plus;
-  var star = parsers.star;
-  var dot = parsers.dot;
+function isObject(val) {
+  return (val && typeof val === 'object') || isExtendable(val);
+}
 
-  // register extglob parsers
-  snapdragon.use(extglob.parsers);
+/**
+ * Returns true if the given `key` is an own property of `obj`.
+ */
 
-  // custom micromatch parsers
-  snapdragon.parser
-    .use(function() {
-      // override "notRegex" created in nanomatch parser
-      this.notRegex = /^\!+(?!\()/;
-    })
-    // reset the referenced parsers
-    .capture('escape', escape)
-    .capture('slash', slash)
-    .capture('qmark', qmark)
-    .capture('star', star)
-    .capture('plus', plus)
-    .capture('dot', dot)
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
 
-    /**
-     * Override `text` parser
-     */
+function isEnum(obj, key) {
+  return Object.prototype.propertyIsEnumerable.call(obj, key);
+}
 
-    .capture('text', function() {
-      if (this.isInside('bracket')) return;
-      var pos = this.position();
-      var m = this.match(createNotRegex(this.options));
-      if (!m || !m[0]) return;
 
-      // escape regex boundary characters and simple brackets
-      var val = m[0].replace(/([[\]^$])/g, '\\$1');
+/***/ }),
 
-      return pos({
-        type: 'text',
-        val: val
-      });
-    });
-};
+/***/ "../../node_modules/to-regex/node_modules/is-extendable/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Create text regex
+"use strict";
+/*!
+ * is-extendable <https://github.com/jonschlinkert/is-extendable>
+ *
+ * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-function textRegex(pattern) {
-  var notStr = regexNot.create(pattern, {contains: true, strictClose: false});
-  var prefix = '(?:[\\^]|\\\\|';
-  return toRegex(prefix + notStr + ')', {strictClose: false});
-}
 
 
-/***/ }),
-/* 725 */
-/***/ (function(module, exports, __webpack_require__) {
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
 
-module.exports = new (__webpack_require__(707))();
+module.exports = function isExtendable(val) {
+  return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
+};
 
 
 /***/ }),
-/* 726 */
+
+/***/ "../../node_modules/union-value/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = module.exports;
-var path = __webpack_require__(4);
-
-/**
- * Module dependencies
- */
+var isObject = __webpack_require__("../../node_modules/is-extendable/index.js");
+var union = __webpack_require__("../../node_modules/arr-union/index.js");
+var get = __webpack_require__("../../node_modules/get-value/index.js");
+var set = __webpack_require__("../../node_modules/union-value/node_modules/set-value/index.js");
 
-var Snapdragon = __webpack_require__(628);
-utils.define = __webpack_require__(727);
-utils.diff = __webpack_require__(711);
-utils.extend = __webpack_require__(696);
-utils.pick = __webpack_require__(712);
-utils.typeOf = __webpack_require__(594);
-utils.unique = __webpack_require__(604);
+module.exports = function unionValue(obj, prop, value) {
+  if (!isObject(obj)) {
+    throw new TypeError('union-value expects the first argument to be an object.');
+  }
 
-/**
- * Returns true if the platform is windows, or `path.sep` is `\\`.
- * This is defined as a function to allow `path.sep` to be set in unit tests,
- * or by the user, if there is a reason to do so.
- * @return {Boolean}
- */
+  if (typeof prop !== 'string') {
+    throw new TypeError('union-value expects `prop` to be a string.');
+  }
 
-utils.isWindows = function() {
-  return path.sep === '\\' || process.platform === 'win32';
+  var arr = arrayify(get(obj, prop));
+  set(obj, prop, union(arr, arrayify(value)));
+  return obj;
 };
 
-/**
- * Get the `Snapdragon` instance to use
- */
-
-utils.instantiate = function(ast, options) {
-  var snapdragon;
-  // if an instance was created by `.parse`, use that instance
-  if (utils.typeOf(ast) === 'object' && ast.snapdragon) {
-    snapdragon = ast.snapdragon;
-  // if the user supplies an instance on options, use that instance
-  } else if (utils.typeOf(options) === 'object' && options.snapdragon) {
-    snapdragon = options.snapdragon;
-  // create a new instance
-  } else {
-    snapdragon = new Snapdragon(options);
+function arrayify(val) {
+  if (val === null || typeof val === 'undefined') {
+    return [];
   }
+  if (Array.isArray(val)) {
+    return val;
+  }
+  return [val];
+}
 
-  utils.define(snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
-    parsed.input = str;
-
-    // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
-    if (last && this.options.strictErrors !== true) {
-      var open = last.nodes[0];
-      var inner = last.nodes[1];
-      if (last.type === 'bracket') {
-        if (inner.val.charAt(0) === '[') {
-          inner.val = '\\' + inner.val;
-        }
-
-      } else {
-        open.val = '\\' + open.val;
-        var sibling = open.parent.nodes[1];
-        if (sibling.type === 'star') {
-          sibling.loose = true;
-        }
-      }
-    }
 
-    // add non-enumerable parser reference
-    utils.define(parsed, 'parser', this.parser);
-    return parsed;
-  });
+/***/ }),
 
-  return snapdragon;
-};
+/***/ "../../node_modules/union-value/node_modules/set-value/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Create the key to use for memoization. The key is generated
- * by iterating over the options and concatenating key-value pairs
- * to the pattern string.
+"use strict";
+/*!
+ * set-value <https://github.com/jonschlinkert/set-value>
+ *
+ * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-utils.createKey = function(pattern, options) {
-  if (utils.typeOf(options) !== 'object') {
-    return pattern;
-  }
-  var val = pattern;
-  var keys = Object.keys(options);
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    val += ';' + key + '=' + String(options[key]);
-  }
-  return val;
-};
 
-/**
- * Cast `val` to an array
- * @return {Array}
- */
 
-utils.arrayify = function(val) {
-  if (typeof val === 'string') return [val];
-  return val ? (Array.isArray(val) ? val : [val]) : [];
-};
+var split = __webpack_require__("../../node_modules/split-string/index.js");
+var extend = __webpack_require__("../../node_modules/extend-shallow/index.js");
+var isPlainObject = __webpack_require__("../../node_modules/is-plain-object/index.js");
+var isObject = __webpack_require__("../../node_modules/is-extendable/index.js");
 
-/**
- * Return true if `val` is a non-empty string
- */
+module.exports = function(obj, prop, val) {
+  if (!isObject(obj)) {
+    return obj;
+  }
 
-utils.isString = function(val) {
-  return typeof val === 'string';
-};
+  if (Array.isArray(prop)) {
+    prop = [].concat.apply([], prop).join('.');
+  }
 
-/**
- * Return true if `val` is a non-empty string
- */
+  if (typeof prop !== 'string') {
+    return obj;
+  }
 
-utils.isObject = function(val) {
-  return utils.typeOf(val) === 'object';
-};
+  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
+  var len = keys.length;
+  var idx = -1;
+  var current = obj;
 
-/**
- * Returns true if the given `str` has special characters
- */
+  while (++idx < len) {
+    var key = keys[idx];
+    if (idx !== len - 1) {
+      if (!isObject(current[key])) {
+        current[key] = {};
+      }
+      current = current[key];
+      continue;
+    }
 
-utils.hasSpecialChars = function(str) {
-  return /(?:(?:(^|\/)[!.])|[*?+()|\[\]{}]|[+@]\()/.test(str);
+    if (isPlainObject(current[key]) && isPlainObject(val)) {
+      current[key] = extend({}, current[key], val);
+    } else {
+      current[key] = val;
+    }
+  }
+
+  return obj;
 };
 
-/**
- * Escape regex characters in the given string
- */
+function isValidKey(key) {
+  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
+}
 
-utils.escapeRegex = function(str) {
-  return str.replace(/[-[\]{}()^$|*+?.\\\/\s]/g, '\\$&');
-};
 
-/**
- * Normalize slashes in the given filepath.
- *
- * @param {String} `filepath`
- * @return {String}
- */
+/***/ }),
 
-utils.toPosixPath = function(str) {
-  return str.replace(/\\+/g, '/');
-};
+/***/ "../../node_modules/unset-value/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Strip backslashes before special characters in a string.
+"use strict";
+/*!
+ * unset-value <https://github.com/jonschlinkert/unset-value>
  *
- * @param {String} `str`
- * @return {String}
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
+ * Released under the MIT License.
  */
 
-utils.unescape = function(str) {
-  return utils.toPosixPath(str.replace(/\\(?=[*+?!.])/g, ''));
-};
 
-/**
- * Strip the prefix from a filepath
- * @param {String} `fp`
- * @return {String}
- */
 
-utils.stripPrefix = function(str) {
-  if (str.charAt(0) !== '.') {
-    return str;
+var isObject = __webpack_require__("../../node_modules/isobject/index.js");
+var has = __webpack_require__("../../node_modules/unset-value/node_modules/has-value/index.js");
+
+module.exports = function unset(obj, prop) {
+  if (!isObject(obj)) {
+    throw new TypeError('expected an object.');
   }
-  var ch = str.charAt(1);
-  if (utils.isSlash(ch)) {
-    return str.slice(2);
+  if (obj.hasOwnProperty(prop)) {
+    delete obj[prop];
+    return true;
   }
-  return str;
+
+  if (has(obj, prop)) {
+    var segs = prop.split('.');
+    var last = segs.pop();
+    while (segs.length && segs[segs.length - 1].slice(-1) === '\\') {
+      last = segs.pop().slice(0, -1) + '.' + last;
+    }
+    while (segs.length) obj = obj[prop = segs.shift()];
+    return (delete obj[last]);
+  }
+  return true;
 };
 
-/**
- * Returns true if the given str is an escaped or
- * unescaped path character
- */
 
-utils.isSlash = function(str) {
-  return str === '/' || str === '\\/' || str === '\\' || str === '\\\\';
-};
+/***/ }),
 
-/**
- * Returns a function that returns true if the given
- * pattern matches or contains a `filepath`
+/***/ "../../node_modules/unset-value/node_modules/has-value/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * has-value <https://github.com/jonschlinkert/has-value>
  *
- * @param {String} `pattern`
- * @return {Function}
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
-utils.matchPath = function(pattern, options) {
-  return (options && options.contains)
-    ? utils.containsPattern(pattern, options)
-    : utils.equalsPattern(pattern, options);
-};
 
-/**
- * Returns true if the given (original) filepath or unixified path are equal
- * to the given pattern.
- */
 
-utils._equals = function(filepath, unixPath, pattern) {
-  return pattern === filepath || pattern === unixPath;
+var isObject = __webpack_require__("../../node_modules/unset-value/node_modules/has-value/node_modules/isobject/index.js");
+var hasValues = __webpack_require__("../../node_modules/unset-value/node_modules/has-values/index.js");
+var get = __webpack_require__("../../node_modules/get-value/index.js");
+
+module.exports = function(obj, prop, noZero) {
+  if (isObject(obj)) {
+    return hasValues(get(obj, prop), noZero);
+  }
+  return hasValues(obj, prop);
 };
 
-/**
- * Returns true if the given (original) filepath or unixified path contain
- * the given pattern.
- */
 
-utils._contains = function(filepath, unixPath, pattern) {
-  return filepath.indexOf(pattern) !== -1 || unixPath.indexOf(pattern) !== -1;
-};
+/***/ }),
 
-/**
- * Returns a function that returns true if the given
- * pattern is the same as a given `filepath`
+/***/ "../../node_modules/unset-value/node_modules/has-value/node_modules/isobject/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * isobject <https://github.com/jonschlinkert/isobject>
  *
- * @param {String} `pattern`
- * @return {Function}
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
-utils.equalsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
 
-  return function fn(filepath) {
-    var equal = utils._equals(filepath, unixify(filepath), pattern);
-    if (equal === true || options.nocase !== true) {
-      return equal;
-    }
-    var lower = filepath.toLowerCase();
-    return utils._equals(lower, unixify(lower), pattern);
-  };
+
+var isArray = __webpack_require__("../../node_modules/unset-value/node_modules/isarray/index.js");
+
+module.exports = function isObject(val) {
+  return val != null && typeof val === 'object' && isArray(val) === false;
 };
 
-/**
- * Returns a function that returns true if the given
- * pattern contains a `filepath`
- *
- * @param {String} `pattern`
- * @return {Function}
- */
 
-utils.containsPattern = function(pattern, options) {
-  var unixify = utils.unixify(options);
-  options = options || {};
+/***/ }),
 
-  return function(filepath) {
-    var contains = utils._contains(filepath, unixify(filepath), pattern);
-    if (contains === true || options.nocase !== true) {
-      return contains;
-    }
-    var lower = filepath.toLowerCase();
-    return utils._contains(lower, unixify(lower), pattern);
-  };
-};
+/***/ "../../node_modules/unset-value/node_modules/has-values/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-/**
- * Returns a function that returns true if the given
- * regex matches the `filename` of a file path.
+"use strict";
+/*!
+ * has-values <https://github.com/jonschlinkert/has-values>
  *
- * @param {RegExp} `re` Matching regex
- * @return {Function}
+ * Copyright (c) 2014-2015, Jon Schlinkert.
+ * Licensed under the MIT License.
  */
 
-utils.matchBasename = function(re) {
-  return function(filepath) {
-    return re.test(path.basename(filepath));
-  };
-};
 
-/**
- * Determines the filepath to return based on the provided options.
- * @return {any}
- */
 
-utils.value = function(str, unixify, options) {
-  if (options && options.unixify === false) {
-    return str;
+module.exports = function hasValue(o, noZero) {
+  if (o === null || o === undefined) {
+    return false;
   }
-  return unixify(str);
-};
 
-/**
- * Returns a function that normalizes slashes in a string to forward
- * slashes, strips `./` from beginning of paths, and optionally unescapes
- * special characters.
- * @return {Function}
- */
+  if (typeof o === 'boolean') {
+    return true;
+  }
 
-utils.unixify = function(options) {
-  options = options || {};
-  return function(filepath) {
-    if (utils.isWindows() || options.unixify === true) {
-      filepath = utils.toPosixPath(filepath);
-    }
-    if (options.stripPrefix !== false) {
-      filepath = utils.stripPrefix(filepath);
+  if (typeof o === 'number') {
+    if (o === 0 && noZero === true) {
+      return false;
     }
-    if (options.unescape === true) {
-      filepath = utils.unescape(filepath);
+    return true;
+  }
+
+  if (o.length !== undefined) {
+    return o.length !== 0;
+  }
+
+  for (var key in o) {
+    if (o.hasOwnProperty(key)) {
+      return true;
     }
-    return filepath;
-  };
+  }
+  return false;
+};
+
+
+/***/ }),
+
+/***/ "../../node_modules/unset-value/node_modules/isarray/index.js":
+/***/ (function(module, exports) {
+
+var toString = {}.toString;
+
+module.exports = Array.isArray || function (arr) {
+  return toString.call(arr) == '[object Array]';
 };
 
 
 /***/ }),
-/* 727 */
+
+/***/ "../../node_modules/urix/index.js":
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright 2014 Simon Lydell
+// X11 (“MIT”) Licensed. (See LICENSE.)
+
+var path = __webpack_require__("path")
+
+"use strict"
+
+function urix(aPath) {
+  if (path.sep === "\\") {
+    return aPath
+      .replace(/\\/g, "/")
+      .replace(/^[a-z]:\/?/i, "/")
+  }
+  return aPath
+}
+
+module.exports = urix
+
+
+/***/ }),
+
+/***/ "../../node_modules/use/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 /*!
- * define-property <https://github.com/jonschlinkert/define-property>
+ * use <https://github.com/jonschlinkert/use>
  *
- * Copyright (c) 2015-2018, Jon Schlinkert.
+ * Copyright (c) 2015, 2017, Jon Schlinkert.
  * Released under the MIT License.
  */
 
 
 
-var isobject = __webpack_require__(592);
-var isDescriptor = __webpack_require__(593);
-var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
-  ? Reflect.defineProperty
-  : Object.defineProperty;
+var utils = __webpack_require__("../../node_modules/use/utils.js");
 
-module.exports = function defineProperty(obj, key, val) {
-  if (!isobject(obj) && typeof obj !== 'function' && !Array.isArray(obj)) {
-    throw new TypeError('expected an object, function, or array');
+module.exports = function base(app, opts) {
+  if (!utils.isObject(app) && typeof app !== 'function') {
+    throw new TypeError('use: expect `app` be an object or function');
   }
 
-  if (typeof key !== 'string') {
-    throw new TypeError('expected "key" to be a string');
+  if (!utils.isObject(opts)) {
+    opts = {};
   }
 
-  if (isDescriptor(val)) {
-    define(obj, key, val);
-    return obj;
+  var prop = utils.isString(opts.prop) ? opts.prop : 'fns';
+  if (!Array.isArray(app[prop])) {
+    utils.define(app, prop, []);
   }
 
-  define(obj, key, {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: val
+  /**
+   * Define a plugin function to be passed to use. The only
+   * parameter exposed to the plugin is `app`, the object or function.
+   * passed to `use(app)`. `app` is also exposed as `this` in plugins.
+   *
+   * Additionally, **if a plugin returns a function, the function will
+   * be pushed onto the `fns` array**, allowing the plugin to be
+   * called at a later point by the `run` method.
+   *
+   * ```js
+   * var use = require('use');
+   *
+   * // define a plugin
+   * function foo(app) {
+   *   // do stuff
+   * }
+   *
+   * var app = function(){};
+   * use(app);
+   *
+   * // register plugins
+   * app.use(foo);
+   * app.use(bar);
+   * app.use(baz);
+   * ```
+   * @name .use
+   * @param {Function} `fn` plugin function to call
+   * @api public
+   */
+
+  utils.define(app, 'use', use);
+
+  /**
+   * Run all plugins on `fns`. Any plugin that returns a function
+   * when called by `use` is pushed onto the `fns` array.
+   *
+   * ```js
+   * var config = {};
+   * app.run(config);
+   * ```
+   * @name .run
+   * @param {Object} `value` Object to be modified by plugins.
+   * @return {Object} Returns the object passed to `run`
+   * @api public
+   */
+
+  utils.define(app, 'run', function(val) {
+    if (!utils.isObject(val)) return;
+    decorate(val);
+
+    var self = this || app;
+    var fns = self[prop];
+    var len = fns.length;
+    var idx = -1;
+
+    while (++idx < len) {
+      val.use(fns[idx]);
+    }
+    return val;
   });
 
-  return obj;
-};
+  /**
+   * Call plugin `fn`. If a function is returned push it into the
+   * `fns` array to be called by the `run` method.
+   */
 
+  function use(fn, options) {
+    if (typeof fn !== 'function') {
+      throw new TypeError('.use expects `fn` be a function');
+    }
 
-/***/ }),
-/* 728 */
-/***/ (function(module, exports, __webpack_require__) {
+    var self = this || app;
+    if (typeof opts.fn === 'function') {
+      opts.fn.call(self, self, options);
+    }
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(729);
-var reader_1 = __webpack_require__(742);
-var fs_stream_1 = __webpack_require__(746);
-var ReaderAsync = /** @class */ (function (_super) {
-    __extends(ReaderAsync, _super);
-    function ReaderAsync() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(ReaderAsync.prototype, "fsAdapter", {
-        /**
-         * Returns FileSystem adapter.
-         */
-        get: function () {
-            return new fs_stream_1.default(this.options);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * Use async API to read entries for Task.
-     */
-    ReaderAsync.prototype.read = function (task) {
-        var _this = this;
-        var root = this.getRootDirectory(task);
-        var options = this.getReaderOptions(task);
-        var entries = [];
-        return new Promise(function (resolve, reject) {
-            var stream = _this.api(root, task, options);
-            stream.on('error', function (err) {
-                _this.isEnoentCodeError(err) ? resolve([]) : reject(err);
-                stream.pause();
-            });
-            stream.on('data', function (entry) { return entries.push(_this.transform(entry)); });
-            stream.on('end', function () { return resolve(entries); });
-        });
-    };
-    /**
-     * Returns founded paths.
-     */
-    ReaderAsync.prototype.api = function (root, task, options) {
-        if (task.dynamic) {
-            return this.dynamicApi(root, options);
-        }
-        return this.staticApi(task, options);
-    };
-    /**
-     * Api for dynamic tasks.
-     */
-    ReaderAsync.prototype.dynamicApi = function (root, options) {
-        return readdir.readdirStreamStat(root, options);
-    };
-    /**
-     * Api for static tasks.
-     */
-    ReaderAsync.prototype.staticApi = function (task, options) {
-        return this.fsAdapter.read(task.patterns, options.filter);
-    };
-    return ReaderAsync;
-}(reader_1.default));
-exports.default = ReaderAsync;
+    var plugin = fn.call(self, self);
+    if (typeof plugin === 'function') {
+      var fns = self[prop];
+      fns.push(plugin);
+    }
+    return self;
+  }
+
+  /**
+   * Ensure the `.use` method exists on `val`
+   */
+
+  function decorate(val) {
+    if (!val.use || !val.run) {
+      base(val);
+    }
+  }
+
+  return app;
+};
 
 
 /***/ }),
-/* 729 */
+
+/***/ "../../node_modules/use/utils.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(730);
-const readdirAsync = __webpack_require__(738);
-const readdirStream = __webpack_require__(741);
+var utils = {};
 
-module.exports = exports = readdirAsyncPath;
-exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
-exports.readdirAsyncStat = exports.async.stat = readdirAsyncStat;
-exports.readdirStream = exports.stream = readdirStreamPath;
-exports.readdirStreamStat = exports.stream.stat = readdirStreamStat;
-exports.readdirSync = exports.sync = readdirSyncPath;
-exports.readdirSyncStat = exports.sync.stat = readdirSyncStat;
 
-/**
- * Synchronous readdir that returns an array of string paths.
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {string[]}
- */
-function readdirSyncPath (dir, options) {
-  return readdirSync(dir, options, {});
-}
 
 /**
- * Synchronous readdir that returns results as an array of {@link fs.Stats} objects
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {fs.Stats[]}
+ * Lazily required module dependencies
  */
-function readdirSyncStat (dir, options) {
-  return readdirSync(dir, options, { stats: true });
-}
 
-/**
- * Aynchronous readdir (accepts an error-first callback or returns a {@link Promise}).
- * Results are an array of path strings.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {function} [callback]
- * @returns {Promise<string[]>}
- */
-function readdirAsyncPath (dir, options, callback) {
-  return readdirAsync(dir, options, callback, {});
-}
+utils.define = __webpack_require__("../../node_modules/define-property/index.js");
+utils.isObject = __webpack_require__("../../node_modules/isobject/index.js");
 
-/**
- * Aynchronous readdir (accepts an error-first callback or returns a {@link Promise}).
- * Results are an array of {@link fs.Stats} objects.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {function} [callback]
- * @returns {Promise<fs.Stats[]>}
- */
-function readdirAsyncStat (dir, options, callback) {
-  return readdirAsync(dir, options, callback, { stats: true });
-}
 
-/**
- * Aynchronous readdir that returns a {@link stream.Readable} (which is also an {@link EventEmitter}).
- * All stream data events ("data", "file", "directory", "symlink") are passed a path string.
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {stream.Readable}
- */
-function readdirStreamPath (dir, options) {
-  return readdirStream(dir, options, {});
-}
+utils.isString = function(val) {
+  return val && typeof val === 'string';
+};
 
 /**
- * Aynchronous readdir that returns a {@link stream.Readable} (which is also an {@link EventEmitter})
- * All stream data events ("data", "file", "directory", "symlink") are passed an {@link fs.Stats} object.
- *
- * @param {string} dir
- * @param {object} [options]
- * @returns {stream.Readable}
+ * Expose `utils` modules
  */
-function readdirStreamStat (dir, options) {
-  return readdirStream(dir, options, { stats: true });
-}
-
 
-/***/ }),
-/* 730 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = utils;
 
-"use strict";
 
+/***/ }),
 
-module.exports = readdirSync;
+/***/ "../../node_modules/validate-npm-package-license/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-const DirectoryReader = __webpack_require__(731);
+var parse = __webpack_require__("../../node_modules/spdx-expression-parse/index.js");
+var correct = __webpack_require__("../../node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js");
 
-let syncFacade = {
-  fs: __webpack_require__(736),
-  forEach: __webpack_require__(737),
-  sync: true
-};
+var genericWarning = (
+  'license should be ' +
+  'a valid SPDX license expression (without "LicenseRef"), ' +
+  '"UNLICENSED", or ' +
+  '"SEE LICENSE IN <filename>"'
+);
 
-/**
- * Returns the buffered output from a synchronous {@link DirectoryReader}.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {object} internalOptions
- */
-function readdirSync (dir, options, internalOptions) {
-  internalOptions.facade = syncFacade;
+var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
 
-  let reader = new DirectoryReader(dir, options, internalOptions);
-  let stream = reader.stream;
+function startsWith(prefix, string) {
+  return string.slice(0, prefix.length) === prefix;
+}
 
-  let results = [];
-  let data = stream.read();
-  while (data !== null) {
-    results.push(data);
-    data = stream.read();
+function usesLicenseRef(ast) {
+  if (ast.hasOwnProperty('license')) {
+    var license = ast.license;
+    return (
+      startsWith('LicenseRef', license) ||
+      startsWith('DocumentRef', license)
+    );
+  } else {
+    return (
+      usesLicenseRef(ast.left) ||
+      usesLicenseRef(ast.right)
+    );
   }
-
-  return results;
 }
 
+module.exports = function(argument) {
+  var ast;
 
-/***/ }),
-/* 731 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const Readable = __webpack_require__(173).Readable;
-const EventEmitter = __webpack_require__(164).EventEmitter;
-const path = __webpack_require__(4);
-const normalizeOptions = __webpack_require__(732);
-const stat = __webpack_require__(734);
-const call = __webpack_require__(735);
+  try {
+    ast = parse(argument);
+  } catch (e) {
+    var match
+    if (
+      argument === 'UNLICENSED' ||
+      argument === 'UNLICENCED'
+    ) {
+      return {
+        validForOldPackages: true,
+        validForNewPackages: true,
+        unlicensed: true
+      };
+    } else if (match = fileReferenceRE.exec(argument)) {
+      return {
+        validForOldPackages: true,
+        validForNewPackages: true,
+        inFile: match[1]
+      };
+    } else {
+      var result = {
+        validForOldPackages: false,
+        validForNewPackages: false,
+        warnings: [genericWarning]
+      };
+      var corrected = correct(argument);
+      if (corrected) {
+        result.warnings.push(
+          'license is similar to the valid expression "' + corrected + '"'
+        );
+      }
+      return result;
+    }
+  }
 
-/**
- * Asynchronously reads the contents of a directory and streams the results
- * via a {@link stream.Readable}.
- */
-class DirectoryReader {
-  /**
-   * @param {string} dir - The absolute or relative directory path to read
-   * @param {object} [options] - User-specified options, if any (see {@link normalizeOptions})
-   * @param {object} internalOptions - Internal options that aren't part of the public API
-   * @class
-   */
-  constructor (dir, options, internalOptions) {
-    this.options = options = normalizeOptions(options, internalOptions);
+  if (usesLicenseRef(ast)) {
+    return {
+      validForNewPackages: false,
+      validForOldPackages: false,
+      spdx: true,
+      warnings: [genericWarning]
+    };
+  } else {
+    return {
+      validForNewPackages: true,
+      validForOldPackages: true,
+      spdx: true
+    };
+  }
+};
 
-    // Indicates whether we should keep reading
-    // This is set false if stream.Readable.push() returns false.
-    this.shouldRead = true;
 
-    // The directories to read
-    // (initialized with the top-level directory)
-    this.queue = [{
-      path: dir,
-      basePath: options.basePath,
-      posixBasePath: options.posixBasePath,
-      depth: 0
-    }];
+/***/ }),
 
-    // The number of directories that are currently being processed
-    this.pending = 0;
+/***/ "../../node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    // The data that has been read, but not yet emitted
-    this.buffer = [];
+var licenseIDs = __webpack_require__("../../node_modules/spdx-license-ids/spdx-license-ids.json");
 
-    this.stream = new Readable({ objectMode: true });
-    this.stream._read = () => {
-      // Start (or resume) reading
-      this.shouldRead = true;
+function valid(string) {
+  return licenseIDs.indexOf(string) > -1;
+}
 
-      // If we have data in the buffer, then send the next chunk
-      if (this.buffer.length > 0) {
-        this.pushFromBuffer();
-      }
+// Common transpositions of license identifier acronyms
+var transpositions = [
+  ['APGL', 'AGPL'],
+  ['Gpl', 'GPL'],
+  ['GLP', 'GPL'],
+  ['APL', 'Apache'],
+  ['ISD', 'ISC'],
+  ['GLP', 'GPL'],
+  ['IST', 'ISC'],
+  ['Claude', 'Clause'],
+  [' or later', '+'],
+  [' International', ''],
+  ['GNU', 'GPL'],
+  ['GUN', 'GPL'],
+  ['+', ''],
+  ['GNU GPL', 'GPL'],
+  ['GNU/GPL', 'GPL'],
+  ['GNU GLP', 'GPL'],
+  ['GNU General Public License', 'GPL'],
+  ['Gnu public license', 'GPL'],
+  ['GNU Public License', 'GPL'],
+  ['GNU GENERAL PUBLIC LICENSE', 'GPL'],
+  ['MTI', 'MIT'],
+  ['Mozilla Public License', 'MPL'],
+  ['WTH', 'WTF'],
+  ['-License', '']
+];
 
-      // If we have directories queued, then start processing the next one
-      if (this.queue.length > 0) {
-        if (this.options.facade.sync) {
-          while (this.queue.length > 0) {
-            this.readNextDirectory();
-          }
-        }
-        else {
-          this.readNextDirectory();
-        }
-      }
+var TRANSPOSED = 0;
+var CORRECT = 1;
 
-      this.checkForEOF();
-    };
+// Simple corrections to nearly valid identifiers.
+var transforms = [
+  // e.g. 'mit'
+  function(argument) {
+    return argument.toUpperCase();
+  },
+  // e.g. 'MIT '
+  function(argument) {
+    return argument.trim();
+  },
+  // e.g. 'M.I.T.'
+  function(argument) {
+    return argument.replace(/\./g, '');
+  },
+  // e.g. 'Apache- 2.0'
+  function(argument) {
+    return argument.replace(/\s+/g, '');
+  },
+  // e.g. 'CC BY 4.0''
+  function(argument) {
+    return argument.replace(/\s+/g, '-');
+  },
+  // e.g. 'LGPLv2.1'
+  function(argument) {
+    return argument.replace('v', '-');
+  },
+  // e.g. 'Apache 2.0'
+  function(argument) {
+    return argument.replace(/,?\s*(\d)/, '-$1');
+  },
+  // e.g. 'GPL 2'
+  function(argument) {
+    return argument.replace(/,?\s*(\d)/, '-$1.0');
+  },
+  // e.g. 'Apache Version 2.0'
+  function(argument) {
+    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2');
+  },
+  // e.g. 'Apache Version 2'
+  function(argument) {
+    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0');
+  },
+  // e.g. 'ZLIB'
+  function(argument) {
+    return argument[0].toUpperCase() + argument.slice(1);
+  },
+  // e.g. 'MPL/2.0'
+  function(argument) {
+    return argument.replace('/', '-');
+  },
+  // e.g. 'Apache 2'
+  function(argument) {
+    return argument
+      .replace(/\s*V\s*(\d)/, '-$1')
+      .replace(/(\d)$/, '$1.0');
+  },
+  // e.g. 'GPL-2.0-'
+  function(argument) {
+    return argument.slice(0, argument.length - 1);
+  },
+  // e.g. 'GPL2'
+  function(argument) {
+    return argument.replace(/(\d)$/, '-$1.0');
+  },
+  // e.g. 'BSD 3'
+  function(argument) {
+    return argument.replace(/(-| )?(\d)$/, '-$2-Clause');
+  },
+  // e.g. 'BSD clause 3'
+  function(argument) {
+    return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause');
+  },
+  // e.g. 'BY-NC-4.0'
+  function(argument) {
+    return 'CC-' + argument;
+  },
+  // e.g. 'BY-NC'
+  function(argument) {
+    return 'CC-' + argument + '-4.0';
+  },
+  // e.g. 'Attribution-NonCommercial'
+  function(argument) {
+    return argument
+      .replace('Attribution', 'BY')
+      .replace('NonCommercial', 'NC')
+      .replace('NoDerivatives', 'ND')
+      .replace(/ (\d)/, '-$1')
+      .replace(/ ?International/, '');
+  },
+  // e.g. 'Attribution-NonCommercial'
+  function(argument) {
+    return 'CC-' +
+      argument
+      .replace('Attribution', 'BY')
+      .replace('NonCommercial', 'NC')
+      .replace('NoDerivatives', 'ND')
+      .replace(/ (\d)/, '-$1')
+      .replace(/ ?International/, '') +
+      '-4.0';
   }
+];
 
-  /**
-   * Reads the next directory in the queue
-   */
-  readNextDirectory () {
-    let facade = this.options.facade;
-    let dir = this.queue.shift();
-    this.pending++;
+// If all else fails, guess that strings containing certain substrings
+// meant to identify certain licenses.
+var lastResorts = [
+  ['UNLI', 'Unlicense'],
+  ['WTF', 'WTFPL'],
+  ['2 CLAUSE', 'BSD-2-Clause'],
+  ['2-CLAUSE', 'BSD-2-Clause'],
+  ['3 CLAUSE', 'BSD-3-Clause'],
+  ['3-CLAUSE', 'BSD-3-Clause'],
+  ['AFFERO', 'AGPL-3.0'],
+  ['AGPL', 'AGPL-3.0'],
+  ['APACHE', 'Apache-2.0'],
+  ['ARTISTIC', 'Artistic-2.0'],
+  ['Affero', 'AGPL-3.0'],
+  ['BEER', 'Beerware'],
+  ['BOOST', 'BSL-1.0'],
+  ['BSD', 'BSD-2-Clause'],
+  ['ECLIPSE', 'EPL-1.0'],
+  ['FUCK', 'WTFPL'],
+  ['GNU', 'GPL-3.0'],
+  ['LGPL', 'LGPL-3.0'],
+  ['GPL', 'GPL-3.0'],
+  ['MIT', 'MIT'],
+  ['MPL', 'MPL-2.0'],
+  ['X11', 'X11'],
+  ['ZLIB', 'Zlib']
+];
 
-    // Read the directory listing
-    call.safe(facade.fs.readdir, dir.path, (err, items) => {
-      if (err) {
-        // fs.readdir threw an error
-        this.emit('error', err);
-        return this.finishedReadingDirectory();
-      }
+var SUBSTRING = 0;
+var IDENTIFIER = 1;
 
-      try {
-        // Process each item in the directory (simultaneously, if async)
-        facade.forEach(
-          items,
-          this.processItem.bind(this, dir),
-          this.finishedReadingDirectory.bind(this, dir)
-        );
-      }
-      catch (err2) {
-        // facade.forEach threw an error
-        // (probably because fs.readdir returned an invalid result)
-        this.emit('error', err2);
-        this.finishedReadingDirectory();
-      }
-    });
+var validTransformation = function(identifier) {
+  for (var i = 0; i < transforms.length; i++) {
+    var transformed = transforms[i](identifier);
+    if (transformed !== identifier && valid(transformed)) {
+      return transformed;
+    }
   }
+  return null;
+};
 
-  /**
-   * This method is called after all items in a directory have been processed.
-   *
-   * NOTE: This does not necessarily mean that the reader is finished, since there may still
-   * be other directories queued or pending.
-   */
-  finishedReadingDirectory () {
-    this.pending--;
+var validLastResort = function(identifier) {
+  var upperCased = identifier.toUpperCase();
+  for (var i = 0; i < lastResorts.length; i++) {
+    var lastResort = lastResorts[i];
+    if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) {
+      return lastResort[IDENTIFIER];
+    }
+  }
+  return null;
+};
 
-    if (this.shouldRead) {
-      // If we have directories queued, then start processing the next one
-      if (this.queue.length > 0 && this.options.facade.async) {
-        this.readNextDirectory();
+var anyCorrection = function(identifier, check) {
+  for (var i = 0; i < transpositions.length; i++) {
+    var transposition = transpositions[i];
+    var transposed = transposition[TRANSPOSED];
+    if (identifier.indexOf(transposed) > -1) {
+      var corrected = identifier.replace(
+        transposed,
+        transposition[CORRECT]
+      );
+      var checked = check(corrected);
+      if (checked !== null) {
+        return checked;
       }
-
-      this.checkForEOF();
     }
   }
+  return null;
+};
 
-  /**
-   * Determines whether the reader has finished processing all items in all directories.
-   * If so, then the "end" event is fired (via {@Readable#push})
-   */
-  checkForEOF () {
-    if (this.buffer.length === 0 &&   // The stuff we've already read
-    this.pending === 0 &&             // The stuff we're currently reading
-    this.queue.length === 0) {        // The stuff we haven't read yet
-      // There's no more stuff!
-      this.stream.push(null);
+module.exports = function(identifier) {
+  identifier = identifier.replace(/\+$/, '');
+  if (valid(identifier)) {
+    return identifier;
+  }
+  var transformed = validTransformation(identifier);
+  if (transformed !== null) {
+    return transformed;
+  }
+  transformed = anyCorrection(identifier, function(argument) {
+    if (valid(argument)) {
+      return argument;
     }
+    return validTransformation(argument);
+  });
+  if (transformed !== null) {
+    return transformed;
+  }
+  transformed = validLastResort(identifier);
+  if (transformed !== null) {
+    return transformed;
+  }
+  transformed = anyCorrection(identifier, validLastResort);
+  if (transformed !== null) {
+    return transformed;
   }
+  return null;
+};
 
-  /**
-   * Processes a single item in a directory.
-   *
-   * If the item is a directory, and `option.deep` is enabled, then the item will be added
-   * to the directory queue.
-   *
-   * If the item meets the filter criteria, then it will be emitted to the reader's stream.
-   *
-   * @param {object} dir - A directory object from the queue
-   * @param {string} item - The name of the item (name only, no path)
-   * @param {function} done - A callback function that is called after the item has been processed
-   */
-  processItem (dir, item, done) {
-    let stream = this.stream;
-    let options = this.options;
 
-    let itemPath = dir.basePath + item;
-    let posixPath = dir.posixBasePath + item;
-    let fullPath = path.join(dir.path, item);
+/***/ }),
 
-    // If `options.deep` is a number, and we've already recursed to the max depth,
-    // then there's no need to check fs.Stats to know if it's a directory.
-    // If `options.deep` is a function, then we'll need fs.Stats
-    let maxDepthReached = dir.depth >= options.recurseDepth;
+/***/ "../../node_modules/wcwidth/combining.js":
+/***/ (function(module, exports) {
 
-    // Do we need to call `fs.stat`?
-    let needStats =
-      !maxDepthReached ||                                 // we need the fs.Stats to know if it's a directory
-      options.stats ||                                    // the user wants fs.Stats objects returned
-      options.recurseFn ||                                // we need fs.Stats for the recurse function
-      options.filterFn ||                                 // we need fs.Stats for the filter function
-      EventEmitter.listenerCount(stream, 'file') ||       // we need the fs.Stats to know if it's a file
-      EventEmitter.listenerCount(stream, 'directory') ||  // we need the fs.Stats to know if it's a directory
-      EventEmitter.listenerCount(stream, 'symlink');      // we need the fs.Stats to know if it's a symlink
+module.exports = [
+    [ 0x0300, 0x036F ], [ 0x0483, 0x0486 ], [ 0x0488, 0x0489 ],
+    [ 0x0591, 0x05BD ], [ 0x05BF, 0x05BF ], [ 0x05C1, 0x05C2 ],
+    [ 0x05C4, 0x05C5 ], [ 0x05C7, 0x05C7 ], [ 0x0600, 0x0603 ],
+    [ 0x0610, 0x0615 ], [ 0x064B, 0x065E ], [ 0x0670, 0x0670 ],
+    [ 0x06D6, 0x06E4 ], [ 0x06E7, 0x06E8 ], [ 0x06EA, 0x06ED ],
+    [ 0x070F, 0x070F ], [ 0x0711, 0x0711 ], [ 0x0730, 0x074A ],
+    [ 0x07A6, 0x07B0 ], [ 0x07EB, 0x07F3 ], [ 0x0901, 0x0902 ],
+    [ 0x093C, 0x093C ], [ 0x0941, 0x0948 ], [ 0x094D, 0x094D ],
+    [ 0x0951, 0x0954 ], [ 0x0962, 0x0963 ], [ 0x0981, 0x0981 ],
+    [ 0x09BC, 0x09BC ], [ 0x09C1, 0x09C4 ], [ 0x09CD, 0x09CD ],
+    [ 0x09E2, 0x09E3 ], [ 0x0A01, 0x0A02 ], [ 0x0A3C, 0x0A3C ],
+    [ 0x0A41, 0x0A42 ], [ 0x0A47, 0x0A48 ], [ 0x0A4B, 0x0A4D ],
+    [ 0x0A70, 0x0A71 ], [ 0x0A81, 0x0A82 ], [ 0x0ABC, 0x0ABC ],
+    [ 0x0AC1, 0x0AC5 ], [ 0x0AC7, 0x0AC8 ], [ 0x0ACD, 0x0ACD ],
+    [ 0x0AE2, 0x0AE3 ], [ 0x0B01, 0x0B01 ], [ 0x0B3C, 0x0B3C ],
+    [ 0x0B3F, 0x0B3F ], [ 0x0B41, 0x0B43 ], [ 0x0B4D, 0x0B4D ],
+    [ 0x0B56, 0x0B56 ], [ 0x0B82, 0x0B82 ], [ 0x0BC0, 0x0BC0 ],
+    [ 0x0BCD, 0x0BCD ], [ 0x0C3E, 0x0C40 ], [ 0x0C46, 0x0C48 ],
+    [ 0x0C4A, 0x0C4D ], [ 0x0C55, 0x0C56 ], [ 0x0CBC, 0x0CBC ],
+    [ 0x0CBF, 0x0CBF ], [ 0x0CC6, 0x0CC6 ], [ 0x0CCC, 0x0CCD ],
+    [ 0x0CE2, 0x0CE3 ], [ 0x0D41, 0x0D43 ], [ 0x0D4D, 0x0D4D ],
+    [ 0x0DCA, 0x0DCA ], [ 0x0DD2, 0x0DD4 ], [ 0x0DD6, 0x0DD6 ],
+    [ 0x0E31, 0x0E31 ], [ 0x0E34, 0x0E3A ], [ 0x0E47, 0x0E4E ],
+    [ 0x0EB1, 0x0EB1 ], [ 0x0EB4, 0x0EB9 ], [ 0x0EBB, 0x0EBC ],
+    [ 0x0EC8, 0x0ECD ], [ 0x0F18, 0x0F19 ], [ 0x0F35, 0x0F35 ],
+    [ 0x0F37, 0x0F37 ], [ 0x0F39, 0x0F39 ], [ 0x0F71, 0x0F7E ],
+    [ 0x0F80, 0x0F84 ], [ 0x0F86, 0x0F87 ], [ 0x0F90, 0x0F97 ],
+    [ 0x0F99, 0x0FBC ], [ 0x0FC6, 0x0FC6 ], [ 0x102D, 0x1030 ],
+    [ 0x1032, 0x1032 ], [ 0x1036, 0x1037 ], [ 0x1039, 0x1039 ],
+    [ 0x1058, 0x1059 ], [ 0x1160, 0x11FF ], [ 0x135F, 0x135F ],
+    [ 0x1712, 0x1714 ], [ 0x1732, 0x1734 ], [ 0x1752, 0x1753 ],
+    [ 0x1772, 0x1773 ], [ 0x17B4, 0x17B5 ], [ 0x17B7, 0x17BD ],
+    [ 0x17C6, 0x17C6 ], [ 0x17C9, 0x17D3 ], [ 0x17DD, 0x17DD ],
+    [ 0x180B, 0x180D ], [ 0x18A9, 0x18A9 ], [ 0x1920, 0x1922 ],
+    [ 0x1927, 0x1928 ], [ 0x1932, 0x1932 ], [ 0x1939, 0x193B ],
+    [ 0x1A17, 0x1A18 ], [ 0x1B00, 0x1B03 ], [ 0x1B34, 0x1B34 ],
+    [ 0x1B36, 0x1B3A ], [ 0x1B3C, 0x1B3C ], [ 0x1B42, 0x1B42 ],
+    [ 0x1B6B, 0x1B73 ], [ 0x1DC0, 0x1DCA ], [ 0x1DFE, 0x1DFF ],
+    [ 0x200B, 0x200F ], [ 0x202A, 0x202E ], [ 0x2060, 0x2063 ],
+    [ 0x206A, 0x206F ], [ 0x20D0, 0x20EF ], [ 0x302A, 0x302F ],
+    [ 0x3099, 0x309A ], [ 0xA806, 0xA806 ], [ 0xA80B, 0xA80B ],
+    [ 0xA825, 0xA826 ], [ 0xFB1E, 0xFB1E ], [ 0xFE00, 0xFE0F ],
+    [ 0xFE20, 0xFE23 ], [ 0xFEFF, 0xFEFF ], [ 0xFFF9, 0xFFFB ],
+    [ 0x10A01, 0x10A03 ], [ 0x10A05, 0x10A06 ], [ 0x10A0C, 0x10A0F ],
+    [ 0x10A38, 0x10A3A ], [ 0x10A3F, 0x10A3F ], [ 0x1D167, 0x1D169 ],
+    [ 0x1D173, 0x1D182 ], [ 0x1D185, 0x1D18B ], [ 0x1D1AA, 0x1D1AD ],
+    [ 0x1D242, 0x1D244 ], [ 0xE0001, 0xE0001 ], [ 0xE0020, 0xE007F ],
+    [ 0xE0100, 0xE01EF ]
+]
 
-    // If we don't need stats, then exit early
-    if (!needStats) {
-      if (this.filter(itemPath, posixPath)) {
-        this.pushOrBuffer({ data: itemPath });
-      }
-      return done();
-    }
 
-    // Get the fs.Stats object for this path
-    stat(options.facade.fs, fullPath, (err, stats) => {
-      if (err) {
-        // fs.stat threw an error
-        this.emit('error', err);
-        return done();
-      }
+/***/ }),
 
-      try {
-        // Add the item's path to the fs.Stats object
-        // The base of this path, and its separators are determined by the options
-        // (i.e. options.basePath and options.sep)
-        stats.path = itemPath;
+/***/ "../../node_modules/wcwidth/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-        // Add depth of the path to the fs.Stats object for use this in the filter function
-        stats.depth = dir.depth;
+"use strict";
 
-        if (this.shouldRecurse(stats, posixPath, maxDepthReached)) {
-          // Add this subdirectory to the queue
-          this.queue.push({
-            path: fullPath,
-            basePath: itemPath + options.sep,
-            posixBasePath: posixPath + '/',
-            depth: dir.depth + 1,
-          });
-        }
 
-        // Determine whether this item matches the filter criteria
-        if (this.filter(stats, posixPath)) {
-          this.pushOrBuffer({
-            data: options.stats ? stats : itemPath,
-            file: stats.isFile(),
-            directory: stats.isDirectory(),
-            symlink: stats.isSymbolicLink(),
-          });
-        }
+var defaults = __webpack_require__("../../node_modules/defaults/index.js")
+var combining = __webpack_require__("../../node_modules/wcwidth/combining.js")
 
-        done();
-      }
-      catch (err2) {
-        // An error occurred while processing the item
-        // (probably during a user-specified function, such as options.deep, options.filter, etc.)
-        this.emit('error', err2);
-        done();
-      }
-    });
-  }
+var DEFAULTS = {
+  nul: 0,
+  control: 0
+}
 
-  /**
-   * Pushes the given chunk of data to the stream, or adds it to the buffer,
-   * depending on the state of the stream.
-   *
-   * @param {object} chunk
-   */
-  pushOrBuffer (chunk) {
-    // Add the chunk to the buffer
-    this.buffer.push(chunk);
+module.exports = function wcwidth(str) {
+  return wcswidth(str, DEFAULTS)
+}
 
-    // If we're still reading, then immediately emit the next chunk in the buffer
-    // (which may or may not be the chunk that we just added)
-    if (this.shouldRead) {
-      this.pushFromBuffer();
-    }
+module.exports.config = function(opts) {
+  opts = defaults(opts || {}, DEFAULTS)
+  return function wcwidth(str) {
+    return wcswidth(str, opts)
   }
+}
 
-  /**
-   * Immediately pushes the next chunk in the buffer to the reader's stream.
-   * The "data" event will always be fired (via {@link Readable#push}).
-   * In addition, the "file", "directory", and/or "symlink" events may be fired,
-   * depending on the type of properties of the chunk.
-   */
-  pushFromBuffer () {
-    let stream = this.stream;
-    let chunk = this.buffer.shift();
+/*
+ *  The following functions define the column width of an ISO 10646
+ *  character as follows:
+ *  - The null character (U+0000) has a column width of 0.
+ *  - Other C0/C1 control characters and DEL will lead to a return value
+ *    of -1.
+ *  - Non-spacing and enclosing combining characters (general category
+ *    code Mn or Me in the
+ *    Unicode database) have a column width of 0.
+ *  - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *  - Other format characters (general category code Cf in the Unicode
+ *    database) and ZERO WIDTH
+ *    SPACE (U+200B) have a column width of 0.
+ *  - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ *    have a column width of 0.
+ *  - Spacing characters in the East Asian Wide (W) or East Asian
+ *    Full-width (F) category as
+ *    defined in Unicode Technical Report #11 have a column width of 2.
+ *  - All remaining characters (including all printable ISO 8859-1 and
+ *    WGL4 characters, Unicode control characters, etc.) have a column
+ *    width of 1.
+ *  This implementation assumes that characters are encoded in ISO 10646.
+*/
 
-    // Stream the data
-    try {
-      this.shouldRead = stream.push(chunk.data);
-    }
-    catch (err) {
-      this.emit('error', err);
-    }
+function wcswidth(str, opts) {
+  if (typeof str !== 'string') return wcwidth(str, opts)
 
-    // Also emit specific events, based on the type of chunk
-    chunk.file && this.emit('file', chunk.data);
-    chunk.symlink && this.emit('symlink', chunk.data);
-    chunk.directory && this.emit('directory', chunk.data);
+  var s = 0
+  for (var i = 0; i < str.length; i++) {
+    var n = wcwidth(str.charCodeAt(i), opts)
+    if (n < 0) return -1
+    s += n
   }
 
-  /**
-   * Determines whether the given directory meets the user-specified recursion criteria.
-   * If the user didn't specify recursion criteria, then this function will default to true.
-   *
-   * @param {fs.Stats} stats - The directory's {@link fs.Stats} object
-   * @param {string} posixPath - The item's POSIX path (used for glob matching)
-   * @param {boolean} maxDepthReached - Whether we've already crawled the user-specified depth
-   * @returns {boolean}
-   */
-  shouldRecurse (stats, posixPath, maxDepthReached) {
-    let options = this.options;
+  return s
+}
 
-    if (maxDepthReached) {
-      // We've already crawled to the maximum depth. So no more recursion.
-      return false;
-    }
-    else if (!stats.isDirectory()) {
-      // It's not a directory. So don't try to crawl it.
-      return false;
-    }
-    else if (options.recurseGlob) {
-      // Glob patterns are always tested against the POSIX path, even on Windows
-      // https://github.com/isaacs/node-glob#windows
-      return options.recurseGlob.test(posixPath);
-    }
-    else if (options.recurseRegExp) {
-      // Regular expressions are tested against the normal path
-      // (based on the OS or options.sep)
-      return options.recurseRegExp.test(stats.path);
-    }
-    else if (options.recurseFn) {
-      try {
-        // Run the user-specified recursion criteria
-        return options.recurseFn.call(null, stats);
-      }
-      catch (err) {
-        // An error occurred in the user's code.
-        // In Sync and Async modes, this will return an error.
-        // In Streaming mode, we emit an "error" event, but continue processing
-        this.emit('error', err);
-      }
-    }
-    else {
-      // No recursion function was specified, and we're within the maximum depth.
-      // So crawl this directory.
-      return true;
-    }
-  }
+function wcwidth(ucs, opts) {
+  // test for 8-bit control characters
+  if (ucs === 0) return opts.nul
+  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return opts.control
 
-  /**
-   * Determines whether the given item meets the user-specified filter criteria.
-   * If the user didn't specify a filter, then this function will always return true.
-   *
-   * @param {string|fs.Stats} value - Either the item's path, or the item's {@link fs.Stats} object
-   * @param {string} posixPath - The item's POSIX path (used for glob matching)
-   * @returns {boolean}
-   */
-  filter (value, posixPath) {
-    let options = this.options;
+  // binary search in table of non-spacing characters
+  if (bisearch(ucs)) return 0
 
-    if (options.filterGlob) {
-      // Glob patterns are always tested against the POSIX path, even on Windows
-      // https://github.com/isaacs/node-glob#windows
-      return options.filterGlob.test(posixPath);
-    }
-    else if (options.filterRegExp) {
-      // Regular expressions are tested against the normal path
-      // (based on the OS or options.sep)
-      return options.filterRegExp.test(value.path || value);
-    }
-    else if (options.filterFn) {
-      try {
-        // Run the user-specified filter function
-        return options.filterFn.call(null, value);
-      }
-      catch (err) {
-        // An error occurred in the user's code.
-        // In Sync and Async modes, this will return an error.
-        // In Streaming mode, we emit an "error" event, but continue processing
-        this.emit('error', err);
-      }
-    }
-    else {
-      // No filter was specified, so match everything
-      return true;
-    }
-  }
+  // if we arrive here, ucs is not a combining or C0/C1 control character
+  return 1 +
+      (ucs >= 0x1100 &&
+       (ucs <= 0x115f ||                       // Hangul Jamo init. consonants
+        ucs == 0x2329 || ucs == 0x232a ||
+        (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+         ucs != 0x303f) ||                     // CJK ... Yi
+        (ucs >= 0xac00 && ucs <= 0xd7a3) ||    // Hangul Syllables
+        (ucs >= 0xf900 && ucs <= 0xfaff) ||    // CJK Compatibility Ideographs
+        (ucs >= 0xfe10 && ucs <= 0xfe19) ||    // Vertical forms
+        (ucs >= 0xfe30 && ucs <= 0xfe6f) ||    // CJK Compatibility Forms
+        (ucs >= 0xff00 && ucs <= 0xff60) ||    // Fullwidth Forms
+        (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+        (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+        (ucs >= 0x30000 && ucs <= 0x3fffd)));
+}
 
-  /**
-   * Emits an event.  If one of the event listeners throws an error,
-   * then an "error" event is emitted.
-   *
-   * @param {string} eventName
-   * @param {*} data
-   */
-  emit (eventName, data) {
-    let stream = this.stream;
+function bisearch(ucs) {
+  var min = 0
+  var max = combining.length - 1
+  var mid
 
-    try {
-      stream.emit(eventName, data);
-    }
-    catch (err) {
-      if (eventName === 'error') {
-        // Don't recursively emit "error" events.
-        // If the first one fails, then just throw
-        throw err;
-      }
-      else {
-        stream.emit('error', err);
-      }
-    }
+  if (ucs < combining[0][0] || ucs > combining[max][1]) return false
+
+  while (max >= min) {
+    mid = Math.floor((min + max) / 2)
+    if (ucs > combining[mid][1]) min = mid + 1
+    else if (ucs < combining[mid][0]) max = mid - 1
+    else return true
   }
-}
 
-module.exports = DirectoryReader;
+  return false
+}
 
 
 /***/ }),
-/* 732 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "../../node_modules/webpack/buildin/module.js":
+/***/ (function(module, exports) {
+
+module.exports = function(module) {
+	if (!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if (!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
 
 
-const path = __webpack_require__(4);
-const globToRegExp = __webpack_require__(733);
+/***/ }),
 
-module.exports = normalizeOptions;
+/***/ "../../node_modules/which/which.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-let isWindows = /^win/.test(process.platform);
+const isWindows = process.platform === 'win32' ||
+    process.env.OSTYPE === 'cygwin' ||
+    process.env.OSTYPE === 'msys'
 
-/**
- * @typedef {Object} FSFacade
- * @property {fs.readdir} readdir
- * @property {fs.stat} stat
- * @property {fs.lstat} lstat
- */
+const path = __webpack_require__("path")
+const COLON = isWindows ? ';' : ':'
+const isexe = __webpack_require__("../../node_modules/isexe/index.js")
 
-/**
- * Validates and normalizes the options argument
- *
- * @param {object} [options] - User-specified options, if any
- * @param {object} internalOptions - Internal options that aren't part of the public API
- *
- * @param {number|boolean|function} [options.deep]
- * The number of directories to recursively traverse. Any falsy value or negative number will
- * default to zero, so only the top-level contents will be returned. Set to `true` or `Infinity`
- * to traverse all subdirectories.  Or provide a function that accepts a {@link fs.Stats} object
- * and returns a truthy value if the directory's contents should be crawled.
- *
- * @param {function|string|RegExp} [options.filter]
- * A function that accepts a {@link fs.Stats} object and returns a truthy value if the data should
- * be returned.  Or a RegExp or glob string pattern, to filter by file name.
- *
- * @param {string} [options.sep]
- * The path separator to use. By default, the OS-specific separator will be used, but this can be
- * set to a specific value to ensure consistency across platforms.
- *
- * @param {string} [options.basePath]
- * The base path to prepend to each result. If empty, then all results will be relative to `dir`.
- *
- * @param {FSFacade} [options.fs]
- * Synchronous or asynchronous facades for Node.js File System module
- *
- * @param {object} [internalOptions.facade]
- * Synchronous or asynchronous facades for various methods, including for the Node.js File System module
- *
- * @param {boolean} [internalOptions.emit]
- * Indicates whether the reader should emit "file", "directory", and "symlink" events
- *
- * @param {boolean} [internalOptions.stats]
- * Indicates whether the reader should emit {@link fs.Stats} objects instead of path strings
- *
- * @returns {object}
- */
-function normalizeOptions (options, internalOptions) {
-  if (options === null || options === undefined) {
-    options = {};
-  }
-  else if (typeof options !== 'object') {
-    throw new TypeError('options must be an object');
-  }
+const getNotFoundError = (cmd) =>
+  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
 
-  let recurseDepth, recurseFn, recurseRegExp, recurseGlob, deep = options.deep;
-  if (deep === null || deep === undefined) {
-    recurseDepth = 0;
-  }
-  else if (typeof deep === 'boolean') {
-    recurseDepth = deep ? Infinity : 0;
-  }
-  else if (typeof deep === 'number') {
-    if (deep < 0 || isNaN(deep)) {
-      throw new Error('options.deep must be a positive number');
-    }
-    else if (Math.floor(deep) !== deep) {
-      throw new Error('options.deep must be an integer');
-    }
-    else {
-      recurseDepth = deep;
-    }
-  }
-  else if (typeof deep === 'function') {
-    recurseDepth = Infinity;
-    recurseFn = deep;
-  }
-  else if (deep instanceof RegExp) {
-    recurseDepth = Infinity;
-    recurseRegExp = deep;
-  }
-  else if (typeof deep === 'string' && deep.length > 0) {
-    recurseDepth = Infinity;
-    recurseGlob = globToRegExp(deep, { extended: true, globstar: true });
-  }
-  else {
-    throw new TypeError('options.deep must be a boolean, number, function, regular expression, or glob pattern');
-  }
+const getPathInfo = (cmd, opt) => {
+  const colon = opt.colon || COLON
 
-  let filterFn, filterRegExp, filterGlob, filter = options.filter;
-  if (filter !== null && filter !== undefined) {
-    if (typeof filter === 'function') {
-      filterFn = filter;
-    }
-    else if (filter instanceof RegExp) {
-      filterRegExp = filter;
-    }
-    else if (typeof filter === 'string' && filter.length > 0) {
-      filterGlob = globToRegExp(filter, { extended: true, globstar: true });
-    }
-    else {
-      throw new TypeError('options.filter must be a function, regular expression, or glob pattern');
-    }
-  }
+  // 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) : ['']
 
-  let sep = options.sep;
-  if (sep === null || sep === undefined) {
-    sep = path.sep;
-  }
-  else if (typeof sep !== 'string') {
-    throw new TypeError('options.sep must be a string');
+  if (isWindows) {
+    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
+      pathExt.unshift('')
   }
 
-  let basePath = options.basePath;
-  if (basePath === null || basePath === undefined) {
-    basePath = '';
-  }
-  else if (typeof basePath === 'string') {
-    // Append a path separator to the basePath, if necessary
-    if (basePath && basePath.substr(-1) !== sep) {
-      basePath += sep;
-    }
+  return {
+    pathEnv,
+    pathExt,
+    pathExtExe,
   }
-  else {
-    throw new TypeError('options.basePath must be a string');
+}
+
+const which = (cmd, opt, cb) => {
+  if (typeof opt === 'function') {
+    cb = opt
+    opt = {}
   }
+  if (!opt)
+    opt = {}
 
-  // Convert the basePath to POSIX (forward slashes)
-  // so that glob pattern matching works consistently, even on Windows
-  let posixBasePath = basePath;
-  if (posixBasePath && sep !== '/') {
-    posixBasePath = posixBasePath.replace(new RegExp('\\' + sep, 'g'), '/');
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
 
-    /* istanbul ignore if */
-    if (isWindows) {
-      // Convert Windows root paths (C:\) and UNCs (\\) to POSIX root paths
-      posixBasePath = posixBasePath.replace(/^([a-zA-Z]\:\/|\/\/)/, '/');
+  const step = i => new Promise((resolve, reject) => {
+    if (i === pathEnv.length)
+      return opt.all && found.length ? resolve(found)
+        : reject(getNotFoundError(cmd))
+
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
+
+    resolve(subStep(p, i, 0))
+  })
+
+  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))
+    })
+  })
+
+  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
+}
+
+const whichSync = (cmd, opt) => {
+  opt = opt || {}
+
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
+
+  for (let i = 0; i < pathEnv.length; i ++) {
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
+
+    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) {}
     }
   }
 
-  // Determine which facade methods to use
-  let facade;
-  if (options.fs === null || options.fs === undefined) {
-    // The user didn't provide their own facades, so use our internal ones
-    facade = internalOptions.facade;
-  }
-  else if (typeof options.fs === 'object') {
-    // Merge the internal facade methods with the user-provided `fs` facades
-    facade = Object.assign({}, internalOptions.facade);
-    facade.fs = Object.assign({}, internalOptions.facade.fs, options.fs);
-  }
-  else {
-    throw new TypeError('options.fs must be an object');
-  }
+  if (opt.all && found.length)
+    return found
 
-  return {
-    recurseDepth,
-    recurseFn,
-    recurseRegExp,
-    recurseGlob,
-    filterFn,
-    filterRegExp,
-    filterGlob,
-    sep,
-    basePath,
-    posixBasePath,
-    facade,
-    emit: !!internalOptions.emit,
-    stats: !!internalOptions.stats,
-  };
+  if (opt.nothrow)
+    return null
+
+  throw getNotFoundError(cmd)
 }
 
+module.exports = which
+which.sync = whichSync
+
 
 /***/ }),
-/* 733 */
+
+/***/ "../../node_modules/wrappy/wrappy.js":
 /***/ (function(module, exports) {
 
-module.exports = function (glob, opts) {
-  if (typeof glob !== 'string') {
-    throw new TypeError('Expected a string');
+// 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')
+
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
+
+  return wrapper
+
+  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
   }
+}
 
-  var str = String(glob);
 
-  // The regexp we are building, as a string.
-  var reStr = "";
+/***/ }),
 
-  // Whether we are matching so called "extended" globs (like bash) and should
-  // support single character matching, matching ranges of characters, group
-  // matching, etc.
-  var extended = opts ? !!opts.extended : false;
+/***/ "../../node_modules/write-json-file/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // When globstar is _false_ (default), '/foo/*' is translated a regexp like
-  // '^\/foo\/.*$' which will match any string beginning with '/foo/'
-  // When globstar is _true_, '/foo/*' is translated to regexp like
-  // '^\/foo\/[^/]*$' which will match any string beginning with '/foo/' BUT
-  // which does not have a '/' to the right of it.
-  // E.g. with '/foo/*' these will match: '/foo/bar', '/foo/bar.txt' but
-  // these will not '/foo/bar/baz', '/foo/bar/baz.txt'
-  // Lastely, when globstar is _true_, '/foo/**' is equivelant to '/foo/*' when
-  // globstar is _false_
-  var globstar = opts ? !!opts.globstar : false;
+"use strict";
 
-  // If we are doing extended matching, this boolean is true when we are inside
-  // a group (eg {*.html,*.js}), and false otherwise.
-  var inGroup = false;
+const path = __webpack_require__("path");
+const fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js");
+const writeFileAtomic = __webpack_require__("../../node_modules/write-json-file/node_modules/write-file-atomic/index.js");
+const sortKeys = __webpack_require__("../../node_modules/sort-keys/index.js");
+const makeDir = __webpack_require__("../../node_modules/write-json-file/node_modules/make-dir/index.js");
+const pify = __webpack_require__("../../node_modules/pify/index.js");
+const detectIndent = __webpack_require__("../../node_modules/write-json-file/node_modules/detect-indent/index.js");
 
-  // RegExp flags (eg "i" ) to pass in to RegExp constructor.
-  var flags = opts && typeof( opts.flags ) === "string" ? opts.flags : "";
+const init = (fn, filePath, data, options) => {
+	if (!filePath) {
+		throw new TypeError('Expected a filepath');
+	}
 
-  var c;
-  for (var i = 0, len = str.length; i < len; i++) {
-    c = str[i];
+	if (data === undefined) {
+		throw new TypeError('Expected data to stringify');
+	}
 
-    switch (c) {
-    case "\\":
-    case "/":
-    case "$":
-    case "^":
-    case "+":
-    case ".":
-    case "(":
-    case ")":
-    case "=":
-    case "!":
-    case "|":
-      reStr += "\\" + c;
-      break;
+	options = Object.assign({
+		indent: '\t',
+		sortKeys: false
+	}, options);
 
-    case "?":
-      if (extended) {
-        reStr += ".";
-	    break;
-      }
+	if (options.sortKeys) {
+		data = sortKeys(data, {
+			deep: true,
+			compare: typeof options.sortKeys === 'function' ? options.sortKeys : undefined
+		});
+	}
 
-    case "[":
-    case "]":
-      if (extended) {
-        reStr += c;
-	    break;
-      }
+	return fn(filePath, data, options);
+};
 
-    case "{":
-      if (extended) {
-        inGroup = true;
-	    reStr += "(";
-	    break;
-      }
+const readFile = filePath => pify(fs.readFile)(filePath, 'utf8').catch(() => {});
 
-    case "}":
-      if (extended) {
-        inGroup = false;
-	    reStr += ")";
-	    break;
-      }
+const main = (filePath, data, options) => {
+	return (options.detectIndent ? readFile(filePath) : Promise.resolve())
+		.then(string => {
+			const indent = string ? detectIndent(string).indent : options.indent;
+			const json = JSON.stringify(data, options.replacer, indent);
 
-    case ",":
-      if (inGroup) {
-        reStr += "|";
-	    break;
-      }
-      reStr += "\\" + c;
-      break;
+			return pify(writeFileAtomic)(filePath, `${json}\n`, {mode: options.mode});
+		});
+};
 
-    case "*":
-      // Move over all consecutive "*"'s.
-      // Also store the previous and next characters
-      var prevChar = str[i - 1];
-      var starCount = 1;
-      while(str[i + 1] === "*") {
-        starCount++;
-        i++;
-      }
-      var nextChar = str[i + 1];
+const mainSync = (filePath, data, options) => {
+	let {indent} = options;
 
-      if (!globstar) {
-        // globstar is disabled, so treat any number of "*" as one
-        reStr += ".*";
-      } else {
-        // globstar is enabled, so determine if this is a globstar segment
-        var isGlobstar = starCount > 1                      // multiple "*"'s
-          && (prevChar === "/" || prevChar === undefined)   // from the start of the segment
-          && (nextChar === "/" || nextChar === undefined)   // to the end of the segment
+	if (options.detectIndent) {
+		try {
+			const file = fs.readFileSync(filePath, 'utf8');
+			indent = detectIndent(file).indent;
+		} catch (error) {
+			if (error.code !== 'ENOENT') {
+				throw error;
+			}
+		}
+	}
 
-        if (isGlobstar) {
-          // it's a globstar, so match zero or more path segments
-          reStr += "(?:[^/]*(?:\/|$))*";
-          i++; // move over the "/"
-        } else {
-          // it's not a globstar, so only match one path segment
-          reStr += "[^/]*";
-        }
-      }
-      break;
+	const json = JSON.stringify(data, options.replacer, indent);
 
-    default:
-      reStr += c;
-    }
-  }
+	return writeFileAtomic.sync(filePath, `${json}\n`, {mode: options.mode});
+};
 
-  // When regexp 'g' flag is specified don't
-  // constrain the regular expression with ^ & $
-  if (!flags || !~flags.indexOf('g')) {
-    reStr = "^" + reStr + "$";
-  }
+const writeJsonFile = (filePath, data, options) => {
+	return makeDir(path.dirname(filePath), {fs})
+		.then(() => init(main, filePath, data, options));
+};
 
-  return new RegExp(reStr, flags);
+module.exports = writeJsonFile;
+// TODO: Remove this for the next major release
+module.exports.default = writeJsonFile;
+module.exports.sync = (filePath, data, options) => {
+	makeDir.sync(path.dirname(filePath), {fs});
+	init(mainSync, filePath, data, options);
 };
 
 
 /***/ }),
-/* 734 */
+
+/***/ "../../node_modules/write-json-file/node_modules/detect-indent/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(735);
+// detect either spaces or tabs but not both to properly handle tabs
+// for indentation and spaces for alignment
+const INDENT_RE = /^(?:( )+|\t+)/;
 
-module.exports = stat;
+function getMostUsed(indents) {
+	let result = 0;
+	let maxUsed = 0;
+	let maxWeight = 0;
 
-/**
- * Retrieves the {@link fs.Stats} for the given path. If the path is a symbolic link,
- * then the Stats of the symlink's target are returned instead.  If the symlink is broken,
- * then the Stats of the symlink itself are returned.
- *
- * @param {object} fs - Synchronous or Asynchronouse facade for the "fs" module
- * @param {string} path - The path to return stats for
- * @param {function} callback
- */
-function stat (fs, path, callback) {
-  let isSymLink = false;
+	for (const entry of indents) {
+		// TODO: use destructuring when targeting Node.js 6
+		const key = entry[0];
+		const val = entry[1];
 
-  call.safe(fs.lstat, path, (err, lstats) => {
-    if (err) {
-      // fs.lstat threw an eror
-      return callback(err);
-    }
+		const u = val[0];
+		const w = val[1];
 
-    try {
-      isSymLink = lstats.isSymbolicLink();
-    }
-    catch (err2) {
-      // lstats.isSymbolicLink() threw an error
-      // (probably because fs.lstat returned an invalid result)
-      return callback(err2);
-    }
+		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
+			maxUsed = u;
+			maxWeight = w;
+			result = Number(key);
+		}
+	}
 
-    if (isSymLink) {
-      // Try to resolve the symlink
-      symlinkStat(fs, path, lstats, callback);
-    }
-    else {
-      // It's not a symlink, so return the stats as-is
-      callback(null, lstats);
-    }
-  });
+	return result;
 }
 
-/**
- * Retrieves the {@link fs.Stats} for the target of the given symlink.
- * If the symlink is broken, then the Stats of the symlink itself are returned.
- *
- * @param {object} fs - Synchronous or Asynchronouse facade for the "fs" module
- * @param {string} path - The path of the symlink to return stats for
- * @param {object} lstats - The stats of the symlink
- * @param {function} callback
- */
-function symlinkStat (fs, path, lstats, callback) {
-  call.safe(fs.stat, path, (err, stats) => {
-    if (err) {
-      // The symlink is broken, so return the stats for the link itself
-      return callback(null, lstats);
-    }
+module.exports = str => {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-    try {
-      // Return the stats for the resolved symlink target,
-      // and override the `isSymbolicLink` method to indicate that it's a symlink
-      stats.isSymbolicLink = () => true;
-    }
-    catch (err2) {
-      // Setting stats.isSymbolicLink threw an error
-      // (probably because fs.stat returned an invalid result)
-      return callback(err2);
-    }
+	// used to see if tabs or spaces are the most used
+	let tabs = 0;
+	let spaces = 0;
 
-    callback(null, stats);
-  });
-}
+	// remember the size of previous line's indentation
+	let prev = 0;
+
+	// 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();
+
+	// pointer to the array of last used indent
+	let current;
+
+	// whether the last action was an indent (opposed to an unindent)
+	let isIndent;
+
+	for (const line of str.split(/\n/g)) {
+		if (!line) {
+			// ignore empty lines
+			continue;
+		}
+
+		let indent;
+		const matches = line.match(INDENT_RE);
+
+		if (matches) {
+			indent = matches[0].length;
+
+			if (matches[1]) {
+				spaces++;
+			} else {
+				tabs++;
+			}
+		} else {
+			indent = 0;
+		}
+
+		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
+	};
+};
 
 
 /***/ }),
-/* 735 */
+
+/***/ "../../node_modules/write-json-file/node_modules/make-dir/index.js":
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const fs = __webpack_require__("fs");
+const path = __webpack_require__("path");
+const pify = __webpack_require__("../../node_modules/pify/index.js");
+const semver = __webpack_require__("../../node_modules/write-json-file/node_modules/semver/semver.js");
 
-let call = module.exports = {
-  safe: safeCall,
-  once: callOnce,
+const defaults = {
+	mode: 0o777 & (~process.umask()),
+	fs
 };
 
-/**
- * Calls a function with the given arguments, and ensures that the error-first callback is _always_
- * invoked exactly once, even if the function throws an error.
- *
- * @param {function} fn - The function to invoke
- * @param {...*} args - The arguments to pass to the function. The final argument must be a callback function.
- */
-function safeCall (fn, args) {
-  // Get the function arguments as an array
-  args = Array.prototype.slice.call(arguments, 1);
+const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
 
-  // Replace the callback function with a wrapper that ensures it will only be called once
-  let callback = call.once(args.pop());
-  args.push(callback);
+// 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, ''));
 
-  try {
-    fn.apply(null, args);
-  }
-  catch (err) {
-    callback(err);
-  }
-}
+		if (pathHasInvalidWinCharacters) {
+			const error = new Error(`Path contains invalid characters: ${pth}`);
+			error.code = 'EINVAL';
+			throw error;
+		}
+	}
+};
 
-/**
- * Returns a wrapper function that ensures the given callback function is only called once.
- * Subsequent calls are ignored, unless the first argument is an Error, in which case the
- * error is thrown.
- *
- * @param {function} fn - The function that should only be called once
- * @returns {function}
- */
-function callOnce (fn) {
-  let fulfilled = false;
+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 function onceWrapper (err) {
-    if (!fulfilled) {
-      fulfilled = true;
-      return fn.apply(this, arguments);
-    }
-    else if (err) {
-      // The callback has already been called, but now an error has occurred
-      // (most likely inside the callback function). So re-throw the error,
-      // so it gets handled further up the call stack
-      throw err;
-    }
-  };
-}
+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);
 
-/***/ }),
-/* 736 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
+		const pth = path.resolve(input);
 
-"use strict";
+		return mkdir(pth, {
+			mode: options.mode,
+			recursive: true
+		}).then(() => pth);
+	}
 
+	const make = pth => {
+		return mkdir(pth, options.mode)
+			.then(() => pth)
+			.catch(error => {
+				if (error.code === 'EPERM') {
+					throw error;
+				}
 
-const fs = __webpack_require__(132);
-const call = __webpack_require__(735);
+				if (error.code === 'ENOENT') {
+					if (path.dirname(pth) === pth) {
+						throw permissionError(pth);
+					}
 
-/**
- * A facade around {@link fs.readdirSync} that allows it to be called
- * the same way as {@link fs.readdir}.
- *
- * @param {string} dir
- * @param {function} callback
- */
-exports.readdir = function (dir, callback) {
-  // Make sure the callback is only called once
-  callback = call.once(callback);
+					if (error.message.includes('null bytes')) {
+						throw error;
+					}
 
-  try {
-    let items = fs.readdirSync(dir);
-    callback(null, items);
-  }
-  catch (err) {
-    callback(err);
-  }
-};
+					return make(path.dirname(pth)).then(() => make(pth));
+				}
 
-/**
- * A facade around {@link fs.statSync} that allows it to be called
- * the same way as {@link fs.stat}.
- *
- * @param {string} path
- * @param {function} callback
- */
-exports.stat = function (path, callback) {
-  // Make sure the callback is only called once
-  callback = call.once(callback);
+				return stat(pth)
+					.then(stats => stats.isDirectory() ? pth : Promise.reject())
+					.catch(() => {
+						throw error;
+					});
+			});
+	};
 
-  try {
-    let stats = fs.statSync(path);
-    callback(null, stats);
-  }
-  catch (err) {
-    callback(err);
-  }
-};
+	return make(path.resolve(input));
+});
 
-/**
- * A facade around {@link fs.lstatSync} that allows it to be called
- * the same way as {@link fs.lstat}.
- *
- * @param {string} path
- * @param {function} callback
- */
-exports.lstat = function (path, callback) {
-  // Make sure the callback is only called once
-  callback = call.once(callback);
+module.exports = makeDir;
+module.exports.default = makeDir;
 
-  try {
-    let stats = fs.lstatSync(path);
-    callback(null, stats);
-  }
-  catch (err) {
-    callback(err);
-  }
-};
+module.exports.sync = (input, options) => {
+	checkPath(input);
+	options = Object.assign({}, defaults, options);
 
+	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
+		const pth = path.resolve(input);
 
-/***/ }),
-/* 737 */
-/***/ (function(module, exports, __webpack_require__) {
+		fs.mkdirSync(pth, {
+			mode: options.mode,
+			recursive: true
+		});
 
-"use strict";
+		return pth;
+	}
 
+	const make = pth => {
+		try {
+			options.fs.mkdirSync(pth, options.mode);
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
+			}
 
-module.exports = syncForEach;
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
 
-/**
- * A facade that allows {@link Array.forEach} to be called as though it were asynchronous.
- *
- * @param {array} array - The array to iterate over
- * @param {function} iterator - The function to call for each item in the array
- * @param {function} done - The function to call when all iterators have completed
- */
-function syncForEach (array, iterator, done) {
-  array.forEach(item => {
-    iterator(item, () => {
-      // Note: No error-handling here because this is currently only ever called
-      // by DirectoryReader, which never passes an `error` parameter to the callback.
-      // Instead, DirectoryReader emits an "error" event if an error occurs.
-    });
-  });
+				if (error.message.includes('null bytes')) {
+					throw error;
+				}
 
-  done();
-}
+				make(path.dirname(pth));
+				return make(pth);
+			}
 
+			try {
+				if (!options.fs.statSync(pth).isDirectory()) {
+					throw new Error('The path is not a directory');
+				}
+			} catch (_) {
+				throw error;
+			}
+		}
 
-/***/ }),
-/* 738 */
-/***/ (function(module, exports, __webpack_require__) {
+		return pth;
+	};
 
-"use strict";
+	return make(path.resolve(input));
+};
 
 
-module.exports = readdirAsync;
+/***/ }),
 
-const maybe = __webpack_require__(739);
-const DirectoryReader = __webpack_require__(731);
+/***/ "../../node_modules/write-json-file/node_modules/semver/semver.js":
+/***/ (function(module, exports) {
 
-let asyncFacade = {
-  fs: __webpack_require__(132),
-  forEach: __webpack_require__(740),
-  async: true
-};
+exports = module.exports = SemVer
 
-/**
- * Returns the buffered output from an asynchronous {@link DirectoryReader},
- * via an error-first callback or a {@link Promise}.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {function} [callback]
- * @param {object} internalOptions
- */
-function readdirAsync (dir, options, callback, internalOptions) {
-  if (typeof options === 'function') {
-    callback = options;
-    options = undefined;
+var debug
+/* istanbul ignore next */
+if (typeof process === 'object' &&
+    process.env &&
+    process.env.NODE_DEBUG &&
+    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
+  debug = function () {
+    var args = Array.prototype.slice.call(arguments, 0)
+    args.unshift('SEMVER')
+    console.log.apply(console, args)
   }
+} else {
+  debug = function () {}
+}
 
-  return maybe(callback, new Promise(((resolve, reject) => {
-    let results = [];
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+exports.SEMVER_SPEC_VERSION = '2.0.0'
 
-    internalOptions.facade = asyncFacade;
+var MAX_LENGTH = 256
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+  /* istanbul ignore next */ 9007199254740991
 
-    let reader = new DirectoryReader(dir, options, internalOptions);
-    let stream = reader.stream;
+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16
 
-    stream.on('error', err => {
-      reject(err);
-      stream.pause();
-    });
-    stream.on('data', result => {
-      results.push(result);
-    });
-    stream.on('end', () => {
-      resolve(results);
-    });
-  })));
-}
+// The actual regexps go on exports.re
+var re = exports.re = []
+var src = exports.src = []
+var R = 0
 
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
-/***/ }),
-/* 739 */
-/***/ (function(module, exports, __webpack_require__) {
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-"use strict";
+var NUMERICIDENTIFIER = R++
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
+var NUMERICIDENTIFIERLOOSE = R++
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
-var next = (global.process && process.nextTick) || global.setImmediate || function (f) {
-  setTimeout(f, 0)
-}
+var NONNUMERICIDENTIFIER = R++
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-module.exports = function maybe (cb, promise) {
-  if (cb) {
-    promise
-      .then(function (result) {
-        next(function () { cb(null, result) })
-      }, function (err) {
-        next(function () { cb(err) })
-      })
-    return undefined
-  }
-  else {
-    return promise
-  }
-}
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
+var MAINVERSION = R++
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')'
 
-/***/ }),
-/* 740 */
-/***/ (function(module, exports, __webpack_require__) {
+var MAINVERSIONLOOSE = R++
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
 
-"use strict";
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
+var PRERELEASEIDENTIFIER = R++
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-module.exports = asyncForEach;
+var PRERELEASEIDENTIFIERLOOSE = R++
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-/**
- * Simultaneously processes all items in the given array.
- *
- * @param {array} array - The array to iterate over
- * @param {function} iterator - The function to call for each item in the array
- * @param {function} done - The function to call when all iterators have completed
- */
-function asyncForEach (array, iterator, done) {
-  if (array.length === 0) {
-    // NOTE: Normally a bad idea to mix sync and async, but it's safe here because
-    // of the way that this method is currently used by DirectoryReader.
-    done();
-    return;
-  }
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
-  // Simultaneously process all items in the array.
-  let pending = array.length;
-  array.forEach(item => {
-    iterator(item, () => {
-      if (--pending === 0) {
-        done();
-      }
-    });
-  });
-}
+var PRERELEASE = R++
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
 
+var PRERELEASELOOSE = R++
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-/***/ }),
-/* 741 */
-/***/ (function(module, exports, __webpack_require__) {
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-"use strict";
+var BUILDIDENTIFIER = R++
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-module.exports = readdirStream;
+var BUILD = R++
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
 
-const DirectoryReader = __webpack_require__(731);
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
 
-let streamFacade = {
-  fs: __webpack_require__(132),
-  forEach: __webpack_require__(740),
-  async: true
-};
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups.  The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
 
-/**
- * Returns the {@link stream.Readable} of an asynchronous {@link DirectoryReader}.
- *
- * @param {string} dir
- * @param {object} [options]
- * @param {object} internalOptions
- */
-function readdirStream (dir, options, internalOptions) {
-  internalOptions.facade = streamFacade;
+var FULL = R++
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?'
 
-  let reader = new DirectoryReader(dir, options, internalOptions);
-  return reader.stream;
-}
+src[FULL] = '^' + FULLPLAIN + '$'
 
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
+                 src[PRERELEASELOOSE] + '?' +
+                 src[BUILD] + '?'
 
-/***/ }),
-/* 742 */
-/***/ (function(module, exports, __webpack_require__) {
+var LOOSE = R++
+src[LOOSE] = '^' + LOOSEPLAIN + '$'
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-var deep_1 = __webpack_require__(743);
-var entry_1 = __webpack_require__(745);
-var pathUtil = __webpack_require__(744);
-var Reader = /** @class */ (function () {
-    function Reader(options) {
-        this.options = options;
-        this.micromatchOptions = this.getMicromatchOptions();
-        this.entryFilter = new entry_1.default(options, this.micromatchOptions);
-        this.deepFilter = new deep_1.default(options, this.micromatchOptions);
-    }
-    /**
-     * Returns root path to scanner.
-     */
-    Reader.prototype.getRootDirectory = function (task) {
-        return path.resolve(this.options.cwd, task.base);
-    };
-    /**
-     * Returns options for reader.
-     */
-    Reader.prototype.getReaderOptions = function (task) {
-        return {
-            basePath: task.base === '.' ? '' : task.base,
-            filter: this.entryFilter.getFilter(task.positive, task.negative),
-            deep: this.deepFilter.getFilter(task.positive, task.negative),
-            sep: '/'
-        };
-    };
-    /**
-     * Returns options for micromatch.
-     */
-    Reader.prototype.getMicromatchOptions = function () {
-        return {
-            dot: this.options.dot,
-            nobrace: !this.options.brace,
-            noglobstar: !this.options.globstar,
-            noext: !this.options.extension,
-            nocase: !this.options.case,
-            matchBase: this.options.matchBase
-        };
-    };
-    /**
-     * Returns transformed entry.
-     */
-    Reader.prototype.transform = function (entry) {
-        if (this.options.absolute) {
-            entry.path = pathUtil.makeAbsolute(this.options.cwd, entry.path);
-        }
-        if (this.options.markDirectories && entry.isDirectory()) {
-            entry.path += '/';
-        }
-        var item = this.options.stats ? entry : entry.path;
-        if (this.options.transform === null) {
-            return item;
-        }
-        return this.options.transform(item);
-    };
-    /**
-     * Returns true if error has ENOENT code.
-     */
-    Reader.prototype.isEnoentCodeError = function (err) {
-        return err.code === 'ENOENT';
-    };
-    return Reader;
-}());
-exports.default = Reader;
+var GTLT = R++
+src[GTLT] = '((?:<|>)?=?)'
+
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+var XRANGEIDENTIFIERLOOSE = R++
+src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
+var XRANGEIDENTIFIER = R++
+src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*'
 
+var XRANGEPLAIN = R++
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?'
 
-/***/ }),
-/* 743 */
-/***/ (function(module, exports, __webpack_require__) {
+var XRANGEPLAINLOOSE = R++
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?'
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(744);
-var patternUtils = __webpack_require__(578);
-var DeepFilter = /** @class */ (function () {
-    function DeepFilter(options, micromatchOptions) {
-        this.options = options;
-        this.micromatchOptions = micromatchOptions;
-    }
-    /**
-     * Returns filter for directories.
-     */
-    DeepFilter.prototype.getFilter = function (positive, negative) {
-        var _this = this;
-        var maxPatternDepth = this.getMaxPatternDepth(positive);
-        var negativeRe = this.getNegativePatternsRe(negative);
-        return function (entry) { return _this.filter(entry, negativeRe, maxPatternDepth); };
-    };
-    /**
-     * Returns max depth of the provided patterns.
-     */
-    DeepFilter.prototype.getMaxPatternDepth = function (patterns) {
-        var globstar = patterns.some(patternUtils.hasGlobStar);
-        return globstar ? Infinity : patternUtils.getMaxNaivePatternsDepth(patterns);
-    };
-    /**
-     * Returns RegExp's for patterns that can affect the depth of reading.
-     */
-    DeepFilter.prototype.getNegativePatternsRe = function (patterns) {
-        var affectDepthOfReadingPatterns = patterns.filter(patternUtils.isAffectDepthOfReadingPattern);
-        return patternUtils.convertPatternsToRe(affectDepthOfReadingPatterns, this.micromatchOptions);
-    };
-    /**
-     * Returns «true» for directory that should be read.
-     */
-    DeepFilter.prototype.filter = function (entry, negativeRe, maxPatternDepth) {
-        if (this.isSkippedByDeepOption(entry.depth)) {
-            return false;
-        }
-        if (this.isSkippedByMaxPatternDepth(entry.depth, maxPatternDepth)) {
-            return false;
-        }
-        if (this.isSkippedSymlinkedDirectory(entry)) {
-            return false;
-        }
-        if (this.isSkippedDotDirectory(entry)) {
-            return false;
-        }
-        return this.isSkippedByNegativePatterns(entry, negativeRe);
-    };
-    /**
-     * Returns «true» when the «deep» option is disabled or number and depth of the entry is greater that the option value.
-     */
-    DeepFilter.prototype.isSkippedByDeepOption = function (entryDepth) {
-        return !this.options.deep || (typeof this.options.deep === 'number' && entryDepth >= this.options.deep);
-    };
-    /**
-     * Returns «true» when depth parameter is not an Infinity and entry depth greater that the parameter value.
-     */
-    DeepFilter.prototype.isSkippedByMaxPatternDepth = function (entryDepth, maxPatternDepth) {
-        return maxPatternDepth !== Infinity && entryDepth >= maxPatternDepth;
-    };
-    /**
-     * Returns «true» for symlinked directory if the «followSymlinkedDirectories» option is disabled.
-     */
-    DeepFilter.prototype.isSkippedSymlinkedDirectory = function (entry) {
-        return !this.options.followSymlinkedDirectories && entry.isSymbolicLink();
-    };
-    /**
-     * Returns «true» for a directory whose name starts with a period if «dot» option is disabled.
-     */
-    DeepFilter.prototype.isSkippedDotDirectory = function (entry) {
-        return !this.options.dot && pathUtils.isDotDirectory(entry.path);
-    };
-    /**
-     * Returns «true» for a directory whose path math to any negative pattern.
-     */
-    DeepFilter.prototype.isSkippedByNegativePatterns = function (entry, negativeRe) {
-        return !patternUtils.matchAny(entry.path, negativeRe);
-    };
-    return DeepFilter;
-}());
-exports.default = DeepFilter;
+var XRANGE = R++
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
+var XRANGELOOSE = R++
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
 
+// Coercion.
+// Extract anything that could conceivably be a part of a valid semver
+var COERCE = R++
+src[COERCE] = '(?:^|[^\\d])' +
+              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:$|[^\\d])'
 
-/***/ }),
-/* 744 */
-/***/ (function(module, exports, __webpack_require__) {
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++
+src[LONETILDE] = '(?:~>?)'
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-/**
- * Returns «true» if the last partial of the path starting with a period.
- */
-function isDotDirectory(filepath) {
-    return path.basename(filepath).startsWith('.');
-}
-exports.isDotDirectory = isDotDirectory;
-/**
- * Convert a windows-like path to a unix-style path.
- */
-function normalize(filepath) {
-    return filepath.replace(/\\/g, '/');
-}
-exports.normalize = normalize;
-/**
- * Returns normalized absolute path of provided filepath.
- */
-function makeAbsolute(cwd, filepath) {
-    return normalize(path.resolve(cwd, filepath));
-}
-exports.makeAbsolute = makeAbsolute;
+var TILDETRIM = R++
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
+var tildeTrimReplace = '$1~'
 
+var TILDE = R++
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
+var TILDELOOSE = R++
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
 
-/***/ }),
-/* 745 */
-/***/ (function(module, exports, __webpack_require__) {
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++
+src[LONECARET] = '(?:\\^)'
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(744);
-var patternUtils = __webpack_require__(578);
-var EntryFilter = /** @class */ (function () {
-    function EntryFilter(options, micromatchOptions) {
-        this.options = options;
-        this.micromatchOptions = micromatchOptions;
-        this.index = new Map();
-    }
-    /**
-     * Returns filter for directories.
-     */
-    EntryFilter.prototype.getFilter = function (positive, negative) {
-        var _this = this;
-        var positiveRe = patternUtils.convertPatternsToRe(positive, this.micromatchOptions);
-        var negativeRe = patternUtils.convertPatternsToRe(negative, this.micromatchOptions);
-        return function (entry) { return _this.filter(entry, positiveRe, negativeRe); };
-    };
-    /**
-     * Returns true if entry must be added to result.
-     */
-    EntryFilter.prototype.filter = function (entry, positiveRe, negativeRe) {
-        // Exclude duplicate results
-        if (this.options.unique) {
-            if (this.isDuplicateEntry(entry)) {
-                return false;
-            }
-            this.createIndexRecord(entry);
-        }
-        // Filter files and directories by options
-        if (this.onlyFileFilter(entry) || this.onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this.isSkippedByAbsoluteNegativePatterns(entry, negativeRe)) {
-            return false;
-        }
-        return this.isMatchToPatterns(entry.path, positiveRe) && !this.isMatchToPatterns(entry.path, negativeRe);
-    };
-    /**
-     * Return true if the entry already has in the cross reader index.
-     */
-    EntryFilter.prototype.isDuplicateEntry = function (entry) {
-        return this.index.has(entry.path);
-    };
-    /**
-     * Create record in the cross reader index.
-     */
-    EntryFilter.prototype.createIndexRecord = function (entry) {
-        this.index.set(entry.path, undefined);
-    };
-    /**
-     * Returns true for non-files if the «onlyFiles» option is enabled.
-     */
-    EntryFilter.prototype.onlyFileFilter = function (entry) {
-        return this.options.onlyFiles && !entry.isFile();
-    };
-    /**
-     * Returns true for non-directories if the «onlyDirectories» option is enabled.
-     */
-    EntryFilter.prototype.onlyDirectoryFilter = function (entry) {
-        return this.options.onlyDirectories && !entry.isDirectory();
-    };
-    /**
-     * Return true when `absolute` option is enabled and matched to the negative patterns.
-     */
-    EntryFilter.prototype.isSkippedByAbsoluteNegativePatterns = function (entry, negativeRe) {
-        if (!this.options.absolute) {
-            return false;
-        }
-        var fullpath = pathUtils.makeAbsolute(this.options.cwd, entry.path);
-        return this.isMatchToPatterns(fullpath, negativeRe);
-    };
-    /**
-     * Return true when entry match to provided patterns.
-     *
-     * First, just trying to apply patterns to the path.
-     * Second, trying to apply patterns to the path with final slash (need to micromatch to support «directory/**» patterns).
-     */
-    EntryFilter.prototype.isMatchToPatterns = function (filepath, patternsRe) {
-        return patternUtils.matchAny(filepath, patternsRe) || patternUtils.matchAny(filepath + '/', patternsRe);
-    };
-    return EntryFilter;
-}());
-exports.default = EntryFilter;
+var CARETTRIM = R++
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
+var caretTrimReplace = '$1^'
 
+var CARET = R++
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
+var CARETLOOSE = R++
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
 
-/***/ }),
-/* 746 */
-/***/ (function(module, exports, __webpack_require__) {
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+var COMPARATORLOOSE = R++
+src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$'
+var COMPARATOR = R++
+src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$'
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var stream = __webpack_require__(173);
-var fsStat = __webpack_require__(747);
-var fs_1 = __webpack_require__(751);
-var FileSystemStream = /** @class */ (function (_super) {
-    __extends(FileSystemStream, _super);
-    function FileSystemStream() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * Use stream API to read entries for Task.
-     */
-    FileSystemStream.prototype.read = function (patterns, filter) {
-        var _this = this;
-        var filepaths = patterns.map(this.getFullEntryPath, this);
-        var transform = new stream.Transform({ objectMode: true });
-        transform._transform = function (index, _enc, done) {
-            return _this.getEntry(filepaths[index], patterns[index]).then(function (entry) {
-                if (entry !== null && filter(entry)) {
-                    transform.push(entry);
-                }
-                if (index === filepaths.length - 1) {
-                    transform.end();
-                }
-                done();
-            });
-        };
-        for (var i = 0; i < filepaths.length; i++) {
-            transform.write(i);
-        }
-        return transform;
-    };
-    /**
-     * Return entry for the provided path.
-     */
-    FileSystemStream.prototype.getEntry = function (filepath, pattern) {
-        var _this = this;
-        return this.getStat(filepath)
-            .then(function (stat) { return _this.makeEntry(stat, pattern); })
-            .catch(function () { return null; });
-    };
-    /**
-     * Return fs.Stats for the provided path.
-     */
-    FileSystemStream.prototype.getStat = function (filepath) {
-        return fsStat.stat(filepath, { throwErrorOnBrokenSymlinks: false });
-    };
-    return FileSystemStream;
-}(fs_1.default));
-exports.default = FileSystemStream;
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+var COMPARATORTRIM = R++
+src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
+                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')'
 
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
+var comparatorTrimReplace = '$1$2$3'
 
-/***/ }),
-/* 747 */
-/***/ (function(module, exports, __webpack_require__) {
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+var HYPHENRANGE = R++
+src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
+                   '\\s+-\\s+' +
+                   '(' + src[XRANGEPLAIN] + ')' +
+                   '\\s*$'
 
-"use strict";
+var HYPHENRANGELOOSE = R++
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$'
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(748);
-const statProvider = __webpack_require__(750);
-/**
- * Asynchronous API.
- */
-function stat(path, opts) {
-    return new Promise((resolve, reject) => {
-        statProvider.async(path, optionsManager.prepare(opts), (err, stats) => err ? reject(err) : resolve(stats));
-    });
+// Star ranges basically just allow anything at all.
+var STAR = R++
+src[STAR] = '(<|>)?=?\\s*\\*'
+
+// Compile to actual regexp objects.
+// All are flag-free, unless they were created above with a flag.
+for (var i = 0; i < R; i++) {
+  debug(i, src[i])
+  if (!re[i]) {
+    re[i] = new RegExp(src[i])
+  }
 }
-exports.stat = stat;
-function statCallback(path, optsOrCallback, callback) {
-    if (typeof optsOrCallback === 'function') {
-        callback = optsOrCallback; /* tslint:disable-line: no-parameter-reassignment */
-        optsOrCallback = undefined; /* tslint:disable-line: no-parameter-reassignment */
-    }
-    if (typeof callback === 'undefined') {
-        throw new TypeError('The "callback" argument must be of type Function.');
+
+exports.parse = parse
+function parse (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
     }
-    statProvider.async(path, optionsManager.prepare(optsOrCallback), callback);
-}
-exports.statCallback = statCallback;
-/**
- * Synchronous API.
- */
-function statSync(path, opts) {
-    return statProvider.sync(path, optionsManager.prepare(opts));
-}
-exports.statSync = statSync;
+  }
 
+  if (version instanceof SemVer) {
+    return version
+  }
 
-/***/ }),
-/* 748 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (typeof version !== 'string') {
+    return null
+  }
 
-"use strict";
+  if (version.length > MAX_LENGTH) {
+    return null
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(749);
-function prepare(opts) {
-    const options = Object.assign({
-        fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
-        throwErrorOnBrokenSymlinks: true,
-        followSymlinks: true
-    }, opts);
-    return options;
+  var r = options.loose ? re[LOOSE] : re[FULL]
+  if (!r.test(version)) {
+    return null
+  }
+
+  try {
+    return new SemVer(version, options)
+  } catch (er) {
+    return null
+  }
 }
-exports.prepare = prepare;
 
+exports.valid = valid
+function valid (version, options) {
+  var v = parse(version, options)
+  return v ? v.version : null
+}
 
-/***/ }),
-/* 749 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.clean = clean
+function clean (version, options) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
+  return s ? s.version : null
+}
 
-"use strict";
+exports.SemVer = SemVer
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(132);
-exports.FILE_SYSTEM_ADAPTER = {
-    lstat: fs.lstat,
-    stat: fs.stat,
-    lstatSync: fs.lstatSync,
-    statSync: fs.statSync
-};
-function getFileSystemAdapter(fsMethods) {
-    if (!fsMethods) {
-        return exports.FILE_SYSTEM_ADAPTER;
+function SemVer (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
     }
-    return Object.assign({}, exports.FILE_SYSTEM_ADAPTER, fsMethods);
+  }
+  if (version instanceof SemVer) {
+    if (version.loose === options.loose) {
+      return version
+    } else {
+      version = version.version
+    }
+  } else if (typeof version !== 'string') {
+    throw new TypeError('Invalid Version: ' + version)
+  }
+
+  if (version.length > MAX_LENGTH) {
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  }
+
+  if (!(this instanceof SemVer)) {
+    return new SemVer(version, options)
+  }
+
+  debug('SemVer', version, options)
+  this.options = options
+  this.loose = !!options.loose
+
+  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
+
+  if (!m) {
+    throw new TypeError('Invalid Version: ' + version)
+  }
+
+  this.raw = version
+
+  // these are actually numbers
+  this.major = +m[1]
+  this.minor = +m[2]
+  this.patch = +m[3]
+
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
+    throw new TypeError('Invalid major version')
+  }
+
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+    throw new TypeError('Invalid minor version')
+  }
+
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+    throw new TypeError('Invalid patch version')
+  }
+
+  // numberify any prerelease numeric ids
+  if (!m[4]) {
+    this.prerelease = []
+  } else {
+    this.prerelease = m[4].split('.').map(function (id) {
+      if (/^[0-9]+$/.test(id)) {
+        var num = +id
+        if (num >= 0 && num < MAX_SAFE_INTEGER) {
+          return num
+        }
+      }
+      return id
+    })
+  }
+
+  this.build = m[5] ? m[5].split('.') : []
+  this.format()
 }
-exports.getFileSystemAdapter = getFileSystemAdapter;
 
+SemVer.prototype.format = function () {
+  this.version = this.major + '.' + this.minor + '.' + this.patch
+  if (this.prerelease.length) {
+    this.version += '-' + this.prerelease.join('.')
+  }
+  return this.version
+}
 
-/***/ }),
-/* 750 */
-/***/ (function(module, exports, __webpack_require__) {
+SemVer.prototype.toString = function () {
+  return this.version
+}
 
-"use strict";
+SemVer.prototype.compare = function (other) {
+  debug('SemVer.compare', this.version, this.options, other)
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-function sync(path, options) {
-    const lstat = options.fs.lstatSync(path);
-    if (!isFollowedSymlink(lstat, options)) {
-        return lstat;
-    }
-    try {
-        const stat = options.fs.statSync(path);
-        stat.isSymbolicLink = () => true;
-        return stat;
-    }
-    catch (err) {
-        if (!options.throwErrorOnBrokenSymlinks) {
-            return lstat;
-        }
-        throw err;
-    }
-}
-exports.sync = sync;
-function async(path, options, callback) {
-    options.fs.lstat(path, (err0, lstat) => {
-        if (err0) {
-            return callback(err0, undefined);
-        }
-        if (!isFollowedSymlink(lstat, options)) {
-            return callback(null, lstat);
-        }
-        options.fs.stat(path, (err1, stat) => {
-            if (err1) {
-                return options.throwErrorOnBrokenSymlinks ? callback(err1) : callback(null, lstat);
-            }
-            stat.isSymbolicLink = () => true;
-            callback(null, stat);
-        });
-    });
-}
-exports.async = async;
-/**
- * Returns `true` for followed symlink.
- */
-function isFollowedSymlink(stat, options) {
-    return stat.isSymbolicLink() && options.followSymlinks;
+  return this.compareMain(other) || this.comparePre(other)
 }
-exports.isFollowedSymlink = isFollowedSymlink;
 
+SemVer.prototype.compareMain = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-/***/ }),
-/* 751 */
-/***/ (function(module, exports, __webpack_require__) {
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch)
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = __webpack_require__(4);
-var FileSystem = /** @class */ (function () {
-    function FileSystem(options) {
-        this.options = options;
-    }
-    /**
-     * Return full path to entry.
-     */
-    FileSystem.prototype.getFullEntryPath = function (filepath) {
-        return path.resolve(this.options.cwd, filepath);
-    };
-    /**
-     * Return an implementation of the Entry interface.
-     */
-    FileSystem.prototype.makeEntry = function (stat, pattern) {
-        stat.path = pattern;
-        stat.depth = pattern.split('/').length;
-        return stat;
-    };
-    return FileSystem;
-}());
-exports.default = FileSystem;
+SemVer.prototype.comparePre = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
+  // NOT having a prerelease is > having one
+  if (this.prerelease.length && !other.prerelease.length) {
+    return -1
+  } else if (!this.prerelease.length && other.prerelease.length) {
+    return 1
+  } else if (!this.prerelease.length && !other.prerelease.length) {
+    return 0
+  }
 
-/***/ }),
-/* 752 */
-/***/ (function(module, exports, __webpack_require__) {
+  var i = 0
+  do {
+    var a = this.prerelease[i]
+    var b = other.prerelease[i]
+    debug('prerelease compare', i, a, b)
+    if (a === undefined && b === undefined) {
+      return 0
+    } else if (b === undefined) {
+      return 1
+    } else if (a === undefined) {
+      return -1
+    } else if (a === b) {
+      continue
+    } else {
+      return compareIdentifiers(a, b)
+    }
+  } while (++i)
+}
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var stream = __webpack_require__(173);
-var readdir = __webpack_require__(729);
-var reader_1 = __webpack_require__(742);
-var fs_stream_1 = __webpack_require__(746);
-var TransformStream = /** @class */ (function (_super) {
-    __extends(TransformStream, _super);
-    function TransformStream(reader) {
-        var _this = _super.call(this, { objectMode: true }) || this;
-        _this.reader = reader;
-        return _this;
-    }
-    TransformStream.prototype._transform = function (entry, _encoding, callback) {
-        callback(null, this.reader.transform(entry));
-    };
-    return TransformStream;
-}(stream.Transform));
-var ReaderStream = /** @class */ (function (_super) {
-    __extends(ReaderStream, _super);
-    function ReaderStream() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(ReaderStream.prototype, "fsAdapter", {
-        /**
-         * Returns FileSystem adapter.
-         */
-        get: function () {
-            return new fs_stream_1.default(this.options);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * Use stream API to read entries for Task.
-     */
-    ReaderStream.prototype.read = function (task) {
-        var _this = this;
-        var root = this.getRootDirectory(task);
-        var options = this.getReaderOptions(task);
-        var transform = new TransformStream(this);
-        var readable = this.api(root, task, options);
-        return readable
-            .on('error', function (err) { return _this.isEnoentCodeError(err) ? null : transform.emit('error', err); })
-            .pipe(transform);
-    };
-    /**
-     * Returns founded paths.
-     */
-    ReaderStream.prototype.api = function (root, task, options) {
-        if (task.dynamic) {
-            return this.dynamicApi(root, options);
-        }
-        return this.staticApi(task, options);
-    };
-    /**
-     * Api for dynamic tasks.
-     */
-    ReaderStream.prototype.dynamicApi = function (root, options) {
-        return readdir.readdirStreamStat(root, options);
-    };
-    /**
-     * Api for static tasks.
-     */
-    ReaderStream.prototype.staticApi = function (task, options) {
-        return this.fsAdapter.read(task.patterns, options.filter);
-    };
-    return ReaderStream;
-}(reader_1.default));
-exports.default = ReaderStream;
+// preminor will bump the version up to the next minor release, and immediately
+// down to pre-release. premajor and prepatch work the same way.
+SemVer.prototype.inc = function (release, identifier) {
+  switch (release) {
+    case 'premajor':
+      this.prerelease.length = 0
+      this.patch = 0
+      this.minor = 0
+      this.major++
+      this.inc('pre', identifier)
+      break
+    case 'preminor':
+      this.prerelease.length = 0
+      this.patch = 0
+      this.minor++
+      this.inc('pre', identifier)
+      break
+    case 'prepatch':
+      // If this is already a prerelease, it will bump to the next version
+      // drop any prereleases that might already exist, since they are not
+      // relevant at this point.
+      this.prerelease.length = 0
+      this.inc('patch', identifier)
+      this.inc('pre', identifier)
+      break
+    // If the input is a non-prerelease version, this acts the same as
+    // prepatch.
+    case 'prerelease':
+      if (this.prerelease.length === 0) {
+        this.inc('patch', identifier)
+      }
+      this.inc('pre', identifier)
+      break
 
+    case 'major':
+      // If this is a pre-major version, bump up to the same major version.
+      // Otherwise increment major.
+      // 1.0.0-5 bumps to 1.0.0
+      // 1.1.0 bumps to 2.0.0
+      if (this.minor !== 0 ||
+          this.patch !== 0 ||
+          this.prerelease.length === 0) {
+        this.major++
+      }
+      this.minor = 0
+      this.patch = 0
+      this.prerelease = []
+      break
+    case 'minor':
+      // If this is a pre-minor version, bump up to the same minor version.
+      // Otherwise increment minor.
+      // 1.2.0-5 bumps to 1.2.0
+      // 1.2.1 bumps to 1.3.0
+      if (this.patch !== 0 || this.prerelease.length === 0) {
+        this.minor++
+      }
+      this.patch = 0
+      this.prerelease = []
+      break
+    case 'patch':
+      // If this is not a pre-release version, it will increment the patch.
+      // If it is a pre-release it will bump up to the same patch version.
+      // 1.2.0-5 patches to 1.2.0
+      // 1.2.0 patches to 1.2.1
+      if (this.prerelease.length === 0) {
+        this.patch++
+      }
+      this.prerelease = []
+      break
+    // This probably shouldn't be used publicly.
+    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
+    case 'pre':
+      if (this.prerelease.length === 0) {
+        this.prerelease = [0]
+      } else {
+        var i = this.prerelease.length
+        while (--i >= 0) {
+          if (typeof this.prerelease[i] === 'number') {
+            this.prerelease[i]++
+            i = -2
+          }
+        }
+        if (i === -1) {
+          // didn't increment anything
+          this.prerelease.push(0)
+        }
+      }
+      if (identifier) {
+        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
+        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
+        if (this.prerelease[0] === identifier) {
+          if (isNaN(this.prerelease[1])) {
+            this.prerelease = [identifier, 0]
+          }
+        } else {
+          this.prerelease = [identifier, 0]
+        }
+      }
+      break
 
-/***/ }),
-/* 753 */
-/***/ (function(module, exports, __webpack_require__) {
+    default:
+      throw new Error('invalid increment argument: ' + release)
+  }
+  this.format()
+  this.raw = this.version
+  return this
+}
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(729);
-var reader_1 = __webpack_require__(742);
-var fs_sync_1 = __webpack_require__(754);
-var ReaderSync = /** @class */ (function (_super) {
-    __extends(ReaderSync, _super);
-    function ReaderSync() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(ReaderSync.prototype, "fsAdapter", {
-        /**
-         * Returns FileSystem adapter.
-         */
-        get: function () {
-            return new fs_sync_1.default(this.options);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * Use sync API to read entries for Task.
-     */
-    ReaderSync.prototype.read = function (task) {
-        var root = this.getRootDirectory(task);
-        var options = this.getReaderOptions(task);
-        try {
-            var entries = this.api(root, task, options);
-            return entries.map(this.transform, this);
-        }
-        catch (err) {
-            if (this.isEnoentCodeError(err)) {
-                return [];
-            }
-            throw err;
-        }
-    };
-    /**
-     * Returns founded paths.
-     */
-    ReaderSync.prototype.api = function (root, task, options) {
-        if (task.dynamic) {
-            return this.dynamicApi(root, options);
-        }
-        return this.staticApi(task, options);
-    };
-    /**
-     * Api for dynamic tasks.
-     */
-    ReaderSync.prototype.dynamicApi = function (root, options) {
-        return readdir.readdirSyncStat(root, options);
-    };
-    /**
-     * Api for static tasks.
-     */
-    ReaderSync.prototype.staticApi = function (task, options) {
-        return this.fsAdapter.read(task.patterns, options.filter);
-    };
-    return ReaderSync;
-}(reader_1.default));
-exports.default = ReaderSync;
+exports.inc = inc
+function inc (version, release, loose, identifier) {
+  if (typeof (loose) === 'string') {
+    identifier = loose
+    loose = undefined
+  }
 
+  try {
+    return new SemVer(version, loose).inc(release, identifier).version
+  } catch (er) {
+    return null
+  }
+}
 
-/***/ }),
-/* 754 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.diff = diff
+function diff (version1, version2) {
+  if (eq(version1, version2)) {
+    return null
+  } else {
+    var v1 = parse(version1)
+    var v2 = parse(version2)
+    var prefix = ''
+    if (v1.prerelease.length || v2.prerelease.length) {
+      prefix = 'pre'
+      var defaultResult = 'prerelease'
+    }
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return prefix + key
+        }
+      }
+    }
+    return defaultResult // may be undefined
+  }
+}
 
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(747);
-var fs_1 = __webpack_require__(751);
-var FileSystemSync = /** @class */ (function (_super) {
-    __extends(FileSystemSync, _super);
-    function FileSystemSync() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * Use sync API to read entries for Task.
-     */
-    FileSystemSync.prototype.read = function (patterns, filter) {
-        var _this = this;
-        var entries = [];
-        patterns.forEach(function (pattern) {
-            var filepath = _this.getFullEntryPath(pattern);
-            var entry = _this.getEntry(filepath, pattern);
-            if (entry === null || !filter(entry)) {
-                return;
-            }
-            entries.push(entry);
-        });
-        return entries;
-    };
-    /**
-     * Return entry for the provided path.
-     */
-    FileSystemSync.prototype.getEntry = function (filepath, pattern) {
-        try {
-            var stat = this.getStat(filepath);
-            return this.makeEntry(stat, pattern);
-        }
-        catch (err) {
-            return null;
-        }
-    };
-    /**
-     * Return fs.Stats for the provided path.
-     */
-    FileSystemSync.prototype.getStat = function (filepath) {
-        return fsStat.statSync(filepath, { throwErrorOnBrokenSymlinks: false });
-    };
-    return FileSystemSync;
-}(fs_1.default));
-exports.default = FileSystemSync;
+exports.compareIdentifiers = compareIdentifiers
 
+var numeric = /^[0-9]+$/
+function compareIdentifiers (a, b) {
+  var anum = numeric.test(a)
+  var bnum = numeric.test(b)
 
-/***/ }),
-/* 755 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (anum && bnum) {
+    a = +a
+    b = +b
+  }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Flatten nested arrays (max depth is 2) into a non-nested array of non-array items.
- */
-function flatten(items) {
-    return items.reduce(function (collection, item) { return [].concat(collection, item); }, []);
-}
-exports.flatten = flatten;
+  return a === b ? 0
+    : (anum && !bnum) ? -1
+    : (bnum && !anum) ? 1
+    : a < b ? -1
+    : 1
+}
 
+exports.rcompareIdentifiers = rcompareIdentifiers
+function rcompareIdentifiers (a, b) {
+  return compareIdentifiers(b, a)
+}
 
-/***/ }),
-/* 756 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.major = major
+function major (a, loose) {
+  return new SemVer(a, loose).major
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(243);
-/**
- * Merge multiple streams and propagate their errors into one stream in parallel.
- */
-function merge(streams) {
-    var mergedStream = merge2(streams);
-    streams.forEach(function (stream) {
-        stream.on('error', function (err) { return mergedStream.emit('error', err); });
-    });
-    return mergedStream;
-}
-exports.merge = merge;
+exports.minor = minor
+function minor (a, loose) {
+  return new SemVer(a, loose).minor
+}
 
+exports.patch = patch
+function patch (a, loose) {
+  return new SemVer(a, loose).patch
+}
 
-/***/ }),
-/* 757 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.compare = compare
+function compare (a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose))
+}
 
-"use strict";
+exports.compareLoose = compareLoose
+function compareLoose (a, b) {
+  return compare(a, b, true)
+}
 
-const path = __webpack_require__(4);
-const pathType = __webpack_require__(758);
+exports.rcompare = rcompare
+function rcompare (a, b, loose) {
+  return compare(b, a, loose)
+}
 
-const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+exports.sort = sort
+function sort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.compare(a, b, loose)
+  })
+}
 
-const getPath = (filepath, cwd) => {
-	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
-	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
-};
+exports.rsort = rsort
+function rsort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.rcompare(a, b, loose)
+  })
+}
 
-const addExtensions = (file, extensions) => {
-	if (path.extname(file)) {
-		return `**/${file}`;
-	}
+exports.gt = gt
+function gt (a, b, loose) {
+  return compare(a, b, loose) > 0
+}
 
-	return `**/${file}.${getExtensions(extensions)}`;
-};
+exports.lt = lt
+function lt (a, b, loose) {
+  return compare(a, b, loose) < 0
+}
 
-const getGlob = (dir, opts) => {
-	if (opts.files && !Array.isArray(opts.files)) {
-		throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof opts.files}\``);
-	}
+exports.eq = eq
+function eq (a, b, loose) {
+  return compare(a, b, loose) === 0
+}
 
-	if (opts.extensions && !Array.isArray(opts.extensions)) {
-		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof opts.extensions}\``);
-	}
+exports.neq = neq
+function neq (a, b, loose) {
+  return compare(a, b, loose) !== 0
+}
 
-	if (opts.files && opts.extensions) {
-		return opts.files.map(x => path.join(dir, addExtensions(x, opts.extensions)));
-	}
+exports.gte = gte
+function gte (a, b, loose) {
+  return compare(a, b, loose) >= 0
+}
 
-	if (opts.files) {
-		return opts.files.map(x => path.join(dir, `**/${x}`));
-	}
+exports.lte = lte
+function lte (a, b, loose) {
+  return compare(a, b, loose) <= 0
+}
 
-	if (opts.extensions) {
-		return [path.join(dir, `**/*.${getExtensions(opts.extensions)}`)];
-	}
+exports.cmp = cmp
+function cmp (a, op, b, loose) {
+  switch (op) {
+    case '===':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a === b
 
-	return [path.join(dir, '**')];
-};
+    case '!==':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a !== b
 
-module.exports = (input, opts) => {
-	opts = Object.assign({cwd: process.cwd()}, opts);
+    case '':
+    case '=':
+    case '==':
+      return eq(a, b, loose)
 
-	if (typeof opts.cwd !== 'string') {
-		return Promise.reject(new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof opts.cwd}\``));
-	}
+    case '!=':
+      return neq(a, b, loose)
 
-	return Promise.all([].concat(input).map(x => pathType.dir(getPath(x, opts.cwd))
-		.then(isDir => isDir ? getGlob(x, opts) : x)))
-		.then(globs => [].concat.apply([], globs));
-};
+    case '>':
+      return gt(a, b, loose)
 
-module.exports.sync = (input, opts) => {
-	opts = Object.assign({cwd: process.cwd()}, opts);
+    case '>=':
+      return gte(a, b, loose)
 
-	if (typeof opts.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof opts.cwd}\``);
-	}
+    case '<':
+      return lt(a, b, loose)
 
-	const globs = [].concat(input).map(x => pathType.dirSync(getPath(x, opts.cwd)) ? getGlob(x, opts) : x);
-	return [].concat.apply([], globs);
-};
+    case '<=':
+      return lte(a, b, loose)
 
+    default:
+      throw new TypeError('Invalid operator: ' + op)
+  }
+}
 
-/***/ }),
-/* 758 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.Comparator = Comparator
+function Comparator (comp, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-"use strict";
+  if (comp instanceof Comparator) {
+    if (comp.loose === !!options.loose) {
+      return comp
+    } else {
+      comp = comp.value
+    }
+  }
 
-const fs = __webpack_require__(132);
-const pify = __webpack_require__(759);
+  if (!(this instanceof Comparator)) {
+    return new Comparator(comp, options)
+  }
 
-function type(fn, fn2, fp) {
-	if (typeof fp !== 'string') {
-		return Promise.reject(new TypeError(`Expected a string, got ${typeof fp}`));
-	}
+  debug('comparator', comp, options)
+  this.options = options
+  this.loose = !!options.loose
+  this.parse(comp)
 
-	return pify(fs[fn])(fp)
-		.then(stats => stats[fn2]())
-		.catch(err => {
-			if (err.code === 'ENOENT') {
-				return false;
-			}
+  if (this.semver === ANY) {
+    this.value = ''
+  } else {
+    this.value = this.operator + this.semver.version
+  }
 
-			throw err;
-		});
+  debug('comp', this)
 }
 
-function typeSync(fn, fn2, fp) {
-	if (typeof fp !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof fp}`);
-	}
+var ANY = {}
+Comparator.prototype.parse = function (comp) {
+  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var m = comp.match(r)
 
-	try {
-		return fs[fn](fp)[fn2]();
-	} catch (err) {
-		if (err.code === 'ENOENT') {
-			return false;
-		}
+  if (!m) {
+    throw new TypeError('Invalid comparator: ' + comp)
+  }
 
-		throw err;
-	}
-}
+  this.operator = m[1]
+  if (this.operator === '=') {
+    this.operator = ''
+  }
 
-exports.file = type.bind(null, 'stat', 'isFile');
-exports.dir = type.bind(null, 'stat', 'isDirectory');
-exports.symlink = type.bind(null, 'lstat', 'isSymbolicLink');
-exports.fileSync = typeSync.bind(null, 'statSync', 'isFile');
-exports.dirSync = typeSync.bind(null, 'statSync', 'isDirectory');
-exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2]) {
+    this.semver = ANY
+  } else {
+    this.semver = new SemVer(m[2], this.options.loose)
+  }
+}
 
+Comparator.prototype.toString = function () {
+  return this.value
+}
 
-/***/ }),
-/* 759 */
-/***/ (function(module, exports, __webpack_require__) {
+Comparator.prototype.test = function (version) {
+  debug('Comparator.test', version, this.options.loose)
 
-"use strict";
+  if (this.semver === ANY) {
+    return true
+  }
 
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-const processFn = (fn, opts) => function () {
-	const P = opts.promiseModule;
-	const args = new Array(arguments.length);
+  return cmp(version, this.operator, this.semver, this.options)
+}
 
-	for (let i = 0; i < arguments.length; i++) {
-		args[i] = arguments[i];
-	}
+Comparator.prototype.intersects = function (comp, options) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required')
+  }
 
-	return new P((resolve, reject) => {
-		if (opts.errorFirst) {
-			args.push(function (err, result) {
-				if (opts.multiArgs) {
-					const results = new Array(arguments.length - 1);
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-					for (let i = 1; i < arguments.length; i++) {
-						results[i - 1] = arguments[i];
-					}
+  var rangeTmp
 
-					if (err) {
-						results.unshift(err);
-						reject(results);
-					} else {
-						resolve(results);
-					}
-				} else if (err) {
-					reject(err);
-				} else {
-					resolve(result);
-				}
-			});
-		} else {
-			args.push(function (result) {
-				if (opts.multiArgs) {
-					const results = new Array(arguments.length - 1);
+  if (this.operator === '') {
+    rangeTmp = new Range(comp.value, options)
+    return satisfies(this.value, rangeTmp, options)
+  } else if (comp.operator === '') {
+    rangeTmp = new Range(this.value, options)
+    return satisfies(comp.semver, rangeTmp, options)
+  }
 
-					for (let i = 0; i < arguments.length; i++) {
-						results[i] = arguments[i];
-					}
+  var sameDirectionIncreasing =
+    (this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '>=' || comp.operator === '>')
+  var sameDirectionDecreasing =
+    (this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '<=' || comp.operator === '<')
+  var sameSemVer = this.semver.version === comp.semver.version
+  var differentDirectionsInclusive =
+    (this.operator === '>=' || this.operator === '<=') &&
+    (comp.operator === '>=' || comp.operator === '<=')
+  var oppositeDirectionsLessThan =
+    cmp(this.semver, '<', comp.semver, options) &&
+    ((this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '<=' || comp.operator === '<'))
+  var oppositeDirectionsGreaterThan =
+    cmp(this.semver, '>', comp.semver, options) &&
+    ((this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '>=' || comp.operator === '>'))
 
-					resolve(results);
-				} else {
-					resolve(result);
-				}
-			});
-		}
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+}
 
-		fn.apply(this, args);
-	});
-};
+exports.Range = Range
+function Range (range, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-module.exports = (obj, opts) => {
-	opts = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, opts);
+  if (range instanceof Range) {
+    if (range.loose === !!options.loose &&
+        range.includePrerelease === !!options.includePrerelease) {
+      return range
+    } else {
+      return new Range(range.raw, options)
+    }
+  }
 
-	const filter = key => {
-		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		return opts.include ? opts.include.some(match) : !opts.exclude.some(match);
-	};
+  if (range instanceof Comparator) {
+    return new Range(range.value, options)
+  }
 
-	let ret;
-	if (typeof obj === 'function') {
-		ret = function () {
-			if (opts.excludeMain) {
-				return obj.apply(this, arguments);
-			}
+  if (!(this instanceof Range)) {
+    return new Range(range, options)
+  }
 
-			return processFn(obj, opts).apply(this, arguments);
-		};
-	} else {
-		ret = Object.create(Object.getPrototypeOf(obj));
-	}
+  this.options = options
+  this.loose = !!options.loose
+  this.includePrerelease = !!options.includePrerelease
 
-	for (const key in obj) { // eslint-disable-line guard-for-in
-		const x = obj[key];
-		ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x;
-	}
+  // First, split based on boolean or ||
+  this.raw = range
+  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
+    return this.parseRange(range.trim())
+  }, this).filter(function (c) {
+    // throw out any that are not relevant for whatever reason
+    return c.length
+  })
 
-	return ret;
-};
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range)
+  }
 
+  this.format()
+}
 
-/***/ }),
-/* 760 */
-/***/ (function(module, exports, __webpack_require__) {
+Range.prototype.format = function () {
+  this.range = this.set.map(function (comps) {
+    return comps.join(' ').trim()
+  }).join('||').trim()
+  return this.range
+}
 
-"use strict";
+Range.prototype.toString = function () {
+  return this.range
+}
 
-const fs = __webpack_require__(132);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(574);
-const gitIgnore = __webpack_require__(761);
-const pify = __webpack_require__(405);
-const slash = __webpack_require__(762);
+Range.prototype.parseRange = function (range) {
+  var loose = this.options.loose
+  range = range.trim()
+  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE]
+  range = range.replace(hr, hyphenReplace)
+  debug('hyphen replace', range)
+  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace)
+  debug('comparator trim', range, re[COMPARATORTRIM])
 
-const DEFAULT_IGNORE = [
-	'**/node_modules/**',
-	'**/bower_components/**',
-	'**/flow-typed/**',
-	'**/coverage/**',
-	'**/.git'
-];
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace)
 
-const readFileP = pify(fs.readFile);
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace)
 
-const mapGitIgnorePatternTo = base => ignore => {
-	if (ignore.startsWith('!')) {
-		return '!' + path.posix.join(base, ignore.slice(1));
-	}
+  // normalize spaces
+  range = range.split(/\s+/).join(' ')
 
-	return path.posix.join(base, ignore);
-};
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
-const parseGitIgnore = (content, options) => {
-	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var set = range.split(' ').map(function (comp) {
+    return parseComparator(comp, this.options)
+  }, this).join(' ').split(/\s+/)
+  if (this.options.loose) {
+    // in loose mode, throw out any that are not valid comparators
+    set = set.filter(function (comp) {
+      return !!comp.match(compRe)
+    })
+  }
+  set = set.map(function (comp) {
+    return new Comparator(comp, this.options)
+  }, this)
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => line.charAt(0) !== '#')
-		.map(mapGitIgnorePatternTo(base));
-};
+  return set
+}
 
-const reduceIgnore = files => {
-	return files.reduce((ignores, file) => {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-		return ignores;
-	}, gitIgnore());
-};
+Range.prototype.intersects = function (range, options) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required')
+  }
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, p)));
-};
+  return this.set.some(function (thisComparators) {
+    return thisComparators.every(function (thisComparator) {
+      return range.set.some(function (rangeComparators) {
+        return rangeComparators.every(function (rangeComparator) {
+          return thisComparator.intersects(rangeComparator, options)
+        })
+      })
+    })
+  })
+}
 
-const getFile = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	return readFileP(filePath, 'utf8')
-		.then(content => ({
-			content,
-			cwd,
-			filePath
-		}));
-};
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators
+function toComparators (range, options) {
+  return new Range(range, options).set.map(function (comp) {
+    return comp.map(function (c) {
+      return c.value
+    }).join(' ').trim().split(' ')
+  })
+}
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
+// comprised of xranges, tildes, stars, and gtlt's at this point.
+// already replaced the hyphen ranges
+// turn into a set of JUST comparators.
+function parseComparator (comp, options) {
+  debug('comp', comp, options)
+  comp = replaceCarets(comp, options)
+  debug('caret', comp)
+  comp = replaceTildes(comp, options)
+  debug('tildes', comp)
+  comp = replaceXRanges(comp, options)
+  debug('xrange', comp)
+  comp = replaceStars(comp, options)
+  debug('stars', comp)
+  return comp
+}
 
-	return {
-		content,
-		cwd,
-		filePath
-	};
-};
+function isX (id) {
+  return !id || id.toLowerCase() === 'x' || id === '*'
+}
 
-const normalizeOptions = (options = {}) => {
-	const ignore = options.ignore || [];
-	const cwd = options.cwd || process.cwd();
-	return {ignore, cwd};
-};
+// ~, ~> --> * (any, kinda silly)
+// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
+// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+function replaceTildes (comp, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceTilde(comp, options)
+  }).join(' ')
+}
 
-module.exports = options => {
-	options = normalizeOptions(options);
+function replaceTilde (comp, options) {
+  var r = options.loose ? re[TILDELOOSE] : re[TILDE]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('tilde', comp, _, M, m, p, pr)
+    var ret
 
-	return fastGlob('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	})
-		.then(paths => Promise.all(paths.map(file => getFile(file, options.cwd))))
-		.then(files => reduceIgnore(files))
-		.then(ignores => getIsIgnoredPredecate(ignores, options.cwd));
-};
+    if (isX(M)) {
+      ret = ''
+    } else if (isX(m)) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (isX(p)) {
+      // ~1.2 == >=1.2.0 <1.3.0
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+    } else if (pr) {
+      debug('replaceTilde pr', pr)
+      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+            ' <' + M + '.' + (+m + 1) + '.0'
+    } else {
+      // ~1.2.3 == >=1.2.3 <1.3.0
+      ret = '>=' + M + '.' + m + '.' + p +
+            ' <' + M + '.' + (+m + 1) + '.0'
+    }
 
-module.exports.sync = options => {
-	options = normalizeOptions(options);
+    debug('tilde return', ret)
+    return ret
+  })
+}
 
-	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);
+// ^ --> * (any, kinda silly)
+// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+// ^1.2.3 --> >=1.2.3 <2.0.0
+// ^1.2.0 --> >=1.2.0 <2.0.0
+function replaceCarets (comp, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceCaret(comp, options)
+  }).join(' ')
+}
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+function replaceCaret (comp, options) {
+  debug('caret', comp, options)
+  var r = options.loose ? re[CARETLOOSE] : re[CARET]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('caret', comp, _, M, m, p, pr)
+    var ret
 
+    if (isX(M)) {
+      ret = ''
+    } else if (isX(m)) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (isX(p)) {
+      if (M === '0') {
+        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+      } else {
+        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'
+      }
+    } else if (pr) {
+      debug('replaceCaret pr', pr)
+      if (M === '0') {
+        if (m === '0') {
+          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+                ' <' + M + '.' + m + '.' + (+p + 1)
+        } else {
+          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+                ' <' + M + '.' + (+m + 1) + '.0'
+        }
+      } else {
+        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+              ' <' + (+M + 1) + '.0.0'
+      }
+    } else {
+      debug('no pr')
+      if (M === '0') {
+        if (m === '0') {
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + m + '.' + (+p + 1)
+        } else {
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + (+m + 1) + '.0'
+        }
+      } else {
+        ret = '>=' + M + '.' + m + '.' + p +
+              ' <' + (+M + 1) + '.0.0'
+      }
+    }
 
-/***/ }),
-/* 761 */
-/***/ (function(module, exports) {
+    debug('caret return', ret)
+    return ret
+  })
+}
 
-// A simple implementation of make-array
-function make_array (subject) {
-  return Array.isArray(subject)
-    ? subject
-    : [subject]
+function replaceXRanges (comp, options) {
+  debug('replaceXRanges', comp, options)
+  return comp.split(/\s+/).map(function (comp) {
+    return replaceXRange(comp, options)
+  }).join(' ')
 }
 
-const REGEX_BLANK_LINE = /^\s+$/
-const REGEX_LEADING_EXCAPED_EXCLAMATION = /^\\!/
-const REGEX_LEADING_EXCAPED_HASH = /^\\#/
-const SLASH = '/'
-const KEY_IGNORE = typeof Symbol !== 'undefined'
-  ? Symbol.for('node-ignore')
-  /* istanbul ignore next */
-  : 'node-ignore'
+function replaceXRange (comp, options) {
+  comp = comp.trim()
+  var r = options.loose ? re[XRANGELOOSE] : re[XRANGE]
+  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
+    debug('xRange', comp, ret, gtlt, M, m, p, pr)
+    var xM = isX(M)
+    var xm = xM || isX(m)
+    var xp = xm || isX(p)
+    var anyX = xp
 
-const define = (object, key, value) =>
-  Object.defineProperty(object, key, {value})
+    if (gtlt === '=' && anyX) {
+      gtlt = ''
+    }
 
-const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
+    if (xM) {
+      if (gtlt === '>' || gtlt === '<') {
+        // nothing is allowed
+        ret = '<0.0.0'
+      } else {
+        // nothing is forbidden
+        ret = '*'
+      }
+    } else if (gtlt && anyX) {
+      // we know patch is an x, because we have any x at all.
+      // replace X with 0
+      if (xm) {
+        m = 0
+      }
+      p = 0
 
-// 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.
-    : ''
-)
+      if (gtlt === '>') {
+        // >1 => >=2.0.0
+        // >1.2 => >=1.3.0
+        // >1.2.3 => >= 1.2.4
+        gtlt = '>='
+        if (xm) {
+          M = +M + 1
+          m = 0
+          p = 0
+        } else {
+          m = +m + 1
+          p = 0
+        }
+      } else if (gtlt === '<=') {
+        // <=0.7.x is actually <0.8.0, since any 0.7.x should
+        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
+        gtlt = '<'
+        if (xm) {
+          M = +M + 1
+        } else {
+          m = +m + 1
+        }
+      }
 
-// > 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`
+      ret = gtlt + M + '.' + m + '.' + p
+    } else if (xm) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
+    } else if (xp) {
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
+    }
 
-// '`foo/`' should not continue with the '`..`'
-const DEFAULT_REPLACER_PREFIX = [
+    debug('xRange return', ret)
 
-  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
-  [
-    // (a\ ) -> (a )
-    // (a  ) -> (a)
-    // (a \ ) -> (a  )
-    /\\?\s+$/,
-    match => match.indexOf('\\') === 0
-      ? ' '
-      : ''
-  ],
+    return ret
+  })
+}
 
-  // replace (\ ) with ' '
-  [
-    /\\\s/g,
-    () => ' '
-  ],
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars (comp, options) {
+  debug('replaceStars', comp, options)
+  // Looseness is ignored here.  star is always as loose as it gets!
+  return comp.trim().replace(re[STAR], '')
+}
 
-  // Escape metacharacters
-  // which is written down by users but means special for regular expressions.
+// This function is passed to string.replace(re[HYPHENRANGE])
+// M, m, patch, prerelease, build
+// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
+// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
+// 1.2 - 3.4 => >=1.2.0 <3.5.0
+function hyphenReplace ($0,
+  from, fM, fm, fp, fpr, fb,
+  to, tM, tm, tp, tpr, tb) {
+  if (isX(fM)) {
+    from = ''
+  } else if (isX(fm)) {
+    from = '>=' + fM + '.0.0'
+  } else if (isX(fp)) {
+    from = '>=' + fM + '.' + fm + '.0'
+  } else {
+    from = '>=' + from
+  }
 
-  // > 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 (isX(tM)) {
+    to = ''
+  } else if (isX(tm)) {
+    to = '<' + (+tM + 1) + '.0.0'
+  } else if (isX(tp)) {
+    to = '<' + tM + '.' + (+tm + 1) + '.0'
+  } else if (tpr) {
+    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr
+  } else {
+    to = '<=' + to
+  }
 
-  [
-    // > [abc] matches any character inside the brackets
-    // >    (in this case a, b, or c);
-    /\[([^\]/]*)($|\])/g,
-    (match, p1, p2) => p2 === ']'
-      ? `[${sanitizeRange(p1)}]`
-      : `\\${match}`
-  ],
+  return (from + ' ' + to).trim()
+}
 
-  [
-    // > a question mark (?) matches a single character
-    /(?!\\)\?/g,
-    () => '[^/]'
-  ],
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function (version) {
+  if (!version) {
+    return false
+  }
 
-  // leading slash
-  [
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-    // > 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
-    /^\//,
-    () => '^'
-  ],
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version, this.options)) {
+      return true
+    }
+  }
+  return false
+}
 
-  // replace special metacharacter slash after the leading slash
-  [
-    /\//g,
-    () => '\\/'
-  ],
+function testSet (set, version, options) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version)) {
+      return false
+    }
+  }
 
-  [
-    // > 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 '\\*'
-    /^\^*\\\*\\\*\\\//,
+  if (version.prerelease.length && !options.includePrerelease) {
+    // Find the set of versions that are allowed to have prereleases
+    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
+    // That should allow `1.2.3-pr.2` to pass.
+    // However, `1.2.4-alpha.notready` should NOT be allowed,
+    // even though it's within the range set by the comparators.
+    for (i = 0; i < set.length; i++) {
+      debug(set[i].semver)
+      if (set[i].semver === ANY) {
+        continue
+      }
 
-    // '**/foo' <-> 'foo'
-    () => '^(?:.*\\/)?'
-  ]
-]
+      if (set[i].semver.prerelease.length > 0) {
+        var allowed = set[i].semver
+        if (allowed.major === version.major &&
+            allowed.minor === version.minor &&
+            allowed.patch === version.patch) {
+          return true
+        }
+      }
+    }
 
-const DEFAULT_REPLACER_SUFFIX = [
-  // 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 () {
-      return !/\/(?!$)/.test(this)
-        // > 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
-        ? '(?:^|\\/)'
+    // Version has a -pre, but it's not one of the ones we like.
+    return false
+  }
 
-        // > Otherwise, Git treats the pattern as a shell glob suitable for
-        // >   consumption by fnmatch(3)
-        : '^'
-    }
-  ],
+  return true
+}
 
-  // two globstars
-  [
-    // Use lookahead assertions so that we could match more than one `'/**'`
-    /\\\/\\\*\\\*(?=\\\/|$)/g,
+exports.satisfies = satisfies
+function satisfies (version, range, options) {
+  try {
+    range = new Range(range, options)
+  } catch (er) {
+    return false
+  }
+  return range.test(version)
+}
 
-    // Zero, one or several directories
-    // should not use '*', or it will be replaced by the next replacer
+exports.maxSatisfying = maxSatisfying
+function maxSatisfying (versions, range, options) {
+  var max = null
+  var maxSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!max || maxSV.compare(v) === -1) {
+        // compare(max, v, true)
+        max = v
+        maxSV = new SemVer(max, options)
+      }
+    }
+  })
+  return max
+}
 
-    // Check if it is not the last `'/**'`
-    (match, index, str) => index + 6 < str.length
+exports.minSatisfying = minSatisfying
+function minSatisfying (versions, range, options) {
+  var min = null
+  var minSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!min || minSV.compare(v) === 1) {
+        // compare(min, v, true)
+        min = v
+        minSV = new SemVer(min, options)
+      }
+    }
+  })
+  return min
+}
 
-      // 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.
-      // '/**/'
-      ? '(?:\\/[^\\/]+)*'
+exports.minVersion = minVersion
+function minVersion (range, loose) {
+  range = new Range(range, loose)
 
-      // case: /**
-      // > A trailing `"/**"` matches everything inside.
+  var minver = new SemVer('0.0.0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-      // #21: everything inside but it should not include the current folder
-      : '\\/.+'
-  ],
+  minver = new SemVer('0.0.0-0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-  // intermediate wildcards
-  [
-    // Never replace escaped '*'
-    // ignore rule '\*' will match the path '*'
+  minver = null
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-    // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+    comparators.forEach(function (comparator) {
+      // Clone to avoid manipulating the comparator's semver object.
+      var compver = new SemVer(comparator.semver.version)
+      switch (comparator.operator) {
+        case '>':
+          if (compver.prerelease.length === 0) {
+            compver.patch++
+          } else {
+            compver.prerelease.push(0)
+          }
+          compver.raw = compver.format()
+          /* fallthrough */
+        case '':
+        case '>=':
+          if (!minver || gt(minver, compver)) {
+            minver = compver
+          }
+          break
+        case '<':
+        case '<=':
+          /* Ignore maximum versions */
+          break
+        /* istanbul ignore next */
+        default:
+          throw new Error('Unexpected operation: ' + comparator.operator)
+      }
+    })
+  }
 
-    // '*.js' matches '.js'
-    // '*.js' doesn't match 'abc'
-    (match, p1) => `${p1}[^\\/]*`
-  ],
+  if (minver && range.test(minver)) {
+    return minver
+  }
 
-  // trailing wildcard
-  [
-    /(\^|\\\/)?\\\*$/,
-    (match, p1) => {
-      const prefix = p1
-        // '\^':
-        // '/*' does not match ''
-        // '/*' does not match everything
+  return null
+}
 
-        // '\\\/':
-        // 'abc/*' does not match 'abc/'
-        ? `${p1}[^/]+`
+exports.validRange = validRange
+function validRange (range, options) {
+  try {
+    // Return '*' instead of '' so that truthiness works.
+    // This will throw if it's invalid anyway
+    return new Range(range, options).range || '*'
+  } catch (er) {
+    return null
+  }
+}
 
-        // 'a*' matches 'a'
-        // 'a*' matches 'aa'
-        : '[^/]*'
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr
+function ltr (version, range, options) {
+  return outside(version, range, '<', options)
+}
 
-      return `${prefix}(?=$|\\/$)`
-    }
-  ],
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr
+function gtr (version, range, options) {
+  return outside(version, range, '>', options)
+}
 
-  [
-    // unescape
-    /\\\\\\/g,
-    () => '\\'
-  ]
-]
+exports.outside = outside
+function outside (version, range, hilo, options) {
+  version = new SemVer(version, options)
+  range = new Range(range, options)
 
-const POSITIVE_REPLACERS = [
-  ...DEFAULT_REPLACER_PREFIX,
+  var gtfn, ltefn, ltfn, comp, ecomp
+  switch (hilo) {
+    case '>':
+      gtfn = gt
+      ltefn = lte
+      ltfn = lt
+      comp = '>'
+      ecomp = '>='
+      break
+    case '<':
+      gtfn = lt
+      ltefn = gte
+      ltfn = gt
+      comp = '<'
+      ecomp = '<='
+      break
+    default:
+      throw new TypeError('Must provide a hilo val of "<" or ">"')
+  }
 
-  // 'f'
-  // matches
-  // - /f(end)
-  // - /f/
-  // - (start)f(end)
-  // - (start)f/
-  // doesn't match
-  // - oof
-  // - foo
-  // pseudo:
-  // -> (^|/)f(/|$)
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, options)) {
+    return false
+  }
 
-  // ending
-  [
-    // 'js' will not match 'js.'
-    // 'ab' will not match 'abc'
-    /(?:[^*/])$/,
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
 
-    // 'js*' will not match 'a.js'
-    // 'js/' will not match 'a.js'
-    // 'js' will match 'a.js' and 'a.js/'
-    match => `${match}(?=$|\\/)`
-  ],
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-  ...DEFAULT_REPLACER_SUFFIX
-]
+    var high = null
+    var low = null
 
-const NEGATIVE_REPLACERS = [
-  ...DEFAULT_REPLACER_PREFIX,
+    comparators.forEach(function (comparator) {
+      if (comparator.semver === ANY) {
+        comparator = new Comparator('>=0.0.0')
+      }
+      high = high || comparator
+      low = low || comparator
+      if (gtfn(comparator.semver, high.semver, options)) {
+        high = comparator
+      } else if (ltfn(comparator.semver, low.semver, options)) {
+        low = comparator
+      }
+    })
 
-  // #24, #38
-  // The MISSING rule of [gitignore docs](https://git-scm.com/docs/gitignore)
-  // A negative pattern without a trailing wildcard should not
-  // re-include the things inside that directory.
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false
+    }
 
-  // eg:
-  // ['node_modules/*', '!node_modules']
-  // should ignore `node_modules/a.js`
-  [
-    /(?:[^*])$/,
-    match => `${match}(?=$|\\/$)`
-  ],
+    // If the lowest version comparator has an operator and our version
+    // is less than it then it isn't higher than the range
+    if ((!low.operator || low.operator === comp) &&
+        ltefn(version, low.semver)) {
+      return false
+    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+      return false
+    }
+  }
+  return true
+}
 
-  ...DEFAULT_REPLACER_SUFFIX
-]
+exports.prerelease = prerelease
+function prerelease (version, options) {
+  var parsed = parse(version, options)
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+}
 
-// A simple cache, because an ignore rule only has only one certain meaning
-const cache = Object.create(null)
+exports.intersects = intersects
+function intersects (r1, r2, options) {
+  r1 = new Range(r1, options)
+  r2 = new Range(r2, options)
+  return r1.intersects(r2)
+}
 
-// @param {pattern}
-const make_regex = (pattern, negative, ignorecase) => {
-  const r = cache[pattern]
-  if (r) {
-    return r
+exports.coerce = coerce
+function coerce (version) {
+  if (version instanceof SemVer) {
+    return version
   }
 
-  const replacers = negative
-    ? NEGATIVE_REPLACERS
-    : POSITIVE_REPLACERS
+  if (typeof version !== 'string') {
+    return null
+  }
 
-  const source = replacers.reduce(
-    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
-    pattern
-  )
+  var match = version.match(re[COERCE])
 
-  return cache[pattern] = ignorecase
-    ? new RegExp(source, 'i')
-    : new RegExp(source)
+  if (match == null) {
+    return null
+  }
+
+  return parse(match[1] +
+    '.' + (match[2] || '0') +
+    '.' + (match[3] || '0'))
 }
 
-// > A blank line matches no files, so it can serve as a separator for readability.
-const checkPattern = pattern => pattern
-  && typeof pattern === 'string'
-  && !REGEX_BLANK_LINE.test(pattern)
 
-  // > A line starting with # serves as a comment.
-  && pattern.indexOf('#') !== 0
+/***/ }),
 
-const createRule = (pattern, ignorecase) => {
-  const origin = pattern
-  let negative = false
+/***/ "../../node_modules/write-json-file/node_modules/write-file-atomic/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-  // > An optional prefix "!" which negates the pattern;
-  if (pattern.indexOf('!') === 0) {
-    negative = true
-    pattern = pattern.substr(1)
-  }
+"use strict";
 
-  pattern = pattern
-  // > Put a backslash ("\") in front of the first "!" for patterns that
-  // >   begin with a literal "!", for example, `"\!important!.txt"`.
-  .replace(REGEX_LEADING_EXCAPED_EXCLAMATION, '!')
-  // > Put a backslash ("\") in front of the first hash for patterns that
-  // >   begin with a hash.
-  .replace(REGEX_LEADING_EXCAPED_HASH, '#')
+module.exports = writeFile
+module.exports.sync = writeFileSync
+module.exports._getTmpname = getTmpname // for testing
+module.exports._cleanupOnExit = cleanupOnExit
 
-  const regex = make_regex(pattern, negative, ignorecase)
+var fs = __webpack_require__("../../node_modules/graceful-fs/graceful-fs.js")
+var MurmurHash3 = __webpack_require__("../../node_modules/imurmurhash/imurmurhash.js")
+var onExit = __webpack_require__("../../node_modules/signal-exit/index.js")
+var path = __webpack_require__("path")
+var activeFiles = {}
 
-  return {
-    origin,
-    pattern,
-    negative,
-    regex
+// 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__("worker_threads")
+
+    /// 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
   }
+})()
+
+var invocations = 0
+function getTmpname (filename) {
+  return filename + '.' +
+    MurmurHash3(__filename)
+      .hash(String(process.pid))
+      .hash(String(threadId))
+      .hash(String(++invocations))
+      .result()
 }
 
-class IgnoreBase {
-  constructor ({
-    ignorecase = true
-  } = {}) {
-    this._rules = []
-    this._ignorecase = ignorecase
-    define(this, KEY_IGNORE, true)
-    this._initCache()
+function cleanupOnExit (tmpfile) {
+  return function () {
+    try {
+      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
+    } catch (_) {}
   }
+}
 
-  _initCache () {
-    this._cache = Object.create(null)
+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 = {}
   }
 
-  // @param {Array.<string>|string|Ignore} pattern
-  add (pattern) {
-    this._added = false
+  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 (typeof pattern === 'string') {
-      pattern = pattern.split(/\r?\n/g)
-    }
+  new Promise(function serializeSameFile (resolve) {
+    // make a queue if it doesn't already exist
+    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
 
-    make_array(pattern).forEach(this._addPattern, this)
+    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)
 
-    // Some rules have just added to the ignore,
-    // making the behavior changed.
-    if (this._added) {
-      this._initCache()
+            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()
+        })
+      })
     }
-
-    return this
-  }
-
-  // legacy
-  addPattern (pattern) {
-    return this.add(pattern)
-  }
-
-  _addPattern (pattern) {
-    // #32
-    if (pattern && pattern[KEY_IGNORE]) {
-      this._rules = this._rules.concat(pattern._rules)
-      this._added = true
-      return
+  }).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]
+  })
+}
 
-    if (checkPattern(pattern)) {
-      const rule = createRule(pattern, this._ignorecase)
-      this._added = true
-      this._rules.push(rule)
-    }
+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)
 
-  filter (paths) {
-    return make_array(paths).filter(path => this._filter(path))
+  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
+    }
   }
 
-  createFilter () {
-    return path => this._filter(path)
-  }
+  var fd
+  var cleanup = cleanupOnExit(tmpfile)
+  var removeOnExitHandler = onExit(cleanup)
 
-  ignores (path) {
-    return !this._filter(path)
+  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
   }
+}
 
-  // @returns `Boolean` true if the `path` is NOT ignored
-  _filter (path, slices) {
-    if (!path) {
-      return false
-    }
 
-    if (path in this._cache) {
-      return this._cache[path]
-    }
+/***/ }),
 
-    if (!slices) {
-      // path/to/a.js
-      // ['path', 'to', 'a.js']
-      slices = path.split(SLASH)
-    }
+/***/ "../../node_modules/write-pkg/index.js":
+/***/ (function(module, exports, __webpack_require__) {
 
-    slices.pop()
+"use strict";
 
-    return this._cache[path] = slices.length
-      // > It is not possible to re-include a file if a parent directory of
-      // >   that file is excluded.
-      // If the path contains a parent directory, check the parent first
-      ? this._filter(slices.join(SLASH) + SLASH, slices)
-        && this._test(path)
+const path = __webpack_require__("path");
+const writeJsonFile = __webpack_require__("../../node_modules/write-json-file/index.js");
+const sortKeys = __webpack_require__("../../node_modules/sort-keys/index.js");
 
-      // Or only test the path
-      : this._test(path)
-  }
+const dependencyKeys = new Set([
+	'dependencies',
+	'devDependencies',
+	'optionalDependencies',
+	'peerDependencies'
+]);
 
-  // @returns {Boolean} true if a file is NOT ignored
-  _test (path) {
-    // Explicitly define variable type by setting matched to `0`
-    let matched = 0
+function normalize(packageJson) {
+	const result = {};
 
-    this._rules.forEach(rule => {
-      // if matched = true, then we only test negative rules
-      // if matched = false, then we test non-negative rules
-      if (!(matched ^ rule.negative)) {
-        matched = rule.negative ^ rule.regex.test(path)
-      }
-    })
+	for (const key of Object.keys(packageJson)) {
+		if (!dependencyKeys.has(key)) {
+			result[key] = packageJson[key];
+		} else if (Object.keys(packageJson[key]).length !== 0) {
+			result[key] = sortKeys(packageJson[key]);
+		}
+	}
 
-    return !matched
-  }
+	return result;
 }
 
-// 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'
-  )
-) {
-  const filter = IgnoreBase.prototype._filter
+module.exports = async (filePath, data, options) => {
+	if (typeof filePath !== 'string') {
+		options = data;
+		data = filePath;
+		filePath = '.';
+	}
 
-  /* eslint no-control-regex: "off" */
-  const make_posix = str => /^\\\\\?\\/.test(str)
-  || /[^\x00-\x80]+/.test(str)
-    ? str
-    : str.replace(/\\/g, '/')
+	options = {
+		normalize: true,
+		...options,
+		detectIndent: true
+	};
 
-  IgnoreBase.prototype._filter = function filterWin32 (path, slices) {
-    path = make_posix(path)
-    return filter.call(this, path, slices)
-  }
-}
+	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
 
-module.exports = options => new IgnoreBase(options)
+	data = options.normalize ? normalize(data) : data;
 
+	return writeJsonFile(filePath, data, options);
+};
 
-/***/ }),
-/* 762 */
-/***/ (function(module, exports, __webpack_require__) {
+module.exports.sync = (filePath, data, options) => {
+	if (typeof filePath !== 'string') {
+		options = data;
+		data = filePath;
+		filePath = '.';
+	}
 
-"use strict";
+	options = {
+		normalize: true,
+		...options,
+		detectIndent: true
+	};
 
-module.exports = input => {
-	const isExtendedLengthPath = /^\\\\\?\\/.test(input);
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(input); // eslint-disable-line no-control-regex
+	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
 
-	if (isExtendedLengthPath || hasNonAscii) {
-		return input;
-	}
+	data = options.normalize ? normalize(data) : data;
 
-	return input.replace(/\\/g, '/');
+	writeJsonFile.sync(filePath, data, options);
 };
 
 
 /***/ }),
-/* 763 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/cli.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/*!
- * has-glob <https://github.com/jonschlinkert/has-glob>
- *
- * Copyright (c) 2015, Jon Schlinkert.
- * Licensed under the MIT License.
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return run; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/getopts/index.js");
+/* harmony import */ var getopts__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(getopts__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/index.js");
+/* 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__("./src/commands/index.ts");
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/run.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
 
 
-var isGlob = __webpack_require__(764);
-
-module.exports = function hasGlob(val) {
-  if (val == null) return false;
-  if (typeof val === 'string') {
-    return isGlob(val);
-  }
-  if (Array.isArray(val)) {
-    var len = val.length;
-    while (len--) {
-      if (isGlob(val[len])) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
-
 
-/***/ }),
-/* 764 */
-/***/ (function(module, exports, __webpack_require__) {
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
 
-var isExtglob = __webpack_require__(267);
 
-module.exports = function isGlob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
 
-  if (isExtglob(str)) return true;
+function help() {
+  _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].info(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      usage: kbn <command> [<args>]
 
-  var regex = /(\\).|([*?]|\[.*\]|\{.*\}|\(.*\|.*\)|^!)/;
-  var match;
+      By default commands are run for Kibana itself, all packages in the 'packages/'
+      folder and for all plugins in './plugins' and '../kibana-extra'.
 
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
-  return false;
-};
+      Available commands:
 
+        ${Object.values(_commands__WEBPACK_IMPORTED_MODULE_4__[/* commands */ "a"]).map(command => `${command.name} - ${command.description}`).join('\n        ')}
 
-/***/ }),
-/* 765 */
-/***/ (function(module, exports, __webpack_require__) {
+      Global options:
 
-"use strict";
+        -e, --exclude           Exclude specified project. Can be specified multiple times to exclude multiple projects, e.g. '-e kibana -e @kbn/pm'.
+        -i, --include           Include only specified projects. If left unspecified, it defaults to including all projects.
+        --oss                   Do not include the x-pack when running command.
+        --skip-kibana-plugins   Filter all plugins in ./plugins and ../kibana-extra when running command.
+        --no-cache              Disable the kbn packages bootstrap cache
+        --no-validate           Disable the bootstrap yarn.lock validation
+        --force-install         Forces yarn install to run on bootstrap
+        --offline               Run in offline mode
+        --verbose               Set log level to verbose
+        --debug                 Set log level to debug
+        --quiet                 Set log level to error
+        --silent                Disable log output
 
-const path = __webpack_require__(4);
-const {constants: fsConstants} = __webpack_require__(132);
-const pEvent = __webpack_require__(766);
-const CpFileError = __webpack_require__(769);
-const fs = __webpack_require__(771);
-const ProgressEmitter = __webpack_require__(774);
+      "run" options:
+        --skip-missing          Ignore packages which don't have the requested script
+    ` + '\n');
+}
 
-const cpFileAsync = async (source, destination, options, progressEmitter) => {
-	let readError;
-	const stat = await fs.stat(source);
-	progressEmitter.size = stat.size;
+async function run(argv) {
+  _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].setLogLevel(Object(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__["pickLevelFromFlags"])(getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
+    boolean: ['verbose', 'debug', 'quiet', 'silent', 'skip-missing']
+  }))); // We can simplify this setup (and remove this extra handling) once Yarn
+  // starts forwarding the `--` directly to this script, see
+  // https://github.com/yarnpkg/yarn/blob/b2d3e1a8fe45ef376b716d597cc79b38702a9320/src/cli/index.js#L174-L182
 
-	const read = await fs.createReadStream(source);
-	await fs.makeDir(path.dirname(destination));
-	const write = fs.createWriteStream(destination, {flags: options.overwrite ? 'w' : 'wx'});
-	read.on('data', () => {
-		progressEmitter.written = write.bytesWritten;
-	});
-	read.once('error', error => {
-		readError = new CpFileError(`Cannot read from \`${source}\`: ${error.message}`, error);
-		write.end();
-	});
+  if (argv.includes('--')) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].error(`Using "--" is not allowed, as it doesn't work with 'yarn kbn'.`);
+    process.exit(1);
+  }
 
-	let updateStats = false;
-	try {
-		const writePromise = pEvent(write, 'close');
-		read.pipe(write);
-		await writePromise;
-		progressEmitter.written = progressEmitter.size;
-		updateStats = true;
-	} catch (error) {
-		if (options.overwrite || error.code !== 'EEXIST') {
-			throw new CpFileError(`Cannot write to \`${destination}\`: ${error.message}`, error);
-		}
-	}
+  const options = getopts__WEBPACK_IMPORTED_MODULE_1___default()(argv, {
+    alias: {
+      e: 'exclude',
+      h: 'help',
+      i: 'include'
+    },
+    default: {
+      cache: true,
+      'force-install': false,
+      offline: false,
+      validate: true
+    },
+    boolean: ['cache', 'force-install', 'offline', 'validate']
+  });
+  const args = options._;
 
-	if (readError) {
-		throw readError;
-	}
+  if (options.help || args.length === 0) {
+    help();
+    return;
+  } // This `rootPath` is relative to `./dist/` as that's the location of the
+  // built version of this tool.
 
-	if (updateStats) {
-		const stats = await fs.lstat(source);
 
-		return Promise.all([
-			fs.utimes(destination, stats.atime, stats.mtime),
-			fs.chmod(destination, stats.mode),
-			fs.chown(destination, stats.uid, stats.gid)
-		]);
-	}
-};
+  const rootPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(__dirname, '../../../');
+  const commandName = args[0];
+  const extraArgs = args.slice(1);
+  const commandOptions = {
+    options,
+    extraArgs,
+    rootPath
+  };
+  const command = _commands__WEBPACK_IMPORTED_MODULE_4__[/* commands */ "a"][commandName];
 
-const cpFile = (source, destination, options) => {
-	if (!source || !destination) {
-		return Promise.reject(new CpFileError('`source` and `destination` required'));
-	}
+  if (command === undefined) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].error(`[${commandName}] is not a valid command, see 'kbn --help'`);
+    process.exit(1);
+  }
 
-	options = {
-		overwrite: true,
-		...options
-	};
+  await Object(_run__WEBPACK_IMPORTED_MODULE_5__[/* runCommand */ "a"])(command, commandOptions);
+}
 
-	const progressEmitter = new ProgressEmitter(path.resolve(source), path.resolve(destination));
-	const promise = cpFileAsync(source, destination, options, progressEmitter);
-	promise.on = (...args) => {
-		progressEmitter.on(...args);
-		return promise;
-	};
+/***/ }),
 
-	return promise;
-};
+/***/ "./src/commands/bootstrap.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = cpFile;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BootstrapCommand; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter/ci_stats_reporter.js");
+/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _utils_link_project_executables__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/link_project_executables.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony import */ var _utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/yarn_lock.ts");
+/* harmony import */ var _utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/validate_dependencies.ts");
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("./src/utils/bazel/setup_remote_cache.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-const checkSourceIsFile = (stat, source) => {
-	if (stat.isDirectory()) {
-		throw Object.assign(new CpFileError(`EISDIR: illegal operation on a directory '${source}'`), {
-			errno: -21,
-			code: 'EISDIR',
-			source
-		});
-	}
-};
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-const fixupAttributes = (destination, stat) => {
-	fs.chmodSync(destination, stat.mode);
-	fs.chownSync(destination, stat.uid, stat.gid);
-};
+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; }
 
-module.exports.sync = (source, destination, options) => {
-	if (!source || !destination) {
-		throw new CpFileError('`source` and `destination` required');
-	}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	options = {
-		overwrite: true,
-		...options
-	};
 
-	const stat = fs.statSync(source);
-	checkSourceIsFile(stat, source);
-	fs.makeDirSync(path.dirname(destination));
 
-	const flags = options.overwrite ? null : fsConstants.COPYFILE_EXCL;
-	try {
-		fs.copyFileSync(source, destination, flags);
-	} catch (error) {
-		if (!options.overwrite && error.code === 'EEXIST') {
-			return;
-		}
 
-		throw error;
-	}
 
-	fs.utimesSync(destination, stat.atime, stat.mtime);
-	fixupAttributes(destination, stat);
-};
 
 
-/***/ }),
-/* 766 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-const pTimeout = __webpack_require__(767);
 
-const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
+const BootstrapCommand = {
+  description: 'Install dependencies and crosslink projects',
+  name: 'bootstrap',
+  reportTiming: {
+    group: 'scripts/kbn bootstrap',
+    id: 'total'
+  },
 
-const normalizeEmitter = emitter => {
-	const addListener = emitter.on || emitter.addListener || emitter.addEventListener;
-	const removeListener = emitter.off || emitter.removeListener || emitter.removeEventListener;
+  async run(projects, projectGraph, {
+    options,
+    kbn,
+    rootPath
+  }) {
+    var _projects$get;
 
-	if (!addListener || !removeListener) {
-		throw new TypeError('Emitter is not compatible');
-	}
+    const nonBazelProjectsOnly = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__[/* getNonBazelProjectsOnly */ "c"])(projects);
+    const batchedNonBazelProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__[/* topologicallyBatchProjects */ "f"])(nonBazelProjectsOnly, projectGraph);
+    const kibanaProjectPath = ((_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path) || '';
+    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true;
+    const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"]);
+    const timings = [];
 
-	return {
-		addListener: addListener.bind(emitter),
-		removeListener: removeListener.bind(emitter)
-	};
-};
+    const time = async (id, body) => {
+      const start = Date.now();
 
-const normalizeEvents = event => Array.isArray(event) ? event : [event];
+      try {
+        return await body();
+      } finally {
+        timings.push({
+          id,
+          ms: Date.now() - start
+        });
+      }
+    }; // Force install is set in case a flag is passed into yarn kbn bootstrap
 
-const multiple = (emitter, event, options) => {
-	let cancel;
-	const ret = new Promise((resolve, reject) => {
-		options = {
-			rejectionEvents: ['error'],
-			multiArgs: false,
-			resolveImmediately: false,
-			...options
-		};
 
-		if (!(options.count >= 0 && (options.count === Infinity || Number.isInteger(options.count)))) {
-			throw new TypeError('The `count` option should be at least 0 or more');
-		}
+    const forceInstall = !!options && options['force-install'] === true; // Install bazel machinery tools if needed
 
-		// Allow multiple events
-		const events = normalizeEvents(event);
+    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* installBazelTools */ "c"])(rootPath); // Setup remote cache settings in .bazelrc.cache if needed
 
-		const items = [];
-		const {addListener, removeListener} = normalizeEmitter(emitter);
+    await Object(_utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_9__[/* setupRemoteCache */ "a"])(rootPath); // Bootstrap process for Bazel packages
+    // Bazel is now managing dependencies so yarn install
+    // will happen as part of this
+    //
+    // NOTE: Bazel projects will be introduced incrementally
+    // And should begin from the ones with none dependencies forward.
+    // That way non bazel projects could depend on bazel projects but not the other way around
+    // That is only intended during the migration process while non Bazel projects are not removed at all.
+    //
 
-		const onItem = (...args) => {
-			const value = options.multiArgs ? args : args[0];
+    if (forceInstall) {
+      await time('force install dependencies', async () => {
+        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* removeYarnIntegrityFileIfExists */ "e"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(kibanaProjectPath, 'node_modules'));
+        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* runBazel */ "f"])(['clean', '--expunge']);
+        await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* runBazel */ "f"])(['run', '@nodejs//:yarn'], runOffline, {
+          env: {
+            SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+            RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
+          }
+        });
+      });
+    } // build packages
 
-			if (options.filter && !options.filter(value)) {
-				return;
-			}
 
-			items.push(value);
+    await time('build packages', async () => {
+      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_8__[/* runBazel */ "f"])(['build', '//packages:build', '--show_result=1'], runOffline);
+    }); // Install monorepo npm dependencies outside of the Bazel managed ones
 
-			if (options.count === items.length) {
-				cancel();
-				resolve(items);
-			}
-		};
+    for (const batch of batchedNonBazelProjects) {
+      for (const project of batch) {
+        const isExternalPlugin = project.path.includes(`${kibanaProjectPath}${path__WEBPACK_IMPORTED_MODULE_0__["sep"]}plugins`);
 
-		const rejectHandler = error => {
-			cancel();
-			reject(error);
-		};
+        if (!project.hasDependencies()) {
+          continue;
+        }
 
-		cancel = () => {
-			for (const event of events) {
-				removeListener(event, onItem);
-			}
+        if (isExternalPlugin) {
+          await project.installDependencies();
+          continue;
+        }
 
-			for (const rejectionEvent of options.rejectionEvents) {
-				removeListener(rejectionEvent, rejectHandler);
-			}
-		};
+        if (!project.isSinglePackageJsonProject && !project.isEveryDependencyLocal() && !isExternalPlugin) {
+          throw new Error(`[${project.name}] is not eligible to hold non local dependencies. Move the non local dependencies into the top level package.json.`);
+        }
+      }
+    }
 
-		for (const event of events) {
-			addListener(event, onItem);
-		}
+    const yarnLock = await time('read yarn.lock', async () => await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__[/* readYarnLock */ "a"])(kbn));
 
-		for (const rejectionEvent of options.rejectionEvents) {
-			addListener(rejectionEvent, rejectHandler);
-		}
+    if (options.validate) {
+      await time('validate dependencies', async () => {
+        await Object(_utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_7__[/* validateDependencies */ "a"])(kbn, yarnLock);
+      });
+    } // Assure all kbn projects with bin defined scripts
+    // copy those scripts into the top level node_modules folder
+    //
+    // NOTE: We don't probably need this anymore, is actually not being used
 
-		if (options.resolveImmediately) {
-			resolve(items);
-		}
-	});
 
-	ret.cancel = cancel;
+    await time('link project executables', async () => {
+      await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_4__[/* linkProjectExecutables */ "a"])(projects, projectGraph);
+    });
+    await time('update vscode config', async () => {
+      // Update vscode settings
+      await Object(_utils_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawnStreaming */ "b"])(process.execPath, ['scripts/update_vscode_config'], {
+        cwd: kbn.getAbsolute(),
+        env: process.env
+      }, {
+        prefix: '[vscode]',
+        debug: false
+      });
+    }); // send timings
 
-	if (typeof options.timeout === 'number') {
-		const timeout = pTimeout(ret, options.timeout);
-		timeout.cancel = cancel;
-		return timeout;
-	}
+    await reporter.timings({
+      upstreamBranch: kbn.kibanaProject.json.branch,
+      // prevent loading @kbn/utils by passing null
+      kibanaUuid: kbn.getUuid() || null,
+      timings: timings.map(t => _objectSpread({
+        group: 'scripts/kbn bootstrap'
+      }, t))
+    });
+  }
 
-	return ret;
 };
 
-const pEvent = (emitter, event, options) => {
-	if (typeof options === 'function') {
-		options = {filter: options};
-	}
-
-	options = {
-		...options,
-		count: 1,
-		resolveImmediately: false
-	};
-
-	const arrayPromise = multiple(emitter, event, options);
-	const promise = arrayPromise.then(array => array[0]); // eslint-disable-line promise/prefer-await-to-then
-	promise.cancel = arrayPromise.cancel;
+/***/ }),
 
-	return promise;
-};
+/***/ "./src/commands/build.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = pEvent;
-// TODO: Remove this for the next major release
-module.exports.default = pEvent;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BuildCommand; });
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/utils/bazel/index.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-module.exports.multiple = multiple;
+const BuildCommand = {
+  description: 'Runs a build in the Bazel built packages',
+  name: 'build',
+  reportTiming: {
+    group: 'scripts/kbn build',
+    id: 'total'
+  },
 
-module.exports.iterator = (emitter, event, options) => {
-	if (typeof options === 'function') {
-		options = {filter: options};
-	}
+  async run(projects, projectGraph, {
+    options
+  }) {
+    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages
 
-	// Allow multiple events
-	const events = normalizeEvents(event);
+    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__[/* runBazel */ "f"])(['build', '//packages:build', '--show_result=1'], runOffline);
+  }
 
-	options = {
-		rejectionEvents: ['error'],
-		resolutionEvents: [],
-		limit: Infinity,
-		multiArgs: false,
-		...options
-	};
+};
 
-	const {limit} = options;
-	const isValidLimit = limit >= 0 && (limit === Infinity || Number.isInteger(limit));
-	if (!isValidLimit) {
-		throw new TypeError('The `limit` option should be a non-negative integer or Infinity');
-	}
+/***/ }),
 
-	if (limit === 0) {
-		// Return an empty async iterator to avoid any further cost
-		return {
-			[Symbol.asyncIterator]() {
-				return this;
-			},
-			async next() {
-				return {
-					done: true,
-					value: undefined
-				};
-			}
-		};
-	}
+/***/ "./src/commands/clean.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	const {addListener, removeListener} = normalizeEmitter(emitter);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CleanCommand; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/del/index.js");
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/ora/index.js");
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	let isDone = false;
-	let error;
-	let hasPendingError = false;
-	const nextQueue = [];
-	const valueQueue = [];
-	let eventCount = 0;
-	let isLimitReached = false;
 
-	const valueHandler = (...args) => {
-		eventCount++;
-		isLimitReached = eventCount === limit;
 
-		const value = options.multiArgs ? args : args[0];
 
-		if (nextQueue.length > 0) {
-			const {resolve} = nextQueue.shift();
 
-			resolve({done: false, value});
 
-			if (isLimitReached) {
-				cancel();
-			}
 
-			return;
-		}
+const CleanCommand = {
+  description: 'Deletes output directories and resets internal caches.',
+  name: 'clean',
+  reportTiming: {
+    group: 'scripts/kbn clean',
+    id: 'total'
+  },
 
-		valueQueue.push(value);
+  async run(projects, projectGraph, {
+    kbn
+  }) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      This command is only necessary for the circumstance where you need to recover a consistent
+      state when problems arise. If you need to run this command often, please let us know by
+      filling out this form: https://ela.st/yarn-kbn-clean.
+      Please not it might not solve problems with node_modules. To solve problems around node_modules
+      you might need to run 'yarn kbn reset'.
+    `);
+    const toDelete = [];
 
-		if (isLimitReached) {
-			cancel();
-		}
-	};
+    for (const project of projects.values()) {
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* isDirectory */ "c"])(project.targetLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
+        });
+      }
 
-	const cancel = () => {
-		isDone = true;
-		for (const event of events) {
-			removeListener(event, valueHandler);
-		}
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
 
-		for (const rejectionEvent of options.rejectionEvents) {
-			removeListener(rejectionEvent, rejectHandler);
-		}
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
+      }
+    } // Runs Bazel soft clean
 
-		for (const resolutionEvent of options.resolutionEvents) {
-			removeListener(resolutionEvent, resolveHandler);
-		}
 
-		while (nextQueue.length > 0) {
-			const {resolve} = nextQueue.shift();
-			resolve({done: true, value: undefined});
-		}
-	};
+    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* isBazelBinAvailable */ "d"])(kbn.getAbsolute())) {
+      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* runBazel */ "f"])(['clean']);
+      _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].success('Soft cleaned bazel');
+    }
 
-	const rejectHandler = (...args) => {
-		error = options.multiArgs ? args : args[0];
+    if (toDelete.length === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].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();
 
-		if (nextQueue.length > 0) {
-			const {reject} = nextQueue.shift();
-			reject(error);
-		} else {
-			hasPendingError = true;
-		}
+      try {
+        for (const {
+          pattern,
+          cwd
+        } of toDelete) {
+          process.chdir(cwd);
+          const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
 
-		cancel();
-	};
+          if (_utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].wouldLogLevel('info')) {
+            ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
+          }
 
-	const resolveHandler = (...args) => {
-		const value = options.multiArgs ? args : args[0];
+          await promise;
+        }
+      } finally {
+        process.chdir(originalCwd);
+      }
+    }
+  }
 
-		if (options.filter && !options.filter(value)) {
-			return;
-		}
+};
 
-		if (nextQueue.length > 0) {
-			const {resolve} = nextQueue.shift();
-			resolve({done: true, value});
-		} else {
-			valueQueue.push(value);
-		}
+/***/ }),
 
-		cancel();
-	};
+/***/ "./src/commands/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	for (const event of events) {
-		addListener(event, valueHandler);
-	}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return commands; });
+/* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/commands/bootstrap.ts");
+/* harmony import */ var _build__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/commands/build.ts");
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/commands/clean.ts");
+/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/commands/reset.ts");
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/commands/run.ts");
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/commands/watch.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	for (const rejectionEvent of options.rejectionEvents) {
-		addListener(rejectionEvent, rejectHandler);
-	}
 
-	for (const resolutionEvent of options.resolutionEvents) {
-		addListener(resolutionEvent, resolveHandler);
-	}
 
-	return {
-		[symbolAsyncIterator]() {
-			return this;
-		},
-		async next() {
-			if (valueQueue.length > 0) {
-				const value = valueQueue.shift();
-				return {
-					done: isDone && valueQueue.length === 0 && !isLimitReached,
-					value
-				};
-			}
 
-			if (hasPendingError) {
-				hasPendingError = false;
-				throw error;
-			}
 
-			if (isDone) {
-				return {
-					done: true,
-					value: undefined
-				};
-			}
 
-			return new Promise((resolve, reject) => nextQueue.push({resolve, reject}));
-		},
-		async return(value) {
-			cancel();
-			return {
-				done: isDone,
-				value
-			};
-		}
-	};
+const commands = {
+  bootstrap: _bootstrap__WEBPACK_IMPORTED_MODULE_0__[/* BootstrapCommand */ "a"],
+  build: _build__WEBPACK_IMPORTED_MODULE_1__[/* BuildCommand */ "a"],
+  clean: _clean__WEBPACK_IMPORTED_MODULE_2__[/* CleanCommand */ "a"],
+  reset: _reset__WEBPACK_IMPORTED_MODULE_3__[/* ResetCommand */ "a"],
+  run: _run__WEBPACK_IMPORTED_MODULE_4__[/* RunCommand */ "a"],
+  watch: _watch__WEBPACK_IMPORTED_MODULE_5__[/* WatchCommand */ "a"]
 };
 
-
 /***/ }),
-/* 767 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const pFinally = __webpack_require__(768);
-
-class TimeoutError extends Error {
-	constructor(message) {
-		super(message);
-		this.name = 'TimeoutError';
-	}
-}
 
-module.exports = (promise, ms, fallback) => new Promise((resolve, reject) => {
-	if (typeof ms !== 'number' || ms < 0) {
-		throw new TypeError('Expected `ms` to be a positive number');
-	}
+/***/ "./src/commands/reset.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	const timer = setTimeout(() => {
-		if (typeof fallback === 'function') {
-			try {
-				resolve(fallback());
-			} catch (err) {
-				reject(err);
-			}
-			return;
-		}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ResetCommand; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/del/index.js");
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/ora/index.js");
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-		const message = typeof fallback === 'string' ? fallback : `Promise timed out after ${ms} milliseconds`;
-		const err = fallback instanceof Error ? fallback : new TimeoutError(message);
 
-		if (typeof promise.cancel === 'function') {
-			promise.cancel();
-		}
 
-		reject(err);
-	}, ms);
 
-	pFinally(
-		promise.then(resolve, reject),
-		() => {
-			clearTimeout(timer);
-		}
-	);
-});
 
-module.exports.TimeoutError = TimeoutError;
 
 
-/***/ }),
-/* 768 */
-/***/ (function(module, exports, __webpack_require__) {
+const ResetCommand = {
+  description: 'Deletes node_modules and output directories, resets internal and disk caches, and stops Bazel server',
+  name: 'reset',
+  reportTiming: {
+    group: 'scripts/kbn reset',
+    id: 'total'
+  },
 
-"use strict";
+  async run(projects, projectGraph, {
+    kbn
+  }) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
+      problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
+      If you think you need to use this command very often (which is not normal), please let us know.
+    `);
+    const toDelete = [];
 
-module.exports = (promise, onFinally) => {
-	onFinally = onFinally || (() => {});
+    for (const project of projects.values()) {
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* isDirectory */ "c"])(project.nodeModulesLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.nodeModulesLocation)
+        });
+      }
 
-	return promise.then(
-		val => new Promise(resolve => {
-			resolve(onFinally());
-		}).then(() => val),
-		err => new Promise(resolve => {
-			resolve(onFinally());
-		}).then(() => {
-			throw err;
-		})
-	);
-};
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* isDirectory */ "c"])(project.targetLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
+        });
+      }
 
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
 
-/***/ }),
-/* 769 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
+      }
+    } // Runs Bazel hard clean and deletes Bazel Cache Folders
 
-"use strict";
 
-const NestedError = __webpack_require__(770);
+    if (await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* isBazelBinAvailable */ "d"])(kbn.getAbsolute())) {
+      // Hard cleaning bazel
+      await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* runBazel */ "f"])(['clean', '--expunge']);
+      _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].success('Hard cleaned bazel'); // Deletes Bazel Cache Folders
 
-class CpFileError extends NestedError {
-	constructor(message, nested) {
-		super(message, nested);
-		Object.assign(this, nested);
-		this.name = 'CpFileError';
-	}
-}
+      await del__WEBPACK_IMPORTED_MODULE_1___default()([await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* getBazelDiskCacheFolder */ "a"])(), await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* getBazelRepositoryCacheFolder */ "b"])()], {
+        force: true
+      });
+      _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].success('Removed disk caches');
+    }
 
-module.exports = CpFileError;
+    if (toDelete.length === 0) {
+      return;
+    }
+    /**
+     * 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.
+     */
 
 
-/***/ }),
-/* 770 */
-/***/ (function(module, exports, __webpack_require__) {
+    const originalCwd = process.cwd();
 
-var inherits = __webpack_require__(113).inherits;
+    try {
+      for (const {
+        pattern,
+        cwd
+      } of toDelete) {
+        process.chdir(cwd);
+        const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
 
-var NestedError = function (message, nested) {
-    this.nested = nested;
+        if (_utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].wouldLogLevel('info')) {
+          ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
+        }
 
-    if (message instanceof Error) {
-        nested = message;
-    } else if (typeof message !== 'undefined') {
-        Object.defineProperty(this, 'message', {
-            value: message,
-            writable: true,
-            enumerable: false,
-            configurable: true
-        });
+        await promise;
+      }
+    } finally {
+      process.chdir(originalCwd);
     }
+  }
 
-    Error.captureStackTrace(this, this.constructor);
-    var oldStackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
-    var stackDescriptor = buildStackDescriptor(oldStackDescriptor, nested);
-    Object.defineProperty(this, 'stack', stackDescriptor);
 };
 
-function buildStackDescriptor(oldStackDescriptor, nested) {
-    if (oldStackDescriptor.get) {
-        return {
-            get: function () {
-                var stack = oldStackDescriptor.get.call(this);
-                return buildCombinedStacks(stack, this.nested);
-            }
-        };
-    } else {
-        var stack = oldStackDescriptor.value;
-        return {
-            value: buildCombinedStacks(stack, nested)
-        };
-    }
-}
+/***/ }),
 
-function buildCombinedStacks(stack, nested) {
-    if (nested) {
-        stack += '\nCaused By: ' + nested.stack;
-    }
-    return stack;
-}
+/***/ "./src/commands/run.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-inherits(NestedError, Error);
-NestedError.prototype.name = 'NestedError';
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return RunCommand; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/errors.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/parallelize.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/projects.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
 
-module.exports = NestedError;
 
 
-/***/ }),
-/* 771 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+const RunCommand = {
+  description: 'Run script defined in package.json in each package that contains that script (only works on packages not using Bazel yet)',
+  name: 'run',
+  reportTiming: {
+    group: 'scripts/kbn run',
+    id: 'total'
+  },
 
-const {promisify} = __webpack_require__(113);
-const fs = __webpack_require__(233);
-const makeDir = __webpack_require__(772);
-const pEvent = __webpack_require__(766);
-const CpFileError = __webpack_require__(769);
+  async run(projects, projectGraph, {
+    extraArgs,
+    options
+  }) {
+    _utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+      We are migrating packages into the Bazel build system and we will no longer support running npm scripts on
+      packages using 'yarn kbn run' on Bazel built packages. If the package you are trying to act on contains a
+      BUILD.bazel file please just use 'yarn kbn build' to build it or 'yarn kbn watch' to watch it
+    `);
+    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__[/* topologicallyBatchProjects */ "f"])(projects, projectGraph);
 
-const stat = promisify(fs.stat);
-const lstat = promisify(fs.lstat);
-const utimes = promisify(fs.utimes);
-const chmod = promisify(fs.chmod);
-const chown = promisify(fs.chown);
+    if (extraArgs.length === 0) {
+      throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__[/* CliError */ "a"]('No script specified');
+    }
 
-exports.closeSync = fs.closeSync.bind(fs);
-exports.createWriteStream = fs.createWriteStream.bind(fs);
+    const scriptName = extraArgs[0];
+    const scriptArgs = extraArgs.slice(1);
+    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_3__[/* parallelizeBatches */ "a"])(batchedProjects, async project => {
+      if (!project.hasScript(scriptName)) {
+        if (!!options['skip-missing']) {
+          return;
+        }
 
-exports.createReadStream = async (path, options) => {
-	const read = fs.createReadStream(path, options);
+        throw new _utils_errors__WEBPACK_IMPORTED_MODULE_1__[/* CliError */ "a"](`[${project.name}] no "${scriptName}" script defined. To skip packages without the "${scriptName}" script pass --skip-missing`);
+      }
 
-	try {
-		await pEvent(read, ['readable', 'end']);
-	} catch (error) {
-		throw new CpFileError(`Cannot read from \`${path}\`: ${error.message}`, error);
-	}
+      _utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].info(`[${project.name}] running "${scriptName}" script`);
+      await project.runScriptStreaming(scriptName, {
+        args: scriptArgs
+      });
+      _utils_log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].success(`[${project.name}] complete`);
+    });
+  }
 
-	return read;
 };
 
-exports.stat = path => stat(path).catch(error => {
-	throw new CpFileError(`Cannot stat path \`${path}\`: ${error.message}`, error);
-});
-
-exports.lstat = path => lstat(path).catch(error => {
-	throw new CpFileError(`lstat \`${path}\` failed: ${error.message}`, error);
-});
+/***/ }),
 
-exports.utimes = (path, atime, mtime) => utimes(path, atime, mtime).catch(error => {
-	throw new CpFileError(`utimes \`${path}\` failed: ${error.message}`, error);
-});
+/***/ "./src/commands/watch.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-exports.chmod = (path, mode) => chmod(path, mode).catch(error => {
-	throw new CpFileError(`chmod \`${path}\` failed: ${error.message}`, error);
-});
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WatchCommand; });
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/utils/bazel/index.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-exports.chown = (path, uid, gid) => chown(path, uid, gid).catch(error => {
-	throw new CpFileError(`chown \`${path}\` failed: ${error.message}`, error);
-});
+const WatchCommand = {
+  description: 'Runs a build in the Bazel built packages and keeps watching them for changes',
+  name: 'watch',
+  reportTiming: {
+    group: 'scripts/kbn watch',
+    id: 'total'
+  },
 
-exports.statSync = path => {
-	try {
-		return fs.statSync(path);
-	} catch (error) {
-		throw new CpFileError(`stat \`${path}\` failed: ${error.message}`, error);
-	}
-};
+  async run(projects, projectGraph, {
+    options
+  }) {
+    const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true; // Call bazel with the target to build all available packages and run it through iBazel to watch it for changes
+    //
+    // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
+    // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
 
-exports.utimesSync = (path, atime, mtime) => {
-	try {
-		return fs.utimesSync(path, atime, mtime);
-	} catch (error) {
-		throw new CpFileError(`utimes \`${path}\` failed: ${error.message}`, error);
-	}
-};
+    await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__[/* runIBazel */ "g"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
+  }
 
-exports.chmodSync = (path, mode) => {
-	try {
-		return fs.chmodSync(path, mode);
-	} catch (error) {
-		throw new CpFileError(`chmod \`${path}\` failed: ${error.message}`, error);
-	}
 };
 
-exports.chownSync = (path, uid, gid) => {
-	try {
-		return fs.chownSync(path, uid, gid);
-	} catch (error) {
-		throw new CpFileError(`chown \`${path}\` failed: ${error.message}`, error);
-	}
-};
+/***/ }),
 
-exports.makeDir = path => makeDir(path, {fs}).catch(error => {
-	throw new CpFileError(`Cannot create directory \`${path}\`: ${error.message}`, error);
-});
+/***/ "./src/config.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-exports.makeDirSync = path => {
-	try {
-		makeDir.sync(path, {fs});
-	} catch (error) {
-		throw new CpFileError(`Cannot create directory \`${path}\`: ${error.message}`, error);
-	}
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getProjectPaths; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-exports.copyFileSync = (source, destination, flags) => {
-	try {
-		fs.copyFileSync(source, destination, flags);
-	} catch (error) {
-		throw new CpFileError(`Cannot copy from \`${source}\` to \`${destination}\`: ${error.message}`, error);
-	}
-};
 
+/**
+ * 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.
 
-/***/ }),
-/* 772 */
-/***/ (function(module, exports, __webpack_require__) {
+  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, 'test/server_integration/__fixtures__/plugins/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
 
-"use strict";
+  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/*'));
+  }
 
-const fs = __webpack_require__(132);
-const path = __webpack_require__(4);
-const {promisify} = __webpack_require__(113);
-const semver = __webpack_require__(773);
+  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/*'));
+  }
 
-const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
+  return projectPaths;
+}
 
-// 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, ''));
+/***/ }),
 
-		if (pathHasInvalidWinCharacters) {
-			const error = new Error(`Path contains invalid characters: ${pth}`);
-			error.code = 'EINVAL';
-			throw error;
-		}
-	}
-};
+/***/ "./src/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-const processOptions = options => {
-	// https://github.com/sindresorhus/make-dir/issues/18
-	const defaults = {
-		mode: 0o777,
-		fs
-	};
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/cli.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-	return {
-		...defaults,
-		...options
-	};
-};
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/production/index.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-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;
-};
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["b"]; });
 
-const makeDir = async (input, options) => {
-	checkPath(input);
-	options = processOptions(options);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return _utils_projects__WEBPACK_IMPORTED_MODULE_2__["d"]; });
 
-	const mkdir = promisify(options.fs.mkdir);
-	const stat = promisify(options.fs.stat);
+/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/project.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
-		const pth = path.resolve(input);
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "transformDependencies", function() { return _utils_package_json__WEBPACK_IMPORTED_MODULE_4__["d"]; });
 
-		await mkdir(pth, {
-			mode: options.mode,
-			recursive: true
-		});
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/config.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["a"]; });
 
-		return pth;
-	}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	const make = async pth => {
-		try {
-			await mkdir(pth, options.mode);
 
-			return pth;
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
 
-				await make(path.dirname(pth));
 
-				return make(pth);
-			}
 
-			try {
-				const stats = await stat(pth);
-				if (!stats.isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
+/***/ }),
 
-			return pth;
-		}
-	};
+/***/ "./src/production/build_bazel_production_projects.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	return make(path.resolve(input));
-};
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return buildBazelProductionProjects; });
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/cpy/index.js");
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/globby/index.js");
+/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(globby__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/production/build_non_bazel_production_projects.ts");
+/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/bazel/index.ts");
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("./src/utils/projects.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-module.exports = makeDir;
 
-module.exports.sync = (input, options) => {
-	checkPath(input);
-	options = processOptions(options);
 
-	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
-		const pth = path.resolve(input);
 
-		fs.mkdirSync(pth, {
-			mode: options.mode,
-			recursive: true
-		});
 
-		return pth;
-	}
 
-	const make = pth => {
-		try {
-			options.fs.mkdirSync(pth, options.mode);
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
 
-				make(path.dirname(pth));
-				return make(pth);
-			}
+async function buildBazelProductionProjects({
+  kibanaRoot,
+  buildRoot,
+  onlyOSS
+}) {
+  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_8__[/* getBazelProjectsOnly */ "b"])(await Object(_build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__[/* getProductionProjects */ "b"])(kibanaRoot, onlyOSS));
+  const projectNames = [...projects.values()].map(project => project.name);
+  _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`);
+  await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_4__[/* runBazel */ "f"])(['build', '//packages:build']);
+  _utils_log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].info(`All Bazel projects production builds for [${projectNames.join(', ')}] are complete`);
 
-			try {
-				if (!options.fs.statSync(pth).isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
-		}
+  for (const project of projects.values()) {
+    await copyToBuild(project, kibanaRoot, buildRoot);
+    await applyCorrectPermissions(project, kibanaRoot, buildRoot);
+  }
+}
+/**
+ * Copy all the project's files from its Bazel dist directory into the
+ * project build folder.
+ *
+ * When copying all the files into the build, we exclude `node_modules` because
+ * we want the Kibana build to be responsible for actually installing all
+ * dependencies. The primary reason for allowing the Kibana build process to
+ * manage dependencies is that it will "dedupe" them, so we don't include
+ * unnecessary copies of dependencies. We also exclude every related Bazel build
+ * files in order to get the most cleaner package module we can in the final distributable.
+ */
 
-		return pth;
-	};
+async function copyToBuild(project, kibanaRoot, buildRoot) {
+  // We want the package to have the same relative location within the build
+  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
+  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
+  await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*'], buildProjectPath, {
+    cwd: Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(kibanaRoot, 'bazel-bin', 'packages', Object(path__WEBPACK_IMPORTED_MODULE_2__["basename"])(buildProjectPath), 'npm_module'),
+    dot: true,
+    onlyFiles: true,
+    parents: true
+  }); // If a project is using an intermediate build directory, we special-case our
+  // handling of `package.json`, as the project build process might have copied
+  // (a potentially modified) `package.json` into the intermediate build
+  // directory already. If so, we want to use that `package.json` as the basis
+  // for creating the production-ready `package.json`. If it's not present in
+  // the intermediate build, we fall back to using the project's already defined
+  // `package.json`.
 
-	return make(path.resolve(input));
-};
+  const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* isFile */ "d"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__[/* readPackageJson */ "c"])(buildProjectPath) : project.json;
+  const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__[/* createProductionPackageJson */ "a"])(packageJson);
+  await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__[/* writePackageJson */ "e"])(buildProjectPath, preparedPackageJson);
+}
 
+async function applyCorrectPermissions(project, kibanaRoot, buildRoot) {
+  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
+  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
+  const allPluginPaths = await globby__WEBPACK_IMPORTED_MODULE_1___default()([`**/*`], {
+    onlyFiles: false,
+    cwd: buildProjectPath,
+    dot: true
+  });
 
-/***/ }),
-/* 773 */
-/***/ (function(module, exports) {
+  for (const pluginPath of allPluginPaths) {
+    const resolvedPluginPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildProjectPath, pluginPath);
 
-exports = module.exports = SemVer
+    if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* isFile */ "d"])(resolvedPluginPath)) {
+      await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* chmod */ "a"])(resolvedPluginPath, 0o644);
+    }
 
-var debug
-/* istanbul ignore next */
-if (typeof process === 'object' &&
-    process.env &&
-    process.env.NODE_DEBUG &&
-    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
-  debug = function () {
-    var args = Array.prototype.slice.call(arguments, 0)
-    args.unshift('SEMVER')
-    console.log.apply(console, args)
+    if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* isDirectory */ "c"])(resolvedPluginPath)) {
+      await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__[/* chmod */ "a"])(resolvedPluginPath, 0o755);
+    }
   }
-} else {
-  debug = function () {}
 }
 
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0'
-
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
+/***/ }),
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16
+/***/ "./src/production/build_non_bazel_production_projects.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// The actual regexps go on exports.re
-var re = exports.re = []
-var src = exports.src = []
-var t = exports.tokens = {}
-var R = 0
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return buildNonBazelProductionProjects; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return getProductionProjects; });
+/* unused harmony export buildProject */
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/cpy/index.js");
+/* 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__("../../node_modules/del/index.js");
+/* 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__("path");
+/* 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__("./src/config.ts");
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/projects.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-function tok (n) {
-  t[n] = R++
-}
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
 
-tok('NUMERICIDENTIFIER')
-src[t.NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-tok('NUMERICIDENTIFIERLOOSE')
-src[t.NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
 
-tok('NONNUMERICIDENTIFIER')
-src[t.NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
 
-tok('MAINVERSION')
-src[t.MAINVERSION] = '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[t.NUMERICIDENTIFIER] + ')'
+async function buildNonBazelProductionProjects({
+  kibanaRoot,
+  buildRoot,
+  onlyOSS
+}) {
+  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__[/* getNonBazelProjectsOnly */ "c"])(await getProductionProjects(kibanaRoot, onlyOSS));
+  const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__[/* buildProjectGraph */ "a"])(projects);
+  const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__[/* topologicallyBatchProjects */ "f"])(projects, projectGraph);
+  const projectNames = [...projects.values()].map(project => project.name);
+  _utils_log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].info(`Preparing non Bazel production build for [${projectNames.join(', ')}]`);
 
-tok('MAINVERSIONLOOSE')
-src[t.MAINVERSIONLOOSE] = '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')'
+  for (const batch of batchedProjects) {
+    for (const project of batch) {
+      await deleteTarget(project);
+      await buildProject(project);
+      await copyToBuild(project, kibanaRoot, buildRoot);
+    }
+  }
+}
+/**
+ * Returns the subset of projects that should be built into the production
+ * bundle. As we copy these into Kibana's `node_modules` during the build step,
+ * and let Kibana's build process be responsible for installing dependencies,
+ * we only include Kibana's transitive _production_ dependencies. If onlyOSS
+ * is supplied, we omit projects with build.oss in their package.json set to false.
+ */
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+async function getProductionProjects(rootPath, onlyOSS) {
+  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__[/* getProjectPaths */ "a"])({
+    rootPath
+  });
+  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__[/* getProjects */ "d"])(rootPath, projectPaths);
+  const projectsSubset = [projects.get('kibana')];
 
-tok('PRERELEASEIDENTIFIER')
-src[t.PRERELEASEIDENTIFIER] = '(?:' + src[t.NUMERICIDENTIFIER] +
-                            '|' + src[t.NONNUMERICIDENTIFIER] + ')'
+  if (projects.has('x-pack')) {
+    projectsSubset.push(projects.get('x-pack'));
+  }
 
-tok('PRERELEASEIDENTIFIERLOOSE')
-src[t.PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[t.NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[t.NONNUMERICIDENTIFIER] + ')'
+  const productionProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__[/* includeTransitiveProjects */ "e"])(projectsSubset, projects, {
+    onlyProductionDependencies: true
+  }); // We remove Kibana, as we're already building Kibana
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+  productionProjects.delete('kibana');
 
-tok('PRERELEASE')
-src[t.PRERELEASE] = '(?:-(' + src[t.PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[t.PRERELEASEIDENTIFIER] + ')*))'
+  if (onlyOSS) {
+    productionProjects.forEach(project => {
+      if (project.getBuildConfig().oss === false) {
+        productionProjects.delete(project.json.name);
+      }
+    });
+  }
 
-tok('PRERELEASELOOSE')
-src[t.PRERELEASELOOSE] = '(?:-?(' + src[t.PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[t.PRERELEASEIDENTIFIERLOOSE] + ')*))'
+  return productionProjects;
+}
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+async function deleteTarget(project) {
+  const targetDir = project.targetLocation;
 
-tok('BUILDIDENTIFIER')
-src[t.BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
+  if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__[/* isDirectory */ "c"])(targetDir)) {
+    await del__WEBPACK_IMPORTED_MODULE_1___default()(targetDir, {
+      force: true
+    });
+  }
+}
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+async function buildProject(project) {
+  if (project.hasScript('build')) {
+    await project.runScript('build');
+  }
+}
+/**
+ * Copy all the project's files from its "intermediate build directory" and
+ * into the build. The intermediate directory can either be the root of the
+ * project or some other location defined in the project's `package.json`.
+ *
+ * When copying all the files into the build, we exclude `node_modules` because
+ * we want the Kibana build to be responsible for actually installing all
+ * dependencies. The primary reason for allowing the Kibana build process to
+ * manage dependencies is that it will "dedupe" them, so we don't include
+ * unnecessary copies of dependencies.
+ */
 
-tok('BUILD')
-src[t.BUILD] = '(?:\\+(' + src[t.BUILDIDENTIFIER] +
-             '(?:\\.' + src[t.BUILDIDENTIFIER] + ')*))'
+async function copyToBuild(project, kibanaRoot, buildRoot) {
+  // We want the package to have the same relative location within the build
+  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
+  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
+  await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*', '!node_modules/**'], buildProjectPath, {
+    cwd: project.getIntermediateBuildDirectory(),
+    dot: true,
+    onlyFiles: true,
+    parents: true
+  }); // If a project is using an intermediate build directory, we special-case our
+  // handling of `package.json`, as the project build process might have copied
+  // (a potentially modified) `package.json` into the intermediate build
+  // directory already. If so, we want to use that `package.json` as the basis
+  // for creating the production-ready `package.json`. If it's not present in
+  // the intermediate build, we fall back to using the project's already defined
+  // `package.json`.
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+  const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__[/* isFile */ "d"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__[/* readPackageJson */ "c"])(buildProjectPath) : project.json;
+  const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__[/* createProductionPackageJson */ "a"])(packageJson);
+  await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__[/* writePackageJson */ "e"])(buildProjectPath, preparedPackageJson);
+}
 
-// Note that the only major, minor, patch, and pre-release sections of
-// the version string are capturing groups.  The build metadata is not a
-// capturing group, because it should not ever be used in version
-// comparison.
+/***/ }),
 
-tok('FULL')
-tok('FULLPLAIN')
-src[t.FULLPLAIN] = 'v?' + src[t.MAINVERSION] +
-                  src[t.PRERELEASE] + '?' +
-                  src[t.BUILD] + '?'
+/***/ "./src/production/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-src[t.FULL] = '^' + src[t.FULLPLAIN] + '$'
+"use strict";
+/* harmony import */ var _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/production/build_bazel_production_projects.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-// common in the npm registry.
-tok('LOOSEPLAIN')
-src[t.LOOSEPLAIN] = '[v=\\s]*' + src[t.MAINVERSIONLOOSE] +
-                  src[t.PRERELEASELOOSE] + '?' +
-                  src[t.BUILD] + '?'
+/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/production/build_non_bazel_production_projects.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "b", function() { return _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-tok('LOOSE')
-src[t.LOOSE] = '^' + src[t.LOOSEPLAIN] + '$'
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-tok('GTLT')
-src[t.GTLT] = '((?:<|>)?=?)'
 
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-tok('XRANGEIDENTIFIERLOOSE')
-src[t.XRANGEIDENTIFIERLOOSE] = src[t.NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'
-tok('XRANGEIDENTIFIER')
-src[t.XRANGEIDENTIFIER] = src[t.NUMERICIDENTIFIER] + '|x|X|\\*'
 
-tok('XRANGEPLAIN')
-src[t.XRANGEPLAIN] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[t.PRERELEASE] + ')?' +
-                   src[t.BUILD] + '?' +
-                   ')?)?'
+/***/ }),
 
-tok('XRANGEPLAINLOOSE')
-src[t.XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[t.PRERELEASELOOSE] + ')?' +
-                        src[t.BUILD] + '?' +
-                        ')?)?'
+/***/ "./src/run.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-tok('XRANGE')
-src[t.XRANGE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAIN] + '$'
-tok('XRANGELOOSE')
-src[t.XRANGELOOSE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAINLOOSE] + '$'
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return runCommand; });
+/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/ci_stats_reporter/ci_stats_reporter.js");
+/* harmony import */ var _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/@kbn/plugin-discovery/target_node/index.js");
+/* harmony import */ var _kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/errors.ts");
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/projects_tree.ts");
+/* harmony import */ var _utils_regenerate_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/regenerate_package_json.ts");
+/* harmony import */ var _utils_regenerate_synthetic_package_map__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/regenerate_synthetic_package_map.ts");
+/* harmony import */ var _utils_regenerate_base_tsconfig__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("./src/utils/regenerate_base_tsconfig.ts");
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("./src/utils/kibana.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-// Coercion.
-// Extract anything that could conceivably be a part of a valid semver
-tok('COERCE')
-src[t.COERCE] = '(^|[^\\d])' +
-              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:$|[^\\d])'
-tok('COERCERTL')
-re[t.COERCERTL] = new RegExp(src[t.COERCE], 'g')
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-tok('LONETILDE')
-src[t.LONETILDE] = '(?:~>?)'
+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; }
 
-tok('TILDETRIM')
-src[t.TILDETRIM] = '(\\s*)' + src[t.LONETILDE] + '\\s+'
-re[t.TILDETRIM] = new RegExp(src[t.TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-tok('TILDE')
-src[t.TILDE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAIN] + '$'
-tok('TILDELOOSE')
-src[t.TILDELOOSE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAINLOOSE] + '$'
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-tok('LONECARET')
-src[t.LONECARET] = '(?:\\^)'
 
-tok('CARETTRIM')
-src[t.CARETTRIM] = '(\\s*)' + src[t.LONECARET] + '\\s+'
-re[t.CARETTRIM] = new RegExp(src[t.CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
 
-tok('CARET')
-src[t.CARET] = '^' + src[t.LONECARET] + src[t.XRANGEPLAIN] + '$'
-tok('CARETLOOSE')
-src[t.CARETLOOSE] = '^' + src[t.LONECARET] + src[t.XRANGEPLAINLOOSE] + '$'
 
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-tok('COMPARATORLOOSE')
-src[t.COMPARATORLOOSE] = '^' + src[t.GTLT] + '\\s*(' + src[t.LOOSEPLAIN] + ')$|^$'
-tok('COMPARATOR')
-src[t.COMPARATOR] = '^' + src[t.GTLT] + '\\s*(' + src[t.FULLPLAIN] + ')$|^$'
 
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-tok('COMPARATORTRIM')
-src[t.COMPARATORTRIM] = '(\\s*)' + src[t.GTLT] +
-                      '\\s*(' + src[t.LOOSEPLAIN] + '|' + src[t.XRANGEPLAIN] + ')'
 
-// this one has to use the /g flag
-re[t.COMPARATORTRIM] = new RegExp(src[t.COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
 
-// Something like `1.2.3 - 1.2.4`
-// Note that these all use the loose form, because they'll be
-// checked against either the strict or loose comparator form
-// later.
-tok('HYPHENRANGE')
-src[t.HYPHENRANGE] = '^\\s*(' + src[t.XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[t.XRANGEPLAIN] + ')' +
-                   '\\s*$'
 
-tok('HYPHENRANGELOOSE')
-src[t.HYPHENRANGELOOSE] = '^\\s*(' + src[t.XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[t.XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
 
-// Star ranges basically just allow anything at all.
-tok('STAR')
-src[t.STAR] = '(<|>)?=?\\s*\\*'
+process.env.CI_STATS_NESTED_TIMING = 'true';
+async function runCommand(command, config) {
+  const runStartTime = Date.now();
+  let kbn;
+  const timings = [];
 
-// Compile to actual regexp objects.
-// All are flag-free, unless they were created above with a flag.
-for (var i = 0; i < R; i++) {
-  debug(i, src[i])
-  if (!re[i]) {
-    re[i] = new RegExp(src[i])
-  }
-}
+  async function time(id, block) {
+    const start = Date.now();
+    let success = true;
 
-exports.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+    try {
+      return await block();
+    } catch (error) {
+      success = false;
+      throw error;
+    } finally {
+      timings.push({
+        id,
+        ms: Date.now() - start,
+        meta: {
+          success
+        }
+      });
     }
   }
 
-  if (version instanceof SemVer) {
-    return version
-  }
-
-  if (typeof version !== 'string') {
-    return null
-  }
+  async function reportTimes(timingConfig, error) {
+    if (!kbn) {
+      // things are too broken to report remotely
+      return;
+    }
 
-  if (version.length > MAX_LENGTH) {
-    return null
-  }
+    const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_0__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"]);
 
-  var r = options.loose ? re[t.LOOSE] : re[t.FULL]
-  if (!r.test(version)) {
-    return null
+    try {
+      await reporter.timings({
+        upstreamBranch: kbn.kibanaProject.json.branch,
+        // prevent loading @kbn/utils by passing null
+        kibanaUuid: kbn.getUuid() || null,
+        timings: [...timings.map(t => _objectSpread(_objectSpread({}, timingConfig), t)), {
+          group: timingConfig.group,
+          id: timingConfig.id,
+          ms: Date.now() - runStartTime,
+          meta: {
+            success: !error
+          }
+        }]
+      });
+    } catch (e) {
+      // prevent hiding bootstrap errors
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error('failed to report timings:');
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(e);
+    }
   }
 
   try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
-  }
-}
-
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
-}
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].debug(`Running [${command.name}] command from [${config.rootPath}]`);
+    await time('regenerate package.json, synthetic-package map and tsconfig', async () => {
+      const plugins = Object(_kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__["simpleKibanaPlatformPluginDiscovery"])(Object(_kbn_plugin_discovery__WEBPACK_IMPORTED_MODULE_1__["getPluginSearchPaths"])({
+        rootDir: config.rootPath,
+        oss: false,
+        examples: true,
+        testPlugins: true
+      }), []);
+      await Promise.all([Object(_utils_regenerate_package_json__WEBPACK_IMPORTED_MODULE_6__[/* regeneratePackageJson */ "a"])(config.rootPath), Object(_utils_regenerate_synthetic_package_map__WEBPACK_IMPORTED_MODULE_7__[/* regenerateSyntheticPackageMap */ "a"])(plugins, config.rootPath), Object(_utils_regenerate_base_tsconfig__WEBPACK_IMPORTED_MODULE_8__[/* regenerateBaseTsconfig */ "a"])(plugins, config.rootPath)]);
+    });
+    kbn = await time('load Kibana project', async () => await _utils_kibana__WEBPACK_IMPORTED_MODULE_9__[/* Kibana */ "a"].loadFrom(config.rootPath));
+    const projects = kbn.getFilteredProjects({
+      skipKibanaPlugins: Boolean(config.options['skip-kibana-plugins']),
+      ossOnly: Boolean(config.options.oss),
+      exclude: toArray(config.options.exclude),
+      include: toArray(config.options.include)
+    });
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
-}
+    if (projects.size === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(`There are no projects found. Double check project name(s) in '-i/--include' and '-e/--exclude' filters.`);
+      return process.exit(1);
+    }
 
-exports.SemVer = SemVer
+    const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__[/* buildProjectGraph */ "a"])(projects);
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].debug(`Found ${projects.size.toString()} projects`);
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].debug(Object(_utils_projects_tree__WEBPACK_IMPORTED_MODULE_5__[/* renderProjectsTree */ "a"])(config.rootPath, projects));
+    await command.run(projects, projectGraph, _objectSpread(_objectSpread({}, config), {}, {
+      kbn
+    }));
 
-function SemVer (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+    if (command.reportTiming) {
+      await reportTimes(command.reportTiming);
     }
-  }
-  if (version instanceof SemVer) {
-    if (version.loose === options.loose) {
-      return version
-    } else {
-      version = version.version
+  } catch (error) {
+    if (command.reportTiming) {
+      await reportTimes(command.reportTiming, error);
     }
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version)
-  }
 
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-  }
+    _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(`[${command.name}] failed:`);
 
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
-  }
+    if (error instanceof _utils_errors__WEBPACK_IMPORTED_MODULE_2__[/* CliError */ "a"]) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(error.message);
+      const metaOutput = Object.entries(error.meta).map(([key, value]) => `${key}: ${value}`).join('\n');
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
+      if (metaOutput) {
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].info('Additional debugging info:\n');
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].indent(2);
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].info(metaOutput);
+        _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].indent(-2);
+      }
+    } else {
+      _utils_log__WEBPACK_IMPORTED_MODULE_3__[/* log */ "a"].error(error);
+    }
 
-  var m = version.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL])
+    process.exit(1);
+  }
+}
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
+function toArray(value) {
+  if (value == null) {
+    return [];
   }
 
-  this.raw = version
+  return Array.isArray(value) ? value : [value];
+}
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
+/***/ }),
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-    throw new TypeError('Invalid major version')
-  }
+/***/ "./src/utils/bazel/get_cache_folders.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-    throw new TypeError('Invalid minor version')
-  }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getBazelDiskCacheFolder; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return getBazelRepositoryCacheFolder; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/child_process.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
-  }
 
-  // numberify any prerelease numeric ids
-  if (!m[4]) {
-    this.prerelease = []
-  } else {
-    this.prerelease = m[4].split('.').map(function (id) {
-      if (/^[0-9]+$/.test(id)) {
-        var num = +id
-        if (num >= 0 && num < MAX_SAFE_INTEGER) {
-          return num
-        }
-      }
-      return id
-    })
-  }
 
-  this.build = m[5] ? m[5].split('.') : []
-  this.format()
+async function rawRunBazelInfoRepoCache() {
+  const {
+    stdout: bazelRepositoryCachePath
+  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_1__[/* spawn */ "a"])('bazel', ['info', 'repository_cache'], {
+    stdio: 'pipe'
+  });
+  return bazelRepositoryCachePath;
 }
 
-SemVer.prototype.format = function () {
-  this.version = this.major + '.' + this.minor + '.' + this.patch
-  if (this.prerelease.length) {
-    this.version += '-' + this.prerelease.join('.')
-  }
-  return this.version
+async function getBazelDiskCacheFolder() {
+  return Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(await rawRunBazelInfoRepoCache()), 'disk-cache');
 }
-
-SemVer.prototype.toString = function () {
-  return this.version
+async function getBazelRepositoryCacheFolder() {
+  return await rawRunBazelInfoRepoCache();
 }
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+/***/ }),
 
-  return this.compareMain(other) || this.comparePre(other)
-}
+/***/ "./src/utils/bazel/index.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+"use strict";
+/* harmony import */ var _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/utils/bazel/get_cache_folders.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "a", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "b", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["b"]; });
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/bazel/install_tools.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "c", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-  // NOT having a prerelease is > having one
-  if (this.prerelease.length && !other.prerelease.length) {
-    return -1
-  } else if (!this.prerelease.length && other.prerelease.length) {
-    return 1
-  } else if (!this.prerelease.length && !other.prerelease.length) {
-    return 0
-  }
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "d", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["b"]; });
 
-  var i = 0
-  do {
-    var a = this.prerelease[i]
-    var b = other.prerelease[i]
-    debug('prerelease compare', i, a, b)
-    if (a === undefined && b === undefined) {
-      return 0
-    } else if (b === undefined) {
-      return 1
-    } else if (a === undefined) {
-      return -1
-    } else if (a === b) {
-      continue
-    } else {
-      return compareIdentifiers(a, b)
-    }
-  } while (++i)
-}
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/bazel/run.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "f", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-SemVer.prototype.compareBuild = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "g", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["b"]; });
 
-  var i = 0
-  do {
-    var a = this.build[i]
-    var b = other.build[i]
-    debug('prerelease compare', i, a, b)
-    if (a === undefined && b === undefined) {
-      return 0
-    } else if (b === undefined) {
-      return 1
-    } else if (a === undefined) {
-      return -1
-    } else if (a === b) {
-      continue
-    } else {
-      return compareIdentifiers(a, b)
-    }
-  } while (++i)
-}
+/* harmony import */ var _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/bazel/yarn_integrity.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "e", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-// preminor will bump the version up to the next minor release, and immediately
-// down to pre-release. premajor and prepatch work the same way.
-SemVer.prototype.inc = function (release, identifier) {
-  switch (release) {
-    case 'premajor':
-      this.prerelease.length = 0
-      this.patch = 0
-      this.minor = 0
-      this.major++
-      this.inc('pre', identifier)
-      break
-    case 'preminor':
-      this.prerelease.length = 0
-      this.patch = 0
-      this.minor++
-      this.inc('pre', identifier)
-      break
-    case 'prepatch':
-      // If this is already a prerelease, it will bump to the next version
-      // drop any prereleases that might already exist, since they are not
-      // relevant at this point.
-      this.prerelease.length = 0
-      this.inc('patch', identifier)
-      this.inc('pre', identifier)
-      break
-    // If the input is a non-prerelease version, this acts the same as
-    // prepatch.
-    case 'prerelease':
-      if (this.prerelease.length === 0) {
-        this.inc('patch', identifier)
-      }
-      this.inc('pre', identifier)
-      break
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-    case 'major':
-      // If this is a pre-major version, bump up to the same major version.
-      // Otherwise increment major.
-      // 1.0.0-5 bumps to 1.0.0
-      // 1.1.0 bumps to 2.0.0
-      if (this.minor !== 0 ||
-          this.patch !== 0 ||
-          this.prerelease.length === 0) {
-        this.major++
-      }
-      this.minor = 0
-      this.patch = 0
-      this.prerelease = []
-      break
-    case 'minor':
-      // If this is a pre-minor version, bump up to the same minor version.
-      // Otherwise increment minor.
-      // 1.2.0-5 bumps to 1.2.0
-      // 1.2.1 bumps to 1.3.0
-      if (this.patch !== 0 || this.prerelease.length === 0) {
-        this.minor++
-      }
-      this.patch = 0
-      this.prerelease = []
-      break
-    case 'patch':
-      // If this is not a pre-release version, it will increment the patch.
-      // If it is a pre-release it will bump up to the same patch version.
-      // 1.2.0-5 patches to 1.2.0
-      // 1.2.0 patches to 1.2.1
-      if (this.prerelease.length === 0) {
-        this.patch++
-      }
-      this.prerelease = []
-      break
-    // This probably shouldn't be used publicly.
-    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
-    case 'pre':
-      if (this.prerelease.length === 0) {
-        this.prerelease = [0]
-      } else {
-        var i = this.prerelease.length
-        while (--i >= 0) {
-          if (typeof this.prerelease[i] === 'number') {
-            this.prerelease[i]++
-            i = -2
-          }
-        }
-        if (i === -1) {
-          // didn't increment anything
-          this.prerelease.push(0)
-        }
-      }
-      if (identifier) {
-        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-        if (this.prerelease[0] === identifier) {
-          if (isNaN(this.prerelease[1])) {
-            this.prerelease = [identifier, 0]
-          }
-        } else {
-          this.prerelease = [identifier, 0]
-        }
-      }
-      break
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
-  }
-  this.format()
-  this.raw = this.version
-  return this
-}
 
-exports.inc = inc
-function inc (version, release, loose, identifier) {
-  if (typeof (loose) === 'string') {
-    identifier = loose
-    loose = undefined
+
+
+/***/ }),
+
+/***/ "./src/utils/bazel/install_tools.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return isBazelBinAvailable; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return installBazelTools; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+
+
+
+
+async function readBazelToolsVersionFile(repoRootPath, versionFilename) {
+  const version = (await Object(_fs__WEBPACK_IMPORTED_MODULE_3__[/* readFile */ "f"])(Object(path__WEBPACK_IMPORTED_MODULE_1__["resolve"])(repoRootPath, versionFilename))).toString().split('\n')[0];
+
+  if (!version) {
+    throw new Error(`[bazel_tools] Failed on reading bazel tools versions\n ${versionFilename} file do not contain any version set`);
   }
 
+  return version;
+}
+
+async function isBazelBinAvailable(repoRootPath) {
   try {
-    return new SemVer(version, loose).inc(release, identifier).version
-  } catch (er) {
-    return null
+    const installedVersion = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('bazel', ['--version'], {
+      stdio: 'pipe'
+    });
+    const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion');
+
+    if (installedVersion.stdout === `bazel ${bazelVersion}`) {
+      return true;
+    } else {
+      _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] Bazel is installed (${installedVersion.stdout}), but was expecting ${bazelVersion}`);
+      return false;
+    }
+  } catch {
+    return false;
   }
 }
 
-exports.diff = diff
-function diff (version1, version2) {
-  if (eq(version1, version2)) {
-    return null
-  } else {
-    var v1 = parse(version1)
-    var v2 = parse(version2)
-    var prefix = ''
-    if (v1.prerelease.length || v2.prerelease.length) {
-      prefix = 'pre'
-      var defaultResult = 'prerelease'
-    }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return prefix + key
-        }
-      }
+async function tryRemoveBazeliskFromYarnGlobal() {
+  try {
+    // Check if Bazelisk is installed on the yarn global scope
+    const {
+      stdout: bazeliskPkgInstallStdout
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('yarn', ['global', 'list'], {
+      stdio: 'pipe'
+    }); // Bazelisk was found on yarn global scope so lets remove it
+
+    if (bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@`)) {
+      await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('yarn', ['global', 'remove', `@bazel/bazelisk`], {
+        stdio: 'pipe'
+      });
+      _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] bazelisk was installed on Yarn global packages and is now removed`);
+      return true;
     }
-    return defaultResult // may be undefined
+
+    return false;
+  } catch {
+    return false;
   }
 }
 
-exports.compareIdentifiers = compareIdentifiers
+async function installBazelTools(repoRootPath) {
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] reading bazel tools versions from version files`);
+  const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
+  const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] verify if bazelisk is installed`); // Check if we need to remove bazelisk from yarn
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
+  await tryRemoveBazeliskFromYarnGlobal(); // Test if bazel bin is available
+
+  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(repoRootPath); // Install bazelisk if not installed
+
+  if (!isBazelBinAlreadyAvailable) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] installing Bazel tools`);
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`);
+    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__[/* spawn */ "a"])('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], {
+      env: {
+        USE_BAZEL_VERSION: bazelVersion
+      },
+      stdio: 'pipe'
+    });
+    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable(repoRootPath);
+
+    if (!isBazelBinAvailableAfterInstall) {
+      throw new Error(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
+      `);
+    }
   }
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].success(`[bazel_tools] all bazel tools are correctly installed`);
 }
 
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
-}
+/***/ }),
 
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
-}
+/***/ "./src/utils/bazel/run.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return runBazel; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return runIBazel; });
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/chalk/source/index.js");
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/Subject.js");
+/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/observable/merge.js");
+/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/rxjs/dist/esm5/internal/operators/tap.js");
+/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/stdio/index.js");
+/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/errors.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
-}
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
-}
+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; }
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
-}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-exports.compareBuild = compareBuild
-function compareBuild (a, b, loose) {
-  var versionA = new SemVer(a, loose)
-  var versionB = new SemVer(b, loose)
-  return versionA.compare(versionB) || versionA.compareBuild(versionB)
-}
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
-}
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compareBuild(a, b, loose)
-  })
-}
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compareBuild(b, a, loose)
-  })
-}
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
-}
 
-exports.lt = lt
-function lt (a, b, loose) {
-  return compare(a, b, loose) < 0
-}
 
-exports.eq = eq
-function eq (a, b, loose) {
-  return compare(a, b, loose) === 0
-}
 
-exports.neq = neq
-function neq (a, b, loose) {
-  return compare(a, b, loose) !== 0
+async function runBazelCommandWithRunner(bazelCommandRunner, bazelArgs, offline = false, runOpts = {}) {
+  // Force logs to pipe in order to control the output of them
+  const bazelOpts = _objectSpread(_objectSpread({}, runOpts), {}, {
+    stdio: 'pipe'
+  });
+
+  if (offline) {
+    bazelArgs = [...bazelArgs, '--config=offline'];
+  }
+
+  const bazelProc = Object(_child_process__WEBPACK_IMPORTED_MODULE_5__[/* spawn */ "a"])(bazelCommandRunner, bazelArgs, bazelOpts);
+  const bazelLogs$ = new rxjs__WEBPACK_IMPORTED_MODULE_1__[/* Subject */ "a"](); // Bazel outputs machine readable output into stdout and human readable output goes to stderr.
+  // Therefore we need to get both. In order to get errors we need to parse the actual text line
+
+  const bazelLogSubscription = rxjs__WEBPACK_IMPORTED_MODULE_2__[/* merge */ "a"](Object(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_4__["observeLines"])(bazelProc.stdout).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__[/* tap */ "a"])(line => _log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].info(`${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan(`[${bazelCommandRunner}]`)} ${line}`))), Object(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_4__["observeLines"])(bazelProc.stderr).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__[/* tap */ "a"])(line => _log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].info(`${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan(`[${bazelCommandRunner}]`)} ${line}`)))).subscribe(bazelLogs$); // Wait for process and logs to finish, unsubscribing in the end
+
+  try {
+    await bazelProc;
+  } catch {
+    _log__WEBPACK_IMPORTED_MODULE_6__[/* log */ "a"].error('HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`');
+    throw new _errors__WEBPACK_IMPORTED_MODULE_7__[/* CliError */ "a"](`The bazel command that was running failed to complete.`);
+  }
+
+  await bazelLogs$.toPromise();
+  await bazelLogSubscription.unsubscribe();
 }
 
-exports.gte = gte
-function gte (a, b, loose) {
-  return compare(a, b, loose) >= 0
+async function runBazel(bazelArgs, offline = false, runOpts = {}) {
+  await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
 }
+async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
+  const extendedEnv = _objectSpread({
+    IBAZEL_USE_LEGACY_WATCHER: '0'
+  }, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);
 
-exports.lte = lte
-function lte (a, b, loose) {
-  return compare(a, b, loose) <= 0
+  await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
+    env: extendedEnv
+  }));
 }
 
-exports.cmp = cmp
-function cmp (a, op, b, loose) {
-  switch (op) {
-    case '===':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a === b
+/***/ }),
 
-    case '!==':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a !== b
+/***/ "./src/utils/bazel/setup_remote_cache.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return setupRemoteCache; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/child_process.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/fs.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-    case '!=':
-      return neq(a, b, loose)
 
-    case '>':
-      return gt(a, b, loose)
 
-    case '>=':
-      return gte(a, b, loose)
 
-    case '<':
-      return lt(a, b, loose)
 
-    case '<=':
-      return lte(a, b, loose)
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
-  }
-}
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
+async function isVaultAvailable() {
+  try {
+    await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawn */ "a"])('vault', ['--version'], {
+      stdio: 'pipe'
+    });
+    return true;
+  } catch {
+    return false;
   }
+}
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
-    }
+async function isElasticCommitter() {
+  try {
+    const {
+      stdout: email
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawn */ "a"])('git', ['config', 'user.email'], {
+      stdio: 'pipe'
+    });
+    return email.trim().endsWith('@elastic.co');
+  } catch {
+    return false;
   }
+}
 
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
+async function migrateToNewServersIfNeeded(settingsPath) {
+  if (!(await Object(_fs__WEBPACK_IMPORTED_MODULE_5__[/* isFile */ "d"])(settingsPath))) {
+    return false;
   }
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
+  const readSettingsFile = await Object(_fs__WEBPACK_IMPORTED_MODULE_5__[/* readFile */ "f"])(settingsPath, 'utf8');
+  const newReadSettingsFile = readSettingsFile.replace(/cloud\.buildbuddy\.io/g, 'remote.buildbuddy.io');
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
+  if (newReadSettingsFile === readSettingsFile) {
+    return false;
   }
 
-  debug('comp', this)
+  Object(_fs__WEBPACK_IMPORTED_MODULE_5__[/* writeFile */ "i"])(settingsPath, newReadSettingsFile);
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] upgrade remote cache settings to use new server address`);
+  return true;
 }
 
-var ANY = {}
-Comparator.prototype.parse = function (comp) {
-  var r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
-  var m = comp.match(r)
-
-  if (!m) {
-    throw new TypeError('Invalid comparator: ' + comp)
+async function setupRemoteCache(repoRootPath) {
+  // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
+  if (process.env.CI || !(await isElasticCommitter())) {
+    return;
   }
 
-  this.operator = m[1] !== undefined ? m[1] : ''
-  if (this.operator === '=') {
-    this.operator = ''
-  }
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] setting up remote cache settings if necessary`);
+  const settingsPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(repoRootPath, '.bazelrc.cache'); // Checks if we should upgrade the servers used on .bazelrc.cache
+  //
+  // NOTE: this can be removed in the future once everyone is migrated into the new servers
 
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2]) {
-    this.semver = ANY
-  } else {
-    this.semver = new SemVer(m[2], this.options.loose)
+  if (await migrateToNewServersIfNeeded(settingsPath)) {
+    return;
   }
-}
-
-Comparator.prototype.toString = function () {
-  return this.value
-}
-
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
 
-  if (this.semver === ANY || version === ANY) {
-    return true
+  if (Object(fs__WEBPACK_IMPORTED_MODULE_1__["existsSync"])(settingsPath)) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].debug(`[bazel_tools] remote cache settings already exist, skipping`);
+    return;
   }
 
-  if (typeof version === 'string') {
-    try {
-      version = new SemVer(version, this.options)
-    } catch (er) {
-      return false
-    }
+  if (!(await isVaultAvailable())) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] use the following guide or reach out to Operations for assistance');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] https://github.com/elastic/infra/tree/master/docs/vault');
+    return;
   }
 
-  return cmp(version, this.operator, this.semver, this.options)
-}
+  let apiKey = '';
 
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
+  try {
+    const {
+      stdout
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__[/* spawn */ "a"])('vault', ['read', '-field=readonly-key', 'secret/ui-team/kibana-bazel-remote-cache'], {
+      stdio: 'pipe'
+    });
+    apiKey = stdout.trim();
+  } catch (ex) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] unable to read bazel remote cache key from vault, are you authenticated?');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] ${ex}`);
+    return;
   }
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+  const contents = dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+    # V1 - This file is automatically generated by 'yarn kbn bootstrap'
+    # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
+    build --bes_results_url=https://app.buildbuddy.io/invocation/
+    build --bes_backend=grpcs://remote.buildbuddy.io
+    build --remote_cache=grpcs://remote.buildbuddy.io
+    build --remote_timeout=3600
+    build --remote_header=${apiKey}
+  `;
+  Object(fs__WEBPACK_IMPORTED_MODULE_1__["writeFileSync"])(settingsPath, contents);
+  _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[bazel_tools] remote cache settings written to ${settingsPath}`);
+}
 
-  var rangeTmp
+/***/ }),
 
-  if (this.operator === '') {
-    if (this.value === '') {
-      return true
-    }
-    rangeTmp = new Range(comp.value, options)
-    return satisfies(this.value, rangeTmp, options)
-  } else if (comp.operator === '') {
-    if (comp.value === '') {
-      return true
-    }
-    rangeTmp = new Range(this.value, options)
-    return satisfies(comp.semver, rangeTmp, options)
-  }
+/***/ "./src/utils/bazel/yarn_integrity.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  var sameDirectionIncreasing =
-    (this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '>=' || comp.operator === '>')
-  var sameDirectionDecreasing =
-    (this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '<=' || comp.operator === '<')
-  var sameSemVer = this.semver.version === comp.semver.version
-  var differentDirectionsInclusive =
-    (this.operator === '>=' || this.operator === '<=') &&
-    (comp.operator === '>=' || comp.operator === '<=')
-  var oppositeDirectionsLessThan =
-    cmp(this.semver, '<', comp.semver, options) &&
-    ((this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '<=' || comp.operator === '<'))
-  var oppositeDirectionsGreaterThan =
-    cmp(this.semver, '>', comp.semver, options) &&
-    ((this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '>=' || comp.operator === '>'))
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return removeYarnIntegrityFileIfExists; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/fs.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
-}
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+async function removeYarnIntegrityFileIfExists(nodeModulesPath) {
+  try {
+    const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* tryRealpath */ "g"])(nodeModulesPath);
+    const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // check if the file exists and delete it in that case
 
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
+    if (await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* isFile */ "d"])(yarnIntegrityFilePath)) {
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* unlink */ "h"])(yarnIntegrityFilePath);
     }
+  } catch {// no-op
   }
+}
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, options)
-  }
+/***/ }),
 
-  if (!(this instanceof Range)) {
-    return new Range(range, options)
-  }
+/***/ "./src/utils/child_process.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return spawn; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return spawnStreaming; });
+/* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("stream");
+/* 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__("../../node_modules/chalk/source/index.js");
+/* 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__("../../node_modules/execa/index.js");
+/* 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__("../../node_modules/strong-log-transformer/index.js");
+/* 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__("./src/utils/log.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-  // First, split based on boolean or ||
-  this.raw = range
-  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
-    return this.parseRange(range.trim())
-  }, this).filter(function (c) {
-    // throw out any that are not relevant for whatever reason
-    return c.length
-  })
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range)
-  }
+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; }
 
-  this.format()
-}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
-}
 
-Range.prototype.toString = function () {
-  return this.range
-}
 
-Range.prototype.parseRange = function (range) {
-  var loose = this.options.loose
-  range = range.trim()
-  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-  var hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE]
-  range = range.replace(hr, hyphenReplace)
-  debug('hyphen replace', range)
-  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-  range = range.replace(re[t.COMPARATORTRIM], comparatorTrimReplace)
-  debug('comparator trim', range, re[t.COMPARATORTRIM])
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[t.TILDETRIM], tildeTrimReplace)
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[t.CARETTRIM], caretTrimReplace)
+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];
+
+const getColor = () => {
+  const color = colorWheel.shift();
+  colorWheel.push(color);
+  return color;
+};
+
+function spawn(command, args, opts) {
+  return execa__WEBPACK_IMPORTED_MODULE_2___default()(command, args, _objectSpread({
+    stdio: 'inherit',
+    preferLocal: true
+  }, opts));
+}
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+function streamToLog(debug = true) {
+  return new stream__WEBPACK_IMPORTED_MODULE_0__["Writable"]({
+    objectMode: true,
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+    write(line, _, cb) {
+      if (line.endsWith('\n')) {
+        _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"][debug ? 'debug' : 'write'](line.slice(0, -1));
+      } else {
+        _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"][debug ? 'debug' : 'write'](line);
+      }
 
-  var compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR]
-  var set = range.split(' ').map(function (comp) {
-    return parseComparator(comp, this.options)
-  }, this).join(' ').split(/\s+/)
-  if (this.options.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function (comp) {
-      return !!comp.match(compRe)
-    })
-  }
-  set = set.map(function (comp) {
-    return new Comparator(comp, this.options)
-  }, this)
+      cb();
+    }
 
-  return set
+  });
 }
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
-  }
+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)); // TypeScript note: As long as the proc stdio[1] is 'pipe', then stdout will not be null
 
-  return this.set.some(function (thisComparators) {
-    return (
-      isSatisfiable(thisComparators, options) &&
-      range.set.some(function (rangeComparators) {
-        return (
-          isSatisfiable(rangeComparators, options) &&
-          thisComparators.every(function (thisComparator) {
-            return rangeComparators.every(function (rangeComparator) {
-              return thisComparator.intersects(rangeComparator, options)
-            })
-          })
-        )
-      })
-    )
-  })
+  spawned.stderr.pipe(prefixedStderr).pipe(streamToLog(debug)); // TypeScript note: As long as the proc stdio[2] is 'pipe', then stderr will not be null
+
+  return spawned;
 }
 
-// take a set of comparators and determine whether there
-// exists a version which can satisfy it
-function isSatisfiable (comparators, options) {
-  var result = true
-  var remainingComparators = comparators.slice()
-  var testComparator = remainingComparators.pop()
+/***/ }),
 
-  while (result && remainingComparators.length) {
-    result = remainingComparators.every(function (otherComparator) {
-      return testComparator.intersects(otherComparator, options)
-    })
+/***/ "./src/utils/convert_plugin_id_to_package_id.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    testComparator = remainingComparators.pop()
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return convertPluginIdToPackageId; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+function convertPluginIdToPackageId(pluginId) {
+  if (pluginId === 'core') {
+    // core is the only non-plugin
+    return `@kbn/core`;
   }
 
-  return result
+  return `@kbn/${pluginId.split('').flatMap(c => c.toUpperCase() === c ? `-${c.toLowerCase()}` : c).join('')}-plugin`.replace(/-\w(-\w)+-/g, match => `-${match.split('-').join('')}-`).replace(/-plugin-plugin$/, '-plugin');
 }
 
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators
-function toComparators (range, options) {
-  return new Range(range, options).set.map(function (comp) {
-    return comp.map(function (c) {
-      return c.value
-    }).join(' ').trim().split(' ')
-  })
-}
+/***/ }),
 
-// comprised of xranges, tildes, stars, and gtlt's at this point.
-// already replaced the hyphen ranges
-// turn into a set of JUST comparators.
-function parseComparator (comp, options) {
-  debug('comp', comp, options)
-  comp = replaceCarets(comp, options)
-  debug('caret', comp)
-  comp = replaceTildes(comp, options)
-  debug('tildes', comp)
-  comp = replaceXRanges(comp, options)
-  debug('xrange', comp)
-  comp = replaceStars(comp, options)
-  debug('stars', comp)
-  return comp
-}
+/***/ "./src/utils/errors.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CliError; });
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+class CliError extends Error {
+  constructor(message, meta = {}) {
+    super(message);
+    this.meta = meta;
+  }
 
-// ~, ~> --> * (any, kinda silly)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-function replaceTildes (comp, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceTilde(comp, options)
-  }).join(' ')
 }
 
-function replaceTilde (comp, options) {
-  var r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr)
-    var ret
+/***/ }),
 
-    if (isX(M)) {
-      ret = ''
-    } else if (isX(m)) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (isX(p)) {
-      // ~1.2 == >=1.2.0 <1.3.0
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-    } else if (pr) {
-      debug('replaceTilde pr', pr)
-      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-            ' <' + M + '.' + (+m + 1) + '.0'
-    } else {
-      // ~1.2.3 == >=1.2.3 <1.3.0
-      ret = '>=' + M + '.' + m + '.' + p +
-            ' <' + M + '.' + (+m + 1) + '.0'
-    }
+/***/ "./src/utils/fs.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    debug('tilde return', ret)
-    return ret
-  })
-}
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return readFile; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return writeFile; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return chmod; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return mkdirp; });
+/* unused harmony export rmdirp */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return unlink; });
+/* unused harmony export copyDirectory */
+/* unused harmony export isSymlink */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return isDirectory; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return isFile; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return createSymlink; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return tryRealpath; });
+/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/cmd-shim/index.js");
+/* harmony import */ var cmd_shim__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cmd_shim__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/del/index.js");
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/ncp/lib/ncp.js");
+/* harmony import */ var ncp__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(ncp__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("util");
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_5__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-// ^ --> * (any, kinda silly)
-// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2.0 --> >=1.2.0 <2.0.0
-function replaceCarets (comp, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceCaret(comp, options)
-  }).join(' ')
-}
 
-function replaceCaret (comp, options) {
-  debug('caret', comp, options)
-  var r = options.loose ? re[t.CARETLOOSE] : re[t.CARET]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr)
-    var ret
 
-    if (isX(M)) {
-      ret = ''
-    } else if (isX(m)) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'
-    } else if (isX(p)) {
-      if (M === '0') {
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'
-      } else {
-        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'
-      }
-    } else if (pr) {
-      debug('replaceCaret pr', pr)
-      if (M === '0') {
-        if (m === '0') {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-                ' <' + M + '.' + m + '.' + (+p + 1)
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-                ' <' + M + '.' + (+m + 1) + '.0'
-        }
-      } else {
-        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
-              ' <' + (+M + 1) + '.0.0'
-      }
-    } else {
-      debug('no pr')
-      if (M === '0') {
-        if (m === '0') {
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + m + '.' + (+p + 1)
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + (+m + 1) + '.0'
-        }
-      } else {
-        ret = '>=' + M + '.' + m + '.' + p +
-              ' <' + (+M + 1) + '.0.0'
-      }
-    }
 
-    debug('caret return', ret)
-    return ret
-  })
-}
 
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
-}
 
-function replaceXRange (comp, options) {
-  comp = comp.trim()
-  var r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE]
-  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
-    debug('xRange', comp, ret, gtlt, M, m, p, pr)
-    var xM = isX(M)
-    var xm = xM || isX(m)
-    var xp = xm || isX(p)
-    var anyX = xp
+const lstat = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.lstat);
+const readFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.readFile);
+const writeFile = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.writeFile);
+const symlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.symlink);
+const chmod = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.chmod);
+const cmdShim = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(cmd_shim__WEBPACK_IMPORTED_MODULE_0___default.a);
+const mkdir = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.mkdir);
+const realpathNative = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.realpath.native);
+const mkdirp = async path => await mkdir(path, {
+  recursive: true
+});
+const rmdirp = async path => await del__WEBPACK_IMPORTED_MODULE_1___default()(path, {
+  force: true
+});
+const unlink = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_2___default.a.unlink);
+const copyDirectory = Object(util__WEBPACK_IMPORTED_MODULE_5__["promisify"])(ncp__WEBPACK_IMPORTED_MODULE_3__["ncp"]);
 
-    if (gtlt === '=' && anyX) {
-      gtlt = ''
+async function statTest(path, block) {
+  try {
+    return block(await lstat(path));
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      return false;
     }
 
-    // if we're including prereleases in the match, then we need
-    // to fix this to -0, the lowest possible prerelease value
-    pr = options.includePrerelease ? '-0' : ''
-
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0-0'
-      } else {
-        // nothing is forbidden
-        ret = '*'
-      }
-    } else if (gtlt && anyX) {
-      // we know patch is an x, because we have any x at all.
-      // replace X with 0
-      if (xm) {
-        m = 0
-      }
-      p = 0
-
-      if (gtlt === '>') {
-        // >1 => >=2.0.0
-        // >1.2 => >=1.3.0
-        // >1.2.3 => >= 1.2.4
-        gtlt = '>='
-        if (xm) {
-          M = +M + 1
-          m = 0
-          p = 0
-        } else {
-          m = +m + 1
-          p = 0
-        }
-      } else if (gtlt === '<=') {
-        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-        gtlt = '<'
-        if (xm) {
-          M = +M + 1
-        } else {
-          m = +m + 1
-        }
-      }
+    throw e;
+  }
+}
+/**
+ * Test if a path points to a symlink.
+ * @param path
+ */
 
-      ret = gtlt + M + '.' + m + '.' + p + pr
-    } else if (xm) {
-      ret = '>=' + M + '.0.0' + pr + ' <' + (+M + 1) + '.0.0' + pr
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0' + pr +
-        ' <' + M + '.' + (+m + 1) + '.0' + pr
-    }
 
-    debug('xRange return', ret)
+async function isSymlink(path) {
+  return await statTest(path, stats => stats.isSymbolicLink());
+}
+/**
+ * Test if a path points to a directory.
+ * @param path
+ */
 
-    return ret
-  })
+async function isDirectory(path) {
+  return await statTest(path, stats => stats.isDirectory());
 }
+/**
+ * Test if a path points to a regular file.
+ * @param path
+ */
 
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars (comp, options) {
-  debug('replaceStars', comp, options)
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[t.STAR], '')
+async function isFile(path) {
+  return await statTest(path, stats => stats.isFile());
 }
+/**
+ * Create a symlink at dest that points to src. Adapted from
+ * https://github.com/lerna/lerna/blob/2f1b87d9e2295f587e4ac74269f714271d8ed428/src/FileSystemUtilities.js#L103.
+ *
+ * @param src
+ * @param dest
+ * @param type 'dir', 'file', 'junction', or 'exec'. 'exec' on
+ *  windows will use the `cmd-shim` module since symlinks can't be used
+ *  for executable files on windows.
+ */
 
-// This function is passed to string.replace(re[t.HYPHENRANGE])
-// M, m, patch, prerelease, build
-// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
-// 1.2 - 3.4 => >=1.2.0 <3.5.0
-function hyphenReplace ($0,
-  from, fM, fm, fp, fpr, fb,
-  to, tM, tm, tp, tpr, tb) {
-  if (isX(fM)) {
-    from = ''
-  } else if (isX(fm)) {
-    from = '>=' + fM + '.0.0'
-  } else if (isX(fp)) {
-    from = '>=' + fM + '.' + fm + '.0'
+async function createSymlink(src, dest, type) {
+  if (process.platform === 'win32') {
+    if (type === 'exec') {
+      await cmdShim(src, dest);
+    } else {
+      await forceCreate(src, dest, type);
+    }
   } else {
-    from = '>=' + from
+    const posixType = type === 'exec' ? 'file' : type;
+    const relativeSource = Object(path__WEBPACK_IMPORTED_MODULE_4__["relative"])(Object(path__WEBPACK_IMPORTED_MODULE_4__["dirname"])(dest), src);
+    await forceCreate(relativeSource, dest, posixType);
   }
+}
 
-  if (isX(tM)) {
-    to = ''
-  } else if (isX(tm)) {
-    to = '<' + (+tM + 1) + '.0.0'
-  } else if (isX(tp)) {
-    to = '<' + tM + '.' + (+tm + 1) + '.0'
-  } else if (tpr) {
-    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr
-  } else {
-    to = '<=' + to
+async function forceCreate(src, dest, type) {
+  try {
+    // If something exists at `dest` we need to remove it first.
+    await unlink(dest);
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
   }
 
-  return (from + ' ' + to).trim()
+  await symlink(src, dest, type);
 }
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
-  }
+async function tryRealpath(path) {
+  let calculatedPath = path;
 
-  if (typeof version === 'string') {
-    try {
-      version = new SemVer(version, this.options)
-    } catch (er) {
-      return false
+  try {
+    calculatedPath = await realpathNative(path);
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
     }
   }
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
-    }
-  }
-  return false
+  return calculatedPath;
 }
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
-    }
-  }
+/***/ }),
 
-  if (version.prerelease.length && !options.includePrerelease) {
-    // Find the set of versions that are allowed to have prereleases
-    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-    // That should allow `1.2.3-pr.2` to pass.
-    // However, `1.2.4-alpha.notready` should NOT be allowed,
-    // even though it's within the range set by the comparators.
-    for (i = 0; i < set.length; i++) {
-      debug(set[i].semver)
-      if (set[i].semver === ANY) {
-        continue
-      }
+/***/ "./src/utils/kibana.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch) {
-          return true
-        }
-      }
-    }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Kibana; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/multimatch/index.js");
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/is-path-inside/index.js");
+/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/yarn_lock.ts");
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/projects.ts");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/config.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+
+
+
+
+
+/**
+ * Helper class for dealing with a set of projects as children of
+ * the Kibana project. The kbn/pm is currently implemented to be
+ * more generic, where everything is an operation of generic projects,
+ * but that leads to exceptions where we need the kibana project and
+ * do things like `project.get('kibana')!`.
+ *
+ * Using this helper we can restructre the generic list of projects
+ * as a Kibana object which encapulates all the projects in the
+ * workspace and knows about the root Kibana project.
+ */
+
+class Kibana {
+  static async loadFrom(rootPath) {
+    return new Kibana(await Object(_projects__WEBPACK_IMPORTED_MODULE_5__[/* getProjects */ "d"])(rootPath, Object(_config__WEBPACK_IMPORTED_MODULE_6__[/* getProjectPaths */ "a"])({
+      rootPath
+    })));
   }
 
-  return true
-}
+  constructor(allWorkspaceProjects) {
+    this.allWorkspaceProjects = allWorkspaceProjects;
 
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
-}
+    _defineProperty(this, "kibanaProject", void 0);
 
-exports.maxSatisfying = maxSatisfying
-function maxSatisfying (versions, range, options) {
-  var max = null
-  var maxSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!max || maxSV.compare(v) === -1) {
-        // compare(max, v, true)
-        max = v
-        maxSV = new SemVer(max, options)
-      }
-    }
-  })
-  return max
-}
+    const kibanaProject = allWorkspaceProjects.get('kibana');
 
-exports.minSatisfying = minSatisfying
-function minSatisfying (versions, range, options) {
-  var min = null
-  var minSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!min || minSV.compare(v) === 1) {
-        // compare(min, v, true)
-        min = v
-        minSV = new SemVer(min, options)
-      }
+    if (!kibanaProject) {
+      throw new TypeError('Unable to create Kibana object without all projects, including the Kibana project.');
     }
-  })
-  return min
-}
-
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
 
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
+    this.kibanaProject = kibanaProject;
   }
+  /** make an absolute path by resolving subPath relative to the kibana repo */
 
-  minver = new SemVer('0.0.0-0')
-  if (range.test(minver)) {
-    return minver
+
+  getAbsolute(...subPath) {
+    return path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(this.kibanaProject.path, ...subPath);
   }
+  /** convert an absolute path to a relative path, relative to the kibana repo */
 
-  minver = null
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
 
-    comparators.forEach(function (comparator) {
-      // Clone to avoid manipulating the comparator's semver object.
-      var compver = new SemVer(comparator.semver.version)
-      switch (comparator.operator) {
-        case '>':
-          if (compver.prerelease.length === 0) {
-            compver.patch++
-          } else {
-            compver.prerelease.push(0)
-          }
-          compver.raw = compver.format()
-          /* fallthrough */
-        case '':
-        case '>=':
-          if (!minver || gt(minver, compver)) {
-            minver = compver
-          }
-          break
-        case '<':
-        case '<=':
-          /* Ignore maximum versions */
-          break
-        /* istanbul ignore next */
-        default:
-          throw new Error('Unexpected operation: ' + comparator.operator)
-      }
-    })
+  getRelative(absolute) {
+    return path__WEBPACK_IMPORTED_MODULE_0___default.a.relative(this.kibanaProject.path, absolute);
   }
+  /** get a copy of the map of all projects in the kibana workspace */
 
-  if (minver && range.test(minver)) {
-    return minver
+
+  getAllProjects() {
+    return new Map(this.allWorkspaceProjects);
   }
+  /** determine if a project with the given name exists */
 
-  return null
-}
 
-exports.validRange = validRange
-function validRange (range, options) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, options).range || '*'
-  } catch (er) {
-    return null
+  hasProject(name) {
+    return this.allWorkspaceProjects.has(name);
   }
-}
+  /** get a specific project, throws if the name is not known (use hasProject() first) */
 
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr
-function ltr (version, range, options) {
-  return outside(version, range, '<', options)
-}
 
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr
-function gtr (version, range, options) {
-  return outside(version, range, '>', options)
-}
+  getProject(name) {
+    const project = this.allWorkspaceProjects.get(name);
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
+    if (!project) {
+      throw new Error(`No package with name "${name}" in the workspace`);
+    }
 
-  var gtfn, ltefn, ltfn, comp, ecomp
-  switch (hilo) {
-    case '>':
-      gtfn = gt
-      ltefn = lte
-      ltfn = lt
-      comp = '>'
-      ecomp = '>='
-      break
-    case '<':
-      gtfn = lt
-      ltefn = gte
-      ltfn = gt
-      comp = '<'
-      ecomp = '<='
-      break
-    default:
-      throw new TypeError('Must provide a hilo val of "<" or ">"')
+    return project;
   }
+  /** get a project and all of the projects it depends on in a ProjectMap */
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
+
+  getProjectAndDeps(name) {
+    const project = this.getProject(name);
+    return Object(_projects__WEBPACK_IMPORTED_MODULE_5__[/* includeTransitiveProjects */ "e"])([project], this.allWorkspaceProjects);
   }
+  /** filter the projects to just those matching certain paths/include/exclude tags */
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+  getFilteredProjects(options) {
+    const allProjects = this.getAllProjects();
+    const filteredProjects = new Map();
+    const pkgJsonPaths = Array.from(allProjects.values()).map(p => p.packageJsonLocation);
+    const filteredPkgJsonGlobs = Object(_config__WEBPACK_IMPORTED_MODULE_6__[/* getProjectPaths */ "a"])(_objectSpread(_objectSpread({}, options), {}, {
+      rootPath: this.kibanaProject.path
+    })).map(g => path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(g, 'package.json'));
+    const matchingPkgJsonPaths = multimatch__WEBPACK_IMPORTED_MODULE_2___default()(pkgJsonPaths, filteredPkgJsonGlobs);
 
-    var high = null
-    var low = null
+    for (const project of allProjects.values()) {
+      const pathMatches = matchingPkgJsonPaths.includes(project.packageJsonLocation);
+      const notExcluded = !options.exclude.includes(project.name);
+      const isIncluded = !options.include.length || options.include.includes(project.name);
 
-    comparators.forEach(function (comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
-      }
-      high = high || comparator
-      low = low || comparator
-      if (gtfn(comparator.semver, high.semver, options)) {
-        high = comparator
-      } else if (ltfn(comparator.semver, low.semver, options)) {
-        low = comparator
+      if (pathMatches && notExcluded && isIncluded) {
+        filteredProjects.set(project.name, project);
       }
-    })
-
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false
     }
 
-    // If the lowest version comparator has an operator and our version
-    // is less than it then it isn't higher than the range
-    if ((!low.operator || low.operator === comp) &&
-        ltefn(version, low.semver)) {
-      return false
-    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-      return false
-    }
+    return filteredProjects;
   }
-  return true
-}
-
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
-}
-
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
-}
 
-exports.coerce = coerce
-function coerce (version, options) {
-  if (version instanceof SemVer) {
-    return version
+  isPartOfRepo(project) {
+    return project.path === this.kibanaProject.path || is_path_inside__WEBPACK_IMPORTED_MODULE_3___default()(project.path, this.kibanaProject.path);
   }
 
-  if (typeof version === 'number') {
-    version = String(version)
+  isOutsideRepo(project) {
+    return !this.isPartOfRepo(project);
   }
 
-  if (typeof version !== 'string') {
-    return null
+  resolveAllProductionDependencies(yarnLock, log) {
+    const kibanaDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__[/* resolveDepsForProject */ "b"])({
+      project: this.kibanaProject,
+      yarnLock,
+      kbn: this,
+      includeDependentProject: true,
+      productionDepsOnly: true,
+      log
+    });
+    const xpackDeps = Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__[/* resolveDepsForProject */ "b"])({
+      project: this.getProject('x-pack'),
+      yarnLock,
+      kbn: this,
+      includeDependentProject: true,
+      productionDepsOnly: true,
+      log
+    });
+    return new Map([...kibanaDeps.entries(), ...xpackDeps.entries()]);
   }
 
-  options = options || {}
-
-  var match = null
-  if (!options.rtl) {
-    match = version.match(re[t.COERCE])
-  } else {
-    // Find the right-most coercible string that does not share
-    // a terminus with a more left-ward coercible string.
-    // Eg, '1.2.3.4' wants to coerce '2.3.4', not '3.4' or '4'
-    //
-    // Walk through the string checking with a /g regexp
-    // Manually set the index so as to pick up overlapping matches.
-    // Stop when we get a match that ends at the string end, since no
-    // coercible string can be more right-ward without the same terminus.
-    var next
-    while ((next = re[t.COERCERTL].exec(version)) &&
-      (!match || match.index + match[0].length !== version.length)
-    ) {
-      if (!match ||
-          next.index + next[0].length !== match.index + match[0].length) {
-        match = next
+  getUuid() {
+    try {
+      return fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFileSync(this.getAbsolute('data/uuid'), 'utf-8').trim();
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return undefined;
       }
-      re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length
-    }
-    // leave it in a clean state
-    re[t.COERCERTL].lastIndex = -1
-  }
 
-  if (match === null) {
-    return null
+      throw error;
+    }
   }
 
-  return parse(match[2] +
-    '.' + (match[3] || '0') +
-    '.' + (match[4] || '0'), options)
 }
 
-
 /***/ }),
-/* 774 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/link_project_executables.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return linkProjectExecutables; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/log.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-const EventEmitter = __webpack_require__(164);
 
-const written = new WeakMap();
 
-class ProgressEmitter extends EventEmitter {
-	constructor(source, destination) {
-		super();
-		this._source = source;
-		this._destination = destination;
-	}
 
-	set written(value) {
-		written.set(this, value);
-		this.emitProgress();
-	}
+/**
+ * Yarn does not link the executables from dependencies that are installed
+ * using `link:` https://github.com/yarnpkg/yarn/pull/5046
+ *
+ * We simulate this functionality by walking through each project's project
+ * dependencies, and manually linking their executables if defined. The logic
+ * for linking was mostly adapted from lerna: https://github.com/lerna/lerna/blob/1d7eb9eeff65d5a7de64dea73613b1bf6bfa8d57/src/PackageUtilities.js#L348
+ */
+async function linkProjectExecutables(projectsByName, projectGraph) {
+  _log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].debug(`Linking package executables`); // Find root and generate executables from dependencies for it
 
-	get written() {
-		return written.get(this);
-	}
+  let rootProject = null;
+  let rootProjectDeps = [];
 
-	emitProgress() {
-		const {size, written} = this;
-		this.emit('progress', {
-			src: this._source,
-			dest: this._destination,
-			size,
-			written,
-			percent: written === size ? 1 : written / size
-		});
-	}
-}
+  for (const [projectName, projectDeps] of projectGraph) {
+    const project = projectsByName.get(projectName);
 
-module.exports = ProgressEmitter;
+    if (project.isSinglePackageJsonProject) {
+      rootProject = projectsByName.get(projectName);
+      rootProjectDeps = projectDeps;
+      break;
+    }
+  }
 
+  if (!rootProject) {
+    throw new Error('Could not finding root project while linking package executables');
+  } // Prepare root project node_modules/.bin
 
-/***/ }),
-/* 775 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+  const rootBinsDir = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootProject.nodeModulesLocation, '.bin');
 
+  for (const rootProjectDep of rootProjectDeps) {
+    const executables = rootProjectDep.getExecutables();
 
-const blacklist = [
-	// # All
-	'^npm-debug\\.log$', // Error log for npm
-	'^\\..*\\.swp$', // Swap file for vim state
+    for (const name of Object.keys(executables)) {
+      const srcPath = executables[name]; // existing logic from lerna -- ensure that the bin we are going to
+      // point to exists or ignore it
 
-	// # macOS
-	'^\\.DS_Store$', // Stores custom folder attributes
-	'^\\.AppleDouble$', // Stores additional file resources
-	'^\\.LSOverride$', // Contains the absolute path to the app to be used
-	'^Icon\\r$', // Custom Finder icon: http://superuser.com/questions/298785/icon-file-on-os-x-desktop
-	'^\\._.*', // Thumbnail
-	'^\\.Spotlight-V100(?:$|\\/)', // Directory that might appear on external disk
-	'\\.Trashes', // File that might appear on external disk
-	'^__MACOSX$', // Resource fork
+      if (!(await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* isFile */ "d"])(srcPath))) {
+        continue;
+      }
 
-	// # Linux
-	'~$', // Backup file
+      const dest = Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootBinsDir, name); // Get relative project path with normalized path separators.
 
-	// # Windows
-	'^Thumbs\\.db$', // Image file cache
-	'^ehthumbs\\.db$', // Folder config file
-	'^Desktop\\.ini$', // Stores custom folder attributes
-	'@eaDir$' // Synology Diskstation "hidden" folder where the server stores thumbnails
-];
+      const rootProjectRelativePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["relative"])(rootProject.path, srcPath).split(path__WEBPACK_IMPORTED_MODULE_0__["sep"]).join('/');
+      _log__WEBPACK_IMPORTED_MODULE_2__[/* log */ "a"].debug(`[${rootProject.name}] ${name} -> ${rootProjectRelativePath}`);
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* mkdirp */ "e"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["dirname"])(dest));
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* createSymlink */ "b"])(srcPath, dest, 'exec');
+      await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* chmod */ "a"])(dest, '755');
+    }
+  }
+}
 
-exports.re = () => {
-	throw new Error('`junk.re` was renamed to `junk.regex`');
-};
+/***/ }),
 
-exports.regex = new RegExp(blacklist.join('|'));
+/***/ "./src/utils/log.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-exports.is = filename => exports.regex.test(filename);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return log; });
+/* unused harmony export Log */
+/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/tooling_log/index.js");
+/* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__);
+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; }
 
-exports.not = filename => !exports.is(filename);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-// TODO: Remove this for the next major release
-exports.default = module.exports;
 
+class Log extends _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLog"] {
+  constructor() {
+    super();
 
-/***/ }),
-/* 776 */
-/***/ (function(module, exports, __webpack_require__) {
+    _defineProperty(this, "logLevel", void 0);
 
-"use strict";
+    this.setLogLevel('info');
+  }
 
-const pMap = __webpack_require__(777);
+  setLogLevel(level) {
+    this.logLevel = Object(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["parseLogLevel"])(level);
+    this.setWriters([new _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_0__["ToolingLogTextWriter"]({
+      level: this.logLevel.name,
+      writeTo: process.stdout
+    })]);
+  }
 
-const pFilter = async (iterable, filterer, options) => {
-	const values = await pMap(
-		iterable,
-		(element, index) => Promise.all([filterer(element, index), element]),
-		options
-	);
-	return values.filter(value => Boolean(value[0])).map(value => value[1]);
-};
+  wouldLogLevel(level) {
+    return this.logLevel.flags[level];
+  }
 
-module.exports = pFilter;
-// TODO: Remove this for the next major release
-module.exports.default = pFilter;
+}
 
+const log = new Log();
 
-/***/ }),
-/* 777 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ }),
 
+/***/ "./src/utils/package_json.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-const pMap = (iterable, mapper, options) => new Promise((resolve, reject) => {
-	options = Object.assign({
-		concurrency: Infinity
-	}, options);
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return readPackageJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return writePackageJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return createProductionPackageJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return isLinkDependency; });
+/* unused harmony export isBazelPackageDependency */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return transformDependencies; });
+/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/read-pkg/index.js");
+/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(read_pkg__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/write-pkg/index.js");
+/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-	if (typeof mapper !== 'function') {
-		throw new TypeError('Mapper function is required');
-	}
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-	const {concurrency} = options;
+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 (!(typeof concurrency === 'number' && concurrency >= 1)) {
-		throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-	}
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-	const ret = [];
-	const iterator = iterable[Symbol.iterator]();
-	let isRejected = false;
-	let isIterableDone = false;
-	let resolvingCount = 0;
-	let currentIndex = 0;
 
-	const next = () => {
-		if (isRejected) {
-			return;
-		}
+function readPackageJson(cwd) {
+  return read_pkg__WEBPACK_IMPORTED_MODULE_0___default()({
+    cwd,
+    normalize: false
+  });
+}
+function writePackageJson(path, json) {
+  return write_pkg__WEBPACK_IMPORTED_MODULE_1___default()(path, json);
+}
+const createProductionPackageJson = pkgJson => _objectSpread(_objectSpread({}, pkgJson), {}, {
+  dependencies: transformDependencies(pkgJson.dependencies)
+});
+const isLinkDependency = depVersion => depVersion.startsWith('link:');
+const isBazelPackageDependency = depVersion => depVersion.startsWith('link:bazel-bin/');
+/**
+ * Replaces `link:` dependencies with `file:` dependencies. When installing
+ * dependencies, these `file:` dependencies will be copied into `node_modules`
+ * instead of being symlinked.
+ *
+ * This will allow us to copy packages into the build and run `yarn`, which
+ * will then _copy_ the `file:` dependencies into `node_modules` instead of
+ * symlinking like we do in development.
+ *
+ * Additionally it also taken care of replacing `link:bazel-bin/` with
+ * `file:` so we can also support the copy of the Bazel packages dist already into
+ * build/packages to be copied into the node_modules
+ */
 
-		const nextItem = iterator.next();
-		const i = currentIndex;
-		currentIndex++;
+function transformDependencies(dependencies = {}) {
+  const newDeps = {};
 
-		if (nextItem.done) {
-			isIterableDone = true;
+  for (const name of Object.keys(dependencies)) {
+    const depVersion = dependencies[name];
 
-			if (resolvingCount === 0) {
-				resolve(ret);
-			}
+    if (!isLinkDependency(depVersion)) {
+      newDeps[name] = depVersion;
+      continue;
+    }
 
-			return;
-		}
+    if (isBazelPackageDependency(depVersion)) {
+      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
+      continue;
+    }
 
-		resolvingCount++;
+    newDeps[name] = depVersion.replace('link:', 'file:');
+  }
 
-		Promise.resolve(nextItem.value)
-			.then(element => mapper(element, i))
-			.then(
-				value => {
-					ret[i] = value;
-					resolvingCount--;
-					next();
-				},
-				error => {
-					isRejected = true;
-					reject(error);
-				}
-			);
-	};
+  return newDeps;
+}
 
-	for (let i = 0; i < concurrency; i++) {
-		next();
+/***/ }),
 
-		if (isIterableDone) {
-			break;
-		}
-	}
-});
+/***/ "./src/utils/parallelize.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-module.exports = pMap;
-// TODO: Remove this for the next major release
-module.exports.default = pMap;
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return parallelizeBatches; });
+/* unused harmony export parallelize */
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+async function parallelizeBatches(batches, fn) {
+  for (const batch of batches) {
+    // We need to make sure the entire batch has completed before we can move on
+    // to the next batch
+    await parallelize(batch, fn);
+  }
+}
+async function parallelize(items, fn, concurrency = 4) {
+  if (items.length === 0) {
+    return;
+  }
 
+  return new Promise((resolve, reject) => {
+    let activePromises = 0;
+    const values = items.slice(0);
 
-/***/ }),
-/* 778 */
-/***/ (function(module, exports, __webpack_require__) {
+    async function scheduleItem(item) {
+      activePromises++;
 
-"use strict";
+      try {
+        await fn(item);
+        activePromises--;
 
-const NestedError = __webpack_require__(770);
+        if (values.length > 0) {
+          // We have more work to do, so we schedule the next promise
+          scheduleItem(values.shift());
+        } else if (activePromises === 0) {
+          // We have no more values left, and all items have completed, so we've
+          // completed all the work.
+          resolve();
+        }
+      } catch (error) {
+        reject(error);
+      }
+    }
 
-class CpyError extends NestedError {
-	constructor(message, nested) {
-		super(message, nested);
-		Object.assign(this, nested);
-		this.name = 'CpyError';
-	}
+    values.splice(0, concurrency).map(scheduleItem);
+  });
 }
 
-module.exports = CpyError;
-
-
 /***/ }),
-/* 779 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/project.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Project; });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs");
+/* 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__("path");
+/* 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__("util");
+/* 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__("./src/utils/errors.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/scripts.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-const fs = __webpack_require__(132);
-const arrayUnion = __webpack_require__(242);
-const merge2 = __webpack_require__(243);
-const fastGlob = __webpack_require__(780);
-const dirGlob = __webpack_require__(326);
-const gitignore = __webpack_require__(805);
-const {FilterStream, UniqueStream} = __webpack_require__(806);
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-const DEFAULT_FILTER = () => false;
+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; }
 
-const isNegative = pattern => pattern[0] === '!';
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-const assertPatternsInput = patterns => {
-	if (!patterns.every(pattern => typeof pattern === 'string')) {
-		throw new TypeError('Patterns must be a string or an array of strings');
-	}
-};
 
-const checkCwdOption = (options = {}) => {
-	if (!options.cwd) {
-		return;
-	}
 
-	let stat;
-	try {
-		stat = fs.statSync(options.cwd);
-	} catch {
-		return;
-	}
 
-	if (!stat.isDirectory()) {
-		throw new Error('The `cwd` option must be a path to a directory');
-	}
-};
 
-const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
 
-	const globTasks = [];
+class Project {
+  static async fromPath(path) {
+    const pkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__[/* readPackageJson */ "c"])(path);
+    return new Project(pkgJson, path);
+  }
+  /** parsed package.json */
 
-	taskOptions = {
-		ignore: [],
-		expandDirectories: true,
-		...taskOptions
-	};
 
-	for (const [index, pattern] of patterns.entries()) {
-		if (isNegative(pattern)) {
-			continue;
-		}
+  constructor(packageJson, projectPath) {
+    _defineProperty(this, "json", void 0);
 
-		const ignore = patterns
-			.slice(index)
-			.filter(pattern => isNegative(pattern))
-			.map(pattern => pattern.slice(1));
+    _defineProperty(this, "packageJsonLocation", void 0);
 
-		const options = {
-			...taskOptions,
-			ignore: taskOptions.ignore.concat(ignore)
-		};
+    _defineProperty(this, "nodeModulesLocation", void 0);
 
-		globTasks.push({pattern, options});
-	}
+    _defineProperty(this, "targetLocation", void 0);
 
-	return globTasks;
-};
+    _defineProperty(this, "path", void 0);
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
-	}
+    _defineProperty(this, "version", void 0);
 
-	if (Array.isArray(task.options.expandDirectories)) {
-		options = {
-			...options,
-			files: task.options.expandDirectories
-		};
-	} else if (typeof task.options.expandDirectories === 'object') {
-		options = {
-			...options,
-			...task.options.expandDirectories
-		};
-	}
+    _defineProperty(this, "allDependencies", void 0);
 
-	return fn(task.pattern, options);
-};
+    _defineProperty(this, "productionDependencies", void 0);
 
-const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+    _defineProperty(this, "devDependencies", void 0);
 
-const getFilterSync = options => {
-	return options && options.gitignore ?
-		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
-		DEFAULT_FILTER;
-};
+    _defineProperty(this, "scripts", void 0);
 
-const globToTask = task => glob => {
-	const {options} = task;
-	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
-		options.ignore = dirGlob.sync(options.ignore);
-	}
+    _defineProperty(this, "bazelPackage", void 0);
 
-	return {
-		pattern: glob,
-		options
-	};
-};
+    _defineProperty(this, "isSinglePackageJsonProject", false);
 
-module.exports = async (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+    this.json = Object.freeze(packageJson);
+    this.path = projectPath;
+    this.packageJsonLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'package.json');
+    this.nodeModulesLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'node_modules');
+    this.targetLocation = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'target');
+    this.version = this.json.version;
+    this.productionDependencies = this.json.dependencies || {};
+    this.devDependencies = this.json.devDependencies || {};
+    this.allDependencies = _objectSpread(_objectSpread({}, this.devDependencies), this.productionDependencies);
+    this.isSinglePackageJsonProject = this.json.name === 'kibana';
+    this.scripts = this.json.scripts || {};
+    this.bazelPackage = !this.isSinglePackageJsonProject && fs__WEBPACK_IMPORTED_MODULE_0___default.a.existsSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, 'BUILD.bazel'));
+  }
 
-	const getFilter = async () => {
-		return options && options.gitignore ?
-			gitignore({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+  get name() {
+    return this.json.name;
+  }
 
-	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)));
-		}));
+  ensureValidProjectDependency(project) {
+    const relativePathToProject = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, project.path));
+    const relativePathToProjectIfBazelPkg = normalizePath(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(this.path, `${__dirname}/../../../bazel-bin/packages/${path__WEBPACK_IMPORTED_MODULE_1___default.a.basename(project.path)}`));
+    const versionInPackageJson = this.allDependencies[project.name];
+    const expectedVersionInPackageJson = `link:${relativePathToProject}`;
+    const expectedVersionInPackageJsonIfBazelPkg = `link:${relativePathToProjectIfBazelPkg}`; // TODO: after introduce bazel to build all the packages and completely remove the support for kbn packages
+    //  do not allow child projects to hold dependencies, unless they are meant to be published externally
 
-		return arrayUnion(...tasks);
-	};
+    if (versionInPackageJson === expectedVersionInPackageJson || versionInPackageJson === expectedVersionInPackageJsonIfBazelPkg) {
+      return;
+    }
 
-	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
-	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+    const updateMsg = 'Update its package.json to the expected value below.';
+    const meta = {
+      actual: `"${project.name}": "${versionInPackageJson}"`,
+      expected: `"${project.name}": "${expectedVersionInPackageJson}" or "${project.name}": "${expectedVersionInPackageJsonIfBazelPkg}"`,
+      package: `${this.name} (${this.packageJsonLocation})`
+    };
 
-	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
-};
+    if (Object(_package_json__WEBPACK_IMPORTED_MODULE_5__[/* isLinkDependency */ "b"])(versionInPackageJson)) {
+      throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`[${this.name}] depends on [${project.name}] using 'link:', but the path is wrong. ${updateMsg}`, meta);
+    }
 
-module.exports.sync = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+    throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`[${this.name}] depends on [${project.name}] but it's not using the local package. ${updateMsg}`, meta);
+  }
 
-	const tasks = [];
-	for (const task of globTasks) {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		tasks.push(...newTask);
-	}
+  getBuildConfig() {
+    return this.json.kibana && this.json.kibana.build || {};
+  }
+  /**
+   * Returns the directory that should be copied into the Kibana build artifact.
+   * This config can be specified to only include the project's build artifacts
+   * instead of everything located in the project directory.
+   */
 
-	const filter = getFilterSync(options);
 
-	let matches = [];
-	for (const task of tasks) {
-		matches = arrayUnion(matches, fastGlob.sync(task.pattern, task.options));
-	}
+  getIntermediateBuildDirectory() {
+    return path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
+  }
 
-	return matches.filter(path_ => !filter(path_));
-};
+  getCleanConfig() {
+    return this.json.kibana && this.json.kibana.clean || {};
+  }
 
-module.exports.stream = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+  isBazelPackage() {
+    return this.bazelPackage;
+  }
 
-	const tasks = [];
-	for (const task of globTasks) {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		tasks.push(...newTask);
-	}
+  isFlaggedAsDevOnly() {
+    return !!(this.json.kibana && this.json.kibana.devOnly);
+  }
 
-	const filter = getFilterSync(options);
-	const filterStream = new FilterStream(p => !filter(p));
-	const uniqueStream = new UniqueStream();
+  hasScript(name) {
+    return name in this.scripts;
+  }
 
-	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
-		.pipe(filterStream)
-		.pipe(uniqueStream);
-};
+  getExecutables() {
+    const raw = this.json.bin;
 
-module.exports.generateGlobTasks = generateGlobTasks;
+    if (!raw) {
+      return {};
+    }
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => fastGlob.isDynamicPattern(pattern, options));
+    if (typeof raw === 'string') {
+      return {
+        [this.name]: path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw)
+      };
+    }
 
-module.exports.gitignore = gitignore;
+    if (typeof raw === 'object') {
+      const binsConfig = {};
 
+      for (const binName of Object.keys(raw)) {
+        binsConfig[binName] = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(this.path, raw[binName]);
+      }
 
-/***/ }),
-/* 780 */
-/***/ (function(module, exports, __webpack_require__) {
+      return binsConfig;
+    }
 
-"use strict";
+    throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, {
+      binConfig: Object(util__WEBPACK_IMPORTED_MODULE_2__["inspect"])(raw),
+      package: `${this.name} (${this.packageJsonLocation})`
+    });
+  }
 
-const taskManager = __webpack_require__(781);
-const async_1 = __webpack_require__(791);
-const stream_1 = __webpack_require__(801);
-const sync_1 = __webpack_require__(802);
-const settings_1 = __webpack_require__(804);
-const utils = __webpack_require__(782);
-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;
+  async runScript(scriptName, args = []) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`Running script [${scriptName}] in [${this.name}]:`);
+    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__[/* runScriptInPackage */ "b"])(scriptName, args, this);
+  }
 
+  runScriptStreaming(scriptName, options = {}) {
+    return Object(_scripts__WEBPACK_IMPORTED_MODULE_6__[/* runScriptInPackageStreaming */ "c"])({
+      script: scriptName,
+      args: options.args || [],
+      pkg: this,
+      debug: options.debug
+    });
+  }
 
-/***/ }),
-/* 781 */
-/***/ (function(module, exports, __webpack_require__) {
+  hasDependencies() {
+    return Object.keys(this.allDependencies).length > 0;
+  }
 
-"use strict";
+  isEveryDependencyLocal() {
+    return Object.values(this.allDependencies).every(dep => Object(_package_json__WEBPACK_IMPORTED_MODULE_5__[/* isLinkDependency */ "b"])(dep));
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
-const utils = __webpack_require__(782);
-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;
-/**
- * Returns tasks grouped by basic pattern directories.
- *
- * Patterns that can be found inside (`./`) and outside (`../`) the current directory are handled separately.
- * This is necessary because directory traversal starts at the base directory and goes deeper.
- */
-function convertPatternsToTasks(positive, negative, dynamic) {
-    const tasks = [];
-    const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
-    const patternsInsideCurrentDirectory = utils.pattern.getPatternsInsideCurrentDirectory(positive);
-    const outsideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsOutsideCurrentDirectory);
-    const insideCurrentDirectoryGroup = groupPatternsByBaseDirectory(patternsInsideCurrentDirectory);
-    tasks.push(...convertPatternGroupsToTasks(outsideCurrentDirectoryGroup, negative, dynamic));
-    /*
-     * For the sake of reducing future accesses to the file system, we merge all tasks within the current directory
-     * into a global task, if at least one pattern refers to the root (`.`). In this case, the global task covers the rest.
-     */
-    if ('.' in insideCurrentDirectoryGroup) {
-        tasks.push(convertPatternGroupToTask('.', patternsInsideCurrentDirectory, negative, dynamic));
-    }
-    else {
-        tasks.push(...convertPatternGroupsToTasks(insideCurrentDirectoryGroup, negative, dynamic));
-    }
-    return tasks;
-}
-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 installDependencies(options = {}) {
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].info(`[${this.name}] running yarn`);
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].write('');
+    await Object(_scripts__WEBPACK_IMPORTED_MODULE_6__[/* installInDir */ "a"])(this.path, options === null || options === void 0 ? void 0 : options.extraArgs);
+    _log__WEBPACK_IMPORTED_MODULE_4__[/* log */ "a"].write('');
+  }
+
+} // We normalize all path separators to `/` in generated files
 
+function normalizePath(path) {
+  return path.replace(/[\\\/]+/g, '/');
+}
 
 /***/ }),
-/* 782 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/projects.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return getProjects; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return getNonBazelProjectsOnly; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return getBazelProjectsOnly; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return buildProjectGraph; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return topologicallyBatchProjects; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return includeTransitiveProjects; });
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/glob/glob.js");
+/* 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__("path");
+/* 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__("util");
+/* 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__("./src/utils/errors.ts");
+/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/project.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
-const array = __webpack_require__(783);
-exports.array = array;
-const errno = __webpack_require__(784);
-exports.errno = errno;
-const fs = __webpack_require__(785);
-exports.fs = fs;
-const path = __webpack_require__(786);
-exports.path = path;
-const pattern = __webpack_require__(787);
-exports.pattern = pattern;
-const stream = __webpack_require__(789);
-exports.stream = stream;
-const string = __webpack_require__(790);
-exports.string = string;
 
 
-/***/ }),
-/* 783 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitWhen = exports.flatten = void 0;
-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;
+const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
+/** a Map of project names to Project instances */
 
+async function getProjects(rootPath, projectsPathsPatterns, {
+  include = [],
+  exclude = []
+} = {}, bazelOnly = false) {
+  const projects = new Map();
 
-/***/ }),
-/* 784 */
-/***/ (function(module, exports, __webpack_require__) {
+  for (const pattern of projectsPathsPatterns) {
+    const pathsToProcess = await packagesFromGlobPattern({
+      pattern,
+      rootPath
+    });
 
-"use strict";
+    for (const filePath of pathsToProcess) {
+      const projectConfigPath = normalize(filePath);
+      const projectDir = path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(projectConfigPath);
+      const project = await _project__WEBPACK_IMPORTED_MODULE_4__[/* Project */ "a"].fromPath(projectDir);
+      const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name) || bazelOnly && !project.isBazelPackage();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnoentCodeError = void 0;
-function isEnoentCodeError(error) {
-    return error.code === 'ENOENT';
-}
-exports.isEnoentCodeError = isEnoentCodeError;
+      if (excludeProject) {
+        continue;
+      }
 
+      if (projects.has(project.name)) {
+        throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](`There are multiple projects with the same name [${project.name}]`, {
+          name: project.name,
+          paths: [project.path, projects.get(project.name).path]
+        });
+      }
 
-/***/ }),
-/* 785 */
-/***/ (function(module, exports, __webpack_require__) {
+      projects.set(project.name, project);
+    }
+  }
 
-"use strict";
+  return projects;
+}
+async function getNonBazelProjectsOnly(projects) {
+  const bazelProjectsOnly = new Map();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDirentFromStats = void 0;
-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);
+  for (const project of projects.values()) {
+    if (!project.isBazelPackage()) {
+      bazelProjectsOnly.set(project.name, project);
     }
+  }
+
+  return bazelProjectsOnly;
 }
-function createDirentFromStats(name, stats) {
-    return new DirentFromStats(name, stats);
-}
-exports.createDirentFromStats = createDirentFromStats;
+async function getBazelProjectsOnly(projects) {
+  const bazelProjectsOnly = new Map();
 
+  for (const project of projects.values()) {
+    if (project.isBazelPackage()) {
+      bazelProjectsOnly.set(project.name, project);
+    }
+  }
 
-/***/ }),
-/* 786 */
-/***/ (function(module, exports, __webpack_require__) {
+  return bazelProjectsOnly;
+}
 
-"use strict";
+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);
+} // https://github.com/isaacs/node-glob/blob/master/common.js#L104
+// glob always returns "\\" as "/" in windows, so everyone
+// gets normalized because we can't have nice things.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
-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;
 
+function normalize(dir) {
+  return path__WEBPACK_IMPORTED_MODULE_1___default.a.normalize(dir);
+}
 
-/***/ }),
-/* 787 */
-/***/ (function(module, exports, __webpack_require__) {
+function buildProjectGraph(projects) {
+  const projectGraph = new Map();
 
-"use strict";
+  for (const project of projects.values()) {
+    const projectDeps = [];
+    const dependencies = project.allDependencies;
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
-const path = __webpack_require__(4);
-const globParent = __webpack_require__(265);
-const micromatch = __webpack_require__(788);
-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 = {}) {
-    /**
-     * A special case with an empty string is necessary for matching patterns that start with a forward slash.
-     * An empty string cannot be a dynamic pattern.
-     * For example, the pattern `/lib/*` will be spread into parts: '', 'lib', '*'.
-     */
-    if (pattern === '') {
-        return false;
-    }
-    /**
-     * 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;
-/**
- * Returns patterns that can be applied inside the current directory.
- *
- * @example
- * // ['./*', '*', 'a/*']
- * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
- */
-function getPatternsInsideCurrentDirectory(patterns) {
-    return patterns.filter((pattern) => !isPatternRelatedToParentDirectory(pattern));
-}
-exports.getPatternsInsideCurrentDirectory = getPatternsInsideCurrentDirectory;
-/**
- * Returns patterns to be expanded relative to (outside) the current directory.
- *
- * @example
- * // ['../*', './../*']
- * getPatternsInsideCurrentDirectory(['./*', '*', 'a/*', '../*', './../*'])
- */
-function getPatternsOutsideCurrentDirectory(patterns) {
-    return patterns.filter(isPatternRelatedToParentDirectory);
-}
-exports.getPatternsOutsideCurrentDirectory = getPatternsOutsideCurrentDirectory;
-function isPatternRelatedToParentDirectory(pattern) {
-    return pattern.startsWith('..') || pattern.startsWith('./..');
-}
-exports.isPatternRelatedToParentDirectory = isPatternRelatedToParentDirectory;
-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) {
-    let { parts } = micromatch.scan(pattern, Object.assign(Object.assign({}, options), { parts: true }));
-    /**
-     * The scan method returns an empty array in some cases.
-     * See micromatch/picomatch#58 for more details.
-     */
-    if (parts.length === 0) {
-        parts = [pattern];
-    }
-    /**
-     * The scan method does not return an empty part for the pattern with a forward slash.
-     * This is another part of micromatch/picomatch#58.
-     */
-    if (parts[0].startsWith('/')) {
-        parts[0] = parts[0].slice(1);
-        parts.unshift('');
+    for (const depName of Object.keys(dependencies)) {
+      if (projects.has(depName)) {
+        const dep = projects.get(depName);
+        project.ensureValidProjectDependency(dep);
+        projectDeps.push(dep);
+      }
     }
-    return 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;
 
+    projectGraph.set(project.name, projectDeps);
+  }
 
-/***/ }),
-/* 788 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+  return projectGraph;
+}
+function topologicallyBatchProjects(projectsToBatch, projectGraph) {
+  // We're going to be chopping stuff out of this list, so copy it.
+  const projectsLeftToBatch = new Set(projectsToBatch.keys());
+  const batches = [];
 
+  while (projectsLeftToBatch.size > 0) {
+    // Get all projects that have no remaining dependencies within the repo
+    // that haven't yet been picked.
+    const batch = [];
 
-const util = __webpack_require__(113);
-const braces = __webpack_require__(269);
-const picomatch = __webpack_require__(279);
-const utils = __webpack_require__(282);
-const isEmptyString = val => val === '' || val === './';
+    for (const projectName of projectsLeftToBatch) {
+      const projectDeps = projectGraph.get(projectName);
+      const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name));
 
-/**
- * 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
- */
+      if (!needsDependenciesBatched) {
+        batch.push(projectsToBatch.get(projectName));
+      }
+    } // If we weren't able to find a project with no remaining dependencies,
+    // then we've encountered a cycle in the dependency graph.
 
-const micromatch = (list, patterns, options) => {
-  patterns = [].concat(patterns);
-  list = [].concat(list);
 
-  let omit = new Set();
-  let keep = new Set();
-  let items = new Set();
-  let negatives = 0;
+    const hasCycles = batch.length === 0;
 
-  let onResult = state => {
-    items.add(state.output);
-    if (options && options.onResult) {
-      options.onResult(state);
+    if (hasCycles) {
+      const cycleProjectNames = [...projectsLeftToBatch];
+      const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', ');
+      throw new _errors__WEBPACK_IMPORTED_MODULE_3__[/* CliError */ "a"](message);
     }
-  };
 
-  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++;
+    batches.push(batch);
+    batch.forEach(project => projectsLeftToBatch.delete(project.name));
+  }
 
-    for (let item of list) {
-      let matched = isMatch(item, true);
+  return batches;
+}
+function includeTransitiveProjects(subsetOfProjects, allProjects, {
+  onlyProductionDependencies = false
+} = {}) {
+  const projectsWithDependents = new Map(); // the current list of packages we are expanding using breadth-first-search
 
-      let match = negated ? !matched.isMatch : matched.isMatch;
-      if (!match) continue;
+  const toProcess = [...subsetOfProjects];
 
-      if (negated) {
-        omit.add(matched.output);
-      } else {
-        omit.delete(matched.output);
-        keep.add(matched.output);
+  while (toProcess.length > 0) {
+    const project = toProcess.shift();
+    const dependencies = onlyProductionDependencies ? project.productionDependencies : project.allDependencies;
+    Object.keys(dependencies).forEach(dep => {
+      if (allProjects.has(dep)) {
+        toProcess.push(allProjects.get(dep));
       }
-    }
+    });
+    projectsWithDependents.set(project.name, project);
   }
 
-  let result = negatives === patterns.length ? [...items] : [...keep];
-  let matches = result.filter(item => !omit.has(item));
-
-  if (options && matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error(`No matches found for "${patterns.join(', ')}"`);
-    }
+  return projectsWithDependents;
+}
 
-    if (options.nonull === true || options.nullglob === true) {
-      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
-    }
-  }
+/***/ }),
 
-  return matches;
-};
+/***/ "./src/utils/projects_tree.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * Backwards compatibility
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return renderProjectsTree; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return treeToString; });
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/chalk/source/index.js");
+/* 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__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-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]);
- *
- * 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 projectKey = Symbol('__project');
+function renderProjectsTree(rootPath, projects) {
+  const projectsTree = buildProjectsTree(rootPath, projects);
+  return treeToString(createTreeStructure(projectsTree));
+}
+function treeToString(tree) {
+  return [tree.name].concat(childrenToStrings(tree.children, '')).join('\n');
+}
+
+function childrenToStrings(tree, treePrefix) {
+  if (tree === undefined) {
+    return [];
+  }
+
+  let strings = [];
+  tree.forEach((node, index) => {
+    const isLastNode = tree.length - 1 === index;
+    const nodePrefix = isLastNode ? '└── ' : '├── ';
+    const childPrefix = isLastNode ? '    ' : '│   ';
+    const childrenPrefix = treePrefix + childPrefix;
+    strings.push(`${treePrefix}${nodePrefix}${node.name}`);
+    strings = strings.concat(childrenToStrings(node.children, childrenPrefix));
+  });
+  return strings;
+}
+
+function createTreeStructure(tree) {
+  let name;
+  const children = [];
 
-micromatch.matcher = (pattern, options) => picomatch(pattern, options);
+  for (const [dir, project] of tree.entries()) {
+    // This is a leaf node (aka a project)
+    if (typeof project === 'string') {
+      name = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(project);
+      continue;
+    } // If there's only one project and the key indicates it's a leaf node, we
+    // know that we're at a package folder that contains a package.json, so we
+    // "inline it" so we don't get unnecessary levels, i.e. we'll just see
+    // `foo` instead of `foo -> foo`.
 
-/**
- * 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);
+    if (project.size === 1 && project.has(projectKey)) {
+      const projectName = project.get(projectKey);
+      children.push({
+        children: [],
+        name: dirOrProjectName(dir, projectName)
+      });
+      continue;
+    }
 
-/**
- * Backwards compatibility
- */
+    const subtree = createTreeStructure(project); // If the name is specified, we know there's a package at the "root" of the
+    // subtree itself.
 
-micromatch.any = micromatch.isMatch;
+    if (subtree.name !== undefined) {
+      const projectName = subtree.name;
+      children.push({
+        children: subtree.children,
+        name: dirOrProjectName(dir, projectName)
+      });
+      continue;
+    } // Special-case whenever we have one child, so we don't get unnecessary
+    // folders in the output. E.g. instead of `foo -> bar -> baz` we get
+    // `foo/bar/baz` instead.
 
-/**
- * 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
- */
 
-micromatch.not = (list, patterns, options = {}) => {
-  patterns = [].concat(patterns).map(String);
-  let result = new Set();
-  let items = [];
+    if (subtree.children && subtree.children.length === 1) {
+      const child = subtree.children[0];
+      const newName = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(dir.toString(), child.name));
+      children.push({
+        children: child.children,
+        name: newName
+      });
+      continue;
+    }
 
-  let onResult = state => {
-    if (options.onResult) options.onResult(state);
-    items.push(state.output);
+    children.push({
+      children: subtree.children,
+      name: chalk__WEBPACK_IMPORTED_MODULE_0___default.a.dim(dir.toString())
+    });
+  }
+
+  return {
+    name,
+    children
   };
+}
 
-  let matches = micromatch(list, patterns, { ...options, onResult });
+function dirOrProjectName(dir, projectName) {
+  return dir === projectName ? chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(dir) : chalk__WEBPACK_IMPORTED_MODULE_0___default.a`{dim ${dir.toString()} ({reset.green ${projectName}})}`;
+}
 
-  for (let item of items) {
-    if (!matches.includes(item)) {
-      result.add(item);
+function buildProjectsTree(rootPath, projects) {
+  const tree = new Map();
+
+  for (const project of projects.values()) {
+    if (rootPath === project.path) {
+      tree.set(projectKey, project.name);
+    } else {
+      const relativeProjectPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(rootPath, project.path);
+      addProjectToTree(tree, relativeProjectPath.split(path__WEBPACK_IMPORTED_MODULE_1___default.a.sep), project);
     }
   }
-  return [...result];
-};
-
-/**
- * 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 any of the patterns matches any part of `str`.
- * @api public
- */
 
-micromatch.contains = (str, pattern, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
-  }
+  return tree;
+}
 
-  if (Array.isArray(pattern)) {
-    return pattern.some(p => micromatch.contains(str, p, options));
-  }
+function addProjectToTree(tree, pathParts, project) {
+  if (pathParts.length === 0) {
+    tree.set(projectKey, project.name);
+  } else {
+    const [currentDir, ...rest] = pathParts;
 
-  if (typeof pattern === 'string') {
-    if (isEmptyString(str) || isEmptyString(pattern)) {
-      return false;
+    if (!tree.has(currentDir)) {
+      tree.set(currentDir, new Map());
     }
 
-    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
-      return true;
-    }
+    const subtree = tree.get(currentDir);
+    addProjectToTree(subtree, rest, project);
   }
+}
 
-  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
- */
+/***/ }),
 
-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;
-};
+/***/ "./src/utils/regenerate_base_tsconfig.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * 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` matches any of the strings in `list`
- * @api public
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return regenerateBaseTsconfig; });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/convert_plugin_id_to_package_id.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-micromatch.some = (list, patterns, options) => {
-  let items = [].concat(list);
 
-  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 all `patterns` matches all of the strings in `list`
- * @api public
- */
+async function regenerateBaseTsconfig(plugins, repoRoot) {
+  const tsconfigPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(repoRoot, 'tsconfig.base.json');
+  const lines = (await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(tsconfigPath, 'utf-8')).split('\n');
+  const packageMap = plugins.slice().sort((a, b) => a.manifestPath.localeCompare(b.manifestPath)).flatMap(p => {
+    const id = Object(_convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_2__[/* convertPluginIdToPackageId */ "a"])(p.manifest.id);
+    const path = path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(repoRoot, p.directory);
+    return [`      "${id}": ["${path}"],`, `      "${id}/*": ["${path}/*"],`];
+  });
+  const start = lines.findIndex(l => l.trim() === '// START AUTOMATED PACKAGE LISTING');
+  const end = lines.findIndex(l => l.trim() === '// END AUTOMATED PACKAGE LISTING');
+  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(tsconfigPath, [...lines.slice(0, start + 1), ...packageMap, ...lines.slice(end)].join('\n'));
+}
 
-micromatch.every = (list, patterns, options) => {
-  let items = [].concat(list);
+/***/ }),
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (!items.every(item => isMatch(item))) {
-      return false;
-    }
-  }
-  return true;
-};
+/***/ "./src/utils/regenerate_package_json.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * 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
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return regeneratePackageJson; });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@kbn/dev-utils/target_node/sort_package_json.js");
+/* harmony import */ var _kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_2__);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-micromatch.all = (str, patterns, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
-  }
 
-  return [].concat(patterns).every(p => picomatch(p, options)(str));
-};
 
-/**
- * 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 {Array|null} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
- * @api public
- */
+async function regeneratePackageJson(rootPath) {
+  const path = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'package.json');
+  const json = await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(path, 'utf8');
+  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(path, Object(_kbn_dev_utils_sort_package_json__WEBPACK_IMPORTED_MODULE_2__["sortPackageJson"])(json));
+}
 
-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);
+/***/ }),
 
-  if (match) {
-    return match.slice(1).map(v => v === void 0 ? '' : v);
-  }
-};
+/***/ "./src/utils/regenerate_synthetic_package_map.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/**
- * 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
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return regenerateSyntheticPackageMap; });
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("fs/promises");
+/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/normalize-path/index.js");
+/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(normalize_path__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/convert_plugin_id_to_package_id.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-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
- */
 
-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
- */
+async function regenerateSyntheticPackageMap(plugins, repoRoot) {
+  const entries = [['@kbn/core', 'src/core']];
 
-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));
-    }
+  for (const plugin of plugins) {
+    entries.push([Object(_convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__[/* convertPluginIdToPackageId */ "a"])(plugin.manifest.id), normalize_path__WEBPACK_IMPORTED_MODULE_2___default()(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(repoRoot, plugin.directory))]);
   }
-  return res;
-};
 
-/**
- * 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
- */
+  await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.writeFile(path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(repoRoot, 'packages/kbn-synthetic-package-map/synthetic-packages.json'), JSON.stringify(entries, null, 2));
+}
 
-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);
-};
+/***/ }),
+
+/***/ "./src/utils/scripts.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return installInDir; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return runScriptInPackage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return runScriptInPackageStreaming; });
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/utils/child_process.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
 
+const YARN_EXEC = process.env.npm_execpath || 'yarn';
 /**
- * Expand braces
+ * Install all dependencies in the given directory
  */
 
-micromatch.braceExpand = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  return micromatch.braces(pattern, { ...options, expand: true });
-};
+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).
 
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__[/* spawn */ "a"])(YARN_EXEC, options, {
+    cwd: directory,
+    env: {
+      SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+      RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
+    }
+  });
+}
 /**
- * Expose micromatch
+ * Run script in the given directory
  */
 
-module.exports = micromatch;
+async function runScriptInPackage(script, args, pkg) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__[/* spawn */ "a"])(YARN_EXEC, ['run', script, ...args], execOpts);
+}
+/**
+ * Run script in the given directory
+ */
 
+function runScriptInPackageStreaming({
+  script,
+  args,
+  pkg,
+  debug
+}) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__[/* spawnStreaming */ "b"])(YARN_EXEC, ['run', script, ...args], execOpts, {
+    prefix: pkg.name,
+    debug
+  });
+}
 
 /***/ }),
-/* 789 */
-/***/ (function(module, exports, __webpack_require__) {
+
+/***/ "./src/utils/validate_dependencies.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return validateDependencies; });
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@yarnpkg/lockfile/index.js");
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/dedent/dist/dedent.js");
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/chalk/source/index.js");
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("path");
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./src/utils/fs.ts");
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./src/utils/log.ts");
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./src/utils/package_json.ts");
+/* harmony import */ var _projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./src/utils/projects_tree.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// @ts-expect-error published types are useless
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = void 0;
-const merge2 = __webpack_require__(243);
-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'));
-}
 
 
-/***/ }),
-/* 790 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.isString = void 0;
-function isString(input) {
-    return typeof input === 'string';
-}
-exports.isString = isString;
-function isEmpty(input) {
-    return input === '';
-}
-exports.isEmpty = isEmpty;
 
 
-/***/ }),
-/* 791 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+async function validateDependencies(kbn, yarnLock) {
+  // look through all of the packages in the yarn.lock file to see if
+  // we have accidentally installed multiple lodash v4 versions
+  const lodash4Versions = new Set();
+  const lodash4Reqs = new Set();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(792);
-const provider_1 = __webpack_require__(794);
-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));
-        });
+  for (const [req, dep] of Object.entries(yarnLock)) {
+    if (req.startsWith('lodash@') && dep.version.startsWith('4.')) {
+      lodash4Reqs.add(req);
+      lodash4Versions.add(dep.version);
     }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
+  } // if we find more than one lodash v4 version installed then delete
+  // lodash v4 requests from the yarn.lock file and prompt the user to
+  // retry bootstrap so that a single v4 version will be installed
+
+
+  if (lodash4Versions.size > 1) {
+    for (const req of lodash4Reqs) {
+      delete yarnLock[req];
     }
-}
-exports.default = ProviderAsync;
 
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__[/* writeFile */ "i"])(kbn.getAbsolute('yarn.lock'), Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["stringify"])(yarnLock), 'utf8');
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-/***/ }),
-/* 792 */
-/***/ (function(module, exports, __webpack_require__) {
+      Multiple version of lodash v4 were detected, so they have been removed
+      from the yarn.lock file. Please rerun yarn kbn bootstrap to coalese the
+      lodash versions installed.
 
-"use strict";
+      If you still see this error when you re-bootstrap then you might need
+      to force a new dependency to use the latest version of lodash via the
+      "resolutions" field in package.json.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(173);
-const fsStat = __webpack_require__(289);
-const fsWalk = __webpack_require__(294);
-const reader_1 = __webpack_require__(793);
-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;
+      If you have questions about this please reach out to the operations team.
 
+    `);
+    process.exit(1);
+  } // look through all the dependencies of production packages and production
+  // dependencies of those packages to determine if we're shipping any versions
+  // of lodash v3 in the distributable
 
-/***/ }),
-/* 793 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+  const prodDependencies = kbn.resolveAllProductionDependencies(yarnLock, _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"]);
+  const lodash3Versions = new Set();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const fsStat = __webpack_require__(289);
-const utils = __webpack_require__(782);
-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;
+  for (const dep of prodDependencies.values()) {
+    if (dep.name === 'lodash' && dep.version.startsWith('3.')) {
+      lodash3Versions.add(dep.version);
     }
-}
-exports.default = Reader;
+  } // if any lodash v3 packages were found we abort and tell the user to fix things
 
 
-/***/ }),
-/* 794 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (lodash3Versions.size) {
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-"use strict";
+      Due to changes in the yarn.lock file and/or package.json files a version of
+      lodash 3 is now included in the production dependencies. To reduce the size of
+      our distributable and especially our front-end bundles we have decided to
+      prevent adding any new instances of lodash 3.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __webpack_require__(4);
-const deep_1 = __webpack_require__(795);
-const entry_1 = __webpack_require__(798);
-const error_1 = __webpack_require__(799);
-const entry_2 = __webpack_require__(800);
-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;
+      Please inspect the changes to yarn.lock or package.json files to identify where
+      the lodash 3 version is coming from and remove it.
 
+      If you have questions about this please reack out to the operations team.
 
-/***/ }),
-/* 795 */
-/***/ (function(module, exports, __webpack_require__) {
+    `);
+    process.exit(1);
+  } // TODO: remove this once we move into a single package.json
+  // look through all the package.json files to find packages which have mismatched version ranges
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(782);
-const partial_1 = __webpack_require__(796);
-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) {
-        if (this._isSkippedByDeep(basePath, entry.path)) {
-            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(basePath, entryPath) {
-        /**
-         * Avoid unnecessary depth calculations when it doesn't matter.
-         */
-        if (this._settings.deep === Infinity) {
-            return false;
-        }
-        return this._getEntryLevel(basePath, entryPath) >= this._settings.deep;
-    }
-    _getEntryLevel(basePath, entryPath) {
-        const entryPathDepth = entryPath.split('/').length;
-        if (basePath === '') {
-            return entryPathDepth;
-        }
-        const basePathDepth = basePath.split('/').length;
-        return entryPathDepth - basePathDepth;
-    }
-    _isSkippedSymbolicLink(entry) {
-        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
-    }
-    _isSkippedByPositivePatterns(entryPath, matcher) {
-        return !this._settings.baseNameMatch && !matcher.match(entryPath);
-    }
-    _isSkippedByNegativePatterns(entryPath, patternsRe) {
-        return !utils.pattern.matchAny(entryPath, patternsRe);
+  const depRanges = new Map();
+
+  for (const project of kbn.getAllProjects().values()) {
+    var _kbn$kibanaProject;
+
+    // Skip if this is an external plugin
+    if (project.path.includes(`${(_kbn$kibanaProject = kbn.kibanaProject) === null || _kbn$kibanaProject === void 0 ? void 0 : _kbn$kibanaProject.path}${path__WEBPACK_IMPORTED_MODULE_3__["sep"]}plugins`)) {
+      continue;
     }
-}
-exports.default = DeepFilter;
 
+    for (const [dep, range] of Object.entries(project.allDependencies)) {
+      const existingDep = depRanges.get(dep);
 
-/***/ }),
-/* 796 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (!existingDep) {
+        depRanges.set(dep, [{
+          range,
+          projects: [project]
+        }]);
+        continue;
+      }
 
-"use strict";
+      const existingRange = existingDep.find(existing => existing.range === range);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const matcher_1 = __webpack_require__(797);
-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;
+      if (!existingRange) {
+        existingDep.push({
+          range,
+          projects: [project]
+        });
+        continue;
+      }
+
+      existingRange.projects.push(project);
     }
-}
-exports.default = PartialMatcher;
+  }
 
+  const duplicateRanges = Array.from(depRanges.entries()).filter(([, ranges]) => ranges.length > 1 && !ranges.every(rng => Object(_package_json__WEBPACK_IMPORTED_MODULE_6__[/* isLinkDependency */ "b"])(rng.range))).reduce((acc, [dep, ranges]) => [...acc, dep, ...ranges.map(({
+    range,
+    projects
+  }) => `  ${range} => ${projects.map(p => p.name).join(', ')}`)], []).join('\n        ');
 
-/***/ }),
-/* 797 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (duplicateRanges) {
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
 
-"use strict";
+      [single_version_dependencies] Multiple version ranges for the same dependency
+      were found declared across different package.json files. Please consolidate
+      those to match across all package.json files. Different versions for the
+      same dependency is not supported.
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(782);
-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;
+      If you have questions about this please reach out to the operations team.
 
+      The conflicting dependencies are:
 
-/***/ }),
-/* 798 */
-/***/ (function(module, exports, __webpack_require__) {
+        ${duplicateRanges}
+    `);
+    process.exit(1);
+  } // look for packages that have the the `kibana.devOnly` flag in their package.json
+  // and make sure they aren't included in the production dependencies of Kibana
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(782);
-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 && this._isDuplicateEntry(entry)) {
-            return false;
-        }
-        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
-            return false;
-        }
-        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
-            return false;
-        }
-        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
-        const isMatched = this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
-        if (this._settings.unique && isMatched) {
-            this._createIndexRecord(entry);
-        }
-        return isMatched;
-    }
-    _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(entryPath, patternsRe) {
-        if (!this._settings.absolute) {
-            return false;
-        }
-        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
-        return utils.pattern.matchAny(fullpath, patternsRe);
-    }
-    _isMatchToPatterns(entryPath, patternsRe) {
-        const filepath = utils.path.removeLeadingDotSegment(entryPath);
-        return utils.pattern.matchAny(filepath, patternsRe);
-    }
-}
-exports.default = EntryFilter;
+  const devOnlyProjectsInProduction = getDevOnlyProductionDepsTree(kbn, 'kibana');
 
+  if (devOnlyProjectsInProduction) {
+    _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a`
+      Some of the packages in the production dependency chain for Kibana and X-Pack are
+      flagged with "kibana.devOnly" in their package.json. Please check changes made to
+      packages and their dependencies to ensure they don't end up in production.
 
-/***/ }),
-/* 799 */
-/***/ (function(module, exports, __webpack_require__) {
+      The devOnly dependencies that are being dependend on in production are:
 
-"use strict";
+        ${Object(_projects_tree__WEBPACK_IMPORTED_MODULE_7__[/* treeToString */ "b"])(devOnlyProjectsInProduction).split('\n').join('\n        ')}
+    `);
+    process.exit(1);
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(782);
-class ErrorFilter {
-    constructor(_settings) {
-        this._settings = _settings;
-    }
-    getFilter() {
-        return (error) => this._isNonFatalError(error);
-    }
-    _isNonFatalError(error) {
-        return utils.errno.isEnoentCodeError(error) || this._settings.suppressErrors;
-    }
+  _log__WEBPACK_IMPORTED_MODULE_5__[/* log */ "a"].success('yarn.lock analysis completed without any issues');
 }
-exports.default = ErrorFilter;
-
 
-/***/ }),
-/* 800 */
-/***/ (function(module, exports, __webpack_require__) {
+function getDevOnlyProductionDepsTree(kbn, projectName) {
+  const project = kbn.getProject(projectName);
+  const childProjectNames = [...Object.keys(project.productionDependencies).filter(name => kbn.hasProject(name)), ...(projectName === 'kibana' ? ['x-pack'] : [])];
+  const children = childProjectNames.map(n => getDevOnlyProductionDepsTree(kbn, n)).filter(t => !!t);
 
-"use strict";
+  if (!children.length && !project.isFlaggedAsDevOnly()) {
+    return;
+  }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(782);
-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 });
-    }
+  const tree = {
+    name: project.isFlaggedAsDevOnly() ? chalk__WEBPACK_IMPORTED_MODULE_2___default.a.red.bold(projectName) : projectName,
+    children
+  };
+  return tree;
 }
-exports.default = EntryTransformer;
-
 
 /***/ }),
-/* 801 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(173);
-const stream_2 = __webpack_require__(792);
-const provider_1 = __webpack_require__(794);
-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;
+/***/ "./src/utils/yarn_lock.ts":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return readYarnLock; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return resolveDepsForProject; });
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@yarnpkg/lockfile/index.js");
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/fs.ts");
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// @ts-expect-error published types are worthless
 
-/***/ }),
-/* 802 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+async function readYarnLock(kbn) {
+  try {
+    const contents = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__[/* readFile */ "f"])(kbn.getAbsolute('yarn.lock'), 'utf8');
+    const yarnLock = Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["parse"])(contents);
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(803);
-const provider_1 = __webpack_require__(794);
-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);
+    if (yarnLock.type === 'success') {
+      return yarnLock.object;
     }
-    api(root, task, options) {
-        if (task.dynamic) {
-            return this._reader.dynamic(root, options);
-        }
-        return this._reader.static(task.patterns, options);
+
+    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
     }
-}
-exports.default = ProviderSync;
+  }
 
+  return {};
+}
+/**
+ * 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
+ */
 
-/***/ }),
-/* 803 */
-/***/ (function(module, exports, __webpack_require__) {
+function resolveDepsForProject({
+  project: rootProject,
+  yarnLock,
+  kbn,
+  log,
+  productionDepsOnly,
+  includeDependentProject
+}) {
+  /** map of [name@range, { name, version }] */
+  const resolved = new Map();
+  const seenProjects = new Set();
+  const projectQueue = [rootProject];
+  const depQueue = [];
 
-"use strict";
+  while (projectQueue.length) {
+    const project = projectQueue.shift();
 
-Object.defineProperty(exports, "__esModule", { value: true });
-const fsStat = __webpack_require__(289);
-const fsWalk = __webpack_require__(294);
-const reader_1 = __webpack_require__(793);
-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;
-        }
+    if (seenProjects.has(project)) {
+      continue;
     }
-    _getStat(filepath) {
-        return this._statSync(filepath, this._fsStatSettings);
+
+    seenProjects.add(project);
+    const projectDeps = Object.entries(productionDepsOnly ? project.productionDependencies : project.allDependencies);
+
+    for (const [name, versionRange] of projectDeps) {
+      depQueue.push([name, versionRange]);
     }
-}
-exports.default = ReaderSync;
 
+    while (depQueue.length) {
+      const [name, versionRange] = depQueue.shift();
+      const req = `${name}@${versionRange}`;
 
-/***/ }),
-/* 804 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (resolved.has(req)) {
+        continue;
+      }
 
-"use strict";
+      if (includeDependentProject && kbn.hasProject(name)) {
+        projectQueue.push(kbn.getProject(name));
+      }
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
-const fs = __webpack_require__(132);
-const os = __webpack_require__(122);
-/**
- * The `os.cpus` method can return zero. We expect the number of cores to be greater than zero.
- * https://github.com/nodejs/node/blob/7faeddf23a98c53896f8b574a6e66589e8fb1eb8/lib/os.js#L106-L107
- */
-const CPU_COUNT = Math.max(os.cpus().length, 1);
-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 (!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;
         }
-        if (this.stats) {
-            this.objectMode = true;
+
+        resolved.set(req, {
+          name,
+          version: pkg.version
+        });
+        const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
+
+        for (const [childName, childVersionRange] of allDepsEntries) {
+          depQueue.push([childName, childVersionRange]);
         }
+      }
     }
-    _getValue(option, value) {
-        return option === undefined ? value : option;
-    }
-    _getFileSystemMethods(methods = {}) {
-        return Object.assign(Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER), methods);
-    }
-}
-exports.default = Settings;
+  }
 
+  return resolved;
+}
 
 /***/ }),
-/* 805 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "assert":
+/***/ (function(module, exports) {
 
-const {promisify} = __webpack_require__(113);
-const fs = __webpack_require__(132);
-const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(780);
-const gitIgnore = __webpack_require__(329);
-const slash = __webpack_require__(330);
+module.exports = require("assert");
 
-const DEFAULT_IGNORE = [
-	'**/node_modules/**',
-	'**/flow-typed/**',
-	'**/coverage/**',
-	'**/.git'
-];
+/***/ }),
 
-const readFileP = promisify(fs.readFile);
+/***/ "buffer":
+/***/ (function(module, exports) {
 
-const mapGitIgnorePatternTo = base => ignore => {
-	if (ignore.startsWith('!')) {
-		return '!' + path.posix.join(base, ignore.slice(1));
-	}
+module.exports = require("buffer");
 
-	return path.posix.join(base, ignore);
-};
+/***/ }),
 
-const parseGitIgnore = (content, options) => {
-	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+/***/ "child_process":
+/***/ (function(module, exports) {
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => !line.startsWith('#'))
-		.map(mapGitIgnorePatternTo(base));
-};
+module.exports = require("child_process");
 
-const reduceIgnore = files => {
-	const ignores = gitIgnore();
-	for (const file of files) {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-	}
+/***/ }),
 
-	return ignores;
-};
+/***/ "constants":
+/***/ (function(module, exports) {
 
-const ensureAbsolutePathForCwd = (cwd, p) => {
-	cwd = slash(cwd);
-	if (path.isAbsolute(p)) {
-		if (slash(p).startsWith(cwd)) {
-			return p;
-		}
+module.exports = require("constants");
 
-		throw new Error(`Path ${p} is not in cwd ${cwd}`);
-	}
+/***/ }),
 
-	return path.join(cwd, p);
-};
+/***/ "crypto":
+/***/ (function(module, exports) {
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p.path || p))));
-};
+module.exports = require("crypto");
 
-const getFile = async (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = await readFileP(filePath, 'utf8');
+/***/ }),
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+/***/ "events":
+/***/ (function(module, exports) {
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
+module.exports = require("events");
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+/***/ }),
 
-const normalizeOptions = ({
-	ignore = [],
-	cwd = slash(process.cwd())
-} = {}) => {
-	return {ignore, cwd};
-};
+/***/ "fs":
+/***/ (function(module, exports) {
 
-module.exports = async options => {
-	options = normalizeOptions(options);
+module.exports = require("fs");
 
-	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);
+/***/ "fs/promises":
+/***/ (function(module, exports) {
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+module.exports = require("fs/promises");
 
-module.exports.sync = options => {
-	options = normalizeOptions(options);
+/***/ }),
 
-	const paths = fastGlob.sync('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+/***/ "http":
+/***/ (function(module, exports) {
 
-	const files = paths.map(file => getFileSync(file, options.cwd));
-	const ignores = reduceIgnore(files);
+module.exports = require("http");
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+/***/ }),
+
+/***/ "https":
+/***/ (function(module, exports) {
 
+module.exports = require("https");
 
 /***/ }),
-/* 806 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/***/ "net":
+/***/ (function(module, exports) {
 
-const {Transform} = __webpack_require__(173);
+module.exports = require("net");
 
-class ObjectTransform extends Transform {
-	constructor() {
-		super({
-			objectMode: true
-		});
-	}
-}
+/***/ }),
 
-class FilterStream extends ObjectTransform {
-	constructor(filter) {
-		super();
-		this._filter = filter;
-	}
+/***/ "os":
+/***/ (function(module, exports) {
 
-	_transform(data, encoding, callback) {
-		if (this._filter(data)) {
-			this.push(data);
-		}
+module.exports = require("os");
 
-		callback();
-	}
-}
+/***/ }),
 
-class UniqueStream extends ObjectTransform {
-	constructor() {
-		super();
-		this._pushed = new Set();
-	}
+/***/ "path":
+/***/ (function(module, exports) {
 
-	_transform(data, encoding, callback) {
-		if (!this._pushed.has(data)) {
-			this.push(data);
-			this._pushed.add(data);
-		}
+module.exports = require("path");
 
-		callback();
-	}
-}
+/***/ }),
 
-module.exports = {
-	FilterStream,
-	UniqueStream
-};
+/***/ "readline":
+/***/ (function(module, exports) {
 
+module.exports = require("readline");
 
 /***/ }),
-/* 807 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return buildNonBazelProductionProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProductionProjects", function() { return getProductionProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProject", function() { return buildProject; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(567);
-/* 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__(240);
-/* 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__(564);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220);
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(343);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(340);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
 
+/***/ "stream":
+/***/ (function(module, exports) {
 
+module.exports = require("stream");
 
+/***/ }),
 
+/***/ "string_decoder":
+/***/ (function(module, exports) {
 
+module.exports = require("string_decoder");
 
+/***/ }),
 
+/***/ "tty":
+/***/ (function(module, exports) {
 
-async function buildNonBazelProductionProjects({
-  kibanaRoot,
-  buildRoot,
-  onlyOSS
-}) {
-  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["getNonBazelProjectsOnly"])(await getProductionProjects(kibanaRoot, onlyOSS));
-  const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["buildProjectGraph"])(projects);
-  const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["topologicallyBatchProjects"])(projects, projectGraph);
-  const projectNames = [...projects.values()].map(project => project.name);
-  _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`Preparing non Bazel production build for [${projectNames.join(', ')}]`);
+module.exports = require("tty");
 
-  for (const batch of batchedProjects) {
-    for (const project of batch) {
-      await deleteTarget(project);
-      await buildProject(project);
-      await copyToBuild(project, kibanaRoot, buildRoot);
-    }
-  }
-}
-/**
- * Returns the subset of projects that should be built into the production
- * bundle. As we copy these into Kibana's `node_modules` during the build step,
- * and let Kibana's build process be responsible for installing dependencies,
- * we only include Kibana's transitive _production_ dependencies. If onlyOSS
- * is supplied, we omit projects with build.oss in their package.json set to false.
- */
+/***/ }),
 
-async function getProductionProjects(rootPath, onlyOSS) {
-  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])({
-    rootPath
-  });
-  const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["getProjects"])(rootPath, projectPaths);
-  const projectsSubset = [projects.get('kibana')];
+/***/ "url":
+/***/ (function(module, exports) {
 
-  if (projects.has('x-pack')) {
-    projectsSubset.push(projects.get('x-pack'));
-  }
+module.exports = require("url");
 
-  const productionProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["includeTransitiveProjects"])(projectsSubset, projects, {
-    onlyProductionDependencies: true
-  }); // We remove Kibana, as we're already building Kibana
+/***/ }),
 
-  productionProjects.delete('kibana');
+/***/ "util":
+/***/ (function(module, exports) {
 
-  if (onlyOSS) {
-    productionProjects.forEach(project => {
-      if (project.getBuildConfig().oss === false) {
-        productionProjects.delete(project.json.name);
-      }
-    });
-  }
+module.exports = require("util");
 
-  return productionProjects;
-}
+/***/ }),
 
-async function deleteTarget(project) {
-  const targetDir = project.targetLocation;
+/***/ "worker_threads":
+/***/ (function(module, exports) {
 
-  if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(targetDir)) {
-    await del__WEBPACK_IMPORTED_MODULE_1___default()(targetDir, {
-      force: true
-    });
-  }
-}
+module.exports = require(undefined);
 
-async function buildProject(project) {
-  if (project.hasScript('build')) {
-    await project.runScript('build');
-  }
-}
-/**
- * Copy all the project's files from its "intermediate build directory" and
- * into the build. The intermediate directory can either be the root of the
- * project or some other location defined in the project's `package.json`.
- *
- * When copying all the files into the build, we exclude `node_modules` because
- * we want the Kibana build to be responsible for actually installing all
- * dependencies. The primary reason for allowing the Kibana build process to
- * manage dependencies is that it will "dedupe" them, so we don't include
- * unnecessary copies of dependencies.
- */
+/***/ }),
 
-async function copyToBuild(project, kibanaRoot, buildRoot) {
-  // We want the package to have the same relative location within the build
-  const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path);
-  const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath);
-  await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*', '!node_modules/**'], buildProjectPath, {
-    cwd: project.getIntermediateBuildDirectory(),
-    dot: true,
-    onlyFiles: true,
-    parents: true
-  }); // If a project is using an intermediate build directory, we special-case our
-  // handling of `package.json`, as the project build process might have copied
-  // (a potentially modified) `package.json` into the intermediate build
-  // directory already. If so, we want to use that `package.json` as the basis
-  // for creating the production-ready `package.json`. If it's not present in
-  // the intermediate build, we fall back to using the project's already defined
-  // `package.json`.
+/***/ "zlib":
+/***/ (function(module, exports) {
 
-  const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isFile"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["readPackageJson"])(buildProjectPath) : project.json;
-  const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["createProductionPackageJson"])(packageJson);
-  await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["writePackageJson"])(buildProjectPath, preparedPackageJson);
-}
+module.exports = require("zlib");
 
 /***/ })
-/******/ ]);
\ No newline at end of file
+
+/******/ });
\ No newline at end of file
diff --git a/packages/kbn-pm/index.d.ts b/packages/kbn-pm/index.d.ts
index 004ac67f4b0c4..de0577ee3ed83 100644
--- a/packages/kbn-pm/index.d.ts
+++ b/packages/kbn-pm/index.d.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from './src/index';
+export * from './src';
diff --git a/packages/kbn-pm/src/commands/bootstrap.ts b/packages/kbn-pm/src/commands/bootstrap.ts
index 691265935b94f..5b6f4fe3baeb7 100644
--- a/packages/kbn-pm/src/commands/bootstrap.ts
+++ b/packages/kbn-pm/src/commands/bootstrap.ts
@@ -13,9 +13,8 @@ import { log } from '../utils/log';
 import { spawnStreaming } from '../utils/child_process';
 import { linkProjectExecutables } from '../utils/link_project_executables';
 import { getNonBazelProjectsOnly, topologicallyBatchProjects } from '../utils/projects';
-import { ICommand } from './';
+import { ICommand } from '.';
 import { readYarnLock } from '../utils/yarn_lock';
-import { sortPackageJson } from '../utils/sort_package_json';
 import { validateDependencies } from '../utils/validate_dependencies';
 import { installBazelTools, removeYarnIntegrityFileIfExists, runBazel } from '../utils/bazel';
 import { setupRemoteCache } from '../utils/bazel/setup_remote_cache';
@@ -71,8 +70,8 @@ export const BootstrapCommand: ICommand = {
     if (forceInstall) {
       await time('force install dependencies', async () => {
         await removeYarnIntegrityFileIfExists(resolve(kibanaProjectPath, 'node_modules'));
-        await runBazel(['clean']);
-        await runBazel(['run', '@yarn//:yarn'], runOffline, {
+        await runBazel(['clean', '--expunge']);
+        await runBazel(['run', '@nodejs//:yarn'], runOffline, {
           env: {
             SASS_BINARY_SITE:
               'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
@@ -114,10 +113,6 @@ export const BootstrapCommand: ICommand = {
       }
     }
 
-    await time('sort package json', async () => {
-      await sortPackageJson(kbn);
-    });
-
     const yarnLock = await time('read yarn.lock', async () => await readYarnLock(kbn));
 
     if (options.validate) {
diff --git a/packages/kbn-pm/src/commands/build.ts b/packages/kbn-pm/src/commands/build.ts
index 5593ffa86e6f0..654558bfdda5f 100644
--- a/packages/kbn-pm/src/commands/build.ts
+++ b/packages/kbn-pm/src/commands/build.ts
@@ -7,7 +7,7 @@
  */
 
 import { runBazel } from '../utils/bazel';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const BuildCommand: ICommand = {
   description: 'Runs a build in the Bazel built packages',
diff --git a/packages/kbn-pm/src/commands/clean.ts b/packages/kbn-pm/src/commands/clean.ts
index 12f6d674ca9e6..b46288db5bffd 100644
--- a/packages/kbn-pm/src/commands/clean.ts
+++ b/packages/kbn-pm/src/commands/clean.ts
@@ -14,7 +14,7 @@ import { join, relative } from 'path';
 import { isBazelBinAvailable, runBazel } from '../utils/bazel';
 import { isDirectory } from '../utils/fs';
 import { log } from '../utils/log';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const CleanCommand: ICommand = {
   description: 'Deletes output directories and resets internal caches.',
@@ -25,7 +25,7 @@ export const CleanCommand: ICommand = {
     id: 'total',
   },
 
-  async run(projects) {
+  async run(projects, projectGraph, { kbn }) {
     log.warning(dedent`
       This command is only necessary for the circumstance where you need to recover a consistent
       state when problems arise. If you need to run this command often, please let us know by
@@ -53,7 +53,7 @@ export const CleanCommand: ICommand = {
     }
 
     // Runs Bazel soft clean
-    if (await isBazelBinAvailable()) {
+    if (await isBazelBinAvailable(kbn.getAbsolute())) {
       await runBazel(['clean']);
       log.success('Soft cleaned bazel');
     }
diff --git a/packages/kbn-pm/src/commands/reset.ts b/packages/kbn-pm/src/commands/reset.ts
index 1a3f7c748f79e..090017c1fafca 100644
--- a/packages/kbn-pm/src/commands/reset.ts
+++ b/packages/kbn-pm/src/commands/reset.ts
@@ -19,7 +19,7 @@ import {
 } from '../utils/bazel';
 import { isDirectory } from '../utils/fs';
 import { log } from '../utils/log';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const ResetCommand: ICommand = {
   description:
@@ -31,7 +31,7 @@ export const ResetCommand: ICommand = {
     id: 'total',
   },
 
-  async run(projects) {
+  async run(projects, projectGraph, { kbn }) {
     log.warning(dedent`
       In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
       problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
@@ -64,7 +64,7 @@ export const ResetCommand: ICommand = {
     }
 
     // Runs Bazel hard clean and deletes Bazel Cache Folders
-    if (await isBazelBinAvailable()) {
+    if (await isBazelBinAvailable(kbn.getAbsolute())) {
       // Hard cleaning bazel
       await runBazel(['clean', '--expunge']);
       log.success('Hard cleaned bazel');
diff --git a/packages/kbn-pm/src/commands/run.ts b/packages/kbn-pm/src/commands/run.ts
index 25d2a16839f27..67cc7855d8e19 100644
--- a/packages/kbn-pm/src/commands/run.ts
+++ b/packages/kbn-pm/src/commands/run.ts
@@ -11,7 +11,7 @@ import { CliError } from '../utils/errors';
 import { log } from '../utils/log';
 import { parallelizeBatches } from '../utils/parallelize';
 import { topologicallyBatchProjects } from '../utils/projects';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const RunCommand: ICommand = {
   description:
diff --git a/packages/kbn-pm/src/commands/watch.ts b/packages/kbn-pm/src/commands/watch.ts
index f5ecf1cd863db..6f5b926aa21c5 100644
--- a/packages/kbn-pm/src/commands/watch.ts
+++ b/packages/kbn-pm/src/commands/watch.ts
@@ -7,7 +7,7 @@
  */
 
 import { runIBazel } from '../utils/bazel';
-import { ICommand } from './';
+import { ICommand } from '.';
 
 export const WatchCommand: ICommand = {
   description: 'Runs a build in the Bazel built packages and keeps watching them for changes',
diff --git a/packages/kbn-pm/src/run.test.ts b/packages/kbn-pm/src/run.test.ts
index 305f79947fcbb..5584c35619ba9 100644
--- a/packages/kbn-pm/src/run.test.ts
+++ b/packages/kbn-pm/src/run.test.ts
@@ -15,7 +15,11 @@ import { log } from './utils/log';
 
 log.setLogLevel('silent');
 
-const rootPath = resolve(`${__dirname}/utils/__fixtures__/kibana`);
+const rootPath = resolve(__dirname, 'utils/__fixtures__/kibana');
+
+jest.mock('./utils/regenerate_package_json');
+jest.mock('./utils/regenerate_synthetic_package_map');
+jest.mock('./utils/regenerate_base_tsconfig');
 
 function getExpectedProjectsAndGraph(runMock: any) {
   const [fullProjects, fullProjectGraph] = (runMock as jest.Mock<any>).mock.calls[0];
diff --git a/packages/kbn-pm/src/run.ts b/packages/kbn-pm/src/run.ts
index 41d26e26a3c29..559fcbcf8b668 100644
--- a/packages/kbn-pm/src/run.ts
+++ b/packages/kbn-pm/src/run.ts
@@ -6,25 +6,98 @@
  * Side Public License, v 1.
  */
 
-import { CiStatsReporter } from '@kbn/dev-utils/ci_stats_reporter';
+import { CiStatsReporter, CiStatsTiming } from '@kbn/dev-utils/ci_stats_reporter';
 
+import { simpleKibanaPlatformPluginDiscovery, getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { ICommand, ICommandConfig } from './commands';
 import { CliError } from './utils/errors';
 import { log } from './utils/log';
 import { buildProjectGraph } from './utils/projects';
 import { renderProjectsTree } from './utils/projects_tree';
+import { regeneratePackageJson } from './utils/regenerate_package_json';
+import { regenerateSyntheticPackageMap } from './utils/regenerate_synthetic_package_map';
+import { regenerateBaseTsconfig } from './utils/regenerate_base_tsconfig';
 import { Kibana } from './utils/kibana';
 
 process.env.CI_STATS_NESTED_TIMING = 'true';
 
 export async function runCommand(command: ICommand, config: Omit<ICommandConfig, 'kbn'>) {
   const runStartTime = Date.now();
-  let kbn;
+  let kbn: undefined | Kibana;
+  const timings: Array<Omit<CiStatsTiming, 'group'>> = [];
+  async function time<T>(id: string, block: () => Promise<T>): Promise<T> {
+    const start = Date.now();
+    let success = true;
+    try {
+      return await block();
+    } catch (error) {
+      success = false;
+      throw error;
+    } finally {
+      timings.push({
+        id,
+        ms: Date.now() - start,
+        meta: {
+          success,
+        },
+      });
+    }
+  }
+
+  async function reportTimes(timingConfig: { group: string; id: string }, error?: Error) {
+    if (!kbn) {
+      // things are too broken to report remotely
+      return;
+    }
+
+    const reporter = CiStatsReporter.fromEnv(log);
+
+    try {
+      await reporter.timings({
+        upstreamBranch: kbn.kibanaProject.json.branch,
+        // prevent loading @kbn/utils by passing null
+        kibanaUuid: kbn.getUuid() || null,
+        timings: [
+          ...timings.map((t) => ({ ...timingConfig, ...t })),
+          {
+            group: timingConfig.group,
+            id: timingConfig.id,
+            ms: Date.now() - runStartTime,
+            meta: {
+              success: !error,
+            },
+          },
+        ],
+      });
+    } catch (e) {
+      // prevent hiding bootstrap errors
+      log.error('failed to report timings:');
+      log.error(e);
+    }
+  }
 
   try {
     log.debug(`Running [${command.name}] command from [${config.rootPath}]`);
 
-    kbn = await Kibana.loadFrom(config.rootPath);
+    await time('regenerate package.json, synthetic-package map and tsconfig', async () => {
+      const plugins = simpleKibanaPlatformPluginDiscovery(
+        getPluginSearchPaths({
+          rootDir: config.rootPath,
+          oss: false,
+          examples: true,
+          testPlugins: true,
+        }),
+        []
+      );
+
+      await Promise.all([
+        regeneratePackageJson(config.rootPath),
+        regenerateSyntheticPackageMap(plugins, config.rootPath),
+        regenerateBaseTsconfig(plugins, config.rootPath),
+      ]);
+    });
+
+    kbn = await time('load Kibana project', async () => await Kibana.loadFrom(config.rootPath));
     const projects = kbn.getFilteredProjects({
       skipKibanaPlugins: Boolean(config.options['skip-kibana-plugins']),
       ossOnly: Boolean(config.options.oss),
@@ -50,50 +123,11 @@ export async function runCommand(command: ICommand, config: Omit<ICommandConfig,
     });
 
     if (command.reportTiming) {
-      const reporter = CiStatsReporter.fromEnv(log);
-      await reporter.timings({
-        upstreamBranch: kbn.kibanaProject.json.branch,
-        // prevent loading @kbn/utils by passing null
-        kibanaUuid: kbn.getUuid() || null,
-        timings: [
-          {
-            group: command.reportTiming.group,
-            id: command.reportTiming.id,
-            ms: Date.now() - runStartTime,
-            meta: {
-              success: true,
-            },
-          },
-        ],
-      });
+      await reportTimes(command.reportTiming);
     }
   } catch (error) {
     if (command.reportTiming) {
-      // if we don't have a kbn object then things are too broken to report on
-      if (kbn) {
-        try {
-          const reporter = CiStatsReporter.fromEnv(log);
-          await reporter.timings({
-            upstreamBranch: kbn.kibanaProject.json.branch,
-            // prevent loading @kbn/utils by passing null
-            kibanaUuid: kbn.getUuid() || null,
-            timings: [
-              {
-                group: command.reportTiming.group,
-                id: command.reportTiming.id,
-                ms: Date.now() - runStartTime,
-                meta: {
-                  success: false,
-                },
-              },
-            ],
-          });
-        } catch (e) {
-          // prevent hiding bootstrap errors
-          log.error('failed to report timings:');
-          log.error(e);
-        }
-      }
+      await reportTimes(command.reportTiming, error);
     }
 
     log.error(`[${command.name}] failed:`);
diff --git a/packages/kbn-pm/src/utils/bazel/install_tools.ts b/packages/kbn-pm/src/utils/bazel/install_tools.ts
index 8f634726b5ab2..05b71f6a868d4 100644
--- a/packages/kbn-pm/src/utils/bazel/install_tools.ts
+++ b/packages/kbn-pm/src/utils/bazel/install_tools.ts
@@ -26,27 +26,19 @@ async function readBazelToolsVersionFile(repoRootPath: string, versionFilename:
   return version;
 }
 
-export async function isBazelBinAvailable() {
+export async function isBazelBinAvailable(repoRootPath: string) {
   try {
-    await spawn('bazel', ['--version'], { stdio: 'pipe' });
+    const installedVersion = await spawn('bazel', ['--version'], { stdio: 'pipe' });
+    const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion');
 
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function isBazeliskInstalled(bazeliskVersion: string) {
-  try {
-    const { stdout: bazeliskPkgInstallStdout } = await spawn(
-      'npm',
-      ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`],
-      {
-        stdio: 'pipe',
-      }
-    );
-
-    return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`);
+    if (installedVersion.stdout === `bazel ${bazelVersion}`) {
+      return true;
+    } else {
+      log.info(
+        `[bazel_tools] Bazel is installed (${installedVersion.stdout}), but was expecting ${bazelVersion}`
+      );
+      return false;
+    }
   } catch {
     return false;
   }
@@ -86,14 +78,11 @@ export async function installBazelTools(repoRootPath: string) {
   // Check if we need to remove bazelisk from yarn
   await tryRemoveBazeliskFromYarnGlobal();
 
-  // Test if bazelisk is already installed in the correct version
-  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion);
-
   // Test if bazel bin is available
-  const isBazelBinAlreadyAvailable = await isBazelBinAvailable();
+  const isBazelBinAlreadyAvailable = await isBazelBinAvailable(repoRootPath);
 
   // Install bazelisk if not installed
-  if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
+  if (!isBazelBinAlreadyAvailable) {
     log.info(`[bazel_tools] installing Bazel tools`);
 
     log.debug(
@@ -106,7 +95,7 @@ export async function installBazelTools(repoRootPath: string) {
       stdio: 'pipe',
     });
 
-    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable();
+    const isBazelBinAvailableAfterInstall = await isBazelBinAvailable(repoRootPath);
     if (!isBazelBinAvailableAfterInstall) {
       throw new Error(dedent`
         [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
diff --git a/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts b/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
index 0e740e674b7d8..0c5213e2dacc6 100644
--- a/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
+++ b/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
@@ -10,6 +10,7 @@ import { existsSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { spawn } from '../child_process';
 import { log } from '../log';
+import { isFile, readFile, writeFile } from '../fs';
 
 async function isVaultAvailable() {
   try {
@@ -33,6 +34,26 @@ async function isElasticCommitter() {
   }
 }
 
+async function migrateToNewServersIfNeeded(settingsPath: string) {
+  if (!(await isFile(settingsPath))) {
+    return false;
+  }
+
+  const readSettingsFile = await readFile(settingsPath, 'utf8');
+  const newReadSettingsFile = readSettingsFile.replace(
+    /cloud\.buildbuddy\.io/g,
+    'remote.buildbuddy.io'
+  );
+
+  if (newReadSettingsFile === readSettingsFile) {
+    return false;
+  }
+
+  writeFile(settingsPath, newReadSettingsFile);
+  log.info(`[bazel_tools] upgrade remote cache settings to use new server address`);
+  return true;
+}
+
 export async function setupRemoteCache(repoRootPath: string) {
   // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
   if (process.env.CI || !(await isElasticCommitter())) {
@@ -43,6 +64,13 @@ export async function setupRemoteCache(repoRootPath: string) {
 
   const settingsPath = resolve(repoRootPath, '.bazelrc.cache');
 
+  // Checks if we should upgrade the servers used on .bazelrc.cache
+  //
+  // NOTE: this can be removed in the future once everyone is migrated into the new servers
+  if (await migrateToNewServersIfNeeded(settingsPath)) {
+    return;
+  }
+
   if (existsSync(settingsPath)) {
     log.debug(`[bazel_tools] remote cache settings already exist, skipping`);
     return;
@@ -51,7 +79,8 @@ export async function setupRemoteCache(repoRootPath: string) {
   if (!(await isVaultAvailable())) {
     log.info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
     log.info('[bazel_tools] building packages will work, but will be slower in many cases.');
-    log.info('[bazel_tools] reach out to Operations if you need assistance with this.');
+    log.info('[bazel_tools] use the following guide or reach out to Operations for assistance');
+    log.info('[bazel_tools] https://github.com/elastic/infra/tree/master/docs/vault');
     return;
   }
 
@@ -81,8 +110,8 @@ export async function setupRemoteCache(repoRootPath: string) {
     # V1 - This file is automatically generated by 'yarn kbn bootstrap'
     # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
     build --bes_results_url=https://app.buildbuddy.io/invocation/
-    build --bes_backend=grpcs://cloud.buildbuddy.io
-    build --remote_cache=grpcs://cloud.buildbuddy.io
+    build --bes_backend=grpcs://remote.buildbuddy.io
+    build --remote_cache=grpcs://remote.buildbuddy.io
     build --remote_timeout=3600
     build --remote_header=${apiKey}
   `;
diff --git a/packages/kbn-pm/src/utils/convert_plugin_id_to_package_id.ts b/packages/kbn-pm/src/utils/convert_plugin_id_to_package_id.ts
new file mode 100644
index 0000000000000..613ab6abc3a6f
--- /dev/null
+++ b/packages/kbn-pm/src/utils/convert_plugin_id_to_package_id.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export function convertPluginIdToPackageId(pluginId: string) {
+  if (pluginId === 'core') {
+    // core is the only non-plugin
+    return `@kbn/core`;
+  }
+
+  return `@kbn/${pluginId
+    .split('')
+    .flatMap((c) => (c.toUpperCase() === c ? `-${c.toLowerCase()}` : c))
+    .join('')}-plugin`
+    .replace(/-\w(-\w)+-/g, (match) => `-${match.split('-').join('')}-`)
+    .replace(/-plugin-plugin$/, '-plugin');
+}
diff --git a/packages/kbn-pm/src/utils/regenerate_base_tsconfig.ts b/packages/kbn-pm/src/utils/regenerate_base_tsconfig.ts
new file mode 100644
index 0000000000000..48a7735937e92
--- /dev/null
+++ b/packages/kbn-pm/src/utils/regenerate_base_tsconfig.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs/promises';
+import Path from 'path';
+
+import { KibanaPlatformPlugin } from '@kbn/plugin-discovery';
+import { convertPluginIdToPackageId } from './convert_plugin_id_to_package_id';
+
+export async function regenerateBaseTsconfig(plugins: KibanaPlatformPlugin[], repoRoot: string) {
+  const tsconfigPath = Path.resolve(repoRoot, 'tsconfig.base.json');
+  const lines = (await Fs.readFile(tsconfigPath, 'utf-8')).split('\n');
+
+  const packageMap = plugins
+    .slice()
+    .sort((a, b) => a.manifestPath.localeCompare(b.manifestPath))
+    .flatMap((p) => {
+      const id = convertPluginIdToPackageId(p.manifest.id);
+      const path = Path.relative(repoRoot, p.directory);
+      return [`      "${id}": ["${path}"],`, `      "${id}/*": ["${path}/*"],`];
+    });
+
+  const start = lines.findIndex((l) => l.trim() === '// START AUTOMATED PACKAGE LISTING');
+  const end = lines.findIndex((l) => l.trim() === '// END AUTOMATED PACKAGE LISTING');
+
+  await Fs.writeFile(
+    tsconfigPath,
+    [...lines.slice(0, start + 1), ...packageMap, ...lines.slice(end)].join('\n')
+  );
+}
diff --git a/packages/kbn-pm/src/utils/sort_package_json.ts b/packages/kbn-pm/src/utils/regenerate_package_json.ts
similarity index 50%
rename from packages/kbn-pm/src/utils/sort_package_json.ts
rename to packages/kbn-pm/src/utils/regenerate_package_json.ts
index 84a1ed6d80960..88460132df2a6 100644
--- a/packages/kbn-pm/src/utils/sort_package_json.ts
+++ b/packages/kbn-pm/src/utils/regenerate_package_json.ts
@@ -6,11 +6,13 @@
  * Side Public License, v 1.
  */
 
-import Fs from 'fs/promises';
-import { sortPackageJson as sort } from '@kbn/dev-utils/sort_package_json';
-import { Kibana } from './kibana';
+import Fsp from 'fs/promises';
+import Path from 'path';
 
-export async function sortPackageJson(kbn: Kibana) {
-  const packageJsonPath = kbn.getAbsolute('package.json');
-  await Fs.writeFile(packageJsonPath, sort(await Fs.readFile(packageJsonPath, 'utf-8')));
+import { sortPackageJson } from '@kbn/dev-utils/sort_package_json';
+
+export async function regeneratePackageJson(rootPath: string) {
+  const path = Path.resolve(rootPath, 'package.json');
+  const json = await Fsp.readFile(path, 'utf8');
+  await Fsp.writeFile(path, sortPackageJson(json));
 }
diff --git a/packages/kbn-pm/src/utils/regenerate_synthetic_package_map.ts b/packages/kbn-pm/src/utils/regenerate_synthetic_package_map.ts
new file mode 100644
index 0000000000000..c502e11f1a3c8
--- /dev/null
+++ b/packages/kbn-pm/src/utils/regenerate_synthetic_package_map.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Fs from 'fs/promises';
+import Path from 'path';
+
+import normalizePath from 'normalize-path';
+import { KibanaPlatformPlugin } from '@kbn/plugin-discovery';
+import { convertPluginIdToPackageId } from './convert_plugin_id_to_package_id';
+
+export async function regenerateSyntheticPackageMap(
+  plugins: KibanaPlatformPlugin[],
+  repoRoot: string
+) {
+  const entries: Array<[string, string]> = [['@kbn/core', 'src/core']];
+
+  for (const plugin of plugins) {
+    entries.push([
+      convertPluginIdToPackageId(plugin.manifest.id),
+      normalizePath(Path.relative(repoRoot, plugin.directory)),
+    ]);
+  }
+
+  await Fs.writeFile(
+    Path.resolve(repoRoot, 'packages/kbn-synthetic-package-map/synthetic-packages.json'),
+    JSON.stringify(entries, null, 2)
+  );
+}
diff --git a/packages/kbn-pm/src/utils/watch.test.ts b/packages/kbn-pm/src/utils/watch.test.ts
deleted file mode 100644
index e310557cf209f..0000000000000
--- a/packages/kbn-pm/src/utils/watch.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { EventEmitter } from 'events';
-import { waitUntilWatchIsReady } from './watch';
-
-describe('#waitUntilWatchIsReady', () => {
-  let buildOutputStream: EventEmitter;
-  let completionHintPromise: Promise<string>;
-  beforeEach(() => {
-    jest.useFakeTimers();
-
-    buildOutputStream = new EventEmitter();
-    completionHintPromise = waitUntilWatchIsReady(buildOutputStream, {
-      handlerDelay: 100,
-      handlerReadinessTimeout: 50,
-    });
-  });
-
-  test('`waitUntilWatchIsReady` correctly handles `webpack` output', async () => {
-    buildOutputStream.emit('data', Buffer.from('$ webpack'));
-    buildOutputStream.emit('data', Buffer.from('Chunk Names'));
-
-    jest.runAllTimers();
-
-    expect(await completionHintPromise).toBe('webpack');
-  });
-
-  test('`waitUntilWatchIsReady` correctly handles `tsc` output', async () => {
-    buildOutputStream.emit('data', Buffer.from('$ tsc'));
-    buildOutputStream.emit('data', Buffer.from('Compilation complete.'));
-
-    jest.runAllTimers();
-
-    expect(await completionHintPromise).toBe('tsc');
-  });
-
-  test('`waitUntilWatchIsReady` fallbacks to default output handler if output is not recognizable', async () => {
-    buildOutputStream.emit('data', Buffer.from('$ some-cli'));
-    buildOutputStream.emit('data', Buffer.from('Compilation complete.'));
-    buildOutputStream.emit('data', Buffer.from('Chunk Names.'));
-
-    jest.runAllTimers();
-
-    expect(await completionHintPromise).toBe('timeout');
-  });
-
-  test('`waitUntilWatchIsReady` fallbacks to default output handler if none output is detected', async () => {
-    jest.runAllTimers();
-    expect(await completionHintPromise).toBe('timeout');
-  });
-
-  test('`waitUntilWatchIsReady` fails if output stream receives error', async () => {
-    buildOutputStream.emit('error', new Error('Uh, oh!'));
-
-    jest.runAllTimers();
-
-    await expect(completionHintPromise).rejects.toThrow(/Uh, oh!/);
-  });
-});
diff --git a/packages/kbn-pm/src/utils/watch.ts b/packages/kbn-pm/src/utils/watch.ts
index 70e6aa8dd49c7..0b4b1c2956080 100644
--- a/packages/kbn-pm/src/utils/watch.ts
+++ b/packages/kbn-pm/src/utils/watch.ts
@@ -87,8 +87,8 @@ export function waitUntilWatchIsReady(stream: NodeJS.EventEmitter, opts: IWatchO
   stream.once('error', onErrorListener);
   stream.on('data', onDataListener);
 
-  return Rx.race(getWatchHandlers(buildOutput$, opts))
-    .pipe(
+  return Rx.firstValueFrom(
+    Rx.race(getWatchHandlers(buildOutput$, opts)).pipe(
       mergeMap((whenReady) => whenReady),
       finalize(() => {
         stream.removeListener('data', onDataListener);
@@ -98,5 +98,5 @@ export function waitUntilWatchIsReady(stream: NodeJS.EventEmitter, opts: IWatchO
         buildOutput$.complete();
       })
     )
-    .toPromise();
+  );
 }
diff --git a/packages/kbn-pm/src/utils/yarn_lock.ts b/packages/kbn-pm/src/utils/yarn_lock.ts
index 5c55e7be6230f..ce1e3ddae4843 100644
--- a/packages/kbn-pm/src/utils/yarn_lock.ts
+++ b/packages/kbn-pm/src/utils/yarn_lock.ts
@@ -9,10 +9,10 @@
 // @ts-expect-error published types are worthless
 import { parse as parseLockfile } from '@yarnpkg/lockfile';
 
-import { readFile } from '../utils/fs';
-import { Kibana } from '../utils/kibana';
-import { Project } from '../utils/project';
-import { Log } from '../utils/log';
+import { readFile } from './fs';
+import { Kibana } from './kibana';
+import { Project } from './project';
+import { Log } from './log';
 
 export interface YarnLock {
   /** a simple map of name@versionrange tags to metadata about a package */
diff --git a/packages/kbn-pm/webpack.config.js b/packages/kbn-pm/webpack.config.js
index bb71aa9717f16..73431203ecb77 100644
--- a/packages/kbn-pm/webpack.config.js
+++ b/packages/kbn-pm/webpack.config.js
@@ -86,4 +86,12 @@ module.exports = {
   watchOptions: {
     ignored: [/node_modules/, /vendor/],
   },
+
+  optimization: {
+    moduleIds: 'named',
+    nodeEnv: 'production',
+    usedExports: true,
+    sideEffects: true,
+    minimize: false,
+  },
 };
diff --git a/packages/kbn-react-field/src/field_icon/__snapshots__/field_icon.test.tsx.snap b/packages/kbn-react-field/src/field_icon/__snapshots__/field_icon.test.tsx.snap
index cd81705dd3c19..7328e2c61b961 100644
--- a/packages/kbn-react-field/src/field_icon/__snapshots__/field_icon.test.tsx.snap
+++ b/packages/kbn-react-field/src/field_icon/__snapshots__/field_icon.test.tsx.snap
@@ -139,7 +139,7 @@ exports[`FieldIcon renders known field types murmur3 is rendered 1`] = `
 <EuiToken
   aria-label="murmur3"
   className="kbnFieldIcon"
-  iconType="tokenFile"
+  iconType="tokenSearchType"
   size="s"
   title="murmur3"
 />
diff --git a/packages/kbn-react-field/src/field_icon/field_icon.tsx b/packages/kbn-react-field/src/field_icon/field_icon.tsx
index be62a8df60274..621b8d0199d04 100644
--- a/packages/kbn-react-field/src/field_icon/field_icon.tsx
+++ b/packages/kbn-react-field/src/field_icon/field_icon.tsx
@@ -46,7 +46,7 @@ export const typeToEuiIconMap: Partial<Record<string, EuiTokenProps>> = {
   ip: { iconType: 'tokenIP' },
   ip_range: { iconType: 'tokenIP' },
   // is a plugin's data type https://www.elastic.co/guide/en/elasticsearch/plugins/current/mapper-murmur3-usage.html
-  murmur3: { iconType: 'tokenFile' },
+  murmur3: { iconType: 'tokenSearchType' },
   number: { iconType: 'tokenNumber' },
   number_range: { iconType: 'tokenNumber' },
   histogram: { iconType: 'tokenHistogram' },
diff --git a/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts b/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts
index 8584edfabeebd..b232e2b6fc521 100644
--- a/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts
+++ b/packages/kbn-securitysolution-io-ts-list-types/src/common/default_import_comments_array/index.test.ts
@@ -10,7 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { left } from 'fp-ts/lib/Either';
 import { foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils';
 import { ImportCommentsArray } from '../import_comment';
-import { DefaultImportCommentsArray } from '../default_import_comments_array';
+import { DefaultImportCommentsArray } from '.';
 import { getCommentsArrayMock } from '../comment/index.mock';
 import { getCreateCommentsArrayMock } from '../create_comment/index.mock';
 
diff --git a/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts b/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts
index 842e046ea67ee..36b92cb288669 100644
--- a/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts
+++ b/packages/kbn-securitysolution-io-ts-list-types/src/common/endpoint/entry_match_wildcard/index.mock.ts
@@ -7,7 +7,7 @@
  */
 
 import { ENTRY_VALUE, FIELD, OPERATOR, WILDCARD } from '../../../constants/index.mock';
-import { EndpointEntryMatchWildcard } from './index';
+import { EndpointEntryMatchWildcard } from '.';
 
 export const getEndpointEntryMatchWildcardMock = (): EndpointEntryMatchWildcard => ({
   field: FIELD,
diff --git a/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts b/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts
index fd7b12123b6bb..c5b12610bb409 100644
--- a/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts
+++ b/packages/kbn-securitysolution-io-ts-types/src/default_version_number/index.test.ts
@@ -8,7 +8,7 @@
 
 import { pipe } from 'fp-ts/lib/pipeable';
 import { left } from 'fp-ts/lib/Either';
-import { DefaultVersionNumber } from '../default_version_number';
+import { DefaultVersionNumber } from '.';
 import { foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils';
 
 describe('default_version_number', () => {
diff --git a/packages/kbn-securitysolution-list-utils/src/helpers/index.ts b/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
index eabf8dfa33f98..470e15db0404e 100644
--- a/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
+++ b/packages/kbn-securitysolution-list-utils/src/helpers/index.ts
@@ -701,7 +701,7 @@ export const getOperatorOptions = (
  * to find it's corresponding keyword type (if available) which does
  * generate autocomplete values
  *
- * @param fields IFieldType fields
+ * @param fields DataViewFieldBase fields
  * @param selectedField the field name that was selected
  * @param isTextType we only want a corresponding keyword field if
  * the selected field is of type 'text'
diff --git a/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
index bb4fc47ce0370..14f6201cc8283 100644
--- a/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
+++ b/packages/kbn-securitysolution-utils/src/transform_data_to_ndjson/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { transformDataToNdjson } from './';
+import { transformDataToNdjson } from '.';
 
 export const ANCHOR_DATE = '2020-02-20T03:57:54.037Z';
 
diff --git a/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx b/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
index 129bbbf3b202d..001efa143b1cc 100644
--- a/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
+++ b/packages/kbn-shared-ux-components/src/empty_state/assets/index.tsx
@@ -13,7 +13,7 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import { withSuspense } from '@kbn/shared-ux-utility';
 
 export const LazyDataViewIllustration = React.lazy(() =>
-  import('../assets/data_view_illustration').then(({ DataViewIllustration }) => ({
+  import('./data_view_illustration').then(({ DataViewIllustration }) => ({
     default: DataViewIllustration,
   }))
 );
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap b/packages/kbn-shared-ux-components/src/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
deleted file mode 100644
index 5f37bccd3985c..0000000000000
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
+++ /dev/null
@@ -1,150 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ExitFullScreenButton /> is rendered 1`] = `
-<SharedUxServicesProvider
-  application={
-    Object {
-      "currentAppId$": Observable {
-        "_isScalar": false,
-      },
-      "navigateToUrl": [Function],
-    }
-  }
-  docLinks={
-    Object {
-      "dataViewsDocLink": "dummy link",
-    }
-  }
-  editors={
-    Object {
-      "openDataViewEditor": [MockFunction],
-    }
-  }
-  http={
-    Object {
-      "addBasePath": [MockFunction],
-    }
-  }
-  permissions={
-    Object {
-      "canAccessFleet": true,
-      "canCreateNewDataView": true,
-    }
-  }
-  platform={
-    Object {
-      "setIsFullscreen": [MockFunction] {
-        "calls": Array [
-          Array [
-            false,
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      },
-    }
-  }
->
-  <ExitFullScreenButton
-    onExit={[MockFunction]}
-  >
-    <ExitFullScreenButton
-      css={
-        Object {
-          "map": undefined,
-          "name": "knjqgf",
-          "next": undefined,
-          "styles": "
-    bottom: 8px;
-    left: 8px;
-    position: fixed;
-    z-index: 5;
-  ",
-          "toString": [Function],
-        }
-      }
-      onClick={[Function]}
-    >
-      <div>
-        <EuiScreenReaderOnly>
-          <p
-            aria-live="polite"
-            className="euiScreenReaderOnly"
-          >
-            In full screen mode, press ESC to exit.
-          </p>
-        </EuiScreenReaderOnly>
-        <button
-          className="exitFullScreenButton"
-          data-test-subj="exitFullScreenModeButton"
-          onClick={[Function]}
-        >
-          <EuiFlexGroup
-            alignItems="center"
-            component="span"
-            gutterSize="s"
-            responsive={false}
-          >
-            <span
-              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-            >
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="m"
-                    type="logoElastic"
-                  >
-                    <span
-                      data-euiicon-type="logoElastic"
-                      size="m"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                data-test-subj="exitFullScreenModeText"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                  data-test-subj="exitFullScreenModeText"
-                >
-                  Exit full screen
-                </span>
-              </EuiFlexItem>
-              <EuiFlexItem
-                component="span"
-                grow={false}
-              >
-                <span
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiIcon
-                    size="s"
-                    type="fullScreenExit"
-                  >
-                    <span
-                      data-euiicon-type="fullScreenExit"
-                      size="s"
-                    />
-                  </EuiIcon>
-                </span>
-              </EuiFlexItem>
-            </span>
-          </EuiFlexGroup>
-        </button>
-      </div>
-    </ExitFullScreenButton>
-  </ExitFullScreenButton>
-</SharedUxServicesProvider>
-`;
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.mdx b/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.mdx
deleted file mode 100644
index 82f1eb0fde1ba..0000000000000
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.mdx
+++ /dev/null
@@ -1,20 +0,0 @@
----
-id: sharedUX/Components/ExitFullScreenButton
-slug: /shared-ux/components/exit-full-screen-button
-title: Exit Full Screen Button
-summary: A button that floats over the plugin workspace and allows one to exit "full screen" mode.
-tags: ['shared-ux', 'component']
-date: 2021-12-28
----
-
-> This documentation is in-progress.
-
-When a plugin moves to "full screen" mode, the Kibana Chrome can be hidden entirely.  This button floats over the plugin workspace and allows someone to exit full screen mode and restore the Kibana Chrome.
-
-The pure component, `exit_full_screen_button.tsx`, contains the base styles and behaviors.
-
-The connected component, `exit_full_screen_button.tsx`, uses services from the `shared_ux` plugin to show and hide the Kibana chrome.  You must wrap your plugin app in the `ServicesContext` provided by the start contract of the `shared_ux` plugin to use it.
-
-This component is provided with `React.lazy` to avoid bundle bloat.
-
-This component is not currently eligible for promotion to EUI.
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.test.tsx b/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.test.tsx
deleted file mode 100644
index da205ddfbe377..0000000000000
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.test.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import React from 'react';
-import { mount as enzymeMount, ReactWrapper } from 'enzyme';
-import { keys } from '@elastic/eui';
-
-import {
-  SharedUxServicesProvider,
-  SharedUxServices,
-  mockServicesFactory,
-} from '@kbn/shared-ux-services';
-import { ExitFullScreenButton } from './exit_full_screen_button';
-
-describe('<ExitFullScreenButton />', () => {
-  let services: SharedUxServices;
-  let mount: (element: JSX.Element) => ReactWrapper;
-
-  beforeEach(() => {
-    services = mockServicesFactory();
-    mount = (element: JSX.Element) =>
-      enzymeMount(<SharedUxServicesProvider {...services}>{element}</SharedUxServicesProvider>);
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  test('is rendered', () => {
-    const component = mount(<ExitFullScreenButton onExit={jest.fn()} />);
-
-    expect(component).toMatchSnapshot();
-  });
-
-  test('passing `false` to toggleChrome does not toggle chrome', () => {
-    const component = mount(<ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />);
-    expect(services.platform.setIsFullscreen).toHaveBeenCalledTimes(0);
-    component.unmount();
-    expect(services.platform.setIsFullscreen).toHaveBeenCalledTimes(0);
-  });
-
-  describe('onExit', () => {
-    const onExitHandler = jest.fn();
-    let component: ReactWrapper;
-
-    beforeEach(() => {
-      component = mount(<ExitFullScreenButton onExit={onExitHandler} toggleChrome={true} />);
-    });
-
-    test('is called when the button is pressed', () => {
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(false);
-
-      component.find('button').simulate('click');
-
-      expect(onExitHandler).toHaveBeenCalledTimes(1);
-
-      component.unmount();
-
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(true);
-    });
-
-    test('is called when the ESC key is pressed', () => {
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(false);
-
-      const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
-      document.dispatchEvent(escapeKeyEvent);
-
-      expect(onExitHandler).toHaveBeenCalledTimes(1);
-
-      component.unmount();
-
-      expect(services.platform.setIsFullscreen).toHaveBeenLastCalledWith(true);
-    });
-  });
-});
diff --git a/packages/kbn-shared-ux-components/src/index.ts b/packages/kbn-shared-ux-components/src/index.ts
index e6e72b23c3d17..98bd3ad1ac7e9 100644
--- a/packages/kbn-shared-ux-components/src/index.ts
+++ b/packages/kbn-shared-ux-components/src/index.ts
@@ -9,31 +9,14 @@
 import React from 'react';
 import { withSuspense } from '@kbn/shared-ux-utility';
 
-/**
- * The Lazily-loaded `ExitFullScreenButton` component.  Consumers should use `React.Suspense` or the
- * `withSuspense` HOC to load this component.
- */
-export const LazyExitFullScreenButton = React.lazy(() =>
-  import('./exit_full_screen_button').then(({ ExitFullScreenButton }) => ({
-    default: ExitFullScreenButton,
-  }))
-);
-
 export const LazyToolbarButton = React.lazy(() =>
-  import('./toolbar/index').then(({ ToolbarButton }) => ({
+  import('./toolbar').then(({ ToolbarButton }) => ({
     default: ToolbarButton,
   }))
 );
 
 export const RedirectAppLinks = React.lazy(() => import('./redirect_app_links'));
 
-/**
- * A `ExitFullScreenButton` component that is wrapped by the `withSuspense` HOC.  This component can
- * be used directly by consumers and will load the `LazyExitFullScreenButton` component lazily with
- * a predefined fallback and error boundary.
- */
-export const ExitFullScreenButton = withSuspense(LazyExitFullScreenButton);
-
 /**
  * A `ToolbarButton` component that is wrapped by the `withSuspense` HOC.  This component can
  * be used directly by consumers and will load the `LazyToolbarButton` component lazily with
@@ -85,7 +68,7 @@ export const NoDataViewsComponent = withSuspense(LazyNoDataViewsComponent);
  * `withSuspense` HOC to load this component.
  */
 export const LazyIconButtonGroup = React.lazy(() =>
-  import('./toolbar/index').then(({ IconButtonGroup }) => ({
+  import('./toolbar').then(({ IconButtonGroup }) => ({
     default: IconButtonGroup,
   }))
 );
diff --git a/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.component.test.tsx.snap b/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.component.test.tsx.snap
index 95cacc3a0db4a..79fce9de0feec 100644
--- a/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.component.test.tsx.snap
+++ b/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.component.test.tsx.snap
@@ -4,10 +4,9 @@ exports[`ElasticAgentCardComponent props button 1`] = `
 <RedirectAppLinks
   currentAppId$={
     Observable {
-      "_isScalar": false,
       "source": Subject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
@@ -30,10 +29,9 @@ exports[`ElasticAgentCardComponent props href 1`] = `
 <RedirectAppLinks
   currentAppId$={
     Observable {
-      "_isScalar": false,
       "source": Subject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
@@ -56,10 +54,9 @@ exports[`ElasticAgentCardComponent renders 1`] = `
 <RedirectAppLinks
   currentAppId$={
     Observable {
-      "_isScalar": false,
       "source": Subject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
@@ -81,10 +78,9 @@ exports[`ElasticAgentCardComponent renders with canAccessFleet false 1`] = `
 <RedirectAppLinks
   currentAppId$={
     Observable {
-      "_isScalar": false,
       "source": Subject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
diff --git a/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap b/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap
index 828955b8489dd..cac139bbb9035 100644
--- a/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap
+++ b/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/elastic_agent_card.test.tsx.snap
@@ -1,17 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ElasticAgentCard renders 1`] = `
-.emotion-0 {
-  max-width: 400px;
-  margin-inline: auto;
-}
-
 <SharedUxServicesProvider
   application={
     Object {
-      "currentAppId$": Observable {
-        "_isScalar": false,
-      },
+      "currentAppId$": Observable {},
       "navigateToUrl": [Function],
     }
   }
@@ -147,20 +140,12 @@ exports[`ElasticAgentCard renders 1`] = `
   <ElasticAgentCard>
     <ElasticAgentCardComponent
       canAccessFleet={true}
-      currentAppId$={
-        Observable {
-          "_isScalar": false,
-        }
-      }
+      currentAppId$={Observable {}}
       href="/app/integrations/browse"
       navigateToUrl={[Function]}
     >
       <RedirectAppLinks
-        currentAppId$={
-          Observable {
-            "_isScalar": false,
-          }
-        }
+        currentAppId$={Observable {}}
         navigateToUrl={[Function]}
       >
         <div>
@@ -197,15 +182,73 @@ exports[`ElasticAgentCard renders 1`] = `
                 onClick={[Function]}
                 paddingSize="l"
               >
+                <Insertion
+                  cache={
+                    Object {
+                      "insert": [Function],
+                      "inserted": Object {
+                        "1hu4pg0-EuiCard": true,
+                      },
+                      "key": "css",
+                      "nonce": undefined,
+                      "registered": Object {
+                        "css-1hu4pg0-EuiCard": "max-width:400px;margin-inline:auto;;label:EuiCard;",
+                      },
+                      "sheet": StyleSheet {
+                        "_alreadyInsertedOrderInsensitiveRule": true,
+                        "_insertTag": [Function],
+                        "before": null,
+                        "container": <head>
+                          <style
+                            data-emotion="css"
+                            data-s=""
+                          >
+                            
+                            .css-1hu4pg0-EuiCard{max-width:400px;margin-inline:auto;}
+                          </style>
+                          <style
+                            data-styled="active"
+                            data-styled-version="5.1.0"
+                          />
+                        </head>,
+                        "ctr": 1,
+                        "insertionPoint": undefined,
+                        "isSpeedy": false,
+                        "key": "css",
+                        "nonce": undefined,
+                        "prepend": undefined,
+                        "tags": Array [
+                          <style
+                            data-emotion="css"
+                            data-s=""
+                          >
+                            
+                            .css-1hu4pg0-EuiCard{max-width:400px;margin-inline:auto;}
+                          </style>,
+                        ],
+                      },
+                    }
+                  }
+                  isStringTag={false}
+                  serialized={
+                    Object {
+                      "map": undefined,
+                      "name": "1hu4pg0-EuiCard",
+                      "next": undefined,
+                      "styles": "max-width:400px;margin-inline:auto;;label:EuiCard;",
+                      "toString": [Function],
+                    }
+                  }
+                />
                 <EuiPanel
-                  className="euiCard euiCard--centerAligned euiCard--isClickable emotion-0"
+                  className="euiCard euiCard--centerAligned euiCard--isClickable css-1hu4pg0-EuiCard"
                   element="div"
                   hasShadow={true}
                   onClick={[Function]}
                   paddingSize="l"
                 >
                   <div
-                    className="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--isClickable euiCard euiCard--centerAligned euiCard--isClickable emotion-0"
+                    className="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--isClickable euiCard euiCard--centerAligned euiCard--isClickable css-1hu4pg0-EuiCard"
                     onClick={[Function]}
                   >
                     <div
diff --git a/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap b/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
index 7b3a25ef737f8..47a4bf4687b38 100644
--- a/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
+++ b/packages/kbn-shared-ux-components/src/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
@@ -1,13 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`NoDataCard props button 1`] = `
-.emotion-0 {
-  max-width: 400px;
-  margin-inline: auto;
-}
-
 <div
-  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiCard euiCard--centerAligned emotion-0"
+  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiCard euiCard--centerAligned css-1hu4pg0-EuiCard"
 >
   <div
     class="euiCard__content"
@@ -49,13 +44,8 @@ exports[`NoDataCard props button 1`] = `
 `;
 
 exports[`NoDataCard props extends EuiCardProps 1`] = `
-.emotion-0 {
-  max-width: 400px;
-  margin-inline: auto;
-}
-
 <div
-  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiCard euiCard--centerAligned custom_class emotion-0"
+  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiCard euiCard--centerAligned custom_class css-1hu4pg0-EuiCard"
 >
   <div
     class="euiCard__content"
@@ -97,13 +87,8 @@ exports[`NoDataCard props extends EuiCardProps 1`] = `
 `;
 
 exports[`NoDataCard props href 1`] = `
-.emotion-0 {
-  max-width: 400px;
-  margin-inline: auto;
-}
-
 <div
-  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--isClickable euiCard euiCard--centerAligned euiCard--isClickable emotion-0"
+  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--isClickable euiCard euiCard--centerAligned euiCard--isClickable css-1hu4pg0-EuiCard"
 >
   <div
     class="euiCard__content"
@@ -152,13 +137,8 @@ exports[`NoDataCard props href 1`] = `
 `;
 
 exports[`NoDataCard props isDisabled 1`] = `
-.emotion-0 {
-  max-width: 400px;
-  margin-inline: auto;
-}
-
 <div
-  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiCard euiCard--centerAligned euiCard-isDisabled emotion-0"
+  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiCard euiCard--centerAligned euiCard-isDisabled css-1hu4pg0-EuiCard"
 >
   <div
     class="euiCard__content"
@@ -188,13 +168,8 @@ exports[`NoDataCard props isDisabled 1`] = `
 `;
 
 exports[`NoDataCard renders 1`] = `
-.emotion-0 {
-  max-width: 400px;
-  margin-inline: auto;
-}
-
 <div
-  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiCard euiCard--centerAligned emotion-0"
+  class="euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiCard euiCard--centerAligned css-1hu4pg0-EuiCard"
 >
   <div
     class="euiCard__content"
diff --git a/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap b/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap
index b49efda2a1cf7..60a49e521ab07 100644
--- a/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap
+++ b/packages/kbn-shared-ux-components/src/toolbar/buttons/icon_button_group/__snapshots__/icon_button_group.test.tsx.snap
@@ -1,27 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<IconButtonGroup /> is rendered 1`] = `
-.emotion-0.euiButtonGroupButton {
-  background-color: #FFF;
-  border: 1px solid #D3DAE6!important;
-}
-
-.emotion-0.euiButtonGroupButton:first-of-type {
-  border-top-left-radius: 6px!important;
-  border-bottom-left-radius: 6px!important;
-}
-
-.emotion-0.euiButtonGroupButton:last-of-type {
-  border-top-right-radius: 6px!important;
-  border-bottom-right-radius: 6px!important;
-}
-
 <SharedUxServicesProvider
   application={
     Object {
-      "currentAppId$": Observable {
-        "_isScalar": false,
-      },
+      "currentAppId$": Observable {},
       "navigateToUrl": [Function],
     }
   }
@@ -115,13 +98,14 @@ exports[`<IconButtonGroup /> is rendered 1`] = `
         >
           <EuiButtonGroupButton
             aria-label="Text"
-            className="emotion-0"
             color="text"
+            css="unknown styles"
             element="button"
             iconType="visText"
             id="generated-id0"
             isDisabled={false}
             isIconOnly={true}
+            key="0"
             label="Text"
             name="generated-id"
             onChange={[Function]}
@@ -129,84 +113,201 @@ exports[`<IconButtonGroup /> is rendered 1`] = `
             size="m"
             title="Text"
           >
-            <EuiButtonDisplay
+            <Insertion
+              cache={
+                Object {
+                  "insert": [Function],
+                  "inserted": Object {
+                    "iuv015-EuiButtonGroup": true,
+                  },
+                  "key": "css",
+                  "nonce": undefined,
+                  "registered": Object {
+                    "css-iuv015-EuiButtonGroup": "&.euiButtonGroupButton{background-color:#FFF;border:1px solid #D3DAE6 !important;&:first-of-type{border-top-left-radius:6px !important;border-bottom-left-radius:6px !important;}&:last-of-type{border-top-right-radius:6px !important;border-bottom-right-radius:6px !important;}};;label:EuiButtonGroup;",
+                  },
+                  "sheet": StyleSheet {
+                    "_alreadyInsertedOrderInsensitiveRule": true,
+                    "_insertTag": [Function],
+                    "before": null,
+                    "container": <head>
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup{}
+                      </style>
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup.euiButtonGroupButton{background-color:#FFF;border:1px solid #D3DAE6!important;}
+                      </style>
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup.euiButtonGroupButton:first-of-type{border-top-left-radius:6px!important;border-bottom-left-radius:6px!important;}
+                      </style>
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup.euiButtonGroupButton:last-of-type{border-top-right-radius:6px!important;border-bottom-right-radius:6px!important;}
+                      </style>
+                      <style
+                        data-styled="active"
+                        data-styled-version="5.1.0"
+                      />
+                    </head>,
+                    "ctr": 4,
+                    "insertionPoint": undefined,
+                    "isSpeedy": false,
+                    "key": "css",
+                    "nonce": undefined,
+                    "prepend": undefined,
+                    "tags": Array [
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup{}
+                      </style>,
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup.euiButtonGroupButton{background-color:#FFF;border:1px solid #D3DAE6!important;}
+                      </style>,
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup.euiButtonGroupButton:first-of-type{border-top-left-radius:6px!important;border-bottom-left-radius:6px!important;}
+                      </style>,
+                      <style
+                        data-emotion="css"
+                        data-s=""
+                      >
+                        
+                        .css-iuv015-EuiButtonGroup.euiButtonGroupButton:last-of-type{border-top-right-radius:6px!important;border-bottom-right-radius:6px!important;}
+                      </style>,
+                    ],
+                  },
+                }
+              }
+              isStringTag={false}
+              serialized={
+                Object {
+                  "map": undefined,
+                  "name": "iuv015-EuiButtonGroup",
+                  "next": undefined,
+                  "styles": "&.euiButtonGroupButton{background-color:#FFF;border:1px solid #D3DAE6 !important;&:first-of-type{border-top-left-radius:6px !important;border-bottom-left-radius:6px !important;}&:last-of-type{border-top-right-radius:6px !important;border-bottom-right-radius:6px !important;}};;label:EuiButtonGroup;",
+                  "toString": [Function],
+                }
+              }
+            />
+            <EuiButtonGroupButton
               aria-label="Text"
-              baseClassName="euiButtonGroupButton"
-              className="euiButtonGroupButton-isIconOnly emotion-0"
+              className="css-iuv015-EuiButtonGroup"
               color="text"
-              data-test-subj="generated-id0"
               element="button"
-              fill={false}
               iconType="visText"
-              id="generated-id"
+              id="generated-id0"
               isDisabled={false}
-              isSelected={false}
+              isIconOnly={true}
+              label="Text"
+              name="generated-id"
+              onChange={[Function]}
               onClick={[MockFunction]}
               size="m"
-              textProps={
-                Object {
-                  "className": "euiScreenReaderOnly",
-                  "data-text": "Text",
-                  "ref": [Function],
-                }
-              }
               title="Text"
-              type="button"
             >
-              <button
+              <EuiButtonDisplay
                 aria-label="Text"
-                aria-pressed={false}
-                className="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton-isIconOnly emotion-0"
+                baseClassName="euiButtonGroupButton"
+                className="euiButtonGroupButton-isIconOnly css-iuv015-EuiButtonGroup"
+                color="text"
                 data-test-subj="generated-id0"
-                disabled={false}
+                element="button"
+                fill={false}
+                iconType="visText"
                 id="generated-id"
+                isDisabled={false}
+                isSelected={false}
                 onClick={[MockFunction]}
-                style={
+                size="m"
+                textProps={
                   Object {
-                    "minWidth": undefined,
+                    "className": "euiScreenReaderOnly",
+                    "data-text": "Text",
+                    "ref": [Function],
                   }
                 }
                 title="Text"
                 type="button"
               >
-                <EuiButtonContent
-                  className="euiButton__content"
-                  iconSide="left"
-                  iconType="visText"
-                  textProps={
+                <button
+                  aria-label="Text"
+                  aria-pressed={false}
+                  className="euiButtonGroupButton euiButtonGroupButton--text euiButtonGroupButton-isIconOnly css-iuv015-EuiButtonGroup"
+                  data-test-subj="generated-id0"
+                  disabled={false}
+                  id="generated-id"
+                  onClick={[MockFunction]}
+                  style={
                     Object {
-                      "className": "euiButton__text euiScreenReaderOnly",
-                      "data-text": "Text",
-                      "ref": [Function],
+                      "minWidth": undefined,
                     }
                   }
+                  title="Text"
+                  type="button"
                 >
-                  <span
-                    className="euiButtonContent euiButton__content"
+                  <EuiButtonContent
+                    className="euiButton__content"
+                    iconSide="left"
+                    iconType="visText"
+                    textProps={
+                      Object {
+                        "className": "euiButton__text euiScreenReaderOnly",
+                        "data-text": "Text",
+                        "ref": [Function],
+                      }
+                    }
                   >
-                    <EuiIcon
-                      className="euiButtonContent__icon"
-                      color="inherit"
-                      size="m"
-                      type="visText"
+                    <span
+                      className="euiButtonContent euiButton__content"
                     >
-                      <span
+                      <EuiIcon
                         className="euiButtonContent__icon"
                         color="inherit"
-                        data-euiicon-type="visText"
                         size="m"
-                      />
-                    </EuiIcon>
-                    <span
-                      className="euiButton__text euiScreenReaderOnly"
-                      data-text="Text"
-                    >
-                      Text
+                        type="visText"
+                      >
+                        <span
+                          className="euiButtonContent__icon"
+                          color="inherit"
+                          data-euiicon-type="visText"
+                          size="m"
+                        />
+                      </EuiIcon>
+                      <span
+                        className="euiButton__text euiScreenReaderOnly"
+                        data-text="Text"
+                      >
+                        Text
+                      </span>
                     </span>
-                  </span>
-                </EuiButtonContent>
-              </button>
-            </EuiButtonDisplay>
+                  </EuiButtonContent>
+                </button>
+              </EuiButtonDisplay>
+            </EuiButtonGroupButton>
           </EuiButtonGroupButton>
         </div>
       </fieldset>
diff --git a/packages/kbn-shared-ux-components/src/toolbar/buttons/primary/__snapshots__/primary.test.tsx.snap b/packages/kbn-shared-ux-components/src/toolbar/buttons/primary/__snapshots__/primary.test.tsx.snap
index 7f50690aba8a6..8b7b51f228740 100644
--- a/packages/kbn-shared-ux-components/src/toolbar/buttons/primary/__snapshots__/primary.test.tsx.snap
+++ b/packages/kbn-shared-ux-components/src/toolbar/buttons/primary/__snapshots__/primary.test.tsx.snap
@@ -4,9 +4,7 @@ exports[`<ToolbarButton /> is rendered 1`] = `
 <SharedUxServicesProvider
   application={
     Object {
-      "currentAppId$": Observable {
-        "_isScalar": false,
-      },
+      "currentAppId$": Observable {},
       "navigateToUrl": [Function],
     }
   }
diff --git a/packages/kbn-shared-ux-storybook/src/config/main.ts b/packages/kbn-shared-ux-storybook/src/config/main.ts
index 1981ff546c353..ccd0d1e73cba8 100644
--- a/packages/kbn-shared-ux-storybook/src/config/main.ts
+++ b/packages/kbn-shared-ux-storybook/src/config/main.ts
@@ -11,6 +11,7 @@ import { defaultConfig } from '@kbn/storybook';
 module.exports = {
   ...defaultConfig,
   stories: [
+    '../../../shared-ux/**/*.stories.+(tsx|mdx)',
     '../../../kbn-shared-ux*/**/*.stories.+(tsx|mdx)',
     '../../../../src/plugins/shared_ux/**/*.stories.+(tsx|mdx)',
   ],
diff --git a/packages/kbn-spec-to-console/lib/convert.test.js b/packages/kbn-spec-to-console/lib/convert.test.js
index 14cb2dd7b6c04..1d92455168fc5 100644
--- a/packages/kbn-spec-to-console/lib/convert.test.js
+++ b/packages/kbn-spec-to-console/lib/convert.test.js
@@ -8,8 +8,8 @@
 
 const convert = require('./convert');
 
-const clusterHealthSpec = require('./__fixtures__/cluster_health_spec');
-const clusterHealthAutocomplete = require('./__fixtures__/cluster_health_autocomplete');
+const clusterHealthSpec = require('./__fixtures__/cluster_health_spec.json');
+const clusterHealthAutocomplete = require('./__fixtures__/cluster_health_autocomplete.json');
 
 test('convert', () => {
   expect(convert(clusterHealthSpec)).toEqual(clusterHealthAutocomplete);
diff --git a/packages/kbn-spec-to-console/lib/replace_pattern.js b/packages/kbn-spec-to-console/lib/replace_pattern.js
index 4cf96e13c5a0c..3847900a8136c 100644
--- a/packages/kbn-spec-to-console/lib/replace_pattern.js
+++ b/packages/kbn-spec-to-console/lib/replace_pattern.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const map = require('./static/map_interpolation');
+const map = require('./static/map_interpolation.json');
 
 module.exports = (pattern, { brackets, exact } = {}) => {
   let newPattern = pattern;
diff --git a/packages/kbn-std/src/index.ts b/packages/kbn-std/src/index.ts
index 66fb98888444f..a46e0f9ae7480 100644
--- a/packages/kbn-std/src/index.ts
+++ b/packages/kbn-std/src/index.ts
@@ -19,7 +19,6 @@ export { isRelativeUrl, modifyUrl, getUrlOrigin } from './url';
 export { unset } from './unset';
 export { getFlattenedObject } from './get_flattened_object';
 export { ensureNoUnsafeProperties } from './ensure_no_unsafe_properties';
-export * from './rxjs_7';
 export {
   map$,
   mapWithLimit$,
diff --git a/packages/kbn-std/src/iteration/for_each.ts b/packages/kbn-std/src/iteration/for_each.ts
index bd23d2e0e6c11..d5485329328a1 100644
--- a/packages/kbn-std/src/iteration/for_each.ts
+++ b/packages/kbn-std/src/iteration/for_each.ts
@@ -6,9 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { defaultIfEmpty } from 'rxjs/operators';
-
-import { lastValueFrom } from '../rxjs_7';
+import { lastValueFrom, defaultIfEmpty } from 'rxjs';
 import { mapWithLimit$ } from './observable';
 import { IterableInput, AsyncMapFn } from './types';
 
@@ -21,7 +19,7 @@ import { IterableInput, AsyncMapFn } from './types';
  * @param fn Function to call for each item
  */
 export async function asyncForEach<T>(iterable: IterableInput<T>, fn: AsyncMapFn<T, any>) {
-  await lastValueFrom(mapWithLimit$(iterable, Infinity, fn).pipe(defaultIfEmpty()));
+  await lastValueFrom(mapWithLimit$(iterable, Infinity, fn).pipe(defaultIfEmpty(undefined)));
 }
 
 /**
@@ -40,5 +38,5 @@ export async function asyncForEachWithLimit<T>(
   limit: number,
   fn: AsyncMapFn<T, any>
 ) {
-  await lastValueFrom(mapWithLimit$(iterable, limit, fn).pipe(defaultIfEmpty()));
+  await lastValueFrom(mapWithLimit$(iterable, limit, fn).pipe(defaultIfEmpty(undefined)));
 }
diff --git a/packages/kbn-std/src/iteration/map.ts b/packages/kbn-std/src/iteration/map.ts
index 4c8d65df57f37..44765d69e1bd0 100644
--- a/packages/kbn-std/src/iteration/map.ts
+++ b/packages/kbn-std/src/iteration/map.ts
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { from } from 'rxjs';
+import { from, lastValueFrom } from 'rxjs';
 import { toArray } from 'rxjs/operators';
-import { lastValueFrom } from '../rxjs_7';
 
 import { IterableInput, AsyncMapFn, AsyncMapResult } from './types';
 import { mapWithLimit$ } from './observable';
diff --git a/packages/kbn-std/src/iteration/observable.test.ts b/packages/kbn-std/src/iteration/observable.test.ts
index e84750e08148d..b2c5d5d75e07c 100644
--- a/packages/kbn-std/src/iteration/observable.test.ts
+++ b/packages/kbn-std/src/iteration/observable.test.ts
@@ -8,7 +8,6 @@
 
 import * as Rx from 'rxjs';
 import { toArray } from 'rxjs/operators';
-import { lastValueFrom } from '../rxjs_7';
 
 import { map$, mapWithLimit$ } from './observable';
 import { list, sleep, generator } from './test_helpers';
@@ -23,7 +22,7 @@ describe('mapWithLimit$', () => {
     let active = 0;
     const limit = Math.random() > 0.5 ? 20 : 40;
 
-    const results = await lastValueFrom(
+    const results = await Rx.lastValueFrom(
       mapWithLimit$(list(100), limit, async (n) => {
         active += 1;
         if (active > maxConcurrency) {
@@ -50,7 +49,7 @@ describe('mapWithLimit$', () => {
     ['observable', Rx.of(1, 2, 3, 4, 5), [1, 2, 3, 4, 5]] as const,
   ])('works with %p', async (_, iter, expected) => {
     const mock = jest.fn(async (n) => n);
-    const results = await lastValueFrom(mapWithLimit$(iter, 1, mock).pipe(toArray()));
+    const results = await Rx.lastValueFrom(mapWithLimit$(iter, 1, mock).pipe(toArray()));
     expect(results).toEqual(expected);
   });
 });
@@ -60,7 +59,7 @@ describe('map$', () => {
     let maxConcurrency = 0;
     let active = 0;
 
-    const results = await lastValueFrom(
+    const results = await Rx.lastValueFrom(
       map$(list(100), async (n) => {
         active += 1;
         if (active > maxConcurrency) {
diff --git a/packages/kbn-std/src/iteration/types.ts b/packages/kbn-std/src/iteration/types.ts
index 6e0bfd9f22d7f..a36522af5feac 100644
--- a/packages/kbn-std/src/iteration/types.ts
+++ b/packages/kbn-std/src/iteration/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Subscribable } from 'rxjs';
+import { ObservableInput } from 'rxjs';
 
-export type IterableInput<T> = Iterable<T> | Subscribable<T>;
-export type AsyncMapResult<T> = Promise<T> | Subscribable<T>;
+export type IterableInput<T> = Iterable<T> | ObservableInput<T>;
+export type AsyncMapResult<T> = Promise<T> | ObservableInput<T>;
 export type AsyncMapFn<T1, T2> = (item: T1, i: number) => AsyncMapResult<T2>;
diff --git a/packages/kbn-std/src/rxjs_7.test.ts b/packages/kbn-std/src/rxjs_7.test.ts
deleted file mode 100644
index 939f853394aee..0000000000000
--- a/packages/kbn-std/src/rxjs_7.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import * as Rx from 'rxjs';
-
-import { firstValueFrom, lastValueFrom } from './rxjs_7';
-
-// create an empty observable that completes with no notifications
-// after a delay to ensure helpers aren't checking for the EMPTY constant
-function empty() {
-  return new Rx.Observable<never>((subscriber) => {
-    setTimeout(() => {
-      subscriber.complete();
-    }, 0);
-  });
-}
-
-describe('firstValueFrom()', () => {
-  it('resolves to the first value from the observable', async () => {
-    await expect(firstValueFrom(Rx.of(1, 2, 3))).resolves.toBe(1);
-  });
-
-  it('rejects if the observable is empty', async () => {
-    await expect(firstValueFrom(empty())).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"no elements in sequence"`
-    );
-  });
-
-  it('unsubscribes from a source observable that emits synchronously', async () => {
-    const values = [1, 2, 3, 4];
-    let unsubscribed = false;
-    const source = new Rx.Observable<number>((subscriber) => {
-      while (!subscriber.closed && values.length) {
-        subscriber.next(values.shift()!);
-      }
-      unsubscribed = subscriber.closed;
-      subscriber.complete();
-    });
-
-    await expect(firstValueFrom(source)).resolves.toMatchInlineSnapshot(`1`);
-    if (!unsubscribed) {
-      throw new Error('expected source to be unsubscribed');
-    }
-    expect(values).toEqual([2, 3, 4]);
-  });
-
-  it('unsubscribes from the source observable after first async notification', async () => {
-    const values = [1, 2, 3, 4];
-    let unsubscribed = false;
-    const source = new Rx.Observable<number>((subscriber) => {
-      setTimeout(() => {
-        while (!subscriber.closed) {
-          subscriber.next(values.shift()!);
-        }
-        unsubscribed = subscriber.closed;
-      });
-    });
-
-    await expect(firstValueFrom(source)).resolves.toMatchInlineSnapshot(`1`);
-    if (!unsubscribed) {
-      throw new Error('expected source to be unsubscribed');
-    }
-    expect(values).toEqual([2, 3, 4]);
-  });
-});
-
-describe('lastValueFrom()', () => {
-  it('resolves to the last value from the observable', async () => {
-    await expect(lastValueFrom(Rx.of(1, 2, 3))).resolves.toBe(3);
-  });
-
-  it('rejects if the observable is empty', async () => {
-    await expect(lastValueFrom(empty())).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"no elements in sequence"`
-    );
-  });
-});
diff --git a/packages/kbn-std/src/rxjs_7.ts b/packages/kbn-std/src/rxjs_7.ts
deleted file mode 100644
index f31c864de5313..0000000000000
--- a/packages/kbn-std/src/rxjs_7.ts
+++ /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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { Observable } from 'rxjs';
-import { first, last } from 'rxjs/operators';
-
-export function firstValueFrom<T>(source: Observable<T>) {
-  // we can't use SafeSubscriber the same way that RxJS 7 does, so instead we
-  return source.pipe(first()).toPromise();
-}
-
-export function lastValueFrom<T>(source: Observable<T>) {
-  return source.pipe(last()).toPromise();
-}
diff --git a/packages/kbn-storybook/preset.js b/packages/kbn-storybook/preset.js
index 38625a4de800f..8021f28688296 100644
--- a/packages/kbn-storybook/preset.js
+++ b/packages/kbn-storybook/preset.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line
 const webpackConfig = require('./target_node/webpack.config');
 
 module.exports = {
diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts
index 4da3c58688f75..7f4821767cd9c 100644
--- a/packages/kbn-storybook/src/webpack.config.ts
+++ b/packages/kbn-storybook/src/webpack.config.ts
@@ -140,13 +140,13 @@ export default ({ config: storybookConfig }: { config: Configuration }) => {
       const options = (loader.options = { ...(loader.options as Record<string, any>) });
 
       // capture the plugins defined at the root level
-      const plugins: string[] = options.plugins;
+      const plugins: string[] = options.plugins ?? [];
       options.plugins = [];
 
       // move the plugins to the top of the preset array so they will run after the typescript preset
       options.presets = [
         {
-          plugins,
+          plugins: [...plugins, require.resolve('@kbn/babel-plugin-synthetic-packages')],
         },
         ...(options.presets as Preset[]).filter(isDesiredPreset).map((preset) => {
           const tsPreset = getTsPreset(preset);
diff --git a/packages/kbn-synthetic-package-map/BUILD.bazel b/packages/kbn-synthetic-package-map/BUILD.bazel
new file mode 100644
index 0000000000000..6b1d32fcbbb1e
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/BUILD.bazel
@@ -0,0 +1,51 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-synthetic-package-map"
+PKG_REQUIRE_NAME = "@kbn/synthetic-package-map"
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+  "index.js",
+  "index.d.ts",
+  "synthetic-packages.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+]
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS,
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+alias(
+  name = "npm_module_types",
+  actual = ":" + PKG_DIRNAME,
+  visibility = ["//visibility:public"],
+)
diff --git a/test/functional_ccs/ftr_provider_context.ts b/packages/kbn-synthetic-package-map/index.d.ts
similarity index 57%
rename from test/functional_ccs/ftr_provider_context.ts
rename to packages/kbn-synthetic-package-map/index.d.ts
index 8fa82b46ac406..92724eed486b1 100644
--- a/test/functional_ccs/ftr_provider_context.ts
+++ b/packages/kbn-synthetic-package-map/index.d.ts
@@ -6,8 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test';
-import { services } from './services';
-import { pageObjects } from '../functional/page_objects';
+export type PackageMap = Map<string, string>;
 
-export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
+/**
+ * Read the package map from disk
+ */
+export function readPackageMap(): PackageMap;
+/**
+ * Read the package map and calculate a cache key/hash of the package map
+ */
+export function readHashOfPackageMap(): string;
diff --git a/packages/kbn-synthetic-package-map/index.js b/packages/kbn-synthetic-package-map/index.js
new file mode 100644
index 0000000000000..9a9b8c51d90a9
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/index.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+const Fs = require('fs');
+const Path = require('path');
+const Crypto = require('crypto');
+
+const PACKAGE_MAP_PATH = Path.resolve(__dirname, 'synthetic-packages.json');
+
+function readPackageMap() {
+  return new Map(JSON.parse(Fs.readFileSync(PACKAGE_MAP_PATH, 'utf8')));
+}
+
+function readHashOfPackageMap() {
+  return Crypto.createHash('sha256').update(Fs.readFileSync(PACKAGE_MAP_PATH)).digest('hex');
+}
+
+module.exports = {
+  readPackageMap,
+  readHashOfPackageMap,
+};
diff --git a/packages/kbn-synthetic-package-map/package.json b/packages/kbn-synthetic-package-map/package.json
new file mode 100644
index 0000000000000..ae209fdf98db0
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@kbn/synthetic-package-map",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "kibana": {
+    "devOnly": true
+  }
+}
diff --git a/packages/kbn-synthetic-package-map/tsconfig.json b/packages/kbn-synthetic-package-map/tsconfig.json
new file mode 100644
index 0000000000000..7b74a1e555c86
--- /dev/null
+++ b/packages/kbn-synthetic-package-map/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "stripInternal": false,
+    "types": [
+      "node"
+    ]
+  },
+  "include": [
+    "index.d.ts"
+  ]
+}
diff --git a/packages/kbn-telemetry-tools/BUILD.bazel b/packages/kbn-telemetry-tools/BUILD.bazel
index 50336dc44da00..1c9f6113851ff 100644
--- a/packages/kbn-telemetry-tools/BUILD.bazel
+++ b/packages/kbn-telemetry-tools/BUILD.bazel
@@ -31,7 +31,9 @@ NPM_MODULE_EXTRA_FILES = [
 
 RUNTIME_DEPS = [
   "//packages/kbn-dev-utils",
+  "//packages/kbn-eslint-plugin-imports",
   "//packages/kbn-utility-types",
+  "//packages/kbn-utils",
   "@npm//glob",
   "@npm//listr",
   "@npm//normalize-path",
@@ -39,7 +41,9 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/kbn-dev-utils:npm_module_types",
+  "//packages/kbn-eslint-plugin-imports:npm_module_types",
   "//packages/kbn-utility-types:npm_module_types",
+  "//packages/kbn-utils:npm_module_types",
   "@npm//tslib",
   "@npm//@types/glob",
   "@npm//@types/jest",
diff --git a/packages/kbn-telemetry-tools/src/tools/compiler_host.ts b/packages/kbn-telemetry-tools/src/tools/compiler_host.ts
new file mode 100644
index 0000000000000..a49bee64e5642
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/compiler_host.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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Path from 'path';
+
+import ts from 'typescript';
+import { REPO_ROOT } from '@kbn/utils';
+import { ImportResolver } from '@kbn/import-resolver';
+
+function readTsConfigFile(path: string) {
+  const json = ts.readConfigFile(path, ts.sys.readFile);
+
+  if (json.error) {
+    throw new Error(`Unable to load tsconfig file: ${json.error.messageText}`);
+  }
+
+  return json.config;
+}
+
+function loadTsConfigFile(path: string) {
+  return ts.parseJsonConfigFileContent(readTsConfigFile(path) ?? {}, ts.sys, Path.dirname(path));
+}
+
+const baseTsConfig = loadTsConfigFile(Path.resolve(REPO_ROOT, 'tsconfig.base.json'));
+const resolver = ImportResolver.create(REPO_ROOT);
+
+function isTsCompatible(path: string) {
+  const extname = Path.extname(path);
+  return extname === '.ts' || extname === '.tsx' || extname === '.js';
+}
+
+export const compilerHost: ts.CompilerHost = {
+  ...ts.createCompilerHost(baseTsConfig.options),
+
+  resolveModuleNames(moduleNames, sourceFilePath) {
+    const dirname = Path.dirname(sourceFilePath);
+
+    const results: Array<ts.ResolvedModule | undefined> = [];
+
+    for (const req of moduleNames) {
+      const result = resolver.resolve(req, dirname);
+      if (result?.type !== 'file' || !isTsCompatible(result.absolute)) {
+        results.push(undefined);
+      } else {
+        results.push({
+          resolvedFileName: result.absolute,
+          isExternalLibraryImport: !!result.nodeModule,
+        });
+      }
+    }
+
+    return results;
+  },
+};
diff --git a/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts b/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
index 9655b397c8d1d..aa69abc555b18 100644
--- a/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
+++ b/packages/kbn-telemetry-tools/src/tools/extract_collectors.ts
@@ -11,6 +11,7 @@ import * as path from 'path';
 import { parseUsageCollection } from './ts_parser';
 import { globAsync } from './utils';
 import { TelemetryRC } from './config';
+import { compilerHost } from './compiler_host';
 
 export async function getProgramPaths({
   root,
@@ -48,7 +49,7 @@ export async function getProgramPaths({
 }
 
 export function* extractCollectors(fullPaths: string[], tsConfig: any) {
-  const program = ts.createProgram(fullPaths, tsConfig);
+  const program = ts.createProgram(fullPaths, tsConfig, compilerHost);
   program.getTypeChecker();
   const sourceFiles = fullPaths.map((fullPath) => {
     const sourceFile = program.getSourceFile(fullPath);
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
index 3398cd0ae6947..5661db270186c 100644
--- a/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/serializer.test.ts
@@ -10,6 +10,7 @@ import * as ts from 'typescript';
 import * as path from 'path';
 import { getDescriptor, TelemetryKinds } from './serializer';
 import { traverseNodes } from './ts_parser';
+import { compilerHost } from './compiler_host';
 
 export function loadFixtureProgram(fixtureName: string) {
   const fixturePath = path.resolve(
@@ -23,7 +24,7 @@ export function loadFixtureProgram(fixtureName: string) {
   if (!tsConfig) {
     throw new Error('Could not find a valid tsconfig.json.');
   }
-  const program = ts.createProgram([fixturePath], tsConfig as any);
+  const program = ts.createProgram([fixturePath], tsConfig as any, compilerHost);
   const checker = program.getTypeChecker();
   const sourceFile = program.getSourceFile(fixturePath);
   if (!sourceFile) {
diff --git a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
index 4a58e3fc1101b..205ab6594fda6 100644
--- a/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/ts_parser.test.ts
@@ -9,6 +9,7 @@
 import { parseUsageCollection } from './ts_parser';
 import * as ts from 'typescript';
 import * as path from 'path';
+import { compilerHost } from './compiler_host';
 import { parsedWorkingCollector } from './__fixture__/parsed_working_collector';
 import { parsedNestedCollector } from './__fixture__/parsed_nested_collector';
 import { parsedExternallyDefinedCollector } from './__fixture__/parsed_externally_defined_collector';
@@ -30,7 +31,7 @@ export function loadFixtureProgram(fixtureName: string) {
   if (!tsConfig) {
     throw new Error('Could not find a valid tsconfig.json.');
   }
-  const program = ts.createProgram([fixturePath], tsConfig as any);
+  const program = ts.createProgram([fixturePath], tsConfig as any, compilerHost);
   const checker = program.getTypeChecker();
   const sourceFile = program.getSourceFile(fixturePath);
   if (!sourceFile) {
diff --git a/packages/kbn-telemetry-tools/src/tools/utils.ts b/packages/kbn-telemetry-tools/src/tools/utils.ts
index c9526fe7d0403..074f9ff2d5f29 100644
--- a/packages/kbn-telemetry-tools/src/tools/utils.ts
+++ b/packages/kbn-telemetry-tools/src/tools/utils.ts
@@ -154,6 +154,12 @@ export function getResolvedModuleSourceFile(
   importedModuleName: string
 ) {
   const resolvedModule = (originalSource as any).resolvedModules.get(importedModuleName);
+  if (!resolvedModule) {
+    throw new Error(
+      `Import for [${importedModuleName}] in [${originalSource.fileName}] could not be resolved by TypeScript`
+    );
+  }
+
   const resolvedModuleSourceFile = program.getSourceFile(resolvedModule.resolvedFileName);
   if (!resolvedModuleSourceFile) {
     throw new Error(`Unable to find resolved module ${importedModuleName}`);
diff --git a/packages/kbn-test-subj-selector/index.test.js b/packages/kbn-test-subj-selector/index.test.js
index 1243fb8d5eebe..aa23c8d1bd70b 100755
--- a/packages/kbn-test-subj-selector/index.test.js
+++ b/packages/kbn-test-subj-selector/index.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const testSubjSelector = require('./');
+const testSubjSelector = require('.');
 
 describe('testSubjSelector()', function () {
   it('converts subjectSelectors to cssSelectors', function () {
diff --git a/packages/kbn-test/BUILD.bazel b/packages/kbn-test/BUILD.bazel
index 99d8c64c88032..8a7aabdecd61e 100644
--- a/packages/kbn-test/BUILD.bazel
+++ b/packages/kbn-test/BUILD.bazel
@@ -41,6 +41,7 @@ RUNTIME_DEPS = [
     "//packages/kbn-i18n-react",
     "//packages/kbn-std",
     "//packages/kbn-utils",
+    "//packages/kbn-bazel-packages",
     "@npm//@elastic/elasticsearch",
     "@npm//@babel/traverse",
     "@npm//@jest/console",
@@ -83,6 +84,7 @@ TYPES_DEPS = [
   "//packages/kbn-i18n-react:npm_module_types",
   "//packages/kbn-std:npm_module_types",
   "//packages/kbn-utils:npm_module_types",
+  "//packages/kbn-bazel-packages:npm_module_types",
   "@npm//@elastic/elasticsearch",
   "@npm//@jest/console",
   "@npm//@jest/reporters",
diff --git a/packages/kbn-test/jest-preset.js b/packages/kbn-test/jest-preset.js
index fd14c973683f7..6245532b00e44 100644
--- a/packages/kbn-test/jest-preset.js
+++ b/packages/kbn-test/jest-preset.js
@@ -9,6 +9,8 @@
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
 
+const pkgMap = require('@kbn/synthetic-package-map').readPackageMap();
+
 /** @typedef {import("@jest/types").Config.InitialOptions} JestConfig */
 /** @type {JestConfig} */
 module.exports = {
@@ -36,13 +38,17 @@ module.exports = {
     '\\.(css|less|scss)$': '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/style_mock.js',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/file_mock.js',
-    '\\.ace\\.worker.js$':
+    '\\.ace\\.worker$':
       '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/worker_module_mock.js',
-    '\\.editor\\.worker.js$':
+    '\\.editor\\.worker(\\.js)?$':
       '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/worker_module_mock.js',
     '^(!!)?file-loader!': '<rootDir>/node_modules/@kbn/test/target_node/jest/mocks/file_mock.js',
-    '^src/core/(.*)': '<rootDir>/src/core/$1',
-    '^src/plugins/(.*)': '<rootDir>/src/plugins/$1',
+    ...Object.fromEntries(
+      Array.from(pkgMap.entries()).map(([pkgId, repoRelativeDir]) => [
+        `^${pkgId}(/?.*)$`,
+        `<rootDir>/${repoRelativeDir}$1`,
+      ])
+    ),
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@@ -84,7 +90,7 @@ module.exports = {
   snapshotSerializers: [
     '<rootDir>/src/plugins/kibana_react/public/util/test_helpers/react_mount_serializer.ts',
     '<rootDir>/node_modules/enzyme-to-json/serializer',
-    '<rootDir>/node_modules/@emotion/jest/serializer',
+    '<rootDir>/node_modules/@kbn/test/target_node/jest/setup/emotion.js',
   ],
 
   // The test environment that will be used for testing
diff --git a/packages/kbn-test/src/es/test_es_cluster.ts b/packages/kbn-test/src/es/test_es_cluster.ts
index 27f29ce6995a7..b75b7f47e0743 100644
--- a/packages/kbn-test/src/es/test_es_cluster.ts
+++ b/packages/kbn-test/src/es/test_es_cluster.ts
@@ -16,7 +16,7 @@ import type { ToolingLog } from '@kbn/dev-utils';
 import { CI_PARALLEL_PROCESS_PREFIX } from '../ci_parallel_process_prefix';
 import { esTestConfig } from './es_test_config';
 
-import { KIBANA_ROOT } from '../';
+import { KIBANA_ROOT } from '..';
 
 interface TestEsClusterNodesOptions {
   name: string;
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
index e12ffdc8cd616..b9d4ed6ef7b5e 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
@@ -12,16 +12,7 @@ import { createAssignmentProxy } from './assignment_proxy';
 import { wrapFunction } from './wrap_function';
 import { wrapRunnableArgs } from './wrap_runnable_args';
 
-function split(arr, fn) {
-  const a = [];
-  const b = [];
-  for (const i of arr) {
-    (fn(i) ? a : b).push(i);
-  }
-  return [a, b];
-}
-
-export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTags }) {
+export function decorateMochaUi(log, lifecycle, context, { rootTags }) {
   // incremented at the start of each suite, decremented after
   // so that in each non-suite call we can know if we are within
   // a suite, or that when a suite is defined it is within a suite
@@ -63,7 +54,7 @@ export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTa
 
           const relativeFilePath = relative(REPO_ROOT, this.file);
           this._tags = [
-            ...(isDockerGroup ? ['ciGroupDocker', relativeFilePath] : [relativeFilePath]),
+            relativeFilePath,
             // we attach the "root tags" to all the child suites of the root suite, so that if they
             // need to be excluded they can be removed from the root suite without removing the entire
             // root suite
@@ -71,17 +62,7 @@ export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTa
           ];
           this.suiteTag = relativeFilePath; // The tag that uniquely targets this suite/file
           this.tags = (tags) => {
-            const newTags = Array.isArray(tags) ? tags : [tags];
-            const [tagsToAdd, tagsToIgnore] = split(newTags, (t) =>
-              !isDockerGroup ? true : !t.startsWith('ciGroup')
-            );
-
-            if (tagsToIgnore.length) {
-              log.warning(
-                `ignoring ciGroup tags because test is being run by a config using 'dockerServers', tags: ${tagsToIgnore}`
-              );
-            }
-
+            const tagsToAdd = Array.isArray(tags) ? tags : [tags];
             this._tags = [...this._tags, ...tagsToAdd];
           };
           this.onlyEsVersion = (semver) => {
diff --git a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
index ba314e8325a65..879eb8bec8cd0 100644
--- a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
+++ b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.ts
@@ -10,7 +10,7 @@ import { resolve } from 'path';
 import type { ToolingLog } from '@kbn/dev-utils';
 import getPort from 'get-port';
 import { KIBANA_ROOT } from './paths';
-import type { Config } from '../../functional_test_runner/';
+import type { Config } from '../../functional_test_runner';
 import { createTestEsCluster } from '../../es';
 
 interface RunElasticsearchOptions {
diff --git a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
index 9522d9dafd6fd..42766ad3f5a31 100644
--- a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
+++ b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
@@ -12,6 +12,7 @@ import Mustache from 'mustache';
 
 import { run, createFailError } from '@kbn/dev-utils';
 import { REPO_ROOT } from '@kbn/utils';
+import { getAllRepoRelativeBazelPackageDirs } from '@kbn/bazel-packages';
 
 import { JestConfigs, CONFIG_NAMES } from './configs';
 
@@ -34,10 +35,10 @@ const roots: string[] = [
   'x-pack/plugins/security_solution/server',
   'x-pack/plugins/security_solution',
   'x-pack/plugins',
-  'packages',
   'src/plugins',
   'test',
   'src',
+  ...getAllRepoRelativeBazelPackageDirs(),
 ];
 
 export async function runCheckJestConfigsCli() {
diff --git a/packages/kbn-test/src/jest/setup/emotion.js b/packages/kbn-test/src/jest/setup/emotion.js
new file mode 100644
index 0000000000000..dc135f4e56c5a
--- /dev/null
+++ b/packages/kbn-test/src/jest/setup/emotion.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { createSerializer } from '@emotion/jest';
+
+module.exports = createSerializer({
+  classNameReplacer: (className) => className,
+  includeStyles: false,
+});
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
index 02861fcb27fdb..97292b0268bc4 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
@@ -10,7 +10,6 @@ import { inspect } from 'util';
 
 import * as Rx from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
-import { lastValueFrom } from '@kbn/std';
 import { ToolingLog, isAxiosResponseError, createFailError } from '@kbn/dev-utils';
 
 import { KbnClientRequester, uriencode } from './kbn_client_requester';
@@ -83,7 +82,7 @@ interface DeleteObjectsOptions {
 
 async function concurrently<T>(maxConcurrency: number, arr: T[], fn: (item: T) => Promise<void>) {
   if (arr.length) {
-    await lastValueFrom(
+    await Rx.lastValueFrom(
       Rx.from(arr).pipe(mergeMap(async (item) => await fn(item), maxConcurrency))
     );
   }
diff --git a/packages/kbn-test/src/mocha/junit_report_generation.js b/packages/kbn-test/src/mocha/junit_report_generation.js
index f662e9ccccb25..144afa92303dc 100644
--- a/packages/kbn-test/src/mocha/junit_report_generation.js
+++ b/packages/kbn-test/src/mocha/junit_report_generation.js
@@ -15,7 +15,7 @@ import xmlBuilder from 'xmlbuilder';
 import { getUniqueJunitReportPath } from '../report_path';
 
 import { getSnapshotOfRunnableLogs } from './log_cache';
-import { escapeCdata } from '../';
+import { escapeCdata } from '..';
 
 const dateNow = Date.now.bind(Date);
 
diff --git a/packages/kbn-tinymath/src/functions/count.js b/packages/kbn-tinymath/src/functions/count.js
index e91cfa871d58a..aa01e1c25835a 100644
--- a/packages/kbn-tinymath/src/functions/count.js
+++ b/packages/kbn-tinymath/src/functions/count.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { size } = require('./size.js');
+const { size } = require('./size');
 
 /**
  * Returns the length of an array. Alias for size
diff --git a/packages/kbn-tinymath/src/functions/cube.js b/packages/kbn-tinymath/src/functions/cube.js
index 409bb128ba09d..4d6f8cbea6374 100644
--- a/packages/kbn-tinymath/src/functions/cube.js
+++ b/packages/kbn-tinymath/src/functions/cube.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pow } = require('./pow.js');
+const { pow } = require('./pow');
 
 /**
  * Calculates the cube of a number. For arrays, the function will be applied index-wise to each element.
diff --git a/packages/kbn-tinymath/src/functions/log10.js b/packages/kbn-tinymath/src/functions/log10.js
index c8b1f5ac25e5b..68c2ffb2bbd30 100644
--- a/packages/kbn-tinymath/src/functions/log10.js
+++ b/packages/kbn-tinymath/src/functions/log10.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { log } = require('./log.js');
+const { log } = require('./log');
 
 /**
  * Calculates the logarithm base 10 of a number. For arrays, the function will be applied index-wise to each element.
diff --git a/packages/kbn-tinymath/src/functions/mean.js b/packages/kbn-tinymath/src/functions/mean.js
index d9e80a9ac8427..441b90cff2ac3 100644
--- a/packages/kbn-tinymath/src/functions/mean.js
+++ b/packages/kbn-tinymath/src/functions/mean.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { add } = require('./add.js');
+const { add } = require('./add');
 
 /**
  * Finds the mean value of one of more numbers/arrays of numbers into the function. If at least one array of numbers is passed into the function, the function will find the mean by index.
diff --git a/packages/kbn-tinymath/src/functions/range.js b/packages/kbn-tinymath/src/functions/range.js
index a849fef5d04a4..571b179b75b65 100644
--- a/packages/kbn-tinymath/src/functions/range.js
+++ b/packages/kbn-tinymath/src/functions/range.js
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-const { max } = require('./max.js');
-const { min } = require('./min.js');
-const { subtract } = require('./subtract.js');
+const { max } = require('./max');
+const { min } = require('./min');
+const { subtract } = require('./subtract');
 
 /**
  * Finds the range of one of more numbers/arrays of numbers into the function. If at least one array of numbers is passed into the function, the function will find the range by index.
diff --git a/packages/kbn-tinymath/src/functions/square.js b/packages/kbn-tinymath/src/functions/square.js
index fa43b575d2c49..5c285eaee3209 100644
--- a/packages/kbn-tinymath/src/functions/square.js
+++ b/packages/kbn-tinymath/src/functions/square.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pow } = require('./pow.js');
+const { pow } = require('./pow');
 
 /**
  * Calculates the square of a number. For arrays, the function will be applied index-wise to each element.
diff --git a/packages/kbn-tinymath/test/functions/abs.test.js b/packages/kbn-tinymath/test/functions/abs.test.js
index 048ba590f0d8f..a30d9e1d29066 100644
--- a/packages/kbn-tinymath/test/functions/abs.test.js
+++ b/packages/kbn-tinymath/test/functions/abs.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { abs } = require('../../src/functions/abs.js');
+const { abs } = require('../../src/functions/abs');
 
 describe('Abs', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/add.test.js b/packages/kbn-tinymath/test/functions/add.test.js
index 1362fae356172..69823f42055a7 100644
--- a/packages/kbn-tinymath/test/functions/add.test.js
+++ b/packages/kbn-tinymath/test/functions/add.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { add } = require('../../src/functions/add.js');
+const { add } = require('../../src/functions/add');
 
 describe('Add', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/cbrt.test.js b/packages/kbn-tinymath/test/functions/cbrt.test.js
index dc83aa33b175c..ce7a7d1ad9b52 100644
--- a/packages/kbn-tinymath/test/functions/cbrt.test.js
+++ b/packages/kbn-tinymath/test/functions/cbrt.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { cbrt } = require('../../src/functions/cbrt.js');
+const { cbrt } = require('../../src/functions/cbrt');
 
 describe('Cbrt', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/ceil.test.js b/packages/kbn-tinymath/test/functions/ceil.test.js
index f3ca2f19e5d41..b67e0a9be9be2 100644
--- a/packages/kbn-tinymath/test/functions/ceil.test.js
+++ b/packages/kbn-tinymath/test/functions/ceil.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { ceil } = require('../../src/functions/ceil.js');
+const { ceil } = require('../../src/functions/ceil');
 
 describe('Ceil', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/clamp.test.js b/packages/kbn-tinymath/test/functions/clamp.test.js
index 7bb1d3629f2ba..9150bf969f764 100644
--- a/packages/kbn-tinymath/test/functions/clamp.test.js
+++ b/packages/kbn-tinymath/test/functions/clamp.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { clamp } = require('../../src/functions/clamp.js');
+const { clamp } = require('../../src/functions/clamp');
 
 describe('Clamp', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/cos.test.js b/packages/kbn-tinymath/test/functions/cos.test.js
index 069151420a3a5..56fdf53a25e5f 100644
--- a/packages/kbn-tinymath/test/functions/cos.test.js
+++ b/packages/kbn-tinymath/test/functions/cos.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { cos } = require('../../src/functions/cos.js');
+const { cos } = require('../../src/functions/cos');
 
 describe('Cosine', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/cube.test.js b/packages/kbn-tinymath/test/functions/cube.test.js
index f3568815d6f72..f4bd9a6cd7ba2 100644
--- a/packages/kbn-tinymath/test/functions/cube.test.js
+++ b/packages/kbn-tinymath/test/functions/cube.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { cube } = require('../../src/functions/cube.js');
+const { cube } = require('../../src/functions/cube');
 
 describe('Cube', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/degtorad.test.js b/packages/kbn-tinymath/test/functions/degtorad.test.js
index 0988db251743d..ecabad19206a7 100644
--- a/packages/kbn-tinymath/test/functions/degtorad.test.js
+++ b/packages/kbn-tinymath/test/functions/degtorad.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { degtorad } = require('../../src/functions/degtorad.js');
+const { degtorad } = require('../../src/functions/degtorad');
 
 describe('Degrees to Radians', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/divide.test.js b/packages/kbn-tinymath/test/functions/divide.test.js
index fa1ed184ded23..00af7b1430e58 100644
--- a/packages/kbn-tinymath/test/functions/divide.test.js
+++ b/packages/kbn-tinymath/test/functions/divide.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { divide } = require('../../src/functions/divide.js');
+const { divide } = require('../../src/functions/divide');
 
 describe('Divide', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/exp.test.js b/packages/kbn-tinymath/test/functions/exp.test.js
index 2c46daea5023e..873e2382cbc73 100644
--- a/packages/kbn-tinymath/test/functions/exp.test.js
+++ b/packages/kbn-tinymath/test/functions/exp.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { exp } = require('../../src/functions/exp.js');
+const { exp } = require('../../src/functions/exp');
 
 describe('Exp', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/first.test.js b/packages/kbn-tinymath/test/functions/first.test.js
index 1fbc397799f0b..b8ddca968d8d4 100644
--- a/packages/kbn-tinymath/test/functions/first.test.js
+++ b/packages/kbn-tinymath/test/functions/first.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { first } = require('../../src/functions/first.js');
+const { first } = require('../../src/functions/first');
 
 describe('First', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/fix.test.js b/packages/kbn-tinymath/test/functions/fix.test.js
index ebdbcb83c4687..8b90412b70972 100644
--- a/packages/kbn-tinymath/test/functions/fix.test.js
+++ b/packages/kbn-tinymath/test/functions/fix.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { fix } = require('../../src/functions/fix.js');
+const { fix } = require('../../src/functions/fix');
 
 describe('Fix', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/floor.test.js b/packages/kbn-tinymath/test/functions/floor.test.js
index ee4c2dc6a05cc..92738b2969df9 100644
--- a/packages/kbn-tinymath/test/functions/floor.test.js
+++ b/packages/kbn-tinymath/test/functions/floor.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { floor } = require('../../src/functions/floor.js');
+const { floor } = require('../../src/functions/floor');
 
 describe('Floor', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/last.test.js b/packages/kbn-tinymath/test/functions/last.test.js
index 9bc5d612d9c3f..88579c1dcf033 100644
--- a/packages/kbn-tinymath/test/functions/last.test.js
+++ b/packages/kbn-tinymath/test/functions/last.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { last } = require('../../src/functions/last.js');
+const { last } = require('../../src/functions/last');
 
 describe('Last', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/log.test.js b/packages/kbn-tinymath/test/functions/log.test.js
index d51b3f86d804d..9cc06c61d031c 100644
--- a/packages/kbn-tinymath/test/functions/log.test.js
+++ b/packages/kbn-tinymath/test/functions/log.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { log } = require('../../src/functions/log.js');
+const { log } = require('../../src/functions/log');
 
 describe('Log', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/log10.test.js b/packages/kbn-tinymath/test/functions/log10.test.js
index d04a2224e4c59..aa42334e357aa 100644
--- a/packages/kbn-tinymath/test/functions/log10.test.js
+++ b/packages/kbn-tinymath/test/functions/log10.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { log10 } = require('../../src/functions/log10.js');
+const { log10 } = require('../../src/functions/log10');
 
 describe('Log10', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/max.test.js b/packages/kbn-tinymath/test/functions/max.test.js
index 8ac98baca948c..428fe25abdefb 100644
--- a/packages/kbn-tinymath/test/functions/max.test.js
+++ b/packages/kbn-tinymath/test/functions/max.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { max } = require('../../src/functions/max.js');
+const { max } = require('../../src/functions/max');
 
 describe('Max', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/mean.test.js b/packages/kbn-tinymath/test/functions/mean.test.js
index 1508f8d2ff6ce..42226775d69f0 100644
--- a/packages/kbn-tinymath/test/functions/mean.test.js
+++ b/packages/kbn-tinymath/test/functions/mean.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { mean } = require('../../src/functions/mean.js');
+const { mean } = require('../../src/functions/mean');
 
 describe('Mean', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/median.test.js b/packages/kbn-tinymath/test/functions/median.test.js
index a20b0a995d35b..cf4a46b5eb7bf 100644
--- a/packages/kbn-tinymath/test/functions/median.test.js
+++ b/packages/kbn-tinymath/test/functions/median.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { median } = require('../../src/functions/median.js');
+const { median } = require('../../src/functions/median');
 
 describe('Median', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/min.test.js b/packages/kbn-tinymath/test/functions/min.test.js
index d016dc3a968f6..0da4c444c1946 100644
--- a/packages/kbn-tinymath/test/functions/min.test.js
+++ b/packages/kbn-tinymath/test/functions/min.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { min } = require('../../src/functions/min.js');
+const { min } = require('../../src/functions/min');
 
 describe('Min', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/mod.test.js b/packages/kbn-tinymath/test/functions/mod.test.js
index d887b76e43426..13edf9c00313d 100644
--- a/packages/kbn-tinymath/test/functions/mod.test.js
+++ b/packages/kbn-tinymath/test/functions/mod.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { mod } = require('../../src/functions/mod.js');
+const { mod } = require('../../src/functions/mod');
 
 describe('Mod', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/mode.test.js b/packages/kbn-tinymath/test/functions/mode.test.js
index b076e9fddb512..d20e8e37e5b03 100644
--- a/packages/kbn-tinymath/test/functions/mode.test.js
+++ b/packages/kbn-tinymath/test/functions/mode.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { mode } = require('../../src/functions/mode.js');
+const { mode } = require('../../src/functions/mode');
 
 describe('Mode', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/multiply.test.js b/packages/kbn-tinymath/test/functions/multiply.test.js
index 1da208e95fbf9..b48ba448b8be1 100644
--- a/packages/kbn-tinymath/test/functions/multiply.test.js
+++ b/packages/kbn-tinymath/test/functions/multiply.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { multiply } = require('../../src/functions/multiply.js');
+const { multiply } = require('../../src/functions/multiply');
 
 describe('Multiply', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/pi.test.js b/packages/kbn-tinymath/test/functions/pi.test.js
index 2c8384c775f88..d12a5adae19e0 100644
--- a/packages/kbn-tinymath/test/functions/pi.test.js
+++ b/packages/kbn-tinymath/test/functions/pi.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pi } = require('../../src/functions/pi.js');
+const { pi } = require('../../src/functions/pi');
 
 describe('PI', () => {
   it('constant', () => {
diff --git a/packages/kbn-tinymath/test/functions/pow.test.js b/packages/kbn-tinymath/test/functions/pow.test.js
index 3d1bdeb30cbd7..41277f30e3795 100644
--- a/packages/kbn-tinymath/test/functions/pow.test.js
+++ b/packages/kbn-tinymath/test/functions/pow.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { pow } = require('../../src/functions/pow.js');
+const { pow } = require('../../src/functions/pow');
 
 describe('Pow', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/radtodeg.test.js b/packages/kbn-tinymath/test/functions/radtodeg.test.js
index e2059df464f2a..daafa6cd88a19 100644
--- a/packages/kbn-tinymath/test/functions/radtodeg.test.js
+++ b/packages/kbn-tinymath/test/functions/radtodeg.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { radtodeg } = require('../../src/functions/radtodeg.js');
+const { radtodeg } = require('../../src/functions/radtodeg');
 
 describe('Radians to Degrees', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/random.test.js b/packages/kbn-tinymath/test/functions/random.test.js
index 9f7e603dc3f23..a735401d38155 100644
--- a/packages/kbn-tinymath/test/functions/random.test.js
+++ b/packages/kbn-tinymath/test/functions/random.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { random } = require('../../src/functions/random.js');
+const { random } = require('../../src/functions/random');
 
 describe('Random', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/range.test.js b/packages/kbn-tinymath/test/functions/range.test.js
index f7dfcf12e004f..8b74432705bc2 100644
--- a/packages/kbn-tinymath/test/functions/range.test.js
+++ b/packages/kbn-tinymath/test/functions/range.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { range } = require('../../src/functions/range.js');
+const { range } = require('../../src/functions/range');
 
 describe('Range', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/round.test.js b/packages/kbn-tinymath/test/functions/round.test.js
index e5231adb848dc..cb02fd96274ab 100644
--- a/packages/kbn-tinymath/test/functions/round.test.js
+++ b/packages/kbn-tinymath/test/functions/round.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { round } = require('../../src/functions/round.js');
+const { round } = require('../../src/functions/round');
 
 describe('Round', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/sin.test.js b/packages/kbn-tinymath/test/functions/sin.test.js
index 1eb87a36b1f0c..ae2ae965ce7a9 100644
--- a/packages/kbn-tinymath/test/functions/sin.test.js
+++ b/packages/kbn-tinymath/test/functions/sin.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { sin } = require('../../src/functions/sin.js');
+const { sin } = require('../../src/functions/sin');
 
 describe('Sine', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/size.test.js b/packages/kbn-tinymath/test/functions/size.test.js
index ef68c13d7b0c9..967204f96ebed 100644
--- a/packages/kbn-tinymath/test/functions/size.test.js
+++ b/packages/kbn-tinymath/test/functions/size.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { size } = require('../../src/functions/size.js');
+const { size } = require('../../src/functions/size');
 
 describe('Size (also Count)', () => {
   it('array', () => {
diff --git a/packages/kbn-tinymath/test/functions/sqrt.test.js b/packages/kbn-tinymath/test/functions/sqrt.test.js
index cdd0cc987e94f..4222a43a2e35c 100644
--- a/packages/kbn-tinymath/test/functions/sqrt.test.js
+++ b/packages/kbn-tinymath/test/functions/sqrt.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { sqrt } = require('../../src/functions/sqrt.js');
+const { sqrt } = require('../../src/functions/sqrt');
 
 describe('Sqrt', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/square.test.js b/packages/kbn-tinymath/test/functions/square.test.js
index fe2795315249c..2f45dfdd510e5 100644
--- a/packages/kbn-tinymath/test/functions/square.test.js
+++ b/packages/kbn-tinymath/test/functions/square.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { square } = require('../../src/functions/square.js');
+const { square } = require('../../src/functions/square');
 
 describe('Square', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/subtract.test.js b/packages/kbn-tinymath/test/functions/subtract.test.js
index 79f6cea5cc6b4..aa2bcf9dc5bda 100644
--- a/packages/kbn-tinymath/test/functions/subtract.test.js
+++ b/packages/kbn-tinymath/test/functions/subtract.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { subtract } = require('../../src/functions/subtract.js');
+const { subtract } = require('../../src/functions/subtract');
 
 describe('Subtract', () => {
   it('number, number', () => {
diff --git a/packages/kbn-tinymath/test/functions/sum.test.js b/packages/kbn-tinymath/test/functions/sum.test.js
index 5618223d58860..d73877f3c67c0 100644
--- a/packages/kbn-tinymath/test/functions/sum.test.js
+++ b/packages/kbn-tinymath/test/functions/sum.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { sum } = require('../../src/functions/sum.js');
+const { sum } = require('../../src/functions/sum');
 
 describe('Sum', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/tan.test.js b/packages/kbn-tinymath/test/functions/tan.test.js
index 9254328a5da5e..2b8f1e50347dc 100644
--- a/packages/kbn-tinymath/test/functions/tan.test.js
+++ b/packages/kbn-tinymath/test/functions/tan.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { tan } = require('../../src/functions/tan.js');
+const { tan } = require('../../src/functions/tan');
 
 describe('Tangent', () => {
   it('numbers', () => {
diff --git a/packages/kbn-tinymath/test/functions/unique.test.js b/packages/kbn-tinymath/test/functions/unique.test.js
index 6ec5357449773..fa0a98dffe611 100644
--- a/packages/kbn-tinymath/test/functions/unique.test.js
+++ b/packages/kbn-tinymath/test/functions/unique.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const { unique } = require('../../src/functions/unique.js');
+const { unique } = require('../../src/functions/unique');
 
 describe('Unique', () => {
   it('numbers', () => {
diff --git a/packages/kbn-type-summarizer/BUILD.bazel b/packages/kbn-type-summarizer/BUILD.bazel
index 4399e62f11a77..13a28657f2f0e 100644
--- a/packages/kbn-type-summarizer/BUILD.bazel
+++ b/packages/kbn-type-summarizer/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config")
-load("@rules_nodejs//nodejs:directory_file_path.bzl", "directory_file_path")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "directory_file_path", "js_library", "nodejs_binary")
 load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
 PKG_BASE_NAME = "kbn-type-summarizer"
diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
index 4582a69db0068..0a709181b04d2 100644
--- a/packages/kbn-ui-shared-deps-npm/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -11,7 +11,7 @@ const webpack = require('webpack');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-const UiSharedDepsNpm = require('./src/index');
+const UiSharedDepsNpm = require('./src');
 
 const MOMENT_SRC = require.resolve('moment/min/moment-with-locales.js');
 const WEBPACK_SRC = require.resolve('webpack');
diff --git a/packages/kbn-utils/src/package_json/index.test.ts b/packages/kbn-utils/src/package_json/index.test.ts
index f8d1b5d25fa1b..263e277dd3b4e 100644
--- a/packages/kbn-utils/src/package_json/index.test.ts
+++ b/packages/kbn-utils/src/package_json/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { kibanaPackageJson } from './index';
+import { kibanaPackageJson } from '.';
 
 it('parses package.json', () => {
   expect(kibanaPackageJson.name).toEqual('kibana');
diff --git a/packages/kbn-utils/src/path/index.test.ts b/packages/kbn-utils/src/path/index.test.ts
index e4c80a0783b5d..5c774d9897372 100644
--- a/packages/kbn-utils/src/path/index.test.ts
+++ b/packages/kbn-utils/src/path/index.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { accessSync, constants } from 'fs';
-import { getConfigPath, getDataPath, getLogsPath, getConfigDirectory } from './';
+import { getConfigPath, getDataPath, getLogsPath, getConfigDirectory } from '.';
 import { REPO_ROOT } from '../repo_root';
 
 expect.addSnapshotSerializer(
diff --git a/packages/kbn-utils/src/streams/concat_stream.test.ts b/packages/kbn-utils/src/streams/concat_stream.test.ts
index 123556d248907..9b3b0b19a1079 100644
--- a/packages/kbn-utils/src/streams/concat_stream.test.ts
+++ b/packages/kbn-utils/src/streams/concat_stream.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createListStream, createPromiseFromStreams, createConcatStream } from './index';
+import { createListStream, createPromiseFromStreams, createConcatStream } from '.';
 
 describe('concatStream', () => {
   test('accepts an initial value', async () => {
diff --git a/packages/kbn-utils/src/streams/filter_stream.test.ts b/packages/kbn-utils/src/streams/filter_stream.test.ts
index 61f32e721f170..49250b46e808c 100644
--- a/packages/kbn-utils/src/streams/filter_stream.test.ts
+++ b/packages/kbn-utils/src/streams/filter_stream.test.ts
@@ -11,7 +11,7 @@ import {
   createFilterStream,
   createListStream,
   createPromiseFromStreams,
-} from './index';
+} from '.';
 
 describe('createFilterStream()', () => {
   test('calls the function with each item in the source stream', async () => {
diff --git a/packages/kbn-utils/src/streams/intersperse_stream.test.ts b/packages/kbn-utils/src/streams/intersperse_stream.test.ts
index 8ca4d6d1f9d37..51251f44465e1 100644
--- a/packages/kbn-utils/src/streams/intersperse_stream.test.ts
+++ b/packages/kbn-utils/src/streams/intersperse_stream.test.ts
@@ -11,7 +11,7 @@ import {
   createListStream,
   createIntersperseStream,
   createConcatStream,
-} from './index';
+} from '.';
 
 describe('intersperseStream', () => {
   test('places the intersperse value between each provided value', async () => {
diff --git a/packages/kbn-utils/src/streams/list_stream.test.ts b/packages/kbn-utils/src/streams/list_stream.test.ts
index 9f4b382432f7e..f9b7db0a1b539 100644
--- a/packages/kbn-utils/src/streams/list_stream.test.ts
+++ b/packages/kbn-utils/src/streams/list_stream.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createListStream } from './index';
+import { createListStream } from '.';
 
 describe('listStream', () => {
   test('provides the values in the initial list', async () => {
diff --git a/packages/kbn-utils/src/streams/promise_from_streams.test.ts b/packages/kbn-utils/src/streams/promise_from_streams.test.ts
index ee1b313d4d4cb..9186edf79feab 100644
--- a/packages/kbn-utils/src/streams/promise_from_streams.test.ts
+++ b/packages/kbn-utils/src/streams/promise_from_streams.test.ts
@@ -8,7 +8,7 @@
 
 import { Readable, Writable, Duplex, Transform } from 'stream';
 
-import { createListStream, createPromiseFromStreams, createReduceStream } from './index';
+import { createListStream, createPromiseFromStreams, createReduceStream } from '.';
 
 describe('promiseFromStreams', () => {
   test('pipes together an array of streams', async () => {
diff --git a/packages/kbn-utils/src/streams/reduce_stream.test.ts b/packages/kbn-utils/src/streams/reduce_stream.test.ts
index b2cf92a81be27..25be250865cf8 100644
--- a/packages/kbn-utils/src/streams/reduce_stream.test.ts
+++ b/packages/kbn-utils/src/streams/reduce_stream.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Transform } from 'stream';
-import { createReduceStream, createPromiseFromStreams, createListStream } from './index';
+import { createReduceStream, createPromiseFromStreams, createListStream } from '.';
 
 const promiseFromEvent = (name: string, emitter: Transform) =>
   new Promise((resolve) => emitter.on(name, () => resolve(name)));
diff --git a/packages/kbn-utils/src/streams/replace_stream.test.ts b/packages/kbn-utils/src/streams/replace_stream.test.ts
index 96db0de343555..f99622a75196d 100644
--- a/packages/kbn-utils/src/streams/replace_stream.test.ts
+++ b/packages/kbn-utils/src/streams/replace_stream.test.ts
@@ -14,7 +14,7 @@ import {
   createPromiseFromStreams,
   createListStream,
   createMapStream,
-} from './index';
+} from '.';
 
 async function concatToString(streams: [Readable, ...Writable[]]) {
   return await createPromiseFromStreams([
diff --git a/packages/kbn-utils/src/streams/split_stream.test.ts b/packages/kbn-utils/src/streams/split_stream.test.ts
index 47da2c6416a47..8f1e6a8f6f258 100644
--- a/packages/kbn-utils/src/streams/split_stream.test.ts
+++ b/packages/kbn-utils/src/streams/split_stream.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Transform } from 'stream';
-import { createSplitStream, createConcatStream, createPromiseFromStreams } from './index';
+import { createSplitStream, createConcatStream, createPromiseFromStreams } from '.';
 
 async function split(stream: Transform, input: Array<Buffer | string>) {
   const concat = createConcatStream();
diff --git a/packages/shared-ux/README.mdx b/packages/shared-ux/README.mdx
new file mode 100644
index 0000000000000..05f582f1863b2
--- /dev/null
+++ b/packages/shared-ux/README.mdx
@@ -0,0 +1,118 @@
+# Shared UX Packages
+
+This directory contains directories of packages of shared components and other code for use in Kibana solutions.
+
+## How to use these components
+
+Each package exports one or more components that can be consumed.
+
+### Lazy by default
+
+All components are exported to be lazily-loaded with a default `React.Suspense` default most appropriate to its nature.
+
+If a solution needs to alter the `React.Suspense` behavior, (e.g. a different "loading" component), one can import the `Lazy[ComponentName]` version and surround it with a custom `React.Suspense` component.
+
+### "Pure" and "Connected" components
+
+If a package contains a component with functionality that relies on a Kibana core or plugin dependency, there are two components exported: a `pure` component and a `connected` component.
+
+__Pure__ components:
+- are focused on how a component looks and behaves;
+- have their props and handlers exposed as simple types;
+- have no logic specific to Kibana.
+
+__Connected__ components, by contrast:
+- *compose* their pure counterparts;
+- rely on Kibana core and plugin dependencies to provide Kibana-specific logic;
+- require a `ContextProvider` packaged with the component to provide stateful services from a start contract.
+
+For example, the `ExitFullScreenButton` "pure" component is a button that is styled with the appropriate translated text.  It is simple and without dependency.
+
+The "connected" component *composes* that pure component and:
+- applies EUI theme state;
+- uses the `coreStart.chrome.setIsVisible` API to change the full screen state `onClick`;
+- applies `emotion` styles to position the button in the window.
+
+### Connected component providers
+
+Connected components are accompanied by a `Provider` which is intended to provide their external services.  We typically provide two: one that abstracts away the dependency into a simplified set of functions, and one that maps to the intended dependency directly.
+
+For example, the `ExitFullScreenButton` relies on the `coreStart.chrome.setIsVisible` API to interact with the full screen state.  The package contains two providers.
+
+The `ExitFullScreenButtonProvider` simply expects a single function, `setIsFullScreen`.  This pattern is useful for more complicated components that may rely on a number of dependencies:
+
+```
+<ExitFullScreenButtonProvider setIsFullScreen={...}>
+  <ExitFullScreenButton />
+</ExitFullScreenButtonProvider>
+```
+
+The `ExitFullScreenButtonKibanaProvider` creates a facsimile of the `coreStart` contract type, containing only the portions it expects to use.  This is a kind of "syntactic-sugar-workaround" to the fact plugin start contracts are not typically available to packages:
+
+```
+<ExitFullScreenButtonKibanaProvider coreStart={...}>
+  <ExitFullScreenButton />
+</ExitFullScreenButtonProvider>
+```
+
+Plugins can use either of these providers in their plugin at either the root of their plugin application or at any level of their React tree, wherever it makes sense.  Component compositions can do the same.  Either Provider can be used, depending on the situation.
+
+## How can I contribute a component?
+
+*__Yes, please!__ :elasticheart:*
+
+The easiest way to contribute a shared component to Kibana is to follow our pattern and create a single package containing that contribution.  You can use the `generate` script to create a new boilerplate package.
+
+> More detail on this is coming soon.  Contact the Shared UX team for more information.
+
+## How this collection is organized
+
+Typically, the `/packages` directory contains a flat list of packages, where each directory matches the name of the package.  Given that we expect to create a large number of packages, we're going to organize them into a loose tree structure:
+
+```
+- packages
+  - shared-ux
+    - button
+      - exit_full_screen
+    - [component type]
+      - baz
+      - qux
+    - [subject matter]
+      - foo
+      - bar
+```
+
+This structure should then map to the name of the package:
+
+```
+- @kbn/shared-ux-button-exit-full-screen
+- @kbn/shared-ux-[subject matter]-[foo]
+- @kbn/shared-ux-[subject matter]-[bar]
+- @kbn/shared-ux-[component-type]-[baz]
+- @kbn/shared-ux-[component-type]-[qux]
+```
+
+## Why?
+
+When we started exploring how to effectively share code between Kibana solutions, we realized-- admittedly through some trial and error-- that the usual ways in which we share code between plugins wasn't going to work.
+
+### Why not a plugin?
+
+First, with each component that we create, those components inevitably begin to depend on other plugins.  Once our plugin depends on another, that plugin then becomes unable to use Shared UX components without creating a circular dependency.
+
+Second, the components, while useful to a plugin, are not actually dependent on the *plugin lifecycle*.  They are stateless.  Containing-- restricting-- them to a plugin lifecycle adds unnecessary complexity.
+
+So we opted to organize our code in packages.
+
+### Why not a single package of components?
+
+We started that way, and quickly ran into the "`lodash` bundle problem": containing all of our components in one package (and all of our services in another) meant that any plugin using even one component would inherit *all* of them... even if they weren't used.  Bundle sizes would increase dramatically, as well as build times: any minor change would cascade through the entire monorepo.
+
+Therefore we've opted to create a package for each component.
+
+### How do your components share code?
+
+At present, *they don't*.  Some utility code is shared, but this is code that should change very rarely, at most.
+
+But that doesn't mean they cannot be *composed* together.  `ComponentA` can certainly compose `ComponentB` and `ComponentC`.  What's great is the dependencies become very clear, top-down, and reflect the granular nature of each component.
+
diff --git a/packages/shared-ux/button/exit_full_screen/BUILD.bazel b/packages/shared-ux/button/exit_full_screen/BUILD.bazel
new file mode 100644
index 0000000000000..2b6fbf63066d5
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/BUILD.bazel
@@ -0,0 +1,153 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
+
+PKG_DIRNAME = "kbn-shared-ux-button-exit-full-screen"
+PKG_REQUIRE_NAME = "@kbn/shared-ux-button-exit-full-screen"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.scss",
+    "src/**/*.mdx",
+    "src/**/*.svg",
+  ],
+  exclude = [
+    "**/*.test.*",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+# In this array place runtime dependencies, including other packages and NPM packages
+# which must be available for this code to run.
+#
+#  To reference other packages use:
+#    "//repo/relative/path/to/package"
+#    eg. "//packages/kbn-utils"
+#
+#  To reference a NPM package use:
+#    "@npm//name-of-package"
+#    eg. "@npm//lodash"
+RUNTIME_DEPS = [
+  "@npm//@elastic/eui",
+  "@npm//@emotion/css",
+  "@npm//@emotion/react",
+  "@npm//@storybook/addon-actions",
+  "@npm//classnames",
+  "@npm//enzyme",
+  "@npm//react-use",
+  "@npm//react",
+  "@npm//url-loader",
+  "//packages/kbn-i18n-react",
+  "//packages/kbn-i18n",
+  "//packages/kbn-shared-ux-utility",
+]
+
+# In this array place dependencies necessary to build the types, which will include the
+# :npm_module_types target of other packages and packages from NPM, including @types/*
+# packages.
+#
+#  To reference the types for another package use:
+#    "//repo/relative/path/to/package:npm_module_types"
+#    eg. "//packages/kbn-utils:npm_module_types"
+#
+#  References to NPM packages work the same as RUNTIME_DEPS
+TYPES_DEPS = [
+  "@npm//@elastic/eui",
+  "@npm//@emotion/css",
+  "@npm//@emotion/react",
+  "@npm//@storybook/addon-actions",
+  "@npm//@types/classnames",
+  "@npm//@types/enzyme",
+  "@npm//@types/jest",
+  "@npm//@types/node",
+  "@npm//@types/react",
+  "@npm//react-use",
+  "//packages/kbn-ambient-ui-types",
+  "//packages/kbn-i18n-react:npm_module_types",
+  "//packages/kbn-i18n:npm_module_types",
+  "//packages/kbn-shared-ux-utility:npm_module_types",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+jsts_transpiler(
+  name = "target_web",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+  web = True,
+  additional_args = [
+    "--copy-files",
+    "--quiet"
+  ],
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node", ":target_web"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/shared-ux/button/exit_full_screen/README.mdx b/packages/shared-ux/button/exit_full_screen/README.mdx
new file mode 100644
index 0000000000000..03a885ba6151c
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/README.mdx
@@ -0,0 +1,28 @@
+---
+id: sharedUX/Components/ExitFullScreenButton
+slug: /shared-ux/components/exit-full-screen-button
+title: Exit Full Screen Button
+summary: A button that floats over the plugin workspace and allows someone to exit "full screen" mode.
+tags: ['shared-ux', 'component']
+date: 2021-12-28
+---
+
+## Description
+
+Many plugins have a "full screen mode", where the chrome is hidden and the workspace of the plugin is maximized.  This button is meant to appear when the plugin is in full screen mode to allow the user to exit that state and return the relevant Kibana Chrome.
+
+## Pure Component: `ExitFullScreenButtonComponent`
+
+The pure component is a simple button representing the style and text of a button to exit full screen mode.  It does not interact with Kibana or browser chrome in any way, nor does it respond to global key presses.  You can use this component with your own logic and positioning, if necessary.
+
+## Connected Component: `ExitFullScreenButton`
+
+The connected component:
+
+- uses the `setIsVisible` API from `coreStart.chrome` to enter and exit full screen;
+- monitors relevant external key presses to exit full screen mode;
+- allows provides the `toggleChrome` prop, which provides the ability to call `setIsVisible` on render, which allows a consumer to enter full screen simply by rendering the component and exit full screen by interacting with it.
+
+## EUI Promotion Status
+
+This component is not currently considered for promotion to EUI.
diff --git a/packages/shared-ux/button/exit_full_screen/jest.config.js b/packages/shared-ux/button/exit_full_screen/jest.config.js
new file mode 100644
index 0000000000000..a9c3d2e1afb48
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/jest.config.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/packages/shared-ux/button/exit_full_screen'],
+};
diff --git a/packages/shared-ux/button/exit_full_screen/package.json b/packages/shared-ux/button/exit_full_screen/package.json
new file mode 100644
index 0000000000000..33cd7d782fd5c
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@kbn/shared-ux-button-exit-full-screen",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "browser": "./target_web/index.js",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
diff --git a/packages/shared-ux/button/exit_full_screen/src/__snapshots__/exit_full_screen_button.test.tsx.snap b/packages/shared-ux/button/exit_full_screen/src/__snapshots__/exit_full_screen_button.test.tsx.snap
new file mode 100644
index 0000000000000..793c17ae1b1e3
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/__snapshots__/exit_full_screen_button.test.tsx.snap
@@ -0,0 +1,241 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ExitFullScreenButton /> with kibana services is rendered 1`] = `
+<ExitFullScreenButtonKibanaProvider
+  coreStart={
+    Object {
+      "chrome": Object {
+        "setIsVisible": [MockFunction] {
+          "calls": Array [
+            Array [
+              false,
+            ],
+          ],
+          "results": Array [
+            Object {
+              "type": "return",
+              "value": undefined,
+            },
+          ],
+        },
+      },
+    }
+  }
+>
+  <ExitFullScreenButton
+    onExit={[MockFunction]}
+  >
+    <ExitFullScreenButton
+      css={
+        Object {
+          "map": undefined,
+          "name": "knjqgf",
+          "next": undefined,
+          "styles": "
+    bottom: 8px;
+    left: 8px;
+    position: fixed;
+    z-index: 5;
+  ",
+          "toString": [Function],
+        }
+      }
+      onClick={[Function]}
+    >
+      <div>
+        <EuiScreenReaderOnly>
+          <p
+            aria-live="polite"
+            className="euiScreenReaderOnly"
+          >
+            In full screen mode, press ESC to exit.
+          </p>
+        </EuiScreenReaderOnly>
+        <button
+          className="exitFullScreenButton"
+          data-test-subj="exitFullScreenModeButton"
+          onClick={[Function]}
+        >
+          <EuiFlexGroup
+            alignItems="center"
+            component="span"
+            gutterSize="s"
+            responsive={false}
+          >
+            <span
+              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+            >
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="m"
+                    type="logoElastic"
+                  >
+                    <span
+                      data-euiicon-type="logoElastic"
+                      size="m"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                data-test-subj="exitFullScreenModeText"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  data-test-subj="exitFullScreenModeText"
+                >
+                  Exit full screen
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="s"
+                    type="fullScreenExit"
+                  >
+                    <span
+                      data-euiicon-type="fullScreenExit"
+                      size="s"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+            </span>
+          </EuiFlexGroup>
+        </button>
+      </div>
+    </ExitFullScreenButton>
+  </ExitFullScreenButton>
+</ExitFullScreenButtonKibanaProvider>
+`;
+
+exports[`<ExitFullScreenButton /> with manual services is rendered 1`] = `
+<ExitFullScreenButtonProvider
+  setIsFullscreen={
+    [MockFunction] {
+      "calls": Array [
+        Array [
+          false,
+        ],
+      ],
+      "results": Array [
+        Object {
+          "type": "return",
+          "value": undefined,
+        },
+      ],
+    }
+  }
+>
+  <ExitFullScreenButton
+    onExit={[MockFunction]}
+  >
+    <ExitFullScreenButton
+      css={
+        Object {
+          "map": undefined,
+          "name": "knjqgf",
+          "next": undefined,
+          "styles": "
+    bottom: 8px;
+    left: 8px;
+    position: fixed;
+    z-index: 5;
+  ",
+          "toString": [Function],
+        }
+      }
+      onClick={[Function]}
+    >
+      <div>
+        <EuiScreenReaderOnly>
+          <p
+            aria-live="polite"
+            className="euiScreenReaderOnly"
+          >
+            In full screen mode, press ESC to exit.
+          </p>
+        </EuiScreenReaderOnly>
+        <button
+          className="exitFullScreenButton"
+          data-test-subj="exitFullScreenModeButton"
+          onClick={[Function]}
+        >
+          <EuiFlexGroup
+            alignItems="center"
+            component="span"
+            gutterSize="s"
+            responsive={false}
+          >
+            <span
+              className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
+            >
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="m"
+                    type="logoElastic"
+                  >
+                    <span
+                      data-euiicon-type="logoElastic"
+                      size="m"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                data-test-subj="exitFullScreenModeText"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                  data-test-subj="exitFullScreenModeText"
+                >
+                  Exit full screen
+                </span>
+              </EuiFlexItem>
+              <EuiFlexItem
+                component="span"
+                grow={false}
+              >
+                <span
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                >
+                  <EuiIcon
+                    size="s"
+                    type="fullScreenExit"
+                  >
+                    <span
+                      data-euiicon-type="fullScreenExit"
+                      size="s"
+                    />
+                  </EuiIcon>
+                </span>
+              </EuiFlexItem>
+            </span>
+          </EuiFlexGroup>
+        </button>
+      </div>
+    </ExitFullScreenButton>
+  </ExitFullScreenButton>
+</ExitFullScreenButtonProvider>
+`;
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.component.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx
similarity index 89%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.component.tsx
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx
index 6c037cc5f65cb..6dc5a8d32929e 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.component.tsx
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx
@@ -21,22 +21,19 @@ import cx from 'classnames';
 
 import './exit_full_screen_button.scss';
 
-const text = i18n.translate(
-  'sharedUXComponents.exitFullScreenButton.exitFullScreenModeButtonText',
-  {
-    defaultMessage: 'Exit full screen',
-  }
-);
+const text = i18n.translate('sharedUXPackages.exitFullScreenButton.exitFullScreenModeButtonText', {
+  defaultMessage: 'Exit full screen',
+});
 
 const description = i18n.translate(
-  'sharedUXComponents.exitFullScreenButton.fullScreenModeDescription',
+  'sharedUXPackages.exitFullScreenButton.fullScreenModeDescription',
   {
     defaultMessage: 'In full screen mode, press ESC to exit.',
   }
 );
 
 /**
- * Props for the Exit Full Screen button component.
+ * Props for the `ExitFullScreenButton` component.
  */
 export interface Props extends Pick<HTMLAttributes<HTMLDivElement>, 'className'> {
   onClick: MouseEventHandler<HTMLButtonElement>;
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.scss b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.scss
similarity index 100%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.scss
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.scss
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.stories.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.stories.tsx
similarity index 78%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.stories.tsx
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.stories.tsx
index e530a4303e6af..36c09558469ec 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.stories.tsx
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.stories.tsx
@@ -9,9 +9,10 @@
 import React from 'react';
 import { action } from '@storybook/addon-actions';
 
+import { ExitFullScreenButtonProvider } from './services';
 import { ExitFullScreenButton as ExitFullScreenButtonComponent } from './exit_full_screen_button.component';
 import { ExitFullScreenButton } from './exit_full_screen_button';
-import mdx from './exit_full_screen_button.mdx';
+import mdx from '../README.mdx';
 
 export default {
   title: 'Exit Full Screen Button',
@@ -25,7 +26,11 @@ export default {
 };
 
 export const ConnectedComponent = ({ toggleChrome = true }: { toggleChrome: boolean }) => {
-  return <ExitFullScreenButton onExit={action('onExit')} toggleChrome={toggleChrome} />;
+  return (
+    <ExitFullScreenButtonProvider setIsFullscreen={action('setIsFullscreen')}>
+      <ExitFullScreenButton onExit={action('onExit')} toggleChrome={toggleChrome} />
+    </ExitFullScreenButtonProvider>
+  );
 };
 
 ConnectedComponent.argTypes = {
diff --git a/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.test.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.test.tsx
new file mode 100644
index 0000000000000..3b30c38d2d050
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.test.tsx
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { ReactWrapper } from 'enzyme';
+import { keys } from '@elastic/eui';
+
+import { ExitFullScreenButton } from './exit_full_screen_button';
+import { componentMount, componentServices, kibanaMount, kibanaServices } from './mocks';
+
+describe('<ExitFullScreenButton />', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('with manual services', () => {
+    test('is rendered', () => {
+      const component = componentMount(<ExitFullScreenButton onExit={jest.fn()} />);
+      expect(component).toMatchSnapshot();
+    });
+
+    test('passing `false` to toggleChrome does not toggle chrome', () => {
+      const component = componentMount(
+        <ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />
+      );
+      expect(componentServices.setIsFullscreen).toHaveBeenCalledTimes(0);
+
+      component.unmount();
+      expect(componentServices.setIsFullscreen).toHaveBeenCalledTimes(0);
+    });
+
+    describe('onExit', () => {
+      const onExitHandler = jest.fn();
+      let component: ReactWrapper;
+
+      beforeEach(() => {
+        component = componentMount(
+          <ExitFullScreenButton onExit={onExitHandler} toggleChrome={true} />
+        );
+      });
+
+      test('is called when the button is pressed', () => {
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(false);
+
+        component.find('button').simulate('click');
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(true);
+      });
+
+      test('is called when the ESC key is pressed', () => {
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(false);
+
+        const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
+        document.dispatchEvent(escapeKeyEvent);
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(componentServices.setIsFullscreen).toHaveBeenLastCalledWith(true);
+      });
+    });
+  });
+
+  describe('with kibana services', () => {
+    test('is rendered', () => {
+      const component = kibanaMount(<ExitFullScreenButton onExit={jest.fn()} />);
+      expect(component).toMatchSnapshot();
+    });
+
+    test('passing `false` to toggleChrome does not toggle chrome', () => {
+      const component = kibanaMount(
+        <ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />
+      );
+      expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenCalledTimes(0);
+
+      component.unmount();
+      expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenCalledTimes(0);
+    });
+
+    describe('onExit', () => {
+      const onExitHandler = jest.fn();
+      let component: ReactWrapper;
+
+      beforeEach(() => {
+        component = kibanaMount(
+          <ExitFullScreenButton onExit={onExitHandler} toggleChrome={true} />
+        );
+      });
+
+      test('is called when the button is pressed', () => {
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(false);
+
+        component.find('button').simulate('click');
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(true);
+      });
+
+      test('is called when the ESC key is pressed', () => {
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(false);
+
+        const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
+        document.dispatchEvent(escapeKeyEvent);
+        expect(onExitHandler).toHaveBeenCalledTimes(1);
+
+        component.unmount();
+        expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenLastCalledWith(true);
+      });
+    });
+  });
+});
diff --git a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.tsx b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.tsx
similarity index 83%
rename from packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.tsx
rename to packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.tsx
index 09abe4a760d89..94c26ae4ebbaa 100644
--- a/packages/kbn-shared-ux-components/src/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/packages/shared-ux/button/exit_full_screen/src/exit_full_screen_button.tsx
@@ -11,12 +11,11 @@ import { useEuiTheme, keys } from '@elastic/eui';
 import { css } from '@emotion/react';
 import useMountedState from 'react-use/lib/useMountedState';
 
-import { usePlatformService } from '@kbn/shared-ux-services';
-
 import { ExitFullScreenButton as Component } from './exit_full_screen_button.component';
+import { useServices } from './services';
 
 /**
- * Props for the service-enabled Exit Full Screen button component.
+ * Props for the service-enabled `ExitFullScreenButton` component.
  */
 export interface Props {
   /** Optional handler to call when one exits full-screen mode. */
@@ -27,16 +26,11 @@ export interface Props {
 
 /**
  * A service-enabled component that provides Kibana-specific functionality to the `ExitFullScreenButton`
- * component.
- *
- * Use of this component requires both the `EuiTheme` context as well as either a configured Shared UX
- * `ServicesProvider` or the `ServicesContext` provided by the Shared UX public plugin contract.
- *
- * See shared-ux/public/services for information.
+ * pure component.
  */
 export const ExitFullScreenButton = ({ onExit = () => {}, toggleChrome = true }: Props) => {
   const { euiTheme } = useEuiTheme();
-  const { setIsFullscreen } = usePlatformService();
+  const { setIsFullscreen } = useServices();
   const isMounted = useMountedState();
 
   const onClick = useCallback(() => {
diff --git a/packages/shared-ux/button/exit_full_screen/src/index.ts b/packages/shared-ux/button/exit_full_screen/src/index.ts
new file mode 100644
index 0000000000000..da1fcce0e26a5
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/index.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { withSuspense } from '@kbn/shared-ux-utility';
+
+export { ExitFullScreenButtonKibanaProvider, ExitFullScreenButtonProvider } from './services';
+
+/**
+ * Lazy-loaded pure component.  Must be wrapped in `React.Suspense`.
+ */
+export const LazyExitFullScreenButtonComponent = React.lazy(() =>
+  import('./exit_full_screen_button.component').then(({ ExitFullScreenButton }) => ({
+    default: ExitFullScreenButton,
+  }))
+);
+
+/**
+ * A pure component that resembles a button to exit full screen mode.
+ */
+export const ExitFullScreenButtonComponent = withSuspense(LazyExitFullScreenButtonComponent);
+
+/**
+ * Lazy-loaded connected component.  Must be wrapped in `React.Suspense` and a Provider.
+ */
+export const LazyExitFullScreenButton = React.lazy(() =>
+  import('./exit_full_screen_button').then(({ ExitFullScreenButton }) => ({
+    default: ExitFullScreenButton,
+  }))
+);
+
+/**
+ * A component that can be used to exit full screen mode in Kibana.  Requires a Provider for
+ * relevant services.
+ */
+export const ExitFullScreenButton = withSuspense(LazyExitFullScreenButton);
diff --git a/packages/shared-ux/button/exit_full_screen/src/mocks.tsx b/packages/shared-ux/button/exit_full_screen/src/mocks.tsx
new file mode 100644
index 0000000000000..b63ea33cfde8e
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/mocks.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { mount as enzymeMount } from 'enzyme';
+import { ExitFullScreenButtonKibanaProvider, ExitFullScreenButtonProvider } from './services';
+
+export const componentServices = { setIsFullscreen: jest.fn() };
+export const componentMount = (element: JSX.Element) =>
+  enzymeMount(
+    <ExitFullScreenButtonProvider {...componentServices}>{element}</ExitFullScreenButtonProvider>
+  );
+
+export const kibanaServices = { coreStart: { chrome: { setIsVisible: jest.fn() } } };
+export const kibanaMount = (element: JSX.Element) =>
+  enzymeMount(
+    <ExitFullScreenButtonKibanaProvider {...kibanaServices}>
+      {element}
+    </ExitFullScreenButtonKibanaProvider>
+  );
diff --git a/packages/shared-ux/button/exit_full_screen/src/services.tsx b/packages/shared-ux/button/exit_full_screen/src/services.tsx
new file mode 100644
index 0000000000000..7522d160028d9
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/src/services.tsx
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, { FC, useContext } from 'react';
+
+/**
+ * Abstract external services for this component.
+ */
+export interface Services {
+  setIsFullscreen: (isFullscreen: boolean) => void;
+}
+
+const ExitFullScreenButtonContext = React.createContext<Services | null>(null);
+
+/**
+ * Abstract external service Provider.
+ */
+export const ExitFullScreenButtonProvider: FC<Services> = ({ children, ...services }) => {
+  return (
+    <ExitFullScreenButtonContext.Provider value={services}>
+      {children}
+    </ExitFullScreenButtonContext.Provider>
+  );
+};
+
+/**
+ * Kibana-specific service types.
+ */
+export interface KibanaServices {
+  coreStart: {
+    chrome: {
+      setIsVisible: (isVisible: boolean) => void;
+    };
+  };
+}
+
+/**
+ * Kibana-specific Provider that maps to known dependency types.
+ */
+export const ExitFullScreenButtonKibanaProvider: FC<KibanaServices> = ({
+  children,
+  ...services
+}) => {
+  return (
+    <ExitFullScreenButtonContext.Provider
+      value={{
+        setIsFullscreen: services.coreStart.chrome.setIsVisible,
+      }}
+    >
+      {children}
+    </ExitFullScreenButtonContext.Provider>
+  );
+};
+
+/**
+ * React hook for accessing pre-wired services.
+ */
+export function useServices() {
+  const context = useContext(ExitFullScreenButtonContext);
+
+  if (!context) {
+    throw new Error(
+      'ExitFullScreenButtonContext is missing.  Ensure your component or React root is wrapped with ExitFullScreenButtonProvider.'
+    );
+  }
+
+  return context;
+}
diff --git a/packages/shared-ux/button/exit_full_screen/tsconfig.json b/packages/shared-ux/button/exit_full_screen/tsconfig.json
new file mode 100644
index 0000000000000..4d110e436c3fe
--- /dev/null
+++ b/packages/shared-ux/button/exit_full_screen/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "rootDir": "src",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node",
+      "@emotion/react/types/css-prop",
+      "@kbn/ambient-ui-types"
+    ]
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/packages/kbn-babel-code-parser/jest.config.js b/packages/shared-ux/jest.config.js
similarity index 88%
rename from packages/kbn-babel-code-parser/jest.config.js
rename to packages/shared-ux/jest.config.js
index c5242b7dad926..a5f7b8dee5a71 100644
--- a/packages/kbn-babel-code-parser/jest.config.js
+++ b/packages/shared-ux/jest.config.js
@@ -9,5 +9,5 @@
 module.exports = {
   preset: '@kbn/test',
   rootDir: '../..',
-  roots: ['<rootDir>/packages/kbn-babel-code-parser'],
+  roots: ['<rootDir>/packages/shared-ux'],
 };
diff --git a/scripts/build_kibana_platform_plugins.js b/scripts/build_kibana_platform_plugins.js
index 9038d08364400..1a016e8b8e54f 100644
--- a/scripts/build_kibana_platform_plugins.js
+++ b/scripts/build_kibana_platform_plugins.js
@@ -9,5 +9,5 @@
 require('../src/setup_node_env/ensure_node_preserve_symlinks');
 require('source-map-support/register');
 require('@kbn/optimizer').runKbnOptimizerCli({
-  defaultLimitsPath: require.resolve('../packages/kbn-optimizer/limits.yml'),
+  defaultLimitsPath: require.resolve('@kbn/optimizer/limits.yml'),
 });
diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js
index b185bcb0ea5d0..1e963660a1e03 100644
--- a/scripts/functional_tests.js
+++ b/scripts/functional_tests.js
@@ -8,8 +8,8 @@
 
 require('../src/setup_node_env');
 require('@kbn/test').runTestsCli([
+  require.resolve('../test/functional/config.ccs.ts'),
   require.resolve('../test/functional/config.js'),
-  require.resolve('../test/functional_ccs/config.ts'),
   require.resolve('../test/plugin_functional/config.ts'),
   require.resolve('../test/ui_capabilities/newsfeed_err/config.ts'),
   require.resolve('../test/new_visualize_flow/config.ts'),
diff --git a/scripts/kbn.js b/scripts/kbn.js
index f384c13a3acfc..459c590ddf8cc 100644
--- a/scripts/kbn.js
+++ b/scripts/kbn.js
@@ -8,4 +8,4 @@
 
 require('../src/setup_node_env/ensure_node_preserve_symlinks');
 require('../src/setup_node_env/node_version_validator');
-require('../packages/kbn-pm/cli');
+require('../packages/kbn-pm/dist').run(process.argv.slice(2));
diff --git a/scripts/type_summarizer.js b/scripts/type_summarizer.js
index 09d3aa69138e9..cb1b46e941954 100644
--- a/scripts/type_summarizer.js
+++ b/scripts/type_summarizer.js
@@ -6,6 +6,6 @@
  * Side Public License, v 1.
  */
 
-require('../src/setup_node_env');
+require('../src/setup_node_env/no_transpilation');
 require('source-map-support/register');
-require('../packages/kbn-type-summarizer/src/bazel_cli');
+require('@kbn/type-summarizer/target_node/bazel_cli');
diff --git a/src/cli/keystore/read_keystore.js b/src/cli/keystore/read_keystore.js
index be6faeab79cb2..d3629c32671f7 100644
--- a/src/cli/keystore/read_keystore.js
+++ b/src/cli/keystore/read_keystore.js
@@ -8,7 +8,7 @@
 
 import { set } from '@elastic/safer-lodash-set';
 
-import { Keystore } from '../keystore';
+import { Keystore } from '.';
 import { getKeystore } from '../../cli_keystore/get_keystore';
 
 export function readKeystore(keystorePath = getKeystore()) {
diff --git a/src/cli/keystore/read_keystore.test.js b/src/cli/keystore/read_keystore.test.js
index 8b376a3d10699..2727576c1f8a1 100644
--- a/src/cli/keystore/read_keystore.test.js
+++ b/src/cli/keystore/read_keystore.test.js
@@ -9,8 +9,8 @@
 import path from 'path';
 import { readKeystore } from './read_keystore';
 
-jest.mock('../keystore');
-import { Keystore } from '../keystore';
+jest.mock('.');
+import { Keystore } from '.';
 
 describe('cli/serve/read_keystore', () => {
   beforeEach(() => {
diff --git a/src/cli/serve/integration_tests/reload_logging_config.test.ts b/src/cli/serve/integration_tests/reload_logging_config.test.ts
index 4cee7dfae4126..7ad3495c39cd6 100644
--- a/src/cli/serve/integration_tests/reload_logging_config.test.ts
+++ b/src/cli/serve/integration_tests/reload_logging_config.test.ts
@@ -117,7 +117,7 @@ describe.skip('Server logging configuration', function () {
           )
           .toPromise();
 
-        const lastMessage = await message$.pipe(take(1)).toPromise();
+        const lastMessage = await Rx.firstValueFrom(message$);
         expect(containsJsonOnly(lastMessage)).toBe(true);
 
         createConfigManager(configFilePath).modify((oldConfig) => {
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index b7228780a1005..6425b0d6c8005 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -38,7 +38,7 @@ const getBootstrapScript = (isDev) => {
     const { bootstrapDevMode } = require(DEV_MODE_PATH);
     return bootstrapDevMode;
   } else {
-    const { bootstrap } = require('../../core/server');
+    const { bootstrap } = require('@kbn/core/server');
     return bootstrap;
   }
 };
diff --git a/src/cli_keystore/list.test.js b/src/cli_keystore/list.test.js
index 6a433b3e9299d..01bac0c4454d9 100644
--- a/src/cli_keystore/list.test.js
+++ b/src/cli_keystore/list.test.js
@@ -25,7 +25,7 @@ jest.mock('fs', () => ({
 }));
 
 import sinon from 'sinon';
-import { Keystore } from '../cli//keystore';
+import { Keystore } from '../cli/keystore';
 import { list } from './list';
 import { Logger } from '../cli_plugin/lib/logger';
 
diff --git a/src/cli_plugin/install/index.test.js b/src/cli_plugin/install/index.test.js
index 730f90dc85a9f..f789dd9ba3083 100644
--- a/src/cli_plugin/install/index.test.js
+++ b/src/cli_plugin/install/index.test.js
@@ -8,7 +8,7 @@
 
 import sinon from 'sinon';
 
-import { installCommand } from './index';
+import { installCommand } from '.';
 
 describe('kibana cli', function () {
   describe('plugin installer', function () {
diff --git a/src/cli_setup/cli_setup.ts b/src/cli_setup/cli_setup.ts
index 9ae9fcba0507f..241c0dc13157f 100644
--- a/src/cli_setup/cli_setup.ts
+++ b/src/cli_setup/cli_setup.ts
@@ -15,8 +15,8 @@ import { getConfigPath } from '@kbn/utils';
 import {
   ElasticsearchService,
   EnrollResult,
-} from '../plugins/interactive_setup/server/elasticsearch_service';
-import { getDetailedErrorMessage } from '../plugins/interactive_setup/server/errors';
+} from '@kbn/interactive-setup-plugin/server/elasticsearch_service';
+import { getDetailedErrorMessage } from '@kbn/interactive-setup-plugin/server/errors';
 import {
   promptToken,
   getCommand,
diff --git a/src/cli_setup/utils.test.ts b/src/cli_setup/utils.test.ts
index c9242d4eaeba4..aa90f4a078e9c 100644
--- a/src/cli_setup/utils.test.ts
+++ b/src/cli_setup/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { decodeEnrollmentToken, getCommand } from './utils';
-import type { EnrollmentToken } from '../plugins/interactive_setup/common';
+import type { EnrollmentToken } from '@kbn/interactive-setup-plugin/common';
 
 describe('kibana setup cli', () => {
   describe('getCommand', () => {
diff --git a/src/cli_setup/utils.ts b/src/cli_setup/utils.ts
index 03eca6fe8e0ac..6a5b60681a9f0 100644
--- a/src/cli_setup/utils.ts
+++ b/src/cli_setup/utils.ts
@@ -12,12 +12,12 @@ import { duration } from 'moment';
 import { merge } from 'lodash';
 import { kibanaPackageJson } from '@kbn/utils';
 
-import { Logger } from '../core/server';
-import { ClusterClient } from '../core/server/elasticsearch/client';
-import { configSchema } from '../core/server/elasticsearch';
-import { ElasticsearchService } from '../plugins/interactive_setup/server/elasticsearch_service';
-import { KibanaConfigWriter } from '../plugins/interactive_setup/server/kibana_config_writer';
-import type { EnrollmentToken } from '../plugins/interactive_setup/common';
+import { Logger } from '@kbn/core/server';
+import { ClusterClient } from '@kbn/core/server/elasticsearch/client';
+import { configSchema } from '@kbn/core/server/elasticsearch';
+import { ElasticsearchService } from '@kbn/interactive-setup-plugin/server/elasticsearch_service';
+import { KibanaConfigWriter } from '@kbn/interactive-setup-plugin/server/kibana_config_writer';
+import type { EnrollmentToken } from '@kbn/interactive-setup-plugin/common';
 
 const noop = () => {};
 const logger: Logger = {
diff --git a/src/core/public/application/__snapshots__/application_service.test.ts.snap b/src/core/public/application/__snapshots__/application_service.test.ts.snap
index 17de9503bd533..712ed1a9f38f1 100644
--- a/src/core/public/application/__snapshots__/application_service.test.ts.snap
+++ b/src/core/public/application/__snapshots__/application_service.test.ts.snap
@@ -4,15 +4,15 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
 <AppRouter
   appStatuses$={
     AnonymousSubject {
-      "_isScalar": false,
       "closed": false,
+      "currentObservers": null,
       "destination": AnonymousSubject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "destination": BehaviorSubject {
-          "_isScalar": false,
           "_value": Map {},
           "closed": false,
+          "currentObservers": Array [],
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -21,14 +21,11 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
-        "operator": MapOperator {
-          "project": [Function],
-          "thisArg": undefined,
-        },
+        "operator": [Function],
         "source": BehaviorSubject {
-          "_isScalar": false,
           "_value": Map {},
           "closed": false,
+          "currentObservers": Array [],
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -41,12 +38,12 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
       "observers": Array [],
       "operator": [Function],
       "source": AnonymousSubject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "destination": BehaviorSubject {
-          "_isScalar": false,
           "_value": Map {},
           "closed": false,
+          "currentObservers": Array [],
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -55,14 +52,11 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
-        "operator": MapOperator {
-          "project": [Function],
-          "thisArg": undefined,
-        },
+        "operator": [Function],
         "source": BehaviorSubject {
-          "_isScalar": false,
           "_value": Map {},
           "closed": false,
+          "currentObservers": Array [],
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -85,7 +79,6 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
   setIsMounting={[Function]}
   theme$={
     Observable {
-      "_isScalar": false,
       "_subscribe": [Function],
     }
   }
diff --git a/src/core/public/application/application_service.test.ts b/src/core/public/application/application_service.test.ts
index 79f62fd152721..e8332cbf198fd 100644
--- a/src/core/public/application/application_service.test.ts
+++ b/src/core/public/application/application_service.test.ts
@@ -13,8 +13,8 @@ import {
 } from './application_service.test.mocks';
 
 import { createElement } from 'react';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { bufferCount, take, takeUntil } from 'rxjs/operators';
+import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
+import { bufferCount, takeUntil } from 'rxjs/operators';
 import { mount, shallow } from 'enzyme';
 
 import { httpServiceMock } from '../http/http_service.mock';
@@ -96,7 +96,7 @@ describe('#setup()', () => {
       );
       const { applications$ } = await service.start(startDeps);
 
-      let applications = await applications$.pipe(take(1)).toPromise();
+      let applications = await firstValueFrom(applications$);
       expect(applications.size).toEqual(2);
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
@@ -125,7 +125,7 @@ describe('#setup()', () => {
         deepLinks: [{ id: 'subapp2', title: 'Subapp 2', path: '/subapp2' }],
       }));
 
-      applications = await applications$.pipe(take(1)).toPromise();
+      applications = await firstValueFrom(applications$);
       expect(applications.size).toEqual(2);
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
@@ -205,7 +205,7 @@ describe('#setup()', () => {
         })
       );
       const start = await service.start(startDeps);
-      const applications = await start.applications$.pipe(take(1)).toPromise();
+      const applications = await firstValueFrom(start.applications$);
 
       expect(applications.size).toEqual(2);
       expect(applications.get('app1')).toEqual(
@@ -252,7 +252,7 @@ describe('#setup()', () => {
       );
 
       const { applications$ } = await service.start(startDeps);
-      const applications = await applications$.pipe(take(1)).toPromise();
+      const applications = await firstValueFrom(applications$);
 
       expect(applications.size).toEqual(2);
       expect(applications.get('app1')).toEqual(
@@ -295,7 +295,7 @@ describe('#setup()', () => {
       );
 
       const start = await service.start(startDeps);
-      const applications = await start.applications$.pipe(take(1)).toPromise();
+      const applications = await firstValueFrom(start.applications$);
 
       expect(applications.size).toEqual(1);
       expect(applications.get('app1')).toEqual(
@@ -410,7 +410,7 @@ describe('#setup()', () => {
 
       updater$.next((app) => ({ defaultPath: '/foo' }));
 
-      let appInfos = await applications$.pipe(take(1)).toPromise();
+      let appInfos = await firstValueFrom(applications$);
 
       expect(appInfos.get('app1')!.deepLinks).toEqual([
         {
@@ -445,7 +445,7 @@ describe('#setup()', () => {
         ],
       }));
 
-      appInfos = await applications$.pipe(take(1)).toPromise();
+      appInfos = await firstValueFrom(applications$);
 
       expect(appInfos.get('app1')!.deepLinks).toEqual([
         {
@@ -496,7 +496,7 @@ describe('#start()', () => {
     register(Symbol(), createApp({ id: 'app2' }));
 
     const { applications$ } = await service.start(startDeps);
-    const availableApps = await applications$.pipe(take(1)).toPromise();
+    const availableApps = await firstValueFrom(applications$);
 
     expect(availableApps.size).toEqual(2);
     expect([...availableApps.keys()]).toEqual(['app1', 'app2']);
@@ -548,7 +548,7 @@ describe('#start()', () => {
     register(Symbol(), createApp({ id: 'app2' }));
 
     const { applications$ } = await service.start(startDeps);
-    const availableApps = await applications$.pipe(take(1)).toPromise();
+    const availableApps = await firstValueFrom(applications$);
 
     expect([...availableApps.keys()]).toEqual(['app1']);
   });
@@ -802,7 +802,7 @@ describe('#start()', () => {
       service.setup(setupDeps);
 
       const { currentAppId$, navigateToApp } = await service.start(startDeps);
-      const stop$ = new Subject();
+      const stop$ = new Subject<void>();
       const promise = currentAppId$.pipe(bufferCount(4), takeUntil(stop$)).toPromise();
 
       await navigateToApp('alpha');
@@ -827,7 +827,7 @@ describe('#start()', () => {
       service.setup(setupDeps);
 
       const { currentAppId$, navigateToApp } = await service.start(startDeps);
-      const stop$ = new Subject();
+      const stop$ = new Subject<void>();
       const promise = currentAppId$.pipe(bufferCount(4), takeUntil(stop$)).toPromise();
 
       await navigateToApp('delta', { openInNewTab: true });
@@ -871,7 +871,7 @@ describe('#start()', () => {
 
       const { navigateToApp, getComponent } = await service.start(startDeps);
       const httpLoadingCount$ = startDeps.http.addLoadingCountSource.mock.calls[0][0];
-      const stop$ = new Subject();
+      const stop$ = new Subject<void>();
       const currentLoadingCount$ = new BehaviorSubject(0);
       httpLoadingCount$.pipe(takeUntil(stop$)).subscribe(currentLoadingCount$);
       const loadingPromise = httpLoadingCount$.pipe(bufferCount(5), takeUntil(stop$)).toPromise();
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 68807323c0a63..9a2703eb74872 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, Observable, Subject, Subscription } from 'rxjs';
 import { map, shareReplay, takeUntil, distinctUntilChanged, filter, take } from 'rxjs/operators';
 import { createBrowserHistory, History } from 'history';
 
@@ -99,7 +99,7 @@ export class ApplicationService {
   private currentActionMenu$ = new BehaviorSubject<MountPoint | undefined>(undefined);
   private readonly statusUpdaters$ = new BehaviorSubject<Map<symbol, AppUpdaterWrapper>>(new Map());
   private readonly subscriptions: Subscription[] = [];
-  private stop$ = new Subject();
+  private stop$ = new Subject<void>();
   private registrationClosed = false;
   private history?: History<any>;
   private navigate?: (url: string, state: unknown, replace: boolean) => void;
@@ -120,7 +120,7 @@ export class ApplicationService {
       createBrowserHistory({
         basename,
         getUserConfirmation: getUserConfirmationHandler({
-          overlayPromise: this.overlayStart$.pipe(take(1)).toPromise(),
+          overlayPromise: firstValueFrom(this.overlayStart$.pipe(take(1))),
         }),
       });
 
diff --git a/src/core/public/application/integration_tests/application_service.test.tsx b/src/core/public/application/integration_tests/application_service.test.tsx
index 99e6d86b6a941..476457d34ccb2 100644
--- a/src/core/public/application/integration_tests/application_service.test.tsx
+++ b/src/core/public/application/integration_tests/application_service.test.tsx
@@ -19,7 +19,7 @@ import { overlayServiceMock } from '../../overlays/overlay_service.mock';
 import { themeServiceMock } from '../../theme/theme_service.mock';
 import { AppMountParameters, AppUpdater } from '../types';
 import { Observable } from 'rxjs';
-import { MountPoint } from 'kibana/public';
+import { MountPoint } from '../..';
 
 const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
 
diff --git a/src/core/public/application/navigation_confirm.ts b/src/core/public/application/navigation_confirm.ts
index 9bae41c71e2d0..63c6a7a438b86 100644
--- a/src/core/public/application/navigation_confirm.ts
+++ b/src/core/public/application/navigation_confirm.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '..';
 
 export type ConfirmHandlerCallback = (result: boolean) => void;
 export type ConfirmHandler = (message: string, callback: ConfirmHandlerCallback) => void;
diff --git a/src/core/public/chrome/chrome_service.mock.ts b/src/core/public/chrome/chrome_service.mock.ts
index a92179ca9283c..08c14e955bcbe 100644
--- a/src/core/public/chrome/chrome_service.mock.ts
+++ b/src/core/public/chrome/chrome_service.mock.ts
@@ -9,7 +9,7 @@
 import { BehaviorSubject } from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import { ChromeBadge, ChromeBreadcrumb, ChromeService, InternalChromeStart } from './';
+import { ChromeBadge, ChromeBreadcrumb, ChromeService, InternalChromeStart } from '.';
 
 const createStartContractMock = () => {
   const startContract: DeeplyMockedKeys<InternalChromeStart> = {
diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
index 505f3fc7a23d2..dbdc867ea33b3 100644
--- a/src/core/public/chrome/chrome_service.test.ts
+++ b/src/core/public/chrome/chrome_service.test.ts
@@ -9,7 +9,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import * as Rx from 'rxjs';
-import { take, toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs/operators';
 import { App, PublicAppInfo } from '../application';
 import { applicationServiceMock } from '../application/application_service.mock';
 import { docLinksServiceMock } from '../doc_links/doc_links_service.mock';
@@ -229,7 +229,7 @@ describe('start', () => {
       const { chrome, service } = await start({ startDeps });
       const promise = chrome.getIsVisible$().pipe(toArray()).toPromise();
 
-      const availableApps = await applications$.pipe(take(1)).toPromise();
+      const availableApps = await Rx.firstValueFrom(applications$);
       [...availableApps.keys()].forEach((appId) => navigateToApp(appId));
       service.stop();
 
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 7db042313796d..a9678613b5fd0 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -55,7 +55,7 @@ export interface StartDeps {
 export class ChromeService {
   private isVisible$!: Observable<boolean>;
   private isForceHidden$!: BehaviorSubject<boolean>;
-  private readonly stop$ = new ReplaySubject(1);
+  private readonly stop$ = new ReplaySubject<void>(1);
   private readonly navControls = new NavControlsService();
   private readonly navLinks = new NavLinksService();
   private readonly recentlyAccessed = new RecentlyAccessedService();
diff --git a/src/core/public/chrome/nav_controls/nav_controls_service.ts b/src/core/public/chrome/nav_controls/nav_controls_service.ts
index 1f45cd9470645..13c65b65e5725 100644
--- a/src/core/public/chrome/nav_controls/nav_controls_service.ts
+++ b/src/core/public/chrome/nav_controls/nav_controls_service.ts
@@ -50,7 +50,7 @@ export interface ChromeNavControls {
 
 /** @internal */
 export class NavControlsService {
-  private readonly stop$ = new ReplaySubject(1);
+  private readonly stop$ = new ReplaySubject<void>(1);
 
   public start() {
     const navControlsLeft$ = new BehaviorSubject<ReadonlySet<ChromeNavControl>>(new Set());
diff --git a/src/core/public/chrome/nav_links/nav_link.ts b/src/core/public/chrome/nav_links/nav_link.ts
index 4e9158cac5cd4..f80a07a91865d 100644
--- a/src/core/public/chrome/nav_links/nav_link.ts
+++ b/src/core/public/chrome/nav_links/nav_link.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { AppCategory } from '../../';
+import { AppCategory } from '../..';
 
 /**
  * @public
diff --git a/src/core/public/chrome/nav_links/nav_links_service.ts b/src/core/public/chrome/nav_links/nav_links_service.ts
index 6a91d4d179076..cd3be364c1b9b 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.ts
@@ -69,7 +69,7 @@ export interface ChromeNavLinks {
 }
 
 export class NavLinksService {
-  private readonly stop$ = new ReplaySubject(1);
+  private readonly stop$ = new ReplaySubject<void>(1);
 
   public start({ application, http }: StartDeps): ChromeNavLinks {
     const navLinks$ = new BehaviorSubject<ReadonlyMap<string, NavLinkWrapper>>(new Map());
diff --git a/src/core/public/chrome/recently_accessed/create_log_key.ts b/src/core/public/chrome/recently_accessed/create_log_key.ts
index 5a93ea5cc9267..bc7655294f049 100644
--- a/src/core/public/chrome/recently_accessed/create_log_key.ts
+++ b/src/core/public/chrome/recently_accessed/create_log_key.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Sha256 } from '../../utils/';
+import { Sha256 } from '../../utils';
 export async function createLogKey(type: string, optionalIdentifier?: string) {
   const baseKey = `kibana.history.${type}`;
 
diff --git a/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts b/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts
index bcf58b7a40ab1..feddf07760de2 100644
--- a/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts
+++ b/src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts
@@ -90,7 +90,7 @@ describe('RecentlyAccessed#start()', () => {
 
   it('exposes an observable', async () => {
     const { recentlyAccessed } = await getStart();
-    const stop$ = new Subject();
+    const stop$ = new Subject<void>();
     const observedValues$ = recentlyAccessed
       .get$()
       .pipe(bufferCount(3), takeUntil(stop$))
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 99d116b1dd957..df638e4b66bbe 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -4,48 +4,32 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
 <CollapsibleNav
   appId$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": "test",
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -65,7 +49,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
   closeNav={[Function]}
   customNavLink$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Object {
         "baseUrl": "/",
         "category": undefined,
@@ -77,45 +60,30 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
         "url": "/",
       },
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -127,7 +95,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
   isNavOpen={true}
   navLinks$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [
         Object {
           "baseUrl": "/",
@@ -246,45 +213,30 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
         },
       ],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -295,7 +247,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
   onIsLockedUpdate={[Function]}
   recentlyAccessed$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [
         Object {
           "id": "recent 1",
@@ -309,45 +260,30 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
         },
       ],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2073,48 +2009,32 @@ exports[`CollapsibleNav renders the default nav 1`] = `
 <CollapsibleNav
   appId$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": "test",
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2134,48 +2054,32 @@ exports[`CollapsibleNav renders the default nav 1`] = `
   closeNav={[Function]}
   customNavLink$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": undefined,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2187,48 +2091,32 @@ exports[`CollapsibleNav renders the default nav 1`] = `
   isNavOpen={false}
   navLinks$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2239,48 +2127,32 @@ exports[`CollapsibleNav renders the default nav 1`] = `
   onIsLockedUpdate={[Function]}
   recentlyAccessed$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2321,48 +2193,32 @@ exports[`CollapsibleNav renders the default nav 2`] = `
 <CollapsibleNav
   appId$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": "test",
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2382,48 +2238,32 @@ exports[`CollapsibleNav renders the default nav 2`] = `
   closeNav={[Function]}
   customNavLink$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": undefined,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2436,48 +2276,32 @@ exports[`CollapsibleNav renders the default nav 2`] = `
   isOpen={true}
   navLinks$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -2488,48 +2312,32 @@ exports[`CollapsibleNav renders the default nav 2`] = `
   onIsLockedUpdate={[Function]}
   recentlyAccessed$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index ad0f27bbf08ce..a2433891023a4 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -4,9 +4,9 @@ exports[`Header renders 1`] = `
 <Header
   appTitle$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": "test",
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [],
@@ -16,9 +16,9 @@ exports[`Header renders 1`] = `
   application={
     Object {
       "applications$": BehaviorSubject {
-        "_isScalar": false,
         "_value": Map {},
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
@@ -30,96 +30,63 @@ exports[`Header renders 1`] = `
         "navLinks": Object {},
       },
       "currentActionMenu$": BehaviorSubject {
-        "_isScalar": false,
         "_value": undefined,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [
-          Subscriber {
-            "_parentOrParents": null,
-            "_subscriptions": Array [
-              SubjectSubscription {
-                "_parentOrParents": [Circular],
-                "_subscriptions": null,
+          SafeSubscriber {
+            "_finalizers": Array [
+              Subscription {
+                "_finalizers": null,
+                "_parentage": [Circular],
                 "closed": false,
-                "subject": [Circular],
-                "subscriber": [Circular],
+                "initialTeardown": [Function],
               },
             ],
+            "_parentage": null,
             "closed": false,
-            "destination": SafeSubscriber {
-              "_complete": undefined,
-              "_context": [Circular],
-              "_error": undefined,
-              "_next": [Function],
-              "_parentOrParents": null,
-              "_parentSubscriber": [Circular],
-              "_subscriptions": null,
-              "closed": false,
-              "destination": Object {
-                "closed": true,
-                "complete": [Function],
-                "error": [Function],
+            "destination": ConsumerObserver {
+              "partialObserver": Object {
+                "complete": undefined,
+                "error": undefined,
                 "next": [Function],
               },
-              "isStopped": false,
-              "syncErrorThrowable": false,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
+            "initialTeardown": undefined,
             "isStopped": false,
-            "syncErrorThrowable": true,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
         ],
         "thrownError": null,
       },
       "currentAppId$": Observable {
-        "_isScalar": false,
         "source": Subject {
-          "_isScalar": false,
           "closed": false,
+          "currentObservers": null,
           "hasError": false,
           "isStopped": false,
           "observers": Array [
-            Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                SubjectSubscription {
-                  "_parentOrParents": [Circular],
-                  "_subscriptions": null,
+            SafeSubscriber {
+              "_finalizers": Array [
+                Subscription {
+                  "_finalizers": null,
+                  "_parentage": [Circular],
                   "closed": false,
-                  "subject": [Circular],
-                  "subscriber": [Circular],
+                  "initialTeardown": [Function],
                 },
               ],
+              "_parentage": null,
               "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
+              "destination": ConsumerObserver {
+                "partialObserver": Object {
+                  "complete": undefined,
+                  "error": undefined,
                   "next": [Function],
                 },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
               },
+              "initialTeardown": undefined,
               "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
           ],
           "thrownError": null,
@@ -152,48 +119,32 @@ exports[`Header renders 1`] = `
   }
   badge$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": undefined,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -211,52 +162,36 @@ exports[`Header renders 1`] = `
   }
   breadcrumbs$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [
         Object {
           "text": "test",
         },
       ],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -264,48 +199,32 @@ exports[`Header renders 1`] = `
   }
   breadcrumbsAppendExtension$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": undefined,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -313,7 +232,6 @@ exports[`Header renders 1`] = `
   }
   customNavLink$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Object {
         "baseUrl": "",
         "href": "",
@@ -322,45 +240,30 @@ exports[`Header renders 1`] = `
         "url": "",
       },
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -368,48 +271,32 @@ exports[`Header renders 1`] = `
   }
   forceAppSwitcherNavigation$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": false,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -417,48 +304,32 @@ exports[`Header renders 1`] = `
   }
   headerBanner$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": undefined,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -466,348 +337,101 @@ exports[`Header renders 1`] = `
   }
   helpExtension$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": undefined,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        InnerSubscriber {
-          "_parentOrParents": CombineLatestSubscriber {
-            "_parentOrParents": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
+        OperatorSubscriber {
+          "_complete": [Function],
+          "_error": [Function],
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
-              },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
+              "initialTeardown": [Function],
             },
-            "_subscriptions": Array [
+          ],
+          "_next": [Function],
+          "_parentage": SafeSubscriber {
+            "_finalizers": Array [
               [Circular],
-              InnerSubscriber {
-                "_parentOrParents": [Circular],
-                "_subscriptions": Array [
-                  SubjectSubscription {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": null,
+              OperatorSubscriber {
+                "_complete": [Function],
+                "_error": [Function],
+                "_finalizers": Array [
+                  Subscription {
+                    "_finalizers": null,
+                    "_parentage": [Circular],
                     "closed": false,
-                    "subject": BehaviorSubject {
-                      "_isScalar": false,
-                      "_value": "",
-                      "closed": false,
-                      "hasError": false,
-                      "isStopped": false,
-                      "observers": Array [
-                        [Circular],
-                      ],
-                      "thrownError": null,
-                    },
-                    "subscriber": [Circular],
+                    "initialTeardown": [Function],
                   },
                 ],
+                "_next": [Function],
+                "_parentage": [Circular],
                 "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "index": 1,
+                "destination": [Circular],
+                "initialTeardown": undefined,
                 "isStopped": false,
-                "outerIndex": 1,
-                "outerValue": undefined,
-                "parent": [Circular],
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+                "onFinalize": undefined,
+                "shouldUnsubscribe": undefined,
               },
             ],
-            "active": 2,
+            "_parentage": null,
             "closed": false,
-            "destination": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
-              "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+            "destination": ConsumerObserver {
+              "partialObserver": Object {
+                "complete": undefined,
+                "error": undefined,
+                "next": [Function],
               },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
-            "isStopped": true,
-            "observables": Array [
-              [Circular],
-              BehaviorSubject {
-                "_isScalar": false,
-                "_value": "",
-                "closed": false,
-                "hasError": false,
-                "isStopped": false,
-                "observers": Array [
-                  InnerSubscriber {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": Array [
-                      SubjectSubscription {
-                        "_parentOrParents": [Circular],
-                        "_subscriptions": null,
-                        "closed": false,
-                        "subject": [Circular],
-                        "subscriber": [Circular],
-                      },
-                    ],
-                    "closed": false,
-                    "destination": Object {
-                      "closed": true,
-                      "complete": [Function],
-                      "error": [Function],
-                      "next": [Function],
-                    },
-                    "index": 1,
-                    "isStopped": false,
-                    "outerIndex": 1,
-                    "outerValue": undefined,
-                    "parent": [Circular],
-                    "syncErrorThrowable": false,
-                    "syncErrorThrown": false,
-                    "syncErrorValue": null,
-                  },
-                ],
-                "thrownError": null,
-              },
-            ],
-            "resultSelector": undefined,
-            "syncErrorThrowable": true,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
-            "toRespond": 0,
-            "values": Array [
-              undefined,
-              "",
-            ],
+            "initialTeardown": undefined,
+            "isStopped": false,
           },
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
-              "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
-            },
-          ],
           "closed": false,
-          "destination": Object {
-            "closed": true,
-            "complete": [Function],
-            "error": [Function],
-            "next": [Function],
-          },
-          "index": 1,
-          "isStopped": false,
-          "outerIndex": 0,
-          "outerValue": undefined,
-          "parent": CombineLatestSubscriber {
-            "_parentOrParents": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
-              "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
-              },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
-            },
-            "_subscriptions": Array [
+          "destination": SafeSubscriber {
+            "_finalizers": Array [
               [Circular],
-              InnerSubscriber {
-                "_parentOrParents": [Circular],
-                "_subscriptions": Array [
-                  SubjectSubscription {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": null,
+              OperatorSubscriber {
+                "_complete": [Function],
+                "_error": [Function],
+                "_finalizers": Array [
+                  Subscription {
+                    "_finalizers": null,
+                    "_parentage": [Circular],
                     "closed": false,
-                    "subject": BehaviorSubject {
-                      "_isScalar": false,
-                      "_value": "",
-                      "closed": false,
-                      "hasError": false,
-                      "isStopped": false,
-                      "observers": Array [
-                        [Circular],
-                      ],
-                      "thrownError": null,
-                    },
-                    "subscriber": [Circular],
+                    "initialTeardown": [Function],
                   },
                 ],
+                "_next": [Function],
+                "_parentage": [Circular],
                 "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "index": 1,
+                "destination": [Circular],
+                "initialTeardown": undefined,
                 "isStopped": false,
-                "outerIndex": 1,
-                "outerValue": undefined,
-                "parent": [Circular],
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+                "onFinalize": undefined,
+                "shouldUnsubscribe": undefined,
               },
             ],
-            "active": 2,
+            "_parentage": null,
             "closed": false,
-            "destination": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
-              "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+            "destination": ConsumerObserver {
+              "partialObserver": Object {
+                "complete": undefined,
+                "error": undefined,
+                "next": [Function],
               },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
-            "isStopped": true,
-            "observables": Array [
-              [Circular],
-              BehaviorSubject {
-                "_isScalar": false,
-                "_value": "",
-                "closed": false,
-                "hasError": false,
-                "isStopped": false,
-                "observers": Array [
-                  InnerSubscriber {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": Array [
-                      SubjectSubscription {
-                        "_parentOrParents": [Circular],
-                        "_subscriptions": null,
-                        "closed": false,
-                        "subject": [Circular],
-                        "subscriber": [Circular],
-                      },
-                    ],
-                    "closed": false,
-                    "destination": Object {
-                      "closed": true,
-                      "complete": [Function],
-                      "error": [Function],
-                      "next": [Function],
-                    },
-                    "index": 1,
-                    "isStopped": false,
-                    "outerIndex": 1,
-                    "outerValue": undefined,
-                    "parent": [Circular],
-                    "syncErrorThrowable": false,
-                    "syncErrorThrown": false,
-                    "syncErrorValue": null,
-                  },
-                ],
-                "thrownError": null,
-              },
-            ],
-            "resultSelector": undefined,
-            "syncErrorThrowable": true,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
-            "toRespond": 0,
-            "values": Array [
-              undefined,
-              "",
-            ],
+            "initialTeardown": undefined,
+            "isStopped": false,
           },
-          "syncErrorThrowable": false,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
+          "initialTeardown": undefined,
+          "isStopped": false,
+          "onFinalize": undefined,
+          "shouldUnsubscribe": undefined,
         },
       ],
       "thrownError": null,
@@ -815,348 +439,101 @@ exports[`Header renders 1`] = `
   }
   helpSupportUrl$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": "",
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        InnerSubscriber {
-          "_parentOrParents": CombineLatestSubscriber {
-            "_parentOrParents": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
+        OperatorSubscriber {
+          "_complete": [Function],
+          "_error": [Function],
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
-              },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
+              "initialTeardown": [Function],
             },
-            "_subscriptions": Array [
-              InnerSubscriber {
-                "_parentOrParents": [Circular],
-                "_subscriptions": Array [
-                  SubjectSubscription {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": null,
+          ],
+          "_next": [Function],
+          "_parentage": SafeSubscriber {
+            "_finalizers": Array [
+              OperatorSubscriber {
+                "_complete": [Function],
+                "_error": [Function],
+                "_finalizers": Array [
+                  Subscription {
+                    "_finalizers": null,
+                    "_parentage": [Circular],
                     "closed": false,
-                    "subject": BehaviorSubject {
-                      "_isScalar": false,
-                      "_value": undefined,
-                      "closed": false,
-                      "hasError": false,
-                      "isStopped": false,
-                      "observers": Array [
-                        [Circular],
-                      ],
-                      "thrownError": null,
-                    },
-                    "subscriber": [Circular],
+                    "initialTeardown": [Function],
                   },
                 ],
+                "_next": [Function],
+                "_parentage": [Circular],
                 "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "index": 1,
+                "destination": [Circular],
+                "initialTeardown": undefined,
                 "isStopped": false,
-                "outerIndex": 0,
-                "outerValue": undefined,
-                "parent": [Circular],
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+                "onFinalize": undefined,
+                "shouldUnsubscribe": undefined,
               },
               [Circular],
             ],
-            "active": 2,
+            "_parentage": null,
             "closed": false,
-            "destination": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
-              "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+            "destination": ConsumerObserver {
+              "partialObserver": Object {
+                "complete": undefined,
+                "error": undefined,
+                "next": [Function],
               },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
-            "isStopped": true,
-            "observables": Array [
-              BehaviorSubject {
-                "_isScalar": false,
-                "_value": undefined,
-                "closed": false,
-                "hasError": false,
-                "isStopped": false,
-                "observers": Array [
-                  InnerSubscriber {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": Array [
-                      SubjectSubscription {
-                        "_parentOrParents": [Circular],
-                        "_subscriptions": null,
-                        "closed": false,
-                        "subject": [Circular],
-                        "subscriber": [Circular],
-                      },
-                    ],
-                    "closed": false,
-                    "destination": Object {
-                      "closed": true,
-                      "complete": [Function],
-                      "error": [Function],
-                      "next": [Function],
-                    },
-                    "index": 1,
-                    "isStopped": false,
-                    "outerIndex": 0,
-                    "outerValue": undefined,
-                    "parent": [Circular],
-                    "syncErrorThrowable": false,
-                    "syncErrorThrown": false,
-                    "syncErrorValue": null,
-                  },
-                ],
-                "thrownError": null,
-              },
-              [Circular],
-            ],
-            "resultSelector": undefined,
-            "syncErrorThrowable": true,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
-            "toRespond": 0,
-            "values": Array [
-              undefined,
-              "",
-            ],
+            "initialTeardown": undefined,
+            "isStopped": false,
           },
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
-              "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
-            },
-          ],
           "closed": false,
-          "destination": Object {
-            "closed": true,
-            "complete": [Function],
-            "error": [Function],
-            "next": [Function],
-          },
-          "index": 1,
-          "isStopped": false,
-          "outerIndex": 1,
-          "outerValue": undefined,
-          "parent": CombineLatestSubscriber {
-            "_parentOrParents": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
-              "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
-              },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
-            },
-            "_subscriptions": Array [
-              InnerSubscriber {
-                "_parentOrParents": [Circular],
-                "_subscriptions": Array [
-                  SubjectSubscription {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": null,
+          "destination": SafeSubscriber {
+            "_finalizers": Array [
+              OperatorSubscriber {
+                "_complete": [Function],
+                "_error": [Function],
+                "_finalizers": Array [
+                  Subscription {
+                    "_finalizers": null,
+                    "_parentage": [Circular],
                     "closed": false,
-                    "subject": BehaviorSubject {
-                      "_isScalar": false,
-                      "_value": undefined,
-                      "closed": false,
-                      "hasError": false,
-                      "isStopped": false,
-                      "observers": Array [
-                        [Circular],
-                      ],
-                      "thrownError": null,
-                    },
-                    "subscriber": [Circular],
+                    "initialTeardown": [Function],
                   },
                 ],
+                "_next": [Function],
+                "_parentage": [Circular],
                 "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "index": 1,
+                "destination": [Circular],
+                "initialTeardown": undefined,
                 "isStopped": false,
-                "outerIndex": 0,
-                "outerValue": undefined,
-                "parent": [Circular],
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+                "onFinalize": undefined,
+                "shouldUnsubscribe": undefined,
               },
               [Circular],
             ],
-            "active": 2,
+            "_parentage": null,
             "closed": false,
-            "destination": Subscriber {
-              "_parentOrParents": null,
-              "_subscriptions": Array [
-                [Circular],
-              ],
-              "closed": false,
-              "destination": SafeSubscriber {
-                "_complete": undefined,
-                "_context": [Circular],
-                "_error": undefined,
-                "_next": [Function],
-                "_parentOrParents": null,
-                "_parentSubscriber": [Circular],
-                "_subscriptions": null,
-                "closed": false,
-                "destination": Object {
-                  "closed": true,
-                  "complete": [Function],
-                  "error": [Function],
-                  "next": [Function],
-                },
-                "isStopped": false,
-                "syncErrorThrowable": false,
-                "syncErrorThrown": false,
-                "syncErrorValue": null,
+            "destination": ConsumerObserver {
+              "partialObserver": Object {
+                "complete": undefined,
+                "error": undefined,
+                "next": [Function],
               },
-              "isStopped": false,
-              "syncErrorThrowable": true,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
-            "isStopped": true,
-            "observables": Array [
-              BehaviorSubject {
-                "_isScalar": false,
-                "_value": undefined,
-                "closed": false,
-                "hasError": false,
-                "isStopped": false,
-                "observers": Array [
-                  InnerSubscriber {
-                    "_parentOrParents": [Circular],
-                    "_subscriptions": Array [
-                      SubjectSubscription {
-                        "_parentOrParents": [Circular],
-                        "_subscriptions": null,
-                        "closed": false,
-                        "subject": [Circular],
-                        "subscriber": [Circular],
-                      },
-                    ],
-                    "closed": false,
-                    "destination": Object {
-                      "closed": true,
-                      "complete": [Function],
-                      "error": [Function],
-                      "next": [Function],
-                    },
-                    "index": 1,
-                    "isStopped": false,
-                    "outerIndex": 0,
-                    "outerValue": undefined,
-                    "parent": [Circular],
-                    "syncErrorThrowable": false,
-                    "syncErrorThrown": false,
-                    "syncErrorValue": null,
-                  },
-                ],
-                "thrownError": null,
-              },
-              [Circular],
-            ],
-            "resultSelector": undefined,
-            "syncErrorThrowable": true,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
-            "toRespond": 0,
-            "values": Array [
-              undefined,
-              "",
-            ],
+            "initialTeardown": undefined,
+            "isStopped": false,
           },
-          "syncErrorThrowable": false,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
+          "initialTeardown": undefined,
+          "isStopped": false,
+          "onFinalize": undefined,
+          "shouldUnsubscribe": undefined,
         },
       ],
       "thrownError": null,
@@ -1267,9 +644,9 @@ exports[`Header renders 1`] = `
   }
   isLocked$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": true,
       "closed": false,
+      "currentObservers": Array [],
       "hasError": false,
       "isStopped": false,
       "observers": Array [],
@@ -1278,48 +655,54 @@ exports[`Header renders 1`] = `
   }
   isVisible$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": true,
       "closed": false,
+      "currentObservers": Array [
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
+              "closed": false,
+              "initialTeardown": [Function],
+            },
+          ],
+          "_parentage": null,
+          "closed": false,
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
+              "next": [Function],
+            },
+          },
+          "initialTeardown": undefined,
+          "isStopped": false,
+        },
+      ],
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1329,48 +712,32 @@ exports[`Header renders 1`] = `
   kibanaVersion="1.0.0"
   loadingCount$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": 0,
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1378,48 +745,32 @@ exports[`Header renders 1`] = `
   }
   navControlsCenter$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1427,48 +778,32 @@ exports[`Header renders 1`] = `
   }
   navControlsLeft$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1476,48 +811,32 @@ exports[`Header renders 1`] = `
   }
   navControlsRight$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1525,7 +844,6 @@ exports[`Header renders 1`] = `
   }
   navLinks$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [
         Object {
           "baseUrl": "",
@@ -1536,82 +854,51 @@ exports[`Header renders 1`] = `
         },
       ],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1620,7 +907,6 @@ exports[`Header renders 1`] = `
   onIsLockedUpdate={[Function]}
   recentlyAccessed$={
     BehaviorSubject {
-      "_isScalar": false,
       "_value": Array [
         Object {
           "id": "dashboard",
@@ -1629,45 +915,30 @@ exports[`Header renders 1`] = `
         },
       ],
       "closed": false,
+      "currentObservers": null,
       "hasError": false,
       "isStopped": false,
       "observers": Array [
-        Subscriber {
-          "_parentOrParents": null,
-          "_subscriptions": Array [
-            SubjectSubscription {
-              "_parentOrParents": [Circular],
-              "_subscriptions": null,
+        SafeSubscriber {
+          "_finalizers": Array [
+            Subscription {
+              "_finalizers": null,
+              "_parentage": [Circular],
               "closed": false,
-              "subject": [Circular],
-              "subscriber": [Circular],
+              "initialTeardown": [Function],
             },
           ],
+          "_parentage": null,
           "closed": false,
-          "destination": SafeSubscriber {
-            "_complete": undefined,
-            "_context": [Circular],
-            "_error": undefined,
-            "_next": [Function],
-            "_parentOrParents": null,
-            "_parentSubscriber": [Circular],
-            "_subscriptions": null,
-            "closed": false,
-            "destination": Object {
-              "closed": true,
-              "complete": [Function],
-              "error": [Function],
+          "destination": ConsumerObserver {
+            "partialObserver": Object {
+              "complete": undefined,
+              "error": undefined,
               "next": [Function],
             },
-            "isStopped": false,
-            "syncErrorThrowable": false,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
+          "initialTeardown": undefined,
           "isStopped": false,
-          "syncErrorThrowable": true,
-          "syncErrorThrown": false,
-          "syncErrorValue": null,
         },
       ],
       "thrownError": null,
@@ -1677,48 +948,32 @@ exports[`Header renders 1`] = `
   <HeaderTopBanner
     headerBanner$={
       BehaviorSubject {
-        "_isScalar": false,
         "_value": undefined,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [
-          Subscriber {
-            "_parentOrParents": null,
-            "_subscriptions": Array [
-              SubjectSubscription {
-                "_parentOrParents": [Circular],
-                "_subscriptions": null,
+          SafeSubscriber {
+            "_finalizers": Array [
+              Subscription {
+                "_finalizers": null,
+                "_parentage": [Circular],
                 "closed": false,
-                "subject": [Circular],
-                "subscriber": [Circular],
+                "initialTeardown": [Function],
               },
             ],
+            "_parentage": null,
             "closed": false,
-            "destination": SafeSubscriber {
-              "_complete": undefined,
-              "_context": [Circular],
-              "_error": undefined,
-              "_next": [Function],
-              "_parentOrParents": null,
-              "_parentSubscriber": [Circular],
-              "_subscriptions": null,
-              "closed": false,
-              "destination": Object {
-                "closed": true,
-                "complete": [Function],
-                "error": [Function],
+            "destination": ConsumerObserver {
+              "partialObserver": Object {
+                "complete": undefined,
+                "error": undefined,
                 "next": [Function],
               },
-              "isStopped": false,
-              "syncErrorThrowable": false,
-              "syncErrorThrown": false,
-              "syncErrorValue": null,
             },
+            "initialTeardown": undefined,
             "isStopped": false,
-            "syncErrorThrowable": true,
-            "syncErrorThrown": false,
-            "syncErrorValue": null,
           },
         ],
         "thrownError": null,
@@ -1744,48 +999,32 @@ exports[`Header renders 1`] = `
                 <HeaderLogo
                   forceNavigation$={
                     BehaviorSubject {
-                      "_isScalar": false,
                       "_value": false,
                       "closed": false,
+                      "currentObservers": null,
                       "hasError": false,
                       "isStopped": false,
                       "observers": Array [
-                        Subscriber {
-                          "_parentOrParents": null,
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
+                        SafeSubscriber {
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
                               "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
+                              "initialTeardown": [Function],
                             },
                           ],
+                          "_parentage": null,
                           "closed": false,
-                          "destination": SafeSubscriber {
-                            "_complete": undefined,
-                            "_context": [Circular],
-                            "_error": undefined,
-                            "_next": [Function],
-                            "_parentOrParents": null,
-                            "_parentSubscriber": [Circular],
-                            "_subscriptions": null,
-                            "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
+                          "destination": ConsumerObserver {
+                            "partialObserver": Object {
+                              "complete": undefined,
+                              "error": undefined,
                               "next": [Function],
                             },
-                            "isStopped": false,
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
+                          "initialTeardown": undefined,
                           "isStopped": false,
-                          "syncErrorThrowable": true,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
                         },
                       ],
                       "thrownError": null,
@@ -1794,48 +1033,32 @@ exports[`Header renders 1`] = `
                   href="/"
                   loadingCount$={
                     BehaviorSubject {
-                      "_isScalar": false,
                       "_value": 0,
                       "closed": false,
+                      "currentObservers": null,
                       "hasError": false,
                       "isStopped": false,
                       "observers": Array [
-                        Subscriber {
-                          "_parentOrParents": null,
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
+                        SafeSubscriber {
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
                               "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
+                              "initialTeardown": [Function],
                             },
                           ],
+                          "_parentage": null,
                           "closed": false,
-                          "destination": SafeSubscriber {
-                            "_complete": undefined,
-                            "_context": [Circular],
-                            "_error": undefined,
-                            "_next": [Function],
-                            "_parentOrParents": null,
-                            "_parentSubscriber": [Circular],
-                            "_subscriptions": null,
-                            "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
+                          "destination": ConsumerObserver {
+                            "partialObserver": Object {
+                              "complete": undefined,
+                              "error": undefined,
                               "next": [Function],
                             },
-                            "isStopped": false,
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
+                          "initialTeardown": undefined,
                           "isStopped": false,
-                          "syncErrorThrowable": true,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
                         },
                       ],
                       "thrownError": null,
@@ -1843,7 +1066,6 @@ exports[`Header renders 1`] = `
                   }
                   navLinks$={
                     BehaviorSubject {
-                      "_isScalar": false,
                       "_value": Array [
                         Object {
                           "baseUrl": "",
@@ -1854,82 +1076,51 @@ exports[`Header renders 1`] = `
                         },
                       ],
                       "closed": false,
+                      "currentObservers": null,
                       "hasError": false,
                       "isStopped": false,
                       "observers": Array [
-                        Subscriber {
-                          "_parentOrParents": null,
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
+                        SafeSubscriber {
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
                               "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
+                              "initialTeardown": [Function],
                             },
                           ],
+                          "_parentage": null,
                           "closed": false,
-                          "destination": SafeSubscriber {
-                            "_complete": undefined,
-                            "_context": [Circular],
-                            "_error": undefined,
-                            "_next": [Function],
-                            "_parentOrParents": null,
-                            "_parentSubscriber": [Circular],
-                            "_subscriptions": null,
-                            "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
+                          "destination": ConsumerObserver {
+                            "partialObserver": Object {
+                              "complete": undefined,
+                              "error": undefined,
                               "next": [Function],
                             },
-                            "isStopped": false,
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
+                          "initialTeardown": undefined,
                           "isStopped": false,
-                          "syncErrorThrowable": true,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
                         },
-                        Subscriber {
-                          "_parentOrParents": null,
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
+                        SafeSubscriber {
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
                               "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
+                              "initialTeardown": [Function],
                             },
                           ],
+                          "_parentage": null,
                           "closed": false,
-                          "destination": SafeSubscriber {
-                            "_complete": undefined,
-                            "_context": [Circular],
-                            "_error": undefined,
-                            "_next": [Function],
-                            "_parentOrParents": null,
-                            "_parentSubscriber": [Circular],
-                            "_subscriptions": null,
-                            "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
+                          "destination": ConsumerObserver {
+                            "partialObserver": Object {
+                              "complete": undefined,
+                              "error": undefined,
                               "next": [Function],
                             },
-                            "isStopped": false,
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
+                          "initialTeardown": undefined,
                           "isStopped": false,
-                          "syncErrorThrowable": true,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
                         },
                       ],
                       "thrownError": null,
@@ -1954,48 +1145,32 @@ exports[`Header renders 1`] = `
                   <HeaderNavControls
                     navControls$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Array [],
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -2020,48 +1195,32 @@ exports[`Header renders 1`] = `
                   <HeaderNavControls
                     navControls$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Array [],
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -2072,697 +1231,203 @@ exports[`Header renders 1`] = `
                 <HeaderHelpMenu
                   helpExtension$={
                     BehaviorSubject {
-                      "_isScalar": false,
                       "_value": undefined,
                       "closed": false,
+                      "currentObservers": null,
                       "hasError": false,
                       "isStopped": false,
                       "observers": Array [
-                        InnerSubscriber {
-                          "_parentOrParents": CombineLatestSubscriber {
-                            "_parentOrParents": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                            },
-                            "_subscriptions": Array [
-                              [Circular],
-                              InnerSubscriber {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": Array [
-                                  SubjectSubscription {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": null,
-                                    "closed": false,
-                                    "subject": BehaviorSubject {
-                                      "_isScalar": false,
-                                      "_value": "",
-                                      "closed": false,
-                                      "hasError": false,
-                                      "isStopped": false,
-                                      "observers": Array [
-                                        [Circular],
-                                      ],
-                                      "thrownError": null,
-                                    },
-                                    "subscriber": [Circular],
-                                  },
-                                ],
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "index": 1,
-                                "isStopped": false,
-                                "outerIndex": 1,
-                                "outerValue": undefined,
-                                "parent": [Circular],
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                            ],
-                            "active": 2,
-                            "closed": false,
-                            "destination": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                            },
-                            "isStopped": true,
-                            "observables": Array [
-                              [Circular],
-                              BehaviorSubject {
-                                "_isScalar": false,
-                                "_value": "",
-                                "closed": false,
-                                "hasError": false,
-                                "isStopped": false,
-                                "observers": Array [
-                                  InnerSubscriber {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": Array [
-                                      SubjectSubscription {
-                                        "_parentOrParents": [Circular],
-                                        "_subscriptions": null,
-                                        "closed": false,
-                                        "subject": [Circular],
-                                        "subscriber": [Circular],
-                                      },
-                                    ],
-                                    "closed": false,
-                                    "destination": Object {
-                                      "closed": true,
-                                      "complete": [Function],
-                                      "error": [Function],
-                                      "next": [Function],
-                                    },
-                                    "index": 1,
-                                    "isStopped": false,
-                                    "outerIndex": 1,
-                                    "outerValue": undefined,
-                                    "parent": [Circular],
-                                    "syncErrorThrowable": false,
-                                    "syncErrorThrown": false,
-                                    "syncErrorValue": null,
-                                  },
-                                ],
-                                "thrownError": null,
-                              },
-                            ],
-                            "resultSelector": undefined,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
-                            "toRespond": 0,
-                            "values": Array [
-                              undefined,
-                              "",
-                            ],
-                          },
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
+                        OperatorSubscriber {
+                          "_complete": [Function],
+                          "_error": [Function],
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
                               "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
+                              "initialTeardown": [Function],
                             },
                           ],
-                          "closed": false,
-                          "destination": Object {
-                            "closed": true,
-                            "complete": [Function],
-                            "error": [Function],
-                            "next": [Function],
-                          },
-                          "index": 1,
-                          "isStopped": false,
-                          "outerIndex": 0,
-                          "outerValue": undefined,
-                          "parent": CombineLatestSubscriber {
-                            "_parentOrParents": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                            },
-                            "_subscriptions": Array [
+                          "_next": [Function],
+                          "_parentage": SafeSubscriber {
+                            "_finalizers": Array [
                               [Circular],
-                              InnerSubscriber {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": Array [
-                                  SubjectSubscription {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": null,
+                              OperatorSubscriber {
+                                "_complete": [Function],
+                                "_error": [Function],
+                                "_finalizers": Array [
+                                  Subscription {
+                                    "_finalizers": null,
+                                    "_parentage": [Circular],
                                     "closed": false,
-                                    "subject": BehaviorSubject {
-                                      "_isScalar": false,
-                                      "_value": "",
-                                      "closed": false,
-                                      "hasError": false,
-                                      "isStopped": false,
-                                      "observers": Array [
-                                        [Circular],
-                                      ],
-                                      "thrownError": null,
-                                    },
-                                    "subscriber": [Circular],
+                                    "initialTeardown": [Function],
                                   },
                                 ],
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "index": 1,
-                                "isStopped": false,
-                                "outerIndex": 1,
-                                "outerValue": undefined,
-                                "parent": [Circular],
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                            ],
-                            "active": 2,
-                            "closed": false,
-                            "destination": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
                                 "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                            },
-                            "isStopped": true,
-                            "observables": Array [
-                              [Circular],
-                              BehaviorSubject {
-                                "_isScalar": false,
-                                "_value": "",
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "hasError": false,
+                                "destination": [Circular],
+                                "initialTeardown": undefined,
                                 "isStopped": false,
-                                "observers": Array [
-                                  InnerSubscriber {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": Array [
-                                      SubjectSubscription {
-                                        "_parentOrParents": [Circular],
-                                        "_subscriptions": null,
-                                        "closed": false,
-                                        "subject": [Circular],
-                                        "subscriber": [Circular],
-                                      },
-                                    ],
-                                    "closed": false,
-                                    "destination": Object {
-                                      "closed": true,
-                                      "complete": [Function],
-                                      "error": [Function],
-                                      "next": [Function],
-                                    },
-                                    "index": 1,
-                                    "isStopped": false,
-                                    "outerIndex": 1,
-                                    "outerValue": undefined,
-                                    "parent": [Circular],
-                                    "syncErrorThrowable": false,
-                                    "syncErrorThrown": false,
-                                    "syncErrorValue": null,
-                                  },
-                                ],
-                                "thrownError": null,
+                                "onFinalize": undefined,
+                                "shouldUnsubscribe": undefined,
                               },
                             ],
-                            "resultSelector": undefined,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
-                            "toRespond": 0,
-                            "values": Array [
-                              undefined,
-                              "",
-                            ],
-                          },
-                          "syncErrorThrowable": false,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
-                        },
-                      ],
-                      "thrownError": null,
-                    }
-                  }
-                  helpSupportUrl$={
-                    BehaviorSubject {
-                      "_isScalar": false,
-                      "_value": "",
-                      "closed": false,
-                      "hasError": false,
-                      "isStopped": false,
-                      "observers": Array [
-                        InnerSubscriber {
-                          "_parentOrParents": CombineLatestSubscriber {
-                            "_parentOrParents": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                            },
-                            "_subscriptions": Array [
-                              InnerSubscriber {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": Array [
-                                  SubjectSubscription {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": null,
-                                    "closed": false,
-                                    "subject": BehaviorSubject {
-                                      "_isScalar": false,
-                                      "_value": undefined,
-                                      "closed": false,
-                                      "hasError": false,
-                                      "isStopped": false,
-                                      "observers": Array [
-                                        [Circular],
-                                      ],
-                                      "thrownError": null,
-                                    },
-                                    "subscriber": [Circular],
-                                  },
-                                ],
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "index": 1,
-                                "isStopped": false,
-                                "outerIndex": 0,
-                                "outerValue": undefined,
-                                "parent": [Circular],
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              [Circular],
-                            ],
-                            "active": 2,
+                            "_parentage": null,
                             "closed": false,
-                            "destination": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
+                                "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
-                            "isStopped": true,
-                            "observables": Array [
-                              BehaviorSubject {
-                                "_isScalar": false,
-                                "_value": undefined,
-                                "closed": false,
-                                "hasError": false,
-                                "isStopped": false,
-                                "observers": Array [
-                                  InnerSubscriber {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": Array [
-                                      SubjectSubscription {
-                                        "_parentOrParents": [Circular],
-                                        "_subscriptions": null,
-                                        "closed": false,
-                                        "subject": [Circular],
-                                        "subscriber": [Circular],
-                                      },
-                                    ],
-                                    "closed": false,
-                                    "destination": Object {
-                                      "closed": true,
-                                      "complete": [Function],
-                                      "error": [Function],
-                                      "next": [Function],
-                                    },
-                                    "index": 1,
-                                    "isStopped": false,
-                                    "outerIndex": 0,
-                                    "outerValue": undefined,
-                                    "parent": [Circular],
-                                    "syncErrorThrowable": false,
-                                    "syncErrorThrown": false,
-                                    "syncErrorValue": null,
-                                  },
-                                ],
-                                "thrownError": null,
-                              },
-                              [Circular],
-                            ],
-                            "resultSelector": undefined,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
-                            "toRespond": 0,
-                            "values": Array [
-                              undefined,
-                              "",
-                            ],
+                            "initialTeardown": undefined,
+                            "isStopped": false,
                           },
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
-                            },
-                          ],
                           "closed": false,
-                          "destination": Object {
-                            "closed": true,
-                            "complete": [Function],
-                            "error": [Function],
-                            "next": [Function],
-                          },
-                          "index": 1,
-                          "isStopped": false,
-                          "outerIndex": 1,
-                          "outerValue": undefined,
-                          "parent": CombineLatestSubscriber {
-                            "_parentOrParents": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
+                          "destination": SafeSubscriber {
+                            "_finalizers": Array [
+                              [Circular],
+                              OperatorSubscriber {
+                                "_complete": [Function],
+                                "_error": [Function],
+                                "_finalizers": Array [
+                                  Subscription {
+                                    "_finalizers": null,
+                                    "_parentage": [Circular],
+                                    "closed": false,
+                                    "initialTeardown": [Function],
+                                  },
+                                ],
                                 "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
+                                "destination": [Circular],
+                                "initialTeardown": undefined,
                                 "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
+                                "onFinalize": undefined,
+                                "shouldUnsubscribe": undefined,
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
+                            ],
+                            "_parentage": null,
+                            "closed": false,
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
+                                "next": [Function],
+                              },
+                            },
+                            "initialTeardown": undefined,
+                            "isStopped": false,
+                          },
+                          "initialTeardown": undefined,
+                          "isStopped": false,
+                          "onFinalize": undefined,
+                          "shouldUnsubscribe": undefined,
+                        },
+                      ],
+                      "thrownError": null,
+                    }
+                  }
+                  helpSupportUrl$={
+                    BehaviorSubject {
+                      "_value": "",
+                      "closed": false,
+                      "currentObservers": null,
+                      "hasError": false,
+                      "isStopped": false,
+                      "observers": Array [
+                        OperatorSubscriber {
+                          "_complete": [Function],
+                          "_error": [Function],
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
+                              "closed": false,
+                              "initialTeardown": [Function],
                             },
-                            "_subscriptions": Array [
-                              InnerSubscriber {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": Array [
-                                  SubjectSubscription {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": null,
+                          ],
+                          "_next": [Function],
+                          "_parentage": SafeSubscriber {
+                            "_finalizers": Array [
+                              OperatorSubscriber {
+                                "_complete": [Function],
+                                "_error": [Function],
+                                "_finalizers": Array [
+                                  Subscription {
+                                    "_finalizers": null,
+                                    "_parentage": [Circular],
                                     "closed": false,
-                                    "subject": BehaviorSubject {
-                                      "_isScalar": false,
-                                      "_value": undefined,
-                                      "closed": false,
-                                      "hasError": false,
-                                      "isStopped": false,
-                                      "observers": Array [
-                                        [Circular],
-                                      ],
-                                      "thrownError": null,
-                                    },
-                                    "subscriber": [Circular],
+                                    "initialTeardown": [Function],
                                   },
                                 ],
+                                "_next": [Function],
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "index": 1,
+                                "destination": [Circular],
+                                "initialTeardown": undefined,
                                 "isStopped": false,
-                                "outerIndex": 0,
-                                "outerValue": undefined,
-                                "parent": [Circular],
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
+                                "onFinalize": undefined,
+                                "shouldUnsubscribe": undefined,
                               },
                               [Circular],
                             ],
-                            "active": 2,
+                            "_parentage": null,
                             "closed": false,
-                            "destination": Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                [Circular],
-                              ],
-                              "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
-                                  "next": [Function],
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
+                                "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
-                            "isStopped": true,
-                            "observables": Array [
-                              BehaviorSubject {
-                                "_isScalar": false,
-                                "_value": undefined,
-                                "closed": false,
-                                "hasError": false,
-                                "isStopped": false,
-                                "observers": Array [
-                                  InnerSubscriber {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": Array [
-                                      SubjectSubscription {
-                                        "_parentOrParents": [Circular],
-                                        "_subscriptions": null,
-                                        "closed": false,
-                                        "subject": [Circular],
-                                        "subscriber": [Circular],
-                                      },
-                                    ],
+                            "initialTeardown": undefined,
+                            "isStopped": false,
+                          },
+                          "closed": false,
+                          "destination": SafeSubscriber {
+                            "_finalizers": Array [
+                              OperatorSubscriber {
+                                "_complete": [Function],
+                                "_error": [Function],
+                                "_finalizers": Array [
+                                  Subscription {
+                                    "_finalizers": null,
+                                    "_parentage": [Circular],
                                     "closed": false,
-                                    "destination": Object {
-                                      "closed": true,
-                                      "complete": [Function],
-                                      "error": [Function],
-                                      "next": [Function],
-                                    },
-                                    "index": 1,
-                                    "isStopped": false,
-                                    "outerIndex": 0,
-                                    "outerValue": undefined,
-                                    "parent": [Circular],
-                                    "syncErrorThrowable": false,
-                                    "syncErrorThrown": false,
-                                    "syncErrorValue": null,
+                                    "initialTeardown": [Function],
                                   },
                                 ],
-                                "thrownError": null,
+                                "_next": [Function],
+                                "_parentage": [Circular],
+                                "closed": false,
+                                "destination": [Circular],
+                                "initialTeardown": undefined,
+                                "isStopped": false,
+                                "onFinalize": undefined,
+                                "shouldUnsubscribe": undefined,
                               },
                               [Circular],
                             ],
-                            "resultSelector": undefined,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
-                            "toRespond": 0,
-                            "values": Array [
-                              undefined,
-                              "",
-                            ],
+                            "_parentage": null,
+                            "closed": false,
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
+                                "next": [Function],
+                              },
+                            },
+                            "initialTeardown": undefined,
+                            "isStopped": false,
                           },
-                          "syncErrorThrowable": false,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
+                          "initialTeardown": undefined,
+                          "isStopped": false,
+                          "onFinalize": undefined,
+                          "shouldUnsubscribe": undefined,
                         },
                       ],
                       "thrownError": null,
@@ -2775,48 +1440,32 @@ exports[`Header renders 1`] = `
                 <HeaderNavControls
                   navControls$={
                     BehaviorSubject {
-                      "_isScalar": false,
                       "_value": Array [],
                       "closed": false,
+                      "currentObservers": null,
                       "hasError": false,
                       "isStopped": false,
                       "observers": Array [
-                        Subscriber {
-                          "_parentOrParents": null,
-                          "_subscriptions": Array [
-                            SubjectSubscription {
-                              "_parentOrParents": [Circular],
-                              "_subscriptions": null,
+                        SafeSubscriber {
+                          "_finalizers": Array [
+                            Subscription {
+                              "_finalizers": null,
+                              "_parentage": [Circular],
                               "closed": false,
-                              "subject": [Circular],
-                              "subscriber": [Circular],
+                              "initialTeardown": [Function],
                             },
                           ],
+                          "_parentage": null,
                           "closed": false,
-                          "destination": SafeSubscriber {
-                            "_complete": undefined,
-                            "_context": [Circular],
-                            "_error": undefined,
-                            "_next": [Function],
-                            "_parentOrParents": null,
-                            "_parentSubscriber": [Circular],
-                            "_subscriptions": null,
-                            "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
+                          "destination": ConsumerObserver {
+                            "partialObserver": Object {
+                              "complete": undefined,
+                              "error": undefined,
                               "next": [Function],
                             },
-                            "isStopped": false,
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
+                          "initialTeardown": undefined,
                           "isStopped": false,
-                          "syncErrorThrowable": true,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
                         },
                       ],
                       "thrownError": null,
@@ -2848,48 +1497,32 @@ exports[`Header renders 1`] = `
                   <HeaderLogo
                     forceNavigation$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": false,
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -2898,48 +1531,32 @@ exports[`Header renders 1`] = `
                     href="/"
                     loadingCount$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": 0,
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -2947,7 +1564,6 @@ exports[`Header renders 1`] = `
                     }
                     navLinks$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Array [
                           Object {
                             "baseUrl": "",
@@ -2958,82 +1574,51 @@ exports[`Header renders 1`] = `
                           },
                         ],
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -3051,48 +1636,32 @@ exports[`Header renders 1`] = `
                       <LoadingIndicator
                         loadingCount$={
                           BehaviorSubject {
-                            "_isScalar": false,
                             "_value": 0,
                             "closed": false,
+                            "currentObservers": null,
                             "hasError": false,
                             "isStopped": false,
                             "observers": Array [
-                              Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  SubjectSubscription {
-                                    "_parentOrParents": [Circular],
-                                    "_subscriptions": null,
+                              SafeSubscriber {
+                                "_finalizers": Array [
+                                  Subscription {
+                                    "_finalizers": null,
+                                    "_parentage": [Circular],
                                     "closed": false,
-                                    "subject": [Circular],
-                                    "subscriber": [Circular],
+                                    "initialTeardown": [Function],
                                   },
                                 ],
+                                "_parentage": null,
                                 "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
+                                "destination": ConsumerObserver {
+                                  "partialObserver": Object {
+                                    "complete": undefined,
+                                    "error": undefined,
                                     "next": [Function],
                                   },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
                                 },
+                                "initialTeardown": undefined,
                                 "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
                             ],
                             "thrownError": null,
@@ -3171,48 +1740,32 @@ exports[`Header renders 1`] = `
                     <HeaderNavControls
                       navControls$={
                         BehaviorSubject {
-                          "_isScalar": false,
                           "_value": Array [],
                           "closed": false,
+                          "currentObservers": null,
                           "hasError": false,
                           "isStopped": false,
                           "observers": Array [
-                            Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                SubjectSubscription {
-                                  "_parentOrParents": [Circular],
-                                  "_subscriptions": null,
+                            SafeSubscriber {
+                              "_finalizers": Array [
+                                Subscription {
+                                  "_finalizers": null,
+                                  "_parentage": [Circular],
                                   "closed": false,
-                                  "subject": [Circular],
-                                  "subscriber": [Circular],
+                                  "initialTeardown": [Function],
                                 },
                               ],
+                              "_parentage": null,
                               "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
+                              "destination": ConsumerObserver {
+                                "partialObserver": Object {
+                                  "complete": undefined,
+                                  "error": undefined,
                                   "next": [Function],
                                 },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
+                              "initialTeardown": undefined,
                               "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
                           ],
                           "thrownError": null,
@@ -3258,348 +1811,101 @@ exports[`Header renders 1`] = `
                   <HeaderHelpMenu
                     helpExtension$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": undefined,
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          InnerSubscriber {
-                            "_parentOrParents": CombineLatestSubscriber {
-                              "_parentOrParents": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
+                          OperatorSubscriber {
+                            "_complete": [Function],
+                            "_error": [Function],
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
+                                "initialTeardown": [Function],
                               },
-                              "_subscriptions": Array [
+                            ],
+                            "_next": [Function],
+                            "_parentage": SafeSubscriber {
+                              "_finalizers": Array [
                                 [Circular],
-                                InnerSubscriber {
-                                  "_parentOrParents": [Circular],
-                                  "_subscriptions": Array [
-                                    SubjectSubscription {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": null,
+                                OperatorSubscriber {
+                                  "_complete": [Function],
+                                  "_error": [Function],
+                                  "_finalizers": Array [
+                                    Subscription {
+                                      "_finalizers": null,
+                                      "_parentage": [Circular],
                                       "closed": false,
-                                      "subject": BehaviorSubject {
-                                        "_isScalar": false,
-                                        "_value": "",
-                                        "closed": false,
-                                        "hasError": false,
-                                        "isStopped": false,
-                                        "observers": Array [
-                                          [Circular],
-                                        ],
-                                        "thrownError": null,
-                                      },
-                                      "subscriber": [Circular],
+                                      "initialTeardown": [Function],
                                     },
                                   ],
+                                  "_next": [Function],
+                                  "_parentage": [Circular],
                                   "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "index": 1,
+                                  "destination": [Circular],
+                                  "initialTeardown": undefined,
                                   "isStopped": false,
-                                  "outerIndex": 1,
-                                  "outerValue": undefined,
-                                  "parent": [Circular],
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                                  "onFinalize": undefined,
+                                  "shouldUnsubscribe": undefined,
                                 },
                               ],
-                              "active": 2,
+                              "_parentage": null,
                               "closed": false,
-                              "destination": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
-                                "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                              "destination": ConsumerObserver {
+                                "partialObserver": Object {
+                                  "complete": undefined,
+                                  "error": undefined,
+                                  "next": [Function],
                                 },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
-                              "isStopped": true,
-                              "observables": Array [
-                                [Circular],
-                                BehaviorSubject {
-                                  "_isScalar": false,
-                                  "_value": "",
-                                  "closed": false,
-                                  "hasError": false,
-                                  "isStopped": false,
-                                  "observers": Array [
-                                    InnerSubscriber {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": Array [
-                                        SubjectSubscription {
-                                          "_parentOrParents": [Circular],
-                                          "_subscriptions": null,
-                                          "closed": false,
-                                          "subject": [Circular],
-                                          "subscriber": [Circular],
-                                        },
-                                      ],
-                                      "closed": false,
-                                      "destination": Object {
-                                        "closed": true,
-                                        "complete": [Function],
-                                        "error": [Function],
-                                        "next": [Function],
-                                      },
-                                      "index": 1,
-                                      "isStopped": false,
-                                      "outerIndex": 1,
-                                      "outerValue": undefined,
-                                      "parent": [Circular],
-                                      "syncErrorThrowable": false,
-                                      "syncErrorThrown": false,
-                                      "syncErrorValue": null,
-                                    },
-                                  ],
-                                  "thrownError": null,
-                                },
-                              ],
-                              "resultSelector": undefined,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                              "toRespond": 0,
-                              "values": Array [
-                                undefined,
-                                "",
-                              ],
+                              "initialTeardown": undefined,
+                              "isStopped": false,
                             },
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
-                              },
-                            ],
                             "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
-                              "next": [Function],
-                            },
-                            "index": 1,
-                            "isStopped": false,
-                            "outerIndex": 0,
-                            "outerValue": undefined,
-                            "parent": CombineLatestSubscriber {
-                              "_parentOrParents": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
-                                "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "_subscriptions": Array [
+                            "destination": SafeSubscriber {
+                              "_finalizers": Array [
                                 [Circular],
-                                InnerSubscriber {
-                                  "_parentOrParents": [Circular],
-                                  "_subscriptions": Array [
-                                    SubjectSubscription {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": null,
+                                OperatorSubscriber {
+                                  "_complete": [Function],
+                                  "_error": [Function],
+                                  "_finalizers": Array [
+                                    Subscription {
+                                      "_finalizers": null,
+                                      "_parentage": [Circular],
                                       "closed": false,
-                                      "subject": BehaviorSubject {
-                                        "_isScalar": false,
-                                        "_value": "",
-                                        "closed": false,
-                                        "hasError": false,
-                                        "isStopped": false,
-                                        "observers": Array [
-                                          [Circular],
-                                        ],
-                                        "thrownError": null,
-                                      },
-                                      "subscriber": [Circular],
+                                      "initialTeardown": [Function],
                                     },
                                   ],
+                                  "_next": [Function],
+                                  "_parentage": [Circular],
                                   "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "index": 1,
+                                  "destination": [Circular],
+                                  "initialTeardown": undefined,
                                   "isStopped": false,
-                                  "outerIndex": 1,
-                                  "outerValue": undefined,
-                                  "parent": [Circular],
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                                  "onFinalize": undefined,
+                                  "shouldUnsubscribe": undefined,
                                 },
                               ],
-                              "active": 2,
+                              "_parentage": null,
                               "closed": false,
-                              "destination": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
-                                "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                              "destination": ConsumerObserver {
+                                "partialObserver": Object {
+                                  "complete": undefined,
+                                  "error": undefined,
+                                  "next": [Function],
                                 },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
-                              "isStopped": true,
-                              "observables": Array [
-                                [Circular],
-                                BehaviorSubject {
-                                  "_isScalar": false,
-                                  "_value": "",
-                                  "closed": false,
-                                  "hasError": false,
-                                  "isStopped": false,
-                                  "observers": Array [
-                                    InnerSubscriber {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": Array [
-                                        SubjectSubscription {
-                                          "_parentOrParents": [Circular],
-                                          "_subscriptions": null,
-                                          "closed": false,
-                                          "subject": [Circular],
-                                          "subscriber": [Circular],
-                                        },
-                                      ],
-                                      "closed": false,
-                                      "destination": Object {
-                                        "closed": true,
-                                        "complete": [Function],
-                                        "error": [Function],
-                                        "next": [Function],
-                                      },
-                                      "index": 1,
-                                      "isStopped": false,
-                                      "outerIndex": 1,
-                                      "outerValue": undefined,
-                                      "parent": [Circular],
-                                      "syncErrorThrowable": false,
-                                      "syncErrorThrown": false,
-                                      "syncErrorValue": null,
-                                    },
-                                  ],
-                                  "thrownError": null,
-                                },
-                              ],
-                              "resultSelector": undefined,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                              "toRespond": 0,
-                              "values": Array [
-                                undefined,
-                                "",
-                              ],
+                              "initialTeardown": undefined,
+                              "isStopped": false,
                             },
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
+                            "initialTeardown": undefined,
+                            "isStopped": false,
+                            "onFinalize": undefined,
+                            "shouldUnsubscribe": undefined,
                           },
                         ],
                         "thrownError": null,
@@ -3607,348 +1913,101 @@ exports[`Header renders 1`] = `
                     }
                     helpSupportUrl$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": "",
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          InnerSubscriber {
-                            "_parentOrParents": CombineLatestSubscriber {
-                              "_parentOrParents": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
+                          OperatorSubscriber {
+                            "_complete": [Function],
+                            "_error": [Function],
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
+                                "initialTeardown": [Function],
                               },
-                              "_subscriptions": Array [
-                                InnerSubscriber {
-                                  "_parentOrParents": [Circular],
-                                  "_subscriptions": Array [
-                                    SubjectSubscription {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": null,
+                            ],
+                            "_next": [Function],
+                            "_parentage": SafeSubscriber {
+                              "_finalizers": Array [
+                                OperatorSubscriber {
+                                  "_complete": [Function],
+                                  "_error": [Function],
+                                  "_finalizers": Array [
+                                    Subscription {
+                                      "_finalizers": null,
+                                      "_parentage": [Circular],
                                       "closed": false,
-                                      "subject": BehaviorSubject {
-                                        "_isScalar": false,
-                                        "_value": undefined,
-                                        "closed": false,
-                                        "hasError": false,
-                                        "isStopped": false,
-                                        "observers": Array [
-                                          [Circular],
-                                        ],
-                                        "thrownError": null,
-                                      },
-                                      "subscriber": [Circular],
+                                      "initialTeardown": [Function],
                                     },
                                   ],
+                                  "_next": [Function],
+                                  "_parentage": [Circular],
                                   "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "index": 1,
+                                  "destination": [Circular],
+                                  "initialTeardown": undefined,
                                   "isStopped": false,
-                                  "outerIndex": 0,
-                                  "outerValue": undefined,
-                                  "parent": [Circular],
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                                  "onFinalize": undefined,
+                                  "shouldUnsubscribe": undefined,
                                 },
                                 [Circular],
                               ],
-                              "active": 2,
+                              "_parentage": null,
                               "closed": false,
-                              "destination": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
-                                "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                              "destination": ConsumerObserver {
+                                "partialObserver": Object {
+                                  "complete": undefined,
+                                  "error": undefined,
+                                  "next": [Function],
                                 },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
-                              "isStopped": true,
-                              "observables": Array [
-                                BehaviorSubject {
-                                  "_isScalar": false,
-                                  "_value": undefined,
-                                  "closed": false,
-                                  "hasError": false,
-                                  "isStopped": false,
-                                  "observers": Array [
-                                    InnerSubscriber {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": Array [
-                                        SubjectSubscription {
-                                          "_parentOrParents": [Circular],
-                                          "_subscriptions": null,
-                                          "closed": false,
-                                          "subject": [Circular],
-                                          "subscriber": [Circular],
-                                        },
-                                      ],
-                                      "closed": false,
-                                      "destination": Object {
-                                        "closed": true,
-                                        "complete": [Function],
-                                        "error": [Function],
-                                        "next": [Function],
-                                      },
-                                      "index": 1,
-                                      "isStopped": false,
-                                      "outerIndex": 0,
-                                      "outerValue": undefined,
-                                      "parent": [Circular],
-                                      "syncErrorThrowable": false,
-                                      "syncErrorThrown": false,
-                                      "syncErrorValue": null,
-                                    },
-                                  ],
-                                  "thrownError": null,
-                                },
-                                [Circular],
-                              ],
-                              "resultSelector": undefined,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                              "toRespond": 0,
-                              "values": Array [
-                                undefined,
-                                "",
-                              ],
+                              "initialTeardown": undefined,
+                              "isStopped": false,
                             },
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
-                              },
-                            ],
                             "closed": false,
-                            "destination": Object {
-                              "closed": true,
-                              "complete": [Function],
-                              "error": [Function],
-                              "next": [Function],
-                            },
-                            "index": 1,
-                            "isStopped": false,
-                            "outerIndex": 1,
-                            "outerValue": undefined,
-                            "parent": CombineLatestSubscriber {
-                              "_parentOrParents": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
-                                "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
-                                },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
-                              },
-                              "_subscriptions": Array [
-                                InnerSubscriber {
-                                  "_parentOrParents": [Circular],
-                                  "_subscriptions": Array [
-                                    SubjectSubscription {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": null,
+                            "destination": SafeSubscriber {
+                              "_finalizers": Array [
+                                OperatorSubscriber {
+                                  "_complete": [Function],
+                                  "_error": [Function],
+                                  "_finalizers": Array [
+                                    Subscription {
+                                      "_finalizers": null,
+                                      "_parentage": [Circular],
                                       "closed": false,
-                                      "subject": BehaviorSubject {
-                                        "_isScalar": false,
-                                        "_value": undefined,
-                                        "closed": false,
-                                        "hasError": false,
-                                        "isStopped": false,
-                                        "observers": Array [
-                                          [Circular],
-                                        ],
-                                        "thrownError": null,
-                                      },
-                                      "subscriber": [Circular],
+                                      "initialTeardown": [Function],
                                     },
                                   ],
+                                  "_next": [Function],
+                                  "_parentage": [Circular],
                                   "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "index": 1,
+                                  "destination": [Circular],
+                                  "initialTeardown": undefined,
                                   "isStopped": false,
-                                  "outerIndex": 0,
-                                  "outerValue": undefined,
-                                  "parent": [Circular],
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                                  "onFinalize": undefined,
+                                  "shouldUnsubscribe": undefined,
                                 },
                                 [Circular],
                               ],
-                              "active": 2,
+                              "_parentage": null,
                               "closed": false,
-                              "destination": Subscriber {
-                                "_parentOrParents": null,
-                                "_subscriptions": Array [
-                                  [Circular],
-                                ],
-                                "closed": false,
-                                "destination": SafeSubscriber {
-                                  "_complete": undefined,
-                                  "_context": [Circular],
-                                  "_error": undefined,
-                                  "_next": [Function],
-                                  "_parentOrParents": null,
-                                  "_parentSubscriber": [Circular],
-                                  "_subscriptions": null,
-                                  "closed": false,
-                                  "destination": Object {
-                                    "closed": true,
-                                    "complete": [Function],
-                                    "error": [Function],
-                                    "next": [Function],
-                                  },
-                                  "isStopped": false,
-                                  "syncErrorThrowable": false,
-                                  "syncErrorThrown": false,
-                                  "syncErrorValue": null,
+                              "destination": ConsumerObserver {
+                                "partialObserver": Object {
+                                  "complete": undefined,
+                                  "error": undefined,
+                                  "next": [Function],
                                 },
-                                "isStopped": false,
-                                "syncErrorThrowable": true,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
-                              "isStopped": true,
-                              "observables": Array [
-                                BehaviorSubject {
-                                  "_isScalar": false,
-                                  "_value": undefined,
-                                  "closed": false,
-                                  "hasError": false,
-                                  "isStopped": false,
-                                  "observers": Array [
-                                    InnerSubscriber {
-                                      "_parentOrParents": [Circular],
-                                      "_subscriptions": Array [
-                                        SubjectSubscription {
-                                          "_parentOrParents": [Circular],
-                                          "_subscriptions": null,
-                                          "closed": false,
-                                          "subject": [Circular],
-                                          "subscriber": [Circular],
-                                        },
-                                      ],
-                                      "closed": false,
-                                      "destination": Object {
-                                        "closed": true,
-                                        "complete": [Function],
-                                        "error": [Function],
-                                        "next": [Function],
-                                      },
-                                      "index": 1,
-                                      "isStopped": false,
-                                      "outerIndex": 0,
-                                      "outerValue": undefined,
-                                      "parent": [Circular],
-                                      "syncErrorThrowable": false,
-                                      "syncErrorThrown": false,
-                                      "syncErrorValue": null,
-                                    },
-                                  ],
-                                  "thrownError": null,
-                                },
-                                [Circular],
-                              ],
-                              "resultSelector": undefined,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
-                              "toRespond": 0,
-                              "values": Array [
-                                undefined,
-                                "",
-                              ],
+                              "initialTeardown": undefined,
+                              "isStopped": false,
                             },
-                            "syncErrorThrowable": false,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
+                            "initialTeardown": undefined,
+                            "isStopped": false,
+                            "onFinalize": undefined,
+                            "shouldUnsubscribe": undefined,
                           },
                         ],
                         "thrownError": null,
@@ -4092,48 +2151,32 @@ exports[`Header renders 1`] = `
                   <HeaderNavControls
                     navControls$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Array [],
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -4169,49 +2212,32 @@ exports[`Header renders 1`] = `
                   <CollapsibleNav
                     appId$={
                       Observable {
-                        "_isScalar": false,
                         "source": Subject {
-                          "_isScalar": false,
                           "closed": false,
+                          "currentObservers": null,
                           "hasError": false,
                           "isStopped": false,
                           "observers": Array [
-                            Subscriber {
-                              "_parentOrParents": null,
-                              "_subscriptions": Array [
-                                SubjectSubscription {
-                                  "_parentOrParents": [Circular],
-                                  "_subscriptions": null,
+                            SafeSubscriber {
+                              "_finalizers": Array [
+                                Subscription {
+                                  "_finalizers": null,
+                                  "_parentage": [Circular],
                                   "closed": false,
-                                  "subject": [Circular],
-                                  "subscriber": [Circular],
+                                  "initialTeardown": [Function],
                                 },
                               ],
+                              "_parentage": null,
                               "closed": false,
-                              "destination": SafeSubscriber {
-                                "_complete": undefined,
-                                "_context": [Circular],
-                                "_error": undefined,
-                                "_next": [Function],
-                                "_parentOrParents": null,
-                                "_parentSubscriber": [Circular],
-                                "_subscriptions": null,
-                                "closed": false,
-                                "destination": Object {
-                                  "closed": true,
-                                  "complete": [Function],
-                                  "error": [Function],
+                              "destination": ConsumerObserver {
+                                "partialObserver": Object {
+                                  "complete": undefined,
+                                  "error": undefined,
                                   "next": [Function],
                                 },
-                                "isStopped": false,
-                                "syncErrorThrowable": false,
-                                "syncErrorThrown": false,
-                                "syncErrorValue": null,
                               },
+                              "initialTeardown": undefined,
                               "isStopped": false,
-                              "syncErrorThrowable": true,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
                           ],
                           "thrownError": null,
@@ -4246,7 +2272,6 @@ exports[`Header renders 1`] = `
                     closeNav={[Function]}
                     customNavLink$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Object {
                           "baseUrl": "",
                           "href": "",
@@ -4255,45 +2280,30 @@ exports[`Header renders 1`] = `
                           "url": "",
                         },
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -4304,7 +2314,6 @@ exports[`Header renders 1`] = `
                     isNavOpen={false}
                     navLinks$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Array [
                           Object {
                             "baseUrl": "",
@@ -4315,82 +2324,51 @@ exports[`Header renders 1`] = `
                           },
                         ],
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -4401,7 +2379,6 @@ exports[`Header renders 1`] = `
                     onIsLockedUpdate={[Function]}
                     recentlyAccessed$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": Array [
                           Object {
                             "id": "dashboard",
@@ -4410,45 +2387,30 @@ exports[`Header renders 1`] = `
                           },
                         ],
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
@@ -4585,48 +2547,32 @@ exports[`Header renders 1`] = `
               <HeaderNavControls
                 navControls$={
                   BehaviorSubject {
-                    "_isScalar": false,
                     "_value": Array [],
                     "closed": false,
+                    "currentObservers": null,
                     "hasError": false,
                     "isStopped": false,
                     "observers": Array [
-                      Subscriber {
-                        "_parentOrParents": null,
-                        "_subscriptions": Array [
-                          SubjectSubscription {
-                            "_parentOrParents": [Circular],
-                            "_subscriptions": null,
+                      SafeSubscriber {
+                        "_finalizers": Array [
+                          Subscription {
+                            "_finalizers": null,
+                            "_parentage": [Circular],
                             "closed": false,
-                            "subject": [Circular],
-                            "subscriber": [Circular],
+                            "initialTeardown": [Function],
                           },
                         ],
+                        "_parentage": null,
                         "closed": false,
-                        "destination": SafeSubscriber {
-                          "_complete": undefined,
-                          "_context": [Circular],
-                          "_error": undefined,
-                          "_next": [Function],
-                          "_parentOrParents": null,
-                          "_parentSubscriber": [Circular],
-                          "_subscriptions": null,
-                          "closed": false,
-                          "destination": Object {
-                            "closed": true,
-                            "complete": [Function],
-                            "error": [Function],
+                        "destination": ConsumerObserver {
+                          "partialObserver": Object {
+                            "complete": undefined,
+                            "error": undefined,
                             "next": [Function],
                           },
-                          "isStopped": false,
-                          "syncErrorThrowable": false,
-                          "syncErrorThrown": false,
-                          "syncErrorValue": null,
                         },
+                        "initialTeardown": undefined,
                         "isStopped": false,
-                        "syncErrorThrowable": true,
-                        "syncErrorThrown": false,
-                        "syncErrorValue": null,
                       },
                     ],
                     "thrownError": null,
@@ -4639,52 +2585,36 @@ exports[`Header renders 1`] = `
           <HeaderBreadcrumbs
             breadcrumbs$={
               BehaviorSubject {
-                "_isScalar": false,
                 "_value": Array [
                   Object {
                     "text": "test",
                   },
                 ],
                 "closed": false,
+                "currentObservers": null,
                 "hasError": false,
                 "isStopped": false,
                 "observers": Array [
-                  Subscriber {
-                    "_parentOrParents": null,
-                    "_subscriptions": Array [
-                      SubjectSubscription {
-                        "_parentOrParents": [Circular],
-                        "_subscriptions": null,
+                  SafeSubscriber {
+                    "_finalizers": Array [
+                      Subscription {
+                        "_finalizers": null,
+                        "_parentage": [Circular],
                         "closed": false,
-                        "subject": [Circular],
-                        "subscriber": [Circular],
+                        "initialTeardown": [Function],
                       },
                     ],
+                    "_parentage": null,
                     "closed": false,
-                    "destination": SafeSubscriber {
-                      "_complete": undefined,
-                      "_context": [Circular],
-                      "_error": undefined,
-                      "_next": [Function],
-                      "_parentOrParents": null,
-                      "_parentSubscriber": [Circular],
-                      "_subscriptions": null,
-                      "closed": false,
-                      "destination": Object {
-                        "closed": true,
-                        "complete": [Function],
-                        "error": [Function],
+                    "destination": ConsumerObserver {
+                      "partialObserver": Object {
+                        "complete": undefined,
+                        "error": undefined,
                         "next": [Function],
                       },
-                      "isStopped": false,
-                      "syncErrorThrowable": false,
-                      "syncErrorThrown": false,
-                      "syncErrorValue": null,
                     },
+                    "initialTeardown": undefined,
                     "isStopped": false,
-                    "syncErrorThrowable": true,
-                    "syncErrorThrown": false,
-                    "syncErrorValue": null,
                   },
                 ],
                 "thrownError": null,
@@ -4748,48 +2678,32 @@ exports[`Header renders 1`] = `
           <HeaderBadge
             badge$={
               BehaviorSubject {
-                "_isScalar": false,
                 "_value": undefined,
                 "closed": false,
+                "currentObservers": null,
                 "hasError": false,
                 "isStopped": false,
                 "observers": Array [
-                  Subscriber {
-                    "_parentOrParents": null,
-                    "_subscriptions": Array [
-                      SubjectSubscription {
-                        "_parentOrParents": [Circular],
-                        "_subscriptions": null,
+                  SafeSubscriber {
+                    "_finalizers": Array [
+                      Subscription {
+                        "_finalizers": null,
+                        "_parentage": [Circular],
                         "closed": false,
-                        "subject": [Circular],
-                        "subscriber": [Circular],
+                        "initialTeardown": [Function],
                       },
                     ],
+                    "_parentage": null,
                     "closed": false,
-                    "destination": SafeSubscriber {
-                      "_complete": undefined,
-                      "_context": [Circular],
-                      "_error": undefined,
-                      "_next": [Function],
-                      "_parentOrParents": null,
-                      "_parentSubscriber": [Circular],
-                      "_subscriptions": null,
-                      "closed": false,
-                      "destination": Object {
-                        "closed": true,
-                        "complete": [Function],
-                        "error": [Function],
+                    "destination": ConsumerObserver {
+                      "partialObserver": Object {
+                        "complete": undefined,
+                        "error": undefined,
                         "next": [Function],
                       },
-                      "isStopped": false,
-                      "syncErrorThrowable": false,
-                      "syncErrorThrown": false,
-                      "syncErrorValue": null,
                     },
+                    "initialTeardown": undefined,
                     "isStopped": false,
-                    "syncErrorThrowable": true,
-                    "syncErrorThrown": false,
-                    "syncErrorValue": null,
                   },
                 ],
                 "thrownError": null,
@@ -4811,48 +2725,32 @@ exports[`Header renders 1`] = `
                   <HeaderActionMenu
                     actionMenu$={
                       BehaviorSubject {
-                        "_isScalar": false,
                         "_value": undefined,
                         "closed": false,
+                        "currentObservers": null,
                         "hasError": false,
                         "isStopped": false,
                         "observers": Array [
-                          Subscriber {
-                            "_parentOrParents": null,
-                            "_subscriptions": Array [
-                              SubjectSubscription {
-                                "_parentOrParents": [Circular],
-                                "_subscriptions": null,
+                          SafeSubscriber {
+                            "_finalizers": Array [
+                              Subscription {
+                                "_finalizers": null,
+                                "_parentage": [Circular],
                                 "closed": false,
-                                "subject": [Circular],
-                                "subscriber": [Circular],
+                                "initialTeardown": [Function],
                               },
                             ],
+                            "_parentage": null,
                             "closed": false,
-                            "destination": SafeSubscriber {
-                              "_complete": undefined,
-                              "_context": [Circular],
-                              "_error": undefined,
-                              "_next": [Function],
-                              "_parentOrParents": null,
-                              "_parentSubscriber": [Circular],
-                              "_subscriptions": null,
-                              "closed": false,
-                              "destination": Object {
-                                "closed": true,
-                                "complete": [Function],
-                                "error": [Function],
+                            "destination": ConsumerObserver {
+                              "partialObserver": Object {
+                                "complete": undefined,
+                                "error": undefined,
                                 "next": [Function],
                               },
-                              "isStopped": false,
-                              "syncErrorThrowable": false,
-                              "syncErrorThrown": false,
-                              "syncErrorValue": null,
                             },
+                            "initialTeardown": undefined,
                             "isStopped": false,
-                            "syncErrorThrowable": true,
-                            "syncErrorThrown": false,
-                            "syncErrorValue": null,
                           },
                         ],
                         "thrownError": null,
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx
index da83e7ccfb4cb..01ae5fe35487a 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx
@@ -26,7 +26,7 @@ import { ChromeNavLink, ChromeRecentlyAccessedHistoryItem } from '../..';
 import { AppCategory } from '../../../../types';
 import { InternalApplicationStart } from '../../../application/types';
 import { HttpStart } from '../../../http';
-import { OnIsLockedUpdate } from './';
+import { OnIsLockedUpdate } from '.';
 import {
   createEuiListItem,
   createRecentNavLink,
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 40108760cc0be..ade605de4b017 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -22,7 +22,7 @@ import classnames from 'classnames';
 import React, { createRef, useState } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { Observable } from 'rxjs';
-import { LoadingIndicator } from '../';
+import { LoadingIndicator } from '..';
 import {
   ChromeBadge,
   ChromeBreadcrumb,
@@ -37,7 +37,7 @@ import {
   ChromeHelpExtension,
   ChromeUserBanner,
 } from '../../types';
-import { OnIsLockedUpdate } from './';
+import { OnIsLockedUpdate } from '.';
 import { CollapsibleNav } from './collapsible_nav';
 import { HeaderBadge } from './header_badge';
 import { HeaderBreadcrumbs } from './header_breadcrumbs';
diff --git a/src/core/public/core_app/status/lib/load_status.ts b/src/core/public/core_app/status/lib/load_status.ts
index 0994e55c31c38..c175f3a5bc833 100644
--- a/src/core/public/core_app/status/lib/load_status.ts
+++ b/src/core/public/core_app/status/lib/load_status.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import type { StatusResponse, ServiceStatus, ServiceStatusLevel } from '../../../../types/status';
 import type { HttpSetup } from '../../../http';
 import type { NotificationsSetup } from '../../../notifications';
-import type { DataType } from '../lib';
+import type { DataType } from '.';
 
 interface MetricMeta {
   title: string;
diff --git a/src/core/public/http/anonymous_paths_service.ts b/src/core/public/http/anonymous_paths_service.ts
index 258c25d7772f1..4aae7460815b6 100644
--- a/src/core/public/http/anonymous_paths_service.ts
+++ b/src/core/public/http/anonymous_paths_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAnonymousPaths, IBasePath } from 'src/core/public';
+import { IAnonymousPaths, IBasePath } from '..';
 import { CoreService } from '../../types';
 
 interface Deps {
diff --git a/src/core/public/http/external_url_service.test.ts b/src/core/public/http/external_url_service.test.ts
index 4ce3709ff6366..c2d7725bf1bed 100644
--- a/src/core/public/http/external_url_service.test.ts
+++ b/src/core/public/http/external_url_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExternalUrlConfig } from 'src/core/server/types';
+import { ExternalUrlConfig } from '../../server/types';
 
 import { injectedMetadataServiceMock } from '../mocks';
 import { Sha256 } from '../utils';
diff --git a/src/core/public/http/external_url_service.ts b/src/core/public/http/external_url_service.ts
index 0fb1c85d48257..ffc2d9ec89be3 100644
--- a/src/core/public/http/external_url_service.ts
+++ b/src/core/public/http/external_url_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IExternalUrlPolicy } from 'src/core/server/types';
+import { IExternalUrlPolicy } from '../../server/types';
 
-import { CoreService } from 'src/core/types';
+import { CoreService } from '../../types';
 import { IExternalUrl } from './types';
 import { InjectedMetadataSetup } from '../injected_metadata';
 import { Sha256 } from '../utils';
diff --git a/src/core/public/http/fetch.ts b/src/core/public/http/fetch.ts
index 9a333161e1b7a..c6e7bcd1dd73f 100644
--- a/src/core/public/http/fetch.ts
+++ b/src/core/public/http/fetch.ts
@@ -33,6 +33,7 @@ interface Params {
 const JSON_CONTENT = /^(application\/(json|x-javascript)|text\/(x-)?javascript|x-json)(;.*)?$/;
 const NDJSON_CONTENT = /^(application\/ndjson)(;.*)?$/;
 const ZIP_CONTENT = /^(application\/zip)(;.*)?$/;
+const VECTOR_TILE = /^(application\/vnd.mapbox-vector-tile)(;.*)?$/;
 
 const removedUndefined = (obj: Record<string, any> | undefined) => {
   return omitBy(obj, (v) => v === undefined);
@@ -164,6 +165,8 @@ export class Fetch {
         body = await response.blob();
       } else if (JSON_CONTENT.test(contentType)) {
         body = await response.json();
+      } else if (VECTOR_TILE.test(contentType)) {
+        body = await response.arrayBuffer();
       } else {
         const text = await response.text();
 
diff --git a/src/core/public/http/loading_count_service.ts b/src/core/public/http/loading_count_service.ts
index f8e23d359d0a8..ccbb3e33ca224 100644
--- a/src/core/public/http/loading_count_service.ts
+++ b/src/core/public/http/loading_count_service.ts
@@ -34,7 +34,7 @@ export type LoadingCountStart = LoadingCountSetup;
 
 /** @internal */
 export class LoadingCountService implements CoreService<LoadingCountSetup, LoadingCountStart> {
-  private readonly stop$ = new Subject();
+  private readonly stop$ = new Subject<void>();
   private readonly loadingCount$ = new BehaviorSubject(0);
 
   public setup({ fatalErrors }: { fatalErrors: FatalErrorsSetup }) {
diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts
index 7229cc903d317..07f56b889fc79 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.ts
@@ -17,7 +17,7 @@ import {
   UiSettingsParams,
   UserProvidedValues,
 } from '../../server/types';
-import { AppCategory } from '../';
+import { AppCategory } from '..';
 
 export interface InjectedPluginMetadata {
   id: PluginName;
diff --git a/src/core/public/kbn_bootstrap.test.ts b/src/core/public/kbn_bootstrap.test.ts
index f3fb7695a1573..03096daf09c39 100644
--- a/src/core/public/kbn_bootstrap.test.ts
+++ b/src/core/public/kbn_bootstrap.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { apmSystem, fatalErrorMock, i18nLoad } from './kbn_bootstrap.test.mocks';
-import { __kbnBootstrap__ } from './';
+import { __kbnBootstrap__ } from '.';
 
 describe('kbn_bootstrap', () => {
   beforeAll(() => {
diff --git a/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap b/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap
index 6e453ed8e48f5..fb08a9b5f53cf 100644
--- a/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap
+++ b/src/core/public/notifications/toasts/__snapshots__/toasts_service.test.tsx.snap
@@ -12,7 +12,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -22,11 +21,10 @@ Array [
         dismissToast={[Function]}
         toasts$={
           Observable {
-            "_isScalar": false,
             "source": BehaviorSubject {
-              "_isScalar": false,
               "_value": Array [],
               "closed": false,
+              "currentObservers": null,
               "hasError": false,
               "isStopped": false,
               "observers": Array [],
diff --git a/src/core/public/notifications/toasts/error_toast.tsx b/src/core/public/notifications/toasts/error_toast.tsx
index f75bdda716131..3b0a8a14f4966 100644
--- a/src/core/public/notifications/toasts/error_toast.tsx
+++ b/src/core/public/notifications/toasts/error_toast.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '../..';
 import { I18nStart } from '../../i18n';
 
 interface ErrorToastProps {
diff --git a/src/core/public/notifications/toasts/toasts_api.test.ts b/src/core/public/notifications/toasts/toasts_api.test.ts
index 35f141a995d06..9130e060a37f8 100644
--- a/src/core/public/notifications/toasts/toasts_api.test.ts
+++ b/src/core/public/notifications/toasts/toasts_api.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 
 import { ToastsApi } from './toasts_api';
 
@@ -14,7 +14,7 @@ import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.moc
 import { i18nServiceMock } from '../../i18n/i18n_service.mock';
 
 async function getCurrentToasts(toasts: ToastsApi) {
-  return await toasts.get$().pipe(take(1)).toPromise();
+  return await firstValueFrom(toasts.get$());
 }
 
 function uiSettingsMock() {
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index 3ee2e0e93b087..655a767bca8f2 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -20,7 +20,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -56,7 +55,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -81,7 +79,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -103,7 +100,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -132,7 +128,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -157,7 +152,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -179,7 +173,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
index 2fc2000e559ab..a04210758053e 100644
--- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
@@ -22,7 +22,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -47,7 +46,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -69,7 +67,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -108,7 +105,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -131,7 +127,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -159,7 +154,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -180,7 +174,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -205,7 +198,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -241,7 +233,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -264,7 +255,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -290,7 +280,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -315,7 +304,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -336,7 +324,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -360,7 +347,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -382,7 +368,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -411,7 +396,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -434,7 +418,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -460,7 +443,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -485,7 +467,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -506,7 +487,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -530,7 +510,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -552,7 +531,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -586,7 +564,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -609,7 +586,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -635,7 +611,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -660,7 +635,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -681,7 +655,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -705,7 +678,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -727,7 +699,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -756,7 +727,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -779,7 +749,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -805,7 +774,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -830,7 +798,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -851,7 +818,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -875,7 +841,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -897,7 +862,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -929,7 +893,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -965,7 +928,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -990,7 +952,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -1012,7 +973,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -1041,7 +1001,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -1066,7 +1025,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -1088,7 +1046,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -1122,7 +1079,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -1147,7 +1103,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -1169,7 +1124,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
@@ -1198,7 +1152,6 @@ Array [
                     globalStyles={false}
                     theme$={
                       Observable {
-                        "_isScalar": false,
                         "_subscribe": [Function],
                       }
                     }
@@ -1223,7 +1176,6 @@ Array [
                   globalStyles={false}
                   theme$={
                     Observable {
-                      "_isScalar": false,
                       "_subscribe": [Function],
                     }
                   }
@@ -1245,7 +1197,6 @@ Array [
       theme={
         Object {
           "theme$": Observable {
-            "_isScalar": false,
             "_subscribe": [Function],
           },
         }
diff --git a/src/core/public/plugins/plugin.ts b/src/core/public/plugins/plugin.ts
index a43cc2046b82d..8e24573bd741c 100644
--- a/src/core/public/plugins/plugin.ts
+++ b/src/core/public/plugins/plugin.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
 import { DiscoveredPlugin, PluginOpaqueId } from '../../server';
 import { PluginInitializerContext } from './plugin_context';
 import { read } from './plugin_reader';
@@ -61,7 +60,7 @@ export class PluginWrapper<
   private instance?: Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
 
   private readonly startDependencies$ = new Subject<[CoreStart, TPluginsStart, TStart]>();
-  public readonly startDependencies = this.startDependencies$.pipe(first()).toPromise();
+  public readonly startDependencies = firstValueFrom(this.startDependencies$);
 
   constructor(
     public readonly discoveredPlugin: DiscoveredPlugin,
diff --git a/src/core/public/plugins/plugin_context.ts b/src/core/public/plugins/plugin_context.ts
index 0311006fc44a3..7d288799a34c3 100644
--- a/src/core/public/plugins/plugin_context.ts
+++ b/src/core/public/plugins/plugin_context.ts
@@ -12,7 +12,7 @@ import { PluginOpaqueId, PackageInfo, EnvironmentMode } from '../../server/types
 import { CoreContext } from '../core_system';
 import { PluginWrapper } from './plugin';
 import { PluginsServiceSetupDeps, PluginsServiceStartDeps } from './plugins_service';
-import { CoreSetup, CoreStart } from '../';
+import { CoreSetup, CoreStart } from '..';
 
 /**
  * The available core services passed to a `PluginInitializer`
diff --git a/src/core/public/plugins/plugins_service.test.mocks.ts b/src/core/public/plugins/plugins_service.test.mocks.ts
index 801ea20015f2a..7cf65f0d37dbe 100644
--- a/src/core/public/plugins/plugins_service.test.mocks.ts
+++ b/src/core/public/plugins/plugins_service.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginName } from 'kibana/server';
+import { PluginName } from '../../server';
 import { Plugin } from './plugin';
 
 export type MockedPluginInitializer = jest.Mock<Plugin<unknown, unknown>>;
diff --git a/src/core/public/plugins/plugins_service.test.ts b/src/core/public/plugins/plugins_service.test.ts
index 63997d65c7d7b..c8438a03fcec7 100644
--- a/src/core/public/plugins/plugins_service.test.ts
+++ b/src/core/public/plugins/plugins_service.test.ts
@@ -13,7 +13,7 @@ import {
   mockPluginInitializerProvider,
 } from './plugins_service.test.mocks';
 
-import { PluginName, PluginType } from 'src/core/server';
+import { PluginName, PluginType } from '../../server';
 import { coreMock } from '../mocks';
 import {
   PluginsService,
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index c68e2b40d1dd3..ecd326190d6c1 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -45,7 +45,6 @@ import { PackageInfo } from '@kbn/config';
 import { Path } from 'history';
 import { PeerCertificate } from 'tls';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { PublicUiSettingsParams as PublicUiSettingsParams_2 } from 'src/core/server/types';
 import { default as React_2 } from 'react';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { Request as Request_2 } from '@hapi/hapi';
@@ -61,7 +60,6 @@ import { TypeOf } from '@kbn/config-schema';
 import { UiCounterMetricType } from '@kbn/analytics';
 import { UnregisterCallback } from 'history';
 import { URL as URL_2 } from 'url';
-import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/types';
 
 // @internal (undocumented)
 export function __kbnBootstrap__(): Promise<void>;
@@ -782,7 +780,7 @@ export type IToasts = Pick<ToastsApi, 'get$' | 'add' | 'remove' | 'addSuccess' |
 export interface IUiSettingsClient {
     get$: <T = any>(key: string, defaultOverride?: T) => Observable<T>;
     get: <T = any>(key: string, defaultOverride?: T) => T;
-    getAll: () => Readonly<Record<string, PublicUiSettingsParams_2 & UserProvidedValues_2>>;
+    getAll: () => Readonly<Record<string, PublicUiSettingsParams & UserProvidedValues>>;
     getUpdate$: <T = any>() => Observable<{
         key: string;
         newValue: T;
@@ -1568,7 +1566,7 @@ export interface UiSettingsParams<T = unknown> {
 // @public (undocumented)
 export interface UiSettingsState {
     // (undocumented)
-    [key: string]: PublicUiSettingsParams_2 & UserProvidedValues_2;
+    [key: string]: PublicUiSettingsParams & UserProvidedValues;
 }
 
 // @public
diff --git a/src/core/public/saved_objects/saved_objects_service.ts b/src/core/public/saved_objects/saved_objects_service.ts
index 010cd9ca5701d..457b81f92a7e5 100644
--- a/src/core/public/saved_objects/saved_objects_service.ts
+++ b/src/core/public/saved_objects/saved_objects_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreService } from 'src/core/types';
-import { CoreStart } from 'src/core/public';
+import { CoreService } from '../../types';
+import { CoreStart } from '..';
 import { SavedObjectsClient, SavedObjectsClientContract } from './saved_objects_client';
 
 /**
diff --git a/src/core/public/theme/theme_service.ts b/src/core/public/theme/theme_service.ts
index bdb00ee4fdce9..e70bd901cde80 100644
--- a/src/core/public/theme/theme_service.ts
+++ b/src/core/public/theme/theme_service.ts
@@ -17,7 +17,7 @@ export interface SetupDeps {
 
 export class ThemeService {
   private theme$?: Observable<CoreTheme>;
-  private stop$ = new Subject();
+  private stop$ = new Subject<void>();
 
   public setup({ injectedMetadata }: SetupDeps): ThemeServiceSetup {
     const theme = injectedMetadata.getTheme();
diff --git a/src/core/public/types.ts b/src/core/public/types.ts
index 30f24a00daba8..5b594373e3523 100644
--- a/src/core/public/types.ts
+++ b/src/core/public/types.ts
@@ -11,7 +11,7 @@ export type {
   PublicUiSettingsParams,
   UserProvidedValues,
   UiSettingsType,
-} from '../../core/types';
+} from '../types';
 
 /**
  * A function that should mount DOM content inside the provided container element
diff --git a/src/core/public/ui_settings/types.ts b/src/core/public/ui_settings/types.ts
index 77c1feb25b6bc..243ac82ed14ab 100644
--- a/src/core/public/ui_settings/types.ts
+++ b/src/core/public/ui_settings/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { PublicUiSettingsParams, UserProvidedValues } from 'src/core/server/types';
+import { PublicUiSettingsParams, UserProvidedValues } from '../../server/types';
 
 /** @public */
 export interface UiSettingsState {
diff --git a/src/core/public/ui_settings/ui_settings_api.test.ts b/src/core/public/ui_settings/ui_settings_api.test.ts
index d14bbfe7ca953..d5f0f1175b9e5 100644
--- a/src/core/public/ui_settings/ui_settings_api.test.ts
+++ b/src/core/public/ui_settings/ui_settings_api.test.ts
@@ -169,7 +169,7 @@ describe('#getLoadingCount$()', () => {
     });
 
     const { uiSettingsApi } = setup();
-    const done$ = new Rx.Subject();
+    const done$ = new Rx.Subject<void>();
     const promise = uiSettingsApi.getLoadingCount$().pipe(takeUntil(done$), toArray()).toPromise();
 
     await uiSettingsApi.batchSet('foo', 'bar');
@@ -194,7 +194,7 @@ describe('#getLoadingCount$()', () => {
     );
 
     const { uiSettingsApi } = setup();
-    const done$ = new Rx.Subject();
+    const done$ = new Rx.Subject<void>();
     const promise = uiSettingsApi.getLoadingCount$().pipe(takeUntil(done$), toArray()).toPromise();
 
     await uiSettingsApi.batchSet('foo', 'bar');
diff --git a/src/core/public/ui_settings/ui_settings_client.ts b/src/core/public/ui_settings/ui_settings_client.ts
index ee5d5da8d29b9..979f6be5ebe2c 100644
--- a/src/core/public/ui_settings/ui_settings_client.ts
+++ b/src/core/public/ui_settings/ui_settings_client.ts
@@ -10,7 +10,7 @@ import { cloneDeep, defaultsDeep } from 'lodash';
 import { Observable, Subject, concat, defer, of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { UserProvidedValues, PublicUiSettingsParams } from 'src/core/server/types';
+import { UserProvidedValues, PublicUiSettingsParams } from '../../server/types';
 import { IUiSettingsClient, UiSettingsState } from './types';
 
 import { UiSettingsApi } from './ui_settings_api';
diff --git a/src/core/public/ui_settings/ui_settings_service.mock.ts b/src/core/public/ui_settings/ui_settings_service.mock.ts
index 72f03be415475..d0633c4fca1fc 100644
--- a/src/core/public/ui_settings/ui_settings_service.mock.ts
+++ b/src/core/public/ui_settings/ui_settings_service.mock.ts
@@ -8,7 +8,7 @@
 
 import * as Rx from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { UiSettingsService } from './';
+import { UiSettingsService } from '.';
 import { IUiSettingsClient } from './types';
 
 const createSetupContractMock = () => {
diff --git a/src/core/public/ui_settings/ui_settings_service.test.ts b/src/core/public/ui_settings/ui_settings_service.test.ts
index 9f0c6ac5fc937..83b2c26091bfd 100644
--- a/src/core/public/ui_settings/ui_settings_service.test.ts
+++ b/src/core/public/ui_settings/ui_settings_service.test.ts
@@ -34,7 +34,10 @@ describe('#stop', () => {
     service.stop();
 
     await expect(
-      Rx.combineLatest(client.getUpdate$(), client.getUpdateErrors$(), loadingCount$!).toPromise()
+      Rx.lastValueFrom(
+        Rx.combineLatest([client.getUpdate$(), client.getUpdateErrors$(), loadingCount$!]),
+        { defaultValue: undefined }
+      )
     ).resolves.toBe(undefined);
   });
 });
diff --git a/src/core/server/context/context_service.test.ts b/src/core/server/context/context_service.test.ts
index 8b5a784b1f8a1..ac16657fa40f4 100644
--- a/src/core/server/context/context_service.test.ts
+++ b/src/core/server/context/context_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginOpaqueId } from '../../server';
+import { PluginOpaqueId } from '..';
 import { MockContextConstructor } from './context_service.test.mocks';
 import { ContextService } from './context_service';
 import { CoreContext } from '../core_context';
diff --git a/src/core/server/context/context_service.ts b/src/core/server/context/context_service.ts
index b2948a4d59129..36f5d77a491e1 100644
--- a/src/core/server/context/context_service.ts
+++ b/src/core/server/context/context_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginOpaqueId } from '../../server';
+import { PluginOpaqueId } from '..';
 import { IContextContainer, ContextContainer } from './container';
 import { CoreContext } from '../core_context';
 
diff --git a/src/core/server/core_app/core_app.test.ts b/src/core/server/core_app/core_app.test.ts
index 6eb38bfaa8644..bdaf0bae3fa6e 100644
--- a/src/core/server/core_app/core_app.test.ts
+++ b/src/core/server/core_app/core_app.test.ts
@@ -15,7 +15,7 @@ import type { UiPlugins } from '../plugins';
 import { PluginType } from '../plugins';
 import { CoreApp } from './core_app';
 import { mockRouter } from '../http/router/router.mock';
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '..';
 
 const emptyPlugins = (): UiPlugins => ({
   internal: new Map(),
diff --git a/src/core/server/core_usage_data/core_usage_data_service.test.ts b/src/core/server/core_usage_data/core_usage_data_service.test.ts
index b2315a7cde281..2dc1655a0f099 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.test.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.test.ts
@@ -8,9 +8,11 @@
 
 import type { ConfigPath } from '@kbn/config';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { HotObservable } from 'rxjs/internal/testing/HotObservable';
 import { TestScheduler } from 'rxjs/testing';
 
+// eslint-disable-next-line @kbn/imports/no_unresolvable_imports
+import { HotObservable } from 'rxjs/internal/testing/HotObservable';
+
 import { configServiceMock } from '../config/mocks';
 
 import { mockCoreContext } from '../core_context.mock';
diff --git a/src/core/server/core_usage_data/core_usage_data_service.ts b/src/core/server/core_usage_data/core_usage_data_service.ts
index bdd46932fd9a9..5efb2b60ae4c4 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.ts
@@ -6,18 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { Subject, Observable } from 'rxjs';
-import { takeUntil, first } from 'rxjs/operators';
+import { Subject, Observable, firstValueFrom } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 import { get } from 'lodash';
 import { hasConfigPathIntersection, ChangedDeprecatedPaths } from '@kbn/config';
 
-import { CoreService } from 'src/core/types';
-import { Logger, SavedObjectsServiceStart, SavedObjectTypeRegistry } from 'src/core/server';
 import type {
   AggregationsMultiBucketAggregateBase,
   AggregationsSingleBucketAggregateBase,
   SearchTotalHits,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { CoreService } from '../../types';
+import { Logger, SavedObjectsServiceStart, SavedObjectTypeRegistry } from '..';
 import { CoreContext } from '../core_context';
 import { ElasticsearchConfigType } from '../elasticsearch/elasticsearch_config';
 import { HttpConfigType, InternalHttpServiceSetup } from '../http';
@@ -100,7 +100,7 @@ export class CoreUsageDataService
   constructor(core: CoreContext) {
     this.logger = core.logger.get('core-usage-stats-service');
     this.configService = core.configService;
-    this.stop$ = new Subject();
+    this.stop$ = new Subject<void>();
   }
 
   private async getSavedObjectUsageData(
@@ -383,7 +383,7 @@ export class CoreUsageDataService
   private async getNonDefaultKibanaConfigs(
     exposedConfigsToUsage: ExposedConfigsToUsage
   ): Promise<ConfigUsageData> {
-    const config = await this.configService.getConfig$().pipe(first()).toPromise();
+    const config = await firstValueFrom(this.configService.getConfig$());
     const nonDefaultConfigs = config.toRaw();
     const usedPaths = await this.configService.getUsedPaths();
     const exposedConfigsKeys = [...exposedConfigsToUsage.keys()];
diff --git a/src/core/server/deprecations/deprecations_service.ts b/src/core/server/deprecations/deprecations_service.ts
index df8084e6c783a..7d7af552f08df 100644
--- a/src/core/server/deprecations/deprecations_service.ts
+++ b/src/core/server/deprecations/deprecations_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 
 import { DeprecationsFactory } from './deprecations_factory';
 import { DomainDeprecationDetails, RegisterDeprecationsConfig } from './types';
@@ -144,10 +144,9 @@ export class DeprecationsService
   public async setup({ http }: DeprecationsSetupDeps): Promise<InternalDeprecationsServiceSetup> {
     this.logger.debug('Setting up Deprecations service');
 
-    const config = await this.configService
-      .atPath<DeprecationConfigType>(deprecationConfig.path)
-      .pipe(take(1))
-      .toPromise();
+    const config = await firstValueFrom(
+      this.configService.atPath<DeprecationConfigType>(deprecationConfig.path)
+    );
 
     this.deprecationsFactory = new DeprecationsFactory({
       logger: this.logger,
diff --git a/src/core/server/elasticsearch/client/configure_client.test.ts b/src/core/server/elasticsearch/client/configure_client.test.ts
index 31c64362f8a2b..b17b308294a20 100644
--- a/src/core/server/elasticsearch/client/configure_client.test.ts
+++ b/src/core/server/elasticsearch/client/configure_client.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-jest.mock('./log_query_and_deprecation.ts', () => ({
+jest.mock('./log_query_and_deprecation', () => ({
   __esModule: true,
   instrumentEsQueryAndDeprecationLogger: jest.fn(),
 }));
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
index 63b2233b06a96..3a8f3c459768d 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.mocks.ts
@@ -7,7 +7,10 @@
  */
 
 export const mockReadFileSync = jest.fn();
-jest.mock('fs', () => ({ readFileSync: mockReadFileSync }));
+jest.mock('fs', () => ({
+  ...jest.requireActual('fs'),
+  readFileSync: mockReadFileSync,
+}));
 
 export const mockReadPkcs12Keystore = jest.fn();
 export const mockReadPkcs12Truststore = jest.fn();
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index 1baef038e313a..80bd52468fd7e 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -11,7 +11,7 @@ import { readPkcs12Keystore, readPkcs12Truststore } from '@kbn/crypto';
 import { i18n } from '@kbn/i18n';
 import { Duration } from 'moment';
 import { readFileSync } from 'fs';
-import { ConfigDeprecationProvider } from 'src/core/server';
+import { ConfigDeprecationProvider } from '..';
 import { ServiceConfigDescriptor } from '../internal_types';
 import { getReservedHeaders } from './default_headers';
 
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index 07462a52ef220..d0cf23c539416 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Observable, Subject } from 'rxjs';
-import { first, map, shareReplay, takeUntil } from 'rxjs/operators';
+import { firstValueFrom, Observable, Subject } from 'rxjs';
+import { map, shareReplay, takeUntil } from 'rxjs/operators';
 
 import { CoreService } from '../../types';
 import { CoreContext } from '../core_context';
@@ -41,7 +41,7 @@ export class ElasticsearchService
 {
   private readonly log: Logger;
   private readonly config$: Observable<ElasticsearchConfig>;
-  private stop$ = new Subject();
+  private stop$ = new Subject<void>();
   private kibanaVersion: string;
   private authHeaders?: IAuthHeadersStorage;
   private executionContextClient?: IExecutionContext;
@@ -60,7 +60,7 @@ export class ElasticsearchService
   public async preboot(): Promise<InternalElasticsearchServicePreboot> {
     this.log.debug('Prebooting elasticsearch service');
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     return {
       config: {
         hosts: config.hosts,
@@ -76,7 +76,7 @@ export class ElasticsearchService
   public async setup(deps: SetupDeps): Promise<InternalElasticsearchServiceSetup> {
     this.log.debug('Setting up elasticsearch service');
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
 
     this.authHeaders = deps.http.authRequestHeaders;
     this.executionContextClient = deps.executionContext;
@@ -112,7 +112,7 @@ export class ElasticsearchService
       throw new Error('ElasticsearchService needs to be setup before calling start');
     }
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
 
     // Log every error we may encounter in the connection to Elasticsearch
     this.esNodesCompatibility$.subscribe(({ isCompatible, message }) => {
diff --git a/src/core/server/elasticsearch/integration_tests/client.test.ts b/src/core/server/elasticsearch/integration_tests/client.test.ts
index 96a9d70d1b651..b3d4f7e631a98 100644
--- a/src/core/server/elasticsearch/integration_tests/client.test.ts
+++ b/src/core/server/elasticsearch/integration_tests/client.test.ts
@@ -68,7 +68,8 @@ function createFakeElasticsearchServer() {
   return server;
 }
 
-describe('fake elasticsearch', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/129754
+describe.skip('fake elasticsearch', () => {
   let esServer: http.Server;
   let kibanaServer: Root;
   let kibanaHttpServer: http.Server;
diff --git a/src/core/server/environment/environment_service.ts b/src/core/server/environment/environment_service.ts
index 472883c1f482c..65c03b108b28a 100644
--- a/src/core/server/environment/environment_service.ts
+++ b/src/core/server/environment/environment_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { PathConfigType, config as pathConfigDef } from '@kbn/utils';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
@@ -49,9 +49,9 @@ export class EnvironmentService {
     // IMPORTANT: This code is based on the assumption that none of the configuration values used
     // here is supposed to change during preboot phase and it's safe to read them only once.
     const [pathConfig, serverConfig, pidConfig] = await Promise.all([
-      this.configService.atPath<PathConfigType>(pathConfigDef.path).pipe(take(1)).toPromise(),
-      this.configService.atPath<HttpConfigType>(httpConfigDef.path).pipe(take(1)).toPromise(),
-      this.configService.atPath<PidConfigType>(pidConfigDef.path).pipe(take(1)).toPromise(),
+      firstValueFrom(this.configService.atPath<PathConfigType>(pathConfigDef.path)),
+      firstValueFrom(this.configService.atPath<HttpConfigType>(httpConfigDef.path)),
+      firstValueFrom(this.configService.atPath<PidConfigType>(pidConfigDef.path)),
     ]);
 
     // Log unhandled rejections so that we can fix them in preparation for https://github.com/elastic/kibana/issues/77469
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 1e26729545cbf..528e5399a1b62 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -25,7 +25,7 @@ import {
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { HttpServer } from './http_server';
 import { Readable } from 'stream';
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '..';
 import { KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import moment from 'moment';
 import { of } from 'rxjs';
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index 813f8e9784332..bc9b3f41bfe19 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -19,7 +19,7 @@ import {
 import agent from 'elastic-apm-node';
 
 import type { Duration } from 'moment';
-import { Observable } from 'rxjs';
+import { firstValueFrom, Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import apm from 'elastic-apm-node';
 import { Logger, LoggerFactory } from '../logging';
@@ -223,7 +223,7 @@ export class HttpServer {
     if (hasStarted) {
       this.log.debug('stopping http server');
 
-      const shutdownTimeout = await this.shutdownTimeout$.pipe(take(1)).toPromise();
+      const shutdownTimeout = await firstValueFrom(this.shutdownTimeout$.pipe(take(1)));
       await this.server.stop({ timeout: shutdownTimeout.asMilliseconds() });
 
       this.log.debug(`http server stopped`);
diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts
index ca031e8ab282b..3e238755eb398 100644
--- a/src/core/server/http/http_service.ts
+++ b/src/core/server/http/http_service.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Observable, Subscription, combineLatest } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { Observable, Subscription, combineLatest, firstValueFrom } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { pick } from '@kbn/std';
 
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '..';
 import type { InternalExecutionContextSetup } from '../execution_context';
 import { CoreService } from '../../types';
 import { Logger } from '../logging';
@@ -84,7 +84,7 @@ export class HttpService
 
   public async preboot(deps: PrebootDeps): Promise<InternalHttpServicePreboot> {
     this.log.debug('setting up preboot server');
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
 
     const prebootSetup = await this.prebootServer.setup(config);
     prebootSetup.server.route({
@@ -147,7 +147,7 @@ export class HttpService
       }
     });
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
 
     const { registerRouter, ...serverContract } = await this.httpServer.setup(
       config,
@@ -196,7 +196,7 @@ export class HttpService
   }
 
   public async start() {
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     if (this.shouldListen(config)) {
       this.log.debug('stopping preboot server');
       await this.prebootServer.stop();
diff --git a/src/core/server/http/integration_tests/cookie_session_storage.test.ts b/src/core/server/http/integration_tests/cookie_session_storage.test.ts
index 61da92a8ffdbd..56e93689555d8 100644
--- a/src/core/server/http/integration_tests/cookie_session_storage.test.ts
+++ b/src/core/server/http/integration_tests/cookie_session_storage.test.ts
@@ -14,7 +14,7 @@ import { BehaviorSubject } from 'rxjs';
 import { duration as momentDuration } from 'moment';
 
 import { CoreContext } from '../../core_context';
-import { HttpService } from './../http_service';
+import { HttpService } from '../http_service';
 import { Env } from '../../config';
 
 import { contextServiceMock } from '../../context/context_service.mock';
diff --git a/src/core/server/http/router/error_wrapper.test.ts b/src/core/server/http/router/error_wrapper.test.ts
index a25e9bb1df9bc..948aff8f32fee 100644
--- a/src/core/server/http/router/error_wrapper.test.ts
+++ b/src/core/server/http/router/error_wrapper.test.ts
@@ -9,7 +9,7 @@
 import Boom from '@hapi/boom';
 import { KibanaResponse, KibanaResponseFactory, kibanaResponseFactory } from './response';
 import { wrapErrors } from './error_wrapper';
-import { KibanaRequest, RequestHandler, RequestHandlerContext } from 'kibana/server';
+import { KibanaRequest, RequestHandler, RequestHandlerContext } from '../..';
 
 const createHandler =
   (handler: () => any): RequestHandler<any, any, any> =>
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index 5a914fb800da9..15351b9f3906a 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -9,7 +9,7 @@
 import { URL } from 'url';
 import uuid from 'uuid';
 import { Request, RouteOptionsApp, RequestApplicationState, RouteOptions } from '@hapi/hapi';
-import { Observable, fromEvent } from 'rxjs';
+import { Observable, fromEvent, NEVER } from 'rxjs';
 import { shareReplay, first, filter } from 'rxjs/operators';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { deepFreeze } from '@kbn/std';
@@ -216,6 +216,13 @@ export class KibanaRequest<
   }
 
   private getEvents(request: Request): KibanaRequestEvents {
+    if (!request.raw.res) {
+      return {
+        aborted$: NEVER,
+        completed$: NEVER,
+      };
+    }
+
     const completed$ = fromEvent<void>(request.raw.res, 'close').pipe(shareReplay(1), first());
     // the response's underlying connection was terminated prematurely
     const aborted$ = completed$.pipe(filter(() => !isCompleted(request)));
diff --git a/src/core/server/http/router/response.ts b/src/core/server/http/router/response.ts
index 331a1ab38f069..eebd0d0dd6eef 100644
--- a/src/core/server/http/router/response.ts
+++ b/src/core/server/http/router/response.ts
@@ -186,7 +186,7 @@ const errorResponseFactory = {
    * Creates an error response with defined status code and payload.
    * @param options - {@link CustomHttpResponseOptions} configures HTTP response headers, error message and other error details to pass to the client
    */
-  customError: (options: CustomHttpResponseOptions<ResponseError>) => {
+  customError: (options: CustomHttpResponseOptions<ResponseError | Buffer | Stream>) => {
     if (!options || !options.statusCode) {
       throw new Error(
         `options.statusCode is expected to be set. given options: ${options && options.statusCode}`
diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts
index be3b24d5d19a7..26cd28bd3d536 100644
--- a/src/core/server/http/router/router.ts
+++ b/src/core/server/http/router/router.ts
@@ -24,7 +24,7 @@ import {
 } from './response';
 import { RouteConfig, RouteConfigOptions, RouteMethod, validBodyOutput } from './route';
 import { HapiResponseAdapter } from './response_adapter';
-import { RequestHandlerContext } from '../../../server';
+import { RequestHandlerContext } from '../..';
 import { wrapErrors } from './error_wrapper';
 import { RouteValidator } from './validator';
 
diff --git a/src/core/server/http/router/validator/validator.test.ts b/src/core/server/http/router/validator/validator.test.ts
index b516d723edadc..7b82a68340194 100644
--- a/src/core/server/http/router/validator/validator.test.ts
+++ b/src/core/server/http/router/validator/validator.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RouteValidationError, RouteValidator } from './';
+import { RouteValidationError, RouteValidator } from '.';
 import { schema, Type } from '@kbn/config-schema';
 
 describe('Router validator', () => {
diff --git a/src/core/server/http_resources/http_resources_service.test.ts b/src/core/server/http_resources/http_resources_service.test.ts
index 00846ef541411..0a661f25d3141 100644
--- a/src/core/server/http_resources/http_resources_service.test.ts
+++ b/src/core/server/http_resources/http_resources_service.test.ts
@@ -17,7 +17,7 @@ import { httpServerMock } from '../http/http_server.mocks';
 import { renderingMock } from '../rendering/rendering_service.mock';
 import { HttpResourcesService, PrebootDeps, SetupDeps } from './http_resources_service';
 import { httpResourcesMock } from './http_resources_service.mock';
-import { HttpResources } from 'kibana/server';
+import { HttpResources } from '..';
 
 const coreContext = mockCoreContext.create();
 
diff --git a/src/core/server/http_resources/http_resources_service.ts b/src/core/server/http_resources/http_resources_service.ts
index 95610d36d4230..692b248752df9 100644
--- a/src/core/server/http_resources/http_resources_service.ts
+++ b/src/core/server/http_resources/http_resources_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RequestHandlerContext } from 'src/core/server';
+import { RequestHandlerContext } from '..';
 
 import { CoreContext } from '../core_context';
 import {
diff --git a/src/core/server/http_resources/types.ts b/src/core/server/http_resources/types.ts
index b85635cb98247..a7f476454c4d5 100644
--- a/src/core/server/http_resources/types.ts
+++ b/src/core/server/http_resources/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '..';
 import type {
   IRouter,
   RouteConfig,
diff --git a/src/core/server/i18n/i18n_service.ts b/src/core/server/i18n/i18n_service.ts
index 5772703a5a6b8..b8e397dc12ab5 100644
--- a/src/core/server/i18n/i18n_service.ts
+++ b/src/core/server/i18n/i18n_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { Logger } from '../logging';
 import { IConfigService } from '../config';
 import { CoreContext } from '../core_context';
@@ -68,10 +68,9 @@ export class I18nService {
   }
 
   private async initTranslations(pluginPaths: string[]) {
-    const i18nConfig = await this.configService
-      .atPath<I18nConfigType>(i18nConfigDef.path)
-      .pipe(take(1))
-      .toPromise();
+    const i18nConfig = await firstValueFrom(
+      this.configService.atPath<I18nConfigType>(i18nConfigDef.path)
+    );
 
     const locale = i18nConfig.locale;
     this.log.debug(`Using locale: ${locale}`);
diff --git a/src/core/server/metrics/integration_tests/server_collector.test.ts b/src/core/server/metrics/integration_tests/server_collector.test.ts
index 713d3ed1dc96e..92df3c303f37d 100644
--- a/src/core/server/metrics/integration_tests/server_collector.test.ts
+++ b/src/core/server/metrics/integration_tests/server_collector.test.ts
@@ -76,8 +76,8 @@ describe('ServerMetricsCollector', () => {
 
   it('collect disconnects requests infos', async () => {
     const never = new Promise((resolve) => undefined);
-    const disconnectRequested$ = new Subject(); // Controls the number of requests in the /disconnect endpoint
-    const disconnectAborted$ = new Subject(); // Controls the abort event in the /disconnect endpoint
+    const disconnectRequested$ = new Subject<void>(); // Controls the number of requests in the /disconnect endpoint
+    const disconnectAborted$ = new Subject<void>(); // Controls the abort event in the /disconnect endpoint
 
     router.get({ path: '/', validate: false }, async (ctx, req, res) => {
       return res.ok({ body: '' });
diff --git a/src/core/server/metrics/metrics_service.ts b/src/core/server/metrics/metrics_service.ts
index 30609837447d1..8c33b183603e7 100644
--- a/src/core/server/metrics/metrics_service.ts
+++ b/src/core/server/metrics/metrics_service.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ReplaySubject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, ReplaySubject } from 'rxjs';
 import { CoreService } from '../../types';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
@@ -38,10 +37,9 @@ export class MetricsService
   }
 
   public async setup({ http }: MetricsServiceSetupDeps): Promise<InternalMetricsServiceSetup> {
-    const config = await this.coreContext.configService
-      .atPath<OpsConfigType>(opsConfig.path)
-      .pipe(first())
-      .toPromise();
+    const config = await firstValueFrom(
+      this.coreContext.configService.atPath<OpsConfigType>(opsConfig.path)
+    );
 
     this.metricsCollector = new OpsMetricsCollector(http.server, {
       logger: this.logger,
diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts
index a6ffdff4422be..91fc7bd403dca 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.test.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts
@@ -13,8 +13,8 @@ import mockFs from 'mock-fs';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
 import { getEnvOptions, rawConfigServiceMock } from '../../config/mocks';
 
-import { from } from 'rxjs';
-import { first, map, toArray } from 'rxjs/operators';
+import { firstValueFrom, from } from 'rxjs';
+import { map, toArray } from 'rxjs/operators';
 import { resolve } from 'path';
 import { ConfigService, Env } from '../../config';
 import { PluginsConfig, PluginsConfigType, config } from '../plugins_config';
@@ -163,10 +163,7 @@ describe('plugins discovery system', () => {
       logger,
     };
 
-    pluginConfig = await configService
-      .atPath<PluginsConfigType>('plugins')
-      .pipe(first())
-      .toPromise();
+    pluginConfig = await firstValueFrom(configService.atPath<PluginsConfigType>('plugins'));
 
     // jest relies on the filesystem to get sourcemaps when using console.log
     // which breaks with the mocked FS, see https://github.com/tschaub/mock-fs/issues/234
@@ -195,7 +192,7 @@ describe('plugins discovery system', () => {
       { createCwd: false }
     );
 
-    const plugins = await plugin$.pipe(toArray()).toPromise();
+    const plugins = await firstValueFrom(plugin$.pipe(toArray()));
     const pluginNames = plugins.map((plugin) => plugin.name);
 
     expect(pluginNames).toHaveLength(4);
@@ -362,7 +359,7 @@ describe('plugins discovery system', () => {
       { createCwd: false }
     );
 
-    const plugins = await plugin$.pipe(toArray()).toPromise();
+    const plugins = await firstValueFrom(plugin$.pipe(toArray()));
     const pluginNames = plugins.map((plugin) => plugin.name);
 
     expect(pluginNames).toHaveLength(4);
@@ -401,7 +398,7 @@ describe('plugins discovery system', () => {
       { createCwd: false }
     );
 
-    const plugins = await plugin$.pipe(toArray()).toPromise();
+    const plugins = await firstValueFrom(plugin$.pipe(toArray()));
     const pluginNames = plugins.map((plugin) => plugin.name);
 
     expect(pluginNames).toEqual(['pluginA']);
@@ -423,7 +420,7 @@ describe('plugins discovery system', () => {
       { createCwd: false }
     );
 
-    const plugins = await plugin$.pipe(toArray()).toPromise();
+    const plugins = await firstValueFrom(plugin$.pipe(toArray()));
     const pluginNames = plugins.map((plugin) => plugin.name);
 
     expect(pluginNames).toHaveLength(5);
@@ -451,7 +448,7 @@ describe('plugins discovery system', () => {
       { createCwd: false }
     );
 
-    const plugins = await plugin$.pipe(toArray()).toPromise();
+    const plugins = await firstValueFrom(plugin$.pipe(toArray()));
     const pluginNames = plugins.map((plugin) => plugin.name);
 
     expect(pluginNames).toHaveLength(3);
@@ -536,7 +533,7 @@ describe('plugins discovery system', () => {
       let { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo);
 
       expect(scanPluginSearchPathsMock).toHaveBeenCalledTimes(1);
-      let plugins = await plugin$.pipe(toArray()).toPromise();
+      let plugins = await firstValueFrom(plugin$.pipe(toArray()));
       let pluginNames = plugins.map((plugin) => plugin.name);
 
       expect(pluginNames).toHaveLength(3);
@@ -555,7 +552,7 @@ describe('plugins discovery system', () => {
       plugin$ = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo).plugin$;
 
       expect(scanPluginSearchPathsMock).toHaveBeenCalledTimes(2);
-      plugins = await plugin$.pipe(toArray()).toPromise();
+      plugins = await firstValueFrom(plugin$.pipe(toArray()));
       pluginNames = plugins.map((plugin) => plugin.name);
 
       expect(pluginNames).toHaveLength(3);
diff --git a/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts b/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts
index 548c479975ddf..e1c7397ef1406 100644
--- a/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts
+++ b/src/core/server/plugins/discovery/scan_plugin_search_paths.test.ts
@@ -12,6 +12,7 @@ import { toArray } from 'rxjs/operators';
 import { resolve } from 'path';
 import { scanPluginSearchPaths } from './scan_plugin_search_paths';
 import { PluginDiscoveryError } from './plugin_discovery_error';
+import { firstValueFrom } from 'rxjs';
 
 const KIBANA_ROOT = process.cwd();
 
@@ -82,7 +83,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths(scanPaths, logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(paths).toHaveLength(3);
     expect(errors).toHaveLength(0);
@@ -106,7 +107,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(paths).toHaveLength(1);
     expect(errors).toHaveLength(0);
@@ -128,7 +129,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(paths).toHaveLength(0);
     expect(errors).toHaveLength(1);
@@ -153,7 +154,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(errors).toHaveLength(0);
     expect(paths).toHaveLength(4);
@@ -180,7 +181,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(errors).toHaveLength(0);
     expect(paths).toHaveLength(1);
@@ -203,7 +204,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/src/plugins`], logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(errors).toHaveLength(0);
     expect(paths).toHaveLength(5);
@@ -236,7 +237,7 @@ describe('scanPluginSearchPaths', () => {
     );
 
     const pluginOrErrors$ = scanPluginSearchPaths([`${KIBANA_ROOT}/plugins`], logger);
-    const { paths, errors } = extract(await pluginOrErrors$.pipe(toArray()).toPromise());
+    const { paths, errors } = extract(await firstValueFrom(pluginOrErrors$.pipe(toArray())));
 
     expect(errors).toHaveLength(0);
     expect(paths).toHaveLength(2);
diff --git a/src/core/server/plugins/discovery/scan_plugin_search_paths.ts b/src/core/server/plugins/discovery/scan_plugin_search_paths.ts
index 51d5a29115c30..7c352d0d7c47f 100644
--- a/src/core/server/plugins/discovery/scan_plugin_search_paths.ts
+++ b/src/core/server/plugins/discovery/scan_plugin_search_paths.ts
@@ -13,8 +13,8 @@ import { catchError, mergeMap } from 'rxjs/operators';
 import { Logger } from '../../logging';
 import { PluginDiscoveryError } from './plugin_discovery_error';
 
-const fsReadDir$ = bindNodeCallback<string, string[]>(readdir);
-const fsStat$ = bindNodeCallback<PathLike, Stats>(stat);
+const fsReadDir$ = bindNodeCallback<[string], [string[]]>(readdir);
+const fsStat$ = bindNodeCallback<[PathLike], [Stats]>(stat);
 
 const maxScanDepth = 5;
 
diff --git a/src/core/server/plugins/plugin.test.ts b/src/core/server/plugins/plugin.test.ts
index 92cbda2a69cfe..41718d22fd50a 100644
--- a/src/core/server/plugins/plugin.test.ts
+++ b/src/core/server/plugins/plugin.test.ts
@@ -467,7 +467,7 @@ describe('#getConfigSchema()', () => {
       schema: pluginSchema,
     };
     jest.doMock(
-      'plugin-with-schema/server',
+      join('plugin-with-schema', 'server'),
       () => ({
         config: configDescriptor,
       }),
@@ -491,7 +491,7 @@ describe('#getConfigSchema()', () => {
   });
 
   it('returns null if config definition not specified', () => {
-    jest.doMock('plugin-with-no-definition/server', () => ({}), { virtual: true });
+    jest.doMock(join('plugin-with-no-definition', 'server'), () => ({}), { virtual: true });
     const manifest = createPluginManifest();
     const opaqueId = Symbol();
     const plugin = new PluginWrapper({
@@ -527,7 +527,7 @@ describe('#getConfigSchema()', () => {
 
   it('throws if plugin contains invalid schema', () => {
     jest.doMock(
-      'plugin-invalid-schema/server',
+      join('plugin-invalid-schema', 'server'),
       () => ({
         config: {
           schema: {
diff --git a/src/core/server/plugins/plugin.ts b/src/core/server/plugins/plugin.ts
index dc861b4489dcf..67c32526f2bf4 100644
--- a/src/core/server/plugins/plugin.ts
+++ b/src/core/server/plugins/plugin.ts
@@ -8,8 +8,7 @@
 
 import { join } from 'path';
 import typeDetect from 'type-detect';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
 import { isPromise } from '@kbn/std';
 import { isConfigSchema } from '@kbn/config-schema';
 
@@ -63,7 +62,7 @@ export class PluginWrapper<
     | AsyncPlugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
 
   private readonly startDependencies$ = new Subject<[CoreStart, TPluginsStart, TStart]>();
-  public readonly startDependencies = this.startDependencies$.pipe(first()).toPromise();
+  public readonly startDependencies = firstValueFrom(this.startDependencies$);
 
   constructor(
     public readonly params: {
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index 4272a9767b90e..1566fd5bbe07b 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -7,7 +7,7 @@
  */
 
 import { shareReplay } from 'rxjs/operators';
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '..';
 import { CoreContext } from '../core_context';
 import { PluginWrapper } from './plugin';
 import {
diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
index 2c1ba26b96ebb..43e10fbe59b6a 100644
--- a/src/core/server/plugins/plugins_service.ts
+++ b/src/core/server/plugins/plugins_service.ts
@@ -7,8 +7,8 @@
  */
 
 import Path from 'path';
-import { Observable } from 'rxjs';
-import { filter, first, map, tap, toArray } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
+import { filter, map, tap, toArray } from 'rxjs/operators';
 import { getFlattenedObject } from '@kbn/std';
 
 import { CoreService } from '../../types';
@@ -111,7 +111,7 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
   }
 
   public async discover({ environment }: PluginsServiceDiscoverDeps): Promise<DiscoveredPlugins> {
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
 
     const { error$, plugin$ } = discover(config, this.coreContext, {
       uuid: environment.instanceUuid,
@@ -151,7 +151,7 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
   public async preboot(deps: PluginsServicePrebootSetupDeps) {
     this.log.debug('Prebooting plugins service');
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     if (config.initialize) {
       await this.prebootPluginsSystem.setupPlugins(deps);
       this.registerPluginStaticDirs(deps, this.prebootUiPluginInternalInfo);
@@ -165,7 +165,7 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
   public async setup(deps: PluginsServiceSetupDeps) {
     this.log.debug('Setting up plugins service');
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
 
     let contracts = new Map<PluginName, unknown>();
     if (config.initialize) {
@@ -186,7 +186,7 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
   public async start(deps: PluginsServiceStartDeps) {
     this.log.debug('Plugins service starts plugins');
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     if (!config.initialize) {
       this.log.info(
         'Skipping `start` for `standard` plugins since plugin initialization is disabled.'
@@ -246,13 +246,13 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
       PluginDiscoveryErrorType.InvalidManifest,
     ];
 
-    const errors = await error$
-      .pipe(
+    const errors = await firstValueFrom(
+      error$.pipe(
         filter((error) => errorTypesToReport.includes(error.type)),
         tap((pluginError) => this.log.error(pluginError)),
         toArray()
       )
-      .toPromise();
+    );
     if (errors.length > 0) {
       throw new Error(
         `Failed to initialize plugins:${errors.map((err) => `\n\t${err.message}`).join('')}`
@@ -265,7 +265,7 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
       PluginName,
       { plugin: PluginWrapper; isEnabled: boolean }
     >();
-    const plugins = await plugin$.pipe(toArray()).toPromise();
+    const plugins = await firstValueFrom(plugin$.pipe(toArray()));
 
     // Register config descriptors and deprecations
     for (const plugin of plugins) {
diff --git a/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts b/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts
index 749ec58bcbfed..533ada6078caa 100644
--- a/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts
+++ b/src/core/server/saved_objects/deprecations/unknown_object_types.test.ts
@@ -12,7 +12,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { deleteUnknownTypeObjects, getUnknownTypesDeprecations } from './unknown_object_types';
 import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { elasticsearchClientMock } from '../../elasticsearch/client/mocks';
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '../..';
 
 const createSearchResponse = (count: number): estypes.SearchResponse => {
   return {
diff --git a/src/core/server/saved_objects/import/lib/check_conflicts.test.ts b/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
index e11e880016550..a9c534bd7e36b 100644
--- a/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
+++ b/src/core/server/saved_objects/import/lib/check_conflicts.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { savedObjectsClientMock } from '../../../mocks';
-import { SavedObjectReference, SavedObjectsImportRetry } from 'kibana/public';
+import { SavedObjectReference, SavedObjectsImportRetry } from '../../../../public';
 import { SavedObjectsClientContract, SavedObject } from '../../types';
 import { SavedObjectsErrorHelpers } from '../../service';
 import { checkConflicts } from './check_conflicts';
diff --git a/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts b/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts
index 5f3e95bbcfc72..8318bd8f7a69b 100644
--- a/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts
+++ b/src/core/server/saved_objects/migrations/actions/bulk_overwrite_transformed_documents.ts
@@ -18,11 +18,7 @@ import {
 } from './catch_retryable_es_client_errors';
 import { isWriteBlockException, isIndexNotFoundException } from './es_errors';
 import { WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE } from './constants';
-import type {
-  TargetIndexHadWriteBlock,
-  RequestEntityTooLargeException,
-  IndexNotFound,
-} from './index';
+import type { TargetIndexHadWriteBlock, RequestEntityTooLargeException, IndexNotFound } from '.';
 
 /**
  * Given a document and index, creates a valid body for the Bulk API.
diff --git a/src/core/server/saved_objects/migrations/actions/clone_index.ts b/src/core/server/saved_objects/migrations/actions/clone_index.ts
index e77ce8c47156f..b5aedb11b36fa 100644
--- a/src/core/server/saved_objects/migrations/actions/clone_index.ts
+++ b/src/core/server/saved_objects/migrations/actions/clone_index.ts
@@ -15,7 +15,7 @@ import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,
 } from './catch_retryable_es_client_errors';
-import type { IndexNotFound, AcknowledgeResponse } from './';
+import type { IndexNotFound, AcknowledgeResponse } from '.';
 import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
 import {
   DEFAULT_TIMEOUT,
diff --git a/src/core/server/saved_objects/migrations/actions/create_index.ts b/src/core/server/saved_objects/migrations/actions/create_index.ts
index e037de1712373..b0be80d1b74b6 100644
--- a/src/core/server/saved_objects/migrations/actions/create_index.ts
+++ b/src/core/server/saved_objects/migrations/actions/create_index.ts
@@ -10,7 +10,7 @@ import * as Either from 'fp-ts/lib/Either';
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { AcknowledgeResponse } from './index';
+import { AcknowledgeResponse } from '.';
 import { ElasticsearchClient } from '../../../elasticsearch';
 import { IndexMapping } from '../../mappings';
 import {
diff --git a/src/core/server/saved_objects/migrations/actions/index.ts b/src/core/server/saved_objects/migrations/actions/index.ts
index 1123588309deb..0915a73f0d531 100644
--- a/src/core/server/saved_objects/migrations/actions/index.ts
+++ b/src/core/server/saved_objects/migrations/actions/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { RetryableEsClientError } from './catch_retryable_es_client_errors';
-import { DocumentsTransformFailed } from '../../migrations/core/migrate_raw_docs';
+import { DocumentsTransformFailed } from '../core/migrate_raw_docs';
 
 export {
   BATCH_SIZE,
diff --git a/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts b/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts
index fb14a0c8b3a01..331958e88ce83 100644
--- a/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts
+++ b/src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from '../../../../';
+import { ElasticsearchClient } from '../../../..';
 import * as kbnTestServer from '../../../../../test_helpers/kbn_server';
 import { SavedObjectsRawDoc } from '../../../serialization';
 import {
@@ -35,7 +35,7 @@ import {
   transformDocs,
   waitForIndexStatusYellow,
   initAction,
-} from '../../actions';
+} from '..';
 import * as Either from 'fp-ts/lib/Either';
 import * as Option from 'fp-ts/lib/Option';
 import { errors } from '@elastic/elasticsearch';
diff --git a/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts b/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts
index 7f998938e92c0..a409bb31d39ef 100644
--- a/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts
+++ b/src/core/server/saved_objects/migrations/actions/integration_tests/es_errors.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from '../../../../';
+import { ElasticsearchClient } from '../../../..';
 import { InternalCoreStart } from '../../../../internal_types';
 import * as kbnTestServer from '../../../../../test_helpers/kbn_server';
 import { Root } from '../../../../root';
diff --git a/src/core/server/saved_objects/migrations/actions/set_write_block.ts b/src/core/server/saved_objects/migrations/actions/set_write_block.ts
index eaca12ab7e315..fcb508aa6cf3f 100644
--- a/src/core/server/saved_objects/migrations/actions/set_write_block.ts
+++ b/src/core/server/saved_objects/migrations/actions/set_write_block.ts
@@ -14,7 +14,7 @@ import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,
 } from './catch_retryable_es_client_errors';
-import type { IndexNotFound } from './';
+import type { IndexNotFound } from '.';
 
 /** @internal */
 export interface SetWriteBlockParams {
diff --git a/src/core/server/saved_objects/migrations/actions/transform_docs.ts b/src/core/server/saved_objects/migrations/actions/transform_docs.ts
index 4c712afcff3a4..e03cdc01a0a22 100644
--- a/src/core/server/saved_objects/migrations/actions/transform_docs.ts
+++ b/src/core/server/saved_objects/migrations/actions/transform_docs.ts
@@ -8,10 +8,7 @@
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import type { TransformRawDocs } from '../types';
 import type { SavedObjectsRawDoc } from '../../serialization';
-import {
-  DocumentsTransformFailed,
-  DocumentsTransformSuccess,
-} from '../../migrations/core/migrate_raw_docs';
+import { DocumentsTransformFailed, DocumentsTransformSuccess } from '../core/migrate_raw_docs';
 
 /** @internal */
 export interface TransformDocsParams {
diff --git a/src/core/server/saved_objects/migrations/actions/update_aliases.ts b/src/core/server/saved_objects/migrations/actions/update_aliases.ts
index f76d30ae023db..c8ac3655ba72a 100644
--- a/src/core/server/saved_objects/migrations/actions/update_aliases.ts
+++ b/src/core/server/saved_objects/migrations/actions/update_aliases.ts
@@ -14,7 +14,7 @@ import {
   catchRetryableEsClientErrors,
   RetryableEsClientError,
 } from './catch_retryable_es_client_errors';
-import { IndexNotFound } from './index';
+import { IndexNotFound } from '.';
 
 export interface AliasNotFound {
   type: 'alias_not_found_exception';
diff --git a/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts b/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts
index cafc8f15f0290..3eb7b0da718c2 100644
--- a/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts
+++ b/src/core/server/saved_objects/migrations/actions/wait_for_reindex_task.ts
@@ -10,7 +10,7 @@ import * as TaskEither from 'fp-ts/lib/TaskEither';
 import * as Option from 'fp-ts/lib/Option';
 import { flow } from 'fp-ts/lib/function';
 import { RetryableEsClientError } from './catch_retryable_es_client_errors';
-import type { IndexNotFound, TargetIndexHadWriteBlock } from './index';
+import type { IndexNotFound, TargetIndexHadWriteBlock } from '.';
 import { waitForTask, WaitForTaskCompletionTimeout } from './wait_for_task';
 import { isWriteBlockException, isIncompatibleMappingException } from './es_errors';
 
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
index a39fff20abbe7..7a57a7a8a08d3 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IndexMapping, SavedObjectsTypeMappingDefinitions } from './../../mappings';
+import { IndexMapping, SavedObjectsTypeMappingDefinitions } from '../../mappings';
 import { buildActiveMappings, diffMappings } from './build_active_mappings';
 
 describe('buildActiveMappings', () => {
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
index d3ac00fc0354a..72b5f32d54782 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
@@ -16,7 +16,7 @@ import {
   IndexMapping,
   SavedObjectsMappingProperties,
   SavedObjectsTypeMappingDefinitions,
-} from './../../mappings';
+} from '../../mappings';
 
 /**
  * Creates an index mapping with the core properties required by saved object
diff --git a/src/core/server/saved_objects/migrations/initial_state.ts b/src/core/server/saved_objects/migrations/initial_state.ts
index f074f123c8930..21b564f8c454f 100644
--- a/src/core/server/saved_objects/migrations/initial_state.ts
+++ b/src/core/server/saved_objects/migrations/initial_state.ts
@@ -12,7 +12,7 @@ import { SavedObjectsMigrationVersion } from '../../../types';
 import { SavedObjectsMigrationConfigType } from '../saved_objects_config';
 import type { ISavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { InitState } from './state';
-import { excludeUnusedTypesQuery } from '../migrations/core';
+import { excludeUnusedTypesQuery } from './core';
 
 /**
  * Construct the initial state for the model
diff --git a/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts b/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
index 5948425ed737c..cf350c0e9a35e 100644
--- a/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
+++ b/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
@@ -13,7 +13,7 @@ import { kibanaPackageJson as pkg } from '@kbn/utils';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 import type { ElasticsearchClient } from '../../../elasticsearch';
 import { Root } from '../../../root';
-import { deterministicallyRegenerateObjectId } from '../../migrations/core/document_migrator';
+import { deterministicallyRegenerateObjectId } from '../core/document_migrator';
 
 const logFilePath = Path.join(__dirname, 'rewriting_id.log');
 
diff --git a/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts b/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts
index 96ce7a1fdc097..79a76d0a9f4fc 100644
--- a/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts
+++ b/src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { REMOVED_TYPES } from '../../migrations/core';
+import { REMOVED_TYPES } from '../core';
 import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 
 // Types should NEVER be removed from this array
diff --git a/src/core/server/saved_objects/migrations/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
index 2adf4d5dee184..e5aa51f9d6b0a 100644
--- a/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana_migrator.test.ts
@@ -16,6 +16,7 @@ import { SavedObjectTypeRegistry } from '../saved_objects_type_registry';
 import { SavedObjectsType } from '../types';
 import { DocumentMigrator } from './core/document_migrator';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { lastValueFrom } from 'rxjs';
 
 jest.mock('./core/document_migrator', () => {
   return {
@@ -134,7 +135,7 @@ describe('KibanaMigrator', () => {
     it('emits results on getMigratorResult$()', async () => {
       const options = mockV2MigrationOptions();
       const migrator = new KibanaMigrator(options);
-      const migratorStatus = migrator.getStatus$().pipe(take(3)).toPromise();
+      const migratorStatus = lastValueFrom(migrator.getStatus$().pipe(take(3)));
       migrator.prepareMigrations();
       await migrator.runMigrations();
 
diff --git a/src/core/server/saved_objects/migrations/model/model.test.ts b/src/core/server/saved_objects/migrations/model/model.test.ts
index de8483bb4abce..cfa650c881833 100644
--- a/src/core/server/saved_objects/migrations/model/model.test.ts
+++ b/src/core/server/saved_objects/migrations/model/model.test.ts
@@ -42,7 +42,7 @@ import type {
   CalculateExcludeFiltersState,
 } from '../state';
 import { SavedObjectsRawDoc } from '../../serialization';
-import { TransformErrorObjects, TransformSavedObjectDocumentError } from '../../migrations/core';
+import { TransformErrorObjects, TransformSavedObjectDocumentError } from '../core';
 import { AliasAction, RetryableEsClientError } from '../actions';
 import { ResponseType } from '../next';
 import { createInitialProgress } from './progress';
diff --git a/src/core/server/saved_objects/migrations/run_resilient_migrator.ts b/src/core/server/saved_objects/migrations/run_resilient_migrator.ts
index 33f73395bcc6c..bdc36b2b79ebe 100644
--- a/src/core/server/saved_objects/migrations/run_resilient_migrator.ts
+++ b/src/core/server/saved_objects/migrations/run_resilient_migrator.ts
@@ -11,7 +11,7 @@ import { IndexMapping } from '../mappings';
 import { Logger } from '../../logging';
 import type { SavedObjectsMigrationVersion } from '../types';
 import type { TransformRawDocs } from './types';
-import { MigrationResult } from '../migrations/core';
+import { MigrationResult } from './core';
 import { next } from './next';
 import { model } from './model';
 import { createInitialState } from './initial_state';
diff --git a/src/core/server/saved_objects/migrations/state.ts b/src/core/server/saved_objects/migrations/state.ts
index 7073167bfbd1b..aacc2826ccb26 100644
--- a/src/core/server/saved_objects/migrations/state.ts
+++ b/src/core/server/saved_objects/migrations/state.ts
@@ -12,7 +12,7 @@ import { ControlState } from './state_action_machine';
 import { AliasAction } from './actions';
 import { IndexMapping } from '../mappings';
 import { SavedObjectsRawDoc } from '..';
-import { TransformErrorObjects } from '../migrations/core';
+import { TransformErrorObjects } from './core';
 import { SavedObjectTypeExcludeFromUpgradeFilterHook } from '../types';
 import { MigrationLog, Progress } from './types';
 
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts
index be3659f0a5ac4..eeec6bd6b0be0 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_create.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkCreateRoute } from '../bulk_create';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts
index 4c59d9838e561..f389307d45c41 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_get.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkGetRoute } from '../bulk_get';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts
index 9fd2d66830b0a..bb5067a13ba3e 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_resolve.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkResolveRoute } from '../bulk_resolve';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts b/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts
index 886cca83ee849..8c55686b2fd0f 100644
--- a/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/bulk_update.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerBulkUpdateRoute } from '../bulk_update';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/delete.test.ts b/src/core/server/saved_objects/routes/integration_tests/delete.test.ts
index 66f0e2ffb877d..84a2db60b587a 100644
--- a/src/core/server/saved_objects/routes/integration_tests/delete.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/delete.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerDeleteRoute } from '../delete';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts b/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts
index 2501a430df8a3..60d916744babc 100644
--- a/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/delete_unknown_types.test.ts
@@ -8,10 +8,10 @@
 
 import supertest from 'supertest';
 import { registerDeleteUnknownTypesRoute } from '../deprecations';
-import { elasticsearchServiceMock } from '../../../../../core/server/elasticsearch/elasticsearch_service.mock';
+import { elasticsearchServiceMock } from '../../../elasticsearch/elasticsearch_service.mock';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
 import { setupServer } from '../test_utils';
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '../../..';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;
 
diff --git a/src/core/server/saved_objects/routes/integration_tests/find.test.ts b/src/core/server/saved_objects/routes/integration_tests/find.test.ts
index 43821c03cbcd6..c18044f8973b8 100644
--- a/src/core/server/saved_objects/routes/integration_tests/find.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/find.test.ts
@@ -10,7 +10,7 @@ import supertest from 'supertest';
 import querystring from 'querystring';
 
 import { registerFindRoute } from '../find';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
index 6f2dfe86a1525..d36b8b07f78f0 100644
--- a/src/core/server/saved_objects/routes/integration_tests/import.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
@@ -10,7 +10,7 @@ jest.mock('uuid');
 
 import supertest from 'supertest';
 import { registerImportRoute } from '../import';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts b/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
index a7f1b1e304aa7..956da9aa13524 100644
--- a/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
@@ -10,7 +10,7 @@ jest.mock('uuid');
 
 import supertest from 'supertest';
 import { registerResolveImportErrorsRoute } from '../resolve_import_errors';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/integration_tests/update.test.ts b/src/core/server/saved_objects/routes/integration_tests/update.test.ts
index 4aa01f7f697a8..78e7b9c1e93d5 100644
--- a/src/core/server/saved_objects/routes/integration_tests/update.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/update.test.ts
@@ -8,7 +8,7 @@
 
 import supertest from 'supertest';
 import { registerUpdateRoute } from '../update';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../mocks';
 import { CoreUsageStatsClient } from '../../../core_usage_data';
 import { coreUsageStatsClientMock } from '../../../core_usage_data/core_usage_stats_client.mock';
 import { coreUsageDataServiceMock } from '../../../core_usage_data/core_usage_data_service.mock';
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/export.ts b/src/core/server/saved_objects/routes/legacy_import_export/export.ts
index c9a954db07e7a..fd10e60c4c804 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/export.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/export.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
-import { InternalCoreUsageDataSetup } from 'src/core/server/core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../../core_usage_data';
 import { IRouter, Logger } from '../../..';
 import { exportDashboards } from './lib';
 
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts
index c27dc29fed65d..b9752b39f8e78 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/export.test.ts
@@ -37,7 +37,7 @@ import { coreUsageStatsClientMock } from '../../../../core_usage_data/core_usage
 import { coreUsageDataServiceMock } from '../../../../core_usage_data/core_usage_data_service.mock';
 import { registerLegacyExportRoute } from '../export';
 import { setupServer } from '../../test_utils';
-import { loggerMock } from 'src/core/server/logging/logger.mock';
+import { loggerMock } from '../../../../logging/logger.mock';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;
 let coreUsageStatsClient: jest.Mocked<CoreUsageStatsClient>;
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts
index dfc9787d8f59a..8a414094fde99 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/integration_tests/import.test.ts
@@ -37,7 +37,7 @@ import { coreUsageStatsClientMock } from '../../../../core_usage_data/core_usage
 import { coreUsageDataServiceMock } from '../../../../core_usage_data/core_usage_data_service.mock';
 import { registerLegacyImportRoute } from '../import';
 import { setupServer } from '../../test_utils';
-import { loggerMock } from 'src/core/server/logging/logger.mock';
+import { loggerMock } from '../../../../logging/logger.mock';
 
 type SetupServerReturn = Awaited<ReturnType<typeof setupServer>>;
 let coreUsageStatsClient: jest.Mocked<CoreUsageStatsClient>;
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts
index 4f5da2a783cd7..1c85ceedf90e6 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectAttributes } from 'src/core/server';
+import { SavedObject, SavedObjectAttributes } from '../../../..';
 import { savedObjectsClientMock } from '../../../../mocks';
 import { collectReferencesDeep } from './collect_references_deep';
 
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts
index 67f739eacbb53..a02fc37e4b863 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/collect_references_deep.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from '../../../..';
 
 const MAX_BULK_GET_SIZE = 10000;
 
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts
index e1beafc03b224..9d0ed7889cdc7 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/export_dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '../../../..';
 import { collectReferencesDeep } from './collect_references_deep';
 
 export async function exportDashboards(
diff --git a/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts b/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts
index 93ec512017c2d..11192cc0ad2f4 100644
--- a/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts
+++ b/src/core/server/saved_objects/routes/legacy_import_export/lib/import_dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from '../../../..';
 
 export async function importDashboards(
   savedObjectsClient: SavedObjectsClientContract,
diff --git a/src/core/server/saved_objects/routes/utils.test.ts b/src/core/server/saved_objects/routes/utils.test.ts
index 51dd5d0918fd4..9c245e58b5947 100644
--- a/src/core/server/saved_objects/routes/utils.test.ts
+++ b/src/core/server/saved_objects/routes/utils.test.ts
@@ -17,7 +17,7 @@ import {
   RequestHandlerContext,
   KibanaResponseFactory,
   kibanaResponseFactory,
-} from '../../';
+} from '../..';
 
 async function readStreamToCompletion(stream: Readable) {
   return createPromiseFromStreams([stream, createConcatStream([])]);
diff --git a/src/core/server/saved_objects/routes/utils.ts b/src/core/server/saved_objects/routes/utils.ts
index 47996847a8387..54a15f599c307 100644
--- a/src/core/server/saved_objects/routes/utils.ts
+++ b/src/core/server/saved_objects/routes/utils.ts
@@ -7,11 +7,6 @@
  */
 
 import { Readable } from 'stream';
-import {
-  RequestHandlerWrapper,
-  SavedObject,
-  SavedObjectsExportResultDetails,
-} from 'src/core/server';
 import {
   createSplitStream,
   createMapStream,
@@ -21,6 +16,7 @@ import {
   createConcatStream,
 } from '@kbn/utils';
 import Boom from '@hapi/boom';
+import { RequestHandlerWrapper, SavedObject, SavedObjectsExportResultDetails } from '../..';
 
 export async function createSavedObjectsStreamFromNdJson(ndJsonStream: Readable) {
   const savedObjects = await createPromiseFromStreams([
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index fef20937c9cfe..0729db0e04266 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { Subject, Observable } from 'rxjs';
-import { first, filter, take, switchMap } from 'rxjs/operators';
+import { Subject, Observable, firstValueFrom } from 'rxjs';
+import { filter, take, switchMap } from 'rxjs/operators';
 import { CoreService } from '../../types';
 import {
   SavedObjectsClient,
   SavedObjectsClientProvider,
   SavedObjectsClientProviderOptions,
-} from './';
+} from '.';
 import { KibanaMigrator, IKibanaMigrator } from './migrations';
 import { CoreContext } from '../core_context';
 import { InternalCoreUsageDataSetup } from '../core_usage_data';
@@ -314,14 +314,12 @@ export class SavedObjectsService
     this.setupDeps = setupDeps;
     const { http, elasticsearch, coreUsageData, deprecations } = setupDeps;
 
-    const savedObjectsConfig = await this.coreContext.configService
-      .atPath<SavedObjectsConfigType>('savedObjects')
-      .pipe(first())
-      .toPromise();
-    const savedObjectsMigrationConfig = await this.coreContext.configService
-      .atPath<SavedObjectsMigrationConfigType>('migrations')
-      .pipe(first())
-      .toPromise();
+    const savedObjectsConfig = await firstValueFrom(
+      this.coreContext.configService.atPath<SavedObjectsConfigType>('savedObjects')
+    );
+    const savedObjectsMigrationConfig = await firstValueFrom(
+      this.coreContext.configService.atPath<SavedObjectsMigrationConfigType>('migrations')
+    );
     this.config = new SavedObjectConfig(savedObjectsConfig, savedObjectsMigrationConfig);
 
     deprecations.getRegistry('savedObjects').registerDeprecations(
@@ -340,7 +338,7 @@ export class SavedObjectsService
       coreUsageData,
       logger: this.logger,
       config: this.config,
-      migratorPromise: this.migrator$.pipe(first()).toPromise(),
+      migratorPromise: firstValueFrom(this.migrator$),
       kibanaIndex,
       kibanaVersion: this.kibanaVersion,
     });
diff --git a/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts b/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts
index fb7e25fae19f2..454212c5a8673 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/aggs_types/metrics_aggs.ts
@@ -19,6 +19,7 @@ import { sortSchema } from './common_schemas';
  * - max
  * - sum
  * - top_hits
+ * - value_count
  * - weighted_avg
  *
  * Not implemented:
@@ -76,6 +77,9 @@ export const metricsAggsSchemas: Record<string, ObjectType> = {
     highlight: s.maybe(s.any()),
     _source: s.maybe(s.oneOf([s.boolean(), s.string(), s.arrayOf(s.string())])),
   }),
+  value_count: s.object({
+    field: s.maybe(s.string()),
+  }),
   weighted_avg: s.object({
     format: s.maybe(s.string()),
     value_type: s.maybe(s.string()),
diff --git a/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts b/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts
index 1c18f0ed9b990..749eff0e33875 100644
--- a/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts
+++ b/src/core/server/saved_objects/service/lib/internal_bulk_resolve.test.ts
@@ -12,7 +12,7 @@ import {
   mockIsNotFoundFromUnsupportedServer,
 } from './internal_bulk_resolve.test.mock';
 
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 import { LEGACY_URL_ALIAS_TYPE } from '../../object_types';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
 import { SavedObjectsSerializer } from '../../serialization';
diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts
index 160852f9160b7..e4045f53eadad 100644
--- a/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts
+++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { loggerMock, MockedLogger } from '../../../logging/logger.mock';
-import type { SavedObjectsFindResult } from '../';
+import type { SavedObjectsFindResult } from '..';
 import { savedObjectsRepositoryMock } from './repository.mock';
 
 import {
diff --git a/src/core/server/saved_objects/service/lib/point_in_time_finder.ts b/src/core/server/saved_objects/service/lib/point_in_time_finder.ts
index 5c630d1416cc3..54cc527f28058 100644
--- a/src/core/server/saved_objects/service/lib/point_in_time_finder.ts
+++ b/src/core/server/saved_objects/service/lib/point_in_time_finder.ts
@@ -8,7 +8,7 @@
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Logger } from '../../../logging';
 import type { SavedObjectsFindOptions, SavedObjectsClientContract } from '../../types';
-import type { SavedObjectsFindResponse } from '../';
+import type { SavedObjectsFindResponse } from '..';
 
 type PointInTimeFinderClient = Pick<
   SavedObjectsClientContract,
diff --git a/src/core/server/saved_objects/service/lib/repository.test.ts b/src/core/server/saved_objects/service/lib/repository.test.ts
index 1df3ef351c6ae..746ed0033a1d2 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.ts
+++ b/src/core/server/saved_objects/service/lib/repository.test.ts
@@ -75,7 +75,7 @@ import {
   SavedObjectsCollectMultiNamespaceReferencesResponse,
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
-} from 'kibana/server';
+} from '../../..';
 import { InternalBulkResolveError } from './internal_bulk_resolve';
 
 const { nodeTypes } = esKuery;
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index abfea6e7ebafc..db57e74bae138 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -9,7 +9,7 @@
 import { omit, isObject } from 'lodash';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import * as esKuery from '@kbn/es-query';
-import type { ElasticsearchClient } from '../../../elasticsearch/';
+import type { ElasticsearchClient } from '../../../elasticsearch';
 import { isSupportedEsServer, isNotFoundFromUnsupportedServer } from '../../../elasticsearch';
 import type { Logger } from '../../../logging';
 import { getRootPropertiesObjects, IndexMapping } from '../../mappings';
diff --git a/src/core/server/saved_objects/service/lib/repository_es_client.ts b/src/core/server/saved_objects/service/lib/repository_es_client.ts
index e9893d4b2d570..9c9d84d975d0d 100644
--- a/src/core/server/saved_objects/service/lib/repository_es_client.ts
+++ b/src/core/server/saved_objects/service/lib/repository_es_client.ts
@@ -8,7 +8,7 @@
 
 import type { TransportRequestOptions } from '@elastic/elasticsearch';
 
-import { ElasticsearchClient } from '../../../elasticsearch/';
+import { ElasticsearchClient } from '../../../elasticsearch';
 import { retryCallCluster } from '../../../elasticsearch/client/retry_call_cluster';
 import { decorateEsError } from './decorate_es_error';
 
diff --git a/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts b/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts
index 38bdba0208b8d..43a9d44d9fd60 100644
--- a/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts
+++ b/src/core/server/saved_objects/service/lib/update_objects_spaces.test.ts
@@ -13,7 +13,7 @@ import {
   mockDeleteLegacyUrlAliases,
 } from './update_objects_spaces.test.mock';
 
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
 
 import { loggerMock } from '../../../logging/logger.mock';
 import { typeRegistryMock } from '../../saved_objects_type_registry.mock';
diff --git a/src/core/server/saved_objects/service/saved_objects_client.test.ts b/src/core/server/saved_objects/service/saved_objects_client.test.ts
index 3c24df6dcc1a4..7017d0d854b6f 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.test.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.test.ts
@@ -28,7 +28,7 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
-} from 'kibana/server';
+} from '../..';
 
 describe('', () => {
   let mockRepository: ReturnType<typeof savedObjectsRepositoryMock.create>;
diff --git a/src/core/server/saved_objects/validation/schema.test.ts b/src/core/server/saved_objects/validation/schema.test.ts
index 7b75dd2cec4fb..3aadad0267bfb 100644
--- a/src/core/server/saved_objects/validation/schema.test.ts
+++ b/src/core/server/saved_objects/validation/schema.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsValidationMap } from './';
+import { SavedObjectsValidationMap } from '.';
 import { SavedObjectSanitizedDoc } from '../serialization';
 import { createSavedObjectSanitizedDocSchema } from './schema';
 
diff --git a/src/core/server/saved_objects/validation/validator.test.ts b/src/core/server/saved_objects/validation/validator.test.ts
index ae1d56b60b241..0b461679984fd 100644
--- a/src/core/server/saved_objects/validation/validator.test.ts
+++ b/src/core/server/saved_objects/validation/validator.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsTypeValidator, SavedObjectsValidationMap } from './';
+import { SavedObjectsTypeValidator, SavedObjectsValidationMap } from '.';
 import { SavedObjectSanitizedDoc } from '../serialization';
 import { loggerMock, MockedLogger } from '../../logging/logger.mock';
 
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index fbd6fd1492094..0a48e4dc6380a 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -56,7 +56,6 @@ import { PublicMethodsOf } from '@kbn/utility-types';
 import { Readable } from 'stream';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { Request as Request_2 } from '@hapi/hapi';
-import type { RequestHandlerContext as RequestHandlerContext_2 } from 'src/core/server';
 import { ResponseObject } from '@hapi/hapi';
 import { ResponseToolkit } from '@hapi/hapi';
 import { SchemaTypeError } from '@kbn/config-schema';
@@ -1129,7 +1128,7 @@ export interface HttpAuth {
 
 // @public
 export interface HttpResources {
-    register: <P, Q, B, Context extends RequestHandlerContext_2 = RequestHandlerContext_2>(route: RouteConfig<P, Q, B, 'get'>, handler: HttpResourcesRequestHandler<P, Q, B, Context>) => void;
+    register: <P, Q, B, Context extends RequestHandlerContext = RequestHandlerContext>(route: RouteConfig<P, Q, B, 'get'>, handler: HttpResourcesRequestHandler<P, Q, B, Context>) => void;
 }
 
 // @public
@@ -1140,7 +1139,7 @@ export interface HttpResourcesRenderOptions {
 }
 
 // @public
-export type HttpResourcesRequestHandler<P = unknown, Q = unknown, B = unknown, Context extends RequestHandlerContext_2 = RequestHandlerContext_2> = RequestHandler<P, Q, B, Context, 'get', KibanaResponseFactory & HttpResourcesServiceToolkit>;
+export type HttpResourcesRequestHandler<P = unknown, Q = unknown, B = unknown, Context extends RequestHandlerContext = RequestHandlerContext> = RequestHandler<P, Q, B, Context, 'get', KibanaResponseFactory & HttpResourcesServiceToolkit>;
 
 // @public
 export type HttpResourcesResponseOptions = HttpResponseOptions;
@@ -1465,7 +1464,7 @@ export const kibanaResponseFactory: {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
-    customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<string | Error | {
+    customError: (options: CustomHttpResponseOptions<ResponseError | Buffer | Stream>) => KibanaResponse<string | Error | Buffer | Stream | {
         message: string | Error;
         attributes?: ResponseErrorAttributes | undefined;
     }>;
diff --git a/src/core/server/status/routes/integration_tests/status.test.ts b/src/core/server/status/routes/integration_tests/status.test.ts
index df203675725a8..3f83a05d0e0a6 100644
--- a/src/core/server/status/routes/integration_tests/status.test.ts
+++ b/src/core/server/status/routes/integration_tests/status.test.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { BehaviorSubject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
 import supertest from 'supertest';
 import { omit } from 'lodash';
 
@@ -144,7 +143,7 @@ describe('GET /api/status', () => {
       build_number: 1234,
       build_snapshot: true,
     });
-    const metricsMockValue = await metrics.getOpsMetrics$().pipe(first()).toPromise();
+    const metricsMockValue = await firstValueFrom(metrics.getOpsMetrics$());
     expect(result.body.metrics).toEqual({
       last_updated: expect.any(String),
       collection_interval_in_millis: metrics.collectionInterval,
diff --git a/src/core/server/status/routes/status.ts b/src/core/server/status/routes/status.ts
index 7751980ae6ec3..4fb0900b23238 100644
--- a/src/core/server/status/routes/status.ts
+++ b/src/core/server/status/routes/status.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Observable, combineLatest, ReplaySubject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { Observable, combineLatest, ReplaySubject, firstValueFrom } from 'rxjs';
 import { schema } from '@kbn/config-schema';
 
 import { IRouter } from '../../http';
@@ -92,7 +91,7 @@ export const registerStatusRoute = ({
     async (context, req, res) => {
       const { version, buildSha, buildNum } = config.packageInfo;
       const versionWithoutSnapshot = version.replace(SNAPSHOT_POSTFIX, '');
-      const [overall, coreOverall, core, plugins] = await combinedStatus$.pipe(first()).toPromise();
+      const [overall, coreOverall, core, plugins] = await firstValueFrom(combinedStatus$);
 
       const { v8format = true, v7format = false } = req.query ?? {};
 
@@ -113,7 +112,7 @@ export const registerStatusRoute = ({
         });
       }
 
-      const lastMetrics = await metrics.getOpsMetrics$().pipe(first()).toPromise();
+      const lastMetrics = await firstValueFrom(metrics.getOpsMetrics$());
 
       const body: StatusHttpBody = {
         name: config.serverName,
diff --git a/src/core/server/status/status_service.ts b/src/core/server/status/status_service.ts
index a5b5f0a37397a..6c8f8716c036e 100644
--- a/src/core/server/status/status_service.ts
+++ b/src/core/server/status/status_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Observable, combineLatest, Subscription, Subject } from 'rxjs';
-import { map, distinctUntilChanged, shareReplay, take, debounceTime } from 'rxjs/operators';
+import { Observable, combineLatest, Subscription, Subject, firstValueFrom } from 'rxjs';
+import { map, distinctUntilChanged, shareReplay, debounceTime } from 'rxjs/operators';
 import { isDeepStrictEqual } from 'util';
 
 import { CoreService } from '../../types';
@@ -65,7 +65,7 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
     environment,
     coreUsageData,
   }: SetupDeps) {
-    const statusConfig = await this.config$.pipe(take(1)).toPromise();
+    const statusConfig = await firstValueFrom(this.config$);
     const core$ = this.setupCoreStatus({ elasticsearch, savedObjects });
     this.pluginsStatus = new PluginsStatusService({ core$, pluginDependencies });
 
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
index d015f506df6e3..402405e1adb39 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
@@ -9,7 +9,7 @@
 import { defaults } from 'lodash';
 
 import { SavedObjectsClientContract } from '../../saved_objects/types';
-import { SavedObjectsErrorHelpers } from '../../saved_objects/';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
 import { Logger, LogMeta } from '../../logging';
 
 import { getUpgradeableConfig } from './get_upgradeable_config';
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
index dc76f434f02de..1da8bad330c31 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '../../..';
 
 import {
   createTestServers,
diff --git a/src/core/server/ui_settings/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
index 2591e4050341c..8beb13e2d2534 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -7,8 +7,8 @@
  */
 
 import type supertest from 'supertest';
-import type { SavedObjectsClientContract, IUiSettingsClient } from 'src/core/server';
 import type { Client } from '@elastic/elasticsearch';
+import type { SavedObjectsClientContract, IUiSettingsClient } from '../../..';
 
 import {
   createTestServers,
diff --git a/src/core/server/ui_settings/routes/index.ts b/src/core/server/ui_settings/routes/index.ts
index 80a35c5493f98..0cf7233b8af19 100644
--- a/src/core/server/ui_settings/routes/index.ts
+++ b/src/core/server/ui_settings/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '../..';
 
 import { registerDeleteRoute } from './delete';
 import { registerGetRoute } from './get';
diff --git a/src/core/server/ui_settings/saved_objects/migrations.test.ts b/src/core/server/ui_settings/saved_objects/migrations.test.ts
index 8f430679a1ead..df561ef4152f6 100644
--- a/src/core/server/ui_settings/saved_objects/migrations.test.ts
+++ b/src/core/server/ui_settings/saved_objects/migrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '../..';
 import { migrations } from './migrations';
 
 describe('ui_settings 7.9.0 migrations', () => {
diff --git a/src/core/server/ui_settings/saved_objects/migrations.ts b/src/core/server/ui_settings/saved_objects/migrations.ts
index cb61a10ea1a59..7ed65cfe61894 100644
--- a/src/core/server/ui_settings/saved_objects/migrations.ts
+++ b/src/core/server/ui_settings/saved_objects/migrations.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '../..';
 
 export const migrations = {
   '7.9.0': (doc: SavedObjectUnsanitizedDoc<any>): SavedObjectSanitizedDoc<any> => ({
diff --git a/src/core/server/ui_settings/settings/index.test.ts b/src/core/server/ui_settings/settings/index.test.ts
index a4a66a96d3a2b..073e017d61df7 100644
--- a/src/core/server/ui_settings/settings/index.test.ts
+++ b/src/core/server/ui_settings/settings/index.test.ts
@@ -12,7 +12,7 @@ import { getMiscUiSettings } from './misc';
 import { getNavigationSettings } from './navigation';
 import { getNotificationsSettings } from './notifications';
 import { getThemeSettings } from './theme';
-import { getCoreSettings } from './index';
+import { getCoreSettings } from '.';
 import { getStateSettings } from './state';
 
 describe('getCoreSettings', () => {
diff --git a/src/core/server/ui_settings/ui_settings_config.ts b/src/core/server/ui_settings/ui_settings_config.ts
index de76fe1cbfc8a..2dc151aeecec8 100644
--- a/src/core/server/ui_settings/ui_settings_config.ts
+++ b/src/core/server/ui_settings/ui_settings_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { ConfigDeprecationProvider } from 'src/core/server';
+import { ConfigDeprecationProvider } from '..';
 import { ServiceConfigDescriptor } from '../internal_types';
 
 const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) => [
diff --git a/src/core/server/ui_settings/ui_settings_service.ts b/src/core/server/ui_settings/ui_settings_service.ts
index 924aaa0717f70..64765ec7d6c74 100644
--- a/src/core/server/ui_settings/ui_settings_service.ts
+++ b/src/core/server/ui_settings/ui_settings_service.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
 import { mapToObject } from '@kbn/std';
 
 import { CoreService } from '../../types';
@@ -53,7 +52,7 @@ export class UiSettingsService
   public async preboot(): Promise<InternalUiSettingsServicePreboot> {
     this.log.debug('Prebooting ui settings service');
 
-    const { overrides } = await this.config$.pipe(first()).toPromise();
+    const { overrides } = await firstValueFrom(this.config$);
     this.overrides = overrides;
 
     this.register(getCoreSettings({ isDist: this.isDist }));
@@ -74,7 +73,7 @@ export class UiSettingsService
     savedObjects.registerType(uiSettingsType);
     registerRoutes(http.createRouter(''));
 
-    const config = await this.config$.pipe(first()).toPromise();
+    const config = await firstValueFrom(this.config$);
     this.overrides = config.overrides;
 
     return {
diff --git a/src/dev/bazel/pkg_npm_types.bzl b/src/dev/bazel/pkg_npm_types.bzl
index f90d60252af2d..03ec4209f6f6c 100644
--- a/src/dev/bazel/pkg_npm_types.bzl
+++ b/src/dev/bazel/pkg_npm_types.bzl
@@ -142,7 +142,7 @@ pkg_npm_types = rule(
     "_packager": attr.label(
       doc = "Target that executes the npm types package assembler binary",
       executable = True,
-      cfg = "exec",
+      cfg = "target",
       default = Label("//packages/kbn-type-summarizer:bazel-cli"),
     ),
   },
diff --git a/src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch b/src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch
new file mode 100644
index 0000000000000..84a9e4a497919
--- /dev/null
+++ b/src/dev/bazel/rules_nodejs_patches/normalized_paths_for_windows_runfiles.patch
@@ -0,0 +1,52 @@
+diff --git a/internal/node/launcher.sh b/internal/node/launcher.sh
+index fd832d02..64820f48 100644
+--- a/internal/node/launcher.sh
++++ b/internal/node/launcher.sh
+@@ -13,6 +13,32 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++# It helps to determine if we are running on a Windows environment (excludes WSL as it acts like Unix)
++function isWindows {
++  case "$(uname -s)" in
++      CYGWIN*)    local IS_WINDOWS=1 ;;
++      MINGW*)     local IS_WINDOWS=1 ;;
++      MSYS_NT*)   local IS_WINDOWS=1 ;;
++      *)          local IS_WINDOWS=0 ;;
++  esac
++
++  echo $IS_WINDOWS
++  return
++}
++
++# It helps to normalizes paths when running on Windows.
++#
++# Example:
++# C:/Users/XUser/_bazel_XUser/7q7kkv32/execroot/A/b/C -> /c/users/xuser/_bazel_xuser/7q7kkv32/execroot/a/b/c
++function normalizeWindowsPath {
++  # Apply the followings paths transformations to normalize paths on Windows
++  # -process driver letter
++  # -convert path separator
++  # -lowercase everything
++  echo $(sed -e 's#^\(.\):#/\L\1#' -e 's#\\#/#g' -e 's/[A-Z]/\L&/g' <<< "$1")
++  return
++}
++
+ # --- begin runfiles.bash initialization v2 ---
+ # Copy-pasted from the Bazel Bash runfiles library v2.
+ set -uo pipefail; f=build_bazel_rules_nodejs/third_party/github.com/bazelbuild/bazel/tools/bash/runfiles/runfiles.bash
+@@ -49,7 +75,13 @@ source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
+ # Case 6a is handled like case 3.
+ if [[ -n "${RUNFILES_MANIFEST_ONLY:-}" ]]; then
+   # Windows only has a manifest file instead of symlinks.
+-  RUNFILES=${RUNFILES_MANIFEST_FILE%/MANIFEST}
++  if [[ $(isWindows) -eq "1" ]]; then
++    # If Windows normalizing the path and case insensitive removing the `/MANIFEST` part of the path
++    NORMALIZED_RUNFILES_MANIFEST_FILE_PATH=$(normalizeWindowsPath $RUNFILES_MANIFEST_FILE)
++    RUNFILES=$(sed 's|\/MANIFEST$||i' <<< $NORMALIZED_RUNFILES_MANIFEST_FILE_PATH)
++  else
++    RUNFILES=${RUNFILES_MANIFEST_FILE%/MANIFEST}
++  fi
+ elif [[ -n "${TEST_SRCDIR:-}" ]]; then
+   # Case 4, bazel has identified runfiles for us.
+   RUNFILES="${TEST_SRCDIR:-}"
diff --git a/src/dev/build/lib/scan.ts b/src/dev/build/lib/scan.ts
index 422a455d44a0c..5ba7385792d74 100644
--- a/src/dev/build/lib/scan.ts
+++ b/src/dev/build/lib/scan.ts
@@ -15,8 +15,8 @@ import { map, mergeAll, mergeMap } from 'rxjs/operators';
 // @ts-ignore
 import { assertAbsolute } from './fs';
 
-const getStat$ = Rx.bindNodeCallback(Fs.stat) as (path: string) => Rx.Observable<Fs.Stats>;
-const getReadDir$ = Rx.bindNodeCallback(Fs.readdir) as (path: string) => Rx.Observable<string[]>;
+const getStat$ = Rx.bindNodeCallback<[string], [Fs.Stats]>(Fs.stat);
+const getReadDir$ = Rx.bindNodeCallback<[string], [string[]]>(Fs.readdir);
 
 /**
  * Return an observable of all files in a directory, starting with the
diff --git a/src/dev/build/lib/scan_delete.ts b/src/dev/build/lib/scan_delete.ts
index 2a12c54972bf4..cc193f2cffd00 100644
--- a/src/dev/build/lib/scan_delete.ts
+++ b/src/dev/build/lib/scan_delete.ts
@@ -16,8 +16,8 @@ import { count, map, mergeAll, mergeMap } from 'rxjs/operators';
 // @ts-ignore
 import { assertAbsolute } from './fs';
 
-const getStat$ = Rx.bindNodeCallback<Fs.PathLike, Fs.Stats>(Fs.stat);
-const getReadDir$ = Rx.bindNodeCallback<string, string[]>(Fs.readdir);
+const getStat$ = Rx.bindNodeCallback<[Fs.PathLike], [Fs.Stats]>(Fs.stat);
+const getReadDir$ = Rx.bindNodeCallback<[string], [string[]]>(Fs.readdir);
 
 interface Options {
   directory: string;
diff --git a/src/dev/build/tasks/build_kibana_platform_plugins.ts b/src/dev/build/tasks/build_kibana_platform_plugins.ts
index 48d249ca37409..aa9101abb507f 100644
--- a/src/dev/build/tasks/build_kibana_platform_plugins.ts
+++ b/src/dev/build/tasks/build_kibana_platform_plugins.ts
@@ -9,7 +9,7 @@
 import Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';
-import { lastValueFrom } from '@kbn/std';
+import { lastValueFrom } from 'rxjs';
 import { CiStatsMetric } from '@kbn/dev-utils';
 import {
   runOptimizer,
diff --git a/src/dev/build/tasks/download_cloud_dependencies.ts b/src/dev/build/tasks/download_cloud_dependencies.ts
index 31873550f6b4a..25730fc88bd08 100644
--- a/src/dev/build/tasks/download_cloud_dependencies.ts
+++ b/src/dev/build/tasks/download_cloud_dependencies.ts
@@ -15,17 +15,15 @@ export const DownloadCloudDependencies: Task = {
   description: 'Downloading cloud dependencies',
 
   async run(config, log, build) {
+    const subdomain = config.isRelease ? 'artifacts-staging' : 'artifacts-snapshot';
+
     const downloadBeat = async (beat: string, id: string) => {
-      const subdomain = config.isRelease ? 'artifacts' : 'snapshots';
       const version = config.getBuildVersion();
-      const buildId = id.match(/[0-9]\.[0-9]\.[0-9]-[0-9a-z]{8}/);
-      const buildIdUrl = buildId ? `${buildId[0]}/` : '';
-
       const localArchitecture = [process.arch === 'arm64' ? 'arm64' : 'x86_64'];
       const allArchitectures = ['arm64', 'x86_64'];
       const architectures = config.getDockerCrossCompile() ? allArchitectures : localArchitecture;
       const downloads = architectures.map(async (arch) => {
-        const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;
+        const url = `https://${subdomain}.elastic.co/beats/${id}/downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;
         const checksum = await downloadToString({ log, url: url + '.sha512', expectStatus: 200 });
         const destination = config.resolveFromRepo('.beats', Path.basename(url));
         return downloadToDisk({
@@ -41,17 +39,13 @@ export const DownloadCloudDependencies: Task = {
     };
 
     let buildId = '';
-    if (!config.isRelease) {
-      const manifestUrl = `https://artifacts-api.elastic.co/v1/versions/${config.getBuildVersion()}/builds/latest`;
-      try {
-        const manifest = await Axios.get(manifestUrl);
-        buildId = manifest.data.build.build_id;
-      } catch (e) {
-        log.error(
-          `Unable to find Elastic artifacts for ${config.getBuildVersion()} at ${manifestUrl}.`
-        );
-        throw e;
-      }
+    const buildUrl = `https://${subdomain}.elastic.co/beats/latest/${config.getBuildVersion()}.json`;
+    try {
+      const latest = await Axios.get(buildUrl);
+      buildId = latest.data.build_id;
+    } catch (e) {
+      log.error(`Unable to find Beats artifacts for ${config.getBuildVersion()} at ${buildUrl}.`);
+      throw e;
     }
     await del([config.resolveFromRepo('.beats')]);
 
diff --git a/src/dev/build/tasks/install_chromium.js b/src/dev/build/tasks/install_chromium.js
index 0d230e95ecb0a..cb7a9e2075553 100644
--- a/src/dev/build/tasks/install_chromium.js
+++ b/src/dev/build/tasks/install_chromium.js
@@ -7,7 +7,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { install, paths } from '../../../../x-pack/plugins/screenshotting/server/utils';
+import { install, paths } from '@kbn/screenshotting-plugin/server/utils';
 
 export const InstallChromium = {
   description: 'Installing Chromium',
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 191f53208df72..7ce7459d6eefd 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -170,6 +170,7 @@ kibana_vars=(
     status.v6ApiFormat
     telemetry.allowChangingOptInStatus
     telemetry.enabled
+    telemetry.hidePrivacyStatement
     telemetry.optIn
     telemetry.sendUsageTo
     telemetry.sendUsageFrom
diff --git a/src/dev/build/tasks/package_json/create_package_json_tasks.ts b/src/dev/build/tasks/package_json/create_package_json_tasks.ts
index 62280252fe34e..a84cd050e461d 100644
--- a/src/dev/build/tasks/package_json/create_package_json_tasks.ts
+++ b/src/dev/build/tasks/package_json/create_package_json_tasks.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import normalizePosixPath from 'normalize-path';
 // @ts-ignore
 import { transformDependencies } from '@kbn/pm';
 import { findUsedDependencies } from './find_used_dependencies';
@@ -18,10 +17,7 @@ export const CreatePackageJson: Task = {
   async run(config, log, build) {
     const pkg = config.getKibanaPkg();
     const transformedDeps = transformDependencies(pkg.dependencies as { [key: string]: string });
-    const foundPkgDeps = await findUsedDependencies(
-      transformedDeps,
-      normalizePosixPath(build.resolvePath('.'))
-    );
+    const foundPkgDeps = await findUsedDependencies(transformedDeps, build.resolvePath('.'));
 
     const newPkg = {
       name: pkg.name,
diff --git a/src/dev/build/tasks/package_json/find_used_dependencies.ts b/src/dev/build/tasks/package_json/find_used_dependencies.ts
index e49d57c6f794f..4250b0a6b7990 100644
--- a/src/dev/build/tasks/package_json/find_used_dependencies.ts
+++ b/src/dev/build/tasks/package_json/find_used_dependencies.ts
@@ -6,66 +6,56 @@
  * Side Public License, v 1.
  */
 
-import Path from 'path';
 import globby from 'globby';
-import normalize from 'normalize-path';
-// @ts-ignore
-import { parseEntries, dependenciesParseStrategy } from '@kbn/babel-code-parser';
-
-async function getDependencies(cwd: string, entries: string[]) {
-  // Return the dependencies retrieve from the
-  // provided code entries (sanitized) and
-  // parseStrategy (dependencies one)
-  return Object.keys(await parseEntries(cwd, entries, dependenciesParseStrategy, {}));
-}
+import { ImportResolver } from '@kbn/import-resolver';
+import { findUsedNodeModules } from '@kbn/find-used-node-modules';
 
 export async function findUsedDependencies(listedPkgDependencies: any, baseDir: any) {
   // Define the entry points for the server code in order to
-  // start here later looking for the server side dependencies
-  const mainCodeEntries = await globby(normalize(Path.resolve(baseDir, `src/cli*/dist.js`)));
-
-  const discoveredPluginEntries = await globby([
-    normalize(Path.resolve(baseDir, `src/plugins/**/server/index.js`)),
-    `!${normalize(Path.resolve(baseDir, `/src/plugins/**/public`))}`,
-    normalize(Path.resolve(baseDir, `x-pack/plugins/**/server/index.js`)),
-    `!${normalize(Path.resolve(baseDir, `/x-pack/plugins/**/public`))}`,
-  ]);
-
-  // It will include entries that cannot be discovered
-  // statically as they are required with dynamic imports.
-  // In vis_type_timelion the problem is the loadFunctions()
-  // which dynamically requires all the files inside of function folders
-  // Another way would be to include an index file and import all the functions
-  // using named imports
-  const dynamicRequiredEntries = await globby([
-    normalize(Path.resolve(baseDir, 'src/plugins/vis_types/timelion/server/**/*.js')),
-  ]);
+  // look for the server side dependencies
+  const serverEntries = await globby(
+    [
+      // main code entries
+      'src/cli*/dist.js',
+      // core entry
+      'src/core/server/index.js',
+      // plugin entries
+      'src/plugins/**/server/index.js',
+      'x-pack/plugins/**/server/index.js',
+      // entries that are loaded into the server with dynamic require() calls
+      'src/plugins/vis_types/timelion/server/**/*.js',
+    ],
+    {
+      cwd: baseDir,
+      ignore: ['**/public/**'],
+      absolute: true,
+    }
+  );
 
-  // Compose all the needed entries
-  const serverEntries = [...mainCodeEntries, ...discoveredPluginEntries, ...dynamicRequiredEntries];
+  const resolver = ImportResolver.create(baseDir);
 
   // Get the dependencies found searching through the server
   // side code entries that were provided
-  const serverDependencies = await getDependencies(baseDir, serverEntries);
-
-  // List of hardcoded dependencies that we need and that are not discovered
-  // searching through code imports
-  // TODO: remove this once we get rid off @kbn/ui-framework
-  const hardCodedDependencies = ['@kbn/ui-framework'];
-
-  // Consider this as our whiteList for the modules we can't delete
-  const whiteListedModules = [...serverDependencies, ...hardCodedDependencies];
-
-  const listedDependencies = Object.keys(listedPkgDependencies);
-  const filteredListedDependencies = listedDependencies.filter((entry) => {
-    return whiteListedModules.some((nonEntry) => entry === nonEntry);
-  });
-
-  return filteredListedDependencies.reduce((foundUsedDeps: any, usedDep) => {
-    if (listedPkgDependencies[usedDep]) {
-      foundUsedDeps[usedDep] = listedPkgDependencies[usedDep];
+  const usedDeps = [
+    // TODO: remove this once we get rid off @kbn/ui-framework, for now it isn't detectable as "used" so we hard code it
+    '@kbn/ui-framework',
+    // find all the node modules we actually use on the server, including the peerDependencies of our used node_modules which are used within those deps
+    ...(await findUsedNodeModules({
+      resolver,
+      entryPaths: serverEntries,
+      findUsedPeers: true,
+    })),
+  ];
+
+  // only include dependencies in the package.json file that are already listed in the package.json dependencies
+  const neededDeps: Record<string, string> = {};
+
+  for (const dep of usedDeps) {
+    const version = listedPkgDependencies[dep];
+    if (version) {
+      neededDeps[dep] = version;
     }
+  }
 
-    return foundUsedDeps;
-  }, {});
+  return neededDeps;
 }
diff --git a/src/dev/build/tasks/transpile_babel_task.ts b/src/dev/build/tasks/transpile_babel_task.ts
index 7e95679df1bf7..37f63d31415e9 100644
--- a/src/dev/build/tasks/transpile_babel_task.ts
+++ b/src/dev/build/tasks/transpile_babel_task.ts
@@ -17,7 +17,7 @@ import { Task, Build } from '../lib';
 
 const asyncPipeline = promisify(pipeline);
 
-const transpileWithBabel = async (srcGlobs: string[], build: Build, presets: string[]) => {
+const transpileWithBabel = async (srcGlobs: string[], build: Build, preset: string) => {
   const buildRoot = build.resolvePath();
 
   await asyncPipeline(
@@ -36,7 +36,18 @@ const transpileWithBabel = async (srcGlobs: string[], build: Build, presets: str
 
     gulpBabel({
       babelrc: false,
-      presets,
+      presets: [
+        [
+          preset,
+          {
+            // we pass this so that @kbn/babel-plugin-synthetic-packages can correct absolute imports
+            // for packages to relative requests, without having to discover the Kibana repo root, which
+            // it can't do because at this point in the build there isn't a package.json file for the
+            // plugin to find.
+            'kibana/rootDir': build.resolvePath('.'),
+          },
+        ],
+      ],
     }),
 
     vfs.dest(buildRoot)
@@ -48,15 +59,19 @@ export const TranspileBabel: Task = {
 
   async run(config, log, build) {
     // Transpile server code
-    await transpileWithBabel(['**/*.{js,ts,tsx}', '!**/public/**'], build, [
-      require.resolve('@kbn/babel-preset/node_preset'),
-    ]);
+    await transpileWithBabel(
+      ['**/*.{js,ts,tsx}', '!**/public/**'],
+      build,
+      require.resolve('@kbn/babel-preset/node_preset')
+    );
 
     // Transpile client code
     // NOTE: For the client, as we have the optimizer, we are only
     // pre-transpiling the typescript based files
-    await transpileWithBabel(['**/public/**/*.{ts,tsx}'], build, [
-      require.resolve('@kbn/babel-preset/webpack_preset'),
-    ]);
+    await transpileWithBabel(
+      ['**/public/**/*.{ts,tsx}'],
+      build,
+      require.resolve('@kbn/babel-preset/webpack_preset')
+    );
   },
 };
diff --git a/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts b/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts
index d4704ba05b59c..dd04337a59993 100644
--- a/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts
+++ b/src/dev/code_coverage/ingest_coverage/integration_tests/fixtures/test_plugin/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
 export class Plugin {
   constructor() {}
diff --git a/src/dev/code_coverage/ingest_coverage/transforms.js b/src/dev/code_coverage/ingest_coverage/transforms.js
index cd30c8735d144..c66ee87c694fb 100644
--- a/src/dev/code_coverage/ingest_coverage/transforms.js
+++ b/src/dev/code_coverage/ingest_coverage/transforms.js
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import * as Either from './either.js';
-import * as Maybe from './maybe.js';
-import { always, id, noop, pink, pipe, ccMark } from './utils.js';
+import * as Either from './either';
+import * as Maybe from './maybe';
+import { always, id, noop, pink, pipe, ccMark } from './utils';
 import execa from 'execa';
 import { resolve } from 'path';
 
diff --git a/src/dev/eslint/run_eslint_with_types.ts b/src/dev/eslint/run_eslint_with_types.ts
index d7f2482fcb26b..1ac7e1c6a91c7 100644
--- a/src/dev/eslint/run_eslint_with_types.ts
+++ b/src/dev/eslint/run_eslint_with_types.ts
@@ -16,7 +16,6 @@ import { mergeMap, reduce } from 'rxjs/operators';
 import { supportsColor } from 'chalk';
 import { run, createFailError } from '@kbn/dev-utils';
 import { REPO_ROOT } from '@kbn/utils';
-import { lastValueFrom } from '@kbn/std';
 
 import { PROJECTS } from '../typescript/projects';
 import { Project } from '../typescript/project';
@@ -61,7 +60,7 @@ export function runEslintWithTypes() {
       const concurrency = Math.max(1, Math.round((Os.cpus() || []).length / 2) || 1) || 1;
       log.info(`Linting ${projects.length} projects, ${concurrency} at a time`);
 
-      const failures = await lastValueFrom(
+      const failures = await Rx.lastValueFrom(
         Rx.from(projects).pipe(
           mergeMap(async (project) => {
             const configFilePath = Path.resolve(project.directory, 'types.eslint.config.js');
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index cb1c61b0a47e0..2a067a54d472e 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -77,6 +77,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.2.0': ['Elastic License 2.0'],
-  '@elastic/eui@53.0.1': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@54.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/dev/plugin_discovery/find_plugins.ts b/src/dev/plugin_discovery/find_plugins.ts
index 7e46894813f0e..698a9816a5312 100644
--- a/src/dev/plugin_discovery/find_plugins.ts
+++ b/src/dev/plugin_discovery/find_plugins.ts
@@ -7,7 +7,7 @@
  */
 
 import Path from 'path';
-import { getPluginSearchPaths } from '@kbn/config';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { KibanaPlatformPlugin, simpleKibanaPlatformPluginDiscovery } from '@kbn/plugin-discovery';
 
 import { REPO_ROOT } from '@kbn/utils';
diff --git a/src/dev/run_find_plugins_with_circular_deps.ts b/src/dev/run_find_plugins_with_circular_deps.ts
index f9ee7bd84c54f..f174561b49f9b 100644
--- a/src/dev/run_find_plugins_with_circular_deps.ts
+++ b/src/dev/run_find_plugins_with_circular_deps.ts
@@ -9,7 +9,7 @@
 import dedent from 'dedent';
 import { parseDependencyTree, parseCircular, prettyCircular } from 'dpdm';
 import { relative } from 'path';
-import { getPluginSearchPaths } from '@kbn/config';
+import { getPluginSearchPaths } from '@kbn/plugin-discovery';
 import { run } from '@kbn/dev-utils';
 import { REPO_ROOT } from '@kbn/utils';
 
diff --git a/src/dev/run_licenses_csv_report.js b/src/dev/run_licenses_csv_report.js
index 1923eddff33e9..391361f2ccfec 100644
--- a/src/dev/run_licenses_csv_report.js
+++ b/src/dev/run_licenses_csv_report.js
@@ -13,7 +13,7 @@ import { isNull, isUndefined } from 'lodash';
 import { run } from '@kbn/dev-utils';
 
 import { getInstalledPackages } from './npm';
-import { engines } from '../../package';
+import { engines } from '../../package.json';
 import { LICENSE_OVERRIDES } from './license_checker';
 
 const allDoubleQuoteRE = /"/g;
diff --git a/src/dev/typescript/concurrent_map.ts b/src/dev/typescript/concurrent_map.ts
index b40da14f4162b..ad7231687faad 100644
--- a/src/dev/typescript/concurrent_map.ts
+++ b/src/dev/typescript/concurrent_map.ts
@@ -8,7 +8,6 @@
 
 import * as Rx from 'rxjs';
 import { mergeMap, toArray, map } from 'rxjs/operators';
-import { lastValueFrom } from '@kbn/std';
 
 export async function concurrentMap<T, T2>(
   concurrency: number,
@@ -19,7 +18,7 @@ export async function concurrentMap<T, T2>(
     return [];
   }
 
-  return await lastValueFrom(
+  return await Rx.lastValueFrom(
     Rx.from(arr).pipe(
       // execute items in parallel based on concurrency
       mergeMap(async (item, index) => ({ index, result: await fn(item, index) }), concurrency),
diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
index 6b47d9b805af7..a2e3d578205e4 100644
--- a/src/dev/typescript/projects.ts
+++ b/src/dev/typescript/projects.ts
@@ -9,6 +9,7 @@
 import glob from 'glob';
 import Path from 'path';
 import { REPO_ROOT } from '@kbn/utils';
+import { BAZEL_PACKAGE_DIRS } from '@kbn/bazel-packages';
 import { Project, ProjectOptions } from './project';
 
 /**
@@ -72,7 +73,6 @@ export const PROJECTS = [
     disableTypeCheck: true,
   }),
 
-  ...findProjects('packages/*/tsconfig.json'),
   ...findProjects('src/plugins/*/tsconfig.json'),
   ...findProjects('src/plugins/chart_expressions/*/tsconfig.json'),
   ...findProjects('src/plugins/vis_types/*/tsconfig.json'),
@@ -83,4 +83,6 @@ export const PROJECTS = [
   ...findProjects('test/interpreter_functional/plugins/*/tsconfig.json'),
   ...findProjects('test/server_integration/__fixtures__/plugins/*/tsconfig.json'),
   ...findProjects('packages/kbn-type-summarizer/tests/tsconfig.json'),
+
+  ...BAZEL_PACKAGE_DIRS.flatMap((dir) => findProjects(`${dir}/*/tsconfig.json`)),
 ];
diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts
index 5888e6eaf6806..bafd2406c1095 100644
--- a/src/dev/typescript/run_type_check_cli.ts
+++ b/src/dev/typescript/run_type_check_cli.ts
@@ -13,7 +13,6 @@ import * as Rx from 'rxjs';
 import { mergeMap, reduce } from 'rxjs/operators';
 import execa from 'execa';
 import { run, createFailError } from '@kbn/dev-utils';
-import { lastValueFrom } from '@kbn/std';
 
 import { PROJECTS } from './projects';
 import { buildTsRefs } from './build_ts_refs';
@@ -65,7 +64,7 @@ export async function runTypeCheckCli() {
           : ['--skipLibCheck', 'false']),
       ];
 
-      const failureCount = await lastValueFrom(
+      const failureCount = await Rx.lastValueFrom(
         Rx.from(projects).pipe(
           mergeMap(async (p) => {
             const relativePath = Path.relative(process.cwd(), p.tsConfigPath);
diff --git a/src/fixtures/telemetry_collectors/constants.ts b/src/fixtures/telemetry_collectors/constants.ts
index 37f94730afb40..8a669f9654ac4 100644
--- a/src/fixtures/telemetry_collectors/constants.ts
+++ b/src/fixtures/telemetry_collectors/constants.ts
@@ -7,7 +7,7 @@
  */
 
 import moment, { Moment } from 'moment';
-import { MakeSchemaFrom } from '../../plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface Usage {
   locale: string;
diff --git a/src/fixtures/telemetry_collectors/enum_collector.ts b/src/fixtures/telemetry_collectors/enum_collector.ts
index f0528b7dcee1a..8f137fee45728 100644
--- a/src/fixtures/telemetry_collectors/enum_collector.ts
+++ b/src/fixtures/telemetry_collectors/enum_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/externally_defined_collector.ts b/src/fixtures/telemetry_collectors/externally_defined_collector.ts
index d954bd30fe002..44e0ef959abb5 100644
--- a/src/fixtures/telemetry_collectors/externally_defined_collector.ts
+++ b/src/fixtures/telemetry_collectors/externally_defined_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectorOptions } from 'src/plugins/usage_collection/server';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import type { UsageCollectorOptions } from '@kbn/usage-collection-plugin/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const collectorSet = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts b/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts
index 1bf7f4aa4811a..13f4a5bd8e281 100644
--- a/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts
+++ b/src/fixtures/telemetry_collectors/externally_defined_usage_collector/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getUsageCollector } from './get_usage_collector';
 
 export function registerCollector(collectorSet: UsageCollectionSetup) {
diff --git a/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts b/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
index 991f8336e7020..6c5634777b4e3 100644
--- a/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
+++ b/src/fixtures/telemetry_collectors/imported_interface_from_export/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import type { Usage } from './types';
-import { createUsageCollectionSetupMock } from '../../../plugins/usage_collection/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/imported_schema.ts b/src/fixtures/telemetry_collectors/imported_schema.ts
index 6ea7ded904404..dbad9383bf100 100644
--- a/src/fixtures/telemetry_collectors/imported_schema.ts
+++ b/src/fixtures/telemetry_collectors/imported_schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { externallyDefinedSchema } from './constants';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
diff --git a/src/fixtures/telemetry_collectors/imported_usage_interface.ts b/src/fixtures/telemetry_collectors/imported_usage_interface.ts
index 43f2bc0d6fb5b..8e37434547f55 100644
--- a/src/fixtures/telemetry_collectors/imported_usage_interface.ts
+++ b/src/fixtures/telemetry_collectors/imported_usage_interface.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { Usage } from './constants';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts b/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
index 5a353ddfbd843..2e89de3dd92cc 100644
--- a/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
+++ b/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/nested_collector.ts b/src/fixtures/telemetry_collectors/nested_collector.ts
index 4d78f26f9fb89..1db9c00a25ed8 100644
--- a/src/fixtures/telemetry_collectors/nested_collector.ts
+++ b/src/fixtures/telemetry_collectors/nested_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { Collector } from 'src/plugins/usage_collection/server';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import type { Collector } from '@kbn/usage-collection-plugin/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const collectorSet = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts b/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts
index 5d8f446f3fd63..f749a817a03fa 100644
--- a/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts
+++ b/src/fixtures/telemetry_collectors/schema_defined_with_spreads_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import type { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/stats_collector.ts b/src/fixtures/telemetry_collectors/stats_collector.ts
index 6046973f42e84..e572638b11838 100644
--- a/src/fixtures/telemetry_collectors/stats_collector.ts
+++ b/src/fixtures/telemetry_collectors/stats_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeStatsCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/unmapped_collector.ts b/src/fixtures/telemetry_collectors/unmapped_collector.ts
index 60b33bbcb340d..32c4b621c346f 100644
--- a/src/fixtures/telemetry_collectors/unmapped_collector.ts
+++ b/src/fixtures/telemetry_collectors/unmapped_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/working_collector.ts b/src/fixtures/telemetry_collectors/working_collector.ts
index a34f52da6c914..00fd415cba01b 100644
--- a/src/fixtures/telemetry_collectors/working_collector.ts
+++ b/src/fixtures/telemetry_collectors/working_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/fixtures/telemetry_collectors/working_collector_with_description.ts b/src/fixtures/telemetry_collectors/working_collector_with_description.ts
index 6f57f481de9b4..c382a63ccd6fa 100644
--- a/src/fixtures/telemetry_collectors/working_collector_with_description.ts
+++ b/src/fixtures/telemetry_collectors/working_collector_with_description.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createUsageCollectionSetupMock } from '../../plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const { makeUsageCollector } = createUsageCollectionSetupMock();
 
diff --git a/src/plugins/advanced_settings/kibana.json b/src/plugins/advanced_settings/kibana.json
index 98b7ec6d7e6d8..b7227b48a215b 100644
--- a/src/plugins/advanced_settings/kibana.json
+++ b/src/plugins/advanced_settings/kibana.json
@@ -5,7 +5,7 @@
   "ui": true,
   "requiredPlugins": ["management"],
   "optionalPlugins": ["home", "usageCollection"],
-  "requiredBundles": ["kibanaReact", "kibanaUtils", "home"],
+  "requiredBundles": ["kibanaReact", "kibanaUtils"],
   "owner": {
     "name": "Kibana Core",
     "githubTeam": "kibana-core"
diff --git a/src/plugins/advanced_settings/public/index.ts b/src/plugins/advanced_settings/public/index.ts
index 83676b4f7c38d..58222c19a5172 100644
--- a/src/plugins/advanced_settings/public/index.ts
+++ b/src/plugins/advanced_settings/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { AdvancedSettingsPlugin } from './plugin';
 export type { AdvancedSettingsSetup, AdvancedSettingsStart } from './types';
 export { ComponentRegistry } from './component_registry';
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
index 5ee1bbf49f56c..0bb3b011c05d8 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
@@ -11,18 +11,14 @@ import { Observable } from 'rxjs';
 import { ReactWrapper } from 'enzyme';
 import { mountWithI18nProvider, shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 import dedent from 'dedent';
-import {
-  PublicUiSettingsParams,
-  UserProvidedValues,
-  UiSettingsType,
-} from '../../../../core/public';
+import { PublicUiSettingsParams, UserProvidedValues, UiSettingsType } from '@kbn/core/public';
 import { FieldSetting } from './types';
 import { AdvancedSettings } from './advanced_settings';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   themeServiceMock,
-} from '../../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { ComponentRegistry } from '../component_registry';
 import { Search } from './components/search';
 
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
index e46dfdf50956b..37496a88240c7 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -20,20 +20,20 @@ import {
   ToastsStart,
   ScopedHistory,
   ThemeServiceStart,
-} from '../../../../core/public';
-import { url } from '../../../kibana_utils/public';
+} from '@kbn/core/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { CallOuts } from './components/call_outs';
 import { Search } from './components/search';
 import { Form } from './components/form';
 import { AdvancedSettingsVoiceAnnouncement } from './components/advanced_settings_voice_announcement';
-import { ComponentRegistry } from '../';
+import { ComponentRegistry } from '..';
 
 import { getAriaName, toEditableConfig, fieldSorter, DEFAULT_CATEGORY } from './lib';
 
 import { FieldSetting, SettingsChanges } from './types';
 import { parseErrorMsg } from './components/search/search';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 
 export const QUERY = 'query';
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx b/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx
index 46905b1e4b751..cb206b0f6dc55 100644
--- a/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/advanced_settings_voice_announcement/advanced_settings_voice_announcement.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { UiSettingsType } from '../../../../../../core/public';
+import { UiSettingsType } from '@kbn/core/public';
 
 import { AdvancedSettingsVoiceAnnouncement } from './advanced_settings_voice_announcement';
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx
index 68cd6936fb9af..555df3c2c5c11 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx
@@ -11,13 +11,13 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
 import { mount, ReactWrapper } from 'enzyme';
 import { FieldSetting } from '../../types';
-import { UiSettingsType } from '../../../../../../core/public';
-import { notificationServiceMock, docLinksServiceMock } from '../../../../../../core/public/mocks';
+import { UiSettingsType } from '@kbn/core/public';
+import { notificationServiceMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { Field, getEditableValue } from './field';
 
-jest.mock('../../../../../kibana_react/public/ui_settings/use_ui_setting', () => ({
+jest.mock('@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting', () => ({
   useUiSetting: jest.fn(),
 }));
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
index 62c000b3ce46f..fd4674a7caf6e 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
@@ -32,10 +32,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { UiSettingsType, DocLinksStart, ToastsStart } from '@kbn/core/public';
 import { FieldCodeEditor } from './field_code_editor';
 import { FieldSetting, FieldState } from '../../types';
 import { isDefaultValue } from '../../lib';
-import { UiSettingsType, DocLinksStart, ToastsStart } from '../../../../../../core/public';
 
 interface FieldProps {
   setting: FieldSetting;
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx
index 5ba1c55e67ec8..819a03cdb616b 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field_code_editor.tsx
@@ -8,7 +8,7 @@
 
 import React, { useCallback } from 'react';
 import { monaco, XJsonLang } from '@kbn/monaco';
-import { CodeEditor, MarkdownLang } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor, MarkdownLang } from '@kbn/kibana-react-plugin/public';
 
 interface FieldCodeEditorProps {
   value: string;
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
index 110fdaf249bd1..4deb1b9c24d1d 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
-import { UiSettingsType } from '../../../../../../core/public';
-import { themeServiceMock, notificationServiceMock } from '../../../../../../core/public/mocks';
+import { UiSettingsType } from '@kbn/core/public';
+import { themeServiceMock, notificationServiceMock } from '@kbn/core/public/mocks';
 import { SettingsChanges } from '../../types';
 import { Form } from './form';
 
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
index 0d1e19b6c004d..1ffae88335758 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
@@ -26,8 +26,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { KibanaThemeProvider, toMountPoint } from '../../../../../kibana_react/public';
-import { DocLinksStart, ThemeServiceStart, ToastsStart } from '../../../../../../core/public';
+import { KibanaThemeProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { DocLinksStart, ThemeServiceStart, ToastsStart } from '@kbn/core/public';
 
 import { getCategoryName } from '../../lib';
 import { Field, getEditableValue } from '../field';
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts b/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
index 6c2572af76eb3..eeee280f826ae 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/get_val_type.ts
@@ -12,7 +12,7 @@
  * @returns {string} the type to use for determining the display and editor
  */
 
-import { UiSettingsType } from 'src/core/public';
+import { UiSettingsType } from '@kbn/core/public';
 import { FieldSetting } from '../types';
 
 export function getValType(def: Partial<FieldSetting>, value?: any): UiSettingsType {
diff --git a/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts b/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
index fdc60828748c1..4828ea957718d 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/is_default_value.test.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { isDefaultValue } from './is_default_value';
-import { UiSettingsType } from '../../../../../core/public';
+import { UiSettingsType } from '@kbn/core/public';
 
 describe('Settings', function () {
   describe('Advanced', function () {
diff --git a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
index 1ededb9cc697e..7de174d409b55 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PublicUiSettingsParams } from 'src/core/public';
+import { PublicUiSettingsParams } from '@kbn/core/public';
 import expect from '@kbn/expect';
 import { toEditableConfig } from './to_editable_config';
 
diff --git a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
index d2ed64aa918a7..b7a08888bb76a 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/to_editable_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PublicUiSettingsParams, UserProvidedValues, SavedObjectAttribute } from 'src/core/public';
+import { PublicUiSettingsParams, UserProvidedValues, SavedObjectAttribute } from '@kbn/core/public';
 import { FieldSetting } from '../types';
 import { getValType } from './get_val_type';
 import { getAriaName } from './get_aria_name';
diff --git a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx b/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
index 84eb0d4139fa0..e208ed80a3fdc 100644
--- a/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
+++ b/src/plugins/advanced_settings/public/management_app/mount_management_section.tsx
@@ -14,11 +14,11 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 
 import { LocationDescriptor } from 'history';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { url } from '../../../kibana_utils/public';
-import { ManagementAppMountParams } from '../../../management/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { StartServicesAccessor } from '../../../../core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 
 import { AdvancedSettings, QUERY } from './advanced_settings';
 import { ComponentRegistry } from '../types';
diff --git a/src/plugins/advanced_settings/public/management_app/types.ts b/src/plugins/advanced_settings/public/management_app/types.ts
index 7af00a3b5bcfe..ec099a3f8fb69 100644
--- a/src/plugins/advanced_settings/public/management_app/types.ts
+++ b/src/plugins/advanced_settings/public/management_app/types.ts
@@ -8,7 +8,7 @@
 
 import type { ReactElement } from 'react';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UiSettingsType } from '../../../../core/public';
+import { UiSettingsType } from '@kbn/core/public';
 
 export interface FieldSetting {
   displayName: string;
diff --git a/src/plugins/advanced_settings/public/plugin.ts b/src/plugins/advanced_settings/public/plugin.ts
index b7f1455f65dfd..2da7d76e0a4ff 100644
--- a/src/plugins/advanced_settings/public/plugin.ts
+++ b/src/plugins/advanced_settings/public/plugin.ts
@@ -7,8 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin } from 'kibana/public';
-import { FeatureCatalogueCategory } from '../../home/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 import { ComponentRegistry } from './component_registry';
 import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
 
@@ -55,7 +54,7 @@ export class AdvancedSettingsPlugin
         icon: 'gear',
         path: '/app/management/kibana/settings',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/src/plugins/advanced_settings/public/types.ts b/src/plugins/advanced_settings/public/types.ts
index b47a188ffdd89..7d6647f0feef9 100644
--- a/src/plugins/advanced_settings/public/types.ts
+++ b/src/plugins/advanced_settings/public/types.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ComponentRegistry } from './component_registry';
-import { HomePublicPluginSetup } from '../../home/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
-import { ManagementSetup } from '../../management/public';
-import { UsageCollectionSetup } from '../../usage_collection/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ComponentRegistry } from './component_registry';
 
 export interface AdvancedSettingsSetup {
   component: ComponentRegistry['setup'];
diff --git a/src/plugins/advanced_settings/server/index.ts b/src/plugins/advanced_settings/server/index.ts
index a935fc09d7f58..74b706407dab2 100644
--- a/src/plugins/advanced_settings/server/index.ts
+++ b/src/plugins/advanced_settings/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { AdvancedSettingsServerPlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/src/plugins/advanced_settings/server/plugin.ts b/src/plugins/advanced_settings/server/plugin.ts
index 78e491b7b9023..8d100ee2e26b2 100644
--- a/src/plugins/advanced_settings/server/plugin.ts
+++ b/src/plugins/advanced_settings/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 import { capabilitiesProvider } from './capabilities_provider';
 
 export class AdvancedSettingsServerPlugin implements Plugin<object, object> {
diff --git a/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts b/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts
index 32adc0d7df0cf..fbdd962a95298 100644
--- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts
+++ b/src/plugins/bfetch/public/batching/create_streaming_batched_function.test.ts
@@ -8,7 +8,7 @@
 
 import { createStreamingBatchedFunction } from './create_streaming_batched_function';
 import { fetchStreaming as fetchStreamingReal } from '../streaming/fetch_streaming';
-import { AbortError, defer, of } from '../../../kibana_utils/public';
+import { AbortError, defer, of } from '@kbn/kibana-utils-plugin/public';
 import { Subject } from 'rxjs';
 
 const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
diff --git a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts b/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
index 3ff8da08cfce7..c1618c9d3bbc1 100644
--- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
+++ b/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { AbortError, abortSignalToPromise, defer } from '../../../kibana_utils/public';
+import { AbortError, abortSignalToPromise, defer } from '@kbn/kibana-utils-plugin/public';
 import {
   ItemBufferParams,
   TimedItemBufferParams,
diff --git a/src/plugins/bfetch/public/batching/types.ts b/src/plugins/bfetch/public/batching/types.ts
index 3f9647988a4fb..f71ce0ca2a6e4 100644
--- a/src/plugins/bfetch/public/batching/types.ts
+++ b/src/plugins/bfetch/public/batching/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Defer } from '../../../kibana_utils/public';
+import { Defer } from '@kbn/kibana-utils-plugin/public';
 
 export interface BatchItem<Payload, Result> {
   payload: Payload;
diff --git a/src/plugins/bfetch/public/index.ts b/src/plugins/bfetch/public/index.ts
index bba7844a3265b..a4c60cdf127d7 100644
--- a/src/plugins/bfetch/public/index.ts
+++ b/src/plugins/bfetch/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { BfetchPublicPlugin } from './plugin';
 
 export type { BfetchPublicSetup, BfetchPublicStart, BfetchPublicContract } from './plugin';
diff --git a/src/plugins/bfetch/public/mocks.ts b/src/plugins/bfetch/public/mocks.ts
index 3e00c1f3bcedb..aa0a03243c50b 100644
--- a/src/plugins/bfetch/public/mocks.ts
+++ b/src/plugins/bfetch/public/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { BfetchPublicSetup, BfetchPublicStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/public/mocks';
 
 export type Setup = jest.Mocked<BfetchPublicSetup>;
 export type Start = jest.Mocked<BfetchPublicStart>;
diff --git a/src/plugins/bfetch/public/plugin.ts b/src/plugins/bfetch/public/plugin.ts
index 54bcb305d8675..b82d69df95a5b 100644
--- a/src/plugins/bfetch/public/plugin.ts
+++ b/src/plugins/bfetch/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { fetchStreaming as fetchStreamingStatic, FetchStreamingParams } from './streaming';
 import { DISABLE_BFETCH_COMPRESSION, removeLeadingSlash } from '../common';
 import { createStreamingBatchedFunction, StreamingBatchedFunctionParams } from './batching';
 import { BatchedFunc } from './batching/types';
-import { createStartServicesGetter } from '../../kibana_utils/public';
 
 // eslint-disable-next-line
 export interface BfetchPublicSetupDependencies {}
diff --git a/src/plugins/bfetch/server/index.ts b/src/plugins/bfetch/server/index.ts
index 76f86e6975070..f0e6b15f99758 100644
--- a/src/plugins/bfetch/server/index.ts
+++ b/src/plugins/bfetch/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { BfetchServerPlugin } from './plugin';
 
 export type { BfetchServerSetup, BfetchServerStart, BatchProcessingRouteParams } from './plugin';
diff --git a/src/plugins/bfetch/server/mocks.ts b/src/plugins/bfetch/server/mocks.ts
index dfa365d9e70b2..d1be681dd407f 100644
--- a/src/plugins/bfetch/server/mocks.ts
+++ b/src/plugins/bfetch/server/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/server/mocks';
 import { BfetchServerSetup, BfetchServerStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/server/mocks';
 
 export type Setup = jest.Mocked<BfetchServerSetup>;
 export type Start = jest.Mocked<BfetchServerStart>;
diff --git a/src/plugins/bfetch/server/plugin.ts b/src/plugins/bfetch/server/plugin.ts
index f7127445f96c5..f32f3d03862b8 100644
--- a/src/plugins/bfetch/server/plugin.ts
+++ b/src/plugins/bfetch/server/plugin.ts
@@ -14,7 +14,7 @@ import type {
   Logger,
   KibanaRequest,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { map$ } from '@kbn/std';
 import {
diff --git a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
index 6814ed1dd7955..5f7319ed154fc 100644
--- a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
@@ -9,7 +9,7 @@
 import { promisify } from 'util';
 import { Observable } from 'rxjs';
 import { catchError, concatMap, finalize } from 'rxjs/operators';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Stream, PassThrough } from 'stream';
 import { constants, deflate } from 'zlib';
 
diff --git a/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts b/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts
index a237e5597162e..01080655e0ad7 100644
--- a/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_ndjson_stream.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Stream, PassThrough } from 'stream';
 
 const delimiter = '\n';
diff --git a/src/plugins/bfetch/server/streaming/create_stream.ts b/src/plugins/bfetch/server/streaming/create_stream.ts
index 756a806a60229..8c4219f052f91 100644
--- a/src/plugins/bfetch/server/streaming/create_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_stream.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { Stream } from 'stream';
 import { Observable } from 'rxjs';
 import { createCompressedStream } from './create_compressed_stream';
diff --git a/src/plugins/bfetch/server/ui_settings.ts b/src/plugins/bfetch/server/ui_settings.ts
index 95854b9604dd3..832ba4d049eb3 100644
--- a/src/plugins/bfetch/server/ui_settings.ts
+++ b/src/plugins/bfetch/server/ui_settings.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UiSettingsParams } from 'src/core/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { DISABLE_BFETCH_COMPRESSION, DISABLE_BFETCH } from '../common';
 
diff --git a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts
index 40d95d5f44af2..ac8cb5c8b86a3 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts
@@ -8,8 +8,8 @@
 
 import { gaugeFunction } from './gauge_function';
 import { GaugeArguments, GaugeShapes } from '..';
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import {
   GaugeCentralMajorModes,
   GaugeColorModes,
diff --git a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts
index c2ce20163e86a..48c7261e43016 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { GaugeExpressionFunctionDefinition } from '../types';
 import {
   EXPRESSION_GAUGE_NAME,
diff --git a/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts
index b090dc5346146..70f87b3402b46 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts
@@ -12,9 +12,9 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/public';
-import { CustomPaletteState } from '../../../../charts/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import {
   EXPRESSION_GAUGE_NAME,
   GAUGE_FUNCTION_RENDERER_NAME,
diff --git a/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts
index 2f1560550690b..c980f3398c611 100644
--- a/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_gauge/common/types/expression_renderers.ts
@@ -7,9 +7,9 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { PersistedState } from '../../../../visualizations/public';
-import type { ChartsPluginSetup } from '../../../../charts/public';
-import type { IFieldFormat, SerializedFieldFormat } from '../../../../field_formats/common';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import type { GaugeExpressionProps } from './expression_functions';
 
 export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat;
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx
index ef21811402c2a..b3edd51768e68 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { ColorStop } from '@kbn/coloring';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
-import { DatatableColumn, DatatableRow } from 'src/plugins/expressions/common';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import {
   GaugeRenderProps,
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx
index e4687d19aa63c..0ae356017712f 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/gauge_component.tsx
@@ -9,10 +9,10 @@ import React, { FC, memo, useCallback } from 'react';
 import { Chart, Goal, Settings } from '@elastic/charts';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PaletteOutput } from '@kbn/coloring';
-import { FieldFormat } from '../../../../field_formats/common';
-import type { CustomPaletteState } from '../../../../charts/public';
-import { EmptyPlaceholder } from '../../../../charts/public';
-import { isVisDimension } from '../../../../visualizations/common/utils';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { CustomPaletteState } from '@kbn/charts-plugin/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
+import { isVisDimension } from '@kbn/visualizations-plugin/common/utils';
 import {
   GaugeRenderProps,
   GaugeLabelMajorMode,
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx
index 93bd51e8b2028..5074f00801109 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/icons/horizontal_bullet_icon.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const HorizontalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    width="30"
-    height="22"
-    viewBox="0 0 30 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      className="chart-icon__subdued"
-      d="M1 13a1 1 0 00-1 1v2a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-2a1 1 0 00-1-1H1z"
-    />
-    <path
-      className="chart-icon__accent"
-      d="M0 6a1 1 0 011-1h24a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V6z"
-    />
-  </svg>
-);
+export const HorizontalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      width="30"
+      height="22"
+      viewBox="0 0 30 22"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M1 13a1 1 0 00-1 1v2a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-1h5v1a1 1 0 102 0v-2a1 1 0 00-1-1H1z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M0 6a1 1 0 011-1h24a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V6z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx b/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx
index 99f4976d5f38f..49a1e2a817cf7 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/icons/vertical_bullet_icon.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const VerticalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    width="30"
-    height="22"
-    viewBox="0 0 30 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      className="chart-icon__subdued"
-      d="M16 22a1 1 0 01-1-1V4a1 1 0 011-1h4a1 1 0 011 1v17a1 1 0 01-1 1h-4z"
-    />
-    <path
-      className="chart-icon__accent"
-      d="M10 0h2a1 1 0 011 1v20a1 1 0 01-1 1h-2a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1V7h-1a1 1 0 010-2h1V2h-1a1 1 0 010-2z"
-    />
-  </svg>
-);
+export const VerticalBulletIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      width="30"
+      height="22"
+      viewBox="0 0 30 22"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M16 22a1 1 0 01-1-1V4a1 1 0 011-1h4a1 1 0 011 1v17a1 1 0 01-1 1h-4z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M10 0h2a1 1 0 011 1v20a1 1 0 01-1 1h-2a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1v-3h-1a1 1 0 110-2h1V7h-1a1 1 0 010-2h1V2h-1a1 1 0 010-2z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts b/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts
index cd5379f0e9ed7..686147ab055e0 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts
@@ -7,8 +7,8 @@
  */
 
 import type { CustomPaletteParams } from '@kbn/coloring';
-import type { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
-import { getAccessorByDimension } from '../../../../../visualizations/common/utils';
+import type { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { getAccessorByDimension } from '@kbn/visualizations-plugin/common/utils';
 import { Accessors, GaugeArguments } from '../../../common';
 
 export const getValueFromAccessor = (
diff --git a/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx b/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx
index c75f60f75c004..f51e5432ba09e 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_gauge/public/expression_renderers/gauge_renderer.tsx
@@ -8,10 +8,10 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { PersistedState } from '../../../../visualizations/public';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { EXPRESSION_GAUGE_NAME, GaugeExpressionProps } from '../../common';
 import { getFormatService, getPaletteService, getThemeService } from '../services';
 
diff --git a/src/plugins/chart_expressions/expression_gauge/public/plugin.ts b/src/plugins/chart_expressions/expression_gauge/public/plugin.ts
index 7cc6ebec0d5d8..afa8a28f0e217 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/plugin.ts
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ChartsPluginSetup } from '../../../charts/public';
-import { CoreSetup, CoreStart } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { gaugeFunction } from '../common';
 import { setFormatService, setThemeService, setPaletteService } from './services';
 import { gaugeRenderer } from './expression_renderers';
-import type { FieldFormatsStart } from '../../../field_formats/public';
 
 /** @internal */
 export interface ExpressionGaugePluginSetup {
diff --git a/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts b/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts
index 73b66341c4d9a..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/services/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts b/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts
index d18db6340fd45..60bee5353b270 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/services/palette_service.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import { createGetterSetter } from '../../../../kibana_utils/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getPaletteService, setPaletteService] =
   createGetterSetter<PaletteRegistry>('palette');
diff --git a/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts b/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts
index 25eb0fc14ba0b..55ac6fb18cdad 100644
--- a/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts
+++ b/src/plugins/chart_expressions/expression_gauge/public/services/theme_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export const [getThemeService, setThemeService] =
   createGetterSetter<ChartsPluginSetup['theme']>('charts.theme');
diff --git a/src/plugins/chart_expressions/expression_gauge/server/plugin.ts b/src/plugins/chart_expressions/expression_gauge/server/plugin.ts
index deb67436627ba..7b6cd1abb4d39 100644
--- a/src/plugins/chart_expressions/expression_gauge/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_gauge/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { gaugeFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts
index b43c29c200cef..13beee6b0f701 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { heatmapFunction } from './heatmap_function';
-import type { HeatmapArguments } from '../../common';
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import type { HeatmapArguments } from '..';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { EXPRESSION_HEATMAP_GRID_NAME, EXPRESSION_HEATMAP_LEGEND_NAME } from '../constants';
 
 describe('interpreter/functions#heatmap', () => {
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts
index a1a04af76fd8b..c440176962faf 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { DatatableColumn } from '../../../../expressions/public';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import type { DatatableColumn } from '@kbn/expressions-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import {
   prepareLogTable,
   Dimension,
   validateAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
 import { HeatmapExpressionFunctionDefinition } from '../types';
 import {
   EXPRESSION_HEATMAP_NAME,
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts
index 9d3b8f6a29ada..e4d239d7c5a75 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_grid.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { EXPRESSION_HEATMAP_GRID_NAME } from '../constants';
 import { HeatmapGridConfig, HeatmapGridConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts
index 094520fed1db8..1135708db8c22 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_legend.ts
@@ -7,7 +7,7 @@
  */
 import { Position } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { EXPRESSION_HEATMAP_LEGEND_NAME } from '../constants';
 import { HeatmapLegendConfig, HeatmapLegendConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts
index d96a803df92f5..d3e7444ad08f2 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts
@@ -11,10 +11,10 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 
-import { CustomPaletteState } from '../../../../charts/common';
+import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import {
   EXPRESSION_HEATMAP_NAME,
   EXPRESSION_HEATMAP_LEGEND_NAME,
diff --git a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts
index 67160240d284b..0c3610c5a114f 100644
--- a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts
@@ -7,10 +7,10 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { ChartsPluginSetup } from '../../../../charts/public';
-import type { IFieldFormat, SerializedFieldFormat } from '../../../../field_formats/common';
-import type { RangeSelectContext, ValueClickContext } from '../../../../embeddable/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import type { HeatmapExpressionProps } from './expression_functions';
 
 export interface FilterEvent {
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx
index 031d8de079a7f..4f3e77b8f1d6e 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { Settings, TooltipType, Heatmap } from '@elastic/charts';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import { EmptyPlaceholder } from '../../../../charts/public';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
@@ -27,6 +27,17 @@ jest.mock('@elastic/charts', () => {
   };
 });
 
+const actWithTimeout = (action: Function, timer: number = 1) =>
+  act(
+    () =>
+      new Promise((resolve) =>
+        setTimeout(async () => {
+          await action();
+          resolve();
+        }, timer)
+      )
+  );
+
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
 const palettesRegistry = chartPluginMock.createPaletteRegistry();
 const formatService = fieldFormatsServiceMock.createStartContract();
@@ -110,6 +121,9 @@ describe('HeatmapComponent', function () {
 
   it('renders the legend toggle component if uiState is set', async () => {
     const component = mountWithIntl(<HeatmapComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(1);
     });
@@ -118,6 +132,9 @@ describe('HeatmapComponent', function () {
   it('not renders the legend toggle component if uiState is undefined', async () => {
     const newProps = { ...wrapperProps, uiState: undefined } as unknown as HeatmapRenderProps;
     const component = mountWithIntl(<HeatmapComponent {...newProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(0);
     });
@@ -125,6 +142,9 @@ describe('HeatmapComponent', function () {
 
   it('renders the legendColorPicker if uiState is set', async () => {
     const component = mountWithIntl(<HeatmapComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(component.find(Settings).prop('legendColorPicker')).toBeDefined();
     });
@@ -133,6 +153,9 @@ describe('HeatmapComponent', function () {
   it('not renders the legendColorPicker if uiState is undefined', async () => {
     const newProps = { ...wrapperProps, uiState: undefined } as unknown as HeatmapRenderProps;
     const component = mountWithIntl(<HeatmapComponent {...newProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     await act(async () => {
       expect(component.find(Settings).prop('legendColorPicker')).toBeUndefined();
     });
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx
index 40d3563756c18..a9b70d1bc2edd 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx
@@ -22,13 +22,13 @@ import {
   ESCalendarIntervalUnit,
   PartialTheme,
 } from '@elastic/charts';
-import type { CustomPaletteState } from '../../../../charts/public';
-import { search } from '../../../../data/public';
-import { LegendToggle, EmptyPlaceholder } from '../../../../charts/public';
+import type { CustomPaletteState } from '@kbn/charts-plugin/public';
+import { search } from '@kbn/data-plugin/public';
+import { LegendToggle, EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import {
   getAccessorByDimension,
   getFormatByAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
 import type { HeatmapRenderProps, FilterEvent, BrushEvent } from '../../common';
 import { applyPaletteParams, findMinMaxByColumnId, getSortPredicate } from './helpers';
 import {
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx
index 410f8a268bff7..7a49d53222946 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_icon.tsx
@@ -8,25 +8,30 @@
 
 import { EuiIconProps } from '@elastic/eui';
 import React from 'react';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const HeatmapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    width={30}
-    height={22}
-    viewBox="0 0 30 22"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      className="chart-icon__accent"
-      d="M16 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V1zM0 17a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1v-4zm17-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V9a1 1 0 00-1-1h-4zm-1 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4zm9-17a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1h-4z"
-    />
-    <path
-      className="chart-icon__subdued"
-      d="M0 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm0 8a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V9zm9-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1H9zM8 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H9a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1H9zm15-7a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1h-4z"
-    />
-  </svg>
-);
+export const HeatmapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      width={30}
+      height={22}
+      viewBox="0 0 30 22"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M16 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V1zM0 17a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1v-4zm17-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V9a1 1 0 00-1-1h-4zm-1 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1v-4zm9-17a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1h-4z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M0 1a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm0 8a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H1a1 1 0 01-1-1V9zm9-9a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1H9zM8 9a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1H9a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1H9zm15-7a1 1 0 011-1h4a1 1 0 011 1v4a1 1 0 01-1 1h-4a1 1 0 01-1-1V9zm1 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1v-4a1 1 0 00-1-1h-4z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts
index 5199d4286e69e..bfda93da53719 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import type { DatatableColumn } from 'src/plugins/expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import type { DatatableColumn } from '@kbn/expressions-plugin/public';
 import {
   applyPaletteParams,
   getDataMinMax,
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts
index b82b52e1a1a49..12cee6852a036 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/components/helpers.ts
@@ -18,7 +18,7 @@ import {
   DEFAULT_MIN_STOP,
 } from '@kbn/coloring';
 
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions/public';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
 
 import { defaultPaletteParams } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx b/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx
index 0d3d9dcf93be7..e6e2fa3ac709d 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/expression_renderers/heatmap_renderer.tsx
@@ -8,10 +8,10 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import {
   EXPRESSION_HEATMAP_NAME,
   HeatmapExpressionProps,
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts b/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts
index cabb938f6f6b4..69ff0751f0114 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/plugin.ts
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ChartsPluginSetup } from '../../../charts/public';
-import { CoreSetup, CoreStart } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { heatmapFunction, heatmapLegendConfig, heatmapGridConfig } from '../common';
 import { setFormatService, setPaletteService, setUISettings, setThemeService } from './services';
 import { heatmapRenderer } from './expression_renderers';
-import type { FieldFormatsStart } from '../../../field_formats/public';
 
 /** @internal */
 export interface ExpressionHeatmapPluginSetup {
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts b/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts
index 73b66341c4d9a..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/services/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts b/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts
index 7185422c79cad..7a9eb241082e1 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/services/palette_service.ts
@@ -7,8 +7,8 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export const [getPaletteService, setPaletteService] =
   createGetterSetter<PaletteRegistry>('palette');
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts b/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts
index 5e49e8da28840..4d9a2293eb8f8 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/services/ui_settings.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { CoreSetup } from '../../../../../core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
 
 export const [getUISettings, setUISettings] =
   createGetterSetter<CoreSetup['uiSettings']>('core.uiSettings');
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx
index 771a633456e13..f744e85378ec1 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx
+++ b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_color_picker.tsx
@@ -9,8 +9,8 @@
 import React, { createContext, useCallback, useContext } from 'react';
 import { LegendColorPicker, Position } from '@elastic/charts';
 import { PopoverAnchorPosition, EuiWrappingPopover, EuiOutsideClickDetector } from '@elastic/eui';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ColorPicker } from '../../../../charts/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
 
 const KEY_CODE_ENTER = 13;
 
diff --git a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts
index 8d33a94c956d0..fb6596f1482f0 100644
--- a/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/public/utils/get_timezone.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import type { IUiSettingsClient } from '../../../../../core/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 
 /**
  * Get timeZone from uiSettings
diff --git a/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts b/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts
index 858c67da86a6e..1f5597621341d 100644
--- a/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_heatmap/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { heatmapFunction, heatmapLegendConfig, heatmapGridConfig } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
index 2c59a9a875d85..65f738e8e227d 100644
--- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { metricVisFunction } from './metric_vis_function';
-import type { MetricArguments } from '../../common';
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import type { MetricArguments } from '..';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { LabelPosition } from '../constants';
 
 describe('interpreter/functions#metric', () => {
diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
index bea25fbf708d7..2310ffb8c5926 100644
--- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
@@ -8,13 +8,13 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { visType } from '../types';
 import {
   prepareLogTable,
   Dimension,
   validateAccessor,
-} from '../../../../visualizations/common/utils';
-import { ColorMode } from '../../../../charts/common';
+} from '@kbn/visualizations-plugin/common/utils';
+import { ColorMode } from '@kbn/charts-plugin/common';
+import { visType } from '../types';
 import { MetricVisExpressionFunctionDefinition } from '../types';
 import { EXPRESSION_METRIC_NAME, LabelPosition } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
index deb5f5e027abf..5ad540fc579f6 100644
--- a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
@@ -12,9 +12,9 @@ import {
   ExpressionFunctionDefinition,
   ExpressionValueRender,
   Style,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { ColorMode, CustomPaletteState } from '../../../../charts/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { VisParams, visType, LabelPositionType } from './expression_renderers';
 import { EXPRESSION_METRIC_NAME } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
index f54fefd9a1267..695b7ad4754fa 100644
--- a/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
@@ -7,14 +7,14 @@
  */
 
 import { $Values } from '@kbn/utility-types';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import {
   ColorMode,
   Labels,
   CustomPaletteState,
   Style as ChartStyle,
-} from '../../../../charts/common';
-import { Style } from '../../../../expressions/common';
+} from '@kbn/charts-plugin/common';
+import { Style } from '@kbn/expressions-plugin/common';
 import { LabelPosition } from '../constants';
 
 export const visType = 'metric';
diff --git a/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts b/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts
index 89872b4461be3..00e068da062e4 100644
--- a/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/__mocks__/palette_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CustomPaletteState } from 'src/plugins/charts/common';
+import { CustomPaletteState } from '@kbn/charts-plugin/common';
 
 export const getPaletteService = () => {
   return {
diff --git a/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx b/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx
index 039e15d2a67b4..7a278d488bc68 100644
--- a/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { from } from 'rxjs';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable, DatatableColumn } from '../../../../expressions';
-import { Render } from '../../../../presentation_util/public/__stories__';
-import { ColorMode, CustomPaletteState } from '../../../../charts/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
+import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getMetricVisRenderer } from '../expression_renderers';
 import { MetricStyle, MetricVisRenderConfig, visType } from '../../common/types';
 import { LabelPosition } from '../../common/constants';
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx
index 83cefac91a825..f91d3adcd16a8 100644
--- a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.test.tsx
@@ -8,11 +8,11 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Datatable } from '../../../../expressions/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import MetricVisComponent, { MetricVisComponentProps } from './metric_component';
 import { LabelPosition } from '../../common/constants';
 
-jest.mock('../../../expression_metric/public/services', () => ({
+jest.mock('../services', () => ({
   getFormatService: () => {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { getFormatService } = require('../__mocks__/services');
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx
index ec13a41f86a6e..a7d0eb8cad8c6 100644
--- a/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/components/metric_component.tsx
@@ -7,18 +7,18 @@
  */
 
 import React, { Component } from 'react';
-import { MetricVisValue } from './metric_value';
-import { VisParams, MetricOptions } from '../../common/types';
-import type { IFieldFormat } from '../../../../field_formats/common';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
 import {
   getColumnByAccessor,
   getAccessor,
   getFormatByAccessor,
-} from '../../../../visualizations/common/utils';
-import { Datatable } from '../../../../expressions/public';
-import { CustomPaletteState } from '../../../../charts/public';
-import { getFormatService, getPaletteService } from '../../../expression_metric/public/services';
-import { ExpressionValueVisDimension } from '../../../../visualizations/public';
+} from '@kbn/visualizations-plugin/common/utils';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { CustomPaletteState } from '@kbn/charts-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { getFormatService, getPaletteService } from '../services';
+import { VisParams, MetricOptions } from '../../common/types';
+import { MetricVisValue } from './metric_value';
 import { formatValue, shouldApplyColor } from '../utils';
 import { needsLightText } from '../utils/palette';
 import { withAutoScale } from './with_auto_scale';
diff --git a/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx b/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx
index 41d9f864c1a20..4026d3c2d1bc6 100644
--- a/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx
@@ -9,10 +9,10 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { VisualizationContainer } from '../../../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { EXPRESSION_METRIC_NAME, MetricVisRenderConfig } from '../../common';
 
 // @ts-ignore
diff --git a/src/plugins/chart_expressions/expression_metric/public/format_service.ts b/src/plugins/chart_expressions/expression_metric/public/format_service.ts
index 19d2f9a5568ce..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_metric/public/format_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_metric/public/plugin.ts b/src/plugins/chart_expressions/expression_metric/public/plugin.ts
index f941b4a9e2f22..439fb398dbb8a 100644
--- a/src/plugins/chart_expressions/expression_metric/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/plugin.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { ChartsPluginSetup } from '../../../charts/public';
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { metricVisFunction } from '../common';
 import { setFormatService, setPaletteService } from './services';
 import { getMetricVisRenderer } from './expression_renderers';
-import { FieldFormatsStart } from '../../../field_formats/public';
 
 /** @internal */
 export interface ExpressionMetricPluginSetup {
diff --git a/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts b/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts
index 73b66341c4d9a..f8e48e3101952 100644
--- a/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/services/format_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts b/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts
index d18db6340fd45..60bee5353b270 100644
--- a/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/services/palette_service.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import { createGetterSetter } from '../../../../kibana_utils/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getPaletteService, setPaletteService] =
   createGetterSetter<PaletteRegistry>('palette');
diff --git a/src/plugins/chart_expressions/expression_metric/public/utils/format.ts b/src/plugins/chart_expressions/expression_metric/public/utils/format.ts
index 0339baec9e904..80f5dec8151f6 100644
--- a/src/plugins/chart_expressions/expression_metric/public/utils/format.ts
+++ b/src/plugins/chart_expressions/expression_metric/public/utils/format.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsContentType, IFieldFormat } from '../../../../field_formats/common';
+import { FieldFormatsContentType, IFieldFormat } from '@kbn/field-formats-plugin/common';
 
 export const formatValue = (
   value: number | string,
diff --git a/src/plugins/chart_expressions/expression_metric/server/plugin.ts b/src/plugins/chart_expressions/expression_metric/server/plugin.ts
index 1a04d4702361f..aeead69b806f2 100644
--- a/src/plugins/chart_expressions/expression_metric/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_metric/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { metricVisFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts
index 58f765899f5e3..0ce174b38677f 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   MosaicVisConfig,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { mosaicVisFunction } from './mosaic_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts
index d3179026f3c9e..74a85dd01e6e4 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, MosaicVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts
index 900927a35983c..48ecab49dc23b 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/partition_labels_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable } from '../../../../expressions/common';
+import { ExpressionFunctionDefinition, Datatable } from '@kbn/expressions-plugin/common';
 import { PARTITION_LABELS_FUNCTION, PARTITION_LABELS_VALUE } from '../constants';
 import {
   ExpressionValuePartitionLabels,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts
index 366683ce80ddb..c542a25c30875 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   PieVisConfig,
   EmptySizeRatios,
@@ -14,8 +14,8 @@ import {
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { pieVisFunction } from './pie_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts
index 5edab8f7c5226..9a30008cc6bb3 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { EmptySizeRatios, LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, PieVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts
index 1d65ba35a5e0c..5d2cd5b8a0c38 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   TreemapVisConfig,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { treemapVisFunction } from './treemap_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts
index cda9e59da0610..062cf7e78b4ea 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, TreemapVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts
index ead4d97a8f8e0..01cbe844728b3 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import {
   WaffleVisConfig,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
 } from '../types/expression_renderers';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { waffleVisFunction } from './waffle_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts
index 3ff35d1277dba..2f947a3d5fea6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts
@@ -7,8 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
+import { prepareLogTable, validateAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { LegendDisplay, PartitionVisParams } from '../types/expression_renderers';
-import { prepareLogTable, validateAccessor } from '../../../../visualizations/common/utils';
 import { ChartTypes, WaffleVisExpressionFunctionDefinition } from '../types';
 import {
   PARTITION_LABELS_FUNCTION,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts
index bc623fd621345..fe5910990d62a 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_functions.ts
@@ -6,6 +6,12 @@
  * Side Public License, v 1.
  */
 
+import {
+  ExpressionFunctionDefinition,
+  Datatable,
+  ExpressionValueRender,
+  ExpressionValueBoxed,
+} from '@kbn/expressions-plugin/common';
 import {
   PARTITION_LABELS_VALUE,
   PIE_VIS_EXPRESSION_NAME,
@@ -13,12 +19,6 @@ import {
   MOSAIC_VIS_EXPRESSION_NAME,
   WAFFLE_VIS_EXPRESSION_NAME,
 } from '../constants';
-import {
-  ExpressionFunctionDefinition,
-  Datatable,
-  ExpressionValueRender,
-  ExpressionValueBoxed,
-} from '../../../../expressions/common';
 import {
   RenderValue,
   PieVisConfig,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts
index 7ac7e9deedc20..05613af4f2f33 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/common/types/expression_renderers.ts
@@ -8,9 +8,9 @@
 
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, DatatableColumn } from '../../../../expressions/common';
-import { SerializedFieldFormat } from '../../../../field_formats/common';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { ChartTypes, ExpressionValuePartitionLabels } from './expression_functions';
 
 export enum EmptySizeRatios {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts
index af87a59388caf..9dfdaf503c4ee 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/start_deps.ts
@@ -8,8 +8,8 @@
 
 import { from } from 'rxjs';
 import { action } from '@storybook/addon-actions';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { getFormatService } from './format_service';
 
 const theme = {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts
index 178b8db605e1a..7cf5674b1b934 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts
@@ -7,7 +7,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ThemeService } from '../../../../charts/public/services';
+import { ThemeService } from '@kbn/charts-plugin/public/services';
 import { uiSettings } from './ui_settings';
 
 const theme = new ThemeService();
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts
index c5838d82867fb..1585133e3b8d6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__mocks__/ui_settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from 'kibana/public';
+import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from '@kbn/core/public';
 import { Observable } from 'rxjs';
 
 export const uiSettings: IUiSettingsClient = {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx
index bba644f721038..bec4787234766 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/mosaic_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx
index b6d6e9055e692..04eda916ae272 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/pie_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx
index a8f9010ade4ab..ba576fddd59c4 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/treemap_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx
index a97efdabef892..8284c0961ad91 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/__stories__/waffle_vis_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { ComponentStory } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getPartitionVisRenderer } from '../expression_renderers';
 import { ChartTypes, RenderValue } from '../../common/types';
 import { palettes, theme, getStartDeps } from '../__mocks__';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap b/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap
index 2df18b5813473..3c48d3cb36771 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/__snapshots__/partition_vis_component.test.tsx.snap
@@ -228,7 +228,7 @@ exports[`PartitionVisComponent should render correct structure for donut 1`] = `
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -656,7 +656,7 @@ exports[`PartitionVisComponent should render correct structure for mosaic 1`] =
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -1035,7 +1035,7 @@ exports[`PartitionVisComponent should render correct structure for pie 1`] = `
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -1447,7 +1447,7 @@ exports[`PartitionVisComponent should render correct structure for treemap 1`] =
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
@@ -1847,7 +1847,7 @@ exports[`PartitionVisComponent should render correct structure for waffle 1`] =
         }
       }
     >
-      <Memo(LegendToggleComponent)
+      <ForwardRef
         legendPosition="right"
         onClick={[Function]}
         showLegend={true}
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
index 001f2390799e6..1281fb17bd990 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { Settings, TooltipType, SeriesIdentifier } from '@elastic/charts';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { shallow, mount } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
@@ -34,6 +34,17 @@ jest.mock('@elastic/charts', () => {
   };
 });
 
+const actWithTimeout = (action: Function, timer: number = 1) =>
+  act(
+    () =>
+      new Promise((resolve) =>
+        setTimeout(async () => {
+          await action();
+          resolve();
+        }, timer)
+      )
+  );
+
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
 const palettesRegistry = chartPluginMock.createPaletteRegistry();
 const visParams = createMockPieParams();
@@ -131,13 +142,12 @@ describe('PartitionVisComponent', function () {
     expect(component).toMatchSnapshot();
   });
 
-  it('renders the legend on the correct position', () => {
-    const component = shallow(<PartitionVisComponent {...wrapperProps} />);
-    expect(component.find(Settings).prop('legendPosition')).toEqual('right');
-  });
-
   it('renders the legend toggle component', async () => {
     const component = mount(<PartitionVisComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
+
     await act(async () => {
       expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(1);
     });
@@ -145,6 +155,9 @@ describe('PartitionVisComponent', function () {
 
   it('hides the legend if the legend toggle is clicked', async () => {
     const component = mount(<PartitionVisComponent {...wrapperProps} />);
+    await actWithTimeout(async () => {
+      await component.update();
+    });
     findTestSubject(component, 'vislibToggleLegend').simulate('click');
     await act(async () => {
       expect(component.find(Settings).prop('showLegend')).toEqual(false);
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
index e8ab85f2877ff..ef6d0d1c4525c 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
@@ -21,15 +21,15 @@ import {
 } from '@elastic/charts';
 import { useEuiTheme } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { LegendToggle, ChartsPluginSetup } from '../../../../charts/public';
-import type { PersistedState } from '../../../../visualizations/public';
-import { getColumnByAccessor } from '../../../../visualizations/common/utils';
+import { LegendToggle, ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import {
   Datatable,
   DatatableColumn,
   IInterpreterRenderHandlers,
-} from '../../../../expressions/public';
-import type { FieldFormat } from '../../../../field_formats/common';
+} from '@kbn/expressions-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { DEFAULT_PERCENT_DECIMALS } from '../../common/constants';
 import {
   PartitionVisParams,
@@ -127,12 +127,8 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
 
   useEffect(() => {
     const legendShow = showLegendDefault();
-    const showLegendDef = shouldShowLegend(visType, visParams.legendDisplay, bucketColumns);
-    if (showLegendDef !== legendShow) {
-      setShowLegend(legendShow);
-      props.uiState?.set('vis.legendOpen', legendShow);
-    }
-  }, [showLegendDefault, props.uiState, visParams.legendDisplay, visType, bucketColumns]);
+    setShowLegend(legendShow);
+  }, [showLegendDefault]);
 
   const onRenderChange = useCallback<RenderChangeListener>(
     (isRendered) => {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx
index c728ff89a04f8..6c8f728fbb1c8 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/visualization_noresults.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { EmptyPlaceholder } from '../../../../charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import { ChartTypes } from '../../common/types';
 import { getIcon } from '../utils';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
index b0fe277cebfd3..828491f47b93a 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/expression_renderers/partition_vis_renderer.tsx
@@ -11,11 +11,11 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { css } from '@emotion/react';
 import { i18n } from '@kbn/i18n';
-import { ExpressionRenderDefinition } from '../../../../expressions/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { VisTypePieDependencies } from '../plugin';
-import { withSuspense } from '../../../../presentation_util/public';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
 import { PARTITION_VIS_RENDERER_NAME } from '../../common/constants';
 import { ChartTypes, RenderValue } from '../../common/types';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx
index 5846fe0e7e8ba..3101164bfe88d 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/donut.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const DonutIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      d="M19.21 21.119a11 11 0 006.595-8.1c.11-.577-.355-1.082-.942-1.082H20.75c-.477 0-.878.342-1.046.788a5.028 5.028 0 11-6.474-6.474c.447-.168.788-.569.788-1.046V1.094c0-.588-.505-1.053-1.082-.943a11 11 0 106.272 20.968h.002z"
-      className="chart-icon__subdued"
-    />
-    <path
-      d="M22.778 3.176A11 11 0 0017.084.154C16.507.042 16 .507 16 1.095v4.116c0 .475.34.875.784 1.044l.14.055A5.026 5.026 0 0119.7 9.17c.168.445.568.784 1.044.784h4.115c.588 0 1.053-.506.942-1.084a11 11 0 00-3.023-5.694z"
-      className="chart-icon__accent"
-    />
-  </svg>
-);
+export const DonutIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        d="M19.21 21.119a11 11 0 006.595-8.1c.11-.577-.355-1.082-.942-1.082H20.75c-.477 0-.878.342-1.046.788a5.028 5.028 0 11-6.474-6.474c.447-.168.788-.569.788-1.046V1.094c0-.588-.505-1.053-1.082-.943a11 11 0 106.272 20.968h.002z"
+        css={chartIcon.subdued}
+      />
+      <path
+        d="M22.778 3.176A11 11 0 0017.084.154C16.507.042 16 .507 16 1.095v4.116c0 .475.34.875.784 1.044l.14.055A5.026 5.026 0 0119.7 9.17c.168.445.568.784 1.044.784h4.115c.588 0 1.053-.506.942-1.084a11 11 0 00-3.023-5.694z"
+        css={chartIcon.accent}
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx
index f8582495f2e0c..1f5c99702f869 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/mosaic.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const MosaicIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId} /> : null}
-    <path
-      className="chart-icon__subdued"
-      d="M2 0a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1H2zM2 14a1 1 0 00-1 1v6a1 1 0 001 1h6a1 1 0 001-1v-6a1 1 0 00-1-1H2zM11 13a1 1 0 011-1h6a1 1 0 011 1v8a1 1 0 01-1 1h-6a1 1 0 01-1-1v-8zM12 0a1 1 0 100 2h6a1 1 0 100-2h-6zM21 15a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1h-6a1 1 0 01-1-1v-6zM22 0a1 1 0 00-1 1v4a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1h-6z"
-    />
-    <path
-      className="chart-icon__accent"
-      d="M11 5a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1h-6a1 1 0 01-1-1V5zM1 7a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1H2a1 1 0 01-1-1V7zM22 8a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V9a1 1 0 00-1-1h-6z"
-    />
-  </svg>
-);
+export const MosaicIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId} /> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M2 0a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1H2zM2 14a1 1 0 00-1 1v6a1 1 0 001 1h6a1 1 0 001-1v-6a1 1 0 00-1-1H2zM11 13a1 1 0 011-1h6a1 1 0 011 1v8a1 1 0 01-1 1h-6a1 1 0 01-1-1v-8zM12 0a1 1 0 100 2h6a1 1 0 100-2h-6zM21 15a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1h-6a1 1 0 01-1-1v-6zM22 0a1 1 0 00-1 1v4a1 1 0 001 1h6a1 1 0 001-1V1a1 1 0 00-1-1h-6z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M11 5a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1h-6a1 1 0 01-1-1V5zM1 7a1 1 0 011-1h6a1 1 0 011 1v4a1 1 0 01-1 1H2a1 1 0 01-1-1V7zM22 8a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1V9a1 1 0 00-1-1h-6z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx
index 9176ac3fdd5c1..5824b8f40b6e6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/pie.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const PieIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      d="M17.827 21.189a10.001 10.001 0 005.952-7.148c.124-.578-.343-1.091-.935-1.091H14a1 1 0 01-1-1V3.106c0-.592-.513-1.059-1.092-.935a10 10 0 105.919 19.018z"
-      className="chart-icon__subdued"
-    />
-    <path
-      d="M22.462 3.538A12.29 12.29 0 0016.094.16C15.512.048 15 .514 15 1.106V10a1 1 0 001 1h8.895c.591 0 1.057-.512.945-1.094a12.288 12.288 0 00-3.378-6.368z"
-      className="chart-icon__accent"
-    />
-  </svg>
-);
+export const PieIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        d="M17.827 21.189a10.001 10.001 0 005.952-7.148c.124-.578-.343-1.091-.935-1.091H14a1 1 0 01-1-1V3.106c0-.592-.513-1.059-1.092-.935a10 10 0 105.919 19.018z"
+        css={chartIcon.subdued}
+      />
+      <path
+        d="M22.462 3.538A12.29 12.29 0 0016.094.16C15.512.048 15 .514 15 1.106V10a1 1 0 001 1h8.895c.591 0 1.057-.512.945-1.094a12.288 12.288 0 00-3.378-6.368z"
+        css={chartIcon.accent}
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx
index 1860132fa9ffd..781b79505384d 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/treemap.tsx
@@ -8,29 +8,34 @@
 
 import React from 'react';
 import { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const TreemapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      d="M0 1a1 1 0 011-1h13a1 1 0 011 1v20a1 1 0 01-1 1H1a1 1 0 01-1-1V1z"
-      className="chart-icon__subdued"
-    />
-    <path
-      d="M17 1a1 1 0 011-1h11a1 1 0 011 1v12a1 1 0 01-1 1H18a1 1 0 01-1-1V1z"
-      className="chart-icon__accent"
-    />
-    <path
-      d="M29 16H18a1 1 0 00-1 1v4a1 1 0 001 1h11a1 1 0 001-1v-4a1 1 0 00-1-1z"
-      className="chart-icon__subdued"
-    />
-  </svg>
-);
+export const TreemapIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId}>{title}</title> : null}
+      <path
+        d="M0 1a1 1 0 011-1h13a1 1 0 011 1v20a1 1 0 01-1 1H1a1 1 0 01-1-1V1z"
+        css={chartIcon.subdued}
+      />
+      <path
+        d="M17 1a1 1 0 011-1h11a1 1 0 011 1v12a1 1 0 01-1 1H18a1 1 0 01-1-1V1z"
+        css={chartIcon.accent}
+      />
+      <path
+        d="M29 16H18a1 1 0 00-1 1v4a1 1 0 001 1h11a1 1 0 001-1v-4a1 1 0 00-1-1z"
+        css={chartIcon.subdued}
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx
index 30f05dd57f348..21e26facd8e15 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/icons/waffle.tsx
@@ -8,25 +8,30 @@
 
 import React from 'react';
 import type { EuiIconProps } from '@elastic/eui';
+import { useCommonChartStyles } from '@kbn/charts-plugin/public';
 
-export const WaffleIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    viewBox="0 0 30 22"
-    width={30}
-    height={22}
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby={titleId}
-    {...props}
-  >
-    {title ? <title id={titleId} /> : null}
-    <path
-      className="chart-icon__accent"
-      d="M16 1a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V1zM4 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM17 6a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V7a1 1 0 00-1-1h-2zM23 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM5 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1H5zM4 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V7zM11 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM10 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7zM11 12a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM22 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7z"
-    />
-    <path
-      className="chart-icon__subdued"
-      d="M22 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM4 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM16 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM11 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM23 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM16 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2z"
-    />
-  </svg>
-);
+export const WaffleIcon = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => {
+  const { chartIcon } = useCommonChartStyles();
+
+  return (
+    <svg
+      viewBox="0 0 30 22"
+      width={30}
+      height={22}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby={titleId}
+      {...props}
+    >
+      {title ? <title id={titleId} /> : null}
+      <path
+        css={chartIcon.subdued}
+        d="M16 1a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V1zM4 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM17 6a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V7a1 1 0 00-1-1h-2zM23 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM5 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1H5zM4 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V7zM11 0a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V1a1 1 0 00-1-1h-2zM10 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7zM11 12a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM22 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7z"
+      />
+      <path
+        css={chartIcon.accent}
+        d="M22 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM4 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1v-2zM16 19a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2zM11 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM23 18a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2zM16 13a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2z"
+      />
+    </svg>
+  );
+};
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts b/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts
index 824fa3a1861f6..455dd111179d2 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '../../../expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import {
   BucketColumns,
   PartitionVisParams,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts b/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts
index 3bc3cdb31f9b1..54d93a704a746 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/plugin.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { CoreSetup, CoreStart, ThemeServiceStart } from '../../../../core/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { CoreSetup, CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   partitionLabelsFunction,
   pieVisFunction,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/types.ts b/src/plugins/chart_expressions/expression_partition_vis/public/types.ts
index 50fb15cc053a3..22b47bb49dfd2 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/public/types.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/types.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { ValueClickContext } from '../../../embeddable/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import type { ValueClickContext } from '@kbn/embeddable-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import {
   Plugin as ExpressionsPublicPlugin,
   ExpressionsServiceStart,
-} from '../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 
 export type ExpressionPartitionVisPluginSetup = void;
 export type ExpressionPartitionVisPluginStart = void;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts
index f6e20104779fa..fbd68ad5177f4 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DatatableColumn } from '../../../../expressions/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/public';
 import { getFilterClickData, getFilterEventData } from './filter_helpers';
 import { createMockBucketColumns, createMockVisData } from '../mocks';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts
index 5b48d68f68201..c36e160c0c36b 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/filter_helpers.ts
@@ -7,10 +7,10 @@
  */
 
 import { LayerValue, SeriesIdentifier } from '@elastic/charts';
-import { Datatable, DatatableColumn } from '../../../../expressions/public';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { ValueClickContext } from '../../../../embeddable/public';
-import type { FieldFormat } from '../../../../field_formats/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ValueClickContext } from '@kbn/embeddable-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { BucketColumns } from '../../common/types';
 import { FilterEvent } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts
index 18f89cb5f3e4e..d6bbf8e2410a8 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
-import { Datatable } from '../../../../expressions';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { Datatable } from '@kbn/expressions-plugin';
 import { createMockVisData } from '../mocks';
 import { generateFormatters, getAvailableFormatter, getFormatter } from './formatters';
 import { BucketColumns } from '../../common/types';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts
index bbb30169928d4..64139e301842a 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { FieldFormat, FormatFactory } from '../../../../field_formats/common';
-import type { Datatable } from '../../../../expressions/public';
+import type { FieldFormat, FormatFactory } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { BucketColumns } from '../../common/types';
 
 export const generateFormatters = (visData: Datatable, formatFactory: FormatFactory) =>
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx
index 1a9c785ed6dae..04aa0136dcadd 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.test.tsx
@@ -16,8 +16,8 @@ import {
   LegendColorPickerWrapperContext,
   LegendColorPickerWrapperContextType,
 } from './get_color_picker';
-import { ColorPicker } from '../../../../charts/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { createMockBucketColumns, createMockVisData } from '../mocks';
 
 const bucketColumns = createMockBucketColumns();
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx
index 3f95f77c7ec6c..ebbd72ce52231 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_color_picker.tsx
@@ -10,9 +10,9 @@ import React, { useCallback, createContext, useContext } from 'react';
 import Color from 'color';
 import { LegendColorPicker, Position } from '@elastic/charts';
 import { PopoverAnchorPosition, EuiWrappingPopover, EuiOutsideClickDetector } from '@elastic/eui';
-import type { DatatableRow } from '../../../../expressions/public';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ColorPicker } from '../../../../charts/public';
+import type { DatatableRow } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
 import { BucketColumns } from '../../common/types';
 
 const KEY_CODE_ENTER = 13;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts
index e365bce5737af..0b5d0d101cf38 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_columns.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { getColumnByAccessor, getFormatByAccessor } from '../../../../visualizations/common/utils';
-import { DatatableColumn, Datatable } from '../../../../expressions/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { getColumnByAccessor, getFormatByAccessor } from '@kbn/visualizations-plugin/common/utils';
+import { DatatableColumn, Datatable } from '@kbn/expressions-plugin/public';
 import { BucketColumns, PartitionVisParams } from '../../common/types';
 
 const getMetricColumn = (
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts
index cb432bf7b2580..b3efd7f7c0451 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_distinct_series.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 import { BucketColumns } from '../../common/types';
 
 export interface DistinctSeries {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx
index bf02a074dc18f..9ad76ea7a49a8 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_legend_actions.tsx
@@ -11,11 +11,11 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiContextMenuPanelDescriptor, EuiIcon, EuiPopover, EuiContextMenu } from '@elastic/eui';
 import { LegendAction, SeriesIdentifier, useLegendAction } from '@elastic/charts';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { Datatable } from '../../../../expressions/public';
-import { getFormatByAccessor, getAccessor } from '../../../../visualizations/common/utils';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { getFormatByAccessor, getAccessor } from '@kbn/visualizations-plugin/common/utils';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { PartitionVisParams } from '../../common/types';
-import { FieldFormatsStart } from '../../../../field_formats/public';
 import { FilterEvent } from '../types';
 
 export const getLegendActions = (
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
index 11838c7ce0140..345d6ce068d0c 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_partition_theme.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { getPartitionTheme } from './get_partition_theme';
 import { createMockPieParams, createMockDonutParams, createMockPartitionVisParams } from '../mocks';
 import { ChartTypes, LabelPositions, PartitionVisParams } from '../../common/types';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts
index 5e0f58a384785..3609be601e1a5 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
-import { DatatableColumn } from '../../../../expressions';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { createMockVisData } from '../mocks';
 import { getSplitDimensionAccessor } from './get_split_dimension_accessor';
 import { BucketColumns } from '../../common/types';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 
 describe('getSplitDimensionAccessor', () => {
   const visData = createMockVisData();
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts
index 6491d79a083ac..d08bac5b61818 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 import { AccessorFn } from '@elastic/charts';
-import { DatatableColumn } from '../../../../expressions/public';
-import { FieldFormat, FormatFactory } from '../../../../field_formats/common';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
-import { getColumnByAccessor } from '../../../../visualizations/common/utils';
+import { DatatableColumn } from '@kbn/expressions-plugin/public';
+import { FieldFormat, FormatFactory } from '@kbn/field-formats-plugin/common';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
+import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { getFormatter } from './formatters';
 
 export const getSplitDimensionAccessor = (
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts
index d951d962d67f2..e076cc65b5136 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts
@@ -7,8 +7,8 @@
  */
 
 import type { PaletteOutput, PaletteDefinition } from '@kbn/coloring';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
-import { Datatable } from '../../../../../expressions';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { Datatable } from '@kbn/expressions-plugin';
 import { byDataColorPaletteMap } from './get_color';
 
 describe('#byDataColorPaletteMap', () => {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts
index f6d88d1fe802e..9e55bec92fbaf 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.ts
@@ -8,9 +8,9 @@
 import { ShapeTreeNode } from '@elastic/charts';
 import { isEqual } from 'lodash';
 import type { PaletteRegistry, SeriesLayer, PaletteOutput, PaletteDefinition } from '@kbn/coloring';
-import type { FieldFormatsStart } from '../../../../../field_formats/public';
-import { lightenColor } from '../../../../../charts/public';
-import type { Datatable, DatatableRow } from '../../../../../expressions/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { lightenColor } from '@kbn/charts-plugin/public';
+import type { Datatable, DatatableRow } from '@kbn/expressions-plugin/public';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 import { DistinctSeries, getDistinctSeries } from '../get_distinct_series';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts
index 0cc0fea93e6fe..cab4beda3f794 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.test.ts
@@ -7,8 +7,8 @@
  */
 import { ShapeTreeNode } from '@elastic/charts';
 import type { PaletteDefinition, SeriesLayer } from '@kbn/coloring';
-import { dataPluginMock } from '../../../../../data/public/mocks';
-import type { DataPublicPluginStart } from '../../../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { getColor } from './get_color';
 import { createMockVisData, createMockBucketColumns, createMockPieParams } from '../../mocks';
 import { ChartTypes } from '../../../common/types';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts
index 8280e7bd2a896..1ba15fe2a055f 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_layers.ts
@@ -8,9 +8,9 @@
 
 import { Datum, PartitionLayer } from '@elastic/charts';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { FieldFormat } from '../../../../../field_formats/common';
-import type { FieldFormatsStart } from '../../../../../field_formats/public';
-import type { Datatable, DatatableRow } from '../../../../../expressions/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { Datatable, DatatableRow } from '@kbn/expressions-plugin/public';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 import { sortPredicateByType } from './sort_predicate';
 import { byDataColorPaletteMap, getColor } from './get_color';
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts
index 90c271daef6a4..70236d53a3e5f 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_node_labels.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { FieldFormat, FormatFactory } from '../../../../../field_formats/common';
+import type { FieldFormat, FormatFactory } from '@kbn/field-formats-plugin/common';
 import { BucketColumns } from '../../../common/types';
 import { getAvailableFormatter } from '../formatters';
 
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts
index 1ccfdb7a5b1f9..001b53889c6c6 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '../../../../../expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { extractUniqTermsMap } from './sort_predicate';
 
 describe('#extractUniqTermsMap', () => {
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts
index c7eaa2c494492..e6cb305157018 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts
@@ -7,7 +7,7 @@
  */
 
 import { ArrayEntry } from '@elastic/charts';
-import { Datatable } from '../../../../../../../src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 
 type SortFn = (([name1, node1]: ArrayEntry, [name2, node2]: ArrayEntry) => number) | undefined;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts
index 9990c1a8e65ea..55fca725a5431 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from '../../../../expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { BucketColumns, ChartTypes, LegendDisplay } from '../../common/types';
 
 type GetLegendIsFlatFn = (splitChartDimension: DatatableColumn | undefined) => boolean;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts b/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts
index 190e43e4c7dfa..3617c4604bb86 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/server/plugin.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import {
   partitionLabelsFunction,
   pieVisFunction,
diff --git a/src/plugins/chart_expressions/expression_partition_vis/server/types.ts b/src/plugins/chart_expressions/expression_partition_vis/server/types.ts
index 0fdca6e6b319e..43a40b57d74e3 100755
--- a/src/plugins/chart_expressions/expression_partition_vis/server/types.ts
+++ b/src/plugins/chart_expressions/expression_partition_vis/server/types.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 
 export type ExpressionPartitionVisPluginSetup = void;
 export type ExpressionPartitionVisPluginStart = void;
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts
index dc77848d37ceb..c9ddd7c30557b 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts
@@ -8,9 +8,9 @@
 
 import { tagcloudFunction } from './tagcloud_function';
 
-import { functionWrapper } from '../../../../expressions/common/expression_functions/specs/tests/utils';
-import { ExpressionValueVisDimension } from '../../../../visualizations/public';
-import { Datatable } from '../../../../expressions/common/expression_types/specs';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { ScaleOptions, Orientation } from '../constants';
 
 type Arguments = Parameters<ReturnType<typeof tagcloudFunction>['fn']>[1];
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts
index e4ccecd6a0069..d86f570daf5c1 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts
@@ -11,7 +11,7 @@ import {
   prepareLogTable,
   Dimension,
   validateAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
 import { TagCloudRendererParams } from '../types';
 import { ExpressionTagcloudFunction } from '../types';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts
index 01c29ccc0e77d..d452783c3ca7b 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts
@@ -12,8 +12,8 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '../../../../expressions';
-import { ExpressionValueVisDimension } from '../../../../visualizations/common';
+} from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
 
 interface TagCloudCommonParams {
diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts
index d426aa061a2ab..c7d6d773f001a 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_renderers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export interface TagCloudTypeProps {
   palettes: ChartsPluginSetup['palettes'];
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx
index 9866ec644ae26..5fcf7d04f0492 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { tagcloudRenderer } from '../expression_renderers';
-import { Render } from '../../../../presentation_util/public/__stories__';
 import { TagcloudRendererConfig } from '../../common/types';
 import { ScaleOptions, Orientation } from '../../common/constants';
 import { palettes } from '../__mocks__/palettes';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx
index a85455b924010..85f77c98e0b50 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx
@@ -7,8 +7,8 @@
  */
 import React from 'react';
 import { Wordcloud, Settings, WordcloudSpec } from '@elastic/charts';
-import { chartPluginMock } from '../../../../charts/public/mocks';
-import type { Datatable } from '../../../../expressions/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { mount } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import TagCloudChart, { TagCloudChartProps } from './tagcloud_component';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx
index 5860c209f8be8..49f376a8a4aa3 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx
@@ -12,13 +12,13 @@ import { throttle } from 'lodash';
 import { EuiIconTip, EuiResizeObserver } from '@elastic/eui';
 import { Chart, Settings, Wordcloud, RenderChangeListener } from '@elastic/charts';
 import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
-import { IInterpreterRenderHandlers } from '../../../../expressions/public';
-import { getFormatService } from '../format_service';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
 import {
   getColumnByAccessor,
   getAccessor,
   getFormatByAccessor,
-} from '../../../../visualizations/common/utils';
+} from '@kbn/visualizations-plugin/common/utils';
+import { getFormatService } from '../format_service';
 import { TagcloudRendererConfig } from '../../common/types';
 import { ScaleOptions, Orientation } from '../../common/constants';
 
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx b/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx
index 2cec5453b9b9e..f0940f8f246e8 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx
@@ -11,9 +11,9 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { ClassNames } from '@emotion/react';
 import { i18n } from '@kbn/i18n';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
-import { VisualizationContainer } from '../../../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../../../expressions/common/expression_renderers';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { ExpressioTagcloudRendererDependencies } from '../plugin';
 import { TagcloudRendererConfig } from '../../common/types';
 import { EXPRESSION_NAME } from '../../common';
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts b/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts
index 778170321bcc3..0c8b1dca122a7 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/format_service.ts
@@ -14,8 +14,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { FieldFormatsStart } from '../../../field_formats/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<FieldFormatsStart>('fieldFormats');
diff --git a/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts b/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts
index 9385ab3b26772..8333ab8683084 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, ThemeServiceStart } from '../../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../../expressions/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { CoreSetup, CoreStart, Plugin, ThemeServiceStart } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { tagcloudRenderer } from './expression_renderers';
 import { tagcloudFunction } from '../common/expression_functions';
-import { FieldFormatsStart } from '../../../field_formats/public';
 import { setFormatService } from './format_service';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts b/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts
index 11f0d03407fbe..78a581d135c61 100644
--- a/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_tagcloud/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { tagcloudFunction } from '../common/expression_functions';
 
 interface SetupDeps {
diff --git a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
index f09ad04e77ddb..f225846687e14 100644
--- a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts
@@ -8,7 +8,7 @@
 
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, DatatableRow } from 'src/plugins/expressions';
+import { Datatable, DatatableRow } from '@kbn/expressions-plugin';
 import { LayerTypes } from '../constants';
 import { DataLayerConfigResult, LensMultiTable, XYArgs } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts
index 0862b69ca44f2..9ec3a43e1d710 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/annotation_layer_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LayerTypes, ANNOTATION_LAYER } from '../constants';
 import { AnnotationLayerArgs, AnnotationLayerConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts
index c5cf89a4663c9..e65550c7aeeef 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_extent_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { AxisExtentConfig, AxisExtentConfigResult } from '../types';
 import { AxisExtentModes, AXIS_EXTENT_CONFIG } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts
index 50302214fc37c..53b9ca238fe78 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/axis_titles_visibility_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { AXIS_TITLES_VISIBILITY_CONFIG } from '../constants';
 import { AxesSettingsConfig, AxisTitlesVisibilityConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts
index ba7fafd3b3685..7f8bf30d956ff 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { DataLayerArgs } from '../types';
-import { dataLayerConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../expressions/common/mocks';
+import { dataLayerConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import { mockPaletteOutput } from '../__mocks__';
 import { LayerTypes } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts
index e9ffa0f41f49f..d09b8481a6842 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/data_layer_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { DataLayerArgs, DataLayerConfigResult } from '../types';
 import {
   DATA_LAYER,
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts
index 91bfbc8fbe6f0..b42465da15ef1 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { AxesSettingsConfig } from '../types';
-import { gridlinesConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { gridlinesConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('gridlinesConfig', () => {
   test('produces the correct arguments', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts
index b94b8b5709c03..5010ca39cbdc4 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/grid_lines_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { GRID_LINES_CONFIG } from '../constants';
 import { AxesSettingsConfig, GridlinesConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts
index 2d54a729d3e5a..c4e795c7f6169 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { LabelsOrientationConfig } from '../types';
-import { labelsOrientationConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { labelsOrientationConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('labelsOrientationConfig', () => {
   test('produces the correct arguments', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts
index 94d726c56f3b2..5143f4a3e25bd 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/labels_orientation_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LABELS_ORIENTATION_CONFIG } from '../constants';
 import { LabelsOrientationConfig, LabelsOrientationConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts
index 2c673ab990ded..9d58903e93c62 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Position } from '@elastic/charts';
-import { createMockExecutionContext } from '../../../../expressions/common/mocks';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import { LegendConfig } from '../types';
 import { legendConfigFunction } from './legend_config';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts
index 384f23aee811a..65f8a725518a3 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/legend_config.ts
@@ -8,7 +8,7 @@
 
 import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LEGEND_CONFIG } from '../constants';
 import { LegendConfig, LegendConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts
index c5d0f17ff138d..46f6e7671c0ab 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/reference_line_layer_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LayerTypes, REFERENCE_LINE_LAYER, Y_CONFIG } from '../constants';
 import { ReferenceLineLayerArgs, ReferenceLineLayerConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts
index 8b31258377dd9..d856af48f5d88 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { AxesSettingsConfig } from '../types';
-import { tickLabelsConfigFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { tickLabelsConfigFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('tickLabelsConfig', () => {
   test('produces the correct arguments', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts
index 6a882094a56d2..4ee40054d6271 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/tick_labels_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { TICK_LABELS_CONFIG } from '../constants';
 import { AxesSettingsConfig, TickLabelsConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts
index 69d0bf51b3d64..27e68f0a49891 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { xyVisFunction } from '../expression_functions';
-import { createMockExecutionContext } from '../../../../../plugins/expressions/common/mocks';
+import { xyVisFunction } from '.';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import { sampleArgs } from '../__mocks__';
 import { XY_VIS } from '../constants';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
index 0f83aeecc7a20..227b7553d6414 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
@@ -7,9 +7,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import { LensMultiTable, XYArgs, XYRender } from '../types';
-import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils';
 import {
   XY_VIS,
   DATA_LAYER,
diff --git a/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts b/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts
index e665fc2b8cea0..943c6910952a0 100644
--- a/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/expression_functions/y_axis_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionFunctionDefinition } from '../../../../expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { FillStyles, IconPositions, LineStyles, YAxisModes, Y_CONFIG } from '../constants';
 import { YConfig, YConfigResult } from '../types';
 
diff --git a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
index 044e75f95fc57..a1984c78fe0ac 100644
--- a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
@@ -9,8 +9,8 @@
 import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable } from '../../../../expressions';
-import { EventAnnotationOutput } from '../../../../event_annotation/common';
+import { Datatable } from '@kbn/expressions-plugin';
+import { EventAnnotationOutput } from '@kbn/event-annotation-plugin/common';
 import {
   AxisExtentModes,
   FillStyles,
diff --git a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
index cc73950438f38..60b9f6a5788b4 100644
--- a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { chartPluginMock } from '../../../../../plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { DataLayerConfigResult, LensMultiTable, XYArgs } from '../../common';
 import { LayerTypes } from '../../common/constants';
 import { mockPaletteOutput, sampleArgs } from '../../common/__mocks__';
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap b/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
index 828a62c85cce3..1725cea040f56 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
+++ b/src/plugins/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`XYChart component annotations should render basic annotation 1`] = `
   dataValues={
     Array [
       Object {
-        "dataValue": 1647591917125,
+        "dataValue": 1647591917140,
         "details": "Annotation",
         "header": "2022-03-18T08:25:17.140Z",
       },
@@ -169,7 +169,7 @@ exports[`XYChart component annotations should render simplified annotation when
   dataValues={
     Array [
       Object {
-        "dataValue": 1647591917125,
+        "dataValue": 1647591917140,
         "details": "Annotation",
         "header": "2022-03-18T08:25:17.140Z",
       },
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx b/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx
index e8b99a36664df..976bec6678fe5 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/annotations.tsx
@@ -19,9 +19,9 @@ import {
 } from '@elastic/charts';
 import moment from 'moment';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import type { EventAnnotationArgs } from '../../../../event_annotation/common';
-import type { FieldFormat } from '../../../../field_formats/common';
-import { defaultAnnotationColor } from '../../../../../../src/plugins/event_annotation/public';
+import type { EventAnnotationArgs } from '@kbn/event-annotation-plugin/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { defaultAnnotationColor } from '@kbn/event-annotation-plugin/public';
 import type { AnnotationLayerArgs, AnnotationLayerConfigResult } from '../../common/types';
 import { AnnotationIcon, hasIcon, Marker, MarkerBody } from '../helpers';
 import { mapVerticalToHorizontalPlacement, LINES_MARKER_SIZE } from '../helpers';
@@ -170,7 +170,12 @@ export const Annotations = ({
         const header =
           formatter?.convert(isGrouped ? roundedTimestamp : exactTimestamp) ||
           moment(isGrouped ? roundedTimestamp : exactTimestamp).toISOString();
-        const strokeWidth = annotation.lineWidth || 1;
+        const strokeWidth = hide ? 1 : annotation.lineWidth || 1;
+        const dataValue = isGrouped
+          ? moment(
+              isBarChart && minInterval ? roundedTimestamp + minInterval / 2 : roundedTimestamp
+            ).valueOf()
+          : moment(exactTimestamp).valueOf();
         return (
           <LineAnnotation
             id={id}
@@ -202,9 +207,7 @@ export const Annotations = ({
             markerPosition={markerPosition}
             dataValues={[
               {
-                dataValue: moment(
-                  isBarChart && minInterval ? roundedTimestamp + minInterval / 2 : roundedTimestamp
-                ).valueOf(),
+                dataValue,
                 header,
                 details: annotation.label,
               },
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx
index a0d6351dad7f9..1f64c45a5cb40 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.test.tsx
@@ -9,7 +9,7 @@
 import { LineAnnotation, RectAnnotation } from '@elastic/charts';
 import { shallow } from 'enzyme';
 import React from 'react';
-import { FieldFormat } from '../../../../field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { LensMultiTable } from '../../common';
 import { ReferenceLineLayerArgs, YConfig } from '../../common/types';
 import { ReferenceLineAnnotations, ReferenceLineAnnotationsProps } from './reference_lines';
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx
index d71e56bcef6d0..6146cc379227d 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/reference_lines.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 import { groupBy } from 'lodash';
 import { RectAnnotation, AnnotationDomainType, LineAnnotation, Position } from '@elastic/charts';
 import { euiLightVars } from '@kbn/ui-theme';
-import type { FieldFormat } from '../../../../field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { IconPosition, ReferenceLineLayerArgs, YAxisMode } from '../../common/types';
 import type { LensMultiTable } from '../../common/types';
 import {
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx b/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx
index dbc4c348cb891..257d299616946 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/x_domain.tsx
@@ -9,9 +9,9 @@
 import { uniq } from 'lodash';
 import React from 'react';
 import moment from 'moment';
-import { Endzones } from '../../../../../plugins/charts/public';
+import { Endzones } from '@kbn/charts-plugin/public';
+import { search } from '@kbn/data-plugin/public';
 import type { LensMultiTable, DataLayerArgs } from '../../common';
-import { search } from '../../../../../plugins/data/public';
 
 export interface XDomain {
   min?: number;
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
index 1a8a16c165e9e..2c5a0d5675d6d 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
@@ -33,7 +33,7 @@ import {
   VerticalAlignment,
   XYChartSeriesIdentifier,
 } from '@elastic/charts';
-import { EmptyPlaceholder } from '../../../../../plugins/charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import { XyEndzones } from './x_domain';
 import {
   chartsActiveCursorService,
@@ -51,8 +51,8 @@ import {
   sampleLayer,
 } from '../../common/__mocks__';
 import { XYChart, XYChartRenderProps } from './xy_chart';
-import { eventAnnotationServiceMock } from '../../../../event_annotation/public/mocks';
-import { EventAnnotationOutput } from '../../../../event_annotation/common';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
+import { EventAnnotationOutput } from '@kbn/event-annotation-plugin/common';
 
 const onClickValue = jest.fn();
 const onSelectRange = jest.fn();
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
index eace75970c67a..79c8066052dd1 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
@@ -39,20 +39,16 @@ import {
 import { IconType } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { PaletteRegistry, SeriesLayer } from '@kbn/coloring';
-import type { Datatable, DatatableRow, DatatableColumn } from '../../../../expressions/public';
-import { RenderMode } from '../../../../expressions/common';
-import { FieldFormat } from '../../../../field_formats/common';
-import { EmptyPlaceholder } from '../../../../../plugins/charts/public';
+import type { Datatable, DatatableRow, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { RenderMode } from '@kbn/expressions-plugin/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart, useActiveCursor } from '@kbn/charts-plugin/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
 import type { FilterEvent, BrushEvent, FormatFactory } from '../types';
 import type { SeriesType, XYChartProps } from '../../common/types';
 import { isHorizontalChart, getSeriesColor, getAnnotationsLayers, getDataLayers } from '../helpers';
-import { EventAnnotationServiceType } from '../../../../event_annotation/public';
-import {
-  ChartsPluginSetup,
-  ChartsPluginStart,
-  useActiveCursor,
-} from '../../../../../plugins/charts/public';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../plugins/charts/common';
 import {
   getFilteredLayers,
   getReferenceLayers,
diff --git a/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx b/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx
index 170f4fb9bb87b..a35216821c077 100644
--- a/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx
@@ -8,15 +8,15 @@
 
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ThemeServiceStart } from 'kibana/public';
+import { ThemeServiceStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { ChartsPluginStart } from '../../../../charts/public';
-import { EventAnnotationServiceType } from '../../../../event_annotation/public';
-import { ExpressionRenderDefinition } from '../../../../expressions';
-import { FormatFactory } from '../../../../field_formats/common';
-import { KibanaThemeProvider } from '../../../../kibana_react/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { XYChartProps } from '../../common';
 import { calculateMinInterval } from '../helpers/interval';
 import type { BrushEvent, FilterEvent } from '../types';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts
index 201b0198087da..c5f2f6d7151e5 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.test.ts
@@ -8,7 +8,7 @@
 
 import { DataLayerConfigResult } from '../../common';
 import { LayerTypes } from '../../common/constants';
-import { Datatable } from '../../../../../plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { getAxesConfiguration } from './axes_configuration';
 
 describe('axes_configuration', () => {
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts
index 16529ecd40e90..38d2220904226 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/axes_configuration.ts
@@ -6,13 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { Datatable } from '@kbn/expressions-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { FormatFactory } from '../types';
 import { AxisExtentConfig, DataLayerConfigResult } from '../../common';
-import { Datatable } from '../../../../../plugins/expressions/public';
-import type {
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../plugins/field_formats/common';
 
 interface FormattedMetric {
   layer: string;
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
index ef0cd36e3598e..ee2f5a0325287 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts
@@ -8,7 +8,7 @@
 
 import { uniq, mapValues } from 'lodash';
 import { euiLightVars } from '@kbn/ui-theme';
-import type { Datatable } from '../../../../expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { FormatFactory } from '../types';
 import { isDataLayer } from './visualization';
 import { DataLayerConfigResult, XYLayerConfigResult } from '../../common';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
index 7e15b49c311d4..b81fcd33fccad 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 import { XYChartProps } from '../../common';
 import { getFilteredLayers } from './layers';
 import { isDataLayer } from './visualization';
diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.ts
index 35419c3a40558..ef66baccfde55 100644
--- a/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/helpers/reference_lines.ts
@@ -7,7 +7,7 @@
  */
 
 import { partition } from 'lodash';
-import { Datatable } from '../../../../expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import type { DataLayerConfigResult } from '../../common';
 import { isStackedChart } from './state';
 
diff --git a/src/plugins/chart_expressions/expression_xy/public/plugin.ts b/src/plugins/chart_expressions/expression_xy/public/plugin.ts
index c43e3aae11de7..d08ffc0fd2ec6 100755
--- a/src/plugins/chart_expressions/expression_xy/public/plugin.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/plugin.ts
@@ -7,11 +7,12 @@
  */
 
 import moment from 'moment';
-import { LEGACY_TIME_AXIS } from '../../../charts/common';
-import { DataPublicPluginStart } from '../../../data/public';
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { ChartsPluginStart } from '../../../charts/public';
-import { CoreSetup, CoreStart, IUiSettingsClient } from '../../../../core/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { CoreSetup, CoreStart, IUiSettingsClient } from '@kbn/core/public';
+import { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
 import { ExpressionXyPluginSetup, ExpressionXyPluginStart, SetupDeps } from './types';
 import {
   xyVisFunction,
@@ -27,7 +28,6 @@ import {
   axisTitlesVisibilityConfigFunction,
 } from '../common';
 import { GetStartDepsFn, getXyChartRenderer } from './expression_renderers';
-import { EventAnnotationPluginSetup } from '../../../event_annotation/public';
 
 export interface XYPluginStartDependencies {
   data: DataPublicPluginStart;
diff --git a/src/plugins/chart_expressions/expression_xy/public/types.ts b/src/plugins/chart_expressions/expression_xy/public/types.ts
index 36b8f4c13a776..b58641f2c58fa 100755
--- a/src/plugins/chart_expressions/expression_xy/public/types.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/types.ts
@@ -7,12 +7,12 @@
  */
 
 import { IconType } from '@elastic/eui';
-import { DataPublicPluginSetup } from '../../../data/public';
-import { FieldFormatsSetup } from '../../../field_formats/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { IFieldFormat, SerializedFieldFormat } from '../../../../plugins/field_formats/common';
-import type { RangeSelectContext, ValueClickContext } from '../../../../plugins/embeddable/public';
-import { ExpressionsServiceStart, ExpressionsSetup } from '../../../expressions/public';
+import { DataPublicPluginSetup } from '@kbn/data-plugin/public';
+import { FieldFormatsSetup } from '@kbn/field-formats-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import { ExpressionsServiceStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 
 export interface SetupDeps {
   expressions: ExpressionsSetup;
diff --git a/src/plugins/chart_expressions/expression_xy/server/plugin.ts b/src/plugins/chart_expressions/expression_xy/server/plugin.ts
index ff979fd38e1c6..c16bd2eb28161 100755
--- a/src/plugins/chart_expressions/expression_xy/server/plugin.ts
+++ b/src/plugins/chart_expressions/expression_xy/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 
 import { ExpressionXyPluginSetup, ExpressionXyPluginStart } from './types';
 import {
diff --git a/src/plugins/chart_expressions/expression_xy/server/types.ts b/src/plugins/chart_expressions/expression_xy/server/types.ts
index 738f52b739229..1b6c46927e786 100755
--- a/src/plugins/chart_expressions/expression_xy/server/types.ts
+++ b/src/plugins/chart_expressions/expression_xy/server/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../../expressions/server';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 
 export type ExpressionXyPluginSetup = void;
 export type ExpressionXyPluginStart = void;
diff --git a/src/plugins/charts/common/constants.ts b/src/plugins/charts/common/constants.ts
index 01fdb5e545bb4..6d895dcba26ed 100644
--- a/src/plugins/charts/common/constants.ts
+++ b/src/plugins/charts/common/constants.ts
@@ -20,3 +20,23 @@ export const paletteIds = [
   'warm',
   'gray',
 ];
+
+// This set of defaults originated in Canvas, which, at present, is the primary
+// consumer of this function.  Changing this default requires a change in Canvas
+// logic, which would likely be a breaking change in 7.x.
+export const defaultCustomColors = [
+  '#882E72',
+  '#B178A6',
+  '#D6C1DE',
+  '#1965B0',
+  '#5289C7',
+  '#7BAFDE',
+  '#4EB265',
+  '#90C987',
+  '#CAE0AB',
+  '#F7EE55',
+  '#F6C141',
+  '#F1932D',
+  '#E8601C',
+  '#DC050C',
+];
diff --git a/src/plugins/charts/common/expressions/palette/index.ts b/src/plugins/charts/common/expressions/palette/index.ts
new file mode 100644
index 0000000000000..cb03733a15df5
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { palette } from './palette';
+
+export { systemPalette } from './system_palette';
+export type { SystemPaletteArguments } from './system_palette';
+
+export type {
+  CustomPaletteArguments,
+  CustomPaletteState,
+  PaletteExpressionFunctionDefinition,
+} from './types';
diff --git a/src/plugins/charts/common/palette.test.ts b/src/plugins/charts/common/expressions/palette/palette.test.ts
similarity index 52%
rename from src/plugins/charts/common/palette.test.ts
rename to src/plugins/charts/common/expressions/palette/palette.test.ts
index e2b0680a08ced..771e26ab4aa48 100644
--- a/src/plugins/charts/common/palette.test.ts
+++ b/src/plugins/charts/common/expressions/palette/palette.test.ts
@@ -6,14 +6,9 @@
  * Side Public License, v 1.
  */
 import type { PaletteOutput } from '@kbn/coloring';
-import {
-  palette,
-  defaultCustomColors,
-  systemPalette,
-  CustomPaletteState,
-  CustomPaletteArguments,
-} from './palette';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { palette, CustomPaletteState, CustomPaletteArguments } from '.';
+import { defaultCustomColors } from '../../constants';
 
 describe('palette', () => {
   const fn = functionWrapper(palette()) as (
@@ -21,70 +16,70 @@ describe('palette', () => {
     args?: Partial<CustomPaletteArguments>
   ) => PaletteOutput<CustomPaletteState>;
 
-  it('results a palette', () => {
-    const result = fn(null);
+  it('results a palette', async () => {
+    const result = await fn(null);
     expect(result).toHaveProperty('type', 'palette');
   });
 
   describe('args', () => {
     describe('color', () => {
-      it('sets colors', () => {
-        const result = fn(null, { color: ['red', 'green', 'blue'] });
+      it('sets colors', async () => {
+        const result = await fn(null, { color: ['red', 'green', 'blue'] });
         expect(result.params!.colors).toEqual(['red', 'green', 'blue']);
       });
 
-      it('defaults to pault_tor_14 colors', () => {
-        const result = fn(null);
+      it('defaults to pault_tor_14 colors', async () => {
+        const result = await fn(null);
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
     });
 
     describe('stop', () => {
-      it('sets stops', () => {
-        const result = fn(null, { color: ['red', 'green', 'blue'], stop: [1, 2, 3] });
+      it('sets stops', async () => {
+        const result = await fn(null, { color: ['red', 'green', 'blue'], stop: [1, 2, 3] });
         expect(result.params!.stops).toEqual([1, 2, 3]);
       });
 
-      it('defaults to pault_tor_14 colors', () => {
-        const result = fn(null);
+      it('defaults to pault_tor_14 colors', async () => {
+        const result = await fn(null);
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
     });
 
     describe('gradient', () => {
-      it('sets gradient', () => {
-        let result = fn(null, { gradient: true });
+      it('sets gradient', async () => {
+        let result = await fn(null, { gradient: true });
         expect(result.params).toHaveProperty('gradient', true);
 
-        result = fn(null, { gradient: false });
+        result = await fn(null, { gradient: false });
         expect(result.params).toHaveProperty('gradient', false);
       });
 
-      it('defaults to false', () => {
-        const result = fn(null);
+      it('defaults to false', async () => {
+        const result = await fn(null);
         expect(result.params).toHaveProperty('gradient', false);
       });
     });
 
     describe('reverse', () => {
-      it('reverses order of the colors', () => {
-        const result = fn(null, { reverse: true });
+      it('reverses order of the colors', async () => {
+        const result = await fn(null, { reverse: true });
         expect(result.params!.colors).toEqual(defaultCustomColors.reverse());
       });
 
-      it('keeps the original order of the colors', () => {
-        const result = fn(null, { reverse: false });
+      it('keeps the original order of the colors', async () => {
+        const result = await fn(null, { reverse: false });
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
 
-      it(`defaults to 'false`, () => {
-        const result = fn(null);
+      it(`defaults to 'false`, async () => {
+        const result = await fn(null);
         expect(result.params!.colors).toEqual(defaultCustomColors);
       });
 
-      it('keeps the stops order pristine when set', () => {
+      it('keeps the stops order pristine when set', async () => {
         const stops = [1, 2, 3];
-        const result = fn(null, {
+        const result = await fn(null, {
           color: ['red', 'green', 'blue'],
           stop: [1, 2, 3],
           reverse: true,
@@ -94,20 +89,3 @@ describe('palette', () => {
     });
   });
 });
-
-describe('system_palette', () => {
-  const fn = functionWrapper(systemPalette()) as (
-    context: null,
-    args: { name: string; params?: unknown }
-  ) => PaletteOutput<unknown>;
-
-  it('results a palette', () => {
-    const result = fn(null, { name: 'test' });
-    expect(result).toHaveProperty('type', 'palette');
-  });
-
-  it('returns the name', () => {
-    const result = fn(null, { name: 'test' });
-    expect(result).toHaveProperty('name', 'test');
-  });
-});
diff --git a/src/plugins/charts/common/expressions/palette/palette.ts b/src/plugins/charts/common/expressions/palette/palette.ts
new file mode 100644
index 0000000000000..1875f89020963
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/palette.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { i18n } from '@kbn/i18n';
+import type { PaletteExpressionFunctionDefinition } from './types';
+
+export function palette(): PaletteExpressionFunctionDefinition {
+  return {
+    name: 'palette',
+    aliases: [],
+    type: 'palette',
+    inputTypes: ['null'],
+    help: i18n.translate('charts.functions.paletteHelpText', {
+      defaultMessage: 'Creates a color palette.',
+    }),
+    args: {
+      color: {
+        aliases: ['_'],
+        multi: true,
+        types: ['string'],
+        help: i18n.translate('charts.functions.palette.args.colorHelpText', {
+          defaultMessage:
+            'The palette colors. Accepts an {html} color name, {hex}, {hsl}, {hsla}, {rgb}, or {rgba}.',
+          values: {
+            html: 'HTML',
+            rgb: 'RGB',
+            rgba: 'RGBA',
+            hex: 'HEX',
+            hsl: 'HSL',
+            hsla: 'HSLA',
+          },
+        }),
+        required: false,
+      },
+      stop: {
+        multi: true,
+        types: ['number'],
+        help: i18n.translate('charts.functions.palette.args.stopHelpText', {
+          defaultMessage:
+            'The palette color stops. When used, it must be associated with each color.',
+        }),
+        required: false,
+      },
+      continuity: {
+        types: ['string'],
+        options: ['above', 'below', 'all', 'none'],
+        default: 'above',
+        help: '',
+      },
+      rangeMin: {
+        types: ['number'],
+        help: '',
+      },
+      rangeMax: {
+        types: ['number'],
+        help: '',
+      },
+      range: {
+        types: ['string'],
+        options: ['number', 'percent'],
+        default: 'percent',
+        help: '',
+      },
+      gradient: {
+        types: ['boolean'],
+        default: false,
+        help: i18n.translate('charts.functions.palette.args.gradientHelpText', {
+          defaultMessage: 'Make a gradient palette where supported?',
+        }),
+        options: [true, false],
+      },
+      reverse: {
+        types: ['boolean'],
+        default: false,
+        help: i18n.translate('charts.functions.palette.args.reverseHelpText', {
+          defaultMessage: 'Reverse the palette?',
+        }),
+        options: [true, false],
+      },
+    },
+    async fn(...args) {
+      /** Build optimization: prevent adding extra code into initial bundle **/
+      const { paletteExpressionFn } = await import('./palette_fn');
+      return paletteExpressionFn(...args);
+    },
+  };
+}
diff --git a/src/plugins/charts/common/expressions/palette/palette_fn.ts b/src/plugins/charts/common/expressions/palette/palette_fn.ts
new file mode 100644
index 0000000000000..1702c95ab76e7
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/palette_fn.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { last } from 'lodash';
+import { checkIsMaxContinuity, checkIsMinContinuity } from '@kbn/coloring';
+import type { PaletteExpressionFunctionDefinition } from './types';
+import { defaultCustomColors } from '../../constants';
+
+export const paletteExpressionFn: PaletteExpressionFunctionDefinition['fn'] = async (
+  input,
+  args
+) => {
+  const { color, continuity, reverse, gradient, stop, range, rangeMin, rangeMax } = args;
+  const colors = ([] as string[]).concat(color || defaultCustomColors);
+  const stops = ([] as number[]).concat(stop || []);
+  if (stops.length > 0 && colors.length !== stops.length) {
+    throw Error('When stop is used, each color must have an associated stop value.');
+  }
+
+  // If the user has defined stops, choose rangeMin/Max, provided by user or range,
+  // taken from first/last element of ranges or default range (0 or 100).
+  const calculateRange = (
+    userRange: number | undefined,
+    stopsRange: number | undefined,
+    defaultRange: number
+  ) => userRange ?? stopsRange ?? defaultRange;
+
+  const rangeMinDefault = 0;
+  const rangeMaxDefault = 100;
+
+  return {
+    type: 'palette',
+    name: 'custom',
+    params: {
+      colors: reverse ? colors.reverse() : colors,
+      stops,
+      range: range ?? 'percent',
+      gradient,
+      continuity,
+      rangeMin: checkIsMinContinuity(continuity)
+        ? Number.NEGATIVE_INFINITY
+        : calculateRange(rangeMin, stops[0], rangeMinDefault),
+      rangeMax: checkIsMaxContinuity(continuity)
+        ? Number.POSITIVE_INFINITY
+        : calculateRange(rangeMax, last(stops), rangeMaxDefault),
+    },
+  };
+};
diff --git a/src/plugins/charts/common/expressions/palette/system_palette.test.ts b/src/plugins/charts/common/expressions/palette/system_palette.test.ts
new file mode 100644
index 0000000000000..82c55f99723ea
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/system_palette.test.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { PaletteOutput } from '@kbn/coloring';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { systemPalette } from './system_palette';
+
+describe('system_palette', () => {
+  const fn = functionWrapper(systemPalette()) as (
+    context: null,
+    args: { name: string; params?: unknown }
+  ) => PaletteOutput<unknown>;
+
+  it('results a palette', () => {
+    const result = fn(null, { name: 'test' });
+    expect(result).toHaveProperty('type', 'palette');
+  });
+
+  it('returns the name', () => {
+    const result = fn(null, { name: 'test' });
+    expect(result).toHaveProperty('name', 'test');
+  });
+});
diff --git a/src/plugins/charts/common/expressions/palette/system_palette.ts b/src/plugins/charts/common/expressions/palette/system_palette.ts
new file mode 100644
index 0000000000000..e4bfed538570e
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/system_palette.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { i18n } from '@kbn/i18n';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import type { PaletteOutput } from './types';
+import { paletteIds } from '../../constants';
+
+export interface SystemPaletteArguments {
+  name: string;
+}
+
+export function systemPalette(): ExpressionFunctionDefinition<
+  'system_palette',
+  null,
+  SystemPaletteArguments,
+  PaletteOutput
+> {
+  return {
+    name: 'system_palette',
+    aliases: [],
+    type: 'palette',
+    inputTypes: ['null'],
+    help: i18n.translate('charts.functions.systemPaletteHelpText', {
+      defaultMessage: 'Creates a dynamic color palette.',
+    }),
+    args: {
+      name: {
+        types: ['string'],
+        help: i18n.translate('charts.functions.systemPalette.args.nameHelpText', {
+          defaultMessage: 'Name of the palette in the palette list',
+        }),
+        options: paletteIds,
+      },
+    },
+    fn: (input, args) => {
+      return {
+        type: 'palette',
+        name: args.name,
+      };
+    },
+  };
+}
diff --git a/src/plugins/charts/common/expressions/palette/types.ts b/src/plugins/charts/common/expressions/palette/types.ts
new file mode 100644
index 0000000000000..12fef842674f1
--- /dev/null
+++ b/src/plugins/charts/common/expressions/palette/types.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { PaletteContinuity } from '@kbn/coloring';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+
+export interface PaletteOutput<T = { [key: string]: unknown }> {
+  type: 'palette' | 'system_palette';
+  name: string;
+  params?: T;
+}
+
+export interface CustomPaletteArguments {
+  color?: string[];
+  gradient: boolean;
+  reverse?: boolean;
+  stop?: number[];
+  range?: 'number' | 'percent';
+  rangeMin?: number;
+  rangeMax?: number;
+  continuity?: PaletteContinuity;
+}
+
+export interface CustomPaletteState {
+  colors: string[];
+  gradient: boolean;
+  stops: number[];
+  range: 'number' | 'percent';
+  rangeMin: number;
+  rangeMax: number;
+  continuity?: PaletteContinuity;
+}
+
+export type PaletteExpressionFunctionDefinition = ExpressionFunctionDefinition<
+  'palette',
+  null,
+  CustomPaletteArguments,
+  Promise<PaletteOutput<CustomPaletteState>>
+>;
diff --git a/src/plugins/charts/common/index.ts b/src/plugins/charts/common/index.ts
index 5ad9eb264e78b..74389ce43990f 100644
--- a/src/plugins/charts/common/index.ts
+++ b/src/plugins/charts/common/index.ts
@@ -9,11 +9,14 @@
 export const COLOR_MAPPING_SETTING = 'visualization:colorMapping';
 export const LEGACY_TIME_AXIS = 'visualization:useLegacyTimeAxis';
 
-export type { CustomPaletteArguments, CustomPaletteState, SystemPaletteArguments } from './palette';
+export type {
+  CustomPaletteArguments,
+  CustomPaletteState,
+  SystemPaletteArguments,
+} from './expressions/palette';
+export { palette, systemPalette } from './expressions/palette';
 
-export { defaultCustomColors, palette, systemPalette } from './palette';
-
-export { paletteIds } from './constants';
+export { paletteIds, defaultCustomColors } from './constants';
 export type { ColorSchema, RawColorSchema, ColorMap } from './static';
 export {
   ColorSchemas,
@@ -29,11 +32,3 @@ export {
 } from './static';
 
 export type { ColorSchemaParams, Labels, Style } from './types';
-
-/** @deprecated **/
-/** Please import directly from @kbn/coloring **/
-export { checkIsMinContinuity, checkIsMaxContinuity } from '@kbn/coloring';
-
-/** @deprecated **/
-/** Please import directly from @kbn/coloring **/
-export type { PaletteOutput, PaletteContinuity } from '@kbn/coloring';
diff --git a/src/plugins/charts/common/palette.ts b/src/plugins/charts/common/palette.ts
deleted file mode 100644
index 508fc8f11a70e..0000000000000
--- a/src/plugins/charts/common/palette.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import type { PaletteContinuity } from '@kbn/coloring';
-import { i18n } from '@kbn/i18n';
-import { checkIsMaxContinuity, checkIsMinContinuity } from '@kbn/coloring';
-import { last } from 'lodash';
-import { paletteIds } from './constants';
-
-export interface CustomPaletteArguments {
-  color?: string[];
-  gradient: boolean;
-  reverse?: boolean;
-  stop?: number[];
-  range?: 'number' | 'percent';
-  rangeMin?: number;
-  rangeMax?: number;
-  continuity?: PaletteContinuity;
-}
-
-export interface CustomPaletteState {
-  colors: string[];
-  gradient: boolean;
-  stops: number[];
-  range: 'number' | 'percent';
-  rangeMin: number;
-  rangeMax: number;
-  continuity?: PaletteContinuity;
-}
-
-export interface SystemPaletteArguments {
-  name: string;
-}
-
-export interface PaletteOutput<T = { [key: string]: unknown }> {
-  type: 'palette' | 'system_palette';
-  name: string;
-  params?: T;
-}
-
-export const defaultCustomColors = [
-  // This set of defaults originated in Canvas, which, at present, is the primary
-  // consumer of this function.  Changing this default requires a change in Canvas
-  // logic, which would likely be a breaking change in 7.x.
-  '#882E72',
-  '#B178A6',
-  '#D6C1DE',
-  '#1965B0',
-  '#5289C7',
-  '#7BAFDE',
-  '#4EB265',
-  '#90C987',
-  '#CAE0AB',
-  '#F7EE55',
-  '#F6C141',
-  '#F1932D',
-  '#E8601C',
-  '#DC050C',
-];
-
-export function palette(): ExpressionFunctionDefinition<
-  'palette',
-  null,
-  CustomPaletteArguments,
-  PaletteOutput<CustomPaletteState>
-> {
-  return {
-    name: 'palette',
-    aliases: [],
-    type: 'palette',
-    inputTypes: ['null'],
-    help: i18n.translate('charts.functions.paletteHelpText', {
-      defaultMessage: 'Creates a color palette.',
-    }),
-    args: {
-      color: {
-        aliases: ['_'],
-        multi: true,
-        types: ['string'],
-        help: i18n.translate('charts.functions.palette.args.colorHelpText', {
-          defaultMessage:
-            'The palette colors. Accepts an {html} color name, {hex}, {hsl}, {hsla}, {rgb}, or {rgba}.',
-          values: {
-            html: 'HTML',
-            rgb: 'RGB',
-            rgba: 'RGBA',
-            hex: 'HEX',
-            hsl: 'HSL',
-            hsla: 'HSLA',
-          },
-        }),
-        required: false,
-      },
-      stop: {
-        multi: true,
-        types: ['number'],
-        help: i18n.translate('charts.functions.palette.args.stopHelpText', {
-          defaultMessage:
-            'The palette color stops. When used, it must be associated with each color.',
-        }),
-        required: false,
-      },
-      continuity: {
-        types: ['string'],
-        options: ['above', 'below', 'all', 'none'],
-        default: 'above',
-        help: '',
-      },
-      rangeMin: {
-        types: ['number'],
-        help: '',
-      },
-      rangeMax: {
-        types: ['number'],
-        help: '',
-      },
-      range: {
-        types: ['string'],
-        options: ['number', 'percent'],
-        default: 'percent',
-        help: '',
-      },
-      gradient: {
-        types: ['boolean'],
-        default: false,
-        help: i18n.translate('charts.functions.palette.args.gradientHelpText', {
-          defaultMessage: 'Make a gradient palette where supported?',
-        }),
-        options: [true, false],
-      },
-      reverse: {
-        types: ['boolean'],
-        default: false,
-        help: i18n.translate('charts.functions.palette.args.reverseHelpText', {
-          defaultMessage: 'Reverse the palette?',
-        }),
-        options: [true, false],
-      },
-    },
-    fn: (input, args) => {
-      const { color, continuity, reverse, gradient, stop, range, rangeMin, rangeMax } = args;
-      const colors = ([] as string[]).concat(color || defaultCustomColors);
-      const stops = ([] as number[]).concat(stop || []);
-      if (stops.length > 0 && colors.length !== stops.length) {
-        throw Error('When stop is used, each color must have an associated stop value.');
-      }
-
-      // If the user has defined stops, choose rangeMin/Max, provided by user or range,
-      // taken from first/last element of ranges or default range (0 or 100).
-      const calculateRange = (
-        userRange: number | undefined,
-        stopsRange: number | undefined,
-        defaultRange: number
-      ) => userRange ?? stopsRange ?? defaultRange;
-
-      const rangeMinDefault = 0;
-      const rangeMaxDefault = 100;
-
-      return {
-        type: 'palette',
-        name: 'custom',
-        params: {
-          colors: reverse ? colors.reverse() : colors,
-          stops,
-          range: range ?? 'percent',
-          gradient,
-          continuity,
-          rangeMin: checkIsMinContinuity(continuity)
-            ? Number.NEGATIVE_INFINITY
-            : calculateRange(rangeMin, stops[0], rangeMinDefault),
-          rangeMax: checkIsMaxContinuity(continuity)
-            ? Number.POSITIVE_INFINITY
-            : calculateRange(rangeMax, last(stops), rangeMaxDefault),
-        },
-      };
-    },
-  };
-}
-
-export function systemPalette(): ExpressionFunctionDefinition<
-  'system_palette',
-  null,
-  SystemPaletteArguments,
-  PaletteOutput
-> {
-  return {
-    name: 'system_palette',
-    aliases: [],
-    type: 'palette',
-    inputTypes: ['null'],
-    help: i18n.translate('charts.functions.systemPaletteHelpText', {
-      defaultMessage: 'Creates a dynamic color palette.',
-    }),
-    args: {
-      name: {
-        types: ['string'],
-        help: i18n.translate('charts.functions.systemPalette.args.nameHelpText', {
-          defaultMessage: 'Name of the palette in the palette list',
-        }),
-        options: paletteIds,
-      },
-    },
-    fn: (input, args) => {
-      return {
-        type: 'palette',
-        name: args.name,
-      };
-    },
-  };
-}
diff --git a/src/plugins/charts/public/index.ts b/src/plugins/charts/public/index.ts
index 666bd1cc9ad4f..d6cae90d50057 100644
--- a/src/plugins/charts/public/index.ts
+++ b/src/plugins/charts/public/index.ts
@@ -42,7 +42,3 @@ export {
   LabelRotation,
   defaultCountLabel,
 } from '../common';
-
-/** @deprecated **/
-/** Please import directly from @kbn/coloring **/
-export type { SeriesLayer, PaletteRegistry, PaletteOutput, PaletteDefinition } from '@kbn/coloring';
diff --git a/src/plugins/charts/public/plugin.ts b/src/plugins/charts/public/plugin.ts
index 7802cef3b4934..2313e452b6d06 100644
--- a/src/plugins/charts/public/plugin.ts
+++ b/src/plugins/charts/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
-import { ExpressionsSetup } from '../../expressions/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { palette, systemPalette } from '../common';
 
 import { ThemeService, LegacyColorsService } from './services';
diff --git a/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts b/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts
index 7f840c858d603..ad0dbb4f5e363 100644
--- a/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts
+++ b/src/plugins/charts/public/services/active_cursor/active_cursor.test.ts
@@ -22,8 +22,8 @@ describe('ActiveCursor', () => {
 
     expect(activeCursor.activeCursor$).toMatchInlineSnapshot(`
       Subject {
-        "_isScalar": false,
         "closed": false,
+        "currentObservers": null,
         "hasError": false,
         "isStopped": false,
         "observers": Array [],
diff --git a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts
index 6bccc456edbb0..e79db95615bb2 100644
--- a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts
+++ b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { parseSyncOptions } from './active_cursor_utils';
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
 describe('active_cursor_utils', () => {
   describe('parseSyncOptions', () => {
diff --git a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts
index 37eeb6bf2d820..bd0bc16d7c977 100644
--- a/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts
+++ b/src/plugins/charts/public/services/active_cursor/active_cursor_utils.ts
@@ -7,7 +7,7 @@
  */
 import { uniq } from 'lodash';
 
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { ActiveCursorSyncOption, DateHistogramSyncOption } from './types';
 import type { ActiveCursorPayload } from './types';
 
diff --git a/src/plugins/charts/public/services/active_cursor/types.ts b/src/plugins/charts/public/services/active_cursor/types.ts
index 0b0180a622efb..0e8bff9af9175 100644
--- a/src/plugins/charts/public/services/active_cursor/types.ts
+++ b/src/plugins/charts/public/services/active_cursor/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PointerEvent } from '@elastic/charts';
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
 /** @public **/
 export type ActiveCursorSyncOption = DateHistogramSyncOption | DatatablesSyncOption;
diff --git a/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts b/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts
index 04d9297ed1d8c..4cc5e747dcef6 100644
--- a/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts
+++ b/src/plugins/charts/public/services/active_cursor/use_active_cursor.test.ts
@@ -13,9 +13,10 @@ import { useActiveCursor } from './use_active_cursor';
 
 import type { ActiveCursorSyncOption, ActiveCursorPayload } from './types';
 import type { Chart, PointerEvent } from '@elastic/charts';
-import type { Datatable } from '../../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
-describe('useActiveCursor', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/130177
+describe.skip('useActiveCursor', () => {
   let cursor: ActiveCursorPayload['cursor'];
   let dispatchExternalPointerEvent: jest.Mock;
 
diff --git a/src/plugins/charts/public/services/legacy_colors/colors.test.ts b/src/plugins/charts/public/services/legacy_colors/colors.test.ts
index d18331bd4c8c2..a1e8f55faf383 100644
--- a/src/plugins/charts/public/services/legacy_colors/colors.test.ts
+++ b/src/plugins/charts/public/services/legacy_colors/colors.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { COLOR_MAPPING_SETTING } from '../../../common';
 import { seedColors } from '../../static/colors';
 import { LegacyColorsService } from './colors';
diff --git a/src/plugins/charts/public/services/legacy_colors/colors.ts b/src/plugins/charts/public/services/legacy_colors/colors.ts
index b01347f461c5a..b2e04cce72f9f 100644
--- a/src/plugins/charts/public/services/legacy_colors/colors.ts
+++ b/src/plugins/charts/public/services/legacy_colors/colors.ts
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { MappedColors } from '../mapped_colors';
 import { seedColors } from '../../static/colors';
diff --git a/src/plugins/charts/public/services/legacy_colors/mock.ts b/src/plugins/charts/public/services/legacy_colors/mock.ts
index 0216025d53e80..f884ac23c19b8 100644
--- a/src/plugins/charts/public/services/legacy_colors/mock.ts
+++ b/src/plugins/charts/public/services/legacy_colors/mock.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { LegacyColorsService } from './colors';
-import { coreMock } from '../../../../../core/public/mocks';
 
 const colors = new LegacyColorsService();
 colors.init(coreMock.createSetup().uiSettings);
diff --git a/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts b/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts
index df52105a7f2e9..529a1c43c989d 100644
--- a/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts
+++ b/src/plugins/charts/public/services/mapped_colors/mapped_colors.test.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import Color from 'color';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { COLOR_MAPPING_SETTING } from '../../../common';
 import { seedColors } from '../../static/colors';
 import { MappedColors } from './mapped_colors';
diff --git a/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts b/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts
index 71ad283132978..bbcb5b22f32df 100644
--- a/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts
+++ b/src/plugins/charts/public/services/mapped_colors/mapped_colors.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import Color from 'color';
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { COLOR_MAPPING_SETTING } from '../../../common';
 import { createColorPalette } from '../../static/colors';
diff --git a/src/plugins/charts/public/services/palettes/palettes.test.tsx b/src/plugins/charts/public/services/palettes/palettes.test.tsx
index 0acda6990cf9c..a5aad8c1cb8bc 100644
--- a/src/plugins/charts/public/services/palettes/palettes.test.tsx
+++ b/src/plugins/charts/public/services/palettes/palettes.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteDefinition } from '@kbn/coloring';
-import { createColorPalette as createLegacyColorPalette } from '../../../../../../src/plugins/charts/public';
+import { createColorPalette as createLegacyColorPalette } from '../..';
 import { buildPalettes } from './palettes';
 import { colorsServiceMock } from '../legacy_colors/mock';
 import { euiPaletteColorBlind, euiPaletteColorBlindBehindText } from '@elastic/eui';
diff --git a/src/plugins/charts/public/services/palettes/palettes.tsx b/src/plugins/charts/public/services/palettes/palettes.tsx
index d6d8fd718cb55..e2ccb239f5a6c 100644
--- a/src/plugins/charts/public/services/palettes/palettes.tsx
+++ b/src/plugins/charts/public/services/palettes/palettes.tsx
@@ -23,10 +23,7 @@ import {
 } from '@elastic/eui';
 import type { ChartColorConfiguration, PaletteDefinition, SeriesLayer } from '@kbn/coloring';
 import { flatten, zip } from 'lodash';
-import {
-  ChartsPluginSetup,
-  createColorPalette as createLegacyColorPalette,
-} from '../../../../../../src/plugins/charts/public';
+import { ChartsPluginSetup, createColorPalette as createLegacyColorPalette } from '../..';
 import { lightenColor } from './lighten_color';
 import { LegacyColorsService } from '../legacy_colors';
 import { MappedColors } from '../mapped_colors';
diff --git a/src/plugins/charts/public/services/palettes/service.ts b/src/plugins/charts/public/services/palettes/service.ts
index d3c4a4ded3efa..0608c897f6306 100644
--- a/src/plugins/charts/public/services/palettes/service.ts
+++ b/src/plugins/charts/public/services/palettes/service.ts
@@ -7,8 +7,8 @@
  */
 
 import type { PaletteRegistry, PaletteDefinition } from '@kbn/coloring';
-import type { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
-import type { ChartsPluginSetup } from '../../../../../../src/plugins/charts/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ChartsPluginSetup } from '../..';
 import type { LegacyColorsService } from '../legacy_colors';
 
 export interface PaletteSetupPlugins {
diff --git a/src/plugins/charts/public/services/theme/theme.test.tsx b/src/plugins/charts/public/services/theme/theme.test.tsx
index 5154c1ce5ad63..9c9fca6f68b56 100644
--- a/src/plugins/charts/public/services/theme/theme.test.tsx
+++ b/src/plugins/charts/public/services/theme/theme.test.tsx
@@ -16,7 +16,7 @@ import { LIGHT_THEME, DARK_THEME } from '@elastic/charts';
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 
 import { ThemeService } from './theme';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const { uiSettings: setupMockUiSettings } = coreMock.createSetup();
 
diff --git a/src/plugins/charts/public/services/theme/theme.ts b/src/plugins/charts/public/services/theme/theme.ts
index 4397084d890ae..1e5053b473870 100644
--- a/src/plugins/charts/public/services/theme/theme.ts
+++ b/src/plugins/charts/public/services/theme/theme.ts
@@ -9,7 +9,7 @@
 import { useEffect, useRef, useState } from 'react';
 import { Observable, BehaviorSubject } from 'rxjs';
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { DARK_THEME, LIGHT_THEME, PartialTheme, Theme } from '@elastic/charts';
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 
diff --git a/src/plugins/charts/public/static/components/color_picker.scss b/src/plugins/charts/public/static/components/color_picker.scss
deleted file mode 100644
index 5def2b75a4c50..0000000000000
--- a/src/plugins/charts/public/static/components/color_picker.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-$visColorPickerWidth: $euiSizeL * 8; // 8 columns
-
-.visColorPicker__value {
-  width: $visColorPickerWidth;
-}
-
-.visColorPicker__colorBtn {
-  position: relative;
-
-  input[type='radio'] {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    opacity: 0;
-    transform: translate(-50%, -50%);
-  }
-}
-
-.visColorPicker__valueDot {
-  cursor: pointer;
-
-  &:hover {
-    transform: scale(1.4);
-  }
-
-  &-isSelected {
-    border: $euiSizeXS solid;
-    border-radius: 100%;
-  }
-}
diff --git a/src/plugins/charts/public/static/components/color_picker.tsx b/src/plugins/charts/public/static/components/color_picker.tsx
index 25c210b87a0e1..edd68ce6dbbba 100644
--- a/src/plugins/charts/public/static/components/color_picker.tsx
+++ b/src/plugins/charts/public/static/components/color_picker.tsx
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import classNames from 'classnames';
-import React, { BaseSyntheticEvent } from 'react';
-
+import React, { BaseSyntheticEvent, useMemo } from 'react';
+import { css } from '@emotion/react';
 import {
   EuiButtonEmpty,
   EuiFlexItem,
@@ -16,10 +15,10 @@ import {
   euiPaletteColorBlind,
   EuiScreenReaderOnly,
   EuiFlexGroup,
+  useEuiTheme,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { lightenColor } from '../../services/palettes/lighten_color';
-import './color_picker.scss';
 
 export const legacyColors: string[] = [
   '#3F6833',
@@ -80,7 +79,7 @@ export const legacyColors: string[] = [
   '#DEDAF7',
 ];
 
-interface ColorPickerProps {
+export interface ColorPickerProps {
   /**
    * Label that characterizes the color that is going to change
    */
@@ -116,6 +115,24 @@ interface ColorPickerProps {
 }
 const euiColors = euiPaletteColorBlind({ rotations: 4, order: 'group' });
 
+const visColorPickerColorBtnStyle = css`
+  position: relative;
+  input[type='radio'] {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    opacity: 0;
+    transform: translate(-50%, -50%);
+  }
+`;
+
+const visColorPickerValueDotStyle = css`
+  cursor: pointer;
+  &:hover {
+    transform: scale(1.4);
+  }
+`;
+
 export const ColorPicker = ({
   onChange,
   color: selectedColor,
@@ -127,6 +144,22 @@ export const ColorPicker = ({
   layerIndex,
 }: ColorPickerProps) => {
   const legendColors = useLegacyColors ? legacyColors : euiColors;
+  const { euiTheme } = useEuiTheme();
+
+  const visColorPickerValueStyle = useMemo(
+    () => css`
+      width: calc(${euiTheme.size.l} * 8);
+    `,
+    [euiTheme.size.l]
+  );
+
+  const visColorPickerValueDotSelectedStyle = useMemo(
+    () => css`
+      border: ${euiTheme.size.xs} solid;
+      border-radius: 100%;
+    `,
+    [euiTheme.size.xs]
+  );
 
   return (
     <div className="visColorPicker">
@@ -140,9 +173,18 @@ export const ColorPicker = ({
             />
           </legend>
         </EuiScreenReaderOnly>
-        <EuiFlexGroup wrap={true} gutterSize="none" className="visColorPicker__value">
+        <EuiFlexGroup
+          wrap={true}
+          gutterSize="none"
+          css={visColorPickerValueStyle}
+          className="visColorPicker__value"
+        >
           {legendColors.map((color) => (
-            <label key={color} className="visColorPicker__colorBtn">
+            <label
+              key={color}
+              css={visColorPickerColorBtnStyle}
+              className="visColorPicker__colorBtn"
+            >
               <input
                 type="radio"
                 onChange={(e) => onChange(color, e)}
@@ -155,9 +197,11 @@ export const ColorPicker = ({
                 type="dot"
                 size="l"
                 color={selectedColor}
-                className={classNames('visColorPicker__valueDot', {
-                  'visColorPicker__valueDot-isSelected': color === selectedColor,
-                })}
+                css={[
+                  visColorPickerValueDotStyle,
+                  color === selectedColor ? visColorPickerValueDotSelectedStyle : null,
+                ]}
+                className="visColorPicker__valueDot"
                 style={{ color }}
                 data-test-subj={`visColorPickerColor-${color}`}
               />
diff --git a/src/plugins/charts/public/static/components/common_chart_styles.scss b/src/plugins/charts/public/static/components/common_chart_styles.scss
deleted file mode 100644
index a6ced495795c8..0000000000000
--- a/src/plugins/charts/public/static/components/common_chart_styles.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.chart-icon__subdued {
-  fill: $euiTextSubduedColor;
-}
-
-.chart-icon__accent {
-  fill: $euiColorVis0;
-}
\ No newline at end of file
diff --git a/src/plugins/charts/public/static/components/common_chart_styles.ts b/src/plugins/charts/public/static/components/common_chart_styles.ts
new file mode 100644
index 0000000000000..3050b5f4a74ba
--- /dev/null
+++ b/src/plugins/charts/public/static/components/common_chart_styles.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { css } from '@emotion/react';
+import { useEuiTheme } from '@elastic/eui';
+import { euiThemeVars } from '@kbn/ui-theme';
+
+import { useMemo } from 'react';
+
+export const useCommonChartStyles = () => {
+  const { euiTheme } = useEuiTheme();
+
+  const subdued = useMemo(
+    () => css`
+      fill: ${euiTheme.colors.subdued};
+    `,
+    [euiTheme.colors.subdued]
+  );
+
+  const accent = css`
+    fill: ${euiThemeVars.euiColorVis0};
+  `;
+
+  return {
+    chartIcon: { subdued, accent },
+  };
+};
diff --git a/src/plugins/charts/public/static/components/empty_placeholder.scss b/src/plugins/charts/public/static/components/empty_placeholder.scss
deleted file mode 100644
index 3f98da9eecb6a..0000000000000
--- a/src/plugins/charts/public/static/components/empty_placeholder.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.chart__empty-placeholder {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
\ No newline at end of file
diff --git a/src/plugins/charts/public/static/components/empty_placeholder.tsx b/src/plugins/charts/public/static/components/empty_placeholder.tsx
index e4559a0890ff2..15235acfeb2a7 100644
--- a/src/plugins/charts/public/static/components/empty_placeholder.tsx
+++ b/src/plugins/charts/public/static/components/empty_placeholder.tsx
@@ -9,8 +9,23 @@
 import React from 'react';
 import { EuiIcon, EuiText, IconType, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import './empty_placeholder.scss';
-import classnames from 'classnames';
+import { css } from '@emotion/react';
+
+export interface EmptyPlaceholderProps {
+  icon: IconType;
+  iconColor?: string;
+  message?: JSX.Element;
+  dataTestSubj?: string;
+  className?: string;
+}
+
+const style = css`
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+`;
 
 export const EmptyPlaceholder = ({
   icon,
@@ -18,24 +33,17 @@ export const EmptyPlaceholder = ({
   message = <FormattedMessage id="charts.noDataLabel" defaultMessage="No results found" />,
   dataTestSubj = 'emptyPlaceholder',
   className,
-}: {
-  icon: IconType;
-  iconColor?: string;
-  message?: JSX.Element;
-  dataTestSubj?: string;
-  className?: string;
-}) => (
-  <>
-    <EuiText
-      data-test-subj={dataTestSubj}
-      className={classnames('chart__empty-placeholder', className)}
-      textAlign="center"
-      color="subdued"
-      size="xs"
-    >
-      <EuiIcon type={icon} color={iconColor} size="l" />
-      <EuiSpacer size="s" />
-      <p>{message}</p>
-    </EuiText>
-  </>
+}: EmptyPlaceholderProps) => (
+  <EuiText
+    data-test-subj={dataTestSubj}
+    css={style}
+    className={className}
+    textAlign="center"
+    color="subdued"
+    size="xs"
+  >
+    <EuiIcon type={icon} color={iconColor} size="l" />
+    <EuiSpacer size="s" />
+    <p>{message}</p>
+  </EuiText>
 );
diff --git a/src/plugins/charts/public/static/components/index.ts b/src/plugins/charts/public/static/components/index.ts
index ece0b085eff9c..ea621c68e450a 100644
--- a/src/plugins/charts/public/static/components/index.ts
+++ b/src/plugins/charts/public/static/components/index.ts
@@ -6,9 +6,45 @@
  * Side Public License, v 1.
  */
 
-export { LegendToggle } from './legend_toggle';
-export { ColorPicker } from './color_picker';
+import React from 'react';
+import { withSuspense } from '@kbn/shared-ux-utility';
+
 export { CurrentTime } from './current_time';
 export { EmptyPlaceholder } from './empty_placeholder';
-import './common_chart_styles.scss';
+
+export { useCommonChartStyles } from './common_chart_styles';
 export * from './endzones';
+
+/**
+ * The Lazily-loaded `ColorPicker` component.  Consumers should use `React.Suspense` or
+ * the withSuspense` HOC to load this component.
+ */
+export const ColorPickerLazy = React.lazy(() =>
+  import('./color_picker').then(({ ColorPicker }) => ({
+    default: ColorPicker,
+  }))
+);
+
+/**
+ * A `ColorPicker` component that is wrapped by the `withSuspense` HOC. This component can
+ * be used directly by consumers and will load the `ColorPickerLazy` component lazily with
+ * a predefined fallback and error boundary.
+ */
+export const ColorPicker = withSuspense(ColorPickerLazy);
+
+/**
+ * The Lazily-loaded `LegendToggle` component.  Consumers should use `React.Suspense` or
+ * the withSuspense` HOC to load this component.
+ */
+export const LegendToggleLazy = React.lazy(() =>
+  import('./legend_toggle').then(({ LegendToggle }) => ({
+    default: LegendToggle,
+  }))
+);
+
+/**
+ * A `LegendToggle` component that is wrapped by the `withSuspense` HOC. This component can
+ * be used directly by consumers and will load the `LegendToggleLazy` component lazily with
+ * a predefined fallback and error boundary.
+ */
+export const LegendToggle = withSuspense(LegendToggleLazy);
diff --git a/src/plugins/charts/public/static/components/legend_toggle.scss b/src/plugins/charts/public/static/components/legend_toggle.scss
deleted file mode 100644
index 3df799d4bcda4..0000000000000
--- a/src/plugins/charts/public/static/components/legend_toggle.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.echLegend__toggle {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-  margin: $euiSizeXS;
-
-  &--isOpen {
-    background-color: $euiColorLightestShade;
-  }
-
-  &--position-left,
-  &--position-bottom {
-    left: auto;
-    bottom: auto;
-    right: 0;
-    top: 0;
-  }
-}
diff --git a/src/plugins/charts/public/static/components/legend_toggle.tsx b/src/plugins/charts/public/static/components/legend_toggle.tsx
index 8bb4f47838de5..0630fef080323 100644
--- a/src/plugins/charts/public/static/components/legend_toggle.tsx
+++ b/src/plugins/charts/public/static/components/legend_toggle.tsx
@@ -7,15 +7,12 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import classNames from 'classnames';
-
 import { i18n } from '@kbn/i18n';
-import { htmlIdGenerator, EuiButtonIcon } from '@elastic/eui';
+import { htmlIdGenerator, EuiButtonIcon, useEuiTheme } from '@elastic/eui';
 import { Position } from '@elastic/charts';
+import { css } from '@emotion/react';
 
-import './legend_toggle.scss';
-
-interface LegendToggleProps {
+export interface LegendToggleProps {
   onClick: () => void;
   showLegend: boolean;
   legendPosition: Position;
@@ -23,6 +20,35 @@ interface LegendToggleProps {
 
 const LegendToggleComponent = ({ onClick, showLegend, legendPosition }: LegendToggleProps) => {
   const legendId = useMemo(() => htmlIdGenerator()('legend'), []);
+  const { euiTheme } = useEuiTheme();
+
+  const baseStyles = useMemo(
+    () => css`
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      z-index: 1;
+      margin: ${euiTheme.size.xs};
+    `,
+    [euiTheme.size.xs]
+  );
+
+  const isOpenStyle = useMemo(
+    () => css`
+      background-color: ${euiTheme.colors.lightestShade};
+    `,
+    [euiTheme.colors.lightestShade]
+  );
+
+  const positionStyle = useMemo(
+    () => css`
+      left: auto;
+      bottom: auto;
+      right: 0;
+      top: 0;
+    `,
+    []
+  );
 
   return (
     <EuiButtonIcon
@@ -30,9 +56,11 @@ const LegendToggleComponent = ({ onClick, showLegend, legendPosition }: LegendTo
       iconType="list"
       color="text"
       onClick={onClick}
-      className={classNames('echLegend__toggle', `echLegend__toggle--position-${legendPosition}`, {
-        'echLegend__toggle--isOpen': showLegend,
-      })}
+      css={[
+        baseStyles,
+        showLegend ? isOpenStyle : null,
+        ['left', 'bottom'].includes(legendPosition) ? positionStyle : null,
+      ]}
       aria-label={i18n.translate('charts.legend.toggleLegendButtonAriaLabel', {
         defaultMessage: 'Toggle legend',
       })}
diff --git a/src/plugins/charts/public/static/utils/transform_click_event.ts b/src/plugins/charts/public/static/utils/transform_click_event.ts
index ae255455b39b1..3d0cc2b47b215 100644
--- a/src/plugins/charts/public/static/utils/transform_click_event.ts
+++ b/src/plugins/charts/public/static/utils/transform_click_event.ts
@@ -15,8 +15,8 @@ import {
   Datum,
 } from '@elastic/charts';
 
-import { RangeSelectContext, ValueClickContext } from '../../../../embeddable/public';
-import { Datatable } from '../../../../expressions/public';
+import { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 
 export interface ClickTriggerEvent {
   name: 'filterBucket';
diff --git a/src/plugins/charts/server/plugin.ts b/src/plugins/charts/server/plugin.ts
index 86c90c73c38b0..b27e262e99aee 100644
--- a/src/plugins/charts/server/plugin.ts
+++ b/src/plugins/charts/server/plugin.ts
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { COLOR_MAPPING_SETTING, LEGACY_TIME_AXIS, palette, systemPalette } from '../common';
-import { ExpressionsServerSetup } from '../../expressions/server';
 
 interface SetupDependencies {
   expressions: ExpressionsServerSetup;
diff --git a/src/plugins/console/kibana.json b/src/plugins/console/kibana.json
index e2345514d76b9..0387b909704b6 100644
--- a/src/plugins/console/kibana.json
+++ b/src/plugins/console/kibana.json
@@ -11,5 +11,5 @@
   "configPath": ["console"],
   "requiredPlugins": ["devTools", "share"],
   "optionalPlugins": ["usageCollection", "home"],
-  "requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils", "home"]
+  "requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils"]
 }
diff --git a/src/plugins/console/public/application/components/console_menu.tsx b/src/plugins/console/public/application/components/console_menu.tsx
index 4769765715a65..159c0d600308f 100644
--- a/src/plugins/console/public/application/components/console_menu.tsx
+++ b/src/plugins/console/public/application/components/console_menu.tsx
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 
-import { NotificationsSetup } from 'src/core/public';
+import { NotificationsSetup } from '@kbn/core/public';
 
 import {
   EuiIcon,
diff --git a/src/plugins/console/public/application/components/help_panel.tsx b/src/plugins/console/public/application/components/help_panel.tsx
index 50238006f6ce2..ed57d3178df4b 100644
--- a/src/plugins/console/public/application/components/help_panel.tsx
+++ b/src/plugins/console/public/application/components/help_panel.tsx
@@ -140,6 +140,13 @@ export function HelpPanel(props: Props) {
                 defaultMessage="Select the currently selected or the top most term in auto-complete menu"
               />
             </dd>
+            <dt>Ctrl/Cmd + L</dt>
+            <dd>
+              <FormattedMessage
+                id="console.helpPage.keyboardCommands.goToLineNumberDescription"
+                defaultMessage="Go to line number"
+              />
+            </dd>
             <dt>Esc</dt>
             <dd>
               <FormattedMessage
diff --git a/src/plugins/console/public/application/components/settings_modal.tsx b/src/plugins/console/public/application/components/settings_modal.tsx
index eafc2dea3f873..71ab14001c2c2 100644
--- a/src/plugins/console/public/application/components/settings_modal.tsx
+++ b/src/plugins/console/public/application/components/settings_modal.tsx
@@ -27,6 +27,8 @@ import {
 } from '@elastic/eui';
 
 import { DevToolsSettings } from '../../services';
+import { unregisterCommands } from '../containers/editor/legacy/console_editor/keyboard_shortcuts';
+import type { SenseEditor } from '../models';
 
 export type AutocompleteOptions = 'fields' | 'indices' | 'templates';
 
@@ -62,6 +64,7 @@ interface Props {
   onClose: () => void;
   refreshAutocompleteSettings: (selectedSettings: DevToolsSettings['autocomplete']) => void;
   settings: DevToolsSettings;
+  editorInstance: SenseEditor | null;
 }
 
 export function DevToolsSettingsModal(props: Props) {
@@ -74,7 +77,10 @@ export function DevToolsSettingsModal(props: Props) {
   const [polling, setPolling] = useState(props.settings.polling);
   const [pollInterval, setPollInterval] = useState(props.settings.pollInterval);
   const [tripleQuotes, setTripleQuotes] = useState(props.settings.tripleQuotes);
-  const [historyDisabled, setHistoryDisabled] = useState(props.settings.historyDisabled);
+  const [isHistoryDisabled, setIsHistoryDisabled] = useState(props.settings.isHistoryDisabled);
+  const [isKeyboardShortcutsDisabled, setIsKeyboardShortcutsDisabled] = useState(
+    props.settings.isKeyboardShortcutsDisabled
+  );
 
   const autoCompleteCheckboxes = [
     {
@@ -134,7 +140,8 @@ export function DevToolsSettingsModal(props: Props) {
       polling,
       pollInterval,
       tripleQuotes,
-      historyDisabled,
+      isHistoryDisabled,
+      isKeyboardShortcutsDisabled,
     });
   }
 
@@ -145,6 +152,21 @@ export function DevToolsSettingsModal(props: Props) {
     setPollInterval(sanitizedValue);
   }, []);
 
+  const toggleKeyboardShortcuts = useCallback(
+    (isDisabled: boolean) => {
+      if (props.editorInstance) {
+        unregisterCommands(props.editorInstance);
+        setIsKeyboardShortcutsDisabled(isDisabled);
+      }
+    },
+    [props.editorInstance]
+  );
+
+  const toggleSavingToHistory = useCallback(
+    (isDisabled: boolean) => setIsHistoryDisabled(isDisabled),
+    []
+  );
+
   // It only makes sense to show polling options if the user needs to fetch any data.
   const pollingFields =
     fields || indices || templates ? (
@@ -160,7 +182,7 @@ export function DevToolsSettingsModal(props: Props) {
             <FormattedMessage
               id="console.settingsPage.refreshingDataDescription"
               defaultMessage="Console refreshes autocomplete suggestions by querying Elasticsearch.
-              Less frequent refresh is recommended to reduce bandwith costs."
+              Less frequent refresh is recommended to reduce bandwidth costs."
             />
           }
         >
@@ -267,15 +289,34 @@ export function DevToolsSettingsModal(props: Props) {
           }
         >
           <EuiSwitch
-            checked={historyDisabled}
-            id="historyDisabled"
+            checked={isHistoryDisabled}
             label={
               <FormattedMessage
                 defaultMessage="Disable saving requests to history"
                 id="console.settingsPage.savingRequestsToHistoryMessage"
               />
             }
-            onChange={(e) => setHistoryDisabled(e.target.checked)}
+            onChange={(e) => toggleSavingToHistory(e.target.checked)}
+          />
+        </EuiFormRow>
+
+        <EuiFormRow
+          label={
+            <FormattedMessage
+              id="console.settingsPage.keyboardShortcutsLabel"
+              defaultMessage="Keyboard shortcuts"
+            />
+          }
+        >
+          <EuiSwitch
+            checked={isKeyboardShortcutsDisabled}
+            label={
+              <FormattedMessage
+                defaultMessage="Disable keyboard shortcuts"
+                id="console.settingsPage.disableKeyboardShortcutsMessage"
+              />
+            }
+            onChange={(e) => toggleKeyboardShortcuts(e.target.checked)}
           />
         </EuiFormRow>
 
diff --git a/src/plugins/console/public/application/containers/editor/editor.tsx b/src/plugins/console/public/application/containers/editor/editor.tsx
index df017250664e4..93c11aa53c602 100644
--- a/src/plugins/console/public/application/containers/editor/editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/editor.tsx
@@ -11,19 +11,21 @@ import { debounce } from 'lodash';
 import { EuiProgress } from '@elastic/eui';
 
 import { EditorContentSpinner } from '../../components';
-import { Panel, PanelsContainer } from '../../containers';
+import { Panel, PanelsContainer } from '..';
 import { Editor as EditorUI, EditorOutput } from './legacy/console_editor';
 import { StorageKeys } from '../../../services';
 import { useEditorReadContext, useServicesContext, useRequestReadContext } from '../../contexts';
+import type { SenseEditor } from '../../models';
 
 const INITIAL_PANEL_WIDTH = 50;
 const PANEL_MIN_WIDTH = '100px';
 
 interface Props {
   loading: boolean;
+  setEditorInstance: (instance: SenseEditor) => void;
 }
 
-export const Editor = memo(({ loading }: Props) => {
+export const Editor = memo(({ loading, setEditorInstance }: Props) => {
   const {
     services: { storage },
   } = useServicesContext();
@@ -61,7 +63,10 @@ export const Editor = memo(({ loading }: Props) => {
           {loading ? (
             <EditorContentSpinner />
           ) : (
-            <EditorUI initialTextValue={currentTextObject.text} />
+            <EditorUI
+              initialTextValue={currentTextObject.text}
+              setEditorInstance={setEditorInstance}
+            />
           )}
         </Panel>
         <Panel
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
index d97e223a9599b..dfed86a643627 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-jest.mock('../../../../contexts/editor_context/editor_registry.ts', () => ({
+jest.mock('../../../../contexts/editor_context/editor_registry', () => ({
   instance: {
     setInputEditor: () => {},
     getInputEditor: () => ({
@@ -15,7 +15,7 @@ jest.mock('../../../../contexts/editor_context/editor_registry.ts', () => ({
     }),
   },
 }));
-jest.mock('../../../../components/editor_example.tsx', () => {});
+jest.mock('../../../../components/editor_example', () => {});
 jest.mock('../../../../../lib/mappings/mappings', () => ({
   retrieveAutoCompleteInfo: () => {},
   clearSubscriptions: () => {},
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
index 37da5f93ff675..b942a6d830217 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
@@ -41,7 +41,7 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
         <ServicesContextProvider value={mockedAppContextValue}>
           <RequestContextProvider>
             <EditorContextProvider settings={{} as unknown as DevToolsSettings}>
-              <Editor initialTextValue="" />
+              <Editor initialTextValue="" setEditorInstance={() => {}} />
             </EditorContextProvider>
           </RequestContextProvider>
         </ServicesContextProvider>
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 9105d86f9e2ec..bafe9ee6ca156 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
@@ -19,7 +19,7 @@ import { debounce } from 'lodash';
 import { decompressFromEncodedURIComponent } from 'lz-string';
 import { parse } from 'query-string';
 import React, { CSSProperties, useCallback, useEffect, useRef, useState } from 'react';
-import { ace } from '../../../../../../../es_ui_shared/public';
+import { ace } from '@kbn/es-ui-shared-plugin/public';
 // @ts-ignore
 import { retrieveAutoCompleteInfo, clearSubscriptions } from '../../../../../lib/mappings/mappings';
 import { ConsoleMenu } from '../../../../components';
@@ -34,11 +34,13 @@ import { autoIndent, getDocumentation } from '../console_menu_actions';
 import { subscribeResizeChecker } from '../subscribe_console_resize_checker';
 import { applyCurrentSettings } from './apply_editor_settings';
 import { registerCommands } from './keyboard_shortcuts';
+import type { SenseEditor } from '../../../../models/sense_editor';
 
 const { useUIAceKeyboardMode } = ace;
 
 export interface EditorProps {
   initialTextValue: string;
+  setEditorInstance: (instance: SenseEditor) => void;
 }
 
 interface QueryParams {
@@ -62,7 +64,7 @@ const DEFAULT_INPUT_VALUE = `GET _search
 
 const inputId = 'ConAppInputTextarea';
 
-function EditorUI({ initialTextValue }: EditorProps) {
+function EditorUI({ initialTextValue, setEditorInstance }: EditorProps) {
   const {
     services: { history, notifications, settings: settingsService, esHostService, http },
     docLinkVersion,
@@ -225,12 +227,22 @@ function EditorUI({ initialTextValue }: EditorProps) {
   }, [settings]);
 
   useEffect(() => {
-    registerCommands({
-      senseEditor: editorInstanceRef.current!,
-      sendCurrentRequestToES,
-      openDocumentation,
-    });
-  }, [sendCurrentRequestToES, openDocumentation]);
+    const { isKeyboardShortcutsDisabled } = settings;
+    if (!isKeyboardShortcutsDisabled) {
+      registerCommands({
+        senseEditor: editorInstanceRef.current!,
+        sendCurrentRequestToES,
+        openDocumentation,
+      });
+    }
+  }, [sendCurrentRequestToES, openDocumentation, settings]);
+
+  useEffect(() => {
+    const { current: editor } = editorInstanceRef;
+    if (editor) {
+      setEditorInstance(editor);
+    }
+  }, [setEditorInstance]);
 
   return (
     <div style={abs} data-test-subj="console-application" className="conApp">
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
index 9f9cdcad9115b..0817b6df5f7ef 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
@@ -5,10 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import { VectorTile } from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
 import { EuiScreenReaderOnly } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useRef } from 'react';
+import { convertMapboxVectorTileToJson } from './mapbox_vector_tile';
 
 // Ensure the modes we might switch to dynamically are available
 import 'brace/mode/text';
@@ -46,7 +48,7 @@ function modeForContentType(contentType?: string) {
   if (!contentType) {
     return 'ace/mode/text';
   }
-  if (isJSONContentType(contentType)) {
+  if (isJSONContentType(contentType) || isMapboxVectorTile(contentType)) {
     // Using hjson will allow us to use comments in editor output and solves the problem with error markers
     return 'ace/mode/hjson';
   } else if (contentType.indexOf('application/yaml') >= 0) {
@@ -86,15 +88,19 @@ function EditorOutputUI() {
         data
           .map((result) => {
             const { value, contentType } = result.response;
+
+            let editorOutput;
             if (readOnlySettings.tripleQuotes && isJSONContentType(contentType)) {
-              return safeExpandLiteralStrings(value as string);
+              editorOutput = safeExpandLiteralStrings(value as string);
+            } else if (isMapboxVectorTile(contentType)) {
+              const vectorTile = new VectorTile(new Protobuf(value as ArrayBuffer));
+              const vectorTileJson = convertMapboxVectorTileToJson(vectorTile);
+              editorOutput = safeExpandLiteralStrings(vectorTileJson as string);
+            } else {
+              editorOutput = value;
             }
-            if (isMapboxVectorTile(contentType)) {
-              return i18n.translate('console.outputCannotPreviewBinaryData', {
-                defaultMessage: 'Cannot preview binary data.',
-              });
-            }
-            return value;
+
+            return editorOutput;
           })
           .join('\n'),
         mode
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
index 4f09a49f3ac96..3d100ef0a5528 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
@@ -15,6 +15,15 @@ interface Actions {
   openDocumentation: () => void;
 }
 
+const COMMANDS = {
+  SEND_TO_ELASTICSEARCH: 'send to Elasticsearch',
+  OPEN_DOCUMENTATION: 'open documentation',
+  AUTO_INDENT_REQUEST: 'auto indent request',
+  MOVE_TO_PREVIOUS_REQUEST: 'move to previous request start or end',
+  MOVE_TO_NEXT_REQUEST: 'move to next request start or end',
+  GO_TO_LINE: 'gotoline',
+};
+
 export function registerCommands({
   senseEditor,
   sendCurrentRequestToES,
@@ -28,12 +37,14 @@ export function registerCommands({
 
   coreEditor.registerKeyboardShortcut({
     keys: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
-    name: 'send to Elasticsearch',
-    fn: () => sendCurrentRequestToES(),
+    name: COMMANDS.SEND_TO_ELASTICSEARCH,
+    fn: () => {
+      sendCurrentRequestToES();
+    },
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'open documentation',
+    name: COMMANDS.OPEN_DOCUMENTATION,
     keys: { win: 'Ctrl-/', mac: 'Command-/' },
     fn: () => {
       openDocumentation();
@@ -41,7 +52,7 @@ export function registerCommands({
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'auto indent request',
+    name: COMMANDS.AUTO_INDENT_REQUEST,
     keys: { win: 'Ctrl-I', mac: 'Command-I' },
     fn: () => {
       throttledAutoIndent();
@@ -49,7 +60,7 @@ export function registerCommands({
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'move to previous request start or end',
+    name: COMMANDS.MOVE_TO_PREVIOUS_REQUEST,
     keys: { win: 'Ctrl-Up', mac: 'Command-Up' },
     fn: () => {
       senseEditor.moveToPreviousRequestEdge();
@@ -57,10 +68,28 @@ export function registerCommands({
   });
 
   coreEditor.registerKeyboardShortcut({
-    name: 'move to next request start or end',
+    name: COMMANDS.MOVE_TO_NEXT_REQUEST,
     keys: { win: 'Ctrl-Down', mac: 'Command-Down' },
     fn: () => {
       senseEditor.moveToNextRequestEdge(false);
     },
   });
+
+  coreEditor.registerKeyboardShortcut({
+    name: COMMANDS.GO_TO_LINE,
+    keys: { win: 'Ctrl-L', mac: 'Command-L' },
+    fn: (editor) => {
+      const line = parseInt(prompt('Enter line number') ?? '', 10);
+      if (!isNaN(line)) {
+        editor.gotoLine(line);
+      }
+    },
+  });
+}
+
+export function unregisterCommands(senseEditor: SenseEditor) {
+  const coreEditor = senseEditor.getCoreEditor();
+  Object.values(COMMANDS).forEach((command) => {
+    coreEditor.unregisterKeyboardShortcut(command);
+  });
 }
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.test.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.test.ts
new file mode 100644
index 0000000000000..a71d86014b4a8
--- /dev/null
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.test.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+import { VectorTile } from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
+import { convertMapboxVectorTileToJson } from './convert_mapbox_vector_tile_to_json';
+
+const PATH_TO_PBF = resolve(__dirname, './response.pbf'); // Query sample "GET kibana_sample_data_logs/_mvt/geo.coordinates/8/23/63"
+
+const MOCK_JSON = JSON.parse(`
+{
+	"meta": [
+		{
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[0,4096],
+						[4096,4096],
+						[4096,0],
+						[0,0],
+						[0,4096]
+					]
+				]
+			},
+			"properties": {
+				"_shards.failed": 0,
+				"_shards.skipped": 0,
+				"_shards.successful": 1,
+				"_shards.total": 1,
+				"aggregations._count.avg": 1,
+				"aggregations._count.count": 1,
+				"aggregations._count.max": 1,
+				"aggregations._count.min": 1,
+				"aggregations._count.sum": 1,
+				"hits.total.relation": "eq",
+				"hits.total.value": 1,
+				"timed_out": false,
+				"took": 1
+			}
+		}
+	],
+	"hits": [
+		{
+			"geometry": {
+				"type": "Point",
+				"coordinates": [
+					3619,
+					334
+				]
+			},
+			"properties": {
+				"_id": "vFVzI4ABgP1gvXfjt0mI",
+				"_index": "kibana_sample_data_logs"
+			}
+		}
+	],
+	"aggs": [
+		{
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[3616,336],
+						[3632,336],
+						[3632,320],
+						[3616,320],
+						[3616,336]
+					]
+				]
+			},
+			"properties": {
+				"_key": "16/6114/16148",
+				"_count": 1
+			}
+		}
+	]
+}`);
+
+describe('Convert mapbox vector tile to json', () => {
+  let vectorTile: VectorTile;
+
+  beforeAll(() => {
+    const response = readFileSync(PATH_TO_PBF);
+    vectorTile = new VectorTile(new Protobuf(response));
+  });
+
+  it('function should convert vectorTile to string', () => {
+    expect(() => {
+      const json = convertMapboxVectorTileToJson(vectorTile);
+      JSON.parse(json);
+    }).not.toThrow();
+  });
+
+  it('response should have [meta, aggs, hits] layers', () => {
+    const vectorTileJson = JSON.parse(convertMapboxVectorTileToJson(vectorTile));
+    expect(vectorTileJson).toEqual(MOCK_JSON);
+  });
+});
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.ts
new file mode 100644
index 0000000000000..5a64dd98fe160
--- /dev/null
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/convert_mapbox_vector_tile_to_json.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { VectorTile, VectorTileLayer, VectorTileFeature } from '@mapbox/vector-tile';
+
+interface MapboxVectorTileJson {
+  [key: string]: {};
+}
+
+export function convertMapboxVectorTileToJson(response: VectorTile) {
+  const data = response.layers;
+  const output: MapboxVectorTileJson = {};
+
+  for (const property in data) {
+    if (data.hasOwnProperty(property)) {
+      const propertyObject: VectorTileLayer = data[property];
+      const featuresArray = [];
+
+      for (let index = 0; index < propertyObject.length; index++) {
+        const feature = propertyObject.feature(index);
+        const properties = feature.properties;
+        const geometry = feature.loadGeometry()[0];
+        const typeName = VectorTileFeature.types[feature.type];
+        let coordinates = [];
+
+        const coordinatesArray = [];
+        for (const value of geometry) {
+          coordinatesArray.push([value.x, value.y]);
+        }
+
+        switch (feature.type) {
+          case 1:
+            coordinates.push(geometry[0].x, geometry[0].y);
+            break;
+          case 2: {
+            coordinates = coordinatesArray;
+            break;
+          }
+          case 3: {
+            coordinates.push(coordinatesArray);
+            break;
+          }
+        }
+
+        featuresArray.push({
+          geometry: {
+            type: typeName,
+            coordinates,
+          },
+          properties,
+        });
+      }
+
+      output[property] = featuresArray;
+    }
+  }
+
+  const sortedOutput = Object.fromEntries(Object.entries(output).sort().reverse()); // "meta" layer is now in top of the result
+
+  return JSON.stringify(sortedOutput, null, '\t');
+}
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/index.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/index.ts
new file mode 100644
index 0000000000000..2af786f9ada74
--- /dev/null
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { convertMapboxVectorTileToJson } from './convert_mapbox_vector_tile_to_json';
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/response.pbf b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/response.pbf
new file mode 100644
index 0000000000000..f9ac7be4a1887
Binary files /dev/null and b/src/plugins/console/public/application/containers/editor/legacy/console_editor/mapbox_vector_tile/response.pbf differ
diff --git a/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts b/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
index 226b3b28a61c4..8485f09de1ee1 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
+++ b/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ResizeChecker } from '../../../../../../kibana_utils/public';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 
 export function subscribeResizeChecker(el: HTMLElement, ...editors: any[]) {
   const checker = new ResizeChecker(el);
diff --git a/src/plugins/console/public/application/containers/main/main.tsx b/src/plugins/console/public/application/containers/main/main.tsx
index 30bf23d94a327..5895b919f9842 100644
--- a/src/plugins/console/public/application/containers/main/main.tsx
+++ b/src/plugins/console/public/application/containers/main/main.tsx
@@ -25,6 +25,7 @@ import { useServicesContext, useEditorReadContext, useRequestReadContext } from
 import { useDataInit } from '../../hooks';
 
 import { getTopNavConfig } from './get_top_nav';
+import type { SenseEditor } from '../../models/sense_editor';
 
 export function Main() {
   const {
@@ -46,6 +47,8 @@ export function Main() {
   const [showSettings, setShowSettings] = useState(false);
   const [showHelp, setShowHelp] = useState(false);
 
+  const [editorInstance, setEditorInstance] = useState<SenseEditor | null>(null);
+
   const renderConsoleHistory = () => {
     return editorsReady ? <ConsoleHistory close={() => setShowHistory(false)} /> : null;
   };
@@ -108,7 +111,7 @@ export function Main() {
         </EuiFlexItem>
         {showingHistory ? <EuiFlexItem grow={false}>{renderConsoleHistory()}</EuiFlexItem> : null}
         <EuiFlexItem>
-          <Editor loading={!done} />
+          <Editor loading={!done} setEditorInstance={setEditorInstance} />
         </EuiFlexItem>
       </EuiFlexGroup>
 
@@ -121,7 +124,9 @@ export function Main() {
         />
       ) : null}
 
-      {showSettings ? <Settings onClose={() => setShowSettings(false)} /> : null}
+      {showSettings ? (
+        <Settings onClose={() => setShowSettings(false)} editorInstance={editorInstance} />
+      ) : null}
 
       {showHelp ? <HelpPanel onClose={() => setShowHelp(false)} /> : null}
     </div>
diff --git a/src/plugins/console/public/application/containers/settings.tsx b/src/plugins/console/public/application/containers/settings.tsx
index f0ec64f4b13b2..b4cbea5833f32 100644
--- a/src/plugins/console/public/application/containers/settings.tsx
+++ b/src/plugins/console/public/application/containers/settings.tsx
@@ -8,13 +8,14 @@
 
 import React from 'react';
 
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 import { AutocompleteOptions, DevToolsSettingsModal } from '../components';
 
 // @ts-ignore
 import { retrieveAutoCompleteInfo } from '../../lib/mappings/mappings';
 import { useServicesContext, useEditorActionContext } from '../contexts';
 import { DevToolsSettings, Settings as SettingsService } from '../../services';
+import type { SenseEditor } from '../models';
 
 const getAutocompleteDiff = (
   newSettings: DevToolsSettings,
@@ -70,9 +71,10 @@ const fetchAutocompleteSettingsIfNeeded = (
 
 export interface Props {
   onClose: () => void;
+  editorInstance: SenseEditor | null;
 }
 
-export function Settings({ onClose }: Props) {
+export function Settings({ onClose, editorInstance }: Props) {
   const {
     services: { settings, http },
   } = useServicesContext();
@@ -102,6 +104,7 @@ export function Settings({ onClose }: Props) {
         refreshAutocompleteSettings(http, settings, selectedSettings)
       }
       settings={settings.toJSON()}
+      editorInstance={editorInstance}
     />
   );
 }
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 028f92ab2aa68..5ede7f58d4bdc 100644
--- a/src/plugins/console/public/application/contexts/services_context.mock.ts
+++ b/src/plugins/console/public/application/contexts/services_context.mock.ts
@@ -11,7 +11,7 @@ import {
   httpServiceMock,
   themeServiceMock,
   docLinksServiceMock,
-} from '../../../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 
 import type { ObjectStorageClient } from '../../../common/types';
 import { HistoryMock } from '../../services/history.mock';
diff --git a/src/plugins/console/public/application/contexts/services_context.tsx b/src/plugins/console/public/application/contexts/services_context.tsx
index f8dc6fcab4d41..c60e41d8f14bb 100644
--- a/src/plugins/console/public/application/contexts/services_context.tsx
+++ b/src/plugins/console/public/application/contexts/services_context.tsx
@@ -8,7 +8,7 @@
 
 import React, { createContext, useContext, useEffect } from 'react';
 import { Observable } from 'rxjs';
-import type { NotificationsSetup, CoreTheme, DocLinksStart, HttpSetup } from 'kibana/public';
+import type { NotificationsSetup, CoreTheme, DocLinksStart, HttpSetup } from '@kbn/core/public';
 
 import { History, Settings, Storage } from '../../services';
 import { ObjectStorageClient } from '../../../common/types';
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
index 1bac49a037e6e..94e184748908c 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { HttpSetup, IHttpFetchError } from 'kibana/public';
+import type { HttpSetup, IHttpFetchError } from '@kbn/core/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import { extractWarningMessages } from '../../../lib/utils';
-import { XJson } from '../../../../../es_ui_shared/public';
 // @ts-ignore
 import * as es from '../../../lib/es/es';
 import { BaseResponseType } from '../../../types';
@@ -88,7 +88,13 @@ export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]>
             (response.status >= 200 && response.status < 300) || response.status === 404;
 
           if (isSuccess) {
-            let value = JSON.stringify(body, null, 2);
+            let value;
+            // check if object is ArrayBuffer
+            if (body instanceof ArrayBuffer) {
+              value = body;
+            } else {
+              value = JSON.stringify(body, null, 2);
+            }
 
             const warnings = response.headers.get('warning');
             if (warnings) {
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
index f53a9dadbe108..e7c436c9806b3 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
@@ -49,9 +49,9 @@ export const useSendCurrentRequestToES = () => {
       const results = await sendRequestToES({ http, requests });
 
       let saveToHistoryError: undefined | Error;
-      const { historyDisabled } = settings.toJSON();
+      const { isHistoryDisabled } = settings.toJSON();
 
-      if (!historyDisabled) {
+      if (!isHistoryDisabled) {
         results.forEach(({ request: { path, method, data } }) => {
           try {
             history.addToHistory(path, method, data);
@@ -81,7 +81,7 @@ export const useSendCurrentRequestToES = () => {
                   notifications.toasts.remove(toast);
                 },
                 onDisableSavingToHistory: () => {
-                  settings.setHistoryDisabled(true);
+                  settings.setIsHistoryDisabled(true);
                   notifications.toasts.remove(toast);
                 },
               }),
diff --git a/src/plugins/console/public/application/index.tsx b/src/plugins/console/public/application/index.tsx
index a922bc1a893da..1950ab0c37951 100644
--- a/src/plugins/console/public/application/index.tsx
+++ b/src/plugins/console/public/application/index.tsx
@@ -15,9 +15,9 @@ import {
   I18nStart,
   CoreTheme,
   DocLinksStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
-import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { KibanaThemeProvider } from '../shared_imports';
 import { createStorage, createHistory, createSettings } from '../services';
 import { createUsageTracker } from '../services/tracker';
diff --git a/src/plugins/console/public/application/lib/api.ts b/src/plugins/console/public/application/lib/api.ts
index 3d818e8a7898a..1f32b4d94c0e2 100644
--- a/src/plugins/console/public/application/lib/api.ts
+++ b/src/plugins/console/public/application/lib/api.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { EsConfigApiResponse } from '../../../common/types/api_responses';
 import { sendRequest } from '../../shared_imports';
 
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
index 7a90dbe138f17..f13597e933bb2 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
+++ b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
@@ -297,6 +297,11 @@ export class LegacyCoreEditor implements CoreEditor {
     });
   }
 
+  unregisterKeyboardShortcut(command: string) {
+    // @ts-ignore
+    this.editor.commands.removeCommand(command);
+  }
+
   legacyUpdateUI(range: Range) {
     if (!this.$actions) {
       return;
diff --git a/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
index 58bb12e8958b1..32c4d77a75df7 100644
--- a/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
+++ b/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import src from '!!raw-loader!./worker.js';
+import src from '!!raw-loader!./worker';
 
 export const workerModule = {
   id: 'sense_editor/mode/worker',
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
index bc6bda7fdc471..0889b98c69388 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
@@ -12,7 +12,7 @@ import $ from 'jquery';
 import _ from 'lodash';
 
 import { create } from './create';
-import { XJson } from '../../../../../es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import editorInput1 from './__fixtures__/editor_input1.txt';
 
 const { collapseLiteralStrings } = XJson;
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
index 01a7786c5d856..5e8ca35f287b7 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 
-import { XJson } from '../../../../../es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 import RowParser from '../../../lib/row_parser';
 import * as utils from '../../../lib/utils';
diff --git a/src/plugins/console/public/index.ts b/src/plugins/console/public/index.ts
index 9a9c5896cd26d..9f335fb4e4e58 100644
--- a/src/plugins/console/public/index.ts
+++ b/src/plugins/console/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import './index.scss';
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { ConsoleUIPlugin } from './plugin';
 
diff --git a/src/plugins/console/public/lib/autocomplete/autocomplete.ts b/src/plugins/console/public/lib/autocomplete/autocomplete.ts
index 63d43a849a681..1dc41430e3855 100644
--- a/src/plugins/console/public/lib/autocomplete/autocomplete.ts
+++ b/src/plugins/console/public/lib/autocomplete/autocomplete.ts
@@ -28,7 +28,7 @@ import * as utils from '../utils';
 import { populateContext } from './engine';
 import { AutoCompleteContext, ResultTerm } from './types';
 // @ts-ignore
-import { URL_PATH_END_MARKER } from './components/index';
+import { URL_PATH_END_MARKER } from './components';
 
 let lastEvaluatedToken: Token | null = null;
 
diff --git a/src/plugins/console/public/lib/autocomplete/components/object_component.js b/src/plugins/console/public/lib/autocomplete/components/object_component.js
index bfbbf2f712c02..8273aab093354 100644
--- a/src/plugins/console/public/lib/autocomplete/components/object_component.js
+++ b/src/plugins/console/public/lib/autocomplete/components/object_component.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { SharedComponent } from './index';
+import { SharedComponent } from '.';
 /**
  * @param constants list of components that represent constant keys
  * @param patternsAndWildCards list of components that represent patterns and should be matched only if
diff --git a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
index 24cc510f65acf..547c4f12a3717 100644
--- a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
+++ b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
@@ -13,7 +13,7 @@ import {
   AcceptEndpointComponent,
   ListComponent,
   SimpleParamComponent,
-} from './index';
+} from '.';
 
 import { FullRequestComponent } from './full_request_component';
 
diff --git a/src/plugins/console/public/lib/es/es.ts b/src/plugins/console/public/lib/es/es.ts
index e17c226d61595..2a4059d664e6c 100644
--- a/src/plugins/console/public/lib/es/es.ts
+++ b/src/plugins/console/public/lib/es/es.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { HttpFetchOptions, HttpResponse, HttpSetup } from 'kibana/public';
+import type { HttpFetchOptions, HttpResponse, HttpSetup } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../common/constants';
 
 const esVersion: string[] = [];
@@ -45,6 +45,7 @@ export async function send({
     asResponse,
     asSystemRequest,
   };
+
   return await http.post<HttpResponse>(`${API_BASE_PATH}/proxy`, options);
 }
 
diff --git a/src/plugins/console/public/lib/kb/kb.test.js b/src/plugins/console/public/lib/kb/kb.test.js
index 25136213c93e2..ff0ddba37281a 100644
--- a/src/plugins/console/public/lib/kb/kb.test.js
+++ b/src/plugins/console/public/lib/kb/kb.test.js
@@ -10,7 +10,7 @@ import _ from 'lodash';
 import { populateContext } from '../autocomplete/engine';
 
 import '../../application/models/sense_editor/sense_editor.test.mocks';
-import * as kb from '../kb';
+import * as kb from '.';
 import * as mappings from '../mappings/mappings';
 
 describe('Knowledge base', () => {
diff --git a/src/plugins/console/public/lib/utils/index.ts b/src/plugins/console/public/lib/utils/index.ts
index fb0729befa60a..3e6eb4a93f1f5 100644
--- a/src/plugins/console/public/lib/utils/index.ts
+++ b/src/plugins/console/public/lib/utils/index.ts
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { XJson } from '../../../../es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
diff --git a/src/plugins/console/public/plugin.ts b/src/plugins/console/public/plugin.ts
index 5157eb4af2765..e6a4d7fff61b0 100644
--- a/src/plugins/console/public/plugin.ts
+++ b/src/plugins/console/public/plugin.ts
@@ -7,9 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/public';
+import { Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 
-import { FeatureCatalogueCategory } from '../../home/public';
 import {
   AppSetupUIPluginDependencies,
   ClientConfigType,
@@ -41,7 +40,7 @@ export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDepen
           icon: 'consoleApp',
           path: '/app/dev_tools#/console',
           showOnHomePage: false,
-          category: FeatureCatalogueCategory.ADMIN,
+          category: 'admin',
         });
       }
 
diff --git a/src/plugins/console/public/services/history.ts b/src/plugins/console/public/services/history.ts
index 972e5283274de..c073411fe10b4 100644
--- a/src/plugins/console/public/services/history.ts
+++ b/src/plugins/console/public/services/history.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { Storage } from './index';
+import { Storage } from '.';
 
 const MAX_NUMBER_OF_HISTORY_ITEMS = 100;
 
diff --git a/src/plugins/console/public/services/settings.ts b/src/plugins/console/public/services/settings.ts
index 1a7eff3e7ca54..aa2280f06064f 100644
--- a/src/plugins/console/public/services/settings.ts
+++ b/src/plugins/console/public/services/settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Storage } from './index';
+import { Storage } from '.';
 
 export const DEFAULT_SETTINGS = Object.freeze({
   fontSize: 14,
@@ -15,7 +15,8 @@ export const DEFAULT_SETTINGS = Object.freeze({
   tripleQuotes: true,
   wrapMode: true,
   autocomplete: Object.freeze({ fields: true, indices: true, templates: true, dataStreams: true }),
-  historyDisabled: false,
+  isHistoryDisabled: false,
+  isKeyboardShortcutsDisabled: false,
 });
 
 export interface DevToolsSettings {
@@ -30,72 +31,96 @@ export interface DevToolsSettings {
   polling: boolean;
   pollInterval: number;
   tripleQuotes: boolean;
-  historyDisabled: boolean;
+  isHistoryDisabled: boolean;
+  isKeyboardShortcutsDisabled: boolean;
+}
+
+enum SettingKeys {
+  FONT_SIZE = 'font_size',
+  WRAP_MODE = 'wrap_mode',
+  TRIPLE_QUOTES = 'triple_quotes',
+  AUTOCOMPLETE_SETTINGS = 'autocomplete_settings',
+  CONSOLE_POLLING = 'console_polling',
+  POLL_INTERVAL = 'poll_interval',
+  IS_HISTORY_DISABLED = 'is_history_disabled',
+  IS_KEYBOARD_SHORTCUTS_DISABLED = 'is_keyboard_shortcuts_disabled',
 }
 
 export class Settings {
   constructor(private readonly storage: Storage) {}
 
   getFontSize() {
-    return this.storage.get('font_size', DEFAULT_SETTINGS.fontSize);
+    return this.storage.get(SettingKeys.FONT_SIZE, DEFAULT_SETTINGS.fontSize);
   }
 
   setFontSize(size: number) {
-    this.storage.set('font_size', size);
+    this.storage.set(SettingKeys.FONT_SIZE, size);
     return true;
   }
 
   getWrapMode() {
-    return this.storage.get('wrap_mode', DEFAULT_SETTINGS.wrapMode);
+    return this.storage.get(SettingKeys.WRAP_MODE, DEFAULT_SETTINGS.wrapMode);
   }
 
   setWrapMode(mode: boolean) {
-    this.storage.set('wrap_mode', mode);
+    this.storage.set(SettingKeys.WRAP_MODE, mode);
     return true;
   }
 
   setTripleQuotes(tripleQuotes: boolean) {
-    this.storage.set('triple_quotes', tripleQuotes);
+    this.storage.set(SettingKeys.TRIPLE_QUOTES, tripleQuotes);
     return true;
   }
 
   getTripleQuotes() {
-    return this.storage.get('triple_quotes', DEFAULT_SETTINGS.tripleQuotes);
+    return this.storage.get(SettingKeys.TRIPLE_QUOTES, DEFAULT_SETTINGS.tripleQuotes);
   }
 
   getAutocomplete() {
-    return this.storage.get('autocomplete_settings', DEFAULT_SETTINGS.autocomplete);
+    return this.storage.get(SettingKeys.AUTOCOMPLETE_SETTINGS, DEFAULT_SETTINGS.autocomplete);
   }
 
   setAutocomplete(settings: object) {
-    this.storage.set('autocomplete_settings', settings);
+    this.storage.set(SettingKeys.AUTOCOMPLETE_SETTINGS, settings);
     return true;
   }
 
   getPolling() {
-    return this.storage.get('console_polling', DEFAULT_SETTINGS.polling);
+    return this.storage.get(SettingKeys.CONSOLE_POLLING, DEFAULT_SETTINGS.polling);
   }
 
   setPolling(polling: boolean) {
-    this.storage.set('console_polling', polling);
+    this.storage.set(SettingKeys.CONSOLE_POLLING, polling);
     return true;
   }
 
-  setHistoryDisabled(disable: boolean) {
-    this.storage.set('disable_history', disable);
+  setIsHistoryDisabled(isDisabled: boolean) {
+    this.storage.set(SettingKeys.IS_HISTORY_DISABLED, isDisabled);
     return true;
   }
 
-  getHistoryDisabled() {
-    return this.storage.get('disable_history', DEFAULT_SETTINGS.historyDisabled);
+  getIsHistoryDisabled() {
+    return this.storage.get(SettingKeys.IS_HISTORY_DISABLED, DEFAULT_SETTINGS.isHistoryDisabled);
   }
 
   setPollInterval(interval: number) {
-    this.storage.set('poll_interval', interval);
+    this.storage.set(SettingKeys.POLL_INTERVAL, interval);
   }
 
   getPollInterval() {
-    return this.storage.get('poll_interval', DEFAULT_SETTINGS.pollInterval);
+    return this.storage.get(SettingKeys.POLL_INTERVAL, DEFAULT_SETTINGS.pollInterval);
+  }
+
+  setIsKeyboardShortcutsDisabled(disable: boolean) {
+    this.storage.set(SettingKeys.IS_KEYBOARD_SHORTCUTS_DISABLED, disable);
+    return true;
+  }
+
+  getIsKeyboardShortcutsDisabled() {
+    return this.storage.get(
+      SettingKeys.IS_KEYBOARD_SHORTCUTS_DISABLED,
+      DEFAULT_SETTINGS.isKeyboardShortcutsDisabled
+    );
   }
 
   toJSON(): DevToolsSettings {
@@ -106,7 +131,8 @@ export class Settings {
       fontSize: parseFloat(this.getFontSize()),
       polling: Boolean(this.getPolling()),
       pollInterval: this.getPollInterval(),
-      historyDisabled: Boolean(this.getHistoryDisabled()),
+      isHistoryDisabled: Boolean(this.getIsHistoryDisabled()),
+      isKeyboardShortcutsDisabled: Boolean(this.getIsKeyboardShortcutsDisabled()),
     };
   }
 
@@ -117,7 +143,8 @@ export class Settings {
     autocomplete,
     polling,
     pollInterval,
-    historyDisabled,
+    isHistoryDisabled,
+    isKeyboardShortcutsDisabled,
   }: DevToolsSettings) {
     this.setFontSize(fontSize);
     this.setWrapMode(wrapMode);
@@ -125,7 +152,8 @@ export class Settings {
     this.setAutocomplete(autocomplete);
     this.setPolling(polling);
     this.setPollInterval(pollInterval);
-    this.setHistoryDisabled(historyDisabled);
+    this.setIsHistoryDisabled(isHistoryDisabled);
+    this.setIsKeyboardShortcutsDisabled(isKeyboardShortcutsDisabled);
   }
 }
 
diff --git a/src/plugins/console/public/services/tracker.ts b/src/plugins/console/public/services/tracker.ts
index 45aef7a3fc5d4..43675c4f9d8dd 100644
--- a/src/plugins/console/public/services/tracker.ts
+++ b/src/plugins/console/public/services/tracker.ts
@@ -7,8 +7,8 @@
  */
 
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { MetricsTracker } from '../types';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 const APP_TRACKER_NAME = 'console';
 
diff --git a/src/plugins/console/public/shared_imports.ts b/src/plugins/console/public/shared_imports.ts
index 4bbf6e5853428..95b96b565e27f 100644
--- a/src/plugins/console/public/shared_imports.ts
+++ b/src/plugins/console/public/shared_imports.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { sendRequest, XJson } from '../../es_ui_shared/public';
+import { sendRequest, XJson } from '@kbn/es-ui-shared-plugin/public';
 
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
 export { sendRequest, collapseLiteralStrings, expandLiteralStrings };
 
-export { KibanaThemeProvider, toMountPoint } from '../../kibana_react/public';
+export { KibanaThemeProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
diff --git a/src/plugins/console/public/types/core_editor.ts b/src/plugins/console/public/types/core_editor.ts
index cc344d6bcc881..db8010afe762b 100644
--- a/src/plugins/console/public/types/core_editor.ts
+++ b/src/plugins/console/public/types/core_editor.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { Editor } from 'brace';
 import { TokensProvider } from './tokens_provider';
 import { Token } from './token';
 
@@ -252,10 +253,15 @@ export interface CoreEditor {
    */
   registerKeyboardShortcut(opts: {
     keys: string | { win?: string; mac?: string };
-    fn: () => void;
+    fn: (editor: Editor) => void;
     name: string;
   }): void;
 
+  /**
+   * Unregister a keyboard shortcut and provide a command name
+   */
+  unregisterKeyboardShortcut(command: string): void;
+
   /**
    * Register a completions function that will be called when the editor
    * detects a change
diff --git a/src/plugins/console/public/types/plugin_dependencies.ts b/src/plugins/console/public/types/plugin_dependencies.ts
index afc49f9a5a986..40d82a4df29ac 100644
--- a/src/plugins/console/public/types/plugin_dependencies.ts
+++ b/src/plugins/console/public/types/plugin_dependencies.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { HomePublicPluginSetup } from '../../../home/public';
-import { DevToolsSetup } from '../../../dev_tools/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { SharePluginSetup, LocatorPublic } from '../../../share/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { DevToolsSetup } from '@kbn/dev-tools-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { SharePluginSetup, LocatorPublic } from '@kbn/share-plugin/public';
 
 import { ConsoleUILocatorParams } from './locator';
 
diff --git a/src/plugins/console/server/config.ts b/src/plugins/console/server/config.ts
index 2183a133e408f..7a24fe2dca401 100644
--- a/src/plugins/console/server/config.ts
+++ b/src/plugins/console/server/config.ts
@@ -10,7 +10,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/src/plugins/console/server/index.ts b/src/plugins/console/server/index.ts
index 598dfa23958c9..84f0d5cbad250 100644
--- a/src/plugins/console/server/index.ts
+++ b/src/plugins/console/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { ConsoleServerPlugin } from './plugin';
 
diff --git a/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js b/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js
index 112f72edcbddc..7b7d4c41a34b1 100644
--- a/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js
+++ b/src/plugins/console/server/lib/elasticsearch_proxy_config.test.js
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { getElasticsearchProxyConfig } from '../lib/elasticsearch_proxy_config';
+import { getElasticsearchProxyConfig } from './elasticsearch_proxy_config';
 import https from 'https';
 import http from 'http';
 
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
index 5543c40d03cb0..c1ae53bbaabc6 100644
--- a/src/plugins/console/server/plugin.ts
+++ b/src/plugins/console/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { SemVer } from 'semver';
 
 import { ProxyConfigCollection } from './lib';
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
index dd8fa5350215f..ed935007914f8 100644
--- a/src/plugins/console/server/routes/api/console/es_config/index.ts
+++ b/src/plugins/console/server/routes/api/console/es_config/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { EsConfigApiResponse } from '../../../../../common/types/api_responses';
-import { RouteDependencies } from '../../../';
+import { RouteDependencies } from '../../..';
 
 export const registerEsConfigRoute = ({ router, services }: RouteDependencies): void => {
   router.get({ path: '/api/console/es_config', validate: false }, async (ctx, req, res) => {
diff --git a/src/plugins/console/server/routes/api/console/proxy/body.test.ts b/src/plugins/console/server/routes/api/console/proxy/body.test.ts
index 80a2e075957de..893f00f975e89 100644
--- a/src/plugins/console/server/routes/api/console/proxy/body.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/body.test.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { IKibanaResponse } from 'src/core/server';
+import { IKibanaResponse } from '@kbn/core/server';
 import { getProxyRouteHandlerDeps } from './mocks';
 
 import { Readable } from 'stream';
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createHandler } from './create_handler';
 import * as requestModule from '../../../../lib/proxy_request';
 import { createResponseStub } from './stubs';
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 815c507b763f7..8cd0400d82cb0 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
@@ -11,8 +11,12 @@ import * as url from 'url';
 import { pick, trimStart, trimEnd } from 'lodash';
 import { SemVer } from 'semver';
 
-import { KibanaRequest, RequestHandler } from 'kibana/server';
+import { KibanaRequest, RequestHandler } from '@kbn/core/server';
 
+// 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 '@kbn/core/server/http/router';
 import { ESConfigForProxy } from '../../../../types';
 import {
   getElasticsearchProxyConfig,
@@ -21,12 +25,7 @@ import {
   setHeaders,
 } from '../../../../lib';
 
-// 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';
-
-import { RouteDependencies } from '../../../';
+import { RouteDependencies } from '../../..';
 
 import { Body, Query } from './validation_config';
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/headers.test.ts b/src/plugins/console/server/routes/api/console/proxy/headers.test.ts
index c2db933ad4e7b..27cad7d948696 100644
--- a/src/plugins/console/server/routes/api/console/proxy/headers.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/headers.test.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-jest.mock('../../../../../../../core/server/http/router/request', () => ({
+jest.mock('@kbn/core/server/http/router/request', () => ({
   ensureRawRequest: jest.fn(),
 }));
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ensureRawRequest } from '../../../../../../../core/server/http/router/request';
+import { ensureRawRequest } from '@kbn/core/server/http/router/request';
 
 import { getProxyRouteHandlerDeps } from './mocks';
 
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 0b07a26dcfeb1..64103035e08d6 100644
--- a/src/plugins/console/server/routes/api/console/proxy/index.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/index.ts
@@ -9,7 +9,7 @@
 import { routeValidationConfig } from './validation_config';
 import { createHandler } from './create_handler';
 
-import { RouteDependencies } from '../../../';
+import { RouteDependencies } from '../../..';
 
 export const registerProxyRoute = (deps: RouteDependencies) => {
   deps.router.post(
diff --git a/src/plugins/console/server/routes/api/console/proxy/mocks.ts b/src/plugins/console/server/routes/api/console/proxy/mocks.ts
index d06ca90adf556..cef9ea34a11ca 100644
--- a/src/plugins/console/server/routes/api/console/proxy/mocks.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/mocks.ts
@@ -12,11 +12,11 @@ jest.mock('../../../../lib/proxy_request', () => ({
 }));
 
 import { duration } from 'moment';
+import { coreMock, httpServiceMock } from '@kbn/core/server/mocks';
 import { MAJOR_VERSION } from '../../../../../common/constants';
 import { ProxyConfigCollection } from '../../../../lib';
-import { RouteDependencies, ProxyDependencies } from '../../../../routes';
+import { RouteDependencies, ProxyDependencies } from '../../..';
 import { EsLegacyConfigService, SpecDefinitionsService } from '../../../../services';
-import { coreMock, httpServiceMock } from '../../../../../../../core/server/mocks';
 
 const kibanaVersion = new SemVer(MAJOR_VERSION);
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/params.test.ts b/src/plugins/console/server/routes/api/console/proxy/params.test.ts
index edefb2f11f1f1..20f861247bddb 100644
--- a/src/plugins/console/server/routes/api/console/proxy/params.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/params.test.ts
@@ -7,7 +7,7 @@
  */
 import { SemVer } from 'semver';
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { getProxyRouteHandlerDeps } from './mocks'; // import need to come first
 import { createResponseStub } from './stubs'; // import needs to come first
 import { MAJOR_VERSION } from '../../../../../common/constants';
diff --git a/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts b/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts
index 30b537ae5c28f..9762ec9754b71 100644
--- a/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/proxy_fallback.test.ts
@@ -9,7 +9,7 @@
 import { duration } from 'moment';
 import { getProxyRouteHandlerDeps } from './mocks';
 
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import * as requestModule from '../../../../lib/proxy_request';
 import { createHandler } from './create_handler';
 
diff --git a/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts b/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts
index 3f7ba81c33c03..fbdc53bc5383b 100644
--- a/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts
+++ b/src/plugins/console/server/routes/api/console/proxy/query_string.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { IKibanaResponse } from 'src/core/server';
-import { kibanaResponseFactory } from '../../../../../../../core/server';
+import type { IKibanaResponse } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { getProxyRouteHandlerDeps } from './mocks';
 import { createResponseStub } from './stubs';
 import * as requestModule from '../../../../lib/proxy_request';
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 90bd37cb317bf..39079da24877d 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
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { RequestHandler } from 'kibana/server';
-import { RouteDependencies } from '../../../';
+import { RequestHandler } from '@kbn/core/server';
+import { RouteDependencies } from '../../..';
 
 interface SpecDefinitionsRouteResponse {
   es: {
diff --git a/src/plugins/console/server/routes/index.ts b/src/plugins/console/server/routes/index.ts
index 3911e8cfabc60..a3263fff2e435 100644
--- a/src/plugins/console/server/routes/index.ts
+++ b/src/plugins/console/server/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, Logger } from 'kibana/server';
+import { IRouter, Logger } from '@kbn/core/server';
 import { SemVer } from 'semver';
 
 import { EsLegacyConfigService, SpecDefinitionsService } from '../services';
diff --git a/src/plugins/console/server/services/es_legacy_config_service.ts b/src/plugins/console/server/services/es_legacy_config_service.ts
index ba13c63e8f95b..c604bda08a169 100644
--- a/src/plugins/console/server/services/es_legacy_config_service.ts
+++ b/src/plugins/console/server/services/es_legacy_config_service.ts
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Observable, Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { ElasticsearchConfig } from 'kibana/server';
+import { firstValueFrom, Observable, Subscription } from 'rxjs';
+import { ElasticsearchConfig } from '@kbn/core/server';
 
 export class EsLegacyConfigService {
   /**
@@ -45,7 +44,7 @@ export class EsLegacyConfigService {
     }
 
     if (!this.config) {
-      return this.config$.pipe(first()).toPromise();
+      return firstValueFrom(this.config$);
     }
 
     return this.config;
diff --git a/src/plugins/controls/common/control_group/control_group_persistable_state.ts b/src/plugins/controls/common/control_group/control_group_persistable_state.ts
index 73f569bb7d247..3826a32e0a039 100644
--- a/src/plugins/controls/common/control_group/control_group_persistable_state.ts
+++ b/src/plugins/controls/common/control_group/control_group_persistable_state.ts
@@ -10,10 +10,10 @@ import {
   EmbeddableInput,
   EmbeddablePersistableStateService,
   EmbeddableStateWithType,
-} from '../../../embeddable/common/types';
+} from '@kbn/embeddable-plugin/common/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { ControlGroupInput, ControlPanelState } from './types';
-import { SavedObjectReference } from '../../../../core/types';
-import { MigrateFunctionsObject } from '../../../kibana_utils/common';
 import { makeControlOrdersZeroBased } from './control_group_migrations';
 
 type ControlGroupInputWithType = Partial<ControlGroupInput> & { type: string };
diff --git a/src/plugins/controls/common/control_group/types.ts b/src/plugins/controls/common/control_group/types.ts
index 988109d237cdc..4bc5831649d08 100644
--- a/src/plugins/controls/common/control_group/types.ts
+++ b/src/plugins/controls/common/control_group/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableInput, PanelState } from '../../../embeddable/common/types';
+import { EmbeddableInput, PanelState } from '@kbn/embeddable-plugin/common/types';
 import { ControlInput, ControlStyle, ControlWidth } from '../types';
 
 export const CONTROL_GROUP_TYPE = 'control_group';
diff --git a/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts b/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts
index a41eb788d71e2..546b5361ab125 100644
--- a/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts
+++ b/src/plugins/controls/common/control_types/options_list/options_list_persistable_state.ts
@@ -9,10 +9,10 @@
 import {
   EmbeddableStateWithType,
   EmbeddablePersistableStateService,
-} from '../../../../embeddable/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { OptionsListEmbeddableInput } from './types';
-import { SavedObjectReference } from '../../../../../core/types';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 type OptionsListInputWithType = Partial<OptionsListEmbeddableInput> & { type: string };
 const dataViewReferenceName = 'optionsListDataView';
diff --git a/src/plugins/controls/common/control_types/options_list/types.ts b/src/plugins/controls/common/control_types/options_list/types.ts
index 5561b80b81153..9c051e4ca6235 100644
--- a/src/plugins/controls/common/control_types/options_list/types.ts
+++ b/src/plugins/controls/common/control_types/options_list/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { BoolQuery } from '@kbn/es-query';
-import { FieldSpec } from '../../../../data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 import { ControlInput } from '../../types';
 
 export const OPTIONS_LIST_CONTROL = 'optionsListControl';
diff --git a/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts b/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts
index c50fe3f6fb710..bb4c703ba47be 100644
--- a/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts
+++ b/src/plugins/controls/common/control_types/range_slider/range_slider_persistable_state.ts
@@ -9,10 +9,10 @@
 import {
   EmbeddableStateWithType,
   EmbeddablePersistableStateService,
-} from '../../../../embeddable/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { RangeSliderEmbeddableInput } from './types';
-import { SavedObjectReference } from '../../../../../core/types';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 type RangeSliderInputWithType = Partial<RangeSliderEmbeddableInput> & { type: string };
 const dataViewReferenceName = 'optionsListDataView';
diff --git a/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts b/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts
index 660f33a15a33d..b8b3a5f16b51f 100644
--- a/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts
+++ b/src/plugins/controls/common/control_types/time_slider/time_slider_persistable_state.ts
@@ -9,10 +9,10 @@
 import {
   EmbeddableStateWithType,
   EmbeddablePersistableStateService,
-} from '../../../../embeddable/common';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { TimeSliderControlEmbeddableInput } from './types';
-import { SavedObjectReference } from '../../../../../core/types';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 type TimeSliderInputWithType = Partial<TimeSliderControlEmbeddableInput> & { type: string };
 const dataViewReferenceName = 'timeSliderDataView';
diff --git a/src/plugins/controls/common/types.ts b/src/plugins/controls/common/types.ts
index d8cb073f64241..3715198d7cfe5 100644
--- a/src/plugins/controls/common/types.ts
+++ b/src/plugins/controls/common/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { Filter, Query } from '@kbn/es-query';
-import { TimeRange } from '../../data/common';
-import { EmbeddableInput } from '../../embeddable/common/types';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types';
 
 export type ControlWidth = 'auto' | 'small' | 'medium' | 'large';
 export type ControlStyle = 'twoLine' | 'oneLine';
diff --git a/src/plugins/controls/public/__stories__/controls.stories.tsx b/src/plugins/controls/public/__stories__/controls.stories.tsx
index 12e595f483e04..74d0d3e9de6a9 100644
--- a/src/plugins/controls/public/__stories__/controls.stories.tsx
+++ b/src/plugins/controls/public/__stories__/controls.stories.tsx
@@ -15,17 +15,17 @@ import {
   getFlightOptionsAsync,
   getFlightSearchOptions,
   storybookFlightsDataView,
-} from '../../../presentation_util/public/mocks';
+} from '@kbn/presentation-util-plugin/public/mocks';
+
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 import {
   ControlGroupContainerFactory,
   OptionsListEmbeddableInput,
   RangeSliderEmbeddableInput,
   OPTIONS_LIST_CONTROL,
   RANGE_SLIDER_CONTROL,
-} from '../';
-
-import { ViewMode } from '../../../embeddable/public';
-import { EmbeddablePersistableStateService } from '../../../embeddable/common';
+} from '..';
 
 import { decorators } from './decorators';
 import { ControlsPanels } from '../control_group/types';
diff --git a/src/plugins/controls/public/control_group/component/control_frame_component.tsx b/src/plugins/controls/public/control_group/component/control_frame_component.tsx
index 8ae1aac7867d0..36879bea110d8 100644
--- a/src/plugins/controls/public/control_group/component/control_frame_component.tsx
+++ b/src/plugins/controls/public/control_group/component/control_frame_component.tsx
@@ -17,12 +17,12 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
 import { pluginServices } from '../../services';
 import { EditControlButton } from '../editor/edit_control';
 import { ControlGroupStrings } from '../control_group_strings';
 import { useChildEmbeddable } from '../../hooks/use_child_embeddable';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 
 export interface ControlFrameProps {
   customPrepend?: JSX.Element;
diff --git a/src/plugins/controls/public/control_group/component/control_group_component.tsx b/src/plugins/controls/public/control_group/component/control_group_component.tsx
index 3bc82c0f2aae7..3abee52002db1 100644
--- a/src/plugins/controls/public/control_group/component/control_group_component.tsx
+++ b/src/plugins/controls/public/control_group/component/control_group_component.tsx
@@ -28,11 +28,11 @@ import {
   useSensors,
   LayoutMeasuringStrategy,
 } from '@dnd-kit/core';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
-import { ViewMode } from '../../../../embeddable/public';
 import { controlGroupReducers } from '../state/control_group_reducers';
 import { ControlClone, SortableControl } from './control_group_sortable_item';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 
 export const ControlGroup = () => {
   // Redux embeddable container Context
diff --git a/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx b/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
index 7f7944c8ca319..2741752b4df88 100644
--- a/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
+++ b/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
@@ -12,9 +12,9 @@ import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import classNames from 'classnames';
 
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
 import { ControlFrame, ControlFrameProps } from './control_frame_component';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 
 interface DragInfo {
   isOver?: boolean;
diff --git a/src/plugins/controls/public/control_group/editor/control_editor.tsx b/src/plugins/controls/public/control_group/editor/control_editor.tsx
index 269c39a7cbf9e..3cd5b92e503c1 100644
--- a/src/plugins/controls/public/control_group/editor/control_editor.tsx
+++ b/src/plugins/controls/public/control_group/editor/control_editor.tsx
@@ -35,6 +35,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
+import { EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import {
   ControlEmbeddable,
@@ -44,7 +45,6 @@ import {
 } from '../../types';
 import { CONTROL_WIDTH_OPTIONS } from './editor_constants';
 import { pluginServices } from '../../services';
-import { EmbeddableFactoryDefinition } from '../../../../embeddable/public';
 
 interface EditControlProps {
   embeddable?: ControlEmbeddable;
diff --git a/src/plugins/controls/public/control_group/editor/create_control.tsx b/src/plugins/controls/public/control_group/editor/create_control.tsx
index 7ae0416feac2e..085f0d21e7dc0 100644
--- a/src/plugins/controls/public/control_group/editor/create_control.tsx
+++ b/src/plugins/controls/public/control_group/editor/create_control.tsx
@@ -9,12 +9,12 @@
 import { EuiButton, EuiContextMenuItem } from '@elastic/eui';
 import React from 'react';
 
+import { OverlayRef } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../../services';
 import { ControlEditor } from './control_editor';
-import { OverlayRef } from '../../../../../core/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { ControlWidth, ControlInput, IEditableControlFactory } from '../../types';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { DEFAULT_CONTROL_WIDTH } from '../../../common/control_group/control_group_constants';
 import { setFlyoutRef } from '../embeddable/control_group_container';
 
diff --git a/src/plugins/controls/public/control_group/editor/edit_control.tsx b/src/plugins/controls/public/control_group/editor/edit_control.tsx
index 7c114350f3679..11a2e705a13f3 100644
--- a/src/plugins/controls/public/control_group/editor/edit_control.tsx
+++ b/src/plugins/controls/public/control_group/editor/edit_control.tsx
@@ -10,16 +10,16 @@ import { isEqual } from 'lodash';
 import { EuiButtonIcon } from '@elastic/eui';
 import React, { useEffect, useRef } from 'react';
 
+import { OverlayRef } from '@kbn/core/public';
+import { EmbeddableFactoryNotFoundError } from '@kbn/embeddable-plugin/public';
+import { useReduxContainerContext } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../types';
 import { ControlEditor } from './control_editor';
 import { pluginServices } from '../../services';
 import { forwardAllContext } from './forward_all_context';
-import { OverlayRef } from '../../../../../core/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { IEditableControlFactory, ControlInput } from '../../types';
 import { controlGroupReducers } from '../state/control_group_reducers';
-import { EmbeddableFactoryNotFoundError } from '../../../../embeddable/public';
-import { useReduxContainerContext } from '../../../../presentation_util/public';
 import { ControlGroupContainer, setFlyoutRef } from '../embeddable/control_group_container';
 
 export const EditControlButton = ({ embeddableId }: { embeddableId: string }) => {
diff --git a/src/plugins/controls/public/control_group/editor/edit_control_group.tsx b/src/plugins/controls/public/control_group/editor/edit_control_group.tsx
index 8d9f81637ef65..733d009878937 100644
--- a/src/plugins/controls/public/control_group/editor/edit_control_group.tsx
+++ b/src/plugins/controls/public/control_group/editor/edit_control_group.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { EuiContextMenuItem } from '@elastic/eui';
 
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { OverlayRef } from '@kbn/core/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { ControlGroupEditor } from './control_group_editor';
-import { OverlayRef } from '../../../../../core/public';
 import { pluginServices } from '../../services';
 import { ControlGroupContainer } from '..';
 import { setFlyoutRef } from '../embeddable/control_group_container';
diff --git a/src/plugins/controls/public/control_group/editor/forward_all_context.tsx b/src/plugins/controls/public/control_group/editor/forward_all_context.tsx
index 23d7e60573323..1d700b036fdcd 100644
--- a/src/plugins/controls/public/control_group/editor/forward_all_context.tsx
+++ b/src/plugins/controls/public/control_group/editor/forward_all_context.tsx
@@ -9,13 +9,13 @@
 import { ReactElement } from 'react';
 import React from 'react';
 
-import { ControlGroupInput } from '../types';
-import { pluginServices } from '../../services';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   ReduxContainerContextServices,
   ReduxEmbeddableContext,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { ControlGroupInput } from '../types';
+import { pluginServices } from '../../services';
 
 /**
  * The overlays service creates its divs outside the flow of the component. This necessitates
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
index 6f0f3e1a23218..08f91cc0d613e 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
@@ -9,9 +9,9 @@
 import { Filter } from '@kbn/es-query';
 
 import { Subject } from 'rxjs';
+import { EmbeddableContainerSettings, isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 import { ControlEmbeddable } from '../../types';
 import { ChildEmbeddableOrderCache } from './control_group_container';
-import { EmbeddableContainerSettings, isErrorEmbeddable } from '../../../../embeddable/public';
 import { ControlGroupChainingSystem, ControlGroupInput } from '../../../common/control_group/types';
 
 interface GetPrecedingFiltersProps {
@@ -59,7 +59,7 @@ export const ControlGroupChainingSystems: {
     onChildChange: ({ childOutputChangedId, childOrder, recalculateFilters$, getChild }) => {
       if (childOutputChangedId === childOrder.lastChildId) {
         // the last control's output has updated, recalculate filters
-        recalculateFilters$.next();
+        recalculateFilters$.next(null);
         return;
       }
 
@@ -75,6 +75,6 @@ export const ControlGroupChainingSystems: {
   NONE: {
     getContainerSettings: () => undefined,
     getPrecedingFilters: () => undefined,
-    onChildChange: ({ recalculateFilters$ }) => recalculateFilters$.next(),
+    onChildChange: ({ recalculateFilters$ }) => recalculateFilters$.next(null),
   },
 };
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx b/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
index 5ee41946a14aa..7d892d2a90d0e 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
@@ -23,6 +23,15 @@ import {
   mapTo,
 } from 'rxjs/operators';
 
+import {
+  withSuspense,
+  LazyReduxEmbeddableWrapper,
+  ReduxEmbeddableWrapperPropsWithChildren,
+  SolutionToolbarPopover,
+} from '@kbn/presentation-util-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { Container, EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { OverlayRef } from '@kbn/core/public';
 import {
   ControlGroupInput,
   ControlGroupOutput,
@@ -30,23 +39,14 @@ import {
   ControlsPanels,
   CONTROL_GROUP_TYPE,
 } from '../types';
-import {
-  withSuspense,
-  LazyReduxEmbeddableWrapper,
-  ReduxEmbeddableWrapperPropsWithChildren,
-  SolutionToolbarPopover,
-} from '../../../../presentation_util/public';
 import { pluginServices } from '../../services';
-import { DataView } from '../../../../data_views/public';
 import { ControlGroupStrings } from '../control_group_strings';
 import { EditControlGroup } from '../editor/edit_control_group';
 import { ControlGroup } from '../component/control_group_component';
 import { controlGroupReducers } from '../state/control_group_reducers';
-import { Container, EmbeddableFactory } from '../../../../embeddable/public';
 import { ControlEmbeddable, ControlInput, ControlOutput } from '../../types';
 import { ControlGroupChainingSystems } from './control_group_chaining_system';
 import { CreateControlButton, CreateControlButtonTypes } from '../editor/create_control';
-import { OverlayRef } from '../../../../../core/public';
 
 const ControlGroupReduxWrapper = withSuspense<
   ReduxEmbeddableWrapperPropsWithChildren<ControlGroupInput>
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts b/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
index 11bf0bbc4aa7f..a8e31e6e2dbec 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
@@ -14,8 +14,8 @@
  * Side Public License, v 1.
  */
 
-import { Container, EmbeddableFactoryDefinition } from '../../../../embeddable/public';
-import { EmbeddablePersistableStateService } from '../../../../embeddable/common';
+import { Container, EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { ControlGroupInput, CONTROL_GROUP_TYPE } from '../types';
 import { ControlGroupStrings } from '../control_group_strings';
diff --git a/src/plugins/controls/public/control_group/types.ts b/src/plugins/controls/public/control_group/types.ts
index 5f6ec00efffab..05422fd0c9729 100644
--- a/src/plugins/controls/public/control_group/types.ts
+++ b/src/plugins/controls/public/control_group/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { ContainerOutput } from '@kbn/embeddable-plugin/public';
 import { CommonControlOutput } from '../types';
-import { ContainerOutput } from '../../../embeddable/public';
 
 export type ControlGroupOutput = ContainerOutput & CommonControlOutput;
 
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_component.tsx b/src/plugins/controls/public/control_types/options_list/options_list_component.tsx
index 3e3d950f532db..5d72e1eb2564c 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_component.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_component.tsx
@@ -12,15 +12,15 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import classNames from 'classnames';
 import { debounce, isEmpty } from 'lodash';
 
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { OptionsListStrings } from './options_list_strings';
 import { optionsListReducers } from './options_list_reducers';
 import { OptionsListPopover } from './options_list_popover_component';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
 
 import './options_list.scss';
 import { useStateObservable } from '../../hooks/use_state_observable';
 import { OptionsListEmbeddableInput } from './types';
-import { DataViewField } from '../../../../data_views/public';
 
 // OptionsListComponentState is controlled by the embeddable, but is not considered embeddable input.
 export interface OptionsListComponentState {
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx b/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
index 7fe50f010c5b4..d77cf2b2c1a71 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
@@ -10,16 +10,16 @@ import useMount from 'react-use/lib/useMount';
 import React, { useEffect, useState } from 'react';
 import { EuiFormRow, EuiSwitch } from '@elastic/eui';
 
-import { pluginServices } from '../../services';
-import { ControlEditorProps } from '../../types';
-import { OptionsListEmbeddableInput } from './types';
-import { OptionsListStrings } from './options_list_strings';
-import { DataViewListItem, DataView } from '../../../../data_views/common';
+import { DataViewListItem, DataView } from '@kbn/data-views-plugin/common';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { pluginServices } from '../../services';
+import { ControlEditorProps } from '../../types';
+import { OptionsListEmbeddableInput } from './types';
+import { OptionsListStrings } from './options_list_strings';
 
 interface OptionsListEditorState {
   singleSelect?: boolean;
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx b/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx
index 0f5a7524db02b..b315fd00392ea 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_embeddable.tsx
@@ -20,20 +20,20 @@ import deepEqual from 'fast-deep-equal';
 import { merge, Subject, Subscription, BehaviorSubject } from 'rxjs';
 import { tap, debounceTime, map, distinctUntilChanged, skip } from 'rxjs/operators';
 
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import {
+  withSuspense,
+  LazyReduxEmbeddableWrapper,
+  ReduxEmbeddableWrapperPropsWithChildren,
+} from '@kbn/presentation-util-plugin/public';
 import { OptionsListComponent, OptionsListComponentState } from './options_list_component';
 import { OptionsListEmbeddableInput, OPTIONS_LIST_CONTROL } from './types';
-import { DataView, DataViewField } from '../../../../data_views/public';
-import { Embeddable, IContainer } from '../../../../embeddable/public';
 import { ControlsDataViewsService } from '../../services/data_views';
 import { optionsListReducers } from './options_list_reducers';
 import { OptionsListStrings } from './options_list_strings';
 import { ControlInput, ControlOutput } from '../..';
 import { pluginServices } from '../../services';
-import {
-  withSuspense,
-  LazyReduxEmbeddableWrapper,
-  ReduxEmbeddableWrapperPropsWithChildren,
-} from '../../../../presentation_util/public';
 import { ControlsOptionsListService } from '../../services/options_list';
 
 const OptionsListReduxWrapper = withSuspense<
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx b/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
index 59a56d1fdb2a2..242036ae69c02 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import deepEqual from 'fast-deep-equal';
 
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { OptionsListEditor } from './options_list_editor';
 import { ControlEmbeddable, IEditableControlFactory } from '../../types';
 import { OptionsListEmbeddableInput, OPTIONS_LIST_CONTROL } from './types';
-import { EmbeddableFactoryDefinition, IContainer } from '../../../../embeddable/public';
 import {
   createOptionsListExtract,
   createOptionsListInject,
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx b/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx
index ab83b868445a9..aa6b14c73f6e1 100644
--- a/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx
+++ b/src/plugins/controls/public/control_types/options_list/options_list_popover_component.tsx
@@ -23,12 +23,12 @@ import {
 } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { OptionsListEmbeddableInput } from './types';
 import { OptionsListStrings } from './options_list_strings';
-import { DataViewField } from '../../../../data_views/public';
 import { optionsListReducers } from './options_list_reducers';
 import { OptionsListComponentState } from './options_list_component';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
 
 export const OptionsListPopover = ({
   field,
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
index 822c88ca10df0..f1002290eab3d 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
@@ -9,8 +9,8 @@
 import React, { FC, useCallback, useState } from 'react';
 import { BehaviorSubject } from 'rxjs';
 
-import { DataViewField } from '../../../../data_views/public';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { useStateObservable } from '../../hooks/use_state_observable';
 import { RangeSliderPopover } from './range_slider_popover';
 import { rangeSliderReducers } from './range_slider_reducers';
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
index d8ec5ae933c9f..fa0c2c7d3cc45 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
@@ -10,16 +10,16 @@ import useMount from 'react-use/lib/useMount';
 import React, { useEffect, useState } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 
-import { pluginServices } from '../../services';
-import { ControlEditorProps } from '../../types';
-import { RangeSliderEmbeddableInput } from './types';
-import { RangeSliderStrings } from './range_slider_strings';
-import { DataViewListItem, DataView } from '../../../../data_views/common';
+import { DataViewListItem, DataView } from '@kbn/data-views-plugin/common';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { pluginServices } from '../../services';
+import { ControlEditorProps } from '../../types';
+import { RangeSliderEmbeddableInput } from './types';
+import { RangeSliderStrings } from './range_slider_strings';
 
 interface RangeSliderEditorState {
   dataViewListItems: DataViewListItem[];
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
index 965eb2da18e93..2777f45d026bd 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
@@ -24,9 +24,9 @@ import {
   withSuspense,
   LazyReduxEmbeddableWrapper,
   ReduxEmbeddableWrapperPropsWithChildren,
-} from '../../../../presentation_util/public';
-import { Embeddable, IContainer } from '../../../../embeddable/public';
-import { DataView, DataViewField } from '../../../../data_views/public';
+} from '@kbn/presentation-util-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 import { ControlsDataViewsService } from '../../services/data_views';
 import { ControlsDataService } from '../../services/data';
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
index fbdaff4f5b349..74bb2d23dbd88 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import deepEqual from 'fast-deep-equal';
 
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { RangeSliderEditor } from './range_slider_editor';
 import { ControlEmbeddable, IEditableControlFactory } from '../../types';
 import { RangeSliderEmbeddableInput, RANGE_SLIDER_CONTROL } from './types';
-import { EmbeddableFactoryDefinition, IContainer } from '../../../../embeddable/public';
 import {
   createRangeSliderExtract,
   createRangeSliderInject,
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx
index 5aab250136ac1..89efce270d14c 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider.component.tsx
@@ -21,8 +21,8 @@ import {
 } from '@elastic/eui';
 import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks';
 import moment from 'moment-timezone';
-import { calcAutoIntervalNear } from '../../../../data/common';
-import { ValidatedDualRange } from '../../../../kibana_react/public';
+import { calcAutoIntervalNear } from '@kbn/data-plugin/common';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { TimeSliderStrings } from './time_slider_strings';
 import './time_slider.component.scss';
 
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
index d2198416fdc42..61a47d8779a1d 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
@@ -9,8 +9,8 @@
 import React, { FC, useCallback, useState, useMemo } from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { debounce } from 'lodash';
+import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { useStateObservable } from '../../hooks/use_state_observable';
-import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
 import { TimeSliderControlEmbeddableInput } from '../../../common/control_types/time_slider/types';
 import { timeSliderReducers } from './time_slider_reducers';
 import { TimeSlider as Component } from './time_slider.component';
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
index 4674db37a3729..e9616abcbe13f 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
@@ -10,14 +10,14 @@ import useMount from 'react-use/lib/useMount';
 import React, { useEffect, useState } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 
-import { pluginServices } from '../../services';
-import { ControlEditorProps } from '../../types';
-import { DataViewListItem, DataView } from '../../../../data_views/common';
+import { DataViewListItem, DataView } from '@kbn/data-views-plugin/common';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { pluginServices } from '../../services';
+import { ControlEditorProps } from '../../types';
 import { TimeSliderStrings } from './time_slider_strings';
 
 interface TimeSliderEditorState {
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts
index c4a42e6b03e2c..b4c1f3ce5c7c0 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.test.ts
@@ -10,7 +10,7 @@ import { of } from 'rxjs';
 import { delay, map } from 'rxjs/operators';
 import { TimeSliderControlEmbeddableInput } from '.';
 import { TimeSliderControlEmbeddable } from './time_slider_embeddable';
-import { stubLogstashDataView } from '../../../../data_views/common/data_view.stub';
+import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 import { pluginServices } from '../../services';
 import { TestScheduler } from 'rxjs/testing';
 import { buildRangeFilter } from '@kbn/es-query';
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
index d6507c10b2d6f..7900cc193ac24 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable.tsx
@@ -14,19 +14,18 @@ import deepEqual from 'fast-deep-equal';
 import { merge, Subscription, BehaviorSubject, Observable } from 'rxjs';
 import { map, distinctUntilChanged, skip, take, mergeMap } from 'rxjs/operators';
 
-import { TimeSliderControlEmbeddableInput } from '../../../common/control_types/time_slider/types';
-
 import {
   withSuspense,
   LazyReduxEmbeddableWrapper,
   ReduxEmbeddableWrapperPropsWithChildren,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { TimeSliderControlEmbeddableInput } from '../../../common/control_types/time_slider/types';
 
-import { TIME_SLIDER_CONTROL } from '../../';
+import { TIME_SLIDER_CONTROL } from '../..';
 import { ControlsSettingsService } from '../../services/settings';
-import { Embeddable, IContainer } from '../../../../embeddable/public';
 import { ControlsDataService } from '../../services/data';
-import { DataView } from '../../../../data_views/public';
 import { ControlOutput } from '../..';
 import { pluginServices } from '../../services';
 
@@ -151,7 +150,7 @@ export class TimeSliderControlEmbeddable extends Embeddable<
     const min = value ? value[0] : null;
     const max = value ? value[1] : null;
     const hasRange =
-      this.componentState.range!.max !== undefined && this.componentState.range!.min !== undefined;
+      this.componentState.range?.max !== undefined && this.componentState.range?.min !== undefined;
 
     this.getCurrentDataView$().subscribe((dataView) => {
       const range: RangeFilterParams = {};
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
index 23003a9e90641..fcb023782321d 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
@@ -8,9 +8,9 @@
 
 import deepEqual from 'fast-deep-equal';
 
-import { TIME_SLIDER_CONTROL } from '../../';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
+import { TIME_SLIDER_CONTROL } from '../..';
 import { ControlEmbeddable, IEditableControlFactory } from '../../types';
-import { EmbeddableFactoryDefinition, IContainer } from '../../../../embeddable/public';
 import {
   createOptionsListExtract,
   createOptionsListInject,
diff --git a/src/plugins/controls/public/controls_service.ts b/src/plugins/controls/public/controls_service.ts
index 69efacbef2915..e13b591bfa91e 100644
--- a/src/plugins/controls/public/controls_service.ts
+++ b/src/plugins/controls/public/controls_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlInput, ControlOutput } from '.';
-import { EmbeddableFactory } from '../../embeddable/public';
 import { ControlTypeRegistry } from './services/controls';
 
 export class ControlsService {
diff --git a/src/plugins/controls/public/plugin.ts b/src/plugins/controls/public/plugin.ts
index b583f14d94ddd..51705640b06f2 100644
--- a/src/plugins/controls/public/plugin.ts
+++ b/src/plugins/controls/public/plugin.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { pluginServices } from './services';
 import {
   ControlsPluginSetup,
@@ -36,7 +37,6 @@ import {
   TimeSliderControlEmbeddableInput,
 } from './control_types/time_slider';
 import { controlsService } from './services/kibana/controls';
-import { EmbeddableFactory } from '../../embeddable/public';
 
 export class ControlsPlugin
   implements
diff --git a/src/plugins/controls/public/services/controls.ts b/src/plugins/controls/public/services/controls.ts
index 7ca396b267e14..5d6731922e6d9 100644
--- a/src/plugins/controls/public/services/controls.ts
+++ b/src/plugins/controls/public/services/controls.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableFactory } from '../../../embeddable/public';
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlOutput, ControlInput } from '../types';
 
 export interface ControlTypeRegistry {
diff --git a/src/plugins/controls/public/services/data.ts b/src/plugins/controls/public/services/data.ts
index 57c2342beb425..74c30a1f6d70e 100644
--- a/src/plugins/controls/public/services/data.ts
+++ b/src/plugins/controls/public/services/data.ts
@@ -7,8 +7,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ControlInput } from '../types';
 
 export interface ControlsDataService {
diff --git a/src/plugins/controls/public/services/data_views.ts b/src/plugins/controls/public/services/data_views.ts
index 2308366e27660..bed8f12f88481 100644
--- a/src/plugins/controls/public/services/data_views.ts
+++ b/src/plugins/controls/public/services/data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export interface ControlsDataViewsService {
   get: DataViewsPublicPluginStart['get'];
diff --git a/src/plugins/controls/public/services/http.ts b/src/plugins/controls/public/services/http.ts
index 1e3d7f92163bd..ce75c4b75a3d0 100644
--- a/src/plugins/controls/public/services/http.ts
+++ b/src/plugins/controls/public/services/http.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from '../../../../core/public';
+import { CoreSetup } from '@kbn/core/public';
 
 export interface ControlsHTTPService {
   fetch: CoreSetup['http']['fetch'];
diff --git a/src/plugins/controls/public/services/index.ts b/src/plugins/controls/public/services/index.ts
index 1a8c8b0c4bdfe..cf358dac8b48b 100644
--- a/src/plugins/controls/public/services/index.ts
+++ b/src/plugins/controls/public/services/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServices } from '../../../presentation_util/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 import { ControlsDataViewsService } from './data_views';
 import { ControlsOverlaysService } from './overlays';
 import { registry as stubRegistry } from './stub';
diff --git a/src/plugins/controls/public/services/kibana/controls.ts b/src/plugins/controls/public/services/kibana/controls.ts
index 8b53c62ff0f4e..6cb9e3a564e91 100644
--- a/src/plugins/controls/public/services/kibana/controls.ts
+++ b/src/plugins/controls/public/services/kibana/controls.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlInput, ControlOutput } from '../..';
-import { EmbeddableFactory } from '../../../../embeddable/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
 import { ControlsService, ControlTypeRegistry } from '../controls';
 
 export type ControlsServiceFactory = PluginServiceFactory<ControlsService>;
diff --git a/src/plugins/controls/public/services/kibana/data.ts b/src/plugins/controls/public/services/kibana/data.ts
index 9eb981d90c237..3a36b929c7cb0 100644
--- a/src/plugins/controls/public/services/kibana/data.ts
+++ b/src/plugins/controls/public/services/kibana/data.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from 'src/plugins/data_views/common';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { get } from 'lodash';
 import { from } from 'rxjs';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsDataService } from '../data';
 import { ControlsPluginStartDeps } from '../../types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type DataServiceFactory = KibanaPluginServiceFactory<
   ControlsDataService,
diff --git a/src/plugins/controls/public/services/kibana/data_views.ts b/src/plugins/controls/public/services/kibana/data_views.ts
index c878423390a64..255abf1982f1e 100644
--- a/src/plugins/controls/public/services/kibana/data_views.ts
+++ b/src/plugins/controls/public/services/kibana/data_views.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsDataViewsService } from '../data_views';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type DataViewsServiceFactory = KibanaPluginServiceFactory<
   ControlsDataViewsService,
diff --git a/src/plugins/controls/public/services/kibana/http.ts b/src/plugins/controls/public/services/kibana/http.ts
index 2eda2e4bf3f8c..8cf20652c506a 100644
--- a/src/plugins/controls/public/services/kibana/http.ts
+++ b/src/plugins/controls/public/services/kibana/http.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsHTTPService } from '../http';
 import { ControlsPluginStartDeps } from '../../types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type HttpServiceFactory = KibanaPluginServiceFactory<
   ControlsHTTPService,
diff --git a/src/plugins/controls/public/services/kibana/index.ts b/src/plugins/controls/public/services/kibana/index.ts
index 19a2c0891ac8f..bed97091bed55 100644
--- a/src/plugins/controls/public/services/kibana/index.ts
+++ b/src/plugins/controls/public/services/kibana/index.ts
@@ -11,7 +11,7 @@ import {
   KibanaPluginServiceParams,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsServices } from '..';
 
diff --git a/src/plugins/controls/public/services/kibana/options_list.ts b/src/plugins/controls/public/services/kibana/options_list.ts
index a731b0acca62b..54bd33f5890bd 100644
--- a/src/plugins/controls/public/services/kibana/options_list.ts
+++ b/src/plugins/controls/public/services/kibana/options_list.ts
@@ -10,13 +10,13 @@ import { memoize } from 'lodash';
 import dateMath from '@kbn/datemath';
 import { buildEsQuery } from '@kbn/es-query';
 
-import { TimeRange } from '../../../../data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsOptionsListService, OptionsListRequest } from '../options_list';
 import {
   OptionsListRequestBody,
   OptionsListResponse,
 } from '../../control_types/options_list/types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsDataService } from '../data';
 import { ControlsHTTPService } from '../http';
diff --git a/src/plugins/controls/public/services/kibana/overlays.ts b/src/plugins/controls/public/services/kibana/overlays.ts
index 43b8bd61ccb4a..dc6435f319e5e 100644
--- a/src/plugins/controls/public/services/kibana/overlays.ts
+++ b/src/plugins/controls/public/services/kibana/overlays.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsPluginStartDeps } from '../../types';
 import { ControlsOverlaysService } from '../overlays';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type OverlaysServiceFactory = KibanaPluginServiceFactory<
   ControlsOverlaysService,
diff --git a/src/plugins/controls/public/services/kibana/settings.ts b/src/plugins/controls/public/services/kibana/settings.ts
index 27e308f19693b..e62c92cf7db1a 100644
--- a/src/plugins/controls/public/services/kibana/settings.ts
+++ b/src/plugins/controls/public/services/kibana/settings.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsSettingsService } from '../settings';
 import { ControlsPluginStartDeps } from '../../types';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 export type SettingsServiceFactory = KibanaPluginServiceFactory<
   ControlsSettingsService,
diff --git a/src/plugins/controls/public/services/options_list.ts b/src/plugins/controls/public/services/options_list.ts
index 479d1bee691bb..e133dc1362698 100644
--- a/src/plugins/controls/public/services/options_list.ts
+++ b/src/plugins/controls/public/services/options_list.ts
@@ -8,8 +8,8 @@
 
 import { Filter, Query } from '@kbn/es-query';
 
-import { TimeRange } from '../../../data/public';
-import { DataView, DataViewField } from '../../../data_views/public';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { OptionsListRequestBody, OptionsListResponse } from '../control_types/options_list/types';
 
 export type OptionsListRequest = Omit<
diff --git a/src/plugins/controls/public/services/overlays.ts b/src/plugins/controls/public/services/overlays.ts
index 9a30fca209c2f..9c18bbbdb2929 100644
--- a/src/plugins/controls/public/services/overlays.ts
+++ b/src/plugins/controls/public/services/overlays.ts
@@ -11,7 +11,7 @@ import {
   OverlayFlyoutOpenOptions,
   OverlayModalConfirmOptions,
   OverlayRef,
-} from '../../../../core/public';
+} from '@kbn/core/public';
 
 export interface ControlsOverlaysService {
   openFlyout(mount: MountPoint, options?: OverlayFlyoutOpenOptions): OverlayRef;
diff --git a/src/plugins/controls/public/services/storybook/data.ts b/src/plugins/controls/public/services/storybook/data.ts
index 3e63066d0d5ff..38a8d01d8c7c8 100644
--- a/src/plugins/controls/public/services/storybook/data.ts
+++ b/src/plugins/controls/public/services/storybook/data.ts
@@ -7,9 +7,9 @@
  */
 
 import { of, Observable } from 'rxjs';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
-import { DataPublicPluginStart } from '../../../../data/public';
-import { DataViewField, DataView } from '../../../../data_views/common';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/common';
 import { ControlsDataService } from '../data';
 
 let valueSuggestionMethod = ({ field, query }: { field: DataViewField; query: string }) =>
diff --git a/src/plugins/controls/public/services/storybook/data_views.ts b/src/plugins/controls/public/services/storybook/data_views.ts
index 5248dfbd70507..11242668abcc5 100644
--- a/src/plugins/controls/public/services/storybook/data_views.ts
+++ b/src/plugins/controls/public/services/storybook/data_views.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
-import { DataViewsPublicPluginStart } from '../../../../data_views/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { ControlsDataViewsService } from '../data_views';
-import { DataView } from '../../../../data_views/common';
 
 export type DataViewsServiceFactory = PluginServiceFactory<ControlsDataViewsService>;
 
diff --git a/src/plugins/controls/public/services/storybook/index.ts b/src/plugins/controls/public/services/storybook/index.ts
index 535befd925f49..f586063e5a339 100644
--- a/src/plugins/controls/public/services/storybook/index.ts
+++ b/src/plugins/controls/public/services/storybook/index.ts
@@ -11,7 +11,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { ControlsServices } from '..';
 import { dataServiceFactory } from './data';
 import { overlaysServiceFactory } from './overlays';
diff --git a/src/plugins/controls/public/services/storybook/options_list.ts b/src/plugins/controls/public/services/storybook/options_list.ts
index ee604042a2064..f5288980bab35 100644
--- a/src/plugins/controls/public/services/storybook/options_list.ts
+++ b/src/plugins/controls/public/services/storybook/options_list.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { OptionsListResponse } from '../../control_types/options_list/types';
 import { ControlsOptionsListService, OptionsListRequest } from '../options_list';
 
diff --git a/src/plugins/controls/public/services/storybook/overlays.tsx b/src/plugins/controls/public/services/storybook/overlays.tsx
index 9ab4ea0b2c450..23320f966c09f 100644
--- a/src/plugins/controls/public/services/storybook/overlays.tsx
+++ b/src/plugins/controls/public/services/storybook/overlays.tsx
@@ -15,10 +15,10 @@ import {
   OverlayFlyoutOpenOptions,
   OverlayModalConfirmOptions,
   OverlayRef,
-} from '../../../../../core/public';
+} from '@kbn/core/public';
+import { MountWrapper } from '@kbn/core/public/utils';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsOverlaysService } from '../overlays';
-import { MountWrapper } from '../../../../../core/public/utils';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
 
 type OverlaysServiceFactory = PluginServiceFactory<ControlsOverlaysService>;
 
diff --git a/src/plugins/controls/public/services/storybook/settings.ts b/src/plugins/controls/public/services/storybook/settings.ts
index 40b175bcec7bb..e10108cc435ed 100644
--- a/src/plugins/controls/public/services/storybook/settings.ts
+++ b/src/plugins/controls/public/services/storybook/settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsSettingsService } from '../settings';
 
 export type SettingsServiceFactory = PluginServiceFactory<ControlsSettingsService>;
diff --git a/src/plugins/controls/public/services/stub/controls.ts b/src/plugins/controls/public/services/stub/controls.ts
index 0bc1ae9b9d305..f3e065142f637 100644
--- a/src/plugins/controls/public/services/stub/controls.ts
+++ b/src/plugins/controls/public/services/stub/controls.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlEmbeddable, ControlFactory, ControlInput, ControlOutput } from '../..';
-import { EmbeddableFactory } from '../../../../embeddable/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
 import { ControlsService, ControlTypeRegistry } from '../controls';
 
 export type ControlsServiceFactory = PluginServiceFactory<ControlsService>;
diff --git a/src/plugins/controls/public/services/stub/http.ts b/src/plugins/controls/public/services/stub/http.ts
index d33083b0641fc..dfd1a5afad6b3 100644
--- a/src/plugins/controls/public/services/stub/http.ts
+++ b/src/plugins/controls/public/services/stub/http.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { HttpResponse } from '../../../../../core/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { HttpResponse } from '@kbn/core/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsHTTPService } from '../http';
 
 type HttpServiceFactory = PluginServiceFactory<ControlsHTTPService>;
diff --git a/src/plugins/controls/public/services/stub/index.ts b/src/plugins/controls/public/services/stub/index.ts
index 486c42a999f9a..9b767496fa985 100644
--- a/src/plugins/controls/public/services/stub/index.ts
+++ b/src/plugins/controls/public/services/stub/index.ts
@@ -10,7 +10,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { ControlsServices } from '..';
 import { httpServiceFactory } from './http';
 import { overlaysServiceFactory } from './overlays';
diff --git a/src/plugins/controls/public/services/stub/overlays.ts b/src/plugins/controls/public/services/stub/overlays.ts
index 3c363111a6646..63f3bc667b017 100644
--- a/src/plugins/controls/public/services/stub/overlays.ts
+++ b/src/plugins/controls/public/services/stub/overlays.ts
@@ -11,8 +11,8 @@ import {
   OverlayFlyoutOpenOptions,
   OverlayModalConfirmOptions,
   OverlayRef,
-} from '../../../../../core/public';
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+} from '@kbn/core/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { ControlsOverlaysService } from '../overlays';
 
 type OverlaysServiceFactory = PluginServiceFactory<ControlsOverlaysService>;
diff --git a/src/plugins/controls/public/types.ts b/src/plugins/controls/public/types.ts
index 745aa1bc32465..e5915262223e4 100644
--- a/src/plugins/controls/public/types.ts
+++ b/src/plugins/controls/public/types.ts
@@ -14,11 +14,11 @@ import {
   EmbeddableSetup,
   EmbeddableStart,
   IEmbeddable,
-} from '../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { ControlInput } from '../common/types';
-import { DataPublicPluginStart } from '../../data/public';
 import { ControlsService } from './services/controls';
-import { DataView, DataViewsPublicPluginStart } from '../../data_views/public';
 
 export interface CommonControlOutput {
   filters?: Filter[];
diff --git a/src/plugins/controls/server/control_group/control_group_container_factory.ts b/src/plugins/controls/server/control_group/control_group_container_factory.ts
index 179b7ebd55984..806efd652db57 100644
--- a/src/plugins/controls/server/control_group/control_group_container_factory.ts
+++ b/src/plugins/controls/server/control_group/control_group_container_factory.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddablePersistableStateService } from '../../../embeddable/common';
-import { EmbeddableRegistryDefinition } from '../../../embeddable/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { CONTROL_GROUP_TYPE } from '../../common';
 import {
   createControlGroupExtract,
diff --git a/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts b/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
index 846e3cfe9342c..1dd48cced20a4 100644
--- a/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
+++ b/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableRegistryDefinition } from '../../../../embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { OPTIONS_LIST_CONTROL } from '../../../common';
 import {
   createOptionsListExtract,
diff --git a/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts b/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
index a2eab10cc77dc..70c1db510c539 100644
--- a/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
+++ b/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
@@ -12,14 +12,14 @@ import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { Observable } from 'rxjs';
 
+import { CoreSetup, ElasticsearchClient } from '@kbn/core/server';
+import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
+import { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
+import { FieldSpec, getFieldSubtypeNested } from '@kbn/data-views-plugin/common';
 import {
   OptionsListRequestBody,
   OptionsListResponse,
 } from '../../../common/control_types/options_list/types';
-import { CoreSetup, ElasticsearchClient } from '../../../../../core/server';
-import { getKbnServerError, reportServerError } from '../../../../kibana_utils/server';
-import { PluginSetup as DataPluginSetup } from '../../../../data/server';
-import { FieldSpec, getFieldSubtypeNested } from '../../../../data_views/common';
 
 export const setupOptionsListSuggestionsRoute = (
   { http }: CoreSetup,
diff --git a/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts b/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
index 0b48dc94707c4..8e8920f12f554 100644
--- a/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
+++ b/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableRegistryDefinition } from '../../../../embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { TIME_SLIDER_CONTROL } from '../../../common';
 import {
   createTimeSliderExtract,
diff --git a/src/plugins/controls/server/plugin.ts b/src/plugins/controls/server/plugin.ts
index 6ff67f702be54..8e391e5f1ac87 100644
--- a/src/plugins/controls/server/plugin.ts
+++ b/src/plugins/controls/server/plugin.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 
-import { EmbeddableSetup } from '../../embeddable/server';
-import { PluginSetup as DataSetup } from '../../data/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { PluginSetup as DataSetup } from '@kbn/data-plugin/server';
 import { setupOptionsListSuggestionsRoute } from './control_types/options_list/options_list_suggestions_route';
 import { controlGroupContainerPersistableStateServiceFactory } from './control_group/control_group_container_factory';
 import { optionsListPersistableStateServiceFactory } from './control_types/options_list/options_list_embeddable_factory';
diff --git a/src/plugins/controls/storybook/decorator.tsx b/src/plugins/controls/storybook/decorator.tsx
index 603bddf320627..4a618e51c7a55 100644
--- a/src/plugins/controls/storybook/decorator.tsx
+++ b/src/plugins/controls/storybook/decorator.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
+import { PluginServiceRegistry } from '@kbn/presentation-util-plugin/public';
+import { KibanaContextProvider as KibanaReactProvider } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../public/services';
 import { ControlsServices } from '../public/services';
 import { providers } from '../public/services/storybook';
-import { PluginServiceRegistry } from '../../presentation_util/public';
-import { KibanaContextProvider as KibanaReactProvider } from '../../kibana_react/public';
 
 const settings = new Map();
 settings.set('darkMode', true);
diff --git a/src/plugins/custom_integrations/public/mocks.ts b/src/plugins/custom_integrations/public/mocks.ts
index a8fedbbb712b2..20328b6ecafef 100644
--- a/src/plugins/custom_integrations/public/mocks.ts
+++ b/src/plugins/custom_integrations/public/mocks.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { PluginServiceRegistry } from '@kbn/presentation-util-plugin/public';
 import { pluginServices } from './services';
-import { PluginServiceRegistry } from '../../presentation_util/public';
 import { CustomIntegrationsSetup, CustomIntegrationsStart } from './types';
 import { CustomIntegrationsServices } from './services';
 import { providers } from './services/stub';
diff --git a/src/plugins/custom_integrations/public/plugin.test.ts b/src/plugins/custom_integrations/public/plugin.test.ts
index 32f25754fe8e0..fe5c87b421390 100644
--- a/src/plugins/custom_integrations/public/plugin.test.ts
+++ b/src/plugins/custom_integrations/public/plugin.test.ts
@@ -8,7 +8,7 @@
 
 import { CustomIntegrationsPlugin } from './plugin';
 
-import { coreMock } from '../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('CustomIntegrationsPlugin', () => {
   beforeEach(() => {});
diff --git a/src/plugins/custom_integrations/public/plugin.ts b/src/plugins/custom_integrations/public/plugin.ts
index a3470fefba46c..79dd3f19e8c42 100755
--- a/src/plugins/custom_integrations/public/plugin.ts
+++ b/src/plugins/custom_integrations/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   CustomIntegrationsSetup,
   CustomIntegrationsStart,
diff --git a/src/plugins/custom_integrations/public/services/index.ts b/src/plugins/custom_integrations/public/services/index.ts
index 8a257ee1a2cd7..b60027d20839a 100644
--- a/src/plugins/custom_integrations/public/services/index.ts
+++ b/src/plugins/custom_integrations/public/services/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServices } from '../../../presentation_util/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 
 import { CustomIntegrationsFindService } from './find';
 import { CustomIntegrationsPlatformService } from './platform';
diff --git a/src/plugins/custom_integrations/public/services/kibana/find.ts b/src/plugins/custom_integrations/public/services/kibana/find.ts
index 5fc7626baa1e1..749ee8b39f9cd 100644
--- a/src/plugins/custom_integrations/public/services/kibana/find.ts
+++ b/src/plugins/custom_integrations/public/services/kibana/find.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import {
   CustomIntegration,
   ROUTES_APPEND_CUSTOM_INTEGRATIONS,
   ROUTES_REPLACEMENT_CUSTOM_INTEGRATIONS,
 } from '../../../common';
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
 
 import { CustomIntegrationsStartDependencies } from '../../types';
 import { CustomIntegrationsFindService, filterCustomIntegrations } from '../find';
diff --git a/src/plugins/custom_integrations/public/services/kibana/index.ts b/src/plugins/custom_integrations/public/services/kibana/index.ts
index d3cf27b9bc7c0..3bf1d2942be2f 100644
--- a/src/plugins/custom_integrations/public/services/kibana/index.ts
+++ b/src/plugins/custom_integrations/public/services/kibana/index.ts
@@ -11,7 +11,7 @@ import {
   PluginServiceProvider,
   PluginServiceRegistry,
   KibanaPluginServiceParams,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CustomIntegrationsServices } from '..';
 import { CustomIntegrationsStartDependencies } from '../../types';
diff --git a/src/plugins/custom_integrations/public/services/kibana/platform.ts b/src/plugins/custom_integrations/public/services/kibana/platform.ts
index e6fe89b68c975..acd5beb515bf1 100644
--- a/src/plugins/custom_integrations/public/services/kibana/platform.ts
+++ b/src/plugins/custom_integrations/public/services/kibana/platform.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import type { CustomIntegrationsPlatformService } from '../platform';
 import type { CustomIntegrationsStartDependencies } from '../../types';
diff --git a/src/plugins/custom_integrations/public/services/storybook/index.ts b/src/plugins/custom_integrations/public/services/storybook/index.ts
index 4dfed1b37e294..a19f1b5741252 100644
--- a/src/plugins/custom_integrations/public/services/storybook/index.ts
+++ b/src/plugins/custom_integrations/public/services/storybook/index.ts
@@ -10,7 +10,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CustomIntegrationsServices } from '..';
 import { findServiceFactory } from '../stub/find';
diff --git a/src/plugins/custom_integrations/public/services/stub/find.ts b/src/plugins/custom_integrations/public/services/stub/find.ts
index 08def4e63471d..e956cfc2f7aac 100644
--- a/src/plugins/custom_integrations/public/services/stub/find.ts
+++ b/src/plugins/custom_integrations/public/services/stub/find.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CustomIntegrationsFindService, filterCustomIntegrations } from '../find';
 
diff --git a/src/plugins/custom_integrations/public/services/stub/index.ts b/src/plugins/custom_integrations/public/services/stub/index.ts
index fe7465949d565..f066254d9a29c 100644
--- a/src/plugins/custom_integrations/public/services/stub/index.ts
+++ b/src/plugins/custom_integrations/public/services/stub/index.ts
@@ -10,7 +10,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CustomIntegrationsServices } from '..';
 import { findServiceFactory } from './find';
diff --git a/src/plugins/custom_integrations/public/services/stub/platform.ts b/src/plugins/custom_integrations/public/services/stub/platform.ts
index 81891c0c3ac40..61d24309df87f 100644
--- a/src/plugins/custom_integrations/public/services/stub/platform.ts
+++ b/src/plugins/custom_integrations/public/services/stub/platform.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginServiceFactory } from '../../../../presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import type { CustomIntegrationsPlatformService } from '../platform';
 
diff --git a/src/plugins/custom_integrations/server/custom_integration_registry.ts b/src/plugins/custom_integrations/server/custom_integration_registry.ts
index ba1b901b3fb29..e594a2ed514fd 100644
--- a/src/plugins/custom_integrations/server/custom_integration_registry.ts
+++ b/src/plugins/custom_integrations/server/custom_integration_registry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { IntegrationCategory, INTEGRATION_CATEGORY_DISPLAY, CustomIntegration } from '../common';
 
 function isAddable(integration: CustomIntegration): boolean {
diff --git a/src/plugins/custom_integrations/server/index.ts b/src/plugins/custom_integrations/server/index.ts
index e2da055e745c2..95e181903e973 100755
--- a/src/plugins/custom_integrations/server/index.ts
+++ b/src/plugins/custom_integrations/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CustomIntegrationsPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,
diff --git a/src/plugins/custom_integrations/server/language_clients/index.ts b/src/plugins/custom_integrations/server/language_clients/index.ts
index d18eddaf08627..34a804a1470f0 100644
--- a/src/plugins/custom_integrations/server/language_clients/index.ts
+++ b/src/plugins/custom_integrations/server/language_clients/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { CustomIntegrationRegistry } from '../custom_integration_registry';
 import { CustomIntegrationIcon, PLUGIN_ID } from '../../common';
 
diff --git a/src/plugins/custom_integrations/server/mocks.ts b/src/plugins/custom_integrations/server/mocks.ts
index 1846885192853..05921ce278924 100644
--- a/src/plugins/custom_integrations/server/mocks.ts
+++ b/src/plugins/custom_integrations/server/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CustomIntegrationsPluginSetup } from '../server';
+import { CustomIntegrationsPluginSetup } from '.';
 
 function createCustomIntegrationsSetup(): jest.Mocked<CustomIntegrationsPluginSetup> {
   const mock: jest.Mocked<CustomIntegrationsPluginSetup> = {
diff --git a/src/plugins/custom_integrations/server/plugin.test.ts b/src/plugins/custom_integrations/server/plugin.test.ts
index 3b18d2e960c2a..7e08fc3cb1d55 100644
--- a/src/plugins/custom_integrations/server/plugin.test.ts
+++ b/src/plugins/custom_integrations/server/plugin.test.ts
@@ -8,7 +8,7 @@
 
 import { CustomIntegrationsPlugin } from './plugin';
 
-import { coreMock } from '../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('CustomIntegrationsPlugin', () => {
   beforeEach(() => {});
diff --git a/src/plugins/custom_integrations/server/plugin.ts b/src/plugins/custom_integrations/server/plugin.ts
index 330a1288d05a2..4e7c4cffe03d4 100755
--- a/src/plugins/custom_integrations/server/plugin.ts
+++ b/src/plugins/custom_integrations/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
 import { CustomIntegrationsPluginSetup, CustomIntegrationsPluginStart } from './types';
 import { CustomIntegration } from '../common';
diff --git a/src/plugins/custom_integrations/server/routes/define_routes.ts b/src/plugins/custom_integrations/server/routes/define_routes.ts
index 77ec49363dc8f..d8863aa5ffd1a 100644
--- a/src/plugins/custom_integrations/server/routes/define_routes.ts
+++ b/src/plugins/custom_integrations/server/routes/define_routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { CustomIntegrationRegistry } from '../custom_integration_registry';
 import {
   ROUTES_APPEND_CUSTOM_INTEGRATIONS,
diff --git a/src/plugins/custom_integrations/storybook/decorator.tsx b/src/plugins/custom_integrations/storybook/decorator.tsx
index eff12dde9b74a..d202648fe8f80 100644
--- a/src/plugins/custom_integrations/storybook/decorator.tsx
+++ b/src/plugins/custom_integrations/storybook/decorator.tsx
@@ -11,12 +11,12 @@ import React from 'react';
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { PluginServiceRegistry } from '../../presentation_util/public';
+import { PluginServiceRegistry } from '@kbn/presentation-util-plugin/public';
 
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common/eui_styled_components';
 import { pluginServices } from '../public/services';
 import { CustomIntegrationsServices } from '../public/services';
 import { providers } from '../public/services/storybook';
-import { EuiThemeProvider } from '../../kibana_react/common/eui_styled_components';
 
 /**
  * Returns a Storybook Decorator that provides both the `I18nProvider` and access to `PluginServices`
diff --git a/src/plugins/custom_integrations/storybook/index.ts b/src/plugins/custom_integrations/storybook/index.ts
index a9e34e1aeeb7e..3bad5c335cc7f 100644
--- a/src/plugins/custom_integrations/storybook/index.ts
+++ b/src/plugins/custom_integrations/storybook/index.ts
@@ -9,4 +9,4 @@
 export {
   getCustomIntegrationsContextDecorator as getStorybookContextDecorator,
   getCustomIntegrationsContextProvider as getStorybookContextProvider,
-} from '../storybook/decorator';
+} from './decorator';
diff --git a/src/plugins/dashboard/common/bwc/types.ts b/src/plugins/dashboard/common/bwc/types.ts
index ba479210cb009..111e2c52f74bf 100644
--- a/src/plugins/dashboard/common/bwc/types.ts
+++ b/src/plugins/dashboard/common/bwc/types.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'kibana/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import type { Serializable } from '@kbn/utility-types';
 
-import { GridData } from '../';
+import { GridData } from '..';
 
 interface SavedObjectAttributes {
   kibanaSavedObjectMeta: {
diff --git a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts
index 93a6bc6f6df46..ee13926486f8b 100644
--- a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts
+++ b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { createExtract, createInject } from './dashboard_container_persistable_state';
-import { createEmbeddablePersistableStateServiceMock } from '../../../embeddable/common/mocks';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 import { DashboardContainerStateWithType } from '../types';
 
 const persistableStateService = createEmbeddablePersistableStateServiceMock();
diff --git a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts
index 9ef251d7dc54e..cffe5c9b47042 100644
--- a/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts
+++ b/src/plugins/dashboard/common/embeddable/dashboard_container_persistable_state.ts
@@ -10,14 +10,14 @@ import {
   EmbeddableInput,
   EmbeddablePersistableStateService,
   EmbeddableStateWithType,
-} from '../../../embeddable/common';
-import { SavedObjectReference } from '../../../../core/types';
+} from '@kbn/embeddable-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { CONTROL_GROUP_TYPE } from '@kbn/controls-plugin/common';
 import {
   DashboardContainerControlGroupInput,
   DashboardContainerStateWithType,
   DashboardPanelState,
 } from '../types';
-import { CONTROL_GROUP_TYPE } from '../../../controls/common';
 
 const getPanelStatePrefix = (state: DashboardPanelState) => `${state.explicitInput.id}:`;
 
diff --git a/src/plugins/dashboard/common/embeddable/dashboard_control_group.ts b/src/plugins/dashboard/common/embeddable/dashboard_control_group.ts
index ce6a1f358661e..908f50bbadd72 100644
--- a/src/plugins/dashboard/common/embeddable/dashboard_control_group.ts
+++ b/src/plugins/dashboard/common/embeddable/dashboard_control_group.ts
@@ -7,7 +7,7 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { ControlGroupInput, getDefaultControlGroupInput } from '../../../controls/common';
+import { ControlGroupInput, getDefaultControlGroupInput } from '@kbn/controls-plugin/common';
 import { RawControlGroupAttributes } from '../types';
 
 export const getDefaultDashboardControlGroupInput = getDefaultControlGroupInput;
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
index d6418c3e1b40d..3a6475b60251c 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_references.test.ts
@@ -12,9 +12,9 @@ import {
   InjectDeps,
   injectPanelsReferences,
 } from './embeddable_references';
-import { createEmbeddablePersistableStateServiceMock } from '../../../embeddable/common/mocks';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 import { SavedDashboardPanel } from '../types';
-import { EmbeddableStateWithType } from '../../../embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 
 const embeddablePersistableStateService = createEmbeddablePersistableStateServiceMock();
 const deps: InjectDeps & ExtractDeps = {
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_references.ts b/src/plugins/dashboard/common/embeddable/embeddable_references.ts
index 09b05dbdcf16a..6664f70d3392a 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_references.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_references.ts
@@ -7,13 +7,13 @@
  */
 
 import { omit } from 'lodash';
+import { SavedObjectReference } from '@kbn/core/types';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types';
 import {
   convertSavedDashboardPanelToPanelState,
   convertPanelStateToSavedDashboardPanel,
 } from './embeddable_saved_object_converters';
 import { SavedDashboardPanel } from '../types';
-import { SavedObjectReference } from '../../../../core/types';
-import { EmbeddablePersistableStateService } from '../../../embeddable/common/types';
 
 export interface InjectDeps {
   embeddablePersistableStateService: EmbeddablePersistableStateService;
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts
index 66dfc5318be1d..9ec93fa85fc54 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.test.ts
@@ -11,7 +11,7 @@ import {
   convertPanelStateToSavedDashboardPanel,
 } from './embeddable_saved_object_converters';
 import { SavedDashboardPanel, DashboardPanelState } from '../types';
-import { EmbeddableInput } from '../../../embeddable/common/types';
+import { EmbeddableInput } from '@kbn/embeddable-plugin/common/types';
 
 test('convertSavedDashboardPanelToPanelState', () => {
   const savedDashboardPanel: SavedDashboardPanel = {
diff --git a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts
index e62170391381e..aa9519a5a48b9 100644
--- a/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts
+++ b/src/plugins/dashboard/common/embeddable/embeddable_saved_object_converters.ts
@@ -7,8 +7,8 @@
  */
 
 import { omit } from 'lodash';
+import { EmbeddableInput, SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common';
 import { DashboardPanelState, SavedDashboardPanel } from '../types';
-import { EmbeddableInput, SavedObjectEmbeddableInput } from '../../../embeddable/common/';
 
 export function convertSavedDashboardPanelToPanelState<
   TEmbeddableInput extends EmbeddableInput | SavedObjectEmbeddableInput = SavedObjectEmbeddableInput
diff --git a/src/plugins/dashboard/common/migrate_to_730_panels.ts b/src/plugins/dashboard/common/migrate_to_730_panels.ts
index ad0fa7658b6fa..f40240bd7247c 100644
--- a/src/plugins/dashboard/common/migrate_to_730_panels.ts
+++ b/src/plugins/dashboard/common/migrate_to_730_panels.ts
@@ -16,7 +16,7 @@ import {
   SavedDashboardPanel620,
   SavedDashboardPanel630,
   SavedDashboardPanel610,
-} from './';
+} from '.';
 import {
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel630,
diff --git a/src/plugins/dashboard/common/saved_dashboard_references.test.ts b/src/plugins/dashboard/common/saved_dashboard_references.test.ts
index 9ab0e7b644496..84bfe6ea48d3a 100644
--- a/src/plugins/dashboard/common/saved_dashboard_references.test.ts
+++ b/src/plugins/dashboard/common/saved_dashboard_references.test.ts
@@ -14,7 +14,7 @@ import {
 } from './saved_dashboard_references';
 
 import { createExtract, createInject } from './embeddable/dashboard_container_persistable_state';
-import { createEmbeddablePersistableStateServiceMock } from '../../embeddable/common/mocks';
+import { createEmbeddablePersistableStateServiceMock } from '@kbn/embeddable-plugin/common/mocks';
 
 const embeddablePersistableStateServiceMock = createEmbeddablePersistableStateServiceMock();
 const dashboardInject = createInject(embeddablePersistableStateServiceMock);
diff --git a/src/plugins/dashboard/common/saved_dashboard_references.ts b/src/plugins/dashboard/common/saved_dashboard_references.ts
index fe549a4c13a1e..79339257d7c01 100644
--- a/src/plugins/dashboard/common/saved_dashboard_references.ts
+++ b/src/plugins/dashboard/common/saved_dashboard_references.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 import semverGt from 'semver/functions/gt';
-import { SavedObjectAttributes, SavedObjectReference } from '../../../core/types';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common/types';
 import {
   DashboardContainerControlGroupInput,
   DashboardContainerStateWithType,
   DashboardPanelState,
   RawControlGroupAttributes,
 } from './types';
-import { EmbeddablePersistableStateService } from '../../embeddable/common/types';
 import {
   convertPanelStateToSavedDashboardPanel,
   convertSavedDashboardPanelToPanelState,
diff --git a/src/plugins/dashboard/common/types.ts b/src/plugins/dashboard/common/types.ts
index 49caa41251211..719df2fbe0be0 100644
--- a/src/plugins/dashboard/common/types.ts
+++ b/src/plugins/dashboard/common/types.ts
@@ -10,8 +10,9 @@ import {
   EmbeddableInput,
   EmbeddableStateWithType,
   PanelState,
-} from '../../../../src/plugins/embeddable/common/types';
-import { SavedObjectEmbeddableInput } from '../../../../src/plugins/embeddable/common/lib/saved_object_embeddable';
+} from '@kbn/embeddable-plugin/common/types';
+import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common/lib/saved_object_embeddable';
+import { ControlGroupInput } from '@kbn/controls-plugin/common';
 import {
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel610,
@@ -22,7 +23,6 @@ import {
 } from './bwc/types';
 
 import { GridData } from './embeddable/types';
-import { ControlGroupInput } from '../../controls/common';
 export type PanelId = string;
 export type SavedObjectId = string;
 
diff --git a/src/plugins/dashboard/kibana.json b/src/plugins/dashboard/kibana.json
index 0130d4a5f8118..31bfd0a74cd09 100644
--- a/src/plugins/dashboard/kibana.json
+++ b/src/plugins/dashboard/kibana.json
@@ -30,5 +30,5 @@
   ],
   "server": true,
   "ui": true,
-  "requiredBundles": ["home", "kibanaReact", "kibanaUtils", "presentationUtil"]
+  "requiredBundles": ["kibanaReact", "kibanaUtils", "presentationUtil"]
 }
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
index e6404d6327ec3..b682dda9dc3dc 100644
--- 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
@@ -10,12 +10,12 @@ import { AddToLibraryAction } from '.';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput } from '../test_helpers';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 import {
   EmbeddableInput,
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
index 84c968e1c2b24..b79d663df3add 100644
--- a/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.test.tsx
@@ -10,10 +10,10 @@ import { DashboardPanelState } from '../embeddable';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { CoreStart } from 'kibana/public';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
 import { ClonePanelAction } from '.';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableFactory,
@@ -22,8 +22,8 @@ import {
   CONTACT_CARD_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
 import { ErrorEmbeddable, IContainer, isErrorEmbeddable } from '../../services/embeddable';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
index 4b2e1e39818ad..0ac6491425502 100644
--- a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import uuid from 'uuid';
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
 import { SavedObject } from '../../services/saved_objects';
 import {
diff --git a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx
index 3c9c1cbbba83e..835c80558c187 100644
--- a/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/copy_to_dashboard_action.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayStart } from '../../../../../core/public';
+import { CoreStart, OverlayStart } from '@kbn/core/public';
 import { dashboardCopyToDashboardAction } from '../../dashboard_strings';
 import { EmbeddableStateTransfer, IEmbeddable } from '../../services/embeddable';
 import { toMountPoint } from '../../services/kibana_react';
diff --git a/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx
index f99b539ecb26c..65808d70bc8b6 100644
--- a/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx
@@ -10,10 +10,10 @@ import { ExpandPanelAction } from './expand_panel_action';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { isErrorEmbeddable } from '../../services/embeddable';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 import {
   CONTACT_CARD_EMBEDDABLE,
@@ -22,7 +22,7 @@ import {
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
 } from '../../services/embeddable_test_samples';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 
diff --git a/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx b/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx
index c08a8d4af68dd..c75bce83651fd 100644
--- a/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/export_csv_action.test.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import { isErrorEmbeddable, IContainer, ErrorEmbeddable } from '../../services/embeddable';
-import { DashboardContainer } from '../../application/embeddable/dashboard_container';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../../application/test_helpers';
+import { DashboardContainer } from '../embeddable/dashboard_container';
+import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableInput,
@@ -18,14 +18,14 @@ import {
   ContactCardExportableEmbeddableFactory,
   CONTACT_CARD_EXPORTABLE_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { ExportCSVAction } from './export_csv_action';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
-import { DataPublicPluginStart } from '../../../../data/public/types';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { LINE_FEED_CHARACTER } from 'src/plugins/data/common/exports/export_csv';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public/types';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { LINE_FEED_CHARACTER } from '@kbn/data-plugin/common/exports/export_csv';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 describe('Export CSV action', () => {
   const { setup, doStart } = embeddablePluginMock.createInstance();
diff --git a/src/plugins/dashboard/public/application/actions/export_csv_action.tsx b/src/plugins/dashboard/public/application/actions/export_csv_action.tsx
index cffff75251080..2835e1c4dd6e2 100644
--- a/src/plugins/dashboard/public/application/actions/export_csv_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/export_csv_action.tsx
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions/public';
-import { CoreStart } from '../../../../../core/public';
-import { FormatFactory } from '../../../../field_formats/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
 
 import { DataPublicPluginStart, exporters } from '../../services/data';
 import { downloadMultipleAs } from '../../services/share';
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
index 92042f581fad4..1f1570fe02e30 100644
--- a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
@@ -9,10 +9,10 @@
 import { getSampleDashboardInput } from '../test_helpers';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { CoreStart } from 'kibana/public';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
 import { LibraryNotificationAction, UnlinkFromLibraryAction } from '.';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   ErrorEmbeddable,
   IContainer,
@@ -27,8 +27,8 @@ import {
   ContactCardEmbeddableOutput,
   CONTACT_CARD_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
index b867f83985a6e..3360d39f6f245 100644
--- a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 
+import { CoreStart } from '@kbn/core/public';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
-import { CoreStart } from '../../../../../core/public';
 import { KibanaThemeProvider, reactToUiComponent } from '../../services/kibana_react';
 import {
   IEmbeddable,
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx b/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx
index 1dc490836808b..d12332396bb89 100644
--- a/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/library_notification_popover.test.tsx
@@ -10,14 +10,14 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 import { DashboardContainer } from '../embeddable/dashboard_container';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { getSampleDashboardInput } from '../test_helpers';
 import {
   LibraryNotificationPopover,
   LibraryNotificationProps,
 } from './library_notification_popover';
-import { CoreStart } from '../../../../../core/public';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { EuiPopover } from '@elastic/eui';
 import { isErrorEmbeddable } from '../../services/embeddable';
@@ -28,8 +28,8 @@ import {
   ContactCardEmbeddableOutput,
   ContactCardEmbeddable,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 describe('LibraryNotificationPopover', () => {
   const { setup, doStart } = embeddablePluginMock.createInstance();
diff --git a/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx
index fa79b02d20dd5..5d07378c6514d 100644
--- a/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx
+++ b/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { toMountPoint } from '../../services/kibana_react';
 import { ReplacePanelFlyout } from './replace_panel_flyout';
 import {
diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx
index 9781736606607..27de8862fbc2a 100644
--- a/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx
@@ -10,9 +10,9 @@ import { ReplacePanelAction } from './replace_panel_action';
 import { DashboardContainer } from '../embeddable/dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { CoreStart } from 'kibana/public';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { isErrorEmbeddable } from '../../services/embeddable';
 import {
   CONTACT_CARD_EMBEDDABLE,
@@ -21,8 +21,8 @@ import {
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx
index 68e6c0861bb55..5291b414bc34e 100644
--- a/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { IEmbeddable, ViewMode, EmbeddableStart } from '../../services/embeddable';
 import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx
index 09195f1491854..5b112ed754b24 100644
--- a/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx
+++ b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
-import { NotificationsStart, Toast } from 'src/core/public';
+import { NotificationsStart, Toast } from '@kbn/core/public';
 import { DashboardPanelState } from '../embeddable';
 import {
   EmbeddableInput,
diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
index f82b8d1bc7a87..14a30ce3b90f3 100644
--- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import {
   ViewMode,
@@ -19,9 +19,9 @@ import {
 import { UnlinkFromLibraryAction } from '.';
 import { getSampleDashboardInput } from '../test_helpers';
 import { DashboardContainer } from '../embeddable/dashboard_container';
-import { coreMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableFactory,
@@ -29,8 +29,8 @@ import {
   ContactCardEmbeddableOutput,
   CONTACT_CARD_EMBEDDABLE,
 } from '../../services/embeddable_test_samples';
-import { getStubPluginServices } from '../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx
index 4eae24bc892f7..506d847d87b57 100644
--- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.tsx
@@ -7,6 +7,7 @@
  */
 
 import _ from 'lodash';
+import { NotificationsStart } from '@kbn/core/public';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
 import {
   ViewMode,
@@ -17,7 +18,6 @@ import {
   isReferenceOrValueEmbeddable,
   isErrorEmbeddable,
 } from '../../services/embeddable';
-import { NotificationsStart } from '../../../../../core/public';
 import { dashboardUnlinkFromLibraryAction } from '../../dashboard_strings';
 import { DashboardPanelState, DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '..';
 
diff --git a/src/plugins/dashboard/public/application/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx
index a32e6643a4e3a..f3aedf36b66a7 100644
--- a/src/plugins/dashboard/public/application/dashboard_app.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_app.tsx
@@ -9,9 +9,9 @@
 import { History } from 'history';
 import React, { useEffect, useMemo } from 'react';
 
+import { useKibana, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { useDashboardSelector } from './state';
 import { useDashboardAppState } from './hooks';
-import { useKibana, useExecutionContext } from '../../../kibana_react/public';
 import {
   getDashboardBreadcrumb,
   getDashboardTitle,
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx
index a26a4d4977a84..063301fcdde17 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx
@@ -13,7 +13,7 @@ import { findTestSubject, nextTick } from '@kbn/test-jest-helpers';
 import { DashboardContainer, DashboardContainerServices } from './dashboard_container';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
 import { I18nProvider } from '@kbn/i18n-react';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 import { KibanaContextProvider } from '../../services/kibana_react';
 import {
@@ -31,14 +31,10 @@ import {
   ContactCardEmbeddableOutput,
   createEditModeAction,
 } from '../../services/embeddable_test_samples';
-import {
-  applicationServiceMock,
-  coreMock,
-  uiSettingsServiceMock,
-} from '../../../../../core/public/mocks';
-import { inspectorPluginMock } from '../../../../inspector/public/mocks';
-import { uiActionsPluginMock } from '../../../../ui_actions/public/mocks';
-import { getStubPluginServices } from '../../../../presentation_util/public';
+import { applicationServiceMock, coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
 
 const presentationUtil = getStubPluginServices();
 const theme = coreMock.createStart().theme;
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
index 6cbf41925269d..ee4367bc87898 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
@@ -11,9 +11,10 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import uuid from 'uuid';
-import { CoreStart, IUiSettingsClient, KibanaExecutionContext } from 'src/core/public';
-import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import { CoreStart, IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 
+import { ControlGroupContainer } from '@kbn/controls-plugin/public';
 import { UiActionsStart } from '../../services/ui_actions';
 import { RefreshInterval, TimeRange, Query, Filter } from '../../services/data';
 import {
@@ -47,7 +48,6 @@ import {
   combineDashboardFiltersWithControlGroupFilters,
   syncDashboardControlGroup,
 } from '../lib/dashboard_control_group';
-import { ControlGroupContainer } from '../../../../controls/public';
 
 export interface DashboardContainerServices {
   ExitFullScreenButton: React.ComponentType<any>;
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
index 564080831607c..7009ea72f06a4 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
@@ -7,9 +7,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { identity, pickBy } from 'lodash';
+import {
+  ControlGroupContainer,
+  ControlGroupInput,
+  ControlGroupOutput,
+  CONTROL_GROUP_TYPE,
+} from '@kbn/controls-plugin/public';
 import { DashboardContainerInput } from '../..';
 import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
 import type { DashboardContainer, DashboardContainerServices } from './dashboard_container';
@@ -24,12 +30,6 @@ import {
   createExtract,
   createInject,
 } from '../../../common/embeddable/dashboard_container_persistable_state';
-import {
-  ControlGroupContainer,
-  ControlGroupInput,
-  ControlGroupOutput,
-  CONTROL_GROUP_TYPE,
-} from '../../../../controls/public';
 
 import { getDefaultDashboardControlGroupInput } from '../../../common/embeddable/dashboard_control_group';
 
diff --git a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx
index 0b3a569813845..158dc61e7964d 100644
--- a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
-import { coreMock } from '../../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('DashboardEmptyScreen', () => {
   const setupMock = coreMock.createSetup();
diff --git a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx
index 5ae2d41e69730..3e4bc95fe451e 100644
--- a/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/empty_screen/dashboard_empty_screen.tsx
@@ -18,7 +18,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { IUiSettingsClient, HttpStart } from 'kibana/public';
+import { IUiSettingsClient, HttpStart } from '@kbn/core/public';
 import { emptyScreenStrings } from '../../../dashboard_strings';
 
 export interface DashboardEmptyScreenProps {
diff --git a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx
index 4717082cbe0d0..c0bfe41b2c86d 100644
--- a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx
@@ -16,14 +16,14 @@ import { DashboardGrid, DashboardGridProps } from './dashboard_grid';
 import { DashboardContainer, DashboardContainerServices } from '../dashboard_container';
 import { getSampleDashboardInput } from '../../test_helpers';
 import { KibanaContextProvider } from '../../../services/kibana_react';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import {
   CONTACT_CARD_EMBEDDABLE,
   ContactCardEmbeddableFactory,
 } from '../../../services/embeddable_test_samples';
-import { coreMock, uiSettingsServiceMock } from '../../../../../../core/public/mocks';
-import { getStubPluginServices } from '../../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../../screenshot_mode/public/mocks';
+import { coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 let dashboardContainer: DashboardContainer | undefined;
 const presentationUtil = getStubPluginServices();
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
index 97e078246aca6..a194c1d2a9d1a 100644
--- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
+++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { EmbeddableInput } from '../../../services/embeddable';
-import { CONTACT_CARD_EMBEDDABLE } from '../../../../../embeddable/public/lib/test_samples';
+import { CONTACT_CARD_EMBEDDABLE } from '@kbn/embeddable-plugin/public/lib/test_samples';
 import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants';
 import { DashboardPanelState } from '../types';
 import { createPanelState } from './create_panel_state';
diff --git a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
index 598d6fc5eabb5..9bdb8de1c42c0 100644
--- a/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/placeholder/placeholder_embeddable.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { EuiLoadingChart } from '@elastic/eui';
 import classNames from 'classnames';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { Embeddable, EmbeddableInput, IContainer } from '../../../services/embeddable';
 import { KibanaThemeProvider } from '../../../services/kibana_react';
 
diff --git a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx
index 9075a7f90b103..0fa1d4beba497 100644
--- a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx
@@ -16,18 +16,14 @@ import { DashboardViewport, DashboardViewportProps } from './dashboard_viewport'
 import { DashboardContainer, DashboardContainerServices } from '../dashboard_container';
 import { getSampleDashboardInput } from '../../test_helpers';
 import { KibanaContextProvider } from '../../../services/kibana_react';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
-import {
-  applicationServiceMock,
-  coreMock,
-  uiSettingsServiceMock,
-} from '../../../../../../core/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { applicationServiceMock, coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import {
   ContactCardEmbeddableFactory,
   CONTACT_CARD_EMBEDDABLE,
-} from '../../../../../embeddable/public/lib/test_samples';
-import { getStubPluginServices } from '../../../../../presentation_util/public';
-import { screenshotModePluginMock } from '../../../../../screenshot_mode/public/mocks';
+} from '@kbn/embeddable-plugin/public/lib/test_samples';
+import { getStubPluginServices } from '@kbn/presentation-util-plugin/public';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 let dashboardContainer: DashboardContainer | undefined;
 const presentationUtil = getStubPluginServices();
diff --git a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
index 0e700e058eef4..82c5bab836a85 100644
--- a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
@@ -8,16 +8,16 @@
 
 import React from 'react';
 import { Subscription } from 'rxjs';
+import {
+  CalloutProps,
+  ControlGroupContainer,
+  LazyControlsCallout,
+} from '@kbn/controls-plugin/public';
 import { ViewMode } from '../../../services/embeddable';
 import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
 import { DashboardGrid } from '../grid';
 import { context } from '../../../services/kibana_react';
 import { DashboardEmptyScreen } from '../empty_screen/dashboard_empty_screen';
-import {
-  CalloutProps,
-  ControlGroupContainer,
-  LazyControlsCallout,
-} from '../../../../../controls/public';
 import { withSuspense } from '../../../services/presentation_util';
 
 export interface DashboardViewportProps {
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
index 039a600d153b2..2f1f88b8b802f 100644
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
@@ -13,17 +13,17 @@ import { createBrowserHistory } from 'history';
 import { renderHook, act, RenderHookResult } from '@testing-library/react-hooks';
 
 import { DashboardSessionStorage } from '../lib';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DashboardConstants } from '../../dashboard_constants';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { SavedObjectLoader } from '../../services/saved_objects';
 import { DashboardAppServices, DashboardAppState } from '../../types';
 import { DashboardContainer } from '../embeddable/dashboard_container';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { EmbeddableFactory, ViewMode } from '../../services/embeddable';
 import { dashboardStateStore, setDescription, setViewMode } from '../state';
 import { DashboardContainerServices } from '../embeddable/dashboard_container';
-import { createKbnUrlStateStorage, defer } from '../../../../kibana_utils/public';
+import { createKbnUrlStateStorage, defer } from '@kbn/kibana-utils-plugin/public';
 import { useDashboardAppState, UseDashboardStateProps } from './use_dashboard_app_state';
 import {
   getSampleDashboardInput,
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
index a8daffcf61440..a103c88843664 100644
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
@@ -310,7 +310,7 @@ export const useDashboardAppState = ({
        * the last saved state on save.
        */
       setLastSavedState(savedDashboardState);
-      dashboardBuildContext.$checkForUnsavedChanges.next();
+      dashboardBuildContext.$checkForUnsavedChanges.next(undefined);
       const updateLastSavedState = () => {
         setLastSavedState(
           savedObjectToDashboardState({
diff --git a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
index 4db7eabe6d78d..4befdfc188df3 100644
--- a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
+++ b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { DashboardSavedObject } from '../../saved_dashboards';
 import { DashboardContainer, DASHBOARD_CONTAINER_TYPE } from '../embeddable';
 import {
diff --git a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
index cc35fa8307d2f..24d891c658056 100644
--- a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
+++ b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
@@ -7,7 +7,8 @@
  */
 
 import _ from 'lodash';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { ControlGroupInput } from '@kbn/controls-plugin/public';
 import { DashboardSavedObject } from '../../saved_dashboards';
 import { getTagsFromSavedDashboard, migrateAppState } from '.';
 import { EmbeddablePackageState, ViewMode } from '../../services/embeddable';
@@ -22,7 +23,6 @@ import {
 } from '../../types';
 import { convertSavedPanelsToPanelMap } from './convert_dashboard_panels';
 import { deserializeControlGroupFromDashboardSavedObject } from './dashboard_control_group';
-import { ControlGroupInput } from '../../../../controls/public';
 
 interface SavedObjectToDashboardStateProps {
   version: string;
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts b/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
index ef8e2785b8a45..38b1b8eeb9fa1 100644
--- a/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
+++ b/src/plugins/dashboard/public/application/lib/dashboard_control_group.ts
@@ -12,10 +12,10 @@ import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query'
 import { debounceTime, distinctUntilChanged, distinctUntilKeyChanged } from 'rxjs/operators';
 
 import { pick } from 'lodash';
+import { ControlGroupContainer, ControlGroupInput } from '@kbn/controls-plugin/public';
 import { DashboardContainer, DashboardContainerControlGroupInput } from '..';
 import { DashboardState } from '../../types';
 import { DashboardContainerInput, DashboardSavedObject } from '../..';
-import { ControlGroupContainer, ControlGroupInput } from '../../../../controls/public';
 import {
   controlGroupInputToRawAttributes,
   getDefaultDashboardControlGroupInput,
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
index ca4fa85b4b55c..60116c69dca9f 100644
--- a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
+++ b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
@@ -7,12 +7,12 @@
  */
 
 import { History } from 'history';
+import { createQueryParamObservable } from '@kbn/kibana-utils-plugin/public';
 import { DashboardAppLocatorParams, DashboardConstants } from '../..';
 import { DashboardState } from '../../types';
 import { getDashboardTitle } from '../../dashboard_strings';
 import { DashboardSavedObject } from '../../saved_dashboards';
 import { getQueryParams } from '../../services/kibana_utils';
-import { createQueryParamObservable } from '../../../../kibana_utils/public';
 import {
   DataPublicPluginStart,
   noSearchSessionStorageCapabilityMessage,
diff --git a/src/plugins/dashboard/public/application/lib/help_menu_util.ts b/src/plugins/dashboard/public/application/lib/help_menu_util.ts
index adea5fdc84d47..4a0b882e80ad9 100644
--- a/src/plugins/dashboard/public/application/lib/help_menu_util.ts
+++ b/src/plugins/dashboard/public/application/lib/help_menu_util.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { ChromeStart, DocLinksStart } from '@kbn/core/public';
 
 export function addHelpMenuToAppChrome(chrome: ChromeStart, docLinks: DocLinksStart) {
   chrome.setHelpExtension({
diff --git a/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts b/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts
index 72b06ded8ca76..f785589f1bbd6 100644
--- a/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts
+++ b/src/plugins/dashboard/public/application/lib/load_dashboard_by_title.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { DashboardSavedObject } from '../..';
-import { SavedObjectsClientContract } from '../../../../../core/public';
 
 export async function attemptLoadDashboardByTitle(
   title: string,
diff --git a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts b/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
index 55366ac50fd2e..0a86ed7efe5f3 100644
--- a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
+++ b/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getSavedDashboardMock } from '../test_helpers';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createSessionRestorationDataProvider, savedObjectToDashboardState } from '.';
 
 describe('createSessionRestorationDataProvider', () => {
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
index 541724549011e..02f939ef69eea 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
@@ -11,6 +11,7 @@ import { Subscription } from 'rxjs';
 import { debounceTime, tap } from 'rxjs/operators';
 
 import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query';
+import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { DashboardContainer } from '../embeddable';
 import { Query } from '../../services/data';
 import { DashboardConstants, DashboardSavedObject } from '../..';
@@ -23,7 +24,6 @@ import {
   setTimeRange,
 } from '../state';
 import { diffDashboardContainerInput } from './diff_dashboard_state';
-import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
 import { DashboardBuildContext, DashboardContainerInput } from '../../types';
 import {
   getSearchSessionIdFromURL,
@@ -60,7 +60,7 @@ export const syncDashboardContainerInput = (
       .getInput$()
       .subscribe(() => applyContainerChangesToState(syncDashboardContainerProps))
   );
-  subscriptions.add($onDashboardStateChange.subscribe(() => $triggerDashboardRefresh.next()));
+  subscriptions.add($onDashboardStateChange.subscribe(() => $triggerDashboardRefresh.next({})));
   subscriptions.add(
     getSessionURLObservable(history).subscribe(() => {
       $triggerDashboardRefresh.next({ force: true });
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
index d187ee207b2fe..ff64f4672922c 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
@@ -103,13 +103,14 @@ export const syncDashboardFilterState = ({
     .subscribe(() => applyFilters(queryString.getQuery(), filterManager.getFilters()));
 
   const timeRefreshSubscription = merge(
-    ...[timefilterService.getRefreshIntervalUpdate$(), timefilterService.getTimeUpdate$()]
+    timefilterService.getRefreshIntervalUpdate$(),
+    timefilterService.getTimeUpdate$()
   ).subscribe(() => {
-    $triggerDashboardRefresh.next();
+    $triggerDashboardRefresh.next({});
 
     // manually check for unsaved changes here because the time range is not stored on the dashboardState,
     // but it could trigger the unsaved changes badge.
-    $checkForUnsavedChanges.next();
+    $checkForUnsavedChanges.next(undefined);
   });
 
   const forceRefreshSubscription = timefilterService
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
index 227430142325a..0aa9e9c595fc1 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
@@ -9,11 +9,11 @@
 import _ from 'lodash';
 import { debounceTime } from 'rxjs/operators';
 
+import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { migrateAppState } from '.';
 import { DashboardSavedObject } from '../..';
 import { setDashboardState } from '../state';
 import { migrateLegacyQuery } from './migrate_legacy_query';
-import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
 import { applyDashboardFilterState } from './sync_dashboard_filter_state';
 import { DASHBOARD_STATE_STORAGE_KEY } from '../../dashboard_constants';
 import type {
diff --git a/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
index 598254ad2173f..d4513837efa11 100644
--- a/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
@@ -22,6 +22,37 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
   title="search by title"
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     createItem={[Function]}
     deleteItems={[Function]}
     editItem={[Function]}
@@ -74,8 +105,6 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter="\\"search by title\\""
-    initialPageSize={20}
-    listingLimit={100}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -99,7 +128,6 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
@@ -142,6 +170,37 @@ exports[`after fetch initialFilter 1`] = `
   redirectTo={[MockFunction]}
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     createItem={[Function]}
     deleteItems={[Function]}
     editItem={[Function]}
@@ -194,8 +253,6 @@ exports[`after fetch initialFilter 1`] = `
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter="testFilter"
-    initialPageSize={20}
-    listingLimit={100}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -219,7 +276,6 @@ exports[`after fetch initialFilter 1`] = `
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
@@ -261,6 +317,37 @@ exports[`after fetch renders all table rows 1`] = `
   redirectTo={[MockFunction]}
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     createItem={[Function]}
     deleteItems={[Function]}
     editItem={[Function]}
@@ -313,8 +400,6 @@ exports[`after fetch renders all table rows 1`] = `
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter=""
-    initialPageSize={20}
-    listingLimit={100}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -338,7 +423,6 @@ exports[`after fetch renders all table rows 1`] = `
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
@@ -380,6 +464,37 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
   redirectTo={[MockFunction]}
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     createItem={[Function]}
     deleteItems={[Function]}
     editItem={[Function]}
@@ -432,8 +547,6 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter=""
-    initialPageSize={20}
-    listingLimit={100}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -457,7 +570,6 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
@@ -499,6 +611,37 @@ exports[`after fetch renders call to action with continue when no dashboards exi
   redirectTo={[MockFunction]}
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     createItem={[Function]}
     deleteItems={[Function]}
     editItem={[Function]}
@@ -562,8 +705,6 @@ exports[`after fetch renders call to action with continue when no dashboards exi
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter=""
-    initialPageSize={20}
-    listingLimit={100}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -587,7 +728,6 @@ exports[`after fetch renders call to action with continue when no dashboards exi
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
@@ -629,6 +769,37 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
   redirectTo={[MockFunction]}
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     createItem={[Function]}
     deleteItems={[Function]}
     editItem={[Function]}
@@ -681,8 +852,6 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter=""
-    initialPageSize={20}
-    listingLimit={1}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -706,7 +875,6 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
@@ -748,6 +916,37 @@ exports[`after fetch showWriteControls 1`] = `
   redirectTo={[MockFunction]}
 >
   <TableListView
+    application={
+      Object {
+        "applications$": BehaviorSubject {
+          "_value": Map {},
+          "closed": false,
+          "currentObservers": null,
+          "hasError": false,
+          "isStopped": false,
+          "observers": Array [],
+          "thrownError": null,
+        },
+        "capabilities": Object {
+          "catalogue": Object {},
+          "management": Object {},
+          "navLinks": Object {},
+        },
+        "currentAppId$": Observable {
+          "source": Subject {
+            "closed": false,
+            "currentObservers": null,
+            "hasError": false,
+            "isStopped": false,
+            "observers": Array [],
+            "thrownError": null,
+          },
+        },
+        "getUrlForApp": [MockFunction],
+        "navigateToApp": [MockFunction],
+        "navigateToUrl": [MockFunction],
+      }
+    }
     emptyPrompt={
       <EuiEmptyPrompt
         body={
@@ -770,8 +969,6 @@ exports[`after fetch showWriteControls 1`] = `
     findItems={[Function]}
     headingId="dashboardListingHeading"
     initialFilter=""
-    initialPageSize={20}
-    listingLimit={100}
     rowHeader="title"
     searchFilters={Array []}
     tableCaption="Dashboards"
@@ -795,7 +992,6 @@ exports[`after fetch showWriteControls 1`] = `
     theme={
       Object {
         "theme$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
       }
diff --git a/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx b/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
index f2792790f2f5d..5ecbeb966d6e8 100644
--- a/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
+++ b/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import React from 'react';
 
-import { CoreStart, OverlayStart } from '../../../../../core/public';
+import { CoreStart, OverlayStart } from '@kbn/core/public';
 import { toMountPoint } from '../../services/kibana_react';
 import { createConfirmStrings, discardConfirmStrings } from '../../dashboard_strings';
 
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
index 065544409b8cf..a4831d9231b73 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
@@ -11,7 +11,7 @@ import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n-react';
 
 import { DashboardAppServices } from '../../types';
-import { SimpleSavedObject } from '../../../../../core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { KibanaContextProvider } from '../../services/kibana_react';
 import { createKbnUrlStateStorage } from '../../services/kibana_utils';
 import { DashboardListing, DashboardListingProps } from './dashboard_listing';
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
index 65374ad723f23..35052c23812c0 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
@@ -17,6 +17,8 @@ import {
   EuiButtonEmpty,
 } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { ApplicationStart, SavedObjectsFindOptionsReference } from '@kbn/core/public';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { attemptLoadDashboardByTitle } from '../lib';
 import { DashboardAppServices, DashboardRedirect } from '../../types';
 import {
@@ -26,7 +28,6 @@ import {
   dashboardUnsavedListingStrings,
   getNewDashboardTitle,
 } from '../../dashboard_strings';
-import { ApplicationStart, SavedObjectsFindOptionsReference } from '../../../../../core/public';
 import { syncQueryStateWithUrl } from '../../services/data';
 import { IKbnUrlStateStorage } from '../../services/kibana_utils';
 import { TableListView, useKibana } from '../../services/kibana_react';
@@ -35,7 +36,9 @@ import { DashboardUnsavedListing } from './dashboard_unsaved_listing';
 import { confirmCreateWithUnsaved, confirmDiscardUnsavedChanges } from './confirm_overlays';
 import { getDashboardListItemLink } from './get_dashboard_list_item_link';
 import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_session_storage';
-import { useExecutionContext } from '../../../../kibana_react/public';
+
+const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
+const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage';
 
 export interface DashboardListingProps {
   kbnUrlStateStorage: IKbnUrlStateStorage;
@@ -54,7 +57,6 @@ export const DashboardListing = ({
     services: {
       core,
       data,
-      savedObjects,
       savedDashboards,
       savedObjectsClient,
       savedObjectsTagging,
@@ -105,7 +107,8 @@ export const DashboardListing = ({
   }, [title, savedObjectsClient, redirectTo, data.query, kbnUrlStateStorage]);
 
   const { showWriteControls } = dashboardCapabilities;
-  const listingLimit = savedObjects.settings.getListingLimit();
+  const listingLimit = core.uiSettings.get(SAVED_OBJECTS_LIMIT_SETTING);
+  const initialPageSize = core.uiSettings.get(SAVED_OBJECTS_PER_PAGE_SETTING);
   const defaultFilter = title ? `"${title}"` : '';
 
   const tableColumns = useMemo(
@@ -286,7 +289,7 @@ export const DashboardListing = ({
     <TableListView
       createItem={!showWriteControls ? undefined : createItem}
       deleteItems={!showWriteControls ? undefined : deleteItems}
-      initialPageSize={savedObjects.settings.getPerPage()}
+      initialPageSize={initialPageSize}
       editItem={!showWriteControls ? undefined : editItem}
       initialFilter={initialFilter ?? defaultFilter}
       toastNotifications={core.notifications.toasts}
@@ -304,6 +307,7 @@ export const DashboardListing = ({
         tableColumns,
       }}
       theme={core.theme}
+      application={core.application}
     >
       <DashboardUnsavedListing
         redirectTo={redirectTo}
diff --git a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts
index ce9535e549446..2b45977eaafed 100644
--- a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts
+++ b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { getDashboardListItemLink } from './get_dashboard_list_item_link';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createHashHistory } from 'history';
 import { FilterStateStore } from '@kbn/es-query';
-import { createKbnUrlStateStorage } from '../../../../kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { GLOBAL_STATE_STORAGE_KEY } from '../../dashboard_constants';
 
 const DASHBOARD_ID = '13823000-99b9-11ea-9eb6-d9e8adceb647';
diff --git a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts
index 8af3f2a10666f..1589c3dd3fa86 100644
--- a/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts
+++ b/src/plugins/dashboard/public/application/listing/get_dashboard_list_item_link.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { QueryState } from '../../../../data/public';
-import { setStateToKbnUrl } from '../../../../kibana_utils/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { QueryState } from '@kbn/data-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import {
   DashboardConstants,
   createDashboardEditUrl,
diff --git a/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts
index 20e28359cb36d..69da1dbbe56a2 100644
--- a/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts
+++ b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { DashboardSavedObject } from '../../saved_dashboards';
 
 export function getSavedDashboardMock(
diff --git a/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts b/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
index 656f5672e38c0..ada51e21aaff9 100644
--- a/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
+++ b/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
@@ -6,24 +6,20 @@
  * Side Public License, v 1.
  */
 
-import { DashboardSessionStorage } from '../lib';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { getSavedDashboardMock } from './get_saved_dashboard_mock';
-import { UrlForwardingStart } from '../../../../url_forwarding/public';
-import { NavigationPublicPluginStart } from '../../services/navigation';
-import { DashboardAppServices, DashboardAppCapabilities } from '../../types';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
-import { DataViewsContract, SavedQueryService } from '../../services/data';
-import { savedObjectsPluginMock } from '../../../../saved_objects/public/mocks';
-import { screenshotModePluginMock } from '../../../../screenshot_mode/public/mocks';
-import { visualizationsPluginMock } from '../../../../visualizations/public/mocks';
-import { PluginInitializerContext, ScopedHistory } from '../../../../../core/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
+import { visualizationsPluginMock } from '@kbn/visualizations-plugin/public/mocks';
+import { PluginInitializerContext, ScopedHistory } from '@kbn/core/public';
+import { chromeServiceMock, coreMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { SavedObjectLoader, SavedObjectLoaderFindOptions } from '../../services/saved_objects';
-import {
-  chromeServiceMock,
-  coreMock,
-  uiSettingsServiceMock,
-} from '../../../../../core/public/mocks';
+import { DataViewsContract, SavedQueryService } from '../../services/data';
+import { DashboardAppServices, DashboardAppCapabilities } from '../../types';
+import { NavigationPublicPluginStart } from '../../services/navigation';
+import { getSavedDashboardMock } from './get_saved_dashboard_mock';
+import { DashboardSessionStorage } from '../lib';
 
 export function makeDefaultServices(): DashboardAppServices {
   const core = coreMock.createStart();
diff --git a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
index 23bc301f788c0..6d6b2382f5a14 100644
--- a/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/dashboard_top_nav.tsx
@@ -12,6 +12,18 @@ import { EuiHorizontalRule } from '@elastic/eui';
 import UseUnmount from 'react-use/lib/useUnmount';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
+import { OverlayRef } from '@kbn/core/public';
+import { TopNavMenuProps } from '@kbn/navigation-plugin/public';
+import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import {
+  AddFromLibraryButton,
+  LazyLabsFlyout,
+  PrimaryActionButton,
+  QuickButtonGroup,
+  QuickButtonProps,
+  SolutionToolbar,
+  withSuspense,
+} from '@kbn/presentation-util-plugin/public';
 import { saveDashboard } from '../lib';
 import { TopNavIds } from './top_nav_ids';
 import { EditorMenu } from './editor_menu';
@@ -21,13 +33,10 @@ import { DashboardSaveModal } from './save_modal';
 import { showCloneModal } from './show_clone_modal';
 import { ShowShareModal } from './show_share_modal';
 import { getTopNavConfig } from './get_top_nav_config';
-import { OverlayRef } from '../../../../../core/public';
 import { useKibana } from '../../services/kibana_react';
 import { showOptionsPopover } from './show_options_popover';
 import { DashboardConstants } from '../../dashboard_constants';
-import { TopNavMenuProps } from '../../../../navigation/public';
 import { confirmDiscardUnsavedChanges } from '../listing/confirm_overlays';
-import { BaseVisType, VisTypeAlias } from '../../../../visualizations/public';
 import { DashboardAppState, DashboardSaveOptions, NavAction } from '../../types';
 import { isErrorEmbeddable, openAddPanelFlyout, ViewMode } from '../../services/embeddable';
 import { DashboardAppServices, DashboardEmbedSettings, DashboardRedirect } from '../../types';
@@ -45,16 +54,6 @@ import {
   useDashboardSelector,
 } from '../state';
 
-import {
-  AddFromLibraryButton,
-  LazyLabsFlyout,
-  PrimaryActionButton,
-  QuickButtonGroup,
-  QuickButtonProps,
-  SolutionToolbar,
-  withSuspense,
-} from '../../../../presentation_util/public';
-
 export interface DashboardTopNavState {
   chromeIsVisible: boolean;
   addPanelOverlay?: OverlayRef;
diff --git a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
index 5fece7ff959ce..b0d4270c4bca5 100644
--- a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
@@ -14,8 +14,8 @@ import {
 } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
-import { BaseVisType, VisGroups, VisTypeAlias } from '../../../../visualizations/public';
-import { SolutionToolbarPopover } from '../../../../presentation_util/public';
+import { BaseVisType, VisGroups, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import { SolutionToolbarPopover } from '@kbn/presentation-util-plugin/public';
 import { EmbeddableFactoryDefinition, EmbeddableInput } from '../../services/embeddable';
 import { useKibana } from '../../services/kibana_react';
 import { DashboardAppServices } from '../../types';
diff --git a/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
index 9b286518621aa..90972758e5df1 100644
--- a/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
+++ b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import { ViewMode } from '../../services/embeddable';
 import { TopNavIds } from './top_nav_ids';
 import { NavAction } from '../../types';
-import { TopNavMenuData } from '../../../../navigation/public';
 
 /**
  * @param actions - A mapping of TopNavIds to an action function that should run when the
diff --git a/src/plugins/dashboard/public/application/top_nav/save_modal.test.js b/src/plugins/dashboard/public/application/top_nav/save_modal.test.js
index 5a8cb8d56db69..89cd53fd53624 100644
--- a/src/plugins/dashboard/public/application/top_nav/save_modal.test.js
+++ b/src/plugins/dashboard/public/application/top_nav/save_modal.test.js
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 
-jest.mock('../../../../saved_objects/public', () => ({
+jest.mock('@kbn/saved-objects-plugin/public', () => ({
   SavedObjectSaveModal: () => null,
 }));
 
diff --git a/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx b/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx
index 5c7ec042bf1d9..fc060f965630a 100644
--- a/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { DashboardCloneModal } from './clone_modal';
 import { KibanaThemeProvider } from '../../services/kibana_react';
 
diff --git a/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx b/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx
index c53103075dcfb..8f5e86b4dab6b 100644
--- a/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/show_options_popover.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { EuiWrappingPopover } from '@elastic/eui';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { OptionsMenu } from './options';
 import { KibanaThemeProvider } from '../../services/kibana_react';
 
diff --git a/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx b/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx
index 3bfac12a6b500..015214260a10b 100644
--- a/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/show_share_modal.tsx
@@ -10,7 +10,7 @@ import { EuiCheckboxGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import React, { ReactElement, useState } from 'react';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import { DashboardSavedObject } from '../..';
 import { shareModalStrings } from '../../dashboard_strings';
 import { DashboardAppLocatorParams, DASHBOARD_APP_LOCATOR } from '../../locator';
diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
index 8acbe5f4d511f..7cb54db209c1d 100644
--- a/src/plugins/dashboard/public/index.ts
+++ b/src/plugins/dashboard/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DashboardPlugin } from './plugin';
 
 export {
diff --git a/src/plugins/dashboard/public/locator.test.ts b/src/plugins/dashboard/public/locator.test.ts
index 11ec16908b811..bc82477beb192 100644
--- a/src/plugins/dashboard/public/locator.test.ts
+++ b/src/plugins/dashboard/public/locator.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { DashboardAppLocatorDefinition } from './locator';
-import { hashedItemStore } from '../../kibana_utils/public';
-import { mockStorage } from '../../kibana_utils/public/storage/hashed_item_store/mock';
+import { hashedItemStore } from '@kbn/kibana-utils-plugin/public';
+import { mockStorage } from '@kbn/kibana-utils-plugin/public/storage/hashed_item_store/mock';
 import { FilterStateStore } from '@kbn/es-query';
 
 describe('dashboard locator', () => {
diff --git a/src/plugins/dashboard/public/locator.ts b/src/plugins/dashboard/public/locator.ts
index 7fa24ebf0636a..9c187ca0803cf 100644
--- a/src/plugins/dashboard/public/locator.ts
+++ b/src/plugins/dashboard/public/locator.ts
@@ -9,12 +9,12 @@
 import type { SerializableRecord } from '@kbn/utility-types';
 import { flow } from 'lodash';
 import { type Filter } from '@kbn/es-query';
-import type { TimeRange, Query, QueryState, RefreshInterval } from '../../data/public';
-import type { LocatorDefinition, LocatorPublic } from '../../share/public';
+import type { TimeRange, Query, QueryState, RefreshInterval } from '@kbn/data-plugin/public';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type { SavedDashboardPanel } from '../common/types';
 import type { RawDashboardState } from './types';
-import { setStateToKbnUrl } from '../../kibana_utils/public';
-import { ViewMode } from '../../embeddable/public';
 import { DashboardConstants } from './dashboard_constants';
 
 /**
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 2f63062ccf60c..9d10f8d5b42ec 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -10,9 +10,9 @@ import * as React from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
-import { UrlForwardingSetup, UrlForwardingStart } from 'src/plugins/url_forwarding/public';
-import { APP_WRAPPER_CLASS } from '../../../core/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
+import { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import {
   App,
   Plugin,
@@ -24,14 +24,15 @@ import {
   DEFAULT_APP_CATEGORIES,
   PluginInitializerContext,
   SavedObjectsClientContract,
-} from '../../../core/public';
-import { VisualizationsStart } from '../../visualizations/public';
+} from '@kbn/core/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
 
+import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { createKbnUrlTracker } from './services/kibana_utils';
 import { UsageCollectionSetup } from './services/usage_collection';
 import { UiActionsSetup, UiActionsStart } from './services/ui_actions';
 import { PresentationUtilPluginStart } from './services/presentation_util';
-import { FeatureCatalogueCategory, HomePublicPluginSetup } from './services/home';
+import type { HomePublicPluginSetup } from './services/home';
 import { NavigationPublicPluginStart as NavigationStart } from './services/navigation';
 import { DataPublicPluginSetup, DataPublicPluginStart } from './services/data';
 import { SharePluginSetup, SharePluginStart } from './services/share';
@@ -76,7 +77,6 @@ import { DashboardConstants } from './dashboard_constants';
 import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder';
 import { ExportCSVAction } from './application/actions/export_csv_action';
 import { dashboardFeatureCatalog } from './dashboard_strings';
-import { replaceUrlHashQuery } from '../../kibana_utils/public';
 import { SpacesPluginStart } from './services/spaces';
 
 export interface DashboardFeatureFlagConfig {
@@ -321,7 +321,7 @@ export class DashboardPlugin
         icon: 'dashboardApp',
         path: `/app/dashboards#${DashboardConstants.LANDING_PAGE_PATH}`,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         solutionId: 'kibana',
         order: 100,
       });
diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
index 32d80c4016bec..23aa9c493e5f4 100644
--- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
@@ -7,8 +7,9 @@
  */
 
 import { assign, cloneDeep } from 'lodash';
-import { SavedObjectsClientContract } from 'kibana/public';
-import type { ResolvedSimpleSavedObject } from 'src/core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
+import type { ResolvedSimpleSavedObject } from '@kbn/core/public';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/types';
 import { EmbeddableStart } from '../services/embeddable';
 import { SavedObject, SavedObjectsStart } from '../services/saved_objects';
 import { Filter, ISearchSource, Query, RefreshInterval } from '../services/data';
@@ -16,7 +17,6 @@ import { Filter, ISearchSource, Query, RefreshInterval } from '../services/data'
 import { createDashboardEditUrl } from '../dashboard_constants';
 import { extractReferences, injectReferences } from '../../common/saved_dashboard_references';
 
-import { SavedObjectAttributes, SavedObjectReference } from '../../../../core/types';
 import { DashboardOptions } from '../types';
 import { RawControlGroupAttributes } from '../application';
 
diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
index 94877b6c3c823..e5f919cd2a45a 100644
--- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 
 import { EmbeddableStart } from '../services/embeddable';
 import { SavedObjectLoader, SavedObjectsStart } from '../services/saved_objects';
diff --git a/src/plugins/dashboard/public/services/core.ts b/src/plugins/dashboard/public/services/core.ts
index 38c91842de4f2..7b1aaeb1f990b 100644
--- a/src/plugins/dashboard/public/services/core.ts
+++ b/src/plugins/dashboard/public/services/core.ts
@@ -13,5 +13,5 @@ export type {
   PluginInitializerContext,
   NotificationsStart,
   ApplicationStart,
-} from '../../../../core/public';
-export { ScopedHistory } from '../../../../core/public';
+} from '@kbn/core/public';
+export { ScopedHistory } from '@kbn/core/public';
diff --git a/src/plugins/dashboard/public/services/data.ts b/src/plugins/dashboard/public/services/data.ts
index 02df973dd3976..da5f4e12299db 100644
--- a/src/plugins/dashboard/public/services/data.ts
+++ b/src/plugins/dashboard/public/services/data.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data/public';
+export * from '@kbn/data-plugin/public';
diff --git a/src/plugins/dashboard/public/services/data_views.ts b/src/plugins/dashboard/public/services/data_views.ts
index 4fb2bbaf08503..21e6a2e9e645c 100644
--- a/src/plugins/dashboard/public/services/data_views.ts
+++ b/src/plugins/dashboard/public/services/data_views.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/public';
+export * from '@kbn/data-views-plugin/public';
diff --git a/src/plugins/dashboard/public/services/embeddable.ts b/src/plugins/dashboard/public/services/embeddable.ts
index 2a7d97d0d683b..1fa960f11aed7 100644
--- a/src/plugins/dashboard/public/services/embeddable.ts
+++ b/src/plugins/dashboard/public/services/embeddable.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../embeddable/public';
+export * from '@kbn/embeddable-plugin/public';
diff --git a/src/plugins/dashboard/public/services/embeddable_test_samples.ts b/src/plugins/dashboard/public/services/embeddable_test_samples.ts
index 5d8117d394c82..0c314893230b6 100644
--- a/src/plugins/dashboard/public/services/embeddable_test_samples.ts
+++ b/src/plugins/dashboard/public/services/embeddable_test_samples.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../embeddable/public/lib/test_samples';
+export * from '@kbn/embeddable-plugin/public/lib/test_samples';
diff --git a/src/plugins/dashboard/public/services/home.ts b/src/plugins/dashboard/public/services/home.ts
index ebbb715e53ca6..ee26c3cd9c4bc 100644
--- a/src/plugins/dashboard/public/services/home.ts
+++ b/src/plugins/dashboard/public/services/home.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { HomePublicPluginSetup } from '../../../home/public';
-export { FeatureCatalogueCategory } from '../../../home/public';
+export type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+export { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
diff --git a/src/plugins/dashboard/public/services/kibana_react.ts b/src/plugins/dashboard/public/services/kibana_react.ts
index 8cab64065824d..9ef6416ba44ea 100644
--- a/src/plugins/dashboard/public/services/kibana_react.ts
+++ b/src/plugins/dashboard/public/services/kibana_react.ts
@@ -10,7 +10,7 @@ export type {
   KibanaReactContext,
   KibanaReactContextValue,
   ExitFullScreenButtonProps,
-} from '../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 export {
   context,
   useKibana,
@@ -21,4 +21,4 @@ export {
   ExitFullScreenButton,
   KibanaContextProvider,
   KibanaThemeProvider,
-} from '../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/src/plugins/dashboard/public/services/kibana_utils.ts b/src/plugins/dashboard/public/services/kibana_utils.ts
index 599e9b73f504f..6e54cff517135 100644
--- a/src/plugins/dashboard/public/services/kibana_utils.ts
+++ b/src/plugins/dashboard/public/services/kibana_utils.ts
@@ -10,7 +10,7 @@ export type {
   ISyncStateRef,
   IKbnUrlStateStorage,
   ReduxLikeStateContainer,
-} from '../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 export {
   Storage,
   unhashUrl,
@@ -23,4 +23,4 @@ export {
   SavedObjectNotFound,
   createStateContainer,
   createKbnUrlStateStorage,
-} from '../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
diff --git a/src/plugins/dashboard/public/services/navigation.ts b/src/plugins/dashboard/public/services/navigation.ts
index eb1622eba35e0..9b5b4d515d393 100644
--- a/src/plugins/dashboard/public/services/navigation.ts
+++ b/src/plugins/dashboard/public/services/navigation.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { NavigationPublicPluginStart } from '../../../navigation/public';
+export type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
diff --git a/src/plugins/dashboard/public/services/presentation_util.ts b/src/plugins/dashboard/public/services/presentation_util.ts
index d640b6326729d..0375a87387e08 100644
--- a/src/plugins/dashboard/public/services/presentation_util.ts
+++ b/src/plugins/dashboard/public/services/presentation_util.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { PresentationUtilPluginStart } from '../../../presentation_util/public';
-export { LazyDashboardPicker, withSuspense, useLabs } from '../../../presentation_util/public';
+export type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+export { LazyDashboardPicker, withSuspense, useLabs } from '@kbn/presentation-util-plugin/public';
diff --git a/src/plugins/dashboard/public/services/saved_object_loader.ts b/src/plugins/dashboard/public/services/saved_object_loader.ts
index 521d6645e30f9..3c406357c0294 100644
--- a/src/plugins/dashboard/public/services/saved_object_loader.ts
+++ b/src/plugins/dashboard/public/services/saved_object_loader.ts
@@ -11,8 +11,8 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsFindOptionsReference,
   SavedObjectReference,
-} from 'kibana/public';
-import { SavedObject } from '../../../saved_objects/public';
+} from '@kbn/core/public';
+import { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { upperFirst } from './string_utils';
 
 /**
diff --git a/src/plugins/dashboard/public/services/saved_objects.ts b/src/plugins/dashboard/public/services/saved_objects.ts
index afd778d78b271..79be111f94371 100644
--- a/src/plugins/dashboard/public/services/saved_objects.ts
+++ b/src/plugins/dashboard/public/services/saved_objects.ts
@@ -11,11 +11,11 @@ export type {
   SavedObject,
   SavedObjectsStart,
   SavedObjectSaveOpts,
-} from '../../../saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
 export {
   showSaveModal,
   SavedObjectSaveModal,
   getSavedObjectFinder,
-} from '../../../saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
 export { SavedObjectLoader } from './saved_object_loader';
 export type { SavedObjectLoaderFindOptions } from './saved_object_loader';
diff --git a/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts b/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts
index 585f428960147..b660cae8a2ac5 100644
--- a/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts
+++ b/src/plugins/dashboard/public/services/saved_objects_tagging_oss.ts
@@ -11,4 +11,4 @@ export type {
   TagDecoratedSavedObject,
   SavedObjectTagDecoratorTypeGuard,
   SavedObjectTaggingOssPluginStart,
-} from '../../../saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
diff --git a/src/plugins/dashboard/public/services/screenshot_mode.ts b/src/plugins/dashboard/public/services/screenshot_mode.ts
index 577aa3eab36b5..7447737d1c8bf 100644
--- a/src/plugins/dashboard/public/services/screenshot_mode.ts
+++ b/src/plugins/dashboard/public/services/screenshot_mode.ts
@@ -9,4 +9,4 @@
 export type {
   ScreenshotModePluginStart,
   ScreenshotModePluginSetup,
-} from '../../../screenshot_mode/public';
+} from '@kbn/screenshot-mode-plugin/public';
diff --git a/src/plugins/dashboard/public/services/share.ts b/src/plugins/dashboard/public/services/share.ts
index 77a9f44a3cf00..21bbe9e7a9c83 100644
--- a/src/plugins/dashboard/public/services/share.ts
+++ b/src/plugins/dashboard/public/services/share.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { SharePluginStart, SharePluginSetup } from '../../../share/public';
-export { downloadMultipleAs } from '../../../share/public';
+export type { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+export { downloadMultipleAs } from '@kbn/share-plugin/public';
diff --git a/src/plugins/dashboard/public/services/spaces.ts b/src/plugins/dashboard/public/services/spaces.ts
index 4ebe6644e2393..57b987be5cbaa 100644
--- a/src/plugins/dashboard/public/services/spaces.ts
+++ b/src/plugins/dashboard/public/services/spaces.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
+export type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
diff --git a/src/plugins/dashboard/public/services/ui_actions.ts b/src/plugins/dashboard/public/services/ui_actions.ts
index 5dc2e016a121c..79eef5302d556 100644
--- a/src/plugins/dashboard/public/services/ui_actions.ts
+++ b/src/plugins/dashboard/public/services/ui_actions.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export type { Action, UiActionsSetup, UiActionsStart } from '../../../ui_actions/public';
-export { IncompatibleActionError } from '../../../ui_actions/public';
+export type { Action, UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+export { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
diff --git a/src/plugins/dashboard/public/services/usage_collection.ts b/src/plugins/dashboard/public/services/usage_collection.ts
index dee7499c61138..c8fec98b3b5db 100644
--- a/src/plugins/dashboard/public/services/usage_collection.ts
+++ b/src/plugins/dashboard/public/services/usage_collection.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export type { UsageCollectionSetup } from '../../../usage_collection/public';
+export type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts
index 575124671cf2b..249f134239663 100644
--- a/src/plugins/dashboard/public/types.ts
+++ b/src/plugins/dashboard/public/types.ts
@@ -15,17 +15,18 @@ import type {
   IUiSettingsClient,
   PluginInitializerContext,
   KibanaExecutionContext,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { History } from 'history';
 import type { Filter } from '@kbn/es-query';
 import { AnyAction, Dispatch } from 'redux';
 import { BehaviorSubject, Subject } from 'rxjs';
 
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
 import { DataView } from './services/data_views';
 import { SharePluginStart } from './services/share';
 import { EmbeddableStart } from './services/embeddable';
 import { DashboardSessionStorage } from './application/lib';
-import { UrlForwardingStart } from '../../url_forwarding/public';
 import { UsageCollectionSetup } from './services/usage_collection';
 import { NavigationPublicPluginStart } from './services/navigation';
 import { Query, RefreshInterval, TimeRange } from './services/data';
@@ -41,7 +42,6 @@ import { SavedObjectLoader, SavedObjectsStart } from './services/saved_objects';
 import type { ScreenshotModePluginStart } from './services/screenshot_mode';
 import { IKbnUrlStateStorage } from './services/kibana_utils';
 import type { DashboardContainer, DashboardSavedObject } from '.';
-import { VisualizationsStart } from '../../visualizations/public';
 import { DashboardAppLocatorParams } from './locator';
 import { SpacesPluginStart } from './services/spaces';
 
diff --git a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
index 995731341739a..31c236da607a4 100644
--- a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
+++ b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
-import { EmbeddableRegistryDefinition } from '../../../embeddable/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import {
   createExtract,
   createInject,
diff --git a/src/plugins/dashboard/server/index.ts b/src/plugins/dashboard/server/index.ts
index c99ca43ad835e..afbf198c79b9e 100644
--- a/src/plugins/dashboard/server/index.ts
+++ b/src/plugins/dashboard/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { DashboardPlugin } from './plugin';
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/dashboard/server/plugin.ts b/src/plugins/dashboard/server/plugin.ts
index 898c1745efccc..32735f883b167 100644
--- a/src/plugins/dashboard/server/plugin.ts
+++ b/src/plugins/dashboard/server/plugin.ts
@@ -6,20 +6,14 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { createDashboardSavedObjectType } from './saved_objects';
 import { capabilitiesProvider } from './capabilities_provider';
 
 import { DashboardPluginSetup, DashboardPluginStart } from './types';
-import { EmbeddableSetup } from '../../embeddable/server';
-import { UsageCollectionSetup } from '../../usage_collection/server';
 import { registerDashboardUsageCollector } from './usage/register_collector';
 import { dashboardPersistableStateServiceFactory } from './embeddable/dashboard_container_embeddable_factory';
 import { getUISettings } from './ui_settings';
diff --git a/src/plugins/dashboard/server/saved_objects/dashboard.ts b/src/plugins/dashboard/server/saved_objects/dashboard.ts
index 69d0feffde27b..953852bee59cf 100644
--- a/src/plugins/dashboard/server/saved_objects/dashboard.ts
+++ b/src/plugins/dashboard/server/saved_objects/dashboard.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   createDashboardSavedObjectTypeMigrations,
   DashboardSavedObjectTypeMigrationsDeps,
diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts
index 9a2afecf0aa96..0cefab5104d7d 100644
--- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.test.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { savedObjectsServiceMock } from '../../../../core/server/mocks';
-import { createEmbeddableSetupMock } from '../../../embeddable/server/mocks';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
+import { createEmbeddableSetupMock } from '@kbn/embeddable-plugin/server/mocks';
 import { createDashboardSavedObjectTypeMigrations } from './dashboard_migrations';
 import { DashboardDoc730ToLatest } from '../../common';
 import {
   createExtract,
   createInject,
 } from '../../common/embeddable/dashboard_container_persistable_state';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
 
 const embeddableSetupMock = createEmbeddableSetupMock();
diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts
index d50c199c7f0d4..603fa4af71db4 100644
--- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts
+++ b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts
@@ -12,11 +12,19 @@ import {
   SavedObjectAttributes,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { SavedObjectEmbeddableInput } from '@kbn/embeddable-plugin/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common';
+import {
+  mergeMigrationFunctionMaps,
+  MigrateFunction,
+  MigrateFunctionsObject,
+} from '@kbn/kibana-utils-plugin/common';
+import { CONTROL_GROUP_TYPE } from '@kbn/controls-plugin/common';
 import { migrations730 } from './migrations_730';
 import { SavedDashboardPanel } from '../../common/types';
-import { EmbeddableSetup } from '../../../embeddable/server';
 import { migrateMatchAllQuery } from './migrate_match_all_query';
 import {
   serializableToRawAttributes,
@@ -29,15 +37,7 @@ import {
   convertPanelStateToSavedDashboardPanel,
   convertSavedDashboardPanelToPanelState,
 } from '../../common/embeddable/embeddable_saved_object_converters';
-import { SavedObjectEmbeddableInput } from '../../../embeddable/common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../data/common';
-import {
-  mergeMigrationFunctionMaps,
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../kibana_utils/common';
 import { replaceIndexPatternReference } from './replace_index_pattern_reference';
-import { CONTROL_GROUP_TYPE } from '../../../controls/common';
 
 function migrateIndexPattern(doc: DashboardDoc700To720) {
   const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
diff --git a/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts b/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts
index d26e2c4424f27..cea39fc45b0fe 100644
--- a/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts
+++ b/src/plugins/dashboard/server/saved_objects/is_dashboard_doc.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { DashboardDoc730ToLatest } from '../../common';
 
 function isDoc(
diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts
index bf8d8fb225842..bf1eb9f4986b7 100644
--- a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { migrateMatchAllQuery } from './migrate_match_all_query';
-import { SavedObjectMigrationContext, SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationContext, SavedObjectMigrationFn } from '@kbn/core/server';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
 
diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts
index 15013fa9c6f26..147aa47a7a6e9 100644
--- a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { get } from 'lodash';
-import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
+import { DEFAULT_QUERY_LANGUAGE } from '@kbn/data-plugin/common';
 
 /**
  * This migration script is related to:
diff --git a/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts b/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts
index 086ef8eddba03..2fc999b067496 100644
--- a/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrations_730.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsServiceMock } from '../../../../core/server/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import { createDashboardSavedObjectTypeMigrations } from './dashboard_migrations';
 import { migrations730 } from './migrations_730';
 import { DashboardDoc700To720, DashboardDoc730ToLatest, DashboardDocPre700 } from '../../common';
 import { RawSavedDashboardPanel730ToLatest } from '../../common';
-import { createEmbeddableSetupMock } from '../../../embeddable/server/mocks';
+import { createEmbeddableSetupMock } from '@kbn/embeddable-plugin/server/mocks';
 
 const mockContext = savedObjectsServiceMock.createMigrationContext();
 const migrations = createDashboardSavedObjectTypeMigrations({
diff --git a/src/plugins/dashboard/server/saved_objects/migrations_730.ts b/src/plugins/dashboard/server/saved_objects/migrations_730.ts
index a21ed5a5afe08..3cc34d8513a45 100644
--- a/src/plugins/dashboard/server/saved_objects/migrations_730.ts
+++ b/src/plugins/dashboard/server/saved_objects/migrations_730.ts
@@ -7,7 +7,7 @@
  */
 
 import { inspect } from 'util';
-import { SavedObjectMigrationContext } from 'kibana/server';
+import { SavedObjectMigrationContext } from '@kbn/core/server';
 import { DashboardDoc730ToLatest } from '../../common';
 import { isDashboardDoc } from './is_dashboard_doc';
 import { moveFiltersToQuery } from './move_filters_to_query';
diff --git a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts
index 41dbcbe05d44f..13db82790c9d0 100644
--- a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts
+++ b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { SavedObjectMigrationContext, SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectMigrationFn } from '@kbn/core/server';
 
 import { replaceIndexPatternReference } from './replace_index_pattern_reference';
 
diff --git a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts
index e2ea076de7743..5d5541143f8a7 100644
--- a/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts
+++ b/src/plugins/dashboard/server/saved_objects/replace_index_pattern_reference.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../data/common';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common';
 
 export const replaceIndexPatternReference: SavedObjectMigrationFn<any, any> = (doc) => ({
   ...doc,
diff --git a/src/plugins/dashboard/server/ui_settings.ts b/src/plugins/dashboard/server/ui_settings.ts
index 6efd68da25f2d..292df760ba2ba 100644
--- a/src/plugins/dashboard/server/ui_settings.ts
+++ b/src/plugins/dashboard/server/ui_settings.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { SETTING_CATEGORY } from '../../../../src/plugins/presentation_util/server';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { SETTING_CATEGORY } from '@kbn/presentation-util-plugin/server';
+import { UiSettingsParams } from '@kbn/core/types';
 import { UI_SETTINGS } from '../common';
 
 /**
diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
index 8d6ebeab08a98..3eb29bf1531c4 100644
--- a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
+++ b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository, SavedObjectAttributes } from 'src/core/server';
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+import { ISavedObjectsRepository, SavedObjectAttributes } from '@kbn/core/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 import { SavedDashboardPanel730ToLatest } from '../../common';
 import { injectReferences } from '../../common/saved_dashboard_references';
 
diff --git a/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts b/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts
index c3c32fbcd6a61..694fe2007f844 100644
--- a/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts
+++ b/src/plugins/dashboard/server/usage/find_by_value_embeddables.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository, SavedObjectAttributes } from 'kibana/server';
+import { ISavedObjectsRepository, SavedObjectAttributes } from '@kbn/core/server';
 import { SavedDashboardPanel730ToLatest } from '../../common';
 
 export const findByValueEmbeddables = async (
diff --git a/src/plugins/dashboard/server/usage/register_collector.ts b/src/plugins/dashboard/server/usage/register_collector.ts
index a911fc9b81666..3ec327172c059 100644
--- a/src/plugins/dashboard/server/usage/register_collector.ts
+++ b/src/plugins/dashboard/server/usage/register_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { collectDashboardTelemetry, DashboardCollectorData } from './dashboard_telemetry';
 
diff --git a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts
index 0a178a78f1e22..1fa33a65c4b02 100644
--- a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts
+++ b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { createStubDataView } from 'src/plugins/data_views/common/mocks';
-import type { DataViewsContract } from 'src/plugins/data_views/common';
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions/common';
-import { FieldFormat } from 'src/plugins/field_formats/common';
-import { fieldFormatsMock } from 'src/plugins/field_formats/common/mocks';
+import { createStubDataView } from '@kbn/data-views-plugin/common/mocks';
+import type { DataViewsContract } from '@kbn/data-views-plugin/common';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import type { AggsCommonStart } from '../search';
 import { DatatableUtilitiesService } from './datatable_utilities_service';
 
diff --git a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts
index 7430b3f6bc09c..c5084c52dbc51 100644
--- a/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts
+++ b/src/plugins/data/common/datatable_utilities/datatable_utilities_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { DataView, DataViewsContract, DataViewField } from 'src/plugins/data_views/common';
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions/common';
-import type { FieldFormatsStartCommon, FieldFormat } from 'src/plugins/field_formats/common';
+import type { DataView, DataViewsContract, DataViewField } from '@kbn/data-views-plugin/common';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
+import type { FieldFormatsStartCommon, FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { AggsCommonStart, AggConfig, CreateAggConfigParams, IAggType } from '../search';
 
 export class DatatableUtilitiesService {
diff --git a/src/plugins/data/common/es_query/get_es_query_config.test.ts b/src/plugins/data/common/es_query/get_es_query_config.test.ts
index 984d964ea9b32..e009a0651484e 100644
--- a/src/plugins/data/common/es_query/get_es_query_config.test.ts
+++ b/src/plugins/data/common/es_query/get_es_query_config.test.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import { getEsQueryConfig } from './get_es_query_config';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { UI_SETTINGS } from '..';
 
 const config = {
diff --git a/src/plugins/data/common/exports/export_csv.test.ts b/src/plugins/data/common/exports/export_csv.test.ts
index f108e69c68d56..52f098948e2d8 100644
--- a/src/plugins/data/common/exports/export_csv.test.ts
+++ b/src/plugins/data/common/exports/export_csv.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions';
-import { FieldFormat } from '../../../field_formats/common';
+import { Datatable } from '@kbn/expressions-plugin';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { datatableToCSV } from './export_csv';
 
 function getDefaultOptions() {
diff --git a/src/plugins/data/common/exports/export_csv.tsx b/src/plugins/data/common/exports/export_csv.tsx
index 68f817d1b1484..e5a408f6c10e4 100644
--- a/src/plugins/data/common/exports/export_csv.tsx
+++ b/src/plugins/data/common/exports/export_csv.tsx
@@ -8,8 +8,8 @@
 
 // Inspired by the inspector CSV exporter
 
-import { Datatable } from 'src/plugins/expressions';
-import { FormatFactory } from '../../../field_formats/common';
+import { Datatable } from '@kbn/expressions-plugin';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { createEscapeValue } from './escape_value';
 
 export const LINE_FEED_CHARACTER = '\r\n';
diff --git a/src/plugins/data/common/exports/formula_checks.ts b/src/plugins/data/common/exports/formula_checks.ts
index eed339c15781c..606f62277e0da 100644
--- a/src/plugins/data/common/exports/formula_checks.ts
+++ b/src/plugins/data/common/exports/formula_checks.ts
@@ -7,7 +7,7 @@
  */
 
 import { startsWith } from 'lodash';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { CSV_FORMULA_CHARS } from './constants';
 
 export const cellHasFormulas = (val: string) =>
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index 93aeb918bc53a..8944aa7db2843 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -128,12 +128,12 @@ export type {
   IndexPatternExpressionType,
   IndexPatternLoadStartDependencies,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../data_views/common';
+} from '@kbn/data-views-plugin/common';
 export type {
   IndexPatternsContract,
   DataViewsContract,
   DataViewListItem,
-} from '../../data_views/common';
+} from '@kbn/data-views-plugin/common';
 export {
   RUNTIME_FIELD_TYPES,
   DEFAULT_ASSETS_TO_IGNORE,
@@ -155,4 +155,4 @@ export {
   isMultiField,
   getFieldSubtypeMulti,
   getFieldSubtypeNested,
-} from '../../data_views/common';
+} from '@kbn/data-views-plugin/common';
diff --git a/src/plugins/data/common/mocks.ts b/src/plugins/data/common/mocks.ts
index cf7d6bef6a4e8..8d5523a7e8e8e 100644
--- a/src/plugins/data/common/mocks.ts
+++ b/src/plugins/data/common/mocks.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export * from '../../data_views/common/fields/fields.mocks';
+export * from '@kbn/data-views-plugin/common/fields/fields.mocks';
 export * from './datatable_utilities/mock';
diff --git a/src/plugins/data/common/query/persistable_state.test.ts b/src/plugins/data/common/query/persistable_state.test.ts
index 93f14a0fc2e08..c69f7dee15e37 100644
--- a/src/plugins/data/common/query/persistable_state.test.ts
+++ b/src/plugins/data/common/query/persistable_state.test.ts
@@ -8,7 +8,7 @@
 
 import { extract, inject } from './persistable_state';
 import { Filter } from '@kbn/es-query';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '..';
 
 describe('filter manager persistable state tests', () => {
   const filters: Filter[] = [
diff --git a/src/plugins/data/common/query/persistable_state.ts b/src/plugins/data/common/query/persistable_state.ts
index 177aae391c4fb..4860d892ab5d7 100644
--- a/src/plugins/data/common/query/persistable_state.ts
+++ b/src/plugins/data/common/query/persistable_state.ts
@@ -8,9 +8,9 @@
 
 import uuid from 'uuid';
 import { Filter } from '@kbn/es-query';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
-import { SavedObjectReference } from '../../../../core/types';
-import { MigrateFunctionsObject } from '../../../kibana_utils/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '..';
 
 export const extract = (filters: Filter[]) => {
   const references: SavedObjectReference[] = [];
diff --git a/src/plugins/data/common/search/aggs/agg_config.test.ts b/src/plugins/data/common/search/aggs/agg_config.test.ts
index 93903ee0c3210..d39b351e93612 100644
--- a/src/plugins/data/common/search/aggs/agg_config.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { identity } from 'lodash';
-import type { ExpressionAstExpression } from 'src/plugins/expressions';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin';
 
 import { AggConfig, IAggConfig } from './agg_config';
 import { AggConfigs, CreateAggConfigParams } from './agg_configs';
diff --git a/src/plugins/data/common/search/aggs/agg_config.ts b/src/plugins/data/common/search/aggs/agg_config.ts
index 9cc5d7b97e633..f78452d99eded 100644
--- a/src/plugins/data/common/search/aggs/agg_config.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.ts
@@ -12,10 +12,10 @@ import { i18n } from '@kbn/i18n';
 import type { SerializableRecord } from '@kbn/utility-types';
 import { Assign, Ensure } from '@kbn/utility-types';
 
+import { ExpressionAstExpression, ExpressionAstArgument } from '@kbn/expressions-plugin/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
-import { ExpressionAstExpression, ExpressionAstArgument } from 'src/plugins/expressions/common';
-import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import { ISearchOptions, ISearchSource } from '../../../public';
 
 import { IAggType } from './agg_type';
 import { writeParams } from './agg_params';
diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts
index a675ce5ee1557..c4f1da62ead3a 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.ts
@@ -19,13 +19,13 @@ import {
   ISearchSource,
   RangeFilter,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/plugins/data/public';
+} from '../../../public';
 import { AggConfig, AggConfigSerialized, IAggConfig } from './agg_config';
 import { IAggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { AggGroupNames } from './agg_groups';
 import { IndexPattern } from '../..';
-import { TimeRange, getTime, calculateBounds } from '../../../common';
+import { TimeRange, getTime, calculateBounds } from '../..';
 import { IBucketAggConfig } from './buckets';
 import { insertTimeShiftSplit, mergeTimeShifts } from './utils/time_splits';
 
diff --git a/src/plugins/data/common/search/aggs/agg_params.test.ts b/src/plugins/data/common/search/aggs/agg_params.test.ts
index 963346beb6a4d..c197d21ba8239 100644
--- a/src/plugins/data/common/search/aggs/agg_params.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_params.test.ts
@@ -10,7 +10,7 @@ import { initParams } from './agg_params';
 import { BaseParamType } from './param_types/base';
 import { FieldParamType } from './param_types/field';
 import { OptionedParamType } from './param_types/optioned';
-import { AggParamType } from '../aggs/param_types/agg';
+import { AggParamType } from './param_types/agg';
 
 describe('AggParams class', () => {
   describe('constructor args', () => {
diff --git a/src/plugins/data/common/search/aggs/agg_type.ts b/src/plugins/data/common/search/aggs/agg_type.ts
index 12b81f422aa52..633bd00dd9a35 100644
--- a/src/plugins/data/common/search/aggs/agg_type.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.ts
@@ -9,13 +9,13 @@
 import { constant, noop, identity } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ISearchSource } from 'src/plugins/data/public';
-import { DatatableColumnType } from 'src/plugins/expressions/common';
-import type { RequestAdapter } from 'src/plugins/inspector/common';
-import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import type { RequestAdapter } from '@kbn/inspector-plugin/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ISearchSource } from '../../../public';
 import { initParams } from './agg_params';
 import { AggConfig } from './agg_config';
 import { IAggConfigs } from './agg_configs';
diff --git a/src/plugins/data/common/search/aggs/agg_types.ts b/src/plugins/data/common/search/aggs/agg_types.ts
index d7750c48016cd..2e65152314cf7 100644
--- a/src/plugins/data/common/search/aggs/agg_types.ts
+++ b/src/plugins/data/common/search/aggs/agg_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsStartCommon } from '../../../../field_formats/common';
+import { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
 
 import * as buckets from './buckets';
 import * as metrics from './metrics';
diff --git a/src/plugins/data/common/search/aggs/aggs_service.ts b/src/plugins/data/common/search/aggs/aggs_service.ts
index 6fe7eef5b87b4..a348acb90212b 100644
--- a/src/plugins/data/common/search/aggs/aggs_service.ts
+++ b/src/plugins/data/common/search/aggs/aggs_service.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
-import { CreateAggConfigParams, IndexPattern, UI_SETTINGS } from '../../../common';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
+import { CreateAggConfigParams, IndexPattern, UI_SETTINGS } from '../..';
 import { GetConfigFn } from '../../types';
 import {
   AggConfigs,
@@ -15,7 +15,7 @@ import {
   getAggTypes,
   getAggTypesFunctions,
   getCalculateAutoTimeExpression,
-} from './';
+} from '.';
 import { AggsCommonSetup, AggsCommonStart } from './types';
 
 /** @internal */
diff --git a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
index d781971f83aab..cc49c896bdfe5 100644
--- a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
+++ b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
@@ -15,6 +15,7 @@ import {
   buildQueryFromFilters,
   Filter,
 } from '@kbn/es-query';
+import { lastValueFrom } from 'rxjs';
 import { AggGroupNames } from '../agg_groups';
 import { IAggConfigs } from '../agg_configs';
 import { IAggType } from '../agg_type';
@@ -342,8 +343,8 @@ export const createOtherBucketPostFlightRequest = (
 
       nestedSearchSource.setField('aggs', filterAgg);
 
-      const { rawResponse: response } = await nestedSearchSource
-        .fetch$({
+      const { rawResponse: response } = await lastValueFrom(
+        nestedSearchSource.fetch$({
           abortSignal,
           sessionId: searchSessionId,
           inspector: {
@@ -358,7 +359,7 @@ export const createOtherBucketPostFlightRequest = (
             }),
           },
         })
-        .toPromise();
+      );
 
       resp = mergeOtherBucketAggResponse(
         aggConfigs,
diff --git a/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts b/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts
index 12a2c9b0e9c92..a55588f4dd550 100644
--- a/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts
+++ b/src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { IAggConfig } from '../agg_config';
-import { FilterFieldFn, GenericBucket, IAggConfigs } from '../../../../common';
+import { FilterFieldFn, GenericBucket, IAggConfigs } from '../../..';
 import { AggType, AggTypeConfig } from '../agg_type';
 import { AggParamType } from '../param_types/agg';
 import type { FieldTypes } from '../param_types/field';
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
index 625da5c304ad3..f0dc3ad0cb7b3 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../../field_formats/common';
+import { BytesFormat, FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
 import { AggConfigs } from '../../agg_configs';
 import { mockAggTypesRegistry, mockGetFieldFormatsStart } from '../../test_helpers';
 import { BUCKET_TYPES } from '../bucket_agg_types';
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts
index 121a3a6c06b95..f52388478df9b 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/ip_range.test.ts
@@ -9,7 +9,7 @@
 import { createFilterIpRange } from './ip_range';
 import { AggConfigs, CreateAggConfigParams } from '../../agg_configs';
 import { mockAggTypesRegistry } from '../../test_helpers';
-import { IpFormat } from '../../../../../../field_formats/common';
+import { IpFormat } from '@kbn/field-formats-plugin/common';
 import { BUCKET_TYPES } from '../bucket_agg_types';
 import { IBucketAggConfig } from '../bucket_agg_type';
 import { RangeFilter } from '@kbn/es-query';
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
index 6f86186fe4dc3..873b6eb2e104f 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { RangeFilter } from '@kbn/es-query';
-import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../../field_formats/common';
+import { BytesFormat, FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
 import { AggConfigs } from '../../agg_configs';
 import { mockAggTypesRegistry, mockGetFieldFormatsStart } from '../../test_helpers';
 import { IBucketAggConfig } from '../bucket_agg_type';
diff --git a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
index 64ec46ad637e0..e1f5d31075d55 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
@@ -10,7 +10,7 @@ import { get, noop, find, every, omitBy, isNil } from 'lodash';
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES, TimeRange, TimeRangeBounds, UI_SETTINGS } from '../../../../common';
+import { KBN_FIELD_TYPES, TimeRange, TimeRangeBounds, UI_SETTINGS } from '../../..';
 import { IFieldType } from '../../..';
 
 import { ExtendedBounds, extendedBoundsToAst, timerangeToAst } from '../../expressions';
diff --git a/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts b/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts
index b5175efd5cf8a..b158d2f8b7f35 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_histogram_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { ExtendedBoundsOutput, KibanaTimerangeOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggDateHistogramFnName = 'aggDateHistogram';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/date_range.ts b/src/plugins/data/common/search/aggs/buckets/date_range.ts
index 58439ad943d38..8fb0bf2d4ccb5 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_range.ts
@@ -16,7 +16,7 @@ import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { createFilterDateRange } from './create_filter/date_range';
 import { aggDateRangeFnName } from './date_range_fn';
 
-import { KBN_FIELD_TYPES } from '../../../../common/kbn_field_types/types';
+import { KBN_FIELD_TYPES } from '../../../kbn_field_types/types';
 import { BaseAggParams } from '../types';
 
 const dateRangeTitle = i18n.translate('data.search.aggs.buckets.dateRangeTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts b/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts
index c0b18d2e72143..9913c838d60f6 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_range_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { DateRangeOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggDateRangeFnName = 'aggDateRange';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts b/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts
index 0e1b235dd576d..2112a106995bd 100644
--- a/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/diversified_sampler_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '..';
 import { DIVERSIFIED_SAMPLER_AGG_NAME } from './diversified_sampler';
 
 export const aggDiversifiedSamplerFnName = 'aggDiversifiedSampler';
diff --git a/src/plugins/data/common/search/aggs/buckets/filter_fn.ts b/src/plugins/data/common/search/aggs/buckets/filter_fn.ts
index 1533368d166fa..0390213f6c16c 100644
--- a/src/plugins/data/common/search/aggs/buckets/filter_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filter_fn.ts
@@ -9,10 +9,10 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { GeoBoundingBoxOutput, KibanaQueryOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggFilterFnName = 'aggFilter';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/filters.test.ts b/src/plugins/data/common/search/aggs/buckets/filters.test.ts
index 75112ec53fa18..da9279232fda0 100644
--- a/src/plugins/data/common/search/aggs/buckets/filters.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filters.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Query } from '../../../../common';
+import { Query } from '../../..';
 import { AggConfigs } from '../agg_configs';
 import { AggTypesDependencies } from '../agg_types';
 import { mockAggTypesRegistry, mockAggTypesDependencies } from '../test_helpers';
diff --git a/src/plugins/data/common/search/aggs/buckets/filters.ts b/src/plugins/data/common/search/aggs/buckets/filters.ts
index 2ce6abbef543e..9ba502c399dc2 100644
--- a/src/plugins/data/common/search/aggs/buckets/filters.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filters.ts
@@ -15,7 +15,7 @@ import { createFilterFilters } from './create_filter/filters';
 import { BucketAggType } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggFiltersFnName } from './filters_fn';
-import { getEsQueryConfig, UI_SETTINGS } from '../../../../common';
+import { getEsQueryConfig, UI_SETTINGS } from '../../..';
 import { BaseAggParams } from '../types';
 
 const filtersTitle = i18n.translate('data.search.aggs.buckets.filtersTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/filters_fn.ts b/src/plugins/data/common/search/aggs/buckets/filters_fn.ts
index 1b57b3850fdb2..cbaf013beb7c3 100644
--- a/src/plugins/data/common/search/aggs/buckets/filters_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/filters_fn.ts
@@ -9,10 +9,10 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { QueryFilterOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggFiltersFnName = 'aggFilters';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_hash.ts b/src/plugins/data/common/search/aggs/buckets/geo_hash.ts
index d42f381360566..bec2e06efca1f 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_hash.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_hash.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { GeoBoundingBox, geoBoundingBoxToAst } from '../../expressions';
 
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggGeoHashFnName } from './geo_hash_fn';
 import { BaseAggParams } from '../types';
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts b/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts
index c9ee407b0dfc0..c1028133e56b1 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_hash_fn.ts
@@ -9,10 +9,10 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { GeoBoundingBoxOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggGeoHashFnName = 'aggGeoHash';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_tile.ts b/src/plugins/data/common/search/aggs/buckets/geo_tile.ts
index 87cba9a33a451..ed9ad7b561efe 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_tile.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_tile.ts
@@ -12,7 +12,7 @@ import { noop } from 'lodash';
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggGeoTileFnName } from './geo_tile_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { METRIC_TYPES } from '../metrics/metric_agg_types';
 import { BaseAggParams } from '../types';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts b/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts
index d74a4df890558..60b2f566f023b 100644
--- a/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/geo_tile_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggGeoTileFnName = 'aggGeoTile';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram.ts b/src/plugins/data/common/search/aggs/buckets/histogram.ts
index 2aba5e81f1e7a..5231bbbb91b10 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram.ts
@@ -8,9 +8,9 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
-import { KBN_FIELD_TYPES, UI_SETTINGS } from '../../../../common';
+import { KBN_FIELD_TYPES, UI_SETTINGS } from '../../..';
 
 import { ExtendedBounds, extendedBoundsToAst } from '../../expressions';
 import { AggTypesDependencies } from '../agg_types';
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts b/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
index f46a158844a00..a7af9017fb5d4 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { ExtendedBoundsOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggHistogramFnName = 'aggHistogram';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/ip_range.ts b/src/plugins/data/common/search/aggs/buckets/ip_range.ts
index 948cc08c3aaa9..d723ed62ed01e 100644
--- a/src/plugins/data/common/search/aggs/buckets/ip_range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/ip_range.ts
@@ -15,7 +15,7 @@ import { BUCKET_TYPES } from './bucket_agg_types';
 import { createFilterIpRange } from './create_filter/ip_range';
 import { IpRangeKey, RangeIpRangeAggKey, CidrMaskIpRangeAggKey } from './lib/ip_range';
 import { aggIpRangeFnName } from './ip_range_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const ipRangeTitle = i18n.translate('data.search.aggs.buckets.ipRangeTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts b/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts
index c0543d3c5b4f8..391e38804f604 100644
--- a/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/ip_range_fn.ts
@@ -9,8 +9,8 @@
 import { groupBy, isEmpty, isNil, map, mapValues, omit, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 import { CidrOutput, IpRangeOutput } from '../../expressions';
 
 export const aggIpRangeFnName = 'aggIpRange';
diff --git a/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts
index 12b9c6d156548..bd9390370df75 100644
--- a/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/multi_terms_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggMultiTermsFnName = 'aggMultiTerms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/range.test.ts b/src/plugins/data/common/search/aggs/buckets/range.test.ts
index 202cc59c83c0f..5c1a8e6ec2aad 100644
--- a/src/plugins/data/common/search/aggs/buckets/range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range.test.ts
@@ -9,7 +9,7 @@
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { BUCKET_TYPES } from './bucket_agg_types';
-import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../../field_formats/common';
+import { FieldFormatsGetConfigFn, NumberFormat } from '@kbn/field-formats-plugin/common';
 
 describe('Range Agg', () => {
   const getConfig = (() => {}) as FieldFormatsGetConfigFn;
diff --git a/src/plugins/data/common/search/aggs/buckets/range.ts b/src/plugins/data/common/search/aggs/buckets/range.ts
index 4c8718c69e589..e15995be5636b 100644
--- a/src/plugins/data/common/search/aggs/buckets/range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 
 import { NumericalRange, numericalRangeToAst } from '../../expressions';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { AggTypesDependencies } from '../agg_types';
 import { BaseAggParams } from '../types';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/range_fn.ts b/src/plugins/data/common/search/aggs/buckets/range_fn.ts
index be7fe7615a9b1..30b0f00fc57de 100644
--- a/src/plugins/data/common/search/aggs/buckets/range_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range_fn.ts
@@ -9,9 +9,9 @@
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { NumericalRangeOutput } from '../../expressions';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggRangeFnName = 'aggRange';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/rare_terms.ts b/src/plugins/data/common/search/aggs/buckets/rare_terms.ts
index bc3c23b026238..4d0c9c9a5e35d 100644
--- a/src/plugins/data/common/search/aggs/buckets/rare_terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/rare_terms.ts
@@ -14,7 +14,7 @@ import { createFilterTerms } from './create_filter/terms';
 import { aggRareTermsFnName } from './rare_terms_fn';
 import { BaseAggParams } from '../types';
 
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 const termsTitle = i18n.translate('data.search.aggs.buckets.rareTermsTitle', {
   defaultMessage: 'Rare terms',
diff --git a/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts
index bdb4556d186ad..6b1dd98884cd5 100644
--- a/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/rare_terms_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggRareTermsFnName = 'aggRareTerms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts b/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts
index 2cb30eb70a230..1c1c57ba31c26 100644
--- a/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/sampler_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionFunctionArgs, AggExpressionType, BUCKET_TYPES } from '..';
 import { SAMPLER_AGG_NAME } from './sampler';
 
 export const aggSamplerFnName = 'aggSampler';
diff --git a/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts b/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts
index 9f7559c6fe34f..cbd77ff1dd2f9 100644
--- a/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/shard_delay.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { AggConfigs } from '../agg_configs';
-import { FieldFormatsGetConfigFn, NumberFormat } from '../../../../../field_formats/common';
+import { FieldFormatsGetConfigFn, NumberFormat } from '@kbn/field-formats-plugin/common';
 import { getShardDelayBucketAgg, SHARD_DELAY_AGG_NAME } from './shard_delay';
 
 describe('Shard Delay Agg', () => {
diff --git a/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts b/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts
index 693c7fe213717..cbf9485b31be4 100644
--- a/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/shard_delay_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggConfigSerialized } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggConfigSerialized } from '..';
 import { AggParamsShardDelay, SHARD_DELAY_AGG_NAME } from './shard_delay';
 
 export const aggShardDelayFnName = 'aggShardDelay';
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_terms.ts b/src/plugins/data/common/search/aggs/buckets/significant_terms.ts
index 561df31a529aa..57a63aedf0939 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_terms.ts
@@ -12,7 +12,7 @@ import { createFilterTerms } from './create_filter/terms';
 import { isStringType, migrateIncludeExcludeFormat } from './migrate_include_exclude_format';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggSignificantTermsFnName } from './significant_terms_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const significantTermsTitle = i18n.translate('data.search.aggs.buckets.significantTermsTitle', {
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts
index bb0de838ad640..92018190440bb 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_terms_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggSignificantTermsFnName = 'aggSignificantTerms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_text.ts b/src/plugins/data/common/search/aggs/buckets/significant_text.ts
index 0436b58a2c998..5e159164b513a 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_text.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_text.ts
@@ -11,7 +11,7 @@ import { BucketAggType } from './bucket_agg_type';
 import { migrateIncludeExcludeFormat } from './migrate_include_exclude_format';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { aggSignificantTextFnName } from './significant_text_fn';
-import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 import { createFilterTerms } from './create_filter/terms';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts b/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts
index 5392b8fd3745c..44d346fb42c74 100644
--- a/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/significant_text_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggSignificantTextFnName = 'aggSignificantText';
 
diff --git a/src/plugins/data/common/search/aggs/buckets/terms.ts b/src/plugins/data/common/search/aggs/buckets/terms.ts
index bfc5809d5e439..3837448e35013 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms.ts
@@ -19,7 +19,7 @@ import {
 import { aggTermsFnName } from './terms_fn';
 import { AggConfigSerialized, BaseAggParams } from '../types';
 
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 import {
   createOtherBucketPostFlightRequest,
diff --git a/src/plugins/data/common/search/aggs/buckets/terms_fn.ts b/src/plugins/data/common/search/aggs/buckets/terms_fn.ts
index bce1010ede342..bbda594cceaa4 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '..';
 
 export const aggTermsFnName = 'aggTerms';
 
diff --git a/src/plugins/data/common/search/aggs/index.test.ts b/src/plugins/data/common/search/aggs/index.test.ts
index ecd821f363b1f..1c1a5e06334c7 100644
--- a/src/plugins/data/common/search/aggs/index.test.ts
+++ b/src/plugins/data/common/search/aggs/index.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getAggTypes } from './index';
+import { getAggTypes } from '.';
 import { mockGetFieldFormatsStart } from './test_helpers';
 
 import { isBucketAggType } from './buckets/bucket_agg_type';
diff --git a/src/plugins/data/common/search/aggs/metrics/avg.ts b/src/plugins/data/common/search/aggs/metrics/avg.ts
index 6ffafbdf37ee9..1fafc095e35b7 100644
--- a/src/plugins/data/common/search/aggs/metrics/avg.ts
+++ b/src/plugins/data/common/search/aggs/metrics/avg.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggAvgFnName } from './avg_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const averageTitle = i18n.translate('data.search.aggs.metrics.averageTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/avg_fn.ts b/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
index e32de6cd0a83f..9955e1f4dbc2c 100644
--- a/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggAvgFnName = 'aggAvg';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts
index a980f6ac555a2..d537199af3050 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketAvgFnName = 'aggBucketAvg';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts
index 0d3e8a5e7f878..81aeea400a908 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketMaxFnName = 'aggBucketMax';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts
index 3b6c32595909a..844960f352cc2 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketMinFnName = 'aggBucketMin';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts b/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts
index ae3502bbc2588..16418c8933633 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggBucketSumFnName = 'aggBucketSum';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/cardinality.ts b/src/plugins/data/common/search/aggs/metrics/cardinality.ts
index f965deb6b0fe8..496cc85440b84 100644
--- a/src/plugins/data/common/search/aggs/metrics/cardinality.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cardinality.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggCardinalityFnName } from './cardinality_fn';
 import { MetricAggType, IMetricAggConfig } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const uniqueCountTitle = i18n.translate('data.search.aggs.metrics.uniqueCountTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
index cdff364f7c45e..351f97dcc3c37 100644
--- a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggCardinalityFnName = 'aggCardinality';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/count_fn.ts b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
index c302e0abf7c5d..b7dedf4301f6c 100644
--- a/src/plugins/data/common/search/aggs/metrics/count_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggCountFnName = 'aggCount';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts b/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts
index 5cdbcfe857585..29324e3a623aa 100644
--- a/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggCumulativeSumFnName = 'aggCumulativeSum';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts b/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
index 8bfe808aede8e..97758b778c20e 100644
--- a/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggDerivativeFnName = 'aggDerivative';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts b/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts
index 0b3d3acd3a603..ffbee1215bdab 100644
--- a/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggFilteredMetricFnName = 'aggFilteredMetric';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts b/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts
index b0f3ec886c5c8..0fd33709da421 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_bounds.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggGeoBoundsFnName } from './geo_bounds_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsGeoBounds extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts b/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts
index b2cfad1805b9f..a787c7a35a0a3 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggGeoBoundsFnName = 'aggGeoBounds';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts b/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts
index e3716084c969a..040fb4c72f50b 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_centroid.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggGeoCentroidFnName } from './geo_centroid_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsGeoCentroid extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts b/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts
index 9215f7afb4c6d..73f7e9ebf3310 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggGeoCentroidFnName = 'aggGeoCentroid';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/max.ts b/src/plugins/data/common/search/aggs/metrics/max.ts
index ce5718a7234ba..53dadb085994b 100644
--- a/src/plugins/data/common/search/aggs/metrics/max.ts
+++ b/src/plugins/data/common/search/aggs/metrics/max.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggMaxFnName } from './max_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const maxTitle = i18n.translate('data.search.aggs.metrics.maxTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/max_fn.ts b/src/plugins/data/common/search/aggs/metrics/max_fn.ts
index 7a1d8ad22fb7e..09ca2def05d50 100644
--- a/src/plugins/data/common/search/aggs/metrics/max_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/max_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMaxFnName = 'aggMax';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/median.ts b/src/plugins/data/common/search/aggs/metrics/median.ts
index 4fdb1ce6b7d81..e43676e4a1ba0 100644
--- a/src/plugins/data/common/search/aggs/metrics/median.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggMedianFnName } from './median_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const medianTitle = i18n.translate('data.search.aggs.metrics.medianTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/median_fn.ts b/src/plugins/data/common/search/aggs/metrics/median_fn.ts
index a9537e1f99ca4..c06c29bc05b50 100644
--- a/src/plugins/data/common/search/aggs/metrics/median_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMedianFnName = 'aggMedian';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/min.ts b/src/plugins/data/common/search/aggs/metrics/min.ts
index ea95827737b87..9d42d2debebca 100644
--- a/src/plugins/data/common/search/aggs/metrics/min.ts
+++ b/src/plugins/data/common/search/aggs/metrics/min.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
 import { aggMinFnName } from './min_fn';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const minTitle = i18n.translate('data.search.aggs.metrics.minTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/min_fn.ts b/src/plugins/data/common/search/aggs/metrics/min_fn.ts
index a97834f310a49..689e34d270a4f 100644
--- a/src/plugins/data/common/search/aggs/metrics/min_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/min_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMinFnName = 'aggMin';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts b/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts
index 1637dad561c37..4b0f23983e55b 100644
--- a/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggMovingAvgFnName = 'aggMovingAvg';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts b/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts
index 8f976ba979b95..3d93a368c6597 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentile_ranks.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { AggTypesDependencies } from '../agg_types';
 import { BaseAggParams } from '../types';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts b/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts
index 60a2882fcec58..bca07d62c3730 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggPercentileRanksFnName = 'aggPercentileRanks';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/percentiles.ts b/src/plugins/data/common/search/aggs/metrics/percentiles.ts
index d0e1c6df77696..c10403a1c6dd4 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentiles.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentiles.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { getResponseAggConfigClass } from './lib/get_response_agg_config_class';
 import type { IResponseAggConfig } from './lib/get_response_agg_config_class';
 import { aggPercentilesFnName } from './percentiles_fn';
diff --git a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
index 1a746a86cbcd5..fa9e4de2b0d4a 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggPercentilesFnName = 'aggPercentiles';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts b/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts
index 8460cb891f1e4..9d5a75e47ac10 100644
--- a/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggSerialDiffFnName = 'aggSerialDiff';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/single_percentile.ts b/src/plugins/data/common/search/aggs/metrics/single_percentile.ts
index 954576e2bbe1f..678e517c831b7 100644
--- a/src/plugins/data/common/search/aggs/metrics/single_percentile.ts
+++ b/src/plugins/data/common/search/aggs/metrics/single_percentile.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { aggSinglePercentileFnName } from './single_percentile_fn';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const singlePercentileTitle = i18n.translate('data.search.aggs.metrics.singlePercentileTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts b/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts
index edf69031c31ac..3d16f71b322d0 100644
--- a/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/single_percentile_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggSinglePercentileFnName = 'aggSinglePercentile';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/std_deviation.ts b/src/plugins/data/common/search/aggs/metrics/std_deviation.ts
index 9a4c38e296635..a6b74b083d689 100644
--- a/src/plugins/data/common/search/aggs/metrics/std_deviation.ts
+++ b/src/plugins/data/common/search/aggs/metrics/std_deviation.ts
@@ -13,7 +13,7 @@ import { aggStdDeviationFnName } from './std_deviation_fn';
 import { METRIC_TYPES } from './metric_agg_types';
 import { getResponseAggConfigClass } from './lib/get_response_agg_config_class';
 import type { IResponseAggConfig } from './lib/get_response_agg_config_class';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsStdDeviation extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts b/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts
index c181065d2416e..1993713470dd6 100644
--- a/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggStdDeviationFnName = 'aggStdDeviation';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/sum.ts b/src/plugins/data/common/search/aggs/metrics/sum.ts
index 2f1afcf418ba1..af0bc83912b41 100644
--- a/src/plugins/data/common/search/aggs/metrics/sum.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sum.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { aggSumFnName } from './sum_fn';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 const sumTitle = i18n.translate('data.search.aggs.metrics.sumTitle', {
diff --git a/src/plugins/data/common/search/aggs/metrics/sum_fn.ts b/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
index 063cc10839813..161674b2ea512 100644
--- a/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggSumFnName = 'aggSum';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts b/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts
index 37ce9c4edb8d1..69b1b5e44205d 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit.test.ts
@@ -11,7 +11,7 @@ import { getTopHitMetricAgg } from './top_hit';
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { IMetricAggConfig } from './metric_agg_type';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 describe('Top hit metric', () => {
   let aggDsl: Record<string, any>;
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit.ts b/src/plugins/data/common/search/aggs/metrics/top_hit.ts
index a4bd99d6b210d..ce120f1271632 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit.ts
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { aggTopHitFnName } from './top_hit_fn';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsTopHit extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts b/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts
index bc20f19253eec..0acc29a814add 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggTopHitFnName = 'aggTopHit';
 
diff --git a/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts b/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts
index 9bf5f581aa0a4..6542c6f398cb9 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts
@@ -10,7 +10,7 @@ import { getTopMetricsMetricAgg } from './top_metrics';
 import { AggConfigs } from '../agg_configs';
 import { mockAggTypesRegistry } from '../test_helpers';
 import { IMetricAggConfig } from './metric_agg_type';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 
 describe('Top metrics metric', () => {
   let aggConfig: IMetricAggConfig;
diff --git a/src/plugins/data/common/search/aggs/metrics/top_metrics.ts b/src/plugins/data/common/search/aggs/metrics/top_metrics.ts
index 2079925e0435b..df90186bbd746 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_metrics.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_metrics.ts
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { aggTopMetricsFnName } from './top_metrics_fn';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { KBN_FIELD_TYPES } from '../../..';
 import { BaseAggParams } from '../types';
 
 export interface AggParamsTopMetrics extends BaseAggParams {
diff --git a/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts b/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts
index 6fe9ba97fe448..0cdcd701d9376 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_metrics_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '..';
 
 export const aggTopMetricsFnName = 'aggTopMetrics';
 
diff --git a/src/plugins/data/common/search/aggs/param_types/base.ts b/src/plugins/data/common/search/aggs/param_types/base.ts
index 8ec528d311e01..8f5c660532df4 100644
--- a/src/plugins/data/common/search/aggs/param_types/base.ts
+++ b/src/plugins/data/common/search/aggs/param_types/base.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
-import { ExpressionAstExpression } from 'src/plugins/expressions/common';
+import { ISearchOptions, ISearchSource } from '../../../../public';
 import { IAggConfigs } from '../agg_configs';
 import { IAggConfig } from '../agg_config';
 
diff --git a/src/plugins/data/common/search/aggs/param_types/field.test.ts b/src/plugins/data/common/search/aggs/param_types/field.test.ts
index f49fec858bfaf..be9b48f7eb0e8 100644
--- a/src/plugins/data/common/search/aggs/param_types/field.test.ts
+++ b/src/plugins/data/common/search/aggs/param_types/field.test.ts
@@ -8,7 +8,7 @@
 
 import { BaseParamType } from './base';
 import { FieldParamType } from './field';
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../common';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../..';
 import { IAggConfig } from '../agg_config';
 
 describe('Field', () => {
diff --git a/src/plugins/data/common/search/aggs/param_types/field.ts b/src/plugins/data/common/search/aggs/param_types/field.ts
index b56787121f724..077978e952e43 100644
--- a/src/plugins/data/common/search/aggs/param_types/field.ts
+++ b/src/plugins/data/common/search/aggs/param_types/field.ts
@@ -7,15 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '@kbn/kibana-utils-plugin/common';
+import { isNestedField, IndexPatternField, DataViewField } from '@kbn/data-views-plugin/common';
 import { IAggConfig } from '../agg_config';
-import {
-  SavedFieldNotFound,
-  SavedFieldTypeInvalidForAgg,
-} from '../../../../../../plugins/kibana_utils/common';
 import { BaseParamType } from './base';
 import { propFilter } from '../utils';
 import { KBN_FIELD_TYPES } from '../../../kbn_field_types/types';
-import { isNestedField, IndexPatternField, DataViewField } from '../../../../../data_views/common';
 
 const filterByType = propFilter('type');
 
diff --git a/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts b/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts
index 91460dcd4f8f5..bcb0a22524689 100644
--- a/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts
+++ b/src/plugins/data/common/search/aggs/test_helpers/function_wrapper.ts
@@ -11,7 +11,7 @@ import {
   AnyExpressionFunctionDefinition,
   ExpressionFunctionDefinition,
   ExecutionContext,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 /**
  * Takes a function spec and passes in default args,
diff --git a/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts b/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts
index 50c8966d284a0..663de94952bbd 100644
--- a/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts
+++ b/src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fieldFormatsMock } from '../../../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 
 import { AggTypesRegistry, AggTypesRegistryStart } from '../agg_types_registry';
 import { AggTypesDependencies, getAggTypes } from '../agg_types';
diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts
index 3781b35e5b767..0d5a51eaef151 100644
--- a/src/plugins/data/common/search/aggs/types.ts
+++ b/src/plugins/data/common/search/aggs/types.ts
@@ -89,7 +89,7 @@ import {
   METRIC_TYPES,
   aggFilteredMetric,
   aggSinglePercentile,
-} from './';
+} from '.';
 import { AggParamsSampler } from './buckets/sampler';
 import { AggParamsDiversifiedSampler } from './buckets/diversified_sampler';
 import { AggParamsSignificantText } from './buckets/significant_text';
diff --git a/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts b/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
index e9ccc3b512756..48ec54a937548 100644
--- a/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
+++ b/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
@@ -7,8 +7,8 @@
  */
 
 import moment from 'moment';
-import { UI_SETTINGS } from '../../../../common/constants';
-import { TimeRange } from '../../../../common/query';
+import { UI_SETTINGS } from '../../../constants';
+import { TimeRange } from '../../../query';
 import { TimeBuckets } from '../buckets/lib/time_buckets';
 import { toAbsoluteDates } from './date_interval_utils';
 import { autoInterval } from '../buckets/_interval_options';
diff --git a/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts b/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts
index d147caf92711f..308f46551af30 100644
--- a/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts
+++ b/src/plugins/data/common/search/aggs/utils/date_interval_utils/to_absolute_dates.ts
@@ -7,7 +7,7 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { TimeRange } from '../../../../../common';
+import { TimeRange } from '../../../..';
 
 export function toAbsoluteDates(range: TimeRange) {
   const fromDate = dateMath.parse(range.from);
diff --git a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
index c8d173461cf3b..ea68be542f42f 100644
--- a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
@@ -8,11 +8,7 @@
 
 import { identity } from 'lodash';
 
-import {
-  FieldFormat,
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../field_formats/common';
+import { FieldFormat, IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { MultiFieldKey } from '../buckets/multi_field_key';
 import { getAggsFormats } from './get_aggs_formats';
 
diff --git a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
index 2233c9338cd58..61b61d70f1375 100644
--- a/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
@@ -16,7 +16,7 @@ import {
   FieldFormatsContentType,
   IFieldFormat,
   SerializedFieldFormat,
-} from '../../../../../field_formats/common';
+} from '@kbn/field-formats-plugin/common';
 import { DateRange } from '../../expressions';
 import { convertDateRangeToString } from '../buckets/lib/date_range';
 import { convertIPRangeToString, IpRangeKey } from '../buckets/lib/ip_range';
diff --git a/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts b/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts
index aa6e460b9c4dc..f6b0d364aa46b 100644
--- a/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_date_histogram_meta.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from 'src/plugins/expressions/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { TimeRange } from '../../../types';
 import type { AggParamsDateHistogram } from '../buckets';
 import { BUCKET_TYPES } from '../buckets/bucket_agg_types';
diff --git a/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts b/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts
index 067f87bd8481e..cdb6ef22fe5ff 100644
--- a/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts
+++ b/src/plugins/data/common/search/aggs/utils/get_number_histogram_interval.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from 'src/plugins/expressions/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import type { AggParamsHistogram } from '../buckets';
 import { BUCKET_TYPES } from '../buckets/bucket_agg_types';
 
diff --git a/src/plugins/data/common/search/aggs/utils/time_splits.ts b/src/plugins/data/common/search/aggs/utils/time_splits.ts
index 14ec52d17ea71..3f8783a05f91a 100644
--- a/src/plugins/data/common/search/aggs/utils/time_splits.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_splits.ts
@@ -12,7 +12,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { RangeFilter } from '@kbn/es-query';
 import { AggGroupNames } from '../agg_groups';
-import { GenericBucket, AggConfigs, getTime, AggConfig } from '../../../../common';
+import { GenericBucket, AggConfigs, getTime, AggConfig } from '../../..';
 import { IBucketAggConfig } from '../buckets';
 
 /**
diff --git a/src/plugins/data/common/search/expressions/cidr.ts b/src/plugins/data/common/search/expressions/cidr.ts
index f575af2ee84d3..84950165c81c0 100644
--- a/src/plugins/data/common/search/expressions/cidr.ts
+++ b/src/plugins/data/common/search/expressions/cidr.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface Cidr {
   mask: string;
diff --git a/src/plugins/data/common/search/expressions/cidr_to_ast.ts b/src/plugins/data/common/search/expressions/cidr_to_ast.ts
index 45ee5ed079001..82eeb1e6c3964 100644
--- a/src/plugins/data/common/search/expressions/cidr_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/cidr_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionCidr, Cidr } from './cidr';
 
 export const cidrToAst = (cidr: Cidr) => {
diff --git a/src/plugins/data/common/search/expressions/date_range.ts b/src/plugins/data/common/search/expressions/date_range.ts
index e506b0c624f9e..8f67493efad40 100644
--- a/src/plugins/data/common/search/expressions/date_range.ts
+++ b/src/plugins/data/common/search/expressions/date_range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface DateRange {
   from: number | string;
diff --git a/src/plugins/data/common/search/expressions/date_range_to_ast.ts b/src/plugins/data/common/search/expressions/date_range_to_ast.ts
index 93cb32d2c943b..61f5c3880e06f 100644
--- a/src/plugins/data/common/search/expressions/date_range_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/date_range_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionDateRange, DateRange } from './date_range';
 
 export const dateRangeToAst = (dateRange: DateRange) => {
diff --git a/src/plugins/data/common/search/expressions/eql.ts b/src/plugins/data/common/search/expressions/eql.ts
index b7a8c47985601..893b0e0ad9d06 100644
--- a/src/plugins/data/common/search/expressions/eql.ts
+++ b/src/plugins/data/common/search/expressions/eql.ts
@@ -8,10 +8,11 @@
 
 import { i18n } from '@kbn/i18n';
 import { buildEsQuery } from '@kbn/es-query';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 import { EqlSearchRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
+import { lastValueFrom } from 'rxjs';
+import { RequestStatistics, RequestAdapter } from '@kbn/inspector-plugin/common';
 import {
   ISearchGeneric,
   KibanaContext,
@@ -143,15 +144,17 @@ export const getEqlFn = ({
       });
 
       try {
-        const response = await search<EqlSearchStrategyRequest, EqlSearchStrategyResponse>(
-          {
-            params: {
-              index: args.index,
-              body: dsl,
+        const response = await lastValueFrom(
+          search<EqlSearchStrategyRequest, EqlSearchStrategyResponse>(
+            {
+              params: {
+                index: args.index,
+                body: dsl,
+              },
             },
-          },
-          { abortSignal, strategy: EQL_SEARCH_STRATEGY }
-        ).toPromise();
+            { abortSignal, strategy: EQL_SEARCH_STRATEGY }
+          )
+        );
 
         const stats: RequestStatistics = {};
 
diff --git a/src/plugins/data/common/search/expressions/eql_raw_response.ts b/src/plugins/data/common/search/expressions/eql_raw_response.ts
index ccdaed47e1676..c77eb9d84c737 100644
--- a/src/plugins/data/common/search/expressions/eql_raw_response.ts
+++ b/src/plugins/data/common/search/expressions/eql_raw_response.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionTypeDefinition } from '../../../../expressions/common';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common';
 import { EqlSearchStrategyResponse } from '..';
 
 const name = 'eql_raw_response';
diff --git a/src/plugins/data/common/search/expressions/es_raw_response.ts b/src/plugins/data/common/search/expressions/es_raw_response.ts
index 97c685777e4c7..6853eba6a9bc7 100644
--- a/src/plugins/data/common/search/expressions/es_raw_response.ts
+++ b/src/plugins/data/common/search/expressions/es_raw_response.ts
@@ -7,7 +7,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ExpressionTypeDefinition } from '../../../../expressions/common';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common';
 
 const name = 'es_raw_response';
 
diff --git a/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts b/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts
index 76e19eb129e5c..ad584ff8dd8bf 100644
--- a/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/create_filter.test.ts
@@ -7,12 +7,12 @@
  */
 
 import { isRangeFilter } from '@kbn/es-query';
-import { BytesFormat, FieldFormatsGetConfigFn } from '../../../../../field_formats/common';
+import { BytesFormat, FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
 import { AggConfigs, IAggConfig } from '../../aggs';
 import { mockAggTypesRegistry } from '../../aggs/test_helpers';
 
 import { createFilter } from './create_filter';
-import { Datatable } from '../../../../../expressions/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 
 describe('createFilter', () => {
   let table: Datatable;
diff --git a/src/plugins/data/common/search/expressions/esaggs/create_filter.ts b/src/plugins/data/common/search/expressions/esaggs/create_filter.ts
index 66430e224bb8d..9030cd7623ef7 100644
--- a/src/plugins/data/common/search/expressions/esaggs/create_filter.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/create_filter.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { Filter } from '../../../es_query';
 import { IAggConfig } from '../../aggs';
-import { Datatable } from '../../../../../expressions/common';
 
 const getOtherBucketFilterTerms = (table: Datatable, columnIndex: number, rowIndex: number) => {
   if (rowIndex === -1) {
diff --git a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
index 792b28408c5ff..6ef043a33dcbe 100644
--- a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
@@ -9,10 +9,10 @@
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
 
-import type { Datatable, ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { buildExpressionFunction } from '../../../../../../plugins/expressions/common';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/common';
 
-import { IndexPatternExpressionType } from '../../../../../data_views/common/expressions';
+import { IndexPatternExpressionType } from '@kbn/data-views-plugin/common/expressions';
 import { IndexPatternsContract } from '../../..';
 
 import { AggsStart, AggExpressionType, aggCountFnName } from '../../aggs';
diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
index d395baed2f08e..4c93667b502c8 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { defer } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { Adapters } from 'src/plugins/inspector/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 
-import { calculateBounds, Filter, IndexPattern, Query, TimeRange } from '../../../../common';
+import { calculateBounds, Filter, IndexPattern, Query, TimeRange } from '../../..';
 
 import { IAggConfigs } from '../../aggs';
 import { ISearchStartSearchSource } from '../../search_source';
diff --git a/src/plugins/data/common/search/expressions/esdsl.ts b/src/plugins/data/common/search/expressions/esdsl.ts
index 69e3c54e43806..34a67223b4be5 100644
--- a/src/plugins/data/common/search/expressions/esdsl.ts
+++ b/src/plugins/data/common/search/expressions/esdsl.ts
@@ -8,10 +8,11 @@
 
 import { i18n } from '@kbn/i18n';
 import { buildEsQuery } from '@kbn/es-query';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
+import { lastValueFrom } from 'rxjs';
+import { RequestStatistics, RequestAdapter } from '@kbn/inspector-plugin/common';
 import { EsRawResponse } from './es_raw_response';
-import { RequestStatistics, RequestAdapter } from '../../../../inspector/common';
 import { ISearchGeneric, KibanaContext } from '..';
 import { getEsQueryConfig } from '../../es_query';
 import { UiSettingsCommon } from '../..';
@@ -125,16 +126,18 @@ export const getEsdslFn = ({
       });
 
       try {
-        const { rawResponse } = await search(
-          {
-            params: {
-              index: args.index,
-              size: args.size,
-              body: dsl,
+        const { rawResponse } = await lastValueFrom(
+          search(
+            {
+              params: {
+                index: args.index,
+                size: args.size,
+                body: dsl,
+              },
             },
-          },
-          { abortSignal }
-        ).toPromise();
+            { abortSignal }
+          )
+        );
 
         const stats: RequestStatistics = {};
 
diff --git a/src/plugins/data/common/search/expressions/exists_filter.test.ts b/src/plugins/data/common/search/expressions/exists_filter.test.ts
index b6543eb25f924..c567505caaf4b 100644
--- a/src/plugins/data/common/search/expressions/exists_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/exists_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { existsFilterFunction } from './exists_filter';
 
diff --git a/src/plugins/data/common/search/expressions/exists_filter.ts b/src/plugins/data/common/search/expressions/exists_filter.ts
index b7c11daa38379..a14deac30fdc8 100644
--- a/src/plugins/data/common/search/expressions/exists_filter.ts
+++ b/src/plugins/data/common/search/expressions/exists_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { buildFilter, FILTERS } from '@kbn/es-query';
 import { KibanaField, KibanaFilter } from './kibana_context_type';
 import { IndexPattern } from '../..';
diff --git a/src/plugins/data/common/search/expressions/extended_bounds.ts b/src/plugins/data/common/search/expressions/extended_bounds.ts
index 028d1f8445dd3..f629b3f148254 100644
--- a/src/plugins/data/common/search/expressions/extended_bounds.ts
+++ b/src/plugins/data/common/search/expressions/extended_bounds.ts
@@ -8,7 +8,7 @@
 
 import { isNil, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface ExtendedBounds {
   min?: number;
diff --git a/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts b/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts
index 57b88cea5ab67..e6c822ae4808c 100644
--- a/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/extended_bounds_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionExtendedBounds, ExtendedBounds } from './extended_bounds';
 
 export const extendedBoundsToAst = (extendedBounds: ExtendedBounds) => {
diff --git a/src/plugins/data/common/search/expressions/field.test.ts b/src/plugins/data/common/search/expressions/field.test.ts
index ba3e3f0d83515..09672547dbcdb 100644
--- a/src/plugins/data/common/search/expressions/field.test.ts
+++ b/src/plugins/data/common/search/expressions/field.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { fieldFunction } from './field';
 
diff --git a/src/plugins/data/common/search/expressions/field.ts b/src/plugins/data/common/search/expressions/field.ts
index 8c13069f50ad5..ccb9c85576814 100644
--- a/src/plugins/data/common/search/expressions/field.ts
+++ b/src/plugins/data/common/search/expressions/field.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaField } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/filters_to_ast.ts b/src/plugins/data/common/search/expressions/filters_to_ast.ts
index 33e064ddd3076..d139ac664ed48 100644
--- a/src/plugins/data/common/search/expressions/filters_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/filters_to_ast.ts
@@ -7,7 +7,7 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionKibanaFilter } from './kibana_filter';
 
 export const filtersToAst = (filters: Filter[] | Filter) => {
diff --git a/src/plugins/data/common/search/expressions/geo_bounding_box.ts b/src/plugins/data/common/search/expressions/geo_bounding_box.ts
index b763b741acd57..5c546cbb095bc 100644
--- a/src/plugins/data/common/search/expressions/geo_bounding_box.ts
+++ b/src/plugins/data/common/search/expressions/geo_bounding_box.ts
@@ -8,7 +8,7 @@
 
 import { chain, isNil, pick, snakeCase } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 import { GeoPoint, GeoPointOutput } from './geo_point';
 
 // The API Extractor is not handling encapsulated interfaces in union types properly.
diff --git a/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts b/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts
index ab1c4ad793cf4..8d6b99cdad739 100644
--- a/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/geo_bounding_box_to_ast.ts
@@ -7,7 +7,7 @@
  */
 
 import { camelCase, chain, isNil, omit } from 'lodash';
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionGeoBoundingBox, GeoBoundingBox } from './geo_bounding_box';
 import { geoPointToAst } from './geo_point_to_ast';
 
diff --git a/src/plugins/data/common/search/expressions/geo_point.ts b/src/plugins/data/common/search/expressions/geo_point.ts
index 60e5cc2c8fb5f..a92663507157f 100644
--- a/src/plugins/data/common/search/expressions/geo_point.ts
+++ b/src/plugins/data/common/search/expressions/geo_point.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 interface Point {
   lat: number;
diff --git a/src/plugins/data/common/search/expressions/geo_point_to_ast.ts b/src/plugins/data/common/search/expressions/geo_point_to_ast.ts
index 221cefb81afa2..7454f1e91cdd6 100644
--- a/src/plugins/data/common/search/expressions/geo_point_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/geo_point_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionGeoPoint, GeoPoint } from './geo_point';
 
 export const geoPointToAst = (point: GeoPoint) => {
diff --git a/src/plugins/data/common/search/expressions/ip_range.ts b/src/plugins/data/common/search/expressions/ip_range.ts
index b63dab6373f02..985466382349a 100644
--- a/src/plugins/data/common/search/expressions/ip_range.ts
+++ b/src/plugins/data/common/search/expressions/ip_range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface IpRange {
   from: string;
diff --git a/src/plugins/data/common/search/expressions/ip_range_to_ast.ts b/src/plugins/data/common/search/expressions/ip_range_to_ast.ts
index 882b90a60e9bc..9682b62c08992 100644
--- a/src/plugins/data/common/search/expressions/ip_range_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/ip_range_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionIpRange, IpRange } from './ip_range';
 
 export const ipRangeToAst = (ipRange: IpRange) => {
diff --git a/src/plugins/data/common/search/expressions/kibana.test.ts b/src/plugins/data/common/search/expressions/kibana.test.ts
index 542cae590375e..c82bc0293cefe 100644
--- a/src/plugins/data/common/search/expressions/kibana.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { kibana } from './kibana';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
diff --git a/src/plugins/data/common/search/expressions/kibana.ts b/src/plugins/data/common/search/expressions/kibana.ts
index 86c451ab2f5ab..aa83662e0b8d4 100644
--- a/src/plugins/data/common/search/expressions/kibana.ts
+++ b/src/plugins/data/common/search/expressions/kibana.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExecutionContext, ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { Adapters } from 'src/plugins/inspector/common';
+import { ExecutionContext, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { ExpressionValueSearchContext, ExecutionContextSearch } from './kibana_context_type';
 
 const toArray = <T>(query: undefined | T | T[]): T[] =>
diff --git a/src/plugins/data/common/search/expressions/kibana_context.test.ts b/src/plugins/data/common/search/expressions/kibana_context.test.ts
index c9fe4ee5b7367..3e07366b76c2d 100644
--- a/src/plugins/data/common/search/expressions/kibana_context.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context.test.ts
@@ -8,7 +8,7 @@
 
 import { FilterStateStore, buildFilter, FILTERS } from '@kbn/es-query';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { ExecutionContext } from 'src/plugins/expressions/common';
+import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { KibanaContext } from './kibana_context_type';
 
 import {
diff --git a/src/plugins/data/common/search/expressions/kibana_context.ts b/src/plugins/data/common/search/expressions/kibana_context.ts
index 6e38e2a3949d5..c95e7e99017c0 100644
--- a/src/plugins/data/common/search/expressions/kibana_context.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context.ts
@@ -8,15 +8,15 @@
 
 import { uniqBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExecutionContext } from 'src/plugins/expressions/common';
-import { Adapters } from 'src/plugins/inspector/common';
+import { ExpressionFunctionDefinition, ExecutionContext } from '@kbn/expressions-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { Filter } from '@kbn/es-query';
 import { Query, uniqFilters } from '@kbn/es-query';
-import { unboxExpressionValue } from '../../../../expressions/common';
+import { unboxExpressionValue } from '@kbn/expressions-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { ExecutionContextSearch, KibanaContext, KibanaFilter } from './kibana_context_type';
 import { KibanaQueryOutput } from './kibana_context_type';
 import { KibanaTimerangeOutput } from './timerange';
-import { SavedObjectReference } from '../../../../../core/types';
 import { SavedObjectsClientCommon } from '../..';
 
 export interface KibanaContextStartDependencies {
diff --git a/src/plugins/data/common/search/expressions/kibana_context_type.ts b/src/plugins/data/common/search/expressions/kibana_context_type.ts
index 673372749c881..ef6b448ae0f8b 100644
--- a/src/plugins/data/common/search/expressions/kibana_context_type.ts
+++ b/src/plugins/data/common/search/expressions/kibana_context_type.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { Filter } from '@kbn/es-query';
-import { ExpressionValueBoxed, ExpressionValueFilter } from 'src/plugins/expressions/common';
+import { ExpressionValueBoxed, ExpressionValueFilter } from '@kbn/expressions-plugin/common';
 import { Query, TimeRange } from '../../query';
 import { adaptToExpressionValueFilter, IndexPatternField } from '../..';
 
diff --git a/src/plugins/data/common/search/expressions/kibana_filter.test.ts b/src/plugins/data/common/search/expressions/kibana_filter.test.ts
index 2ecd2761de46c..b776d1297d7be 100644
--- a/src/plugins/data/common/search/expressions/kibana_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/kibana_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { kibanaFilterFunction } from './kibana_filter';
 
diff --git a/src/plugins/data/common/search/expressions/kibana_filter.ts b/src/plugins/data/common/search/expressions/kibana_filter.ts
index 35da556bb296c..83550f7ab139e 100644
--- a/src/plugins/data/common/search/expressions/kibana_filter.ts
+++ b/src/plugins/data/common/search/expressions/kibana_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaFilter } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/kql.test.ts b/src/plugins/data/common/search/expressions/kql.test.ts
index 378122adf7c91..bc23d5ec11e53 100644
--- a/src/plugins/data/common/search/expressions/kql.test.ts
+++ b/src/plugins/data/common/search/expressions/kql.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
 import { kqlFunction } from './kql';
diff --git a/src/plugins/data/common/search/expressions/kql.ts b/src/plugins/data/common/search/expressions/kql.ts
index 5dd830f92f834..8044848dad4e6 100644
--- a/src/plugins/data/common/search/expressions/kql.ts
+++ b/src/plugins/data/common/search/expressions/kql.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaQueryOutput } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/lucene.test.ts b/src/plugins/data/common/search/expressions/lucene.test.ts
index c87ccecbfa574..f13ed403ac58c 100644
--- a/src/plugins/data/common/search/expressions/lucene.test.ts
+++ b/src/plugins/data/common/search/expressions/lucene.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
 import { luceneFunction } from './lucene';
diff --git a/src/plugins/data/common/search/expressions/lucene.ts b/src/plugins/data/common/search/expressions/lucene.ts
index a00ff7ed5f447..70c2d1d4ac392 100644
--- a/src/plugins/data/common/search/expressions/lucene.ts
+++ b/src/plugins/data/common/search/expressions/lucene.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaQueryOutput } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/numerical_range.ts b/src/plugins/data/common/search/expressions/numerical_range.ts
index 8968117986c03..91f47d34c9db8 100644
--- a/src/plugins/data/common/search/expressions/numerical_range.ts
+++ b/src/plugins/data/common/search/expressions/numerical_range.ts
@@ -8,7 +8,7 @@
 
 import { isNil, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 export interface NumericalRange {
   from?: number;
diff --git a/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts b/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts
index a166a6fe403fd..2c168f06391b3 100644
--- a/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/numerical_range_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionNumericalRange, NumericalRange } from './numerical_range';
 
 export const numericalRangeToAst = (numericalRange: NumericalRange) => {
diff --git a/src/plugins/data/common/search/expressions/phrase_filter.test.ts b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
index a61cc0bfd68ab..c8d7c89018771 100644
--- a/src/plugins/data/common/search/expressions/phrase_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/phrase_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { phraseFilterFunction } from './phrase_filter';
 
diff --git a/src/plugins/data/common/search/expressions/phrase_filter.ts b/src/plugins/data/common/search/expressions/phrase_filter.ts
index ec241752df0d0..302c4500e2c23 100644
--- a/src/plugins/data/common/search/expressions/phrase_filter.ts
+++ b/src/plugins/data/common/search/expressions/phrase_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { buildFilter, FILTERS } from '@kbn/es-query';
 import { KibanaField, KibanaFilter } from './kibana_context_type';
 import { IndexPattern } from '../..';
diff --git a/src/plugins/data/common/search/expressions/query_filter.ts b/src/plugins/data/common/search/expressions/query_filter.ts
index c5784b431146e..76841c6b4c9b7 100644
--- a/src/plugins/data/common/search/expressions/query_filter.ts
+++ b/src/plugins/data/common/search/expressions/query_filter.ts
@@ -8,7 +8,7 @@
 
 import { isNil, omit, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 import { Query } from '../../query';
 import { KibanaQueryOutput } from './kibana_context_type';
 
diff --git a/src/plugins/data/common/search/expressions/query_filter_to_ast.ts b/src/plugins/data/common/search/expressions/query_filter_to_ast.ts
index cc90643637c6c..d3390ed8d6204 100644
--- a/src/plugins/data/common/search/expressions/query_filter_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/query_filter_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { ExpressionFunctionQueryFilter, QueryFilter } from './query_filter';
 import { queryToAst } from './query_to_ast';
 
diff --git a/src/plugins/data/common/search/expressions/query_to_ast.ts b/src/plugins/data/common/search/expressions/query_to_ast.ts
index 45447ded13476..282a5772fd1e7 100644
--- a/src/plugins/data/common/search/expressions/query_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/query_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { Query } from '../../query';
 import { ExpressionFunctionKql } from './kql';
 import { ExpressionFunctionLucene } from './lucene';
diff --git a/src/plugins/data/common/search/expressions/range.test.ts b/src/plugins/data/common/search/expressions/range.test.ts
index cdd51c0b05925..5892abf6a9799 100644
--- a/src/plugins/data/common/search/expressions/range.test.ts
+++ b/src/plugins/data/common/search/expressions/range.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { rangeFunction } from './range';
 
diff --git a/src/plugins/data/common/search/expressions/range.ts b/src/plugins/data/common/search/expressions/range.ts
index c7649a6e0669c..1faa5e3c60c5d 100644
--- a/src/plugins/data/common/search/expressions/range.ts
+++ b/src/plugins/data/common/search/expressions/range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   gt?: number | string;
diff --git a/src/plugins/data/common/search/expressions/range_filter.test.ts b/src/plugins/data/common/search/expressions/range_filter.test.ts
index 4db21ca1a6db5..549c77907e846 100644
--- a/src/plugins/data/common/search/expressions/range_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/range_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { rangeFilterFunction } from './range_filter';
 
diff --git a/src/plugins/data/common/search/expressions/range_filter.ts b/src/plugins/data/common/search/expressions/range_filter.ts
index f2b4b23c018f1..9fde8b99716f7 100644
--- a/src/plugins/data/common/search/expressions/range_filter.ts
+++ b/src/plugins/data/common/search/expressions/range_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { buildFilter, FILTERS } from '@kbn/es-query';
 import { KibanaField, KibanaFilter } from './kibana_context_type';
 import { IndexPattern } from '../..';
diff --git a/src/plugins/data/common/search/expressions/remove_filter.test.ts b/src/plugins/data/common/search/expressions/remove_filter.test.ts
index f5a924769df70..321dd9b4c83eb 100644
--- a/src/plugins/data/common/search/expressions/remove_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/remove_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { removeFilterFunction } from './remove_filter';
 import { KibanaContext } from './kibana_context_type';
diff --git a/src/plugins/data/common/search/expressions/remove_filter.ts b/src/plugins/data/common/search/expressions/remove_filter.ts
index f45cc4c557a73..751af01008781 100644
--- a/src/plugins/data/common/search/expressions/remove_filter.ts
+++ b/src/plugins/data/common/search/expressions/remove_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaContext } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/select_filter.test.ts b/src/plugins/data/common/search/expressions/select_filter.test.ts
index 8ef2b77b1fcc6..3ccd67ac7fb6d 100644
--- a/src/plugins/data/common/search/expressions/select_filter.test.ts
+++ b/src/plugins/data/common/search/expressions/select_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper } from './utils';
 import { selectFilterFunction } from './select_filter';
 import { KibanaContext } from './kibana_context_type';
diff --git a/src/plugins/data/common/search/expressions/select_filter.ts b/src/plugins/data/common/search/expressions/select_filter.ts
index 600da4b16d274..fa60ba2cb1566 100644
--- a/src/plugins/data/common/search/expressions/select_filter.ts
+++ b/src/plugins/data/common/search/expressions/select_filter.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { KibanaContext } from './kibana_context_type';
 
 interface Arguments {
diff --git a/src/plugins/data/common/search/expressions/timerange.test.ts b/src/plugins/data/common/search/expressions/timerange.test.ts
index 7a408b72187dc..6106a2836fba8 100644
--- a/src/plugins/data/common/search/expressions/timerange.test.ts
+++ b/src/plugins/data/common/search/expressions/timerange.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions/common';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { ExpressionValueSearchContext } from './kibana_context_type';
 import { functionWrapper } from './utils';
 import { kibanaTimerangeFunction } from './timerange';
diff --git a/src/plugins/data/common/search/expressions/timerange.ts b/src/plugins/data/common/search/expressions/timerange.ts
index ed09bab629519..5ef8cb7a83b62 100644
--- a/src/plugins/data/common/search/expressions/timerange.ts
+++ b/src/plugins/data/common/search/expressions/timerange.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, ExpressionValueBoxed } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, ExpressionValueBoxed } from '@kbn/expressions-plugin/common';
 import { TimeRange } from '../../query';
 
 export type KibanaTimerangeOutput = ExpressionValueBoxed<'timerange', TimeRange>;
diff --git a/src/plugins/data/common/search/expressions/timerange_to_ast.ts b/src/plugins/data/common/search/expressions/timerange_to_ast.ts
index 204e4187d8417..40c98e0b0b51c 100644
--- a/src/plugins/data/common/search/expressions/timerange_to_ast.ts
+++ b/src/plugins/data/common/search/expressions/timerange_to_ast.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../../expressions/common';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/common';
 import { TimeRange } from '../../query';
 import { ExpressionFunctionKibanaTimerange } from './timerange';
 
diff --git a/src/plugins/data/common/search/expressions/utils/filters_adapter.ts b/src/plugins/data/common/search/expressions/utils/filters_adapter.ts
index 304150ad94813..d8ac85c7aa99e 100644
--- a/src/plugins/data/common/search/expressions/utils/filters_adapter.ts
+++ b/src/plugins/data/common/search/expressions/utils/filters_adapter.ts
@@ -7,7 +7,7 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { ExpressionValueFilter } from 'src/plugins/expressions/common';
+import { ExpressionValueFilter } from '@kbn/expressions-plugin/common';
 
 function getGroupFromFilter(filter: Filter) {
   const { meta } = filter;
diff --git a/src/plugins/data/common/search/expressions/utils/function_wrapper.ts b/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
index b6a87fa306f72..4d0a09a1680c0 100644
--- a/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
+++ b/src/plugins/data/common/search/expressions/utils/function_wrapper.ts
@@ -7,7 +7,7 @@
  */
 
 import { mapValues } from 'lodash';
-import { AnyExpressionFunctionDefinition, ExecutionContext } from 'src/plugins/expressions/common';
+import { AnyExpressionFunctionDefinition, ExecutionContext } from '@kbn/expressions-plugin/common';
 
 /**
  * Takes a function spec and passes in default args,
diff --git a/src/plugins/data/common/search/poll_search.test.ts b/src/plugins/data/common/search/poll_search.test.ts
index 38c52f5d5bec4..0b9c1ce6beb33 100644
--- a/src/plugins/data/common/search/poll_search.test.ts
+++ b/src/plugins/data/common/search/poll_search.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { pollSearch } from './poll_search';
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 
 describe('pollSearch', () => {
   function getMockedSearch$(resolveOnI = 1, finishWithError = false) {
diff --git a/src/plugins/data/common/search/poll_search.ts b/src/plugins/data/common/search/poll_search.ts
index fa31f2cb208a6..8db68eda52758 100644
--- a/src/plugins/data/common/search/poll_search.ts
+++ b/src/plugins/data/common/search/poll_search.ts
@@ -8,12 +8,9 @@
 
 import { from, Observable, timer, defer, fromEvent, EMPTY } from 'rxjs';
 import { expand, map, switchMap, takeUntil, takeWhile, tap } from 'rxjs/operators';
-import type {
-  IAsyncSearchOptions,
-  IKibanaSearchResponse,
-} from '../../../../../src/plugins/data/common';
-import { isErrorResponse, isPartialResponse } from '../../../../../src/plugins/data/common';
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
+import type { IAsyncSearchOptions, IKibanaSearchResponse } from '..';
+import { isErrorResponse, isPartialResponse } from '..';
 
 export const pollSearch = <Response extends IKibanaSearchResponse>(
   search: () => Promise<Response>,
diff --git a/src/plugins/data/common/search/search_source/extract_references.ts b/src/plugins/data/common/search/search_source/extract_references.ts
index 954d336cb8a92..d72cb86c7f426 100644
--- a/src/plugins/data/common/search/search_source/extract_references.ts
+++ b/src/plugins/data/common/search/search_source/extract_references.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { Filter } from '@kbn/es-query';
 import { SerializedSearchSourceFields } from './types';
 
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../..';
 
 export const extractReferences = (
   state: SerializedSearchSourceFields
diff --git a/src/plugins/data/common/search/search_source/fetch/get_search_params.ts b/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
index ae01dcf4ea051..a2b673cd8ecfd 100644
--- a/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
+++ b/src/plugins/data/common/search/search_source/fetch/get_search_params.ts
@@ -8,7 +8,7 @@
 
 import { UI_SETTINGS } from '../../../constants';
 import { GetConfigFn } from '../../../types';
-import { ISearchRequestParams } from '../../index';
+import { ISearchRequestParams } from '../..';
 import type { SearchRequest } from './types';
 
 const sessionId = Date.now();
diff --git a/src/plugins/data/common/search/search_source/fetch/request_error.ts b/src/plugins/data/common/search/search_source/fetch/request_error.ts
index 48e216fa05541..26bbc90e3ba07 100644
--- a/src/plugins/data/common/search/search_source/fetch/request_error.ts
+++ b/src/plugins/data/common/search/search_source/fetch/request_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KbnError } from '../../../../../kibana_utils/common';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 import { IKibanaSearchResponse } from '../../types';
 import { SearchError } from './types';
 
diff --git a/src/plugins/data/common/search/search_source/inject_references.test.ts b/src/plugins/data/common/search/search_source/inject_references.test.ts
index 1785e55acc792..11d098533f449 100644
--- a/src/plugins/data/common/search/search_source/inject_references.test.ts
+++ b/src/plugins/data/common/search/search_source/inject_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { SerializedSearchSourceFields } from './types';
 
 import { injectReferences } from './inject_references';
diff --git a/src/plugins/data/common/search/search_source/inject_references.ts b/src/plugins/data/common/search/search_source/inject_references.ts
index c4b39773c4401..69404f8fe16a0 100644
--- a/src/plugins/data/common/search/search_source/inject_references.ts
+++ b/src/plugins/data/common/search/search_source/inject_references.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { SerializedSearchSourceFields } from './types';
 
 export const injectReferences = (
diff --git a/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts b/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts
index 233eafc49e1a8..bd4b0c2066479 100644
--- a/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts
+++ b/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts
@@ -15,9 +15,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { RequestStatistics } from '@kbn/inspector-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { ISearchSource } from 'src/plugins/data/public';
-import type { RequestStatistics } from 'src/plugins/inspector/common';
+import type { ISearchSource } from '../../../../public';
 
 /** @public */
 export function getRequestInspectorStats(searchSource: ISearchSource) {
diff --git a/src/plugins/data/common/search/search_source/mocks.ts b/src/plugins/data/common/search/search_source/mocks.ts
index 77ba2a761fbf0..eb10855460236 100644
--- a/src/plugins/data/common/search/search_source/mocks.ts
+++ b/src/plugins/data/common/search/search_source/mocks.ts
@@ -8,7 +8,7 @@
 
 import { of } from 'rxjs';
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { uiSettingsServiceMock } from '../../../../../core/public/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 import { SearchSource } from './search_source';
 import { ISearchStartSearchSource, ISearchSource, SearchSourceFields } from './types';
diff --git a/src/plugins/data/common/search/search_source/parse_json.ts b/src/plugins/data/common/search/search_source/parse_json.ts
index 6c7d08a4f2b50..31383a9ac4865 100644
--- a/src/plugins/data/common/search/search_source/parse_json.ts
+++ b/src/plugins/data/common/search/search_source/parse_json.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { InvalidJSONProperty } from '@kbn/kibana-utils-plugin/common';
 import { SerializedSearchSourceFields } from './types';
-import { InvalidJSONProperty } from '../../../../kibana_utils/common';
 
 export const parseSearchSourceJSON = (searchSourceJSON: string) => {
   // if we have a searchSource, set its values based on the searchSourceJson field
diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
index 87e249acab8b1..eb0c786bebb6c 100644
--- a/src/plugins/data/common/search/search_source/search_source.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { of, throwError } from 'rxjs';
+import { lastValueFrom, of, throwError } from 'rxjs';
 import { IndexPattern } from '../..';
-import { SearchSource, SearchSourceDependencies, SortDirection } from './';
-import { AggConfigs, AggTypesRegistryStart } from '../../';
+import { SearchSource, SearchSourceDependencies, SortDirection } from '.';
+import { AggConfigs, AggTypesRegistryStart } from '../..';
 import { mockAggTypesRegistry } from '../aggs/test_helpers';
-import { RequestResponder } from 'src/plugins/inspector/common';
+import { RequestResponder } from '@kbn/inspector-plugin/common';
 import { switchMap } from 'rxjs/operators';
 import { Filter } from '@kbn/es-query';
 
@@ -1240,7 +1240,7 @@ describe('SearchSource', () => {
         const fetch$ = searchSource.fetch$({});
         fetch$.subscribe(fetchSub);
 
-        const resp = await fetch$.toPromise();
+        const resp = await lastValueFrom(fetch$);
 
         expect(fetchSub.next).toHaveBeenCalledTimes(3);
         expect(fetchSub.complete).toHaveBeenCalledTimes(1);
diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
index 8acdb0514cccb..87171a4b54498 100644
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@@ -70,11 +70,12 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
-import { defer, EMPTY, from, Observable } from 'rxjs';
+import { defer, EMPTY, from, lastValueFrom, Observable } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { buildEsQuery, Filter } from '@kbn/es-query';
+import { fieldWildcardFilter } from '@kbn/kibana-utils-plugin/common';
+import { getHighlightRequest } from '@kbn/field-formats-plugin/common';
 import { normalizeSortRequest } from './normalize_sort_request';
-import { fieldWildcardFilter } from '../../../../kibana_utils/common';
 import {
   AggConfigSerialized,
   IIndexPattern,
@@ -105,8 +106,7 @@ import {
   isErrorResponse,
   isPartialResponse,
   UI_SETTINGS,
-} from '../../../common';
-import { getHighlightRequest } from '../../../../field_formats/common';
+} from '../..';
 import { extractReferences } from './extract_references';
 
 /** @internal */
@@ -325,11 +325,9 @@ export class SearchSource {
    * @removeBy 8.1
    */
   fetch(options: ISearchOptions = {}) {
-    return this.fetch$(options)
-      .toPromise()
-      .then((r) => {
-        return r.rawResponse as estypes.SearchResponse<any>;
-      });
+    return lastValueFrom(this.fetch$(options)).then((r) => {
+      return r.rawResponse as estypes.SearchResponse<any>;
+    });
   }
 
   /**
diff --git a/src/plugins/data/common/search/search_source/search_source_service.test.ts b/src/plugins/data/common/search/search_source/search_source_service.test.ts
index a1b49fc433925..d6b06bb22288e 100644
--- a/src/plugins/data/common/search/search_source/search_source_service.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { IndexPatternsContract } from '../..';
-import { SearchSourceService, SearchSourceDependencies } from './';
+import { SearchSourceService, SearchSourceDependencies } from '.';
 
 describe('SearchSource service', () => {
   let dependencies: jest.Mocked<SearchSourceDependencies>;
diff --git a/src/plugins/data/common/search/search_source/search_source_service.ts b/src/plugins/data/common/search/search_source/search_source_service.ts
index 1a3c835bd9058..c03053c839f4d 100644
--- a/src/plugins/data/common/search/search_source/search_source_service.ts
+++ b/src/plugins/data/common/search/search_source/search_source_service.ts
@@ -7,6 +7,10 @@
  */
 
 import { mapValues } from 'lodash';
+import {
+  mergeMigrationFunctionMaps,
+  MigrateFunctionsObject,
+} from '@kbn/kibana-utils-plugin/common';
 import {
   createSearchSource,
   extractReferences,
@@ -14,12 +18,8 @@ import {
   SearchSource,
   SearchSourceDependencies,
   SerializedSearchSourceFields,
-} from './';
+} from '.';
 import { IndexPatternsContract } from '../..';
-import {
-  mergeMigrationFunctionMaps,
-  MigrateFunctionsObject,
-} from '../../../../kibana_utils/common';
 import { getAllMigrations as filtersGetAllMigrations } from '../../query/persistable_state';
 
 const getAllMigrations = (): MigrateFunctionsObject => {
diff --git a/src/plugins/data/common/search/search_source/types.ts b/src/plugins/data/common/search/search_source/types.ts
index a794ccb552c5f..9ac9c4a057ee9 100644
--- a/src/plugins/data/common/search/search_source/types.ts
+++ b/src/plugins/data/common/search/search_source/types.ts
@@ -7,14 +7,14 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AggConfigSerialized, IAggConfigs } from 'src/plugins/data/public';
 import { SerializableRecord } from '@kbn/utility-types';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AggConfigSerialized, IAggConfigs } from '../../../public';
 import { Query } from '../..';
 import { Filter } from '../../es_query';
 import { IndexPattern } from '../..';
 import type { SearchSource } from './search_source';
-import { PersistableStateService } from '../../../../kibana_utils/common';
 
 /**
  * search source interface
diff --git a/src/plugins/data/common/search/tabify/response_writer.ts b/src/plugins/data/common/search/tabify/response_writer.ts
index 6af0576b9ed4d..ea9acc97a5df0 100644
--- a/src/plugins/data/common/search/tabify/response_writer.ts
+++ b/src/plugins/data/common/search/tabify/response_writer.ts
@@ -7,11 +7,11 @@
  */
 
 import { isEmpty } from 'lodash';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { IAggConfigs } from '../aggs';
 import { tabifyGetColumns } from './get_columns';
 
 import type { TabbedResponseWriterOptions, TabbedAggColumn, TabbedAggRow } from './types';
-import { Datatable, DatatableColumn } from '../../../../expressions/common/expression_types/specs';
 
 interface BufferColumn {
   id: string;
diff --git a/src/plugins/data/common/search/tabify/tabify.ts b/src/plugins/data/common/search/tabify/tabify.ts
index a640e75bac3c4..c8e609212fe43 100644
--- a/src/plugins/data/common/search/tabify/tabify.ts
+++ b/src/plugins/data/common/search/tabify/tabify.ts
@@ -7,7 +7,7 @@
  */
 
 import { get } from 'lodash';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { TabbedAggResponseWriter } from './response_writer';
 import { TabifyBuckets } from './buckets';
 import type { TabbedResponseWriterOptions } from './types';
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.test.ts b/src/plugins/data/common/search/tabify/tabify_docs.test.ts
index dc2e09f4939c9..a514275f2d1cf 100644
--- a/src/plugins/data/common/search/tabify/tabify_docs.test.ts
+++ b/src/plugins/data/common/search/tabify/tabify_docs.test.ts
@@ -10,8 +10,8 @@ import { tabifyDocs, flattenHit } from './tabify_docs';
 import { IndexPattern, DataView } from '../..';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { fieldFormatsMock } from '../../../../field_formats/common/mocks';
-import { stubbedSavedObjectIndexPattern } from '../../../../data_views/common/data_view.stub';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
 
 class MockFieldFormatter {}
 
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.ts b/src/plugins/data/common/search/tabify/tabify_docs.ts
index 5db0770b2247f..97787ba74cf32 100644
--- a/src/plugins/data/common/search/tabify/tabify_docs.ts
+++ b/src/plugins/data/common/search/tabify/tabify_docs.ts
@@ -8,8 +8,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { isPlainObject } from 'lodash';
+import { Datatable, DatatableColumn, DatatableColumnType } from '@kbn/expressions-plugin/common';
 import { IndexPattern } from '../..';
-import { Datatable, DatatableColumn, DatatableColumnType } from '../../../../expressions/common';
 
 type ValidMetaFieldNames = keyof Pick<
   estypes.SearchHit,
diff --git a/src/plugins/data/common/search/tabify/utils.test.ts b/src/plugins/data/common/search/tabify/utils.test.ts
index ed29ef58ec0bf..8abaea0ce2618 100644
--- a/src/plugins/data/common/search/tabify/utils.test.ts
+++ b/src/plugins/data/common/search/tabify/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { checkColumnForPrecisionError } from './utils';
-import type { DatatableColumn } from '../../../../expressions';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 
 describe('tabify utils', () => {
   describe('checkDatatableForPrecisionError', () => {
diff --git a/src/plugins/data/common/search/tabify/utils.ts b/src/plugins/data/common/search/tabify/utils.ts
index 1a4f87e2fed73..aba7448f80284 100644
--- a/src/plugins/data/common/search/tabify/utils.ts
+++ b/src/plugins/data/common/search/tabify/utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DatatableColumn } from '../../../../expressions';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 
 /** @public **/
 export const checkColumnForPrecisionError = (column: DatatableColumn) =>
diff --git a/src/plugins/data/common/search/types.ts b/src/plugins/data/common/search/types.ts
index e9b6160c4a75a..bb6788fd1781b 100644
--- a/src/plugins/data/common/search/types.ts
+++ b/src/plugins/data/common/search/types.ts
@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { Observable } from 'rxjs';
+import type { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { IEsSearchRequest, IEsSearchResponse, IndexPattern } from '..';
-import type { RequestAdapter } from '../../../inspector/common';
 
 export type ISearchGeneric = <
   SearchStrategyRequest extends IKibanaSearchRequest = IEsSearchRequest,
diff --git a/src/plugins/data/common/stubs.ts b/src/plugins/data/common/stubs.ts
index ec53b20f6ff3d..034389d5419a1 100644
--- a/src/plugins/data/common/stubs.ts
+++ b/src/plugins/data/common/stubs.ts
@@ -6,6 +6,6 @@
  * Side Public License, v 1.
  */
 
-export * from '../../data_views/common/field.stub';
-export * from '../../data_views/common/data_view.stub';
+export * from '@kbn/data-views-plugin/common/field.stub';
+export * from '@kbn/data-views-plugin/common/data_view.stub';
 export * from './es_query/stubs';
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts
index 15b20669cd192..a217e580ad608 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.test.ts
@@ -10,11 +10,11 @@ import moment from 'moment';
 
 import { createFiltersFromRangeSelectAction } from './create_filters_from_range_select';
 
-import { IndexPatternsContract } from '../../../public';
-import { dataPluginMock } from '../../../public/mocks';
-import { setIndexPatterns, setSearchService } from '../../../public/services';
-import { FieldFormatsGetConfigFn } from '../../../../field_formats/common';
-import { DateFormat } from '../../../../field_formats/public/';
+import { IndexPatternsContract } from '../..';
+import { dataPluginMock } from '../../mocks';
+import { setIndexPatterns, setSearchService } from '../../services';
+import { FieldFormatsGetConfigFn } from '@kbn/field-formats-plugin/common';
+import { DateFormat } from '@kbn/field-formats-plugin/public';
 import { RangeFilter } from '@kbn/es-query';
 
 describe('brushEvent', () => {
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts
index 2ae1805c8aa28..0b07194cd9bbc 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts
@@ -8,9 +8,9 @@
 
 import { last } from 'lodash';
 import moment from 'moment';
-import { Datatable } from 'src/plugins/expressions';
-import { esFilters, IFieldType, RangeFilterParams } from '../../../public';
-import { getIndexPatterns, getSearchService } from '../../../public/services';
+import { Datatable } from '@kbn/expressions-plugin';
+import { esFilters, IFieldType, RangeFilterParams } from '../..';
+import { getIndexPatterns, getSearchService } from '../../services';
 import { AggConfigSerialized } from '../../../common/search/aggs';
 
 interface RangeSelectDataContext {
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
index 5163f979d3ff5..1132edabb2b3f 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { IndexPatternsContract } from '../../../public';
-import { dataPluginMock } from '../../../public/mocks';
-import { setIndexPatterns, setSearchService } from '../../../public/services';
+import { IndexPatternsContract } from '../..';
+import { dataPluginMock } from '../../mocks';
+import { setIndexPatterns, setSearchService } from '../../services';
 import { createFiltersFromValueClickAction } from './create_filters_from_value_click';
-import { FieldFormatsGetConfigFn, BytesFormat } from '../../../../field_formats/common';
+import { FieldFormatsGetConfigFn, BytesFormat } from '@kbn/field-formats-plugin/common';
 import { RangeFilter } from '@kbn/es-query';
 
 const mockField = {
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
index 23ab718e512bd..1c7ffe5edf58f 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
@@ -7,9 +7,9 @@
  */
 
 import _ from 'lodash';
-import { Datatable } from '../../../../../plugins/expressions/public';
-import { esFilters, Filter } from '../../../public';
-import { getIndexPatterns, getSearchService } from '../../../public/services';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { esFilters, Filter } from '../..';
+import { getIndexPatterns, getSearchService } from '../../services';
 import { AggConfigSerialized } from '../../../common/search/aggs';
 
 interface ValueClickDataContext {
diff --git a/src/plugins/data/public/actions/select_range_action.ts b/src/plugins/data/public/actions/select_range_action.ts
index 5e04d20813446..d17a74ef13466 100644
--- a/src/plugins/data/public/actions/select_range_action.ts
+++ b/src/plugins/data/public/actions/select_range_action.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions/public';
-import { Action, createAction, UiActionsStart } from '../../../../plugins/ui_actions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { Action, createAction, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { APPLY_FILTER_TRIGGER } from '../triggers';
 import { createFiltersFromRangeSelectAction } from './filters/create_filters_from_range_select';
 
diff --git a/src/plugins/data/public/actions/value_click_action.ts b/src/plugins/data/public/actions/value_click_action.ts
index eb8e991cb8891..a6eb83badd61c 100644
--- a/src/plugins/data/public/actions/value_click_action.ts
+++ b/src/plugins/data/public/actions/value_click_action.ts
@@ -7,8 +7,8 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { Datatable } from 'src/plugins/expressions/public';
-import { Action, createAction, UiActionsStart } from '../../../../plugins/ui_actions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { Action, createAction, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { APPLY_FILTER_TRIGGER } from '../triggers';
 import { createFiltersFromValueClickAction } from './filters/create_filters_from_value_click';
 
diff --git a/src/plugins/data/public/autocomplete/autocomplete_service.ts b/src/plugins/data/public/autocomplete/autocomplete_service.ts
index 0d21c7e765501..95db8e31eb4d2 100644
--- a/src/plugins/data/public/autocomplete/autocomplete_service.ts
+++ b/src/plugins/data/public/autocomplete/autocomplete_service.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 import moment from 'moment';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import type { TimefilterSetup } from '../query';
 import { QuerySuggestionGetFn } from './providers/query_suggestion_provider';
 import {
@@ -17,7 +18,6 @@ import {
 import type { ValueSuggestionsGetFn } from './providers/value_suggestion_provider';
 
 import { ConfigSchema } from '../../config';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 import { createUsageCollector } from './collectors';
 import {
   KUERY_LANGUAGE_NAME,
diff --git a/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts b/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts
index 326fcb1e8153d..102b50402e3fa 100644
--- a/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts
+++ b/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts
@@ -8,8 +8,8 @@
 
 import { first } from 'rxjs/operators';
 import { METRIC_TYPE } from '@kbn/analytics';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { AUTOCOMPLETE_EVENT_TYPE, AutocompleteUsageCollector } from './types';
 
 export const createUsageCollector = (
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
index 24d9cdbfa6b3c..68b0d123f0a92 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { setupGetConjunctionSuggestions } from './conjunction';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { QuerySuggestionGetFnArgs, KueryNode } from '../../..';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
index 4cad30943f4cf..c11c54c2a6f38 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
@@ -10,10 +10,7 @@ import React from 'react';
 import { $Keys } from 'utility-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { KqlQuerySuggestionProvider } from './types';
-import {
-  QuerySuggestion,
-  QuerySuggestionTypes,
-} from '../../../../../../../src/plugins/data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '../../..';
 
 const bothArgumentsText = (
   <FormattedMessage
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
index 9462b8c5d171f..7e1633a2cd5e0 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
@@ -9,12 +9,8 @@
 import indexPatternResponse from './__fixtures__/index_pattern_response.json';
 
 import { setupGetFieldSuggestions } from './field';
-import {
-  indexPatterns as indexPatternsUtils,
-  QuerySuggestionGetFnArgs,
-  KueryNode,
-} from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { indexPatterns as indexPatternsUtils, QuerySuggestionGetFnArgs, KueryNode } from '../../..';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
index a0008101b5aec..9664353515c6b 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
@@ -14,7 +14,7 @@ import {
   indexPatterns as indexPatternsUtils,
   QuerySuggestionField,
   QuerySuggestionTypes,
-} from '../../../../../../../src/plugins/data/public';
+} from '../../..';
 import { KqlQuerySuggestionProvider } from './types';
 
 const keywordComparator = (first: IFieldType, second: IFieldType) => {
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
index c40f1dd925345..6ddf518933af9 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { $Keys } from 'utility-types';
 import { flatten, uniqBy } from 'lodash';
 import { fromKueryExpression } from '@kbn/es-query';
@@ -19,7 +19,7 @@ import {
   QuerySuggestionGetFnArgs,
   QuerySuggestionGetFn,
   DataPublicPluginStart,
-} from '../../../../../../../src/plugins/data/public';
+} from '../../..';
 
 const cursorSymbol = '@kuery-cursor@';
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
index ab1d79eb522c1..6a2411cc5ccbe 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
@@ -9,8 +9,8 @@
 import indexPatternResponse from './__fixtures__/index_pattern_response.json';
 
 import { setupGetOperatorSuggestions } from './operator';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { QuerySuggestionGetFnArgs, KueryNode } from '../../..';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
index 4e1efef73a42b..f6517f67218d7 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
@@ -12,7 +12,7 @@ import { $Keys } from 'utility-types';
 import { flatten } from 'lodash';
 
 import { KqlQuerySuggestionProvider } from './types';
-import { QuerySuggestionTypes } from '../../../../../../../src/plugins/data/public';
+import { QuerySuggestionTypes } from '../../..';
 
 const equalsText = (
   <FormattedMessage
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
index 12a0dae97ebaa..b39f942b1f76c 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
@@ -7,12 +7,8 @@
  */
 
 import { KueryNode } from '@kbn/es-query';
-import { CoreSetup } from 'kibana/public';
-import {
-  DataPublicPluginStart,
-  QuerySuggestionBasic,
-  QuerySuggestionGetFnArgs,
-} from '../../../../../../../src/plugins/data/public';
+import { CoreSetup } from '@kbn/core/public';
+import { DataPublicPluginStart, QuerySuggestionBasic, QuerySuggestionGetFnArgs } from '../../..';
 
 export type KqlQuerySuggestionProvider<T = QuerySuggestionBasic> = (
   core: CoreSetup<object, DataPublicPluginStart>
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
index 27031209c42a5..224865449a5a6 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
@@ -8,8 +8,8 @@
 
 import { setupGetValueSuggestions } from './value';
 import indexPatternResponse from './__fixtures__/index_pattern_response.json';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../../../../../../src/plugins/data/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { QuerySuggestionGetFnArgs, KueryNode } from '../../..';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
index cee7d37a1a12d..b75cf9d09d27b 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
@@ -7,7 +7,7 @@
  */
 
 import { flatten } from 'lodash';
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { escapeQuotes } from './lib/escape_kuery';
 import { KqlQuerySuggestionProvider } from './types';
 import {
@@ -16,7 +16,7 @@ import {
   IIndexPattern,
   QuerySuggestion,
   QuerySuggestionTypes,
-} from '../../../../../../../src/plugins/data/public';
+} from '../../..';
 
 const wrapAsSuggestions = (start: number, end: number, query: string, values: string[]) =>
   values
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
index 4a68c7232ea7e..bf80438da08a5 100644
--- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
+++ b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
@@ -10,7 +10,7 @@ import { stubIndexPattern, stubFields } from '../../stubs';
 import type { TimefilterSetup } from '../../query';
 import { setupValueSuggestionProvider } from './value_suggestion_provider';
 import type { ValueSuggestionsGetFn } from './value_suggestion_provider';
-import { IUiSettingsClient, CoreSetup } from 'kibana/public';
+import { IUiSettingsClient, CoreSetup } from '@kbn/core/public';
 import { UI_SETTINGS } from '../../../common';
 
 describe('FieldSuggestions', () => {
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
index 0caf2d4ced530..422c4e02d8e49 100644
--- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
+++ b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
@@ -9,7 +9,7 @@
 import dateMath from '@kbn/datemath';
 import { buildQueryFromFilters } from '@kbn/es-query';
 import { memoize } from 'lodash';
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { IIndexPattern, IFieldType, UI_SETTINGS, ValueSuggestionsMethod } from '../../../common';
 import type { TimefilterSetup } from '../../query';
 import { AutocompleteUsageCollector } from '../collectors';
diff --git a/src/plugins/data/public/data_views/index.ts b/src/plugins/data/public/data_views/index.ts
index 4fb2bbaf08503..21e6a2e9e645c 100644
--- a/src/plugins/data/public/data_views/index.ts
+++ b/src/plugins/data/public/data_views/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/public';
+export * from '@kbn/data-views-plugin/public';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 6fd357447fad8..1f2b00313ddb9 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/109904
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ConfigSchema } from '../config';
 
 export * from './deprecated';
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 3c0c58c979db7..af6fdedc3ed9f 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { createDatatableUtilitiesMock } from '../common/mocks';
 import { DataPlugin, DataViewsContract } from '.';
-import { fieldFormatsServiceMock } from '../../field_formats/public/mocks';
 import { searchServiceMock } from './search/mocks';
 import { queryServiceMock } from './query/mocks';
 import { AutocompleteStart, AutocompleteSetup } from './autocomplete';
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 1402a01a3b057..ed9ba5c00e493 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -8,9 +8,13 @@
 
 import './index.scss';
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import {
+  Storage,
+  IStorageWrapper,
+  createStartServicesGetter,
+} from '@kbn/kibana-utils-plugin/public';
 import { ConfigSchema } from '../config';
-import { Storage, IStorageWrapper, createStartServicesGetter } from '../../kibana_utils/public';
 import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 0a995c9207770..9620d79295220 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -15,7 +15,7 @@ import { getFilter } from './test_helpers/get_stub_filter';
 import { getFiltersArray } from './test_helpers/get_filters_array';
 import { Filter, FilterStateStore, UI_SETTINGS } from '../../../common';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const setupMock = coreMock.createSetup();
 
 const uiSettingsMock = (pinnedByDefault: boolean) => (key: string) => {
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index bfedf444cf23e..c874a15b5efc6 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -9,9 +9,10 @@
 import _ from 'lodash';
 import { Subject } from 'rxjs';
 
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 import { isFilterPinned, onlyDisabledFiltersChanged, Filter } from '@kbn/es-query';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common/persistable_state';
 import { sortFilters } from './lib/sort_filters';
 import { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
 
@@ -22,7 +23,6 @@ import {
   COMPARE_ALL_OPTIONS,
   UI_SETTINGS,
 } from '../../../common';
-import { PersistableStateService } from '../../../../kibana_utils/common/persistable_state';
 import {
   getAllMigrations,
   inject,
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
index c90685de56c45..54a26a741c9b3 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern, phraseFilter } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern, phraseFilter } from '../../../../common/stubs';
 import { getDisplayValueFromFilter } from './get_display_value';
-import { FieldFormat } from '../../../../../field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 describe('getDisplayValueFromFilter', () => {
   beforeEach(() => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
index d38c1d6375d8c..71e367bbb1240 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_display_value.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { Filter } from '../../../../common';
-import { DataView, DataViewField } from '../../../../../data_views/public';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
 
 function getValueFormatter(indexPattern?: DataView, key?: string) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
index b3561a757ca8b..9cc81195d1946 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern, phraseFilter } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern, phraseFilter } from '../../../../common/stubs';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
 
 describe('getIndexPatternFromFilter', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
index d4951ebc6efc2..5ecd02b6f9d85 100644
--- a/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/get_index_pattern_from_filter.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { Filter } from '../../../../common';
-import { DataView } from '../../../../../data_views/public';
 
 export function getIndexPatternFromFilter(
   filter: Filter,
diff --git a/src/plugins/data/public/query/lib/add_to_query_log.ts b/src/plugins/data/public/query/lib/add_to_query_log.ts
index d45fabd649682..a74e127cd5562 100644
--- a/src/plugins/data/public/query/lib/add_to_query_log.ts
+++ b/src/plugins/data/public/query/lib/add_to_query_log.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { Query } from '../../../common';
 import { getQueryLog } from './get_query_log';
 
diff --git a/src/plugins/data/public/query/lib/get_query_log.ts b/src/plugins/data/public/query/lib/get_query_log.ts
index 51e074cc85e33..08aabecfb2529 100644
--- a/src/plugins/data/public/query/lib/get_query_log.ts
+++ b/src/plugins/data/public/query/lib/get_query_log.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { PersistedLog } from '../persisted_log';
 import { UI_SETTINGS } from '../../../common';
 
diff --git a/src/plugins/data/public/query/persisted_log/persisted_log.ts b/src/plugins/data/public/query/persisted_log/persisted_log.ts
index ab9c3d3fb631b..a4e73d19250e3 100644
--- a/src/plugins/data/public/query/persisted_log/persisted_log.ts
+++ b/src/plugins/data/public/query/persisted_log/persisted_log.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const defaultIsDuplicate = (oldItem: any, newItem: any) => {
   return _.isEqual(oldItem, newItem);
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
index dc6b9586b0b4b..1b634fda28996 100644
--- a/src/plugins/data/public/query/query_service.ts
+++ b/src/plugins/data/public/query/query_service.ts
@@ -7,8 +7,8 @@
  */
 
 import { share } from 'rxjs/operators';
-import { HttpStart, IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { HttpStart, IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { buildEsQuery } from '@kbn/es-query';
 import { FilterManager } from './filter_manager';
 import { createAddToQueryLog } from './lib';
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.test.ts b/src/plugins/data/public/query/query_string/query_string_manager.test.ts
index 32852b4fe7c32..7ba28a7e04cd9 100644
--- a/src/plugins/data/public/query/query_string/query_string_manager.test.ts
+++ b/src/plugins/data/public/query/query_string/query_string_manager.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { QueryStringManager } from './query_string_manager';
-import { Storage } from '../../../../kibana_utils/public/storage';
+import { Storage } from '@kbn/kibana-utils-plugin/public/storage';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { Query } from '../../../common/query';
 
 describe('QueryStringManager', () => {
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.ts b/src/plugins/data/public/query/query_string/query_string_manager.ts
index 0fdbb8965a5e5..fb9c2b1a734fa 100644
--- a/src/plugins/data/public/query/query_string/query_string_manager.ts
+++ b/src/plugins/data/public/query/query_string/query_string_manager.ts
@@ -9,8 +9,8 @@
 import { BehaviorSubject } from 'rxjs';
 import { skip } from 'rxjs/operators';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { CoreStart } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { CoreStart } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { KIBANA_USER_QUERY_LANGUAGE_KEY, Query, UI_SETTINGS } from '../../../common';
 
 export class QueryStringManager {
diff --git a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
index 7527ed60d41f9..e7ac546226326 100644
--- a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
+++ b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { createSavedQueryService } from './saved_query_service';
-import { httpServiceMock } from '../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import type { SavedQueryAttributes } from '../../../common';
 
 const http = httpServiceMock.createStartContract();
diff --git a/src/plugins/data/public/query/saved_query/saved_query_service.ts b/src/plugins/data/public/query/saved_query/saved_query_service.ts
index e73baba66c4f1..fd643a33dd103 100644
--- a/src/plugins/data/public/query/saved_query/saved_query_service.ts
+++ b/src/plugins/data/public/query/saved_query/saved_query_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { SavedQuery } from './types';
 import type { SavedQueryAttributes } from '../../../common';
 
diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
index 32e9ec7fb374a..d1d3ea5865c7e 100644
--- a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
+++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
@@ -10,8 +10,8 @@ import { Subscription } from 'rxjs';
 import { FilterManager } from '../filter_manager';
 import { getFilter } from '../filter_manager/test_helpers/get_stub_filter';
 import { Filter, FilterStateStore, UI_SETTINGS } from '../../../common';
-import { coreMock } from '../../../../../core/public/mocks';
-import { BaseStateContainer, createStateContainer, Storage } from '../../../../kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { BaseStateContainer, createStateContainer, Storage } from '@kbn/kibana-utils-plugin/public';
 import { QueryService, QueryStart } from '../query_service';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { connectToQueryState } from './connect_to_query_state';
diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
index a38d9f2af50ea..b9bb05841f161 100644
--- a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
+++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
@@ -9,7 +9,7 @@
 import { Subscription } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import _ from 'lodash';
-import { BaseStateContainer } from '../../../../kibana_utils/public';
+import { BaseStateContainer } from '@kbn/kibana-utils-plugin/public';
 import { QuerySetup, QueryStart } from '../query_service';
 import { QueryState, QueryStateChange } from './types';
 import { FilterStateStore, COMPARE_ALL_OPTIONS, compareFilters } from '../../../common';
diff --git a/src/plugins/data/public/query/state_sync/create_global_query_observable.ts b/src/plugins/data/public/query/state_sync/create_global_query_observable.ts
index 3577478154c31..2e054229a55da 100644
--- a/src/plugins/data/public/query/state_sync/create_global_query_observable.ts
+++ b/src/plugins/data/public/query/state_sync/create_global_query_observable.ts
@@ -9,10 +9,10 @@
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 import { isFilterPinned } from '@kbn/es-query';
+import { createStateContainer } from '@kbn/kibana-utils-plugin/public';
 import type { TimefilterSetup } from '../timefilter';
 import { FilterManager } from '../filter_manager';
-import { QueryState, QueryStateChange } from './index';
-import { createStateContainer } from '../../../../kibana_utils/public';
+import { QueryState, QueryStateChange } from '.';
 import { compareFilters, COMPARE_ALL_OPTIONS } from '../../../common';
 import type { QueryStringContract } from '../query_string';
 
diff --git a/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts b/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
index 2442ca68f997d..edeaa7c772575 100644
--- a/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
+++ b/src/plugins/data/public/query/state_sync/sync_state_with_url.test.ts
@@ -11,12 +11,12 @@ import { createBrowserHistory, History } from 'history';
 import { FilterManager } from '../filter_manager';
 import { getFilter } from '../filter_manager/test_helpers/get_stub_filter';
 import { Filter, FilterStateStore, UI_SETTINGS } from '../../../common';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import {
   createKbnUrlStateStorage,
   IKbnUrlStateStorage,
   Storage,
-} from '../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { QueryService, QueryStart } from '../query_service';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { TimefilterContract } from '../timefilter';
diff --git a/src/plugins/data/public/query/state_sync/sync_state_with_url.ts b/src/plugins/data/public/query/state_sync/sync_state_with_url.ts
index 2f068ccdfab4f..fd52ca5ffc979 100644
--- a/src/plugins/data/public/query/state_sync/sync_state_with_url.ts
+++ b/src/plugins/data/public/query/state_sync/sync_state_with_url.ts
@@ -10,7 +10,7 @@ import {
   createStateContainer,
   IKbnUrlStateStorage,
   syncState,
-} from '../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { QuerySetup, QueryStart } from '../query_service';
 import { connectToQueryState } from './connect_to_query_state';
 import { QueryState } from './types';
diff --git a/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
index 94e12f1f6f7ca..9b53f04bd2066 100644
--- a/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
+++ b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 import { keys } from 'lodash';
 import { RangeFilter } from '@kbn/es-query';
-import { TimefilterContract } from '../../timefilter';
+import { TimefilterContract } from '..';
 import { TimeRange } from '../../../../common';
 
 export function convertRangeFilterToTimeRange(filter: RangeFilter) {
diff --git a/src/plugins/data/public/query/timefilter/time_history.ts b/src/plugins/data/public/query/timefilter/time_history.ts
index f83e5e685b581..548973ab815d2 100644
--- a/src/plugins/data/public/query/timefilter/time_history.ts
+++ b/src/plugins/data/public/query/timefilter/time_history.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { PersistedLog } from '../persisted_log';
 import { TimeRange } from '../../../common';
 
diff --git a/src/plugins/data/public/query/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
index b81a95618b815..d4ceb83940d27 100644
--- a/src/plugins/data/public/query/timefilter/timefilter.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -32,10 +32,10 @@ export class Timefilter {
   // Fired when isTimeRangeSelectorEnabled \ isAutoRefreshSelectorEnabled are toggled
   private enabledUpdated$ = new BehaviorSubject(false);
   // Fired when a user changes the timerange
-  private timeUpdate$ = new Subject();
+  private timeUpdate$ = new Subject<void>();
   // Fired when a user changes the the autorefresh settings
-  private refreshIntervalUpdate$ = new Subject();
-  private fetch$ = new Subject();
+  private refreshIntervalUpdate$ = new Subject<void>();
+  private fetch$ = new Subject<void>();
 
   private _time: TimeRange;
   // Denotes whether setTime has been called, can be used to determine if the constructor defaults are being used.
diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
index ec5caae031498..6a16924a0f20b 100644
--- a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
@@ -23,7 +23,7 @@ const createSetupContractMock = () => {
     getTimeUpdate$: jest.fn(),
     getRefreshIntervalUpdate$: jest.fn(),
     getAutoRefreshFetch$: jest.fn(() => new Observable<() => void>()),
-    getFetch$: jest.fn(() => new Observable<() => void>()),
+    getFetch$: jest.fn().mockImplementation(() => new Observable<() => void>()),
     getTime: jest.fn(),
     setTime: jest.fn(),
     setRefreshInterval: jest.fn(),
diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.ts b/src/plugins/data/public/query/timefilter/timefilter_service.ts
index dcc78b51eac58..a8c9b7a759e9e 100644
--- a/src/plugins/data/public/query/timefilter/timefilter_service.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { TimeHistory, Timefilter, TimeHistoryContract, TimefilterContract } from './index';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { TimeHistory, Timefilter, TimeHistoryContract, TimefilterContract } from '.';
 import { UI_SETTINGS } from '../../../common';
 import { NowProviderInternalContract } from '../../now_provider';
 
diff --git a/src/plugins/data/public/search/aggs/aggs_service.test.ts b/src/plugins/data/public/search/aggs/aggs_service.test.ts
index 83328e196fa0a..4309c68d639d8 100644
--- a/src/plugins/data/public/search/aggs/aggs_service.test.ts
+++ b/src/plugins/data/public/search/aggs/aggs_service.test.ts
@@ -8,10 +8,10 @@
 
 import { BehaviorSubject, Subscription } from 'rxjs';
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { expressionsPluginMock } from '../../../../../plugins/expressions/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { BucketAggType, getAggTypes, MetricAggType } from '../../../common';
-import { fieldFormatsServiceMock } from '../../../../field_formats/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { dataPluginMock } from '../../mocks';
 
 import {
diff --git a/src/plugins/data/public/search/aggs/aggs_service.ts b/src/plugins/data/public/search/aggs/aggs_service.ts
index 99930a95831ea..6dc6e3f9c5874 100644
--- a/src/plugins/data/public/search/aggs/aggs_service.ts
+++ b/src/plugins/data/public/search/aggs/aggs_service.ts
@@ -8,9 +8,9 @@
 
 import { Subscription } from 'rxjs';
 
-import { IUiSettingsClient } from 'src/core/public';
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { calculateBounds, TimeRange } from '../../../common';
 import {
   aggsRequiredUiSettings,
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 145bb191fde11..031275e76f3bd 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
@@ -7,9 +7,9 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart } from '../../../../../core/public';
-import { coreMock } from '../../../../../core/public/mocks';
-import { usageCollectionPluginMock, Setup } from '../../../../usage_collection/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { usageCollectionPluginMock, Setup } from '@kbn/usage-collection-plugin/public/mocks';
 import { createUsageCollector } from './create_usage_collector';
 import { SEARCH_EVENT_TYPE, SearchUsageCollector } from './types';
 import { METRIC_TYPE } from '@kbn/analytics';
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 d4f64fcfa962f..266e3e1e9a1a6 100644
--- a/src/plugins/data/public/search/collectors/create_usage_collector.ts
+++ b/src/plugins/data/public/search/collectors/create_usage_collector.ts
@@ -9,8 +9,8 @@
 import { first } from 'rxjs/operators';
 import { METRIC_TYPE } from '@kbn/analytics';
 import type { UiCounterMetricType } from '@kbn/analytics';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SEARCH_EVENT_TYPE, SearchUsageCollector } from './types';
 
 export const createUsageCollector = (
diff --git a/src/plugins/data/public/search/errors/es_error.tsx b/src/plugins/data/public/search/errors/es_error.tsx
index 71c11af48830f..a8d73baaf4d71 100644
--- a/src/plugins/data/public/search/errors/es_error.tsx
+++ b/src/plugins/data/public/search/errors/es_error.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiCodeBlock, EuiSpacer } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { KbnError } from '../../../../kibana_utils/common';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 import { IEsError } from './types';
 import { getRootCause } from './utils';
 
diff --git a/src/plugins/data/public/search/errors/painless_error.test.tsx b/src/plugins/data/public/search/errors/painless_error.test.tsx
index f07f078ea03a3..c4a540f7d21ab 100644
--- a/src/plugins/data/public/search/errors/painless_error.test.tsx
+++ b/src/plugins/data/public/search/errors/painless_error.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
diff --git a/src/plugins/data/public/search/errors/painless_error.tsx b/src/plugins/data/public/search/errors/painless_error.tsx
index 674197d74d6be..0eac061bde364 100644
--- a/src/plugins/data/public/search/errors/painless_error.tsx
+++ b/src/plugins/data/public/search/errors/painless_error.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiSpacer, EuiText, EuiCodeBlock } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { IEsError, isEsError } from './types';
 import { EsError } from './es_error';
 import { getRootCause } from './utils';
diff --git a/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx b/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx
index 868245e66bf4d..e5f96a79ac8db 100644
--- a/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx
+++ b/src/plugins/data/public/search/errors/search_session_incomplete_warning.tsx
@@ -7,7 +7,7 @@
  */
 
 import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/src/plugins/data/public/search/errors/timeout_error.test.tsx b/src/plugins/data/public/search/errors/timeout_error.test.tsx
index f1b83ae959a9e..aa370f395df5e 100644
--- a/src/plugins/data/public/search/errors/timeout_error.test.tsx
+++ b/src/plugins/data/public/search/errors/timeout_error.test.tsx
@@ -8,11 +8,11 @@
 
 import { SearchTimeoutError, TimeoutErrorMode } from './timeout_error';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
-import { AbortError } from '../../../../kibana_utils/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/public';
 
 describe('SearchTimeoutError', () => {
   beforeEach(() => {
diff --git a/src/plugins/data/public/search/errors/timeout_error.tsx b/src/plugins/data/public/search/errors/timeout_error.tsx
index 29b921c9cc12b..878700acdf77a 100644
--- a/src/plugins/data/public/search/errors/timeout_error.tsx
+++ b/src/plugins/data/public/search/errors/timeout_error.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
-import { KbnError } from '../../../../kibana_utils/common';
+import { ApplicationStart } from '@kbn/core/public';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 
 export enum TimeoutErrorMode {
   CONTACT,
diff --git a/src/plugins/data/public/search/errors/types.ts b/src/plugins/data/public/search/errors/types.ts
index 8f18ab06fcd94..560ecbe31a3ff 100644
--- a/src/plugins/data/public/search/errors/types.ts
+++ b/src/plugins/data/public/search/errors/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { KibanaServerError } from '../../../../kibana_utils/common';
+import { KibanaServerError } from '@kbn/kibana-utils-plugin/common';
 
 export interface FailedShard {
   shard: number;
diff --git a/src/plugins/data/public/search/errors/utils.ts b/src/plugins/data/public/search/errors/utils.ts
index 4373939878d68..f90a1fb461804 100644
--- a/src/plugins/data/public/search/errors/utils.ts
+++ b/src/plugins/data/public/search/errors/utils.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { ErrorCause } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { KibanaServerError } from '@kbn/kibana-utils-plugin/common';
 import type { FailedShard, Reason } from './types';
-import { KibanaServerError } from '../../../../kibana_utils/common';
 
 export function getFailedShards(err: KibanaServerError<any>): FailedShard | undefined {
   const errorInfo = err.attributes;
diff --git a/src/plugins/data/public/search/es_search/get_es_preference.test.ts b/src/plugins/data/public/search/es_search/get_es_preference.test.ts
index 9127b8bf75272..881e7b6448be4 100644
--- a/src/plugins/data/public/search/es_search/get_es_preference.test.ts
+++ b/src/plugins/data/public/search/es_search/get_es_preference.test.ts
@@ -8,8 +8,8 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import { getEsPreference } from './get_es_preference';
-import { CoreStart } from '../../../../../core/public';
-import { coreMock } from '../../../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { UI_SETTINGS } from '../../../common';
 
 describe('Get ES preference', () => {
diff --git a/src/plugins/data/public/search/es_search/get_es_preference.ts b/src/plugins/data/public/search/es_search/get_es_preference.ts
index 14e1a7779268c..9cb4fb5ab577c 100644
--- a/src/plugins/data/public/search/es_search/get_es_preference.ts
+++ b/src/plugins/data/public/search/es_search/get_es_preference.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { UI_SETTINGS } from '../../../common';
 
 const defaultSessionId = `${Date.now()}`;
diff --git a/src/plugins/data/public/search/expressions/eql.test.ts b/src/plugins/data/public/search/expressions/eql.test.ts
index 71655a551253c..3be05be44b039 100644
--- a/src/plugins/data/public/search/expressions/eql.test.ts
+++ b/src/plugins/data/public/search/expressions/eql.test.ts
@@ -9,7 +9,7 @@
 import { getEql } from './eql';
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { EqlExpressionFunctionDefinition } from '../../../common/search/expressions';
-import { StartServicesAccessor } from 'kibana/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { of } from 'rxjs';
 
diff --git a/src/plugins/data/public/search/expressions/eql.ts b/src/plugins/data/public/search/expressions/eql.ts
index 03444dd22adc2..676d49867f3b1 100644
--- a/src/plugins/data/public/search/expressions/eql.ts
+++ b/src/plugins/data/public/search/expressions/eql.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { getEqlFn } from '../../../common/search/expressions/eql';
 import { UiSettingsCommon } from '../../../common';
diff --git a/src/plugins/data/public/search/expressions/esaggs.test.ts b/src/plugins/data/public/search/expressions/esaggs.test.ts
index 8acbb8006e954..a837c43d1cf1e 100644
--- a/src/plugins/data/public/search/expressions/esaggs.test.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.test.ts
@@ -9,7 +9,7 @@
 import { omit } from 'lodash';
 import { of as mockOf } from 'rxjs';
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import type { ExecutionContext } from 'src/plugins/expressions/public';
+import type { ExecutionContext } from '@kbn/expressions-plugin/public';
 import type { IndexPatternsContract } from '../../../common';
 import type {
   ISearchStartSearchSource,
diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
index b691dc2237c22..ffdd1663a87b1 100644
--- a/src/plugins/data/public/search/expressions/esaggs.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -9,7 +9,7 @@
 import { get } from 'lodash';
 import { defer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import {
   EsaggsExpressionFunctionDefinition,
   EsaggsStartDependencies,
diff --git a/src/plugins/data/public/search/expressions/esdsl.test.ts b/src/plugins/data/public/search/expressions/esdsl.test.ts
index f39b33c252ded..7ac0d3d5fb133 100644
--- a/src/plugins/data/public/search/expressions/esdsl.test.ts
+++ b/src/plugins/data/public/search/expressions/esdsl.test.ts
@@ -9,7 +9,7 @@
 import { getEsdsl } from './esdsl';
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { EsdslExpressionFunctionDefinition } from '../../../common/search/expressions';
-import { StartServicesAccessor } from 'kibana/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { of } from 'rxjs';
 
diff --git a/src/plugins/data/public/search/expressions/esdsl.ts b/src/plugins/data/public/search/expressions/esdsl.ts
index 8d65f6e4ee688..f4f17be601fb1 100644
--- a/src/plugins/data/public/search/expressions/esdsl.ts
+++ b/src/plugins/data/public/search/expressions/esdsl.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { getEsdslFn } from '../../../common/search/expressions/esdsl';
 import { UiSettingsCommon } from '../../../common';
diff --git a/src/plugins/data/public/search/expressions/kibana_context.ts b/src/plugins/data/public/search/expressions/kibana_context.ts
index a2d97dbc6b5dd..8fad3c8e06c57 100644
--- a/src/plugins/data/public/search/expressions/kibana_context.ts
+++ b/src/plugins/data/public/search/expressions/kibana_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { getKibanaContextFn } from '../../../common/search/expressions';
 import { DataPublicPluginStart, DataStartDependencies } from '../../types';
 import { SavedObjectsClientCommon } from '../../../common';
diff --git a/src/plugins/data/public/search/fetch/handle_response.test.ts b/src/plugins/data/public/search/fetch/handle_response.test.ts
index f79ab8e9c16fe..cd71f572c27df 100644
--- a/src/plugins/data/public/search/fetch/handle_response.test.ts
+++ b/src/plugins/data/public/search/fetch/handle_response.test.ts
@@ -10,10 +10,10 @@ import { handleResponse } from './handle_response';
 
 // Temporary disable eslint, will be removed after moving to new platform folder
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { notificationServiceMock } from '../../../../../core/public/notifications/notifications_service.mock';
+import { notificationServiceMock } from '@kbn/core/public/notifications/notifications_service.mock';
 import { setNotifications } from '../../services';
-import { IKibanaSearchResponse } from 'src/plugins/data/common';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { IKibanaSearchResponse } from '../../../common';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('@kbn/i18n', () => {
   return {
diff --git a/src/plugins/data/public/search/fetch/handle_response.tsx b/src/plugins/data/public/search/fetch/handle_response.tsx
index 6199e52f45955..d37944b5d85cd 100644
--- a/src/plugins/data/public/search/fetch/handle_response.tsx
+++ b/src/plugins/data/public/search/fetch/handle_response.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
-import { IKibanaSearchResponse } from 'src/plugins/data/common';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { IKibanaSearchResponse } from '../../../common';
 import { ShardFailureOpenModalButton } from '../../shard_failure_modal';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { getNotifications } from '../../services';
 import type { SearchRequest } from '..';
 
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
index f1e2e903cadde..9287005db38a0 100644
--- a/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.test.ts
@@ -7,15 +7,15 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart } from '../../../../../core/public';
-import { coreMock, themeServiceMock } from '../../../../../core/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { IEsSearchRequest } from '../../../common/search';
 import { SearchInterceptor } from './search_interceptor';
-import { AbortError } from '../../../../kibana_utils/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/public';
 import { SearchTimeoutError, PainlessError, TimeoutErrorMode, EsError } from '../errors';
-import { ISessionService, SearchSessionState } from '../';
-import { bfetchPluginMock } from '../../../../bfetch/public/mocks';
-import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
+import { ISessionService, SearchSessionState } from '..';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/public/mocks';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
 
 import * as searchPhaseException from '../../../common/search/test_data/search_phase_execution_exception.json';
 import * as resourceNotFoundException from '../../../common/search/test_data/resource_not_found_exception.json';
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
index cebcf19317a8c..07989b101a556 100644
--- a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
@@ -31,9 +31,11 @@ import {
   ThemeServiceSetup,
   ToastsSetup,
   ExecutionContextSetup,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { BatchedFunc, BfetchPublicSetup, DISABLE_BFETCH } from '../../../../bfetch/public';
+import { BatchedFunc, BfetchPublicSetup, DISABLE_BFETCH } from '@kbn/bfetch-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { AbortError, KibanaServerError } from '@kbn/kibana-utils-plugin/public';
 import {
   ENHANCED_ES_SEARCH_STRATEGY,
   IAsyncSearchOptions,
@@ -55,8 +57,6 @@ import {
   TimeoutErrorMode,
   SearchSessionIncompleteWarning,
 } from '../errors';
-import { toMountPoint } from '../../../../kibana_react/public';
-import { AbortError, KibanaServerError } from '../../../../kibana_utils/public';
 import { ISessionService, SearchSessionState } from '../session';
 import { SearchResponseCache } from './search_response_cache';
 import { createRequestHash } from './utils';
diff --git a/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts b/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
index df277c289f973..d97d31112f699 100644
--- a/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
@@ -8,7 +8,7 @@
 
 import { interval, Observable, of, throwError } from 'rxjs';
 import { shareReplay, switchMap, take } from 'rxjs/operators';
-import { IKibanaSearchResponse } from 'src/plugins/data/public';
+import { IKibanaSearchResponse } from '../..';
 import { SearchAbortController } from './search_abort_controller';
 import { SearchResponseCache } from './search_response_cache';
 
diff --git a/src/plugins/data/public/search/search_interceptor/utils.ts b/src/plugins/data/public/search/search_interceptor/utils.ts
index 02c7059a8fdf5..a1818a50d0525 100644
--- a/src/plugins/data/public/search/search_interceptor/utils.ts
+++ b/src/plugins/data/public/search/search_interceptor/utils.ts
@@ -7,7 +7,7 @@
  */
 
 import stringify from 'json-stable-stringify';
-import { Sha256 } from '../../../../../core/public/utils';
+import { Sha256 } from '@kbn/core/public/utils';
 
 export async function createRequestHash(keys: Record<string, any>) {
   return new Sha256().update(stringify(keys), 'utf8').digest('hex');
diff --git a/src/plugins/data/public/search/search_service.test.ts b/src/plugins/data/public/search/search_service.test.ts
index 5bf4c21d48578..8c1fba48c7b4b 100644
--- a/src/plugins/data/public/search/search_service.test.ts
+++ b/src/plugins/data/public/search/search_service.test.ts
@@ -7,11 +7,11 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { coreMock } from '../../../../core/public/mocks';
-import { CoreSetup, CoreStart } from '../../../../core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 
 import { SearchService, SearchServiceSetupDependencies } from './search_service';
-import { bfetchPluginMock } from '../../../bfetch/public/mocks';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/public/mocks';
 
 describe('Search service', () => {
   let searchService: SearchService;
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index b21ad44c7bd6d..52271426d28e1 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -12,9 +12,11 @@ import {
   CoreStart,
   PluginInitializerContext,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { BehaviorSubject } from 'rxjs';
-import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import type { ISearchSetup, ISearchStart } from './types';
 
 import { handleResponse } from './fetch';
@@ -50,9 +52,7 @@ import { AggsService, AggsStartDependencies } from './aggs';
 import { IKibanaSearchResponse, IndexPatternsContract, SearchRequest } from '..';
 import { ISearchInterceptor, SearchInterceptor } from './search_interceptor';
 import { SearchUsageCollector, createUsageCollector } from './collectors';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 import { getEsaggs, getEsdsl, getEql } from './expressions';
-import { ExpressionsSetup } from '../../../expressions/public';
 import { ISessionsClient, ISessionService, SessionsClient, SessionService } from './session';
 import { ConfigSchema } from '../../config';
 import {
diff --git a/src/plugins/data/public/search/session/search_session_state.ts b/src/plugins/data/public/search/session/search_session_state.ts
index c714a3e387641..329d40da89b60 100644
--- a/src/plugins/data/public/search/session/search_session_state.ts
+++ b/src/plugins/data/public/search/session/search_session_state.ts
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import deepEqual from 'fast-deep-equal';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
-import { createStateContainer, StateContainer } from '../../../../kibana_utils/public';
+import { createStateContainer, StateContainer } from '@kbn/kibana-utils-plugin/public';
 import type { SearchSessionSavedObject } from './sessions_client';
 
 /**
diff --git a/src/plugins/data/public/search/session/session_helpers.test.ts b/src/plugins/data/public/search/session/session_helpers.test.ts
index 5b64e7b554d18..c06185d438401 100644
--- a/src/plugins/data/public/search/session/session_helpers.test.ts
+++ b/src/plugins/data/public/search/session/session_helpers.test.ts
@@ -9,9 +9,10 @@
 import { waitUntilNextSessionCompletes$ } from './session_helpers';
 import { ISessionService, SessionService } from './session_service';
 import { BehaviorSubject } from 'rxjs';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { SearchSessionState } from './search_session_state';
 import { NowProviderInternalContract } from '../../now_provider';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createNowProviderMock } from '../../now_provider/mocks';
 import { SEARCH_SESSIONS_MANAGEMENT_ID } from './constants';
 import { getSessionsClientMock } from './mocks';
@@ -62,27 +63,30 @@ describe('waitUntilNextSessionCompletes$', () => {
   afterEach(() => {
     jest.useRealTimers();
   });
-  test('emits when next session starts', () => {
-    sessionService.start();
-    let untrackSearch = sessionService.trackSearch({ abort: () => {} });
-    untrackSearch();
+  test(
+    'emits when next session starts',
+    fakeSchedulers((advance) => {
+      sessionService.start();
+      let untrackSearch = sessionService.trackSearch({ abort: () => {} });
+      untrackSearch();
 
-    const next = jest.fn();
-    const complete = jest.fn();
-    waitUntilNextSessionCompletes$(sessionService).subscribe({ next, complete });
-    expect(next).not.toBeCalled();
+      const next = jest.fn();
+      const complete = jest.fn();
+      waitUntilNextSessionCompletes$(sessionService).subscribe({ next, complete });
+      expect(next).not.toBeCalled();
 
-    sessionService.start();
-    expect(next).not.toBeCalled();
+      sessionService.start();
+      expect(next).not.toBeCalled();
 
-    untrackSearch = sessionService.trackSearch({ abort: () => {} });
-    untrackSearch();
+      untrackSearch = sessionService.trackSearch({ abort: () => {} });
+      untrackSearch();
 
-    expect(next).not.toBeCalled();
-    jest.advanceTimersByTime(500);
-    expect(next).not.toBeCalled();
-    jest.advanceTimersByTime(1000);
-    expect(next).toBeCalledTimes(1);
-    expect(complete).toBeCalled();
-  });
+      expect(next).not.toBeCalled();
+      advance(500);
+      expect(next).not.toBeCalled();
+      advance(1000);
+      expect(next).toBeCalledTimes(1);
+      expect(complete).toBeCalled();
+    })
+  );
 });
diff --git a/src/plugins/data/public/search/session/session_service.test.ts b/src/plugins/data/public/search/session/session_service.test.ts
index ad131fbea60b2..d377cca07a738 100644
--- a/src/plugins/data/public/search/session/session_service.test.ts
+++ b/src/plugins/data/public/search/session/session_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SessionService, ISessionService } from './session_service';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { take, toArray } from 'rxjs/operators';
 import { getSessionsClientMock } from './mocks';
 import { BehaviorSubject } from 'rxjs';
@@ -17,7 +17,7 @@ import { NowProviderInternalContract } from '../../now_provider';
 import { SEARCH_SESSIONS_MANAGEMENT_ID } from './constants';
 import type { SearchSessionSavedObject, ISessionsClient } from './sessions_client';
 import { SearchSessionStatus } from '../../../common';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 const mockSavedObject: SearchSessionSavedObject = {
   id: 'd7170a35-7e2c-48d6-8dec-9a056721b489',
diff --git a/src/plugins/data/public/search/session/session_service.ts b/src/plugins/data/public/search/session/session_service.ts
index 9a02e336ecf86..4b5d4da33132d 100644
--- a/src/plugins/data/public/search/session/session_service.ts
+++ b/src/plugins/data/public/search/session/session_service.ts
@@ -13,7 +13,7 @@ import {
   PluginInitializerContext,
   StartServicesAccessor,
   ToastsStart as ToastService,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ConfigSchema } from '../../../config';
 import { createSessionStateContainer } from './search_session_state';
diff --git a/src/plugins/data/public/search/session/sessions_client.ts b/src/plugins/data/public/search/session/sessions_client.ts
index c9606501d0a19..71e8d9dafb78d 100644
--- a/src/plugins/data/public/search/session/sessions_client.ts
+++ b/src/plugins/data/public/search/session/sessions_client.ts
@@ -7,13 +7,13 @@
  */
 
 import { PublicContract } from '@kbn/utility-types';
-import { HttpSetup, SavedObjectsFindOptions } from 'kibana/public';
+import { HttpSetup, SavedObjectsFindOptions } from '@kbn/core/public';
 import type {
   SavedObject,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type { SearchSessionSavedObjectAttributes } from '../../../common';
 export type SearchSessionSavedObject = SavedObject<SearchSessionSavedObjectAttributes>;
 export type ISessionsClient = PublicContract<SessionsClient>;
diff --git a/src/plugins/data/public/search/types.ts b/src/plugins/data/public/search/types.ts
index 6a06a93131b89..fa23b8f593688 100644
--- a/src/plugins/data/public/search/types.ts
+++ b/src/plugins/data/public/search/types.ts
@@ -7,12 +7,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { PackageInfo } from 'kibana/server';
+import { PackageInfo } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SearchUsageCollector } from './collectors';
 import { AggsSetup, AggsSetupDependencies, AggsStartDependencies, AggsStart } from './aggs';
 import { ISearchGeneric, ISearchStartSearchSource } from '../../common/search';
 import { IndexPatternsContract } from '../../common';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 import { ISessionsClient, ISessionService } from './session';
 
 export type { ISearchStartSearchSource, SearchUsageCollector };
diff --git a/src/plugins/data/public/services.ts b/src/plugins/data/public/services.ts
index 5c52a1e695359..cb294964a4b4f 100644
--- a/src/plugins/data/public/services.ts
+++ b/src/plugins/data/public/services.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NotificationsStart, CoreStart, ThemeServiceStart } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { NotificationsStart, CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { IndexPatternsContract } from './data_views';
 import { DataPublicPluginStart } from './types';
 
diff --git a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
index 757d318e1d1b7..948905cf1ce90 100644
--- a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
@@ -7,7 +7,7 @@
  */
 
 import { setOverlays } from '../services';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 export const openModal = jest.fn();
 
diff --git a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
index 0cb71f9097f9e..6893ae0126e84 100644
--- a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
@@ -8,7 +8,7 @@
 
 import { openModal } from './shard_failure_open_modal_button.test.mocks';
 import React from 'react';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import ShardFailureOpenModalButton from './shard_failure_open_modal_button';
 import { shardFailureRequest } from './__mocks__/shard_failure_request';
diff --git a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
index a20fe3da06e5a..63547b1391e5b 100644
--- a/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiTextAlign } from '@elastic/eui';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { getOverlays } from '../services';
-import { ThemeServiceStart } from '../../../../core/public';
-import { toMountPoint } from '../../../kibana_react/public';
 import { ShardFailureModal } from './shard_failure_modal';
 import { ShardFailureRequest } from './shard_failure_types';
 
diff --git a/src/plugins/data/public/test_utils.ts b/src/plugins/data/public/test_utils.ts
index 2d8009686a4da..c621d7d5ef94b 100644
--- a/src/plugins/data/public/test_utils.ts
+++ b/src/plugins/data/public/test_utils.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { getFieldFormatsRegistry } from '../../field_formats/public/mocks';
+export { getFieldFormatsRegistry } from '@kbn/field-formats-plugin/public/mocks';
diff --git a/src/plugins/data/public/triggers/apply_filter_trigger.ts b/src/plugins/data/public/triggers/apply_filter_trigger.ts
index 69fd76f45d614..f216cb805ab4e 100644
--- a/src/plugins/data/public/triggers/apply_filter_trigger.ts
+++ b/src/plugins/data/public/triggers/apply_filter_trigger.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Trigger } from '../../../ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const APPLY_FILTER_TRIGGER = 'FILTER_TRIGGER';
 export const applyFilterTrigger: Trigger = {
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 55b2637e874e0..4f571559df8de 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -6,21 +6,21 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'src/core/public';
-import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
-import { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { CoreStart } from '@kbn/core/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { UsageCollectionSetup, UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import { Setup as InspectorSetup } from '@kbn/inspector-plugin/public';
 import { DatatableUtilitiesService } from '../common';
 import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
 import { createFiltersFromRangeSelectAction, createFiltersFromValueClickAction } from './actions';
 import type { ISearchSetup, ISearchStart } from './search';
 import { QuerySetup, QueryStart } from './query';
 import { DataViewsContract } from './data_views';
-import { UsageCollectionSetup, UsageCollectionStart } from '../../usage_collection/public';
-import { Setup as InspectorSetup } from '../../inspector/public';
 import { NowProviderPublicContract } from './now_provider';
 
 export interface DataSetupDependencies {
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
index 4621937664479..307c074ce5c6f 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
@@ -20,11 +20,11 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
+import { IUiSettingsClient } from '@kbn/core/public';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { DataViewRow, DataViewColumn } from '../types';
-import { IUiSettingsClient } from '../../../../../../core/public';
-import { Datatable, DatatableColumn } from '../../../../../expressions/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { UiActionsStart } from '../../../../../ui_actions/public';
 
 interface DataTableFormatState {
   columns: DataViewColumn[];
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx
index 0a55582ebff05..faea07d402f18 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_table_selector.tsx
@@ -17,7 +17,7 @@ import {
   EuiFlexItem,
   EuiPopover,
 } from '@elastic/eui';
-import { Datatable } from '../../../../../expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 
 interface TableSelectorState {
   isPopoverOpen: boolean;
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx
index eb7f51aad8223..00817e3516720 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view.test.tsx
@@ -7,11 +7,11 @@
  */
 
 import React, { Suspense } from 'react';
-import { getTableViewDescription } from '../index';
+import { getTableViewDescription } from '..';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { TablesAdapter } from '../../../../../expressions/common';
+import { TablesAdapter } from '@kbn/expressions-plugin/common';
 
-jest.mock('../../../../../share/public', () => ({
+jest.mock('@kbn/share-plugin/public', () => ({
   downloadMultipleAs: jest.fn(),
 }));
 jest.mock('../../../../common', () => ({
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx
index f310952a5608d..70c534b4fbbc8 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view.tsx
@@ -11,12 +11,12 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 
+import { IUiSettingsClient } from '@kbn/core/public';
+import { InspectorViewProps, Adapters } from '@kbn/inspector-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { TablesAdapter, Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
 import { DataTableFormat } from './data_table';
-import { IUiSettingsClient } from '../../../../../../core/public';
-import { InspectorViewProps, Adapters } from '../../../../../inspector/public';
-import { UiActionsStart } from '../../../../../ui_actions/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { TablesAdapter, Datatable, DatatableColumn } from '../../../../../expressions/public';
 import { TableSelector } from './data_table_selector';
 import { DataDownloadOptions } from './download_options';
 
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx
index 1e0ebe3e3d907..ccb2ec11303bf 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_view_wrapper.tsx
@@ -7,10 +7,10 @@
  */
 
 import React, { lazy } from 'react';
-import { IUiSettingsClient } from 'kibana/public';
-import { UiActionsStart } from '../../../../../ui_actions/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { DatatableColumn } from '../../../../../expressions/common/expression_types/specs';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 
 const DataViewComponent = lazy(() => import('./data_view'));
 
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
index cd20f7d598ce3..1be85a7c066d3 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
@@ -19,11 +19,11 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
+import { Datatable } from '@kbn/expressions-plugin';
+import { downloadMultipleAs } from '@kbn/share-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { CSV_MIME_TYPE, datatableToCSV, tableHasFormulas } from '../../../../common';
-import { Datatable } from '../../../../../expressions';
-import { downloadMultipleAs } from '../../../../../share/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
-import { IUiSettingsClient } from '../../../../../../core/public';
 
 interface DataDownloadOptionsState {
   isPopoverOpen: boolean;
diff --git a/src/plugins/data/public/utils/table_inspector_view/index.ts b/src/plugins/data/public/utils/table_inspector_view/index.ts
index 498fe8d7fcca0..01e6100a4a375 100644
--- a/src/plugins/data/public/utils/table_inspector_view/index.ts
+++ b/src/plugins/data/public/utils/table_inspector_view/index.ts
@@ -7,12 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
-import { Adapters, InspectorViewDescription } from '../../../../inspector/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { Adapters, InspectorViewDescription } from '@kbn/inspector-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { getDataViewComponentWrapper } from './components/data_view_wrapper';
-import { UiActionsStart } from '../../../../ui_actions/public';
-import { FieldFormatsStart } from '../../../../field_formats/public';
-import { DatatableColumn } from '../../../../expressions/common/expression_types/specs';
 
 export const getTableViewDescription = (
   getStartServices: () => {
diff --git a/src/plugins/data/public/utils/table_inspector_view/types.ts b/src/plugins/data/public/utils/table_inspector_view/types.ts
index 7d57d15d7b3aa..32570ad5aac35 100644
--- a/src/plugins/data/public/utils/table_inspector_view/types.ts
+++ b/src/plugins/data/public/utils/table_inspector_view/types.ts
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { Datatable, DatatableColumn, DatatableRow } from '../../../../expressions/common';
+import { Datatable, DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 
 type DataViewColumnRender = (value: string, _item: DatatableRow) => React.ReactNode | string;
 
diff --git a/src/plugins/data/server/autocomplete/autocomplete_service.ts b/src/plugins/data/server/autocomplete/autocomplete_service.ts
index 071acc13c8117..8ab86f8a05d90 100644
--- a/src/plugins/data/server/autocomplete/autocomplete_service.ts
+++ b/src/plugins/data/server/autocomplete/autocomplete_service.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { registerRoutes } from './routes';
 import { ConfigSchema } from '../../config';
 
diff --git a/src/plugins/data/server/autocomplete/routes.ts b/src/plugins/data/server/autocomplete/routes.ts
index bdefd4df87b59..4b4321fdf9b8a 100644
--- a/src/plugins/data/server/autocomplete/routes.ts
+++ b/src/plugins/data/server/autocomplete/routes.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { registerValueSuggestionsRoute } from './value_suggestions_route';
 import { ConfigSchema } from '../../config';
 
diff --git a/src/plugins/data/server/autocomplete/terms_agg.test.ts b/src/plugins/data/server/autocomplete/terms_agg.test.ts
index f9d45475d9e2f..f27fa9d594f97 100644
--- a/src/plugins/data/server/autocomplete/terms_agg.test.ts
+++ b/src/plugins/data/server/autocomplete/terms_agg.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../core/server/mocks';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { ConfigSchema } from '../../config';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { termsAggSuggestions } from './terms_agg';
diff --git a/src/plugins/data/server/autocomplete/terms_agg.ts b/src/plugins/data/server/autocomplete/terms_agg.ts
index 742812adafbb9..7e48bc6ee21c3 100644
--- a/src/plugins/data/server/autocomplete/terms_agg.ts
+++ b/src/plugins/data/server/autocomplete/terms_agg.ts
@@ -7,7 +7,7 @@
  */
 
 import { get, map } from 'lodash';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ConfigSchema } from '../../config';
 import { IFieldType, getFieldSubtypeNested } from '../../common';
diff --git a/src/plugins/data/server/autocomplete/terms_enum.test.ts b/src/plugins/data/server/autocomplete/terms_enum.test.ts
index ce2741f612ba8..bc2a4e010a765 100644
--- a/src/plugins/data/server/autocomplete/terms_enum.test.ts
+++ b/src/plugins/data/server/autocomplete/terms_enum.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { termsEnumSuggestions } from './terms_enum';
-import { coreMock } from '../../../../core/server/mocks';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { ConfigSchema } from '../../config';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { TermsEnumResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
@@ -39,7 +39,7 @@ describe('_terms_enum suggestions', () => {
       'fieldName',
       'query',
       [],
-      { name: 'field_name', type: 'string' }
+      { name: 'field_name', type: 'string', searchable: true, aggregatable: true }
     );
 
     const [[args]] = esClientMock.termsEnum.mock.calls;
diff --git a/src/plugins/data/server/autocomplete/terms_enum.ts b/src/plugins/data/server/autocomplete/terms_enum.ts
index e4dca0a739087..77e8887f3fcb5 100644
--- a/src/plugins/data/server/autocomplete/terms_enum.ts
+++ b/src/plugins/data/server/autocomplete/terms_enum.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IFieldType } from '../../common';
+import { FieldSpec } from '../../common';
 import { findIndexPatternById, getFieldByName } from '../data_views';
 import { ConfigSchema } from '../../config';
 
@@ -20,7 +20,7 @@ export async function termsEnumSuggestions(
   fieldName: string,
   query: string,
   filters?: estypes.QueryDslQueryContainer[],
-  field?: IFieldType,
+  field?: FieldSpec,
   abortSignal?: AbortSignal
 ) {
   const { tiers } = config.autocomplete.valueSuggestions;
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
index de76183da3be3..9c6c037a86a82 100644
--- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts
+++ b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -7,11 +7,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { IRouter } from '@kbn/core/server';
+import { firstValueFrom, Observable } from 'rxjs';
+import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { getRequestAbortedSignal } from '../lib';
-import { getKbnServerError, reportServerError } from '../../../kibana_utils/server';
 import type { ConfigSchema } from '../../config';
 import { termsEnumSuggestions } from './terms_enum';
 import { termsAggSuggestions } from './terms_agg';
@@ -42,7 +41,7 @@ export function registerValueSuggestionsRoute(router: IRouter, config$: Observab
       },
     },
     async (context, request, response) => {
-      const config = await config$.pipe(first()).toPromise();
+      const config = await firstValueFrom(config$);
       const { field: fieldName, query, filters, fieldMeta, method } = request.body;
       const { index } = request.params;
       const abortSignal = getRequestAbortedSignal(request.events.aborted$);
diff --git a/src/plugins/data/server/config_deprecations.test.ts b/src/plugins/data/server/config_deprecations.test.ts
index 3df1ea9119292..7da937c840560 100644
--- a/src/plugins/data/server/config_deprecations.test.ts
+++ b/src/plugins/data/server/config_deprecations.test.ts
@@ -9,7 +9,7 @@
 import { cloneDeep } from 'lodash';
 
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 import { autocompleteConfigDeprecationProvider } from './config_deprecations';
 
diff --git a/src/plugins/data/server/config_deprecations.ts b/src/plugins/data/server/config_deprecations.ts
index d98364a8e83c6..7f704dac1f431 100644
--- a/src/plugins/data/server/config_deprecations.ts
+++ b/src/plugins/data/server/config_deprecations.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ConfigDeprecationProvider } from 'src/core/server';
+import type { ConfigDeprecationProvider } from '@kbn/core/server';
 
 export const autocompleteConfigDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot,
diff --git a/src/plugins/data/server/data_views/index.ts b/src/plugins/data/server/data_views/index.ts
index 91a61f4bcb7db..dfe03378f0278 100644
--- a/src/plugins/data/server/data_views/index.ts
+++ b/src/plugins/data/server/data_views/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/server';
+export * from '@kbn/data-views-plugin/server';
diff --git a/src/plugins/data/server/data_views/mocks.ts b/src/plugins/data/server/data_views/mocks.ts
index 69b57ed079127..6bbf835a9de00 100644
--- a/src/plugins/data/server/data_views/mocks.ts
+++ b/src/plugins/data/server/data_views/mocks.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../data_views/server/mocks';
+export * from '@kbn/data-views-plugin/server/mocks';
diff --git a/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts b/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts
index 3909003cd4d2c..9c460e639dc37 100644
--- a/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts
+++ b/src/plugins/data/server/datatable_utilities/datatable_utilities_service.ts
@@ -10,9 +10,9 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   UiSettingsServiceStart,
-} from 'src/core/server';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import type { IndexPatternsServiceStart } from 'src/plugins/data_views/server';
+} from '@kbn/core/server';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { IndexPatternsServiceStart } from '@kbn/data-views-plugin/server';
 import { DatatableUtilitiesService as DatatableUtilitiesServiceCommon } from '../../common';
 import type { AggsStart } from '../search';
 
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 449d18b542300..83fcd58ba9a45 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/109904
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { ConfigSchema, configSchema } from '../config';
 import { DataServerPlugin, DataPluginSetup, DataPluginStart } from './plugin';
 
@@ -43,7 +43,7 @@ export {
   getCapabilitiesForRollupIndices,
 } from './data_views';
 
-export type { IFieldType, IndexPatternAttributes } from '../common';
+export type { IndexPatternAttributes } from '../common';
 export {
   IndexPatternField,
   ES_FIELD_TYPES,
diff --git a/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
index 423ebbdcd43c7..6302af57166c4 100644
--- a/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
+++ b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { registerKqlTelemetryRoute } from './route';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
 import { makeKQLUsageCollector } from './usage_collector';
 import { kqlTelemetry } from '../saved_objects';
 
diff --git a/src/plugins/data/server/kql_telemetry/route.ts b/src/plugins/data/server/kql_telemetry/route.ts
index 7181d2bebd31c..9e1f497ce53e2 100644
--- a/src/plugins/data/server/kql_telemetry/route.ts
+++ b/src/plugins/data/server/kql_telemetry/route.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor, IRouter, Logger } from 'kibana/server';
+import { StartServicesAccessor, IRouter, Logger } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
 export function registerKqlTelemetryRoute(
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
index fb874e4a41c20..679b2e67158eb 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { fetchProvider } from './fetch';
-import { ElasticsearchClient } from 'kibana/server';
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 jest.mock('../../../common', () => ({
   DEFAULT_QUERY_LANGUAGE: 'lucene',
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
index bad26c1cf8f80..3f0d2129c6b92 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
@@ -7,7 +7,7 @@
  */
 
 import { get } from 'lodash';
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../../../common';
 
 const defaultSearchQueryLanguageSetting = DEFAULT_QUERY_LANGUAGE;
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
index 877e0a6b1ef0c..129bf59ca80a9 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { makeKQLUsageCollector } from './make_kql_usage_collector';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 describe('makeKQLUsageCollector', () => {
   let usageCollectionMock: jest.Mocked<UsageCollectionSetup>;
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
index 39ea7d6ab2dec..885c6b1807e92 100644
--- a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider, Usage } from './fetch';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
 
 export function makeKQLUsageCollector(usageCollection: UsageCollectionSetup, kibanaIndex: string) {
   const kqlUsageCollector = usageCollection.makeUsageCollector<Usage>({
diff --git a/src/plugins/data/server/mocks.ts b/src/plugins/data/server/mocks.ts
index 355e809888bd4..477ccf3120323 100644
--- a/src/plugins/data/server/mocks.ts
+++ b/src/plugins/data/server/mocks.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
+import {
+  createFieldFormatsSetupMock,
+  createFieldFormatsStartMock,
+} from '@kbn/field-formats-plugin/server/mocks';
 import {
   createSearchSetupMock,
   createSearchStartMock,
   createSearchRequestHandlerContext,
 } from './search/mocks';
-import {
-  createFieldFormatsSetupMock,
-  createFieldFormatsStartMock,
-} from '../../field_formats/server/mocks';
 import { createIndexPatternsStartMock } from './data_views/mocks';
 import { createDatatableUtilitiesMock } from './datatable_utilities/mock';
 import { DataRequestHandlerContext } from './search';
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 9d5b3792da566..dcf0baa188eaa 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -6,10 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { ConfigSchema } from '../config';
 import { DatatableUtilitiesService } from './datatable_utilities';
 import type { ISearchSetup, ISearchStart, SearchEnhancements } from './search';
@@ -17,9 +19,7 @@ import { SearchService } from './search/search_service';
 import { QueryService } from './query/query_service';
 import { ScriptsService } from './scripts';
 import { KqlTelemetryService } from './kql_telemetry';
-import { UsageCollectionSetup } from '../../usage_collection/server';
 import { AutocompleteService } from './autocomplete';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../field_formats/server';
 import { getUiSettings } from './ui_settings';
 import { QuerySetup } from './query';
 import { AutocompleteSetup } from './autocomplete/autocomplete_service';
diff --git a/src/plugins/data/server/query/query_service.ts b/src/plugins/data/server/query/query_service.ts
index 33aeecbc11df1..ea7c05905efee 100644
--- a/src/plugins/data/server/query/query_service.ts
+++ b/src/plugins/data/server/query/query_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { querySavedObjectType } from '../saved_objects';
 import { extract, getAllMigrations, inject, telemetry } from '../../common/query/persistable_state';
 import { registerSavedQueryRoutes } from './routes';
diff --git a/src/plugins/data/server/query/route_handler_context.test.ts b/src/plugins/data/server/query/route_handler_context.test.ts
index f8c14d59e0f85..69908f9733f56 100644
--- a/src/plugins/data/server/query/route_handler_context.test.ts
+++ b/src/plugins/data/server/query/route_handler_context.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { DATA_VIEW_SAVED_OBJECT_TYPE, FilterStateStore } from '../../common';
 import type { SavedObject, SavedQueryAttributes } from '../../common';
 import { registerSavedQueryRouteHandlerContext } from './route_handler_context';
-import { SavedObjectsFindResponse, SavedObjectsUpdateResponse } from 'kibana/server';
+import { SavedObjectsFindResponse, SavedObjectsUpdateResponse } from '@kbn/core/server';
 
 const mockContext = {
   core: coreMock.createRequestHandlerContext(),
diff --git a/src/plugins/data/server/query/route_handler_context.ts b/src/plugins/data/server/query/route_handler_context.ts
index 9351bd26408f5..e72257fe185d3 100644
--- a/src/plugins/data/server/query/route_handler_context.ts
+++ b/src/plugins/data/server/query/route_handler_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RequestHandlerContext, SavedObject } from 'kibana/server';
+import { RequestHandlerContext, SavedObject } from '@kbn/core/server';
 import { isFilters } from '@kbn/es-query';
 import { isQuery, SavedQueryAttributes } from '../../common';
 import { extract, inject } from '../../common/query/persistable_state';
diff --git a/src/plugins/data/server/query/routes.ts b/src/plugins/data/server/query/routes.ts
index 3f813b56b4fb3..d5997e93fa993 100644
--- a/src/plugins/data/server/query/routes.ts
+++ b/src/plugins/data/server/query/routes.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { SavedQueryRouteHandlerContext } from './route_handler_context';
 
 const SAVED_QUERY_PATH = '/api/saved_query';
diff --git a/src/plugins/data/server/saved_objects/kql_telemetry.ts b/src/plugins/data/server/saved_objects/kql_telemetry.ts
index 617e8047e945d..4c887e93fac65 100644
--- a/src/plugins/data/server/saved_objects/kql_telemetry.ts
+++ b/src/plugins/data/server/saved_objects/kql_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const kqlTelemetry: SavedObjectsType = {
   name: 'kql-telemetry',
diff --git a/src/plugins/data/server/saved_objects/migrations/query.ts b/src/plugins/data/server/saved_objects/migrations/query.ts
index 9640725e3edd4..b297276f9a22a 100644
--- a/src/plugins/data/server/saved_objects/migrations/query.ts
+++ b/src/plugins/data/server/saved_objects/migrations/query.ts
@@ -7,10 +7,10 @@
  */
 
 import { mapValues } from 'lodash';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
+import { mergeMigrationFunctionMaps } from '@kbn/kibana-utils-plugin/common';
 import { SavedQueryAttributes } from '../../../common';
 import { extract, getAllMigrations } from '../../../common/query/persistable_state';
-import { mergeMigrationFunctionMaps } from '../../../../kibana_utils/common';
 
 const extractFilterReferences = (doc: SavedObject<SavedQueryAttributes>) => {
   const { state: filters, references } = extract(doc.attributes.filters ?? []);
diff --git a/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts b/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts
index 955028c0f9bf2..561dfd2df7d90 100644
--- a/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts
+++ b/src/plugins/data/server/saved_objects/migrations/to_v7_12_0.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 /**
  * Drop the previous document's attributes, which report `averageDuration` incorrectly.
diff --git a/src/plugins/data/server/saved_objects/query.ts b/src/plugins/data/server/saved_objects/query.ts
index 6fd34f4802726..3c7e964d6c863 100644
--- a/src/plugins/data/server/saved_objects/query.ts
+++ b/src/plugins/data/server/saved_objects/query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { savedQueryMigrations } from './migrations/query';
 
 export const querySavedObjectType: SavedObjectsType = {
diff --git a/src/plugins/data/server/saved_objects/search_telemetry.ts b/src/plugins/data/server/saved_objects/search_telemetry.ts
index 33ad4b74f3169..9878db7f81cc0 100644
--- a/src/plugins/data/server/saved_objects/search_telemetry.ts
+++ b/src/plugins/data/server/saved_objects/search_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { migrate712 } from './migrations/to_v7_12_0';
 
 export const searchTelemetry: SavedObjectsType = {
diff --git a/src/plugins/data/server/scripts/route.ts b/src/plugins/data/server/scripts/route.ts
index 3be858a36fae2..2427bd91d967d 100644
--- a/src/plugins/data/server/scripts/route.ts
+++ b/src/plugins/data/server/scripts/route.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 
 export function registerScriptsRoute(router: IRouter) {
   router.get(
diff --git a/src/plugins/data/server/scripts/scripts_service.ts b/src/plugins/data/server/scripts/scripts_service.ts
index d0b5a2cf9afe9..899780c570c13 100644
--- a/src/plugins/data/server/scripts/scripts_service.ts
+++ b/src/plugins/data/server/scripts/scripts_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { registerScriptsRoute } from './route';
 
 export class ScriptsService implements Plugin<void> {
diff --git a/src/plugins/data/server/search/aggs/aggs_service.test.ts b/src/plugins/data/server/search/aggs/aggs_service.test.ts
index d03ee17bdaeb9..a78416c6f0625 100644
--- a/src/plugins/data/server/search/aggs/aggs_service.test.ts
+++ b/src/plugins/data/server/search/aggs/aggs_service.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { KibanaRequest, ElasticsearchClient } from 'src/core/server';
+import { KibanaRequest, ElasticsearchClient } from '@kbn/core/server';
 
-import { coreMock } from '../../../../../core/server/mocks';
-import { expressionsPluginMock } from '../../../../../plugins/expressions/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/server/mocks';
 import { BucketAggType, getAggTypes, MetricAggType } from '../../../common';
-import { createFieldFormatsStartMock } from '../../../../field_formats/server/mocks';
+import { createFieldFormatsStartMock } from '@kbn/field-formats-plugin/server/mocks';
 import { createIndexPatternsStartMock } from '../../data_views/mocks';
 
 import { AggsService, AggsSetupDependencies, AggsStartDependencies } from './aggs_service';
diff --git a/src/plugins/data/server/search/aggs/aggs_service.ts b/src/plugins/data/server/search/aggs/aggs_service.ts
index 808c0e9cc8499..4885c5d61f039 100644
--- a/src/plugins/data/server/search/aggs/aggs_service.ts
+++ b/src/plugins/data/server/search/aggs/aggs_service.ts
@@ -12,8 +12,9 @@ import {
   UiSettingsServiceStart,
   SavedObjectsClientContract,
   ElasticsearchClient,
-} from 'src/core/server';
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/common';
+} from '@kbn/core/server';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import {
   AggsCommonService,
   AggConfigs,
@@ -22,7 +23,6 @@ import {
   calculateBounds,
   TimeRange,
 } from '../../../common';
-import { FieldFormatsStart } from '../../../../field_formats/server';
 import { IndexPatternsServiceStart } from '../../data_views';
 import { AggsSetup, AggsStart } from './types';
 
diff --git a/src/plugins/data/server/search/aggs/types.ts b/src/plugins/data/server/search/aggs/types.ts
index 470e60f8e4dd5..d931f4fb361f2 100644
--- a/src/plugins/data/server/search/aggs/types.ts
+++ b/src/plugins/data/server/search/aggs/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
+import { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 import { AggsCommonSetup, AggsStart as Start } from '../../../common';
 
 export type AggsSetup = AggsCommonSetup;
diff --git a/src/plugins/data/server/search/collectors/fetch.ts b/src/plugins/data/server/search/collectors/fetch.ts
index 054d04d6fbcae..08f365d0a6073 100644
--- a/src/plugins/data/server/search/collectors/fetch.ts
+++ b/src/plugins/data/server/search/collectors/fetch.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import { CollectedUsage, ReportedUsage } from './register';
 
 interface SearchTelemetry {
diff --git a/src/plugins/data/server/search/collectors/register.ts b/src/plugins/data/server/search/collectors/register.ts
index a70b9760122a9..927c5274e8128 100644
--- a/src/plugins/data/server/search/collectors/register.ts
+++ b/src/plugins/data/server/search/collectors/register.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider } from './fetch';
 
 export interface CollectedUsage {
diff --git a/src/plugins/data/server/search/collectors/usage.ts b/src/plugins/data/server/search/collectors/usage.ts
index 836ff33b335c4..5b1904737b9bc 100644
--- a/src/plugins/data/server/search/collectors/usage.ts
+++ b/src/plugins/data/server/search/collectors/usage.ts
@@ -7,7 +7,7 @@
  */
 
 import { once, debounce } from 'lodash';
-import type { CoreSetup, Logger } from 'kibana/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 import type { IEsSearchResponse, ISearchOptions } from '../../../common';
 import { isCompleteResponse } from '../../../common';
 import { CollectedUsage } from './register';
diff --git a/src/plugins/data/server/search/errors/no_search_id_in_session.ts b/src/plugins/data/server/search/errors/no_search_id_in_session.ts
index b291df1cee5ba..49f924b6f3f56 100644
--- a/src/plugins/data/server/search/errors/no_search_id_in_session.ts
+++ b/src/plugins/data/server/search/errors/no_search_id_in_session.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KbnError } from '../../../../kibana_utils/common';
+import { KbnError } from '@kbn/kibana-utils-plugin/common';
 
 export class NoSearchIdInSessionError extends KbnError {
   constructor() {
diff --git a/src/plugins/data/server/search/expressions/eql.ts b/src/plugins/data/server/search/expressions/eql.ts
index e9acac3ffc08f..2eb8e3754dd7b 100644
--- a/src/plugins/data/server/search/expressions/eql.ts
+++ b/src/plugins/data/server/search/expressions/eql.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 import { getEqlFn } from '../../../common/search/expressions/eql';
 
diff --git a/src/plugins/data/server/search/expressions/esaggs.test.ts b/src/plugins/data/server/search/expressions/esaggs.test.ts
index cc5b81657bc55..bd07d8f538456 100644
--- a/src/plugins/data/server/search/expressions/esaggs.test.ts
+++ b/src/plugins/data/server/search/expressions/esaggs.test.ts
@@ -9,8 +9,8 @@
 import { omit } from 'lodash';
 import { of as mockOf } from 'rxjs';
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { KibanaRequest } from 'src/core/server';
-import type { ExecutionContext } from 'src/plugins/expressions/server';
+import { KibanaRequest } from '@kbn/core/server';
+import type { ExecutionContext } from '@kbn/expressions-plugin/server';
 import type { IndexPatternsContract } from '../../../common';
 import type {
   AggsCommonStart,
diff --git a/src/plugins/data/server/search/expressions/esaggs.ts b/src/plugins/data/server/search/expressions/esaggs.ts
index 058538fad4981..912acfab3b3fe 100644
--- a/src/plugins/data/server/search/expressions/esaggs.ts
+++ b/src/plugins/data/server/search/expressions/esaggs.ts
@@ -10,7 +10,7 @@ import { get } from 'lodash';
 import { defer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, StartServicesAccessor } from 'src/core/server';
+import { KibanaRequest, StartServicesAccessor } from '@kbn/core/server';
 import {
   EsaggsExpressionFunctionDefinition,
   EsaggsStartDependencies,
diff --git a/src/plugins/data/server/search/expressions/esdsl.ts b/src/plugins/data/server/search/expressions/esdsl.ts
index e16204c8782e4..cfbfcdc5ca05a 100644
--- a/src/plugins/data/server/search/expressions/esdsl.ts
+++ b/src/plugins/data/server/search/expressions/esdsl.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 import { getEsdslFn } from '../../../common/search/expressions/esdsl';
 
diff --git a/src/plugins/data/server/search/expressions/kibana_context.ts b/src/plugins/data/server/search/expressions/kibana_context.ts
index fd5af4cc4b057..ee28124d09216 100644
--- a/src/plugins/data/server/search/expressions/kibana_context.ts
+++ b/src/plugins/data/server/search/expressions/kibana_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { getKibanaContextFn } from '../../../common/search/expressions';
 import { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 import { SavedObjectsClientCommon } from '../../../common';
diff --git a/src/plugins/data/server/search/routes/bsearch.ts b/src/plugins/data/server/search/routes/bsearch.ts
index 25b1bd0d7009d..581920feef89d 100644
--- a/src/plugins/data/server/search/routes/bsearch.ts
+++ b/src/plugins/data/server/search/routes/bsearch.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { catchError, first } from 'rxjs/operators';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import type { ExecutionContextSetup } from 'src/core/server';
+import { firstValueFrom } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import type { ExecutionContextSetup } from '@kbn/core/server';
 import apm from 'elastic-apm-node';
 import {
   IKibanaSearchRequest,
@@ -37,10 +38,8 @@ export function registerBsearchRoute(
         return executionContextService.withContext(executionContext, () => {
           apm.addLabels(executionContextService.getAsLabels());
 
-          return search
-            .search(requestData, restOptions)
-            .pipe(
-              first(),
+          return firstValueFrom(
+            search.search(requestData, restOptions).pipe(
               catchError((err) => {
                 // Re-throw as object, to get attributes passed to the client
                 // eslint-disable-next-line no-throw-literal
@@ -51,7 +50,7 @@ export function registerBsearchRoute(
                 };
               })
             )
-            .toPromise();
+          );
         });
       },
     };
diff --git a/src/plugins/data/server/search/routes/search.test.ts b/src/plugins/data/server/search/routes/search.test.ts
index 06487d271c6e1..f31e5e8be6de8 100644
--- a/src/plugins/data/server/search/routes/search.test.ts
+++ b/src/plugins/data/server/search/routes/search.test.ts
@@ -8,13 +8,13 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import { from } from 'rxjs';
-import { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { registerSearchRoute } from './search';
 import { DataPluginStart } from '../../plugin';
 import * as searchPhaseException from '../../../common/search/test_data/search_phase_execution_exception.json';
 import * as indexNotFoundException from '../../../common/search/test_data/index_not_found_exception.json';
-import { KbnServerError } from '../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 
 describe('Search service', () => {
   let mockCoreSetup: MockedKeys<CoreSetup<{}, DataPluginStart>>;
diff --git a/src/plugins/data/server/search/routes/search.ts b/src/plugins/data/server/search/routes/search.ts
index 1680a9c4a7237..6f48ba747a715 100644
--- a/src/plugins/data/server/search/routes/search.ts
+++ b/src/plugins/data/server/search/routes/search.ts
@@ -8,8 +8,8 @@
 
 import { first } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
+import { reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { getRequestAbortedSignal } from '../../lib';
-import { reportServerError } from '../../../../kibana_utils/server';
 import type { DataPluginRouter } from '../types';
 
 export function registerSearchRoute(router: DataPluginRouter): void {
diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts
index f449018612cef..121de2e068e3c 100644
--- a/src/plugins/data/server/search/search_service.test.ts
+++ b/src/plugins/data/server/search/search_service.test.ts
@@ -7,16 +7,16 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart, SavedObject } from '../../../../core/server';
-import { coreMock } from '../../../../core/server/mocks';
+import { CoreSetup, CoreStart, SavedObject } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
 
 import { DataPluginStart, DataPluginStartDependencies } from '../plugin';
-import { createFieldFormatsStartMock } from '../../../field_formats/server/mocks';
+import { createFieldFormatsStartMock } from '@kbn/field-formats-plugin/server/mocks';
 import { createIndexPatternsStartMock } from '../data_views/mocks';
 
 import { SearchService, SearchServiceSetupDependencies } from './search_service';
-import { bfetchPluginMock } from '../../../bfetch/server/mocks';
-import { of } from 'rxjs';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/server/mocks';
+import { lastValueFrom, of } from 'rxjs';
 import type {
   IEsSearchRequest,
   IEsSearchResponse,
@@ -28,7 +28,7 @@ import type {
 } from '.';
 import { NoSearchIdInSessionError } from '.';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { expressionsPluginMock } from '../../../expressions/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { createSearchSessionsClientMock } from './mocks';
 import { ENHANCED_ES_SEARCH_STRATEGY } from '../../common';
 
@@ -182,7 +182,7 @@ describe('Search service', () => {
           throw new NoSearchIdInSessionError();
         });
 
-        const res = await mockScopedClient.search(searchRequest, options).toPromise();
+        const res = await lastValueFrom(mockScopedClient.search(searchRequest, options));
 
         const [request, callOptions] = mockStrategy.search.mock.calls[0];
         expect(callOptions).toBe(options);
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 7c01fefc92d65..8c264889ebf2a 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { from, Observable, throwError } from 'rxjs';
+import { firstValueFrom, from, Observable, throwError } from 'rxjs';
 import { pick } from 'lodash';
 import moment from 'moment';
 import {
@@ -18,10 +18,13 @@ import {
   PluginInitializerContext,
   SharedGlobalConfig,
   StartServicesAccessor,
-} from 'src/core/server';
-import { first, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+} from '@kbn/core/server';
+import { map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type {
   IScopedSearchClient,
   ISearchSetup,
@@ -34,12 +37,10 @@ import type {
 
 import { AggsService } from './aggs';
 
-import { FieldFormatsStart } from '../../../field_formats/server';
 import { IndexPatternsServiceStart } from '../data_views';
 import { registerSearchRoute } from './routes';
 import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './strategies/es_search';
 import { DataPluginStart, DataPluginStartDependencies } from '../plugin';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
 import { registerUsageCollector } from './collectors/register';
 import { usageProvider } from './collectors/usage';
 import { searchTelemetry } from '../saved_objects';
@@ -87,7 +88,6 @@ import {
 import { aggShardDelay } from '../../common/search/aggs/buckets/shard_delay_fn';
 import { ConfigSchema } from '../../config';
 import { ISearchSessionService, SearchSessionService } from './session';
-import { KbnServerError } from '../../../kibana_utils/server';
 import { registerBsearchRoute } from './routes/bsearch';
 import { getKibanaContext } from './expressions/kibana_context';
 import { enhancedEsSearchStrategyProvider } from './strategies/ese_search';
@@ -221,16 +221,12 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
 
     const aggs = this.aggsService.setup({ registerFunction: expressions.registerFunction });
 
-    this.initializerContext.config
-      .create<ConfigSchema>()
-      .pipe(first())
-      .toPromise()
-      .then((value) => {
-        if (value.search.aggs.shardDelay.enabled) {
-          aggs.types.registerBucket(SHARD_DELAY_AGG_NAME, getShardDelayBucketAgg);
-          expressions.registerFunction(aggShardDelay);
-        }
-      });
+    firstValueFrom(this.initializerContext.config.create<ConfigSchema>()).then((value) => {
+      if (value.search.aggs.shardDelay.enabled) {
+        aggs.types.registerBucket(SHARD_DELAY_AGG_NAME, getShardDelayBucketAgg);
+        expressions.registerFunction(aggShardDelay);
+      }
+    });
 
     return {
       __enhance: (enhancements: SearchEnhancements) => {
diff --git a/src/plugins/data/server/search/search_source/mocks.ts b/src/plugins/data/server/search/search_source/mocks.ts
index 6c93c39812301..6c6e2cf8a8736 100644
--- a/src/plugins/data/server/search/search_source/mocks.ts
+++ b/src/plugins/data/server/search/search_source/mocks.ts
@@ -7,7 +7,7 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 
 import { searchSourceCommonMock } from '../../../common/search/search_source/mocks';
 import type { ISearchStart, ISearchSetup } from '../types';
diff --git a/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts b/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts
index 045e9d6d540ff..43da5c720feed 100644
--- a/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts
+++ b/src/plugins/data/server/search/services/cached_ui_settings_client.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock, httpServerMock } from '../../../../../core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { CachedUiSettingsClient } from './cached_ui_settings_client';
 
diff --git a/src/plugins/data/server/search/services/cached_ui_settings_client.ts b/src/plugins/data/server/search/services/cached_ui_settings_client.ts
index 053f2e2c35f4b..69affb21517d1 100644
--- a/src/plugins/data/server/search/services/cached_ui_settings_client.ts
+++ b/src/plugins/data/server/search/services/cached_ui_settings_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 
 /**
  * {@link IUiSettingsClient} wrapper to ensure uiSettings requested only once within a single KibanaRequest,
diff --git a/src/plugins/data/server/search/session/types.ts b/src/plugins/data/server/search/session/types.ts
index 3083cc7d335e8..76c4cff37cfa2 100644
--- a/src/plugins/data/server/search/session/types.ts
+++ b/src/plugins/data/server/search/session/types.ts
@@ -13,7 +13,7 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { IKibanaSearchRequest, ISearchOptions } from '../../../common/search';
 import { SearchSessionsConfigSchema } from '../../../config';
 
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts
index d32080928d630..32f2d8b1e03d5 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { eqlSearchStrategyProvider } from './eql_search_strategy';
 import { SearchStrategyDependencies } from '../../types';
 import { EqlSearchStrategyRequest } from '../../../../common';
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
index ebb07cff6e05d..33c6f387d6506 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
@@ -8,7 +8,7 @@
 
 import type { TransportResult } from '@elastic/elasticsearch';
 import { tap } from 'rxjs/operators';
-import type { IScopedClusterClient, Logger } from 'kibana/server';
+import type { IScopedClusterClient, Logger } from '@kbn/core/server';
 import {
   EqlSearchStrategyRequest,
   EqlSearchStrategyResponse,
diff --git a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts
index de5962763aed4..7a7f2253b9695 100644
--- a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.test.ts
@@ -7,14 +7,14 @@
  */
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock } from '../../../../../../core/server/mocks';
-import { pluginInitializerContextConfigMock } from '../../../../../../core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { pluginInitializerContextConfigMock } from '@kbn/core/server/mocks';
 import { esSearchStrategyProvider } from './es_search_strategy';
 import { SearchStrategyDependencies } from '../../types';
 
 import * as indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
 import { errors } from '@elastic/elasticsearch';
-import { KbnServerError } from '../../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 
 describe('ES search strategy', () => {
   const successBody = {
diff --git a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
index 5fd734138824d..02ebd10f7cb07 100644
--- a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { from, Observable } from 'rxjs';
-import { first, tap } from 'rxjs/operators';
-import type { Logger, SharedGlobalConfig } from 'kibana/server';
+import { firstValueFrom, from, Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import type { Logger, SharedGlobalConfig } from '@kbn/core/server';
+import { getKbnServerError, KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ISearchStrategy } from '../../types';
 import type { SearchUsage } from '../../collectors';
 import { getDefaultSearchParams, getShardTimeout } from './request_utils';
 import { shimHitsTotal, toKibanaSearchResponse } from './response_utils';
 import { searchUsageObserver } from '../../collectors/usage';
-import { getKbnServerError, KbnServerError } from '../../../../../kibana_utils/server';
 
 export const esSearchStrategyProvider = (
   config$: Observable<SharedGlobalConfig>,
@@ -37,7 +37,7 @@ export const esSearchStrategyProvider = (
 
     const search = async () => {
       try {
-        const config = await config$.pipe(first()).toPromise();
+        const config = await firstValueFrom(config$);
         // @ts-expect-error params fall back to any, but should be valid SearchRequest params
         const { terminateAfter, ...requestParams } = request.params ?? {};
         const params = {
diff --git a/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts b/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts
index d6e078c71a87d..b31955be71ce2 100644
--- a/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts
+++ b/src/plugins/data/server/search/strategies/es_search/request_utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getShardTimeout, getDefaultSearchParams } from './request_utils';
-import { IUiSettingsClient, SharedGlobalConfig } from 'kibana/server';
+import { IUiSettingsClient, SharedGlobalConfig } from '@kbn/core/server';
 
 describe('request utils', () => {
   describe('getShardTimeout', () => {
diff --git a/src/plugins/data/server/search/strategies/es_search/request_utils.ts b/src/plugins/data/server/search/strategies/es_search/request_utils.ts
index 9a57ac56ce250..e0b5cb40e8784 100644
--- a/src/plugins/data/server/search/strategies/es_search/request_utils.ts
+++ b/src/plugins/data/server/search/strategies/es_search/request_utils.ts
@@ -7,7 +7,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IUiSettingsClient, SharedGlobalConfig } from 'kibana/server';
+import type { IUiSettingsClient, SharedGlobalConfig } from '@kbn/core/server';
 import { UI_SETTINGS } from '../../../../common';
 
 export function getShardTimeout(
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
index d4fe74486ee85..b657d5602e99c 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { KbnServerError } from '../../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { errors } from '@elastic/elasticsearch';
 import * as indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
 import * as xContentParseException from '../../../../common/search/test_data/x_content_parse_exception.json';
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index 7a9caa4998f9a..11229e99526db 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -7,10 +7,11 @@
  */
 
 import type { Observable } from 'rxjs';
-import type { IScopedClusterClient, Logger, SharedGlobalConfig } from 'kibana/server';
-import { catchError, first, tap } from 'rxjs/operators';
+import type { IScopedClusterClient, Logger, SharedGlobalConfig } from '@kbn/core/server';
+import { catchError, tap } from 'rxjs/operators';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { from } from 'rxjs';
+import { firstValueFrom, from } from 'rxjs';
+import { getKbnServerError, KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ISearchStrategy, SearchStrategyDependencies } from '../../types';
 import type {
   IAsyncSearchOptions,
@@ -25,7 +26,6 @@ import {
   getIgnoreThrottled,
 } from './request_utils';
 import { toAsyncKibanaSearchResponse } from './response_utils';
-import { getKbnServerError, KbnServerError } from '../../../../../kibana_utils/server';
 import { SearchUsage, searchUsageObserver } from '../../collectors';
 import {
   getDefaultSearchParams,
@@ -107,7 +107,7 @@ export const enhancedEsSearchStrategyProvider = (
     { esClient, uiSettingsClient }: SearchStrategyDependencies
   ): Promise<IEsSearchResponse> {
     const client = useInternalUser ? esClient.asInternalUser : esClient.asCurrentUser;
-    const legacyConfig = await legacyConfig$.pipe(first()).toPromise();
+    const legacyConfig = await firstValueFrom(legacyConfig$);
     const { body, index, ...params } = request.params!;
     const method = 'POST';
     const path = encodeURI(`/${index}/_rollup_search`);
diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
index 91b323de7c07b..878806d9b3559 100644
--- a/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/request_utils.test.ts
@@ -11,7 +11,7 @@ import {
   getDefaultAsyncGetParams,
   getIgnoreThrottled,
 } from './request_utils';
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import { UI_SETTINGS } from '../../../../common';
 import moment from 'moment';
 import { SearchSessionsConfigSchema } from '../../../../config';
diff --git a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
index 85f9f243ad2b1..ea850c80f90b3 100644
--- a/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/request_utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import { AsyncSearchGetRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { AsyncSearchSubmitRequest } from '@elastic/elasticsearch/lib/api/types';
 import { ISearchOptions, UI_SETTINGS } from '../../../../common';
diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts
index 2734a512e046b..ac676a4084a6a 100644
--- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts
+++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { KbnServerError } from '../../../../../kibana_utils/server';
+import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { errors } from '@elastic/elasticsearch';
 import * as indexNotFoundException from '../../../../common/search/test_data/index_not_found_exception.json';
 import { SearchStrategyDependencies } from '../../types';
diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
index 51ab35af3db0f..532062fa1c82d 100644
--- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-import type { IScopedClusterClient, Logger } from 'kibana/server';
+import type { IScopedClusterClient, Logger } from '@kbn/core/server';
 import { catchError, tap } from 'rxjs/operators';
 import { SqlGetAsyncRequest, SqlQueryRequest } from '@elastic/elasticsearch/lib/api/types';
+import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import type { ISearchStrategy, SearchStrategyDependencies } from '../../types';
 import type {
   IAsyncSearchOptions,
@@ -18,7 +19,6 @@ import type {
 import { pollSearch } from '../../../../common';
 import { getDefaultAsyncGetParams, getDefaultAsyncSubmitParams } from './request_utils';
 import { toAsyncKibanaSearchResponse } from './response_utils';
-import { getKbnServerError } from '../../../../../kibana_utils/server';
 
 export const sqlSearchStrategyProvider = (
   logger: Logger,
diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts
index 02372d149779f..ef6a2f5f88fe5 100644
--- a/src/plugins/data/server/search/types.ts
+++ b/src/plugins/data/server/search/types.ts
@@ -14,7 +14,7 @@ import type {
   SavedObjectsClientContract,
   KibanaRequest,
   RequestHandlerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   ISearchOptions,
   ISearchStartSearchSource,
diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts
index 4783223e49869..2238c43221b84 100644
--- a/src/plugins/data/server/ui_settings.ts
+++ b/src/plugins/data/server/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import type { DocLinksServiceSetup, UiSettingsParams } from 'kibana/server';
+import type { DocLinksServiceSetup, UiSettingsParams } from '@kbn/core/server';
 import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../common';
 
 const luceneQueryLanguageLabel = i18n.translate('data.advancedSettings.searchQueryLanguageLucene', {
diff --git a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
index deab9b8cf824f..9d21af4b2df09 100644
--- a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
+++ b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
@@ -10,7 +10,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import memoizeOne from 'memoize-one';
-import { DataViewField } from '../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 import {
   DataViewSpec,
diff --git a/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx b/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx
index dcc81770c02a0..0eba25613052a 100644
--- a/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx
+++ b/src/plugins/data_view_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx
@@ -26,7 +26,7 @@ import {
   EuiFlexGroup,
 } from '@elastic/eui';
 
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 export const EmptyIndexListPrompt = ({
   onRefresh,
diff --git a/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx
index ec5ba142df0d4..686decce9c655 100644
--- a/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx
+++ b/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.tsx
@@ -11,6 +11,7 @@ import useAsync from 'react-use/lib/useAsync';
 
 import { NoDataViewsComponent } from '@kbn/shared-ux-components';
 import { EuiFlyoutBody } from '@elastic/eui';
+import { DEFAULT_ASSETS_TO_IGNORE } from '@kbn/data-plugin/common';
 import { useKibana } from '../../shared_imports';
 
 import { MatchedItem, DataViewEditorContext } from '../../types';
@@ -19,7 +20,6 @@ import { getIndices } from '../../lib';
 
 import { EmptyIndexListPrompt } from './empty_index_list_prompt';
 import { PromptFooter } from './prompt_footer';
-import { DEFAULT_ASSETS_TO_IGNORE } from '../../../../data/common';
 
 const removeAliases = (mItem: MatchedItem) => !mItem.item.indices;
 
diff --git a/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx b/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx
index e2b5b51402060..dc10d06df0769 100644
--- a/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx
+++ b/src/plugins/data_view_editor/public/components/loading_indices/loading_indices.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { LoadingIndices } from '../loading_indices';
+import { LoadingIndices } from '.';
 import { shallow } from 'enzyme';
 
 describe('LoadingIndices', () => {
diff --git a/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx b/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx
index c26ff17b2d8f1..cad9f323f95ed 100644
--- a/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx
+++ b/src/plugins/data_view_editor/public/components/preview_panel/indices_list/indices_list.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { IndicesList } from '../indices_list';
+import { IndicesList } from '.';
 import { shallow } from 'enzyme';
 import { MatchedItem } from '../../../types';
 
diff --git a/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx b/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx
index c92a653c8c17d..858a00f025e9c 100644
--- a/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx
+++ b/src/plugins/data_view_editor/public/components/preview_panel/status_message/status_message.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { StatusMessage } from '../status_message';
+import { StatusMessage } from '.';
 import { shallow } from 'enzyme';
 import { MatchedItem } from '../../../types';
 
diff --git a/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts b/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts
index bc3e4209f5db7..5f23ac0591cec 100644
--- a/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts
+++ b/src/plugins/data_view_editor/public/lib/extract_time_fields.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { extractTimeFields } from './extract_time_fields';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 
 describe('extractTimeFields', () => {
   it('should handle no date fields', () => {
diff --git a/src/plugins/data_view_editor/public/lib/extract_time_fields.ts b/src/plugins/data_view_editor/public/lib/extract_time_fields.ts
index 82b94b5c6744a..bd6735cedb765 100644
--- a/src/plugins/data_view_editor/public/lib/extract_time_fields.ts
+++ b/src/plugins/data_view_editor/public/lib/extract_time_fields.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexPatternField } from '../../../../plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { TimestampOption } from '../types';
 
 export function extractTimeFields(
diff --git a/src/plugins/data_view_editor/public/lib/get_indices.test.ts b/src/plugins/data_view_editor/public/lib/get_indices.test.ts
index bc4e6b0896065..d4003e8bb4575 100644
--- a/src/plugins/data_view_editor/public/lib/get_indices.test.ts
+++ b/src/plugins/data_view_editor/public/lib/get_indices.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getIndices, responseToItemArray } from './get_indices';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { ResolveIndexResponseItemIndexAttrs } from '../types';
 
 export const successfulResolveResponse = {
diff --git a/src/plugins/data_view_editor/public/lib/get_indices.ts b/src/plugins/data_view_editor/public/lib/get_indices.ts
index 2bf97dd31e45e..0ddd75fa688be 100644
--- a/src/plugins/data_view_editor/public/lib/get_indices.ts
+++ b/src/plugins/data_view_editor/public/lib/get_indices.ts
@@ -7,13 +7,12 @@
  */
 
 import { sortBy } from 'lodash';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
+import { IEsSearchResponse } from '@kbn/data-plugin/public';
 import { Tag, INDEX_PATTERN_TYPE } from '../types';
 import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types';
 
-import { IEsSearchResponse } from '../../../data/public';
-
 const aliasLabel = i18n.translate('indexPatternEditor.aliasLabel', { defaultMessage: 'Alias' });
 const dataStreamLabel = i18n.translate('indexPatternEditor.dataStreamLabel', {
   defaultMessage: 'Data stream',
diff --git a/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts b/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts
index b584532c61b52..b1c80791a1343 100644
--- a/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts
+++ b/src/plugins/data_view_editor/public/lib/get_matched_indices.test.ts
@@ -9,7 +9,7 @@
 import { getMatchedIndices } from './get_matched_indices';
 import { Tag, MatchedItem } from '../types';
 
-jest.mock('./../constants', () => ({
+jest.mock('../constants', () => ({
   MAX_NUMBER_OF_MATCHING_INDICES: 6,
 }));
 
diff --git a/src/plugins/data_view_editor/public/open_editor.tsx b/src/plugins/data_view_editor/public/open_editor.tsx
index fcf0fad5a32b0..7fd5163edacc4 100644
--- a/src/plugins/data_view_editor/public/open_editor.tsx
+++ b/src/plugins/data_view_editor/public/open_editor.tsx
@@ -7,9 +7,9 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayRef } from 'src/core/public';
+import { CoreStart, OverlayRef } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 import {
   createKibanaReactContext,
diff --git a/src/plugins/data_view_editor/public/plugin.test.tsx b/src/plugins/data_view_editor/public/plugin.test.tsx
index f8735462fcff5..37e8002067613 100644
--- a/src/plugins/data_view_editor/public/plugin.test.tsx
+++ b/src/plugins/data_view_editor/public/plugin.test.tsx
@@ -7,8 +7,8 @@
  */
 import React from 'react';
 
-jest.mock('../../kibana_react/public', () => {
-  const original = jest.requireActual('../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
@@ -16,10 +16,10 @@ jest.mock('../../kibana_react/public', () => {
   };
 });
 
-import { CoreStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
-import { usageCollectionPluginMock } from '../../usage_collection/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import { DataViewEditorLazy } from './components/data_view_editor_lazy';
 import { DataViewEditorPlugin } from './plugin';
diff --git a/src/plugins/data_view_editor/public/plugin.tsx b/src/plugins/data_view_editor/public/plugin.tsx
index a8aa33620c456..b0186b838987b 100644
--- a/src/plugins/data_view_editor/public/plugin.tsx
+++ b/src/plugins/data_view_editor/public/plugin.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 import { PluginSetup, PluginStart, SetupPlugins, StartPlugins, DataViewEditorProps } from './types';
 import { getEditorOpener } from './open_editor';
diff --git a/src/plugins/data_view_editor/public/shared_imports.ts b/src/plugins/data_view_editor/public/shared_imports.ts
index dd9b8ea2a0e41..cc826dffdb6e5 100644
--- a/src/plugins/data_view_editor/public/shared_imports.ts
+++ b/src/plugins/data_view_editor/public/shared_imports.ts
@@ -10,17 +10,17 @@ export type {
   DataPublicPluginStart,
   GetFieldsOptions,
   IndexPatternAggRestrictions,
-} from '../../data/public';
-export { IndexPattern, IndexPatternField } from '../../data/public';
-export type { DataViewSpec } from '../../data_views/public';
-export { DataView } from '../../data_views/public';
+} from '@kbn/data-plugin/public';
+export { IndexPattern, IndexPatternField } from '@kbn/data-plugin/public';
+export type { DataViewSpec } from '@kbn/data-views-plugin/public';
+export { DataView } from '@kbn/data-views-plugin/public';
 
 export {
   createKibanaReactContext,
   toMountPoint,
   CodeEditor,
   useKibana,
-} from '../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
 export type {
   FormSchema,
@@ -29,7 +29,7 @@ export type {
   FieldConfig,
   ValidationConfig,
   ValidationFuncArg,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   useForm,
   useFormData,
@@ -37,9 +37,9 @@ export {
   Form,
   UseField,
   getFieldValidityAndErrorMessage,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   TextField,
@@ -48,6 +48,6 @@ export {
   SelectField,
   FormRow,
   SuperSelectField,
-} from '../../es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export type { HttpStart } from '../../../core/public';
+export type { HttpStart } from '@kbn/core/public';
diff --git a/src/plugins/data_view_editor/public/test_utils/mocks.ts b/src/plugins/data_view_editor/public/test_utils/mocks.ts
index 5d0296a04ea51..bfd5b296e5421 100644
--- a/src/plugins/data_view_editor/public/test_utils/mocks.ts
+++ b/src/plugins/data_view_editor/public/test_utils/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const noop = () => {};
 
diff --git a/src/plugins/data_view_editor/public/types.ts b/src/plugins/data_view_editor/public/types.ts
index ed0b19f6e529a..fe6928ee73734 100644
--- a/src/plugins/data_view_editor/public/types.ts
+++ b/src/plugins/data_view_editor/public/types.ts
@@ -13,11 +13,11 @@ import {
   NotificationsStart,
   DocLinksStart,
   HttpSetup,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 
-import type { DataView, DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
+import type { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DataPublicPluginStart, IndexPatternAggRestrictions } from './shared_imports';
 
 export interface DataViewEditorContext {
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts
index 4c7a5832f037c..83b9f65a09ef5 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/http_requests.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 type HttpResponse = Record<string, any> | any[];
 
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
index 7161776c21fb1..7c626c6550f99 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
@@ -75,8 +75,8 @@ jest.mock('react-use/lib/useDebounce', () => {
   };
 });
 
-jest.mock('../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   /**
    * We mock the CodeEditor because it requires the <KibanaReactContextProvider>
diff --git a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
index 02d4f713871a3..438c358ae9bb5 100644
--- a/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/src/plugins/data_view_field_editor/__jest__/client_integration/helpers/setup_environment.tsx
@@ -12,14 +12,15 @@ import './jest.mocks';
 import React, { FunctionComponent } from 'react';
 import { merge } from 'lodash';
 
-import { notificationServiceMock, uiSettingsServiceMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { defer } from 'rxjs';
+import { notificationServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fieldFormatsMock as fieldFormats } from '@kbn/field-formats-plugin/common/mocks';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { FieldEditorProvider, Context } from '../../../public/components/field_editor_context';
 import { FieldPreviewProvider } from '../../../public/components/preview';
 import { initApi, ApiService } from '../../../public/lib';
 import { init as initHttpRequests } from './http_requests';
-import { fieldFormatsMock as fieldFormats } from '../../../../field_formats/common/mocks';
-import { FieldFormat } from '../../../../field_formats/common';
 
 const dataStart = dataPluginMock.createStartContract();
 const { search } = dataStart;
@@ -36,22 +37,20 @@ export const setSearchResponseLatency = (ms: number) => {
 };
 
 spySearchQuery.mockImplementation(() => {
-  return {
-    toPromise: () => {
-      if (searchResponseDelay === 0) {
-        // no delay, it is synchronous
-        return spySearchQueryResponse();
-      }
-
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(undefined);
-        }, searchResponseDelay);
-      }).then(() => {
-        return spySearchQueryResponse();
-      });
-    },
-  };
+  return defer(() => {
+    if (searchResponseDelay === 0) {
+      // no delay, it is synchronous
+      return spySearchQueryResponse();
+    }
+
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(undefined);
+      }, searchResponseDelay);
+    }).then(() => {
+      return spySearchQueryResponse();
+    });
+  });
 });
 search.search = spySearchQuery;
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx b/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
index c5eaeb02c05cf..a7cd508401c6c 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
@@ -7,13 +7,12 @@
  */
 
 import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';
-import { first } from 'rxjs/operators';
+import { first, firstValueFrom } from 'rxjs';
 import type { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFormRow, EuiLink, EuiCode } from '@elastic/eui';
 import { PainlessLang, PainlessContext, monaco } from '@kbn/monaco';
-import { firstValueFrom } from '@kbn/std';
 
 import {
   UseField,
diff --git a/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx b/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx
index 4bee00f3c4b2a..6cadc094bb35f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor_context.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { createContext, useContext, FunctionComponent, useMemo } from 'react';
-import { NotificationsStart, CoreStart } from 'src/core/public';
+import { NotificationsStart, CoreStart } from '@kbn/core/public';
 import { FieldFormatsStart } from '../shared_imports';
 import type { DataView, DataPublicPluginStart } from '../shared_imports';
 import { ApiService } from '../lib/api';
diff --git a/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx b/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx
index bd4f62b2c55f3..f2bb91f18c6dd 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor_flyout_content_container.tsx
@@ -7,11 +7,11 @@
  */
 
 import React, { useCallback, useState, useMemo } from 'react';
-import { DocLinksStart, NotificationsStart, CoreStart } from 'src/core/public';
+import { DocLinksStart, NotificationsStart, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import {
   DataViewField,
   DataView,
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx
index afca37bd6f214..d97f9cbb02356 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/bytes/bytes.test.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { BytesFormatEditor } from './bytes';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx
index 750cf8378f334..513a0c2d97c00 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 
 import { ColorFormatEditor } from './color';
-import { FieldFormat, DEFAULT_CONVERTER_COLOR } from '../../../../../../field_formats/common';
+import { FieldFormat, DEFAULT_CONVERTER_COLOR } from '@kbn/field-formats-plugin/common';
 
 const fieldType = 'string';
 const format = {
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx
index 77c357134399b..8418f24bd443f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/color/color.tsx
@@ -12,10 +12,10 @@ import { EuiBasicTable, EuiButton, EuiColorPicker, EuiFieldText, EuiSpacer } fro
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DEFAULT_CONVERTER_COLOR } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor } from '../default/default';
 import { formatId } from './constants';
 
-import { DEFAULT_CONVERTER_COLOR } from '../../../../../../field_formats/common';
 import { FormatEditorProps } from '../types';
 
 interface Color {
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx
index dfe51a36685dc..98d73157c63b1 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date/date.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { DateFormatEditor } from './date';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx
index ba8035541e0f2..4b9cc75c6701f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/date_nanos/date_nanos.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { DateNanosFormatEditor } from './date_nanos';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx
index 388d51ca8ac25..3130accfa427f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { SampleInput } from '../../types';
 import { DefaultFormatEditor, convertSampleInput } from './default';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx
index fcf73f397b3fe..a3a71becb3ef3 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/default/default.tsx
@@ -9,7 +9,7 @@
 import React, { PureComponent, ReactText } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { FieldFormatsContentType } from 'src/plugins/field_formats/common';
+import type { FieldFormatsContentType } from '@kbn/field-formats-plugin/common';
 import type { Sample, SampleInput } from '../../types';
 import type { FormatEditorProps } from '../types';
 import { formatId } from './constants';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
index c2cf5200d1887..31e47f9a7889c 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { DurationFormatEditor } from './duration';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { EuiSwitch } from '@elastic/eui';
 
 const fieldType = 'number';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
index 5ed464dd7bc31..e18c9664cacab 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { Fragment } from 'react';
-import { DurationFormat } from 'src/plugins/field_formats/common';
+import { DurationFormat } from '@kbn/field-formats-plugin/common';
 
 import { EuiFieldNumber, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx
index d21d1eb766f1d..a9460b7e045ca 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/geo_point/geo_point.tsx
@@ -11,11 +11,11 @@ import React, { Fragment } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { GeoPointFormat } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor, defaultState } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
-import { GeoPointFormat } from '../../../../../../field_formats/common';
 
 interface GeoPointFormatEditorFormatParams {
   transform: string;
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx
index d16a33f52ea11..ae25602ec1ed8 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/histogram/histogram.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { HistogramFormatEditor } from './histogram';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx
index 3f80b101f3970..c54d29f41e88c 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.test.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { NumberFormatEditor } from './number';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx
index dfbd43f99142c..65793583d8bf3 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/number/number.tsx
@@ -11,13 +11,12 @@ import React, { Fragment } from 'react';
 import { EuiCode, EuiFieldText, EuiFormRow, EuiIcon, EuiLink } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { context as contextType } from '@kbn/kibana-react-plugin/public';
 import { DefaultFormatEditor, defaultState } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
 
-import { context as contextType } from '../../../../../../kibana_react/public';
-
 export interface NumberFormatEditorParams {
   pattern: string;
 }
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx
index bd4daecadd907..535b55cf64549 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/percent/percent.test.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { PercentFormatEditor } from './percent';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx
index 9f2bd59d7ceb4..369b2eb972f7d 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/static_lookup/static_lookup.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
 import { StaticLookupFormatEditorFormatParams } from './static_lookup';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { StaticLookupFormatEditor } from './static_lookup';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx
index 2b7ae5e6f270f..8cebd1ebea1d4 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { StringFormatEditor } from './string';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx
index b3138cf6c3198..21e48130a73d9 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/string/string.tsx
@@ -11,11 +11,11 @@ import React, { Fragment } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { StringFormat } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor, defaultState } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
-import { StringFormat } from '../../../../../../field_formats/common';
 
 interface StringFormatEditorFormatParams {
   transform: string;
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx
index 0a5154e783546..fb45c15527f04 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/truncate/truncate.test.tsx
@@ -9,7 +9,7 @@
 import React, { ChangeEvent } from 'react';
 import { shallow } from 'enzyme';
 import { EuiFieldNumber } from '@elastic/eui';
-import { FieldFormat } from 'src/plugins/field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { TruncateFormatEditor } from './truncate';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts
index cbdd8efb2a4c8..ceb18914ebfc0 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { ComponentType } from 'react';
-import type { FieldFormat } from '../../../../../field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { FormatSelectEditorProps } from '../field_format_editor';
 
 /**
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index c37e1d28dab4c..a90cf78b4f46f 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -29,7 +29,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
           class="euiFormControlLayout__childrenWrapper"
         >
           <select
-            class="euiSelect"
+            class="euiSelect euiFormControlLayout--1icons"
             data-test-subj="urlEditorType"
             id="generated-id"
           >
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
index 357ac257c2611..8993e2a3185ce 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
@@ -7,11 +7,11 @@
  */
 
 import React from 'react';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { UrlFormatEditor } from './url';
-import { coreMock } from 'src/core/public/mocks';
-import { createKibanaReactContext } from '../../../../../../kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx
index 03c400a0a3595..d7f76e07ef447 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/editors/url/url.tsx
@@ -18,14 +18,14 @@ import {
 } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { context as contextType } from '@kbn/kibana-react-plugin/public';
+import { UrlFormat } from '@kbn/field-formats-plugin/common';
 import { DefaultFormatEditor } from '../default/default';
 
 import { FormatEditorSamples } from '../../samples';
 import { formatId } from './constants';
 
-import { context as contextType } from '../../../../../../kibana_react/public';
 import { FormatEditorProps } from '../types';
-import { UrlFormat } from '../../../../../../field_formats/common';
 
 interface OnChangeParam {
   type: string;
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx
index e921d0beafce1..2cef6a93a1266 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/field_format_editor.tsx
@@ -11,12 +11,12 @@ import { EuiCode, EuiFormRow, EuiSelect } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from 'src/plugins/data/public';
-import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
-import { CoreStart } from 'src/core/public';
+import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import type { FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
+import { CoreStart } from '@kbn/core/public';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { DataView } from 'src/plugins/data_views/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FormatEditor } from './format_editor';
 import { FormatEditorServiceStart } from '../../service';
 import { FieldFormatConfig } from '../../types';
diff --git a/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx b/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx
index c6f5fc9899ac7..2fcaa3420848a 100644
--- a/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_format_editor/format_editor.tsx
@@ -9,7 +9,7 @@
 import { EuiDelayRender, EuiLoadingContent } from '@elastic/eui';
 import { memoize } from 'lodash';
 import React, { PureComponent, LazyExoticComponent } from 'react';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { FieldFormatEditorFactory, FieldFormatEditor } from './editors';
 
 export interface FormatEditorProps {
diff --git a/src/plugins/data_view_field_editor/public/lib/api.ts b/src/plugins/data_view_field_editor/public/lib/api.ts
index 594cd07ecb70e..67233db393cb8 100644
--- a/src/plugins/data_view_field_editor/public/lib/api.ts
+++ b/src/plugins/data_view_field_editor/public/lib/api.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../common/constants';
 import { sendRequest } from '../shared_imports';
 import { PainlessExecuteContext, FieldPreviewResponse } from '../components/preview';
diff --git a/src/plugins/data_view_field_editor/public/lib/documentation.ts b/src/plugins/data_view_field_editor/public/lib/documentation.ts
index a18a75f63d6b8..81e0709b696bf 100644
--- a/src/plugins/data_view_field_editor/public/lib/documentation.ts
+++ b/src/plugins/data_view_field_editor/public/lib/documentation.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const getLinks = ({ links }: DocLinksStart) => {
   return {
diff --git a/src/plugins/data_view_field_editor/public/lib/remove_fields.ts b/src/plugins/data_view_field_editor/public/lib/remove_fields.ts
index abae8de69dcb6..ac4e336b8a4e7 100644
--- a/src/plugins/data_view_field_editor/public/lib/remove_fields.ts
+++ b/src/plugins/data_view_field_editor/public/lib/remove_fields.ts
@@ -8,10 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { NotificationsStart } from 'src/core/public';
+import { NotificationsStart } from '@kbn/core/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DataView, UsageCollectionStart } from '../shared_imports';
 import { pluginName } from '../constants';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
 
 export async function removeFields(
   fieldNames: string[],
diff --git a/src/plugins/data_view_field_editor/public/open_delete_modal.tsx b/src/plugins/data_view_field_editor/public/open_delete_modal.tsx
index f44367d16d08d..2703653138fe0 100644
--- a/src/plugins/data_view_field_editor/public/open_delete_modal.tsx
+++ b/src/plugins/data_view_field_editor/public/open_delete_modal.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayRef } from 'src/core/public';
+import { CoreStart, OverlayRef } from '@kbn/core/public';
 
 import {
   toMountPoint,
diff --git a/src/plugins/data_view_field_editor/public/open_editor.tsx b/src/plugins/data_view_field_editor/public/open_editor.tsx
index d3a91739dc94a..f6355b0e70e0e 100644
--- a/src/plugins/data_view_field_editor/public/open_editor.tsx
+++ b/src/plugins/data_view_field_editor/public/open_editor.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { CoreStart, OverlayRef } from 'src/core/public';
+import { CoreStart, OverlayRef } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
 import {
diff --git a/src/plugins/data_view_field_editor/public/plugin.test.tsx b/src/plugins/data_view_field_editor/public/plugin.test.tsx
index eba7d19a5a0d0..1fc63cf945663 100644
--- a/src/plugins/data_view_field_editor/public/plugin.test.tsx
+++ b/src/plugins/data_view_field_editor/public/plugin.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { registerTestBed } from '@kbn/test-jest-helpers';
 
-jest.mock('../../kibana_react/public', () => {
-  const original = jest.requireActual('../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
@@ -17,11 +17,11 @@ jest.mock('../../kibana_react/public', () => {
   };
 });
 
-import { CoreStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
-import { fieldFormatsServiceMock } from '../../field_formats/public/mocks';
-import { usageCollectionPluginMock } from '../../usage_collection/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import { FieldEditorLoader } from './components/field_editor_loader';
 import { IndexPatternFieldEditorPlugin } from './plugin';
diff --git a/src/plugins/data_view_field_editor/public/plugin.ts b/src/plugins/data_view_field_editor/public/plugin.ts
index 3b13bcd82c110..fe5b5d8390765 100644
--- a/src/plugins/data_view_field_editor/public/plugin.ts
+++ b/src/plugins/data_view_field_editor/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 import type { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types';
 import { getFieldEditorOpener } from './open_editor';
diff --git a/src/plugins/data_view_field_editor/public/shared_imports.ts b/src/plugins/data_view_field_editor/public/shared_imports.ts
index c8332a2afe76d..f51b8f030e724 100644
--- a/src/plugins/data_view_field_editor/public/shared_imports.ts
+++ b/src/plugins/data_view_field_editor/public/shared_imports.ts
@@ -6,19 +6,27 @@
  * Side Public License, v 1.
  */
 
-export type { DataPublicPluginStart } from '../../data/public';
+export type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-export type { DataViewsPublicPluginStart, DataView, DataViewField } from '../../data_views/public';
-export type { FieldFormatsStart } from '../../field_formats/public';
+export type {
+  DataViewsPublicPluginStart,
+  DataView,
+  DataViewField,
+} from '@kbn/data-views-plugin/public';
+export type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 
-export type { UsageCollectionStart } from '../../usage_collection/public';
+export type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 
-export type { RuntimeType, RuntimeField } from '../../data/common';
-export { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '../../data/common';
+export type { RuntimeType, RuntimeField } from '@kbn/data-plugin/common';
+export { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
-export { createKibanaReactContext, toMountPoint, CodeEditor } from '../../kibana_react/public';
+export {
+  createKibanaReactContext,
+  toMountPoint,
+  CodeEditor,
+} from '@kbn/kibana-react-plugin/public';
 
-export { FieldFormat } from '../../field_formats/common';
+export { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 export type {
   FormSchema,
@@ -26,7 +34,7 @@ export type {
   ValidationFunc,
   FieldConfig,
   ValidationCancelablePromise,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   useForm,
@@ -36,10 +44,14 @@ export {
   Form,
   UseField,
   useBehaviorSubject,
-} from '../../es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export { TextField, ToggleField, NumericField } from '../../es_ui_shared/static/forms/components';
+export {
+  TextField,
+  ToggleField,
+  NumericField,
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { sendRequest } from '../../es_ui_shared/public';
+export { sendRequest } from '@kbn/es-ui-shared-plugin/public';
diff --git a/src/plugins/data_view_field_editor/server/index.ts b/src/plugins/data_view_field_editor/server/index.ts
index dc6f734a7e503..38ae28ebe9892 100644
--- a/src/plugins/data_view_field_editor/server/index.ts
+++ b/src/plugins/data_view_field_editor/server/index.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IndexPatternPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/data_view_field_editor/server/plugin.ts b/src/plugins/data_view_field_editor/server/plugin.ts
index 18601aad85307..c5bbe9bab7572 100644
--- a/src/plugins/data_view_field_editor/server/plugin.ts
+++ b/src/plugins/data_view_field_editor/server/plugin.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { PluginInitializerContext, CoreSetup, Plugin, Logger } from 'kibana/server';
+import { PluginInitializerContext, CoreSetup, Plugin, Logger } from '@kbn/core/server';
 
 import { ApiRoutes } from './routes';
 
diff --git a/src/plugins/data_view_field_editor/server/shared_imports.ts b/src/plugins/data_view_field_editor/server/shared_imports.ts
index d818f11ceefda..f709280aa013b 100644
--- a/src/plugins/data_view_field_editor/server/shared_imports.ts
+++ b/src/plugins/data_view_field_editor/server/shared_imports.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { handleEsError } from '../../es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/src/plugins/data_view_field_editor/server/types.ts b/src/plugins/data_view_field_editor/server/types.ts
index c86708c12a71e..7868ca4c88650 100644
--- a/src/plugins/data_view_field_editor/server/types.ts
+++ b/src/plugins/data_view_field_editor/server/types.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export interface RouteDependencies {
   router: IRouter;
diff --git a/src/plugins/data_view_management/public/components/breadcrumbs.ts b/src/plugins/data_view_management/public/components/breadcrumbs.ts
index 244bce41f8fd4..6815a772b2648 100644
--- a/src/plugins/data_view_management/public/components/breadcrumbs.ts
+++ b/src/plugins/data_view_management/public/components/breadcrumbs.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export function getListBreadcrumbs() {
   return [
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
index 2d8469975430b..c7b5134bc30f9 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx
@@ -11,8 +11,8 @@ import { RouteComponentProps, withRouter } from 'react-router-dom';
 
 import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataView, DataViewField } from '../../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { IndexHeader } from '../index_header';
 import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS } from '../constants';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx
index f9cb95f67eabc..11e14d067012b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/create_edit_field/create_edit_field_container.tsx
@@ -9,9 +9,9 @@
 import React, { useEffect, useState } from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
-import type { DataView } from '../../../../../../plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { getEditFieldBreadcrumbs, getCreateFieldBreadcrumbs } from '../../breadcrumbs';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { CreateEditField } from './create_edit_field';
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index 6a7663d9d2f01..ca6f34ffcb8de 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -20,8 +20,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView, DataViewField } from '../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../plugins/kibana_react/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../types';
 import { Tabs } from './tabs';
 import { IndexHeader } from './index_header';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx
index 61de32b1dd20f..03fa92c435247 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_container.tsx
@@ -8,12 +8,12 @@
 
 import React, { useEffect, useState } from 'react';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { DataView } from '../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../plugins/kibana_react/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../types';
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
-import { EditIndexPattern } from '../edit_index_pattern';
+import { EditIndexPattern } from '.';
 
 const EditIndexPatternCont: React.FC<RouteComponentProps<{ id: string }>> = ({ ...props }) => {
   const { dataViews, setBreadcrumbs } = useKibana<IndexPatternManagmentContext>().services;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts
index 82724a96de834..6252ea3ae6ad8 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/edit_index_pattern_state_container.ts
@@ -11,7 +11,7 @@ import {
   createStateContainer,
   syncState,
   createKbnUrlStateStorage,
-} from '../../../../../plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
 interface IEditIndexPatternState {
   tab: string;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
index e40ef6a7ddf2f..ed2029b854972 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/index_header/index_header.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonIcon, EuiPageHeader, EuiToolTip } from '@elastic/eui';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 interface IndexHeaderProps {
   indexPattern: DataView;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
index 44385c7b6e41d..6da5b8ffd2e61 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { IndexedFieldItem } from '../../types';
 import { Table, renderFieldName, getConflictModalContent, showDelete } from './table';
-import { overlayServiceMock, themeServiceMock } from 'src/core/public/mocks';
+import { overlayServiceMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 const theme = themeServiceMock.createStartContract();
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
index f8ce07b11d3e8..1646ec0f24ed5 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { PureComponent } from 'react';
-import { OverlayModalStart, ThemeServiceStart } from 'src/core/public';
+import { OverlayModalStart, ThemeServiceStart } from '@kbn/core/public';
 
 import {
   EuiIcon,
@@ -28,9 +28,9 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { toMountPoint } from '../../../../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { DataView } from '../../../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { IndexedFieldItem } from '../../types';
 
 export const showDelete = (field: IndexedFieldItem) =>
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
index ff03bd404b6c4..4cc5792ce756b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
-import { DataViewField, DataView, DataViewType } from 'src/plugins/data_views/public';
+import { DataViewField, DataView, DataViewType } from '@kbn/data-views-plugin/public';
 import { IndexedFieldsTable } from './indexed_fields_table';
 import { getFieldInfo } from '../../utils';
-import { RuntimeField } from 'src/plugins/data_views/common';
+import { RuntimeField } from '@kbn/data-views-plugin/common';
 
 jest.mock('@elastic/eui', () => ({
   EuiFlexGroup: 'eui-flex-group',
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
index ad85499009db0..d26b0726d7814 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -8,8 +8,8 @@
 
 import React, { Component } from 'react';
 import { createSelector } from 'reselect';
-import { OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { DataViewField, DataView } from '../../../../../../plugins/data_views/public';
+import { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import { Table } from './components/table';
 import { IndexedFieldItem } from './types';
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts
index 1467c7579eba7..38c9e847a71ca 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/indexed_fields_table/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { DataViewFieldBase } from '@kbn/es-query';
-import { DataViewField } from '../../../../../../plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 type IndexedFieldItemBase = Partial<DataViewField> & DataViewFieldBase;
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx
index 9db99e0428463..3e29f39e3334d 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/remove_data_view.tsx
@@ -7,11 +7,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { IUiSettingsClient, OverlayStart } from 'src/core/public';
+import type { IUiSettingsClient, OverlayStart } from '@kbn/core/public';
 import { asyncForEach } from '@kbn/std';
 import { EuiConfirmModalProps } from '@elastic/eui';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
-import { DataViewsPublicPluginStart } from '../../../../../plugins/data_views/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 const confirmModalOptionsDelete = {
   confirmButtonText: i18n.translate('indexPatternManagement.editIndexPattern.deleteButton', {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx
index 80809d3a57168..534572b3dad66 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { CallOuts } from '../call_outs';
+import { CallOuts } from '.';
 
 describe('CallOuts', () => {
   test('should render normally', () => {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx
index 99ffb4ada6369..d579a83c8ee72 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { RouteComponentProps } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
-import { scopedHistoryMock } from '../../../../../../../../core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { ScopedHistory } from '@kbn/core/public';
+import { scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { mockManagementPlugin } from '../../../../../mocks';
 
 import { Header } from './header';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
index 651f0c5757f12..dd4a4e6d71dbb 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx
@@ -11,9 +11,9 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiText, EuiLink, EuiIcon } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
-import { reactRouterNavigate, useKibana } from '../../../../../../../kibana_react/public';
+import { reactRouterNavigate, useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../../../types';
 
 interface HeaderProps extends RouteComponentProps {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
index c37399e1d02a9..dddb52784f68c 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Table } from '../table';
+import { Table } from '.';
 import { ScriptedFieldItem } from '../../types';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 const getIndexPatternMock = (mockedFields: any = {}) => ({ ...mockedFields } as DataView);
 
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx
index 1e2226ac4ab38..89407e29e5cd1 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx
@@ -11,8 +11,8 @@ import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiInMemoryTable, EuiBasicTableColumn } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ScriptedFieldItem } from '../../types';
-import { DataView } from '../../../../../../../data_views/public';
 
 interface TableProps {
   indexPattern: DataView;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
index 4febfdf0e1219..54b4a49f0ead8 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 
-import { ScriptedFieldsTable } from '../scripted_fields_table';
-import { DataView } from '../../../../../../plugins/data_views/public';
+import { ScriptedFieldsTable } from '.';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 jest.mock('@elastic/eui', () => ({
   EuiTitle: 'eui-title',
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
index 540131c50b236..2e0822417d41b 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
@@ -8,6 +8,7 @@
 
 import React, { Component } from 'react';
 import { EuiSpacer } from '@elastic/eui';
+import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import {
   getSupportedScriptingLanguages,
   getDeprecatedScriptingLanguages,
@@ -16,8 +17,6 @@ import {
 import { Table, Header, CallOuts, DeleteScritpedFieldConfirmationModal } from './components';
 import { ScriptedFieldItem } from './types';
 
-import { DataView, DataViewsPublicPluginStart } from '../../../../../../plugins/data_views/public';
-
 interface ScriptedFieldsTableProps {
   indexPattern: DataView;
   fieldFilter?: string;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx
index 19a0f236a8248..fe9f850dc239a 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/header/header.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { Header } from '../header';
+import { Header } from '.';
 
 describe('Header', () => {
   test('should render normally', () => {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
index f9c7f41030837..2c082ced0f1f8 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
@@ -11,7 +11,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { Table, TableProps, TableState } from './table';
 import { EuiTableFieldDataColumnType, keys } from '@elastic/eui';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SourceFiltersTableFilter } from '../../types';
 
 const indexPattern = {} as DataView;
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
index 144f6d19599bd..6030f653f9562 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
@@ -19,7 +19,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SourceFiltersTableFilter } from '../../types';
 
 const filterHeader = i18n.translate(
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx
index 13d1bd72c96ef..0f04c82419dac 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { SourceFiltersTable } from './source_filters_table';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 jest.mock('@elastic/eui', () => ({
   EuiButton: 'eui-button',
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
index 80451e95fb5ed..3d3d167f732da 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/source_filters_table/source_filters_table.tsx
@@ -10,8 +10,8 @@ import React, { Component } from 'react';
 import { createSelector } from 'reselect';
 
 import { EuiSpacer } from '@elastic/eui';
+import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { AddFilter, Table, Header, DeleteFilterConfirmationModal } from './components';
-import { DataView, DataViewsPublicPluginStart } from '../../../../../../plugins/data_views/public';
 import { SourceFiltersTableFilter } from './types';
 
 export interface SourceFiltersTableProps {
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
index 762d30685ba38..a50e1062f447f 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -23,14 +23,14 @@ import {
   FilterChecked,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { fieldWildcardMatcher } from '../../../../../kibana_utils/public';
+import { fieldWildcardMatcher } from '@kbn/kibana-utils-plugin/public';
 import {
   DataView,
   DataViewField,
   DataViewsPublicPluginStart,
   META_FIELDS,
-} from '../../../../../../plugins/data_views/public';
-import { useKibana } from '../../../../../../plugins/kibana_react/public';
+} from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../types';
 import { createEditIndexPatternPageStateContainer } from '../edit_index_pattern_state_container';
 import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants';
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts
index 738f62f647ac2..1c1dd544ad7a9 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getPath } from './utils';
-import { DataViewField, DataView } from '../../../../../data_views/public';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 
 test('getPath() should encode "fieldName"', () => {
   expect(
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts
index e82722b1a5127..6b29057926a64 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/utils.ts
@@ -8,7 +8,7 @@
 
 import { Dictionary, countBy, defaults, uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { DataView, DataViewField } from '../../../../../../plugins/data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants';
 import { areScriptedFieldsEnabled } from '../../utils';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx
index 1a06fdf425500..89be237adac58 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.test.tsx
@@ -10,7 +10,7 @@ import React, { PureComponent } from 'react';
 import { shallow } from 'enzyme';
 
 import { FieldFormatEditor } from './field_format_editor';
-import type { FieldFormat } from '../../../../../../field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 class TestEditor extends PureComponent {
   render() {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx
index 3cddad8dc3e76..0b0018629f02d 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/field_format_editor/field_format_editor.tsx
@@ -12,8 +12,8 @@ import { EuiDelayRender, EuiLoadingContent } from '@elastic/eui';
 import type {
   FieldFormatEditorFactory,
   FieldFormatEditor as InnerFieldFormatEditor,
-} from 'src/plugins/data_view_field_editor/public';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+} from '@kbn/data-view-field-editor-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 export interface FieldFormatEditorProps {
   fieldType: string;
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx
index a295f82e53afb..1233bb853f3a0 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { mockManagementPlugin } from '../../../../mocks';
 import { ScriptingWarningCallOut } from './warning_call_out';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx
index 875354de10e0f..59d40961ac218 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx
@@ -12,7 +12,7 @@ import { EuiCallOut, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../../types';
 
 export interface ScriptingWarningCallOutProps {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx
index 949032e57b71a..78993cf342d4d 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ScriptingHelpFlyout } from './help_flyout';
 
-import { DataView } from '../../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 import { ExecuteScript } from '../../types';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx
index 74bbb90a3d898..19e556d8d3349 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/help_flyout.tsx
@@ -9,11 +9,11 @@
 import React from 'react';
 import { EuiFlyout, EuiFlyoutBody, EuiTabbedContent } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ScriptingSyntax } from './scripting_syntax';
 import { TestScript } from './test_script';
 
 import { ExecuteScript } from '../../types';
-import { DataView } from '../../../../../../data_views/public';
 
 interface ScriptingHelpFlyoutProps {
   indexPattern: DataView;
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx
index fe327bc0e0003..7f2d0e3e33360 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/scripting_syntax.tsx
@@ -10,7 +10,7 @@ import React, { Fragment } from 'react';
 import { EuiCode, EuiIcon, EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContext } from '../../../../types';
 
 export const ScriptingSyntax = () => {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
index 4b5609cf1970a..52bf882331698 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
@@ -25,9 +25,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
 import { Query, buildEsQuery } from '@kbn/es-query';
-import { getEsQueryConfig } from '../../../../../../../plugins/data/public';
-import { DataView } from '../../../../../../../plugins/data_views/public';
-import { context as contextType } from '../../../../../../kibana_react/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { context as contextType } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternManagmentContextValue } from '../../../../types';
 import { ExecuteScript } from '../../types';
 
diff --git a/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx b/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx
index 875b21ac52444..89f41e8b269ad 100644
--- a/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField, DataViewsContract } from 'src/plugins/data_views/public';
-import { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
+import { DataView, DataViewField, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { FieldEditor, FieldEdiorProps } from './field_editor';
@@ -39,8 +39,8 @@ jest.mock('@elastic/eui', () => ({
   euiPaletteColorBlind: () => ['red'],
 }));
 
-jest.mock('../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx b/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx
index 4455b554eb053..c9e74ba05448f 100644
--- a/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/field_editor.tsx
@@ -33,20 +33,16 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { PainlessLang } from '@kbn/monaco';
-import type { FieldFormatInstanceType } from 'src/plugins/field_formats/common';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { KBN_FIELD_TYPES, ES_FIELD_TYPES } from '@kbn/field-types';
+import { DataView, DataViewField, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { context as contextType, CodeEditor } from '@kbn/kibana-react-plugin/public';
 import {
   getEnabledScriptingLanguages,
   getDeprecatedScriptingLanguages,
   getSupportedScriptingLanguages,
 } from '../../scripting_languages';
-import {
-  DataView,
-  DataViewField,
-  DataViewsPublicPluginStart,
-} from '../../../../../plugins/data_views/public';
-import { context as contextType, CodeEditor } from '../../../../kibana_react/public';
 import {
   ScriptingDisabledCallOut,
   ScriptingWarningCallOut,
diff --git a/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts b/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts
index 5bff350b332a0..655e8d9653efd 100644
--- a/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts
+++ b/src/plugins/data_view_management/public/components/field_editor/lib/validate_script.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExecuteScriptParams, ExecuteScriptResult } from '../types';
 
 export const executeScript = async ({
diff --git a/src/plugins/data_view_management/public/components/field_editor/types.ts b/src/plugins/data_view_management/public/components/field_editor/types.ts
index e134b67d8ab72..440833fa04809 100644
--- a/src/plugins/data_view_management/public/components/field_editor/types.ts
+++ b/src/plugins/data_view_management/public/components/field_editor/types.ts
@@ -8,7 +8,7 @@
 
 import { ReactText } from 'react';
 import { Query } from '@kbn/es-query';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 export type SampleInput = ReactText | ReactText[] | Record<string, ReactText | ReactText[]>;
 export interface Sample {
diff --git a/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx
index 578a0b198bbe8..bff6ea4b82777 100644
--- a/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx
+++ b/src/plugins/data_view_management/public/components/index_pattern_table/index_pattern_table.tsx
@@ -19,13 +19,13 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { RouteComponentProps, withRouter, useLocation } from 'react-router-dom';
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { reactRouterNavigate, useKibana } from '../../../../../plugins/kibana_react/public';
+import { reactRouterNavigate, useKibana } from '@kbn/kibana-react-plugin/public';
+import type { SpacesContextProps } from '@kbn/spaces-plugin/public';
 import { IndexPatternManagmentContext } from '../../types';
 import { IndexPatternTableItem } from '../types';
 import { getIndexPatterns } from '../utils';
 import { getListBreadcrumbs } from '../breadcrumbs';
 import { SpacesList } from './spaces_list';
-import type { SpacesContextProps } from '../../../../../../x-pack/plugins/spaces/public';
 import { removeDataView, RemoveDataViewProps } from '../edit_index_pattern';
 import { deleteModalMsg } from './delete_modal_msg';
 
diff --git a/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx b/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx
index fe616cf5abd64..b5ced1c8af9b5 100644
--- a/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx
+++ b/src/plugins/data_view_management/public/components/index_pattern_table/spaces_list.tsx
@@ -9,12 +9,9 @@
 import React, { FC, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
-import type { Capabilities } from 'src/core/public';
-import type {
-  SpacesPluginStart,
-  ShareToSpaceFlyoutProps,
-} from '../../../../../../x-pack/plugins/spaces/public';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/public';
+import type { Capabilities } from '@kbn/core/public';
+import type { SpacesPluginStart, ShareToSpaceFlyoutProps } from '@kbn/spaces-plugin/public';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/public';
 
 interface Props {
   spacesApi: SpacesPluginStart;
diff --git a/src/plugins/data_view_management/public/components/utils.test.ts b/src/plugins/data_view_management/public/components/utils.test.ts
index cb318b79e223d..ef08442a31d9f 100644
--- a/src/plugins/data_view_management/public/components/utils.test.ts
+++ b/src/plugins/data_view_management/public/components/utils.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataViewsContract } from 'src/plugins/data_views/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { getIndexPatterns } from './utils';
 
 const indexPatternContractMock = {
diff --git a/src/plugins/data_view_management/public/components/utils.ts b/src/plugins/data_view_management/public/components/utils.ts
index 1fccc8c694e31..23b076ab05f5a 100644
--- a/src/plugins/data_view_management/public/components/utils.ts
+++ b/src/plugins/data_view_management/public/components/utils.ts
@@ -11,7 +11,7 @@ import {
   DataView,
   DataViewField,
   DataViewListItem,
-} from 'src/plugins/data_views/public';
+} from '@kbn/data-views-plugin/public';
 import { i18n } from '@kbn/i18n';
 
 const defaultIndexPatternListName = i18n.translate(
diff --git a/src/plugins/data_view_management/public/index.ts b/src/plugins/data_view_management/public/index.ts
index 65b71ee6053e3..2b7ad118e4985 100644
--- a/src/plugins/data_view_management/public/index.ts
+++ b/src/plugins/data_view_management/public/index.ts
@@ -17,7 +17,7 @@
  * in the setup/start interfaces in `plugin.ts`. The remaining items exported here are
  * either types, or static code.
  */
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { IndexPatternManagementPlugin } from './plugin';
 export type { IndexPatternManagementSetup, IndexPatternManagementStart } from './plugin';
 
diff --git a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
index 842ee8a966952..0ef1c47541302 100644
--- a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
@@ -12,10 +12,10 @@ import { Router, Switch, Route, Redirect } from 'react-router-dom';
 
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
-import { ManagementAppMountParams } from '../../../management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import {
   IndexPatternTableWithRouter,
   EditIndexPatternContainer,
diff --git a/src/plugins/data_view_management/public/mocks.ts b/src/plugins/data_view_management/public/mocks.ts
index 85c0e219d6a9f..f86a4cc724704 100644
--- a/src/plugins/data_view_management/public/mocks.ts
+++ b/src/plugins/data_view_management/public/mocks.ts
@@ -6,22 +6,22 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
-import { coreMock } from '../../../core/public/mocks';
-import { managementPluginMock } from '../../management/public/mocks';
-import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
-import { unifiedSearchPluginMock } from '../../unified_search/public/mocks';
-import { indexPatternFieldEditorPluginMock } from '../../data_view_field_editor/public/mocks';
-import { indexPatternEditorPluginMock } from '../../data_view_editor/public/mocks';
-import { dataViewPluginMocks } from '../../data_views/public/mocks';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { urlForwardingPluginMock } from '@kbn/url-forwarding-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
+import { indexPatternEditorPluginMock } from '@kbn/data-view-editor-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import {
   IndexPatternManagementSetup,
   IndexPatternManagementStart,
   IndexPatternManagementPlugin,
 } from './plugin';
 import { IndexPatternManagmentContext } from './types';
-import { fieldFormatsServiceMock } from '../../field_formats/public/mocks';
 
 const createSetupContract = (): IndexPatternManagementSetup => ({});
 
diff --git a/src/plugins/data_view_management/public/plugin.ts b/src/plugins/data_view_management/public/plugin.ts
index f78f81297dcb0..02ea4aac4421e 100644
--- a/src/plugins/data_view_management/public/plugin.ts
+++ b/src/plugins/data_view_management/public/plugin.ts
@@ -7,17 +7,17 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { PluginInitializerContext, CoreSetup, Plugin } from 'src/core/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { UrlForwardingSetup } from '../../url_forwarding/public';
-
-import { ManagementSetup } from '../../management/public';
-import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/public';
-import { DataViewEditorStart } from '../../data_view_editor/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
-import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
+import { PluginInitializerContext, CoreSetup, Plugin } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { UrlForwardingSetup } from '@kbn/url-forwarding-plugin/public';
+
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 
 export interface IndexPatternManagementSetupDependencies {
   management: ManagementSetup;
diff --git a/src/plugins/data_view_management/public/scripting_languages/index.ts b/src/plugins/data_view_management/public/scripting_languages/index.ts
index f01802786ea57..58be2a520e5fb 100644
--- a/src/plugins/data_view_management/public/scripting_languages/index.ts
+++ b/src/plugins/data_view_management/public/scripting_languages/index.ts
@@ -7,7 +7,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import { HttpStart, NotificationsStart } from 'src/core/public';
+import { HttpStart, NotificationsStart } from '@kbn/core/public';
 
 export function getSupportedScriptingLanguages(): estypes.ScriptLanguage[] {
   return ['painless'];
diff --git a/src/plugins/data_view_management/public/types.ts b/src/plugins/data_view_management/public/types.ts
index 53e576f32fcb7..56e9735a9001f 100644
--- a/src/plugins/data_view_management/public/types.ts
+++ b/src/plugins/data_view_management/public/types.ts
@@ -14,17 +14,17 @@ import {
   DocLinksStart,
   HttpSetup,
   ApplicationStart,
-} from 'src/core/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
-import { ManagementAppMountParams } from '../../management/public';
-import { IndexPatternManagementStart } from './index';
-import { KibanaReactContextValue } from '../../kibana_react/public';
-import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/public';
-import { DataViewEditorStart } from '../../data_view_editor/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { FieldFormatsStart } from '../../field_formats/public';
-import { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
+} from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { IndexPatternManagementStart } from '.';
 
 export interface IndexPatternManagmentContext {
   application: ApplicationStart;
diff --git a/src/plugins/data_view_management/server/index.ts b/src/plugins/data_view_management/server/index.ts
index 9bfa12d875493..77e1ddf010eaf 100644
--- a/src/plugins/data_view_management/server/index.ts
+++ b/src/plugins/data_view_management/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IndexPatternManagementPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/data_view_management/server/plugin.ts b/src/plugins/data_view_management/server/plugin.ts
index 4c6ec7e255b34..ad9722848116f 100644
--- a/src/plugins/data_view_management/server/plugin.ts
+++ b/src/plugins/data_view_management/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, Plugin } from 'src/core/server';
+import { PluginInitializerContext, CoreSetup, Plugin } from '@kbn/core/server';
 
 import { registerPreviewScriptedFieldRoute, registerResolveIndexRoute } from './routes';
 
diff --git a/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts b/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts
index 19e42c856fba5..296e6b5cd9d61 100644
--- a/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts
+++ b/src/plugins/data_view_management/server/routes/preview_scripted_field.test.ts
@@ -7,8 +7,8 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { registerPreviewScriptedFieldRoute } from './preview_scripted_field';
 
 describe('preview_scripted_field route', () => {
diff --git a/src/plugins/data_view_management/server/routes/preview_scripted_field.ts b/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
index 6756761fe9653..aee953af1c298 100644
--- a/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
+++ b/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export function registerPreviewScriptedFieldRoute(router: IRouter): void {
   router.post(
diff --git a/src/plugins/data_view_management/server/routes/resolve_index.ts b/src/plugins/data_view_management/server/routes/resolve_index.ts
index f668fb1f1b8de..85ad6ae8993a3 100644
--- a/src/plugins/data_view_management/server/routes/resolve_index.ts
+++ b/src/plugins/data_view_management/server/routes/resolve_index.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export function registerResolveIndexRoute(router: IRouter): void {
   router.get(
diff --git a/src/plugins/data_views/common/data_view.stub.ts b/src/plugins/data_views/common/data_view.stub.ts
index 2eb6d4f5d7813..a7323ad4a7d1a 100644
--- a/src/plugins/data_views/common/data_view.stub.ts
+++ b/src/plugins/data_views/common/data_view.stub.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
+import { SavedObject } from '@kbn/core/types';
 import { stubFieldSpecMap, stubLogstashFieldSpecMap } from './field.stub';
 import { createStubDataView } from './data_views/data_view.stub';
 export {
   createStubDataView,
   createStubDataView as createStubIndexPattern,
 } from './data_views/data_view.stub';
-import { SavedObject } from '../../../core/types';
 import { DataViewAttributes } from './types';
 
 export const stubDataView = createStubDataView({
diff --git a/src/plugins/data_views/common/data_views/data_view.stub.ts b/src/plugins/data_views/common/data_views/data_view.stub.ts
index bb7696b0e1262..a55c0800e784e 100644
--- a/src/plugins/data_views/common/data_views/data_view.stub.ts
+++ b/src/plugins/data_views/common/data_views/data_view.stub.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { DataView } from './data_view';
 import { DataViewSpec } from '../types';
-import { FieldFormatsStartCommon } from '../../../field_formats/common';
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
 
 /**
  * Create a custom stub index pattern. Use it in your unit tests where an {@link DataView} expected.
diff --git a/src/plugins/data_views/common/data_views/data_view.test.ts b/src/plugins/data_views/common/data_views/data_view.test.ts
index 514aba80bdb1e..f061772a60e04 100644
--- a/src/plugins/data_views/common/data_views/data_view.test.ts
+++ b/src/plugins/data_views/common/data_views/data_view.test.ts
@@ -10,12 +10,12 @@ import { map, last } from 'lodash';
 
 import { IndexPattern } from './data_view';
 
-import { CharacterNotAllowedInField } from '../../../kibana_utils/common';
+import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
 
 import { IndexPatternField } from '../fields';
 
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
-import { FieldFormat } from '../../../field_formats/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { RuntimeField, RuntimeTypeExceptComposite } from '../types';
 import { stubLogstashFields } from '../field.stub';
 import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts
index 4349fc11bced5..d04ff5ab63d31 100644
--- a/src/plugins/data_views/common/data_views/data_view.ts
+++ b/src/plugins/data_views/common/data_views/data_view.ts
@@ -11,18 +11,18 @@
 import _, { each, reject } from 'lodash';
 import { castEsToKbnFieldTypeName, ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/field-types';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
+import {
+  FieldFormatsStartCommon,
+  FieldFormat,
+  SerializedFieldFormat,
+} from '@kbn/field-formats-plugin/common';
 import { FieldAttrs, FieldAttrSet, DataViewAttributes } from '..';
 import type { RuntimeField, RuntimeFieldSpec, RuntimeType, FieldConfiguration } from '../types';
-import { CharacterNotAllowedInField } from '../../../kibana_utils/common';
 
-import { IIndexPattern, IFieldType } from '../../common';
+import { IIndexPattern, IFieldType } from '..';
 import { DataViewField, IIndexPatternFieldList, fieldList } from '../fields';
 import { flattenHitWrapper } from './flatten_hit';
-import {
-  FieldFormatsStartCommon,
-  FieldFormat,
-  SerializedFieldFormat,
-} from '../../../field_formats/common';
 import { DataViewSpec, TypeMeta, SourceFilter, DataViewFieldMap } from '../types';
 import { removeFieldAttrs } from './utils';
 
diff --git a/src/plugins/data_views/common/data_views/data_views.test.ts b/src/plugins/data_views/common/data_views/data_views.test.ts
index 642d0e842654b..ba2e62d457b9c 100644
--- a/src/plugins/data_views/common/data_views/data_views.test.ts
+++ b/src/plugins/data_views/common/data_views/data_views.test.ts
@@ -8,7 +8,7 @@
 
 import { defaults } from 'lodash';
 import { DataViewsService, DataView } from '.';
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 
 import { UiSettingsCommon, SavedObjectsClientCommon, SavedObject } from '../types';
 import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
diff --git a/src/plugins/data_views/common/data_views/data_views.ts b/src/plugins/data_views/common/data_views/data_views.ts
index 9a59179ef4a35..098e895324aa7 100644
--- a/src/plugins/data_views/common/data_views/data_views.ts
+++ b/src/plugins/data_views/common/data_views/data_views.ts
@@ -11,6 +11,8 @@
 import { i18n } from '@kbn/i18n';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
+import { FieldFormatsStartCommon, FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
 import {
   DATA_VIEW_SAVED_OBJECT_TYPE,
   DEFAULT_ASSETS_TO_IGNORE,
@@ -34,9 +36,7 @@ import {
   DataViewFieldMap,
   TypeMeta,
 } from '../types';
-import { FieldFormatsStartCommon, FORMATS_UI_SETTINGS } from '../../../field_formats/common/';
-import { META_FIELDS, SavedObject } from '../../common';
-import { SavedObjectNotFound } from '../../../kibana_utils/common';
+import { META_FIELDS, SavedObject } from '..';
 import { DataViewMissingIndices } from '../lib';
 import { findByTitle } from '../utils';
 import { DuplicateDataViewError, DataViewInsufficientAccessError } from '../errors';
diff --git a/src/plugins/data_views/common/data_views/flatten_hit.test.ts b/src/plugins/data_views/common/data_views/flatten_hit.test.ts
index 0946f30b85e39..24d5ee12885d2 100644
--- a/src/plugins/data_views/common/data_views/flatten_hit.test.ts
+++ b/src/plugins/data_views/common/data_views/flatten_hit.test.ts
@@ -8,7 +8,7 @@
 
 import { DataView } from './data_view';
 
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { flattenHitWrapper } from './flatten_hit';
 import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
 
diff --git a/src/plugins/data_views/common/expressions/load_index_pattern.ts b/src/plugins/data_views/common/expressions/load_index_pattern.ts
index 3c923597a5063..19bb928557988 100644
--- a/src/plugins/data_views/common/expressions/load_index_pattern.ts
+++ b/src/plugins/data_views/common/expressions/load_index_pattern.ts
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { DataViewsContract } from '../data_views';
 import { DataViewSpec } from '..';
-import { SavedObjectReference } from '../../../../core/types';
 
 const name = 'indexPatternLoad';
 const type = 'index_pattern';
diff --git a/src/plugins/data_views/common/fields/data_view_field.test.ts b/src/plugins/data_views/common/fields/data_view_field.test.ts
index 72fbd96d40b65..2bf2c5490f2b0 100644
--- a/src/plugins/data_views/common/fields/data_view_field.test.ts
+++ b/src/plugins/data_views/common/fields/data_view_field.test.ts
@@ -10,7 +10,7 @@ import { IndexPatternField } from './data_view_field';
 import { IndexPattern } from '..';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import { FieldSpec, RuntimeField } from '../types';
-import { FieldFormat } from '../../../field_formats/common';
+import { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 describe('Field', function () {
   function flatten(obj: Record<string, any>) {
diff --git a/src/plugins/data_views/common/fields/fields.mocks.ts b/src/plugins/data_views/common/fields/fields.mocks.ts
index 22036f262c2d1..05a51d7ccf120 100644
--- a/src/plugins/data_views/common/fields/fields.mocks.ts
+++ b/src/plugins/data_views/common/fields/fields.mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { IFieldType } from './types';
+import { FieldSpec } from '..';
 
-export const fields: IFieldType[] = [
+export const fields: FieldSpec[] = [
   {
     name: 'bytes',
     type: 'number',
@@ -308,4 +308,4 @@ export const fields: IFieldType[] = [
   },
 ];
 
-export const getField = (name: string) => fields.find((field) => field.name === name) as IFieldType;
+export const getField = (name: string) => fields.find((field) => field.name === name) as FieldSpec;
diff --git a/src/plugins/data_views/common/lib/get_title.ts b/src/plugins/data_views/common/lib/get_title.ts
index 69471583f139c..b955fb815dfdf 100644
--- a/src/plugins/data_views/common/lib/get_title.ts
+++ b/src/plugins/data_views/common/lib/get_title.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from '../../../../core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../constants';
 import { DataViewAttributes } from '../types';
 
diff --git a/src/plugins/data_views/common/types.ts b/src/plugins/data_views/common/types.ts
index 606128d484ddb..4032d83b24c5a 100644
--- a/src/plugins/data_views/common/types.ts
+++ b/src/plugins/data_views/common/types.ts
@@ -7,15 +7,15 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { DataViewFieldBase, IFieldSubType, DataViewBase } from '@kbn/es-query';
-import { ToastInputFields, ErrorToastOptions } from 'src/core/public/notifications';
+import { ToastInputFields, ErrorToastOptions } from '@kbn/core/public/notifications';
 // eslint-disable-next-line
 import type { SavedObject } from 'src/core/server';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { FieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { IFieldType } from './fields';
 import { RUNTIME_FIELD_TYPES } from './constants';
 import { DataViewField } from './fields';
-import { FieldFormat, SerializedFieldFormat } from '../../field_formats/common';
 
 export type { QueryDslQueryContainer };
 
diff --git a/src/plugins/data_views/public/data_views/data_view.stub.ts b/src/plugins/data_views/public/data_views/data_view.stub.ts
index f37a8a78b234b..b396807beb510 100644
--- a/src/plugins/data_views/public/data_views/data_view.stub.ts
+++ b/src/plugins/data_views/public/data_views/data_view.stub.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
-import { FieldFormatsStartCommon } from '../../../field_formats/common';
-import { getFieldFormatsRegistry } from '../../../field_formats/public/mocks';
+import { CoreSetup } from '@kbn/core/public';
+import { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
+import { getFieldFormatsRegistry } from '@kbn/field-formats-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import * as commonStubs from '../../common/stubs';
 import { DataView, DataViewSpec } from '../../common';
-import { coreMock } from '../../../../core/public/mocks';
 /**
  * Create a custom stub index pattern. Use it in your unit tests where an {@link DataView} expected.
  * @param spec - Serialized index pattern object
diff --git a/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts b/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
index 2fd17b98f7498..5880bd9fd36fa 100644
--- a/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
+++ b/src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { setup } from '../../../../core/test_helpers/http_test_setup';
+import { setup } from '@kbn/core/test_helpers/http_test_setup';
 
 export const { http } = setup((injectedMetadata) => {
   injectedMetadata.getBasePath.mockReturnValue('/hola/daro/');
diff --git a/src/plugins/data_views/public/data_views/data_views_api_client.ts b/src/plugins/data_views/public/data_views/data_views_api_client.ts
index 9a15f19630718..42aa03882de58 100644
--- a/src/plugins/data_views/public/data_views/data_views_api_client.ts
+++ b/src/plugins/data_views/public/data_views/data_views_api_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { DataViewMissingIndices } from '../../common/lib';
 import { GetFieldsOptions, IDataViewsApiClient, GetFieldsOptionsTimePattern } from '../../common';
 
diff --git a/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx b/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx
index fc7b8c9eb42b6..3ddfd24f687af 100644
--- a/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx
+++ b/src/plugins/data_views/public/data_views/redirect_no_index_pattern.tsx
@@ -9,8 +9,8 @@
 import { EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { CoreStart } from 'kibana/public';
-import { toMountPoint } from '../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 let bannerId: string;
 
diff --git a/src/plugins/data_views/public/expressions/load_index_pattern.ts b/src/plugins/data_views/public/expressions/load_index_pattern.ts
index 76119f3e50a45..5373dfd4864d8 100644
--- a/src/plugins/data_views/public/expressions/load_index_pattern.ts
+++ b/src/plugins/data_views/public/expressions/load_index_pattern.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from 'src/core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import {
   getIndexPatternLoadMeta,
   IndexPatternLoadExpressionFunctionDefinition,
diff --git a/src/plugins/data_views/public/plugin.ts b/src/plugins/data_views/public/plugin.ts
index eb05e2ab209fc..95378df130c46 100644
--- a/src/plugins/data_views/public/plugin.ts
+++ b/src/plugins/data_views/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { getIndexPatternLoad } from './expressions';
 import {
   DataViewsPublicPluginSetup,
diff --git a/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts b/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts
index 124a66eba57f2..faf497c60ba31 100644
--- a/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts
+++ b/src/plugins/data_views/public/saved_objects_client_wrapper.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectsClientPublicToCommon } from './saved_objects_client_wrapper';
-import { savedObjectsServiceMock } from 'src/core/public/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
 
 import { DataViewSavedObjectConflictError } from '../common';
 
diff --git a/src/plugins/data_views/public/saved_objects_client_wrapper.ts b/src/plugins/data_views/public/saved_objects_client_wrapper.ts
index a5bc83546e3bb..907c964bd4632 100644
--- a/src/plugins/data_views/public/saved_objects_client_wrapper.ts
+++ b/src/plugins/data_views/public/saved_objects_client_wrapper.ts
@@ -7,7 +7,7 @@
  */
 
 import { omit } from 'lodash';
-import { SavedObjectsClient, SimpleSavedObject } from 'src/core/public';
+import { SavedObjectsClient, SimpleSavedObject } from '@kbn/core/public';
 import {
   SavedObjectsClientCommon,
   SavedObjectsClientCommonFindArgs,
diff --git a/src/plugins/data_views/public/services/has_data.test.ts b/src/plugins/data_views/public/services/has_data.test.ts
index 3d1fcef1100bd..c13fffe9fc475 100644
--- a/src/plugins/data_views/public/services/has_data.test.ts
+++ b/src/plugins/data_views/public/services/has_data.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { HasData } from './has_data';
 
diff --git a/src/plugins/data_views/public/services/has_data.ts b/src/plugins/data_views/public/services/has_data.ts
index 628f68140603a..76f6b39ec4982 100644
--- a/src/plugins/data_views/public/services/has_data.ts
+++ b/src/plugins/data_views/public/services/has_data.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, HttpStart } from 'kibana/public';
+import { CoreStart, HttpStart } from '@kbn/core/public';
 import { DEFAULT_ASSETS_TO_IGNORE } from '../../common';
-import { HasDataViewsResponse, IndicesResponse, IndicesResponseModified } from '../';
+import { HasDataViewsResponse, IndicesResponse, IndicesResponseModified } from '..';
 
 export class HasData {
   private removeAliases = (source: IndicesResponseModified): boolean => !source.item.indices;
diff --git a/src/plugins/data_views/public/types.ts b/src/plugins/data_views/public/types.ts
index 5e9f769ba6cb4..612f22335e72a 100644
--- a/src/plugins/data_views/public/types.ts
+++ b/src/plugins/data_views/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DataViewsServicePublicMethods } from './data_views';
 import { HasDataService } from '../common';
 
diff --git a/src/plugins/data_views/public/ui_settings_wrapper.ts b/src/plugins/data_views/public/ui_settings_wrapper.ts
index 91806867b6730..3474451ad720f 100644
--- a/src/plugins/data_views/public/ui_settings_wrapper.ts
+++ b/src/plugins/data_views/public/ui_settings_wrapper.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from 'src/core/public';
+import { IUiSettingsClient, PublicUiSettingsParams, UserProvidedValues } from '@kbn/core/public';
 import { UiSettingsCommon } from '../common';
 
 export class UiSettingsPublicToCommon implements UiSettingsCommon {
diff --git a/src/plugins/data_views/server/data_views_service_factory.ts b/src/plugins/data_views/server/data_views_service_factory.ts
index e575362b8c34d..570ced7b62580 100644
--- a/src/plugins/data_views/server/data_views_service_factory.ts
+++ b/src/plugins/data_views/server/data_views_service_factory.ts
@@ -13,9 +13,9 @@ import {
   UiSettingsServiceStart,
   KibanaRequest,
   CoreStart,
-} from 'kibana/server';
+} from '@kbn/core/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { DataViewsService } from '../common';
-import { FieldFormatsStart } from '../../field_formats/server';
 import { UiSettingsServerToCommon } from './ui_settings_wrapper';
 import { IndexPatternsApiServer } from './index_patterns_api_client';
 import { SavedObjectsClientServerToCommon } from './saved_objects_client_wrapper';
diff --git a/src/plugins/data_views/server/deprecations/scripted_fields.ts b/src/plugins/data_views/server/deprecations/scripted_fields.ts
index 0d668466ff099..198a44ed45555 100644
--- a/src/plugins/data_views/server/deprecations/scripted_fields.ts
+++ b/src/plugins/data_views/server/deprecations/scripted_fields.ts
@@ -11,7 +11,7 @@ import {
   DeprecationsDetails,
   GetDeprecationsContext,
   RegisterDeprecationsConfig,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { DataViewAttributes } from '../../common';
 
diff --git a/src/plugins/data_views/server/expressions/load_index_pattern.ts b/src/plugins/data_views/server/expressions/load_index_pattern.ts
index 8604709e81582..091a6aa2c3817 100644
--- a/src/plugins/data_views/server/expressions/load_index_pattern.ts
+++ b/src/plugins/data_views/server/expressions/load_index_pattern.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, StartServicesAccessor } from 'src/core/server';
+import { KibanaRequest, StartServicesAccessor } from '@kbn/core/server';
 
 import {
   getIndexPatternLoadMeta,
diff --git a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts
index 8f1749a4b61fa..b9925838fa975 100644
--- a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts
+++ b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts
@@ -8,7 +8,7 @@
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { IndexPatternsFetcher } from '.';
-import { elasticsearchServiceMock } from '../../../../core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import * as indexNotFoundException from './index_not_found_exception.json';
 
 describe('Index Pattern Fetcher - server', () => {
diff --git a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
index dce48a6d96208..ceb01333c5ff0 100644
--- a/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
+++ b/src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { keyBy } from 'lodash';
 import type { QueryDslQueryContainer } from '../../common/types';
 
diff --git a/src/plugins/data_views/server/fetcher/lib/es_api.ts b/src/plugins/data_views/server/fetcher/lib/es_api.ts
index fe0a8fb126aec..6e611994ee394 100644
--- a/src/plugins/data_views/server/fetcher/lib/es_api.ts
+++ b/src/plugins/data_views/server/fetcher/lib/es_api.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { QueryDslQueryContainer } from '../../../common/types';
 import { convertEsError } from './errors';
 
diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js
index 88486172942c0..88e91749b11d8 100644
--- a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js
+++ b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.test.js
@@ -10,7 +10,7 @@
 import sinon from 'sinon';
 import { identity, shuffle, sortBy } from 'lodash';
 
-import { getFieldCapabilities } from '../field_capabilities';
+import { getFieldCapabilities } from '.';
 
 import { callFieldCapsApi } from '../es_api';
 import * as callFieldCapsApiNS from '../es_api';
diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts
index 9f52c784adda3..875ebb2490613 100644
--- a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -8,7 +8,7 @@
 
 import { defaults, keyBy, sortBy } from 'lodash';
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { callFieldCapsApi } from '../es_api';
 import { readFieldCapsResponse } from './field_caps_response';
 import { mergeOverrides } from './overrides';
diff --git a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
index 75bede61e10d8..2581b2b78f5d8 100644
--- a/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -10,7 +10,7 @@ import { uniq } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
 import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
-import { FieldDescriptor } from '../../../fetcher';
+import { FieldDescriptor } from '../..';
 
 /**
  *  Read the response from the _field_caps API to determine the type and
diff --git a/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts
index 0d487cae4ef41..f0da3c6dffeaa 100644
--- a/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts
+++ b/src/plugins/data_views/server/fetcher/lib/resolve_time_pattern.ts
@@ -9,7 +9,7 @@
 import { chain } from 'lodash';
 import moment from 'moment';
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { timePatternToWildcard } from './time_pattern_to_wildcard';
 import { callIndexAliasApi } from './es_api';
diff --git a/src/plugins/data_views/server/has_user_index_pattern.test.ts b/src/plugins/data_views/server/has_user_index_pattern.test.ts
index f50462cd7ea5e..29b5473e8f974 100644
--- a/src/plugins/data_views/server/has_user_index_pattern.test.ts
+++ b/src/plugins/data_views/server/has_user_index_pattern.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { hasUserIndexPattern } from './has_user_index_pattern';
-import { elasticsearchServiceMock, savedObjectsClientMock } from '../../../core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 describe('hasUserIndexPattern', () => {
   const esClient = elasticsearchServiceMock.createScopedClusterClient().asCurrentUser;
diff --git a/src/plugins/data_views/server/has_user_index_pattern.ts b/src/plugins/data_views/server/has_user_index_pattern.ts
index b844c2f741258..b2ef306054582 100644
--- a/src/plugins/data_views/server/has_user_index_pattern.ts
+++ b/src/plugins/data_views/server/has_user_index_pattern.ts
@@ -10,7 +10,7 @@ import {
   ElasticsearchClient,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from '../../../core/server';
+} from '@kbn/core/server';
 import { IndexPatternSavedObjectAttrs } from '../common/data_views';
 import { DEFAULT_ASSETS_TO_IGNORE } from '../common/constants';
 
diff --git a/src/plugins/data_views/server/index.ts b/src/plugins/data_views/server/index.ts
index 4ba79373ee5bb..6558d75c50a46 100644
--- a/src/plugins/data_views/server/index.ts
+++ b/src/plugins/data_views/server/index.ts
@@ -16,7 +16,7 @@ export {
 } from './fetcher';
 export type { IndexPatternsServiceStart } from './types';
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DataViewsServerPlugin } from './plugin';
 import { DataViewsServerPluginSetup, DataViewsServerPluginStart } from './types';
 export type { dataViewsServiceFactory } from './data_views_service_factory';
diff --git a/src/plugins/data_views/server/index_patterns_api_client.ts b/src/plugins/data_views/server/index_patterns_api_client.ts
index 4f036449fe7ee..d4b4118e06bc8 100644
--- a/src/plugins/data_views/server/index_patterns_api_client.ts
+++ b/src/plugins/data_views/server/index_patterns_api_client.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   GetFieldsOptions,
   GetFieldsOptionsTimePattern,
diff --git a/src/plugins/data_views/server/mocks.ts b/src/plugins/data_views/server/mocks.ts
index 63dd54f771bc1..361daf4b937d4 100644
--- a/src/plugins/data_views/server/mocks.ts
+++ b/src/plugins/data_views/server/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { DataViewsService } from '../common';
 
 export function createIndexPatternsStartMock() {
   const dataViewsServiceFactory = jest.fn().mockResolvedValue({ get: jest.fn() });
diff --git a/src/plugins/data_views/server/plugin.ts b/src/plugins/data_views/server/plugin.ts
index 7884db67a9d9c..6ec356a150bd5 100644
--- a/src/plugins/data_views/server/plugin.ts
+++ b/src/plugins/data_views/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { dataViewsServiceFactory } from './data_views_service_factory';
 import { registerRoutes } from './routes';
 import { dataViewSavedObjectType } from './saved_objects';
diff --git a/src/plugins/data_views/server/register_index_pattern_usage_collection.ts b/src/plugins/data_views/server/register_index_pattern_usage_collection.ts
index 5b42db0f75a4d..9c005d531da23 100644
--- a/src/plugins/data_views/server/register_index_pattern_usage_collection.ts
+++ b/src/plugins/data_views/server/register_index_pattern_usage_collection.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { StartServicesAccessor } from 'src/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { StartServicesAccessor } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 import { DataViewsContract } from '../common';
-import { SavedObjectsClient } from '../../../core/server';
 import { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from './types';
 
 interface CountSummary {
diff --git a/src/plugins/data_views/server/rest_api_routes/create_data_view.ts b/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
index 00e6e94887f50..755ba5dcd86ef 100644
--- a/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewSpec, DataViewsService } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewSpec, DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
 import { fieldSpecSchema, runtimeFieldSchema, serializedFieldFormatSchema } from './util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import {
   DATA_VIEW_PATH,
diff --git a/src/plugins/data_views/server/rest_api_routes/default_data_view.ts b/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
index b2f6c3b633724..da89bbe95b69d 100644
--- a/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService } from 'src/plugins/data_views/common';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import { handleErrors } from './util/handle_errors';
 import { SERVICE_PATH, SERVICE_PATH_LEGACY, SERVICE_KEY, SERVICE_KEY_LEGACY } from '../constants';
diff --git a/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts b/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
index 277fb7daf9e5d..88370b5aea776 100644
--- a/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import { SPECIFIC_DATA_VIEW_PATH, SPECIFIC_DATA_VIEW_PATH_LEGACY } from '../constants';
 
diff --git a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts
index 453d6c90e5cc6..14a03bce748ff 100644
--- a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.test.ts
@@ -9,7 +9,7 @@
 import { updateFields } from './update_fields';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('create runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
index 8e1d1686e2e24..49e3d3fc0f1ef 100644
--- a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
+++ b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { FieldFormatParams, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { DataViewsService } from '../../../common';
 import { handleErrors } from '../util/handle_errors';
 import { serializedFieldFormatSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
-import { FieldFormatParams, SerializedFieldFormat } from '../../../../field_formats/common';
 import type {
   DataViewsServerPluginStartDependencies,
   DataViewsServerPluginStart,
diff --git a/src/plugins/data_views/server/rest_api_routes/get_data_view.ts b/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
index e943165adebab..63ef2701a3062 100644
--- a/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import {
   SPECIFIC_DATA_VIEW_PATH,
diff --git a/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts b/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
index f684f346dbd6d..5bbe7966ae267 100644
--- a/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsService } from 'src/plugins/data_views/common';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import { SERVICE_PATH, SERVICE_PATH_LEGACY } from '../constants';
 
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts
index ac2e6bc54fe15..2f15f7911cba6 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { createRuntimeField } from './create_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('create runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
index 8753e58c8e240..4ae100e1a79f5 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService, RuntimeField } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService, RuntimeField } from '../../../common';
 import { handleErrors } from '../util/handle_errors';
 import { runtimeFieldSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts
index 8262916e9ef4e..8f36cde01afb1 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { deleteRuntimeField } from './delete_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('delete runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
index b846eb74771d9..94dde735c0674 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts
index 2552e88d5725a..00f15bab6aa3d 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { getRuntimeField } from './get_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('get runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
index b8f87a21b819f..4d9a5678392a2 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts
index 62d56d46d38fa..a6ec75de0d37f 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { putRuntimeField } from './put_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('put runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
index a50fe84133159..ed4f01d703f0c 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { DataViewsService, RuntimeField } from 'src/plugins/data_views/common';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService, RuntimeField } from '../../../common';
 import { handleErrors } from '../util/handle_errors';
 import { runtimeFieldSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts
index 3152ac1be91c2..e7718341a4a59 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.test.ts
@@ -8,7 +8,7 @@
 
 import { responseFormatter } from './response_formatter';
 import { SERVICE_KEY, SERVICE_KEY_LEGACY } from '../../constants';
-import { DataView, DataViewField } from 'src/plugins/data_views/common';
+import { DataView, DataViewField } from '../../../common';
 
 const dataView = {
   toSpec: () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts
index 7764f5bf0974b..83dc31b4b713d 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/response_formatter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from 'src/plugins/data_views/common';
+import { DataView, DataViewField } from '../../../common';
 import { SERVICE_KEY_LEGACY, SERVICE_KEY_TYPE, SERVICE_KEY } from '../../constants';
 
 interface ResponseFormatterArgs {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts
index f3ca214b41d0f..da3c0df626701 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.test.ts
@@ -9,7 +9,7 @@
 import { updateRuntimeField } from './update_runtime_field';
 import { dataViewsService } from '../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '../../../common';
 
 describe('update runtime field', () => {
   it('call usageCollection', () => {
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
index 27893ff1b7c05..fe632f5533dc7 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
-import { DataViewsService, RuntimeField } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewsService, RuntimeField } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
 import { runtimeFieldSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
index b3660f5841442..4335fc6aea905 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { handleErrors } from '../util/handle_errors';
 import { fieldSpecSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
index 628ba9fb41aa1..811c3e096ca18 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
index 82f14faaaed99..3b76d56070f1e 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
index bd79203b1161f..8989c1412769e 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { handleErrors } from '../util/handle_errors';
 import { fieldSpecSchema } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
index fba7488a83a24..28f28064b2a1b 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
@@ -7,11 +7,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { FieldSpec } from 'src/plugins/data_views/common';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { FieldSpec } from '../../../common';
 import { ErrorIndexPatternFieldNotFound } from '../../error';
 import { handleErrors } from '../util/handle_errors';
 import { fieldSpecSchemaFields } from '../util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type {
   DataViewsServerPluginStart,
   DataViewsServerPluginStartDependencies,
diff --git a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
index e71ae8c8ec88e..c0f890fda9d85 100644
--- a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
@@ -7,11 +7,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { DataViewSpec, DataViewsService } from 'src/plugins/data_views/common';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { DataViewSpec, DataViewsService } from '../../common';
 import { handleErrors } from './util/handle_errors';
 import { fieldSpecSchema, runtimeFieldSchema, serializedFieldFormatSchema } from './util/schemas';
-import { IRouter, StartServicesAccessor } from '../../../../core/server';
 import type { DataViewsServerPluginStartDependencies, DataViewsServerPluginStart } from '../types';
 import {
   SPECIFIC_DATA_VIEW_PATH,
diff --git a/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts b/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts
index f49e6394fd007..c828e064fce84 100644
--- a/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts
+++ b/src/plugins/data_views/server/rest_api_routes/util/handle_errors.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandler, RouteMethod, RequestHandlerContext } from 'src/core/server';
+import type { RequestHandler, RouteMethod, RequestHandlerContext } from '@kbn/core/server';
 import { ErrorIndexPatternNotFound } from '../../error';
 
 interface ErrorResponseBody {
diff --git a/src/plugins/data_views/server/routes.ts b/src/plugins/data_views/server/routes.ts
index f21d951cab007..1a35b75b2a104 100644
--- a/src/plugins/data_views/server/routes.ts
+++ b/src/plugins/data_views/server/routes.ts
@@ -7,8 +7,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { HttpServiceSetup, StartServicesAccessor } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { HttpServiceSetup, StartServicesAccessor } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { IndexPatternsFetcher } from './fetcher';
 import { routes } from './rest_api_routes';
 import type { DataViewsServerPluginStart, DataViewsServerPluginStartDependencies } from './types';
diff --git a/src/plugins/data_views/server/routes/fields_for.ts b/src/plugins/data_views/server/routes/fields_for.ts
index 77d39a6ea5d8b..cc71eb9258d4c 100644
--- a/src/plugins/data_views/server/routes/fields_for.ts
+++ b/src/plugins/data_views/server/routes/fields_for.ts
@@ -12,7 +12,7 @@ import {
   StartServicesAccessor,
   RequestHandler,
   RouteValidatorFullConfig,
-} from '../../../../core/server';
+} from '@kbn/core/server';
 import type { DataViewsServerPluginStart, DataViewsServerPluginStartDependencies } from '../types';
 import { IndexPatternsFetcher } from '../fetcher';
 
diff --git a/src/plugins/data_views/server/routes/has_data_views.test.ts b/src/plugins/data_views/server/routes/has_data_views.test.ts
index 1468026ad66e2..70967ce85edf3 100644
--- a/src/plugins/data_views/server/routes/has_data_views.test.ts
+++ b/src/plugins/data_views/server/routes/has_data_views.test.ts
@@ -7,8 +7,8 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { registerHasDataViewsRoute } from './has_data_views';
 
 describe('preview has_data_views route', () => {
diff --git a/src/plugins/data_views/server/routes/has_data_views.ts b/src/plugins/data_views/server/routes/has_data_views.ts
index 80204221b0aa4..d74711e8c0d2b 100644
--- a/src/plugins/data_views/server/routes/has_data_views.ts
+++ b/src/plugins/data_views/server/routes/has_data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from '../../../../core/server';
+import { IRouter } from '@kbn/core/server';
 import { getIndexPattern, hasUserIndexPattern } from '../has_user_index_pattern';
 
 export const registerHasDataViewsRoute = (router: IRouter): void => {
diff --git a/src/plugins/data_views/server/saved_objects/data_views.ts b/src/plugins/data_views/server/saved_objects/data_views.ts
index 4c54acadee9bc..6319911f3bfd5 100644
--- a/src/plugins/data_views/server/saved_objects/data_views.ts
+++ b/src/plugins/data_views/server/saved_objects/data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsType } from 'kibana/server';
+import type { SavedObjectsType } from '@kbn/core/server';
 import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations';
 import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
 
diff --git a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts
index 7d8ca120d6d6a..7f4d3a912b246 100644
--- a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts
+++ b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectMigrationContext } from 'kibana/server';
+import { SavedObjectMigrationContext } from '@kbn/core/server';
 import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
diff --git a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts
index fc5c5afb3d551..d92b39e8a6c24 100644
--- a/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts
+++ b/src/plugins/data_views/server/saved_objects/index_pattern_migrations.ts
@@ -7,7 +7,7 @@
  */
 
 import { flow, omit } from 'lodash';
-import { SavedObjectMigrationFn } from 'kibana/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 
 const migrateAttributeTypeAndAttributeTypeMeta: SavedObjectMigrationFn<any, any> = (doc) => ({
   ...doc,
diff --git a/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts b/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts
index 955028c0f9bf2..561dfd2df7d90 100644
--- a/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts
+++ b/src/plugins/data_views/server/saved_objects/migrations/to_v7_12_0.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 /**
  * Drop the previous document's attributes, which report `averageDuration` incorrectly.
diff --git a/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts b/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts
index b03532421ecab..bd7983abd46a9 100644
--- a/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts
+++ b/src/plugins/data_views/server/saved_objects_client_wrapper.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectsClientServerToCommon } from './saved_objects_client_wrapper';
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { DataViewSavedObjectConflictError } from '../common';
 
diff --git a/src/plugins/data_views/server/saved_objects_client_wrapper.ts b/src/plugins/data_views/server/saved_objects_client_wrapper.ts
index e00eb9e3375a8..85b7710614536 100644
--- a/src/plugins/data_views/server/saved_objects_client_wrapper.ts
+++ b/src/plugins/data_views/server/saved_objects_client_wrapper.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract, SavedObject } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObject } from '@kbn/core/server';
 import {
   SavedObjectsClientCommon,
   SavedObjectsClientCommonFindArgs,
diff --git a/src/plugins/data_views/server/types.ts b/src/plugins/data_views/server/types.ts
index 343661e1840ba..5e366b328275b 100644
--- a/src/plugins/data_views/server/types.ts
+++ b/src/plugins/data_views/server/types.ts
@@ -11,11 +11,11 @@ import {
   SavedObjectsClientContract,
   ElasticsearchClient,
   KibanaRequest,
-} from 'kibana/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { DataViewsService } from '../common';
-import { FieldFormatsSetup, FieldFormatsStart } from '../../field_formats/server';
 
 type ServiceFactory = (
   savedObjectsClient: SavedObjectsClientContract,
diff --git a/src/plugins/data_views/server/ui_settings_wrapper.ts b/src/plugins/data_views/server/ui_settings_wrapper.ts
index f42d43c1c24f4..51f23d7de4cd6 100644
--- a/src/plugins/data_views/server/ui_settings_wrapper.ts
+++ b/src/plugins/data_views/server/ui_settings_wrapper.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'src/core/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import { UiSettingsCommon } from '../common';
 
 export class UiSettingsServerToCommon implements UiSettingsCommon {
diff --git a/src/plugins/data_views/server/utils.ts b/src/plugins/data_views/server/utils.ts
index a3b6aeb5e8c26..d5d6082dc5ab8 100644
--- a/src/plugins/data_views/server/utils.ts
+++ b/src/plugins/data_views/server/utils.ts
@@ -6,19 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import {
-  IFieldType,
-  DATA_VIEW_SAVED_OBJECT_TYPE,
-  DataViewAttributes,
-  SavedObject,
-} from '../common';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE, DataViewAttributes, SavedObject, FieldSpec } from '../common';
 
 export const getFieldByName = (
   fieldName: string,
   indexPattern: SavedObject<DataViewAttributes>
-): IFieldType | undefined => {
-  const fields: IFieldType[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
+): FieldSpec | undefined => {
+  const fields: FieldSpec[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
   const field = fields && fields.find((f) => f.name === fieldName);
 
   return field;
diff --git a/src/plugins/dev_tools/public/application.tsx b/src/plugins/dev_tools/public/application.tsx
index fa4796a7fb0cb..1a1d7ca9fb430 100644
--- a/src/plugins/dev_tools/public/application.tsx
+++ b/src/plugins/dev_tools/public/application.tsx
@@ -27,8 +27,8 @@ import type {
   ScopedHistory,
   CoreTheme,
   ExecutionContextStart,
-} from 'src/core/public';
-import { KibanaThemeProvider, useExecutionContext } from '../../kibana_react/public';
+} from '@kbn/core/public';
+import { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import type { DocTitleService, BreadcrumbService } from './services';
 
 import { DevToolApp } from './dev_tool';
diff --git a/src/plugins/dev_tools/public/dev_tool.ts b/src/plugins/dev_tools/public/dev_tool.ts
index f2425aa571622..53f79ad686c43 100644
--- a/src/plugins/dev_tools/public/dev_tool.ts
+++ b/src/plugins/dev_tools/public/dev_tool.ts
@@ -9,7 +9,7 @@
 import { Observable } from 'rxjs';
 import { RouteComponentProps } from 'react-router-dom';
 
-import { AppUnmount, CoreTheme } from 'src/core/public';
+import { AppUnmount, CoreTheme } from '@kbn/core/public';
 
 /**
  * Descriptor for a dev tool. A dev tool works similar to an application
diff --git a/src/plugins/dev_tools/public/index.ts b/src/plugins/dev_tools/public/index.ts
index 2326106af3e03..d5e7f2e293df8 100644
--- a/src/plugins/dev_tools/public/index.ts
+++ b/src/plugins/dev_tools/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110892
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DevToolsPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts
index ee729c8f4400c..86c26f099b55d 100644
--- a/src/plugins/dev_tools/public/plugin.ts
+++ b/src/plugins/dev_tools/public/plugin.ts
@@ -7,13 +7,13 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { Plugin, CoreSetup, AppMountParameters, AppDeepLink } from 'src/core/public';
-import { AppUpdater } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters, AppDeepLink } from '@kbn/core/public';
+import { AppUpdater } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { sortBy } from 'lodash';
 
-import { AppNavLinkStatus, DEFAULT_APP_CATEGORIES } from '../../../core/public';
-import { UrlForwardingSetup } from '../../url_forwarding/public';
+import { AppNavLinkStatus, DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import { UrlForwardingSetup } from '@kbn/url-forwarding-plugin/public';
 import { CreateDevToolArgs, DevToolApp, createDevToolApp } from './dev_tool';
 import { DocTitleService, BreadcrumbService } from './services';
 
diff --git a/src/plugins/dev_tools/public/services/breadcrumb.ts b/src/plugins/dev_tools/public/services/breadcrumb.ts
index c12aa7e8ceef2..20b6b62463aa8 100644
--- a/src/plugins/dev_tools/public/services/breadcrumb.ts
+++ b/src/plugins/dev_tools/public/services/breadcrumb.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ManagementAppMountParams } from '../../../management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { i18Texts } from '../constants/texts';
 
 export type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
diff --git a/src/plugins/discover/kibana.json b/src/plugins/discover/kibana.json
index 2b09f2bef4896..f9802782f8e48 100644
--- a/src/plugins/discover/kibana.json
+++ b/src/plugins/discover/kibana.json
@@ -17,7 +17,7 @@
     "dataViewEditor"
   ],
   "optionalPlugins": ["home", "share", "usageCollection", "spaces", "triggersActionsUi"],
-  "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "dataViews"],
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "dataViews"],
   "extraPublicDirs": ["common"],
   "owner": {
     "name": "Data Discovery",
diff --git a/src/plugins/discover/public/__mocks__/config.ts b/src/plugins/discover/public/__mocks__/config.ts
index 42ecbd351af74..6fa506a7df550 100644
--- a/src/plugins/discover/public/__mocks__/config.ts
+++ b/src/plugins/discover/public/__mocks__/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../common';
 
 export const configMock = {
diff --git a/src/plugins/discover/public/__mocks__/index_pattern.ts b/src/plugins/discover/public/__mocks__/index_pattern.ts
index becaa9934afce..839acfcf3ea15 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPatternFieldList, DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 const fields = [
   {
@@ -62,7 +62,7 @@ const fields = [
     filterable: true,
     aggregatable: true,
   },
-] as IIndexPatternFieldList;
+] as DataView['fields'];
 
 fields.getByName = (name: string) => {
   return fields.find((field) => field.name === name);
diff --git a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
index 01f3f537f0745..89a53e474b5b3 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPatternFieldList, DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 const fields = [
   {
@@ -49,7 +49,7 @@ const fields = [
     scripted: true,
     filterable: false,
   },
-] as IIndexPatternFieldList;
+] as DataView['fields'];
 
 fields.getByName = (name: string) => {
   return fields.find((field) => field.name === name);
diff --git a/src/plugins/discover/public/__mocks__/index_patterns.ts b/src/plugins/discover/public/__mocks__/index_patterns.ts
index 0d6f3fa723682..31997300c6490 100644
--- a/src/plugins/discover/public/__mocks__/index_patterns.ts
+++ b/src/plugins/discover/public/__mocks__/index_patterns.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsContract } from '../../../data_views/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { indexPatternMock } from './index_pattern';
 
 export const indexPatternsMock = {
diff --git a/src/plugins/discover/public/__mocks__/saved_search.ts b/src/plugins/discover/public/__mocks__/saved_search.ts
index 04c880e7e1928..d322098a5e418 100644
--- a/src/plugins/discover/public/__mocks__/saved_search.ts
+++ b/src/plugins/discover/public/__mocks__/saved_search.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedSearch } from '../services/saved_searches';
-import { createSearchSourceMock } from '../../../data/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
 import { indexPatternMock } from './index_pattern';
 import { indexPatternWithTimefieldMock } from './index_pattern_with_timefield';
 
diff --git a/src/plugins/discover/public/__mocks__/search_session.ts b/src/plugins/discover/public/__mocks__/search_session.ts
index 78a7a7f90a39e..9763ff7089e0a 100644
--- a/src/plugins/discover/public/__mocks__/search_session.ts
+++ b/src/plugins/discover/public/__mocks__/search_session.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import { createMemoryHistory } from 'history';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { DataPublicPluginStart } from '../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { DiscoverSearchSessionManager } from '../application/main/services/discover_search_session';
 
 export function createSearchSessionMock() {
diff --git a/src/plugins/discover/public/__mocks__/services.ts b/src/plugins/discover/public/__mocks__/services.ts
index 5f9511d2a63fe..81938c8a9ca06 100644
--- a/src/plugins/discover/public/__mocks__/services.ts
+++ b/src/plugins/discover/public/__mocks__/services.ts
@@ -7,8 +7,8 @@
  */
 import { EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 import { DiscoverServices } from '../build_services';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { chromeServiceMock, coreMock, docLinksServiceMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { chromeServiceMock, coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 import {
   CONTEXT_STEP_SETTING,
   DEFAULT_COLUMNS_SETTING,
@@ -17,11 +17,11 @@ import {
   SAMPLE_SIZE_SETTING,
   SORT_DEFAULT_ORDER_SETTING,
 } from '../../common';
-import { UI_SETTINGS } from '../../../data/public';
-import { TopNavMenu } from '../../../navigation/public';
-import { FORMATS_UI_SETTINGS } from 'src/plugins/field_formats/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { TopNavMenu } from '@kbn/navigation-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { LocalStorageMock } from './local_storage_mock';
-import { fieldFormatsMock } from '../../../field_formats/common/mocks';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 const dataPlugin = dataPluginMock.createStartContract();
 
 export const discoverServiceMock = {
diff --git a/src/plugins/discover/public/__mocks__/start_contract.ts b/src/plugins/discover/public/__mocks__/start_contract.ts
index ac53eb4978c9d..39ccd882dbe59 100644
--- a/src/plugins/discover/public/__mocks__/start_contract.ts
+++ b/src/plugins/discover/public/__mocks__/start_contract.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ApplicationStart, PublicAppInfo } from 'src/core/public';
+import { ApplicationStart, PublicAppInfo } from '@kbn/core/public';
 import { deepFreeze } from '@kbn/std';
 import { BehaviorSubject, Subject } from 'rxjs';
 
diff --git a/src/plugins/discover/public/__mocks__/ui_settings.ts b/src/plugins/discover/public/__mocks__/ui_settings.ts
index 7c6a4768b577f..4a0515f7b7d00 100644
--- a/src/plugins/discover/public/__mocks__/ui_settings.ts
+++ b/src/plugins/discover/public/__mocks__/ui_settings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   CONTEXT_TIE_BREAKER_FIELDS_SETTING,
   DEFAULT_COLUMNS_SETTING,
diff --git a/src/plugins/discover/public/application/context/context_app.test.tsx b/src/plugins/discover/public/application/context/context_app.test.tsx
index cf1e7a98e01a3..af3c83eb50d6c 100644
--- a/src/plugins/discover/public/application/context/context_app.test.tsx
+++ b/src/plugins/discover/public/application/context/context_app.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { mockTopNavMenu } from './__mocks__/top_nav_menu';
 import { ContextAppContent } from './context_app_content';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
@@ -18,9 +18,9 @@ import { DiscoverServices } from '../../build_services';
 import { indexPatternsMock } from '../../__mocks__/index_patterns';
 import { act } from 'react-dom/test-utils';
 import { uiSettingsMock } from '../../__mocks__/ui_settings';
-import { themeServiceMock } from '../../../../../core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 import { LocalStorageMock } from '../../__mocks__/local_storage_mock';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockFilterManager = createFilterManagerMock();
 const mockNavigationPlugin = { ui: { TopNavMenu: mockTopNavMenu } };
diff --git a/src/plugins/discover/public/application/context/context_app.tsx b/src/plugins/discover/public/application/context/context_app.tsx
index d2ec535a6ed2c..e84bbf644a895 100644
--- a/src/plugins/discover/public/application/context/context_app.tsx
+++ b/src/plugins/discover/public/application/context/context_app.tsx
@@ -12,9 +12,11 @@ import classNames from 'classnames';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText, EuiPageContent, EuiPage, EuiSpacer } from '@elastic/eui';
 import { cloneDeep } from 'lodash';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
+import { generateFilters } from '@kbn/data-plugin/public';
 import { DOC_TABLE_LEGACY, SEARCH_FIELDS_FROM_SOURCE } from '../../../common';
 import { ContextErrorMessage } from './components/context_error_message';
-import { DataView, DataViewField } from '../../../../data_views/public';
 import { LoadingStatus } from './services/context_query_state';
 import { AppState, isEqualFilters } from './services/context_state';
 import { useColumns } from '../../utils/use_data_grid_columns';
@@ -25,8 +27,6 @@ import { ContextAppContent } from './context_app_content';
 import { SurrDocType } from './services/context';
 import { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import { useDiscoverServices } from '../../utils/use_discover_services';
-import { useExecutionContext } from '../../../../kibana_react/public';
-import { generateFilters } from '../../../../data/public';
 
 const ContextAppContentMemoized = memo(ContextAppContent);
 
diff --git a/src/plugins/discover/public/application/context/context_app_content.test.tsx b/src/plugins/discover/public/application/context/context_app_content.test.tsx
index c25df457807c2..9751f0d38f3d0 100644
--- a/src/plugins/discover/public/application/context/context_app_content.test.tsx
+++ b/src/plugins/discover/public/application/context/context_app_content.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { ActionBar } from './components/action_bar/action_bar';
 import { GetStateReturn } from './services/context_state';
-import { SortDirection } from 'src/plugins/data/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { ContextAppContent, ContextAppContentProps } from './context_app_content';
 import { LoadingStatus } from './services/context_query_state';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
@@ -19,7 +19,7 @@ import { DiscoverGrid } from '../../components/discover_grid/discover_grid';
 import { discoverServiceMock } from '../../__mocks__/services';
 import { DocTableWrapper } from '../../components/doc_table/doc_table_wrapper';
 import { EsHitRecordList } from '../types';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 describe('ContextAppContent test', () => {
   const mountComponent = ({
diff --git a/src/plugins/discover/public/application/context/context_app_content.tsx b/src/plugins/discover/public/application/context/context_app_content.tsx
index ffd6b3540b855..dbc82061ab9a0 100644
--- a/src/plugins/discover/public/application/context/context_app_content.tsx
+++ b/src/plugins/discover/public/application/context/context_app_content.tsx
@@ -9,9 +9,9 @@
 import React, { useState, Fragment, useMemo, useCallback } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiHorizontalRule, EuiText } from '@elastic/eui';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { CONTEXT_STEP_SETTING, DOC_HIDE_TIME_COLUMN_SETTING } from '../../../common';
-import type { DataView } from '../../../../data_views/public';
-import { SortDirection } from '../../../../data/public';
 import { LoadingStatus } from './services/context_query_state';
 import { ActionBar } from './components/action_bar/action_bar';
 import { DiscoverGrid } from '../../components/discover_grid/discover_grid';
diff --git a/src/plugins/discover/public/application/context/services/anchor.test.ts b/src/plugins/discover/public/application/context/services/anchor.test.ts
index 12c7c2c0ccb40..30ff0b039d3e7 100644
--- a/src/plugins/discover/public/application/context/services/anchor.test.ts
+++ b/src/plugins/discover/public/application/context/services/anchor.test.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView } from '../../../../../data_views/public';
-import { SortDirection } from '../../../../../data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { createSearchSourceStub } from './_stubs';
 import { fetchAnchor, updateSearchSource } from './anchor';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
diff --git a/src/plugins/discover/public/application/context/services/anchor.ts b/src/plugins/discover/public/application/context/services/anchor.ts
index 90268c094d91a..a55ed2506537f 100644
--- a/src/plugins/discover/public/application/context/services/anchor.ts
+++ b/src/plugins/discover/public/application/context/services/anchor.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ISearchSource, EsQuerySortValue } from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
+import { ISearchSource, EsQuerySortValue } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { EsHitRecord } from '../../types';
 
 export async function fetchAnchor(
diff --git a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
index c5aaf7f68b9a5..90fe6bfd7e26b 100644
--- a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
@@ -8,11 +8,11 @@
 
 import moment from 'moment';
 import { get, last } from 'lodash';
-import type { DataView } from 'src/plugins/data_views/public';
-import { SortDirection } from 'src/plugins/data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { createContextSearchSourceStub } from './_stubs';
 import { fetchSurroundingDocs, SurrDocType } from './context';
-import { DataPublicPluginStart, Query } from '../../../../../data/public';
+import { DataPublicPluginStart, Query } from '@kbn/data-plugin/public';
 import { EsHitRecord, EsHitRecordList } from '../../types';
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
diff --git a/src/plugins/discover/public/application/context/services/context.successors.test.ts b/src/plugins/discover/public/application/context/services/context.successors.test.ts
index 9fc53de86840b..0c32c3b7ed213 100644
--- a/src/plugins/discover/public/application/context/services/context.successors.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.successors.test.ts
@@ -8,10 +8,10 @@
 
 import moment from 'moment';
 import { get, last } from 'lodash';
-import { SortDirection } from 'src/plugins/data/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import { SortDirection } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { createContextSearchSourceStub } from './_stubs';
-import { DataPublicPluginStart, Query } from '../../../../../data/public';
+import { DataPublicPluginStart, Query } from '@kbn/data-plugin/public';
 import { fetchSurroundingDocs, SurrDocType } from './context';
 import { EsHitRecord, EsHitRecordList } from '../../types';
 
diff --git a/src/plugins/discover/public/application/context/services/context.test.ts b/src/plugins/discover/public/application/context/services/context.test.ts
index df5a279dfe927..c02aad483159d 100644
--- a/src/plugins/discover/public/application/context/services/context.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.test.ts
@@ -8,7 +8,7 @@
 
 import { updateSearchSource } from './context';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { createSearchSourceMock } from '../../../../../data/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
 
 describe('context api', function () {
   test('createSearchSource when useFieldsApi is true', () => {
diff --git a/src/plugins/discover/public/application/context/services/context.ts b/src/plugins/discover/public/application/context/services/context.ts
index 81e11c05e7280..336ca6a21cc33 100644
--- a/src/plugins/discover/public/application/context/services/context.ts
+++ b/src/plugins/discover/public/application/context/services/context.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { Filter } from '@kbn/es-query';
-import { DataView } from 'src/plugins/data_views/public';
-import { DataPublicPluginStart, ISearchSource } from 'src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { DataPublicPluginStart, ISearchSource } from '@kbn/data-plugin/public';
 import { reverseSortDir, SortDirection } from '../utils/sorting';
 import { convertIsoToMillis, extractNanos } from '../utils/date_conversion';
 import { fetchHitsInInterval } from '../utils/fetch_hits_in_interval';
diff --git a/src/plugins/discover/public/application/context/services/context_state.test.ts b/src/plugins/discover/public/application/context/services/context_state.test.ts
index 3eb0e8a1e85d4..4e64ff206647e 100644
--- a/src/plugins/discover/public/application/context/services/context_state.test.ts
+++ b/src/plugins/discover/public/application/context/services/context_state.test.ts
@@ -7,11 +7,11 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { getState } from './context_state';
 import { createBrowserHistory, History } from 'history';
-import { FilterManager } from '../../../../../data/public';
-import { coreMock } from '../../../../../../core/public/mocks';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../common';
 
 const setupMock = coreMock.createSetup();
diff --git a/src/plugins/discover/public/application/context/services/context_state.ts b/src/plugins/discover/public/application/context/services/context_state.ts
index 25d4d5e22126b..77fa33faa14c8 100644
--- a/src/plugins/discover/public/application/context/services/context_state.ts
+++ b/src/plugins/discover/public/application/context/services/context_state.ts
@@ -8,7 +8,7 @@
 
 import { isEqual } from 'lodash';
 import { History } from 'history';
-import { NotificationsStart, IUiSettingsClient } from 'kibana/public';
+import { NotificationsStart, IUiSettingsClient } from '@kbn/core/public';
 import { Filter, compareFilters, COMPARE_ALL_OPTIONS } from '@kbn/es-query';
 import {
   createStateContainer,
@@ -16,9 +16,9 @@ import {
   syncStates,
   withNotifyOnErrors,
   ReduxLikeStateContainer,
-} from '../../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
-import { FilterManager } from '../../../../../data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { handleSourceColumnState } from '../../../utils/state_helpers';
 
 export interface AppState {
diff --git a/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts b/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts
index 3fc2716114513..1d990f4ae8359 100644
--- a/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts
+++ b/src/plugins/discover/public/application/context/utils/fetch_hits_in_interval.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISearchSource, EsQuerySortValue, SortDirection } from '../../../../../data/public';
+import { ISearchSource, EsQuerySortValue, SortDirection } from '@kbn/data-plugin/public';
 import { convertTimeValueToIso } from './date_conversion';
 import { IntervalValue } from './generate_intervals';
 import { EsQuerySearchAfter } from './get_es_query_search_after';
diff --git a/src/plugins/discover/public/application/context/utils/generate_intervals.ts b/src/plugins/discover/public/application/context/utils/generate_intervals.ts
index 5adeb31444ee7..ed86b741f2610 100644
--- a/src/plugins/discover/public/application/context/utils/generate_intervals.ts
+++ b/src/plugins/discover/public/application/context/utils/generate_intervals.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SortDirection } from '../../../../../data/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { SurrDocType } from '../services/context';
 
 export type IntervalValue = number | null;
diff --git a/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts b/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts
index 5fcc831cce746..2bbea70e16160 100644
--- a/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts
+++ b/src/plugins/discover/public/application/context/utils/get_es_query_sort.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { EsQuerySortValue, SortDirection } from 'src/plugins/data/public';
+import type { EsQuerySortValue, SortDirection } from '@kbn/data-plugin/public';
 
 /**
  * Returns `EsQuerySort` which is used to sort records in the ES query
diff --git a/src/plugins/discover/public/application/context/utils/sorting.ts b/src/plugins/discover/public/application/context/utils/sorting.ts
index 5b31176c74f95..600997d7031ff 100644
--- a/src/plugins/discover/public/application/context/utils/sorting.ts
+++ b/src/plugins/discover/public/application/context/utils/sorting.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export enum SortDirection {
   asc = 'asc',
diff --git a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx
index d67ca4e4ca242..eafe84a9bdc7e 100644
--- a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx
+++ b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import { createFilterManagerMock } from '../../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { CONTEXT_TIE_BREAKER_FIELDS_SETTING } from '../../../../common';
 import { DiscoverServices } from '../../../build_services';
 import { FailureReason, LoadingStatus } from '../services/context_query_state';
@@ -20,9 +20,9 @@ import {
 } from '../__mocks__/use_context_app_fetch';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
 import { createContextSearchSourceStub } from '../services/_stubs';
-import { DataView } from '../../../../../data_views/public';
-import { themeServiceMock } from '../../../../../../core/public/mocks';
-import { KibanaContextProvider } from '../../../../../kibana_react/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockFilterManager = createFilterManagerMock();
 
diff --git a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx
index aaed483ae8be6..88d3764a86982 100644
--- a/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx
+++ b/src/plugins/discover/public/application/context/utils/use_context_app_fetch.tsx
@@ -7,12 +7,12 @@
  */
 import React, { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { MarkdownSimple, toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { CONTEXT_TIE_BREAKER_FIELDS_SETTING } from '../../../../common';
 import { fetchAnchor } from '../services/anchor';
 import { fetchSurroundingDocs, SurrDocType } from '../services/context';
-import { MarkdownSimple, toMountPoint, wrapWithTheme } from '../../../../../kibana_react/public';
-import type { DataView } from '../../../../../data_views/public';
-import { SortDirection } from '../../../../../data/public';
 import {
   ContextFetchState,
   FailureReason,
diff --git a/src/plugins/discover/public/application/discover_router.tsx b/src/plugins/discover/public/application/discover_router.tsx
index 0270af2383488..6950d03927b8c 100644
--- a/src/plugins/discover/public/application/discover_router.tsx
+++ b/src/plugins/discover/public/application/discover_router.tsx
@@ -10,7 +10,7 @@ import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import React from 'react';
 import { History } from 'history';
 import { EuiErrorBoundary } from '@elastic/eui';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { ContextAppRoute } from './context';
 import { SingleDocRoute } from './doc';
 import { DiscoverMainRoute } from './main';
diff --git a/src/plugins/discover/public/application/doc/components/doc.test.tsx b/src/plugins/discover/public/application/doc/components/doc.test.tsx
index 29453e7f83f19..184e6d16088e8 100644
--- a/src/plugins/discover/public/application/doc/components/doc.test.tsx
+++ b/src/plugins/discover/public/application/doc/components/doc.test.tsx
@@ -15,7 +15,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { Doc, DocProps } from './doc';
 import { SEARCH_FIELDS_FROM_SOURCE as mockSearchFieldsFromSource } from '../../../../common';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { KibanaContextProvider } from '../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockSearchApi = jest.fn();
 
diff --git a/src/plugins/discover/public/application/doc/components/doc.tsx b/src/plugins/discover/public/application/doc/components/doc.tsx
index 590651e1e6335..cd2b27c956b9d 100644
--- a/src/plugins/discover/public/application/doc/components/doc.tsx
+++ b/src/plugins/discover/public/application/doc/components/doc.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent, EuiPage } from '@elastic/eui';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { DocViewer } from '../../../services/doc_views/components/doc_viewer';
 import { ElasticRequestState } from '../types';
 import { useEsDocSearch } from '../../../utils/use_es_doc_search';
diff --git a/src/plugins/discover/public/application/doc/single_doc_route.tsx b/src/plugins/discover/public/application/doc/single_doc_route.tsx
index e2bdc6dc799e6..8ffb6f5d71fb3 100644
--- a/src/plugins/discover/public/application/doc/single_doc_route.tsx
+++ b/src/plugins/discover/public/application/doc/single_doc_route.tsx
@@ -9,6 +9,7 @@ import React, { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { getRootBreadcrumbs } from '../../utils/breadcrumbs';
 import { LoadingIndicator } from '../../components/common/loading_indicator';
 import { useIndexPattern } from '../../utils/use_index_pattern';
@@ -16,7 +17,6 @@ import { withQueryParams } from '../../utils/with_query_params';
 import { useMainRouteBreadcrumb } from '../../utils/use_navigation_props';
 import { Doc } from './components/doc';
 import { useDiscoverServices } from '../../utils/use_discover_services';
-import { useExecutionContext } from '../../../../kibana_react/public';
 
 export interface SingleDocRouteProps {
   /**
diff --git a/src/plugins/discover/public/application/index.tsx b/src/plugins/discover/public/application/index.tsx
index 826a02c29ce1a..8747492640065 100644
--- a/src/plugins/discover/public/application/index.tsx
+++ b/src/plugins/discover/public/application/index.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import { i18n } from '@kbn/i18n';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { discoverRouter } from './discover_router';
-import { toMountPoint, wrapWithTheme } from '../../../kibana_react/public';
 import { DiscoverServices } from '../build_services';
 
 export const renderApp = (element: HTMLElement, services: DiscoverServices) => {
diff --git a/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx b/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx
index a7e5baa8592eb..8f12c4b6383d2 100644
--- a/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/discover_chart.test.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { Subject, BehaviorSubject } from 'rxjs';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { DataView } from '../../../../../../data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { setHeaderActionMenuMounter, setUiActions } from '../../../../kibana_services';
 import { esHits } from '../../../../__mocks__/es_hits';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
-import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { GetStateReturn } from '../../services/discover_state';
 import { DataCharts$, DataTotalHits$ } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
@@ -22,8 +22,8 @@ import { FetchStatus } from '../../../types';
 import { Chart } from './point_series';
 import { DiscoverChart } from './discover_chart';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ReactWrapper } from 'enzyme';
 
 setHeaderActionMenuMounter(jest.fn());
diff --git a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx
index bd0f637f14c71..8251abba41fa9 100644
--- a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx
@@ -17,7 +17,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { DataView } from '../../../../../../data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { HitsCounter } from '../hits_counter';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { GetStateReturn } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx b/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx
index d336cd2c092b6..a62bd9c2317dc 100644
--- a/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/histogram.test.tsx
@@ -14,7 +14,7 @@ import { Chart } from './point_series';
 import { DiscoverHistogram } from './histogram';
 import React from 'react';
 import * as hooks from '../../utils/use_data_state';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const chartData = {
   xAxisOrderedValues: [
diff --git a/src/plugins/discover/public/application/main/components/chart/histogram.tsx b/src/plugins/discover/public/application/main/components/chart/histogram.tsx
index 2a71207e82835..c9533f70fc8e9 100644
--- a/src/plugins/discover/public/application/main/components/chart/histogram.tsx
+++ b/src/plugins/discover/public/application/main/components/chart/histogram.tsx
@@ -32,19 +32,19 @@ import {
   XYBrushEvent,
   XYChartElementEvent,
 } from '@elastic/charts';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import {
   CurrentTime,
   Endzones,
   getAdjustedInterval,
   renderEndzoneTooltip,
-} from '../../../../../../charts/public';
+} from '@kbn/charts-plugin/public';
+import { LEGACY_TIME_AXIS, MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
+import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DataCharts$, DataChartsMessage } from '../../utils/use_saved_search';
 import { FetchStatus } from '../../../types';
 import { useDataState } from '../../utils/use_data_state';
-import { LEGACY_TIME_AXIS, MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../charts/common';
 
 export interface DiscoverHistogramProps {
   savedSearchData$: DataCharts$;
diff --git a/src/plugins/discover/public/application/main/components/chart/point_series.ts b/src/plugins/discover/public/application/main/components/chart/point_series.ts
index 88b5c444f4beb..c8795296d6fd8 100644
--- a/src/plugins/discover/public/application/main/components/chart/point_series.ts
+++ b/src/plugins/discover/public/application/main/components/chart/point_series.ts
@@ -9,7 +9,7 @@
 import { uniq } from 'lodash';
 import { Duration, Moment } from 'moment';
 import { Unit } from '@kbn/datemath';
-import { SerializedFieldFormat } from '../../../../../../field_formats/common';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 
 export interface Column {
   id: string;
diff --git a/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts b/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts
index 30b3089ad2f2c..bbd670d217e58 100644
--- a/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts
+++ b/src/plugins/discover/public/application/main/components/chart/use_chart_panels.ts
@@ -10,7 +10,7 @@ import type {
   EuiContextMenuPanelItemDescriptor,
   EuiContextMenuPanelDescriptor,
 } from '@elastic/eui';
-import { search } from '../../../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 
 export function useChartPanels(
   toggleHideChart: () => void,
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx
index cfe04094fd6f6..abeb9e942c0ac 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { CALLOUT_STATE_KEY, DocumentExplorerCallout } from './document_explorer_callout';
 import { LocalStorageMock } from '../../../../__mocks__/local_storage_mock';
 import { DiscoverServices } from '../../../../build_services';
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx
index efae6bcc51db5..69dac6b6ce30a 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_callout.tsx
@@ -20,9 +20,9 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DOC_TABLE_LEGACY } from '../../../../../common';
-import { Storage } from '../../../../../../kibana_utils/public';
 
 export const CALLOUT_STATE_KEY = 'discover:docExplorerCalloutClosed';
 
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx
index f065f9c48b5f7..5bf5107dc0349 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   CALLOUT_STATE_KEY,
   DocumentExplorerUpdateCallout,
diff --git a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx
index 7e45193cba3ee..67d647e9ee685 100644
--- a/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx
+++ b/src/plugins/discover/public/application/main/components/document_explorer_callout/document_explorer_update_callout.tsx
@@ -19,8 +19,8 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import { Storage } from '../../../../../../kibana_utils/public';
 
 export const CALLOUT_STATE_KEY = 'discover:docExplorerUpdateCalloutClosed';
 
diff --git a/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx b/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
index ceae378be3bd6..9e51324aefc64 100644
--- a/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
+++ b/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
@@ -9,16 +9,16 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import type { Filter } from '@kbn/es-query';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
-import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import type { Query } from '../../../../../../data/public';
-import type { DataViewField, DataView } from '../../../../../../data_views/public';
+import type { Query } from '@kbn/data-plugin/public';
+import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import {
   EmbeddableInput,
   EmbeddableOutput,
   ErrorEmbeddable,
   IEmbeddable,
   isErrorEmbeddable,
-} from '../../../../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { FIELD_STATISTICS_LOADED } from './constants';
 import type { SavedSearch } from '../../../../services/saved_searches';
 import type { GetStateReturn } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
index 78f18e0218872..6e5b5a513f9bf 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
@@ -18,8 +18,8 @@ import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
 import { DiscoverDocuments } from './discover_documents';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
-import { ElasticSearchHit } from 'src/plugins/discover/public/types';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { ElasticSearchHit } from '../../../../types';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 setHeaderActionMenuMounter(jest.fn());
 
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
index 1c7971fe9a292..955d69509cf01 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
@@ -14,6 +14,7 @@ import {
   EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DocViewFilterFn } from '../../../../services/doc_views/doc_views_types';
 import { DiscoverGrid } from '../../../../components/discover_grid/discover_grid';
@@ -25,7 +26,6 @@ import {
   SEARCH_FIELDS_FROM_SOURCE,
 } from '../../../../../common';
 import { useColumns } from '../../../../utils/use_data_grid_columns';
-import { DataView } from '../../../../../../data_views/public';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { DataDocumentsMsg, DataDocuments$ } from '../../utils/use_saved_search';
 import { AppState, GetStateReturn } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
index 6ff808a65eb5e..43d58f63f5fa6 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
@@ -14,9 +14,9 @@ import { DiscoverLayout, SIDEBAR_CLOSED_KEY } from './discover_layout';
 import { esHits } from '../../../../__mocks__/es_hits';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
-import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
-import type { DataView, DataViewAttributes } from '../../../../../../data_views/public';
-import { SavedObject } from '../../../../../../../core/types';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
 import { GetStateReturn } from '../../services/discover_state';
 import { DiscoverLayoutProps } from './types';
@@ -29,12 +29,12 @@ import {
 } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
-import { RequestAdapter } from '../../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { Chart } from '../chart/point_series';
 import { DiscoverSidebar } from '../sidebar/discover_sidebar';
 import { ElasticSearchHit } from '../../../../types';
-import { LocalStorageMock } from 'src/plugins/discover/public/__mocks__/local_storage_mock';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { LocalStorageMock } from '../../../../__mocks__/local_storage_mock';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../../../../build_services';
 
 setHeaderActionMenuMounter(jest.fn());
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
index b6ee4133f1f75..ad1c96e308d12 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -21,11 +21,12 @@ import {
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import classNames from 'classnames';
+import { generateFilters } from '@kbn/data-plugin/public';
+import { DataView, DataViewField, DataViewType } from '@kbn/data-views-plugin/public';
+import { InspectorSession } from '@kbn/inspector-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverNoResults } from '../no_results';
 import { LoadingSpinner } from '../loading_spinner/loading_spinner';
-import { generateFilters } from '../../../../../../data/public';
-import { DataView, DataViewField, DataViewType } from '../../../../../../data_views/public';
 import { DiscoverSidebarResponsive } from '../sidebar';
 import { DiscoverLayoutProps } from './types';
 import { SEARCH_FIELDS_FROM_SOURCE, SHOW_FIELD_STATISTICS } from '../../../../../common';
@@ -34,7 +35,6 @@ import { DiscoverTopNav } from '../top_nav/discover_topnav';
 import { DocViewFilterFn } from '../../../../services/doc_views/doc_views_types';
 import { DiscoverChart } from '../chart';
 import { getResultState } from '../../utils/get_result_state';
-import { InspectorSession } from '../../../../../../inspector/public';
 import { DiscoverUninitialized } from '../uninitialized/uninitialized';
 import { DataMainMsg } from '../../utils/use_saved_search';
 import { useColumns } from '../../../../utils/use_data_grid_columns';
@@ -307,7 +307,7 @@ export function DiscoverLayout({
                 />
               )}
               {resultState === 'uninitialized' && (
-                <DiscoverUninitialized onRefresh={() => savedSearchRefetch$.next()} />
+                <DiscoverUninitialized onRefresh={() => savedSearchRefetch$.next(undefined)} />
               )}
               {resultState === 'loading' && <LoadingSpinner />}
               {resultState === 'ready' && (
diff --git a/src/plugins/discover/public/application/main/components/layout/types.ts b/src/plugins/discover/public/application/main/components/layout/types.ts
index 4399cacf8c3c6..295351f2cd318 100644
--- a/src/plugins/discover/public/application/main/components/layout/types.ts
+++ b/src/plugins/discover/public/application/main/components/layout/types.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import type { Query, TimeRange, SavedObject } from '../../../../../../data/public';
-import type { DataView, DataViewAttributes } from '../../../../../../data_views/public';
-import { ISearchSource } from '../../../../../../data/public';
+import type { Query, TimeRange, SavedObject } from '@kbn/data-plugin/public';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { AppState, GetStateReturn } from '../../services/discover_state';
 import { DataRefetch$, SavedSearchData } from '../../utils/use_saved_search';
 import { SavedSearch } from '../../../../services/saved_searches';
-import { RequestAdapter } from '../../../../../../inspector';
 import { ElasticSearchHit } from '../../../../types';
 
 export interface DiscoverLayoutProps {
diff --git a/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx b/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx
index cbfd6e05cb646..6ead00f8cce06 100644
--- a/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx
+++ b/src/plugins/discover/public/application/main/components/no_results/no_results.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { DiscoverNoResults, DiscoverNoResultsProps } from './no_results';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 beforeEach(() => {
   jest.clearAllMocks();
diff --git a/src/plugins/discover/public/application/main/components/no_results/no_results.tsx b/src/plugins/discover/public/application/main/components/no_results/no_results.tsx
index 223938dedf303..4e6f4425f56e0 100644
--- a/src/plugins/discover/public/application/main/components/no_results/no_results.tsx
+++ b/src/plugins/discover/public/application/main/components/no_results/no_results.tsx
@@ -16,7 +16,7 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { DataPublicPluginStart } from '../../../../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { NoResultsSuggestions } from './no_results_suggestions';
 import './_no_results.scss';
 import { NoResultsIllustration } from './assets/no_results_illustration';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx b/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx
index 3547359209700..bf921dc22234e 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/__stories__/discover_field_details.stories.tsx
@@ -9,9 +9,9 @@
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DiscoverFieldDetails } from '../discover_field_details';
-import { DataViewField } from '../../../../../../../data_views/public';
-import { DataView } from '../../../../../../../data_views/public';
 import { fieldSpecMap } from './fields';
 import { numericField as field } from './fields';
 import { Bucket } from '../types';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts b/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts
index ce630953d9d3c..04f1cb9eb618b 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/__stories__/fields.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField, FieldSpec } from '../../../../../../../data_views/public';
+import { DataViewField, FieldSpec } from '@kbn/data-views-plugin/public';
 
 export const fieldSpecMap: Record<string, FieldSpec> = {
   'machine.os': {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
index 9447405e878be..4b2ccf1bff0bb 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
@@ -11,9 +11,9 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 import { DiscoverField } from './discover_field';
-import { DataViewField } from '../../../../../../data_views/public';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
-import { stubDataView } from '../../../../../../data_views/common/data_view.stub';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 
 jest.mock('../../../../kibana_services', () => ({
   getUiActions: jest.fn(() => {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
index e14d9f7a0e5a7..40bc0a9f6df14 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
@@ -25,10 +25,10 @@ import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
 import classNames from 'classnames';
 import { FieldButton, FieldIcon } from '@kbn/react-field';
+import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import { getTypeForFieldIcon } from '../../../../utils/get_type_for_field_icon';
 import { DiscoverFieldDetails } from './discover_field_details';
 import { FieldDetails } from './types';
-import type { DataViewField, DataView } from '../../../../../../data_views/public';
 import { getFieldTypeName } from './lib/get_field_type_name';
 import { DiscoverFieldVisualize } from './discover_field_visualize';
 
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx
index 86f563c546654..ac0dd3e7f8186 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_bucket.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { EuiText, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { StringFieldProgressBar } from './string_progress_bar';
 import { Bucket } from './types';
-import { DataViewField } from '../../../../../../data_views/public';
 import './discover_field_bucket.scss';
 
 interface Props {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx
index e7ae1043851be..075e58829c751 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.test.tsx
@@ -11,8 +11,8 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 import { DiscoverFieldDetails } from './discover_field_details';
-import { DataViewField } from '../../../../../../data_views/public';
-import { stubDataView } from '../../../../../../data_views/common/data_view.stub';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('discover sidebar field details', function () {
   const onAddFilter = jest.fn();
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx
index dfd01a9769abd..45924257189b7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_details.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { EuiText, EuiSpacer, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/public';
 import { DiscoverFieldBucket } from './discover_field_bucket';
 import { Bucket, FieldDetails } from './types';
-import { DataViewField, DataView } from '../../../../../../data_views/public';
 
 interface DiscoverFieldDetailsProps {
   field: DataViewField;
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
index 454f8620d7b08..1601032fc5af2 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_search.test.tsx
@@ -13,7 +13,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { DiscoverFieldSearch, Props } from './discover_field_search';
 import { EuiButtonGroupProps, EuiPopover } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 describe('DiscoverFieldSearch', () => {
   const defaultProps = {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx
index 1adb355b6ef40..3cdc0619aa151 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize.tsx
@@ -8,7 +8,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 import { triggerVisualizeActions, VisualizeInformation } from './lib/visualize_trigger_utils';
 import type { FieldDetails } from './types';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx
index d2b9e5cd6b587..fcdd85ccb3d70 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field_visualize_inner.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DataViewField } from '../../../../../../data_views/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { VisualizeInformation } from './lib/visualize_trigger_utils';
 
 interface DiscoverFieldVisualizeInnerProps {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx
index 488f1ae166772..d640e2fa11594 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.test.tsx
@@ -12,10 +12,10 @@ import { shallowWithIntl as shallow } from '@kbn/test-jest-helpers';
 import { ShallowWrapper } from 'enzyme';
 import { ChangeIndexPattern } from './change_indexpattern';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { DiscoverIndexPattern, DiscoverIndexPatternProps } from './discover_index_pattern';
 import { EuiSelectable } from '@elastic/eui';
-import type { DataView, DataViewAttributes } from 'src/plugins/data_views/public';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { indexPatternsMock } from '../../../../__mocks__/index_patterns';
 
 const indexPattern = {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx
index 0bbd78ed36cb7..83aa3ce478215 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern.tsx
@@ -7,8 +7,8 @@
  */
 
 import React, { useState, useEffect } from 'react';
-import { SavedObject } from 'kibana/public';
-import type { DataView, DataViewAttributes } from 'src/plugins/data_views/public';
+import { SavedObject } from '@kbn/core/public';
+import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { IndexPatternRef } from './types';
 import { ChangeIndexPattern } from './change_indexpattern';
 
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx
index b511dc08f1e91..cddbe087030e7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.test.tsx
@@ -11,8 +11,8 @@ import { mountWithIntl, findTestSubject } from '@kbn/test-jest-helpers';
 import { EuiContextMenuPanel, EuiPopover, EuiContextMenuItem } from '@elastic/eui';
 import { DiscoverServices } from '../../../../build_services';
 import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
-import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { stubLogstashIndexPattern } from '@kbn/data-plugin/common/stubs';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockServices = {
   history: () => ({
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx
index f993d151f4479..823aa9c0050c0 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_index_pattern_management.tsx
@@ -15,8 +15,8 @@ import {
   EuiPopover,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import type { DataView } from '../../../../../../data_views/public';
 
 export interface DiscoverIndexPatternManagementProps {
   /**
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
index 3d3c4b9da4516..c26a2c01f256a 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
@@ -10,21 +10,21 @@ import { cloneDeep, each } from 'lodash';
 import { ReactWrapper } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 // @ts-expect-error
-import realHits from '../../../../__fixtures__/real_hits.js';
+import realHits from '../../../../__fixtures__/real_hits';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { DiscoverSidebarProps } from './discover_sidebar';
-import { flattenHit } from '../../../../../../data/public';
-import { DataViewAttributes } from '../../../../../../data_views/public';
-import { SavedObject } from '../../../../../../../core/types';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebarComponent as DiscoverSidebar } from './discover_sidebar';
 import { discoverServiceMock as mockDiscoverServices } from '../../../../__mocks__/services';
-import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
+import { stubLogstashIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
 import { ElasticSearchHit } from '../../../../types';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { BehaviorSubject } from 'rxjs';
 import { FetchStatus } from '../../../types';
 import { AvailableFields$ } from '../../utils/use_saved_search';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
index f3a3f121e36ad..fb6af1bc1b775 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
@@ -25,13 +25,14 @@ import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect';
 
 import { isEqual, sortBy } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { indexPatterns as indexPatternUtils } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverField } from './discover_field';
 import { DiscoverIndexPattern } from './discover_index_pattern';
 import { DiscoverFieldSearch } from './discover_field_search';
 import { FIELDS_LIMIT_SETTING } from '../../../../../common';
 import { groupFields } from './lib/group_fields';
-import { indexPatterns as indexPatternUtils } from '../../../../../../data/public';
 import { getDetails } from './lib/get_details';
 import { FieldFilterState, getDefaultFieldFilter, setFieldFilterProp } from './lib/field_filter';
 import { getIndexPatternFieldList } from './lib/get_index_pattern_field_list';
@@ -39,7 +40,6 @@ import { DiscoverSidebarResponsiveProps } from './discover_sidebar_responsive';
 import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
 import { ElasticSearchHit } from '../../../../types';
-import { DataViewField } from '../../../../../../data_views/public';
 
 /**
  * Default number of available fields displayed and added on scroll
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
index 2adb1e5607a3b..d3af81c06c129 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
@@ -11,13 +11,13 @@ import { BehaviorSubject } from 'rxjs';
 import { ReactWrapper } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 // @ts-expect-error
-import realHits from '../../../../__fixtures__/real_hits.js';
+import realHits from '../../../../__fixtures__/real_hits';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
-import { DataViewAttributes } from '../../../../../../data_views/public';
-import { flattenHit } from '../../../../../../data/public';
-import { SavedObject } from '../../../../../../../core/types';
+import { DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import {
   DiscoverSidebarResponsive,
   DiscoverSidebarResponsiveProps,
@@ -25,10 +25,10 @@ import {
 import { DiscoverServices } from '../../../../build_services';
 import { FetchStatus } from '../../../types';
 import { AvailableFields$, DataDocuments$ } from '../../utils/use_saved_search';
-import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
+import { stubLogstashIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
 import { ElasticSearchHit } from '../../../../types';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockServices = {
   history: () => ({
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
index 506c16de8ee02..f2f58c43d5e7f 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
@@ -26,14 +26,10 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
+import type { DataViewField, DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
+import { SavedObject } from '@kbn/core/types';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverIndexPattern } from './discover_index_pattern';
-import type {
-  DataViewField,
-  DataView,
-  DataViewAttributes,
-} from '../../../../../../data_views/public';
-import { SavedObject } from '../../../../../../../core/types';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebar } from './discover_sidebar';
 import { AppState } from '../../services/discover_state';
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js
index 5562d0159a76d..24a2d0d7140e7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.js
@@ -8,7 +8,7 @@
 
 import { map, sortBy, without, each, defaults, isObject } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { flattenHit } from '../../../../../../../data/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 
 function getFieldValues(hits, field, indexPattern) {
   const name = field.name;
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts
index f94032afb18d6..d3f8b0064be65 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_calculator.test.ts
@@ -10,13 +10,13 @@
 
 import { keys, each, cloneDeep, clone, uniq, filter, map } from 'lodash';
 // @ts-expect-error
-import realHits from '../../../../../__fixtures__/real_hits.js';
-import { flattenHit } from '../../../../../../../data/public';
-import type { DataView } from '../../../../../../../data_views/public';
+import realHits from '../../../../../__fixtures__/real_hits';
+import { flattenHit } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
-import { stubLogstashDataView as dataView } from '../../../../../../../data_views/common/data_view.stub';
+import { stubLogstashDataView as dataView } from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('fieldCalculator', function () {
   it('should have a _countMissing that counts nulls & undefineds in an array', function () {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts
index c298c198dd267..7020dfcc418eb 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getDefaultFieldFilter, setFieldFilterProp, isFieldFiltered } from './field_filter';
-import { DataViewField } from '../../../../../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 describe('field_filter', function () {
   it('getDefaultFieldFilter should return default filter state', function () {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts
index 602c25c2c99c9..0ca0cea75ad5c 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/field_filter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from '../../../../../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 export interface FieldFilterState {
   missing: boolean;
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
index 6111b2bf0876d..78e752494c43d 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
-import { DataView, DataViewField } from '../../../../../../../data_views/public';
 import { ElasticSearchHit } from '../../../../../types';
 
 export function getDetails(
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts
index c53e3b494f2cb..eba306098b832 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/get_index_pattern_field_list.ts
@@ -7,7 +7,7 @@
  */
 
 import { difference } from 'lodash';
-import { DataView, DataViewField } from 'src/plugins/data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { isNestedFieldParent } from '../../../utils/nested_fields';
 
 export function getIndexPatternFieldList(
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts
index afd5eb6964598..10d9d4face166 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.test.ts
@@ -8,7 +8,7 @@
 
 import { groupFields } from './group_fields';
 import { getDefaultFieldFilter } from './field_filter';
-import { DataViewField } from '../../../../../../../data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 const fields = [
   {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx
index 8d2a7db8e30a5..587f89d363141 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/group_fields.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataViewField, getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
 import { FieldFilterState, isFieldFiltered } from './field_filter';
-import { DataViewField, getFieldSubtypeMulti } from '../../../../../../../data_views/public';
 
 interface GroupedFields {
   selected: DataViewField[];
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts
index 5494f5bfee590..3114e6e574fae 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { DataViewField } from 'src/plugins/data_views/public';
-import type { Action } from 'src/plugins/ui_actions/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
+import type { Action } from '@kbn/ui-actions-plugin/public';
 import { getVisualizeInformation } from './visualize_trigger_utils';
 
 const field = {
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts
index ff9406c21c02f..20a0b4a714671 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts
@@ -11,10 +11,10 @@ import {
   VISUALIZE_GEO_FIELD_TRIGGER,
   visualizeFieldTrigger,
   visualizeGeoFieldTrigger,
-} from '../../../../../../../ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getUiActions } from '../../../../../kibana_services';
-import type { DataViewField } from '../../../../../../../data_views/public';
-import { KBN_FIELD_TYPES } from '../../../../../../../data/public';
 
 function getTriggerConstant(type: string) {
   return type === KBN_FIELD_TYPES.GEO_POINT || type === KBN_FIELD_TYPES.GEO_SHAPE
diff --git a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx
index 834e7283bddfb..938d2d55df004 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.test.tsx
@@ -11,16 +11,16 @@ import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
 import { DiscoverTopNav, DiscoverTopNavProps } from './discover_topnav';
-import { TopNavMenuData } from '../../../../../../navigation/public';
-import { ISearchSource, Query } from '../../../../../../data/public';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
+import { ISearchSource, Query } from '@kbn/data-plugin/public';
 import { GetStateReturn } from '../../services/discover_state';
 import { setHeaderActionMenuMounter } from '../../../../kibana_services';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 
 setHeaderActionMenuMounter(jest.fn());
 
-jest.mock('../../../../../../kibana_react/public', () => ({
-  ...jest.requireActual('../../../../../../kibana_react/public'),
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
+  ...jest.requireActual('@kbn/kibana-react-plugin/public'),
   useKibana: () => ({
     services: jest.requireActual('../../../../__mocks__/services').discoverServiceMock,
   }),
diff --git a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx
index d0b79cf11a519..8656a2fdb7072 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/discover_topnav.tsx
@@ -7,13 +7,13 @@
  */
 import React, { useCallback, useMemo } from 'react';
 import { useHistory } from 'react-router-dom';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
+import { DataViewType } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverLayoutProps } from '../layout/types';
 import { getTopNavLinks } from './get_top_nav_links';
-import { Query, TimeRange } from '../../../../../../data/public';
 import { getHeaderActionMenuMounter } from '../../../../kibana_services';
 import { GetStateReturn } from '../../services/discover_state';
-import { DataViewType } from '../../../../../../data_views/public';
 
 export type DiscoverTopNavProps = Pick<
   DiscoverLayoutProps,
diff --git a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts
index 6cf37c5333597..40ef4669db093 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts
+++ b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISearchSource } from 'src/plugins/data/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
 import { getTopNavLinks } from './get_top_nav_links';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx
index abf9a790a2417..f2ac0d2bfa060 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/get_top_nav_links.tsx
@@ -7,17 +7,17 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ISearchSource } from 'src/plugins/data/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { ISearchSource } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { unhashUrl } from '@kbn/kibana-utils-plugin/public';
+import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import { showOpenSearchPanel } from './show_open_search_panel';
 import { getSharingData, showPublicUrlSwitch } from '../../../../utils/get_sharing_data';
-import { unhashUrl } from '../../../../../../kibana_utils/public';
 import { DiscoverServices } from '../../../../build_services';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { onSaveSearch } from './on_save_search';
 import { GetStateReturn } from '../../services/discover_state';
 import { openOptionsPopover } from './open_options_popover';
-import type { TopNavMenuData } from '../../../../../../navigation/public';
 import { openAlertsPopover } from './open_alerts_popover';
 
 /**
diff --git a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx
index c0d4a34a4e429..ec1d9eef5fcc4 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.test.tsx
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { showSaveModal } from '../../../../../../saved_objects/public';
-jest.mock('../../../../../../saved_objects/public');
+import { showSaveModal } from '@kbn/saved-objects-plugin/public';
+jest.mock('@kbn/saved-objects-plugin/public');
 
 import { onSaveSearch } from './on_save_search';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../../__mocks__/saved_search';
 import { DiscoverServices } from '../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
-import { i18nServiceMock } from '../../../../../../../core/public/mocks';
+import { i18nServiceMock } from '@kbn/core/public/mocks';
 
 test('onSaveSearch', async () => {
   const serviceMock = {
diff --git a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx
index c56a7f8f347da..88be94742dfd5 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectSaveModal, showSaveModal } from '../../../../../../saved_objects/public';
+import { SavedObjectSaveModal, showSaveModal } from '@kbn/saved-objects-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearch, SaveSavedSearchOptions } from '../../../../services/saved_searches';
-import { DataView } from '../../../../../../data_views/public';
 import { DiscoverServices } from '../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
 import { setBreadcrumbsTitle } from '../../../../utils/breadcrumbs';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx
index 21d560ccb539d..d414919e567f9 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx
@@ -8,11 +8,11 @@
 
 import React, { useCallback, useState, useMemo } from 'react';
 import ReactDOM from 'react-dom';
-import { I18nStart } from 'kibana/public';
+import { I18nStart } from '@kbn/core/public';
 import { EuiWrappingPopover, EuiLink, EuiContextMenu, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ISearchSource } from '../../../../../../data/common';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { ISearchSource } from '@kbn/data-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../../../../build_services';
 import { updateSearchSource } from '../../utils/update_search_source';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx
index ef64e602280b4..41636ac93139c 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { OptionsPopover } from './open_options_popover';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 test('should display the correct text if datagrid is selected', () => {
   const element = document.createElement('div');
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx
index b52aa21414664..af976ccc7dca3 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_options_popover.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreTheme, I18nStart } from 'kibana/public';
+import { CoreTheme, I18nStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import {
@@ -23,10 +23,10 @@ import {
 } from '@elastic/eui';
 import './open_options_popover.scss';
 import { Observable } from 'rxjs';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DiscoverServices } from '../../../../build_services';
 import { DOC_TABLE_LEGACY } from '../../../../../common';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../../../../kibana_react/public';
 
 const container = document.createElement('div');
 let isOpen = false;
diff --git a/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx b/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx
index 3c972a3f4bb98..3e5a40dd94162 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/open_search_panel.tsx
@@ -20,7 +20,7 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
-import { SavedObjectFinderUi } from '../../../../../../saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 
 const SEARCH_OBJECT_TYPE = 'search';
diff --git a/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx b/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx
index 6ba1ffd15130a..b437a753af37d 100644
--- a/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx
+++ b/src/plugins/discover/public/application/main/components/top_nav/show_open_search_panel.tsx
@@ -8,11 +8,11 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreTheme, I18nStart } from 'kibana/public';
+import { CoreTheme, I18nStart } from '@kbn/core/public';
 import { Observable } from 'rxjs';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../../../../build_services';
 import { OpenSearchPanel } from './open_search_panel';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../../../../kibana_react/public';
 
 let isOpen = false;
 
diff --git a/src/plugins/discover/public/application/main/discover_main_app.test.tsx b/src/plugins/discover/public/application/main/discover_main_app.test.tsx
index 86cd009b86d77..ceb06df058fae 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.test.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.test.tsx
@@ -10,11 +10,11 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { DiscoverMainApp } from './discover_main_app';
 import { savedSearchMock } from '../../__mocks__/saved_search';
-import { SavedObject } from '../../../../../core/types';
-import type { DataViewAttributes } from '../../../../data_views/public';
+import { SavedObject } from '@kbn/core/types';
+import type { DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { setHeaderActionMenuMounter } from '../../kibana_services';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { discoverServiceMock } from '../../__mocks__/services';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
index 74bd997df0a42..fd1a438e70d04 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -7,13 +7,13 @@
  */
 import React, { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
+import type { DataViewAttributes } from '@kbn/data-views-plugin/public';
+import type { SavedObject } from '@kbn/data-plugin/public';
 import { DiscoverLayout } from './components/layout';
 import { setBreadcrumbsTitle } from '../../utils/breadcrumbs';
 import { addHelpMenuToAppChrome } from '../../components/help_menu/help_menu_util';
 import { useDiscoverState } from './utils/use_discover_state';
 import { useUrl } from './utils/use_url';
-import type { DataViewAttributes } from '../../../../data_views/public';
-import type { SavedObject } from '../../../../data/public';
 import { SavedSearch } from '../../services/saved_searches';
 import { ElasticSearchHit } from '../../types';
 import { useDiscoverServices } from '../../utils/use_discover_services';
diff --git a/src/plugins/discover/public/application/main/discover_main_route.tsx b/src/plugins/discover/public/application/main/discover_main_route.tsx
index 84d702dab7627..0361cf1764419 100644
--- a/src/plugins/discover/public/application/main/discover_main_route.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_route.tsx
@@ -7,12 +7,14 @@
  */
 import React, { useEffect, useState, memo, useCallback } from 'react';
 import { useParams, useHistory } from 'react-router-dom';
-import { SavedObject } from 'src/plugins/data/public';
-import { ISearchSource } from 'src/plugins/data/public';
+import { SavedObject } from '@kbn/data-plugin/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
 import {
   DataViewAttributes,
   DataViewSavedObjectConflictError,
-} from '../../../../data_views/public';
+} from '@kbn/data-views-plugin/public';
+import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import {
   SavedSearch,
   getSavedSearch,
@@ -22,12 +24,10 @@ import { getState } from './services/discover_state';
 import { loadIndexPattern, resolveIndexPattern } from './utils/resolve_index_pattern';
 import { DiscoverMainApp } from './discover_main_app';
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../../utils/breadcrumbs';
-import { redirectWhenMissing } from '../../../../kibana_utils/public';
 import { LoadingIndicator } from '../../components/common/loading_indicator';
 import { DiscoverError } from '../../components/common/error_alert';
 import { useDiscoverServices } from '../../utils/use_discover_services';
 import { getUrlTracker } from '../../kibana_services';
-import { useExecutionContext } from '../../../../kibana_react/public';
 
 const DiscoverMainAppMemoized = memo(DiscoverMainApp);
 
diff --git a/src/plugins/discover/public/application/main/services/discover_search_session.ts b/src/plugins/discover/public/application/main/services/discover_search_session.ts
index 98376d1e1391a..5797b0381b1bf 100644
--- a/src/plugins/discover/public/application/main/services/discover_search_session.ts
+++ b/src/plugins/discover/public/application/main/services/discover_search_session.ts
@@ -9,12 +9,12 @@
 import { History } from 'history';
 import * as Rx from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { DataPublicPluginStart } from '../../../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   createQueryParamObservable,
   getQueryParams,
   removeQueryParam,
-} from '../../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { SEARCH_SESSION_ID_QUERY_PARAM } from '../../../constants';
 
 export interface DiscoverSearchSessionManagerDeps {
diff --git a/src/plugins/discover/public/application/main/services/discover_state.test.ts b/src/plugins/discover/public/application/main/services/discover_state.test.ts
index 5c9900c6a2d78..f81393454a7c7 100644
--- a/src/plugins/discover/public/application/main/services/discover_state.test.ts
+++ b/src/plugins/discover/public/application/main/services/discover_state.test.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   getState,
   GetStateReturn,
   createSearchSessionRestorationDataProvider,
 } from './discover_state';
 import { createBrowserHistory, History } from 'history';
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import type { SavedSearch } from '../../../services/saved_searches';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../common';
 
diff --git a/src/plugins/discover/public/application/main/services/discover_state.ts b/src/plugins/discover/public/application/main/services/discover_state.ts
index 0d4c947701379..81f25e6151c99 100644
--- a/src/plugins/discover/public/application/main/services/discover_state.ts
+++ b/src/plugins/discover/public/application/main/services/discover_state.ts
@@ -9,7 +9,7 @@
 import { isEqual, cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { History } from 'history';
-import { NotificationsStart, IUiSettingsClient } from 'kibana/public';
+import { NotificationsStart, IUiSettingsClient } from '@kbn/core/public';
 import { Filter, FilterStateStore, compareFilters, COMPARE_ALL_OPTIONS } from '@kbn/es-query';
 import {
   createKbnUrlStateStorage,
@@ -19,7 +19,7 @@ import {
   StateContainer,
   syncState,
   withNotifyOnErrors,
-} from '../../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import {
   connectToQueryState,
   DataPublicPluginStart,
@@ -27,8 +27,8 @@ import {
   Query,
   SearchSessionInfoProvider,
   syncQueryStateWithUrl,
-} from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { migrateLegacyQuery } from '../../../utils/migrate_legacy_query';
 import { DiscoverGridSettings } from '../../../components/discover_grid/types';
 import { SavedSearch } from '../../../services/saved_searches';
diff --git a/src/plugins/discover/public/application/main/utils/calc_field_counts.ts b/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
index 646ac7a10bf0b..cf2b5d7a880b3 100644
--- a/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
+++ b/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView } from '../../../../../data_views/public';
-import { flattenHit } from '../../../../../data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { ElasticSearchHit } from '../../../types';
 
 /**
diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
index d63b2323f607e..03a414cd70702 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 import { FetchStatus } from '../../types';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
 import { reduce } from 'rxjs/operators';
-import { SearchSource } from '../../../../../data/public';
-import { RequestAdapter } from '../../../../../inspector';
+import { SearchSource } from '@kbn/data-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/common';
+import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { AppState } from '../services/discover_state';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { fetchAll } from './fetch_all';
@@ -45,9 +45,9 @@ const mockFetchTotalHits = fetchTotalHits as unknown as jest.MockedFunction<type
 const mockFetchChart = fetchChart as unknown as jest.MockedFunction<typeof fetchChart>;
 
 function subjectCollector<T>(subject: Subject<T>): () => Promise<T[]> {
-  const promise = subject
-    .pipe(reduce((history, value) => history.concat([value]), [] as T[]))
-    .toPromise();
+  const promise = firstValueFrom(
+    subject.pipe(reduce((history, value) => history.concat([value]), [] as T[]))
+  );
 
   return () => {
     subject.complete();
diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.ts b/src/plugins/discover/public/application/main/utils/fetch_all.ts
index da89b88e990a6..a897c2e18f384 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_all.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_all.ts
@@ -5,6 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { Adapters } from '@kbn/inspector-plugin';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
+import { DataViewType } from '@kbn/data-views-plugin/public';
 import {
   sendCompleteMsg,
   sendErrorMsg,
@@ -18,11 +23,8 @@ import type { SavedSearch, SortOrder } from '../../../services/saved_searches';
 import { fetchDocuments } from './fetch_documents';
 import { fetchTotalHits } from './fetch_total_hits';
 import { fetchChart } from './fetch_chart';
-import { ISearchSource } from '../../../../../data/public';
-import { Adapters } from '../../../../../inspector';
 import { AppState } from '../services/discover_state';
 import { FetchStatus } from '../../types';
-import { DataPublicPluginStart } from '../../../../../data/public';
 import {
   DataCharts$,
   DataDocuments$,
@@ -31,8 +33,6 @@ import {
   SavedSearchData,
 } from './use_saved_search';
 import { DiscoverServices } from '../../../build_services';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/common';
-import { DataViewType } from '../../../../../data_views/public';
 
 export interface FetchDeps {
   abortController: AbortController;
diff --git a/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts b/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts
index 17423fad1ae9e..6a5ce76c2e66a 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_chart.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 import { of, throwError as throwErrorRx } from 'rxjs';
-import { RequestAdapter } from '../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { fetchChart, updateSearchSource } from './fetch_chart';
-import { ReduxLikeStateContainer } from '../../../../../kibana_utils/common';
+import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { AppState } from '../services/discover_state';
 import { discoverServiceMock } from '../../../__mocks__/services';
-import { calculateBounds, IKibanaSearchResponse } from '../../../../../data/public';
+import { calculateBounds, IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FetchDeps } from './fetch_all';
 
diff --git a/src/plugins/discover/public/application/main/utils/fetch_chart.ts b/src/plugins/discover/public/application/main/utils/fetch_chart.ts
index 9d1baf6e57cb2..21270e2f94655 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_chart.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_chart.ts
@@ -7,14 +7,15 @@
  */
 import { i18n } from '@kbn/i18n';
 import { filter, map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
 import {
   DataPublicPluginStart,
   isCompleteResponse,
   search,
   ISearchSource,
   tabifyAggResponse,
-} from '../../../../../data/public';
-import { getChartAggConfigs, getDimensions } from './index';
+} from '@kbn/data-plugin/public';
+import { getChartAggConfigs, getDimensions } from '.';
 import { buildPointSeriesData, Chart } from '../components/chart/point_series';
 import { TimechartBucketInterval } from './use_saved_search';
 import { FetchDeps } from './fetch_all';
@@ -77,7 +78,7 @@ export function fetchChart(
       })
     );
 
-  return fetch$.toPromise();
+  return lastValueFrom(fetch$);
 }
 
 export function updateSearchSource(
diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts
index bca83de0c46dd..5796c488dd8fb 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_documents.test.ts
@@ -7,10 +7,10 @@
  */
 import { fetchDocuments } from './fetch_documents';
 import { throwError as throwErrorRx, of } from 'rxjs';
-import { RequestAdapter } from '../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { discoverServiceMock } from '../../../__mocks__/services';
-import { IKibanaSearchResponse } from 'src/plugins/data/public';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import { FetchDeps } from './fetch_all';
 import { fetchTotalHits } from './fetch_total_hits';
diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
index 57be8911d7d0e..d652f544a8f70 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_documents.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
@@ -7,7 +7,8 @@
  */
 import { i18n } from '@kbn/i18n';
 import { filter, map } from 'rxjs/operators';
-import { isCompleteResponse, ISearchSource } from '../../../../../data/public';
+import { lastValueFrom } from 'rxjs';
+import { isCompleteResponse, ISearchSource } from '@kbn/data-plugin/public';
 import { SAMPLE_SIZE_SETTING } from '../../../../common';
 import { FetchDeps } from './fetch_all';
 
@@ -55,5 +56,5 @@ export const fetchDocuments = (
       map((res) => res.rawResponse.hits.hits)
     );
 
-  return fetch$.toPromise();
+  return lastValueFrom(fetch$);
 };
diff --git a/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts b/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts
index 65848d7ddd254..f0e079e146753 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 import { throwError as throwErrorRx, of } from 'rxjs';
-import { RequestAdapter } from '../../../../../inspector';
+import { RequestAdapter } from '@kbn/inspector-plugin';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { fetchTotalHits } from './fetch_total_hits';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import { IKibanaSearchResponse } from 'src/plugins/data/public';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import { FetchDeps } from './fetch_all';
 
 const getDeps = () =>
diff --git a/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts b/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
index 080cec6cf2646..40eb7ebf8db76 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_total_hits.ts
@@ -8,8 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { filter, map } from 'rxjs/operators';
-import { isCompleteResponse, ISearchSource } from '../../../../../data/public';
-import { DataViewType } from '../../../../../data_views/public';
+import { lastValueFrom } from 'rxjs';
+import { isCompleteResponse, ISearchSource } from '@kbn/data-plugin/public';
+import { DataViewType } from '@kbn/data-views-plugin/public';
 import { FetchDeps } from './fetch_all';
 
 export function fetchTotalHits(
@@ -53,5 +54,5 @@ export function fetchTotalHits(
       map((res) => res.rawResponse.hits.total as number)
     );
 
-  return fetch$.toPromise();
+  return lastValueFrom(fetch$);
 }
diff --git a/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts b/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts
index ded1cf1d858af..53200975e0690 100644
--- a/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_chart_agg_config.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
-import { ISearchSource } from '../../../../../data/public';
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { getChartAggConfigs } from './get_chart_agg_configs';
 
 describe('getChartAggConfigs', () => {
diff --git a/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts b/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts
index c7210a49fbc32..f816a8dbb2eff 100644
--- a/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts
+++ b/src/plugins/discover/public/application/main/utils/get_chart_agg_configs.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataPublicPluginStart, ISearchSource } from '../../../../../data/public';
+import { DataPublicPluginStart, ISearchSource } from '@kbn/data-plugin/public';
 
 /**
  * Helper function to apply or remove aggregations to a given search source used for gaining data
diff --git a/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts b/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts
index 1da3a5188ffc9..d50ab1b413e66 100644
--- a/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_dimensions.test.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 import { getDimensions } from './get_dimensions';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
-import { ISearchSource, calculateBounds } from '../../../../../data/public';
+import { ISearchSource, calculateBounds } from '@kbn/data-plugin/public';
 import { getChartAggConfigs } from './get_chart_agg_configs';
 
 test('getDimensions', () => {
diff --git a/src/plugins/discover/public/application/main/utils/get_dimensions.ts b/src/plugins/discover/public/application/main/utils/get_dimensions.ts
index c9a2a198d1f7e..a1ea11609b8ca 100644
--- a/src/plugins/discover/public/application/main/utils/get_dimensions.ts
+++ b/src/plugins/discover/public/application/main/utils/get_dimensions.ts
@@ -7,7 +7,7 @@
  */
 import moment from 'moment';
 import dateMath from '@kbn/datemath';
-import { DataPublicPluginStart, search, IAggConfigs } from '../../../../../data/public';
+import { DataPublicPluginStart, search, IAggConfigs } from '@kbn/data-plugin/public';
 import { Dimensions, HistogramParamsBounds } from '../components/chart/point_series';
 
 export function getDimensions(
diff --git a/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts b/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
index 8c0d614f7ac61..2265de776c065 100644
--- a/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
+++ b/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
@@ -8,12 +8,12 @@
 import { merge } from 'rxjs';
 import { debounceTime, filter, skip, tap } from 'rxjs/operators';
 
-import { FetchStatus } from '../../types';
 import type {
   AutoRefreshDoneFn,
   DataPublicPluginStart,
   ISearchSource,
-} from '../../../../../data/public';
+} from '@kbn/data-plugin/public';
+import { FetchStatus } from '../../types';
 import { DataMain$, DataRefetch$ } from './use_saved_search';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
 
diff --git a/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts b/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
index 58fcc20396dee..aa75a04b15bca 100644
--- a/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_fetch_observeable.test.ts
@@ -5,10 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { BehaviorSubject, Subject } from 'rxjs';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { getFetch$ } from './get_fetch_observable';
 import { FetchStatus } from '../../types';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { DataPublicPluginStart } from '../../../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { createSearchSessionMock } from '../../../__mocks__/search_session';
 import { DataRefetch$ } from './use_saved_search';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
@@ -46,6 +47,10 @@ function createDataMock(
 }
 
 describe('getFetchObservable', () => {
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   test('refetch$.next should trigger fetch$.next', async (done) => {
     const searchSessionManagerMock = createSearchSessionMock();
 
@@ -64,34 +69,43 @@ describe('getFetchObservable', () => {
     fetch$.subscribe(() => {
       done();
     });
-    refetch$.next();
+    refetch$.next(undefined);
   });
-  test('getAutoRefreshFetch$ should trigger fetch$.next', async () => {
-    jest.useFakeTimers();
-    const searchSessionManagerMock = createSearchSessionMock();
-    const autoRefreshFetch$ = new Subject();
 
-    const main$ = new BehaviorSubject({ fetchStatus: FetchStatus.UNINITIALIZED });
-    const refetch$: DataRefetch$ = new Subject();
-    const dataMock = createDataMock(new Subject(), new Subject(), new Subject(), autoRefreshFetch$);
-    const setAutoRefreshDone = jest.fn();
-    const fetch$ = getFetch$({
-      setAutoRefreshDone,
-      main$,
-      refetch$,
-      data: dataMock,
-      searchSessionManager: searchSessionManagerMock.searchSessionManager,
-      searchSource: savedSearchMockWithTimeField.searchSource,
-      initialFetchStatus: FetchStatus.LOADING,
-    });
+  test(
+    'getAutoRefreshFetch$ should trigger fetch$.next',
+    fakeSchedulers((advance) => {
+      jest.useFakeTimers();
+      const searchSessionManagerMock = createSearchSessionMock();
+      const autoRefreshFetch$ = new Subject();
 
-    const fetchfnMock = jest.fn();
-    fetch$.subscribe(() => {
-      fetchfnMock();
-    });
-    autoRefreshFetch$.next(jest.fn());
-    jest.runAllTimers();
-    expect(fetchfnMock).toHaveBeenCalledTimes(1);
-    expect(setAutoRefreshDone).toHaveBeenCalled();
-  });
+      const main$ = new BehaviorSubject({ fetchStatus: FetchStatus.UNINITIALIZED });
+      const refetch$: DataRefetch$ = new Subject();
+      const dataMock = createDataMock(
+        new Subject(),
+        new Subject(),
+        new Subject(),
+        autoRefreshFetch$
+      );
+      const setAutoRefreshDone = jest.fn();
+      const fetch$ = getFetch$({
+        setAutoRefreshDone,
+        main$,
+        refetch$,
+        data: dataMock,
+        searchSessionManager: searchSessionManagerMock.searchSessionManager,
+        searchSource: savedSearchMockWithTimeField.searchSource,
+        initialFetchStatus: FetchStatus.LOADING,
+      });
+
+      const fetchfnMock = jest.fn();
+      fetch$.subscribe(() => {
+        fetchfnMock();
+      });
+      autoRefreshFetch$.next(jest.fn());
+      advance(100);
+      expect(fetchfnMock).toHaveBeenCalledTimes(1);
+      expect(setAutoRefreshDone).toHaveBeenCalled();
+    })
+  );
 });
diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
index 1b651643e8443..d6842846a5cf7 100644
--- a/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getStateDefaults } from './get_state_defaults';
-import { createSearchSourceMock, dataPluginMock } from '../../../../../data/public/mocks';
+import { createSearchSourceMock, dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { uiSettingsMock } from '../../../__mocks__/ui_settings';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
index 56197218355cd..b75e3eb612cc4 100644
--- a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
+++ b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
@@ -7,7 +7,9 @@
  */
 
 import { cloneDeep, isEqual } from 'lodash';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import {
   DEFAULT_COLUMNS_SETTING,
   DOC_HIDE_TIME_COLUMN_SETTING,
@@ -15,12 +17,10 @@ import {
   SORT_DEFAULT_ORDER_SETTING,
 } from '../../../../common';
 import { SavedSearch } from '../../../services/saved_searches';
-import { DataPublicPluginStart } from '../../../../../data/public';
 
 import { AppState } from '../services/discover_state';
 import { getDefaultSort, getSortArray } from '../../../components/doc_table';
 import { CHART_HIDDEN_KEY } from '../components/chart/discover_chart';
-import { Storage } from '../../../../../kibana_utils/public';
 
 function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient) {
   if (savedSearch.columns && savedSearch.columns.length > 0) {
diff --git a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts
index aeb51ad0606e5..8b60a6215eaff 100644
--- a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getSwitchIndexPatternAppState } from './get_switch_index_pattern_app_state';
-import { DataView } from '../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 /**
  * Helper function returning an index pattern
diff --git a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
index b047c2743809b..bf9aeee042fb8 100644
--- a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
+++ b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getSortArray, SortPairArr } from '../../../components/doc_table/lib/get_sort';
 
 /**
diff --git a/src/plugins/discover/public/application/main/utils/nested_fields.ts b/src/plugins/discover/public/application/main/utils/nested_fields.ts
index 2690c815717aa..74edeca32b3f6 100644
--- a/src/plugins/discover/public/application/main/utils/nested_fields.ts
+++ b/src/plugins/discover/public/application/main/utils/nested_fields.ts
@@ -7,8 +7,8 @@
  */
 
 import { escapeRegExp } from 'lodash/fp';
-import { getFieldSubtypeNested } from '../../../../../data_views/public';
-import type { DataView } from '../../../../../data_views/public';
+import { getFieldSubtypeNested } from '@kbn/data-views-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 /**
  * This function checks if the given field in a given index pattern is a nested field's parent.
diff --git a/src/plugins/discover/public/application/main/utils/persist_saved_search.ts b/src/plugins/discover/public/application/main/utils/persist_saved_search.ts
index c73cf982d484d..30430abd941a8 100644
--- a/src/plugins/discover/public/application/main/utils/persist_saved_search.ts
+++ b/src/plugins/discover/public/application/main/utils/persist_saved_search.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SavedObjectSaveOpts } from '@kbn/saved-objects-plugin/public';
 import { updateSearchSource } from './update_search_source';
-import { DataView } from '../../../../../data_views/public';
 import { SavedSearch } from '../../../services/saved_searches';
 import { AppState } from '../services/discover_state';
 import type { SortOrder } from '../../../services/saved_searches';
-import { SavedObjectSaveOpts } from '../../../../../saved_objects/public';
 import { DiscoverServices } from '../../../build_services';
 import { saveSavedSearch } from '../../../services/saved_searches';
 
diff --git a/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts b/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts
index 54a26a77e76c6..d58aea6f5a6fe 100644
--- a/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts
+++ b/src/plugins/discover/public/application/main/utils/resolve_index_pattern.ts
@@ -7,9 +7,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { DataView, DataViewsContract } from 'src/plugins/data_views/public';
-import type { ISearchSource } from 'src/plugins/data/public';
-import type { IUiSettingsClient, SavedObject, ToastsStart } from 'kibana/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import type { ISearchSource } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient, SavedObject, ToastsStart } from '@kbn/core/public';
 export type IndexPatternSavedObject = SavedObject & { title: string };
 
 interface IndexPatternData {
diff --git a/src/plugins/discover/public/application/main/utils/update_search_source.test.ts b/src/plugins/discover/public/application/main/utils/update_search_source.test.ts
index 3d36cf1cce5da..d21474c631756 100644
--- a/src/plugins/discover/public/application/main/utils/update_search_source.test.ts
+++ b/src/plugins/discover/public/application/main/utils/update_search_source.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { updateSearchSource } from './update_search_source';
-import { createSearchSourceMock } from '../../../../../data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import type { SortOrder } from '../../../services/saved_searches';
 import { discoverServiceMock } from '../../../__mocks__/services';
diff --git a/src/plugins/discover/public/application/main/utils/update_search_source.ts b/src/plugins/discover/public/application/main/utils/update_search_source.ts
index a94023f04e054..3cc547aaab83a 100644
--- a/src/plugins/discover/public/application/main/utils/update_search_source.ts
+++ b/src/plugins/discover/public/application/main/utils/update_search_source.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { DataViewType, DataView } from '@kbn/data-views-plugin/public';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../common';
-import { ISearchSource } from '../../../../../data/public';
-import { DataViewType, DataView } from '../../../../../data_views/public';
 import type { SortOrder } from '../../../services/saved_searches';
 import { DiscoverServices } from '../../../build_services';
 import { getSortForSearchSource } from '../../../components/doc_table';
diff --git a/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts b/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
index 0c85885899232..50c33b72378c9 100644
--- a/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
+++ b/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
@@ -12,7 +12,7 @@ import { discoverServiceMock } from '../../../__mocks__/services';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { useDiscoverState } from './use_discover_state';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { SearchSource } from '../../../../../data/public';
+import { SearchSource } from '@kbn/data-plugin/public';
 
 describe('test useDiscoverState', () => {
   const originalSavedObjectsClient = discoverServiceMock.core.savedObjects.client;
diff --git a/src/plugins/discover/public/application/main/utils/use_discover_state.ts b/src/plugins/discover/public/application/main/utils/use_discover_state.ts
index 4d5d911f8abf3..607aba88e033c 100644
--- a/src/plugins/discover/public/application/main/utils/use_discover_state.ts
+++ b/src/plugins/discover/public/application/main/utils/use_discover_state.ts
@@ -141,7 +141,7 @@ export function useDiscoverState({
       }
 
       if (chartDisplayChanged || chartIntervalChanged || docTableSortChanged) {
-        refetch$.next();
+        refetch$.next(undefined);
       }
       setState(nextState);
     });
@@ -211,7 +211,7 @@ export function useDiscoverState({
     (_payload, isUpdate?: boolean) => {
       if (isUpdate === false) {
         searchSessionManager.removeSearchSessionIdFromURL({ replace: false });
-        refetch$.next();
+        refetch$.next(undefined);
       }
     },
     [refetch$, searchSessionManager]
@@ -222,7 +222,7 @@ export function useDiscoverState({
    */
   useEffect(() => {
     if (indexPattern) {
-      refetch$.next();
+      refetch$.next(undefined);
     }
   }, [initialFetchStatus, refetch$, indexPattern, savedSearch.id]);
 
diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
index 0430b5672aebd..597d8b76be8aa 100644
--- a/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
+++ b/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
@@ -76,7 +76,7 @@ describe('test useSavedSearch', () => {
       });
     });
 
-    result.current.refetch$.next();
+    result.current.refetch$.next(undefined);
 
     await waitForValueToChange(() => {
       return result.current.data$.main$.value.fetchStatus === 'complete';
@@ -119,7 +119,7 @@ describe('test useSavedSearch', () => {
       });
     });
 
-    result.current.refetch$.next();
+    result.current.refetch$.next(undefined);
 
     await waitForValueToChange(() => {
       return result.current.data$.main$.value.fetchStatus === FetchStatus.COMPLETE;
diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.ts
index 8197979e103eb..5c9ea00d6558c 100644
--- a/src/plugins/discover/public/application/main/utils/use_saved_search.ts
+++ b/src/plugins/discover/public/application/main/utils/use_saved_search.ts
@@ -7,12 +7,12 @@
  */
 import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { BehaviorSubject, Subject } from 'rxjs';
+import { ISearchSource } from '@kbn/data-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin/public';
+import type { AutoRefreshDoneFn } from '@kbn/data-plugin/public';
 import { DiscoverServices } from '../../../build_services';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
-import { ISearchSource } from '../../../../../data/public';
 import { GetStateReturn } from '../services/discover_state';
-import { RequestAdapter } from '../../../../../inspector/public';
-import type { AutoRefreshDoneFn } from '../../../../../data/public';
 import { validateTimeRange } from './validate_time_range';
 import { Chart } from '../components/chart/point_series';
 import { useSingleton } from './use_singleton';
diff --git a/src/plugins/discover/public/application/main/utils/use_search_session.ts b/src/plugins/discover/public/application/main/utils/use_search_session.ts
index c18261f1ffaac..1bdbc27968f73 100644
--- a/src/plugins/discover/public/application/main/utils/use_search_session.ts
+++ b/src/plugins/discover/public/application/main/utils/use_search_session.ts
@@ -7,12 +7,12 @@
  */
 import { useMemo, useEffect } from 'react';
 import { History } from 'history';
+import { noSearchSessionStorageCapabilityMessage } from '@kbn/data-plugin/public';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
 import {
   createSearchSessionRestorationDataProvider,
   GetStateReturn,
 } from '../services/discover_state';
-import { noSearchSessionStorageCapabilityMessage } from '../../../../../data/public';
 import { DiscoverServices } from '../../../build_services';
 import { SavedSearch } from '../../../services/saved_searches';
 
diff --git a/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts b/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts
index ff3a66b1edfa3..bc0ed5f9c51c9 100644
--- a/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts
+++ b/src/plugins/discover/public/application/main/utils/validate_time_range.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { validateTimeRange } from './validate_time_range';
-import { notificationServiceMock } from '../../../../../../core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 
 describe('Discover validateTimeRange', () => {
   test('validates given time ranges correctly', async () => {
diff --git a/src/plugins/discover/public/application/main/utils/validate_time_range.ts b/src/plugins/discover/public/application/main/utils/validate_time_range.ts
index 7744a10f3e8ca..83d5f18de7f95 100644
--- a/src/plugins/discover/public/application/main/utils/validate_time_range.ts
+++ b/src/plugins/discover/public/application/main/utils/validate_time_range.ts
@@ -8,7 +8,7 @@
 
 import dateMath from '@kbn/datemath';
 import { i18n } from '@kbn/i18n';
-import { ToastsStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
 
 /**
  * Validates a given time filter range, provided by URL or UI
diff --git a/src/plugins/discover/public/application/not_found/not_found_route.tsx b/src/plugins/discover/public/application/not_found/not_found_route.tsx
index 28f525039dd1e..d4844c67b827e 100644
--- a/src/plugins/discover/public/application/not_found/not_found_route.tsx
+++ b/src/plugins/discover/public/application/not_found/not_found_route.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiCallOut } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Redirect } from 'react-router-dom';
-import { toMountPoint, wrapWithTheme } from '../../../../kibana_react/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { getUrlTracker } from '../../kibana_services';
 import { useDiscoverServices } from '../../utils/use_discover_services';
 
diff --git a/src/plugins/discover/public/application/view_alert/view_alert_route.tsx b/src/plugins/discover/public/application/view_alert/view_alert_route.tsx
index 2a6fa70ef0e2b..7eaefcbcd3c52 100644
--- a/src/plugins/discover/public/application/view_alert/view_alert_route.tsx
+++ b/src/plugins/discover/public/application/view_alert/view_alert_route.tsx
@@ -9,9 +9,9 @@
 import { useEffect, useMemo } from 'react';
 import { useHistory, useLocation, useParams } from 'react-router-dom';
 import { sha256 } from 'js-sha256';
-import type { Rule } from '../../../../../../x-pack/plugins/alerting/common';
-import { getTime, IndexPattern } from '../../../../data/common';
-import type { Filter } from '../../../../data/public';
+import type { Rule } from '@kbn/alerting-plugin/common';
+import { getTime, IndexPattern } from '@kbn/data-plugin/common';
+import type { Filter } from '@kbn/data-plugin/public';
 import { DiscoverAppLocatorParams } from '../../locator';
 import { useDiscoverServices } from '../../utils/use_discover_services';
 import { getAlertUtils, QueryParams, SearchThresholdAlertParams } from './view_alert_utils';
diff --git a/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx b/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx
index 585da8c676417..6ae74632f9379 100644
--- a/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx
+++ b/src/plugins/discover/public/application/view_alert/view_alert_utils.tsx
@@ -8,12 +8,12 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { CoreStart, ToastsStart } from 'kibana/public';
-import type { Rule } from '../../../../../../x-pack/plugins/alerting/common';
-import type { RuleTypeParams } from '../../../../../../x-pack/plugins/alerting/common';
-import { SerializedSearchSourceFields } from '../../../../data/common';
-import type { DataPublicPluginStart } from '../../../../data/public';
-import { MarkdownSimple, toMountPoint } from '../../../../kibana_react/public';
+import { CoreStart, ToastsStart } from '@kbn/core/public';
+import type { Rule } from '@kbn/alerting-plugin/common';
+import type { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { MarkdownSimple, toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export interface SearchThresholdAlertParams extends RuleTypeParams {
   searchConfiguration: SerializedSearchSourceFields;
diff --git a/src/plugins/discover/public/build_services.ts b/src/plugins/discover/public/build_services.ts
index 100235cb95a0d..d77bc5dde2660 100644
--- a/src/plugins/discover/public/build_services.ts
+++ b/src/plugins/discover/public/build_services.ts
@@ -20,31 +20,31 @@ import {
   HttpStart,
   NotificationsStart,
   ApplicationStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import {
   FilterManager,
   TimefilterContract,
   DataViewsContract,
   DataPublicPluginStart,
-} from 'src/plugins/data/public';
-import { Start as InspectorPublicPluginStart } from 'src/plugins/inspector/public';
-import { SharePluginStart } from 'src/plugins/share/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
+} from '@kbn/data-plugin/public';
+import { Start as InspectorPublicPluginStart } from '@kbn/inspector-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { Storage } from '../../kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
-import { DiscoverStartPlugins } from './plugin';
-import { getHistory } from './kibana_services';
-import { UrlForwardingStart } from '../../url_forwarding/public';
-import { NavigationPublicPluginStart } from '../../navigation/public';
-import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/public';
-import { FieldFormatsStart } from '../../field_formats/public';
-import { EmbeddableStart } from '../../embeddable/public';
-import { DiscoverAppLocator } from './locator';
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 
-import type { SpacesApi } from '../../../../x-pack/plugins/spaces/public';
-import { DataViewEditorStart } from '../../../plugins/data_view_editor/public';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../x-pack/plugins/triggers_actions_ui/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { DiscoverAppLocator } from './locator';
+import { getHistory } from './kibana_services';
+import { DiscoverStartPlugins } from './plugin';
 
 export interface HistoryLocationState {
   referrer: string;
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
index f2b3b130e395c..c5ac7335b69c2 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
@@ -16,7 +16,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DiscoverGrid, DiscoverGridProps } from './discover_grid';
 import { getDocId } from './discover_grid_document_selection';
 import { ElasticSearchHit } from '../../types';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { discoverServiceMock } from '../../__mocks__/services';
 
 function getProps() {
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
index 1074897e6a118..da9892f343d70 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
@@ -20,8 +20,8 @@ import {
   EuiLoadingSpinner,
   EuiIcon,
 } from '@elastic/eui';
-import type { DataView } from '../../../../data_views/public';
-import { flattenHit } from '../../../../data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import { getSchemaDetectors } from './discover_grid_schema';
 import { DiscoverGridFlyout } from './discover_grid_flyout';
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
index 0c6783fabf189..c94b660b26893 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.test.tsx
@@ -15,7 +15,7 @@ import { DiscoverGridContext } from './discover_grid_context';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { esHits } from '../../__mocks__/es_hits';
 import { EuiButton } from '@elastic/eui';
-import { DataViewField } from 'src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 describe('Discover cell actions ', function () {
   it('should not show cell actions for unfilterable fields', async () => {
@@ -43,7 +43,6 @@ describe('Discover cell actions ', function () {
           colIndex={1}
           columnId="extension"
           isExpanded={false}
-          closePopover={jest.fn()}
         />
       </DiscoverGridContext.Provider>
     );
@@ -72,7 +71,6 @@ describe('Discover cell actions ', function () {
           colIndex={1}
           columnId="extension"
           isExpanded={false}
-          closePopover={jest.fn()}
         />
       </DiscoverGridContext.Provider>
     );
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx
index dac15af537563..1ac99da2ee8c0 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_cell_actions.tsx
@@ -9,8 +9,8 @@
 import React, { useContext } from 'react';
 import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataViewField } from '../../../../data_views/public';
-import { flattenHit } from '../../../../data/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { DiscoverGridContext } from './discover_grid_context';
 
 export const FilterInBtn = ({
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx
index 23ccba6638ebb..d441c3e5aba75 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_columns.tsx
@@ -9,9 +9,9 @@
 import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiDataGridColumn, EuiIconTip, EuiScreenReaderOnly } from '@elastic/eui';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { ExpandButton } from './discover_grid_expand_button';
 import { DiscoverGridSettings } from './types';
-import type { DataView } from '../../../../data_views/public';
 import { buildCellActions } from './discover_grid_cell_actions';
 import { getSchemaByKbnType } from './discover_grid_schema';
 import { SelectButton } from './discover_grid_document_selection';
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx
index 33977d24b88a1..41d58cf213336 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_context.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import type { ElasticSearchHit } from '../../types';
 
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx
index cfda4b6579054..6452349bbdc77 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.test.tsx
@@ -11,14 +11,14 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DiscoverGridFlyout, DiscoverGridFlyoutProps } from './discover_grid_flyout';
 import { esHits } from '../../__mocks__/es_hits';
-import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { DiscoverServices } from '../../build_services';
 import { DocViewsRegistry } from '../../services/doc_views/doc_views_registry';
 import { setDocViewsRegistry } from '../../kibana_services';
 import { indexPatternWithTimefieldMock } from '../../__mocks__/index_pattern_with_timefield';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import type { DataView } from '../../../../data_views/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { ElasticSearchHit } from '../../types';
 
 describe('Discover flyout', function () {
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
index 1b2e0de906763..a8cd9dc259d8b 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_flyout.tsx
@@ -8,7 +8,7 @@
 
 import React, { useMemo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   EuiFlexGroup,
   EuiFlexItem,
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts b/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts
index 0cd90cebf226f..dde4be2e76841 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid_schema.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { kibanaJSON } from './constants';
-import { KBN_FIELD_TYPES } from '../../../../data/public';
 
 export function getSchemaByKbnType(kbnType: string | undefined) {
   // Default DataGrid schemas: boolean, numeric, datetime, json, currency, string
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
index 901aeb71737ee..be4c69f1ced25 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { getRenderCellValueFn } from './get_render_cell_value';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
-import { flattenHit } from 'src/plugins/data/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { ElasticSearchHit } from '../../types';
 
 jest.mock('../../utils/use_discover_services', () => {
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx
index fe69ecc91d34b..159ebae3f18f0 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.tsx
@@ -8,14 +8,14 @@
 
 import React, { Fragment, useContext, useEffect, useMemo } from 'react';
 import { euiLightVars as themeLight, euiDarkVars as themeDark } from '@kbn/ui-theme';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import {
   EuiDataGridCellValueElementProps,
   EuiDescriptionList,
   EuiDescriptionListTitle,
   EuiDescriptionListDescription,
 } from '@elastic/eui';
-import { FieldFormatsStart } from '../../../../field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DiscoverGridContext } from './discover_grid_context';
 import { JsonCodeEditor } from '../json_code_editor/json_code_editor';
 import { defaultMonacoEditorWidth } from './constants';
diff --git a/src/plugins/discover/public/components/doc_table/_doc_table.scss b/src/plugins/discover/public/components/doc_table/_doc_table.scss
index 164b61d42df19..4553cdc05fdad 100644
--- a/src/plugins/discover/public/components/doc_table/_doc_table.scss
+++ b/src/plugins/discover/public/components/doc_table/_doc_table.scss
@@ -124,3 +124,7 @@
     }
   }
 }
+
+.dscTruncateByHeight {
+  display: inline-block;
+}
diff --git a/src/plugins/discover/public/components/doc_table/actions/columns.test.ts b/src/plugins/discover/public/components/doc_table/actions/columns.test.ts
index 5f3c7d203122f..92cd4dc142fac 100644
--- a/src/plugins/discover/public/components/doc_table/actions/columns.test.ts
+++ b/src/plugins/discover/public/components/doc_table/actions/columns.test.ts
@@ -10,7 +10,7 @@ import { getStateColumnActions } from './columns';
 import { configMock } from '../../../__mocks__/config';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { indexPatternsMock } from '../../../__mocks__/index_patterns';
-import { Capabilities } from '../../../../../../core/types';
+import { Capabilities } from '@kbn/core/types';
 import { AppState } from '../../../application/main/services/discover_state';
 
 function getStateColumnAction(state: {}, setAppState: (state: Partial<AppState>) => void) {
diff --git a/src/plugins/discover/public/components/doc_table/actions/columns.ts b/src/plugins/discover/public/components/doc_table/actions/columns.ts
index ec3d2b42560f9..3d97a9dff273a 100644
--- a/src/plugins/discover/public/components/doc_table/actions/columns.ts
+++ b/src/plugins/discover/public/components/doc_table/actions/columns.ts
@@ -5,7 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Capabilities, IUiSettingsClient } from 'kibana/public';
+import { Capabilities, IUiSettingsClient } from '@kbn/core/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../common';
 import {
   AppState as DiscoverState,
@@ -15,8 +17,6 @@ import {
   AppState as ContextState,
   GetStateReturn as ContextGetStateReturn,
 } from '../../../application/context/services/context_state';
-import { DataViewsContract } from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
 import { popularizeField } from '../../../utils/popularize_field';
 
 /**
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx b/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx
index 56d9a3689a911..e47da5a67c509 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/helpers.tsx
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export type SortOrder = [string, string];
 export interface ColumnProps {
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx
index b1f5f69b6d096..b6308023f4f7d 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.test.tsx
@@ -8,13 +8,13 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { TableHeader } from './table_header';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { SortOrder } from './helpers';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { DOC_HIDE_TIME_COLUMN_SETTING } from '../../../../../common';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 
 const defaultUiSettings = {
   get: (key: string) => {
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx
index f1e594cb8b9c8..e3fd1696497fa 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/table_header.tsx
@@ -7,13 +7,13 @@
  */
 
 import React, { useMemo } from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { TableHeaderColumn } from './table_header_column';
 import { SortOrder, getDisplayedColumns } from './helpers';
 import { getDefaultSort } from '../../lib/get_default_sort';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
 
 interface Props {
   columns: string[];
diff --git a/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx b/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx
index 61e536129ffdb..f2cfc9c6ad698 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_row.test.tsx
@@ -10,16 +10,13 @@ import React from 'react';
 import { mountWithIntl, findTestSubject } from '@kbn/test-jest-helpers';
 import { TableRow, TableRowProps } from './table_row';
 import { setDocViewsRegistry } from '../../../kibana_services';
-import { createFilterManagerMock } from '../../../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
 import { DocViewsRegistry } from '../../../services/doc_views/doc_views_registry';
-import { KibanaContextProvider } from '../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { discoverServiceMock } from '../../../__mocks__/services';
 
-import {
-  DOC_HIDE_TIME_COLUMN_SETTING,
-  MAX_DOC_FIELDS_DISPLAYED,
-} from '../../../../../discover/common';
+import { DOC_HIDE_TIME_COLUMN_SETTING, MAX_DOC_FIELDS_DISPLAYED } from '../../../../common';
 
 jest.mock('../lib/row_formatter', () => {
   const originalModule = jest.requireActual('../lib/row_formatter');
diff --git a/src/plugins/discover/public/components/doc_table/components/table_row.tsx b/src/plugins/discover/public/components/doc_table/components/table_row.tsx
index b14db847e3ed8..17c448f35d2a5 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_row.tsx
+++ b/src/plugins/discover/public/components/doc_table/components/table_row.tsx
@@ -10,9 +10,9 @@ import React, { Fragment, useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiIcon } from '@elastic/eui';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { formatFieldValue } from '../../../utils/format_value';
-import { flattenHit } from '../../../../../data/public';
-import { DataView } from '../../../../../data_views/public';
 import { DocViewer } from '../../../services/doc_views/components/doc_viewer';
 import { TableCell } from './table_row/table_cell';
 import { formatRow, formatTopLevelObject } from '../lib/row_formatter';
diff --git a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx
index 9de67c340f8bd..3e7e9523c2901 100644
--- a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx
+++ b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.test.tsx
@@ -12,7 +12,7 @@ import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { DocTableWrapper } from './doc_table_wrapper';
 import { DocTableRow } from './components/table_row';
 import { discoverServiceMock } from '../../__mocks__/services';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 describe('Doc table component', () => {
   const mountComponent = (rows?: DocTableRow[]) => {
diff --git a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx
index 334c825d78de0..d636ed37f7f27 100644
--- a/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx
+++ b/src/plugins/discover/public/components/doc_table/doc_table_wrapper.tsx
@@ -8,7 +8,7 @@
 
 import React, { forwardRef, useCallback, useMemo } from 'react';
 import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
-import type { DataView, DataViewField } from 'src/plugins/data_views/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { TableHeader } from './components/table_header/table_header';
 import { SHOW_MULTIFIELDS } from '../../../common';
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts
index c468301060400..af8f8a805f202 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.test.ts
@@ -10,7 +10,7 @@ import { getDefaultSort } from './get_default_sort';
 import {
   stubDataView,
   stubDataViewWithoutTimeField,
-} from '../../../../../data_views/common/data_view.stub';
+} from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('getDefaultSort function', function () {
   test('should be a function', function () {
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts
index 341d028206747..f1e3a2e1ffe86 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_default_sort.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { isSortable } from './get_sort';
 import { SortOrder } from '../components/table_header/helpers';
 
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts
index dce52adb82519..f778bbd8fecaa 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort.test.ts
@@ -10,7 +10,7 @@ import { getSort, getSortArray } from './get_sort';
 import {
   stubDataView,
   stubDataViewWithoutTimeField,
-} from '../../../../../data_views/common/data_view.stub';
+} from '@kbn/data-views-plugin/common/data_view.stub';
 
 describe('docTable', function () {
   describe('getSort function', function () {
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort.ts
index 5738bb8dc329e..f7cceaa650e2b 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort.ts
@@ -7,7 +7,7 @@
  */
 
 import { isPlainObject } from 'lodash';
-import { DataView } from '../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export type SortPairObj = Record<string, string>;
 export type SortPairArr = [string, string];
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts
index 2d3c00ae3ad10..729d74cb710fa 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.test.ts
@@ -8,7 +8,7 @@
 
 import { getSortForSearchSource } from './get_sort_for_search_source';
 import { SortOrder } from '../components/table_header/helpers';
-import { stubDataView, stubDataViewWithoutTimeField } from '../../../../../data/common/stubs';
+import { stubDataView, stubDataViewWithoutTimeField } from '@kbn/data-plugin/common/stubs';
 
 describe('getSortForSearchSource function', function () {
   test('should be a function', function () {
diff --git a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts
index d2314c41c5044..aa80d682d163d 100644
--- a/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/get_sort_for_search_source.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { DataView } from 'src/plugins/data_views/public';
-import type { EsQuerySortValue } from 'src/plugins/data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { EsQuerySortValue } from '@kbn/data-plugin/public';
 import { SortOrder } from '../components/table_header/helpers';
 import { getSort } from './get_sort';
 
diff --git a/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts b/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts
index ca6cfd5cb8d10..9721179867145 100644
--- a/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts
+++ b/src/plugins/discover/public/components/doc_table/lib/row_formatter.test.ts
@@ -8,10 +8,10 @@
 
 import ReactDOM from 'react-dom/server';
 import { formatRow, formatTopLevelObject } from './row_formatter';
-import { DataView } from '../../../../../data_views/public';
-import { fieldFormatsMock } from '../../../../../field_formats/common/mocks';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { DiscoverServices } from '../../../build_services';
-import { stubbedSavedObjectIndexPattern } from '../../../../../data/common/stubs';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-plugin/common/stubs';
 
 describe('Row formatter', () => {
   const hit = {
diff --git a/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx b/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx
index 5c8c9c05f5fe3..932a952cec09f 100644
--- a/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx
+++ b/src/plugins/discover/public/components/doc_table/lib/row_formatter.tsx
@@ -8,8 +8,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import React, { Fragment } from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
-import { FieldFormatsStart } from '../../../../../field_formats/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { formatHit } from '../../../utils/format_hit';
 
 import './row_formatter.scss';
diff --git a/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx b/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx
index 0882991a42cd1..ebc8f2f84c833 100644
--- a/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx
+++ b/src/plugins/discover/public/components/field_name/__stories__/field_name.stories.tsx
@@ -9,8 +9,8 @@
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { FieldName } from '../field_name';
-import { DataViewField } from '../../../../../data_views/public';
 
 const field = new DataViewField({
   name: 'bytes',
diff --git a/src/plugins/discover/public/components/field_name/field_name.tsx b/src/plugins/discover/public/components/field_name/field_name.tsx
index 8d29606f54ae1..d937e58ff5256 100644
--- a/src/plugins/discover/public/components/field_name/field_name.tsx
+++ b/src/plugins/discover/public/components/field_name/field_name.tsx
@@ -12,9 +12,9 @@ import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { FieldIcon, FieldIconProps } from '@kbn/react-field';
+import { getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { getFieldTypeName } from './field_type_name';
-import { getFieldSubtypeMulti } from '../../../../data_views/public';
-import type { DataViewField } from '../../../../data_views/public';
 
 interface Props {
   fieldName: string;
diff --git a/src/plugins/discover/public/components/help_menu/help_menu_util.ts b/src/plugins/discover/public/components/help_menu/help_menu_util.ts
index d0d5cfde1fe06..8e34d9cc3c127 100644
--- a/src/plugins/discover/public/components/help_menu/help_menu_util.ts
+++ b/src/plugins/discover/public/components/help_menu/help_menu_util.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { ChromeStart, DocLinksStart } from '@kbn/core/public';
 
 export function addHelpMenuToAppChrome(chrome: ChromeStart, docLinks: DocLinksStart) {
   chrome.setHelpExtension({
diff --git a/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx b/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx
index 5c247d0fe7381..5f6faa8ac0e9d 100644
--- a/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx
+++ b/src/plugins/discover/public/components/json_code_editor/json_code_editor_common.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { monaco, XJsonLang } from '@kbn/monaco';
 import { EuiButtonEmpty, EuiCopy, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { CodeEditor } from '../../../../kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 const codeEditorAriaLabel = i18n.translate('discover.json.codeEditorAriaLabel', {
   defaultMessage: 'Read only JSON view of an elasticsearch document',
diff --git a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
index b1fd1ae873e08..0b5d0bc922160 100644
--- a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
+++ b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
@@ -6,25 +6,26 @@
  * Side Public License, v 1.
  */
 
-import { Subscription } from 'rxjs';
+import { lastValueFrom, Subscription } from 'rxjs';
 import { onlyDisabledFiltersChanged, Filter } from '@kbn/es-query';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { KibanaExecutionContext } from 'kibana/public';
-import { Container, Embeddable } from '../../../embeddable/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { Container, Embeddable } from '@kbn/embeddable-plugin/public';
+import { Adapters, RequestAdapter } from '@kbn/inspector-plugin/common';
+import { APPLY_FILTER_TRIGGER, FilterManager, generateFilters } from '@kbn/data-plugin/public';
+import { ISearchSource, Query, TimeRange, FilterStateStore } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
 import { SavedSearch } from '../services/saved_searches';
-import { Adapters, RequestAdapter } from '../../../inspector/common';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
-import { APPLY_FILTER_TRIGGER, FilterManager, generateFilters } from '../../../data/public';
 import { DiscoverServices } from '../build_services';
-import { ISearchSource, Query, TimeRange, FilterStateStore } from '../../../data/public';
-import { DataView, DataViewField } from '../../../data_views/public';
 import { SavedSearchEmbeddableComponent } from './saved_search_embeddable_component';
-import { UiActionsStart } from '../../../ui_actions/public';
 import {
   DOC_HIDE_TIME_COLUMN_SETTING,
   DOC_TABLE_LEGACY,
@@ -44,7 +45,6 @@ import { VIEW_MODE } from '../components/view_mode_toggle';
 import { updateSearchSource } from './utils/update_search_source';
 import { FieldStatisticsTable } from '../application/main/components/field_stats_table';
 import { ElasticSearchHit } from '../types';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
 
 export type SearchProps = Partial<DiscoverGridProps> &
   Partial<DocTableProps> & {
@@ -182,8 +182,8 @@ export class SavedSearchEmbeddable
 
     try {
       // Make the request
-      const { rawResponse: resp } = await searchSource
-        .fetch$({
+      const { rawResponse: resp } = await lastValueFrom(
+        searchSource.fetch$({
           abortSignal: this.abortController.signal,
           sessionId: searchSessionId,
           inspector: {
@@ -198,7 +198,7 @@ export class SavedSearchEmbeddable
           },
           executionContext,
         })
-        .toPromise();
+      );
       this.updateOutput({ loading: false, error: undefined });
 
       this.searchProps!.rows = resp.hits.hits;
diff --git a/src/plugins/discover/public/embeddable/search_embeddable_factory.ts b/src/plugins/discover/public/embeddable/search_embeddable_factory.ts
index be391282ea57d..eeb2200b1f7e7 100644
--- a/src/plugins/discover/public/embeddable/search_embeddable_factory.ts
+++ b/src/plugins/discover/public/embeddable/search_embeddable_factory.ts
@@ -7,14 +7,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   EmbeddableFactoryDefinition,
   Container,
   ErrorEmbeddable,
-} from '../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 
-import { TimeRange } from '../../../data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 
 import { SearchInput, SearchOutput } from './types';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
diff --git a/src/plugins/discover/public/embeddable/types.ts b/src/plugins/discover/public/embeddable/types.ts
index 74fc89e498cdf..10f99e301b0ea 100644
--- a/src/plugins/discover/public/embeddable/types.ts
+++ b/src/plugins/discover/public/embeddable/types.ts
@@ -11,10 +11,10 @@ import {
   EmbeddableInput,
   EmbeddableOutput,
   IEmbeddable,
-} from 'src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import type { Filter } from '@kbn/es-query';
-import { DataView } from '../../../data_views/public';
-import type { TimeRange, Query } from '../../../data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { TimeRange, Query } from '@kbn/data-plugin/public';
 import { SavedSearch } from '../services/saved_searches';
 import { SortOrder } from '../components/doc_table/components/table_header/helpers';
 
diff --git a/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts b/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts
index cd2f6cf88cfa3..3bc82bc25e277 100644
--- a/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts
+++ b/src/plugins/discover/public/embeddable/utils/update_search_source.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { updateSearchSource } from './update_search_source';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import type { SortOrder } from '../../services/saved_searches';
diff --git a/src/plugins/discover/public/embeddable/utils/update_search_source.ts b/src/plugins/discover/public/embeddable/utils/update_search_source.ts
index dcc619ec18dae..7f383b910b990 100644
--- a/src/plugins/discover/public/embeddable/utils/update_search_source.ts
+++ b/src/plugins/discover/public/embeddable/utils/update_search_source.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataView } from '../../../../data_views/public';
-import { ISearchSource } from '../../../../data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { ISearchSource } from '@kbn/data-plugin/public';
 import { getSortForSearchSource } from '../../components/doc_table';
 import { SortPairArr } from '../../components/doc_table/lib/get_sort';
 
diff --git a/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts b/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts
index cf8dc8020b06d..e7a84a0bd1c74 100644
--- a/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts
+++ b/src/plugins/discover/public/embeddable/view_saved_search_action.test.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { ContactCardEmbeddable } from 'src/plugins/embeddable/public/lib/test_samples';
+import { ContactCardEmbeddable } from '@kbn/embeddable-plugin/public/lib/test_samples';
 
 import { ViewSavedSearchAction } from './view_saved_search_action';
 import { SavedSearchEmbeddable } from './saved_search_embeddable';
 import { createStartContractMock } from '../__mocks__/start_contract';
 import { savedSearchMock } from '../__mocks__/saved_search';
 import { discoverServiceMock } from '../__mocks__/services';
-import { DataView } from 'src/plugins/data_views/public';
-import { createFilterManagerMock } from 'src/plugins/data/public/query/filter_manager/filter_manager.mock';
-import { ViewMode } from 'src/plugins/embeddable/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 const applicationMock = createStartContractMock();
 const savedSearch = savedSearchMock;
diff --git a/src/plugins/discover/public/embeddable/view_saved_search_action.ts b/src/plugins/discover/public/embeddable/view_saved_search_action.ts
index b9bbc21cfef2c..59e27de85c2bd 100644
--- a/src/plugins/discover/public/embeddable/view_saved_search_action.ts
+++ b/src/plugins/discover/public/embeddable/view_saved_search_action.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ActionExecutionContext } from 'src/plugins/ui_actions/public';
-import { ApplicationStart } from 'kibana/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable, ViewMode } from '../../../embeddable/public';
-import { Action } from '../../../ui_actions/public';
+import { IEmbeddable, ViewMode } from '@kbn/embeddable-plugin/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 import { SavedSearchEmbeddable } from './saved_search_embeddable';
 import { SEARCH_EMBEDDABLE_TYPE } from '../../common';
 import { getSavedSearchUrl } from '../services/saved_searches';
diff --git a/src/plugins/discover/public/index.ts b/src/plugins/discover/public/index.ts
index 0ce755006b692..936efb7239313 100644
--- a/src/plugins/discover/public/index.ts
+++ b/src/plugins/discover/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DiscoverPlugin } from './plugin';
 
 export type { SavedSearch } from './services/saved_searches';
diff --git a/src/plugins/discover/public/kibana_services.ts b/src/plugins/discover/public/kibana_services.ts
index f055d2b67ade1..e1ddf2b2b148c 100644
--- a/src/plugins/discover/public/kibana_services.ts
+++ b/src/plugins/discover/public/kibana_services.ts
@@ -8,10 +8,10 @@
 
 import { once } from 'lodash';
 import { createHashHistory } from 'history';
-import type { ScopedHistory, AppMountParameters } from 'kibana/public';
-import type { UiActionsStart } from 'src/plugins/ui_actions/public';
+import type { ScopedHistory, AppMountParameters } from '@kbn/core/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { HistoryLocationState } from './build_services';
-import { createGetterSetter } from '../../kibana_utils/public';
 import { DocViewsRegistry } from './services/doc_views/doc_views_registry';
 
 let uiActions: UiActionsStart;
diff --git a/src/plugins/discover/public/locator.test.ts b/src/plugins/discover/public/locator.test.ts
index 5d86211993428..f4b55172e97c1 100644
--- a/src/plugins/discover/public/locator.test.ts
+++ b/src/plugins/discover/public/locator.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { hashedItemStore, getStatesFromKbnUrl } from '../../kibana_utils/public';
-import { mockStorage } from '../../kibana_utils/public/storage/hashed_item_store/mock';
-import { FilterStateStore } from '../../data/public';
+import { hashedItemStore, getStatesFromKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import { mockStorage } from '@kbn/kibana-utils-plugin/public/storage/hashed_item_store/mock';
+import { FilterStateStore } from '@kbn/data-plugin/public';
 import { DiscoverAppLocatorDefinition } from './locator';
 import { SerializableRecord } from '@kbn/utility-types';
 
diff --git a/src/plugins/discover/public/locator.ts b/src/plugins/discover/public/locator.ts
index 38b93f915114f..d1b4d73571550 100644
--- a/src/plugins/discover/public/locator.ts
+++ b/src/plugins/discover/public/locator.ts
@@ -8,9 +8,9 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import type { Filter } from '@kbn/es-query';
-import type { TimeRange, Query, QueryState, RefreshInterval } from '../../data/public';
-import type { LocatorDefinition, LocatorPublic } from '../../share/public';
-import { setStateToKbnUrl } from '../../kibana_utils/public';
+import type { TimeRange, Query, QueryState, RefreshInterval } from '@kbn/data-plugin/public';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type { VIEW_MODE } from './components/view_mode_toggle';
 
 export const DISCOVER_APP_LOCATOR = 'DISCOVER_APP_LOCATOR';
diff --git a/src/plugins/discover/public/mocks.ts b/src/plugins/discover/public/mocks.ts
index 8e109c44864ac..4d7c5817871b4 100644
--- a/src/plugins/discover/public/mocks.ts
+++ b/src/plugins/discover/public/mocks.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { DiscoverSetup, DiscoverStart } from '.';
-import { sharePluginMock } from '../../share/public/mocks';
 
 export type Setup = jest.Mocked<DiscoverSetup>;
 export type Start = jest.Mocked<DiscoverStart>;
diff --git a/src/plugins/discover/public/plugin.tsx b/src/plugins/discover/public/plugin.tsx
index 0f7be875a4f21..8330751cf13f0 100644
--- a/src/plugins/discover/public/plugin.tsx
+++ b/src/plugins/discover/public/plugin.tsx
@@ -16,19 +16,25 @@ import {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
-import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
-import { EmbeddableSetup, EmbeddableStart } from 'src/plugins/embeddable/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
-import { SharePluginStart, SharePluginSetup } from 'src/plugins/share/public';
-import { UrlForwardingSetup, UrlForwardingStart } from 'src/plugins/url_forwarding/public';
-import { HomePublicPluginSetup } from 'src/plugins/home/public';
-import { Start as InspectorPublicPluginStart } from 'src/plugins/inspector/public';
+} from '@kbn/core/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { Start as InspectorPublicPluginStart } from '@kbn/inspector-plugin/public';
 import { EuiLoadingContent } from '@elastic/eui';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../data/public';
-import { SavedObjectsStart } from '../../saved_objects/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { DocViewInput, DocViewInputFn } from './services/doc_views/doc_views_types';
 import { DocViewsRegistry } from './services/doc_views/doc_views_registry';
 import {
@@ -43,17 +49,11 @@ import { registerFeature } from './register_feature';
 import { buildServices } from './build_services';
 import { DiscoverAppLocator, DiscoverAppLocatorDefinition } from './locator';
 import { SearchEmbeddableFactory } from './embeddable';
-import { UsageCollectionSetup } from '../../usage_collection/public';
-import { IndexPatternFieldEditorStart } from '../../../plugins/data_view_field_editor/public';
 import { DeferredSpinner } from './components';
 import { ViewSavedSearchAction } from './embeddable/view_saved_search_action';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
-import { FieldFormatsStart } from '../../field_formats/public';
 import { injectTruncateStyles } from './utils/truncate_styles';
 import { DOC_TABLE_LEGACY, TRUNCATE_MAX_HEIGHT } from '../common';
-import { DataViewEditorStart } from '../../../plugins/data_view_editor/public';
 import { useDiscoverServices } from './utils/use_discover_services';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../x-pack/plugins/triggers_actions_ui/public';
 import { initializeKbnUrlTracking } from './utils/initialize_kbn_url_tracking';
 
 const DocViewerLegacyTable = React.lazy(
diff --git a/src/plugins/discover/public/register_feature.ts b/src/plugins/discover/public/register_feature.ts
index e5abfcd9e4823..49772c9b7336c 100644
--- a/src/plugins/discover/public/register_feature.ts
+++ b/src/plugins/discover/public/register_feature.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export function registerFeature(home: HomePublicPluginSetup) {
   home.featureCatalogue.register({
@@ -24,7 +24,7 @@ export function registerFeature(home: HomePublicPluginSetup) {
     icon: 'discoverApp',
     path: '/app/discover#/',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
     solutionId: 'kibana',
     order: 200,
   });
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx
index 8eab6b1e12c8c..1d5b1d4577652 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer/doc_viewer_tab.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { DocViewerTab } from './doc_viewer_tab';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
-import { ElasticSearchHit } from 'src/plugins/discover/public/types';
+import { ElasticSearchHit } from '../../../../types';
 
 describe('DocViewerTab', () => {
   test('changing columns triggers an update', () => {
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx
index 5b59f26a6c7cd..34ed49eb7e272 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.test.tsx
@@ -7,14 +7,14 @@
  */
 
 import React from 'react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DocViewerSource } from './source';
 import * as hooks from '../../../../utils/use_es_doc_search';
-import * as useUiSettingHook from '../../../../../../kibana_react/public/ui_settings/use_ui_setting';
+import * as useUiSettingHook from '@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting';
 import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
 import { JsonCodeEditorCommon } from '../../../../components/json_code_editor/json_code_editor_common';
-import { KibanaContextProvider } from '../../../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const mockIndexPattern = {
   getComputedFields: () => [],
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx
index 845f078c59fac..5aa813e25fe98 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_source/source.tsx
@@ -12,11 +12,11 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { monaco } from '@kbn/monaco';
 import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
 import { JSONCodeEditorCommonMemoized } from '../../../../components/json_code_editor/json_code_editor_common';
 import { DOC_TABLE_LEGACY, SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common';
 import { useEsDocSearch } from '../../../../utils/use_es_doc_search';
-import { DataView } from '../../../../../../data_views/public';
 import { ElasticRequestState } from '../../../../application/doc/types';
 import { getHeight } from './get_height';
 
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx
index abd65d726f3ee..0e75ab7d7800d 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.test.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DocViewerLegacyTable } from './table';
-import { DataView } from '../../../../../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DocViewRenderProps } from '../../../doc_views_types';
 import { ElasticSearchHit } from '../../../../../types';
-import { KibanaContextProvider } from '../../../../../../../kibana_react/public';
-import { DiscoverServices } from 'src/plugins/discover/public/build_services';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { DiscoverServices } from '../../../../../build_services';
 
 const services = {
   uiSettings: {
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx
index aa44f0d56889c..7c8ad53fe641a 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table.tsx
@@ -9,9 +9,9 @@
 import '../table.scss';
 import React, { useCallback, useMemo } from 'react';
 import { EuiInMemoryTable } from '@elastic/eui';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { getTypeForFieldIcon } from '../../../../../utils/get_type_for_field_icon';
 import { useDiscoverServices } from '../../../../../utils/use_discover_services';
-import { flattenHit } from '../../../../../../../data/public';
 import { SHOW_MULTIFIELDS } from '../../../../../../common';
 import { DocViewRenderProps, FieldRecordLegacy } from '../../../doc_views_types';
 import { ACTIONS_COLUMN, MAIN_COLUMNS } from './table_columns';
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx
index cae127713704b..3ce4b789bd1ff 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/legacy/table_cell_actions.tsx
@@ -7,11 +7,11 @@
  */
 
 import React from 'react';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { DocViewTableRowBtnFilterRemove } from './table_row_btn_filter_remove';
 import { DocViewTableRowBtnFilterExists } from './table_row_btn_filter_exists';
 import { DocViewTableRowBtnToggleColumn } from './table_row_btn_toggle_column';
 import { DocViewTableRowBtnFilterAdd } from './table_row_btn_filter_add';
-import { DataViewField } from '../../../../../../../data_views/public';
 import { DocViewFilterFn } from '../../../doc_views_types';
 
 interface TableActionsProps {
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx
index 4742dd3d8f585..56673acfb1821 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table.tsx
@@ -27,12 +27,12 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
 import { getTypeForFieldIcon } from '../../../../utils/get_type_for_field_icon';
 import { useDiscoverServices } from '../../../../utils/use_discover_services';
-import { Storage } from '../../../../../../kibana_utils/public';
 import { usePager } from '../../../../utils/use_pager';
 import { FieldName } from '../../../../components/field_name/field_name';
-import { flattenHit } from '../../../../../../data/public';
 import { SHOW_MULTIFIELDS } from '../../../../../common';
 import { DocViewRenderProps, FieldRecordLegacy } from '../../doc_views_types';
 import { getFieldsToShow } from '../../../../utils/get_fields_to_show';
diff --git a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx
index d5dc166e639f3..d687a75e45323 100644
--- a/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx
+++ b/src/plugins/discover/public/services/doc_views/components/doc_viewer_table/table_cell_actions.tsx
@@ -9,7 +9,7 @@
 import React, { useCallback, useState } from 'react';
 import { EuiButtonIcon, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { DataViewField } from '../../../../../../data_views/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { DocViewFilterFn } from '../../doc_views_types';
 
 interface TableActionsProps {
diff --git a/src/plugins/discover/public/services/doc_views/doc_views_types.ts b/src/plugins/discover/public/services/doc_views/doc_views_types.ts
index 3e02a27e8af1a..171b29a86bb05 100644
--- a/src/plugins/discover/public/services/doc_views/doc_views_types.ts
+++ b/src/plugins/discover/public/services/doc_views/doc_views_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from '../../../../data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { ElasticSearchHit } from '../../types';
 import { IgnoredReason } from '../../utils/get_ignored_reason';
 
diff --git a/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts b/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts
index e189eda2e1b2b..9f9fc86b0288e 100644
--- a/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/get_saved_searches.test.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { SavedObjectsStart } from 'kibana/public';
-import type { DataPublicPluginStart } from '../../../../data/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-import { savedObjectsServiceMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 import { getSavedSearch } from './get_saved_searches';
 
diff --git a/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts b/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts
index 3947b9311c423..444e9f0978182 100644
--- a/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts
+++ b/src/plugins/discover/public/services/saved_searches/get_saved_searches.ts
@@ -6,16 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsStart } from 'kibana/public';
-import type { DataPublicPluginStart } from '../../../../data/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { injectSearchSourceReferences, parseSearchSourceJSON } from '@kbn/data-plugin/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import type { SavedSearchAttributes, SavedSearch } from './types';
 
 import { SAVED_SEARCH_TYPE } from './constants';
 import { fromSavedSearchAttributes } from './saved_searches_utils';
-import { injectSearchSourceReferences, parseSearchSourceJSON } from '../../../../data/public';
-import { SavedObjectNotFound } from '../../../../kibana_utils/public';
-
-import type { SpacesApi } from '../../../../../../x-pack/plugins/spaces/public';
 
 interface GetSavedSearchDependencies {
   search: DataPublicPluginStart['search'];
diff --git a/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts b/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts
index fd6777155a53b..23c1107fe23c1 100644
--- a/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/save_saved_searches.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsStart } from 'kibana/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
 
-import { savedObjectsServiceMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 import { saveSavedSearch } from './save_saved_searches';
 import type { SavedSearch } from './types';
diff --git a/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts b/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts
index c3440bdb7696a..e83685015dd46 100644
--- a/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts
+++ b/src/plugins/discover/public/services/saved_searches/save_saved_searches.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { SavedObjectsStart } from 'kibana/public';
+import type { SavedObjectsStart } from '@kbn/core/public';
 import type { SavedSearch, SavedSearchAttributes } from './types';
 
 import { SAVED_SEARCH_TYPE } from './constants';
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts
index a99813795a0d9..62c2e447f6d8b 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.test.ts
@@ -12,7 +12,7 @@ import type { History } from 'history';
 import { useSavedSearchAliasMatchRedirect } from './saved_search_alias_match_redirect';
 import type { SavedSearch } from './types';
 
-import { spacesPluginMock } from '../../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 
 describe('useSavedSearchAliasMatchRedirect', () => {
   let spaces: ReturnType<typeof spacesPluginMock.createStartContract>;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts
index 6e80d68839451..e395ccbdaf264 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_alias_match_redirect.ts
@@ -9,10 +9,10 @@
 import type { History } from 'history';
 import { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import { getSavedSearchUrl } from './saved_searches_utils';
 
 import type { SavedSearch } from './types';
-import type { SpacesApi } from '../../../../../../x-pack/plugins/spaces/public';
 
 interface SavedSearchAliasMatchRedirectProps {
   savedSearch?: SavedSearch;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx
index 6bdea087fcf46..0d2fd18a6afc7 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.test.tsx
@@ -13,7 +13,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { SavedSearchURLConflictCallout } from './saved_search_url_conflict_callout';
 import type { SavedSearch } from './types';
 
-import { spacesPluginMock } from '../../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 
 describe('SavedSearchURLConflictCallout', () => {
   let spaces: ReturnType<typeof spacesPluginMock.createStartContract>;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts
index 4a13b56a5e8d7..3da3fc346ffaa 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_search_url_conflict_callout.ts
@@ -8,10 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 import type { History } from 'history';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import { getSavedSearchUrl } from './saved_searches_utils';
 
 import type { SavedSearch } from './types';
-import type { SpacesApi } from '../../../../../../x-pack/plugins/spaces/public';
 
 interface SavedSearchURLConflictCalloutProps {
   savedSearch?: SavedSearch;
diff --git a/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts b/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts
index 13739f0b1f4d1..4a4713badb807 100644
--- a/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts
+++ b/src/plugins/discover/public/services/saved_searches/saved_searches_utils.test.ts
@@ -14,7 +14,7 @@ import {
   throwErrorOnSavedSearchUrlConflict,
 } from './saved_searches_utils';
 
-import { createSearchSourceMock } from '../../../../data/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
 
 import type { SavedSearchAttributes, SavedSearch } from './types';
 
diff --git a/src/plugins/discover/public/services/saved_searches/types.ts b/src/plugins/discover/public/services/saved_searches/types.ts
index b7cd7f4a63f7b..aba95f85afd11 100644
--- a/src/plugins/discover/public/services/saved_searches/types.ts
+++ b/src/plugins/discover/public/services/saved_searches/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsResolveResponse } from 'src/core/public';
-import type { ISearchSource } from '../../../../data/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
+import type { ISearchSource } from '@kbn/data-plugin/public';
 import { DiscoverGridSettingsColumn } from '../../components/discover_grid/types';
 import { VIEW_MODE } from '../../components/view_mode_toggle';
 
diff --git a/src/plugins/discover/public/utils/breadcrumbs.ts b/src/plugins/discover/public/utils/breadcrumbs.ts
index 4d79598ce5389..e89186fc6f38d 100644
--- a/src/plugins/discover/public/utils/breadcrumbs.ts
+++ b/src/plugins/discover/public/utils/breadcrumbs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { SavedSearch } from '../services/saved_searches';
 
diff --git a/src/plugins/discover/public/utils/columns.ts b/src/plugins/discover/public/utils/columns.ts
index 11a9076d555ed..add21e13b5e36 100644
--- a/src/plugins/discover/public/utils/columns.ts
+++ b/src/plugins/discover/public/utils/columns.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 // We store this outside the function as a constant, so we're not creating a new array every time
 // the function is returning this. A changing array might cause the data grid to think it got
diff --git a/src/plugins/discover/public/utils/format_hit.ts b/src/plugins/discover/public/utils/format_hit.ts
index ffc61ff6b0dd9..6af6a8aa61210 100644
--- a/src/plugins/discover/public/utils/format_hit.ts
+++ b/src/plugins/discover/public/utils/format_hit.ts
@@ -8,9 +8,9 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { flattenHit } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { flattenHit } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { formatFieldValue } from './format_value';
 
 const formattedHitCache = new WeakMap<estypes.SearchHit, FormattedHit>();
diff --git a/src/plugins/discover/public/utils/format_value.test.ts b/src/plugins/discover/public/utils/format_value.test.ts
index 9fbf38c21b4b7..9580c6d0ca605 100644
--- a/src/plugins/discover/public/utils/format_value.test.ts
+++ b/src/plugins/discover/public/utils/format_value.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FieldFormatsStart } from '../../../field_formats/public';
-import type { FieldFormat } from '../../../field_formats/common';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { indexPatternMock } from '../__mocks__/index_pattern';
 import { formatFieldValue } from './format_value';
 
diff --git a/src/plugins/discover/public/utils/format_value.ts b/src/plugins/discover/public/utils/format_value.ts
index 50318b7d62805..74331e946682e 100644
--- a/src/plugins/discover/public/utils/format_value.ts
+++ b/src/plugins/discover/public/utils/format_value.ts
@@ -7,9 +7,9 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { FieldFormatsStart } from '../../../field_formats/public';
-import { KBN_FIELD_TYPES } from '../../../data/public';
-import { DataView, DataViewField } from '../../../data_views/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 /**
  * Formats the value of a specific field using the appropriate field formatter if available
diff --git a/src/plugins/discover/public/utils/get_fields_to_show.test.ts b/src/plugins/discover/public/utils/get_fields_to_show.test.ts
index 42dde146073f9..cdefb448e015e 100644
--- a/src/plugins/discover/public/utils/get_fields_to_show.test.ts
+++ b/src/plugins/discover/public/utils/get_fields_to_show.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from '../../../data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { getFieldsToShow } from './get_fields_to_show';
 
 describe('get fields to show', () => {
diff --git a/src/plugins/discover/public/utils/get_fields_to_show.ts b/src/plugins/discover/public/utils/get_fields_to_show.ts
index ddabd1a045883..6a749a89316a0 100644
--- a/src/plugins/discover/public/utils/get_fields_to_show.ts
+++ b/src/plugins/discover/public/utils/get_fields_to_show.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { getFieldSubtypeMulti } from '../../../data_views/public';
-import type { DataView } from '../../../data_views/public';
+import { getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export const getFieldsToShow = (
   fields: string[],
diff --git a/src/plugins/discover/public/utils/get_ignored_reason.test.ts b/src/plugins/discover/public/utils/get_ignored_reason.test.ts
index 7f431b578845b..091a32a29f586 100644
--- a/src/plugins/discover/public/utils/get_ignored_reason.test.ts
+++ b/src/plugins/discover/public/utils/get_ignored_reason.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { getIgnoredReason, IgnoredReason } from './get_ignored_reason';
-import type { DataViewField } from '../../../data_views/public';
-import { KBN_FIELD_TYPES } from '../../../data/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 function field(params: Partial<DataViewField>): DataViewField {
   return {
diff --git a/src/plugins/discover/public/utils/get_ignored_reason.ts b/src/plugins/discover/public/utils/get_ignored_reason.ts
index 891b42073755e..f1aae33e5d35d 100644
--- a/src/plugins/discover/public/utils/get_ignored_reason.ts
+++ b/src/plugins/discover/public/utils/get_ignored_reason.ts
@@ -7,8 +7,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { KBN_FIELD_TYPES } from '../../../data/public';
-import { DataViewField } from '../../../data_views/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 export enum IgnoredReason {
   IGNORE_ABOVE = 'ignore_above',
diff --git a/src/plugins/discover/public/utils/get_sharing_data.test.ts b/src/plugins/discover/public/utils/get_sharing_data.test.ts
index 71fe826360d8f..63031f689fb33 100644
--- a/src/plugins/discover/public/utils/get_sharing_data.test.ts
+++ b/src/plugins/discover/public/utils/get_sharing_data.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Capabilities, IUiSettingsClient } from 'kibana/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import { Capabilities, IUiSettingsClient } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DiscoverServices } from '../build_services';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { createSearchSourceMock } from '../../../data/common/search/search_source/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import {
   DOC_HIDE_TIME_COLUMN_SETTING,
   SORT_DEFAULT_ORDER_SETTING,
diff --git a/src/plugins/discover/public/utils/get_sharing_data.ts b/src/plugins/discover/public/utils/get_sharing_data.ts
index 6a74a54071faa..2e3e385ce71ff 100644
--- a/src/plugins/discover/public/utils/get_sharing_data.ts
+++ b/src/plugins/discover/public/utils/get_sharing_data.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import type { Capabilities } from 'kibana/public';
-import type { IUiSettingsClient } from 'kibana/public';
+import type { Capabilities } from '@kbn/core/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 import type {
   DataPublicPluginStart,
   ISearchSource,
   SerializedSearchSourceFields,
-} from 'src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import type { Filter } from '@kbn/es-query';
 import {
   DOC_HIDE_TIME_COLUMN_SETTING,
diff --git a/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts b/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts
index bffa0fecaed74..bce15f5d5eb22 100644
--- a/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts
+++ b/src/plugins/discover/public/utils/get_type_for_field_icon.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from 'src/plugins/data_views/common';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { getTypeForFieldIcon } from './get_type_for_field_icon';
 
 describe('getTypeForFieldIcon', () => {
diff --git a/src/plugins/discover/public/utils/get_type_for_field_icon.ts b/src/plugins/discover/public/utils/get_type_for_field_icon.ts
index bb3f65ed3e01c..429fdf87991eb 100644
--- a/src/plugins/discover/public/utils/get_type_for_field_icon.ts
+++ b/src/plugins/discover/public/utils/get_type_for_field_icon.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewField } from 'src/plugins/data_views/common';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 
 /**
  * Extracts the type from a data view field that will match the right icon.
diff --git a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts
index a3a373adbbf02..2f4ba59aef11a 100644
--- a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts
+++ b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.test.ts
@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { AppUpdater } from 'kibana/public';
+import { AppUpdater } from '@kbn/core/public';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DiscoverSetupPlugins } from '../plugin';
 import { initializeKbnUrlTracking } from './initialize_kbn_url_tracking';
 
diff --git a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
index 139f3b5a0c631..0bbbca3629f4c 100644
--- a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
+++ b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { AppUpdater, CoreSetup } from 'kibana/public';
+import { AppUpdater, CoreSetup } from '@kbn/core/public';
 import type { BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { createKbnUrlTracker, replaceUrlHashQuery } from '../../../kibana_utils/public';
+import { createKbnUrlTracker, replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/public';
 import { getScopedHistory } from '../kibana_services';
 import { SEARCH_SESSION_ID_QUERY_PARAM } from '../constants';
 import type { DiscoverSetupPlugins } from '../plugin';
diff --git a/src/plugins/discover/public/utils/migrate_legacy_query.ts b/src/plugins/discover/public/utils/migrate_legacy_query.ts
index f87d5328046d8..f9f22c6383c57 100644
--- a/src/plugins/discover/public/utils/migrate_legacy_query.ts
+++ b/src/plugins/discover/public/utils/migrate_legacy_query.ts
@@ -7,7 +7,7 @@
  */
 
 import { has } from 'lodash';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 /**
  * Creates a standardized query object from old queries that were either strings or pure ES query DSL
diff --git a/src/plugins/discover/public/utils/popularize_field.test.ts b/src/plugins/discover/public/utils/popularize_field.test.ts
index bf81163463b87..1818c0e358bf5 100644
--- a/src/plugins/discover/public/utils/popularize_field.test.ts
+++ b/src/plugins/discover/public/utils/popularize_field.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Capabilities } from 'kibana/public';
-import { DataView, DataViewsContract } from '../../../data_views/public';
+import { Capabilities } from '@kbn/core/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import { popularizeField } from './popularize_field';
 
 const capabilities = {
diff --git a/src/plugins/discover/public/utils/popularize_field.ts b/src/plugins/discover/public/utils/popularize_field.ts
index 3964cf363f193..d94700d1fa0b2 100644
--- a/src/plugins/discover/public/utils/popularize_field.ts
+++ b/src/plugins/discover/public/utils/popularize_field.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { Capabilities } from 'kibana/public';
-import { DataViewsContract } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import type { Capabilities } from '@kbn/core/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 async function popularizeField(
   indexPattern: DataView,
diff --git a/src/plugins/discover/public/utils/row_heights.ts b/src/plugins/discover/public/utils/row_heights.ts
index e3759853f60cf..f1e096b76b9f9 100644
--- a/src/plugins/discover/public/utils/row_heights.ts
+++ b/src/plugins/discover/public/utils/row_heights.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Storage } from '../../../kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { isValidRowHeight } from './validate_row_height';
 
 export interface DataGridOptionsRecord {
diff --git a/src/plugins/discover/public/utils/state_helpers.ts b/src/plugins/discover/public/utils/state_helpers.ts
index e50cd87ad82ee..7a2bc6f440885 100644
--- a/src/plugins/discover/public/utils/state_helpers.ts
+++ b/src/plugins/discover/public/utils/state_helpers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { isEqual } from 'lodash';
 import { SEARCH_FIELDS_FROM_SOURCE, DEFAULT_COLUMNS_SETTING } from '../../common';
 
diff --git a/src/plugins/discover/public/utils/truncate_styles.ts b/src/plugins/discover/public/utils/truncate_styles.ts
index dbe8b770e1793..95a615b5d1cb3 100644
--- a/src/plugins/discover/public/utils/truncate_styles.ts
+++ b/src/plugins/discover/public/utils/truncate_styles.ts
@@ -18,12 +18,19 @@ const TRUNCATE_GRADIENT_HEIGHT = 15;
 const globalThemeCache = createCache({ key: 'truncation' });
 
 const buildStylesheet = (maxHeight: number) => {
+  if (!maxHeight) {
+    return [
+      `
+    .dscTruncateByHeight {
+      max-height: none;
+    }`,
+    ];
+  }
   return [
     `
     .dscTruncateByHeight {
       overflow: hidden;
       max-height: ${maxHeight}px !important;
-      display: inline-block;
     }
     .dscTruncateByHeight:before {
       top: ${maxHeight - TRUNCATE_GRADIENT_HEIGHT}px;
@@ -32,18 +39,7 @@ const buildStylesheet = (maxHeight: number) => {
   ];
 };
 
-const flushThemedGlobals = () => {
-  globalThemeCache.sheet.flush();
-  globalThemeCache.inserted = {};
-  globalThemeCache.registered = {};
-};
-
 export const injectTruncateStyles = (maxHeight: number) => {
-  if (maxHeight <= 0) {
-    flushThemedGlobals();
-    return;
-  }
-
   const serialized = serializeStyles(buildStylesheet(maxHeight), cache.registered);
   if (!globalThemeCache.inserted[serialized.name]) {
     globalThemeCache.insert('', serialized, globalThemeCache.sheet, true);
diff --git a/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx b/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx
index d09e9d8d1c6ba..056055d32da35 100644
--- a/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx
+++ b/src/plugins/discover/public/utils/use_data_grid_columns.test.tsx
@@ -12,7 +12,7 @@ import { indexPatternMock } from '../__mocks__/index_pattern';
 import { configMock } from '../__mocks__/config';
 import { indexPatternsMock } from '../__mocks__/index_patterns';
 import { AppState } from '../application/context/services/context_state';
-import { Capabilities } from '../../../../core/types';
+import { Capabilities } from '@kbn/core/types';
 
 describe('useColumns', () => {
   const defaultProps = {
diff --git a/src/plugins/discover/public/utils/use_data_grid_columns.ts b/src/plugins/discover/public/utils/use_data_grid_columns.ts
index ab492dc10f617..cc9aae7035769 100644
--- a/src/plugins/discover/public/utils/use_data_grid_columns.ts
+++ b/src/plugins/discover/public/utils/use_data_grid_columns.ts
@@ -7,9 +7,9 @@
  */
 
 import { useMemo } from 'react';
-import type { DataView, DataViewsContract } from 'src/plugins/data_views/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 
-import { Capabilities, IUiSettingsClient } from 'kibana/public';
+import { Capabilities, IUiSettingsClient } from '@kbn/core/public';
 import {
   AppState as DiscoverState,
   GetStateReturn as DiscoverGetStateReturn,
diff --git a/src/plugins/discover/public/utils/use_discover_services.ts b/src/plugins/discover/public/utils/use_discover_services.ts
index d9a6a2d77e481..239234c32f359 100644
--- a/src/plugins/discover/public/utils/use_discover_services.ts
+++ b/src/plugins/discover/public/utils/use_discover_services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { useKibana } from '../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DiscoverServices } from '../build_services';
 
 export const useDiscoverServices = () => useKibana<DiscoverServices>().services;
diff --git a/src/plugins/discover/public/utils/use_es_doc_search.test.tsx b/src/plugins/discover/public/utils/use_es_doc_search.test.tsx
index 26f048893e6b5..a059ae721ecad 100644
--- a/src/plugins/discover/public/utils/use_es_doc_search.test.tsx
+++ b/src/plugins/discover/public/utils/use_es_doc_search.test.tsx
@@ -9,11 +9,11 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { buildSearchBody, useEsDocSearch } from './use_es_doc_search';
 import { Observable } from 'rxjs';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DocProps } from '../application/doc/components/doc';
 import { ElasticRequestState } from '../application/doc/types';
 import { SEARCH_FIELDS_FROM_SOURCE as mockSearchFieldsFromSource } from '../../common';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import React from 'react';
 
 const mockSearchResult = new Observable();
diff --git a/src/plugins/discover/public/utils/use_es_doc_search.ts b/src/plugins/discover/public/utils/use_es_doc_search.ts
index e33d30d65979e..27393dca72da3 100644
--- a/src/plugins/discover/public/utils/use_es_doc_search.ts
+++ b/src/plugins/discover/public/utils/use_es_doc_search.ts
@@ -8,7 +8,8 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { DataView } from '../../../data_views/public';
+import { firstValueFrom } from 'rxjs';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { DocProps } from '../application/doc/components/doc';
 import { ElasticRequestState } from '../application/doc/types';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../common';
@@ -74,14 +75,14 @@ export function useEsDocSearch({
 
   const requestData = useCallback(async () => {
     try {
-      const { rawResponse } = await data.search
-        .search({
+      const { rawResponse } = await firstValueFrom(
+        data.search.search({
           params: {
             index,
             body: buildSearchBody(id, indexPattern, useNewFieldsApi, requestSource)?.body,
           },
         })
-        .toPromise();
+      );
 
       const hits = rawResponse.hits;
 
diff --git a/src/plugins/discover/public/utils/use_index_pattern.tsx b/src/plugins/discover/public/utils/use_index_pattern.tsx
index 6146aec13a3e4..208b2a8253e27 100644
--- a/src/plugins/discover/public/utils/use_index_pattern.tsx
+++ b/src/plugins/discover/public/utils/use_index_pattern.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { useEffect, useState } from 'react';
-import { DataView, DataViewsContract } from '../../../data_views/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export const useIndexPattern = (indexPatterns: DataViewsContract, indexPatternId: string) => {
   const [indexPattern, setIndexPattern] = useState<DataView | undefined>(undefined);
diff --git a/src/plugins/discover/public/utils/use_navigation_props.test.tsx b/src/plugins/discover/public/utils/use_navigation_props.test.tsx
index de1f1dbcc9b01..e7b33c3962c7e 100644
--- a/src/plugins/discover/public/utils/use_navigation_props.test.tsx
+++ b/src/plugins/discover/public/utils/use_navigation_props.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { ReactElement } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { createFilterManagerMock } from '../../../data/public/query/filter_manager/filter_manager.mock';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
 import {
   getContextHash,
   HistoryState,
@@ -17,7 +17,7 @@ import {
 } from './use_navigation_props';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const filterManager = createFilterManagerMock();
 const defaultProps = {
diff --git a/src/plugins/discover/public/utils/use_navigation_props.tsx b/src/plugins/discover/public/utils/use_navigation_props.tsx
index 74df39e09e41b..008e115448f38 100644
--- a/src/plugins/discover/public/utils/use_navigation_props.tsx
+++ b/src/plugins/discover/public/utils/use_navigation_props.tsx
@@ -12,8 +12,8 @@ import type { Location } from 'history';
 import { stringify } from 'query-string';
 import rison from 'rison-node';
 import { disableFilter } from '@kbn/es-query';
-import { FilterManager } from '../../../data/public';
-import { url } from '../../../kibana_utils/common';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { url } from '@kbn/kibana-utils-plugin/common';
 import { useDiscoverServices } from './use_discover_services';
 
 export type DiscoverNavigationProps = { onClick: () => void } | { href: string };
diff --git a/src/plugins/discover/public/utils/use_row_heights_options.test.tsx b/src/plugins/discover/public/utils/use_row_heights_options.test.tsx
index c91e41c930649..113f34ab723dd 100644
--- a/src/plugins/discover/public/utils/use_row_heights_options.test.tsx
+++ b/src/plugins/discover/public/utils/use_row_heights_options.test.tsx
@@ -8,12 +8,12 @@
 
 import React, { ReactNode } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { Storage } from '../../../kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { DiscoverServices } from '../build_services';
 import { LocalStorageMock } from '../__mocks__/local_storage_mock';
 import { uiSettingsMock } from '../__mocks__/ui_settings';
 import { useRowHeightsOptions } from './use_row_heights_options';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const CONFIG_ROW_HEIGHT = 3;
 
diff --git a/src/plugins/discover/server/plugin.ts b/src/plugins/discover/server/plugin.ts
index 00888d31f8d9b..9147f533d28d6 100644
--- a/src/plugins/discover/server/plugin.ts
+++ b/src/plugins/discover/server/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import type { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
 import { getUiSettings } from './ui_settings';
 import { capabilitiesProvider } from './capabilities_provider';
 import { getSavedSearchObjectType } from './saved_objects';
-import type { PluginSetup as DataPluginSetup } from '../../data/server';
 
 export class DiscoverServerPlugin implements Plugin<object, object> {
   public setup(
diff --git a/src/plugins/discover/server/saved_objects/search.ts b/src/plugins/discover/server/saved_objects/search.ts
index 796ab164cf0af..f30fa932aa133 100644
--- a/src/plugins/discover/server/saved_objects/search.ts
+++ b/src/plugins/discover/server/saved_objects/search.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { SavedObjectsType } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { getAllMigrations } from './search_migrations';
 
 export function getSavedSearchObjectType(
diff --git a/src/plugins/discover/server/saved_objects/search_migrations.test.ts b/src/plugins/discover/server/saved_objects/search_migrations.test.ts
index 9e4c23c91976c..9563bd6dc86c3 100644
--- a/src/plugins/discover/server/saved_objects/search_migrations.test.ts
+++ b/src/plugins/discover/server/saved_objects/search_migrations.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { getAllMigrations, searchMigrations } from './search_migrations';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
diff --git a/src/plugins/discover/server/saved_objects/search_migrations.ts b/src/plugins/discover/server/saved_objects/search_migrations.ts
index cb8ced07387a1..95da82fa38acf 100644
--- a/src/plugins/discover/server/saved_objects/search_migrations.ts
+++ b/src/plugins/discover/server/saved_objects/search_migrations.ts
@@ -13,11 +13,11 @@ import type {
   SavedObjectAttributes,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
-} from 'kibana/server';
-import { mergeSavedObjectMigrationMaps } from '../../../../core/server';
-import { DEFAULT_QUERY_LANGUAGE } from '../../../data/server';
-import { MigrateFunctionsObject, MigrateFunction } from '../../../kibana_utils/common';
-import type { SerializedSearchSourceFields } from '../../../data/common';
+} from '@kbn/core/server';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
+import { DEFAULT_QUERY_LANGUAGE } from '@kbn/data-plugin/server';
+import { MigrateFunctionsObject, MigrateFunction } from '@kbn/kibana-utils-plugin/common';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface SavedSearchMigrationAttributes extends SavedObjectAttributes {
   kibanaSavedObjectMeta: {
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index 94c85e42673ec..46e2d4d9969c6 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import type { DocLinksServiceSetup, UiSettingsParams } from 'kibana/server';
+import type { DocLinksServiceSetup, UiSettingsParams } from '@kbn/core/server';
 import { METRIC_TYPE } from '@kbn/analytics';
 import {
   DEFAULT_COLUMNS_SETTING,
@@ -286,5 +286,6 @@ export const getUiSettings: (docLinks: DocLinksServiceSetup) => Record<string, U
         'The maximum height that a cell in a table should occupy. Set to 0 to disable truncation.',
     }),
     schema: schema.number({ min: 0 }),
+    requiresPageReload: true,
   },
 });
diff --git a/src/plugins/embeddable/common/lib/get_all_migrations.ts b/src/plugins/embeddable/common/lib/get_all_migrations.ts
index 7ab11089f2ef0..8ef251a2e7c3f 100644
--- a/src/plugins/embeddable/common/lib/get_all_migrations.ts
+++ b/src/plugins/embeddable/common/lib/get_all_migrations.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { baseEmbeddableMigrations } from './migrate_base_input';
 import {
   MigrateFunctionsObject,
   PersistableState,
   PersistableStateMigrateFn,
-} from '../../../kibana_utils/common/persistable_state';
+} from '@kbn/kibana-utils-plugin/common/persistable_state';
+import { baseEmbeddableMigrations } from './migrate_base_input';
 
 export const getAllMigrations = (
   factories: unknown[],
diff --git a/src/plugins/embeddable/common/lib/inject.ts b/src/plugins/embeddable/common/lib/inject.ts
index f4b1eed9cdb7d..d175fce453c07 100644
--- a/src/plugins/embeddable/common/lib/inject.ts
+++ b/src/plugins/embeddable/common/lib/inject.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { CommonEmbeddableStartContract, EmbeddableStateWithType } from '../types';
-import { SavedObjectReference } from '../../../../core/types';
 import { injectBaseEmbeddableInput } from './migrate_base_input';
 
 export const getInjectFunction = (embeddables: CommonEmbeddableStartContract) => {
diff --git a/src/plugins/embeddable/common/lib/migrate_base_input.ts b/src/plugins/embeddable/common/lib/migrate_base_input.ts
index 94b3262335e26..1e64a50fa5c59 100644
--- a/src/plugins/embeddable/common/lib/migrate_base_input.ts
+++ b/src/plugins/embeddable/common/lib/migrate_base_input.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { EmbeddableStateWithType } from '../types';
-import { MigrateFunctionsObject } from '../../../kibana_utils/common';
 
 export const telemetryBaseEmbeddableInput = (
   state: EmbeddableStateWithType,
diff --git a/src/plugins/embeddable/common/types.ts b/src/plugins/embeddable/common/types.ts
index b9d9d4cc34146..b7cdc9bd08df3 100644
--- a/src/plugins/embeddable/common/types.ts
+++ b/src/plugins/embeddable/common/types.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaExecutionContext } from 'src/core/public';
-import { PersistableStateService, PersistableState } from '../../kibana_utils/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { PersistableStateService, PersistableState } from '@kbn/kibana-utils-plugin/common';
 
 export enum ViewMode {
   EDIT = 'edit',
diff --git a/src/plugins/embeddable/public/bootstrap.ts b/src/plugins/embeddable/public/bootstrap.ts
index ec0a81adc7c77..4e21457b6e758 100644
--- a/src/plugins/embeddable/public/bootstrap.ts
+++ b/src/plugins/embeddable/public/bootstrap.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiActionsSetup } from '../../ui_actions/public';
+import { UiActionsSetup } from '@kbn/ui-actions-plugin/public';
 import {
   contextMenuTrigger,
   panelBadgeTrigger,
diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
index 3aedd2c0a3b78..5f93585a39214 100644
--- a/src/plugins/embeddable/public/index.ts
+++ b/src/plugins/embeddable/public/index.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { EmbeddablePublicPlugin } from './plugin';
 
 export type {
diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx b/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
index a8c54ca8cdc33..926b6782b5633 100644
--- a/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/actions/edit_panel_action.test.tsx
@@ -11,7 +11,7 @@ import { Embeddable, EmbeddableInput, SavedObjectEmbeddableInput } from '../embe
 import { ViewMode } from '../types';
 import { ContactCardEmbeddable } from '../test_samples';
 import { embeddablePluginMock } from '../../mocks';
-import { applicationServiceMock } from '../../../../../core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { of } from 'rxjs';
 
 const { doStart } = embeddablePluginMock.createInstance();
diff --git a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
index fde5c2ae62bc0..4bfa26add28ba 100644
--- a/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/actions/edit_panel_action.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ApplicationStart } from 'kibana/public';
-import { Action } from 'src/plugins/ui_actions/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 import { take } from 'rxjs/operators';
 import { ViewMode } from '../types';
 import { EmbeddableFactoryNotFoundError } from '../errors';
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx
index 859e9be9d29dd..e8c741cdb2e76 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.mock.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableInput, SavedObjectEmbeddableInput } from '../index';
-import { coreMock } from '../../../../../core/public/mocks';
+import { EmbeddableInput, SavedObjectEmbeddableInput } from '..';
+import { coreMock } from '@kbn/core/public/mocks';
 import { AttributeServiceOptions } from './attribute_service';
-import { CoreStart } from 'src/core/public';
-import { AttributeService, ATTRIBUTE_SERVICE_KEY } from './index';
+import { CoreStart } from '@kbn/core/public';
+import { AttributeService, ATTRIBUTE_SERVICE_KEY } from '.';
 
 export const mockAttributeService = <
   A extends { title: string },
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts
index 8b954b7271e41..05ceb00a58d41 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.test.ts
@@ -8,8 +8,8 @@
 
 import { ATTRIBUTE_SERVICE_KEY, AttributeServiceUnwrapResult } from './attribute_service';
 import { mockAttributeService } from './attribute_service.mock';
-import { coreMock } from '../../../../../core/public/mocks';
-import { OnSaveProps } from 'src/plugins/saved_objects/public/save_modal';
+import { coreMock } from '@kbn/core/public/mocks';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public/save_modal';
 
 interface TestAttributes {
   title: string;
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
index 81b836796d31d..aa31c6afcf51a 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
@@ -9,15 +9,15 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { get, omit } from 'lodash';
-import { I18nStart, NotificationsStart } from 'src/core/public';
-import { SavedObjectSaveModal, OnSaveProps, SaveResult } from '../../../../saved_objects/public';
+import { I18nStart, NotificationsStart } from '@kbn/core/public';
+import { SavedObjectSaveModal, OnSaveProps, SaveResult } from '@kbn/saved-objects-plugin/public';
 import {
   EmbeddableInput,
   SavedObjectEmbeddableInput,
   isSavedObjectEmbeddableInput,
   EmbeddableFactoryNotFoundError,
   EmbeddableFactory,
-} from '../index';
+} from '..';
 
 /**
  * The attribute service is a shared, generic service that embeddables can use to provide the functionality
diff --git a/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx b/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx
index e4dfc8ab58d82..fb2a35e634da2 100644
--- a/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/containers/embeddable_child_panel.test.tsx
@@ -16,7 +16,7 @@ import {
   ContactCardEmbeddableOutput,
   ContactCardEmbeddable,
 } from '../test_samples/embeddables/contact_card/contact_card_embeddable';
-import { inspectorPluginMock } from '../../../../inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { mount } from 'enzyme';
 import { embeddablePluginMock, createEmbeddablePanelMock } from '../../mocks';
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts b/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts
index b260c594591fa..ca4a391d3b860 100644
--- a/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/default_embeddable_factory_provider.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import { EmbeddableFactoryDefinition } from './embeddable_factory_definition';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { EmbeddableFactory } from './embeddable_factory';
diff --git a/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts b/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts
index 01d776610f947..00c4de5ff426f 100644
--- a/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/diff_embeddable_input.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { ViewMode } from '..';
-import { KibanaExecutionContext } from '../../../../../core/types';
+import { KibanaExecutionContext } from '@kbn/core/types';
 import { EmbeddableInput, omitGenericEmbeddableInput, genericEmbeddableInputIsEqual } from '.';
 
 const getGenericEmbeddableState = (state?: Partial<EmbeddableInput>): EmbeddableInput => {
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index 59f02107b0f23..4917f7ff8177b 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -11,7 +11,7 @@ import { cloneDeep } from 'lodash';
 import * as Rx from 'rxjs';
 import { merge } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs/operators';
-import { RenderCompleteDispatcher } from '../../../../kibana_utils/public';
+import { RenderCompleteDispatcher } from '@kbn/kibana-utils-plugin/public';
 import { Adapters } from '../types';
 import { IContainer } from '../containers';
 import { EmbeddableOutput, IEmbeddable } from './i_embeddable';
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
index e6cb585968d40..e1b7a48948743 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes } from 'src/core/public';
-import { SavedObjectMetaData } from '../../../../saved_objects/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
+import { SavedObjectMetaData } from '@kbn/saved-objects-plugin/public';
+import { PersistableState } from '@kbn/kibana-utils-plugin/common';
+import { UiActionsPresentableGrouping } from '@kbn/ui-actions-plugin/public';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { ErrorEmbeddable } from './error_embeddable';
 import { IContainer } from '../containers/i_container';
 import { PropertySpec } from '../types';
-import { PersistableState } from '../../../../kibana_utils/common';
 import { EmbeddableStateWithType } from '../../../common/types';
-import { UiActionsPresentableGrouping } from '../../../../ui_actions/public';
 
 export interface EmbeddableInstanceConfiguration {
   id: string;
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts
index b783bc5af0a1d..a51ca4b54e831 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_definition.ts
@@ -7,7 +7,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectAttributes } from 'kibana/server';
+import { SavedObjectAttributes } from '@kbn/core/server';
 import { IEmbeddable } from './i_embeddable';
 import { EmbeddableFactory } from './embeddable_factory';
 import { EmbeddableInput, EmbeddableOutput } from '..';
diff --git a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
index 70c30d314fc82..f769d44cd2756 100644
--- a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
@@ -9,7 +9,7 @@
 import { EuiText, EuiIcon, EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider, Markdown } from '../../../../kibana_react/public';
+import { KibanaThemeProvider, Markdown } from '@kbn/kibana-react-plugin/public';
 import { Embeddable } from './embeddable';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { IContainer } from '../containers';
diff --git a/src/plugins/embeddable/public/lib/errors.test.ts b/src/plugins/embeddable/public/lib/errors.test.ts
index ecc08102609de..a59733b80f498 100644
--- a/src/plugins/embeddable/public/lib/errors.test.ts
+++ b/src/plugins/embeddable/public/lib/errors.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IncompatibleActionError } from 'src/plugins/ui_actions/public';
+import { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
 import { PanelNotFoundError, EmbeddableFactoryNotFoundError } from './errors';
 
 describe('IncompatibleActionError', () => {
diff --git a/src/plugins/embeddable/public/lib/inspector.ts b/src/plugins/embeddable/public/lib/inspector.ts
index 0da02190c6b6d..33e88c0d00fb2 100644
--- a/src/plugins/embeddable/public/lib/inspector.ts
+++ b/src/plugins/embeddable/public/lib/inspector.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../inspector/public';
+export * from '@kbn/inspector-plugin/public';
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
index 81ea83fe06d10..8f0310ba3e07b 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx
@@ -13,7 +13,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { I18nProvider } from '@kbn/i18n-react';
 import { CONTEXT_MENU_TRIGGER } from '../triggers';
-import { Action, UiActionsStart } from '../../../../ui_actions/public';
+import { Action, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { Trigger, ViewMode } from '../types';
 import { isErrorEmbeddable } from '../embeddables';
 import { EmbeddablePanel } from './embeddable_panel';
@@ -28,10 +28,10 @@ import {
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
 } from '../test_samples/embeddables/contact_card/contact_card_embeddable';
-import { inspectorPluginMock } from '../../../../inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { EuiBadge } from '@elastic/eui';
 import { embeddablePluginMock } from '../../mocks';
-import { applicationServiceMock, themeServiceMock } from '../../../../../core/public/mocks';
+import { applicationServiceMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 const actionRegistry = new Map<string, Action>();
 const triggerRegistry = new Map<string, Trigger>();
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index bddc882f00034..fbe1a9a96b5c8 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -11,10 +11,10 @@ import classNames from 'classnames';
 import React from 'react';
 import { Subscription } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
+import { CoreStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { buildContextMenuForActions, UiActionsService, Action } from '../ui_actions';
-import { CoreStart, OverlayStart, ThemeServiceStart } from '../../../../../core/public';
-import { toMountPoint } from '../../../../kibana_react/public';
-import { UsageCollectionStart } from '../../../../usage_collection/public';
 
 import { Start as InspectorStartContract } from '../inspector';
 import {
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
index fe6a9ea3c22b3..5abf91ed07fd1 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../../';
+import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../..';
 import { AddPanelAction } from './add_panel_action';
 import {
   MockFilter,
@@ -16,11 +16,11 @@ import {
 } from '../../../../test_samples/embeddables/filterable_embeddable';
 import { FilterableEmbeddableFactory } from '../../../../test_samples/embeddables/filterable_embeddable_factory';
 import { FilterableContainer } from '../../../../test_samples/embeddables/filterable_container';
-import { coreMock, themeServiceMock } from '../../../../../../../../core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { ContactCardEmbeddable } from '../../../../test_samples';
 import { EmbeddableStart } from '../../../../../plugin';
 import { embeddablePluginMock } from '../../../../../mocks';
-import { defaultTrigger } from '../../../../../../../ui_actions/public/triggers';
+import { defaultTrigger } from '@kbn/ui-actions-plugin/public/triggers';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts
index d766c509782a0..2c1c31b177645 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Action, ActionExecutionContext } from 'src/plugins/ui_actions/public';
-import { NotificationsStart, OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { EmbeddableStart } from 'src/plugins/embeddable/public/plugin';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import { EmbeddableStart } from '../../../../../plugin';
 import { ViewMode } from '../../../../types';
 import { openAddPanelFlyout } from './open_add_panel_flyout';
 import { IContainer } from '../../../../containers';
-import { UsageCollectionStart } from '../../../../../../../usage_collection/public';
 
 export const ACTION_ADD_PANEL = 'ACTION_ADD_PANEL';
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
index c860fc7e770b9..59b2af392283e 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
@@ -18,7 +18,7 @@ import { ContactCardEmbeddable } from '../../../../test_samples/embeddables/cont
 import { ContainerInput } from '../../../../containers';
 import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
-import { coreMock } from '../../../../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { embeddablePluginMock } from '../../../../../mocks';
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
index 624d5cc56288a..dcaa3880678ab 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
@@ -10,16 +10,16 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { ReactElement } from 'react';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { CoreSetup, SavedObjectAttributes, SimpleSavedObject, Toast } from 'src/core/public';
+import { CoreSetup, SavedObjectAttributes, SimpleSavedObject, Toast } from '@kbn/core/public';
 
 import { EuiContextMenuItem, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
 
-import { EmbeddableFactory, EmbeddableStart } from 'src/plugins/embeddable/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import { EmbeddableFactory, EmbeddableStart } from '../../../../..';
 import { IContainer } from '../../../../containers';
 import { EmbeddableFactoryNotFoundError } from '../../../../errors';
 import { SavedObjectFinderCreateNew } from './saved_object_finder_create_new';
 import { SavedObjectEmbeddableInput } from '../../../../embeddables';
-import { UsageCollectionStart } from '../../../../../../../usage_collection/public';
 
 interface Props {
   onClose: () => void;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
index 00c6f99abda09..4cc5a7ccb6e11 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
@@ -7,12 +7,12 @@
  */
 
 import React from 'react';
-import { NotificationsStart, OverlayRef, OverlayStart, ThemeServiceStart } from 'src/core/public';
+import { NotificationsStart, OverlayRef, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { EmbeddableStart } from '../../../../../plugin';
-import { toMountPoint } from '../../../../../../../kibana_react/public';
 import { IContainer } from '../../../../containers';
 import { AddPanelFlyout } from './add_panel_flyout';
-import { UsageCollectionStart } from '../../../../../../../usage_collection/public';
 
 export function openAddPanelFlyout(options: {
   embeddable: IContainer;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
index fbfd86cf4ec53..d2aab8eedea2c 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_action.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
 import { ViewMode } from '../../../../types';
 import { IEmbeddable } from '../../../../embeddables';
 
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx
index 34acdf6fd1cb1..16c216248a5da 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../';
+import { IEmbeddable } from '../../../..';
 
 interface CustomizePanelProps {
   embeddable: IEmbeddable;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
index dbd1f8eacdf1b..5c7483588d19f 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
@@ -15,7 +15,7 @@ import {
   FilterableEmbeddable,
   ContactCardEmbeddable,
 } from '../../../test_samples';
-import { inspectorPluginMock } from '../../../../../../../plugins/inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { EmbeddableOutput, isErrorEmbeddable, ErrorEmbeddable } from '../../../embeddables';
 import { of } from '../../../../tests/helpers';
 import { embeddablePluginMock } from '../../../../mocks';
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
index 4e9997c9abf11..08c08fc63e896 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Action } from 'src/plugins/ui_actions/public';
-import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 import { IEmbeddable } from '../../../embeddables';
 
 export const ACTION_INSPECT_PANEL = 'openInspector';
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
index 019584a7f1aa4..b04aa4a0bd9a9 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableOutput, isErrorEmbeddable } from '../../../';
+import { EmbeddableOutput, isErrorEmbeddable } from '../../..';
 import { RemovePanelAction } from './remove_panel_action';
 import { EmbeddableStart } from '../../../../plugin';
 import {
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
index eb4b6988b0b7c..667230807ddfb 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
@@ -18,11 +18,11 @@ import {
 } from '@elastic/eui';
 import classNames from 'classnames';
 import React from 'react';
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import { PanelOptionsMenu } from './panel_options_menu';
 import { IEmbeddable } from '../../embeddables';
 import { EmbeddableContext, panelBadgeTrigger, panelNotificationTrigger } from '../../triggers';
-import { uiToReactComponent } from '../../../../../kibana_react/public';
 import { CustomizePanelTitleAction } from '.';
 
 export interface PanelHeaderProps {
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 2dda0df1a85c5..32efb83f27306 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
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { Storage } from '../../../../kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { EmbeddableStateTransfer } from '.';
-import { ApplicationStart, PublicAppInfo } from '../../../../../core/public';
+import { ApplicationStart, PublicAppInfo } from '@kbn/core/public';
 import { EMBEDDABLE_EDITOR_STATE_KEY, EMBEDDABLE_PACKAGE_STATE_KEY } from './types';
 import { EMBEDDABLE_STATE_TRANSFER_STORAGE_KEY } from './embeddable_state_transfer';
 import { Subject } from 'rxjs';
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 fe471ef853b23..193aec8ee5234 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
@@ -7,8 +7,8 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { Storage } from '../../../../kibana_utils/public';
-import { ApplicationStart, PublicAppInfo } from '../../../../../core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { ApplicationStart, PublicAppInfo } from '@kbn/core/public';
 import {
   EmbeddableEditorState,
   isEmbeddableEditorState,
diff --git a/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx b/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx
index 522451285d485..a7e8e70a045f7 100644
--- a/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/actions/send_message_action.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiFlyoutBody } from '@elastic/eui';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { createAction, IncompatibleActionError } from '../../ui_actions';
-import { CoreStart } from '../../../../../../core/public';
-import { toMountPoint } from '../../../../../kibana_react/public';
 import { Embeddable, EmbeddableInput } from '../../embeddables';
 import { GetMessageModal } from './get_message_modal';
 import { FullNameEmbeddableOutput, hasFullNameOutput } from './say_hello_action';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx
index 09b576d07babf..b69e6dc45c617 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card.tsx
@@ -12,7 +12,7 @@ import { EuiCard, EuiFlexItem, EuiFlexGroup, EuiFormRow } from '@elastic/eui';
 import { Subscription } from 'rxjs';
 import { EuiButton } from '@elastic/eui';
 import * as Rx from 'rxjs';
-import { UiActionsStart } from '../../../../../../ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { ContactCardEmbeddable, CONTACT_USER_TRIGGER } from './contact_card_embeddable';
 
 interface Props {
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx
index 09a2eb8c5f8dc..82743caf04cce 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDom from 'react-dom';
 import { Subscription } from 'rxjs';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { Container } from '../../../containers';
 import { EmbeddableOutput, Embeddable, EmbeddableInput } from '../../../embeddables';
 import { CONTACT_CARD_EMBEDDABLE } from './contact_card_embeddable_factory';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx
index 6b33d6b44b936..47fb58c1fbbd9 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-import { CoreStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { EmbeddableFactoryDefinition } from '../../../embeddables';
 import { Container } from '../../../containers';
 import { ContactCardEmbeddable, ContactCardEmbeddableInput } from './contact_card_embeddable';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx
index 7b58d5c8b4983..cf6ffdbe84e9f 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/contact_card_exportable_embeddable_factory.tsx
@@ -8,10 +8,10 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-import { CoreStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { EmbeddableFactoryDefinition } from '../../../embeddables';
 import { Container } from '../../../containers';
 import { ContactCardEmbeddableInput } from './contact_card_embeddable';
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts
index 7e9e01214e8cc..9493bcbaee458 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { Container, EmbeddableFactoryDefinition } from '../../..';
 import { ContactCardEmbeddable, ContactCardEmbeddableInput } from './contact_card_embeddable';
 import { CONTACT_CARD_EMBEDDABLE } from './contact_card_embeddable_factory';
diff --git a/src/plugins/embeddable/public/lib/triggers/triggers.ts b/src/plugins/embeddable/public/lib/triggers/triggers.ts
index 24b712dfd3639..f00bf34596c2e 100644
--- a/src/plugins/embeddable/public/lib/triggers/triggers.ts
+++ b/src/plugins/embeddable/public/lib/triggers/triggers.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Datatable } from '../../../../expressions';
-import { Trigger, RowClickContext } from '../../../../ui_actions/public';
+import { Datatable } from '@kbn/expressions-plugin';
+import { Trigger, RowClickContext } from '@kbn/ui-actions-plugin/public';
 import { IEmbeddable } from '..';
 
 export interface EmbeddableContext<T extends IEmbeddable = IEmbeddable> {
diff --git a/src/plugins/embeddable/public/lib/ui_actions.ts b/src/plugins/embeddable/public/lib/ui_actions.ts
index 6d3521b6472a4..e17be5ade3bd1 100644
--- a/src/plugins/embeddable/public/lib/ui_actions.ts
+++ b/src/plugins/embeddable/public/lib/ui_actions.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from '../../../ui_actions/public';
+export * from '@kbn/ui-actions-plugin/public';
diff --git a/src/plugins/embeddable/public/mocks.tsx b/src/plugins/embeddable/public/mocks.tsx
index 44d2b395a48c3..a626dc5a4b1d9 100644
--- a/src/plugins/embeddable/public/mocks.tsx
+++ b/src/plugins/embeddable/public/mocks.tsx
@@ -7,6 +7,14 @@
  */
 
 import React from 'react';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { UiActionsService } from './lib/ui_actions';
+import { EmbeddablePublicPlugin } from './plugin';
 import {
   EmbeddableStart,
   EmbeddableSetup,
@@ -19,14 +27,6 @@ import {
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
 } from '.';
-import { EmbeddablePublicPlugin } from './plugin';
-import { coreMock, themeServiceMock } from '../../../core/public/mocks';
-import { UiActionsService } from './lib/ui_actions';
-import { CoreStart } from '../../../core/public';
-import { Start as InspectorStart } from '../../inspector/public';
-
-import { inspectorPluginMock } from '../../inspector/public/mocks';
-import { uiActionsPluginMock } from '../../ui_actions/public/mocks';
 
 export { mockAttributeService } from './lib/attribute_service/attribute_service.mock';
 export type Setup = jest.Mocked<EmbeddableSetup>;
diff --git a/src/plugins/embeddable/public/plugin.test.ts b/src/plugins/embeddable/public/plugin.test.ts
index a616b559d3236..82d9801503536 100644
--- a/src/plugins/embeddable/public/plugin.test.ts
+++ b/src/plugins/embeddable/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { testPlugin } from './tests/test_plugin';
 import { EmbeddableFactoryProvider } from './types';
 import { defaultEmbeddableFactoryProvider } from './lib';
diff --git a/src/plugins/embeddable/public/plugin.tsx b/src/plugins/embeddable/public/plugin.tsx
index 4098bd7467062..750e10d60dfbb 100644
--- a/src/plugins/embeddable/public/plugin.tsx
+++ b/src/plugins/embeddable/public/plugin.tsx
@@ -10,16 +10,18 @@ import React from 'react';
 import { Subscription } from 'rxjs';
 import { identity } from 'lodash';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { getSavedObjectFinder, showSaveModal } from '../../saved_objects/public';
-import { UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
-import { Start as InspectorStart } from '../../inspector/public';
+import { getSavedObjectFinder, showSaveModal } from '@kbn/saved-objects-plugin/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import {
   PluginInitializerContext,
   CoreSetup,
   CoreStart,
   Plugin,
   PublicAppInfo,
-} from '../../../core/public';
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { migrateToLatest, PersistableStateService } from '@kbn/kibana-utils-plugin/common';
 import {
   EmbeddableFactoryRegistry,
   EmbeddableFactoryProvider,
@@ -40,8 +42,6 @@ import {
 } from './lib';
 import { EmbeddableFactoryDefinition } from './lib/embeddables/embeddable_factory_definition';
 import { EmbeddableStateTransfer } from './lib/state_transfer';
-import { Storage } from '../../kibana_utils/public';
-import { migrateToLatest, PersistableStateService } from '../../kibana_utils/common';
 import { ATTRIBUTE_SERVICE_KEY, AttributeService } from './lib/attribute_service';
 import { AttributeServiceOptions } from './lib/attribute_service/attribute_service';
 import { EmbeddableStateWithType, CommonEmbeddableStartContract } from '../common/types';
diff --git a/src/plugins/embeddable/public/services.ts b/src/plugins/embeddable/public/services.ts
index 96088e086a771..60c4b81311960 100644
--- a/src/plugins/embeddable/public/services.ts
+++ b/src/plugins/embeddable/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceSetup } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceSetup>('Theme');
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 3e071594eea30..c082255faff28 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -36,7 +36,7 @@ import {
   FilterableContainer,
   FilterableContainerInput,
 } from '../lib/test_samples/embeddables/filterable_container';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { testPlugin } from './test_plugin';
 import { of } from './helpers';
 import { createEmbeddablePanelMock } from '../mocks';
diff --git a/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx b/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
index baae08b23cfa1..25280c3ee8092 100644
--- a/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
+++ b/src/plugins/embeddable/public/tests/customize_panel_modal.test.tsx
@@ -19,13 +19,13 @@ import {
   ContactCardEmbeddableFactory,
 } from '../lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { testPlugin } from './test_plugin';
 import { CustomizePanelModal } from '../lib/panel/panel_header/panel_actions/customize_title/customize_panel_modal';
 import { EmbeddableStart } from '../plugin';
 import { createEmbeddablePanelMock } from '../mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 let api: EmbeddableStart;
 let container: Container;
diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts
index 55b29f7f17a64..d9a7b72ada15a 100644
--- a/src/plugins/embeddable/public/tests/explicit_input.test.ts
+++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts
@@ -20,7 +20,7 @@ import { HELLO_WORLD_EMBEDDABLE, HelloWorldEmbeddableFactoryDefinition } from '.
 import { FilterableContainer } from '../lib/test_samples/embeddables/filterable_container';
 import { isErrorEmbeddable } from '../lib';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createEmbeddablePanelMock } from '../mocks';
 
 const { setup, doStart, coreStart, uiActions } = testPlugin(
diff --git a/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx b/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx
index 366d0ed9ed152..7bf9ce0889534 100644
--- a/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx
+++ b/src/plugins/embeddable/public/tests/fixtures/hello_world_embeddable.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Embeddable, EmbeddableInput, IContainer } from '../../';
+import { Embeddable, EmbeddableInput, IContainer } from '../..';
 
 export const HELLO_WORLD_EMBEDDABLE = 'HELLO_WORLD_EMBEDDABLE';
 
diff --git a/src/plugins/embeddable/public/tests/test_plugin.ts b/src/plugins/embeddable/public/tests/test_plugin.ts
index c515d1b05cd5f..6587d42dfda12 100644
--- a/src/plugins/embeddable/public/tests/test_plugin.ts
+++ b/src/plugins/embeddable/public/tests/test_plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/public';
-import { UiActionsStart } from '../../../ui_actions/public';
-import { uiActionsPluginMock } from '../../../ui_actions/public/mocks';
-import { inspectorPluginMock } from '../../../inspector/public/mocks';
-import { coreMock } from '../../../../core/public/mocks';
+import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { EmbeddablePublicPlugin, EmbeddableSetup, EmbeddableStart } from '../plugin';
 
 export interface TestPluginReturn {
diff --git a/src/plugins/embeddable/public/types.ts b/src/plugins/embeddable/public/types.ts
index 8cfe77a3a6db0..29f38c2f1916b 100644
--- a/src/plugins/embeddable/public/types.ts
+++ b/src/plugins/embeddable/public/types.ts
@@ -7,7 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
+import { PersistableState, PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import {
   EmbeddableFactory,
   EmbeddableInput,
@@ -15,7 +16,6 @@ import {
   IEmbeddable,
   EmbeddableFactoryDefinition,
 } from './lib/embeddables';
-import { PersistableState, PersistableStateDefinition } from '../../kibana_utils/common';
 
 export type EmbeddableFactoryRegistry = Map<string, EmbeddableFactory>;
 export type EnhancementsRegistry = Map<string, EnhancementRegistryItem>;
diff --git a/src/plugins/embeddable/server/plugin.ts b/src/plugins/embeddable/server/plugin.ts
index f9ad0a1bda372..10bc1965fab5c 100644
--- a/src/plugins/embeddable/server/plugin.ts
+++ b/src/plugins/embeddable/server/plugin.ts
@@ -7,8 +7,13 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { identity } from 'lodash';
+import {
+  PersistableStateService,
+  PersistableStateMigrateFn,
+  MigrateFunctionsObject,
+} from '@kbn/kibana-utils-plugin/common';
 import {
   EmbeddableFactoryRegistry,
   EnhancementsRegistry,
@@ -22,11 +27,6 @@ import {
   getMigrateFunction,
   getTelemetryFunction,
 } from '../common/lib';
-import {
-  PersistableStateService,
-  PersistableStateMigrateFn,
-  MigrateFunctionsObject,
-} from '../../kibana_utils/common';
 import { EmbeddableStateWithType, CommonEmbeddableStartContract } from '../common/types';
 import { getAllMigrations } from '../common/lib/get_all_migrations';
 
diff --git a/src/plugins/embeddable/server/types.ts b/src/plugins/embeddable/server/types.ts
index ba5314692e430..9b0479d6bc25d 100644
--- a/src/plugins/embeddable/server/types.ts
+++ b/src/plugins/embeddable/server/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { PersistableState, PersistableStateDefinition } from '../../kibana_utils/common';
+import { PersistableState, PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import { EmbeddableStateWithType } from '../common/types';
 
 export type EmbeddableFactoryRegistry = Map<string, EmbeddableRegistryItem>;
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx
index 7d8d00156e541..bc1b795d1a46c 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/authorization_provider.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import React, { createContext, useContext } from 'react';
 
 import { useRequest } from '../../../public/request';
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx
index 9953a8fedb39b..7fe745c22f225 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/authorization/components/page_error.tsx
@@ -8,7 +8,7 @@
 
 import { EuiSpacer, EuiEmptyPrompt, EuiPageContent } from '@elastic/eui';
 import React from 'react';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { Error } from '../types';
 
 interface Props {
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts
index 240eeb59f9a45..595e65577aa1a 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.test.ts
@@ -8,7 +8,7 @@
 
 import { errors } from '@elastic/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { kibanaResponseFactory as response } from 'src/core/server';
+import { kibanaResponseFactory as response } from '@kbn/core/server';
 import { handleEsError } from './handle_es_error';
 
 const { ResponseError } = errors;
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts
index d1853c988dbce..7620c71ae8956 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/errors/handle_es_error.ts
@@ -8,7 +8,7 @@
 
 import { errors } from '@elastic/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { IKibanaResponse, KibanaResponseFactory } from 'kibana/server';
+import { IKibanaResponse, KibanaResponseFactory } from '@kbn/core/server';
 import { getEsCause } from './es_error_parser';
 
 interface EsErrorHandlerParams {
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts b/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts
index df6129e7cf013..9118ea5089a1f 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/xjson/json_xjson_translation_tools/json_xjson_translation_tools.test.ts
@@ -12,7 +12,7 @@ import collapsingTests from './__fixtures__/utils_string_collapsing.txt';
 // @ts-ignore
 import expandingTests from './__fixtures__/utils_string_expanding.txt';
 
-import * as utils from './index';
+import * as utils from '.';
 import { extractJSONStringValues } from './parser';
 
 describe('JSON to XJSON conversion tools', () => {
diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap b/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
index 64e940756539a..17cf07121e7ce 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/__snapshots__/cron_editor.test.tsx.snap
@@ -95,13 +95,8 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
           <EuiFormControlLayout
             compressed={false}
             fullWidth={true}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
-            }
             inputId="generated-id"
+            isDropdown={true}
             isLoading={false}
             prepend="Every"
           >
@@ -124,7 +119,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
               >
                 <EuiValidatableControl>
                   <select
-                    className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                     data-test-subj="cronFrequencySelect"
                     id="generated-id"
                     onBlur={[Function]}
@@ -173,12 +168,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                 </EuiValidatableControl>
                 <EuiFormControlLayoutIcons
                   compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
-                    }
-                  }
+                  isDropdown={true}
                   isLoading={false}
                 >
                   <div
@@ -742,12 +732,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend="At"
                     >
@@ -769,7 +754,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Hour"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyDailyHourSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -923,12 +908,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -1223,12 +1203,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend=":"
                     >
@@ -1250,7 +1225,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Minute"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyDailyMinuteSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -1620,12 +1595,7 @@ exports[`CronEditor is rendered with a DAY frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -1765,13 +1735,8 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
           <EuiFormControlLayout
             compressed={false}
             fullWidth={true}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
-            }
             inputId="generated-id"
+            isDropdown={true}
             isLoading={false}
             prepend="Every"
           >
@@ -1794,7 +1759,7 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
               >
                 <EuiValidatableControl>
                   <select
-                    className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                     data-test-subj="cronFrequencySelect"
                     id="generated-id"
                     onBlur={[Function]}
@@ -1843,12 +1808,7 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
                 </EuiValidatableControl>
                 <EuiFormControlLayoutIcons
                   compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
-                    }
-                  }
+                  isDropdown={true}
                   isLoading={false}
                 >
                   <div
@@ -2439,13 +2399,8 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
             <EuiFormControlLayout
               compressed={false}
               fullWidth={true}
-              icon={
-                Object {
-                  "side": "right",
-                  "type": "arrowDown",
-                }
-              }
               inputId="generated-id"
+              isDropdown={true}
               isLoading={false}
               prepend="At"
             >
@@ -2468,7 +2423,7 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
                 >
                   <EuiValidatableControl>
                     <select
-                      className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                       data-test-subj="cronFrequencyHourlyMinuteSelect"
                       id="generated-id"
                       onBlur={[Function]}
@@ -2841,12 +2796,7 @@ exports[`CronEditor is rendered with a HOUR frequency 1`] = `
                   </EuiValidatableControl>
                   <EuiFormControlLayoutIcons
                     compressed={false}
-                    icon={
-                      Object {
-                        "side": "right",
-                        "type": "arrowDown",
-                      }
-                    }
+                    isDropdown={true}
                     isLoading={false}
                   >
                     <div
@@ -2982,13 +2932,8 @@ exports[`CronEditor is rendered with a MINUTE frequency 1`] = `
           <EuiFormControlLayout
             compressed={false}
             fullWidth={true}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
-            }
             inputId="generated-id"
+            isDropdown={true}
             isLoading={false}
             prepend="Every"
           >
@@ -3011,7 +2956,7 @@ exports[`CronEditor is rendered with a MINUTE frequency 1`] = `
               >
                 <EuiValidatableControl>
                   <select
-                    className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                     data-test-subj="cronFrequencySelect"
                     id="generated-id"
                     onBlur={[Function]}
@@ -3060,12 +3005,7 @@ exports[`CronEditor is rendered with a MINUTE frequency 1`] = `
                 </EuiValidatableControl>
                 <EuiFormControlLayoutIcons
                   compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
-                    }
-                  }
+                  isDropdown={true}
                   isLoading={false}
                 >
                   <div
@@ -3200,13 +3140,8 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
           <EuiFormControlLayout
             compressed={false}
             fullWidth={true}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
-            }
             inputId="generated-id"
+            isDropdown={true}
             isLoading={false}
             prepend="Every"
           >
@@ -3229,7 +3164,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
               >
                 <EuiValidatableControl>
                   <select
-                    className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                     data-test-subj="cronFrequencySelect"
                     id="generated-id"
                     onBlur={[Function]}
@@ -3278,12 +3213,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                 </EuiValidatableControl>
                 <EuiFormControlLayoutIcons
                   compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
-                    }
-                  }
+                  isDropdown={true}
                   isLoading={false}
                 >
                   <div
@@ -3988,13 +3918,8 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
             <EuiFormControlLayout
               compressed={false}
               fullWidth={true}
-              icon={
-                Object {
-                  "side": "right",
-                  "type": "arrowDown",
-                }
-              }
               inputId="generated-id"
+              isDropdown={true}
               isLoading={false}
               prepend="On the"
             >
@@ -4017,7 +3942,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                 >
                   <EuiValidatableControl>
                     <select
-                      className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                       data-test-subj="cronFrequencyMonthlyDateSelect"
                       id="generated-id"
                       onBlur={[Function]}
@@ -4216,12 +4141,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                   </EuiValidatableControl>
                   <EuiFormControlLayoutIcons
                     compressed={false}
-                    icon={
-                      Object {
-                        "side": "right",
-                        "type": "arrowDown",
-                      }
-                    }
+                    isDropdown={true}
                     isLoading={false}
                   >
                     <div
@@ -4436,12 +4356,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend="At"
                     >
@@ -4463,7 +4378,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Hour"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyMonthlyHourSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -4617,12 +4532,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -4917,12 +4827,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend=":"
                     >
@@ -4944,7 +4849,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Minute"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyMonthlyMinuteSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -5314,12 +5219,7 @@ exports[`CronEditor is rendered with a MONTH frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -5459,13 +5359,8 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
           <EuiFormControlLayout
             compressed={false}
             fullWidth={true}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
-            }
             inputId="generated-id"
+            isDropdown={true}
             isLoading={false}
             prepend="Every"
           >
@@ -5488,7 +5383,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
               >
                 <EuiValidatableControl>
                   <select
-                    className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                     data-test-subj="cronFrequencySelect"
                     id="generated-id"
                     onBlur={[Function]}
@@ -5537,12 +5432,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                 </EuiValidatableControl>
                 <EuiFormControlLayoutIcons
                   compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
-                    }
-                  }
+                  isDropdown={true}
                   isLoading={false}
                 >
                   <div
@@ -6055,13 +5945,8 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
             <EuiFormControlLayout
               compressed={false}
               fullWidth={true}
-              icon={
-                Object {
-                  "side": "right",
-                  "type": "arrowDown",
-                }
-              }
               inputId="generated-id"
+              isDropdown={true}
               isLoading={false}
               prepend="On"
             >
@@ -6084,7 +5969,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                 >
                   <EuiValidatableControl>
                     <select
-                      className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                       data-test-subj="cronFrequencyWeeklyDaySelect"
                       id="generated-id"
                       onBlur={[Function]}
@@ -6139,12 +6024,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                   </EuiValidatableControl>
                   <EuiFormControlLayoutIcons
                     compressed={false}
-                    icon={
-                      Object {
-                        "side": "right",
-                        "type": "arrowDown",
-                      }
-                    }
+                    isDropdown={true}
                     isLoading={false}
                   >
                     <div
@@ -6359,12 +6239,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend="At"
                     >
@@ -6386,7 +6261,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Hour"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyWeeklyHourSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -6540,12 +6415,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -6840,12 +6710,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend=":"
                     >
@@ -6867,7 +6732,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Minute"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyWeeklyMinuteSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -7237,12 +7102,7 @@ exports[`CronEditor is rendered with a WEEK frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -7382,13 +7242,8 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
           <EuiFormControlLayout
             compressed={false}
             fullWidth={true}
-            icon={
-              Object {
-                "side": "right",
-                "type": "arrowDown",
-              }
-            }
             inputId="generated-id"
+            isDropdown={true}
             isLoading={false}
             prepend="Every"
           >
@@ -7411,7 +7266,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
               >
                 <EuiValidatableControl>
                   <select
-                    className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                    className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                     data-test-subj="cronFrequencySelect"
                     id="generated-id"
                     onBlur={[Function]}
@@ -7460,12 +7315,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                 </EuiValidatableControl>
                 <EuiFormControlLayoutIcons
                   compressed={false}
-                  icon={
-                    Object {
-                      "side": "right",
-                      "type": "arrowDown",
-                    }
-                  }
+                  isDropdown={true}
                   isLoading={false}
                 >
                   <div
@@ -8147,13 +7997,8 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
             <EuiFormControlLayout
               compressed={false}
               fullWidth={true}
-              icon={
-                Object {
-                  "side": "right",
-                  "type": "arrowDown",
-                }
-              }
               inputId="generated-id"
+              isDropdown={true}
               isLoading={false}
               prepend="In"
             >
@@ -8176,7 +8021,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                 >
                   <EuiValidatableControl>
                     <select
-                      className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                       data-test-subj="cronFrequencyYearlyMonthSelect"
                       id="generated-id"
                       onBlur={[Function]}
@@ -8261,12 +8106,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                   </EuiValidatableControl>
                   <EuiFormControlLayoutIcons
                     compressed={false}
-                    icon={
-                      Object {
-                        "side": "right",
-                        "type": "arrowDown",
-                      }
-                    }
+                    isDropdown={true}
                     isLoading={false}
                   >
                     <div
@@ -8493,13 +8333,8 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
             <EuiFormControlLayout
               compressed={false}
               fullWidth={true}
-              icon={
-                Object {
-                  "side": "right",
-                  "type": "arrowDown",
-                }
-              }
               inputId="generated-id"
+              isDropdown={true}
               isLoading={false}
               prepend="On the"
             >
@@ -8522,7 +8357,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                 >
                   <EuiValidatableControl>
                     <select
-                      className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                      className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                       data-test-subj="cronFrequencyYearlyDateSelect"
                       id="generated-id"
                       onBlur={[Function]}
@@ -8721,12 +8556,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                   </EuiValidatableControl>
                   <EuiFormControlLayoutIcons
                     compressed={false}
-                    icon={
-                      Object {
-                        "side": "right",
-                        "type": "arrowDown",
-                      }
-                    }
+                    isDropdown={true}
                     isLoading={false}
                   >
                     <div
@@ -8941,12 +8771,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend="At"
                     >
@@ -8968,7 +8793,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Hour"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyYearlyHourSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -9122,12 +8947,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
@@ -9422,12 +9242,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                     <EuiFormControlLayout
                       compressed={false}
                       fullWidth={true}
-                      icon={
-                        Object {
-                          "side": "right",
-                          "type": "arrowDown",
-                        }
-                      }
+                      isDropdown={true}
                       isLoading={false}
                       prepend=":"
                     >
@@ -9449,7 +9264,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                           <EuiValidatableControl>
                             <select
                               aria-label="Minute"
-                              className="euiSelect euiSelect--fullWidth euiSelect--inGroup"
+                              className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--inGroup"
                               data-test-subj="cronFrequencyYearlyMinuteSelect"
                               onChange={[Function]}
                               onMouseUp={[Function]}
@@ -9819,12 +9634,7 @@ exports[`CronEditor is rendered with a YEAR frequency 1`] = `
                           </EuiValidatableControl>
                           <EuiFormControlLayoutIcons
                             compressed={false}
-                            icon={
-                              Object {
-                                "side": "right",
-                                "type": "arrowDown",
-                              }
-                            }
+                            isDropdown={true}
                             isLoading={false}
                           >
                             <div
diff --git a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx
index 4f6c954d4c37d..721b7b4a071ff 100644
--- a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx
+++ b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.test.tsx
@@ -13,9 +13,9 @@ import { findTestSubject, takeMountedSnapshot } from '@elastic/eui/lib/test';
 import { compressToEncodedURIComponent } from 'lz-string';
 
 import { ViewApiRequestFlyout } from './view_api_request_flyout';
-import type { UrlService } from 'src/plugins/share/common/url_service';
-import { ApplicationStart } from 'src/core/public';
-import { applicationServiceMock } from 'src/core/public/mocks';
+import type { UrlService } from '@kbn/share-plugin/common/url_service';
+import { ApplicationStart } from '@kbn/core/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 
 const payload = {
   title: 'Test title',
diff --git a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx
index fa7bc6088f5c0..7ee8b464ce521 100644
--- a/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx
+++ b/src/plugins/es_ui_shared/public/components/view_api_request_flyout/view_api_request_flyout.tsx
@@ -23,9 +23,9 @@ import {
   EuiCodeBlock,
   EuiCopy,
 } from '@elastic/eui';
-import type { UrlService } from 'src/plugins/share/common/url_service';
-import { ApplicationStart, APP_WRAPPER_CLASS } from '../../../../../core/public';
-import { RedirectAppLinks } from '../../../../kibana_react/public';
+import type { UrlService } from '@kbn/share-plugin/common/url_service';
+import { ApplicationStart, APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
 type FlyoutProps = Omit<EuiFlyoutProps, 'onClose'>;
 interface ViewApiRequestFlyoutProps {
diff --git a/src/plugins/es_ui_shared/public/indices/constants/index.ts b/src/plugins/es_ui_shared/public/indices/constants/index.ts
index 5591c3776804b..f7858c94dcab9 100644
--- a/src/plugins/es_ui_shared/public/indices/constants/index.ts
+++ b/src/plugins/es_ui_shared/public/indices/constants/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { indexPatterns } from '../../../../data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [...indexPatterns.ILLEGAL_CHARACTERS_VISIBLE, '*'];
 
diff --git a/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts b/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
index 3ef33b651f4d2..4f52490067192 100644
--- a/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
+++ b/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
@@ -8,7 +8,7 @@
 
 import sinon from 'sinon';
 
-import { HttpSetup, HttpFetchOptions } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchOptions } from '@kbn/core/public';
 import {
   SendRequestConfig,
   SendRequestResponse,
diff --git a/src/plugins/es_ui_shared/public/request/send_request.ts b/src/plugins/es_ui_shared/public/request/send_request.ts
index bdc6386ad15c6..518ae5fb14bc6 100644
--- a/src/plugins/es_ui_shared/public/request/send_request.ts
+++ b/src/plugins/es_ui_shared/public/request/send_request.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpSetup, HttpFetchQuery } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchQuery } from '@kbn/core/public';
 
 export interface SendRequestConfig {
   path: string;
diff --git a/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx b/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
index 82d3764dbf72a..db694a29b793e 100644
--- a/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
+++ b/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { mount, ReactWrapper } from 'enzyme';
 import sinon from 'sinon';
 
-import { HttpSetup, HttpFetchOptions } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchOptions } from '@kbn/core/public';
 import { SendRequestConfig, SendRequestResponse } from './send_request';
 import { useRequest, UseRequestResponse, UseRequestConfig } from './use_request';
 
diff --git a/src/plugins/es_ui_shared/public/request/use_request.ts b/src/plugins/es_ui_shared/public/request/use_request.ts
index 1241d6222a38f..d03ad222d20bf 100644
--- a/src/plugins/es_ui_shared/public/request/use_request.ts
+++ b/src/plugins/es_ui_shared/public/request/use_request.ts
@@ -8,7 +8,7 @@
 
 import { useEffect, useCallback, useState, useRef, useMemo } from 'react';
 
-import { HttpSetup } from '../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { sendRequest, SendRequestConfig } from './send_request';
 
 export interface UseRequestConfig extends SendRequestConfig {
diff --git a/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx b/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx
index 0273a0e3b3070..0f4e9617d9af3 100644
--- a/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx
+++ b/src/plugins/es_ui_shared/static/forms/docs/examples/validation.mdx
@@ -357,7 +357,7 @@ const schema = {
 }
 
 // myform.tsx
-import { firstValueFrom } from '@kbn/std';
+import { firstValueFrom } from 'rxjs';
 
 const MyForm = () => {
   const { form } = useForm();
diff --git a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts
index 1b6667fce41ab..52cd12b09a32e 100644
--- a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts
+++ b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts
@@ -6,12 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { ValidationFunc } from '../../hook_form_lib';
 import { containsChars } from '../../../validators/string';
 import { ERROR_CODE } from './types';
 
-import { indexPatterns } from '../../../../../data/public';
-
 export const indexPatternField =
   (i18n: any) =>
   (...args: Parameters<ValidationFunc>): ReturnType<ValidationFunc<any, ERROR_CODE>> => {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx
new file mode 100644
index 0000000000000..dc8695190bdaf
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.test.tsx
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, { useEffect } from 'react';
+import { act } from 'react-dom/test-utils';
+
+import { registerTestBed } from '../shared_imports';
+import { useForm } from '../hooks/use_form';
+import { useFormData } from '../hooks/use_form_data';
+import { Form } from './form';
+import { UseField } from './use_field';
+import { UseArray } from './use_array';
+
+describe('<UseArray />', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  test('it should render by default 1 array item', () => {
+    const TestComp = () => {
+      const { form } = useForm();
+      return (
+        <Form form={form}>
+          <UseArray path="myArray">
+            {({ items }) => {
+              return (
+                <>
+                  {items.map(({ id }) => {
+                    return (
+                      <p key={id} data-test-subj="arrayItem">
+                        Array item
+                      </p>
+                    );
+                  })}
+                </>
+              );
+            }}
+          </UseArray>
+        </Form>
+      );
+    };
+
+    const setup = registerTestBed(TestComp, {
+      memoryRouter: { wrapComponent: false },
+    });
+
+    const { find } = setup();
+
+    expect(find('arrayItem').length).toBe(1);
+  });
+
+  test('it should allow to listen to array item field value change', async () => {
+    const onFormData = jest.fn();
+
+    const TestComp = ({ onData }: { onData: (data: any) => void }) => {
+      const { form } = useForm();
+      const [formData] = useFormData({ form, watch: 'users[0].name' });
+
+      useEffect(() => {
+        onData(formData);
+      }, [onData, formData]);
+
+      return (
+        <Form form={form}>
+          <UseArray path="users">
+            {({ items }) => {
+              return (
+                <>
+                  {items.map(({ id, path }) => {
+                    return (
+                      <UseField
+                        key={id}
+                        path={`${path}.name`}
+                        data-test-subj={`nameField__${id}`}
+                      />
+                    );
+                  })}
+                </>
+              );
+            }}
+          </UseArray>
+        </Form>
+      );
+    };
+
+    const setup = registerTestBed(TestComp, {
+      defaultProps: { onData: onFormData },
+      memoryRouter: { wrapComponent: false },
+    });
+
+    const {
+      form: { setInputValue },
+    } = setup();
+
+    await act(async () => {
+      setInputValue('nameField__0', 'John');
+    });
+
+    const formData = onFormData.mock.calls[onFormData.mock.calls.length - 1][0];
+
+    expect(formData.users[0].name).toEqual('John');
+  });
+});
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
index 3e7b061603458..78379aa9fffbf 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_array.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import uuid from 'uuid';
 import { useEffect, useRef, useCallback, useMemo } from 'react';
 
 import { FormHook, FieldConfig } from '../types';
@@ -53,7 +54,7 @@ export interface FormArrayField {
  */
 export const UseArray = ({
   path,
-  initialNumberOfItems,
+  initialNumberOfItems = 1,
   validations,
   readDefaultValueOnForm = true,
   children,
@@ -92,6 +93,9 @@ export const UseArray = ({
   // Create an internal hook field which behaves like any other form field except that it is not
   // outputed in the form data (when calling form.submit() or form.getFormData())
   // This allow us to run custom validations (passed to the props) on the Array items
+
+  const internalFieldPath = useMemo(() => `${path}__${uuid.v4()}`, [path]);
+
   const fieldConfigBase: FieldConfig<ArrayItem[]> & InternalFieldConfig<ArrayItem[]> = {
     defaultValue: fieldDefaultValue,
     initialValue: fieldDefaultValue,
@@ -103,7 +107,7 @@ export const UseArray = ({
     ? { validations, ...fieldConfigBase }
     : fieldConfigBase;
 
-  const field = useField(form, path, fieldConfig);
+  const field = useField(form, internalFieldPath, fieldConfig);
   const { setValue, value, isChangingValue, errors } = field;
 
   // Derived state from the field
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 cbf0d9d619636..36fd16209f5d4 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
@@ -26,41 +26,91 @@ describe('<UseField />', () => {
     jest.useRealTimers();
   });
 
-  test('should read the default value from the prop and fallback to the config object', () => {
-    const onFormData = jest.fn();
+  describe('defaultValue', () => {
+    test('should read the default value from the prop and fallback to the config object', () => {
+      const onFormData = jest.fn();
 
-    const TestComp = ({ onData }: { onData: OnUpdateHandler }) => {
-      const { form } = useForm();
-      const { subscribe } = form;
+      const TestComp = ({ onData }: { onData: OnUpdateHandler }) => {
+        const { form } = useForm();
+        const { subscribe } = form;
 
-      useEffect(() => subscribe(onData).unsubscribe, [subscribe, onData]);
+        useEffect(() => subscribe(onData).unsubscribe, [subscribe, onData]);
 
-      return (
-        <Form form={form}>
-          <UseField path="name" config={{ defaultValue: 'John' }} />
-          <UseField
-            path="lastName"
-            defaultValue="Snow"
-            config={{ defaultValue: 'Will be Overridden' }}
-          />
-        </Form>
-      );
-    };
+        return (
+          <Form form={form}>
+            <UseField path="name" config={{ defaultValue: 'John' }} />
+            <UseField
+              path="lastName"
+              defaultValue="Snow"
+              config={{ defaultValue: 'Will be Overridden' }}
+            />
+          </Form>
+        );
+      };
+
+      const setup = registerTestBed(TestComp, {
+        defaultProps: { onData: onFormData },
+        memoryRouter: { wrapComponent: false },
+      });
 
-    const setup = registerTestBed(TestComp, {
-      defaultProps: { onData: onFormData },
-      memoryRouter: { wrapComponent: false },
+      setup();
+
+      const [{ data }] = onFormData.mock.calls[
+        onFormData.mock.calls.length - 1
+      ] as Parameters<OnUpdateHandler>;
+
+      expect(data.internal).toEqual({
+        name: 'John',
+        lastName: 'Snow',
+      });
     });
 
-    setup();
+    test('should update the form.defaultValue when a field defaultValue is provided through prop', () => {
+      let formHook: FormHook | null = null;
 
-    const [{ data }] = onFormData.mock.calls[
-      onFormData.mock.calls.length - 1
-    ] as Parameters<OnUpdateHandler>;
+      const TestComp = () => {
+        const [isFieldVisible, setIsFieldVisible] = useState(true);
+        const { form } = useForm();
+        formHook = form;
+
+        return (
+          <Form form={form}>
+            {isFieldVisible && (
+              <>
+                <UseField path="name" defaultValue="John" />
+                <UseField path="myArray[0].name" defaultValue="John" />
+                <UseField path="myArray[0].lastName" defaultValue="Snow" />
+                <UseField path="myArray[1].name" defaultValue="Foo" />
+                <UseField path="myArray[1].lastName" defaultValue="Bar" />
+              </>
+            )}
+            <button data-test-subj="unmountField" onClick={() => setIsFieldVisible(false)}>
+              Unmount field
+            </button>
+          </Form>
+        );
+      };
+
+      const setup = registerTestBed(TestComp, {
+        memoryRouter: { wrapComponent: false },
+      });
+
+      const { find } = setup();
+
+      expect(formHook!.__getFormDefaultValue()).toEqual({
+        name: 'John',
+        myArray: [
+          { name: 'John', lastName: 'Snow' },
+          { name: 'Foo', lastName: 'Bar' },
+        ],
+      });
+
+      // Unmounts the field and make sure the form.defaultValue has been updated
+      act(() => {
+        find('unmountField').simulate('click');
+      });
 
-    expect(data.internal).toEqual({
-      name: 'John',
-      lastName: 'Snow',
+      expect(formHook!.__getFormDefaultValue()).toEqual({});
     });
   });
 
@@ -205,7 +255,7 @@ describe('<UseField />', () => {
 
   describe('validation', () => {
     let formHook: FormHook | null = null;
-    let fieldHook: FieldHook | null = null;
+    let fieldHook: FieldHook<string> | null = null;
 
     beforeEach(() => {
       formHook = null;
@@ -216,19 +266,24 @@ describe('<UseField />', () => {
       formHook = form;
     };
 
-    const onFieldHook = (field: FieldHook) => {
+    const onFieldHook = (field: FieldHook<string>) => {
       fieldHook = field;
     };
 
-    const getTestComp = (fieldConfig: FieldConfig) => {
+    const getTestComp = (fieldConfig?: FieldConfig<string>) => {
       const TestComp = () => {
-        const { form } = useForm<any>();
+        const { form } = useForm();
         const [isFieldActive, setIsFieldActive] = useState(true);
+        const [fieldPath, setFieldPath] = useState('name');
 
         const unmountField = () => {
           setIsFieldActive(false);
         };
 
+        const changeFieldPath = () => {
+          setFieldPath('newPath');
+        };
+
         useEffect(() => {
           onFormHook(form);
         }, [form]);
@@ -236,16 +291,12 @@ describe('<UseField />', () => {
         return (
           <Form form={form}>
             {isFieldActive && (
-              <UseField path="name" config={fieldConfig}>
+              <UseField<string> path={fieldPath} config={fieldConfig}>
                 {(field) => {
                   onFieldHook(field);
 
                   return (
-                    <input
-                      value={field.value as string}
-                      onChange={field.onChange}
-                      data-test-subj="myField"
-                    />
+                    <input value={field.value} onChange={field.onChange} data-test-subj="myField" />
                   );
                 }}
               </UseField>
@@ -253,20 +304,23 @@ describe('<UseField />', () => {
             <button onClick={unmountField} data-test-subj="unmountFieldBtn">
               Unmount field
             </button>
+            <button onClick={changeFieldPath} data-test-subj="changeFieldPathBtn">
+              Change field path
+            </button>
           </Form>
         );
       };
       return TestComp;
     };
 
-    const setup = (fieldConfig: FieldConfig) => {
+    const setup = (fieldConfig?: FieldConfig<string>) => {
       return registerTestBed(getTestComp(fieldConfig), {
         memoryRouter: { wrapComponent: false },
       })() as TestBed;
     };
 
     test('should update the form validity whenever the field value changes', async () => {
-      const fieldConfig: FieldConfig = {
+      const fieldConfig: FieldConfig<string> = {
         defaultValue: '', // empty string, which is not valid
         validations: [
           {
@@ -317,7 +371,7 @@ describe('<UseField />', () => {
     });
 
     test('should not update the state if the field has unmounted while validating', async () => {
-      const fieldConfig: FieldConfig = {
+      const fieldConfig: FieldConfig<string> = {
         validations: [
           {
             validator: () => {
@@ -369,6 +423,40 @@ describe('<UseField />', () => {
       console.error = originalConsoleError; // eslint-disable-line no-console
     });
 
+    test('should not validate the field if the "path" changes but the value has not changed', async () => {
+      // This happens with the UseArray. When we delete an item from the array the path for
+      // the remaining items are recalculated and thus changed for every <UseField path={...} /> inside
+      // the array. We should not re-run the validation when adding/removing array items.
+
+      const validator = jest.fn();
+      const fieldConfig: FieldConfig<string> = {
+        validations: [
+          {
+            validator,
+          },
+        ],
+      };
+
+      const {
+        find,
+        form: { setInputValue },
+      } = setup(fieldConfig);
+
+      await act(async () => {
+        setInputValue('myField', 'changedValue');
+      });
+
+      expect(validator).toHaveBeenCalledTimes(1);
+      validator.mockReset();
+
+      await act(async () => {
+        // Change the field path
+        find('changeFieldPathBtn').simulate('click');
+      });
+
+      expect(validator).not.toHaveBeenCalled();
+    });
+
     describe('dynamic data', () => {
       let nameFieldHook: FieldHook<string> | null = null;
       let lastNameFieldHook: FieldHook<string> | null = null;
@@ -708,32 +796,54 @@ describe('<UseField />', () => {
   });
 
   describe('change handlers', () => {
+    const onChange = jest.fn();
     const onError = jest.fn();
 
     beforeEach(() => {
       jest.resetAllMocks();
     });
 
-    const getTestComp = (fieldConfig: FieldConfig) => {
+    const getTestComp = (fieldConfig?: FieldConfig) => {
       const TestComp = () => {
         const { form } = useForm<any>();
 
         return (
           <Form form={form}>
-            <UseField path="name" config={fieldConfig} data-test-subj="myField" onError={onError} />
+            <UseField
+              path="name"
+              config={fieldConfig}
+              data-test-subj="myField"
+              onChange={onChange}
+              onError={onError}
+            />
           </Form>
         );
       };
       return TestComp;
     };
 
-    const setup = (fieldConfig: FieldConfig) => {
+    const setup = (fieldConfig?: FieldConfig) => {
       return registerTestBed(getTestComp(fieldConfig), {
         memoryRouter: { wrapComponent: false },
       })() as TestBed;
     };
 
-    it('calls onError when validation state changes', async () => {
+    test('calls onChange() prop when value state changes', async () => {
+      const {
+        form: { setInputValue },
+      } = setup();
+
+      expect(onChange).toBeCalledTimes(0);
+
+      await act(async () => {
+        setInputValue('myField', 'foo');
+      });
+
+      expect(onChange).toBeCalledTimes(1);
+      expect(onChange).toBeCalledWith('foo');
+    });
+
+    test('calls onError() prop when validation state changes', async () => {
       const {
         form: { setInputValue },
       } = setup({
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 bc4e2ccf58294..7e216e3126ed8 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
@@ -128,11 +128,20 @@ function UseFieldComp<T = unknown, FormType = FormData, I = T>(props: Props<T, F
   );
 
   useEffect(() => {
+    let needsCleanUp = false;
+
     if (defaultValue !== undefined) {
+      needsCleanUp = true;
       // Update the form "defaultValue" ref object.
       // This allows us to reset the form and put back the defaultValue of each field
       __updateDefaultValueAt(path, defaultValue);
     }
+
+    return () => {
+      if (needsCleanUp) {
+        __updateDefaultValueAt(path, undefined);
+      }
+    };
   }, [path, defaultValue, __updateDefaultValueAt]);
 
   // Children prevails over anything else provided.
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 f0c9c50c1033e..7ba06304b971b 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
@@ -26,6 +26,10 @@ export interface InternalFieldConfig<T> {
   isIncludedInOutput?: boolean;
 }
 
+const errorsToString = (errors: ValidationError[]): string[] | null => {
+  return errors.length ? errors.map((error) => error.message) : null;
+};
+
 export const useField = <T, FormType = FormData, I = T>(
   form: FormHook<FormType>,
   path: string,
@@ -81,14 +85,13 @@ export const useField = <T, FormType = FormData, I = T>(
   const isMounted = useRef<boolean>(false);
   const validateCounter = useRef(0);
   const changeCounter = useRef(0);
-  const hasBeenReset = useRef<boolean>(false);
   const inflightValidation = useRef<ValidationCancelablePromise | null>(null);
   const debounceTimeout = useRef<NodeJS.Timeout | null>(null);
   // Keep a ref of the last state (value and errors) notified to the consumer so they don't get
   // loads of updates whenever they don't wrap the "onChange()" and "onError()" handlers with a useCallback
   // e.g. <UseField onChange={() => { // inline code }}
   const lastNotifiedState = useRef<{ value?: I; errors: string[] | null }>({
-    value: undefined,
+    value: initialValueDeserialized,
     errors: null,
   });
 
@@ -100,6 +103,9 @@ export const useField = <T, FormType = FormData, I = T>(
     [validations]
   );
 
+  const valueHasChanged = value !== lastNotifiedState.current.value;
+  const errorsHaveChanged = lastNotifiedState.current.errors !== errorsToString(errors);
+
   // ----------------------------------
   // -- HELPERS
   // ----------------------------------
@@ -519,8 +525,8 @@ export const useField = <T, FormType = FormData, I = T>(
         setStateErrors([]);
 
         if (resetValue) {
-          hasBeenReset.current = true;
           const newValue = deserializeValue(updatedDefaultValue ?? defaultValue);
+          lastNotifiedState.current.value = newValue;
           setValue(newValue);
           return newValue;
         }
@@ -604,36 +610,29 @@ export const useField = <T, FormType = FormData, I = T>(
   // might not be wrapped inside a "useCallback" and that would trigger a possible infinite
   // amount of effect executions.
   useEffect(() => {
-    if (!isMounted.current) {
+    if (!isMounted.current || value === undefined) {
       return;
     }
 
-    if (valueChangeListener && value !== lastNotifiedState.current.value) {
+    if (valueChangeListener && valueHasChanged) {
       valueChangeListener(value);
-      lastNotifiedState.current.value = value;
     }
-  }, [value, valueChangeListener]);
+  }, [value, valueHasChanged, valueChangeListener]);
 
   // Value change: update state and run validations
   useEffect(() => {
-    if (!isMounted.current) {
+    if (!isMounted.current || !valueHasChanged) {
       return;
     }
 
-    if (hasBeenReset.current) {
-      // If the field value has just been reset (triggering this useEffect)
-      // we don't want to set the "isPristine" state to true and validate the field
-      hasBeenReset.current = false;
-    } else {
-      setPristine(false);
-      setIsChangingValue(true);
-
-      runValidationsOnValueChange(() => {
-        if (isMounted.current) {
-          setIsChangingValue(false);
-        }
-      });
-    }
+    setPristine(false);
+    setIsChangingValue(true);
+
+    runValidationsOnValueChange(() => {
+      if (isMounted.current) {
+        setIsChangingValue(false);
+      }
+    });
 
     return () => {
       if (debounceTimeout.current) {
@@ -641,7 +640,7 @@ export const useField = <T, FormType = FormData, I = T>(
         debounceTimeout.current = null;
       }
     };
-  }, [value, runValidationsOnValueChange]);
+  }, [valueHasChanged, runValidationsOnValueChange]);
 
   // Value change: set "isModified" state
   useEffect(() => {
@@ -659,13 +658,18 @@ export const useField = <T, FormType = FormData, I = T>(
       return;
     }
 
-    const errorMessages = errors.length ? errors.map((error) => error.message) : null;
-
-    if (errorChangeListener && lastNotifiedState.current.errors !== errorMessages) {
-      errorChangeListener(errorMessages);
-      lastNotifiedState.current.errors = errorMessages;
+    if (errorChangeListener && errorsHaveChanged) {
+      errorChangeListener(errorsToString(errors));
     }
-  }, [errors, errorChangeListener]);
+  }, [errors, errorsHaveChanged, errorChangeListener]);
+
+  useEffect(() => {
+    lastNotifiedState.current.value = value;
+  }, [value]);
+
+  useEffect(() => {
+    lastNotifiedState.current.errors = errorsToString(errors);
+  }, [errors]);
 
   useEffect(() => {
     isMounted.current = true;
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 2160c09ef720e..3966f9cc61a70 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
@@ -11,7 +11,7 @@ import { get } from 'lodash';
 import { set } from '@elastic/safer-lodash-set';
 
 import { FormHook, FieldHook, FormData, FieldsMap, FormConfig } from '../types';
-import { mapFormFields, unflattenObject, Subject, Subscription } from '../lib';
+import { mapFormFields, unflattenObject, flattenObject, Subject, Subscription } from '../lib';
 
 const DEFAULT_OPTIONS = {
   valueChangeDebounceTime: 500,
@@ -205,7 +205,18 @@ export function useForm<T extends FormData = FormData, I extends FormData = T>(
       if (defaultValueDeserialized.current === undefined) {
         defaultValueDeserialized.current = {} as I;
       }
-      set(defaultValueDeserialized.current!, path, value);
+
+      // We allow "undefined" to be passed to be able to remove a value from the form `defaultValue` object.
+      // When <UseField path="foo" defaultValue="bar" /> mounts it calls `updateDefaultValueAt("foo", "bar")` to
+      // update the form "defaultValue" object. When that component unmounts we want to be able to clean up and
+      // remove its defaultValue on the form.
+      if (value === undefined) {
+        const updated = flattenObject(defaultValueDeserialized.current!);
+        delete updated[path];
+        defaultValueDeserialized.current = unflattenObject<I>(updated);
+      } else {
+        set(defaultValueDeserialized.current!, path, value);
+      }
     },
     []
   );
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.test.tsx
index dc89cfe4f1fb6..7c0cd960999e8 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.test.tsx
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed } from '../shared_imports';
@@ -36,8 +36,10 @@ describe('useFormIsModified()', () => {
     const [isNameVisible, setIsNameVisible] = useState(true);
     const [isLastNameVisible, setIsLastNameVisible] = useState(true);
 
-    // Call our jest.spy() with the latest hook value
-    onIsModifiedChange(isModified);
+    useEffect(() => {
+      // Call our jest.spy() with the latest hook value
+      onIsModifiedChange(isModified);
+    }, [onIsModifiedChange, isModified]);
 
     return (
       <Form form={form}>
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.ts
index 08f5eaf76a083..e5e0fd6d61472 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_is_modified.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { get } from 'lodash';
 
 import { FieldHook, FormHook } from '../types';
@@ -36,6 +36,8 @@ export const useFormIsModified = ({
   form: formFromOptions,
   discard: fieldPathsToDiscard = [],
 }: Options = {}): boolean => {
+  const [isFormModified, setIsFormModified] = useState(false);
+
   // Hook calls can not be conditional we first try to access the form through context
   let form = useFormContext({ throwIfNotFound: false });
 
@@ -76,28 +78,34 @@ export const useFormIsModified = ({
     ? ([path]: [string, FieldHook]) => fieldsToDiscard[path] !== true
     : () => true;
 
+  // Calculate next state value
   // 1. Check if any field has been modified
-  let isModified = Object.entries(getFields())
+  let nextIsModified = Object.entries(getFields())
     .filter(isFieldIncluded)
     .some(([_, field]) => field.isModified);
 
-  if (isModified) {
-    return isModified;
-  }
+  if (!nextIsModified) {
+    // 2. Check if any field has been removed.
+    // If somme field has been removed **and** they were originaly present on the
+    // form "defaultValue" then the form has been modified.
+    const formDefaultValue = __getFormDefaultValue();
+    const fieldOnFormDefaultValue = (path: string) => Boolean(get(formDefaultValue, path));
 
-  // 2. Check if any field has been removed.
-  // If somme field has been removed **and** they were originaly present on the
-  // form "defaultValue" then the form has been modified.
-  const formDefaultValue = __getFormDefaultValue();
-  const fieldOnFormDefaultValue = (path: string) => Boolean(get(formDefaultValue, path));
+    const fieldsRemovedFromDOM: string[] = fieldsToDiscard
+      ? Object.keys(__getFieldsRemoved())
+          .filter((path) => fieldsToDiscard[path] !== true)
+          .filter(fieldOnFormDefaultValue)
+      : Object.keys(__getFieldsRemoved()).filter(fieldOnFormDefaultValue);
 
-  const fieldsRemovedFromDOM: string[] = fieldsToDiscard
-    ? Object.keys(__getFieldsRemoved())
-        .filter((path) => fieldsToDiscard[path] !== true)
-        .filter(fieldOnFormDefaultValue)
-    : Object.keys(__getFieldsRemoved()).filter(fieldOnFormDefaultValue);
+    nextIsModified = fieldsRemovedFromDOM.length > 0;
+  }
 
-  isModified = fieldsRemovedFromDOM.length > 0;
+  // Update the state **only** if it has changed to avoid creating an infinite re-render
+  if (nextIsModified && !isFormModified) {
+    setIsFormModified(true);
+  } else if (!nextIsModified && isFormModified) {
+    setIsFormModified(false);
+  }
 
-  return isModified;
+  return isFormModified;
 };
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts
index 0bbaedcf2e90e..b65dc0570acba 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/index.ts
@@ -7,5 +7,7 @@
  */
 
 export type { Subscription } from './subject';
+
 export { Subject } from './subject';
-export * from './utils';
+
+export { flattenObject, unflattenObject, mapFormFields } from './utils';
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts
new file mode 100644
index 0000000000000..f7d7429889eb2
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.test.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { flattenObject } from './utils';
+
+describe('Form lib utils', () => {
+  describe('flattenObject', () => {
+    test('should flatten an object', () => {
+      const obj = {
+        a: true,
+        b: {
+          foo: 'bar',
+          baz: [
+            {
+              a: false,
+              b: 'foo',
+            },
+            'bar',
+            true,
+            [1, 2, { 3: false }],
+          ],
+        },
+      };
+
+      expect(flattenObject(obj)).toEqual({
+        a: true,
+        'b.baz[0].a': false,
+        'b.baz[0].b': 'foo',
+        'b.baz[1]': 'bar',
+        'b.baz[2]': true,
+        'b.foo': 'bar',
+        'b.baz[3][0]': 1,
+        'b.baz[3][1]': 2,
+        'b.baz[3][2].3': false,
+      });
+    });
+  });
+});
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts
index 9d8801b1448c0..8df6506ec2e7b 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts
@@ -9,12 +9,53 @@
 import { set } from '@elastic/safer-lodash-set';
 import { FieldHook } from '../types';
 
-export const unflattenObject = <T extends object = { [key: string]: any }>(object: object): T =>
+interface GenericObject {
+  [key: string]: any;
+}
+
+export const unflattenObject = <T extends object = GenericObject>(object: object): T =>
   Object.entries(object).reduce((acc, [key, value]) => {
     set(acc, key, value);
     return acc;
   }, {} as T);
 
+/**
+ * Wrap the key with [] if it is a key from an Array
+ * @param key The object key
+ * @param isArrayItem Flag to indicate if it is the key of an Array
+ */
+const renderKey = (key: string, isArrayItem: boolean): string => (isArrayItem ? `[${key}]` : key);
+
+export const flattenObject = (
+  obj: GenericObject,
+  prefix: string[] = [],
+  isArrayItem = false
+): GenericObject =>
+  Object.keys(obj).reduce<GenericObject>((acc, k) => {
+    const nextValue = obj[k];
+
+    if (typeof nextValue === 'object' && nextValue !== null) {
+      const isNextValueArray = Array.isArray(nextValue);
+      const dotSuffix = isNextValueArray ? '' : '.';
+
+      if (Object.keys(nextValue).length > 0) {
+        return {
+          ...acc,
+          ...flattenObject(
+            nextValue,
+            [...prefix, `${renderKey(k, isArrayItem)}${dotSuffix}`],
+            isNextValueArray
+          ),
+        };
+      }
+    }
+
+    const fullPath = `${prefix.join('')}${renderKey(k, isArrayItem)}`;
+    acc[fullPath] = nextValue;
+
+    return acc;
+  }, {});
+
 /**
  * Helper to map the object of fields to any of its value
  *
diff --git a/src/plugins/event_annotation/common/event_annotation_group/index.ts b/src/plugins/event_annotation/common/event_annotation_group/index.ts
index 85f1d9dff900c..f6a1f38459c13 100644
--- a/src/plugins/event_annotation/common/event_annotation_group/index.ts
+++ b/src/plugins/event_annotation/common/event_annotation_group/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import type { EventAnnotationOutput } from '../manual_event_annotation/types';
 
diff --git a/src/plugins/event_annotation/common/manual_event_annotation/index.ts b/src/plugins/event_annotation/common/manual_event_annotation/index.ts
index 108df93b34180..167adcb3ed739 100644
--- a/src/plugins/event_annotation/common/manual_event_annotation/index.ts
+++ b/src/plugins/event_annotation/common/manual_event_annotation/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import type { EventAnnotationArgs, EventAnnotationOutput } from './types';
 export const manualEventAnnotation: ExpressionFunctionDefinition<
diff --git a/src/plugins/event_annotation/public/event_annotation_service/types.ts b/src/plugins/event_annotation/public/event_annotation_service/types.ts
index bb0b6eb4cc200..c44b2d1e536d5 100644
--- a/src/plugins/event_annotation/public/event_annotation_service/types.ts
+++ b/src/plugins/event_annotation/public/event_annotation_service/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionAstExpression } from '../../../expressions/common/ast';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin/common/ast';
 import { EventAnnotationArgs } from '../../common';
 
 export interface EventAnnotationServiceType {
diff --git a/src/plugins/event_annotation/public/plugin.ts b/src/plugins/event_annotation/public/plugin.ts
index 83cdc0546a7f5..f3f4fcfcc60f6 100644
--- a/src/plugins/event_annotation/public/plugin.ts
+++ b/src/plugins/event_annotation/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
-import { ExpressionsSetup } from '../../expressions/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { manualEventAnnotation, eventAnnotationGroup } from '../common';
 import { EventAnnotationService } from './event_annotation_service';
 
diff --git a/src/plugins/event_annotation/server/plugin.ts b/src/plugins/event_annotation/server/plugin.ts
index ef4e0216fb5ac..0643611af9bb3 100644
--- a/src/plugins/event_annotation/server/plugin.ts
+++ b/src/plugins/event_annotation/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { manualEventAnnotation, eventAnnotationGroup } from '../common';
-import { ExpressionsServerSetup } from '../../expressions/server';
 
 interface SetupDependencies {
   expressions: ExpressionsServerSetup;
diff --git a/src/plugins/expression_error/public/components/debug_component.tsx b/src/plugins/expression_error/public/components/debug_component.tsx
index 6cb927380d669..a9c1729d646e1 100644
--- a/src/plugins/expression_error/public/components/debug_component.tsx
+++ b/src/plugins/expression_error/public/components/debug_component.tsx
@@ -8,8 +8,8 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '../../../expressions';
-import { withSuspense } from '../../../presentation_util/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions } from '../../common/types';
 import { LazyDebugComponent } from '.';
 
diff --git a/src/plugins/expression_error/public/components/error/error.tsx b/src/plugins/expression_error/public/components/error/error.tsx
index 2b42aa0f7eccd..4fe51aede4a64 100644
--- a/src/plugins/expression_error/public/components/error/error.tsx
+++ b/src/plugins/expression_error/public/components/error/error.tsx
@@ -9,8 +9,8 @@
 import React, { FC } from 'react';
 import { EuiButtonIcon, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { ShowDebugging } from './show_debugging';
-import { Markdown } from '../../../../kibana_react/public';
 
 export interface Props {
   payload: {
diff --git a/src/plugins/expression_error/public/components/error_component.tsx b/src/plugins/expression_error/public/components/error_component.tsx
index 2a019c9ce6945..fd84e298e93d3 100644
--- a/src/plugins/expression_error/public/components/error_component.tsx
+++ b/src/plugins/expression_error/public/components/error_component.tsx
@@ -8,8 +8,8 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { EuiIcon, useResizeObserver, EuiPopover } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '../../../expressions';
-import { withSuspense } from '../../../presentation_util/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { ErrorRendererConfig } from '../../common/types';
 import { LazyErrorComponent } from '.';
 
diff --git a/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx b/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx
index 378e22f834e1d..6f6a72c85d6c2 100644
--- a/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx
+++ b/src/plugins/expression_error/public/expression_renderers/__stories__/error_renderer.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getErrorRenderer } from '../error_renderer';
-import { Render } from '../../../../presentation_util/public/__stories__';
 
 storiesOf('renderers/error', module).add('default', () => {
   const thrownError = new Error('There was an error');
diff --git a/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx b/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx
index d4c74a9c646e7..acf3c73226604 100644
--- a/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx
+++ b/src/plugins/expression_error/public/expression_renderers/debug_renderer.tsx
@@ -9,12 +9,12 @@
 import { render, unmountComponentAtNode } from 'react-dom';
 import React from 'react';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { ExpressionRenderDefinition } from 'src/plugins/expressions/common';
+import { CoreTheme } from '@kbn/core/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../../../src/plugins/presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { LazyDebugRenderComponent } from '../components';
 import { JSON } from '../../common';
 
diff --git a/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx b/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx
index 65847a18d4e0a..4b96881f081b5 100644
--- a/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx
+++ b/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx
@@ -9,13 +9,13 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { ErrorRendererConfig } from '../../common/types';
 import { LazyErrorRenderComponent } from '../components';
 
diff --git a/src/plugins/expression_error/public/plugin.ts b/src/plugins/expression_error/public/plugin.ts
index de3793b6a30ae..654ef2dfaedd2 100755
--- a/src/plugins/expression_error/public/plugin.ts
+++ b/src/plugins/expression_error/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { debugRendererFactory, errorRendererFactory } from './expression_renderers';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_image/__fixtures__/function_specs.ts b/src/plugins/expression_image/__fixtures__/function_specs.ts
index 2117a8fc4b726..1fe2563f3c274 100644
--- a/src/plugins/expression_image/__fixtures__/function_specs.ts
+++ b/src/plugins/expression_image/__fixtures__/function_specs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { imageFunction } from '../common/expression_functions';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
 
 export const functionSpecs = [imageFunction].map((fn) => new ExpressionFunction(fn()));
diff --git a/src/plugins/expression_image/common/expression_functions/image_function.test.ts b/src/plugins/expression_image/common/expression_functions/image_function.test.ts
index 7deaeb90b411b..389fe7ec4ac19 100644
--- a/src/plugins/expression_image/common/expression_functions/image_function.test.ts
+++ b/src/plugins/expression_image/common/expression_functions/image_function.test.ts
@@ -7,12 +7,12 @@
  */
 
 import expect from '@kbn/expect';
-import { ExecutionContext } from 'src/plugins/expressions';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 import {
   functionWrapper,
   getElasticLogo,
   getElasticOutline,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { imageFunction as image } from './image_function';
 
 describe('image', () => {
diff --git a/src/plugins/expression_image/common/expression_functions/image_function.ts b/src/plugins/expression_image/common/expression_functions/image_function.ts
index 8394681e1b10b..c4bf2a2ec9b84 100644
--- a/src/plugins/expression_image/common/expression_functions/image_function.ts
+++ b/src/plugins/expression_image/common/expression_functions/image_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { getElasticLogo, resolveWithMissingImage } from '../../../presentation_util/common/lib';
+import { getElasticLogo, resolveWithMissingImage } from '@kbn/presentation-util-plugin/common/lib';
 import { BASE64, URL } from '../constants';
 import { ExpressionImageFunction, ImageMode } from '../types';
 
diff --git a/src/plugins/expression_image/common/types/expression_functions.ts b/src/plugins/expression_image/common/types/expression_functions.ts
index 5ee9ed93cc87b..2b4b3a605df23 100644
--- a/src/plugins/expression_image/common/types/expression_functions.ts
+++ b/src/plugins/expression_image/common/types/expression_functions.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition } from '../../../expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export enum ImageMode {
   CONTAIN = 'contain',
diff --git a/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx b/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx
index dc54194d5d83f..16efe9ee4a817 100644
--- a/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx
+++ b/src/plugins/expression_image/public/expression_renderers/__stories__/image_renderer.stories.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Render, waitFor } from '../../../../presentation_util/public/__stories__';
+import { Render, waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
 import { getImageRenderer } from '../image_renderer';
-import { getElasticLogo } from '../../../../../../src/plugins/presentation_util/common/lib';
 import { ImageMode } from '../../../common';
 
 const Renderer = ({ elasticLogo }: { elasticLogo: string }) => {
diff --git a/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx b/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx
index 161fcef8be0fc..2ee79c6dae1a0 100644
--- a/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx
+++ b/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx
@@ -7,13 +7,13 @@
  */
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { getElasticLogo, defaultTheme$, isValidUrl } from '../../../presentation_util/public';
+import { CoreTheme } from '@kbn/core/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { getElasticLogo, defaultTheme$, isValidUrl } from '@kbn/presentation-util-plugin/public';
 import { ImageRendererConfig } from '../../common/types';
 
 const strings = {
diff --git a/src/plugins/expression_image/public/plugin.ts b/src/plugins/expression_image/public/plugin.ts
index ba7e2baded8d8..c6bc06209236e 100755
--- a/src/plugins/expression_image/public/plugin.ts
+++ b/src/plugins/expression_image/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { imageRendererFactory } from './expression_renderers';
 import { imageFunction } from '../common/expression_functions';
 
diff --git a/src/plugins/expression_image/server/plugin.ts b/src/plugins/expression_image/server/plugin.ts
index b342bb96647ce..f474c3e05948d 100755
--- a/src/plugins/expression_image/server/plugin.ts
+++ b/src/plugins/expression_image/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { imageFunction } from '../common/expression_functions';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_metric/__fixtures__/function_specs.ts b/src/plugins/expression_metric/__fixtures__/function_specs.ts
index 3d36840b47e0d..10a0c2ae31b3c 100644
--- a/src/plugins/expression_metric/__fixtures__/function_specs.ts
+++ b/src/plugins/expression_metric/__fixtures__/function_specs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { metricFunction } from '../common/expression_functions';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
 
 export const functionSpecs = [metricFunction].map((fn) => new ExpressionFunction(fn()));
diff --git a/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts b/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts
index 88249728526d0..825bcbe54b46a 100644
--- a/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts
+++ b/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions';
-import { functionWrapper, fontStyle } from '../../../presentation_util/common/lib';
+import { ExecutionContext } from '@kbn/expressions-plugin';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { metricFunction } from './metric_function';
 
 describe('metric', () => {
diff --git a/src/plugins/expression_metric/common/expression_functions/metric_function.ts b/src/plugins/expression_metric/common/expression_functions/metric_function.ts
index 184ef37834e01..53184d0359b73 100644
--- a/src/plugins/expression_metric/common/expression_functions/metric_function.ts
+++ b/src/plugins/expression_metric/common/expression_functions/metric_function.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { openSans } from '../../../expressions/common/fonts';
+import { openSans } from '@kbn/expressions-plugin/common/fonts';
 import { FONT_FAMILY, FONT_WEIGHT, CSS, NUMERALJS } from '../constants';
 import { ExpressionMetricFunction } from '../types';
 
diff --git a/src/plugins/expression_metric/common/types/expression_functions.ts b/src/plugins/expression_metric/common/types/expression_functions.ts
index 69573eec26b8f..c2fa2e7a718ce 100644
--- a/src/plugins/expression_metric/common/types/expression_functions.ts
+++ b/src/plugins/expression_metric/common/types/expression_functions.ts
@@ -5,7 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender, Style } from '../../../expressions';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionValueRender,
+  Style,
+} from '@kbn/expressions-plugin';
 
 export type Input = number | string | null;
 
diff --git a/src/plugins/expression_metric/common/types/expression_renderers.ts b/src/plugins/expression_metric/common/types/expression_renderers.ts
index 0f8635edd7f95..656a973448752 100644
--- a/src/plugins/expression_metric/common/types/expression_renderers.ts
+++ b/src/plugins/expression_metric/common/types/expression_renderers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Style } from '../../../expressions/common';
+import { Style } from '@kbn/expressions-plugin/common';
 
 export interface MetricRendererConfig {
   /** The text to display under the metric */
diff --git a/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx b/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx
index 5835730e35f9b..eefb6656e7d42 100644
--- a/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx
+++ b/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx
@@ -8,9 +8,9 @@
 
 import React, { CSSProperties } from 'react';
 import { storiesOf } from '@storybook/react';
-import { Style } from 'src/plugins/expressions';
+import { Style } from '@kbn/expressions-plugin';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getMetricRenderer } from '../metric_renderer';
-import { Render } from '../../../../presentation_util/public/__stories__';
 import { MetricRendererConfig } from '../../../common';
 
 const labelFontSpec: CSSProperties = {
diff --git a/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx b/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx
index 6a11910d4f26f..f5a5452c1388f 100644
--- a/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx
+++ b/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx
@@ -7,13 +7,13 @@
  */
 import React, { CSSProperties, lazy } from 'react';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { MetricRendererConfig } from '../../common/types';
 
 const strings = {
diff --git a/src/plugins/expression_metric/public/plugin.ts b/src/plugins/expression_metric/public/plugin.ts
index 6830fd904751c..25d5f08cc8614 100755
--- a/src/plugins/expression_metric/public/plugin.ts
+++ b/src/plugins/expression_metric/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { metricFunction } from '../common/expression_functions';
 import { metricRendererFactory } from './expression_renderers';
 
diff --git a/src/plugins/expression_metric/server/plugin.ts b/src/plugins/expression_metric/server/plugin.ts
index 29281faf0b790..4f5edabdca3b3 100755
--- a/src/plugins/expression_metric/server/plugin.ts
+++ b/src/plugins/expression_metric/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { metricFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts
index 4c7e4771a8e0a..b01f67f41b608 100644
--- a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts
+++ b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from 'src/plugins/expressions';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 import {
   getElasticLogo,
   getElasticOutline,
   functionWrapper,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { repeatImageFunction } from './repeat_image_function';
 
 describe('repeatImage', () => {
diff --git a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts
index ebc72ab10af42..c62fced4ddf7e 100644
--- a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts
+++ b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.ts
@@ -11,7 +11,7 @@ import {
   getElasticOutline,
   isValidUrl,
   resolveWithMissingImage,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { CONTEXT, BASE64, URL } from '../constants';
 import { ExpressionRepeatImageFunction } from '../types';
 
diff --git a/src/plugins/expression_repeat_image/common/types/expression_functions.ts b/src/plugins/expression_repeat_image/common/types/expression_functions.ts
index 3e278ddcc97c5..2be479bbaff3e 100644
--- a/src/plugins/expression_repeat_image/common/types/expression_functions.ts
+++ b/src/plugins/expression_repeat_image/common/types/expression_functions.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender } from '../../../expressions';
+import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin';
 
 interface Arguments {
   image: string | null;
diff --git a/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx b/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx
index e837932b9469a..297c91d98d0cd 100644
--- a/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx
+++ b/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx
@@ -8,7 +8,7 @@
 
 import React, { ReactElement, useEffect, useState } from 'react';
 import { times } from 'lodash';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { RepeatImageRendererConfig } from '../../common';
 
 interface RepeatImageComponentProps extends RepeatImageRendererConfig {
diff --git a/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx b/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx
index c727ca9562fad..639d89ffd2cb9 100644
--- a/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx
+++ b/src/plugins/expression_repeat_image/public/expression_renderers/__stories__/repeat_image_renderer.stories.tsx
@@ -8,13 +8,10 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo, getElasticOutline } from '@kbn/presentation-util-plugin/common/lib';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getRepeatImageRenderer } from '../repeat_image_renderer';
-import {
-  getElasticLogo,
-  getElasticOutline,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
-import { waitFor } from '../../../../../../src/plugins/presentation_util/public/__stories__';
 
 const Renderer = ({
   elasticLogo,
diff --git a/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx b/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx
index 5e5bc04f317d2..ce3d8c7c666d2 100644
--- a/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx
+++ b/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx
@@ -8,18 +8,18 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { CoreTheme } from '@kbn/core/public';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { CoreSetup } from '../../../../core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
 import {
   defaultTheme$,
   getElasticOutline,
   isValidUrl,
   withSuspense,
-} from '../../../presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { RepeatImageRendererConfig } from '../../common/types';
 
 const strings = {
diff --git a/src/plugins/expression_repeat_image/public/plugin.ts b/src/plugins/expression_repeat_image/public/plugin.ts
index 2f275f9218d50..a4f9f98049e3d 100755
--- a/src/plugins/expression_repeat_image/public/plugin.ts
+++ b/src/plugins/expression_repeat_image/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { repeatImageFunction } from '../common/expression_functions';
 import { repeatImageRendererFactory } from './expression_renderers';
 
diff --git a/src/plugins/expression_repeat_image/server/plugin.ts b/src/plugins/expression_repeat_image/server/plugin.ts
index eff5e24ef65fa..8c316e3c17d61 100755
--- a/src/plugins/expression_repeat_image/server/plugin.ts
+++ b/src/plugins/expression_repeat_image/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { repeatImageFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts
index 999fd31980c6e..73c851772d650 100644
--- a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts
+++ b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts
@@ -10,10 +10,10 @@ import {
   functionWrapper,
   getElasticOutline,
   getElasticLogo,
-} from '../../../presentation_util/common/lib';
+} from '@kbn/presentation-util-plugin/common/lib';
 import { revealImageFunction, errors } from './reveal_image_function';
 import { Origin } from '../types';
-import { ExecutionContext } from 'src/plugins/expressions';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 
 describe('revealImageFunction', () => {
   const fn = functionWrapper(revealImageFunction);
diff --git a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts
index 7056bb10518e8..5f03df6308391 100644
--- a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts
+++ b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image_function.ts
@@ -11,9 +11,9 @@ import {
   resolveWithMissingImage,
   getElasticOutline,
   isValidUrl,
-} from '../../../presentation_util/common/lib';
-import { ExpressionRevealImageFunction, Origin, Position } from '../../common/types';
-import { BASE64, URL } from '../../common/constants';
+} from '@kbn/presentation-util-plugin/common/lib';
+import { ExpressionRevealImageFunction, Origin, Position } from '../types';
+import { BASE64, URL } from '../constants';
 
 const strings = {
   help: i18n.translate('expressionRevealImage.functions.revealImageHelpText', {
diff --git a/src/plugins/expression_reveal_image/common/types/expression_functions.ts b/src/plugins/expression_reveal_image/common/types/expression_functions.ts
index 2d836bf8ad997..e8dca801aa69a 100644
--- a/src/plugins/expression_reveal_image/common/types/expression_functions.ts
+++ b/src/plugins/expression_reveal_image/common/types/expression_functions.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin';
 
 export enum Origin {
   TOP = 'top',
diff --git a/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx b/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx
index 1f09ff06b4b2a..3b89454c7213c 100644
--- a/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx
+++ b/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx
@@ -8,10 +8,10 @@
 
 import React, { useRef, useState, useEffect, useCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { css, CSSObject } from '@emotion/react';
+import { isValidUrl } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions, RevealImageRendererConfig, OriginString } from '../../common/types';
-import { isValidUrl } from '../../../presentation_util/public';
 
 const revealImageParentStyle = css`
   height: 100%;
diff --git a/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx b/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx
index 22dd2ef4156df..06bb5ba3d4d32 100644
--- a/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx
+++ b/src/plugins/expression_reveal_image/public/expression_renderers/__stories__/reveal_image_renderer.stories.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getRevealImageRenderer } from '../';
-import { getElasticOutline, getElasticLogo } from '../../../../presentation_util/public';
-import { Render, waitFor } from '../../../../presentation_util/public/__stories__';
+import { getElasticOutline, getElasticLogo } from '@kbn/presentation-util-plugin/public';
+import { Render, waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getRevealImageRenderer } from '..';
 import { Origin } from '../../../common/types/expression_functions';
 
 const Renderer = ({
diff --git a/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx b/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx
index 6bdd014296419..77502502b9736 100644
--- a/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx
+++ b/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx
@@ -8,13 +8,13 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { RevealImageRendererConfig } from '../../common/types';
 
 export const strings = {
diff --git a/src/plugins/expression_reveal_image/public/plugin.ts b/src/plugins/expression_reveal_image/public/plugin.ts
index 17bff3f33e8ac..89a074f7095d5 100755
--- a/src/plugins/expression_reveal_image/public/plugin.ts
+++ b/src/plugins/expression_reveal_image/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { revealImageRendererFactory } from './expression_renderers';
 import { revealImageFunction } from '../common/expression_functions';
 
diff --git a/src/plugins/expression_reveal_image/server/plugin.ts b/src/plugins/expression_reveal_image/server/plugin.ts
index c85ff9c620814..58ebe7b42609e 100644
--- a/src/plugins/expression_reveal_image/server/plugin.ts
+++ b/src/plugins/expression_reveal_image/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { revealImageFunction } from '../common';
 
 interface SetupDeps {
diff --git a/src/plugins/expression_shape/__fixtures__/function_specs.ts b/src/plugins/expression_shape/__fixtures__/function_specs.ts
index c75cb5c61caa1..8d18bb9f2afd6 100644
--- a/src/plugins/expression_shape/__fixtures__/function_specs.ts
+++ b/src/plugins/expression_shape/__fixtures__/function_specs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { shapeFunction } from '../common/expression_functions';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
 
 export const functionSpecs = [shapeFunction].map((fn) => new ExpressionFunction(fn()));
diff --git a/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts b/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts
index 489808fb52b13..e30c093760c38 100644
--- a/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts
+++ b/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '../../../expressions';
-import { functionWrapper, fontStyle } from '../../../presentation_util/common/lib';
+import { ExecutionContext } from '@kbn/expressions-plugin';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { progressFunction, errors } from './progress_function';
 
 describe('progress', () => {
diff --git a/src/plugins/expression_shape/common/expression_functions/progress_function.ts b/src/plugins/expression_shape/common/expression_functions/progress_function.ts
index 56ee8878e531c..49b2f12952fdb 100644
--- a/src/plugins/expression_shape/common/expression_functions/progress_function.ts
+++ b/src/plugins/expression_shape/common/expression_functions/progress_function.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { Style, openSans } from '../../../expressions/common';
+import { Style, openSans } from '@kbn/expressions-plugin/common';
 import { CSS, FONT_FAMILY, FONT_WEIGHT, BOOLEAN_TRUE, BOOLEAN_FALSE } from '../constants';
 import { ExpressionProgressFunction, Progress } from '../types';
 
diff --git a/src/plugins/expression_shape/common/types/expression_functions.ts b/src/plugins/expression_shape/common/types/expression_functions.ts
index 2486be13f51bf..88f17298fcf47 100644
--- a/src/plugins/expression_shape/common/types/expression_functions.ts
+++ b/src/plugins/expression_shape/common/types/expression_functions.ts
@@ -6,7 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunctionDefinition, ExpressionValueRender, Style } from '../../../expressions';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionValueRender,
+  Style,
+} from '@kbn/expressions-plugin';
 
 export enum Shape {
   ARROW = 'arrow',
diff --git a/src/plugins/expression_shape/public/components/progress/progress_component.tsx b/src/plugins/expression_shape/public/components/progress/progress_component.tsx
index e9c71753e8ff6..d7cd700ed82da 100644
--- a/src/plugins/expression_shape/public/components/progress/progress_component.tsx
+++ b/src/plugins/expression_shape/public/components/progress/progress_component.tsx
@@ -8,11 +8,11 @@
 
 import React, { CSSProperties, RefCallback, useCallback, useEffect, useRef, useState } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '../../../../expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions, ProgressRendererConfig } from '../../../common/types';
 import { ShapeRef, SvgConfig, SvgTextAttributes } from '../reusable/types';
 import { getShapeContentElement } from '../reusable/shape_factory';
-import { withSuspense } from '../../../../presentation_util/public';
 import { getTextAttributes, getViewBox } from './utils';
 import { getId } from '../../../common/lib';
 import { getDefaultShapeData } from '../reusable';
diff --git a/src/plugins/expression_shape/public/components/shape/shape_component.tsx b/src/plugins/expression_shape/public/components/shape/shape_component.tsx
index 9e7aba33f5834..ef3259e9b8300 100644
--- a/src/plugins/expression_shape/public/components/shape/shape_component.tsx
+++ b/src/plugins/expression_shape/public/components/shape/shape_component.tsx
@@ -8,7 +8,7 @@
 
 import React, { useState, useEffect, useCallback, RefCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { withSuspense } from '../../../../presentation_util/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import {
   ShapeRef,
   ShapeAttributes,
diff --git a/src/plugins/expression_shape/public/components/shape/types.ts b/src/plugins/expression_shape/public/components/shape/types.ts
index 279bf29575214..33531b3eb8571 100644
--- a/src/plugins/expression_shape/public/components/shape/types.ts
+++ b/src/plugins/expression_shape/public/components/shape/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IInterpreterRenderHandlers } from '../../../../../../src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { ShapeRendererConfig } from '../../../common/types';
 
 export interface ShapeComponentProps extends ShapeRendererConfig {
diff --git a/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx b/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx
index 862718f775c5e..a0d617fa48056 100644
--- a/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/__stories__/progress_renderer.stories.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getProgressRenderer } from '../progress_renderer';
 import { Progress } from '../../../common';
 
diff --git a/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx b/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx
index d7098e8378c60..8bd77ec638cc2 100644
--- a/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/__stories__/shape_renderer.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getShapeRenderer } from '../';
-import { Render } from '../../../../presentation_util/public/__stories__';
+import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getShapeRenderer } from '..';
 import { Shape } from '../../../common/types';
 
 storiesOf('renderers/shape', module).add('default', () => {
diff --git a/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx b/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx
index b618d24d26fb0..1ce90f02c9cab 100644
--- a/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx
@@ -8,15 +8,15 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { CoreTheme } from '@kbn/core/public';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { CoreSetup } from '../../../../core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { ProgressRendererConfig } from '../../common/types';
 import { LazyProgressComponent } from '../components/progress';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
 
 const ProgressComponent = withSuspense(LazyProgressComponent);
 
diff --git a/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx b/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx
index fb2a32884d03b..7cfe2bcf326ed 100644
--- a/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx
+++ b/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx
@@ -8,13 +8,13 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from '../../../../core/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { withSuspense, defaultTheme$ } from '../../../presentation_util/public';
+import { CoreSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
 import { ShapeRendererConfig } from '../../common/types';
 import { LazyShapeComponent } from '../components/shape';
 
diff --git a/src/plugins/expression_shape/public/plugin.ts b/src/plugins/expression_shape/public/plugin.ts
index 5728b92e97f94..cafc49a404da3 100755
--- a/src/plugins/expression_shape/public/plugin.ts
+++ b/src/plugins/expression_shape/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsStart, ExpressionsSetup } from '../../expressions/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsStart, ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { shapeRendererFactory, progressRendererFactory } from './expression_renderers';
 import { shapeFunction, progressFunction } from '../common/expression_functions';
 
diff --git a/src/plugins/expression_shape/server/plugin.ts b/src/plugins/expression_shape/server/plugin.ts
index a98d0fe3f17fe..41538ba489656 100644
--- a/src/plugins/expression_shape/server/plugin.ts
+++ b/src/plugins/expression_shape/server/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { ExpressionsServerStart, ExpressionsServerSetup } from '../../expressions/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ExpressionsServerStart, ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { shapeFunction, progressFunction } from '../common/expression_functions';
 
 interface SetupDeps {
diff --git a/src/plugins/expressions/common/execution/container.ts b/src/plugins/expressions/common/execution/container.ts
index 955d0346f3bb7..f55d69e3afbcd 100644
--- a/src/plugins/expressions/common/execution/container.ts
+++ b/src/plugins/expressions/common/execution/container.ts
@@ -9,7 +9,7 @@
 import {
   StateContainer,
   createStateContainer,
-} from '../../../kibana_utils/common/state_containers';
+} from '@kbn/kibana-utils-plugin/common/state_containers';
 import { ExecutorState, defaultState as executorDefaultState } from '../executor';
 import { ExpressionAstExpression } from '../ast';
 import { ExpressionValue } from '../expression_types';
diff --git a/src/plugins/expressions/common/execution/execution.abortion.test.ts b/src/plugins/expressions/common/execution/execution.abortion.test.ts
index fca030fb9a080..1664dd86870a8 100644
--- a/src/plugins/expressions/common/execution/execution.abortion.test.ts
+++ b/src/plugins/expressions/common/execution/execution.abortion.test.ts
@@ -7,6 +7,7 @@
  */
 
 import { waitFor } from '@testing-library/react';
+import { lastValueFrom } from 'rxjs';
 import { Execution } from './execution';
 import { parseExpression } from '../ast';
 import { createUnitTestExecutor } from '../test_helpers';
@@ -75,7 +76,7 @@ describe('Execution abortion tests', () => {
 
     execution.start();
 
-    const { result } = await execution.result.toPromise();
+    const { result } = await lastValueFrom(execution.result);
 
     execution.cancel();
 
@@ -135,7 +136,7 @@ describe('Execution abortion tests', () => {
     await waitFor(() => expect(started).toHaveBeenCalledTimes(1));
 
     execution.cancel();
-    const { result } = await execution.result.toPromise();
+    const { result } = await lastValueFrom(execution.result);
     expect(result).toMatchObject({
       type: 'error',
       error: {
diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts
index 786b18405309f..78d88adfa3dbd 100644
--- a/src/plugins/expressions/common/execution/execution.test.ts
+++ b/src/plugins/expressions/common/execution/execution.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { of } from 'rxjs';
+import { lastValueFrom, of } from 'rxjs';
 import { scan } from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
 import { Execution } from './execution';
 import { parseExpression, ExpressionAstExpression } from '../ast';
 import { createUnitTestExecutor } from '../test_helpers';
-import { ExpressionFunctionDefinition } from '../../common';
+import { ExpressionFunctionDefinition } from '..';
 import { ExecutionContract } from './execution_contract';
 
 beforeAll(() => {
@@ -45,7 +45,7 @@ const run = async (
 ) => {
   const execution = createExecution(expression, context);
   execution.start(input);
-  return await execution.result.toPromise();
+  return await lastValueFrom(execution.result);
 };
 
 let testScheduler: TestScheduler;
@@ -84,7 +84,7 @@ describe('Execution', () => {
     /* eslint-enable no-console */
 
     execution.start(123);
-    const { result } = await execution.result.toPromise();
+    const { result } = await lastValueFrom(execution.result);
 
     expect(result).toBe(123);
     expect(spy).toHaveBeenCalledTimes(1);
@@ -102,7 +102,7 @@ describe('Execution', () => {
       value: -1,
     });
 
-    const { result } = await execution.result.toPromise();
+    const { result } = await lastValueFrom(execution.result);
 
     expect(result).toEqual({
       type: 'num',
@@ -117,7 +117,7 @@ describe('Execution', () => {
       value: 0,
     });
 
-    const { result } = await execution.result.toPromise();
+    const { result } = await lastValueFrom(execution.result);
 
     expect(result).toEqual({
       type: 'num',
@@ -131,7 +131,7 @@ describe('Execution', () => {
 
       // Below 1 is cast to { type: 'num', value: 1 }.
       execution.start(1);
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toEqual({
         type: 'num',
@@ -143,7 +143,7 @@ describe('Execution', () => {
       const execution = createExecution('add val=1');
 
       execution.start(Promise.resolve(1));
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toEqual({
         type: 'num',
@@ -155,7 +155,7 @@ describe('Execution', () => {
       const execution = createExecution('add val=1');
 
       execution.start(of(1));
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toEqual({
         type: 'num',
@@ -372,7 +372,7 @@ describe('Execution', () => {
         value: 0,
       });
 
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toEqual({
         type: 'num',
@@ -460,7 +460,7 @@ describe('Execution', () => {
       const execution = await createExecution('error "foo"');
       execution.start(null);
 
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toMatchObject({
         type: 'error',
@@ -709,7 +709,7 @@ describe('Execution', () => {
       };
       const executor = createUnitTestExecutor();
       executor.registerFunction(requiredArg);
-      const { result } = await executor.run('requiredArg', null, {}).toPromise();
+      const { result } = await lastValueFrom(executor.run('requiredArg', null, {}));
 
       expect(result).toMatchObject({
         type: 'error',
@@ -758,7 +758,7 @@ describe('Execution', () => {
     });
 
     it('errors when argument is invalid', async () => {
-      const { result } = await executor.run('validateArg arg="invalid"', null).toPromise();
+      const { result } = await lastValueFrom(executor.run('validateArg arg="invalid"', null));
 
       expect(result).toMatchObject({
         type: 'error',
@@ -770,9 +770,9 @@ describe('Execution', () => {
     });
 
     it('errors when at least one value is invalid', async () => {
-      const { result } = await executor
-        .run('validateArg arg="valid" arg="invalid"', null)
-        .toPromise();
+      const { result } = await lastValueFrom(
+        executor.run('validateArg arg="valid" arg="invalid"', null)
+      );
 
       expect(result).toMatchObject({
         type: 'error',
@@ -784,7 +784,7 @@ describe('Execution', () => {
     });
 
     it('does not error when argument is valid', async () => {
-      const { result } = await executor.run('validateArg arg="valid"', null).toPromise();
+      const { result } = await lastValueFrom(executor.run('validateArg arg="valid"', null));
 
       expect(result).toBe('something');
     });
@@ -794,7 +794,7 @@ describe('Execution', () => {
     test('can execute expression in debug mode', async () => {
       const execution = createExecution('add val=1 | add val=2 | add val=3', {}, true);
       execution.start(-1);
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toEqual({
         type: 'num',
@@ -809,7 +809,7 @@ describe('Execution', () => {
         true
       );
       execution.start(0);
-      const { result } = await execution.result.toPromise();
+      const { result } = await lastValueFrom(execution.result);
 
       expect(result).toEqual({
         type: 'num',
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index 4eafd1ff5a278..17b6338a48f89 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -21,11 +21,11 @@ import {
   ReplaySubject,
 } from 'rxjs';
 import { catchError, finalize, map, pluck, shareReplay, switchMap, tap } from 'rxjs/operators';
+import { now, AbortError } from '@kbn/kibana-utils-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { Executor } from '../executor';
 import { createExecutionContainer, ExecutionContainer } from './container';
 import { createError } from '../util';
-import { now, AbortError } from '../../../kibana_utils/common';
-import { Adapters } from '../../../inspector/common';
 import { isExpressionValueError, ExpressionValueError } from '../expression_types/specs/error';
 import {
   ExpressionAstArgument,
@@ -281,8 +281,8 @@ export class Execution<
       this.context.inspectorAdapters.requests?.reset();
     }
 
-    if (isObservable<Input>(input)) {
-      input.subscribe(this.input$);
+    if (isObservable(input)) {
+      (input as Observable<Input>).subscribe(this.input$);
     } else if (isPromise(input)) {
       from(input).subscribe(this.input$);
     } else {
diff --git a/src/plugins/expressions/common/execution/execution_contract.ts b/src/plugins/expressions/common/execution/execution_contract.ts
index 5167868582332..34e11ad4c4948 100644
--- a/src/plugins/expressions/common/execution/execution_contract.ts
+++ b/src/plugins/expressions/common/execution/execution_contract.ts
@@ -8,10 +8,10 @@
 
 import { of, Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { Execution, ExecutionResult } from './execution';
 import { ExpressionValueError } from '../expression_types/specs';
 import { ExpressionAstExpression } from '../ast';
-import { Adapters } from '../../../inspector/common/adapters';
 
 /**
  * `ExecutionContract` is a wrapper around `Execution` class. It provides the
diff --git a/src/plugins/expressions/common/execution/types.ts b/src/plugins/expressions/common/execution/types.ts
index e1e65ada632a9..44d6fef6f79a6 100644
--- a/src/plugins/expressions/common/execution/types.ts
+++ b/src/plugins/expressions/common/execution/types.ts
@@ -8,11 +8,11 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'src/core/server';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 
+import { Adapters, RequestAdapter } from '@kbn/inspector-plugin/common';
 import { Datatable, ExpressionType } from '../expression_types';
-import { Adapters, RequestAdapter } from '../../../inspector/common';
 import { TablesAdapter } from '../util/tables_adapter';
 import { ExpressionsInspectorAdapter } from '../util';
 
diff --git a/src/plugins/expressions/common/executor/container.ts b/src/plugins/expressions/common/executor/container.ts
index 91d4247a97cce..3ea5ff1f68920 100644
--- a/src/plugins/expressions/common/executor/container.ts
+++ b/src/plugins/expressions/common/executor/container.ts
@@ -9,7 +9,7 @@
 import {
   StateContainer,
   createStateContainer,
-} from '../../../kibana_utils/common/state_containers';
+} from '@kbn/kibana-utils-plugin/common/state_containers';
 import { ExpressionFunction } from '../expression_functions';
 import { ExpressionType } from '../expression_types';
 
diff --git a/src/plugins/expressions/common/executor/executor.test.ts b/src/plugins/expressions/common/executor/executor.test.ts
index be985c2720f8b..35f0b9c13aa1a 100644
--- a/src/plugins/expressions/common/executor/executor.test.ts
+++ b/src/plugins/expressions/common/executor/executor.test.ts
@@ -11,8 +11,8 @@ import * as expressionTypes from '../expression_types';
 import * as expressionFunctions from '../expression_functions';
 import { Execution } from '../execution';
 import { ExpressionAstFunction, parseExpression, formatExpression } from '../ast';
-import { MigrateFunction } from '../../../kibana_utils/common/persistable_state';
-import { SavedObjectReference } from 'src/core/types';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common/persistable_state';
+import { SavedObjectReference } from '@kbn/core/types';
 
 describe('Executor', () => {
   test('can instantiate', () => {
diff --git a/src/plugins/expressions/common/executor/executor.ts b/src/plugins/expressions/common/executor/executor.ts
index e9398f1d17c58..0a5e8d388fe00 100644
--- a/src/plugins/expressions/common/executor/executor.ts
+++ b/src/plugins/expressions/common/executor/executor.ts
@@ -11,6 +11,13 @@
 import { cloneDeep, mapValues } from 'lodash';
 import { Observable } from 'rxjs';
 import type { SerializableRecord } from '@kbn/utility-types';
+import { SavedObjectReference } from '@kbn/core/types';
+import {
+  MigrateFunctionsObject,
+  migrateToLatest,
+  PersistableStateService,
+  VersionedState,
+} from '@kbn/kibana-utils-plugin/common';
 import { ExecutorState, ExecutorContainer } from './container';
 import { createExecutorContainer } from './container';
 import { AnyExpressionFunctionDefinition, ExpressionFunction } from '../expression_functions';
@@ -21,13 +28,6 @@ import { AnyExpressionTypeDefinition } from '../expression_types/types';
 import { ExpressionAstExpression, ExpressionAstFunction } from '../ast';
 import { ExpressionValueError, typeSpecs } from '../expression_types/specs';
 import { ALL_NAMESPACES, getByAlias } from '../util';
-import { SavedObjectReference } from '../../../../core/types';
-import {
-  MigrateFunctionsObject,
-  migrateToLatest,
-  PersistableStateService,
-  VersionedState,
-} from '../../../kibana_utils/common';
 import { ExpressionExecutionParams } from '../service';
 
 export interface ExpressionExecOptions {
diff --git a/src/plugins/expressions/common/expression_functions/expression_function.ts b/src/plugins/expressions/common/expression_functions/expression_function.ts
index 951a5aab37961..287b126cafbd8 100644
--- a/src/plugins/expressions/common/expression_functions/expression_function.ts
+++ b/src/plugins/expressions/common/expression_functions/expression_function.ts
@@ -7,16 +7,16 @@
  */
 
 import { identity } from 'lodash';
-import { AnyExpressionFunctionDefinition } from './types';
-import { ExpressionFunctionParameter } from './expression_function_parameter';
-import { ExpressionValue } from '../expression_types/types';
-import { ExpressionAstFunction } from '../ast';
-import { SavedObjectReference } from '../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import {
   MigrateFunctionsObject,
   GetMigrationFunctionObjectFn,
   PersistableState,
-} from '../../../kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
+import { AnyExpressionFunctionDefinition } from './types';
+import { ExpressionFunctionParameter } from './expression_function_parameter';
+import { ExpressionValue } from '../expression_types/types';
+import { ExpressionAstFunction } from '../ast';
 
 export class ExpressionFunction implements PersistableState<ExpressionAstFunction['arguments']> {
   /**
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts
index 053f97ffc8fb0..62aacc3903be9 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/ui_setting.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-jest.mock('../../../../common');
+jest.mock('../../..');
 
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { getUiSettingFn } from '../ui_setting';
 import { functionWrapper } from './utils';
 
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
index b98e8285a1a84..cbe6406308251 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/var_set.test.ts
@@ -10,7 +10,7 @@ import { functionWrapper } from './utils';
 import { variableSet } from '../var_set';
 import { ExecutionContext } from '../../../execution/types';
 import { createUnitTestExecutor } from '../../../test_helpers';
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 
 describe('expression_functions', () => {
   describe('var_set', () => {
@@ -66,10 +66,9 @@ describe('expression_functions', () => {
 
       it('sets the variables', async () => {
         const vars = {};
-        const { result } = await executor
-          .run('var_set name=test1 name=test2 value=1', 2, { variables: vars })
-          .pipe(first())
-          .toPromise();
+        const { result } = await firstValueFrom(
+          executor.run('var_set name=test1 name=test2 value=1', 2, { variables: vars })
+        );
 
         expect(result).toEqual(2);
 
diff --git a/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts b/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts
index 8e352e12d49c5..c1a3c572031dc 100644
--- a/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/ui_setting.ts
@@ -7,9 +7,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '../..';
 import { UiSetting } from '../../expression_types/specs/ui_setting';
 
 interface UiSettingsClient {
diff --git a/src/plugins/expressions/common/expression_functions/types.ts b/src/plugins/expressions/common/expression_functions/types.ts
index 62107d17ab67a..14f7c14a6759d 100644
--- a/src/plugins/expressions/common/expression_functions/types.ts
+++ b/src/plugins/expressions/common/expression_functions/types.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import { ArgumentType } from './arguments';
 import { TypeToString, TypeString, UnmappedTypeStrings } from '../types/common';
 import { ExecutionContext } from '../execution/types';
@@ -21,7 +22,6 @@ import {
   ExpressionFunctionOverallMetric,
 } from './specs';
 import { ExpressionAstFunction } from '../ast';
-import { PersistableStateDefinition } from '../../../kibana_utils/common';
 
 /**
  * `ExpressionFunctionDefinition` is the interface plugins have to implement to
diff --git a/src/plugins/expressions/common/expression_types/specs/datatable.ts b/src/plugins/expressions/common/expression_types/specs/datatable.ts
index 2a4820508210d..0e1e76acddca4 100644
--- a/src/plugins/expressions/common/expression_types/specs/datatable.ts
+++ b/src/plugins/expressions/common/expression_types/specs/datatable.ts
@@ -8,7 +8,7 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import { map, pick, zipObject } from 'lodash';
-import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 
 import { ExpressionTypeDefinition, ExpressionValueBoxed } from '../types';
 import { PointSeries, PointSeriesColumn } from './pointseries';
diff --git a/src/plugins/expressions/common/service/expressions_services.test.ts b/src/plugins/expressions/common/service/expressions_services.test.ts
index 8e83cd8e55651..882e66e1471c8 100644
--- a/src/plugins/expressions/common/service/expressions_services.test.ts
+++ b/src/plugins/expressions/common/service/expressions_services.test.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { lastValueFrom } from 'rxjs';
 import { ExpressionsService } from './expressions_services';
 import { ExpressionsServiceFork } from './expressions_fork';
 
@@ -131,7 +132,7 @@ describe('ExpressionsService', () => {
         },
       });
 
-      const { result } = await forkStart.run('__test__', null).toPromise();
+      const { result } = await lastValueFrom(forkStart.run('__test__', null));
 
       expect(result).toBe('123');
     });
diff --git a/src/plugins/expressions/common/service/expressions_services.ts b/src/plugins/expressions/common/service/expressions_services.ts
index f15bb49e4ecf9..d873a1957cd1f 100644
--- a/src/plugins/expressions/common/service/expressions_services.ts
+++ b/src/plugins/expressions/common/service/expressions_services.ts
@@ -9,22 +9,22 @@
 import { Observable } from 'rxjs';
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'src/core/server';
-import type { KibanaExecutionContext } from 'src/core/public';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 
+import { SavedObjectReference } from '@kbn/core/types';
+import {
+  MigrateFunctionsObject,
+  PersistableStateService,
+  VersionedState,
+} from '@kbn/kibana-utils-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { Executor } from '../executor';
 import { AnyExpressionRenderDefinition, ExpressionRendererRegistry } from '../expression_renderers';
 import { ExpressionAstExpression } from '../ast';
 import { ExecutionContract, ExecutionResult } from '../execution';
 import { AnyExpressionTypeDefinition, ExpressionValueError } from '../expression_types';
 import { AnyExpressionFunctionDefinition } from '../expression_functions';
-import { SavedObjectReference } from '../../../../core/types';
-import {
-  MigrateFunctionsObject,
-  PersistableStateService,
-  VersionedState,
-} from '../../../kibana_utils/common';
-import { Adapters } from '../../../inspector/common/adapters';
 import {
   clog,
   createTable,
diff --git a/src/plugins/expressions/common/util/create_default_inspector_adapters.ts b/src/plugins/expressions/common/util/create_default_inspector_adapters.ts
index 693a9d6e8cf70..505360483c21f 100644
--- a/src/plugins/expressions/common/util/create_default_inspector_adapters.ts
+++ b/src/plugins/expressions/common/util/create_default_inspector_adapters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { RequestAdapter } from '../../../inspector/common';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { TablesAdapter } from './tables_adapter';
 import { ExpressionsInspectorAdapter } from './expressions_inspector_adapter';
 
diff --git a/src/plugins/expressions/common/util/create_error.ts b/src/plugins/expressions/common/util/create_error.ts
index aa4e44730add6..4d787a391df37 100644
--- a/src/plugins/expressions/common/util/create_error.ts
+++ b/src/plugins/expressions/common/util/create_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionValueError } from '../../common';
+import { ExpressionValueError } from '..';
 
 export type SerializedError = {
   name: string;
diff --git a/src/plugins/expressions/public/expression_functions/ui_setting.ts b/src/plugins/expressions/public/expression_functions/ui_setting.ts
index dd5be4ad736b2..6b16952279c69 100644
--- a/src/plugins/expressions/public/expression_functions/ui_setting.ts
+++ b/src/plugins/expressions/public/expression_functions/ui_setting.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { getUiSettingFn as getCommonUiSettingFn } from '../../common';
 
 export function getUiSettingFn({ getStartServices }: Pick<CoreSetup, 'getStartServices'>) {
diff --git a/src/plugins/expressions/public/index.ts b/src/plugins/expressions/public/index.ts
index a0ef158dfb621..054f80ca8a78e 100644
--- a/src/plugins/expressions/public/index.ts
+++ b/src/plugins/expressions/public/index.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ExpressionsPublicPlugin } from './plugin';
 
 // Kibana Platform.
diff --git a/src/plugins/expressions/public/loader.test.ts b/src/plugins/expressions/public/loader.test.ts
index 61a6ee3bda912..06cb30a74fe97 100644
--- a/src/plugins/expressions/public/loader.test.ts
+++ b/src/plugins/expressions/public/loader.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from 'rxjs';
+import { firstValueFrom, of } from 'rxjs';
 import { first, skip, toArray } from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
 import { loader, ExpressionLoader } from './loader';
@@ -125,7 +125,7 @@ describe('ExpressionLoader', () => {
 
   it('emits on $data when data is available', async () => {
     const expressionLoader = new ExpressionLoader(element, 'var foo', { variables: { foo: 123 } });
-    const { result } = await expressionLoader.data$.pipe(first()).toPromise();
+    const { result } = await firstValueFrom(expressionLoader.data$);
     expect(result).toBe(123);
   });
 
@@ -133,7 +133,7 @@ describe('ExpressionLoader', () => {
     const expressionLoader = new ExpressionLoader(element, 'var foo', {
       variables: { foo: of(1, 2) },
     });
-    const { result, partial } = await expressionLoader.data$.pipe(first()).toPromise();
+    const { result, partial } = await firstValueFrom(expressionLoader.data$);
 
     expect(partial).toBe(false);
     expect(result).toBe(2);
@@ -145,7 +145,7 @@ describe('ExpressionLoader', () => {
       partial: true,
       throttle: 0,
     });
-    const { result, partial } = await expressionLoader.data$.pipe(first()).toPromise();
+    const { result, partial } = await firstValueFrom(expressionLoader.data$);
 
     expect(partial).toBe(true);
     expect(result).toBe(1);
@@ -159,7 +159,7 @@ describe('ExpressionLoader', () => {
         throttle: 20,
       });
 
-      expectObservable(expressionLoader.data$).toBe('a 19ms c 2ms d', {
+      expectObservable(expressionLoader.data$).toBe('a 19ms c 19ms d', {
         a: expect.objectContaining({ result: 1 }),
         c: expect.objectContaining({ result: 3 }),
         d: expect.objectContaining({ result: 4 }),
diff --git a/src/plugins/expressions/public/loader.ts b/src/plugins/expressions/public/loader.ts
index f0571d82f427e..6482da0af21ee 100644
--- a/src/plugins/expressions/public/loader.ts
+++ b/src/plugins/expressions/public/loader.ts
@@ -10,7 +10,7 @@ import { BehaviorSubject, Observable, Subject, Subscription, asyncScheduler, ide
 import { filter, map, delay, shareReplay, throttleTime } from 'rxjs/operators';
 import { defaults } from 'lodash';
 import { SerializableRecord, UnwrapObservable } from '@kbn/utility-types';
-import { Adapters } from '../../inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { IExpressionLoaderParams } from './types';
 import { ExpressionAstExpression } from '../common';
 import { ExecutionContract } from '../common/execution/execution_contract';
diff --git a/src/plugins/expressions/public/mocks.tsx b/src/plugins/expressions/public/mocks.tsx
index bf5daab911efe..38d6a4752ab9b 100644
--- a/src/plugins/expressions/public/mocks.tsx
+++ b/src/plugins/expressions/public/mocks.tsx
@@ -7,10 +7,9 @@
  */
 
 import React from 'react';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ExpressionsSetup, ExpressionsStart, plugin as pluginInitializer } from '.';
 
-import { coreMock } from '../../../core/public/mocks';
-
 export type Setup = jest.Mocked<ExpressionsSetup>;
 export type Start = jest.Mocked<ExpressionsStart>;
 
diff --git a/src/plugins/expressions/public/plugin.ts b/src/plugins/expressions/public/plugin.ts
index 4991d6bcc4f40..338783c0a5ba4 100644
--- a/src/plugins/expressions/public/plugin.ts
+++ b/src/plugins/expressions/public/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { pick } from 'lodash';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { SerializableRecord } from '@kbn/utility-types';
 import type { ExpressionsServiceSetup, ExpressionsServiceStart } from '../common';
 import {
diff --git a/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx b/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
index d7e08b0f7fc93..a23ac9d90df4c 100644
--- a/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
+++ b/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
@@ -32,7 +32,7 @@ describe('ExpressionRenderer', () => {
     const data$ = dataSubject.asObservable().pipe(share());
     const renderSubject = new Subject();
     const render$ = renderSubject.asObservable().pipe(share());
-    const loadingSubject = new Subject();
+    const loadingSubject = new Subject<void>();
     const loading$ = loadingSubject.asObservable().pipe(share());
 
     (ExpressionLoader as jest.Mock).mockImplementation(() => {
@@ -78,7 +78,7 @@ describe('ExpressionRenderer', () => {
   });
 
   it('updates the expression loader when refresh subject emits', () => {
-    const refreshSubject = new Subject();
+    const refreshSubject = new Subject<void>();
     const loaderUpdate = jest.fn();
 
     (ExpressionLoader as jest.Mock).mockImplementation(() => {
@@ -207,7 +207,7 @@ describe('ExpressionRenderer', () => {
     const data$ = dataSubject.asObservable().pipe(share());
     const renderSubject = new Subject();
     const render$ = renderSubject.asObservable().pipe(share());
-    const loadingSubject = new Subject();
+    const loadingSubject = new Subject<void>();
     const loading$ = loadingSubject.asObservable().pipe(share());
 
     let onRenderError: RenderErrorHandlerFnType;
diff --git a/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts b/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts
index 581fb4b182b41..3ed68338dc4e4 100644
--- a/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts
+++ b/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.test.ts
@@ -205,7 +205,7 @@ describe('useExpressionRenderer', () => {
   });
 
   it('should update on reload', () => {
-    const reload$ = new Subject();
+    const reload$ = new Subject<void>();
     hook.rerender({ reload$, expression: 'something' });
 
     expect(expressionLoader.update).not.toHaveBeenCalled();
diff --git a/src/plugins/expressions/public/services/expressions_services.ts b/src/plugins/expressions/public/services/expressions_services.ts
index 388af81629c31..64f0097868232 100644
--- a/src/plugins/expressions/public/services/expressions_services.ts
+++ b/src/plugins/expressions/public/services/expressions_services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { ExpressionsService as CommonExpressionsService } from '../../common';
 import { getUiSettingFn } from '../expression_functions';
 
diff --git a/src/plugins/expressions/public/services/index.ts b/src/plugins/expressions/public/services/index.ts
index 198ff129bcce3..29a528f196ce5 100644
--- a/src/plugins/expressions/public/services/index.ts
+++ b/src/plugins/expressions/public/services/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NotificationsStart } from 'kibana/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
+import { NotificationsStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { ExpressionsService, ExpressionRendererRegistry } from '../../common';
 
 export const [getNotifications, setNotifications] =
diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts
index 35bda400756d0..322c2895f9bb5 100644
--- a/src/plugins/expressions/public/types/index.ts
+++ b/src/plugins/expressions/public/types/index.ts
@@ -7,8 +7,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaExecutionContext } from 'src/core/public';
-import { Adapters } from '../../../inspector/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import {
   IInterpreterRenderHandlers,
   ExpressionValue,
diff --git a/src/plugins/expressions/server/expression_functions/ui_setting.ts b/src/plugins/expressions/server/expression_functions/ui_setting.ts
index 0d3d5b1c1f997..a490b003ce90b 100644
--- a/src/plugins/expressions/server/expression_functions/ui_setting.ts
+++ b/src/plugins/expressions/server/expression_functions/ui_setting.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { getUiSettingFn as getCommonUiSettingFn } from '../../common';
 
 export function getUiSettingFn({ getStartServices }: Pick<CoreSetup, 'getStartServices'>) {
diff --git a/src/plugins/expressions/server/index.ts b/src/plugins/expressions/server/index.ts
index 4baac3dd5285b..facb1b80fb759 100644
--- a/src/plugins/expressions/server/index.ts
+++ b/src/plugins/expressions/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ExpressionsServerPlugin } from './plugin';
 
 export type { ExpressionsServerSetup, ExpressionsServerStart } from './plugin';
diff --git a/src/plugins/expressions/server/mocks.ts b/src/plugins/expressions/server/mocks.ts
index cb6392e04fc9e..df5232ab5faf5 100644
--- a/src/plugins/expressions/server/mocks.ts
+++ b/src/plugins/expressions/server/mocks.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/server/mocks';
 import { ExpressionsServerSetup, ExpressionsServerStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/server/mocks';
 
 export type Setup = jest.Mocked<ExpressionsServerSetup>;
 export type Start = jest.Mocked<ExpressionsServerStart>;
diff --git a/src/plugins/expressions/server/plugin.ts b/src/plugins/expressions/server/plugin.ts
index ccdcd81036f95..750d61ec5eb03 100644
--- a/src/plugins/expressions/server/plugin.ts
+++ b/src/plugins/expressions/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { pick } from 'lodash';
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { ExpressionsService, ExpressionsServiceSetup, ExpressionsServiceStart } from '../common';
 
 export type ExpressionsServerSetup = ExpressionsServiceSetup;
diff --git a/src/plugins/expressions/server/services/expressions_services.ts b/src/plugins/expressions/server/services/expressions_services.ts
index 914745436f151..ce07e1922dd4b 100644
--- a/src/plugins/expressions/server/services/expressions_services.ts
+++ b/src/plugins/expressions/server/services/expressions_services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { ExpressionsService as CommonExpressionsService } from '../../common';
 import { getUiSettingFn } from '../expression_functions';
 
diff --git a/src/plugins/field_formats/common/converters/date_nanos_shared.ts b/src/plugins/field_formats/common/converters/date_nanos_shared.ts
index daffc289a7c7b..47a3c9830a5f1 100644
--- a/src/plugins/field_formats/common/converters/date_nanos_shared.ts
+++ b/src/plugins/field_formats/common/converters/date_nanos_shared.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { memoize, noop } from 'lodash';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import moment, { Moment } from 'moment';
-import { FieldFormat, FIELD_FORMAT_IDS } from '../';
+import { FieldFormat, FIELD_FORMAT_IDS } from '..';
 import { TextContextTypeConvert } from '../types';
 
 interface FractPatternObject {
diff --git a/src/plugins/field_formats/common/field_formats_registry.ts b/src/plugins/field_formats/common/field_formats_registry.ts
index 19af3a1f976ab..7235511718297 100644
--- a/src/plugins/field_formats/common/field_formats_registry.ts
+++ b/src/plugins/field_formats/common/field_formats_registry.ts
@@ -23,7 +23,7 @@ import {
 } from './types';
 import { baseFormatters } from './constants/base_formatters';
 import { FieldFormat } from './field_format';
-import { FORMATS_UI_SETTINGS } from '../common/constants/ui_settings';
+import { FORMATS_UI_SETTINGS } from './constants/ui_settings';
 import { FieldFormatNotFoundError } from './errors';
 
 export class FieldFormatsRegistry {
diff --git a/src/plugins/field_formats/public/mocks.ts b/src/plugins/field_formats/public/mocks.ts
index cf7cc5732c6a6..759c91d8e6ad3 100644
--- a/src/plugins/field_formats/public/mocks.ts
+++ b/src/plugins/field_formats/public/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { baseFormattersPublic } from './lib/constants';
 import { FieldFormatsRegistry, FORMATS_UI_SETTINGS } from '../common';
 import type { FieldFormatsSetup, FieldFormatsStart } from '.';
diff --git a/src/plugins/field_formats/public/plugin.test.ts b/src/plugins/field_formats/public/plugin.test.ts
index 808413667918d..063769ba8ff0e 100644
--- a/src/plugins/field_formats/public/plugin.test.ts
+++ b/src/plugins/field_formats/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DateFormat } from './lib/converters/date';
 import { FieldFormatsPlugin } from './plugin';
 
diff --git a/src/plugins/field_formats/public/plugin.ts b/src/plugins/field_formats/public/plugin.ts
index 0e90aa9b48c8e..6b33b056ec180 100755
--- a/src/plugins/field_formats/public/plugin.ts
+++ b/src/plugins/field_formats/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from '../../../core/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 import { FieldFormatsRegistry, FORMATS_UI_SETTINGS } from '../common';
 import { baseFormattersPublic } from './lib';
 import { FormatFactory } from '../common/types';
diff --git a/src/plugins/field_formats/server/index.ts b/src/plugins/field_formats/server/index.ts
index d3cac3bfb00c2..bcc94c38dd0d8 100755
--- a/src/plugins/field_formats/server/index.ts
+++ b/src/plugins/field_formats/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FieldFormatsPlugin } from './plugin';
 export { DateFormat, DateNanosFormat } from './lib/converters';
 
diff --git a/src/plugins/field_formats/server/plugin.test.ts b/src/plugins/field_formats/server/plugin.test.ts
index da598c69d027c..1bbbd82fa8321 100644
--- a/src/plugins/field_formats/server/plugin.test.ts
+++ b/src/plugins/field_formats/server/plugin.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { DateFormat } from './lib/converters/date_server';
-import { coreMock, httpServerMock } from '../../../core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import { FieldFormatsPlugin } from './plugin';
 
 describe('FieldFormats registry server plugin', () => {
diff --git a/src/plugins/field_formats/server/plugin.ts b/src/plugins/field_formats/server/plugin.ts
index e2c64807433a9..55abfe68eddb7 100755
--- a/src/plugins/field_formats/server/plugin.ts
+++ b/src/plugins/field_formats/server/plugin.ts
@@ -13,7 +13,7 @@ import {
   CoreStart,
   Plugin,
   IUiSettingsClient,
-} from '../../../core/server';
+} from '@kbn/core/server';
 import { FieldFormatsStart, FieldFormatsSetup } from './types';
 import { DateFormat, DateNanosFormat } from './lib/converters';
 import { baseFormatters, FieldFormatInstanceType, FieldFormatsRegistry } from '../common';
diff --git a/src/plugins/field_formats/server/types.ts b/src/plugins/field_formats/server/types.ts
index eaf9c9ffdc390..a241aa6493556 100755
--- a/src/plugins/field_formats/server/types.ts
+++ b/src/plugins/field_formats/server/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { IUiSettingsClient } from '@kbn/core/server';
 import { FieldFormatInstanceType, FieldFormatsRegistry } from '../common';
-import { IUiSettingsClient } from '../../../core/server';
 
 export interface FieldFormatsSetup {
   /**
diff --git a/src/plugins/field_formats/server/ui_settings.ts b/src/plugins/field_formats/server/ui_settings.ts
index 0fe2ed58818dd..4d38bbc72fbe2 100644
--- a/src/plugins/field_formats/server/ui_settings.ts
+++ b/src/plugins/field_formats/server/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 // @ts-ignore untyped module
 import numeralLanguages from '@elastic/numeral/languages';
 import { FORMATS_UI_SETTINGS } from '../common';
diff --git a/src/plugins/home/public/application/application.tsx b/src/plugins/home/public/application/application.tsx
index b5a340fafacc0..36cc7a7c1b785 100644
--- a/src/plugins/home/public/application/application.tsx
+++ b/src/plugins/home/public/application/application.tsx
@@ -9,13 +9,13 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
-import { ScopedHistory, CoreStart, CoreTheme } from 'kibana/public';
+import { ScopedHistory, CoreStart, CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 // @ts-ignore
 import { HomeApp } from './components/home_app';
 import { getServices } from './kibana_services';
diff --git a/src/plugins/home/public/application/components/add_data/add_data.test.tsx b/src/plugins/home/public/application/components/add_data/add_data.test.tsx
index 009b72791263b..92a43fc081172 100644
--- a/src/plugins/home/public/application/components/add_data/add_data.test.tsx
+++ b/src/plugins/home/public/application/components/add_data/add_data.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { AddData } from './add_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 jest.mock('../app_navigation_handler', () => {
   return {
diff --git a/src/plugins/home/public/application/components/add_data/add_data.tsx b/src/plugins/home/public/application/components/add_data/add_data.tsx
index 090443c4a6f85..8946e3e80a217 100644
--- a/src/plugins/home/public/application/components/add_data/add_data.tsx
+++ b/src/plugins/home/public/application/components/add_data/add_data.tsx
@@ -20,10 +20,10 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { createAppNavigationHandler } from '../app_navigation_handler';
 import { getServices } from '../../kibana_services';
-import { RedirectAppLinks } from '../../../../../kibana_react/public';
 
 interface Props {
   addBasePath: (path: string) => string;
diff --git a/src/plugins/home/public/application/components/home.test.tsx b/src/plugins/home/public/application/components/home.test.tsx
index f27a286488c2b..578afe8de6b86 100644
--- a/src/plugins/home/public/application/components/home.test.tsx
+++ b/src/plugins/home/public/application/components/home.test.tsx
@@ -8,10 +8,9 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
+
 import type { HomeProps } from './home';
 import { Home } from './home';
-
-import { FeatureCatalogueCategory } from '../../services';
 import { Welcome } from './welcome';
 
 let mockHasIntegrationsPermission = true;
@@ -33,7 +32,7 @@ jest.mock('../kibana_services', () => ({
   }),
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   overviewPageActions: jest.fn().mockReturnValue([]),
   OverviewPageFooter: jest.fn().mockReturnValue(<></>),
   KibanaPageTemplate: jest.fn().mockReturnValue(<></>),
@@ -132,7 +131,7 @@ describe('home', () => {
         icon: 'indexPatternApp',
         path: 'index_management_landing_page',
         showOnHomePage: true,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin' as const,
       };
 
       const component = await renderHome({
@@ -150,7 +149,7 @@ describe('home', () => {
         icon: 'managementApp',
         path: 'management_landing_page',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin' as const,
       };
 
       const component = await renderHome({
@@ -172,7 +171,7 @@ describe('home', () => {
             path: 'path-to-advanced_settings',
             showOnHomePage: false,
             title: 'Advanced settings',
-            category: FeatureCatalogueCategory.ADMIN,
+            category: 'admin',
           },
         ],
       });
diff --git a/src/plugins/home/public/application/components/home.tsx b/src/plugins/home/public/application/components/home.tsx
index 1fb0b3c790ab7..a18fd9b7547ab 100644
--- a/src/plugins/home/public/application/components/home.tsx
+++ b/src/plugins/home/public/application/components/home.tsx
@@ -10,10 +10,13 @@ import React, { Component } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
-import { KibanaPageTemplate, OverviewPageFooter } from '../../../../kibana_react/public';
+import { KibanaPageTemplate, OverviewPageFooter } from '@kbn/kibana-react-plugin/public';
 import { HOME_APP_BASE_PATH } from '../../../common/constants';
-import type { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../services';
-import { FeatureCatalogueCategory } from '../../services';
+import type {
+  FeatureCatalogueEntry,
+  FeatureCatalogueSolution,
+  FeatureCatalogueCategory,
+} from '../../services';
 import { getServices } from '../kibana_services';
 import { AddData } from './add_data';
 import { ManageData } from './manage_data';
@@ -126,7 +129,7 @@ export class Home extends Component<HomeProps, State> {
     const { application, trackUiMetric } = getServices();
     const isDarkMode = getServices().uiSettings?.get('theme:darkMode') || false;
     const devTools = this.findDirectoryById('console');
-    const manageDataFeatures = this.getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
+    const manageDataFeatures = this.getFeaturesByCategory('admin');
 
     // Show card for console if none of the manage data plugins are available, most likely in OSS
     if (manageDataFeatures.length < 1 && devTools) {
diff --git a/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx b/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
index f602ee5aa4439..e6baad44bf816 100644
--- a/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
+++ b/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { ManageData } from './manage_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { ApplicationStart } from 'kibana/public';
-import { FeatureCatalogueEntry, FeatureCatalogueCategory } from '../../../services';
+import { ApplicationStart } from '@kbn/core/public';
+import { FeatureCatalogueEntry } from '../../../services';
 
 jest.mock('../app_navigation_handler', () => {
   return {
@@ -41,7 +41,7 @@ const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
 
 const mockFeatures: FeatureCatalogueEntry[] = [
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description: 'Control who has access and what tasks they can perform.',
     icon: 'securityApp',
     id: 'security',
@@ -51,7 +51,7 @@ const mockFeatures: FeatureCatalogueEntry[] = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description: 'Track the real-time health and performance of your deployment.',
     icon: 'monitoringApp',
     id: 'monitoring',
@@ -61,7 +61,7 @@ const mockFeatures: FeatureCatalogueEntry[] = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description:
       'Save snapshots to a backup repository, and restore to recover index and cluster state.',
     icon: 'storage',
@@ -72,7 +72,7 @@ const mockFeatures: FeatureCatalogueEntry[] = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
     description: 'Define lifecycle policies to automatically perform operations as an index ages.',
     icon: 'indexSettings',
     id: 'index_lifecycle_management',
diff --git a/src/plugins/home/public/application/components/manage_data/manage_data.tsx b/src/plugins/home/public/application/components/manage_data/manage_data.tsx
index 15f5dadb43493..092d9b2e7a504 100644
--- a/src/plugins/home/public/application/components/manage_data/manage_data.tsx
+++ b/src/plugins/home/public/application/components/manage_data/manage_data.tsx
@@ -17,13 +17,13 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { FeatureCatalogueEntry } from '../../../services';
 import { createAppNavigationHandler } from '../app_navigation_handler';
 // @ts-expect-error untyped component
 import { Synopsis } from '../synopsis';
 import { getServices } from '../../kibana_services';
-import { RedirectAppLinks } from '../../../../../kibana_react/public';
 
 interface Props {
   addBasePath: (path: string) => string;
diff --git a/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx b/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
index d53151c32a5ab..a6c7a1c0f8f4e 100644
--- a/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
+++ b/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
@@ -10,8 +10,8 @@ import { snakeCase } from 'lodash';
 import React, { FC, MouseEvent } from 'react';
 import { EuiCard, EuiFlexItem } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { KibanaPageTemplateSolutionNavAvatar } from '../../../../../kibana_react/public';
-import { FeatureCatalogueSolution } from '../../../';
+import { KibanaPageTemplateSolutionNavAvatar } from '@kbn/kibana-react-plugin/public';
+import { FeatureCatalogueSolution } from '../../..';
 import { createAppNavigationHandler } from '../app_navigation_handler';
 import { getServices } from '../../kibana_services';
 
diff --git a/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx b/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
index 11813bf86538f..41978b97cd5a3 100644
--- a/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
+++ b/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
@@ -10,7 +10,7 @@ import React, { FC } from 'react';
 import { EuiFlexGroup, EuiHorizontalRule, EuiScreenReaderOnly } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { SolutionPanel } from './solution_panel';
-import { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../../';
+import { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../..';
 
 const sortByOrder = (
   { order: orderA = 0 }: FeatureCatalogueSolution | FeatureCatalogueEntry,
diff --git a/src/plugins/home/public/application/components/tutorial/introduction.test.js b/src/plugins/home/public/application/components/tutorial/introduction.test.js
index c599c8748e925..6f7b6b31289ed 100644
--- a/src/plugins/home/public/application/components/tutorial/introduction.test.js
+++ b/src/plugins/home/public/application/components/tutorial/introduction.test.js
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 
 import { Introduction } from './introduction';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { TutorialsCategory } from '../../../../common/constants';
 
 const basePathMock = httpServiceMock.createBasePath();
diff --git a/src/plugins/home/public/application/components/tutorial/tutorial.js b/src/plugins/home/public/application/components/tutorial/tutorial.js
index 00cbf013856da..de222dbe6155d 100644
--- a/src/plugins/home/public/application/components/tutorial/tutorial.js
+++ b/src/plugins/home/public/application/components/tutorial/tutorial.js
@@ -18,7 +18,7 @@ import * as StatusCheckStates from './status_check_states';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { getServices } from '../../kibana_services';
-import { KibanaPageTemplate } from '../../../../../kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 const INSTRUCTIONS_TYPE = {
   ELASTIC_CLOUD: 'elasticCloud',
diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js
index 3ecbb73e849fc..e4868796c288d 100644
--- a/src/plugins/home/public/application/components/tutorial_directory.js
+++ b/src/plugins/home/public/application/components/tutorial_directory.js
@@ -15,7 +15,7 @@ import { i18n } from '@kbn/i18n';
 import { Synopsis } from './synopsis';
 import { SampleDataSetCards } from './sample_data_set_cards';
 import { getServices } from '../kibana_services';
-import { KibanaPageTemplate } from '../../../../kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { getTutorials } from '../load_tutorials';
 
 const SAMPLE_DATA_TAB_ID = 'sampleData';
diff --git a/src/plugins/home/public/application/kibana_services.ts b/src/plugins/home/public/application/kibana_services.ts
index 3ccfd9413a88a..af4591c8e7368 100644
--- a/src/plugins/home/public/application/kibana_services.ts
+++ b/src/plugins/home/public/application/kibana_services.ts
@@ -15,16 +15,16 @@ import {
   SavedObjectsClientContract,
   IUiSettingsClient,
   ApplicationStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UrlForwardingStart } from '../../../url_forwarding/public';
-import { DataViewsContract } from '../../../data_views/public';
+import { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 import { TutorialService } from '../services/tutorials';
 import { AddDataService } from '../services/add_data';
 import { FeatureCatalogueRegistry } from '../services/feature_catalogue';
 import { EnvironmentService } from '../services/environment';
 import { ConfigSchema } from '../../config';
-import { SharePluginSetup } from '../../../share/public';
 import type { WelcomeService } from '../services/welcome';
 
 export interface HomeKibanaServices {
diff --git a/src/plugins/home/public/index.ts b/src/plugins/home/public/index.ts
index 3450f4f9d2caf..17e5d1f599eca 100644
--- a/src/plugins/home/public/index.ts
+++ b/src/plugins/home/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 export type {
   FeatureCatalogueSetup,
@@ -16,10 +16,9 @@ export type {
   HomePublicPluginStart,
 } from './plugin';
 
-export { FeatureCatalogueCategory } from './services';
-
 export type {
   AddDataTab,
+  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueRegistry,
   FeatureCatalogueSolution,
diff --git a/src/plugins/home/public/plugin.test.ts b/src/plugins/home/public/plugin.test.ts
index 57a1f5ec112aa..12243944ef0f0 100644
--- a/src/plugins/home/public/plugin.test.ts
+++ b/src/plugins/home/public/plugin.test.ts
@@ -8,9 +8,9 @@
 
 import { registryMock, environmentMock, tutorialMock } from './plugin.test.mocks';
 import { HomePublicPlugin } from './plugin';
-import { coreMock } from '../../../core/public/mocks';
-import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
-import { SharePluginSetup } from '../../share/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { urlForwardingPluginMock } from '@kbn/url-forwarding-plugin/public/mocks';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 
 const mockInitializerContext = coreMock.createPluginInitializerContext();
 const mockShare = {} as SharePluginSetup;
diff --git a/src/plugins/home/public/plugin.ts b/src/plugins/home/public/plugin.ts
index 9179635d2cc0c..641d43a68ab13 100644
--- a/src/plugins/home/public/plugin.ts
+++ b/src/plugins/home/public/plugin.ts
@@ -12,13 +12,20 @@ import {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { PLUGIN_ID, HOME_APP_BASE_PATH } from '../common/constants';
+import { setServices } from './application/kibana_services';
+import { ConfigSchema } from '../config';
 import {
   EnvironmentService,
   EnvironmentServiceSetup,
-  FeatureCatalogueCategory,
   FeatureCatalogueRegistry,
   FeatureCatalogueRegistrySetup,
   TutorialService,
@@ -28,14 +35,6 @@ import {
   WelcomeService,
   WelcomeServiceSetup,
 } from './services';
-import { ConfigSchema } from '../config';
-import { setServices } from './application/kibana_services';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { UsageCollectionSetup } from '../../usage_collection/public';
-import { UrlForwardingSetup, UrlForwardingStart } from '../../url_forwarding/public';
-import { AppNavLinkStatus } from '../../../core/public';
-import { PLUGIN_ID, HOME_APP_BASE_PATH } from '../common/constants';
-import { SharePluginSetup } from '../../share/public';
 
 export interface HomePluginStartDependencies {
   dataViews: DataViewsPublicPluginStart;
@@ -124,7 +123,7 @@ export class HomePublicPlugin
       icon: 'indexOpen',
       showOnHomePage: true,
       path: `${HOME_APP_BASE_PATH}#/tutorial_directory`,
-      category: 'data' as FeatureCatalogueCategory.DATA,
+      category: 'data',
       order: 500,
     });
 
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
index 4198ceb54b26a..759ff5e3d0d23 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
@@ -8,7 +8,6 @@
 
 import {
   FeatureCatalogueRegistry,
-  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
 } from './feature_catalogue_registry';
@@ -20,7 +19,7 @@ const DASHBOARD_FEATURE: FeatureCatalogueEntry = {
   icon: 'dashboardApp',
   path: `/app/kibana#dashboard`,
   showOnHomePage: true,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data',
 };
 
 const KIBANA_SOLUTION: FeatureCatalogueSolution = {
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
index 0b38d8359890d..2bc84b44f5540 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
@@ -6,15 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { IconType } from '@elastic/eui';
 
 /** @public */
-export enum FeatureCatalogueCategory {
-  ADMIN = 'admin',
-  DATA = 'data',
-  OTHER = 'other',
-}
+export type FeatureCatalogueCategory = 'admin' | 'data' | 'other';
 
 /** @public */
 export interface FeatureCatalogueEntry {
diff --git a/src/plugins/home/public/services/feature_catalogue/index.ts b/src/plugins/home/public/services/feature_catalogue/index.ts
index c89f26c8f8949..d344298ed3797 100644
--- a/src/plugins/home/public/services/feature_catalogue/index.ts
+++ b/src/plugins/home/public/services/feature_catalogue/index.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-export { FeatureCatalogueCategory, FeatureCatalogueRegistry } from './feature_catalogue_registry';
+export { FeatureCatalogueRegistry } from './feature_catalogue_registry';
 
 export type {
+  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
   FeatureCatalogueRegistrySetup,
diff --git a/src/plugins/home/public/services/index.ts b/src/plugins/home/public/services/index.ts
index 41bc9ee258ceb..9bb73fa281c6c 100644
--- a/src/plugins/home/public/services/index.ts
+++ b/src/plugins/home/public/services/index.ts
@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-export { FeatureCatalogueCategory, FeatureCatalogueRegistry } from './feature_catalogue';
+export { FeatureCatalogueRegistry } from './feature_catalogue';
 
 export type {
+  FeatureCatalogueCategory,
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
   FeatureCatalogueRegistrySetup,
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
index feffc2f2e003c..d93f864fb7af4 100644
--- a/src/plugins/home/server/index.ts
+++ b/src/plugins/home/server/index.ts
@@ -22,7 +22,7 @@ export type {
   SampleObject,
   ScopedTutorialContextFactory,
 } from './services';
-import { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { HomeServerPlugin } from './plugin';
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/home/server/plugin.test.ts b/src/plugins/home/server/plugin.test.ts
index 5af0c4a578eeb..449740897d9ac 100644
--- a/src/plugins/home/server/plugin.test.ts
+++ b/src/plugins/home/server/plugin.test.ts
@@ -8,8 +8,8 @@
 
 import { registryForTutorialsMock, registryForSampleDataMock } from './plugin.test.mocks';
 import { HomeServerPlugin, HomeServerPluginSetupDependencies } from './plugin';
-import { coreMock, httpServiceMock } from '../../../core/server/mocks';
-import { customIntegrationsMock } from '../../custom_integrations/server/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/server/mocks';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/server/mocks';
 
 describe('HomeServerPlugin', () => {
   let homeServerPluginSetupDependenciesMock: HomeServerPluginSetupDependencies;
diff --git a/src/plugins/home/server/plugin.ts b/src/plugins/home/server/plugin.ts
index 04d2d80898b50..8a4d22c144c79 100644
--- a/src/plugins/home/server/plugin.ts
+++ b/src/plugins/home/server/plugin.ts
@@ -6,7 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import {
   TutorialsRegistry,
   TutorialsRegistrySetup,
@@ -15,11 +17,9 @@ import {
   SampleDataRegistrySetup,
   SampleDataRegistryStart,
 } from './services';
-import { UsageCollectionSetup } from '../../usage_collection/server';
 import { capabilitiesProvider } from './capabilities_provider';
 import { sampleDataTelemetry } from './saved_objects';
 import { registerRoutes } from './routes';
-import { CustomIntegrationsPluginSetup } from '../../custom_integrations/server';
 
 export interface HomeServerPluginSetupDependencies {
   usageCollection?: UsageCollectionSetup;
diff --git a/src/plugins/home/server/routes/fetch_es_hits_status.ts b/src/plugins/home/server/routes/fetch_es_hits_status.ts
index b3cfef51920f1..557f93f0425e9 100644
--- a/src/plugins/home/server/routes/fetch_es_hits_status.ts
+++ b/src/plugins/home/server/routes/fetch_es_hits_status.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export const registerHitsStatusRoute = (router: IRouter) => {
   router.post(
diff --git a/src/plugins/home/server/routes/index.ts b/src/plugins/home/server/routes/index.ts
index 905304e059660..6a5ff1cf7fb5a 100644
--- a/src/plugins/home/server/routes/index.ts
+++ b/src/plugins/home/server/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { registerHitsStatusRoute } from './fetch_es_hits_status';
 
 export const registerRoutes = (router: IRouter) => {
diff --git a/src/plugins/home/server/saved_objects/sample_data_telemetry.ts b/src/plugins/home/server/saved_objects/sample_data_telemetry.ts
index d786154aaf4bd..31b7d3f9cb23b 100644
--- a/src/plugins/home/server/saved_objects/sample_data_telemetry.ts
+++ b/src/plugins/home/server/saved_objects/sample_data_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const sampleDataTelemetry: SavedObjectsType = {
   name: 'sample-data-telemetry',
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
index c2f56c1d6049d..8a520d23c0a45 100644
--- a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
+++ b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
@@ -9,7 +9,7 @@
 /* eslint max-len: 0 */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export const getSavedObjects = (): SavedObject[] => [
   {
diff --git a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
index 8552d74201fe2..279ab629352c7 100644
--- a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
+++ b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
@@ -9,7 +9,7 @@
 /* eslint max-len: 0 */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export const getSavedObjects = (): SavedObject[] => [
   {
diff --git a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
index aa2a0d077e30a..a38dd2120e8f1 100644
--- a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
+++ b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
@@ -8,7 +8,7 @@
 
 /* eslint max-len: 0 */
 import { i18n } from '@kbn/i18n';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export const getSavedObjects = (): SavedObject[] => [
   {
diff --git a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts
index 93a3e8c1d5f9c..6a4be4728a7aa 100644
--- a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts
+++ b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.test.ts
@@ -8,8 +8,8 @@
 
 import { mockBuildNode } from './find_sample_objects.test.mock';
 
-import type { SavedObject, SavedObjectsFindResponse } from 'src/core/server';
-import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { SavedObject, SavedObjectsFindResponse } from '@kbn/core/server';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { findSampleObjects } from './find_sample_objects';
 
 describe('findSampleObjects', () => {
diff --git a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts
index 904470acc2c84..a03780611e292 100644
--- a/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts
+++ b/src/plugins/home/server/services/sample_data/lib/find_sample_objects.ts
@@ -7,7 +7,7 @@
  */
 
 import * as esKuery from '@kbn/es-query';
-import type { Logger, SavedObjectsClientContract } from 'src/core/server';
+import type { Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 const MAX_OBJECTS_TO_FIND = 10000; // we only expect up to a few dozen, search for 10k to be safe; anything over this is ignored
 
diff --git a/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts b/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
index e22a552b7d7bd..47772f925dd3b 100644
--- a/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
+++ b/src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IScopedClusterClient, Logger } from 'kibana/server';
+import { IScopedClusterClient, Logger } from '@kbn/core/server';
 import type { DataIndexSchema } from './sample_dataset_registry_types';
 import {
   translateTimeRelativeToDifference,
diff --git a/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts b/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts
index d06dcacff18d9..4ba7e1ae107e9 100644
--- a/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts
+++ b/src/plugins/home/server/services/sample_data/lib/register_with_integrations.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import { CustomIntegrationsPluginSetup } from '../../../../../custom_integrations/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { HOME_APP_BASE_PATH } from '../../../../common/constants';
 import { GLOBE_ICON_PATH } from '../data_sets/logs';
 
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 21c77ec51e5ef..58604ec30ce07 100644
--- a/src/plugins/home/server/services/sample_data/routes/install.ts
+++ b/src/plugins/home/server/services/sample_data/routes/install.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, Logger } from 'src/core/server';
+import { IRouter, Logger } from '@kbn/core/server';
 import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { SampleDataUsageTracker } from '../usage/usage';
 import { getSampleDataInstaller } from './utils';
diff --git a/src/plugins/home/server/services/sample_data/routes/list.ts b/src/plugins/home/server/services/sample_data/routes/list.ts
index 6bcc40c0c93e3..8f500b1c95501 100644
--- a/src/plugins/home/server/services/sample_data/routes/list.ts
+++ b/src/plugins/home/server/services/sample_data/routes/list.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter, Logger, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, Logger, RequestHandlerContext } from '@kbn/core/server';
 import type { AppLinkData, SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { createIndexName } from '../lib/create_index_name';
 import type { FindSampleObjectsResponseObject } from '../lib/find_sample_objects';
diff --git a/src/plugins/home/server/services/sample_data/routes/uninstall.ts b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
index 52f725da4906b..e6f4b9a07514c 100644
--- a/src/plugins/home/server/services/sample_data/routes/uninstall.ts
+++ b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { IRouter, Logger } from 'src/core/server';
+import type { IRouter, Logger } from '@kbn/core/server';
 import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { SampleDataUsageTracker } from '../usage/usage';
 import { getSampleDataInstaller } from './utils';
diff --git a/src/plugins/home/server/services/sample_data/routes/utils.ts b/src/plugins/home/server/services/sample_data/routes/utils.ts
index 36b5534d9f4af..b784c50ff1182 100644
--- a/src/plugins/home/server/services/sample_data/routes/utils.ts
+++ b/src/plugins/home/server/services/sample_data/routes/utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandlerContext, Logger } from 'src/core/server';
+import type { RequestHandlerContext, Logger } from '@kbn/core/server';
 import type { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
 import { SampleDataInstaller } from '../sample_data_installer';
 import { getUniqueObjectTypes } from '../lib/utils';
diff --git a/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts b/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts
index 205b00e3df94f..d103bdb18f779 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_installer.test.ts
@@ -8,13 +8,13 @@
 
 import { Readable } from 'stream';
 import { insertDataIntoIndexMock, findSampleObjectsMock } from './sample_data_installer.test.mocks';
-import type { SavedObjectsImportFailure } from 'kibana/server';
+import type { SavedObjectsImportFailure } from '@kbn/core/server';
 import {
   savedObjectsClientMock,
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   loggingSystemMock,
-} from '../../../../../core/server/mocks';
+} from '@kbn/core/server/mocks';
 import type { SampleDatasetSchema } from './lib/sample_dataset_registry_types';
 import { SampleDataInstaller } from './sample_data_installer';
 import { SampleDataInstallError } from './errors';
diff --git a/src/plugins/home/server/services/sample_data/sample_data_installer.ts b/src/plugins/home/server/services/sample_data/sample_data_installer.ts
index 5aec4a6b2d516..048924ef3aba3 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_installer.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_installer.ts
@@ -13,7 +13,7 @@ import type {
   ISavedObjectsImporter,
   Logger,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { SampleDatasetSchema, DataIndexSchema } from './lib/sample_dataset_registry_types';
 import { dateToIso8601IgnoringTime } from './lib/translate_timestamp';
 import { createIndexName } from './lib/create_index_name';
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts
index 3d836d233d72c..30aa2d7e48d2f 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.test.ts
@@ -7,14 +7,14 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup } from '../../../../../core/server';
+import { CoreSetup } from '@kbn/core/server';
 
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
-import { customIntegrationsMock } from '../../../../custom_integrations/server/mocks';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/server/mocks';
 import { SampleDataRegistry } from './sample_data_registry';
-import { usageCollectionPluginMock } from '../../../../usage_collection/server/mocks';
-import { UsageCollectionSetup } from '../../../../usage_collection/server/plugin';
-import { coreMock } from '../../../../../core/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server/plugin';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('SampleDataRegistry', () => {
   let mockCoreSetup: MockedKeys<CoreSetup>;
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
index f8dd12746832b..4ee78da7128e6 100644
--- a/src/plugins/home/server/services/sample_data/sample_data_registry.ts
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
@@ -6,8 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { SavedObject } from 'src/core/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/server';
+import { SavedObject } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import {
   SampleDatasetProvider,
   SampleDatasetSchema,
@@ -18,10 +20,8 @@ import { sampleDataSchema } from './lib/sample_dataset_schema';
 
 import { flightsSpecProvider, logsSpecProvider, ecommerceSpecProvider } from './data_sets';
 import { createListRoute, createInstallRoute } from './routes';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
 import { makeSampleDataUsageCollector, usage } from './usage';
 import { createUninstallRoute } from './routes/uninstall';
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
 import { registerSampleDatasetWithIntegration } from './lib/register_with_integrations';
 
 export class SampleDataRegistry {
diff --git a/src/plugins/home/server/services/sample_data/usage/collector.ts b/src/plugins/home/server/services/sample_data/usage/collector.ts
index 06c0c9239942b..5f32d4c79369c 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectionSetup } from '../../../../../usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider, TelemetryResponse } from './collector_fetch';
 
 export function makeSampleDataUsageCollector(
diff --git a/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
index c37c55bf02535..54df964e4bdec 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CollectorFetchContext } from 'src/plugins/usage_collection/server';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { fetchProvider } from './collector_fetch';
 
 const getMockFetchClients = (hits?: unknown[]) => {
diff --git a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
index 3342912919a62..66e1a7099f7eb 100644
--- a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
@@ -8,8 +8,8 @@
 
 import { get } from 'lodash';
 import moment from 'moment';
-import { SearchResponse } from 'src/core/server';
-import { CollectorFetchContext } from '../../../../../usage_collection/server';
+import { SearchResponse } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 
 interface SearchHit {
   _id: string;
diff --git a/src/plugins/home/server/services/sample_data/usage/usage.ts b/src/plugins/home/server/services/sample_data/usage/usage.ts
index b491b58c426f5..58c9ebb6aec18 100644
--- a/src/plugins/home/server/services/sample_data/usage/usage.ts
+++ b/src/plugins/home/server/services/sample_data/usage/usage.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Logger, SavedObjectsServiceStart } from 'kibana/server';
+import { Logger, SavedObjectsServiceStart } from '@kbn/core/server';
 
 const SAVED_OBJECT_ID = 'sample-data-telemetry';
 
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
index e4012c1ab2ef3..f0746764f4641 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import type { TutorialSchema } from './tutorial_schema';
 export { TutorialsCategory } from '../../../../common/constants';
 
diff --git a/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts b/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
index dec1d23e05787..537e6267d0293 100644
--- a/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
+++ b/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
@@ -8,9 +8,9 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 import { TutorialsRegistry } from './tutorials_registry';
-import { coreMock } from '../../../../../core/server/mocks';
-import { CoreSetup } from '../../../../../core/server';
-import { httpServerMock } from '../../../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { CoreSetup } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   TutorialProvider,
@@ -18,8 +18,8 @@ import {
   TutorialsCategory,
   ScopedTutorialContextFactory,
 } from './lib/tutorials_registry_types';
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
-import { customIntegrationsMock } from '../../../../custom_integrations/server/mocks';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/server/mocks';
 
 const INVALID_TUTORIAL: TutorialSchema = {
   id: 'test',
diff --git a/src/plugins/home/server/services/tutorials/tutorials_registry.ts b/src/plugins/home/server/services/tutorials/tutorials_registry.ts
index 7d93a57b2073d..0ef800f63228b 100644
--- a/src/plugins/home/server/services/tutorials/tutorials_registry.ts
+++ b/src/plugins/home/server/services/tutorials/tutorials_registry.ts
@@ -6,7 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
 import {
   TutorialProvider,
   TutorialContextFactory,
@@ -15,8 +17,6 @@ import {
 } from './lib/tutorials_registry_types';
 import { TutorialSchema, tutorialSchema } from './lib/tutorial_schema';
 import { builtInTutorials } from '../../tutorials/register';
-import { CustomIntegrationsPluginSetup } from '../../../../custom_integrations/server';
-import { IntegrationCategory } from '../../../../custom_integrations/common';
 import { HOME_APP_BASE_PATH } from '../../../common/constants';
 
 function registerTutorialWithCustomIntegrations(
diff --git a/src/plugins/input_control_vis/public/components/editor/control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
index cb0ea78d613b3..794c793b39673 100644
--- a/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
@@ -19,10 +19,10 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import { RangeControlEditor } from './range_control_editor';
 import { ListControlEditor } from './list_control_editor';
 import { getTitle, ControlParams, CONTROL_TYPES, ControlParamsOptions } from '../../editor_utils';
-import { DataView } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 import './control_editor.scss';
diff --git a/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx b/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
index 2182843d30975..94284fef23cb8 100644
--- a/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
@@ -11,7 +11,7 @@ import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { getDepsMock, getIndexPatternMock } from '../../test_utils';
 import ControlsTab, { ControlsTabProps } from './controls_tab';
-import { Vis } from '../../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 const indexPatternsMock = {
   get: getIndexPatternMock,
diff --git a/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx b/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
index 0b000aa61f34e..ad32a1395f427 100644
--- a/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
@@ -19,8 +19,8 @@ import {
   EuiSelect,
 } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { DataView } from '../../../../data_views/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { ControlEditor } from './control_editor';
 import {
   addControl,
diff --git a/src/plugins/input_control_vis/public/components/editor/field_select.tsx b/src/plugins/input_control_vis/public/components/editor/field_select.tsx
index 7cc818b71d795..841622c880757 100644
--- a/src/plugins/input_control_vis/public/components/editor/field_select.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/field_select.tsx
@@ -12,7 +12,7 @@ import React, { Component } from 'react';
 import { injectI18n, FormattedMessage, InjectedIntlProps } from '@kbn/i18n-react';
 import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { DataView, DataViewField } from '../../../../data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 interface FieldSelectUiState {
   isLoading: boolean;
diff --git a/src/plugins/input_control_vis/public/components/editor/index.tsx b/src/plugins/input_control_vis/public/components/editor/index.tsx
index f34bdcf7b63ec..d6100a018bf2f 100644
--- a/src/plugins/input_control_vis/public/components/editor/index.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { InputControlVisDependencies } from '../../plugin';
 import { InputControlVisParams } from '../../types';
 
diff --git a/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
index 57fb9cdce6d86..633b34902ff97 100644
--- a/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
@@ -9,7 +9,7 @@
 import React, { ComponentType } from 'react';
 import { injectI18n, InjectedIntlProps } from '@kbn/i18n-react';
 import { EuiFormRow } from '@elastic/eui';
-import { IndexPatternSelectProps } from '../../../../unified_search/public';
+import { IndexPatternSelectProps } from '@kbn/unified-search-plugin/public';
 
 export type IndexPatternSelectFormRowUiProps = InjectedIntlProps & {
   onChange: (opt: any) => void;
diff --git a/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
index 3a8dcccce6515..5bcb7ffcf09a3 100644
--- a/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
@@ -11,11 +11,11 @@ import React, { PureComponent, ComponentType } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFormRow, EuiFieldNumber, EuiSwitch, EuiSelect } from '@elastic/eui';
 
+import { IndexPatternSelectProps } from '@kbn/unified-search-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import { IndexPatternSelectProps } from '../../../../unified_search/public';
-import { DataView, DataViewField } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface ListControlEditorState {
diff --git a/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx b/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
index 45907fc08e1c2..a1285aeac5308 100644
--- a/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { Vis } from '../../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import OptionsTab, { OptionsTabProps } from './options_tab';
 
 describe('OptionsTab', () => {
diff --git a/src/plugins/input_control_vis/public/components/editor/options_tab.tsx b/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
index 17f07730bd1b7..850c92395be80 100644
--- a/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
@@ -12,7 +12,7 @@ import { EuiForm, EuiFormRow, EuiSwitch } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSwitchEvent } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { InputControlVisParams } from '../../types';
 
 export type OptionsTabProps = VisEditorOptionsProps<InputControlVisParams>;
diff --git a/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
index 32d1f9aef5549..a77d2f1c2f261 100644
--- a/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
@@ -11,11 +11,11 @@ import React, { Component, Fragment, ComponentType } from 'react';
 import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { IndexPatternSelectProps } from '@kbn/unified-search-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import { IndexPatternSelectProps } from '../../../../unified_search/public';
-import { DataView, DataViewField } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface RangeControlEditorProps {
diff --git a/src/plugins/input_control_vis/public/components/vis/range_control.tsx b/src/plugins/input_control_vis/public/components/vis/range_control.tsx
index fd0b81df7aeea..dd003a74369df 100644
--- a/src/plugins/input_control_vis/public/components/vis/range_control.tsx
+++ b/src/plugins/input_control_vis/public/components/vis/range_control.tsx
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 import React, { PureComponent } from 'react';
-import { ValidatedDualRange } from '../../../../kibana_react/public';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { FormRow } from './form_row';
 import { RangeControl as RangeControlClass } from '../../control/range_control_factory';
 
diff --git a/src/plugins/input_control_vis/public/control/create_search_source.ts b/src/plugins/input_control_vis/public/control/create_search_source.ts
index c9db1de9f7f22..847c5ba4500d4 100644
--- a/src/plugins/input_control_vis/public/control/create_search_source.ts
+++ b/src/plugins/input_control_vis/public/control/create_search_source.ts
@@ -11,9 +11,9 @@ import {
   SerializedSearchSourceFields,
   TimefilterContract,
   DataPublicPluginStart,
-} from 'src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 
-import { DataView } from '../../../data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export async function createSearchSource(
   { create }: DataPublicPluginStart['search']['searchSource'],
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
index 7759ba3b34607..f0b1b8d4344e6 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 
 import { FilterManager } from './filter_manager';
-import { coreMock } from '../../../../../core/public/mocks';
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
 import { Filter } from '@kbn/es-query';
 
 const setupMock = coreMock.createSetup();
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
index 420cb8fe844d7..376060a68cff9 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
@@ -9,8 +9,8 @@
 import { Filter } from '@kbn/es-query';
 import _ from 'lodash';
 
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
-import { DataView } from '../../../../data_views/public';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export abstract class FilterManager {
   protected indexPattern: DataView | undefined;
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
index 45e67ad742a64..cdec8be5e218c 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
@@ -9,8 +9,8 @@
 import { Filter } from '@kbn/es-query';
 import expect from '@kbn/expect';
 
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
-import { DataView } from '../../../../data_views/public';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { PhraseFilterManager } from './phrase_filter_manager';
 
 describe('PhraseFilterManager', function () {
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
index 0653d25f16d44..60d0947212611 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
@@ -17,8 +17,8 @@ import {
   isPhraseFilter,
   PhraseFilter,
 } from '@kbn/es-query';
+import { DataViewsContract, FilterManager as QueryFilterManager } from '@kbn/data-plugin/public';
 import { FilterManager } from './filter_manager';
-import { DataViewsContract, FilterManager as QueryFilterManager } from '../../../../data/public';
 
 export class PhraseFilterManager extends FilterManager {
   constructor(
diff --git a/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
index a329773720bc9..00084be816830 100644
--- a/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 
 import { RangeFilterManager } from './range_filter_manager';
-import { FilterManager as QueryFilterManager, DataViewsContract } from '../../../../data/public';
-import { DataView } from '../../../../data_views/public';
+import { FilterManager as QueryFilterManager, DataViewsContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { RangeFilter, RangeFilterMeta } from '@kbn/es-query';
 
 describe('RangeFilterManager', function () {
diff --git a/src/plugins/input_control_vis/public/control/list_control_factory.ts b/src/plugins/input_control_vis/public/control/list_control_factory.ts
index f6bd0bc0cd28a..c44fba0b2cbb8 100644
--- a/src/plugins/input_control_vis/public/control/list_control_factory.ts
+++ b/src/plugins/input_control_vis/public/control/list_control_factory.ts
@@ -12,8 +12,8 @@ import {
   TimefilterContract,
   SerializedSearchSourceFields,
   DataPublicPluginStart,
-} from 'src/plugins/data/public';
-import { DataViewField } from '../../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
 import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
 import { createSearchSource } from './create_search_source';
diff --git a/src/plugins/input_control_vis/public/control/range_control_factory.ts b/src/plugins/input_control_vis/public/control/range_control_factory.ts
index 6cd477d28b4f6..41cc48049a5c9 100644
--- a/src/plugins/input_control_vis/public/control/range_control_factory.ts
+++ b/src/plugins/input_control_vis/public/control/range_control_factory.ts
@@ -9,8 +9,8 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import { TimefilterContract, DataPublicPluginStart } from 'src/plugins/data/public';
-import { DataViewField } from '../../../data_views/public';
+import { TimefilterContract, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
 import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { createSearchSource } from './create_search_source';
diff --git a/src/plugins/input_control_vis/public/index.ts b/src/plugins/input_control_vis/public/index.ts
index 9d024af3464f4..41f7e4a4afd31 100644
--- a/src/plugins/input_control_vis/public/index.ts
+++ b/src/plugins/input_control_vis/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { InputControlVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/input_control_vis/public/input_control_fn.test.ts b/src/plugins/input_control_vis/public/input_control_fn.test.ts
index a1137030f1ac8..13d0406fd53de 100644
--- a/src/plugins/input_control_vis/public/input_control_fn.test.ts
+++ b/src/plugins/input_control_vis/public/input_control_fn.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { createInputControlVisFn } from './input_control_fn';
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 
 describe('interpreter/functions#input_control_vis', () => {
   const fn = functionWrapper(createInputControlVisFn());
diff --git a/src/plugins/input_control_vis/public/input_control_fn.ts b/src/plugins/input_control_vis/public/input_control_fn.ts
index 6018543777e60..ae7a67f8fc0f5 100644
--- a/src/plugins/input_control_vis/public/input_control_fn.ts
+++ b/src/plugins/input_control_vis/public/input_control_fn.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../expressions/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
 import { InputControlVisParams } from './types';
 
 interface Arguments {
diff --git a/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx b/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx
index 81ff7a5aa47f1..5e9710c0c63a7 100644
--- a/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx
+++ b/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import { InputControlVisDependencies } from './plugin';
 import { InputControlRenderValue } from './input_control_fn';
 import type { InputControlVisControllerType } from './vis_controller';
diff --git a/src/plugins/input_control_vis/public/input_control_vis_type.ts b/src/plugins/input_control_vis/public/input_control_vis_type.ts
index 64d2a5c3571f1..c5eb5ad5d91fe 100644
--- a/src/plugins/input_control_vis/public/input_control_vis_type.ts
+++ b/src/plugins/input_control_vis/public/input_control_vis_type.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { VisGroups, VisTypeDefinition } from '../../visualizations/public';
+import { VisGroups, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { getControlsTab, OptionsTabLazy } from './components/editor';
 import { InputControlVisDependencies } from './plugin';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/input_control_vis/public/plugin.ts b/src/plugins/input_control_vis/public/plugin.ts
index 0f8f601d5edbc..73158e17882f6 100644
--- a/src/plugins/input_control_vis/public/plugin.ts
+++ b/src/plugins/input_control_vis/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 
-import { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { VisualizationsSetup, VisualizationsStart } from '../../visualizations/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
 import { createInputControlVisFn } from './input_control_fn';
 import { getInputControlVisRenderer } from './input_control_vis_renderer';
 import { createInputControlVisTypeDefinition } from './input_control_vis_type';
diff --git a/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts b/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
index 40f01b05d18b2..0292cd759a0a1 100644
--- a/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
+++ b/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 /**
  * Returns forced **Partial** IndexPattern for use in tests
diff --git a/src/plugins/input_control_vis/public/to_ast.test.ts b/src/plugins/input_control_vis/public/to_ast.test.ts
index 7b8511c5bca90..bbe79f2e677b6 100644
--- a/src/plugins/input_control_vis/public/to_ast.test.ts
+++ b/src/plugins/input_control_vis/public/to_ast.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { InputControlVisParams } from './types';
 import { toExpressionAst } from './to_ast';
 
diff --git a/src/plugins/input_control_vis/public/to_ast.ts b/src/plugins/input_control_vis/public/to_ast.ts
index d70f0234bf7c3..ee6e783656ff8 100644
--- a/src/plugins/input_control_vis/public/to_ast.ts
+++ b/src/plugins/input_control_vis/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
-import { Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { InputControlExpressionFunctionDefinition } from './input_control_fn';
 import { InputControlVisParams } from './types';
 
diff --git a/src/plugins/input_control_vis/public/vis_controller.tsx b/src/plugins/input_control_vis/public/vis_controller.tsx
index 51c88962f3cb2..229a8741c2bfd 100644
--- a/src/plugins/input_control_vis/public/vis_controller.tsx
+++ b/src/plugins/input_control_vis/public/vis_controller.tsx
@@ -11,11 +11,11 @@ import { isEqual } from 'lodash';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Subscription } from 'rxjs';
 
-import { I18nStart } from 'kibana/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { I18nStart } from '@kbn/core/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { Filter } from '@kbn/es-query';
-import { VisualizationContainer } from '../../visualizations/public';
-import { FilterManager } from '../../data/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 
 import { InputControlVis } from './components/vis/input_control_vis';
 import { getControlFactory } from './control/control_factory';
diff --git a/src/plugins/inspector/public/index.ts b/src/plugins/inspector/public/index.ts
index 5ad7898550974..388f5f55e2c86 100644
--- a/src/plugins/inspector/public/index.ts
+++ b/src/plugins/inspector/public/index.ts
@@ -11,7 +11,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { InspectorPublicPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/inspector/public/mocks.ts b/src/plugins/inspector/public/mocks.ts
index 25f339825409b..bd2e6aa7e2b5f 100644
--- a/src/plugins/inspector/public/mocks.ts
+++ b/src/plugins/inspector/public/mocks.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 import { Setup as PluginSetup, Start as PluginStart } from '.';
 import { InspectorViewRegistry } from './view_registry';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/public/mocks';
-import type { SharePluginStart } from '../../share/public';
 
 export type Setup = jest.Mocked<PluginSetup>;
 export type Start = jest.Mocked<PluginStart>;
diff --git a/src/plugins/inspector/public/plugin.tsx b/src/plugins/inspector/public/plugin.tsx
index 14a141f7c2ec1..6842a271e9819 100644
--- a/src/plugins/inspector/public/plugin.tsx
+++ b/src/plugins/inspector/public/plugin.tsx
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import * as React from 'react';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { toMountPoint } from '../../kibana_react/public';
-import { SharePluginStart } from '../../share/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { InspectorViewRegistry } from './view_registry';
 import { InspectorOptions, InspectorSession } from './types';
 import { InspectorPanel } from './ui/inspector_panel';
diff --git a/src/plugins/inspector/public/types.ts b/src/plugins/inspector/public/types.ts
index cd83da7eb73af..040a283bc4972 100644
--- a/src/plugins/inspector/public/types.ts
+++ b/src/plugins/inspector/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { OverlayRef } from '../../../core/public';
+import { OverlayRef } from '@kbn/core/public';
 import { Adapters } from '../common';
 
 /**
diff --git a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index 4381db10f8cd0..fa3cbbdec6df0 100644
--- a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -14,9 +14,9 @@ exports[`InspectorPanel should render as expected 1`] = `
     Object {
       "application": Object {
         "applications$": BehaviorSubject {
-          "_isScalar": false,
           "_value": Map {},
           "closed": false,
+          "currentObservers": null,
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -28,10 +28,9 @@ exports[`InspectorPanel should render as expected 1`] = `
           "navLinks": Object {},
         },
         "currentAppId$": Observable {
-          "_isScalar": false,
           "source": Subject {
-            "_isScalar": false,
             "closed": false,
+            "currentObservers": null,
             "hasError": false,
             "isStopped": false,
             "observers": Array [],
@@ -199,9 +198,9 @@ exports[`InspectorPanel should render as expected 1`] = `
       Object {
         "application": Object {
           "applications$": BehaviorSubject {
-            "_isScalar": false,
             "_value": Map {},
             "closed": false,
+            "currentObservers": null,
             "hasError": false,
             "isStopped": false,
             "observers": Array [],
@@ -213,10 +212,9 @@ exports[`InspectorPanel should render as expected 1`] = `
             "navLinks": Object {},
           },
           "currentAppId$": Observable {
-            "_isScalar": false,
             "source": Subject {
-              "_isScalar": false,
               "closed": false,
+              "currentObservers": null,
               "hasError": false,
               "isStopped": false,
               "observers": Array [],
diff --git a/src/plugins/inspector/public/ui/inspector_panel.test.tsx b/src/plugins/inspector/public/ui/inspector_panel.test.tsx
index 4466a293ca6b3..777611fb0e110 100644
--- a/src/plugins/inspector/public/ui/inspector_panel.test.tsx
+++ b/src/plugins/inspector/public/ui/inspector_panel.test.tsx
@@ -11,10 +11,10 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { InspectorPanel } from './inspector_panel';
 import { InspectorViewDescription } from '../types';
 import { Adapters } from '../../common';
-import type { ApplicationStart, HttpSetup, IUiSettingsClient } from 'kibana/public';
-import { SharePluginStart } from '../../../share/public';
-import { sharePluginMock } from '../../../share/public/mocks';
-import { applicationServiceMock } from '../../../../core/public/mocks';
+import type { ApplicationStart, HttpSetup, IUiSettingsClient } from '@kbn/core/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 
 describe('InspectorPanel', () => {
   let adapters: Adapters;
diff --git a/src/plugins/inspector/public/ui/inspector_panel.tsx b/src/plugins/inspector/public/ui/inspector_panel.tsx
index 3c6e3c079c8ec..4615d61b76652 100644
--- a/src/plugins/inspector/public/ui/inspector_panel.tsx
+++ b/src/plugins/inspector/public/ui/inspector_panel.tsx
@@ -18,12 +18,12 @@ import {
   EuiFlyoutBody,
   EuiLoadingSpinner,
 } from '@elastic/eui';
-import { ApplicationStart, HttpStart, IUiSettingsClient } from 'kibana/public';
+import { ApplicationStart, HttpStart, IUiSettingsClient } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { InspectorViewDescription } from '../types';
 import { Adapters } from '../../common';
 import { InspectorViewChooser } from './inspector_view_chooser';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { SharePluginStart } from '../../../share/public';
 
 function hasAdaptersChanged(oldAdapters: Adapters, newAdapters: Adapters) {
   return (
diff --git a/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx b/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx
index 216ccbe8d0c2c..df2b3d5c88b93 100644
--- a/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx
+++ b/src/plugins/inspector/public/views/requests/components/details/req_code_viewer.tsx
@@ -16,7 +16,7 @@ import { i18n } from '@kbn/i18n';
 import { XJsonLang } from '@kbn/monaco';
 import { compressToEncodedURIComponent } from 'lz-string';
 import React, { useCallback } from 'react';
-import { CodeEditor, useKibana } from '../../../../../../kibana_react/public';
+import { CodeEditor, useKibana } from '@kbn/kibana-react-plugin/public';
 import { InspectorPluginStartDeps } from '../../../../plugin';
 
 interface RequestCodeViewerProps {
diff --git a/src/plugins/interactive_setup/public/cluster_address_form.test.tsx b/src/plugins/interactive_setup/public/cluster_address_form.test.tsx
index 098012bd36310..51ca8dd830c3f 100644
--- a/src/plugins/interactive_setup/public/cluster_address_form.test.tsx
+++ b/src/plugins/interactive_setup/public/cluster_address_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { ClusterAddressForm } from './cluster_address_form';
 import { Providers } from './plugin';
diff --git a/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx b/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx
index 21c8d193fbec1..2e66d9b4f125e 100644
--- a/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx
+++ b/src/plugins/interactive_setup/public/cluster_configuration_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { ClusterConfigurationForm } from './cluster_configuration_form';
 import { Providers } from './plugin';
diff --git a/src/plugins/interactive_setup/public/doc_link.tsx b/src/plugins/interactive_setup/public/doc_link.tsx
index d283dd08b7f7c..850e3ad4da5c4 100644
--- a/src/plugins/interactive_setup/public/doc_link.tsx
+++ b/src/plugins/interactive_setup/public/doc_link.tsx
@@ -11,7 +11,7 @@ import { EuiLink } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React, { useCallback } from 'react';
 
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 import { useKibana } from './use_kibana';
 
diff --git a/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx b/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx
index a344129aa8e5b..53f95ce62d7a7 100644
--- a/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx
+++ b/src/plugins/interactive_setup/public/enrollment_token_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import type { EnrollmentToken } from '../common';
 import { decodeEnrollmentToken, EnrollmentTokenForm } from './enrollment_token_form';
diff --git a/src/plugins/interactive_setup/public/plugin.tsx b/src/plugins/interactive_setup/public/plugin.tsx
index 2deba1ce5b1a2..aa688cd0e53b5 100644
--- a/src/plugins/interactive_setup/public/plugin.tsx
+++ b/src/plugins/interactive_setup/public/plugin.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import type { Observable } from 'rxjs';
 
+import type { CoreSetup, CoreStart, CoreTheme, Plugin } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { CoreSetup, CoreStart, CoreTheme, Plugin } from 'src/core/public';
 
 import { App } from './app';
 import { KibanaThemeProvider } from './theme'; // TODO: replace this with the one exported from `kibana_react` after https://github.com/elastic/kibana/issues/119204 is implemented.
diff --git a/src/plugins/interactive_setup/public/progress_indicator.tsx b/src/plugins/interactive_setup/public/progress_indicator.tsx
index 21bdcd2f78688..74bb10529d725 100644
--- a/src/plugins/interactive_setup/public/progress_indicator.tsx
+++ b/src/plugins/interactive_setup/public/progress_indicator.tsx
@@ -13,10 +13,10 @@ import React, { useEffect, useState } from 'react';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useTimeoutFn from 'react-use/lib/useTimeoutFn';
 
+import type { IHttpFetchError } from '@kbn/core/public';
+import type { StatusResponse } from '@kbn/core/types/status';
 import { i18n } from '@kbn/i18n';
-import type { IHttpFetchError } from 'kibana/public';
 
-import type { StatusResponse } from '../../../core/types/status';
 import { useKibana } from './use_kibana';
 
 export interface ProgressIndicatorProps {
diff --git a/src/plugins/interactive_setup/public/submit_error_callout.tsx b/src/plugins/interactive_setup/public/submit_error_callout.tsx
index 7c4524dcfee96..8ccf5ae2a78f4 100644
--- a/src/plugins/interactive_setup/public/submit_error_callout.tsx
+++ b/src/plugins/interactive_setup/public/submit_error_callout.tsx
@@ -10,8 +10,8 @@ import { EuiButton, EuiCallOut } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React from 'react';
 
+import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
 
 import {
   ERROR_COMPATIBILITY_FAILURE,
diff --git a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx
index 5d1bc9798ee17..c261494dd78d0 100644
--- a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx
+++ b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.test.tsx
@@ -13,8 +13,8 @@ import React, { useEffect } from 'react';
 import { act } from 'react-dom/test-utils';
 import { BehaviorSubject, of } from 'rxjs';
 
+import type { CoreTheme } from '@kbn/core/public';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { CoreTheme } from 'src/core/public';
 
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
diff --git a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx
index b1de6bd143049..238d8b8c930ab 100644
--- a/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx
+++ b/src/plugins/interactive_setup/public/theme/kibana_theme_provider.tsx
@@ -12,7 +12,8 @@ import React, { useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
+
 import { getColorMode } from './utils';
 
 interface KibanaThemeProviderProps {
diff --git a/src/plugins/interactive_setup/public/theme/utils.ts b/src/plugins/interactive_setup/public/theme/utils.ts
index 052804073f226..19cbd19c81cfc 100644
--- a/src/plugins/interactive_setup/public/theme/utils.ts
+++ b/src/plugins/interactive_setup/public/theme/utils.ts
@@ -9,7 +9,7 @@
 import { COLOR_MODES_STANDARD } from '@elastic/eui';
 import type { EuiThemeColorModeStandard } from '@elastic/eui';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 /**
  * Copied from the `kibana_react` plugin, remove once https://github.com/elastic/kibana/issues/119204 is implemented.
diff --git a/src/plugins/interactive_setup/public/use_kibana.ts b/src/plugins/interactive_setup/public/use_kibana.ts
index 12b01e2eae70c..7ef58b0d480b4 100644
--- a/src/plugins/interactive_setup/public/use_kibana.ts
+++ b/src/plugins/interactive_setup/public/use_kibana.ts
@@ -8,7 +8,7 @@
 
 import constate from 'constate';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 export const [KibanaProvider, useKibana] = constate(({ services }: { services: CoreStart }) => {
   return services;
diff --git a/src/plugins/interactive_setup/public/verification_code_form.test.tsx b/src/plugins/interactive_setup/public/verification_code_form.test.tsx
index 4848a2838f9d9..efa5721c8d5b8 100644
--- a/src/plugins/interactive_setup/public/verification_code_form.test.tsx
+++ b/src/plugins/interactive_setup/public/verification_code_form.test.tsx
@@ -9,7 +9,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { Providers } from './plugin';
 import { VerificationCodeForm } from './verification_code_form';
diff --git a/src/plugins/interactive_setup/public/verification_code_form.tsx b/src/plugins/interactive_setup/public/verification_code_form.tsx
index fce48293b702b..a61b11e464271 100644
--- a/src/plugins/interactive_setup/public/verification_code_form.tsx
+++ b/src/plugins/interactive_setup/public/verification_code_form.tsx
@@ -18,9 +18,9 @@ import {
 import type { FunctionComponent } from 'react';
 import React from 'react';
 
+import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
 
 import { VERIFICATION_CODE_LENGTH } from '../common';
 import { getCommandLineSnippet } from './get_command_line_snippet';
diff --git a/src/plugins/interactive_setup/server/compatibility_error.ts b/src/plugins/interactive_setup/server/compatibility_error.ts
index f739c93e52acf..85f34f2b2079f 100644
--- a/src/plugins/interactive_setup/server/compatibility_error.ts
+++ b/src/plugins/interactive_setup/server/compatibility_error.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { NodesVersionCompatibility } from 'src/core/server';
+import type { NodesVersionCompatibility } from '@kbn/core/server';
 
 export class CompatibilityError extends Error {
   constructor(private meta: NodesVersionCompatibility) {
diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.test.ts b/src/plugins/interactive_setup/server/elasticsearch_service.test.ts
index 63d95673cacb4..717c6bf56481a 100644
--- a/src/plugins/interactive_setup/server/elasticsearch_service.test.ts
+++ b/src/plugins/interactive_setup/server/elasticsearch_service.test.ts
@@ -10,11 +10,11 @@ import { errors } from '@elastic/elasticsearch';
 import { BehaviorSubject } from 'rxjs';
 import tls from 'tls';
 
+import { pollEsNodesVersion } from '@kbn/core/server';
+import type { NodesVersionCompatibility } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
 
-import { pollEsNodesVersion } from '../../../../src/core/server';
-import type { NodesVersionCompatibility } from '../../../../src/core/server';
 import { ElasticsearchConnectionStatus } from '../common';
 import { ConfigSchema } from './config';
 import type { ElasticsearchServiceSetup } from './elasticsearch_service';
@@ -22,7 +22,7 @@ import { ElasticsearchService } from './elasticsearch_service';
 import { interactiveSetupMock } from './mocks';
 
 jest.mock('tls');
-jest.mock('../../../../src/core/server', () => ({
+jest.mock('@kbn/core/server', () => ({
   pollEsNodesVersion: jest.fn(),
 }));
 
diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.ts b/src/plugins/interactive_setup/server/elasticsearch_service.ts
index f9bcbd60d02d3..25c704a89024b 100644
--- a/src/plugins/interactive_setup/server/elasticsearch_service.ts
+++ b/src/plugins/interactive_setup/server/elasticsearch_service.ts
@@ -10,12 +10,11 @@ import { errors } from '@elastic/elasticsearch';
 import type { TransportResult } from '@elastic/elasticsearch';
 import type { Duration } from 'moment';
 import type { Observable } from 'rxjs';
-import { from, of, timer } from 'rxjs';
+import { firstValueFrom, from, of, timer } from 'rxjs';
 import {
   catchError,
   distinctUntilChanged,
   exhaustMap,
-  first,
   map,
   shareReplay,
   takeWhile,
@@ -28,9 +27,9 @@ import type {
   ICustomClusterClient,
   Logger,
   ScopeableRequest,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { pollEsNodesVersion } from '@kbn/core/server';
 
-import { pollEsNodesVersion } from '../../../../src/core/server';
 import { ElasticsearchConnectionStatus } from '../common';
 import type { Certificate, PingResult } from '../common';
 import { CompatibilityError } from './compatibility_error';
@@ -388,15 +387,15 @@ export class ElasticsearchService {
   }
 
   private async checkCompatibility(internalClient: ElasticsearchClient) {
-    return pollEsNodesVersion({
-      internalClient,
-      log: this.logger,
-      kibanaVersion: this.kibanaVersion,
-      ignoreVersionMismatch: false,
-      esVersionCheckInterval: -1, // Passing a negative number here will result in immediate completion after the first value is emitted
-    })
-      .pipe(first())
-      .toPromise();
+    return firstValueFrom(
+      pollEsNodesVersion({
+        internalClient,
+        log: this.logger,
+        kibanaVersion: this.kibanaVersion,
+        ignoreVersionMismatch: false,
+        esVersionCheckInterval: -1, // Passing a negative number here will result in immediate completion after the first value is emitted
+      })
+    );
   }
 
   private static fetchPeerCertificate(host: string, port: string | number) {
diff --git a/src/plugins/interactive_setup/server/index.ts b/src/plugins/interactive_setup/server/index.ts
index 2f9a2cf3adec0..885a4f4afa544 100644
--- a/src/plugins/interactive_setup/server/index.ts
+++ b/src/plugins/interactive_setup/server/index.ts
@@ -11,7 +11,7 @@ import type {
   PluginConfigDescriptor,
   PluginInitializer,
   PluginInitializerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { InteractiveSetupPlugin } from './plugin';
diff --git a/src/plugins/interactive_setup/server/kibana_config_writer.test.ts b/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
index d097d7cc4a05d..1d17ce10d5e6d 100644
--- a/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
+++ b/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
@@ -10,7 +10,7 @@ jest.mock('fs/promises');
 jest.mock('crypto');
 import { constants } from 'fs';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { KibanaConfigWriter } from './kibana_config_writer';
 
diff --git a/src/plugins/interactive_setup/server/kibana_config_writer.ts b/src/plugins/interactive_setup/server/kibana_config_writer.ts
index eac1bd0cef175..94a5676840f9c 100644
--- a/src/plugins/interactive_setup/server/kibana_config_writer.ts
+++ b/src/plugins/interactive_setup/server/kibana_config_writer.ts
@@ -12,8 +12,8 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 import path from 'path';
 
+import type { Logger } from '@kbn/core/server';
 import { getFlattenedObject } from '@kbn/std';
-import type { Logger } from 'src/core/server';
 
 import { getDetailedErrorMessage } from './errors';
 
diff --git a/src/plugins/interactive_setup/server/plugin.ts b/src/plugins/interactive_setup/server/plugin.ts
index 86f0d29bc2884..ee09c2c71e752 100644
--- a/src/plugins/interactive_setup/server/plugin.ts
+++ b/src/plugins/interactive_setup/server/plugin.ts
@@ -10,8 +10,13 @@ import chalk from 'chalk';
 import type { Subscription } from 'rxjs';
 
 import type { TypeOf } from '@kbn/config-schema';
+import type {
+  CorePreboot,
+  Logger,
+  PluginInitializerContext,
+  PrebootPlugin,
+} from '@kbn/core/server';
 import { getDataPath } from '@kbn/utils';
-import type { CorePreboot, Logger, PluginInitializerContext, PrebootPlugin } from 'src/core/server';
 
 import { ElasticsearchConnectionStatus } from '../common';
 import type { ConfigSchema, ConfigType } from './config';
diff --git a/src/plugins/interactive_setup/server/routes/configure.test.ts b/src/plugins/interactive_setup/server/routes/configure.test.ts
index 575f53dfb434f..def3a8dcdb11a 100644
--- a/src/plugins/interactive_setup/server/routes/configure.test.ts
+++ b/src/plugins/interactive_setup/server/routes/configure.test.ts
@@ -9,9 +9,9 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   ElasticsearchConnectionStatus,
diff --git a/src/plugins/interactive_setup/server/routes/enroll.test.ts b/src/plugins/interactive_setup/server/routes/enroll.test.ts
index eddc06860deaf..a803792cfa9eb 100644
--- a/src/plugins/interactive_setup/server/routes/enroll.test.ts
+++ b/src/plugins/interactive_setup/server/routes/enroll.test.ts
@@ -9,9 +9,9 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   ElasticsearchConnectionStatus,
diff --git a/src/plugins/interactive_setup/server/routes/enroll.ts b/src/plugins/interactive_setup/server/routes/enroll.ts
index 4c204aac51c90..162cb623e4ddb 100644
--- a/src/plugins/interactive_setup/server/routes/enroll.ts
+++ b/src/plugins/interactive_setup/server/routes/enroll.ts
@@ -10,6 +10,7 @@ import { first } from 'rxjs/operators';
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '.';
 import {
   ElasticsearchConnectionStatus,
   ERROR_COMPATIBILITY_FAILURE,
@@ -23,7 +24,6 @@ import { CompatibilityError } from '../compatibility_error';
 import { ElasticsearchService } from '../elasticsearch_service';
 import type { EnrollResult } from '../elasticsearch_service';
 import type { WriteConfigParameters } from '../kibana_config_writer';
-import type { RouteDefinitionParams } from './';
 
 /**
  * Defines routes to deal with Elasticsearch `enroll_kibana` APIs.
diff --git a/src/plugins/interactive_setup/server/routes/index.mock.ts b/src/plugins/interactive_setup/server/routes/index.mock.ts
index 15ec86031b6f2..b4d9823831e7d 100644
--- a/src/plugins/interactive_setup/server/routes/index.mock.ts
+++ b/src/plugins/interactive_setup/server/routes/index.mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock, httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { coreMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { ConfigSchema } from '../config';
 import { elasticsearchServiceMock } from '../elasticsearch_service.mock';
diff --git a/src/plugins/interactive_setup/server/routes/index.ts b/src/plugins/interactive_setup/server/routes/index.ts
index f1f6b34fb689c..804bc9bddbc91 100644
--- a/src/plugins/interactive_setup/server/routes/index.ts
+++ b/src/plugins/interactive_setup/server/routes/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { IBasePath, IRouter, Logger, PrebootServicePreboot } from '@kbn/core/server';
 import type { PublicContract, PublicMethodsOf } from '@kbn/utility-types';
-import type { IBasePath, IRouter, Logger, PrebootServicePreboot } from 'src/core/server';
 
 import type { ConfigType } from '../config';
 import type { ElasticsearchServiceSetup } from '../elasticsearch_service';
diff --git a/src/plugins/interactive_setup/server/routes/ping.test.ts b/src/plugins/interactive_setup/server/routes/ping.test.ts
index ffa98071129d2..4e98fc841fc57 100644
--- a/src/plugins/interactive_setup/server/routes/ping.test.ts
+++ b/src/plugins/interactive_setup/server/routes/ping.test.ts
@@ -9,9 +9,9 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { ERROR_OUTSIDE_PREBOOT_STAGE, ERROR_PING_FAILURE } from '../../common';
 import { interactiveSetupMock } from '../mocks';
diff --git a/src/plugins/interactive_setup/server/routes/status.test.ts b/src/plugins/interactive_setup/server/routes/status.test.ts
index b40c765a8a53a..dd4f0db7a64d0 100644
--- a/src/plugins/interactive_setup/server/routes/status.test.ts
+++ b/src/plugins/interactive_setup/server/routes/status.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter, RequestHandler, RequestHandlerContext } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from './index.mock';
 import { defineStatusRoute } from './status';
diff --git a/src/plugins/interactive_setup/server/routes/verify.test.ts b/src/plugins/interactive_setup/server/routes/verify.test.ts
index 05858dce0f710..bedbc0cf418aa 100644
--- a/src/plugins/interactive_setup/server/routes/verify.test.ts
+++ b/src/plugins/interactive_setup/server/routes/verify.test.ts
@@ -7,9 +7,9 @@
  */
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from './index.mock';
 import { defineVerifyRoute } from './verify';
diff --git a/src/plugins/interactive_setup/server/verification_code.test.ts b/src/plugins/interactive_setup/server/verification_code.test.ts
index 7387f285a2f62..ec9aa48ab2b97 100644
--- a/src/plugins/interactive_setup/server/verification_code.test.ts
+++ b/src/plugins/interactive_setup/server/verification_code.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { VERIFICATION_CODE_LENGTH } from '../common';
 import { VerificationCode } from './verification_code';
diff --git a/src/plugins/interactive_setup/server/verification_code.ts b/src/plugins/interactive_setup/server/verification_code.ts
index 849ece5f4e0b0..4e737a865e850 100644
--- a/src/plugins/interactive_setup/server/verification_code.ts
+++ b/src/plugins/interactive_setup/server/verification_code.ts
@@ -9,7 +9,7 @@
 import chalk from 'chalk';
 import crypto from 'crypto';
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 import { VERIFICATION_CODE_LENGTH } from '../common';
 
diff --git a/src/plugins/interactive_setup/server/verification_service.test.ts b/src/plugins/interactive_setup/server/verification_service.test.ts
index 1721362d1c635..b16d230c27419 100644
--- a/src/plugins/interactive_setup/server/verification_service.test.ts
+++ b/src/plugins/interactive_setup/server/verification_service.test.ts
@@ -8,7 +8,7 @@
 
 import fs from 'fs';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { VerificationCode } from './verification_code';
 import { VerificationService } from './verification_service';
diff --git a/src/plugins/interactive_setup/server/verification_service.ts b/src/plugins/interactive_setup/server/verification_service.ts
index b158b23bd3b6d..a361225d6c32b 100644
--- a/src/plugins/interactive_setup/server/verification_service.ts
+++ b/src/plugins/interactive_setup/server/verification_service.ts
@@ -9,8 +9,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import type { Logger } from '@kbn/core/server';
 import { getDataPath } from '@kbn/utils';
-import type { Logger } from 'src/core/server';
 
 import { getDetailedErrorMessage } from './errors';
 import { VerificationCode } from './verification_code';
diff --git a/src/plugins/kibana_overview/public/application.tsx b/src/plugins/kibana_overview/public/application.tsx
index 4c0608d1b62ea..adfd53c04ef48 100644
--- a/src/plugins/kibana_overview/public/application.tsx
+++ b/src/plugins/kibana_overview/public/application.tsx
@@ -10,12 +10,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
-import { NewsfeedApiEndpoint } from '../../../../src/plugins/newsfeed/public';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { NewsfeedApiEndpoint } from '@kbn/newsfeed-plugin/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { AppPluginStartDependencies } from './types';
 import { KibanaOverviewApp } from './components/app';
 
diff --git a/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx b/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx
index ed091ff96c5f2..b5a8b93a8128a 100644
--- a/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx
+++ b/src/plugins/kibana_overview/public/components/add_data/add_data.test.tsx
@@ -9,11 +9,10 @@
 import React from 'react';
 import { AddData } from './add_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
 
 const mockFeatures = [
   {
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as const,
     description: 'Ingest data from popular apps and services.',
     showOnHomePage: true,
     icon: 'indexOpen',
@@ -23,7 +22,7 @@ const mockFeatures = [
     title: 'Ingest data',
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Add and manage your fleet of Elastic Agents and integrations.',
     showOnHomePage: true,
     icon: 'indexManagementApp',
@@ -33,7 +32,7 @@ const mockFeatures = [
     title: 'Add Elastic Agent',
   },
   {
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as const,
     description: 'Import your own CSV, NDJSON, or log file',
     showOnHomePage: true,
     icon: 'document',
diff --git a/src/plugins/kibana_overview/public/components/add_data/add_data.tsx b/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
index 1be7cd133bca2..172fd7864a0b9 100644
--- a/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
+++ b/src/plugins/kibana_overview/public/components/add_data/add_data.tsx
@@ -10,12 +10,9 @@ import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
-import { RedirectAppLinks, useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import {
-  FeatureCatalogueEntry,
-  FeatureCatalogueCategory,
-} from '../../../../../../src/plugins/home/public';
+import { CoreStart } from '@kbn/core/public';
+import { RedirectAppLinks, useKibana } from '@kbn/kibana-react-plugin/public';
+import { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
 // @ts-expect-error untyped component
 import { Synopsis } from '../synopsis';
 import { METRIC_TYPE, trackUiMetric } from '../../lib/ui_metric';
@@ -97,7 +94,7 @@ AddData.propTypes = {
       icon: PropTypes.string.isRequired,
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
-      category: PropTypes.oneOf(Object.values(FeatureCatalogueCategory)).isRequired,
+      category: PropTypes.string.isRequired,
       order: PropTypes.number as PropTypes.Validator<number | undefined>,
     }).isRequired
   ).isRequired,
diff --git a/src/plugins/kibana_overview/public/components/app.tsx b/src/plugins/kibana_overview/public/components/app.tsx
index ce1ebde281c8c..90e7051882cfd 100644
--- a/src/plugins/kibana_overview/public/components/app.tsx
+++ b/src/plugins/kibana_overview/public/components/app.tsx
@@ -10,10 +10,10 @@ import React, { useEffect, useState } from 'react';
 import { Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
-import { CoreStart } from 'src/core/public';
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { FetchResult } from 'src/plugins/newsfeed/public';
-import { FeatureCatalogueEntry, FeatureCatalogueSolution } from 'src/plugins/home/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { FetchResult } from '@kbn/newsfeed-plugin/public';
+import { FeatureCatalogueEntry, FeatureCatalogueSolution } from '@kbn/home-plugin/public';
 import { Overview } from './overview';
 
 interface KibanaOverviewAppDeps {
diff --git a/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx b/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx
index f5e72a3e0a867..44a5cafe0f3c1 100644
--- a/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx
+++ b/src/plugins/kibana_overview/public/components/manage_data/manage_data.test.tsx
@@ -9,11 +9,10 @@
 import React from 'react';
 import { ManageData } from './manage_data';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
 
 const mockFeatures = [
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Control who has access and what tasks they can perform.',
     icon: 'securityApp',
     id: 'security',
@@ -23,7 +22,7 @@ const mockFeatures = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Track the real-time health and performance of your deployment.',
     icon: 'monitoringApp',
     id: 'monitoring',
@@ -33,7 +32,7 @@ const mockFeatures = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description:
       'Save snapshots to a backup repository, and restore to recover index and cluster state.',
     icon: 'storage',
@@ -44,7 +43,7 @@ const mockFeatures = [
     showOnHomePage: true,
   },
   {
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin' as const,
     description: 'Define lifecycle policies to automatically perform operations as an index ages.',
     icon: 'indexSettings',
     id: 'index_lifecycle_management',
diff --git a/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx b/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx
index 85f354d8a81cb..376af562221c7 100644
--- a/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx
+++ b/src/plugins/kibana_overview/public/components/manage_data/manage_data.tsx
@@ -10,12 +10,9 @@ import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
-import { RedirectAppLinks, useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import {
-  FeatureCatalogueEntry,
-  FeatureCatalogueCategory,
-} from '../../../../../../src/plugins/home/public';
+import { CoreStart } from '@kbn/core/public';
+import { RedirectAppLinks, useKibana } from '@kbn/kibana-react-plugin/public';
+import { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
 // @ts-expect-error untyped component
 import { Synopsis } from '../synopsis';
 import { METRIC_TYPE, trackUiMetric } from '../../lib/ui_metric';
@@ -84,7 +81,7 @@ ManageData.propTypes = {
       icon: PropTypes.string.isRequired,
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
-      category: PropTypes.oneOf(Object.values(FeatureCatalogueCategory)).isRequired,
+      category: PropTypes.string.isRequired,
       order: PropTypes.number as PropTypes.Validator<number | undefined>,
     }).isRequired
   ).isRequired,
diff --git a/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx b/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx
index 1960249086629..354d99e64c6be 100644
--- a/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx
+++ b/src/plugins/kibana_overview/public/components/news_feed/news_feed.tsx
@@ -9,7 +9,7 @@
 import React, { FC } from 'react';
 import { EuiLink, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { FetchResult } from 'src/plugins/newsfeed/public';
+import { FetchResult } from '@kbn/newsfeed-plugin/public';
 
 interface Props {
   newsFetchResult: FetchResult;
diff --git a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
index 1a52bf05b9238..37bb37a21c201 100644
--- a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
@@ -682,6 +682,7 @@ exports[`Overview when there is no user data view 1`] = `
       Object {
         "actions": Object {
           "elasticAgent": Object {
+            "data-test-subj": "kbnOverviewAddIntegrations",
             "description": "Use Elastic Agent or Beats to collect data and build out Analytics solutions.",
             "title": "Add integrations",
           },
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts b/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts
index 7f1e7f7d7ac52..4c58de5cdd245 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts
+++ b/src/plugins/kibana_overview/public/components/overview/overview.test.mocks.ts
@@ -10,7 +10,7 @@ import React from 'react';
 
 export const hasUserDataViewMock = jest.fn();
 
-jest.doMock('../../../../../../src/plugins/kibana_react/public', () => ({
+jest.doMock('@kbn/kibana-react-plugin/public', () => ({
   useKibana: jest.fn().mockReturnValue({
     services: {
       http: { basePath: { prepend: jest.fn((path: string) => (path ? path : 'path')) } },
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
index 85aee7411d7ad..3682629bf64d7 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.test.tsx
@@ -14,8 +14,7 @@ import { act } from 'react-dom/test-utils';
 import { ReactWrapper } from 'enzyme';
 import { Overview } from './overview';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { FeatureCatalogueCategory } from 'src/plugins/home/public';
-
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 const mockNewsFetchResult = {
   error: null,
   feedItems: [
@@ -103,7 +102,7 @@ const mockFeatures = [
     icon: 'dashboardApp',
     path: 'dashboard_landing_page',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as FeatureCatalogueCategory,
   },
   {
     id: 'discover',
@@ -112,7 +111,7 @@ const mockFeatures = [
     icon: 'discoverApp',
     path: 'discover_landing_page',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as FeatureCatalogueCategory,
   },
   {
     id: 'canvas',
@@ -121,7 +120,7 @@ const mockFeatures = [
     icon: 'canvasApp',
     path: 'canvas_landing_page',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data' as FeatureCatalogueCategory,
   },
 ];
 
diff --git a/src/plugins/kibana_overview/public/components/overview/overview.tsx b/src/plugins/kibana_overview/public/components/overview/overview.tsx
index b387715710ce4..5859ea2e8a58b 100644
--- a/src/plugins/kibana_overview/public/components/overview/overview.tsx
+++ b/src/plugins/kibana_overview/public/components/overview/overview.tsx
@@ -19,7 +19,7 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import {
   RedirectAppLinks,
@@ -29,13 +29,13 @@ import {
   KibanaPageTemplateProps,
   overviewPageActions,
   OverviewPageFooter,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { FetchResult } from '../../../../../../src/plugins/newsfeed/public';
+} from '@kbn/kibana-react-plugin/public';
+import { FetchResult } from '@kbn/newsfeed-plugin/public';
 import {
   FeatureCatalogueEntry,
   FeatureCatalogueSolution,
   FeatureCatalogueCategory,
-} from '../../../../../../src/plugins/home/public';
+} from '@kbn/home-plugin/public';
 import { PLUGIN_ID, PLUGIN_PATH } from '../../../common';
 import { AppPluginStartDependencies } from '../../types';
 import { AddData } from '../add_data';
@@ -68,7 +68,7 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
     .get('MANAGEMENT_APP_LOCATOR')
     ?.useUrl({ sectionId: '' });
 
-  const getFeaturesByCategory = (category: string) =>
+  const getFeaturesByCategory = (category: FeatureCatalogueCategory) =>
     features
       .filter((feature) => feature.showOnHomePage && feature.category === category)
       .sort(sortByOrder);
@@ -78,8 +78,8 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
 
   const findFeatureById = (featureId: string) => features.find(({ id }) => id === featureId);
   const kibanaApps = features.filter(({ solutionId }) => solutionId === 'kibana').sort(sortByOrder);
-  const addDataFeatures = getFeaturesByCategory(FeatureCatalogueCategory.DATA);
-  const manageDataFeatures = getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
+  const addDataFeatures = getFeaturesByCategory('data');
+  const manageDataFeatures = getFeaturesByCategory('admin');
   const devTools = findFeatureById('console');
   const noDataConfig: KibanaPageTemplateProps['noDataConfig'] = {
     solution: i18n.translate('kibanaOverview.noDataConfig.solutionName', {
@@ -98,6 +98,7 @@ export const Overview: FC<Props> = ({ newsFetchResult, solutions, features }) =>
           defaultMessage:
             'Use Elastic Agent or Beats to collect data and build out Analytics solutions.',
         }),
+        'data-test-subj': 'kbnOverviewAddIntegrations',
       },
     },
     docsLink: docLinks.links.kibana.guide,
diff --git a/src/plugins/kibana_overview/public/lib/ui_metric.ts b/src/plugins/kibana_overview/public/lib/ui_metric.ts
index 9b19d485cf664..cf7af82f4cee8 100644
--- a/src/plugins/kibana_overview/public/lib/ui_metric.ts
+++ b/src/plugins/kibana_overview/public/lib/ui_metric.ts
@@ -7,7 +7,7 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export { METRIC_TYPE };
 
diff --git a/src/plugins/kibana_overview/public/plugin.ts b/src/plugins/kibana_overview/public/plugin.ts
index 2b0340fc7fe55..e5b33ed1544f2 100644
--- a/src/plugins/kibana_overview/public/plugin.ts
+++ b/src/plugins/kibana_overview/public/plugin.ts
@@ -17,7 +17,7 @@ import {
   DEFAULT_APP_CATEGORIES,
   AppStatus,
   AppNavLinkStatus,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import {
   KibanaOverviewPluginSetup,
   KibanaOverviewPluginStart,
diff --git a/src/plugins/kibana_overview/public/types.ts b/src/plugins/kibana_overview/public/types.ts
index 43c9746a6abbe..7698b944bfc2f 100644
--- a/src/plugins/kibana_overview/public/types.ts
+++ b/src/plugins/kibana_overview/public/types.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { HomePublicPluginSetup, HomePublicPluginStart } from 'src/plugins/home/public';
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import { NewsfeedPublicPluginStart } from 'src/plugins/newsfeed/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { SharePluginStart } from '../../share/public';
+import { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { NewsfeedPublicPluginStart } from '@kbn/newsfeed-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface KibanaOverviewPluginSetup {}
diff --git a/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts b/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
index 038e39a0060f1..40757d9b794aa 100644
--- a/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
+++ b/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
@@ -8,7 +8,7 @@
 
 import { ComponentType, createElement as h } from 'react';
 import { render as renderReact, unmountComponentAtNode } from 'react-dom';
-import { UiComponent, UiComponentInstance } from '../../../kibana_utils/public';
+import { UiComponent, UiComponentInstance } from '@kbn/kibana-utils-plugin/public';
 
 /**
  * Transform a React component into a `UiComponent`.
diff --git a/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx b/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
index 0a435f89bff37..27f1938c6ae7f 100644
--- a/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
+++ b/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
@@ -8,7 +8,7 @@
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { UiComponent } from '../../../kibana_utils/public';
+import { UiComponent } from '@kbn/kibana-utils-plugin/public';
 import { uiToReactComponent } from './ui_to_react_component';
 import { reactToUiComponent } from './react_to_ui_component';
 
diff --git a/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts b/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
index c85366e4bc4f7..1f8a5c6c46501 100644
--- a/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
+++ b/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
@@ -7,7 +7,7 @@
  */
 
 import { FC, createElement as h, useRef, useLayoutEffect, useMemo } from 'react';
-import { UiComponent, UiComponentInstance } from '../../../kibana_utils/public';
+import { UiComponent, UiComponentInstance } from '@kbn/kibana-utils-plugin/public';
 
 /**
  * Transforms `UiComponent` into a React component.
diff --git a/src/plugins/kibana_react/public/app_links/click_handler.test.ts b/src/plugins/kibana_react/public/app_links/click_handler.test.ts
index 1569203c394df..868e3d91d1218 100644
--- a/src/plugins/kibana_react/public/app_links/click_handler.test.ts
+++ b/src/plugins/kibana_react/public/app_links/click_handler.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { MouseEvent } from 'react';
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createNavigateToUrlClickHandler } from './click_handler';
 
 const createLink = ({
diff --git a/src/plugins/kibana_react/public/app_links/click_handler.ts b/src/plugins/kibana_react/public/app_links/click_handler.ts
index dc55c9f508471..05ef24009d612 100644
--- a/src/plugins/kibana_react/public/app_links/click_handler.ts
+++ b/src/plugins/kibana_react/public/app_links/click_handler.ts
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { getClosestLink, hasActiveModifierKey } from './utils';
 
 interface CreateCrossAppClickHandlerOptions {
diff --git a/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx b/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx
index 6c87306221988..133cab06e6b6f 100644
--- a/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx
+++ b/src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { MouseEvent } from 'react';
 import { mount } from 'enzyme';
-import { applicationServiceMock } from '../../../../core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 /** @deprecated Use `RedirectAppLinks` from `@kbn/shared-ux-components */
 import { RedirectAppLinks } from './redirect_app_link';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx b/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx
index 757239278921f..339055c3e1da5 100644
--- a/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx
+++ b/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx
@@ -9,7 +9,7 @@
 import React, { FunctionComponent, useRef, useMemo } from 'react';
 import classNames from 'classnames';
 import useObservable from 'react-use/lib/useObservable';
-import { ApplicationStart } from 'src/core/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createNavigateToUrlClickHandler } from './click_handler';
 
 interface RedirectCrossAppLinksProps extends React.HTMLAttributes<HTMLDivElement> {
diff --git a/src/plugins/kibana_react/public/context/context.test.tsx b/src/plugins/kibana_react/public/context/context.test.tsx
index a806f3eb66f75..46a5914eece9d 100644
--- a/src/plugins/kibana_react/public/context/context.test.tsx
+++ b/src/plugins/kibana_react/public/context/context.test.tsx
@@ -9,8 +9,8 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { context, createKibanaReactContext, useKibana, KibanaContextProvider } from './context';
-import { coreMock, overlayServiceMock } from '../../../../core/public/mocks';
-import { CoreStart } from '../../../../core/public';
+import { coreMock, overlayServiceMock } from '@kbn/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
 
 let container: HTMLDivElement | null;
 
diff --git a/src/plugins/kibana_react/public/context/types.ts b/src/plugins/kibana_react/public/context/types.ts
index 486a587dfe499..4962267974d79 100644
--- a/src/plugins/kibana_react/public/context/types.ts
+++ b/src/plugins/kibana_react/public/context/types.ts
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { CoreStart } from '../../../../core/public';
+import { CoreStart } from '@kbn/core/public';
 import { KibanaReactOverlays } from '../overlays';
 import { KibanaReactNotifications } from '../notifications';
 
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
index f62ac1c280aa6..6b45111df836e 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { ExitFullScreenButton } from './exit_full_screen_button';
 import { keys } from '@elastic/eui';
-import type { ChromeStart } from '../../../../core/public';
+import type { ChromeStart } from '@kbn/core/public';
 
 const MockChrome = {
   setIsVisible: jest.fn(),
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
index 5c559a8f9e06a..33871742acbb3 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import React, { PureComponent } from 'react';
 import { EuiScreenReaderOnly, keys } from '@elastic/eui';
 import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
-import type { ChromeStart } from '../../../../core/public';
+import type { ChromeStart } from '@kbn/core/public';
 
 export interface ExitFullScreenButtonProps {
   onExitFullScreenMode: () => void;
diff --git a/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx b/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx
index f5ac538207107..518849569a46a 100644
--- a/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx
+++ b/src/plugins/kibana_react/public/notifications/create_notifications.test.tsx
@@ -9,7 +9,7 @@
 import * as React from 'react';
 import { createNotifications } from './create_notifications';
 // eslint-disable-next-lien
-import { notificationServiceMock } from '../../../../core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 
 test('throws if no overlays service provided', () => {
   const notifications = createNotifications({});
diff --git a/src/plugins/kibana_react/public/notifications/types.ts b/src/plugins/kibana_react/public/notifications/types.ts
index 43061df0e0510..5b07ba16dda24 100644
--- a/src/plugins/kibana_react/public/notifications/types.ts
+++ b/src/plugins/kibana_react/public/notifications/types.ts
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { Toast } from '../../../../core/public';
+import { Toast } from '@kbn/core/public';
 
 export interface ToastInput {
   title?: React.ReactNode;
diff --git a/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx b/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx
index f7e4ef997c6f9..85be2c2a50514 100644
--- a/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx
+++ b/src/plugins/kibana_react/public/overlays/create_react_overlays.test.tsx
@@ -8,7 +8,7 @@
 
 import * as React from 'react';
 import { createReactOverlays } from './create_react_overlays';
-import { overlayServiceMock } from '../../../../core/public/mocks';
+import { overlayServiceMock } from '@kbn/core/public/mocks';
 
 test('throws if no overlays service provided', () => {
   const overlays = createReactOverlays({});
diff --git a/src/plugins/kibana_react/public/overlays/types.ts b/src/plugins/kibana_react/public/overlays/types.ts
index 725f8784c0cf4..f81be56a272ac 100644
--- a/src/plugins/kibana_react/public/overlays/types.ts
+++ b/src/plugins/kibana_react/public/overlays/types.ts
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { CoreStart } from '../../../../core/public';
+import { CoreStart } from '@kbn/core/public';
 
 export interface KibanaReactOverlays {
   openFlyout: (
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
index 389cccd08da8e..cb5d60fd330fd 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import { overviewPageActions } from './overview_page_actions';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 jest.mock('../../app_links', () => ({
   RedirectAppLinks: jest.fn((element: JSX.Element) => element),
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
index 5d61cc3e96bd0..9101224f60e13 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_actions/overview_page_actions.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { RedirectAppLinks } from '../../app_links';
 
 interface Props {
diff --git a/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx b/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
index cf2397b9693e9..b7a93dd33a0be 100644
--- a/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
+++ b/src/plugins/kibana_react/public/overview_page/overview_page_footer/overview_page_footer.tsx
@@ -10,7 +10,7 @@ import React, { FC, MouseEvent } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { RedirectAppLinks } from '../../app_links';
 import { useKibana } from '../../context';
 import { useUiSetting$ } from '../../ui_settings';
diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
index 19a197e8badd7..2cec3045c31c1 100644
--- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
+++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/elastic_agent_card.tsx
@@ -8,7 +8,7 @@
 
 import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { EuiButton, EuiCard, EuiTextColor, EuiScreenReaderOnly } from '@elastic/eui';
 import { useKibana } from '../../../context';
 import { NoDataPageActions, NO_DATA_RECOMMENDED } from '../no_data_page';
diff --git a/src/plugins/kibana_react/public/page_template/page_template.tsx b/src/plugins/kibana_react/public/page_template/page_template.tsx
index 77469b240a19d..bd5213c9a2608 100644
--- a/src/plugins/kibana_react/public/page_template/page_template.tsx
+++ b/src/plugins/kibana_react/public/page_template/page_template.tsx
@@ -21,6 +21,7 @@ import { KibanaPageTemplateInner, KibanaPageTemplateWithSolutionNav } from './pa
 
 /**
  * A thin wrapper around EuiPageTemplate with a few Kibana specific additions
+ * @deprecated Use `KibanaPageTemplateProps` from `kbn-shared-ux-components`.
  */
 export type KibanaPageTemplateProps = EuiPageTemplateProps & {
   /**
@@ -41,6 +42,7 @@ export type KibanaPageTemplateProps = EuiPageTemplateProps & {
   noDataConfig?: NoDataPageProps;
 };
 
+/** @deprecated Use `KibanaPageTemplate` from `kbn-shared-ux-components`. */
 export const KibanaPageTemplate: FunctionComponent<KibanaPageTemplateProps> = ({
   template,
   className,
diff --git a/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx b/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
index bad8baee55fd3..c4fa5363461ba 100644
--- a/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
+++ b/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
@@ -10,11 +10,8 @@ import React, { ComponentType, useState } from 'react';
 import classNames from 'classnames';
 import { useIsWithinBreakpoints } from '@elastic/eui';
 import { EuiPageSideBarProps } from '@elastic/eui/src/components/page/page_side_bar';
-import {
-  KibanaPageTemplateSolutionNav,
-  KibanaPageTemplateSolutionNavProps,
-} from '../page_template/solution_nav';
-import { KibanaPageTemplateProps } from '../page_template';
+import { KibanaPageTemplateSolutionNav, KibanaPageTemplateSolutionNavProps } from './solution_nav';
+import { KibanaPageTemplateProps } from '.';
 
 // https://reactjs.org/docs/higher-order-components.html#convention-wrap-the-display-name-for-easy-debugging
 function getDisplayName(Component: ComponentType<any>) {
diff --git a/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx b/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx
index 5abd77c9dc9b6..e65767abaf8ae 100644
--- a/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx
+++ b/src/plugins/kibana_react/public/react_router_navigate/react_router_navigate.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { MouseEvent } from 'react';
 import { History, parsePath } from 'history';
 
diff --git a/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx b/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx
index cf8ff8ac8ec53..13423047bc3f0 100644
--- a/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx
+++ b/src/plugins/kibana_react/public/table_list_view/table_list_view.test.tsx
@@ -8,9 +8,9 @@
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { ToastsStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
 import React from 'react';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock, applicationServiceMock } from '@kbn/core/public/mocks';
 import { TableListView } from './table_list_view';
 
 const requiredProps = {
@@ -26,6 +26,7 @@ const requiredProps = {
   toastNotifications: {} as ToastsStart,
   findItems: jest.fn(() => Promise.resolve({ total: 0, hits: [] })),
   theme: themeServiceMock.createStartContract(),
+  application: applicationServiceMock.createStartContract(),
 };
 
 describe('TableListView', () => {
diff --git a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
index dd023d522dbb6..ece2fa37cc832 100644
--- a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
+++ b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ThemeServiceStart, HttpFetchError, ToastsStart } from 'kibana/public';
+import { ThemeServiceStart, HttpFetchError, ToastsStart, ApplicationStart } from '@kbn/core/public';
 import { debounce, keyBy, sortBy, uniq } from 'lodash';
 import React from 'react';
 import { KibanaPageTemplate } from '../page_template';
@@ -58,6 +58,7 @@ export interface TableListViewProps<V> {
   tableCaption: string;
   searchFilters?: SearchFilterConfig[];
   theme: ThemeServiceStart;
+  application: ApplicationStart;
 }
 
 export interface TableListViewState<V> {
@@ -275,6 +276,11 @@ class TableListView<V extends {}> extends React.Component<
 
   renderListingLimitWarning() {
     if (this.state.showLimitError) {
+      const canEditAdvancedSettings = this.props.application.capabilities.advancedSettings.save;
+      const setting = 'savedObjects:listingLimit';
+      const advancedSettingsLink = this.props.application.getUrlForApp('management', {
+        path: `/kibana/settings?query=${setting}`,
+      });
       return (
         <React.Fragment>
           <EuiCallOut
@@ -288,25 +294,39 @@ class TableListView<V extends {}> extends React.Component<
             iconType="help"
           >
             <p>
-              <FormattedMessage
-                id="kibana-react.tableListView.listing.listingLimitExceededDescription"
-                defaultMessage="You have {totalItems} {entityNamePlural}, but your {listingLimitText} setting prevents
+              {canEditAdvancedSettings ? (
+                <FormattedMessage
+                  id="kibana-react.tableListView.listing.listingLimitExceededDescription"
+                  defaultMessage="You have {totalItems} {entityNamePlural}, but your {listingLimitText} setting prevents
                 the table below from displaying more than {listingLimitValue}. You can change this setting under {advancedSettingsLink}."
-                values={{
-                  entityNamePlural: this.props.entityNamePlural,
-                  totalItems: this.state.totalItems,
-                  listingLimitValue: this.props.listingLimit,
-                  listingLimitText: <strong>listingLimit</strong>,
-                  advancedSettingsLink: (
-                    <EuiLink href="#/management/kibana/settings">
-                      <FormattedMessage
-                        id="kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText"
-                        defaultMessage="Advanced Settings"
-                      />
-                    </EuiLink>
-                  ),
-                }}
-              />
+                  values={{
+                    entityNamePlural: this.props.entityNamePlural,
+                    totalItems: this.state.totalItems,
+                    listingLimitValue: this.props.listingLimit,
+                    listingLimitText: <strong>listingLimit</strong>,
+                    advancedSettingsLink: (
+                      <EuiLink href={advancedSettingsLink}>
+                        <FormattedMessage
+                          id="kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText"
+                          defaultMessage="Advanced Settings"
+                        />
+                      </EuiLink>
+                    ),
+                  }}
+                />
+              ) : (
+                <FormattedMessage
+                  id="kibana-react.tableListView.listing.listingLimitExceededDescriptionNoPermissions"
+                  defaultMessage="You have {totalItems} {entityNamePlural}, but your {listingLimitText} setting prevents
+                  the table below from displaying more than {listingLimitValue}. Contact your system administrator to change this setting."
+                  values={{
+                    entityNamePlural: this.props.entityNamePlural,
+                    totalItems: this.state.totalItems,
+                    listingLimitValue: this.props.listingLimit,
+                    listingLimitText: <strong>listingLimit</strong>,
+                  }}
+                />
+              )}
             </p>
           </EuiCallOut>
           <EuiSpacer size="m" />
diff --git a/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx b/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx
index 10c1f32e6ec26..890a36960b341 100644
--- a/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx
+++ b/src/plugins/kibana_react/public/theme/kibana_theme_provider.test.tsx
@@ -13,7 +13,7 @@ import { of, BehaviorSubject } from 'rxjs';
 import { useEuiTheme } from '@elastic/eui';
 import type { UseEuiTheme } from '@elastic/eui';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { CoreTheme } from 'src/core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
 describe('KibanaThemeProvider', () => {
diff --git a/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx b/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx
index 56ca7642f1cde..f5afe687f29c0 100644
--- a/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx
+++ b/src/plugins/kibana_react/public/theme/kibana_theme_provider.tsx
@@ -10,7 +10,7 @@ import React, { FC, useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { Observable } from 'rxjs';
 import { EuiThemeProvider } from '@elastic/eui';
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { getColorMode } from './utils';
 
 interface KibanaThemeProviderProps {
diff --git a/src/plugins/kibana_react/public/theme/utils.ts b/src/plugins/kibana_react/public/theme/utils.ts
index fe8092949d431..fc397396e5625 100644
--- a/src/plugins/kibana_react/public/theme/utils.ts
+++ b/src/plugins/kibana_react/public/theme/utils.ts
@@ -8,7 +8,7 @@
 
 import { COLOR_MODES_STANDARD } from '@elastic/eui';
 import type { EuiThemeColorModeStandard } from '@elastic/eui';
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 /* IMPORTANT: This code has been copied to the `interactive_setup` plugin, any changes here should be applied there too.
 That copy and this comment can be removed once https://github.com/elastic/kibana/issues/119204 is implemented.*/
diff --git a/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx b/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx
index b07b93653c3e5..dca0108d79223 100644
--- a/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx
+++ b/src/plugins/kibana_react/public/theme/wrap_with_theme.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { Observable } from 'rxjs';
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
 export const wrapWithTheme = (
diff --git a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx
index 44dea2aa420a7..466af1ad18324 100644
--- a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx
+++ b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx
@@ -13,7 +13,7 @@ import { useUiSetting$ } from './use_ui_setting';
 import { createKibanaReactContext } from '../context';
 import { KibanaServices } from '../context/types';
 import { Subject } from 'rxjs';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import useObservable from 'react-use/lib/useObservable';
 
 jest.mock('react-use/lib/useObservable');
diff --git a/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts b/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts
index e2c538056153c..9614176bb262e 100644
--- a/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts
+++ b/src/plugins/kibana_react/public/use_execution_context/use_execution_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaExecutionContext, CoreStart } from 'kibana/public';
+import type { KibanaExecutionContext, CoreStart } from '@kbn/core/public';
 import useDeepCompareEffect from 'react-use/lib/useDeepCompareEffect';
 
 /**
diff --git a/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx b/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
index 39e345568a298..c7200a934f5a6 100644
--- a/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
+++ b/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
-import { MountPoint, UnmountCallback } from 'kibana/public';
+import { MountPoint, UnmountCallback } from '@kbn/core/public';
 import { MountPointPortal } from './mount_point_portal';
 import { act } from 'react-dom/test-utils';
 
diff --git a/src/plugins/kibana_react/public/util/mount_point_portal.tsx b/src/plugins/kibana_react/public/util/mount_point_portal.tsx
index d0753c68d1f2d..e449d5ebf7cd6 100644
--- a/src/plugins/kibana_react/public/util/mount_point_portal.tsx
+++ b/src/plugins/kibana_react/public/util/mount_point_portal.tsx
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { useRef, useEffect, useState, Component } from 'react';
 import ReactDOM from 'react-dom';
-import { MountPoint } from 'kibana/public';
+import { MountPoint } from '@kbn/core/public';
 import { useIfMounted } from './utils';
 
 interface MountPointPortalProps {
diff --git a/src/plugins/kibana_react/public/util/to_mount_point.test.tsx b/src/plugins/kibana_react/public/util/to_mount_point.test.tsx
index 74566763d9215..09755d0f5b1de 100644
--- a/src/plugins/kibana_react/public/util/to_mount_point.test.tsx
+++ b/src/plugins/kibana_react/public/util/to_mount_point.test.tsx
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { of, BehaviorSubject } from 'rxjs';
 import { useEuiTheme } from '@elastic/eui';
 import type { UseEuiTheme } from '@elastic/eui';
-import type { CoreTheme } from 'src/core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { toMountPoint } from './to_mount_point';
 
 describe('toMountPoint', () => {
diff --git a/src/plugins/kibana_react/public/util/to_mount_point.tsx b/src/plugins/kibana_react/public/util/to_mount_point.tsx
index 192f3a0ba2082..915b787a12b48 100644
--- a/src/plugins/kibana_react/public/util/to_mount_point.tsx
+++ b/src/plugins/kibana_react/public/util/to_mount_point.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { MountPoint, CoreTheme } from 'kibana/public';
+import type { MountPoint, CoreTheme } from '@kbn/core/public';
 import { KibanaThemeProvider } from '../theme';
 
 export interface ToMountPointOptions {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts
index 5acd1fb9c9c3a..9c0fab85844bb 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { SavedObjectsErrorHelpers } from '../../../../../../core/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { SAVED_OBJECTS_DAILY_TYPE, SAVED_OBJECTS_TRANSACTIONAL_TYPE } from '../saved_objects_types';
 import { rollDailyData } from './daily';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts
index 4a00818336082..7cd326eeec346 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/daily.ts
@@ -8,12 +8,8 @@
 
 import moment from 'moment';
 import type { Logger } from '@kbn/logging';
-import {
-  ISavedObjectsRepository,
-  SavedObject,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../core/server';
-import { getDailyId } from '../../../../../usage_collection/common/application_usage';
+import { ISavedObjectsRepository, SavedObject, SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { getDailyId } from '@kbn/usage-collection-plugin/common/application_usage';
 import {
   ApplicationUsageDaily,
   ApplicationUsageTransactional,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts
index 9fea955ab5d8a..e5dd0996e440d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../../usage_collection/common/constants';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
 import { SAVED_OBJECTS_DAILY_TYPE, SAVED_OBJECTS_TOTAL_TYPE } from '../saved_objects_types';
 import { rollTotals } from './total';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts
index e27c7b897d995..6c55d0f7535af 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/rollups/total.ts
@@ -7,8 +7,8 @@
  */
 
 import type { Logger } from '@kbn/logging';
-import type { ISavedObjectsRepository } from 'kibana/server';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../../usage_collection/common/constants';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
 import {
   ApplicationUsageDaily,
   ApplicationUsageTotal,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
index 9823a2589fac1..35f649f4e4e21 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/saved_objects_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectAttributes, SavedObjectsServiceSetup } from 'kibana/server';
+import type { SavedObjectAttributes, SavedObjectsServiceSetup } from '@kbn/core/server';
 
 /**
  * Used for accumulating the totals of all the stats older than 90d
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
index 4e267e0d15270..b99a65accd072 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { ApplicationUsageTelemetryReport } from './types';
 
 const commonSchema: MakeSchemaFrom<ApplicationUsageTelemetryReport[string]> = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts
index 38864945a17d0..611cfee77415e 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
-} from '../../../../usage_collection/server/mocks';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../usage_collection/common/constants';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import {
   registerApplicationUsageCollector,
   transformByApplicationViews,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
index a01f1bca4f0e0..15856c21760ce 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
@@ -8,9 +8,9 @@
 
 import moment from 'moment';
 import { timer } from 'rxjs';
-import { ISavedObjectsRepository, Logger, SavedObjectsServiceSetup } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { MAIN_APP_DEFAULT_VIEW_ID } from '../../../../usage_collection/common/constants';
+import { ISavedObjectsRepository, Logger, SavedObjectsServiceSetup } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { MAIN_APP_DEFAULT_VIEW_ID } from '@kbn/usage-collection-plugin/common/constants';
 import {
   ApplicationUsageDaily,
   ApplicationUsageTotal,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts
index b3f9c2a329468..dd1cc0381caf7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.test.ts
@@ -7,12 +7,12 @@
  */
 
 import { cloudDetailsMock, detectCloudServiceMock } from './cloud_provider_collector.test.mocks';
-import { loggingSystemMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import { registerCloudProviderUsageCollector } from './cloud_provider_collector';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts
index 2b3cbce6fa3e1..3db7edf9a0c73 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/cloud/cloud_provider_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { CloudDetector } from './detector';
 
 interface Usage {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts
index 8f78bc962dd28..a55f200a4ce25 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.test.ts
@@ -10,10 +10,10 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerConfigUsageCollector } from './register_config_usage_collector';
-import { coreUsageDataServiceMock, loggingSystemMock } from '../../../../../core/server/mocks';
-import type { ConfigUsageData } from '../../../../../core/server';
+import { coreUsageDataServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { ConfigUsageData } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts
index ad7f570432abf..71e56dbde8ab9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
-import { ConfigUsageData, CoreUsageDataStart } from '../../../../../core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { ConfigUsageData, CoreUsageDataStart } from '@kbn/core/server';
 
 export function registerConfigUsageCollector(
   usageCollection: UsageCollectionSetup,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts
index 0bb3b2ff923fa..39cd57a3d4745 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.test.ts
@@ -10,10 +10,10 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerCoreUsageCollector } from './core_usage_collector';
-import { coreUsageDataServiceMock, loggingSystemMock } from '../../../../../core/server/mocks';
-import type { CoreUsageData } from '../../../../../core/server';
+import { coreUsageDataServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { CoreUsageData } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
index a208832baf719..9e0d7cfc8e8ba 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CoreUsageData, CoreUsageDataStart } from '../../../../../core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CoreUsageData, CoreUsageDataStart } from '@kbn/core/server';
 
 export function getCoreUsageCollector(
   usageCollection: UsageCollectionSetup,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
index ee88ba1f33e10..e8ada00137da4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.test.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { CspConfig, ICspConfig } from '../../../../../core/server';
+import { CspConfig, ICspConfig } from '@kbn/core/server';
 import { createCspCollector } from './csp_collector';
-import { httpServiceMock, loggingSystemMock } from '../../../../../core/server/mocks';
+import { httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts
index fa0cd55cd3072..35be96f253cb9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/csp/csp_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup, UsageCollectorOptions } from 'src/plugins/usage_collection/server';
-import { HttpServiceSetup, CspConfig } from '../../../../../core/server';
+import { UsageCollectionSetup, UsageCollectorOptions } from '@kbn/usage-collection-plugin/server';
+import { HttpServiceSetup, CspConfig } from '@kbn/core/server';
 
 interface Usage {
   strict: boolean;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts
index 96d5240c935f8..dd3b538e090fa 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.test.ts
@@ -10,10 +10,10 @@ import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerEventLoopDelaysCollector } from './event_loop_delays_usage_collector';
-import { loggingSystemMock, savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
-import type { SavedObjectsFindResponse } from '../../../../../core/server';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts
index 774e021d7a549..c9b23038d2e35 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/event_loop_delays_usage_collector.ts
@@ -7,8 +7,8 @@
  */
 
 import { timer } from 'rxjs';
-import { SavedObjectsServiceSetup, ISavedObjectsRepository, Logger } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceSetup, ISavedObjectsRepository, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { rollDailyData } from './rollups';
 import { registerSavedObjectTypes, EventLoopDelaysDaily } from './saved_objects';
 import { eventLoopDelaysUsageSchema, EventLoopDelaysUsageReport } from './schema';
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts
index cb59d6a44b07e..844524ae18f7e 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { rollDailyData } from './daily';
-import { loggingSystemMock, savedObjectsRepositoryMock } from '../../../../../../core/server/mocks';
-import type { SavedObjectsFindResponse } from '../../../../../../core/server';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 
 describe('rollDailyData', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts
index 29072335d272b..5fb2b8fb6bd65 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/daily.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Logger } from '@kbn/logging';
-import { ISavedObjectsRepository } from '../../../../../../core/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { deleteHistogramSavedObjects } from '../saved_objects';
 
 /**
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
index d4f069560443b..8910279ab4ab4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { Logger, ISavedObjectsRepository } from '../../../../../../../core/server';
+import type { Logger, ISavedObjectsRepository } from '@kbn/core/server';
 import {
   createTestServers,
   TestElasticsearchUtils,
   TestKibanaUtils,
   createRootWithCorePlugins,
-} from '../../../../../../../core/test_helpers/kbn_server';
+} from '@kbn/core/test_helpers/kbn_server';
 import { rollDailyData } from '../daily';
-import { metricsServiceMock } from '../../../../../../../core/server/mocks';
+import { metricsServiceMock } from '@kbn/core/server/mocks';
 
 import {
   SAVED_OBJECTS_DAILY_TYPE,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts
index ddae0ff302829..e6313991d64ce 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.test.ts
@@ -11,8 +11,8 @@ import {
   serializeSavedObjectId,
   deleteHistogramSavedObjects,
 } from './saved_objects';
-import { savedObjectsRepositoryMock, metricsServiceMock } from '../../../../../core/server/mocks';
-import type { SavedObjectsFindResponse } from '../../../../../core/server/';
+import { savedObjectsRepositoryMock, metricsServiceMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 
 describe('serializeSavedObjectId', () => {
   it('returns serialized id', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts
index 57a9bb3b739c0..cf0c5372450e5 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/saved_objects.ts
@@ -10,9 +10,9 @@ import type {
   SavedObjectAttributes,
   SavedObjectsServiceSetup,
   ISavedObjectsRepository,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import moment from 'moment';
-import type { IntervalHistogram } from 'kibana/server';
+import type { IntervalHistogram } from '@kbn/core/server';
 export const SAVED_OBJECTS_DAILY_TYPE = 'event_loop_delays_daily';
 
 export interface EventLoopDelaysDaily extends SavedObjectAttributes, IntervalHistogram {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts
index 7ac0bd408c49b..0342ee9822796 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface EventLoopDelaysUsageReport {
   daily: Array<{
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts
index 92549b926eafc..0b7375191c78f 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { savedObjectsRepositoryMock, metricsServiceMock } from '../../../../../core/server/mocks';
+import { savedObjectsRepositoryMock, metricsServiceMock } from '@kbn/core/server/mocks';
 import { startTrackingEventLoopDelaysUsage } from './track_delays';
 
 describe('startTrackingEventLoopDelaysUsage', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
index 39d4cbcb84824..7e8c8fab39eaf 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
@@ -8,8 +8,8 @@
 
 import { takeUntil, finalize, map } from 'rxjs/operators';
 import { Observable, timer } from 'rxjs';
-import type { ISavedObjectsRepository } from 'kibana/server';
-import type { EventLoopDelaysMonitor } from '../../../../../core/server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import type { EventLoopDelaysMonitor } from '@kbn/core/server';
 import {
   MONITOR_EVENT_LOOP_DELAYS_START,
   MONITOR_EVENT_LOOP_DELAYS_INTERVAL,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts
index 49b1943033719..241349d3d71cb 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { Subject } from 'rxjs';
-import { loggingSystemMock, metricsServiceMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, metricsServiceMock } from '@kbn/core/server/mocks';
 import { startTrackingEventLoopDelaysThreshold } from './track_threshold';
-import { usageCountersServiceMock } from '../../../../usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 describe('startTrackingEventLoopDelaysThreshold', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
index d30db883cae60..f2322a782dbf7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
@@ -8,14 +8,14 @@
 
 import { takeUntil, finalize } from 'rxjs/operators';
 import { Observable, timer } from 'rxjs';
-import type { Logger } from 'kibana/server';
-import type { UsageCounter } from '../../../../usage_collection/server';
+import type { Logger } from '@kbn/core/server';
+import type { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import type { EventLoopDelaysMonitor } from '@kbn/core/server';
 import {
   MONITOR_EVENT_LOOP_THRESHOLD_START,
   MONITOR_EVENT_LOOP_THRESHOLD_INTERVAL,
   MONITOR_EVENT_LOOP_WARN_THRESHOLD,
 } from './constants';
-import type { EventLoopDelaysMonitor } from '../../../../../core/server';
 
 /**
  * The monitoring of the event loop starts immediately.
diff --git a/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts
index 34ab4a5be7d28..186ea64da7a95 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/localization/telemetry_localization_collector.ts
@@ -8,8 +8,8 @@
 
 import { i18nLoader } from '@kbn/i18n';
 import { size } from 'lodash';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { I18nServiceSetup } from '../../../../../core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { I18nServiceSetup } from '@kbn/core/server';
 import { getIntegrityHashes, Integrities } from './file_integrity';
 
 export interface UsageStats {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index 1abb7409709e0..7a19ff022226e 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { UsageStats } from './types';
 
 export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
index 8295342c527ab..0d7c5f5238836 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.test.ts
@@ -6,18 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, uiSettingsServiceMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, uiSettingsServiceMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import {
   registerManagementUsageCollector,
   createCollectorFetch,
 } from './telemetry_management_collector';
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
index 3c29824d96f96..b18fed38ef9e4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { UsageStats } from './types';
 import { REDACTED_KEYWORD } from '../../../common/constants';
 import { stackManagementSchema } from './schema';
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
index 54a7d3e220242..1f8f95536ee19 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.test.ts
@@ -6,17 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { Subject } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Subject } from 'rxjs';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import { registerOpsStatsCollector } from '.';
-import { OpsMetrics } from '../../../../../core/server';
-import { loggingSystemMock, metricsServiceMock } from '../../../../../core/server/mocks';
+import { OpsMetrics } from '@kbn/core/server';
+import { loggingSystemMock, metricsServiceMock } from '@kbn/core/server/mocks';
 
 const logger = loggingSystemMock.createLogger();
 
@@ -47,7 +46,7 @@ describe('telemetry_ops_stats', () => {
   });
 
   test('should return something when there is a metric', async () => {
-    const opsMetrics = await metricsServiceSetupMock.getOpsMetrics$().pipe(take(1)).toPromise();
+    const opsMetrics = await firstValueFrom(metricsServiceSetupMock.getOpsMetrics$());
     metrics$.next(opsMetrics);
     expect(collector.isReady()).toBe(true);
     expect(await collector.fetch(mockedFetchContext)).toMatchSnapshot({
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
index ca7cca2a9de8c..d8e4b35996bed 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
@@ -9,8 +9,8 @@
 import { Observable } from 'rxjs';
 import { cloneDeep, omit } from 'lodash';
 import moment from 'moment';
-import { OpsMetrics } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { OpsMetrics } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { KIBANA_STATS_TYPE } from '../../../common/constants';
 interface OpsStatsMetrics extends Omit<OpsMetrics, 'response_times' | 'collected_at'> {
   timestamp: string;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts
index 8fb75d1ae08e3..688bdf46ca56c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
 function mockGetSavedObjectsCounts<TBody>(params: TBody) {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts
index cb3c09efa0e3b..a06829062ed64 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export async function getSavedObjectsCounts(
   esClient: ElasticsearchClient,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
index 0f5152daa31a7..1768d4b0c916b 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
   createUsageCollectionSetupMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { getKibanaSavedObjectCounts, registerKibanaUsageCollector } from './kibana_usage_collector';
 
 const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
index 9bd8da2be54df..fb3d3c89537c4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { snakeCase } from 'lodash';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
index a5bda0c0b3713..2d356caec33eb 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
@@ -9,7 +9,7 @@
 import {
   createCollectorFetchContextMock,
   createUsageCollectionSetupMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerSavedObjectsCountUsageCollector } from './saved_objects_count_collector';
 
 describe('saved_objects_count_collector', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
index f541b1ef452e6..966053c76a2d3 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
 interface SavedObjectsCountUsageByType {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
index 6b70a8c97e651..4516e5174d402 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCountersSavedObject } from '../../../../../usage_collection/server';
+import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
 
 export const rawUsageCounters: UsageCountersSavedObject[] = [
   {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
index 122e637d2b20c..9d702be86aa48 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
@@ -14,9 +14,9 @@ import {
 import { BehaviorSubject } from 'rxjs';
 import { rawUiCounters } from './__fixtures__/ui_counter_saved_objects';
 import { rawUsageCounters } from './__fixtures__/usage_counter_saved_objects';
-import { savedObjectsClientMock } from '../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { UI_COUNTER_SAVED_OBJECT_TYPE } from './ui_counter_saved_object_type';
-import { USAGE_COUNTERS_SAVED_OBJECT_TYPE } from '../../../../usage_collection/server';
+import { USAGE_COUNTERS_SAVED_OBJECT_TYPE } from '@kbn/usage-collection-plugin/server';
 
 describe('transformRawUsageCounterObject', () => {
   it('transforms usage counters savedObject raw entries', () => {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
index 12c0a21f5353d..5d741a6df8e3d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
@@ -9,11 +9,6 @@
 import moment from 'moment';
 import { mergeWith } from 'lodash';
 import type { Subject } from 'rxjs';
-import {
-  UICounterSavedObject,
-  UICounterSavedObjectAttributes,
-  UI_COUNTER_SAVED_OBJECT_TYPE,
-} from './ui_counter_saved_object_type';
 
 import {
   CollectorFetchContext,
@@ -22,12 +17,17 @@ import {
   UsageCountersSavedObject,
   UsageCountersSavedObjectAttributes,
   serializeCounterKey,
-} from '../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 import {
   deserializeUiCounterName,
   serializeUiCounterName,
-} from '../../../../usage_collection/common/ui_counters';
+} from '@kbn/usage-collection-plugin/common/ui_counters';
+import {
+  UICounterSavedObject,
+  UICounterSavedObjectAttributes,
+  UI_COUNTER_SAVED_OBJECT_TYPE,
+} from './ui_counter_saved_object_type';
 
 interface UiCounterEvent {
   appName: string;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts
index 55da239d8ef2a..859a50e01401a 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/register_rollups.ts
@@ -8,7 +8,7 @@
 
 import { Subject, timer } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { Logger, ISavedObjectsRepository } from 'kibana/server';
+import { Logger, ISavedObjectsRepository } from '@kbn/core/server';
 import { ROLL_INDICES_INTERVAL, ROLL_INDICES_START } from './constants';
 import { rollUiCounterIndices } from './rollups';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts
index f69ddde6a65bd..e5414ed0d5001 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.test.ts
@@ -9,8 +9,8 @@
 import moment from 'moment';
 import * as Rx from 'rxjs';
 import { isSavedObjectOlderThan, rollUiCounterIndices } from './rollups';
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { SavedObjectsFindResult } from 'kibana/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 
 import {
   UICounterSavedObjectAttributes,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts
index d92110251c79b..ca472fe0825f9 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/rollups/rollups.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository, Logger } from 'kibana/server';
+import { ISavedObjectsRepository, Logger } from '@kbn/core/server';
 import moment from 'moment';
 import type { Subject } from 'rxjs';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts
index 4d31fc1599e3f..2d4e680a61a2f 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/ui_counter_saved_object_type.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject, SavedObjectAttributes, SavedObjectsServiceSetup } from 'kibana/server';
+import { SavedObject, SavedObjectAttributes, SavedObjectsServiceSetup } from '@kbn/core/server';
 
 export interface UICounterSavedObjectAttributes extends SavedObjectAttributes {
   count: number;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts
index cbc848bb5af46..0a5ed52ce9416 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/index.test.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, savedObjectsRepositoryMock } from '../../../../../core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
-import { registerUiMetricUsageCollector } from './';
+import { registerUiMetricUsageCollector } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts
index f14c2539379eb..d93a637ed5780 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { UIMetricUsage } from './telemetry_ui_metric_collector';
 
 const commonSchema: MakeSchemaFrom<UIMetricUsage>[string] = {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
index 582e20b9b5b96..3d49bca3bb2a4 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts
@@ -10,8 +10,8 @@ import {
   ISavedObjectsRepository,
   SavedObjectAttributes,
   SavedObjectsServiceSetup,
-} from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { uiMetricSchema } from './schema';
 
 interface UIMetricsSavedObjects extends SavedObjectAttributes {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
index d0a45fb86b1f8..344d36542646d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCountersSavedObject } from '../../../../../usage_collection/server';
+import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
 
 export const rawUsageCounters: UsageCountersSavedObject[] = [
   {
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
index ad940c825c436..3899dac73f939 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
@@ -13,7 +13,7 @@ import {
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
   UsageCountersSavedObject,
   UsageCountersSavedObjectAttributes,
-} from '../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 interface UsageCounterEvent {
   domainId: string;
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts
index 30ad993d54a8e..8237d46efb930 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/register_rollups.ts
@@ -7,7 +7,7 @@
  */
 
 import { timer } from 'rxjs';
-import { Logger, ISavedObjectsRepository } from 'kibana/server';
+import { Logger, ISavedObjectsRepository } from '@kbn/core/server';
 import { ROLL_INDICES_INTERVAL, ROLL_INDICES_START } from './constants';
 import { rollUsageCountersIndices } from './rollups';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
index c6cdaae20a8bc..4397468244a1f 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
@@ -8,13 +8,13 @@
 
 import moment from 'moment';
 import { isSavedObjectOlderThan, rollUsageCountersIndices } from './rollups';
-import { savedObjectsRepositoryMock, loggingSystemMock } from '../../../../../../core/server/mocks';
-import { SavedObjectsFindResult } from '../../../../../../core/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 
 import {
   UsageCountersSavedObjectAttributes,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-} from '../../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
index 99bbcee368d1c..621b40fb21e9c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
@@ -6,15 +6,14 @@
  * Side Public License, v 1.
  */
 
-import type { ISavedObjectsRepository, Logger } from 'kibana/server';
+import type { ISavedObjectsRepository, Logger } from '@kbn/core/server';
 import moment from 'moment';
 
-import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
-
 import {
   UsageCountersSavedObject,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-} from '../../../../../usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
+import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
 
 export function isSavedObjectOlderThan({
   numberOfDays,
diff --git a/src/plugins/kibana_usage_collection/server/index.ts b/src/plugins/kibana_usage_collection/server/index.ts
index 3b4ddd97bb3d8..2a674035ebe29 100644
--- a/src/plugins/kibana_usage_collection/server/index.ts
+++ b/src/plugins/kibana_usage_collection/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { KibanaUsageCollectionPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,
diff --git a/src/plugins/kibana_usage_collection/server/plugin.test.ts b/src/plugins/kibana_usage_collection/server/plugin.test.ts
index 75c323ba0332f..a6604ac0bc1cd 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.test.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.test.ts
@@ -10,13 +10,13 @@ import {
   coreMock,
   savedObjectsRepositoryMock,
   uiSettingsServiceMock,
-} from '../../../core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   CollectorOptions,
   createUsageCollectionSetupMock,
-} from '../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { cloudDetailsMock } from './mocks';
-import { plugin } from './';
+import { plugin } from '.';
 
 describe('kibana_usage_collection', () => {
   const pluginInstance = plugin(coreMock.createPluginInitializerContext({}));
diff --git a/src/plugins/kibana_usage_collection/server/plugin.ts b/src/plugins/kibana_usage_collection/server/plugin.ts
index 19adea4f009a2..4442757e2df68 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { Subject } from 'rxjs';
 import type {
   PluginInitializerContext,
@@ -19,8 +19,8 @@ import type {
   OpsMetrics,
   Logger,
   CoreUsageDataStart,
-} from 'src/core/server';
-import { SavedObjectsClient, EventLoopDelaysMonitor } from '../../../core/server';
+} from '@kbn/core/server';
+import { SavedObjectsClient, EventLoopDelaysMonitor } from '@kbn/core/server';
 import {
   startTrackingEventLoopDelaysUsage,
   startTrackingEventLoopDelaysThreshold,
diff --git a/src/plugins/kibana_utils/common/persistable_state/types.ts b/src/plugins/kibana_utils/common/persistable_state/types.ts
index 5491396b19615..4db588d15741f 100644
--- a/src/plugins/kibana_utils/common/persistable_state/types.ts
+++ b/src/plugins/kibana_utils/common/persistable_state/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord, Serializable } from '@kbn/utility-types';
-import { SavedObjectReference } from '../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 
 /**
  * Versioned state is a POJO JavaScript object that can be serialized to JSON,
diff --git a/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts b/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
index c8234997e338a..dae657faf7641 100644
--- a/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
+++ b/src/plugins/kibana_utils/public/core/create_start_service_getter.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { StartServicesAccessor } from '../../../../core/public';
+import { StartServicesAccessor } from '@kbn/core/public';
 import { createStartServicesGetter } from './create_start_service_getter';
 import { Defer } from '../../common/defer';
 
diff --git a/src/plugins/kibana_utils/public/core/create_start_service_getter.ts b/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
index 6a9f2e0c17b19..d81f15492c242 100644
--- a/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
+++ b/src/plugins/kibana_utils/public/core/create_start_service_getter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, StartServicesAccessor } from '../../../../core/public';
+import { CoreStart, StartServicesAccessor } from '@kbn/core/public';
 
 interface StartServices<Plugins = unknown, OwnContract = unknown, Core = CoreStart> {
   plugins: Plugins;
diff --git a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
index 6913c94a6bb5f..b5e81707a7a79 100644
--- a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
+++ b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
@@ -12,8 +12,8 @@ import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import ReactDOM from 'react-dom';
 
-import { ApplicationStart, HttpStart, ToastsSetup } from 'kibana/public';
-import type { ThemeServiceStart } from '../../../../core/public';
+import { ApplicationStart, HttpStart, ToastsSetup } from '@kbn/core/public';
+import type { ThemeServiceStart } from '@kbn/core/public';
 import { SavedObjectNotFound } from '..';
 import { KibanaThemeProvider } from '../theme';
 
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 16cfbf4abd01e..4aa6244e1b24e 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { KibanaUtilsPublicPlugin } from './plugin';
 
 export type { Get, Set, UiComponent, UiComponentInstance } from '../common';
diff --git a/src/plugins/kibana_utils/public/plugin.ts b/src/plugins/kibana_utils/public/plugin.ts
index b255aa34ccfdb..d483754da5b22 100644
--- a/src/plugins/kibana_utils/public/plugin.ts
+++ b/src/plugins/kibana_utils/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { History } from 'history';
 import { setVersion } from './set_version';
 
diff --git a/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts b/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts
index 35e80598da063..fe3a63539b28c 100644
--- a/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts
+++ b/src/plugins/kibana_utils/public/state_management/state_hash/state_hash.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Sha256 } from '../../../../../core/public/utils';
+import { Sha256 } from '@kbn/core/public/utils';
 import { hashedItemStore } from '../../storage/hashed_item_store';
 
 // This prefix is used to identify hash strings that have been encoded in the URL.
diff --git a/src/plugins/kibana_utils/public/state_management/url/errors.ts b/src/plugins/kibana_utils/public/state_management/url/errors.ts
index e2574a8abcf5a..184ac5d128bd1 100644
--- a/src/plugins/kibana_utils/public/state_management/url/errors.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/errors.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 
 export const restoreUrlErrorTitle = i18n.translate(
   'kibana_utils.stateManagement.url.restoreUrlErrorTitle',
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts
index 32704af6213b8..384bbcfd0fe01 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.test.ts
@@ -21,7 +21,7 @@ import {
   setStateToKbnUrl,
   getStateFromKbnUrl,
 } from './kbn_url_storage';
-import { ScopedHistory } from '../../../../../core/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 describe('kbn_url_storage', () => {
   describe('getStateFromUrl & setStateToUrl', () => {
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
index 3c748fab8e0c1..d9cae8bd14e52 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
@@ -10,8 +10,8 @@ import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { createMemoryHistory, History } from 'history';
 import { createKbnUrlTracker, KbnUrlTracker } from './kbn_url_tracker';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { App, AppUpdater, ToastsSetup } from 'kibana/public';
-import { coreMock } from '../../../../../core/public/mocks';
+import { App, AppUpdater, ToastsSetup } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { unhashUrl } from './hash_unhash_url';
 
 jest.mock('./hash_unhash_url', () => ({
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
index cc5903694f591..7cfb3f9a1e964 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
@@ -8,7 +8,7 @@
 
 import { createHashHistory, History, UnregisterCallback } from 'history';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { AppUpdater, ToastsSetup } from 'kibana/public';
+import { AppUpdater, ToastsSetup } from '@kbn/core/public';
 import { setStateToKbnUrl } from './kbn_url_storage';
 import { unhashUrl } from './hash_unhash_url';
 
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
index 1d659ae3fe61c..1c900aac9e539 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
@@ -11,9 +11,9 @@ import { createKbnUrlStateStorage, IKbnUrlStateStorage } from './create_kbn_url_
 import { History, createBrowserHistory } from 'history';
 import { takeUntil, toArray } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { ScopedHistory } from '../../../../../core/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { withNotifyOnErrors } from '../../state_management/url';
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('KbnUrlStateStorage', () => {
   describe('useHash: false', () => {
@@ -73,7 +73,7 @@ describe('KbnUrlStateStorage', () => {
     it('should notify about url changes', async () => {
       expect(urlStateStorage.change$).toBeDefined();
       const key = '_s';
-      const destroy$ = new Subject();
+      const destroy$ = new Subject<void>();
       const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
 
       history.push(`/#?${key}=(ok:1,test:test)`);
@@ -139,7 +139,7 @@ describe('KbnUrlStateStorage', () => {
     it('should notify about url changes', async () => {
       expect(urlStateStorage.change$).toBeDefined();
       const key = '_s';
-      const destroy$ = new Subject();
+      const destroy$ = new Subject<void>();
       const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
 
       history.push(`/#?${key}=(ok:1,test:test)`);
@@ -248,7 +248,7 @@ describe('KbnUrlStateStorage', () => {
     it('should notify about url changes', async () => {
       expect(urlStateStorage.change$).toBeDefined();
       const key = '_s';
-      const destroy$ = new Subject();
+      const destroy$ = new Subject<void>();
       const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
 
       history.push(`/?${key}=(ok:1,test:test)`);
@@ -357,7 +357,7 @@ describe('KbnUrlStateStorage', () => {
     it('should notify about url changes', async () => {
       expect(urlStateStorage.change$).toBeDefined();
       const key = '_s';
-      const destroy$ = new Subject();
+      const destroy$ = new Subject<void>();
       const result = urlStateStorage.change$!(key).pipe(takeUntil(destroy$), toArray()).toPromise();
 
       history.push(`/#?${key}=(ok:1,test:test)`);
diff --git a/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts b/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts
index 0f2176b5d4ba9..9f4174e4abdd3 100644
--- a/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts
+++ b/src/plugins/kibana_utils/public/storage/hashed_item_store/mock.ts
@@ -19,7 +19,7 @@ import { HashedItemStore } from './hashed_item_store';
  */
 export const mockStorage = new StubBrowserStorage();
 const mockHashedItemStore = new HashedItemStore(mockStorage);
-jest.mock('./', () => {
+jest.mock('.', () => {
   return {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     HashedItemStore: require('./hashed_item_store').HashedItemStore,
diff --git a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx
index 5d1bc9798ee17..bda4a5cd689b8 100644
--- a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx
+++ b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.test.tsx
@@ -14,7 +14,7 @@ import { act } from 'react-dom/test-utils';
 import { BehaviorSubject, of } from 'rxjs';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import type { CoreTheme } from 'src/core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 import { KibanaThemeProvider } from './kibana_theme_provider';
 
diff --git a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx
index 7c7963eff984b..334bcc9a7ed26 100644
--- a/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx
+++ b/src/plugins/kibana_utils/public/theme/kibana_theme_provider.tsx
@@ -12,7 +12,7 @@ import React, { useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { getColorMode } from './utils';
 
 interface KibanaThemeProviderProps {
diff --git a/src/plugins/kibana_utils/public/theme/utils.ts b/src/plugins/kibana_utils/public/theme/utils.ts
index 887e4fe61fbe1..de733c672971d 100644
--- a/src/plugins/kibana_utils/public/theme/utils.ts
+++ b/src/plugins/kibana_utils/public/theme/utils.ts
@@ -9,7 +9,7 @@
 import { COLOR_MODES_STANDARD } from '@elastic/eui';
 import type { EuiThemeColorModeStandard } from '@elastic/eui';
 
-import type { CoreTheme } from '../../../../core/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 /**
  * Copied from the `kibana_react` plugin, to avoid cyclical dependency
diff --git a/src/plugins/kibana_utils/server/report_server_error.ts b/src/plugins/kibana_utils/server/report_server_error.ts
index 57b8c4e207f72..0fcc0c34cc4a9 100644
--- a/src/plugins/kibana_utils/server/report_server_error.ts
+++ b/src/plugins/kibana_utils/server/report_server_error.ts
@@ -7,7 +7,7 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { KibanaResponseFactory } from 'kibana/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { KbnError } from '../common';
 
 export class KbnServerError extends KbnError {
diff --git a/src/plugins/management/common/locator.ts b/src/plugins/management/common/locator.ts
index bff90cea5d111..5169919846d9d 100644
--- a/src/plugins/management/common/locator.ts
+++ b/src/plugins/management/common/locator.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
+import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 import { MANAGEMENT_APP_ID } from './contants';
 
 export const MANAGEMENT_APP_LOCATOR = 'MANAGEMENT_APP_LOCATOR';
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
index 9f033637de963..bf285cbbeadd3 100644
--- a/src/plugins/management/kibana.json
+++ b/src/plugins/management/kibana.json
@@ -4,7 +4,7 @@
   "server": true,
   "ui": true,
   "optionalPlugins": ["home", "share"],
-  "requiredBundles": ["kibanaReact", "kibanaUtils", "home"],
+  "requiredBundles": ["kibanaReact", "kibanaUtils"],
   "owner": {
     "name": "Vis Editors",
     "githubTeam": "kibana-vis-editors"
diff --git a/src/plugins/management/public/application.tsx b/src/plugins/management/public/application.tsx
index 3e2c4f7c04e40..dc16faa4f6d04 100644
--- a/src/plugins/management/public/application.tsx
+++ b/src/plugins/management/public/application.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { ManagementApp, ManagementAppDependencies } from './components/management_app';
 
 export const renderApp = async (
diff --git a/src/plugins/management/public/components/management_app/management_app.tsx b/src/plugins/management/public/components/management_app/management_app.tsx
index 4d306ffd2e266..52d5eb3da0606 100644
--- a/src/plugins/management/public/components/management_app/management_app.tsx
+++ b/src/plugins/management/public/components/management_app/management_app.tsx
@@ -10,17 +10,17 @@ import './management_app.scss';
 import React, { useState, useEffect, useCallback } from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from 'kibana/public';
+import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
 
-import { ManagementSection, MANAGEMENT_BREADCRUMB } from '../../utils';
-import { ManagementRouter } from './management_router';
-import { managementSidebarNav } from '../management_sidebar_nav/management_sidebar_nav';
 import {
   KibanaPageTemplate,
   KibanaPageTemplateProps,
   reactRouterNavigate,
   KibanaThemeProvider,
-} from '../../../../kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { ManagementSection, MANAGEMENT_BREADCRUMB } from '../../utils';
+import { ManagementRouter } from './management_router';
+import { managementSidebarNav } from '../management_sidebar_nav/management_sidebar_nav';
 import { SectionsServiceStart } from '../../types';
 
 interface ManagementAppProps {
diff --git a/src/plugins/management/public/components/management_app/management_router.tsx b/src/plugins/management/public/components/management_app/management_router.tsx
index 8f52d629bdb9b..79c537451ac51 100644
--- a/src/plugins/management/public/components/management_app/management_router.tsx
+++ b/src/plugins/management/public/components/management_app/management_router.tsx
@@ -8,7 +8,7 @@
 
 import React, { memo } from 'react';
 import { Route, Router, Switch, Redirect } from 'react-router-dom';
-import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from 'kibana/public';
+import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
 import { ManagementAppWrapper } from '../management_app_wrapper';
 import { ManagementLandingPage } from '../landing';
 import { ManagementAppDependencies } from './management_app';
diff --git a/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx b/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx
index 57de84ec5aec6..5516803070f0e 100644
--- a/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx
+++ b/src/plugins/management/public/components/management_app_wrapper/management_app_wrapper.tsx
@@ -8,11 +8,11 @@
 
 import React, { createRef, Component } from 'react';
 
-import { ChromeBreadcrumb, AppMountParameters, ScopedHistory } from 'kibana/public';
+import { ChromeBreadcrumb, AppMountParameters, ScopedHistory } from '@kbn/core/public';
 import classNames from 'classnames';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { ManagementApp } from '../../utils';
 import { Unmount } from '../../types';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
 
 interface ManagementSectionWrapperProps {
   app: ManagementApp;
diff --git a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
index bf1b81061f6a9..0cfcd81b57b2a 100644
--- a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
+++ b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { sortBy } from 'lodash';
 
 import { EuiIcon, EuiSideNavItemType, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { ManagementApp, ManagementSection } from '../../utils';
 
 import { ManagementItem } from '../../utils/management_item';
-import { reactRouterNavigate } from '../../../../kibana_react/public';
 
 interface ManagementSidebarNavProps {
   sections: ManagementSection[];
diff --git a/src/plugins/management/public/index.ts b/src/plugins/management/public/index.ts
index 41d244ad44d5a..685f5dee6f15a 100644
--- a/src/plugins/management/public/index.ts
+++ b/src/plugins/management/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ManagementPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/management/public/management_sections_service.ts b/src/plugins/management/public/management_sections_service.ts
index 1b14a661159a5..7344057e2e993 100644
--- a/src/plugins/management/public/management_sections_service.ts
+++ b/src/plugins/management/public/management_sections_service.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { ManagementSection, RegisterManagementSectionArgs } from './utils';
 import {
   IngestSection,
@@ -23,7 +24,6 @@ import {
   DefinedSections,
   ManagementSectionsStartPrivate,
 } from './types';
-import { createGetterSetter } from '../../kibana_utils/public';
 
 const [getSectionsServiceStartPrivate, setSectionsServiceStartPrivate] =
   createGetterSetter<ManagementSectionsStartPrivate>('SectionsServiceStartPrivate');
diff --git a/src/plugins/management/public/mocks/index.ts b/src/plugins/management/public/mocks/index.ts
index bf9a7ff0b8216..92f6f9e1ed4ce 100644
--- a/src/plugins/management/public/mocks/index.ts
+++ b/src/plugins/management/public/mocks/index.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { ManagementSetup, ManagementStart, DefinedSections } from '../types';
-import { ManagementSection } from '../index';
-import { sharePluginMock } from '../../../share/public/mocks';
+import { ManagementSection } from '..';
 
 export const createManagementSectionMock = () =>
   ({
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
index acec140fd6521..0cdb83d4b6793 100644
--- a/src/plugins/management/public/plugin.ts
+++ b/src/plugins/management/public/plugin.ts
@@ -8,9 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
-import type { SharePluginSetup, SharePluginStart } from 'src/plugins/share/public';
-import { ManagementSetup, ManagementStart } from './types';
-import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import {
   CoreSetup,
   CoreStart,
@@ -22,7 +21,8 @@ import {
   AppStatus,
   AppNavLinkStatus,
   AppDeepLink,
-} from '../../../core/public';
+} from '@kbn/core/public';
+import { ManagementSetup, ManagementStart } from './types';
 
 import { MANAGEMENT_APP_ID } from '../common/contants';
 import { ManagementAppLocatorDefinition } from '../common/locator';
@@ -89,7 +89,7 @@ export class ManagementPlugin
         icon: 'managementApp',
         path: '/app/management',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
         visible: () => this.hasAnyEnabledApps,
       });
     }
diff --git a/src/plugins/management/public/types.ts b/src/plugins/management/public/types.ts
index 87b336928db91..5d8d963ea981e 100644
--- a/src/plugins/management/public/types.ts
+++ b/src/plugins/management/public/types.ts
@@ -7,10 +7,10 @@
  */
 
 import { Observable } from 'rxjs';
-import { ScopedHistory, Capabilities } from 'kibana/public';
-import type { LocatorPublic } from 'src/plugins/share/common';
+import { ScopedHistory, Capabilities } from '@kbn/core/public';
+import type { LocatorPublic } from '@kbn/share-plugin/common';
+import { ChromeBreadcrumb, CoreTheme } from '@kbn/core/public';
 import { ManagementSection, RegisterManagementSectionArgs } from './utils';
-import { ChromeBreadcrumb, CoreTheme } from '../../../core/public/';
 import type { ManagementAppLocatorParams } from '../common/locator';
 
 export interface ManagementSetup {
diff --git a/src/plugins/management/server/index.ts b/src/plugins/management/server/index.ts
index d6d4a89535599..69f90d0876f85 100644
--- a/src/plugins/management/server/index.ts
+++ b/src/plugins/management/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ManagementServerPlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/src/plugins/management/server/plugin.ts b/src/plugins/management/server/plugin.ts
index 13471ad73083d..d902921581ef7 100644
--- a/src/plugins/management/server/plugin.ts
+++ b/src/plugins/management/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from 'kibana/server';
-import { LocatorPublic } from 'src/plugins/share/common';
-import type { SharePluginSetup } from 'src/plugins/share/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
+import { LocatorPublic } from '@kbn/share-plugin/common';
+import type { SharePluginSetup } from '@kbn/share-plugin/server';
 import { ManagementAppLocatorDefinition, ManagementAppLocatorParams } from '../common/locator';
 import { capabilitiesProvider } from './capabilities_provider';
 
diff --git a/src/plugins/maps_ems/public/index.ts b/src/plugins/maps_ems/public/index.ts
index 9b09e1d804ae7..48158e74f3e83 100644
--- a/src/plugins/maps_ems/public/index.ts
+++ b/src/plugins/maps_ems/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'kibana/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import type { EMSClient } from '@elastic/ems-client';
 import { MapsEmsPlugin } from './plugin';
 import type { MapConfig } from '../config';
diff --git a/src/plugins/maps_ems/public/kibana_services.ts b/src/plugins/maps_ems/public/kibana_services.ts
index 6e7fe0ccd5cab..6e49b58fbae81 100644
--- a/src/plugins/maps_ems/public/kibana_services.ts
+++ b/src/plugins/maps_ems/public/kibana_services.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import type { MapConfig } from '../config';
-import { LicensingPluginStart } from '../../../../x-pack/plugins/licensing/public';
-import { ILicense } from '../../../../x-pack/plugins/licensing/common/types';
 import { LICENSE_CHECK_ID } from '../common';
 
 let kibanaVersion: string;
diff --git a/src/plugins/maps_ems/public/plugin.ts b/src/plugins/maps_ems/public/plugin.ts
index bd77a2accd0bc..eae66181737c6 100644
--- a/src/plugins/maps_ems/public/plugin.ts
+++ b/src/plugins/maps_ems/public/plugin.ts
@@ -6,17 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import {
   setKibanaVersion,
   setLicensingPluginStart,
   setMapConfig,
   getIsEnterprisePlus,
 } from './kibana_services';
-import type { MapsEmsPluginPublicSetup, MapsEmsPluginPublicStart } from './index';
+import type { MapsEmsPluginPublicSetup, MapsEmsPluginPublicStart } from '.';
 import type { MapConfig } from '../config';
 import { createEMSSettings } from '../common/ems_settings';
-import type { LicensingPluginStart } from '../../../../x-pack/plugins/licensing/public';
 import { createEMSClientLazy } from './lazy_load_bundle';
 
 interface MapsEmsStartPublicDependencies {
diff --git a/src/plugins/maps_ems/server/index.ts b/src/plugins/maps_ems/server/index.ts
index 874a8f5e7792c..a0a5cd6c7e72e 100644
--- a/src/plugins/maps_ems/server/index.ts
+++ b/src/plugins/maps_ems/server/index.ts
@@ -11,11 +11,11 @@ import {
   PluginInitializerContext,
   Plugin,
   PluginConfigDescriptor,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { MapConfig, mapConfigSchema } from '../config';
 import { EMSSettings, LICENSE_CHECK_ID } from '../common';
-import { LicensingPluginSetup } from '../../../../x-pack/plugins/licensing/server';
-import { ILicense } from '../../../../x-pack/plugins/licensing/common/types';
 export type { EMSSettings } from '../common';
 
 export const config: PluginConfigDescriptor<MapConfig> = {
diff --git a/src/plugins/navigation/public/index.ts b/src/plugins/navigation/public/index.ts
index 91b68ecab644b..904e4ed2c5e7c 100644
--- a/src/plugins/navigation/public/index.ts
+++ b/src/plugins/navigation/public/index.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new NavigationPublicPlugin(initializerContext);
 }
diff --git a/src/plugins/navigation/public/plugin.ts b/src/plugins/navigation/public/plugin.ts
index dc3d8f2043a76..9d04acdeacba6 100644
--- a/src/plugins/navigation/public/plugin.ts
+++ b/src/plugins/navigation/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   NavigationPublicPluginSetup,
   NavigationPublicPluginStart,
@@ -31,14 +31,14 @@ export class NavigationPublicPlugin
   }
 
   public start(
-    { i18n }: CoreStart,
+    core: CoreStart,
     { unifiedSearch }: NavigationPluginStartDependencies
   ): NavigationPublicPluginStart {
     const extensions = this.topNavMenuExtensionsRegistry.getAll();
 
     return {
       ui: {
-        TopNavMenu: createTopNav(unifiedSearch, extensions, i18n),
+        TopNavMenu: createTopNav(unifiedSearch, extensions),
       },
     };
   }
diff --git a/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
index a26627c84a52b..46e2ed5336f7a 100644
--- a/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
@@ -7,15 +7,14 @@
  */
 
 import React from 'react';
-import { I18nStart } from 'kibana/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
+import { I18nProvider } from '@kbn/i18n-react';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { TopNavMenuProps, TopNavMenu } from './top_nav_menu';
 import { RegisteredTopNavMenuData } from './top_nav_menu_data';
 
 export function createTopNav(
   unifiedSearch: UnifiedSearchPublicPluginStart,
-  extraConfig: RegisteredTopNavMenuData[],
-  i18n: I18nStart
+  extraConfig: RegisteredTopNavMenuData[]
 ) {
   return (props: TopNavMenuProps) => {
     const relevantConfig = extraConfig.filter(
@@ -24,9 +23,9 @@ export function createTopNav(
     const config = (props.config || []).concat(relevantConfig);
 
     return (
-      <i18n.Context>
+      <I18nProvider>
         <TopNavMenu {...props} unifiedSearch={unifiedSearch} config={config} />
-      </i18n.Context>
+      </I18nProvider>
     );
   };
 }
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
index 7d263d010d46a..85a9803ffced6 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -9,11 +9,11 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import { MountPoint } from 'kibana/public';
+import { MountPoint } from '@kbn/core/public';
 import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
-import type { UnifiedSearchPublicPluginStart } from '../../../unified_search/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 
 const unifiedSearch = {
   ui: {
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
index fcc2f08263392..7eb7365ed79f3 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -10,10 +10,10 @@ import React, { ReactElement } from 'react';
 import { EuiBadge, EuiBadgeGroup, EuiBadgeProps, EuiHeaderLinks } from '@elastic/eui';
 import classNames from 'classnames';
 
-import { MountPoint } from '../../../../core/public';
-import { MountPointPortal } from '../../../kibana_react/public';
-import { UnifiedSearchPublicPluginStart } from '../../../unified_search/public';
-import { StatefulSearchBarProps, SearchBarProps } from '../../../unified_search/public';
+import { MountPoint } from '@kbn/core/public';
+import { MountPointPortal } from '@kbn/kibana-react-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { StatefulSearchBarProps, SearchBarProps } from '@kbn/unified-search-plugin/public';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
 
diff --git a/src/plugins/navigation/public/types.ts b/src/plugins/navigation/public/types.ts
index 29b204a798fa5..40f83697cc9d6 100644
--- a/src/plugins/navigation/public/types.ts
+++ b/src/plugins/navigation/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { TopNavMenuProps, TopNavMenuExtensionsRegistrySetup } from './top_nav_menu';
-import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
 
 export interface NavigationPublicPluginSetup {
   registerMenuItem: TopNavMenuExtensionsRegistrySetup['register'];
diff --git a/src/plugins/newsfeed/public/index.ts b/src/plugins/newsfeed/public/index.ts
index f9d59ca6d99dd..31a47cb8db6c8 100644
--- a/src/plugins/newsfeed/public/index.ts
+++ b/src/plugins/newsfeed/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import {
   NewsfeedPublicPluginSetup,
   NewsfeedPublicPluginStart,
diff --git a/src/plugins/newsfeed/public/plugin.test.ts b/src/plugins/newsfeed/public/plugin.test.ts
index 3497a1e52697d..a082b81dc84be 100644
--- a/src/plugins/newsfeed/public/plugin.test.ts
+++ b/src/plugins/newsfeed/public/plugin.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { take } from 'rxjs/operators';
-import { coreMock } from '../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { NewsfeedPublicPlugin } from './plugin';
 import { NewsfeedApiEndpoint } from './lib/api';
-import { screenshotModePluginMock } from '../../screenshot_mode/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 
 describe('Newsfeed plugin', () => {
   let plugin: NewsfeedPublicPlugin;
diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx
index 04d7c18d070af..60dc5cdba8f6c 100644
--- a/src/plugins/newsfeed/public/plugin.tsx
+++ b/src/plugins/newsfeed/public/plugin.tsx
@@ -12,7 +12,7 @@ import ReactDOM from 'react-dom';
 import React from 'react';
 import moment from 'moment';
 import { I18nProvider } from '@kbn/i18n-react';
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { NewsfeedPluginBrowserConfig, NewsfeedPluginStartDependencies } from './types';
 import { NewsfeedNavButton } from './components/newsfeed_header_nav_button';
 import { getApi, NewsfeedApi, NewsfeedApiEndpoint } from './lib/api';
@@ -25,7 +25,7 @@ export class NewsfeedPublicPlugin
 {
   private readonly kibanaVersion: string;
   private readonly config: NewsfeedPluginBrowserConfig;
-  private readonly stop$ = new Rx.ReplaySubject(1);
+  private readonly stop$ = new Rx.ReplaySubject<void>(1);
 
   constructor(initializerContext: PluginInitializerContext<NewsfeedPluginBrowserConfig>) {
     this.kibanaVersion = initializerContext.env.packageInfo.version;
diff --git a/src/plugins/newsfeed/public/types.ts b/src/plugins/newsfeed/public/types.ts
index a7ff917f6f975..c681bee1e2609 100644
--- a/src/plugins/newsfeed/public/types.ts
+++ b/src/plugins/newsfeed/public/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { Duration, Moment } from 'moment';
-import type { ScreenshotModePluginStart } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
 export interface NewsfeedPluginStartDependencies {
   screenshotMode: ScreenshotModePluginStart;
 }
diff --git a/src/plugins/newsfeed/server/index.ts b/src/plugins/newsfeed/server/index.ts
index fefb725e2804e..60df08a9b95e1 100644
--- a/src/plugins/newsfeed/server/index.ts
+++ b/src/plugins/newsfeed/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { NewsfeedPlugin } from './plugin';
 import { configSchema, NewsfeedConfigType } from './config';
 
diff --git a/src/plugins/newsfeed/server/plugin.ts b/src/plugins/newsfeed/server/plugin.ts
index 882676c55a93a..179d91bec46c0 100644
--- a/src/plugins/newsfeed/server/plugin.ts
+++ b/src/plugins/newsfeed/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'kibana/server';
+import { Plugin } from '@kbn/core/server';
 
 export class NewsfeedPlugin implements Plugin {
   public setup() {}
diff --git a/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts b/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts
index 51e82d785e86c..096ffc217cc42 100644
--- a/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts
+++ b/src/plugins/presentation_util/common/lib/test_helpers/function_wrapper.ts
@@ -11,7 +11,7 @@ import {
   ExpressionValueBoxed,
   typeSpecs,
   ExpressionFunctionDefinition,
-} from '../../../../expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 type DefaultFnResultType = typeof typeSpecs[number] &
   ExpressionFunctionDefinition<
diff --git a/src/plugins/presentation_util/common/lib/utils/default_theme.ts b/src/plugins/presentation_util/common/lib/utils/default_theme.ts
index c403937016ec8..fb744534b4e46 100644
--- a/src/plugins/presentation_util/common/lib/utils/default_theme.ts
+++ b/src/plugins/presentation_util/common/lib/utils/default_theme.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
 
 export const defaultTheme$: Observable<CoreTheme> = new Observable((subscriber) =>
diff --git a/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts b/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts
index d999db22b4057..c574d18b8de31 100644
--- a/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts
+++ b/src/plugins/presentation_util/public/__stories__/fixtures/flights.ts
@@ -7,8 +7,8 @@
  */
 
 import { map, uniq } from 'lodash';
+import { DataView, DataViewField, IIndexPatternFieldList } from '@kbn/data-views-plugin/public';
 import { flights } from './flights_data';
-import { DataView, DataViewField, IIndexPatternFieldList } from '../../../../data_views/public';
 
 export type Flight = typeof flights[number];
 export type FlightField = keyof Flight;
diff --git a/src/plugins/presentation_util/public/__stories__/render.tsx b/src/plugins/presentation_util/public/__stories__/render.tsx
index 76725d08956bd..bd6463ca254d6 100644
--- a/src/plugins/presentation_util/public/__stories__/render.tsx
+++ b/src/plugins/presentation_util/public/__stories__/render.tsx
@@ -8,7 +8,7 @@
 
 import { action } from '@storybook/addon-actions';
 import React, { useRef, useEffect } from 'react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 
 export const defaultHandlers: IInterpreterRenderHandlers = {
   getRenderMode: () => 'view',
diff --git a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx
index f8c1539ecda28..29c82fda2d213 100644
--- a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx
+++ b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx
@@ -9,8 +9,8 @@
 import React, { useState } from 'react';
 
 import useMount from 'react-use/lib/useMount';
+import { DataView, DataViewListItem } from '@kbn/data-views-plugin/common';
 import { DataViewPicker } from './data_view_picker';
-import { DataView, DataViewListItem } from '../../../../data_views/common';
 import { injectStorybookDataView } from '../../services/storybook/data_views';
 import { storybookFlightsDataView } from '../../mocks';
 import { pluginServices, registry, StorybookParams } from '../../services/storybook';
diff --git a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
index ec9cb26ed3dce..47c3625971f18 100644
--- a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
+++ b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
@@ -9,9 +9,9 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { EuiPopover, EuiPopoverTitle, EuiSelectable, EuiSelectableProps } from '@elastic/eui';
-import { DataViewListItem } from '../../../../data_views/common';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 
-import { ToolbarButton, ToolbarButtonProps } from '../../../../kibana_react/public';
+import { ToolbarButton, ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 
 import './data_view_picker.scss';
 
diff --git a/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts b/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts
index 96d991719a63b..be592b430f0e5 100644
--- a/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/autocomplete.ts
@@ -14,7 +14,7 @@ import {
   ExpressionFunction,
   ExpressionFunctionParameter,
   getByAlias,
-} from '../../../../expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 const MARKER = 'EXPRESSIONS_SUGGESTION_MARKER';
 
diff --git a/src/plugins/presentation_util/public/components/expression_input/constants.ts b/src/plugins/presentation_util/public/components/expression_input/constants.ts
index f937d55cbf9bb..ab58dc3a0f2cf 100644
--- a/src/plugins/presentation_util/public/components/expression_input/constants.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/constants.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CodeEditorProps } from '../../../../kibana_react/public';
+import { CodeEditorProps } from '@kbn/kibana-react-plugin/public';
 
 export const LANGUAGE_CONFIGURATION = {
   autoClosingPairs: [
diff --git a/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx b/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx
index 648171959791f..46db57e1e20ff 100644
--- a/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx
+++ b/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { action } from '@storybook/addon-actions';
 import { Meta } from '@storybook/react';
 
-import { ExpressionFunction, ExpressionFunctionParameter, Style } from 'src/plugins/expressions';
-import { ExpressionInput } from '../expression_input';
+import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin';
+import { ExpressionInput } from '.';
 import { registerExpressionsLanguage } from './language';
 
 const content: ExpressionFunctionParameter<'string'> = {
diff --git a/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx b/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx
index dc971e1b4e5f2..24ee158494274 100644
--- a/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx
+++ b/src/plugins/presentation_util/public/components/expression_input/expression_input.tsx
@@ -12,7 +12,7 @@ import { debounce } from 'lodash';
 import type { monaco } from '@kbn/monaco';
 import usePrevious from 'react-use/lib/usePrevious';
 
-import { CodeEditor } from '../../../../kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { ExpressionInputProps } from '../types';
 import { EXPRESSIONS_LANGUAGE_ID } from '../../../common';
diff --git a/src/plugins/presentation_util/public/components/expression_input/language.ts b/src/plugins/presentation_util/public/components/expression_input/language.ts
index 6dc3c252ebb03..3035de0176b60 100644
--- a/src/plugins/presentation_util/public/components/expression_input/language.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/language.ts
@@ -7,7 +7,7 @@
  */
 
 import { monaco } from '@kbn/monaco';
-import { ExpressionFunction } from 'src/plugins/expressions/common';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { EXPRESSIONS_LANGUAGE_ID } from '../../../common';
 
 /**
diff --git a/src/plugins/presentation_util/public/components/expression_input/providers.ts b/src/plugins/presentation_util/public/components/expression_input/providers.ts
index 1b1e0e076749d..e8306bffcf496 100644
--- a/src/plugins/presentation_util/public/components/expression_input/providers.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/providers.ts
@@ -7,7 +7,7 @@
  */
 
 import { monaco } from '@kbn/monaco';
-import { ExpressionFunction } from '../../../../expressions/common';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import {
   AutocompleteSuggestion,
   getAutocompleteSuggestions,
diff --git a/src/plugins/presentation_util/public/components/expression_input/reference.ts b/src/plugins/presentation_util/public/components/expression_input/reference.ts
index 4912af60cf176..3e4ca7b185a52 100644
--- a/src/plugins/presentation_util/public/components/expression_input/reference.ts
+++ b/src/plugins/presentation_util/public/components/expression_input/reference.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunction, ExpressionFunctionParameter } from 'src/plugins/expressions/common';
+import { ExpressionFunction, ExpressionFunctionParameter } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 
 const BOLD_MD_TOKEN = '**';
diff --git a/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx b/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx
index f2462f3a25bb4..6bb48cc5fede2 100644
--- a/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx
+++ b/src/plugins/presentation_util/public/components/field_picker/field_picker.stories.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { FieldPicker } from './field_picker';
-import { DataViewField } from '../../../../data_views/common';
 import { storybookFlightsDataView } from '../../mocks';
 
 export default {
diff --git a/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx b/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx
index f9fb6f985b629..b47e425f67bb2 100644
--- a/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx
+++ b/src/plugins/presentation_util/public/components/field_picker/field_picker.tsx
@@ -13,8 +13,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiText } from '@elastic/eui';
 import { FieldButton, FieldIcon } from '@kbn/react-field';
 
+import { DataView, DataViewField } from '@kbn/data-views-plugin/common';
 import { FieldSearch } from './field_search';
-import { DataView, DataViewField } from '../../../../data_views/common';
 
 import './field_picker.scss';
 
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
index 40fdab429ae55..4e0a7886d8795 100644
--- a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_context.ts
@@ -7,12 +7,12 @@
  */
 import { createContext, useContext } from 'react';
 
+import type { ContainerInput, EmbeddableInput } from '@kbn/embeddable-plugin/public';
 import type {
   GenericEmbeddableReducers,
   ReduxContainerContextServices,
   ReduxEmbeddableContextServices,
 } from './types';
-import type { ContainerInput, EmbeddableInput } from '../../../../embeddable/public';
 
 /**
  * When creating the context, a generic EmbeddableInput as placeholder is used. This will later be cast to
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
index a23dcf944812b..7b7ac93c14a97 100644
--- a/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/redux_embeddable_wrapper.tsx
@@ -14,19 +14,19 @@ import { debounceTime, finalize } from 'rxjs/operators';
 import { Filter } from '@kbn/es-query';
 import { isEqual } from 'lodash';
 
-import {
-  ReduxEmbeddableWrapperProps,
-  ReduxContainerContextServices,
-  ReduxEmbeddableContextServices,
-  ReduxEmbeddableWrapperPropsWithChildren,
-} from './types';
 import {
   IContainer,
   IEmbeddable,
   EmbeddableInput,
   EmbeddableOutput,
   isErrorEmbeddable,
-} from '../../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import {
+  ReduxEmbeddableWrapperProps,
+  ReduxContainerContextServices,
+  ReduxEmbeddableContextServices,
+  ReduxEmbeddableWrapperPropsWithChildren,
+} from './types';
 import { getManagedEmbeddablesStore } from './generic_embeddable_store';
 import { ReduxEmbeddableContext, useReduxEmbeddableContext } from './redux_embeddable_context';
 
diff --git a/src/plugins/presentation_util/public/components/redux_embeddables/types.ts b/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
index 4fcc01ed51c48..72d5d87821ae4 100644
--- a/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
+++ b/src/plugins/presentation_util/public/components/redux_embeddables/types.ts
@@ -20,7 +20,7 @@ import {
   EmbeddableOutput,
   IContainer,
   IEmbeddable,
-} from '../../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 
 export interface GenericEmbeddableReducers<InputType> {
   /**
diff --git a/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx b/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
index 6c36cf8b8e3a7..a13d7f0c76d5b 100644
--- a/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
+++ b/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx
@@ -10,7 +10,7 @@ import React, { useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { OnSaveProps, SavedObjectSaveModal } from '../../../../plugins/saved_objects/public';
+import { OnSaveProps, SavedObjectSaveModal } from '@kbn/saved-objects-plugin/public';
 
 import { pluginServices } from '../services';
 import { SaveModalDashboardProps } from './types';
diff --git a/src/plugins/presentation_util/public/components/types.ts b/src/plugins/presentation_util/public/components/types.ts
index ea2e9e4773de5..dc63726c38fd2 100644
--- a/src/plugins/presentation_util/public/components/types.ts
+++ b/src/plugins/presentation_util/public/components/types.ts
@@ -10,9 +10,9 @@ import type { MutableRefObject } from 'react';
 import type { monaco } from '@kbn/monaco';
 import type { CSSProperties, HTMLAttributes } from 'react';
 
-import type { ExpressionFunction } from '../../../expressions/common';
+import type { ExpressionFunction } from '@kbn/expressions-plugin/common';
 
-import { OnSaveProps, SaveModalState } from '../../../../plugins/saved_objects/public';
+import { OnSaveProps, SaveModalState } from '@kbn/saved-objects-plugin/public';
 
 interface SaveModalDocumentInfo {
   id?: string;
diff --git a/src/plugins/presentation_util/public/index.ts b/src/plugins/presentation_util/public/index.ts
index 61e677f7231ce..35b13d248d8c8 100644
--- a/src/plugins/presentation_util/public/index.ts
+++ b/src/plugins/presentation_util/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110893
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { ExpressionFunction } from 'src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { PresentationUtilPlugin } from './plugin';
 import { pluginServices } from './services';
 
diff --git a/src/plugins/presentation_util/public/mocks.ts b/src/plugins/presentation_util/public/mocks.ts
index b569cb7436668..53cbce3469c67 100644
--- a/src/plugins/presentation_util/public/mocks.ts
+++ b/src/plugins/presentation_util/public/mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { PresentationUtilPluginStart } from './types';
 import { pluginServices } from './services';
 import { registry } from './services/kibana';
diff --git a/src/plugins/presentation_util/public/plugin.ts b/src/plugins/presentation_util/public/plugin.ts
index 9cd9027a53e76..de6898b107a2d 100644
--- a/src/plugins/presentation_util/public/plugin.ts
+++ b/src/plugins/presentation_util/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { pluginServices } from './services';
 import { registry } from './services/kibana';
 import {
diff --git a/src/plugins/presentation_util/public/services/create/factory.ts b/src/plugins/presentation_util/public/services/create/factory.ts
index 49ed5ef8aaf8d..b606693f31463 100644
--- a/src/plugins/presentation_util/public/services/create/factory.ts
+++ b/src/plugins/presentation_util/public/services/create/factory.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { CoreStart, AppUpdater, PluginInitializerContext } from 'src/core/public';
+import { CoreStart, AppUpdater, PluginInitializerContext } from '@kbn/core/public';
 
 /**
  * A factory function for creating a service.
diff --git a/src/plugins/presentation_util/public/services/dashboards.ts b/src/plugins/presentation_util/public/services/dashboards.ts
index cbca79223063b..1ee60f6a3b26b 100644
--- a/src/plugins/presentation_util/public/services/dashboards.ts
+++ b/src/plugins/presentation_util/public/services/dashboards.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SimpleSavedObject } from 'src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { PartialDashboardAttributes } from './kibana/dashboards';
 
 export interface PresentationDashboardsService {
diff --git a/src/plugins/presentation_util/public/services/data_views.ts b/src/plugins/presentation_util/public/services/data_views.ts
index 9ab260034a1db..8393c419e6873 100644
--- a/src/plugins/presentation_util/public/services/data_views.ts
+++ b/src/plugins/presentation_util/public/services/data_views.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export interface PresentationDataViewsService {
   get: DataViewsPublicPluginStart['get'];
diff --git a/src/plugins/presentation_util/public/services/labs.ts b/src/plugins/presentation_util/public/services/labs.ts
index 70c40eaafa2ef..0a1fbe31c34b8 100644
--- a/src/plugins/presentation_util/public/services/labs.ts
+++ b/src/plugins/presentation_util/public/services/labs.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   EnvironmentName,
   projectIDs,
diff --git a/src/plugins/presentation_util/public/services/storybook/data_views.ts b/src/plugins/presentation_util/public/services/storybook/data_views.ts
index ecdd3d48c4658..4ae31925deca0 100644
--- a/src/plugins/presentation_util/public/services/storybook/data_views.ts
+++ b/src/plugins/presentation_util/public/services/storybook/data_views.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { PluginServiceFactory } from '../create';
 import { PresentationDataViewsService } from '../data_views';
-import { DataViewsPublicPluginStart } from '../../../../data_views/public';
-import { DataView } from '../../../../data_views/common';
 
 export type DataViewsServiceFactory = PluginServiceFactory<PresentationDataViewsService>;
 
diff --git a/src/plugins/presentation_util/public/types.ts b/src/plugins/presentation_util/public/types.ts
index a918ee3adaf35..2cda0aa4bf557 100644
--- a/src/plugins/presentation_util/public/types.ts
+++ b/src/plugins/presentation_util/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { registerExpressionsLanguage } from '.';
 import { PresentationLabsService } from './services/labs';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PresentationUtilPluginSetup {}
diff --git a/src/plugins/presentation_util/server/plugin.ts b/src/plugins/presentation_util/server/plugin.ts
index eb55373920625..eb488a6cb45b1 100644
--- a/src/plugins/presentation_util/server/plugin.ts
+++ b/src/plugins/presentation_util/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { getUISettings } from './ui_settings';
 
 export class PresentationUtilPlugin implements Plugin<object, object> {
diff --git a/src/plugins/presentation_util/server/ui_settings.ts b/src/plugins/presentation_util/server/ui_settings.ts
index 450354832c3ac..54bd082bad655 100644
--- a/src/plugins/presentation_util/server/ui_settings.ts
+++ b/src/plugins/presentation_util/server/ui_settings.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { UiSettingsParams } from '@kbn/core/types';
 import { projects, projectIDs, ProjectID } from '../common';
 
 export const SETTING_CATEGORY = 'Presentation Labs';
diff --git a/src/plugins/presentation_util/storybook/decorator.tsx b/src/plugins/presentation_util/storybook/decorator.tsx
index 0f97de79daa85..8a6c112635302 100644
--- a/src/plugins/presentation_util/storybook/decorator.tsx
+++ b/src/plugins/presentation_util/storybook/decorator.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
+import { KibanaContextProvider as KibanaReactProvider } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../public/services';
 import { PresentationUtilServices } from '../public/services';
 import { providers, StorybookParams } from '../public/services/storybook';
 import { PluginServiceRegistry } from '../public/services/create';
-import { KibanaContextProvider as KibanaReactProvider } from '../../kibana_react/public';
 
 const settings = new Map();
 settings.set('darkMode', true);
diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
index 758ae14db8e17..7a447b88c83ff 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx
@@ -25,7 +25,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 import * as sinon from 'sinon';
 import { SavedObjectFinderUi as SavedObjectFinder } from './saved_object_finder';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('SavedObjectsFinder', () => {
   const doc = {
diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
index a4c8f1f64276b..9d4c801733263 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
@@ -36,7 +36,7 @@ import {
   CoreStart,
   IUiSettingsClient,
   SavedObjectsStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import { LISTING_LIMIT_SETTING } from '../../common';
 
diff --git a/src/plugins/saved_objects/public/plugin.ts b/src/plugins/saved_objects/public/plugin.ts
index 236bbb921340f..dda247b191a3a 100644
--- a/src/plugins/saved_objects/public/plugin.ts
+++ b/src/plugins/saved_objects/public/plugin.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, Plugin } from 'src/core/public';
+import { CoreStart, Plugin } from '@kbn/core/public';
 
 import './index.scss';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import {
   createSavedObjectClass,
   SavedObjectDecoratorRegistry,
   SavedObjectDecoratorConfig,
 } from './saved_object';
-import { DataPublicPluginStart } from '../../data/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
 import { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common';
 import { SavedObject } from './types';
 
diff --git a/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx
index ec25c06c3c54b..7903faeb509c0 100644
--- a/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx
+++ b/src/plugins/saved_objects/public/save_modal/show_saved_object_save_modal.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { I18nStart } from '../../../../core/public';
+import { I18nStart } from '@kbn/core/public';
 
 /**
  * Represents the result of trying to persist the saved object.
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
index 40baff22f52c8..d26f0e5c602f7 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
@@ -7,13 +7,13 @@
  */
 
 import { cloneDeep, defaults, forOwn, assign } from 'lodash';
-import { EsResponse, SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../../types';
-import { SavedObjectNotFound } from '../../../../kibana_utils/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import {
   IndexPattern,
   injectSearchSourceReferences,
   parseSearchSourceJSON,
-} from '../../../../data/public';
+} from '@kbn/data-plugin/public';
+import { EsResponse, SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../../types';
 import { expandShorthand } from './field_mapping';
 
 /**
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx b/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
index b1093873f730e..6b09d4118d7dc 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
+++ b/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
@@ -7,10 +7,10 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export function confirmModalPromise(
   message = '',
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
index 7ed729b4b7a0f..66d67b0496429 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import { SavedObject, SavedObjectKibanaServices } from '../../types';
 import { OVERWRITE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts b/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
index b82c16456efbd..0957400e9f956 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 import { SAVE_DUPLICATE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 import { SavedObject } from '../../types';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts
index 26e62e3d61aeb..ee780d279ed7b 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { expandShorthand } from './mapping_setup';
-import { ES_FIELD_TYPES } from '../../../../../data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 describe('mapping_setup', () => {
   it('allows shortcuts for field types by just setting the value to the type name', () => {
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts
index 0acbc7877565a..766d631204dc2 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/mapping_setup.ts
@@ -7,10 +7,10 @@
  */
 
 import { mapValues, isString } from 'lodash';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { FieldMappingSpec, MappingObject } from './types';
 
 // import from ./common/types to prevent circular dependency of kibana_utils <-> data plugin
-import { ES_FIELD_TYPES } from '../../../../../data/public';
 
 /** @private */
 type ShorthandFieldMapObject = FieldMappingSpec | ES_FIELD_TYPES | 'json';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts
index cb6a96fe175ec..142d24d5a9432 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/field_mapping/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ES_FIELD_TYPES } from '../../../../../data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 /** @public */
 export interface FieldMappingSpec {
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
index d61fe1c13eee4..398c00b27e4e9 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
@@ -7,11 +7,7 @@
  */
 
 import { findObjectByTitle } from './find_object_by_title';
-import {
-  SimpleSavedObject,
-  SavedObjectsClientContract,
-  SavedObject,
-} from '../../../../../core/public';
+import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from '@kbn/core/public';
 
 describe('findObjectByTitle', () => {
   const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
index f5a38dd74321e..53b05265eecb7 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectsClientContract,
   SimpleSavedObject,
   SavedObjectAttributes,
-} from '../../../../../core/public';
+} from '@kbn/core/public';
 
 /**
  * Returns an object matching a given title
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts b/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
index 64843ce9260d2..b8aa5d386cd35 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
-import { DataViewsContract } from '../../../../data_views/public';
 
 /**
  * After creation or fetching from ES, ensure that the searchSources index indexPattern
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
index b6dddf8d82b72..5f67c471c3862 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
@@ -7,7 +7,7 @@
  */
 
 import { cloneDeep, assign } from 'lodash';
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
 
 /**
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
index bd5e632f80435..bc51775dda428 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from 'kibana/public';
-import { SavedObjectsClientContract } from '../../../../../core/public';
+import { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from '@kbn/core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { saveWithConfirmation } from './save_with_confirmation';
 import * as deps from './confirm_modal_promise';
 import { OVERWRITE_REJECTED } from '../../constants';
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
index 527a666c79c73..3f4ddbf9836d9 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts
@@ -13,7 +13,7 @@ import {
   SavedObjectsCreateOptions,
   OverlayStart,
   SavedObjectsClientContract,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { OVERWRITE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
index c5e6e158a2cbd..108b297c50377 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
@@ -7,8 +7,8 @@
  */
 
 import { forOwn } from 'lodash';
+import { extractSearchSourceReferences } from '@kbn/data-plugin/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
-import { extractSearchSourceReferences } from '../../../../data/public';
 import { expandShorthand } from './field_mapping';
 
 export function serializeSavedObject(savedObject: SavedObject, config: SavedObjectConfig) {
diff --git a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
index 01fc75df459bc..d53d9981957d9 100644
--- a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
@@ -15,11 +15,11 @@ import {
 } from '../types';
 import { SavedObjectDecorator } from './decorators';
 
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock, createSearchSourceMock } from '../../../../plugins/data/public/mocks';
-import { createStubIndexPattern } from '../../../../plugins/data/common/stubs';
-import { SavedObjectAttributes, SimpleSavedObject } from 'kibana/public';
-import { DataView } from '../../../data/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock, createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
+import { createStubIndexPattern } from '@kbn/data-plugin/common/stubs';
+import { SavedObjectAttributes, SimpleSavedObject } from '@kbn/core/public';
+import { DataView } from '@kbn/data-plugin/common';
 import { savedObjectsDecoratorRegistryMock } from './decorators/registry.mock';
 
 describe('Saved Object', () => {
diff --git a/src/plugins/saved_objects/public/types.ts b/src/plugins/saved_objects/public/types.ts
index c0848307b8b61..a7a3029db1ba1 100644
--- a/src/plugins/saved_objects/public/types.ts
+++ b/src/plugins/saved_objects/public/types.ts
@@ -12,14 +12,14 @@ import {
   SavedObjectsClientContract,
   SavedObjectAttributes,
   SavedObjectReference,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import {
   IndexPattern,
   ISearchSource,
   ISearchStart,
   SerializedSearchSourceFields,
-} from '../../data/public';
-import { DataViewsContract } from '../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 /**
  * @deprecated
diff --git a/src/plugins/saved_objects/server/plugin.ts b/src/plugins/saved_objects/server/plugin.ts
index 0343ad04336e5..c540846a191f8 100644
--- a/src/plugins/saved_objects/server/plugin.ts
+++ b/src/plugins/saved_objects/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { uiSettings } from './ui_settings';
 
 export class SavedObjectsServerPlugin implements Plugin<object, object> {
diff --git a/src/plugins/saved_objects/server/ui_settings.ts b/src/plugins/saved_objects/server/ui_settings.ts
index 4fa1fb221b42f..6028a1a57f83c 100644
--- a/src/plugins/saved_objects/server/ui_settings.ts
+++ b/src/plugins/saved_objects/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common';
 
 export const uiSettings: Record<string, UiSettingsParams> = {
diff --git a/src/plugins/saved_objects_management/common/types.ts b/src/plugins/saved_objects_management/common/types.ts
index cb771a2aa0ab6..957fec6a87e53 100644
--- a/src/plugins/saved_objects_management/common/types.ts
+++ b/src/plugins/saved_objects_management/common/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject } from 'src/core/types';
-import type { SavedObjectsNamespaceType } from 'src/core/public';
+import type { SavedObject } from '@kbn/core/types';
+import type { SavedObjectsNamespaceType } from '@kbn/core/public';
 
 /**
  * The metadata injected into a {@link SavedObject | saved object} when returning
diff --git a/src/plugins/saved_objects_management/kibana.json b/src/plugins/saved_objects_management/kibana.json
index 4e9977915f5cd..f9f0df88b9920 100644
--- a/src/plugins/saved_objects_management/kibana.json
+++ b/src/plugins/saved_objects_management/kibana.json
@@ -10,5 +10,5 @@
   "requiredPlugins": ["management", "data", "dataViews"],
   "optionalPlugins": ["home", "savedObjectsTaggingOss", "spaces"],
   "extraPublicDirs": ["public/lib"],
-  "requiredBundles": ["kibanaReact", "home"]
+  "requiredBundles": ["kibanaReact"]
 }
diff --git a/src/plugins/saved_objects_management/public/index.ts b/src/plugins/saved_objects_management/public/index.ts
index 99ffae349bb48..d9aad59688fb5 100644
--- a/src/plugins/saved_objects_management/public/index.ts
+++ b/src/plugins/saved_objects_management/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 export type {
diff --git a/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts b/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts
index 1d29a39b5c7e4..370939d62e1d2 100644
--- a/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/bulk_get_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { SavedObjectWithMetadata } from '../types';
 
 export async function bulkGetObjects(
diff --git a/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts b/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
index 7a50bb9897987..eb14f96c700ec 100644
--- a/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
+++ b/src/plugins/saved_objects_management/public/lib/fetch_export_by_type_and_search.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsFindOptionsReference } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptionsReference } from '@kbn/core/public';
 
 export async function fetchExportByTypeAndSearch({
   http,
diff --git a/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts b/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
index 401bd882aea9d..d6d8d9a7c01ae 100644
--- a/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/fetch_export_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 export async function fetchExportObjects(
   http: HttpStart,
diff --git a/src/plugins/saved_objects_management/public/lib/find_objects.ts b/src/plugins/saved_objects_management/public/lib/find_objects.ts
index 9dafae0be303f..aff66e0a08cc6 100644
--- a/src/plugins/saved_objects_management/public/lib/find_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/find_objects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsFindOptions } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptions } from '@kbn/core/public';
 import { keysToCamelCaseShallow } from './case_conversion';
 import { SavedObjectWithMetadata } from '../types';
 
diff --git a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
index b2465e09a3888..7e68dbc6be37d 100644
--- a/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_allowed_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 
 interface GetAllowedTypesResponse {
diff --git a/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
index 26841b43e909e..c52ce26e96a39 100644
--- a/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectGetRelationshipsResponse } from '../types';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getRelationships } from './get_relationships';
 
 describe('getRelationships', () => {
diff --git a/src/plugins/saved_objects_management/public/lib/get_relationships.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
index 9002442f6db9c..f0431144573d4 100644
--- a/src/plugins/saved_objects_management/public/lib/get_relationships.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { get } from 'lodash';
 import { SavedObjectGetRelationshipsResponse } from '../types';
 
diff --git a/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
index ebe4c9c2f376d..6d31d7085606a 100644
--- a/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_saved_object_counts.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsFindOptionsReference } from 'src/core/public';
+import { HttpStart, SavedObjectsFindOptionsReference } from '@kbn/core/public';
 
 export async function getSavedObjectCounts({
   http,
diff --git a/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts b/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts
index 533797aa8e526..8f5114224e9aa 100644
--- a/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_tag_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { taggingApiMock } from '../../../saved_objects_tagging_oss/public/mocks';
+import { taggingApiMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
 import { getTagFindReferences } from './get_tag_references';
 
 const tagNameToRef = (name: string) => ({
diff --git a/src/plugins/saved_objects_management/public/lib/get_tag_references.ts b/src/plugins/saved_objects_management/public/lib/get_tag_references.ts
index 835545b1477a5..fbeec9113cd6d 100644
--- a/src/plugins/saved_objects_management/public/lib/get_tag_references.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_tag_references.ts
@@ -7,8 +7,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsFindOptionsReference } from 'kibana/server';
-import { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/server';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 export const getTagFindReferences = ({
   selectedTags,
diff --git a/src/plugins/saved_objects_management/public/lib/import_file.ts b/src/plugins/saved_objects_management/public/lib/import_file.ts
index c3e984c6dd38e..a9774b306557b 100644
--- a/src/plugins/saved_objects_management/public/lib/import_file.ts
+++ b/src/plugins/saved_objects_management/public/lib/import_file.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, SavedObjectsImportResponse } from 'src/core/public';
+import { HttpStart, SavedObjectsImportResponse } from '@kbn/core/public';
 import { ImportMode } from '../management_section/objects_table/components/import_mode_control';
 
 export async function importFile(
diff --git a/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
index c44003eeaf071..6e354d994220b 100644
--- a/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectsImportUnknownError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportResponse,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { processImportResponse } from './process_import_response';
 
 describe('processImportResponse()', () => {
diff --git a/src/plugins/saved_objects_management/public/lib/process_import_response.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
index 67c66bce1b331..4f2624c73ed1e 100644
--- a/src/plugins/saved_objects_management/public/lib/process_import_response.ts
+++ b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
@@ -16,7 +16,7 @@ import {
   SavedObjectsImportFailure,
   SavedObjectsImportSuccess,
   SavedObjectsImportWarning,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 export interface FailedImport {
   obj: Omit<SavedObjectsImportFailure, 'error'>;
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
index 6e6b15f5ec135..c9a206925564e 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsImportUnknownError } from 'src/core/public';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { SavedObjectsImportUnknownError } from '@kbn/core/public';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { resolveImportErrors } from './resolve_import_errors';
 
 function getFormData(form: Map<string, any>) {
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
index b6699385f20e4..9e90627096742 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectsImportRetry,
   SavedObjectsImportResponse,
   SavedObjectsImportAmbiguousConflictError,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { Required } from '@kbn/utility-types';
 import { FailedImport, ProcessedImportResponse } from './process_import_response';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
index bca3741bf2741..b3822d92e4aab 100644
--- a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -12,12 +12,12 @@ import { Router, Switch, Route } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import { CoreSetup } from 'src/core/public';
-import { wrapWithTheme } from '../../../kibana_react/public';
-import { ManagementAppMountParams } from '../../../management/public';
+import { CoreSetup } from '@kbn/core/public';
+import { wrapWithTheme } from '@kbn/kibana-react-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 import { StartDependencies, SavedObjectsManagementPluginStart } from '../plugin';
-import { getAllowedTypes } from './../lib';
+import { getAllowedTypes } from '../lib';
 
 interface MountParams {
   core: CoreSetup<StartDependencies, SavedObjectsManagementPluginStart>;
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx
index 58d6da8ce935b..b904bd8035627 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/inspect.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { XJsonLang } from '@kbn/monaco';
 import { omit } from 'lodash';
 import { EuiButtonEmpty, EuiCopy, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { CodeEditor } from '../../../../../kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { SavedObjectWithMetadata } from '../../../../common';
 
 export interface InspectProps {
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
index 40936d27589a9..61fda64215301 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n-react';
 import { NotFoundErrors } from './not_found_errors';
-import { docLinksServiceMock } from '../../../../../../core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 describe('NotFoundErrors component', () => {
   const mountError = (type: string) =>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
index 56a317b54c4fd..c6cf64115d6a2 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
@@ -11,7 +11,7 @@ import { EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiLink } from '@elastic/eui';
-import { DocLinksStart } from '../../../../../../core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 interface NotFoundErrors {
   type: string;
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx
index ba0a584a94074..fd7d71a39dcd2 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.test.tsx
@@ -21,7 +21,7 @@ import {
   uiSettingsServiceMock,
   scopedHistoryMock,
   docLinksServiceMock,
-} from '../../../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 
 import {
   SavedObjectEdition,
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
index 64b6e27309dd2..6a695858fca35 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/saved_object_view.tsx
@@ -10,7 +10,7 @@ import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { get } from 'lodash';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   Capabilities,
   SavedObjectsClientContract,
@@ -20,7 +20,7 @@ import {
   HttpSetup,
   IUiSettingsClient,
   DocLinksStart,
-} from '../../../../../core/public';
+} from '@kbn/core/public';
 import { Header, Inspect, NotFoundErrors } from './components';
 import { bulkGetObjects } from '../../lib/bulk_get_objects';
 import { SavedObjectWithMetadata } from '../../types';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 03f30d65cbaf8..f7026af66c500 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -104,9 +104,9 @@ exports[`SavedObjectsTable should render normally 1`] = `
     application={
       Object {
         "applications$": BehaviorSubject {
-          "_isScalar": false,
           "_value": Map {},
           "closed": false,
+          "currentObservers": null,
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -123,10 +123,9 @@ exports[`SavedObjectsTable should render normally 1`] = `
           },
         },
         "currentAppId$": Observable {
-          "_isScalar": false,
           "source": Subject {
-            "_isScalar": false,
             "closed": false,
+            "currentObservers": null,
             "hasError": false,
             "isStopped": false,
             "observers": Array [],
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
index 62a1c6357df05..9509d72bdad40 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
@@ -10,10 +10,10 @@ import { importFileMock, resolveImportErrorsMock } from './flyout.test.mocks';
 
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
-import { coreMock, httpServiceMock } from '../../../../../../core/public/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/public/mocks';
 import { Flyout, FlyoutProps, FlyoutState } from './flyout';
 import { ShallowWrapper } from 'enzyme';
-import { dataPluginMock } from '../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 const mockFile = {
   name: 'foo.ndjson',
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index 5b0408110fd85..dd46606a60316 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -31,9 +31,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { HttpStart, IBasePath } from 'src/core/public';
-import { ISearchStart } from '../../../../../data/public';
-import type { DataViewsContract, DataView } from '../../../../../data_views/public';
+import { HttpStart, IBasePath } from '@kbn/core/public';
+import { ISearchStart } from '@kbn/data-plugin/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import {
   importFile,
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
index 03d3631398cda..bb949f855ff18 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { mountWithI18nProvider } from '@kbn/test-jest-helpers';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { ImportSummary, ImportSummaryProps } from './import_summary';
 import { FailedImport } from '../../../lib';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
index 016ba282c561f..70788ac04af4b 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
@@ -27,7 +27,7 @@ import type {
   SavedObjectsImportSuccess,
   SavedObjectsImportWarning,
   IBasePath,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { getDefaultTitle, getSavedObjectLabel, FailedImport } from '../../../lib';
 import './import_summary.scss';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
index 751335e4670d9..adb920d3a6133 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { shallowWithI18nProvider } from '@kbn/test-jest-helpers';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { Relationships, RelationshipsProps } from './relationships';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
index 9fef685250937..75614ba83ec16 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
@@ -24,7 +24,7 @@ import {
 import { SearchFilterConfig } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { IBasePath } from 'src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
 import {
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
index c0b795f9e9610..4ee1510a7627c 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallowWithI18nProvider, mountWithI18nProvider } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { keys } from '@elastic/eui';
-import { httpServiceMock } from '../../../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { actionServiceMock } from '../../../services/action_service.mock';
 import { columnServiceMock } from '../../../services/column_service.mock';
 import { Table, TableProps } from './table';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
index fb0e55fb272a1..ff5d49da99c61 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart, IBasePath } from 'src/core/public';
+import { ApplicationStart, IBasePath } from '@kbn/core/public';
 import React, { PureComponent, Fragment } from 'react';
 import {
   EuiSearchBar,
@@ -27,7 +27,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedObjectsTaggingApi } from '../../../../../saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../../../common/types';
 import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
 import { SavedObjectWithMetadata } from '../../../types';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index 5382cc39989ed..28a31890664b9 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -26,9 +26,9 @@ import {
   notificationServiceMock,
   savedObjectsServiceMock,
   applicationServiceMock,
-} from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { dataViewPluginMocks } from '../../../../data_views/public/mocks';
+} from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import type { SavedObjectManagementTypeInfo } from '../../../common/types';
 import { actionServiceMock } from '../../services/action_service.mock';
 import { columnServiceMock } from '../../services/column_service.mock';
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
index 12ef7ba075cdb..c8330e0eb9cf3 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -19,10 +19,11 @@ import {
   OverlayStart,
   NotificationsStart,
   ApplicationStart,
-} from 'src/core/public';
-import { RedirectAppLinks } from '../../../../kibana_react/public';
-import { SavedObjectsTaggingApi } from '../../../../saved_objects_tagging_oss/public';
-import { DataViewsContract } from '../../../../data_views/public';
+} from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../../common/types';
 import {
   parseQuery,
@@ -49,7 +50,6 @@ import {
   DeleteConfirmModal,
   ExportModal,
 } from './components';
-import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 
 interface ExportAllOption {
   id: string;
diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx
index 8d71a6429490e..f77c7bfed86d6 100644
--- a/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_edition_page.tsx
@@ -10,8 +10,8 @@ import React, { useEffect } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
 import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
-import { CoreStart, ChromeBreadcrumb, ScopedHistory } from 'src/core/public';
-import { RedirectAppLinks } from '../../../kibana_react/public';
+import { CoreStart, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { SavedObjectEdition } from './object_view';
 import './saved_objects_edition_page.scss';
 
diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
index 129c35a6a93f9..dac81d87730c0 100644
--- a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
@@ -12,11 +12,11 @@ import { get } from 'lodash';
 import { Query } from '@elastic/eui';
 import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
-import { CoreStart, ChromeBreadcrumb } from 'src/core/public';
-import type { SpacesApi, SpacesContextProps } from '../../../../../x-pack/plugins/spaces/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsContract } from '../../../data_views/public';
-import { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
+import { CoreStart, ChromeBreadcrumb } from '@kbn/core/public';
+import type { SpacesApi, SpacesContextProps } from '@kbn/spaces-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 import {
   SavedObjectsManagementActionServiceStart,
diff --git a/src/plugins/saved_objects_management/public/plugin.test.ts b/src/plugins/saved_objects_management/public/plugin.test.ts
index 311cd811c455a..14f5a45d3bb94 100644
--- a/src/plugins/saved_objects_management/public/plugin.test.ts
+++ b/src/plugins/saved_objects_management/public/plugin.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/public/mocks';
-import { homePluginMock } from '../../home/public/mocks';
-import { managementPluginMock } from '../../management/public/mocks';
-import { dataViewPluginMocks } from '../../data_views/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 describe('SavedObjectsManagementPlugin', () => {
diff --git a/src/plugins/saved_objects_management/public/plugin.ts b/src/plugins/saved_objects_management/public/plugin.ts
index 97093fc9f4b77..af899499a54ab 100644
--- a/src/plugins/saved_objects_management/public/plugin.ts
+++ b/src/plugins/saved_objects_management/public/plugin.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
-import { ManagementSetup } from '../../management/public';
-import { DataPublicPluginStart } from '../../data/public';
-import { DataViewsPublicPluginStart } from '../../data_views/public';
-import { HomePublicPluginSetup, FeatureCatalogueCategory } from '../../home/public';
-import { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import {
   SavedObjectsManagementActionService,
   SavedObjectsManagementActionServiceSetup,
@@ -76,7 +76,7 @@ export class SavedObjectsManagementPlugin
         icon: 'savedObjectsApp',
         path: '/app/management/kibana/objects',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/src/plugins/saved_objects_management/public/services/action_service.test.ts b/src/plugins/saved_objects_management/public/services/action_service.test.ts
index 7a2536611f58a..3068a55b728b1 100644
--- a/src/plugins/saved_objects_management/public/services/action_service.test.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { spacesPluginMock } from '../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import {
   CopyToSpaceSavedObjectsManagementAction,
   ShareToSpaceSavedObjectsManagementAction,
diff --git a/src/plugins/saved_objects_management/public/services/action_service.ts b/src/plugins/saved_objects_management/public/services/action_service.ts
index b72ca3d2535de..a13db8c590f8a 100644
--- a/src/plugins/saved_objects_management/public/services/action_service.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import {
   CopyToSpaceSavedObjectsManagementAction,
   ShareToSpaceSavedObjectsManagementAction,
diff --git a/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx b/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx
index 5773f64a1e628..1ba5d4a3f48b4 100644
--- a/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx
+++ b/src/plugins/saved_objects_management/public/services/actions/copy_saved_objects_to_space_action.tsx
@@ -10,10 +10,7 @@ import React, { useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type {
-  CopyToSpaceFlyoutProps,
-  SpacesApiUi,
-} from '../../../../../../x-pack/plugins/spaces/public';
+import type { CopyToSpaceFlyoutProps, SpacesApiUi } from '@kbn/spaces-plugin/public';
 import type { SavedObjectsManagementRecord } from '../types';
 import { SavedObjectsManagementAction } from '../types';
 
diff --git a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx
index 235f8d4508a64..fd62beb4a12fd 100644
--- a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx
+++ b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { spacesPluginMock } from '../../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import type { SavedObjectsManagementRecord } from '../types';
 import { ShareToSpaceSavedObjectsManagementAction } from './share_saved_objects_to_space_action';
 
diff --git a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx
index b1a80c71e4ea2..00b99e9327a58 100644
--- a/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx
+++ b/src/plugins/saved_objects_management/public/services/actions/share_saved_objects_to_space_action.tsx
@@ -10,10 +10,7 @@ import React, { useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type {
-  ShareToSpaceFlyoutProps,
-  SpacesApiUi,
-} from '../../../../../../x-pack/plugins/spaces/public';
+import type { ShareToSpaceFlyoutProps, SpacesApiUi } from '@kbn/spaces-plugin/public';
 import type { SavedObjectsManagementRecord } from '../types';
 import { SavedObjectsManagementAction } from '../types';
 
diff --git a/src/plugins/saved_objects_management/public/services/column_service.test.ts b/src/plugins/saved_objects_management/public/services/column_service.test.ts
index 1124e71b36c52..a2a0528800427 100644
--- a/src/plugins/saved_objects_management/public/services/column_service.test.ts
+++ b/src/plugins/saved_objects_management/public/services/column_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { spacesPluginMock } from '../../../../../x-pack/plugins/spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { ShareToSpaceSavedObjectsManagementColumn } from './columns';
 import {
   SavedObjectsManagementColumnService,
diff --git a/src/plugins/saved_objects_management/public/services/column_service.ts b/src/plugins/saved_objects_management/public/services/column_service.ts
index d9c88ec8834e5..1606948b41ca5 100644
--- a/src/plugins/saved_objects_management/public/services/column_service.ts
+++ b/src/plugins/saved_objects_management/public/services/column_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { SpacesApi } from '../../../../../x-pack/plugins/spaces/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import { ShareToSpaceSavedObjectsManagementColumn } from './columns';
 import { SavedObjectsManagementColumn } from './types';
 
diff --git a/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx b/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx
index ed99aeccf00ce..732ead0756168 100644
--- a/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx
+++ b/src/plugins/saved_objects_management/public/services/columns/share_saved_objects_to_space_column.tsx
@@ -10,14 +10,14 @@ import React, { useMemo, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type { Capabilities, SavedObjectsNamespaceType } from 'src/core/public';
+import type { Capabilities, SavedObjectsNamespaceType } from '@kbn/core/public';
 import { EuiIconTip, EuiToolTip } from '@elastic/eui';
 
 import type {
   ShareToSpaceFlyoutProps,
   SpaceListProps,
   SpacesApiUi,
-} from '../../../../../../x-pack/plugins/spaces/public';
+} from '@kbn/spaces-plugin/public';
 import type { SavedObjectsManagementRecord } from '../types';
 import { SavedObjectsManagementColumn } from '../types';
 import { SHAREABLE_SOON_OBJECT_TYPES } from './constants';
diff --git a/src/plugins/saved_objects_management/public/services/types/action.ts b/src/plugins/saved_objects_management/public/services/types/action.ts
index b0ab229065555..598dbc63c8ff2 100644
--- a/src/plugins/saved_objects_management/public/services/types/action.ts
+++ b/src/plugins/saved_objects_management/public/services/types/action.ts
@@ -7,7 +7,7 @@
  */
 
 import { ReactNode } from 'react';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import { SavedObjectsManagementRecord } from '.';
 
 interface ActionContext {
diff --git a/src/plugins/saved_objects_management/public/services/types/column.ts b/src/plugins/saved_objects_management/public/services/types/column.ts
index fcdb33015df59..ea3d8d5f99045 100644
--- a/src/plugins/saved_objects_management/public/services/types/column.ts
+++ b/src/plugins/saved_objects_management/public/services/types/column.ts
@@ -7,7 +7,7 @@
  */
 
 import { EuiTableFieldDataColumnType } from '@elastic/eui';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import { SavedObjectsManagementRecord } from '.';
 
 interface ColumnContext {
diff --git a/src/plugins/saved_objects_management/public/services/types/record.ts b/src/plugins/saved_objects_management/public/services/types/record.ts
index fc92c83cfc790..6aff08af9795b 100644
--- a/src/plugins/saved_objects_management/public/services/types/record.ts
+++ b/src/plugins/saved_objects_management/public/services/types/record.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference, SavedObjectsNamespaceType } from 'src/core/public';
+import { SavedObjectReference, SavedObjectsNamespaceType } from '@kbn/core/public';
 
 export interface SavedObjectsManagementRecord {
   type: string;
diff --git a/src/plugins/saved_objects_management/server/index.ts b/src/plugins/saved_objects_management/server/index.ts
index 942d7b0734aee..1ec0db16fd62b 100644
--- a/src/plugins/saved_objects_management/server/index.ts
+++ b/src/plugins/saved_objects_management/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SavedObjectsManagementPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) =>
diff --git a/src/plugins/saved_objects_management/server/lib/find_all.test.ts b/src/plugins/saved_objects_management/server/lib/find_all.test.ts
index 1fbe9c41592ba..59c2efd36a8f4 100644
--- a/src/plugins/saved_objects_management/server/lib/find_all.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_all.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { times } from 'lodash';
-import { SavedObjectsFindOptions, SavedObjectsFindResult } from 'src/core/server';
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
+import { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { findAll } from './find_all';
 
 describe('findAll', () => {
diff --git a/src/plugins/saved_objects_management/server/lib/find_all.ts b/src/plugins/saved_objects_management/server/lib/find_all.ts
index 8d908234c6961..bb27bbd3765ef 100644
--- a/src/plugins/saved_objects_management/server/lib/find_all.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_all.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectsClientContract,
   SavedObject,
   SavedObjectsCreatePointInTimeFinderOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 export const findAll = async (
   client: SavedObjectsClientContract,
diff --git a/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts b/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts
index 0da14cbee4fd5..2d1ba251c89af 100644
--- a/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_relationships.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObject, SavedObjectError } from 'src/core/types';
-import type { SavedObjectsFindResponse } from 'src/core/server';
+import type { SavedObject, SavedObjectError } from '@kbn/core/types';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 import { findRelationships } from './find_relationships';
 import { managementMock } from '../services/management.mock';
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 const createObj = (parts: Partial<SavedObject<any>>): SavedObject<any> => ({
   id: 'id',
diff --git a/src/plugins/saved_objects_management/server/lib/find_relationships.ts b/src/plugins/saved_objects_management/server/lib/find_relationships.ts
index 9d62667282ddd..329d985b0b266 100644
--- a/src/plugins/saved_objects_management/server/lib/find_relationships.ts
+++ b/src/plugins/saved_objects_management/server/lib/find_relationships.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { injectMetaAttributes } from './inject_meta_attributes';
 import { ISavedObjectsManagement } from '../services';
 import {
diff --git a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
index 7b5f52d6bf968..308d2fe8709f2 100644
--- a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from 'src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { injectMetaAttributes } from './inject_meta_attributes';
 import { managementMock } from '../services/management.mock';
 
diff --git a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
index d5b585371cbdf..f46a3110e7ec5 100644
--- a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
+++ b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from 'src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { ISavedObjectsManagement } from '../services';
 import { SavedObjectWithMetadata } from '../types';
 
diff --git a/src/plugins/saved_objects_management/server/plugin.test.ts b/src/plugins/saved_objects_management/server/plugin.test.ts
index aa63fb21d087b..dbdd7efecaad9 100644
--- a/src/plugins/saved_objects_management/server/plugin.test.ts
+++ b/src/plugins/saved_objects_management/server/plugin.test.ts
@@ -8,7 +8,7 @@
 
 import { registerRoutesMock } from './plugin.test.mocks';
 import { SavedObjectsManagementPlugin } from './plugin';
-import { coreMock } from '../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('SavedObjectsManagementPlugin', () => {
   let plugin: SavedObjectsManagementPlugin;
diff --git a/src/plugins/saved_objects_management/server/plugin.ts b/src/plugins/saved_objects_management/server/plugin.ts
index c84f7b6277207..93f8e6695cd2b 100644
--- a/src/plugins/saved_objects_management/server/plugin.ts
+++ b/src/plugins/saved_objects_management/server/plugin.ts
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { firstValueFrom, Subject } from 'rxjs';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './types';
 import { SavedObjectsManagement } from './services';
 import { registerRoutes } from './routes';
@@ -28,7 +27,7 @@ export class SavedObjectsManagementPlugin
     this.logger.debug('Setting up SavedObjectsManagement plugin');
     registerRoutes({
       http,
-      managementServicePromise: this.managementService$.pipe(first()).toPromise(),
+      managementServicePromise: firstValueFrom(this.managementService$),
     });
 
     capabilities.registerProvider(capabilitiesProvider);
diff --git a/src/plugins/saved_objects_management/server/routes/bulk_get.ts b/src/plugins/saved_objects_management/server/routes/bulk_get.ts
index c277653b6f350..fab25b51d9224 100644
--- a/src/plugins/saved_objects_management/server/routes/bulk_get.ts
+++ b/src/plugins/saved_objects_management/server/routes/bulk_get.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { injectMetaAttributes } from '../lib';
 import { ISavedObjectsManagement } from '../services';
 
diff --git a/src/plugins/saved_objects_management/server/routes/find.ts b/src/plugins/saved_objects_management/server/routes/find.ts
index 45fbd311c2ee0..662ab68031158 100644
--- a/src/plugins/saved_objects_management/server/routes/find.ts
+++ b/src/plugins/saved_objects_management/server/routes/find.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { injectMetaAttributes } from '../lib';
 import { ISavedObjectsManagement } from '../services';
 
diff --git a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
index 65465fbfa67d8..3ad8130654a77 100644
--- a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
+++ b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, SavedObjectsType } from 'src/core/server';
+import { IRouter, SavedObjectsType } from '@kbn/core/server';
 import { SavedObjectManagementTypeInfo } from '../../common';
 
 const convertType = (sot: SavedObjectsType): SavedObjectManagementTypeInfo => {
diff --git a/src/plugins/saved_objects_management/server/routes/index.test.ts b/src/plugins/saved_objects_management/server/routes/index.test.ts
index 9c3d235a83e36..8c640d261d212 100644
--- a/src/plugins/saved_objects_management/server/routes/index.test.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { registerRoutes } from './index';
+import { registerRoutes } from '.';
 import { ISavedObjectsManagement } from '../services';
-import { coreMock, httpServiceMock } from '../../../../core/server/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/server/mocks';
 
 describe('registerRoutes', () => {
   it('registers the management routes', () => {
diff --git a/src/plugins/saved_objects_management/server/routes/index.ts b/src/plugins/saved_objects_management/server/routes/index.ts
index 5370088d27977..a66a3aa28470f 100644
--- a/src/plugins/saved_objects_management/server/routes/index.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpServiceSetup } from 'src/core/server';
+import { HttpServiceSetup } from '@kbn/core/server';
 import { ISavedObjectsManagement } from '../services';
 import { registerFindRoute } from './find';
 import { registerBulkGetRoute } from './bulk_get';
diff --git a/src/plugins/saved_objects_management/server/routes/relationships.ts b/src/plugins/saved_objects_management/server/routes/relationships.ts
index 9e2c2031d8abd..875cf82488abe 100644
--- a/src/plugins/saved_objects_management/server/routes/relationships.ts
+++ b/src/plugins/saved_objects_management/server/routes/relationships.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { chain } from 'lodash';
 import { findRelationships } from '../lib';
 import { ISavedObjectsManagement } from '../services';
diff --git a/src/plugins/saved_objects_management/server/routes/scroll_count.ts b/src/plugins/saved_objects_management/server/routes/scroll_count.ts
index 9a021be4c0cde..217153bbb86e0 100644
--- a/src/plugins/saved_objects_management/server/routes/scroll_count.ts
+++ b/src/plugins/saved_objects_management/server/routes/scroll_count.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, SavedObjectsCreatePointInTimeFinderOptions } from 'src/core/server';
+import { IRouter, SavedObjectsCreatePointInTimeFinderOptions } from '@kbn/core/server';
 import { chain } from 'lodash';
 import { findAll } from '../lib';
 
diff --git a/src/plugins/saved_objects_management/server/services/management.test.ts b/src/plugins/saved_objects_management/server/services/management.test.ts
index a96a0697ea3b6..39966bc88e8b3 100644
--- a/src/plugins/saved_objects_management/server/services/management.test.ts
+++ b/src/plugins/saved_objects_management/server/services/management.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { SavedObjectsManagement } from './management';
-import { SavedObjectsType, SavedObjectTypeRegistry } from '../../../../core/server';
+import { SavedObjectsType, SavedObjectTypeRegistry } from '@kbn/core/server';
 
 describe('SavedObjectsManagement', () => {
   let registry: SavedObjectTypeRegistry;
diff --git a/src/plugins/saved_objects_management/server/services/management.ts b/src/plugins/saved_objects_management/server/services/management.ts
index 176c52c5a21bc..d3584fdb11127 100644
--- a/src/plugins/saved_objects_management/server/services/management.ts
+++ b/src/plugins/saved_objects_management/server/services/management.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { ISavedObjectTypeRegistry, SavedObject } from 'src/core/server';
+import { ISavedObjectTypeRegistry, SavedObject } from '@kbn/core/server';
 
 export type ISavedObjectsManagement = PublicMethodsOf<SavedObjectsManagement>;
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/api.ts b/src/plugins/saved_objects_tagging_oss/public/api.ts
index 3f4dac2d9c29f..61d6fe29e64d9 100644
--- a/src/plugins/saved_objects_tagging_oss/public/api.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/api.ts
@@ -9,9 +9,9 @@
 import { Observable } from 'rxjs';
 import { SearchFilterConfig, EuiTableFieldDataColumnType } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
-import { SavedObject, SavedObjectReference } from '../../../core/types';
-import { SavedObjectsFindOptionsReference } from '../../../core/public';
-import { SavedObject as SavedObjectClass } from '../../saved_objects/public';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
+import { SavedObject as SavedObjectClass } from '@kbn/saved-objects-plugin/public';
 import { TagDecoratedSavedObject } from './decorator';
 import { ITagsClient, Tag } from '../common';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts
index b66b0863cad51..8067110fc3830 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.test.ts
@@ -8,7 +8,7 @@
 
 import { extractTagReferencesMock, injectTagReferencesMock } from './decorate_config.test.mocks';
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 import { decorateConfig } from './decorate_config';
 
 describe('decorateConfig', () => {
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts
index 5a85b9a2bd0c2..2a5193134d08c 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/decorate_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 import { injectTagReferences } from './inject_tag_references';
 import { extractTagReferences } from './extract_tag_references';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts
index 80edbaaf875f3..b43460b7c1e44 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../core/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { extractTagReferences } from './extract_tag_references';
 
 const ref = (type: string, id: string, name = `ref-to-${type}-${id}`): SavedObjectReference => ({
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts
index 354f6825d8220..2b2cc2af62c62 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/extract_tag_references.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 
 /**
  * Extract the tag references from the object's attribute
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts
index b353c41dbcdde..1278bc894b5fe 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectDecoratorFactory } from '../../../saved_objects/public';
+import { SavedObjectDecoratorFactory } from '@kbn/saved-objects-plugin/public';
 import { InternalTagDecoratedSavedObject } from './types';
 import { decorateConfig } from './decorate_config';
 import { decorateObject } from './decorate_object';
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts
index 7ca7c50505f27..f4cc18ef17c8e 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectDecoratorConfig } from '../../../saved_objects/public';
+import { SavedObjectDecoratorConfig } from '@kbn/saved-objects-plugin/public';
 import { tagDecoratorFactory, decoratorId } from './factory';
 import { InternalTagDecoratedSavedObject } from './types';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts
index 941596aad850d..b0f77047460d9 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../core/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { injectTagReferences } from './inject_tag_references';
 import { InternalTagDecoratedSavedObject } from './types';
 
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts
index a73b70dd87c06..1c0507eca9e79 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/inject_tag_references.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectConfig } from '../../../saved_objects/public';
+import { SavedObjectConfig } from '@kbn/saved-objects-plugin/public';
 import { InternalTagDecoratedSavedObject } from './types';
 
 /**
diff --git a/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts b/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts
index 5cc822cd6d0b3..c7f8e0040ee74 100644
--- a/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from '../../../saved_objects/public';
+import { SavedObject } from '@kbn/saved-objects-plugin/public';
 
 /**
  * @public
diff --git a/src/plugins/saved_objects_tagging_oss/public/index.ts b/src/plugins/saved_objects_tagging_oss/public/index.ts
index 6e9a0bf3d832e..cb22cb9ce4864 100644
--- a/src/plugins/saved_objects_tagging_oss/public/index.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { SavedObjectTaggingOssPlugin } from './plugin';
 
 export type { SavedObjectTaggingOssPluginSetup, SavedObjectTaggingOssPluginStart } from './types';
diff --git a/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts b/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts
index 30b764df59315..fef1930646ad5 100644
--- a/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/plugin.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/public/mocks';
-import { savedObjectsPluginMock } from '../../saved_objects/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
 import { tagDecoratorConfig } from './decorator';
 import { taggingApiMock } from './api.mock';
 import { SavedObjectTaggingOssPlugin } from './plugin';
diff --git a/src/plugins/saved_objects_tagging_oss/public/plugin.ts b/src/plugins/saved_objects_tagging_oss/public/plugin.ts
index f923a08eb0b06..70a3a35134d25 100644
--- a/src/plugins/saved_objects_tagging_oss/public/plugin.ts
+++ b/src/plugins/saved_objects_tagging_oss/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from 'src/core/public';
-import { SavedObjectSetup } from '../../saved_objects/public';
+import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from '@kbn/core/public';
+import { SavedObjectSetup } from '@kbn/saved-objects-plugin/public';
 import { SavedObjectTaggingOssPluginSetup, SavedObjectTaggingOssPluginStart } from './types';
 import { SavedObjectsTaggingApi } from './api';
 import { tagDecoratorConfig } from './decorator';
diff --git a/src/plugins/screenshot_mode/public/plugin.test.ts b/src/plugins/screenshot_mode/public/plugin.test.ts
index f2c0970d0ff60..8a71f3cdcca67 100644
--- a/src/plugins/screenshot_mode/public/plugin.test.ts
+++ b/src/plugins/screenshot_mode/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ScreenshotModePlugin } from './plugin';
 import { setScreenshotModeEnabled, setScreenshotModeDisabled } from '../common';
 
diff --git a/src/plugins/screenshot_mode/public/plugin.ts b/src/plugins/screenshot_mode/public/plugin.ts
index 2df8585cd6817..2008e46e9b2d6 100644
--- a/src/plugins/screenshot_mode/public/plugin.ts
+++ b/src/plugins/screenshot_mode/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import type { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { getScreenshotContext, getScreenshotMode } from '../common';
 import type { ScreenshotModePluginSetup, ScreenshotModePluginStart } from './types';
 
diff --git a/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts b/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts
index 6d783970bd362..57a9306708aee 100644
--- a/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts
+++ b/src/plugins/screenshot_mode/server/is_screenshot_mode.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { KBN_SCREENSHOT_MODE_HEADER } from '../common';
 import { isScreenshotMode } from './is_screenshot_mode';
 
diff --git a/src/plugins/screenshot_mode/server/is_screenshot_mode.ts b/src/plugins/screenshot_mode/server/is_screenshot_mode.ts
index 8b8819f462770..8769a69998577 100644
--- a/src/plugins/screenshot_mode/server/is_screenshot_mode.ts
+++ b/src/plugins/screenshot_mode/server/is_screenshot_mode.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import { KBN_SCREENSHOT_MODE_HEADER } from '../common';
 
 export const isScreenshotMode = (request: KibanaRequest): boolean => {
diff --git a/src/plugins/screenshot_mode/server/plugin.ts b/src/plugins/screenshot_mode/server/plugin.ts
index ff150b2f1a934..fc900170f7a83 100644
--- a/src/plugins/screenshot_mode/server/plugin.ts
+++ b/src/plugins/screenshot_mode/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'src/core/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
 import type {
   ScreenshotModeRequestHandlerContext,
   ScreenshotModePluginSetup,
diff --git a/src/plugins/screenshot_mode/server/types.ts b/src/plugins/screenshot_mode/server/types.ts
index 5b9e50657674a..514bcb759428d 100644
--- a/src/plugins/screenshot_mode/server/types.ts
+++ b/src/plugins/screenshot_mode/server/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { RequestHandlerContext, KibanaRequest } from 'src/core/server';
+import type { RequestHandlerContext, KibanaRequest } from '@kbn/core/server';
 
 export interface ScreenshotModePluginStart {
   /**
diff --git a/src/plugins/share/common/anonymous_access/types.ts b/src/plugins/share/common/anonymous_access/types.ts
index 7ab731dfabaaa..768117ca29496 100644
--- a/src/plugins/share/common/anonymous_access/types.ts
+++ b/src/plugins/share/common/anonymous_access/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 
 /**
  * The contract that is used to check anonymous access for the purposes of sharing public links. The implementation is intended to be
diff --git a/src/plugins/share/common/url_service/__tests__/locators.test.ts b/src/plugins/share/common/url_service/__tests__/locators.test.ts
index 93ba76c7399f4..dfbcbe132dc6b 100644
--- a/src/plugins/share/common/url_service/__tests__/locators.test.ts
+++ b/src/plugins/share/common/url_service/__tests__/locators.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from 'src/plugins/kibana_utils/common';
+import { of } from '@kbn/kibana-utils-plugin/common';
 import { testLocator, TestLocatorState, urlServiceTestSetup } from './setup';
 
 describe('locators', () => {
diff --git a/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts b/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts
index 0a2064478f7ba..c14f4e9ca45b4 100644
--- a/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts
+++ b/src/plugins/share/common/url_service/locators/legacy_short_url_locator.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaLocation, LocatorDefinition } from '../../url_service';
+import type { KibanaLocation, LocatorDefinition } from '..';
 import { shortUrlAssertValid } from './short_url_assert_valid';
 
 export const LEGACY_SHORT_URL_LOCATOR_ID = 'LEGACY_SHORT_URL_LOCATOR';
diff --git a/src/plugins/share/common/url_service/locators/locator.test.ts b/src/plugins/share/common/url_service/locators/locator.test.ts
index 17c6df8587296..6961d1a9b39d2 100644
--- a/src/plugins/share/common/url_service/locators/locator.test.ts
+++ b/src/plugins/share/common/url_service/locators/locator.test.ts
@@ -9,7 +9,7 @@
 import { LocatorDefinition } from './types';
 import { Locator, LocatorDependencies } from './locator';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaLocation } from 'src/plugins/share/public';
+import { KibanaLocation } from '../../../public';
 import { LocatorGetUrlParams } from '.';
 import { decompressFromBase64 } from 'lz-string';
 
diff --git a/src/plugins/share/common/url_service/locators/locator.ts b/src/plugins/share/common/url_service/locators/locator.ts
index d33bb8c12bcd6..b014a09442aa2 100644
--- a/src/plugins/share/common/url_service/locators/locator.ts
+++ b/src/plugins/share/common/url_service/locators/locator.ts
@@ -8,9 +8,9 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { SavedObjectReference } from 'kibana/server';
+import type { SavedObjectReference } from '@kbn/core/server';
 import { DependencyList } from 'react';
-import type { PersistableState } from 'src/plugins/kibana_utils/common';
+import type { PersistableState } from '@kbn/kibana-utils-plugin/common';
 import { useLocatorUrl } from './use_locator_url';
 import type {
   LocatorDefinition,
diff --git a/src/plugins/share/common/url_service/locators/locator_client.ts b/src/plugins/share/common/url_service/locators/locator_client.ts
index 78a84e8564df4..637c8f7f2718f 100644
--- a/src/plugins/share/common/url_service/locators/locator_client.ts
+++ b/src/plugins/share/common/url_service/locators/locator_client.ts
@@ -7,9 +7,9 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import type { LocatorDependencies } from './locator';
 import type { LocatorDefinition, LocatorPublic, ILocatorClient, LocatorData } from './types';
 import { Locator } from './locator';
diff --git a/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts b/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts
index ade5103670534..1f82c92bc28b5 100644
--- a/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts
+++ b/src/plugins/share/common/url_service/locators/short_url_redirect_locator.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import type { KibanaLocation, LocatorDefinition } from '../../url_service';
+import type { KibanaLocation, LocatorDefinition } from '..';
 
 export const SHORT_URL_REDIRECT_LOCATOR = 'SHORT_URL_REDIRECT_LOCATOR';
 
diff --git a/src/plugins/share/common/url_service/locators/types.ts b/src/plugins/share/common/url_service/locators/types.ts
index 641906a8b9191..78b9b0d80b1c6 100644
--- a/src/plugins/share/common/url_service/locators/types.ts
+++ b/src/plugins/share/common/url_service/locators/types.ts
@@ -13,7 +13,7 @@ import {
   PersistableState,
   PersistableStateService,
   VersionedState,
-} from 'src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import type { FormatSearchParamsOptions } from './redirect';
 
 /**
diff --git a/src/plugins/share/common/url_service/locators/use_locator_url.ts b/src/plugins/share/common/url_service/locators/use_locator_url.ts
index a8fefc5010bcf..7c06bea0ce635 100644
--- a/src/plugins/share/common/url_service/locators/use_locator_url.ts
+++ b/src/plugins/share/common/url_service/locators/use_locator_url.ts
@@ -9,7 +9,7 @@
 import { DependencyList, useEffect, useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { LocatorGetUrlParams, LocatorPublic } from '../../../common/url_service';
+import { LocatorGetUrlParams, LocatorPublic } from '..';
 
 export const useLocatorUrl = <P extends SerializableRecord>(
   locator: LocatorPublic<P> | null | undefined,
diff --git a/src/plugins/share/public/components/share_context_menu.tsx b/src/plugins/share/public/components/share_context_menu.tsx
index 66cef3e663af3..3550711ac84c3 100644
--- a/src/plugins/share/public/components/share_context_menu.tsx
+++ b/src/plugins/share/public/components/share_context_menu.tsx
@@ -12,7 +12,7 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiContextMenu, EuiContextMenuPanelDescriptor } from '@elastic/eui';
 
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 
 import { UrlPanelContent } from './url_panel_content';
 import { ShareMenuItem, ShareContextMenuPanelItem, UrlParamExtension } from '../types';
diff --git a/src/plugins/share/public/components/url_panel_content.tsx b/src/plugins/share/public/components/url_panel_content.tsx
index 2399466ca575a..54d3c8aa7e7ec 100644
--- a/src/plugins/share/public/components/url_panel_content.tsx
+++ b/src/plugins/share/public/components/url_panel_content.tsx
@@ -26,7 +26,7 @@ import { format as formatUrl, parse as parseUrl } from 'url';
 
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 
 import { UrlParamExtension } from '../types';
 import {
diff --git a/src/plugins/share/public/index.ts b/src/plugins/share/public/index.ts
index c4c097f992538..d33e4110ff3a4 100644
--- a/src/plugins/share/public/index.ts
+++ b/src/plugins/share/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 export { CSV_QUOTE_VALUES_SETTING, CSV_SEPARATOR_SETTING } from '../common/constants';
 
diff --git a/src/plugins/share/public/plugin.test.ts b/src/plugins/share/public/plugin.test.ts
index a13946e75caf4..ece207a67aa40 100644
--- a/src/plugins/share/public/plugin.test.ts
+++ b/src/plugins/share/public/plugin.test.ts
@@ -8,8 +8,8 @@
 
 import { registryMock, managerMock } from './plugin.test.mocks';
 import { SharePlugin } from './plugin';
-import { CoreStart } from 'kibana/public';
-import { coreMock } from '../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { anonymousAccessMock } from '../common/anonymous_access/index.mock';
 
 describe('SharePlugin', () => {
diff --git a/src/plugins/share/public/plugin.ts b/src/plugins/share/public/plugin.ts
index 5a7ff7b12cdd2..792e0dae0b986 100644
--- a/src/plugins/share/public/plugin.ts
+++ b/src/plugins/share/public/plugin.ts
@@ -8,7 +8,7 @@
 
 import './index.scss';
 
-import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import { ShareMenuManager, ShareMenuManagerStart } from './services';
 import { ShareMenuRegistry, ShareMenuRegistrySetup } from './services';
 import { UrlService } from '../common/url_service';
diff --git a/src/plugins/share/public/services/share_menu_manager.tsx b/src/plugins/share/public/services/share_menu_manager.tsx
index dc847ffd07351..a6be0c4811cab 100644
--- a/src/plugins/share/public/services/share_menu_manager.tsx
+++ b/src/plugins/share/public/services/share_menu_manager.tsx
@@ -11,8 +11,8 @@ import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { EuiWrappingPopover } from '@elastic/eui';
 
-import { CoreStart, ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
+import { CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { ShareContextMenu } from '../components/share_context_menu';
 import { ShareMenuItem, ShowShareMenuOptions } from '../types';
 import { ShareMenuRegistryStart } from './share_menu_registry';
diff --git a/src/plugins/share/public/types.ts b/src/plugins/share/public/types.ts
index 084108bf49fa9..15634e31011e2 100644
--- a/src/plugins/share/public/types.ts
+++ b/src/plugins/share/public/types.ts
@@ -9,7 +9,7 @@
 import { ComponentType } from 'react';
 import { EuiContextMenuPanelDescriptor } from '@elastic/eui';
 import { EuiContextMenuPanelItemDescriptorEntry } from '@elastic/eui/src/components/context_menu/context_menu';
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
 import type { UrlService } from '../common/url_service';
 import type { BrowserShortUrlClientFactoryCreateParams } from './url_service/short_urls/short_url_client_factory';
 import type { BrowserShortUrlClient } from './url_service/short_urls/short_url_client';
diff --git a/src/plugins/share/public/url_service/redirect/components/page.tsx b/src/plugins/share/public/url_service/redirect/components/page.tsx
index f6aa4d62767c5..bb65cbcdb3fec 100644
--- a/src/plugins/share/public/url_service/redirect/components/page.tsx
+++ b/src/plugins/share/public/url_service/redirect/components/page.tsx
@@ -9,11 +9,11 @@
 import * as React from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { EuiPageTemplate } from '@elastic/eui';
-import { ThemeServiceSetup } from 'kibana/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { Error } from './error';
 import { RedirectManager } from '../redirect_manager';
 import { Spinner } from './spinner';
-import { KibanaThemeProvider } from '../../../../../kibana_react/public';
 
 export interface PageProps {
   manager: Pick<RedirectManager, 'error$'>;
diff --git a/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts b/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts
index 817e0e0fbad6a..6d8401926ea2d 100644
--- a/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts
+++ b/src/plugins/share/public/url_service/redirect/redirect_manager.test.ts
@@ -8,7 +8,7 @@
 
 import { RedirectManager } from './redirect_manager';
 import { MockUrlService } from '../../mocks';
-import { MigrateFunction } from 'src/plugins/kibana_utils/common';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 
 const setup = () => {
   const url = new MockUrlService();
diff --git a/src/plugins/share/public/url_service/redirect/redirect_manager.ts b/src/plugins/share/public/url_service/redirect/redirect_manager.ts
index 1f38b78670d55..1bcf2eeea34dd 100644
--- a/src/plugins/share/public/url_service/redirect/redirect_manager.ts
+++ b/src/plugins/share/public/url_service/redirect/redirect_manager.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup } from 'src/core/public';
+import type { CoreSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
 import type { Location } from 'history';
-import { migrateToLatest } from '../../../../kibana_utils/common';
+import { migrateToLatest } from '@kbn/kibana-utils-plugin/common';
 import type { UrlService } from '../../../common/url_service';
 import { parseSearchParams, RedirectOptions } from '../../../common/url_service/locators/redirect';
 import {
@@ -66,7 +66,7 @@ export class RedirectManager {
         let redirectUrl = (locatorState as LegacyShortUrlLocatorParams).url;
         const storeInSessionStorage = core.uiSettings.get('state:storeInSessionStorage');
         if (storeInSessionStorage) {
-          const { hashUrl } = await import('../../../../kibana_utils/public');
+          const { hashUrl } = await import('@kbn/kibana-utils-plugin/public');
           redirectUrl = hashUrl(redirectUrl);
         }
         const url = core.http.basePath.prepend(redirectUrl);
diff --git a/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts b/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts
index 0f385c42e2de5..8a125206d1c80 100644
--- a/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts
+++ b/src/plugins/share/public/url_service/short_urls/short_url_client.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from '../../../../kibana_utils';
+import { of } from '@kbn/kibana-utils-plugin';
 import {
   KibanaLocation,
   Locator,
diff --git a/src/plugins/share/server/index.ts b/src/plugins/share/server/index.ts
index 73cd4cc89af70..c55d91d053b50 100644
--- a/src/plugins/share/server/index.ts
+++ b/src/plugins/share/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SharePlugin } from './plugin';
 
 export type { SharePluginSetup, SharePluginStart } from './plugin';
diff --git a/src/plugins/share/server/plugin.ts b/src/plugins/share/server/plugin.ts
index 595aefb9d630b..437257704501c 100644
--- a/src/plugins/share/server/plugin.ts
+++ b/src/plugins/share/server/plugin.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { CSV_SEPARATOR_SETTING, CSV_QUOTE_VALUES_SETTING } from '../common/constants';
 import { UrlService } from '../common/url_service';
 import {
diff --git a/src/plugins/share/server/url_service/http/register_url_service_routes.ts b/src/plugins/share/server/url_service/http/register_url_service_routes.ts
index 9fe0714c7245b..6547423851078 100644
--- a/src/plugins/share/server/url_service/http/register_url_service_routes.ts
+++ b/src/plugins/share/server/url_service/http/register_url_service_routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, IRouter } from 'kibana/server';
+import { CoreSetup, IRouter } from '@kbn/core/server';
 import { ServerUrlService } from '../types';
 import { registerCreateRoute } from './short_urls/register_create_route';
 import { registerGetRoute } from './short_urls/register_get_route';
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
index ca408fbfa8989..972641d160e28 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { UrlServiceError } from '../../error';
 import { ServerUrlService } from '../../types';
 
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
index 2e241cddc15ca..6e2b133ac3cff 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ServerUrlService } from '../../types';
 
 export const registerDeleteRoute = (router: IRouter, url: ServerUrlService) => {
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
index 149df5cf3999f..7ece9b1ef6c63 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ServerUrlService } from '../../types';
 
 export const registerGetRoute = (router: IRouter, url: ServerUrlService) => {
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts
index 679d5ad671700..6a7e8f542d62b 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_goto_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, IRouter } from 'kibana/server';
+import { CoreSetup, IRouter } from '@kbn/core/server';
 
 /**
  * This endpoint maintains the legacy /goto/<short_url_id> route. It loads the
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
index a89048b4bbd18..b4c73780bdf7c 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { UrlServiceError } from '../../error';
 import { ServerUrlService } from '../../types';
 
diff --git a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts
index 651169f6101a9..d68040ffb5471 100644
--- a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts
+++ b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.test.ts
@@ -11,7 +11,7 @@ import type {
   SavedObjectMigrationMap,
   SavedObjectsType,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { ServerShortUrlClientFactory } from '..';
 import { UrlService, LocatorDefinition } from '../../../common/url_service';
 import { LegacyShortUrlLocatorDefinition } from '../../../common/url_service/locators/legacy_short_url_locator';
diff --git a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts
index b2fcefcc767cf..929928eda3f9a 100644
--- a/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts
+++ b/src/plugins/share/server/url_service/saved_objects/register_url_service_saved_object_type.ts
@@ -10,8 +10,8 @@ import type {
   SavedObjectMigrationMap,
   SavedObjectsServiceSetup,
   SavedObjectsType,
-} from 'kibana/server';
-import type { LocatorData } from 'src/plugins/share/common/url_service';
+} from '@kbn/core/server';
+import type { LocatorData } from '../../../common/url_service';
 import type { ServerUrlService } from '..';
 
 export const registerUrlServiceSavedObjectType = (
diff --git a/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts b/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts
index 8c6ad49fcb9bb..5fc108cdbf56c 100644
--- a/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts
+++ b/src/plugins/share/server/url_service/short_urls/short_url_client.test.ts
@@ -11,7 +11,7 @@ import { UrlService, LocatorDefinition } from '../../../common/url_service';
 import { LegacyShortUrlLocatorDefinition } from '../../../common/url_service/locators/legacy_short_url_locator';
 import { MemoryShortUrlStorage } from './storage/memory_short_url_storage';
 import { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { UrlServiceError } from '../error';
 
 const setup = () => {
diff --git a/src/plugins/share/server/url_service/short_urls/short_url_client.ts b/src/plugins/share/server/url_service/short_urls/short_url_client.ts
index dc1b6127a7c18..762ded11bf8ee 100644
--- a/src/plugins/share/server/url_service/short_urls/short_url_client.ts
+++ b/src/plugins/share/server/url_service/short_urls/short_url_client.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { generateSlug } from 'random-word-slugs';
 import { ShortUrlRecord } from '.';
 import type {
diff --git a/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts b/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts
index 63456c36daa68..fe8872f4974ea 100644
--- a/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts
+++ b/src/plugins/share/server/url_service/short_urls/short_url_client_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { ShortUrlStorage } from './types';
 import type { IShortUrlClientFactory, ILocatorClient } from '../../../common/url_service';
 import { ServerShortUrlClient } from './short_url_client';
diff --git a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts
index 5d1b0bfa0bf55..da06d9f248beb 100644
--- a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts
+++ b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { of } from 'src/plugins/kibana_utils/common';
+import { of } from '@kbn/kibana-utils-plugin/common';
 import { MemoryShortUrlStorage } from './memory_short_url_storage';
 
 describe('.create()', () => {
diff --git a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts
index fafd00344eecd..b85d79e56b246 100644
--- a/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts
+++ b/src/plugins/share/server/url_service/short_urls/storage/memory_short_url_storage.ts
@@ -8,8 +8,8 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ShortUrlData } from 'src/plugins/share/common/url_service/short_urls/types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { ShortUrlData } from '../../../../common/url_service/short_urls/types';
 import { ShortUrlStorage, ShortUrlRecord } from '../types';
 
 const clone = <P>(obj: P): P => JSON.parse(JSON.stringify(obj)) as P;
diff --git a/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts b/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts
index 49d5bfb4741d5..1b38e47eb3ad7 100644
--- a/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts
+++ b/src/plugins/share/server/url_service/short_urls/storage/saved_object_short_url_storage.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObject, SavedObjectReference, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObject, SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
 import { ShortUrlRecord } from '..';
 import { UrlServiceError } from '../..';
 import { LEGACY_SHORT_URL_LOCATOR_ID } from '../../../../common/url_service/locators/legacy_short_url_locator';
diff --git a/src/plugins/share/server/url_service/short_urls/types.ts b/src/plugins/share/server/url_service/short_urls/types.ts
index 9a9d9006eb371..32cb546ec4112 100644
--- a/src/plugins/share/server/url_service/short_urls/types.ts
+++ b/src/plugins/share/server/url_service/short_urls/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { ShortUrlData } from '../../../common/url_service/short_urls/types';
 
 /**
diff --git a/src/plugins/shared_ux/public/plugin.ts b/src/plugins/shared_ux/public/plugin.ts
index a46e7862882d4..8806de85b9304 100755
--- a/src/plugins/shared_ux/public/plugin.ts
+++ b/src/plugins/shared_ux/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   SharedUXPluginSetup,
   SharedUXPluginStart,
diff --git a/src/plugins/shared_ux/public/services/types.ts b/src/plugins/shared_ux/public/services/types.ts
index 15191a493d378..895b2fb231a37 100644
--- a/src/plugins/shared_ux/public/services/types.ts
+++ b/src/plugins/shared_ux/public/services/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { CoreStart, AppUpdater, PluginInitializerContext } from 'src/core/public';
+import { CoreStart, AppUpdater, PluginInitializerContext } from '@kbn/core/public';
 
 /**
  * Parameters necessary to create a Kibana-based service, (e.g. during Plugin
diff --git a/src/plugins/shared_ux/public/types/index.ts b/src/plugins/shared_ux/public/types/index.ts
index 42ed661276778..5a6aace584bec 100644
--- a/src/plugins/shared_ux/public/types/index.ts
+++ b/src/plugins/shared_ux/public/types/index.ts
@@ -9,7 +9,7 @@
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
 import { SharedUxServices } from '@kbn/shared-ux-services';
-import { DataViewEditorStart } from 'src/plugins/data_view_editor/public';
+import { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
 
 /** @internal */
 export interface SharedUXPluginSetup {}
diff --git a/src/plugins/shared_ux/server/index.ts b/src/plugins/shared_ux/server/index.ts
index 4658588c54c90..44c72b244aaf9 100755
--- a/src/plugins/shared_ux/server/index.ts
+++ b/src/plugins/shared_ux/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SharedUXPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/shared_ux/server/plugin.ts b/src/plugins/shared_ux/server/plugin.ts
index 85724bf7699b0..f0ea504884610 100755
--- a/src/plugins/shared_ux/server/plugin.ts
+++ b/src/plugins/shared_ux/server/plugin.ts
@@ -6,13 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
 import { SharedUXPluginSetup, SharedUXPluginStart } from './types';
 
diff --git a/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx b/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx
index 558b283058a21..3e60534ce410a 100644
--- a/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx
+++ b/src/plugins/telemetry/public/components/opted_in_notice_banner.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import { OptedInNoticeBanner } from './opted_in_notice_banner';
-import { httpServiceMock } from '../../../../core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { mockTelemetryConstants } from '../mocks';
 
 const mockHttp = httpServiceMock.createStartContract();
diff --git a/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx b/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx
index a68da24947844..da9db9eec7321 100644
--- a/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx
+++ b/src/plugins/telemetry/public/components/opted_in_notice_banner.tsx
@@ -12,7 +12,7 @@ import * as React from 'react';
 import { EuiButton, EuiLink, EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PATH_TO_ADVANCED_SETTINGS } from '../../common/constants';
 import { TelemetryConstants } from '..';
 
diff --git a/src/plugins/telemetry/public/index.ts b/src/plugins/telemetry/public/index.ts
index 47b90ed13c96d..e07f2c7f4e42c 100644
--- a/src/plugins/telemetry/public/index.ts
+++ b/src/plugins/telemetry/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import type { TelemetryPluginConfig } from './plugin';
 import { TelemetryPlugin } from './plugin';
 export type {
diff --git a/src/plugins/telemetry/public/mocks.ts b/src/plugins/telemetry/public/mocks.ts
index 202c306c94020..f562cbad270d9 100644
--- a/src/plugins/telemetry/public/mocks.ts
+++ b/src/plugins/telemetry/public/mocks.ts
@@ -10,7 +10,7 @@ import {
   overlayServiceMock,
   httpServiceMock,
   notificationServiceMock,
-} from '../../../core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { TelemetryService } from './services/telemetry_service';
 import { TelemetryNotifications } from './services/telemetry_notifications/telemetry_notifications';
 import { TelemetryPluginStart, TelemetryPluginSetup, TelemetryPluginConfig } from './plugin';
diff --git a/src/plugins/telemetry/public/plugin.test.ts b/src/plugins/telemetry/public/plugin.test.ts
new file mode 100644
index 0000000000000..5d9e03fcbae20
--- /dev/null
+++ b/src/plugins/telemetry/public/plugin.test.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { TelemetryPlugin } from './plugin';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+
+let screenshotMode: ScreenshotModePluginSetup;
+let home: HomePublicPluginSetup;
+
+describe('TelemetryPlugin', () => {
+  beforeEach(() => {
+    screenshotMode = screenshotModePluginMock.createSetupContract();
+    home = homePluginMock.createSetupContract();
+  });
+
+  describe('setup', () => {
+    describe('when home is provided', () => {
+      describe('and hidePrivacyStatement is false (default)', () => {
+        it('registers the telemetry notice renderer and onRendered handlers', () => {
+          const initializerContext = coreMock.createPluginInitializerContext();
+
+          new TelemetryPlugin(initializerContext).setup(coreMock.createSetup(), {
+            screenshotMode,
+            home,
+          });
+
+          expect(home.welcomeScreen.registerTelemetryNoticeRenderer).toHaveBeenCalledWith(
+            expect.any(Function)
+          );
+          expect(home.welcomeScreen.registerOnRendered).toHaveBeenCalledWith(expect.any(Function));
+        });
+      });
+
+      describe('and hidePrivacyStatement is true', () => {
+        it('does not register the telemetry notice renderer and onRendered handlers', () => {
+          const initializerContext = coreMock.createPluginInitializerContext({
+            hidePrivacyStatement: true,
+          });
+
+          new TelemetryPlugin(initializerContext).setup(coreMock.createSetup(), {
+            screenshotMode,
+            home,
+          });
+
+          expect(home.welcomeScreen.registerTelemetryNoticeRenderer).not.toBeCalled();
+          expect(home.welcomeScreen.registerOnRendered).not.toBeCalled();
+        });
+      });
+    });
+  });
+});
diff --git a/src/plugins/telemetry/public/plugin.ts b/src/plugins/telemetry/public/plugin.ts
index a758715e62ba8..133b2c6157c3c 100644
--- a/src/plugins/telemetry/public/plugin.ts
+++ b/src/plugins/telemetry/public/plugin.ts
@@ -16,10 +16,11 @@ import type {
   SavedObjectsBatchResponse,
   ApplicationStart,
   DocLinksStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { TelemetrySender, TelemetryService, TelemetryNotifications } from './services';
 import type {
   TelemetrySavedObjectAttributes,
@@ -31,7 +32,6 @@ import {
   getTelemetrySendUsageFrom,
 } from '../common/telemetry_config';
 import { getNotifyUserAboutOptInDefault } from '../common/telemetry_config/get_telemetry_notify_user_about_optin_default';
-import { HomePublicPluginSetup } from '../../home/public';
 import { renderWelcomeTelemetryNotice } from './render_welcome_telemetry_notice';
 
 /**
@@ -109,6 +109,8 @@ export interface TelemetryPluginConfig {
   telemetryNotifyUserAboutOptInDefault?: boolean;
   /** Does the user have enough privileges to change the settings? **/
   userCanChangeSettings?: boolean;
+  /** Should we hide the privacy statement notice? Useful on some environments, e.g. Cloud */
+  hidePrivacyStatement?: boolean;
 }
 
 function getTelemetryConstants(docLinks: DocLinksStart): TelemetryConstants {
@@ -132,7 +134,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
   }
 
   public setup(
-    { http, notifications, getStartServices }: CoreSetup,
+    { analytics, http, notifications, getStartServices }: CoreSetup,
     { screenshotMode, home }: TelemetryPluginSetupDependencies
   ): TelemetryPluginSetup {
     const config = this.config;
@@ -153,9 +155,10 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
 
     this.telemetrySender = new TelemetrySender(this.telemetryService, async () => {
       await this.refreshConfig();
+      analytics.optIn({ global: { enabled: this.telemetryService!.isOptedIn } });
     });
 
-    if (home) {
+    if (home && !this.config.hidePrivacyStatement) {
       home.welcomeScreen.registerOnRendered(() => {
         if (this.telemetryService?.userCanChangeSettings) {
           this.telemetryNotifications?.setOptedInNoticeSeen();
@@ -177,6 +180,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
   }
 
   public start({
+    analytics,
     http,
     overlays,
     application,
@@ -209,6 +213,9 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
 
       // Refresh and get telemetry config
       const updatedConfig = await this.refreshConfig();
+
+      analytics.optIn({ global: { enabled: this.telemetryService!.isOptedIn } });
+
       const telemetryBanner = updatedConfig?.banner;
 
       this.maybeStartTelemetryPoller();
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts
index b77364e4bc385..7f051f7d9fc03 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { renderOptInBanner } from './render_opt_in_banner';
-import { overlayServiceMock } from '../../../../../core/public/mocks';
+import { overlayServiceMock } from '@kbn/core/public/mocks';
 import { mockTelemetryConstants } from '../../mocks';
 
 describe('renderOptInBanner', () => {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx
index 7626be56bfa46..23754471e1630 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opt_in_banner.tsx
@@ -7,9 +7,9 @@
  */
 
 import React from 'react';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { OptInBanner } from '../../components/opt_in_banner';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { TelemetryConstants } from '../..';
 
 interface RenderBannerConfig {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts
index bc56f9ff6107f..e4678fc8ef5fc 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { renderOptedInNoticeBanner } from './render_opted_in_notice_banner';
-import { overlayServiceMock, httpServiceMock } from '../../../../../core/public/mocks';
+import { overlayServiceMock, httpServiceMock } from '@kbn/core/public/mocks';
 import { mockTelemetryConstants } from '../../mocks';
 
 describe('renderOptedInNoticeBanner', () => {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx
index ca2b34de06afd..30720e43fcadf 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/render_opted_in_notice_banner.tsx
@@ -7,9 +7,9 @@
  */
 
 import React from 'react';
-import { HttpStart, OverlayStart } from 'kibana/public';
+import { HttpStart, OverlayStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { OptedInNoticeBanner } from '../../components/opted_in_notice_banner';
-import { toMountPoint } from '../../../../kibana_react/public';
 import { TelemetryConstants } from '../..';
 
 interface RenderBannerConfig {
diff --git a/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts b/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts
index e674942acb9bd..7a4da14bdb528 100644
--- a/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts
+++ b/src/plugins/telemetry/public/services/telemetry_notifications/telemetry_notifications.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { HttpStart, OverlayStart } from 'kibana/public';
+import { HttpStart, OverlayStart } from '@kbn/core/public';
 import { renderOptedInNoticeBanner } from './render_opted_in_notice_banner';
 import { renderOptInBanner } from './render_opt_in_banner';
 import { TelemetryService } from '../telemetry_service';
diff --git a/src/plugins/telemetry/public/services/telemetry_sender.ts b/src/plugins/telemetry/public/services/telemetry_sender.ts
index 72f226ce52b83..6ffed583ec95c 100644
--- a/src/plugins/telemetry/public/services/telemetry_sender.ts
+++ b/src/plugins/telemetry/public/services/telemetry_sender.ts
@@ -9,9 +9,9 @@
 import type { Subscription } from 'rxjs';
 import { fromEvent, interval, merge } from 'rxjs';
 import { exhaustMap } from 'rxjs/operators';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { LOCALSTORAGE_KEY, PAYLOAD_CONTENT_ENCODING } from '../../common/constants';
 import { TelemetryService } from './telemetry_service';
-import { Storage } from '../../../kibana_utils/public';
 import type { EncryptedTelemetryPayload } from '../../common/types';
 import { isReportIntervalExpired } from '../../common/is_report_interval_expired';
 
diff --git a/src/plugins/telemetry/public/services/telemetry_service.test.ts b/src/plugins/telemetry/public/services/telemetry_service.test.ts
index 778dd2fbfe0b0..03564f5b6f632 100644
--- a/src/plugins/telemetry/public/services/telemetry_service.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_service.test.ts
@@ -219,6 +219,19 @@ describe('TelemetryService', () => {
   });
 
   describe('getUserShouldSeeOptInNotice', () => {
+    it('should return false if the telemetry notice is hidden by config', () => {
+      const telemetryService = mockTelemetryService({
+        config: {
+          userCanChangeSettings: true,
+          telemetryNotifyUserAboutOptInDefault: true,
+          hidePrivacyStatement: true,
+        },
+      });
+      expect(telemetryService.config.userCanChangeSettings).toBe(true);
+      expect(telemetryService.userCanChangeSettings).toBe(true);
+      expect(telemetryService.getUserShouldSeeOptInNotice()).toBe(false);
+    });
+
     it('returns whether the user can update the telemetry config (has SavedObjects access)', () => {
       const telemetryService = mockTelemetryService({
         config: { userCanChangeSettings: undefined },
diff --git a/src/plugins/telemetry/public/services/telemetry_service.ts b/src/plugins/telemetry/public/services/telemetry_service.ts
index 55dc623a8ccf8..e01a900e190d7 100644
--- a/src/plugins/telemetry/public/services/telemetry_service.ts
+++ b/src/plugins/telemetry/public/services/telemetry_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { TelemetryPluginConfig } from '../plugin';
 import { getTelemetryChannelEndpoint } from '../../common/telemetry_config';
 import type { UnencryptedTelemetryPayload, EncryptedTelemetryPayload } from '../../common/types';
@@ -113,7 +113,9 @@ export class TelemetryService {
    */
   public getUserShouldSeeOptInNotice(): boolean {
     return (
-      (this.config.telemetryNotifyUserAboutOptInDefault && this.config.userCanChangeSettings) ??
+      (!this.config.hidePrivacyStatement &&
+        this.config.telemetryNotifyUserAboutOptInDefault &&
+        this.config.userCanChangeSettings) ??
       false
     );
   }
diff --git a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
index 6d1266b7f27a7..185ac8be49b59 100644
--- a/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
+++ b/src/plugins/telemetry/server/collectors/telemetry_plugin/telemetry_plugin_collector.ts
@@ -6,12 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { ISavedObjectsRepository, SavedObjectsClient } from '../../../../../core/server';
+import { Observable, firstValueFrom } from 'rxjs';
+import { ISavedObjectsRepository, SavedObjectsClient } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getTelemetrySavedObject, TelemetrySavedObject } from '../../telemetry_repository';
 import { getTelemetryOptIn, getTelemetrySendUsageFrom } from '../../../common/telemetry_config';
-import { UsageCollectionSetup } from '../../../../usage_collection/server';
 import { TelemetryConfigType } from '../../config';
 
 export interface TelemetryUsageStats {
@@ -32,11 +31,7 @@ export function createCollectorFetch({
   getSavedObjectsClient,
 }: TelemetryPluginUsageCollectorOptions) {
   return async function fetchUsageStats(): Promise<TelemetryUsageStats> {
-    const {
-      sendUsageFrom,
-      allowChangingOptInStatus,
-      optIn = null,
-    } = await config$.pipe(take(1)).toPromise();
+    const { sendUsageFrom, allowChangingOptInStatus, optIn = null } = await firstValueFrom(config$);
     const configTelemetrySendUsageFrom = sendUsageFrom;
     const configTelemetryOptIn = optIn;
 
diff --git a/src/plugins/telemetry/server/collectors/usage/schema.ts b/src/plugins/telemetry/server/collectors/usage/schema.ts
index 348d86b6e89c1..b5de37533c01e 100644
--- a/src/plugins/telemetry/server/collectors/usage/schema.ts
+++ b/src/plugins/telemetry/server/collectors/usage/schema.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { LicenseUsage, StaticTelemetryUsage } from './telemetry_usage_collector';
 
 const licenseSchema: MakeSchemaFrom<LicenseUsage> = {
diff --git a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
index 2acc6676d13db..80d88dce3e789 100644
--- a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.test.ts
@@ -15,7 +15,7 @@ import {
   readTelemetryFile,
   MAX_FILE_SIZE,
 } from './telemetry_usage_collector';
-import { usageCollectionPluginMock } from '../../../../usage_collection/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const mockUsageCollector = () => {
   return usageCollectionPluginMock.createSetupContract();
diff --git a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
index f26196c080686..71cda893264e1 100644
--- a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
+++ b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
@@ -9,11 +9,10 @@
 import { accessSync, constants, readFileSync, statSync } from 'fs';
 import { safeLoad } from 'js-yaml';
 import { dirname, join } from 'path';
-import { Observable } from 'rxjs';
+import { Observable, firstValueFrom } from 'rxjs';
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
-import { take } from 'rxjs/operators';
 import { TelemetryConfigType } from '../../config';
 
 // look for telemetry.yml in the same places we expect kibana.yml
@@ -129,7 +128,7 @@ export function registerTelemetryUsageCollector(
   config$: Observable<TelemetryConfigType>
 ) {
   const collector = createTelemetryUsageCollector(usageCollection, async () => {
-    const config = await config$.pipe(take(1)).toPromise();
+    const config = await firstValueFrom(config$);
     return config.config;
   });
   usageCollection.registerCollector(collector);
diff --git a/src/plugins/telemetry/server/config/config.ts b/src/plugins/telemetry/server/config/config.ts
index 166598371fe36..bc3d8bf190efb 100644
--- a/src/plugins/telemetry/server/config/config.ts
+++ b/src/plugins/telemetry/server/config/config.ts
@@ -8,7 +8,7 @@
 
 import { schema, TypeOf, Type } from '@kbn/config-schema';
 import { getConfigPath } from '@kbn/utils';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const clusterEnvSchema: [Type<'prod'>, Type<'staging'>] = [
   schema.literal('prod'),
@@ -18,6 +18,7 @@ const clusterEnvSchema: [Type<'prod'>, Type<'staging'>] = [
 const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   allowChangingOptInStatus: schema.boolean({ defaultValue: true }),
+  hidePrivacyStatement: schema.boolean({ defaultValue: false }),
   optIn: schema.conditional(
     schema.siblingRef('allowChangingOptInStatus'),
     schema.literal(false),
@@ -50,5 +51,6 @@ export const config: PluginConfigDescriptor<TelemetryConfigType> = {
     optIn: true,
     sendUsageFrom: true,
     sendUsageTo: true,
+    hidePrivacyStatement: true,
   },
 };
diff --git a/src/plugins/telemetry/server/fetcher.test.ts b/src/plugins/telemetry/server/fetcher.test.ts
index c6e62659ec93f..87466b7c05fcb 100644
--- a/src/plugins/telemetry/server/fetcher.test.ts
+++ b/src/plugins/telemetry/server/fetcher.test.ts
@@ -8,7 +8,7 @@
 
 /* eslint-disable dot-notation */
 import { FetcherTask } from './fetcher';
-import { coreMock } from '../../../core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 describe('FetcherTask', () => {
   describe('sendIfDue', () => {
diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
index db890d2ea12ec..efc8ac184d28b 100644
--- a/src/plugins/telemetry/server/fetcher.ts
+++ b/src/plugins/telemetry/server/fetcher.ts
@@ -6,17 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { Observable, Subscription, timer } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, Subscription, timer } from 'rxjs';
 import fetch from 'node-fetch';
-import type { TelemetryCollectionManagerPluginStart } from 'src/plugins/telemetry_collection_manager/server';
+import type { TelemetryCollectionManagerPluginStart } from '@kbn/telemetry-collection-manager-plugin/server';
 import {
   PluginInitializerContext,
   Logger,
   SavedObjectsClientContract,
   SavedObjectsClient,
   CoreStart,
-} from '../../../core/server';
+} from '@kbn/core/server';
 import {
   getTelemetryChannelEndpoint,
   getTelemetryOptIn,
@@ -119,7 +118,7 @@ export class FetcherTask {
 
   private async getCurrentConfigs(): Promise<TelemetryConfig> {
     const telemetrySavedObject = await getTelemetrySavedObject(this.internalRepository!);
-    const config = await this.config$.pipe(take(1)).toPromise();
+    const config = await firstValueFrom(this.config$);
     const currentKibanaVersion = this.currentKibanaVersion;
     const configTelemetrySendUsageFrom = config.sendUsageFrom;
     const allowChangingOptInStatus = config.allowChangingOptInStatus;
diff --git a/src/plugins/telemetry/server/index.ts b/src/plugins/telemetry/server/index.ts
index 6b56996c756aa..3c67764953ef4 100644
--- a/src/plugins/telemetry/server/index.ts
+++ b/src/plugins/telemetry/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'kibana/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 import type { TelemetryConfigType } from './config';
 import { TelemetryPlugin } from './plugin';
 
diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
index 681a871ba105b..7c01b85130977 100644
--- a/src/plugins/telemetry/server/plugin.ts
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -8,13 +8,12 @@
 
 import { URL } from 'url';
 import type { Observable } from 'rxjs';
-import { ReplaySubject } from 'rxjs';
-import { take } from 'rxjs/operators';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { firstValueFrom, ReplaySubject } from 'rxjs';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   TelemetryCollectionManagerPluginSetup,
   TelemetryCollectionManagerPluginStart,
-} from 'src/plugins/telemetry_collection_manager/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
 import type {
   CoreSetup,
   PluginInitializerContext,
@@ -22,9 +21,9 @@ import type {
   CoreStart,
   Plugin,
   Logger,
-} from 'src/core/server';
-import type { SecurityPluginStart } from '../../../../x-pack/plugins/security/server';
-import { SavedObjectsClient } from '../../../core/server';
+} from '@kbn/core/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 import { registerRoutes } from './routes';
 import { registerCollection } from './telemetry_collection';
 import {
@@ -131,7 +130,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
 
     return {
       getTelemetryUrl: async () => {
-        const { sendUsageTo } = await config$.pipe(take(1)).toPromise();
+        const { sendUsageTo } = await firstValueFrom(config$);
         const telemetryUrl = getTelemetryChannelEndpoint({
           env: sendUsageTo,
           channelName: 'snapshot',
@@ -157,9 +156,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
 
     return {
       getIsOptedIn: async () => {
-        const internalRepositoryClient = await this.savedObjectsInternalClient$
-          .pipe(take(1))
-          .toPromise();
+        const internalRepositoryClient = await firstValueFrom(this.savedObjectsInternalClient$);
         let telemetrySavedObject: TelemetrySavedObject = false; // if an error occurs while fetching opt-in status, a `false` result indicates that Kibana cannot opt-in
         try {
           telemetrySavedObject = await getTelemetrySavedObject(internalRepositoryClient);
@@ -167,7 +164,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
           this.logger.debug('Failed to check telemetry opt-in status: ' + err.message);
         }
 
-        const config = await this.config$.pipe(take(1)).toPromise();
+        const config = await firstValueFrom(this.config$);
         const allowChangingOptInStatus = config.allowChangingOptInStatus;
         const configTelemetryOptIn = typeof config.optIn === 'undefined' ? null : config.optIn;
         const currentKibanaVersion = this.currentKibanaVersion;
diff --git a/src/plugins/telemetry/server/routes/index.ts b/src/plugins/telemetry/server/routes/index.ts
index 6b249ac9c280d..da752fd4c836a 100644
--- a/src/plugins/telemetry/server/routes/index.ts
+++ b/src/plugins/telemetry/server/routes/index.ts
@@ -7,8 +7,8 @@
  */
 
 import type { Observable } from 'rxjs';
-import type { IRouter, Logger, SavedObjectsClient } from 'kibana/server';
-import type { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import type { IRouter, Logger, SavedObjectsClient } from '@kbn/core/server';
+import type { TelemetryCollectionManagerPluginSetup } from '@kbn/telemetry-collection-manager-plugin/server';
 import { registerTelemetryOptInRoutes } from './telemetry_opt_in';
 import { registerTelemetryUsageStatsRoutes, SecurityGetter } from './telemetry_usage_stats';
 import { registerTelemetryOptInStatsRoutes } from './telemetry_opt_in_stats';
diff --git a/src/plugins/telemetry/server/routes/telemetry_last_reported.ts b/src/plugins/telemetry/server/routes/telemetry_last_reported.ts
index 2086327476ba2..2b5ffbd7ec4d6 100644
--- a/src/plugins/telemetry/server/routes/telemetry_last_reported.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_last_reported.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IRouter, SavedObjectsClient } from 'kibana/server';
+import type { IRouter, SavedObjectsClient } from '@kbn/core/server';
 import type { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { getTelemetrySavedObject, updateTelemetrySavedObject } from '../telemetry_repository';
 
 export function registerTelemetryLastReported(
@@ -22,9 +22,7 @@ export function registerTelemetryLastReported(
       validate: false,
     },
     async (context, req, res) => {
-      const savedObjectsInternalClient = await savedObjectsInternalClient$
-        .pipe(take(1))
-        .toPromise();
+      const savedObjectsInternalClient = await firstValueFrom(savedObjectsInternalClient$);
       const telemetrySavedObject = await getTelemetrySavedObject(savedObjectsInternalClient);
 
       return res.ok({
@@ -42,9 +40,7 @@ export function registerTelemetryLastReported(
       validate: false,
     },
     async (context, req, res) => {
-      const savedObjectsInternalClient = await savedObjectsInternalClient$
-        .pipe(take(1))
-        .toPromise();
+      const savedObjectsInternalClient = await firstValueFrom(savedObjectsInternalClient$);
       await updateTelemetrySavedObject(savedObjectsInternalClient, {
         lastReported: Date.now(),
       });
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
index e3fad0642303c..fff5df2dff100 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -6,15 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import { IRouter, Logger } from 'kibana/server';
+import { IRouter, Logger } from '@kbn/core/server';
 import {
   StatsGetterConfig,
   TelemetryCollectionManagerPluginSetup,
-} from 'src/plugins/telemetry_collection_manager/server';
-import { SavedObjectsErrorHelpers } from '../../../../core/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { getTelemetryAllowChangingOptInStatus } from '../../common/telemetry_config';
 import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
 
@@ -53,7 +52,7 @@ export function registerTelemetryOptInRoutes({
         enabled: newOptInStatus,
         lastVersionChecked: currentKibanaVersion,
       };
-      const config = await config$.pipe(take(1)).toPromise();
+      const config = await firstValueFrom(config$);
       const telemetrySavedObject = await getTelemetrySavedObject(context.core.savedObjects.client);
 
       if (telemetrySavedObject === false) {
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts
index 00bf675a0494a..b8b2fa179ba4c 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.test.ts
@@ -9,7 +9,7 @@
 jest.mock('node-fetch');
 import fetch from 'node-fetch';
 import { sendTelemetryOptInStatus } from './telemetry_opt_in_stats';
-import { StatsGetterConfig } from 'src/plugins/telemetry_collection_manager/server';
+import { StatsGetterConfig } from '@kbn/telemetry-collection-manager-plugin/server';
 
 describe('sendTelemetryOptInStatus', () => {
   const mockClusterUuid = 'mk_uuid';
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
index 6139eee3e10ca..12a90300cf782 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts
@@ -8,12 +8,12 @@
 
 import fetch from 'node-fetch';
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import {
   TelemetryCollectionManagerPluginSetup,
   StatsGetterConfig,
-} from 'src/plugins/telemetry_collection_manager/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
 import { getTelemetryChannelEndpoint } from '../../common/telemetry_config';
 import { PAYLOAD_CONTENT_ENCODING } from '../../common/constants';
 import type { UnencryptedTelemetryPayload } from '../../common/types';
diff --git a/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts b/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts
index bc7569585c127..9dde180ff980d 100644
--- a/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_usage_stats.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { registerTelemetryUsageStatsRoutes } from './telemetry_usage_stats';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
-import type { RequestHandlerContext, IRouter } from 'src/core/server';
-import { securityMock } from '../../../../../x-pack/plugins/security/server/mocks';
-import { telemetryCollectionManagerPluginMock } from '../../../telemetry_collection_manager/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { RequestHandlerContext, IRouter } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { telemetryCollectionManagerPluginMock } from '@kbn/telemetry-collection-manager-plugin/server/mocks';
 
 async function runRequest(
   mockRouter: IRouter<RequestHandlerContext>,
diff --git a/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts b/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
index 4647f5afe0760..9095f04f4f5e0 100644
--- a/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_usage_stats.ts
@@ -7,12 +7,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import {
   TelemetryCollectionManagerPluginSetup,
   StatsGetterConfig,
-} from 'src/plugins/telemetry_collection_manager/server';
-import type { SecurityPluginStart } from '../../../../../x-pack/plugins/security/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export type SecurityGetter = () => SecurityPluginStart | undefined;
 
diff --git a/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
index 516e7c6970fe5..686274dc4f5d3 100644
--- a/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import {
   TelemetrySavedObject,
   TelemetrySavedObjectAttributes,
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts
index 3c96b45ed3262..f60cf7262d752 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getClusterInfo } from './get_cluster_info';
 
 export function mockGetClusterInfo<ClusterInfo>(clusterInfo: ClusterInfo) {
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
index 667b8564e4d33..3e73ea28eb9ab 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_info.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Get the cluster info from the connected cluster.
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts
index 84a0fdaacb5b1..3d5f420e99554 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getClusterStats } from './get_cluster_stats';
 import { TIMEOUT } from './constants';
 
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
index f420291d1c131..8cec4cd5c4e55 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_cluster_stats.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ClusterDetailsGetter } from 'src/plugins/telemetry_collection_manager/server';
-import { ElasticsearchClient } from 'src/core/server';
+import { ClusterDetailsGetter } from '@kbn/telemetry-collection-manager-plugin/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { TIMEOUT } from './constants';
 
 /**
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
index 310ba6a3ee41d..fc96b5adc70d6 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
@@ -8,7 +8,7 @@
 
 import { buildDataTelemetryPayload, getDataTelemetry } from './get_data_telemetry';
 import { DATA_DATASETS_INDEX_PATTERNS, DATA_DATASETS_INDEX_PATTERNS_UNIQUE } from './constants';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 describe('get_data_telemetry', () => {
   describe('DATA_DATASETS_INDEX_PATTERNS', () => {
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
index 174e200a6c996..ba7c700c041da 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import {
   DATA_DATASETS_INDEX_PATTERNS_UNIQUE,
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
index 4340eaafd2d8f..15ca075175cb5 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
@@ -7,9 +7,9 @@
  */
 
 import { omit } from 'lodash';
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import type { StatsCollectionContext } from 'src/plugins/telemetry_collection_manager/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { StatsCollectionContext } from '@kbn/telemetry-collection-manager-plugin/server';
 
 export interface KibanaUsageStats {
   kibana: {
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
index fa45438e00fbe..35577923f66bf 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.test.ts
@@ -13,9 +13,9 @@ import { getLocalStats, handleLocalStats } from './get_local_stats';
 import {
   usageCollectionPluginMock,
   createCollectorFetchContextMock,
-} from '../../../usage_collection/server/mocks';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
-import { StatsCollectionConfig } from '../../../telemetry_collection_manager/server';
+} from '@kbn/usage-collection-plugin/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { StatsCollectionConfig } from '@kbn/telemetry-collection-manager-plugin/server';
 
 function mockUsageCollection(kibanaUsage = {}) {
   const usageCollection = usageCollectionPluginMock.createSetupContract();
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
index 73de59ae8156a..ccd03f26fe5b5 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
@@ -10,7 +10,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   StatsGetter,
   StatsCollectionContext,
-} from 'src/plugins/telemetry_collection_manager/server';
+} from '@kbn/telemetry-collection-manager-plugin/server';
 import { getClusterInfo } from './get_cluster_info';
 import { getClusterStats } from './get_cluster_stats';
 import { getKibana, handleKibanaStats, KibanaUsageStats } from './get_kibana';
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts
index 65bb6eed344aa..9575e7827fc77 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.test.ts
@@ -8,7 +8,7 @@
 
 import { getNodesUsage } from './get_nodes_usage';
 import { TIMEOUT } from './constants';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const mockedNodesFetchResponse = {
   cluster_name: 'test cluster',
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
index b701a696f210d..8243cf586e537 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TIMEOUT } from './constants';
 
diff --git a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
index 0520e9fef0dd7..23e4a269b21e2 100644
--- a/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/register_collection.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
+import { TelemetryCollectionManagerPluginSetup } from '@kbn/telemetry-collection-manager-plugin/server';
 import { getLocalStats } from './get_local_stats';
 import { getClusterUuids } from './get_cluster_stats';
 
diff --git a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
index 5ea8211739a13..379232e7571ea 100644
--- a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { getTelemetrySavedObject } from './get_telemetry_saved_object';
-import { SavedObjectsErrorHelpers } from '../../../../core/server';
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 describe('getTelemetrySavedObject', () => {
   it('returns null when saved object not found', async () => {
diff --git a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
index 1a43e32d23653..56d13f3c6ad22 100644
--- a/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/get_telemetry_saved_object.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '../../../../core/server';
-import { TelemetrySavedObject } from './';
+import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '@kbn/core/server';
+import { TelemetrySavedObject } from '.';
 
 type GetTelemetrySavedObject = (
   repository: SavedObjectsClientContract
diff --git a/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts b/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
index f0dd142bc89be..8ecb10d741bb9 100644
--- a/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/telemetry_repository/update_telemetry_saved_object.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '../../../../core/server';
-import { TelemetrySavedObjectAttributes } from './';
+import { SavedObjectsErrorHelpers, SavedObjectsClientContract } from '@kbn/core/server';
+import { TelemetrySavedObjectAttributes } from '.';
 
 export async function updateTelemetrySavedObject(
   savedObjectsClient: SavedObjectsClientContract,
diff --git a/src/plugins/telemetry_collection_manager/server/index.ts b/src/plugins/telemetry_collection_manager/server/index.ts
index c0cd124a132c0..ededc6abb87dd 100644
--- a/src/plugins/telemetry_collection_manager/server/index.ts
+++ b/src/plugins/telemetry_collection_manager/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { TelemetryCollectionManagerPlugin } from './plugin';
 
 //  This exports static code and TypeScript types,
diff --git a/src/plugins/telemetry_collection_manager/server/plugin.test.ts b/src/plugins/telemetry_collection_manager/server/plugin.test.ts
index 990e237b6b272..5ffe8235b3930 100644
--- a/src/plugins/telemetry_collection_manager/server/plugin.test.ts
+++ b/src/plugins/telemetry_collection_manager/server/plugin.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../core/server/mocks';
-import { usageCollectionPluginMock } from '../../usage_collection/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { TelemetryCollectionManagerPlugin } from './plugin';
 import type { BasicStatsPayload, CollectionStrategyConfig, StatsGetterConfig } from './types';
 import { TelemetrySavedObjectsClient } from './telemetry_saved_objects_client';
diff --git a/src/plugins/telemetry_collection_manager/server/plugin.ts b/src/plugins/telemetry_collection_manager/server/plugin.ts
index cffe736f8eeaf..be4632ce21338 100644
--- a/src/plugins/telemetry_collection_manager/server/plugin.ts
+++ b/src/plugins/telemetry_collection_manager/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   PluginInitializerContext,
   CoreSetup,
@@ -17,7 +17,7 @@ import type {
   SavedObjectsServiceStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type {
   TelemetryCollectionManagerPluginSetup,
diff --git a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts
index a1aa9a3070d01..ff8ccc9c45b6f 100644
--- a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts
+++ b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { TelemetrySavedObjectsClient } from './telemetry_saved_objects_client';
-import { savedObjectsRepositoryMock } from '../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 describe('TelemetrySavedObjectsClient', () => {
   test("find requests are extended with `namespaces:['*']`", async () => {
diff --git a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts
index 01d89c5731158..15907903c46c3 100644
--- a/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts
+++ b/src/plugins/telemetry_collection_manager/server/telemetry_saved_objects_client.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsFindOptions, SavedObjectsFindResponse } from 'src/core/server';
-import { SavedObjectsClient } from '../../../core/server';
+import type { SavedObjectsFindOptions, SavedObjectsFindResponse } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 
 /**
  * Extends the SavedObjectsClient to fit the telemetry fetching requirements (i.e.: find objects from all namespaces by default)
diff --git a/src/plugins/telemetry_collection_manager/server/types.ts b/src/plugins/telemetry_collection_manager/server/types.ts
index 9658c0d68d05d..fd3b3ef85f43a 100644
--- a/src/plugins/telemetry_collection_manager/server/types.ts
+++ b/src/plugins/telemetry_collection_manager/server/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type { TelemetryCollectionManagerPlugin } from './plugin';
 
 export interface TelemetryCollectionManagerPluginSetup {
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
index ecf99187cbaa6..a8d67792b8625 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import TelemetryManagementSection from './telemetry_management_section';
-import { TelemetryService } from '../../../telemetry/public/services';
-import { coreMock } from '../../../../core/public/mocks';
+import { TelemetryService } from '@kbn/telemetry-plugin/public/services';
+import { coreMock } from '@kbn/core/public/mocks';
 import { render } from '@testing-library/react';
-import type { DocLinksStart } from 'src/core/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 describe('TelemetryManagementSectionComponent', () => {
   const coreStart = coreMock.createStart();
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
index 331b9f895b8a5..c50c3e4719852 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
@@ -11,11 +11,11 @@ import { EuiCallOut, EuiForm, EuiLink, EuiSpacer, EuiSplitPanel, EuiTitle } from
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
-import type { DocLinksStart, ToastsStart } from 'src/core/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
+import type { DocLinksStart, ToastsStart } from '@kbn/core/public';
+import { LazyField } from '@kbn/advanced-settings-plugin/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { OptInExampleFlyout } from './opt_in_example_flyout';
-import { LazyField } from '../../../advanced_settings/public';
-import { TrackApplicationView } from '../../../usage_collection/public';
 
 type TelemetryService = TelemetryPluginSetup['telemetryService'];
 
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
index 8dfaf56f2cc37..75cb161df926f 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section_wrapper.tsx
@@ -8,8 +8,8 @@
 
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import type { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
-import { DocLinksStart } from 'kibana/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
+import { DocLinksStart } from '@kbn/core/public';
 import type TelemetryManagementSection from './telemetry_management_section';
 
 export type TelemetryManagementSectionWrapperProps = Omit<
diff --git a/src/plugins/telemetry_management_section/public/plugin.tsx b/src/plugins/telemetry_management_section/public/plugin.tsx
index 91e3d4b9422e0..8595a39615c69 100644
--- a/src/plugins/telemetry_management_section/public/plugin.tsx
+++ b/src/plugins/telemetry_management_section/public/plugin.tsx
@@ -7,10 +7,10 @@
  */
 
 import React from 'react';
-import type { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
-import type { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { CoreStart, CoreSetup, DocLinksStart } from 'src/core/public';
+import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { CoreStart, CoreSetup, DocLinksStart } from '@kbn/core/public';
 
 import {
   telemetryManagementSectionWrapper,
diff --git a/src/plugins/ui_actions/public/actions/action.test.ts b/src/plugins/ui_actions/public/actions/action.test.ts
index 239271424a0f6..a318ae6a0ce89 100644
--- a/src/plugins/ui_actions/public/actions/action.test.ts
+++ b/src/plugins/ui_actions/public/actions/action.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ActionExecutionContext, createAction } from '../../../ui_actions/public';
+import { ActionExecutionContext, createAction } from '..';
 import { defaultTrigger } from '../triggers';
 
 const sayHelloAction = createAction<{ amICompatible: boolean }>({
diff --git a/src/plugins/ui_actions/public/actions/action.ts b/src/plugins/ui_actions/public/actions/action.ts
index 2cca606ca9701..99dfd1844c66d 100644
--- a/src/plugins/ui_actions/public/actions/action.ts
+++ b/src/plugins/ui_actions/public/actions/action.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiComponent } from 'src/plugins/kibana_utils/public';
+import { UiComponent } from '@kbn/kibana-utils-plugin/public';
 import { Presentable } from '../util/presentable';
 import { Trigger } from '../triggers';
 
diff --git a/src/plugins/ui_actions/public/actions/action_internal.ts b/src/plugins/ui_actions/public/actions/action_internal.ts
index 9f5639b329cb4..a701c54fce647 100644
--- a/src/plugins/ui_actions/public/actions/action_internal.ts
+++ b/src/plugins/ui_actions/public/actions/action_internal.ts
@@ -8,10 +8,10 @@
 
 // @ts-ignore
 import React from 'react';
-import type { UiComponent } from 'src/plugins/kibana_utils/public';
+import type { UiComponent } from '@kbn/kibana-utils-plugin/public';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import { Action, ActionContext as Context, ActionDefinition, ActionMenuItemProps } from './action';
 import { Presentable, PresentableGrouping } from '../util/presentable';
-import { uiToReactComponent } from '../../../kibana_react/public';
 
 /**
  * @internal
diff --git a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
index f389a2fac8a71..1e27cda319bbf 100644
--- a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
+++ b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
@@ -10,7 +10,7 @@ import * as React from 'react';
 import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { uiToReactComponent } from '../../../kibana_react/public';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import { Action, ActionExecutionContext } from '../actions';
 import { Trigger } from '../triggers';
 
diff --git a/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx b/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx
index 04449d7b656bc..8c7cf620d4a82 100644
--- a/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx
+++ b/src/plugins/ui_actions/public/context_menu/open_context_menu.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { EuiContextMenu, EuiContextMenuPanelDescriptor, EuiPopover } from '@elastic/eui';
 import { EventEmitter } from 'events';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getTheme } from '../services';
 
 let activeSession: ContextMenuSession | null = null;
diff --git a/src/plugins/ui_actions/public/index.ts b/src/plugins/ui_actions/public/index.ts
index a93b5e3f958a9..29598b1c51b9b 100644
--- a/src/plugins/ui_actions/public/index.ts
+++ b/src/plugins/ui_actions/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UiActionsPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/ui_actions/public/mocks.ts b/src/plugins/ui_actions/public/mocks.ts
index d9f4db9b9041e..4b53a73bbbbd1 100644
--- a/src/plugins/ui_actions/public/mocks.ts
+++ b/src/plugins/ui_actions/public/mocks.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart } from 'src/core/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { UiActionsSetup, UiActionsStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { coreMock } from '../../../core/public/mocks';
 
 export type Setup = jest.Mocked<UiActionsSetup>;
 export type Start = jest.Mocked<UiActionsStart>;
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index 2a2ad100a53d3..14c19f0b32184 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { UiActionsService } from './service';
 import { rowClickTrigger, visualizeFieldTrigger, visualizeGeoFieldTrigger } from './triggers';
diff --git a/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts b/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts
index aa6a76bf9a5f8..804ef1bcf858e 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_execution_service.ts
@@ -7,8 +7,8 @@
  */
 
 import { uniqBy } from 'lodash';
+import { defer as createDefer, Defer } from '@kbn/kibana-utils-plugin/public';
 import { Action } from '../actions';
-import { defer as createDefer, Defer } from '../../../kibana_utils/public';
 import { buildContextMenuForActions, openContextMenu } from '../context_menu';
 import { Trigger } from '../triggers';
 
diff --git a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
index 8d89b62ec208d..f6f4f3af8727c 100644
--- a/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
+++ b/src/plugins/ui_actions/public/service/ui_actions_service.test.ts
@@ -11,7 +11,7 @@ import { Action, ActionDefinition, ActionInternal, createAction } from '../actio
 import { createHelloWorldAction } from '../tests/test_samples';
 import { TriggerRegistry, ActionRegistry } from '../types';
 import { Trigger } from '../triggers';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 const FOO_TRIGGER = 'FOO_TRIGGER';
 const BAR_TRIGGER = 'BAR_TRIGGER';
diff --git a/src/plugins/ui_actions/public/services.ts b/src/plugins/ui_actions/public/services.ts
index 96088e086a771..60c4b81311960 100644
--- a/src/plugins/ui_actions/public/services.ts
+++ b/src/plugins/ui_actions/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceSetup } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceSetup>('Theme');
diff --git a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
index d372064c9ad37..37a02726d25ef 100644
--- a/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
+++ b/src/plugins/ui_actions/public/tests/get_trigger_compatible_actions.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { uiActionsPluginMock } from '../mocks';
-import { createHelloWorldAction } from '../tests/test_samples';
+import { createHelloWorldAction } from './test_samples';
 import { Action, createAction } from '../actions';
 import { Trigger } from '../triggers';
-import { OverlayStart } from 'kibana/public';
+import { OverlayStart } from '@kbn/core/public';
 
 let action: Action<{ name: string }>;
 let uiActions: ReturnType<typeof uiActionsPluginMock.createPlugin>;
diff --git a/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx b/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
index 4e0ba2852a421..c62c8fa1097d8 100644
--- a/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
+++ b/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge, EuiFlyoutBody } from '@elastic/eui';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint, reactToUiComponent } from '@kbn/kibana-react-plugin/public';
 import { createAction, Action } from '../../actions';
-import { toMountPoint, reactToUiComponent } from '../../../../kibana_react/public';
 
 const ReactMenuItem: React.FC = () => {
   return (
diff --git a/src/plugins/ui_actions/public/triggers/row_click_trigger.ts b/src/plugins/ui_actions/public/triggers/row_click_trigger.ts
index 40ffba7b79886..058366b765b55 100644
--- a/src/plugins/ui_actions/public/triggers/row_click_trigger.ts
+++ b/src/plugins/ui_actions/public/triggers/row_click_trigger.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { Trigger } from '.';
-import type { Datatable } from '../../../expressions';
 
 export const ROW_CLICK_TRIGGER = 'ROW_CLICK_TRIGGER';
 
diff --git a/src/plugins/ui_actions/public/util/presentable.ts b/src/plugins/ui_actions/public/util/presentable.ts
index 9e690b9ef3c08..6cc1116101cf0 100644
--- a/src/plugins/ui_actions/public/util/presentable.ts
+++ b/src/plugins/ui_actions/public/util/presentable.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { UiComponent } from 'src/plugins/kibana_utils/public';
+import { UiComponent } from '@kbn/kibana-utils-plugin/public';
 
 /**
  * Represents something that can be displayed to user in UI.
diff --git a/src/plugins/unified_search/public/actions/apply_filter_action.ts b/src/plugins/unified_search/public/actions/apply_filter_action.ts
index e9fb75c5bd6d5..36524cf3ff826 100644
--- a/src/plugins/unified_search/public/actions/apply_filter_action.ts
+++ b/src/plugins/unified_search/public/actions/apply_filter_action.ts
@@ -7,12 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ThemeServiceSetup } from 'kibana/public';
-import { toMountPoint } from '../../../kibana_react/public';
-import { Action, createAction, IncompatibleActionError } from '../../../ui_actions/public';
+import { ThemeServiceSetup } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { Action, createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { Filter, FilterManager, TimefilterContract, esFilters } from '@kbn/data-plugin/public';
 import { getOverlays, getIndexPatterns } from '../services';
 import { applyFiltersPopover } from '../apply_filters';
-import { Filter, FilterManager, TimefilterContract, esFilters } from '../../../data/public';
 
 export const ACTION_GLOBAL_APPLY_FILTER = 'ACTION_GLOBAL_APPLY_FILTER';
 
diff --git a/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
index 1daf3a719284f..25d6f27bc51f1 100644
--- a/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
@@ -19,10 +19,10 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Component } from 'react';
-import { getDisplayValueFromFilter, mapAndFlattenFilters } from '../../../data/public';
+import { getDisplayValueFromFilter, mapAndFlattenFilters } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterLabel } from '../filter_bar';
-import { Filter } from '../../../data/common';
-import { DataView } from '../../../data_views/public';
 
 interface Props {
   filters: Filter[];
diff --git a/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
index 45567f4c93d31..4cefbd1a202a0 100644
--- a/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
@@ -7,8 +7,8 @@
  */
 
 import React from 'react';
-import { Filter } from '../../../data/common';
-import { DataView } from '../../../data_views/common';
+import { Filter } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 
 type CancelFnType = () => void;
 type SubmitFnType = (filters: Filter[]) => void;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_bar.tsx b/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
index 136d83525a9f6..43b511b2c9f7d 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
@@ -22,13 +22,13 @@ import classNames from 'classnames';
 import React, { useState, useRef } from 'react';
 
 import { METRIC_TYPE } from '@kbn/analytics';
-import { FilterEditor } from './filter_editor';
-import { FILTER_EDITOR_WIDTH, FilterItem } from './filter_item';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterOptions } from './filter_options';
-import { useKibana } from '../../../kibana_react/public';
-import { UI_SETTINGS } from '../../../data/common';
-import { IDataPluginServices } from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+import { FILTER_EDITOR_WIDTH, FilterItem } from './filter_item';
+import { FilterEditor } from './filter_editor';
 
 export interface Props {
   filters: Filter[];
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
index 9bc8aa382bb03..87d0eca815cd8 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
@@ -10,8 +10,8 @@ import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { FilterEditor, Props } from '.';
 import React from 'react';
 
-jest.mock('../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
index 7596b5ba557a1..f136da2a7503a 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
@@ -32,6 +32,9 @@ import {
 import { get } from 'lodash';
 import React, { Component } from 'react';
 import { XJsonLang } from '@kbn/monaco';
+import { DataView, IFieldType } from '@kbn/data-views-plugin/common';
+import { getIndexPatternFromFilter } from '@kbn/data-plugin/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import {
   getFieldFromFilter,
@@ -44,9 +47,6 @@ import { Operator } from './lib/filter_operators';
 import { PhraseValueInput } from './phrase_value_input';
 import { PhrasesValuesInput } from './phrases_values_input';
 import { RangeValueInput } from './range_value_input';
-import { DataView, IFieldType } from '../../../../data_views/common';
-import { getIndexPatternFromFilter } from '../../../../data/public';
-import { CodeEditor } from '../../../../kibana_react/public';
 
 export interface Props {
   filter: Filter;
@@ -371,6 +371,7 @@ class FilterEditorUI extends Component<Props, State> {
             field={this.state.selectedField}
             values={this.state.params}
             onChange={this.onParamsChange}
+            onParamsUpdate={this.onParamsUpdate}
             timeRangeForSuggestionsOverride={this.props.timeRangeForSuggestionsOverride}
             fullWidth
           />
@@ -469,6 +470,10 @@ class FilterEditorUI extends Component<Props, State> {
     this.setState({ params });
   };
 
+  private onParamsUpdate = (value: string) => {
+    this.setState((prevState) => ({ params: [value, ...(prevState.params || [])] }));
+  };
+
   private onQueryDslChange = (queryDsl: string) => {
     this.setState({ queryDsl });
   };
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
index 7790bd601dcf5..d6c44228eb72f 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
@@ -13,8 +13,8 @@ import {
   rangeFilter,
   stubIndexPattern,
   stubFields,
-} from '../../../../../data/common/stubs';
-import { toggleFilterNegated } from '../../../../../data/common';
+} from '@kbn/data-plugin/common/stubs';
+import { toggleFilterNegated } from '@kbn/data-plugin/common';
 import {
   getFieldFromFilter,
   getFilterableFields,
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
index 488a6942dce85..f85b9a9e788d8 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
@@ -10,9 +10,9 @@ import dateMath from '@kbn/datemath';
 import { Filter, FieldFilter } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import isSemverValid from 'semver/functions/valid';
+import { isFilterable, IFieldType, IpAddress } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
-import { isFilterable, IFieldType, IpAddress } from '../../../../../data/common';
-import { DataView } from '../../../../../data_views/common';
 
 export function getFieldFromFilter(filter: FieldFilter, indexPattern: DataView) {
   return indexPattern.fields.find((field) => field.name === filter.meta.key);
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
index b3756701aaa9c..3bd0db41cb10c 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import FilterLabel from './filter_label';
 import { render } from '@testing-library/react';
-import { phraseFilter } from '../../../../../data/common/stubs';
+import { phraseFilter } from '@kbn/data-plugin/common/stubs';
 
 test('alias', () => {
   const filter = {
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
index 099f211deef00..0f5ea0cc136ad 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
@@ -9,8 +9,8 @@
 import React, { Fragment } from 'react';
 import { EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { Filter, FILTERS } from '@kbn/data-plugin/common';
 import { existsOperator, isOneOfOperator } from './filter_operators';
-import { Filter, FILTERS } from '../../../../../data/common';
 import type { FilterLabelStatus } from '../../filter_item';
 
 export interface FilterLabelProps {
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
index 515a4e7f85f65..c1e4d5361e3f8 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { FILTERS } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
-import { IFieldType } from '../../../../../data_views/common';
+import { IFieldType } from '@kbn/data-views-plugin/common';
 
 export interface Operator {
   message: string;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
index 68ed20e8c34dd..057a730e5cc40 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
@@ -9,10 +9,10 @@
 import React from 'react';
 import { debounce } from 'lodash';
 
-import { withKibana, KibanaReactContextValue } from '../../../../kibana_react/public';
-import { IFieldType, UI_SETTINGS } from '../../../../data/common';
-import { DataView } from '../../../../data_views/common';
-import { IDataPluginServices } from '../../../../data/public';
+import { withKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
+import { IFieldType, UI_SETTINGS } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
 
 export interface PhraseSuggestorProps {
   kibana: KibanaReactContextValue<IDataPluginServices>;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
index 6b8667b5043fe..cf8ef5dbabb20 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
@@ -10,10 +10,10 @@ import { EuiFormRow } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { uniq } from 'lodash';
 import React from 'react';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor';
 import { ValueInputType } from './value_input_type';
-import { withKibana } from '../../../../kibana_react/public';
 
 interface Props extends PhraseSuggestorProps {
   value?: string;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
index 0a89ba59d3299..aa819007001a2 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
@@ -10,13 +10,14 @@ import { EuiFormRow } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { uniq } from 'lodash';
 import React from 'react';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor';
-import { withKibana } from '../../../../kibana_react/public';
 
 interface Props extends PhraseSuggestorProps {
   values?: string[];
   onChange: (values: string[]) => void;
+  onParamsUpdate: (value: string) => void;
   intl: InjectedIntl;
   fullWidth?: boolean;
 }
@@ -24,7 +25,7 @@ interface Props extends PhraseSuggestorProps {
 class PhrasesValuesInputUI extends PhraseSuggestorUI<Props> {
   public render() {
     const { suggestions } = this.state;
-    const { values, intl, onChange, fullWidth } = this.props;
+    const { values, intl, onChange, fullWidth, onParamsUpdate } = this.props;
     const options = values ? uniq([...values, ...suggestions]) : suggestions;
     return (
       <EuiFormRow
@@ -40,11 +41,14 @@ class PhrasesValuesInputUI extends PhraseSuggestorUI<Props> {
             id: 'unifiedSearch.filter.filterEditor.valuesSelectPlaceholder',
             defaultMessage: 'Select values',
           })}
+          delimiter=","
           options={options}
           getLabel={(option) => option}
           selectedOptions={values || []}
           onSearchChange={this.onSearchChange}
-          onCreateOption={(option: string) => onChange([...(values || []), option])}
+          onCreateOption={(option: string) => {
+            onParamsUpdate(option.trim());
+          }}
           onChange={onChange}
           isClearable={false}
           data-test-subj="filterParamsComboBox phrasesParamsComboxBox"
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
index bb36682cb607d..3c1046d928981 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
@@ -11,8 +11,8 @@ import { EuiFormControlLayoutDelimited } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { get } from 'lodash';
 import React from 'react';
-import { useKibana } from '../../../../kibana_react/public';
-import { IFieldType } from '../../../../data/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IFieldType } from '@kbn/data-plugin/common';
 import { ValueInputType } from './value_input_type';
 
 interface RangeParams {
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
index 3b6f8a6879dfb..e66c5d52770f5 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
@@ -10,8 +10,8 @@ import { EuiFieldNumber, EuiFieldText, EuiSelect } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
+import { IFieldType } from '@kbn/data-views-plugin/common';
 import { validateParams } from './lib/filter_editor_utils';
-import { IFieldType } from '../../../../data_views/common';
 
 interface Props {
   value?: string | number;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_item.tsx b/src/plugins/unified_search/public/filter_bar/filter_item.tsx
index 571278fcf05d1..2f48a4ea4c758 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_item.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_item.tsx
@@ -17,11 +17,11 @@ import {
 } from '@kbn/es-query';
 import classNames from 'classnames';
 import React, { MouseEvent, useState, useEffect, HTMLAttributes } from 'react';
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { getIndexPatternFromFilter, getDisplayValueFromFilter } from '@kbn/data-plugin/public';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
-import { DataView } from '../../../data_views/public';
-import { getIndexPatternFromFilter, getDisplayValueFromFilter } from '../../../data/public';
 import { getIndexPatterns } from '../services';
 
 type PanelOptions = 'pinFilter' | 'editFilter' | 'negateFilter' | 'disableFilter' | 'deleteFilter';
diff --git a/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx b/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
index 69ef9edee5803..974b94e95b0e0 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
@@ -10,7 +10,7 @@ import { EuiBadge, EuiBadgeProps, useInnerText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { FC } from 'react';
 import { Filter, isFilterPinned } from '@kbn/es-query';
-import { FilterLabel } from '../';
+import { FilterLabel } from '..';
 import type { FilterLabelStatus } from '../filter_item';
 
 interface Props {
diff --git a/src/plugins/unified_search/public/index.ts b/src/plugins/unified_search/public/index.ts
index 3eb528dc07ba1..ff020ef1e8f94 100755
--- a/src/plugins/unified_search/public/index.ts
+++ b/src/plugins/unified_search/public/index.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ConfigSchema } from '../config';
 import { UnifiedSearchPublicPlugin } from './plugin';
 
diff --git a/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx b/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
index 4a86ab32db9ec..505b1deda7cdf 100644
--- a/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
+++ b/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
@@ -9,8 +9,8 @@
 import _ from 'lodash';
 import React from 'react';
 
-import { IndexPatternsContract } from '../../../data/public';
-import { IndexPatternSelect, IndexPatternSelectProps } from './';
+import { IndexPatternsContract } from '@kbn/data-plugin/public';
+import { IndexPatternSelect, IndexPatternSelectProps } from '.';
 
 // Takes in stateful runtime dependencies and pre-wires them to the component
 export function createIndexPatternSelect(indexPatternService: IndexPatternsContract) {
diff --git a/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx b/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
index 7555d00bac8b3..335787d2ee38a 100644
--- a/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
+++ b/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
@@ -11,7 +11,7 @@ import React, { Component } from 'react';
 
 import { Required } from '@kbn/utility-types';
 import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
-import { IndexPatternsContract } from '../../../data/public';
+import { IndexPatternsContract } from '@kbn/data-plugin/public';
 
 export type IndexPatternSelectProps = Required<
   Omit<
diff --git a/src/plugins/unified_search/public/plugin.ts b/src/plugins/unified_search/public/plugin.ts
index 9a7121ddc9114..6064d98ba554d 100755
--- a/src/plugins/unified_search/public/plugin.ts
+++ b/src/plugins/unified_search/public/plugin.ts
@@ -8,18 +8,18 @@
 
 import './index.scss';
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { Storage, IStorageWrapper } from '../../kibana_utils/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Storage, IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
 import { ConfigSchema } from '../config';
 import { setIndexPatterns, setTheme, setOverlays } from './services';
-import type { UsageCollectionSetup } from '../../usage_collection/public';
 import { createSearchBar } from './search_bar';
 import { createIndexPatternSelect } from './index_pattern_select';
 import { UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart } from './types';
 import type { UnifiedSearchStartDependencies, UnifiedSearchSetupDependencies } from './types';
 import { createFilterAction } from './actions/apply_filter_action';
 import { ACTION_GLOBAL_APPLY_FILTER } from './actions';
-import { APPLY_FILTER_TRIGGER } from '../../data/public';
 
 export class UnifiedSearchPublicPlugin
   implements Plugin<UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart>
diff --git a/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts b/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
index ed2d57afe348c..77853da4e5ec2 100644
--- a/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
+++ b/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
@@ -7,7 +7,7 @@
  */
 
 import { isEmpty } from 'lodash';
-import { DataViewsContract } from '../../../data_views/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export async function fetchIndexPatterns(
   indexPatternsService: DataViewsContract,
diff --git a/src/plugins/unified_search/public/query_string_input/index.tsx b/src/plugins/unified_search/public/query_string_input/index.tsx
index d0f22a2f41c52..74b3c2060b4e7 100644
--- a/src/plugins/unified_search/public/query_string_input/index.tsx
+++ b/src/plugins/unified_search/public/query_string_input/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { withKibana } from '../../../kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import type { QueryBarTopRowProps } from './query_bar_top_row';
 import type { QueryStringInputProps } from './query_string_input';
 
diff --git a/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx b/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
index 8106c9daf2817..0223fc85a3ddb 100644
--- a/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { QueryLanguageSwitcher, QueryLanguageSwitcherProps } from './language_switcher';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { coreMock } from '../../../../core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { EuiButtonEmpty, EuiIcon, EuiPopover } from '@elastic/eui';
 const startMock = coreMock.createStart();
diff --git a/src/plugins/unified_search/public/query_string_input/language_switcher.tsx b/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
index 0454d3066cd16..db42339e464c3 100644
--- a/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
+++ b/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
@@ -22,7 +22,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { useKibana } from '../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export interface QueryLanguageSwitcherProps {
   language: string;
diff --git a/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
index e417f274fa557..a5a481d9520f3 100644
--- a/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
+++ b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { ReactElement, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiText, EuiTourStep } from '@elastic/eui';
-import { IStorageWrapper } from '../../../kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const NO_DATA_POPOVER_STORAGE_KEY = 'data.noDataPopover';
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
index e8ca82782d11f..373c8a55b9b6b 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
@@ -14,12 +14,12 @@ import { render } from '@testing-library/react';
 import { EMPTY } from 'rxjs';
 
 import QueryBarTopRow from './query_bar_top_row';
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { stubIndexPattern } from '../../../data/public/stubs';
-import { UI_SETTINGS } from '../../../data/common';
+import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 const startMock = coreMock.createStart();
 
 const mockTimeHistory = {
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
index c5e27e5ca3336..de1fa659aa133 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -29,12 +29,12 @@ import {
   TimeHistoryContract,
   Query,
   getQueryLog,
-} from '../../../data/public';
-import { DataView } from '../../../data_views/public';
-import type { PersistedLog } from '../../../data/public';
-import { useKibana, withKibana } from '../../../kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { PersistedLog } from '@kbn/data-plugin/public';
+import { useKibana, withKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import QueryStringInputUI from './query_string_input';
-import { UI_SETTINGS } from '../../../data/common';
 import { NoDataPopover } from './no_data_popover';
 import { shallowEqual } from '../utils';
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
index f8c80473d4f0a..97ec8575f7ff5 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern } from '../../../data/public/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
 
 export const mockPersistedLog = {
   add: jest.fn(),
@@ -21,7 +21,7 @@ export const mockFetchIndexPatterns = jest
   .fn()
   .mockReturnValue(Promise.resolve([stubIndexPattern]));
 
-jest.mock('../../../data/public/query/persisted_log', () => ({
+jest.mock('@kbn/data-plugin/public/query/persisted_log', () => ({
   PersistedLog: mockPersistedLogFactory,
 }));
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
index 4a48b3cc42420..39d63a5c888cd 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
@@ -23,10 +23,10 @@ import { EuiTextArea, EuiIcon } from '@elastic/eui';
 import { QueryLanguageSwitcher } from './language_switcher';
 import QueryStringInputUI from './query_string_input';
 
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { stubIndexPattern } from '../../../data/public/stubs';
-import { KibanaContextProvider, withKibana } from '../../../kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
+import { KibanaContextProvider, withKibana } from '@kbn/kibana-react-plugin/public';
 
 jest.useFakeTimers();
 
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
index a9b093eb3c8bb..f4b99b8e86fb2 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
@@ -27,21 +27,21 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { compact, debounce, isEqual, isFunction } from 'lodash';
-import { Toast } from '../../../../core/public';
+import { Toast } from '@kbn/core/public';
 import {
   IDataPluginServices,
   Query,
   QuerySuggestion,
   QuerySuggestionTypes,
   getQueryLog,
-} from '../../../data/public';
-import { DataView } from '../../../data_views/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { PersistedLog } from '@kbn/data-plugin/public';
+import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '@kbn/data-plugin/common';
+import { KibanaReactContextValue, toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { matchPairs } from './match_pairs';
 import { toUser } from './to_user';
 import { fromUser } from './from_user';
-import type { PersistedLog } from '../../../data/public';
-import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '../../../data/common';
-import { KibanaReactContextValue, toMountPoint } from '../../../kibana_react/public';
 import { fetchIndexPatterns } from './fetch_index_patterns';
 import { QueryLanguageSwitcher } from './language_switcher';
 import type { SuggestionsListSize } from '../typeahead/suggestions_component';
diff --git a/src/plugins/unified_search/public/saved_query_form/index.ts b/src/plugins/unified_search/public/saved_query_form/index.ts
index 1590b8fc98927..d6553e6693790 100644
--- a/src/plugins/unified_search/public/saved_query_form/index.ts
+++ b/src/plugins/unified_search/public/saved_query_form/index.ts
@@ -7,5 +7,5 @@
  */
 
 // @internal
-export type { SavedQueryMeta } from '../saved_query_form/save_query_form';
-export { SaveQueryForm } from '../saved_query_form/save_query_form';
+export type { SavedQueryMeta } from './save_query_form';
+export { SaveQueryForm } from './save_query_form';
diff --git a/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx b/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
index 5aee148bb58bc..53c5ec3310da2 100644
--- a/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
+++ b/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { sortBy, isEqual } from 'lodash';
-import { SavedQuery, SavedQueryService } from '../../../data/public';
+import { SavedQuery, SavedQueryService } from '@kbn/data-plugin/public';
 
 interface Props {
   savedQuery?: SavedQuery;
diff --git a/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx b/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
index a99c49515aee5..71fbd8aad6e48 100644
--- a/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
+++ b/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
@@ -11,7 +11,7 @@ import { EuiListGroupItem, EuiConfirmModal, EuiIconTip } from '@elastic/eui';
 import React, { Fragment, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
-import { SavedQuery } from '../../../data/public';
+import { SavedQuery } from '@kbn/data-plugin/public';
 
 interface Props {
   savedQuery: SavedQuery;
diff --git a/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx b/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
index 29d7bda08cbc5..07d3a9d799a66 100644
--- a/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
+++ b/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
@@ -24,7 +24,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect, useState, Fragment, useRef } from 'react';
 import { sortBy } from 'lodash';
-import { SavedQuery, SavedQueryService } from '../../../data/public';
+import { SavedQuery, SavedQueryService } from '@kbn/data-plugin/public';
 import { SavedQueryListItem } from './saved_query_list_item';
 
 const perPage = 50;
diff --git a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
index a3491c1540ff0..3d8aa26af22af 100644
--- a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
@@ -8,18 +8,18 @@
 
 import _ from 'lodash';
 import React, { useEffect, useRef } from 'react';
-import { CoreStart } from '../../../../core/public';
-import { IStorageWrapper } from '../../../kibana_utils/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { QueryStart, SavedQuery, DataPublicPluginStart } from '../../../data/public';
-import { Filter, Query, TimeRange } from '../../../data/common';
+import { CoreStart } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { QueryStart, SavedQuery, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Filter, Query, TimeRange } from '@kbn/data-plugin/common';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SearchBar } from '.';
 import type { SearchBarOwnProps } from '.';
 import { useFilterManager } from './lib/use_filter_manager';
 import { useTimefilter } from './lib/use_timefilter';
 import { useSavedQuery } from './lib/use_saved_query';
 import { useQueryStringManager } from './lib/use_query_string_manager';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 interface StatefulSearchBarDeps {
   core: CoreStart;
diff --git a/src/plugins/unified_search/public/search_bar/index.tsx b/src/plugins/unified_search/public/search_bar/index.tsx
index 75fa878b5426a..f8c9de7ec7d87 100644
--- a/src/plugins/unified_search/public/search_bar/index.tsx
+++ b/src/plugins/unified_search/public/search_bar/index.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { injectI18n } from '@kbn/i18n-react';
-import { withKibana } from '../../../kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import type { SearchBarProps } from './search_bar';
 
 const Fallback = () => <div />;
diff --git a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
index e43833e25dfef..d05f4e8bb9aa0 100644
--- a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { clearStateFromSavedQuery } from './clear_saved_query';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { DataPublicPluginStart } from '../../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 describe('clearStateFromSavedQuery', () => {
   let dataMock: jest.Mocked<DataPublicPluginStart>;
diff --git a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
index 685dff3853422..dfe90be4cf0d1 100644
--- a/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QueryStart } from '../../../../data/public';
+import { QueryStart } from '@kbn/data-plugin/public';
 
 export const clearStateFromSavedQuery = (queryService: QueryStart) => {
   queryService.filterManager.removeAll();
diff --git a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
index c9813097839b6..67a2e4ea71c6a 100644
--- a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { populateStateFromSavedQuery } from './populate_state_from_saved_query';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { DataPublicPluginStart, SavedQuery } from '../../../../data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { DataPublicPluginStart, SavedQuery } from '@kbn/data-plugin/public';
 import { getFilter } from '../../test_helpers/get_stub_filter';
-import { FilterStateStore } from '../../../../data/common';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 
 describe('populateStateFromSavedQuery', () => {
   let dataMock: jest.Mocked<DataPublicPluginStart>;
diff --git a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
index 20023150ff263..cf53433f32c55 100644
--- a/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QueryStart, SavedQuery } from '../../../../data/public';
+import { QueryStart, SavedQuery } from '@kbn/data-plugin/public';
 
 export const populateStateFromSavedQuery = (queryService: QueryStart, savedQuery: SavedQuery) => {
   const {
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
index 871e1112761ad..511e05e043b26 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
@@ -8,7 +8,7 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, Filter } from '../../../../data/public';
+import { DataPublicPluginStart, Filter } from '@kbn/data-plugin/public';
 
 interface UseFilterManagerProps {
   filters?: Filter[];
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
index a9fc57ecbca3e..10b2c7b64e97c 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
@@ -8,8 +8,8 @@
 
 import { useState, useEffect, useMemo } from 'react';
 import { Subscription } from 'rxjs';
-import { Query } from '../../../../data/public';
-import type { QueryStringContract } from '../../../../data/public';
+import { Query } from '@kbn/data-plugin/public';
+import type { QueryStringContract } from '@kbn/data-plugin/public';
 
 interface UseQueryStringProps {
   query?: Query;
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
index bf6e46a096b55..7e8b41c73fcfd 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
@@ -9,9 +9,9 @@
 import { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { CoreStart } from 'kibana/public';
-import { SavedQuery } from '../../../../data/public';
-import { DataPublicPluginStart } from '../../../../data/public';
+import { CoreStart } from '@kbn/core/public';
+import { SavedQuery } from '@kbn/data-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { populateStateFromSavedQuery } from './populate_state_from_saved_query';
 import { clearStateFromSavedQuery } from './clear_saved_query';
 
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts b/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
index e8396bff7d27e..66d69f414c55c 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
@@ -8,7 +8,7 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, TimeRange, RefreshInterval } from '../../../../data/public';
+import { DataPublicPluginStart, TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
 
 interface UseTimefilterProps {
   dateRangeFrom?: string;
diff --git a/src/plugins/unified_search/public/search_bar/search_bar.test.tsx b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
index 727947dab984b..14310b69809e0 100644
--- a/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
@@ -9,14 +9,14 @@
 import React from 'react';
 import SearchBar from './search_bar';
 
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
-import { IIndexPattern } from '../../../data/public';
+import { IIndexPattern } from '@kbn/data-plugin/public';
 
 const mockTimeHistory = {
   get: () => {
diff --git a/src/plugins/unified_search/public/search_bar/search_bar.tsx b/src/plugins/unified_search/public/search_bar/search_bar.tsx
index 4a212db08998e..c829ab66bb60a 100644
--- a/src/plugins/unified_search/public/search_bar/search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.tsx
@@ -16,15 +16,15 @@ import memoizeOne from 'memoize-one';
 
 import { METRIC_TYPE } from '@kbn/analytics';
 import { Query, Filter } from '@kbn/es-query';
-import { withKibana, KibanaReactContextValue } from '../../../kibana_react/public';
+import { withKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
 
-import QueryBarTopRow from '../query_string_input/query_bar_top_row';
-import type { TimeHistoryContract, SavedQuery } from '../../../data/public';
-import type { SavedQueryAttributes } from '../../../data/common';
-import { IDataPluginServices } from '../../../data/public';
+import type { TimeHistoryContract, SavedQuery } from '@kbn/data-plugin/public';
+import type { SavedQueryAttributes } from '@kbn/data-plugin/common';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterBar } from '../filter_bar';
-import { TimeRange } from '../../../data/common';
-import { DataView } from '../../../data_views/public';
+import QueryBarTopRow from '../query_string_input/query_bar_top_row';
 import { SavedQueryMeta, SaveQueryForm } from '../saved_query_form';
 import { SavedQueryManagementComponent } from '../saved_query_management';
 
diff --git a/src/plugins/unified_search/public/services.ts b/src/plugins/unified_search/public/services.ts
index eb2008a107b31..4f8937baf8fdf 100644
--- a/src/plugins/unified_search/public/services.ts
+++ b/src/plugins/unified_search/public/services.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceStart, OverlayStart } from 'src/core/public';
-import { createGetterSetter } from '../../kibana_utils/public';
-import { DataViewsContract } from '../../data_views/public';
+import { ThemeServiceStart, OverlayStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export const [getIndexPatterns, setIndexPatterns] =
   createGetterSetter<DataViewsContract>('IndexPatterns');
diff --git a/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
index 037c89774b6c2..2954526d7ede8 100644
--- a/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
+++ b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Filter, FilterStateStore } from '../../../data/public';
+import { Filter, FilterStateStore } from '@kbn/data-plugin/public';
 
 export function getFilter(
   store: FilterStateStore,
diff --git a/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
index 39d140a10229f..d32ce1db3bdf6 100644
--- a/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
@@ -8,7 +8,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/data-plugin/public';
 import { SuggestionComponent } from './suggestion_component';
 
 const noop = () => {
diff --git a/src/plugins/unified_search/public/typeahead/suggestion_component.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
index dc5b94800f97b..9fd4f0ddb9652 100644
--- a/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
@@ -9,7 +9,7 @@
 import { EuiIcon } from '@elastic/eui';
 import classNames from 'classnames';
 import React, { useCallback } from 'react';
-import { QuerySuggestion } from '../../../data/public';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
 import { SuggestionOnClick, SuggestionOnMouseEnter } from './types';
 
 function getEuiIconType(type: string) {
diff --git a/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
index 947b1a0be4d1f..7f1715ed2d706 100644
--- a/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
@@ -8,7 +8,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../data/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/data-plugin/public';
 import { SuggestionComponent } from './suggestion_component';
 import SuggestionsComponent from './suggestions_component';
 
diff --git a/src/plugins/unified_search/public/typeahead/suggestions_component.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
index 9446653df2ee7..e9d5d51050f9d 100644
--- a/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
@@ -13,7 +13,7 @@ import classNames from 'classnames';
 import styled from 'styled-components';
 
 import useRafState from 'react-use/lib/useRafState';
-import { QuerySuggestion } from '../../../data/public';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
 import { SuggestionComponent } from './suggestion_component';
 import {
   SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE,
diff --git a/src/plugins/unified_search/public/typeahead/types.ts b/src/plugins/unified_search/public/typeahead/types.ts
index 25d4909800044..0da396ae56d73 100644
--- a/src/plugins/unified_search/public/typeahead/types.ts
+++ b/src/plugins/unified_search/public/typeahead/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QuerySuggestion } from '../../../data/public';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
 
 export type SuggestionOnClick = (suggestion: QuerySuggestion, index: number) => void;
 
diff --git a/src/plugins/unified_search/public/types.ts b/src/plugins/unified_search/public/types.ts
index b5de235e7a563..e113fd32f54ed 100755
--- a/src/plugins/unified_search/public/types.ts
+++ b/src/plugins/unified_search/public/types.ts
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataViewsPublicPluginStart } from '../../data_views/public';
-import type { FieldFormatsStart } from '../../field_formats/public';
-import { IndexPatternSelectProps, StatefulSearchBarProps } from './index';
-import type { DataPublicPluginStart } from '../../data/public';
-import type { UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { IndexPatternSelectProps, StatefulSearchBarProps } from '.';
 
 export interface UnifiedSearchSetupDependencies {
   uiActions: UiActionsSetup;
diff --git a/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts b/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts
index c45bde0d67891..56a3224a20495 100644
--- a/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts
+++ b/src/plugins/url_forwarding/public/forward_app/forward_app.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { Location } from 'history';
-import type { AppMountParameters, CoreSetup, ScopedHistory } from 'kibana/public';
-import { coreMock } from '../../../../core/public/mocks';
+import type { AppMountParameters, CoreSetup, ScopedHistory } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { UrlForwardingStart } from '../plugin';
 import { createLegacyUrlForwardApp } from './forward_app';
 
diff --git a/src/plugins/url_forwarding/public/forward_app/forward_app.ts b/src/plugins/url_forwarding/public/forward_app/forward_app.ts
index 3a66e207f8c26..5b4d62334ffcf 100644
--- a/src/plugins/url_forwarding/public/forward_app/forward_app.ts
+++ b/src/plugins/url_forwarding/public/forward_app/forward_app.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { App, AppMountParameters, CoreSetup } from 'kibana/public';
-import { AppNavLinkStatus } from '../../../../core/public';
+import { App, AppMountParameters, CoreSetup } from '@kbn/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { navigateToLegacyKibanaUrl } from './navigate_to_legacy_kibana_url';
 import { ForwardDefinition, UrlForwardingStart } from '../plugin';
 
diff --git a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts
index dda9b16238b2c..7b06fd4f67e2c 100644
--- a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts
+++ b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ForwardDefinition } from '../index';
+import { ForwardDefinition } from '..';
 import { navigateToLegacyKibanaUrl } from './navigate_to_legacy_kibana_url';
-import { CoreStart } from '../../../../core/public';
-import { coreMock } from '../../../../core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 describe('migrate legacy kibana urls', () => {
   let forwardDefinitions: ForwardDefinition[];
diff --git a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts
index aa1e05e005404..b14b423e46014 100644
--- a/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts
+++ b/src/plugins/url_forwarding/public/forward_app/navigate_to_legacy_kibana_url.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart, IBasePath } from 'kibana/public';
-import { ForwardDefinition } from '../index';
+import { ApplicationStart, IBasePath } from '@kbn/core/public';
+import { ForwardDefinition } from '..';
 import { normalizePath } from './normalize_path';
 
 export const navigateToLegacyKibanaUrl = (
diff --git a/src/plugins/url_forwarding/public/plugin.ts b/src/plugins/url_forwarding/public/plugin.ts
index ee56ba73eb24e..e9518668f7749 100644
--- a/src/plugins/url_forwarding/public/plugin.ts
+++ b/src/plugins/url_forwarding/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, CoreSetup } from 'kibana/public';
+import { CoreStart, CoreSetup } from '@kbn/core/public';
 import { createLegacyUrlForwardApp } from './forward_app';
 import { navigateToLegacyKibanaUrl } from './forward_app/navigate_to_legacy_kibana_url';
 
diff --git a/src/plugins/usage_collection/public/index.ts b/src/plugins/usage_collection/public/index.ts
index d5ac73b7758f5..bc5d418f48233 100644
--- a/src/plugins/usage_collection/public/index.ts
+++ b/src/plugins/usage_collection/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import { UsageCollectionPlugin } from './plugin';
 
 export type { UsageCollectionSetup, UsageCollectionStart } from './plugin';
diff --git a/src/plugins/usage_collection/public/plugin.tsx b/src/plugins/usage_collection/public/plugin.tsx
index 450c8903e1a5e..cbd637c237656 100644
--- a/src/plugins/usage_collection/public/plugin.tsx
+++ b/src/plugins/usage_collection/public/plugin.tsx
@@ -16,8 +16,8 @@ import type {
   CoreSetup,
   CoreStart,
   HttpSetup,
-} from 'src/core/public';
-import { Storage } from '../../kibana_utils/public';
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { createReporter, trackApplicationUsageChange } from './services';
 import { ApplicationUsageContext } from './components/track_application_view';
 
diff --git a/src/plugins/usage_collection/public/services/create_reporter.ts b/src/plugins/usage_collection/public/services/create_reporter.ts
index fb187d1c0c486..95d5fff9cc943 100644
--- a/src/plugins/usage_collection/public/services/create_reporter.ts
+++ b/src/plugins/usage_collection/public/services/create_reporter.ts
@@ -7,7 +7,7 @@
  */
 
 import { Reporter, Storage } from '@kbn/analytics';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 interface AnalyicsReporterConfig {
   localStorage: Storage;
diff --git a/src/plugins/usage_collection/server/collector/collector.test.ts b/src/plugins/usage_collection/server/collector/collector.test.ts
index 8c7971e52a4b9..e75a88d5adeea 100644
--- a/src/plugins/usage_collection/server/collector/collector.test.ts
+++ b/src/plugins/usage_collection/server/collector/collector.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock } from '../../../../core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Collector } from './collector';
 
 const logger = loggingSystemMock.createLogger();
diff --git a/src/plugins/usage_collection/server/collector/collector.ts b/src/plugins/usage_collection/server/collector/collector.ts
index 1ff04cf3650c0..4bec62f983595 100644
--- a/src/plugins/usage_collection/server/collector/collector.ts
+++ b/src/plugins/usage_collection/server/collector/collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { CollectorFetchMethod, CollectorOptions, ICollector } from './types';
 
 export class Collector<TFetchReturn, ExtraOptions extends object = {}>
diff --git a/src/plugins/usage_collection/server/collector/collector_set.test.ts b/src/plugins/usage_collection/server/collector/collector_set.test.ts
index 87e841f3de4c5..a3e8d2de19e60 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.test.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.test.ts
@@ -16,8 +16,8 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   executionContextServiceMock,
-} from '../../../../core/server/mocks';
-import type { ExecutionContextSetup, Logger } from 'src/core/server';
+} from '@kbn/core/server/mocks';
+import type { ExecutionContextSetup, Logger } from '@kbn/core/server';
 
 describe('CollectorSet', () => {
   let logger: jest.Mocked<Logger>;
diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts
index 3a7c0a66ac60d..90cf7e6450ea4 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.ts
@@ -13,7 +13,7 @@ import type {
   SavedObjectsClientContract,
   KibanaExecutionContext,
   ExecutionContextSetup,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { Collector } from './collector';
 import type { ICollector, CollectorOptions } from './types';
 import { UsageCollector, UsageCollectorOptions } from './usage_collector';
diff --git a/src/plugins/usage_collection/server/collector/types.ts b/src/plugins/usage_collection/server/collector/types.ts
index 141faf0ef2f6b..8eb9c7ba22595 100644
--- a/src/plugins/usage_collection/server/collector/types.ts
+++ b/src/plugins/usage_collection/server/collector/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
 
 import type { PossibleSchemaTypes } from '@elastic/analytics';
 
diff --git a/src/plugins/usage_collection/server/collector/usage_collector.ts b/src/plugins/usage_collection/server/collector/usage_collector.ts
index 2ed8c2a50dbaf..9a368798fcd82 100644
--- a/src/plugins/usage_collection/server/collector/usage_collector.ts
+++ b/src/plugins/usage_collection/server/collector/usage_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { CollectorOptions } from './types';
 import { Collector } from './collector';
 
diff --git a/src/plugins/usage_collection/server/config.ts b/src/plugins/usage_collection/server/config.ts
index f09dc7d431b33..bc183e31c0089 100644
--- a/src/plugins/usage_collection/server/config.ts
+++ b/src/plugins/usage_collection/server/config.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { DEFAULT_MAXIMUM_WAIT_TIME_FOR_ALL_COLLECTORS_IN_S } from '../common/constants';
 
 export const configSchema = schema.object({
diff --git a/src/plugins/usage_collection/server/index.ts b/src/plugins/usage_collection/server/index.ts
index 907a61a752052..7e66b1bd323b0 100644
--- a/src/plugins/usage_collection/server/index.ts
+++ b/src/plugins/usage_collection/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { UsageCollectionPlugin } from './plugin';
 
 export type {
diff --git a/src/plugins/usage_collection/server/mocks.ts b/src/plugins/usage_collection/server/mocks.ts
index ac7ad69ed4bce..bc59cf3cbef22 100644
--- a/src/plugins/usage_collection/server/mocks.ts
+++ b/src/plugins/usage_collection/server/mocks.ts
@@ -11,11 +11,11 @@ import {
   executionContextServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { CollectorOptions, CollectorSet } from './collector';
 import { Collector } from './collector/collector';
-import { UsageCollectionSetup, CollectorFetchContext } from './index';
+import { UsageCollectionSetup, CollectorFetchContext } from '.';
 import { usageCountersServiceMock } from './usage_counters/usage_counters_service.mock';
 export type { CollectorOptions };
 export { Collector };
diff --git a/src/plugins/usage_collection/server/plugin.ts b/src/plugins/usage_collection/server/plugin.ts
index 7cde8bad706dd..c8c44679cfa23 100644
--- a/src/plugins/usage_collection/server/plugin.ts
+++ b/src/plugins/usage_collection/server/plugin.ts
@@ -15,7 +15,7 @@ import type {
   Plugin,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { ConfigType } from './config';
 import { CollectorSet } from './collector';
 import type { Collector, CollectorOptions, UsageCollectorOptions } from './collector';
diff --git a/src/plugins/usage_collection/server/report/store_application_usage.test.ts b/src/plugins/usage_collection/server/report/store_application_usage.test.ts
index c4c9e5746e6cb..97028f3cc92f2 100644
--- a/src/plugins/usage_collection/server/report/store_application_usage.test.ts
+++ b/src/plugins/usage_collection/server/report/store_application_usage.test.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getDailyId } from '../../common/application_usage';
 import { storeApplicationUsage } from './store_application_usage';
 import { ApplicationUsageReport } from './schema';
diff --git a/src/plugins/usage_collection/server/report/store_application_usage.ts b/src/plugins/usage_collection/server/report/store_application_usage.ts
index 2058b054fda8c..5add00a2704e3 100644
--- a/src/plugins/usage_collection/server/report/store_application_usage.ts
+++ b/src/plugins/usage_collection/server/report/store_application_usage.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { Writable } from '@kbn/utility-types';
-import { ISavedObjectsRepository } from 'src/core/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { ApplicationUsageReport } from './schema';
 import { getDailyId } from '../../common/application_usage';
 
diff --git a/src/plugins/usage_collection/server/report/store_report.test.ts b/src/plugins/usage_collection/server/report/store_report.test.ts
index 789e01020bb2e..b80c0eb6ab9ef 100644
--- a/src/plugins/usage_collection/server/report/store_report.test.ts
+++ b/src/plugins/usage_collection/server/report/store_report.test.ts
@@ -8,7 +8,7 @@
 
 import { storeApplicationUsageMock } from './store_report.test.mocks';
 
-import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { storeReport } from './store_report';
 import { ReportSchemaType } from './schema';
 import { METRIC_TYPE } from '@kbn/analytics';
diff --git a/src/plugins/usage_collection/server/report/store_report.ts b/src/plugins/usage_collection/server/report/store_report.ts
index 1647fb8893be1..234bab7d7202c 100644
--- a/src/plugins/usage_collection/server/report/store_report.ts
+++ b/src/plugins/usage_collection/server/report/store_report.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ISavedObjectsRepository } from 'src/core/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import moment from 'moment';
 import { chain, sumBy } from 'lodash';
 import { ReportSchemaType } from './schema';
diff --git a/src/plugins/usage_collection/server/routes/index.ts b/src/plugins/usage_collection/server/routes/index.ts
index 20949224c0f6d..b96414707f78b 100644
--- a/src/plugins/usage_collection/server/routes/index.ts
+++ b/src/plugins/usage_collection/server/routes/index.ts
@@ -11,7 +11,7 @@ import {
   ISavedObjectsRepository,
   MetricsServiceSetup,
   ServiceStatus,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { Observable } from 'rxjs';
 import { CollectorSet } from '../collector';
 import { registerUiCountersRoute } from './ui_counters';
diff --git a/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts b/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts
index 181535552a7f6..4412eeb78c428 100644
--- a/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts
+++ b/src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts
@@ -8,18 +8,14 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import {
-  MetricsServiceSetup,
-  ServiceStatus,
-  ServiceStatusLevels,
-} from '../../../../../core/server';
+import { MetricsServiceSetup, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import {
   contextServiceMock,
   loggingSystemMock,
   metricsServiceMock,
   executionContextServiceMock,
-} from '../../../../../core/server/mocks';
-import { createHttpServer } from '../../../../../core/server/test_utils';
+} from '@kbn/core/server/mocks';
+import { createHttpServer } from '@kbn/core/server/test_utils';
 import { registerStatsRoute } from '../stats';
 import supertest from 'supertest';
 import { CollectorSet } from '../../collector';
diff --git a/src/plugins/usage_collection/server/routes/stats/stats.ts b/src/plugins/usage_collection/server/routes/stats/stats.ts
index 72cbd2e5899ff..2c6c8e77d8cdf 100644
--- a/src/plugins/usage_collection/server/routes/stats/stats.ts
+++ b/src/plugins/usage_collection/server/routes/stats/stats.ts
@@ -9,8 +9,7 @@
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
 import defaultsDeep from 'lodash/defaultsDeep';
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { firstValueFrom, Observable } from 'rxjs';
 
 import {
   ElasticsearchClient,
@@ -19,7 +18,7 @@ import {
   SavedObjectsClientContract,
   ServiceStatus,
   ServiceStatusLevels,
-} from '../../../../../core/server';
+} from '@kbn/core/server';
 import { CollectorSet } from '../../collector';
 const SNAPSHOT_REGEX = /-snapshot/i;
 
@@ -143,12 +142,11 @@ export function registerStatsRoute({
       }
 
       // Guaranteed to resolve immediately due to replay effect on getOpsMetrics$
-      const { collected_at: collectedAt, ...lastMetrics } = await metrics
-        .getOpsMetrics$()
-        .pipe(first())
-        .toPromise();
+      const { collected_at: collectedAt, ...lastMetrics } = await firstValueFrom(
+        metrics.getOpsMetrics$()
+      );
 
-      const overallStatus = await overallStatus$.pipe(first()).toPromise();
+      const overallStatus = await firstValueFrom(overallStatus$);
       const kibanaStats = collectorSet.toApiFieldNames({
         ...lastMetrics,
         kibana: {
diff --git a/src/plugins/usage_collection/server/routes/ui_counters.ts b/src/plugins/usage_collection/server/routes/ui_counters.ts
index c03541b1032b6..f4d7385195012 100644
--- a/src/plugins/usage_collection/server/routes/ui_counters.ts
+++ b/src/plugins/usage_collection/server/routes/ui_counters.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, ISavedObjectsRepository } from 'src/core/server';
+import { IRouter, ISavedObjectsRepository } from '@kbn/core/server';
 import { storeReport, reportSchema } from '../report';
 import { UsageCounter } from '../usage_counters';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
index f857d449312e6..cb3c5e7683b16 100644
--- a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { serializeCounterKey, storeCounter } from './saved_objects';
-import { savedObjectsRepositoryMock } from '../../../../core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { CounterMetric } from './usage_counter';
 import moment from 'moment';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
index 34de2adac8086..2752696f24711 100644
--- a/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
+++ b/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
@@ -11,7 +11,7 @@ import type {
   SavedObjectsRepository,
   SavedObjectAttributes,
   SavedObjectsServiceSetup,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import moment from 'moment';
 import type { CounterMetric } from './usage_counter';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
index 8a76368c8cd9d..406fa9c9ee7ca 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
@@ -8,7 +8,7 @@
 
 /* eslint-disable dot-notation */
 import { UsageCountersService } from './usage_counters_service';
-import { loggingSystemMock, coreMock } from '../../../../core/server/mocks';
+import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
 import * as rxOp from 'rxjs/operators';
 import moment from 'moment';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
index a698ea3db5bad..095f314a8e80b 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
@@ -12,8 +12,8 @@ import {
   SavedObjectsRepository,
   SavedObjectsServiceSetup,
   SavedObjectsServiceStart,
-} from 'src/core/server';
-import type { Logger, LogMeta } from 'src/core/server';
+} from '@kbn/core/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 
 import moment from 'moment';
 import { CounterMetric, UsageCounter } from './usage_counter';
@@ -49,16 +49,16 @@ export interface UsageCountersServiceStartDeps {
 }
 
 export class UsageCountersService {
-  private readonly stop$ = new Rx.Subject();
+  private readonly stop$ = new Rx.Subject<void>();
   private readonly retryCount: number;
   private readonly bufferDurationMs: number;
 
   private readonly counterSets = new Map<string, UsageCounter>();
   private readonly source$ = new Rx.Subject<CounterMetric>();
   private readonly counter$ = this.source$.pipe(rxOp.multicast(new Rx.Subject()), rxOp.refCount());
-  private readonly flushCache$ = new Rx.Subject<CounterMetric>();
+  private readonly flushCache$ = new Rx.Subject<void>();
 
-  private readonly stopCaching$ = new Rx.Subject();
+  private readonly stopCaching$ = new Rx.Subject<void>();
 
   private readonly logger: Logger;
 
diff --git a/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts b/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts
index 5b40e1c422672..a6ef90756d42b 100644
--- a/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts
+++ b/src/plugins/vis_default_editor/public/agg_filters/agg_type_field_filters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggConfig, IndexPatternField } from '../../../data/public';
+import { IAggConfig, IndexPatternField } from '@kbn/data-plugin/public';
 
 type AggTypeFieldFilter = (field: IndexPatternField, aggConfig: IAggConfig) => boolean;
 
diff --git a/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts b/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts
index 39ed7f69de338..879c6f340bde7 100644
--- a/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts
+++ b/src/plugins/vis_default_editor/public/agg_filters/agg_type_filters.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggType, IAggConfig, IndexPattern, search } from '../../../data/public';
+import { IAggType, IAggConfig, IndexPattern, search } from '@kbn/data-plugin/public';
 
 const { propFilter } = search.aggs;
 const filterByName = propFilter('name');
diff --git a/src/plugins/vis_default_editor/public/components/agg.test.tsx b/src/plugins/vis_default_editor/public/components/agg.test.tsx
index 7d3892d9beaab..b3688fefaee74 100644
--- a/src/plugins/vis_default_editor/public/components/agg.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import { IndexPattern, IAggType, AggGroupNames } from 'src/plugins/data/public';
-import type { Schema } from '../../../visualizations/public';
+import { IndexPattern, IAggType, AggGroupNames } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { DefaultEditorAggParams } from './agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/agg.tsx b/src/plugins/vis_default_editor/public/components/agg.tsx
index b813519d8caf9..3413eb46a9c34 100644
--- a/src/plugins/vis_default_editor/public/components/agg.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig, TimeRange } from 'src/plugins/data/public';
+import { IAggConfig, TimeRange } from '@kbn/data-plugin/public';
 import { DefaultEditorAggParams } from './agg_params';
 import { DefaultEditorAggCommonProps } from './agg_common_props';
 import { AGGS_ACTION_KEYS, AggsAction } from './agg_group_state';
diff --git a/src/plugins/vis_default_editor/public/components/agg_add.tsx b/src/plugins/vis_default_editor/public/components/agg_add.tsx
index afd830ff87fea..b42eab5fb9ec0 100644
--- a/src/plugins/vis_default_editor/public/components/agg_add.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_add.tsx
@@ -18,8 +18,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { IAggConfig, AggGroupNames } from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+import { IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 interface DefaultEditorAggAddProps {
   group?: IAggConfig[];
diff --git a/src/plugins/vis_default_editor/public/components/agg_common_props.ts b/src/plugins/vis_default_editor/public/components/agg_common_props.ts
index 7c097ef9a3e8d..0f9882a53fe2e 100644
--- a/src/plugins/vis_default_editor/public/components/agg_common_props.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_common_props.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { VisParams, Schema } from 'src/plugins/visualizations/public';
-import type { IAggType, IAggConfig, AggGroupName } from 'src/plugins/data/public';
+import type { VisParams, Schema } from '@kbn/visualizations-plugin/public';
+import type { IAggType, IAggConfig, AggGroupName } from '@kbn/data-plugin/public';
 
 import type { EditorVisState } from './sidebar/state/reducers';
 
diff --git a/src/plugins/vis_default_editor/public/components/agg_group.test.tsx b/src/plugins/vis_default_editor/public/components/agg_group.test.tsx
index 55179e7e20ae8..91edd90655956 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import type { IAggConfigs, IAggConfig } from 'src/plugins/data/public';
-import { ISchemas } from 'src/plugins/visualizations/public';
-import { createMockedVisEditorSchemas } from 'src/plugins/visualizations/public/mocks';
+import type { IAggConfigs, IAggConfig } from '@kbn/data-plugin/public';
+import { ISchemas } from '@kbn/visualizations-plugin/public';
+import { createMockedVisEditorSchemas } from '@kbn/visualizations-plugin/public/mocks';
 
 import { DefaultEditorAggGroup, DefaultEditorAggGroupProps } from './agg_group';
 import { DefaultEditorAgg } from './agg';
diff --git a/src/plugins/vis_default_editor/public/components/agg_group.tsx b/src/plugins/vis_default_editor/public/components/agg_group.tsx
index c13b260437d59..26304ba7f17f0 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group.tsx
@@ -19,8 +19,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames, AggGroupLabels, IAggConfig, TimeRange } from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+import { AggGroupNames, AggGroupLabels, IAggConfig, TimeRange } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
 import { AddSchema, ReorderAggs, DefaultEditorAggCommonProps } from './agg_common_props';
diff --git a/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts b/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts
index 0889844bd86cd..dffd971b0e79c 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_group_helper.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { IAggConfig } from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+import type { IAggConfig } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import {
   isAggRemovable,
diff --git a/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx b/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx
index f5d5529a4b4e8..95f1cdf01aad7 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx
@@ -7,8 +7,8 @@
  */
 
 import { findIndex, isEmpty } from 'lodash';
-import type { IAggConfig } from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+import type { IAggConfig } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import { getSchemaByName } from '../schemas';
 import type { AggsState } from './agg_group_state';
diff --git a/src/plugins/vis_default_editor/public/components/agg_group_state.tsx b/src/plugins/vis_default_editor/public/components/agg_group_state.tsx
index 5a1fa6056f925..2bf7b3e31f727 100644
--- a/src/plugins/vis_default_editor/public/components/agg_group_state.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_group_state.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 
 export enum AGGS_ACTION_KEYS {
   TOUCHED = 'aggsTouched',
diff --git a/src/plugins/vis_default_editor/public/components/agg_param_props.ts b/src/plugins/vis_default_editor/public/components/agg_param_props.ts
index f115f99f2f13c..98428967ab370 100644
--- a/src/plugins/vis_default_editor/public/components/agg_param_props.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_param_props.ts
@@ -11,8 +11,8 @@ import {
   AggParam,
   IndexPatternField,
   OptionedValueProp,
-} from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from './utils';
 import { EditorVisState } from './sidebar/state/reducers';
diff --git a/src/plugins/vis_default_editor/public/components/agg_params.test.tsx b/src/plugins/vis_default_editor/public/components/agg_params.test.tsx
index 2f71ae3b7ecd1..fd75b06c41250 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_params.test.tsx
@@ -9,13 +9,13 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { IndexPattern, IAggConfig, AggGroupNames } from 'src/plugins/data/public';
+import { IndexPattern, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import {
   DefaultEditorAggParams as PureDefaultEditorAggParams,
   DefaultEditorAggParamsProps,
 } from './agg_params';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { dataPluginMock } from '../../../data/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { EditorVisState } from './sidebar/state/reducers';
 
 const mockEditorConfig = {
diff --git a/src/plugins/vis_default_editor/public/components/agg_params.tsx b/src/plugins/vis_default_editor/public/components/agg_params.tsx
index 03c4823d22c8c..a664a0f1fe3fa 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_params.tsx
@@ -11,9 +11,10 @@ import { EuiForm, EuiAccordion, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useUnmount from 'react-use/lib/useUnmount';
 
-import { IAggConfig, IndexPattern, AggGroupNames } from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+import { IAggConfig, IndexPattern, AggGroupNames } from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
 import {
@@ -30,7 +31,6 @@ import {
 import { DefaultEditorCommonProps } from './agg_common_props';
 import { EditorParamConfig, TimeIntervalParam, FixedParam, getEditorConfig } from './utils';
 import { getSchemaByName } from '../schemas';
-import { useKibana } from '../../../kibana_react/public';
 import { VisDefaultEditorKibanaServices } from '../types';
 
 const FIXED_VALUE_PROP = 'fixedValue';
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts
index c38af03646216..7bf2328ab3b06 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.test.ts
@@ -12,8 +12,8 @@ import {
   IAggConfig,
   IAggType,
   IndexPattern,
-} from 'src/plugins/data/public';
-import type { Schema } from 'src/plugins/visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import {
   getAggParamsToRender,
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
index 55db880a83932..5c51ac8dd4521 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -15,8 +15,8 @@ import {
   IAggType,
   IndexPattern,
   IndexPatternField,
-} from '../../../data/public';
-import type { Schema } from '../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 import { filterAggTypes, filterAggTypeFields } from '../agg_filters';
 import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_map.ts b/src/plugins/vis_default_editor/public/components/agg_params_map.ts
index 283e1d7511b75..e7361af3b7e6d 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_map.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_map.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { AggGroupNames, BUCKET_TYPES, METRIC_TYPES, search } from '@kbn/data-plugin/public';
 import * as controls from './controls';
-import { AggGroupNames, BUCKET_TYPES, METRIC_TYPES, search } from '../../../data/public';
 import { wrapWithInlineComp } from './controls/utils';
 
 const { siblingPipelineType, parentPipelineType } = search.aggs;
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 279658111cdf1..dc0fc9b2ff22d 100644
--- a/src/plugins/vis_default_editor/public/components/agg_select.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_select.tsx
@@ -12,10 +12,10 @@ import React, { useEffect, useCallback, useState } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow, EuiLink, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { IAggType, IndexPattern } from 'src/plugins/data/public';
+import { IAggType, IndexPattern } from '@kbn/data-plugin/public';
 
-import { DocLinksStart } from '../../../../core/public';
-import { useKibana } from '../../../kibana_react/public';
+import { DocLinksStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComboBoxGroupedOptions } from '../utils';
 import { AGG_TYPE_ACTION_KEYS, AggTypeAction } from './agg_params_state';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx b/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
index ba87c7ac8c6dc..ba19df4f2d978 100644
--- a/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisParams } from 'src/plugins/visualizations/public';
-import { IAggConfig } from 'src/plugins/data/public';
+import { VisParams } from '@kbn/visualizations-plugin/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import { DefaultEditorAggCommonProps } from '../agg_common_props';
 
 export interface AggControlProps {
diff --git a/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx b/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
index 42c0afaa6b9d5..34d3bc520f00b 100644
--- a/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
@@ -9,7 +9,7 @@
 import React, { FunctionComponent } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import {
   safeMakeLabel,
   useAvailableOptions,
diff --git a/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx
index 1c721cde37b2b..89a6109c52fc7 100644
--- a/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/components/from_to_list.tsx
@@ -10,7 +10,7 @@ import React, { useCallback } from 'react';
 import { EuiFieldText, EuiFlexItem, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { search } from '../../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 import { InputList, InputListConfig, InputModel, InputObject, InputItem } from './input_list';
 
 const EMPTY_STRING = '';
diff --git a/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
index 39959f7560ce2..a63848c1d14ce 100644
--- a/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
@@ -10,8 +10,8 @@ import React, { useCallback } from 'react';
 import { EuiFieldText, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { search } from '@kbn/data-plugin/public';
 import { InputList, InputListConfig, InputObject, InputModel, InputItem } from './input_list';
-import { search } from '../../../../../data/public';
 
 const EMPTY_STRING = '';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx
index 00da70d7687f8..f2400d9c6462d 100644
--- a/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/date_ranges.test.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DateRangesParamEditor } from './date_ranges';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import { docLinksServiceMock } from '../../../../../core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 describe('DateRangesParamEditor component', () => {
   let setValue: jest.Mock;
diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
index f060cfb311023..96cb0761d610c 100644
--- a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
@@ -26,9 +26,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { isEqual, omit } from 'lodash';
 import useMount from 'react-use/lib/useMount';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 const FROM_PLACEHOLDER = '\u2212\u221E';
diff --git a/src/plugins/vis_default_editor/public/components/controls/field.test.tsx b/src/plugins/vis_default_editor/public/components/controls/field.test.tsx
index 55ea1dbfc56a3..af86377b179d1 100644
--- a/src/plugins/vis_default_editor/public/components/controls/field.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/field.test.tsx
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { mount, shallow, ReactWrapper } from 'enzyme';
 import { EuiComboBoxProps, EuiComboBox } from '@elastic/eui';
 
-import { IAggConfig, IndexPatternField, AggParam } from 'src/plugins/data/public';
+import { IAggConfig, IndexPatternField, AggParam } from '@kbn/data-plugin/public';
 import { ComboBoxGroupedOptions } from '../../utils';
 import { FieldParamEditor, FieldParamEditorProps } from './field';
 import { EditorVisState } from '../sidebar/state/reducers';
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 f8db2d89888a2..88f00d073609e 100644
--- a/src/plugins/vis_default_editor/public/components/controls/field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/field.tsx
@@ -19,7 +19,7 @@ import {
   IFieldParamType,
   IndexPatternField,
   KBN_FIELD_TYPES,
-} from '../../../../../plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { formatListAsProse, parseCommaSeparatedList, useValidation } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { ComboBoxGroupedOptions } from '../../utils';
diff --git a/src/plugins/vis_default_editor/public/components/controls/filter.tsx b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
index 120c3b8871c45..9796179ed2a9c 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filter.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
@@ -10,10 +10,10 @@ import React, { useState } from 'react';
 import { EuiForm, EuiButtonIcon, EuiFieldText, EuiFormRow, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig, Query, DataPublicPluginStart } from '../../../../data/public';
-import { QueryStringInput } from '../../../../unified_search/public';
+import { IAggConfig, Query, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface FilterRowProps {
   id: string;
diff --git a/src/plugins/vis_default_editor/public/components/controls/filters.tsx b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
index 8a73520c91376..3236e16903b9f 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filters.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
@@ -12,9 +12,9 @@ import { htmlIdGenerator, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useMount from 'react-use/lib/useMount';
 
-import { Query, DataPublicPluginStart } from '../../../../data/public';
-import { IUiSettingsClient } from '../../../../../core/public';
-import { useKibana } from '../../../../kibana_react/public';
+import { Query, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { FilterRow } from './filter';
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx b/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
index d83035ea31fcc..30e49f8696892 100644
--- a/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
@@ -9,7 +9,7 @@
 import React, { useEffect, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 import { SwitchParamEditor } from './switch';
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx b/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
index 242d0357dc3f8..ca22abfbbc2a2 100644
--- a/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
@@ -7,9 +7,9 @@
  */
 
 import React, { useEffect } from 'react';
+import { search } from '@kbn/data-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 import { StringParamEditor } from './string';
-import { search } from '../../../../data/public';
 import { SimpleNumberList } from './components/simple_number_list';
 const { isNumberType } = search.aggs;
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx b/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
index 6ad6f6179dfc8..f8ffe53781021 100644
--- a/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
@@ -10,9 +10,9 @@ import React, { useCallback, useEffect } from 'react';
 import { EuiFormRow, EuiFieldNumber, EuiFieldNumberProps, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
-import { UI_SETTINGS } from '../../../../data/public';
 
 export interface SizeParamEditorProps extends AggParamEditorProps<number | ''> {
   iconTip?: React.ReactNode;
diff --git a/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx b/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
index 22959e70f7299..40ec11c010a1a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import { DEFAULT_OPTIONS, aggFilter, MetricAggParamEditor } from './metric_agg';
 
 jest.mock('./utils', () => ({
diff --git a/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx b/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
index 5b4a0b47c735d..d3e4e9201a89e 100644
--- a/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
@@ -8,9 +8,9 @@
 
 import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+import { search } from '@kbn/data-plugin/public';
 import { SwitchParamEditor } from './switch';
 
-import { search } from '../../../../data/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function MissingBucketParamEditor(props: AggParamEditorProps<boolean>) {
diff --git a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
index e5f90dc382e49..e1d7a058acd61 100644
--- a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { UI_SETTINGS } from '../../../../data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/order.tsx b/src/plugins/vis_default_editor/public/components/controls/order.tsx
index d6c0904b76cc1..68a909878465a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order.tsx
@@ -10,7 +10,7 @@ import React, { useEffect } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { OptionedValueProp } from 'src/plugins/data/public';
+import { OptionedValueProp } from '@kbn/data-plugin/public';
 import { AggParamEditorProps, OptionedParamEditorProps } from '../agg_param_props';
 
 function OrderParamEditor({
diff --git a/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx b/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx
index d3dd9900f4eda..00d04898782e7 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order_agg.tsx
@@ -9,7 +9,7 @@
 import React, { useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../../../data/public';
+import { AggParamType, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/controls/order_by.tsx b/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
index 690face8f1261..5cde95a9a5060 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
@@ -11,6 +11,7 @@ import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useMount from 'react-use/lib/useMount';
 
+import { search } from '@kbn/data-plugin/public';
 import {
   isCompatibleAggregation,
   useAvailableOptions,
@@ -18,7 +19,6 @@ import {
   useValidation,
 } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
-import { search } from '../../../../data/public';
 
 const { termsAggFilter } = search.aggs;
 const DEFAULT_VALUE = '_key';
diff --git a/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx b/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx
index a02bdc6cdb6b4..17555391abc8a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/palette_picker.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import { PalettePicker, PalettePickerProps } from './palette_picker';
-import { chartPluginMock } from '../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EuiColorPalettePicker } from '@elastic/eui';
 
 describe('PalettePicker', function () {
diff --git a/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx b/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
index a94c68c944d12..260ef34718107 100644
--- a/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { AggParamEditorProps } from '../agg_param_props';
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
 import { PercentilesEditor } from './percentiles';
 import { EditorVisState } from '../sidebar/state/reducers';
diff --git a/src/plugins/vis_default_editor/public/components/controls/precision.tsx b/src/plugins/vis_default_editor/public/components/controls/precision.tsx
index 34fc484df8c5a..2e9c2b252fa63 100644
--- a/src/plugins/vis_default_editor/public/components/controls/precision.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/precision.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 
 import { EuiRange, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function PrecisionParamEditor({ agg, value, setValue }: AggParamEditorProps<number>) {
diff --git a/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx b/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx
index 6e5ae78e54dc1..4c98ad351716a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/raw_json.tsx
@@ -11,8 +11,8 @@ import React, { useState, useMemo, useCallback } from 'react';
 import { EuiFormRow, EuiIconTip, EuiScreenReaderOnly } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { XJsonLang } from '@kbn/monaco';
-import { CodeEditor } from '../../../../kibana_react/public';
-import { XJson } from '../../../../es_ui_shared/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx b/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx
index fa04dc7981bee..7d7c60df6e4a2 100644
--- a/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/sub_agg.tsx
@@ -9,7 +9,7 @@
 import React, { useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../../../data/public';
+import { AggParamType, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx b/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx
index 5b5115e58ce35..2b05c3332846a 100644
--- a/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/sub_metric.tsx
@@ -11,7 +11,7 @@ import { EuiFormLabel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useMount from 'react-use/lib/useMount';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../../../data/public';
+import { AggParamType, IAggConfig, AggGroupNames } from '@kbn/data-plugin/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/plugins/vis_default_editor/public/components/controls/test_utils.ts b/src/plugins/vis_default_editor/public/components/controls/test_utils.ts
index 39001c7748a33..8e6095e1e6ed0 100644
--- a/src/plugins/vis_default_editor/public/components/controls/test_utils.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/test_utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IAggConfig, AggParam } from 'src/plugins/data/public';
+import { IAggConfig, AggParam } from '@kbn/data-plugin/public';
 import { EditorConfig } from '../utils';
 import { EditorVisState } from '../sidebar/state/reducers';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx b/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx
index d1179bcb162ef..c23e91a68b8bf 100644
--- a/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/time_interval.test.tsx
@@ -12,7 +12,7 @@ import { TimeIntervalParamEditor } from './time_interval';
 import { aggParamCommonPropsMock } from './test_utils';
 import { AggParamEditorProps } from '../agg_param_props';
 
-jest.mock('../../../../data/public', () => ({
+jest.mock('@kbn/data-plugin/public', () => ({
   search: {
     aggs: {
       isValidInterval: jest.fn().mockReturnValue(true),
@@ -22,7 +22,7 @@ jest.mock('../../../../data/public', () => ({
   },
 }));
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 
 describe('TimeIntervalParamEditor', () => {
   let props: AggParamEditorProps<string>;
diff --git a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
index 9b5c450669eee..f6d4a9e003d2b 100644
--- a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx
@@ -12,7 +12,7 @@ import { EuiFormRow, EuiIconTip, EuiComboBox, EuiComboBoxOptionOption } from '@e
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { search, AggParamOption } from '../../../../data/public';
+import { search, AggParamOption } from '@kbn/data-plugin/public';
 import { AggParamEditorProps } from '../agg_param_props';
 const { parseEsInterval, InvalidEsCalendarIntervalError } = search.aggs;
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
index 95e3a74a66d70..c8ced47ff92c0 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
@@ -14,7 +14,7 @@ import {
   TopAggregateParamEditorProps,
 } from './top_aggregate';
 import { aggParamCommonPropsMock } from './test_utils';
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 
 describe('TopAggregateParamEditor', () => {
   let agg: IAggConfig;
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
index 35c352635a27c..62cc98a9293a6 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
@@ -16,7 +16,7 @@ import {
   AggParam,
   OptionedValueProp,
   OptionedParamType,
-} from 'src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { AggParamEditorProps, OptionedParamEditorProps } from '../agg_param_props';
 
 export interface AggregateValueProp extends OptionedValueProp {
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_field.tsx b/src/plugins/vis_default_editor/public/components/controls/top_field.tsx
index 49a3e236746d2..a74025a578e15 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_field.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FieldParamEditor } from './field';
 import { getCompatibleAggs } from './top_aggregate';
 import { AggParamEditorProps } from '../agg_param_props';
diff --git a/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx b/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx
index 8ca5d62346e15..022d3ed779be0 100644
--- a/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/top_sort_field.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FieldParamEditor } from './field';
 import { AggParamEditorProps } from '../agg_param_props';
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts b/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
index 4d85ce4c3d42c..7b304199a2944 100644
--- a/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
@@ -9,7 +9,7 @@
 import { useEffect, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig } from 'src/plugins/data/public';
+import { IAggConfig } from '@kbn/data-plugin/public';
 
 type AggFilter = string[];
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts b/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
index febedd49621fd..ae622e059e921 100644
--- a/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
@@ -9,7 +9,7 @@
 import { useCallback } from 'react';
 import type { SerializableRecord } from '@kbn/utility-types';
 
-import { IAggConfig, AggParamType } from 'src/plugins/data/public';
+import { IAggConfig, AggParamType } from '@kbn/data-plugin/public';
 
 type SetValue = (value?: IAggConfig) => void;
 
diff --git a/src/plugins/vis_default_editor/public/components/options/basic_options.tsx b/src/plugins/vis_default_editor/public/components/options/basic_options.tsx
index 5cec0743b94fd..d7d6057aabcc7 100644
--- a/src/plugins/vis_default_editor/public/components/options/basic_options.tsx
+++ b/src/plugins/vis_default_editor/public/components/options/basic_options.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { VisEditorOptionsProps } from '../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { SwitchOption } from './switch';
 import { SelectOption } from './select';
 
diff --git a/src/plugins/vis_default_editor/public/components/options/color_schema.tsx b/src/plugins/vis_default_editor/public/components/options/color_schema.tsx
index 3ce9e2ec72fa0..6858842651958 100644
--- a/src/plugins/vis_default_editor/public/components/options/color_schema.tsx
+++ b/src/plugins/vis_default_editor/public/components/options/color_schema.tsx
@@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
 import { EuiLink, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { ColorSchemaParams, ColorSchema } from 'src/plugins/charts/public';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { ColorSchemaParams, ColorSchema } from '@kbn/charts-plugin/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { SelectOption } from './select';
 import { SwitchOption } from './switch';
 
diff --git a/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx b/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx
index 0a593dd753b53..9dc3f1aea1c64 100644
--- a/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx
+++ b/src/plugins/vis_default_editor/public/components/options/percentage_mode.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { SwitchOption } from './switch';
-import { useKibana } from '../../../../kibana_react/public';
-import { FORMATS_UI_SETTINGS } from '../../../../field_formats/common';
 
 export interface PercentageModeOptionProps {
   setValue: (
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx b/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx
index b033a4d77a6c2..abf88e665019f 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/controls.tsx
@@ -19,7 +19,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import useDebounce from 'react-use/lib/useDebounce';
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { discardChanges, EditorAction } from './state';
 
 interface DefaultEditorControlsProps {
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
index 15169500aad62..c7b2878e2656b 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
@@ -16,8 +16,8 @@ import {
   IMetricAggType,
   search,
   TimeRange,
-} from '../../../../data/public';
-import type { ISchemas } from '../../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import type { ISchemas } from '@kbn/visualizations-plugin/public';
 import { DefaultEditorAggGroup } from '../agg_group';
 import {
   EditorAction,
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
index 5fcf3d4ecf133..bb8d6d9ecf97f 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -23,10 +23,10 @@ import {
   Vis,
   PersistedState,
   VisualizeEmbeddableContract,
-} from 'src/plugins/visualizations/public';
-import type { Schema } from 'src/plugins/visualizations/public';
-import { TimeRange } from 'src/plugins/data/public';
-import { SavedSearch } from 'src/plugins/discover/public';
+} from '@kbn/visualizations-plugin/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { SavedSearch } from '@kbn/discover-plugin/public';
 import { DefaultEditorNavBar } from './navbar';
 import { DefaultEditorControls } from './controls';
 import { setStateParamValue, useEditorReducer, useEditorFormState, discardChanges } from './state';
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
index af800c857f0cb..b11e72c117d8e 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -24,10 +24,10 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
-import { Vis } from 'src/plugins/visualizations/public';
-import { SavedSearch, getSavedSearchUrl } from '../../../../discover/public';
-import { ApplicationStart } from '../../../../../core/public';
-import { useKibana } from '../../../../kibana_react/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { SavedSearch, getSavedSearchUrl } from '@kbn/discover-plugin/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface LinkedSearchProps {
   savedSearch: SavedSearch;
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts
index 1023aeae2438e..e53890de3196e 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/state/actions.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Vis, VisParams, Schema } from 'src/plugins/visualizations/public';
-import type { IAggConfig } from 'src/plugins/data/public';
+import { Vis, VisParams, Schema } from '@kbn/visualizations-plugin/public';
+import type { IAggConfig } from '@kbn/data-plugin/public';
 
 import { EditorStateActionTypes } from './constants';
 
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts
index c3161845c6b36..b033450d19d9a 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/state/index.ts
@@ -9,11 +9,11 @@
 import { useReducer, useCallback } from 'react';
 import { EventEmitter } from 'events';
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { createEditorStateReducer, initEditorState, EditorVisState } from './reducers';
 import { EditorStateActionTypes } from './constants';
 import { EditorAction } from './actions';
-import { useKibana } from '../../../../../kibana_react/public';
 import { VisDefaultEditorKibanaServices } from '../../../types';
 
 export * from './editor_form_state';
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
index 54012b9d89590..8afac862ffb44 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
@@ -8,8 +8,8 @@
 
 import { cloneDeep } from 'lodash';
 
-import { Vis } from 'src/plugins/visualizations/public';
-import { AggGroupNames, DataPublicPluginStart } from '../../../../../data/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { AggGroupNames, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { EditorStateActionTypes } from './constants';
 import { getEnabledMetricAggsCount } from '../../agg_group_helper';
 import { EditorAction } from './actions';
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts b/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts
index b092d37af6293..463e5024eb5b5 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts
+++ b/src/plugins/vis_default_editor/public/components/sidebar/use_option_tabs.ts
@@ -9,7 +9,7 @@
 import { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { Vis, VisEditorOptionsProps } from '../../../../visualizations/public';
+import { Vis, VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 import { DefaultEditorDataTab, DefaultEditorDataTabProps } from './data_tab';
 
diff --git a/src/plugins/vis_default_editor/public/components/utils/editor_config.ts b/src/plugins/vis_default_editor/public/components/utils/editor_config.ts
index a5b85c83f29c9..b8e61d1910509 100644
--- a/src/plugins/vis_default_editor/public/components/utils/editor_config.ts
+++ b/src/plugins/vis_default_editor/public/components/utils/editor_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from 'src/plugins/data/public';
+import { IndexPattern } from '@kbn/data-plugin/public';
 
 /**
  * A hidden parameter can be hidden from the UI completely.
diff --git a/src/plugins/vis_default_editor/public/default_editor.tsx b/src/plugins/vis_default_editor/public/default_editor.tsx
index c8e127947e3d0..cc7ff066f1274 100644
--- a/src/plugins/vis_default_editor/public/default_editor.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor.tsx
@@ -17,9 +17,9 @@ import {
   Vis,
   VisualizeEmbeddableContract,
   EditorRenderProps,
-} from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../kibana_react/public';
-import { Storage } from '../../kibana_utils/public';
+} from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { DefaultEditorSideBar } from './components/sidebar';
 import { getInitialWidth } from './editor_size';
diff --git a/src/plugins/vis_default_editor/public/default_editor_controller.tsx b/src/plugins/vis_default_editor/public/default_editor_controller.tsx
index 5de603faf8533..883a87ad789b1 100644
--- a/src/plugins/vis_default_editor/public/default_editor_controller.tsx
+++ b/src/plugins/vis_default_editor/public/default_editor_controller.tsx
@@ -11,9 +11,9 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { EventEmitter } from 'events';
 import { EuiErrorBoundary, EuiLoadingChart } from '@elastic/eui';
 
-import { Vis, VisualizeEmbeddableContract } from 'src/plugins/visualizations/public';
-import { IEditorController, EditorRenderProps } from 'src/plugins/visualizations/public';
-import { KibanaThemeProvider } from '../../kibana_react/public';
+import { Vis, VisualizeEmbeddableContract } from '@kbn/visualizations-plugin/public';
+import { IEditorController, EditorRenderProps } from '@kbn/visualizations-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getTheme } from './services';
 
 // @ts-ignore
diff --git a/src/plugins/vis_default_editor/public/index.ts b/src/plugins/vis_default_editor/public/index.ts
index d89a898467b98..90c9f487d9f92 100644
--- a/src/plugins/vis_default_editor/public/index.ts
+++ b/src/plugins/vis_default_editor/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DefaultEditorController } from './default_editor_controller';
 import { VisDefaultEditorPlugin } from './plugin';
 
diff --git a/src/plugins/vis_default_editor/public/plugin.ts b/src/plugins/vis_default_editor/public/plugin.ts
index 0b39f1a5b193a..1758fd1b6ff3c 100644
--- a/src/plugins/vis_default_editor/public/plugin.ts
+++ b/src/plugins/vis_default_editor/public/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 
+import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { DefaultEditorController } from './default_editor_controller';
 import { setTheme } from './services';
-import type { VisualizationsSetup } from '../../visualizations/public';
 
 export interface VisDefaultEditorSetupDependencies {
   visualizations: VisualizationsSetup;
diff --git a/src/plugins/vis_default_editor/public/schemas.ts b/src/plugins/vis_default_editor/public/schemas.ts
index f59ecd0b33178..355b92e2e89f4 100644
--- a/src/plugins/vis_default_editor/public/schemas.ts
+++ b/src/plugins/vis_default_editor/public/schemas.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Schema } from '../../visualizations/public';
+import type { Schema } from '@kbn/visualizations-plugin/public';
 
 export const getSchemaByName = (schemas: Schema[], schemaName?: string) => {
   return schemas.find((s) => s.name === schemaName) || ({} as Schema);
diff --git a/src/plugins/vis_default_editor/public/services.ts b/src/plugins/vis_default_editor/public/services.ts
index d76fbc4542f4c..5f637ae0d9eae 100644
--- a/src/plugins/vis_default_editor/public/services.ts
+++ b/src/plugins/vis_default_editor/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceStart } from 'kibana/public';
-import { createGetterSetter } from '../../kibana_utils/common';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/common';
 
 export const [getTheme, setTheme] = createGetterSetter<ThemeServiceStart>('ThemeService');
diff --git a/src/plugins/vis_default_editor/public/types.ts b/src/plugins/vis_default_editor/public/types.ts
index 5354b78a9dceb..68375151e5068 100644
--- a/src/plugins/vis_default_editor/public/types.ts
+++ b/src/plugins/vis_default_editor/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export interface VisDefaultEditorKibanaServices {
   data: DataPublicPluginStart;
diff --git a/src/plugins/vis_default_editor/public/utils.test.ts b/src/plugins/vis_default_editor/public/utils.test.ts
index 0339ac4a43c36..4e7d22cdb4b12 100644
--- a/src/plugins/vis_default_editor/public/utils.test.ts
+++ b/src/plugins/vis_default_editor/public/utils.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { groupAndSortBy } from './utils';
-import { AggGroupNames } from 'src/plugins/data/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
 
 const aggs = [
   {
diff --git a/src/plugins/vis_type_markdown/public/index.ts b/src/plugins/vis_type_markdown/public/index.ts
index 8aef539a32277..a94db9b3bfca5 100644
--- a/src/plugins/vis_type_markdown/public/index.ts
+++ b/src/plugins/vis_type_markdown/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MarkdownPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_type_markdown/public/markdown_fn.test.ts b/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
index 148a15fb9fc8a..c942245354a91 100644
--- a/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import { createMarkdownVisFn } from './markdown_fn';
 import { Arguments } from './types';
 
diff --git a/src/plugins/vis_type_markdown/public/markdown_fn.ts b/src/plugins/vis_type_markdown/public/markdown_fn.ts
index 5a531b4be660e..e319ca884e134 100644
--- a/src/plugins/vis_type_markdown/public/markdown_fn.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_fn.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Render } from '../../expressions/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 import { Arguments, MarkdownVisParams } from './types';
 
 export interface MarkdownVisRenderValue {
diff --git a/src/plugins/vis_type_markdown/public/markdown_options.test.tsx b/src/plugins/vis_type_markdown/public/markdown_options.test.tsx
index 93e00bf2badae..75a2fdf742337 100644
--- a/src/plugins/vis_type_markdown/public/markdown_options.test.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_options.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { MarkdownVisParams } from './types';
 import { MarkdownOptions } from './markdown_options';
 
diff --git a/src/plugins/vis_type_markdown/public/markdown_options.tsx b/src/plugins/vis_type_markdown/public/markdown_options.tsx
index f57f853e18636..8311ffb89c6dc 100644
--- a/src/plugins/vis_type_markdown/public/markdown_options.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_options.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { MarkdownVisParams } from './types';
 
 function MarkdownOptions({ stateParams, setValue }: VisEditorOptionsProps<MarkdownVisParams>) {
diff --git a/src/plugins/vis_type_markdown/public/markdown_renderer.tsx b/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
index f3e57ec03c144..38805bd5ce697 100644
--- a/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_renderer.tsx
@@ -8,8 +8,8 @@
 
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { VisualizationContainer } from '../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
 import { MarkdownVisRenderValue } from './markdown_fn';
 
 // @ts-ignore
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis.ts b/src/plugins/vis_type_markdown/public/markdown_vis.ts
index dec26da934858..7fcf9fb6311e6 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_vis.ts
@@ -8,10 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { DefaultEditorSize } from '@kbn/vis-default-editor-plugin/public';
+import { VisGroups, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { MarkdownOptions } from './markdown_options';
 import { SettingsOptions } from './settings_options_lazy';
-import { DefaultEditorSize } from '../../vis_default_editor/public';
-import { VisGroups, VisTypeDefinition } from '../../visualizations/public';
 import { toExpressionAst } from './to_ast';
 import { MarkdownVisParams } from './types';
 
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 0276750bdc415..60df18d60a15e 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
+++ b/src/plugins/vis_type_markdown/public/markdown_vis_controller.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { useEffect } from 'react';
-import { Markdown } from '../../kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { MarkdownVisParams } from './types';
 
 import './markdown_vis.scss';
diff --git a/src/plugins/vis_type_markdown/public/plugin.ts b/src/plugins/vis_type_markdown/public/plugin.ts
index d0b739cb4b0fa..97848aab8afc7 100644
--- a/src/plugins/vis_type_markdown/public/plugin.ts
+++ b/src/plugins/vis_type_markdown/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { VisualizationsSetup } from '../../visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 
 import { markdownVisDefinition } from './markdown_vis';
 import { createMarkdownVisFn } from './markdown_fn';
diff --git a/src/plugins/vis_type_markdown/public/settings_options.tsx b/src/plugins/vis_type_markdown/public/settings_options.tsx
index d0fe584a6348a..0ba0b273de1b5 100644
--- a/src/plugins/vis_type_markdown/public/settings_options.tsx
+++ b/src/plugins/vis_type_markdown/public/settings_options.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { SwitchOption, RangeOption } from '../../vis_default_editor/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { SwitchOption, RangeOption } from '@kbn/vis-default-editor-plugin/public';
 import { MarkdownVisParams } from './types';
 
 function SettingsOptions({ stateParams, setValue }: VisEditorOptionsProps<MarkdownVisParams>) {
diff --git a/src/plugins/vis_type_markdown/public/to_ast.test.ts b/src/plugins/vis_type_markdown/public/to_ast.test.ts
index 402e5aeb655a3..d1ced131a5ac2 100644
--- a/src/plugins/vis_type_markdown/public/to_ast.test.ts
+++ b/src/plugins/vis_type_markdown/public/to_ast.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { toExpressionAst } from './to_ast';
-import { Vis } from '../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 describe('markdown vis toExpressionAst function', () => {
   let vis: Vis;
diff --git a/src/plugins/vis_type_markdown/public/to_ast.ts b/src/plugins/vis_type_markdown/public/to_ast.ts
index daeedd9d8c373..4da10e88eb609 100644
--- a/src/plugins/vis_type_markdown/public/to_ast.ts
+++ b/src/plugins/vis_type_markdown/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisToExpressionAst } from '../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { MarkdownVisExpressionFunctionDefinition } from './markdown_fn';
 import { MarkdownVisParams } from './types';
 
diff --git a/src/plugins/vis_type_markdown/public/types.ts b/src/plugins/vis_type_markdown/public/types.ts
index 927be64ea0ff9..e8ed2b9f0e317 100644
--- a/src/plugins/vis_type_markdown/public/types.ts
+++ b/src/plugins/vis_type_markdown/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Style } from 'src/plugins/expressions/public';
+import { Style } from '@kbn/expressions-plugin/public';
 
 export interface Arguments {
   markdown: string;
diff --git a/src/plugins/vis_type_markdown/server/index.ts b/src/plugins/vis_type_markdown/server/index.ts
index cc1c995a185f9..d2deba39e9987 100644
--- a/src/plugins/vis_type_markdown/server/index.ts
+++ b/src/plugins/vis_type_markdown/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/gauge/public/editor/collections.ts b/src/plugins/vis_types/gauge/public/editor/collections.ts
index 3f52ffbead01c..ef0a27211ec6c 100644
--- a/src/plugins/vis_types/gauge/public/editor/collections.ts
+++ b/src/plugins/vis_types/gauge/public/editor/collections.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { colorSchemas } from '../../../../charts/public';
+import { colorSchemas } from '@kbn/charts-plugin/public';
 import { Alignment, GaugeType } from '../types';
 
 export const getGaugeTypes = () => [
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx
index 8fbe8b1567ae3..54b831032366f 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/index.tsx
@@ -9,7 +9,7 @@
 import React, { useCallback } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { GaugeTypeProps, GaugeVisParams } from '../../../types';
 import { RangesPanel } from './ranges_panel';
 import { StylePanel } from './style_panel';
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx
index 087a43c5dd005..f48f16b4ef5be 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/labels_panel.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SwitchOption, TextInputOption } from '../../../../../../vis_default_editor/public';
-import { GaugeOptionsInternalProps } from '../gauge';
+import { SwitchOption, TextInputOption } from '@kbn/vis-default-editor-plugin/public';
+import { GaugeOptionsInternalProps } from '.';
 
 function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInternalProps) {
   return (
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx
index 1dc36ef6a7015..908d71b0b98df 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/ranges_panel.tsx
@@ -16,9 +16,9 @@ import {
   SwitchOption,
   ColorSchemaOptions,
   PercentageModeOption,
-} from '../../../../../../vis_default_editor/public';
-import { ColorSchemaParams, ColorSchemas, colorSchemas } from '../../../../../../charts/public';
-import { GaugeOptionsInternalProps } from '../gauge';
+} from '@kbn/vis-default-editor-plugin/public';
+import { ColorSchemaParams, ColorSchemas, colorSchemas } from '@kbn/charts-plugin/public';
+import { GaugeOptionsInternalProps } from '.';
 import { Gauge } from '../../../types';
 
 function RangesPanel({
diff --git a/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx b/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx
index 6ccb7be1cd31e..57d624d6614cf 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/gauge/style_panel.tsx
@@ -11,10 +11,10 @@ import { EuiPanel, EuiSpacer, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { SelectOption } from '../../../../../../vis_default_editor/public';
-import { GaugeOptionsInternalProps } from '../gauge';
-import { AggGroupNames } from '../../../../../../data/public';
-import { getGaugeCollections } from './../../collections';
+import { SelectOption } from '@kbn/vis-default-editor-plugin/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { GaugeOptionsInternalProps } from '.';
+import { getGaugeCollections } from '../../collections';
 
 const gaugeCollections = getGaugeCollections();
 
diff --git a/src/plugins/vis_types/gauge/public/editor/components/index.tsx b/src/plugins/vis_types/gauge/public/editor/components/index.tsx
index 7cb1ca9a26c69..e05361b327469 100644
--- a/src/plugins/vis_types/gauge/public/editor/components/index.tsx
+++ b/src/plugins/vis_types/gauge/public/editor/components/index.tsx
@@ -8,7 +8,7 @@
 
 import React, { lazy } from 'react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { GaugeTypeProps, GaugeVisParams } from '../../types';
 
 const GaugeOptionsLazy = lazy(() => import('./gauge'));
diff --git a/src/plugins/vis_types/gauge/public/plugin.ts b/src/plugins/vis_types/gauge/public/plugin.ts
index 8c11892192766..1db42c7cc01df 100755
--- a/src/plugins/vis_types/gauge/public/plugin.ts
+++ b/src/plugins/vis_types/gauge/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
-import { CoreSetup } from '../../../../core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { CoreSetup } from '@kbn/core/public';
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../common';
 import { VisTypeGaugePluginSetup } from './types';
 import { gaugeVisType, goalVisType } from './vis_type';
diff --git a/src/plugins/vis_types/gauge/public/to_ast.test.ts b/src/plugins/vis_types/gauge/public/to_ast.test.ts
index 4f76e8e5f727e..f3b8ee90b5b55 100644
--- a/src/plugins/vis_types/gauge/public/to_ast.test.ts
+++ b/src/plugins/vis_types/gauge/public/to_ast.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from 'src/plugins/data/public';
-import { Vis } from 'src/plugins/visualizations/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { GaugeVisParams } from './types';
 
diff --git a/src/plugins/vis_types/gauge/public/to_ast.ts b/src/plugins/vis_types/gauge/public/to_ast.ts
index 3728453b52583..85148b713b319 100644
--- a/src/plugins/vis_types/gauge/public/to_ast.ts
+++ b/src/plugins/vis_types/gauge/public/to_ast.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import type {
   GaugeExpressionFunctionDefinition,
   GaugeShape,
-} from '../../../chart_expressions/expression_gauge/common';
+} from '@kbn/expression-gauge-plugin/common';
 import { GaugeType, GaugeVisParams } from './types';
 import { getStopsWithColorsFromRanges } from './utils';
 import { getEsaggsFn } from './to_ast_esaggs';
diff --git a/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts b/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts
index ecf3f3e637177..4b098342c6de2 100644
--- a/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/gauge/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 import { GaugeVisParams } from './types';
 
diff --git a/src/plugins/vis_types/gauge/public/types.ts b/src/plugins/vis_types/gauge/public/types.ts
index c160b2ccf2f3f..65998f7b00c27 100755
--- a/src/plugins/vis_types/gauge/public/types.ts
+++ b/src/plugins/vis_types/gauge/public/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { $Values } from '@kbn/utility-types';
-import { Range } from '../../../expressions/public';
-import { ColorSchemaParams, Labels, Style } from '../../../charts/public';
+import { Range } from '@kbn/expressions-plugin/public';
+import { ColorSchemaParams, Labels, Style } from '@kbn/charts-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface VisTypeGaugePluginSetup {}
diff --git a/src/plugins/vis_types/gauge/public/utils/palette.ts b/src/plugins/vis_types/gauge/public/utils/palette.ts
index ff3a4b10a0118..5c7322fa3ea99 100644
--- a/src/plugins/vis_types/gauge/public/utils/palette.ts
+++ b/src/plugins/vis_types/gauge/public/utils/palette.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ColorSchemas, getHeatmapColors } from '../../../../charts/common';
-import { Range } from '../../../../expressions';
+import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
+import { Range } from '@kbn/expressions-plugin';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;
diff --git a/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx b/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
index 648d34cdee7bd..1516e35a9c169 100644
--- a/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
+++ b/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { ColorMode, ColorSchemas } from '../../../../charts/public';
-import { AggGroupNames } from '../../../../data/public';
-import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
+import { ColorMode, ColorSchemas } from '@kbn/charts-plugin/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
 import { Alignment, GaugeType, GaugeTypeProps } from '../types';
 import { toExpressionAst } from '../to_ast';
diff --git a/src/plugins/vis_types/gauge/public/vis_type/goal.tsx b/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
index e56e87ee70dff..d0b4095a05130 100644
--- a/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
+++ b/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames } from '../../../../data/public';
-import { ColorMode, ColorSchemas } from '../../../../charts/public';
-import { VisTypeDefinition } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { ColorMode, ColorSchemas } from '@kbn/charts-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 
 import { getGaugeOptions } from '../editor/components';
 import { toExpressionAst } from '../to_ast';
diff --git a/src/plugins/vis_types/gauge/server/index.ts b/src/plugins/vis_types/gauge/server/index.ts
index 8d958e63356e2..1c506253e85e0 100755
--- a/src/plugins/vis_types/gauge/server/index.ts
+++ b/src/plugins/vis_types/gauge/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeGaugeServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/gauge/server/plugin.ts b/src/plugins/vis_types/gauge/server/plugin.ts
index 0334f963c720c..f3bef549a4791 100755
--- a/src/plugins/vis_types/gauge/server/plugin.ts
+++ b/src/plugins/vis_types/gauge/server/plugin.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, Plugin, UiSettingsParams } from '@kbn/core/server';
 
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx
index bb1467c658f76..c10f75129c47c 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
-import type { PersistedState } from '../../../../../visualizations/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import HeatmapOptions, { HeatmapOptionsProps } from './heatmap';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx
index b7cf530b1254f..f592ee3933c1c 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/heatmap.tsx
@@ -24,9 +24,9 @@ import {
   PercentageModeOption,
   LongLegendOptions,
   LegendSizeSettings,
-} from '../../../../../vis_default_editor/public';
-import { colorSchemas } from '../../../../../charts/public';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
+} from '@kbn/vis-default-editor-plugin/public';
+import { colorSchemas } from '@kbn/charts-plugin/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { HeatmapVisParams, HeatmapTypeProps, ValueAxis } from '../../types';
 import { LabelsPanel } from './labels_panel';
 import { legendPositions, scaleTypes } from '../collections';
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/index.tsx b/src/plugins/vis_types/heatmap/public/editor/components/index.tsx
index 1313d335b06fe..59db84b0db665 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/index.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { HeatmapVisParams, HeatmapTypeProps } from '../../types';
 
 const HeatmapOptionsLazy = lazy(() => import('./heatmap'));
diff --git a/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx b/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx
index 3bdfcb34eb13b..0b16e538fb481 100644
--- a/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx
+++ b/src/plugins/vis_types/heatmap/public/editor/components/labels_panel.tsx
@@ -12,8 +12,8 @@ import { EuiColorPicker, EuiFormRow, EuiPanel, EuiSpacer, EuiTitle } from '@elas
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { SwitchOption } from '../../../../../vis_default_editor/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 import { HeatmapVisParams, ValueAxis } from '../../types';
 
 const VERTICAL_ROTATION = 270;
diff --git a/src/plugins/vis_types/heatmap/public/plugin.ts b/src/plugins/vis_types/heatmap/public/plugin.ts
index 622f68ed707e5..c84c8830318c2 100644
--- a/src/plugins/vis_types/heatmap/public/plugin.ts
+++ b/src/plugins/vis_types/heatmap/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'src/core/public';
-import type { VisualizationsSetup } from '../../../visualizations/public';
-import type { ChartsPluginSetup } from '../../../charts/public';
-import type { FieldFormatsStart } from '../../../field_formats/public';
-import type { UsageCollectionSetup } from '../../../usage_collection/public';
-import type { DataPublicPluginStart } from '../../../data/public';
+import { CoreSetup } from '@kbn/core/public';
+import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../common';
 import { heatmapVisType } from './vis_type';
 
diff --git a/src/plugins/vis_types/heatmap/public/to_ast.test.ts b/src/plugins/vis_types/heatmap/public/to_ast.test.ts
index ec6dfd92e5d6a..8c7e3372df867 100644
--- a/src/plugins/vis_types/heatmap/public/to_ast.test.ts
+++ b/src/plugins/vis_types/heatmap/public/to_ast.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { sampleAreaVis } from './sample_vis.test.mocks';
-import { buildExpression } from '../../../expressions/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 
 import { toExpressionAst } from './to_ast';
 import { HeatmapVisParams } from './types';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/heatmap/public/to_ast.ts b/src/plugins/vis_types/heatmap/public/to_ast.ts
index d6dc8a8038591..5b52ab1feeb3a 100644
--- a/src/plugins/vis_types/heatmap/public/to_ast.ts
+++ b/src/plugins/vis_types/heatmap/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisToExpressionAst, getVisSchemas, SchemaConfig } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { VisToExpressionAst, getVisSchemas, SchemaConfig } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { getStopsWithColorsFromRanges, getStopsWithColorsFromColorsNumber } from './utils/palette';
 import type { HeatmapVisParams } from './types';
 import { getEsaggsFn } from './to_ast_esaggs';
diff --git a/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts b/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts
index 9b6e02928f7a9..7a95c59646f45 100644
--- a/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/heatmap/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 import { HeatmapVisParams } from './types';
 
diff --git a/src/plugins/vis_types/heatmap/public/types.ts b/src/plugins/vis_types/heatmap/public/types.ts
index 9806b6de772ae..8301d246e9f63 100644
--- a/src/plugins/vis_types/heatmap/public/types.ts
+++ b/src/plugins/vis_types/heatmap/public/types.ts
@@ -7,8 +7,8 @@
  */
 import { UiCounterMetricType } from '@kbn/analytics';
 import type { Position } from '@elastic/charts';
-import type { ChartsPluginSetup, Style, Labels, ColorSchemas } from '../../../charts/public';
-import { Range } from '../../../expressions/public';
+import type { ChartsPluginSetup, Style, Labels, ColorSchemas } from '@kbn/charts-plugin/public';
+import { Range } from '@kbn/expressions-plugin/public';
 
 export interface HeatmapTypeProps {
   showElasticChartsOptions?: boolean;
diff --git a/src/plugins/vis_types/heatmap/public/utils/palette.test.ts b/src/plugins/vis_types/heatmap/public/utils/palette.test.ts
index 511ab12d9e462..a0724249c61ee 100644
--- a/src/plugins/vis_types/heatmap/public/utils/palette.test.ts
+++ b/src/plugins/vis_types/heatmap/public/utils/palette.test.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Range } from '../../../../expressions';
-import type { ColorSchemas } from '../../../../charts/common';
+import type { Range } from '@kbn/expressions-plugin';
+import type { ColorSchemas } from '@kbn/charts-plugin/common';
 import { getStopsWithColorsFromRanges, getStopsWithColorsFromColorsNumber } from './palette';
 
 describe('getFilterClickData', () => {
diff --git a/src/plugins/vis_types/heatmap/public/utils/palette.ts b/src/plugins/vis_types/heatmap/public/utils/palette.ts
index 18f1681bad9c1..4379aea2df6a8 100644
--- a/src/plugins/vis_types/heatmap/public/utils/palette.ts
+++ b/src/plugins/vis_types/heatmap/public/utils/palette.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ColorSchemas, getHeatmapColors } from '../../../../charts/common';
-import { Range } from '../../../../expressions';
+import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
+import { Range } from '@kbn/expressions-plugin';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;
diff --git a/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx b/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
index 775d689e3ec68..a9c2d242a2335 100644
--- a/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
+++ b/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { ColorSchemas } from '../../../../charts/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { ColorSchemas } from '@kbn/charts-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { HeatmapTypeProps, HeatmapVisParams, AxisType, ScaleType } from '../types';
 import { toExpressionAst } from '../to_ast';
 import { getHeatmapOptions } from '../editor/components';
diff --git a/src/plugins/vis_types/heatmap/server/index.ts b/src/plugins/vis_types/heatmap/server/index.ts
index 97d30c275a0ac..077fc3013b7fe 100644
--- a/src/plugins/vis_types/heatmap/server/index.ts
+++ b/src/plugins/vis_types/heatmap/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeHeatmapServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/heatmap/server/plugin.ts b/src/plugins/vis_types/heatmap/server/plugin.ts
index 13854f49236a7..b14afa2ac67e8 100644
--- a/src/plugins/vis_types/heatmap/server/plugin.ts
+++ b/src/plugins/vis_types/heatmap/server/plugin.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, Plugin, UiSettingsParams } from '@kbn/core/server';
 
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
index 8a3873e134192..aba6c75316de5 100644
--- a/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
+++ b/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
@@ -18,7 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import {
   ColorRanges,
   SetColorRangeValue,
@@ -27,8 +27,8 @@ import {
   ColorSchemaOptions,
   RangeOption,
   PercentageModeOption,
-} from '../../../../vis_default_editor/public';
-import { ColorMode, colorSchemas } from '../../../../charts/public';
+} from '@kbn/vis-default-editor-plugin/public';
+import { ColorMode, colorSchemas } from '@kbn/charts-plugin/public';
 import { MetricVisParam, VisParams } from '../types';
 
 const metricColorMode = [
diff --git a/src/plugins/vis_types/metric/public/index.ts b/src/plugins/vis_types/metric/public/index.ts
index bd472ba2be13c..f136a58abaa97 100644
--- a/src/plugins/vis_types/metric/public/index.ts
+++ b/src/plugins/vis_types/metric/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MetricVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/metric/public/metric_vis_type.ts b/src/plugins/vis_types/metric/public/metric_vis_type.ts
index 12f68f3b0e17e..b4abdd180a6e8 100644
--- a/src/plugins/vis_types/metric/public/metric_vis_type.ts
+++ b/src/plugins/vis_types/metric/public/metric_vis_type.ts
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ColorSchemas, ColorMode } from '@kbn/charts-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
 import { MetricVisOptions } from './components';
-import { ColorSchemas, ColorMode } from '../../../charts/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
-import { AggGroupNames } from '../../../data/public';
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
 
diff --git a/src/plugins/vis_types/metric/public/plugin.ts b/src/plugins/vis_types/metric/public/plugin.ts
index a88bbc8e5f2e9..9e79d1d23efda 100644
--- a/src/plugins/vis_types/metric/public/plugin.ts
+++ b/src/plugins/vis_types/metric/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { createMetricVisTypeDefinition } from './metric_vis_type';
 import { ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/metric/public/to_ast.test.ts b/src/plugins/vis_types/metric/public/to_ast.test.ts
index 1c8987bfab5d5..bb9a5f0873f11 100644
--- a/src/plugins/vis_types/metric/public/to_ast.test.ts
+++ b/src/plugins/vis_types/metric/public/to_ast.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from 'src/plugins/data/public';
-import { Vis } from 'src/plugins/visualizations/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
diff --git a/src/plugins/vis_types/metric/public/to_ast.ts b/src/plugins/vis_types/metric/public/to_ast.ts
index 852aa70269994..22176341f45ab 100644
--- a/src/plugins/vis_types/metric/public/to_ast.ts
+++ b/src/plugins/vis_types/metric/public/to_ast.ts
@@ -7,14 +7,14 @@
  */
 
 import { get } from 'lodash';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { inter } from '../../../expressions/common';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { inter } from '@kbn/expressions-plugin/common';
 
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 import { VisParams } from './types';
 import { getStopsWithColorsFromRanges } from './utils';
 
diff --git a/src/plugins/vis_types/metric/public/types.ts b/src/plugins/vis_types/metric/public/types.ts
index 98065348fa91d..c26a5940fe050 100644
--- a/src/plugins/vis_types/metric/public/types.ts
+++ b/src/plugins/vis_types/metric/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Range } from '../../../expressions/public';
-import { ExpressionValueVisDimension } from '../../../visualizations/public';
-import { ColorMode, Labels, Style, ColorSchemas } from '../../../charts/public';
+import { Range } from '@kbn/expressions-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
+import { ColorMode, Labels, Style, ColorSchemas } from '@kbn/charts-plugin/public';
 
 export const visType = 'metric';
 
diff --git a/src/plugins/vis_types/metric/public/utils/palette.ts b/src/plugins/vis_types/metric/public/utils/palette.ts
index ff3a4b10a0118..5c7322fa3ea99 100644
--- a/src/plugins/vis_types/metric/public/utils/palette.ts
+++ b/src/plugins/vis_types/metric/public/utils/palette.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ColorSchemas, getHeatmapColors } from '../../../../charts/common';
-import { Range } from '../../../../expressions';
+import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
+import { Range } from '@kbn/expressions-plugin';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;
diff --git a/src/plugins/vis_types/metric/server/index.ts b/src/plugins/vis_types/metric/server/index.ts
index a14a44b6caa80..db7446c9ef81a 100644
--- a/src/plugins/vis_types/metric/server/index.ts
+++ b/src/plugins/vis_types/metric/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/pie/public/editor/collections.ts b/src/plugins/vis_types/pie/public/editor/collections.ts
index dd9d3fb3737b0..da695c2037710 100644
--- a/src/plugins/vis_types/pie/public/editor/collections.ts
+++ b/src/plugins/vis_types/pie/public/editor/collections.ts
@@ -11,7 +11,7 @@ import {
   LabelPositions,
   ValueFormats,
   EmptySizeRatios,
-} from '../../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
 
 export const getLabelPositions = [
   {
diff --git a/src/plugins/vis_types/pie/public/editor/components/index.tsx b/src/plugins/vis_types/pie/public/editor/components/index.tsx
index 591eaba64ecc5..f21af20f6b2af 100644
--- a/src/plugins/vis_types/pie/public/editor/components/index.tsx
+++ b/src/plugins/vis_types/pie/public/editor/components/index.tsx
@@ -7,9 +7,9 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common';
 import { PieTypeProps } from '../../types';
-import { PartitionVisParams } from '../../../../../chart_expressions/expression_partition_vis/common';
 
 const PieOptionsLazy = lazy(() => import('./pie'));
 
diff --git a/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx b/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx
index aac0c5aef6001..c69bfe3409dcc 100644
--- a/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx
+++ b/src/plugins/vis_types/pie/public/editor/components/pie.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import PieOptions, { PieOptionsProps } from './pie';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
 
diff --git a/src/plugins/vis_types/pie/public/editor/components/pie.tsx b/src/plugins/vis_types/pie/public/editor/components/pie.tsx
index 9be0726ae9eb3..f1f335f186ffd 100644
--- a/src/plugins/vis_types/pie/public/editor/components/pie.tsx
+++ b/src/plugins/vis_types/pie/public/editor/components/pie.tsx
@@ -30,17 +30,17 @@ import {
   PalettePicker,
   LongLegendOptions,
   LegendSizeSettings,
-} from '../../../../../vis_default_editor/public';
-import { VisEditorOptionsProps } from '../../../../../visualizations/public';
-import { TruncateLabelsOption } from './truncate_labels';
-import { DEFAULT_PERCENT_DECIMALS } from '../../../common';
-import { PieTypeProps } from '../../types';
+} from '@kbn/vis-default-editor-plugin/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import {
   PartitionVisParams,
   LabelPositions,
   ValueFormats,
   LegendDisplay,
-} from '../../../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
+import { TruncateLabelsOption } from './truncate_labels';
+import { DEFAULT_PERCENT_DECIMALS } from '../../../common';
+import { PieTypeProps } from '../../types';
 
 import { emptySizeRatioOptions, getLabelPositions, getValuesFormats } from '../collections';
 import { getLegendPositions } from '../positions';
@@ -103,8 +103,8 @@ const PieOptions = (props: PieOptionsProps) => {
   );
 
   useEffect(() => {
-    setLegendVisibility(legendUiStateValue);
-  }, [legendUiStateValue]);
+    setLegendVisibility(legendUiStateValue ?? stateParams.legendDisplay === LegendDisplay.SHOW);
+  }, [legendUiStateValue, stateParams.legendDisplay]);
 
   useEffect(() => {
     const fetchPalettes = async () => {
diff --git a/src/plugins/vis_types/pie/public/plugin.ts b/src/plugins/vis_types/pie/public/plugin.ts
index 1c0a3994bb8dc..ac219d29b5479 100644
--- a/src/plugins/vis_types/pie/public/plugin.ts
+++ b/src/plugins/vis_types/pie/public/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, DocLinksStart, ThemeServiceStart } from 'src/core/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { CoreSetup, DocLinksStart, ThemeServiceStart } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
 import { pieVisType } from './vis_type';
 
diff --git a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
index 53140c822bd9b..f8836f208d916 100644
--- a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
+++ b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { LegendDisplay } from '../../../chart_expressions/expression_partition_vis/common';
+import { LegendDisplay } from '@kbn/expression-partition-vis-plugin/common';
 
 export const samplePieVis = {
   type: {
diff --git a/src/plugins/vis_types/pie/public/to_ast.test.ts b/src/plugins/vis_types/pie/public/to_ast.test.ts
index 62421d30c2ac0..b035c36d04c37 100644
--- a/src/plugins/vis_types/pie/public/to_ast.test.ts
+++ b/src/plugins/vis_types/pie/public/to_ast.test.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
-import { PartitionVisParams } from '../../../chart_expressions/expression_partition_vis/common';
+import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common';
 import { samplePieVis } from './sample_vis.test.mocks';
 import { toExpressionAst } from './to_ast';
 
diff --git a/src/plugins/vis_types/pie/public/to_ast.ts b/src/plugins/vis_types/pie/public/to_ast.ts
index 37f01fcc59340..aaac3040d7bd3 100644
--- a/src/plugins/vis_types/pie/public/to_ast.ts
+++ b/src/plugins/vis_types/pie/public/to_ast.ts
@@ -7,15 +7,15 @@
  */
 
 import type { PaletteOutput } from '@kbn/coloring';
-import { getVisSchemas, VisToExpressionAst, SchemaConfig } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, VisToExpressionAst, SchemaConfig } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   PIE_VIS_EXPRESSION_NAME,
   PARTITION_LABELS_FUNCTION,
   PieVisExpressionFunctionDefinition,
   PartitionVisParams,
   LabelsParams,
-} from '../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
 import { getEsaggsFn } from './to_ast_esaggs';
 
 const prepareDimension = (params: SchemaConfig) => {
diff --git a/src/plugins/vis_types/pie/public/to_ast_esaggs.ts b/src/plugins/vis_types/pie/public/to_ast_esaggs.ts
index 3f41a59e3aa8e..ed689d065d66c 100644
--- a/src/plugins/vis_types/pie/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/pie/public/to_ast_esaggs.ts
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
-import { PartitionVisParams } from '../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/data-plugin/public';
+import { PartitionVisParams } from '@kbn/expression-partition-vis-plugin/common';
 
 /**
  * Get esaggs expressions function
diff --git a/src/plugins/vis_types/pie/public/types/types.ts b/src/plugins/vis_types/pie/public/types/types.ts
index ebddd6470f133..de8151bffbfcb 100644
--- a/src/plugins/vis_types/pie/public/types/types.ts
+++ b/src/plugins/vis_types/pie/public/types/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { SerializedFieldFormat } from '../../../../field_formats/common';
-import { ChartsPluginSetup } from '../../../../charts/public';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 export interface Dimension {
   accessor: number;
diff --git a/src/plugins/vis_types/pie/public/vis_type/pie.ts b/src/plugins/vis_types/pie/public/vis_type/pie.ts
index c9cc573e27781..d3b0cde93a741 100644
--- a/src/plugins/vis_types/pie/public/vis_type/pie.ts
+++ b/src/plugins/vis_types/pie/public/vis_type/pie.ts
@@ -8,17 +8,17 @@
 
 import { i18n } from '@kbn/i18n';
 import { Position } from '@elastic/charts';
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../../visualizations/public';
-import { DEFAULT_PERCENT_DECIMALS } from '../../common';
-import { PieTypeProps } from '../types';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import {
   PartitionVisParams,
   LabelPositions,
   ValueFormats,
   EmptySizeRatios,
   LegendDisplay,
-} from '../../../../chart_expressions/expression_partition_vis/common';
+} from '@kbn/expression-partition-vis-plugin/common';
+import { DEFAULT_PERCENT_DECIMALS } from '../../common';
+import { PieTypeProps } from '../types';
 import { toExpressionAst } from '../to_ast';
 import { getPieOptions } from '../editor/components';
 
diff --git a/src/plugins/vis_types/pie/server/index.ts b/src/plugins/vis_types/pie/server/index.ts
index 1e92bedb3d11c..528db1ad401fc 100644
--- a/src/plugins/vis_types/pie/server/index.ts
+++ b/src/plugins/vis_types/pie/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypePieServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/pie/server/plugin.ts b/src/plugins/vis_types/pie/server/plugin.ts
index 49b74e63b8c3c..024e1ecac8e33 100644
--- a/src/plugins/vis_types/pie/server/plugin.ts
+++ b/src/plugins/vis_types/pie/server/plugin.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, Plugin, UiSettingsParams } from '@kbn/core/server';
 
 import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
index 0296f2ec1327a..c90f8d93ac892 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { TableVisBasic } from './table_vis_basic';
 import { FormattedColumn, TableVisConfig, TableVisUiState } from '../types';
-import { DatatableColumn } from 'src/plugins/expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { createTableVisCell } from './table_vis_cell';
 import { createGridColumns } from './table_vis_columns';
 
@@ -103,7 +103,8 @@ describe('TableVisBasic', () => {
       sortedRows,
       table.formattedColumns,
       uiStateProps.columnsWidth,
-      props.fireEvent
+      props.fireEvent,
+      undefined
     );
 
     const { onSort } = comp.find('EuiDataGrid').prop('sorting');
diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
index adfeb9f5f614c..991012684f17d 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
@@ -6,12 +6,18 @@
  * Side Public License, v 1.
  */
 
-import React, { memo, useCallback, useMemo } from 'react';
-import { EuiDataGrid, EuiDataGridProps, EuiDataGridSorting, EuiTitle } from '@elastic/eui';
+import React, { memo, useCallback, useMemo, useRef } from 'react';
+import {
+  EuiDataGrid,
+  EuiDataGridProps,
+  EuiDataGridRefProps,
+  EuiDataGridSorting,
+  EuiTitle,
+} from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { orderBy } from 'lodash';
 
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { createTableVisCell } from './table_vis_cell';
 import { TableContext, TableVisConfig, TableVisUseUiStateProps } from '../types';
 import { usePagination } from '../utils';
@@ -34,6 +40,8 @@ export const TableVisBasic = memo(
     title,
     uiStateProps: { columnsWidth, sort, setColumnsWidth, setSort },
   }: TableVisBasicProps) => {
+    const dataGridRef = useRef<EuiDataGridRefProps>(null);
+
     const { columns, rows, formattedColumns } = table;
 
     // custom sorting is in place until the EuiDataGrid sorting gets rid of flaws -> https://github.com/elastic/eui/issues/4108
@@ -65,7 +73,8 @@ export const TableVisBasic = memo(
       sortedRows,
       formattedColumns,
       columnsWidth,
-      fireEvent
+      fireEvent,
+      dataGridRef.current?.closeCellPopover
     );
 
     // Pagination config
@@ -158,6 +167,7 @@ export const TableVisBasic = memo(
           sorting={{ columns: sortingColumns, onSort }}
           onColumnResize={onColumnResize}
           minSizeForControls={1}
+          ref={dataGridRef}
         />
       </>
     );
diff --git a/src/plugins/vis_types/table/public/components/table_vis_cell.tsx b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
index 7d7af447db489..a0ebbbd062842 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 
-import { DatatableRow } from 'src/plugins/expressions';
+import { DatatableRow } from '@kbn/expressions-plugin';
 import { FormattedColumns } from '../types';
 
 export const createTableVisCell =
diff --git a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
index 17d32264998ea..9aa30f95f1809 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { EuiDataGridColumnCellActionProps, EuiDataGridColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn, DatatableRow, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { DatatableColumn, DatatableRow, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { FormattedColumns, TableVisUiState } from '../types';
 
 interface FilterCellData {
@@ -30,7 +30,8 @@ export const createGridColumns = (
   rows: DatatableRow[],
   formattedColumns: FormattedColumns,
   columnsWidth: TableVisUiState['colWidth'],
-  fireEvent: IInterpreterRenderHandlers['event']
+  fireEvent: IInterpreterRenderHandlers['event'],
+  closeCellPopover?: Function
 ) => {
   const onFilterClick = (data: FilterCellData, negate: boolean) => {
     fireEvent({
@@ -55,7 +56,7 @@ export const createGridColumns = (
     const formattedColumn = formattedColumns[col.id];
     const cellActions = formattedColumn.filterable
       ? [
-          ({ rowIndex, columnId, Component, closePopover }: EuiDataGridColumnCellActionProps) => {
+          ({ rowIndex, columnId, Component }: EuiDataGridColumnCellActionProps) => {
             const rowValue = rows[rowIndex][columnId];
             if (rowValue == null) return null;
             const cellContent = formattedColumn.formatter.convert(rowValue);
@@ -82,7 +83,7 @@ export const createGridColumns = (
                 data-test-subj="tbvChartCell__filterForCellValue"
                 onClick={() => {
                   onFilterClick({ row: rowIndex, column: colIndex, value: rowValue }, false);
-                  closePopover?.();
+                  closeCellPopover?.();
                 }}
                 iconType="plusInCircle"
               >
@@ -90,7 +91,7 @@ export const createGridColumns = (
               </Component>
             );
           },
-          ({ rowIndex, columnId, Component, closePopover }: EuiDataGridColumnCellActionProps) => {
+          ({ rowIndex, columnId, Component }: EuiDataGridColumnCellActionProps) => {
             const rowValue = rows[rowIndex][columnId];
             if (rowValue == null) return null;
             const cellContent = formattedColumn.formatter.convert(rowValue);
@@ -116,7 +117,7 @@ export const createGridColumns = (
                 aria-label={filterOutAriaLabel}
                 onClick={() => {
                   onFilterClick({ row: rowIndex, column: colIndex, value: rowValue }, true);
-                  closePopover?.();
+                  closeCellPopover?.();
                 }}
                 iconType="minusInCircle"
               >
diff --git a/src/plugins/vis_types/table/public/components/table_vis_controls.tsx b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
index 9ebda35e9caed..36894e306d0e3 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
@@ -17,15 +17,15 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../kibana_react/public';
-import { exporters } from '../../../../data/public';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { exporters } from '@kbn/data-plugin/public';
 import {
   CSV_SEPARATOR_SETTING,
   CSV_QUOTE_VALUES_SETTING,
   downloadFileAs,
-} from '../../../../share/public';
+} from '@kbn/share-plugin/public';
 import { getFormatService } from '../services';
 
 interface TableVisControlsProps {
diff --git a/src/plugins/vis_types/table/public/components/table_vis_options.tsx b/src/plugins/vis_types/table/public/components/table_vis_options.tsx
index c816778079dae..7023716025b21 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_options.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_options.tsx
@@ -12,13 +12,13 @@ import { EuiIconTip, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { search } from '../../../../data/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { search } from '@kbn/data-plugin/public';
 import {
   SwitchOption,
   SelectOption,
   NumberInputOption,
-} from '../../../../vis_default_editor/public';
+} from '@kbn/vis-default-editor-plugin/public';
 import { TableVisParams } from '../../common';
 import { totalAggregations } from './utils';
 
diff --git a/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx b/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
index e1b641eceb5ca..ea9058e68f613 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
@@ -9,7 +9,7 @@
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../../common';
 
 const TableOptionsComponent = lazy(() => import('./table_vis_options'));
diff --git a/src/plugins/vis_types/table/public/components/table_vis_split.tsx b/src/plugins/vis_types/table/public/components/table_vis_split.tsx
index ebb4330f45b05..3e90000d309d7 100644
--- a/src/plugins/vis_types/table/public/components/table_vis_split.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_split.tsx
@@ -8,7 +8,7 @@
 
 import React, { memo } from 'react';
 
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { TableGroup, TableVisConfig, TableVisUseUiStateProps } from '../types';
 import { TableVisBasic } from './table_vis_basic';
 
diff --git a/src/plugins/vis_types/table/public/components/table_visualization.test.tsx b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
index a8c0ae2507373..b3ce828e39bbb 100644
--- a/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
+++ b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
@@ -12,8 +12,8 @@ jest.mock('../utils', () => ({
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { coreMock } from '../../../../../core/public/mocks';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { coreMock } from '@kbn/core/public/mocks';
 import { TableVisConfig, TableVisData } from '../types';
 import TableVisualizationComponent from './table_visualization';
 import { useUiState } from '../utils';
diff --git a/src/plugins/vis_types/table/public/components/table_visualization.tsx b/src/plugins/vis_types/table/public/components/table_visualization.tsx
index 356913146890b..336d6a8ce5ec6 100644
--- a/src/plugins/vis_types/table/public/components/table_visualization.tsx
+++ b/src/plugins/vis_types/table/public/components/table_visualization.tsx
@@ -10,10 +10,10 @@ import './table_visualization.scss';
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
 
-import { CoreStart } from 'kibana/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import type { PersistedState } from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { TableVisConfig, TableVisData } from '../types';
 import { TableVisBasic } from './table_vis_basic';
 import { TableVisSplit } from './table_vis_split';
diff --git a/src/plugins/vis_types/table/public/plugin.ts b/src/plugins/vis_types/table/public/plugin.ts
index e36b4a14c3a57..7acf9595c7aa5 100644
--- a/src/plugins/vis_types/table/public/plugin.ts
+++ b/src/plugins/vis_types/table/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
-import { DataPublicPluginStart } from '../../../data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { setFormatService } from './services';
 import { registerTableVis } from './register_vis';
 
diff --git a/src/plugins/vis_types/table/public/register_vis.ts b/src/plugins/vis_types/table/public/register_vis.ts
index b80dccccaff0a..09922e77a2b72 100644
--- a/src/plugins/vis_types/table/public/register_vis.ts
+++ b/src/plugins/vis_types/table/public/register_vis.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { TablePluginSetupDependencies, TablePluginStartDependencies } from './plugin';
 import { createTableVisFn } from './table_vis_fn';
 import { getTableVisRenderer } from './table_vis_renderer';
diff --git a/src/plugins/vis_types/table/public/services.ts b/src/plugins/vis_types/table/public/services.ts
index e1e6daf3615ef..88129d3760dd1 100644
--- a/src/plugins/vis_types/table/public/services.ts
+++ b/src/plugins/vis_types/table/public/services.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export const [getFormatService, setFormatService] =
   createGetterSetter<DataPublicPluginStart['fieldFormats']>('table data.fieldFormats');
diff --git a/src/plugins/vis_types/table/public/table_vis_fn.test.ts b/src/plugins/vis_types/table/public/table_vis_fn.test.ts
index 2ddb68695387f..98336d6cc67d4 100644
--- a/src/plugins/vis_types/table/public/table_vis_fn.test.ts
+++ b/src/plugins/vis_types/table/public/table_vis_fn.test.ts
@@ -10,8 +10,8 @@ import { createTableVisFn } from './table_vis_fn';
 import { tableVisResponseHandler } from './utils';
 import { TableVisConfig } from './types';
 
-import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../expressions/common/expression_types/specs';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 
 jest.mock('./utils', () => ({
   tableVisResponseHandler: jest.fn().mockReturnValue({
diff --git a/src/plugins/vis_types/table/public/table_vis_fn.ts b/src/plugins/vis_types/table/public/table_vis_fn.ts
index 99c8992ff5984..e6589c9811ed2 100644
--- a/src/plugins/vis_types/table/public/table_vis_fn.ts
+++ b/src/plugins/vis_types/table/public/table_vis_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
-import { prepareLogTable, Dimension } from '../../../visualizations/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
+import { prepareLogTable, Dimension } from '@kbn/visualizations-plugin/public';
 import { TableVisData, TableVisConfig } from './types';
 import { VIS_TYPE_TABLE } from '../common';
 import { tableVisResponseHandler } from './utils';
diff --git a/src/plugins/vis_types/table/public/table_vis_renderer.tsx b/src/plugins/vis_types/table/public/table_vis_renderer.tsx
index 09c6c57150e62..0c552e3745cf7 100644
--- a/src/plugins/vis_types/table/public/table_vis_renderer.tsx
+++ b/src/plugins/vis_types/table/public/table_vis_renderer.tsx
@@ -9,11 +9,11 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { CoreStart } from 'kibana/public';
-import { VisualizationContainer } from '../../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../../expressions/common/expression_renderers';
+import { CoreStart } from '@kbn/core/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common/expression_renderers';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { TableVisRenderValue } from './table_vis_fn';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 
 const TableVisualizationComponent = lazy(() => import('./components/table_visualization'));
 
diff --git a/src/plugins/vis_types/table/public/table_vis_type.ts b/src/plugins/vis_types/table/public/table_vis_type.ts
index a432bd94dacb6..8662f45c02e7e 100644
--- a/src/plugins/vis_types/table/public/table_vis_type.ts
+++ b/src/plugins/vis_types/table/public/table_vis_type.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames } from '../../../data/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { TableVisParams, VIS_TYPE_TABLE } from '../common';
 import { TableOptions } from './components/table_vis_options_lazy';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_types/table/public/to_ast.test.ts b/src/plugins/vis_types/table/public/to_ast.test.ts
index e8f987909a534..da112d94c0c18 100644
--- a/src/plugins/vis_types/table/public/to_ast.test.ts
+++ b/src/plugins/vis_types/table/public/to_ast.test.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { AggTypes, TableVisParams } from '../common';
-import { buildExpressionFunction } from '../../../expressions/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 
 const mockSchemas = {
   metric: [{ accessor: 1, format: { id: 'number' }, params: {}, label: 'Count', aggType: 'count' }],
@@ -32,11 +32,11 @@ const mockTableExpression = {
   toAst: jest.fn(),
 };
 
-jest.mock('../../../visualizations/public', () => ({
+jest.mock('@kbn/visualizations-plugin/public', () => ({
   getVisSchemas: () => mockSchemas,
 }));
 
-jest.mock('../../../expressions/public', () => ({
+jest.mock('@kbn/expressions-plugin/public', () => ({
   buildExpression: jest.fn(() => mockTableExpression),
   buildExpressionFunction: jest.fn(() => mockTableExpressionFunction),
 }));
diff --git a/src/plugins/vis_types/table/public/to_ast.ts b/src/plugins/vis_types/table/public/to_ast.ts
index 0268708f22dfe..ac3799fb51cea 100644
--- a/src/plugins/vis_types/table/public/to_ast.ts
+++ b/src/plugins/vis_types/table/public/to_ast.ts
@@ -9,9 +9,9 @@
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../common';
 import { TableExpressionFunctionDefinition } from './table_vis_fn';
 
diff --git a/src/plugins/vis_types/table/public/types.ts b/src/plugins/vis_types/table/public/types.ts
index 4df6f2b94e17b..b61de821d76cf 100644
--- a/src/plugins/vis_types/table/public/types.ts
+++ b/src/plugins/vis_types/table/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IFieldFormat } from 'src/plugins/field_formats/common';
-import { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
-import { ExpressionValueVisDimension } from 'src/plugins/visualizations/public';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../common';
 
 export interface ColumnWidthData {
diff --git a/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
index 51eef1446bac6..ef24b56713069 100644
--- a/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
+++ b/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
@@ -12,7 +12,7 @@ jest.mock('../services', () => ({
   })),
 }));
 
-import type { FieldFormat } from 'src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { TableContext } from '../types';
 import { addPercentageColumn } from './add_percentage_column';
 
diff --git a/src/plugins/vis_types/table/public/utils/add_percentage_column.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
index e606baafccec4..519742a54203e 100644
--- a/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
+++ b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
@@ -8,7 +8,7 @@
 
 import { findIndex } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { DatatableColumn } from 'src/plugins/expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { getFormatService } from '../services';
 import { FormattedColumns, TableContext } from '../types';
 
diff --git a/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
index 59f6b4fdd808d..4992d2abfc005 100644
--- a/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
+++ b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
@@ -14,7 +14,7 @@ jest.mock('../services', () => ({
   })),
 }));
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { AggTypes } from '../../common';
 import { TableVisConfig } from '../types';
 import { createFormattedTable } from './create_formatted_table';
diff --git a/src/plugins/vis_types/table/public/utils/create_formatted_table.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
index a623e18e67a33..ccbcb0cbec199 100644
--- a/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
+++ b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
@@ -7,7 +7,7 @@
  */
 
 import { chain } from 'lodash';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { getFormatService } from '../services';
 import { FormattedColumn, FormattedColumns, TableVisConfig, TableContext } from '../types';
 import { AggTypes } from '../../common';
diff --git a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
index 0c4c4c08cce0c..72b482979b271 100644
--- a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
+++ b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
@@ -30,8 +30,8 @@ jest.mock('./add_percentage_column', () => ({
   })),
 }));
 
-import { Datatable } from 'src/plugins/expressions';
-import { ExpressionValueVisDimension } from 'src/plugins/visualizations/public';
+import { Datatable } from '@kbn/expressions-plugin';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { AggTypes } from '../../common';
 import { TableGroup, TableVisConfig } from '../types';
 import { addPercentageColumn } from './add_percentage_column';
diff --git a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
index 8769e811c6f6c..6a6400b3125f4 100644
--- a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
+++ b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { getFormatService } from '../services';
 import { TableVisData, TableGroup, TableVisConfig, TableContext } from '../types';
 import { addPercentageColumn } from './add_percentage_column';
diff --git a/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts b/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
index be1f9d3a10cf7..5d6d0594e8e62 100644
--- a/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
+++ b/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { act, renderHook } from '@testing-library/react-hooks';
-import type { PersistedState } from 'src/plugins/visualizations/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { TableVisUiState } from '../../types';
 import { useUiState } from './use_ui_state';
 
diff --git a/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts b/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
index 59df2c645cbc7..f0b9b09ec521a 100644
--- a/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
+++ b/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
@@ -8,7 +8,7 @@
 
 import { debounce, isEqual } from 'lodash';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import type { PersistedState } from 'src/plugins/visualizations/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 
 import { ColumnWidthData, TableVisUiState, TableVisUseUiStateProps } from '../../types';
 
diff --git a/src/plugins/vis_types/table/server/index.ts b/src/plugins/vis_types/table/server/index.ts
index 2f84e8daef450..0d1eade453f6c 100644
--- a/src/plugins/vis_types/table/server/index.ts
+++ b/src/plugins/vis_types/table/server/index.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, PluginConfigDescriptor } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CoreSetup, PluginConfigDescriptor } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { configSchema, ConfigSchema } from '../config';
 import { registerVisTypeTableUsageCollector } from './usage_collector';
diff --git a/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts b/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
index 85912aa4d5bdf..cba5bce0c5bbf 100644
--- a/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getStats } from './get_stats';
-import type { SavedObjectsClientContract } from '../../../../../core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const mockVisualizations = {
   saved_objects: [
diff --git a/src/plugins/vis_types/table/server/usage_collector/get_stats.ts b/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
index ac8d759c94c76..288a48a20cc81 100644
--- a/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
@@ -6,14 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { VIS_TYPE_TABLE } from '../../common';
-
 import type {
   ISavedObjectsRepository,
   SavedObjectsClientContract,
   SavedObjectsFindResult,
-} from '../../../../../core/server';
-import type { SavedVisState } from '../../../../visualizations/common';
+} from '@kbn/core/server';
+import type { SavedVisState } from '@kbn/visualizations-plugin/common';
+import { VIS_TYPE_TABLE } from '../../common';
 
 export interface VisTypeTableUsage {
   /**
diff --git a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
index b65c698f219a6..7d6c4e54ff8fd 100644
--- a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
@@ -9,7 +9,7 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { registerVisTypeTableUsageCollector } from './register_usage_collector';
 import { getStats } from './get_stats';
 
diff --git a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
index ed176fc9222bc..75cc7c0b11f1a 100644
--- a/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getStats, VisTypeTableUsage } from './get_stats';
-import type { UsageCollectionSetup } from '../../../../usage_collection/server';
 
 export function registerVisTypeTableUsageCollector(collectorSet: UsageCollectionSetup) {
   const collector = collectorSet.makeUsageCollector<VisTypeTableUsage | undefined>({
diff --git a/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx b/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
index bb5af48bf0075..1cb504ec08d9e 100644
--- a/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
+++ b/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { TagCloudVisParams, TagCloudTypeProps } from '../types';
 
 const TagCloudOptionsLazy = lazy(() => import('./tag_cloud_options'));
diff --git a/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx b/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
index 870a05bcb9277..a5c23dc50319d 100644
--- a/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
+++ b/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
@@ -10,9 +10,9 @@ import React, { useState, useEffect } from 'react';
 import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { VisEditorOptionsProps } from '../../../../visualizations/public';
-import { SelectOption, SwitchOption, PalettePicker } from '../../../../vis_default_editor/public';
-import { ValidatedDualRange } from '../../../../kibana_react/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { SelectOption, SwitchOption, PalettePicker } from '@kbn/vis-default-editor-plugin/public';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { TagCloudVisParams, TagCloudTypeProps } from '../types';
 import { collections } from './collections';
 
diff --git a/src/plugins/vis_types/tagcloud/public/index.ts b/src/plugins/vis_types/tagcloud/public/index.ts
index a37da7fee9acf..6a471a5813d01 100644
--- a/src/plugins/vis_types/tagcloud/public/index.ts
+++ b/src/plugins/vis_types/tagcloud/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { TagCloudPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/tagcloud/public/plugin.ts b/src/plugins/vis_types/tagcloud/public/plugin.ts
index cc99480de7099..8d9dbdedc7fe3 100644
--- a/src/plugins/vis_types/tagcloud/public/plugin.ts
+++ b/src/plugins/vis_types/tagcloud/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 import { getTagCloudVisTypeDefinition } from './tag_cloud_type';
 import { ConfigSchema } from '../config';
diff --git a/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts b/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
index daad73c082980..b29ffac33121c 100644
--- a/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
+++ b/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AggGroupNames } from '../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
 import { getTagCloudOptions } from './components/get_tag_cloud_options';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_types/tagcloud/public/to_ast.test.ts b/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
index 789acda46ec5e..2c3fcc5799742 100644
--- a/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
+++ b/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis, VisToExpressionAstParams } from '../../../visualizations/public';
+import { Vis, VisToExpressionAstParams } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { TagCloudVisParams } from './types';
 
@@ -30,7 +30,7 @@ const mockedSchemas = {
   ],
 };
 
-jest.mock('../../../visualizations/public', () => ({
+jest.mock('@kbn/visualizations-plugin/public', () => ({
   getVisSchemas: () => mockedSchemas,
 }));
 
diff --git a/src/plugins/vis_types/tagcloud/public/to_ast.ts b/src/plugins/vis_types/tagcloud/public/to_ast.ts
index c66660e78a78a..78461475a3d3d 100644
--- a/src/plugins/vis_types/tagcloud/public/to_ast.ts
+++ b/src/plugins/vis_types/tagcloud/public/to_ast.ts
@@ -10,9 +10,9 @@ import type { PaletteOutput } from '@kbn/coloring';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
+} from '@kbn/data-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { TagCloudVisParams } from './types';
 
 const prepareDimension = (params: SchemaConfig) => {
diff --git a/src/plugins/vis_types/tagcloud/public/types.ts b/src/plugins/vis_types/tagcloud/public/types.ts
index e3c5c057a3405..5fc177cceb191 100644
--- a/src/plugins/vis_types/tagcloud/public/types.ts
+++ b/src/plugins/vis_types/tagcloud/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { PaletteOutput } from '@kbn/coloring';
-import type { ChartsPluginSetup } from '../../../charts/public';
-import { ExpressionValueVisDimension } from '../../../visualizations/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 
 interface TagCloudCommonParams {
   scale: 'linear' | 'log' | 'square root';
diff --git a/src/plugins/vis_types/tagcloud/server/index.ts b/src/plugins/vis_types/tagcloud/server/index.ts
index a14a44b6caa80..db7446c9ef81a 100644
--- a/src/plugins/vis_types/tagcloud/server/index.ts
+++ b/src/plugins/vis_types/tagcloud/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 
diff --git a/src/plugins/vis_types/timelion/common/parser_async.ts b/src/plugins/vis_types/timelion/common/parser_async.ts
index 8d52c4f2132c3..e8dd2e3fd0a50 100644
--- a/src/plugins/vis_types/timelion/common/parser_async.ts
+++ b/src/plugins/vis_types/timelion/common/parser_async.ts
@@ -10,6 +10,6 @@ import { ParsedExpression } from './parser';
 
 /** Build optimizations, we want to exclude the parser from the main bundle **/
 export const parseTimelionExpressionAsync = async (input: string): Promise<ParsedExpression> => {
-  const { parseTimelionExpression } = await import('../common/parser');
+  const { parseTimelionExpression } = await import('./parser');
   return parseTimelionExpression(input);
 };
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx b/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
index 597d1a10dd051..8d1d5285e2989 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
@@ -11,7 +11,7 @@ import { EuiFormLabel } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { monaco } from '@kbn/monaco';
 
-import { CodeEditor, useKibana } from '../../../../kibana_react/public';
+import { CodeEditor, useKibana } from '@kbn/kibana-react-plugin/public';
 import { suggest, getSuggestion } from './timelion_expression_input_helpers';
 import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
 import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts b/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
index 701da1d6a6fb7..cc274d411b2ea 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
+++ b/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
@@ -9,7 +9,7 @@
 import { SUGGESTION_TYPE, suggest } from './timelion_expression_input_helpers';
 import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
 import { setIndexPatterns } from '../helpers/plugin_services';
-import { DataViewsContract } from 'src/plugins/data_views/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { ITimelionFunction } from '../../common/types';
 
 describe('Timelion expression suggestions', () => {
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx b/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
index fc080ff578bee..b513896b54dba 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
@@ -10,9 +10,9 @@ import React, { useMemo, useCallback } from 'react';
 import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { search } from '../../../../data/public';
+import { search } from '@kbn/data-plugin/public';
 const { isValidEsInterval } = search.aggs;
-import { useValidation } from '../../../../vis_default_editor/public';
+import { useValidation } from '@kbn/vis-default-editor-plugin/public';
 
 const intervalOptions = [
   {
diff --git a/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
index 401c26cdb8b37..8137d8defd18c 100644
--- a/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
@@ -20,9 +20,10 @@ import {
 import { EuiTitle } from '@elastic/eui';
 import { RangeFilterParams } from '@kbn/es-query';
 
-import { useKibana } from '../../../../kibana_react/public';
-import { useActiveCursor } from '../../../../charts/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useActiveCursor } from '@kbn/charts-plugin/public';
 
+import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import { AreaSeriesComponent, BarSeriesComponent } from './series';
 
 import {
@@ -37,7 +38,6 @@ import { colors } from '../helpers/chart_constants';
 import { getCharts, getFieldFormats } from '../helpers/plugin_services';
 
 import type { Series, Sheet } from '../helpers/timelion_request_handler';
-import type { IInterpreterRenderHandlers } from '../../../../expressions';
 import type { TimelionVisDependencies } from '../plugin';
 
 import './timelion_vis.scss';
diff --git a/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts b/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
index 494135280343e..31e4cdaf176c3 100644
--- a/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
@@ -7,11 +7,11 @@
  */
 
 import { get } from 'lodash';
-import { isNestedField } from '../../../..//data_views/common';
+import { isNestedField } from '@kbn/data-views-plugin/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getIndexPatterns } from './plugin_services';
 import { TimelionFunctionArgs } from '../../common/types';
 import { TimelionExpressionFunction, TimelionExpressionArgument } from '../../common/parser';
-import { KBN_FIELD_TYPES } from '../../../../data/public';
 
 export function getArgValueSuggestions() {
   const indexPatterns = getIndexPatterns();
diff --git a/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts b/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
index 9f3b3d6512058..44fc531e77b78 100644
--- a/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 export function getTimezone(config: IUiSettingsClient) {
   if (config.isDefault('dateFormat:tz')) {
diff --git a/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts b/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
index 80078d9e2672e..d2bc0a2fb32fb 100644
--- a/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
@@ -8,8 +8,8 @@
 
 import moment from 'moment-timezone';
 import { Position, AxisSpec } from '@elastic/charts';
-import type { TimefilterContract } from 'src/plugins/data/public';
-import type { IUiSettingsClient } from 'kibana/public';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 
 import { calculateInterval } from '../../common/lib';
 import { xaxisFormatterProvider } from './xaxis_formatter';
diff --git a/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts b/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
index 811004bfe1933..2ba22f6bf3cb8 100644
--- a/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import type { ISearchStart } from 'src/plugins/data/public';
-import type { DataViewsContract } from 'src/plugins/data_views/public';
-import type { ChartsPluginStart } from 'src/plugins/charts/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { createGetterSetter } from '../../../../kibana_utils/public';
+import type { ISearchStart } from '@kbn/data-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 
 export const [getIndexPatterns, setIndexPatterns] =
   createGetterSetter<DataViewsContract>('dataViews');
diff --git a/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
index a8807cfe87b8a..b31de9e7c9383 100644
--- a/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
@@ -7,14 +7,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { KibanaExecutionContext } from 'kibana/public';
-import { DataView } from 'src/plugins/data/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { DataView } from '@kbn/data-plugin/common';
 import { Filter, buildEsQuery } from '@kbn/es-query';
-import { KibanaContext, TimeRange, Query, getEsQueryConfig } from '../../../../data/public';
+import { KibanaContext, TimeRange, Query, getEsQueryConfig } from '@kbn/data-plugin/public';
 import { TimelionVisDependencies } from '../plugin';
 import { getTimezone } from './get_timezone';
 import { TimelionVisParams } from '../timelion_vis_fn';
-import { getDataSearch, getIndexPatterns } from '../helpers/plugin_services';
+import { getDataSearch, getIndexPatterns } from './plugin_services';
 import { VisSeries } from '../../common/vis_data';
 
 interface Stats {
diff --git a/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts b/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
index 204d842cc37a0..d2eac375214b0 100644
--- a/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 export function xaxisFormatterProvider(config: IUiSettingsClient) {
   function getFormat(esInterval: any) {
diff --git a/src/plugins/vis_types/timelion/public/index.ts b/src/plugins/vis_types/timelion/public/index.ts
index 960eda3dc558f..21cbd23ef8bb1 100644
--- a/src/plugins/vis_types/timelion/public/index.ts
+++ b/src/plugins/vis_types/timelion/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { TimelionVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts b/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
index 5dd8431a5a2ab..50682a901030f 100644
--- a/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
+++ b/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
@@ -10,8 +10,8 @@ import { cloneDeep, defaults, mergeWith, compact } from 'lodash';
 import $ from 'jquery';
 import moment, { Moment } from 'moment-timezone';
 
-import { TimefilterContract } from 'src/plugins/data/public';
-import { IUiSettingsClient } from 'kibana/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 import { calculateInterval } from '../../common/lib';
 import { xaxisFormatterProvider } from '../helpers/xaxis_formatter';
diff --git a/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
index edb250dfe1200..30497f39da35f 100644
--- a/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
+++ b/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
@@ -13,8 +13,8 @@ import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash';
 import { useResizeObserver } from '@elastic/eui';
 import { RangeFilterParams } from '@kbn/es-query';
 
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { useKibana } from '../../../../kibana_react/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DEFAULT_TIME_FORMAT } from '../../common/lib';
 
 import {
diff --git a/src/plugins/vis_types/timelion/public/plugin.ts b/src/plugins/vis_types/timelion/public/plugin.ts
index 1e94c7c28bb42..eadacdd21d152 100644
--- a/src/plugins/vis_types/timelion/public/plugin.ts
+++ b/src/plugins/vis_types/timelion/public/plugin.ts
@@ -14,18 +14,18 @@ import type {
   IUiSettingsClient,
   HttpSetup,
   ThemeServiceStart,
-} from 'kibana/public';
-import type { Plugin as ExpressionsPlugin } from 'src/plugins/expressions/public';
+} from '@kbn/core/public';
+import type { Plugin as ExpressionsPlugin } from '@kbn/expressions-plugin/public';
 import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
   TimefilterContract,
-} from 'src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import type { VisualizationsSetup } from 'src/plugins/visualizations/public';
-import type { ChartsPluginSetup, ChartsPluginStart } from 'src/plugins/charts/public';
+} from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import type { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
 
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { getTimelionVisualizationConfig } from './timelion_vis_fn';
 import { getTimelionVisDefinition } from './timelion_vis_type';
 import {
diff --git a/src/plugins/vis_types/timelion/public/timelion_options.tsx b/src/plugins/vis_types/timelion/public/timelion_options.tsx
index 7879eb88e0bd2..d3b95c291bf56 100644
--- a/src/plugins/vis_types/timelion/public/timelion_options.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_options.tsx
@@ -9,8 +9,8 @@
 import React, { useCallback } from 'react';
 import { EuiPanel } from '@elastic/eui';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import { TimelionVisParams } from './timelion_vis_fn';
 import { TimelionInterval, TimelionExpressionInput } from './components';
diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts b/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
index 4bb195312f3b7..a7afb338c8edc 100644
--- a/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
@@ -9,11 +9,11 @@
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
-import { ExpressionFunctionDefinition, Render } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
+import { KibanaContext, Query, TimeRange } from '@kbn/data-plugin/public';
 import { TimelionSuccessResponse } from './helpers/timelion_request_handler';
 import { TIMELION_VIS_NAME } from './timelion_vis_type';
 import { TimelionVisDependencies } from './plugin';
-import { KibanaContext, Query, TimeRange } from '../../../data/public';
 
 type Input = KibanaContext | null;
 type Output = Promise<Render<TimelionRenderValue>>;
diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
index e865c3c8d7fb2..5e2c40d51217c 100644
--- a/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
@@ -9,10 +9,10 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import { RangeFilterParams } from '@kbn/es-query';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
-import { VisualizationContainer } from '../../../visualizations/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
 import { TimelionVisDependencies } from './plugin';
 import { TimelionRenderValue } from './timelion_vis_fn';
 import { UI_SETTINGS } from '../common/constants';
diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
index 3462ae8df5cd5..cac1f127e11c9 100644
--- a/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
@@ -9,7 +9,8 @@
 import React, { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { DefaultEditorSize } from '../../../vis_default_editor/public';
+import { DefaultEditorSize } from '@kbn/vis-default-editor-plugin/public';
+import { VIS_EVENT_TO_TRIGGER, VisParams } from '@kbn/visualizations-plugin/public';
 import { TimelionOptionsProps } from './timelion_options';
 import { TimelionVisDependencies } from './plugin';
 import { toExpressionAst } from './to_ast';
@@ -17,8 +18,6 @@ import { getIndexPatterns } from './helpers/plugin_services';
 
 import { parseTimelionExpressionAsync } from '../common/parser_async';
 
-import { VIS_EVENT_TO_TRIGGER, VisParams } from '../../../visualizations/public';
-
 const TimelionOptions = lazy(() => import('./timelion_options'));
 
 export const TIMELION_VIS_NAME = 'timelion';
diff --git a/src/plugins/vis_types/timelion/public/to_ast.test.ts b/src/plugins/vis_types/timelion/public/to_ast.test.ts
index 44955a399770f..d4a31dd40804e 100644
--- a/src/plugins/vis_types/timelion/public/to_ast.test.ts
+++ b/src/plugins/vis_types/timelion/public/to_ast.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from 'src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { TimelionVisParams } from './timelion_vis_fn';
 import { toExpressionAst } from './to_ast';
 
diff --git a/src/plugins/vis_types/timelion/public/to_ast.ts b/src/plugins/vis_types/timelion/public/to_ast.ts
index cf0a24a0e3d3e..feb1f27e5bb76 100644
--- a/src/plugins/vis_types/timelion/public/to_ast.ts
+++ b/src/plugins/vis_types/timelion/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { TimelionExpressionFunctionDefinition, TimelionVisParams } from './timelion_vis_fn';
 
 export const toExpressionAst = (vis: Vis<TimelionVisParams>) => {
diff --git a/src/plugins/vis_types/timelion/server/handlers/chain_runner.js b/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
index fac1a68acc907..3abab865d0123 100644
--- a/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
+++ b/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
@@ -10,10 +10,10 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 
-import parseSheet from './lib/parse_sheet.js';
-import repositionArguments from './lib/reposition_arguments.js';
-import indexArguments from './lib/index_arguments.js';
-import validateTime from './lib/validate_time.js';
+import parseSheet from './lib/parse_sheet';
+import repositionArguments from './lib/reposition_arguments';
+import indexArguments from './lib/index_arguments';
+import validateTime from './lib/validate_time';
 import { calculateInterval } from '../../common/lib';
 
 export default function chainRunner(tlConfig) {
diff --git a/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js b/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
index a2aa844a1edc4..87d08b0b0a3eb 100644
--- a/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
+++ b/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import buildTarget from '../../lib/build_target.js';
+import buildTarget from '../../lib/build_target';
 
 export default function tlConfigFn(setup) {
   let targetSeries;
diff --git a/src/plugins/vis_types/timelion/server/index.ts b/src/plugins/vis_types/timelion/server/index.ts
index 4bf47dff7076d..771ac24120cd7 100644
--- a/src/plugins/vis_types/timelion/server/index.ts
+++ b/src/plugins/vis_types/timelion/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { TimelionPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/timelion/server/lib/as_sorted.js b/src/plugins/vis_types/timelion/server/lib/as_sorted.js
index 1947b18439d86..a50da88f38b89 100644
--- a/src/plugins/vis_types/timelion/server/lib/as_sorted.js
+++ b/src/plugins/vis_types/timelion/server/lib/as_sorted.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import unzipPairs from './unzip_pairs.js';
+import unzipPairs from './unzip_pairs';
 
 export default function asSorted(timeValObject, fn) {
   const data = unzipPairs(timeValObject);
diff --git a/src/plugins/vis_types/timelion/server/lib/build_target.js b/src/plugins/vis_types/timelion/server/lib/build_target.js
index d332bec977089..b7967bbb48e41 100644
--- a/src/plugins/vis_types/timelion/server/lib/build_target.js
+++ b/src/plugins/vis_types/timelion/server/lib/build_target.js
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import splitInterval from './split_interval.js';
+import splitInterval from './split_interval';
 
 export default function (tlConfig) {
   const min = moment(tlConfig.time.from);
diff --git a/src/plugins/vis_types/timelion/server/lib/classes/datasource.js b/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
index 50129494bf84c..f3f03b40c441b 100644
--- a/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
+++ b/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import loadFunctions from '../load_functions.js';
+import loadFunctions from '../load_functions';
 const fitFunctions = loadFunctions('fit_functions');
 import TimelionFunction from './timelion_function';
 import { offsetTime, preprocessOffset } from '../offset_time';
diff --git a/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js b/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
index 0abef484bbf14..7a50b7aded903 100644
--- a/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
+++ b/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import loadFunctions from '../load_functions.js';
+import loadFunctions from '../load_functions';
 const fitFunctions = loadFunctions('fit_functions');
 
 export default class TimelionFunction {
diff --git a/src/plugins/vis_types/timelion/server/lib/config_manager.ts b/src/plugins/vis_types/timelion/server/lib/config_manager.ts
index 3ab60b0afaaed..2de5469fb313c 100644
--- a/src/plugins/vis_types/timelion/server/lib/config_manager.ts
+++ b/src/plugins/vis_types/timelion/server/lib/config_manager.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 export class ConfigManager {
   private esShardTimeout: number = 0;
diff --git a/src/plugins/vis_types/timelion/server/lib/functions_md.js b/src/plugins/vis_types/timelion/server/lib/functions_md.js
index aeed4f02fc996..2dcd185c8182c 100644
--- a/src/plugins/vis_types/timelion/server/lib/functions_md.js
+++ b/src/plugins/vis_types/timelion/server/lib/functions_md.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import loadFunctions from './load_functions.js';
+import loadFunctions from './load_functions';
 const functions = loadFunctions('series_functions/');
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/lib/load_functions.test.js b/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
index 1508670523733..5fafaf02d774e 100644
--- a/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
+++ b/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const fn = require(`src/plugins/vis_types/timelion/server/lib/load_functions`);
+const fn = require('./load_functions');
 
 const expect = require('chai').expect;
 
diff --git a/src/plugins/vis_types/timelion/server/plugin.ts b/src/plugins/vis_types/timelion/server/plugin.ts
index f6d31033c1ff5..f3f9f1c7deadc 100644
--- a/src/plugins/vis_types/timelion/server/plugin.ts
+++ b/src/plugins/vis_types/timelion/server/plugin.ts
@@ -8,12 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type {
-  PluginStart,
-  DataRequestHandlerContext,
-} from '../../../../../src/plugins/data/server';
-import type { PluginStart as DataViewPluginStart } from '../../../../../src/plugins/data_views/server';
-import { CoreSetup, PluginInitializerContext, Plugin } from '../../../../../src/core/server';
+import type { PluginStart, DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { PluginStart as DataViewPluginStart } from '@kbn/data-views-plugin/server';
+import { CoreSetup, PluginInitializerContext, Plugin } from '@kbn/core/server';
 import loadFunctions from './lib/load_functions';
 import { functionsRoute } from './routes/functions';
 import { runRoute } from './routes/run';
diff --git a/src/plugins/vis_types/timelion/server/routes/functions.ts b/src/plugins/vis_types/timelion/server/routes/functions.ts
index ea33e639bac30..8fadb0d834542 100644
--- a/src/plugins/vis_types/timelion/server/routes/functions.ts
+++ b/src/plugins/vis_types/timelion/server/routes/functions.ts
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { LoadFunctions } from '../lib/load_functions';
 
 export function functionsRoute(router: IRouter, { functions }: { functions: LoadFunctions }) {
diff --git a/src/plugins/vis_types/timelion/server/routes/run.ts b/src/plugins/vis_types/timelion/server/routes/run.ts
index bf829fe708854..5fb6ef6c0a3d3 100644
--- a/src/plugins/vis_types/timelion/server/routes/run.ts
+++ b/src/plugins/vis_types/timelion/server/routes/run.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { IRouter, Logger, CoreSetup } from 'kibana/server';
+import { IRouter, Logger, CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import _ from 'lodash';
 // @ts-ignore
-import chainRunnerFn from '../handlers/chain_runner.js';
+import chainRunnerFn from '../handlers/chain_runner';
 // @ts-ignore
 import getNamespacesSettings from '../lib/get_namespaced_settings';
 // @ts-ignore
diff --git a/src/plugins/vis_types/timelion/server/series_functions/abs.js b/src/plugins/vis_types/timelion/server/series_functions/abs.js
index 0b1bab3389858..6a279a7f7ad9e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/abs.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/abs.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/abs.test.js b/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
index 77bc6f0f19233..80e914383f73a 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
@@ -10,8 +10,8 @@ import fn from './abs';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-const seriesList = require('./fixtures/series_list.js')();
-import invoke from './helpers/invoke_series_fn.js';
+const seriesList = require('./fixtures/series_list')();
+import invoke from './helpers/invoke_series_fn';
 
 describe('abs.js', function () {
   it('should return the positive value of every value', function () {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
index ea874c725f1fa..f2a0bcf8eab73 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import fn from './index';
+import fn from '.';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from '../helpers/invoke_series_fn.js';
+import invoke from '../helpers/invoke_series_fn';
 
 describe('aggregate', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('../fixtures/series_list.js')();
+    seriesList = require('../fixtures/series_list')();
   });
 
   it('first', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
index 746af7994f0b3..de40b2f0e88db 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../../lib/alter.js';
+import alter from '../../lib/alter';
 import Chainable from '../../lib/classes/chainable';
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/bars.js b/src/plugins/vis_types/timelion/server/series_functions/bars.js
index 729df7b160d2f..2b4a53e816b23 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/bars.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/bars.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('bars', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/bars.test.js b/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
index 09a13ae02b26f..9504489ac8f5c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
@@ -10,12 +10,12 @@ import fn from './bars';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('bars.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('creates the bars property, with defaults, on all series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/color.js b/src/plugins/vis_types/timelion/server/series_functions/color.js
index fd93a0e0e03c1..080a223bcf60d 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/color.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/color.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 import tinygradient from 'tinygradient';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/color.test.js b/src/plugins/vis_types/timelion/server/series_functions/color.test.js
index 87dfa35f96f48..00f5e2819d065 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/color.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/color.test.js
@@ -10,12 +10,12 @@ import fn from './color';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('color.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('sets the color, on all series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/condition.js b/src/plugins/vis_types/timelion/server/series_functions/condition.js
index d4ed81b35cb06..0bebddc9498a2 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/condition.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/condition.js
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
-import argType from '../handlers/lib/arg_type.js';
+import argType from '../handlers/lib/arg_type';
 
 export default new Chainable('condition', {
   args: [
diff --git a/src/plugins/vis_types/timelion/server/series_functions/condition.test.js b/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
index d69b4b73205e7..4e84f59faa2cf 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
@@ -9,7 +9,7 @@
 import fn from './condition';
 import moment from 'moment';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 import getSeriesList from './helpers/get_single_series_list';
 import _ from 'lodash';
 
@@ -17,7 +17,7 @@ describe('condition.js', function () {
   let comparable;
   let seriesList;
   beforeEach(function () {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
     comparable = getSeriesList('', [
       [moment.utc('1980-01-01T00:00:00.000Z'), 12],
       [moment.utc('1981-01-01T00:00:00.000Z'), 33],
diff --git a/src/plugins/vis_types/timelion/server/series_functions/cusum.js b/src/plugins/vis_types/timelion/server/series_functions/cusum.js
index ecd61ee250847..7f8a2b554bada 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/cusum.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/cusum.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js b/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
index 70022da8ab4d7..6a791f33ea391 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
@@ -10,12 +10,12 @@ import fn from './cusum';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('cusum.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('progressively adds the numbers in the list', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/derivative.js b/src/plugins/vis_types/timelion/server/series_functions/derivative.js
index ba7493a108e26..f6d4c3fc424b4 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/derivative.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/derivative.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js b/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
index f720b15110fd2..e729b21652478 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
@@ -10,12 +10,12 @@ import fn from './derivative';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('derivative.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('gets the change in the set', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/divide.js b/src/plugins/vis_types/timelion/server/series_functions/divide.js
index 3fcd1ded41af2..b2104ad3fce04 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/divide.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/divide.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('divide', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/divide.test.js b/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
index aa9e5b03eeded..a651901478369 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
@@ -10,12 +10,12 @@ import fn from './divide';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('divide.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('divides by a single number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js b/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
index 6f718a6ec8e16..6d58158acb322 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
@@ -7,7 +7,7 @@
  */
 
 import { of } from 'rxjs';
-import es from './index';
+import es from '.';
 import tlConfigFn from '../fixtures/tl_config';
 import * as aggResponse from './lib/agg_response_to_series_list';
 import buildRequest from './lib/build_request';
@@ -16,8 +16,8 @@ import esResponse from '../fixtures/es_response';
 
 import _ from 'lodash';
 import sinon from 'sinon';
-import invoke from '../helpers/invoke_series_fn.js';
-import { UI_SETTINGS } from '../../../../../data/server';
+import invoke from '../helpers/invoke_series_fn';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 
 describe('es', () => {
   let tlConfig;
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
index 99b5d0bacd858..2a69e87589aeb 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
@@ -10,7 +10,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import { buildAggBody } from './agg_body';
 import createDateAgg from './create_date_agg';
-import { UI_SETTINGS } from '../../../../../../data/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 
 export default function buildRequest(config, tlConfig, scriptFields, runtimeFields, timeout) {
   const bool = { must: [] };
diff --git a/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
index e12ad035a2b61..a80c4888f9479 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
@@ -7,7 +7,7 @@
  */
 
 import { buildAggBody } from './agg_body';
-import { search, METRIC_TYPES } from '../../../../../../data/server';
+import { search, METRIC_TYPES } from '@kbn/data-plugin/server';
 
 const { dateHistogramInterval } = search.aggs;
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/first.js b/src/plugins/vis_types/timelion/server/series_functions/first.js
index 51e47274ef3e5..9e309a7f3f81e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/first.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/first.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('first', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/first.test.js b/src/plugins/vis_types/timelion/server/series_functions/first.test.js
index f070f6f96e0c7..b95581860c8f5 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/first.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/first.test.js
@@ -9,8 +9,8 @@
 import fn from './first';
 
 const expect = require('chai').expect;
-const seriesList = require('./fixtures/series_list.js')();
-import invoke from './helpers/invoke_series_fn.js';
+const seriesList = require('./fixtures/series_list')();
+import invoke from './helpers/invoke_series_fn';
 
 describe('first.js', function () {
   it('should return exactly the data input', function () {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/fit.js b/src/plugins/vis_types/timelion/server/series_functions/fit.js
index 69ec31f829499..e53ab6255e0c4 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/fit.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fit.js
@@ -7,10 +7,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
-import loadFunctions from '../lib/load_functions.js';
+import loadFunctions from '../lib/load_functions';
 const fitFunctions = loadFunctions('fit_functions');
 
 export default new Chainable('fit', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/fit.test.js b/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
index b755a3f80e338..20c18204fa2d8 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-const fn = require(`src/plugins/vis_types/timelion/server/series_functions/fit`);
+const fn = require('./fit');
 import moment from 'moment';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 import getSeriesList from './helpers/get_single_series_list';
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js b/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
index f3eb378095fc7..6c344d3abf3a0 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
@@ -14,7 +14,7 @@ import esResponse from './es_response';
 export default function () {
   const functions = require('../../lib/load_functions')('series_functions');
 
-  const tlConfig = require('../../handlers/lib/tl_config.js')({
+  const tlConfig = require('../../handlers/lib/tl_config')({
     getFunction: (name) => {
       if (!functions[name]) throw new Error('No such function: ' + name);
       return functions[name];
diff --git a/src/plugins/vis_types/timelion/server/series_functions/hide.js b/src/plugins/vis_types/timelion/server/series_functions/hide.js
index 4f445ca91e21e..b309f1eba05d1 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/hide.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/hide.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('hide', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/hide.test.js b/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
index c0778186af7fc..d189832245610 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
@@ -10,12 +10,12 @@ import fn from './hide';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('hide.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('hides a series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/label.js b/src/plugins/vis_types/timelion/server/series_functions/label.js
index 30a5c626251d1..a0e6f8ef3cb3b 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/label.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/label.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('label', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/label.test.js b/src/plugins/vis_types/timelion/server/series_functions/label.test.js
index 0f1eff24cb27c..cb763036bbc3c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/label.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/label.test.js
@@ -10,12 +10,12 @@ import fn from './label';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('label.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('changes the label on the series', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/legend.js b/src/plugins/vis_types/timelion/server/series_functions/legend.js
index 7fe4889936c03..2efd489c362e0 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/legend.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/legend.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 import { DEFAULT_TIME_FORMAT } from '../../common/lib';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/legend.test.js b/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
index aa60b63d49bc7..ec77767565430 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
@@ -9,12 +9,12 @@
 import fn from './legend';
 
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('legend.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should create the _global object if it does not exist', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/lines.js b/src/plugins/vis_types/timelion/server/series_functions/lines.js
index 2479de0e2914a..555e62ebf4aab 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/lines.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/lines.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('lines', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/lines.test.js b/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
index 64f6bd9d65f6c..3c10fcc75b0bc 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
@@ -9,12 +9,12 @@
 import fn from './lines';
 
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('lines.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should simply set show, steps, stack and lineWidth', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/log.js b/src/plugins/vis_types/timelion/server/series_functions/log.js
index ec5d687335dfa..b3b04d0824d98 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/log.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/log.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/log.test.js b/src/plugins/vis_types/timelion/server/series_functions/log.test.js
index da0f5bb31a2bf..681d4cc5617ef 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/log.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/log.test.js
@@ -10,12 +10,12 @@ import fn from './log';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('log.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should return the log10 value of every value', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/max.js b/src/plugins/vis_types/timelion/server/series_functions/max.js
index be31e651b12d4..e598abeb8f5f8 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/max.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/max.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('max', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/max.test.js b/src/plugins/vis_types/timelion/server/series_functions/max.test.js
index 7211cabbef180..e3161909590e2 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/max.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/max.test.js
@@ -10,12 +10,12 @@ import fn from './max';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('max.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('keeps the max of a series vs a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/min.js b/src/plugins/vis_types/timelion/server/series_functions/min.js
index 2382f8cd96bc3..ed9fed9dd5248 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/min.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/min.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('min', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/min.test.js b/src/plugins/vis_types/timelion/server/series_functions/min.test.js
index 07c5bd3d018d4..eb7ddd5964408 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/min.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/min.test.js
@@ -10,12 +10,12 @@ import fn from './min';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('min.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('keeps the min of a series vs a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
index 5d017909a784d..cba15e4fb0495 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 import { toMS } from '../../common/lib/to_milliseconds';
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
index 6a5b62497ec68..843da98979e98 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
@@ -14,7 +14,7 @@ import _ from 'lodash';
 import buckets from './fixtures/bucket_list';
 import getSeries from './helpers/get_series';
 import getSeriesList from './helpers/get_series_list';
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 function getFivePointSeries() {
   return getSeriesList([
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingstd.js b/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
index 90ddf6c26a9b7..c52f2162f0d2e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js b/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
index 3c91cc4ec05b9..a0246cf7a79bb 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
@@ -10,7 +10,7 @@ import fn from './movingstd';
 
 import moment from 'moment';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 import getSeries from './helpers/get_series';
 import getSeriesList from './helpers/get_series_list';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/multiply.js b/src/plugins/vis_types/timelion/server/series_functions/multiply.js
index 8e07676a32be4..1eb717f6091c5 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/multiply.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/multiply.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('multiply', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js b/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
index c0755dc6ed120..8f21a9301673e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
@@ -10,12 +10,12 @@ import fn from './multiply';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('multiply.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('multiplies by a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/points.js b/src/plugins/vis_types/timelion/server/series_functions/points.js
index 2c0f184c7ccae..908ecea8cdfa1 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/points.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/points.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/points.test.js b/src/plugins/vis_types/timelion/server/series_functions/points.test.js
index e510ac7361493..80148c45a4d2e 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/points.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/points.test.js
@@ -11,12 +11,12 @@ import fn from './points';
 import _ from 'lodash';
 import assert from 'chai';
 const expect = assert.expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('points.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('should set the point radius', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/precision.js b/src/plugins/vis_types/timelion/server/series_functions/precision.js
index b22b6cedddae3..b55c23851f20c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/precision.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/precision.js
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
-import alter from '../lib/alter.js';
+import reduce from '../lib/reduce';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('precision', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/precision.test.js b/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
index 7a06aa221f269..1e09925cfb83c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
@@ -10,12 +10,12 @@ import fn from './precision';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('precision.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('keeps the min of a series vs a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/props.js b/src/plugins/vis_types/timelion/server/series_functions/props.js
index 58cc06f149048..938c7e470bb55 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/props.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/props.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 import _ from 'lodash';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/range.js b/src/plugins/vis_types/timelion/server/series_functions/range.js
index 36d7fc1b21446..7411c4ec6dd3c 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/range.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/range.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/range.test.js b/src/plugins/vis_types/timelion/server/series_functions/range.test.js
index 5acad54fc8b24..486cef637cb28 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/range.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/range.test.js
@@ -10,12 +10,12 @@ import fn from './range';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('range.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
     seriesList.list[0].data = [
       [1000, 20],
       [2000, 10],
diff --git a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
index a823ae860c6d9..b459355d65cb4 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import { toMS } from '../../common/lib/to_milliseconds';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
diff --git a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
index 4f081e7027a5e..872dfc89e4bfe 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
@@ -10,12 +10,12 @@ import fn from './scale_interval';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('scale_interval.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('Can multiply to transform one interval to another', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/static.test.js b/src/plugins/vis_types/timelion/server/series_functions/static.test.js
index 8294d84e81e5a..89f4a9404c478 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/static.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/static.test.js
@@ -10,7 +10,7 @@ import fn from './static';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('static.js', () => {
   it('returns a series in which all numbers are the same', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/subtract.js b/src/plugins/vis_types/timelion/server/series_functions/subtract.js
index b8b49d10d60fc..314996cbdc0fc 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/subtract.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/subtract.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('subtract', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js b/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
index a452365164126..0f40688d53518 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
@@ -10,12 +10,12 @@ import fn from './subtract';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('subtract.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('it throws an error if first argument is not seriesList', async () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/sum.js b/src/plugins/vis_types/timelion/server/series_functions/sum.js
index 3927551eff2f5..ea2ec7dcb9de5 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/sum.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/sum.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import reduce from '../lib/reduce.js';
+import reduce from '../lib/reduce';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('sum', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/sum.test.js b/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
index efed2df3b30c5..179e2faa7cfe7 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
@@ -10,12 +10,12 @@ import fn from './sum';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('sum.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('it adds a number', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/title.js b/src/plugins/vis_types/timelion/server/series_functions/title.js
index 8443c3892b6ee..2f45635e2cf28 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/title.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/title.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 
 export default new Chainable('title', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/title.test.js b/src/plugins/vis_types/timelion/server/series_functions/title.test.js
index fc1ac042556e1..653c833575665 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/title.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/title.test.js
@@ -10,12 +10,12 @@ import fn from './title';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('title.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('sets the title property', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/trim.js b/src/plugins/vis_types/timelion/server/series_functions/trim.js
index ab24c43b965c6..7e8587883f096 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/trim.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/trim.js
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
diff --git a/src/plugins/vis_types/timelion/server/series_functions/trim.test.js b/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
index 201fed167dff3..6158c0dbabdd6 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
@@ -10,12 +10,12 @@ import fn from './trim';
 
 import _ from 'lodash';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('trim.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('Sets the first and last values to null by default', () => {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js b/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
index c2eb07890a102..344e5a47fafde 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import worldbank from './worldbank.js';
+import worldbank from './worldbank';
 import Datasource from '../lib/classes/datasource';
 
 export default new Datasource('worldbank_indicators', {
diff --git a/src/plugins/vis_types/timelion/server/series_functions/yaxis.js b/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
index b33ee592d7a8d..46ed7e18b0ea7 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import alter from '../lib/alter.js';
+import alter from '../lib/alter';
 import Chainable from '../lib/classes/chainable';
 const tickFormatters = {
   bits: 'bits',
diff --git a/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js b/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
index d68aa7ac70117..74e8966bfd7cb 100644
--- a/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
@@ -8,12 +8,12 @@
 
 import fn from './yaxis';
 const expect = require('chai').expect;
-import invoke from './helpers/invoke_series_fn.js';
+import invoke from './helpers/invoke_series_fn';
 
 describe('yaxis.js', () => {
   let seriesList;
   beforeEach(() => {
-    seriesList = require('./fixtures/series_list.js')();
+    seriesList = require('./fixtures/series_list')();
   });
 
   it('creates the yaxes array', () => {
diff --git a/src/plugins/vis_types/timelion/server/ui_settings.ts b/src/plugins/vis_types/timelion/server/ui_settings.ts
index 30c170b135da8..5a29d029f6ab2 100644
--- a/src/plugins/vis_types/timelion/server/ui_settings.ts
+++ b/src/plugins/vis_types/timelion/server/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import type { UiSettingsParams } from 'kibana/server';
+import type { UiSettingsParams } from '@kbn/core/server';
 
 import { UI_SETTINGS } from '../common/constants';
 
diff --git a/src/plugins/vis_types/timeseries/common/agg_utils.test.ts b/src/plugins/vis_types/timeseries/common/agg_utils.test.ts
index 21fa870c2ca04..2a350d54de2c6 100644
--- a/src/plugins/vis_types/timeseries/common/agg_utils.test.ts
+++ b/src/plugins/vis_types/timeseries/common/agg_utils.test.ts
@@ -13,7 +13,7 @@ import {
   getAggsByPredicate,
   getAggsByType,
 } from './agg_utils';
-import { METRIC_TYPES } from '../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from './enums';
 import type { Metric } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/common/agg_utils.ts b/src/plugins/vis_types/timeseries/common/agg_utils.ts
index 71f13542b10f4..93b89d23b9793 100644
--- a/src/plugins/vis_types/timeseries/common/agg_utils.ts
+++ b/src/plugins/vis_types/timeseries/common/agg_utils.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { filter } from 'lodash';
 import { Assign } from 'utility-types';
-import { METRIC_TYPES } from '../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from './enums';
 import type { Metric, MetricType } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/common/calculate_label.test.ts b/src/plugins/vis_types/timeseries/common/calculate_label.test.ts
index 7e612ed1aaddd..9d9aa170e9d88 100644
--- a/src/plugins/vis_types/timeseries/common/calculate_label.test.ts
+++ b/src/plugins/vis_types/timeseries/common/calculate_label.test.ts
@@ -9,7 +9,7 @@
 import { calculateLabel } from './calculate_label';
 import type { Metric } from './types';
 import { SanitizedFieldType } from './types';
-import { KBN_FIELD_TYPES } from '../../../data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 describe('calculateLabel(metric, metrics)', () => {
   test('returns the metric.alias if set', () => {
diff --git a/src/plugins/vis_types/timeseries/common/calculate_label.ts b/src/plugins/vis_types/timeseries/common/calculate_label.ts
index e5cf053d310aa..d9b03d8de615e 100644
--- a/src/plugins/vis_types/timeseries/common/calculate_label.ts
+++ b/src/plugins/vis_types/timeseries/common/calculate_label.ts
@@ -8,9 +8,9 @@
 
 import { includes, startsWith } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { getMetricLabel } from './agg_utils';
 import { extractFieldLabel } from './fields_utils';
-import { METRIC_TYPES } from '../../../data/common';
 import { TSVB_METRIC_TYPES } from './enums';
 import type { Metric, SanitizedFieldType } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/common/fields_utils.test.ts b/src/plugins/vis_types/timeseries/common/fields_utils.test.ts
index 6dd00d803b7c3..cea7315024300 100644
--- a/src/plugins/vis_types/timeseries/common/fields_utils.test.ts
+++ b/src/plugins/vis_types/timeseries/common/fields_utils.test.ts
@@ -12,10 +12,10 @@ import {
   getMultiFieldLabel,
   createCachedFieldValueFormatter,
 } from './fields_utils';
-import { FieldSpec, KBN_FIELD_TYPES } from '../../../data/common';
-import { DataView } from '../../../data_views/common';
-import { stubLogstashDataView } from '../../../data/common/stubs';
-import { FieldFormatsRegistry, StringFormat } from '../../../field_formats/common';
+import { FieldSpec, KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { stubLogstashDataView } from '@kbn/data-plugin/common/stubs';
+import { FieldFormatsRegistry, StringFormat } from '@kbn/field-formats-plugin/common';
 
 describe('fields_utils', () => {
   describe('toSanitizedFieldType', () => {
diff --git a/src/plugins/vis_types/timeseries/common/fields_utils.ts b/src/plugins/vis_types/timeseries/common/fields_utils.ts
index 02a62b9246d54..e47967fc47f1b 100644
--- a/src/plugins/vis_types/timeseries/common/fields_utils.ts
+++ b/src/plugins/vis_types/timeseries/common/fields_utils.ts
@@ -7,10 +7,14 @@
  */
 import { i18n } from '@kbn/i18n';
 
-import { isNestedField, FieldSpec, DataView } from '../../../data/common';
+import { isNestedField, FieldSpec, DataView } from '@kbn/data-plugin/common';
+import {
+  FieldFormat,
+  FieldFormatsRegistry,
+  FIELD_FORMAT_IDS,
+} from '@kbn/field-formats-plugin/common';
 import { FieldNotFoundError } from './errors';
 import type { FetchedIndexPattern, SanitizedFieldType } from './types';
-import { FieldFormat, FieldFormatsRegistry, FIELD_FORMAT_IDS } from '../../../field_formats/common';
 
 export const extractFieldLabel = (
   fields: SanitizedFieldType[],
diff --git a/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts b/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts
index 0d4b293a3242b..1de76eefbfd01 100644
--- a/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts
+++ b/src/plugins/vis_types/timeseries/common/index_patterns_utils.test.ts
@@ -12,7 +12,7 @@ import {
   fetchIndexPattern,
 } from './index_patterns_utils';
 import { Panel } from './types';
-import type { DataView, DataViewsService } from '../../../data_views/public';
+import type { DataView, DataViewsService } from '@kbn/data-views-plugin/public';
 
 describe('isStringTypeIndexPattern', () => {
   test('should returns true on string-based index', () => {
diff --git a/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts b/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts
index 4c4abf0023de0..81bb104bcb194 100644
--- a/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts
+++ b/src/plugins/vis_types/timeseries/common/index_patterns_utils.ts
@@ -7,8 +7,8 @@
  */
 
 import { uniq } from 'lodash';
-import type { Panel, IndexPatternValue, FetchedIndexPattern } from '../common/types';
-import { DataViewsService } from '../../../data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { Panel, IndexPatternValue, FetchedIndexPattern } from './types';
 
 export const isStringTypeIndexPattern = (
   indexPatternValue: IndexPatternValue
diff --git a/src/plugins/vis_types/timeseries/common/types/index.ts b/src/plugins/vis_types/timeseries/common/types/index.ts
index 2fa775765b496..4076ca1a0bb24 100644
--- a/src/plugins/vis_types/timeseries/common/types/index.ts
+++ b/src/plugins/vis_types/timeseries/common/types/index.ts
@@ -7,8 +7,8 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { KBN_FIELD_TYPES, Query } from '../../../../data/common';
-import type { DataView } from '../../../../data_views/public';
+import { KBN_FIELD_TYPES, Query } from '@kbn/data-plugin/common';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { Panel } from './panel_model';
 
 export type { Metric, Series, Panel, MetricType } from './panel_model';
diff --git a/src/plugins/vis_types/timeseries/common/types/panel_model.ts b/src/plugins/vis_types/timeseries/common/types/panel_model.ts
index 1ccf7412a3e98..cdb294f0ed630 100644
--- a/src/plugins/vis_types/timeseries/common/types/panel_model.ts
+++ b/src/plugins/vis_types/timeseries/common/types/panel_model.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Query, METRIC_TYPES, KBN_FIELD_TYPES } from '../../../../data/common';
+import { Query, METRIC_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { PANEL_TYPES, TOOLTIP_MODES, TSVB_METRIC_TYPES } from '../enums';
-import type { IndexPatternValue, Annotation } from './index';
+import type { IndexPatternValue, Annotation } from '.';
 import type {
   ColorRules,
   BackgroundColorRules,
diff --git a/src/plugins/vis_types/timeseries/common/validate_interval.ts b/src/plugins/vis_types/timeseries/common/validate_interval.ts
index 78a2410f905c9..3047d10e00143 100644
--- a/src/plugins/vis_types/timeseries/common/validate_interval.ts
+++ b/src/plugins/vis_types/timeseries/common/validate_interval.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { parseInterval, TimeRangeBounds } from '@kbn/data-plugin/common';
 import { GTE_INTERVAL_RE } from './interval_regexp';
-import { parseInterval, TimeRangeBounds } from '../../../data/common';
 import { ValidateIntervalError } from './errors';
 
 export function validateInterval(bounds: TimeRangeBounds, interval: string, maxBuckets: number) {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts b/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts
index 40d80a014e36b..55668a94c8470 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/field_select/field_select_utils.ts
@@ -9,7 +9,7 @@
 import type { EuiComboBoxOptionOption, EuiComboBoxProps } from '@elastic/eui';
 import { isFieldEnabled } from '../../../../../common/check_ui_restrictions';
 
-import type { SanitizedFieldType } from '../../../../..//common/types';
+import type { SanitizedFieldType } from '../../../../../common/types';
 import type { TimeseriesUIRestrictions } from '../../../../../common/ui_restrictions';
 
 export const INVALID_FIELD_ID = 'INVALID_FIELD';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js
index b24ac14717561..18bb47c9f4426 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.js
@@ -24,7 +24,7 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getSupportedFieldsByMetricType } from '../lib/get_supported_fields_by_metric_type';
 import { getDataStart } from '../../../services';
 import { QueryBarWrapper } from '../query_bar_wrapper';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js
index bebbbc6f8614f..f634a475d52eb 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/filter_ratio.test.js
@@ -11,7 +11,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { FilterRatioAgg } from './filter_ratio';
 import { FIELDS, METRIC, SERIES, PANEL } from '../../../test_utils';
 import { EuiComboBox } from '@elastic/eui';
-import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { setDataStart } from '../../../services';
 
 jest.mock('../query_bar_wrapper', () => ({
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
index b97968ff62241..17e8e9fc233b7 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
@@ -12,7 +12,7 @@ import { Agg } from './agg';
 import { FieldSelect } from './field_select';
 import { FIELDS, METRIC, SERIES, PANEL } from '../../../test_utils';
 import { setDataStart } from '../../../services';
-import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
 jest.mock('../query_bar_wrapper', () => ({
   QueryBarWrapper: jest.fn(() => null),
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js
index c098eb83ddf98..7f6c2505010b2 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile.js
@@ -23,7 +23,7 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { Percentiles, newPercentile } from './percentile_ui';
 import { PercentileHdr } from './percentile_hdr';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
index 57dfa23c815d8..fd689f917030b 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
@@ -16,6 +16,7 @@ import {
   EuiFlexGrid,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { AggSelect } from '../agg_select';
 import { FieldSelect } from '../field_select';
 // @ts-ignore
@@ -26,7 +27,6 @@ import { createNumberHandler } from '../../lib/create_number_handler';
 import { AggRow } from '../agg_row';
 import { PercentileRankValues } from './percentile_rank_values';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../data/public';
 import type { Metric, Panel, SanitizedFieldType, Series } from '../../../../../common/types';
 import { TSVB_DEFAULT_COLOR } from '../../../../../common/constants';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js
index 35786efa98c5f..31cdeebee39e8 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/positive_rate.js
@@ -26,7 +26,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 const UNIT_OPTIONS = [
   {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js
index 375d576f8cf28..f949ad2b628c0 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/std_deviation.js
@@ -25,7 +25,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 const RESTRICT_FIELDS = KBN_FIELD_TYPES.NUMBER;
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js
index 7dec7d94236e0..e49faca9ec253 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/top_hit.js
@@ -24,7 +24,7 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { PANEL_TYPES } from '../../../../common/enums';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx b/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx
index b571c958e1a08..0b0be9bebf39d 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/annotation_row.tsx
@@ -20,8 +20,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { KBN_FIELD_TYPES, Query } from '@kbn/data-plugin/public';
 import { getDataViewsStart } from '../../services';
-import { KBN_FIELD_TYPES, Query } from '../../../../../../plugins/data/public';
 
 import { AddDeleteButtons } from './add_delete_buttons';
 import { ColorPicker } from './color_picker';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx b/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx
index 006682d4bfa37..498b51af2da51 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/annotations_editor.tsx
@@ -10,7 +10,7 @@ import React, { useCallback } from 'react';
 import uuid from 'uuid';
 import { EuiSpacer, EuiTitle, EuiButton, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { AnnotationRow } from './annotation_row';
 import { collectionActions, CollectionActionsProps } from './lib/collection_actions';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js b/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
index 26d8a91824a83..e653f75ea7c4e 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
@@ -26,7 +26,7 @@ import { createTextHandler } from './lib/create_text_handler';
 import { IndexPatternSelect } from './lib/index_pattern_select';
 import { YesNo } from './yes_no';
 import { LastValueModePopover } from './last_value_mode_popover';
-import { KBN_FIELD_TYPES } from '../../../../../data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { isGteInterval, validateReInterval, isAutoInterval } from './lib/get_interval';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
@@ -37,7 +37,7 @@ import { VisDataContext } from '../contexts/vis_data_context';
 import { PanelModelContext } from '../contexts/panel_model_context';
 import { FormValidationContext } from '../contexts/form_validation_context';
 import { getUISettings, getDataViewsStart } from '../../services';
-import { UI_SETTINGS } from '../../../../../data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { fetchIndexPattern } from '../../../common/index_patterns_utils';
 
 const RESTRICT_FIELDS = [KBN_FIELD_TYPES.DATE];
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts
index 2eaee96099110..4bd0684dfed84 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { checkIfNumericMetric } from './check_if_numeric_metric';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts
index 139c13d7ddbda..a7cf2810d1e37 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_numeric_metric.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
-import { KBN_FIELD_TYPES } from '../../../../../../data/public';
 
 import type { Metric, IndexPatternValue } from '../../../../common/types';
 import type { VisFields } from '../../lib/fetch_fields';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
index 996cabb9f7963..1bf4fb4f24a60 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import type { FieldFormatMap } from '@kbn/data-plugin/common';
 import { DATA_FORMATTERS } from '../../../../common/enums';
 import { aggs } from '../../../../common/agg_utils';
 import type { Series } from '../../../../common/types';
-import type { FieldFormatMap } from '../../../../../../data/common';
 
 export const checkIfSeriesHaveSameFormatters = (
   seriesModel: Series[],
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
index 651fe6fbd36f5..3e0dc222b5920 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView, DataViewField } from 'src/plugins/data_views/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { PanelData } from '../../../../common/types';
 import { TimeseriesVisParams } from '../../../types';
 import { convertSeriesToDataTable, addMetaToColumns } from './convert_series_to_datatable';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts
index e18611365ce06..1219a7fde22cc 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.ts
@@ -5,16 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DataView } from 'src/plugins/data_views/public';
-import { DatatableRow, DatatableColumn, DatatableColumnType } from 'src/plugins/expressions/public';
-import { Query } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { DatatableRow, DatatableColumn, DatatableColumnType } from '@kbn/expressions-plugin/public';
+import { Query } from '@kbn/data-plugin/common';
+import { BUCKET_TYPES as DATA_PLUGIN_BUCKET_TYPES, MultiFieldKey } from '@kbn/data-plugin/common';
 import { TimeseriesVisParams } from '../../../types';
 import type { PanelData, Metric } from '../../../../common/types';
 import { getMultiFieldLabel, getFieldsForTerms } from '../../../../common/fields_utils';
-import {
-  BUCKET_TYPES as DATA_PLUGIN_BUCKET_TYPES,
-  MultiFieldKey,
-} from '../../../../../../data/common';
 import { BUCKET_TYPES, TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { fetchIndexPattern } from '../../../../common/index_patterns_utils';
 import { getDataStart, getDataViewsStart } from '../../../services';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts
index 956dd9416e8ff..c5f4799ca2167 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { createFieldFormatter } from './create_field_formatter';
-import { getFieldFormatsRegistry } from '../../../../../../data/public/test_utils';
+import { getFieldFormatsRegistry } from '@kbn/data-plugin/public/test_utils';
 import { setFieldFormats } from '../../../services';
-import { FORMATS_UI_SETTINGS } from 'src/plugins/field_formats/common';
-import type { CoreSetup } from 'kibana/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
+import type { CoreSetup } from '@kbn/core/public';
 
 const mockUiSettings = {
   get: jest.fn((item: keyof typeof mockUiSettings) => mockUiSettings[item]),
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts
index a7606895e84aa..0d605618cf864 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/create_field_formatter.ts
@@ -7,11 +7,11 @@
  */
 
 import { isNumber } from 'lodash';
-import { getFieldFormats } from '../../../services';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
+import type { FieldFormatMap } from '@kbn/data-plugin/common';
+import type { FieldFormatsContentType } from '@kbn/field-formats-plugin/common';
 import { isEmptyValue, DISPLAY_EMPTY_VALUE } from '../../../../common/last_value_utils';
-import { FIELD_FORMAT_IDS } from '../../../../../../field_formats/common';
-import type { FieldFormatMap } from '../../../../../../data/common';
-import type { FieldFormatsContentType } from '../../../../../../field_formats/common';
+import { getFieldFormats } from '../../../services';
 
 const DEFAULT_FIELD_FORMAT = { id: 'number' };
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts
index 91ed3000641a2..31f743b01ac24 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_click_filter_data.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
-import { ValueClickContext } from 'src/plugins/embeddable/public';
+import { ValueClickContext } from '@kbn/embeddable-plugin/public';
 import { X_ACCESSOR_INDEX } from '../../visualizations/constants';
 import { BUCKET_TYPES } from '../../../../common/enums';
 import { TimeseriesVisParams } from '../../../types';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts
index 3cb7ee0388f94..0d6d2953f1ac4 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_default_query_language.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { getUISettings } from '../../../services';
-import { UI_SETTINGS } from '../../../../../../data/public';
 
 export function getDefaultQueryLanguage() {
   return getUISettings().get(UI_SETTINGS.SEARCH_QUERY_LANGUAGE);
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts
index ea86ef6dc7ae9..59faf6d425503 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_interval.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { search } from '../../../../../../../plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 import { GTE_INTERVAL_RE } from '../../../../common/interval_regexp';
 import { AUTO_INTERVAL } from '../../../../common/constants';
 import { isVisTableData } from '../../../../common/vis_data_utils';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
index 2909e7804b1bf..c44c34b570c9a 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.js
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 
 export function getSupportedFieldsByMetricType(type) {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
index 878b4f7655f3e..c905a7813dcdb 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/get_supported_fields_by_metric_type.test.js
@@ -7,7 +7,7 @@
  */
 
 import { getSupportedFieldsByMetricType } from './get_supported_fields_by_metric_type';
-import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 describe('getSupportedFieldsByMetricType', () => {
   const shouldHaveHistogramAndNumbers = (type) =>
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx
index be32104289d09..844c79de2cf28 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/combo_box_select.tsx
@@ -8,13 +8,13 @@
 
 import React, { useCallback, useState, useEffect } from 'react';
 import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
+import type { DataViewsService } from '@kbn/data-views-plugin/public';
 import { getDataViewsStart } from '../../../../services';
 
 import { SwitchModePopover } from './switch_mode_popover';
 
 import type { SelectIndexComponentProps } from './types';
 import type { IndexPatternValue } from '../../../../../common/types';
-import type { DataViewsService } from '../../../../../../../data_views/public';
 
 /** @internal **/
 type IdsWithTitle = Awaited<ReturnType<DataViewsService['getIdsWithTitle']>>;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx
index 6cc1c8d1e6968..9d830f03fa1d4 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/index_pattern_select.tsx
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiFormRow, EuiText, EuiLink, htmlIdGenerator } from '@elastic/eui';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getCoreStart } from '../../../../services';
 import { PanelModelContext } from '../../../contexts/panel_model_context';
 
@@ -19,7 +20,6 @@ import { ComboBoxSelect } from './combo_box_select';
 
 import type { IndexPatternValue, FetchedIndexPattern } from '../../../../../common/types';
 import { USE_KIBANA_INDEXES_KEY } from '../../../../../common/constants';
-import type { DataView } from '../../../../../../../data_views/public';
 
 export interface IndexPatternSelectProps {
   indexPatternName: string;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts
index e922fd6c7ed0a..fb745db6fa7dc 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/index_pattern_select/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 import type { Assign } from '@kbn/utility-types';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { FetchedIndexPattern, IndexPatternValue } from '../../../../../common/types';
-import type { DataView } from '../../../../../../../data_views/public';
 
 /** @internal **/
 export interface SelectIndexComponentProps {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts
index 9c7cc1225c5ac..5c36b202b7b07 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/new_metric_agg_fn.ts
@@ -7,7 +7,7 @@
  */
 
 import uuid from 'uuid';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import type { Metric } from '../../../../common/types';
 
 export const newMetricAggFn = (): Metric => {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js
index 9bccc13d19269..58fbe2c3d37c0 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.js
@@ -9,7 +9,7 @@
 import { isNumber } from 'lodash';
 import handlebars from 'handlebars';
 import { isEmptyValue, DISPLAY_EMPTY_VALUE } from '../../../../common/last_value_utils';
-import { inputFormats, outputFormats, isDuration } from '../lib/durations';
+import { inputFormats, outputFormats, isDuration } from './durations';
 import { getFieldFormats } from '../../../services';
 
 export const createTickFormatter = (format = '0,0.[00]', template, getConfig = null) => {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js
index 8053c066114a3..1793ba8b62e35 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/tick_formatter.test.js
@@ -7,10 +7,10 @@
  */
 
 import { createTickFormatter } from './tick_formatter';
-import { getFieldFormatsRegistry } from '../../../../../../data/public/test_utils';
+import { getFieldFormatsRegistry } from '@kbn/data-plugin/public/test_utils';
 import { setFieldFormats } from '../../../services';
-import { UI_SETTINGS } from '../../../../../../data/public';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 
 const mockUiSettings = {
   get: (item) => {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts
index fee6670b49b9c..af5a14eed423e 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/types.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Datatable } from 'src/plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 
 export interface TSVBTables {
   [key: string]: Datatable;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js b/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js
index 8dd92b97e0ee7..8252f2e4d563e 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/markdown_editor.js
@@ -15,7 +15,7 @@ import React, { Component } from 'react';
 import { createTickFormatter } from './lib/tick_formatter';
 import { convertSeriesToVars } from './lib/convert_series_to_vars';
 import _ from 'lodash';
-import { CodeEditor, MarkdownLang } from '../../../../../kibana_react/public';
+import { CodeEditor, MarkdownLang } from '@kbn/kibana-react-plugin/public';
 
 import { EuiText, EuiCodeBlock, EuiSpacer, EuiTitle } from '@elastic/eui';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx b/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx
index 489896662033b..38185891de37f 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/palette_picker.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import { PalettePicker, PalettePickerProps } from './palette_picker';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EuiColorPalettePicker } from '@elastic/eui';
 import { PALETTES } from '../../../common/enums';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx b/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx
index 0e8e7108d8e38..7e0ed4023a1b9 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/panel_config/markdown.tsx
@@ -24,6 +24,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
+import { CodeEditor, CssLang } from '@kbn/kibana-react-plugin/public';
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
 // @ts-expect-error not typed yet
@@ -37,7 +38,6 @@ import { QueryBarWrapper } from '../query_bar_wrapper';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
 import { VisDataContext } from '../../contexts/vis_data_context';
 import { PanelConfigProps, PANEL_CONFIG_TABS } from './types';
-import { CodeEditor, CssLang } from '../../../../../../kibana_react/public';
 
 export class MarkdownPanelConfig extends Component<
   PanelConfigProps,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx b/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx
index cefcd9c2e5421..f7afd46c07c05 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/panel_config/table.tsx
@@ -27,6 +27,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { i18n } from '@kbn/i18n';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { FieldSelect } from '../aggs/field_select';
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
@@ -41,7 +42,6 @@ import { BUCKET_TYPES } from '../../../../common/enums';
 import { PanelConfigProps, PANEL_CONFIG_TABS } from './types';
 import { TimeseriesVisParams } from '../../../types';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
-import { KBN_FIELD_TYPES } from '../../../../../../data/public';
 
 export class TablePanelConfig extends Component<
   PanelConfigProps,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts b/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts
index ec55121a14e9f..75f5ed9a8ffaf 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/panel_config/types.ts
@@ -7,8 +7,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { IUiSettingsClient } from 'kibana/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { TimeseriesVisData } from '../../../../common/types';
 import { TimeseriesVisParams } from '../../../types';
 import { VisFields } from '../../lib/fetch_fields';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx b/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
index 0a4971d66476e..f83180dcea225 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
@@ -8,10 +8,10 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 
+import { QueryStringInput, QueryStringInputProps } from '@kbn/unified-search-plugin/public';
 import { CoreStartContext } from '../contexts/query_input_bar_context';
 import type { IndexPatternValue } from '../../../common/types';
 
-import { QueryStringInput, QueryStringInputProps } from '../../../../../unified_search/public';
 import { getDataViewsStart } from '../../services';
 import { fetchIndexPattern, isStringTypeIndexPattern } from '../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js b/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js
index 4810932c9b4ac..bfc31f7e46d48 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/splits/terms.js
@@ -25,7 +25,7 @@ import {
   EuiFieldText,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n-react';
-import { KBN_FIELD_TYPES } from '../../../../../../data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { STACKED_OPTIONS } from '../../visualizations/constants';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
index f2bf6425cf775..6784943b11188 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
@@ -11,9 +11,9 @@ import './timeseries_visualization.scss';
 import React, { Suspense, useCallback, useEffect, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingChart } from '@elastic/eui';
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
-import { IUiSettingsClient } from 'src/core/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { PersistedState } from 'src/plugins/visualizations/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
 import type { PaletteRegistry } from '@kbn/coloring';
 import { TimeseriesLoading } from './timeseries_loading';
 import { TimeseriesVisTypes } from './vis_types';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx b/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
index 4b3d51ad5d42a..904084fafaeba 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
@@ -11,16 +11,14 @@ import * as Rx from 'rxjs';
 import { share } from 'rxjs/operators';
 import { isEqual, isEmpty, debounce } from 'lodash';
 import { EventEmitter } from 'events';
-import type { IUiSettingsClient } from 'kibana/public';
-import type { DataView } from 'src/plugins/data_views/public';
-import type {
-  Vis,
-  VisualizeEmbeddableContract,
-} from '../../../../../../plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../../../../plugins/kibana_react/public';
-import { Storage } from '../../../../../../plugins/kibana_utils/public';
-
-import type { TimeRange } from '../../../../../../plugins/data/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { Vis, VisualizeEmbeddableContract } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+
+import type { TimeRange } from '@kbn/data-plugin/public';
+import type { EditorRenderProps } from '@kbn/visualizations-plugin/public';
 import type { IndexPatternValue, TimeseriesVisData } from '../../../common/types';
 
 // @ts-expect-error
@@ -33,7 +31,6 @@ import { fetchFields, VisFields } from '../lib/fetch_fields';
 import { getDataStart, getCoreStart } from '../../services';
 import type { TimeseriesVisParams } from '../../types';
 import { UseIndexPatternModeCallout } from './use_index_patter_mode_callout';
-import type { EditorRenderProps } from '../../../../../visualizations/public';
 
 const VIS_STATE_DEBOUNCE_DELAY = 200;
 const APP_NAME = 'VisEditor';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts b/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts
index 9061e71283e0c..bbc4dcddf6128 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/index.ts
@@ -8,12 +8,12 @@
 
 import React, { lazy } from 'react';
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
-import { IUiSettingsClient } from 'src/core/public';
-import { PersistedState } from 'src/plugins/visualizations/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
 import type { PaletteRegistry } from '@kbn/coloring';
+import type { FieldFormatMap } from '@kbn/data-plugin/common';
 import { TimeseriesVisParams } from '../../../types';
 import type { TimeseriesVisData, PanelData } from '../../../../common/types';
-import type { FieldFormatMap } from '../../../../../../data/common';
 import { FetchedIndexPattern } from '../../../../common/types';
 
 /**
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js
index 17a293627b314..85be7ff98332d 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/markdown/vis.js
@@ -11,7 +11,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { get } from 'lodash';
 import { ClassNames } from '@emotion/react';
-import { Markdown } from '../../../../../../../../plugins/kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorComponent } from '../../error';
 import { replaceVars } from '../../lib/replace_vars';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js
index f3cb92b31b309..74f53e7bf6ed3 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/config.js
@@ -37,7 +37,7 @@ import { QueryBarWrapper } from '../../query_bar_wrapper';
 import { DATA_FORMATTERS } from '../../../../../common/enums';
 import { isConfigurationFeatureEnabled } from '../../../../../common/check_ui_restrictions';
 import { filterCannotBeAppliedErrorMessage } from '../../../../../common/errors';
-import { KBN_FIELD_TYPES } from '../../../../../../../data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 export class TableSeriesConfig extends Component {
   UNSAFE_componentWillMount() {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
index 549aa1b70082f..a194a6212519d 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/table/vis.js
@@ -10,7 +10,7 @@ import _, { isArray, last, get } from 'lodash';
 import React, { Component } from 'react';
 import { parse as parseUrl } from 'url';
 import PropTypes from 'prop-types';
-import { RedirectAppLinks } from '../../../../../../../kibana_react/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { getMetricsField } from '../../lib/get_metrics_field';
 import { createTickFormatter } from '../../lib/tick_formatter';
 import { createFieldFormatter } from '../../lib/create_field_formatter';
@@ -21,7 +21,7 @@ import { ExternalUrlErrorModal } from '../../lib/external_url_error_modal';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { getFieldFormats, getCoreStart } from '../../../../services';
 import { DATA_FORMATTERS } from '../../../../../common/enums';
-import { FIELD_FORMAT_IDS } from '../../../../../../../../plugins/field_formats/common';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 
 import {
   createCachedFieldValueFormatter,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
index d9d5cdb576c03..3a9ec7c6cb648 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { ColorPicker } from '../../color_picker';
 import { AddDeleteButtons } from '../../add_delete_buttons';
-import { Aggs } from '../../../components/aggs/aggs';
+import { Aggs } from '../../aggs/aggs';
 import { TimeseriesConfig as SeriesConfig } from './config';
 import { SeriesDragHandler } from '../../series_drag_handler';
 import {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
index 0fb4e99b1e973..007e763997e13 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
@@ -18,8 +18,8 @@ import { createTickFormatter } from '../../lib/tick_formatter';
 import { createFieldFormatter } from '../../lib/create_field_formatter';
 import { checkIfSeriesHaveSameFormatters } from '../../lib/check_if_series_have_same_formatters';
 import { TimeSeries } from '../../../visualizations/views/timeseries';
-import { MarkdownSimple } from '../../../../../../../../plugins/kibana_react/public';
-import { LEGACY_TIME_AXIS } from '../../../../../../../../plugins/charts/common';
+import { MarkdownSimple } from '@kbn/kibana-react-plugin/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import { replaceVars } from '../../lib/replace_vars';
 import { getInterval } from '../../lib/get_interval';
 import { createIntervalBasedFormatter } from '../../lib/create_interval_based_formatter';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
index 0fd909af7376d..fe6f73ce66f79 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
@@ -12,12 +12,12 @@ import { TimeSeries } from '../../../visualizations/views/timeseries';
 import TimeseriesVisualization from './vis';
 import { setFieldFormats, setCharts, setUISettings } from '../../../../services';
 import { createFieldFormatter } from '../../lib/create_field_formatter';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../field_formats/common';
-import { METRIC_TYPES } from '../../../../../../../data/common';
-import { getFieldFormatsRegistry } from '../../../../../../../data/public/test_utils';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../../charts/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
+import { getFieldFormatsRegistry } from '@kbn/data-plugin/public/test_utils';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/public';
 
-jest.mock('../../../../../../../data/public/services', () => ({
+jest.mock('@kbn/data-plugin/public/services', () => ({
   getUiSettings: () => ({ get: jest.fn() }),
 }));
 
diff --git a/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts b/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts
index 1b63026777462..93cf557bdc84b 100644
--- a/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts
+++ b/src/plugins/vis_types/timeseries/public/application/contexts/query_input_bar_context.ts
@@ -7,8 +7,8 @@
  */
 
 import React from 'react';
-import { IUiSettingsClient, SavedObjectsClientContract } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient, SavedObjectsClientContract } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 export interface ICoreStartContext {
   appName: string;
diff --git a/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx b/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx
index 01958e77c78d5..d8ab097eedde5 100644
--- a/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/editor_controller.tsx
@@ -14,11 +14,11 @@ import type {
   VisualizeEmbeddableContract,
   IEditorController,
   EditorRenderProps,
-} from 'src/plugins/visualizations/public';
+} from '@kbn/visualizations-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getUISettings, getI18n, getCoreStart, getDataViewsStart } from '../services';
 import { VisEditor } from './components/vis_editor_lazy';
 import type { TimeseriesVisParams } from '../types';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 
 export const TSVB_EDITOR_NAME = 'tsvbEditor';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts b/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts
index c447acb74dc37..7c90bc3228913 100644
--- a/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/lib/get_split_by_terms_color.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { getSplitByTermsColor, SplitByTermsColorProps } from './get_split_by_terms_color';
 
 const chartsRegistry = chartPluginMock.createPaletteRegistry();
diff --git a/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts b/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts
index 9f3b3d6512058..44fc531e77b78 100644
--- a/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts
+++ b/src/plugins/vis_types/timeseries/public/application/lib/get_timezone.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 export function getTimezone(config: IUiSettingsClient) {
   if (config.isDefault('dateFormat:tz')) {
diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
index c8e845ce6b54c..3fff0f2cce6cb 100644
--- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
+++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
@@ -36,7 +36,7 @@ import {
   MULTILAYER_TIME_AXIS_STYLE,
   renderEndzoneTooltip,
   useActiveCursor,
-} from '../../../../../../../charts/public';
+} from '@kbn/charts-plugin/public';
 import { getAxisLabelString } from '../../../components/lib/get_axis_label_string';
 import { calculateDomainForSeries } from './utils/series_domain_calculation';
 
diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts
index 53157286328e2..38e0a8c9fad3a 100644
--- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/utils/series_domain_calculations.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { calculateDomainForSeries } from './series_domain_calculation';
-import { PanelData } from 'src/plugins/vis_types/timeseries/common/types';
+import { PanelData } from '../../../../../../common/types';
 
 describe('calculateDomainForSeries', () => {
   it('should return 0 for domainStart and 3 for domainEnd', () => {
diff --git a/src/plugins/vis_types/timeseries/public/index.ts b/src/plugins/vis_types/timeseries/public/index.ts
index a3180678b53a0..d0051df4de71e 100644
--- a/src/plugins/vis_types/timeseries/public/index.ts
+++ b/src/plugins/vis_types/timeseries/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MetricsPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/timeseries/public/metrics_fn.ts b/src/plugins/vis_types/timeseries/public/metrics_fn.ts
index 5eadf170b768c..58b1f581b4a65 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_fn.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_fn.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaContext } from '../../../data/public';
-import { ExpressionFunctionDefinition, Render } from '../../../expressions/public';
+import { KibanaContext } from '@kbn/data-plugin/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 
 import type { TimeseriesVisData } from '../common/types';
 import { metricsRequestHandler } from './request_handler';
diff --git a/src/plugins/vis_types/timeseries/public/metrics_type.test.ts b/src/plugins/vis_types/timeseries/public/metrics_type.test.ts
index d87dfa23f7dee..3c05a4c13fc27 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_type.test.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_type.test.ts
@@ -7,12 +7,12 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { DataView } from 'src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { setDataViewsStart } from './services';
 import type { TimeseriesVisParams } from './types';
-import type { Vis } from 'src/plugins/visualizations/public';
+import type { Vis } from '@kbn/visualizations-plugin/public';
 import { metricsVisDefinition } from './metrics_type';
-import { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 describe('metricsVisDefinition', () => {
   describe('getUsedIndexPattern', () => {
     const indexPattern1 = { id: '1', title: 'pattern1' } as unknown as DataView;
@@ -24,7 +24,10 @@ describe('metricsVisDefinition', () => {
         async getDefault() {
           return indexPattern1;
         },
-        async find(title: string) {
+        async find(title: string, size: number) {
+          if (size !== 1) {
+            throw new Error('trying to fetch too many data views');
+          }
           if (title === 'pattern1') return [indexPattern1];
           if (title === 'pattern2') return [indexPattern2];
           return [];
diff --git a/src/plugins/vis_types/timeseries/public/metrics_type.ts b/src/plugins/vis_types/timeseries/public/metrics_type.ts
index 7b1f6e4bd5eb3..c013553e44197 100644
--- a/src/plugins/vis_types/timeseries/public/metrics_type.ts
+++ b/src/plugins/vis_types/timeseries/public/metrics_type.ts
@@ -8,7 +8,15 @@
 
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
-import type { DataViewsContract, DataView } from 'src/plugins/data_views/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
+import {
+  Vis,
+  VIS_EVENT_TO_TRIGGER,
+  VisGroups,
+  VisParams,
+  VisTypeDefinition,
+} from '@kbn/visualizations-plugin/public';
+import { RequestAdapter } from '@kbn/inspector-plugin/public';
 import { TSVB_EDITOR_NAME } from './application/editor_controller';
 import { PANEL_TYPES, TOOLTIP_MODES } from '../common/enums';
 import {
@@ -17,17 +25,9 @@ import {
 } from '../common/index_patterns_utils';
 import { TSVB_DEFAULT_COLOR } from '../common/constants';
 import { toExpressionAst } from './to_ast';
-import {
-  Vis,
-  VIS_EVENT_TO_TRIGGER,
-  VisGroups,
-  VisParams,
-  VisTypeDefinition,
-} from '../../../visualizations/public';
 import { getDataViewsStart } from './services';
 import type { TimeseriesVisDefaultParams, TimeseriesVisParams } from './types';
 import type { IndexPatternValue, Panel } from '../common/types';
-import { RequestAdapter } from '../../../inspector/public';
 
 export const withReplacedIds = (
   vis: Vis<TimeseriesVisParams | TimeseriesVisDefaultParams>
@@ -71,7 +71,7 @@ async function resolveIndexPattern(
 ) {
   if (!indexPatternValue) return;
   if (isStringTypeIndexPattern(indexPatternValue)) {
-    return await indexPatterns.find(indexPatternValue);
+    return await indexPatterns.find(indexPatternValue, 1);
   }
 
   if (indexPatternValue.id) {
diff --git a/src/plugins/vis_types/timeseries/public/plugin.ts b/src/plugins/vis_types/timeseries/public/plugin.ts
index e669e9132b47a..caac927930ea1 100644
--- a/src/plugins/vis_types/timeseries/public/plugin.ts
+++ b/src/plugins/vis_types/timeseries/public/plugin.ts
@@ -6,9 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { EditorController, TSVB_EDITOR_NAME } from './application/editor_controller';
 
 import { createMetricsFn } from './metrics_fn';
@@ -22,9 +25,6 @@ import {
   setDataViewsStart,
   setCharts,
 } from './services';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
-import { ChartsPluginStart } from '../../../charts/public';
 import { getTimeseriesVisRenderer } from './timeseries_vis_renderer';
 
 /** @internal */
diff --git a/src/plugins/vis_types/timeseries/public/request_handler.ts b/src/plugins/vis_types/timeseries/public/request_handler.ts
index dcb1b0691602d..d963fc76b5ead 100644
--- a/src/plugins/vis_types/timeseries/public/request_handler.ts
+++ b/src/plugins/vis_types/timeseries/public/request_handler.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
-import type { Adapters } from 'src/plugins/inspector';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import type { Adapters } from '@kbn/inspector-plugin';
+import { KibanaContext, handleResponse } from '@kbn/data-plugin/public';
 import { getTimezone } from './application/lib/get_timezone';
 import { getUISettings, getDataStart, getCoreStart } from './services';
 import { ROUTES, UI_SETTINGS } from '../common/constants';
-import { KibanaContext, handleResponse } from '../../../data/public';
 
 import type { TimeseriesVisParams } from './types';
 import type { TimeseriesVisData } from '../common/types';
diff --git a/src/plugins/vis_types/timeseries/public/services.ts b/src/plugins/vis_types/timeseries/public/services.ts
index 329d3642e0ce4..5dc3dc0124829 100644
--- a/src/plugins/vis_types/timeseries/public/services.ts
+++ b/src/plugins/vis_types/timeseries/public/services.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { I18nStart, IUiSettingsClient, CoreStart } from 'src/core/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { ChartsPluginStart } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
+import { I18nStart, IUiSettingsClient, CoreStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
diff --git a/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx b/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
index f1b68737c268e..5c4e124c92d31 100644
--- a/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
+++ b/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
@@ -11,17 +11,17 @@ import { get } from 'lodash';
 import { render, unmountComponentAtNode } from 'react-dom';
 
 import { I18nProvider } from '@kbn/i18n-react';
-import { IUiSettingsClient, ThemeServiceStart } from 'kibana/public';
+import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
 
-import { VisualizationContainer, PersistedState } from '../../../visualizations/public';
+import { VisualizationContainer, PersistedState } from '@kbn/visualizations-plugin/public';
 
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { TimeseriesVisData } from '../common/types';
 import { isVisTableData } from '../common/vis_data_utils';
 
 import type { TimeseriesVisParams } from './types';
-import type { ExpressionRenderDefinition } from '../../../expressions/common';
 import type { TimeseriesRenderValue } from './metrics_fn';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 
 const TimeseriesVisualization = lazy(
   () => import('./application/components/timeseries_visualization')
diff --git a/src/plugins/vis_types/timeseries/public/to_ast.ts b/src/plugins/vis_types/timeseries/public/to_ast.ts
index 91fc7465f122f..5a6d79d67413f 100644
--- a/src/plugins/vis_types/timeseries/public/to_ast.ts
+++ b/src/plugins/vis_types/timeseries/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import type { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import type { Vis } from '@kbn/visualizations-plugin/public';
 import type { TimeseriesExpressionFunctionDefinition } from './metrics_fn';
 import type { TimeseriesVisParams } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts b/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts
index f9b02823804df..8405a685122ed 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/get_datasource_info.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataView } from '../../../../data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 import { getDataSourceInfo } from './get_datasource_info';
 const dataViewsMap: Record<string, DataView> = {
   test1: { id: 'test1', title: 'test1', timeFieldName: 'timeField1' } as DataView,
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts b/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts
index 641890b68b83c..fef35f229359f 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/get_series.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { VisualizeEditorLayersContext } from '../../../../visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import type { Metric } from '../../common/types';
 import { SUPPORTED_METRICS } from './supported_metrics';
 import {
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts b/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts
index 97189e4f9c826..0ce0d0883b670 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/index.test.ts
@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { DataView } from '../../../../data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 import type { Panel, Series } from '../../common/types';
-import { triggerTSVBtoLensConfiguration } from './';
+import { triggerTSVBtoLensConfiguration } from '.';
 
 const dataViewsMap: Record<string, DataView> = {
   test1: { id: 'test1', title: 'test1', timeFieldName: 'timeField1' } as DataView,
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/index.ts b/src/plugins/vis_types/timeseries/public/trigger_action/index.ts
index 5cdbc72d08fe3..80ef6500c130c 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/index.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/index.ts
@@ -9,7 +9,7 @@ import type { PaletteOutput } from '@kbn/coloring';
 import type {
   NavigateToLensContext,
   VisualizeEditorLayersContext,
-} from '../../../../visualizations/public';
+} from '@kbn/visualizations-plugin/public';
 import type { Panel } from '../../common/types';
 import { PANEL_TYPES } from '../../common/enums';
 import { getDataSourceInfo } from './get_datasource_info';
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts
index 8b1a5f5e68dec..3abb325b4c75a 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { METRIC_TYPES } from 'src/plugins/data/public';
+import { METRIC_TYPES } from '@kbn/data-plugin/public';
 import type { Metric, MetricType } from '../../common/types';
 import { getPercentilesSeries, getParentPipelineSeries } from './metrics_helpers';
 
diff --git a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts
index a71f43f2a6a25..9f6c7dd4236b1 100644
--- a/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts
+++ b/src/plugins/vis_types/timeseries/public/trigger_action/metrics_helpers.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Query } from '../../../../data/common';
+import { Query } from '@kbn/data-plugin/common';
 import type { Metric, MetricType } from '../../common/types';
 import { SUPPORTED_METRICS } from './supported_metrics';
 
diff --git a/src/plugins/vis_types/timeseries/public/vis_state.test.ts b/src/plugins/vis_types/timeseries/public/vis_state.test.ts
index 82e52a0493391..bc25a2b89d778 100644
--- a/src/plugins/vis_types/timeseries/public/vis_state.test.ts
+++ b/src/plugins/vis_types/timeseries/public/vis_state.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { updateOldState } from '../../../visualizations/public';
+import { updateOldState } from '@kbn/visualizations-plugin/public';
 
 /**
  * The reason we add this test is to ensure that `convertNumIdsToStringsForTSVB` of the updateOldState runs correctly
diff --git a/src/plugins/vis_types/timeseries/server/index.ts b/src/plugins/vis_types/timeseries/server/index.ts
index d6b1174177bb6..ee274ecd6d859 100644
--- a/src/plugins/vis_types/timeseries/server/index.ts
+++ b/src/plugins/vis_types/timeseries/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { VisTypeTimeseriesConfig, config as configSchema } from './config';
 import { VisTypeTimeseriesPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts
index f407b224ac7cd..0afc300b89444 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewsService } from 'src/plugins/data_views/common';
+import { DataView, DataViewsService } from '@kbn/data-views-plugin/common';
 import { fetchIndexPattern } from '../../../../common/index_patterns_utils';
 import {
   getCachedIndexPatternFetcher,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts
index 9bab0e520e74b..c82e75f018195 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/cached_index_pattern_fetcher.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { getIndexPatternKey, fetchIndexPattern } from '../../../../common/index_patterns_utils';
 
-import type { DataViewsService } from '../../../../../../data_views/common';
 import type { IndexPatternValue, FetchedIndexPattern } from '../../../../common/types';
 
 export const getCachedIndexPatternFetcher = (
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts
index 788ce2ff44a3c..1b8e505485a65 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/lib/fields_fetcher.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
 import type { VisTypeTimeseriesVisDataRequest } from '../../../types';
-import type { SearchStrategy, SearchCapabilities } from '../index';
-import type { DataViewsService } from '../../../../../../data_views/common';
+import type { SearchStrategy, SearchCapabilities } from '..';
 import type { CachedIndexPatternFetcher } from './cached_index_pattern_fetcher';
 import type { IndexPatternValue } from '../../../../common/types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
index 8677a44941c43..ae5dade8c5592 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { DataViewsService } from '../../../../../../data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { from } from 'rxjs';
 
 import { AbstractSearchStrategy, EsSearchRequest } from './abstract_search_strategy';
-import type { FieldSpec } from '../../../../../../data/common';
+import type { FieldSpec } from '@kbn/data-plugin/common';
 import type { CachedIndexPatternFetcher } from '../lib/cached_index_pattern_fetcher';
 import type {
   VisTypeTimeseriesRequestHandlerContext,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
index de770b30fb823..e89e999e583f0 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -8,7 +8,7 @@
 import { tap } from 'rxjs/operators';
 import { omit } from 'lodash';
 import type { Observable } from 'rxjs';
-import { DataViewsService } from '../../../../../../data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { toSanitizedFieldType } from '../../../../common/fields_utils';
 
 import type { FetchedIndexPattern, TrackedEsSearches } from '../../../../common/types';
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
index 9b683b87c90c7..f2c52b59bf0d9 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { AbstractSearchStrategy } from './abstract_search_strategy';
 import { DefaultSearchCapabilities } from '../capabilities/default_search_capabilities';
 
-import type { DataViewsService } from '../../../../../../data_views/common';
 import type { FetchedIndexPattern } from '../../../../common/types';
 import type {
   VisTypeTimeseriesRequestHandlerContext,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
index 32adce54fc597..d36abcfddfe08 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
@@ -8,7 +8,7 @@
 
 import { RollupSearchStrategy } from './rollup_search_strategy';
 
-import type { DataViewsService } from '../../../../../../data_views/common';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { CachedIndexPatternFetcher } from '../lib/cached_index_pattern_fetcher';
 import type {
   VisTypeTimeseriesRequestHandlerContext,
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
index 32c9952e235d5..dbc98e624b27a 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getCapabilitiesForRollupIndices } from '../../../../../../data/server';
-import type { DataViewsService } from '../../../../../../data_views/common';
+import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { AbstractSearchStrategy, EsSearchRequest } from './abstract_search_strategy';
 import { RollupSearchCapabilities } from '../capabilities/rollup_search_capabilities';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js
index eac2c4af65291..a832eebde9cfc 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_agg_value.js
@@ -8,7 +8,7 @@
 
 import { get, max, min, sum, noop } from 'lodash';
 import { toPercentileNumber } from '../../../../common/to_percentile_number';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { getAggByPredicate } from '../../../../common/agg_utils';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts
index 58c96eca99b61..9486d5f238727 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_bucket_size.ts
@@ -7,6 +7,7 @@
  */
 import type { Unit } from '@kbn/datemath';
 
+import { search } from '@kbn/data-plugin/server';
 import {
   getUnitValue,
   parseInterval,
@@ -15,7 +16,6 @@ import {
 } from './unit_to_seconds';
 import { getTimerange } from './get_timerange';
 import { INTERVAL_STRING_RE, GTE_INTERVAL_RE } from '../../../../common/interval_regexp';
-import { search } from '../../../../../../data/server';
 import type { SearchCapabilities } from '../../search_strategies';
 import type { VisTypeTimeseriesVisDataRequest } from '../../../types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts
index 06df19ab73856..732ef151a6928 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_buckets_path.ts
@@ -7,8 +7,8 @@
  */
 
 import { startsWith } from 'lodash';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { toPercentileNumber } from '../../../../common/to_percentile_number';
-import { METRIC_TYPES } from '../../../../../../data/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import type { Metric } from '../../../../common/types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts
index 07b030782d6d7..424e8ed0738d3 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
-import { UI_SETTINGS } from '../../../../../../data/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 
 export async function getEsQueryConfig(uiSettings: IUiSettingsClient) {
   const allowLeadingWildcards = await uiSettings.get(UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS);
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts
index ee82a245085c5..79e44e5b4bb82 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/get_splits.ts
@@ -8,7 +8,7 @@
 
 import Color from 'color';
 import { get, isPlainObject } from 'lodash';
-import { overwrite } from '../helpers';
+import { overwrite } from '.';
 
 import { calculateLabel } from '../../../../common/calculate_label';
 import { SERIES_SEPARATOR } from '../../../../common/constants';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts
index fd061cd363695..16897774ba9c0 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { mapEmptyToZero } from './map_empty_to_zero';
-import { METRIC_TYPES } from '../../../../../../data/common';
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 
 describe('mapEmptyToZero(metric, buckets)', () => {
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts
index 26014b229bae9..0be4f0514a9f7 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/helpers/map_empty_to_zero.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { METRIC_TYPES } from '@kbn/data-plugin/common';
 // @ts-expect-error not typed yet
 import { getAggValue } from './get_agg_value';
-import { METRIC_TYPES } from '../../../../../../data/common';
 import type { Metric } from '../../../../common/types';
 import type { PanelDataArray } from '../../../../common/types/vis_data';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
index 53893a50673bf..8bd8b485e0dbf 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
@@ -6,12 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { search, UI_SETTINGS } from '@kbn/data-plugin/server';
 import { overwrite } from '../../helpers';
 import { getBucketSize, getTimerange } from '../../helpers';
 import { validateField } from '../../../../../common/fields_utils';
 
-import { search, UI_SETTINGS } from '../../../../../../../../plugins/data/server';
-
 import type { AnnotationsRequestProcessorsFunction } from './types';
 
 const { dateHistogramInterval } = search.aggs;
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts
index eaf2c5ae2e7bf..e6478302518f1 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/query.ts
@@ -7,9 +7,9 @@
  */
 
 import { buildEsQuery } from '@kbn/es-query';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 import { getBucketSize, getTimerange, overwrite } from '../../helpers';
 import { validateField } from '../../../../../common/fields_utils';
-import { UI_SETTINGS } from '../../../../../../../data/server';
 
 import type { AnnotationsRequestProcessorsFunction } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
index ae2563fbfb64b..425cdd30d033b 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IUiSettingsClient } from 'kibana/server';
+import type { IUiSettingsClient } from '@kbn/core/server';
 import type { EsQueryConfig } from '@kbn/es-query';
 import type { VisTypeTimeseriesVisDataRequest } from '../../../../types';
 import type { Annotation, FetchedIndexPattern, Panel } from '../../../../../common/types';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
index a5ea36d742305..95e46c6a6a8aa 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
@@ -10,7 +10,7 @@ import { overwrite } from '../../helpers';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { offsetTime } from '../../offset_time';
 import { isLastValueTimerangeMode } from '../../helpers/get_timerange_mode';
-import { search, UI_SETTINGS } from '../../../../../../../../plugins/data/server';
+import { search, UI_SETTINGS } from '@kbn/data-plugin/server';
 
 const { dateHistogramInterval } = search.aggs;
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
index 379a3fb4cc3a2..ece2b2d316eda 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
@@ -9,7 +9,7 @@
 import { DefaultSearchCapabilities } from '../../../search_strategies/capabilities/default_search_capabilities';
 import { dateHistogram } from './date_histogram';
 import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
-import { UI_SETTINGS } from '../../../../../../../data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 describe('dateHistogram(req, panel, series)', () => {
   let panel;
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
index 86c5311f51dcb..225797d7ccfe2 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
@@ -9,7 +9,7 @@
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { bucketTransform } from '../../helpers/bucket_transform';
 import { overwrite } from '../../helpers';
-import { UI_SETTINGS } from '../../../../../../../data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 export const filter = (metric) => metric.type === 'positive_rate';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts
index 72d3a8e3c1e57..f8346e2638a02 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { TableSearchRequest } from '../table/types';
+import type { TableSearchRequest } from './types';
 import type { Series } from '../../../../../common/types';
 
 export function calculateAggRoot(doc: TableSearchRequest, column: Series) {
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts
index 246c133e93608..00c8f93f1c00a 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/date_histogram.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { search, UI_SETTINGS } from '@kbn/data-plugin/server';
 import { overwrite, getBucketSize, isLastValueTimerangeMode, getTimerange } from '../../helpers';
 import { calculateAggRoot } from './calculate_agg_root';
-import { search, UI_SETTINGS } from '../../../../../../../../plugins/data/server';
 
 import type { TableRequestProcessorsFunction, TableSearchRequestMeta } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts
index e03a65ffebbd1..3a94f28c37fc7 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/positive_rate.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { calculateAggRoot } from './calculate_agg_root';
-import { UI_SETTINGS } from '../../../../../../../data/common';
 
 import type { TableRequestProcessorsFunction } from './types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts
index 6ab50858fe98b..ef407932afedd 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/table/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { IUiSettingsClient } from 'kibana/server';
+import type { IUiSettingsClient } from '@kbn/core/server';
 import { EsQueryConfig } from '@kbn/es-query';
 import type { FetchedIndexPattern, Panel } from '../../../../../common/types';
 import type { SearchCapabilities } from '../../../search_strategies';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts
index 43019c509eae1..1f17b1ecdf2c7 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/annotations/buckets.ts
@@ -7,7 +7,7 @@
  */
 
 import { get, isEmpty } from 'lodash';
-import type { SearchResponse } from 'kibana/server';
+import type { SearchResponse } from '@kbn/core/server';
 import { overwrite } from '../../helpers';
 import type { Annotation } from '../../../../../common/types';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts
index 813cf1a5b9a6f..637406c1746ff 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/response_processors/series/format_label.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import { BUCKET_TYPES, PANEL_TYPES, TSVB_METRIC_TYPES } from '../../../../../common/enums';
 import {
   createCachedFieldValueFormatter,
@@ -13,7 +14,6 @@ import {
   MULTI_FIELD_VALUES_SEPARATOR,
 } from '../../../../../common/fields_utils';
 import type { Panel, PanelData, Series } from '../../../../../common/types';
-import type { FieldFormatsRegistry } from '../../../../../../../field_formats/common';
 import type { createFieldsFetcher } from '../../../search_strategies/lib/fields_fetcher';
 import type { CachedIndexPatternFetcher } from '../../../search_strategies/lib/cached_index_pattern_fetcher';
 import type { BaseMeta } from '../../request_processors/types';
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts
index b16524f27f213..f8bbddbec5aae 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/build_request_body.ts
@@ -8,7 +8,7 @@
 
 import { _legacyBuildProcessorFunction } from '../build_processor_function';
 // @ts-ignore
-import { processors } from '../request_processors/series/index';
+import { processors } from '../request_processors/series';
 
 /**
  * Builds series request body
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts
index 5244bca66a5b3..c9d80e955ddf0 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/series/handle_response_body.ts
@@ -8,6 +8,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import type { Panel } from '../../../../common/types';
 import { _legacyBuildProcessorFunction } from '../build_processor_function';
 // @ts-expect-error
@@ -17,7 +18,6 @@ import {
   FieldsFetcherServices,
 } from '../../search_strategies/lib/fields_fetcher';
 import { VisTypeTimeseriesVisDataRequest } from '../../../types';
-import type { FieldFormatsRegistry } from '../../../../../../field_formats/common';
 
 export function handleResponseBody(
   panel: Panel,
diff --git a/src/plugins/vis_types/timeseries/server/plugin.ts b/src/plugins/vis_types/timeseries/server/plugin.ts
index 36c8558afcd08..e30758745627b 100644
--- a/src/plugins/vis_types/timeseries/server/plugin.ts
+++ b/src/plugins/vis_types/timeseries/server/plugin.ts
@@ -14,17 +14,18 @@ import {
   Logger,
   KibanaRequest,
   IUiSettingsClient,
-} from 'src/core/server';
-import { Observable } from 'rxjs';
+} from '@kbn/core/server';
+import { firstValueFrom, Observable } from 'rxjs';
 import { Server } from '@hapi/hapi';
-import { first, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { PluginStart } from '@kbn/data-plugin/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { PluginStart as DataViewsPublicPluginStart } from '@kbn/data-views-plugin/server';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import { VisTypeTimeseriesConfig } from './config';
 import { getVisData } from './lib/get_vis_data';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
-import { HomeServerPluginSetup } from '../../../home/server';
-import { PluginStart } from '../../../data/server';
-import type { DataViewsService } from '../../../data_views/common';
-import type { PluginStart as DataViewsPublicPluginStart } from '../../../data_views/server';
 import { visDataRoutes } from './routes/vis';
 import { fieldsRoutes } from './routes/fields';
 import { getUiSettings } from './ui_settings';
@@ -32,7 +33,6 @@ import type {
   VisTypeTimeseriesRequestHandlerContext,
   VisTypeTimeseriesVisDataRequest,
 } from './types';
-import type { FieldFormatsRegistry } from '../../../field_formats/common';
 
 import {
   SearchStrategyRegistry,
@@ -104,12 +104,9 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
       logger,
       searchStrategyRegistry,
       getEsShardTimeout: () =>
-        globalConfig$
-          .pipe(
-            first(),
-            map((config) => config.elasticsearch.shardTimeout.asMilliseconds())
-          )
-          .toPromise(),
+        firstValueFrom(
+          globalConfig$.pipe(map((config) => config.elasticsearch.shardTimeout.asMilliseconds()))
+        ),
       getIndexPatternsService: async (requestContext) => {
         const [, { dataViews }] = await core.getStartServices();
 
diff --git a/src/plugins/vis_types/timeseries/server/types.ts b/src/plugins/vis_types/timeseries/server/types.ts
index 8eeb4b5a68f89..afbd80510028b 100644
--- a/src/plugins/vis_types/timeseries/server/types.ts
+++ b/src/plugins/vis_types/timeseries/server/types.ts
@@ -8,11 +8,11 @@
 
 import { Observable } from 'rxjs';
 import { EsQueryConfig } from '@kbn/es-query';
-import { SharedGlobalConfig } from 'kibana/server';
-import type { IRouter, IUiSettingsClient, KibanaRequest } from 'src/core/server';
-import type { DataViewsService } from '../../../data_views/common';
-import type { DataRequestHandlerContext } from '../../../data/server';
-import type { FieldFormatsRegistry } from '../../../field_formats/common';
+import { SharedGlobalConfig } from '@kbn/core/server';
+import type { IRouter, IUiSettingsClient, KibanaRequest } from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import type { Series, VisPayload } from '../common/types';
 import type { SearchStrategyRegistry } from './lib/search_strategies';
 import type { CachedIndexPatternFetcher } from './lib/search_strategies/lib/cached_index_pattern_fetcher';
diff --git a/src/plugins/vis_types/timeseries/server/ui_settings.ts b/src/plugins/vis_types/timeseries/server/ui_settings.ts
index 3d30482dec916..1a6e54de060a0 100644
--- a/src/plugins/vis_types/timeseries/server/ui_settings.ts
+++ b/src/plugins/vis_types/timeseries/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { UI_SETTINGS } from '../common/constants';
 
 export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts
index 573c6c0e00fe2..6304e7e6518ba 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.test.ts
@@ -7,11 +7,8 @@
  */
 
 import { getStats } from './get_usage_collector';
-import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
-import type {
-  SavedObjectsClientContract,
-  SavedObjectsFindResponse,
-} from '../../../../../core/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
+import type { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
 import { TIME_RANGE_DATA_MODES } from '../../common/enums';
 
 const mockedSavedObject = {
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts
index cc08b8789d368..1a6c060cd7f96 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/get_usage_collector.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { TIME_RANGE_DATA_MODES } from '../../common/enums';
-import { findByValueEmbeddables } from '../../../../dashboard/server';
+import { findByValueEmbeddables } from '@kbn/dashboard-plugin/server';
 
 import type {
   SavedObjectsClientContract,
   ISavedObjectsRepository,
   SavedObjectsFindResult,
-} from '../../../../../core/server';
-import type { HomeServerPluginSetup } from '../../../../home/server';
-import type { SavedVisState } from '../../../../visualizations/common';
+} from '@kbn/core/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { SavedVisState } from '@kbn/visualizations-plugin/common';
+import { TIME_RANGE_DATA_MODES } from '../../common/enums';
 import type { Panel } from '../../common/types';
 
 export interface TimeseriesUsage {
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts
index 3714cc6b30c45..2c4f0f08d216c 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
-import { createUsageCollectionSetupMock } from '../../../../usage_collection/server/mocks';
-import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { registerTimeseriesUsageCollector } from './register_timeseries_collector';
 
 describe('registerTimeseriesUsageCollector', () => {
diff --git a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts
index e8fd666fb28d1..d06bf7f3a64b5 100644
--- a/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts
+++ b/src/plugins/vis_types/timeseries/server/usage_collector/register_timeseries_collector.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { getStats, TimeseriesUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../../usage_collection/server';
-import type { HomeServerPluginSetup } from '../../../../home/server';
 
 export function registerTimeseriesUsageCollector(
   collectorSet: UsageCollectionSetup,
diff --git a/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx b/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx
index 9d2a18d6e0077..51e854ed5b525 100644
--- a/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx
+++ b/src/plugins/vis_types/vega/public/components/deprecated_interval_info.tsx
@@ -9,11 +9,10 @@
 import React from 'react';
 import { EuiCallOut, EuiButtonIcon } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
 import { VegaSpec } from '../data_model/types';
 import { getDocLinks } from '../services';
 
-import { BUCKET_TYPES } from '../../../../data/public';
-
 export const DeprecatedHistogramIntervalInfo = () => (
   <EuiCallOut
     className="hide-for-sharing"
diff --git a/src/plugins/vis_types/vega/public/components/vega_info_message.tsx b/src/plugins/vis_types/vega/public/components/vega_info_message.tsx
index 265613ef1e6ce..b15de8e4972be 100644
--- a/src/plugins/vis_types/vega/public/components/vega_info_message.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_info_message.tsx
@@ -8,13 +8,13 @@
 
 import React, { useMemo } from 'react';
 import { parse } from 'hjson';
+import type { Vis } from '@kbn/visualizations-plugin/public';
 import { ExperimentalMapLayerInfo, shouldShowMapLayerInfo } from './experimental_map_vis_info';
 import {
   DeprecatedHistogramIntervalInfo,
   shouldShowDeprecatedHistogramIntervalInfo,
 } from './deprecated_interval_info';
 
-import type { Vis } from '../../../../visualizations/public';
 import type { VegaSpec } from '../data_model/types';
 
 const parseSpec = (spec: string) => {
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
index f9b6f3c0e36df..c74f02b730d3f 100644
--- a/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
@@ -10,7 +10,7 @@ import React, { useEffect, useRef, useMemo, useCallback } from 'react';
 import { EuiResizeObserver, EuiResizeObserverProps } from '@elastic/eui';
 import { throttle } from 'lodash';
 
-import type { IInterpreterRenderHandlers, RenderMode } from 'src/plugins/expressions';
+import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin';
 import { createVegaVisualization } from '../vega_visualization';
 import { VegaVisualizationDependencies } from '../plugin';
 import { VegaParser } from '../data_model/vega_parser';
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
index 46e5e331c9455..5349436374fc5 100644
--- a/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
@@ -14,8 +14,8 @@ import React, { useCallback, useState } from 'react';
 import compactStringify from 'json-stringify-pretty-compact';
 import { i18n } from '@kbn/i18n';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { CodeEditor, HJsonLang } from '../../../../kibana_react/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { CodeEditor, HJsonLang } from '@kbn/kibana-react-plugin/public';
 import { getNotifications } from '../services';
 import { VisParams } from '../vega_fn';
 import { VegaHelpMenu } from './vega_help_menu';
diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
index 06915e68b7a87..eb713d8099b38 100644
--- a/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
@@ -8,7 +8,7 @@
 
 import React, { lazy } from 'react';
 
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 import { VisParams } from '../vega_fn';
 
 const VegaVisEditor = lazy(() => import('./vega_vis_editor'));
diff --git a/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
index 214a23d2ee935..a5aed0e882b6d 100644
--- a/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
+++ b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { of } from 'rxjs';
 import { cloneDeep } from 'lodash';
 import moment from 'moment';
 import { EsQueryParser } from './es_query_parser';
@@ -93,9 +94,7 @@ describe('EsQueryParser.populateData', () => {
 
   beforeEach(() => {
     searchApiStub = {
-      search: jest.fn(() => ({
-        toPromise: jest.fn(() => Promise.resolve(data)),
-      })),
+      search: jest.fn(() => of(data)),
     };
     parser = new EsQueryParser({}, searchApiStub, undefined, undefined);
   });
diff --git a/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
index f52101212662d..0b364194a7aa7 100644
--- a/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
+++ b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { cloneDeep, isPlainObject } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Assign } from 'utility-types';
+import { dateHistogramInterval } from '@kbn/data-plugin/common';
 import { TimeCache } from './time_cache';
 import { SearchAPI } from './search_api';
 import {
@@ -23,7 +24,6 @@ import {
   Query,
   ContextVarsObject,
 } from './types';
-import { dateHistogramInterval } from '../../../../data/common';
 
 const TIMEFILTER: string = '%timefilter%';
 const AUTOINTERVAL: string = '%autointerval%';
diff --git a/src/plugins/vis_types/vega/public/data_model/search_api.test.ts b/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
index 4ca87386e4054..45a8799df0a38 100644
--- a/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { extendSearchParamsWithRuntimeFields } from './search_api';
-import { dataViewPluginMocks } from '../../../../data_views/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
-import { getSearchParamsFromRequest } from '../../../../data/public';
-import type { DataViewsPublicPluginStart } from '../../../../data_views/public';
+import { getSearchParamsFromRequest } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 const mockComputedFields = (
   dataViewsStart: DataViewsPublicPluginStart,
diff --git a/src/plugins/vis_types/vega/public/data_model/search_api.ts b/src/plugins/vis_types/vega/public/data_model/search_api.ts
index 19889edf11a82..042bc34dea0f1 100644
--- a/src/plugins/vis_types/vega/public/data_model/search_api.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.ts
@@ -8,17 +8,17 @@
 
 import { combineLatest, from } from 'rxjs';
 import { map, tap, switchMap } from 'rxjs/operators';
-import type { CoreStart, IUiSettingsClient, KibanaExecutionContext } from 'kibana/public';
+import type { CoreStart, IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
 import {
   getSearchParamsFromRequest,
   SearchRequest,
   DataPublicPluginStart,
   IEsSearchResponse,
-} from '../../../../data/public';
-import type { DataViewsPublicPluginStart } from '../../../../data_views/public';
-import { search as dataPluginSearch } from '../../../../data/public';
+} from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { search as dataPluginSearch } from '@kbn/data-plugin/public';
+import type { RequestResponder } from '@kbn/inspector-plugin/public';
 import type { VegaInspectorAdapters } from '../vega_inspector';
-import type { RequestResponder } from '../../../../inspector/public';
 
 /** @internal **/
 export const extendSearchParamsWithRuntimeFields = async (
diff --git a/src/plugins/vis_types/vega/public/data_model/time_cache.ts b/src/plugins/vis_types/vega/public/data_model/time_cache.ts
index cc9619e143437..8ce622755cb83 100644
--- a/src/plugins/vis_types/vega/public/data_model/time_cache.ts
+++ b/src/plugins/vis_types/vega/public/data_model/time_cache.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from '../../../../data/public';
-import { TimeRange } from '../../../../data/common';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { CacheBounds } from './types';
 
 /**
diff --git a/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js b/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
index 5b9213c4dc583..35228cdb107a1 100644
--- a/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
+++ b/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
@@ -5,6 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { of } from 'rxjs';
 import { cloneDeep } from 'lodash';
 import 'jest-canvas-mock';
 import { euiThemeVars } from '@kbn/ui-theme';
@@ -18,7 +19,7 @@ describe(`VegaParser.parseAsync`, () => {
   function check(spec, useResize, expectedSpec, warnCount) {
     return async () => {
       const searchApiStub = {
-        search: jest.fn(() => ({ toPromise: jest.fn(() => Promise.resolve({})) })),
+        search: jest.fn(() => of({})),
         resetSearchStats: jest.fn(),
       };
       expectedSpec = expectedSpec || cloneDeep(spec);
diff --git a/src/plugins/vis_types/vega/public/index.ts b/src/plugins/vis_types/vega/public/index.ts
index 0cf1a12582790..746432663dcfd 100644
--- a/src/plugins/vis_types/vega/public/index.ts
+++ b/src/plugins/vis_types/vega/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { ConfigSchema } from '../config';
 import { VegaPlugin as Plugin } from './plugin';
 
diff --git a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
index 70a03a5de995f..da89d9b904d9f 100644
--- a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
+++ b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { dataViewPluginMocks } from '../../../../data_views/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { extractIndexPatternsFromSpec } from './extract_index_pattern';
 import { setDataViews } from '../services';
 
diff --git a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
index a2d22dce614cb..7a52ca254f7ea 100644
--- a/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
+++ b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
@@ -7,10 +7,10 @@
  */
 
 import { flatten } from 'lodash';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getDataViews } from '../services';
 
 import type { Data, VegaSpec } from '../data_model/types';
-import type { DataView } from '../../../../data_views/public';
 
 export const extractIndexPatternsFromSpec = async (spec: VegaSpec) => {
   const dataViews = getDataViews();
diff --git a/src/plugins/vis_types/vega/public/plugin.ts b/src/plugins/vis_types/vega/public/plugin.ts
index e33f6141e7358..a95d646427306 100644
--- a/src/plugins/vis_types/vega/public/plugin.ts
+++ b/src/plugins/vis_types/vega/public/plugin.ts
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../data/public';
-import type { DataViewsPublicPluginStart } from '../../../data_views/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { Setup as InspectorSetup } from '../../../inspector/public';
-
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { Setup as InspectorSetup } from '@kbn/inspector-plugin/public';
+
+import type { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 import {
   setNotifications,
   setData,
@@ -26,7 +27,6 @@ import {
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
-import type { MapsEmsPluginPublicStart } from '../../../maps_ems/public';
 import type { IServiceSettings } from './vega_view/vega_map_view/service_settings/service_settings_types';
 
 import { ConfigSchema } from '../config';
diff --git a/src/plugins/vis_types/vega/public/services.ts b/src/plugins/vis_types/vega/public/services.ts
index af162c204acda..f7f0444803a00 100644
--- a/src/plugins/vis_types/vega/public/services.ts
+++ b/src/plugins/vis_types/vega/public/services.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, NotificationsStart, IUiSettingsClient, DocLinksStart } from 'src/core/public';
+import { CoreStart, NotificationsStart, IUiSettingsClient, DocLinksStart } from '@kbn/core/public';
 
-import { DataPublicPluginStart } from '../../../data/public';
-import { DataViewsPublicPluginStart } from '../../../data_views/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import type { MapsEmsPluginPublicStart } from '../../../maps_ems/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import type { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 
 export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
 
diff --git a/src/plugins/vis_types/vega/public/to_ast.ts b/src/plugins/vis_types/vega/public/to_ast.ts
index f9ff7effafe49..d453b8ec06302 100644
--- a/src/plugins/vis_types/vega/public/to_ast.ts
+++ b/src/plugins/vis_types/vega/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { VegaExpressionFunctionDefinition, VisParams } from './vega_fn';
 
 export const toExpressionAst = (vis: Vis<VisParams>) => {
diff --git a/src/plugins/vis_types/vega/public/vega_fn.ts b/src/plugins/vis_types/vega/public/vega_fn.ts
index 36a534545f078..f8e9eff3bf555 100644
--- a/src/plugins/vis_types/vega/public/vega_fn.ts
+++ b/src/plugins/vis_types/vega/public/vega_fn.ts
@@ -8,15 +8,15 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExecutionContextSearch } from '../../../data/public';
+import { ExecutionContextSearch } from '@kbn/data-plugin/public';
 import {
   ExecutionContext,
   ExpressionFunctionDefinition,
   Render,
-} from '../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
+import { KibanaContext, TimeRange, Query } from '@kbn/data-plugin/public';
 import { VegaVisualizationDependencies } from './plugin';
-import { VegaInspectorAdapters } from './vega_inspector/index';
-import { KibanaContext, TimeRange, Query } from '../../../data/public';
+import { VegaInspectorAdapters } from './vega_inspector';
 import { VegaParser } from './data_model/vega_parser';
 
 type Input = KibanaContext | { type: 'null' };
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx b/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
index 9c13857076d8b..4e028fa3fb3cf 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
@@ -18,8 +18,8 @@ import {
   EuiSpacer,
   CommonProps,
 } from '@elastic/eui';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { VegaAdapter } from '../vega_adapter';
-import { CodeEditor } from '../../../../../kibana_react/public';
 
 interface SpecViewerProps extends CommonProps {
   vegaAdapter: VegaAdapter;
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
index 91f159c86af98..54c6e108505d1 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
@@ -12,9 +12,9 @@ import React, { useState, useEffect } from 'react';
 import { EuiTabbedContent, EuiCallOut } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
+import { InspectorViewProps } from '@kbn/inspector-plugin/public';
 import { VegaInspectorAdapters } from './vega_inspector';
 import { DataViewer, SignalViewer, SpecViewer } from './components';
-import { InspectorViewProps } from '../../../../inspector/public';
 
 export type VegaDataInspectorProps = InspectorViewProps<VegaInspectorAdapters>;
 
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
index 1ca95b84f53ae..02fe668276c93 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
@@ -10,9 +10,9 @@ import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient } from 'kibana/public';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import { Adapters, RequestAdapter, InspectorViewDescription } from '../../../../inspector/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Adapters, RequestAdapter, InspectorViewDescription } from '@kbn/inspector-plugin/public';
 import { VegaAdapter } from './vega_adapter';
 import type { VegaDataInspectorProps } from './vega_data_inspector';
 
diff --git a/src/plugins/vis_types/vega/public/vega_request_handler.ts b/src/plugins/vis_types/vega/public/vega_request_handler.ts
index f632c8e93965c..8670fd9499529 100644
--- a/src/plugins/vis_types/vega/public/vega_request_handler.ts
+++ b/src/plugins/vis_types/vega/public/vega_request_handler.ts
@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { KibanaExecutionContext } from 'src/core/public';
-import type { DataView } from 'src/plugins/data_views/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { Filter, buildEsQuery } from '@kbn/es-query';
-import { getEsQueryConfig, TimeRange, Query } from '../../../data/public';
+import { getEsQueryConfig, TimeRange, Query } from '@kbn/data-plugin/public';
 
 import { SearchAPI } from './data_model/search_api';
 import { TimeCache } from './data_model/time_cache';
diff --git a/src/plugins/vis_types/vega/public/vega_type.ts b/src/plugins/vis_types/vega/public/vega_type.ts
index 23f0e385d2b33..798930db1f975 100644
--- a/src/plugins/vis_types/vega/public/vega_type.ts
+++ b/src/plugins/vis_types/vega/public/vega_type.ts
@@ -9,8 +9,12 @@
 import { i18n } from '@kbn/i18n';
 import { parse } from 'hjson';
 
-import { DefaultEditorSize } from '../../../vis_default_editor/public';
-import { VIS_EVENT_TO_TRIGGER, VisGroups, VisTypeDefinition } from '../../../visualizations/public';
+import { DefaultEditorSize } from '@kbn/vis-default-editor-plugin/public';
+import {
+  VIS_EVENT_TO_TRIGGER,
+  VisGroups,
+  VisTypeDefinition,
+} from '@kbn/visualizations-plugin/public';
 
 import { getDefaultSpec } from './default_spec';
 import { extractIndexPatternsFromSpec } from './lib/extract_index_pattern';
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
index 1ddd2849e3f39..0f4f5574c5742 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { IExternalUrl } from 'kibana/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import type { IExternalUrl } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 import type { IServiceSettings } from './vega_map_view/service_settings/service_settings_types';
 import { VegaParser } from '../data_model/vega_parser';
 import { createVegaStateRestorer } from '../lib/vega_state_restorer';
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts
index 69e951d383e12..d90926610685b 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/get_service_settings.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
+import type { MapsEmsPluginPublicStart, MapConfig } from '@kbn/maps-ems-plugin/public';
 import type { IServiceSettings } from './service_settings_types';
 import { ServiceSettings } from './service_settings';
 import { getMapsEms } from '../../../services';
-import type { MapsEmsPluginPublicStart, MapConfig } from '../../../../../../maps_ems/public';
 
 export async function getServiceSettings(): Promise<IServiceSettings> {
   const mapsEms: MapsEmsPluginPublicStart = getMapsEms();
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts
index 058760b5b2f0b..87ae6082acab4 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings.ts
@@ -9,9 +9,9 @@
 import _ from 'lodash';
 import MarkdownIt from 'markdown-it';
 import type { EMSClient, FileLayer as EMSFileLayer, TMSService } from '@elastic/ems-client';
+import type { MapConfig, TileMapConfig } from '@kbn/maps-ems-plugin/public';
 import type { FileLayer, IServiceSettings, TmsLayer } from './service_settings_types';
 import { ORIGIN_LEGACY, TMS_IN_YML_ID } from './service_settings_types';
-import type { MapConfig, TileMapConfig } from '../../../../../../maps_ems/public';
 /**
  * This class provides access to the EMS-layers and the kibana.yml configured layers through a single interface.
  */
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts
index 35d8c9ffb2de2..577c966fd0fa0 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/service_settings/service_settings_types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type { TMSService } from '@elastic/ems-client';
-import type { MapConfig, TileMapConfig } from '../../../../../../maps_ems/public';
+import type { MapConfig, TileMapConfig } from '@kbn/maps-ems-plugin/public';
 
 export const ORIGIN_LEGACY = {
   EMS: 'elastic_maps_service',
diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
index c0453f470de4b..6dca45de21835 100644
--- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
@@ -14,11 +14,11 @@ import { VegaParser } from '../../data_model/vega_parser';
 import { TimeCache } from '../../data_model/time_cache';
 import { SearchAPI } from '../../data_model/search_api';
 import vegaMap from '../../test_utils/vega_map_test.json';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../../data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../data_views/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
-import type { IServiceSettings } from '../vega_map_view/service_settings/service_settings_types';
+import type { IServiceSettings } from './service_settings/service_settings_types';
 
 import {
   setInjectedVars,
diff --git a/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
index ac36c9f2d20e1..1584755d84fea 100644
--- a/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
+++ b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
@@ -9,9 +9,9 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { VisualizationContainer } from '../../../visualizations/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { RenderValue } from './vega_fn';
 const LazyVegaVisComponent = lazy(() =>
diff --git a/src/plugins/vis_types/vega/public/vega_visualization.test.js b/src/plugins/vis_types/vega/public/vega_visualization.test.js
index af5b6e0d61ada..d1c821e962021 100644
--- a/src/plugins/vis_types/vega/public/vega_visualization.test.js
+++ b/src/plugins/vis_types/vega/public/vega_visualization.test.js
@@ -19,9 +19,9 @@ import { VegaParser } from './data_model/vega_parser';
 import { SearchAPI } from './data_model/search_api';
 
 import { setInjectedVars, setData, setNotifications } from './services';
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { dataViewPluginMocks } from '../../../data_views/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('./default_spec', () => ({
   getDefaultSpec: () => jest.requireActual('./test_utils/default.spec.json'),
diff --git a/src/plugins/vis_types/vega/public/vega_visualization.ts b/src/plugins/vis_types/vega/public/vega_visualization.ts
index 49e6355a7109d..6540abc5a99dc 100644
--- a/src/plugins/vis_types/vega/public/vega_visualization.ts
+++ b/src/plugins/vis_types/vega/public/vega_visualization.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { IInterpreterRenderHandlers, RenderMode } from 'src/plugins/expressions';
+import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin';
 import { VegaParser } from './data_model/vega_parser';
 import { VegaVisualizationDependencies } from './plugin';
 import { getNotifications, getData } from './services';
diff --git a/src/plugins/vis_types/vega/server/index.ts b/src/plugins/vis_types/vega/server/index.ts
index 62bc9a1494acf..42e03c0ceefc5 100644
--- a/src/plugins/vis_types/vega/server/index.ts
+++ b/src/plugins/vis_types/vega/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeVegaPlugin } from './plugin';
diff --git a/src/plugins/vis_types/vega/server/plugin.ts b/src/plugins/vis_types/vega/server/plugin.ts
index 51a783456d6b2..e5e9bdaefe987 100644
--- a/src/plugins/vis_types/vega/server/plugin.ts
+++ b/src/plugins/vis_types/vega/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { registerVegaUsageCollector } from './usage_collector';
 import {
   ConfigObservable,
diff --git a/src/plugins/vis_types/vega/server/types.ts b/src/plugins/vis_types/vega/server/types.ts
index 626d22b59181a..3f0c3f6f9dbe7 100644
--- a/src/plugins/vis_types/vega/server/types.ts
+++ b/src/plugins/vis_types/vega/server/types.ts
@@ -7,9 +7,9 @@
  */
 
 import { Observable } from 'rxjs';
-import { SharedGlobalConfig } from 'kibana/server';
-import { HomeServerPluginSetup } from '../../../home/server';
-import { UsageCollectionSetup } from '../../../usage_collection/server';
+import { SharedGlobalConfig } from '@kbn/core/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 export type ConfigObservable = Observable<SharedGlobalConfig>;
 
diff --git a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
index 627f8c2eea83c..e7154ea2b7da6 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { getStats } from './get_usage_collector';
-import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
-import type { HomeServerPluginSetup } from '../../../../home/server';
-import type { SavedObjectsClientContract } from '../../../../../core/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const mockedSavedObjects = [
   // vega-lite lib spec
diff --git a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
index 0e67af1c2e890..21afe9f141b88 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
@@ -8,11 +8,8 @@
 
 import { parse } from 'hjson';
 
-import type {
-  SavedObjectsClientContract,
-  SavedObjectsFindResult,
-} from '../../../../../core/server';
-import type { SavedVisState } from '../../../../visualizations/common';
+import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
+import type { SavedVisState } from '@kbn/visualizations-plugin/common';
 import type { VegaSavedObjectAttributes, VisTypeVegaPluginSetupDependencies } from '../types';
 
 type UsageCollectorDependencies = Pick<VisTypeVegaPluginSetupDependencies, 'home'>;
diff --git a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
index 0597f3b856f04..098515d15d9df 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
@@ -9,11 +9,11 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
 import { registerVegaUsageCollector } from './register_vega_collector';
 
-import type { HomeServerPluginSetup } from '../../../../home/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import type { ConfigObservable } from '../types';
 
 describe('registerVegaUsageCollector', () => {
diff --git a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
index 27af5aa57e38b..adf35f81396d1 100644
--- a/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getStats, VegaUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../../usage_collection/server';
 import type { ConfigObservable, VisTypeVegaPluginSetupDependencies } from '../types';
 
 export function registerVegaUsageCollector(
diff --git a/src/plugins/vis_types/vislib/public/gauge.ts b/src/plugins/vis_types/vislib/public/gauge.ts
index 5edc33edb84fa..c1eb884124d62 100644
--- a/src/plugins/vis_types/vislib/public/gauge.ts
+++ b/src/plugins/vis_types/vislib/public/gauge.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ColorSchemaParams, Labels, Style } from '../../../charts/public';
-import { RangeValues } from '../../../vis_default_editor/public';
-import { gaugeVisType } from '../../gauge/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
+import { ColorSchemaParams, Labels, Style } from '@kbn/charts-plugin/public';
+import { RangeValues } from '@kbn/vis-default-editor-plugin/public';
+import { gaugeVisType } from '@kbn/vis-type-gauge-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 
 import { Alignment, GaugeType } from './types';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_types/vislib/public/goal.ts b/src/plugins/vis_types/vislib/public/goal.ts
index 205b3a7a4280a..a6410f9b4cd3d 100644
--- a/src/plugins/vis_types/vislib/public/goal.ts
+++ b/src/plugins/vis_types/vislib/public/goal.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisTypeDefinition } from '../../../visualizations/public';
-import { goalVisType } from '../../gauge/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
+import { goalVisType } from '@kbn/vis-type-gauge-plugin/public';
 
 import { toExpressionAst } from './to_ast';
 import { GaugeVisParams } from './gauge';
diff --git a/src/plugins/vis_types/vislib/public/heatmap.ts b/src/plugins/vis_types/vislib/public/heatmap.ts
index 8336ef0b62e0a..f6945ab768889 100644
--- a/src/plugins/vis_types/vislib/public/heatmap.ts
+++ b/src/plugins/vis_types/vislib/public/heatmap.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { RangeValues } from '../../../vis_default_editor/public';
-import { heatmapVisType } from '../../heatmap/public';
+import { RangeValues } from '@kbn/vis-default-editor-plugin/public';
+import { heatmapVisType } from '@kbn/vis-type-heatmap-plugin/public';
 
-import { ColorSchemaParams } from '../../../charts/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
-import { ValueAxis } from '../../xy/public';
+import { ColorSchemaParams } from '@kbn/charts-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
+import { ValueAxis } from '@kbn/vis-type-xy-plugin/public';
 
 import { TimeMarker } from './vislib/visualizations/time_marker';
 import { CommonVislibParams } from './types';
diff --git a/src/plugins/vis_types/vislib/public/index.ts b/src/plugins/vis_types/vislib/public/index.ts
index bd6cf6d9c892d..4d5b33a2dab64 100644
--- a/src/plugins/vis_types/vislib/public/index.ts
+++ b/src/plugins/vis_types/vislib/public/index.ts
@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { VisTypeVislibPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/vis_types/vislib/public/pie.ts b/src/plugins/vis_types/vislib/public/pie.ts
index 66d4c326fa47b..27996346ccb28 100644
--- a/src/plugins/vis_types/vislib/public/pie.ts
+++ b/src/plugins/vis_types/vislib/public/pie.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { pieVisType } from '../../pie/public';
-import { VisTypeDefinition } from '../../../visualizations/public';
+import { pieVisType } from '@kbn/vis-type-pie-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { CommonVislibParams } from './types';
 import { toExpressionAst } from './to_ast_pie';
 
diff --git a/src/plugins/vis_types/vislib/public/pie_fn.test.ts b/src/plugins/vis_types/vislib/public/pie_fn.test.ts
index 42061397d0ac7..2112a32b4ff5d 100644
--- a/src/plugins/vis_types/vislib/public/pie_fn.test.ts
+++ b/src/plugins/vis_types/vislib/public/pie_fn.test.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { Datatable } from 'src/plugins/expressions';
-import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
+import type { Datatable } from '@kbn/expressions-plugin';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import { createPieVisFn } from './pie_fn';
 // @ts-ignore
 import { vislibSlicesResponseHandler } from './vislib/response_handler';
diff --git a/src/plugins/vis_types/vislib/public/pie_fn.ts b/src/plugins/vis_types/vislib/public/pie_fn.ts
index dd5d2689af74d..06d1f5f4baf9a 100644
--- a/src/plugins/vis_types/vislib/public/pie_fn.ts
+++ b/src/plugins/vis_types/vislib/public/pie_fn.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
 
 // @ts-ignore
 import { vislibSlicesResponseHandler } from './vislib/response_handler';
diff --git a/src/plugins/vis_types/vislib/public/plugin.ts b/src/plugins/vis_types/vislib/public/plugin.ts
index 23013bc582387..6d2f199ca898e 100644
--- a/src/plugins/vis_types/vislib/public/plugin.ts
+++ b/src/plugins/vis_types/vislib/public/plugin.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { LEGACY_PIE_CHARTS_LIBRARY } from '../../pie/common/index';
-import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../../heatmap/common/index';
-import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../../gauge/common/index';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { LEGACY_PIE_CHARTS_LIBRARY } from '@kbn/vis-type-pie-plugin/common';
+import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '@kbn/vis-type-heatmap-plugin/common';
+import { LEGACY_GAUGE_CHARTS_LIBRARY } from '@kbn/vis-type-gauge-plugin/common';
 import { heatmapVisTypeDefinition } from './heatmap';
 
 import { createVisTypeVislibVisFn } from './vis_type_vislib_vis_fn';
diff --git a/src/plugins/vis_types/vislib/public/services.ts b/src/plugins/vis_types/vislib/public/services.ts
index 7afe16867bab4..ebc15fc7f4b49 100644
--- a/src/plugins/vis_types/vislib/public/services.ts
+++ b/src/plugins/vis_types/vislib/public/services.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ThemeServiceStart } from 'kibana/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export const [getDataActions, setDataActions] =
   createGetterSetter<DataPublicPluginStart['actions']>('vislib data.actions');
diff --git a/src/plugins/vis_types/vislib/public/to_ast.test.ts b/src/plugins/vis_types/vislib/public/to_ast.test.ts
index 70a1f938a8266..1628fb1812d34 100644
--- a/src/plugins/vis_types/vislib/public/to_ast.test.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 
 import { BasicVislibParams } from './types';
 import { toExpressionAst } from './to_ast';
-import { sampleAreaVis } from '../../xy/public/sample_vis.test.mocks';
+import { sampleAreaVis } from '@kbn/vis-type-xy-plugin/public/sample_vis.test.mocks';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/vislib/public/to_ast.ts b/src/plugins/vis_types/vislib/public/to_ast.ts
index c1de94ba0f5f9..6ef3ec72f4ab0 100644
--- a/src/plugins/vis_types/vislib/public/to_ast.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast.ts
@@ -13,12 +13,12 @@ import {
   VisToExpressionAstParams,
   getVisSchemas,
   VisParams,
-} from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import type { Dimensions } from '../../xy/public';
-import type { DateHistogramParams, HistogramParams } from '../../../visualizations/public';
+} from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import type { Dimensions } from '@kbn/vis-type-xy-plugin/public';
+import type { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
-import { BUCKET_TYPES } from '../../../data/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
 
 import { vislibVisName, VisTypeVislibExpressionFunctionDefinition } from './vis_type_vislib_vis_fn';
 import { BasicVislibParams, VislibChartType } from './types';
diff --git a/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts b/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts
index d34989917e707..6874f812c41ff 100644
--- a/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 /**
  * Get esaggs expressions function
diff --git a/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts b/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts
index 6202df3f65094..49a44c3de4a89 100644
--- a/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast_pie.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 
 import { PieVisParams } from './pie';
-import { samplePieVis } from '../../pie/public/sample_vis.test.mocks';
+import { samplePieVis } from '@kbn/vis-type-pie-plugin/public/sample_vis.test.mocks';
 import { toExpressionAst } from './to_ast_pie';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/vislib/public/to_ast_pie.ts b/src/plugins/vis_types/vislib/public/to_ast_pie.ts
index 90c181f8ac74e..9f7bda7740a44 100644
--- a/src/plugins/vis_types/vislib/public/to_ast_pie.ts
+++ b/src/plugins/vis_types/vislib/public/to_ast_pie.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getVisSchemas, VisToExpressionAst } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 
 import { PieVisParams } from './pie';
 import { vislibPieName, VisTypeVislibPieExpressionFunctionDefinition } from './pie_fn';
diff --git a/src/plugins/vis_types/vislib/public/types.ts b/src/plugins/vis_types/vislib/public/types.ts
index 9184e2a4c884c..dd4c724be1d17 100644
--- a/src/plugins/vis_types/vislib/public/types.ts
+++ b/src/plugins/vis_types/vislib/public/types.ts
@@ -9,7 +9,7 @@
 import { $Values } from '@kbn/utility-types';
 import { Position } from '@elastic/charts';
 
-import { Labels } from '../../../charts/public';
+import { Labels } from '@kbn/charts-plugin/public';
 import {
   CategoryAxis,
   Dimensions,
@@ -17,7 +17,7 @@ import {
   SeriesParam,
   ThresholdLine,
   ValueAxis,
-} from '../../../vis_types/xy/public';
+} from '@kbn/vis-type-xy-plugin/public';
 import { TimeMarker } from './vislib/visualizations/time_marker';
 
 /**
diff --git a/src/plugins/vis_types/vislib/public/vis_controller.tsx b/src/plugins/vis_types/vislib/public/vis_controller.tsx
index 94a7e819f16f0..5a39811961882 100644
--- a/src/plugins/vis_types/vislib/public/vis_controller.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_controller.tsx
@@ -9,10 +9,10 @@
 import $ from 'jquery';
 import React, { RefObject } from 'react';
 
-import { mountReactNode } from '../../../../core/public/utils';
-import { ChartsPluginSetup } from '../../../charts/public';
-import type { PersistedState } from '../../../visualizations/public';
-import { IInterpreterRenderHandlers } from '../../../expressions/public';
+import { mountReactNode } from '@kbn/core/public/utils';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
 
 import { VisTypeVislibCoreSetup } from './plugin';
 import { VisLegend, CUSTOM_LEGEND_VIS_TYPES } from './vislib/components/legend';
diff --git a/src/plugins/vis_types/vislib/public/vis_renderer.tsx b/src/plugins/vis_types/vislib/public/vis_renderer.tsx
index 906c8efb69cf2..767cd6275b9b1 100644
--- a/src/plugins/vis_types/vislib/public/vis_renderer.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_renderer.tsx
@@ -9,10 +9,10 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { ExpressionRenderDefinition } from '../../../expressions/public';
-import { VisualizationContainer } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 import { VisTypeVislibCoreSetup } from './plugin';
 import { VislibRenderValue, vislibVisName } from './vis_type_vislib_vis_fn';
diff --git a/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts b/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts
index 0658ed1b7c4b1..26385d70a9aaa 100644
--- a/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts
+++ b/src/plugins/vis_types/vislib/public/vis_type_vislib_vis_fn.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '@kbn/expressions-plugin/public';
 
 // @ts-ignore
 import { vislibSeriesResponseHandler } from './vislib/response_handler';
diff --git a/src/plugins/vis_types/vislib/public/vis_wrapper.tsx b/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
index e3948807005e6..a800abd3d11fb 100644
--- a/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
+++ b/src/plugins/vis_types/vislib/public/vis_wrapper.tsx
@@ -10,9 +10,9 @@ import React, { useEffect, useMemo, useRef } from 'react';
 import { EuiResizeObserver } from '@elastic/eui';
 import { debounce } from 'lodash';
 
-import { IInterpreterRenderHandlers } from '../../../expressions/public';
-import type { PersistedState } from '../../../visualizations/public';
-import { ChartsPluginSetup } from '../../../charts/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 
 import { VislibRenderValue } from './vis_type_vislib_vis_fn';
 import { createVislibVisController, VislibVisController } from './vis_controller';
diff --git a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx
index 3ec280951d5f7..577a76dd84454 100644
--- a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx
+++ b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend.tsx
@@ -14,8 +14,8 @@ import { i18n } from '@kbn/i18n';
 import { asyncForEach } from '@kbn/std';
 import { EuiPopoverProps, EuiIcon, keys, htmlIdGenerator } from '@elastic/eui';
 
-import { PersistedState } from '../../../../../../visualizations/public';
-import { IInterpreterRenderHandlers } from '../../../../../../expressions/public';
+import { PersistedState } from '@kbn/visualizations-plugin/public';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
 
 import { getDataActions } from '../../../services';
 import { CUSTOM_LEGEND_VIS_TYPES, LegendItem } from './models';
diff --git a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx
index 5752a0ac09e8f..c137a689aafba 100644
--- a/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx
+++ b/src/plugins/vis_types/vislib/public/vislib/components/legend/legend_item.tsx
@@ -20,8 +20,8 @@ import {
   EuiButtonGroupOptionProps,
 } from '@elastic/eui';
 
+import { ColorPicker } from '@kbn/charts-plugin/public';
 import { LegendItem } from './models';
-import { ColorPicker } from '../../../../../../charts/public';
 
 interface Props {
   item: LegendItem;
diff --git a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
index ecd741bc4d5d0..9fdc6ca88728e 100644
--- a/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
+++ b/src/plugins/vis_types/vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
@@ -9,7 +9,7 @@
 import { last } from 'lodash';
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../plugins/field_formats/common';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { getValueForPercentageMode } from '../../percentage_mode_transform';
 
 function getMax(handler, config, isGauge) {
diff --git a/src/plugins/vis_types/vislib/public/vislib/errors.ts b/src/plugins/vis_types/vislib/public/vislib/errors.ts
index 67a9d79363e73..b394bbf6383aa 100644
--- a/src/plugins/vis_types/vislib/public/vislib/errors.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/errors.ts
@@ -9,7 +9,7 @@
 /* eslint-disable max-classes-per-file */
 
 import { i18n } from '@kbn/i18n';
-import { KbnError } from '../../../../kibana_utils/public';
+import { KbnError } from '@kbn/kibana-utils-plugin/public';
 
 export class VislibError extends KbnError {
   constructor(message: string) {
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
index 43fdb3c198474..6191bf9e195d6 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Dimensions, Dimension } from '../../../../../pie/public';
+import type { Dimensions, Dimension } from '@kbn/vis-type-pie-plugin/public';
 import { buildHierarchicalData } from './build_hierarchical_data';
 import { Table, TableParent } from '../../types';
 
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
index e5b11fcc0339c..da63b0b5a97a4 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
@@ -7,9 +7,9 @@
  */
 
 import { toArray } from 'lodash';
+import type { Dimensions } from '@kbn/vis-type-pie-plugin/public';
 import { getFormatService } from '../../../services';
 import { Table } from '../../types';
-import type { Dimensions } from '../../../../../pie/public';
 
 interface Slice {
   name: string;
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
index 9256276b1e9c7..5887080210c94 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Dimension } from '../../../../../xy/public';
+import type { Dimension } from '@kbn/vis-type-xy-plugin/public';
 
 import { addToSiri, Serie } from './_add_to_siri';
 import { Point } from './_get_point';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts
index c334a83f3dd6a..612a75b7e282f 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_add_to_siri.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getAggId } from '../../../../../xy/public';
-import type { Dimension } from '../../../../../xy/public';
+import { getAggId } from '@kbn/vis-type-xy-plugin/public';
+import type { Dimension } from '@kbn/vis-type-xy-plugin/public';
 
 import { Point } from './_get_point';
 
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
index e4ebb1fa47929..50cfdf0bad73c 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Dimension, Dimensions } from '../../../../../xy/public';
+import type { Dimension, Dimensions } from '@kbn/vis-type-xy-plugin/public';
 
 import { getAspects } from './_get_aspects';
 import { Aspect } from './point_series';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts
index 1fecf09f77380..aea0135ec2819 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_aspects.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Dimensions } from '../../../../../xy/public';
+import type { Dimensions } from '@kbn/vis-type-xy-plugin/public';
 
 import { makeFakeXAspect } from './_fake_x_aspect';
 import { Aspects } from './point_series';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts
index bf7ff40904130..3c1bac9a057c9 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_get_point.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IFieldFormatsRegistry } from '../../../../../../field_formats/common';
+import { IFieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 
 import { getPoint } from './_get_point';
 import { setFormatService } from '../../../services';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
index 251888aa19498..c3bef9fc021f8 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 
-import type { DateHistogramParams, HistogramParams } from '../../../../../../visualizations/public';
+import type { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { initXAxis } from './_init_x_axis';
 import { makeFakeXAspect } from './_fake_x_aspect';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
index 4d39147587169..8f683bbc66cfb 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
@@ -9,7 +9,7 @@
 import moment from 'moment';
 import _ from 'lodash';
 
-import type { DateHistogramParams } from '../../../../../../visualizations/public';
+import type { DateHistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { orderedDateAxis } from './_ordered_date_axis';
 import { OrderedChart } from './point_series';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts
index d6e6531866d4b..d28095678f41d 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.test.ts
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 
-import type { Dimensions } from '../../../../../xy/public';
+import type { Dimensions } from '@kbn/vis-type-xy-plugin/public';
 
 import { buildPointSeriesData } from './point_series';
 import { Table, Column } from '../../types';
diff --git a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts
index ec9f0169a48fc..5c82dce313e63 100644
--- a/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts
+++ b/src/plugins/vis_types/vislib/public/vislib/helpers/point_series/point_series.ts
@@ -8,8 +8,8 @@
 
 import { Duration } from 'moment';
 
-import type { Dimension, Dimensions } from '../../../../../xy/public';
-import type { DateHistogramParams, HistogramParams } from '../../../../../../visualizations/public';
+import type { Dimension, Dimensions } from '@kbn/vis-type-xy-plugin/public';
+import type { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { getSeries } from './_get_series';
 import { getAspects } from './_get_aspects';
diff --git a/src/plugins/vis_types/vislib/public/vislib/lib/handler.js b/src/plugins/vis_types/vislib/public/vislib/lib/handler.js
index 7a68b128faf09..fe8388e025b94 100644
--- a/src/plugins/vis_types/vislib/public/vislib/lib/handler.js
+++ b/src/plugins/vis_types/vislib/public/vislib/lib/handler.js
@@ -11,7 +11,7 @@ import _ from 'lodash';
 import MarkdownIt from 'markdown-it';
 import moment from 'moment';
 
-import { dispatchRenderComplete } from '../../../../../kibana_utils/public';
+import { dispatchRenderComplete } from '@kbn/kibana-utils-plugin/public';
 
 import { visTypes as chartTypes } from '../visualizations/vis_types';
 import { NoResults } from '../errors';
diff --git a/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx b/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx
index 4338b0bc99cca..083af7aabb957 100644
--- a/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx
+++ b/src/plugins/vis_types/vislib/public/vislib/partials/touchdown_template.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom/server';
 import { EuiIcon } from '@elastic/eui';
-import { KibanaThemeProvider } from '../../../../../kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getTheme } from '../../services';
 
 interface Props {
diff --git a/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js b/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js
index 7313d1c8f8eac..dd86dadee94cb 100644
--- a/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js
+++ b/src/plugins/vis_types/vislib/public/vislib/visualizations/_vis_fixture.js
@@ -8,8 +8,8 @@
 
 import _ from 'lodash';
 import $ from 'jquery';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { chartPluginMock } from '../../../../../charts/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 import { Vis } from '../vis';
 
diff --git a/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js b/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js
index 4073aeeed434b..7baf50407b64f 100644
--- a/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js
+++ b/src/plugins/vis_types/vislib/public/vislib/visualizations/gauges/meter.js
@@ -9,8 +9,8 @@
 import d3 from 'd3';
 import _ from 'lodash';
 
-import { getHeatmapColors } from '../../../../../../charts/public';
-import { FORMATS_UI_SETTINGS } from '../../../../../../field_formats/common';
+import { getHeatmapColors } from '@kbn/charts-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { getValueForPercentageMode } from '../../percentage_mode_transform';
 
 const arcAngles = {
diff --git a/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js b/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js
index ecab91103d614..cfa627bf37ef6 100644
--- a/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js
+++ b/src/plugins/vis_types/vislib/public/vislib/visualizations/point_series/heatmap_chart.js
@@ -12,8 +12,8 @@ import moment from 'moment';
 import { isColorDark } from '@elastic/eui';
 
 import { PointSeries } from './_point_series';
-import { getHeatmapColors } from '../../../../../../../plugins/charts/public';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../plugins/field_formats/common';
+import { getHeatmapColors } from '@kbn/charts-plugin/public';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { getValueForPercentageMode } from '../../percentage_mode_transform';
 
 const defaults = {
diff --git a/src/plugins/vis_types/vislib/server/plugin.ts b/src/plugins/vis_types/vislib/server/plugin.ts
index dfbb30a13dbb1..e59da32896a56 100644
--- a/src/plugins/vis_types/vislib/server/plugin.ts
+++ b/src/plugins/vis_types/vislib/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { getUiSettings } from './ui_settings';
 
 export class VisTypeVislibServerPlugin implements Plugin<object, object> {
diff --git a/src/plugins/vis_types/vislib/server/ui_settings.ts b/src/plugins/vis_types/vislib/server/ui_settings.ts
index 1c7a7cdedc4e0..0247cf94aa75a 100644
--- a/src/plugins/vis_types/vislib/server/ui_settings.ts
+++ b/src/plugins/vis_types/vislib/server/ui_settings.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 import { HEATMAP_MAX_BUCKETS_SETTING } from '../common';
 
 export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
diff --git a/src/plugins/vis_types/xy/public/components/xy_current_time.tsx b/src/plugins/vis_types/xy/public/components/xy_current_time.tsx
index 1ecf661355868..68f1dd0d60b13 100644
--- a/src/plugins/vis_types/xy/public/components/xy_current_time.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_current_time.tsx
@@ -8,7 +8,7 @@
 
 import React, { FC } from 'react';
 import { DomainRange } from '@elastic/charts';
-import { CurrentTime } from '../../../../charts/public';
+import { CurrentTime } from '@kbn/charts-plugin/public';
 
 interface XYCurrentTime {
   enabled: boolean;
diff --git a/src/plugins/vis_types/xy/public/components/xy_endzones.tsx b/src/plugins/vis_types/xy/public/components/xy_endzones.tsx
index fbf398b886ffa..50982cc30dc3c 100644
--- a/src/plugins/vis_types/xy/public/components/xy_endzones.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_endzones.tsx
@@ -10,7 +10,7 @@ import React, { FC } from 'react';
 
 import { DomainRange } from '@elastic/charts';
 
-import { Endzones } from '../../../../charts/public';
+import { Endzones } from '@kbn/charts-plugin/public';
 
 interface XYEndzones {
   enabled: boolean;
diff --git a/src/plugins/vis_types/xy/public/components/xy_settings.tsx b/src/plugins/vis_types/xy/public/components/xy_settings.tsx
index 1cb38e5af3e7c..836a46236e228 100644
--- a/src/plugins/vis_types/xy/public/components/xy_settings.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_settings.tsx
@@ -26,7 +26,7 @@ import {
   HorizontalAlignment,
 } from '@elastic/charts';
 
-import { renderEndzoneTooltip } from '../../../../charts/public';
+import { renderEndzoneTooltip } from '@kbn/charts-plugin/public';
 
 import { getThemeService } from '../services';
 import { VisConfig } from '../types';
diff --git a/src/plugins/vis_types/xy/public/config/get_aspects.ts b/src/plugins/vis_types/xy/public/config/get_aspects.ts
index 666a913e48402..ee4b403301d87 100644
--- a/src/plugins/vis_types/xy/public/config/get_aspects.ts
+++ b/src/plugins/vis_types/xy/public/config/get_aspects.ts
@@ -10,7 +10,7 @@ import { compact } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn } from '../../../../expressions/public';
+import { DatatableColumn } from '@kbn/expressions-plugin/public';
 
 import { Aspect, Dimension, Aspects, Dimensions } from '../types';
 import { getFormatService } from '../services';
diff --git a/src/plugins/vis_types/xy/public/config/get_axis.ts b/src/plugins/vis_types/xy/public/config/get_axis.ts
index 23605feddd381..62e2345c80566 100644
--- a/src/plugins/vis_types/xy/public/config/get_axis.ts
+++ b/src/plugins/vis_types/xy/public/config/get_axis.ts
@@ -10,9 +10,9 @@ import { identity } from 'lodash';
 
 import { AxisSpec, TickFormatter, YDomainRange, ScaleType as ECScaleType } from '@elastic/charts';
 
-import { LabelRotation } from '../../../../charts/public';
-import { BUCKET_TYPES } from '../../../../data/public';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../charts/common';
+import { LabelRotation } from '@kbn/charts-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
 
 import {
   Aspect,
diff --git a/src/plugins/vis_types/xy/public/config/get_config.ts b/src/plugins/vis_types/xy/public/config/get_config.ts
index 7aad30c5b743e..1a78b65f19f33 100644
--- a/src/plugins/vis_types/xy/public/config/get_config.ts
+++ b/src/plugins/vis_types/xy/public/config/get_config.ts
@@ -8,9 +8,9 @@
 
 import { Fit, ScaleContinuousType } from '@elastic/charts';
 
-import { Datatable } from '../../../../expressions/public';
-import { BUCKET_TYPES } from '../../../../data/public';
-import { DateHistogramParams } from '../../../../visualizations/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { DateHistogramParams } from '@kbn/visualizations-plugin/public';
 
 import {
   Aspect,
@@ -27,7 +27,7 @@ import { getTooltip } from './get_tooltip';
 import { getLegend } from './get_legend';
 import { getAxis } from './get_axis';
 import { getAspects } from './get_aspects';
-import { ChartType } from '../index';
+import { ChartType } from '..';
 import { getSafeId } from '../utils/accessors';
 
 export function getConfig(
diff --git a/src/plugins/vis_types/xy/public/editor/collections.ts b/src/plugins/vis_types/xy/public/editor/collections.ts
index 71f7a639379e0..6df826b3016de 100644
--- a/src/plugins/vis_types/xy/public/editor/collections.ts
+++ b/src/plugins/vis_types/xy/public/editor/collections.ts
@@ -9,9 +9,9 @@
 import { i18n } from '@kbn/i18n';
 import { Fit } from '@elastic/charts';
 
+import { LabelRotation } from '@kbn/charts-plugin/public';
 import { AxisMode, ChartMode, InterpolationMode, ThresholdLineStyle } from '../types';
 import { ChartType } from '../../common';
-import { LabelRotation } from '../../../../charts/public';
 import { getScaleTypes } from './scale_types';
 import { getPositions } from './positions';
 
diff --git a/src/plugins/vis_types/xy/public/editor/common_config.tsx b/src/plugins/vis_types/xy/public/editor/common_config.tsx
index 6c071969f0cd8..499a9884e100d 100644
--- a/src/plugins/vis_types/xy/public/editor/common_config.tsx
+++ b/src/plugins/vis_types/xy/public/editor/common_config.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { VisEditorOptionsProps } from '../../../../visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 import type { VisParams } from '../types';
 import { MetricsAxisOptions, PointSeriesOptions } from './components/options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx b/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx
index 4d50dcd20228f..53f9fbf6873bd 100644
--- a/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/common/validation_wrapper.tsx
@@ -8,7 +8,7 @@
 
 import React, { useEffect, useState, useCallback } from 'react';
 
-import { VisEditorOptionsProps } from '../../../../../../visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 export interface ValidationVisOptionsProps<T> extends VisEditorOptionsProps<T> {
   setMultipleValidity(paramName: string, isValid: boolean): void;
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx
index ef3e591220efc..86708407566cc 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx
@@ -13,7 +13,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 
-import { SelectOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { LabelOptions, SetAxisLabel } from './label_options';
 import { CategoryAxis } from '../../../../types';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx
index f1643746cd84e..1d609187f83c5 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/chart_options.tsx
@@ -11,7 +11,7 @@ import React, { useMemo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 
-import { SelectOption } from '../../../../../../../vis_default_editor/public';
+import { SelectOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { SeriesParam, ValueAxis } from '../../../../types';
 import { LineOptions } from './line_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx
index 2152849983513..ef998270fbebd 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/custom_extents_options.tsx
@@ -10,7 +10,7 @@ import React, { useCallback, useEffect } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { NumberInputOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { ValueAxis } from '../../../../types';
 import { YExtents } from './y_extents';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx
index 6a32b1f75016b..20a4b209e8055 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.test.tsx
@@ -11,11 +11,11 @@ import { mount, shallow } from 'enzyme';
 
 import { Position } from '@elastic/charts';
 
-import { IAggConfig, IAggType } from 'src/plugins/data/public';
+import { IAggConfig, IAggType } from '@kbn/data-plugin/public';
 
 import { ChartType } from '../../../../../common';
 import { VisParams, SeriesParam, ValueAxis } from '../../../../types';
-import MetricsAxisOptions from './index';
+import MetricsAxisOptions from '.';
 import { ValidationVisOptionsProps } from '../../common';
 import { ValueAxesPanel } from './value_axes_panel';
 import { CategoryAxisPanel } from './category_axis_panel';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx
index 0397eec7b2c73..a8535f9d148eb 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/index.tsx
@@ -12,7 +12,8 @@ import { cloneDeep, get } from 'lodash';
 import { EuiSpacer } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 
-import { BUCKET_TYPES, IAggConfig } from '../../../../../../../data/public';
+import { BUCKET_TYPES, IAggConfig } from '@kbn/data-plugin/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import { getUISettings } from '../../../../services';
 
 import { VisParams, ValueAxis, SeriesParam, CategoryAxis } from '../../../../types';
@@ -29,7 +30,6 @@ import {
   mapPositionOpposingOpposite,
 } from './utils';
 import { getSeriesParams } from '../../../../utils/get_series_params';
-import { LEGACY_TIME_AXIS } from '../../../../../../../charts/common';
 
 export type SetParamByIndex = <P extends keyof ValueAxis, O extends keyof SeriesParam>(
   axesName: 'valueAxes' | 'seriesParams',
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx
index d24ebaa61d1d3..2c7f394f6a0aa 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/label_options.tsx
@@ -12,8 +12,8 @@ import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiToolTip } from '@ela
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { SelectOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
-import { Labels } from '../../../../../../../charts/public';
+import { SelectOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
+import { Labels } from '@kbn/charts-plugin/public';
 
 import { TruncateLabelsOption } from '../../common';
 import { getRotateOptions } from '../../../collections';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx
index 41bbfec7ee939..e01a96728785a 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { NumberInputOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { LineOptions, LineOptionsParams } from './line_options';
 import { seriesParam } from './mocks';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx
index 355b04f07d00d..7f75cf3f0724b 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/line_options.tsx
@@ -15,7 +15,7 @@ import {
   NumberInputOption,
   SelectOption,
   SwitchOption,
-} from '../../../../../../../vis_default_editor/public';
+} from '@kbn/vis-default-editor-plugin/public';
 
 import { SeriesParam } from '../../../../types';
 import { SetChart } from './chart_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts
index 1541837dacc30..7bf1191165882 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/mocks.ts
@@ -8,8 +8,8 @@
 
 import { Position } from '@elastic/charts';
 
-import { Vis } from '../../../../../../../visualizations/public';
-import { Style } from '../../../../../../../charts/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { Style } from '@kbn/charts-plugin/public';
 
 import {
   ValueAxis,
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx
index 41d5f7c2c9794..d71773ed81e7b 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/point_options.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiRange, EuiFormRow, EuiSpacer } from '@elastic/eui';
 
-import { SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { SeriesParam } from '../../../../types';
 import { SetChart } from './chart_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx
index 1928b47c64a6e..f078eff843e43 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/series_panel.tsx
@@ -12,7 +12,7 @@ import { EuiPanel, EuiTitle, EuiSpacer, EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { Vis } from '../../../../../../../visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 
 import { ValueAxis, SeriesParam } from '../../../../types';
 import { ChartOptions } from './chart_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx
index ceb655fa47107..afcc2a14ea42c 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { Position } from '@elastic/charts';
 
-import { TextInputOption } from '../../../../../../../vis_default_editor/public';
+import { TextInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { ValueAxis, ScaleType } from '../../../../types';
 import { LabelOptions } from './label_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx
index aa20eb84222bd..b1dcdfdbab1fa 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/value_axis_options.tsx
@@ -10,11 +10,7 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiAccordion, EuiHorizontalRule } from '@elastic/eui';
 
-import {
-  SelectOption,
-  SwitchOption,
-  TextInputOption,
-} from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption, TextInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { ValueAxis } from '../../../../types';
 import { LabelOptions, SetAxisLabel } from './label_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx
index da7005210865d..2be0c8e955423 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.test.tsx
@@ -11,7 +11,7 @@ import { mount, shallow } from 'enzyme';
 
 import { ScaleType } from '../../../../types';
 import { YExtents, YExtentsProps } from './y_extents';
-import { NumberInputOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 describe('YExtents component', () => {
   let setMultipleValidity: jest.Mock;
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx
index ce546339a9912..5b37ae97a1966 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/y_extents.tsx
@@ -10,7 +10,7 @@ import React, { useEffect, useCallback } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { NumberInputOption } from '../../../../../../../vis_default_editor/public';
+import { NumberInputOption } from '@kbn/vis-default-editor-plugin/public';
 
 import { Scale, ScaleType } from '../../../../types';
 import { SetScale } from './value_axis_options';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx
index b073f32ea3a58..8a633e9bda53e 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/elastic_charts_options.tsx
@@ -11,11 +11,7 @@ import type { PaletteRegistry } from '@kbn/coloring';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiFormRow, EuiRange } from '@elastic/eui';
-import {
-  SelectOption,
-  SwitchOption,
-  PalettePicker,
-} from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption, PalettePicker } from '@kbn/vis-default-editor-plugin/public';
 
 import { ChartType } from '../../../../../common';
 import { VisParams } from '../../../../types';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx
index 14a5c2667499f..2a07cbafe027f 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/grid_panel.tsx
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 
-import { SelectOption, SwitchOption } from '../../../../../../../vis_default_editor/public';
+import { SelectOption, SwitchOption } from '@kbn/vis-default-editor-plugin/public';
 import { VisParams, ValueAxis } from '../../../../types';
 import { ValidationVisOptionsProps } from '../../common';
 
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx
index 55ec844c09194..15b5adf00b41f 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.tsx
@@ -17,8 +17,8 @@ import {
   SwitchOption,
   LongLegendOptions,
   LegendSizeSettings,
-} from '../../../../../../../vis_default_editor/public';
-import { BUCKET_TYPES } from '../../../../../../../data/public';
+} from '@kbn/vis-default-editor-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
 
 import { VisParams } from '../../../../types';
 import { GridPanel } from './grid_panel';
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx b/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx
index 12588975a5a0e..47640c36a3264 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx
+++ b/src/plugins/vis_types/xy/public/editor/components/options/point_series/threshold_panel.tsx
@@ -16,7 +16,7 @@ import {
   SelectOption,
   SwitchOption,
   RequiredNumberInputOption,
-} from '../../../../../../../vis_default_editor/public';
+} from '@kbn/vis-default-editor-plugin/public';
 import { ValidationVisOptionsProps } from '../../common';
 import { VisParams } from '../../../../types';
 import { getThresholdLineStyles } from '../../../collections';
diff --git a/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts b/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts
index 08958915da4a4..5283a54e57f30 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/category_axis.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { CategoryAxis } from '../types';
 import type { ExpressionValueScale } from './vis_scale';
 import type { ExpressionValueLabel } from './label';
diff --git a/src/plugins/vis_types/xy/public/expression_functions/label.ts b/src/plugins/vis_types/xy/public/expression_functions/label.ts
index e733aebaa627c..cd3eea2b68bc7 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/label.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/label.ts
@@ -7,12 +7,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Labels } from '../../../../charts/public';
+import type { Labels } from '@kbn/charts-plugin/public';
 import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 
 export type ExpressionValueLabel = ExpressionValueBoxed<
   'label',
diff --git a/src/plugins/vis_types/xy/public/expression_functions/series_param.ts b/src/plugins/vis_types/xy/public/expression_functions/series_param.ts
index 174ed4c057974..df5ed2ec0d9b4 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/series_param.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/series_param.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { SeriesParam } from '../types';
 
 export interface Arguments extends Omit<SeriesParam, 'data'> {
diff --git a/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts b/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts
index a4f5cf98fb968..9a496158bf5a7 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/threshold_line.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { ThresholdLine } from '../types';
 
 export type ExpressionValueThresholdLine = ExpressionValueBoxed<
diff --git a/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts b/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts
index 3b673394463f0..f3b8e9cdc61d0 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/time_marker.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { TimeMarker } from '../types';
 
 export type ExpressionValueTimeMarker = ExpressionValueBoxed<
diff --git a/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts b/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts
index a92d35dc9fefd..8b32084d8b588 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/value_axis.ts
@@ -7,13 +7,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionValueCategoryAxis } from './category_axis';
-import type { CategoryAxis } from '../types';
 import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
+import type { ExpressionValueCategoryAxis } from './category_axis';
+import type { CategoryAxis } from '../types';
 
 interface Arguments {
   name: string;
diff --git a/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts b/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts
index ddf14ead20a25..33952473e5916 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/vis_scale.ts
@@ -11,7 +11,7 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../../expressions/public';
+} from '@kbn/expressions-plugin/public';
 import type { Scale } from '../types';
 
 export type ExpressionValueScale = ExpressionValueBoxed<
diff --git a/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts b/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts
index afd5f39f75742..9ed19e2549389 100644
--- a/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts
+++ b/src/plugins/vis_types/xy/public/expression_functions/xy_vis_fn.ts
@@ -12,8 +12,8 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   Render,
-} from '../../../../expressions/common';
-import { prepareLogTable, Dimension } from '../../../../visualizations/public';
+} from '@kbn/expressions-plugin/common';
+import { prepareLogTable, Dimension } from '@kbn/visualizations-plugin/public';
 import type { ChartType } from '../../common';
 import type { VisParams, XYVisConfig } from '../types';
 
diff --git a/src/plugins/vis_types/xy/public/mocks.ts b/src/plugins/vis_types/xy/public/mocks.ts
index 187850e41b3a8..b65ed6caab97c 100644
--- a/src/plugins/vis_types/xy/public/mocks.ts
+++ b/src/plugins/vis_types/xy/public/mocks.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Datatable } from '../../../expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { VisParams } from './types';
 
 export const visData = {
diff --git a/src/plugins/vis_types/xy/public/plugin.ts b/src/plugins/vis_types/xy/public/plugin.ts
index 9f81d6848d2e5..00b036594e4d4 100644
--- a/src/plugins/vis_types/xy/public/plugin.ts
+++ b/src/plugins/vis_types/xy/public/plugin.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
-import { VisualizationsSetup, VisualizationsStart } from '../../../visualizations/public';
-import { ChartsPluginSetup, ChartsPluginStart } from '../../../charts/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import {
   setDataActions,
   setFormatService,
diff --git a/src/plugins/vis_types/xy/public/services.ts b/src/plugins/vis_types/xy/public/services.ts
index d8c8689eee298..6ee38238c9cf4 100644
--- a/src/plugins/vis_types/xy/public/services.ts
+++ b/src/plugins/vis_types/xy/public/services.ts
@@ -7,10 +7,10 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { CoreSetup, DocLinksStart } from '../../../../core/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { ChartsPluginSetup, ChartsPluginStart } from '../../../charts/public';
+import { CoreSetup, DocLinksStart } from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
 
 export const [getUISettings, setUISettings] =
   createGetterSetter<CoreSetup['uiSettings']>('xy core.uiSettings');
diff --git a/src/plugins/vis_types/xy/public/to_ast.test.ts b/src/plugins/vis_types/xy/public/to_ast.test.ts
index cbe25bc1fef6f..ed35017d53edf 100644
--- a/src/plugins/vis_types/xy/public/to_ast.test.ts
+++ b/src/plugins/vis_types/xy/public/to_ast.test.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 import { sampleAreaVis } from './sample_vis.test.mocks';
 
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
 
-jest.mock('../../../expressions/public', () => ({
-  ...(jest.requireActual('../../../expressions/public') as any),
+jest.mock('@kbn/expressions-plugin/public', () => ({
+  ...(jest.requireActual('@kbn/expressions-plugin/public') as any),
   buildExpression: jest.fn().mockImplementation(() => ({
     toAst: () => ({
       type: 'expression',
diff --git a/src/plugins/vis_types/xy/public/to_ast.ts b/src/plugins/vis_types/xy/public/to_ast.ts
index 0046a6f89a6d5..bf2ca297f9f38 100644
--- a/src/plugins/vis_types/xy/public/to_ast.ts
+++ b/src/plugins/vis_types/xy/public/to_ast.ts
@@ -13,11 +13,12 @@ import {
   getVisSchemas,
   DateHistogramParams,
   HistogramParams,
-} from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import { BUCKET_TYPES } from '../../../data/public';
-import { Labels } from '../../../charts/public';
+} from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { Labels } from '@kbn/charts-plugin/public';
 
+import { TimeRangeBounds } from '@kbn/data-plugin/common';
 import {
   Dimensions,
   Dimension,
@@ -32,7 +33,6 @@ import {
 import { visName, VisTypeXyExpressionFunctionDefinition } from './expression_functions/xy_vis_fn';
 import { XyVisType } from '../common';
 import { getEsaggsFn } from './to_ast_esaggs';
-import { TimeRangeBounds } from '../../../data/common';
 import { getSeriesParams } from './utils/get_series_params';
 import { getSafeId } from './utils/accessors';
 
diff --git a/src/plugins/vis_types/xy/public/to_ast_esaggs.ts b/src/plugins/vis_types/xy/public/to_ast_esaggs.ts
index ff9dbd9ca7664..1a9079079ebda 100644
--- a/src/plugins/vis_types/xy/public/to_ast_esaggs.ts
+++ b/src/plugins/vis_types/xy/public/to_ast_esaggs.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../data/public';
+} from '@kbn/data-plugin/public';
 
 import { VisParams } from './types';
 
diff --git a/src/plugins/vis_types/xy/public/types/param.ts b/src/plugins/vis_types/xy/public/types/param.ts
index c0913226f9614..708eb1cbdd196 100644
--- a/src/plugins/vis_types/xy/public/types/param.ts
+++ b/src/plugins/vis_types/xy/public/types/param.ts
@@ -8,14 +8,14 @@
 
 import type { Fit, Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import type { Style, Labels } from '../../../../charts/public';
+import type { Style, Labels } from '@kbn/charts-plugin/public';
 import type {
   SchemaConfig,
   ExpressionValueXYDimension,
   FakeParams,
   HistogramParams,
   DateHistogramParams,
-} from '../../../../visualizations/public';
+} from '@kbn/visualizations-plugin/public';
 import type { ChartType, XyVisType } from '../../common';
 import type {
   ExpressionValueCategoryAxis,
diff --git a/src/plugins/vis_types/xy/public/types/vis_type.ts b/src/plugins/vis_types/xy/public/types/vis_type.ts
index 311714ed3587d..39d762465c34f 100644
--- a/src/plugins/vis_types/xy/public/types/vis_type.ts
+++ b/src/plugins/vis_types/xy/public/types/vis_type.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { VisTypeDefinition } from '../../../../visualizations/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { ChartType } from '../../common';
 
 import { VisParams } from './param';
diff --git a/src/plugins/vis_types/xy/public/utils/accessors.test.ts b/src/plugins/vis_types/xy/public/utils/accessors.test.ts
index ebb389054af7e..882c3d382a237 100644
--- a/src/plugins/vis_types/xy/public/utils/accessors.test.ts
+++ b/src/plugins/vis_types/xy/public/utils/accessors.test.ts
@@ -11,7 +11,7 @@ import {
   getComplexAccessor,
   isPercentileIdEqualToSeriesId,
 } from './accessors';
-import { BUCKET_TYPES } from '../../../../data/common';
+import { BUCKET_TYPES } from '@kbn/data-plugin/common';
 import { AccessorFn, Datum } from '@elastic/charts';
 
 describe('XY chart datum accessors', () => {
diff --git a/src/plugins/vis_types/xy/public/utils/accessors.tsx b/src/plugins/vis_types/xy/public/utils/accessors.tsx
index 0acde395bbdb7..9739a9d3328ea 100644
--- a/src/plugins/vis_types/xy/public/utils/accessors.tsx
+++ b/src/plugins/vis_types/xy/public/utils/accessors.tsx
@@ -7,8 +7,8 @@
  */
 
 import { AccessorFn, Accessor } from '@elastic/charts';
-import { BUCKET_TYPES } from '../../../../data/public';
-import { FakeParams } from '../../../../visualizations/public';
+import { BUCKET_TYPES } from '@kbn/data-plugin/public';
+import { FakeParams } from '@kbn/visualizations-plugin/public';
 import type { Aspect } from '../types';
 
 export const COMPLEX_X_ACCESSOR = '__customXAccessor__';
diff --git a/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts b/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts
index 78457c2fd56cd..65b43495d8c6d 100644
--- a/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts
+++ b/src/plugins/vis_types/xy/public/utils/compute_percentage_data.ts
@@ -7,7 +7,7 @@
  */
 import type { Accessor, AccessorFn } from '@elastic/charts';
 import { computeRatioByGroups } from '@elastic/charts';
-import type { DatatableRow } from '../../../../expressions/public';
+import type { DatatableRow } from '@kbn/expressions-plugin/public';
 
 export const computePercentageData = (
   rows: DatatableRow[],
diff --git a/src/plugins/vis_types/xy/public/utils/domain.ts b/src/plugins/vis_types/xy/public/utils/domain.ts
index 5b1310863979a..1f07509f55aa1 100644
--- a/src/plugins/vis_types/xy/public/utils/domain.ts
+++ b/src/plugins/vis_types/xy/public/utils/domain.ts
@@ -11,9 +11,9 @@ import { unitOfTime } from 'moment';
 
 import { DomainRange } from '@elastic/charts';
 
-import { getAdjustedInterval } from '../../../../charts/public';
-import { Datatable } from '../../../../expressions/public';
-import { DateHistogramParams, HistogramParams } from '../../../../visualizations/public';
+import { getAdjustedInterval } from '@kbn/charts-plugin/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { DateHistogramParams, HistogramParams } from '@kbn/visualizations-plugin/public';
 
 import { Aspect } from '../types';
 
diff --git a/src/plugins/vis_types/xy/public/utils/get_all_series.ts b/src/plugins/vis_types/xy/public/utils/get_all_series.ts
index cdb8f816d7e4f..6ec625cb884c1 100644
--- a/src/plugins/vis_types/xy/public/utils/get_all_series.ts
+++ b/src/plugins/vis_types/xy/public/utils/get_all_series.ts
@@ -7,7 +7,7 @@
  */
 
 import { TickFormatter } from '@elastic/charts';
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 import { Column, Aspect } from '../types';
 
 interface SplitAccessors {
diff --git a/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx b/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx
index 89cb8d50d4b8e..6c541fc27161e 100644
--- a/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx
+++ b/src/plugins/vis_types/xy/public/utils/get_color_picker.test.tsx
@@ -12,8 +12,8 @@ import { EuiPopover } from '@elastic/eui';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ComponentType, ReactWrapper } from 'enzyme';
 import { getColorPicker } from './get_color_picker';
-import { ColorPicker } from '../../../../charts/public';
-import type { PersistedState } from '../../../../visualizations/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 
 jest.mock('@elastic/charts', () => {
   const original = jest.requireActual('@elastic/charts');
diff --git a/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx b/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx
index 6e1a61875b5af..18ba4296e2545 100644
--- a/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx
+++ b/src/plugins/vis_types/xy/public/utils/get_color_picker.tsx
@@ -10,8 +10,8 @@ import React, { useCallback } from 'react';
 
 import { LegendColorPicker, Position, XYChartSeriesIdentifier, SeriesName } from '@elastic/charts';
 import { PopoverAnchorPosition, EuiWrappingPopover, EuiOutsideClickDetector } from '@elastic/eui';
-import type { PersistedState } from '../../../../visualizations/public';
-import { ColorPicker } from '../../../../charts/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import { ColorPicker } from '@kbn/charts-plugin/public';
 
 function getAnchorPosition(legendPosition: Position): PopoverAnchorPosition {
   switch (legendPosition) {
diff --git a/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx b/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx
index d52e3a457f8e9..028bb31ef7637 100644
--- a/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx
+++ b/src/plugins/vis_types/xy/public/utils/get_legend_actions.tsx
@@ -17,7 +17,7 @@ import {
   useLegendAction,
 } from '@elastic/charts';
 
-import { ClickTriggerEvent } from '../../../../charts/public';
+import { ClickTriggerEvent } from '@kbn/charts-plugin/public';
 
 export const getLegendActions = (
   canFilter: (data: ClickTriggerEvent | null) => Promise<boolean>,
diff --git a/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts b/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts
index 5c22527d5b9d7..21b2dac5da322 100644
--- a/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts
+++ b/src/plugins/vis_types/xy/public/utils/get_series_params.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { AggConfigs } from '../../../../data/public';
+import type { AggConfigs } from '@kbn/data-plugin/public';
 import type { SeriesParam } from '../types';
 import { getSeriesParams } from './get_series_params';
 import { sampleAreaVis } from '../sample_vis.test.mocks';
diff --git a/src/plugins/vis_types/xy/public/utils/get_series_params.ts b/src/plugins/vis_types/xy/public/utils/get_series_params.ts
index 0acd2a0913282..84ee04fa01919 100644
--- a/src/plugins/vis_types/xy/public/utils/get_series_params.ts
+++ b/src/plugins/vis_types/xy/public/utils/get_series_params.ts
@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import type { AggConfigs } from '@kbn/data-plugin/public';
 import { ValueAxis, SeriesParam, ChartMode, InterpolationMode } from '../types';
 import { ChartType } from '../../common';
-import type { AggConfigs } from '../../../../data/public';
 
 const makeSerie = (
   id: string,
diff --git a/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx b/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx
index 6f56eff3c2a92..6be7c31cb1060 100644
--- a/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx
+++ b/src/plugins/vis_types/xy/public/utils/render_all_series.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { AreaSeries, BarSeries, CurveType } from '@elastic/charts';
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 import { renderAllSeries } from './render_all_series';
 import {
   getVisConfig,
diff --git a/src/plugins/vis_types/xy/public/utils/render_all_series.tsx b/src/plugins/vis_types/xy/public/utils/render_all_series.tsx
index d9e4e9a47c23f..0e3787a27560d 100644
--- a/src/plugins/vis_types/xy/public/utils/render_all_series.tsx
+++ b/src/plugins/vis_types/xy/public/utils/render_all_series.tsx
@@ -20,7 +20,7 @@ import {
   LabelOverflowConstraint,
 } from '@elastic/charts';
 
-import { DatatableRow } from '../../../../expressions/public';
+import { DatatableRow } from '@kbn/expressions-plugin/public';
 
 import { ChartType } from '../../common';
 import { SeriesParam, VisConfig, Aspect } from '../types';
diff --git a/src/plugins/vis_types/xy/public/vis_component.tsx b/src/plugins/vis_types/xy/public/vis_component.tsx
index 05d2d0b0765cd..3bc7eb4a77c52 100644
--- a/src/plugins/vis_types/xy/public/vis_component.tsx
+++ b/src/plugins/vis_types/xy/public/vis_component.tsx
@@ -30,9 +30,9 @@ import {
   getBrushFromChartBrushEventFn,
   ClickTriggerEvent,
   useActiveCursor,
-} from '../../../charts/public';
-import { Datatable, IInterpreterRenderHandlers } from '../../../expressions/public';
-import type { PersistedState } from '../../../visualizations/public';
+} from '@kbn/charts-plugin/public';
+import { Datatable, IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { VisParams } from './types';
 import {
   getAdjustedDomain,
diff --git a/src/plugins/vis_types/xy/public/vis_renderer.tsx b/src/plugins/vis_types/xy/public/vis_renderer.tsx
index e4fb02af1ed49..abdb4c0cca6cf 100644
--- a/src/plugins/vis_types/xy/public/vis_renderer.tsx
+++ b/src/plugins/vis_types/xy/public/vis_renderer.tsx
@@ -9,17 +9,17 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import { IUiSettingsClient, ThemeServiceStart } from 'kibana/public';
+import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
 
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { VisualizationContainer } from '../../../visualizations/public';
-import type { PersistedState } from '../../../visualizations/public';
-import type { ExpressionRenderDefinition } from '../../../expressions/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
+import type { PersistedState } from '@kbn/visualizations-plugin/public';
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin/public';
 
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import type { XyVisType } from '../common';
 import type { VisComponentType } from './vis_component';
 import { RenderValue, visName } from './expression_functions/xy_vis_fn';
-import { LEGACY_TIME_AXIS } from '../../../charts/common';
 
 // @ts-ignore
 const VisComponent = lazy<VisComponentType>(() => import('./vis_component'));
diff --git a/src/plugins/vis_types/xy/public/vis_types/area.ts b/src/plugins/vis_types/xy/public/vis_types/area.ts
index d5e35dbc9f3de..8c83c8ac4dcd5 100644
--- a/src/plugins/vis_types/xy/public/vis_types/area.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/area.ts
@@ -11,9 +11,9 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Fit, Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 
 import {
   ChartMode,
diff --git a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts
index d1ca6bf3455ff..5176a54c61924 100644
--- a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { VisParams } from 'src/plugins/visualizations/common';
+import { VisParams } from '@kbn/visualizations-plugin/common';
 import { getVisTypeFromParams } from './get_vis_type_from_params';
 
 describe('extracting visualization type from vis params', () => {
diff --git a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts
index abe67052cd97a..c1f79b041e807 100644
--- a/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/get_vis_type_from_params.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { VisParams } from 'src/plugins/visualizations/common';
+import { VisParams } from '@kbn/visualizations-plugin/common';
 
 export const getVisTypeFromParams = (params?: VisParams) => {
   let type = params?.seriesParams?.[0]?.type;
diff --git a/src/plugins/vis_types/xy/public/vis_types/histogram.ts b/src/plugins/vis_types/xy/public/vis_types/histogram.ts
index c0b3e5f4e5073..d0a4307af198c 100644
--- a/src/plugins/vis_types/xy/public/vis_types/histogram.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/histogram.ts
@@ -11,9 +11,10 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 import {
   ChartMode,
   AxisType,
@@ -25,7 +26,6 @@ import {
 import { toExpressionAst } from '../to_ast';
 import { ChartType } from '../../common';
 import { optionTabs } from '../editor/common_config';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
 import { getVisTypeFromParams } from './get_vis_type_from_params';
 
 export const histogramVisTypeDefinition = {
diff --git a/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts b/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts
index f62e4e2287115..2e6708667ded2 100644
--- a/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/horizontal_bar.ts
@@ -11,9 +11,10 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Position } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 import {
   ChartMode,
   AxisType,
@@ -25,7 +26,6 @@ import {
 import { toExpressionAst } from '../to_ast';
 import { ChartType } from '../../common';
 import { optionTabs } from '../editor/common_config';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
 import { getVisTypeFromParams } from './get_vis_type_from_params';
 
 export const horizontalBarVisTypeDefinition = {
diff --git a/src/plugins/vis_types/xy/public/vis_types/line.ts b/src/plugins/vis_types/xy/public/vis_types/line.ts
index c14339bd1d652..536a71eb6e540 100644
--- a/src/plugins/vis_types/xy/public/vis_types/line.ts
+++ b/src/plugins/vis_types/xy/public/vis_types/line.ts
@@ -11,9 +11,9 @@ import { i18n } from '@kbn/i18n';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { Position, Fit } from '@elastic/charts';
 
-import { AggGroupNames } from '../../../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../visualizations/public';
-import { defaultCountLabel, LabelRotation } from '../../../../charts/public';
+import { AggGroupNames } from '@kbn/data-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { defaultCountLabel, LabelRotation } from '@kbn/charts-plugin/public';
 
 import {
   ChartMode,
diff --git a/src/plugins/vis_types/xy/server/index.ts b/src/plugins/vis_types/xy/server/index.ts
index 9dfa405ee27b8..9ee8a69c9d777 100644
--- a/src/plugins/vis_types/xy/server/index.ts
+++ b/src/plugins/vis_types/xy/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from '../config';
 import { VisTypeXYServerPlugin } from './plugin';
 
diff --git a/src/plugins/vis_types/xy/server/plugin.ts b/src/plugins/vis_types/xy/server/plugin.ts
index 5cb0687cf1889..3e739678763ae 100644
--- a/src/plugins/vis_types/xy/server/plugin.ts
+++ b/src/plugins/vis_types/xy/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'src/core/server';
+import { Plugin } from '@kbn/core/server';
 
 export class VisTypeXYServerPlugin implements Plugin {
   public setup() {
diff --git a/src/plugins/visualizations/common/constants.ts b/src/plugins/visualizations/common/constants.ts
index b901dacc62971..0b840c8ff13fc 100644
--- a/src/plugins/visualizations/common/constants.ts
+++ b/src/plugins/visualizations/common/constants.ts
@@ -7,6 +7,8 @@
  */
 
 export const VISUALIZE_ENABLE_LABS_SETTING = 'visualize:enableLabs';
+export const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
+export const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage';
 export const VISUALIZE_EMBEDDABLE_TYPE = 'visualization';
 
 export const STATE_STORAGE_KEY = '_a';
diff --git a/src/plugins/visualizations/common/expression_functions/range.ts b/src/plugins/visualizations/common/expression_functions/range.ts
index 04751ef01985e..5772c089790ab 100644
--- a/src/plugins/visualizations/common/expression_functions/range.ts
+++ b/src/plugins/visualizations/common/expression_functions/range.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable, Range } from '../../../expressions/common';
+import { ExpressionFunctionDefinition, Datatable, Range } from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   from: number;
diff --git a/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts b/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts
index 990631c260479..0a7614c1750cf 100644
--- a/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts
+++ b/src/plugins/visualizations/common/expression_functions/vis_dimension.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { Arguments, visDimension } from './vis_dimension';
-import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../../expressions/common';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import moment from 'moment';
 
 describe('interpreter/functions#vis_dimension', () => {
diff --git a/src/plugins/visualizations/common/expression_functions/vis_dimension.ts b/src/plugins/visualizations/common/expression_functions/vis_dimension.ts
index bd5694cb69a03..99574e1c36756 100644
--- a/src/plugins/visualizations/common/expression_functions/vis_dimension.ts
+++ b/src/plugins/visualizations/common/expression_functions/vis_dimension.ts
@@ -12,7 +12,7 @@ import {
   ExpressionValueBoxed,
   Datatable,
   DatatableColumn,
-} from '../../../expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { findAccessorOrFail } from '../utils/accessors';
 
 export interface Arguments {
diff --git a/src/plugins/visualizations/common/expression_functions/xy_dimension.ts b/src/plugins/visualizations/common/expression_functions/xy_dimension.ts
index 5bbddd48e9b8b..19872529cb9f9 100644
--- a/src/plugins/visualizations/common/expression_functions/xy_dimension.ts
+++ b/src/plugins/visualizations/common/expression_functions/xy_dimension.ts
@@ -7,15 +7,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExpressionValueVisDimension } from './vis_dimension';
 
 import type {
   ExpressionFunctionDefinition,
   ExpressionValueBoxed,
   Datatable,
   DatatableColumn,
-} from '../../../expressions/common';
-import type { SerializedFieldFormat } from '../../../field_formats/common';
+} from '@kbn/expressions-plugin/common';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { ExpressionValueVisDimension } from './vis_dimension';
 
 export interface DateHistogramParams {
   date: boolean;
diff --git a/src/plugins/visualizations/common/locator.test.ts b/src/plugins/visualizations/common/locator.test.ts
index c08c6a910327e..7dcdd7191d60b 100644
--- a/src/plugins/visualizations/common/locator.test.ts
+++ b/src/plugins/visualizations/common/locator.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { VisualizeLocatorDefinition } from './locator';
-import { FilterStateStore } from '../../data/common';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 
 describe('visualize locator', () => {
   let definition: VisualizeLocatorDefinition;
diff --git a/src/plugins/visualizations/common/locator.ts b/src/plugins/visualizations/common/locator.ts
index 8e562eedb765a..60ac8230090fb 100644
--- a/src/plugins/visualizations/common/locator.ts
+++ b/src/plugins/visualizations/common/locator.ts
@@ -8,8 +8,8 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import { Filter } from '@kbn/es-query';
-import type { Query, RefreshInterval, TimeRange } from 'src/plugins/data/common';
-import type { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
+import type { Query, RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 import type { SavedVisState } from './types';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
diff --git a/src/plugins/visualizations/common/locator_location.ts b/src/plugins/visualizations/common/locator_location.ts
index 1e6ee3d362d68..c4c86007fd124 100644
--- a/src/plugins/visualizations/common/locator_location.ts
+++ b/src/plugins/visualizations/common/locator_location.ts
@@ -12,7 +12,7 @@ import type { ParsedQuery } from 'query-string';
 import { stringify } from 'query-string';
 import rison from 'rison-node';
 import { isFilterPinned } from '@kbn/es-query';
-import { url } from '../../kibana_utils/common';
+import { url } from '@kbn/kibana-utils-plugin/common';
 import { GLOBAL_STATE_STORAGE_KEY, STATE_STORAGE_KEY, VisualizeConstants } from './constants';
 import type { VisualizeLocatorParams } from './locator';
 
diff --git a/src/plugins/visualizations/common/types.ts b/src/plugins/visualizations/common/types.ts
index 4d0424fc3f8a1..978e424477be6 100644
--- a/src/plugins/visualizations/common/types.ts
+++ b/src/plugins/visualizations/common/types.ts
@@ -7,9 +7,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectAttributes } from 'kibana/server';
+import { SavedObjectAttributes } from '@kbn/core/server';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { AggConfigSerialized, SerializedSearchSourceFields } from 'src/plugins/data/common';
+import { AggConfigSerialized, SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface VisParams {
   [key: string]: any;
diff --git a/src/plugins/visualizations/common/utils/accessors.ts b/src/plugins/visualizations/common/utils/accessors.ts
index d290eabf93080..83ec3aa802ac3 100644
--- a/src/plugins/visualizations/common/utils/accessors.ts
+++ b/src/plugins/visualizations/common/utils/accessors.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { i18n } from '@kbn/i18n';
-import { Datatable, DatatableColumn } from '../../../expressions/common';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '../expression_functions';
 
 const getAccessorByIndex = (accessor: number, columns: Datatable['columns']) =>
diff --git a/src/plugins/visualizations/common/utils/prepare_log_table.ts b/src/plugins/visualizations/common/utils/prepare_log_table.ts
index 36234a0fcaa58..6ff3a80e35f87 100644
--- a/src/plugins/visualizations/common/utils/prepare_log_table.ts
+++ b/src/plugins/visualizations/common/utils/prepare_log_table.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { ExpressionValueVisDimension } from '../expression_functions/vis_dimension';
 import { ExpressionValueXYDimension } from '../expression_functions/xy_dimension';
-import { Datatable, DatatableColumn } from '../../../expressions/common/expression_types/specs';
 
 type DimensionColumn = ExpressionValueVisDimension | ExpressionValueXYDimension | string;
 
diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json
index 3a4dc81ed8df7..2588a3e9854e6 100644
--- a/src/plugins/visualizations/kibana.json
+++ b/src/plugins/visualizations/kibana.json
@@ -17,7 +17,7 @@
     "dataViews"
   ],
   "optionalPlugins": ["home", "share", "usageCollection", "spaces", "savedObjectsTaggingOss"],
-  "requiredBundles": ["kibanaUtils", "discover", "kibanaReact", "home"],
+  "requiredBundles": ["kibanaUtils", "discover", "kibanaReact"],
   "extraPublicDirs": ["common/constants", "common/utils", "common/expression_functions"],
   "owner": {
     "name": "Vis Editors",
diff --git a/src/plugins/visualizations/public/components/visualization_container.tsx b/src/plugins/visualizations/public/components/visualization_container.tsx
index a978718c9aa2b..bfe3cf3aaa526 100644
--- a/src/plugins/visualizations/public/components/visualization_container.tsx
+++ b/src/plugins/visualizations/public/components/visualization_container.tsx
@@ -10,7 +10,7 @@ import React, { ReactNode, Suspense, lazy } from 'react';
 import { EuiLoadingChart } from '@elastic/eui';
 import classNames from 'classnames';
 
-import { IInterpreterRenderHandlers } from '../../../expressions/common';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 
 export interface VisualizationContainerProps {
   'data-test-subj'?: string;
diff --git a/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts b/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts
index b5cd655e712e9..744537b534f95 100644
--- a/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts
+++ b/src/plugins/visualizations/public/embeddable/create_vis_embeddable_from_object.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { IContainer, ErrorEmbeddable, AttributeService } from '@kbn/embeddable-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { Vis } from '../types';
 import type {
   VisualizeInput,
@@ -14,17 +16,11 @@ import type {
   VisualizeByReferenceInput,
   VisualizeSavedObjectAttributes,
 } from './visualize_embeddable';
-import {
-  IContainer,
-  ErrorEmbeddable,
-  AttributeService,
-} from '../../../../plugins/embeddable/public';
 import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
 import { getUISettings, getHttp, getTimeFilter, getCapabilities } from '../services';
 import { urlFor } from '../utils/saved_visualize_utils';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
-import type { DataView } from '../../../data_views/public';
 import { createVisualizeEmbeddableAsync } from './visualize_embeddable_async';
 
 export const createVisEmbeddableFromObject =
diff --git a/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx b/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx
index b363553e6c9b2..3cb35f4bf69b0 100644
--- a/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx
+++ b/src/plugins/visualizations/public/embeddable/disabled_lab_embeddable.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { Embeddable, EmbeddableOutput } from '../../../../plugins/embeddable/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Embeddable, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 
 import { DisabledLabVisualization } from './disabled_lab_visualization';
 import { VisualizeInput } from './visualize_embeddable';
diff --git a/src/plugins/visualizations/public/embeddable/events.ts b/src/plugins/visualizations/public/embeddable/events.ts
index a1c60ce3c9252..0e6dc57f49922 100644
--- a/src/plugins/visualizations/public/embeddable/events.ts
+++ b/src/plugins/visualizations/public/embeddable/events.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ROW_CLICK_TRIGGER } from '../../../ui_actions/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../plugins/data/public';
-import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER } from '../../../../plugins/embeddable/public';
+import { ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
 
 export interface VisEventToTrigger {
   ['applyFilter']: typeof APPLY_FILTER_TRIGGER;
diff --git a/src/plugins/visualizations/public/embeddable/to_ast.ts b/src/plugins/visualizations/public/embeddable/to_ast.ts
index 95b64fe4e6e17..dc4e931781f7b 100644
--- a/src/plugins/visualizations/public/embeddable/to_ast.ts
+++ b/src/plugins/visualizations/public/embeddable/to_ast.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunctionKibana, ExpressionFunctionKibanaContext } from '../../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { ExpressionFunctionKibana, ExpressionFunctionKibanaContext } from '@kbn/data-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 
+import { queryToAst, filtersToAst } from '@kbn/data-plugin/common';
 import { VisToExpressionAst } from '../types';
-import { queryToAst, filtersToAst } from '../../../data/common';
 
 /**
  * Creates an ast expression for a visualization based on kibana context (query, filters, timerange)
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
index 7854012bf61fe..efb60c16b4bf9 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
@@ -13,11 +13,10 @@ import React from 'react';
 import { render } from 'react-dom';
 import { EuiLoadingChart } from '@elastic/eui';
 import { Filter, onlyDisabledFiltersChanged } from '@kbn/es-query';
-import type { SavedObjectAttributes, KibanaExecutionContext } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
-import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
-import { TimeRange, Query, TimefilterContract } from '../../../../plugins/data/public';
-import type { DataView } from '../../../../plugins/data_views/public';
+import type { SavedObjectAttributes, KibanaExecutionContext } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { TimeRange, Query, TimefilterContract } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   EmbeddableInput,
   EmbeddableOutput,
@@ -27,13 +26,15 @@ import {
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
   AttributeService,
-} from '../../../../plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import {
   IExpressionLoaderParams,
   ExpressionLoader,
   ExpressionRenderError,
   ExpressionAstExpression,
-} from '../../../../plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
+import type { RenderMode } from '@kbn/expressions-plugin';
+import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import { Vis, SerializedVis } from '../vis';
 import { getExecutionContext, getExpressions, getTheme, getUiActions } from '../services';
 import { VIS_EVENT_TO_TRIGGER } from './events';
@@ -41,7 +42,6 @@ import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 import { getSavedVisualization } from '../utils/saved_visualize_utils';
 import { VisSavedObject } from '../types';
 import { toExpressionAst } from './to_ast';
-import type { RenderMode } from '../../../expressions';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
 
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts
index 814a5996af638..98fa2108bbca1 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import { VisualizeEmbeddableFactory, VisualizeInput } from '.';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
 
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
index 2760b64472a5e..05e7ea218325b 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
@@ -8,15 +8,15 @@
 
 import { i18n } from '@kbn/i18n';
 import { first } from 'rxjs/operators';
-import type { SavedObjectMetaData, OnSaveProps } from 'src/plugins/saved_objects/public';
-import type { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import type { SavedObjectMetaData, OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import type { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 
 import {
   injectSearchSourceReferences,
   extractSearchSourceReferences,
   SerializedSearchSourceFields,
-} from '../../../data/public';
-import type { SavedObjectAttributes, SavedObjectReference } from '../../../../core/public';
+} from '@kbn/data-plugin/public';
+import type { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/public';
 
 import {
   EmbeddableFactoryDefinition,
@@ -24,7 +24,9 @@ import {
   ErrorEmbeddable,
   IContainer,
   AttributeService,
-} from '../../../embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { checkForDuplicateTitle } from '@kbn/saved-objects-plugin/public';
+import type { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import type { DisabledLabEmbeddable } from './disabled_lab_embeddable';
 import type {
   VisualizeByReferenceInput,
@@ -53,8 +55,6 @@ import {
 } from '../utils/saved_visualization_references';
 import { createVisEmbeddableFromObject } from './create_vis_embeddable_from_object';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
-import { checkForDuplicateTitle } from '../../../saved_objects/public';
-import type { StartServicesGetter } from '../../../kibana_utils/public';
 import type { VisualizationsStartDeps } from '../plugin';
 
 interface VisualizationAttributes extends SavedObjectAttributes {
diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts
index de2af1d5cdcfb..22217e9de9abe 100644
--- a/src/plugins/visualizations/public/index.ts
+++ b/src/plugins/visualizations/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PublicContract } from '@kbn/utility-types';
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { VisualizationsPlugin, VisualizationsSetup, VisualizationsStart } from './plugin';
 import type { VisualizeEmbeddableFactory, VisualizeEmbeddable } from './embeddable';
 
@@ -52,7 +52,11 @@ export type {
   VisualizationListItem,
   VisualizationStage,
 } from './vis_types/vis_type_alias_registry';
-export { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
+export {
+  VISUALIZE_ENABLE_LABS_SETTING,
+  SAVED_OBJECTS_LIMIT_SETTING,
+  SAVED_OBJECTS_PER_PAGE_SETTING,
+} from '../common/constants';
 export type { SavedVisState, VisParams, Dimension } from '../common';
 export { prepareLogTable } from '../common';
 export type { ExpressionValueVisDimension } from '../common/expression_functions/vis_dimension';
diff --git a/src/plugins/visualizations/public/mocks.ts b/src/plugins/visualizations/public/mocks.ts
index 901ca34c34521..35cc96daf4f7d 100644
--- a/src/plugins/visualizations/public/mocks.ts
+++ b/src/plugins/visualizations/public/mocks.ts
@@ -6,25 +6,25 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/public';
-import { Schema, VisualizationsSetup, VisualizationsStart } from './';
-import { Schemas } from './vis_types';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { coreMock, applicationServiceMock } from '@kbn/core/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
+import { urlForwardingPluginMock } from '@kbn/url-forwarding-plugin/public/mocks';
+import { navigationPluginMock } from '@kbn/navigation-plugin/public/mocks';
+import { presentationUtilPluginMock } from '@kbn/presentation-util-plugin/public/mocks';
+import { savedObjectTaggingOssPluginMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 import { VisualizationsPlugin } from './plugin';
-import { spacesPluginMock } from '../../../../x-pack/plugins/spaces/public/mocks';
-import { coreMock, applicationServiceMock } from '../../../core/public/mocks';
-import { embeddablePluginMock } from '../../../plugins/embeddable/public/mocks';
-import { expressionsPluginMock } from '../../../plugins/expressions/public/mocks';
-import { dataPluginMock } from '../../../plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../plugins/data_views/public/mocks';
-import { usageCollectionPluginMock } from '../../../plugins/usage_collection/public/mocks';
-import { uiActionsPluginMock } from '../../../plugins/ui_actions/public/mocks';
-import { inspectorPluginMock } from '../../../plugins/inspector/public/mocks';
-import { savedObjectsPluginMock } from '../../../plugins/saved_objects/public/mocks';
-import { urlForwardingPluginMock } from '../../../plugins/url_forwarding/public/mocks';
-import { navigationPluginMock } from '../../../plugins/navigation/public/mocks';
-import { presentationUtilPluginMock } from '../../../plugins/presentation_util/public/mocks';
-import { savedObjectTaggingOssPluginMock } from '../../saved_objects_tagging_oss/public/mocks';
-import { screenshotModePluginMock } from '../../screenshot_mode/public/mocks';
+import { Schemas } from './vis_types';
+import { Schema, VisualizationsSetup, VisualizationsStart } from '.';
 
 const createSetupContract = (): VisualizationsSetup => ({
   createBaseVisualization: jest.fn(),
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
index 997d78b31163d..7cba4ef19b254 100644
--- a/src/plugins/visualizations/public/plugin.ts
+++ b/src/plugins/visualizations/public/plugin.ts
@@ -15,8 +15,59 @@ import {
   AppUpdater,
   DEFAULT_APP_CATEGORIES,
   ScopedHistory,
-} from '../../../core/public';
-import { VisualizeConstants } from '../common/constants';
+} from '@kbn/core/public';
+
+import {
+  createKbnUrlStateStorage,
+  createKbnUrlTracker,
+  createStartServicesGetter,
+  Storage,
+  withNotifyOnErrors,
+} from '@kbn/kibana-utils-plugin/public';
+
+import type {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  ApplicationStart,
+  SavedObjectsClientContract,
+} from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { UiActionsStart, UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import type {
+  Setup as InspectorSetup,
+  Start as InspectorStart,
+} from '@kbn/inspector-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import type { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { TypesSetup, TypesStart } from './vis_types';
+import type { VisualizeServices } from './visualize_app/types';
+import { visualizeEditorTrigger } from './triggers';
+import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry';
+import { showNewVisModal } from './wizard';
+import { VisualizeLocatorDefinition } from '../common/locator';
+import { xyDimension as xyDimensionExpressionFunction } from '../common/expression_functions/xy_dimension';
+import { visDimension as visDimensionExpressionFunction } from '../common/expression_functions/vis_dimension';
+import { range as rangeExpressionFunction } from '../common/expression_functions/range';
+import { TypesService } from './vis_types/types_service';
+import {
+  createVisEmbeddableFromObject,
+  VISUALIZE_EMBEDDABLE_TYPE,
+  VisualizeEmbeddableFactory,
+} from './embeddable';
 import {
   setUISettings,
   setTypes,
@@ -38,59 +89,7 @@ import {
   setTheme,
   setExecutionContext,
 } from './services';
-import {
-  createVisEmbeddableFromObject,
-  VISUALIZE_EMBEDDABLE_TYPE,
-  VisualizeEmbeddableFactory,
-} from './embeddable';
-import { TypesService } from './vis_types/types_service';
-import { range as rangeExpressionFunction } from '../common/expression_functions/range';
-import { visDimension as visDimensionExpressionFunction } from '../common/expression_functions/vis_dimension';
-import { xyDimension as xyDimensionExpressionFunction } from '../common/expression_functions/xy_dimension';
-
-import {
-  createKbnUrlStateStorage,
-  createKbnUrlTracker,
-  createStartServicesGetter,
-  Storage,
-  withNotifyOnErrors,
-} from '../../kibana_utils/public';
-import { VisualizeLocatorDefinition } from '../common/locator';
-import { showNewVisModal } from './wizard';
-import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry';
-import { FeatureCatalogueCategory } from '../../home/public';
-import { visualizeEditorTrigger } from './triggers';
-
-import type { VisualizeServices } from './visualize_app/types';
-import type {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  ApplicationStart,
-  SavedObjectsClientContract,
-} from '../../../core/public';
-import type { UsageCollectionSetup } from '../../usage_collection/public';
-import type { UiActionsStart, UiActionsSetup } from '../../ui_actions/public';
-import type { SavedObjectsStart } from '../../saved_objects/public';
-import type { TypesSetup, TypesStart } from './vis_types';
-import type {
-  Setup as InspectorSetup,
-  Start as InspectorStart,
-} from '../../../plugins/inspector/public';
-import type { DataPublicPluginSetup, DataPublicPluginStart } from '../../../plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../plugins/data_views/public';
-import type { ExpressionsSetup, ExpressionsStart } from '../../expressions/public';
-import type { EmbeddableSetup, EmbeddableStart } from '../../embeddable/public';
-import type { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
-import type { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
-import type { SharePluginSetup, SharePluginStart } from '../../share/public';
-import type { UrlForwardingSetup, UrlForwardingStart } from '../../url_forwarding/public';
-import type { PresentationUtilPluginStart } from '../../presentation_util/public';
-import type { UsageCollectionStart } from '../../usage_collection/public';
-import type { ScreenshotModePluginStart } from '../../screenshot_mode/public';
-import type { HomePublicPluginSetup } from '../../home/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
+import { VisualizeConstants } from '../common/constants';
 
 /**
  * Interface for this plugin's returned setup/start contracts.
@@ -281,7 +280,6 @@ export class VisualizationsPlugin
           stateTransferService: pluginsStart.embeddable.getStateTransfer(),
           setActiveUrl,
           createVisEmbeddableFromObject: createVisEmbeddableFromObject({ start }),
-          savedObjectsPublic: pluginsStart.savedObjects,
           scopedHistory: params.history,
           restorePreviousUrl,
           setHeaderActionMenu: params.setHeaderActionMenu,
@@ -324,7 +322,7 @@ export class VisualizationsPlugin
         icon: 'visualizeApp',
         path: `/app/visualize#${VisualizeConstants.LANDING_PAGE_PATH}`,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
       });
     }
 
diff --git a/src/plugins/visualizations/public/services.ts b/src/plugins/visualizations/public/services.ts
index 8564c8225f1a7..af19c9302b4f5 100644
--- a/src/plugins/visualizations/public/services.ts
+++ b/src/plugins/visualizations/public/services.ts
@@ -17,15 +17,15 @@ import type {
   DocLinksStart,
   ThemeServiceStart,
   ExecutionContextSetup,
-} from '../../../core/public';
+} from '@kbn/core/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart, TimefilterContract } from '@kbn/data-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type { TypesStart } from './vis_types';
-import { createGetterSetter } from '../../../plugins/kibana_utils/public';
-import { DataPublicPluginStart, TimefilterContract } from '../../../plugins/data/public';
-import { UsageCollectionSetup } from '../../../plugins/usage_collection/public';
-import { ExpressionsStart } from '../../../plugins/expressions/public';
-import { UiActionsStart } from '../../../plugins/ui_actions/public';
-import { EmbeddableStart } from '../../embeddable/public';
-import type { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
diff --git a/src/plugins/visualizations/public/triggers/index.ts b/src/plugins/visualizations/public/triggers/index.ts
index eedeac1695717..2050185db15e4 100644
--- a/src/plugins/visualizations/public/triggers/index.ts
+++ b/src/plugins/visualizations/public/triggers/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Trigger } from '../../../ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const VISUALIZE_EDITOR_TRIGGER = 'VISUALIZE_EDITOR_TRIGGER';
 export const visualizeEditorTrigger: Trigger = {
diff --git a/src/plugins/visualizations/public/types.ts b/src/plugins/visualizations/public/types.ts
index abc62e711cdc9..9235b62c11bd9 100644
--- a/src/plugins/visualizations/public/types.ts
+++ b/src/plugins/visualizations/public/types.ts
@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectsMigrationVersion, SavedObjectsResolveResponse } from 'src/core/public';
+import type { SavedObjectsMigrationVersion, SavedObjectsResolveResponse } from '@kbn/core/public';
 import {
   IAggConfigs,
   SerializedSearchSourceFields,
   TimefilterContract,
   AggConfigSerialized,
-} from '../../../plugins/data/public';
-import type { ISearchSource } from '../../data/common';
-import { ExpressionAstExpression } from '../../expressions/public';
+} from '@kbn/data-plugin/public';
+import type { ISearchSource } from '@kbn/data-plugin/common';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin/public';
 
 import type { Vis } from './vis';
 import type { PersistedState } from './persisted_state';
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts
index c0820cce45c90..3dc876a7e32e7 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/check_for_duplicate_title.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import type { SavedObject } from '../../../../saved_objects/public';
+import type { OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { findObjectByTitle } from './find_object_by_title';
 import { displayDuplicateTitleConfirmModal } from './display_duplicate_title_confirm_modal';
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx b/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx
index 3c29fd958465b..66395d4b3722e 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import type { OverlayStart } from 'kibana/public';
+import type { OverlayStart } from '@kbn/core/public';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export function confirmModalPromise(
   message = '',
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts
index 48ada48511812..9291b2a29e0a0 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/display_duplicate_title_confirm_modal.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { OverlayStart } from 'kibana/public';
-import type { SavedObject } from '../../../../saved_objects/public';
+import type { OverlayStart } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts
index d61fe1c13eee4..398c00b27e4e9 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.test.ts
@@ -7,11 +7,7 @@
  */
 
 import { findObjectByTitle } from './find_object_by_title';
-import {
-  SimpleSavedObject,
-  SavedObjectsClientContract,
-  SavedObject,
-} from '../../../../../core/public';
+import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from '@kbn/core/public';
 
 describe('findObjectByTitle', () => {
   const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts
index 10289ac0f2f53..92fa0e0437695 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/find_object_by_title.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsClientContract,
   SimpleSavedObject,
   SavedObjectAttributes,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 /** Returns an object matching a given title */
 export async function findObjectByTitle<T extends SavedObjectAttributes>(
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts
index 6d2c8f6bbe089..fc5581eb3ed05 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.test.ts
@@ -6,8 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { SavedObjectAttributes, SavedObjectsCreateOptions, OverlayStart } from 'kibana/public';
-import type { SavedObjectsClientContract } from 'kibana/public';
+import type {
+  SavedObjectAttributes,
+  SavedObjectsCreateOptions,
+  OverlayStart,
+} from '@kbn/core/public';
+import type { SavedObjectsClientContract } from '@kbn/core/public';
 import { saveWithConfirmation } from './save_with_confirmation';
 import * as deps from './confirm_modal_promise';
 import { OVERWRITE_REJECTED } from './constants';
diff --git a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts
index de9ba38343548..a33fbd18f1b4f 100644
--- a/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts
+++ b/src/plugins/visualizations/public/utils/saved_objects_utils/save_with_confirmation.ts
@@ -13,7 +13,7 @@ import type {
   SavedObjectsCreateOptions,
   OverlayStart,
   SavedObjectsClientContract,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { OVERWRITE_REJECTED } from './constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts b/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts
index 5e9af25e58249..b0920f60f5399 100644
--- a/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualization_references/controls_references.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { VisParams } from '../../../common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 const isControlsVis = (visType: string) => visType === 'input_control_vis';
 
diff --git a/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts b/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts
index 0f7d78c88d5ed..5b53c53248b71 100644
--- a/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualization_references/saved_visualization_references.ts
@@ -10,13 +10,13 @@ import {
   SavedObjectAttribute,
   SavedObjectAttributes,
   SavedObjectReference,
-} from '../../../../../core/public';
-import { SavedVisState, VisSavedObject } from '../../types';
+} from '@kbn/core/public';
 import {
   extractSearchSourceReferences,
   injectSearchSourceReferences,
   SerializedSearchSourceFields,
-} from '../../../../data/public';
+} from '@kbn/data-plugin/public';
+import { SavedVisState, VisSavedObject } from '../../types';
 
 import { extractTimeSeriesReferences, injectTimeSeriesReferences } from './timeseries_references';
 import { extractControlsReferences, injectControlsReferences } from './controls_references';
diff --git a/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts b/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts
index 36217579b88a6..a9e942b91a684 100644
--- a/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectReference } from '../../../../../core/types';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { VisParams } from '../../../common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../data_views/common';
 
 /** @internal **/
 const REF_NAME_POSTFIX = '_ref_name';
diff --git a/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts b/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts
index fe2453fbb78a4..b5a8ab1acd6fd 100644
--- a/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualize_utils.test.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { ISearchSource } from '../../../data/common';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
-import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
-import { coreMock } from '../../../../core/public/mocks';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { SavedObjectsClientContract } from '../../../../core/public';
+import type { ISearchSource } from '@kbn/data-plugin/common';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import {
   findListItems,
   getSavedVisualization,
@@ -36,7 +36,7 @@ const mockParseSearchSourceJSON = jest.fn();
 const mockInjectSearchSourceReferences = jest.fn();
 const mockExtractSearchSourceReferences = jest.fn((...args) => [{}, []]);
 
-jest.mock('../../../../plugins/data/public', () => ({
+jest.mock('@kbn/data-plugin/public', () => ({
   extractSearchSourceReferences: jest.fn((...args) => mockExtractSearchSourceReferences(...args)),
   injectSearchSourceReferences: jest.fn((...args) => mockInjectSearchSourceReferences(...args)),
   parseSearchSourceJSON: jest.fn((...args) => mockParseSearchSourceJSON(...args)),
diff --git a/src/plugins/visualizations/public/utils/saved_visualize_utils.ts b/src/plugins/visualizations/public/utils/saved_visualize_utils.ts
index 875211a39757d..5b8ba8ce04cb4 100644
--- a/src/plugins/visualizations/public/utils/saved_visualize_utils.ts
+++ b/src/plugins/visualizations/public/utils/saved_visualize_utils.ts
@@ -13,18 +13,18 @@ import type {
   SavedObjectsClientContract,
   SavedObjectAttributes,
   SavedObjectReference,
-} from 'kibana/public';
-import type { OverlayStart } from '../../../../core/public';
-import { SavedObjectNotFound } from '../../../kibana_utils/public';
+} from '@kbn/core/public';
+import type { OverlayStart } from '@kbn/core/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import {
   extractSearchSourceReferences,
   injectSearchSourceReferences,
   parseSearchSourceJSON,
   DataPublicPluginStart,
-} from '../../../../plugins/data/public';
+} from '@kbn/data-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { saveWithConfirmation, checkForDuplicateTitle } from './saved_objects_utils';
-import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
 import { VisualizationsAppExtension } from '../vis_types/vis_type_alias_registry';
 import type {
   VisSavedObject,
diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts
index 47a667a4f36b9..9614e5f415fe7 100644
--- a/src/plugins/visualizations/public/vis.ts
+++ b/src/plugins/visualizations/public/vis.ts
@@ -20,15 +20,14 @@ import { isFunction, defaults, cloneDeep } from 'lodash';
 import { Assign } from '@kbn/utility-types';
 import { i18n } from '@kbn/i18n';
 
+import { IAggConfigs, ISearchSource, AggConfigSerialized } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { getSavedSearch, throwErrorOnSavedSearchUrlConflict } from '@kbn/discover-plugin/public';
 import { PersistedState } from './persisted_state';
 import { getTypes, getAggs, getSearch, getSavedObjects, getSpaces } from './services';
-import { IAggConfigs, ISearchSource, AggConfigSerialized } from '../../data/public';
-import type { DataView } from '../../data_views/public';
 import { BaseVisType } from './vis_types';
 import { SerializedVis, SerializedVisData, VisParams } from '../common/types';
 
-import { getSavedSearch, throwErrorOnSavedSearchUrlConflict } from '../../discover/public';
-
 export type { SerializedVis, SerializedVisData };
 
 export interface VisData {
diff --git a/src/plugins/visualizations/public/vis_schemas.ts b/src/plugins/visualizations/public/vis_schemas.ts
index f80f85fb55a60..795631b9b4f07 100644
--- a/src/plugins/visualizations/public/vis_schemas.ts
+++ b/src/plugins/visualizations/public/vis_schemas.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { SerializedFieldFormat } from '../../field_formats/common';
-import { IAggConfig, search } from '../../data/public';
+import type { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import { IAggConfig, search } from '@kbn/data-plugin/public';
 
 import { Vis, VisToExpressionAstParams } from './types';
 
diff --git a/src/plugins/visualizations/public/vis_types/schemas.ts b/src/plugins/visualizations/public/vis_types/schemas.ts
index 1e14cb90cf046..528a2269f7283 100644
--- a/src/plugins/visualizations/public/vis_types/schemas.ts
+++ b/src/plugins/visualizations/public/vis_types/schemas.ts
@@ -7,7 +7,7 @@
  */
 
 import _, { defaults } from 'lodash';
-import { AggGroupNames, AggParam } from '../../../data/public';
+import { AggGroupNames, AggParam } from '@kbn/data-plugin/public';
 import type { ISchemas, Schema } from './types';
 
 /** @private **/
diff --git a/src/plugins/visualizations/public/vis_types/types.ts b/src/plugins/visualizations/public/vis_types/types.ts
index ee4459e4e772e..0e7e44b6ea38e 100644
--- a/src/plugins/visualizations/public/vis_types/types.ts
+++ b/src/plugins/visualizations/public/vis_types/types.ts
@@ -9,9 +9,9 @@
 import type { IconType } from '@elastic/eui';
 import type { ReactNode } from 'react';
 import type { PaletteOutput } from '@kbn/coloring';
-import type { Adapters } from 'src/plugins/inspector';
-import type { AggGroupNames, AggParam, AggGroupName, Query } from '../../../data/public';
-import type { DataView } from '../../../data_views/public';
+import type { Adapters } from '@kbn/inspector-plugin';
+import type { AggGroupNames, AggParam, AggGroupName, Query } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { Vis, VisEditorOptionsProps, VisParams, VisToExpressionAst } from '../types';
 import { VisGroups } from './vis_groups_enum';
 
diff --git a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
index a8b00b15a1ede..2945aaa1a0cc8 100644
--- a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
+++ b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject } from '../../../../core/types/saved_objects';
+import { SavedObject } from '@kbn/core/types/saved_objects';
 import { BaseVisType } from './base_vis_type';
 
 export type VisualizationStage = 'experimental' | 'beta' | 'production';
diff --git a/src/plugins/visualizations/public/visualize_app/app.tsx b/src/plugins/visualizations/public/visualize_app/app.tsx
index de744ebce1c91..156cc9b99b16e 100644
--- a/src/plugins/visualizations/public/visualize_app/app.tsx
+++ b/src/plugins/visualizations/public/visualize_app/app.tsx
@@ -10,9 +10,9 @@ import './app.scss';
 import React, { useEffect } from 'react';
 import { Route, Switch, useLocation } from 'react-router-dom';
 
-import { AppMountParameters } from 'kibana/public';
-import { syncQueryStateWithUrl } from '../../../data/public';
-import { useKibana } from '../../../kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { syncQueryStateWithUrl } from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { VisualizeServices } from './types';
 import {
   VisualizeEditor,
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx
index b0244ea5fbb05..a85e8d0cd6561 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_byvalue_editor.tsx
@@ -10,8 +10,8 @@ import './visualize_editor.scss';
 import React, { useEffect, useState } from 'react';
 import { EventEmitter } from 'events';
 
-import { VisualizeInput } from 'src/plugins/visualizations/public';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { VisualizeInput } from '../..';
 import {
   useChromeVisibility,
   useVisByValue,
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx
index c281b211768a1..fc505d1d74e00 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_editor.tsx
@@ -11,7 +11,7 @@ import React, { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { EventEmitter } from 'events';
 
-import { useExecutionContext, useKibana } from '../../../../kibana_react/public';
+import { useExecutionContext, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   useChromeVisibility,
   useSavedVisInstance,
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx
index e2d169d263e45..9118a9a0b8ed0 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.test.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
 import { VisualizeEditorCommon } from './visualize_editor_common';
 import { VisualizeEditorVisInstance } from '../types';
-import { SplitChartWarning } from './split_chart_warning';
+import { VizChartWarning } from './viz_chart_warning';
 
 const mockGetLegacyUrlConflict = jest.fn();
 const mockRedirectLegacyUrl = jest.fn(() => Promise.resolve());
-jest.mock('../../../../kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   useKibana: jest.fn(() => ({
     services: {
       spaces: {
@@ -42,7 +42,7 @@ jest.mock('../../../../kibana_react/public', () => ({
 
 jest.mock('../../services', () => ({
   getUISettings: jest.fn(() => ({
-    get: jest.fn(),
+    get: jest.fn((token) => Boolean(token === 'visualization:visualize:legacyPieChartsLibrary')),
   })),
 }));
 
@@ -157,7 +157,7 @@ describe('VisualizeEditorCommon', () => {
         }
       />
     );
-    expect(wrapper.find(SplitChartWarning).length).toBe(1);
+    expect(wrapper.find(VizChartWarning).length).toBe(1);
   });
 
   it('should not display a warning callout for XY charts with split aggs', async () => {
@@ -198,6 +198,47 @@ describe('VisualizeEditorCommon', () => {
         }
       />
     );
-    expect(wrapper.find(SplitChartWarning).length).toBe(0);
+    expect(wrapper.find(VizChartWarning).length).toBe(0);
+  });
+
+  it('should display a warning callout for old pie implementation', async () => {
+    const wrapper = shallowWithIntl(
+      <VisualizeEditorCommon
+        appState={null}
+        hasUnsavedChanges={false}
+        setHasUnsavedChanges={() => {}}
+        hasUnappliedChanges={false}
+        isEmbeddableRendered={false}
+        onAppLeave={() => {}}
+        visEditorRef={React.createRef()}
+        visInstance={
+          {
+            savedVis: {
+              id: 'test',
+              sharingSavedObjectProps: {
+                outcome: 'conflict',
+                aliasTargetId: 'alias_id',
+              },
+            },
+            vis: {
+              type: {
+                title: 'pie',
+                name: 'pie',
+              },
+              data: {
+                aggs: {
+                  aggs: [
+                    {
+                      schema: 'buckets',
+                    },
+                  ],
+                },
+              },
+            },
+          } as unknown as VisualizeEditorVisInstance
+        }
+      />
+    );
+    expect(wrapper.find(VizChartWarning).length).toBe(1);
   });
 });
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx
index 922a55609c1e3..f69f53e4a24ab 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_editor_common.tsx
@@ -11,13 +11,13 @@ import React, { RefObject, useCallback, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiScreenReaderOnly } from '@elastic/eui';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { VisualizeTopNav } from './visualize_top_nav';
 import { ExperimentalVisInfo } from './experimental_vis_info';
-import { useKibana } from '../../../../kibana_react/public';
-import { urlFor } from '../../../../visualizations/public';
+import { urlFor } from '../..';
 import { getUISettings } from '../../services';
-import { SplitChartWarning } from './split_chart_warning';
+import { VizChartWarning } from './viz_chart_warning';
 import {
   SavedVisInstance,
   VisualizeAppState,
@@ -28,6 +28,7 @@ import {
 import {
   CHARTS_CONFIG_TOKENS,
   CHARTS_WITHOUT_SMALL_MULTIPLES,
+  CHARTS_TO_BE_DEPRECATED,
   isSplitChart as isSplitChartFn,
 } from '../utils/split_chart_warning_helpers';
 
@@ -121,8 +122,10 @@ export const VisualizeEditorCommon = ({
 
   const chartsWithoutSmallMultiples: string[] = Object.values(CHARTS_WITHOUT_SMALL_MULTIPLES);
   const chartNeedsWarning = chartName ? chartsWithoutSmallMultiples.includes(chartName) : false;
+  const deprecatedCharts: string[] = Object.values(CHARTS_TO_BE_DEPRECATED);
+  const deprecatedChartsNeedWarning = chartName ? deprecatedCharts.includes(chartName) : false;
   const chartToken =
-    chartName && chartNeedsWarning
+    chartName && (chartNeedsWarning || deprecatedChartsNeedWarning)
       ? CHARTS_CONFIG_TOKENS[chartName as CHARTS_WITHOUT_SMALL_MULTIPLES]
       : undefined;
 
@@ -150,11 +153,18 @@ export const VisualizeEditorCommon = ({
       )}
       {visInstance?.vis?.type?.stage === 'experimental' && <ExperimentalVisInfo />}
       {!hasLegacyChartsEnabled && isSplitChart && chartNeedsWarning && chartToken && chartName && (
-        <SplitChartWarning
+        <VizChartWarning
           chartType={chartName as CHARTS_WITHOUT_SMALL_MULTIPLES}
           chartConfigToken={chartToken}
         />
       )}
+      {hasLegacyChartsEnabled && deprecatedChartsNeedWarning && chartToken && chartName && (
+        <VizChartWarning
+          chartType={chartName as CHARTS_TO_BE_DEPRECATED}
+          chartConfigToken={chartToken}
+          mode="new"
+        />
+      )}
       {visInstance?.vis?.type?.getInfoMessage?.(visInstance.vis)}
       {getLegacyUrlConflictCallout()}
       {visInstance && (
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx
index a180cf78feeb2..59017aa643cc7 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_listing.tsx
@@ -17,12 +17,16 @@ import useMount from 'react-use/lib/useMount';
 
 import { useLocation } from 'react-router-dom';
 
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
+import { useKibana, TableListView, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { findListItems } from '../../utils/saved_visualize_utils';
 import { showNewVisModal } from '../../wizard';
 import { getTypes } from '../../services';
-import { SavedObjectsFindOptionsReference } from '../../../../../core/public';
-import { useKibana, TableListView, useExecutionContext } from '../../../../kibana_react/public';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../visualizations/public';
+import {
+  VISUALIZE_ENABLE_LABS_SETTING,
+  SAVED_OBJECTS_LIMIT_SETTING,
+  SAVED_OBJECTS_PER_PAGE_SETTING,
+} from '../..';
 import { VisualizeServices } from '../types';
 import { VisualizeConstants } from '../../../common/constants';
 import { getTableColumns, getNoItemsMessage } from '../utils';
@@ -37,7 +41,6 @@ export const VisualizeListing = () => {
       toastNotifications,
       stateTransferService,
       savedObjects,
-      savedObjectsPublic,
       savedObjectsTagging,
       uiSettings,
       visualizeCapabilities,
@@ -48,7 +51,8 @@ export const VisualizeListing = () => {
   } = useKibana<VisualizeServices>();
   const { pathname } = useLocation();
   const closeNewVisModal = useRef(() => {});
-  const listingLimit = savedObjectsPublic.settings.getListingLimit();
+  const listingLimit = uiSettings.get(SAVED_OBJECTS_LIMIT_SETTING);
+  const initialPageSize = uiSettings.get(SAVED_OBJECTS_PER_PAGE_SETTING);
 
   useExecutionContext(executionContext, {
     type: 'application',
@@ -193,7 +197,7 @@ export const VisualizeListing = () => {
       editItem={visualizeCapabilities.save ? editItem : undefined}
       tableColumns={tableColumns}
       listingLimit={listingLimit}
-      initialPageSize={savedObjectsPublic.settings.getPerPage()}
+      initialPageSize={initialPageSize}
       initialFilter={''}
       rowHeader="title"
       emptyPrompt={noItemsFragment}
@@ -209,6 +213,7 @@ export const VisualizeListing = () => {
       toastNotifications={toastNotifications}
       searchFilters={searchFilters}
       theme={theme}
+      application={application}
     >
       {dashboardCapabilities.createNew && (
         <>
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx
index 679526d063278..7fd668594b014 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_no_match.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 
-import { useKibana, toMountPoint, KibanaThemeProvider } from '../../../../kibana_react/public';
+import { useKibana, toMountPoint, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { VisualizeServices } from '../types';
 import { VisualizeConstants } from '../../../common/constants';
 
diff --git a/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx b/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx
index 276c99ec4ca5c..a6c1710afbed8 100644
--- a/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/visualize_top_nav.tsx
@@ -8,10 +8,11 @@
 
 import React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
 
-import { AppMountParameters, OverlayRef } from 'kibana/public';
+import { AppMountParameters, OverlayRef } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   VisualizeServices,
   VisualizeAppState,
@@ -20,8 +21,7 @@ import {
 } from '../types';
 import { VISUALIZE_APP_NAME } from '../../../common/constants';
 import { getTopNavConfig } from '../utils';
-import type { DataView } from '../../../../data_views/public';
-import type { NavigateToLensContext } from '../../../../visualizations/public';
+import type { NavigateToLensContext } from '../..';
 
 const LOCAL_STORAGE_EDIT_IN_LENS_BADGE = 'EDIT_IN_LENS_BADGE_VISIBLE';
 
diff --git a/src/plugins/visualizations/public/visualize_app/components/split_chart_warning.tsx b/src/plugins/visualizations/public/visualize_app/components/viz_chart_warning.tsx
similarity index 68%
rename from src/plugins/visualizations/public/visualize_app/components/split_chart_warning.tsx
rename to src/plugins/visualizations/public/visualize_app/components/viz_chart_warning.tsx
index 679aa6aa2fbe1..bc66ea42602e6 100644
--- a/src/plugins/visualizations/public/visualize_app/components/split_chart_warning.tsx
+++ b/src/plugins/visualizations/public/visualize_app/components/viz_chart_warning.tsx
@@ -8,32 +8,42 @@
 
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { VisualizeServices } from '../types';
-import { CHARTS_WITHOUT_SMALL_MULTIPLES } from '../utils/split_chart_warning_helpers';
-import type { CHARTS_WITHOUT_SMALL_MULTIPLES as CHART_WITHOUT_SMALL_MULTIPLES } from '../utils/split_chart_warning_helpers';
+import {
+  CHARTS_WITHOUT_SMALL_MULTIPLES,
+  CHARTS_TO_BE_DEPRECATED,
+} from '../utils/split_chart_warning_helpers';
+import type {
+  CHARTS_WITHOUT_SMALL_MULTIPLES as CHART_WITHOUT_SMALL_MULTIPLES,
+  CHARTS_TO_BE_DEPRECATED as CHART_TO_BE_DEPRECATED,
+} from '../utils/split_chart_warning_helpers';
 
 interface Props {
-  chartType: CHART_WITHOUT_SMALL_MULTIPLES;
+  chartType: CHART_WITHOUT_SMALL_MULTIPLES | CHART_TO_BE_DEPRECATED;
   chartConfigToken: string;
+  mode?: 'old' | 'new';
 }
 
 interface WarningMessageProps {
   canEditAdvancedSettings: boolean | Readonly<{ [x: string]: boolean }>;
   advancedSettingsLink: string;
+  mode?: 'old' | 'new';
 }
 
 const SwitchToOldLibraryMessage: FC<WarningMessageProps> = ({
   canEditAdvancedSettings,
   advancedSettingsLink,
+  mode = 'old',
 }) => {
   return (
     <>
       {canEditAdvancedSettings && (
         <FormattedMessage
           id="visualizations.newChart.conditionalMessage.newLibrary"
-          defaultMessage="Switch to the old library in {link}"
+          defaultMessage="Switch to the {type} library in {link}"
           values={{
             link: (
               <EuiLink href={advancedSettingsLink}>
@@ -43,6 +53,14 @@ const SwitchToOldLibraryMessage: FC<WarningMessageProps> = ({
                 />
               </EuiLink>
             ),
+            type:
+              mode === 'old'
+                ? i18n.translate('visualizations.newChart.libraryMode.old', {
+                    defaultMessage: 'old',
+                  })
+                : i18n.translate('visualizations.newChart.libraryMode.new', {
+                    defaultMessage: 'new',
+                  }),
           }}
         />
       )}
@@ -97,12 +115,30 @@ const HeatmapWarningFormatMessage: FC<WarningMessageProps> = (props) => {
   );
 };
 
+const PieWarningFormatMessage: FC<WarningMessageProps> = (props) => {
+  return (
+    <FormattedMessage
+      id="visualizations.oldPieChart.notificationMessage"
+      defaultMessage="You are using the legacy charts library, which will be removed in a future version. {conditionalMessage}"
+      values={{
+        conditionalMessage: (
+          <>
+            <SwitchToOldLibraryMessage {...props} />
+            <ContactAdminMessage {...props} />
+          </>
+        ),
+      }}
+    />
+  );
+};
+
 const warningMessages = {
   [CHARTS_WITHOUT_SMALL_MULTIPLES.heatmap]: HeatmapWarningFormatMessage,
   [CHARTS_WITHOUT_SMALL_MULTIPLES.gauge]: GaugeWarningFormatMessage,
+  [CHARTS_TO_BE_DEPRECATED.pie]: PieWarningFormatMessage,
 };
 
-export const SplitChartWarning: FC<Props> = ({ chartType, chartConfigToken }) => {
+export const VizChartWarning: FC<Props> = ({ chartType, chartConfigToken, mode }) => {
   const { services } = useKibana<VisualizeServices>();
   const canEditAdvancedSettings = services.application.capabilities.advancedSettings.save;
   const advancedSettingsLink = services.application.getUrlForApp('management', {
@@ -112,11 +148,12 @@ export const SplitChartWarning: FC<Props> = ({ chartType, chartConfigToken }) =>
   const WarningMessage = warningMessages[chartType];
   return (
     <EuiCallOut
-      data-test-subj="vizSplitChartWarning"
+      data-test-subj="vizChartWarning"
       title={
         <WarningMessage
           advancedSettingsLink={advancedSettingsLink}
           canEditAdvancedSettings={canEditAdvancedSettings}
+          mode={mode}
         />
       }
       iconType="alert"
diff --git a/src/plugins/visualizations/public/visualize_app/constants.ts b/src/plugins/visualizations/public/visualize_app/constants.ts
index fd256cb5bbb86..36f1844d998b2 100644
--- a/src/plugins/visualizations/public/visualize_app/constants.ts
+++ b/src/plugins/visualizations/public/visualize_app/constants.ts
@@ -8,3 +8,4 @@
 
 export const NEW_HEATMAP_CHARTS_LIBRARY = 'visualization:visualize:legacyHeatmapChartsLibrary';
 export const NEW_GAUGE_CHARTS_LIBRARY = 'visualization:visualize:legacyGaugeChartsLibrary';
+export const NEW_PIE_CHARTS_LIBRARY = 'visualization:visualize:legacyPieChartsLibrary';
diff --git a/src/plugins/visualizations/public/visualize_app/index.tsx b/src/plugins/visualizations/public/visualize_app/index.tsx
index c3bc01deff020..c29eef172ffe6 100644
--- a/src/plugins/visualizations/public/visualize_app/index.tsx
+++ b/src/plugins/visualizations/public/visualize_app/index.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router } from 'react-router-dom';
 
-import { AppMountParameters } from 'kibana/public';
-import { KibanaContextProvider, KibanaThemeProvider } from '../../../kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { VisualizeApp } from './app';
 import { VisualizeServices } from './types';
 import { addHelpMenuToAppChrome, addBadgeToAppChrome } from './utils';
diff --git a/src/plugins/visualizations/public/visualize_app/types.ts b/src/plugins/visualizations/public/visualize_app/types.ts
index 7c4c8155a9405..8eb57495d95ab 100644
--- a/src/plugins/visualizations/public/visualize_app/types.ts
+++ b/src/plugins/visualizations/public/visualize_app/types.ts
@@ -18,35 +18,33 @@ import type {
   ScopedHistory,
   AppMountParameters,
   ThemeServiceStart,
-} from 'kibana/public';
-
-import type {
-  Vis,
-  VisualizeEmbeddableContract,
-  VisSavedObject,
-  PersistedState,
-  VisParams,
-} from 'src/plugins/visualizations/public';
+} from '@kbn/core/public';
 
 import type {
   Storage,
   IKbnUrlStateStorage,
   ReduxLikeStateContainer,
-} from 'src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
-import type { NavigationPublicPluginStart as NavigationStart } from 'src/plugins/navigation/public';
+import type { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
 import type { Filter } from '@kbn/es-query';
-import type { Query, DataPublicPluginStart, TimeRange } from 'src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { SavedObjectsStart } from 'src/plugins/saved_objects/public';
-import type { EmbeddableStart, EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
-import type { UrlForwardingStart } from 'src/plugins/url_forwarding/public';
-import type { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
-import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
-import type { UsageCollectionStart } from '../../../usage_collection/public';
-import type { SavedSearch } from '../../../discover/public';
+import type { Query, DataPublicPluginStart, TimeRange } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { EmbeddableStart, EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import type { UrlForwardingStart } from '@kbn/url-forwarding-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { SavedSearch } from '@kbn/discover-plugin/public';
+import type {
+  Vis,
+  VisualizeEmbeddableContract,
+  VisSavedObject,
+  PersistedState,
+  VisParams,
+} from '..';
 
 import type { SavedVisState } from '../types';
 import type { createVisEmbeddableFromObject } from '../embeddable';
@@ -97,7 +95,6 @@ export interface VisualizeServices extends CoreStart {
   share?: SharePluginStart;
   visualizeCapabilities: Record<string, boolean | Record<string, boolean>>;
   dashboardCapabilities: Record<string, boolean | Record<string, boolean>>;
-  savedObjectsPublic: SavedObjectsStart;
   setActiveUrl: (newUrl: string) => void;
   createVisEmbeddableFromObject: ReturnType<typeof createVisEmbeddableFromObject>;
   restorePreviousUrl: () => void;
diff --git a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts
index 0474e60cea676..48dce29fbac65 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
+import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { createVisualizeAppState } from './create_visualize_app_state';
 import { migrateAppState } from './migrate_app_state';
 import { visualizeAppStateStub } from './stubs';
@@ -14,7 +14,7 @@ import { visualizeAppStateStub } from './stubs';
 const mockStartStateSync = jest.fn();
 const mockStopStateSync = jest.fn();
 
-jest.mock('../../../../kibana_utils/public', () => ({
+jest.mock('@kbn/kibana-utils-plugin/public', () => ({
   createStateContainer: jest.fn(() => 'stateContainer'),
   syncState: jest.fn(() => ({
     start: mockStartStateSync,
@@ -25,7 +25,7 @@ jest.mock('./migrate_app_state', () => ({
   migrateAppState: jest.fn(() => 'migratedAppState'),
 }));
 
-const { createStateContainer, syncState } = jest.requireMock('../../../../kibana_utils/public');
+const { createStateContainer, syncState } = jest.requireMock('@kbn/kibana-utils-plugin/public');
 
 describe('createVisualizeAppState', () => {
   const kbnUrlStateStorage = {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts
index bd0406460a3c9..ab3e631663f40 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/create_visualize_app_state.ts
@@ -8,12 +8,12 @@
 
 import { isFunction, omitBy, union } from 'lodash';
 
-import { migrateAppState } from './migrate_app_state';
 import {
   createStateContainer,
   syncState,
   IKbnUrlStateStorage,
-} from '../../../../kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
+import { migrateAppState } from './migrate_app_state';
 import type { SavedVisState } from '../../types';
 import type { VisualizeAppState, VisualizeAppStateTransitions } from '../types';
 
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx b/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx
index 1d29e9822e1fd..5775d4e5bf535 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_table_columns.tsx
@@ -19,11 +19,11 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
-import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
-import { VisualizationListItem } from 'src/plugins/visualizations/public';
-import type { SavedObjectsTaggingApi } from 'src/plugins/saved_objects_tagging_oss/public';
-import { RedirectAppLinks } from '../../../../kibana_react/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { VisualizationListItem } from '../..';
 import { getVisualizeListItemLink } from './get_visualize_list_item_link';
 import { getUsageCollector } from '../../services';
 import { VISUALIZE_APP_NAME } from '../../../common/constants';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx
index 62ed8343b33c7..a7f2f3427c785 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { Observable } from 'rxjs';
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { showPublicUrlSwitch, getTopNavConfig, TopNavConfigParams } from './get_top_nav_config';
 import type {
   VisualizeEditorVisInstance,
@@ -14,8 +14,8 @@ import type {
   VisualizeServices,
 } from '../types';
 import { createVisualizeServicesMock } from './mocks';
-import { sharePluginMock } from '../../../../share/public/mocks';
-import { createEmbeddableStateTransferMock } from '../../../../embeddable/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { createEmbeddableStateTransferMock } from '@kbn/embeddable-plugin/public/mocks';
 import { visualizeAppStateStub } from './stubs';
 
 describe('showPublicUrlSwitch', () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx
index 376dde50ec97e..7cdd79b2ee490 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_top_nav_config.tsx
@@ -13,26 +13,27 @@ import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiBetaBadgeProps } from '@elastic/eui';
 import { parse } from 'query-string';
 
-import { Capabilities } from 'src/core/public';
-import { TopNavMenuData } from 'src/plugins/navigation/public';
-import { saveVisualization } from '../../utils/saved_visualize_utils';
-import {
-  VISUALIZE_EMBEDDABLE_TYPE,
-  VisualizeInput,
-  getFullPath,
-  NavigateToLensContext,
-} from '../../../../visualizations/public';
+import { Capabilities } from '@kbn/core/public';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import {
   showSaveModal,
   SavedObjectSaveModalOrigin,
   SavedObjectSaveOpts,
   OnSaveProps,
-} from '../../../../saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
 import {
   LazySavedObjectSaveModalDashboard,
   withSuspense,
-} from '../../../../presentation_util/public';
-import { unhashUrl } from '../../../../kibana_utils/public';
+} from '@kbn/presentation-util-plugin/public';
+import { unhashUrl } from '@kbn/kibana-utils-plugin/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { saveVisualization } from '../../utils/saved_visualize_utils';
+import {
+  VISUALIZE_EMBEDDABLE_TYPE,
+  VisualizeInput,
+  getFullPath,
+  NavigateToLensContext,
+} from '../..';
 
 import {
   VisualizeServices,
@@ -41,7 +42,6 @@ import {
 } from '../types';
 import { VISUALIZE_APP_NAME, VisualizeConstants } from '../../../common/constants';
 import { getEditBreadcrumbs } from './breadcrumbs';
-import { EmbeddableStateTransfer } from '../../../../embeddable/public';
 import { VISUALIZE_APP_LOCATOR, VisualizeLocatorParams } from '../../../common/locator';
 import { getUiActions } from '../../services';
 import { VISUALIZE_EDITOR_TRIGGER } from '../../triggers';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts
index f8934e0aeb5a9..ebc17b1e32c91 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.test.ts
@@ -6,13 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getSavedSearch } from '../../../../discover/public';
-import type {
-  VisualizeInput,
-  VisSavedObject,
-  Vis,
-  VisParams,
-} from 'src/plugins/visualizations/public';
+import { getSavedSearch } from '@kbn/discover-plugin/public';
+import type { VisualizeInput, VisSavedObject, Vis, VisParams } from '../..';
 import {
   getVisualizationInstance,
   getVisualizationInstanceFromInput,
@@ -43,7 +38,7 @@ jest.mock('../../vis_async', () => ({
 }));
 const { createVisAsync } = jest.requireMock('../../vis_async');
 
-jest.mock('../../../../discover/public', () => ({
+jest.mock('@kbn/discover-plugin/public', () => ({
   getSavedSearch: jest.fn().mockResolvedValue({
     id: 'savedSearch',
     title: 'savedSearchTitle',
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts
index dda06717257df..60947ce0dbd6f 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualization_instance.ts
@@ -6,24 +6,24 @@
  * Side Public License, v 1.
  */
 
+import { cloneDeep } from 'lodash';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
+import type { ExpressionValueError } from '@kbn/expressions-plugin/public';
+import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '@kbn/kibana-utils-plugin/common';
+import {
+  getSavedSearch,
+  SavedSearch,
+  throwErrorOnSavedSearchUrlConflict,
+} from '@kbn/discover-plugin/public';
+import { createVisAsync } from '../../vis_async';
+import { convertToSerializedVis, getSavedVisualization } from '../../utils/saved_visualize_utils';
 import {
   SerializedVis,
   Vis,
   VisSavedObject,
   VisualizeEmbeddableContract,
   VisualizeInput,
-} from 'src/plugins/visualizations/public';
-import { cloneDeep } from 'lodash';
-import type { SerializedSearchSourceFields } from 'src/plugins/data/public';
-import type { ExpressionValueError } from 'src/plugins/expressions/public';
-import { createVisAsync } from '../../vis_async';
-import { convertToSerializedVis, getSavedVisualization } from '../../utils/saved_visualize_utils';
-import { SavedFieldNotFound, SavedFieldTypeInvalidForAgg } from '../../../../kibana_utils/common';
-import {
-  getSavedSearch,
-  SavedSearch,
-  throwErrorOnSavedSearchUrlConflict,
-} from '../../../../discover/public';
+} from '../..';
 import type { VisualizeServices } from '../types';
 
 function isErrorRelatedToRuntimeFields(error: ExpressionValueError['error']) {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts
index 7fe571b25f98c..13dd9e3891fb6 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.test.ts
@@ -7,10 +7,10 @@
  */
 
 import { getVisualizeListItemLink } from './get_visualize_list_item_link';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { createHashHistory } from 'history';
 import { FilterStateStore } from '@kbn/es-query';
-import { createKbnUrlStateStorage } from '../../../../kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { GLOBAL_STATE_STORAGE_KEY } from '../../../common/constants';
 
 jest.mock('../../services', () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts
index bfbd0721b5b2c..fc41486fae84a 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/get_visualize_list_item_link.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
-import { QueryState } from '../../../../data/public';
-import { setStateToKbnUrl } from '../../../../kibana_utils/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+import { QueryState } from '@kbn/data-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { getUISettings } from '../../services';
 import { GLOBAL_STATE_STORAGE_KEY, VISUALIZE_APP_NAME } from '../../../common/constants';
 
diff --git a/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts b/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts
index fd92dc8259a1f..9c7beafdeb22d 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/migrate_legacy_query.ts
@@ -7,7 +7,7 @@
  */
 
 import { has } from 'lodash';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 /**
  * Creates a standardized query object from old queries that were either strings or pure ES query DSL
diff --git a/src/plugins/visualizations/public/visualize_app/utils/mocks.ts b/src/plugins/visualizations/public/visualize_app/utils/mocks.ts
index 4ac506e470ef2..65bad216859ef 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/mocks.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/mocks.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { VisualizeServices } from '../types';
 
 export const createVisualizeServicesMock = () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts b/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
index d40f15aa08657..904da850fc096 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/split_chart_warning_helpers.ts
@@ -7,19 +7,29 @@
  */
 
 import { $Values } from '@kbn/utility-types';
-import { AggConfigs } from '../../../../data/common';
-import { NEW_HEATMAP_CHARTS_LIBRARY, NEW_GAUGE_CHARTS_LIBRARY } from '../constants';
+import { AggConfigs } from '@kbn/data-plugin/common';
+import {
+  NEW_HEATMAP_CHARTS_LIBRARY,
+  NEW_GAUGE_CHARTS_LIBRARY,
+  NEW_PIE_CHARTS_LIBRARY,
+} from '../constants';
 
 export const CHARTS_WITHOUT_SMALL_MULTIPLES = {
   heatmap: 'heatmap',
   gauge: 'gauge',
 } as const;
 
+export const CHARTS_TO_BE_DEPRECATED = {
+  pie: 'pie',
+} as const;
+
 export type CHARTS_WITHOUT_SMALL_MULTIPLES = $Values<typeof CHARTS_WITHOUT_SMALL_MULTIPLES>;
+export type CHARTS_TO_BE_DEPRECATED = $Values<typeof CHARTS_TO_BE_DEPRECATED>;
 
 export const CHARTS_CONFIG_TOKENS = {
   [CHARTS_WITHOUT_SMALL_MULTIPLES.heatmap]: NEW_HEATMAP_CHARTS_LIBRARY,
   [CHARTS_WITHOUT_SMALL_MULTIPLES.gauge]: NEW_GAUGE_CHARTS_LIBRARY,
+  [CHARTS_TO_BE_DEPRECATED.pie]: NEW_PIE_CHARTS_LIBRARY,
 } as const;
 
 export const isSplitChart = (chartType: string | undefined, aggs?: AggConfigs) => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts
index 6ea5fcec88924..0160ce66556ea 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.test.ts
@@ -8,7 +8,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
-import { chromeServiceMock } from '../../../../../../core/public/mocks';
+import { chromeServiceMock } from '@kbn/core/public/mocks';
 import { useChromeVisibility } from './use_chrome_visibility';
 
 describe('useChromeVisibility', () => {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts
index 574d62d0854b6..b843e7526e586 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_chrome_visibility.ts
@@ -7,7 +7,7 @@
  */
 
 import { useState, useEffect } from 'react';
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
 
 export const useChromeVisibility = (chrome: ChromeStart) => {
   const [isVisible, setIsVisible] = useState<boolean>();
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts
index e8cedb3c4a5f9..93f9e2ae0b0a4 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_saved_vis_instance.test.ts
@@ -10,13 +10,13 @@ import { renderHook } from '@testing-library/react-hooks';
 import { EventEmitter } from 'events';
 
 import { setTypes } from '../../../services';
-import { coreMock } from '../../../../../../core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { useSavedVisInstance } from './use_saved_vis_instance';
-import { redirectWhenMissing } from '../../../../../kibana_utils/public';
+import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
 import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';
 import { VisualizeConstants } from '../../../../common/constants';
 import { createVisEditorsRegistry } from '../../../vis_editors_registry';
-import { createEmbeddableStateTransferMock } from '../../../../../embeddable/public/mocks';
+import { createEmbeddableStateTransferMock } from '@kbn/embeddable-plugin/public/mocks';
 import type { VisualizeServices } from '../../types';
 import type { TypesStart } from '../../../vis_types';
 
@@ -50,8 +50,8 @@ jest.mock('../breadcrumbs', () => ({
   getCreateBreadcrumbs: jest.fn((text) => text),
 }));
 
-jest.mock('../../../../../kibana_utils/public', () => {
-  const actual = jest.requireActual('../../../../../kibana_utils/public');
+jest.mock('@kbn/kibana-utils-plugin/public', () => {
+  const actual = jest.requireActual('@kbn/kibana-utils-plugin/public');
   return {
     ...actual,
     redirectWhenMissing: jest.fn(),
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts
index 366092d327d9b..37495fea848cd 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_vis_byvalue.ts
@@ -8,7 +8,7 @@
 
 import { EventEmitter } from 'events';
 import { useEffect, useRef, useState } from 'react';
-import { VisualizeInput } from 'src/plugins/visualizations/public';
+import { VisualizeInput } from '../../..';
 import { ByValueVisInstance, VisualizeServices, IEditorController } from '../../types';
 import { getVisualizationInstanceFromInput } from '../get_visualization_instance';
 import { getEditBreadcrumbs } from '../breadcrumbs';
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts
index 0a64371a16e34..61b1853c0f241 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.test.ts
@@ -18,12 +18,12 @@ import { createVisualizeServicesMock } from '../mocks';
 
 jest.mock('../utils');
 jest.mock('../create_visualize_app_state');
-jest.mock('../../../../../data/public');
+jest.mock('@kbn/data-plugin/public');
 
 describe('useVisualizeAppState', () => {
   const { visStateToEditorState } = jest.requireMock('../utils');
   const { createVisualizeAppState } = jest.requireMock('../create_visualize_app_state');
-  const { connectToQueryState } = jest.requireMock('../../../../../data/public');
+  const { connectToQueryState } = jest.requireMock('@kbn/data-plugin/public');
   const stopStateSyncMock = jest.fn();
   const stateContainerGetStateMock = jest.fn(() => visualizeAppStateStub);
   const stopSyncingAppFiltersMock = jest.fn();
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
index c6e8f9efdd035..70f3413da0419 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
@@ -13,13 +13,9 @@ import { EventEmitter } from 'events';
 import { i18n } from '@kbn/i18n';
 import { FilterStateStore } from '@kbn/es-query';
 
-import {
-  KibanaThemeProvider,
-  MarkdownSimple,
-  toMountPoint,
-} from '../../../../../kibana_react/public';
+import { KibanaThemeProvider, MarkdownSimple, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { connectToQueryState } from '@kbn/data-plugin/public';
 import { migrateLegacyQuery } from '../migrate_legacy_query';
-import { connectToQueryState } from '../../../../../data/public';
 import {
   VisualizeServices,
   VisualizeAppStateContainer,
diff --git a/src/plugins/visualizations/public/visualize_app/utils/utils.ts b/src/plugins/visualizations/public/visualize_app/utils/utils.ts
index 6f71cb33e7321..27d15ddc84d90 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/utils.ts
+++ b/src/plugins/visualizations/public/visualize_app/utils/utils.ts
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type { History } from 'history';
-import type { ChromeStart, DocLinksStart } from 'kibana/public';
+import type { ChromeStart, DocLinksStart } from '@kbn/core/public';
 import type { Filter } from '@kbn/es-query';
-import { redirectWhenMissing } from '../../../../kibana_utils/public';
+import { redirectWhenMissing } from '@kbn/kibana-utils-plugin/public';
 import { VisualizeConstants } from '../../../common/constants';
 import { convertFromSerializedVis } from '../../utils/saved_visualize_utils';
 import type { VisualizeServices, VisualizeEditorVisInstance } from '../types';
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
index ae9d13b879cf7..f7dbd4c484fba 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TypesStart, BaseVisType, VisGroups } from '../../vis_types';
 import { GroupSelection } from './group_selection';
-import { DocLinksStart } from '../../../../../core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 describe('GroupSelection', () => {
   const defaultVisTypeParams = {
diff --git a/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx b/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
index bd6e64597ec8f..d380c4244ad25 100644
--- a/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/group_selection/group_selection.tsx
@@ -28,7 +28,7 @@ import {
   EuiDescriptionList,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DocLinksStart } from '../../../../../core/public';
+import { DocLinksStart } from '@kbn/core/public';
 import type { BaseVisType, TypesStart } from '../../vis_types';
 import { VisGroups } from '../../vis_types/vis_groups_enum';
 import type { VisTypeAlias } from '../../vis_types/vis_type_alias_registry';
diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
index ae65251409c20..d807091f45438 100644
--- a/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
+++ b/src/plugins/visualizations/public/wizard/new_vis_modal.test.tsx
@@ -10,8 +10,8 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TypesStart, VisGroups, BaseVisType } from '../vis_types';
 import NewVisModal from './new_vis_modal';
-import { ApplicationStart, SavedObjectsStart, DocLinksStart } from '../../../../core/public';
-import { embeddablePluginMock } from '../../../embeddable/public/mocks';
+import { ApplicationStart, SavedObjectsStart, DocLinksStart } from '@kbn/core/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 describe('NewVisModal', () => {
   const defaultVisTypeParams = {
diff --git a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
index 2620ae01aa15a..839ba364719a2 100644
--- a/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
+++ b/src/plugins/visualizations/public/wizard/new_vis_modal.tsx
@@ -17,13 +17,13 @@ import {
   IUiSettingsClient,
   SavedObjectsStart,
   DocLinksStart,
-} from '../../../../core/public';
+} from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 import { SearchSelection } from './search_selection';
 import { GroupSelection } from './group_selection';
 import { AggBasedSelection } from './agg_based_selection';
 import type { TypesStart, BaseVisType, VisTypeAlias } from '../vis_types';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
-import { EmbeddableStateTransfer } from '../../../embeddable/public';
 import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
 import './dialog.scss';
 
diff --git a/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx b/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx
index 9d9098f00b753..e6179593de8d6 100644
--- a/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/search_selection/search_selection.tsx
@@ -10,9 +10,9 @@ import { EuiModalBody, EuiModalHeader, EuiModalHeaderTitle } from '@elastic/eui'
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { IUiSettingsClient, SavedObjectsStart } from '../../../../../core/public';
+import { IUiSettingsClient, SavedObjectsStart } from '@kbn/core/public';
 
-import { SavedObjectFinderUi } from '../../../../../plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import type { BaseVisType } from '../../vis_types';
 import { DialogNavigation } from '../dialog_navigation';
 
diff --git a/src/plugins/visualizations/public/wizard/show_new_vis.tsx b/src/plugins/visualizations/public/wizard/show_new_vis.tsx
index 13e8cd1851bf1..2df53fbfd078e 100644
--- a/src/plugins/visualizations/public/wizard/show_new_vis.tsx
+++ b/src/plugins/visualizations/public/wizard/show_new_vis.tsx
@@ -10,7 +10,7 @@ import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { EuiPortal, EuiProgress } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaThemeProvider } from '../../../kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   getHttp,
   getSavedObjects,
diff --git a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
index 24b05ca80d760..42fcc34984b4d 100644
--- a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
+++ b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
@@ -10,8 +10,8 @@ import semverGte from 'semver/functions/gte';
 import { makeVisualizeEmbeddableFactory } from './make_visualize_embeddable_factory';
 import { getAllMigrations } from '../migrations/visualization_saved_object_migrations';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SerializedSearchSourceFields } from 'src/plugins/data/public';
-import { GetMigrationFunctionObjectFn } from 'src/plugins/kibana_utils/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
+import { GetMigrationFunctionObjectFn } from '@kbn/kibana-utils-plugin/common';
 
 describe('embeddable migrations', () => {
   test('should have same versions registered as saved object migrations versions (>7.13.0)', () => {
diff --git a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
index 614ebdd104319..e9dd45e1f84fc 100644
--- a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
+++ b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
@@ -7,15 +7,15 @@
  */
 
 import { flow, mapValues } from 'lodash';
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SerializedSearchSourceFields } from 'src/plugins/data/public';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/public';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
   MigrateFunction,
-} from '../../../kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import {
   commonAddSupportOfDualIndexSelectionModeInTSVB,
   commonHideTSVBLastValueIndicator,
diff --git a/src/plugins/visualizations/server/index.ts b/src/plugins/visualizations/server/index.ts
index f10caf44b3ccd..8ced8ed138b90 100644
--- a/src/plugins/visualizations/server/index.ts
+++ b/src/plugins/visualizations/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from '../../../core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { VisualizationsPlugin } from './plugin';
 
 export { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
diff --git a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts
index 083e1ae51575b..99dbf548e6f44 100644
--- a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts
+++ b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.test.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 const savedObjectMigrationContext = null as unknown as SavedObjectMigrationContext;
 
diff --git a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
index e480d03e137ae..4b729afa62307 100644
--- a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
+++ b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
@@ -7,12 +7,12 @@
  */
 
 import { cloneDeep, get, omit, has, flow, forOwn, mapValues } from 'lodash';
-import type { SavedObjectMigrationFn, SavedObjectMigrationMap } from 'kibana/server';
-import { mergeSavedObjectMigrationMaps } from '../../../../core/server';
-import { MigrateFunctionsObject, MigrateFunction } from '../../../kibana_utils/common';
+import type { SavedObjectMigrationFn, SavedObjectMigrationMap } from '@kbn/core/server';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
+import { MigrateFunctionsObject, MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 
-import { DEFAULT_QUERY_LANGUAGE, SerializedSearchSourceFields } from '../../../data/common';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../data_views/common';
+import { DEFAULT_QUERY_LANGUAGE, SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import {
   commonAddSupportOfDualIndexSelectionModeInTSVB,
   commonHideTSVBLastValueIndicator,
diff --git a/src/plugins/visualizations/server/plugin.ts b/src/plugins/visualizations/server/plugin.ts
index 7ad8a44200bc1..eabea76bd31c9 100644
--- a/src/plugins/visualizations/server/plugin.ts
+++ b/src/plugins/visualizations/server/plugin.ts
@@ -9,21 +9,21 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { PluginSetup as DataPluginSetup } from 'src/plugins/data/server';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
-import { registerVisualizationsCollector } from './usage_collector';
-import { capabilitiesProvider } from './capabilities_provider';
-
-import type { VisualizationsPluginSetup, VisualizationsPluginStart } from './types';
+import { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
 import type {
   PluginInitializerContext,
   CoreSetup,
   CoreStart,
   Plugin,
   Logger,
-} from '../../../core/server';
-import type { UsageCollectionSetup } from '../../usage_collection/server';
-import type { EmbeddableSetup } from '../../embeddable/server';
+} from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
+import { registerVisualizationsCollector } from './usage_collector';
+import { capabilitiesProvider } from './capabilities_provider';
+
+import type { VisualizationsPluginSetup, VisualizationsPluginStart } from './types';
 import { makeVisualizeEmbeddableFactory } from './embeddable/make_visualize_embeddable_factory';
 import { getVisualizationSavedObjectType } from './saved_objects';
 
diff --git a/src/plugins/visualizations/server/saved_objects/visualization.ts b/src/plugins/visualizations/server/saved_objects/visualization.ts
index c27d406ab29fe..30d60a36abcfc 100644
--- a/src/plugins/visualizations/server/saved_objects/visualization.ts
+++ b/src/plugins/visualizations/server/saved_objects/visualization.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType } from 'kibana/server';
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { SavedObjectsType } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { getAllMigrations } from '../migrations/visualization_saved_object_migrations';
 
 export const getVisualizationSavedObjectType = (
diff --git a/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts b/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts
index ab31d622e62c7..38e0036feec24 100644
--- a/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/visualizations/server/usage_collector/get_usage_collector.test.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 import { getStats } from './get_usage_collector';
-import type { SavedObjectsClientContract } from '../../../../core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const defaultMockSavedObjects = [
   {
diff --git a/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts b/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts
index c2fa148cf121c..f53b4b01864c5 100644
--- a/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/visualizations/server/usage_collector/get_usage_collector.ts
@@ -7,10 +7,10 @@
  */
 
 import { countBy, groupBy, mapValues, max, min, values } from 'lodash';
+import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
 import { getPastDays } from './get_past_days';
 
-import type { SavedObjectsClientContract, SavedObjectsFindResult } from '../../../../core/server';
-import type { SavedVisState } from '../../../visualizations/common';
+import type { SavedVisState } from '../../common';
 
 interface VisSummary {
   type: string;
diff --git a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts
index e8f9df8516632..9f0fbd6571cde 100644
--- a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts
+++ b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.test.ts
@@ -8,7 +8,7 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
 import { registerVisualizationsCollector } from './register_visualizations_collector';
 
diff --git a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts
index b7ca4268c9a89..bf00e83be4b87 100644
--- a/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts
+++ b/src/plugins/visualizations/server/usage_collector/register_visualizations_collector.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getStats, VisualizationUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../usage_collection/server';
 
 export function registerVisualizationsCollector(collectorSet: UsageCollectionSetup) {
   const collector = collectorSet.makeUsageCollector<VisualizationUsage | undefined>({
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts
index bda7ec2aadebb..31c9302e5ece8 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/custom_shipper.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import type { Event, IShipper } from 'src/core/public';
+import type { Event, IShipper } from '@kbn/core/public';
 
 export class CustomShipper implements IShipper {
   public static shipperName = 'FTR-helpers-shipper';
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
index 463cb6f8d6172..21789d0aab005 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/plugin.ts
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ReplaySubject } from 'rxjs';
-import { filter, take, toArray } from 'rxjs/operators';
-import type { Plugin, CoreSetup, Event } from 'src/core/public';
+import { ReplaySubject, firstValueFrom, filter, take, toArray } from 'rxjs';
+import type { Plugin, CoreSetup, Event } from '@kbn/core/public';
 import { CustomShipper } from './custom_shipper';
 import './types';
 
@@ -23,8 +22,8 @@ export class AnalyticsFTRHelpers implements Plugin {
         analytics.optIn({ global: { enabled: optIn } });
       },
       getLastEvents: async (takeNumberOfEvents, eventTypes = []) =>
-        this.events$
-          .pipe(
+        firstValueFrom(
+          this.events$.pipe(
             filter((event) => {
               if (eventTypes.length > 0) {
                 return eventTypes.includes(event.event_type);
@@ -34,7 +33,7 @@ export class AnalyticsFTRHelpers implements Plugin {
             take(takeNumberOfEvents),
             toArray()
           )
-          .toPromise(),
+        ),
     };
   }
   public start() {}
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts
index 413335ee8293f..0b4cd0ec731b9 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Event, EventType } from 'src/core/public';
+import type { Event, EventType } from '@kbn/core/public';
 
 declare global {
   interface Window {
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts
index e9d8c3b609209..0feb1f2d13e7c 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/custom_shipper.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import type { IShipper, Event } from 'src/core/server';
+import type { IShipper, Event } from '@kbn/core/server';
 
 export class CustomShipper implements IShipper {
   public static shipperName = 'FTR-helpers-shipper';
diff --git a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
index 26d61e2e5355f..b5cdea559b11b 100644
--- a/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_ftr_helpers/server/plugin.ts
@@ -6,10 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { ReplaySubject } from 'rxjs';
+import { firstValueFrom, ReplaySubject, filter, take, toArray } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import type { Plugin, CoreSetup, Event } from 'src/core/server';
-import { filter, take, toArray } from 'rxjs/operators';
+import type { Plugin, CoreSetup, Event } from '@kbn/core/server';
 import { CustomShipper } from './custom_shipper';
 
 export class AnalyticsFTRHelpers implements Plugin {
@@ -52,8 +51,8 @@ export class AnalyticsFTRHelpers implements Plugin {
       async (context, req, res) => {
         const { takeNumberOfEvents, eventTypes } = req.query;
 
-        const events = await events$
-          .pipe(
+        const events = await firstValueFrom(
+          events$.pipe(
             filter((event) => {
               if (eventTypes.length > 0) {
                 return eventTypes.includes(event.event_type);
@@ -63,7 +62,7 @@ export class AnalyticsFTRHelpers implements Plugin {
             take(takeNumberOfEvents),
             toArray()
           )
-          .toPromise();
+        );
 
         return res.ok({ body: events });
       }
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts
index a0d943736db4f..ce1c5798cb6e9 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/custom_shipper.ts
@@ -8,7 +8,7 @@
 
 import { Subject } from 'rxjs';
 import { TelemetryCounterType } from '@elastic/analytics';
-import type { Event, EventContext, IShipper, TelemetryCounter } from 'src/core/public';
+import type { Event, EventContext, IShipper, TelemetryCounter } from '@kbn/core/public';
 
 export interface Action {
   action: string;
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
index 021a57f126612..d98fddfc6943b 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { BehaviorSubject, ReplaySubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, ReplaySubject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
-import type { Plugin, CoreSetup, TelemetryCounter, CoreStart } from 'src/core/public';
+import type { Plugin, CoreSetup, TelemetryCounter, CoreStart } from '@kbn/core/public';
 import type { Action } from './custom_shipper';
 import { CustomShipper } from './custom_shipper';
 import './types';
@@ -55,7 +55,7 @@ export class AnalyticsPluginA implements Plugin {
 
     window.__analyticsPluginA__ = {
       getLastActions: async (takeNumberOfActions: number) =>
-        this.actions$.pipe(take(takeNumberOfActions), toArray()).toPromise(),
+        firstValueFrom(this.actions$.pipe(take(takeNumberOfActions), toArray())),
       stats,
       setOptIn(optIn: boolean) {
         analytics.optIn({ global: { enabled: optIn } });
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts
index 37203512e3674..fd6836bd4d699 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { TelemetryCounter } from 'src/core/public';
+import type { TelemetryCounter } from '@kbn/core/public';
 import type { Action } from './custom_shipper';
 
 declare global {
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts
index 949623314e603..fe4e83d9f306c 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/custom_shipper.ts
@@ -8,7 +8,7 @@
 
 import { Subject } from 'rxjs';
 import { TelemetryCounterType } from '@elastic/analytics';
-import type { IShipper, Event, EventContext, TelemetryCounter } from 'src/core/server';
+import type { IShipper, Event, EventContext, TelemetryCounter } from '@kbn/core/server';
 
 export interface Action {
   action: string;
diff --git a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
index 1abb73c09b37a..8ee729a8346bb 100644
--- a/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
+++ b/test/analytics/__fixtures__/plugins/analytics_plugin_a/server/plugin.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { BehaviorSubject, ReplaySubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, ReplaySubject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
-import type { Plugin, CoreSetup, CoreStart, TelemetryCounter } from 'src/core/server';
+import type { Plugin, CoreSetup, CoreStart, TelemetryCounter } from '@kbn/core/server';
 import type { Action } from './custom_shipper';
 import { CustomShipper } from './custom_shipper';
 
@@ -61,13 +61,18 @@ export class AnalyticsPluginAPlugin implements Plugin {
         validate: {
           query: schema.object({
             takeNumberOfCounters: schema.number({ min: 1 }),
+            eventType: schema.string(),
           }),
         },
       },
       async (context, req, res) => {
-        const { takeNumberOfCounters } = req.query;
+        const { takeNumberOfCounters, eventType } = req.query;
 
-        return res.ok({ body: stats.slice(-takeNumberOfCounters) });
+        return res.ok({
+          body: stats
+            .filter((counter) => counter.event_type === eventType)
+            .slice(-takeNumberOfCounters),
+        });
       }
     );
 
@@ -83,7 +88,7 @@ export class AnalyticsPluginAPlugin implements Plugin {
       async (context, req, res) => {
         const { takeNumberOfActions } = req.query;
 
-        const actions = await actions$.pipe(take(takeNumberOfActions), toArray()).toPromise();
+        const actions = await firstValueFrom(actions$.pipe(take(takeNumberOfActions), toArray()));
 
         return res.ok({ body: actions });
       }
diff --git a/test/analytics/config.ts b/test/analytics/config.ts
index 46fa5d892997a..1ecac5af0d01a 100644
--- a/test/analytics/config.ts
+++ b/test/analytics/config.ts
@@ -34,6 +34,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       ...functionalConfig.get('kbnTestServer'),
       serverArgs: [
         ...functionalConfig.get('kbnTestServer.serverArgs'),
+        // Disabling telemetry so it doesn't call opt-in before the tests run.
+        '--telemetry.enabled=false',
         `--plugin-path=${path.resolve(__dirname, './__fixtures__/plugins/analytics_plugin_a')}`,
         `--plugin-path=${path.resolve(__dirname, './__fixtures__/plugins/analytics_ftr_helpers')}`,
       ],
diff --git a/test/analytics/services/kibana_ebt.ts b/test/analytics/services/kibana_ebt.ts
index cdb6e5ae28d95..fd64cbbbc0105 100644
--- a/test/analytics/services/kibana_ebt.ts
+++ b/test/analytics/services/kibana_ebt.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
-import '../__fixtures__/plugins/analytics_ftr_helpers/public/types';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
+import '@kbn/analytics-ftr-helpers-plugin/public/types';
 
 export function KibanaEBTServerProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/analytics/tests/analytics_from_the_browser.ts b/test/analytics/tests/analytics_from_the_browser.ts
index 9c866204ce18e..7acabf2112c5d 100644
--- a/test/analytics/tests/analytics_from_the_browser.ts
+++ b/test/analytics/tests/analytics_from_the_browser.ts
@@ -7,10 +7,10 @@
  */
 
 import expect from '@kbn/expect';
-import type { TelemetryCounter } from 'src/core/server';
+import type { TelemetryCounter } from '@kbn/core/server';
+import { Action } from '@kbn/analytics-plugin-a-plugin/server/custom_shipper';
 import { FtrProviderContext } from '../services';
-import { Action } from '../__fixtures__/plugins/analytics_plugin_a/server/custom_shipper';
-import '../__fixtures__/plugins/analytics_plugin_a/public/types';
+import '@kbn/analytics-plugin-a-plugin/public/types';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const { common } = getPageObjects(['common']);
@@ -23,7 +23,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     ): Promise<TelemetryCounter[]> => {
       return await browser.execute(
         ({ takeNumberOfCounters }) =>
-          window.__analyticsPluginA__.stats.slice(-takeNumberOfCounters),
+          window.__analyticsPluginA__.stats
+            .filter((counter) => counter.event_type === 'test-plugin-lifecycle')
+            .slice(-takeNumberOfCounters),
         { takeNumberOfCounters: _takeNumberOfCounters }
       );
     };
@@ -70,6 +72,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(context).to.have.property('user_agent');
       expect(context.user_agent).to.be.a('string');
 
+      const reportEventContext = actions[2].meta[1].context;
+      expect(reportEventContext).to.have.property('user_agent');
+      expect(reportEventContext.user_agent).to.be.a('string');
+
       expect(actions).to.eql([
         { action: 'optIn', meta: true },
         { action: 'extendContext', meta: context },
@@ -85,7 +91,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             {
               timestamp: actions[2].meta[1].timestamp,
               event_type: 'test-plugin-lifecycle',
-              context,
+              context: reportEventContext,
               properties: { plugin: 'analyticsPluginA', step: 'start' },
             },
           ],
@@ -103,7 +109,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         {
           timestamp: actions[2].meta[1].timestamp,
           event_type: 'test-plugin-lifecycle',
-          context,
+          context: reportEventContext,
           properties: { plugin: 'analyticsPluginA', step: 'start' },
         },
       ]);
diff --git a/test/analytics/tests/analytics_from_the_server.ts b/test/analytics/tests/analytics_from_the_server.ts
index 8555d91031d27..e5e3573b20fcd 100644
--- a/test/analytics/tests/analytics_from_the_server.ts
+++ b/test/analytics/tests/analytics_from_the_server.ts
@@ -7,9 +7,9 @@
  */
 
 import expect from '@kbn/expect';
-import type { TelemetryCounter } from 'src/core/server';
+import type { TelemetryCounter } from '@kbn/core/server';
+import { Action } from '@kbn/analytics-plugin-a-plugin/server/custom_shipper';
 import { FtrProviderContext } from '../services';
-import { Action } from '../__fixtures__/plugins/analytics_plugin_a/server/custom_shipper';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -20,7 +20,7 @@ export default function ({ getService }: FtrProviderContext) {
   ): Promise<TelemetryCounter[]> => {
     const resp = await supertest
       .get(`/internal/analytics_plugin_a/stats`)
-      .query({ takeNumberOfCounters })
+      .query({ takeNumberOfCounters, eventType: 'test-plugin-lifecycle' })
       .set('kbn-xsrf', 'xxx')
       .expect(200);
 
diff --git a/test/api_integration/apis/data_view_field_editor/field_preview.ts b/test/api_integration/apis/data_view_field_editor/field_preview.ts
index 4fea3229462d9..0c2446af541e9 100644
--- a/test/api_integration/apis/data_view_field_editor/field_preview.ts
+++ b/test/api_integration/apis/data_view_field_editor/field_preview.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { getErrorCodeFromErrorReason } from '../../../../src/plugins/data_view_field_editor/public/lib/runtime_field_validation';
+import { getErrorCodeFromErrorReason } from '@kbn/data-view-field-editor-plugin/public/lib/runtime_field_validation';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { API_BASE_PATH } from './constants';
 
diff --git a/test/api_integration/apis/index_patterns/constants.ts b/test/api_integration/apis/index_patterns/constants.ts
index 3de4f80dd657d..8194966bcdcb8 100644
--- a/test/api_integration/apis/index_patterns/constants.ts
+++ b/test/api_integration/apis/index_patterns/constants.ts
@@ -13,7 +13,7 @@ import {
   SERVICE_KEY,
   SERVICE_PATH,
   SERVICE_PATH_LEGACY,
-} from '../../../../src/plugins/data_views/server';
+} from '@kbn/data-views-plugin/server';
 
 const legacyConfig = {
   name: 'legacy index pattern api',
diff --git a/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts b/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts
index c32b9b4241206..2b3ffca019370 100644
--- a/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts
+++ b/test/api_integration/apis/index_patterns/deprecations/scripted_fields.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import type { DeprecationsGetResponse } from 'src/core/server/types';
+import type { DeprecationsGetResponse } from '@kbn/core/server/types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js
index d5ca92c371617..3f0b00c02f1ae 100644
--- a/test/api_integration/apis/index_patterns/es_errors/errors.js
+++ b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -15,7 +15,7 @@ import {
   createNoMatchingIndicesError,
   isNoMatchingIndicesError,
   convertEsError,
-} from '../../../../../src/plugins/data_views/server/fetcher/lib/errors';
+} from '@kbn/data-views-plugin/server/fetcher/lib/errors';
 
 import { getIndexNotFoundError, getDocNotFoundError } from './lib';
 
diff --git a/test/api_integration/apis/saved_objects/find.ts b/test/api_integration/apis/saved_objects/find.ts
index c8623f08e6f97..4afcc4f162a62 100644
--- a/test/api_integration/apis/saved_objects/find.ts
+++ b/test/api_integration/apis/saved_objects/find.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { SavedObject } from '@kbn/core/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { SavedObject } from '../../../../src/core/server';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts
index 205325ae745bb..0d9cfed365a00 100644
--- a/test/api_integration/apis/saved_objects/import.ts
+++ b/test/api_integration/apis/saved_objects/import.ts
@@ -9,7 +9,7 @@
 import expect from '@kbn/expect';
 import { join } from 'path';
 import dedent from 'dedent';
-import type { SavedObjectsImportFailure } from 'src/core/server';
+import type { SavedObjectsImportFailure } from '@kbn/core/server';
 import type { FtrProviderContext } from '../../ftr_provider_context';
 
 const createConflictError = (
diff --git a/test/api_integration/apis/search/bsearch.ts b/test/api_integration/apis/search/bsearch.ts
index 6aee2b542da0f..6b2cde859feb6 100644
--- a/test/api_integration/apis/search/bsearch.ts
+++ b/test/api_integration/apis/search/bsearch.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import request from 'superagent';
-import { inflateResponse } from '../../../../src/plugins/bfetch/public/streaming';
+import { inflateResponse } from '@kbn/bfetch-plugin/public/streaming';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { painlessErrReq } from './painless_err_req';
 import { verifyErrorResponse } from './verify_error';
diff --git a/test/api_integration/apis/telemetry/opt_in.ts b/test/api_integration/apis/telemetry/opt_in.ts
index 7e0564ac44a43..cbd2745976c6a 100644
--- a/test/api_integration/apis/telemetry/opt_in.ts
+++ b/test/api_integration/apis/telemetry/opt_in.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository';
+import { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/telemetry_repository';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
diff --git a/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts b/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts
index ec44cec39c29a..deb6218e145af 100644
--- a/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts
+++ b/test/api_integration/apis/telemetry/utils/schema_to_config_schema.ts
@@ -10,7 +10,7 @@ import type { ObjectType, Type } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
 import { set } from '@elastic/safer-lodash-set';
 import { get, merge } from 'lodash';
-import type { AllowedSchemaTypes } from 'src/plugins/usage_collection/server';
+import type { AllowedSchemaTypes } from '@kbn/usage-collection-plugin/server';
 
 /**
  * Type that defines all the possible values that the Telemetry Schema accepts.
diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts
index 019dcfd621655..9d3bfa9c25b81 100644
--- a/test/api_integration/apis/ui_counters/ui_counters.ts
+++ b/test/api_integration/apis/ui_counters/ui_counters.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 import { ReportManager, METRIC_TYPE, UiCounterMetricType, Report } from '@kbn/analytics';
 import moment from 'moment';
+import { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UsageCountersSavedObject } from '../../../../src/plugins/usage_collection/server';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/api_integration/services/supertest.ts b/test/api_integration/services/supertest.ts
index 709b9ddd75c22..6680c7b203bd5 100644
--- a/test/api_integration/services/supertest.ts
+++ b/test/api_integration/services/supertest.ts
@@ -8,10 +8,10 @@
 
 import { systemIndicesSuperuser } from '@kbn/test';
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import { format as formatUrl } from 'url';
 
 import supertest from 'supertest';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 export function KibanaSupertestProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
diff --git a/test/common/fixtures/plugins/coverage/public/plugin.ts b/test/common/fixtures/plugins/coverage/public/plugin.ts
index d611565550b45..0c7d3f238a27d 100644
--- a/test/common/fixtures/plugins/coverage/public/plugin.ts
+++ b/test/common/fixtures/plugins/coverage/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'kibana/server';
+import { Plugin } from '@kbn/core/server';
 
 declare global {
   interface Window {
diff --git a/test/common/fixtures/plugins/newsfeed/server/index.ts b/test/common/fixtures/plugins/newsfeed/server/index.ts
index 8077c979014d9..21e28f5435cc2 100644
--- a/test/common/fixtures/plugins/newsfeed/server/index.ts
+++ b/test/common/fixtures/plugins/newsfeed/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { PluginInitializerContext } from 'kibana/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 import { NewsFeedSimulatorPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/test/common/fixtures/plugins/newsfeed/server/plugin.ts b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
index a592a832532ce..85dadcfa8d7d2 100644
--- a/test/common/fixtures/plugins/newsfeed/server/plugin.ts
+++ b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import type { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 export class NewsFeedSimulatorPlugin implements Plugin {
   constructor(private readonly initializerContext: PluginInitializerContext) {}
diff --git a/test/common/services/bsearch.ts b/test/common/services/bsearch.ts
index d9fe89d9e4b9c..3c8a58c46867b 100644
--- a/test/common/services/bsearch.ts
+++ b/test/common/services/bsearch.ts
@@ -9,7 +9,7 @@
 import expect from '@kbn/expect';
 import request from 'superagent';
 import type SuperTest from 'supertest';
-import { IEsSearchResponse } from 'src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { RetryService } from './retry/retry';
 
diff --git a/test/common/services/es_archiver.ts b/test/common/services/es_archiver.ts
index 3212e80928686..f5b7ee8cc5885 100644
--- a/test/common/services/es_archiver.ts
+++ b/test/common/services/es_archiver.ts
@@ -8,7 +8,7 @@
 
 import { EsArchiver } from '@kbn/es-archiver';
 import { FtrProviderContext } from '../ftr_provider_context';
-import * as KibanaServer from '../../common/services/kibana_server';
+import * as KibanaServer from './kibana_server';
 
 export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiver {
   const config = getService('config');
diff --git a/test/common/services/index_patterns.ts b/test/common/services/index_patterns.ts
index 1e7e998ae24d9..316bafaa71fcc 100644
--- a/test/common/services/index_patterns.ts
+++ b/test/common/services/index_patterns.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { DataViewSpec } from '@kbn/data-plugin/common';
 import { FtrService } from '../ftr_provider_context';
-import { DataViewSpec } from '../../../src/plugins/data/common';
 
 export class IndexPatternsService extends FtrService {
   private readonly kibanaServer = this.ctx.getService('kibanaServer');
diff --git a/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts b/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts
index 79a29517780a7..389c877432493 100644
--- a/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts
+++ b/test/examples/data_view_field_editor_example/data_view_field_editor_example.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/data_view_field_editor_example/index.ts b/test/examples/data_view_field_editor_example/index.ts
index 6a5e76d767f50..f24eb0feddbc8 100644
--- a/test/examples/data_view_field_editor_example/index.ts
+++ b/test/examples/data_view_field_editor_example/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
diff --git a/test/examples/embeddables/adding_children.ts b/test/examples/embeddables/adding_children.ts
index dcc7467689a18..1b99413b184f7 100644
--- a/test/examples/embeddables/adding_children.ts
+++ b/test/examples/embeddables/adding_children.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts
index 6be6d833a8ddf..073b9d9ee3b86 100644
--- a/test/examples/embeddables/dashboard.ts
+++ b/test/examples/embeddables/dashboard.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 export const testDashboardInput = {
   panels: {
diff --git a/test/examples/embeddables/hello_world_embeddable.ts b/test/examples/embeddables/hello_world_embeddable.ts
index ba3897c0e473b..9e74246f2e2ba 100644
--- a/test/examples/embeddables/hello_world_embeddable.ts
+++ b/test/examples/embeddables/hello_world_embeddable.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/embeddables/index.ts b/test/examples/embeddables/index.ts
index b6ec314875566..9a3b07aab51dc 100644
--- a/test/examples/embeddables/index.ts
+++ b/test/examples/embeddables/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
diff --git a/test/examples/embeddables/list_container.ts b/test/examples/embeddables/list_container.ts
index b5fc35e84a956..d91dc9447b9e5 100644
--- a/test/examples/embeddables/list_container.ts
+++ b/test/examples/embeddables/list_container.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/embeddables/todo_embeddable.ts b/test/examples/embeddables/todo_embeddable.ts
index 351e89a20f4e5..a26d0f098429e 100644
--- a/test/examples/embeddables/todo_embeddable.ts
+++ b/test/examples/embeddables/todo_embeddable.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/expressions_explorer/expressions.ts b/test/examples/expressions_explorer/expressions.ts
index 9aef64a392a7b..9d55458426776 100644
--- a/test/examples/expressions_explorer/expressions.ts
+++ b/test/examples/expressions_explorer/expressions.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import testSubjSelector from '@kbn/test-subj-selector';
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/examples/expressions_explorer/index.ts b/test/examples/expressions_explorer/index.ts
index 843b3da369d81..ec826f66d8e27 100644
--- a/test/examples/expressions_explorer/index.ts
+++ b/test/examples/expressions_explorer/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
diff --git a/test/examples/field_formats/index.ts b/test/examples/field_formats/index.ts
index bbef5cca2e447..cafa84f862eaa 100644
--- a/test/examples/field_formats/index.ts
+++ b/test/examples/field_formats/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/examples/hello_world/index.ts b/test/examples/hello_world/index.ts
index d1a37968a9a6c..3215c92666b27 100644
--- a/test/examples/hello_world/index.ts
+++ b/test/examples/hello_world/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) {
diff --git a/test/examples/partial_results/index.ts b/test/examples/partial_results/index.ts
index 8fb2824163024..62d40652b4db5 100644
--- a/test/examples/partial_results/index.ts
+++ b/test/examples/partial_results/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/examples/routing/index.ts b/test/examples/routing/index.ts
index bef282c436a21..4c42931e267f1 100644
--- a/test/examples/routing/index.ts
+++ b/test/examples/routing/index.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) {
diff --git a/test/examples/state_sync/index.ts b/test/examples/state_sync/index.ts
index 83ab9edaa1cf0..d48f4d4d8ae64 100644
--- a/test/examples/state_sync/index.ts
+++ b/test/examples/state_sync/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
diff --git a/test/examples/state_sync/todo_app.ts b/test/examples/state_sync/todo_app.ts
index ed1deeb7901c1..68ed23c5a3eda 100644
--- a/test/examples/state_sync/todo_app.ts
+++ b/test/examples/state_sync/todo_app.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
diff --git a/test/examples/ui_actions/index.ts b/test/examples/ui_actions/index.ts
index 3827d9c8d641e..9c4dbaee9b860 100644
--- a/test/examples/ui_actions/index.ts
+++ b/test/examples/ui_actions/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({
diff --git a/test/examples/ui_actions/ui_actions.ts b/test/examples/ui_actions/ui_actions.ts
index 51a6c00d247e8..967a56252c0cb 100644
--- a/test/examples/ui_actions/ui_actions.ts
+++ b/test/examples/ui_actions/ui_actions.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: PluginFunctionalProviderContext) {
diff --git a/test/functional/apps/console/_vector_tile.ts b/test/functional/apps/console/_vector_tile.ts
new file mode 100644
index 0000000000000..b02db523b95ac
--- /dev/null
+++ b/test/functional/apps/console/_vector_tile.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'console', 'header', 'home']);
+  const retry = getService('retry');
+
+  describe('console vector tiles response validation', function describeIndexTests() {
+    before(async () => {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
+        useActualUrl: true,
+      });
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.home.addSampleDataSet('logs');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.common.navigateToApp('console');
+      await PageObjects.console.dismissTutorial();
+      await PageObjects.console.clearTextArea();
+    });
+
+    it('should validate response', async () => {
+      await PageObjects.console.enterText(`GET kibana_sample_data_logs/_mvt/geo.coordinates/0/0/0`);
+      await PageObjects.console.clickPlay();
+      await retry.try(async () => {
+        const actualResponse = await PageObjects.console.getResponse();
+        expect(actualResponse).to.contain('"meta": [');
+      });
+    });
+
+    after(async () => {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
+        useActualUrl: true,
+      });
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.home.removeSampleDataSet('logs');
+    });
+  });
+}
diff --git a/test/functional/apps/console/index.js b/test/functional/apps/console/index.js
index 7a1fb578b4e4a..c3d0553514cb5 100644
--- a/test/functional/apps/console/index.js
+++ b/test/functional/apps/console/index.js
@@ -18,5 +18,6 @@ export default function ({ getService, loadTestFile }) {
 
     loadTestFile(require.resolve('./_console'));
     loadTestFile(require.resolve('./_autocomplete'));
+    loadTestFile(require.resolve('./_vector_tile'));
   });
 }
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.ts b/test/functional/apps/dashboard/create_and_add_embeddables.ts
index d8bf67b6d2873..30100f0e1aa07 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.ts
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.ts
@@ -8,8 +8,8 @@
 
 import expect from '@kbn/expect';
 
-import { VisualizeConstants } from '../../../../src/plugins/visualizations/common/constants';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../src/plugins/visualizations/common/constants';
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '@kbn/visualizations-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard/dashboard_state.ts b/test/functional/apps/dashboard/dashboard_state.ts
index d3643753c8e83..d931475766776 100644
--- a/test/functional/apps/dashboard/dashboard_state.ts
+++ b/test/functional/apps/dashboard/dashboard_state.ts
@@ -9,8 +9,8 @@
 import expect from '@kbn/expect';
 import chroma from 'chroma-js';
 
+import { DEFAULT_PANEL_WIDTH } from '@kbn/dashboard-plugin/public/application/embeddable/dashboard_constants';
 import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dashboard_page';
-import { DEFAULT_PANEL_WIDTH } from '../../../../src/plugins/dashboard/public/application/embeddable/dashboard_constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard/panel_context_menu.ts b/test/functional/apps/dashboard/panel_context_menu.ts
index 337848f7864cc..8c82c162f5e86 100644
--- a/test/functional/apps/dashboard/panel_context_menu.ts
+++ b/test/functional/apps/dashboard/panel_context_menu.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
 import { PIE_CHART_VIS_NAME } from '../../page_objects/dashboard_page';
-import { VisualizeConstants } from '../../../../src/plugins/visualizations/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/dashboard/url_field_formatter.ts b/test/functional/apps/dashboard/url_field_formatter.ts
index be480066c0365..8e9dd7b66e79f 100644
--- a/test/functional/apps/dashboard/url_field_formatter.ts
+++ b/test/functional/apps/dashboard/url_field_formatter.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/discover/_data_view_editor.ts b/test/functional/apps/discover/_data_view_editor.ts
index c67964fddf93b..01954088ad941 100644
--- a/test/functional/apps/discover/_data_view_editor.ts
+++ b/test/functional/apps/discover/_data_view_editor.ts
@@ -14,10 +14,22 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const esArchiver = getService('esArchiver');
   const security = getService('security');
+  const config = getService('config');
   const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
+  const defaultIndexPatternString = config.get('esTestCluster.ccs')
+    ? 'ftr-remote:logstash-*'
+    : 'logstash-*';
   const defaultSettings = {
-    defaultIndex: 'logstash-*',
+    defaultIndex: defaultIndexPatternString,
   };
+  const localArchiveDirectory = 'test/functional/fixtures/kbn_archiver/discover';
+  const remoteArchiveDirectory = 'test/functional/fixtures/kbn_archiver/ccs/discover';
+  const esNode = config.get('esTestCluster.ccs')
+    ? getService('remoteEsArchiver' as 'esArchiver')
+    : esArchiver;
+  const kbnDirectory = config.get('esTestCluster.ccs')
+    ? remoteArchiveDirectory
+    : localArchiveDirectory;
 
   const createDataView = async (dataViewName: string) => {
     await PageObjects.discover.clickIndexPatternActions();
@@ -31,10 +43,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover integration with data view editor', function describeIndexTests() {
     before(async function () {
-      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
-      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      const roles = config.get('esTestCluster.ccs')
+        ? ['kibana_admin', 'test_logstash_reader', 'ccs_remote_search']
+        : ['kibana_admin', 'test_logstash_reader'];
+      await security.testUser.setRoles(roles);
+      await esNode.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.savedObjects.clean({ types: ['saved-search', 'index-pattern'] });
-      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
+      await kibanaServer.importExport.load(kbnDirectory);
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
@@ -42,12 +57,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
+      await kibanaServer.importExport.unload(kbnDirectory);
       await kibanaServer.savedObjects.clean({ types: ['saved-search', 'index-pattern'] });
     });
 
     it('allows creating a new data view', async function () {
-      const dataViewToCreate = 'logstash';
+      const dataViewToCreate = config.get('esTestCluster.ccs') ? 'ftr-remote:logstash' : 'logstash';
       await createDataView(dataViewToCreate);
       await PageObjects.header.waitUntilLoadingHasFinished();
       await retry.waitForWithTimeout(
diff --git a/test/functional/apps/discover/_field_data_with_fields_api.ts b/test/functional/apps/discover/_field_data_with_fields_api.ts
index 402783694cbd5..d7912d6d0959f 100644
--- a/test/functional/apps/discover/_field_data_with_fields_api.ts
+++ b/test/functional/apps/discover/_field_data_with_fields_api.ts
@@ -34,8 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
     });
-    // FLAKY: https://github.com/elastic/kibana/issues/127905
-    describe.skip('field data', function () {
+    describe('field data', function () {
       it('search php should show the correct hit count', async function () {
         const expectedHitCount = '445';
         await retry.try(async function () {
@@ -92,12 +91,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           hash.replace('columns:!()', 'columns:!(relatedContent)'),
           { useActualUrl: true }
         );
+
+        await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.try(async function tryingForTime() {
           expect(await PageObjects.discover.getDocHeader()).to.contain('relatedContent');
-        });
 
-        const field = await PageObjects.discover.getDocTableIndex(1);
-        expect(field).to.contain('relatedContent.url');
+          const field = await PageObjects.discover.getDocTableIndex(1);
+          expect(field).to.contain('relatedContent.url');
+        });
 
         const marks = await PageObjects.discover.getMarks();
         expect(marks.length).to.be.above(0);
diff --git a/test/functional/apps/discover/_saved_queries.ts b/test/functional/apps/discover/_saved_queries.ts
index fd49a03413321..79d49131df138 100644
--- a/test/functional/apps/discover/_saved_queries.ts
+++ b/test/functional/apps/discover/_saved_queries.ts
@@ -13,7 +13,6 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const log = getService('log');
-  const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
   const browser = getService('browser');
@@ -21,9 +20,30 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const queryBar = getService('queryBar');
   const savedQueryManagementComponent = getService('savedQueryManagementComponent');
   const testSubjects = getService('testSubjects');
+  const config = getService('config');
+  const localArchiveDirectories = {
+    nested: 'test/functional/fixtures/kbn_archiver/date_nested.json',
+    discover: 'test/functional/fixtures/kbn_archiver/discover.json',
+  };
+  const remoteArchiveDirectories = {
+    nested: 'test/functional/fixtures/kbn_archiver/ccs/date_nested.json',
+    discover: 'test/functional/fixtures/kbn_archiver/ccs/discover.json',
+  };
+  const logstashIndexPatternString = config.get('esTestCluster.ccs')
+    ? 'ftr-remote:logstash-*'
+    : 'logstash-*';
+  const dateNestedIndexPattern = config.get('esTestCluster.ccs')
+    ? 'ftr-remote:date-nested'
+    : 'date-nested';
   const defaultSettings = {
-    defaultIndex: 'logstash-*',
+    defaultIndex: logstashIndexPatternString,
   };
+  const esNode = config.get('esTestCluster.ccs')
+    ? getService('remoteEsArchiver' as 'esArchiver')
+    : getService('esArchiver');
+  const kbnArchives = config.get('esTestCluster.ccs')
+    ? remoteArchiveDirectories
+    : localArchiveDirectories;
 
   const from = 'Sep 20, 2015 @ 08:00:00.000';
   const to = 'Sep 21, 2015 @ 08:00:00.000';
@@ -34,7 +54,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     log.debug('set up a query with filters to save');
     await PageObjects.common.setTime({ from, to });
     await PageObjects.common.navigateToApp('discover');
-    await PageObjects.discover.selectIndexPattern('logstash-*');
+    await PageObjects.discover.selectIndexPattern(logstashIndexPatternString);
     await retry.try(async function tryingForTime() {
       const hitCount = await PageObjects.discover.getHitCount();
       expect(hitCount).to.be('4,731');
@@ -59,12 +79,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern', 'query'] });
 
-      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
-      await kibanaServer.importExport.load(
-        'test/functional/fixtures/kbn_archiver/date_nested.json'
-      );
-      await esArchiver.load('test/functional/fixtures/es_archiver/date_nested');
-      await esArchiver.load('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.importExport.load(kbnArchives.discover);
+      await kibanaServer.importExport.load(kbnArchives.nested);
+      await esNode.load('test/functional/fixtures/es_archiver/date_nested');
+      await esNode.load('test/functional/fixtures/es_archiver/logstash_functional');
 
       await kibanaServer.uiSettings.replace(defaultSettings);
       log.debug('discover');
@@ -72,12 +90,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
-      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/date_nested');
+      await kibanaServer.importExport.unload(kbnArchives.discover);
+      await kibanaServer.importExport.unload(kbnArchives.nested);
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern', 'query'] });
       await kibanaServer.savedObjects.clean({ types: ['search', 'query'] });
-      await esArchiver.unload('test/functional/fixtures/es_archiver/date_nested');
-      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+      await esNode.unload('test/functional/fixtures/es_archiver/date_nested');
+      await esNode.unload('test/functional/fixtures/es_archiver/logstash_functional');
       await PageObjects.common.unsetTime();
     });
 
@@ -102,14 +120,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(false);
         expect(await queryBar.getQueryString()).to.eql('');
 
-        await PageObjects.discover.selectIndexPattern('date-nested');
+        await PageObjects.discover.selectIndexPattern(dateNestedIndexPattern);
 
         expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(false);
         expect(await queryBar.getQueryString()).to.eql('');
 
-        await PageObjects.discover.selectIndexPattern('logstash-*');
+        await PageObjects.discover.selectIndexPattern(logstashIndexPatternString);
         const currentDataView = await PageObjects.discover.getCurrentlySelectedDataView();
-        expect(currentDataView).to.be('logstash-*');
+        expect(currentDataView).to.be(logstashIndexPatternString);
         await retry.try(async function tryingForTime() {
           const hitCount = await PageObjects.discover.getHitCount();
           expect(hitCount).to.be('4,731');
diff --git a/test/functional/apps/discover/_search_on_page_load.ts b/test/functional/apps/discover/_search_on_page_load.ts
index 3df6ce1c13c43..91943b28c6db0 100644
--- a/test/functional/apps/discover/_search_on_page_load.ts
+++ b/test/functional/apps/discover/_search_on_page_load.ts
@@ -18,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
   const testSubjects = getService('testSubjects');
+  const refreshButtonSelector = 'refreshDataButton';
 
   const defaultSettings = {
     defaultIndex: 'logstash-*',
@@ -58,63 +59,57 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/118432
-    describe.skip(`when it's false`, () => {
+    describe(`when it's false`, () => {
       beforeEach(async () => await initSearchOnPageLoad(false));
 
       it('should not fetch data from ES initially', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
       });
 
       it('should not fetch on indexPattern change', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
         await PageObjects.discover.selectIndexPattern('date-nested');
 
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
       });
 
       it('should fetch data from ES after refreshDataButton click', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
-        /**
-         * We should wait for debounce timeout expired 100 ms,
-         * otherwise click event will be skipped. See getFetch$ implementation.
-         */
-        await PageObjects.common.sleep(100);
-        await testSubjects.click('refreshDataButton');
+        await testSubjects.click(refreshButtonSelector);
+        await testSubjects.missingOrFail(refreshButtonSelector);
 
         await retry.waitFor('number of fetches to be 1', waitForFetches(1));
-        expect(await testSubjects.exists('refreshDataButton')).to.be(false);
       });
 
       it('should fetch data from ES after submit query', async function () {
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
         await queryBar.submitQuery();
+        await testSubjects.missingOrFail(refreshButtonSelector);
 
         await retry.waitFor('number of fetches to be 1', waitForFetches(1));
-        expect(await testSubjects.exists('refreshDataButton')).to.be(false);
       });
 
       it('should fetch data from ES after choosing commonly used time range', async function () {
         await PageObjects.discover.selectIndexPattern('logstash-*');
-        expect(await testSubjects.exists('refreshDataButton')).to.be(true);
+        expect(await testSubjects.exists(refreshButtonSelector)).to.be(true);
         await retry.waitFor('number of fetches to be 0', waitForFetches(0));
 
         await PageObjects.timePicker.setCommonlyUsedTime('This_week');
+        await testSubjects.missingOrFail(refreshButtonSelector);
 
         await retry.waitFor('number of fetches to be 1', waitForFetches(1));
-        expect(await testSubjects.exists('refreshDataButton')).to.be(false);
       });
     });
 
-    it(`when it's false should fetch data from ES initially`, async function () {
+    it(`when it's true should fetch data from ES initially`, async function () {
       await initSearchOnPageLoad(true);
       await retry.waitFor('number of fetches to be 1', waitForFetches(1));
     });
diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts
index 994cfeb851281..e2895f3ca56b4 100644
--- a/test/functional/apps/discover/index.ts
+++ b/test/functional/apps/discover/index.ts
@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
+  const config = getService('config');
 
   describe('discover app', function () {
     this.tags('ciGroup6');
@@ -23,38 +23,43 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
-    loadTestFile(require.resolve('./_saved_queries'));
-    loadTestFile(require.resolve('./_discover'));
-    loadTestFile(require.resolve('./_discover_histogram'));
-    loadTestFile(require.resolve('./_doc_table'));
-    loadTestFile(require.resolve('./_doc_table_newline'));
-    loadTestFile(require.resolve('./_filter_editor'));
-    loadTestFile(require.resolve('./_errors'));
-    loadTestFile(require.resolve('./_field_data'));
-    loadTestFile(require.resolve('./_field_data_with_fields_api'));
-    loadTestFile(require.resolve('./_shared_links'));
-    loadTestFile(require.resolve('./_sidebar'));
-    loadTestFile(require.resolve('./_source_filters'));
-    loadTestFile(require.resolve('./_large_string'));
-    loadTestFile(require.resolve('./_inspector'));
-    loadTestFile(require.resolve('./_classic_table_doc_navigation'));
-    loadTestFile(require.resolve('./_date_nanos'));
-    loadTestFile(require.resolve('./_date_nanos_mixed'));
-    loadTestFile(require.resolve('./_indexpattern_without_timefield'));
-    loadTestFile(require.resolve('./_discover_fields_api'));
-    loadTestFile(require.resolve('./_data_grid'));
-    loadTestFile(require.resolve('./_data_grid_context'));
-    loadTestFile(require.resolve('./_data_grid_field_data'));
-    loadTestFile(require.resolve('./_data_grid_doc_navigation'));
-    loadTestFile(require.resolve('./_data_grid_doc_table'));
-    loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
-    loadTestFile(require.resolve('./_runtime_fields_editor'));
-    loadTestFile(require.resolve('./_huge_fields'));
-    loadTestFile(require.resolve('./_date_nested'));
-    loadTestFile(require.resolve('./_search_on_page_load'));
-    loadTestFile(require.resolve('./_chart_hidden'));
-    loadTestFile(require.resolve('./_context_encoded_url_param'));
-    loadTestFile(require.resolve('./_data_view_editor'));
-    loadTestFile(require.resolve('./_empty_state'));
+    if (config.get('esTestCluster.ccs')) {
+      loadTestFile(require.resolve('./_data_view_editor'));
+      loadTestFile(require.resolve('./_saved_queries'));
+    } else {
+      loadTestFile(require.resolve('./_saved_queries'));
+      loadTestFile(require.resolve('./_discover'));
+      loadTestFile(require.resolve('./_discover_histogram'));
+      loadTestFile(require.resolve('./_doc_table'));
+      loadTestFile(require.resolve('./_doc_table_newline'));
+      loadTestFile(require.resolve('./_filter_editor'));
+      loadTestFile(require.resolve('./_errors'));
+      loadTestFile(require.resolve('./_field_data'));
+      loadTestFile(require.resolve('./_field_data_with_fields_api'));
+      loadTestFile(require.resolve('./_shared_links'));
+      loadTestFile(require.resolve('./_sidebar'));
+      loadTestFile(require.resolve('./_source_filters'));
+      loadTestFile(require.resolve('./_large_string'));
+      loadTestFile(require.resolve('./_inspector'));
+      loadTestFile(require.resolve('./_classic_table_doc_navigation'));
+      loadTestFile(require.resolve('./_date_nanos'));
+      loadTestFile(require.resolve('./_date_nanos_mixed'));
+      loadTestFile(require.resolve('./_indexpattern_without_timefield'));
+      loadTestFile(require.resolve('./_discover_fields_api'));
+      loadTestFile(require.resolve('./_data_grid'));
+      loadTestFile(require.resolve('./_data_grid_context'));
+      loadTestFile(require.resolve('./_data_grid_field_data'));
+      loadTestFile(require.resolve('./_data_grid_doc_navigation'));
+      loadTestFile(require.resolve('./_data_grid_doc_table'));
+      loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
+      loadTestFile(require.resolve('./_runtime_fields_editor'));
+      loadTestFile(require.resolve('./_huge_fields'));
+      loadTestFile(require.resolve('./_date_nested'));
+      loadTestFile(require.resolve('./_search_on_page_load'));
+      loadTestFile(require.resolve('./_chart_hidden'));
+      loadTestFile(require.resolve('./_context_encoded_url_param'));
+      loadTestFile(require.resolve('./_data_view_editor'));
+      loadTestFile(require.resolve('./_empty_state'));
+    }
   });
 }
diff --git a/test/functional/apps/management/_field_formatter.ts b/test/functional/apps/management/_field_formatter.ts
index 383e1e5e300a9..18672ceea1517 100644
--- a/test/functional/apps/management/_field_formatter.ts
+++ b/test/functional/apps/management/_field_formatter.ts
@@ -7,8 +7,8 @@
  */
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import expect from '@kbn/expect';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { FIELD_FORMAT_IDS } from '../../../../src/plugins/field_formats/common';
 import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/test/functional/apps/management/_index_pattern_filter.ts b/test/functional/apps/management/_index_pattern_filter.ts
index 732065282d546..edfd32952da49 100644
--- a/test/functional/apps/management/_index_pattern_filter.ts
+++ b/test/functional/apps/management/_index_pattern_filter.ts
@@ -16,7 +16,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   // FLAKY: https://github.com/elastic/kibana/issues/128558
-  describe.skip('index pattern filter', function describeIndexTests() {
+  // Failing: See https://github.com/elastic/kibana/issues/130190
+  describe.skip('data view filter', function describeIndexTests() {
     before(async function () {
       await esArchiver.emptyKibanaIndex();
       await kibanaServer.uiSettings.replace({});
diff --git a/test/functional/apps/management/_scripted_fields_filter.ts b/test/functional/apps/management/_scripted_fields_filter.ts
index 4f6d1a41d0523..1093c7f82fd4a 100644
--- a/test/functional/apps/management/_scripted_fields_filter.ts
+++ b/test/functional/apps/management/_scripted_fields_filter.ts
@@ -17,8 +17,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['settings']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/126027
-  describe.skip('filter scripted fields', function describeIndexTests() {
+  describe('filter scripted fields', function describeIndexTests() {
     before(async function () {
       // delete .kibana index and then wait for Kibana to re-create it
       await browser.setWindowSize(1200, 800);
@@ -80,7 +79,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(lang).to.be('expression');
         }
       });
-      await PageObjects.settings.clearScriptedFieldLanguageFilter('expression');
     });
   });
 }
diff --git a/test/functional/apps/visualize/_add_to_dashboard.ts b/test/functional/apps/visualize/_add_to_dashboard.ts
index 4343f8b1469d6..9e8984675eccd 100644
--- a/test/functional/apps/visualize/_add_to_dashboard.ts
+++ b/test/functional/apps/visualize/_add_to_dashboard.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dashboardExpect = getService('dashboardExpect');
diff --git a/test/functional/apps/visualize/_lab_mode.ts b/test/functional/apps/visualize/_lab_mode.ts
index d3a02a8d17291..2af593f2acc4a 100644
--- a/test/functional/apps/visualize/_lab_mode.ts
+++ b/test/functional/apps/visualize/_lab_mode.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../src/plugins/visualizations/common/constants';
+import { VISUALIZE_ENABLE_LABS_SETTING } from '@kbn/visualizations-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/test/functional_ccs/config.ts b/test/functional/config.ccs.ts
similarity index 79%
rename from test/functional_ccs/config.ts
rename to test/functional/config.ccs.ts
index e99a5310453d9..8137635b474da 100644
--- a/test/functional_ccs/config.ts
+++ b/test/functional/config.ccs.ts
@@ -7,17 +7,23 @@
  */
 
 import { FtrConfigProviderContext } from '@kbn/test';
-import { services } from './services';
+import { RemoteEsArchiverProvider } from './services/remote_es/remote_es_archiver';
+import { RemoteEsProvider } from './services/remote_es/remote_es';
 
+// eslint-disable-next-line import/no-default-export
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+  const functionalConfig = await readConfigFile(require.resolve('./config'));
 
   return {
     ...functionalConfig.getAll(),
 
     testFiles: [require.resolve('./apps/discover')],
 
-    services,
+    services: {
+      ...functionalConfig.get('services'),
+      remoteEs: RemoteEsProvider,
+      remoteEsArchiver: RemoteEsArchiverProvider,
+    },
 
     junit: {
       reportName: 'Kibana CCS Tests',
diff --git a/test/functional/fixtures/es_archiver/many_fields/data.json.gz b/test/functional/fixtures/es_archiver/many_fields/data.json.gz
new file mode 100644
index 0000000000000..78c564e96da2a
Binary files /dev/null and b/test/functional/fixtures/es_archiver/many_fields/data.json.gz differ
diff --git a/test/functional/fixtures/es_archiver/many_fields/mappings.json b/test/functional/fixtures/es_archiver/many_fields/mappings.json
new file mode 100644
index 0000000000000..491085676c16e
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/many_fields/mappings.json
@@ -0,0 +1,38111 @@
+{
+  "type": "index",
+  "value" : {
+    "index": "indices-stats",
+    "mappings" : {
+      "properties" : {
+        "_all" : {
+          "properties" : {
+            "primaries" : {
+              "properties" : {
+                "bulk" : {
+                  "properties" : {
+                    "avg_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "avg_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "avg_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_operations" : {
+                      "type" : "long"
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "completion" : {
+                  "properties" : {
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "docs" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "deleted" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "fielddata" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "flush" : {
+                  "properties" : {
+                    "periodic" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "get" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "exists_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "exists_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "exists_total" : {
+                      "type" : "long"
+                    },
+                    "getTime" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "missing_total" : {
+                      "type" : "long"
+                    },
+                    "time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "indexing" : {
+                  "properties" : {
+                    "delete_current" : {
+                      "type" : "long"
+                    },
+                    "delete_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "delete_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "delete_total" : {
+                      "type" : "long"
+                    },
+                    "index_current" : {
+                      "type" : "long"
+                    },
+                    "index_failed" : {
+                      "type" : "long"
+                    },
+                    "index_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "index_total" : {
+                      "type" : "long"
+                    },
+                    "is_throttled" : {
+                      "type" : "boolean"
+                    },
+                    "noop_update_total" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "merges" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "current_docs" : {
+                      "type" : "long"
+                    },
+                    "current_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "current_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_auto_throttle" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_auto_throttle_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_docs" : {
+                      "type" : "long"
+                    },
+                    "total_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_stopped_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_stopped_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_throttled_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_throttled_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "query_cache" : {
+                  "properties" : {
+                    "cache_count" : {
+                      "type" : "long"
+                    },
+                    "cache_size" : {
+                      "type" : "long"
+                    },
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    },
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "recovery" : {
+                  "properties" : {
+                    "current_as_source" : {
+                      "type" : "long"
+                    },
+                    "current_as_target" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "refresh" : {
+                  "properties" : {
+                    "external_total" : {
+                      "type" : "long"
+                    },
+                    "external_total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "external_total_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "listeners" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "request_cache" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "search" : {
+                  "properties" : {
+                    "fetch_current" : {
+                      "type" : "long"
+                    },
+                    "fetch_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fetch_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "fetch_total" : {
+                      "type" : "long"
+                    },
+                    "open_contexts" : {
+                      "type" : "long"
+                    },
+                    "query_current" : {
+                      "type" : "long"
+                    },
+                    "query_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "query_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "query_total" : {
+                      "type" : "long"
+                    },
+                    "scroll_current" : {
+                      "type" : "long"
+                    },
+                    "scroll_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "scroll_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "scroll_total" : {
+                      "type" : "long"
+                    },
+                    "suggest_current" : {
+                      "type" : "long"
+                    },
+                    "suggest_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "suggest_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "suggest_total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "segments" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "doc_values_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "doc_values_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "file_sizes" : {
+                      "type" : "object"
+                    },
+                    "fixed_bit_set" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fixed_bit_set_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "index_writer_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_writer_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "max_unsafe_auto_id_timestamp" : {
+                      "type" : "long"
+                    },
+                    "memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "norms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "norms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "points_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "points_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "stored_fields_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "stored_fields_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "term_vectors_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "term_vectors_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "terms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "terms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "version_map_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "version_map_memory_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "shard_stats" : {
+                  "properties" : {
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "store" : {
+                  "properties" : {
+                    "reserved" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "reserved_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_data_set_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_data_set_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "translog" : {
+                  "properties" : {
+                    "earliest_last_modified_age" : {
+                      "type" : "long"
+                    },
+                    "operations" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_operations" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "uncommitted_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "warmer" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                }
+              }
+            },
+            "total" : {
+              "properties" : {
+                "bulk" : {
+                  "properties" : {
+                    "avg_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "avg_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "avg_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_operations" : {
+                      "type" : "long"
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "completion" : {
+                  "properties" : {
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "docs" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "deleted" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "fielddata" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "flush" : {
+                  "properties" : {
+                    "periodic" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "get" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "exists_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "exists_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "exists_total" : {
+                      "type" : "long"
+                    },
+                    "getTime" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "missing_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "missing_total" : {
+                      "type" : "long"
+                    },
+                    "time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "indexing" : {
+                  "properties" : {
+                    "delete_current" : {
+                      "type" : "long"
+                    },
+                    "delete_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "delete_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "delete_total" : {
+                      "type" : "long"
+                    },
+                    "index_current" : {
+                      "type" : "long"
+                    },
+                    "index_failed" : {
+                      "type" : "long"
+                    },
+                    "index_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "index_total" : {
+                      "type" : "long"
+                    },
+                    "is_throttled" : {
+                      "type" : "boolean"
+                    },
+                    "noop_update_total" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "merges" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "current_docs" : {
+                      "type" : "long"
+                    },
+                    "current_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "current_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_auto_throttle" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_auto_throttle_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_docs" : {
+                      "type" : "long"
+                    },
+                    "total_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_stopped_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_stopped_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_throttled_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_throttled_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "query_cache" : {
+                  "properties" : {
+                    "cache_count" : {
+                      "type" : "long"
+                    },
+                    "cache_size" : {
+                      "type" : "long"
+                    },
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    },
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "recovery" : {
+                  "properties" : {
+                    "current_as_source" : {
+                      "type" : "long"
+                    },
+                    "current_as_target" : {
+                      "type" : "long"
+                    },
+                    "throttle_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "throttle_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "refresh" : {
+                  "properties" : {
+                    "external_total" : {
+                      "type" : "long"
+                    },
+                    "external_total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "external_total_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "listeners" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "request_cache" : {
+                  "properties" : {
+                    "evictions" : {
+                      "type" : "long"
+                    },
+                    "hit_count" : {
+                      "type" : "long"
+                    },
+                    "memory_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "miss_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "search" : {
+                  "properties" : {
+                    "fetch_current" : {
+                      "type" : "long"
+                    },
+                    "fetch_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fetch_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "fetch_total" : {
+                      "type" : "long"
+                    },
+                    "open_contexts" : {
+                      "type" : "long"
+                    },
+                    "query_current" : {
+                      "type" : "long"
+                    },
+                    "query_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "query_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "query_total" : {
+                      "type" : "long"
+                    },
+                    "scroll_current" : {
+                      "type" : "long"
+                    },
+                    "scroll_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "scroll_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "scroll_total" : {
+                      "type" : "long"
+                    },
+                    "suggest_current" : {
+                      "type" : "long"
+                    },
+                    "suggest_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "suggest_time_in_millis" : {
+                      "type" : "long"
+                    },
+                    "suggest_total" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "segments" : {
+                  "properties" : {
+                    "count" : {
+                      "type" : "long"
+                    },
+                    "doc_values_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "doc_values_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "file_sizes" : {
+                      "type" : "object"
+                    },
+                    "fixed_bit_set" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "fixed_bit_set_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "index_writer_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "index_writer_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "max_unsafe_auto_id_timestamp" : {
+                      "type" : "long"
+                    },
+                    "memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "norms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "norms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "points_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "points_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "stored_fields_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "stored_fields_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "term_vectors_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "term_vectors_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "terms_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "terms_memory_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "version_map_memory" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "version_map_memory_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "shard_stats" : {
+                  "properties" : {
+                    "total_count" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "store" : {
+                  "properties" : {
+                    "reserved" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "reserved_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "total_data_set_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_data_set_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "translog" : {
+                  "properties" : {
+                    "earliest_last_modified_age" : {
+                      "type" : "long"
+                    },
+                    "operations" : {
+                      "type" : "long"
+                    },
+                    "size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "size_in_bytes" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_operations" : {
+                      "type" : "long"
+                    },
+                    "uncommitted_size" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "uncommitted_size_in_bytes" : {
+                      "type" : "long"
+                    }
+                  }
+                },
+                "warmer" : {
+                  "properties" : {
+                    "current" : {
+                      "type" : "long"
+                    },
+                    "total" : {
+                      "type" : "long"
+                    },
+                    "total_time" : {
+                      "type" : "text",
+                      "fields" : {
+                        "keyword" : {
+                          "type" : "keyword",
+                          "ignore_above" : 256
+                        }
+                      }
+                    },
+                    "total_time_in_millis" : {
+                      "type" : "long"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "_shards" : {
+          "properties" : {
+            "failed" : {
+              "type" : "long"
+            },
+            "successful" : {
+              "type" : "long"
+            },
+            "total" : {
+              "type" : "long"
+            }
+          }
+        },
+        "indices" : {
+          "properties" : {
+            "apm-agent-configuration" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "apm-custom-link" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "ds-" : {
+              "properties" : {
+                "logs-deprecation" : {
+                  "properties" : {
+                    "elasticsearch-default-2022" : {
+                      "properties" : {
+                        "03" : {
+                          "properties" : {
+                            "07-000001" : {
+                              "properties" : {
+                                "primaries" : {
+                                  "properties" : {
+                                    "bulk" : {
+                                      "properties" : {
+                                        "avg_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "avg_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "avg_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "completion" : {
+                                      "properties" : {
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "docs" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "deleted" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "fielddata" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "flush" : {
+                                      "properties" : {
+                                        "periodic" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "get" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "exists_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_total" : {
+                                          "type" : "long"
+                                        },
+                                        "getTime" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "missing_total" : {
+                                          "type" : "long"
+                                        },
+                                        "time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "indexing" : {
+                                      "properties" : {
+                                        "delete_current" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "delete_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_total" : {
+                                          "type" : "long"
+                                        },
+                                        "index_current" : {
+                                          "type" : "long"
+                                        },
+                                        "index_failed" : {
+                                          "type" : "long"
+                                        },
+                                        "index_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "index_total" : {
+                                          "type" : "long"
+                                        },
+                                        "is_throttled" : {
+                                          "type" : "boolean"
+                                        },
+                                        "noop_update_total" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "merges" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "current_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "current_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "current_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_auto_throttle" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_auto_throttle_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_stopped_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_stopped_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_throttled_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_throttled_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "query_cache" : {
+                                      "properties" : {
+                                        "cache_count" : {
+                                          "type" : "long"
+                                        },
+                                        "cache_size" : {
+                                          "type" : "long"
+                                        },
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        },
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "recovery" : {
+                                      "properties" : {
+                                        "current_as_source" : {
+                                          "type" : "long"
+                                        },
+                                        "current_as_target" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "refresh" : {
+                                      "properties" : {
+                                        "external_total" : {
+                                          "type" : "long"
+                                        },
+                                        "external_total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "external_total_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "listeners" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "request_cache" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "search" : {
+                                      "properties" : {
+                                        "fetch_current" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fetch_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_total" : {
+                                          "type" : "long"
+                                        },
+                                        "open_contexts" : {
+                                          "type" : "long"
+                                        },
+                                        "query_current" : {
+                                          "type" : "long"
+                                        },
+                                        "query_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "query_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "query_total" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_current" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "scroll_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_total" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_current" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "suggest_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "segments" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "doc_values_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "doc_values_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "file_sizes" : {
+                                          "type" : "object"
+                                        },
+                                        "fixed_bit_set" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fixed_bit_set_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "index_writer_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_writer_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "long"
+                                        },
+                                        "memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "norms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "norms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "points_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "points_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "stored_fields_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "stored_fields_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "term_vectors_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "term_vectors_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "terms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "terms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "version_map_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "version_map_memory_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "shard_stats" : {
+                                      "properties" : {
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "store" : {
+                                      "properties" : {
+                                        "reserved" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "reserved_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_data_set_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_data_set_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "translog" : {
+                                      "properties" : {
+                                        "earliest_last_modified_age" : {
+                                          "type" : "long"
+                                        },
+                                        "operations" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "uncommitted_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "warmer" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shards" : {
+                                  "properties" : {
+                                    "0" : {
+                                      "properties" : {
+                                        "bulk" : {
+                                          "properties" : {
+                                            "avg_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "avg_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "avg_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total_operations" : {
+                                              "type" : "long"
+                                            },
+                                            "total_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "commit" : {
+                                          "properties" : {
+                                            "generation" : {
+                                              "type" : "long"
+                                            },
+                                            "id" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "num_docs" : {
+                                              "type" : "long"
+                                            },
+                                            "user_data" : {
+                                              "properties" : {
+                                                "es_version" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "history_uuid" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "local_checkpoint" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "max_seq_no" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "max_unsafe_auto_id_timestamp" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "min_retained_seq_no" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "translog_uuid" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "completion" : {
+                                          "properties" : {
+                                            "size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "docs" : {
+                                          "properties" : {
+                                            "count" : {
+                                              "type" : "long"
+                                            },
+                                            "deleted" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "fielddata" : {
+                                          "properties" : {
+                                            "evictions" : {
+                                              "type" : "long"
+                                            },
+                                            "memory_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "flush" : {
+                                          "properties" : {
+                                            "periodic" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "get" : {
+                                          "properties" : {
+                                            "current" : {
+                                              "type" : "long"
+                                            },
+                                            "exists_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "exists_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "exists_total" : {
+                                              "type" : "long"
+                                            },
+                                            "getTime" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "missing_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "missing_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "missing_total" : {
+                                              "type" : "long"
+                                            },
+                                            "time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "indexing" : {
+                                          "properties" : {
+                                            "delete_current" : {
+                                              "type" : "long"
+                                            },
+                                            "delete_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "delete_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "delete_total" : {
+                                              "type" : "long"
+                                            },
+                                            "index_current" : {
+                                              "type" : "long"
+                                            },
+                                            "index_failed" : {
+                                              "type" : "long"
+                                            },
+                                            "index_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "index_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "index_total" : {
+                                              "type" : "long"
+                                            },
+                                            "is_throttled" : {
+                                              "type" : "boolean"
+                                            },
+                                            "noop_update_total" : {
+                                              "type" : "long"
+                                            },
+                                            "throttle_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "throttle_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "merges" : {
+                                          "properties" : {
+                                            "current" : {
+                                              "type" : "long"
+                                            },
+                                            "current_docs" : {
+                                              "type" : "long"
+                                            },
+                                            "current_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "current_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_auto_throttle" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_auto_throttle_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_docs" : {
+                                              "type" : "long"
+                                            },
+                                            "total_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_stopped_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_stopped_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total_throttled_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_throttled_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "query_cache" : {
+                                          "properties" : {
+                                            "cache_count" : {
+                                              "type" : "long"
+                                            },
+                                            "cache_size" : {
+                                              "type" : "long"
+                                            },
+                                            "evictions" : {
+                                              "type" : "long"
+                                            },
+                                            "hit_count" : {
+                                              "type" : "long"
+                                            },
+                                            "memory_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "miss_count" : {
+                                              "type" : "long"
+                                            },
+                                            "total_count" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "recovery" : {
+                                          "properties" : {
+                                            "current_as_source" : {
+                                              "type" : "long"
+                                            },
+                                            "current_as_target" : {
+                                              "type" : "long"
+                                            },
+                                            "throttle_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "throttle_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "refresh" : {
+                                          "properties" : {
+                                            "external_total" : {
+                                              "type" : "long"
+                                            },
+                                            "external_total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "external_total_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "listeners" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "request_cache" : {
+                                          "properties" : {
+                                            "evictions" : {
+                                              "type" : "long"
+                                            },
+                                            "hit_count" : {
+                                              "type" : "long"
+                                            },
+                                            "memory_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "miss_count" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "retention_leases" : {
+                                          "properties" : {
+                                            "leases" : {
+                                              "properties" : {
+                                                "id" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "retaining_seq_no" : {
+                                                  "type" : "long"
+                                                },
+                                                "source" : {
+                                                  "type" : "text",
+                                                  "fields" : {
+                                                    "keyword" : {
+                                                      "type" : "keyword",
+                                                      "ignore_above" : 256
+                                                    }
+                                                  }
+                                                },
+                                                "timestamp" : {
+                                                  "type" : "long"
+                                                }
+                                              }
+                                            },
+                                            "primary_term" : {
+                                              "type" : "long"
+                                            },
+                                            "version" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "routing" : {
+                                          "properties" : {
+                                            "node" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "primary" : {
+                                              "type" : "boolean"
+                                            },
+                                            "state" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "search" : {
+                                          "properties" : {
+                                            "fetch_current" : {
+                                              "type" : "long"
+                                            },
+                                            "fetch_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "fetch_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "fetch_total" : {
+                                              "type" : "long"
+                                            },
+                                            "open_contexts" : {
+                                              "type" : "long"
+                                            },
+                                            "query_current" : {
+                                              "type" : "long"
+                                            },
+                                            "query_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "query_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "query_total" : {
+                                              "type" : "long"
+                                            },
+                                            "scroll_current" : {
+                                              "type" : "long"
+                                            },
+                                            "scroll_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "scroll_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "scroll_total" : {
+                                              "type" : "long"
+                                            },
+                                            "suggest_current" : {
+                                              "type" : "long"
+                                            },
+                                            "suggest_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "suggest_time_in_millis" : {
+                                              "type" : "long"
+                                            },
+                                            "suggest_total" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "segments" : {
+                                          "properties" : {
+                                            "count" : {
+                                              "type" : "long"
+                                            },
+                                            "doc_values_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "doc_values_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "file_sizes" : {
+                                              "type" : "object"
+                                            },
+                                            "fixed_bit_set" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "fixed_bit_set_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "index_writer_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "index_writer_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "max_unsafe_auto_id_timestamp" : {
+                                              "type" : "long"
+                                            },
+                                            "memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "norms_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "norms_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "points_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "points_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "stored_fields_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "stored_fields_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "term_vectors_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "term_vectors_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "terms_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "terms_memory_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "version_map_memory" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "version_map_memory_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "seq_no" : {
+                                          "properties" : {
+                                            "global_checkpoint" : {
+                                              "type" : "long"
+                                            },
+                                            "local_checkpoint" : {
+                                              "type" : "long"
+                                            },
+                                            "max_seq_no" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "shard_path" : {
+                                          "properties" : {
+                                            "data_path" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "is_custom_data_path" : {
+                                              "type" : "boolean"
+                                            },
+                                            "state_path" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        "shard_stats" : {
+                                          "properties" : {
+                                            "total_count" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "store" : {
+                                          "properties" : {
+                                            "reserved" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "reserved_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "total_data_set_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_data_set_size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "translog" : {
+                                          "properties" : {
+                                            "earliest_last_modified_age" : {
+                                              "type" : "long"
+                                            },
+                                            "operations" : {
+                                              "type" : "long"
+                                            },
+                                            "size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "size_in_bytes" : {
+                                              "type" : "long"
+                                            },
+                                            "uncommitted_operations" : {
+                                              "type" : "long"
+                                            },
+                                            "uncommitted_size" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "uncommitted_size_in_bytes" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        },
+                                        "warmer" : {
+                                          "properties" : {
+                                            "current" : {
+                                              "type" : "long"
+                                            },
+                                            "total" : {
+                                              "type" : "long"
+                                            },
+                                            "total_time" : {
+                                              "type" : "text",
+                                              "fields" : {
+                                                "keyword" : {
+                                                  "type" : "keyword",
+                                                  "ignore_above" : 256
+                                                }
+                                              }
+                                            },
+                                            "total_time_in_millis" : {
+                                              "type" : "long"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "total" : {
+                                  "properties" : {
+                                    "bulk" : {
+                                      "properties" : {
+                                        "avg_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "avg_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "avg_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "completion" : {
+                                      "properties" : {
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "docs" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "deleted" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "fielddata" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "flush" : {
+                                      "properties" : {
+                                        "periodic" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "get" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "exists_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "exists_total" : {
+                                          "type" : "long"
+                                        },
+                                        "getTime" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "missing_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "missing_total" : {
+                                          "type" : "long"
+                                        },
+                                        "time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "indexing" : {
+                                      "properties" : {
+                                        "delete_current" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "delete_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "delete_total" : {
+                                          "type" : "long"
+                                        },
+                                        "index_current" : {
+                                          "type" : "long"
+                                        },
+                                        "index_failed" : {
+                                          "type" : "long"
+                                        },
+                                        "index_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "index_total" : {
+                                          "type" : "long"
+                                        },
+                                        "is_throttled" : {
+                                          "type" : "boolean"
+                                        },
+                                        "noop_update_total" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "merges" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "current_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "current_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "current_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_auto_throttle" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_auto_throttle_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_docs" : {
+                                          "type" : "long"
+                                        },
+                                        "total_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_stopped_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_stopped_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_throttled_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_throttled_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "query_cache" : {
+                                      "properties" : {
+                                        "cache_count" : {
+                                          "type" : "long"
+                                        },
+                                        "cache_size" : {
+                                          "type" : "long"
+                                        },
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        },
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "recovery" : {
+                                      "properties" : {
+                                        "current_as_source" : {
+                                          "type" : "long"
+                                        },
+                                        "current_as_target" : {
+                                          "type" : "long"
+                                        },
+                                        "throttle_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "throttle_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "refresh" : {
+                                      "properties" : {
+                                        "external_total" : {
+                                          "type" : "long"
+                                        },
+                                        "external_total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "external_total_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "listeners" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "request_cache" : {
+                                      "properties" : {
+                                        "evictions" : {
+                                          "type" : "long"
+                                        },
+                                        "hit_count" : {
+                                          "type" : "long"
+                                        },
+                                        "memory_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "miss_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "search" : {
+                                      "properties" : {
+                                        "fetch_current" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fetch_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "fetch_total" : {
+                                          "type" : "long"
+                                        },
+                                        "open_contexts" : {
+                                          "type" : "long"
+                                        },
+                                        "query_current" : {
+                                          "type" : "long"
+                                        },
+                                        "query_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "query_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "query_total" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_current" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "scroll_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "scroll_total" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_current" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "suggest_time_in_millis" : {
+                                          "type" : "long"
+                                        },
+                                        "suggest_total" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "segments" : {
+                                      "properties" : {
+                                        "count" : {
+                                          "type" : "long"
+                                        },
+                                        "doc_values_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "doc_values_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "file_sizes" : {
+                                          "type" : "object"
+                                        },
+                                        "fixed_bit_set" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "fixed_bit_set_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "index_writer_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "index_writer_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "long"
+                                        },
+                                        "memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "norms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "norms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "points_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "points_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "stored_fields_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "stored_fields_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "term_vectors_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "term_vectors_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "terms_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "terms_memory_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "version_map_memory" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "version_map_memory_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "shard_stats" : {
+                                      "properties" : {
+                                        "total_count" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "store" : {
+                                      "properties" : {
+                                        "reserved" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "reserved_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "total_data_set_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_data_set_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "translog" : {
+                                      "properties" : {
+                                        "earliest_last_modified_age" : {
+                                          "type" : "long"
+                                        },
+                                        "operations" : {
+                                          "type" : "long"
+                                        },
+                                        "size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "size_in_bytes" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_operations" : {
+                                          "type" : "long"
+                                        },
+                                        "uncommitted_size" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "uncommitted_size_in_bytes" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "warmer" : {
+                                      "properties" : {
+                                        "current" : {
+                                          "type" : "long"
+                                        },
+                                        "total" : {
+                                          "type" : "long"
+                                        },
+                                        "total_time" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "total_time_in_millis" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "ds-ilm-history-5-2022" : {
+              "properties" : {
+                "03" : {
+                  "properties" : {
+                    "07-000001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "min_retained_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-agents-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-enrollment-api-keys-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-policies-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-policies-leader-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "fleet-servers-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "geoip_databases" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "min_retained_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "kibana-event-log-8" : {
+              "properties" : {
+                "0" : {
+                  "properties" : {
+                    "1-000001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "min_retained_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "kibana_8" : {
+              "properties" : {
+                "0" : {
+                  "properties" : {
+                    "1_001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "kibana_security_session_1" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            },
+            "kibana_task_manager_8" : {
+              "properties" : {
+                "0" : {
+                  "properties" : {
+                    "1_001" : {
+                      "properties" : {
+                        "primaries" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shards" : {
+                          "properties" : {
+                            "0" : {
+                              "properties" : {
+                                "bulk" : {
+                                  "properties" : {
+                                    "avg_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "avg_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "avg_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "commit" : {
+                                  "properties" : {
+                                    "generation" : {
+                                      "type" : "long"
+                                    },
+                                    "id" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "num_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "user_data" : {
+                                      "properties" : {
+                                        "es_version" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "history_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "local_checkpoint" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_seq_no" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "max_unsafe_auto_id_timestamp" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "translog_uuid" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "completion" : {
+                                  "properties" : {
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "docs" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "deleted" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "fielddata" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "flush" : {
+                                  "properties" : {
+                                    "periodic" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "get" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "exists_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "exists_total" : {
+                                      "type" : "long"
+                                    },
+                                    "getTime" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "missing_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "missing_total" : {
+                                      "type" : "long"
+                                    },
+                                    "time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "indexing" : {
+                                  "properties" : {
+                                    "delete_current" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "delete_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "delete_total" : {
+                                      "type" : "long"
+                                    },
+                                    "index_current" : {
+                                      "type" : "long"
+                                    },
+                                    "index_failed" : {
+                                      "type" : "long"
+                                    },
+                                    "index_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "index_total" : {
+                                      "type" : "long"
+                                    },
+                                    "is_throttled" : {
+                                      "type" : "boolean"
+                                    },
+                                    "noop_update_total" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "merges" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "current_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "current_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "current_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_auto_throttle" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_auto_throttle_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_docs" : {
+                                      "type" : "long"
+                                    },
+                                    "total_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_stopped_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_stopped_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_throttled_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_throttled_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "query_cache" : {
+                                  "properties" : {
+                                    "cache_count" : {
+                                      "type" : "long"
+                                    },
+                                    "cache_size" : {
+                                      "type" : "long"
+                                    },
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    },
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "recovery" : {
+                                  "properties" : {
+                                    "current_as_source" : {
+                                      "type" : "long"
+                                    },
+                                    "current_as_target" : {
+                                      "type" : "long"
+                                    },
+                                    "throttle_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "throttle_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "refresh" : {
+                                  "properties" : {
+                                    "external_total" : {
+                                      "type" : "long"
+                                    },
+                                    "external_total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "external_total_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "listeners" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "request_cache" : {
+                                  "properties" : {
+                                    "evictions" : {
+                                      "type" : "long"
+                                    },
+                                    "hit_count" : {
+                                      "type" : "long"
+                                    },
+                                    "memory_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "miss_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "retention_leases" : {
+                                  "properties" : {
+                                    "leases" : {
+                                      "properties" : {
+                                        "id" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "retaining_seq_no" : {
+                                          "type" : "long"
+                                        },
+                                        "source" : {
+                                          "type" : "text",
+                                          "fields" : {
+                                            "keyword" : {
+                                              "type" : "keyword",
+                                              "ignore_above" : 256
+                                            }
+                                          }
+                                        },
+                                        "timestamp" : {
+                                          "type" : "long"
+                                        }
+                                      }
+                                    },
+                                    "primary_term" : {
+                                      "type" : "long"
+                                    },
+                                    "version" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "routing" : {
+                                  "properties" : {
+                                    "node" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "primary" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "search" : {
+                                  "properties" : {
+                                    "fetch_current" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fetch_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "fetch_total" : {
+                                      "type" : "long"
+                                    },
+                                    "open_contexts" : {
+                                      "type" : "long"
+                                    },
+                                    "query_current" : {
+                                      "type" : "long"
+                                    },
+                                    "query_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "query_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "query_total" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_current" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "scroll_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "scroll_total" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_current" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "suggest_time_in_millis" : {
+                                      "type" : "long"
+                                    },
+                                    "suggest_total" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "segments" : {
+                                  "properties" : {
+                                    "count" : {
+                                      "type" : "long"
+                                    },
+                                    "doc_values_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "doc_values_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "file_sizes" : {
+                                      "type" : "object"
+                                    },
+                                    "fixed_bit_set" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "fixed_bit_set_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "index_writer_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "index_writer_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "max_unsafe_auto_id_timestamp" : {
+                                      "type" : "long"
+                                    },
+                                    "memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "norms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "norms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "points_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "points_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "stored_fields_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "stored_fields_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "term_vectors_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "term_vectors_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "terms_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "terms_memory_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "version_map_memory" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "version_map_memory_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "seq_no" : {
+                                  "properties" : {
+                                    "global_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "local_checkpoint" : {
+                                      "type" : "long"
+                                    },
+                                    "max_seq_no" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "shard_path" : {
+                                  "properties" : {
+                                    "data_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "is_custom_data_path" : {
+                                      "type" : "boolean"
+                                    },
+                                    "state_path" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "shard_stats" : {
+                                  "properties" : {
+                                    "total_count" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "store" : {
+                                  "properties" : {
+                                    "reserved" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "reserved_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "total_data_set_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_data_set_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "translog" : {
+                                  "properties" : {
+                                    "earliest_last_modified_age" : {
+                                      "type" : "long"
+                                    },
+                                    "operations" : {
+                                      "type" : "long"
+                                    },
+                                    "size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "size_in_bytes" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_operations" : {
+                                      "type" : "long"
+                                    },
+                                    "uncommitted_size" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "uncommitted_size_in_bytes" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                },
+                                "warmer" : {
+                                  "properties" : {
+                                    "current" : {
+                                      "type" : "long"
+                                    },
+                                    "total" : {
+                                      "type" : "long"
+                                    },
+                                    "total_time" : {
+                                      "type" : "text",
+                                      "fields" : {
+                                        "keyword" : {
+                                          "type" : "keyword",
+                                          "ignore_above" : 256
+                                        }
+                                      }
+                                    },
+                                    "total_time_in_millis" : {
+                                      "type" : "long"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "total" : {
+                          "properties" : {
+                            "bulk" : {
+                              "properties" : {
+                                "avg_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "avg_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "avg_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_operations" : {
+                                  "type" : "long"
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "completion" : {
+                              "properties" : {
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "docs" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "deleted" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "fielddata" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "flush" : {
+                              "properties" : {
+                                "periodic" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "get" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "exists_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "exists_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "exists_total" : {
+                                  "type" : "long"
+                                },
+                                "getTime" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "missing_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "missing_total" : {
+                                  "type" : "long"
+                                },
+                                "time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "indexing" : {
+                              "properties" : {
+                                "delete_current" : {
+                                  "type" : "long"
+                                },
+                                "delete_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "delete_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "delete_total" : {
+                                  "type" : "long"
+                                },
+                                "index_current" : {
+                                  "type" : "long"
+                                },
+                                "index_failed" : {
+                                  "type" : "long"
+                                },
+                                "index_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "index_total" : {
+                                  "type" : "long"
+                                },
+                                "is_throttled" : {
+                                  "type" : "boolean"
+                                },
+                                "noop_update_total" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "merges" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "current_docs" : {
+                                  "type" : "long"
+                                },
+                                "current_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "current_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_auto_throttle" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_auto_throttle_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_docs" : {
+                                  "type" : "long"
+                                },
+                                "total_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_stopped_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_stopped_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_throttled_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_throttled_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "query_cache" : {
+                              "properties" : {
+                                "cache_count" : {
+                                  "type" : "long"
+                                },
+                                "cache_size" : {
+                                  "type" : "long"
+                                },
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                },
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "recovery" : {
+                              "properties" : {
+                                "current_as_source" : {
+                                  "type" : "long"
+                                },
+                                "current_as_target" : {
+                                  "type" : "long"
+                                },
+                                "throttle_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "throttle_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "refresh" : {
+                              "properties" : {
+                                "external_total" : {
+                                  "type" : "long"
+                                },
+                                "external_total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "external_total_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "listeners" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "request_cache" : {
+                              "properties" : {
+                                "evictions" : {
+                                  "type" : "long"
+                                },
+                                "hit_count" : {
+                                  "type" : "long"
+                                },
+                                "memory_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "miss_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "search" : {
+                              "properties" : {
+                                "fetch_current" : {
+                                  "type" : "long"
+                                },
+                                "fetch_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fetch_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "fetch_total" : {
+                                  "type" : "long"
+                                },
+                                "open_contexts" : {
+                                  "type" : "long"
+                                },
+                                "query_current" : {
+                                  "type" : "long"
+                                },
+                                "query_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "query_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "query_total" : {
+                                  "type" : "long"
+                                },
+                                "scroll_current" : {
+                                  "type" : "long"
+                                },
+                                "scroll_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "scroll_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "scroll_total" : {
+                                  "type" : "long"
+                                },
+                                "suggest_current" : {
+                                  "type" : "long"
+                                },
+                                "suggest_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "suggest_time_in_millis" : {
+                                  "type" : "long"
+                                },
+                                "suggest_total" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "segments" : {
+                              "properties" : {
+                                "count" : {
+                                  "type" : "long"
+                                },
+                                "doc_values_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "doc_values_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "file_sizes" : {
+                                  "type" : "object"
+                                },
+                                "fixed_bit_set" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "fixed_bit_set_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "index_writer_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "index_writer_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "long"
+                                },
+                                "memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "norms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "norms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "points_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "points_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "stored_fields_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "stored_fields_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "term_vectors_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "term_vectors_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "terms_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "terms_memory_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "version_map_memory" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "version_map_memory_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "shard_stats" : {
+                              "properties" : {
+                                "total_count" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "store" : {
+                              "properties" : {
+                                "reserved" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "reserved_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "total_data_set_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_data_set_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "translog" : {
+                              "properties" : {
+                                "earliest_last_modified_age" : {
+                                  "type" : "long"
+                                },
+                                "operations" : {
+                                  "type" : "long"
+                                },
+                                "size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "size_in_bytes" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_operations" : {
+                                  "type" : "long"
+                                },
+                                "uncommitted_size" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "uncommitted_size_in_bytes" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "warmer" : {
+                              "properties" : {
+                                "current" : {
+                                  "type" : "long"
+                                },
+                                "total" : {
+                                  "type" : "long"
+                                },
+                                "total_time" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "total_time_in_millis" : {
+                                  "type" : "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "uuid" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "security-7" : {
+              "properties" : {
+                "primaries" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "shards" : {
+                  "properties" : {
+                    "0" : {
+                      "properties" : {
+                        "bulk" : {
+                          "properties" : {
+                            "avg_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "avg_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "avg_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_operations" : {
+                              "type" : "long"
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "commit" : {
+                          "properties" : {
+                            "generation" : {
+                              "type" : "long"
+                            },
+                            "id" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "num_docs" : {
+                              "type" : "long"
+                            },
+                            "user_data" : {
+                              "properties" : {
+                                "es_version" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "history_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "local_checkpoint" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_seq_no" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "max_unsafe_auto_id_timestamp" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "translog_uuid" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "completion" : {
+                          "properties" : {
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "docs" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "deleted" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "fielddata" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "flush" : {
+                          "properties" : {
+                            "periodic" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "get" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "exists_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "exists_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "exists_total" : {
+                              "type" : "long"
+                            },
+                            "getTime" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "missing_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "missing_total" : {
+                              "type" : "long"
+                            },
+                            "time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "indexing" : {
+                          "properties" : {
+                            "delete_current" : {
+                              "type" : "long"
+                            },
+                            "delete_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "delete_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "delete_total" : {
+                              "type" : "long"
+                            },
+                            "index_current" : {
+                              "type" : "long"
+                            },
+                            "index_failed" : {
+                              "type" : "long"
+                            },
+                            "index_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "index_total" : {
+                              "type" : "long"
+                            },
+                            "is_throttled" : {
+                              "type" : "boolean"
+                            },
+                            "noop_update_total" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "merges" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "current_docs" : {
+                              "type" : "long"
+                            },
+                            "current_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "current_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_auto_throttle" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_auto_throttle_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_docs" : {
+                              "type" : "long"
+                            },
+                            "total_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_stopped_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_stopped_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_throttled_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_throttled_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "query_cache" : {
+                          "properties" : {
+                            "cache_count" : {
+                              "type" : "long"
+                            },
+                            "cache_size" : {
+                              "type" : "long"
+                            },
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            },
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "recovery" : {
+                          "properties" : {
+                            "current_as_source" : {
+                              "type" : "long"
+                            },
+                            "current_as_target" : {
+                              "type" : "long"
+                            },
+                            "throttle_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "throttle_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "refresh" : {
+                          "properties" : {
+                            "external_total" : {
+                              "type" : "long"
+                            },
+                            "external_total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "external_total_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "listeners" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "request_cache" : {
+                          "properties" : {
+                            "evictions" : {
+                              "type" : "long"
+                            },
+                            "hit_count" : {
+                              "type" : "long"
+                            },
+                            "memory_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "miss_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "retention_leases" : {
+                          "properties" : {
+                            "leases" : {
+                              "properties" : {
+                                "id" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "retaining_seq_no" : {
+                                  "type" : "long"
+                                },
+                                "source" : {
+                                  "type" : "text",
+                                  "fields" : {
+                                    "keyword" : {
+                                      "type" : "keyword",
+                                      "ignore_above" : 256
+                                    }
+                                  }
+                                },
+                                "timestamp" : {
+                                  "type" : "long"
+                                }
+                              }
+                            },
+                            "primary_term" : {
+                              "type" : "long"
+                            },
+                            "version" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "routing" : {
+                          "properties" : {
+                            "node" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "primary" : {
+                              "type" : "boolean"
+                            },
+                            "state" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "search" : {
+                          "properties" : {
+                            "fetch_current" : {
+                              "type" : "long"
+                            },
+                            "fetch_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fetch_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "fetch_total" : {
+                              "type" : "long"
+                            },
+                            "open_contexts" : {
+                              "type" : "long"
+                            },
+                            "query_current" : {
+                              "type" : "long"
+                            },
+                            "query_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "query_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "query_total" : {
+                              "type" : "long"
+                            },
+                            "scroll_current" : {
+                              "type" : "long"
+                            },
+                            "scroll_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "scroll_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "scroll_total" : {
+                              "type" : "long"
+                            },
+                            "suggest_current" : {
+                              "type" : "long"
+                            },
+                            "suggest_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "suggest_time_in_millis" : {
+                              "type" : "long"
+                            },
+                            "suggest_total" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "segments" : {
+                          "properties" : {
+                            "count" : {
+                              "type" : "long"
+                            },
+                            "doc_values_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "doc_values_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "file_sizes" : {
+                              "type" : "object"
+                            },
+                            "fixed_bit_set" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "fixed_bit_set_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "index_writer_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "index_writer_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "max_unsafe_auto_id_timestamp" : {
+                              "type" : "long"
+                            },
+                            "memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "norms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "norms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "points_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "points_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "stored_fields_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "stored_fields_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "term_vectors_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "term_vectors_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "terms_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "terms_memory_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "version_map_memory" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "version_map_memory_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "seq_no" : {
+                          "properties" : {
+                            "global_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "local_checkpoint" : {
+                              "type" : "long"
+                            },
+                            "max_seq_no" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "shard_path" : {
+                          "properties" : {
+                            "data_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "is_custom_data_path" : {
+                              "type" : "boolean"
+                            },
+                            "state_path" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "shard_stats" : {
+                          "properties" : {
+                            "total_count" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "store" : {
+                          "properties" : {
+                            "reserved" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "reserved_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "total_data_set_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_data_set_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "translog" : {
+                          "properties" : {
+                            "earliest_last_modified_age" : {
+                              "type" : "long"
+                            },
+                            "operations" : {
+                              "type" : "long"
+                            },
+                            "size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "size_in_bytes" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_operations" : {
+                              "type" : "long"
+                            },
+                            "uncommitted_size" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "uncommitted_size_in_bytes" : {
+                              "type" : "long"
+                            }
+                          }
+                        },
+                        "warmer" : {
+                          "properties" : {
+                            "current" : {
+                              "type" : "long"
+                            },
+                            "total" : {
+                              "type" : "long"
+                            },
+                            "total_time" : {
+                              "type" : "text",
+                              "fields" : {
+                                "keyword" : {
+                                  "type" : "keyword",
+                                  "ignore_above" : 256
+                                }
+                              }
+                            },
+                            "total_time_in_millis" : {
+                              "type" : "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "total" : {
+                  "properties" : {
+                    "bulk" : {
+                      "properties" : {
+                        "avg_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "avg_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "avg_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_operations" : {
+                          "type" : "long"
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "completion" : {
+                      "properties" : {
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "docs" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "deleted" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "fielddata" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "flush" : {
+                      "properties" : {
+                        "periodic" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "get" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "exists_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "exists_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "exists_total" : {
+                          "type" : "long"
+                        },
+                        "getTime" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "missing_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "missing_total" : {
+                          "type" : "long"
+                        },
+                        "time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "indexing" : {
+                      "properties" : {
+                        "delete_current" : {
+                          "type" : "long"
+                        },
+                        "delete_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "delete_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "delete_total" : {
+                          "type" : "long"
+                        },
+                        "index_current" : {
+                          "type" : "long"
+                        },
+                        "index_failed" : {
+                          "type" : "long"
+                        },
+                        "index_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "index_total" : {
+                          "type" : "long"
+                        },
+                        "is_throttled" : {
+                          "type" : "boolean"
+                        },
+                        "noop_update_total" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "merges" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "current_docs" : {
+                          "type" : "long"
+                        },
+                        "current_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "current_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_auto_throttle" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_auto_throttle_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_docs" : {
+                          "type" : "long"
+                        },
+                        "total_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_stopped_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_stopped_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_throttled_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_throttled_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "query_cache" : {
+                      "properties" : {
+                        "cache_count" : {
+                          "type" : "long"
+                        },
+                        "cache_size" : {
+                          "type" : "long"
+                        },
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        },
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "recovery" : {
+                      "properties" : {
+                        "current_as_source" : {
+                          "type" : "long"
+                        },
+                        "current_as_target" : {
+                          "type" : "long"
+                        },
+                        "throttle_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "throttle_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "refresh" : {
+                      "properties" : {
+                        "external_total" : {
+                          "type" : "long"
+                        },
+                        "external_total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "external_total_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "listeners" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "request_cache" : {
+                      "properties" : {
+                        "evictions" : {
+                          "type" : "long"
+                        },
+                        "hit_count" : {
+                          "type" : "long"
+                        },
+                        "memory_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "miss_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "search" : {
+                      "properties" : {
+                        "fetch_current" : {
+                          "type" : "long"
+                        },
+                        "fetch_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fetch_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "fetch_total" : {
+                          "type" : "long"
+                        },
+                        "open_contexts" : {
+                          "type" : "long"
+                        },
+                        "query_current" : {
+                          "type" : "long"
+                        },
+                        "query_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "query_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "query_total" : {
+                          "type" : "long"
+                        },
+                        "scroll_current" : {
+                          "type" : "long"
+                        },
+                        "scroll_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "scroll_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "scroll_total" : {
+                          "type" : "long"
+                        },
+                        "suggest_current" : {
+                          "type" : "long"
+                        },
+                        "suggest_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "suggest_time_in_millis" : {
+                          "type" : "long"
+                        },
+                        "suggest_total" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "segments" : {
+                      "properties" : {
+                        "count" : {
+                          "type" : "long"
+                        },
+                        "doc_values_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "doc_values_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "file_sizes" : {
+                          "type" : "object"
+                        },
+                        "fixed_bit_set" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "fixed_bit_set_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "index_writer_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "index_writer_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "max_unsafe_auto_id_timestamp" : {
+                          "type" : "long"
+                        },
+                        "memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "norms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "norms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "points_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "points_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "stored_fields_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "stored_fields_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "term_vectors_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "term_vectors_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "terms_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "terms_memory_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "version_map_memory" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "version_map_memory_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "shard_stats" : {
+                      "properties" : {
+                        "total_count" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "store" : {
+                      "properties" : {
+                        "reserved" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "reserved_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "total_data_set_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_data_set_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "translog" : {
+                      "properties" : {
+                        "earliest_last_modified_age" : {
+                          "type" : "long"
+                        },
+                        "operations" : {
+                          "type" : "long"
+                        },
+                        "size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "size_in_bytes" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_operations" : {
+                          "type" : "long"
+                        },
+                        "uncommitted_size" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "uncommitted_size_in_bytes" : {
+                          "type" : "long"
+                        }
+                      }
+                    },
+                    "warmer" : {
+                      "properties" : {
+                        "current" : {
+                          "type" : "long"
+                        },
+                        "total" : {
+                          "type" : "long"
+                        },
+                        "total_time" : {
+                          "type" : "text",
+                          "fields" : {
+                            "keyword" : {
+                              "type" : "keyword",
+                              "ignore_above" : 256
+                            }
+                          }
+                        },
+                        "total_time_in_millis" : {
+                          "type" : "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uuid" : {
+                  "type" : "text",
+                  "fields" : {
+                    "keyword" : {
+                      "type" : "keyword",
+                      "ignore_above" : 256
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "settings" : {
+      "index" : {
+        "mapping" : {
+          "total_fields" : {
+            "limit" : "50000"
+          }
+        },
+        "number_of_shards" : "1",
+        "number_of_replicas" : "0"
+      }
+    }
+  }
+}
diff --git a/test/functional/fixtures/kbn_archiver/date_nested_ccs.json b/test/functional/fixtures/kbn_archiver/ccs/date_nested.json
similarity index 100%
rename from test/functional/fixtures/kbn_archiver/date_nested_ccs.json
rename to test/functional/fixtures/kbn_archiver/ccs/date_nested.json
diff --git a/test/functional/fixtures/kbn_archiver/discover_ccs.json b/test/functional/fixtures/kbn_archiver/ccs/discover.json
similarity index 100%
rename from test/functional/fixtures/kbn_archiver/discover_ccs.json
rename to test/functional/fixtures/kbn_archiver/ccs/discover.json
diff --git a/test/functional/fixtures/kbn_archiver/many_fields_data_view.json b/test/functional/fixtures/kbn_archiver/many_fields_data_view.json
new file mode 100644
index 0000000000000..c5f1366b734de
--- /dev/null
+++ b/test/functional/fixtures/kbn_archiver/many_fields_data_view.json
@@ -0,0 +1,18 @@
+{
+  "attributes": {
+    "fieldAttrs": "{}",
+    "fields": "[]",
+    "runtimeFieldMap": "{}",
+    "title": "indices-stats*",
+    "typeMeta": "{}"
+  },
+  "coreMigrationVersion": "8.3.0",
+  "id": "35796250-bb09-11ec-a8e4-a9868e049a39",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2022-04-13T09:07:56.793Z",
+  "version": "WzQwLDFd"
+}
\ No newline at end of file
diff --git a/test/functional/page_objects/dashboard_page_controls.ts b/test/functional/page_objects/dashboard_page_controls.ts
index 0f52bf1255693..179e27d09cf55 100644
--- a/test/functional/page_objects/dashboard_page_controls.ts
+++ b/test/functional/page_objects/dashboard_page_controls.ts
@@ -7,13 +7,13 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
 import {
   OPTIONS_LIST_CONTROL,
   ControlWidth,
   RANGE_SLIDER_CONTROL,
-} from '../../../src/plugins/controls/common';
-import { ControlGroupChainingSystem } from '../../../src/plugins/controls/common/control_group/types';
+} from '@kbn/controls-plugin/common';
+import { ControlGroupChainingSystem } from '@kbn/controls-plugin/common/control_group/types';
+import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 import { FtrService } from '../ftr_provider_context';
 
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index dfaaecff0a0c7..29fbe04f59e97 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -273,8 +273,12 @@ export class SettingsPageObject extends FtrService {
 
   async clearFieldTypeFilter(type: string) {
     await this.testSubjects.clickWhenNotDisabled('indexedFieldTypeFilterDropdown');
-    await this.testSubjects.existOrFail('indexedFieldTypeFilterDropdown-popover');
-    await this.testSubjects.existOrFail(`indexedFieldTypeFilterDropdown-option-${type}-checked`);
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail('indexedFieldTypeFilterDropdown-popover');
+    });
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail(`indexedFieldTypeFilterDropdown-option-${type}-checked`);
+    });
     await this.testSubjects.click(`indexedFieldTypeFilterDropdown-option-${type}-checked`);
     await this.testSubjects.existOrFail(`indexedFieldTypeFilterDropdown-option-${type}`);
     await this.browser.pressKeys(this.browser.keys.ESCAPE);
@@ -291,10 +295,14 @@ export class SettingsPageObject extends FtrService {
 
   async clearScriptedFieldLanguageFilter(type: string) {
     await this.testSubjects.clickWhenNotDisabled('scriptedFieldLanguageFilterDropdown');
-    await this.testSubjects.existOrFail('scriptedFieldLanguageFilterDropdown-popover');
-    await this.testSubjects.existOrFail(
-      `scriptedFieldLanguageFilterDropdown-option-${type}-checked`
-    );
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail('scriptedFieldLanguageFilterDropdown-popover');
+    });
+    await this.retry.try(async () => {
+      await this.testSubjects.existOrFail(
+        `scriptedFieldLanguageFilterDropdown-option-${type}-checked`
+      );
+    });
     await this.testSubjects.click(`scriptedFieldLanguageFilterDropdown-option-${type}-checked`);
     await this.testSubjects.existOrFail(`scriptedFieldLanguageFilterDropdown-option-${type}`);
     await this.browser.pressKeys(this.browser.keys.ESCAPE);
diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
index 37933a91a9d70..5c3c0d81890dd 100644
--- a/test/functional/page_objects/time_picker.ts
+++ b/test/functional/page_objects/time_picker.ts
@@ -48,7 +48,9 @@ export class TimePickerPageObject extends FtrService {
   }
 
   async ensureHiddenNoDataPopover() {
-    const isVisible = await this.testSubjects.exists('noDataPopoverDismissButton');
+    const isVisible = await this.testSubjects.exists('noDataPopoverDismissButton', {
+      timeout: 100,
+    });
     if (isVisible) {
       await this.testSubjects.click('noDataPopoverDismissButton');
     }
@@ -103,15 +105,19 @@ export class TimePickerPageObject extends FtrService {
   private async showStartEndTimes() {
     // This first await makes sure the superDatePicker has loaded before we check for the ShowDatesButton
     await this.testSubjects.exists('superDatePickerToggleQuickMenuButton', { timeout: 20000 });
-    const isShowDatesButton = await this.testSubjects.exists('superDatePickerShowDatesButton');
-    if (isShowDatesButton) {
-      await this.testSubjects.click('superDatePickerShowDatesButton');
-    }
-    await this.testSubjects.exists('superDatePickerstartDatePopoverButton');
-    // Close the start date popover which opens automatically if `superDatePickerShowDatesButton` is clicked
-    if (isShowDatesButton) {
-      await this.testSubjects.click('superDatePickerstartDatePopoverButton');
-    }
+    await this.retry.tryForTime(5000, async () => {
+      const isShowDatesButton = await this.testSubjects.exists('superDatePickerShowDatesButton', {
+        timeout: 50,
+      });
+      if (isShowDatesButton) {
+        await this.testSubjects.click('superDatePickerShowDatesButton', 50);
+      }
+      await this.testSubjects.exists('superDatePickerstartDatePopoverButton', { timeout: 1000 });
+      // Close the start date popover which opens automatically if `superDatePickerShowDatesButton` is clicked
+      if (isShowDatesButton) {
+        await this.testSubjects.click('superDatePickerstartDatePopoverButton');
+      }
+    });
   }
 
   /**
@@ -156,11 +162,12 @@ export class TimePickerPageObject extends FtrService {
 
     await this.retry.waitFor('Timepicker popover to close', async () => {
       await this.browser.pressKeys(this.browser.keys.ESCAPE);
-      return !(await this.testSubjects.exists('superDatePickerAbsoluteDateInput'));
+      return !(await this.testSubjects.exists('superDatePickerAbsoluteDateInput', { timeout: 50 }));
     });
 
     const superDatePickerApplyButtonExists = await this.testSubjects.exists(
-      'superDatePickerApplyTimeButton'
+      'superDatePickerApplyTimeButton',
+      { timeout: 100 }
     );
     if (superDatePickerApplyButtonExists) {
       // Timepicker is in top nav
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index af4bf6fc40299..20aec8ba5d984 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { FtrService } from '../ftr_provider_context';
-import { VisualizeConstants } from '../../../src/plugins/visualizations/common/constants';
-import { FORMATS_UI_SETTINGS } from '../../../src/plugins/field_formats/common';
 
 // TODO: Remove & Refactor to use the TTV page objects
 interface VisualizeSaveModalArgs {
diff --git a/test/functional/services/remote/create_stdout_stream.ts b/test/functional/services/remote/create_stdout_stream.ts
index 54ca36f3258d8..d136c2549bca0 100644
--- a/test/functional/services/remote/create_stdout_stream.ts
+++ b/test/functional/services/remote/create_stdout_stream.ts
@@ -13,7 +13,7 @@ import { map, takeUntil, take } from 'rxjs/operators';
 
 export async function createStdoutSocket() {
   const chunk$ = new Rx.Subject<Buffer>();
-  const cleanup$ = new Rx.ReplaySubject(1);
+  const cleanup$ = new Rx.ReplaySubject<void>(1);
 
   const server = Net.createServer();
   server.on('connection', (socket) => {
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index d4e20a617a602..2945418f5f4c7 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -364,39 +364,41 @@ export async function initWebDriver(
   }
 
   let attempt = 1;
-  return await Rx.race(
-    Rx.timer(2 * MINUTE).pipe(
-      map(() => {
-        throw new Error('remote failed to start within 2 minutes');
-      })
-    ),
-
+  return await Rx.firstValueFrom(
     Rx.race(
-      Rx.defer(async () => {
-        const command = await attemptToCreateCommand(log, browserType, lifecycle, config);
-        if (!command) {
-          throw new Error('remote creation aborted');
-        }
-        return command;
-      }),
-      Rx.timer(30 * SECOND).pipe(
+      Rx.timer(2 * MINUTE).pipe(
         map(() => {
-          throw new Error('remote failed to start within 30 seconds');
+          throw new Error('remote failed to start within 2 minutes');
+        })
+      ),
+
+      Rx.race(
+        Rx.defer(async () => {
+          const command = await attemptToCreateCommand(log, browserType, lifecycle, config);
+          if (!command) {
+            throw new Error('remote creation aborted');
+          }
+          return command;
+        }),
+        Rx.timer(30 * SECOND).pipe(
+          map(() => {
+            throw new Error('remote failed to start within 30 seconds');
+          })
+        )
+      ).pipe(
+        catchError((error, resubscribe) => {
+          log.warning('Failure while creating webdriver instance');
+          log.warning(error);
+
+          if (attempt > 5) {
+            throw new Error('out of retry attempts');
+          }
+
+          attempt += 1;
+          log.warning('...retrying in 15 seconds...');
+          return Rx.concat(sleep$(15000), resubscribe);
         })
       )
-    ).pipe(
-      catchError((error, resubscribe) => {
-        log.warning('Failure while creating webdriver instance');
-        log.warning(error);
-
-        if (attempt > 5) {
-          throw new Error('out of retry attempts');
-        }
-
-        attempt += 1;
-        log.warning('...retrying in 15 seconds...');
-        return Rx.concat(sleep$(15000), resubscribe);
-      })
     )
-  ).toPromise();
+  );
 }
diff --git a/test/functional_ccs/services/remote_es.ts b/test/functional/services/remote_es/remote_es.ts
similarity index 92%
rename from test/functional_ccs/services/remote_es.ts
rename to test/functional/services/remote_es/remote_es.ts
index 05a10d9e068f0..37ce35cdfefbc 100644
--- a/test/functional_ccs/services/remote_es.ts
+++ b/test/functional/services/remote_es/remote_es.ts
@@ -9,7 +9,7 @@
 import { Client } from '@elastic/elasticsearch';
 
 import { systemIndicesSuperuser, createRemoteEsClientForFtrConfig } from '@kbn/test';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 /**
  * Kibana-specific @elastic/elasticsearch client instance.
diff --git a/test/functional_ccs/services/remote_es_archiver.ts b/test/functional/services/remote_es/remote_es_archiver.ts
similarity index 85%
rename from test/functional_ccs/services/remote_es_archiver.ts
rename to test/functional/services/remote_es/remote_es_archiver.ts
index 569792d050a4d..7e6f4241591e3 100644
--- a/test/functional_ccs/services/remote_es_archiver.ts
+++ b/test/functional/services/remote_es/remote_es_archiver.ts
@@ -7,10 +7,10 @@
  */
 
 import { EsArchiver } from '@kbn/es-archiver';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function RemoteEsArchiverProvider({ getService }: FtrProviderContext): EsArchiver {
-  const remoteEs = getService('remoteEs');
+  const remoteEs = getService('remoteEs' as 'es');
   const log = getService('log');
   const kibanaServer = getService('kibanaServer');
 
diff --git a/test/functional/services/supertest.ts b/test/functional/services/supertest.ts
index 0ffae35c90e41..32ecc3f51759d 100644
--- a/test/functional/services/supertest.ts
+++ b/test/functional/services/supertest.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import { format as formatUrl } from 'url';
 
 import supertest from 'supertest';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function KibanaSupertestProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
diff --git a/test/functional_ccs/apps/discover/data_view_ccs.ts b/test/functional_ccs/apps/discover/data_view_ccs.ts
deleted file mode 100644
index 5fc39ff5705df..0000000000000
--- a/test/functional_ccs/apps/discover/data_view_ccs.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const kibanaServer = getService('kibanaServer');
-  const remoteEsArchiver = getService('remoteEsArchiver');
-
-  const security = getService('security');
-  const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
-
-  const createDataView = async (dataViewName: string) => {
-    await PageObjects.discover.clickIndexPatternActions();
-    await PageObjects.discover.clickCreateNewDataView();
-    await testSubjects.setValue('createIndexPatternNameInput', dataViewName, {
-      clearWithKeyboard: true,
-      typeCharByChar: true,
-    });
-    await testSubjects.click('saveIndexPatternButton');
-  };
-
-  describe('discover integration with data view editor', function describeIndexTests() {
-    before(async function () {
-      await security.testUser.setRoles([
-        'kibana_admin',
-        'test_logstash_reader',
-        'ccs_remote_search',
-      ]);
-      await remoteEsArchiver.loadIfNeeded(
-        'test/functional/fixtures/es_archiver/logstash_functional'
-      );
-      await kibanaServer.savedObjects.clean({ types: ['saved-search', 'index-pattern'] });
-      // The test creates the 'ftr-remote:logstash*" data view but we have to load the discover_ccs
-      // which contains ftr-remote:logstash-* otherwise, discover will redirect us to another page.
-      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover_ccs');
-      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
-      await PageObjects.common.navigateToApp('discover');
-    });
-
-    after(async () => {
-      await security.testUser.restoreDefaults();
-      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover_ccs');
-      await kibanaServer.savedObjects.clean({ types: ['saved-search', 'index-pattern'] });
-    });
-
-    it('use ccs to create a new data view', async function () {
-      const dataViewToCreate = 'ftr-remote:logstash';
-      await createDataView(dataViewToCreate);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await retry.waitForWithTimeout(
-        'data view selector to include a newly created dataview',
-        5000,
-        async () => {
-          const dataViewTitle = await PageObjects.discover.getCurrentlySelectedDataView();
-          // data view editor will add wildcard symbol by default
-          // so we need to include it in our original title when comparing
-          return dataViewTitle === `${dataViewToCreate}*`;
-        }
-      );
-    });
-  });
-}
diff --git a/test/functional_ccs/apps/discover/index.ts b/test/functional_ccs/apps/discover/index.ts
deleted file mode 100644
index 2e9d428f44c60..0000000000000
--- a/test/functional_ccs/apps/discover/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ getService, loadTestFile }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const browser = getService('browser');
-
-  describe('discover app css', function () {
-    this.tags('ciGroup6');
-
-    before(async () => {
-      await browser.setWindowSize(1300, 800);
-    });
-
-    loadTestFile(require.resolve('./data_view_ccs'));
-    loadTestFile(require.resolve('./saved_queries_ccs'));
-
-    after(async () => {
-      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
-    });
-  });
-}
diff --git a/test/functional_ccs/apps/discover/saved_queries_ccs.ts b/test/functional_ccs/apps/discover/saved_queries_ccs.ts
deleted file mode 100644
index 08b6d61368f5d..0000000000000
--- a/test/functional_ccs/apps/discover/saved_queries_ccs.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import expect from '@kbn/expect';
-
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const retry = getService('retry');
-  const log = getService('log');
-  const remoteEsArchiver = getService('remoteEsArchiver');
-  const kibanaServer = getService('kibanaServer');
-  const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
-  const browser = getService('browser');
-  const filterBar = getService('filterBar');
-  const queryBar = getService('queryBar');
-  const savedQueryManagementComponent = getService('savedQueryManagementComponent');
-  const testSubjects = getService('testSubjects');
-  const defaultSettings = {
-    defaultIndex: 'logstash-*',
-  };
-
-  const setUpQueriesWithFilters = async () => {
-    // set up a query with filters and a time filter
-    log.debug('set up a query with filters to save');
-    const from = 'Sep 20, 2015 @ 08:00:00.000';
-    const to = 'Sep 21, 2015 @ 08:00:00.000';
-    await PageObjects.common.setTime({ from, to });
-    await PageObjects.common.navigateToApp('discover');
-    await filterBar.addFilter('extension.raw', 'is one of', 'jpg');
-    await queryBar.setQuery('response:200');
-  };
-
-  describe('saved queries saved objects', function describeIndexTests() {
-    before(async function () {
-      log.debug('load kibana index with default index pattern');
-      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
-
-      await kibanaServer.importExport.load(
-        'test/functional/fixtures/kbn_archiver/discover_ccs.json'
-      );
-      await kibanaServer.importExport.load(
-        'test/functional/fixtures/kbn_archiver/date_nested_ccs.json'
-      );
-      await remoteEsArchiver.load('test/functional/fixtures/es_archiver/date_nested');
-      await remoteEsArchiver.load('test/functional/fixtures/es_archiver/logstash_functional');
-
-      await kibanaServer.uiSettings.replace(defaultSettings);
-      log.debug('discover');
-      await PageObjects.common.navigateToApp('discover');
-      await PageObjects.timePicker.setDefaultAbsoluteRange();
-    });
-
-    after(async () => {
-      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover_ccs');
-      await kibanaServer.importExport.unload(
-        'test/functional/fixtures/kbn_archiver/date_nested_ccs'
-      );
-      await remoteEsArchiver.unload('test/functional/fixtures/es_archiver/date_nested');
-      await remoteEsArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
-      await PageObjects.common.unsetTime();
-    });
-
-    describe('saved query selection', () => {
-      before(async () => await setUpQueriesWithFilters());
-
-      it(`should unselect saved query when navigating to a 'new'`, async function () {
-        await savedQueryManagementComponent.saveNewQuery(
-          'test-unselect-saved-query',
-          'mock',
-          true,
-          true
-        );
-
-        await queryBar.submitQuery();
-
-        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
-        expect(await queryBar.getQueryString()).to.eql('response:200');
-
-        await PageObjects.discover.clickNewSearchButton();
-
-        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(false);
-        expect(await queryBar.getQueryString()).to.eql('');
-
-        await PageObjects.discover.selectIndexPattern('ftr-remote:date-nested');
-
-        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(false);
-        expect(await queryBar.getQueryString()).to.eql('');
-
-        await PageObjects.discover.selectIndexPattern('ftr-remote:logstash-*');
-
-        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(false);
-        expect(await queryBar.getQueryString()).to.eql('');
-
-        // reset state
-        await savedQueryManagementComponent.deleteSavedQuery('test-unselect-saved-query');
-      });
-    });
-
-    describe('saved query management component functionality', function () {
-      before(async () => await setUpQueriesWithFilters());
-
-      it('should show the saved query management component when there are no saved queries', async () => {
-        await savedQueryManagementComponent.openSavedQueryManagementComponent();
-        const descriptionText = await testSubjects.getVisibleText('saved-query-management-popover');
-        expect(descriptionText).to.eql(
-          'Saved Queries\nThere are no saved queries. Save query text and filters that you want to use again.\nSave current query'
-        );
-      });
-
-      it('should allow a query to be saved via the saved objects management component', async () => {
-        await savedQueryManagementComponent.saveNewQuery(
-          'OkResponse',
-          '200 responses for .jpg over 24 hours',
-          true,
-          true
-        );
-        await savedQueryManagementComponent.savedQueryExistOrFail('OkResponse');
-        await savedQueryManagementComponent.savedQueryTextExist('response:200');
-      });
-
-      it('reinstates filters and the time filter when a saved query has filters and a time filter included', async () => {
-        await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        const timePickerValues = await PageObjects.timePicker.getTimeConfigAsAbsoluteTimes();
-        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
-        expect(timePickerValues.start).to.not.eql(PageObjects.timePicker.defaultStartTime);
-        expect(timePickerValues.end).to.not.eql(PageObjects.timePicker.defaultEndTime);
-      });
-
-      it('preserves the currently loaded query when the page is reloaded', async () => {
-        await browser.refresh();
-        const timePickerValues = await PageObjects.timePicker.getTimeConfigAsAbsoluteTimes();
-        expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
-        expect(timePickerValues.start).to.not.eql(PageObjects.timePicker.defaultStartTime);
-        expect(timePickerValues.end).to.not.eql(PageObjects.timePicker.defaultEndTime);
-        await retry.waitFor(
-          'the right hit count',
-          async () => (await PageObjects.discover.getHitCount()) === '2,792'
-        );
-        expect(await savedQueryManagementComponent.getCurrentlyLoadedQueryID()).to.be('OkResponse');
-      });
-
-      it('allows saving changes to a currently loaded query via the saved query management component', async () => {
-        await queryBar.setQuery('response:404');
-        await savedQueryManagementComponent.updateCurrentlyLoadedQuery('OkResponse', false, false);
-        await savedQueryManagementComponent.savedQueryExistOrFail('OkResponse');
-        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
-        expect(await queryBar.getQueryString()).to.eql('');
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        expect(await queryBar.getQueryString()).to.eql('response:404');
-      });
-
-      it('allows saving the currently loaded query as a new query', async () => {
-        await savedQueryManagementComponent.saveCurrentlyLoadedAsNewQuery(
-          'OkResponseCopy',
-          '200 responses',
-          false,
-          false
-        );
-        await savedQueryManagementComponent.savedQueryExistOrFail('OkResponseCopy');
-      });
-
-      it('allows deleting the currently loaded saved query in the saved query management component and clears the query', async () => {
-        await savedQueryManagementComponent.deleteSavedQuery('OkResponseCopy');
-        await savedQueryManagementComponent.savedQueryMissingOrFail('OkResponseCopy');
-        expect(await queryBar.getQueryString()).to.eql('');
-      });
-
-      it('does not allow saving a query with a non-unique name', async () => {
-        // this check allows this test to run stand alone, also should fix occacional flakiness
-        const savedQueryExists = await savedQueryManagementComponent.savedQueryExist('OkResponse');
-        if (!savedQueryExists) {
-          await savedQueryManagementComponent.saveNewQuery(
-            'OkResponse',
-            '200 responses for .jpg over 24 hours',
-            true,
-            true
-          );
-          await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
-        }
-        await savedQueryManagementComponent.saveNewQueryWithNameError('OkResponse');
-      });
-
-      it('resets any changes to a loaded query on reloading the same saved query', async () => {
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        await queryBar.setQuery('response:503');
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        expect(await queryBar.getQueryString()).to.eql('response:404');
-      });
-
-      it('allows clearing the currently loaded saved query', async () => {
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
-        expect(await queryBar.getQueryString()).to.eql('');
-      });
-
-      it('allows clearing if non default language was remembered in localstorage', async () => {
-        await queryBar.switchQueryLanguage('lucene');
-        await PageObjects.common.navigateToApp('discover'); // makes sure discovered is reloaded without any state in url
-        await queryBar.expectQueryLanguageOrFail('lucene'); // make sure lucene is remembered after refresh (comes from localstorage)
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        await queryBar.expectQueryLanguageOrFail('kql');
-        await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
-        await queryBar.expectQueryLanguageOrFail('lucene');
-      });
-
-      it('changing language removes saved query', async () => {
-        await savedQueryManagementComponent.loadSavedQuery('OkResponse');
-        await queryBar.switchQueryLanguage('lucene');
-        expect(await queryBar.getQueryString()).to.eql('');
-      });
-    });
-  });
-}
diff --git a/test/functional_ccs/services/index.ts b/test/functional_ccs/services/index.ts
deleted file mode 100644
index dcdffa077fe08..0000000000000
--- a/test/functional_ccs/services/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { services as functionalServices } from '../../functional/services';
-import { RemoteEsProvider } from './remote_es';
-import { RemoteEsArchiverProvider } from './remote_es_archiver';
-
-export const services = {
-  ...functionalServices,
-  remoteEs: RemoteEsProvider,
-  remoteEsArchiver: RemoteEsArchiverProvider,
-};
diff --git a/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts b/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
index 3373da1180d09..8af208ce69da9 100644
--- a/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
+++ b/test/interactive_setup_api_integration/fixtures/test_endpoints/server/index.ts
@@ -9,7 +9,7 @@
 import fs from 'fs/promises';
 import path from 'path';
 
-import type { PluginInitializer, PrebootPlugin } from 'kibana/server';
+import type { PluginInitializer, PrebootPlugin } from '@kbn/core/server';
 
 export const plugin: PluginInitializer<void, never> = (initializerContext): PrebootPlugin => ({
   setup: (core) => {
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx
index 66db420c99997..9acbf092f97ae 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { Main } from './components/main';
 
 export const renderApp = ({ element }: AppMountParameters) => {
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
index 6d132c3acb730..426137101c705 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
@@ -10,10 +10,7 @@ import './main.scss';
 import React from 'react';
 import { EuiPage, EuiPageBody, EuiPageContent, EuiPageContentHeader } from '@elastic/eui';
 import { first, pluck } from 'rxjs/operators';
-import {
-  IInterpreterRenderHandlers,
-  ExpressionValue,
-} from '../../../../../../../src/plugins/expressions/public';
+import { IInterpreterRenderHandlers, ExpressionValue } from '@kbn/expressions-plugin/public';
 import { ExpressionRenderHandler } from '../../types';
 import { getExpressions } from '../../services';
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts
index 897fbf832d561..ec3b4549e2958 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'src/core/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import { Plugin, StartDeps } from './plugin';
 export type { StartDeps };
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts
index c4f37f121b84b..fbf14f3e3b38f 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/public';
 import { ExpressionsStart } from './types';
 import { setExpressions } from './services';
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts
index 5846fe5723c53..35b7c93c54301 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../../../../src/plugins/kibana_utils/public';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
 import { ExpressionsStart } from './types';
 
 export const [getExpressions, setExpressions] = createGetterSetter<ExpressionsStart>('Expressions');
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts
index 02872843cf8bc..56d04da36f62a 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionsStart, ExpressionRenderHandler } from 'src/plugins/expressions/public';
-import { Adapters } from 'src/plugins/inspector/public';
+import { ExpressionsStart, ExpressionRenderHandler } from '@kbn/expressions-plugin/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 
 export type { ExpressionsStart, Adapters };
 export { ExpressionRenderHandler };
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts
index 4a6ce20d80f62..0230677a9d7e1 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from '../../../../../src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { TestPlugin, TestPluginSetup, TestPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<TestPluginSetup, TestPluginStart> = () => new TestPlugin();
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
index a4903fedd22d5..2a87a70c804bb 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
@@ -8,9 +8,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { pluck } from 'rxjs/operators';
-import { CoreSetup, Plugin, HttpResponsePayload } from '../../../../../src/core/server';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
-import { ExpressionsServerStart } from '../../../../../src/plugins/expressions/server';
+import { CoreSetup, Plugin, HttpResponsePayload } from '@kbn/core/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { ExpressionsServerStart } from '@kbn/expressions-plugin/server';
 
 export interface TestStartDeps {
   data: DataPluginStart;
diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts
index b52bd7904a256..843fee17d866c 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { DatatableRow } from 'src/plugins/expressions';
+import { DatatableRow } from '@kbn/expressions-plugin';
 import { ExpectExpression, expectExpressionProvider } from './helpers';
 import { FtrProviderContext } from '../../../functional/ftr_provider_context';
 
diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
index 8fbb71a25edc5..6ab2d776fdcf9 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import { ExpectExpression, expectExpressionProvider } from './helpers';
 import { FtrProviderContext } from '../../../functional/ftr_provider_context';
 
diff --git a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
index 24906032245bf..94e32e7f0a10e 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ExpressionValue } from 'src/plugins/expressions';
+import { ExpressionValue } from '@kbn/expressions-plugin';
 import { FtrProviderContext } from '../../../functional/ftr_provider_context';
 
 declare global {
diff --git a/test/new_visualize_flow/dashboard_embedding.ts b/test/new_visualize_flow/dashboard_embedding.ts
index 3470973f9c96c..57e997043906b 100644
--- a/test/new_visualize_flow/dashboard_embedding.ts
+++ b/test/new_visualize_flow/dashboard_embedding.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../functional/ftr_provider_context';
 
 /**
  * This tests both that one of each visualization can be added to a dashboard (as opposed to opening an existing
diff --git a/test/plugin_functional/plugins/app_link_test/public/app.tsx b/test/plugin_functional/plugins/app_link_test/public/app.tsx
index ca0c12dfff894..24b851f64aa5f 100644
--- a/test/plugin_functional/plugins/app_link_test/public/app.tsx
+++ b/test/plugin_functional/plugins/app_link_test/public/app.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, IBasePath, ApplicationStart } from 'kibana/public';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
+import { AppMountParameters, IBasePath, ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
 const FooApp = ({
   appId,
diff --git a/test/plugin_functional/plugins/app_link_test/public/index.ts b/test/plugin_functional/plugins/app_link_test/public/index.ts
index deec3d61a0d64..61f988c985e6f 100644
--- a/test/plugin_functional/plugins/app_link_test/public/index.ts
+++ b/test/plugin_functional/plugins/app_link_test/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppLinkPlugin, CoreAppLinkPluginSetup, CoreAppLinkPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/app_link_test/public/plugin.ts b/test/plugin_functional/plugins/app_link_test/public/plugin.ts
index 8d75cb09469bc..a4c80bdcfc578 100644
--- a/test/plugin_functional/plugins/app_link_test/public/plugin.ts
+++ b/test/plugin_functional/plugins/app_link_test/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { renderApp } from './app';
 
 export class CoreAppLinkPlugin implements Plugin<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> {
diff --git a/test/plugin_functional/plugins/core_app_status/public/application.tsx b/test/plugin_functional/plugins/core_app_status/public/application.tsx
index 6194947ac3515..8a3a8eefd4cbc 100644
--- a/test/plugin_functional/plugins/core_app_status/public/application.tsx
+++ b/test/plugin_functional/plugins/core_app_status/public/application.tsx
@@ -20,7 +20,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const AppStatusApp = ({ appId }: { appId: string }) => (
   <EuiPage>
diff --git a/test/plugin_functional/plugins/core_app_status/public/index.ts b/test/plugin_functional/plugins/core_app_status/public/index.ts
index 32289f4ebd0bc..17d3e9edab313 100644
--- a/test/plugin_functional/plugins/core_app_status/public/index.ts
+++ b/test/plugin_functional/plugins/core_app_status/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppStatusPlugin, CoreAppStatusPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<{}, CoreAppStatusPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
index e166af63a3ca4..e5be727bea174 100644
--- a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
@@ -14,7 +14,7 @@ import {
   AppUpdatableFields,
   CoreStart,
   AppMountParameters,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { renderApp } from './application';
 import './types';
 
diff --git a/test/plugin_functional/plugins/core_history_block/public/app.tsx b/test/plugin_functional/plugins/core_history_block/public/app.tsx
index 28866426f281b..29ccf03ad890a 100644
--- a/test/plugin_functional/plugins/core_history_block/public/app.tsx
+++ b/test/plugin_functional/plugins/core_history_block/public/app.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Switch, Route, Prompt } from 'react-router-dom';
-import type { AppMountParameters, IBasePath, ApplicationStart } from 'kibana/public';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
+import type { AppMountParameters, IBasePath, ApplicationStart } from '@kbn/core/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
 const HomePage = ({
   basePath,
diff --git a/test/plugin_functional/plugins/core_history_block/public/index.ts b/test/plugin_functional/plugins/core_history_block/public/index.ts
index deec3d61a0d64..61f988c985e6f 100644
--- a/test/plugin_functional/plugins/core_history_block/public/index.ts
+++ b/test/plugin_functional/plugins/core_history_block/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppLinkPlugin, CoreAppLinkPluginSetup, CoreAppLinkPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_history_block/public/plugin.ts b/test/plugin_functional/plugins/core_history_block/public/plugin.ts
index 3483d8dfee513..d88044cf8058f 100644
--- a/test/plugin_functional/plugins/core_history_block/public/plugin.ts
+++ b/test/plugin_functional/plugins/core_history_block/public/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { renderApp } from './app';
 
 export class CoreAppLinkPlugin implements Plugin<CoreAppLinkPluginSetup, CoreAppLinkPluginStart> {
diff --git a/test/plugin_functional/plugins/core_http/public/index.ts b/test/plugin_functional/plugins/core_http/public/index.ts
index 7b353cb1d2905..f79197b69b917 100644
--- a/test/plugin_functional/plugins/core_http/public/index.ts
+++ b/test/plugin_functional/plugins/core_http/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreHttpPlugin, CoreHttpPluginSetup, CoreHttpPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreHttpPluginSetup, CoreHttpPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_http/public/plugin.tsx b/test/plugin_functional/plugins/core_http/public/plugin.tsx
index 64b59847ffd1b..ec57278ae3cf9 100644
--- a/test/plugin_functional/plugins/core_http/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_http/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CoreHttpPlugin implements Plugin<CoreHttpPluginSetup, CoreHttpPluginStart> {
   public setup({ http }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_http/server/plugin.ts b/test/plugin_functional/plugins/core_http/server/plugin.ts
index 533e3b22b368b..f767f96c44408 100644
--- a/test/plugin_functional/plugins/core_http/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_http/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'kibana/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class CoreHttpPlugin implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
index 6682c00b2482e..29195feb67a44 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -25,7 +25,7 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 
-import { CoreStart, AppMountParameters } from 'kibana/public';
+import { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="fooAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/index.ts b/test/plugin_functional/plugins/core_plugin_a/public/index.ts
index 58ed51e923b1e..70dc8ec7b54e7 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_a/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CorePluginAPlugin, CorePluginAPluginSetup, CorePluginAPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CorePluginAPluginSetup, CorePluginAPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
index b7b1b8dd2eed3..0f3478efc3c75 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CorePluginAPlugin implements Plugin<CorePluginAPluginSetup, CorePluginAPluginStart> {
   public setup(core: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts
index c65690e8532fd..aa86662871c29 100644
--- a/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup, RequestHandlerContext } from 'kibana/server';
+import type { Plugin, CoreSetup, RequestHandlerContext } from '@kbn/core/server';
 
 export interface PluginAApiRequestContext {
   ping: () => Promise<string>;
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx b/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx
index 7205fff3fa714..bf8f2740668a4 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx
@@ -20,7 +20,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const App = ({ appName }: { appName: string }) => (
   <EuiPage>
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts b/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts
index 82ee6dbf5688a..3e0bc13adc440 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreAppLeavePlugin, CoreAppLeavePluginSetup, CoreAppLeavePluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreAppLeavePluginSetup, CoreAppLeavePluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx
index 0739c858307c8..aab64fc657696 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CoreAppLeavePlugin
   implements Plugin<CoreAppLeavePluginSetup, CoreAppLeavePluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
index 28615a19b6831..5f937e6e8dcbe 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
@@ -25,7 +25,7 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 
-import { CoreStart, AppMountParameters } from 'kibana/public';
+import { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="barAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/index.ts b/test/plugin_functional/plugins/core_plugin_b/public/index.ts
index eb59363c23930..28d230275bc36 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import {
   CorePluginBDeps,
   CorePluginBPlugin,
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
index 2fbf57b2a7104..536515606ea38 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
-import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { CorePluginAPluginSetup } from '@kbn/core-plugin-a-plugin/public/plugin';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
index ae7abdaebba10..c9617eb81e8fb 100644
--- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, RequestHandlerContext } from 'kibana/server';
+import { Plugin, CoreSetup, RequestHandlerContext } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { PluginAApiRequestContext } from '../../core_plugin_a/server';
+import { PluginAApiRequestContext } from '@kbn/core-plugin-a-plugin/server';
 
 interface PluginBContext extends RequestHandlerContext {
   pluginA: PluginAApiRequestContext;
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx b/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx
index a3b84c86f39fa..b8e03bfef4c95 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx
@@ -21,7 +21,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="chromelessAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts b/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts
index b54d3cbea9681..12b3a5f54541c 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   CorePluginChromelessPlugin,
   CorePluginChromelessPluginSetup,
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx
index 47b33479e45ff..1e089790bc6a3 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CorePluginChromelessPlugin
   implements Plugin<CorePluginChromelessPluginSetup, CorePluginChromelessPluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx b/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
index 90814bd552d37..595124184d699 100644
--- a/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
@@ -25,7 +25,7 @@ import {
   EuiSideNav,
 } from '@elastic/eui';
 
-import { CoreStart, AppMountParameters } from 'kibana/public';
+import { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 const Home = () => (
   <EuiPageBody data-test-subj="dlAppHome">
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts b/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
index d908134d27d62..a59d179042ee6 100644
--- a/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   CorePluginDeepLinksPlugin,
   CorePluginDeepLinksPluginSetup,
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx
index d53810d32c324..f7e3102f0b230 100644
--- a/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
-import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../../src/core/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '@kbn/core/public';
 
 export class CorePluginDeepLinksPlugin
   implements Plugin<CorePluginDeepLinksPluginSetup, CorePluginDeepLinksPluginStart>
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx b/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx
index e2166a249e34b..bfb149c3f184f 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/public/application.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const DeprecationsApp = () => <div>Deprcations App</div>;
 
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts b/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts
index bb6b3f0740b3b..ea8dd52735843 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import {
   CorePluginDeprecationsPlugin,
   CorePluginDeprecationsPluginSetup,
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx
index 1ae9b15be97d1..443ccd8c2e1da 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
index aca0fca301a13..22a69c55b80bc 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
@@ -8,7 +8,7 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { get } from 'lodash';
-import type { PluginConfigDescriptor } from 'kibana/server';
+import type { PluginConfigDescriptor } from '@kbn/core/server';
 import type { ConfigDeprecation } from '@kbn/config';
 
 const configSchema = schema.object({
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
index 8e78a2c279d67..9edfe5034a3d0 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
@@ -6,7 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup, GetDeprecationsContext, DeprecationsDetails } from 'kibana/server';
+import type {
+  Plugin,
+  CoreSetup,
+  GetDeprecationsContext,
+  DeprecationsDetails,
+} from '@kbn/core/server';
 import { registerRoutes } from './routes';
 async function getDeprecations({
   savedObjectsClient,
diff --git a/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts b/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts
index d6bf065898f93..ca7c17d1c94d2 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/routes.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { HttpServiceSetup } from 'kibana/server';
+import type { HttpServiceSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
 export function registerRoutes(http: HttpServiceSetup) {
diff --git a/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts
index 530b90eb5e6d0..69001eb58b6f1 100644
--- a/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_execution_context/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'kibana/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class CorePluginExecutionContext implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx b/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx
index 7205fff3fa714..bf8f2740668a4 100644
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/public/application.tsx
@@ -20,7 +20,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 const App = ({ appName }: { appName: string }) => (
   <EuiPage>
diff --git a/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts b/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts
index d5bcab69d7957..de210b22b017e 100644
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { CoreHelpMenuPlugin, CoreHelpMenuPluginSetup, CoreHelpMenuPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<CoreHelpMenuPluginSetup, CoreHelpMenuPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx
index 15357639f155b..5f10db820153f 100644
--- a/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_helpmenu/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CoreHelpMenuPlugin
   implements Plugin<CoreHelpMenuPluginSetup, CoreHelpMenuPluginStart>
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
index f0d58fa4b0d00..fce258c1b8b00 100644
--- a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
 export class CorePluginRouteTimeoutsPlugin implements Plugin {
diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx
index 751d59cfe06b9..79346a5c222b1 100644
--- a/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class CorePluginStaticAssets implements Plugin {
   public setup(core: CoreSetup, deps: {}) {}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
index a9a8ff754fbbd..5afd4d0cdc866 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
+++ b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 import '../types';
 
 export const plugin = () => new CoreProviderPlugin();
diff --git a/test/plugin_functional/plugins/core_provider_plugin/types.ts b/test/plugin_functional/plugins/core_provider_plugin/types.ts
index 85dc0f425519e..4b01019000ef8 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/types.ts
+++ b/test/plugin_functional/plugins/core_provider_plugin/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/plugins/data_search/server/index.ts b/test/plugin_functional/plugins/data_search/server/index.ts
index 4aab40a19e3e0..f7fb397aaedaa 100644
--- a/test/plugin_functional/plugins/data_search/server/index.ts
+++ b/test/plugin_functional/plugins/data_search/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { DataSearchTestPlugin, TestPluginSetup, TestPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<TestPluginSetup, TestPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/data_search/server/plugin.ts b/test/plugin_functional/plugins/data_search/server/plugin.ts
index f48d57ae45460..5258211c544bb 100644
--- a/test/plugin_functional/plugins/data_search/server/plugin.ts
+++ b/test/plugin_functional/plugins/data_search/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 
 export interface DataSearchTestStartDeps {
   data: DataPluginStart;
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
index ab046ab6a0131..d66069aa3ab64 100644
--- a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup, CoreStart, ICustomClusterClient } from 'src/core/server';
+import { Plugin, CoreSetup, CoreStart, ICustomClusterClient } from '@kbn/core/server';
 
 export class ElasticsearchClientPlugin implements Plugin {
   private client?: ICustomClusterClient;
diff --git a/test/plugin_functional/plugins/index_patterns/server/index.ts b/test/plugin_functional/plugins/index_patterns/server/index.ts
index f776ad9a76224..e40b2e7534bfb 100644
--- a/test/plugin_functional/plugins/index_patterns/server/index.ts
+++ b/test/plugin_functional/plugins/index_patterns/server/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import {
   IndexPatternsTestPlugin,
   IndexPatternsTestPluginSetup,
diff --git a/test/plugin_functional/plugins/index_patterns/server/plugin.ts b/test/plugin_functional/plugins/index_patterns/server/plugin.ts
index f168779c2e638..5e6836de2a986 100644
--- a/test/plugin_functional/plugins/index_patterns/server/plugin.ts
+++ b/test/plugin_functional/plugins/index_patterns/server/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 
 export interface IndexPatternsTestStartDeps {
   data: DataPluginStart;
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts
index da745baafe30b..a7453f8c8ba65 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   SampelPanelActionTestPlugin,
   SampelPanelActionTestPluginSetup,
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts
index b1ff7ba4ee7ff..e36cdac61e3fb 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/public';
-import { UiActionsSetup } from '../../../../../src/plugins/ui_actions/public';
-import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { createSamplePanelAction } from './sample_panel_action';
 import { createSamplePanelLink } from './sample_panel_link';
 
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx
index e55de5fbcacb9..e35e10b4808b0 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx
@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
 import React from 'react';
 
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export const SAMPLE_PANEL_ACTION = 'samplePanelAction';
 
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts
index 2c4d95b5067a5..a95f17df8251e 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Action, createAction } from '../../../../../src/plugins/ui_actions/public';
+import { Action, createAction } from '@kbn/ui-actions-plugin/public';
 
 export const SAMPLE_PANEL_LINK = 'samplePanelLink';
 
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx b/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx
index dbfd6cdcd0018..045a36840a394 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { AppPluginDependencies } from './types';
 
 export const renderApp = (
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/index.ts b/test/plugin_functional/plugins/kbn_top_nav/public/index.ts
index 13fef691bb24c..95390c82d7466 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/index.ts
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { TopNavTestPlugin, TopNavTestPluginSetup, TopNavTestPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<TopNavTestPluginSetup, TopNavTestPluginStart> = () =>
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx b/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx
index 9813206d3b702..55dac9b58379c 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin, AppMountParameters } from 'kibana/public';
-import { NavigationPublicPluginSetup } from '../../../../../src/plugins/navigation/public';
+import { CoreSetup, Plugin, AppMountParameters } from '@kbn/core/public';
+import { NavigationPublicPluginSetup } from '@kbn/navigation-plugin/public';
 import { AppPluginDependencies } from './types';
 
 export class TopNavTestPlugin implements Plugin<TopNavTestPluginSetup, TopNavTestPluginStart> {
diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/types.ts b/test/plugin_functional/plugins/kbn_top_nav/public/types.ts
index 0618575397a06..f209e5e3f472b 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/public/types.ts
+++ b/test/plugin_functional/plugins/kbn_top_nav/public/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 export interface AppPluginDependencies {
   navigation: NavigationPublicPluginStart;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts
index 1f6a864d2c852..7c435bb951c9b 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   CustomVisualizationsPublicPlugin,
   CustomVisualizationsSetup,
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts
index b1f1cec78bd64..a81cb2d827267 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from 'src/plugins/visualizations/public';
-import { Plugin as ExpressionsPlugin } from '../../../../../src/plugins/expressions/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
+import { Plugin as ExpressionsPlugin } from '@kbn/expressions-plugin/public';
 
 import { SelfChangingEditor } from './self_changing_vis/self_changing_editor';
 import { selfChangingVisFn, SelfChangingVisParams } from './self_changing_vis_fn';
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx
index 3b622ea642957..2ffe694e37b5e 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_editor.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
+import { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
 
 interface CounterParams {
   counter: number;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts
index 6176173e24717..7066ce1d3cdfd 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_fn.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunctionDefinition, Render } from 'src/plugins/expressions/public';
-import { KibanaContext } from 'src/plugins/data/public';
+import { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
+import { KibanaContext } from '@kbn/data-plugin/public';
 
 export interface SelfChangingVisParams {
   counter: number;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx
index 6a62fa629921f..4dcae9672861c 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import { SelfChangingComponent } from './self_changing_vis/self_changing_components';
 import { SelfChangingVisRenderValue } from './self_changing_vis_fn';
 
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts
index 4e74e3170c3e8..1dd1c73eef39a 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/to_ast.ts
@@ -6,11 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { VisToExpressionAst } from 'src/plugins/visualizations/public';
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../src/plugins/expressions/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
   SelfChangingVisExpressionFunctionDefinition,
   SelfChangingVisParams,
diff --git a/test/plugin_functional/plugins/management_test_plugin/public/index.ts b/test/plugin_functional/plugins/management_test_plugin/public/index.ts
index 813845e2255c1..878748bf0d963 100644
--- a/test/plugin_functional/plugins/management_test_plugin/public/index.ts
+++ b/test/plugin_functional/plugins/management_test_plugin/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   ManagementTestPlugin,
   ManagementTestPluginSetup,
diff --git a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
index a2cbe6aa5e48f..99129b2375f3d 100644
--- a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
+++ b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx
@@ -9,8 +9,8 @@
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Switch, Route, Link } from 'react-router-dom';
-import { CoreSetup, Plugin } from 'kibana/public';
-import { ManagementSetup } from '../../../../../src/plugins/management/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
 
 export class ManagementTestPlugin
   implements Plugin<ManagementTestPluginSetup, ManagementTestPluginStart>
diff --git a/test/plugin_functional/plugins/rendering_plugin/public/index.ts b/test/plugin_functional/plugins/rendering_plugin/public/index.ts
index b836a53eaeaee..df88a9223cd41 100644
--- a/test/plugin_functional/plugins/rendering_plugin/public/index.ts
+++ b/test/plugin_functional/plugins/rendering_plugin/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { RenderingPlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new RenderingPlugin();
diff --git a/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx b/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx
index 985dac86bc85f..c18f096a6d82d 100644
--- a/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx
+++ b/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
 export class RenderingPlugin implements Plugin {
   public setup(core: CoreSetup) {
diff --git a/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts b/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts
index d2e4d4386cbfd..fdf3f0853d84b 100644
--- a/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts
+++ b/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 import { schema } from '@kbn/config-schema';
 
diff --git a/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts b/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts
index 0fd5c467d081b..ce8119cfd0acc 100644
--- a/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts
+++ b/test/plugin_functional/plugins/saved_object_export_transforms/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class SavedObjectExportTransformsPlugin implements Plugin {
   public setup({ savedObjects, getStartServices }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts b/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts
index aef9a6139be4d..364f094ccf7cb 100644
--- a/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts
+++ b/test/plugin_functional/plugins/saved_object_import_warnings/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class SavedObjectImportWarningsPlugin implements Plugin {
   public setup({ savedObjects }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts b/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts
index da2a0a2def1c2..6f72129959ea7 100644
--- a/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts
+++ b/test/plugin_functional/plugins/saved_objects_hidden_type/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class SavedObjectsHiddenTypePlugin implements Plugin {
   public setup({ savedObjects }: CoreSetup, deps: {}) {
diff --git a/test/plugin_functional/plugins/session_notifications/public/index.ts b/test/plugin_functional/plugins/session_notifications/public/index.ts
index 1bfe0c39ffede..c8729cf62fd98 100644
--- a/test/plugin_functional/plugins/session_notifications/public/index.ts
+++ b/test/plugin_functional/plugins/session_notifications/public/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { SessionNotificationsPlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new SessionNotificationsPlugin();
diff --git a/test/plugin_functional/plugins/session_notifications/public/plugin.tsx b/test/plugin_functional/plugins/session_notifications/public/plugin.tsx
index 79b1f1a85b12a..c84cb0530c09c 100644
--- a/test/plugin_functional/plugins/session_notifications/public/plugin.tsx
+++ b/test/plugin_functional/plugins/session_notifications/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { AppPluginDependenciesStart, AppPluginDependenciesSetup } from './types';
 
 export class SessionNotificationsPlugin implements Plugin {
diff --git a/test/plugin_functional/plugins/session_notifications/public/types.ts b/test/plugin_functional/plugins/session_notifications/public/types.ts
index 5201fe69ef1dc..8345a112e0c08 100644
--- a/test/plugin_functional/plugins/session_notifications/public/types.ts
+++ b/test/plugin_functional/plugins/session_notifications/public/types.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { NavigationPublicPluginSetup } from '../../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { NavigationPublicPluginSetup } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export interface AppPluginDependenciesSetup {
   navigation: NavigationPublicPluginSetup;
diff --git a/test/plugin_functional/plugins/telemetry/public/plugin.ts b/test/plugin_functional/plugins/telemetry/public/plugin.ts
index 441675b1aa4ed..fd3be98b198ed 100644
--- a/test/plugin_functional/plugins/telemetry/public/plugin.ts
+++ b/test/plugin_functional/plugins/telemetry/public/plugin.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { CoreSetup, Plugin } from 'src/core/public';
-import type { TelemetryPluginSetup } from '../../../../../src/plugins/telemetry/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import type { TelemetryPluginSetup } from '@kbn/telemetry-plugin/public';
 
 interface TelemetryTestPluginSetupDependencies {
   telemetry: TelemetryPluginSetup;
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
index bf04d757a57ca..fee0773a76141 100644
--- a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
+++ b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class UiSettingsPlugin implements Plugin {
   public setup(core: CoreSetup) {
diff --git a/test/plugin_functional/plugins/usage_collection/server/plugin.ts b/test/plugin_functional/plugins/usage_collection/server/plugin.ts
index 523fbcfe058dc..ff7b3f4221182 100644
--- a/test/plugin_functional/plugins/usage_collection/server/plugin.ts
+++ b/test/plugin_functional/plugins/usage_collection/server/plugin.ts
@@ -6,11 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { Plugin, CoreSetup } from 'kibana/server';
-import {
-  UsageCollectionSetup,
-  UsageCounter,
-} from '../../../../../src/plugins/usage_collection/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { registerRoutes } from './routes';
 
 export interface TestPluginDepsSetup {
diff --git a/test/plugin_functional/plugins/usage_collection/server/routes.ts b/test/plugin_functional/plugins/usage_collection/server/routes.ts
index e67e454512779..45b0ad4433f61 100644
--- a/test/plugin_functional/plugins/usage_collection/server/routes.ts
+++ b/test/plugin_functional/plugins/usage_collection/server/routes.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import type { HttpServiceSetup } from 'kibana/server';
-import { UsageCounter } from '../../../../../src/plugins/usage_collection/server';
+import type { HttpServiceSetup } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function registerRoutes(http: HttpServiceSetup, usageCounter: UsageCounter) {
   const router = http.createRouter();
diff --git a/test/plugin_functional/test_suites/application_links/redirect_app_links.ts b/test/plugin_functional/test_suites/application_links/redirect_app_links.ts
index 41e50eedec323..940ca8983a398 100644
--- a/test/plugin_functional/test_suites/application_links/redirect_app_links.ts
+++ b/test/plugin_functional/test_suites/application_links/redirect_app_links.ts
@@ -9,7 +9,7 @@
 import url from 'url';
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_app_status/public/types';
+import '@kbn/core-app-status-plugin/public/types';
 
 declare global {
   interface Window {
diff --git a/test/plugin_functional/test_suites/core/deprecations.ts b/test/plugin_functional/test_suites/core/deprecations.ts
index bb533c18f7340..4b63f62670cca 100644
--- a/test/plugin_functional/test_suites/core/deprecations.ts
+++ b/test/plugin_functional/test_suites/core/deprecations.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
-import type { DomainDeprecationDetails, DeprecationsGetResponse } from 'src/core/server/types';
-import type { ResolveDeprecationResponse } from 'src/core/public';
+import type { DomainDeprecationDetails, DeprecationsGetResponse } from '@kbn/core/server/types';
+import type { ResolveDeprecationResponse } from '@kbn/core/public';
 import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
diff --git a/test/plugin_functional/test_suites/core_plugins/application_status.ts b/test/plugin_functional/test_suites/core_plugins/application_status.ts
index 4c5e5f3103017..8dbb62290d389 100644
--- a/test/plugin_functional/test_suites/core_plugins/application_status.ts
+++ b/test/plugin_functional/test_suites/core_plugins/application_status.ts
@@ -12,9 +12,9 @@ import {
   AppNavLinkStatus,
   AppStatus,
   AppUpdatableFields,
-} from '../../../../src/core/public/application/types';
+} from '@kbn/core/public/application/types';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_app_status/public/types';
+import '@kbn/core-app-status-plugin/public/types';
 
 const getKibanaUrl = (pathname?: string, search?: string) =>
   Url.format({
diff --git a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts b/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
index de6ba6cb243f6..b823084aeb5ec 100644
--- a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
+++ b/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/plugin_functional/test_suites/core_plugins/execution_context.ts b/test/plugin_functional/test_suites/core_plugins/execution_context.ts
index 6d1da821d3daa..9ca1c202b3140 100644
--- a/test/plugin_functional/test_suites/core_plugins/execution_context.ts
+++ b/test/plugin_functional/test_suites/core_plugins/execution_context.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   describe('execution context', function () {
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index c18e38cc1a4d6..c75724f294905 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import expect from '@kbn/expect';
 
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 import { PluginFunctionalProviderContext } from '../../services';
 
 declare global {
@@ -129,6 +129,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'telemetry.allowChangingOptInStatus (boolean)',
         'telemetry.banner (boolean)',
         'telemetry.enabled (boolean)',
+        'telemetry.hidePrivacyStatement (boolean)',
         'telemetry.optIn (any)',
         'telemetry.sendUsageFrom (alternatives)',
         'telemetry.sendUsageTo (any)',
diff --git a/test/plugin_functional/test_suites/core_plugins/status.ts b/test/plugin_functional/test_suites/core_plugins/status.ts
index 10ca8c6722046..dd1d98e2d3971 100644
--- a/test/plugin_functional/test_suites/core_plugins/status.ts
+++ b/test/plugin_functional/test_suites/core_plugins/status.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ServiceStatusLevels } from '../../../../src/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
index 1d6b33e41b772..cd35a2c0252c5 100644
--- a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const PageObjects = getPageObjects(['common']);
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
index 7b3f011a5aab3..ccbbf7f4d4259 100644
--- a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const PageObjects = getPageObjects(['common']);
diff --git a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
index 7947616ac6568..3fd87c20889a1 100644
--- a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
+++ b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts
@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
-import '../../plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 export default function ({ getService }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts b/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts
index 90cb27e5babef..1b2fa3343d7aa 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
-import type { SavedObject } from '../../../../src/core/types';
-import type { SavedObjectsExportResultDetails } from '../../../../src/core/server';
+import type { SavedObject } from '@kbn/core/types';
+import type { SavedObjectsExportResultDetails } from '@kbn/core/server';
 import { PluginFunctionalProviderContext } from '../../services';
 
 function parseNdJson(input: string): Array<SavedObject<any>> {
diff --git a/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts b/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
index e6d8aa4189f28..9e154ddde153c 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
@@ -9,9 +9,9 @@
 import { join } from 'path';
 import expect from '@kbn/expect';
 import type { Response } from 'supertest';
+import { SavedObject } from '@kbn/core/types';
+import type { SavedObjectManagementTypeInfo } from '@kbn/saved-objects-management-plugin/common/types';
 import type { PluginFunctionalProviderContext } from '../../services';
-import { SavedObject } from '../../../../src/core/types';
-import type { SavedObjectManagementTypeInfo } from '../../../../src/plugins/saved_objects_management/common/types';
 
 function parseNdJson(input: string): Array<SavedObject<any>> {
   return input.split('\n').map((str) => JSON.parse(str));
diff --git a/test/plugin_functional/test_suites/telemetry/telemetry.ts b/test/plugin_functional/test_suites/telemetry/telemetry.ts
index 97db6593874ea..3b087c2705c10 100644
--- a/test/plugin_functional/test_suites/telemetry/telemetry.ts
+++ b/test/plugin_functional/test_suites/telemetry/telemetry.ts
@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { KBN_SCREENSHOT_MODE_ENABLED_KEY } from '@kbn/screenshot-mode-plugin/public';
 import { PluginFunctionalProviderContext } from '../../services';
-import { KBN_SCREENSHOT_MODE_ENABLED_KEY } from '../../../../src/plugins/screenshot_mode/public';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const browser = getService('browser');
diff --git a/test/plugin_functional/test_suites/usage_collection/usage_counters.ts b/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
index f1591165b8d65..0e49b4ddbc91b 100644
--- a/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
+++ b/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
@@ -7,11 +7,11 @@
  */
 
 import expect from '@kbn/expect';
-import { PluginFunctionalProviderContext } from '../../services';
 import {
   UsageCountersSavedObject,
   serializeCounterKey,
-} from '../../../../src/plugins/usage_collection/server/usage_counters';
+} from '@kbn/usage-collection-plugin/server/usage_counters';
+import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
   const supertest = getService('supertest');
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
index b2e4f0dd322c4..302f21c377760 100644
--- a/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_a/server/plugin.ts
@@ -8,12 +8,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { Subject } from 'rxjs';
-import {
-  Plugin,
-  CoreSetup,
-  ServiceStatus,
-  ServiceStatusLevels,
-} from '../../../../../../src/core/server';
+import { Plugin, CoreSetup, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 
 export class StatusPluginAPlugin implements Plugin {
   private status$ = new Subject<ServiceStatus>();
diff --git a/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
index 191e8135f69a9..8b0173aa09a90 100644
--- a/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
+++ b/test/server_integration/__fixtures__/plugins/status_plugin_b/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Plugin } from 'kibana/server';
+import { Plugin } from '@kbn/core/server';
 
 export class StatusPluginBPlugin implements Plugin {
   public setup() {}
diff --git a/test/server_integration/http/platform/status.ts b/test/server_integration/http/platform/status.ts
index c6ca805703bfd..48006576128ce 100644
--- a/test/server_integration/http/platform/status.ts
+++ b/test/server_integration/http/platform/status.ts
@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import type { ServiceStatus, ServiceStatusLevels } from '../../../../src/core/server';
+import type { ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import { FtrProviderContext } from '../../services/types';
 
 type ServiceStatusSerialized = Omit<ServiceStatus, 'level'> & { level: string };
diff --git a/test/server_integration/http/ssl/config.js b/test/server_integration/http/ssl/config.js
index 14381de6667fd..260ba7424d676 100644
--- a/test/server_integration/http/ssl/config.js
+++ b/test/server_integration/http/ssl/config.js
@@ -15,7 +15,7 @@ export default async function ({ readConfigFile }) {
   const certificateAuthorities = [readFileSync(CA_CERT_PATH)];
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/server_integration/http/ssl_redirect/config.js b/test/server_integration/http/ssl_redirect/config.js
index d19883bcfe241..aed7f23593820 100644
--- a/test/server_integration/http/ssl_redirect/config.js
+++ b/test/server_integration/http/ssl_redirect/config.js
@@ -19,7 +19,7 @@ export default async function ({ readConfigFile }) {
   const redirectPort = httpConfig.get('servers.kibana.port') + 1234;
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/server_integration/http/ssl_with_p12/config.js b/test/server_integration/http/ssl_with_p12/config.js
index c4621500e927d..5d2de9e9a9b54 100644
--- a/test/server_integration/http/ssl_with_p12/config.js
+++ b/test/server_integration/http/ssl_with_p12/config.js
@@ -15,7 +15,7 @@ export default async function ({ readConfigFile }) {
   const certificateAuthorities = [readFileSync(CA_CERT_PATH)];
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/test/server_integration/http/ssl_with_p12_intermediate/config.js b/test/server_integration/http/ssl_with_p12_intermediate/config.js
index 7f32bad648351..ffcb9da0fa047 100644
--- a/test/server_integration/http/ssl_with_p12_intermediate/config.js
+++ b/test/server_integration/http/ssl_with_p12_intermediate/config.js
@@ -15,7 +15,7 @@ export default async function ({ readConfigFile }) {
   const certificateAuthorities = [readFileSync(CA1_CERT_PATH), readFileSync(CA2_CERT_PATH)];
 
   return {
-    testFiles: [require.resolve('./')],
+    testFiles: [require.resolve('.')],
     services: {
       ...httpConfig.get('services'),
       supertest: createKibanaSupertestProvider({
diff --git a/tsconfig.base.json b/tsconfig.base.json
index b7c6505389f0c..b8dfc58796297 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -2,13 +2,442 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      // Setup @kbn paths for Bazel compilations
-      "@kbn/*": [
-        "node_modules/@kbn/*",
-        "bazel-out/darwin-fastbuild/bin/packages/kbn-*",
-        "bazel-out/k8-fastbuild/bin/packages/kbn-*",
-        "bazel-out/x64_windows-fastbuild/bin/packages/kbn-*"
-      ],
+      "@kbn/core": ["src/core"],
+      "@kbn/core/*": ["src/core/*"],
+      // START AUTOMATED PACKAGE LISTING
+      "@kbn/bfetch-explorer-plugin": ["examples/bfetch_explorer"],
+      "@kbn/bfetch-explorer-plugin/*": ["examples/bfetch_explorer/*"],
+      "@kbn/dashboard-embeddable-examples-plugin": ["examples/dashboard_embeddable_examples"],
+      "@kbn/dashboard-embeddable-examples-plugin/*": ["examples/dashboard_embeddable_examples/*"],
+      "@kbn/data-view-field-editor-example-plugin": ["examples/data_view_field_editor_example"],
+      "@kbn/data-view-field-editor-example-plugin/*": ["examples/data_view_field_editor_example/*"],
+      "@kbn/developer-examples-plugin": ["examples/developer_examples"],
+      "@kbn/developer-examples-plugin/*": ["examples/developer_examples/*"],
+      "@kbn/embeddable-examples-plugin": ["examples/embeddable_examples"],
+      "@kbn/embeddable-examples-plugin/*": ["examples/embeddable_examples/*"],
+      "@kbn/embeddable-explorer-plugin": ["examples/embeddable_explorer"],
+      "@kbn/embeddable-explorer-plugin/*": ["examples/embeddable_explorer/*"],
+      "@kbn/expressions-explorer-plugin": ["examples/expressions_explorer"],
+      "@kbn/expressions-explorer-plugin/*": ["examples/expressions_explorer/*"],
+      "@kbn/field-formats-example-plugin": ["examples/field_formats_example"],
+      "@kbn/field-formats-example-plugin/*": ["examples/field_formats_example/*"],
+      "@kbn/hello-world-plugin": ["examples/hello_world"],
+      "@kbn/hello-world-plugin/*": ["examples/hello_world/*"],
+      "@kbn/locator-examples-plugin": ["examples/locator_examples"],
+      "@kbn/locator-examples-plugin/*": ["examples/locator_examples/*"],
+      "@kbn/locator-explorer-plugin": ["examples/locator_explorer"],
+      "@kbn/locator-explorer-plugin/*": ["examples/locator_explorer/*"],
+      "@kbn/paertial-results-example-plugin": ["examples/partial_results_example"],
+      "@kbn/paertial-results-example-plugin/*": ["examples/partial_results_example/*"],
+      "@kbn/preboot-example-plugin": ["examples/preboot_example"],
+      "@kbn/preboot-example-plugin/*": ["examples/preboot_example/*"],
+      "@kbn/routing-example-plugin": ["examples/routing_example"],
+      "@kbn/routing-example-plugin/*": ["examples/routing_example/*"],
+      "@kbn/screenshot-mode-example-plugin": ["examples/screenshot_mode_example"],
+      "@kbn/screenshot-mode-example-plugin/*": ["examples/screenshot_mode_example/*"],
+      "@kbn/search-examples-plugin": ["examples/search_examples"],
+      "@kbn/search-examples-plugin/*": ["examples/search_examples/*"],
+      "@kbn/share-examples-plugin": ["examples/share_examples"],
+      "@kbn/share-examples-plugin/*": ["examples/share_examples/*"],
+      "@kbn/state-containers-examples-plugin": ["examples/state_containers_examples"],
+      "@kbn/state-containers-examples-plugin/*": ["examples/state_containers_examples/*"],
+      "@kbn/ui-actions-examples-plugin": ["examples/ui_action_examples"],
+      "@kbn/ui-actions-examples-plugin/*": ["examples/ui_action_examples/*"],
+      "@kbn/ui-actions-explorer-plugin": ["examples/ui_actions_explorer"],
+      "@kbn/ui-actions-explorer-plugin/*": ["examples/ui_actions_explorer/*"],
+      "@kbn/advanced-settings-plugin": ["src/plugins/advanced_settings"],
+      "@kbn/advanced-settings-plugin/*": ["src/plugins/advanced_settings/*"],
+      "@kbn/bfetch-plugin": ["src/plugins/bfetch"],
+      "@kbn/bfetch-plugin/*": ["src/plugins/bfetch/*"],
+      "@kbn/expression-gauge-plugin": ["src/plugins/chart_expressions/expression_gauge"],
+      "@kbn/expression-gauge-plugin/*": ["src/plugins/chart_expressions/expression_gauge/*"],
+      "@kbn/expression-heatmap-plugin": ["src/plugins/chart_expressions/expression_heatmap"],
+      "@kbn/expression-heatmap-plugin/*": ["src/plugins/chart_expressions/expression_heatmap/*"],
+      "@kbn/expression-metric-vis-plugin": ["src/plugins/chart_expressions/expression_metric"],
+      "@kbn/expression-metric-vis-plugin/*": ["src/plugins/chart_expressions/expression_metric/*"],
+      "@kbn/expression-partition-vis-plugin": ["src/plugins/chart_expressions/expression_partition_vis"],
+      "@kbn/expression-partition-vis-plugin/*": ["src/plugins/chart_expressions/expression_partition_vis/*"],
+      "@kbn/expression-tagcloud-plugin": ["src/plugins/chart_expressions/expression_tagcloud"],
+      "@kbn/expression-tagcloud-plugin/*": ["src/plugins/chart_expressions/expression_tagcloud/*"],
+      "@kbn/expression-xy-plugin": ["src/plugins/chart_expressions/expression_xy"],
+      "@kbn/expression-xy-plugin/*": ["src/plugins/chart_expressions/expression_xy/*"],
+      "@kbn/charts-plugin": ["src/plugins/charts"],
+      "@kbn/charts-plugin/*": ["src/plugins/charts/*"],
+      "@kbn/console-plugin": ["src/plugins/console"],
+      "@kbn/console-plugin/*": ["src/plugins/console/*"],
+      "@kbn/controls-plugin": ["src/plugins/controls"],
+      "@kbn/controls-plugin/*": ["src/plugins/controls/*"],
+      "@kbn/custom-integrations-plugin": ["src/plugins/custom_integrations"],
+      "@kbn/custom-integrations-plugin/*": ["src/plugins/custom_integrations/*"],
+      "@kbn/dashboard-plugin": ["src/plugins/dashboard"],
+      "@kbn/dashboard-plugin/*": ["src/plugins/dashboard/*"],
+      "@kbn/data-view-editor-plugin": ["src/plugins/data_view_editor"],
+      "@kbn/data-view-editor-plugin/*": ["src/plugins/data_view_editor/*"],
+      "@kbn/data-view-field-editor-plugin": ["src/plugins/data_view_field_editor"],
+      "@kbn/data-view-field-editor-plugin/*": ["src/plugins/data_view_field_editor/*"],
+      "@kbn/data-view-management-plugin": ["src/plugins/data_view_management"],
+      "@kbn/data-view-management-plugin/*": ["src/plugins/data_view_management/*"],
+      "@kbn/data-views-plugin": ["src/plugins/data_views"],
+      "@kbn/data-views-plugin/*": ["src/plugins/data_views/*"],
+      "@kbn/data-plugin": ["src/plugins/data"],
+      "@kbn/data-plugin/*": ["src/plugins/data/*"],
+      "@kbn/dev-tools-plugin": ["src/plugins/dev_tools"],
+      "@kbn/dev-tools-plugin/*": ["src/plugins/dev_tools/*"],
+      "@kbn/discover-plugin": ["src/plugins/discover"],
+      "@kbn/discover-plugin/*": ["src/plugins/discover/*"],
+      "@kbn/embeddable-plugin": ["src/plugins/embeddable"],
+      "@kbn/embeddable-plugin/*": ["src/plugins/embeddable/*"],
+      "@kbn/es-ui-shared-plugin": ["src/plugins/es_ui_shared"],
+      "@kbn/es-ui-shared-plugin/*": ["src/plugins/es_ui_shared/*"],
+      "@kbn/event-annotation-plugin": ["src/plugins/event_annotation"],
+      "@kbn/event-annotation-plugin/*": ["src/plugins/event_annotation/*"],
+      "@kbn/expression-error-plugin": ["src/plugins/expression_error"],
+      "@kbn/expression-error-plugin/*": ["src/plugins/expression_error/*"],
+      "@kbn/expression-image-plugin": ["src/plugins/expression_image"],
+      "@kbn/expression-image-plugin/*": ["src/plugins/expression_image/*"],
+      "@kbn/expression-metric-plugin": ["src/plugins/expression_metric"],
+      "@kbn/expression-metric-plugin/*": ["src/plugins/expression_metric/*"],
+      "@kbn/expression-repeat-image-plugin": ["src/plugins/expression_repeat_image"],
+      "@kbn/expression-repeat-image-plugin/*": ["src/plugins/expression_repeat_image/*"],
+      "@kbn/expression-reveal-image-plugin": ["src/plugins/expression_reveal_image"],
+      "@kbn/expression-reveal-image-plugin/*": ["src/plugins/expression_reveal_image/*"],
+      "@kbn/expression-shape-plugin": ["src/plugins/expression_shape"],
+      "@kbn/expression-shape-plugin/*": ["src/plugins/expression_shape/*"],
+      "@kbn/expressions-plugin": ["src/plugins/expressions"],
+      "@kbn/expressions-plugin/*": ["src/plugins/expressions/*"],
+      "@kbn/field-formats-plugin": ["src/plugins/field_formats"],
+      "@kbn/field-formats-plugin/*": ["src/plugins/field_formats/*"],
+      "@kbn/home-plugin": ["src/plugins/home"],
+      "@kbn/home-plugin/*": ["src/plugins/home/*"],
+      "@kbn/input-control-vis-plugin": ["src/plugins/input_control_vis"],
+      "@kbn/input-control-vis-plugin/*": ["src/plugins/input_control_vis/*"],
+      "@kbn/inspector-plugin": ["src/plugins/inspector"],
+      "@kbn/inspector-plugin/*": ["src/plugins/inspector/*"],
+      "@kbn/interactive-setup-plugin": ["src/plugins/interactive_setup"],
+      "@kbn/interactive-setup-plugin/*": ["src/plugins/interactive_setup/*"],
+      "@kbn/kibana-overview-plugin": ["src/plugins/kibana_overview"],
+      "@kbn/kibana-overview-plugin/*": ["src/plugins/kibana_overview/*"],
+      "@kbn/kibana-react-plugin": ["src/plugins/kibana_react"],
+      "@kbn/kibana-react-plugin/*": ["src/plugins/kibana_react/*"],
+      "@kbn/kibana-usage-collection-plugin": ["src/plugins/kibana_usage_collection"],
+      "@kbn/kibana-usage-collection-plugin/*": ["src/plugins/kibana_usage_collection/*"],
+      "@kbn/kibana-utils-plugin": ["src/plugins/kibana_utils"],
+      "@kbn/kibana-utils-plugin/*": ["src/plugins/kibana_utils/*"],
+      "@kbn/management-plugin": ["src/plugins/management"],
+      "@kbn/management-plugin/*": ["src/plugins/management/*"],
+      "@kbn/maps-ems-plugin": ["src/plugins/maps_ems"],
+      "@kbn/maps-ems-plugin/*": ["src/plugins/maps_ems/*"],
+      "@kbn/navigation-plugin": ["src/plugins/navigation"],
+      "@kbn/navigation-plugin/*": ["src/plugins/navigation/*"],
+      "@kbn/newsfeed-plugin": ["src/plugins/newsfeed"],
+      "@kbn/newsfeed-plugin/*": ["src/plugins/newsfeed/*"],
+      "@kbn/presentation-util-plugin": ["src/plugins/presentation_util"],
+      "@kbn/presentation-util-plugin/*": ["src/plugins/presentation_util/*"],
+      "@kbn/saved-objects-management-plugin": ["src/plugins/saved_objects_management"],
+      "@kbn/saved-objects-management-plugin/*": ["src/plugins/saved_objects_management/*"],
+      "@kbn/saved-objects-tagging-oss-plugin": ["src/plugins/saved_objects_tagging_oss"],
+      "@kbn/saved-objects-tagging-oss-plugin/*": ["src/plugins/saved_objects_tagging_oss/*"],
+      "@kbn/saved-objects-plugin": ["src/plugins/saved_objects"],
+      "@kbn/saved-objects-plugin/*": ["src/plugins/saved_objects/*"],
+      "@kbn/screenshot-mode-plugin": ["src/plugins/screenshot_mode"],
+      "@kbn/screenshot-mode-plugin/*": ["src/plugins/screenshot_mode/*"],
+      "@kbn/share-plugin": ["src/plugins/share"],
+      "@kbn/share-plugin/*": ["src/plugins/share/*"],
+      "@kbn/shared-ux-plugin": ["src/plugins/shared_ux"],
+      "@kbn/shared-ux-plugin/*": ["src/plugins/shared_ux/*"],
+      "@kbn/telemetry-collection-manager-plugin": ["src/plugins/telemetry_collection_manager"],
+      "@kbn/telemetry-collection-manager-plugin/*": ["src/plugins/telemetry_collection_manager/*"],
+      "@kbn/telemetry-management-section-plugin": ["src/plugins/telemetry_management_section"],
+      "@kbn/telemetry-management-section-plugin/*": ["src/plugins/telemetry_management_section/*"],
+      "@kbn/telemetry-plugin": ["src/plugins/telemetry"],
+      "@kbn/telemetry-plugin/*": ["src/plugins/telemetry/*"],
+      "@kbn/ui-actions-plugin": ["src/plugins/ui_actions"],
+      "@kbn/ui-actions-plugin/*": ["src/plugins/ui_actions/*"],
+      "@kbn/unified-search-plugin": ["src/plugins/unified_search"],
+      "@kbn/unified-search-plugin/*": ["src/plugins/unified_search/*"],
+      "@kbn/url-forwarding-plugin": ["src/plugins/url_forwarding"],
+      "@kbn/url-forwarding-plugin/*": ["src/plugins/url_forwarding/*"],
+      "@kbn/usage-collection-plugin": ["src/plugins/usage_collection"],
+      "@kbn/usage-collection-plugin/*": ["src/plugins/usage_collection/*"],
+      "@kbn/vis-default-editor-plugin": ["src/plugins/vis_default_editor"],
+      "@kbn/vis-default-editor-plugin/*": ["src/plugins/vis_default_editor/*"],
+      "@kbn/vis-type-markdown-plugin": ["src/plugins/vis_type_markdown"],
+      "@kbn/vis-type-markdown-plugin/*": ["src/plugins/vis_type_markdown/*"],
+      "@kbn/vis-type-gauge-plugin": ["src/plugins/vis_types/gauge"],
+      "@kbn/vis-type-gauge-plugin/*": ["src/plugins/vis_types/gauge/*"],
+      "@kbn/vis-type-heatmap-plugin": ["src/plugins/vis_types/heatmap"],
+      "@kbn/vis-type-heatmap-plugin/*": ["src/plugins/vis_types/heatmap/*"],
+      "@kbn/vis-type-metric-plugin": ["src/plugins/vis_types/metric"],
+      "@kbn/vis-type-metric-plugin/*": ["src/plugins/vis_types/metric/*"],
+      "@kbn/vis-type-pie-plugin": ["src/plugins/vis_types/pie"],
+      "@kbn/vis-type-pie-plugin/*": ["src/plugins/vis_types/pie/*"],
+      "@kbn/vis-type-table-plugin": ["src/plugins/vis_types/table"],
+      "@kbn/vis-type-table-plugin/*": ["src/plugins/vis_types/table/*"],
+      "@kbn/vis-type-tagcloud-plugin": ["src/plugins/vis_types/tagcloud"],
+      "@kbn/vis-type-tagcloud-plugin/*": ["src/plugins/vis_types/tagcloud/*"],
+      "@kbn/vis-type-timelion-plugin": ["src/plugins/vis_types/timelion"],
+      "@kbn/vis-type-timelion-plugin/*": ["src/plugins/vis_types/timelion/*"],
+      "@kbn/vis-type-timeseries-plugin": ["src/plugins/vis_types/timeseries"],
+      "@kbn/vis-type-timeseries-plugin/*": ["src/plugins/vis_types/timeseries/*"],
+      "@kbn/vis-type-vega-plugin": ["src/plugins/vis_types/vega"],
+      "@kbn/vis-type-vega-plugin/*": ["src/plugins/vis_types/vega/*"],
+      "@kbn/vis-type-vislib-plugin": ["src/plugins/vis_types/vislib"],
+      "@kbn/vis-type-vislib-plugin/*": ["src/plugins/vis_types/vislib/*"],
+      "@kbn/vis-type-xy-plugin": ["src/plugins/vis_types/xy"],
+      "@kbn/vis-type-xy-plugin/*": ["src/plugins/vis_types/xy/*"],
+      "@kbn/visualizations-plugin": ["src/plugins/visualizations"],
+      "@kbn/visualizations-plugin/*": ["src/plugins/visualizations/*"],
+      "@kbn/analytics-ftr-helpers-plugin": ["test/analytics/__fixtures__/plugins/analytics_ftr_helpers"],
+      "@kbn/analytics-ftr-helpers-plugin/*": ["test/analytics/__fixtures__/plugins/analytics_ftr_helpers/*"],
+      "@kbn/analytics-plugin-a-plugin": ["test/analytics/__fixtures__/plugins/analytics_plugin_a"],
+      "@kbn/analytics-plugin-a-plugin/*": ["test/analytics/__fixtures__/plugins/analytics_plugin_a/*"],
+      "@kbn/coverage-fixtures-plugin": ["test/common/fixtures/plugins/coverage"],
+      "@kbn/coverage-fixtures-plugin/*": ["test/common/fixtures/plugins/coverage/*"],
+      "@kbn/newsfeed-fixtures-plugin": ["test/common/fixtures/plugins/newsfeed"],
+      "@kbn/newsfeed-fixtures-plugin/*": ["test/common/fixtures/plugins/newsfeed/*"],
+      "@kbn/kbn-tp-run-pipeline-plugin": ["test/interpreter_functional/plugins/kbn_tp_run_pipeline"],
+      "@kbn/kbn-tp-run-pipeline-plugin/*": ["test/interpreter_functional/plugins/kbn_tp_run_pipeline/*"],
+      "@kbn/app-link-test-plugin": ["test/plugin_functional/plugins/app_link_test"],
+      "@kbn/app-link-test-plugin/*": ["test/plugin_functional/plugins/app_link_test/*"],
+      "@kbn/core-app-status-plugin": ["test/plugin_functional/plugins/core_app_status"],
+      "@kbn/core-app-status-plugin/*": ["test/plugin_functional/plugins/core_app_status/*"],
+      "@kbn/core-history-block-plugin": ["test/plugin_functional/plugins/core_history_block"],
+      "@kbn/core-history-block-plugin/*": ["test/plugin_functional/plugins/core_history_block/*"],
+      "@kbn/core-http-plugin": ["test/plugin_functional/plugins/core_http"],
+      "@kbn/core-http-plugin/*": ["test/plugin_functional/plugins/core_http/*"],
+      "@kbn/core-plugin-a-plugin": ["test/plugin_functional/plugins/core_plugin_a"],
+      "@kbn/core-plugin-a-plugin/*": ["test/plugin_functional/plugins/core_plugin_a/*"],
+      "@kbn/core-plugin-appleave-plugin": ["test/plugin_functional/plugins/core_plugin_appleave"],
+      "@kbn/core-plugin-appleave-plugin/*": ["test/plugin_functional/plugins/core_plugin_appleave/*"],
+      "@kbn/core-plugin-b-plugin": ["test/plugin_functional/plugins/core_plugin_b"],
+      "@kbn/core-plugin-b-plugin/*": ["test/plugin_functional/plugins/core_plugin_b/*"],
+      "@kbn/core-plugin-chromeless-plugin": ["test/plugin_functional/plugins/core_plugin_chromeless"],
+      "@kbn/core-plugin-chromeless-plugin/*": ["test/plugin_functional/plugins/core_plugin_chromeless/*"],
+      "@kbn/core-plugin-deep-links-plugin": ["test/plugin_functional/plugins/core_plugin_deep_links"],
+      "@kbn/core-plugin-deep-links-plugin/*": ["test/plugin_functional/plugins/core_plugin_deep_links/*"],
+      "@kbn/core-plugin-deprecations-plugin": ["test/plugin_functional/plugins/core_plugin_deprecations"],
+      "@kbn/core-plugin-deprecations-plugin/*": ["test/plugin_functional/plugins/core_plugin_deprecations/*"],
+      "@kbn/core-plugin-execution-context-plugin": ["test/plugin_functional/plugins/core_plugin_execution_context"],
+      "@kbn/core-plugin-execution-context-plugin/*": ["test/plugin_functional/plugins/core_plugin_execution_context/*"],
+      "@kbn/core-plugin-helpmenu-plugin": ["test/plugin_functional/plugins/core_plugin_helpmenu"],
+      "@kbn/core-plugin-helpmenu-plugin/*": ["test/plugin_functional/plugins/core_plugin_helpmenu/*"],
+      "@kbn/core-plugin-route-timeouts-plugin": ["test/plugin_functional/plugins/core_plugin_route_timeouts"],
+      "@kbn/core-plugin-route-timeouts-plugin/*": ["test/plugin_functional/plugins/core_plugin_route_timeouts/*"],
+      "@kbn/core-plugin-static-assets-plugin": ["test/plugin_functional/plugins/core_plugin_static_assets"],
+      "@kbn/core-plugin-static-assets-plugin/*": ["test/plugin_functional/plugins/core_plugin_static_assets/*"],
+      "@kbn/core-provider-plugin": ["test/plugin_functional/plugins/core_provider_plugin"],
+      "@kbn/core-provider-plugin/*": ["test/plugin_functional/plugins/core_provider_plugin/*"],
+      "@kbn/data-search-plugin": ["test/plugin_functional/plugins/data_search"],
+      "@kbn/data-search-plugin/*": ["test/plugin_functional/plugins/data_search/*"],
+      "@kbn/elasticsearch-client-plugin": ["test/plugin_functional/plugins/elasticsearch_client_plugin"],
+      "@kbn/elasticsearch-client-plugin/*": ["test/plugin_functional/plugins/elasticsearch_client_plugin/*"],
+      "@kbn/index-patterns-test-plugin": ["test/plugin_functional/plugins/index_patterns"],
+      "@kbn/index-patterns-test-plugin/*": ["test/plugin_functional/plugins/index_patterns/*"],
+      "@kbn/kbn-sample-panel-action-plugin": ["test/plugin_functional/plugins/kbn_sample_panel_action"],
+      "@kbn/kbn-sample-panel-action-plugin/*": ["test/plugin_functional/plugins/kbn_sample_panel_action/*"],
+      "@kbn/kbn-top-nav-plugin": ["test/plugin_functional/plugins/kbn_top_nav"],
+      "@kbn/kbn-top-nav-plugin/*": ["test/plugin_functional/plugins/kbn_top_nav/*"],
+      "@kbn/kbn-tp-custom-visualizations-plugin": ["test/plugin_functional/plugins/kbn_tp_custom_visualizations"],
+      "@kbn/kbn-tp-custom-visualizations-plugin/*": ["test/plugin_functional/plugins/kbn_tp_custom_visualizations/*"],
+      "@kbn/management-test-plugin": ["test/plugin_functional/plugins/management_test_plugin"],
+      "@kbn/management-test-plugin/*": ["test/plugin_functional/plugins/management_test_plugin/*"],
+      "@kbn/rendering-plugin": ["test/plugin_functional/plugins/rendering_plugin"],
+      "@kbn/rendering-plugin/*": ["test/plugin_functional/plugins/rendering_plugin/*"],
+      "@kbn/saved-object-export-transforms-plugin": ["test/plugin_functional/plugins/saved_object_export_transforms"],
+      "@kbn/saved-object-export-transforms-plugin/*": ["test/plugin_functional/plugins/saved_object_export_transforms/*"],
+      "@kbn/saved-object-import-warnings-plugin": ["test/plugin_functional/plugins/saved_object_import_warnings"],
+      "@kbn/saved-object-import-warnings-plugin/*": ["test/plugin_functional/plugins/saved_object_import_warnings/*"],
+      "@kbn/saved-objects-hidden-type-plugin": ["test/plugin_functional/plugins/saved_objects_hidden_type"],
+      "@kbn/saved-objects-hidden-type-plugin/*": ["test/plugin_functional/plugins/saved_objects_hidden_type/*"],
+      "@kbn/session-notifications-plugin": ["test/plugin_functional/plugins/session_notifications"],
+      "@kbn/session-notifications-plugin/*": ["test/plugin_functional/plugins/session_notifications/*"],
+      "@kbn/telemetry-test-plugin": ["test/plugin_functional/plugins/telemetry"],
+      "@kbn/telemetry-test-plugin/*": ["test/plugin_functional/plugins/telemetry/*"],
+      "@kbn/ui-settings-plugin": ["test/plugin_functional/plugins/ui_settings_plugin"],
+      "@kbn/ui-settings-plugin/*": ["test/plugin_functional/plugins/ui_settings_plugin/*"],
+      "@kbn/usage-collection-test-plugin": ["test/plugin_functional/plugins/usage_collection"],
+      "@kbn/usage-collection-test-plugin/*": ["test/plugin_functional/plugins/usage_collection/*"],
+      "@kbn/alerting-example-plugin": ["x-pack/examples/alerting_example"],
+      "@kbn/alerting-example-plugin/*": ["x-pack/examples/alerting_example/*"],
+      "@kbn/embedded-lens-example-plugin": ["x-pack/examples/embedded_lens_example"],
+      "@kbn/embedded-lens-example-plugin/*": ["x-pack/examples/embedded_lens_example/*"],
+      "@kbn/exploratory-view-example-plugin": ["x-pack/examples/exploratory_view_example"],
+      "@kbn/exploratory-view-example-plugin/*": ["x-pack/examples/exploratory_view_example/*"],
+      "@kbn/reporting-example-plugin": ["x-pack/examples/reporting_example"],
+      "@kbn/reporting-example-plugin/*": ["x-pack/examples/reporting_example/*"],
+      "@kbn/screenshotting-example-plugin": ["x-pack/examples/screenshotting_example"],
+      "@kbn/screenshotting-example-plugin/*": ["x-pack/examples/screenshotting_example/*"],
+      "@kbn/testing-embedded-lens-plugin": ["x-pack/examples/testing_embedded_lens"],
+      "@kbn/testing-embedded-lens-plugin/*": ["x-pack/examples/testing_embedded_lens/*"],
+      "@kbn/third-party-lens-navigation-prompt-plugin": ["x-pack/examples/third_party_lens_navigation_prompt"],
+      "@kbn/third-party-lens-navigation-prompt-plugin/*": ["x-pack/examples/third_party_lens_navigation_prompt/*"],
+      "@kbn/third-party-vis-lens-example-plugin": ["x-pack/examples/third_party_vis_lens_example"],
+      "@kbn/third-party-vis-lens-example-plugin/*": ["x-pack/examples/third_party_vis_lens_example/*"],
+      "@kbn/ui-actions-enhanced-examples-plugin": ["x-pack/examples/ui_actions_enhanced_examples"],
+      "@kbn/ui-actions-enhanced-examples-plugin/*": ["x-pack/examples/ui_actions_enhanced_examples/*"],
+      "@kbn/actions-plugin": ["x-pack/plugins/actions"],
+      "@kbn/actions-plugin/*": ["x-pack/plugins/actions/*"],
+      "@kbn/alerting-plugin": ["x-pack/plugins/alerting"],
+      "@kbn/alerting-plugin/*": ["x-pack/plugins/alerting/*"],
+      "@kbn/apm-plugin": ["x-pack/plugins/apm"],
+      "@kbn/apm-plugin/*": ["x-pack/plugins/apm/*"],
+      "@kbn/banners-plugin": ["x-pack/plugins/banners"],
+      "@kbn/banners-plugin/*": ["x-pack/plugins/banners/*"],
+      "@kbn/canvas-plugin": ["x-pack/plugins/canvas"],
+      "@kbn/canvas-plugin/*": ["x-pack/plugins/canvas/*"],
+      "@kbn/cases-plugin": ["x-pack/plugins/cases"],
+      "@kbn/cases-plugin/*": ["x-pack/plugins/cases/*"],
+      "@kbn/cloud-security-posture-plugin": ["x-pack/plugins/cloud_security_posture"],
+      "@kbn/cloud-security-posture-plugin/*": ["x-pack/plugins/cloud_security_posture/*"],
+      "@kbn/cloud-plugin": ["x-pack/plugins/cloud"],
+      "@kbn/cloud-plugin/*": ["x-pack/plugins/cloud/*"],
+      "@kbn/cross-cluster-replication-plugin": ["x-pack/plugins/cross_cluster_replication"],
+      "@kbn/cross-cluster-replication-plugin/*": ["x-pack/plugins/cross_cluster_replication/*"],
+      "@kbn/dashboard-enhanced-plugin": ["x-pack/plugins/dashboard_enhanced"],
+      "@kbn/dashboard-enhanced-plugin/*": ["x-pack/plugins/dashboard_enhanced/*"],
+      "@kbn/data-enhanced-plugin": ["x-pack/plugins/data_enhanced"],
+      "@kbn/data-enhanced-plugin/*": ["x-pack/plugins/data_enhanced/*"],
+      "@kbn/data-visualizer-plugin": ["x-pack/plugins/data_visualizer"],
+      "@kbn/data-visualizer-plugin/*": ["x-pack/plugins/data_visualizer/*"],
+      "@kbn/discover-enhanced-plugin": ["x-pack/plugins/discover_enhanced"],
+      "@kbn/discover-enhanced-plugin/*": ["x-pack/plugins/discover_enhanced/*"],
+      "@kbn/url-drilldown-plugin": ["x-pack/plugins/drilldowns/url_drilldown"],
+      "@kbn/url-drilldown-plugin/*": ["x-pack/plugins/drilldowns/url_drilldown/*"],
+      "@kbn/embeddable-enhanced-plugin": ["x-pack/plugins/embeddable_enhanced"],
+      "@kbn/embeddable-enhanced-plugin/*": ["x-pack/plugins/embeddable_enhanced/*"],
+      "@kbn/encrypted-saved-objects-plugin": ["x-pack/plugins/encrypted_saved_objects"],
+      "@kbn/encrypted-saved-objects-plugin/*": ["x-pack/plugins/encrypted_saved_objects/*"],
+      "@kbn/enterprise-search-plugin": ["x-pack/plugins/enterprise_search"],
+      "@kbn/enterprise-search-plugin/*": ["x-pack/plugins/enterprise_search/*"],
+      "@kbn/event-log-plugin": ["x-pack/plugins/event_log"],
+      "@kbn/event-log-plugin/*": ["x-pack/plugins/event_log/*"],
+      "@kbn/features-plugin": ["x-pack/plugins/features"],
+      "@kbn/features-plugin/*": ["x-pack/plugins/features/*"],
+      "@kbn/file-upload-plugin": ["x-pack/plugins/file_upload"],
+      "@kbn/file-upload-plugin/*": ["x-pack/plugins/file_upload/*"],
+      "@kbn/fleet-plugin": ["x-pack/plugins/fleet"],
+      "@kbn/fleet-plugin/*": ["x-pack/plugins/fleet/*"],
+      "@kbn/global-search-bar-plugin": ["x-pack/plugins/global_search_bar"],
+      "@kbn/global-search-bar-plugin/*": ["x-pack/plugins/global_search_bar/*"],
+      "@kbn/global-search-providers-plugin": ["x-pack/plugins/global_search_providers"],
+      "@kbn/global-search-providers-plugin/*": ["x-pack/plugins/global_search_providers/*"],
+      "@kbn/global-search-plugin": ["x-pack/plugins/global_search"],
+      "@kbn/global-search-plugin/*": ["x-pack/plugins/global_search/*"],
+      "@kbn/graph-plugin": ["x-pack/plugins/graph"],
+      "@kbn/graph-plugin/*": ["x-pack/plugins/graph/*"],
+      "@kbn/grokdebugger-plugin": ["x-pack/plugins/grokdebugger"],
+      "@kbn/grokdebugger-plugin/*": ["x-pack/plugins/grokdebugger/*"],
+      "@kbn/index-lifecycle-management-plugin": ["x-pack/plugins/index_lifecycle_management"],
+      "@kbn/index-lifecycle-management-plugin/*": ["x-pack/plugins/index_lifecycle_management/*"],
+      "@kbn/index-management-plugin": ["x-pack/plugins/index_management"],
+      "@kbn/index-management-plugin/*": ["x-pack/plugins/index_management/*"],
+      "@kbn/infra-plugin": ["x-pack/plugins/infra"],
+      "@kbn/infra-plugin/*": ["x-pack/plugins/infra/*"],
+      "@kbn/ingest-pipelines-plugin": ["x-pack/plugins/ingest_pipelines"],
+      "@kbn/ingest-pipelines-plugin/*": ["x-pack/plugins/ingest_pipelines/*"],
+      "@kbn/lens-plugin": ["x-pack/plugins/lens"],
+      "@kbn/lens-plugin/*": ["x-pack/plugins/lens/*"],
+      "@kbn/license-api-guard-plugin": ["x-pack/plugins/license_api_guard"],
+      "@kbn/license-api-guard-plugin/*": ["x-pack/plugins/license_api_guard/*"],
+      "@kbn/license-management-plugin": ["x-pack/plugins/license_management"],
+      "@kbn/license-management-plugin/*": ["x-pack/plugins/license_management/*"],
+      "@kbn/licensing-plugin": ["x-pack/plugins/licensing"],
+      "@kbn/licensing-plugin/*": ["x-pack/plugins/licensing/*"],
+      "@kbn/lists-plugin": ["x-pack/plugins/lists"],
+      "@kbn/lists-plugin/*": ["x-pack/plugins/lists/*"],
+      "@kbn/logstash-plugin": ["x-pack/plugins/logstash"],
+      "@kbn/logstash-plugin/*": ["x-pack/plugins/logstash/*"],
+      "@kbn/maps-plugin": ["x-pack/plugins/maps"],
+      "@kbn/maps-plugin/*": ["x-pack/plugins/maps/*"],
+      "@kbn/ml-plugin": ["x-pack/plugins/ml"],
+      "@kbn/ml-plugin/*": ["x-pack/plugins/ml/*"],
+      "@kbn/monitoring-collection-plugin": ["x-pack/plugins/monitoring_collection"],
+      "@kbn/monitoring-collection-plugin/*": ["x-pack/plugins/monitoring_collection/*"],
+      "@kbn/monitoring-plugin": ["x-pack/plugins/monitoring"],
+      "@kbn/monitoring-plugin/*": ["x-pack/plugins/monitoring/*"],
+      "@kbn/observability-plugin": ["x-pack/plugins/observability"],
+      "@kbn/observability-plugin/*": ["x-pack/plugins/observability/*"],
+      "@kbn/osquery-plugin": ["x-pack/plugins/osquery"],
+      "@kbn/osquery-plugin/*": ["x-pack/plugins/osquery/*"],
+      "@kbn/painless-lab-plugin": ["x-pack/plugins/painless_lab"],
+      "@kbn/painless-lab-plugin/*": ["x-pack/plugins/painless_lab/*"],
+      "@kbn/remote-clusters-plugin": ["x-pack/plugins/remote_clusters"],
+      "@kbn/remote-clusters-plugin/*": ["x-pack/plugins/remote_clusters/*"],
+      "@kbn/reporting-plugin": ["x-pack/plugins/reporting"],
+      "@kbn/reporting-plugin/*": ["x-pack/plugins/reporting/*"],
+      "@kbn/rollup-plugin": ["x-pack/plugins/rollup"],
+      "@kbn/rollup-plugin/*": ["x-pack/plugins/rollup/*"],
+      "@kbn/rule-registry-plugin": ["x-pack/plugins/rule_registry"],
+      "@kbn/rule-registry-plugin/*": ["x-pack/plugins/rule_registry/*"],
+      "@kbn/runtime-fields-plugin": ["x-pack/plugins/runtime_fields"],
+      "@kbn/runtime-fields-plugin/*": ["x-pack/plugins/runtime_fields/*"],
+      "@kbn/saved-objects-tagging-plugin": ["x-pack/plugins/saved_objects_tagging"],
+      "@kbn/saved-objects-tagging-plugin/*": ["x-pack/plugins/saved_objects_tagging/*"],
+      "@kbn/screenshotting-plugin": ["x-pack/plugins/screenshotting"],
+      "@kbn/screenshotting-plugin/*": ["x-pack/plugins/screenshotting/*"],
+      "@kbn/searchprofiler-plugin": ["x-pack/plugins/searchprofiler"],
+      "@kbn/searchprofiler-plugin/*": ["x-pack/plugins/searchprofiler/*"],
+      "@kbn/security-solution-plugin": ["x-pack/plugins/security_solution"],
+      "@kbn/security-solution-plugin/*": ["x-pack/plugins/security_solution/*"],
+      "@kbn/security-plugin": ["x-pack/plugins/security"],
+      "@kbn/security-plugin/*": ["x-pack/plugins/security/*"],
+      "@kbn/session-view-plugin": ["x-pack/plugins/session_view"],
+      "@kbn/session-view-plugin/*": ["x-pack/plugins/session_view/*"],
+      "@kbn/snapshot-restore-plugin": ["x-pack/plugins/snapshot_restore"],
+      "@kbn/snapshot-restore-plugin/*": ["x-pack/plugins/snapshot_restore/*"],
+      "@kbn/spaces-plugin": ["x-pack/plugins/spaces"],
+      "@kbn/spaces-plugin/*": ["x-pack/plugins/spaces/*"],
+      "@kbn/stack-alerts-plugin": ["x-pack/plugins/stack_alerts"],
+      "@kbn/stack-alerts-plugin/*": ["x-pack/plugins/stack_alerts/*"],
+      "@kbn/task-manager-plugin": ["x-pack/plugins/task_manager"],
+      "@kbn/task-manager-plugin/*": ["x-pack/plugins/task_manager/*"],
+      "@kbn/telemetry-collection-xpack-plugin": ["x-pack/plugins/telemetry_collection_xpack"],
+      "@kbn/telemetry-collection-xpack-plugin/*": ["x-pack/plugins/telemetry_collection_xpack/*"],
+      "@kbn/timelines-plugin": ["x-pack/plugins/timelines"],
+      "@kbn/timelines-plugin/*": ["x-pack/plugins/timelines/*"],
+      "@kbn/transform-plugin": ["x-pack/plugins/transform"],
+      "@kbn/transform-plugin/*": ["x-pack/plugins/transform/*"],
+      "@kbn/translations-plugin": ["x-pack/plugins/translations"],
+      "@kbn/translations-plugin/*": ["x-pack/plugins/translations/*"],
+      "@kbn/triggers-actions-ui-plugin": ["x-pack/plugins/triggers_actions_ui"],
+      "@kbn/triggers-actions-ui-plugin/*": ["x-pack/plugins/triggers_actions_ui/*"],
+      "@kbn/ui-actions-enhanced-plugin": ["x-pack/plugins/ui_actions_enhanced"],
+      "@kbn/ui-actions-enhanced-plugin/*": ["x-pack/plugins/ui_actions_enhanced/*"],
+      "@kbn/upgrade-assistant-plugin": ["x-pack/plugins/upgrade_assistant"],
+      "@kbn/upgrade-assistant-plugin/*": ["x-pack/plugins/upgrade_assistant/*"],
+      "@kbn/uptime-plugin": ["x-pack/plugins/uptime"],
+      "@kbn/uptime-plugin/*": ["x-pack/plugins/uptime/*"],
+      "@kbn/ux-plugin": ["x-pack/plugins/ux"],
+      "@kbn/ux-plugin/*": ["x-pack/plugins/ux/*"],
+      "@kbn/watcher-plugin": ["x-pack/plugins/watcher"],
+      "@kbn/watcher-plugin/*": ["x-pack/plugins/watcher/*"],
+      "@kbn/alerting-fixture-plugin": ["x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts"],
+      "@kbn/alerting-fixture-plugin/*": ["x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/*"],
+      "@kbn/test-feature-usage-plugin": ["x-pack/test/licensing_plugin/plugins/test_feature_usage"],
+      "@kbn/test-feature-usage-plugin/*": ["x-pack/test/licensing_plugin/plugins/test_feature_usage/*"],
+      "@kbn/elasticsearch-client-xpack-plugin": ["x-pack/test/plugin_api_integration/plugins/elasticsearch_client"],
+      "@kbn/elasticsearch-client-xpack-plugin/*": ["x-pack/test/plugin_api_integration/plugins/elasticsearch_client/*"],
+      "@kbn/event-log-fixture-plugin": ["x-pack/test/plugin_api_integration/plugins/event_log"],
+      "@kbn/event-log-fixture-plugin/*": ["x-pack/test/plugin_api_integration/plugins/event_log/*"],
+      "@kbn/feature-usage-test-plugin": ["x-pack/test/plugin_api_integration/plugins/feature_usage_test"],
+      "@kbn/feature-usage-test-plugin/*": ["x-pack/test/plugin_api_integration/plugins/feature_usage_test/*"],
+      "@kbn/sample-task-plugin": ["x-pack/test/plugin_api_integration/plugins/sample_task_plugin"],
+      "@kbn/sample-task-plugin/*": ["x-pack/test/plugin_api_integration/plugins/sample_task_plugin/*"],
+      "@kbn/task-manager-performance-plugin": ["x-pack/test/plugin_api_perf/plugins/task_manager_performance"],
+      "@kbn/task-manager-performance-plugin/*": ["x-pack/test/plugin_api_perf/plugins/task_manager_performance/*"],
+      "@kbn/global-search-test-plugin": ["x-pack/test/plugin_functional/plugins/global_search_test"],
+      "@kbn/global-search-test-plugin/*": ["x-pack/test/plugin_functional/plugins/global_search_test/*"],
+      "@kbn/resolver-test-plugin": ["x-pack/test/plugin_functional/plugins/resolver_test"],
+      "@kbn/resolver-test-plugin/*": ["x-pack/test/plugin_functional/plugins/resolver_test/*"],
+      "@kbn/timelines-test-plugin": ["x-pack/test/plugin_functional/plugins/timelines_test"],
+      "@kbn/timelines-test-plugin/*": ["x-pack/test/plugin_functional/plugins/timelines_test/*"],
+      "@kbn/security-test-endpoints-plugin": ["x-pack/test/security_functional/fixtures/common/test_endpoints"],
+      "@kbn/security-test-endpoints-plugin/*": ["x-pack/test/security_functional/fixtures/common/test_endpoints/*"],
+      "@kbn/application-usage-test-plugin": ["x-pack/test/usage_collection/plugins/application_usage_test"],
+      "@kbn/application-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/application_usage_test/*"],
+      "@kbn/stack-management-usage-test-plugin": ["x-pack/test/usage_collection/plugins/stack_management_usage_test"],
+      "@kbn/stack-management-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/stack_management_usage_test/*"],
+      // END AUTOMATED PACKAGE LISTING
       // Allows for importing from `kibana` package for the exported types.
       "kibana": ["./kibana"],
       "kibana/public": ["src/core/public"],
diff --git a/x-pack/examples/alerting_example/common/constants.ts b/x-pack/examples/alerting_example/common/constants.ts
index 83cb074328f42..9840b4d507e8b 100644
--- a/x-pack/examples/alerting_example/common/constants.ts
+++ b/x-pack/examples/alerting_example/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../plugins/alerting/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 
 export const ALERTING_EXAMPLE_APP_ID = 'AlertingExample';
 
diff --git a/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx b/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx
index 27b8684e1a17e..58707025b2c69 100644
--- a/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx
+++ b/x-pack/examples/alerting_example/public/alert_types/always_firing.tsx
@@ -23,7 +23,7 @@ import {
   AlertConditionsGroup,
   RuleTypeModel,
   RuleTypeParamsExpressionProps,
-} from '../../../../plugins/triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import {
   AlwaysFiringParams,
   AlwaysFiringActionGroupIds,
diff --git a/x-pack/examples/alerting_example/public/alert_types/astros.tsx b/x-pack/examples/alerting_example/public/alert_types/astros.tsx
index d7fe322a083b1..eee4e92b623f7 100644
--- a/x-pack/examples/alerting_example/public/alert_types/astros.tsx
+++ b/x-pack/examples/alerting_example/public/alert_types/astros.tsx
@@ -19,10 +19,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { flatten } from 'lodash';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { ALERTING_EXAMPLE_APP_ID, Craft, Operator } from '../../common/constants';
-import { SanitizedRule } from '../../../../plugins/alerting/common';
-import { PluginSetupContract as AlertingSetup } from '../../../../plugins/alerting/public';
-import { RuleTypeModel } from '../../../../plugins/triggers_actions_ui/public';
 
 export function registerNavigation(alerting: AlertingSetup) {
   alerting.registerNavigation(
diff --git a/x-pack/examples/alerting_example/public/alert_types/index.ts b/x-pack/examples/alerting_example/public/alert_types/index.ts
index 5b62fe138c018..4cb30b9f4df02 100644
--- a/x-pack/examples/alerting_example/public/alert_types/index.ts
+++ b/x-pack/examples/alerting_example/public/alert_types/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { registerNavigation as registerPeopleInSpaceNavigation } from './astros';
 import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
-import { SanitizedRule } from '../../../../plugins/alerting/common';
-import { PluginSetupContract as AlertingSetup } from '../../../../plugins/alerting/public';
 
 export function registerNavigation(alerting: AlertingSetup) {
   // register default navigation
diff --git a/x-pack/examples/alerting_example/public/application.tsx b/x-pack/examples/alerting_example/public/application.tsx
index a9d0b9fc84905..6e45211111018 100644
--- a/x-pack/examples/alerting_example/public/application.tsx
+++ b/x-pack/examples/alerting_example/public/application.tsx
@@ -9,15 +9,15 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, RouteComponentProps } from 'react-router-dom';
 import { EuiPage } from '@elastic/eui';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { Page } from './components/page';
 import { DocumentationPage } from './components/documentation';
 import { ViewAlertPage } from './components/view_alert';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../plugins/triggers_actions_ui/public';
 import { AlertingExamplePublicStartDeps } from './plugin';
 import { ViewPeopleInSpaceAlertPage } from './components/view_astros_alert';
-import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
 
 export interface AlertingExampleComponentParams {
   http: CoreStart['http'];
diff --git a/x-pack/examples/alerting_example/public/components/view_alert.tsx b/x-pack/examples/alerting_example/public/components/view_alert.tsx
index bade2e484fbe1..b85577f334a5c 100644
--- a/x-pack/examples/alerting_example/public/components/view_alert.tsx
+++ b/x-pack/examples/alerting_example/public/components/view_alert.tsx
@@ -19,13 +19,13 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { isEmpty } from 'lodash';
-import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 import {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
-} from '../../../../plugins/alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 import { Rule, RuleTaskState } from '../../common/types';
 
 type Props = RouteComponentProps & {
diff --git a/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx b/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx
index abb0111bf3374..be1e0799cf51d 100644
--- a/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx
+++ b/x-pack/examples/alerting_example/public/components/view_astros_alert.tsx
@@ -21,13 +21,13 @@ import {
   EuiStat,
 } from '@elastic/eui';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { isEmpty } from 'lodash';
-import { ALERTING_EXAMPLE_APP_ID, AlwaysFiringParams } from '../../common/constants';
 import {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
-} from '../../../../plugins/alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { ALERTING_EXAMPLE_APP_ID, AlwaysFiringParams } from '../../common/constants';
 import { Rule, RuleTaskState } from '../../common/types';
 
 type Props = RouteComponentProps & {
diff --git a/x-pack/examples/alerting_example/public/plugin.tsx b/x-pack/examples/alerting_example/public/plugin.tsx
index 25b6800ade2e8..4c3fd1ae88e5f 100644
--- a/x-pack/examples/alerting_example/public/plugin.tsx
+++ b/x-pack/examples/alerting_example/public/plugin.tsx
@@ -5,23 +5,18 @@
  * 2.0.
  */
 
-import {
-  Plugin,
-  CoreSetup,
-  AppMountParameters,
-  AppNavLinkStatus,
-} from '../../../../src/core/public';
-import { PluginSetupContract as AlertingSetup } from '../../../plugins/alerting/public';
-import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
+import { Plugin, CoreSetup, AppMountParameters, AppNavLinkStatus } from '@kbn/core/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../plugins/triggers_actions_ui/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { getAlertType as getAlwaysFiringAlertType } from './alert_types/always_firing';
 import { getAlertType as getPeopleInSpaceAlertType } from './alert_types/astros';
 import { registerNavigation } from './alert_types';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
 
 export type Setup = void;
 export type Start = void;
diff --git a/x-pack/examples/alerting_example/server/alert_types/always_firing.ts b/x-pack/examples/alerting_example/server/alert_types/always_firing.ts
index 1896db426da5f..a1fa6581f4aca 100644
--- a/x-pack/examples/alerting_example/server/alert_types/always_firing.ts
+++ b/x-pack/examples/alerting_example/server/alert_types/always_firing.ts
@@ -7,7 +7,7 @@
 
 import uuid from 'uuid';
 import { range } from 'lodash';
-import { RuleType } from '../../../../plugins/alerting/server';
+import { RuleType } from '@kbn/alerting-plugin/server';
 import {
   DEFAULT_INSTANCES_TO_GENERATE,
   ALERTING_EXAMPLE_APP_ID,
diff --git a/x-pack/examples/alerting_example/server/alert_types/astros.ts b/x-pack/examples/alerting_example/server/alert_types/astros.ts
index a29b280a34fff..f929fbb2e0879 100644
--- a/x-pack/examples/alerting_example/server/alert_types/astros.ts
+++ b/x-pack/examples/alerting_example/server/alert_types/astros.ts
@@ -6,7 +6,7 @@
  */
 
 import axios from 'axios';
-import { RuleType } from '../../../../plugins/alerting/server';
+import { RuleType } from '@kbn/alerting-plugin/server';
 import { Operator, Craft, ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 
 interface PeopleInSpace {
diff --git a/x-pack/examples/alerting_example/server/index.ts b/x-pack/examples/alerting_example/server/index.ts
index 92722eed31fa3..f14bbe1baac9d 100644
--- a/x-pack/examples/alerting_example/server/index.ts
+++ b/x-pack/examples/alerting_example/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { AlertingExamplePlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new AlertingExamplePlugin();
diff --git a/x-pack/examples/alerting_example/server/plugin.ts b/x-pack/examples/alerting_example/server/plugin.ts
index 2420be798ec84..272611e95ec85 100644
--- a/x-pack/examples/alerting_example/server/plugin.ts
+++ b/x-pack/examples/alerting_example/server/plugin.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 // import directly to support examples functional tests (@kbn-test/src/functional_tests/lib/babel_register_for_test_plugins.js)
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/utils/default_app_categories';
-import { PluginSetupContract as AlertingSetup } from '../../../plugins/alerting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../plugins/features/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/utils/default_app_categories';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 import { alertType as alwaysFiringAlert } from './alert_types/always_firing';
 import { alertType as peopleInSpaceAlert } from './alert_types/astros';
diff --git a/x-pack/examples/embedded_lens_example/public/app.tsx b/x-pack/examples/embedded_lens_example/public/app.tsx
index 950e2f454ad2e..3ef7721c58c02 100644
--- a/x-pack/examples/embedded_lens_example/public/app.tsx
+++ b/x-pack/examples/embedded_lens_example/public/app.tsx
@@ -19,9 +19,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import type { DataView } from 'src/plugins/data_views/public';
-import type { CoreStart } from 'kibana/public';
-import type { StartDependencies } from './plugin';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
 import type {
   TypedLensByValueInput,
   PersistedIndexPatternLayer,
@@ -29,10 +28,11 @@ import type {
   LensEmbeddableInput,
   FormulaPublicApi,
   DateHistogramIndexPatternColumn,
-} from '../../../plugins/lens/public';
+} from '@kbn/lens-plugin/public';
 
-import { ViewMode } from '../../../../src/plugins/embeddable/public';
-import { ActionExecutionContext } from '../../../../src/plugins/ui_actions/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import type { StartDependencies } from './plugin';
 
 // Generate a Lens state based on some app-specific input parameters.
 // `TypedLensByValueInput` can be used for type-safety - it uses the same interfaces as Lens-internal code.
diff --git a/x-pack/examples/embedded_lens_example/public/mount.tsx b/x-pack/examples/embedded_lens_example/public/mount.tsx
index e438b6946b8b6..49775bca09b72 100644
--- a/x-pack/examples/embedded_lens_example/public/mount.tsx
+++ b/x-pack/examples/embedded_lens_example/public/mount.tsx
@@ -9,7 +9,7 @@ import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { EuiCallOut } from '@elastic/eui';
 
-import type { CoreSetup, AppMountParameters } from 'kibana/public';
+import type { CoreSetup, AppMountParameters } from '@kbn/core/public';
 import type { StartDependencies } from './plugin';
 
 export const mount =
diff --git a/x-pack/examples/embedded_lens_example/public/plugin.ts b/x-pack/examples/embedded_lens_example/public/plugin.ts
index f0f799ea8f8ec..f0ca19229895a 100644
--- a/x-pack/examples/embedded_lens_example/public/plugin.ts
+++ b/x-pack/examples/embedded_lens_example/public/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { LensPublicStart } from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/exploratory_view_example/public/app.tsx b/x-pack/examples/exploratory_view_example/public/app.tsx
index a0aba95ddf521..35ace0b045a38 100644
--- a/x-pack/examples/exploratory_view_example/public/app.tsx
+++ b/x-pack/examples/exploratory_view_example/public/app.tsx
@@ -18,10 +18,10 @@ import {
   EuiPageHeaderSection,
   EuiTitle,
 } from '@elastic/eui';
-import { IndexPattern } from 'src/plugins/data/public';
-import { CoreStart } from 'kibana/public';
+import { IndexPattern } from '@kbn/data-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { AllSeries } from '@kbn/observability-plugin/public';
 import { StartDependencies } from './plugin';
-import { AllSeries } from '../../../plugins/observability/public';
 
 export const App = (props: {
   core: CoreStart;
diff --git a/x-pack/examples/exploratory_view_example/public/mount.tsx b/x-pack/examples/exploratory_view_example/public/mount.tsx
index b589db9d531b7..f763621e5ef2f 100644
--- a/x-pack/examples/exploratory_view_example/public/mount.tsx
+++ b/x-pack/examples/exploratory_view_example/public/mount.tsx
@@ -7,12 +7,9 @@
 
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { CoreSetup, AppMountParameters, APP_WRAPPER_CLASS } from '../../../../src/core/public';
+import { CoreSetup, AppMountParameters, APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { StartDependencies } from './plugin';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../src/plugins/kibana_react/public';
 export const mount =
   (coreSetup: CoreSetup<StartDependencies>) =>
   async ({ element }: AppMountParameters) => {
diff --git a/x-pack/examples/exploratory_view_example/public/plugin.ts b/x-pack/examples/exploratory_view_example/public/plugin.ts
index 6b7e2a93918d8..b8fd68e25379c 100644
--- a/x-pack/examples/exploratory_view_example/public/plugin.ts
+++ b/x-pack/examples/exploratory_view_example/public/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { ObservabilityPublicStart } from '../../../plugins/observability/public';
-import type { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ObservabilityPublicStart } from '@kbn/observability-plugin/public';
+import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/reporting_example/common/locator.ts b/x-pack/examples/reporting_example/common/locator.ts
index cbb7c7d110571..17ae845178c81 100644
--- a/x-pack/examples/reporting_example/common/locator.ts
+++ b/x-pack/examples/reporting_example/common/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import type { LocatorDefinition } from '../../../../src/plugins/share/public';
-import { PLUGIN_ID } from '../common';
+import type { LocatorDefinition } from '@kbn/share-plugin/public';
+import { PLUGIN_ID } from '.';
 import type { MyForwardableState } from '../public/types';
 
 export const REPORTING_EXAMPLE_LOCATOR_ID = 'REPORTING_EXAMPLE_LOCATOR_ID';
diff --git a/x-pack/examples/reporting_example/public/application.tsx b/x-pack/examples/reporting_example/public/application.tsx
index c1e18b13ebe5e..24ca76c3c903a 100644
--- a/x-pack/examples/reporting_example/public/application.tsx
+++ b/x-pack/examples/reporting_example/public/application.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Route, Switch } from 'react-router-dom';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { CaptureTest } from './containers/capture_test';
 import { Main } from './containers/main';
 import { ApplicationContextProvider } from './application_context';
diff --git a/x-pack/examples/reporting_example/public/containers/main.tsx b/x-pack/examples/reporting_example/public/containers/main.tsx
index 2a72f0ee71661..b6487c6130812 100644
--- a/x-pack/examples/reporting_example/public/containers/main.tsx
+++ b/x-pack/examples/reporting_example/public/containers/main.tsx
@@ -33,14 +33,14 @@ import React, { useEffect, useState } from 'react';
 import { BrowserRouter as Router, useHistory } from 'react-router-dom';
 import * as Rx from 'rxjs';
 import { takeWhile } from 'rxjs/operators';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 import type {
   JobAppParamsPDF,
   JobParamsPDFV2,
   JobParamsPNGV2,
-} from '../../../../plugins/reporting/common/types';
-import type { ReportingStart } from '../../../../plugins/reporting/public';
-import { LayoutTypes } from '../../../../plugins/screenshotting/public';
+} from '@kbn/reporting-plugin/common/types';
+import type { ReportingStart } from '@kbn/reporting-plugin/public';
+import { LayoutTypes } from '@kbn/screenshotting-plugin/public';
 import { REPORTING_EXAMPLE_LOCATOR_ID } from '../../common';
 import { useApplicationContext } from '../application_context';
 import { ROUTES } from '../constants';
diff --git a/x-pack/examples/reporting_example/public/plugin.ts b/x-pack/examples/reporting_example/public/plugin.ts
index 6ee103fe8286e..9a65b4d67888a 100644
--- a/x-pack/examples/reporting_example/public/plugin.ts
+++ b/x-pack/examples/reporting_example/public/plugin.ts
@@ -11,7 +11,7 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import { PLUGIN_ID, PLUGIN_NAME, ReportingExampleLocatorDefinition } from '../common';
 import { SetupDeps, StartDeps, MyForwardableState } from './types';
 
diff --git a/x-pack/examples/reporting_example/public/types.ts b/x-pack/examples/reporting_example/public/types.ts
index 732de505acf76..9aff6a439ba38 100644
--- a/x-pack/examples/reporting_example/public/types.ts
+++ b/x-pack/examples/reporting_example/public/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
-import { ReportingStart } from '../../../plugins/reporting/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
 import type { MyForwardableState } from '../common';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/examples/screenshotting_example/README.md b/x-pack/examples/screenshotting_example/README.md
new file mode 100755
index 0000000000000..8b1d817fbdf6e
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/README.md
@@ -0,0 +1,13 @@
+# Screenshotting Example
+
+Screenshotting integration example plugin.
+
+This plugin demonstrates the usage of the screenshotting plugin capabilities. The interaction happens on the backend via an API endpoint exposed by the plugin.
+
+The plugin provides a way to input an expression on the front-end side. The expression will be rendered by an internal screenshotting application in Chromium on the backend.
+
+To run this example, use the following command:
+
+```bash
+$ yarn start --run-examples
+```
diff --git a/x-pack/examples/screenshotting_example/common/index.ts b/x-pack/examples/screenshotting_example/common/index.ts
new file mode 100644
index 0000000000000..5a0828196d7f0
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/common/index.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ScreenshotResult } from '@kbn/screenshotting-plugin/server';
+
+export interface ScreenshottingExpressionResponse {
+  errors?: string[];
+  image?: string;
+  metrics?: ScreenshotResult['metrics'];
+}
+
+export const API_ENDPOINT = '/api/examples/screenshotting/expression';
diff --git a/x-pack/examples/screenshotting_example/kibana.json b/x-pack/examples/screenshotting_example/kibana.json
new file mode 100644
index 0000000000000..82ea3ead70b2e
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/kibana.json
@@ -0,0 +1,19 @@
+{
+  "id": "screenshottingExample",
+  "version": "0.1.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": true,
+  "owner": {
+    "name": "Kibana Reporting Services",
+    "githubTeam": "kibana-reporting-services"
+  },
+  "description": "An example integration with the screenshotting plugin.",
+  "optionalPlugins": [],
+  "requiredPlugins": [
+    "screenshotting",
+    "developerExamples",
+    "kibanaReact",
+    "navigation"
+  ]
+}
diff --git a/x-pack/examples/screenshotting_example/public/app/app.tsx b/x-pack/examples/screenshotting_example/public/app/app.tsx
new file mode 100644
index 0000000000000..24513b7b4b643
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/app/app.tsx
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useCallback, useContext, useState } from 'react';
+import {
+  EuiButton,
+  EuiCallOut,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiImage,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiSpacer,
+  EuiStat,
+  EuiText,
+  EuiTextArea,
+  EuiTitle,
+} from '@elastic/eui';
+import { API_ENDPOINT, ScreenshottingExpressionResponse } from '../../common';
+import { HttpContext } from './http_context';
+
+export function App() {
+  const http = useContext(HttpContext);
+  const [expression, setExpression] = useState<string>();
+  const [loading, setLoading] = useState(false);
+  const [response, setResponse] = useState<ScreenshottingExpressionResponse>();
+
+  const handleClick = useCallback(async () => {
+    try {
+      setLoading(true);
+      setResponse(
+        await http?.get<ScreenshottingExpressionResponse>(API_ENDPOINT, {
+          query: { expression },
+        })
+      );
+    } finally {
+      setLoading(false);
+    }
+  }, [expression, http]);
+  const handleChange = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setExpression(e.target.value);
+  }, []);
+
+  return (
+    <EuiPage>
+      <EuiPageBody style={{ maxWidth: 1200, margin: '0 auto' }}>
+        <EuiPageHeader>
+          <EuiPageHeaderSection>
+            <EuiTitle size="l">
+              <h1>Screenshotting Demo</h1>
+            </EuiTitle>
+          </EuiPageHeaderSection>
+        </EuiPageHeader>
+        <EuiPageContent>
+          <EuiPageContentBody>
+            <EuiText>
+              <p>This example captures a screenshot of an expression provided below.</p>
+            </EuiText>
+            <EuiSpacer size={'m'} />
+            <EuiTextArea
+              placeholder="Expression to render"
+              fullWidth
+              onChange={handleChange}
+              data-test-subj="expression"
+            />
+            <EuiSpacer size={'m'} />
+            <EuiButton
+              iconType="play"
+              onClick={handleClick}
+              isDisabled={!expression}
+              isLoading={loading}
+              data-test-subj="run"
+            >
+              Run
+            </EuiButton>
+            {!!response && <EuiHorizontalRule />}
+            {response?.errors && (
+              <>
+                <EuiCallOut
+                  title="Sorry, there was an error"
+                  color="danger"
+                  iconType="alert"
+                  data-test-subj="error"
+                >
+                  <p>{response.errors.join('\n')}</p>
+                </EuiCallOut>
+                <EuiSpacer size={'m'} />
+              </>
+            )}
+            <EuiFlexGroup justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>
+                {response?.image && (
+                  <EuiImage
+                    src={`data:image/png;base64,${response.image}`}
+                    alt="Screenshot"
+                    size="xl"
+                    allowFullScreen
+                    hasShadow
+                    data-test-subj="image"
+                  />
+                )}
+              </EuiFlexItem>
+              <EuiFlexItem>
+                {response?.metrics && (
+                  <>
+                    <EuiStat
+                      title={`${response.metrics.cpuInPercentage ?? 'N/A'}%`}
+                      description="CPU"
+                      titleColor="primary"
+                      data-test-subj="cpu"
+                    />
+                    <EuiSpacer size={'m'} />
+                    <EuiStat
+                      title={`${response.metrics.memoryInMegabytes ?? 'N/A'} MB`}
+                      description="Memory"
+                      titleColor="primary"
+                      data-test-subj="memory"
+                    />
+                  </>
+                )}
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPageContentBody>
+        </EuiPageContent>
+      </EuiPageBody>
+    </EuiPage>
+  );
+}
diff --git a/x-pack/examples/screenshotting_example/public/app/http_context.ts b/x-pack/examples/screenshotting_example/public/app/http_context.ts
new file mode 100644
index 0000000000000..e33a7bee5c6ce
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/app/http_context.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createContext } from 'react';
+import type { HttpStart } from '@kbn/core/public';
+
+export const HttpContext = createContext<HttpStart | undefined>(undefined);
diff --git a/x-pack/examples/screenshotting_example/public/app/index.ts b/x-pack/examples/screenshotting_example/public/app/index.ts
new file mode 100644
index 0000000000000..67d215f3d81e7
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/app/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './app';
+export * from './http_context';
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/index.ts b/x-pack/examples/screenshotting_example/public/index.ts
similarity index 66%
rename from x-pack/plugins/fleet/server/services/preconfiguration/index.ts
rename to x-pack/examples/screenshotting_example/public/index.ts
index e9ebc473af8f2..2d9a1d5fbb25b 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/index.ts
+++ b/x-pack/examples/screenshotting_example/public/index.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
-export { resetPreconfiguredAgentPolicies } from './reset_agent_policies';
+import { ScreenshottingExamplePlugin } from './plugin';
 
-export { ensurePreconfiguredOutputs } from './outputs';
+export function plugin() {
+  return new ScreenshottingExamplePlugin();
+}
diff --git a/x-pack/examples/screenshotting_example/public/plugin.tsx b/x-pack/examples/screenshotting_example/public/plugin.tsx
new file mode 100644
index 0000000000000..03cb974567dbb
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/public/plugin.tsx
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import type { AppMountParameters, CoreSetup, Plugin } from '@kbn/core/public';
+import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+
+import { App, HttpContext } from './app';
+
+interface SetupDeps {
+  developerExamples: DeveloperExamplesSetup;
+}
+
+const APPLICATION_ID = 'screenshottingExample';
+const APPLICATION_NAME = 'Screenshotting Example';
+
+export class ScreenshottingExamplePlugin implements Plugin<void, void> {
+  setup({ application, getStartServices }: CoreSetup, { developerExamples }: SetupDeps): void {
+    application.register({
+      id: APPLICATION_ID,
+      title: APPLICATION_NAME,
+      navLinkStatus: AppNavLinkStatus.hidden,
+      mount: async ({ element }: AppMountParameters) => {
+        const [{ http }] = await getStartServices();
+
+        ReactDOM.render(
+          <HttpContext.Provider value={http}>
+            <App />
+          </HttpContext.Provider>,
+          element
+        );
+        return () => ReactDOM.unmountComponentAtNode(element);
+      },
+    });
+
+    developerExamples.register({
+      appId: APPLICATION_ID,
+      title: APPLICATION_NAME,
+      description: 'An example integration with the screenshotting plugin.',
+    });
+  }
+
+  start() {}
+}
diff --git a/x-pack/examples/screenshotting_example/server/index.ts b/x-pack/examples/screenshotting_example/server/index.ts
new file mode 100644
index 0000000000000..2d9a1d5fbb25b
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/server/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ScreenshottingExamplePlugin } from './plugin';
+
+export function plugin() {
+  return new ScreenshottingExamplePlugin();
+}
diff --git a/x-pack/examples/screenshotting_example/server/plugin.ts b/x-pack/examples/screenshotting_example/server/plugin.ts
new file mode 100644
index 0000000000000..9ca74c6e16353
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/server/plugin.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { lastValueFrom } from 'rxjs';
+import { schema } from '@kbn/config-schema';
+import type { CoreSetup, Plugin } from '@kbn/core/server';
+import type { ScreenshottingStart } from '@kbn/screenshotting-plugin/server';
+import { API_ENDPOINT, ScreenshottingExpressionResponse } from '../common';
+
+interface StartDeps {
+  screenshotting: ScreenshottingStart;
+}
+
+export class ScreenshottingExamplePlugin implements Plugin<void, void> {
+  setup({ http, getStartServices }: CoreSetup<StartDeps>) {
+    const router = http.createRouter();
+
+    router.get(
+      {
+        path: API_ENDPOINT,
+        validate: {
+          query: schema.object({
+            expression: schema.string(),
+          }),
+        },
+      },
+      async (context, request, response) => {
+        const [, { screenshotting }] = await getStartServices();
+        const { metrics, results } = await lastValueFrom(
+          screenshotting.getScreenshots({
+            request,
+            expression: request.query.expression,
+          })
+        );
+
+        return response.ok({
+          body: JSON.stringify({
+            metrics,
+            image: results[0]?.screenshots[0]?.data.toString('base64'),
+            errors: results[0]?.renderErrors,
+          } as ScreenshottingExpressionResponse),
+        });
+      }
+    );
+  }
+
+  start() {}
+}
diff --git a/x-pack/examples/screenshotting_example/tsconfig.json b/x-pack/examples/screenshotting_example/tsconfig.json
new file mode 100644
index 0000000000000..b28f046f7b94b
--- /dev/null
+++ b/x-pack/examples/screenshotting_example/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types"
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "common/**/*.ts",
+    "../../../typings/**/*"
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
+    { "path": "../../../src/plugins/navigation/tsconfig.json" },
+    { "path": "../../../src/plugins/screenshot_mode/tsconfig.json" },
+    { "path": "../../../examples/developer_examples/tsconfig.json" },
+    { "path": "../../plugins/screenshotting/tsconfig.json" }
+  ]
+}
diff --git a/x-pack/examples/testing_embedded_lens/public/app.tsx b/x-pack/examples/testing_embedded_lens/public/app.tsx
index ba6e1f8ebcbe9..6df9f25310117 100644
--- a/x-pack/examples/testing_embedded_lens/public/app.tsx
+++ b/x-pack/examples/testing_embedded_lens/public/app.tsx
@@ -17,11 +17,11 @@ import {
   EuiPanel,
   EuiCallOut,
 } from '@elastic/eui';
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import useDebounce from 'react-use/lib/useDebounce';
-import { DOCUMENT_FIELD_NAME } from '../../../plugins/lens/common/constants';
-import type { DataView } from '../../../../src/plugins/data_views/public';
-import { ViewMode } from '../../../../src/plugins/embeddable/public';
+import { DOCUMENT_FIELD_NAME } from '@kbn/lens-plugin/common/constants';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type {
   TypedLensByValueInput,
   PersistedIndexPatternLayer,
@@ -36,14 +36,10 @@ import type {
   RangeIndexPatternColumn,
   PieVisualizationState,
   MedianIndexPatternColumn,
-} from '../../../plugins/lens/public';
+} from '@kbn/lens-plugin/public';
+import type { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { CodeEditor, HJsonLang, KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import type { StartDependencies } from './plugin';
-import type { ActionExecutionContext } from '../../../../src/plugins/ui_actions/public';
-import {
-  CodeEditor,
-  HJsonLang,
-  KibanaContextProvider,
-} from '../../../../src/plugins/kibana_react/public';
 
 type RequiredType = 'date' | 'string' | 'number';
 type FieldsMap = Record<RequiredType, string>;
diff --git a/x-pack/examples/testing_embedded_lens/public/mount.tsx b/x-pack/examples/testing_embedded_lens/public/mount.tsx
index f3739ac9a481d..ee58520c29c3c 100644
--- a/x-pack/examples/testing_embedded_lens/public/mount.tsx
+++ b/x-pack/examples/testing_embedded_lens/public/mount.tsx
@@ -9,9 +9,9 @@ import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { EuiCallOut } from '@elastic/eui';
 
-import type { CoreSetup, AppMountParameters } from 'kibana/public';
+import type { CoreSetup, AppMountParameters } from '@kbn/core/public';
+import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import type { StartDependencies } from './plugin';
-import type { TypedLensByValueInput } from '../../../plugins/lens/public';
 
 export const mount =
   (coreSetup: CoreSetup<StartDependencies>) =>
diff --git a/x-pack/examples/testing_embedded_lens/public/plugin.ts b/x-pack/examples/testing_embedded_lens/public/plugin.ts
index 374f830d0bb2e..5895151ab0797 100644
--- a/x-pack/examples/testing_embedded_lens/public/plugin.ts
+++ b/x-pack/examples/testing_embedded_lens/public/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { LensPublicStart } from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
 import { mount } from './mount';
 import image from './image.png';
 
diff --git a/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts b/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
index b7a7e4ab10c0e..b8f21580b24ab 100644
--- a/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
+++ b/x-pack/examples/third_party_lens_navigation_prompt/public/plugin.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataViewsPublicPluginStart, DataView } from '../../../../src/plugins/data_views/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
 import {
   DateHistogramIndexPatternColumn,
   IndexPatternPersistedState,
   LensPublicSetup,
   LensPublicStart,
-} from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
-import { TypedLensByValueInput, PersistedIndexPatternLayer } from '../../../plugins/lens/public';
+} from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { TypedLensByValueInput, PersistedIndexPatternLayer } from '@kbn/lens-plugin/public';
 import image from './image.png';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/third_party_vis_lens_example/public/expression.tsx b/x-pack/examples/third_party_vis_lens_example/public/expression.tsx
index 6e38f2e582209..b93a15bbada3f 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/expression.tsx
+++ b/x-pack/examples/third_party_vis_lens_example/public/expression.tsx
@@ -13,9 +13,9 @@ import type {
   ExpressionFunctionDefinition,
   ExpressionRenderDefinition,
   IInterpreterRenderHandlers,
-} from '../../../../src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
+import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { RotatingNumberState } from '../common/types';
-import { FormatFactory } from '../../../../src/plugins/field_formats/common';
 
 export const getRotatingNumberRenderer = (
   formatFactory: Promise<FormatFactory>
diff --git a/x-pack/examples/third_party_vis_lens_example/public/plugin.ts b/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
index 9b34972f12b00..123d7ef6367cd 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
+++ b/x-pack/examples/third_party_vis_lens_example/public/plugin.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataViewsPublicPluginStart, DataView } from '../../../../src/plugins/data_views/public';
-import { LensPublicSetup, LensPublicStart } from '../../../plugins/lens/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
-import { TypedLensByValueInput, PersistedIndexPatternLayer } from '../../../plugins/lens/public';
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { Plugin, CoreSetup, AppNavLinkStatus } from '@kbn/core/public';
+import { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
+import { LensPublicSetup, LensPublicStart } from '@kbn/lens-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import { TypedLensByValueInput, PersistedIndexPatternLayer } from '@kbn/lens-plugin/public';
 import { getRotatingNumberRenderer, rotatingNumberFunction } from './expression';
 import { getRotatingNumberVisualization } from './visualization';
 import { RotatingNumberState } from '../common/types';
diff --git a/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx b/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx
index a1796eee9b253..f122d17977f6f 100644
--- a/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx
+++ b/x-pack/examples/third_party_vis_lens_example/public/visualization.tsx
@@ -9,12 +9,12 @@ import React from 'react';
 import { EuiFormRow, EuiColorPicker } from '@elastic/eui';
 import { render } from 'react-dom';
 import { Ast } from '@kbn/interpreter';
-import { ThemeServiceStart } from '../../../../src/core/public';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
-import { Visualization, OperationMetadata } from '../../../plugins/lens/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Visualization, OperationMetadata } from '@kbn/lens-plugin/public';
+import { layerTypes } from '@kbn/lens-plugin/public';
 import type { RotatingNumberState } from '../common/types';
 import { DEFAULT_COLOR } from '../common/constants';
-import { layerTypes } from '../../../plugins/lens/public';
 
 const toExpression = (state: RotatingNumberState): Ast | null => {
   if (!state.accessor) {
diff --git a/x-pack/examples/third_party_vis_lens_example/server/index.ts b/x-pack/examples/third_party_vis_lens_example/server/index.ts
index cab22f4ad29c9..cba785e2c3783 100644
--- a/x-pack/examples/third_party_vis_lens_example/server/index.ts
+++ b/x-pack/examples/third_party_vis_lens_example/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { ThirdPartyVisLensExamplePlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new ThirdPartyVisLensExamplePlugin();
diff --git a/x-pack/examples/third_party_vis_lens_example/server/plugin.ts b/x-pack/examples/third_party_vis_lens_example/server/plugin.ts
index b3e99b665c494..ab58781654e5a 100644
--- a/x-pack/examples/third_party_vis_lens_example/server/plugin.ts
+++ b/x-pack/examples/third_party_vis_lens_example/server/plugin.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Plugin, CoreSetup } from 'kibana/server';
-import { LensServerPluginSetup } from '../../../plugins/lens/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { DEFAULT_COLOR } from '../common/constants';
 import { RotatingNumberState as Post81RotatingNumberState } from '../common/types';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx
index 792b978c99241..4ca214aa2cff4 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/containers/drilldowns_with_embeddable_example/drilldowns_with_embeddable_example.tsx
@@ -18,11 +18,8 @@ import {
   EuiFlexItem,
   EuiFlexGroup,
 } from '@elastic/eui';
+import { EmbeddableRoot, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { SampleMlJob, SampleApp1ClickContext } from '../../triggers';
-import {
-  EmbeddableRoot,
-  VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
 import { ButtonEmbeddable } from '../../embeddables/button_embeddable';
 import { useUiActions } from '../../context';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts b/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts
index 597bee10b51d6..bf9b31abd5c12 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/context/context.ts
@@ -6,8 +6,8 @@
  */
 
 import { createContext, useContext } from 'react';
-import { CoreStart } from 'src/core/public';
-import { UiActionsEnhancedDynamicActionManager } from '../../../../plugins/ui_actions_enhanced/public';
+import { CoreStart } from '@kbn/core/public';
+import { UiActionsEnhancedDynamicActionManager } from '@kbn/ui-actions-enhanced-plugin/public';
 import { StartDependencies } from '../plugin';
 
 export interface UiActionsExampleAppContextValue {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx
index 2db7255e607d0..6a405db14fc1d 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_hello_world_drilldown/app1_hello_world_drilldown.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiFieldText, EuiFormRow } from '@elastic/eui';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
-import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
+import { CollectConfigProps as CollectConfigPropsBase } from '@kbn/kibana-utils-plugin/public';
 import { SAMPLE_APP1_CLICK_TRIGGER, SampleApp1ClickContext } from '../../triggers';
 
 export interface Config extends SerializableRecord {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
index 1bb911530dc50..3dde2100ddc82 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app1_to_dashboard_drilldown/app1_to_dashboard_drilldown.ts
@@ -8,9 +8,9 @@
 import {
   DashboardEnhancedAbstractDashboardDrilldown as AbstractDashboardDrilldown,
   DashboardEnhancedAbstractDashboardDrilldownConfig as Config,
-} from '../../../../../plugins/dashboard_enhanced/public';
+} from '@kbn/dashboard-enhanced-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import { SAMPLE_APP1_CLICK_TRIGGER, SampleApp1ClickContext } from '../../triggers';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 
 export const APP1_TO_DASHBOARD_DRILLDOWN = 'APP1_TO_DASHBOARD_DRILLDOWN';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
index daac998872c14..6d6865595fced 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/app2_to_dashboard_drilldown/app2_to_dashboard_drilldown.ts
@@ -8,9 +8,9 @@
 import {
   DashboardEnhancedAbstractDashboardDrilldown as AbstractDashboardDrilldown,
   DashboardEnhancedAbstractDashboardDrilldownConfig as Config,
-} from '../../../../../plugins/dashboard_enhanced/public';
+} from '@kbn/dashboard-enhanced-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import { SAMPLE_APP2_CLICK_TRIGGER, SampleApp2ClickContext } from '../../triggers';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 
 export const APP2_TO_DASHBOARD_DRILLDOWN = 'APP2_TO_DASHBOARD_DRILLDOWN';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx
index 971f50c1efc3a..df61fe6a1344b 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_drilldown/index.tsx
@@ -7,14 +7,14 @@
 
 import React from 'react';
 import { EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
 import {
   ChartActionContext,
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/embeddable-plugin/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
 
 export type ActionContext = ChartActionContext;
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx
index c7c50fa6dc433..49081d60cd2de 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_hello_world_only_range_select_drilldown/index.tsx
@@ -7,14 +7,11 @@
 
 import React from 'react';
 import { EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
-import {
-  RangeSelectContext,
-  SELECT_RANGE_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
-import { BaseActionFactoryContext } from '../../../../../plugins/ui_actions_enhanced/public/dynamic_actions';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
+import { RangeSelectContext, SELECT_RANGE_TRIGGER } from '@kbn/embeddable-plugin/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
+import { BaseActionFactoryContext } from '@kbn/ui-actions-enhanced-plugin/public/dynamic_actions';
 
 export type Config = {
   name: string;
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
index 4e0d69084fc3c..2abf5ff0ac7d2 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
@@ -6,16 +6,16 @@
  */
 
 import React from 'react';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '@kbn/ui-actions-enhanced-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
 import { StartDependencies as Start } from '../../plugin';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { StartServicesGetter } from '../../../../../../src/plugins/kibana_utils/public';
 import { ActionContext, Config, CollectConfigProps } from './types';
 import { CollectConfigContainer } from './collect_config_container';
 import { SAMPLE_DASHBOARD_TO_DISCOVER_DRILLDOWN } from './constants';
-import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
 import { txtGoToDiscover } from './i18n';
-import { APPLY_FILTER_TRIGGER } from '../../../../../../src/plugins/data/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
 
 const isOutputWithIndexPatterns = (
   output: unknown
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
index 1047668fd9950..1bfd523d293d9 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
+import { CollectConfigProps as CollectConfigPropsBase } from '@kbn/kibana-utils-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
 
 export type ActionContext = ApplyGlobalFilterActionContext & { embeddable: IEmbeddable };
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts b/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts
index 8f5228c29f59e..df44e9061fc0e 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/embeddables/button_embeddable/button_embeddable.ts
@@ -7,12 +7,8 @@
 
 import { createElement } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AdvancedUiActionsStart } from '../../../../../plugins/ui_actions_enhanced/public';
-import {
-  Embeddable,
-  EmbeddableInput,
-  VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
+import { AdvancedUiActionsStart } from '@kbn/ui-actions-enhanced-plugin/public';
+import { Embeddable, EmbeddableInput, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { ButtonEmbeddableComponent } from './button_embeddable_component';
 
 export const BUTTON_EMBEDDABLE = 'BUTTON_EMBEDDABLE';
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx
index 3fd42488b2839..76708ac558fc8 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/mount.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { CoreSetup, AppMountParameters } from 'kibana/public';
+import { CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { StartDependencies, UiActionsEnhancedExamplesStart } from './plugin';
 import { UiActionsExampleAppContextValue, context } from './context';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts b/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
index 76cfe32ea9ec3..2c020314d05a3 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
@@ -6,22 +6,26 @@
  */
 
 import { createElement as h } from 'react';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
-import { Plugin, CoreSetup, CoreStart, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { Plugin, CoreSetup, CoreStart, AppNavLinkStatus } from '@kbn/core/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   AdvancedUiActionsSetup,
   AdvancedUiActionsStart,
-} from '../../../../x-pack/plugins/ui_actions_enhanced/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import { DashboardSetup, DashboardStart } from '@kbn/dashboard-plugin/public';
+import { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';
+import {
+  UiActionsEnhancedMemoryActionStorage,
+  UiActionsEnhancedDynamicActionManager,
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import { DashboardHelloWorldDrilldown } from './drilldowns/dashboard_hello_world_drilldown';
 import { DashboardToDiscoverDrilldown } from './drilldowns/dashboard_to_discover_drilldown';
 import { App1ToDashboardDrilldown } from './drilldowns/app1_to_dashboard_drilldown';
 import { App1HelloWorldDrilldown } from './drilldowns/app1_hello_world_drilldown';
-import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';
-import { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
-import { DashboardSetup, DashboardStart } from '../../../../src/plugins/dashboard/public';
 import { DashboardHelloWorldOnlyRangeSelectDrilldown } from './drilldowns/dashboard_hello_world_only_range_select_drilldown';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
 import {
   sampleApp1ClickTrigger,
   sampleApp2ClickTrigger,
@@ -30,10 +34,6 @@ import {
   sampleApp2ClickContext,
 } from './triggers';
 import { mount } from './mount';
-import {
-  UiActionsEnhancedMemoryActionStorage,
-  UiActionsEnhancedDynamicActionManager,
-} from '../../../plugins/ui_actions_enhanced/public';
 import { App2ToDashboardDrilldown } from './drilldowns/app2_to_dashboard_drilldown';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts
index 1d277ba1788b8..79ae512c3c818 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app1_trigger.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Trigger } from '../../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const SAMPLE_APP1_CLICK_TRIGGER = 'SAMPLE_APP1_CLICK_TRIGGER';
 
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts
index 2e4cd9ec4287b..79b1221fd5717 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/triggers/sample_app2_trigger.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Trigger } from '../../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const SAMPLE_APP2_CLICK_TRIGGER = 'SAMPLE_APP2_CLICK_TRIGGER';
 
diff --git a/x-pack/plugins/actions/common/types.ts b/x-pack/plugins/actions/common/types.ts
index d31472dd03710..20de64a7cc3b5 100644
--- a/x-pack/plugins/actions/common/types.ts
+++ b/x-pack/plugins/actions/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface ActionType {
   id: string;
diff --git a/x-pack/plugins/actions/server/action_type_registry.test.ts b/x-pack/plugins/actions/server/action_type_registry.test.ts
index 1bb0e76d7226b..760aafbefbba8 100644
--- a/x-pack/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_registry';
 import { ActionType, ExecutorType } from './types';
 import { ActionExecutor, ExecutorError, ILicenseState, TaskRunnerFactory } from './lib';
 import { actionsConfigMock } from './actions_config.mock';
 import { licenseStateMock } from './lib/license_state.mock';
 import { ActionsConfigurationUtilities } from './actions_config';
-import { licensingMock } from '../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
 const mockTaskManager = taskManagerMock.createSetup();
diff --git a/x-pack/plugins/actions/server/action_type_registry.ts b/x-pack/plugins/actions/server/action_type_registry.ts
index 9f8d2dec2128d..00851fcab7398 100644
--- a/x-pack/plugins/actions/server/action_type_registry.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import { RunContext, TaskManagerSetupContract } from '../../task_manager/server';
+import { RunContext, TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { ActionType as CommonActionType } from '../common';
 import { ActionsConfigurationUtilities } from './actions_config';
-import { LicensingPluginSetup } from '../../licensing/server';
 import {
   ExecutorError,
   getActionTypeFeatureUsageName,
diff --git a/x-pack/plugins/actions/server/actions_client.test.ts b/x-pack/plugins/actions/server/actions_client.test.ts
index 41bb5171de405..0b20e7078dd3b 100644
--- a/x-pack/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client.test.ts
@@ -13,19 +13,16 @@ import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_regist
 import { ActionsClient } from './actions_client';
 import { ExecutorType, ActionType } from './types';
 import { ActionExecutor, TaskRunnerFactory, ILicenseState } from './lib';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { actionsConfigMock } from './actions_config.mock';
 import { getActionsConfigurationUtilities } from './actions_config';
 import { licenseStateMock } from './lib/license_state.mock';
-import { licensingMock } from '../../licensing/server/mocks';
-import { httpServerMock, loggingSystemMock } from '../../../../src/core/server/mocks';
-import { auditLoggerMock } from '../../security/server/audit/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-import {
-  elasticsearchServiceMock,
-  savedObjectsClientMock,
-} from '../../../../src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { actionExecutorMock } from './lib/action_executor.mock';
 import uuid from 'uuid';
 import { ActionsAuthorization } from './authorization/actions_authorization';
@@ -36,12 +33,12 @@ import {
 import { actionsAuthorizationMock } from './authorization/actions_authorization.mock';
 import { trackLegacyRBACExemption } from './lib/track_legacy_rbac_exemption';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { Logger } from 'kibana/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { connectorTokenClientMock } from './builtin_action_types/lib/connector_token_client.mock';
 import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
-jest.mock('../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
index 18e67c5ca8076..cafbc6e6bd999 100644
--- a/x-pack/plugins/actions/server/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 import { i18n } from '@kbn/i18n';
 import { omitBy, isUndefined } from 'lodash';
@@ -18,8 +18,9 @@ import {
   SavedObject,
   KibanaRequest,
   SavedObjectsUtils,
-} from '../../../../src/core/server';
-import { AuditLogger } from '../../security/server';
+} from '@kbn/core/server';
+import { AuditLogger } from '@kbn/security-plugin/server';
+import { RunNowResult } from '@kbn/task-manager-plugin/server';
 import { ActionType } from '../common';
 import { ActionTypeRegistry } from './action_type_registry';
 import { validateConfig, validateSecrets, ActionExecutorContract, validateConnector } from './lib';
@@ -43,7 +44,6 @@ import {
   AuthorizationMode,
 } from './authorization/get_authorization_mode_by_source';
 import { connectorAuditEvent, ConnectorAuditAction } from './lib/audit_events';
-import { RunNowResult } from '../../task_manager/server';
 import { trackLegacyRBACExemption } from './lib/track_legacy_rbac_exemption';
 
 // We are assuming there won't be many actions. This is why we will load
diff --git a/x-pack/plugins/actions/server/actions_config.test.ts b/x-pack/plugins/actions/server/actions_config.test.ts
index 217f9593ee6d8..15261da6fd952 100644
--- a/x-pack/plugins/actions/server/actions_config.test.ts
+++ b/x-pack/plugins/actions/server/actions_config.test.ts
@@ -14,8 +14,8 @@ import {
   EnabledActionTypes,
 } from './actions_config';
 import { resolveCustomHosts } from './lib/custom_host_settings';
-import { Logger } from '../../../../src/core/server';
-import { loggingSystemMock } from '../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import moment from 'moment';
 
diff --git a/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts b/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts
index ea469c01decbb..09310c398bc53 100644
--- a/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts
+++ b/x-pack/plugins/actions/server/authorization/actions_authorization.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { securityMock } from '../../../../plugins/security/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { ActionsAuthorization } from './actions_authorization';
 import {
   ACTION_SAVED_OBJECT_TYPE,
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
 } from '../constants/saved_objects';
-import { AuthenticatedUser } from '../../../security/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
 import { AuthorizationMode } from './get_authorization_mode_by_source';
 
 const request = {} as KibanaRequest;
diff --git a/x-pack/plugins/actions/server/authorization/actions_authorization.ts b/x-pack/plugins/actions/server/authorization/actions_authorization.ts
index 8f7885b81b284..f09670c216613 100644
--- a/x-pack/plugins/actions/server/authorization/actions_authorization.ts
+++ b/x-pack/plugins/actions/server/authorization/actions_authorization.ts
@@ -6,8 +6,8 @@
  */
 
 import Boom from '@hapi/boom';
-import { KibanaRequest } from 'src/core/server';
-import { SecurityPluginSetup } from '../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   ACTION_SAVED_OBJECT_TYPE,
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts
index c55e457af5ab4..6d882be8705c3 100644
--- a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts
+++ b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.test.ts
@@ -9,7 +9,7 @@ import {
   getAuthorizationModeBySource,
   AuthorizationMode,
 } from './get_authorization_mode_by_source';
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import uuid from 'uuid';
 import { asSavedObjectExecutionSource } from '../lib';
 
diff --git a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts
index 659a51df7fbbd..f811c5ddad998 100644
--- a/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts
+++ b/x-pack/plugins/actions/server/authorization/get_authorization_mode_by_source.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { ActionExecutionSource, isSavedObjectExecutionSource } from '../lib';
 import { ALERT_SAVED_OBJECT_TYPE } from '../constants/saved_objects';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
index 456a105a0f081..729e1e8c9ac2f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
@@ -9,7 +9,7 @@ jest.mock('./lib/send_email', () => ({
   sendEmail: jest.fn(),
 }));
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { actionsConfigMock } from '../actions_config.mock';
 import { validateConfig, validateConnector, validateParams, validateSecrets } from '../lib';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.ts b/x-pack/plugins/actions/server/builtin_action_types/email.ts
index ed9509cf98bc6..29c4f9fb595bd 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts
@@ -11,9 +11,9 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import nodemailerGetService from 'nodemailer/lib/well-known';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 
+import { Logger } from '@kbn/core/server';
 import { sendEmail, JSON_TRANSPORT_SERVICE, SendEmailOptions, Transport } from './lib/send_email';
 import { portSchema } from './lib/schemas';
-import { Logger } from '../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
 import { renderMustacheString, renderMustacheObject } from '../lib/mustache_renderer';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
index 7f9aa2298fc14..cca2f8c045d3d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -20,7 +20,7 @@ import {
 } from './es_index';
 import { AlertHistoryEsIndexConnectorId } from '../../common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 const ACTION_TYPE_ID = '.index';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/es_index.ts b/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
index 6ab24293d18ad..2a2ca0504d3ac 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
@@ -8,7 +8,7 @@
 import { curry, find } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { renderMustacheObject } from '../lib/mustache_renderer';
 import { buildAlertHistoryDocument, AlertHistoryEsIndexConnectorId } from '../../common';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
index 12001a472ca49..2465e64179a7b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
@@ -7,13 +7,13 @@
 
 import { ActionExecutor, TaskRunnerFactory } from '../lib';
 import { ActionTypeRegistry } from '../action_type_registry';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
-import { registerBuiltInActionTypes } from './index';
-import { Logger } from '../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { registerBuiltInActionTypes } from '.';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../actions_config.mock';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 
 const ACTION_TYPE_IDS = [
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.ts b/x-pack/plugins/actions/server/builtin_action_types/index.ts
index 5c9c8e784af7e..26ca6b7b1820e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Logger } from '@kbn/core/server';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { ActionsConfigurationUtilities } from '../actions_config';
-import { Logger } from '../../../../../src/core/server';
 
 import { getActionType as getEmailActionType } from './email';
 import { getActionType as getIndexActionType } from './es_index';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts
index a1ad8aae92aa4..b682d069397b8 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceMock, apiParams } from './mocks';
 import { ExternalService } from './types';
 import { api } from './api';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
index c8b107094723f..af94c79e46309 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
@@ -8,6 +8,7 @@
 import { curry } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 
+import { Logger } from '@kbn/core/server';
 import { validate } from './validators';
 import {
   ExternalIncidentServiceConfiguration,
@@ -31,7 +32,6 @@ import {
   ExecutorSubActionGetIncidentParams,
 } from './types';
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ActionParamsType = TypeOf<typeof ExecutorParamsSchema>;
 interface GetActionTypeParams {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
index 1254d86e99066..c62a1f3230e64 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalService } from './service';
 import { request, createAxiosResponse } from '../lib/axios_utils';
 import { ExternalService } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
index a3262a526e2f4..5f5147c67e104 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 import { isEmpty } from 'lodash';
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   CreateCommentParams,
   CreateIncidentParams,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
index 74d53901d55d9..ad504585b6f4b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/types.ts
@@ -8,6 +8,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import {
   ExternalIncidentServiceConfigurationSchema,
   ExternalIncidentServiceSecretConfigurationSchema,
@@ -22,7 +23,6 @@ import {
   ExecutorSubActionCommonFieldsParamsSchema,
 } from './schema';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { Logger } from '../../../../../../src/core/server';
 
 export type JiraPublicConfigurationType = TypeOf<typeof ExternalIncidentServiceConfigurationSchema>;
 export type JiraSecretConfigurationType = TypeOf<
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
index d0177e0e5a8a2..a172a2b6391e1 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
@@ -9,7 +9,7 @@ import axios from 'axios';
 import { Agent as HttpsAgent } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   addTimeZoneToDate,
   request,
@@ -18,7 +18,7 @@ import {
   throwIfResponseIsNotValid,
   createAxiosResponse,
 } from './axios_utils';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { getCustomAgents } from './get_custom_agents';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
index 43c9d276e6574..a7a9d135f2f2e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
@@ -7,7 +7,7 @@
 
 import { isObjectLike, isEmpty } from 'lodash';
 import { AxiosInstance, Method, AxiosResponse, AxiosBasicCredentials } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getCustomAgents } from './get_custom_agents';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
index 149ac79522f73..d5daa33cbb47c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils_connection.test.ts
@@ -15,9 +15,9 @@ import { schema } from '@kbn/config-schema';
 
 import { request } from './axios_utils';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { createReadySignal } from '../../../../event_log/server/lib/ready_signal';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { createReadySignal } from '@kbn/event-log-plugin/server/lib/ready_signal';
 import { ActionsConfig } from '../../config';
 import {
   ActionsConfigurationUtilities,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts
index 1fa02d172ab36..e3e9f3b362ae9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { ConnectorTokenClient } from './connector_token_client';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ConnectorToken } from '../../types';
 
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
-jest.mock('../../../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts
index b5a91d6e3db69..949ec855ee3f0 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/connector_token_client.ts
@@ -6,13 +6,9 @@
  */
 
 import { omitBy, isUndefined } from 'lodash';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { Logger, SavedObjectsClientContract, SavedObjectsUtils } from '@kbn/core/server';
 import { ConnectorToken } from '../../types';
-import { EncryptedSavedObjectsClient } from '../../../../encrypted_saved_objects/server';
-import {
-  Logger,
-  SavedObjectsClientContract,
-  SavedObjectsUtils,
-} from '../../../../../../src/core/server';
 import { CONNECTOR_TOKEN_SAVED_OBJECT_TYPE } from '../../constants/saved_objects';
 
 export const MAX_TOKENS_RETURNED = 1;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts
index ed6497573a362..d68cc9a5e4398 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.test.ts
@@ -10,8 +10,8 @@ jest.mock('jsonwebtoken', () => ({
 }));
 
 import jwt from 'jsonwebtoken';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createJWTAssertion } from './create_jwt_assertion';
 
 const jwtSign = jwt.sign as jest.Mock;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts
index 79230a99a3822..f4723e59b418c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/create_jwt_assertion.ts
@@ -6,7 +6,7 @@
  */
 
 import jwt, { Algorithm } from 'jsonwebtoken';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export interface JWTClaims {
   audience: string;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
index 0c1112da5909f..4d83cce7be1a7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.test.ts
@@ -8,9 +8,9 @@
 import { Agent as HttpsAgent } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getCustomAgents } from './get_custom_agents';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
index a98622a374bea..2654198828eef 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_custom_agents.ts
@@ -9,7 +9,7 @@ import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent, AgentOptions } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
index 893191b2ca2b4..c31addd53f44b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
index 46e90ec3be697..5892442a1a319 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_ssl_options.ts
@@ -6,8 +6,8 @@
  */
 
 import { PeerCertificate } from 'tls';
+import { Logger } from '@kbn/core/server';
 import { SSLSettings } from '../../types';
-import { Logger } from '../../../../../../src/core/server';
 
 export function getNodeSSLOptions(
   logger: Logger,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts
index 07ab8d4ba260f..374e91890c1e6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/post_pagerduty.ts
@@ -6,7 +6,7 @@
  */
 
 import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Services } from '../../types';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts
index 7cd6b105a34ac..fb93ac5ef28ec 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/post_xmatters.ts
@@ -6,7 +6,7 @@
  */
 
 import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts
index a8dbe4ebc0743..95964214dd6b1 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
   create: jest.fn(),
 }));
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { requestOAuthClientCredentialsToken } from './request_oauth_client_credentials_token';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts
index 3acd01be6954f..784e5958803a2 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_client_credentials_token.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { OAuthTokenResponse, requestOAuthToken } from './request_oauth_token';
-import { RewriteResponseCase } from '../../../../actions/common';
+import { RewriteResponseCase } from '../../../common';
 
 export const OAUTH_CLIENT_CREDENTIALS_GRANT_TYPE = 'client_credentials';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts
index 9ee510bd991f2..43d4fd7180549 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
   create: jest.fn(),
 }));
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { requestOAuthJWTToken } from './request_oauth_jwt_token';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts
index 91c1d8a999b23..84b31f590413f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_jwt_token.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { OAuthTokenResponse, requestOAuthToken } from './request_oauth_token';
-import { RewriteResponseCase } from '../../../../actions/common';
+import { RewriteResponseCase } from '../../../common';
 
 // This is a standard for JSON Web Token (JWT) Profile
 // for OAuth 2.0 Client Authentication and Authorization Grants https://datatracker.ietf.org/doc/html/rfc7523#section-8.1
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts
index d8280d2fcdebd..443a9234d7a08 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
   create: jest.fn(),
 }));
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { requestOAuthToken } from './request_oauth_token';
 import { actionsConfigMock } from '../../actions_config.mock';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts
index 6e4fc40ed21be..a7b845a504c83 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/request_oauth_token.ts
@@ -8,10 +8,10 @@
 import qs from 'query-string';
 import axios from 'axios';
 import stringify from 'json-stable-stringify';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { AsApiContract } from '../../../../actions/common';
+import { AsApiContract } from '../../../common';
 
 export interface OAuthTokenResponse {
   tokenType: string;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
index c3fc1c8128ffc..65aad21db447e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
@@ -16,9 +16,9 @@ jest.mock('./request_oauth_client_credentials_token', () => ({
   requestOAuthClientCredentialsToken: jest.fn(),
 }));
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { sendEmail } from './send_email';
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import nodemailer from 'nodemailer';
 import { ProxySettings } from '../../types';
 import { actionsConfigMock } from '../../actions_config.mock';
@@ -26,7 +26,7 @@ import { CustomHostSettings } from '../../config';
 import { sendEmailGraphApi } from './send_email_graph_api';
 import { requestOAuthClientCredentialsToken } from './request_oauth_client_credentials_token';
 import { ConnectorTokenClient } from './connector_token_client';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { connectorTokenClientMock } from './connector_token_client.mock';
 
 const createTransportMock = nodemailer.createTransport as jest.Mock;
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
index 378edc174e790..a664b22f9df34 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
@@ -9,7 +9,7 @@
 import nodemailer from 'nodemailer';
 import { default as MarkdownIt } from 'markdown-it';
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { CustomHostSettings } from '../../config';
 import { getNodeSSLOptions, getSSLSettingsFromConfig } from './get_node_ssl_options';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts
index 63cd3523b0026..fc67302b9bb0a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.test.ts
@@ -9,8 +9,8 @@ jest.mock('axios', () => ({
 }));
 
 import axios from 'axios';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { CustomHostSettings } from '../../config';
 import { ProxySettings } from '../../types';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts
index ea1579095bb97..c16cd884cb753 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email_graph_api.ts
@@ -8,7 +8,7 @@
 // @ts-expect-error missing type def
 import stringify from 'json-stringify-safe';
 import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { request } from './axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 import { SendEmailOptions } from './send_email';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index f6567d6da3713..c3628acc43b2f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -15,7 +15,7 @@ import { Services } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { postPagerduty } from './lib/post_pagerduty';
 import { createActionTypeRegistry } from './index.test';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { actionsConfigMock } from '../actions_config.mock';
 import { actionsMock } from '../mocks';
 import {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
index 4f5cb557d4b93..d9aac7f58108c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -9,8 +9,8 @@ import { curry, isUndefined, pick, omitBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 import moment from 'moment';
+import { Logger } from '@kbn/core/server';
 import { postPagerduty } from './lib/post_pagerduty';
-import { Logger } from '../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts
index 48a66710ba629..c92148b26319a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { api } from './api';
 import { externalServiceMock, apiParams } from './mocks';
 import { ExternalService } from './types';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts
index 528f25da12a47..b036d655feba8 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/index.ts
@@ -8,6 +8,7 @@
 import { curry } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 
+import { Logger } from '@kbn/core/server';
 import { validate } from './validators';
 import {
   ExternalIncidentServiceConfiguration,
@@ -29,7 +30,6 @@ import {
   ExecutorSubActionCommonFieldsParams,
 } from './types';
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ActionParamsType = TypeOf<typeof ExecutorParamsSchema>;
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
index 094b8150850df..e51117c93301c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalService, getValueTextContent, formatUpdateRequest } from './service';
 import { request, createAxiosResponse } from '../lib/axios_utils';
 import { ExternalService } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { incidentTypes, resilientFields, severity } from './mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
index a469c631fac37..acad4707c29fc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 import { omitBy, isNil } from 'lodash/fp';
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   ExternalService,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts
index 640733d5916ce..da37e6c072ac5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/types.ts
@@ -8,6 +8,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import {
   ExecutorParamsSchema,
   ExecutorSubActionCommonFieldsParamsSchema,
@@ -21,7 +22,6 @@ import {
 } from './schema';
 
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ResilientPublicConfigurationType = TypeOf<
   typeof ExternalIncidentServiceConfigurationSchema
diff --git a/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts b/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts
index 45fd2048a3bd7..776d412d84143 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/server_log.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { validateParams } from '../lib';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { createActionTypeRegistry } from './index.test';
 import { actionsMock } from '../mocks';
 import {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
index 6c54c1b9f2ff1..5641db63b9811 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
@@ -9,7 +9,7 @@ import { curry } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { Logger, LogMeta } from '../../../../../src/core/server';
+import { Logger, LogMeta } from '@kbn/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { withoutControlCharacters } from './lib/string_utils';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts
index 7969f2e53d3d9..ce7439bc05df5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceMock, apiParams, serviceNowCommonFields, serviceNowChoices } from './mocks';
 import { ExternalService } from './types';
 import { api } from './api';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts
index c918c4a52670a..be10a10dfb819 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_itom.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceITOMMock, itomEventParams } from './mocks';
 import { ExternalServiceITOM } from './types';
 import { apiITOM, prepareParams } from './api_itom';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
index e5a161611fcb1..0eab1bf7fe089 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { externalServiceSIRMock, sirParams } from './mocks';
 import { ExternalServiceSIR, ObservableTypes } from './types';
 import { apiSIR, combineObservables, formatObservables, prepareParams } from './api_sir';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
index 1e07cf858f332..e22c65a3694bb 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
@@ -8,6 +8,7 @@
 import { curry } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 
+import { Logger } from '@kbn/core/server';
 import { validate } from './validators';
 import {
   ExternalIncidentServiceConfiguration,
@@ -22,7 +23,6 @@ import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from
 import { createExternalService } from './service';
 import { api as commonAPI } from './api';
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 import {
   ExecutorParams,
   ExecutorSubActionPushParams,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts
index db3eb3b448e6f..c179277956aa9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.test.ts
@@ -10,8 +10,8 @@ import axios, { AxiosResponse } from 'axios';
 import { createExternalService } from './service';
 import * as utils from '../lib/axios_utils';
 import { ExternalService, ServiceNowITSMIncident } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { serviceNowCommonFields, serviceNowChoices } from './mocks';
 import { snExternalServiceConfig } from './config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
index 5e657e1890695..8e606ca5f8ef7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
@@ -7,6 +7,7 @@
 
 import axios, { AxiosResponse } from 'axios';
 
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   ExternalService,
@@ -21,7 +22,6 @@ import {
 } from './types';
 
 import * as i18n from './translations';
-import { Logger } from '../../../../../../src/core/server';
 import { ServiceNowPublicConfigurationType, ServiceNowSecretConfigurationType } from './types';
 import { request } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts
index a0277be2a0d24..57e7a7506171a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalServiceITOM } from './service_itom';
 import * as utils from '../lib/axios_utils';
 import { ExternalServiceITOM } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { snExternalServiceConfig } from './config';
 import { itomEventParams, serviceNowChoices } from './mocks';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts
index aa135e07dbc64..65c9c70545acc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_itom.ts
@@ -6,6 +6,7 @@
  */
 import axios from 'axios';
 
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   SNProductsConfigValue,
@@ -14,7 +15,6 @@ import {
   ExecutorSubActionAddEventParams,
 } from './types';
 
-import { Logger } from '../../../../../../src/core/server';
 import { ServiceNowSecretConfigurationType } from './types';
 import { request } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts
index 0fc94b6287abd..cbd47fb2552c7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.test.ts
@@ -10,8 +10,8 @@ import axios from 'axios';
 import { createExternalServiceSIR } from './service_sir';
 import * as utils from '../lib/axios_utils';
 import { ExternalServiceSIR } from './types';
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { observables } from './mocks';
 import { snExternalServiceConfig } from './config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts
index 03433f11f9465..41c02a57643e3 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service_sir.ts
@@ -7,6 +7,7 @@
 
 import axios from 'axios';
 
+import { Logger } from '@kbn/core/server';
 import {
   ExternalServiceCredentials,
   SNProductsConfigValue,
@@ -16,7 +17,6 @@ import {
   ServiceFactory,
 } from './types';
 
-import { Logger } from '../../../../../../src/core/server';
 import { ServiceNowSecretConfigurationType } from './types';
 import { request } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts
index 352a0c22c7ec8..270abfed3fb35 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/types.ts
@@ -9,6 +9,7 @@
 
 import { AxiosError, AxiosResponse } from 'axios';
 import { TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import {
   ExecutorParamsSchemaITSM,
   ExecutorSubActionCommonFieldsParamsSchema,
@@ -25,7 +26,6 @@ import {
   ExternalIncidentServiceConfigurationBaseSchema,
 } from './schema';
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { Logger } from '../../../../../../src/core/server';
 
 export type ServiceNowPublicConfigurationBaseType = TypeOf<
   typeof ExternalIncidentServiceConfigurationBaseSchema
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts
index 3eaf5305d5d26..7d66949d4473f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.test.ts
@@ -7,8 +7,8 @@
 
 import { AxiosError } from 'axios';
 
-import { Logger } from '../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   prepareIncident,
   createServiceError,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts
index 3bd4864b71e7a..f18d09cdaedb9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Incident, PartialIncident, ResponseError, ServiceNowError } from './types';
 import { FIELD_PREFIX } from './config';
 import { addTimeZoneToDate, getErrorMessage } from '../lib/axios_utils';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index 7953f0ab365e8..bcff352180656 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Services, ActionTypeExecutorResult } from '../types';
 import { validateParams, validateSecrets } from '../lib';
 import { getActionType, SlackActionType, SlackActionTypeExecutorOptions } from './slack';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
index d0fb4a8c4b935..5fce521eb5f09 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -14,7 +14,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { IncomingWebhook, IncomingWebhookResult } from '@slack/webhook';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, getOrElse } from 'fp-ts/lib/Option';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getRetryAfterIntervalFromHeaders } from './lib/http_rersponse_retry_header';
 import { renderMustacheString } from '../lib/mustache_renderer';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
index 21bc4894c5717..9701eff3f0cdc 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
@@ -7,8 +7,8 @@
 
 import axios from 'axios';
 
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { Logger } from '../../../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { request, createAxiosResponse } from '../lib/axios_utils';
 import { createExternalService } from './service';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts b/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
index aeb21b81ebc5d..eb4ce4fda4cc6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/teams.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Services } from '../types';
 import { validateParams, validateSecrets } from '../lib';
 import axios from 'axios';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/teams.ts b/x-pack/plugins/actions/server/builtin_action_types/teams.ts
index ffd42b82c286f..87429344abc01 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/teams.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/teams.ts
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, getOrElse } from 'fp-ts/lib/Option';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getRetryAfterIntervalFromHeaders } from './lib/http_rersponse_retry_header';
 import { isOk, promiseResult, Result } from './lib/result_type';
 import { request } from './lib/axios_utils';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
index 1dbc6b2c6f606..2f68c6465fa18 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -9,7 +9,7 @@ import { Services } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { actionsConfigMock } from '../actions_config.mock';
 import { createActionTypeRegistry } from './index.test';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { actionsMock } from '../mocks';
 import axios from 'axios';
 import {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
index 93c9bbdbab18a..a36b971635e36 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -11,12 +11,12 @@ import axios, { AxiosError, AxiosResponse } from 'axios';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, getOrElse } from 'fp-ts/lib/Option';
+import { Logger } from '@kbn/core/server';
 import { getRetryAfterIntervalFromHeaders } from './lib/http_rersponse_retry_header';
 import { nullableType } from './lib/nullable';
 import { isOk, promiseResult, Result } from './lib/result_type';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
-import { Logger } from '../../../../../src/core/server';
 import { request } from './lib/axios_utils';
 import { renderMustacheString } from '../lib/mustache_renderer';
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts b/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts
index 989ab4ff63c9e..1ea95b4bf0b44 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/xmatters.test.ts
@@ -14,7 +14,7 @@ import { validateConfig, validateSecrets, validateParams, validateConnector } fr
 import { postXmatters } from './lib/post_xmatters';
 import { actionsConfigMock } from '../actions_config.mock';
 import { createActionTypeRegistry } from './index.test';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { actionsMock } from '../mocks';
 import {
   ActionParamsType,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts b/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts
index 9158b981c5a8c..670581d25d62d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/xmatters.ts
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { curry, isString } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
+import { Logger } from '@kbn/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { ActionsConfigurationUtilities } from '../actions_config';
-import { Logger } from '../../../../../src/core/server';
 import { postXmatters } from './lib/post_xmatters';
 
 export type XmattersActionType = ActionType<
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts
index 6d3647be4b65d..a3cf697be9fcd 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult, SavedObjectsSerializer } from 'kibana/server';
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
-import { spacesMock } from '../../../spaces/server/mocks';
+import type { SavedObjectsFindResult, SavedObjectsSerializer } from '@kbn/core/server';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 import { CleanupTasksOpts, cleanupTasks } from './cleanup_tasks';
-import { TaskInstance } from '../../../task_manager/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 describe('cleanupTasks', () => {
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
index 3009bfe1a277b..e9c3c4e93fc82 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/cleanup_tasks.ts
@@ -10,9 +10,9 @@ import {
   ElasticsearchClient,
   SavedObjectsFindResult,
   SavedObjectsSerializer,
-} from 'kibana/server';
-import { TaskInstance } from '../../../task_manager/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+} from '@kbn/core/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   bulkDelete,
   extractBulkResponseDeleteFailures,
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts
index 3c27a38e818ef..f3baeb420cc31 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.test.ts
@@ -8,8 +8,8 @@
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ensureScheduled } from './ensure_scheduled';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('ensureScheduled', () => {
   const logger = loggingSystemMock.create().get();
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts
index 6dc1ce44982c1..d40f1ea15e1f9 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/ensure_scheduled.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
+import { TaskManagerStartContract, asInterval } from '@kbn/task-manager-plugin/server';
 import { TASK_ID, TASK_TYPE } from './constants';
 import { ActionsConfig } from '../config';
-import { TaskManagerStartContract, asInterval } from '../../../task_manager/server';
 
 export async function ensureScheduled(
   taskManager: TaskManagerStartContract,
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts
index e7ac962251f87..6dd2075f648d9 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.test.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/server';
+import { CoreStart } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
-import { spacesMock } from '../../../spaces/server/mocks';
-import { esKuery } from '../../../../../src/plugins/data/server';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
+import { esKuery } from '@kbn/data-plugin/server';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
   savedObjectsServiceMock,
   elasticsearchServiceMock,
-} from '../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { FindAndCleanupTasksOpts, findAndCleanupTasks } from './find_and_cleanup_tasks';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts
index 8d00c952454b3..fc180a47b3e2b 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/find_and_cleanup_tasks.ts
@@ -6,12 +6,12 @@
  */
 
 import { nodeBuilder } from '@kbn/es-query';
-import { Logger, CoreStart } from 'kibana/server';
+import { Logger, CoreStart } from '@kbn/core/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
 import { ActionTypeRegistryContract } from '../types';
 import { cleanupTasks, CleanupTasksResult } from './cleanup_tasks';
-import { TaskInstance } from '../../../task_manager/server';
 
 export interface FindAndCleanupTasksOpts {
   logger: Logger;
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts
index c93cc12b49731..398a5ae324038 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/bulk_delete.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { TransportResult } from '@elastic/elasticsearch';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts
index 7a9b664387ff4..6eee015ebd03d 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/lib/get_raw_action_task_params_id_from_task.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult, SavedObjectsSerializer } from 'kibana/server';
+import { SavedObjectsFindResult, SavedObjectsSerializer } from '@kbn/core/server';
+import { TaskInstance } from '@kbn/task-manager-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { spaceIdToNamespace } from '../../lib';
-import { TaskInstance } from '../../../../task_manager/server';
-import { SpacesPluginStart } from '../../../../spaces/server';
 
 interface GetRawActionTaskParamsIdFromTaskOpts {
   task: SavedObjectsFindResult<TaskInstance>;
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts
index a12ab16facdcd..55023844befd9 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/server';
+import { CoreStart } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
 import { registerTaskDefinition } from './register_task_definition';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
-import { loggingSystemMock, coreMock } from '../../../../../src/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { TaskRunnerOpts } from './task_runner';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts
index c9a6b486a6463..7b447bc17c2b7 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/register_task_definition.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
 import { TASK_TYPE } from './constants';
 import { taskRunner, TaskRunnerOpts } from './task_runner';
-import { TaskManagerSetupContract } from '../../../task_manager/server';
 
 export function registerTaskDefinition(
   taskManager: TaskManagerSetupContract,
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts
index d465e532b0284..117e53a2c2145 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/server';
+import { CoreStart } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionsConfig } from '../config';
 import { ActionsPluginsStart } from '../plugin';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
-import { loggingSystemMock, coreMock } from '../../../../../src/core/server/mocks';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
+import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { taskRunner, TaskRunnerOpts } from './task_runner';
 
diff --git a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts
index 38eb672238c7f..141247330d4b0 100644
--- a/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts
+++ b/x-pack/plugins/actions/server/cleanup_failed_executions/task_runner.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Logger, CoreStart } from 'kibana/server';
+import { Logger, CoreStart } from '@kbn/core/server';
+import { RunContext, asInterval } from '@kbn/task-manager-plugin/server';
 import { ActionsConfig } from '../config';
-import { RunContext, asInterval } from '../../../task_manager/server';
 import { ActionsPluginsStart } from '../plugin';
 import { ActionTypeRegistryContract } from '../types';
 import { findAndCleanupTasks } from './find_and_cleanup_tasks';
diff --git a/x-pack/plugins/actions/server/config.test.ts b/x-pack/plugins/actions/server/config.test.ts
index 7f3ce5bee6e02..4f39956d910a9 100644
--- a/x-pack/plugins/actions/server/config.test.ts
+++ b/x-pack/plugins/actions/server/config.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { configSchema, ActionsConfig, getValidatedConfig } from './config';
-import { Logger } from '../../../..//src/core/server';
-import { loggingSystemMock } from '../../../..//src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 const mockLogger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 
diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts
index cf05ee9a24eec..1f279f20c27c3 100644
--- a/x-pack/plugins/actions/server/config.ts
+++ b/x-pack/plugins/actions/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { Logger } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export enum AllowedHosts {
   Any = '*',
diff --git a/x-pack/plugins/actions/server/constants/plugin.ts b/x-pack/plugins/actions/server/constants/plugin.ts
index cecf56cf22a52..0d9d147275f07 100644
--- a/x-pack/plugins/actions/server/constants/plugin.ts
+++ b/x-pack/plugins/actions/server/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 
 export const PLUGIN = {
   ID: 'actions',
diff --git a/x-pack/plugins/actions/server/create_execute_function.test.ts b/x-pack/plugins/actions/server/create_execute_function.test.ts
index ffbf150119510..a503b1adeb40c 100644
--- a/x-pack/plugins/actions/server/create_execute_function.test.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import uuid from 'uuid';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { createExecutionEnqueuerFunction } from './create_execute_function';
-import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { actionTypeRegistryMock } from './action_type_registry.mock';
 import {
   asHttpRequestExecutionSource,
diff --git a/x-pack/plugins/actions/server/create_execute_function.ts b/x-pack/plugins/actions/server/create_execute_function.ts
index 46337441caace..ed5ddcacc5e6e 100644
--- a/x-pack/plugins/actions/server/create_execute_function.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from '../../../../src/core/server';
-import { RunNowResult, TaskManagerStartContract } from '../../task_manager/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { RunNowResult, TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import {
   RawAction,
   ActionTypeRegistryContract,
diff --git a/x-pack/plugins/actions/server/feature.ts b/x-pack/plugins/actions/server/feature.ts
index ecb2e0e0b9ea3..c176e9f261551 100644
--- a/x-pack/plugins/actions/server/feature.ts
+++ b/x-pack/plugins/actions/server/feature.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import {
   ACTION_SAVED_OBJECT_TYPE,
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
   CONNECTOR_TOKEN_SAVED_OBJECT_TYPE,
 } from './constants/saved_objects';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
 
 /**
  * The order of appearance in the feature privilege page
diff --git a/x-pack/plugins/actions/server/index.test.ts b/x-pack/plugins/actions/server/index.test.ts
index fe8cf98a48f43..43f69da15de2f 100644
--- a/x-pack/plugins/actions/server/index.test.ts
+++ b/x-pack/plugins/actions/server/index.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from 'src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.actions';
 const applyStackAlertDeprecations = (settings: Record<string, unknown> = {}) => {
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index 9af6db47d076c..7b5863eabf0a9 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -6,7 +6,7 @@
  */
 import { get } from 'lodash';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { ActionsPlugin } from './plugin';
 import { configSchema, ActionsConfig, CustomHostSettings } from './config';
 import { ActionsClient as ActionsClientClass } from './actions_client';
diff --git a/x-pack/plugins/actions/server/lib/action_execution_source.ts b/x-pack/plugins/actions/server/lib/action_execution_source.ts
index 95ee211c6e9b4..f5e1570dfa4c5 100644
--- a/x-pack/plugins/actions/server/lib/action_execution_source.ts
+++ b/x-pack/plugins/actions/server/lib/action_execution_source.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectReference } from 'src/core/server';
+import { KibanaRequest, SavedObjectReference } from '@kbn/core/server';
 
 export enum ActionExecutionSourceType {
   SAVED_OBJECT = 'SAVED_OBJECT',
diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
index 3d6e49fa13584..881877d74bb9d 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { KibanaRequest } from '../../../../../src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ActionExecutor } from './action_executor';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { eventLoggerMock } from '../../../event_log/server/mocks';
-import { spacesServiceMock } from '../../../spaces/server/spaces_service/spaces_service.mock';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/mocks';
+import { spacesServiceMock } from '@kbn/spaces-plugin/server/spaces_service/spaces_service.mock';
 import { ActionType } from '../types';
 import { actionsMock, actionsClientMock } from '../mocks';
 import { pick } from 'lodash';
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index 8869ed79dd2a6..fe77b72f47aa3 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -6,9 +6,12 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { Logger, KibanaRequest } from 'src/core/server';
+import { Logger, KibanaRequest } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 import { withSpan } from '@kbn/apm-utils';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
+import { IEventLogger, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import {
   validateParams,
   validateConfig,
@@ -22,10 +25,7 @@ import {
   PreConfiguredAction,
   RawAction,
 } from '../types';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { SpacesServiceStart } from '../../../spaces/server';
 import { EVENT_LOG_ACTIONS } from '../constants/event_log';
-import { IEventLogger, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
 import { ActionsClient } from '../actions_client';
 import { ActionExecutionSource } from './action_execution_source';
 import { RelatedSavedObjects } from './related_saved_objects';
diff --git a/x-pack/plugins/actions/server/lib/action_task_params_utils.ts b/x-pack/plugins/actions/server/lib/action_task_params_utils.ts
index a4b1afb9497dc..4c2d1b4c9dc20 100644
--- a/x-pack/plugins/actions/server/lib/action_task_params_utils.ts
+++ b/x-pack/plugins/actions/server/lib/action_task_params_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectAttribute, SavedObjectReference } from 'src/core/server/types';
+import { SavedObjectAttribute, SavedObjectReference } from '@kbn/core/server/types';
 import { RelatedSavedObjects } from './related_saved_objects';
 
 export const ACTION_REF_NAME = `actionRef`;
diff --git a/x-pack/plugins/actions/server/lib/audit_events.ts b/x-pack/plugins/actions/server/lib/audit_events.ts
index 5231c9bab7c37..2ad012c6e6473 100644
--- a/x-pack/plugins/actions/server/lib/audit_events.ts
+++ b/x-pack/plugins/actions/server/lib/audit_events.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { EcsEventOutcome, EcsEventType } from 'src/core/server';
-import { AuditEvent } from '../../../security/server';
+import type { EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { AuditEvent } from '@kbn/security-plugin/server';
 
 export enum ConnectorAuditAction {
   CREATE = 'connector_create',
diff --git a/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts b/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts
index c6686e97a4c8b..5d556398dc668 100644
--- a/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts
+++ b/x-pack/plugins/actions/server/lib/create_action_event_log_record_object.ts
@@ -6,7 +6,7 @@
  */
 
 import { set } from 'lodash';
-import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
+import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import { RelatedSavedObjects } from './related_saved_objects';
 
 export type Event = Exclude<IEvent, undefined>;
diff --git a/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts b/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
index 48c9352566118..f4712f74d5e31 100644
--- a/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
+++ b/x-pack/plugins/actions/server/lib/custom_host_settings.test.ts
@@ -11,8 +11,8 @@ import { schema, ByteSizeValue } from '@kbn/config-schema';
 import moment from 'moment';
 
 import { ActionsConfig } from '../config';
-import { Logger } from '../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { resolveCustomHosts, getCanonicalCustomHostUrl } from './custom_host_settings';
 
diff --git a/x-pack/plugins/actions/server/lib/custom_host_settings.ts b/x-pack/plugins/actions/server/lib/custom_host_settings.ts
index 0ff8624d42cfe..47b68fc1dc815 100644
--- a/x-pack/plugins/actions/server/lib/custom_host_settings.ts
+++ b/x-pack/plugins/actions/server/lib/custom_host_settings.ts
@@ -7,7 +7,7 @@
 
 import { readFileSync } from 'fs';
 import { cloneDeep } from 'lodash';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ActionsConfig, CustomHostSettings } from '../config';
 
 type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
diff --git a/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts b/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts
index f101525b5eaa7..2bd3a6aa24576 100644
--- a/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts
+++ b/x-pack/plugins/actions/server/lib/ensure_sufficient_license.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/common/types';
 import { ActionType } from '../types';
-import { LICENSE_TYPE } from '../../../licensing/common/types';
 import { ServerLogActionTypeId, IndexActionTypeId } from '../builtin_action_types';
 import { ActionTypeConfig, ActionTypeSecrets, ActionTypeParams } from '../types';
 
diff --git a/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts b/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
index 6344a399012f0..792f22ae5e016 100644
--- a/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
+++ b/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type ActionTypeDisabledReason =
diff --git a/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts b/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
index eec099b211146..8b9ce4c0116c1 100644
--- a/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
+++ b/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type PreconfiguredActionDisabledFrom = 'update' | 'delete';
diff --git a/x-pack/plugins/actions/server/lib/errors/types.ts b/x-pack/plugins/actions/server/lib/errors/types.ts
index c8cd7d6d294f7..2b664da0941e8 100644
--- a/x-pack/plugins/actions/server/lib/errors/types.ts
+++ b/x-pack/plugins/actions/server/lib/errors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory, IKibanaResponse } from '../../../../../../src/core/server';
+import { KibanaResponseFactory, IKibanaResponse } from '@kbn/core/server';
 
 export interface ErrorThatHandlesItsOwnResponse extends Error {
   sendResponse(res: KibanaResponseFactory): IKibanaResponse;
diff --git a/x-pack/plugins/actions/server/lib/license_state.test.ts b/x-pack/plugins/actions/server/lib/license_state.test.ts
index d071bd919467c..de03113d4a1db 100644
--- a/x-pack/plugins/actions/server/lib/license_state.test.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.test.ts
@@ -8,8 +8,8 @@
 import { ActionType } from '../types';
 import { Subject } from 'rxjs';
 import { LicenseState, ILicenseState } from './license_state';
-import { licensingMock } from '../../../licensing/server/mocks';
-import { ILicense } from '../../../licensing/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 describe('checkLicense()', () => {
   const getRawLicense = jest.fn();
diff --git a/x-pack/plugins/actions/server/lib/license_state.ts b/x-pack/plugins/actions/server/lib/license_state.ts
index 04c87b270e933..c863e6a6b7b74 100644
--- a/x-pack/plugins/actions/server/lib/license_state.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.ts
@@ -9,11 +9,11 @@ import { i18n } from '@kbn/i18n';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Observable, Subscription } from 'rxjs';
 import { assertNever } from '@kbn/std';
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { PLUGIN } from '../constants/plugin';
 import { ActionType } from '../types';
 import { ActionTypeDisabledError } from './errors';
-import { LicensingPluginStart } from '../../../licensing/server';
 import { getActionTypeFeatureUsageName } from './get_action_type_feature_usage_name';
 
 export type ILicenseState = PublicMethodsOf<LicenseState>;
diff --git a/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts b/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts
index 8fd13d1375697..b9d87fe96e975 100644
--- a/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts
+++ b/x-pack/plugins/actions/server/lib/related_saved_objects.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { validatedRelatedSavedObjects } from './related_saved_objects';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { Logger } from '../../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 
 const loggerMock = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/actions/server/lib/related_saved_objects.ts b/x-pack/plugins/actions/server/lib/related_saved_objects.ts
index 160587a3a9a8b..a4b2f8a1dfdfb 100644
--- a/x-pack/plugins/actions/server/lib/related_saved_objects.ts
+++ b/x-pack/plugins/actions/server/lib/related_saved_objects.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export type RelatedSavedObjects = TypeOf<typeof RelatedSavedObjectsSchema>;
 
diff --git a/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts b/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts
index 826c4e44b2b85..94410c3272e0f 100644
--- a/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts
+++ b/x-pack/plugins/actions/server/lib/space_id_to_namespace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SpacesPluginStart } from '../../../spaces/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 export function spaceIdToNamespace(spaces?: SpacesPluginStart, spaceId?: string) {
   return spaces && spaceId ? spaces.spacesService.spaceIdToNamespace(spaceId) : undefined;
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
index 2793d82544955..7fd09f2237eac 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -8,13 +8,13 @@
 import sinon from 'sinon';
 import { ExecutorError } from './executor_error';
 import { ActionExecutor } from './action_executor';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerFactory } from './task_runner_factory';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { actionExecutorMock } from './action_executor.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { savedObjectsClientMock, loggingSystemMock, httpServiceMock } from 'src/core/server/mocks';
-import { eventLoggerMock } from '../../../event_log/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock, httpServiceMock } from '@kbn/core/server/mocks';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/mocks';
 import { ActionTypeDisabledError } from './errors';
 import { actionsClientMock } from '../mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
index 221c84664f47e..3c94c243b56a5 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
@@ -9,7 +9,7 @@ import { pick } from 'lodash';
 import type { Request } from '@hapi/hapi';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fromNullable, getOrElse } from 'fp-ts/lib/Option';
-import { addSpaceIdToPath } from '../../../spaces/server';
+import { addSpaceIdToPath } from '@kbn/spaces-plugin/server';
 import {
   Logger,
   SavedObjectsClientContract,
@@ -17,11 +17,11 @@ import {
   SavedObjectReference,
   IBasePath,
   SavedObject,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ActionExecutorContract } from './action_executor';
 import { ExecutorError } from './executor_error';
-import { RunContext } from '../../../task_manager/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
 import {
   ActionTaskParams,
   ActionTypeRegistryContract,
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts
index ffd8e7f17c11f..b9669fb63ae3f 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyRBACExemption } from './track_legacy_rbac_exemption';
 
 describe('trackLegacyRBACExemption', () => {
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts
index 73c859c4cd21e..1103754b85d46 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_rbac_exemption.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function trackLegacyRBACExemption(source: string, usageCounter?: UsageCounter) {
   if (usageCounter) {
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts
index f4a1ce07ab985..1c48cdd902111 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyRouteUsage } from './track_legacy_route_usage';
 
 describe('trackLegacyRouteUsage', () => {
diff --git a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts
index 528a75a0a18bd..2d33322630ef4 100644
--- a/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts
+++ b/x-pack/plugins/actions/server/lib/track_legacy_route_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function trackLegacyRouteUsage(route: string, usageCounter?: UsageCounter) {
   if (usageCounter) {
diff --git a/x-pack/plugins/actions/server/mocks.ts b/x-pack/plugins/actions/server/mocks.ts
index bdfdab5124e29..00cca942fe14b 100644
--- a/x-pack/plugins/actions/server/mocks.ts
+++ b/x-pack/plugins/actions/server/mocks.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { actionsClientMock } from './actions_client.mock';
-import { PluginSetupContract, PluginStartContract, renderActionParameterTemplates } from './plugin';
-import { Services } from './types';
 import {
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { actionsClientMock } from './actions_client.mock';
+import { PluginSetupContract, PluginStartContract, renderActionParameterTemplates } from './plugin';
+import { Services } from './types';
 import { actionsAuthorizationMock } from './authorization/actions_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
-import { Logger } from '../../../../src/core/server';
 export { actionsAuthorizationMock };
 export { actionsClientMock };
 const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
diff --git a/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts b/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts
index 8e888503451a5..705979f022dc4 100644
--- a/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts
+++ b/x-pack/plugins/actions/server/monitoring/in_memory_metrics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('inMemoryMetrics', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts
index 4949f0d443989..488e4b5d20e3a 100644
--- a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.test.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from 'src/core/public/mocks';
-import { CoreSetup } from '../../../../../src/core/server';
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { coreMock } from '@kbn/core/public/mocks';
+import { CoreSetup } from '@kbn/core/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerClusterCollector } from './register_cluster_collector';
 import { ActionsPluginsStart } from '../plugin';
 import { ClusterActionsMetric } from './types';
diff --git a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts
index b09b1d99db87e..895eb44bfceec 100644
--- a/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_cluster_collector.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import stats from 'stats-lite';
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import {
   IdleTaskWithExpiredRunAt,
   RunningOrClaimingTaskWithExpiredRetryAt,
-} from '../../../task_manager/server';
-import { CoreSetup } from '../../../../../src/core/server';
+} from '@kbn/task-manager-plugin/server';
+import { CoreSetup } from '@kbn/core/server';
 import { ActionsPluginsStart } from '../plugin';
 import { ClusterActionsMetric } from './types';
 
diff --git a/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts b/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts
index 8ec7a3620943a..19fce333ecc3a 100644
--- a/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_node_collector.test.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerNodeCollector } from './register_node_collector';
 import { NodeActionsMetric } from './types';
 import { IN_MEMORY_METRICS } from '.';
diff --git a/x-pack/plugins/actions/server/monitoring/register_node_collector.ts b/x-pack/plugins/actions/server/monitoring/register_node_collector.ts
index 7aab4f274e72a..f2e0473ed63a1 100644
--- a/x-pack/plugins/actions/server/monitoring/register_node_collector.ts
+++ b/x-pack/plugins/actions/server/monitoring/register_node_collector.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
 
 export function registerNodeCollector({
diff --git a/x-pack/plugins/actions/server/monitoring/types.ts b/x-pack/plugins/actions/server/monitoring/types.ts
index 39e6840ded7e3..6ce104118757e 100644
--- a/x-pack/plugins/actions/server/monitoring/types.ts
+++ b/x-pack/plugins/actions/server/monitoring/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MetricResult } from '../../../monitoring_collection/server';
+import { MetricResult } from '@kbn/monitoring-collection-plugin/server';
 
 export type ClusterActionsMetric = MetricResult<{
   overdue: {
diff --git a/x-pack/plugins/actions/server/plugin.test.ts b/x-pack/plugins/actions/server/plugin.test.ts
index 2d854df6a5853..d89a3c96b01b9 100644
--- a/x-pack/plugins/actions/server/plugin.test.ts
+++ b/x-pack/plugins/actions/server/plugin.test.ts
@@ -7,14 +7,14 @@
 
 import moment from 'moment';
 import { schema, ByteSizeValue } from '@kbn/config-schema';
-import { PluginInitializerContext, RequestHandlerContext } from '../../../../src/core/server';
-import { coreMock, httpServerMock } from '../../../../src/core/server/mocks';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
-import { eventLogMock } from '../../event_log/server/mocks';
+import { PluginInitializerContext, RequestHandlerContext } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { eventLogMock } from '@kbn/event-log-plugin/server/mocks';
 import { ActionType, ActionsApiRequestHandlerContext } from './types';
 import { ActionsConfig } from './config';
 import {
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
index 2262258c20ef2..9d4a720eeae6b 100644
--- a/x-pack/plugins/actions/server/plugin.ts
+++ b/x-pack/plugins/actions/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
   PluginInitializerContext,
   Plugin,
@@ -18,18 +18,23 @@ import {
   ElasticsearchServiceStart,
   SavedObjectsClientContract,
   SavedObjectsBulkGetObject,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 
 import {
   EncryptedSavedObjectsClient,
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../encrypted_saved_objects/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
-import { SpacesPluginStart, SpacesPluginSetup } from '../../spaces/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { SecurityPluginSetup } from '../../security/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { SpacesPluginStart, SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { IEventLogger, IEventLogService } from '@kbn/event-log-plugin/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import {
   ensureCleanupFailedExecutionsTaskScheduled,
   registerCleanupFailedExecutionsTaskDefinition,
@@ -65,7 +70,6 @@ import {
 import { getActionsConfigurationUtilities } from './actions_config';
 
 import { defineRoutes } from './routes';
-import { IEventLogger, IEventLogService } from '../../event_log/server';
 import { initializeActionsTelemetry, scheduleActionsTelemetry } from './usage/task';
 import {
   ACTION_SAVED_OBJECT_TYPE,
@@ -89,7 +93,6 @@ import { ACTIONS_FEATURE_ID, AlertHistoryEsIndexConnectorId } from '../common';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER } from './constants/event_log';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
 import { InMemoryMetrics, registerClusterCollector, registerNodeCollector } from './monitoring';
-import { MonitoringCollectionSetup } from '../../monitoring_collection/server';
 
 export interface PluginSetupContract {
   registerType<
diff --git a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts
index 4a7c5908963f6..5c2d7fc370fa3 100644
--- a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts
+++ b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   createAlertHistoryIndexTemplate,
   getAlertHistoryIndexTemplate,
diff --git a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
index 0a1c5037e7f8a..670e3f2953a4e 100644
--- a/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
+++ b/x-pack/plugins/actions/server/preconfigured_connectors/alert_history_es_index/create_alert_history_index_template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ALERT_HISTORY_PREFIX } from '../../../common';
 import mappings from './mappings.json';
 
diff --git a/x-pack/plugins/actions/server/routes/connector_types.test.ts b/x-pack/plugins/actions/server/routes/connector_types.test.ts
index ebbdc703556d5..298c985e4eec9 100644
--- a/x-pack/plugins/actions/server/routes/connector_types.test.ts
+++ b/x-pack/plugins/actions/server/routes/connector_types.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { connectorTypesRoute } from './connector_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
-import { LicenseType } from '../../../../plugins/licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 import { actionsClientMock } from '../mocks';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/connector_types.ts b/x-pack/plugins/actions/server/routes/connector_types.ts
index 9f9ad5b2aea68..aaafc482f0590 100644
--- a/x-pack/plugins/actions/server/routes/connector_types.ts
+++ b/x-pack/plugins/actions/server/routes/connector_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { ActionType, BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionsRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/actions/server/routes/create.test.ts b/x-pack/plugins/actions/server/routes/create.test.ts
index 51a55309b52ae..5089b7f96286f 100644
--- a/x-pack/plugins/actions/server/routes/create.test.ts
+++ b/x-pack/plugins/actions/server/routes/create.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { createActionRoute } from './create';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 import { omit } from 'lodash';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
index 0c243b6a4eaa9..f0aaeb8257c82 100644
--- a/x-pack/plugins/actions/server/routes/create.ts
+++ b/x-pack/plugins/actions/server/routes/create.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteRequestCase, RewriteResponseCase } from '../../common';
diff --git a/x-pack/plugins/actions/server/routes/delete.test.ts b/x-pack/plugins/actions/server/routes/delete.test.ts
index 438f366e5cb73..160092eb8c101 100644
--- a/x-pack/plugins/actions/server/routes/delete.test.ts
+++ b/x-pack/plugins/actions/server/routes/delete.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { deleteActionRoute } from './delete';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../mocks';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/delete.ts b/x-pack/plugins/actions/server/routes/delete.ts
index 653ce32e69eb0..a68b82da1145b 100644
--- a/x-pack/plugins/actions/server/routes/delete.ts
+++ b/x-pack/plugins/actions/server/routes/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH } from '../../common';
 import { ActionsRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/actions/server/routes/execute.test.ts b/x-pack/plugins/actions/server/routes/execute.test.ts
index 322c9aeb15600..6bcab72fbc869 100644
--- a/x-pack/plugins/actions/server/routes/execute.test.ts
+++ b/x-pack/plugins/actions/server/routes/execute.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { executeActionRoute } from './execute';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { asHttpRequestExecutionSource } from '../lib';
@@ -14,7 +14,7 @@ import { actionsClientMock } from '../actions_client.mock';
 import { ActionTypeExecutorResult } from '../types';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/execute.ts b/x-pack/plugins/actions/server/routes/execute.ts
index 7e8110365e87a..41324d670f7bd 100644
--- a/x-pack/plugins/actions/server/routes/execute.ts
+++ b/x-pack/plugins/actions/server/routes/execute.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 
 import { ActionTypeExecutorResult, ActionsRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/actions/server/routes/get.test.ts b/x-pack/plugins/actions/server/routes/get.test.ts
index 1107ec243bc01..bf51ccaa4b0e5 100644
--- a/x-pack/plugins/actions/server/routes/get.test.ts
+++ b/x-pack/plugins/actions/server/routes/get.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { getActionRoute } from './get';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/server/routes/get.ts
index 3f4a67c3bfbcd..64463c49c57be 100644
--- a/x-pack/plugins/actions/server/routes/get.ts
+++ b/x-pack/plugins/actions/server/routes/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/actions/server/routes/get_all.test.ts b/x-pack/plugins/actions/server/routes/get_all.test.ts
index 69684457f3dd8..ea65a3bdf4dd1 100644
--- a/x-pack/plugins/actions/server/routes/get_all.test.ts
+++ b/x-pack/plugins/actions/server/routes/get_all.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { getAllActionRoute } from './get_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/get_all.ts b/x-pack/plugins/actions/server/routes/get_all.ts
index 2d3a2727e9663..ebb357280f85e 100644
--- a/x-pack/plugins/actions/server/routes/get_all.ts
+++ b/x-pack/plugins/actions/server/routes/get_all.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionsRequestHandlerContext, FindActionResult } from '../types';
diff --git a/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts b/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
index bbcedf18142ef..26048c25ce157 100644
--- a/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
+++ b/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { getWellKnownEmailServiceRoute } from './get_well_known_email_service';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts b/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
index c2b7e23ce0c79..9a74bd7afc90e 100644
--- a/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
+++ b/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import nodemailerGetService from 'nodemailer/lib/well-known';
 import SMTPConnection from 'nodemailer/lib/smtp-connection';
 import { ILicenseState } from '../lib';
diff --git a/x-pack/plugins/actions/server/routes/index.ts b/x-pack/plugins/actions/server/routes/index.ts
index a6470d366c039..48d87e9d62c58 100644
--- a/x-pack/plugins/actions/server/routes/index.ts
+++ b/x-pack/plugins/actions/server/routes/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../lib';
 import { ActionsRequestHandlerContext } from '../types';
 import { createActionRoute } from './create';
diff --git a/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts b/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts
index c5d0776d6c58b..d31a2bbf9f8d5 100644
--- a/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/_mock_handler_arguments.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'kibana/server';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { identity } from 'lodash';
 import type { MethodKeysOf } from '@kbn/utility-types';
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { ActionType } from '../../../common';
 import { ActionsClientMock, actionsClientMock } from '../../actions_client.mock';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/create.test.ts b/x-pack/plugins/actions/server/routes/legacy/create.test.ts
index 9e4ab8272dd6d..a79720c8f21e4 100644
--- a/x-pack/plugins/actions/server/routes/legacy/create.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/create.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { createActionRoute } from './create';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { verifyAccessAndContext } from '../verify_access_and_context';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../verify_access_and_context.ts', () => ({
+jest.mock('../verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/create.ts b/x-pack/plugins/actions/server/routes/legacy/create.ts
index 9713c01905b7f..89b9f19d82633 100644
--- a/x-pack/plugins/actions/server/routes/legacy/create.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/create.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ActionsRequestHandlerContext } from '../../types';
 import { ILicenseState } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
diff --git a/x-pack/plugins/actions/server/routes/legacy/delete.test.ts b/x-pack/plugins/actions/server/routes/legacy/delete.test.ts
index 7284d18919716..e16614a57fd04 100644
--- a/x-pack/plugins/actions/server/routes/legacy/delete.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/delete.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { deleteActionRoute } from './delete';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../mocks';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/delete.ts b/x-pack/plugins/actions/server/routes/legacy/delete.ts
index 656ece6f1c6f5..59392c6592631 100644
--- a/x-pack/plugins/actions/server/routes/legacy/delete.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/delete.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/execute.test.ts b/x-pack/plugins/actions/server/routes/legacy/execute.test.ts
index 6372d893842d7..1f9e7bb7566da 100644
--- a/x-pack/plugins/actions/server/routes/legacy/execute.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/execute.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { executeActionRoute } from './execute';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { verifyApiAccess, ActionTypeDisabledError, asHttpRequestExecutionSource } from '../../lib';
 import { actionsClientMock } from '../../actions_client.mock';
 import { ActionTypeExecutorResult } from '../../types';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/execute.ts b/x-pack/plugins/actions/server/routes/legacy/execute.ts
index 33174861122d4..0616235cd52cb 100644
--- a/x-pack/plugins/actions/server/routes/legacy/execute.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/execute.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../../lib';
 
 import { ActionTypeExecutorResult, ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/get.test.ts b/x-pack/plugins/actions/server/routes/legacy/get.test.ts
index 91b8e53b64e7d..df3c3822ab08c 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getActionRoute } from './get';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/get.ts b/x-pack/plugins/actions/server/routes/legacy/get.ts
index bd8c1096979e2..7612858c9fc8b 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts b/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts
index b4c6792f415ea..f7cdb56082a10 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get_all.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getAllActionRoute } from './get_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/get_all.ts b/x-pack/plugins/actions/server/routes/legacy/get_all.ts
index 6c91c2466d70d..f968f4de85946 100644
--- a/x-pack/plugins/actions/server/routes/legacy/get_all.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/get_all.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState, verifyApiAccess } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/index.ts b/x-pack/plugins/actions/server/routes/legacy/index.ts
index a974237f0a95d..37ed5efbd99b9 100644
--- a/x-pack/plugins/actions/server/routes/legacy/index.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../../lib';
 import { ActionsRequestHandlerContext } from '../../types';
 import { createActionRoute } from './create';
diff --git a/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts b/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts
index a6536d42f7e8a..3737d507a7bae 100644
--- a/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/list_action_types.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { listActionTypesRoute } from './list_action_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { LicenseType } from '../../../../../plugins/licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 import { actionsClientMock } from '../../mocks';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts b/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts
index 5ce25826ca5cc..1c600b68b4e0e 100644
--- a/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/list_action_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState, verifyApiAccess } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/legacy/update.test.ts b/x-pack/plugins/actions/server/routes/legacy/update.test.ts
index d813b765150c6..d9c956d3fd35c 100644
--- a/x-pack/plugins/actions/server/routes/legacy/update.test.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/update.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { updateActionRoute } from './update';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess, ActionTypeDisabledError } from '../../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { actionsClientMock } from '../../actions_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
-jest.mock('../../lib/verify_api_access.ts', () => ({
+jest.mock('../../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/legacy/update.ts b/x-pack/plugins/actions/server/routes/legacy/update.ts
index 7ddce9bc799c5..28edcfd336898 100644
--- a/x-pack/plugins/actions/server/routes/legacy/update.ts
+++ b/x-pack/plugins/actions/server/routes/legacy/update.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { IRouter } from 'kibana/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../../lib';
 import { BASE_ACTION_API_PATH } from '../../../common';
 import { ActionsRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/actions/server/routes/update.test.ts b/x-pack/plugins/actions/server/routes/update.test.ts
index 653fcba75da95..2856ea6014fd8 100644
--- a/x-pack/plugins/actions/server/routes/update.test.ts
+++ b/x-pack/plugins/actions/server/routes/update.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { updateActionRoute } from './update';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('./verify_access_and_context.ts', () => ({
+jest.mock('./verify_access_and_context', () => ({
   verifyAccessAndContext: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/update.ts b/x-pack/plugins/actions/server/routes/update.ts
index 276ce80751726..3f1ceb0a0096f 100644
--- a/x-pack/plugins/actions/server/routes/update.ts
+++ b/x-pack/plugins/actions/server/routes/update.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts b/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts
index f13bc7279e346..4b07216172473 100644
--- a/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts
+++ b/x-pack/plugins/actions/server/routes/verify_access_and_context.test.ts
@@ -11,7 +11,7 @@ import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
 import { actionsClientMock } from '../actions_client.mock';
 import { verifyAccessAndContext } from './verify_access_and_context';
 
-jest.mock('../lib/verify_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/actions/server/routes/verify_access_and_context.ts b/x-pack/plugins/actions/server/routes/verify_access_and_context.ts
index 3f1fe4b1c229f..304a5bae6765d 100644
--- a/x-pack/plugins/actions/server/routes/verify_access_and_context.ts
+++ b/x-pack/plugins/actions/server/routes/verify_access_and_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { ILicenseState, isErrorThatHandlesItsOwnResponse, verifyApiAccess } from '../lib';
 import { ActionsRequestHandlerContext } from '../types';
 
diff --git a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts
index 6d7fd940612f3..399efe023c3fd 100644
--- a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.test.ts
@@ -11,9 +11,9 @@ import {
   isPreconfiguredAction,
 } from './action_task_params_migrations';
 import { ActionTaskParams } from '../types';
-import { SavedObjectReference, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
 const context = migrationMocks.createContext();
 const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
diff --git a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts
index ceb82146a03eb..b0778d680e70e 100644
--- a/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts
+++ b/x-pack/plugins/actions/server/saved_objects/action_task_params_migrations.ts
@@ -12,10 +12,10 @@ import {
   SavedObjectMigrationFn,
   SavedObjectMigrationContext,
   SavedObjectReference,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import type { IsMigrationNeededPredicate } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ActionTaskParams, PreConfiguredAction } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
-import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
 import { RelatedSavedObjects } from '../lib/related_saved_objects';
 
 interface ActionTaskParamsLogMeta extends LogMeta {
diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
index 6c61d9849c72c..d350e40c1b362 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
@@ -8,9 +8,9 @@
 import uuid from 'uuid';
 import { getActionsMigrations } from './actions_migrations';
 import { RawAction } from '../types';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
 const context = migrationMocks.createContext();
 const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
index 2e5b1b5d916fe..4c113a09b81b5 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
@@ -11,10 +11,10 @@ import {
   SavedObjectUnsanitizedDoc,
   SavedObjectMigrationFn,
   SavedObjectMigrationContext,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import type { IsMigrationNeededPredicate } from '@kbn/encrypted-saved-objects-plugin/server';
 import { RawAction } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
-import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
 
 interface ActionsLogMeta extends LogMeta {
   migrations: { actionDocument: SavedObjectUnsanitizedDoc<RawAction> };
diff --git a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts
index f52cd14382658..58aff2bbe0c9d 100644
--- a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { RawAction } from '../types';
 import { getImportWarnings } from './get_import_warnings';
 
diff --git a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts
index 941d6d0fd6aaa..2c8eef94f9a4d 100644
--- a/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts
+++ b/x-pack/plugins/actions/server/saved_objects/get_import_warnings.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectsImportWarning } from 'kibana/server';
+import { SavedObject, SavedObjectsImportWarning } from '@kbn/core/server';
 import { RawAction } from '../types';
 
 export function getImportWarnings(
diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts
index e0d60cd14834e..27850b6945a21 100644
--- a/x-pack/plugins/actions/server/saved_objects/index.ts
+++ b/x-pack/plugins/actions/server/saved_objects/index.ts
@@ -10,8 +10,9 @@ import type {
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
   SavedObjectsTypeMappingDefinition,
-} from 'kibana/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import { getOldestIdleActionTask } from '@kbn/task-manager-plugin/server';
 import mappings from './mappings.json';
 import { getActionsMigrations } from './actions_migrations';
 import { getActionTaskParamsMigrations } from './action_task_params_migrations';
@@ -24,7 +25,6 @@ import {
   ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
   CONNECTOR_TOKEN_SAVED_OBJECT_TYPE,
 } from '../constants/saved_objects';
-import { getOldestIdleActionTask } from '../../../task_manager/server';
 
 export function setupSavedObjects(
   savedObjects: SavedObjectsServiceSetup,
diff --git a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts
index 82c1c55cd8020..50ddd0a429649 100644
--- a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.test.ts
@@ -7,11 +7,11 @@
 
 import { transformConnectorsForExport } from './transform_connectors_for_export';
 import { ActionTypeRegistry, ActionTypeRegistryOpts } from '../action_type_registry';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { actionsConfigMock } from '../actions_config.mock';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ActionExecutor, TaskRunnerFactory } from '../lib';
 import { registerBuiltInActionTypes } from '../builtin_action_types';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
diff --git a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts
index 050fa20b7fdab..250346f33d4af 100644
--- a/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts
+++ b/x-pack/plugins/actions/server/saved_objects/transform_connectors_for_export.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { ActionTypeRegistry } from '../action_type_registry';
 import { validateSecrets } from '../lib';
 import { RawAction, ActionType } from '../types';
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index ec9a194da5f42..b13df8dfe2460 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -6,10 +6,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { ActionTypeRegistry } from './action_type_registry';
-import { PluginSetupContract, PluginStartContract } from './plugin';
-import { ActionsClient } from './actions_client';
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import {
   KibanaRequest,
   SavedObjectsClientContract,
@@ -17,7 +14,10 @@ import {
   ElasticsearchClient,
   RequestHandlerContext,
   SavedObjectReference,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { ActionTypeRegistry } from './action_type_registry';
+import { PluginSetupContract, PluginStartContract } from './plugin';
+import { ActionsClient } from './actions_client';
 import { ActionTypeExecutorResult } from '../common';
 import { TaskInfo } from './lib/action_executor';
 import { ConnectorTokenClient } from './builtin_action_types/lib/connector_token_client';
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
index c389529aa7e82..1d947c8fedfe3 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getExecutionsPerDayCount, getInUseTotalCount, getTotalCount } from './actions_telemetry';
 
 describe('actions telemetry', () => {
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
index 473c440ed37fb..ce3e69139d6e3 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertHistoryEsIndexConnectorId } from '../../common';
 import { ActionResult, PreConfiguredAction } from '../types';
 
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts
index 6288b022e4736..7efc54a5f99d3 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { registerActionsUsageCollector } from './actions_usage_collector';
 import { configSchema, ActionsConfig } from '../config';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 
 const mockTaskManagerStart = taskManagerMock.createStart();
 
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index 3e690d18063d6..1a6b22b0b0ce6 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { get } from 'lodash';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import { ActionsUsage, byServiceProviderTypeSchema, byTypeSchema } from './types';
 import { ActionsConfig } from '../config';
 
diff --git a/x-pack/plugins/actions/server/usage/task.ts b/x-pack/plugins/actions/server/usage/task.ts
index ccc7fa54983cf..5591a817bd598 100644
--- a/x-pack/plugins/actions/server/usage/task.ts
+++ b/x-pack/plugins/actions/server/usage/task.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Logger, CoreSetup } from 'kibana/server';
+import { Logger, CoreSetup } from '@kbn/core/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { PreConfiguredAction } from '../types';
 import { getTotalCount, getInUseTotalCount, getExecutionsPerDayCount } from './actions_telemetry';
 
diff --git a/x-pack/plugins/actions/server/usage/types.ts b/x-pack/plugins/actions/server/usage/types.ts
index 2d041b1ba0d0e..4d9f9c6ef17ff 100644
--- a/x-pack/plugins/actions/server/usage/types.ts
+++ b/x-pack/plugins/actions/server/usage/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface ActionsUsage {
   alert_history_connector_enabled: boolean;
diff --git a/x-pack/plugins/alerting/common/rule.ts b/x-pack/plugins/alerting/common/rule.ts
index 9b6b93cc3af17..14566464fcb1e 100644
--- a/x-pack/plugins/alerting/common/rule.ts
+++ b/x-pack/plugins/alerting/common/rule.ts
@@ -10,7 +10,7 @@ import {
   SavedObjectAttributes,
   SavedObjectsResolveResponse,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { RuleExecutionMetrics } from '.';
 import { RuleNotifyWhenType } from './rule_notify_when_type';
 
diff --git a/x-pack/plugins/alerting/common/rule_type.ts b/x-pack/plugins/alerting/common/rule_type.ts
index e98a641ba91fd..cce1e6f5e9542 100644
--- a/x-pack/plugins/alerting/common/rule_type.ts
+++ b/x-pack/plugins/alerting/common/rule_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { RecoveredActionGroupId, DefaultActionGroupId } from './builtin_action_groups';
 
 interface ConsumerPrivileges {
diff --git a/x-pack/plugins/alerting/public/alert_api.test.ts b/x-pack/plugins/alerting/public/alert_api.test.ts
index eae4bc72a02e8..2f09643e499e3 100644
--- a/x-pack/plugins/alerting/public/alert_api.test.ts
+++ b/x-pack/plugins/alerting/public/alert_api.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Rule, RuleType } from '../common';
-import { httpServiceMock } from '../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRule, loadRuleType, loadRuleTypes } from './alert_api';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/alerting/public/alert_api.ts b/x-pack/plugins/alerting/public/alert_api.ts
index 93ea8c79bdd34..79d59f9aab54b 100644
--- a/x-pack/plugins/alerting/public/alert_api.ts
+++ b/x-pack/plugins/alerting/public/alert_api.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { BASE_ALERTING_API_PATH, INTERNAL_BASE_ALERTING_API_PATH } from '../common';
 import type { Rule, RuleType } from '../common';
-import { AsApiContract } from '../../actions/common';
 import { transformRule, transformRuleType, ApiRule } from './lib/common_transformations';
 
 export async function loadRuleTypes({ http }: { http: HttpSetup }): Promise<RuleType[]> {
diff --git a/x-pack/plugins/alerting/public/lib/common_transformations.ts b/x-pack/plugins/alerting/public/lib/common_transformations.ts
index 8f1f0c5c72d84..1b306aae0ae2f 100644
--- a/x-pack/plugins/alerting/public/lib/common_transformations.ts
+++ b/x-pack/plugins/alerting/public/lib/common_transformations.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { RuleExecutionStatus, Rule, RuleAction, RuleType } from '../../common';
-import { AsApiContract } from '../../../actions/common';
 
 function transformAction(input: AsApiContract<RuleAction>): RuleAction {
   const { connector_type_id: actionTypeId, ...rest } = input;
diff --git a/x-pack/plugins/alerting/public/plugin.ts b/x-pack/plugins/alerting/public/plugin.ts
index e1d683d74cc9f..57ab4172b4689 100644
--- a/x-pack/plugins/alerting/public/plugin.ts
+++ b/x-pack/plugins/alerting/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, CoreStart } from 'src/core/public';
+import { CoreSetup, Plugin, CoreStart } from '@kbn/core/public';
 
 import { AlertNavigationRegistry, AlertNavigationHandler } from './alert_navigation_registry';
 import { loadRule, loadRuleType } from './alert_api';
diff --git a/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts b/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts
index 254da05c0dd53..f8d61e64c9eaf 100644
--- a/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts
+++ b/x-pack/plugins/alerting/server/alert/create_alert_factory.test.ts
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Alert } from './alert';
 import { createAlertFactory } from './create_alert_factory';
 import { getRecoveredAlerts } from '../lib';
diff --git a/x-pack/plugins/alerting/server/alert/create_alert_factory.ts b/x-pack/plugins/alerting/server/alert/create_alert_factory.ts
index ad83b0a416c72..9528273fb28db 100644
--- a/x-pack/plugins/alerting/server/alert/create_alert_factory.ts
+++ b/x-pack/plugins/alerting/server/alert/create_alert_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { AlertInstanceContext, AlertInstanceState } from '../types';
 import { Alert } from './alert';
 import { getRecoveredAlerts } from '../lib';
diff --git a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts
index 4ff92109ab224..0e382c651dc5f 100644
--- a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts
+++ b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.test.ts
@@ -7,14 +7,14 @@
 
 import { Request } from '@hapi/hapi';
 import { ruleTypeRegistryMock } from './rule_type_registry.mock';
-import { KibanaRequest } from '../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
-import { securityMock } from '../../security/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import {
   AlertingAuthorizationClientFactory,
   AlertingAuthorizationClientFactoryOpts,
 } from './alerting_authorization_client_factory';
-import { featuresPluginMock } from '../../features/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 
 jest.mock('./authorization/alerting_authorization');
 
diff --git a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts
index 0888f2e7a09f2..3a8a0a072cc16 100644
--- a/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts
+++ b/x-pack/plugins/alerting/server/alerting_authorization_client_factory.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
-import { RuleTypeRegistry } from './types';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../features/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { Space } from '@kbn/spaces-plugin/server';
 import { AlertingAuthorization } from './authorization/alerting_authorization';
-import { Space } from '../../spaces/server';
+import { RuleTypeRegistry } from './types';
 
 export interface AlertingAuthorizationClientFactoryOpts {
   ruleTypeRegistry: RuleTypeRegistry;
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
index 5497394c8db4b..1b102fa1a8f39 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { fromKueryExpression } from '@kbn/es-query';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { securityMock } from '../../../../plugins/security/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import {
   PluginStartContract as FeaturesStartContract,
   KibanaFeature,
-} from '../../../features/server';
-import { featuresPluginMock } from '../../../features/server/mocks';
+} from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import {
   AlertingAuthorization,
   WriteOperations,
diff --git a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
index f7b154777baa4..b9acfed7dcc65 100644
--- a/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
+++ b/x-pack/plugins/alerting/server/authorization/alerting_authorization.ts
@@ -7,14 +7,14 @@
 
 import Boom from '@hapi/boom';
 import { map, mapValues, fromPairs, has } from 'lodash';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { KueryNode } from '@kbn/es-query';
-import { ALERTS_FEATURE_ID, RuleTypeRegistry } from '../types';
-import { SecurityPluginSetup } from '../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { Space } from '@kbn/spaces-plugin/server';
 import { RegistryRuleType } from '../rule_type_registry';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
-import { Space } from '../../../spaces/server';
+import { ALERTS_FEATURE_ID, RuleTypeRegistry } from '../types';
 import {
   asFiltersByRuleTypeAndConsumer,
   asFiltersBySpaceId,
diff --git a/x-pack/plugins/alerting/server/config.test.ts b/x-pack/plugins/alerting/server/config.test.ts
index b08145219c24b..f3298fe16a694 100644
--- a/x-pack/plugins/alerting/server/config.test.ts
+++ b/x-pack/plugins/alerting/server/config.test.ts
@@ -22,15 +22,15 @@ describe('config validation', () => {
         },
         "maxEphemeralActionsPerAlert": 10,
         "rules": Object {
-          "execution": Object {
-            "actions": Object {
-              "max": 100000,
-            },
-          },
           "minimumScheduleInterval": Object {
             "enforce": false,
             "value": "1m",
           },
+          "run": Object {
+            "actions": Object {
+              "max": 100000,
+            },
+          },
         },
       }
     `);
diff --git a/x-pack/plugins/alerting/server/config.ts b/x-pack/plugins/alerting/server/config.ts
index c727c137aa9a2..8819a6c1e6211 100644
--- a/x-pack/plugins/alerting/server/config.ts
+++ b/x-pack/plugins/alerting/server/config.ts
@@ -21,7 +21,7 @@ const rulesSchema = schema.object({
     }),
     enforce: schema.boolean({ defaultValue: false }), // if enforce is false, only warnings will be shown
   }),
-  execution: schema.object({
+  run: schema.object({
     timeout: schema.maybe(schema.string({ validate: validateDurationSchema })),
     actions: schema.object({
       max: schema.number({ defaultValue: 100000 }),
diff --git a/x-pack/plugins/alerting/server/constants/plugin.ts b/x-pack/plugins/alerting/server/constants/plugin.ts
index 4c5cc39c1512e..05fd33ebf8dd3 100644
--- a/x-pack/plugins/alerting/server/constants/plugin.ts
+++ b/x-pack/plugins/alerting/server/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 
 export const PLUGIN = {
   ID: 'alerting',
diff --git a/x-pack/plugins/alerting/server/health/get_health.test.ts b/x-pack/plugins/alerting/server/health/get_health.test.ts
index 19d528d44e54f..3715113c84232 100644
--- a/x-pack/plugins/alerting/server/health/get_health.test.ts
+++ b/x-pack/plugins/alerting/server/health/get_health.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  savedObjectsServiceMock,
-} from '../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import { RuleExecutionStatusErrorReasons, HealthStatus } from '../types';
 import { getAlertingHealthStatus, getHealth } from './get_health';
 
diff --git a/x-pack/plugins/alerting/server/health/get_health.ts b/x-pack/plugins/alerting/server/health/get_health.ts
index 2bf554894917d..b101d0187e7e8 100644
--- a/x-pack/plugins/alerting/server/health/get_health.ts
+++ b/x-pack/plugins/alerting/server/health/get_health.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISavedObjectsRepository, SavedObjectsServiceStart } from 'src/core/server';
+import { ISavedObjectsRepository, SavedObjectsServiceStart } from '@kbn/core/server';
 import { AlertsHealth, HealthStatus, RawRule, RuleExecutionStatusErrorReasons } from '../types';
 
 export const getHealth = async (
diff --git a/x-pack/plugins/alerting/server/health/task.ts b/x-pack/plugins/alerting/server/health/task.ts
index 889dafdfa02a1..0c3be1e623a2d 100644
--- a/x-pack/plugins/alerting/server/health/task.ts
+++ b/x-pack/plugins/alerting/server/health/task.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreStart, Logger } from 'kibana/server';
+import { CoreStart, Logger } from '@kbn/core/server';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { AlertingConfig } from '../config';
 import { AlertingPluginsStart } from '../plugin';
 import { HealthStatus } from '../types';
diff --git a/x-pack/plugins/alerting/server/index.ts b/x-pack/plugins/alerting/server/index.ts
index f73fb7f964b25..1ff36f483a211 100644
--- a/x-pack/plugins/alerting/server/index.ts
+++ b/x-pack/plugins/alerting/server/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { RulesClient as RulesClientClass } from './rules_client';
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
 import { AlertingPlugin } from './plugin';
 import { configSchema } from './config';
 import { AlertsConfigType } from './types';
@@ -60,12 +60,8 @@ export const config: PluginConfigDescriptor<AlertsConfigType> = {
       'xpack.alerting.invalidateApiKeysTask.removalDelay',
       { level: 'warning' }
     ),
-    renameFromRoot(
-      'xpack.alerting.defaultRuleTaskTimeout',
-      'xpack.alerting.rules.execution.timeout',
-      {
-        level: 'warning',
-      }
-    ),
+    renameFromRoot('xpack.alerting.defaultRuleTaskTimeout', 'xpack.alerting.rules.run.timeout', {
+      level: 'warning',
+    }),
   ],
 };
diff --git a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts
index 61d9ccfef1e62..85ab0b579e762 100644
--- a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts
+++ b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { markApiKeyForInvalidation } from './mark_api_key_for_invalidation';
 
 describe('markApiKeyForInvalidation', () => {
diff --git a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts
index 72bcc6bcb4556..16bc2cf101102 100644
--- a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts
+++ b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/mark_api_key_for_invalidation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectsClientContract } from 'src/core/server';
+import { Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 export const markApiKeyForInvalidation = async (
   { apiKey }: { apiKey: string | null },
diff --git a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts
index 8b3c6716b1cd3..29161b8336f5e 100644
--- a/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts
+++ b/x-pack/plugins/alerting/server/invalidate_pending_api_keys/task.ts
@@ -11,14 +11,14 @@ import {
   SavedObjectsFindResponse,
   KibanaRequest,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { InvalidateAPIKeysParams, SecurityPluginStart } from '../../../security/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { InvalidateAPIKeysParams, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { InvalidateAPIKeyResult } from '../rules_client';
 import { AlertingConfig } from '../config';
 import { timePeriodBeforeDate } from '../lib/get_cadence';
diff --git a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts
index b0a46807af5c1..70ec1524fec16 100644
--- a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts
+++ b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.test.ts
@@ -7,7 +7,7 @@
 
 import { random, mean } from 'lodash';
 import { SanitizedRule, AlertSummary } from '../types';
-import { IValidatedEvent } from '../../../event_log/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 import { alertSummaryFromEventLog } from './alert_summary_from_event_log';
 
diff --git a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts
index e42a135b3de04..ff9bc776cfb95 100644
--- a/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts
+++ b/x-pack/plugins/alerting/server/lib/alert_summary_from_event_log.ts
@@ -6,8 +6,8 @@
  */
 
 import { mean } from 'lodash';
+import { IEvent } from '@kbn/event-log-plugin/server';
 import { SanitizedRule, AlertSummary, AlertStatus } from '../types';
-import { IEvent } from '../../../event_log/server';
 import { EVENT_LOG_ACTIONS, EVENT_LOG_PROVIDER, LEGACY_EVENT_LOG_ACTIONS } from '../plugin';
 
 const Millis2Nanos = 1000 * 1000;
diff --git a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
index 9c16c3af555c2..51b43793efd45 100644
--- a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
+++ b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { IEvent } from '@kbn/event-log-plugin/server';
 import { AlertInstanceState } from '../types';
-import { IEvent } from '../../../event_log/server';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 
 export type Event = Exclude<IEvent, undefined>;
diff --git a/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts b/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts
index d7c1325b8464d..c95fbb2e0b34c 100644
--- a/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts
+++ b/x-pack/plugins/alerting/server/lib/errors/rule_muted.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export class RuleMutedError extends Error implements ErrorThatHandlesItsOwnResponse {
diff --git a/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts b/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts
index f907436ddf955..387f48fdaefcb 100644
--- a/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts
+++ b/x-pack/plugins/alerting/server/lib/errors/rule_type_disabled.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type RuleTypeDisabledReason =
diff --git a/x-pack/plugins/alerting/server/lib/errors/types.ts b/x-pack/plugins/alerting/server/lib/errors/types.ts
index 1b83526610270..78b114d71c511 100644
--- a/x-pack/plugins/alerting/server/lib/errors/types.ts
+++ b/x-pack/plugins/alerting/server/lib/errors/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaResponseFactory, IKibanaResponse } from '../../../../../../src/core/server';
+import { KibanaResponseFactory, IKibanaResponse } from '@kbn/core/server';
 
 export interface ErrorThatHandlesItsOwnResponse extends Error {
   sendResponse(res: KibanaResponseFactory): IKibanaResponse;
diff --git a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts
index 70cfe4294020f..4665194b7a4cc 100644
--- a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts
+++ b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { formatExecutionErrorsResult } from './format_execution_log_errors';
-import { QueryEventsBySavedObjectResult } from '../../../event_log/server';
+import { QueryEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 
 describe('formatExecutionErrorsResult', () => {
   test('should return empty results if data is undefined', () => {
diff --git a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts
index ef5b931310f6a..34970350b1461 100644
--- a/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts
+++ b/x-pack/plugins/alerting/server/lib/format_execution_log_errors.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { QueryEventsBySavedObjectResult, IValidatedEvent } from '../../../event_log/server';
+import { QueryEventsBySavedObjectResult, IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { IExecutionErrors, IExecutionErrorsResult } from '../../common';
 
 const EXECUTION_UUID_FIELD = 'kibana.alert.rule.execution.uuid';
diff --git a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts
index fbe72508dab2b..851b96bf0299f 100644
--- a/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts
+++ b/x-pack/plugins/alerting/server/lib/get_execution_log_aggregation.ts
@@ -8,8 +8,8 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import Boom from '@hapi/boom';
 import { flatMap, get } from 'lodash';
+import { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 import { parseDuration } from '.';
-import { AggregateEventsBySavedObjectResult } from '../../../event_log/server';
 import { IExecutionLog, IExecutionLogResult } from '../../common';
 
 const DEFAULT_MAX_BUCKETS_LIMIT = 1000; // do not retrieve more than this number of executions
diff --git a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts
index 6a41d5068682d..9336c380c1742 100644
--- a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.test.ts
@@ -14,7 +14,7 @@ const config = {
     value: '2m',
     enforce: false,
   },
-  execution: {
+  run: {
     timeout: '1m',
     actions: { max: 1000 },
   },
@@ -22,8 +22,8 @@ const config = {
 
 const configWithRuleType = {
   ...config,
-  execution: {
-    ...config.execution,
+  run: {
+    ...config.run,
     ruleTypeOverrides: [
       {
         id: ruleTypeId,
@@ -35,7 +35,7 @@ const configWithRuleType = {
 
 const configWithoutTimeout = {
   ...config,
-  execution: {
+  run: {
     actions: { max: 1000 },
   },
 };
diff --git a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts
index abb6c6e971711..e6721d65e309f 100644
--- a/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rule_task_timeout.ts
@@ -18,7 +18,7 @@ export const getRuleTaskTimeout = ({
   ruleTaskTimeout?: string;
   ruleTypeId: string;
 }): string => {
-  const ruleTypeConfig = config.execution.ruleTypeOverrides?.find(
+  const ruleTypeConfig = config.run.ruleTypeOverrides?.find(
     (ruleType) => ruleTypeId === ruleType.id
   );
 
@@ -27,9 +27,6 @@ export const getRuleTaskTimeout = ({
   // if not, ruleTaskTimeout is applied that is passed from the rule type registering plugin
   // if none of above is set, DEFAULT_EXECUTION_TIMEOUT is applied
   return (
-    ruleTypeConfig?.timeout ||
-    config.execution.timeout ||
-    ruleTaskTimeout ||
-    DEFAULT_EXECUTION_TIMEOUT
+    ruleTypeConfig?.timeout || config.run.timeout || ruleTaskTimeout || DEFAULT_EXECUTION_TIMEOUT
   );
 };
diff --git a/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts b/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts
index e8956bd065038..e6477945eebda 100644
--- a/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rules_config.test.ts
@@ -14,7 +14,7 @@ const config = {
     value: '2m',
     enforce: false,
   },
-  execution: {
+  run: {
     timeout: '1m',
     actions: { max: 1000 },
   },
@@ -22,8 +22,8 @@ const config = {
 
 const configWithRuleType = {
   ...config,
-  execution: {
-    ...config.execution,
+  run: {
+    ...config.run,
     ruleTypeOverrides: [
       {
         id: ruleTypeId,
@@ -36,7 +36,7 @@ const configWithRuleType = {
 describe('get rules config', () => {
   test('returns the rule type specific config and keeps the default values that are not overwritten', () => {
     expect(getExecutionConfigForRuleType({ config: configWithRuleType, ruleTypeId })).toEqual({
-      execution: {
+      run: {
         id: ruleTypeId,
         timeout: '1m',
         actions: { max: 20 },
@@ -46,7 +46,7 @@ describe('get rules config', () => {
 
   test('returns the default config when there is no rule type specific config', () => {
     expect(getExecutionConfigForRuleType({ config, ruleTypeId })).toEqual({
-      execution: config.execution,
+      run: config.run,
     });
   });
 });
diff --git a/x-pack/plugins/alerting/server/lib/get_rules_config.ts b/x-pack/plugins/alerting/server/lib/get_rules_config.ts
index 12f75254a5656..14d3bdc36285f 100644
--- a/x-pack/plugins/alerting/server/lib/get_rules_config.ts
+++ b/x-pack/plugins/alerting/server/lib/get_rules_config.ts
@@ -15,13 +15,13 @@ export const getExecutionConfigForRuleType = ({
   config: RulesConfig;
   ruleTypeId: string;
 }): RuleTypeConfig => {
-  const ruleTypeExecutionConfig = config.execution.ruleTypeOverrides?.find(
+  const ruleTypeExecutionConfig = config.run.ruleTypeOverrides?.find(
     (ruleType) => ruleType.id === ruleTypeId
   );
 
   return {
-    execution: {
-      ...omit(config.execution, 'ruleTypeOverrides'),
+    run: {
+      ...omit(config.run, 'ruleTypeOverrides'),
       ...ruleTypeExecutionConfig,
     },
   };
diff --git a/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts b/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts
index 214b95c5ef50c..4413941dfc293 100644
--- a/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts
+++ b/x-pack/plugins/alerting/server/lib/is_alerting_error.test.ts
@@ -7,7 +7,7 @@
 
 import { isAlertSavedObjectNotFoundError, isEsUnavailableError } from './is_alerting_error';
 import { ErrorWithReason } from './error_with_reason';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import uuid from 'uuid';
 import { RuleExecutionStatusErrorReasons } from '../types';
 
diff --git a/x-pack/plugins/alerting/server/lib/is_alerting_error.ts b/x-pack/plugins/alerting/server/lib/is_alerting_error.ts
index abd6ac64bf8b7..5759909712d41 100644
--- a/x-pack/plugins/alerting/server/lib/is_alerting_error.ts
+++ b/x-pack/plugins/alerting/server/lib/is_alerting_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { isErrorWithReason } from './error_with_reason';
 
 export function isAlertSavedObjectNotFoundError(err: Error, ruleId: string) {
diff --git a/x-pack/plugins/alerting/server/lib/license_state.test.ts b/x-pack/plugins/alerting/server/lib/license_state.test.ts
index 0a261c7248484..535033851b3e0 100644
--- a/x-pack/plugins/alerting/server/lib/license_state.test.ts
+++ b/x-pack/plugins/alerting/server/lib/license_state.test.ts
@@ -8,8 +8,8 @@
 import { RuleType } from '../types';
 import { Subject } from 'rxjs';
 import { LicenseState, ILicenseState } from './license_state';
-import { licensingMock } from '../../../licensing/server/mocks';
-import { ILicense } from '../../../licensing/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 describe('checkLicense()', () => {
   const getRawLicense = jest.fn();
diff --git a/x-pack/plugins/alerting/server/lib/license_state.ts b/x-pack/plugins/alerting/server/lib/license_state.ts
index 340d608002fc5..6e422c802c5e3 100644
--- a/x-pack/plugins/alerting/server/lib/license_state.ts
+++ b/x-pack/plugins/alerting/server/lib/license_state.ts
@@ -11,8 +11,8 @@ import type { PublicMethodsOf } from '@kbn/utility-types';
 import { assertNever } from '@kbn/std';
 import { capitalize } from 'lodash';
 import { Observable, Subscription } from 'rxjs';
-import { LicensingPluginStart } from '../../../licensing/server';
-import { ILicense, LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 import { PLUGIN } from '../constants/plugin';
 import { getRuleTypeFeatureUsageName } from './get_rule_type_feature_usage_name';
 import {
diff --git a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts
index abcc0407c54d0..8cce79e22fe88 100644
--- a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts
+++ b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { retryIfConflicts, RetryForConflictsAttempts } from './retry_if_conflicts';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('retry_if_conflicts', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts
index 068a28bc54453..8b7a3b5f76c8a 100644
--- a/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts
+++ b/x-pack/plugins/alerting/server/lib/retry_if_conflicts.ts
@@ -11,7 +11,7 @@
 // have the caller make explicit conflict checks, where the conflict was
 // caused by a background update.
 
-import { Logger, SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { Logger, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 type RetryableForConflicts<T> = () => Promise<T>;
 
diff --git a/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts b/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts
index ff43f4ffac8a9..e28646af55fec 100644
--- a/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts
+++ b/x-pack/plugins/alerting/server/lib/rule_execution_status.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   RuleExecutionStatusErrorReasons,
   RuleExecutionStatusWarningReasons,
diff --git a/x-pack/plugins/alerting/server/lib/rule_execution_status.ts b/x-pack/plugins/alerting/server/lib/rule_execution_status.ts
index a87aed321b16b..11e7946669824 100644
--- a/x-pack/plugins/alerting/server/lib/rule_execution_status.ts
+++ b/x-pack/plugins/alerting/server/lib/rule_execution_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   RuleExecutionStatus,
   RuleExecutionStatusValues,
diff --git a/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.test.ts b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.test.ts
new file mode 100644
index 0000000000000..3ea70a2992c16
--- /dev/null
+++ b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.test.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
+import { trackDeprecatedRouteUsage } from './track_deprecated_route_usage';
+
+describe('trackDeprecatedRouteUsage', () => {
+  it('should call `usageCounter.incrementCounter`', () => {
+    const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
+    const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
+
+    trackDeprecatedRouteUsage('test', mockUsageCounter);
+    expect(mockUsageCounter.incrementCounter).toHaveBeenCalledWith({
+      counterName: `deprecatedRoute_test`,
+      counterType: 'deprecatedApiUsage',
+      incrementBy: 1,
+    });
+  });
+
+  it('should do nothing if no usage counter is provided', () => {
+    let err;
+    try {
+      trackDeprecatedRouteUsage('test', undefined);
+    } catch (e) {
+      err = e;
+    }
+    expect(err).toBeUndefined();
+  });
+});
diff --git a/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.ts b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.ts
new file mode 100644
index 0000000000000..aa163d5cd409a
--- /dev/null
+++ b/x-pack/plugins/alerting/server/lib/track_deprecated_route_usage.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+
+export function trackDeprecatedRouteUsage(route: string, usageCounter?: UsageCounter) {
+  if (usageCounter) {
+    usageCounter.incrementCounter({
+      counterName: `deprecatedRoute_${route}`,
+      counterType: 'deprecatedApiUsage',
+      incrementBy: 1,
+    });
+  }
+}
diff --git a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts
index f4a1ce07ab985..1c48cdd902111 100644
--- a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts
+++ b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyRouteUsage } from './track_legacy_route_usage';
 
 describe('trackLegacyRouteUsage', () => {
diff --git a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts
index 528a75a0a18bd..2d33322630ef4 100644
--- a/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts
+++ b/x-pack/plugins/alerting/server/lib/track_legacy_route_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export function trackLegacyRouteUsage(route: string, usageCounter?: UsageCounter) {
   if (usageCounter) {
diff --git a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
index 046b18553d042..e86cd98f4a490 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { createWrappedScopedClusterClientFactory } from './wrap_scoped_cluster_client';
 
 const esQuery = {
diff --git a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
index 914d6f8c6da30..af77191474d89 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
@@ -20,7 +20,7 @@ import type {
   SearchRequest as SearchRequestWithBody,
   AggregationsAggregate,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient, ElasticsearchClient, Logger } from 'src/core/server';
+import { IScopedClusterClient, ElasticsearchClient, Logger } from '@kbn/core/server';
 import { RuleExecutionMetrics } from '../types';
 import { Rule } from '../types';
 
diff --git a/x-pack/plugins/alerting/server/mocks.ts b/x-pack/plugins/alerting/server/mocks.ts
index d9951b4a79759..f7525c2c5f570 100644
--- a/x-pack/plugins/alerting/server/mocks.ts
+++ b/x-pack/plugins/alerting/server/mocks.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { rulesClientMock } from './rules_client.mock';
-import { PluginSetupContract, PluginStartContract } from './plugin';
-import { Alert, AlertFactoryDoneUtils } from './alert';
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
   httpServerMock,
-} from '../../../../src/core/server/mocks';
-import { dataPluginMock } from '../../../../src/plugins/data/server/mocks';
+} from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { rulesClientMock } from './rules_client.mock';
+import { PluginSetupContract, PluginStartContract } from './plugin';
+import { Alert, AlertFactoryDoneUtils } from './alert';
 import { AlertInstanceContext, AlertInstanceState } from './types';
 
 export { rulesClientMock };
diff --git a/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts b/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts
index 630aba27485e4..6a139df0aa844 100644
--- a/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts
+++ b/x-pack/plugins/alerting/server/monitoring/in_memory_metrics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('inMemoryMetrics', () => {
   const logger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts
index 73bef5b29172b..ac90fc283ca77 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.test.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from 'src/core/public/mocks';
-import { CoreSetup } from '../../../../../src/core/server';
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { coreMock } from '@kbn/core/public/mocks';
+import { CoreSetup } from '@kbn/core/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerClusterCollector } from './register_cluster_collector';
 import { AlertingPluginsStart } from '../plugin';
 import { ClusterRulesMetric } from './types';
diff --git a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts
index 63dd6053d3889..f1764d922069f 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_cluster_collector.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import stats from 'stats-lite';
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import {
   IdleTaskWithExpiredRunAt,
   RunningOrClaimingTaskWithExpiredRetryAt,
-} from '../../../task_manager/server';
-import { CoreSetup } from '../../../../../src/core/server';
+} from '@kbn/task-manager-plugin/server';
+import { CoreSetup } from '@kbn/core/server';
 import { AlertingPluginsStart } from '../plugin';
 import { ClusterRulesMetric } from './types';
 
diff --git a/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts b/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts
index 7c5dea1d2eb5f..a17cf5b47020b 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_node_collector.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { monitoringCollectionMock } from '../../../monitoring_collection/server/mocks';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { Metric } from '../../../monitoring_collection/server';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Metric } from '@kbn/monitoring-collection-plugin/server';
 import { registerNodeCollector } from './register_node_collector';
 import { NodeRulesMetric } from './types';
 import { InMemoryMetrics, IN_MEMORY_METRICS } from '.';
diff --git a/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts b/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts
index 4e364e5c812fb..839787c6e78fc 100644
--- a/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts
+++ b/x-pack/plugins/alerting/server/monitoring/register_node_collector.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MonitoringCollectionSetup } from '../../../monitoring_collection/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import { IN_MEMORY_METRICS } from '.';
 import { InMemoryMetrics } from './in_memory_metrics';
 
diff --git a/x-pack/plugins/alerting/server/monitoring/types.ts b/x-pack/plugins/alerting/server/monitoring/types.ts
index 20cb3fb5bb4e5..4b159dd8349ae 100644
--- a/x-pack/plugins/alerting/server/monitoring/types.ts
+++ b/x-pack/plugins/alerting/server/monitoring/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MetricResult } from '../../../monitoring_collection/server';
+import { MetricResult } from '@kbn/monitoring-collection-plugin/server';
 
 export type ClusterRulesMetric = MetricResult<{
   overdue: {
diff --git a/x-pack/plugins/alerting/server/plugin.test.ts b/x-pack/plugins/alerting/server/plugin.test.ts
index 8eb73aa25954b..949328d065536 100644
--- a/x-pack/plugins/alerting/server/plugin.test.ts
+++ b/x-pack/plugins/alerting/server/plugin.test.ts
@@ -6,21 +6,21 @@
  */
 
 import { AlertingPlugin, PluginSetupContract } from './plugin';
-import { createUsageCollectionSetupMock } from 'src/plugins/usage_collection/server/mocks';
-import { coreMock, statusServiceMock } from '../../../../src/core/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
-import { eventLogServiceMock } from '../../event_log/server/event_log_service.mock';
-import { KibanaRequest } from 'kibana/server';
-import { featuresPluginMock } from '../../features/server/mocks';
-import { KibanaFeature } from '../../features/server';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
+import { coreMock, statusServiceMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { eventLogServiceMock } from '@kbn/event-log-plugin/server/event_log_service.mock';
+import { KibanaRequest } from '@kbn/core/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/server';
 import { AlertingConfig } from './config';
 import { RuleType } from './types';
-import { eventLogMock } from '../../event_log/server/mocks';
-import { actionsMock } from '../../actions/server/mocks';
-import { dataPluginMock } from '../../../../src/plugins/data/server/mocks';
-import { monitoringCollectionMock } from '../../monitoring_collection/server/mocks';
+import { eventLogMock } from '@kbn/event-log-plugin/server/mocks';
+import { actionsMock } from '@kbn/actions-plugin/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { monitoringCollectionMock } from '@kbn/monitoring-collection-plugin/server/mocks';
 
 const generateAlertingConfig = (): AlertingConfig => ({
   healthCheck: {
@@ -34,7 +34,7 @@ const generateAlertingConfig = (): AlertingConfig => ({
   cancelAlertsOnRuleTimeout: true,
   rules: {
     minimumScheduleInterval: { value: '1m', enforce: false },
-    execution: {
+    run: {
       actions: {
         max: 1000,
       },
@@ -51,7 +51,7 @@ const sampleRuleType: RuleType<never, never, never, never, never, 'default'> = {
   defaultActionGroupId: 'default',
   producer: 'test',
   config: {
-    execution: {
+    run: {
       actions: {
         max: 1000,
       },
@@ -127,7 +127,7 @@ describe('Alerting Plugin', () => {
         ...generateAlertingConfig(),
         rules: {
           minimumScheduleInterval: { value: '1m', enforce: false },
-          execution: {
+          run: {
             actions: {
               max: 123,
             },
@@ -142,7 +142,7 @@ describe('Alerting Plugin', () => {
       setupContract.registerType(ruleType);
 
       expect(ruleType.config).toEqual({
-        execution: {
+        run: {
           actions: { max: 123 },
         },
       });
@@ -153,7 +153,7 @@ describe('Alerting Plugin', () => {
         ...generateAlertingConfig(),
         rules: {
           minimumScheduleInterval: { value: '1m', enforce: false },
-          execution: {
+          run: {
             actions: { max: 123 },
             ruleTypeOverrides: [{ id: sampleRuleType.id, timeout: '1d' }],
           },
@@ -167,7 +167,7 @@ describe('Alerting Plugin', () => {
       setupContract.registerType(ruleType);
 
       expect(ruleType.config).toEqual({
-        execution: {
+        run: {
           id: sampleRuleType.id,
           actions: {
             max: 123,
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 85279ec615331..9696c523b095b 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -8,19 +8,17 @@
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { BehaviorSubject } from 'rxjs';
 import { pick } from 'lodash';
-import { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../encrypted_saved_objects/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
-import { SpacesPluginStart } from '../../spaces/server';
-import { RulesClient } from './rules_client';
-import { RuleTypeRegistry } from './rule_type_registry';
-import { TaskRunnerFactory } from './task_runner';
-import { RulesClientFactory } from './rules_client_factory';
-import { ILicenseState, LicenseState } from './lib/license_state';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   KibanaRequest,
   Logger,
@@ -32,14 +30,31 @@ import {
   ServiceStatus,
   SavedObjectsBulkGetObject,
   ServiceStatusLevels,
-} from '../../../../src/core/server';
-import { AlertingRequestHandlerContext, ALERTS_FEATURE_ID } from './types';
-import { defineRoutes } from './routes';
-import { LICENSE_TYPE, LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
+} from '@kbn/core/server';
+import {
+  LICENSE_TYPE,
+  LicensingPluginSetup,
+  LicensingPluginStart,
+} from '@kbn/licensing-plugin/server';
 import {
   PluginSetupContract as ActionsPluginSetupContract,
   PluginStartContract as ActionsPluginStartContract,
-} from '../../actions/server';
+} from '@kbn/actions-plugin/server';
+import {
+  IEventLogger,
+  IEventLogService,
+  IEventLogClientService,
+} from '@kbn/event-log-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
+import { RulesClient } from './rules_client';
+import { RuleTypeRegistry } from './rule_type_registry';
+import { TaskRunnerFactory } from './task_runner';
+import { RulesClientFactory } from './rules_client_factory';
+import { ILicenseState, LicenseState } from './lib/license_state';
+import { AlertingRequestHandlerContext, ALERTS_FEATURE_ID } from './types';
+import { defineRoutes } from './routes';
 import {
   AlertInstanceContext,
   AlertInstanceState,
@@ -50,8 +65,6 @@ import {
 } from './types';
 import { registerAlertingUsageCollector } from './usage';
 import { initializeAlertingTelemetry, scheduleAlertingTelemetry } from './usage/task';
-import { IEventLogger, IEventLogService, IEventLogClientService } from '../../event_log/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../features/server';
 import { setupSavedObjects } from './saved_objects';
 import {
   initializeApiKeyInvalidator,
@@ -63,8 +76,6 @@ import { getHealth } from './health/get_health';
 import { AlertingAuthorizationClientFactory } from './alerting_authorization_client_factory';
 import { AlertingAuthorization } from './authorization';
 import { getSecurityHealth, SecurityHealth } from './lib/get_security_health';
-import { PluginStart as DataPluginStart } from '../../../../src/plugins/data/server';
-import { MonitoringCollectionSetup } from '../../monitoring_collection/server';
 import { registerNodeCollector, registerClusterCollector, InMemoryMetrics } from './monitoring';
 import { getExecutionConfigForRuleType } from './lib/get_rules_config';
 import { getRuleTaskTimeout } from './lib/get_rule_task_timeout';
diff --git a/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
index c94d46e3a4558..dbc0407324e6d 100644
--- a/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/alerting/server/routes/_mock_handler_arguments.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'kibana/server';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { identity } from 'lodash';
 import type { MethodKeysOf } from '@kbn/utility-types';
-import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { rulesClientMock, RulesClientMock } from '../rules_client.mock';
 import { AlertsHealth, RuleType } from '../../common';
 import type { AlertingRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts b/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts
index 038e923f28f0c..7123f1bf4ad6c 100644
--- a/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts
+++ b/x-pack/plugins/alerting/server/routes/aggregate_rules.test.ts
@@ -6,19 +6,19 @@
  */
 
 import { aggregateRulesRoute } from './aggregate_rules';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { trackLegacyTerminology } from './lib/track_legacy_terminology';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 const rulesClient = rulesClientMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
 const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/aggregate_rules.ts b/x-pack/plugins/alerting/server/routes/aggregate_rules.ts
index 8c44f57b83789..5bba2b714d4d0 100644
--- a/x-pack/plugins/alerting/server/routes/aggregate_rules.ts
+++ b/x-pack/plugins/alerting/server/routes/aggregate_rules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../lib';
 import { AggregateResult, AggregateOptions } from '../rules_client';
 import { RewriteResponseCase, RewriteRequestCase, verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/create_rule.test.ts b/x-pack/plugins/alerting/server/routes/create_rule.test.ts
index 62c7819fb5b05..cbb7965cab081 100644
--- a/x-pack/plugins/alerting/server/routes/create_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/create_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { createRuleRoute } from './create_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -16,12 +16,12 @@ import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib';
 import { AsApiContract } from './lib';
 import { SanitizedRule } from '../types';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/delete_rule.test.ts b/x-pack/plugins/alerting/server/routes/delete_rule.test.ts
index b7d1a2c9c7fc6..b64dff27c5b90 100644
--- a/x-pack/plugins/alerting/server/routes/delete_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/delete_rule.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { deleteRuleRoute } from './delete_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -14,7 +14,7 @@ import { rulesClientMock } from '../rules_client.mock';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/delete_rule.ts b/x-pack/plugins/alerting/server/routes/delete_rule.ts
index 27da50b180fe5..278bd031a8d6f 100644
--- a/x-pack/plugins/alerting/server/routes/delete_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/delete_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/disable_rule.test.ts b/x-pack/plugins/alerting/server/routes/disable_rule.test.ts
index baecc8f198fff..6f4806b8e17f5 100644
--- a/x-pack/plugins/alerting/server/routes/disable_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/disable_rule.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { disableRuleRoute } from './disable_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
@@ -14,7 +14,7 @@ import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/disable_rule.ts b/x-pack/plugins/alerting/server/routes/disable_rule.ts
index 74bf9d11166be..6e6700c3ece4d 100644
--- a/x-pack/plugins/alerting/server/routes/disable_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/disable_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/enable_rule.test.ts b/x-pack/plugins/alerting/server/routes/enable_rule.test.ts
index 9a8b3fe1b4226..cb75ec87d2bfb 100644
--- a/x-pack/plugins/alerting/server/routes/enable_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/enable_rule.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { enableRuleRoute } from './enable_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
@@ -14,7 +14,7 @@ import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/enable_rule.ts b/x-pack/plugins/alerting/server/routes/enable_rule.ts
index e62e6aa30221f..f3b3c5bfbefdc 100644
--- a/x-pack/plugins/alerting/server/routes/enable_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/enable_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/find_rules.test.ts b/x-pack/plugins/alerting/server/routes/find_rules.test.ts
index 33791dcac1038..1641a73eab238 100644
--- a/x-pack/plugins/alerting/server/routes/find_rules.test.ts
+++ b/x-pack/plugins/alerting/server/routes/find_rules.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { findRulesRoute } from './find_rules';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -17,7 +17,7 @@ const rulesClient = rulesClientMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
 const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/find_rules.ts b/x-pack/plugins/alerting/server/routes/find_rules.ts
index 7d7f878780ac3..2c5819f7b7115 100644
--- a/x-pack/plugins/alerting/server/routes/find_rules.ts
+++ b/x-pack/plugins/alerting/server/routes/find_rules.ts
@@ -6,8 +6,8 @@
  */
 
 import { omit } from 'lodash';
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { FindOptions, FindResult } from '../rules_client';
diff --git a/x-pack/plugins/alerting/server/routes/get_rule.test.ts b/x-pack/plugins/alerting/server/routes/get_rule.test.ts
index 4384e02352d95..065cd567f1f69 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { getRuleRoute } from './get_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -16,7 +16,7 @@ import { SanitizedRule } from '../types';
 import { AsApiContract } from './lib';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule.ts b/x-pack/plugins/alerting/server/routes/get_rule.ts
index 52b73d22680f9..189401f03815c 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule.ts
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash';
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { verifyAccessAndContext, RewriteResponseCase } from './lib';
 import {
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
index 4193e769dc513..a6b0e88bbf5af 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getRuleAlertSummaryRoute } from './get_rule_alert_summary';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../rules_client.mock';
 import { AlertSummary } from '../types';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
index 097eee875fcee..033c0f178cef7 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_alert_summary.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { GetAlertSummaryParams } from '../rules_client';
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts
index 2394e159a9f19..f55f3e9dc1c4d 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { getRuleExecutionLogRoute } from './get_rule_execution_log';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../rules_client.mock';
 import { IExecutionLogWithErrorsResult } from '../../common';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts
index 066f72e4f9459..b8717e4ef6cab 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_execution_log.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { GetExecutionLogByIdParams } from '../rules_client';
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts b/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts
index 36f1e6c5f8f42..04d3704c88714 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_state.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { getRuleStateRoute } from './get_rule_state';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../rules_client.mock';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/get_rule_state.ts b/x-pack/plugins/alerting/server/routes/get_rule_state.ts
index 1ebe3ab367443..5f9bee59c4e70 100644
--- a/x-pack/plugins/alerting/server/routes/get_rule_state.ts
+++ b/x-pack/plugins/alerting/server/routes/get_rule_state.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState } from '../lib';
 import { RewriteResponseCase, verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/health.test.ts b/x-pack/plugins/alerting/server/routes/health.test.ts
index 7b3ba5ee2a873..b525122e3d00c 100644
--- a/x-pack/plugins/alerting/server/routes/health.test.ts
+++ b/x-pack/plugins/alerting/server/routes/health.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { healthRoute } from './health';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { rulesClientMock } from '../rules_client.mock';
 import { HealthStatus } from '../types';
 import { alertsMock } from '../mocks';
@@ -19,7 +19,7 @@ import { RegistryAlertTypeWithAuth } from '../authorization';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/health.ts b/x-pack/plugins/alerting/server/routes/health.ts
index 993dd0d554836..4d9fcde896281 100644
--- a/x-pack/plugins/alerting/server/routes/health.ts
+++ b/x-pack/plugins/alerting/server/routes/health.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ILicenseState } from '../lib';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { RewriteResponseCase, verifyAccessAndContext } from './lib';
 import {
   AlertingRequestHandlerContext,
diff --git a/x-pack/plugins/alerting/server/routes/index.ts b/x-pack/plugins/alerting/server/routes/index.ts
index e03e726bb2b2c..392ec591d9608 100644
--- a/x-pack/plugins/alerting/server/routes/index.ts
+++ b/x-pack/plugins/alerting/server/routes/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { ILicenseState } from '../lib';
 import { defineLegacyRoutes } from './legacy';
 import { AlertingRequestHandlerContext } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { createRuleRoute } from './create_rule';
 import { getRuleRoute, getInternalRuleRoute } from './get_rule';
 import { updateRuleRoute } from './update_rule';
@@ -60,7 +60,7 @@ export function defineRoutes(opts: RouteOptions) {
   getRuleStateRoute(router, licenseState);
   healthRoute(router, licenseState, encryptedSavedObjects);
   ruleTypesRoute(router, licenseState);
-  muteAllRuleRoute(router, licenseState);
+  muteAllRuleRoute(router, licenseState, usageCounter);
   muteAlertRoute(router, licenseState);
   unmuteAllRuleRoute(router, licenseState);
   unmuteAlertRoute(router, licenseState);
diff --git a/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts b/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts
index cab779a42ce20..a2fad24b24c0f 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/aggregate.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { aggregateAlertRoute } from './aggregate';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 
 const rulesClient = rulesClientMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
@@ -23,7 +23,7 @@ jest.mock('../../lib/track_legacy_route_usage', () => ({
   trackLegacyRouteUsage: jest.fn(),
 }));
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts b/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts
index bd4aa7750738c..67bb1a416d1c0 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/aggregate.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { renameKeys } from './../lib/rename_keys';
+import { renameKeys } from '../lib/rename_keys';
 import { FindOptions } from '../../rules_client';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.test.ts b/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
index cd584543d57e0..60b299be6db97 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
@@ -6,20 +6,20 @@
  */
 
 import { createAlertRoute } from './create';
-import { httpServiceMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { Rule } from '../../../common/rule';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.ts b/x-pack/plugins/alerting/server/routes/legacy/create.ts
index b6669a605022d..fb56279eaabc7 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/create.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/create.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { validateDurationSchema } from '../../lib';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import {
   SanitizedRule,
   RuleNotifyWhenType,
diff --git a/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts b/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts
index ae1c5327bd27c..fee6b3db736fe 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/delete.test.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { deleteAlertRoute } from './delete';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/delete.ts b/x-pack/plugins/alerting/server/routes/legacy/delete.ts
index 66d05e580a3a2..4e29ded695181 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/delete.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts b/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts
index 1e9f5531d19d2..2e8629b5e3fe9 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/disable.test.ts
@@ -4,18 +4,18 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { disableAlertRoute } from './disable';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/disable.ts b/x-pack/plugins/alerting/server/routes/legacy/disable.ts
index 1345c4ae4428a..b9ad5765e977e 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/disable.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/disable.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts b/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts
index eb839ba3e7b83..d63c330c54300 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/enable.test.ts
@@ -4,18 +4,18 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { enableAlertRoute } from './enable';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/enable.ts b/x-pack/plugins/alerting/server/routes/legacy/enable.ts
index ec3b4b0a0fc20..6835be0631cb2 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/enable.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/enable.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/find.test.ts b/x-pack/plugins/alerting/server/routes/legacy/find.test.ts
index 0d18b70a5944d..026a4f81688e3 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/find.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/find.test.ts
@@ -4,19 +4,19 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { findAlertRoute } from './find';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/find.ts b/x-pack/plugins/alerting/server/routes/legacy/find.ts
index fc8076343e713..e6d57572a2238 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/find.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/find.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { renameKeys } from './../lib/rename_keys';
+import { renameKeys } from '../lib/rename_keys';
 import { FindOptions } from '../../rules_client';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { trackLegacyTerminology } from '../lib/track_legacy_terminology';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get.test.ts
index 8c2233ae280b7..6860140ce2540 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get.test.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { getAlertRoute } from './get';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { Rule } from '../../../common';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get.ts b/x-pack/plugins/alerting/server/routes/legacy/get.ts
index df8259789d53c..82b56030de4cd 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
index d7b81ff5c26d0..672ccee369aac 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.test.ts
@@ -4,18 +4,18 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { getAlertInstanceSummaryRoute } from './get_alert_instance_summary';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../../rules_client.mock';
 import { AlertSummary } from '../../types';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts
index e94c0a858646d..7d467aed1b3fd 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_instance_summary.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts
index f164e0fa0bc81..42527256925f7 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.test.ts
@@ -4,17 +4,17 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { getAlertStateRoute } from './get_alert_state';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { rulesClientMock } from '../../rules_client.mock';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts
index 2bd2d343b98ba..49a0daf5ea180 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/get_alert_state.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/health.test.ts b/x-pack/plugins/alerting/server/routes/legacy/health.test.ts
index c5371f6fcb5e7..453d743d8e794 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/health.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/health.test.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { healthRoute } from './health';
-import { httpServiceMock } from 'src/core/server/mocks';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import { rulesClientMock } from '../../rules_client.mock';
 import { HealthStatus, RecoveredActionGroup } from '../../types';
 import { alertsMock } from '../../mocks';
@@ -18,7 +18,7 @@ import { RegistryAlertTypeWithAuth } from '../../authorization';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/health.ts b/x-pack/plugins/alerting/server/routes/legacy/health.ts
index 2d9609969f306..e9f770b437caa 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/health.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/health.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { AlertingFrameworkHealth } from '../../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../../encrypted_saved_objects/server';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import { getSecurityHealth } from '../../lib/get_security_health';
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts
index 45c5c62913996..9ab197a47f648 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { listAlertTypesRoute } from './list_alert_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryAlertTypeWithAuth } from '../../authorization';
@@ -18,7 +18,7 @@ import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts
index 250d3d1bdeedc..5c0ef90ccc5e2 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/list_alert_types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts
index 9d84fd75a68c5..ee3dca51a4340 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_all.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { muteAllAlertRoute } from './mute_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts
index f35ffe93ccda4..2b16b332c9cbb 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_all.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts
index 5e17c42528e14..648a2a963246f 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { muteAlertInstanceRoute } from './mute_instance';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts
index af6aea1e0f6c7..50c4a3de95893 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/mute_instance.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { renameKeys } from './../lib/rename_keys';
+import { renameKeys } from '../lib/rename_keys';
 import { MuteOptions } from '../../rules_client';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts
index f3530786667ff..e781fee392ce6 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { unmuteAllAlertRoute } from './unmute_all';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts
index a6cd687271cc4..34297624b45d6 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_all.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts
index fa109fa09f250..0cc1856bc6a27 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { unmuteAlertInstanceRoute } from './unmute_instance';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts
index d4684bda7f0fa..8f3b1f2413953 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/unmute_instance.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update.test.ts b/x-pack/plugins/alerting/server/routes/legacy/update.test.ts
index 5396e267fa525..61073c0d4e3bf 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update.test.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { updateAlertRoute } from './update';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
 import { verifyApiAccess } from '../../lib/license_api_access';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { RuleNotifyWhenType } from '../../../common';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update.ts b/x-pack/plugins/alerting/server/routes/legacy/update.ts
index b740be04829e8..415d2f0af4a60 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { validateDurationSchema } from '../../lib';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 import {
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts
index 5ae3ec2f5387f..e4fa2539c391f 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { updateApiKeyRoute } from './update_api_key';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../../lib/license_state.mock';
-import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
 import { rulesClientMock } from '../../rules_client.mock';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts
index ab5ff254fca86..3c288219812ca 100644
--- a/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts
+++ b/x-pack/plugins/alerting/server/routes/legacy/update_api_key.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { AlertingRouter } from '../../types';
 import { ILicenseState } from '../../lib/license_state';
 import { verifyApiAccess } from '../../lib/license_api_access';
 import { LEGACY_BASE_ALERT_API_PATH } from '../../../common';
-import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { handleDisabledApiKeysError } from '../lib/error_handler';
 import { RuleTypeDisabledError } from '../../lib/errors/rule_type_disabled';
 import { trackLegacyRouteUsage } from '../../lib/track_legacy_route_usage';
 
diff --git a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts
index b9065059f52f0..6dbfea0090952 100644
--- a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { countUsageOfPredefinedIds } from './count_usage_of_predefined_ids';
 
 beforeEach(() => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts
index 1956000d4e22b..8955e321c3fe5 100644
--- a/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/count_usage_of_predefined_ids.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export interface CountUsageOfPredefinedIdsOptions {
   predefinedId?: string;
diff --git a/x-pack/plugins/alerting/server/routes/lib/error_handler.ts b/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
index 0699a43ef42be..7e8243e7d501c 100644
--- a/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/error_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { RequestHandlerWrapper } from 'kibana/server';
+import { RequestHandlerWrapper } from '@kbn/core/server';
 
 export const handleDisabledApiKeysError: RequestHandlerWrapper = (handler) => {
   return async (context, request, response) => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts
index 5c6838e144aa2..117e0c5456bd2 100644
--- a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { trackLegacyTerminology, LEGACY_TERMS } from './track_legacy_terminology';
 
 describe('trackLegacyTerminology', () => {
diff --git a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts
index e825cb990fc4d..c0c1fd155b7fd 100644
--- a/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/track_legacy_terminology.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { flatten } from 'lodash';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 export const LEGACY_TERMS = ['alertTypeId', 'actionTypeId'];
 
diff --git a/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts b/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts
index f0177f04bf9b2..09930a4b59165 100644
--- a/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts
+++ b/x-pack/plugins/alerting/server/routes/lib/verify_access_and_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { ILicenseState, isErrorThatHandlesItsOwnResponse, verifyApiAccess } from '../../lib';
 import { AlertingRequestHandlerContext } from '../../types';
 
diff --git a/x-pack/plugins/alerting/server/routes/mute_alert.test.ts b/x-pack/plugins/alerting/server/routes/mute_alert.test.ts
index 0fc28412abc6f..ef67a6d2ef3bf 100644
--- a/x-pack/plugins/alerting/server/routes/mute_alert.test.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_alert.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { muteAlertRoute } from './mute_alert';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/mute_alert.ts b/x-pack/plugins/alerting/server/routes/mute_alert.ts
index 67e6f3b4002d7..a90dc77e5fb6b 100644
--- a/x-pack/plugins/alerting/server/routes/mute_alert.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_alert.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { MuteOptions } from '../rules_client';
diff --git a/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts b/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts
index 277add6ec1647..131c20eb84a72 100644
--- a/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_all_rule.test.ts
@@ -4,19 +4,24 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { muteAllRuleRoute } from './mute_all_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
+import { trackDeprecatedRouteUsage } from '../lib/track_deprecated_route_usage';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
+jest.mock('../lib/track_deprecated_route_usage', () => ({
+  trackDeprecatedRouteUsage: jest.fn(),
+}));
+
 beforeEach(() => {
   jest.resetAllMocks();
 });
@@ -77,4 +82,19 @@ describe('muteAllRuleRoute', () => {
 
     expect(res.forbidden).toHaveBeenCalledWith({ body: { message: 'Fail' } });
   });
+
+  it('should track every call', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+    const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
+    const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
+
+    muteAllRuleRoute(router, licenseState, mockUsageCounter);
+    const [, handler] = router.post.mock.calls[0];
+    const [context, req, res] = mockHandlerArguments({ rulesClient }, { params: {}, body: {} }, [
+      'ok',
+    ]);
+    await handler(context, req, res);
+    expect(trackDeprecatedRouteUsage).toHaveBeenCalledWith('muteAll', mockUsageCounter);
+  });
 });
diff --git a/x-pack/plugins/alerting/server/routes/mute_all_rule.ts b/x-pack/plugins/alerting/server/routes/mute_all_rule.ts
index ad3c93f415ea2..e9d64ce3e30f0 100644
--- a/x-pack/plugins/alerting/server/routes/mute_all_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_all_rule.ts
@@ -5,11 +5,13 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
 import { AlertingRequestHandlerContext, BASE_ALERTING_API_PATH } from '../types';
+import { trackDeprecatedRouteUsage } from '../lib/track_deprecated_route_usage';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -17,7 +19,8 @@ const paramSchema = schema.object({
 
 export const muteAllRuleRoute = (
   router: IRouter<AlertingRequestHandlerContext>,
-  licenseState: ILicenseState
+  licenseState: ILicenseState,
+  usageCounter?: UsageCounter
 ) => {
   router.post(
     {
@@ -30,6 +33,7 @@ export const muteAllRuleRoute = (
       verifyAccessAndContext(licenseState, async function (context, req, res) {
         const rulesClient = context.alerting.getRulesClient();
         const { id } = req.params;
+        trackDeprecatedRouteUsage('muteAll', usageCounter);
         try {
           await rulesClient.muteAll({ id });
           return res.noContent();
diff --git a/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts b/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts
index b03369a74b865..656874b5cf332 100644
--- a/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/resolve_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { resolveRuleRoute } from './resolve_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -16,7 +16,7 @@ import { ResolvedSanitizedRule } from '../types';
 import { AsApiContract } from './lib';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/resolve_rule.ts b/x-pack/plugins/alerting/server/routes/resolve_rule.ts
index e6cacb8231b5f..02c70c555fc0d 100644
--- a/x-pack/plugins/alerting/server/routes/resolve_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/resolve_rule.ts
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash';
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { verifyAccessAndContext, RewriteResponseCase } from './lib';
 import {
diff --git a/x-pack/plugins/alerting/server/routes/rule_types.test.ts b/x-pack/plugins/alerting/server/routes/rule_types.test.ts
index 880db9b9e9886..4eb4d1f713d5e 100644
--- a/x-pack/plugins/alerting/server/routes/rule_types.test.ts
+++ b/x-pack/plugins/alerting/server/routes/rule_types.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { ruleTypesRoute } from './rule_types';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -17,7 +17,7 @@ import { AsApiContract } from './lib';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/rule_types.ts b/x-pack/plugins/alerting/server/routes/rule_types.ts
index 0427fffab04d1..f78a0ef3ee89e 100644
--- a/x-pack/plugins/alerting/server/routes/rule_types.ts
+++ b/x-pack/plugins/alerting/server/routes/rule_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState } from '../lib';
 import { RegistryAlertTypeWithAuth } from '../authorization';
 import { RewriteResponseCase, verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts b/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts
index f7e83301385ad..dd0af1c77ac1a 100644
--- a/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/snooze_rule.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { snoozeRuleRoute } from './snooze_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/snooze_rule.ts b/x-pack/plugins/alerting/server/routes/snooze_rule.ts
index 3b2167cc79fa3..ed717de973c9a 100644
--- a/x-pack/plugins/alerting/server/routes/snooze_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/snooze_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleMutedError } from '../lib';
 import { verifyAccessAndContext, RewriteRequestCase } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts b/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts
index bfc281cb16b2f..6f9c553831e77 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_alert.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { unmuteAlertRoute } from './unmute_alert';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/unmute_alert.ts b/x-pack/plugins/alerting/server/routes/unmute_alert.ts
index 0269f53fa8827..6b02674de0267 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_alert.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_alert.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { MuteOptions } from '../rules_client';
diff --git a/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts b/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts
index ff97819506276..8671247987bd4 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_all_rule.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { unmuteAllRuleRoute } from './unmute_all_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts b/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts
index 05ae9be2ba6e5..bead959a6d7d8 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_all_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts b/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts
index 260e4b4150043..0a67c3aa608dc 100644
--- a/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/unsnooze_rule.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { unsnoozeRuleRoute } from './unsnooze_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts b/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts
index f779f1681d482..f0c1a9a12ac50 100644
--- a/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/unsnooze_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleMutedError } from '../lib';
 import { verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/routes/update_rule.test.ts b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
index f39ad53c8786d..853a002ade57c 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule.test.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
@@ -7,7 +7,7 @@
 
 import { pick } from 'lodash';
 import { updateRuleRoute } from './update_rule';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { mockHandlerArguments } from './_mock_handler_arguments';
@@ -19,7 +19,7 @@ import { AsApiContract } from './lib';
 import { PartialRule } from '../types';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/update_rule.ts b/x-pack/plugins/alerting/server/routes/update_rule.ts
index 5c416e50b4ff2..f58e61b5d1ac2 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { ILicenseState, RuleTypeDisabledError, validateDurationSchema } from '../lib';
 import { RuleNotifyWhenType } from '../../common';
 import { UpdateOptions } from '../rules_client';
diff --git a/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts b/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts
index 2622c260d7938..4b2847eb16f73 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule_api_key.test.ts
@@ -6,14 +6,14 @@
  */
 
 import { updateRuleApiKeyRoute } from './update_rule_api_key';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { rulesClientMock } from '../rules_client.mock';
 import { RuleTypeDisabledError } from '../lib/errors/rule_type_disabled';
 
 const rulesClient = rulesClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts b/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts
index a6644e455a9be..af10d97bc2a97 100644
--- a/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts
+++ b/x-pack/plugins/alerting/server/routes/update_rule_api_key.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { ILicenseState, RuleTypeDisabledError } from '../lib';
 import { verifyAccessAndContext } from './lib';
diff --git a/x-pack/plugins/alerting/server/rule_type_registry.test.ts b/x-pack/plugins/alerting/server/rule_type_registry.test.ts
index f4102a2bc6227..abaeee60759e9 100644
--- a/x-pack/plugins/alerting/server/rule_type_registry.test.ts
+++ b/x-pack/plugins/alerting/server/rule_type_registry.test.ts
@@ -8,11 +8,11 @@
 import { TaskRunnerFactory } from './task_runner';
 import { RuleTypeRegistry, ConstructorOptions } from './rule_type_registry';
 import { ActionGroup, RuleType } from './types';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ILicenseState } from './lib/license_state';
 import { licenseStateMock } from './lib/license_state.mock';
-import { licensingMock } from '../../licensing/server/mocks';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
 const logger = loggingSystemMock.create().get();
@@ -61,7 +61,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -87,7 +87,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -125,7 +125,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -154,7 +154,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -186,7 +186,7 @@ describe('Create Lifecycle', () => {
         producer: 'alerts',
         defaultScheduleInterval: 'foobar',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -279,7 +279,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -313,7 +313,7 @@ describe('Create Lifecycle', () => {
         minimumLicenseRequired: 'basic',
         isExportable: true,
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -351,7 +351,7 @@ describe('Create Lifecycle', () => {
         minimumLicenseRequired: 'basic',
         isExportable: true,
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -393,7 +393,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -424,7 +424,7 @@ describe('Create Lifecycle', () => {
         producer: 'alerts',
         ruleTaskTimeout: '20m',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -461,7 +461,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -489,7 +489,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -510,7 +510,7 @@ describe('Create Lifecycle', () => {
           executor: jest.fn(),
           producer: 'alerts',
           config: {
-            execution: {
+            run: {
               actions: { max: 1000 },
             },
           },
@@ -537,7 +537,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -561,7 +561,7 @@ describe('Create Lifecycle', () => {
           "state": Array [],
         },
         "config": Object {
-          "execution": Object {
+          "run": Object {
             "actions": Object {
               "max": 1000,
             },
@@ -616,7 +616,7 @@ describe('Create Lifecycle', () => {
         executor: jest.fn(),
         producer: 'alerts',
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -715,7 +715,7 @@ describe('Create Lifecycle', () => {
         minimumLicenseRequired: 'basic',
         recoveryActionGroup: { id: 'recovered', name: 'Recovered' },
         config: {
-          execution: {
+          run: {
             actions: { max: 1000 },
           },
         },
@@ -753,7 +753,7 @@ function ruleTypeWithVariables<ActionGroupIds extends string>(
     async executor() {},
     producer: 'alerts',
     config: {
-      execution: {
+      run: {
         actions: { max: 1000 },
       },
     },
diff --git a/x-pack/plugins/alerting/server/rule_type_registry.ts b/x-pack/plugins/alerting/server/rule_type_registry.ts
index bc548b8ae2286..338450746781b 100644
--- a/x-pack/plugins/alerting/server/rule_type_registry.ts
+++ b/x-pack/plugins/alerting/server/rule_type_registry.ts
@@ -10,9 +10,9 @@ import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 import typeDetect from 'type-detect';
 import { intersection } from 'lodash';
-import { Logger } from 'kibana/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { RunContext, TaskManagerSetupContract } from '../../task_manager/server';
+import { Logger } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { RunContext, TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerFactory } from './task_runner';
 import {
   RuleType,
diff --git a/x-pack/plugins/alerting/server/rules_client/audit_events.ts b/x-pack/plugins/alerting/server/rules_client/audit_events.ts
index 2192073a1244b..a60cc503d3c8e 100644
--- a/x-pack/plugins/alerting/server/rules_client/audit_events.ts
+++ b/x-pack/plugins/alerting/server/rules_client/audit_events.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { EcsEventOutcome, EcsEventType } from 'src/core/server';
-import { AuditEvent } from '../../../security/server';
+import { EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { AuditEvent } from '@kbn/security-plugin/server';
 
 export enum RuleAuditAction {
   CREATE = 'rule_create',
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
index 26385cfac3f78..3479ca374e596 100644
--- a/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/mapped_params_utils.ts
@@ -6,8 +6,8 @@
  */
 
 import { snakeCase } from 'lodash';
+import { SavedObjectAttribute } from '@kbn/core/server';
 import { RuleTypeParams, MappedParams, MappedParamsProperties } from '../../types';
-import { SavedObjectAttribute } from '../../../../../../src/core/server';
 import {
   iterateFilterKureyNode,
   IterateFilterKureyNodeParams,
diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
index ac53486d279fd..d925315928f2c 100644
--- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts
+++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
@@ -19,8 +19,21 @@ import {
   PluginInitializerContext,
   SavedObjectsUtils,
   SavedObjectAttributes,
-} from '../../../../../src/core/server';
-import { ActionsClient, ActionsAuthorization } from '../../../actions/server';
+} from '@kbn/core/server';
+import { ActionsClient, ActionsAuthorization } from '@kbn/actions-plugin/server';
+import {
+  GrantAPIKeyResult as SecurityPluginGrantAPIKeyResult,
+  InvalidateAPIKeyResult as SecurityPluginInvalidateAPIKeyResult,
+} from '@kbn/security-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
+import {
+  IEvent,
+  IEventLogClient,
+  IEventLogger,
+  SAVED_OBJECT_REL_PRIMARY,
+} from '@kbn/event-log-plugin/server';
+import { AuditLogger } from '@kbn/security-plugin/server';
 import {
   Rule,
   PartialRule,
@@ -41,12 +54,6 @@ import {
   RawAlertInstance as RawAlert,
 } from '../types';
 import { validateRuleTypeParams, ruleExecutionStatusFromRaw, getRuleNotifyWhenType } from '../lib';
-import {
-  GrantAPIKeyResult as SecurityPluginGrantAPIKeyResult,
-  InvalidateAPIKeyResult as SecurityPluginInvalidateAPIKeyResult,
-} from '../../../security/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { TaskManagerStartContract } from '../../../task_manager/server';
 import { taskInstanceToAlertTaskInstance } from '../task_runner/alert_task_instance';
 import { RegistryRuleType, UntypedNormalizedRuleType } from '../rule_type_registry';
 import {
@@ -57,15 +64,8 @@ import {
   AlertingAuthorizationFilterType,
   AlertingAuthorizationFilterOpts,
 } from '../authorization';
-import {
-  IEvent,
-  IEventLogClient,
-  IEventLogger,
-  SAVED_OBJECT_REL_PRIMARY,
-} from '../../../event_log/server';
 import { parseIsoOrRelativeDate } from '../lib/iso_or_relative_date';
 import { alertSummaryFromEventLog } from '../lib/alert_summary_from_event_log';
-import { AuditLogger } from '../../../security/server';
 import { parseDuration } from '../../common/parse_duration';
 import { retryIfConflicts } from '../lib/retry_if_conflicts';
 import { partiallyUpdateAlert } from '../saved_objects';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts
index af27decb73a2a..b74059e4be3d6 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/aggregate.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
index 8a9cd1d4acc7f..d695acf574aeb 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/create.test.ts
@@ -7,21 +7,21 @@
 
 import { schema } from '@kbn/config-schema';
 import { RulesClient, ConstructorOptions, CreateOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization, ActionsClient } from '../../../../actions/server';
-import { TaskStatus } from '../../../../task_manager/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization, ActionsClient } from '@kbn/actions-plugin/server';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { getDefaultRuleMonitoring } from '../../task_runner/task_runner';
 
-jest.mock('../../../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
@@ -1167,7 +1167,7 @@ describe('create()', () => {
         injectReferences: injectReferencesFn,
       },
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
@@ -1340,7 +1340,7 @@ describe('create()', () => {
         injectReferences: injectReferencesFn,
       },
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
@@ -2099,7 +2099,7 @@ describe('create()', () => {
       async executor() {},
       producer: 'alerts',
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
@@ -2629,7 +2629,7 @@ describe('create()', () => {
         injectReferences: jest.fn(),
       },
       config: {
-        execution: {
+        run: {
           actions: { max: 1000 },
         },
       },
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
index db19346e34946..f6194ec6c1a5f 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
index 5a6a7265d3a33..f15b647a8e396 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
@@ -6,19 +6,19 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { InvalidatePendingApiKey } from '../../types';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
-import { eventLoggerMock } from '../../../../event_log/server/event_logger.mock';
-import { TaskStatus } from '../../../../task_manager/server';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
 
 jest.mock('uuid', () => ({
   v4: () => '5f6aa57d-3e22-484e-bae8-cbed868f4d28',
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
index 36ffd44a1df30..0a4737006d557 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { TaskStatus } from '../../../../task_manager/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { InvalidatePendingApiKey } from '../../types';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
index a803859f58af6..6ba7469335b88 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
@@ -6,16 +6,16 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
 import { nodeTypes, fromKueryExpression } from '@kbn/es-query';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
index 8ff06637b2efd..eb61f754bb6b3 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
index 238dad71f6344..88f6e466be821 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_state.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { TaskStatus } from '../../../../task_manager/server';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { getBeforeSetup } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts
index 64f28096b788f..6dcd64565c562 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_summary.test.ts
@@ -7,17 +7,17 @@
 
 import { omit, mean } from 'lodash';
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { eventLogClientMock } from '../../../../event_log/server/mocks';
-import { QueryEventsBySavedObjectResult } from '../../../../event_log/server';
-import { SavedObject } from 'kibana/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { eventLogClientMock } from '@kbn/event-log-plugin/server/mocks';
+import { QueryEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
+import { SavedObject } from '@kbn/core/server';
 import { EventsFactory } from '../../lib/alert_summary_from_event_log.test';
 import { RawRule } from '../../types';
 import { getBeforeSetup, mockedDateString, setGlobalDate } from './lib';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts
index df5f9252a98a0..2cc59f7bfbba7 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_execution_log.test.ts
@@ -7,18 +7,18 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { eventLogClientMock } from '../../../../event_log/server/mocks';
-import { SavedObject } from 'kibana/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { eventLogClientMock } from '@kbn/event-log-plugin/server/mocks';
+import { SavedObject } from '@kbn/core/server';
 import { RawRule } from '../../types';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, mockedDateString, setGlobalDate } from './lib';
 import { getExecutionLogAggregation } from '../../lib/get_execution_log_aggregation';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/lib.ts b/x-pack/plugins/alerting/server/rules_client/tests/lib.ts
index 489dbb27b9e18..b25fd2ab2c489 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/lib.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/lib.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { IEventLogClient } from '../../../../event_log/server';
-import { actionsClientMock } from '../../../../actions/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { IEventLogClient } from '@kbn/event-log-plugin/server';
+import { actionsClientMock } from '@kbn/actions-plugin/server/mocks';
+import { eventLogClientMock } from '@kbn/event-log-plugin/server/mocks';
 import { ConstructorOptions } from '../rules_client';
-import { eventLogClientMock } from '../../../../event_log/server/mocks';
 import { RuleTypeRegistry } from '../../rule_type_registry';
 import { RecoveredActionGroup } from '../../../common';
 
@@ -92,7 +92,7 @@ export function getBeforeSetup(
     async executor() {},
     producer: 'alerts',
     config: {
-      execution: {
+      run: {
         actions: { max: 1000 },
       },
     },
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts
index 7a5d3863923fb..0a3f5981a33a0 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/list_alert_types.test.ts
@@ -6,17 +6,17 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import {
   AlertingAuthorization,
   RegistryAlertTypeWithAuth,
 } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { getBeforeSetup } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts
index 3d4b3a6ec3d03..7f8ae28a20c6e 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/mute_all.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts
index c0000c3ae6a43..d566ea8c18bd5 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/mute_instance.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
index 3387d5a30bed1..20aced1c32369 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts
index 1ff4c8be3df02..cf063eea07862 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/unmute_all.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts
index 3de2d654c9c5f..6f52b6291474f 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/unmute_instance.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
 const taskManager = taskManagerMock.createStart();
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
index 4bc0276a9ae1a..c2005d8a061b5 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
@@ -8,22 +8,22 @@
 import uuid from 'uuid';
 import { schema } from '@kbn/config-schema';
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
 import { IntervalSchedule, InvalidatePendingApiKey } from '../../types';
 import { RecoveredActionGroup } from '../../../common';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
 import { resolvable } from '../../test_utils';
-import { ActionsAuthorization, ActionsClient } from '../../../../actions/server';
-import { TaskStatus } from '../../../../task_manager/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization, ActionsClient } from '@kbn/actions-plugin/server';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
-jest.mock('../../../../../../src/core/server/saved_objects/service/lib/utils', () => ({
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => ({
   SavedObjectsUtils: {
     generateId: () => 'mock-saved-object-id',
   },
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts
index 9ce129f361a01..abc0db48ac167 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update_api_key.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { alertingAuthorizationMock } from '../../authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { actionsAuthorizationMock } from '../../../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from '../../authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../../../actions/server';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { InvalidatePendingApiKey } from '../../types';
 import { getBeforeSetup, setGlobalDate } from './lib';
 
diff --git a/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts b/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts
index 626207bad4bb4..3732c79075f97 100644
--- a/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client_conflict_retries.test.ts
@@ -8,17 +8,17 @@
 import { cloneDeep } from 'lodash';
 
 import { RulesClient, ConstructorOptions } from './rules_client';
-import { savedObjectsClientMock, loggingSystemMock } from '../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ruleTypeRegistryMock } from './rule_type_registry.mock';
 import { alertingAuthorizationMock } from './authorization/alerting_authorization.mock';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { actionsClientMock, actionsAuthorizationMock } from '../../actions/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { actionsClientMock, actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
 import { AlertingAuthorization } from './authorization/alerting_authorization';
-import { ActionsAuthorization } from '../../actions/server';
-import { SavedObjectsErrorHelpers } from '../../../../src/core/server';
+import { ActionsAuthorization } from '@kbn/actions-plugin/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { RetryForConflictsAttempts } from './lib/retry_if_conflicts';
-import { TaskStatus } from '../../task_manager/server/task';
+import { TaskStatus } from '@kbn/task-manager-plugin/server/task';
 import { RecoveredActionGroup } from '../common';
 
 let rulesClient: RulesClient;
diff --git a/x-pack/plugins/alerting/server/rules_client_factory.test.ts b/x-pack/plugins/alerting/server/rules_client_factory.test.ts
index cf8e4604f01d9..080480e8b3d1e 100644
--- a/x-pack/plugins/alerting/server/rules_client_factory.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client_factory.test.ts
@@ -8,19 +8,19 @@
 import { Request } from '@hapi/hapi';
 import { RulesClientFactory, RulesClientFactoryOpts } from './rules_client_factory';
 import { ruleTypeRegistryMock } from './rule_type_registry.mock';
-import { taskManagerMock } from '../../task_manager/server/mocks';
-import { KibanaRequest } from '../../../../src/core/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   savedObjectsClientMock,
   savedObjectsServiceMock,
   loggingSystemMock,
-} from '../../../../src/core/server/mocks';
-import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/mocks';
-import { AuthenticatedUser } from '../../security/common/model';
-import { securityMock } from '../../security/server/mocks';
-import { PluginStartContract as ActionsStartContract } from '../../actions/server';
-import { actionsMock, actionsAuthorizationMock } from '../../actions/server/mocks';
-import { eventLogMock } from '../../event_log/server/mocks';
+} from '@kbn/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { PluginStartContract as ActionsStartContract } from '@kbn/actions-plugin/server';
+import { actionsMock, actionsAuthorizationMock } from '@kbn/actions-plugin/server/mocks';
+import { eventLogMock } from '@kbn/event-log-plugin/server/mocks';
 import { alertingAuthorizationMock } from './authorization/alerting_authorization.mock';
 import { alertingAuthorizationClientFactoryMock } from './alerting_authorization_client_factory.mock';
 import { AlertingAuthorization } from './authorization';
diff --git a/x-pack/plugins/alerting/server/rules_client_factory.ts b/x-pack/plugins/alerting/server/rules_client_factory.ts
index 19231030c4007..19184d3baa329 100644
--- a/x-pack/plugins/alerting/server/rules_client_factory.ts
+++ b/x-pack/plugins/alerting/server/rules_client_factory.ts
@@ -10,14 +10,14 @@ import {
   Logger,
   SavedObjectsServiceStart,
   PluginInitializerContext,
-} from 'src/core/server';
-import { PluginStartContract as ActionsPluginStartContract } from '../../actions/server';
-import { RulesClient } from './rules_client';
+} from '@kbn/core/server';
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
+import { IEventLogClientService, IEventLogger } from '@kbn/event-log-plugin/server';
 import { RuleTypeRegistry, SpaceIdToNamespaceFunction } from './types';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { EncryptedSavedObjectsClient } from '../../encrypted_saved_objects/server';
-import { TaskManagerStartContract } from '../../task_manager/server';
-import { IEventLogClientService, IEventLogger } from '../../../plugins/event_log/server';
+import { RulesClient } from './rules_client';
 import { AlertingAuthorizationClientFactory } from './alerting_authorization_client_factory';
 import { AlertingRulesConfig } from './config';
 export interface RulesClientFactoryOpts {
diff --git a/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts b/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts
index ffed0e0b5efbc..7ad94643f47cf 100644
--- a/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/geo_containment/migrations.ts
@@ -9,9 +9,9 @@ import {
   SavedObjectAttributes,
   SavedObjectReference,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
-import { RuleTypeParams } from '../../index';
-import { Query } from '../../../../../../src/plugins/data/common/query';
+} from '@kbn/core/server';
+import { Query } from '@kbn/data-plugin/common/query';
+import { RuleTypeParams } from '../..';
 import { RawRule } from '../../types';
 
 // These definitions are dupes of the SO-types in stack_alerts/geo_containment
diff --git a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts
index 0bf2db556c2dc..1eff02d732231 100644
--- a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { RawRule } from '../types';
 import { getImportWarnings } from './get_import_warnings';
 
diff --git a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts
index 0058cd82c9d83..6bd7feacb635d 100644
--- a/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/get_import_warnings.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectsImportWarning } from 'kibana/server';
+import { SavedObject, SavedObjectsImportWarning } from '@kbn/core/server';
 
 export function getImportWarnings(
   rulesSavedObjects: Array<SavedObject<unknown>>
diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
index 16736a24a9a38..47e172005ccbe 100644
--- a/x-pack/plugins/alerting/server/saved_objects/index.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -11,10 +11,10 @@ import type {
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
   SavedObjectsTypeMappingDefinition,
-} from 'kibana/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import mappings from './mappings.json';
 import { getMigrations } from './migrations';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { transformRulesForExport } from './transform_rule_for_export';
 import { RawRule } from '../types';
 import { getImportWarnings } from './get_import_warnings';
diff --git a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts
index 6bd3dfc99472b..0f2677dc49751 100644
--- a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.test.ts
@@ -8,13 +8,13 @@
 import { MockedLogger, loggerMock } from '@kbn/logging-mocks';
 import { TaskRunnerFactory } from '../task_runner';
 import { RuleTypeRegistry, ConstructorOptions } from '../rule_type_registry';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ILicenseState } from '../lib/license_state';
 import { licenseStateMock } from '../lib/license_state.mock';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { isRuleExportable } from './is_rule_exportable';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 let ruleTypeRegistryParams: ConstructorOptions;
 let logger: MockedLogger;
diff --git a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts
index 31ada226cacfd..34339a1fdb388 100644
--- a/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/is_rule_exportable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObject } from 'kibana/server';
+import { Logger, SavedObject } from '@kbn/core/server';
 import { RawRule } from '../types';
 import { RuleTypeRegistry } from '../rule_type_registry';
 
diff --git a/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts b/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
index 28b1f599f9575..6b736006fc074 100644
--- a/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/migrations.test.ts
@@ -8,9 +8,9 @@
 import uuid from 'uuid';
 import { getMigrations, isAnyActionSupportIncidents } from './migrations';
 import { RawRule } from '../types';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { RuleType, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
 const migrationContext = migrationMocks.createContext();
diff --git a/x-pack/plugins/alerting/server/saved_objects/migrations.ts b/x-pack/plugins/alerting/server/saved_objects/migrations.ts
index 91e03eb4da6c2..18de27eb6919e 100644
--- a/x-pack/plugins/alerting/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/migrations.ts
@@ -16,12 +16,12 @@ import {
   SavedObjectAttributes,
   SavedObjectAttribute,
   SavedObjectReference,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import type { IsMigrationNeededPredicate } from '@kbn/encrypted-saved-objects-plugin/server';
 import { RawRule, RawRuleAction, RawRuleExecutionStatus } from '../types';
-import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
-import type { IsMigrationNeededPredicate } from '../../../encrypted_saved_objects/server';
 import { extractRefsFromGeoContainmentAlert } from './geo_containment/migrations';
-import { getMappedParams } from '../../server/rules_client/lib/mapped_params_utils';
+import { getMappedParams } from '../rules_client/lib/mapped_params_utils';
 
 const SIEM_APP_ID = 'securitySolution';
 const SIEM_SERVER_APP_ID = 'siem';
diff --git a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts
index 37729dada3168..7560632d12e5a 100644
--- a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.test.ts
@@ -9,10 +9,10 @@ import {
   SavedObjectsClientContract,
   ISavedObjectsRepository,
   SavedObjectsErrorHelpers,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 
 import { partiallyUpdateAlert, PartiallyUpdateableAlertAttributes } from './partially_update_alert';
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 const MockSavedObjectsClientContract = savedObjectsClientMock.create();
 const MockISavedObjectsRepository =
diff --git a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts
index 76303722fc876..2c275a5f602fc 100644
--- a/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/partially_update_alert.ts
@@ -6,15 +6,14 @@
  */
 
 import { pick } from 'lodash';
-import { RawRule } from '../types';
-
 import {
   SavedObjectsClient,
   SavedObjectsErrorHelpers,
   SavedObjectsUpdateOptions,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { RawRule } from '../types';
 
-import { AlertAttributesExcludedFromAAD, AlertAttributesExcludedFromAADType } from './index';
+import { AlertAttributesExcludedFromAAD, AlertAttributesExcludedFromAADType } from '.';
 
 export type PartiallyUpdateableAlertAttributes = Partial<
   Pick<RawRule, AlertAttributesExcludedFromAADType>
diff --git a/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts b/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts
index 5b89f6394e3c5..4c1aafa9e5cb7 100644
--- a/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/transform_rule_for_export.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { getRuleExecutionStatusPending } from '../lib/rule_execution_status';
 import { RawRule } from '../types';
 
diff --git a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts
index f5183e9e19dcc..3faea1a4d2261 100644
--- a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { AlertTaskInstance, taskInstanceToAlertTaskInstance } from './alert_task_instance';
 import uuid from 'uuid';
 import { SanitizedRule } from '../types';
diff --git a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts
index fd61b37a277de..d831fe8c63b07 100644
--- a/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts
+++ b/x-pack/plugins/alerting/server/task_runner/alert_task_instance.ts
@@ -8,7 +8,7 @@
 import * as t from 'io-ts';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
-import { ConcreteTaskInstance } from '../../../task_manager/server';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import {
   SanitizedRule,
   RuleTaskState,
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
index af0220ccba987..addd2b99b5efd 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
@@ -7,15 +7,15 @@
 
 import { createExecutionHandler } from './create_execution_handler';
 import { ActionsCompletion, AlertExecutionStore, CreateExecutionHandlerOptions } from './types';
-import { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   actionsClientMock,
   actionsMock,
   renderActionParameterTemplatesDefault,
-} from '../../../actions/server/mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
-import { KibanaRequest } from 'kibana/server';
-import { asSavedObjectExecutionSource } from '../../../actions/server';
+} from '@kbn/actions-plugin/server/mocks';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { KibanaRequest } from '@kbn/core/server';
+import { asSavedObjectExecutionSource } from '@kbn/actions-plugin/server';
 import { InjectActionParamsOpts } from './inject_action_params';
 import { NormalizedRuleType } from '../rule_type_registry';
 import { AlertInstanceContext, AlertInstanceState, RuleTypeParams, RuleTypeState } from '../types';
@@ -49,7 +49,7 @@ const ruleType: NormalizedRuleType<
   executor: jest.fn(),
   producer: 'alerts',
   config: {
-    execution: {
+    run: {
       actions: { max: 1000 },
     },
   },
@@ -476,7 +476,7 @@ describe('Create Execution Handler', () => {
       ruleType: {
         ...ruleType,
         config: {
-          execution: {
+          run: {
             actions: { max: 2 },
           },
         },
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
index 7752817f17c85..e9452e3cf7c8f 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
@@ -4,15 +4,15 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { asSavedObjectExecutionSource } from '@kbn/actions-plugin/server';
+import { SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
+import { isEphemeralTaskRejectedDueToCapacityError } from '@kbn/task-manager-plugin/server';
 import { transformActionParams } from './transform_action_params';
-import { asSavedObjectExecutionSource } from '../../../actions/server';
-import { SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
 import { EVENT_LOG_ACTIONS } from '../plugin';
 import { injectActionParams } from './inject_action_params';
 import { AlertInstanceContext, AlertInstanceState, RuleTypeParams, RuleTypeState } from '../types';
 
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
-import { isEphemeralTaskRejectedDueToCapacityError } from '../../../task_manager/server';
 import { createAlertEventLogRecordObject } from '../lib/create_alert_event_log_record_object';
 import { ActionsCompletion, CreateExecutionHandlerOptions, ExecutionHandlerOptions } from './types';
 
@@ -115,7 +115,7 @@ export function createExecutionHandler<
     let ephemeralActionsToSchedule = maxEphemeralActionsPerRule;
 
     for (const action of actions) {
-      if (alertExecutionStore.numberOfTriggeredActions >= ruleType.config!.execution.actions.max) {
+      if (alertExecutionStore.numberOfTriggeredActions >= ruleType.config!.run.actions.max) {
         alertExecutionStore.triggeredActionsStatus = ActionsCompletion.PARTIAL;
         break;
       }
diff --git a/x-pack/plugins/alerting/server/task_runner/fixtures.ts b/x-pack/plugins/alerting/server/task_runner/fixtures.ts
index 613f3ed9e1645..1f41ce1fc0529 100644
--- a/x-pack/plugins/alerting/server/task_runner/fixtures.ts
+++ b/x-pack/plugins/alerting/server/task_runner/fixtures.ts
@@ -6,6 +6,7 @@
  */
 
 import { isNil } from 'lodash';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
 import {
   Rule,
   RuleExecutionStatusWarningReasons,
@@ -14,7 +15,6 @@ import {
 } from '../../common';
 import { getDefaultRuleMonitoring } from './task_runner';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
-import { TaskStatus } from '../../../task_manager/server';
 import { EVENT_LOG_ACTIONS } from '../plugin';
 
 interface GeneratorParams {
@@ -109,7 +109,7 @@ export const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
   executor: jest.fn(),
   producer: 'alerts',
   config: {
-    execution: {
+    run: {
       actions: { max: 1000 },
     },
   },
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
index 21109b60e012d..bba5488afe1e1 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -7,7 +7,7 @@
 
 import sinon from 'sinon';
 import { schema } from '@kbn/config-schema';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   RuleExecutorOptions,
   RuleTypeParams,
@@ -20,10 +20,10 @@ import {
   ConcreteTaskInstance,
   isUnrecoverableError,
   RunNowResult,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
 import { TaskRunner } from './task_runner';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
@@ -32,16 +32,16 @@ import {
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
-import { actionsMock, actionsClientMock } from '../../../actions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
+import { actionsMock, actionsClientMock } from '@kbn/actions-plugin/server/mocks';
 import { alertsMock, rulesClientMock } from '../mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
-import { IEventLogger } from '../../../event_log/server';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { omit } from 'lodash';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { ExecuteOptions } from '../../../actions/server/create_execute_function';
+import { ExecuteOptions } from '@kbn/actions-plugin/server/create_execute_function';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 import moment from 'moment';
 import {
@@ -70,7 +70,7 @@ import {
 import { EVENT_LOG_ACTIONS } from '../plugin';
 import { IN_MEMORY_METRICS } from '../monitoring';
 import { translations } from '../constants/translations';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 
 jest.mock('uuid', () => ({
   v4: () => '5f6aa57d-3e22-484e-bae8-cbed868f4d28',
@@ -2645,7 +2645,7 @@ describe('Task Runner', () => {
     const ruleTypeWithConfig = {
       ...ruleType,
       config: {
-        execution: {
+        run: {
           actions: { max: 3 },
         },
       },
@@ -2718,7 +2718,7 @@ describe('Task Runner', () => {
     const runnerResult = await taskRunner.run();
 
     expect(actionsClient.enqueueExecution).toHaveBeenCalledTimes(
-      ruleTypeWithConfig.config.execution.actions.max
+      ruleTypeWithConfig.config.run.actions.max
     );
 
     expect(
@@ -2818,7 +2818,7 @@ describe('Task Runner', () => {
         action: EVENT_LOG_ACTIONS.execute,
         outcome: 'success',
         status: 'warning',
-        numberOfTriggeredActions: ruleTypeWithConfig.config.execution.actions.max,
+        numberOfTriggeredActions: ruleTypeWithConfig.config.run.actions.max,
         numberOfScheduledActions: mockActions.length,
         reason: RuleExecutionStatusWarningReasons.MAX_EXECUTABLE_ACTIONS,
         task: true,
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index 36c8bddb1ff82..f7317fc5e6b48 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -7,12 +7,13 @@
 import apm from 'elastic-apm-node';
 import { cloneDeep, mapValues, omit, pickBy, set, without } from 'lodash';
 import type { Request } from '@hapi/hapi';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import uuid from 'uuid';
-import { addSpaceIdToPath } from '../../../spaces/server';
-import { KibanaRequest, Logger } from '../../../../../src/core/server';
+import { addSpaceIdToPath } from '@kbn/spaces-plugin/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ConcreteTaskInstance, throwUnrecoverableError } from '@kbn/task-manager-plugin/server';
+import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
-import { ConcreteTaskInstance, throwUnrecoverableError } from '../../../task_manager/server';
 import { createExecutionHandler, ExecutionHandler } from './create_execution_handler';
 import { Alert, createAlertFactory } from '../alert';
 import {
@@ -45,7 +46,6 @@ import { asErr, asOk, map, promiseResult, resolveErr, Resultable } from '../lib/
 import { getExecutionDurationPercentiles, getExecutionSuccessRatio } from '../lib/monitoring';
 import { taskInstanceToAlertTaskInstance } from './alert_task_instance';
 import { EVENT_LOG_ACTIONS } from '../plugin';
-import { IEvent, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server';
 import { isAlertSavedObjectNotFoundError, isEsUnavailableError } from '../lib/is_alerting_error';
 import { partiallyUpdateAlert } from '../saved_objects';
 import {
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
index 1e24ac986f015..92ef6fcf21ada 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   RuleExecutorOptions,
   RuleTypeParams,
@@ -14,10 +14,10 @@ import {
   AlertInstanceState,
   AlertInstanceContext,
 } from '../types';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
 import { TaskRunner } from './task_runner';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
@@ -26,16 +26,16 @@ import {
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
-import { actionsMock, actionsClientMock } from '../../../actions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
+import { actionsMock, actionsClientMock } from '@kbn/actions-plugin/server/mocks';
 import { alertsMock, rulesClientMock } from '../mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
-import { IEventLogger } from '../../../event_log/server';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
 import { Rule, RecoveredActionGroup } from '../../common';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 
 jest.mock('uuid', () => ({
@@ -58,7 +58,7 @@ const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
   cancelAlertsOnRuleTimeout: true,
   ruleTaskTimeout: '5m',
   config: {
-    execution: {
+    run: {
       actions: { max: 1000 },
     },
   },
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
index 8cda4f9567d3f..0fe747ab7a93e 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -6,10 +6,10 @@
  */
 
 import sinon from 'sinon';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
 import {
   loggingSystemMock,
   savedObjectsRepositoryMock,
@@ -17,14 +17,14 @@ import {
   savedObjectsServiceMock,
   elasticsearchServiceMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { actionsMock } from '../../../actions/server/mocks';
+} from '@kbn/core/server/mocks';
+import { actionsMock } from '@kbn/actions-plugin/server/mocks';
 import { rulesClientMock } from '../mocks';
-import { eventLoggerMock } from '../../../event_log/server/event_logger.mock';
+import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 import { ruleTypeRegistryMock } from '../rule_type_registry.mock';
-import { executionContextServiceMock } from '../../../../../src/core/server/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 
 const inMemoryMetrics = inMemoryMetricsMock.create();
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
index 2cba16152e198..5a32e86593fa4 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type {
   Logger,
   KibanaRequest,
@@ -16,10 +16,12 @@ import type {
   SavedObjectsServiceStart,
   ElasticsearchServiceStart,
   UiSettingsServiceStart,
-} from '../../../../../src/core/server';
-import { RunContext } from '../../../task_manager/server';
-import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server';
+} from '@kbn/core/server';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import {
   RuleTypeParams,
   RuleTypeRegistry,
@@ -29,10 +31,8 @@ import {
   AlertInstanceContext,
 } from '../types';
 import { TaskRunner } from './task_runner';
-import { IEventLogger } from '../../../event_log/server';
 import { RulesClient } from '../rules_client';
 import { NormalizedRuleType } from '../rule_type_registry';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 import { InMemoryMetrics } from '../monitoring';
 
 export interface TaskRunnerContext {
diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
index e325d597da145..6235e630ba0bb 100644
--- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
@@ -6,7 +6,10 @@
  */
 
 import { transformActionParams } from './transform_action_params';
-import { actionsMock, renderActionParameterTemplatesDefault } from '../../../actions/server/mocks';
+import {
+  actionsMock,
+  renderActionParameterTemplatesDefault,
+} from '@kbn/actions-plugin/server/mocks';
 
 const actionsPlugin = actionsMock.createStart();
 const actionTypeId = 'test-actionTypeId';
diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
index 387bdc00125f0..322a16c1c238e 100644
--- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
+++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 import {
   RuleActionParams,
   AlertInstanceState,
   AlertInstanceContext,
   RuleTypeParams,
 } from '../types';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server';
 
 interface TransformActionParamsOptions {
   actionsPlugin: ActionsPluginStartContract;
diff --git a/x-pack/plugins/alerting/server/task_runner/types.ts b/x-pack/plugins/alerting/server/task_runner/types.ts
index d5ad11f246c49..4aa104fa05410 100644
--- a/x-pack/plugins/alerting/server/task_runner/types.ts
+++ b/x-pack/plugins/alerting/server/task_runner/types.ts
@@ -6,7 +6,10 @@
  */
 
 import { Dictionary } from 'lodash';
-import { KibanaRequest, Logger } from 'kibana/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
+import { IEventLogger } from '@kbn/event-log-plugin/server';
+import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 import {
   ActionGroup,
   RuleAction,
@@ -20,12 +23,9 @@ import {
   RuleTaskState,
   SanitizedRule,
 } from '../../common';
-import { ConcreteTaskInstance } from '../../../task_manager/server';
 import { Alert } from '../alert';
-import { IEventLogger } from '../../../event_log/server';
 import { NormalizedRuleType } from '../rule_type_registry';
 import { ExecutionHandler } from './create_execution_handler';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server';
 import { RawRule } from '../types';
 
 export interface RuleTaskRunResultWithActions {
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
index cfd03f4edf184..7469bdfd98277 100644
--- a/x-pack/plugins/alerting/server/types.ts
+++ b/x-pack/plugins/alerting/server/types.ts
@@ -10,18 +10,20 @@ import type {
   RequestHandlerContext,
   SavedObjectReference,
   IUiSettingsClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import { ISearchStartSearchSource } from '@kbn/data-plugin/common';
+import { LicenseType } from '@kbn/licensing-plugin/server';
+import {
+  IScopedClusterClient,
+  SavedObjectAttributes,
+  SavedObjectsClientContract,
+} from '@kbn/core/server';
 import { AlertFactoryDoneUtils, PublicAlert } from './alert';
 import { RuleTypeRegistry as OrigruleTypeRegistry } from './rule_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { RulesClient } from './rules_client';
 export * from '../common';
-import {
-  IScopedClusterClient,
-  SavedObjectAttributes,
-  SavedObjectsClientContract,
-} from '../../../../src/core/server';
 import {
   Rule,
   RuleTypeParams,
@@ -41,8 +43,6 @@ import {
   RuleMonitoring,
   MappedParams,
 } from '../common';
-import { LicenseType } from '../../licensing/server';
-import { ISearchStartSearchSource } from '../../../../src/plugins/data/common';
 import { RuleTypeConfig } from './config';
 export type WithoutQueryAndParams<T> = Pick<T, Exclude<keyof T, 'query' | 'params'>>;
 export type SpaceIdToNamespaceFunction = (spaceId?: string) => string | undefined;
diff --git a/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts b/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts
index 61383656e67d5..212731625aa84 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_telemetry.test.ts
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import {
   getTotalCountAggregations,
   getTotalCountInUse,
diff --git a/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts b/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts
index 2e360374faa42..7225a0f5f606a 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get, merge } from 'lodash';
 import { AlertingUsage } from './types';
 import { NUM_ALERTING_RULE_TYPES } from './alerting_usage_collector';
diff --git a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts
index e05086949b349..fd8960adf4d8c 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { registerAlertingUsageCollector } from './alerting_usage_collector';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 const taskManagerStart = taskManagerMock.createStart();
 
 beforeEach(() => jest.resetAllMocks());
diff --git a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts
index b0990bab9491d..af15846574be8 100644
--- a/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts
+++ b/x-pack/plugins/alerting/server/usage/alerting_usage_collector.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { get } from 'lodash';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import { AlertingUsage } from './types';
 
 const byTypeSchema: MakeSchemaFrom<AlertingUsage>['count_by_type'] = {
diff --git a/x-pack/plugins/alerting/server/usage/task.ts b/x-pack/plugins/alerting/server/usage/task.ts
index 0d0d2d802a3fb..512db36f47b2a 100644
--- a/x-pack/plugins/alerting/server/usage/task.ts
+++ b/x-pack/plugins/alerting/server/usage/task.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Logger, CoreSetup } from 'kibana/server';
+import { Logger, CoreSetup } from '@kbn/core/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 
 import {
   getTotalCountAggregations,
diff --git a/x-pack/plugins/apm/.storybook/preview.js b/x-pack/plugins/apm/.storybook/preview.js
index 18343c15a6465..3200746243d47 100644
--- a/x-pack/plugins/apm/.storybook/preview.js
+++ b/x-pack/plugins/apm/.storybook/preview.js
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { EuiThemeProviderDecorator } from '../../../../src/plugins/kibana_react/common';
+import { EuiThemeProviderDecorator } from '@kbn/kibana-react-plugin/common';
 
 export const decorators = [EuiThemeProviderDecorator];
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
index 0ffa21cbd4a4d..c9d33d37b6601 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { omit } from 'lodash';
-import { filterByAgent, settingDefinitions } from '../setting_definitions';
+import { filterByAgent, settingDefinitions } from '.';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import { SettingDefinition } from './types';
 
diff --git a/x-pack/plugins/apm/common/alert_types.ts b/x-pack/plugins/apm/common/alert_types.ts
index f2f021b81d76d..afb052b28bbd2 100644
--- a/x-pack/plugins/apm/common/alert_types.ts
+++ b/x-pack/plugins/apm/common/alert_types.ts
@@ -11,10 +11,10 @@ import type {
   AsDuration,
   AsPercent,
   TimeUnitChar,
-} from '../../observability/common';
-import type { ActionGroup } from '../../alerting/common';
+} from '@kbn/observability-plugin/common';
+import type { ActionGroup } from '@kbn/alerting-plugin/common';
+import { formatDurationFromTimeUnitChar } from '@kbn/observability-plugin/common';
 import { ANOMALY_SEVERITY, ANOMALY_THRESHOLD } from './ml_constants';
-import { formatDurationFromTimeUnitChar } from '../../observability/common';
 
 export const APM_SERVER_FEATURE_ID = 'apm';
 
diff --git a/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts b/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts
index ab630decb70c8..6f25c72e1859b 100644
--- a/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts
+++ b/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { DATAFEED_STATE, JOB_STATE } from '../../../ml/common';
+import { DATAFEED_STATE, JOB_STATE } from '@kbn/ml-plugin/common';
 import { Environment } from '../environment_rt';
 
 export interface ApmMlJob {
diff --git a/x-pack/plugins/apm/common/anomaly_detection/index.ts b/x-pack/plugins/apm/common/anomaly_detection/index.ts
index cdb1c62b9eed5..be80902b1d93b 100644
--- a/x-pack/plugins/apm/common/anomaly_detection/index.ts
+++ b/x-pack/plugins/apm/common/anomaly_detection/index.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ANOMALY_SEVERITY } from '../ml_constants';
 import {
   getSeverityType,
   getSeverityColor as mlGetSeverityColor,
-} from '../../../ml/common';
+} from '@kbn/ml-plugin/common';
+import { ANOMALY_SEVERITY } from '../ml_constants';
 import { ServiceHealthStatus } from '../service_health_status';
 
 export interface ServiceAnomalyStats {
diff --git a/x-pack/plugins/apm/common/fetch_options.ts b/x-pack/plugins/apm/common/fetch_options.ts
index 2f862ec7cbc38..14b8900e6ed26 100644
--- a/x-pack/plugins/apm/common/fetch_options.ts
+++ b/x-pack/plugins/apm/common/fetch_options.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 
 export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
   pathname: string;
diff --git a/x-pack/plugins/apm/common/license_check.test.ts b/x-pack/plugins/apm/common/license_check.test.ts
index be50490fe0e81..8b82d1d9f0171 100644
--- a/x-pack/plugins/apm/common/license_check.test.ts
+++ b/x-pack/plugins/apm/common/license_check.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { License } from '../../licensing/common/license';
+import { License } from '@kbn/licensing-plugin/common/license';
 import { isActiveGoldLicense, isActivePlatinumLicense } from './license_check';
 
 describe('License check', () => {
diff --git a/x-pack/plugins/apm/common/license_check.ts b/x-pack/plugins/apm/common/license_check.ts
index 7efc50f4aed9b..6d732dc7917e2 100644
--- a/x-pack/plugins/apm/common/license_check.ts
+++ b/x-pack/plugins/apm/common/license_check.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense, LicenseType } from '../../licensing/common/types';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 
 function isActiveLicense(licenseType: LicenseType, license?: ILicense) {
   return license && license.isActive && license.hasAtLeast(licenseType);
diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/apm/common/service_health_status.ts
index b5318f9333e4f..a58ae8cb04125 100644
--- a/x-pack/plugins/apm/common/service_health_status.ts
+++ b/x-pack/plugins/apm/common/service_health_status.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EuiTheme } from '../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { ANOMALY_SEVERITY } from './ml_constants';
 
 export enum ServiceHealthStatus {
diff --git a/x-pack/plugins/apm/common/utils/formatters/duration.ts b/x-pack/plugins/apm/common/utils/formatters/duration.ts
index 5b20b2e1827a1..bf83ed2e093ea 100644
--- a/x-pack/plugins/apm/common/utils/formatters/duration.ts
+++ b/x-pack/plugins/apm/common/utils/formatters/duration.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { memoize } from 'lodash';
-import { NOT_AVAILABLE_LABEL } from '../../../common/i18n';
+import { NOT_AVAILABLE_LABEL } from '../../i18n';
 import { asDecimalOrInteger, asInteger, asDecimal } from './formatters';
 import { TimeUnit } from './datetime';
 import { Maybe } from '../../../typings/common';
diff --git a/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts b/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts
index f049ab9bb5488..227f9272d547e 100644
--- a/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts
+++ b/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import moment from 'moment';
-import { parseInterval } from '../../../../../src/plugins/data/common';
+import { parseInterval } from '@kbn/data-plugin/common';
 
 export function getOffsetInMs({
   start,
diff --git a/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts b/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
index add9673d88246..7cce6c440a225 100644
--- a/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
+++ b/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { joinByKey } from './';
+import { joinByKey } from '.';
 
 describe('joinByKey', () => {
   it('joins by a string key', () => {
diff --git a/x-pack/plugins/apm/dev_docs/local_setup.md b/x-pack/plugins/apm/dev_docs/local_setup.md
index e41ee4390d58c..716cc8fb832bc 100644
--- a/x-pack/plugins/apm/dev_docs/local_setup.md
+++ b/x-pack/plugins/apm/dev_docs/local_setup.md
@@ -13,25 +13,26 @@ To access an Elasticsearch instance that has live data you have three options:
 
 ## 1. Using Synthtrace
 
-**Start Elasticsearch**
+**Start Elasticsearch & Kibana**
+
+Elasticsearch:
 ```
 yarn es snapshot
 ```
-
-**Create APM mappings**
-
+Kibana:
 ```
-node ./scripts/es_archiver load "x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_mappings_only_8.0.0" --es-url=http://system_indices_superuser:changeme@localhost:9200 --kibana-url=http://elastic:changeme@localhost:5601 --config=./test/functional/config.js
+yarn start
 ```
 
-*Note: Elasticsearch must be available before running the above command*
-
 
 **Run Synthtrace**
 ```
-node packages/elastic-apm-synthtrace/src/scripts/run packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts --target=http://localhost:9200 --username=elastic --password=changeme
+node packages/elastic-apm-synthtrace/src/scripts/run packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts \
+  --local
 ```
 
+The `--local` flag is a shortcut to specifying `--target` and `--kibana`.  It autodiscovers the current kibana basepath and installs the appropiate APM package.
+
 **Connect Kibana to ES**
 Update `config/kibana.dev.yml` with:
 
@@ -47,6 +48,16 @@ Documentation for [Synthtrace](https://github.com/elastic/kibana/blob/main/packa
 
 Use the [oblt-cli](https://github.com/elastic/observability-test-environments/blob/master/tools/oblt_cli/README.md) to connect to a cloud-based ES cluster.
 
+**Run Synthtrace**
+
+If you want to bootstrap some data on a cloud instance you can also use the following
+
+```
+node packages/elastic-apm-synthtrace/src/scripts/run packages/elastic-apm-synthtrace/src/scripts/examples/01_simple_trace.ts \
+  --cloudId "myname:<base64string>" \
+  --maxDocs 100000
+```
+
 ## 3. Local ES Cluster
 
 ### Start Elasticsearch and APM data generators
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts
index 6ef38a9f63baa..1d0155bf9b434 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts
@@ -27,8 +27,8 @@ export function opbeans({ from, to }: { from: number; to: number }) {
   return range
     .interval('1s')
     .rate(1)
-    .spans((timestamp) => [
-      ...opbeansJava
+    .generator((timestamp) => [
+      opbeansJava
         .transaction('GET /api/product')
         .timestamp(timestamp)
         .duration(1000)
@@ -43,24 +43,17 @@ export function opbeans({ from, to }: { from: number; to: number }) {
             .duration(50)
             .success()
             .destination('postgresql')
-        )
-        .serialize(),
-      ...opbeansNode
+        ),
+      opbeansNode
         .transaction('GET /api/product/:id')
         .timestamp(timestamp)
         .duration(500)
-        .success()
-        .serialize(),
-      ...opbeansNode
+        .success(),
+      opbeansNode
         .transaction('Worker job', 'Worker')
         .timestamp(timestamp)
         .duration(1000)
-        .success()
-        .serialize(),
-      ...opbeansRum
-        .transaction('/')
-        .timestamp(timestamp)
-        .duration(1000)
-        .serialize(),
+        .success(),
+      opbeansRum.transaction('/').timestamp(timestamp).duration(1000),
     ]);
 }
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts
similarity index 86%
rename from x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts
rename to x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts
index 1fade825bc4cb..a74d4ba27610d 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/feature_flag/infrastructure.spec.ts
@@ -35,8 +35,8 @@ describe('Infrastracture feature flag', () => {
     cy.loginAsPowerUser();
   });
 
-  describe('when infrastracture feature is enabled', () => {
-    it('shows the flag as enabled in kibana advanced settings', () => {
+  describe('when infrastracture feature is disabled', () => {
+    it('shows the flag as disabled in kibana advanced settings', () => {
       cy.visit(settingsPath);
 
       cy.get(infraToggle)
@@ -50,8 +50,16 @@ describe('Infrastracture feature flag', () => {
     });
   });
 
-  describe('when infrastracture feature is disabled', () => {
-    it('shows the flag as disabled in kibana advanced settings', () => {
+  describe('when infrastracture feature is enabled', () => {
+    after(() => {
+      // Reverts to default state, which is infrastructureView disabled
+      cy.visit(settingsPath);
+      cy.get(infraToggle).click();
+      cy.contains('Save changes').should('not.be.disabled');
+      cy.contains('Save changes').click();
+    });
+
+    it('shows the flag as enabled in kibana advanced settings', () => {
       cy.visit(settingsPath);
       cy.get(infraToggle).click();
       cy.contains('Save changes').should('not.be.disabled');
@@ -65,6 +73,7 @@ describe('Infrastracture feature flag', () => {
     it('shows infrastructure tab in service overview page', () => {
       cy.visit(serviceOverviewPath);
       cy.contains('a[role="tab"]', 'Infrastructure').click();
+      cy.contains('Infrastructure data coming soon');
     });
   });
 });
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/integration_settings/integration_policy.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/integration_settings/integration_policy.spec.ts
new file mode 100644
index 0000000000000..5cdf21d7ca9de
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/integration_settings/integration_policy.spec.ts
@@ -0,0 +1,138 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+const integrationsPoliciesPath = '/app/integrations/detail/apm/policies';
+const policyName = 'apm-integration';
+const description = 'integration description';
+const host = 'myhost:8200';
+const url = 'http://myhost:8200';
+
+const policyFormFields = [
+  {
+    selector: 'packagePolicyNameInput',
+    value: 'apm-integration',
+    required: true,
+  },
+  {
+    selector: 'packagePolicyDescriptionInput',
+    value: 'apm policy descrtiption',
+    required: false,
+  },
+  {
+    selector: 'packagePolicyHostInput',
+    value: 'myhost:8200',
+    required: true,
+  },
+  {
+    selector: 'packagePolicyUrlInput',
+    value: 'http://myhost:8200',
+    required: true,
+  },
+];
+
+const apisToIntercept = [
+  {
+    endpoint: 'api/fleet/agent_policies*',
+    name: 'fleetAgentPolicies',
+    method: 'POST',
+  },
+  {
+    endpoint: 'api/fleet/agent_status*',
+    name: 'fleetAgentStatus',
+    method: 'GET',
+  },
+  {
+    endpoint: 'api/fleet/package_policies',
+    name: 'fleetPackagePolicies',
+    method: 'POST',
+  },
+];
+
+describe('when navigating to integration page', () => {
+  beforeEach(() => {
+    const integrationsPath = '/app/integrations/browse';
+
+    cy.loginAsPowerUser();
+    cy.visit(integrationsPath);
+
+    // open integration policy form
+    cy.get('[data-test-subj="integration-card:epr:apm:featured').click();
+    cy.contains('Elastic APM in Fleet').click();
+    cy.contains('a', 'APM integration').click();
+    cy.get('[data-test-subj="addIntegrationPolicyButton"]').click();
+  });
+
+  it('checks validators for required fields', () => {
+    const requiredFields = policyFormFields.filter((field) => field.required);
+
+    requiredFields.map((field) => {
+      cy.get(`[data-test-subj="${field.selector}"`).clear();
+      cy.get('[data-test-subj="createPackagePolicySaveButton"').should(
+        'be.disabled'
+      );
+      cy.get(`[data-test-subj="${field.selector}"`).type(field.value);
+    });
+  });
+
+  it('adds a new policy without agent', () => {
+    apisToIntercept.map(({ endpoint, method, name }) => {
+      cy.intercept(method, endpoint).as(name);
+    });
+
+    cy.url().should('include', 'app/fleet/integrations/apm/add-integration');
+    policyFormFields.map((field) => {
+      cy.get(`[data-test-subj="${field.selector}"`).clear().type(field.value);
+    });
+    cy.contains('Save and continue').click();
+    cy.wait('@fleetAgentPolicies');
+    cy.wait('@fleetAgentStatus');
+    cy.wait('@fleetPackagePolicies');
+
+    cy.get('[data-test-subj="confirmModalCancelButton').click();
+
+    cy.url().should('include', '/app/integrations/detail/apm/policies');
+    cy.contains(policyName);
+  });
+
+  it('updates an existing policy', () => {
+    apisToIntercept.map(({ endpoint, method, name }) => {
+      cy.intercept(method, endpoint).as(name);
+    });
+
+    policyFormFields.map((field) => {
+      cy.get(`[data-test-subj="${field.selector}"`)
+        .clear()
+        .type(`${field.value}-new`);
+    });
+
+    cy.contains('Save and continue').click();
+    cy.wait('@fleetAgentPolicies');
+    cy.wait('@fleetAgentStatus');
+    cy.wait('@fleetPackagePolicies');
+
+    cy.get('[data-test-subj="confirmModalCancelButton').click();
+    cy.contains(`${policyName}-new`).click();
+
+    policyFormFields.map((field) => {
+      cy.get(`[data-test-subj="${field.selector}"`)
+        .clear()
+        .type(`${field.value}-updated`);
+    });
+    cy.contains('Save integration').click();
+    cy.contains(`${policyName}-updated`);
+  });
+
+  it('should display Tail-based section on latest version', () => {
+    cy.visit('/app/fleet/integrations/apm/add-integration');
+    cy.contains('Tail-based sampling').should('exist');
+  });
+
+  it('should hide Tail-based section for 8.0.0 apm package', () => {
+    cy.visit('/app/fleet/integrations/apm-8.0.0/add-integration');
+    cy.contains('Tail-based sampling').should('not.exist');
+  });
+});
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/settings/agent_configurations.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/settings/agent_configurations.spec.ts
new file mode 100644
index 0000000000000..ffe036b03a50b
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/settings/agent_configurations.spec.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { apm, timerange } from '@elastic/apm-synthtrace';
+import url from 'url';
+import { synthtrace } from '../../../../synthtrace';
+
+const timeRange = {
+  rangeFrom: '2021-10-10T00:00:00.000Z',
+  rangeTo: '2021-10-10T00:15:00.000Z',
+};
+
+const agentConfigHref = url.format({
+  pathname: '/app/apm/settings/agent-configuration',
+});
+
+function generateData({
+  from,
+  to,
+  serviceName,
+}: {
+  from: number;
+  to: number;
+  serviceName: string;
+}) {
+  const range = timerange(from, to);
+
+  const service1 = apm
+    .service(serviceName, 'production', 'java')
+    .instance('service-1-prod-1')
+    .podId('service-1-prod-1-pod');
+
+  const service2 = apm
+    .service(serviceName, 'development', 'nodejs')
+    .instance('opbeans-node-prod-1');
+
+  return range
+    .interval('1m')
+    .rate(1)
+    .generator((timestamp, index) => [
+      service1
+        .transaction('GET /apple 🍎 ')
+        .timestamp(timestamp)
+        .duration(1000)
+        .success(),
+      service2
+        .transaction('GET /banana 🍌')
+        .timestamp(timestamp)
+        .duration(500)
+        .success(),
+    ]);
+}
+
+describe('Agent configuration', () => {
+  before(async () => {
+    const { rangeFrom, rangeTo } = timeRange;
+
+    await synthtrace.index(
+      generateData({
+        from: new Date(rangeFrom).getTime(),
+        to: new Date(rangeTo).getTime(),
+        serviceName: 'opbeans-node',
+      })
+    );
+  });
+
+  after(async () => {
+    await synthtrace.clean();
+  });
+
+  beforeEach(() => {
+    cy.loginAsPowerUser();
+    cy.visit(agentConfigHref);
+  });
+
+  it('persists service enviroment when clicking on edit button', () => {
+    cy.intercept(
+      'GET',
+      '/api/apm/settings/agent-configuration/environments?*'
+    ).as('serviceEnvironmentApi');
+    cy.contains('Create configuration').click();
+    cy.get('[data-test-subj="serviceNameComboBox"]')
+      .click()
+      .type('opbeans-node')
+      .type('{enter}');
+
+    cy.contains('opbeans-node').realClick();
+    cy.wait('@serviceEnvironmentApi');
+
+    cy.get('[data-test-subj="serviceEnviromentComboBox"]')
+      .click({ force: true })
+      .type('prod')
+      .type('{enter}');
+    cy.contains('production').realClick();
+    cy.contains('Next step').click();
+    cy.contains('Create configuration');
+    cy.contains('Edit').click();
+    cy.wait('@serviceEnvironmentApi');
+    cy.contains('production');
+  });
+});
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/errors/generate_data.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/errors/generate_data.ts
index c2c02d8997153..a65e4e08d198f 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/errors/generate_data.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/errors/generate_data.ts
@@ -21,8 +21,8 @@ export function generateData({ from, to }: { from: number; to: number }) {
   return range
     .interval('2m')
     .rate(1)
-    .spans((timestamp, index) => [
-      ...opbeansJava
+    .generator((timestamp, index) => [
+      opbeansJava
         .transaction('GET /apple 🍎 ')
         .timestamp(timestamp)
         .duration(1000)
@@ -31,13 +31,11 @@ export function generateData({ from, to }: { from: number; to: number }) {
           opbeansJava
             .error(`Error ${index}`, `exception ${index}`)
             .timestamp(timestamp)
-        )
-        .serialize(),
-      ...opbeansNode
+        ),
+      opbeansNode
         .transaction('GET /banana 🍌')
         .timestamp(timestamp)
         .duration(500)
-        .success()
-        .serialize(),
+        .success(),
     ]);
 }
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
index f0f306a538331..50ac9fd81e2ec 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/home.spec.ts
@@ -14,21 +14,15 @@ const end = '2021-10-10T00:15:00.000Z';
 
 const serviceInventoryHref = url.format({
   pathname: '/app/apm/services',
-  query: { rangeFrom: start, rangeTo: end },
-});
-
-const apisToIntercept = [
-  {
-    endpoint: '/internal/apm/service?*',
-    name: 'servicesMainStatistics',
-  },
-  {
-    endpoint: '/internal/apm/services/detailed_statistics?*',
-    name: 'servicesDetailedStatistics',
+  query: {
+    comparisonEnabled: 'true',
+    environment: 'ENVIRONMENT_ALL',
+    rangeFrom: start,
+    rangeTo: end,
+    offset: '1d',
   },
-];
+});
 
-// flaky test
 describe.skip('Home page', () => {
   before(async () => {
     await synthtrace.index(
@@ -47,12 +41,12 @@ describe.skip('Home page', () => {
     cy.loginAsReadOnlyUser();
   });
 
-  it('Redirects to service page with environment, rangeFrom and rangeTo added to the URL', () => {
+  it('Redirects to service page with comparisonEnabled, environment, rangeFrom, rangeTo and offset added to the URL', () => {
     cy.visit('/app/apm');
 
     cy.url().should(
       'include',
-      'app/apm/services?environment=ENVIRONMENT_ALL&rangeFrom=now-15m&rangeTo=now'
+      'app/apm/services?comparisonEnabled=true&environment=ENVIRONMENT_ALL&rangeFrom=now-15m&rangeTo=now&offset=1d'
     );
   });
 
@@ -66,17 +60,11 @@ describe.skip('Home page', () => {
 
   describe('navigations', () => {
     it('navigates to service overview page with transaction type', () => {
-      apisToIntercept.map(({ endpoint, name }) => {
-        cy.intercept('GET', endpoint).as(name);
-      });
-
       cy.visit(serviceInventoryHref);
 
       cy.contains('Services');
+      cy.contains('opbeans-rum').click({ force: true });
 
-      cy.get('[data-test-subj="serviceLink_rum-js"]').then((element) => {
-        element[0].click();
-      });
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'page-load'
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/integration_settings/apm_server_not_installed.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/integration_settings/apm_server_not_installed.ts
deleted file mode 100644
index 354ffa5e42e18..0000000000000
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/integration_settings/apm_server_not_installed.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-const integrationsPath = '/app/integrations/browse';
-
-describe('when navigating to the integrations browse page', () => {
-  beforeEach(() => {
-    cy.loginAsReadOnlyUser();
-    cy.visit(integrationsPath);
-  });
-
-  it('should display Elastic APM integration option', () => {
-    cy.get('[data-test-subj="integration-card:epr:apm:featured').should(
-      'exist'
-    );
-    cy.contains('Elastic APM');
-  });
-
-  describe('when clicking on the Elastic APM option but Fleet is not installed', () => {
-    it('should display Elastic APM in Fleet tab', () => {
-      cy.get('[data-test-subj="integration-card:epr:apm:featured').click();
-      cy.get('[aria-selected="true"]').contains('Elastic APM in Fleet');
-      cy.contains('Elastic APM now available in Fleet!');
-      cy.contains('APM integration');
-    });
-
-    it('should display no APM server detected when checking the apm server status', () => {
-      cy.intercept('POST', '/api/home/hits_status', {
-        count: 0,
-      }).as('hitsStatus');
-
-      cy.get('[data-test-subj="integration-card:epr:apm:featured').click();
-      cy.contains('Check APM Server status').click();
-      cy.wait('@hitsStatus');
-      cy.contains(
-        'No APM Server detected. Please make sure it is running and you have updated to 7.0 or higher.'
-      );
-    });
-  });
-});
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/header_filters/generate_data.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/header_filters/generate_data.ts
index 1e1e6db5ccaf5..94b7ab52f6f70 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/header_filters/generate_data.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/header_filters/generate_data.ts
@@ -29,18 +29,16 @@ export function generateData({
   return range
     .interval('2m')
     .rate(1)
-    .spans((timestamp, index) => [
-      ...service1
+    .generator((timestamp) => [
+      service1
         .transaction('GET /apple 🍎 ')
         .timestamp(timestamp)
         .duration(1000)
-        .success()
-        .serialize(),
-      ...opbeansNode
+        .success(),
+      opbeansNode
         .transaction('GET /banana 🍌')
         .timestamp(timestamp)
         .duration(500)
-        .success()
-        .serialize(),
+        .success(),
     ]);
 }
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts
index ecee9c3c4f63e..0dab9c6f2440f 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_inventory/service_inventory.spec.ts
@@ -37,6 +37,9 @@ const aliasNames = apiRequestsToIntercept.map(
 
 describe('When navigating to the service inventory', () => {
   before(async () => {
+    cy.loginAsReadOnlyUser();
+    cy.visit(serviceInventoryHref);
+
     const { rangeFrom, rangeTo } = timeRange;
     await synthtrace.index(
       opbeans({
@@ -50,11 +53,6 @@ describe('When navigating to the service inventory', () => {
     await synthtrace.clean();
   });
 
-  beforeEach(() => {
-    cy.loginAsReadOnlyUser();
-    cy.visit(serviceInventoryHref);
-  });
-
   it('has no detectable a11y violations on load', () => {
     cy.contains('h1', 'Services');
     // set skipFailures to true to not fail the test when there are accessibility failures
@@ -77,11 +75,14 @@ describe('When navigating to the service inventory', () => {
     cy.contains('h1', 'opbeans-node');
   });
 
-  describe('Calls APIs', () => {
+  describe.skip('Calls APIs', () => {
     beforeEach(() => {
       apiRequestsToIntercept.map(({ endpoint, aliasName }) => {
         cy.intercept('GET', endpoint).as(aliasName);
       });
+
+      cy.loginAsReadOnlyUser();
+      cy.visit(serviceInventoryHref);
     });
 
     it('with the correct environment when changing the environment', () => {
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/aws_lambda/generate_data.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/aws_lambda/generate_data.ts
index fffa3e98a2c66..68dc3f62b5c12 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/aws_lambda/generate_data.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/aws_lambda/generate_data.ts
@@ -24,7 +24,7 @@ export function generateData({ start, end }: { start: number; end: number }) {
   const traceEvents = timerange(start, end)
     .interval('1m')
     .rate(rate)
-    .spans((timestamp) =>
+    .generator((timestamp) =>
       instance
         .transaction(transaction.name)
         .defaults({
@@ -34,7 +34,6 @@ export function generateData({ start, end }: { start: number; end: number }) {
         .timestamp(timestamp)
         .duration(transaction.duration)
         .success()
-        .serialize()
     );
 
   return traceEvents;
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts
index 9caf8ede5e527..e989d5470c4c6 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/header_filters.spec.ts
@@ -69,11 +69,10 @@ describe('Service overview - header filters', () => {
     await synthtrace.clean();
   });
 
-  beforeEach(() => {
-    cy.loginAsReadOnlyUser();
-  });
-
   describe('Filtering by transaction type', () => {
+    beforeEach(() => {
+      cy.loginAsReadOnlyUser();
+    });
     it('changes url when selecting different value', () => {
       cy.visit(serviceOverviewHref);
       cy.contains('opbeans-node');
@@ -95,7 +94,6 @@ describe('Service overview - header filters', () => {
         cy.intercept('GET', endpoint).as(name);
       });
       cy.visit(serviceOverviewHref);
-      cy.contains('opbeans-node');
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'request'
@@ -120,6 +118,9 @@ describe('Service overview - header filters', () => {
   });
 
   describe('Filtering by kuerybar', () => {
+    beforeEach(() => {
+      cy.loginAsReadOnlyUser();
+    });
     it('filters by transaction.name', () => {
       cy.visit(
         url.format({
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts
index 0935d23d02696..48fe14b44c793 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/service_overview.spec.ts
@@ -85,8 +85,7 @@ const aliasNamesWithComparison = apiRequestsToInterceptWithComparison.map(
 
 const aliasNames = [...aliasNamesNoComparison, ...aliasNamesWithComparison];
 
-// flaky test
-describe.skip('Service Overview', () => {
+describe('Service Overview', () => {
   before(async () => {
     await synthtrace.index(
       opbeans({
@@ -127,6 +126,12 @@ describe.skip('Service Overview', () => {
     });
 
     it('persists transaction type selected when clicking on Transactions tab', () => {
+      cy.intercept(
+        'GET',
+        '/internal/apm/services/opbeans-node/transaction_types?*'
+      ).as('transactionTypesRequest');
+      cy.wait('@transactionTypesRequest');
+
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'request'
@@ -144,6 +149,11 @@ describe.skip('Service Overview', () => {
     });
 
     it('persists transaction type selected when clicking on View Transactions link', () => {
+      cy.intercept(
+        'GET',
+        '/internal/apm/services/opbeans-node/transaction_types?*'
+      ).as('transactionTypesRequest');
+      cy.wait('@transactionTypesRequest');
       cy.get('[data-test-subj="headerFilterTransactionType"]').should(
         'have.value',
         'request'
@@ -238,14 +248,11 @@ describe.skip('Service Overview', () => {
     });
 
     it('when selecting a different comparison window', () => {
-      cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+      cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
 
       // selects another comparison type
-      cy.get('[data-test-subj="comparisonSelect"]').select('week');
-      cy.get('[data-test-subj="comparisonSelect"]').should(
-        'have.value',
-        'week'
-      );
+      cy.get('[data-test-subj="comparisonSelect"]').select('1w');
+      cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1w');
       cy.expectAPIsToHaveBeenCalledWith({
         apisIntercepted: aliasNamesWithComparison,
         value: 'offset',
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts
index f844969850b84..cd2d2c064bdc6 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/service_overview/time_comparison.spec.ts
@@ -50,7 +50,6 @@ const apisToIntercept = [
   },
 ];
 
-// Skipping tests since it's flaky.
 describe.skip('Service overview: Time Comparison', () => {
   before(async () => {
     await synthtrace.index(
@@ -71,7 +70,8 @@ describe.skip('Service overview: Time Comparison', () => {
 
   it('enables by default the time comparison feature with Last 24 hours selected', () => {
     cy.visit(serviceOverviewPath);
-    cy.url().should('include', 'comparisonEnabled=true&offset=1d');
+    cy.url().should('include', 'comparisonEnabled=true');
+    cy.url().should('include', 'offset=1d');
   });
 
   describe('when comparison is toggled off', () => {
@@ -92,7 +92,6 @@ describe.skip('Service overview: Time Comparison', () => {
         cy.intercept('GET', endpoint).as(name);
       });
       cy.visit(serviceOverviewHref);
-      cy.contains('opbeans-java');
 
       cy.get('[data-test-subj="comparisonSelect"]').should('be.enabled');
       const offset = `offset=1d`;
@@ -106,6 +105,8 @@ describe.skip('Service overview: Time Comparison', () => {
         }
       );
 
+      cy.contains('opbeans-java');
+
       // toggles off comparison
       cy.contains('Comparison').click();
       cy.get('[data-test-subj="comparisonSelect"]').should('be.disabled');
@@ -127,32 +128,52 @@ describe.skip('Service overview: Time Comparison', () => {
     cy.visit(serviceOverviewPath);
     cy.contains('opbeans-java');
     // opens the page with "Day before" selected
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
 
     // selects another comparison type
-    cy.get('[data-test-subj="comparisonSelect"]').select('week');
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'week');
+    cy.get('[data-test-subj="comparisonSelect"]').select('1w');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1w');
   });
 
   it('changes comparison type when a new time range is selected', () => {
-    cy.visit(serviceOverviewPath);
+    cy.visit(serviceOverviewHref);
     cy.contains('opbeans-java');
     // Time comparison default value
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
     cy.contains('Day before');
     cy.contains('Week before');
 
+    cy.selectAbsoluteTimeRange(
+      '2021-10-10T00:00:00.000Z',
+      '2021-10-20T00:00:00.000Z'
+    );
+
+    cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
+
+    cy.get('[data-test-subj="comparisonSelect"]').should(
+      'have.value',
+      '864000000ms'
+    );
+    cy.get('[data-test-subj="comparisonSelect"]').should(
+      'not.contain.text',
+      'Day before'
+    );
+    cy.get('[data-test-subj="comparisonSelect"]').should(
+      'not.contain.text',
+      'Week before'
+    );
+
     cy.changeTimeRange('Today');
     cy.contains('Day before');
     cy.contains('Week before');
 
     cy.changeTimeRange('Last 24 hours');
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'day');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1d');
     cy.contains('Day before');
     cy.contains('Week before');
 
     cy.changeTimeRange('Last 7 days');
-    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', 'week');
+    cy.get('[data-test-subj="comparisonSelect"]').should('have.value', '1w');
     cy.get('[data-test-subj="comparisonSelect"]').should(
       'contain.text',
       'Week before'
@@ -162,20 +183,6 @@ describe.skip('Service overview: Time Comparison', () => {
       'Day before'
     );
     cy.contains('Week before');
-
-    cy.changeTimeRange('Last 30 days');
-    cy.get('[data-test-subj="comparisonSelect"]').should(
-      'have.value',
-      'period'
-    );
-    cy.get('[data-test-subj="comparisonSelect"]').should(
-      'not.contain.text',
-      'Day before'
-    );
-    cy.get('[data-test-subj="comparisonSelect"]').should(
-      'not.contain.text',
-      'Week before'
-    );
   });
 
   it('hovers over throughput chart shows previous and current period', () => {
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/plugins/index.ts b/x-pack/plugins/apm/ftr_e2e/cypress/plugins/index.ts
index 093ededbcc247..25b29e080b2c2 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/plugins/index.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/plugins/index.ts
@@ -7,8 +7,8 @@
 import {
   apm,
   createLogger,
+  EntityArrayIterable,
   LogLevel,
-  SpanArrayIterable,
 } from '@elastic/apm-synthtrace';
 import { createEsClientForTesting } from '@kbn/test';
 
@@ -38,16 +38,18 @@ const plugin: Cypress.PluginConfig = (on, config) => {
     isCloud: !!config.env.TEST_CLOUD,
   });
 
-  const forceDataStreams = false;
   const synthtraceEsClient = new apm.ApmSynthtraceEsClient(
     client,
     createLogger(LogLevel.info),
-    forceDataStreams
+    {
+      forceLegacyIndices: true,
+      refreshAfterIndex: true,
+    }
   );
 
   on('task', {
     'synthtrace:index': async (events: Array<Record<string, any>>) => {
-      await synthtraceEsClient.index(new SpanArrayIterable(events));
+      await synthtraceEsClient.index(new EntityArrayIterable(events));
       return null;
     },
     'synthtrace:clean': async () => {
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts b/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts
index 98bad66b1cc76..8e61908f56e0e 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts
@@ -53,12 +53,12 @@ Cypress.Commands.add(
     cy.get('[data-test-subj="superDatePickerstartDatePopoverButton"]').click();
     cy.get('[data-test-subj="superDatePickerAbsoluteDateInput"]')
       .eq(0)
-      .clear()
+      .clear({ force: true })
       .type(moment(start).format(format), { force: true });
     cy.get('[data-test-subj="superDatePickerendDatePopoverButton"]').click();
     cy.get('[data-test-subj="superDatePickerAbsoluteDateInput"]')
       .eq(1)
-      .clear()
+      .clear({ force: true })
       .type(moment(end).format(format), { force: true });
   }
 );
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts b/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts
index e2025c01d4c7a..5f5d1eb3b3614 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/support/index.ts
@@ -6,11 +6,7 @@
  */
 
 Cypress.on('uncaught:exception', (err, runnable) => {
-  // @see https://stackoverflow.com/a/50387233/434980
-  // ResizeObserver error can be safely ignored
-  if (err.message.includes('ResizeObserver loop limit exceeded')) {
-    return false;
-  }
+  return false;
 });
 
 import './commands';
diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts b/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
index aa56557c09df8..b87f35adcccf2 100644
--- a/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
+++ b/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
@@ -7,6 +7,4 @@
 
 import { GenericFtrProviderContext } from '@kbn/test';
 
-import { services } from './services';
-
-export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
+export type FtrProviderContext = GenericFtrProviderContext<{}, {}>;
diff --git a/x-pack/plugins/apm/ftr_e2e/synthtrace.ts b/x-pack/plugins/apm/ftr_e2e/synthtrace.ts
index 775951dfe85c7..1d4559bf174e6 100644
--- a/x-pack/plugins/apm/ftr_e2e/synthtrace.ts
+++ b/x-pack/plugins/apm/ftr_e2e/synthtrace.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SpanIterable } from '@elastic/apm-synthtrace';
+import { EntityIterable } from '@elastic/apm-synthtrace';
 
 export const synthtrace = {
-  index: (events: SpanIterable) =>
+  index: (events: EntityIterable) =>
     new Promise((resolve) => {
       cy.task('synthtrace:index', events.toArray()).then(resolve);
     }),
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 8b5ac68f07a22..3917fd601d75e 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -35,7 +35,6 @@
   "configPath": ["xpack", "apm"],
   "requiredBundles": [
     "fleet",
-    "home",
     "kibanaReact",
     "kibanaUtils",
     "ml",
diff --git a/x-pack/plugins/apm/public/application/application.test.tsx b/x-pack/plugins/apm/public/application/application.test.tsx
index 5a7df0708caed..dd74d072c306d 100644
--- a/x-pack/plugins/apm/public/application/application.test.tsx
+++ b/x-pack/plugins/apm/public/application/application.test.tsx
@@ -9,13 +9,13 @@ import React from 'react';
 import { act } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import { Observable } from 'rxjs';
-import { AppMountParameters, DocLinksStart, HttpStart } from 'src/core/public';
+import { AppMountParameters, DocLinksStart, HttpStart } from '@kbn/core/public';
 import { mockApmPluginContextValue } from '../context/apm_plugin/mock_apm_plugin_context';
 import { createCallApmApi } from '../services/rest/create_call_apm_api';
-import { renderApp as renderApmApp } from './';
+import { renderApp as renderApmApp } from '.';
 import { disableConsoleWarning } from '../utils/test_helpers';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 
 jest.mock('../services/rest/data_view', () => ({
diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
index 5fd8697a1352b..19e16237c1272 100644
--- a/x-pack/plugins/apm/public/application/index.tsx
+++ b/x-pack/plugins/apm/public/application/index.tsx
@@ -8,20 +8,20 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import 'react-vis/dist/style.css';
-import type { ObservabilityRuleTypeRegistry } from '../../../observability/public';
-import { ConfigSchema } from '../';
+import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
 import {
   AppMountParameters,
   CoreStart,
   APP_WRAPPER_CLASS,
-} from '../../../../../src/core/public';
+} from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ConfigSchema } from '..';
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 import { createCallApmApi } from '../services/rest/create_call_apm_api';
 import { createStaticDataView } from '../services/rest/data_view';
 import { setHelpExtension } from '../set_help_extension';
 import { setReadonlyBadge } from '../update_badge';
 import { ApmAppRoot } from '../components/routing/app_root';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 
 /**
  * This module is rendered asynchronously in the Kibana platform.
diff --git a/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx b/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
index 84a5eeccd3228..110f00fe0d0cf 100644
--- a/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/alerting_flyout/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   AlertType,
   APM_SERVER_FEATURE_ID,
diff --git a/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx b/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
index 2015bf2228b6c..67ea6e8d568f1 100644
--- a/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
@@ -21,9 +21,9 @@ import {
 } from '@elastic/charts';
 import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { Coordinate } from '../../../../typings/timeseries';
 import { useTheme } from '../../../hooks/use_theme';
-import { IUiSettingsClient } from '../../../../../../../src/core/public';
 import { getTimeZone } from '../../shared/charts/helper/timezone';
 
 interface ChartPreviewProps {
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx
index 3f3eb0becdc26..fb4f777c1f19e 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/error_count_alert_trigger.stories.tsx
@@ -7,9 +7,9 @@
 
 import { Meta, Story } from '@storybook/react';
 import React, { useState } from 'react';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { RuleParams, ErrorCountAlertTrigger } from '.';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
 
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
index 5a59a6902b368..63fa0ca5f8fc9 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { defaults, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ForLastExpression } from '@kbn/triggers-actions-ui-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { asInteger } from '../../../../common/utils/formatters';
 import { useFetcher } from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts
index 7fabd1c1ff87a..e82cedda7ef62 100644
--- a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts
+++ b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'kibana/public';
+import { Capabilities } from '@kbn/core/public';
 import { ApmPluginSetupDeps } from '../../plugin';
 import { getAlertingCapabilities } from './get_alerting_capabilities';
 
diff --git a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
index aaa3dc55f38fc..af0cf2c19dc0f 100644
--- a/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
+++ b/x-pack/plugins/apm/public/components/alerting/get_alerting_capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'kibana/public';
+import { Capabilities } from '@kbn/core/public';
 import { ApmPluginSetupDeps } from '../../plugin';
 
 export const getAlertingCapabilities = (
diff --git a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
index 69ed7d73c3115..2e94ba483faec 100644
--- a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { lazy } from 'react';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import type { ObservabilityRuleTypeRegistry } from '../../../../observability/public';
+import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
 import {
   getAlertUrlErrorCount,
   getAlertUrlTransaction,
diff --git a/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx b/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx
index 7ca4024e58286..a5c516f17546b 100644
--- a/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/service_alert_trigger/service_alert_trigger.test.tsx
@@ -8,7 +8,7 @@
 import { render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { ServiceAlertTrigger } from './';
+import { ServiceAlertTrigger } from '.';
 
 function Wrapper({ children }: { children?: ReactNode }) {
   return <MemoryRouter>{children}</MemoryRouter>;
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
index de9f018fa3d97..576f4637aa1d5 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.stories.tsx
@@ -7,9 +7,9 @@
 
 import { Story } from '@storybook/react';
 import React, { ComponentType, useState } from 'react';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { RuleParams, TransactionDurationAlertTrigger } from '.';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
 
 const KibanaReactContext = createKibanaReactContext({
   notifications: { toasts: { add: () => {} } },
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
index dceb8bf7ff07c..e6745a70a5cd6 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
@@ -9,9 +9,9 @@ import { EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { defaults, map, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ForLastExpression } from '@kbn/triggers-actions-ui-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { getDurationFormatter } from '../../../../common/utils/formatters';
 import { useFetcher } from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx
index 392adb9c589a4..6a580339e0268 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_anomaly_alert_trigger/index.tsx
@@ -8,8 +8,8 @@
 import { i18n } from '@kbn/i18n';
 import { defaults, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { ANOMALY_SEVERITY } from '../../../../common/ml_constants';
 import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
index 8f638d6de7557..fdc2be4e5c969 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
@@ -7,9 +7,9 @@
 
 import { defaults, omit } from 'lodash';
 import React, { useEffect } from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ForLastExpression } from '@kbn/triggers-actions-ui-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import { asPercent } from '../../../../common/utils/formatters';
 import { useFetcher } from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx
index f471777d965ef..34b2184321f5f 100644
--- a/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/backend_inventory/backend_inventory_dependencies_table/index.tsx
@@ -8,7 +8,7 @@
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getNodeName, NodeType } from '../../../../../common/connections';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx b/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
index a530b950cf061..8bb1933f84955 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx
@@ -11,8 +11,8 @@ import { EuiBasicTable, EuiBasicTableColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/table_types';
 import type { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
-import { useUiTracker } from '../../../../../observability/public';
 import { useTheme } from '../../../hooks/use_theme';
 import type { FieldValuePair } from '../../../../common/correlations/types';
 
diff --git a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
index c970838f8b8c3..c689c06ec45a4 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx
@@ -26,7 +26,7 @@ import type { Direction } from '@elastic/eui/src/services/sort/sort_direction';
 
 import { i18n } from '@kbn/i18n';
 
-import { useUiTracker } from '../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 
 import {
   asPercent,
diff --git a/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts b/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts
index 12799e5edc726..eafead65fb77f 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts
+++ b/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import type { HistogramItem } from '../../../../common/correlations/types';
 import { TransactionDistributionChartData } from '../../shared/charts/transaction_distribution_chart';
 import { LatencyCorrelation } from '../../../../common/correlations/latency_correlations/types';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx
index 5bf7e30a3df5d..ce2469a5ab40e 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx
@@ -12,12 +12,12 @@ import { of } from 'rxjs';
 
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { merge } from 'lodash';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import type { IKibanaSearchResponse } from 'src/plugins/data/public';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import type { IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import type { LatencyCorrelationsResponse } from '../../../../common/correlations/latency_correlations/types';
 import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
index f3734dae5d247..f4efe77b0ca6d 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
+++ b/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx
@@ -25,7 +25,7 @@ import { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/tab
 import { i18n } from '@kbn/i18n';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useUiTracker } from '../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 
 import { asPreciseDecimal } from '../../../../common/utils/formatters';
 import { LatencyCorrelation } from '../../../../common/correlations/latency_correlations/types';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts b/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts
index 26f63e1ab0c59..e95eca4cf0417 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts
+++ b/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts
@@ -8,7 +8,7 @@
 import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
 import { chunk, debounce } from 'lodash';
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 import { EVENT_OUTCOME } from '../../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../../common/event_outcome';
diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts b/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts
index 428fdcda7cfc6..910dad59e4e61 100644
--- a/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts
+++ b/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts
@@ -8,7 +8,7 @@
 import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
 import { chunk, debounce } from 'lodash';
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 import {
   DEBOUNCE_INTERVAL,
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx
index c280f90f0c0fa..a6743f5b7d768 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import { mockMoment } from '../../../../utils/test_helpers';
-import { DetailView } from './index';
+import { DetailView } from '.';
 
 describe('DetailView', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx
index a0dbbb552d8cd..03c866dcc7f06 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/detail_view/index.tsx
@@ -18,7 +18,7 @@ import { i18n } from '@kbn/i18n';
 import { first } from 'lodash';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import type { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import type { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
 import type { ApmUrlParams } from '../../../../context/url_params_context/types';
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx
index 67d22aaf6740a..84c7f21502a51 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx
@@ -6,12 +6,12 @@
  */
 
 import React, { ComponentType } from 'react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   ApmPluginContext,
   ApmPluginContextValue,
 } from '../../../../context/apm_plugin/apm_plugin_context';
-import { ErrorDistribution } from './';
+import { ErrorDistribution } from '.';
 import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 
 export default {
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
index 071ef02922c4b..bac23d55099a5 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
 import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
 import { useBreadcrumb } from '../../../context/breadcrumbs/use_breadcrumb';
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx
index 6e86c8c951710..cf5c4b7139649 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx
@@ -13,9 +13,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { asInteger } from '../../../../../common/utils/formatters';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
 import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import { truncate, unit } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx b/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx
index 930cece64f96a..57f4197476244 100644
--- a/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx
+++ b/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx
@@ -16,7 +16,7 @@ import {
   EuiPopoverTitle,
   EuiText,
 } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 const PopoverContent = euiStyled(EuiText)`
   max-width: 480px;
diff --git a/x-pack/plugins/apm/public/components/app/service_groups/index.tsx b/x-pack/plugins/apm/public/components/app/service_groups/index.tsx
index d62ecd6281191..13271d6291830 100644
--- a/x-pack/plugins/apm/public/components/app/service_groups/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_groups/index.tsx
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { ServiceGroupsList } from './service_groups_list/.';
-export { ServiceGroupSaveButton } from './service_group_save/.';
+export { ServiceGroupsList } from './service_groups_list';
+export { ServiceGroupSaveButton } from './service_group_save';
diff --git a/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx b/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx
index c578f021bd17e..0dfb9b6efd1a0 100644
--- a/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useRef } from 'react';
 import { Subject, Subscription } from 'rxjs';
 
-const refreshServiceGroupsSubject = new Subject();
+const refreshServiceGroupsSubject = new Subject<void>();
 
 export function refreshServiceGroups() {
   refreshServiceGroupsSubject.next();
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
index 082ab1733547e..5d6dfef10d9dc 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
@@ -9,6 +9,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiEmptyPrompt } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import uuid from 'uuid';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { apmServiceInventoryOptimizedSorting } from '@kbn/observability-plugin/common';
 import { useAnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
 import { useLocalStorage } from '../../../hooks/use_local_storage';
 import { useApmParams } from '../../../hooks/use_apm_params';
@@ -18,8 +20,6 @@ import { SearchBar } from '../../shared/search_bar';
 import { ServiceList } from './service_list';
 import { MLCallout, shouldDisplayMlCallout } from '../../shared/ml_callout';
 import { joinByKey } from '../../../../common/utils/join_by_key';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { apmServiceInventoryOptimizedSorting } from '../../../../../observability/common';
 import { ServiceInventoryFieldName } from '../../../../common/service_inventory';
 import { orderServiceItems } from './service_list/order_service_items';
 
@@ -141,11 +141,21 @@ export function ServiceInventory() {
     !userHasDismissedCallout &&
     shouldDisplayMlCallout(anomalyDetectionSetupState);
 
-  const isLoading =
-    sortedAndFilteredServicesFetch.status === FETCH_STATUS.LOADING ||
-    (sortedAndFilteredServicesFetch.status === FETCH_STATUS.SUCCESS &&
-      sortedAndFilteredServicesFetch.data?.services.length === 0 &&
-      mainStatisticsFetch.status === FETCH_STATUS.LOADING);
+  const useOptimizedSorting = useKibana().services.uiSettings?.get<boolean>(
+    apmServiceInventoryOptimizedSorting
+  );
+
+  let isLoading: boolean;
+
+  if (useOptimizedSorting) {
+    isLoading =
+      sortedAndFilteredServicesFetch.status === FETCH_STATUS.LOADING ||
+      (sortedAndFilteredServicesFetch.status === FETCH_STATUS.SUCCESS &&
+        sortedAndFilteredServicesFetch.data?.services.length === 0 &&
+        mainStatisticsFetch.status === FETCH_STATUS.LOADING);
+  } else {
+    isLoading = mainStatisticsFetch.status === FETCH_STATUS.LOADING;
+  }
 
   const isFailure = mainStatisticsFetch.status === FETCH_STATUS.FAILURE;
   const noItemsMessage = (
@@ -169,9 +179,7 @@ export function ServiceInventory() {
     ...preloadedServices,
   ].some((item) => 'healthStatus' in item);
 
-  const tiebreakerField = useKibana().services.uiSettings?.get<boolean>(
-    apmServiceInventoryOptimizedSorting
-  )
+  const tiebreakerField = useOptimizedSorting
     ? ServiceInventoryFieldName.ServiceName
     : ServiceInventoryFieldName.Throughput;
 
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx
index 61e4f2b3ae766..cbda5f9d3ccfd 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx
@@ -8,15 +8,15 @@
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { AnomalyDetectionSetupState } from '../../../../common/anomaly_detection/get_anomaly_detection_setup_state';
 import { AnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
-import { ServiceInventory } from './';
+import { ServiceInventory } from '.';
 
 const stories: Meta<{}> = {
   title: 'app/ServiceInventory',
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx
index 290f1e6b69b77..5073bd72381e2 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx
@@ -8,13 +8,13 @@
 import { Meta, Story } from '@storybook/react';
 import React, { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { ServiceHealthStatus } from '../../../../../common/service_health_status';
 import { ServiceInventoryFieldName } from '../../../../../common/service_inventory';
 import type { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
-import { ServiceList } from './';
+import { ServiceList } from '.';
 import { items } from './__fixtures__/service_api_mock_data';
 
 type Args = ComponentProps<typeof ServiceList>;
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx
index 5a781cf00336a..df06c3d8c485d 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx
@@ -10,7 +10,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { Breakpoints } from '../../../../hooks/use_breakpoints';
-import { getServiceColumns } from './';
+import { getServiceColumns } from '.';
 import * as stories from './service_list.stories';
 import * as timeSeriesColor from '../../../shared/charts/helper/get_timeseries_color';
 
diff --git a/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts b/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts
index 74a49d06d761b..d8d2b1de4d302 100644
--- a/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts
+++ b/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getInfrastructureKQLFilter } from './';
+import { getInfrastructureKQLFilter } from '.';
 
 describe('service logs', () => {
   const serviceName = 'opbeans-node';
diff --git a/x-pack/plugins/apm/public/components/app/service_logs/index.tsx b/x-pack/plugins/apm/public/components/app/service_logs/index.tsx
index 2cd94bf5de207..93f3b3a3a2f27 100644
--- a/x-pack/plugins/apm/public/components/app/service_logs/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_logs/index.tsx
@@ -10,9 +10,9 @@ import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
+import { LogStream } from '@kbn/infra-plugin/public';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
 import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
-import { LogStream } from '../../../../../infra/public';
 import { APIReturnType } from '../../../services/rest/create_call_apm_api';
 
 import {
diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
index b3615c7fcc42f..e8cdd733eaef6 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
@@ -17,11 +17,11 @@ import {
 } from '@elastic/eui';
 import { Meta, Story } from '@storybook/react';
 import React, { useEffect, useState } from 'react';
-import { CoreStart } from '../../../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import {
   CodeEditor,
   createKibanaReactContext,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { Cytoscape } from '../cytoscape';
 import { Centerer } from './centerer';
 import exampleResponseHipsterStore from './example_response_hipster_store.json';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx b/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
index 90d4179cba466..6aea9b6939b5b 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/controls.tsx
@@ -8,7 +8,7 @@
 import { EuiButtonIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext, useEffect, useState } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { useTheme } from '../../../hooks/use_theme';
 import { getLegacyApmHref } from '../../shared/links/apm/apm_link';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts b/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
index e137f2dbb0f78..c04fb31613d33 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
+++ b/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
@@ -7,7 +7,7 @@
 
 import cytoscape from 'cytoscape';
 import { CSSProperties } from 'react';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { ServiceAnomalyStats } from '../../../../common/anomaly_detection';
 import {
   SERVICE_NAME,
@@ -98,7 +98,7 @@ const zIndexEdgeHighlight = 110;
 const zIndexEdgeHover = 120;
 
 export const getNodeHeight = (theme: EuiTheme): number =>
-  parseInt(theme.eui.avatarSizing.l.size, 10);
+  parseInt(theme.eui.euiSizeXXL, 10);
 
 function isService(el: cytoscape.NodeSingular) {
   return el.data(SERVICE_NAME) !== undefined;
@@ -156,7 +156,7 @@ const getStyle = (theme: EuiTheme): cytoscape.Stylesheet[] => {
         'text-max-width': '200px',
         'text-valign': 'bottom',
         'text-wrap': 'ellipsis',
-        width: theme.eui.avatarSizing.l.size,
+        width: theme.eui.euiSizeXXL,
         'z-index': zIndexNode,
       },
     },
diff --git a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
index 684082e90cf15..bf076b56bc373 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx
@@ -8,7 +8,7 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CytoscapeContext } from './cytoscape';
 import { useTheme } from '../../../hooks/use_theme';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
index 796be0659e617..b844ff2cff098 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
@@ -7,11 +7,11 @@
 
 import { render } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React, { ReactNode } from 'react';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
-import { License } from '../../../../../licensing/common/license';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { License } from '@kbn/licensing-plugin/common/license';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { LicenseContext } from '../../../context/license/license_context';
 import * as useFetcherModule from '../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx
index dd728be30c71a..f10d557b845cb 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx
@@ -14,7 +14,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   getSeverity,
   ServiceAnomalyStats,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx
index 3b50913d49648..ffff0fa9d56d0 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/backend_contents.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import { METRIC_TYPE } from '@kbn/analytics';
 import React from 'react';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { ContentsProps } from '.';
 import { useAnyOfApmParams } from '../../../../hooks/use_apm_params';
 import { useApmRouter } from '../../../../hooks/use_apm_router';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx
index c8ab7a653b201..a564e0419046f 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx
@@ -12,8 +12,8 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import React, { Fragment } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ContentsProps } from '.';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import {
   SPAN_DESTINATION_SERVICE_RESOURCE,
   SPAN_TYPE,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx
index bd2d897ea2752..44429ad67a141 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx
@@ -7,11 +7,11 @@
 
 import { Meta, Story } from '@storybook/react';
 import cytoscape from 'cytoscape';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { Popover } from '.';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx
index e0cfb8f16f61d..78d23e3ebf8dd 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx
@@ -11,8 +11,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import type { ContentsProps } from '.';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import {
   SPAN_SUBTYPE,
   SPAN_TYPE,
diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
index 3deb1f49cf188..21a65b5dc090b 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
@@ -8,12 +8,12 @@
 import { renderHook } from '@testing-library/react-hooks';
 import cytoscape from 'cytoscape';
 import dagre from 'cytoscape-dagre';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useCytoscapeEventHandlers } from './use_cytoscape_event_handlers';
 import lodash from 'lodash';
 
-jest.mock('../../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public');
 
 cytoscape.use(dagre);
 
diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
index 5510025c158d6..cce9972aa91c9 100644
--- a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
+++ b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
@@ -8,8 +8,8 @@
 import cytoscape from 'cytoscape';
 import { debounce } from 'lodash';
 import { useEffect } from 'react';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getAnimationOptions, getNodeHeight } from './cytoscape_options';
 
 /*
diff --git a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
index 0bf38d9d57e3f..9e4fb9b67509f 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
@@ -19,7 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   getServiceNodeName,
   SERVICE_NODE_NAME_MISSING,
diff --git a/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
index 9c14c683018e8..bb7ee9115dd53 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx
@@ -7,7 +7,7 @@
 import { EuiToolTip, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   getServiceNodeName,
   SERVICE_NODE_NAME_MISSING,
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx
index b4a68e381f422..eb2febf0c3a95 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx
@@ -8,15 +8,15 @@
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import type { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import type { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import type { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import {
   APMServiceContext,
   APMServiceContextValue,
 } from '../../../context/apm_service/apm_service_context';
-import { ServiceOverview } from './';
+import { ServiceOverview } from '.';
 
 const stories: Meta<{}> = {
   title: 'app/ServiceOverview',
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
index 4e912d7a0a453..7cb1dad9f091f 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
@@ -9,7 +9,7 @@ import { EuiIcon, EuiToolTip } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getNodeName, NodeType } from '../../../../../common/connections';
 import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
 import { useApmParams } from '../../../../hooks/use_apm_params';
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx
index 2e7883be350b6..e20273c24767f 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/get_columns.tsx
@@ -9,7 +9,7 @@ import { EuiBasicTableColumn, RIGHT_ALIGNMENT } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { asInteger } from '../../../../../common/utils/formatters';
 import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import { truncate } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx
index 26a117224ace1..978c168de418c 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx
@@ -12,7 +12,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
-import { ActionMenu } from '../../../../../../observability/public';
+import { ActionMenu } from '@kbn/observability-plugin/public';
 import { isJavaAgentName } from '../../../../../common/agent_name';
 import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
 import {
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
index 932f2f5d215e7..fd8b43700f9b6 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
@@ -14,7 +14,7 @@ import {
   SectionLinks,
   SectionSubtitle,
   SectionTitle,
-} from '../../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { isJavaAgentName } from '../../../../../../common/agent_name';
 import { SERVICE_NODE_NAME } from '../../../../../../common/elasticsearch_fieldnames';
 import { useApmPluginContext } from '../../../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
index 360b918516665..decc23e053565 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import moment from 'moment';
 import { APIReturnType } from '../../../../../services/rest/create_call_apm_api';
 import { getInfraHref } from '../../../../shared/links/infra_link';
diff --git a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx
index e1739d3ba8b91..1c92d6831e87f 100644
--- a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_flamegraph.tsx
@@ -30,8 +30,8 @@ import { find, sumBy } from 'lodash';
 import { rgba } from 'polished';
 import React, { useMemo, useState } from 'react';
 import seedrandom from 'seedrandom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useChartTheme } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import {
   getValueTypeConfig,
   ProfileNode,
diff --git a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx
index a625d87f05d9c..1801cbc365f35 100644
--- a/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_profiling/service_profiling_timeline.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useChartTheme } from '../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import {
   getValueTypeConfig,
   ProfilingValueType,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx
index 1b43a85addb05..e8d9f1f9cef38 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx
@@ -7,11 +7,11 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { AgentConfiguration } from '../../../../../../common/agent_configuration/configuration_types';
 import { FETCH_STATUS } from '../../../../../hooks/use_fetcher';
 import { createCallApmApi } from '../../../../../services/rest/create_call_apm_api';
-import { AgentConfigurationCreateEdit } from './index';
+import { AgentConfigurationCreateEdit } from '.';
 import {
   ApmPluginContext,
   ApmPluginContextValue,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx
index be716042a63ce..bfde04af12b94 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import React, { useState, useEffect } from 'react';
-import { i18n } from '@kbn/i18n';
 import {
-  EuiDescribedFormGroup,
+  EuiComboBox,
   EuiComboBoxOptionOption,
+  EuiDescribedFormGroup,
   EuiFormRow,
-  EuiComboBox,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React, { useMemo } from 'react';
 interface Props {
   title: string;
   description: string;
@@ -22,6 +22,7 @@ interface Props {
   isDisabled: boolean;
   value?: string;
   onChange: (value?: string) => void;
+  dataTestSubj?: string;
 }
 
 export function FormRowSelect({
@@ -32,23 +33,21 @@ export function FormRowSelect({
   options,
   isDisabled,
   onChange,
+  value,
+  dataTestSubj,
 }: Props) {
-  const [selectedOptions, setSelected] = useState<
-    Array<EuiComboBoxOptionOption<string>> | undefined
-  >([]);
+  const selectedOptions = useMemo(() => {
+    const optionFound = options?.find((option) => option.value === value);
+    return optionFound ? [optionFound] : undefined;
+  }, [options, value]);
 
   const handleOnChange = (
     nextSelectedOptions: Array<EuiComboBoxOptionOption<string>>
   ) => {
     const [selectedOption] = nextSelectedOptions;
-    setSelected(nextSelectedOptions);
     onChange(selectedOption.value);
   };
 
-  useEffect(() => {
-    setSelected(undefined);
-  }, [isLoading]);
-
   return (
     <EuiDescribedFormGroup
       fullWidth
@@ -68,6 +67,7 @@ export function FormRowSelect({
             'xpack.apm.agentConfig.servicePage.environment.placeholder',
             { defaultMessage: 'Select Option' }
           )}
+          data-test-subj={dataTestSubj}
         />
       </EuiFormRow>
     </EuiDescribedFormGroup>
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx
index f3f680ff4a9ff..5fa3a46b00901 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx
@@ -19,6 +19,7 @@ interface Props {
   value?: string;
   allowAll?: boolean;
   onChange: (value?: string) => void;
+  dataTestSubj?: string;
 }
 
 export function FormRowSuggestionsSelect({
@@ -29,6 +30,7 @@ export function FormRowSuggestionsSelect({
   value,
   allowAll = true,
   onChange,
+  dataTestSubj,
 }: Props) {
   return (
     <EuiDescribedFormGroup
@@ -47,6 +49,7 @@ export function FormRowSuggestionsSelect({
             'xpack.apm.agentConfig.servicePage.service.placeholder',
             { defaultMessage: 'Select Option' }
           )}
+          dataTestSubj={dataTestSubj}
         />
       </EuiFormRow>
     </EuiDescribedFormGroup>
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx
index 9f8d3ca1318b5..1ede5cd5405c7 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx
@@ -105,6 +105,7 @@ export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
             service: { name, environment: '' },
           }));
         }}
+        dataTestSubj="serviceNameComboBox"
       />
       {/* Environment options */}
       <FormRowSelect
@@ -135,6 +136,7 @@ export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
             service: { name: prev.service.name, environment },
           }));
         }}
+        dataTestSubj="serviceEnviromentComboBox"
       />
       <EuiSpacer />
       <EuiFlexGroup justifyContent="flexEnd">
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts
index 6594a30bf2bdf..add3d1d870bb1 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { AgentConfigurationIntake } from '../../../../../../../common/agent_configuration/configuration_types';
 import {
   getOptionLabel,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx
index 19c18bac8d5b1..f4e8f52cdc1df 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx
@@ -23,7 +23,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useMemo, useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { useUiTracker } from '../../../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { getOptionLabel } from '../../../../../../../common/agent_configuration/all_option';
 import { AgentConfigurationIntake } from '../../../../../../../common/agent_configuration/configuration_types';
 import {
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx
index 341cba5826bf3..dd644d89efeef 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState } from 'react';
 import { EuiConfirmModal } from '@elastic/eui';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { getOptionLabel } from '../../../../../../common/agent_configuration/all_option';
 import {
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx
index 08d26569b8ece..ad75c7ff60edf 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx
@@ -6,12 +6,12 @@
  */
 import { Meta, Story } from '@storybook/react';
 import React, { ComponentProps } from 'react';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import type { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { AgentKeysTable } from './agent_keys_table';
-import { ApiKey } from '../../../../../../security/common/model';
 
 type Args = ComponentProps<typeof AgentKeysTable>;
 
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx
index e1ced3fabcd77..bfe56c3c8d1ad 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx
@@ -12,8 +12,8 @@ import {
   EuiBasicTableColumn,
   EuiInMemoryTableProps,
 } from '@elastic/eui';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { TimestampTooltip } from '../../../shared/timestamp_tooltip';
-import { ApiKey } from '../../../../../../security/common/model';
 import { ConfirmDeleteModal } from './confirm_delete_modal';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx
index cad8d8016fc8e..f080745c149a1 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx
@@ -8,9 +8,9 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { callApmApi } from '../../../../services/rest/create_call_apm_api';
-import { ApiKey } from '../../../../../../security/common/model';
 
 interface Props {
   agentKey: ApiKey;
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx
index 858fcc07bb6bf..03916eda5cfa3 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx
@@ -17,6 +17,7 @@ import {
   EuiButton,
   EuiLoadingSpinner,
 } from '@elastic/eui';
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { useFetcher, FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import { PermissionDenied } from './prompts/permission_denied';
 import { ApiKeysNotEnabled } from './prompts/api_keys_not_enabled';
@@ -25,7 +26,6 @@ import { CreateAgentKeyFlyout } from './create_agent_key';
 import { AgentKeyCallOut } from './create_agent_key/agent_key_callout';
 import { CreateApiKeyResponse } from '../../../../../common/agent_key_types';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { ApiKey } from '../../../../../../security/common/model';
 
 const INITIAL_DATA = {
   areApiKeysEnabled: false,
diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx b/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx
index 5d667b9f3e1a4..8aa5eb475bd6f 100644
--- a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx
@@ -8,7 +8,7 @@ import { EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export function ApiKeysNotEnabled() {
   const {
diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts
index d986c292bea10..844d35b43524f 100644
--- a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { callApmApi } from '../../../../services/rest/create_call_apm_api';
 
 const errorToastTitle = i18n.translate(
diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx
index 69b92a9a50a36..50cb040c0c065 100644
--- a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx
@@ -20,7 +20,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
-import { MLJobsAwaitingNodeWarning } from '../../../../../../ml/public';
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
 import { AnomalyDetectionSetupState } from '../../../../../common/anomaly_detection/get_anomaly_detection_setup_state';
 import { getEnvironmentLabel } from '../../../../../common/environment_filter_values';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
@@ -32,7 +32,7 @@ import { MLManageJobsLink } from '../../../shared/links/machine_learning_links/m
 import { LoadingStatePrompt } from '../../../shared/loading_state_prompt';
 import { ITableColumn, ManagedTable } from '../../../shared/managed_table';
 import { MLCallout, shouldDisplayMlCallout } from '../../../shared/ml_callout';
-import { AnomalyDetectionApiResponse } from './index';
+import { AnomalyDetectionApiResponse } from '.';
 import { JobsListStatus } from './jobs_list_status';
 
 type Jobs = AnomalyDetectionApiResponse['jobs'];
diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx
index 1df6dc0332b2a..7433c4c331fe7 100644
--- a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx
@@ -7,7 +7,7 @@
 import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { DATAFEED_STATE, JOB_STATE } from '../../../../../../ml/common';
+import { DATAFEED_STATE, JOB_STATE } from '@kbn/ml-plugin/common';
 import { MLManageJobsLink } from '../../../shared/links/machine_learning_links/mlmanage_jobs_link';
 
 export function JobsListStatus({
diff --git a/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx b/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx
index 383be90168a10..62adbd0d68ac6 100644
--- a/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx
@@ -22,7 +22,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useEffect, useState } from 'react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { ApmPluginStartDeps } from '../../../../plugin';
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx
index 55943a82dd7ec..68e8be3413ea2 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx
@@ -8,7 +8,7 @@
 import { fireEvent, render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { act } from 'react-dom/test-utils';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { MockApmPluginContextWrapper } from '../../../../../context/apm_plugin/mock_apm_plugin_context';
 import * as apmApi from '../../../../../services/rest/create_call_apm_api';
 import { DeleteButton } from './delete_button';
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx
index ee0193d8376d6..f0d1c7e5e1861 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import React, { useState } from 'react';
 import { callApmApi } from '../../../../../services/rest/create_call_apm_api';
 import { useApmPluginContext } from '../../../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts
index ce18ad4ff3264..81f6b88994e64 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  getSelectOptions,
-  replaceTemplateVariables,
-} from '../create_edit_custom_link_flyout/helper';
+import { getSelectOptions, replaceTemplateVariables } from './helper';
 import { Transaction } from '../../../../../../typings/es_schemas/ui/transaction';
 
 describe('Custom link helper', () => {
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx
index ea6dac148e844..206a60c90e0d4 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ComponentProps } from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { createCallApmApi } from '../../../../../services/rest/create_call_apm_api';
 import { LinkPreview } from './link_preview';
 
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts
index 7884d6740d5ea..da18d894ff02f 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import {
   Filter,
   CustomLink,
diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx b/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx
index fe997306f4b1d..e9979746426a3 100644
--- a/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { getCallApmApiSpy } from '../../../../services/rest/call_apm_api_spy';
 import { CustomLinkOverview } from '.';
-import { License } from '../../../../../../licensing/common/license';
+import { License } from '@kbn/licensing-plugin/common/license';
 import { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import {
   mockApmPluginContextValue,
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx
index 375a4b5ac1156..0e39d37254b67 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx
@@ -15,7 +15,7 @@ import {
   htmlIdGenerator,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { ElasticDocsLink } from '../../../shared/links/elastic_docs_link';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx
index 41d99e4551cc0..e0ae029d09b0c 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 import moment from 'moment';
 import { useLocalStorage } from '../../../../hooks/use_local_storage';
 import { SchemaOverview } from './schema_overview';
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx
index 4d5063624b101..51a82e43d008b 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx
@@ -8,10 +8,10 @@
 import type { Meta, Story } from '@storybook/react';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { createCallApmApi } from '../../../../services/rest/create_call_apm_api';
-import { Schema } from './';
+import { Schema } from '.';
 import { ConfirmSwitchModal } from './confirm_switch_modal';
 
 interface Args {
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
index 5871b139ae6ec..1e31eb8ccbe67 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 import semverLt from 'semver/functions/lt';
-import { PackagePolicy } from '../../../../../../fleet/common/types';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types';
 import { ElasticDocsLink } from '../../../shared/links/elastic_docs_link';
 import rocketLaunchGraphic from './blog_rocket_720x420.png';
 import { MigrationInProgressPanel } from './migration_in_progress_panel';
diff --git a/x-pack/plugins/apm/public/components/app/trace_link/index.tsx b/x-pack/plugins/apm/public/components/app/trace_link/index.tsx
index 21d38e3954f27..689531e912829 100644
--- a/x-pack/plugins/apm/public/components/app/trace_link/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_link/index.tsx
@@ -8,7 +8,7 @@
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
 import { getRedirectToTransactionDetailPageUrl } from './get_redirect_to_transaction_detail_page_url';
 import { getRedirectToTracePageUrl } from './get_redirect_to_trace_page_url';
diff --git a/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx b/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx
index ffeab11e1f276..d8a5127af21a3 100644
--- a/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx
@@ -9,7 +9,7 @@ import { act, render, waitFor } from '@testing-library/react';
 import { shallow } from 'enzyme';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { TraceLink } from './';
+import { TraceLink } from '.';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import {
   mockApmPluginContextValue,
diff --git a/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx
index a3e48ee00e0d8..5fbaae7411ff7 100644
--- a/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_overview/trace_list.tsx
@@ -9,8 +9,8 @@ import { EuiIcon, EuiToolTip, RIGHT_ALIGNMENT } from '@elastic/eui';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ApmRoutes } from '../../routing/apm_route_config';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import {
   asMillisecondDuration,
   asTransactionRate,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx
index e2530458ae980..03132d482f374 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx
@@ -10,10 +10,10 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React, { ReactNode } from 'react';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { merge } from 'lodash';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
 import { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import {
@@ -23,7 +23,7 @@ import {
 import * as useFetcherModule from '../../../../hooks/use_fetcher';
 import { fromQuery } from '../../../shared/links/url_helpers';
 
-import { getFormattedSelection, TransactionDistribution } from './index';
+import { getFormattedSelection, TransactionDistribution } from '.';
 
 function Wrapper({ children }: { children?: ReactNode }) {
   const KibanaReactContext = createKibanaReactContext({
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx
index ca2a3584c8942..fe551cc0e96b8 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx
@@ -19,7 +19,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { useUiTracker } from '../../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx
index af66f818309a0..3044d365e1958 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx
@@ -9,10 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  METRIC_TYPE,
-  useTrackMetric,
-} from '../../../../../observability/public';
+import { METRIC_TYPE, useTrackMetric } from '@kbn/observability-plugin/public';
 
 import { isActivePlatinumLicense } from '../../../../common/license_check';
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx
index df3e75a3c8f2e..e3dec8b3d9aa3 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx
@@ -9,10 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  METRIC_TYPE,
-  useTrackMetric,
-} from '../../../../../observability/public';
+import { METRIC_TYPE, useTrackMetric } from '@kbn/observability-plugin/public';
 
 import { isActivePlatinumLicense } from '../../../../common/license_check';
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx
index c5001e25b0801..aeaea322fff96 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx
@@ -9,7 +9,7 @@ import { EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { LogStream } from '../../../../../../infra/public';
+import { LogStream } from '@kbn/infra-plugin/public';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
 import type { ApmUrlParams } from '../../../../context/url_params_context/types';
 import { fromQuery, toQuery } from '../../../shared/links/url_helpers';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx
index 6ca1a78db28b1..695ebfd9a8976 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx
@@ -14,7 +14,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import React, { Dispatch, SetStateAction, useState } from 'react';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Margins } from '../../../../../shared/charts/timeline';
 import {
   IWaterfall,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx
index 14f47fe22b4c0..29dd5ffde6547 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { EventOutcome } from '../../../../../../../typings/es_schemas/raw/fields/event_outcome';
 import { useTheme } from '../../../../../../hooks/use_theme';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 const ResetLineHeight = euiStyled.span`
   line-height: initial;
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx
index c64a121c91882..04c3734eebaff 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { History } from 'history';
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Timeline } from '../../../../../shared/charts/timeline';
 import { fromQuery, toQuery } from '../../../../../shared/links/url_helpers';
 import { getAgentMarks } from '../marks/get_agent_marks';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx
index 8549f09bba248..16a80ce09efd0 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiFlyout } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const ResponsiveFlyout = euiStyled(EuiFlyout)`
   width: 100%;
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx
index 5d3c1d733e040..d50305c22e543 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx
@@ -22,8 +22,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
 import { isEmpty } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CompositeSpanDurationSummaryItem } from '../../../../../../shared/summary/composite_span_duration_summary_item';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { Span } from '../../../../../../../../typings/es_schemas/ui/span';
 import { Transaction } from '../../../../../../../../typings/es_schemas/ui/transaction';
 import { DiscoverSpanLink } from '../../../../../../shared/links/discover_links/discover_span_link';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx
index f87967f762f25..c008bd8d2f064 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx
@@ -9,7 +9,7 @@ import { Story } from '@storybook/react';
 import React, { ComponentProps, ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MockApmPluginContextWrapper } from '../../../../../../../context/apm_plugin/mock_apm_plugin_context';
-import { SpanFlyout } from './';
+import { SpanFlyout } from '.';
 
 type Args = ComponentProps<typeof SpanFlyout>;
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx
index 18ec931bb7302..19d487ce35fb1 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx
@@ -7,10 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import {
-  METRIC_TYPE,
-  useUiTracker,
-} from '../../../../../../../../../observability/public';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import {
   SERVICE_NAME,
   SPAN_DESTINATION_SERVICE_RESOURCE,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx
index 4c845e16348e7..aac15e48d8840 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx
@@ -8,7 +8,7 @@
 import { EuiIcon, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment, ReactNode, useEffect, useRef, useState } from 'react';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 const ToggleButtonContainer = euiStyled.div`
   margin-top: ${({ theme }) => theme.eui.euiSizeS}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx
index 7f8fbf62130b3..47aec921f3513 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx
@@ -9,7 +9,7 @@ import { Story } from '@storybook/react';
 import React, { ComponentProps, ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MockApmPluginContextWrapper } from '../../../../../../../context/apm_plugin/mock_apm_plugin_context';
-import { TransactionFlyout } from './';
+import { TransactionFlyout } from '.';
 
 type Args = ComponentProps<typeof TransactionFlyout>;
 
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx
index 51e9cbeaba6f7..9190fd5924174 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx
@@ -8,8 +8,8 @@
 import { EuiBadge, EuiIcon, EuiText, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useTheme } from '../../../../../../hooks/use_theme';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
 import { isRumAgentName } from '../../../../../../../common/agent_name';
 import {
   TRACE_ID,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx
index db82e9e360207..82d85891e36da 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx
@@ -9,7 +9,7 @@ import { Meta, Story } from '@storybook/react';
 import React, { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { MockApmPluginContextWrapper } from '../../../../../context/apm_plugin/mock_apm_plugin_context';
-import { WaterfallContainer } from './index';
+import { WaterfallContainer } from '.';
 import { getWaterfall } from './waterfall/waterfall_helpers/waterfall_helpers';
 import {
   inferredSpans,
diff --git a/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
index 2c71bcf49917b..b28649d9bc56f 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
@@ -8,7 +8,7 @@
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
 import { getRedirectToTransactionDetailPageUrl } from '../trace_link/get_redirect_to_transaction_detail_page_url';
 import { useApmParams } from '../../../hooks/use_apm_params';
diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
index 82164f34adb79..5398d245ace48 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx
@@ -7,9 +7,9 @@
 
 import { queryByLabelText } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { ApmServiceContextProvider } from '../../../context/apm_service/apm_service_context';
 import { UrlParamsProvider } from '../../../context/url_params_context/url_params_context';
@@ -22,7 +22,7 @@ import {
   renderWithTheme,
 } from '../../../utils/test_helpers';
 import { fromQuery } from '../../shared/links/url_helpers';
-import { TransactionOverview } from './';
+import { TransactionOverview } from '.';
 
 const KibanaReactContext = createKibanaReactContext({
   uiSettings: { get: () => true },
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
index a82fa3121bb3b..238ffc760d93f 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
@@ -18,14 +18,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { ComponentType } from 'react';
 import styled from 'styled-components';
+import { Markdown, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   AgentRuntimeAttachmentProps,
   CreateAgentInstructions,
 } from './agent_instructions_mappings';
-import {
-  Markdown,
-  useKibana,
-} from '../../../../../../../src/plugins/kibana_react/public';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import { AgentIcon } from '../../shared/agent_icon';
 import type {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts
index 212bb9554dd05..dd3f63cb51361 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import Mustache from 'mustache';
 
 const TEMPLATE_TAGS = ['{', '}'];
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx
index 40b902b7729d0..0dcf338288933 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx
@@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
 import {
   CustomAssetsAccordionProps,
   CustomAssetsAccordion,
-} from '../../../../fleet/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ApmPluginStartDeps } from '../../plugin';
 
 export function ApmCustomAssetsExtension() {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx
index 6b3ba6a8f05db..ab08467fc7dbe 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { EuiButton, EuiText, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AgentEnrollmentFlyoutFinalStepExtension } from '../../../../fleet/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { AgentEnrollmentFlyoutFinalStepExtension } from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ApmPluginStartDeps } from '../../plugin';
 
 function StepComponent() {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx
index 7f9ec6e069773..dc7010a57d743 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx
@@ -7,6 +7,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { getAgentAuthorizationSettings } from './settings_definition/agent_authorization_settings';
 import { getApmSettings } from './settings_definition/apm_settings';
 import {
@@ -25,7 +26,6 @@ import {
 import { SettingsForm, SettingsSection } from './settings_form';
 import { isSettingsFormValid, mergeNewVars } from './settings_form/utils';
 import { PackagePolicyVars } from './typings';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   updateAPMPolicy: (newVars: PackagePolicyVars, isValid: boolean) => void;
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts
index 03032a6160502..09fb0d03528ae 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts
@@ -31,7 +31,7 @@ export function getApmSettings(): SettingsRow[] {
             'Host defines the host and port the server is listening on. URL is the unchangeable, publicly reachable server URL for deployments on Elastic Cloud or ECK.',
         }
       ),
-
+      dataTestSubj: 'packagePolicyHostInput',
       required: true,
     },
     {
@@ -44,6 +44,7 @@ export function getApmSettings(): SettingsRow[] {
           defaultMessage: 'URL',
         }
       ),
+      dataTestSubj: 'packagePolicyUrlInput',
       required: true,
     },
     {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx
index 56ba3c6d47eb5..20d60658e8833 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx
@@ -16,9 +16,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import styled from 'styled-components';
-import { FormRowOnChange } from './';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import { FormRowOnChange } from '.';
 import { SettingsRow } from '../typings';
-import { CodeEditor } from '../../../../../../../../src/plugins/kibana_react/public';
 
 const FixedHeightDiv = styled.div`
   height: 300px;
@@ -45,6 +45,7 @@ export function FormRowSetting({ row, value, onChange, isDisabled }: Props) {
     case 'boolean': {
       return (
         <EuiSwitch
+          data-test-subj={row.dataTestSubj}
           disabled={isDisabled}
           label={row.placeholder || (value ? ENABLED_LABEL : DISABLED_LABEL)}
           checked={value}
@@ -58,6 +59,7 @@ export function FormRowSetting({ row, value, onChange, isDisabled }: Props) {
     case 'text': {
       return (
         <EuiFieldText
+          data-test-subj={row.dataTestSubj}
           disabled={isDisabled}
           value={value}
           prepend={isDisabled ? <EuiIcon type="lock" /> : undefined}
@@ -70,6 +72,7 @@ export function FormRowSetting({ row, value, onChange, isDisabled }: Props) {
     case 'area': {
       return (
         <EuiTextArea
+          data-test-subj={row.dataTestSubj}
           disabled={isDisabled}
           value={value}
           onChange={(e) => {
@@ -82,6 +85,7 @@ export function FormRowSetting({ row, value, onChange, isDisabled }: Props) {
     case 'integer': {
       return (
         <EuiFieldNumber
+          data-test-subj={row.dataTestSubj}
           disabled={isDisabled}
           value={value}
           onChange={(e) => {
@@ -96,6 +100,7 @@ export function FormRowSetting({ row, value, onChange, isDisabled }: Props) {
         : [];
       return (
         <EuiComboBox
+          data-test-subj={row.dataTestSubj}
           noSuggestions
           placeholder={i18n.translate(
             'xpack.apm.fleet_integration.settings.selectOrCreateOptions',
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts
index c25031efad5fd..9d9d2fb2a6200 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts
+++ b/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts
@@ -6,18 +6,18 @@
  */
 import * as t from 'io-ts';
 import { ReactNode } from 'react';
-import { PackagePolicyConfigRecordEntry } from '../../../../../fleet/common';
+import { PackagePolicyConfigRecordEntry } from '@kbn/fleet-plugin/common';
 
 export type {
   PackagePolicyCreateExtensionComponentProps,
   PackagePolicyEditExtensionComponentProps,
-} from '../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 
 export type {
   NewPackagePolicy,
   PackagePolicy,
   PackagePolicyConfigRecordEntry,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 
 export type PackagePolicyVars = Record<string, PackagePolicyConfigRecordEntry>;
 
@@ -47,6 +47,7 @@ export interface BasicSettingRow {
   labelAppend?: string;
   labelAppendLink?: string;
   labelAppendLinkText?: string;
+  dataTestSubj?: string;
   settings?: SettingsRow[];
   validation?: SettingValidation;
   required?: boolean;
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
index e1fb6dee9ca96..861f587f9c42c 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const getLazyApmAgentsTabExtension = () => {
   return lazy<PackagePolicyEditExtensionComponent>(async () => {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx
index 6bde5e9416635..f51ee17ce8e83 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const getLazyAPMPolicyCreateExtension = () => {
   return lazy<PackagePolicyCreateExtensionComponent>(async () => {
diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx
index f79d7b58b1621..feb5a6dd93875 100644
--- a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx
+++ b/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const getLazyAPMPolicyEditExtension = () => {
   return lazy<PackagePolicyEditExtensionComponent>(async () => {
diff --git a/x-pack/plugins/apm/public/components/routing/app_root.tsx b/x-pack/plugins/apm/public/components/routing/app_root.tsx
index 3c66f39e268ec..b82a44a598249 100644
--- a/x-pack/plugins/apm/public/components/routing/app_root.tsx
+++ b/x-pack/plugins/apm/public/components/routing/app_root.tsx
@@ -10,17 +10,17 @@ import { RouteRenderer, RouterProvider } from '@kbn/typed-react-router-config';
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { DefaultTheme, ThemeProvider } from 'styled-components';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import {
   KibanaContextProvider,
   RedirectAppLinks,
   useUiSetting$,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import {
   HeaderMenuPortal,
   InspectorContextProvider,
-} from '../../../../observability/public';
-import { ScrollToTopOnPathChange } from '../../components/app/main/scroll_to_top_on_path_change';
+} from '@kbn/observability-plugin/public';
+import { ScrollToTopOnPathChange } from '../app/main/scroll_to_top_on_path_change';
 import { AnomalyDetectionJobsContextProvider } from '../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
 import {
   ApmPluginContext,
diff --git a/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx b/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx
index 6776acebf9f2e..f309c69932903 100644
--- a/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx
+++ b/x-pack/plugins/apm/public/components/routing/service_groups_redirect.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import React from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { RedirectTo } from './redirect_to';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { enableServiceGroups } from '../../../../observability/public';
 import { useFetcher, FETCH_STATUS } from '../../hooks/use_fetcher';
 
 export function ServiceGroupsRedirect({
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
index e138027d05554..9d534b0bfc53c 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
@@ -11,13 +11,13 @@ import { useLocation } from 'react-router-dom';
 import {
   useKibana,
   KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { EnvironmentsContextProvider } from '../../../context/environments_context/environments_context';
 import { useFetcher, FETCH_STATUS } from '../../../hooks/use_fetcher';
 import { ApmPluginStartDeps } from '../../../plugin';
 import { ApmEnvironmentFilter } from '../../shared/environment_filter';
 import { getNoDataConfig } from './no_data_config';
-import { enableServiceGroups } from '../../../../../observability/public';
 import { ServiceGroupSaveButton } from '../../app/service_groups';
 
 // Paths that must skip the no data screen
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx
index 1d04dd83ef99f..9245302539efb 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx
@@ -8,8 +8,8 @@
 import type { Story, StoryContext } from '@storybook/react';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
 import { APMServiceContext } from '../../../../context/apm_service/apm_service_context';
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx
index ec54fa1f228ce..0fba7e3b99804 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx
@@ -8,9 +8,9 @@
 import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { createExploratoryViewUrl } from '../../../../../../observability/public';
-import { ALL_VALUES_SELECTED } from '../../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
+import { ALL_VALUES_SELECTED } from '@kbn/observability-plugin/public';
 import {
   isIosAgentName,
   isRumAgentName,
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx
index 03a50d6082583..39cc5ee12dc54 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { isMetricsTabHidden, isJVMsTabHidden } from './';
+import { isMetricsTabHidden, isJVMsTabHidden } from '.';
 
 describe('APM service template', () => {
   describe('isMetricsTabHidden', () => {
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
index 8a2d837857060..598692780ef8d 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx
@@ -15,7 +15,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { omit } from 'lodash';
 import React from 'react';
-import { enableInfrastructureView } from '../../../../../../observability/public';
+import { enableInfrastructureView } from '@kbn/observability-plugin/public';
 import {
   isIosAgentName,
   isJavaAgentName,
diff --git a/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts b/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts
index d753901471eea..144afb113b67f 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts
+++ b/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaPageTemplateProps } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 
 export function getNoDataConfig({
   docsLink,
diff --git a/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx
index 3c078e1a56deb..51a8f03c74a6e 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx
@@ -17,10 +17,10 @@ import { i18n } from '@kbn/i18n';
 import {
   useKibana,
   KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { useFetcher } from '../../../hooks/use_fetcher';
 import { ApmPluginStartDeps } from '../../../plugin';
-import { enableServiceGroups } from '../../../../../observability/public';
 import { useApmRouter } from '../../../hooks/use_apm_router';
 import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
 import { ApmMainTemplate } from './apm_main_template';
diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
index a1a5e38bdd2ea..341c6b5c8a6e7 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
@@ -6,10 +6,10 @@
  */
 
 import type { Meta, Story } from '@storybook/react';
-import type { CoreStart, DocLinksStart } from 'kibana/public';
+import type { CoreStart, DocLinksStart } from '@kbn/core/public';
 import React, { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import type { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { SettingsTemplate } from './settings_template';
diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
index 08cacc38e89f0..aaec73e11ed68 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { History } from 'history';
 import { useHistory } from 'react-router-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { ApmMainTemplate } from './apm_main_template';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { getLegacyApmHref } from '../../shared/links/apm/apm_link';
diff --git a/x-pack/plugins/apm/public/components/routing/track_pageview.tsx b/x-pack/plugins/apm/public/components/routing/track_pageview.tsx
index af0682a56ec2b..ea31702a187ac 100644
--- a/x-pack/plugins/apm/public/components/routing/track_pageview.tsx
+++ b/x-pack/plugins/apm/public/components/routing/track_pageview.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useRoutePath } from '@kbn/typed-react-router-config';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 export function TrackPageview({ children }: { children: React.ReactElement }) {
   const routePath = useRoutePath();
diff --git a/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx b/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
index fce7c2b2a2a69..67b07f73490b1 100644
--- a/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/agent_icon/agent_icon.stories.tsx
@@ -16,7 +16,7 @@ import type { Story } from '@storybook/react';
 import React from 'react';
 import { AGENT_NAMES } from '../../../../common/agent_name';
 import { getAgentIcon } from './get_agent_icon';
-import { AgentIcon } from './index';
+import { AgentIcon } from '.';
 
 export default {
   title: 'shared/AgentIcon',
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
index 164a413a548ee..374cf76c1c2ac 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
@@ -13,7 +13,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { IBasePath } from '../../../../../../../src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import { AlertType } from '../../../../common/alert_types';
 import { AlertingFlyout } from '../../alerting/alerting_flyout';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
index e47c4853827de..4de3536d61593 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
@@ -8,7 +8,7 @@
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ApmMlJob } from '../../../../common/anomaly_detection/apm_ml_job';
 import { getAnomalyDetectionSetupState } from '../../../../common/anomaly_detection/get_anomaly_detection_setup_state';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx
index 8a18bf0b3eed1..b9302a3ef857a 100644
--- a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/inspector_header_link.tsx
@@ -8,11 +8,11 @@
 import { EuiHeaderLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   enableInspectEsQueries,
   useInspectorContext,
-} from '../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 
 export function InspectorHeaderLink() {
diff --git a/x-pack/plugins/apm/public/components/shared/backend_link.tsx b/x-pack/plugins/apm/public/components/shared/backend_link.tsx
index 92cad37273b02..6dde4e269ec54 100644
--- a/x-pack/plugins/apm/public/components/shared/backend_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/backend_link.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import React from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmRouter } from '../../hooks/use_apm_router';
 import { truncate } from '../../utils/style';
 import { ApmRoutes } from '../routing/apm_route_config';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
index 0d4c856a33a3d..62d7d8a9f6cc6 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
@@ -24,8 +24,8 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { Annotation } from '../../../../../common/annotations';
-import { useChartTheme } from '../../../../../../observability/public';
 import {
   asAbsoluteDateTime,
   asPercent,
@@ -36,14 +36,14 @@ import { useChartPointerEventContext } from '../../../../context/chart_pointer_e
 import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import { useTheme } from '../../../../hooks/use_theme';
 import { unit } from '../../../../utils/style';
-import { ChartContainer } from '../../charts/chart_container';
-import { isTimeseriesEmpty, onBrushEnd } from '../../charts/helper/helper';
+import { ChartContainer } from '../chart_container';
+import { isTimeseriesEmpty, onBrushEnd } from '../helper/helper';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { useTimeRange } from '../../../../hooks/use_time_range';
 import {
   getMaxY,
   getResponseTimeTickFormatter,
-} from '../../../shared/charts/transaction_charts/helper';
+} from '../transaction_charts/helper';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { getTimeZone } from '../helper/timezone';
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx b/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
index ffb62b7c62aac..089cdc87c08d5 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
@@ -8,7 +8,8 @@
 import { Fit } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import { rgba } from 'polished';
-import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { getSeverity } from '@kbn/ml-plugin/public';
 import { getSeverityColor } from '../../../../../common/anomaly_detection';
 import {
   ANOMALY_SEVERITY,
@@ -16,7 +17,6 @@ import {
 } from '../../../../../common/ml_constants';
 import { ServiceAnomalyTimeseries } from '../../../../../common/anomaly_detection/service_anomaly_timeseries';
 import { APMChartSpec } from '../../../../../typings/timeseries';
-import { getSeverity } from '../../../../../../ml/public';
 
 export function getChartAnomalyTimeseries({
   anomalyTimeseries,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
index acf3677af4938..946d6912f98d0 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from '../../../../../../../../src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { getDomainTZ, getTimeTicksTZ, getTimeZone } from './timezone';
 
 describe('Timezone helper', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
index f807d83c8977f..6514a0fd2bb7f 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
@@ -6,9 +6,9 @@
  */
 
 import d3 from 'd3';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { getTimezoneOffsetInMs } from './get_timezone_offset_in_ms';
-import { IUiSettingsClient } from '../../../../../../../../src/core/public';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
 
 interface Params {
   domain: [number, number];
diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx
index 4c93d2b513818..bf859151fb773 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx
@@ -22,7 +22,7 @@ import { EuiPanel, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useChartTheme } from '../../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { SERVICE_NODE_NAME } from '../../../../../common/elasticsearch_fieldnames';
 import {
   asTransactionRate,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
index 80bfcca05aabc..42bd5fc354337 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx
@@ -10,7 +10,7 @@ import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import {
   InstancesLatencyDistributionChart,
   InstancesLatencyDistributionChartProps,
-} from './';
+} from '.';
 
 export default {
   title: 'shared/charts/InstancesLatencyDistributionChart',
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
index dd8543bc88c9f..e38674057cd85 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx
@@ -13,13 +13,13 @@ import { LatencyAggregationType } from '../../../../../common/latency_aggregatio
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 import { useLicenseContext } from '../../../../context/license/use_license_context';
 import { useTransactionLatencyChartsFetcher } from '../../../../hooks/use_transaction_latency_chart_fetcher';
-import { TimeseriesChart } from '../../../shared/charts/timeseries_chart';
+import { TimeseriesChart } from '../timeseries_chart';
 import {
   getMaxY,
   getResponseTimeTickFormatter,
-} from '../../../shared/charts/transaction_charts/helper';
-import { MLHeader } from '../../../shared/charts/transaction_charts/ml_header';
-import * as urlHelpers from '../../../shared/links/url_helpers';
+} from '../transaction_charts/helper';
+import { MLHeader } from '../transaction_charts/ml_header';
+import * as urlHelpers from '../../links/url_helpers';
 import { getComparisonChartTheme } from '../../time_comparison/get_comparison_chart_theme';
 import { useEnvironmentsContext } from '../../../../context/environments_context/use_environments_context';
 import { ApmMlDetectorType } from '../../../../../common/anomaly_detection/apm_ml_detectors';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
index 34ca6a205dbc9..127983bfbf544 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
@@ -8,7 +8,7 @@
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
 import type { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
 import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock_apm_plugin_context';
@@ -19,7 +19,7 @@ import {
   APIReturnType,
   createCallApmApi,
 } from '../../../../services/rest/create_call_apm_api';
-import { LatencyChart } from './';
+import { LatencyChart } from '.';
 
 interface Args {
   latencyChartResponse: APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/charts/latency'>;
diff --git a/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx
index 680cd70bb4d83..a726ab28cf04e 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx
@@ -21,7 +21,7 @@ import {
   EuiLoadingChart,
 } from '@elastic/eui';
 import React from 'react';
-import { useChartTheme } from '../../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { Coordinate } from '../../../../../typings/timeseries';
 import { useTheme } from '../../../../hooks/use_theme';
 import { unit } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx
index a75eb157335fe..131d82f4cb428 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useTheme } from '../../../../hooks/use_theme';
 
 export enum Shape {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx
index e421190d6793c..27fe750b06521 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
 import { AgentMarker } from './agent_marker';
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx
index 9e97129b199db..46c04983464e8 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx
@@ -7,7 +7,7 @@
 
 import { EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { asDuration } from '../../../../../../common/utils/formatters';
 import { useTheme } from '../../../../../hooks/use_theme';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx
index 3f27ddbf78af4..17ad34f70c008 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPopover, EuiText } from '@elastic/eui';
 import React, { useState } from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   TRACE_ID,
   TRANSACTION_ID,
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx
index 698801b5a8d37..cadf1078937c6 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { Marker } from './';
+import { Marker } from '.';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
 import { ErrorMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks';
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx
index e4e26ce637bfe..d91e65662e11a 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { AgentMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks';
 import { ErrorMark } from '../../../../app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks';
 import { AgentMarker } from './agent_marker';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts b/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts
index f12df738d84b7..67fdc04d6529c 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { scaleLinear } from 'd3-scale';
-import { Margins } from './';
+import { Margins } from '.';
 
 export type PlotValues = ReturnType<typeof getPlotValues>;
 
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx
index 4dddb4bee226d..31d5be127214e 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx
@@ -10,7 +10,7 @@ import React, { ReactNode } from 'react';
 import { XAxis, XYPlot } from 'react-vis';
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 import { useTheme } from '../../../../hooks/use_theme';
-import { Mark } from './';
+import { Mark } from '.';
 import { LastTickValue } from './last_tick_value';
 import { Marker } from './marker';
 import { PlotValues } from './plot_utils';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
index 3c15262a658d6..632e354341632 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
@@ -25,7 +25,7 @@ import { EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useChartTheme } from '../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 import { ServiceAnomalyTimeseries } from '../../../../common/anomaly_detection/service_anomaly_timeseries';
 import { asAbsoluteDateTime } from '../../../../common/utils/formatters';
 import { Coordinate, TimeSeries } from '../../../../typings/timeseries';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx
index 0ae6fc00b2804..98ff3a16ec519 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx
@@ -9,7 +9,7 @@ import { EuiFlexItem, EuiIconTip, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
 import { useApmParams } from '../../../../hooks/use_apm_params';
 import { MLSingleMetricLink } from '../../links/machine_learning_links/mlsingle_metric_link';
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx
index b8d070c64ca9f..6af1c89fd1991 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.test.tsx
@@ -7,7 +7,7 @@
 
 import type { HistogramItem } from '../../../../../common/correlations/types';
 
-import { replaceHistogramDotsWithBars } from './index';
+import { replaceHistogramDotsWithBars } from '.';
 
 describe('TransactionDistributionChart', () => {
   describe('replaceHistogramDotsWithBars', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx
index 91d3c0a727877..edc55596adb4d 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/transaction_distribution_chart/index.tsx
@@ -29,7 +29,7 @@ import { euiPaletteColorBlind } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { useChartTheme } from '../../../../../../observability/public';
+import { useChartTheme } from '@kbn/observability-plugin/public';
 
 import { getDurationFormatter } from '../../../../../common/utils/formatters';
 import type { HistogramItem } from '../../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx b/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx
index 737c1a54a2f09..a5632ead92ecd 100644
--- a/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx
@@ -13,7 +13,7 @@ import React from 'react';
 import { useLocation } from 'react-router-dom';
 import qs from 'query-string';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import { DatePicker } from './';
+import { DatePicker } from '.';
 
 let history: MemoryHistory;
 
diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx b/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx
index 20433a89f359f..146cc87737c65 100644
--- a/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx
@@ -8,7 +8,7 @@
 import { EuiSuperDatePicker } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { clearCache } from '../../../services/rest/call_api';
 import { fromQuery, toQuery } from '../links/url_helpers';
diff --git a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx
index 6dbbc864297a2..8270c8aa64d41 100644
--- a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React from 'react';
-import { KeyValueFilterList } from './';
+import { KeyValueFilterList } from '.';
 import {
   expectTextsInDocument,
   renderWithTheme,
diff --git a/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx b/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx
index ed91aefdfcf9e..e7cc34cb75d44 100644
--- a/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx
+++ b/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx
@@ -7,7 +7,7 @@
 
 import { isBoolean, isNumber, isObject } from 'lodash';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
 
 const EmptyValue = euiStyled.span`
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts b/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
index fcfea9df339cc..0b3cbcb5efe79 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx b/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
index 0fb84aa7164bb..93fee4bf06865 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx
@@ -10,11 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { uniqueId } from 'lodash';
 import React, { useState } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import {
-  esKuery,
-  QuerySuggestion,
-} from '../../../../../../../src/plugins/data/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { esKuery, QuerySuggestion } from '@kbn/data-plugin/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { useLegacyUrlParams } from '../../../context/url_params_context/use_url_params';
 import { useApmParams } from '../../../hooks/use_apm_params';
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js
index 26b99c4e54f65..9c2ee835b8f72 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { EuiIcon } from '@elastic/eui';
 import { unit } from '../../../../utils/style';
 import { tint } from 'polished';
diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js
index e6f482e88afc0..3f38b61c9a5e0 100644
--- a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js
+++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js
@@ -9,7 +9,7 @@ import { isEmpty } from 'lodash';
 import { tint } from 'polished';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { unit } from '../../../../utils/style';
 import Suggestion from './suggestion';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx b/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx
index 366003c101789..b518cb23d91ff 100644
--- a/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { AgentConfigurationIntake } from '../../../../../common/agent_configuration/configuration_types';
 import { getLegacyApmHref } from './apm_link';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx b/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx
index 10e101d6af2b1..b8eb716d15cbb 100644
--- a/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { pick } from 'lodash';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx b/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx
index 919d140c54c1e..4df9bc0447aa1 100644
--- a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx
@@ -7,7 +7,7 @@
 
 import { EuiLink } from '@elastic/eui';
 import { Location } from 'history';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 import rison, { RisonValue } from 'rison-node';
diff --git a/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx b/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
index e38eaf0ea8124..1e5c3a6748a1f 100644
--- a/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
@@ -6,10 +6,10 @@
  */
 
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import React from 'react';
 import url from 'url';
-import { InfraAppId } from '../../../../../infra/public';
+import { InfraAppId } from '@kbn/infra-plugin/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { fromQuery } from './url_helpers';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/kibana.ts b/x-pack/plugins/apm/public/components/shared/links/kibana.ts
index e05ccf4e6fcff..f8a59036c85bb 100644
--- a/x-pack/plugins/apm/public/components/shared/links/kibana.ts
+++ b/x-pack/plugins/apm/public/components/shared/links/kibana.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IBasePath } from '../../../../../../../src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 
 export function getUpgradeAssistantHref(basePath: IBasePath) {
diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
index 541b00f8291b0..9da957f97c974 100644
--- a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx
@@ -7,9 +7,9 @@
 
 import React, { ReactNode } from 'react';
 import { EuiLink } from '@elastic/eui';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TimePickerRefreshInterval } from '../../date_picker/typings';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
index ef92691336c34..cc2d855550af3 100644
--- a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx
@@ -7,9 +7,9 @@
 
 import React, { ReactNode } from 'react';
 import { EuiLink } from '@elastic/eui';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TimePickerRefreshInterval } from '../../date_picker/typings';
 
diff --git a/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts b/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts
index 093a953dffe94..6be36d8823833 100644
--- a/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts
+++ b/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts
@@ -7,7 +7,7 @@
 
 import { History } from 'history';
 import { parse, stringify } from 'query-string';
-import { url } from '../../../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 export function toQuery(search?: string): APMQueryParamsRaw {
   return search ? parse(search.slice(1), { sort: false }) : {};
diff --git a/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx b/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx
index 15246d5375abe..60df610b05e6e 100644
--- a/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ReactNode } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useBreakpoints } from '../../../hooks/use_breakpoints';
 
 /**
diff --git a/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx b/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx
index 469e384a06ee4..fb6dd69128200 100644
--- a/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/redirect_with_default_environment/index.test.tsx
@@ -9,7 +9,7 @@ import { RouterProvider } from '@kbn/typed-react-router-config';
 import { render } from '@testing-library/react';
 import { createMemoryHistory, Location, MemoryHistory } from 'history';
 import qs from 'query-string';
-import { RedirectWithDefaultEnvironment } from './';
+import { RedirectWithDefaultEnvironment } from '.';
 import { apmRouter } from '../../routing/apm_route_config';
 import * as useApmPluginContextExports from '../../../context/apm_plugin/use_apm_plugin_context';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
diff --git a/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx b/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx
index b8f505bf3e3c0..fb5c98ba515fa 100644
--- a/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/redirect_with_offset/index.tsx
@@ -13,9 +13,9 @@ import { isRouteWithTimeRange } from '../is_route_with_time_range';
 import {
   TimeRangeComparisonEnum,
   dayAndWeekBeforeToOffset,
-} from '../../../components/shared/time_comparison/get_comparison_options';
+} from '../time_comparison/get_comparison_options';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
-import { getComparisonEnabled } from '../../../components/shared/time_comparison/get_comparison_enabled';
+import { getComparisonEnabled } from '../time_comparison/get_comparison_enabled';
 import { toBoolean } from '../../../context/url_params_context/helpers';
 
 export function RedirectWithOffset({
diff --git a/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx b/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
index 6cf6c2090c661..d6fc9eb0eecb5 100644
--- a/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
@@ -9,7 +9,7 @@ import { getByTestId, fireEvent, getByText } from '@testing-library/react';
 import { createMemoryHistory, MemoryHistory } from 'history';
 import React from 'react';
 import { Router } from 'react-router-dom';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockApmPluginContextWrapper } from '../../context/apm_plugin/mock_apm_plugin_context';
 import { ApmServiceContextProvider } from '../../context/apm_service/apm_service_context';
 import { UrlParamsProvider } from '../../context/url_params_context/url_params_context';
@@ -18,7 +18,7 @@ import * as useFetcherHook from '../../hooks/use_fetcher';
 import * as useServiceTransactionTypesHook from '../../context/apm_service/use_service_transaction_types_fetcher';
 import { renderWithTheme } from '../../utils/test_helpers';
 import { fromQuery } from './links/url_helpers';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { SearchBar } from './search_bar';
 
 function setup({
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
index 2e15ea9f0db5f..862d1e7f10dba 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
@@ -6,11 +6,11 @@
  */
 
 import { fireEvent, render } from '@testing-library/react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { merge } from 'lodash';
 // import { renderWithTheme } from '../../../../utils/test_helpers';
 import React, { ReactNode } from 'react';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import {
@@ -19,7 +19,7 @@ import {
 } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import * as fetcherHook from '../../../hooks/use_fetcher';
 import { ServiceIcons } from '.';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 const KibanaReactContext = createKibanaReactContext({
   usageCollection: { reportUiCounter: () => {} },
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
index 97c1ecf3476fa..60757bc0b99be 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx
@@ -7,13 +7,13 @@
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import {
   APIReturnType,
   createCallApmApi,
 } from '../../../services/rest/create_call_apm_api';
-import { ServiceIcons } from './';
+import { ServiceIcons } from '.';
 
 type ServiceDetailsReturnType =
   APIReturnType<'GET /internal/apm/services/{serviceName}/metadata/details'>;
diff --git a/x-pack/plugins/apm/public/components/shared/service_link.tsx b/x-pack/plugins/apm/public/components/shared/service_link.tsx
index d8f346f63b2ae..dc4f56ac57053 100644
--- a/x-pack/plugins/apm/public/components/shared/service_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_link.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import React from 'react';
 import { TypeOf } from '@kbn/typed-react-router-config';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate } from '../../utils/style';
 import { useApmRouter } from '../../hooks/use_apm_router';
 import { AgentIcon } from './agent_icon';
diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts b/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts
index 2abb7d03bce80..f9d74fe1bc956 100644
--- a/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts
+++ b/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts
@@ -23,7 +23,7 @@ import mysqlIcon from './icons/mysql.svg';
 import postgresqlIcon from './icons/postgresql.svg';
 import redisIcon from './icons/redis.svg';
 import websocketIcon from './icons/websocket.svg';
-import javaIcon from '../../shared/agent_icon/icons/java.svg';
+import javaIcon from '../agent_icon/icons/java.svg';
 
 const defaultSpanTypeIcons: { [key: string]: string } = {
   cache: databaseIcon,
diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx b/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
index d68b042159bb9..a56f10df28ca5 100644
--- a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx
@@ -15,7 +15,7 @@ import {
 import type { Story } from '@storybook/react';
 import React from 'react';
 import { getSpanIcon, spanTypeIcons } from './get_span_icon';
-import { SpanIcon } from './index';
+import { SpanIcon } from '.';
 
 const spanTypes = Object.keys(spanTypeIcons);
 
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx
index 0ee4f66e2c24c..afa9fd640472d 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx
@@ -8,8 +8,8 @@
 import { EuiAccordion, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stacktrace } from '.';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 
 const Accordion = euiStyled(EuiAccordion)`
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
index a03b0b5f2ae01..9ba8919affc74 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
@@ -13,7 +13,7 @@ import javascript from 'react-syntax-highlighter/dist/cjs/languages/hljs/javascr
 import python from 'react-syntax-highlighter/dist/cjs/languages/hljs/python';
 import ruby from 'react-syntax-highlighter/dist/cjs/languages/hljs/ruby';
 import xcode from 'react-syntax-highlighter/dist/cjs/styles/hljs/xcode';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { StackframeWithLineContext } from '../../../../typings/es_schemas/raw/fields/stackframe';
 
 SyntaxHighlighter.registerLanguage('javascript', javascript);
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx
index 8c9b9ae26c140..796faf775a30a 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ComponentType } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import {
   CSharpFrameHeadingRenderer,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
index 6d2288235899e..1fc295a35cbb7 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 import { DefaultFrameHeadingRenderer } from './default_frame_heading_renderer';
 
 export function CSharpFrameHeadingRenderer({
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
index cc101697155ee..da01abf6d94e3 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function DefaultFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
index 847e05de38868..4b4864e7f1f76 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function JavaFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
index d3430c63722ce..a50f782f19ec2 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function JavaScriptFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
index efda5b3b5c98c..0446c790225e5 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FrameHeadingRendererProps } from './';
+import { FrameHeadingRendererProps } from '.';
 
 export function RubyFrameHeadingRenderer({
   stackframe,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx
index 965d6bf8d5df8..eb32a2aa8ce4d 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { isEmpty, last } from 'lodash';
 import React, { Fragment } from 'react';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
-import { EmptyMessage } from '../../shared/empty_message';
+import { EmptyMessage } from '../empty_message';
 import { LibraryStacktrace } from './library_stacktrace';
 import { Stackframe as StackframeComponent } from './stackframe';
 
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx
index 11017dd09d4ee..1957f9cff382d 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx
@@ -8,7 +8,7 @@
 import { EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { Stackframe as StackframeComponent } from './stackframe';
 
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx
index 48c81b2365d2d..b8de428d819e1 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx
@@ -7,7 +7,7 @@
 
 import { EuiAccordion } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   Stackframe as StackframeType,
   StackframeWithLineContext,
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts b/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts
index 432ebb1d9492b..35a43a2e0cc76 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
-import { getGroupedStackframes } from './';
+import { getGroupedStackframes } from '.';
 import stacktracesMock from './__fixtures__/stacktraces.json';
 
 describe('Stacktrace', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx b/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx
index 01abfbe0915dc..2844589cc60a8 100644
--- a/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx
+++ b/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx
@@ -8,7 +8,7 @@
 import { EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { KeyValueTable } from '../key_value_table';
 import { flattenObject } from '../../../utils/flatten_object';
diff --git a/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx b/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx
index 49488ba09e068..ae76e4116e358 100644
--- a/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate } from '../../../utils/style';
 
 export interface IStickyProperty {
diff --git a/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx b/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx
index 2e3a1af38e2ff..742ea46cee539 100644
--- a/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx
+++ b/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx
@@ -8,10 +8,10 @@
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { createCallApmApi } from '../../../services/rest/create_call_apm_api';
-import { SuggestionsSelect } from './';
+import { SuggestionsSelect } from '.';
 
 interface Args {
   allOption: EuiComboBoxOptionOption<string>;
diff --git a/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx b/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx
index 17189f1e40d94..1f339188db149 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBadge } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useTheme } from '../../../hooks/use_theme';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx
index 3e1848af316fe..6091a6ff8c73d 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 import { HttpInfoSummaryItem } from '.';
 import * as exampleTransactions from '../__fixtures__/transactions';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 describe('HttpInfoSummaryItem', () => {
   describe('render', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx
index 51e574324dfa6..082a124dee890 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx
@@ -8,7 +8,7 @@
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate, unit } from '../../../../utils/style';
 import { HttpStatusBadge } from '../http_status_badge';
 
diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx b/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx
index 3972dc15dbea1..62b2407e7cadf 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { HttpStatusBadge } from './index';
+import { HttpStatusBadge } from '.';
 import {
   successColor,
   neutralColor,
diff --git a/x-pack/plugins/apm/public/components/shared/summary/index.tsx b/x-pack/plugins/apm/public/components/shared/summary/index.tsx
index 1880ee00f3de7..649d9bdb66447 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Maybe } from '../../../../typings/common';
 
 interface Props {
diff --git a/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx b/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx
index 7ceec331ae8fe..4b4ab9b61365c 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
-import { Summary } from './';
+import { Summary } from '.';
 import { TimestampTooltip } from '../timestamp_tooltip';
 import { DurationSummaryItem } from './duration_summary_item';
 import { ErrorCountSummaryItemBadge } from './error_count_summary_item_badge';
diff --git a/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx b/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx
index 20fd19a06c9eb..1ca8bd1fc8bed 100644
--- a/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx
+++ b/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { UserAgent } from '../../../../typings/es_schemas/raw/fields/user_agent';
 
 type UserAgentSummaryItemProps = UserAgent;
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts
index 23e1c94729204..12811360cabc8 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { getComparisonEnabled } from './get_comparison_enabled';
 
 describe('getComparisonEnabled', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts
index 5f2ca5dca4656..916e55709d6ef 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreStart } from 'kibana/public';
-import { enableComparisonByDefault } from '../../../../../observability/public';
+import { CoreStart } from '@kbn/core/public';
+import { enableComparisonByDefault } from '@kbn/observability-plugin/public';
 
 export function getComparisonEnabled({
   core,
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx
index 93d24208a0681..3d0c0b0cd9d8f 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx
@@ -8,13 +8,13 @@
 import { render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   expectTextsInDocument,
   expectTextsNotInDocument,
 } from '../../../utils/test_helpers';
-import { TimeComparison } from './';
-import * as urlHelpers from '../../shared/links/url_helpers';
+import { TimeComparison } from '.';
+import * as urlHelpers from '../links/url_helpers';
 import moment from 'moment';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx
index d587d363d921d..f776d32c7c6d1 100644
--- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx
@@ -9,12 +9,12 @@ import { EuiCheckbox, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
 import { useBreakpoints } from '../../../hooks/use_breakpoints';
 import { useTimeRange } from '../../../hooks/use_time_range';
-import * as urlHelpers from '../../shared/links/url_helpers';
+import * as urlHelpers from '../links/url_helpers';
 import { getComparisonOptions } from './get_comparison_options';
 
 const PrependContainer = euiStyled.div`
diff --git a/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx b/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx
index 2b9ab7d8c5dbf..1072799a2106f 100644
--- a/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import moment from 'moment-timezone';
-import { TimestampTooltip } from './index';
+import { TimestampTooltip } from '.';
 import { mockNow } from '../../../utils/test_helpers';
 
 describe('TimestampTooltip', () => {
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx
index 5cd7188c8ba8b..d20a158b62c77 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx
@@ -7,10 +7,7 @@
 
 import Mustache from 'mustache';
 import React from 'react';
-import {
-  SectionLink,
-  SectionLinks,
-} from '../../../../../../observability/public';
+import { SectionLink, SectionLinks } from '@kbn/observability-plugin/public';
 import { CustomLink } from '../../../../../common/custom_link/custom_link_types';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
 import { unit } from '../../../../utils/style';
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx
index 68442ede98347..e9c7e6ec01d16 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx
@@ -21,7 +21,7 @@ import {
   Section,
   SectionSubtitle,
   SectionTitle,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { NO_PERMISSION_LABEL } from '../../../../../common/custom_link';
 import {
   CustomLink,
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
index 1d37dde6c6343..2b3a08028ccec 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Location } from 'history';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { getSections } from './sections';
 
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
index 8fbf0ea1f3235..29db2d09b3bcf 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import { IBasePath } from 'kibana/public';
+import { IBasePath } from '@kbn/core/public';
 import { isEmpty, pickBy } from 'lodash';
 import moment from 'moment';
 import url from 'url';
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
index ebdbf759bcddc..9c5dd2bbe03b6 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx
@@ -8,7 +8,7 @@
 import { act, fireEvent, render } from '@testing-library/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { License } from '../../../../../licensing/common/license';
+import { License } from '@kbn/licensing-plugin/common/license';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
 import {
diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx
index 253c792246139..8b010e79fb7b9 100644
--- a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx
+++ b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx
@@ -17,7 +17,7 @@ import {
   SectionLinks,
   SectionSubtitle,
   SectionTitle,
-} from '../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { useLicenseContext } from '../../../context/license/use_license_context';
diff --git a/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx b/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx
index 3b649d77172ee..5f41838858e6a 100644
--- a/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiToolTip } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { truncate } from '../../../utils/style';
 
 const tooltipAnchorClassname = '_apm_truncate_tooltip_anchor_';
diff --git a/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx b/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx
index 59a0d1fec8006..67209c23324ad 100644
--- a/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { createContext } from 'react';
-import type { ObservabilityRuleTypeRegistry } from '../../../../observability/public';
-import { ConfigSchema } from '../..';
+import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
+import { MapsStartApi } from '@kbn/maps-plugin/public';
+import { ObservabilityPublicStart } from '@kbn/observability-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 import { ApmPluginSetupDeps } from '../../plugin';
-import { MapsStartApi } from '../../../../maps/public';
-import { ObservabilityPublicStart } from '../../../../observability/public';
-import { Start as InspectorPluginStart } from '../../../../../../src/plugins/inspector/public';
+import { ConfigSchema } from '../..';
 
 export interface ApmPluginContextValue {
   appMountParameters: AppMountParameters;
diff --git a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
index 025338bb53517..ddc7db4c6e5f4 100644
--- a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
@@ -10,16 +10,16 @@ import { RouterProvider } from '@kbn/typed-react-router-config';
 import { useHistory } from 'react-router-dom';
 import { createMemoryHistory, History } from 'history';
 import { merge } from 'lodash';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { UrlService } from '../../../../../../src/plugins/share/common/url_service';
-import { createObservabilityRuleTypeRegistryMock } from '../../../../observability/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { UrlService } from '@kbn/share-plugin/common/url_service';
+import { createObservabilityRuleTypeRegistryMock } from '@kbn/observability-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { MlLocatorDefinition } from '@kbn/ml-plugin/public';
+import { enableComparisonByDefault } from '@kbn/observability-plugin/public';
 import { ApmPluginContext, ApmPluginContextValue } from './apm_plugin_context';
 import { ConfigSchema } from '../..';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { createCallApmApi } from '../../services/rest/create_call_apm_api';
 import { apmRouter } from '../../components/routing/apm_route_config';
-import { MlLocatorDefinition } from '../../../../ml/public';
-import { enableComparisonByDefault } from '../../../../observability/public';
 
 const coreStart = coreMock.createStart({ basePath: '/basepath' });
 
diff --git a/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx b/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx
index 906d2b19abf9f..541fa1197ec2b 100644
--- a/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx
+++ b/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx
@@ -9,10 +9,10 @@ import {
   RouteMatch,
   useMatchRoutes,
 } from '@kbn/typed-react-router-config';
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { compact, isEqual } from 'lodash';
 import React, { createContext, useMemo, useState } from 'react';
-import { useBreadcrumbs } from '../../../../observability/public';
+import { useBreadcrumbs } from '@kbn/observability-plugin/public';
 
 export interface Breadcrumb {
   title: string;
diff --git a/x-pack/plugins/apm/public/context/license/license_context.tsx b/x-pack/plugins/apm/public/context/license/license_context.tsx
index 356fd791abdd0..1ec6fe2d4dbe3 100644
--- a/x-pack/plugins/apm/public/context/license/license_context.tsx
+++ b/x-pack/plugins/apm/public/context/license/license_context.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import useObservable from 'react-use/lib/useObservable';
-import { ILicense } from '../../../../licensing/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { useApmPluginContext } from '../apm_plugin/use_apm_plugin_context';
 import { InvalidLicenseNotification } from './invalid_license_notification';
 
diff --git a/x-pack/plugins/apm/public/feature_catalogue_entry.ts b/x-pack/plugins/apm/public/feature_catalogue_entry.ts
index eadc8b6cbbcb6..8a6a70bd91164 100644
--- a/x-pack/plugins/apm/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/apm/public/feature_catalogue_entry.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 
 export const featureCatalogueEntry = {
   id: 'apm',
@@ -19,5 +19,5 @@ export const featureCatalogueEntry = {
   icon: 'apmApp',
   path: '/app/apm',
   showOnHomePage: false,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data' as FeatureCatalogueCategory,
 };
diff --git a/x-pack/plugins/apm/public/hooks/use_current_user.ts b/x-pack/plugins/apm/public/hooks/use_current_user.ts
index 6f7c999c01e86..0e95bb27bbb87 100644
--- a/x-pack/plugins/apm/public/hooks/use_current_user.ts
+++ b/x-pack/plugins/apm/public/hooks/use_current_user.ts
@@ -6,9 +6,9 @@
  */
 
 import { useState, useEffect } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { ApmPluginStartDeps } from '../plugin';
-import { AuthenticatedUser } from '../../../security/common/model';
 
 export function useCurrentUser() {
   const {
diff --git a/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts b/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts
index a0b06c241a28c..eb6ca4f38f623 100644
--- a/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts
+++ b/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts
@@ -6,7 +6,7 @@
  */
 import qs from 'query-string';
 import { useHistory, useLocation } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { TimePickerTimeDefaults } from '../components/shared/date_picker/typings';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
 
diff --git a/x-pack/plugins/apm/public/hooks/use_default_environment.ts b/x-pack/plugins/apm/public/hooks/use_default_environment.ts
index ed95bd7853bcd..0f266379aaa47 100644
--- a/x-pack/plugins/apm/public/hooks/use_default_environment.ts
+++ b/x-pack/plugins/apm/public/hooks/use_default_environment.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { defaultApmServiceEnvironment } from '../../../observability/common';
+import { defaultApmServiceEnvironment } from '@kbn/observability-plugin/common';
 import { ENVIRONMENT_ALL } from '../../common/environment_filter_values';
 import { Environment } from '../../common/environment_rt';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx b/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx
index eb78f386105b5..ed4d1f0791992 100644
--- a/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx
@@ -7,8 +7,8 @@
 
 import { renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import React, { ReactNode } from 'react';
-import { CoreStart } from '../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { delay } from '../utils/test_helpers';
 import { FetcherResult, useFetcher } from './use_fetcher';
 
diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx b/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
index e0c62fa8953d9..139a43c9a9d9b 100644
--- a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_fetcher.tsx
@@ -7,14 +7,14 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useMemo, useState } from 'react';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useInspectorContext } from '@kbn/observability-plugin/public';
 import { useTimeRangeId } from '../context/time_range_id/use_time_range_id';
 import {
   AutoAbortedAPMClient,
   callApmApi,
 } from '../services/rest/create_call_apm_api';
-import { useInspectorContext } from '../../../observability/public';
 
 export enum FETCH_STATUS {
   LOADING = 'loading',
diff --git a/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts b/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts
index d289c29b60b37..5eb1f6bb8f0bf 100644
--- a/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts
+++ b/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { ML_PAGES, useMlHref } from '../../../ml/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { ML_PAGES, useMlHref } from '@kbn/ml-plugin/public';
 import { TimePickerRefreshInterval } from '../components/shared/date_picker/typings';
 import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
 import { useLegacyUrlParams } from '../context/url_params_context/use_url_params';
diff --git a/x-pack/plugins/apm/public/hooks/use_theme.tsx b/x-pack/plugins/apm/public/hooks/use_theme.tsx
index d140e82977fb0..8c18ac38efc33 100644
--- a/x-pack/plugins/apm/public/hooks/use_theme.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_theme.tsx
@@ -7,7 +7,7 @@
 
 import { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
-import { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 export function useTheme(): EuiTheme {
   const theme = useContext(ThemeContext);
diff --git a/x-pack/plugins/apm/public/index.ts b/x-pack/plugins/apm/public/index.ts
index 9b2175dd465bc..1a5177b7f1f8c 100644
--- a/x-pack/plugins/apm/public/index.ts
+++ b/x-pack/plugins/apm/public/index.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  PluginInitializer,
-  PluginInitializerContext,
-} from '../../../../src/core/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import { ApmPlugin, ApmPluginSetup, ApmPluginStart } from './plugin';
 
 export interface ConfigSchema {
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 83aad1b3b4fe6..591b2322af0d5 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -7,8 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { UsageCollectionStart } from 'src/plugins/usage_collection/public';
-import type { ConfigSchema } from '.';
+import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import {
   AppMountParameters,
   CoreSetup,
@@ -16,33 +15,36 @@ import {
   DEFAULT_APP_CATEGORIES,
   Plugin,
   PluginInitializerContext,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { Start as InspectorPluginStart } from '../../../../src/plugins/inspector/public';
+} from '@kbn/data-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 import type {
   PluginSetupContract as AlertingPluginPublicSetup,
   PluginStartContract as AlertingPluginPublicStart,
-} from '../../alerting/public';
-import type { FeaturesPluginSetup } from '../../features/public';
-import type { FleetStart } from '../../fleet/public';
-import type { LicensingPluginSetup } from '../../licensing/public';
-import type { MapsStartApi } from '../../maps/public';
-import type { MlPluginSetup, MlPluginStart } from '../../ml/public';
+} from '@kbn/alerting-plugin/public';
+import type { FeaturesPluginSetup } from '@kbn/features-plugin/public';
+import type { FleetStart } from '@kbn/fleet-plugin/public';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
 import {
   FetchDataParams,
   METRIC_TYPE,
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../observability/public';
+} from '@kbn/observability-plugin/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { SecurityPluginStart } from '@kbn/security-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { enableServiceGroups } from '@kbn/observability-plugin/public';
 import { registerApmAlerts } from './components/alerting/register_apm_alerts';
 import {
   getApmEnrollmentFlyoutData,
@@ -52,9 +54,7 @@ import { getLazyApmAgentsTabExtension } from './components/fleet_integration/laz
 import { getLazyAPMPolicyCreateExtension } from './components/fleet_integration/lazy_apm_policy_create_extension';
 import { getLazyAPMPolicyEditExtension } from './components/fleet_integration/lazy_apm_policy_edit_extension';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
-import type { SecurityPluginStart } from '../../security/public';
-import { SpacesPluginStart } from '../../spaces/public';
-import { enableServiceGroups } from '../../observability/public';
+import type { ConfigSchema } from '.';
 
 export type ApmPluginSetup = ReturnType<ApmPlugin['setup']>;
 
diff --git a/x-pack/plugins/apm/public/services/call_api.test.ts b/x-pack/plugins/apm/public/services/call_api.test.ts
index e172d41001f16..63ea230fe216e 100644
--- a/x-pack/plugins/apm/public/services/call_api.test.ts
+++ b/x-pack/plugins/apm/public/services/call_api.test.ts
@@ -7,7 +7,7 @@
 
 import { mockNow } from '../utils/test_helpers';
 import { clearCache, callApi } from './rest/call_api';
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 
 type CoreMock = CoreStart & {
   http: {
diff --git a/x-pack/plugins/apm/public/services/call_apm_api.test.ts b/x-pack/plugins/apm/public/services/call_apm_api.test.ts
index 2e74d36b97b38..dceeba14504c3 100644
--- a/x-pack/plugins/apm/public/services/call_apm_api.test.ts
+++ b/x-pack/plugins/apm/public/services/call_apm_api.test.ts
@@ -7,7 +7,7 @@
 
 import * as callApiExports from './rest/call_api';
 import { createCallApmApi, callApmApi } from './rest/create_call_apm_api';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 const callApi = jest
   .spyOn(callApiExports, 'callApi')
diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
index c52d38489a85e..f6a3f87fe4bf0 100644
--- a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
+++ b/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts
@@ -8,7 +8,7 @@
 import {
   ApmFetchDataResponse,
   FetchDataParams,
-} from '../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { callApmApi } from './create_call_apm_api';
 
 export const fetchObservabilityOverviewPageData = async ({
diff --git a/x-pack/plugins/apm/public/services/rest/call_api.ts b/x-pack/plugins/apm/public/services/rest/call_api.ts
index 196878a08821e..c0458241460e8 100644
--- a/x-pack/plugins/apm/public/services/rest/call_api.ts
+++ b/x-pack/plugins/apm/public/services/rest/call_api.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import { isString, startsWith } from 'lodash';
 import LRU from 'lru-cache';
 import hash from 'object-hash';
-import { enableInspectEsQueries } from '../../../../observability/public';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/public';
 import { FetchOptions } from '../../../common/fetch_options';
 
 function fetchOptionsWithDebug(
diff --git a/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts b/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts
index 214f91198e35f..e9450ec67cc88 100644
--- a/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts
+++ b/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import type {
   ClientRequestParamsOf,
   formatRequest as formatRequestType,
@@ -18,6 +18,7 @@ import type {
 // so in order to do targeted imports they must me imported separately, and
 // an error is expected here
 import { formatRequest } from '@kbn/server-route-repository/target_node/format_request';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
 import { FetchOptions } from '../../../common/fetch_options';
 import { CallApi, callApi } from './call_api';
 import type {
@@ -25,7 +26,6 @@ import type {
   APIEndpoint,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../server';
-import { InspectResponse } from '../../../../observability/typings/common';
 
 export type APMClientOptions = Omit<
   FetchOptions,
diff --git a/x-pack/plugins/apm/public/set_help_extension.ts b/x-pack/plugins/apm/public/set_help_extension.ts
index 9015a28822a75..0b79f81cce2d2 100644
--- a/x-pack/plugins/apm/public/set_help_extension.ts
+++ b/x-pack/plugins/apm/public/set_help_extension.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { getUpgradeAssistantHref } from './components/shared/links/kibana';
 
 export function setHelpExtension({ chrome, http }: CoreStart) {
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
index 0fe659700a1eb..2ef44b9538318 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
@@ -6,10 +6,10 @@
  */
 
 import { Story } from '@storybook/react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React from 'react';
 import { POLICY_ELASTIC_AGENT_ON_CLOUD } from '../../../common/fleet';
-import TutorialConfigAgent from './';
+import TutorialConfigAgent from '.';
 import { APIReturnType } from '../../services/rest/create_call_apm_api';
 
 export type APIResponseType = APIReturnType<'GET /internal/apm/fleet/agents'>;
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts
index 0336c5942127d..b0613c8536756 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts
@@ -6,7 +6,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import { POLICY_ELASTIC_AGENT_ON_CLOUD } from '../../../common/fleet';
-import { APIResponseType } from './';
+import { APIResponseType } from '.';
 
 const DEFAULT_STANDALONE_CONFIG_LABEL = i18n.translate(
   'xpack.apm.tutorial.agent_config.defaultStandaloneConfig',
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
index ab2163cc961bf..c41f6df5369f6 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx
@@ -5,13 +5,13 @@
  * 2.0.
  */
 import { fireEvent, render, screen } from '@testing-library/react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React from 'react';
 import {
   expectTextsInDocument,
   expectTextsNotInDocument,
 } from '../../utils/test_helpers';
-import TutorialConfigAgent from './';
+import TutorialConfigAgent from '.';
 
 const policyElasticAgentOnCloudAgent = {
   id: 'policy-elastic-agent-on-cloud',
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
index 68952193282fd..72fb4f453eff8 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx
@@ -6,7 +6,7 @@
  */
 import { EuiCodeBlock, EuiLoadingSpinner, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React, { useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
 import { APIReturnType } from '../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx
index 4a4bfb252bfe5..67d568c0114e8 100644
--- a/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx
+++ b/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React from 'react';
-import TutorialConfigAgent from './';
+import TutorialConfigAgent from '.';
 
 interface Props {
   http: HttpStart;
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
index 87a0d216648f9..9fc4cf32fe000 100644
--- a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx
@@ -16,7 +16,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { APIReturnType } from '../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx
index 733b7a91ed663..b5d0857042812 100644
--- a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx
+++ b/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx
@@ -7,7 +7,7 @@
 
 import { Story } from '@storybook/react';
 import React from 'react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import TutorialFleetInstructions from '.';
 
 interface Args {
diff --git a/x-pack/plugins/apm/public/update_badge.ts b/x-pack/plugins/apm/public/update_badge.ts
index addaf88ab7f39..a81a3181008d8 100644
--- a/x-pack/plugins/apm/public/update_badge.ts
+++ b/x-pack/plugins/apm/public/update_badge.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 export function setReadonlyBadge({ application, chrome }: CoreStart) {
   const canSave = application.capabilities.apm.save;
diff --git a/x-pack/plugins/apm/public/utils/test_helpers.tsx b/x-pack/plugins/apm/public/utils/test_helpers.tsx
index 042d84a75bf76..d365cfc26d658 100644
--- a/x-pack/plugins/apm/public/utils/test_helpers.tsx
+++ b/x-pack/plugins/apm/public/utils/test_helpers.tsx
@@ -18,11 +18,11 @@ import moment from 'moment';
 import { Moment } from 'moment-timezone';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { APMConfig } from '../../server';
 import { MockApmPluginContextWrapper } from '../context/apm_plugin/mock_apm_plugin_context';
diff --git a/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js b/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js
index 9cbfe73eeb6dc..c8f1eb764155f 100644
--- a/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js
+++ b/x-pack/plugins/apm/scripts/aggregate_latency_metrics.js
@@ -8,9 +8,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-const {
-  aggregateLatencyMetrics,
-} = require('./aggregate_latency_metrics/index.ts');
+const { aggregateLatencyMetrics } = require('./aggregate_latency_metrics');
 
 aggregateLatencyMetrics().catch((err) => {
   if (err.meta && err.meta.body) {
diff --git a/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js b/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js
index 8d8b0c2d3d813..25bbe25e74a3f 100644
--- a/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js
+++ b/x-pack/plugins/apm/scripts/create_apm_users_and_roles.js
@@ -20,4 +20,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./create_apm_users_and_roles/create_apm_users_and_roles_cli.ts');
+require('./create_apm_users_and_roles/create_apm_users_and_roles_cli');
diff --git a/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts b/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts
index a4979146c5af4..71aa4184e983a 100644
--- a/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts
+++ b/x-pack/plugins/apm/scripts/create_apm_users_and_roles/helpers/create_role.ts
@@ -6,7 +6,7 @@
  */
 /* eslint-disable no-console */
 
-import { Role } from '../../../../security/common/model';
+import { Role } from '@kbn/security-plugin/common/model';
 import { callKibana, isAxiosError } from './call_kibana';
 import { Elasticsearch, Kibana } from '../create_apm_users_and_roles';
 
diff --git a/x-pack/plugins/apm/scripts/create_apm_users_and_roles/roles/power_user_role.ts b/x-pack/plugins/apm/scripts/create_apm_users_and_roles/roles/power_user_role.ts
index 8b92096755d24..fec628bf04233 100644
--- a/x-pack/plugins/apm/scripts/create_apm_users_and_roles/roles/power_user_role.ts
+++ b/x-pack/plugins/apm/scripts/create_apm_users_and_roles/roles/power_user_role.ts
@@ -67,6 +67,7 @@ export const powerUserRole: RoleType = {
         savedObjectsManagement: ['all'],
         stackAlerts: ['all'],
         fleet: ['all'],
+        fleetv2: ['all'],
         actions: ['all'],
       },
       spaces: ['*'],
diff --git a/x-pack/plugins/apm/scripts/create_functional_tests_archive.js b/x-pack/plugins/apm/scripts/create_functional_tests_archive.js
index 55290f00a6d8c..b1b766990ad67 100644
--- a/x-pack/plugins/apm/scripts/create_functional_tests_archive.js
+++ b/x-pack/plugins/apm/scripts/create_functional_tests_archive.js
@@ -9,4 +9,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./create_functional_tests_archive/index.ts');
+require('./create_functional_tests_archive');
diff --git a/x-pack/plugins/apm/scripts/infer_route_return_types.js b/x-pack/plugins/apm/scripts/infer_route_return_types.js
index cd973ff36d3ab..8bf3bdbcdf3d3 100644
--- a/x-pack/plugins/apm/scripts/infer_route_return_types.js
+++ b/x-pack/plugins/apm/scripts/infer_route_return_types.js
@@ -9,4 +9,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./infer_route_return_types/index.ts');
+require('./infer_route_return_types');
diff --git a/x-pack/plugins/apm/scripts/shared/get_es_client.ts b/x-pack/plugins/apm/scripts/shared/get_es_client.ts
index 3ee5642852c06..bd81b139d86ae 100644
--- a/x-pack/plugins/apm/scripts/shared/get_es_client.ts
+++ b/x-pack/plugins/apm/scripts/shared/get_es_client.ts
@@ -10,7 +10,7 @@ import type { ClientOptions } from '@elastic/elasticsearch/lib/client';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 
 export type ESClient = ReturnType<typeof getEsClient>;
 
diff --git a/x-pack/plugins/apm/scripts/test/jest.js b/x-pack/plugins/apm/scripts/test/jest.js
index 9ff5c9a4a3793..c4c5d24d839b3 100644
--- a/x-pack/plugins/apm/scripts/test/jest.js
+++ b/x-pack/plugins/apm/scripts/test/jest.js
@@ -13,7 +13,7 @@ const { run } = require('jest');
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'test';
 
-const config = require('../../jest.config.js');
+const config = require('../../jest.config');
 
 const argv = [...process.argv.slice(2), '--config', JSON.stringify(config)];
 
diff --git a/x-pack/plugins/apm/scripts/upload_telemetry_data.js b/x-pack/plugins/apm/scripts/upload_telemetry_data.js
index f101fb73aba95..e82e197097dd8 100644
--- a/x-pack/plugins/apm/scripts/upload_telemetry_data.js
+++ b/x-pack/plugins/apm/scripts/upload_telemetry_data.js
@@ -9,4 +9,4 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 require('@kbn/optimizer').registerNodeAutoTranspilation();
 
-require('./upload_telemetry_data/index.ts');
+require('./upload_telemetry_data');
diff --git a/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts b/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts
index 5ac4f6ad8b406..0f8a6f874d72f 100644
--- a/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts
+++ b/x-pack/plugins/apm/scripts/upload_telemetry_data/index.ts
@@ -15,7 +15,7 @@
 import { merge, chunk, flatten, omit } from 'lodash';
 import { argv } from 'yargs';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { CollectTelemetryParams } from '../../server/lib/apm_telemetry/collect_data_telemetry';
 import { downloadTelemetryTemplate } from '../shared/download_telemetry_template';
diff --git a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts b/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
index 8761e46df9aaa..b57628a3f326b 100644
--- a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
+++ b/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
@@ -7,11 +7,11 @@
 
 import { kibanaPackageJson } from '@kbn/utils';
 
-import { GetDeprecationsContext } from '../../../../../src/core/server';
-import { CloudSetup } from '../../../cloud/server';
-import { getDeprecations } from './';
-import { APMRouteHandlerResources } from '../';
-import { AgentPolicy } from '../../../fleet/common';
+import { GetDeprecationsContext } from '@kbn/core/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { getDeprecations } from '.';
+import { APMRouteHandlerResources } from '..';
+import { AgentPolicy } from '@kbn/fleet-plugin/common';
 
 const deprecationContext = {
   esClient: {},
diff --git a/x-pack/plugins/apm/server/deprecations/index.ts b/x-pack/plugins/apm/server/deprecations/index.ts
index 76637842e9503..6545e4bfeff09 100644
--- a/x-pack/plugins/apm/server/deprecations/index.ts
+++ b/x-pack/plugins/apm/server/deprecations/index.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { GetDeprecationsContext, DeprecationsDetails } from 'src/core/server';
+import { GetDeprecationsContext, DeprecationsDetails } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { CloudSetup } from '../../../cloud/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   getCloudAgentPolicy,
   getApmPackagePolicy,
 } from '../routes/fleet/get_cloud_apm_package_policy';
-import { APMRouteHandlerResources } from '../';
+import { APMRouteHandlerResources } from '..';
 
 export function getDeprecations({
   cloudSetup,
diff --git a/x-pack/plugins/apm/server/feature.ts b/x-pack/plugins/apm/server/feature.ts
index 4c1fe784ea490..adf1759312449 100644
--- a/x-pack/plugins/apm/server/feature.ts
+++ b/x-pack/plugins/apm/server/feature.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LicenseType } from '../../licensing/common/types';
-import { AlertType, APM_SERVER_FEATURE_ID } from '../common/alert_types';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import {
   LicensingPluginSetup,
   LicensingApiRequestHandlerContext,
-} from '../../licensing/server';
+} from '@kbn/licensing-plugin/server';
+import { AlertType, APM_SERVER_FEATURE_ID } from '../common/alert_types';
 
 export const APM_FEATURE = {
   id: APM_SERVER_FEATURE_ID,
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 958bfb672083a..6c853ea02a34b 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -9,8 +9,8 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import {
   PluginConfigDescriptor,
   PluginInitializerContext,
-} from 'src/core/server';
-import { maxSuggestions } from '../../observability/common';
+} from '@kbn/core/server';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { SearchAggregatedTransactionSetting } from '../common/aggregated_transactions';
 import { APMPlugin } from './plugin';
 
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts
index fbc08aa657f71..57f76e9805be7 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts
@@ -8,7 +8,7 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 import { Setup } from '../helpers/setup_request';
 
 interface SharedFields {
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts
index f988043023ac0..ced20138e9739 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-import { termQuery, termsQuery } from '../../../../observability/server';
+import { termQuery, termsQuery } from '@kbn/observability-plugin/server';
 import {
   ApmMlDetectorType,
   getApmMlDetectorIndex,
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
index d855adee4a9ba..3be864fe8127e 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { snakeCase } from 'lodash';
 import moment from 'moment';
 import uuid from 'uuid/v4';
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts
index 37279d3320585..69c7252a3c1be 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts
@@ -7,7 +7,7 @@
 
 import type { Logger } from '@kbn/logging';
 import { compact, keyBy } from 'lodash';
-import { rangeQuery } from '../../../../observability/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { apmMlAnomalyQuery } from './apm_ml_anomaly_query';
 import {
   ApmMlDetectorType,
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
index 1f989ba17fe7c..6d290d5ad8506 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlPluginSetup } from '../../../../ml/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { ApmMlJob } from '../../../common/anomaly_detection/apm_ml_job';
 import { Environment } from '../../../common/environment_rt';
 import { withApmSpan } from '../../utils/with_apm_span';
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
index 8aee60357ba73..2a196c3e04638 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
@@ -6,12 +6,12 @@
  */
 
 import { merge } from 'lodash';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 import { ApmIndicesConfig } from '../../../routes/settings/apm_indices/get_apm_indices';
 import { tasks } from './tasks';
 import { APMDataTelemetry } from '../types';
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
index 310e9c30c71e0..d8e1638ad4a57 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
@@ -5,20 +5,15 @@
  * 2.0.
  */
 
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import {
-  CoreSetup,
-  Logger,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
-import { unwrapEsResponse } from '../../../../observability/server';
-import { APMConfig } from '../..';
+import { Observable, firstValueFrom } from 'rxjs';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CoreSetup, Logger, SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { unwrapEsResponse } from '@kbn/observability-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+import { APMConfig } from '../..';
 import {
   APM_TELEMETRY_SAVED_OBJECT_ID,
   APM_TELEMETRY_SAVED_OBJECT_TYPE,
@@ -66,7 +61,7 @@ export async function createApmTelemetry({
   const savedObjectsClient = await getInternalSavedObjectsClient(core);
 
   const collectAndStore = async () => {
-    const config = await config$.pipe(take(1)).toPromise();
+    const config = await firstValueFrom(config$);
     const [{ elasticsearch }] = await core.getStartServices();
     const esClient = elasticsearch.client;
 
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts
index 76c897dec5693..63bacf6264e25 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import {
   AggregatedTransactionsCounts,
   APMUsage,
diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts
index 2eb0ed3db02bd..4e3dd452276d5 100644
--- a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts
+++ b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts
@@ -7,6 +7,7 @@
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import objectHash from 'object-hash';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { getOffsetInMs } from '../../../../common/utils/get_offset_in_ms';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../common/environment_filter_values';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
@@ -23,7 +24,6 @@ import {
   SPAN_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery } from '../../../../../observability/server';
 import { Setup } from '../../helpers/setup_request';
 import { withApmSpan } from '../../../utils/with_apm_span';
 import { Node, NodeType } from '../../../../common/connections';
diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts
index ff46db949d122..a0cd85c857a05 100644
--- a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts
+++ b/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts
@@ -8,6 +8,7 @@
 import { sum } from 'lodash';
 import objectHash from 'object-hash';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import { getOffsetInMs } from '../../../../common/utils/get_offset_in_ms';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../common/environment_filter_values';
@@ -24,7 +25,6 @@ import {
   SPAN_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery } from '../../../../../observability/server';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { EventOutcome } from '../../../../common/event_outcome';
 import { Setup } from '../../helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
index a9799c0cfb60c..36d0de8ccde96 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts
@@ -8,11 +8,11 @@
 /* eslint-disable no-console */
 
 import chalk from 'chalk';
-import { KibanaRequest } from '../../../../../../../src/core/server';
-import { RequestStatus } from '../../../../../../../src/plugins/inspector';
-import { WrappedElasticsearchClientError } from '../../../../../observability/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { RequestStatus } from '@kbn/inspector-plugin';
+import { WrappedElasticsearchClientError } from '@kbn/observability-plugin/server';
+import { getInspectResponse } from '@kbn/observability-plugin/server';
 import { inspectableEsQueriesMap } from '../../../routes/apm_routes/register_apm_server_routes';
-import { getInspectResponse } from '../../../../../observability/server';
 
 function formatObj(obj: Record<string, any>) {
   return JSON.stringify(obj, null, 2);
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
index 386372fbf655e..1156930018991 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 export function cancelEsRequestOnAbort<T extends Promise<any>>(
   promise: T,
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
index d69740c51d04d..0e316e81773b4 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
@@ -8,8 +8,8 @@ import { setTimeout as setTimeoutPromise } from 'timers/promises';
 import {
   contextServiceMock,
   executionContextServiceMock,
-} from '../../../../../../../../src/core/server/mocks';
-import { createHttpServer } from 'src/core/server/test_utils';
+} from '@kbn/core/server/mocks';
+import { createHttpServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
 import { APMEventClient } from '.';
 
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
index 4b8f63e33799c..0fcf02f95ac0e 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
@@ -10,17 +10,14 @@ import type {
   TermsEnumResponse,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ValuesType } from 'utility-types';
-import { withApmSpan } from '../../../../utils/with_apm_span';
-import { Profile } from '../../../../../typings/es_schemas/ui/profile';
-import {
-  ElasticsearchClient,
-  KibanaRequest,
-} from '../../../../../../../../src/core/server';
+import { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
 import {
   ESSearchRequest,
   InferSearchResponseOf,
-} from '../../../../../../../../src/core/types/elasticsearch';
-import { unwrapEsResponse } from '../../../../../../observability/server';
+} from '@kbn/core/types/elasticsearch';
+import { unwrapEsResponse } from '@kbn/observability-plugin/server';
+import { Profile } from '../../../../../typings/es_schemas/ui/profile';
+import { withApmSpan } from '../../../../utils/with_apm_span';
 import { ProcessorEvent } from '../../../../../common/processor_event';
 import { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
 import { Metric } from '../../../../../typings/es_schemas/ui/metric';
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
index e62720e9fbd0c..3fc6b40f9cfe7 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts
@@ -6,12 +6,9 @@
  */
 
 import { uniq, defaultsDeep, cloneDeep } from 'lodash';
+import { ESSearchRequest, ESFilter } from '@kbn/core/types/elasticsearch';
 import { PROCESSOR_EVENT } from '../../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../../common/processor_event';
-import {
-  ESSearchRequest,
-  ESFilter,
-} from '../../../../../../../../src/core/types/elasticsearch';
 import { APMEventESSearchRequest, APMEventESTermsEnumRequest } from '.';
 import { ApmIndicesConfig } from '../../../../routes/settings/apm_indices/get_apm_indices';
 
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
index bd54c0916ef96..f494a39956f2b 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts
@@ -6,12 +6,12 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { unwrapEsResponse } from '../../../../../../observability/server';
-import { APMRouteHandlerResources } from '../../../../routes/typings';
+import { unwrapEsResponse } from '@kbn/observability-plugin/server';
 import {
   ESSearchResponse,
   ESSearchRequest,
-} from '../../../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { APMRouteHandlerResources } from '../../../../routes/typings';
 import {
   callAsyncWithDebug,
   getDebugBody,
diff --git a/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts
index 6af6d3342986c..f3f7a4262c8af 100644
--- a/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getBucketSizeForAggregatedTransactions } from './';
+import { getBucketSizeForAggregatedTransactions } from '.';
 
 describe('getBucketSizeForAggregatedTransactions', () => {
   describe('when searchAggregatedTransactions is enabled', () => {
diff --git a/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts b/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts
index b13c8022d89d3..f15e364b06158 100644
--- a/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { withApmSpan } from '../../utils/with_apm_span';
 
 export type InternalSavedObjectsClient = Awaited<
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
index ae47abb01942e..818f999754610 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { setupRequest } from './setup_request';
 import { APMConfig } from '../..';
 import { APMRouteHandlerResources } from '../../routes/typings';
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
index fb2d46bfa5aa2..a3eb942111a48 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { KibanaRequest } from '@kbn/core/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { isActivePlatinumLicense } from '../../../common/license_check';
 import { APMConfig } from '../..';
-import { KibanaRequest } from '../../../../../../src/core/server';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { APMRouteHandlerResources } from '../../routes/typings';
 import {
   ApmIndicesConfig,
diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts b/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts
index 094d5ed6350df..9b596c8438161 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FAAS_COLDSTART } from '../../../common/elasticsearch_fieldnames';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { FAAS_COLDSTART } from '../../../common/elasticsearch_fieldnames';
 
 export const getColdstartAggregation = () => ({
   terms: {
diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts b/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts
index 240cbceb6c878..5108af744273f 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { EVENT_OUTCOME } from '../../../common/elasticsearch_fieldnames';
-import { EventOutcome } from '../../../common/event_outcome';
 import {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { EVENT_OUTCOME } from '../../../common/elasticsearch_fieldnames';
+import { EventOutcome } from '../../../common/event_outcome';
 
 export const getOutcomeAggregation = () => ({
   terms: {
diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts b/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
index a28fe1ad1ecea..7db898af4a810 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { getSearchAggregatedTransactions } from '.';
 import { Setup } from '../setup_request';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { APMEventClient } from '../create_es_client/create_apm_event_client';
 import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts b/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts
index 573cb0a3cf6b4..f98540a85b761 100644
--- a/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { SearchAggregatedTransactionSetting } from '../../../../common/aggregated_transactions';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
   TRANSACTION_DURATION,
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts
index 2a47c4e441dec..f334a9c9f82e6 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
+import { termQuery } from '@kbn/observability-plugin/server';
 import {
   FAAS_COLDSTART,
   SERVICE_NAME,
@@ -12,7 +14,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Coordinate } from '../../../typings/timeseries';
 import {
@@ -26,7 +27,6 @@ import {
   getColdstartAggregation,
   getTransactionColdstartRateTimeSeries,
 } from '../helpers/transaction_coldstart_rate';
-import { termQuery } from '../../../../observability/server';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
 
 export async function getColdstartRate({
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts
index 06c0419f5999e..3d2c678c35cfc 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts
@@ -5,6 +5,11 @@
  * 2.0.
  */
 
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -12,11 +17,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Coordinate } from '../../../typings/timeseries';
 import {
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index 4e603741ea2a5..bc4c0d30a9a81 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import {
   CoreSetup,
   CoreStart,
@@ -13,13 +13,13 @@ import {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { isEmpty, mapValues } from 'lodash';
-import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { experimentalRuleFieldMap } from '../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
-import { Dataset } from '../../rule_registry/server';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
+import { Dataset } from '@kbn/rule-registry-plugin/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { APMConfig, APM_SERVER_FEATURE_ID } from '.';
-import { UI_SETTINGS } from '../../../../src/plugins/data/common';
 import { APM_FEATURE, registerFeaturesUsage } from './feature';
 import { registerApmAlerts } from './routes/alerts/register_apm_alerts';
 import { registerFleetPolicyCallbacks } from './routes/fleet/register_fleet_policy_callbacks';
@@ -154,7 +154,7 @@ export class APMPlugin
     const boundGetApmIndices = async () =>
       getApmIndices({
         savedObjectsClient: await getInternalSavedObjectsClient(core),
-        config: await config$.pipe(take(1)).toPromise(),
+        config: await firstValueFrom(config$),
       });
 
     boundGetApmIndices().then((indices) => {
diff --git a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
index e3e98cc3c1773..545e90914f4d2 100644
--- a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
+++ b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { SetupUX } from '../routes/rum_client/route';
 import {
   AGENT_NAME,
   TRANSACTION_TYPE,
   SERVICE_LANGUAGE_NAME,
 } from '../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../observability/server';
 import { ProcessorEvent } from '../../common/processor_event';
 import { TRANSACTION_PAGE_LOAD } from '../../common/transaction_types';
 import { getEsFilter } from '../routes/rum_client/ui_filters/get_es_filter';
diff --git a/x-pack/plugins/apm/server/projections/typings.ts b/x-pack/plugins/apm/server/projections/typings.ts
index 5558fba4cde2a..6ba7d315bfa6d 100644
--- a/x-pack/plugins/apm/server/projections/typings.ts
+++ b/x-pack/plugins/apm/server/projections/typings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { AggregationOptionsByType } from '../../../../../src/core/types/elasticsearch';
+import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
 import { APMEventESSearchRequest } from '../lib/helpers/create_es_client/create_apm_event_client';
 
 export type Projection = Omit<APMEventESSearchRequest, 'body'> & {
diff --git a/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts b/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts
index 16b2c6f8e6061..8294630dad9d4 100644
--- a/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts
+++ b/x-pack/plugins/apm/server/projections/util/merge_projection/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mergeProjection } from './index';
+import { mergeProjection } from '.';
 
 describe('mergeProjection', () => {
   it('overrides arrays', () => {
diff --git a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts b/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts
index dff7b3b5c32ab..ee01876d743d4 100644
--- a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts
+++ b/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { ApiKey } from '@kbn/security-plugin/common/model';
 import { ApmPluginRequestHandlerContext } from '../typings';
-import { ApiKey } from '../../../../security/common/model';
 
 export async function getAgentKeys({
   context,
diff --git a/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts b/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts
index ebab01464de6b..2f2925d612e04 100644
--- a/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts
@@ -8,8 +8,8 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../src/core/types/elasticsearch';
-import { RuleExecutorServices } from '../../../../alerting/server';
+} from '@kbn/core/types/elasticsearch';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 export async function alertingEsClient<TParams extends ESSearchRequest>({
   scopedClusterClient,
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts
index 6b5fb0c5fb1b4..0247e4088ccab 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_duration.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { rangeQuery, termQuery } from '../../../../../observability/server';
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts
index 708acd6d7f8ea..f283a912bc3cd 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_count.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { AlertParams } from '../route';
-import { rangeQuery, termQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { Setup } from '../../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts
index cf3380c105ac8..71e52640e014d 100644
--- a/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/chart_preview/get_transaction_error_rate.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rangeQuery, termQuery } from '../../../../../observability/server';
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts
index 2f4245c89694a..9aa99572141d5 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.test.ts
@@ -6,7 +6,7 @@
  */
 import { registerAnomalyAlertType } from './register_anomaly_alert_type';
 import { ANOMALY_SEVERITY } from '../../../common/ml_constants';
-import { MlPluginSetup } from '../../../../ml/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import * as GetServiceAnomalies from '../service_map/get_service_anomalies';
 import { createRuleTypeMocks } from './test_utils';
 import { ApmMlJob } from '../../../common/anomaly_detection/apm_ml_job';
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts
index f84fe4d3169fb..7f978c4f61161 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts
@@ -14,10 +14,10 @@ import {
   ALERT_SEVERITY,
 } from '@kbn/rule-data-utils';
 import { compact } from 'lodash';
-import { ESSearchResponse } from 'src/core/types/elasticsearch';
-import { KibanaRequest } from '../../../../../../src/core/server';
-import { termQuery } from '../../../../observability/server';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { KibanaRequest } from '@kbn/core/server';
+import { termQuery } from '@kbn/observability-plugin/server';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import {
   AlertType,
   ALERT_TYPES_CONFIG,
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts b/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts
index dfe0310e919b4..e6fcba2555ada 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_apm_alerts.ts
@@ -6,14 +6,14 @@
  */
 
 import { Observable } from 'rxjs';
-import { IBasePath, Logger } from 'kibana/server';
-import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../alerting/server';
-import { IRuleDataClient } from '../../../../rule_registry/server';
+import { IBasePath, Logger } from '@kbn/core/server';
+import { PluginSetupContract as AlertingPluginSetupContract } from '@kbn/alerting-plugin/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { registerTransactionDurationAlertType } from './register_transaction_duration_alert_type';
 import { registerAnomalyAlertType } from './register_anomaly_alert_type';
 import { registerErrorCountAlertType } from './register_error_count_alert_type';
 import { APMConfig } from '../..';
-import { MlPluginSetup } from '../../../../ml/server';
 import { registerTransactionErrorRateAlertType } from './register_transaction_error_rate_alert_type';
 
 export interface RegisterRuleDependencies {
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
index 5fc32ea363bc6..7c9422d34948d 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_error_count_alert_type.ts
@@ -6,13 +6,14 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
+import { termQuery } from '@kbn/observability-plugin/server';
 import {
   ENVIRONMENT_NOT_DEFINED,
   getEnvironmentEsField,
@@ -32,11 +33,10 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { getApmIndices } from '../../routes/settings/apm_indices/get_apm_indices';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 import { alertingEsClient } from './alerting_es_client';
 import { RegisterRuleDependencies } from './register_apm_alerts';
-import { termQuery } from '../../../../observability/server';
 
 const paramsSchema = schema.object({
   windowSize: schema.number(),
@@ -84,7 +84,7 @@ export function registerErrorCountAlertType({
       minimumLicenseRequired: 'basic',
       isExportable: true,
       executor: async ({ services, params }) => {
-        const config = await config$.pipe(take(1)).toPromise();
+        const config = await firstValueFrom(config$);
         const ruleParams = params;
 
         const indices = await getApmIndices({
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
index bfbb2a99c662c..58fd9323f8702 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_transaction_duration_alert_type.ts
@@ -12,10 +12,10 @@ import {
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
+import { asDuration } from '@kbn/observability-plugin/common/utils/formatters';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import { getAlertUrlTransaction } from '../../../common/utils/formatters';
-import { asDuration } from '../../../../observability/common/utils/formatters';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
 import { SearchAggregatedTransactionSetting } from '../../../common/aggregated_transactions';
 import {
   AlertType,
@@ -40,7 +40,7 @@ import {
   getDocumentTypeFilterForTransactions,
   getDurationFieldForTransactions,
 } from '../../lib/helpers/transactions';
-import { getApmIndices } from '../../routes/settings/apm_indices/get_apm_indices';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 import { alertingEsClient } from './alerting_es_client';
 import { RegisterRuleDependencies } from './register_apm_alerts';
@@ -97,7 +97,7 @@ export function registerTransactionDurationAlertType({
     minimumLicenseRequired: 'basic',
     isExportable: true,
     executor: async ({ services, params }) => {
-      const config = await config$.pipe(take(1)).toPromise();
+      const config = await firstValueFrom(config$);
       const ruleParams = params;
       const indices = await getApmIndices({
         config,
diff --git a/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
index 219f992ad15be..ceecaeb961dd6 100644
--- a/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/register_transaction_error_rate_alert_type.ts
@@ -6,19 +6,21 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
+import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
+import { asPercent } from '@kbn/observability-plugin/common/utils/formatters';
+import { termQuery } from '@kbn/observability-plugin/server';
 import {
   ENVIRONMENT_NOT_DEFINED,
   getEnvironmentEsField,
   getEnvironmentLabel,
 } from '../../../common/environment_filter_values';
 import { getAlertUrlTransaction } from '../../../common/utils/formatters';
-import { createLifecycleRuleTypeFactory } from '../../../../rule_registry/server';
 import {
   AlertType,
   ALERT_TYPES_CONFIG,
@@ -36,14 +38,12 @@ import { EventOutcome } from '../../../common/event_outcome';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { asDecimalOrInteger } from '../../../common/utils/formatters';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { getApmIndices } from '../../routes/settings/apm_indices/get_apm_indices';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { apmActionVariables } from './action_variables';
 import { alertingEsClient } from './alerting_es_client';
 import { RegisterRuleDependencies } from './register_apm_alerts';
 import { SearchAggregatedTransactionSetting } from '../../../common/aggregated_transactions';
 import { getDocumentTypeFilterForTransactions } from '../../lib/helpers/transactions';
-import { asPercent } from '../../../../observability/common/utils/formatters';
-import { termQuery } from '../../../../observability/server';
 
 const paramsSchema = schema.object({
   windowSize: schema.number(),
@@ -93,7 +93,7 @@ export function registerTransactionErrorRateAlertType({
       minimumLicenseRequired: 'basic',
       isExportable: true,
       executor: async ({ services, params: ruleParams }) => {
-        const config = await config$.pipe(take(1)).toPromise();
+        const config = await firstValueFrom(config$);
         const indices = await getApmIndices({
           config,
           savedObjectsClient: services.savedObjectsClient,
diff --git a/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts b/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts
index 71a4e0d3d111e..5302f632781f0 100644
--- a/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IBasePath, Logger } from 'kibana/server';
+import { IBasePath, Logger } from '@kbn/core/server';
 import { of } from 'rxjs';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
-import { IRuleDataClient } from '../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../rule_registry/server/mocks';
-import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../../alerting/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { PluginSetupContract as AlertingPluginSetupContract } from '@kbn/alerting-plugin/server';
 import { APMConfig, APM_SERVER_FEATURE_ID } from '../../..';
 
 export const createRuleTypeMocks = () => {
diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
index c795bbb53d13f..1af4e9d772280 100644
--- a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
+++ b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts
@@ -11,10 +11,11 @@ import {
   ServerRouteRepository,
 } from '@kbn/server-route-repository';
 import * as t from 'io-ts';
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { APMConfig } from '../..';
 import { APMRouteCreateOptions, APMRouteHandlerResources } from '../typings';
 import { registerRoutes } from './register_apm_server_routes';
+import { NEVER } from 'rxjs';
 
 type RegisterRouteDependencies = Parameters<typeof registerRoutes>[0];
 
@@ -105,9 +106,7 @@ const initApi = (
         query: {},
         body: null,
         events: {
-          aborted$: {
-            toPromise: () => new Promise(() => {}),
-          },
+          aborted$: NEVER,
         },
         ...request,
       },
diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts
index aa8b5feec4afc..6de9c99cdbcd3 100644
--- a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts
+++ b/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import * as t from 'io-ts';
-import { KibanaRequest, RouteRegistrar } from 'src/core/server';
+import { KibanaRequest, RouteRegistrar } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
 import agent from 'elastic-apm-node';
 import { ServerRouteRepository } from '@kbn/server-route-repository';
@@ -18,10 +18,10 @@ import {
   routeValidationObject,
 } from '@kbn/server-route-repository';
 import { jsonRt, mergeRt } from '@kbn/io-ts-utils';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
 import { pickKeys } from '../../../common/utils/pick_keys';
 import { APMRouteHandlerResources, TelemetryUsageCounter } from '../typings';
 import type { ApmPluginRequestHandlerContext } from '../typings';
-import { InspectResponse } from '../../../../observability/typings/common';
 
 const inspectRt = t.exact(
   t.partial({
diff --git a/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts
index 378db134e7cf7..52857a4c77367 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_error_rate_charts_for_backend.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { EventOutcome } from '../../../common/event_outcome';
 import {
   EVENT_OUTCOME,
   SPAN_DESTINATION_SERVICE_RESOURCE,
 } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../lib/helpers/metrics';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts
index 8f72d83fcc0b0..3ed74c7af713c 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_latency_charts_for_backend.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SPAN_DESTINATION_SERVICE_RESOURCE,
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_SUM,
 } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../lib/helpers/metrics';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts
index 1f40b975a8f9e..3392b4f2d1622 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_metadata_for_backend.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { maybe } from '../../../common/utils/maybe';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { SPAN_DESTINATION_SERVICE_RESOURCE } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 
 export async function getMetadataForBackend({
diff --git a/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts
index 64fdc3eb264f8..3544faa2ebad8 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_throughput_charts_for_backend.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SPAN_DESTINATION_SERVICE_RESOURCE,
   SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
 } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts b/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts
index 7251718396660..573d4792be429 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_top_backends.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kqlQuery } from '../../../../observability/server';
+import { kqlQuery } from '@kbn/observability-plugin/server';
 import { NodeType } from '../../../common/connections';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { getConnectionStats } from '../../lib/connections/get_connection_stats';
diff --git a/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts b/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts
index 31204c960c87d..c9ccb0ef476de 100644
--- a/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts
+++ b/x-pack/plugins/apm/server/routes/backends/get_upstream_services_for_backend.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kqlQuery } from '../../../../observability/server';
+import { kqlQuery } from '@kbn/observability-plugin/server';
 import { SPAN_DESTINATION_SERVICE_RESOURCE } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { getConnectionStats } from '../../lib/connections/get_connection_stats';
diff --git a/x-pack/plugins/apm/server/routes/backends/route.ts b/x-pack/plugins/apm/server/routes/backends/route.ts
index d8f619af58199..7dd9ed47335df 100644
--- a/x-pack/plugins/apm/server/routes/backends/route.ts
+++ b/x-pack/plugins/apm/server/routes/backends/route.ts
@@ -16,7 +16,7 @@ import { getTopBackends } from './get_top_backends';
 import { getUpstreamServicesForBackend } from './get_upstream_services_for_backend';
 import { getThroughputChartsForBackend } from './get_throughput_charts_for_backend';
 import { getErrorRateChartsForBackend } from './get_error_rate_charts_for_backend';
-import { ConnectionStatsItemWithImpact } from './../../../common/connections';
+import { ConnectionStatsItemWithImpact } from '../../../common/connections';
 import { offsetRt } from '../../../common/offset_rt';
 
 const topBackendsRoute = createApmServerRoute({
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts
index 13910ef7104fb..4ff00f93bec80 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_boolean_field_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FieldValuePair } from '../../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts
index 1c979bc3e4c6d..40674a1b5de43 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_stats.test.ts
@@ -10,7 +10,7 @@ import { getNumericFieldStatsRequest } from './get_numeric_field_stats';
 import { getKeywordFieldStatsRequest } from './get_keyword_field_stats';
 import { getBooleanFieldStatsRequest } from './get_boolean_field_stats';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchFieldsStats } from './get_fields_stats';
 
 const params = {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts
index c500d1d49dd6e..6c021b7995dd3 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_field_value_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FieldValuePair } from '../../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts
index e44996337f4b1..f0dc541cb5d9d 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_fields_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { chunk } from 'lodash';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import { FieldValuePair } from '../../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts
index 35b8eab5712ec..0661a3f4db373 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_keyword_field_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FieldValuePair } from '../../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts
index 192377b88a992..085c9975c53d4 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/get_numeric_field_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   NumericFieldStats,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts b/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts
index 58ee5051d8863..33f8544baf049 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/get_filters.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   SERVICE_NAME,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts
index 8f5029c7a3e9e..7573ebaea2ec9 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts
index c859853f6896b..858d6ea35caff 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts
index 10994c6c017e0..97e907d1bfd24 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import { splitAllSettledPromises } from '../utils';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts
index 5c6b8f3594aa0..3410615056670 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_correlation_with_histogram.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type {
   FieldValuePair,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts
index 46a980a53ab48..8e49b6b2dbfe9 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_failure_correlation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { CorrelationsParams } from '../../../../common/correlations/types';
 import { FailedTransactionsCorrelation } from '../../../../common/correlations/failed_transactions_correlations/types';
 import { EVENT_OUTCOME } from '../../../../common/elasticsearch_fieldnames';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts
index 0ecbd6477fda7..bbe20474b658d 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import { hasPrefixToInclude } from '../../../../common/correlations/utils';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts
index 2d6347362e8ea..b8a4ae2518ed4 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_candidates.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { CorrelationsParams } from '../../../../common/correlations/types';
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts
index 4f7c44e5f3107..23d5a579bff02 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts
index 6bcec359c157a..9546d94ac59ce 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_field_value_pairs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts
index d8fada32cb74c..31f2bab8dd738 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts
index 867a4defcb01b..c0ec2e7589937 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_fractions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { CorrelationsParams } from '../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts
index 7b60d93d0b745..929f2286d970b 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts
index 943718c986a7a..dbf1bd1a6d1f9 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts
index 891c2af077e63..803692f88eb1c 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts
index d260a22fb6e84..77b264a2cdb5f 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_histogram_range_steps.ts
@@ -9,7 +9,7 @@ import { scaleLog } from 'd3-scale';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type { CorrelationsParams } from '../../../../common/correlations/types';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts
index ee59925c47f27..c3c4c814cd328 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_p_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { CorrelationsParams } from '../../../../common/correlations/types';
 import type { FailedTransactionsCorrelation } from '../../../../common/correlations/failed_transactions_correlations/types';
@@ -16,7 +16,7 @@ import { splitAllSettledPromises } from '../utils';
 import {
   fetchFailedTransactionsCorrelationPValues,
   fetchTransactionDurationHistogramRangeSteps,
-} from './index';
+} from '.';
 
 export const fetchPValues = async (
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts
index 876225179aaa7..9904df5d068e8 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts
index e7ecb03fa342e..fba4e68450b07 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_percentiles.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import { SIGNIFICANT_VALUE_DIGITS } from '../../../../common/correlations/constants';
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts
index 2b233958ce273..d4a0e3fab87bb 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 
 import {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts
index b2b591519dc9c..6f56ca6b9ff8f 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_ranges.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { TRANSACTION_DURATION } from '../../../../common/elasticsearch_fieldnames';
 import type {
diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts b/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts
index 2fc1e69eab356..c7293fc87e3d1 100644
--- a/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/queries/query_significant_correlations.ts
@@ -7,7 +7,7 @@
 
 import { range } from 'lodash';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type {
   FieldValuePair,
@@ -26,7 +26,7 @@ import {
   fetchTransactionDurationHistogramRangeSteps,
   fetchTransactionDurationPercentiles,
   fetchTransactionDurationRanges,
-} from './index';
+} from '.';
 
 export const fetchSignificantCorrelations = async (
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/apm/server/routes/correlations/route.ts b/x-pack/plugins/apm/server/routes/correlations/route.ts
index b0735c7c57b36..897ca65c37ca1 100644
--- a/x-pack/plugins/apm/server/routes/correlations/route.ts
+++ b/x-pack/plugins/apm/server/routes/correlations/route.ts
@@ -27,13 +27,13 @@ import { withApmSpan } from '../../utils/with_apm_span';
 
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { environmentRt, kueryRt, rangeRt } from '../default_api_types';
-import { LatencyCorrelation } from './../../../common/correlations/latency_correlations/types';
+import { LatencyCorrelation } from '../../../common/correlations/latency_correlations/types';
 import {
   FieldStats,
   TopValuesStats,
-} from './../../../common/correlations/field_stats_types';
-import { FieldValuePair } from './../../../common/correlations/types';
-import { FailedTransactionsCorrelation } from './../../../common/correlations/failed_transactions_correlations/types';
+} from '../../../common/correlations/field_stats_types';
+import { FieldValuePair } from '../../../common/correlations/types';
+import { FailedTransactionsCorrelation } from '../../../common/correlations/failed_transactions_correlations/types';
 
 const INVALID_LICENSE = i18n.translate('xpack.apm.correlations.license.text', {
   defaultMessage:
diff --git a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts
index cdea5cd43f02f..d42a5a7eb3a9b 100644
--- a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts
@@ -7,7 +7,7 @@
 
 import { createStaticDataView } from './create_static_data_view';
 import { Setup } from '../../lib/helpers/setup_request';
-import * as HistoricalAgentData from '../../routes/historical_data/has_historical_agent_data';
+import * as HistoricalAgentData from '../historical_data/has_historical_agent_data';
 import { InternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { APMConfig } from '../..';
 
diff --git a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts
index a6818a6056f3b..9f22eaa6b9c30 100644
--- a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { APM_STATIC_INDEX_PATTERN_ID } from '../../../common/index_pattern_constants';
-import { hasHistoricalAgentData } from '../../routes/historical_data/has_historical_agent_data';
+import { hasHistoricalAgentData } from '../historical_data/has_historical_agent_data';
 import { Setup } from '../../lib/helpers/setup_request';
-import { APMRouteHandlerResources } from '../../routes/typings';
+import { APMRouteHandlerResources } from '../typings';
 import { InternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getApmDataViewTitle } from './get_apm_data_view_title';
diff --git a/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts b/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts
index 24e846cf73ee4..6a0d52eadd228 100644
--- a/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/get_dynamic_data_view.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  IndexPatternsFetcher,
-  FieldDescriptor,
-} from '../../../../../../src/plugins/data/server';
-import { APMRouteHandlerResources } from '../../routes/typings';
+import { IndexPatternsFetcher, FieldDescriptor } from '@kbn/data-plugin/server';
+import { APMRouteHandlerResources } from '../typings';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 import { getApmDataViewTitle } from './get_apm_data_view_title';
diff --git a/x-pack/plugins/apm/server/routes/data_view/route.ts b/x-pack/plugins/apm/server/routes/data_view/route.ts
index 01d835b149d2e..4b2a3dbb7252d 100644
--- a/x-pack/plugins/apm/server/routes/data_view/route.ts
+++ b/x-pack/plugins/apm/server/routes/data_view/route.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { createStaticDataView } from './create_static_data_view';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { getDynamicDataView } from './get_dynamic_data_view';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
-import { ISavedObjectsRepository } from '../../../../../../src/core/server';
 
 const staticDataViewRoute = createApmServerRoute({
   endpoint: 'POST /internal/apm/data_view/static',
diff --git a/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts b/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts
index f479fd185b889..bbfb9071d3bc6 100644
--- a/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts
+++ b/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { termQuery } from '../../../../observability/server';
+import { termQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
diff --git a/x-pack/plugins/apm/server/routes/environments/get_environments.ts b/x-pack/plugins/apm/server/routes/environments/get_environments.ts
index 3b208ef875899..6676b8061c354 100644
--- a/x-pack/plugins/apm/server/routes/environments/get_environments.ts
+++ b/x-pack/plugins/apm/server/routes/environments/get_environments.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_values';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery, termQuery } from '../../../../observability/server';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
 import { Setup } from '../../lib/helpers/setup_request';
 import { Environment } from '../../../common/environment_rt';
diff --git a/x-pack/plugins/apm/server/routes/environments/route.ts b/x-pack/plugins/apm/server/routes/environments/route.ts
index 0b01f6193ff2f..f8be45ecf0d59 100644
--- a/x-pack/plugins/apm/server/routes/environments/route.ts
+++ b/x-pack/plugins/apm/server/routes/environments/route.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { maxSuggestions } from '../../../../observability/common';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { getEnvironments } from './get_environments';
diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts
index dd2dd3bc9ff3e..34fd6be58a57d 100644
--- a/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts
+++ b/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
+import {
+  rangeQuery,
+  kqlQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   ERROR_GROUP_ID,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import {
-  rangeQuery,
-  kqlQuery,
-  termQuery,
-} from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { Setup } from '../../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
index 3ffa084f63463..12d78e529fd74 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { keyBy } from 'lodash';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { offsetPreviousPeriodCoordinates } from '../../../../common/utils/offset_previous_period_coordinate';
 import { Coordinate } from '../../../../typings/timeseries';
 import {
@@ -12,7 +13,6 @@ import {
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getBucketSize } from '../../../lib/helpers/get_bucket_size';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
index d6b58b197914d..4dce3280ec39c 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts
@@ -6,7 +6,7 @@
  */
 
 import { AggregationsTermsAggregationOrder } from '@elastic/elasticsearch/lib/api/types';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   ERROR_CULPRIT,
   ERROR_EXC_HANDLED,
diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts
index 7dabc62b00ed1..8df5235950cef 100644
--- a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts
+++ b/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
 import {
   ERROR_GROUP_ID,
@@ -12,7 +13,6 @@ import {
   TRANSACTION_SAMPLED,
 } from '../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getTransaction } from '../../transactions/get_transaction';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts b/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts
index 670932ea6dbbd..1feeab80875e0 100644
--- a/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts
@@ -10,8 +10,8 @@ import {
   SavedObjectsClientContract,
   Logger,
   KibanaRequest,
-} from 'kibana/server';
-import { PackagePolicy } from '../../../../fleet/common';
+} from '@kbn/core/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
 import {
   APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE,
   APM_SERVER_SCHEMA_SAVED_OBJECT_ID,
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_agents.ts b/x-pack/plugins/apm/server/routes/fleet/get_agents.ts
index bcfe42428dbe2..28b7bf755fa35 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_agents.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_agents.ts
@@ -9,7 +9,7 @@ import {
   CoreSetup,
   CoreStart,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
index 89ab9df051f70..4ad330d2bd475 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts
@@ -9,7 +9,7 @@ import {
   CoreSetup,
   CoreStart,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts
index 28b40447136ce..023ba2755ea9a 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts
@@ -6,8 +6,8 @@
  */
 
 import yaml from 'js-yaml';
-import { KibanaRequest } from 'kibana/server';
-import { RegistryVarsEntry } from '../../../../fleet/common';
+import { KibanaRequest } from '@kbn/core/server';
+import { RegistryVarsEntry } from '@kbn/fleet-plugin/common';
 import {
   POLICY_ELASTIC_AGENT_ON_CLOUD,
   INPUT_VAR_NAME_TO_SCHEMA_PATH,
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts b/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts
index d48e2315eace3..d196503c3f91c 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { AgentPolicy, PackagePolicy } from '@kbn/fleet-plugin/common';
 import { Maybe } from '../../../typings/common';
-import { AgentPolicy, PackagePolicy } from '../../../../fleet/common';
 import { APMPluginStartDependencies } from '../../types';
 import { POLICY_ELASTIC_AGENT_ON_CLOUD } from '../../../common/fleet';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts b/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
index ba5b9f4b919e9..e5d088af2df8a 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 import { APM_PACKAGE_NAME } from './get_cloud_apm_package_policy';
 
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts
index cdc56ba9794f6..2e2473e425a27 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { getUnsupportedApmServerSchema } from './get_unsupported_apm_server_schema';
 
 const apmServerSchema = {
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts
index fa2b4c585cb9d..2a9e4b9b08dbb 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { INPUT_VAR_NAME_TO_SCHEMA_PATH } from '../../../common/fleet';
 import {
   APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts b/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts
index 1e4e596ab76e7..e36c0fd93d210 100644
--- a/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { APMPluginStartDependencies } from '../../types';
 
 export function isSuperuser({
diff --git a/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts b/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
index 8a26321248ff3..e6311fa4fc9e6 100644
--- a/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { APMPlugin, APMRouteHandlerResources } from '../..';
 import {
   PostPackagePolicyCreateCallback,
   PutPackagePolicyUpdateCallback,
-} from '../../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import {
   NewPackagePolicy,
   UpdatePackagePolicy,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { APMPlugin, APMRouteHandlerResources } from '../..';
 import { AgentConfiguration } from '../../../common/agent_configuration/configuration_types';
 import { AGENT_NAME } from '../../../common/elasticsearch_fieldnames';
 import { APMPluginStartDependencies } from '../../types';
diff --git a/x-pack/plugins/apm/server/routes/fleet/source_maps.ts b/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
index 1d70076a828dd..93b6fb592b47b 100644
--- a/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/source_maps.ts
@@ -9,10 +9,10 @@ import {
   CoreStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { promisify } from 'util';
 import { unzip } from 'zlib';
-import { Artifact } from '../../../../fleet/server';
+import { Artifact } from '@kbn/fleet-plugin/server';
 import { SourceMap } from '../source_maps/route';
 import { APMPluginStartDependencies } from '../../types';
 import { getApmPackgePolicies } from './get_apm_package_policies';
diff --git a/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts b/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
index c3660eee0afae..0f92f7f081ee6 100644
--- a/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts
@@ -9,7 +9,7 @@ import {
   CoreSetup,
   CoreStart,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { TelemetryUsageCounter } from '../typings';
 import { APMPluginStartDependencies } from '../../types';
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index 1604d22a209a7..8b199cc76085e 100644
--- a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -7,6 +7,7 @@
 
 import { sum, round } from 'lodash';
 import { euiLightVars as theme } from '@kbn/ui-theme';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { isFiniteNumber } from '../../../../../../common/utils/is_finite_number';
 import { Setup } from '../../../../../lib/helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../../../../lib/helpers/metrics';
@@ -26,10 +27,6 @@ import {
   environmentQuery,
   serviceNodeNameQuery,
 } from '../../../../../../common/utils/environment_query';
-import {
-  kqlQuery,
-  rangeQuery,
-} from '../../../../../../../observability/server';
 import { ProcessorEvent } from '../../../../../../common/processor_event';
 
 export async function fetchAndTransformGcMetrics({
diff --git a/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts
index 52a099bdcf405..f767fb71f15c6 100644
--- a/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts
@@ -8,8 +8,9 @@
 import { Unionize } from 'utility-types';
 import { euiLightVars as theme } from '@kbn/ui-theme';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { getVizColorForIndex } from '../../../common/viz_colors';
-import { AggregationOptionsByType } from '../../../../../../src/core/types/elasticsearch';
 import { APMEventESSearchRequest } from '../../lib/helpers/create_es_client/create_apm_event_client';
 import { getMetricsDateHistogramParams } from '../../lib/helpers/metrics';
 import { Setup } from '../../lib/helpers/setup_request';
@@ -18,7 +19,6 @@ import {
   environmentQuery,
   serviceNodeNameQuery,
 } from '../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 
diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts b/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts
index 74b70e5fa7d60..07bbdb4b348b5 100644
--- a/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts
+++ b/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery } from '../../../../observability/server';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../lib/helpers/setup_request';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts b/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts
index 83e51d7d638fe..214072d78ff76 100644
--- a/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts
+++ b/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   TRANSACTION_PAGE_LOAD,
   TRANSACTION_REQUEST,
 } from '../../../common/transaction_types';
 import { TRANSACTION_TYPE } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts b/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts
index 6cb3bc069e072..67689c9e718f2 100644
--- a/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client/has_rum_data.ts
@@ -6,13 +6,13 @@
  */
 
 import moment from 'moment';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { SetupUX } from './route';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery } from '../../../../observability/server';
 import { TRANSACTION_PAGE_LOAD } from '../../../common/transaction_types';
 
 export async function hasRumData({
diff --git a/x-pack/plugins/apm/server/routes/rum_client/route.ts b/x-pack/plugins/apm/server/routes/rum_client/route.ts
index d7d1e2837c53e..c325692299d5e 100644
--- a/x-pack/plugins/apm/server/routes/rum_client/route.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client/route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import * as t from 'io-ts';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { isoToEpochRt } from '@kbn/io-ts-utils';
 import { setupRequest, Setup } from '../../lib/helpers/setup_request';
 import { getClientMetrics } from './get_client_metrics';
diff --git a/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts b/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts
index 5259cd6e1ee61..8d759140fc659 100644
--- a/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts
+++ b/x-pack/plugins/apm/server/routes/rum_client/ui_filters/get_es_filter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
 import {
diff --git a/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts b/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts
index 6ef5ada473a71..c650158dc3fe5 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { APM_SERVICE_GROUP_SAVED_OBJECT_TYPE } from '../../../common/service_groups';
 
 interface Options {
diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts b/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts
index d9202e2548fc7..9ae682812de05 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ServiceGroup,
   SavedServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts b/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
index 2c4668ac9e916..6307d273e12f5 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ServiceGroup,
   SavedServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts b/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
index d3fe63dde47eb..a9b0d9fe8c57b 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
 import { MAX_NUMBER_OF_SERVICES_IN_GROUP } from '../../../common/service_groups';
diff --git a/x-pack/plugins/apm/server/routes/service_groups/route.ts b/x-pack/plugins/apm/server/routes/service_groups/route.ts
index 347c76b676443..b9e6a238ba261 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/route.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/route.ts
@@ -9,11 +9,11 @@ import * as t from 'io-ts';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { kueryRt, rangeRt } from '../default_api_types';
-import { getServiceGroups } from '../service_groups/get_service_groups';
-import { getServiceGroup } from '../service_groups/get_service_group';
-import { saveServiceGroup } from '../service_groups/save_service_group';
-import { deleteServiceGroup } from '../service_groups/delete_service_group';
-import { lookupServices } from '../service_groups/lookup_services';
+import { getServiceGroups } from './get_service_groups';
+import { getServiceGroup } from './get_service_group';
+import { saveServiceGroup } from './save_service_group';
+import { deleteServiceGroup } from './delete_service_group';
+import { lookupServices } from './lookup_services';
 import {
   ServiceGroup,
   SavedServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts b/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts
index 5dda1cca11c54..6f21fa0ef38c7 100644
--- a/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts
+++ b/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   APM_SERVICE_GROUP_SAVED_OBJECT_TYPE,
   ServiceGroup,
diff --git a/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts b/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts
index b3bd4d1510180..8c2254af1deb2 100644
--- a/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rangeQuery } from '../../../../observability/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { TRACE_ID } from '../../../common/elasticsearch_fieldnames';
 import {
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts
index 6eedc3b3d0329..1519cd07987a3 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts
@@ -8,8 +8,9 @@
 import Boom from '@hapi/boom';
 import { sortBy, uniqBy } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ESSearchResponse } from '../../../../../../src/core/types/elasticsearch';
-import { MlPluginSetup } from '../../../../ml/server';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { getSeverity, ML_ERRORS } from '../../../common/anomaly_detection';
 import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 import { getServiceHealthStatus } from '../../../common/service_health_status';
@@ -17,7 +18,6 @@ import {
   TRANSACTION_PAGE_LOAD,
   TRANSACTION_REQUEST,
 } from '../../../common/transaction_types';
-import { rangeQuery } from '../../../../observability/server';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { getMlJobsWithAPMGroup } from '../../lib/anomaly_detection/get_ml_jobs_with_apm_group';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts
index 837be066133b2..bb04a7f5ce689 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { chunk } from 'lodash';
+import { rangeQuery, termsQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { rangeQuery, termsQuery } from '../../../../observability/server';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts
index 995aae9372554..76bccabc803ed 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map_backend_node_info.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rangeQuery } from '../../../../observability/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SPAN_DESTINATION_SERVICE_RESOURCE,
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
index 884da3991d731..225c78bd89dcb 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
-import { rangeQuery } from '../../../../observability/server';
+import { sumBy } from 'lodash';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_SYSTEM_CPU_PERCENT,
@@ -84,7 +84,7 @@ export function getServiceMapServiceNodeInfo({
       ...environmentQuery(environment),
     ];
 
-    const minutes = Math.abs((end - start) / (1000 * 60));
+    const minutes = (end - start) / 1000 / 60;
     const numBuckets = 20;
     const { intervalString, bucketSize } =
       getBucketSizeForAggregatedTransactions({
@@ -193,7 +193,6 @@ async function getTransactionStats({
           ],
         },
       },
-      track_total_hits: true,
       aggs: {
         duration: { avg: { field: durationField } },
         timeseries: {
@@ -215,7 +214,10 @@ async function getTransactionStats({
     params
   );
 
-  const totalRequests = response.hits.total.value;
+  const throughputValue = sumBy(
+    response.aggregations?.timeseries.buckets,
+    'doc_count'
+  );
 
   return {
     latency: {
@@ -226,7 +228,7 @@ async function getTransactionStats({
       })),
     },
     throughput: {
-      value: totalRequests > 0 ? totalRequests / minutes : null,
+      value: throughputValue ? throughputValue / minutes : null,
       timeseries: response.aggregations?.timeseries.buckets.map((bucket) => {
         return {
           x: bucket.key + offsetInMs,
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts b/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts
index 6f6c6a4401526..31710b253d07c 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts
@@ -7,6 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { sortBy, take, uniq } from 'lodash';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import {
   SERVICE_ENVIRONMENT,
@@ -16,7 +17,6 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { SERVICE_MAP_TIMEOUT_ERROR } from '../../../common/service_map';
-import { rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Setup } from '../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts b/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts
index 58c105289be9c..f0b710069d244 100644
--- a/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts
+++ b/x-pack/plugins/apm/server/routes/service_nodes/get_service_nodes.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   METRIC_JAVA_HEAP_MEMORY_USED,
   METRIC_JAVA_NON_HEAP_MEMORY_USED,
@@ -19,7 +20,6 @@ import {
   SERVICE_NODE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Setup } from '../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts b/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts
index 523775de170e7..1126b530b4fe0 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { isFiniteNumber } from '../../../../common/utils/is_finite_number';
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
 import { Annotation, AnnotationType } from '../../../../common/annotations';
 import {
   SERVICE_NAME,
   SERVICE_VERSION,
 } from '../../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts b/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts
index 7ce9eddf65981..9106edc0ec453 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts
@@ -6,16 +6,16 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { ElasticsearchClient, Logger } from 'kibana/server';
-import { rangeQuery } from '../../../../../observability/server';
-import { environmentQuery } from '../../../../common/utils/environment_query';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   unwrapEsResponse,
   WrappedElasticsearchClientError,
-} from '../../../../../observability/server';
-import { ESSearchResponse } from '../../../../../../../src/core/types/elasticsearch';
-import { Annotation as ESAnnotation } from '../../../../../observability/common/annotations';
-import { ScopedAnnotationsClient } from '../../../../../observability/server';
+} from '@kbn/observability-plugin/server';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { Annotation as ESAnnotation } from '@kbn/observability-plugin/common/annotations';
+import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
+import { environmentQuery } from '../../../../common/utils/environment_query';
 import { Annotation, AnnotationType } from '../../../../common/annotations';
 import { SERVICE_NAME } from '../../../../common/elasticsearch_fieldnames';
 import { withApmSpan } from '../../../utils/with_apm_span';
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts b/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts
index e5bc2501407c3..d642d86b59245 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/index.test.ts
@@ -8,7 +8,7 @@
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
 import {
   inspectSearchParams,
   SearchParamsMock,
diff --git a/x-pack/plugins/apm/server/routes/services/annotations/index.ts b/x-pack/plugins/apm/server/routes/services/annotations/index.ts
index 488a4ce6e4c20..0423263fe5227 100644
--- a/x-pack/plugins/apm/server/routes/services/annotations/index.ts
+++ b/x-pack/plugins/apm/server/routes/services/annotations/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
-import { ScopedAnnotationsClient } from '../../../../../observability/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
 import { getDerivedServiceAnnotations } from './get_derived_service_annotations';
 import { Setup } from '../../../lib/helpers/setup_request';
 import { getStoredAnnotations } from './get_stored_annotations';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_agent.ts b/x-pack/plugins/apm/server/routes/services/get_service_agent.ts
index fede626bb9d49..e96dcdb6bf0fd 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_agent.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_agent.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   AGENT_NAME,
   SERVICE_NAME,
   SERVICE_RUNTIME_NAME,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 
 interface ServiceAgent {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts b/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts
index a0b8eb1768d6f..4fc7667fa2349 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { sortBy, take } from 'lodash';
+import { kqlQuery } from '@kbn/observability-plugin/server';
 import { getNodeName } from '../../../common/connections';
-import { kqlQuery } from '../../../../observability/server';
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts b/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts
index 79d7ff4f1f41e..e4e44ac44082b 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_infrastructure.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { Setup } from '../../lib/helpers/setup_request';
-import { rangeQuery, kqlQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts b/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts
index 957d655b98e5d..1bc44bf2c2b77 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 import { merge } from 'lodash';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   METRICSET_NAME,
   SERVICE_NAME,
   SERVICE_NODE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import { maybe } from '../../../common/utils/maybe';
 import {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
index c1cfbed24c91d..8a191228255a9 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { AggregationOptionsByType } from 'src/core/types/elasticsearch';
+import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_PROCESS_CPU_PERCENT,
@@ -17,7 +18,6 @@ import {
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
 import { Coordinate } from '../../../../typings/timeseries';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getBucketSize } from '../../../lib/helpers/get_bucket_size';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts
index 7aa80322269b4..8231675baff8e 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -14,7 +15,6 @@ import { EventOutcome } from '../../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
 import { Coordinate } from '../../../../typings/timeseries';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts b/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
index 6b7f16084e5f3..4769a1986ec43 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   AGENT,
@@ -24,7 +25,6 @@ import {
   FAAS_TRIGGER_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
 import { ContainerType } from '../../../common/service_metadata';
-import { rangeQuery } from '../../../../observability/server';
 import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts b/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts
index 6082ae6c5b112..b1724e2c07db6 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   AGENT_NAME,
@@ -17,7 +18,6 @@ import {
   HOST_OS_PLATFORM,
 } from '../../../common/elasticsearch_fieldnames';
 import { ContainerType } from '../../../common/service_metadata';
-import { rangeQuery } from '../../../../observability/server';
 import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
 import { getProcessorEventForTransactions } from '../../lib/helpers/transactions';
 import { Setup } from '../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts b/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts
index 89e0e42e95914..e782a99201ccf 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
   HOST_NAME,
@@ -16,7 +17,6 @@ import {
   SERVICE_NODE_NAME,
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import {
   environmentQuery,
   serviceNodeNameQuery,
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts
index 2bc9ea328030d..0bf0b83431e45 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts
@@ -6,6 +6,7 @@
  */
 
 import { keyBy } from 'lodash';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -15,7 +16,6 @@ import {
 import { EventOutcome } from '../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
 import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { Coordinate } from '../../../typings/timeseries';
 import {
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts b/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts
index 979d79c84578a..985b5bc3e1dc4 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -13,7 +14,6 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
-import { rangeQuery, kqlQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts b/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts
index a3761df72156e..51ce7c35d3fb8 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts
index 4e8795aacc228..4fc1636deda2f 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts
@@ -10,7 +10,7 @@ import {
   getServiceHealthStatus,
   ServiceHealthStatus,
 } from '../../../../common/service_health_status';
-import { getServiceAnomalies } from '../../../routes/service_map/get_service_anomalies';
+import { getServiceAnomalies } from '../../service_map/get_service_anomalies';
 import { ServicesItemsSetup } from './get_services_items';
 
 interface AggregationParams {
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts
index 10f235063f9cb..92014c05726c4 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
@@ -23,7 +23,7 @@ import {
   getDurationFieldForTransactions,
   getProcessorEventForTransactions,
 } from '../../../lib/helpers/transactions';
-import { calculateThroughput } from '../../../lib/helpers/calculate_throughput';
+import { calculateThroughputWithRange } from '../../../lib/helpers/calculate_throughput';
 import {
   calculateFailedTransactionRate,
   getOutcomeAggregation,
@@ -145,7 +145,7 @@ export async function getServiceTransactionStats({
         transactionErrorRate: calculateFailedTransactionRate(
           topTransactionTypeBucket.outcomes
         ),
-        throughput: calculateThroughput({
+        throughput: calculateThroughputWithRange({
           start,
           end,
           value: topTransactionTypeBucket.doc_count,
diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts b/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts
index e70813308084a..63378095d72e2 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services/get_services_from_error_and_metric_documents.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
 import {
   AGENT_NAME,
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
index 744cd70e9eeb2..0e3310efd400c 100644
--- a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
@@ -6,7 +6,7 @@
  */
 
 import { keyBy } from 'lodash';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
diff --git a/x-pack/plugins/apm/server/routes/services/get_throughput.ts b/x-pack/plugins/apm/server/routes/services/get_throughput.ts
index fc266d8c8f8ee..c5f2686cc942f 100644
--- a/x-pack/plugins/apm/server/routes/services/get_throughput.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_throughput.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/elasticsearch_fieldnames';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts
index 3713b4faa73d9..aa65316e2a0c3 100644
--- a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_statistics.ts
@@ -5,8 +5,10 @@
  * 2.0.
  */
 import { keyBy, last } from 'lodash';
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import util from 'util';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { maybe } from '../../../../common/utils/maybe';
 import { ProfileStackFrame } from '../../../../typings/es_schemas/ui/profile';
 import {
@@ -15,13 +17,11 @@ import {
   getValueTypeConfig,
 } from '../../../../common/profiling';
 import { ProcessorEvent } from '../../../../common/processor_event';
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
 import {
   PROFILE_STACK,
   PROFILE_TOP_ID,
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { APMEventClient } from '../../../lib/helpers/create_es_client/create_apm_event_client';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts
index 47df939467d0e..5a95b332e9ee9 100644
--- a/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts
+++ b/x-pack/plugins/apm/server/routes/services/profiling/get_service_profiling_timeline.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { mapKeys, mapValues } from 'lodash';
+import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
   PROFILE_ID,
@@ -17,7 +18,6 @@ import {
 import { Setup } from '../../../lib/helpers/setup_request';
 import { getBucketSize } from '../../../lib/helpers/get_bucket_size';
 import { environmentQuery } from '../../../../common/utils/environment_query';
-import { kqlQuery, rangeQuery } from '../../../../../observability/server';
 
 const configMap = mapValues(
   mapKeys(ProfilingValueType, (val, key) => val),
diff --git a/x-pack/plugins/apm/server/routes/services/queries.test.ts b/x-pack/plugins/apm/server/routes/services/queries.test.ts
index 9b2b54a9a11b9..a8a65d0388297 100644
--- a/x-pack/plugins/apm/server/routes/services/queries.test.ts
+++ b/x-pack/plugins/apm/server/routes/services/queries.test.ts
@@ -8,7 +8,7 @@
 import { getServiceAgent } from './get_service_agent';
 import { getServiceTransactionTypes } from './get_service_transaction_types';
 import { getServicesItems } from './get_services/get_services_items';
-import { hasHistoricalAgentData } from '../../routes/historical_data/has_historical_agent_data';
+import { hasHistoricalAgentData } from '../historical_data/has_historical_agent_data';
 import {
   SearchParamsMock,
   inspectSearchParams,
diff --git a/x-pack/plugins/apm/server/routes/services/route.ts b/x-pack/plugins/apm/server/routes/services/route.ts
index fb5b7a56e72fb..e8de9ba8948d9 100644
--- a/x-pack/plugins/apm/server/routes/services/route.ts
+++ b/x-pack/plugins/apm/server/routes/services/route.ts
@@ -9,6 +9,13 @@ import Boom from '@hapi/boom';
 import { isoToEpochRt, jsonRt, toNumberRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
 import { uniq } from 'lodash';
+import {
+  UnknownMLCapabilitiesError,
+  InsufficientMLCapabilities,
+  MLPrivilegesUninitialized,
+} from '@kbn/ml-plugin/server';
+import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
+import { Annotation } from '@kbn/observability-plugin/common/annotations';
 import { latencyAggregationTypeRt } from '../../../common/latency_aggregation_types';
 import { ProfilingValueType } from '../../../common/profiling';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
@@ -34,18 +41,11 @@ import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_pr
 import { getServicesDetailedStatistics } from './get_services_detailed_statistics';
 import { getServiceDependenciesBreakdown } from './get_service_dependencies_breakdown';
 import { getAnomalyTimeseries } from '../../lib/anomaly_detection/get_anomaly_timeseries';
-import {
-  UnknownMLCapabilitiesError,
-  InsufficientMLCapabilities,
-  MLPrivilegesUninitialized,
-} from '../../../../ml/server';
 import { getServiceInstancesDetailedStatisticsPeriods } from './get_service_instances/detailed_statistics';
 import { ML_ERRORS } from '../../../common/anomaly_detection';
-import { ScopedAnnotationsClient } from '../../../../observability/server';
-import { Annotation } from './../../../../observability/common/annotations';
-import { ConnectionStatsItemWithImpact } from './../../../common/connections';
+import { ConnectionStatsItemWithImpact } from '../../../common/connections';
 import { getSortedAndFilteredServices } from './get_services/get_sorted_and_filtered_services';
-import { ServiceHealthStatus } from './../../../common/service_health_status';
+import { ServiceHealthStatus } from '../../../common/service_health_status';
 import { getServiceGroup } from '../service_groups/get_service_group';
 import { offsetRt } from '../../../common/offset_rt';
 
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts
index e5f6b36789302..d52b048bc6b46 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchHit } from '../../../../../../../src/core/types/elasticsearch';
+import { SearchHit } from '@kbn/core/types/elasticsearch';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 
 // needed for backwards compatability
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts
index a14019f4dbdec..05e9b4d87589a 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import {
   createOrUpdateIndex,
   Mappings,
-} from '../../../../../observability/server';
+} from '@kbn/observability-plugin/server';
 import { APMConfig } from '../../..';
 import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
 
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
index ac95f36107994..18e2fe0f34a6d 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchHit } from '../../../../../../../src/core/types/elasticsearch';
+import { SearchHit } from '@kbn/core/types/elasticsearch';
 import { AgentConfiguration } from '../../../../common/agent_configuration/configuration_types';
 import {
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
index f2cfbe857ba48..3618647717e50 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts
@@ -8,7 +8,7 @@
 import * as t from 'io-ts';
 import Boom from '@hapi/boom';
 import { toBooleanRt } from '@kbn/io-ts-utils';
-import { maxSuggestions } from '../../../../../observability/common';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
 import { setupRequest } from '../../../lib/helpers/setup_request';
 import { createOrUpdateConfiguration } from './create_or_update_configuration';
 import { searchConfigurations } from './search_configurations';
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts
index 194e1eff4e657..ecaddcc2286fa 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchHit } from '../../../../../../../src/core/types/elasticsearch';
+import { SearchHit } from '@kbn/core/types/elasticsearch';
 import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts
index 974b7f57289db..52e60b0191230 100644
--- a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts
@@ -7,7 +7,8 @@
 
 import * as t from 'io-ts';
 import Boom from '@hapi/boom';
-import { maxSuggestions } from '../../../../../observability/common';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { isActivePlatinumLicense } from '../../../../common/license_check';
 import { ML_ERRORS } from '../../../../common/anomaly_detection';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
@@ -19,7 +20,6 @@ import { notifyFeatureUsage } from '../../../feature';
 import { updateToV3 } from './update_to_v3';
 import { environmentStringRt } from '../../../../common/environment_rt';
 import { getMlJobsWithAPMGroup } from '../../../lib/anomaly_detection/get_ml_jobs_with_apm_group';
-import { ElasticsearchClient } from '../../../../../../../src/core/server';
 
 // get ML anomaly detection jobs for each environment
 const anomalyDetectionJobsRoute = createApmServerRoute({
diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts
index b23a28648482e..4c0cd118fab2b 100644
--- a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts
+++ b/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts
@@ -7,8 +7,8 @@
 import { Logger } from '@kbn/logging';
 import { uniq } from 'lodash';
 import pLimit from 'p-limit';
-import { ElasticsearchClient } from '../../../../../../../src/core/server';
-import { JOB_STATE } from '../../../../../ml/common';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { JOB_STATE } from '@kbn/ml-plugin/common';
 import { createAnomalyDetectionJobs } from '../../../lib/anomaly_detection/create_anomaly_detection_jobs';
 import { getAnomalyDetectionJobs } from '../../../lib/anomaly_detection/get_anomaly_detection_jobs';
 import { Setup } from '../../../lib/helpers/setup_request';
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts
index 7d98502ee5d93..840c15ac1bbcd 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsClient } from 'src/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+import { ApmIndicesConfig } from '@kbn/observability-plugin/common/typings';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
@@ -13,7 +14,6 @@ import {
 import { APMConfig } from '../../..';
 import { APMRouteHandlerResources } from '../../typings';
 import { withApmSpan } from '../../../utils/with_apm_span';
-import { ApmIndicesConfig } from '../../../../../observability/common/typings';
 import { APMIndices } from '../../../saved_objects/apm_indices';
 
 export type { ApmIndicesConfig };
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts
index f0d19050954d9..cc9f8ef76e4de 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts
@@ -9,7 +9,7 @@ import * as t from 'io-ts';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
 import { getApmIndices, getApmIndexSettings } from './get_apm_indices';
 import { saveApmIndices } from './save_apm_indices';
-import { APMConfig } from '../../../';
+import { APMConfig } from '../../..';
 
 // get list of apm indices and values
 const apmIndexSettingsRoute = createApmServerRoute({
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts
index 0c91bccb42999..e72282ba6275a 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { saveApmIndices } from './save_apm_indices';
-import { SavedObjectsClientContract } from '../../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 describe('saveApmIndices', () => {
   it('should trim and strip empty settings', async () => {
diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts
index 2bd4273910bbf..4e0b412084f6e 100644
--- a/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts
+++ b/x-pack/plugins/apm/server/routes/settings/apm_indices/save_apm_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from '../../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts
index 752a7769caea0..4f9fc321a19f9 100644
--- a/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   createOrUpdateIndex,
   Mappings,
-} from '../../../../../observability/server';
+} from '@kbn/observability-plugin/server';
 import { APMConfig } from '../../..';
 import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
 
diff --git a/x-pack/plugins/apm/server/routes/source_maps/route.ts b/x-pack/plugins/apm/server/routes/source_maps/route.ts
index 6e172e8ed3663..738192377beb0 100644
--- a/x-pack/plugins/apm/server/routes/source_maps/route.ts
+++ b/x-pack/plugins/apm/server/routes/source_maps/route.ts
@@ -6,8 +6,9 @@
  */
 import Boom from '@hapi/boom';
 import * as t from 'io-ts';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { jsonRt } from '@kbn/io-ts-utils';
+import { Artifact } from '@kbn/fleet-plugin/server';
 import {
   createApmArtifact,
   deleteApmArtifact,
@@ -19,7 +20,6 @@ import {
 import { getInternalSavedObjectsClient } from '../../lib/helpers/get_internal_saved_objects_client';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { stringFromBufferRt } from '../../utils/string_from_buffer_rt';
-import { Artifact } from '../../../../fleet/server';
 
 export const sourceMapRt = t.intersection([
   t.type({
diff --git a/x-pack/plugins/apm/server/routes/suggestions/route.ts b/x-pack/plugins/apm/server/routes/suggestions/route.ts
index 5db74e64c9a2e..85e58a815f0d9 100644
--- a/x-pack/plugins/apm/server/routes/suggestions/route.ts
+++ b/x-pack/plugins/apm/server/routes/suggestions/route.ts
@@ -6,8 +6,8 @@
  */
 
 import * as t from 'io-ts';
-import { maxSuggestions } from '../../../../observability/common';
-import { getSuggestions } from '../suggestions/get_suggestions';
+import { maxSuggestions } from '@kbn/observability-plugin/common';
+import { getSuggestions } from './get_suggestions';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
 import { setupRequest } from '../../lib/helpers/setup_request';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
diff --git a/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts b/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts
index 7b0bb729324d7..7cc415a4673c8 100644
--- a/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts
+++ b/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts
@@ -7,6 +7,11 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { sortBy } from 'lodash';
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import { withApmSpan } from '../../utils/with_apm_span';
 import { Setup } from '../../lib/helpers/setup_request';
@@ -14,11 +19,6 @@ import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { calculateImpactBuilder } from './calculate_impact_builder';
 import { calculateThroughputWithRange } from '../../lib/helpers/calculate_throughput';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../observability/server';
 import {
   getDurationFieldForTransactions,
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts b/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts
index 43da43ca10601..d754c2d53b71f 100644
--- a/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts
+++ b/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts
@@ -9,6 +9,7 @@ import {
   QueryDslQueryContainer,
   Sort,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   TRACE_ID,
@@ -17,7 +18,6 @@ import {
   PARENT_ID,
   ERROR_LOG_LEVEL,
 } from '../../../common/elasticsearch_fieldnames';
-import { rangeQuery } from '../../../../observability/server';
 import { Setup } from '../../lib/helpers/setup_request';
 
 export async function getTraceItems(
diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts
index 1d2602dcafc75..41d4c60fd72b4 100644
--- a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts
@@ -11,7 +11,7 @@ import noDataResponse from './mock_responses/no_data.json';
 import dataResponse from './mock_responses/data.json';
 import { APMConfig } from '../../..';
 import { ENVIRONMENT_ALL } from '../../../../common/environment_filter_values';
-import { ApmIndicesConfig } from '../../../routes/settings/apm_indices/get_apm_indices';
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
 
 const mockIndices: ApmIndicesConfig = {
   sourcemap: 'myIndex',
diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts
index 9c229a005b355..122a56e28ed61 100644
--- a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts
@@ -6,6 +6,7 @@
  */
 
 import { flatten, orderBy, last } from 'lodash';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { asPercent } from '../../../../common/utils/formatters';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
@@ -17,7 +18,6 @@ import {
   TRANSACTION_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../../lib/helpers/setup_request';
-import { rangeQuery, kqlQuery } from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { getMetricsDateHistogramParams } from '../../../lib/helpers/metrics';
 import { MAX_KPIS } from './constants';
diff --git a/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts b/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts
index cb8289200959e..82da75e560431 100644
--- a/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts
@@ -5,6 +5,11 @@
  * 2.0.
  */
 
+import {
+  kqlQuery,
+  rangeQuery,
+  termQuery,
+} from '@kbn/observability-plugin/server';
 import {
   SERVICE_NAME,
   TRANSACTION_NAME,
@@ -12,11 +17,6 @@ import {
 } from '../../../../common/elasticsearch_fieldnames';
 import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
 import { offsetPreviousPeriodCoordinates } from '../../../../common/utils/offset_previous_period_coordinate';
-import {
-  kqlQuery,
-  rangeQuery,
-  termQuery,
-} from '../../../../../observability/server';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import {
   getDocumentTypeFilterForTransactions,
diff --git a/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts b/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts
index 0522fb3a1899d..efbab5bf030f7 100644
--- a/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
 import {
   TRACE_ID,
   TRANSACTION_ID,
 } from '../../../../common/elasticsearch_fieldnames';
-import { rangeQuery, termQuery } from '../../../../../observability/server';
 import { Setup } from '../../../lib/helpers/setup_request';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
diff --git a/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts b/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts
index d4ceafd9f6306..40ce7fbcbf047 100644
--- a/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts
+++ b/x-pack/plugins/apm/server/routes/transactions/trace_samples/get_trace_samples/index.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { rangeQuery, kqlQuery } from '@kbn/observability-plugin/server';
 import { withApmSpan } from '../../../../utils/with_apm_span';
 import {
   SERVICE_NAME,
@@ -15,7 +16,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../../../common/processor_event';
-import { rangeQuery, kqlQuery } from '../../../../../../observability/server';
 import { environmentQuery } from '../../../../../common/utils/environment_query';
 import { Setup } from '../../../../lib/helpers/setup_request';
 
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index b9c74068b3788..dac98c9fd4e14 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -11,17 +11,17 @@ import {
   Logger,
   KibanaRequest,
   CoreStart,
-} from 'src/core/server';
-import { IRuleDataClient } from '../../../rule_registry/server';
-import { AlertingApiRequestHandlerContext } from '../../../alerting/server';
-import type { RacApiRequestHandlerContext } from '../../../rule_registry/server';
-import { LicensingApiRequestHandlerContext } from '../../../licensing/server';
+} from '@kbn/core/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { RacApiRequestHandlerContext } from '@kbn/rule-registry-plugin/server';
+import { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { APMConfig } from '..';
 import {
   APMPluginSetupDependencies,
   APMPluginStartDependencies,
 } from '../types';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
 import { UxUIFilters } from '../../common/ux_ui_filter';
 
 export interface ApmPluginRequestHandlerContext extends RequestHandlerContext {
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
index fe6650fb356ff..19c90f41461c2 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { updateApmOssIndexPaths } from './migrations/update_apm_oss_index_paths';
 
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts b/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts
index 84c52e85c4397..4515903d306f8 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { APM_SERVER_SCHEMA_SAVED_OBJECT_TYPE } from '../../common/apm_saved_object_constants';
 
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts b/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts
index 114386d630c97..3a3c866aa942b 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { APM_SERVICE_GROUP_SAVED_OBJECT_TYPE } from '../../common/service_groups';
 
diff --git a/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts b/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts
index e8eacd4e36f63..102944d95d7f6 100644
--- a/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts
+++ b/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { APM_TELEMETRY_SAVED_OBJECT_ID } from '../../common/apm_saved_object_constants';
 
 export const apmTelemetry: SavedObjectsType = {
diff --git a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts
index 71488ab007c67..4f794d48c3056 100644
--- a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts
+++ b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { CoreStart, Logger } from 'src/core/server';
+import type { CoreStart, Logger } from '@kbn/core/server';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts
index 3f97191a5b88a..8098318ce61e6 100644
--- a/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts
+++ b/x-pack/plugins/apm/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts
@@ -8,8 +8,8 @@ import type {
   CoreStart,
   Logger,
   ISavedObjectsRepository,
-} from 'src/core/server';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   APM_INDEX_SETTINGS_SAVED_OBJECT_ID,
   APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
index 654c0e675a053..ed486842bbf3a 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -10,8 +10,9 @@ import {
   INSTRUCTION_VARIANT,
   TutorialSchema,
   InstructionSetSchema,
-} from '../../../../../../src/plugins/home/server';
+} from '@kbn/home-plugin/server';
 
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   createNodeAgentInstructions,
   createDjangoAgentInstructions,
@@ -24,7 +25,6 @@ import {
   createDotNetAgentInstructions,
   createPhpAgentInstructions,
 } from '../../../common/tutorial/instructions/apm_agent_instructions';
-import { CloudSetup } from '../../../../cloud/server';
 import { APMConfig } from '../..';
 import { getOnPremApmServerInstructionSet } from './on_prem_apm_server_instruction_set';
 
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
index ff0a9953bcbed..a89365b1b56da 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APMConfig } from '../..';
 import {
   INSTRUCTION_VARIANT,
   InstructionsSchema,
-} from '../../../../../../src/plugins/home/server';
+} from '@kbn/home-plugin/server';
+import { APMConfig } from '../..';
 import {
   createDjangoAgentInstructions,
   createDotNetAgentInstructions,
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts
index 8c327a62f0d8e..d9731988f0fea 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APMConfig } from '../..';
 import {
   InstructionsSchema,
   INSTRUCTION_VARIANT,
-} from '../../../../../../src/plugins/home/server';
+} from '@kbn/home-plugin/server';
+import { APMConfig } from '../..';
 import {
   createDownloadServerDeb,
   createDownloadServerOsx,
diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/apm/server/tutorial/index.ts
index cae2f1fcfaa68..682d1979e12c7 100644
--- a/x-pack/plugins/apm/server/tutorial/index.ts
+++ b/x-pack/plugins/apm/server/tutorial/index.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { APMConfig } from '..';
 import {
   ArtifactsSchema,
   TutorialsCategory,
   TutorialSchema,
-} from '../../../../../src/plugins/home/server';
-import { CloudSetup } from '../../../cloud/server';
+} from '@kbn/home-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { APMConfig } from '..';
 import { APM_STATIC_INDEX_PATTERN_ID } from '../../common/index_pattern_constants';
 import { getApmDataViewAttributes } from '../routes/data_view/get_apm_data_view_attributes';
 import { getApmDataViewTitle } from '../routes/data_view/get_apm_data_view_title';
diff --git a/x-pack/plugins/apm/server/types.ts b/x-pack/plugins/apm/server/types.ts
index 0044a5abe8176..d375886728748 100644
--- a/x-pack/plugins/apm/server/types.ts
+++ b/x-pack/plugins/apm/server/types.ts
@@ -6,46 +6,49 @@
  */
 
 import { Observable } from 'rxjs';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   RuleRegistryPluginSetupContract,
   RuleRegistryPluginStartContract,
-} from '../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/data-plugin/server';
+import {
+  SpacesPluginSetup,
+  SpacesPluginStart,
+} from '@kbn/spaces-plugin/server';
 import {
   HomeServerPluginSetup,
   HomeServerPluginStart,
-} from '../../../../src/plugins/home/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { ActionsPlugin } from '../../actions/server';
-import { AlertingPlugin } from '../../alerting/server';
-import { CloudSetup } from '../../cloud/server';
+} from '@kbn/home-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { ActionsPlugin } from '@kbn/actions-plugin/server';
+import { AlertingPlugin } from '@kbn/alerting-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../features/server';
+} from '@kbn/features-plugin/server';
 import {
   LicensingPluginSetup,
   LicensingPluginStart,
-} from '../../licensing/server';
-import { MlPluginSetup, MlPluginStart } from '../../ml/server';
-import { ObservabilityPluginSetup } from '../../observability/server';
+} from '@kbn/licensing-plugin/server';
+import { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/server';
+import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';
 import {
   SecurityPluginSetup,
   SecurityPluginStart,
-} from '../../security/server';
+} from '@kbn/security-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import {
   FleetSetupContract as FleetPluginSetup,
   FleetStartContract as FleetPluginStart,
-} from '../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import { APMConfig } from '.';
 import { ApmIndicesConfig } from './routes/settings/apm_indices/get_apm_indices';
 import { APMEventClient } from './lib/helpers/create_es_client/create_apm_event_client';
diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx
index c0abf3a69623e..e16c20b566def 100644
--- a/x-pack/plugins/apm/server/utils/test_helpers.tsx
+++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { APMConfig } from '../';
 import {
   ESSearchRequest,
   ESSearchResponse,
-} from '../../../../../src/core/types/elasticsearch';
+} from '@kbn/core/types/elasticsearch';
+import { APMConfig } from '..';
 import { ApmIndicesConfig } from '../routes/settings/apm_indices/get_apm_indices';
 import { UxUIFilters } from '../../common/ux_ui_filter';
 
diff --git a/x-pack/plugins/apm/typings/common.d.ts b/x-pack/plugins/apm/typings/common.d.ts
index 046e3d012b42b..d265c7b8410f1 100644
--- a/x-pack/plugins/apm/typings/common.d.ts
+++ b/x-pack/plugins/apm/typings/common.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import '../../infra/types/eui';
+import '@kbn/infra-plugin/types/eui';
 import './apm_rum_react';
 
 // Allow unknown properties in an object
diff --git a/x-pack/plugins/apm/typings/timeseries.ts b/x-pack/plugins/apm/typings/timeseries.ts
index c48c3507b77fc..b675873fc1d3c 100644
--- a/x-pack/plugins/apm/typings/timeseries.ts
+++ b/x-pack/plugins/apm/typings/timeseries.ts
@@ -15,7 +15,7 @@ import {
   SeriesColorAccessorFn,
   SeriesColorsArray,
 } from '@elastic/charts';
-import { Maybe } from '../typings/common';
+import { Maybe } from './common';
 
 export interface Coordinate {
   x: number;
diff --git a/x-pack/plugins/banners/public/components/banner.tsx b/x-pack/plugins/banners/public/components/banner.tsx
index 5a1e20621f3d4..e89206ca5a61e 100644
--- a/x-pack/plugins/banners/public/components/banner.tsx
+++ b/x-pack/plugins/banners/public/components/banner.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import { Markdown } from '../../../../../src/plugins/kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { BannerConfiguration } from '../../common';
 
 import './banner.scss';
diff --git a/x-pack/plugins/banners/public/get_banner_info.test.ts b/x-pack/plugins/banners/public/get_banner_info.test.ts
index cfb9bc26db47b..86a87d64df435 100644
--- a/x-pack/plugins/banners/public/get_banner_info.test.ts
+++ b/x-pack/plugins/banners/public/get_banner_info.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getBannerInfo } from './get_banner_info';
 
 describe('getBannerInfo', () => {
diff --git a/x-pack/plugins/banners/public/get_banner_info.ts b/x-pack/plugins/banners/public/get_banner_info.ts
index 56b32b26bef7c..d1617b9f44ee8 100644
--- a/x-pack/plugins/banners/public/get_banner_info.ts
+++ b/x-pack/plugins/banners/public/get_banner_info.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { BannerInfoResponse } from '../common';
 
 export const getBannerInfo = async (http: HttpStart): Promise<BannerInfoResponse> => {
diff --git a/x-pack/plugins/banners/public/index.ts b/x-pack/plugins/banners/public/index.ts
index d38a4d4785e09..94e782604a227 100644
--- a/x-pack/plugins/banners/public/index.ts
+++ b/x-pack/plugins/banners/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { BannersPlugin } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, {}, {}> = (contextInitializer) =>
diff --git a/x-pack/plugins/banners/public/plugin.test.tsx b/x-pack/plugins/banners/public/plugin.test.tsx
index 057b4110f20a1..78079b8f42fbd 100644
--- a/x-pack/plugins/banners/public/plugin.test.tsx
+++ b/x-pack/plugins/banners/public/plugin.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { getBannerInfoMock } from './plugin.test.mocks';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { screenshotModePluginMock } from '../../../../src/plugins/screenshot_mode/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { screenshotModePluginMock } from '@kbn/screenshot-mode-plugin/public/mocks';
 import { BannerConfiguration } from '../common/types';
 import { BannersPlugin } from './plugin';
 
diff --git a/x-pack/plugins/banners/public/plugin.tsx b/x-pack/plugins/banners/public/plugin.tsx
index 79aeb15387963..a8ea40f86ad24 100644
--- a/x-pack/plugins/banners/public/plugin.tsx
+++ b/x-pack/plugins/banners/public/plugin.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Banner } from './components';
 import { getBannerInfo } from './get_banner_info';
 import { BannerPluginStartDependencies } from './types';
diff --git a/x-pack/plugins/banners/public/types.ts b/x-pack/plugins/banners/public/types.ts
index b0d6cf788977c..b7c891e725680 100644
--- a/x-pack/plugins/banners/public/types.ts
+++ b/x-pack/plugins/banners/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ScreenshotModePluginStart } from '../../../../src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
 
 export interface BannerPluginStartDependencies {
   screenshotMode: ScreenshotModePluginStart;
diff --git a/x-pack/plugins/banners/server/config.ts b/x-pack/plugins/banners/server/config.ts
index cc0e18c32e310..03aa54b455e81 100644
--- a/x-pack/plugins/banners/server/config.ts
+++ b/x-pack/plugins/banners/server/config.ts
@@ -7,7 +7,7 @@
 
 // import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { isHexColor } from './utils';
 
 const configSchema = schema.object({
diff --git a/x-pack/plugins/banners/server/index.ts b/x-pack/plugins/banners/server/index.ts
index 2036eda7e6502..053de8b5c12b2 100644
--- a/x-pack/plugins/banners/server/index.ts
+++ b/x-pack/plugins/banners/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { BannersPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/banners/server/plugin.test.ts b/x-pack/plugins/banners/server/plugin.test.ts
index b3f8c7be696cd..6b0d7a7d35f70 100644
--- a/x-pack/plugins/banners/server/plugin.test.ts
+++ b/x-pack/plugins/banners/server/plugin.test.ts
@@ -7,7 +7,7 @@
 
 import { registerRoutesMock, registerSettingsMock } from './plugin.test.mocks';
 
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { BannersPlugin } from './plugin';
 import { BannersConfigType } from './config';
 
diff --git a/x-pack/plugins/banners/server/plugin.ts b/x-pack/plugins/banners/server/plugin.ts
index 852ba135c478b..ab7a11c5d40f8 100644
--- a/x-pack/plugins/banners/server/plugin.ts
+++ b/x-pack/plugins/banners/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { BannersConfigType } from './config';
 import { BannersRequestHandlerContext } from './types';
 import { registerRoutes } from './routes';
diff --git a/x-pack/plugins/banners/server/routes/info.ts b/x-pack/plugins/banners/server/routes/info.ts
index 806c4a7ae6b39..94574d538c286 100644
--- a/x-pack/plugins/banners/server/routes/info.ts
+++ b/x-pack/plugins/banners/server/routes/info.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/server';
-import { ILicense } from '../../../licensing/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { BannersConfigType } from '../config';
 import { BannerInfoResponse, BannerConfiguration, BannerPlacement } from '../../common';
 import { BannersRouter } from '../types';
diff --git a/x-pack/plugins/banners/server/types.ts b/x-pack/plugins/banners/server/types.ts
index 96f7224e62c22..e72a5ec99d243 100644
--- a/x-pack/plugins/banners/server/types.ts
+++ b/x-pack/plugins/banners/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RequestHandlerContext, IRouter } from 'src/core/server';
-import { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import { RequestHandlerContext, IRouter } from '@kbn/core/server';
+import { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export interface BannersRequestHandlerContext extends RequestHandlerContext {
   licensing: LicensingApiRequestHandlerContext;
diff --git a/x-pack/plugins/banners/server/ui_settings.test.ts b/x-pack/plugins/banners/server/ui_settings.test.ts
index 9fae019774336..f83ef6f4bba59 100644
--- a/x-pack/plugins/banners/server/ui_settings.test.ts
+++ b/x-pack/plugins/banners/server/ui_settings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { uiSettingsServiceMock } from '../../../../src/core/server/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/server/mocks';
 import { BannersConfigType } from './config';
 import { registerSettings } from './ui_settings';
 
diff --git a/x-pack/plugins/banners/server/ui_settings.ts b/x-pack/plugins/banners/server/ui_settings.ts
index d35ab76c41a58..7d6f12589d164 100644
--- a/x-pack/plugins/banners/server/ui_settings.ts
+++ b/x-pack/plugins/banners/server/ui_settings.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { UiSettingsServiceSetup } from 'src/core/server';
+import { UiSettingsServiceSetup } from '@kbn/core/server';
 import { BannersConfigType } from './config';
 import { isHexColor } from './utils';
 
diff --git a/x-pack/plugins/canvas/__fixtures__/function_specs.ts b/x-pack/plugins/canvas/__fixtures__/function_specs.ts
index a307d420e888a..62f8445e74a0d 100644
--- a/x-pack/plugins/canvas/__fixtures__/function_specs.ts
+++ b/x-pack/plugins/canvas/__fixtures__/function_specs.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { functions as browserFns } from '../canvas_plugin_src/functions/browser';
-import { ExpressionFunction } from '../../../../src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
+import { functionSpecs as shapeFunctionSpecs } from '@kbn/expression-shape-plugin/__fixtures__';
+import { functionSpecs as imageFunctionSpecs } from '@kbn/expression-image-plugin/__fixtures__';
+import { functionSpecs as metricFunctionSpecs } from '@kbn/expression-metric-plugin/__fixtures__';
 import { initFunctions } from '../public/functions';
-import { functionSpecs as shapeFunctionSpecs } from '../../../../src/plugins/expression_shape/__fixtures__';
-import { functionSpecs as imageFunctionSpecs } from '../../../../src/plugins/expression_image/__fixtures__';
-import { functionSpecs as metricFunctionSpecs } from '../../../../src/plugins/expression_metric/__fixtures__';
+import { functions as browserFns } from '../canvas_plugin_src/functions/browser';
 
 export const functionSpecs = browserFns
   .concat(...(initFunctions({} as any) as any))
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts
index aa18e235f5fd9..60b46474f2912 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { openSans } from '../../../common/lib/fonts';
 import { ElementFactory } from '../../../types';
 import { SetupInitializer } from '../../plugin';
-import { FORMATS_UI_SETTINGS } from '../../../../../../src/plugins/field_formats/common';
 
 export const metricElementInitializer: SetupInitializer<ElementFactory> = (core, setup) => {
   return () => ({
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
index 1f447c7ed834e..6c7a14a2b070a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionTypeDefinition } from '../../../../../src/plugins/expressions';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin';
 import { EmbeddableInput } from '../../types';
 import { EmbeddableTypes } from './embeddable_types';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
index 79bb75af677ae..a5d9cfef54955 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../plugins/maps/common';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../src/plugins/visualizations/common/constants';
-import { LENS_EMBEDDABLE_TYPE } from '../../../../plugins/lens/common/constants';
-import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../src/plugins/discover/common';
+import { MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/common';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '@kbn/visualizations-plugin/common/constants';
+import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-plugin/common/constants';
+import { SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-plugin/common';
 
 export const EmbeddableTypes: {
   lens: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
index 97aa934280414..7bdb13cff93c0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
@@ -8,7 +8,7 @@
 import {
   ExpressionFunctionDefinition,
   ExpressionValueFilter,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 
 // @ts-expect-error untyped local
 import { buildESRequest } from '../../../common/lib/request/build_es_request';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
index c40e1ffd62439..f4349af6e785e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts
@@ -8,7 +8,8 @@
 import {
   ExpressionFunctionDefinition,
   ExpressionValueFilter,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
+import { lastValueFrom } from 'rxjs';
 
 // @ts-expect-error untyped local
 import { buildESRequest } from '../../../common/lib/request/build_es_request';
@@ -122,20 +123,19 @@ export function esdocs(): ExpressionFunctionDefinition<
 
       // We're requesting the data using the ESSQL strategy because
       // the SQL routes return type information with the result set
-      return search
-        .search<EssqlSearchStrategyRequest, EssqlSearchStrategyResponse>(req, {
+      return lastValueFrom(
+        search.search<EssqlSearchStrategyRequest, EssqlSearchStrategyResponse>(req, {
           strategy: ESSQL_SEARCH_STRATEGY,
         })
-        .toPromise()
-        .then((resp: EssqlSearchStrategyResponse) => {
-          return {
-            type: 'datatable',
-            meta: {
-              type: 'essql',
-            },
-            ...resp,
-          };
-        });
+      ).then((resp: EssqlSearchStrategyResponse) => {
+        return {
+          type: 'datatable',
+          meta: {
+            type: 'essql',
+          },
+          ...resp,
+        };
+      });
     },
   };
 }
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
index 1339c93032ea9..483976a98f458 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/essql.ts
@@ -8,7 +8,8 @@
 import {
   ExpressionFunctionDefinition,
   ExpressionValueFilter,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
+import { lastValueFrom } from 'rxjs';
 import { searchService } from '../../../public/services';
 import { ESSQL_SEARCH_STRATEGY } from '../../../common/lib/constants';
 import { EssqlSearchStrategyRequest, EssqlSearchStrategyResponse } from '../../../types';
@@ -69,11 +70,11 @@ export function essql(): ExpressionFunctionDefinition<
         filter: input.and,
       };
 
-      return search
-        .search<EssqlSearchStrategyRequest, EssqlSearchStrategyResponse>(req, {
+      return lastValueFrom(
+        search.search<EssqlSearchStrategyRequest, EssqlSearchStrategyResponse>(req, {
           strategy: ESSQL_SEARCH_STRATEGY,
         })
-        .toPromise()
+      )
         .then((resp: EssqlSearchStrategyResponse) => {
           return {
             type: 'datatable',
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js
index 823ee074a9ddc..89e975bd1a9fe 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  functionWrapper,
-  fontStyle,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from '../common/__fixtures__/test_tables';
 import { markdown } from './markdown';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
index e11396619f270..78f2b25a9c686 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts
@@ -10,7 +10,7 @@ import {
   Render,
   Style,
   ExpressionFunctionDefinition,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Context = Datatable | null;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
index 9d56278e2c324..49e7fddb3d4c3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js
index 9e6729d38259f..125affb217f5b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getElasticLogo } from '../../../../../../../src/plugins/presentation_util/common/lib';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
 
 export const fontStyle = {
   type: 'style',
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js
index 7d983e02f1123..e08b07f106bc4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { all } from './all';
 
 describe('all', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts
index b95e3490cbda7..357dc29714835 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js
index d2a7cd5565ece..53e7819ff3105 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { alterColumn } from './alterColumn';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts
index 77bf11c71a35a..d4076741c11ad 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts
@@ -6,7 +6,7 @@
  */
 
 import { omit } from 'lodash';
-import { Datatable } from 'src/plugins/expressions/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { DatatableColumn, DatatableColumnType, ExpressionFunctionDefinition } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js
index b691595409c62..887e3bdd54253 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { any } from './any';
 
 describe('any', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts
index 95c76de34d870..a9ac341e15b5f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js
index fe297e00e7b35..92b276424b214 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { asFn } from './as';
 
 describe('as', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts
index fd1cc57ad4db7..876f2505c15cb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Position } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js
index 1538ee8254ec3..3b6ad9314ec69 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { axisConfig } from './axisConfig';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js
index 5bdc013eff594..3914377eaec23 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { caseFn } from './case';
 
 describe('case', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
index 89329d6982716..e4219abfc446f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
@@ -7,7 +7,7 @@
 
 import { Observable, defer, isObservable, of } from 'rxjs';
 import { map, concatMap } from 'rxjs/operators';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js
index 0834dc27d321b..c6a90c9cd30f1 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { clear } from './clear';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts
index c4fa4d74b05ea..957b698a1807f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export function clear(): ExpressionFunctionDefinition<'clear', any, {}, null> {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js
index 0184920285a6d..e8cef3d2a62af 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { columns } from './columns';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js
index c04f132a577fd..814f9403965a0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { compare } from './compare';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
index 7867220676321..fceef5f1df111 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
 export enum Operation {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
index 12aad5d609414..19d727ffa2b3f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { isValidUrl } from '@kbn/presentation-util-plugin/common/lib';
 import { ContainerStyle, Overflow, BackgroundRepeat, BackgroundSize } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
-import { isValidUrl } from '../../../../../../src/plugins/presentation_util/common/lib';
 
 interface Output extends ContainerStyle {
   type: 'containerStyle';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js
index 15c7ccdbf5ce0..5035e55e9f12e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  functionWrapper,
-  getElasticLogo,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper, getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { containerStyle } from './containerStyle';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js
index e4c45f228aa17..6182fb3e7a3a7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable, emptyTable } from './__fixtures__/test_tables';
 import { context } from './context';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts
index e8180c4c96178..a0abf6cd5bef5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export function context(): ExpressionFunctionDefinition<'context', unknown, {}, unknown> {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
index 7401bbb6aabee..06de11353edaf 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { csv } from './csv';
-import { Datatable, ExecutionContext } from 'src/plugins/expressions';
-import { Adapters } from 'src/plugins/inspector';
+import { Datatable, ExecutionContext } from '@kbn/expressions-plugin';
+import { Adapters } from '@kbn/inspector-plugin';
 
 const errors = getFunctionErrors().csv;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
index 078721fc08d05..741ed8d1c90b8 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
@@ -6,7 +6,7 @@
  */
 
 import Papa from 'papaparse';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js
index cd06ce5fbb463..e8cf389f98f71 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { date } from './date';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts
index 79ec46248f28d..ea32890754392 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js
index 00429779e2ff1..de436f95b9db7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { doFn } from './do';
 
 describe('do', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts
index 782ae707d4b70..a8390a0c7f823 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts
index b64761bb5a822..6c95160222016 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable, relationalTable } from './__fixtures__/test_tables';
 import { dropdownControl } from './dropdownControl';
-import { ExecutionContext } from 'src/plugins/expressions';
-import { Adapters } from 'src/plugins/inspector';
+import { ExecutionContext } from '@kbn/expressions-plugin';
+import { Adapters } from '@kbn/inspector-plugin';
 import { SerializableRecord } from '@kbn/utility-types';
 
 describe('dropdownControl', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js
index 5e710fc109396..4ecd61fe45199 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { eq } from './eq';
 
 describe('eq', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts
index d85b96d0ebbdb..46c752f641113 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js
index 9d3dcb6a99167..6367bb243c682 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyFilter } from './__fixtures__/test_filters';
 import { exactly } from './exactly';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js
index f81e3ae241304..ac7835caea6a4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { filterrows } from './filterrows';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js
index e725dccc8ca34..ea7063965e4b7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { formatdate } from './formatdate';
 
 describe('formatdate', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts
index ec1f3b78c1955..8d386ddbea98b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js
index e957bf115198f..9c32721f0bef3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { formatnumber } from './formatnumber';
 
 describe('formatnumber', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts
index f44bfbf630605..c4e9b46733a10 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts
@@ -6,7 +6,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js
index a556c2ddeb48a..fc8ba402a23aa 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { getCell } from './getCell';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts
index bdc3678f74a48..8b7bcff0b8822 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js
index 53675fca2b3ae..93835e6f8a5a9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { gt } from './gt';
 
 describe('gt', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts
index 651e82e938993..95aa0d58d5201 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js
index aefb2ccf926ae..a684a6caf82f9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { gte } from './gte';
 
 describe('gte', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts
index b9b024465e4f1..0f95a4012b947 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js
index 4721eaf6cb530..212955b523425 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { head } from './head';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js
index bcf42e850ce28..b3485aa155fd3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { ifFn } from './if';
 
 describe('if', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
index 82bfb87c173b0..39ed7a37f51f2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, defer, of } from 'rxjs';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js
index 94fef857983bc..ae95b602de1be 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { joinRows } from './join_rows';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js
index 1ecfca9fc2f94..19d5ffc1e1a61 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { lt } from './lt';
 
 describe('lt', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts
index c86cc03de98c6..4235ec94aa571 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Context = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js
index f32d2d23027c3..fe4de213c6998 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { lte } from './lte';
 
 describe('lte', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts
index 579df347af641..3e4cb0b35c90d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = number | string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
index cf9280d38ea10..386060fe3af35 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n/functions';
 import { MapCenter } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js
index 88c7a5c18bc7a..aa3b5b21523f0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { neq } from './neq';
 
 describe('neq', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
index 180c4475dce37..351904ed95a92 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 type Input = boolean | number | string | null;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js
index 282cb2460d61c..c65157fa238c9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { ply } from './ply';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js
index 1725af3522ba3..19ad94705123a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { DEFAULT_ELEMENT_CSS } from '../../../common/lib/constants';
 import { testTable } from './__fixtures__/test_tables';
 import { fontStyle, getContainerStyle } from './__fixtures__/test_styles';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
index df5f8233d462f..63d76f3f397b9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { ExpressionValueRender, ContainerStyle } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 import { DEFAULT_ELEMENT_CSS } from '../../../common/lib/constants';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js
index 6025ff354cd8d..92a5212d8c8d5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { replace } from './replace';
 
 describe('replace', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts
index e9c0d7e4f8c2f..aacd58217168c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js
index 987096cc0d3dc..36c64c2f0774c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { rounddate } from './rounddate';
 
 describe('rounddate', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts
index cc52d58a4ba06..b33652a3ca2e8 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 export interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js
index 7a32849e9161a..7d6f4633a9314 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { rowCount } from './rowCount';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts
index 49b6d13b5a368..179bffe9bb4b1 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts
index a404ae8a5ec84..de89cbc03ee89 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 const name = 'seriesStyle';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js
index 6e91b84d82b6f..a819cd0b0de50 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { seriesStyle } from './seriesStyle';
 
 describe('seriesStyle', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js
index f59c517c91d88..fdabe478bdae4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { sort } from './sort';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts
index 7216ea670c971..f4f8f6f7a05e7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts
@@ -6,7 +6,7 @@
  */
 
 import { sortBy } from 'lodash';
-import { ExpressionFunctionDefinition, Datatable } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition, Datatable } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js
index 0260c9e77c424..554c73a42c7ef 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable, emptyTable } from './__fixtures__/test_tables';
 import { staticColumn } from './staticColumn';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
index 032e7298e02f1..18c4554f6c1f3 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts
@@ -10,7 +10,7 @@ import {
   ExpressionFunctionDefinition,
   Datatable,
   DatatableColumnType,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js
index 48af07b7cd880..d525553706339 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { string } from './string';
 
 describe('string', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts
index faa004254d7cc..6ed9a67c57e40 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
 interface Arguments {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js
index d0ea8fff0a45d..1ee2061d598c7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js
@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { switchFn } from './switch';
 
 describe('switch', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
index 3e676c829a301..4f344c6141c9b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
@@ -7,7 +7,7 @@
 
 import { Observable, combineLatest, defer, of } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Case } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js
index e04b4a4cc1469..2d839a7059f2f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  functionWrapper,
-  fontStyle,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { testTable } from './__fixtures__/test_tables';
 import { table } from './table';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts
index 39bc8a8c84a96..c1b00d6592cb6 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Datatable, Render, Style } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js
index 75744f91ccb57..63f51945a6152 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { tail } from './tail';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
index 1edf2a6775476..3eb4872d8fba0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n/functions';
 import { TimeRange } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js
index 38b0d1bff606e..8028df8a662a4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js
@@ -6,7 +6,7 @@
  */
 
 import sinon from 'sinon';
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyFilter } from './__fixtures__/test_filters';
 import { timefilter } from './timefilter';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
index c71c3ade08369..08cfe9a4741a4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { Render } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js
index b4a476807b7ee..dce41b2808334 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
 import { timefilterControl } from './timefilterControl';
 
 describe('timefilterControl', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
index 8ec299c60dae5..2554d2efd1bc9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
@@ -6,19 +6,16 @@
  */
 
 import { mapValues } from 'lodash';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 import {
   ExpressionFunctionDefinition,
   ExpressionAstFunction,
-} from 'src/plugins/expressions/common';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/expressions-plugin/common';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { ExpressionValueFilter, EmbeddableInput } from '../../../types';
 import { EmbeddableExpressionType, EmbeddableExpression } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { decode, encode } from '../../../common/lib/embeddable_dataurl';
 import { InitializeArguments } from '.';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
index 29200d938b53a..3e1f4af69c69d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EmbeddableStart } from 'src/plugins/embeddable/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import { embeddableFunctionFactory } from './embeddable';
 import { savedLens } from './saved_lens';
 import { savedMap } from './saved_map';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
index 67947691f7757..2d8dab316ede2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { PaletteOutput } from 'src/plugins/charts/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import type { PaletteOutput } from '@kbn/coloring';
 import { Filter as DataFilter } from '@kbn/es-query';
-import { TimeRange } from 'src/plugins/data/common';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { SavedObjectReference } from '@kbn/core/types';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter, EmbeddableInput, TimeRange as TimeRangeArg } from '../../../types';
 import {
@@ -17,7 +18,6 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 interface Arguments {
   id: string;
   title: string | null;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
index a7471c755155c..2c09f33d7e25d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { MapEmbeddableInput } from '@kbn/maps-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter, MapCenter, TimeRange as TimeRangeArg } from '../../../types';
 import {
@@ -14,8 +16,6 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { MapEmbeddableInput } from '../../../../../plugins/maps/public';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 
 interface Arguments {
   id: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
index ebe9a275c44af..8e9b7c3643098 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { SearchInput } from 'src/plugins/discover/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { SearchInput } from '@kbn/discover-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
@@ -16,7 +17,6 @@ import {
 import { buildEmbeddableFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 
 interface Arguments {
   id: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
index 4a0668740bb4b..cb88c1b9c3b15 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
@@ -6,8 +6,9 @@
  */
 
 import { omit } from 'lodash';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
-import { VisualizeInput } from 'src/plugins/visualizations/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { VisualizeInput } from '@kbn/visualizations-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
@@ -16,7 +17,6 @@ import {
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
 import { ExpressionValueFilter, TimeRange as TimeRangeArg, SeriesStyle } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
 
 interface Arguments {
   id: string;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
index 5dc1790e67d7d..81e308f27e9ec 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { sortBy } from 'lodash';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { queryDatatable } from '../../../../common/lib/datatable/query';
 import { DemoRows } from './demo_rows_types';
 import { getDemoRows } from './get_demo_rows';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts
index 8b46e818209f3..2bf5925d2b02b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts
@@ -9,7 +9,7 @@ import {
   ExpressionValueFilter,
   ExpressionAstExpression,
   ExpressionAstFunction,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 import { fromExpression } from '@kbn/interpreter';
 import { buildFiltersFunction } from '../../../common/functions';
 import type { FiltersFunction } from '../../../common/functions';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
index 38438ffb4ad66..195de0a38a581 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts
@@ -8,14 +8,14 @@
 import { evaluate } from '@kbn/tinymath';
 import { groupBy, zipObject, omit, uniqBy } from 'lodash';
 import moment from 'moment';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import {
   Datatable,
   DatatableRow,
   PointSeries,
   PointSeriesColumnName,
   PointSeriesColumns,
-} from 'src/plugins/expressions/common';
+} from '@kbn/expressions-plugin/common';
 import { pivotObjectArray } from '../../../../common/lib/pivot_object_array';
 import { unquoteString } from '../../../../common/lib/unquote_string';
 import { isColumnReference } from './lib/is_column_reference';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts
index 80ac627747318..63db2643cced7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { parse } from '@kbn/tinymath';
-import { DatatableColumn } from 'src/plugins/expressions/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { getFieldType } from '../../../../../common/lib/get_field_type';
 import { isColumnReference } from './is_column_reference';
 import { getFieldNames } from './get_field_names';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
index 6153d20b657f5..b7f814269c020 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 import { CanvasSetup } from '../public';
-import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
 
 import { functions } from './functions/browser';
 import { initFunctions } from './functions/external';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index 4c001828a6b23..8add1aa41b83e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -7,21 +7,21 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from '../../../../../../src/core/public';
-import { StartDeps } from '../../plugin';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   IEmbeddable,
   EmbeddableFactory,
   EmbeddableFactoryNotFoundError,
   isErrorEmbeddable,
-} from '../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import type { EmbeddableContainerContext } from '@kbn/embeddable-plugin/public';
+import { StartDeps } from '../../plugin';
 import { EmbeddableExpression } from '../../expression_types/embeddable';
 import { RendererStrings } from '../../../i18n';
 import { embeddableInputToExpression } from './embeddable_input_to_expression';
 import { RendererFactory, EmbeddableInput } from '../../../types';
 import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../common/lib';
-import type { EmbeddableContainerContext } from '../../../../../../src/plugins/embeddable/public/';
 
 const { embeddable: strings } = RendererStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
index a4cb737a2213e..66f69a2a0cf32 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import {
   embeddableInputToExpression,
   inputToExpressionTypeMap,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
index 80830eac24021..e57f14d3884eb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry } from '@kbn/coloring';
 import { EmbeddableTypes, EmbeddableInput } from '../../expression_types';
 import { toExpression as mapToExpression } from './input_type_to_expression/map';
 import { toExpression as visualizationToExpression } from './input_type_to_expression/visualization';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
index 9382ec20ec320..ab00a2117f7fa 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
@@ -8,7 +8,7 @@
 import { toExpression } from './lens';
 import { SavedLensInput } from '../../../functions/external/saved_lens';
 import { fromExpression, Ast } from '@kbn/interpreter';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 const baseEmbeddableInput = {
   id: 'elementId',
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
index 1d3a5eb9164b7..8f791668d75f9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
@@ -6,7 +6,7 @@
  */
 
 import { toExpression as toExpressionString } from '@kbn/interpreter';
-import { PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry } from '@kbn/coloring';
 import { SavedLensInput } from '../../../functions/external/saved_lens';
 
 export function toExpression(input: SavedLensInput, palettes: PaletteRegistry): string {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
index 03746f38b4696..c716a048edda0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MapEmbeddableInput } from '../../../../../../plugins/maps/public';
+import { MapEmbeddableInput } from '@kbn/maps-plugin/public';
 
 export function toExpression(input: MapEmbeddableInput & { savedObjectId: string }): string {
   const expressionParts = [] as string[];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
index 364d7cd0755db..d7dc7b1554310 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { VisualizeInput } from 'src/plugins/visualizations/public';
+import { VisualizeInput } from '@kbn/visualizations-plugin/public';
 
 export function toExpression(input: VisualizeInput & { savedObjectId: string }): string {
   const expressionParts = [] as string[];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts
index 9b79c50a92098..cf9ee71a294b7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/external.ts
@@ -5,18 +5,12 @@
  * 2.0.
  */
 
-import { imageRendererFactory } from '../../../../../src/plugins/expression_image/public';
-import { metricRendererFactory } from '../../../../../src/plugins/expression_metric/public';
-import {
-  errorRendererFactory,
-  debugRendererFactory,
-} from '../../../../../src/plugins/expression_error/public';
-import { revealImageRendererFactory } from '../../../../../src/plugins/expression_reveal_image/public';
-import { repeatImageRendererFactory } from '../../../../../src/plugins/expression_repeat_image/public';
-import {
-  shapeRendererFactory,
-  progressRendererFactory,
-} from '../../../../../src/plugins/expression_shape/public';
+import { imageRendererFactory } from '@kbn/expression-image-plugin/public';
+import { metricRendererFactory } from '@kbn/expression-metric-plugin/public';
+import { errorRendererFactory, debugRendererFactory } from '@kbn/expression-error-plugin/public';
+import { revealImageRendererFactory } from '@kbn/expression-reveal-image-plugin/public';
+import { repeatImageRendererFactory } from '@kbn/expression-repeat-image-plugin/public';
+import { shapeRendererFactory, progressRendererFactory } from '@kbn/expression-shape-plugin/public';
 
 export const renderFunctions = [];
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
index a31021cba4c10..12e1948260a96 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { StartInitializer } from '../../../plugin';
 import { RendererFactory } from '../../../../types';
 import { AdvancedFilter } from './component';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot
index 0ded42439fb95..6ddc57397fd5d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot
@@ -11,7 +11,7 @@ exports[`Storyshots renderers/DropdownFilter default 1`] = `
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
         data-test-subj="canvasDropdownFilter__select"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -56,7 +56,7 @@ exports[`Storyshots renderers/DropdownFilter with choices 1`] = `
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
         data-test-subj="canvasDropdownFilter__select"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -119,7 +119,7 @@ exports[`Storyshots renderers/DropdownFilter with choices and new value 1`] = `
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
         data-test-subj="canvasDropdownFilter__select"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -182,7 +182,7 @@ exports[`Storyshots renderers/DropdownFilter with choices and value 1`] = `
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
         data-test-subj="canvasDropdownFilter__select"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -245,7 +245,7 @@ exports[`Storyshots renderers/DropdownFilter with new value 1`] = `
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--fullWidth euiSelect--compressed canvasDropdownFilter__select"
         data-test-subj="canvasDropdownFilter__select"
         onChange={[Function]}
         onMouseUp={[Function]}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
index 5e4ea42990e47..76323793ab698 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
@@ -9,7 +9,7 @@ import { fromExpression, toExpression, Ast } from '@kbn/interpreter';
 import { get } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';
 import { RendererFactory } from '../../../../types';
 import { StartInitializer } from '../../../plugin';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
index f7e9d333f8683..9ae72a82c8870 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
@@ -8,8 +8,8 @@
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { toExpression } from '@kbn/interpreter';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
-import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';
 import { RendererStrings } from '../../../../i18n';
 import { TimeFilter } from './components';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
index c41cdce77b1ed..db12daf4c340c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getMarkdownRenderer } from '../';
+import { getMarkdownRenderer } from '..';
 import { Render } from '../../__stories__/render';
 
 const markdown = getMarkdownRenderer();
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx
index 498e09e14b7e0..137fe31f9b667 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.tsx
@@ -7,14 +7,14 @@
 
 import React, { CSSProperties } from 'react';
 import ReactDOM from 'react-dom';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { defaultTheme$ } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common/lib';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { StartInitializer } from '../../plugin';
 import { RendererStrings } from '../../../i18n';
 import { Return as Config } from '../../functions/browser/markdown';
-import { Markdown } from '../../../../../../src/plugins/kibana_react/public';
 import { RendererFactory } from '../../../types';
 
 const { markdown: strings } = RendererStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
index af132cc1a4b0e..4b1a6b4c776d9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { pie } from '../';
+import { pie } from '..';
 import { Render } from '../../__stories__/render';
 
 const pieOptions = {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
index 50f9c0e414754..8943517931dec 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { plot } from '../';
+import { plot } from '..';
 import { Render } from '../../__stories__/render';
 
 const plotOptions = {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx
index ec918f89321ad..f12b48194024a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.tsx
@@ -7,10 +7,10 @@
 
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { defaultTheme$ } from '../../../../../src/plugins/presentation_util/common/lib';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common/lib';
 import { StartInitializer } from '../plugin';
 import { Datatable as DatatableComponent } from '../../public/components/datatable';
 import { RendererStrings } from '../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx
index a89c56c66ce27..a8cf9919c5036 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.tsx
@@ -7,10 +7,10 @@
 
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { CoreTheme } from 'kibana/public';
+import { CoreTheme } from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { defaultTheme$ } from '../../../../../src/plugins/presentation_util/common/lib';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common/lib';
 import { StartInitializer } from '../plugin';
 import { RendererStrings } from '../../i18n';
 import { RendererFactory } from '../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
index 7c0a2ad18c3dc..24d6e94de0ec2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -35,7 +35,7 @@ exports[`Storyshots arguments/AxisConfig extended 1`] = `
           className="euiFormControlLayout__childrenWrapper"
         >
           <select
-            className="euiSelect euiSelect--compressed"
+            className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
             id="generated-id"
             onBlur={[Function]}
             onChange={[Function]}
@@ -115,7 +115,7 @@ exports[`Storyshots arguments/AxisConfig/components extended 1`] = `
           className="euiFormControlLayout__childrenWrapper"
         >
           <select
-            className="euiSelect euiSelect--compressed"
+            className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
             id="generated-id"
             onBlur={[Function]}
             onChange={[Function]}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot
index 9755e1b53b868..3cb7e726a9389 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot
@@ -9,7 +9,7 @@ Array [
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--compressed"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
         id="DateFormatExample3"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -84,7 +84,7 @@ Array [
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--compressed"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
         id="DateFormatExample1"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -158,7 +158,7 @@ exports[`Storyshots arguments/DateFormat with preset format 1`] = `
     className="euiFormControlLayout__childrenWrapper"
   >
     <select
-      className="euiSelect euiSelect--compressed"
+      className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
       id="DateFormatExample2"
       onChange={[Function]}
       onMouseUp={[Function]}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
index 15f10617a654e..8534257a95868 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
@@ -9,13 +9,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiSpacer, EuiFormRow, EuiButtonGroup } from '@elastic/eui';
 import { get } from 'lodash';
-import { AssetPicker } from '../../../../public/components/asset_picker';
 import {
   encode,
   getElasticOutline,
   isValidHttpUrl,
   resolveFromArgs,
-} from '../../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
+import { AssetPicker } from '../../../../public/components/asset_picker';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { VALID_IMAGE_TYPES } from '../../../../common/lib/constants';
 import { ArgumentStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot
index ecd8e53ce1d25..8cbcc1565f7e5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot
@@ -9,7 +9,7 @@ Array [
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--compressed"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
         id="NumberFormatExample3"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -94,7 +94,7 @@ Array [
       className="euiFormControlLayout__childrenWrapper"
     >
       <select
-        className="euiSelect euiSelect--compressed"
+        className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
         id="NumberFormatExample1"
         onChange={[Function]}
         onMouseUp={[Function]}
@@ -178,7 +178,7 @@ exports[`Storyshots arguments/NumberFormat with preset format 1`] = `
     className="euiFormControlLayout__childrenWrapper"
   >
     <select
-      className="euiSelect euiSelect--compressed"
+      className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
       id="NumberFormatExample2"
       onChange={[Function]}
       onMouseUp={[Function]}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx
index 6277f41b89fe5..3fd307b18b488 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import { Assign } from '@kbn/utility-types';
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { NumberFormatArgInput, Props as ComponentProps } from './number_format';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentFactory } from '../../../../types/arguments';
 import { ArgumentStrings } from '../../../../i18n';
 import { SetupInitializer } from '../../../plugin';
-import { FORMATS_UI_SETTINGS } from '../../../../../../../src/plugins/field_formats/common';
 
 const { NumberFormat: strings } = ArgumentStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx
index eddefb8dadd2c..609913a84ed3d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
-import { ExpressionAstExpression } from 'src/plugins/expressions';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentStrings } from '../../../../i18n';
 import { ColorPalette } from '../../../../common/lib';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts
index e701f0fcbf9f7..94457fec0c92f 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { getType } from '@kbn/interpreter';
-import { ExpressionAstArgument, ExpressionAstFunction } from 'src/plugins/expressions';
+import { ExpressionAstArgument, ExpressionAstFunction } from '@kbn/expressions-plugin';
 import { identifyPalette, ColorPalette, identifyPartialPalette } from '../../../../common/lib';
 import { ArgumentStrings } from '../../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js
index 72fd42a1ff99e..4289360df8263 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js
@@ -9,7 +9,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
-import { ShapePickerPopover } from '../../../public/components/shape_picker_popover/';
+import { ShapePickerPopover } from '../../../public/components/shape_picker_popover';
 import { ArgumentStrings } from '../../../i18n';
 
 const { Shape: strings } = ArgumentStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx
index 5b9764160b11f..39c1b8bf39f21 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSelect } from '@elastic/eui';
-import { DatatableColumn, ExpressionAstExpression } from 'src/plugins/expressions';
+import { DatatableColumn, ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
 import { ArgumentStrings } from '../../../i18n';
 import { ResolvedArgProps, ResolvedColumns } from '../../../public/expression_types/arg';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
index 8321cc1026333..86731ca161177 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js
@@ -9,7 +9,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { EsqlLang } from '@kbn/monaco';
 import { EuiFormRow, EuiLink, EuiText } from '@elastic/eui';
-import { CodeEditorField } from '../../../../../../src/plugins/kibana_react/public';
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import { getSimpleArg, setSimpleArg } from '../../../public/lib/arg_helpers';
 import { templateFromReactComponent } from '../../../public/lib/template_from_react_component';
 import { DataSourceStrings, SQL_URL } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js
index c3855ad31e3f5..27172e26620ed 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  getElasticLogo,
-  resolveFromArgs,
-} from '../../../../../../src/plugins/presentation_util/common/lib';
+import { getElasticLogo, resolveFromArgs } from '@kbn/presentation-util-plugin/common/lib';
 import { ViewStrings } from '../../../i18n';
 
 const { Image: strings } = ViewStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts
index 775588226aa80..77f6f8d2c5517 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { openSans } from '../../../common/lib/fonts';
 import { ViewStrings } from '../../../i18n';
 import { SetupInitializer } from '../../plugin';
-import { FORMATS_UI_SETTINGS } from '../../../../../../src/plugins/field_formats/common';
 
 const { Metric: strings } = ViewStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js
index 340b770db1e6a..9ca9b1ada72bb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { getAvailableProgressShapes } from '@kbn/expression-shape-plugin/common';
 import { openSans } from '../../../common/lib/fonts';
-import { getAvailableProgressShapes } from '../../../../../../src/plugins/expression_shape/common';
 import { ViewStrings } from '../../../i18n';
 
 const { Progress: strings } = ViewStrings;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js
index 1c84b0b27fd19..8189435df1e35 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getAvailableShapes } from '../../../../../../src/plugins/expression_shape/common';
+import { getAvailableShapes } from '@kbn/expression-shape-plugin/common';
 import { ViewStrings } from '../../../i18n';
 
 const { Shape: strings } = ViewStrings;
diff --git a/x-pack/plugins/canvas/common/functions/filters.ts b/x-pack/plugins/canvas/common/functions/filters.ts
index 86645b633f18a..f33974dd56a49 100644
--- a/x-pack/plugins/canvas/common/functions/filters.ts
+++ b/x-pack/plugins/canvas/common/functions/filters.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/public';
 import { ExpressionValueFilter } from '../../types';
 import { getFunctionHelp } from '../../i18n';
 
diff --git a/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts b/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts
index 9209eec105b23..6b8ef6e6ccdee 100644
--- a/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts
+++ b/x-pack/plugins/canvas/common/lib/build_embeddable_filters.ts
@@ -8,10 +8,10 @@
 import { buildQueryFilter, Filter } from '@kbn/es-query';
 import dateMath from '@kbn/datemath';
 import { maxBy, minBy } from 'lodash';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { ExpressionValueFilter } from '../../types';
 // @ts-expect-error untyped local
 import { buildBoolArray } from './build_bool_array';
-import { TimeRange } from '../../../../../src/plugins/data/common';
 
 export interface EmbeddableFilterInput {
   filters: Filter[];
diff --git a/x-pack/plugins/canvas/common/lib/fonts.ts b/x-pack/plugins/canvas/common/lib/fonts.ts
index dfe9529c38248..b7db14f31bacb 100644
--- a/x-pack/plugins/canvas/common/lib/fonts.ts
+++ b/x-pack/plugins/canvas/common/lib/fonts.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from '../../../../../src/plugins/expressions/common/fonts';
+export * from '@kbn/expressions-plugin/common/fonts';
diff --git a/x-pack/plugins/canvas/common/locator.ts b/x-pack/plugins/canvas/common/locator.ts
index 147e4fd860982..6fd9d4440932f 100644
--- a/x-pack/plugins/canvas/common/locator.ts
+++ b/x-pack/plugins/canvas/common/locator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LocatorDefinition, LocatorPublic } from 'src/plugins/share/common';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 
 import { CANVAS_APP } from './lib/constants';
 
diff --git a/x-pack/plugins/canvas/i18n/elements/apply_strings.ts b/x-pack/plugins/canvas/i18n/elements/apply_strings.ts
index 82c1fba0a38f4..20555950331e7 100644
--- a/x-pack/plugins/canvas/i18n/elements/apply_strings.ts
+++ b/x-pack/plugins/canvas/i18n/elements/apply_strings.ts
@@ -6,7 +6,7 @@
  */
 
 import { ElementFactory } from '../../types';
-import { getElementStrings } from './index';
+import { getElementStrings } from '.';
 
 /**
  * This function takes a set of Canvas Element specification factories, runs them,
diff --git a/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts b/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts
index 6589bf36cbec5..9e237789eb946 100644
--- a/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts
+++ b/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts
@@ -7,7 +7,7 @@
 
 import { getElementStrings } from './element_strings';
 import { initializeElementsSpec } from '../../canvas_plugin_src/elements';
-import { coreMock } from '../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const elementSpecs = initializeElementsSpec(coreMock.createSetup() as any, {} as any);
 
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
index 6d3ac403050c3..99d607e05b03c 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { mapCenter } from '../../../canvas_plugin_src/functions/common/map_center';
-import { FunctionHelp } from '../';
+import { FunctionHelp } from '..';
 import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof mapCenter>> = {
diff --git a/x-pack/plugins/canvas/i18n/functions/function_help.ts b/x-pack/plugins/canvas/i18n/functions/function_help.ts
index 520d32af1c272..0c7498b96b984 100644
--- a/x-pack/plugins/canvas/i18n/functions/function_help.ts
+++ b/x-pack/plugins/canvas/i18n/functions/function_help.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { UnionToIntersection } from '@kbn/utility-types';
 import { CanvasFunction, FunctionFactory } from '../../types';
 
diff --git a/x-pack/plugins/canvas/i18n/templates/apply_strings.ts b/x-pack/plugins/canvas/i18n/templates/apply_strings.ts
index 4473dce71e5e7..977f0ae008c2c 100644
--- a/x-pack/plugins/canvas/i18n/templates/apply_strings.ts
+++ b/x-pack/plugins/canvas/i18n/templates/apply_strings.ts
@@ -8,7 +8,7 @@
 import { CanvasTemplate } from '../../types';
 import { getTemplateStrings } from './template_strings';
 
-import { TagStrings } from '../../i18n';
+import { TagStrings } from '..';
 
 /**
  * This function takes a set of Canvas  templates
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index a00dd94ce346c..48f4d9a6b0d58 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -32,7 +32,6 @@
   "optionalPlugins": ["home", "reporting", "spaces", "usageCollection"],
   "requiredBundles": [
     "discover",
-    "home",
     "kibanaReact",
     "kibanaUtils",
     "lens",
diff --git a/x-pack/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx
index e1aaa2bbeb993..e0658f471f860 100644
--- a/x-pack/plugins/canvas/public/application.tsx
+++ b/x-pack/plugins/canvas/public/application.tsx
@@ -15,13 +15,10 @@ import { BehaviorSubject } from 'rxjs';
 
 import { includes, remove } from 'lodash';
 
-import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from 'kibana/public';
+import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from '@kbn/core/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
-import { PluginServices } from '../../../../src/plugins/presentation_util/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps, CanvasSetupDeps } from './plugin';
 import { App } from './components/app';
diff --git a/x-pack/plugins/canvas/public/components/app/index.tsx b/x-pack/plugins/canvas/public/components/app/index.tsx
index 0cb229608086c..d9a8b5fa54695 100644
--- a/x-pack/plugins/canvas/public/components/app/index.tsx
+++ b/x-pack/plugins/canvas/public/components/app/index.tsx
@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
 import { History } from 'history';
 // @ts-expect-error
 import createHashStateHistory from 'history-extra/dist/createHashStateHistory';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { skipWhile, timeout, take } from 'rxjs/operators';
 import { useNavLinkService } from '../../services';
 // @ts-expect-error
diff --git a/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx
index 952c4fa66e9d0..58e89af71b856 100644
--- a/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx
+++ b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx
@@ -9,7 +9,7 @@ import React, { useState, useEffect, useCallback, useRef, memo, ReactPortal } fr
 import deepEqual from 'react-fast-compare';
 import usePrevious from 'react-use/lib/usePrevious';
 import useEffectOnce from 'react-use/lib/useEffectOnce';
-import { ExpressionAstExpression, ExpressionValue } from 'src/plugins/expressions';
+import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin';
 import { ExpressionFormHandlers } from '../../../common/lib/expression_form_handlers';
 import { UpdatePropsRef } from '../../../types/arguments';
 
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx
index 0dc698c4bd2eb..48cb570c4d7f7 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset.stories.tsx
@@ -9,7 +9,7 @@ import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { reduxDecorator, getAddonPanelParameters } from '../../../../storybook';
-import { Asset, AssetComponent } from '../';
+import { Asset, AssetComponent } from '..';
 import { AIRPLANE, MARKER, assets } from './assets';
 
 storiesOf('components/Assets/Asset', module)
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx
index f27c1f8f078c4..5e0e3116e5e4f 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/asset_manager.stories.tsx
@@ -10,7 +10,7 @@ import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import { reduxDecorator, getAddonPanelParameters } from '../../../../storybook';
 
-import { AssetManager, AssetManagerComponent } from '../';
+import { AssetManager, AssetManagerComponent } from '..';
 import { assets } from './assets';
 
 storiesOf('components/Assets/AssetManager', module)
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts
index 6c658f728e73c..6475202bacf30 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts
+++ b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.ts
@@ -8,10 +8,10 @@
 import { Dispatch } from 'redux';
 import { connect } from 'react-redux';
 import { get } from 'lodash';
+import { encode } from '@kbn/presentation-util-plugin/public';
 // @ts-expect-error untyped local
 import { findExistingAsset } from '../../lib/find_existing_asset';
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
-import { encode } from '../../../../../../src/plugins/presentation_util/public';
 import { getId } from '../../lib/get_id';
 // @ts-expect-error untyped local
 import { elementsRegistry } from '../../lib/elements_registry';
diff --git a/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
index 057bd37b71c20..6f9f6195f17cb 100644
--- a/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
@@ -39,6 +39,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -86,6 +87,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -133,6 +135,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -180,6 +183,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -227,6 +231,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -274,6 +279,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -321,6 +327,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -369,6 +376,7 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -475,12 +483,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="elastic"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -518,12 +538,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="#xyz"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -561,12 +593,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="#ghij"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -604,12 +648,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="#canvas"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -647,12 +703,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="#12345xyz"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -690,12 +758,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="rgb(a,b,c)"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -733,12 +813,24 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
-            className="euiFieldText"
+            aria-invalid={true}
+            className="euiFieldText euiFormControlLayout--1icons"
             onChange={[Function]}
             placeholder="Color code"
             type="text"
             value="rgba(w,x,y,z)"
           />
+          <div
+            className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
+          >
+            <span
+              color="danger"
+              data-euiicon-type="alert"
+              size="m"
+            >
+              
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -785,6 +877,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -869,6 +962,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -953,6 +1047,7 @@ Array [
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
diff --git a/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
index 557f94c26fac9..e713c4f49d311 100644
--- a/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
@@ -212,6 +212,7 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
             className="euiFormControlLayout__childrenWrapper"
           >
             <input
+              aria-invalid={false}
               className="euiFieldText"
               onChange={[Function]}
               placeholder="Color code"
@@ -507,6 +508,7 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -772,6 +774,7 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
@@ -961,6 +964,7 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
           className="euiFormControlLayout__childrenWrapper"
         >
           <input
+            aria-invalid={false}
             className="euiFieldText"
             onChange={[Function]}
             placeholder="Color code"
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx
index a072579be2e82..b1929fd8e9313 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/custom_element_modal.stories.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/public';
 import { CustomElementModal } from '../custom_element_modal';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
-import { getElasticLogo } from '../../../../../../../src/plugins/presentation_util/public';
 
 storiesOf('components/Elements/CustomElementModal', module)
   .add('with title', () => (
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
index 51ffe57fe5e76..c4b77955dccd3 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx
@@ -28,8 +28,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { encode } from '@kbn/presentation-util-plugin/public';
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
-import { encode } from '../../../../../../src/plugins/presentation_util/public';
 import { ElementCard } from '../element_card';
 
 const MAX_NAME_LENGTH = 40;
diff --git a/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx b/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx
index 157b612afbb23..4543236c2bd5c 100644
--- a/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/datasource/__stories__/datasource_component.stories.tsx
@@ -11,8 +11,8 @@ import { EuiCallOut, EuiText } from '@elastic/eui';
 import React from 'react';
 // @ts-expect-error untyped local
 import { DatasourceComponent } from '../datasource_component';
-import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
-import { Datasource } from '../../../../public/expression_types/datasource';
+import { templateFromReactComponent } from '../../../lib/template_from_react_component';
+import { Datasource } from '../../../expression_types/datasource';
 
 const TestDatasource = ({ args }: any) => (
   <EuiCallOut title="My Test Data Source" iconType="iInCircle">
diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
index cff085f504f9d..2912911df1b50 100644
--- a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
+++ b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js
@@ -19,8 +19,8 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withSuspense } from '../../../../../../../src/plugins/presentation_util/public';
-import { LazyErrorComponent } from '../../../../../../../src/plugins/expression_error/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { LazyErrorComponent } from '@kbn/expression-error-plugin/public';
 import { Datatable } from '../../datatable';
 
 const Error = withSuspense(LazyErrorComponent);
diff --git a/x-pack/plugins/canvas/public/components/download/download.tsx b/x-pack/plugins/canvas/public/components/download/download.tsx
index 89cd999481007..0a553c7172046 100644
--- a/x-pack/plugins/canvas/public/components/download/download.tsx
+++ b/x-pack/plugins/canvas/public/components/download/download.tsx
@@ -9,7 +9,7 @@ import { toByteArray } from 'base64-js';
 import fileSaver from 'file-saver';
 import PropTypes from 'prop-types';
 import React, { ReactElement } from 'react';
-import { parseDataUrl } from '../../../../../../src/plugins/presentation_util/public';
+import { parseDataUrl } from '@kbn/presentation-util-plugin/public';
 
 interface Props {
   children: ReactElement<any>;
diff --git a/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx b/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx
index 74cd86c8d17dd..8a28179eb33ba 100644
--- a/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/element_card/__stories__/element_card.stories.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/public';
 import { ElementCard } from '../element_card';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
-import { getElasticLogo } from '../../../../../../../src/plugins/presentation_util/public';
 
 storiesOf('components/Elements/ElementCard', module)
   .addDecorator((story) => (
diff --git a/x-pack/plugins/canvas/public/components/element_card/element_card.tsx b/x-pack/plugins/canvas/public/components/element_card/element_card.tsx
index dca778e4c06ab..30a5b17cd5e42 100644
--- a/x-pack/plugins/canvas/public/components/element_card/element_card.tsx
+++ b/x-pack/plugins/canvas/public/components/element_card/element_card.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { EuiCard, EuiIcon } from '@elastic/eui';
-import { TagList } from '../tag_list/';
+import { TagList } from '../tag_list';
 
 export interface Props {
   /**
diff --git a/x-pack/plugins/canvas/public/components/element_content/element_content.tsx b/x-pack/plugins/canvas/public/components/element_content/element_content.tsx
index e5202f9c97aa3..0a9e935aa2320 100644
--- a/x-pack/plugins/canvas/public/components/element_content/element_content.tsx
+++ b/x-pack/plugins/canvas/public/components/element_content/element_content.tsx
@@ -10,7 +10,7 @@ import { omitBy, isNil } from 'lodash';
 // @ts-expect-error Untyped library
 import Style from 'style-it';
 
-import { ExpressionRenderer } from 'src/plugins/expressions';
+import { ExpressionRenderer } from '@kbn/expressions-plugin';
 import { getType } from '@kbn/interpreter';
 import { Loading } from '../loading';
 import { RenderWithFn } from '../render_with_fn';
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
index dc32f63c95bd8..0ac0dd279560b 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
@@ -9,10 +9,7 @@ import React, { FC, useCallback } from 'react';
 import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  SavedObjectFinderUi,
-  SavedObjectMetaData,
-} from '../../../../../../src/plugins/saved_objects/public/';
+import { SavedObjectFinderUi, SavedObjectMetaData } from '@kbn/saved-objects-plugin/public';
 import { useEmbeddablesService, usePlatformService } from '../../services';
 
 const strings = {
diff --git a/x-pack/plugins/canvas/public/components/expression/expression.tsx b/x-pack/plugins/canvas/public/components/expression/expression.tsx
index 86bb36d7cdb9c..537203cfcbf6f 100644
--- a/x-pack/plugins/canvas/public/components/expression/expression.tsx
+++ b/x-pack/plugins/canvas/public/components/expression/expression.tsx
@@ -22,11 +22,11 @@ import { i18n } from '@kbn/i18n';
 // @ts-expect-error
 import { Shortcuts } from 'react-shortcuts';
 
-import { ExpressionInputEditorRef } from 'src/plugins/presentation_util/public';
+import { ExpressionInputEditorRef } from '@kbn/presentation-util-plugin/public';
 import { ExpressionInput } from '../expression_input';
 import { ToolTipShortcut } from '../tool_tip_shortcut';
 import { ExpressionFunction } from '../../../types';
-import { FormState } from './';
+import { FormState } from '.';
 
 const strings = {
   getCancelButtonLabel: () =>
diff --git a/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx b/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx
index 803b92b2f8db2..0f8b14ff52277 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx
@@ -8,10 +8,10 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
-import { ExpressionFunction, ExpressionFunctionParameter, Style } from 'src/plugins/expressions';
+import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin';
 
+import { registerExpressionsLanguage } from '@kbn/presentation-util-plugin/public';
 import { ExpressionInput } from '../expression_input';
-import { registerExpressionsLanguage } from '../../../../../../../src/plugins/presentation_util/public';
 
 const content: ExpressionFunctionParameter<'string'> = {
   name: 'content',
diff --git a/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx b/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx
index 0917e633306aa..37c022d01541b 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx
+++ b/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx
@@ -12,7 +12,7 @@ import {
   LazyExpressionInput,
   ExpressionInputProps,
   withSuspense,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 interface Props extends Omit<ExpressionInputProps, 'height'> {
   /** Optional string for displaying error messages */
diff --git a/x-pack/plugins/canvas/public/components/function_form/index.tsx b/x-pack/plugins/canvas/public/components/function_form/index.tsx
index 1194943f385e4..5200fb310c6bf 100644
--- a/x-pack/plugins/canvas/public/components/function_form/index.tsx
+++ b/x-pack/plugins/canvas/public/components/function_form/index.tsx
@@ -9,10 +9,7 @@ import React, { useCallback } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { Ast } from '@kbn/interpreter';
 import deepEqual from 'react-fast-compare';
-import {
-  ExpressionAstExpression,
-  ExpressionValue,
-} from '../../../../../../src/plugins/expressions';
+import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin';
 import { findExpressionType } from '../../lib/find_expression_type';
 import { getId } from '../../lib/get_id';
 // @ts-expect-error unconverted action function
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
index 49b5aaaf1b209..4b54956bcbec1 100644
--- a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import { ExpressionFunction } from 'src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 import { EuiButtonEmpty } from '@elastic/eui';
 import copy from 'copy-to-clipboard';
 import { CanvasPluginServices } from '../../services';
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
index 7f7f897b4f28e..7c1f11db071b4 100644
--- a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
@@ -7,11 +7,11 @@
 
 // @ts-expect-error untyped lib
 import pluralize from 'pluralize';
-import { ExpressionFunction, ExpressionFunctionParameter } from 'src/plugins/expressions';
+import { ExpressionFunction, ExpressionFunctionParameter } from '@kbn/expressions-plugin';
+import { isValidDataUrl } from '@kbn/presentation-util-plugin/public';
 import { functions as browserFunctions } from '../../../canvas_plugin_src/functions/browser';
 import { functions as serverFunctions } from '../../../canvas_plugin_src/functions/server';
 import { DATATABLE_COLUMN_TYPES } from '../../../common/lib';
-import { isValidDataUrl } from '../../../../../../src/plugins/presentation_util/public';
 import { getFunctionExamples, FunctionExample } from './function_examples';
 
 const ALPHABET = 'abcdefghijklmnopqrstuvwxyz'.split('');
diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
index 9331de3fcad4b..737e90b499546 100644
--- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
@@ -8,10 +8,10 @@
 import React, { FC, useState, lazy, Suspense } from 'react';
 import { EuiButtonEmpty, EuiPortal, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunction } from 'src/plugins/expressions';
+import { ExpressionFunction } from '@kbn/expressions-plugin';
 
 import { KeyboardShortcutsDoc } from '../keyboard_shortcuts_doc';
-import { CanvasPluginServices } from '../../services/';
+import { CanvasPluginServices } from '../../services';
 
 let FunctionReferenceGenerator: null | React.LazyExoticComponent<any> = null;
 
diff --git a/x-pack/plugins/canvas/public/components/home/home.component.tsx b/x-pack/plugins/canvas/public/components/home/home.component.tsx
index 6e98439a0c530..dbfbd8a920c7e 100644
--- a/x-pack/plugins/canvas/public/components/home/home.component.tsx
+++ b/x-pack/plugins/canvas/public/components/home/home.component.tsx
@@ -7,8 +7,8 @@
 
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { KibanaPageTemplate } from '../../../../../../src/plugins/kibana_react/public';
-import { withSuspense } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 
 import { WorkpadCreate } from './workpad_create';
 import { LazyWorkpadTemplates } from './workpad_templates';
diff --git a/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts b/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts
index 045ff8b52e259..4c12deef54af1 100644
--- a/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts
+++ b/x-pack/plugins/canvas/public/components/home/hooks/use_upload_workpad.ts
@@ -9,7 +9,7 @@ import { useCallback } from 'react';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { CANVAS, JSON as JSONString } from '../../../../i18n/constants';
 import { useNotifyService } from '../../../services';
 import { getId } from '../../../lib/get_id';
diff --git a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
index 8ad746710f786..7536cc7acf7dd 100644
--- a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
@@ -18,6 +18,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
             className="euiFormControlLayout__childrenWrapper"
           >
             <input
+              aria-invalid={false}
               aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
               className="euiFieldSearch euiFieldSearch--fullWidth"
               data-test-subj="tableListSearchBox"
diff --git a/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx b/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx
index f5d41313ff571..b75c8864ad495 100644
--- a/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx
+++ b/x-pack/plugins/canvas/public/components/home/my_workpads/my_workpads.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useState, useEffect, createContext, Dispatch, SetStateAction } from 'react';
-import { useFindWorkpads } from './../hooks';
+import { useFindWorkpads } from '../hooks';
 import { FoundWorkpad } from '../../../services/workpad';
 import { Loading } from '../loading';
 import { MyWorkpads as Component } from './my_workpads.component';
diff --git a/x-pack/plugins/canvas/public/components/paginate/paginate.tsx b/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
index 322d18b07fd1c..9b65f2151b98f 100644
--- a/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
+++ b/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { InPaginateProps } from './';
+import { InPaginateProps } from '.';
 
 export type PaginateProps = Omit<InPaginateProps, 'startPage'> & {
   pageNumber: number;
diff --git a/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx
index 3c1b5f3537ac0..b5d4967464c17 100644
--- a/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker/__stories__/palette_picker.stories.tsx
@@ -8,7 +8,7 @@
 import React, { FC, useState } from 'react';
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
-import { PalettePicker } from '../../palette_picker';
+import { PalettePicker } from '..';
 
 import { paulTor14, ColorPalette } from '../../../../../common/lib/palettes';
 import { CustomColorPalette } from '../../types';
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
index e0b7f40657cf8..d7dc9a062e3ee 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -692,7 +692,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
-                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                className="euiFieldSearch euiFormControlLayout--1icons euiFieldSearch--fullWidth euiFieldSearch-isClearable"
                 onChange={[Function]}
                 onKeyUp={[Function]}
                 placeholder="Find element"
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx
index 3f0611479c3b5..6b03873723c18 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/element_grid.stories.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { ElementGrid } from '../element_grid';
 import { getTestCustomElements } from './fixtures/test_elements';
 
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx
index 29cb1c8d525ce..6e30d04fe2976 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/fixtures/test_elements.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getElasticLogo } from '../../../../../../../../src/plugins/presentation_util/public';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/public';
 
 export const getTestCustomElements = async () => {
   const { elasticLogo } = await getElasticLogo();
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx
index 50e9ee8ac5a89..5044f82b67f50 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/saved_elements_modal.stories.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
-import { waitFor } from '../../../../../../../src/plugins/presentation_util/public/__stories__';
+import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { SavedElementsModal } from '../saved_elements_modal.component';
 import { getTestCustomElements } from './fixtures/test_elements';
 import { CustomElement } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx b/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx
index 5fdea5591f538..0f6634b026ac1 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker/__stories__/shape_picker.stories.tsx
@@ -8,8 +8,8 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { getAvailableShapes } from '@kbn/expression-shape-plugin/common';
 import { ShapePicker } from '../shape_picker';
-import { getAvailableShapes } from '../../../../../../../src/plugins/expression_shape/common';
 
 storiesOf('components/Shapes/ShapePicker', module).add('default', () => (
   <ShapePicker shapes={getAvailableShapes()} onChange={action('onChange')} />
diff --git a/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx
index 0470699943bf1..b27c49dc2c875 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx
@@ -8,8 +8,8 @@
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGrid, EuiFlexItem, EuiLink } from '@elastic/eui';
+import { Shape } from '@kbn/expression-shape-plugin/common';
 import { ShapePreview } from '../shape_preview';
-import { Shape } from '../../../../../../src/plugins/expression_shape/common';
 
 interface Props {
   shapes: Shape[];
diff --git a/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx
index babc03b8f6763..1d0ee9ffee532 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker_popover/__stories__/shape_picker_popover.stories.tsx
@@ -8,11 +8,8 @@
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { getAvailableShapes, Shape } from '@kbn/expression-shape-plugin/common';
 import { ShapePickerPopover } from '../shape_picker_popover';
-import {
-  getAvailableShapes,
-  Shape,
-} from '../../../../../../../src/plugins/expression_shape/common';
 
 class Interactive extends React.Component<{}, { value: string }> {
   public state = {
diff --git a/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx
index 5701c3cb1e799..25198b073700a 100644
--- a/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx
@@ -8,10 +8,10 @@
 import React, { FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiLink, EuiPanel } from '@elastic/eui';
+import { Shape } from '@kbn/expression-shape-plugin/common';
 import { Popover } from '../popover';
 import { ShapePicker } from '../shape_picker';
 import { ShapePreview } from '../shape_preview';
-import { Shape } from '../../../../../../src/plugins/expression_shape/common';
 
 interface Props {
   shapes: Shape[];
diff --git a/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx b/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx
index de7ce4b411860..db152953ba9c9 100644
--- a/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_preview/__stories__/shape_preview.stories.tsx
@@ -7,8 +7,8 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { Shape } from '@kbn/expression-shape-plugin/public';
 import { ShapePreview } from '../shape_preview';
-import { Shape } from '../../../../../../../src/plugins/expression_shape/public';
 
 storiesOf('components/Shapes/ShapePreview', module)
   .add('arrow', () => <ShapePreview shape={Shape.ARROW} />)
diff --git a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx
index 4edc1d9ef9e7c..46782f4730f77 100644
--- a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx
+++ b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx
@@ -14,8 +14,8 @@ import {
   SvgConfig,
   ShapeRef,
   ViewBoxParams,
-} from '../../../../../../src/plugins/expression_shape/public';
-import { withSuspense } from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/expression-shape-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
 
 interface Props {
   shape?: string;
diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
index 14e45d8ecdb24..31013aaba10e6 100644
--- a/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
@@ -45,7 +45,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
             className="euiFormControlLayout__childrenWrapper"
           >
             <select
-              className="euiSelect euiSelect--compressed euiSelect--inGroup"
+              className="euiSelect euiFormControlLayout--1icons euiSelect--compressed euiSelect--inGroup"
               onChange={[Function]}
               onMouseUp={[Function]}
               value={14}
@@ -505,7 +505,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
             className="euiFormControlLayout__childrenWrapper"
           >
             <select
-              className="euiSelect euiSelect--compressed euiSelect--inGroup"
+              className="euiSelect euiFormControlLayout--1icons euiSelect--compressed euiSelect--inGroup"
               onChange={[Function]}
               onMouseUp={[Function]}
               value={14}
diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
index 8d4a1506ad8a2..a51dcf79e11c9 100644
--- a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
+++ b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx
@@ -9,7 +9,7 @@ import React, { FC, useState } from 'react';
 import PropTypes from 'prop-types';
 import { EuiFlexGroup, EuiFlexItem, EuiSelect, EuiSpacer, EuiButtonGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FontValue } from 'src/plugins/expressions';
+import { FontValue } from '@kbn/expressions-plugin';
 
 import { FontPicker } from '../font_picker';
 import { ColorPickerPopover } from '../color_picker_popover';
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
index 72e1b4d6ef909..2bc247480467a 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
@@ -124,6 +124,7 @@ Array [
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
+                aria-invalid={false}
                 className="euiFieldText euiFieldText--compressed"
                 id="generated-id"
                 name="name"
@@ -420,6 +421,7 @@ Array [
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
+                aria-invalid={false}
                 className="euiFieldText euiFieldText--compressed"
                 id="generated-id"
                 name="name"
@@ -657,6 +659,7 @@ Array [
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
+                aria-invalid={false}
                 className="euiFieldText euiFieldText--compressed"
                 id="generated-id"
                 name="name"
@@ -867,6 +870,7 @@ Array [
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
+                aria-invalid={false}
                 className="euiFieldText euiFieldText--compressed"
                 id="generated-id"
                 name="name"
diff --git a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
index 0d9ff68c9f46f..9d5d77859cf8d 100644
--- a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, MouseEventHandler, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { Sidebar } from '../../components/sidebar';
-import { Toolbar } from '../../components/toolbar';
+import { Sidebar } from '../sidebar';
+import { Toolbar } from '../toolbar';
 import { Workpad } from '../workpad';
 import { WorkpadHeader } from '../workpad_header';
 import { CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR } from '../../../common/lib/constants';
diff --git a/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts
index 96e0ab70840ad..140de2b73ddf0 100644
--- a/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.ts
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { addColor, removeColor } from '../../state/actions/workpad';
 import { getWorkpadColors } from '../../state/selectors/workpad';
 
-import { WorkpadColorPicker as Component } from '../workpad_color_picker/workpad_color_picker.component';
+import { WorkpadColorPicker as Component } from './workpad_color_picker.component';
 import { State } from '../../../types';
 
 const mapStateToProps = (state: State) => ({
diff --git a/x-pack/plugins/canvas/public/components/workpad_filters/__stories__/__snapshots__/workpad_filters.component.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_filters/__stories__/__snapshots__/workpad_filters.component.stories.storyshot
index adcb0823fad4c..6dc972a50b8d0 100644
--- a/x-pack/plugins/canvas/public/components/workpad_filters/__stories__/__snapshots__/workpad_filters.component.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_filters/__stories__/__snapshots__/workpad_filters.component.stories.storyshot
@@ -40,7 +40,7 @@ exports[`Storyshots components/WorkpadFilters/WorkpadFiltersComponent Empty filt
               >
                 <select
                   aria-label="Use aria labels when no actual label is in use"
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   defaultValue=""
                   onChange={[Function]}
                   onMouseUp={[Function]}
@@ -127,7 +127,7 @@ exports[`Storyshots components/WorkpadFilters/WorkpadFiltersComponent Filters gr
               >
                 <select
                   aria-label="Use aria labels when no actual label is in use"
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   onChange={[Function]}
                   onMouseUp={[Function]}
                   value="filterGroup"
@@ -271,7 +271,7 @@ exports[`Storyshots components/WorkpadFilters/WorkpadFiltersComponent Filters gr
               >
                 <select
                   aria-label="Use aria labels when no actual label is in use"
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   onChange={[Function]}
                   onMouseUp={[Function]}
                   value="column"
@@ -415,7 +415,7 @@ exports[`Storyshots components/WorkpadFilters/WorkpadFiltersComponent Filters gr
               >
                 <select
                   aria-label="Use aria labels when no actual label is in use"
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   defaultValue=""
                   onChange={[Function]}
                   onMouseUp={[Function]}
@@ -559,7 +559,7 @@ exports[`Storyshots components/WorkpadFilters/WorkpadFiltersComponent default 1`
               >
                 <select
                   aria-label="Use aria labels when no actual label is in use"
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   defaultValue=""
                   onChange={[Function]}
                   onMouseUp={[Function]}
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
index 01048bc0af301..c6c900df06dc4 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
@@ -8,8 +8,8 @@
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import React from 'react';
-import { EmbeddableFactoryDefinition, IEmbeddable } from 'src/plugins/embeddable/public';
-import { BaseVisType, VisTypeAlias } from 'src/plugins/visualizations/public';
+import { EmbeddableFactoryDefinition, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
 import { EditorMenu } from '../editor_menu.component';
 
 const testFactories: EmbeddableFactoryDefinition[] = [
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
index e8f762f9731a1..ed84d13641260 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
@@ -12,9 +12,9 @@ import {
   EuiContextMenuItemIcon,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { EmbeddableFactoryDefinition } from '../../../../../../../src/plugins/embeddable/public';
-import { BaseVisType, VisTypeAlias } from '../../../../../../../src/plugins/visualizations/public';
-import { SolutionToolbarPopover } from '../../../../../../../src/plugins/presentation_util/public';
+import { EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
+import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import { SolutionToolbarPopover } from '@kbn/presentation-util-plugin/public';
 
 const strings = {
   getEditorMenuButtonLabel: () =>
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
index a6bb98e9aba9b..c02ac90f8066c 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
@@ -7,21 +7,14 @@
 
 import React, { FC, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
-import { trackCanvasUiMetric, METRIC_TYPE } from '../../../../public/lib/ui_metric';
+import { BaseVisType, VisGroups, VisTypeAlias } from '@kbn/visualizations-plugin/public';
+import { EmbeddableFactoryDefinition, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { trackCanvasUiMetric, METRIC_TYPE } from '../../../lib/ui_metric';
 import {
   useEmbeddablesService,
   usePlatformService,
   useVisualizationsService,
 } from '../../../services';
-import {
-  BaseVisType,
-  VisGroups,
-  VisTypeAlias,
-} from '../../../../../../../src/plugins/visualizations/public';
-import {
-  EmbeddableFactoryDefinition,
-  EmbeddableInput,
-} from '../../../../../../../src/plugins/embeddable/public';
 import { CANVAS_APP } from '../../../../common/lib';
 import { encode } from '../../../../common/lib/embeddable_dataurl';
 import { ElementSpec } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
index 69b26c87287bc..d45b723dd53cd 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
@@ -10,7 +10,7 @@ import React, { FunctionComponent, useState } from 'react';
 import PropTypes from 'prop-types';
 import { EuiContextMenu, EuiIcon, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { PrimaryActionPopover } from '../../../../../../../src/plugins/presentation_util/public';
+import { PrimaryActionPopover } from '@kbn/presentation-util-plugin/public';
 import { getId } from '../../../lib/get_id';
 import { CONTEXT_MENU_TOP_BORDER_CLASSNAME } from '../../../../common/lib';
 import { ElementSpec } from '../../../../types';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
index 39d29e134cca6..75d6f8064f32a 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/labs_control/labs_control.tsx
@@ -9,10 +9,7 @@ import React, { useState } from 'react';
 import { EuiButtonEmpty, EuiNotificationBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  LazyLabsFlyout,
-  withSuspense,
-} from '../../../../../../../src/plugins/presentation_util/public';
+import { LazyLabsFlyout, withSuspense } from '@kbn/presentation-util-plugin/public';
 
 import { useLabsService } from '../../../services';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
index 8c9360d50cb27..5fcd5e93e805a 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { RedirectOptions } from 'src/plugins/share/public';
-import { JobAppParamsPDFV2 } from '../../../../../reporting/common/types';
+import type { RedirectOptions } from '@kbn/share-plugin/public';
+import { JobAppParamsPDFV2 } from '@kbn/reporting-plugin/common/types';
 import { CanvasAppLocatorParams, CANVAS_APP_LOCATOR } from '../../../../common/locator';
 import { CanvasWorkpad } from '../../../../types';
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
index 85a30d3003402..5bba9ce3895f5 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
@@ -16,10 +16,10 @@ import {
   AddFromLibraryButton,
   QuickButtonGroup,
   SolutionToolbar,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 import { getElementStrings } from '../../../i18n';
 import { CommitFn, ElementSpec } from '../../../types';
-import { ToolTipShortcut } from '../tool_tip_shortcut/';
+import { ToolTipShortcut } from '../tool_tip_shortcut';
 import { RefreshControl } from './refresh_control';
 // @ts-expect-error untyped local
 import { FullscreenControl } from './fullscreen_control';
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
index b3f9f7a7cffcb..720c70f50e2b1 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -95,7 +95,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -183,7 +183,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -513,7 +513,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
               className="euiFormControlLayout__childrenWrapper"
             >
               <select
-                className="euiSelect euiSelect--compressed"
+                className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                 id="generated-id"
                 onBlur={[Function]}
                 onChange={[Function]}
@@ -601,7 +601,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
               className="euiFormControlLayout__childrenWrapper"
             >
               <select
-                className="euiSelect euiSelect--compressed"
+                className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                 id="generated-id"
                 onBlur={[Function]}
                 onChange={[Function]}
@@ -941,7 +941,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -1029,7 +1029,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx
index bd802650e68f1..5b68c3eab09d0 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import { EuiSpacer, EuiTitle } from '@elastic/eui';
 import { BorderForm } from './border_form';
 import { AppearanceForm } from './appearance_form';
-import { CanvasWorkpad } from '../.../../../../../types';
+import { CanvasWorkpad } from '../../../../types';
 import { Arguments as AppearanceArguments } from './appearance_form';
 import { Arguments as BorderArguments } from './border_form';
 import { ArgTypesStrings } from '../../../../i18n';
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx
index 6a98a0dcfa56a..76cde0be02baa 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx
@@ -8,7 +8,7 @@
 import React, { FunctionComponent } from 'react';
 import PropTypes from 'prop-types';
 import { ColorPickerPopover } from '../../../components/color_picker_popover';
-import { CanvasWorkpad } from '../.../../../../../types';
+import { CanvasWorkpad } from '../../../../types';
 import { ArgTypesStrings } from '../../../../i18n';
 
 const { ContainerStyle: strings } = ArgTypesStrings;
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
index ccf462ca4798a..b8f3ac9ee425c 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -36,7 +36,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
             className="euiFormControlLayout__childrenWrapper"
           >
             <select
-              className="euiSelect euiSelect--compressed"
+              className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
               id="generated-id"
               onBlur={[Function]}
               onChange={[Function]}
@@ -117,7 +117,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -205,7 +205,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
@@ -293,7 +293,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                 className="euiFormControlLayout__childrenWrapper"
               >
                 <select
-                  className="euiSelect euiSelect--compressed"
+                  className="euiSelect euiFormControlLayout--1icons euiSelect--compressed"
                   id="generated-id"
                   onBlur={[Function]}
                   onChange={[Function]}
diff --git a/x-pack/plugins/canvas/public/expression_types/function_form.tsx b/x-pack/plugins/canvas/public/expression_types/function_form.tsx
index f66cfd301c7d8..c5440b19441ce 100644
--- a/x-pack/plugins/canvas/public/expression_types/function_form.tsx
+++ b/x-pack/plugins/canvas/public/expression_types/function_form.tsx
@@ -17,7 +17,7 @@ import { SidebarSectionTitle } from '../components/sidebar/sidebar_section_title
 import { BaseForm, BaseFormProps } from './base_form';
 import { Arg, ArgUiConfig, ResolvedArgProps } from './arg';
 import { ArgDisplayType, Args, ArgType, ArgTypeDef, ArgValue, ExpressionType } from './types';
-import { Model, Transform, View } from '../expression_types';
+import { Model, Transform, View } from '.';
 import {
   AssetType,
   CanvasElement,
diff --git a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
index 9f6e57e94a256..be9661eb891f7 100644
--- a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 
 export const featureCatalogueEntry = {
   id: 'canvas',
@@ -20,7 +20,7 @@ export const featureCatalogueEntry = {
   icon: 'canvasApp',
   path: '/app/canvas',
   showOnHomePage: false,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data' as FeatureCatalogueCategory,
   solutionId: 'kibana',
   order: 300,
 };
diff --git a/x-pack/plugins/canvas/public/functions/asset.ts b/x-pack/plugins/canvas/public/functions/asset.ts
index 08ffad9471a98..4048d0fe099b3 100644
--- a/x-pack/plugins/canvas/public/functions/asset.ts
+++ b/x-pack/plugins/canvas/public/functions/asset.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/public';
 // @ts-expect-error unconverted local lib
 import { getState } from '../state/store';
 import { getAssetById } from '../state/selectors/assets';
diff --git a/x-pack/plugins/canvas/public/functions/index.ts b/x-pack/plugins/canvas/public/functions/index.ts
index 7a3ca9a2619bb..ad91d6b98fa7f 100644
--- a/x-pack/plugins/canvas/public/functions/index.ts
+++ b/x-pack/plugins/canvas/public/functions/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry } from '@kbn/coloring';
 import { asset } from './asset';
 import { filtersFunctionFactory } from './filters';
 import { timelionFunctionFactory } from './timelion';
diff --git a/x-pack/plugins/canvas/public/functions/pie.test.js b/x-pack/plugins/canvas/public/functions/pie.test.js
index 6f1b66018fb49..757261310beb5 100644
--- a/x-pack/plugins/canvas/public/functions/pie.test.js
+++ b/x-pack/plugins/canvas/public/functions/pie.test.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { fontStyle, functionWrapper } from '@kbn/presentation-util-plugin/public';
 import { testPie } from '../../canvas_plugin_src/functions/common/__fixtures__/test_pointseries';
-import { fontStyle, functionWrapper } from '../../../../../src/plugins/presentation_util/public';
 import {
   grayscalePalette,
   seriesStyle,
diff --git a/x-pack/plugins/canvas/public/functions/pie.ts b/x-pack/plugins/canvas/public/functions/pie.ts
index 11e487273b31c..67df9d896350c 100644
--- a/x-pack/plugins/canvas/public/functions/pie.ts
+++ b/x-pack/plugins/canvas/public/functions/pie.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, keyBy, map, groupBy } from 'lodash';
-import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public';
+import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
 import { getLegendConfig } from '../../common/lib/get_legend_config';
 import { getFunctionHelp } from '../../i18n';
 import {
diff --git a/x-pack/plugins/canvas/public/functions/plot.test.js b/x-pack/plugins/canvas/public/functions/plot.test.js
index 1f74698ccaf4e..b69fd40555363 100644
--- a/x-pack/plugins/canvas/public/functions/plot.test.js
+++ b/x-pack/plugins/canvas/public/functions/plot.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { fontStyle, functionWrapper } from '../../../../../src/plugins/presentation_util/public';
+import { fontStyle, functionWrapper } from '@kbn/presentation-util-plugin/public';
 import { testPlot } from '../../canvas_plugin_src/functions/common/__fixtures__/test_pointseries';
 import {
   grayscalePalette,
diff --git a/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts b/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts
index b35037d4b556c..2d58e926d28c8 100644
--- a/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts
+++ b/x-pack/plugins/canvas/public/functions/plot/get_flot_axis_config.ts
@@ -6,8 +6,8 @@
  */
 
 import { get, map } from 'lodash';
+import { Style, PointSeriesColumns } from '@kbn/expressions-plugin/common';
 import { Ticks, AxisConfig, isAxisConfig } from '../../../types';
-import { Style, PointSeriesColumns } from '../../../../../../src/plugins/expressions/common';
 
 type Position = 'bottom' | 'top' | 'left' | 'right';
 interface Config {
diff --git a/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js b/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js
index 7a142a02412c2..579dceb6fcfe9 100644
--- a/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js
+++ b/x-pack/plugins/canvas/public/functions/plot/get_font_spec.test.js
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { fontStyle } from '../../../../../../src/plugins/presentation_util/common/lib';
+import { fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { defaultSpec, getFontSpec } from './get_font_spec';
 
 describe('getFontSpec', () => {
diff --git a/x-pack/plugins/canvas/public/functions/plot/index.ts b/x-pack/plugins/canvas/public/functions/plot/index.ts
index 477c704190146..00542af70c8db 100644
--- a/x-pack/plugins/canvas/public/functions/plot/index.ts
+++ b/x-pack/plugins/canvas/public/functions/plot/index.ts
@@ -7,8 +7,8 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import { groupBy, get, keyBy, map, sortBy } from 'lodash';
-import { ExpressionFunctionDefinition, Style } from 'src/plugins/expressions';
-import { PaletteOutput, PaletteRegistry } from 'src/plugins/charts/public';
+import { ExpressionFunctionDefinition, Style } from '@kbn/expressions-plugin';
+import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
 import { getLegendConfig } from '../../../common/lib/get_legend_config';
 import { getFlotAxisConfig } from './get_flot_axis_config';
 import { getFontSpec } from './get_font_spec';
diff --git a/x-pack/plugins/canvas/public/functions/timelion.ts b/x-pack/plugins/canvas/public/functions/timelion.ts
index 81893db1bbd4b..f457bad07f92e 100644
--- a/x-pack/plugins/canvas/public/functions/timelion.ts
+++ b/x-pack/plugins/canvas/public/functions/timelion.ts
@@ -9,14 +9,14 @@ import { flatten } from 'lodash';
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
 
-import { TimeRange } from 'src/plugins/data/common';
-import { ExpressionFunctionDefinition, DatatableRow } from 'src/plugins/expressions/public';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { ExpressionFunctionDefinition, DatatableRow } from '@kbn/expressions-plugin/public';
 import { fetch } from '../../common/lib/fetch';
 // @ts-expect-error untyped local
 import { buildBoolArray } from '../../common/lib/build_bool_array';
 import { Datatable, ExpressionValueFilter } from '../../types';
 import { getFunctionHelp } from '../../i18n';
-import { InitializeArguments } from './';
+import { InitializeArguments } from '.';
 
 const errors = {
   timelionError: () =>
diff --git a/x-pack/plugins/canvas/public/functions/to.ts b/x-pack/plugins/canvas/public/functions/to.ts
index 2866ed4d1cded..bf3d1e2ba4f10 100644
--- a/x-pack/plugins/canvas/public/functions/to.ts
+++ b/x-pack/plugins/canvas/public/functions/to.ts
@@ -6,7 +6,7 @@
  */
 
 import { castProvider } from '@kbn/interpreter';
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/public';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/public';
 import { getFunctionHelp, getFunctionErrors } from '../../i18n';
 import { InitializeArguments } from '.';
 
diff --git a/x-pack/plugins/canvas/public/index.ts b/x-pack/plugins/canvas/public/index.ts
index 95d4333c6e9e5..5c2780b88d124 100644
--- a/x-pack/plugins/canvas/public/index.ts
+++ b/x-pack/plugins/canvas/public/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
-import { CoreStart } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { CanvasServices } from './services';
 import { CanvasSetup, CanvasStart, CanvasStartDeps, CanvasPlugin } from './plugin';
 
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
index 0f71039e7409c..146842c4e3322 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { select } from './select';
-import { Json, Selector, Vector2d, Vector3d, TransformMatrix2d, TransformMatrix3d } from './index';
+import { Json, Selector, Vector2d, Vector3d, TransformMatrix2d, TransformMatrix3d } from '.';
 import {
   mvMultiply as mult2d,
   ORIGIN as UNIT2D,
diff --git a/x-pack/plugins/canvas/public/lib/breadcrumbs.ts b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
index b926c30674298..02036be10322d 100644
--- a/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
+++ b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from '../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
 export const getBaseBreadcrumb = (): ChromeBreadcrumb => ({
   text: 'Canvas',
diff --git a/x-pack/plugins/canvas/public/lib/clipboard.test.ts b/x-pack/plugins/canvas/public/lib/clipboard.test.ts
index e51e4b32f3e41..cb8b019390539 100644
--- a/x-pack/plugins/canvas/public/lib/clipboard.test.ts
+++ b/x-pack/plugins/canvas/public/lib/clipboard.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-jest.mock('../../../../../src/plugins/kibana_utils/public');
+jest.mock('@kbn/kibana-utils-plugin/public');
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { setClipboardData, getClipboardData } from './clipboard';
 import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants';
 import { elements } from '../../__fixtures__/workpads';
diff --git a/x-pack/plugins/canvas/public/lib/create_handlers.ts b/x-pack/plugins/canvas/public/lib/create_handlers.ts
index 3536bed0f92b3..66993c0d39bae 100644
--- a/x-pack/plugins/canvas/public/lib/create_handlers.ts
+++ b/x-pack/plugins/canvas/public/lib/create_handlers.ts
@@ -9,7 +9,7 @@ import { isEqual } from 'lodash';
 import {
   ExpressionRendererEvent,
   IInterpreterRenderHandlers,
-} from 'src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
 import { updateEmbeddableExpression, fetchEmbeddableRenderable } from '../state/actions/embeddable';
 import { RendererHandlers, CanvasElement } from '../../types';
 import { pluginServices } from '../services';
diff --git a/x-pack/plugins/canvas/public/lib/es_service.ts b/x-pack/plugins/canvas/public/lib/es_service.ts
index 0ff6c9e5d110f..7b86716aef7e5 100644
--- a/x-pack/plugins/canvas/public/lib/es_service.ts
+++ b/x-pack/plugins/canvas/public/lib/es_service.ts
@@ -6,7 +6,7 @@
  */
 
 // TODO - clint: convert to service abstraction
-import { IndexPatternAttributes } from 'src/plugins/data/public';
+import { IndexPatternAttributes } from '@kbn/data-plugin/public';
 
 import { API_ROUTE } from '../../common/lib/constants';
 import { fetch } from '../../common/lib/fetch';
diff --git a/x-pack/plugins/canvas/public/lib/loading_indicator.ts b/x-pack/plugins/canvas/public/lib/loading_indicator.ts
index a78c4711c8206..920e732b21bb2 100644
--- a/x-pack/plugins/canvas/public/lib/loading_indicator.ts
+++ b/x-pack/plugins/canvas/public/lib/loading_indicator.ts
@@ -6,7 +6,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
 let isActive = false;
 
diff --git a/x-pack/plugins/canvas/public/lib/storage.ts b/x-pack/plugins/canvas/public/lib/storage.ts
index 92221b9398446..f449d785f16b9 100644
--- a/x-pack/plugins/canvas/public/lib/storage.ts
+++ b/x-pack/plugins/canvas/public/lib/storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { getWindow } from './get_window';
 
 export enum StorageType {
diff --git a/x-pack/plugins/canvas/public/lib/template.js b/x-pack/plugins/canvas/public/lib/template.js
index 55ee6ff6e89d0..edac3b37cbdb8 100644
--- a/x-pack/plugins/canvas/public/lib/template.js
+++ b/x-pack/plugins/canvas/public/lib/template.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { tagsRegistry } from '../lib/tags_registry';
 import { getDefaultWorkpad } from '../state/defaults';
+import { tagsRegistry } from './tags_registry';
 import { getId } from './get_id';
 
 const defaultWorkpad = getDefaultWorkpad();
diff --git a/x-pack/plugins/canvas/public/lib/ui_metric.ts b/x-pack/plugins/canvas/public/lib/ui_metric.ts
index dc1b56a58fc0f..a4fc282646e52 100644
--- a/x-pack/plugins/canvas/public/lib/ui_metric.ts
+++ b/x-pack/plugins/canvas/public/lib/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export { METRIC_TYPE };
 
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 1c2ce763f42e2..5d3d3f8a3e202 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -6,10 +6,10 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import type { SharePluginSetup } from 'src/plugins/share/public';
-import { ChartsPluginSetup, ChartsPluginStart } from 'src/plugins/charts/public';
-import { VisualizationsStart } from 'src/plugins/visualizations/public';
-import { ReportingStart } from '../../reporting/public';
+import type { SharePluginSetup } from '@kbn/share-plugin/public';
+import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
 import {
   CoreSetup,
   CoreStart,
@@ -18,22 +18,22 @@ import {
   AppUpdater,
   DEFAULT_APP_CATEGORIES,
   PluginInitializerContext,
-} from '../../../../src/core/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { SpacesPluginStart } from '../../spaces/public';
-import { initLoadingIndicator } from './lib/loading_indicator';
-import { getSessionStorage } from './lib/storage';
-import { SESSIONSTORAGE_LASTPATH, CANVAS_APP } from '../common/lib/constants';
-import { CanvasAppLocatorDefinition } from '../common/locator';
+} from '@kbn/core/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
-import { ExpressionsSetup, ExpressionsStart } from '../../../../src/plugins/expressions/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
-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';
-import { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public';
+import { CanvasAppLocatorDefinition } from '../common/locator';
+import { SESSIONSTORAGE_LASTPATH, CANVAS_APP } from '../common/lib/constants';
+import { getSessionStorage } from './lib/storage';
+import { initLoadingIndicator } from './lib/loading_indicator';
 import { getPluginApi, CanvasApi } from './plugin_api';
 import { setupExpressions } from './setup_expressions';
 
diff --git a/x-pack/plugins/canvas/public/plugin_api.ts b/x-pack/plugins/canvas/public/plugin_api.ts
index aafbc2237a531..be98100d041e5 100644
--- a/x-pack/plugins/canvas/public/plugin_api.ts
+++ b/x-pack/plugins/canvas/public/plugin_api.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import {
   AnyExpressionFunctionDefinition,
   AnyExpressionTypeDefinition,
@@ -12,7 +13,6 @@ import {
   AnyRendererFactory,
 } from '../types';
 import { ElementFactory } from '../types';
-import { ExpressionsSetup } from '../../../../src/plugins/expressions/public';
 
 type SpecPromiseFn<T extends any> = () => Promise<T[]>;
 type AddToRegistry<T extends any> = (add: T[] | SpecPromiseFn<T>) => void;
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts
index e54e4d5065564..f4b4e25095209 100644
--- a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.ts
@@ -8,7 +8,7 @@
 import { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { WorkpadPageRouteParams } from '../';
+import { WorkpadPageRouteParams } from '..';
 import { getWorkpad } from '../../../state/selectors/workpad';
 // @ts-expect-error
 import { setPage } from '../../../state/actions/pages';
diff --git a/x-pack/plugins/canvas/public/services/embeddables.ts b/x-pack/plugins/canvas/public/services/embeddables.ts
index 26b150b7a5349..2dad3da3d330b 100644
--- a/x-pack/plugins/canvas/public/services/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/embeddables.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  EmbeddableFactory,
-  EmbeddableStateTransfer,
-} from '../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactory, EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 
 export interface CanvasEmbeddablesService {
   getEmbeddableFactories: () => IterableIterator<EmbeddableFactory>;
diff --git a/x-pack/plugins/canvas/public/services/index.ts b/x-pack/plugins/canvas/public/services/index.ts
index 4bf025c274859..2c01378851ee5 100644
--- a/x-pack/plugins/canvas/public/services/index.ts
+++ b/x-pack/plugins/canvas/public/services/index.ts
@@ -7,7 +7,7 @@
 
 export * from './legacy';
 
-import { PluginServices } from '../../../../../src/plugins/presentation_util/public';
+import { PluginServices } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasCustomElementService } from './custom_element';
 import { CanvasEmbeddablesService } from './embeddables';
diff --git a/x-pack/plugins/canvas/public/services/kibana/custom_element.ts b/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
index 093373d55a3c5..4f580330ef7c2 100644
--- a/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/custom_element.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { CustomElement } from '../../../types';
diff --git a/x-pack/plugins/canvas/public/services/kibana/embeddables.ts b/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
index 8d1a86edab3d8..c0bfdcbb8aa1d 100644
--- a/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasEmbeddablesService } from '../embeddables';
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/expressions.ts b/x-pack/plugins/canvas/public/services/kibana/expressions.ts
index 6174c56aa2b71..614357a3e3867 100644
--- a/x-pack/plugins/canvas/public/services/kibana/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/expressions.ts
@@ -9,11 +9,11 @@ import {
   ExpressionAstExpression,
   ExpressionExecutionParams,
   ExpressionValue,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 import { pluck } from 'rxjs/operators';
+import { ExpressionsServiceStart } from '@kbn/expressions-plugin/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { buildEmbeddableFilters } from '../../../common/lib/build_embeddable_filters';
-import { ExpressionsServiceStart } from '../../../../../../src/plugins/expressions/public';
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasFiltersService } from './filters';
 import { CanvasNotifyService } from '../notify';
diff --git a/x-pack/plugins/canvas/public/services/kibana/filters.ts b/x-pack/plugins/canvas/public/services/kibana/filters.ts
index 872b6759b389b..793b073aaf231 100644
--- a/x-pack/plugins/canvas/public/services/kibana/filters.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 // @ts-expect-error untyped local
 import { getState, getStore } from '../../state/store';
 import { State } from '../../../types';
diff --git a/x-pack/plugins/canvas/public/services/kibana/index.ts b/x-pack/plugins/canvas/public/services/kibana/index.ts
index c1ceb531657d0..cd5e704296405 100644
--- a/x-pack/plugins/canvas/public/services/kibana/index.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/index.ts
@@ -10,7 +10,7 @@ import {
   PluginServiceProvider,
   PluginServiceRegistry,
   KibanaPluginServiceParams,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPluginServices } from '..';
 import { CanvasStartDeps } from '../../plugin';
diff --git a/x-pack/plugins/canvas/public/services/kibana/labs.ts b/x-pack/plugins/canvas/public/services/kibana/labs.ts
index 58cbf4d181c17..f6dd9135c809d 100644
--- a/x-pack/plugins/canvas/public/services/kibana/labs.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/labs.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  KibanaPluginServiceFactory,
-  projectIDs,
-} from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory, projectIDs } from '@kbn/presentation-util-plugin/public';
 import { UI_SETTINGS } from '../../../common';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasLabsService } from '../labs';
diff --git a/x-pack/plugins/canvas/public/services/kibana/nav_link.ts b/x-pack/plugins/canvas/public/services/kibana/nav_link.ts
index afbcbde03d49e..cf68b69155ad7 100644
--- a/x-pack/plugins/canvas/public/services/kibana/nav_link.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/nav_link.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { SESSIONSTORAGE_LASTPATH } from '../../../common/lib/constants';
 import { getSessionStorage } from '../../lib/storage';
diff --git a/x-pack/plugins/canvas/public/services/kibana/notify.ts b/x-pack/plugins/canvas/public/services/kibana/notify.ts
index 22d4b6f8a476d..8448a1d515fe4 100644
--- a/x-pack/plugins/canvas/public/services/kibana/notify.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/notify.ts
@@ -6,10 +6,10 @@
  */
 
 import { get } from 'lodash';
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
+import { ToastInputFields } from '@kbn/core/public';
 import { formatMsg } from '../../lib/format_msg';
-import { ToastInputFields } from '../../../../../../src/core/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasNotifyService } from '../notify';
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/platform.ts b/x-pack/plugins/canvas/public/services/kibana/platform.ts
index aea8c6e7f7a95..8a6ea957ab97c 100644
--- a/x-pack/plugins/canvas/public/services/kibana/platform.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/platform.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasPlatformService } from '../platform';
diff --git a/x-pack/plugins/canvas/public/services/kibana/reporting.ts b/x-pack/plugins/canvas/public/services/kibana/reporting.ts
index 02611acdea4da..56b9b91e45fc6 100644
--- a/x-pack/plugins/canvas/public/services/kibana/reporting.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/reporting.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasReportingService } from '../reporting';
diff --git a/x-pack/plugins/canvas/public/services/kibana/visualizations.ts b/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
index e319ec1c1f427..6f1728953ee8e 100644
--- a/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasVisualizationsService } from '../visualizations';
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/workpad.ts b/x-pack/plugins/canvas/public/services/kibana/workpad.ts
index 7399c12d96a86..9a8a5f1d9a428 100644
--- a/x-pack/plugins/canvas/public/services/kibana/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/workpad.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/public';
-import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { SavedObject } from '@kbn/core/public';
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasStartDeps } from '../../plugin';
 import { CanvasWorkpadService, ResolveWorkpadResponse } from '../workpad';
diff --git a/x-pack/plugins/canvas/public/services/labs.ts b/x-pack/plugins/canvas/public/services/labs.ts
index 6d8171cdfe1de..960e48a009007 100644
--- a/x-pack/plugins/canvas/public/services/labs.ts
+++ b/x-pack/plugins/canvas/public/services/labs.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  projectIDs,
-  PresentationLabsService,
-} from '../../../../../src/plugins/presentation_util/public';
+import { projectIDs, PresentationLabsService } from '@kbn/presentation-util-plugin/public';
 
 export interface CanvasLabsService extends PresentationLabsService {
   projectIDs: typeof projectIDs;
diff --git a/x-pack/plugins/canvas/public/services/legacy/index.ts b/x-pack/plugins/canvas/public/services/legacy/index.ts
index 82ef3f248f7fd..c5311f37dd4c5 100644
--- a/x-pack/plugins/canvas/public/services/legacy/index.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/index.ts
@@ -6,12 +6,12 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { CoreSetup, CoreStart, AppUpdater } from '../../../../../../src/core/public';
+import { CoreSetup, CoreStart, AppUpdater } from '@kbn/core/public';
 import { CanvasSetupDeps, CanvasStartDeps } from '../../plugin';
 import { searchServiceFactory } from './search';
 
 export type { SearchService } from './search';
-export { ExpressionsService } from '../../../../../../src/plugins/expressions/common';
+export { ExpressionsService } from '@kbn/expressions-plugin/common';
 export * from './context';
 
 export type CanvasServiceFactory<Service> = (
diff --git a/x-pack/plugins/canvas/public/services/legacy/reporting.ts b/x-pack/plugins/canvas/public/services/legacy/reporting.ts
index e594475360dff..411a892baed29 100644
--- a/x-pack/plugins/canvas/public/services/legacy/reporting.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/reporting.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ReportingStart } from '../../../../reporting/public';
-import { CanvasServiceFactory } from './';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
+import { CanvasServiceFactory } from '.';
 
 export interface ReportingService {
   start?: ReportingStart;
diff --git a/x-pack/plugins/canvas/public/services/legacy/search.ts b/x-pack/plugins/canvas/public/services/legacy/search.ts
index 0fe5c89c77096..849817196f0cb 100644
--- a/x-pack/plugins/canvas/public/services/legacy/search.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/search.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { CanvasServiceFactory } from '.';
 
 export interface SearchService {
diff --git a/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts b/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts
index af43e9ed75c98..6a90ed878d425 100644
--- a/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts
+++ b/x-pack/plugins/canvas/public/services/legacy/stubs/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CanvasServices, services } from '../';
+import { CanvasServices, services } from '..';
 import { searchService } from './search';
 
 export const stubs: CanvasServices = {
diff --git a/x-pack/plugins/canvas/public/services/notify.ts b/x-pack/plugins/canvas/public/services/notify.ts
index 67c5cb6bf79c4..83e7b4e71ee72 100644
--- a/x-pack/plugins/canvas/public/services/notify.ts
+++ b/x-pack/plugins/canvas/public/services/notify.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToastInputFields } from '../../../../../src/core/public';
+import { ToastInputFields } from '@kbn/core/public';
 
 export interface CanvasNotifyService {
   error: (err: string | Error, opts?: ToastInputFields) => void;
diff --git a/x-pack/plugins/canvas/public/services/platform.ts b/x-pack/plugins/canvas/public/services/platform.ts
index c476fac3b8789..613c89770e6e8 100644
--- a/x-pack/plugins/canvas/public/services/platform.ts
+++ b/x-pack/plugins/canvas/public/services/platform.ts
@@ -13,9 +13,9 @@ import {
   ChromeBreadcrumb,
   IBasePath,
   ChromeStart,
-} from '../../../../../src/core/public';
+} from '@kbn/core/public';
 
-import { SpacesPluginStart } from '../../../spaces/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
 export interface CanvasPlatformService {
   getBasePath: () => string;
diff --git a/x-pack/plugins/canvas/public/services/reporting.ts b/x-pack/plugins/canvas/public/services/reporting.ts
index 9ec5bd6a06a4c..71d90421eafa8 100644
--- a/x-pack/plugins/canvas/public/services/reporting.ts
+++ b/x-pack/plugins/canvas/public/services/reporting.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReportingStart } from '../../../reporting/public';
+import { ReportingStart } from '@kbn/reporting-plugin/public';
 
 type ReportingPanelPDFComponent = ReportingStart['components']['ReportingPanelPDFV2'];
 export interface CanvasReportingService {
diff --git a/x-pack/plugins/canvas/public/services/storybook/index.ts b/x-pack/plugins/canvas/public/services/storybook/index.ts
index 06ac743265f4d..52cad460662b2 100644
--- a/x-pack/plugins/canvas/public/services/storybook/index.ts
+++ b/x-pack/plugins/canvas/public/services/storybook/index.ts
@@ -8,7 +8,7 @@
 import {
   PluginServiceProviders,
   PluginServiceProvider,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPluginServices } from '..';
 import { pluginServiceProviders as stubProviders } from '../stubs';
diff --git a/x-pack/plugins/canvas/public/services/storybook/notify.ts b/x-pack/plugins/canvas/public/services/storybook/notify.ts
index 7ffd2ef9d1453..f6f97c42a1741 100644
--- a/x-pack/plugins/canvas/public/services/storybook/notify.ts
+++ b/x-pack/plugins/canvas/public/services/storybook/notify.ts
@@ -7,7 +7,7 @@
 
 import { action } from '@storybook/addon-actions';
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { StorybookParams } from '.';
 import { CanvasNotifyService } from '../notify';
diff --git a/x-pack/plugins/canvas/public/services/storybook/workpad.ts b/x-pack/plugins/canvas/public/services/storybook/workpad.ts
index 5dd40997900c6..9f40ccccafb3d 100644
--- a/x-pack/plugins/canvas/public/services/storybook/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/storybook/workpad.ts
@@ -8,7 +8,7 @@
 import moment from 'moment';
 
 import { action } from '@storybook/addon-actions';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { getId } from '../../lib/get_id';
 // @ts-expect-error
 import { getDefaultWorkpad } from '../../state/defaults';
diff --git a/x-pack/plugins/canvas/public/services/stubs/custom_element.ts b/x-pack/plugins/canvas/public/services/stubs/custom_element.ts
index d30b5db36949a..551c06ef4b65e 100644
--- a/x-pack/plugins/canvas/public/services/stubs/custom_element.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/custom_element.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasCustomElementService } from '../custom_element';
 
 type CanvasCustomElementServiceFactory = PluginServiceFactory<CanvasCustomElementService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/embeddables.ts b/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
index 9c2cf4d0650ab..435992bd3b5d9 100644
--- a/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasEmbeddablesService } from '../embeddables';
 
 type EmbeddablesServiceFactory = PluginServiceFactory<CanvasEmbeddablesService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/expressions.ts b/x-pack/plugins/canvas/public/services/stubs/expressions.ts
index 776b553b75d55..aaec0bb9edf6a 100644
--- a/x-pack/plugins/canvas/public/services/stubs/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/expressions.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { AnyExpressionRenderDefinition } from 'src/plugins/expressions';
-import { plugin } from '../../../../../../src/plugins/expressions/public';
+import { AnyExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { plugin } from '@kbn/expressions-plugin/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { functions as functionDefinitions } from '../../../canvas_plugin_src/functions/common';
 import { renderFunctions } from '../../../canvas_plugin_src/renderers/core';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
 import {
   CanvasExpressionsService,
   CanvasExpressionsServiceRequiredServices,
diff --git a/x-pack/plugins/canvas/public/services/stubs/filters.ts b/x-pack/plugins/canvas/public/services/stubs/filters.ts
index 972dbfd6dc0e4..19d237bb9c390 100644
--- a/x-pack/plugins/canvas/public/services/stubs/filters.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasFiltersService } from '../filters';
 
 export type CanvasFiltersServiceFactory = PluginServiceFactory<CanvasFiltersService, {}>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/index.ts b/x-pack/plugins/canvas/public/services/stubs/index.ts
index d90b1a3c92201..bb47f0506ce89 100644
--- a/x-pack/plugins/canvas/public/services/stubs/index.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/index.ts
@@ -11,7 +11,7 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../../../../../../src/plugins/presentation_util/public';
+} from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPluginServices } from '..';
 import { customElementServiceFactory } from './custom_element';
diff --git a/x-pack/plugins/canvas/public/services/stubs/labs.ts b/x-pack/plugins/canvas/public/services/stubs/labs.ts
index 74ab460f733d8..617dc4b2b0ec1 100644
--- a/x-pack/plugins/canvas/public/services/stubs/labs.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/labs.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  PluginServiceFactory,
-  projectIDs,
-} from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory, projectIDs } from '@kbn/presentation-util-plugin/public';
 import { CanvasLabsService } from '../labs';
 
 type CanvasLabsServiceFactory = PluginServiceFactory<CanvasLabsService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/nav_link.ts b/x-pack/plugins/canvas/public/services/stubs/nav_link.ts
index cd371db54bded..becbdebcd6328 100644
--- a/x-pack/plugins/canvas/public/services/stubs/nav_link.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/nav_link.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasNavLinkService } from '../nav_link';
 
 type CanvasNavLinkServiceFactory = PluginServiceFactory<CanvasNavLinkService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/notify.ts b/x-pack/plugins/canvas/public/services/stubs/notify.ts
index 0ad322a414f0d..2406afe3ca8a2 100644
--- a/x-pack/plugins/canvas/public/services/stubs/notify.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/notify.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasNotifyService } from '../notify';
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/platform.ts b/x-pack/plugins/canvas/public/services/stubs/platform.ts
index b50f2d3589827..6a0b122069935 100644
--- a/x-pack/plugins/canvas/public/services/stubs/platform.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/platform.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasPlatformService } from '../platform';
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/reporting.tsx b/x-pack/plugins/canvas/public/services/stubs/reporting.tsx
index 6b34ccdf9eebe..71c376efbaba9 100644
--- a/x-pack/plugins/canvas/public/services/stubs/reporting.tsx
+++ b/x-pack/plugins/canvas/public/services/stubs/reporting.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 import { CanvasReportingService } from '../reporting';
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/visualizations.ts b/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
index 4c5525aea143a..812287bf078fb 100644
--- a/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { CanvasVisualizationsService } from '../visualizations';
 
 type VisualizationsServiceFactory = PluginServiceFactory<CanvasVisualizationsService>;
diff --git a/x-pack/plugins/canvas/public/services/stubs/workpad.ts b/x-pack/plugins/canvas/public/services/stubs/workpad.ts
index 6268fa128df0f..f0f877d6d33c2 100644
--- a/x-pack/plugins/canvas/public/services/stubs/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/workpad.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 
 // @ts-expect-error
 import { getDefaultWorkpad, getExportedWorkpad } from '../../state/defaults';
diff --git a/x-pack/plugins/canvas/public/services/visualizations.ts b/x-pack/plugins/canvas/public/services/visualizations.ts
index c602b1dd39f3d..dc816f764e5ec 100644
--- a/x-pack/plugins/canvas/public/services/visualizations.ts
+++ b/x-pack/plugins/canvas/public/services/visualizations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { VisualizationsStart } from '../../../../../src/plugins/visualizations/public';
+import { VisualizationsStart } from '@kbn/visualizations-plugin/public';
 
 export interface CanvasVisualizationsService {
   showNewVisModal: VisualizationsStart['showNewVisModal'];
diff --git a/x-pack/plugins/canvas/public/services/workpad.ts b/x-pack/plugins/canvas/public/services/workpad.ts
index 36780a5df1dfd..1b4b912365e3a 100644
--- a/x-pack/plugins/canvas/public/services/workpad.ts
+++ b/x-pack/plugins/canvas/public/services/workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsResolveResponse } from 'src/core/public';
+import { SavedObjectsResolveResponse } from '@kbn/core/public';
 import { CanvasWorkpad, CanvasTemplate } from '../../types';
 import { CanvasRenderedWorkpad } from '../../shareable_runtime/types';
 
diff --git a/x-pack/plugins/canvas/public/setup_expressions.ts b/x-pack/plugins/canvas/public/setup_expressions.ts
index 54f1c6dbc0d96..2098ad62ad756 100644
--- a/x-pack/plugins/canvas/public/setup_expressions.ts
+++ b/x-pack/plugins/canvas/public/setup_expressions.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../src/core/public';
-import { serializeProvider } from '../../../../src/plugins/expressions/common';
+import { CoreSetup } from '@kbn/core/public';
+import { serializeProvider } from '@kbn/expressions-plugin/common';
 import { API_ROUTE_FUNCTIONS } from '../common/lib/constants';
 
 import { CanvasSetupDeps } from './plugin';
diff --git a/x-pack/plugins/canvas/public/store.ts b/x-pack/plugins/canvas/public/store.ts
index 7fe4eb21ee46f..83e36a41da322 100644
--- a/x-pack/plugins/canvas/public/store.ts
+++ b/x-pack/plugins/canvas/public/store.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { CoreSetup } from '@kbn/core/public';
 import {
   createStore as createReduxStore,
   destroyStore as destroy,
@@ -15,7 +16,6 @@ import {
 // @ts-expect-error untyped local
 import { getInitialState } from './state/initial_state';
 
-import { CoreSetup } from '../../../../src/core/public';
 import { API_ROUTE_FUNCTIONS } from '../common/lib/constants';
 
 export async function createStore(core: CoreSetup) {
diff --git a/x-pack/plugins/canvas/scripts/shareable_runtime.js b/x-pack/plugins/canvas/scripts/shareable_runtime.js
index b760a92811b8e..d182543b5a092 100644
--- a/x-pack/plugins/canvas/scripts/shareable_runtime.js
+++ b/x-pack/plugins/canvas/scripts/shareable_runtime.js
@@ -51,9 +51,10 @@ run(
     if (flags.run) {
       log.info('Starting Webpack Dev Server...');
       execa.sync(
-        'yarn',
+        process.execPath,
         [
-          'webpack-dev-server',
+          '--preserve-symlinks',
+          require.resolve('webpack-dev-server/bin/webpack-dev-server'),
           '--config',
           webpackConfig,
           ...(process.stdout.isTTY && !process.env.CI ? ['--progress'] : []),
@@ -87,9 +88,10 @@ run(
     clean();
     log.info('Building Canvas Shareable Workpad Runtime...');
     execa.sync(
-      'yarn',
+      process.execPath,
       [
-        'webpack',
+        '--preserve-symlinks',
+        require.resolve('webpack/bin/webpack'),
         '--config',
         webpackConfig,
         '--hide-modules',
diff --git a/x-pack/plugins/canvas/server/collectors/collector.ts b/x-pack/plugins/canvas/server/collectors/collector.ts
index 00a246ca8fa30..f98bd319a8ac0 100644
--- a/x-pack/plugins/canvas/server/collectors/collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { TelemetryCollector } from '../../types';
 
 import { workpadCollector, workpadSchema, WorkpadTelemetry } from './workpad_collector';
diff --git a/x-pack/plugins/canvas/server/collectors/collector_helpers.ts b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
index aa88d910098a5..b6781582db3bd 100644
--- a/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
+++ b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
@@ -11,7 +11,7 @@
  */
 
 import { isAst } from '@kbn/interpreter';
-import { ExpressionAstNode } from '../../../../../src/plugins/expressions/common';
+import { ExpressionAstNode } from '@kbn/expressions-plugin/common';
 
 export function collectFns(ast: ExpressionAstNode, cb: (functionName: string) => void) {
   if (!isAst(ast)) {
diff --git a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
index bd855c93ed507..66238abfe89df 100644
--- a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
@@ -6,14 +6,14 @@
  */
 
 import { get } from 'lodash';
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { parseExpression } from '@kbn/expressions-plugin/common';
 import { collectFns } from './collector_helpers';
 import {
   TelemetryCollector,
   TelemetryCustomElement,
   TelemetryCustomElementDocument,
 } from '../../types';
-import { parseExpression } from '../../../../../src/plugins/expressions/common';
 
 const CUSTOM_ELEMENT_TYPE = 'canvas-element';
 interface CustomElementSearch {
diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
index b47ea33a24f4c..72c0206226090 100644
--- a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
@@ -7,11 +7,11 @@
 
 import { sum as arraySum, min as arrayMin, max as arrayMax, get } from 'lodash';
 import moment from 'moment';
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { parseExpression } from '@kbn/expressions-plugin/common';
 import { CANVAS_TYPE } from '../../common/lib/constants';
 import { collectFns } from './collector_helpers';
 import { TelemetryCollector, CanvasWorkpad } from '../../types';
-import { parseExpression } from '../../../../../src/plugins/expressions/common';
 
 interface WorkpadSearch {
   [CANVAS_TYPE]: CanvasWorkpad;
diff --git a/x-pack/plugins/canvas/server/feature.test.ts b/x-pack/plugins/canvas/server/feature.test.ts
index d5325a2c1607b..d6ec20258f5cf 100644
--- a/x-pack/plugins/canvas/server/feature.test.ts
+++ b/x-pack/plugins/canvas/server/feature.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReportingStart } from '../../reporting/server/types';
+import { ReportingStart } from '@kbn/reporting-plugin/server/types';
 import { getCanvasFeature } from './feature';
 
 let mockReportingPlugin: ReportingStart;
diff --git a/x-pack/plugins/canvas/server/feature.ts b/x-pack/plugins/canvas/server/feature.ts
index 84298464e94fc..f5fc320fbeb50 100644
--- a/x-pack/plugins/canvas/server/feature.ts
+++ b/x-pack/plugins/canvas/server/feature.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { KibanaFeatureConfig } from '../../features/common';
-import { ReportingSetup } from '../../reporting/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { ReportingSetup } from '@kbn/reporting-plugin/server';
 
 /*
  * Register Canvas as a Kibana feature,
diff --git a/x-pack/plugins/canvas/server/index.ts b/x-pack/plugins/canvas/server/index.ts
index 79888c98c8caa..d6d375b7259ac 100644
--- a/x-pack/plugins/canvas/server/index.ts
+++ b/x-pack/plugins/canvas/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CanvasPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts b/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts
index e343de569b22f..e39c6f7e98976 100644
--- a/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts
+++ b/x-pack/plugins/canvas/server/lib/essql_strategy.test.ts
@@ -8,6 +8,7 @@
 import { essqlSearchStrategyProvider } from './essql_strategy';
 import { EssqlSearchStrategyRequest } from '../../types';
 import { zipObject } from 'lodash';
+import { lastValueFrom } from 'rxjs';
 
 const getMockEssqlResponse = () => ({
   body: {
@@ -72,7 +73,7 @@ describe('ESSQL search strategy', () => {
     describe('query functionality', () => {
       it('performs a simple query', async () => {
         const sqlSearch = await essqlSearchStrategyProvider();
-        const result = await sqlSearch.search(basicReq, {}, mockDeps).toPromise();
+        const result = await lastValueFrom(sqlSearch.search(basicReq, {}, mockDeps));
         const [[request]] = mockQuery.mock.calls;
 
         expect(request.format).toEqual('json');
@@ -120,7 +121,9 @@ describe('ESSQL search strategy', () => {
         mockQuery.mockReset().mockReturnValueOnce(pageOne).mockReturnValueOnce(pageTwo);
 
         const sqlSearch = await essqlSearchStrategyProvider();
-        const result = await sqlSearch.search({ ...basicReq, count: 2 }, {}, mockDeps).toPromise();
+        const result = await lastValueFrom(
+          sqlSearch.search({ ...basicReq, count: 2 }, {}, mockDeps)
+        );
 
         expect(result.rows).toHaveLength(2);
       });
diff --git a/x-pack/plugins/canvas/server/lib/essql_strategy.ts b/x-pack/plugins/canvas/server/lib/essql_strategy.ts
index 4e69f4831d375..39e019591b1cf 100644
--- a/x-pack/plugins/canvas/server/lib/essql_strategy.ts
+++ b/x-pack/plugins/canvas/server/lib/essql_strategy.ts
@@ -8,9 +8,9 @@
 import { from } from 'rxjs';
 import { map, zipObject } from 'lodash';
 
-import { ISearchStrategy } from 'src/plugins/data/server';
+import { ISearchStrategy } from '@kbn/data-plugin/server';
 
-import { getKbnServerError } from '../../../../../src/plugins/kibana_utils/server';
+import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { EssqlSearchStrategyRequest, EssqlSearchStrategyResponse } from '../../types';
 
 import { buildBoolArray } from '../../common/lib/request/build_bool_array';
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index de4d452508cf2..67675b9f2513b 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { CoreSetup, PluginInitializerContext, Plugin, Logger, CoreStart } from 'src/core/server';
+import { CoreSetup, PluginInitializerContext, Plugin, Logger, CoreStart } from '@kbn/core/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from 'src/plugins/data/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 { EmbeddableSetup } from 'src/plugins/embeddable/server';
+} from '@kbn/data-plugin/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
+import { ReportingSetup } from '@kbn/reporting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { ESSQL_SEARCH_STRATEGY } from '../common/lib/constants';
-import { ReportingSetup } from '../../reporting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import { getCanvasFeature } from './feature';
 import { initRoutes } from './routes';
 import { registerCanvasUsageCollector } from './collectors';
diff --git a/x-pack/plugins/canvas/server/routes/catch_error_handler.ts b/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
index f565c911274f8..5920377c85336 100644
--- a/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
+++ b/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler, RequestHandlerContext } from 'src/core/server';
+import { RequestHandler, RequestHandlerContext } from '@kbn/core/server';
 
 export const catchErrorHandler: <P, Q, B, Context extends RequestHandlerContext>(
   fn: RequestHandler<P, Q, B, Context>
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 fe34eeeb6e631..e1175191a4c2c 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
@@ -6,10 +6,10 @@
  */
 
 import sinon from 'sinon';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeCreateCustomElementRoute } from './create';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/create.ts b/x-pack/plugins/canvas/server/routes/custom_elements/create.ts
index 9e5b38002dc06..72780ee35e972 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/create.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/create.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { getId } from '../../../common/lib/get_id';
 import { CustomElementSchema } from './custom_element_schema';
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 5d7321d6943d1..95d300ca07eda 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,8 +7,8 @@
 
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeDeleteCustomElementRoute } from './delete';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts b/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts
index 53f1f271c80a7..8e1ae3335c27d 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { okResponse } from '../ok_response';
 import { catchErrorHandler } from '../catch_error_handler';
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 e84eb835ce225..e84d7ec758978 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,8 +6,8 @@
  */
 
 import { initializeFindCustomElementsRoute } from './find';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/find.ts b/x-pack/plugins/canvas/server/routes/custom_elements/find.ts
index 069fd149069c8..edc72208d8075 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/find.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/find.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectAttributes } from 'src/core/server';
-import { RouteInitializerDeps } from '../';
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 
 export function initializeFindCustomElementsRoute(deps: RouteInitializerDeps) {
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 ee1db89bda228..5f70876bd5f6d 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,8 +7,8 @@
 
 import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants';
 import { initializeGetCustomElementRoute } from './get';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/get.ts b/x-pack/plugins/canvas/server/routes/custom_elements/get.ts
index 26e8c14305c27..0fd66da28fab4 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/get.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { CustomElementAttributes } from './custom_element_attributes';
 import { catchErrorHandler } from '../catch_error_handler';
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/index.ts b/x-pack/plugins/canvas/server/routes/custom_elements/index.ts
index ec84cd4987246..86d40d1d01ba3 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/index.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeFindCustomElementsRoute } from './find';
 import { initializeGetCustomElementRoute } from './get';
 import { initializeCreateCustomElementRoute } from './create';
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 d19fb5516bd47..cb984931d548f 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,8 +9,8 @@ import sinon from 'sinon';
 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, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { okResponse } from '../ok_response';
 import { getMockedRouterDeps } from '../test_helpers';
 
diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/update.ts b/x-pack/plugins/canvas/server/routes/custom_elements/update.ts
index e38e9467e2854..1604c7b408309 100644
--- a/x-pack/plugins/canvas/server/routes/custom_elements/update.ts
+++ b/x-pack/plugins/canvas/server/routes/custom_elements/update.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { omit } from 'lodash';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants';
 import { CustomElementUpdateSchema } from './custom_element_schema';
 import { CustomElementAttributes } from './custom_element_attributes';
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 ee17b2d3035b8..ec664df330d31 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,8 +6,8 @@
  */
 
 import { initializeESFieldsRoute } from './es_fields';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServerMock, elasticsearchServiceMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/functions/functions.test.ts b/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
index 9265850553d7e..9a308b8f0b545 100644
--- a/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
+++ b/x-pack/plugins/canvas/server/routes/functions/functions.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-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 { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common/expression_functions';
 import { initializeGetFunctionsRoute } from './functions';
 import { getMockedRouterDeps } from '../test_helpers';
 import { API_ROUTE_FUNCTIONS } from '../../../common/lib';
diff --git a/x-pack/plugins/canvas/server/routes/functions/functions.ts b/x-pack/plugins/canvas/server/routes/functions/functions.ts
index 47b35a4f6c17b..a2cc8f0a365e9 100644
--- a/x-pack/plugins/canvas/server/routes/functions/functions.ts
+++ b/x-pack/plugins/canvas/server/routes/functions/functions.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { serializeProvider } from '../../../../../../src/plugins/expressions/common';
-import { RouteInitializerDeps } from '../';
+import { serializeProvider } from '@kbn/expressions-plugin/common';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_FUNCTIONS } from '../../../common/lib/constants';
 
 interface FunctionCall {
diff --git a/x-pack/plugins/canvas/server/routes/index.ts b/x-pack/plugins/canvas/server/routes/index.ts
index b7ba5637119f8..73829cb372e70 100644
--- a/x-pack/plugins/canvas/server/routes/index.ts
+++ b/x-pack/plugins/canvas/server/routes/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter, Logger } from 'src/core/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { BfetchServerSetup } from 'src/plugins/bfetch/server';
+import { IRouter, Logger } from '@kbn/core/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { initCustomElementsRoutes } from './custom_elements';
 import { initESFieldsRoutes } from './es_fields';
 import { initShareablesRoutes } from './shareables';
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 d91b7160ccb91..cb93695a1ee49 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,8 @@
 import fs from 'fs';
 import { SHAREABLE_RUNTIME_FILE } from '../../../shareable_runtime/constants';
 
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { initializeDownloadShareableWorkpadRoute } from './download';
 import { getMockedRouterDeps } from '../test_helpers';
 
diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.ts b/x-pack/plugins/canvas/server/routes/shareables/download.ts
index 89104cf2e4884..27b3765d240ec 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/download.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/download.ts
@@ -7,7 +7,7 @@
 
 import { readFileSync } from 'fs';
 import { SHAREABLE_RUNTIME_FILE } from '../../../shareable_runtime/constants';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD } from '../../../common/lib/constants';
 
 export function initializeDownloadShareableWorkpadRoute(deps: RouteInitializerDeps) {
diff --git a/x-pack/plugins/canvas/server/routes/shareables/index.ts b/x-pack/plugins/canvas/server/routes/shareables/index.ts
index 0d06bb3397151..a14975632a26b 100644
--- a/x-pack/plugins/canvas/server/routes/shareables/index.ts
+++ b/x-pack/plugins/canvas/server/routes/shareables/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeZipShareableWorkpadRoute } from './zip';
 import { initializeDownloadShareableWorkpadRoute } from './download';
 
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 73387db51aab4..a0a741fa6b538 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,8 @@ 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 { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { initializeZipShareableWorkpadRoute } from './zip';
 import { getMockedRouterDeps } from '../test_helpers';
 import { API_ROUTE_SHAREABLE_ZIP } from '../../../common/lib';
diff --git a/x-pack/plugins/canvas/server/routes/templates/index.ts b/x-pack/plugins/canvas/server/routes/templates/index.ts
index f291de34c4bf3..26ca9756eb20d 100644
--- a/x-pack/plugins/canvas/server/routes/templates/index.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeListTemplates } from './list';
 
 export function initTemplateRoutes(deps: RouteInitializerDeps) {
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 d055692e17191..eb9703a33a401 100644
--- a/x-pack/plugins/canvas/server/routes/templates/list.test.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/list.test.ts
@@ -7,8 +7,8 @@
 
 import { badRequest } from '@hapi/boom';
 import { initializeListTemplates } from './list';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/templates/list.ts b/x-pack/plugins/canvas/server/routes/templates/list.ts
index 3115743d66b0a..2bff143f127bc 100644
--- a/x-pack/plugins/canvas/server/routes/templates/list.ts
+++ b/x-pack/plugins/canvas/server/routes/templates/list.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { TEMPLATE_TYPE, API_ROUTE_TEMPLATES } from '../../../common/lib/constants';
 import { catchErrorHandler } from '../catch_error_handler';
 import { CanvasTemplate } from '../../../types';
diff --git a/x-pack/plugins/canvas/server/routes/test_helpers.ts b/x-pack/plugins/canvas/server/routes/test_helpers.ts
index bc1aaee41f9e8..30d63576ed6f2 100644
--- a/x-pack/plugins/canvas/server/routes/test_helpers.ts
+++ b/x-pack/plugins/canvas/server/routes/test_helpers.ts
@@ -9,9 +9,9 @@ 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';
+} from '@kbn/core/server/mocks';
+import { bfetchPluginMock } from '@kbn/bfetch-plugin/server/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/server/mocks';
 
 export function getMockedRouterDeps() {
   const httpService = httpServiceMock.createSetupContract();
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 87ead1bf897f9..175a1084ec1a4 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { workpadRouteContextMock, MockWorkpadRouteContext } from '../../mocks';
 import { initializeCreateWorkpadRoute } from './create';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 import { getMockedRouterDeps } from '../test_helpers';
 
 let mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.ts b/x-pack/plugins/canvas/server/routes/workpad/create.ts
index 2a0c47fee4c9e..8460939c730c8 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/create.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/create.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD, TEMPLATE_TYPE } from '../../../common/lib/constants';
 import { CanvasWorkpad } from '../../../types';
 import { WorkpadSchema } from './workpad_schema';
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 b3f1ebd4db528..fdd390d2954a9 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts
@@ -7,8 +7,8 @@
 
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeDeleteWorkpadRoute } from './delete';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/delete.ts b/x-pack/plugins/canvas/server/routes/workpad/delete.ts
index 0a1d0d7826b52..9075f651abb5a 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/delete.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 import { okResponse } from '../ok_response';
 import { catchErrorHandler } from '../catch_error_handler';
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 6379b6f8258b7..8a54889413d80 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/find.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { initializeFindWorkpadsRoute } from './find';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getMockedRouterDeps } from '../test_helpers';
 
 const mockRouteContext = {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/find.ts b/x-pack/plugins/canvas/server/routes/workpad/find.ts
index 5e7a3606755b5..c8953bfab8a72 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/find.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/find.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectAttributes } from 'src/core/server';
-import { RouteInitializerDeps } from '../';
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RouteInitializerDeps } from '..';
 import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 
 export function initializeFindWorkpadsRoute(deps: RouteInitializerDeps) {
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 cae485b62f66f..735bbfc7209af 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts
@@ -7,8 +7,8 @@
 
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeGetWorkpadRoute } from './get';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { workpadWithGroupAsElement } from '../../../__fixtures__/workpads';
 import { CanvasWorkpad } from '../../../types';
 import { getMockedRouterDeps } from '../test_helpers';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/get.ts b/x-pack/plugins/canvas/server/routes/workpad/get.ts
index 11e39adc4ca32..8fc31e9850dbc 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/get.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/get.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 import { catchErrorHandler } from '../catch_error_handler';
 import { shimWorkpad } from './shim_workpad';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/import.ts b/x-pack/plugins/canvas/server/routes/workpad/import.ts
index 35d362f43becc..d8438920aeb5d 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/import.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/import.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD_IMPORT } from '../../../common/lib/constants';
 import { ImportedCanvasWorkpad } from '../../../types';
 import { ImportedWorkpadSchema } from './workpad_schema';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/index.ts b/x-pack/plugins/canvas/server/routes/workpad/index.ts
index b97d58ee232f1..067b54e7cbebe 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/index.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { initializeFindWorkpadsRoute } from './find';
 import { initializeGetWorkpadRoute } from './get';
 import { initializeCreateWorkpadRoute } from './create';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts b/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts
index bc93e115e137f..94e3f9dd03462 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/resolve.test.ts
@@ -7,8 +7,8 @@
 
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeResolveWorkpadRoute } from './resolve';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { workpadWithGroupAsElement } from '../../../__fixtures__/workpads';
 import { CanvasWorkpad } from '../../../types';
 import { getMockedRouterDeps } from '../test_helpers';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/resolve.ts b/x-pack/plugins/canvas/server/routes/workpad/resolve.ts
index e5643a9a81353..dbd65e30482f8 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/resolve.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/resolve.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import { API_ROUTE_WORKPAD } from '../../../common/lib/constants';
 import { catchErrorHandler } from '../catch_error_handler';
 import { shimWorkpad } from './shim_workpad';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts b/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts
index 63fa5bb252985..755c0c3391bf3 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/shim_workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { WorkpadAttributes } from './workpad_attributes';
 
 export function shimWorkpad(workpad: SavedObject<WorkpadAttributes>) {
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 240298564fdba..a0aaa05b0f718 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts
@@ -8,8 +8,8 @@
 import sinon from 'sinon';
 import { CANVAS_TYPE } from '../../../common/lib/constants';
 import { initializeUpdateWorkpadRoute, initializeUpdateWorkpadAssetsRoute } from './update';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { savedObjectsClientMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
+import { savedObjectsClientMock, httpServerMock } from '@kbn/core/server/mocks';
 import { workpads } from '../../../__fixtures__/workpads';
 import { okResponse } from '../ok_response';
 import { getMockedRouterDeps } from '../test_helpers';
diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.ts b/x-pack/plugins/canvas/server/routes/workpad/update.ts
index 2fe3c8fc9e3ed..9d115c83c1def 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/update.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/update.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { CanvasWorkpad } from '../../../types';
-import { RouteInitializerDeps } from '../';
+import { RouteInitializerDeps } from '..';
 import {
   API_ROUTE_WORKPAD,
   API_ROUTE_WORKPAD_STRUCTURES,
diff --git a/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts b/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
index d891a5405a424..da219146a3609 100644
--- a/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
+++ b/x-pack/plugins/canvas/server/sample_data/load_sample_data.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SampleDataRegistrySetup } from 'src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { CANVAS as label } from '../../i18n';
-import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from './index';
+import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from '.';
 
 export function loadSampleData(
   addSavedObjectsToSampleDataset: SampleDataRegistrySetup['addSavedObjectsToSampleDataset'],
diff --git a/x-pack/plugins/canvas/server/saved_objects/custom_element.ts b/x-pack/plugins/canvas/server/saved_objects/custom_element.ts
index 82305b2fdd95f..db87909fbd44f 100644
--- a/x-pack/plugins/canvas/server/saved_objects/custom_element.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/custom_element.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CUSTOM_ELEMENT_TYPE } from '../../common/lib/constants';
 import { customElementMigrationsFactory, CanvasSavedObjectTypeMigrationsDeps } from './migrations';
 
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts
index 20eba14c5cff0..d0afe5ec8e814 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/expressions.ts
@@ -6,8 +6,9 @@
  */
 import { Ast, fromExpression, toExpression } from '@kbn/interpreter';
 import { Serializable } from '@kbn/utility-types';
-import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { flowRight, mapValues } from 'lodash';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import {
   CanvasElement,
   CanvasTemplateElement,
@@ -16,10 +17,6 @@ import {
   CustomElementContent,
   CustomElementNode,
 } from '../../../types';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
 import { WorkpadAttributes } from '../../routes/workpad/workpad_attributes';
 import { CanvasSavedObjectTypeMigrationsDeps } from './types';
 
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts
index 88913b50c3c4c..dcfab92b4e859 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/index.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { mergeMigrationFunctionMaps } from '@kbn/kibana-utils-plugin/common';
 import {
   customElementExpressionsMigrationsFactory,
   templateWorkpadExpressionsMigrationsFactory,
@@ -11,7 +12,6 @@ import {
 } from './expressions';
 import { CanvasSavedObjectTypeMigrationsDeps } from './types';
 import { workpadMigrationsFactory as workpadMigrationsFactoryFn } from './workpad';
-import { mergeMigrationFunctionMaps } from '../../../../../../src/plugins/kibana_utils/common';
 
 export const workpadMigrationsFactory = (deps: CanvasSavedObjectTypeMigrationsDeps) =>
   mergeMigrationFunctionMaps(
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts
index f1dcbd5fe9e7c..86707fc006214 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/remove_attributes_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 
 export const removeAttributesId: SavedObjectMigrationFn<any, any> = (doc) => {
   if (typeof doc.attributes === 'object' && doc.attributes !== null) {
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts
index f9b3fd86fc0f5..366e29bf65d2c 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionsServiceSetup } from 'src/plugins/expressions/public';
+import { ExpressionsServiceSetup } from '@kbn/expressions-plugin/public';
 
 export interface CanvasSavedObjectTypeMigrationsDeps {
   expressions: ExpressionsServiceSetup;
diff --git a/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts b/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts
index d4d7e2b429711..c37d7292e28c8 100644
--- a/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/migrations/workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { removeAttributesId } from './remove_attributes_id';
 import { CanvasSavedObjectTypeMigrationsDeps } from './types';
 
diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad.ts b/x-pack/plugins/canvas/server/saved_objects/workpad.ts
index db22025e625e8..b23ea62f88954 100644
--- a/x-pack/plugins/canvas/server/saved_objects/workpad.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/workpad.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CANVAS_TYPE } from '../../common/lib/constants';
 import { workpadMigrationsFactory } from './migrations';
 import type { CanvasSavedObjectTypeMigrationsDeps } from './migrations';
diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts b/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts
index 6d76dc61bd96b..917561559f380 100644
--- a/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts
@@ -6,12 +6,11 @@
  */
 
 import { fromExpression, toExpression } from '@kbn/interpreter';
-import { PersistableStateService } from '../../../../../src/plugins/kibana_utils/common';
-import { SavedObjectReference } from '../../../../../src/core/server';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+import { SavedObjectReference } from '@kbn/core/server';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { WorkpadAttributes } from '../routes/workpad/workpad_attributes';
 
-import type { ExpressionAstExpression } from '../../../../../src/plugins/expressions';
-
 export const extractReferences = (
   workpad: WorkpadAttributes,
   expressions: PersistableStateService<ExpressionAstExpression>
diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts b/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts
index a55c7348c62bb..ec852113e1ca4 100644
--- a/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts
+++ b/x-pack/plugins/canvas/server/saved_objects/workpad_template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { TEMPLATE_TYPE } from '../../common/lib/constants';
 import {
   CanvasSavedObjectTypeMigrationsDeps,
diff --git a/x-pack/plugins/canvas/server/setup_interpreter.ts b/x-pack/plugins/canvas/server/setup_interpreter.ts
index 849ad79717056..fdd56e4857329 100644
--- a/x-pack/plugins/canvas/server/setup_interpreter.ts
+++ b/x-pack/plugins/canvas/server/setup_interpreter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { functions } from '../canvas_plugin_src/functions/server';
 import {
   initFunctions as initExternalFunctions,
diff --git a/x-pack/plugins/canvas/server/templates/index.ts b/x-pack/plugins/canvas/server/templates/index.ts
index 524f4c8a9265a..fbd4276e40cd9 100644
--- a/x-pack/plugins/canvas/server/templates/index.ts
+++ b/x-pack/plugins/canvas/server/templates/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsRepository } from 'src/core/server';
+import { SavedObjectsRepository } from '@kbn/core/server';
 
 import { TEMPLATE_TYPE } from '../../common/lib/constants';
 
diff --git a/x-pack/plugins/canvas/server/ui_settings.ts b/x-pack/plugins/canvas/server/ui_settings.ts
index 3e7de1dbb7d79..308700abf5cb0 100644
--- a/x-pack/plugins/canvas/server/ui_settings.ts
+++ b/x-pack/plugins/canvas/server/ui_settings.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { SETTING_CATEGORY } from '../../../../src/plugins/presentation_util/server';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { SETTING_CATEGORY } from '@kbn/presentation-util-plugin/server';
+import { UiSettingsParams } from '@kbn/core/types';
 import { UI_SETTINGS } from '../common';
 
 /**
diff --git a/x-pack/plugins/canvas/server/workpad_route_context.test.ts b/x-pack/plugins/canvas/server/workpad_route_context.test.ts
index 9626b2ffd9575..a1da10b09a91d 100644
--- a/x-pack/plugins/canvas/server/workpad_route_context.test.ts
+++ b/x-pack/plugins/canvas/server/workpad_route_context.test.ts
@@ -8,8 +8,8 @@
 import sinon from 'sinon';
 import { fromExpression } from '@kbn/interpreter';
 import { createWorkpadRouteContext } from './workpad_route_context';
-import { RequestHandlerContext, SavedObjectReference } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { RequestHandlerContext, SavedObjectReference } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { CanvasWorkpad } from '../types';
 import { CANVAS_TYPE } from '../common/lib/constants';
 
diff --git a/x-pack/plugins/canvas/server/workpad_route_context.ts b/x-pack/plugins/canvas/server/workpad_route_context.ts
index 2e4cad231dd84..c154dd66d76be 100644
--- a/x-pack/plugins/canvas/server/workpad_route_context.ts
+++ b/x-pack/plugins/canvas/server/workpad_route_context.ts
@@ -10,8 +10,8 @@ import {
   RequestHandlerContextProvider,
   SavedObject,
   SavedObjectsResolveResponse,
-} from 'kibana/server';
-import { ExpressionsServiceStart } from 'src/plugins/expressions';
+} from '@kbn/core/server';
+import { ExpressionsServiceStart } from '@kbn/expressions-plugin';
 import { WorkpadAttributes } from './routes/workpad/workpad_attributes';
 import { CANVAS_TYPE } from '../common/lib/constants';
 import { injectReferences, extractReferences } from './saved_objects/workpad_references';
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx
index ee609f42f1cf9..ac35952a29765 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/rendered_element.stories.tsx
@@ -7,9 +7,9 @@
 
 import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { imageFunction } from '@kbn/expression-image-plugin/__fixtures__';
 import { ExampleContext } from '../../test/context_example';
 
-import { imageFunction } from '../../../../../../src/plugins/expression_image/__fixtures__';
 import { sharedWorkpads } from '../../test';
 import { RenderedElement, RenderedElementComponent } from '../rendered_element';
 
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
index 0109e292ebc7c..557b8698f7e12 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
@@ -296,6 +296,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                               >
                                 <input
                                   aria-describedby="generated-id-help-0"
+                                  aria-invalid="false"
                                   class="euiFieldText euiFieldText--compressed"
                                   id="generated-id"
                                   type="text"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
index 3dd472eecd9c5..e803600fe8d51 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
@@ -107,6 +107,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
                 >
                   <input
                     aria-describedby="generated-id-help-0"
+                    aria-invalid={false}
                     className="euiFieldText euiFieldText--compressed"
                     id="generated-id"
                     onBlur={[Function]}
@@ -275,6 +276,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
                 >
                   <input
                     aria-describedby="generated-id-help-0"
+                    aria-invalid={false}
                     className="euiFieldText euiFieldText--compressed"
                     id="generated-id"
                     onBlur={[Function]}
@@ -443,6 +445,7 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
                 >
                   <input
                     aria-describedby="generated-id-help-0"
+                    aria-invalid={false}
                     className="euiFieldText euiFieldText--compressed"
                     id="generated-id"
                     onBlur={[Function]}
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
index 01c0a633fbdb7..2488aaac9c2e8 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx
@@ -8,7 +8,7 @@
 import React, { FC, PureComponent } from 'react';
 // @ts-expect-error untyped library
 import Style from 'style-it';
-import { AnyExpressionFunctionDefinition } from '../../../../../src/plugins/expressions';
+import { AnyExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import { Positionable } from '../../public/components/positionable/positionable';
 import { elementToShape } from '../../public/components/workpad_page/positioning_utils';
 import { CanvasRenderedElement } from '../types';
diff --git a/x-pack/plugins/canvas/shareable_runtime/index.ts b/x-pack/plugins/canvas/shareable_runtime/index.ts
index 8b3b5007c853e..08de4d4c7ae85 100644
--- a/x-pack/plugins/canvas/shareable_runtime/index.ts
+++ b/x-pack/plugins/canvas/shareable_runtime/index.ts
@@ -7,7 +7,7 @@
 
 export * from './api';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../src/core/server/core_app/assets/legacy_light_theme.css';
+import '@kbn/core/server/core_app/assets/legacy_light_theme.css';
 import '../public/style/index.scss';
 import '@elastic/eui/dist/eui_theme_light.css';
 import '@kbn/ui-framework/dist/kui_light.css';
diff --git a/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
index f8aebc04efe5c..8d8e2e1f26739 100644
--- a/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
+++ b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js
@@ -5,23 +5,17 @@
  * 2.0.
  */
 
-import { getMarkdownRenderer } from '../canvas_plugin_src/renderers/markdown';
-import { pie } from '../canvas_plugin_src/renderers/pie';
-import { plot } from '../canvas_plugin_src/renderers/plot';
-import { getTableRenderer } from '../canvas_plugin_src/renderers/table';
+import { getImageRenderer } from '@kbn/expression-image-plugin/public';
+import { getErrorRenderer, getDebugRenderer } from '@kbn/expression-error-plugin/public';
+import { getRevealImageRenderer } from '@kbn/expression-reveal-image-plugin/public';
+import { getRepeatImageRenderer } from '@kbn/expression-repeat-image-plugin/public';
+import { getShapeRenderer, getProgressRenderer } from '@kbn/expression-shape-plugin/public';
+import { getMetricRenderer } from '@kbn/expression-metric-plugin/public';
 import { getTextRenderer } from '../canvas_plugin_src/renderers/text';
-import { getImageRenderer } from '../../../../src/plugins/expression_image/public';
-import {
-  getErrorRenderer,
-  getDebugRenderer,
-} from '../../../../src/plugins/expression_error/public';
-import { getRevealImageRenderer } from '../../../../src/plugins/expression_reveal_image/public';
-import { getRepeatImageRenderer } from '../../../../src/plugins/expression_repeat_image/public';
-import {
-  getShapeRenderer,
-  getProgressRenderer,
-} from '../../../../src/plugins/expression_shape/public';
-import { getMetricRenderer } from '../../../../src/plugins/expression_metric/public';
+import { getTableRenderer } from '../canvas_plugin_src/renderers/table';
+import { plot } from '../canvas_plugin_src/renderers/plot';
+import { pie } from '../canvas_plugin_src/renderers/pie';
+import { getMarkdownRenderer } from '../canvas_plugin_src/renderers/markdown';
 
 const unboxFactory = (factory) => factory();
 
diff --git a/x-pack/plugins/canvas/shareable_runtime/test/context.tsx b/x-pack/plugins/canvas/shareable_runtime/test/context.tsx
index 394a666599bc6..915d53d862df8 100644
--- a/x-pack/plugins/canvas/shareable_runtime/test/context.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/test/context.tsx
@@ -10,7 +10,7 @@ import {
   initialCanvasShareableState,
   CanvasShareableStateProvider,
   useCanvasShareableState,
-} from '../context/index';
+} from '../context';
 import { renderFunctions } from '../supported_renderers';
 import { CanvasShareableState } from '../types';
 import { RendererSpec } from '../../types';
diff --git a/x-pack/plugins/canvas/shareable_runtime/types.ts b/x-pack/plugins/canvas/shareable_runtime/types.ts
index 751fb3f795524..4dbbb2bbc904c 100644
--- a/x-pack/plugins/canvas/shareable_runtime/types.ts
+++ b/x-pack/plugins/canvas/shareable_runtime/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { RefObject } from 'react';
-import { SavedObject, SavedObjectAttributes } from 'src/core/public';
+import { SavedObject, SavedObjectAttributes } from '@kbn/core/public';
 
 import { ElementPosition, CanvasPage, CanvasWorkpad, RendererSpec } from '../types';
 
diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
index 42e96ab4471fe..1a22af80da28d 100644
--- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
+++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
@@ -38,15 +38,8 @@ module.exports = {
     filename: '[name].js',
     library: LIBRARY_NAME,
   },
-  // Include a require alias for legacy UI code and styles
   resolve: {
     alias: {
-      'data/interpreter': path.resolve(
-        KIBANA_ROOT,
-        'src/plugins/data/public/expressions/interpreter'
-      ),
-      'kbn/interpreter': path.resolve(KIBANA_ROOT, 'packages/kbn-interpreter/target/common'),
-      tinymath: path.resolve(KIBANA_ROOT, 'node_modules/tinymath/lib/tinymath.min.js'),
       core_app_image_assets: path.resolve(KIBANA_ROOT, 'src/core/public/core_app/images'),
     },
     extensions: ['.js', '.json', '.ts', '.tsx', '.scss'],
diff --git a/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx b/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx
index 953a8152a01e6..2c67e20ae2de8 100644
--- a/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx
+++ b/x-pack/plugins/canvas/storybook/decorators/kibana_decorator.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const settings = new Map();
 settings.set('darkMode', true);
diff --git a/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx b/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx
index eaed712ba869f..4c610a943a1f2 100644
--- a/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx
+++ b/x-pack/plugins/canvas/storybook/decorators/services_decorator.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { DecoratorFn } from '@storybook/react';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { PluginServiceRegistry } from '../../../../../src/plugins/presentation_util/public';
+import { PluginServiceRegistry } from '@kbn/presentation-util-plugin/public';
 import { pluginServices, CanvasPluginServices } from '../../public/services';
 import { pluginServiceProviders, StorybookParams } from '../../public/services/storybook';
 import { LegacyServicesProvider } from '../../public/services/legacy';
diff --git a/x-pack/plugins/canvas/storybook/storyshots.test.tsx b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
index 1b05145d561f5..24bbcdb8be0c6 100644
--- a/x-pack/plugins/canvas/storybook/storyshots.test.tsx
+++ b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
@@ -61,8 +61,8 @@ import { EuiObserver } from '@elastic/eui/test-env/components/observer/observer'
 jest.mock('@elastic/eui/test-env/components/observer/observer');
 EuiObserver.mockImplementation(() => 'EuiObserver');
 
-import { ExpressionInput } from '../../../../src/plugins/presentation_util/public/components/expression_input';
-jest.mock('../../../../src/plugins/presentation_util/public/components/expression_input');
+import { ExpressionInput } from '@kbn/presentation-util-plugin/public/components/expression_input';
+jest.mock('@kbn/presentation-util-plugin/public/components/expression_input');
 // @ts-expect-error
 ExpressionInput.mockImplementation(() => 'ExpressionInput');
 
diff --git a/x-pack/plugins/canvas/types/elements.ts b/x-pack/plugins/canvas/types/elements.ts
index 0119c0a842f50..81c869e230052 100644
--- a/x-pack/plugins/canvas/types/elements.ts
+++ b/x-pack/plugins/canvas/types/elements.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionAstExpression } from 'src/plugins/expressions';
+import { ExpressionAstExpression } from '@kbn/expressions-plugin';
 import { CanvasElement } from '.';
 
 export interface ElementSpec {
diff --git a/x-pack/plugins/canvas/types/embeddables.ts b/x-pack/plugins/canvas/types/embeddables.ts
index b78efece59d8f..b548a2f0627a0 100644
--- a/x-pack/plugins/canvas/types/embeddables.ts
+++ b/x-pack/plugins/canvas/types/embeddables.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { Filter } from '@kbn/es-query';
-import { EmbeddableInput as Input } from '../../../../src/plugins/embeddable/common/';
+import { EmbeddableInput as Input } from '@kbn/embeddable-plugin/common';
 
 export type EmbeddableInput = Input & {
   timeRange?: TimeRange;
diff --git a/x-pack/plugins/canvas/types/functions.ts b/x-pack/plugins/canvas/types/functions.ts
index 5dfa547abe344..fc5f48dd901e3 100644
--- a/x-pack/plugins/canvas/types/functions.ts
+++ b/x-pack/plugins/canvas/types/functions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { functions as commonFunctions } from '../canvas_plugin_src/functions/common';
 import { functions as browserFunctions } from '../canvas_plugin_src/functions/browser';
 import { functions as serverFunctions } from '../canvas_plugin_src/functions/server';
diff --git a/x-pack/plugins/canvas/types/index.ts b/x-pack/plugins/canvas/types/index.ts
index 930f337292088..2932aea617b16 100644
--- a/x-pack/plugins/canvas/types/index.ts
+++ b/x-pack/plugins/canvas/types/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export * from '../../../../src/plugins/expressions/common';
+export * from '@kbn/expressions-plugin/common';
 export * from './assets';
 export * from './canvas';
 export * from './elements';
diff --git a/x-pack/plugins/canvas/types/renderers.ts b/x-pack/plugins/canvas/types/renderers.ts
index 7c9b785dbb2bb..f1457d3fc6f93 100644
--- a/x-pack/plugins/canvas/types/renderers.ts
+++ b/x-pack/plugins/canvas/types/renderers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from 'src/plugins/expressions';
+import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
 
 type GenericRendererCallback = (callback: () => void) => void;
 
diff --git a/x-pack/plugins/canvas/types/state.ts b/x-pack/plugins/canvas/types/state.ts
index b283de1386f55..b411a7aae7ed7 100644
--- a/x-pack/plugins/canvas/types/state.ts
+++ b/x-pack/plugins/canvas/types/state.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaContext } from 'src/plugins/data/common';
+import { KibanaContext } from '@kbn/data-plugin/common';
 import {
   AnyExpressionFunctionDefinition,
   Datatable,
@@ -15,7 +15,7 @@ import {
   Render,
   Style,
   Range,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 import { Datasource, Model, Transform, View } from '../public/expression_types';
 import { AssetType } from './assets';
 import { CanvasWorkpad, Sidebar } from './canvas';
diff --git a/x-pack/plugins/canvas/types/strategy.ts b/x-pack/plugins/canvas/types/strategy.ts
index 2cc4c72116cdb..a3675466cf278 100644
--- a/x-pack/plugins/canvas/types/strategy.ts
+++ b/x-pack/plugins/canvas/types/strategy.ts
@@ -7,7 +7,7 @@
 
 import { TransportResult } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IKibanaSearchRequest } from 'src/plugins/data/common';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/common';
 import { ExpressionValueFilter } from '.';
 export interface EssqlSearchStrategyRequest extends IKibanaSearchRequest {
   count: number;
diff --git a/x-pack/plugins/canvas/types/telemetry.ts b/x-pack/plugins/canvas/types/telemetry.ts
index 16f3b75e5d8ab..6e46b8c4cbe69 100644
--- a/x-pack/plugins/canvas/types/telemetry.ts
+++ b/x-pack/plugins/canvas/types/telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
   Function for collecting information about canvas usage
diff --git a/x-pack/plugins/cases/common/api/cases/comment.ts b/x-pack/plugins/cases/common/api/cases/comment.ts
index 900f90156d431..8cdab3dbd597d 100644
--- a/x-pack/plugins/cases/common/api/cases/comment.ts
+++ b/x-pack/plugins/cases/common/api/cases/comment.ts
@@ -153,12 +153,15 @@ export const FindQueryParamsRt = rt.partial({
   ...SavedObjectFindOptionsRt.props,
 });
 
+export const BulkCreateCommentRequestRt = rt.array(CommentRequestRt);
+
 export type FindQueryParams = rt.TypeOf<typeof FindQueryParamsRt>;
 export type AttributesTypeActions = rt.TypeOf<typeof AttributesTypeActionsRt>;
 export type AttributesTypeAlerts = rt.TypeOf<typeof AttributesTypeAlertsRt>;
 export type AttributesTypeUser = rt.TypeOf<typeof AttributesTypeUserRt>;
 export type CommentAttributes = rt.TypeOf<typeof CommentAttributesRt>;
 export type CommentRequest = rt.TypeOf<typeof CommentRequestRt>;
+export type BulkCreateCommentRequest = rt.TypeOf<typeof BulkCreateCommentRequestRt>;
 export type CommentResponse = rt.TypeOf<typeof CommentResponseRt>;
 export type CommentResponseUserType = rt.TypeOf<typeof CommentResponseTypeUserRt>;
 export type CommentResponseAlertsType = rt.TypeOf<typeof CommentResponseTypeAlertsRt>;
diff --git a/x-pack/plugins/cases/common/api/connectors/index.ts b/x-pack/plugins/cases/common/api/connectors/index.ts
index 96eb505623201..bb1892525f8e0 100644
--- a/x-pack/plugins/cases/common/api/connectors/index.ts
+++ b/x-pack/plugins/cases/common/api/connectors/index.ts
@@ -7,7 +7,7 @@
 
 import * as rt from 'io-ts';
 
-import { ActionResult, ActionType } from '../../../../actions/common';
+import { ActionResult, ActionType } from '@kbn/actions-plugin/common';
 import { JiraFieldsRT } from './jira';
 import { ResilientFieldsRT } from './resilient';
 import { ServiceNowITSMFieldsRT } from './servicenow_itsm';
diff --git a/x-pack/plugins/cases/common/api/helpers.ts b/x-pack/plugins/cases/common/api/helpers.ts
index 9aebb7d0ccd9d..0fe187389cae1 100644
--- a/x-pack/plugins/cases/common/api/helpers.ts
+++ b/x-pack/plugins/cases/common/api/helpers.ts
@@ -14,6 +14,7 @@ import {
   CASE_PUSH_URL,
   CASE_CONFIGURE_DETAILS_URL,
   CASE_ALERTS_URL,
+  CASE_COMMENT_DELETE_URL,
 } from '../constants';
 
 export const getCaseDetailsUrl = (id: string): string => {
@@ -32,6 +33,10 @@ export const getCaseCommentDetailsUrl = (caseId: string, commentId: string): str
   return CASE_COMMENT_DETAILS_URL.replace('{case_id}', caseId).replace('{comment_id}', commentId);
 };
 
+export const getCaseCommentDeleteUrl = (caseId: string, commentId: string): string => {
+  return CASE_COMMENT_DELETE_URL.replace('{case_id}', caseId).replace('{comment_id}', commentId);
+};
+
 export const getCaseUserActionUrl = (id: string): string => {
   return CASE_USER_ACTIONS_URL.replace('{case_id}', id);
 };
diff --git a/x-pack/plugins/cases/common/constants.ts b/x-pack/plugins/cases/common/constants.ts
index a1ac829b33cce..29a8029dda063 100644
--- a/x-pack/plugins/cases/common/constants.ts
+++ b/x-pack/plugins/cases/common/constants.ts
@@ -59,6 +59,7 @@ export const CASE_CONFIGURE_CONNECTORS_URL = `${CASE_CONFIGURE_URL}/connectors`
 
 export const CASE_COMMENTS_URL = `${CASE_DETAILS_URL}/comments` as const;
 export const CASE_COMMENT_DETAILS_URL = `${CASE_DETAILS_URL}/comments/{comment_id}` as const;
+export const CASE_COMMENT_DELETE_URL = `${CASE_DETAILS_URL}/comments/{comment_id}` as const;
 export const CASE_PUSH_URL = `${CASE_DETAILS_URL}/connector/{connector_id}/_push` as const;
 export const CASE_REPORTERS_URL = `${CASES_URL}/reporters` as const;
 export const CASE_STATUS_URL = `${CASES_URL}/status` as const;
@@ -70,6 +71,14 @@ export const CASE_DETAILS_ALERTS_URL = `${CASE_DETAILS_URL}/alerts` as const;
 
 export const CASE_METRICS_DETAILS_URL = `${CASES_URL}/metrics/{case_id}` as const;
 
+/**
+ * Internal routes
+ */
+
+export const CASES_INTERNAL_URL = '/internal/cases' as const;
+export const INTERNAL_BULK_CREATE_ATTACHMENTS_URL =
+  `${CASES_INTERNAL_URL}/{case_id}/attachments/_bulk_create` as const;
+
 /**
  * Action routes
  */
@@ -89,8 +98,11 @@ export const SUPPORTED_CONNECTORS = [
 /**
  * Alerts
  */
-export const MAX_ALERTS_PER_CASE = 5000 as const;
+export const MAX_ALERTS_PER_CASE = 1000 as const;
 
+/**
+ * Owner
+ */
 export const SECURITY_SOLUTION_OWNER = 'securitySolution' as const;
 export const OBSERVABILITY_OWNER = 'observability' as const;
 
@@ -105,6 +117,9 @@ export const OWNER_INFO = {
   },
 } as const;
 
+/**
+ * Searching
+ */
 export const MAX_DOCS_PER_PAGE = 10000 as const;
 export const MAX_CONCURRENT_SEARCHES = 10 as const;
 
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index bc40077873eae..31a81ce31d879 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsResolveResponse } from 'src/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
 import {
   CaseAttributes,
   CaseConnector,
diff --git a/x-pack/plugins/cases/common/utils/connectors_api.ts b/x-pack/plugins/cases/common/utils/connectors_api.ts
index 3ab8f856d925e..c6021dc6d66b0 100644
--- a/x-pack/plugins/cases/common/utils/connectors_api.ts
+++ b/x-pack/plugins/cases/common/utils/connectors_api.ts
@@ -9,7 +9,7 @@
  * Actions and connectors API endpoint helpers
  */
 
-import { ACTION_URL, ACTION_TYPES_URL, CONNECTORS_URL } from '../../common/constants';
+import { ACTION_URL, ACTION_TYPES_URL, CONNECTORS_URL } from '../constants';
 
 /**
  *
diff --git a/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts b/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts
index 69d01b0051e18..52863d5dd8d1f 100644
--- a/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts
+++ b/x-pack/plugins/cases/common/utils/markdown_plugins/lens/serializer.ts
@@ -6,7 +6,7 @@
  */
 
 import { Plugin } from 'unified';
-import type { TimeRange } from 'src/plugins/data/common';
+import type { TimeRange } from '@kbn/data-plugin/common';
 import { LENS_ID } from './constants';
 
 export interface LensSerializerProps {
diff --git a/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts b/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts
index e9bda7ae469e2..a91970bc97295 100644
--- a/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts
+++ b/x-pack/plugins/cases/common/utils/markdown_plugins/utils.ts
@@ -12,7 +12,7 @@ import remarkStringify from 'remark-stringify';
 import unified from 'unified';
 
 import { SerializableRecord } from '@kbn/utility-types';
-import type { TimeRange } from 'src/plugins/data/common';
+import type { TimeRange } from '@kbn/data-plugin/common';
 import { LENS_ID, LensParser, LensSerializer } from './lens';
 import { TimelineSerializer, TimelineParser } from './timeline';
 
diff --git a/x-pack/plugins/cases/kibana.json b/x-pack/plugins/cases/kibana.json
index 45ae5533a0e79..865f06b8764f6 100644
--- a/x-pack/plugins/cases/kibana.json
+++ b/x-pack/plugins/cases/kibana.json
@@ -33,7 +33,6 @@
      "management"
   ],
   "requiredBundles": [
-    "home",
     "savedObjects"
   ],
   "server":true,
diff --git a/x-pack/plugins/cases/public/application.tsx b/x-pack/plugins/cases/public/application.tsx
index a528fa2376dbb..151a531b73809 100644
--- a/x-pack/plugins/cases/public/application.tsx
+++ b/x-pack/plugins/cases/public/application.tsx
@@ -15,8 +15,8 @@ import {
   KibanaContextProvider,
   KibanaThemeProvider,
   useUiSetting$,
-} from '../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider as StyledComponentsThemeProvider } from '../../../../src/plugins/kibana_react/common';
+} from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider as StyledComponentsThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { RenderAppProps } from './types';
 import { CasesApp } from './components/app';
 
diff --git a/x-pack/plugins/cases/public/client/api/index.test.ts b/x-pack/plugins/cases/public/client/api/index.test.ts
index 9dd5245c03dd4..8bf4ca682fe3b 100644
--- a/x-pack/plugins/cases/public/client/api/index.test.ts
+++ b/x-pack/plugins/cases/public/client/api/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { createClientAPI } from '.';
 import { allCases, casesStatus } from '../../containers/mock';
 
diff --git a/x-pack/plugins/cases/public/client/api/index.ts b/x-pack/plugins/cases/public/client/api/index.ts
index b35fff84fdb09..8f55f7a4f0739 100644
--- a/x-pack/plugins/cases/public/client/api/index.ts
+++ b/x-pack/plugins/cases/public/client/api/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   CasesByAlertId,
   CasesByAlertIDRequest,
diff --git a/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts b/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts
index d4906c2702146..ea3b508e3113c 100644
--- a/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts
+++ b/x-pack/plugins/cases/public/client/helpers/can_use_cases.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import { canUseCases } from './can_use_cases';
 
 type CasesCapabilities = Pick<
diff --git a/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts b/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
index ad05be1b07cd3..d34e2c9bf5912 100644
--- a/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
+++ b/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import { OBSERVABILITY_OWNER, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 
 export type CasesOwners = typeof SECURITY_SOLUTION_OWNER | typeof OBSERVABILITY_OWNER;
diff --git a/x-pack/plugins/cases/public/common/hooks.test.tsx b/x-pack/plugins/cases/public/common/hooks.test.tsx
index f122d3312a643..a83932551f394 100644
--- a/x-pack/plugins/cases/public/common/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/hooks.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
 
-import { TestProviders } from '../common/mock';
+import { TestProviders } from './mock';
 import { useIsMainApplication } from './hooks';
 import { useApplication } from '../components/cases_context/use_application';
 
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts
index ffd1f2bc4c8c9..5062d73dd9b2f 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { notificationServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import {
   createKibanaContextProviderMock,
   createStartServicesMock,
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
index 127274e5ed55f..02a099f9c6a1f 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
@@ -10,16 +10,16 @@ import moment from 'moment-timezone';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import {
   FEATURE_ID,
   DEFAULT_DATE_FORMAT,
   DEFAULT_DATE_FORMAT_TZ,
 } from '../../../../common/constants';
-import { AuthenticatedUser } from '../../../../../security/common/model';
 import { convertToCamelCase } from '../../../containers/utils';
 import { StartServices } from '../../../types';
 import { useUiSetting, useKibana } from './kibana_react';
-import { NavigateToAppOptions } from '../../../../../../../src/core/public';
 
 export const useDateFormat = (): string => useUiSetting<string>(DEFAULT_DATE_FORMAT);
 
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts
index 90291201d74e1..49b7028a8f883 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts
@@ -9,15 +9,15 @@
 
 import React from 'react';
 
-import { PublicAppInfo } from 'kibana/public';
+import { PublicAppInfo } from '@kbn/core/public';
 import { RecursivePartial } from '@elastic/eui/src/components/common';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { securityMock } from '../../../../../security/public/mocks';
-import { spacesPluginMock } from '../../../../../spaces/public/mocks';
-import { triggersActionsUiMock } from '../../../../../triggers_actions_ui/public/mocks';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 import { BehaviorSubject } from 'rxjs';
 import { registerConnectorsToMockActionRegistry } from '../../mock/register_connectors';
 import { connectorsMock } from '../../mock/connectors';
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts
index 921463c4c41ab..0884b57048e78 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts
@@ -10,7 +10,7 @@ import {
   useKibana,
   useUiSetting,
   useUiSetting$,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
 
 const useTypedKibana = () => useKibana<StartServices>();
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/services.ts b/x-pack/plugins/cases/public/common/lib/kibana/services.ts
index 3a1f220d9794f..30198b812e4aa 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/services.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { CasesUiConfigType } from '../../../../common/ui/types';
 
 type GlobalServices = Pick<CoreStart, 'http'>;
diff --git a/x-pack/plugins/cases/public/common/mock/register_connectors.ts b/x-pack/plugins/cases/public/common/mock/register_connectors.ts
index b86968e4bf801..ee7063141a693 100644
--- a/x-pack/plugins/cases/public/common/mock/register_connectors.ts
+++ b/x-pack/plugins/cases/public/common/mock/register_connectors.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { actionTypeRegistryMock } from '../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 import { CaseActionConnector } from '../../../common/ui/types';
 
 const getUniqueActionTypeIds = (connectors: CaseActionConnector[]) =>
diff --git a/x-pack/plugins/cases/public/common/mock/test_providers.tsx b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
index db155c2aae0df..75803bb3820aa 100644
--- a/x-pack/plugins/cases/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
@@ -11,7 +11,7 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { ThemeProvider } from 'styled-components';
 
 import { render as reactRender, RenderOptions, RenderResult } from '@testing-library/react';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 import { CasesFeatures } from '../../../common/ui/types';
 import { CasesProvider } from '../../components/cases_context';
diff --git a/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts b/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts
index 52ddcd8b20ffc..af8685cd16fb6 100644
--- a/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts
+++ b/x-pack/plugins/cases/public/common/navigation/deep_links.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AppNavLinkStatus } from '../../../../../../src/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { getCasesDeepLinks } from './deep_links';
 
 describe('getCasesDeepLinks', () => {
diff --git a/x-pack/plugins/cases/public/common/navigation/deep_links.ts b/x-pack/plugins/cases/public/common/navigation/deep_links.ts
index 860299a05008d..6743d22e74dac 100644
--- a/x-pack/plugins/cases/public/common/navigation/deep_links.ts
+++ b/x-pack/plugins/cases/public/common/navigation/deep_links.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { AppDeepLink } from '../../../../../../src/core/public';
+import type { AppDeepLink } from '@kbn/core/public';
 import { DEFAULT_BASE_PATH, getCreateCasePath, getCasesConfigurePath } from './paths';
 
 export const CasesDeepLinkId = {
diff --git a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
index cd6cf13e7256d..7d296db032a75 100644
--- a/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
+++ b/x-pack/plugins/cases/public/common/navigation/hooks.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
 
 import { APP_ID } from '../../../common/constants';
-import { useNavigation } from '../../common/lib/kibana';
-import { TestProviders } from '../../common/mock';
+import { useNavigation } from '../lib/kibana';
+import { TestProviders } from '../mock';
 import {
   useCasesNavigation,
   useAllCasesNavigation,
@@ -21,7 +21,7 @@ import {
 import { CasesDeepLinkId } from './deep_links';
 
 const useNavigationMock = useNavigation as jest.Mock;
-jest.mock('../../common/lib/kibana');
+jest.mock('../lib/kibana');
 
 const navigateTo = jest.fn();
 const getAppUrl = jest.fn();
diff --git a/x-pack/plugins/cases/public/common/shared_imports.ts b/x-pack/plugins/cases/public/common/shared_imports.ts
index 21040543fae69..84c34a6186fa8 100644
--- a/x-pack/plugins/cases/public/common/shared_imports.ts
+++ b/x-pack/plugins/cases/public/common/shared_imports.ts
@@ -15,7 +15,7 @@ export type {
   ValidationFunc,
   FieldConfig,
   ValidationConfig,
-} from '../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   getUseField,
   getFieldValidityAndErrorMessage,
@@ -28,10 +28,7 @@ export {
   useFormContext,
   useFormData,
   VALIDATION_TYPES,
-} from '../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-export {
-  Field,
-  SelectField,
-} from '../../../../../src/plugins/es_ui_shared/static/forms/components';
-export { fieldValidators } from '../../../../../src/plugins/es_ui_shared/static/forms/helpers';
-export type { ERROR_CODE } from '../../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+export { Field, SelectField } from '@kbn/es-ui-shared-plugin/static/forms/components';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
+export type { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
index 517d1cfdd77b1..4dfbe6495364d 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
@@ -6,15 +6,15 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { useToasts } from '../common/lib/kibana';
-import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../common/mock';
+import { useToasts } from './lib/kibana';
+import { AppMockRenderer, createAppMockRenderer, TestProviders } from './mock';
 import { CaseToastSuccessContent, useCasesToast } from './use_cases_toast';
 import { alertComment, basicComment, mockCase } from '../containers/mock';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { SupportedCaseAttachment } from '../types';
 
-jest.mock('../common/lib/kibana');
+jest.mock('./lib/kibana');
 
 const useToastsMock = useToasts as jest.Mock;
 
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
index d02f792d601cf..8abb18d3099f3 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
@@ -8,10 +8,10 @@
 import { EuiButtonEmpty, EuiText } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Case, CommentType } from '../../common';
-import { useToasts } from '../common/lib/kibana';
-import { useCaseViewNavigation } from '../common/navigation';
+import { useToasts } from './lib/kibana';
+import { useCaseViewNavigation } from './navigation';
 import { CaseAttachments } from '../types';
 import {
   CASE_ALERT_SUCCESS_SYNC_TEXT,
diff --git a/x-pack/plugins/cases/public/components/__mock__/form.ts b/x-pack/plugins/cases/public/components/__mock__/form.ts
index a2bd59d5dd541..809aa56374d1a 100644
--- a/x-pack/plugins/cases/public/components/__mock__/form.ts
+++ b/x-pack/plugins/cases/public/components/__mock__/form.ts
@@ -5,13 +5,11 @@
  * 2.0.
  */
 
-import { useForm } from '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form';
-import { useFormData } from '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data';
+import { useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form';
+import { useFormData } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form_data';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
-jest.mock(
-  '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data'
-);
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form_data');
 
 export const mockFormHook = {
   isSubmitted: false,
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.test.tsx b/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
index f7535e6f52071..b9a253adc76f5 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
@@ -14,17 +14,17 @@ import { TestProviders } from '../../common/mock';
 
 import { CommentRequest, CommentType } from '../../../common/api';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { AddComment, AddCommentProps, AddCommentRefObject } from '.';
 import { CasesTimelineIntegrationProvider } from '../timeline_context';
 import { timelineIntegrationMock } from '../__mock__/timeline';
 
-jest.mock('../../containers/use_post_comment');
+jest.mock('../../containers/use_create_attachments');
 
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 const onCommentSaving = jest.fn();
 const onCommentPosted = jest.fn();
-const postComment = jest.fn();
+const createAttachments = jest.fn();
 
 const addCommentProps: AddCommentProps = {
   id: 'newComment',
@@ -36,10 +36,10 @@ const addCommentProps: AddCommentProps = {
   statusActionButton: null,
 };
 
-const defaultPostComment = {
+const defaultResponse = {
   isLoading: false,
   isError: false,
-  postComment,
+  createAttachments,
 };
 
 const sampleData: CommentRequest = {
@@ -51,7 +51,7 @@ const sampleData: CommentRequest = {
 describe('AddComment ', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    usePostCommentMock.mockImplementation(() => defaultPostComment);
+    useCreateAttachmentsMock.mockImplementation(() => defaultResponse);
   });
 
   it('should post comment on submit click', async () => {
@@ -72,9 +72,9 @@ describe('AddComment ', () => {
     wrapper.find(`[data-test-subj="submit-comment"]`).first().simulate('click');
     await waitFor(() => {
       expect(onCommentSaving).toBeCalled();
-      expect(postComment).toBeCalledWith({
+      expect(createAttachments).toBeCalledWith({
         caseId: addCommentProps.caseId,
-        data: sampleData,
+        data: [sampleData],
         updateCase: onCommentPosted,
       });
       expect(wrapper.find(`[data-test-subj="add-comment"] textarea`).text()).toBe('');
@@ -82,7 +82,10 @@ describe('AddComment ', () => {
   });
 
   it('should render spinner and disable submit when loading', () => {
-    usePostCommentMock.mockImplementation(() => ({ ...defaultPostComment, isLoading: true }));
+    useCreateAttachmentsMock.mockImplementation(() => ({
+      ...defaultResponse,
+      isLoading: true,
+    }));
     const wrapper = mount(
       <TestProviders>
         <AddComment {...{ ...addCommentProps, showLoading: true }} />
@@ -96,7 +99,10 @@ describe('AddComment ', () => {
   });
 
   it('should disable submit button when isLoading is true', () => {
-    usePostCommentMock.mockImplementation(() => ({ ...defaultPostComment, isLoading: true }));
+    useCreateAttachmentsMock.mockImplementation(() => ({
+      ...defaultResponse,
+      isLoading: true,
+    }));
     const wrapper = mount(
       <TestProviders>
         <AddComment {...addCommentProps} />
@@ -109,7 +115,10 @@ describe('AddComment ', () => {
   });
 
   it('should hide the component when the user does not have crud permissions', () => {
-    usePostCommentMock.mockImplementation(() => ({ ...defaultPostComment, isLoading: true }));
+    useCreateAttachmentsMock.mockImplementation(() => ({
+      ...defaultResponse,
+      isLoading: true,
+    }));
     const wrapper = mount(
       <TestProviders>
         <AddComment {...{ ...addCommentProps, userCanCrud: false }} />
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.tsx b/x-pack/plugins/cases/public/components/add_comment/index.tsx
index dea692f7c71a1..f3630d16cda79 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.tsx
@@ -18,7 +18,7 @@ import styled from 'styled-components';
 import { isEmpty } from 'lodash';
 
 import { CommentType } from '../../../common/api';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { Case } from '../../containers/types';
 import { EuiMarkdownEditorRef, MarkdownEditorForm } from '../markdown_editor';
 import { Form, useForm, UseField, useFormData } from '../../common/shared_imports';
@@ -71,7 +71,7 @@ export const AddComment = React.memo(
       const editorRef = useRef<EuiMarkdownEditorRef>(null);
       const [focusOnContext, setFocusOnContext] = useState(false);
       const { owner } = useCasesContext();
-      const { isLoading, postComment } = usePostComment();
+      const { isLoading, createAttachments } = useCreateAttachments();
 
       const { form } = useForm<AddCommentFormSchema>({
         defaultValue: initialCommentValue,
@@ -112,14 +112,14 @@ export const AddComment = React.memo(
           if (onCommentSaving != null) {
             onCommentSaving();
           }
-          postComment({
+          createAttachments({
             caseId,
-            data: { ...data, type: CommentType.user, owner: owner[0] },
+            data: [{ ...data, type: CommentType.user, owner: owner[0] }],
             updateCase: onCommentPosted,
           });
           reset();
         }
-      }, [submit, onCommentSaving, postComment, caseId, owner, onCommentPosted, reset]);
+      }, [submit, onCommentSaving, createAttachments, caseId, owner, onCommentPosted, reset]);
 
       /**
        * Focus on the text area when a quote has been added.
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
index c8e656b8117eb..ef6d789e97a36 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
@@ -29,15 +29,15 @@ import { useConnectors } from '../../containers/configure/use_connectors';
 import { useKibana } from '../../common/lib/kibana';
 import { AllCasesList } from './all_cases_list';
 import { CasesColumns, GetCasesColumn, useCasesColumns } from './columns';
-import { triggersActionsUiMock } from '../../../../triggers_actions_ui/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 import { registerConnectorsToMockActionRegistry } from '../../common/mock/register_connectors';
 import { createStartServicesMock } from '../../common/lib/kibana/kibana_react.mock';
 import { waitForComponentToUpdate } from '../../common/test_utils';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { useGetTags } from '../../containers/use_get_tags';
 import { useGetReporters } from '../../containers/use_get_reporters';
 
-jest.mock('../../containers/use_post_comment');
+jest.mock('../../containers/use_create_attachments');
 jest.mock('../../containers/use_bulk_update_case');
 jest.mock('../../containers/use_delete_cases');
 jest.mock('../../containers/use_get_cases');
@@ -61,7 +61,7 @@ const useGetTagsMock = useGetTags as jest.Mock;
 const useGetReportersMock = useGetReporters as jest.Mock;
 const useKibanaMock = useKibana as jest.MockedFunction<typeof useKibana>;
 const useConnectorsMock = useConnectors as jest.Mock;
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 
 const mockTriggersActionsUiService = triggersActionsUiMock.createStart();
 
@@ -88,7 +88,10 @@ describe('AllCasesListGeneric', () => {
   const fetchCasesStatus = jest.fn();
   const onRowClick = jest.fn();
   const emptyTag = getEmptyTagValue().props.children;
-  usePostCommentMock.mockReturnValue({ status: { isLoading: false }, postComment: jest.fn() });
+  useCreateAttachmentsMock.mockReturnValue({
+    status: { isLoading: false },
+    createAttachments: jest.fn(),
+  });
 
   const defaultGetCases = {
     ...useGetCasesMockState,
@@ -811,15 +814,16 @@ describe('AllCasesListGeneric', () => {
   });
 
   it('should hide the alerts column if the alert feature is disabled', async () => {
-    expect.assertions(1);
-
-    const { findAllByTestId } = render(
+    const result = render(
       <TestProviders features={{ alerts: { enabled: false } }}>
         <AllCasesList />
       </TestProviders>
     );
 
-    await expect(findAllByTestId('case-table-column-alertsCount')).rejects.toThrow();
+    await waitFor(() => {
+      expect(result.getByTestId('cases-table')).toBeTruthy();
+      expect(result.queryAllByTestId('case-table-column-alertsCount').length).toBe(0);
+    });
   });
 
   it('should show the alerts column if the alert feature is enabled', async () => {
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
index 25360800554b2..f0eea39d551a7 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
@@ -14,14 +14,14 @@ import { Case, CaseStatuses, StatusAll } from '../../../../common';
 import { AppMockRenderer, createAppMockRenderer } from '../../../common/mock';
 import { useCasesToast } from '../../../common/use_cases_toast';
 import { alertComment } from '../../../containers/mock';
-import { usePostComment } from '../../../containers/use_post_comment';
+import { useCreateAttachments } from '../../../containers/use_create_attachments';
 import { SupportedCaseAttachment } from '../../../types';
 import { CasesContext } from '../../cases_context';
 import { CasesContextStoreActionsList } from '../../cases_context/cases_context_reducer';
 import { useCasesAddToExistingCaseModal } from './use_cases_add_to_existing_case_modal';
 
 jest.mock('../../../common/use_cases_toast');
-jest.mock('../../../containers/use_post_comment');
+jest.mock('../../../containers/use_create_attachments');
 // dummy mock, will call onRowclick when rendering
 jest.mock('./all_cases_selector_modal', () => {
   return {
@@ -46,11 +46,11 @@ const TestComponent: React.FC = () => {
   return <button type="button" data-test-subj="open-modal" onClick={onClick} />;
 };
 
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 
 describe('use cases add to existing case modal hook', () => {
-  usePostCommentMock.mockReturnValue({
-    postComment: jest.fn(),
+  useCreateAttachmentsMock.mockReturnValue({
+    createAttachments: jest.fn(),
   });
 
   const dispatch = jest.fn();
@@ -130,10 +130,10 @@ describe('use cases add to existing case modal hook', () => {
     );
   });
 
-  it('should call postComment when a case is selected and show a toast message', async () => {
-    const mockedPostMessage = jest.fn();
-    usePostCommentMock.mockReturnValueOnce({
-      postComment: mockedPostMessage,
+  it('should call createAttachments when a case is selected and show a toast message', async () => {
+    const mockBulkCreateAttachments = jest.fn();
+    useCreateAttachmentsMock.mockReturnValueOnce({
+      createAttachments: mockBulkCreateAttachments,
     });
 
     const mockedToastSuccess = jest.fn();
@@ -150,19 +150,20 @@ describe('use cases add to existing case modal hook', () => {
     userEvent.click(result.getByTestId('open-modal'));
 
     await waitFor(() => {
-      expect(mockedPostMessage).toHaveBeenCalledWith({
+      expect(mockBulkCreateAttachments).toHaveBeenCalledTimes(1);
+      expect(mockBulkCreateAttachments).toHaveBeenCalledWith({
         caseId: 'test',
-        data: alertComment,
+        data: [alertComment],
         throwOnError: true,
       });
     });
     expect(mockedToastSuccess).toHaveBeenCalled();
   });
 
-  it('should not call postComment nor show toast success when  a case is not selected', async () => {
-    const mockedPostMessage = jest.fn();
-    usePostCommentMock.mockReturnValueOnce({
-      postComment: mockedPostMessage,
+  it('should not call createAttachments nor show toast success when  a case is not selected', async () => {
+    const mockBulkCreateAttachments = jest.fn();
+    useCreateAttachmentsMock.mockReturnValueOnce({
+      createAttachments: mockBulkCreateAttachments,
     });
 
     const mockedToastSuccess = jest.fn();
@@ -180,15 +181,15 @@ describe('use cases add to existing case modal hook', () => {
     // give a small delay for the reducer to run
 
     act(() => {
-      expect(mockedPostMessage).not.toHaveBeenCalled();
+      expect(mockBulkCreateAttachments).not.toHaveBeenCalled();
       expect(mockedToastSuccess).not.toHaveBeenCalled();
     });
   });
 
   it('should not show toast success when a case is selected with attachments and fails to update attachments', async () => {
-    const mockedPostMessage = jest.fn().mockRejectedValue(new Error('Impossible'));
-    usePostCommentMock.mockReturnValueOnce({
-      postComment: mockedPostMessage,
+    const mockBulkCreateAttachments = jest.fn().mockRejectedValue(new Error('Impossible'));
+    useCreateAttachmentsMock.mockReturnValueOnce({
+      createAttachments: mockBulkCreateAttachments,
     });
 
     const mockedToast = jest.fn();
@@ -206,15 +207,15 @@ describe('use cases add to existing case modal hook', () => {
     userEvent.click(result.getByTestId('open-modal'));
 
     await waitFor(() => {
-      expect(mockedPostMessage).toHaveBeenCalledWith({
+      expect(mockBulkCreateAttachments).toHaveBeenCalledWith({
         caseId: 'test',
-        data: alertComment,
+        data: [alertComment],
         throwOnError: true,
       });
     });
 
     act(() => {
-      expect(mockedPostMessage).toHaveBeenCalled();
+      expect(mockBulkCreateAttachments).toHaveBeenCalled();
       expect(mockedToast).not.toHaveBeenCalled();
     });
   });
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
index 651b01c2242f3..269e411e8eb89 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
@@ -14,7 +14,7 @@ import { CasesContextStoreActionsList } from '../../cases_context/cases_context_
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import { useCasesAddToNewCaseFlyout } from '../../create/flyout/use_cases_add_to_new_case_flyout';
 import { CaseAttachments } from '../../../types';
-import { usePostComment } from '../../../containers/use_post_comment';
+import { useCreateAttachments } from '../../../containers/use_create_attachments';
 
 type AddToExistingFlyoutProps = AllCasesSelectorModalProps & {
   toastTitle?: string;
@@ -39,7 +39,7 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingFlyoutProps)
 
   const { dispatch } = useCasesContext();
   const casesToasts = useCasesToast();
-  const { postComment } = usePostComment();
+  const { createAttachments } = useCreateAttachments();
 
   const closeModal = useCallback(() => {
     dispatch({
@@ -66,13 +66,12 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingFlyoutProps)
         // add attachments to the case
         const attachments = props.attachments;
         if (attachments !== undefined && attachments.length > 0) {
-          for (const attachment of attachments) {
-            await postComment({
-              caseId: theCase.id,
-              data: attachment,
-              throwOnError: true,
-            });
-          }
+          await createAttachments({
+            caseId: theCase.id,
+            data: attachments,
+            throwOnError: true,
+          });
+
           casesToasts.showSuccessAttach({
             theCase,
             attachments: props.attachments,
@@ -82,14 +81,14 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingFlyoutProps)
         }
       } catch (error) {
         // error toast is handled
-        // inside the postComment method
+        // inside the createAttachments method
       }
 
       if (props.onRowClick) {
         props.onRowClick(theCase);
       }
     },
-    [casesToasts, closeModal, createNewCaseFlyout, postComment, props]
+    [casesToasts, closeModal, createNewCaseFlyout, createAttachments, props]
   );
 
   const openModal = useCallback(() => {
diff --git a/x-pack/plugins/cases/public/components/case_view/index.test.tsx b/x-pack/plugins/cases/public/components/case_view/index.test.tsx
index d7d8ca6df8f8d..e092865b5eba8 100644
--- a/x-pack/plugins/cases/public/components/case_view/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/index.test.tsx
@@ -21,7 +21,7 @@ import {
   connectorsMock,
 } from '../../containers/mock';
 import { TestProviders } from '../../common/mock';
-import { SpacesApi } from '../../../../spaces/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import { useUpdateCase } from '../../containers/use_update_case';
 import { UseGetCase, useGetCase } from '../../containers/use_get_case';
 import { useGetCaseMetrics } from '../../containers/use_get_case_metrics';
diff --git a/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx b/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx
index 9c850b7417fc9..f816d39e8c0e0 100644
--- a/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/metrics/index.test.tsx
@@ -12,7 +12,7 @@ import {
   basicCaseNumericValueFeatures,
   basicCaseStatusFeatures,
 } from '../../../containers/mock';
-import { CaseViewMetrics } from './index';
+import { CaseViewMetrics } from '.';
 import { CaseMetrics, CaseMetricsFeature } from '../../../../common/ui';
 import { TestProviders } from '../../../common/mock';
 
diff --git a/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx b/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx
index f3bfcee1ab947..df19d1776d86a 100644
--- a/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/metrics/status.tsx
@@ -8,6 +8,7 @@
 import React, { useMemo } from 'react';
 import prettyMilliseconds from 'pretty-ms';
 import { EuiFlexGrid, EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiSpacer } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CaseMetrics, CaseMetricsFeature } from '../../../../common/ui';
 import {
   CASE_CREATED,
@@ -20,7 +21,6 @@ import {
 import { getMaybeDate } from '../../formatted_date/maybe_date';
 import { FormattedRelativePreferenceDate } from '../../formatted_date';
 import { getEmptyTagValue } from '../../empty_value';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { CaseViewMetricsProps } from './types';
 
 export const CaseStatusMetrics: React.FC<Pick<CaseViewMetricsProps, 'metrics' | 'features'>> =
diff --git a/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx b/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx
index 0e975562d1c78..39b3f8613120a 100644
--- a/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/metrics/totals.tsx
@@ -7,6 +7,7 @@
 
 import React, { useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CaseMetrics, CaseMetricsFeature } from '../../../../common/ui';
 import {
   ASSOCIATED_HOSTS_METRIC,
@@ -15,7 +16,6 @@ import {
   TOTAL_ALERTS_METRIC,
   TOTAL_CONNECTORS_METRIC,
 } from './translations';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { CaseViewMetricsProps } from './types';
 
 export const CaseViewMetricItems: React.FC<Pick<CaseViewMetricsProps, 'metrics' | 'features'>> =
diff --git a/x-pack/plugins/cases/public/components/case_view/translations.ts b/x-pack/plugins/cases/public/components/case_view/translations.ts
index 7d6d81a22ca11..761cecb1121ca 100644
--- a/x-pack/plugins/cases/public/components/case_view/translations.ts
+++ b/x-pack/plugins/cases/public/components/case_view/translations.ts
@@ -83,6 +83,14 @@ export const EDIT_COMMENT = i18n.translate('xpack.cases.caseView.edit.comment',
   defaultMessage: 'Edit comment',
 });
 
+export const DELETE_COMMENT = i18n.translate('xpack.cases.caseView.delete.comment', {
+  defaultMessage: 'Delete comment',
+});
+
+export const DELETE_COMMENT_TITLE = i18n.translate('xpack.cases.caseView.deleteTitle.comment', {
+  defaultMessage: 'Delete this comment?',
+});
+
 export const ON = i18n.translate('xpack.cases.caseView.actionLabel.on', {
   defaultMessage: 'on',
 });
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
index cf8d86eb1700a..a5fe9f655ef44 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
@@ -9,11 +9,11 @@ import React, { useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiIconTip, EuiSuperSelect } from '@elastic/eui';
 import styled from 'styled-components';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ActionConnector } from '../../containers/configure/types';
 import * as i18n from './translations';
 import { useKibana } from '../../common/lib/kibana';
 import { getConnectorIcon, isDeprecatedConnector } from '../utils';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
 
 export interface Props {
   connectors: ActionConnector[];
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
index 918252369c26b..2ee1c328f4699 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
@@ -27,7 +27,7 @@ import {
   useActionTypesResponse,
 } from './__mock__';
 import { ConnectorTypes } from '../../../common/api';
-import { actionTypeRegistryMock } from '../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 
 jest.mock('../../common/lib/kibana');
 jest.mock('../../containers/configure/use_connectors');
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
index 44c1979aa0fda..61172b9998667 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
@@ -11,6 +11,8 @@ import styled, { css } from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ActionConnectorTableItem } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { SUPPORTED_CONNECTORS } from '../../../common/constants';
 import { useKibana } from '../../common/lib/kibana';
 import { useConnectors } from '../../containers/configure/use_connectors';
@@ -19,9 +21,6 @@ import { useCaseConfigure } from '../../containers/configure/use_configure';
 
 import { ClosureType } from '../../containers/configure/types';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ActionConnectorTableItem } from '../../../../triggers_actions_ui/public/types';
-
 import { SectionWrapper, ContentWrapper, WhitePageWrapper } from '../wrappers';
 import { Connectors } from './connectors';
 import { ClosureOptions } from './closure_options';
diff --git a/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx b/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
index b914b4c7edab2..44e5179f1e02e 100644
--- a/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
@@ -13,7 +13,7 @@ import { connectorsMock } from '../../containers/mock';
 import { getFormMock } from '../__mock__/form';
 import { useKibana } from '../../common/lib/kibana';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../../common/lib/kibana');
 
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts b/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
index 593e5fa5497f5..1512929ec9dd0 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getIssueTypes, getFieldsByIssueType, getIssues, getIssue } from './api';
 
 const issueTypesResponse = {
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/api.ts b/x-pack/plugins/cases/public/components/connectors/jira/api.ts
index b4bbec156f04d..286d44c5916d4 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import { ActionTypeExecutorResult } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { getExecuteConnectorUrl } from '../../../../common/utils';
 import {
   ConnectorExecutorResult,
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
index f3d14f02ca1f3..955a03c614888 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getFieldsByIssueType } from './api';
 import { Fields } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
index 6322b59527e4e..3be1093eeaccb 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIssueTypes } from './api';
 import { IssueTypes } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx
index f4ab31c9daa2d..230bf5636d62d 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issues.tsx
@@ -7,7 +7,7 @@
 
 import { isEmpty, debounce } from 'lodash/fp';
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIssues } from './api';
 import { Issues } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx
index 857b07e41d2f2..aa7bd2ea0d4f6 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_single_issue.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIssue } from './api';
 import { Issue } from './types';
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/api.ts b/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
index 6d803b6fbe542..2afb2d5d35f22 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
 import {
   ConnectorExecutorResult,
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx
index 588e2ee715a88..0f58b8e37cc7c 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_incident_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getIncidentTypes } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx
index 1d647ca1848fe..fa3b63ea4c7d0 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getSeverity } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
index e73488257d9d2..739250bee0d19 100644
--- a/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
+++ b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionTypeExecutorResult, RewriteResponseCase } from '../../../../actions/common';
+import { ActionTypeExecutorResult, RewriteResponseCase } from '@kbn/actions-plugin/common';
 
 export type ConnectorExecutorResult<T> = ReturnType<
   RewriteResponseCase<ActionTypeExecutorResult<T>>
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts
index 9ea46e5e427b7..20a0b4b78d849 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getChoices } from './api';
 import { choices } from '../mock';
 
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
index de3ea1f16c359..3224c65cc9319 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
 import {
   ConnectorExecutorResult,
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
index fa8e648a0981e..19452cb3ac3ae 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../common/api';
 import { getChoices } from './api';
 import { Choice } from './types';
diff --git a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
index e2448bf8fbf8a..6a2ac8e15dedb 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
@@ -12,11 +12,14 @@ import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eu
 import * as i18n from '../translations';
 import { Case } from '../../../../common/ui/types';
 import { CreateCaseForm } from '../form';
-import { UsePostComment } from '../../../containers/use_post_comment';
+import { UseCreateAttachments } from '../../../containers/use_create_attachments';
 import { CaseAttachments } from '../../../types';
 
 export interface CreateCaseFlyoutProps {
-  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
+  afterCaseCreated?: (
+    theCase: Case,
+    createAttachments: UseCreateAttachments['createAttachments']
+  ) => Promise<void>;
   onClose?: () => void;
   onSuccess?: (theCase: Case) => Promise<void>;
   attachments?: CaseAttachments;
diff --git a/x-pack/plugins/cases/public/components/create/form.tsx b/x-pack/plugins/cases/public/components/create/form.tsx
index c353ddc08a310..ac2729564b387 100644
--- a/x-pack/plugins/cases/public/components/create/form.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.tsx
@@ -27,7 +27,7 @@ import { ActionConnector } from '../../../common/api';
 import { Case } from '../../containers/types';
 import { CasesTimelineIntegration, CasesTimelineIntegrationProvider } from '../timeline_context';
 import { InsertTimeline } from '../insert_timeline';
-import { UsePostComment } from '../../containers/use_post_comment';
+import { UseCreateAttachments } from '../../containers/use_create_attachments';
 import { SubmitCaseButton } from './submit_button';
 import { FormContext } from './form_context';
 import { useCasesFeatures } from '../cases_context/use_cases_features';
@@ -61,7 +61,10 @@ export interface CreateCaseFormFieldsProps {
 export interface CreateCaseFormProps extends Pick<Partial<CreateCaseFormFieldsProps>, 'withSteps'> {
   onCancel: () => void;
   onSuccess: (theCase: Case) => Promise<void>;
-  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
+  afterCaseCreated?: (
+    theCase: Case,
+    createAttachments: UseCreateAttachments['createAttachments']
+  ) => Promise<void>;
   timelineIntegration?: CasesTimelineIntegration;
   attachments?: CaseAttachments;
 }
diff --git a/x-pack/plugins/cases/public/components/create/form_context.test.tsx b/x-pack/plugins/cases/public/components/create/form_context.test.tsx
index 1255131c17791..634f518ae5ebd 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.test.tsx
@@ -14,7 +14,7 @@ import { CommentType, ConnectorTypes } from '../../../common/api';
 import { useKibana } from '../../common/lib/kibana';
 import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
 import { usePostCase } from '../../containers/use_post_case';
-import { usePostComment } from '../../containers/use_post_comment';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
 import { useGetTags } from '../../containers/use_get_tags';
 import { useConnectors } from '../../containers/configure/use_connectors';
 import { useCaseConfigure } from '../../containers/configure/use_configure';
@@ -41,11 +41,12 @@ import { usePostPushToService } from '../../containers/use_post_push_to_service'
 import { Choice } from '../connectors/servicenow/types';
 import userEvent from '@testing-library/user-event';
 import { connectorsMock } from '../../common/mock/connectors';
+import { CaseAttachments } from '../../types';
 
 const sampleId = 'case-id';
 
 jest.mock('../../containers/use_post_case');
-jest.mock('../../containers/use_post_comment');
+jest.mock('../../containers/use_create_attachments');
 jest.mock('../../containers/use_post_push_to_service');
 jest.mock('../../containers/use_get_tags');
 jest.mock('../../containers/configure/use_connectors');
@@ -62,7 +63,7 @@ jest.mock('../../common/lib/kibana');
 const useConnectorsMock = useConnectors as jest.Mock;
 const useCaseConfigureMock = useCaseConfigure as jest.Mock;
 const usePostCaseMock = usePostCase as jest.Mock;
-const usePostCommentMock = usePostComment as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
 const usePostPushToServiceMock = usePostPushToService as jest.Mock;
 const useGetIncidentTypesMock = useGetIncidentTypes as jest.Mock;
 const useGetSeverityMock = useGetSeverity as jest.Mock;
@@ -132,7 +133,7 @@ describe('Create case', () => {
   const fetchTags = jest.fn();
   const onFormSubmitSuccess = jest.fn();
   const afterCaseCreated = jest.fn();
-  const postComment = jest.fn();
+  const createAttachments = jest.fn();
   let onChoicesSuccess: (values: Choice[]) => void;
   let mockedContext: AppMockRenderer;
 
@@ -142,7 +143,7 @@ describe('Create case', () => {
       ...sampleData,
     });
     usePostCaseMock.mockImplementation(() => defaultPostCase);
-    usePostCommentMock.mockImplementation(() => ({ postComment }));
+    useCreateAttachmentsMock.mockImplementation(() => ({ createAttachments }));
     usePostPushToServiceMock.mockImplementation(() => defaultPostPushToService);
     useConnectorsMock.mockReturnValue(sampleConnectorData);
     useCaseConfigureMock.mockImplementation(() => useCaseConfigureResponse);
@@ -733,12 +734,12 @@ describe('Create case', () => {
           id: sampleId,
           ...sampleData,
         },
-        postComment
+        createAttachments
       );
     });
   });
 
-  it('should call `postComment` with the attachments after the case is created', async () => {
+  it('should call createAttachments with the attachments after the case is created', async () => {
     useConnectorsMock.mockReturnValue({
       ...sampleConnectorData,
       connectors: connectorsMock,
@@ -778,8 +779,32 @@ describe('Create case', () => {
     await act(async () => {
       userEvent.click(wrapper.getByTestId('create-case-submit'));
     });
-    expect(postComment).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments[0] });
-    expect(postComment).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments[1] });
+
+    expect(createAttachments).toHaveBeenCalledTimes(1);
+    expect(createAttachments).toHaveBeenCalledWith({ caseId: 'case-id', data: attachments });
+  });
+
+  it('should NOT call createAttachments if the attachments are an empty array', async () => {
+    useConnectorsMock.mockReturnValue({
+      ...sampleConnectorData,
+      connectors: connectorsMock,
+    });
+    const attachments: CaseAttachments = [];
+
+    const wrapper = mockedContext.render(
+      <FormContext onSuccess={onFormSubmitSuccess} attachments={attachments}>
+        <CreateCaseFormFields {...defaultCreateCaseForm} />
+        <SubmitCaseButton />
+      </FormContext>
+    );
+
+    await fillFormReactTestingLib(wrapper);
+
+    await act(async () => {
+      userEvent.click(wrapper.getByTestId('create-case-submit'));
+    });
+
+    expect(createAttachments).not.toHaveBeenCalled();
   });
 
   it(`should call callbacks in correct order`, async () => {
@@ -826,21 +851,21 @@ describe('Create case', () => {
     wrapper.find(`[data-test-subj="create-case-submit"]`).first().simulate('click');
     await waitFor(() => {
       expect(postCase).toHaveBeenCalled();
-      expect(postComment).toHaveBeenCalled();
+      expect(createAttachments).toHaveBeenCalled();
       expect(afterCaseCreated).toHaveBeenCalled();
       expect(pushCaseToExternalService).toHaveBeenCalled();
       expect(onFormSubmitSuccess).toHaveBeenCalled();
     });
 
     const postCaseOrder = postCase.mock.invocationCallOrder[0];
-    const postCommentOrder = postComment.mock.invocationCallOrder[0];
+    const createAttachmentsOrder = createAttachments.mock.invocationCallOrder[0];
     const afterCaseOrder = afterCaseCreated.mock.invocationCallOrder[0];
     const pushCaseToExternalServiceOrder = pushCaseToExternalService.mock.invocationCallOrder[0];
     const onFormSubmitSuccessOrder = onFormSubmitSuccess.mock.invocationCallOrder[0];
 
     expect(
-      postCaseOrder < postCommentOrder &&
-        postCommentOrder < afterCaseOrder &&
+      postCaseOrder < createAttachmentsOrder &&
+        createAttachmentsOrder < afterCaseOrder &&
         afterCaseOrder < pushCaseToExternalServiceOrder &&
         pushCaseToExternalServiceOrder < onFormSubmitSuccessOrder
     ).toBe(true);
diff --git a/x-pack/plugins/cases/public/components/create/form_context.tsx b/x-pack/plugins/cases/public/components/create/form_context.tsx
index 8a89dfea3a811..4385053a8c8c0 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.tsx
@@ -15,7 +15,10 @@ import { usePostPushToService } from '../../containers/use_post_push_to_service'
 import { useConnectors } from '../../containers/configure/use_connectors';
 import { Case } from '../../containers/types';
 import { NONE_CONNECTOR_ID } from '../../../common/api';
-import { UsePostComment, usePostComment } from '../../containers/use_post_comment';
+import {
+  UseCreateAttachments,
+  useCreateAttachments,
+} from '../../containers/use_create_attachments';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { useCasesFeatures } from '../cases_context/use_cases_features';
 import { getConnectorById } from '../utils';
@@ -32,7 +35,10 @@ const initialCaseValue: FormProps = {
 };
 
 interface Props {
-  afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
+  afterCaseCreated?: (
+    theCase: Case,
+    createAttachments: UseCreateAttachments['createAttachments']
+  ) => Promise<void>;
   children?: JSX.Element | JSX.Element[];
   onSuccess?: (theCase: Case) => Promise<void>;
   attachments?: CaseAttachments;
@@ -48,7 +54,7 @@ export const FormContext: React.FC<Props> = ({
   const { owner } = useCasesContext();
   const { isSyncAlertsEnabled } = useCasesFeatures();
   const { postCase } = usePostCase();
-  const { postComment } = usePostComment();
+  const { createAttachments } = useCreateAttachments();
   const { pushCaseToExternalService } = usePostPushToService();
 
   const submitCase = useCallback(
@@ -77,20 +83,15 @@ export const FormContext: React.FC<Props> = ({
         });
 
         // add attachments to the case
-        if (updatedCase && Array.isArray(attachments)) {
-          // TODO currently the API only supports to add a comment at the time
-          // once the API is updated we should use bulk post comment #124814
-          // this operation is intentionally made in sequence
-          for (const attachment of attachments) {
-            await postComment({
-              caseId: updatedCase.id,
-              data: attachment,
-            });
-          }
+        if (updatedCase && Array.isArray(attachments) && attachments.length > 0) {
+          await createAttachments({
+            caseId: updatedCase.id,
+            data: attachments,
+          });
         }
 
         if (afterCaseCreated && updatedCase) {
-          await afterCaseCreated(updatedCase, postComment);
+          await afterCaseCreated(updatedCase, createAttachments);
         }
 
         if (updatedCase?.id && connectorToUpdate.id !== 'none') {
@@ -113,7 +114,7 @@ export const FormContext: React.FC<Props> = ({
       afterCaseCreated,
       onSuccess,
       attachments,
-      postComment,
+      createAttachments,
       pushCaseToExternalService,
     ]
   );
diff --git a/x-pack/plugins/cases/public/components/create/owner_selector.tsx b/x-pack/plugins/cases/public/components/create/owner_selector.tsx
index eaa5382260d21..34bef0b98ff78 100644
--- a/x-pack/plugins/cases/public/components/create/owner_selector.tsx
+++ b/x-pack/plugins/cases/public/components/create/owner_selector.tsx
@@ -17,7 +17,7 @@ import {
   useGeneratedHtmlId,
 } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SECURITY_SOLUTION_OWNER } from '../../../common';
 import { OBSERVABILITY_OWNER, OWNER_INFO } from '../../../common/constants';
 
diff --git a/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx b/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx
index 87d4ea8f1e586..3f8f47f2b96ae 100644
--- a/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/edit_connector/index.test.tsx
@@ -10,7 +10,7 @@ import { mount } from 'enzyme';
 import { render, waitFor, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { EditConnector, EditConnectorProps } from './index';
+import { EditConnector, EditConnectorProps } from '.';
 import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
 import { basicCase, basicPush, caseUserActions, connectorsMock } from '../../containers/mock';
 import { CaseConnector } from '../../containers/configure/types';
diff --git a/x-pack/plugins/cases/public/components/header_page/index.test.tsx b/x-pack/plugins/cases/public/components/header_page/index.test.tsx
index bd4069cd11679..55ca3671ce974 100644
--- a/x-pack/plugins/cases/public/components/header_page/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/header_page/index.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 
 import '../../common/mock/match_media';
 import { AppMockRenderer, createAppMockRenderer, TestProviders } from '../../common/mock';
-import { HeaderPage } from './index';
+import { HeaderPage } from '.';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
 jest.mock('../../common/navigation/hooks');
diff --git a/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx b/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx
index 5b396acc95389..1a745221bbc48 100644
--- a/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/insert_timeline/index.test.tsx
@@ -17,7 +17,7 @@ import { getFormMock } from '../__mock__/form';
 import { InsertTimeline } from '.';
 import { useTimelineContext } from '../timeline_context/use_timeline_context';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../timeline_context/use_timeline_context');
 
 const useFormMock = useForm as jest.Mock;
diff --git a/x-pack/plugins/cases/public/components/link_icon/index.test.tsx b/x-pack/plugins/cases/public/components/link_icon/index.test.tsx
index 4600f0dc4adc4..8136457a5c905 100644
--- a/x-pack/plugins/cases/public/components/link_icon/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/link_icon/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { LinkIcon } from './index';
+import { LinkIcon } from '.';
 
 describe('LinkIcon', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
index 2105618ae0315..65a2653bb298b 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
@@ -27,12 +27,12 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { useLocation } from 'react-router-dom';
 import styled from 'styled-components';
 
-import type { TypedLensByValueInput } from '../../../../../../lens/public';
+import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import type { EmbeddablePackageState } from '@kbn/embeddable-plugin/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import { DRAFT_COMMENT_STORAGE_ID, ID } from './constants';
 import { CommentEditorContext } from '../../context';
 import { ModalContainer } from './modal_container';
-import type { EmbeddablePackageState } from '../../../../../../../../src/plugins/embeddable/public';
 import { SavedObjectFinderUi } from './saved_objects_finder';
 import { useLensDraftComment } from './use_lens_draft_comment';
 import { VISUALIZATION } from './translations';
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx
index 1ca3f53291eb0..c25710aed2d5d 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/processor.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { createGlobalStyle } from '../../../../../../../../src/plugins/kibana_react/common';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
+import { createGlobalStyle } from '@kbn/kibana-react-plugin/common';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import { LENS_VISUALIZATION_HEIGHT } from './constants';
 
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx
index e33704c4d690f..7d7ce5d638489 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/saved_objects_finder.tsx
@@ -35,9 +35,9 @@ import {
 import { Direction } from '@elastic/eui/src/services/sort/sort_direction';
 import { i18n } from '@kbn/i18n';
 
-import { SimpleSavedObject, CoreStart } from 'src/core/public';
+import { SimpleSavedObject, CoreStart } from '@kbn/core/public';
 
-import { LISTING_LIMIT_SETTING } from '../../../../../../../../src/plugins/saved_objects/public';
+import { LISTING_LIMIT_SETTING } from '@kbn/saved-objects-plugin/public';
 
 export interface SavedObjectMetaData<T = unknown> {
   type: string;
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
index 8060b53831279..1d6a5ec8ca11a 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
@@ -8,7 +8,7 @@
 import { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { TypedLensByValueInput } from '../../../../../../lens/public';
+import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import {
   parseCommentString,
diff --git a/x-pack/plugins/cases/public/components/subtitle/index.test.tsx b/x-pack/plugins/cases/public/components/subtitle/index.test.tsx
index 20120edc91937..96755ca5d41ba 100644
--- a/x-pack/plugins/cases/public/components/subtitle/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/subtitle/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { Subtitle } from './index';
+import { Subtitle } from '.';
 
 describe('Subtitle', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/tag_list/index.test.tsx b/x-pack/plugins/cases/public/components/tag_list/index.test.tsx
index 2ced7502b3c3f..da1d8c1c63ab1 100644
--- a/x-pack/plugins/cases/public/components/tag_list/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/tag_list/index.test.tsx
@@ -12,13 +12,13 @@ import { TagList, TagListProps } from '.';
 import { getFormMock } from '../__mock__/form';
 import { TestProviders } from '../../common/mock';
 import { waitFor } from '@testing-library/react';
-import { useForm } from '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form';
+import { useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form';
 import { useGetTags } from '../../containers/use_get_tags';
 
-jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../../containers/use_get_tags');
 jest.mock(
-  '../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider',
+  '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/components/form_data_provider',
   () => ({
     FormDataProvider: ({ children }: { children: ({ tags }: { tags: string[] }) => void }) =>
       children({ tags: ['rad', 'dude'] }),
diff --git a/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts b/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts
index 7c7625507fe9e..ce42b36a471e3 100644
--- a/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts
+++ b/x-pack/plugins/cases/public/components/use_breadcrumbs/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useCallback, useEffect } from 'react';
 import { useKibana, useNavigation } from '../../common/lib/kibana';
 import { CasesDeepLinkId, ICasesDeepLinkId } from '../../common/navigation';
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
index 9c0b539720748..07bca8bff8286 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
@@ -47,6 +47,7 @@ const getCreateCommentUserAction = ({
   handleManageMarkdownEditId,
   handleSaveComment,
   handleManageQuote,
+  handleDeleteComment,
   getRuleDetailsHref,
   loadingAlertData,
   onRuleDetailsClick,
@@ -72,6 +73,7 @@ const getCreateCommentUserAction = ({
         handleManageMarkdownEditId,
         handleSaveComment,
         handleManageQuote,
+        handleDeleteComment,
       });
 
       return userBuilder.build();
@@ -114,8 +116,10 @@ export const createCommentUserActionBuilder: UserActionBuilder = ({
   onShowAlertDetails,
   handleManageMarkdownEditId,
   handleSaveComment,
+  handleDeleteComment,
   handleManageQuote,
   handleOutlineComment,
+  actionsNavigation,
 }) => ({
   build: () => {
     const commentUserAction = userAction as UserActionResponse<CommentUserAction>;
@@ -145,7 +149,9 @@ export const createCommentUserActionBuilder: UserActionBuilder = ({
         onShowAlertDetails,
         handleManageMarkdownEditId,
         handleSaveComment,
+        handleDeleteComment,
         handleManageQuote,
+        actionsNavigation,
       });
 
       return commentAction;
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
index c059be0f20797..a4e6fe6cf2887 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
@@ -25,6 +25,7 @@ type BuilderArgs = Pick<
   | 'handleSaveComment'
   | 'handleManageQuote'
   | 'commentRefs'
+  | 'handleDeleteComment'
 > & {
   comment: SnakeToCamelCase<CommentResponseUserType>;
   outlined: boolean;
@@ -42,6 +43,7 @@ export const createUserAttachmentUserActionBuilder = ({
   handleManageMarkdownEditId,
   handleSaveComment,
   handleManageQuote,
+  handleDeleteComment,
 }: BuilderArgs): ReturnType<UserActionBuilder> => ({
   // TODO: Fix this manually. Issue #123375
   // eslint-disable-next-line react/display-name
@@ -85,10 +87,13 @@ export const createUserAttachmentUserActionBuilder = ({
           id={comment.id}
           commentMarkdown={comment.comment}
           editLabel={i18n.EDIT_COMMENT}
+          deleteLabel={i18n.DELETE_COMMENT}
+          deleteConfirmTitle={i18n.DELETE_COMMENT_TITLE}
           quoteLabel={i18n.QUOTE}
           isLoading={isLoading}
           onEdit={handleManageMarkdownEditId.bind(null, comment.id)}
           onQuote={handleManageQuote.bind(null, comment.comment)}
+          onDelete={handleDeleteComment.bind(null, comment.id)}
           userCanCrud={userCanCrud}
         />
       ),
diff --git a/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx b/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx
index 0a1f02b4aaebf..bea47933dccd6 100644
--- a/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/content_toolbar.tsx
@@ -15,10 +15,13 @@ export interface UserActionContentToolbarProps {
   commentMarkdown: string;
   id: string;
   editLabel: string;
+  deleteLabel?: string;
+  deleteConfirmTitle?: string;
   quoteLabel: string;
   isLoading: boolean;
   onEdit: (id: string) => void;
   onQuote: (id: string) => void;
+  onDelete?: (id: string) => void;
   userCanCrud: boolean;
 }
 
@@ -26,10 +29,13 @@ const UserActionContentToolbarComponent = ({
   commentMarkdown,
   id,
   editLabel,
+  deleteLabel,
+  deleteConfirmTitle,
   quoteLabel,
   isLoading,
   onEdit,
   onQuote,
+  onDelete,
   userCanCrud,
 }: UserActionContentToolbarProps) => (
   <EuiFlexGroup responsive={false} alignItems="center">
@@ -41,9 +47,12 @@ const UserActionContentToolbarComponent = ({
         id={id}
         editLabel={editLabel}
         quoteLabel={quoteLabel}
+        deleteLabel={deleteLabel}
+        deleteConfirmTitle={deleteConfirmTitle}
         isLoading={isLoading}
         onEdit={onEdit}
         onQuote={onQuote}
+        onDelete={onDelete}
         userCanCrud={userCanCrud}
         commentMarkdown={commentMarkdown}
       />
diff --git a/x-pack/plugins/cases/public/components/user_actions/index.tsx b/x-pack/plugins/cases/public/components/user_actions/index.tsx
index d980ef029e447..9cdfb37902c55 100644
--- a/x-pack/plugins/cases/public/components/user_actions/index.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/index.tsx
@@ -114,6 +114,7 @@ export const UserActions = React.memo(
       handleOutlineComment,
       handleSaveComment,
       handleManageQuote,
+      handleDeleteComment,
       handleUpdate,
     } = useUserActionsHandler({ fetchUserActions, updateCase });
 
@@ -202,6 +203,7 @@ export const UserActions = React.memo(
               alertData: manualAlertsData,
               handleOutlineComment,
               handleManageMarkdownEditId,
+              handleDeleteComment,
               handleSaveComment,
               handleManageQuote,
               onShowAlertDetails,
@@ -227,6 +229,7 @@ export const UserActions = React.memo(
         manualAlertsData,
         handleOutlineComment,
         handleManageMarkdownEditId,
+        handleDeleteComment,
         handleSaveComment,
         handleManageQuote,
         onShowAlertDetails,
diff --git a/x-pack/plugins/cases/public/components/user_actions/mock.ts b/x-pack/plugins/cases/public/components/user_actions/mock.ts
index 7000f407f97e5..f44c64109e7ea 100644
--- a/x-pack/plugins/cases/public/components/user_actions/mock.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/mock.ts
@@ -53,6 +53,7 @@ export const getMockBuilderArgs = (): UserActionBuilderArgs => {
   const onShowAlertDetails = jest.fn();
   const handleManageMarkdownEditId = jest.fn();
   const handleSaveComment = jest.fn();
+  const handleDeleteComment = jest.fn();
   const handleManageQuote = jest.fn();
   const handleOutlineComment = jest.fn();
 
@@ -74,6 +75,7 @@ export const getMockBuilderArgs = (): UserActionBuilderArgs => {
     onShowAlertDetails,
     handleManageMarkdownEditId,
     handleSaveComment,
+    handleDeleteComment,
     handleManageQuote,
     handleOutlineComment,
   };
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx
index 167a7fb977929..0084301183e68 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions.test.tsx
@@ -8,6 +8,8 @@
 import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { UserActionPropertyActions } from './property_actions';
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 jest.mock('../../common/lib/kibana');
 
@@ -36,7 +38,7 @@ describe('UserActionPropertyActions ', () => {
     jest.clearAllMocks();
   });
 
-  it('it renders', async () => {
+  it('renders', async () => {
     expect(
       wrapper.find('[data-test-subj="user-action-title-loading"]').first().exists()
     ).toBeFalsy();
@@ -44,7 +46,7 @@ describe('UserActionPropertyActions ', () => {
     expect(wrapper.find('[data-test-subj="property-actions"]').first().exists()).toBeTruthy();
   });
 
-  it('it shows the edit and quote buttons', async () => {
+  it('shows the edit and quote buttons', async () => {
     wrapper.find('[data-test-subj="property-actions-ellipses"]').first().simulate('click');
     wrapper.find('[data-test-subj="property-actions-pencil"]').exists();
     wrapper.find('[data-test-subj="property-actions-quote"]').exists();
@@ -62,7 +64,7 @@ describe('UserActionPropertyActions ', () => {
     expect(onEdit).toHaveBeenCalledWith(props.id);
   });
 
-  it('it shows the spinner when loading', async () => {
+  it('shows the spinner when loading', async () => {
     wrapper = mount(<UserActionPropertyActions {...props} isLoading={true} />);
     expect(
       wrapper.find('[data-test-subj="user-action-title-loading"]').first().exists()
@@ -70,4 +72,51 @@ describe('UserActionPropertyActions ', () => {
 
     expect(wrapper.find('[data-test-subj="property-actions"]').first().exists()).toBeFalsy();
   });
+
+  describe('Delete button', () => {
+    const onDelete = jest.fn();
+    const deleteProps = {
+      ...props,
+      onDelete,
+      deleteLabel: 'delete me',
+      deleteConfirmlabel: 'confirm delete me',
+    };
+    it('shows the delete button', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      expect(renderResult.getByTestId('property-actions-trash')).toBeTruthy();
+    });
+
+    it('shows a confirm dialog when the delete button is clicked', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      userEvent.click(renderResult.getByTestId('property-actions-trash'));
+
+      expect(renderResult.getByTestId('property-actions-confirm-modal')).toBeTruthy();
+    });
+
+    it('closes the confirm dialog when the cancel button is clicked', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      userEvent.click(renderResult.getByTestId('property-actions-trash'));
+      expect(renderResult.getByTestId('property-actions-confirm-modal')).toBeTruthy();
+
+      userEvent.click(renderResult.getByTestId('confirmModalCancelButton'));
+      expect(renderResult.queryByTestId('property-actions-confirm-modal')).toBe(null);
+    });
+
+    it('calls onDelete when the confirm is pressed', () => {
+      const renderResult = render(<UserActionPropertyActions {...deleteProps} />);
+
+      userEvent.click(renderResult.getByTestId('property-actions-ellipses'));
+      userEvent.click(renderResult.getByTestId('property-actions-trash'));
+      expect(renderResult.getByTestId('property-actions-confirm-modal')).toBeTruthy();
+
+      userEvent.click(renderResult.getByTestId('confirmModalConfirmButton'));
+      expect(onDelete).toHaveBeenCalledWith(deleteProps.id);
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx
index 86e1ac0e1f481..898ef87a0b2b9 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions.tsx
@@ -5,18 +5,22 @@
  * 2.0.
  */
 
-import React, { memo, useMemo, useCallback } from 'react';
-import { EuiLoadingSpinner } from '@elastic/eui';
+import React, { memo, useMemo, useCallback, useState } from 'react';
+import { EuiConfirmModal, EuiLoadingSpinner } from '@elastic/eui';
 
 import { PropertyActions } from '../property_actions';
 import { useLensOpenVisualization } from '../markdown_editor/plugins/lens/use_lens_open_visualization';
+import { CANCEL_BUTTON, CONFIRM_BUTTON } from './translations';
 
 interface UserActionPropertyActionsProps {
   id: string;
   editLabel: string;
+  deleteLabel?: string;
+  deleteConfirmTitle?: string;
   quoteLabel: string;
   isLoading: boolean;
   onEdit: (id: string) => void;
+  onDelete?: (id: string) => void;
   onQuote: (id: string) => void;
   userCanCrud: boolean;
   commentMarkdown: string;
@@ -26,8 +30,11 @@ const UserActionPropertyActionsComponent = ({
   id,
   editLabel,
   quoteLabel,
+  deleteLabel,
+  deleteConfirmTitle,
   isLoading,
   onEdit,
+  onDelete,
   onQuote,
   userCanCrud,
   commentMarkdown,
@@ -35,6 +42,22 @@ const UserActionPropertyActionsComponent = ({
   const { canUseEditor, actionConfig } = useLensOpenVisualization({ comment: commentMarkdown });
   const onEditClick = useCallback(() => onEdit(id), [id, onEdit]);
   const onQuoteClick = useCallback(() => onQuote(id), [id, onQuote]);
+  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
+
+  const onDeleteClick = useCallback(() => {
+    setShowDeleteConfirm(true);
+  }, []);
+
+  const onDeleteConfirmClick = useCallback(() => {
+    if (onDelete) {
+      onDelete(id);
+    }
+    setShowDeleteConfirm(false);
+  }, [id, onDelete]);
+
+  const onDeleteCancelClick = useCallback(() => {
+    setShowDeleteConfirm(false);
+  }, []);
 
   const propertyActions = useMemo(
     () =>
@@ -46,6 +69,15 @@ const UserActionPropertyActionsComponent = ({
                 label: editLabel,
                 onClick: onEditClick,
               },
+              ...(deleteLabel && onDelete
+                ? [
+                    {
+                      iconType: 'trash',
+                      label: deleteLabel,
+                      onClick: onDeleteClick,
+                    },
+                  ]
+                : []),
               {
                 iconType: 'quote',
                 label: quoteLabel,
@@ -55,7 +87,18 @@ const UserActionPropertyActionsComponent = ({
           : [],
         canUseEditor && actionConfig ? [actionConfig] : [],
       ].flat(),
-    [userCanCrud, editLabel, onEditClick, quoteLabel, onQuoteClick, canUseEditor, actionConfig]
+    [
+      userCanCrud,
+      editLabel,
+      onEditClick,
+      deleteLabel,
+      onDelete,
+      onDeleteClick,
+      quoteLabel,
+      onQuoteClick,
+      canUseEditor,
+      actionConfig,
+    ]
   );
 
   if (!propertyActions.length) {
@@ -66,6 +109,18 @@ const UserActionPropertyActionsComponent = ({
     <>
       {isLoading && <EuiLoadingSpinner data-test-subj="user-action-title-loading" />}
       {!isLoading && <PropertyActions propertyActions={propertyActions} />}
+      {showDeleteConfirm ? (
+        <EuiConfirmModal
+          title={deleteConfirmTitle}
+          onCancel={onDeleteCancelClick}
+          onConfirm={onDeleteConfirmClick}
+          cancelButtonText={CANCEL_BUTTON}
+          confirmButtonText={CONFIRM_BUTTON}
+          buttonColor="danger"
+          defaultFocusedButton="confirm"
+          data-test-subj="property-actions-confirm-modal"
+        />
+      ) : null}
     </>
   );
 };
diff --git a/x-pack/plugins/cases/public/components/user_actions/translations.ts b/x-pack/plugins/cases/public/components/user_actions/translations.ts
index 40d6fc5bc2ad8..2540dd22e09f1 100644
--- a/x-pack/plugins/cases/public/components/user_actions/translations.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/translations.ts
@@ -70,3 +70,11 @@ export const OTHER_ENDPOINTS = (endpoints: number): string =>
     values: { endpoints },
     defaultMessage: ` and {endpoints} {endpoints, plural, =1 {other} other {others}}`,
   });
+
+export const CANCEL_BUTTON = i18n.translate('xpack.cases.caseView.delete.cancel', {
+  defaultMessage: 'Cancel',
+});
+
+export const CONFIRM_BUTTON = i18n.translate('xpack.cases.caseView.delete.confirm', {
+  defaultMessage: 'Delete',
+});
diff --git a/x-pack/plugins/cases/public/components/user_actions/types.ts b/x-pack/plugins/cases/public/components/user_actions/types.ts
index 37beaca4dc6b6..080ccf095c4f6 100644
--- a/x-pack/plugins/cases/public/components/user_actions/types.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/types.ts
@@ -55,6 +55,7 @@ export interface UserActionBuilderArgs {
   handleOutlineComment: (id: string) => void;
   handleManageMarkdownEditId: (id: string) => void;
   handleSaveComment: ({ id, version }: { id: string; version: string }, content: string) => void;
+  handleDeleteComment: (id: string) => void;
   handleManageQuote: (quote: string) => void;
   onShowAlertDetails: (alertId: string, index: string) => void;
   actionsNavigation?: ActionsNavigation;
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
index a90cac5b15d56..56b70391d4155 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.test.tsx
@@ -56,24 +56,6 @@ describe('useUserActionsHandler', () => {
     });
   });
 
-  it('init', async () => {
-    const { result } = renderHook<UseUserActionsHandlerArgs, UseUserActionsHandler>(() =>
-      useUserActionsHandler({ fetchUserActions, updateCase })
-    );
-
-    expect(result.current).toEqual({
-      loadingCommentIds: [],
-      selectedOutlineCommentId: '',
-      manageMarkdownEditIds: [],
-      commentRefs: result.current.commentRefs,
-      handleManageMarkdownEditId: result.current.handleManageMarkdownEditId,
-      handleOutlineComment: result.current.handleOutlineComment,
-      handleSaveComment: result.current.handleSaveComment,
-      handleManageQuote: result.current.handleManageQuote,
-      handleUpdate: result.current.handleUpdate,
-    });
-  });
-
   it('should saves a comment', async () => {
     const { result } = renderHook<UseUserActionsHandlerArgs, UseUserActionsHandler>(() =>
       useUserActionsHandler({ fetchUserActions, updateCase })
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
index 61f5329908c04..4981e86251c18 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
@@ -14,6 +14,7 @@ import { AddCommentRefObject } from '../add_comment';
 import { UserActionMarkdownRefObject } from './markdown_form';
 import { UserActionBuilderArgs, UserActionTreeProps } from './types';
 import { NEW_COMMENT_ID } from './constants';
+import { useDeleteComment } from '../../containers/use_delete_comment';
 
 export type UseUserActionsHandlerArgs = Pick<
   UserActionTreeProps,
@@ -30,6 +31,7 @@ export type UseUserActionsHandler = Pick<
   | 'handleOutlineComment'
   | 'handleSaveComment'
   | 'handleManageQuote'
+  | 'handleDeleteComment'
 > & { handleUpdate: (updatedCase: Case) => void };
 
 const isAddCommentRef = (
@@ -48,6 +50,7 @@ export const useUserActionsHandler = ({
     useLensDraftComment();
   const handlerTimeoutId = useRef(0);
   const { isLoadingIds, patchComment } = useUpdateComment();
+  const { deleteComment } = useDeleteComment();
   const [selectedOutlineCommentId, setSelectedOutlineCommentId] = useState('');
   const [manageMarkdownEditIds, setManageMarkdownEditIds] = useState<string[]>([]);
   const commentRefs = useRef<
@@ -80,6 +83,13 @@ export const useUserActionsHandler = ({
     [caseId, fetchUserActions, patchComment, updateCase]
   );
 
+  const handleDeleteComment = useCallback(
+    (id: string) => {
+      deleteComment({ caseId, commentId: id, fetchUserActions, updateCase });
+    },
+    [caseId, deleteComment, fetchUserActions, updateCase]
+  );
+
   const handleOutlineComment = useCallback(
     (id: string) => {
       const moveToTarget = document.getElementById(`${id}-permLink`);
@@ -160,6 +170,7 @@ export const useUserActionsHandler = ({
     handleManageMarkdownEditId,
     handleOutlineComment,
     handleSaveComment,
+    handleDeleteComment,
     handleManageQuote,
     handleUpdate,
   };
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx
index a1930c17a70b1..545b1f4ae13c2 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar.test.tsx
@@ -16,7 +16,7 @@ import {
   UtilityBarGroup,
   UtilityBarSection,
   UtilityBarText,
-} from './index';
+} from '.';
 
 describe('UtilityBar', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx
index 8fc67cefc0f61..88977fa9bc587 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_action.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarAction } from './index';
+import { UtilityBarAction } from '.';
 
 describe('UtilityBarAction', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx
index 546dcf48bba9a..bf7bb34ab5b64 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_group.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarGroup, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarText } from '.';
 
 describe('UtilityBarGroup', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx
index f06ff651b5419..142cca8fc9e32 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_section.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from '.';
 
 describe('UtilityBarSection', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx
index 456a1f4bed3be..afeae82a19e85 100644
--- a/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx
+++ b/x-pack/plugins/cases/public/components/utility_bar/utility_bar_text.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../common/mock';
-import { UtilityBarText } from './index';
+import { UtilityBarText } from '.';
 
 describe('UtilityBarText', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/cases/public/components/utils.test.ts b/x-pack/plugins/cases/public/components/utils.test.ts
index e3cc753e75746..71218492dec95 100644
--- a/x-pack/plugins/cases/public/components/utils.test.ts
+++ b/x-pack/plugins/cases/public/components/utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { actionTypeRegistryMock } from '../../../triggers_actions_ui/public/application/action_type_registry.mock';
-import { triggersActionsUiMock } from '../../../triggers_actions_ui/public/mocks';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 import { getConnectorIcon, isDeprecatedConnector } from './utils';
 
 describe('Utils', () => {
diff --git a/x-pack/plugins/cases/public/containers/__mocks__/api.ts b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
index 2cd30eb15d2d1..1f5c1652edfff 100644
--- a/x-pack/plugins/cases/public/containers/__mocks__/api.ts
+++ b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
@@ -101,12 +101,18 @@ export const patchCasesStatus = async (
   signal: AbortSignal
 ): Promise<Case[]> => Promise.resolve(allCases.cases);
 
-export const postComment = async (
+export const createAttachments = async (
   newComment: CommentRequest,
   caseId: string,
   signal: AbortSignal
 ): Promise<Case> => Promise.resolve(basicCase);
 
+export const deleteComment = async (
+  caseId: string,
+  commentId: string,
+  signal: AbortSignal
+): Promise<void> => Promise.resolve(undefined);
+
 export const patchComment = async (
   caseId: string,
   commentId: string,
diff --git a/x-pack/plugins/cases/public/containers/api.test.tsx b/x-pack/plugins/cases/public/containers/api.test.tsx
index e656544084d09..6b8bd6f65bc6d 100644
--- a/x-pack/plugins/cases/public/containers/api.test.tsx
+++ b/x-pack/plugins/cases/public/containers/api.test.tsx
@@ -8,10 +8,15 @@
 import { KibanaServices } from '../common/lib/kibana';
 
 import { ConnectorTypes, CommentType, CaseStatuses } from '../../common/api';
-import { CASES_URL, SECURITY_SOLUTION_OWNER } from '../../common/constants';
+import {
+  CASES_URL,
+  INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
+  SECURITY_SOLUTION_OWNER,
+} from '../../common/constants';
 
 import {
   deleteCases,
+  deleteComment,
   getActionLicense,
   getCase,
   getCases,
@@ -23,7 +28,7 @@ import {
   patchCasesStatus,
   patchComment,
   postCase,
-  postComment,
+  createAttachments,
   pushCase,
   resolveCase,
 } from './api';
@@ -45,6 +50,7 @@ import {
   tags,
   caseUserActionsSnake,
   casesStatusSnake,
+  basicCaseId,
 } from './mock';
 
 import { DEFAULT_FILTER_OPTIONS, DEFAULT_QUERY_PARAMS } from './use_get_cases';
@@ -458,28 +464,43 @@ describe('Case Configuration API', () => {
     });
   });
 
-  describe('postComment', () => {
+  describe('createAttachments', () => {
     beforeEach(() => {
       fetchMock.mockClear();
       fetchMock.mockResolvedValue(basicCaseSnake);
     });
-    const data = {
-      comment: 'comment',
-      owner: SECURITY_SOLUTION_OWNER,
-      type: CommentType.user as const,
-    };
+    const data = [
+      {
+        comment: 'comment',
+        owner: SECURITY_SOLUTION_OWNER,
+        type: CommentType.user as const,
+      },
+      {
+        alertId: 'test-id',
+        index: 'test-index',
+        rule: {
+          id: 'test-rule',
+          name: 'Test',
+        },
+        owner: SECURITY_SOLUTION_OWNER,
+        type: CommentType.alert as const,
+      },
+    ];
 
     test('should be called with correct check url, method, signal', async () => {
-      await postComment(data, basicCase.id, abortCtrl.signal);
-      expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/${basicCase.id}/comments`, {
-        method: 'POST',
-        body: JSON.stringify(data),
-        signal: abortCtrl.signal,
-      });
+      await createAttachments(data, basicCase.id, abortCtrl.signal);
+      expect(fetchMock).toHaveBeenCalledWith(
+        INTERNAL_BULK_CREATE_ATTACHMENTS_URL.replace('{case_id}', basicCase.id),
+        {
+          method: 'POST',
+          body: JSON.stringify(data),
+          signal: abortCtrl.signal,
+        }
+      );
     });
 
     test('should return correct response', async () => {
-      const resp = await postComment(data, basicCase.id, abortCtrl.signal);
+      const resp = await createAttachments(data, basicCase.id, abortCtrl.signal);
       expect(resp).toEqual(basicCase);
     });
   });
@@ -509,4 +530,25 @@ describe('Case Configuration API', () => {
       expect(resp).toEqual(pushedCase);
     });
   });
+
+  describe('deleteComment', () => {
+    beforeEach(() => {
+      fetchMock.mockClear();
+      fetchMock.mockResolvedValue(null);
+    });
+    const commentId = 'ab1234';
+
+    test('should be called with correct check url, method, signal', async () => {
+      const resp = await deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        signal: abortCtrl.signal,
+      });
+      expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/${basicCase.id}/comments/${commentId}`, {
+        method: 'DELETE',
+        signal: abortCtrl.signal,
+      });
+      expect(resp).toBe(undefined);
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index 9d250e2ae6e0c..d4593dd1f2813 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -9,6 +9,7 @@ import { omit } from 'lodash';
 
 import { StatusAll, ResolvedCase } from '../../common/ui/types';
 import {
+  BulkCreateCommentRequest,
   CasePatchRequest,
   CasePostRequest,
   CaseResponse,
@@ -26,12 +27,14 @@ import {
   getCaseUserActionUrl,
   User,
   CaseMetricsResponse,
+  getCaseCommentDeleteUrl,
 } from '../../common/api';
 import {
   CASE_REPORTERS_URL,
   CASE_STATUS_URL,
   CASE_TAGS_URL,
   CASES_URL,
+  INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
 } from '../../common/constants';
 import { getAllConnectorTypesUrl } from '../../common/utils/connectors_api';
 
@@ -271,6 +274,21 @@ export const patchComment = async ({
   return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
 };
 
+export const deleteComment = async ({
+  caseId,
+  commentId,
+  signal,
+}: {
+  caseId: string;
+  commentId: string;
+  signal: AbortSignal;
+}): Promise<void> => {
+  await KibanaServices.get().http.fetch<CaseResponse>(getCaseCommentDeleteUrl(caseId, commentId), {
+    method: 'DELETE',
+    signal,
+  });
+};
+
 export const deleteCases = async (caseIds: string[], signal: AbortSignal): Promise<string> => {
   const response = await KibanaServices.get().http.fetch<string>(CASES_URL, {
     method: 'DELETE',
@@ -308,3 +326,19 @@ export const getActionLicense = async (signal: AbortSignal): Promise<ActionLicen
 
   return convertArrayToCamelCase(response) as ActionLicense[];
 };
+
+export const createAttachments = async (
+  attachments: BulkCreateCommentRequest,
+  caseId: string,
+  signal: AbortSignal
+): Promise<Case> => {
+  const response = await KibanaServices.get().http.fetch<CaseResponse>(
+    INTERNAL_BULK_CREATE_ATTACHMENTS_URL.replace('{case_id}', caseId),
+    {
+      method: 'POST',
+      body: JSON.stringify(attachments),
+      signal,
+    }
+  );
+  return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
+};
diff --git a/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
similarity index 60%
rename from x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
rename to x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
index a3e6147c98439..428b28e02dcc5 100644
--- a/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_create_attachments.test.tsx
@@ -9,7 +9,7 @@ import { renderHook, act } from '@testing-library/react-hooks';
 
 import { CommentType } from '../../common/api';
 import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
-import { usePostComment, UsePostComment } from './use_post_comment';
+import { useCreateAttachments, UseCreateAttachments } from './use_create_attachments';
 import { basicCaseId } from './mock';
 import * as api from './api';
 import { useToasts } from '../common/lib/kibana';
@@ -19,18 +19,20 @@ jest.mock('../common/lib/kibana');
 
 const useToastMock = useToasts as jest.Mock;
 
-describe('usePostComment', () => {
+describe('useCreateAttachments', () => {
   const toastErrorMock = jest.fn();
   useToastMock.mockReturnValue({
     addError: toastErrorMock,
   });
 
   const abortCtrl = new AbortController();
-  const samplePost = {
-    comment: 'a comment',
-    type: CommentType.user as const,
-    owner: SECURITY_SOLUTION_OWNER,
-  };
+  const samplePost = [
+    {
+      comment: 'a comment',
+      type: CommentType.user as const,
+      owner: SECURITY_SOLUTION_OWNER,
+    },
+  ];
   const updateCaseCallback = jest.fn();
   beforeEach(() => {
     jest.clearAllMocks();
@@ -39,45 +41,65 @@ describe('usePostComment', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
       expect(result.current).toEqual({
         isLoading: false,
         isError: false,
-        postComment: result.current.postComment,
+        createAttachments: result.current.createAttachments,
       });
     });
   });
 
-  it('calls postComment with correct arguments - case', async () => {
-    const spyOnPostCase = jest.spyOn(api, 'postComment');
+  it('calls createAttachments with data not as an array', async () => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
 
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
       });
       await waitForNextUpdate();
-      expect(spyOnPostCase).toBeCalledWith(samplePost, basicCaseId, abortCtrl.signal);
+      expect(spyOnBulkCreateAttachments).toBeCalledWith(samplePost, basicCaseId, abortCtrl.signal);
+      expect(toastErrorMock).not.toHaveBeenCalled();
+    });
+  });
+
+  it('calls createAttachments with data as an array', async () => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
+      );
+      await waitForNextUpdate();
+
+      result.current.createAttachments({
+        caseId: basicCaseId,
+        data: samplePost,
+        updateCase: updateCaseCallback,
+      });
+      await waitForNextUpdate();
+      expect(spyOnBulkCreateAttachments).toBeCalledWith(samplePost, basicCaseId, abortCtrl.signal);
       expect(toastErrorMock).not.toHaveBeenCalled();
     });
   });
 
   it('post case', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
@@ -86,18 +108,18 @@ describe('usePostComment', () => {
       expect(result.current).toEqual({
         isLoading: false,
         isError: false,
-        postComment: result.current.postComment,
+        createAttachments: result.current.createAttachments,
       });
     });
   });
 
   it('set isLoading to true when posting case', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
@@ -108,17 +130,17 @@ describe('usePostComment', () => {
   });
 
   it('set isError true and shows a toast error when an error occurs', async () => {
-    const spyOnPostCase = jest.spyOn(api, 'postComment');
-    spyOnPostCase.mockImplementation(() => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
+    spyOnBulkCreateAttachments.mockImplementation(() => {
       throw new Error('Something went wrong');
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
-      result.current.postComment({
+      result.current.createAttachments({
         caseId: basicCaseId,
         data: samplePost,
         updateCase: updateCaseCallback,
@@ -127,7 +149,7 @@ describe('usePostComment', () => {
       expect(result.current).toEqual({
         isLoading: false,
         isError: true,
-        postComment: result.current.postComment,
+        createAttachments: result.current.createAttachments,
       });
 
       expect(toastErrorMock).toHaveBeenCalledWith(expect.any(Error), {
@@ -137,18 +159,18 @@ describe('usePostComment', () => {
   });
 
   it('throws an error when invoked with throwOnError true', async () => {
-    const spyOnPostCase = jest.spyOn(api, 'postComment');
-    spyOnPostCase.mockImplementation(() => {
+    const spyOnBulkCreateAttachments = jest.spyOn(api, 'createAttachments');
+    spyOnBulkCreateAttachments.mockImplementation(() => {
       throw new Error('This is not possible');
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UsePostComment>(() =>
-        usePostComment()
+      const { result, waitForNextUpdate } = renderHook<string, UseCreateAttachments>(() =>
+        useCreateAttachments()
       );
       await waitForNextUpdate();
       async function test() {
-        await result.current.postComment({
+        await result.current.createAttachments({
           caseId: basicCaseId,
           data: samplePost,
           updateCase: updateCaseCallback,
diff --git a/x-pack/plugins/cases/public/containers/use_post_comment.tsx b/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
similarity index 82%
rename from x-pack/plugins/cases/public/containers/use_post_comment.tsx
rename to x-pack/plugins/cases/public/containers/use_create_attachments.tsx
index ebfcf607701ba..e6de525f36e6a 100644
--- a/x-pack/plugins/cases/public/containers/use_post_comment.tsx
+++ b/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
-import { CommentRequest } from '../../common/api';
+import { BulkCreateCommentRequest } from '../../common/api';
 
-import { postComment } from './api';
+import { createAttachments } from './api';
 import * as i18n from './translations';
 import { Case } from './types';
 import { useToasts } from '../common/lib/kibana';
@@ -43,15 +43,15 @@ const dataFetchReducer = (state: NewCommentState, action: Action): NewCommentSta
 
 export interface PostComment {
   caseId: string;
-  data: CommentRequest;
+  data: BulkCreateCommentRequest;
   updateCase?: (newCase: Case) => void;
   throwOnError?: boolean;
 }
-export interface UsePostComment extends NewCommentState {
-  postComment: (args: PostComment) => Promise<void>;
+export interface UseCreateAttachments extends NewCommentState {
+  createAttachments: (args: PostComment) => Promise<void>;
 }
 
-export const usePostComment = (): UsePostComment => {
+export const useCreateAttachments = (): UseCreateAttachments => {
   const [state, dispatch] = useReducer(dataFetchReducer, {
     isLoading: false,
     isError: false,
@@ -60,7 +60,7 @@ export const usePostComment = (): UsePostComment => {
   const isCancelledRef = useRef(false);
   const abortCtrlRef = useRef(new AbortController());
 
-  const postMyComment = useCallback(
+  const fetch = useCallback(
     async ({ caseId, data, updateCase, throwOnError }: PostComment) => {
       try {
         isCancelledRef.current = false;
@@ -68,7 +68,7 @@ export const usePostComment = (): UsePostComment => {
         abortCtrlRef.current = new AbortController();
         dispatch({ type: 'FETCH_INIT' });
 
-        const response = await postComment(data, caseId, abortCtrlRef.current.signal);
+        const response = await createAttachments(data, caseId, abortCtrlRef.current.signal);
 
         if (!isCancelledRef.current) {
           dispatch({ type: 'FETCH_SUCCESS' });
@@ -102,5 +102,5 @@ export const usePostComment = (): UsePostComment => {
     []
   );
 
-  return { ...state, postComment: postMyComment };
+  return { ...state, createAttachments: fetch };
 };
diff --git a/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
new file mode 100644
index 0000000000000..8cf0eb6c78faa
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_delete_comment.test.tsx
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { act, renderHook } from '@testing-library/react-hooks';
+import { useDeleteComment, UseDeleteComment } from './use_delete_comment';
+import * as api from './api';
+import { basicCaseId } from './mock';
+
+jest.mock('../common/lib/kibana');
+jest.mock('./api');
+
+const commentId = 'ab124';
+const fetchUserActions = jest.fn();
+const updateCase = jest.fn();
+
+describe('useDeleteComment', () => {
+  it('init', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+      expect(result.current).toEqual({
+        isError: false,
+        deleteComment: result.current.deleteComment,
+      });
+    });
+  });
+
+  it('calls deleteComment with correct arguments - case', async () => {
+    const spyOnDeleteComment = jest.spyOn(api, 'deleteComment');
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+
+      result.current.deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        fetchUserActions,
+        updateCase,
+      });
+      await waitForNextUpdate();
+      expect(spyOnDeleteComment).toBeCalledWith({
+        caseId: basicCaseId,
+        commentId,
+        signal: expect.any(AbortSignal),
+      });
+      expect(result.current.isError).toBe(false);
+    });
+  });
+
+  it('fetches the case information', async () => {
+    const spyOnGetCase = jest.spyOn(api, 'getCase');
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+
+      result.current.deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        fetchUserActions,
+        updateCase,
+      });
+      await waitForNextUpdate();
+      expect(spyOnGetCase).toBeCalledWith(basicCaseId, true, expect.any(AbortSignal));
+    });
+  });
+
+  it('sets isError when fails to delete a case', async () => {
+    const spyOnDeleteComment = jest.spyOn(api, 'deleteComment');
+    spyOnDeleteComment.mockRejectedValue(new Error('Not possible :O'));
+
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<string, UseDeleteComment>(() =>
+        useDeleteComment()
+      );
+      await waitForNextUpdate();
+
+      result.current.deleteComment({
+        caseId: basicCaseId,
+        commentId,
+        fetchUserActions,
+        updateCase,
+      });
+      await waitForNextUpdate();
+      expect(spyOnDeleteComment).toBeCalledWith({
+        caseId: basicCaseId,
+        commentId,
+        signal: expect.any(AbortSignal),
+      });
+
+      expect(result.current.isError).toBe(true);
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_comment.tsx b/x-pack/plugins/cases/public/containers/use_delete_comment.tsx
new file mode 100644
index 0000000000000..3568450659aac
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_delete_comment.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useReducer, useCallback, useRef, useEffect } from 'react';
+import { useToasts } from '../common/lib/kibana';
+import { deleteComment, getCase } from './api';
+import * as i18n from './translations';
+import { Case } from './types';
+
+interface CommentDeleteState {
+  isError: boolean;
+}
+interface CommentDelete {
+  commentId: string;
+}
+
+type Action =
+  | { type: 'FETCH_INIT'; payload: string }
+  | { type: 'FETCH_SUCCESS'; payload: CommentDelete }
+  | { type: 'FETCH_FAILURE'; payload: string };
+
+const dataFetchReducer = (state: CommentDeleteState, action: Action): CommentDeleteState => {
+  switch (action.type) {
+    case 'FETCH_INIT':
+      return {
+        ...state,
+        isError: false,
+      };
+
+    case 'FETCH_SUCCESS':
+      return {
+        ...state,
+        isError: false,
+      };
+    case 'FETCH_FAILURE':
+      return {
+        ...state,
+        isError: true,
+      };
+    default:
+      return state;
+  }
+};
+
+interface DeleteComment {
+  caseId: string;
+  commentId: string;
+  fetchUserActions: () => void;
+  updateCase: (newCase: Case) => void;
+}
+
+export interface UseDeleteComment extends CommentDeleteState {
+  deleteComment: ({ caseId, commentId, fetchUserActions }: DeleteComment) => void;
+}
+
+export const useDeleteComment = (): UseDeleteComment => {
+  const [state, dispatch] = useReducer(dataFetchReducer, {
+    isError: false,
+  });
+  const toasts = useToasts();
+  const isCancelledRef = useRef(false);
+  const abortCtrlRef = useRef(new AbortController());
+
+  const dispatchDeleteComment = useCallback(
+    async ({ caseId, commentId, fetchUserActions, updateCase }: DeleteComment) => {
+      try {
+        isCancelledRef.current = false;
+        abortCtrlRef.current.abort();
+        abortCtrlRef.current = new AbortController();
+        dispatch({ type: 'FETCH_INIT', payload: commentId });
+
+        await deleteComment({
+          caseId,
+          commentId,
+          signal: abortCtrlRef.current.signal,
+        });
+
+        if (!isCancelledRef.current) {
+          const theCase = await getCase(caseId, true, abortCtrlRef.current.signal);
+          updateCase(theCase);
+          fetchUserActions();
+          dispatch({ type: 'FETCH_SUCCESS', payload: { commentId } });
+        }
+      } catch (error) {
+        if (!isCancelledRef.current) {
+          if (error.name !== 'AbortError') {
+            toasts.addError(
+              error.body && error.body.message ? new Error(error.body.message) : error,
+              { title: i18n.ERROR_TITLE }
+            );
+          }
+          dispatch({ type: 'FETCH_FAILURE', payload: commentId });
+        }
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  useEffect(
+    () => () => {
+      isCancelledRef.current = true;
+      abortCtrlRef.current.abort();
+    },
+    []
+  );
+
+  return { ...state, deleteComment: dispatchDeleteComment };
+};
diff --git a/x-pack/plugins/cases/public/containers/use_messages_storage.tsx b/x-pack/plugins/cases/public/containers/use_messages_storage.tsx
index 2a590d29340e4..2f6e9fd107780 100644
--- a/x-pack/plugins/cases/public/containers/use_messages_storage.tsx
+++ b/x-pack/plugins/cases/public/containers/use_messages_storage.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback, useMemo } from 'react';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 export interface UseMessagesStorage {
   getMessages: (plugin: string) => string[];
diff --git a/x-pack/plugins/cases/public/containers/utils.ts b/x-pack/plugins/cases/public/containers/utils.ts
index 303600fdb3398..cd1682c0cd988 100644
--- a/x-pack/plugins/cases/public/containers/utils.ts
+++ b/x-pack/plugins/cases/public/containers/utils.ts
@@ -11,7 +11,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { ToastInputFields } from 'kibana/public';
+import { ToastInputFields } from '@kbn/core/public';
 import {
   CasesFindResponse,
   CasesFindResponseRt,
diff --git a/x-pack/plugins/cases/public/index.tsx b/x-pack/plugins/cases/public/index.tsx
index f81cb1d0a57cd..e267960d91a80 100644
--- a/x-pack/plugins/cases/public/index.tsx
+++ b/x-pack/plugins/cases/public/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { CasesUiPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/cases/public/plugin.ts b/x-pack/plugins/cases/public/plugin.ts
index 7ae68ee141d6e..3b124f920e889 100644
--- a/x-pack/plugins/cases/public/plugin.ts
+++ b/x-pack/plugins/cases/public/plugin.ts
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { CasesUiStart, CasesPluginSetup, CasesPluginStart } from './types';
 import { KibanaServices } from './common/lib/kibana';
 import { CasesUiConfigType } from '../common/ui/types';
 import { APP_ID, APP_PATH } from '../common/constants';
 import { APP_TITLE, APP_DESC } from './common/translations';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import { ManagementAppMountParams } from '../../../../src/plugins/management/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
 import { useCasesAddToExistingCaseModal } from './components/all_cases/selector_modal/use_cases_add_to_existing_case_modal';
 import { useCasesAddToNewCaseFlyout } from './components/create/flyout/use_cases_add_to_new_case_flyout';
 import { createClientAPI } from './client/api';
@@ -51,7 +50,7 @@ export class CasesUiPlugin
         icon: 'watchesApp',
         path: APP_PATH,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/x-pack/plugins/cases/public/types.ts b/x-pack/plugins/cases/public/types.ts
index 63c767f412456..65cc1de25d345 100644
--- a/x-pack/plugins/cases/public/types.ts
+++ b/x-pack/plugins/cases/public/types.ts
@@ -5,21 +5,18 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { ReactElement, ReactNode } from 'react';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import {
-  ManagementSetup,
-  ManagementAppMountParams,
-} from '../../../../src/plugins/management/public';
-import { FeaturesPluginStart } from '../..//features/public';
-import type { LensPublicStart } from '../../lens/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import type { SpacesPluginStart } from '../../spaces/public';
-import type { TriggersAndActionsUIPublicPluginStart as TriggersActionsStart } from '../../triggers_actions_ui/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ManagementSetup, ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart as TriggersActionsStart } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   CasesByAlertId,
   CasesByAlertIDRequest,
diff --git a/x-pack/plugins/cases/server/authorization/audit_logger.test.ts b/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
index 3c465a6f843c0..d06881b8c230d 100644
--- a/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
+++ b/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { auditLoggerMock } from '../../../../plugins/security/server/audit/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { Operations } from '.';
 import { AuthorizationAuditLogger } from './audit_logger';
 import { ReadOperations } from './types';
diff --git a/x-pack/plugins/cases/server/authorization/audit_logger.ts b/x-pack/plugins/cases/server/authorization/audit_logger.ts
index a59dfaaa4dabe..09dd5771c4a11 100644
--- a/x-pack/plugins/cases/server/authorization/audit_logger.ts
+++ b/x-pack/plugins/cases/server/authorization/audit_logger.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
+import { AuditEvent, AuditLogger } from '@kbn/security-plugin/server';
 import { DATABASE_CATEGORY, ECS_OUTCOMES, isWriteOperation, OperationDetails } from '.';
-import { AuditEvent, AuditLogger } from '../../../security/server';
 import { OwnerEntity } from './types';
 
 interface CreateAuditMsgParams {
diff --git a/x-pack/plugins/cases/server/authorization/authorization.test.ts b/x-pack/plugins/cases/server/authorization/authorization.test.ts
index 650119bab0079..7f7d4ea801555 100644
--- a/x-pack/plugins/cases/server/authorization/authorization.test.ts
+++ b/x-pack/plugins/cases/server/authorization/authorization.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { securityMock } from '../../../../plugins/security/server/mocks';
-import { httpServerMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
-import { featuresPluginMock } from '../../../../plugins/features/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { Authorization, Operations } from '.';
-import { Space } from '../../../spaces/server';
+import { Space } from '@kbn/spaces-plugin/server';
 import { AuthorizationAuditLogger } from './audit_logger';
-import { KibanaRequest } from 'kibana/server';
-import { KibanaFeature } from '../../../../plugins/features/common';
-import { AuditLogger, SecurityPluginStart } from '../../../security/server';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { AuditLogger, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
 
 describe('authorization', () => {
   let request: KibanaRequest;
diff --git a/x-pack/plugins/cases/server/authorization/authorization.ts b/x-pack/plugins/cases/server/authorization/authorization.ts
index 453d5c5783f8c..f2bcc1308ea33 100644
--- a/x-pack/plugins/cases/server/authorization/authorization.ts
+++ b/x-pack/plugins/cases/server/authorization/authorization.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'kibana/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import Boom from '@hapi/boom';
-import { SecurityPluginStart } from '../../../security/server';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
 import { AuthFilterHelpers, GetSpaceFn, OwnerEntity } from './types';
 import { getOwnersFilter } from './utils';
 import { AuthorizationAuditLogger, OperationDetails } from '.';
diff --git a/x-pack/plugins/cases/server/authorization/index.ts b/x-pack/plugins/cases/server/authorization/index.ts
index 0239aad4a4424..cd3ceebf02f92 100644
--- a/x-pack/plugins/cases/server/authorization/index.ts
+++ b/x-pack/plugins/cases/server/authorization/index.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { EcsEventCategory, EcsEventOutcome, EcsEventType } from 'kibana/server';
+import { EcsEventCategory, EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { CasesSupportedOperations } from '@kbn/security-plugin/server';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_CONFIGURE_SAVED_OBJECT,
@@ -13,7 +14,6 @@ import {
   CASE_USER_ACTION_SAVED_OBJECT,
 } from '../../common/constants';
 import { Verbs, ReadOperations, WriteOperations, OperationDetails } from './types';
-import { CasesSupportedOperations } from '../../../security/server';
 
 export * from './authorization';
 export * from './audit_logger';
diff --git a/x-pack/plugins/cases/server/authorization/types.ts b/x-pack/plugins/cases/server/authorization/types.ts
index 2c9a5959f0965..8c672ffb9d245 100644
--- a/x-pack/plugins/cases/server/authorization/types.ts
+++ b/x-pack/plugins/cases/server/authorization/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { EcsEventType, KibanaRequest } from 'kibana/server';
+import { EcsEventType, KibanaRequest } from '@kbn/core/server';
 import type { KueryNode } from '@kbn/es-query';
-import { Space } from '../../../spaces/server';
-import { CasesSupportedOperations } from '../../../security/server';
+import { Space } from '@kbn/spaces-plugin/server';
+import { CasesSupportedOperations } from '@kbn/security-plugin/server';
 
 /**
  * The tenses for describing the action performed by a API route
diff --git a/x-pack/plugins/cases/server/client/attachments/add.ts b/x-pack/plugins/cases/server/client/attachments/add.ts
index b503c79e3f362..2c58845ec6d57 100644
--- a/x-pack/plugins/cases/server/client/attachments/add.ts
+++ b/x-pack/plugins/cases/server/client/attachments/add.ts
@@ -10,7 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsUtils } from '../../../../../../src/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 import { CaseResponse, CommentRequest, CommentRequestRt, throwErrors } from '../../../common/api';
 
diff --git a/x-pack/plugins/cases/server/client/attachments/bulk_create.ts b/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
new file mode 100644
index 0000000000000..efd6fa833c9e4
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import Boom from '@hapi/boom';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+
+import { SavedObjectsUtils } from '@kbn/core/server';
+
+import {
+  BulkCreateCommentRequest,
+  BulkCreateCommentRequestRt,
+  CaseResponse,
+  CommentRequest,
+  throwErrors,
+} from '../../../common/api';
+
+import { CaseCommentModel } from '../../common/models';
+import { createCaseError } from '../../common/error';
+import { CasesClientArgs } from '..';
+
+import { decodeCommentRequest } from '../utils';
+import { Operations, OwnerEntity } from '../../authorization';
+
+export interface BulkCreateArgs {
+  caseId: string;
+  attachments: BulkCreateCommentRequest;
+}
+
+/**
+ * Create an attachment to a case.
+ *
+ * @ignore
+ */
+export const bulkCreate = async (
+  args: BulkCreateArgs,
+  clientArgs: CasesClientArgs
+): Promise<CaseResponse> => {
+  const { attachments, caseId } = args;
+
+  pipe(
+    BulkCreateCommentRequestRt.decode(attachments),
+    fold(throwErrors(Boom.badRequest), identity)
+  );
+
+  attachments.forEach((attachment) => {
+    decodeCommentRequest(attachment);
+  });
+
+  const { logger, authorization } = clientArgs;
+
+  try {
+    const [attachmentsWithIds, entities]: [Array<{ id: string } & CommentRequest>, OwnerEntity[]] =
+      attachments.reduce<[Array<{ id: string } & CommentRequest>, OwnerEntity[]]>(
+        ([a, e], attachment) => {
+          const savedObjectID = SavedObjectsUtils.generateId();
+          return [
+            [...a, { id: savedObjectID, ...attachment }],
+            [...e, { owner: attachment.owner, id: savedObjectID }],
+          ];
+        },
+        [[], []]
+      );
+
+    await authorization.ensureAuthorized({
+      operation: Operations.createComment,
+      entities,
+    });
+
+    const model = await CaseCommentModel.create(caseId, clientArgs);
+    const updatedModel = await model.bulkCreate({
+      attachments: attachmentsWithIds,
+    });
+
+    return await updatedModel.encodeWithComments();
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed while bulk creating attachment to case id: ${caseId} error: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
diff --git a/x-pack/plugins/cases/server/client/attachments/client.ts b/x-pack/plugins/cases/server/client/attachments/client.ts
index ab77ae3f01836..63b039890aff9 100644
--- a/x-pack/plugins/cases/server/client/attachments/client.ts
+++ b/x-pack/plugins/cases/server/client/attachments/client.ts
@@ -12,6 +12,7 @@ import { CasesClientInternal } from '../client_internal';
 import { IAllCommentsResponse, ICaseResponse, ICommentsResponse } from '../typedoc_interfaces';
 import { CasesClientArgs } from '../types';
 import { AddArgs, addComment } from './add';
+import { bulkCreate, BulkCreateArgs } from './bulk_create';
 import { DeleteAllArgs, deleteAll, DeleteArgs, deleteComment } from './delete';
 import {
   find,
@@ -33,6 +34,7 @@ export interface AttachmentsSubClient {
    * Adds an attachment to a case.
    */
   add(params: AddArgs): Promise<ICaseResponse>;
+  bulkCreate(params: BulkCreateArgs): Promise<ICaseResponse>;
   /**
    * Deletes all attachments associated with a single case.
    */
@@ -77,6 +79,7 @@ export const createAttachmentsSubClient = (
 ): AttachmentsSubClient => {
   const attachmentSubClient: AttachmentsSubClient = {
     add: (params: AddArgs) => addComment(params, clientArgs),
+    bulkCreate: (params: BulkCreateArgs) => bulkCreate(params, clientArgs),
     deleteAll: (deleteAllArgs: DeleteAllArgs) => deleteAll(deleteAllArgs, clientArgs),
     delete: (deleteArgs: DeleteArgs) => deleteComment(deleteArgs, clientArgs),
     find: (findArgs: FindArgs) => find(findArgs, clientArgs),
diff --git a/x-pack/plugins/cases/server/client/attachments/delete.ts b/x-pack/plugins/cases/server/client/attachments/delete.ts
index 6071570029d63..68852dd1edea8 100644
--- a/x-pack/plugins/cases/server/client/attachments/delete.ts
+++ b/x-pack/plugins/cases/server/client/attachments/delete.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import pMap from 'p-map';
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { Actions, ActionTypes, CommentAttributes } from '../../../common/api';
 import { CASE_SAVED_OBJECT, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
 import { CasesClientArgs } from '../types';
diff --git a/x-pack/plugins/cases/server/client/attachments/get.ts b/x-pack/plugins/cases/server/client/attachments/get.ts
index 6e9e924fbee30..8f31c745d2657 100644
--- a/x-pack/plugins/cases/server/client/attachments/get.ts
+++ b/x-pack/plugins/cases/server/client/attachments/get.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 import {
   AlertResponse,
diff --git a/x-pack/plugins/cases/server/client/cases/create.ts b/x-pack/plugins/cases/server/client/cases/create.ts
index 23b295602c213..ab9f6a4305800 100644
--- a/x-pack/plugins/cases/server/client/cases/create.ts
+++ b/x-pack/plugins/cases/server/client/cases/create.ts
@@ -10,7 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsUtils } from '../../../../../../src/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 import {
   throwErrors,
diff --git a/x-pack/plugins/cases/server/client/cases/delete.ts b/x-pack/plugins/cases/server/client/cases/delete.ts
index 8d0a97079f1cc..3e3f70433a624 100644
--- a/x-pack/plugins/cases/server/client/cases/delete.ts
+++ b/x-pack/plugins/cases/server/client/cases/delete.ts
@@ -7,7 +7,7 @@
 
 import pMap from 'p-map';
 import { Boom } from '@hapi/boom';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { CommentAttributes } from '../../../common/api';
 import { MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
 import { CasesClientArgs } from '..';
diff --git a/x-pack/plugins/cases/server/client/cases/get.ts b/x-pack/plugins/cases/server/client/cases/get.ts
index 76f0667023e54..a26b01d8cd211 100644
--- a/x-pack/plugins/cases/server/client/cases/get.ts
+++ b/x-pack/plugins/cases/server/client/cases/get.ts
@@ -9,7 +9,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObject, SavedObjectsResolveResponse } from 'kibana/server';
+import { SavedObject, SavedObjectsResolveResponse } from '@kbn/core/server';
 import {
   CaseResponseRt,
   CaseResponse,
diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
index b19a5ebdb0e5c..42fe71f902a72 100644
--- a/x-pack/plugins/cases/server/client/cases/push.ts
+++ b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { nodeBuilder } from '@kbn/es-query';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 
 import {
   ActionConnector,
diff --git a/x-pack/plugins/cases/server/client/cases/types.ts b/x-pack/plugins/cases/server/client/cases/types.ts
index f1d56e7132bd1..7a9abe061d8cd 100644
--- a/x-pack/plugins/cases/server/client/cases/types.ts
+++ b/x-pack/plugins/cases/server/client/cases/types.ts
@@ -9,16 +9,16 @@
 import {
   PushToServiceApiParams as JiraPushToServiceApiParams,
   Incident as JiraIncident,
-} from '../../../../actions/server/builtin_action_types/jira/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/jira/types';
 import {
   PushToServiceApiParams as ResilientPushToServiceApiParams,
   Incident as ResilientIncident,
-} from '../../../../actions/server/builtin_action_types/resilient/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/resilient/types';
 import {
   PushToServiceApiParamsITSM as ServiceNowITSMPushToServiceApiParams,
   PushToServiceApiParamsSIR as ServiceNowSIRPushToServiceApiParams,
   ServiceNowITSMIncident,
-} from '../../../../actions/server/builtin_action_types/servicenow/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/servicenow/types';
 import { CaseResponse, ConnectorMappingsAttributes } from '../../../common/api';
 
 export type Incident = JiraIncident | ResilientIncident | ServiceNowITSMIncident;
diff --git a/x-pack/plugins/cases/server/client/cases/update.ts b/x-pack/plugins/cases/server/client/cases/update.ts
index 184810098bde4..ae53cb03c28a7 100644
--- a/x-pack/plugins/cases/server/client/cases/update.ts
+++ b/x-pack/plugins/cases/server/client/cases/update.ts
@@ -15,7 +15,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsFindResult,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { nodeBuilder } from '@kbn/es-query';
 
diff --git a/x-pack/plugins/cases/server/client/cases/utils.test.ts b/x-pack/plugins/cases/server/client/cases/utils.test.ts
index 664509ba6b03e..3dca8014957da 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { actionsClientMock } from '../../../../actions/server/actions_client.mock';
+import { actionsClientMock } from '@kbn/actions-plugin/server/actions_client.mock';
 import { mockCases } from '../../routes/api/__fixtures__';
 
 import { BasicParams, ExternalServiceParams, Incident } from './types';
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index 4c7e444c114ac..42a9a54466906 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { flow } from 'lodash';
+import { ActionsClient } from '@kbn/actions-plugin/server';
 import { isPushedUserAction } from '../../../common/utils/user_actions';
 import {
   ActionConnector,
@@ -23,8 +24,7 @@ import {
   CommentRequestActionsType,
   ActionTypes,
 } from '../../../common/api';
-import { ActionsClient } from '../../../../actions/server';
-import { CasesClientGetAlertsResponse } from '../../client/alerts/types';
+import { CasesClientGetAlertsResponse } from '../alerts/types';
 import {
   BasicParams,
   EntityInformation,
diff --git a/x-pack/plugins/cases/server/client/configure/client.test.ts b/x-pack/plugins/cases/server/client/configure/client.test.ts
index 971748bd8295a..fa3f2b3f987f1 100644
--- a/x-pack/plugins/cases/server/client/configure/client.test.ts
+++ b/x-pack/plugins/cases/server/client/configure/client.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { CasesClientArgs } from '../types';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getConnectors } from './client';
-import { actionsClientMock } from '../../../../actions/server/mocks';
-import { ActionType } from '../../../../actions/common/types';
+import { actionsClientMock } from '@kbn/actions-plugin/server/mocks';
+import { ActionType } from '@kbn/actions-plugin/common/types';
 
 describe('client', () => {
   describe('getConnectors', () => {
diff --git a/x-pack/plugins/cases/server/client/configure/client.ts b/x-pack/plugins/cases/server/client/configure/client.ts
index 831fe273af92e..c4b07019627e4 100644
--- a/x-pack/plugins/cases/server/client/configure/client.ts
+++ b/x-pack/plugins/cases/server/client/configure/client.ts
@@ -11,11 +11,10 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import {
-  SavedObject,
-  SavedObjectsFindResponse,
-  SavedObjectsUtils,
-} from '../../../../../../src/core/server';
+import { SavedObject, SavedObjectsFindResponse, SavedObjectsUtils } from '@kbn/core/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { FindActionResult } from '@kbn/actions-plugin/server/types';
+import { ActionType } from '@kbn/actions-plugin/common';
 import {
   CaseConfigurationsResponseRt,
   CaseConfigureResponseRt,
@@ -38,9 +37,6 @@ import { CasesClientInternal } from '../client_internal';
 import { CasesClientArgs } from '../types';
 import { getMappings } from './get_mappings';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FindActionResult } from '../../../../actions/server/types';
-import { ActionType } from '../../../../actions/common';
 import { Operations } from '../../authorization';
 import { combineAuthorizedAndOwnerFilter } from '../utils';
 import { MappingsArgs, CreateMappingsArgs, UpdateMappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/configure/create_mappings.ts b/x-pack/plugins/cases/server/client/configure/create_mappings.ts
index bb4c32ae57071..52f00453ef0ec 100644
--- a/x-pack/plugins/cases/server/client/configure/create_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/create_mappings.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorMappingsAttributes } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import { createCaseError } from '../../common/error';
 import { CasesClientArgs } from '..';
 import { CreateMappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/configure/get_mappings.ts b/x-pack/plugins/cases/server/client/configure/get_mappings.ts
index 2fa0e8454bacf..2a3f151156f8b 100644
--- a/x-pack/plugins/cases/server/client/configure/get_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/get_mappings.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorMappings } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import { createCaseError } from '../../common/error';
 import { CasesClientArgs } from '..';
 import { MappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/configure/update_mappings.ts b/x-pack/plugins/cases/server/client/configure/update_mappings.ts
index 3d529e51e7561..490ec69cc5a26 100644
--- a/x-pack/plugins/cases/server/client/configure/update_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/update_mappings.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorMappingsAttributes } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import { createCaseError } from '../../common/error';
 import { CasesClientArgs } from '..';
 import { UpdateMappingsArgs } from './types';
diff --git a/x-pack/plugins/cases/server/client/factory.ts b/x-pack/plugins/cases/server/client/factory.ts
index da43d6864f156..238799cf3e6e1 100644
--- a/x-pack/plugins/cases/server/client/factory.ts
+++ b/x-pack/plugins/cases/server/client/factory.ts
@@ -10,8 +10,11 @@ import {
   SavedObjectsServiceStart,
   Logger,
   ElasticsearchClient,
-} from 'kibana/server';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../../security/server';
+} from '@kbn/core/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as FeaturesPluginStart } from '@kbn/features-plugin/server';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { SAVED_OBJECT_TYPES } from '../../common/constants';
 import { Authorization } from '../authorization/authorization';
 import { GetSpaceFn } from '../authorization/types';
@@ -23,9 +26,6 @@ import {
   AttachmentService,
   AlertService,
 } from '../services';
-import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
-import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
-import { LensServerPluginSetup } from '../../../lens/server';
 
 import { AuthorizationAuditLogger } from '../authorization';
 import { CasesClient, createCasesClient } from '.';
diff --git a/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts b/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
index 239277259539e..8616196088884 100644
--- a/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
@@ -8,7 +8,7 @@
 import { CaseResponse } from '../../../../common/api';
 import { createCasesClientMock } from '../../mocks';
 import { CasesClientArgs } from '../../types';
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createAttachmentServiceMock } from '../../../services/mocks';
 
 import { Actions } from './actions';
diff --git a/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts b/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts
index 529590bfbc7dc..6f8a7b284d1eb 100644
--- a/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/alerts/details.test.ts
@@ -7,7 +7,7 @@
 
 import { CasesClientMock, createCasesClientMock } from '../../mocks';
 import { CasesClientArgs } from '../../types';
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { AlertDetails } from './details';
 import { mockAlertsService } from '../test_utils/alerts';
diff --git a/x-pack/plugins/cases/server/client/metrics/connectors.test.ts b/x-pack/plugins/cases/server/client/metrics/connectors.test.ts
index 0b15b94525b02..c0bcdbdda8964 100644
--- a/x-pack/plugins/cases/server/client/metrics/connectors.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/connectors.test.ts
@@ -7,7 +7,7 @@
 
 import { createCasesClientMock } from '../mocks';
 import { CasesClientArgs } from '../types';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createUserActionServiceMock } from '../../services/mocks';
 import { Connectors } from './connectors';
 
diff --git a/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts b/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
index 11c158835e9fb..03b03eafa7d97 100644
--- a/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
@@ -10,13 +10,13 @@ import { CaseAttributes, CaseResponse, CaseStatuses } from '../../../common/api'
 import { CasesClientMock, createCasesClientMock } from '../mocks';
 import { CasesClientArgs } from '../types';
 import { createAuthorizationMock } from '../../authorization/mock';
-import { loggingSystemMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   createAttachmentServiceMock,
   createCaseServiceMock,
   createUserActionServiceMock,
 } from '../../services/mocks';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { mockAlertsService } from './test_utils/alerts';
 import { createStatusChangeSavedObject } from './test_utils/lifespan';
 
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
index 61b6c2ff3d1bd..efb9062bfdfe0 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { CaseStatuses, CaseUserActionResponse } from '../../../common/api';
 import { getStatusInfo } from './lifespan';
 
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
index 2f00393f8636b..6198886036471 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import {
   CaseMetricsResponse,
   CaseStatuses,
diff --git a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
index 07b4248315435..2e5176b6f21a6 100644
--- a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { CaseStatuses, CaseUserActionResponse } from '../../../../common/api';
 
 export function createStatusChangeSavedObject(
diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
index ecedc7cb05071..6ad4663f1e5ea 100644
--- a/x-pack/plugins/cases/server/client/mocks.ts
+++ b/x-pack/plugins/cases/server/client/mocks.ts
@@ -46,6 +46,7 @@ type AttachmentsSubClientMock = jest.Mocked<AttachmentsSubClient>;
 const createAttachmentsSubClientMock = (): AttachmentsSubClientMock => {
   return {
     add: jest.fn(),
+    bulkCreate: jest.fn(),
     deleteAll: jest.fn(),
     delete: jest.fn(),
     find: jest.fn(),
diff --git a/x-pack/plugins/cases/server/client/types.ts b/x-pack/plugins/cases/server/client/types.ts
index e3d7b8a541b9d..d071e72099bf9 100644
--- a/x-pack/plugins/cases/server/client/types.ts
+++ b/x-pack/plugins/cases/server/client/types.ts
@@ -6,7 +6,9 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { SavedObjectsClientContract, Logger } from '@kbn/core/server';
+import { ActionsClient } from '@kbn/actions-plugin/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { User } from '../../common/api';
 import { Authorization } from '../authorization/authorization';
 import {
@@ -17,8 +19,6 @@ import {
   AttachmentService,
   AlertService,
 } from '../services';
-import { ActionsClient } from '../../../actions/server';
-import { LensServerPluginSetup } from '../../../lens/server';
 
 /**
  * Parameters for initializing a cases client
diff --git a/x-pack/plugins/cases/server/client/user_actions/get.ts b/x-pack/plugins/cases/server/client/user_actions/get.ts
index 9b10d9df2b9a6..1385ea6106e4b 100644
--- a/x-pack/plugins/cases/server/client/user_actions/get.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/get.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import {
   CaseUserActionsResponse,
   CaseUserActionsResponseRt,
diff --git a/x-pack/plugins/cases/server/common/error.ts b/x-pack/plugins/cases/server/common/error.ts
index 3478131f65537..e994d249e858b 100644
--- a/x-pack/plugins/cases/server/common/error.ts
+++ b/x-pack/plugins/cases/server/common/error.ts
@@ -6,7 +6,7 @@
  */
 
 import { Boom, isBoom } from '@hapi/boom';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 export interface HTTPError extends Error {
   statusCode: number;
diff --git a/x-pack/plugins/cases/server/common/models/case_with_comments.ts b/x-pack/plugins/cases/server/common/models/case_with_comments.ts
index 14c0b6aec5eac..97d896ba08056 100644
--- a/x-pack/plugins/cases/server/common/models/case_with_comments.ts
+++ b/x-pack/plugins/cases/server/common/models/case_with_comments.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectReference,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   CaseResponse,
   CaseResponseRt,
@@ -24,8 +24,13 @@ import {
   CaseAttributes,
   ActionTypes,
   Actions,
+  CommentRequestAlertType,
 } from '../../../common/api';
-import { CASE_SAVED_OBJECT, MAX_DOCS_PER_PAGE } from '../../../common/constants';
+import {
+  CASE_SAVED_OBJECT,
+  MAX_ALERTS_PER_CASE,
+  MAX_DOCS_PER_PAGE,
+} from '../../../common/constants';
 import { CasesClientArgs } from '../../client';
 import { createCaseError } from '../error';
 import {
@@ -34,9 +39,11 @@ import {
   transformNewComment,
   getOrUpdateLensReferences,
   createAlertUpdateRequest,
+  isCommentRequestTypeAlert,
 } from '../utils';
 
 type CaseCommentModelParams = Omit<CasesClientArgs, 'authorization'>;
+const ALERT_LIMIT_MSG = `Case has already reach the maximum allowed number (${MAX_ALERTS_PER_CASE}) of attached alerts on a case`;
 
 /**
  * This class represents a case that can have a comment attached to it.
@@ -188,17 +195,9 @@ export class CaseCommentModel {
     id: string;
   }): Promise<CaseCommentModel> {
     try {
-      this.validateCreateCommentRequest(commentReq);
+      await this.validateCreateCommentRequest([commentReq]);
 
-      let references = this.buildRefsToCase();
-
-      if (commentReq.type === CommentType.user && commentReq?.comment) {
-        const commentStringReferences = getOrUpdateLensReferences(
-          this.params.lensEmbeddableFactory,
-          commentReq.comment
-        );
-        references = [...references, ...commentStringReferences];
-      }
+      const references = [...this.buildRefsToCase(), ...this.getCommentReferences(commentReq)];
 
       const [comment, commentableCase] = await Promise.all([
         this.params.attachmentService.create({
@@ -215,7 +214,7 @@ export class CaseCommentModel {
       ]);
 
       await Promise.all([
-        commentableCase.handleAlertComments(comment, commentReq),
+        commentableCase.handleAlertComments([commentReq]),
         this.createCommentUserAction(comment, commentReq),
       ]);
 
@@ -229,14 +228,48 @@ export class CaseCommentModel {
     }
   }
 
-  private validateCreateCommentRequest(req: CommentRequest) {
-    if (req.type === CommentType.alert && this.caseInfo.attributes.status === CaseStatuses.closed) {
+  private async validateCreateCommentRequest(req: CommentRequest[]) {
+    const totalAlertsInReq = req
+      .filter<CommentRequestAlertType>(isCommentRequestTypeAlert)
+      .reduce((count, attachment) => {
+        const ids = Array.isArray(attachment.alertId) ? attachment.alertId : [attachment.alertId];
+        return count + ids.length;
+      }, 0);
+
+    const reqHasAlerts = totalAlertsInReq > 0;
+
+    if (reqHasAlerts && this.caseInfo.attributes.status === CaseStatuses.closed) {
       throw Boom.badRequest('Alert cannot be attached to a closed case');
     }
 
-    if (req.owner !== this.caseInfo.attributes.owner) {
+    if (req.some((attachment) => attachment.owner !== this.caseInfo.attributes.owner)) {
       throw Boom.badRequest('The owner field of the comment must match the case');
     }
+
+    if (reqHasAlerts) {
+      /**
+       * This check is for optimization reasons.
+       * It saves one aggregation if the total number
+       * of alerts of the request is already greater than
+       * MAX_ALERTS_PER_CASE
+       */
+      if (totalAlertsInReq > MAX_ALERTS_PER_CASE) {
+        throw Boom.badRequest(ALERT_LIMIT_MSG);
+      }
+
+      await this.validateAlertsLimitOnCase(totalAlertsInReq);
+    }
+  }
+
+  private async validateAlertsLimitOnCase(totalAlertsInReq: number) {
+    const alertsValueCount = await this.params.attachmentService.valueCountAlertsAttachedToCase({
+      unsecuredSavedObjectsClient: this.params.unsecuredSavedObjectsClient,
+      caseId: this.caseInfo.id,
+    });
+
+    if (alertsValueCount + totalAlertsInReq > MAX_ALERTS_PER_CASE) {
+      throw Boom.badRequest(ALERT_LIMIT_MSG);
+    }
   }
 
   private buildRefsToCase(): SavedObjectReference[] {
@@ -249,20 +282,38 @@ export class CaseCommentModel {
     ];
   }
 
-  private async handleAlertComments(comment: SavedObject<CommentAttributes>, req: CommentRequest) {
-    if (
-      comment.attributes.type === CommentType.alert &&
-      this.caseInfo.attributes.settings.syncAlerts
-    ) {
-      await this.updateAlertsStatus(req);
+  private getCommentReferences(commentReq: CommentRequest) {
+    let references: SavedObjectReference[] = [];
+
+    if (commentReq.type === CommentType.user && commentReq?.comment) {
+      const commentStringReferences = getOrUpdateLensReferences(
+        this.params.lensEmbeddableFactory,
+        commentReq.comment
+      );
+      references = [...references, ...commentStringReferences];
     }
+
+    return references;
   }
 
-  private async updateAlertsStatus(req: CommentRequest) {
-    const alertsToUpdate = createAlertUpdateRequest({
-      comment: req,
-      status: this.caseInfo.attributes.status,
-    });
+  private async handleAlertComments(attachments: CommentRequest[]) {
+    const alerts = attachments.filter(
+      (attachment) =>
+        attachment.type === CommentType.alert && this.caseInfo.attributes.settings.syncAlerts
+    );
+
+    await this.updateAlertsStatus(alerts);
+  }
+
+  private async updateAlertsStatus(alerts: CommentRequest[]) {
+    const alertsToUpdate = alerts
+      .map((alert) =>
+        createAlertUpdateRequest({
+          comment: alert,
+          status: this.caseInfo.attributes.status,
+        })
+      )
+      .flat();
 
     await this.params.alertsService.updateAlertsStatus(alertsToUpdate);
   }
@@ -285,6 +336,19 @@ export class CaseCommentModel {
     });
   }
 
+  private async bulkCreateCommentUserAction(attachments: Array<{ id: string } & CommentRequest>) {
+    await this.params.userActionService.bulkCreateAttachmentCreation({
+      unsecuredSavedObjectsClient: this.params.unsecuredSavedObjectsClient,
+      caseId: this.caseInfo.id,
+      attachments: attachments.map(({ id, ...attachment }) => ({
+        id,
+        owner: attachment.owner,
+        attachment,
+      })),
+      user: this.params.user,
+    });
+  }
+
   private formatForEncoding(totalComment: number) {
     return {
       id: this.caseInfo.id,
@@ -322,4 +386,54 @@ export class CaseCommentModel {
       });
     }
   }
+  public async bulkCreate({
+    attachments,
+  }: {
+    attachments: Array<{ id: string } & CommentRequest>;
+  }): Promise<CaseCommentModel> {
+    try {
+      await this.validateCreateCommentRequest(attachments);
+
+      const caseReference = this.buildRefsToCase();
+
+      const [newlyCreatedAttachments, commentableCase] = await Promise.all([
+        this.params.attachmentService.bulkCreate({
+          unsecuredSavedObjectsClient: this.params.unsecuredSavedObjectsClient,
+          attachments: attachments.map(({ id, ...attachment }) => {
+            return {
+              attributes: transformNewComment({
+                createdDate: new Date().toISOString(),
+                ...attachment,
+                ...this.params.user,
+              }),
+              references: [...caseReference, ...this.getCommentReferences(attachment)],
+              id,
+            };
+          }),
+        }),
+        this.updateCaseUserAndDate(new Date().toISOString()),
+      ]);
+
+      const savedObjectsWithoutErrors = newlyCreatedAttachments.saved_objects.filter(
+        (attachment) => attachment.error == null
+      );
+
+      const attachmentsWithoutErrors = attachments.filter((attachment) =>
+        savedObjectsWithoutErrors.some((so) => so.id === attachment.id)
+      );
+
+      await Promise.all([
+        commentableCase.handleAlertComments(attachmentsWithoutErrors),
+        this.bulkCreateCommentUserAction(attachmentsWithoutErrors),
+      ]);
+
+      return commentableCase;
+    } catch (error) {
+      throw createCaseError({
+        message: `Failed bulk creating attachments on a commentable case, case id: ${this.caseInfo.id}: ${error}`,
+        error,
+        logger: this.params.logger,
+      });
+    }
+  }
 }
diff --git a/x-pack/plugins/cases/server/common/utils.test.ts b/x-pack/plugins/cases/server/common/utils.test.ts
index 0479dc73ff6b6..47af4b11a0a96 100644
--- a/x-pack/plugins/cases/server/common/utils.test.ts
+++ b/x-pack/plugins/cases/server/common/utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsFindResponse } from 'kibana/server';
-import { makeLensEmbeddableFactory } from '../../../lens/server/embeddable/make_lens_embeddable_factory';
+import { SavedObject, SavedObjectsFindResponse } from '@kbn/core/server';
+import { makeLensEmbeddableFactory } from '@kbn/lens-plugin/server/embeddable/make_lens_embeddable_factory';
 import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
 import {
   CaseResponse,
diff --git a/x-pack/plugins/cases/server/common/utils.ts b/x-pack/plugins/cases/server/common/utils.ts
index 8bbf247b24773..9385e83c948c9 100644
--- a/x-pack/plugins/cases/server/common/utils.ts
+++ b/x-pack/plugins/cases/server/common/utils.ts
@@ -10,10 +10,10 @@ import {
   SavedObjectsFindResponse,
   SavedObject,
   SavedObjectReference,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { flatMap, uniqWith, xorWith } from 'lodash';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { AlertInfo } from './types';
-import { LensServerPluginSetup } from '../../../lens/server';
 
 import {
   CaseAttributes,
diff --git a/x-pack/plugins/cases/server/connectors/types.ts b/x-pack/plugins/cases/server/connectors/types.ts
index 16f4efa3b1327..83dab22ec920f 100644
--- a/x-pack/plugins/cases/server/connectors/types.ts
+++ b/x-pack/plugins/cases/server/connectors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { CaseResponse, ConnectorMappingsAttributes } from '../../common/api';
 import { CasesClientGetAlertsResponse } from '../client/alerts/types';
 import { CasesClientFactory } from '../client/factory';
diff --git a/x-pack/plugins/cases/server/features.ts b/x-pack/plugins/cases/server/features.ts
index 33a3315b7d9d3..dabd3b37e5bb0 100644
--- a/x-pack/plugins/cases/server/features.ts
+++ b/x-pack/plugins/cases/server/features.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { KibanaFeatureConfig } from '../../features/common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 
 import { APP_ID, FEATURE_ID } from '../common/constants';
 
diff --git a/x-pack/plugins/cases/server/index.ts b/x-pack/plugins/cases/server/index.ts
index 765d21af8538c..ee8dc44d402ed 100644
--- a/x-pack/plugins/cases/server/index.ts
+++ b/x-pack/plugins/cases/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 export { CasesClient } from './client';
 import { ConfigType, ConfigSchema } from './config';
 import { CasePlugin } from './plugin';
diff --git a/x-pack/plugins/cases/server/plugin.ts b/x-pack/plugins/cases/server/plugin.ts
index 5eba2f75cdaaa..52d413cb1ef83 100644
--- a/x-pack/plugins/cases/server/plugin.ts
+++ b/x-pack/plugins/cases/server/plugin.ts
@@ -5,14 +5,31 @@
  * 2.0.
  */
 
-import { IContextProvider, KibanaRequest, Logger, PluginInitializerContext } from 'kibana/server';
-import { CoreSetup, CoreStart } from 'src/core/server';
-
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
+import {
+  CoreSetup,
+  CoreStart,
+  IContextProvider,
+  KibanaRequest,
+  Logger,
+  PluginInitializerContext,
+} from '@kbn/core/server';
+
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   PluginSetupContract as ActionsPluginSetup,
   PluginStartContract as ActionsPluginStart,
-} from '../../actions/server';
+} from '@kbn/actions-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import {
+  PluginStartContract as FeaturesPluginStart,
+  PluginSetupContract as FeaturesPluginSetup,
+} from '@kbn/features-plugin/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { APP_ID } from '../common/constants';
 
 import {
@@ -27,18 +44,11 @@ import {
 import { CasesClient } from './client';
 import type { CasesRequestHandlerContext } from './types';
 import { CasesClientFactory } from './client/factory';
-import { SpacesPluginStart } from '../../spaces/server';
-import {
-  PluginStartContract as FeaturesPluginStart,
-  PluginSetupContract as FeaturesPluginSetup,
-} from '../../features/server';
-import { LensServerPluginSetup } from '../../lens/server';
 import { getCasesKibanaFeature } from './features';
 import { registerRoutes } from './routes/api/register_routes';
 import { getExternalRoutes } from './routes/api/get_external_routes';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
 import { createCasesTelemetry, scheduleCasesTelemetryTask } from './telemetry';
+import { getInternalRoutes } from './routes/api/get_internal_routes';
 
 export interface PluginsSetup {
   actions: ActionsPluginSetup;
@@ -130,7 +140,7 @@ export class CasePlugin {
 
     registerRoutes({
       router,
-      routes: getExternalRoutes(),
+      routes: [...getExternalRoutes(), ...getInternalRoutes()],
       logger: this.logger,
       kibanaVersion: this.kibanaVersion,
       telemetryUsageCounter,
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts
index 3c6bec265e3ea..08c8cd44f4ad1 100644
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts
+++ b/x-pack/plugins/cases/server/routes/api/__fixtures__/authc_mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { AuthenticatedUser } from '../../../../../security/server';
-import { securityMock } from '../../../../../security/server/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { nullUser } from '../../../common/utils';
 
 function createAuthenticationMock({
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts
index a05c9e320d897..cf5de90f4f61f 100644
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts
+++ b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import {
   CaseAttributes,
   CaseStatuses,
diff --git a/x-pack/plugins/cases/server/routes/api/get_internal_routes.ts b/x-pack/plugins/cases/server/routes/api/get_internal_routes.ts
new file mode 100644
index 0000000000000..10d379c080abb
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/get_internal_routes.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { bulkCreateAttachmentsRoute } from './internal/bulk_create_attachments';
+import { CaseRoute } from './types';
+
+export const getInternalRoutes = () => [bulkCreateAttachmentsRoute] as CaseRoute[];
diff --git a/x-pack/plugins/cases/server/routes/api/internal/bulk_create_attachments.ts b/x-pack/plugins/cases/server/routes/api/internal/bulk_create_attachments.ts
new file mode 100644
index 0000000000000..1940cd442eb27
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/internal/bulk_create_attachments.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { INTERNAL_BULK_CREATE_ATTACHMENTS_URL } from '../../../../common/constants';
+import { BulkCreateCommentRequest } from '../../../../common/api';
+import { createCaseError } from '../../../common/error';
+import { createCasesRoute } from '../create_cases_route';
+import { escapeHatch } from '../utils';
+
+export const bulkCreateAttachmentsRoute = createCasesRoute({
+  method: 'post',
+  path: INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
+  params: {
+    params: schema.object({
+      case_id: schema.string(),
+    }),
+    body: schema.arrayOf(escapeHatch),
+  },
+  handler: async ({ context, request, response }) => {
+    try {
+      const casesClient = await context.cases.getCasesClient();
+      const caseId = request.params.case_id;
+      const attachments = request.body as BulkCreateCommentRequest;
+
+      return response.ok({
+        body: await casesClient.attachments.bulkCreate({ caseId, attachments }),
+      });
+    } catch (error) {
+      throw createCaseError({
+        message: `Failed to bulk create attachments in route case id: ${request.params.case_id}: ${error}`,
+        error,
+      });
+    }
+  },
+});
diff --git a/x-pack/plugins/cases/server/routes/api/register_routes.test.ts b/x-pack/plugins/cases/server/routes/api/register_routes.test.ts
index 4082ed3f6e6ae..07aa3fc70a75f 100644
--- a/x-pack/plugins/cases/server/routes/api/register_routes.test.ts
+++ b/x-pack/plugins/cases/server/routes/api/register_routes.test.ts
@@ -7,13 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
-import {
-  httpServerMock,
-  httpServiceMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 import { CasesRouter } from '../../types';
 import { createCasesRoute } from './create_cases_route';
diff --git a/x-pack/plugins/cases/server/routes/api/register_routes.ts b/x-pack/plugins/cases/server/routes/api/register_routes.ts
index a4545d82efef7..e46491ffad80a 100644
--- a/x-pack/plugins/cases/server/routes/api/register_routes.ts
+++ b/x-pack/plugins/cases/server/routes/api/register_routes.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Headers, RouteRegistrar } from 'kibana/server';
+import { Headers, RouteRegistrar } from '@kbn/core/server';
 import { CasesRequestHandlerContext } from '../../types';
 import { RegisterRoutesDeps } from './types';
 import {
diff --git a/x-pack/plugins/cases/server/routes/api/types.ts b/x-pack/plugins/cases/server/routes/api/types.ts
index ffa06526dc68c..d49861881d586 100644
--- a/x-pack/plugins/cases/server/routes/api/types.ts
+++ b/x-pack/plugins/cases/server/routes/api/types.ts
@@ -12,9 +12,9 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   RouteValidatorConfig,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type { CasesRequestHandlerContext, CasesRouter } from '../../types';
 
 type TelemetryUsageCounter = ReturnType<UsageCollectionSetup['createUsageCounter']>;
diff --git a/x-pack/plugins/cases/server/routes/api/utils.test.ts b/x-pack/plugins/cases/server/routes/api/utils.test.ts
index ec9dff072d359..d7415276d3e71 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.test.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { isBoom, boomify } from '@hapi/boom';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { HTTPError } from '../../common/error';
 import { extractWarningValueFromWarningHeader, logDeprecatedEndpoint, wrapError } from './utils';
 
diff --git a/x-pack/plugins/cases/server/routes/api/utils.ts b/x-pack/plugins/cases/server/routes/api/utils.ts
index 41fe1db9a7eb6..3e595e74f042d 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.ts
@@ -7,7 +7,7 @@
 
 import { Boom, boomify, isBoom } from '@hapi/boom';
 import { schema } from '@kbn/config-schema';
-import type { CustomHttpResponseOptions, ResponseError, Headers, Logger } from 'kibana/server';
+import type { CustomHttpResponseOptions, ResponseError, Headers, Logger } from '@kbn/core/server';
 import { CaseError, isCaseError, HTTPError, isHTTPError } from '../../common/error';
 
 /**
diff --git a/x-pack/plugins/cases/server/saved_object_types/cases.ts b/x-pack/plugins/cases/server/saved_object_types/cases.ts
index 31eadd9bd5142..441bd818189ae 100644
--- a/x-pack/plugins/cases/server/saved_object_types/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/cases.ts
@@ -11,7 +11,7 @@ import {
   SavedObject,
   SavedObjectsExportTransformContext,
   SavedObjectsType,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { CASE_SAVED_OBJECT } from '../../common/constants';
 import { ESCaseAttributes } from '../services/cases/types';
 import { handleExport } from './import_export/export';
diff --git a/x-pack/plugins/cases/server/saved_object_types/comments.ts b/x-pack/plugins/cases/server/saved_object_types/comments.ts
index 06a15fab14e43..8fe3c67d160a4 100644
--- a/x-pack/plugins/cases/server/saved_object_types/comments.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/comments.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_COMMENT_SAVED_OBJECT } from '../../common/constants';
 import { createCommentsMigrations, CreateCommentsMigrationsDeps } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/configure.ts b/x-pack/plugins/cases/server/saved_object_types/configure.ts
index c9303b848dc23..6dac42da7fb46 100644
--- a/x-pack/plugins/cases/server/saved_object_types/configure.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/configure.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_CONFIGURE_SAVED_OBJECT } from '../../common/constants';
 import { configureMigrations } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts b/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts
index b9bb275f080cf..a8d5ccf605158 100644
--- a/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../common/constants';
 import { connectorMappingsMigrations } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts b/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
index 54610e62e1eff..78710558793fc 100644
--- a/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
@@ -11,7 +11,7 @@ import {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsExportTransformContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { CaseUserActionAttributes, CommentAttributes } from '../../../common/api';
 import {
   CASE_COMMENT_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
index 2510a80e62b3a..bdc6b6ca18e64 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectSanitizedDoc } from 'kibana/server';
+import { SavedObjectSanitizedDoc } from '@kbn/core/server';
 import {
   CaseAttributes,
   CaseFullExternalService,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
index 7ab22781d77e6..eaa93a585015f 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
@@ -8,11 +8,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { cloneDeep, unset } from 'lodash';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { addOwnerToSO, SanitizedCaseOwner } from '.';
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../src/core/server';
 import { ESConnectorFields } from '../../services';
 import { ConnectorTypes } from '../../../common/api';
 import {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts
index 837a1e4f10d70..5dc48b3c1c92c 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.test.ts
@@ -19,18 +19,15 @@ import {
 } from '../../../common/utils/markdown_plugins/utils';
 import { CommentType } from '../../../common/api';
 
-import { savedObjectsServiceMock } from '../../../../../../src/core/server/mocks';
-import { makeLensEmbeddableFactory } from '../../../../lens/server/embeddable/make_lens_embeddable_factory';
-import { LensDocShape715 } from '../../../../lens/server';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
+import { makeLensEmbeddableFactory } from '@kbn/lens-plugin/server/embeddable/make_lens_embeddable_factory';
+import { LensDocShape715 } from '@kbn/lens-plugin/server';
 import {
   SavedObjectReference,
   SavedObjectsMigrationLogger,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/core/server';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
 import { GENERATED_ALERT, SUB_CASE_SAVED_OBJECT } from './constants';
 
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
index e30d138cc657f..be7306657f6b4 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
@@ -7,18 +7,15 @@
 
 import { mapValues, trimEnd, mergeWith, cloneDeep, unset } from 'lodash';
 import type { SerializableRecord } from '@kbn/utility-types';
-import {
-  MigrateFunction,
-  MigrateFunctionsObject,
-} from '../../../../../../src/plugins/kibana_utils/common';
+import { MigrateFunction, MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import {
   SavedObjectUnsanitizedDoc,
   SavedObjectSanitizedDoc,
   SavedObjectMigrationFn,
   SavedObjectMigrationMap,
   SavedObjectMigrationContext,
-} from '../../../../../../src/core/server';
-import { LensServerPluginSetup } from '../../../../lens/server';
+} from '@kbn/core/server';
+import { LensServerPluginSetup } from '@kbn/lens-plugin/server';
 import { CommentType } from '../../../common/api';
 import {
   isLensMarkdownNode,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
index 7d9189673079d..ac48732c07096 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectSanitizedDoc } from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { SavedObjectSanitizedDoc } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorTypes } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts
index f940069d33621..ebf0fc2dcfc19 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.ts
@@ -7,10 +7,7 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../src/core/server';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { ConnectorTypes } from '../../../common/api';
 import { addOwnerToSO, SanitizedCaseOwner } from '.';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts
index be656abb2d42c..e24bbdd424053 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/index.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../src/core/server';
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
 
 export { caseMigrations } from './cases';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts
index d4c60003782fd..4542cbc269683 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.test.ts
@@ -9,9 +9,9 @@ import {
   SavedObject,
   SavedObjectMigrationContext,
   SavedObjectsMigrationLogger,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { cloneDeep, omit, set } from 'lodash';
-import { migrationMocks } from 'src/core/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { removeRuleInformation } from './alerts';
 
 describe('alert user actions', () => {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts
index 8642c9b2af9ba..8c5ad2b254b60 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/alerts.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectMigrationContext,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { CommentRequestAlertType, CommentType } from '../../../../common/api';
 import { GENERATED_ALERT } from '../constants';
 import { logError } from '../utils';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts
index 15f3242b82a45..a26581721eee6 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.test.ts
@@ -12,8 +12,8 @@ import {
   SavedObjectSanitizedDoc,
   SavedObjectsMigrationLogger,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import {
   CASE_USER_ACTION_SAVED_OBJECT,
   SECURITY_SOLUTION_OWNER,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts
index 00261cd578239..c22b5f8c89479 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/connector_id.ts
@@ -14,7 +14,8 @@ import {
   SavedObjectReference,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import {
   CaseAttributes,
   CaseConnector,
@@ -27,7 +28,6 @@ import {
   PUSH_CONNECTOR_ID_REFERENCE_NAME,
 } from '../../../common/constants';
 import { getNoneCaseConnector } from '../../../common/utils';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../../actions/server';
 import { UserActionVersion800 } from './types';
 import { logError } from '../utils';
 import { USER_ACTION_OLD_ID_REF_NAME, USER_ACTION_OLD_PUSH_ID_REF_NAME } from './constants';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts
index d977e470a7fe3..eaabacf6ed93e 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/index.ts
@@ -7,11 +7,8 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
+import { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import { addOwnerToSO, SanitizedCaseOwner } from '..';
-import {
-  SavedObjectUnsanitizedDoc,
-  SavedObjectSanitizedDoc,
-} from '../../../../../../../src/core/server';
 
 import { ConnectorTypes } from '../../../../common/api';
 import { removeRuleInformation } from './alerts';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts
index 2b18eb48f9d0e..7ac7711b79db3 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { CommentType } from '../../../../common/api';
 import {
   CASE_USER_ACTION_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts
index 0c2974a73a129..0a04c858e7d4d 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/user_actions/payload.ts
@@ -14,7 +14,7 @@ import {
   SavedObjectReference,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   Actions,
   ActionTypes,
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts
index 565688cd6ac3c..3284c09df274f 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsMigrationLogger } from 'kibana/server';
-import { migrationMocks } from '../../../../../../src/core/server/mocks';
+import { SavedObjectsMigrationLogger } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { logError } from './utils';
 
 describe('migration utils', () => {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts
index 993d70181974d..65c1d42271845 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogMeta, SavedObjectMigrationContext } from '../../../../../../src/core/server';
+import { LogMeta, SavedObjectMigrationContext } from '@kbn/core/server';
 
 interface MigrationLogMeta extends LogMeta {
   migrations: {
diff --git a/x-pack/plugins/cases/server/saved_object_types/telemetry.ts b/x-pack/plugins/cases/server/saved_object_types/telemetry.ts
index 8fb643d2e7839..932fc39a6b180 100644
--- a/x-pack/plugins/cases/server/saved_object_types/telemetry.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/telemetry.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_TELEMETRY_SAVED_OBJECT } from '../../common/constants';
 
 export const casesTelemetrySavedObjectType: SavedObjectsType = {
diff --git a/x-pack/plugins/cases/server/saved_object_types/user_actions.ts b/x-pack/plugins/cases/server/saved_object_types/user_actions.ts
index 0f06535fddb70..33a29c06517e2 100644
--- a/x-pack/plugins/cases/server/saved_object_types/user_actions.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/user_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { CASE_USER_ACTION_SAVED_OBJECT } from '../../common/constants';
 import { userActionsMigrations } from './migrations';
 
diff --git a/x-pack/plugins/cases/server/services/alerts/index.test.ts b/x-pack/plugins/cases/server/services/alerts/index.test.ts
index 3104b85e0b0b9..02e58b3a4e5ac 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.test.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.test.ts
@@ -7,7 +7,7 @@
 
 import { CaseStatuses } from '../../../common/api';
 import { AlertService } from '.';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('updateAlertsStatus', () => {
   const esClient = elasticsearchServiceMock.createElasticsearchClient();
diff --git a/x-pack/plugins/cases/server/services/alerts/index.ts b/x-pack/plugins/cases/server/services/alerts/index.ts
index e205899ead380..69c44b30fec28 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.ts
@@ -8,16 +8,16 @@
 import pMap from 'p-map';
 import { isEmpty } from 'lodash';
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import {
+  ALERT_WORKFLOW_STATUS,
+  STATUS_VALUES,
+} from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import { CaseStatuses } from '../../../common/api';
 import { MAX_ALERTS_PER_CASE, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
 import { createCaseError } from '../../common/error';
 import { AlertInfo } from '../../common/types';
 import { UpdateAlertRequest } from '../../client/alerts/types';
-import {
-  ALERT_WORKFLOW_STATUS,
-  STATUS_VALUES,
-} from '../../../../rule_registry/common/technical_rule_data_field_names';
 import { AggregationBuilder, AggregationResponse } from '../../client/metrics/types';
 
 export class AlertService {
diff --git a/x-pack/plugins/cases/server/services/attachments/index.ts b/x-pack/plugins/cases/server/services/attachments/index.ts
index 1b52a6c2bf153..661fd2973d105 100644
--- a/x-pack/plugins/cases/server/services/attachments/index.ts
+++ b/x-pack/plugins/cases/server/services/attachments/index.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectReference,
   SavedObjectsClientContract,
   SavedObjectsUpdateOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { KueryNode } from '@kbn/es-query';
@@ -36,7 +36,13 @@ interface AttachedToCaseArgs extends ClientArgs {
 }
 
 type GetAllAlertsAttachToCaseArgs = AttachedToCaseArgs;
-type CountAlertsAttachedToCaseArgs = AttachedToCaseArgs;
+type AlertsAttachedToCaseArgs = AttachedToCaseArgs;
+
+interface AttachmentsAttachedToCaseArgs extends AttachedToCaseArgs {
+  attachmentType: CommentType;
+  aggregations: Record<string, estypes.AggregationsAggregationContainer>;
+}
+
 interface CountActionsAttachedToCaseArgs extends AttachedToCaseArgs {
   aggregations: Record<string, estypes.AggregationsAggregationContainer>;
 }
@@ -51,6 +57,14 @@ interface CreateAttachmentArgs extends ClientArgs {
   id: string;
 }
 
+interface BulkCreateAttachments extends ClientArgs {
+  attachments: Array<{
+    attributes: AttachmentAttributes;
+    references: SavedObjectReference[];
+    id: string;
+  }>;
+}
+
 interface UpdateArgs {
   attachmentId: string;
   updatedAttributes: AttachmentPatchAttributes;
@@ -71,52 +85,50 @@ interface CommentStats {
 export class AttachmentService {
   constructor(private readonly log: Logger) {}
 
-  public async countAlertsAttachedToCase({
-    unsecuredSavedObjectsClient,
-    caseId,
-    filter,
-  }: CountAlertsAttachedToCaseArgs): Promise<number | undefined> {
+  public async countAlertsAttachedToCase(
+    params: AlertsAttachedToCaseArgs
+  ): Promise<number | undefined> {
     try {
-      this.log.debug(`Attempting to count alerts for case id ${caseId}`);
-      const alertsFilter = buildFilter({
-        filters: [CommentType.alert],
-        field: 'type',
-        operator: 'or',
-        type: CASE_COMMENT_SAVED_OBJECT,
-      });
-
-      const combinedFilter = combineFilters([alertsFilter, filter]);
-
-      const response = await unsecuredSavedObjectsClient.find<
-        AttachmentAttributes,
-        { alerts: { value: number } }
-      >({
-        type: CASE_COMMENT_SAVED_OBJECT,
-        hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
-        page: 1,
-        perPage: 1,
-        sortField: defaultSortField,
-        aggs: this.buildCountAlertsAggs(),
-        filter: combinedFilter,
+      this.log.debug(`Attempting to count alerts for case id ${params.caseId}`);
+      const res = await this.executeCaseAggregations<{ alerts: { value: number } }>({
+        ...params,
+        attachmentType: CommentType.alert,
+        aggregations: this.buildAlertsAggs('cardinality'),
       });
 
-      return response.aggregations?.alerts?.value;
+      return res?.alerts?.value;
     } catch (error) {
-      this.log.error(`Error while counting alerts for case id ${caseId}: ${error}`);
+      this.log.error(`Error while counting alerts for case id ${params.caseId}: ${error}`);
       throw error;
     }
   }
 
-  private buildCountAlertsAggs(): Record<string, estypes.AggregationsAggregationContainer> {
+  private buildAlertsAggs(agg: string): Record<string, estypes.AggregationsAggregationContainer> {
     return {
       alerts: {
-        cardinality: {
+        [agg]: {
           field: `${CASE_COMMENT_SAVED_OBJECT}.attributes.alertId`,
         },
       },
     };
   }
 
+  public async valueCountAlertsAttachedToCase(params: AlertsAttachedToCaseArgs): Promise<number> {
+    try {
+      this.log.debug(`Attempting to value count alerts for case id ${params.caseId}`);
+      const res = await this.executeCaseAggregations<{ alerts: { value: number } }>({
+        ...params,
+        attachmentType: CommentType.alert,
+        aggregations: this.buildAlertsAggs('value_count'),
+      });
+
+      return res?.alerts?.value ?? 0;
+    } catch (error) {
+      this.log.error(`Error while value counting alerts for case id ${params.caseId}: ${error}`);
+      throw error;
+    }
+  }
+
   /**
    * Retrieves all the alerts attached to a case.
    */
@@ -158,29 +170,27 @@ export class AttachmentService {
   }
 
   /**
-   * Executes the aggregations against the actions attached to a case.
+   * Executes the aggregations against a type of attachment attached to a case.
    */
-  public async executeCaseActionsAggregations({
+  public async executeCaseAggregations<Agg extends AggregationResponse = AggregationResponse>({
     unsecuredSavedObjectsClient,
     caseId,
     filter,
     aggregations,
-  }: CountActionsAttachedToCaseArgs): Promise<AggregationResponse | undefined> {
+    attachmentType,
+  }: AttachmentsAttachedToCaseArgs): Promise<Agg | undefined> {
     try {
-      this.log.debug(`Attempting to count actions for case id ${caseId}`);
-      const actionsFilter = buildFilter({
-        filters: [CommentType.actions],
+      this.log.debug(`Attempting to aggregate for case id ${caseId}`);
+      const attachmentFilter = buildFilter({
+        filters: attachmentType,
         field: 'type',
         operator: 'or',
         type: CASE_COMMENT_SAVED_OBJECT,
       });
 
-      const combinedFilter = combineFilters([actionsFilter, filter]);
+      const combinedFilter = combineFilters([attachmentFilter, filter]);
 
-      const response = await unsecuredSavedObjectsClient.find<
-        AttachmentAttributes,
-        AggregationResponse
-      >({
+      const response = await unsecuredSavedObjectsClient.find<AttachmentAttributes, Agg>({
         type: CASE_COMMENT_SAVED_OBJECT,
         hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
         page: 1,
@@ -192,7 +202,22 @@ export class AttachmentService {
 
       return response.aggregations;
     } catch (error) {
-      this.log.error(`Error while counting actions for case id ${caseId}: ${error}`);
+      this.log.error(`Error while executing aggregation for case id ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Executes the aggregations against the actions attached to a case.
+   */
+  public async executeCaseActionsAggregations(
+    params: CountActionsAttachedToCaseArgs
+  ): Promise<AggregationResponse | undefined> {
+    try {
+      this.log.debug(`Attempting to count actions for case id ${params.caseId}`);
+      return await this.executeCaseAggregations({ ...params, attachmentType: CommentType.actions });
+    } catch (error) {
+      this.log.error(`Error while counting actions for case id ${params.caseId}: ${error}`);
       throw error;
     }
   }
@@ -245,6 +270,18 @@ export class AttachmentService {
     }
   }
 
+  public async bulkCreate({ unsecuredSavedObjectsClient, attachments }: BulkCreateAttachments) {
+    try {
+      this.log.debug(`Attempting to bulk create attachments`);
+      return await unsecuredSavedObjectsClient.bulkCreate(
+        attachments.map((attachment) => ({ type: CASE_COMMENT_SAVED_OBJECT, ...attachment }))
+      );
+    } catch (error) {
+      this.log.error(`Error on bulk create attachments: ${error}`);
+      throw error;
+    }
+  }
+
   public async update({
     unsecuredSavedObjectsClient,
     attachmentId,
diff --git a/x-pack/plugins/cases/server/services/cases/index.test.ts b/x-pack/plugins/cases/server/services/cases/index.test.ts
index 821f0a8aaa2f9..7e576b83404db 100644
--- a/x-pack/plugins/cases/server/services/cases/index.test.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.test.ts
@@ -15,7 +15,7 @@
 
 import { CaseAttributes, CaseConnector, CaseFullExternalService } from '../../../common/api';
 import { CASE_SAVED_OBJECT } from '../../../common/constants';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   SavedObject,
   SavedObjectReference,
@@ -23,8 +23,8 @@ import {
   SavedObjectsFindResult,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { loggerMock } from '@kbn/logging-mocks';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import { getNoneCaseConnector } from '../../common/utils';
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index 684edcc077f8e..26557d4ea7748 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -16,12 +16,12 @@ import {
   SavedObjectsBulkUpdateResponse,
   SavedObjectsUpdateResponse,
   SavedObjectsResolveResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { nodeBuilder, KueryNode } from '@kbn/es-query';
 
-import { SecurityPluginSetup } from '../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/services/cases/transform.test.ts b/x-pack/plugins/cases/server/services/cases/transform.test.ts
index 7235bc26bcf73..93b417c5b73b4 100644
--- a/x-pack/plugins/cases/server/services/cases/transform.test.ts
+++ b/x-pack/plugins/cases/server/services/cases/transform.test.ts
@@ -16,7 +16,7 @@ import {
   transformSavedObjectToExternalModel,
   transformUpdateResponseToExternalModel,
 } from './transform';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorTypes } from '../../../common/api';
 import {
   CONNECTOR_ID_REFERENCE_NAME,
diff --git a/x-pack/plugins/cases/server/services/cases/transform.ts b/x-pack/plugins/cases/server/services/cases/transform.ts
index 956bc3953595e..c013475bd2e9c 100644
--- a/x-pack/plugins/cases/server/services/cases/transform.ts
+++ b/x-pack/plugins/cases/server/services/cases/transform.ts
@@ -14,8 +14,8 @@ import {
   SavedObjectsBulkUpdateResponse,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ESCaseAttributes, ExternalServicesWithoutConnectorId } from './types';
 import {
   CONNECTOR_ID_REFERENCE_NAME,
diff --git a/x-pack/plugins/cases/server/services/configure/index.test.ts b/x-pack/plugins/cases/server/services/configure/index.test.ts
index 94df7c21a82a9..dbe5a157994da 100644
--- a/x-pack/plugins/cases/server/services/configure/index.test.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.test.ts
@@ -12,7 +12,7 @@ import {
   ConnectorTypes,
 } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../../common/constants';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   SavedObject,
   SavedObjectReference,
@@ -20,8 +20,8 @@ import {
   SavedObjectsFindResult,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+} from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { loggerMock } from '@kbn/logging-mocks';
 import { CaseConfigureService } from '.';
 import { ESCasesConfigureAttributes } from './types';
diff --git a/x-pack/plugins/cases/server/services/configure/index.ts b/x-pack/plugins/cases/server/services/configure/index.ts
index 0c22d95a5ee33..2b8bc3c6b7cc8 100644
--- a/x-pack/plugins/cases/server/services/configure/index.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.ts
@@ -11,13 +11,13 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { SavedObjectFindOptionsKueryNode } from '../../common/types';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import { CasesConfigureAttributes, CasesConfigurePatch } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT } from '../../../common/constants';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import {
   transformFieldsToESModel,
   transformESConnectorToExternalModel,
diff --git a/x-pack/plugins/cases/server/services/connector_mappings/index.ts b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
index 46b9f4bac0064..302a546ca69ea 100644
--- a/x-pack/plugins/cases/server/services/connector_mappings/index.ts
+++ b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference, SavedObjectsClientContract } from 'kibana/server';
+import { Logger, SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../../common/constants';
 import { ConnectorMappings } from '../../../common/api';
diff --git a/x-pack/plugins/cases/server/services/connector_reference_handler.ts b/x-pack/plugins/cases/server/services/connector_reference_handler.ts
index c6249243bf981..f11c3317f690e 100644
--- a/x-pack/plugins/cases/server/services/connector_reference_handler.ts
+++ b/x-pack/plugins/cases/server/services/connector_reference_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { NONE_CONNECTOR_ID } from '../../common/api';
 
 interface Reference {
diff --git a/x-pack/plugins/cases/server/services/index.ts b/x-pack/plugins/cases/server/services/index.ts
index 9a43aa43c2874..bfd551d27e23e 100644
--- a/x-pack/plugins/cases/server/services/index.ts
+++ b/x-pack/plugins/cases/server/services/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { ConnectorTypes } from '../../common/api';
 
 export { CasesService } from './cases';
diff --git a/x-pack/plugins/cases/server/services/mocks.ts b/x-pack/plugins/cases/server/services/mocks.ts
index 8e21db9ccb4e0..a9f3d427bba65 100644
--- a/x-pack/plugins/cases/server/services/mocks.ts
+++ b/x-pack/plugins/cases/server/services/mocks.ts
@@ -74,6 +74,7 @@ export const createUserActionServiceMock = (): CaseUserActionServiceMock => {
     bulkCreateCaseDeletion: jest.fn(),
     bulkCreateUpdateCase: jest.fn(),
     bulkCreateAttachmentDeletion: jest.fn(),
+    bulkCreateAttachmentCreation: jest.fn(),
     createUserAction: jest.fn(),
     create: jest.fn(),
     getAll: jest.fn(),
@@ -102,12 +103,15 @@ export const createAttachmentServiceMock = (): AttachmentServiceMock => {
     get: jest.fn(),
     delete: jest.fn(),
     create: jest.fn(),
+    bulkCreate: jest.fn(),
     update: jest.fn(),
     bulkUpdate: jest.fn(),
     getAllAlertsAttachToCase: jest.fn(),
     countAlertsAttachedToCase: jest.fn(),
     executeCaseActionsAggregations: jest.fn(),
     getCaseCommentStats: jest.fn(),
+    valueCountAlertsAttachedToCase: jest.fn(),
+    executeCaseAggregations: jest.fn(),
   };
 
   // the cast here is required because jest.Mocked tries to include private members and would throw an error
diff --git a/x-pack/plugins/cases/server/services/test_utils.ts b/x-pack/plugins/cases/server/services/test_utils.ts
index c2b24c42c8a69..16c6445af774f 100644
--- a/x-pack/plugins/cases/server/services/test_utils.ts
+++ b/x-pack/plugins/cases/server/services/test_utils.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference, SavedObjectsFindResult } from 'kibana/server';
+import { SavedObject, SavedObjectReference, SavedObjectsFindResult } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ESConnectorFields } from '.';
 import { CONNECTOR_ID_REFERENCE_NAME, PUSH_CONNECTOR_ID_REFERENCE_NAME } from '../common/constants';
 import {
@@ -18,7 +19,6 @@ import {
 } from '../../common/api';
 import { CASE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../common/constants';
 import { ESCaseAttributes, ExternalServicesWithoutConnectorId } from './cases/types';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../actions/server';
 
 /**
  * This is only a utility interface to help with constructing test cases. After the migration, the ES format will no longer
diff --git a/x-pack/plugins/cases/server/services/transform.test.ts b/x-pack/plugins/cases/server/services/transform.test.ts
index f7f49d285b80c..32bce1cf08231 100644
--- a/x-pack/plugins/cases/server/services/transform.test.ts
+++ b/x-pack/plugins/cases/server/services/transform.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../actions/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { ConnectorTypes } from '../../common/api';
 import { createESJiraConnector, createJiraConnector } from './test_utils';
 import {
diff --git a/x-pack/plugins/cases/server/services/transform.ts b/x-pack/plugins/cases/server/services/transform.ts
index 8956bfe42954e..e8467a9031f13 100644
--- a/x-pack/plugins/cases/server/services/transform.ts
+++ b/x-pack/plugins/cases/server/services/transform.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { CaseConnector, ConnectorTypeFields } from '../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../actions/server';
 import { getNoneCaseConnector } from '../common/utils';
 import { ESCaseConnector, ESConnectorFields } from '.';
 
diff --git a/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts b/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts
index 90eddb80361b8..d4123bda14762 100644
--- a/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/abstract_builder.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../../common/constants';
 import {
   CASE_REF_NAME,
@@ -20,7 +21,6 @@ import {
   NONE_CONNECTOR_ID,
   User,
 } from '../../../common/api';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
 import {
   BuilderParameters,
   BuilderReturnValue,
diff --git a/x-pack/plugins/cases/server/services/user_actions/index.test.ts b/x-pack/plugins/cases/server/services/user_actions/index.test.ts
index 084f319cbb1e0..eb1b57622d24d 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.test.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.test.ts
@@ -7,9 +7,9 @@
 
 import { get } from 'lodash';
 import { loggerMock } from '@kbn/logging-mocks';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { SavedObject, SavedObjectsFindResponse, SavedObjectsFindResult } from 'kibana/server';
-import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { SavedObject, SavedObjectsFindResponse, SavedObjectsFindResult } from '@kbn/core/server';
+import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import {
   Actions,
   ActionTypes,
diff --git a/x-pack/plugins/cases/server/services/user_actions/index.ts b/x-pack/plugins/cases/server/services/user_actions/index.ts
index c80d2d6da4c98..7739437f9e607 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.ts
@@ -14,7 +14,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { KueryNode } from '@kbn/es-query';
@@ -91,7 +91,7 @@ interface BulkCreateBulkUpdateCaseUserActions extends ClientArgs {
   user: User;
 }
 
-interface BulkCreateAttachmentDeletionUserAction extends Omit<CommonUserActionArgs, 'owner'> {
+interface BulkCreateAttachmentUserAction extends Omit<CommonUserActionArgs, 'owner'> {
   attachments: Array<{ id: string; owner: string; attachment: CommentRequest }>;
 }
 
@@ -241,18 +241,19 @@ export class CaseUserActionService {
     await this.bulkCreate({ unsecuredSavedObjectsClient, actions: userActionsWithReferences });
   }
 
-  public async bulkCreateAttachmentDeletion({
+  private async bulkCreateAttachment({
     unsecuredSavedObjectsClient,
     caseId,
     attachments,
     user,
-  }: BulkCreateAttachmentDeletionUserAction): Promise<void> {
-    this.log.debug(`Attempting to create a create case user action`);
+    action = Actions.create,
+  }: BulkCreateAttachmentUserAction): Promise<void> {
+    this.log.debug(`Attempting to create a bulk create case user action`);
     const userActionsWithReferences = attachments.reduce<BuilderReturnValue[]>(
       (acc, attachment) => {
         const userActionBuilder = this.builderFactory.getBuilder(ActionTypes.comment);
-        const deleteCommentUserAction = userActionBuilder?.build({
-          action: Actions.delete,
+        const commentUserAction = userActionBuilder?.build({
+          action,
           caseId,
           user,
           owner: attachment.owner,
@@ -260,11 +261,11 @@ export class CaseUserActionService {
           payload: { attachment: attachment.attachment },
         });
 
-        if (deleteCommentUserAction == null) {
+        if (commentUserAction == null) {
           return acc;
         }
 
-        return [...acc, deleteCommentUserAction];
+        return [...acc, commentUserAction];
       },
       []
     );
@@ -272,6 +273,36 @@ export class CaseUserActionService {
     await this.bulkCreate({ unsecuredSavedObjectsClient, actions: userActionsWithReferences });
   }
 
+  public async bulkCreateAttachmentDeletion({
+    unsecuredSavedObjectsClient,
+    caseId,
+    attachments,
+    user,
+  }: BulkCreateAttachmentUserAction): Promise<void> {
+    await this.bulkCreateAttachment({
+      unsecuredSavedObjectsClient,
+      caseId,
+      attachments,
+      user,
+      action: Actions.delete,
+    });
+  }
+
+  public async bulkCreateAttachmentCreation({
+    unsecuredSavedObjectsClient,
+    caseId,
+    attachments,
+    user,
+  }: BulkCreateAttachmentUserAction): Promise<void> {
+    await this.bulkCreateAttachment({
+      unsecuredSavedObjectsClient,
+      caseId,
+      attachments,
+      user,
+      action: Actions.create,
+    });
+  }
+
   public async createUserAction<T extends keyof BuilderParameters>({
     unsecuredSavedObjectsClient,
     action,
diff --git a/x-pack/plugins/cases/server/services/user_actions/types.ts b/x-pack/plugins/cases/server/services/user_actions/types.ts
index 435e4169323a1..f681a9186181c 100644
--- a/x-pack/plugins/cases/server/services/user_actions/types.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   CasePostRequest,
   CaseSettings,
diff --git a/x-pack/plugins/cases/server/telemetry/index.ts b/x-pack/plugins/cases/server/telemetry/index.ts
index 6031cc0746bbb..fdba46d01240f 100644
--- a/x-pack/plugins/cases/server/telemetry/index.ts
+++ b/x-pack/plugins/cases/server/telemetry/index.ts
@@ -11,9 +11,9 @@ import {
   Logger,
   PluginInitializerContext,
   SavedObjectsErrorHelpers,
-} from '../../../../../src/core/server';
-import { TaskManagerSetupContract } from '../../../task_manager/server';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { collectTelemetryData } from './collect_telemetry_data';
 import {
   CASE_TELEMETRY_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts b/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts
index 2d4a550977b69..1cb02f1065be2 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/alerts.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  loggingSystemMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getAlertsTelemetryData } from './alerts';
 
 describe('alerts', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts b/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
index d7d2b4d82d8b8..f41ec19a0045a 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResponse } from 'kibana/server';
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getCasesTelemetryData } from './cases';
 
 describe('getCasesTelemetryData', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts b/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts
index be37d3dc946bf..e21b008b39fcb 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/comments.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  loggingSystemMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getUserCommentsTelemetryData } from './comments';
 
 describe('comments', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts b/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts
index 88253a8a4b2d3..6fd1da4903ed6 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/configuration.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  loggingSystemMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import { getConfigurationTelemetryData } from './configuration';
 
 describe('configuration', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts b/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts
index 79b102db835a9..a0ecce25f3bf1 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/connectors.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getConnectorsTelemetryData } from './connectors';
 
 describe('getConnectorsTelemetryData', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/connectors.ts b/x-pack/plugins/cases/server/telemetry/queries/connectors.ts
index d9166e10c81c3..efafbfb09feb9 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/connectors.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/connectors.ts
@@ -7,7 +7,7 @@
 
 import { AggregationsAggregationContainer } from '@elastic/elasticsearch/lib/api/types';
 import { KueryNode } from '@kbn/es-query';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { CASE_USER_ACTION_SAVED_OBJECT } from '../../../common/constants';
 import { buildFilter } from '../../client/utils';
 import {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts b/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts
index c84aaf401264e..38ca202514af1 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/pushed.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getPushedTelemetryData } from './pushes';
 
 describe('pushes', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts b/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts
index df857523e4c3d..c01c8d329c5b0 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/user_actions.test.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  savedObjectsRepositoryMock,
-  loggingSystemMock,
-} from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getUserActionsTelemetryData } from './user_actions';
 
 describe('user_actions', () => {
diff --git a/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts b/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts
index 13bcc51ab0be1..74687f6218ef9 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import {
   findValueInBuckets,
   getAggregationsBuckets,
diff --git a/x-pack/plugins/cases/server/telemetry/queries/utils.ts b/x-pack/plugins/cases/server/telemetry/queries/utils.ts
index f404e62b17fc7..70e719ef9fa31 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/utils.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/utils.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { KueryNode } from '@kbn/es-query';
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts b/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts
index 35433416434c4..d33e68597f107 100644
--- a/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts
+++ b/x-pack/plugins/cases/server/telemetry/schedule_telemetry_task.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { Logger } from '@kbn/core/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 import { CASES_TELEMETRY_TASK_NAME } from '../../common/constants';
 
 const MINUTES_ON_HALF_DAY = 60 * 12;
diff --git a/x-pack/plugins/cases/server/telemetry/types.ts b/x-pack/plugins/cases/server/telemetry/types.ts
index e39f657b76be9..ec880855f3302 100644
--- a/x-pack/plugins/cases/server/telemetry/types.ts
+++ b/x-pack/plugins/cases/server/telemetry/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ISavedObjectsRepository, Logger } from 'kibana/server';
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { ISavedObjectsRepository, Logger } from '@kbn/core/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 
 export interface Buckets {
   buckets: Array<{
diff --git a/x-pack/plugins/cases/server/types.ts b/x-pack/plugins/cases/server/types.ts
index c3b8e0a273221..962dc9c85231d 100644
--- a/x-pack/plugins/cases/server/types.ts
+++ b/x-pack/plugins/cases/server/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
 import {
   ActionTypeConfig,
   ActionTypeSecrets,
   ActionTypeParams,
   ActionType,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../actions/server/types';
+} from '@kbn/actions-plugin/server/types';
 import { CasesClient } from './client';
 
 export interface CaseRequestContext {
diff --git a/x-pack/plugins/cloud/public/fullstory.ts b/x-pack/plugins/cloud/public/fullstory.ts
deleted file mode 100644
index 602b1c4cc63d3..0000000000000
--- a/x-pack/plugins/cloud/public/fullstory.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { sha256 } from 'js-sha256'; // loaded here to reduce page load bundle size when FullStory is disabled
-import type { IBasePath, PackageInfo } from '../../../../src/core/public';
-
-export interface FullStoryDeps {
-  basePath: IBasePath;
-  orgId: string;
-  packageInfo: PackageInfo;
-}
-
-export type FullstoryUserVars = Record<string, any>;
-export type FullstoryVars = Record<string, any>;
-
-export interface FullStoryApi {
-  identify(userId: string, userVars?: FullstoryUserVars): void;
-  setVars(pageName: string, vars?: FullstoryVars): void;
-  setUserVars(userVars?: FullstoryUserVars): void;
-  event(eventName: string, eventProperties: Record<string, any>): void;
-}
-
-export interface FullStoryService {
-  fullStory: FullStoryApi;
-  sha256: typeof sha256;
-}
-
-export const initializeFullStory = ({
-  basePath,
-  orgId,
-  packageInfo,
-}: FullStoryDeps): FullStoryService => {
-  // @ts-expect-error
-  window._fs_debug = false;
-  // @ts-expect-error
-  window._fs_host = 'fullstory.com';
-  // @ts-expect-error
-  window._fs_script = basePath.prepend(`/internal/cloud/${packageInfo.buildNum}/fullstory.js`);
-  // @ts-expect-error
-  window._fs_org = orgId;
-  // @ts-expect-error
-  window._fs_namespace = 'FSKibana';
-
-  /* eslint-disable */
-  (function(m,n,e,t,l,o,g,y){
-      if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
-      // @ts-expect-error
-      g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
-      // @ts-expect-error
-      o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src=_fs_script;
-      // @ts-expect-error
-      y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
-      // @ts-expect-error
-      g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
-      // @ts-expect-error
-      g.anonymize=function(){g.identify(!!0)};
-      // @ts-expect-error
-      g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
-      // @ts-expect-error
-      g.log = function(a,b){g("log",[a,b])};
-      // @ts-expect-error
-      g.consent=function(a){g("consent",!arguments.length||a)};
-      // @ts-expect-error
-      g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
-      // @ts-expect-error
-      g.clearUserCookie=function(){};
-      // @ts-expect-error
-      g.setVars=function(n, p){g('setVars',[n,p]);};
-      // @ts-expect-error
-      g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
-      // @ts-expect-error
-      if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
-      // @ts-expect-error
-      g._v="1.3.0";
-      // @ts-expect-error
-  })(window,document,window['_fs_namespace'],'script','user');
-  /* eslint-enable */
-
-  // @ts-expect-error
-  const fullStory: FullStoryApi = window.FSKibana;
-
-  return {
-    fullStory,
-    sha256,
-  };
-};
diff --git a/x-pack/plugins/cloud/public/index.ts b/x-pack/plugins/cloud/public/index.ts
index 73aa3a350e8ea..d50798cb15cd2 100644
--- a/x-pack/plugins/cloud/public/index.ts
+++ b/x-pack/plugins/cloud/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { CloudPlugin } from './plugin';
 
 export type { CloudSetup, CloudConfigType, CloudStart } from './plugin';
diff --git a/x-pack/plugins/cloud/public/mocks.tsx b/x-pack/plugins/cloud/public/mocks.tsx
index 5bef215ffb0ea..f31596f3930f5 100644
--- a/x-pack/plugins/cloud/public/mocks.tsx
+++ b/x-pack/plugins/cloud/public/mocks.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 
 import { CloudStart } from '.';
-import { ServicesProvider } from '../public/services';
+import { ServicesProvider } from './services';
 
 function createSetupMock() {
   return {
diff --git a/x-pack/plugins/cloud/public/plugin.test.mocks.ts b/x-pack/plugins/cloud/public/plugin.test.mocks.ts
deleted file mode 100644
index 1c185d0194912..0000000000000
--- a/x-pack/plugins/cloud/public/plugin.test.mocks.ts
+++ /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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { sha256 } from 'js-sha256';
-import type { FullStoryDeps, FullStoryApi, FullStoryService } from './fullstory';
-
-export const fullStoryApiMock: jest.Mocked<FullStoryApi> = {
-  event: jest.fn(),
-  setUserVars: jest.fn(),
-  setVars: jest.fn(),
-  identify: jest.fn(),
-};
-export const initializeFullStoryMock = jest.fn<FullStoryService, [FullStoryDeps]>(() => ({
-  fullStory: fullStoryApiMock,
-  sha256,
-}));
-jest.doMock('./fullstory', () => {
-  return { initializeFullStory: initializeFullStoryMock };
-});
diff --git a/x-pack/plugins/cloud/public/plugin.test.ts b/x-pack/plugins/cloud/public/plugin.test.ts
index edbf724e25390..5e0294178a5da 100644
--- a/x-pack/plugins/cloud/public/plugin.test.ts
+++ b/x-pack/plugins/cloud/public/plugin.test.ts
@@ -6,17 +6,16 @@
  */
 
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
-import { homePluginMock } from 'src/plugins/home/public/mocks';
-import { securityMock } from '../../security/public/mocks';
-import { fullStoryApiMock, initializeFullStoryMock } from './plugin.test.mocks';
-import { CloudPlugin, CloudConfigType, loadFullStoryUserId } from './plugin';
-import { Observable, Subject } from 'rxjs';
-import { KibanaExecutionContext } from 'kibana/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+import { CloudPlugin, CloudConfigType, loadUserId } from './plugin';
+import { firstValueFrom, Observable, Subject } from 'rxjs';
+import { KibanaExecutionContext } from '@kbn/core/public';
 
 describe('Cloud Plugin', () => {
   describe('#setup', () => {
-    describe('setupFullstory', () => {
+    describe('setupFullStory', () => {
       beforeEach(() => {
         jest.clearAllMocks();
       });
@@ -65,72 +64,82 @@ describe('Cloud Plugin', () => {
         );
 
         const setup = plugin.setup(coreSetup, securityEnabled ? { security: securitySetup } : {});
-        // Wait for fullstory dynamic import to resolve
+        // Wait for FullStory dynamic import to resolve
         await new Promise((r) => setImmediate(r));
 
-        return { initContext, plugin, setup };
+        return { initContext, plugin, setup, coreSetup };
       };
 
-      it('calls initializeFullStory with correct args when enabled and org_id are set', async () => {
-        const { initContext } = await setupPlugin({
+      test('register the shipper FullStory with correct args when enabled and org_id are set', async () => {
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        expect(initializeFullStoryMock).toHaveBeenCalled();
-        const { basePath, orgId, packageInfo } = initializeFullStoryMock.mock.calls[0][0];
-        expect(basePath.prepend).toBeDefined();
-        expect(orgId).toEqual('foo');
-        expect(packageInfo).toEqual(initContext.env.packageInfo);
+        expect(coreSetup.analytics.registerShipper).toHaveBeenCalled();
+        expect(coreSetup.analytics.registerShipper).toHaveBeenCalledWith(expect.anything(), {
+          fullStoryOrgId: 'foo',
+          scriptUrl: '/internal/cloud/100/fullstory.js',
+          namespace: 'FSKibana',
+        });
       });
 
-      it('calls FS.identify with hashed user ID when security is available', async () => {
-        await setupPlugin({
+      test('register the context provider for the cloud user with hashed user ID when security is available', async () => {
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        expect(fullStoryApiMock.identify).toHaveBeenCalledWith(
-          '5ef112cfdae3dea57097bc276e275b2816e73ef2a398dc0ffaf5b6b4e3af2041',
-          {
-            version_str: 'version',
-            version_major_int: -1,
-            version_minor_int: -1,
-            version_patch_int: -1,
-            org_id_str: 'cloudId',
-          }
-        );
+        expect(coreSetup.analytics.registerContextProvider).toHaveBeenCalled();
+
+        const [{ context$ }] = coreSetup.analytics.registerContextProvider.mock.calls.find(
+          ([{ name }]) => name === 'cloud_user_id'
+        )!;
+
+        await expect(firstValueFrom(context$)).resolves.toEqual({
+          userId: '5ef112cfdae3dea57097bc276e275b2816e73ef2a398dc0ffaf5b6b4e3af2041',
+        });
       });
 
       it('user hash includes org id', async () => {
-        await setupPlugin({
+        const { coreSetup: coreSetup1 } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' }, id: 'esOrg1' },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        const hashId1 = fullStoryApiMock.identify.mock.calls[0][0];
+        const [{ context$: context1$ }] =
+          coreSetup1.analytics.registerContextProvider.mock.calls.find(
+            ([{ name }]) => name === 'cloud_user_id'
+          )!;
+
+        const hashId1 = await firstValueFrom(context1$);
 
-        await setupPlugin({
+        const { coreSetup: coreSetup2 } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' }, id: 'esOrg2' },
           currentUserProps: {
             username: '1234',
           },
         });
 
-        const hashId2 = fullStoryApiMock.identify.mock.calls[1][0];
+        const [{ context$: context2$ }] =
+          coreSetup2.analytics.registerContextProvider.mock.calls.find(
+            ([{ name }]) => name === 'cloud_user_id'
+          )!;
+
+        const hashId2 = await firstValueFrom(context2$);
 
         expect(hashId1).not.toEqual(hashId2);
       });
 
-      it('calls FS.setVars everytime an app changes', async () => {
+      it('emits the execution context provider everytime an app changes', async () => {
         const currentContext$ = new Subject<KibanaExecutionContext>();
-        const { plugin } = await setupPlugin({
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           currentUserProps: {
             username: '1234',
@@ -138,23 +147,34 @@ describe('Cloud Plugin', () => {
           currentContext$,
         });
 
+        const [{ context$ }] = coreSetup.analytics.registerContextProvider.mock.calls.find(
+          ([{ name }]) => name === 'execution_context'
+        )!;
+
+        let latestContext;
+        context$.subscribe((context) => {
+          latestContext = context;
+        });
+
         // takes the app name
-        expect(fullStoryApiMock.setVars).not.toHaveBeenCalled();
+        expect(latestContext).toBeUndefined();
         currentContext$.next({
           name: 'App1',
           description: '123',
         });
 
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
+        await new Promise((r) => setImmediate(r));
+
+        expect(latestContext).toEqual({
           pageName: 'App1',
-          app_id_str: 'App1',
+          applicationId: 'App1',
         });
 
         // context clear
         currentContext$.next({});
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
-          pageName: 'App1',
-          app_id_str: 'App1',
+        expect(latestContext).toEqual({
+          pageName: '',
+          applicationId: 'unknown',
         });
 
         // different app
@@ -163,11 +183,11 @@ describe('Cloud Plugin', () => {
           page: 'page2',
           id: '123',
         });
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
+        expect(latestContext).toEqual({
           pageName: 'App2:page2',
-          app_id_str: 'App2',
-          page_str: 'page2',
-          ent_id_str: '123',
+          applicationId: 'App2',
+          page: 'page2',
+          entityId: '123',
         });
 
         // Back to first app
@@ -177,25 +197,25 @@ describe('Cloud Plugin', () => {
           id: '123',
         });
 
-        expect(fullStoryApiMock.setVars).toHaveBeenCalledWith('page', {
+        expect(latestContext).toEqual({
           pageName: 'App1:page3',
-          app_id_str: 'App1',
-          page_str: 'page3',
-          ent_id_str: '123',
+          applicationId: 'App1',
+          page: 'page3',
+          entityId: '123',
         });
-
-        expect(currentContext$.observers.length).toBe(1);
-        plugin.stop();
-        expect(currentContext$.observers.length).toBe(0);
       });
 
-      it('does not call FS.identify when security is not available', async () => {
-        await setupPlugin({
+      it('does not register the cloud user id context provider when security is not available', async () => {
+        const { coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           securityEnabled: false,
         });
 
-        expect(fullStoryApiMock.identify).not.toHaveBeenCalled();
+        expect(
+          coreSetup.analytics.registerContextProvider.mock.calls.find(
+            ([{ name }]) => name === 'cloud_user_id'
+          )
+        ).toBeUndefined();
       });
 
       describe('with memory', () => {
@@ -219,58 +239,44 @@ describe('Cloud Plugin', () => {
           delete window.performance.memory;
         });
 
-        it('calls FS.event when security is available', async () => {
-          const { initContext } = await setupPlugin({
+        it('reports an event when security is available', async () => {
+          const { initContext, coreSetup } = await setupPlugin({
             config: { full_story: { enabled: true, org_id: 'foo' } },
             currentUserProps: {
               username: '1234',
             },
           });
 
-          expect(fullStoryApiMock.event).toHaveBeenCalledWith('Loaded Kibana', {
-            kibana_version_str: initContext.env.packageInfo.version,
-            memory_js_heap_size_limit_int: 3,
-            memory_js_heap_size_total_int: 2,
-            memory_js_heap_size_used_int: 1,
+          expect(coreSetup.analytics.reportEvent).toHaveBeenCalledWith('Loaded Kibana', {
+            kibana_version: initContext.env.packageInfo.version,
+            memory_js_heap_size_limit: 3,
+            memory_js_heap_size_total: 2,
+            memory_js_heap_size_used: 1,
           });
         });
       });
 
-      it('calls FS.event when security is not available', async () => {
-        const { initContext } = await setupPlugin({
+      it('reports an event when security is not available', async () => {
+        const { initContext, coreSetup } = await setupPlugin({
           config: { full_story: { enabled: true, org_id: 'foo' } },
           securityEnabled: false,
         });
 
-        expect(fullStoryApiMock.event).toHaveBeenCalledWith('Loaded Kibana', {
-          kibana_version_str: initContext.env.packageInfo.version,
-        });
-      });
-
-      it('calls FS.event when FS.identify throws an error', async () => {
-        fullStoryApiMock.identify.mockImplementationOnce(() => {
-          throw new Error(`identify failed!`);
-        });
-        const { initContext } = await setupPlugin({
-          config: { full_story: { enabled: true, org_id: 'foo' } },
-          currentUserProps: {
-            username: '1234',
-          },
-        });
-
-        expect(fullStoryApiMock.event).toHaveBeenCalledWith('Loaded Kibana', {
-          kibana_version_str: initContext.env.packageInfo.version,
+        expect(coreSetup.analytics.reportEvent).toHaveBeenCalledWith('Loaded Kibana', {
+          kibana_version: initContext.env.packageInfo.version,
         });
       });
 
       it('does not call initializeFullStory when enabled=false', async () => {
-        await setupPlugin({ config: { full_story: { enabled: false, org_id: 'foo' } } });
-        expect(initializeFullStoryMock).not.toHaveBeenCalled();
+        const { coreSetup } = await setupPlugin({
+          config: { full_story: { enabled: false, org_id: 'foo' } },
+        });
+        expect(coreSetup.analytics.registerShipper).not.toHaveBeenCalled();
       });
 
       it('does not call initializeFullStory when org_id is undefined', async () => {
-        await setupPlugin({ config: { full_story: { enabled: true } } });
-        expect(initializeFullStoryMock).not.toHaveBeenCalled();
+        const { coreSetup } = await setupPlugin({ config: { full_story: { enabled: true } } });
+        expect(coreSetup.analytics.registerShipper).not.toHaveBeenCalled();
       });
     });
 
@@ -659,7 +665,7 @@ describe('Cloud Plugin', () => {
 
     it('returns principal ID when username specified', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockResolvedValue({
             username: '1234',
           }),
@@ -670,7 +676,7 @@ describe('Cloud Plugin', () => {
 
     it('returns undefined if getCurrentUser throws', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockRejectedValue(new Error(`Oh no!`)),
         })
       ).toBeUndefined();
@@ -678,7 +684,7 @@ describe('Cloud Plugin', () => {
 
     it('returns undefined if getCurrentUser returns undefined', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockResolvedValue(undefined),
         })
       ).toBeUndefined();
@@ -686,7 +692,7 @@ describe('Cloud Plugin', () => {
 
     it('returns undefined and logs if username undefined', async () => {
       expect(
-        await loadFullStoryUserId({
+        await loadUserId({
           getCurrentUser: jest.fn().mockResolvedValue({
             username: undefined,
             metadata: { foo: 'bar' },
@@ -694,7 +700,7 @@ describe('Cloud Plugin', () => {
         })
       ).toBeUndefined();
       expect(consoleMock).toHaveBeenLastCalledWith(
-        `[cloud.full_story] username not specified. User metadata: {"foo":"bar"}`
+        `[cloud.analytics] username not specified. User metadata: {"foo":"bar"}`
       );
     });
   });
diff --git a/x-pack/plugins/cloud/public/plugin.tsx b/x-pack/plugins/cloud/public/plugin.tsx
index 89f24971de25c..da3c8be25ed42 100644
--- a/x-pack/plugins/cloud/public/plugin.tsx
+++ b/x-pack/plugins/cloud/public/plugin.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { FC } from 'react';
-import {
+import type {
   CoreSetup,
   CoreStart,
   Plugin,
@@ -14,16 +14,20 @@ import {
   HttpStart,
   IBasePath,
   ExecutionContextStart,
-} from 'src/core/public';
+  AnalyticsServiceSetup,
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import useObservable from 'react-use/lib/useObservable';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { compact, isUndefined, omitBy } from 'lodash';
+import { BehaviorSubject, from, of, Subscription } from 'rxjs';
+import { exhaustMap, filter, map } from 'rxjs/operators';
+import { compact } from 'lodash';
+
 import type {
   AuthenticatedUser,
   SecurityPluginSetup,
   SecurityPluginStart,
-} from '../../security/public';
+} from '@kbn/security-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
 import {
   ELASTIC_SUPPORT_LINK,
@@ -31,7 +35,6 @@ import {
   GET_CHAT_USER_DATA_ROUTE_PATH,
 } from '../common/constants';
 import type { GetChatUserDataResponseBody } from '../common/types';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import { createUserMenuLinks } from './user_menu_links';
 import { getFullCloudUrl } from './utils';
 import { ChatConfig, ServicesProvider } from './services';
@@ -83,9 +86,13 @@ export interface CloudSetup {
   isCloudEnabled: boolean;
 }
 
-interface SetupFullstoryDeps extends CloudSetupDependencies {
-  executionContextPromise?: Promise<ExecutionContextStart>;
+interface SetupFullStoryDeps {
+  analytics: AnalyticsServiceSetup;
   basePath: IBasePath;
+}
+interface SetupTelemetryContextDeps extends CloudSetupDependencies {
+  analytics: AnalyticsServiceSetup;
+  executionContextPromise: Promise<ExecutionContextStart>;
   esOrgId?: string;
 }
 
@@ -94,7 +101,7 @@ interface SetupChatDeps extends Pick<CloudSetupDependencies, 'security'> {
 }
 
 export class CloudPlugin implements Plugin<CloudSetup> {
-  private config!: CloudConfigType;
+  private readonly config: CloudConfigType;
   private isCloudEnabled: boolean;
   private appSubscription?: Subscription;
   private chatConfig$ = new BehaviorSubject<ChatConfig>({ enabled: false });
@@ -109,12 +116,17 @@ export class CloudPlugin implements Plugin<CloudSetup> {
       return coreStart.executionContext;
     });
 
-    this.setupFullstory({
-      basePath: core.http.basePath,
+    this.setupTelemetryContext({
+      analytics: core.analytics,
       security,
       executionContextPromise,
       esOrgId: this.config.id,
-    }).catch((e) =>
+    }).catch((e) => {
+      // eslint-disable-next-line no-console
+      console.debug(`Error setting up TelemetryContext: ${e.toString()}`);
+    });
+
+    this.setupFullStory({ analytics: core.analytics, basePath: core.http.basePath }).catch((e) =>
       // eslint-disable-next-line no-console
       console.debug(`Error setting up FullStory: ${e.toString()}`)
     );
@@ -230,109 +242,158 @@ export class CloudPlugin implements Plugin<CloudSetup> {
     return user?.roles.includes('superuser') ?? true;
   }
 
-  private async setupFullstory({
-    basePath,
+  /**
+   * If the right config is provided, register the FullStory shipper to the analytics client.
+   * @param analytics Core's Analytics service's setup contract.
+   * @param basePath Core's http.basePath helper.
+   * @private
+   */
+  private async setupFullStory({ analytics, basePath }: SetupFullStoryDeps) {
+    const { enabled, org_id: fullStoryOrgId } = this.config.full_story;
+    if (!enabled || !fullStoryOrgId) {
+      return; // do not load any FullStory code in the browser if not enabled
+    }
+
+    // Keep this import async so that we do not load any FullStory code into the browser when it is disabled.
+    const { FullStoryShipper } = await import('@elastic/analytics');
+    analytics.registerShipper(FullStoryShipper, {
+      fullStoryOrgId,
+      // Load an Elastic-internally audited script. Ideally, it should be hosted on a CDN.
+      scriptUrl: basePath.prepend(
+        `/internal/cloud/${this.initializerContext.env.packageInfo.buildNum}/fullstory.js`
+      ),
+      namespace: 'FSKibana',
+    });
+  }
+
+  /**
+   * Set up the Analytics context providers.
+   * @param analytics Core's Analytics service. The Setup contract.
+   * @param security The security plugin.
+   * @param executionContextPromise Core's executionContext's start contract.
+   * @param esOrgId The Cloud Org ID.
+   * @private
+   */
+  private async setupTelemetryContext({
+    analytics,
     security,
     executionContextPromise,
     esOrgId,
-  }: SetupFullstoryDeps) {
-    const { enabled, org_id: fsOrgId } = this.config.full_story;
-    if (!enabled || !fsOrgId) {
-      return; // do not load any fullstory code in the browser if not enabled
-    }
+  }: SetupTelemetryContextDeps) {
+    // Some context providers can be moved to other places for better domain isolation.
+    // Let's use https://github.com/elastic/kibana/issues/125690 for that purpose.
+    analytics.registerContextProvider({
+      name: 'kibana_version',
+      context$: of({ version: this.initializerContext.env.packageInfo.version }),
+      schema: { version: { type: 'keyword', _meta: { description: 'The version of Kibana' } } },
+    });
 
-    // Keep this import async so that we do not load any FullStory code into the browser when it is disabled.
-    const fullStoryChunkPromise = import('./fullstory');
-    const userIdPromise: Promise<string | undefined> = security
-      ? loadFullStoryUserId({ getCurrentUser: security.authc.getCurrentUser })
-      : Promise.resolve(undefined);
-
-    // We need to call FS.identify synchronously after FullStory is initialized, so we must load the user upfront
-    const [{ initializeFullStory }, userId] = await Promise.all([
-      fullStoryChunkPromise,
-      userIdPromise,
-    ]);
-
-    const { fullStory, sha256 } = initializeFullStory({
-      basePath,
-      orgId: fsOrgId,
-      packageInfo: this.initializerContext.env.packageInfo,
+    analytics.registerContextProvider({
+      name: 'cloud_org_id',
+      context$: of({ esOrgId }),
+      schema: {
+        esOrgId: {
+          type: 'keyword',
+          _meta: { description: 'The Cloud Organization ID', optional: true },
+        },
+      },
     });
 
-    // Very defensive try/catch to avoid any UnhandledPromiseRejections
-    try {
-      // This needs to be called syncronously to be sure that we populate the user ID soon enough to make sessions merging
-      // across domains work
-      if (userId) {
-        // Join the cloud org id and the user to create a truly unique user id.
-        // The hashing here is to keep it at clear as possible in our source code that we do not send literal user IDs
-        const hashedId = sha256(esOrgId ? `${esOrgId}:${userId}` : `${userId}`);
-
-        executionContextPromise
-          ?.then(async (executionContext) => {
-            this.appSubscription = executionContext.context$.subscribe((context) => {
-              const { name, page, id } = context;
-              // Update the current context every time it changes
-              fullStory.setVars(
-                'page',
-                omitBy(
-                  {
-                    // Read about the special pageName property
-                    // https://help.fullstory.com/hc/en-us/articles/1500004101581-FS-setVars-API-Sending-custom-page-data-to-FullStory
-                    pageName: `${compact([name, page]).join(':')}`,
-                    app_id_str: name ?? 'unknown',
-                    page_str: page,
-                    ent_id_str: id,
-                  },
-                  isUndefined
-                )
-              );
-            });
+    // This needs to be called synchronously to be sure that we populate the user ID soon enough to make sessions merging
+    // across domains work
+    if (security) {
+      analytics.registerContextProvider({
+        name: 'cloud_user_id',
+        context$: from(loadUserId({ getCurrentUser: security.authc.getCurrentUser })).pipe(
+          filter((userId): userId is string => Boolean(userId)),
+          exhaustMap(async (userId) => {
+            const { sha256 } = await import('js-sha256');
+            // Join the cloud org id and the user to create a truly unique user id.
+            // The hashing here is to keep it at clear as possible in our source code that we do not send literal user IDs
+            return { userId: sha256(esOrgId ? `${esOrgId}:${userId}` : `${userId}`) };
           })
-          .catch((e) => {
-            // eslint-disable-next-line no-console
-            console.error(
-              `[cloud.full_story] Could not retrieve application service due to error: ${e.toString()}`,
-              e
-            );
-          });
-        const kibanaVer = this.initializerContext.env.packageInfo.version;
-        // TODO: use semver instead
-        const parsedVer = (kibanaVer.indexOf('.') > -1 ? kibanaVer.split('.') : []).map((s) =>
-          parseInt(s, 10)
-        );
-        // `str` suffix is required for evn vars, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
-        fullStory.identify(hashedId, {
-          version_str: kibanaVer,
-          version_major_int: parsedVer[0] ?? -1,
-          version_minor_int: parsedVer[1] ?? -1,
-          version_patch_int: parsedVer[2] ?? -1,
-          org_id_str: esOrgId,
-        });
-      }
-    } catch (e) {
-      // eslint-disable-next-line no-console
-      console.error(
-        `[cloud.full_story] Could not call FS.identify due to error: ${e.toString()}`,
-        e
-      );
+        ),
+        schema: {
+          userId: {
+            type: 'keyword',
+            _meta: { description: 'The user id scoped as seen by Cloud (hashed)' },
+          },
+        },
+      });
     }
 
+    const executionContext = await executionContextPromise;
+    analytics.registerContextProvider({
+      name: 'execution_context',
+      context$: executionContext.context$.pipe(
+        // Update the current context every time it changes
+        map(({ name, page, id }) => ({
+          pageName: `${compact([name, page]).join(':')}`,
+          applicationId: name ?? 'unknown',
+          page,
+          entityId: id,
+        }))
+      ),
+      schema: {
+        pageName: {
+          type: 'keyword',
+          _meta: { description: 'The name of the current page' },
+        },
+        page: {
+          type: 'keyword',
+          _meta: { description: 'The current page', optional: true },
+        },
+        applicationId: {
+          type: 'keyword',
+          _meta: { description: 'The id of the current application' },
+        },
+        entityId: {
+          type: 'keyword',
+          _meta: {
+            description:
+              'The id of the current entity (dashboard, visualization, canvas, lens, etc)',
+            optional: true,
+          },
+        },
+      },
+    });
+
+    analytics.registerEventType({
+      eventType: 'Loaded Kibana',
+      schema: {
+        kibana_version: {
+          type: 'keyword',
+          _meta: { description: 'The version of Kibana', optional: true },
+        },
+        memory_js_heap_size_limit: {
+          type: 'long',
+          _meta: { description: 'The maximum size of the heap', optional: true },
+        },
+        memory_js_heap_size_total: {
+          type: 'long',
+          _meta: { description: 'The total size of the heap', optional: true },
+        },
+        memory_js_heap_size_used: {
+          type: 'long',
+          _meta: { description: 'The used size of the heap', optional: true },
+        },
+      },
+    });
+
     // Get performance information from the browser (non standard property
     // @ts-expect-error 2339
     const memory = window.performance.memory;
     let memoryInfo = {};
     if (memory) {
       memoryInfo = {
-        memory_js_heap_size_limit_int: memory.jsHeapSizeLimit,
-        memory_js_heap_size_total_int: memory.totalJSHeapSize,
-        memory_js_heap_size_used_int: memory.usedJSHeapSize,
+        memory_js_heap_size_limit: memory.jsHeapSizeLimit,
+        memory_js_heap_size_total: memory.totalJSHeapSize,
+        memory_js_heap_size_used: memory.usedJSHeapSize,
       };
     }
-    // Record an event that Kibana was opened so we can easily search for sessions that use Kibana
-    fullStory.event('Loaded Kibana', {
-      // `str` suffix is required, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
-      kibana_version_str: this.initializerContext.env.packageInfo.version,
+
+    analytics.reportEvent('Loaded Kibana', {
+      kibana_version: this.initializerContext.env.packageInfo.version,
       ...memoryInfo,
     });
   }
@@ -376,7 +437,7 @@ export class CloudPlugin implements Plugin<CloudSetup> {
 }
 
 /** @internal exported for testing */
-export const loadFullStoryUserId = async ({
+export const loadUserId = async ({
   getCurrentUser,
 }: {
   getCurrentUser: () => Promise<AuthenticatedUser>;
@@ -391,7 +452,7 @@ export const loadFullStoryUserId = async ({
     if (!currentUser.username) {
       // eslint-disable-next-line no-console
       console.debug(
-        `[cloud.full_story] username not specified. User metadata: ${JSON.stringify(
+        `[cloud.analytics] username not specified. User metadata: ${JSON.stringify(
           currentUser.metadata
         )}`
       );
@@ -400,7 +461,7 @@ export const loadFullStoryUserId = async ({
     return currentUser.username;
   } catch (e) {
     // eslint-disable-next-line no-console
-    console.error(`[cloud.full_story] Error loading the current user: ${e.toString()}`, e);
+    console.error(`[cloud.analytics] Error loading the current user: ${e.toString()}`, e);
     return undefined;
   }
 };
diff --git a/x-pack/plugins/cloud/public/user_menu_links.ts b/x-pack/plugins/cloud/public/user_menu_links.ts
index f00911d577c59..55c41831cc18c 100644
--- a/x-pack/plugins/cloud/public/user_menu_links.ts
+++ b/x-pack/plugins/cloud/public/user_menu_links.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UserMenuLink } from '../../security/public';
+import { UserMenuLink } from '@kbn/security-plugin/public';
 import { CloudConfigType } from '.';
 import { getFullCloudUrl } from './utils';
 
diff --git a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts
index 494e697403147..f9fdef5319d59 100644
--- a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts
+++ b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { createCloudUsageCollector } from './cloud_usage_collector';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const mockUsageCollection = () => ({
   makeUsageCollector: jest.fn().mockImplementation((args: any) => ({ ...args })),
diff --git a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
index 87a7c18cc146e..28f6e8c94d0b8 100644
--- a/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
+++ b/x-pack/plugins/cloud/server/collectors/cloud_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 interface Config {
   isCloudEnabled: boolean;
diff --git a/x-pack/plugins/cloud/server/config.ts b/x-pack/plugins/cloud/server/config.ts
index c5a122c2ec702..bee83e23475b5 100644
--- a/x-pack/plugins/cloud/server/config.ts
+++ b/x-pack/plugins/cloud/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const apmConfigSchema = schema.object({
   url: schema.maybe(schema.string()),
diff --git a/x-pack/plugins/cloud/server/index.ts b/x-pack/plugins/cloud/server/index.ts
index eda2fa0a7324e..4381ddaa0c3cc 100644
--- a/x-pack/plugins/cloud/server/index.ts
+++ b/x-pack/plugins/cloud/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CloudPlugin } from './plugin';
 
 export type { CloudSetup } from './plugin';
diff --git a/x-pack/plugins/cloud/server/plugin.ts b/x-pack/plugins/cloud/server/plugin.ts
index a5cf423fb8295..fbf3c925cff87 100644
--- a/x-pack/plugins/cloud/server/plugin.ts
+++ b/x-pack/plugins/cloud/server/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import type { SecurityPluginSetup } from '../../security/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { CloudConfigType } from './config';
 import { registerCloudUsageCollector } from './collectors';
 import { getIsCloudEnabled } from '../common/is_cloud_enabled';
diff --git a/x-pack/plugins/cloud/server/routes/chat.test.ts b/x-pack/plugins/cloud/server/routes/chat.test.ts
index e12278e264e5e..c21b72bd9d10c 100644
--- a/x-pack/plugins/cloud/server/routes/chat.test.ts
+++ b/x-pack/plugins/cloud/server/routes/chat.test.ts
@@ -11,9 +11,9 @@ jest.mock('jsonwebtoken', () => ({
   },
 }));
 
-import { httpServiceMock, httpServerMock } from '../../../../../src/core/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { kibanaResponseFactory } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { registerChatRoute } from './chat';
 
 describe('chat route', () => {
diff --git a/x-pack/plugins/cloud/server/routes/chat.ts b/x-pack/plugins/cloud/server/routes/chat.ts
index 1bc3505c087ae..3efb2cc34b3a1 100644
--- a/x-pack/plugins/cloud/server/routes/chat.ts
+++ b/x-pack/plugins/cloud/server/routes/chat.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../src/core/server';
-import type { SecurityPluginSetup, AuthenticatedUser } from '../../../security/server';
+import { IRouter } from '@kbn/core/server';
+import type { SecurityPluginSetup, AuthenticatedUser } from '@kbn/security-plugin/server';
 import { GET_CHAT_USER_DATA_ROUTE_PATH } from '../../common/constants';
 import type { GetChatUserDataResponseBody } from '../../common/types';
 import { generateSignedJwt } from '../util/generate_jwt';
diff --git a/x-pack/plugins/cloud/server/routes/fullstory.ts b/x-pack/plugins/cloud/server/routes/fullstory.ts
index c614d803eed9f..e9f4835494a4e 100644
--- a/x-pack/plugins/cloud/server/routes/fullstory.ts
+++ b/x-pack/plugins/cloud/server/routes/fullstory.ts
@@ -9,7 +9,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import { createHash } from 'crypto';
 import { once } from 'lodash';
-import { HttpResources, HttpResponseOptions, PackageInfo } from '../../../../../src/core/server';
+import { HttpResources, HttpResponseOptions, PackageInfo } from '@kbn/core/server';
 
 const MINUTE = 60;
 const HOUR = 60 * MINUTE;
diff --git a/x-pack/plugins/cloud_security_posture/common/constants.ts b/x-pack/plugins/cloud_security_posture/common/constants.ts
index 37cddf0eba9a5..a45222ebbcec9 100644
--- a/x-pack/plugins/cloud_security_posture/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/common/constants.ts
@@ -5,18 +5,23 @@
  * 2.0.
  */
 
-export const STATS_ROUTE_PATH = '/api/csp/stats';
-export const FINDINGS_ROUTE_PATH = '/api/csp/findings';
-export const BENCHMARKS_ROUTE_PATH = '/api/csp/benchmarks';
-export const UPDATE_RULES_CONFIG_ROUTE_PATH = '/api/csp/update_rules_config';
+export const STATS_ROUTE_PATH = '/internal/cloud_security_posture/stats';
+export const FINDINGS_ROUTE_PATH = '/internal/cloud_security_posture/findings';
+export const BENCHMARKS_ROUTE_PATH = '/internal/cloud_security_posture/benchmarks';
+export const UPDATE_RULES_CONFIG_ROUTE_PATH =
+  '/internal/cloud_security_posture/update_rules_config';
 
 export const CSP_FINDINGS_INDEX_NAME = 'findings';
 export const CIS_KUBERNETES_PACKAGE_NAME = 'cis_kubernetes_benchmark';
+export const FINDINGS_DATA_STREAM_NAME =
+  // Currently 'cis_kubernetes_benchmark.findings', To be refactored to 'cloud_security_posture.findings'
+  CIS_KUBERNETES_PACKAGE_NAME + '.' + CSP_FINDINGS_INDEX_NAME;
 export const LATEST_FINDINGS_INDEX_NAME = 'cloud_security_posture.findings_latest';
 export const BENCHMARK_SCORE_INDEX_NAME = 'cloud_security_posture.scores';
 
 export const AGENT_LOGS_INDEX_PATTERN = '.logs-cis_kubernetes_benchmark.metadata*';
-export const CSP_KUBEBEAT_INDEX_PATTERN = 'logs-cis_kubernetes_benchmark.findings*';
+export const CSP_KUBEBEAT_INDEX_PATTERN = 'logs-cis_kubernetes_benchmark.findings-*';
+export const FINDINGS_INDEX_PATTERN = 'logs-' + FINDINGS_DATA_STREAM_NAME + '-default';
 export const LATEST_FINDINGS_INDEX_PATTERN = 'logs-' + LATEST_FINDINGS_INDEX_NAME + '-default';
 export const BENCHMARK_SCORE_INDEX_PATTERN = 'logs-' + BENCHMARK_SCORE_INDEX_NAME + '-default';
 
@@ -29,4 +34,5 @@ export const INTERNAL_FEATURE_FLAGS = {
   showBenchmarks: false,
   showManageRulesMock: false,
   showRisksMock: false,
+  showFindingsGroupBy: false,
 } as const;
diff --git a/x-pack/plugins/cloud_security_posture/common/types.ts b/x-pack/plugins/cloud_security_posture/common/types.ts
index b9403128220f5..0aee5ce2f350d 100644
--- a/x-pack/plugins/cloud_security_posture/common/types.ts
+++ b/x-pack/plugins/cloud_security_posture/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PackagePolicy, GetAgentPoliciesResponseItem } from '../../fleet/common';
+import type { PackagePolicy, GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 
 export type Evaluation = 'passed' | 'failed' | 'NA';
 /** number between 1-100 */
diff --git a/x-pack/plugins/cloud_security_posture/public/application/app.tsx b/x-pack/plugins/cloud_security_posture/public/application/app.tsx
index 23e5178be326f..c18a9c0083026 100755
--- a/x-pack/plugins/cloud_security_posture/public/application/app.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/application/app.tsx
@@ -10,14 +10,11 @@ import { Router, Redirect, Switch, Route } from 'react-router-dom';
 import type { RouteProps } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { EuiErrorBoundary } from '@elastic/eui';
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
 import { allNavigationItems } from '../common/navigation/constants';
 import { CspNavigationItem } from '../common/navigation/types';
 import { UnknownRoute } from '../components/unknown_route';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
-import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '../../../../../src/core/public';
 import type { CspClientPluginStartDeps } from '../types';
 import { pageToComponentMapping } from './constants';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/application/index.tsx b/x-pack/plugins/cloud_security_posture/public/application/index.tsx
index 38fbef254ea44..f299745fa2ba0 100644
--- a/x-pack/plugins/cloud_security_posture/public/application/index.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/application/index.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { CspApp } from './app';
-import type { AppMountParameters, CoreStart } from '../../../../../src/core/public';
 import type { CspClientPluginStartDeps } from '../types';
 
 export const renderApp = (
diff --git a/x-pack/plugins/cloud_security_posture/public/assets/icons/cis_logo.svg b/x-pack/plugins/cloud_security_posture/public/assets/icons/cis_logo.svg
new file mode 100644
index 0000000000000..c5e4849425d8a
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/assets/icons/cis_logo.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="364px" height="364px" viewBox="0 0 364 364" version="1.1">
+    <title>Logos/CIS/CIS_logo_no-tag_stacked_large</title>
+    <defs>
+        <linearGradient x1="7.07315124e-06%" y1="50%" x2="100.000007%" y2="50%" id="linearGradient-1">
+            <stop stop-color="#0083C1" offset="0%"/>
+            <stop stop-color="#0083C1" offset="30%"/>
+            <stop stop-color="#0083C1" stop-opacity="0" offset="96%"/>
+        </linearGradient>
+        <linearGradient x1="26.1416475%" y1="21.3703432%" x2="54.9973025%" y2="62.8950176%" id="linearGradient-2">
+            <stop stop-color="#0083C1" offset="0%"/>
+            <stop stop-color="#0083C1" offset="30%"/>
+            <stop stop-color="#0083C1" stop-opacity="0" offset="90%"/>
+        </linearGradient>
+    </defs>
+    <g id="Logos/CIS/CIS_logo_no-tag_stacked_large" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="CIS-Logo-2-Line-2-Spot">
+            <path d="M182.021968,8.53125 C277.814564,8.53125 355.469807,86.1958548 355.469807,182 C355.469807,277.804145 277.814564,355.46875 182.021968,355.46875 C178.960206,355.46875 175.917841,355.389319 172.894872,355.230458 C169.872444,355.072601 166.871038,354.838366 163.890655,354.527753 L163.44532,358.765125 L163,363.002498 C166.127018,363.328903 169.276092,363.576755 172.44722,363.746053 C175.617951,363.913834 178.809515,364 182.021911,364 C282.525619,364 364,282.515853 364,182.000028 C364,81.484204 282.525675,0 182.021968,0 C178.809989,0 175.618425,0.0846631771 172.447277,0.253989531 C169.276537,0.421770781 166.127464,0.66965099 163,0.997630156 L163.445377,5.23495984 L163.890712,9.47228953 C166.870602,9.16269047 169.872008,8.92845552 172.894929,8.76958469 C175.917319,8.61171865 178.959665,8.53227375 182.021968,8.53125 Z" id="Path"/>
+            <path d="M321.399443,181.94592 C321.389731,247.758795 275.379477,304.599795 211.039543,318.284375 C146.69961,331.968955 81.5588663,298.768868 54.793377,238.650861 L50.8966814,240.386699 L47,242.12258 C69.9653962,293.839532 120.404925,327.917988 176.931299,329.908054 C233.457673,331.89812 286.16645,301.451101 312.70814,251.477094 C339.24983,201.503088 334.973849,140.75844 301.693293,95 L298.243093,97.5080572 L294.79288,100.016129 C312.125417,123.809748 321.44357,152.503206 321.399443,181.94592 L321.399443,181.94592 Z" id="Path"/>
+            <path d="M149.594523,154.988343 C149.616789,153.363816 149.25995,151.756373 148.552185,150.292948 C147.902427,148.995814 146.977573,147.855043 145.841706,146.949679 C143.515504,145.107287 140.770464,143.863702 137.848528,143.328532 C135.220249,142.777636 132.541004,142.504782 129.855292,142.514501 C123.738501,142.514501 115.988513,143.172584 109.767726,148.543212 C103.546939,153.91384 98.855411,163.997 98.855411,182.847141 C98.855411,194.419566 100.836375,204.225103 105.753991,211.137541 C110.671607,218.049979 118.525875,222.069304 130.272452,222.069304 C133.050547,222.114185 135.823326,221.811627 138.525924,221.168709 C141.345364,220.550712 143.902124,219.073451 145.841749,216.941726 C146.789667,215.915802 147.516916,214.707268 147.978713,213.390545 C148.520334,211.813127 148.784766,210.154324 148.76036,208.487209 L151.541438,208.487209 C151.402228,210.496935 151.263019,212.576216 151.158569,214.967195 C151.054119,217.358174 150.984543,220.060753 150.984543,223.316906 L150.984543,225.675041 C147.273125,226.802721 143.462043,227.573907 139.603348,227.978069 C135.584207,228.459261 131.540496,228.708073 127.492511,228.723254 C119.42627,228.862449 111.39981,227.565773 103.790357,224.894166 C97.1443839,222.559808 91.2587757,218.470185 86.7615771,213.061694 C83.8527349,209.382313 81.6603177,205.192592 80.2975717,200.708946 C78.7149304,195.45638 77.9414091,189.994659 78.003457,184.51054 C78.003457,172.521114 81.4093437,162.749865 87.0394278,155.178778 C92.7308216,147.708471 100.521171,142.093769 109.420526,139.048155 C113.069473,137.831142 116.838523,137.006794 120.66335,136.58918 C123.944748,136.199662 127.246285,136.002929 130.550857,136 C135.902763,136 141.046126,136.380984 145.007927,136.762053 C148.969728,137.143122 151.749953,137.524106 152.3756,137.524106 C152.236391,138.841404 152.166786,140.296947 152.13197,141.769628 C152.097153,143.242308 152.097167,144.73214 152.097167,146.118001 C152.097167,147.919729 152.131828,149.686617 152.18396,151.228427 C152.236093,152.770237 152.305712,154.086969 152.3756,154.988399 L149.594523,154.988399 L149.594523,154.988343 Z M196.853682,142.235745 C195.523643,143.864116 194.750274,145.873623 194.646403,147.971099 C194.256297,152.19257 194.111008,156.432978 194.21126,160.671151 L194.21126,208.347817 C194.1481,211.494512 194.275814,214.642136 194.593703,217.773461 C194.709187,219.343724 195.197911,220.864024 196.019463,222.208653 C196.49323,222.894341 197.094874,223.482755 197.791599,223.941819 C199.380091,224.975507 201.213864,225.573323 203.108007,225.674985 L203.108007,228.167923 C200.39794,228.029664 196.923003,227.925736 193.517401,227.856338 C190.111798,227.786939 186.775516,227.752084 184.342774,227.752084 C181.910033,227.752084 178.608709,227.786939 175.237767,227.856338 C171.866825,227.925736 168.426264,228.029707 165.715089,228.167923 L165.715089,225.674942 C166.845073,225.660431 167.963188,225.443031 169.015844,225.033161 C170.363456,224.523821 171.56775,223.697499 172.526294,222.624478 C173.845737,220.995964 174.59618,218.982664 174.663684,216.890258 C175.003494,212.666311 175.125401,208.427745 175.028924,204.191324 L175.028924,156.512449 C175.088806,153.367573 174.984494,150.22172 174.716413,147.087655 C174.636003,145.520515 174.17038,143.997122 173.360542,142.651613 C172.883546,141.962968 172.275494,141.374474 171.570934,140.919566 C169.939849,139.880688 168.065306,139.283714 166.13222,139.187533 L166.13222,136.692315 C168.843395,136.831678 172.3189,136.935649 175.724787,137.004778 C179.130674,137.073908 182.466956,137.108168 184.899697,137.108168 C187.331303,137.108168 190.63264,137.073879 194.003582,137.004778 C197.374525,136.935677 200.815086,136.831678 203.525138,136.692315 L203.525138,139.187533 C200.976376,139.249333 198.564712,140.351236 196.853711,142.235745 L196.853682,142.235745 Z M239.804239,228.999854 C235.874684,229.006232 231.947573,228.80391 228.039622,228.393596 C224.298388,228.040144 220.601967,227.314664 217.005498,226.227978 L217.005498,223.872137 C217.005498,220.614866 216.936163,217.773461 216.831898,215.243954 C216.727633,212.714447 216.588395,210.496865 216.448604,208.487195 L219.230818,208.487195 C219.473847,210.459007 220.067938,212.371736 220.985141,214.13539 C221.84221,215.771767 223.046126,217.202617 224.513347,218.32865 C226.43202,219.851183 228.626162,220.992079 230.976514,221.689325 C233.341819,222.406568 235.801045,222.76871 238.273319,222.763842 C247.239955,222.763842 251.758168,219.783626 254.034824,216.456956 C255.635106,213.957764 256.440815,211.034858 256.346369,208.071271 C256.52256,204.270228 255.128165,200.563353 252.488435,197.815295 C250.090353,195.286085 246.754071,193.311256 243.001255,190.885719 L239.108647,188.390501 L235.216038,185.895282 C230.664317,183.185932 226.643297,179.675793 223.348278,175.535349 C220.162419,171.137483 218.519503,165.815138 218.673881,160.392297 C218.704697,155.090943 220.570725,149.962842 223.956453,145.875063 C228.404833,140.608689 236.467361,136.139222 250.924005,136.139222 C255.659023,136.110281 260.39229,136.329757 265.104176,136.796738 C268.440728,137.142924 270.595591,137.52395 272.194113,137.663328 C271.974544,139.090281 271.875462,140.533088 271.897909,141.976563 C271.880153,143.587785 271.914543,145.008488 271.914543,145.146732 C271.914543,147.918426 271.984432,149.997806 272.054335,151.57474 C272.124238,153.151674 272.194113,154.226191 272.194113,154.988244 L269.274379,154.988244 C269.156731,153.370002 268.750748,151.78562 268.075474,150.30942 C267.446222,148.955498 266.581141,147.723563 265.520412,146.670838 C263.617633,144.904804 261.279246,143.673337 258.743583,143.101953 C256.321857,142.507183 253.835133,142.216164 251.341093,142.235646 C244.18266,142.235646 240.186341,144.314997 237.97963,146.983302 C236.166891,149.356166 235.239197,152.284205 235.355816,155.264733 C235.245787,158.411221 236.324576,161.484229 238.378649,163.875496 C240.900452,166.521434 243.820006,168.759834 247.032448,170.510297 L251.480828,173.213457 L255.929195,175.916616 C261.489049,179.312133 266.006793,182.465434 269.134517,186.519614 C272.26224,190.573794 274,195.52881 274,202.527798 C274,211.398182 270.525063,218.016144 264.513104,222.416495 C258.501146,226.816846 249.952309,228.999854 239.804239,228.999854 L239.804239,228.999854 Z" id="Shape" fill="#003A5D" fill-rule="nonzero"/>
+            <path d="M287.9999,223.468253 C288.008709,224.936984 287.434031,226.349147 286.402094,227.394313 C285.378677,228.426389 283.983998,229.004764 282.530535,228.999928 C281.057766,229.007441 279.643637,228.423308 278.605558,227.378569 C277.569437,226.329529 276.992037,224.912147 277.000083,223.437715 C276.995028,221.984293 277.58325,220.591721 278.628781,219.582094 C279.703456,218.553829 281.137388,217.986186 282.624692,218.000255 C284.054445,218.008544 285.420472,218.592917 286.413863,219.621225 C287.425587,220.646612 287.994973,222.02778 287.9999,223.468253 L287.9999,223.468253 Z M277.905924,223.468253 C277.903082,224.694868 278.38787,225.872325 279.253549,226.741349 C280.112123,227.606927 281.281022,228.093479 282.500195,228.092762 C283.719369,228.092044 284.887694,227.604115 285.745248,226.737526 C286.613348,225.859219 287.097891,224.672617 287.09275,223.437715 C287.09039,222.228795 286.597119,221.072669 285.725998,220.234425 C284.845046,219.379749 283.665031,218.903078 282.437615,218.906058 C281.235307,218.913447 280.085934,219.401574 279.245753,220.261622 C278.394158,221.112264 277.912676,222.264613 277.905924,223.468253 L277.905924,223.468253 Z M280.124697,220.093053 L282.281172,220.093053 C282.957293,220.05472 283.632344,220.184995 284.245647,220.472168 C284.648923,220.735446 284.929997,221.149229 285.026119,221.621146 C285.122242,222.093062 285.025411,222.583819 284.757242,222.983858 C284.532659,223.269711 284.204224,223.455247 283.843471,223.500055 L283.843471,223.562396 C284.009314,223.614725 284.159616,223.707311 284.280956,223.831886 C284.386238,223.945176 284.470704,224.076154 284.53047,224.218797 L285.077525,225.421686 L285.624581,226.624616 L283.749327,226.624616 L283.327572,225.624601 L282.90583,224.624641 C282.843502,224.462616 282.736466,224.32161 282.597165,224.218013 C282.392761,224.11588 282.163994,224.072562 281.9364,224.092893 L281.749406,224.092893 L281.749406,226.624616 L280.124766,226.624616 L280.124766,220.093039 L280.124697,220.093053 Z M281.749337,222.875402 L281.968162,222.875402 C282.33564,222.902534 282.704441,222.844914 283.046131,222.706984 C283.270174,222.588093 283.399839,222.345305 283.374045,222.092987 C283.396708,221.863424 283.262144,221.647324 283.046131,221.566381 C282.697776,221.457579 282.332339,221.413964 281.968162,221.437727 L281.749337,221.437727 L281.749337,222.875429 L281.749337,222.875402 Z" id="Shape" fill="#0083C1" fill-rule="nonzero"/>
+            <path d="M181.978035,355.46875 C86.1854521,355.46875 8.53022039,277.804145 8.53022039,182 C8.53022039,86.1958548 86.1854521,8.53125 181.978035,8.53125 C185.039815,8.53125 188.08218,8.61068068 191.105129,8.76954203 C194.127557,8.92739859 197.128967,9.16163354 200.10936,9.47224688 L200.55468,5.23487453 L201,0.997502188 C197.872973,0.671096563 194.7239,0.423244792 191.552781,0.253946875 C188.382022,0.0861845833 185.19044,0 181.978035,0 C81.4743415,0 0,81.4841755 0,182 C0,282.515824 81.4743415,364 181.978035,364 C185.190023,364 188.381591,363.915337 191.552738,363.74601 C194.723478,363.578229 197.872551,363.330349 201,363.00237 L200.554637,358.76504 L200.109317,354.52771 C197.129427,354.83731 194.128017,355.071544 191.105087,355.230415 C188.082735,355.388291 185.040384,355.467736 181.978035,355.46875 Z" id="Path" fill="url(#linearGradient-1)" fill-rule="nonzero"/>
+            <path d="M42.6005901,182.054104 C42.6103015,116.241248 88.6205483,59.4002649 152.960471,45.7156886 C217.300393,32.0311123 282.441125,65.2311899 309.20661,125.34918 L313.103305,123.613342 L317,121.877504 C294.03464,70.160526 243.595114,36.0820346 187.068727,34.0919482 C130.542339,32.1018618 77.8335412,62.5488798 51.2918496,112.522897 C24.750158,162.496913 29.0261602,223.241572 62.3067513,269 L65.75695,266.491944 L69.207163,263.983873 C51.8746234,240.190262 42.5564673,211.496812 42.6005901,182.054104 Z" id="Path" fill="url(#linearGradient-2)" fill-rule="nonzero"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/x-pack/plugins/cloud_security_posture/public/assets/icons/k8s_logo.svg b/x-pack/plugins/cloud_security_posture/public/assets/icons/k8s_logo.svg
new file mode 100644
index 0000000000000..1949c06d51520
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/assets/icons/k8s_logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256px" height="249px" viewBox="0 0 256 249" version="1.1" preserveAspectRatio="xMidYMid">
+	<g>
+		<path d="M82.0851613,244.934194 C76.1393548,244.934194 70.523871,242.291613 66.7251613,237.501935 L8.91870968,165.656774 C5.12,160.867097 3.63354839,154.756129 5.12,148.810323 L25.7651613,59.1277419 C27.0864516,53.1819355 31.0503226,48.3922581 36.5006452,45.7496774 L120.072258,5.78064516 C122.714839,4.45935484 125.687742,3.79870968 128.660645,3.79870968 C131.633548,3.79870968 134.606452,4.45935484 137.249032,5.78064516 L220.820645,45.5845161 C226.270968,48.2270968 230.234839,53.0167742 231.556129,58.9625806 L252.20129,148.645161 C253.522581,154.590968 252.20129,160.701935 248.402581,165.491613 L190.596129,237.336774 C186.797419,241.96129 181.181935,244.769032 175.236129,244.769032 L82.0851613,244.934194 L82.0851613,244.934194 Z" fill="#326DE6"/>
+		<path d="M128.495484,7.92774194 C130.807742,7.92774194 133.12,8.42322581 135.267097,9.41419355 L218.83871,49.2180645 C223.132903,51.3651613 226.436129,55.3290323 227.427097,59.9535484 L248.072258,149.636129 C249.228387,154.425806 248.072258,159.380645 244.934194,163.179355 L187.127742,235.024516 C184.154839,238.823226 179.530323,240.970323 174.740645,240.970323 L82.0851613,240.970323 C77.2954839,240.970323 72.6709677,238.823226 69.6980645,235.024516 L11.8916129,163.179355 C8.91870968,159.380645 7.76258065,154.425806 8.75354839,149.636129 L29.3987097,59.9535484 C30.5548387,55.163871 33.6929032,51.2 37.9870968,49.2180645 L121.55871,9.24903226 C123.705806,8.42322581 126.183226,7.92774194 128.495484,7.92774194 L128.495484,7.92774194 Z M128.495484,0.16516129 L128.495484,0.16516129 C125.027097,0.16516129 121.55871,0.990967742 118.255484,2.47741935 L34.683871,42.4464516 C28.0774194,45.5845161 23.4529032,51.3651613 21.8012903,58.4670968 L1.15612903,148.149677 C-0.495483871,155.251613 1.15612903,162.51871 5.78064516,168.299355 L63.5870968,240.144516 C68.0464516,245.76 74.8180645,248.898065 81.92,248.898065 L174.575484,248.898065 C181.677419,248.898065 188.449032,245.76 192.908387,240.144516 L250.714839,168.299355 C255.339355,162.683871 256.990968,155.251613 255.339355,148.149677 L234.694194,58.4670968 C233.042581,51.3651613 228.418065,45.5845161 221.811613,42.4464516 L138.570323,2.47741935 C135.432258,0.990967742 131.963871,0.16516129 128.495484,0.16516129 L128.495484,0.16516129 L128.495484,0.16516129 Z" fill="#FFFFFF"/>
+		<path d="M212.232258,142.534194 L212.232258,142.534194 L212.232258,142.534194 C212.067097,142.534194 212.067097,142.534194 212.232258,142.534194 L212.067097,142.534194 C211.901935,142.534194 211.736774,142.534194 211.736774,142.369032 C211.406452,142.369032 211.076129,142.203871 210.745806,142.203871 C209.589677,142.03871 208.59871,141.873548 207.607742,141.873548 C207.112258,141.873548 206.616774,141.873548 205.956129,141.708387 L205.790968,141.708387 C202.322581,141.378065 199.514839,141.047742 196.872258,140.221935 C195.716129,139.726452 195.385806,139.065806 195.055484,138.405161 C195.055484,138.24 194.890323,138.24 194.890323,138.074839 L194.890323,138.074839 L192.743226,137.414194 C193.734194,129.816774 193.403871,121.889032 191.587097,114.126452 C189.770323,106.363871 186.632258,99.0967742 182.338065,92.4903226 L183.989677,91.003871 L183.989677,90.6735484 C183.989677,89.8477419 184.154839,89.0219355 184.815484,88.196129 C186.797419,86.3793548 189.274839,84.8929032 192.247742,83.076129 L192.247742,83.076129 C192.743226,82.7458065 193.23871,82.5806452 193.734194,82.2503226 C194.725161,81.7548387 195.550968,81.2593548 196.541935,80.5987097 C196.707097,80.4335484 197.037419,80.2683871 197.367742,79.9380645 C197.532903,79.7729032 197.698065,79.7729032 197.698065,79.6077419 L197.698065,79.6077419 C200.010323,77.6258065 200.505806,74.3225806 198.854194,72.1754839 C198.028387,71.0193548 196.541935,70.3587097 195.055484,70.3587097 C193.734194,70.3587097 192.578065,70.8541935 191.421935,71.68 L191.421935,71.68 L191.421935,71.68 C191.256774,71.8451613 191.256774,71.8451613 191.091613,72.0103226 C190.76129,72.1754839 190.596129,72.5058065 190.265806,72.6709677 C189.44,73.4967742 188.779355,74.1574194 188.11871,74.9832258 C187.788387,75.3135484 187.458065,75.8090323 186.962581,76.1393548 L186.962581,76.1393548 C184.650323,78.6167742 182.503226,80.5987097 180.356129,82.0851613 C179.860645,82.4154839 179.365161,82.5806452 178.869677,82.5806452 C178.539355,82.5806452 178.209032,82.5806452 177.87871,82.4154839 L177.548387,82.4154839 L177.548387,82.4154839 L175.566452,83.7367742 C173.419355,81.4245161 171.107097,79.4425806 168.794839,77.4606452 C158.885161,69.6980645 146.828387,64.9083871 134.276129,63.7522581 L134.110968,61.6051613 C133.945806,61.44 133.945806,61.44 133.780645,61.2748387 C133.285161,60.7793548 132.624516,60.283871 132.459355,59.1277419 C132.294194,56.4851613 132.624516,53.5122581 132.954839,50.2090323 L132.954839,50.043871 C132.954839,49.5483871 133.12,48.8877419 133.285161,48.3922581 C133.450323,47.4012903 133.615484,46.4103226 133.780645,45.2541935 L133.780645,44.2632258 L133.780645,43.7677419 L133.780645,43.7677419 L133.780645,43.7677419 C133.780645,40.7948387 131.468387,38.3174194 128.660645,38.3174194 C127.339355,38.3174194 126.018065,38.9780645 125.027097,39.9690323 C124.036129,40.96 123.540645,42.2812903 123.540645,43.7677419 L123.540645,43.7677419 L123.540645,43.7677419 L123.540645,44.0980645 L123.540645,45.0890323 C123.540645,46.2451613 123.705806,47.236129 124.036129,48.2270968 C124.20129,48.7225806 124.20129,49.2180645 124.366452,49.8787097 L124.366452,50.043871 C124.696774,53.3470968 125.192258,56.32 124.861935,58.9625806 C124.696774,60.1187097 124.036129,60.6141935 123.540645,61.1096774 C123.375484,61.2748387 123.375484,61.2748387 123.210323,61.44 L123.210323,61.44 L123.045161,63.5870968 C120.072258,63.9174194 117.099355,64.2477419 114.126452,64.9083871 C101.409032,67.716129 90.1780645,74.1574194 81.4245161,83.4064516 L79.7729032,82.2503226 L79.4425806,82.2503226 C79.1122581,82.2503226 78.7819355,82.4154839 78.4516129,82.4154839 C77.956129,82.4154839 77.4606452,82.2503226 76.9651613,81.92 C74.8180645,80.4335484 72.6709677,78.2864516 70.3587097,75.8090323 L70.3587097,75.8090323 C70.0283871,75.4787097 69.6980645,74.9832258 69.2025806,74.6529032 C68.5419355,73.8270968 67.8812903,73.1664516 67.0554839,72.3406452 C66.8903226,72.1754839 66.56,72.0103226 66.2296774,71.68 C66.0645161,71.5148387 65.8993548,71.5148387 65.8993548,71.3496774 L65.8993548,71.3496774 C64.9083871,70.523871 63.5870968,70.0283871 62.2658065,70.0283871 C60.7793548,70.0283871 59.2929032,70.6890323 58.4670968,71.8451613 C56.8154839,73.9922581 57.3109677,77.2954839 59.6232258,79.2774194 L59.6232258,79.2774194 L59.6232258,79.2774194 C59.7883871,79.2774194 59.7883871,79.4425806 59.9535484,79.4425806 C60.283871,79.6077419 60.4490323,79.9380645 60.7793548,80.1032258 C61.7703226,80.763871 62.596129,81.2593548 63.5870968,81.7548387 C64.0825806,81.92 64.5780645,82.2503226 65.0735484,82.5806452 L65.0735484,82.5806452 C68.0464516,84.3974194 70.523871,85.883871 72.5058065,87.7006452 C73.3316129,88.5264516 73.3316129,89.3522581 73.3316129,90.1780645 L73.3316129,90.5083871 L73.3316129,90.5083871 L74.9832258,91.9948387 C74.6529032,92.4903226 74.3225806,92.8206452 74.1574194,93.316129 C65.8993548,106.363871 62.7612903,121.723871 64.9083871,136.91871 L62.7612903,137.579355 C62.7612903,137.744516 62.596129,137.744516 62.596129,137.909677 C62.2658065,138.570323 61.7703226,139.230968 60.7793548,139.726452 C58.3019355,140.552258 55.3290323,140.882581 51.8606452,141.212903 L51.6954839,141.212903 C51.2,141.212903 50.5393548,141.212903 50.043871,141.378065 C49.0529032,141.378065 48.0619355,141.543226 46.9058065,141.708387 C46.5754839,141.708387 46.2451613,141.873548 45.9148387,141.873548 C45.7496774,141.873548 45.5845161,141.873548 45.4193548,142.03871 L45.4193548,142.03871 L45.4193548,142.03871 C42.4464516,142.699355 40.6296774,145.507097 41.1251613,148.149677 C41.6206452,150.461935 43.7677419,151.948387 46.4103226,151.948387 C46.9058065,151.948387 47.236129,151.948387 47.7316129,151.783226 L47.7316129,151.783226 L47.7316129,151.783226 C47.8967742,151.783226 48.0619355,151.783226 48.0619355,151.618065 C48.3922581,151.618065 48.7225806,151.452903 49.0529032,151.452903 C50.2090323,151.122581 51.0348387,150.792258 52.0258065,150.296774 C52.5212903,150.131613 53.0167742,149.80129 53.5122581,149.636129 L53.6774194,149.636129 C56.8154839,148.48 59.6232258,147.489032 62.2658065,147.15871 L62.596129,147.15871 C63.5870968,147.15871 64.2477419,147.654194 64.7432258,147.984516 C64.9083871,147.984516 64.9083871,148.149677 65.0735484,148.149677 L65.0735484,148.149677 L67.3858065,147.819355 C71.3496774,160.04129 78.9470968,170.941935 89.0219355,178.869677 C91.3341935,180.686452 93.6464516,182.172903 96.123871,183.659355 L95.1329032,185.806452 C95.1329032,185.971613 95.2980645,185.971613 95.2980645,186.136774 C95.6283871,186.797419 95.9587097,187.623226 95.6283871,188.779355 C94.6374194,191.256774 93.1509677,193.734194 91.3341935,196.541935 L91.3341935,196.707097 C91.003871,197.202581 90.6735484,197.532903 90.3432258,198.028387 C89.6825806,198.854194 89.1870968,199.68 88.5264516,200.670968 C88.3612903,200.836129 88.196129,201.166452 88.0309677,201.496774 C88.0309677,201.661935 87.8658065,201.827097 87.8658065,201.827097 L87.8658065,201.827097 L87.8658065,201.827097 C86.5445161,204.634839 87.5354839,207.772903 90.0129032,208.929032 C90.6735484,209.259355 91.3341935,209.424516 91.9948387,209.424516 C93.9767742,209.424516 95.9587097,208.103226 96.9496774,206.286452 L96.9496774,206.286452 L96.9496774,206.286452 C96.9496774,206.12129 97.1148387,205.956129 97.1148387,205.956129 C97.28,205.625806 97.4451613,205.295484 97.6103226,205.130323 C98.1058065,203.974194 98.2709677,203.148387 98.6012903,202.157419 C98.7664516,201.661935 98.9316129,201.166452 99.0967742,200.670968 L99.0967742,200.670968 C100.252903,197.367742 101.07871,194.725161 102.565161,192.412903 C103.225806,191.421935 104.051613,191.256774 104.712258,190.926452 C104.877419,190.926452 104.877419,190.926452 105.042581,190.76129 L105.042581,190.76129 L106.19871,188.614194 C113.465806,191.421935 121.393548,192.908387 129.32129,192.908387 C134.110968,192.908387 139.065806,192.412903 143.690323,191.256774 C146.663226,190.596129 149.470968,189.770323 152.27871,188.779355 L153.269677,190.596129 C153.434839,190.596129 153.434839,190.596129 153.6,190.76129 C154.425806,190.926452 155.086452,191.256774 155.747097,192.247742 C157.068387,194.56 158.059355,197.367742 159.215484,200.505806 L159.215484,200.670968 C159.380645,201.166452 159.545806,201.661935 159.710968,202.157419 C160.04129,203.148387 160.206452,204.139355 160.701935,205.130323 C160.867097,205.460645 161.032258,205.625806 161.197419,205.956129 C161.197419,206.12129 161.362581,206.286452 161.362581,206.286452 L161.362581,206.286452 L161.362581,206.286452 C162.353548,208.268387 164.335484,209.424516 166.317419,209.424516 C166.978065,209.424516 167.63871,209.259355 168.299355,208.929032 C169.455484,208.268387 170.446452,207.277419 170.776774,205.956129 C171.107097,204.634839 171.107097,203.148387 170.446452,201.827097 L170.446452,201.827097 L170.446452,201.827097 C170.446452,201.661935 170.28129,201.661935 170.28129,201.496774 C170.116129,201.166452 169.950968,200.836129 169.785806,200.670968 C169.290323,199.68 168.629677,198.854194 167.969032,198.028387 C167.63871,197.532903 167.308387,197.202581 166.978065,196.707097 L166.978065,196.541935 C165.16129,193.734194 163.509677,191.256774 162.683871,188.779355 C162.353548,187.623226 162.683871,186.962581 162.849032,186.136774 C162.849032,185.971613 163.014194,185.971613 163.014194,185.806452 L163.014194,185.806452 L162.188387,183.824516 C170.941935,178.704516 178.374194,171.437419 183.989677,162.51871 C186.962581,157.894194 189.274839,152.774194 190.926452,147.654194 L192.908387,147.984516 C193.073548,147.984516 193.073548,147.819355 193.23871,147.819355 C193.899355,147.489032 194.394839,146.993548 195.385806,146.993548 L195.716129,146.993548 C198.35871,147.323871 201.166452,148.314839 204.304516,149.470968 L204.469677,149.470968 C204.965161,149.636129 205.460645,149.966452 205.956129,150.131613 C206.947097,150.627097 207.772903,150.957419 208.929032,151.287742 C209.259355,151.287742 209.589677,151.452903 209.92,151.452903 C210.085161,151.452903 210.250323,151.452903 210.415484,151.618065 L210.415484,151.618065 C210.910968,151.783226 211.24129,151.783226 211.736774,151.783226 C214.214194,151.783226 216.36129,150.131613 217.021935,147.984516 C217.021935,146.002581 215.205161,143.36 212.232258,142.534194 L212.232258,142.534194 Z M135.762581,134.44129 L128.495484,137.909677 L121.228387,134.44129 L119.411613,126.67871 L124.366452,120.402581 L132.459355,120.402581 L137.414194,126.67871 L135.762581,134.44129 L135.762581,134.44129 Z M178.869677,117.264516 C180.190968,122.88 180.52129,128.495484 180.025806,133.945806 L154.756129,126.67871 C152.443871,126.018065 151.122581,123.705806 151.618065,121.393548 C151.783226,120.732903 152.113548,120.072258 152.609032,119.576774 L172.593548,101.574194 C175.40129,106.19871 177.548387,111.483871 178.869677,117.264516 L178.869677,117.264516 Z M164.665806,91.6645161 L143.029677,107.024516 C141.212903,108.180645 138.735484,107.850323 137.249032,106.033548 C136.753548,105.538065 136.588387,104.877419 136.423226,104.216774 L134.936774,77.2954839 C146.332903,78.6167742 156.738065,83.7367742 164.665806,91.6645161 L164.665806,91.6645161 Z M116.769032,78.1212903 C118.585806,77.7909677 120.237419,77.4606452 122.054194,77.1303226 L120.567742,103.556129 C120.402581,105.868387 118.585806,107.850323 116.108387,107.850323 C115.447742,107.850323 114.621935,107.685161 114.126452,107.354839 L92.16,91.6645161 C98.9316129,84.8929032 107.354839,80.2683871 116.769032,78.1212903 L116.769032,78.1212903 Z M84.2322581,101.574194 L103.886452,119.08129 C105.703226,120.567742 105.868387,123.375484 104.381935,125.192258 C103.886452,125.852903 103.225806,126.348387 102.4,126.513548 L76.8,133.945806 C75.8090323,122.714839 78.2864516,111.31871 84.2322581,101.574194 L84.2322581,101.574194 Z M79.7729032,146.332903 L106.033548,141.873548 C108.180645,141.708387 110.162581,143.194839 110.658065,145.341935 C110.823226,146.332903 110.823226,147.15871 110.492903,147.984516 L110.492903,147.984516 L100.418065,172.263226 C91.1690323,166.317419 83.7367742,157.233548 79.7729032,146.332903 L79.7729032,146.332903 Z M140.056774,179.2 C136.258065,180.025806 132.459355,180.52129 128.495484,180.52129 C122.714839,180.52129 117.099355,179.530323 111.814194,177.87871 L124.861935,154.260645 C126.183226,152.774194 128.330323,152.113548 130.147097,153.104516 C130.972903,153.6 131.633548,154.260645 132.129032,154.92129 L132.129032,154.92129 L144.846452,177.87871 C143.36,178.374194 141.708387,178.704516 140.056774,179.2 L140.056774,179.2 Z M172.263226,156.242581 C168.134194,162.849032 162.683871,168.134194 156.407742,172.263226 L146.002581,147.323871 C145.507097,145.341935 146.332903,143.194839 148.314839,142.203871 C148.975484,141.873548 149.80129,141.708387 150.627097,141.708387 L177.052903,146.167742 C176.061935,149.80129 174.410323,153.104516 172.263226,156.242581 L172.263226,156.242581 Z" fill="#FFFFFF"/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx b/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx
index cd7d97cadee04..0a9f2c2134a6e 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_cis_kubernetes_integration.tsx
@@ -10,7 +10,7 @@ import {
   epmRouteService,
   type GetInfoResponse,
   type DefaultPackagesInstallationError,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { CIS_KUBERNETES_PACKAGE_NAME } from '../../../common/constants';
 import { useKibana } from '../hooks/use_kibana';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts
index 91bedbf83769d..4ab446395686f 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_compliance_dashboard_data_api.ts
@@ -6,7 +6,7 @@
  */
 
 import { useQuery } from 'react-query';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComplianceDashboardData } from '../../../common/types';
 import { STATS_ROUTE_PATH } from '../../../common/constants';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts
index 3e83187ef9ba1..20d22b93cb9d2 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_kubebeat_data_view.ts
@@ -6,7 +6,7 @@
  */
 
 import { useQuery } from 'react-query';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import { CspClientPluginStartDeps } from '../../types';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts
index b2d1d2a7b6bbe..1c6f252080e11 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_kibana.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreStart } from '../../../../../../src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import { useKibana as useKibanaBase } from '@kbn/kibana-react-plugin/public';
 import type { CspClientPluginStartDeps } from '../../types';
-import { useKibana as useKibanaBase } from '../../../../../../src/plugins/kibana_react/public';
 
 type CspKibanaContext = CoreStart & CspClientPluginStartDeps;
 
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts
index f11b09bc559dc..ca2ee7cd5f9e8 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_breadcrumbs.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ChromeBreadcrumb, CoreStart } from 'kibana/public';
+import type { ChromeBreadcrumb, CoreStart } from '@kbn/core/public';
 import { useEffect } from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PLUGIN_ID } from '../../../common';
 import type { CspNavigationItem } from './types';
 import { CLOUD_POSTURE } from './translations';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts
index f8b7685c776e0..a6a63847f5c77 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { pagePathGetters } from '../../../../fleet/public';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useKibana } from '../hooks/use_kibana';
 
 const CIS_INTEGRATION_PATH = pagePathGetters.integrations_all({ searchTerm: 'CIS' }).join('');
diff --git a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx
index e280bd6f0da89..c191e88a68c3c 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.test.tsx
@@ -7,7 +7,7 @@
 import React, { type ComponentProps } from 'react';
 import { render, screen } from '@testing-library/react';
 import Chance from 'chance';
-import { coreMock } from '../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createNavigationItemFixture } from '../test/fixtures/navigation_item';
 import { createReactQueryResponse } from '../test/fixtures/react_query';
 import { TestProvider } from '../test/test_provider';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx
index cc973169c2e86..d7dab061742cb 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/csp_page_template.tsx
@@ -9,10 +9,7 @@ import type { UseQueryResult } from 'react-query';
 import { NavLink } from 'react-router-dom';
 import { EuiEmptyPrompt, EuiErrorBoundary, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  KibanaPageTemplate,
-  type KibanaPageTemplateProps,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate, type KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { allNavigationItems } from '../common/navigation/constants';
 import type { CspNavigationItem } from '../common/navigation/types';
 import { CspLoadingState } from './csp_loading_state';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx
index cb4ddba3ad64c..990140f3cf949 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import type { UseQueryResult } from 'react-query/types/react/types';
-import { createStubDataView } from '../../../../../../src/plugins/data_views/public/data_views/data_view.stub';
+import { createStubDataView } from '@kbn/data-views-plugin/public/data_views/data_view.stub';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import { useKubebeatDataView } from '../../common/api/use_kubebeat_data_view';
 import { createCspBenchmarkIntegrationFixture } from '../../test/fixtures/csp_benchmark_integration';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
index 865f5169e4f31..0eaeae1bee104 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
@@ -15,9 +15,9 @@ import {
 import React from 'react';
 import moment from 'moment';
 import { Link, useHistory, generatePath } from 'react-router-dom';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { TABLE_COLUMN_HEADERS } from './translations';
 import type { Benchmark } from '../../../common/types';
-import { pagePathGetters } from '../../../../fleet/public';
 import { useKibana } from '../../common/hooks/use_kibana';
 import { allNavigationItems } from '../../common/navigation/constants';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
index 345ea32af817a..53e65d05ce08d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
@@ -6,7 +6,7 @@
  */
 
 import { useQuery } from 'react-query';
-import type { ListResult } from '../../../../fleet/common';
+import type { ListResult } from '@kbn/fleet-plugin/common';
 import { BENCHMARKS_ROUTE_PATH } from '../../../common/constants';
 import { BenchmarksQuerySchema } from '../../../common/schemas/benchmark';
 import { useKibana } from '../../common/hooks/use_kibana';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx
index dd872b49aec62..540402b986e5b 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/cloud_posture_score_chart.tsx
@@ -23,8 +23,8 @@ import { FormattedDate, FormattedTime } from '@kbn/i18n-react';
 import moment from 'moment';
 import { statusColors } from '../../../common/constants';
 import type { PostureTrend, Stats } from '../../../../common/types';
-import * as TEXT from '../translations';
 import { CompactFormattedNumber } from '../../../components/compact_formatted_number';
+import { RULE_FAILED, RULE_PASSED } from '../../../../common/constants';
 
 interface CloudPostureScoreChartProps {
   trend: PostureTrend[];
@@ -41,8 +41,8 @@ const ScoreChart = ({
   partitionOnElementClick,
 }: Omit<CloudPostureScoreChartProps, 'trend'>) => {
   const data = [
-    { label: TEXT.PASSED, value: totalPassed },
-    { label: TEXT.FAILED, value: totalFailed },
+    { label: RULE_PASSED, value: totalPassed },
+    { label: RULE_FAILED, value: totalFailed },
   ];
 
   return (
@@ -69,7 +69,7 @@ const ScoreChart = ({
             groupByRollup: (d: { label: string }) => d.label,
             shape: {
               fillColor: (d, index) =>
-                d.dataName === 'Passed' ? statusColors.success : statusColors.danger,
+                d.dataName === RULE_PASSED ? statusColors.success : statusColors.danger,
             },
           },
         ]}
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
index ff564744384e0..f7d73f92809d3 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
@@ -7,13 +7,13 @@
 
 import React from 'react';
 import { EuiSpacer, EuiIcon } from '@elastic/eui';
+import { type KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { allNavigationItems } from '../../common/navigation/constants';
 import { useCspBreadcrumbs } from '../../common/navigation/use_csp_breadcrumbs';
 import { SummarySection } from './dashboard_sections/summary_section';
 import { BenchmarksSection } from './dashboard_sections/benchmarks_section';
 import { useComplianceDashboardDataApi } from '../../common/api';
 import { CspPageTemplate } from '../../components/csp_page_template';
-import { type KibanaPageTemplateProps } from '../../../../../../src/plugins/kibana_react/public';
 import { CLOUD_POSTURE, NO_DATA_CONFIG_TEXT } from './translations';
 
 const getNoDataConfig = (onClick: () => void): KibanaPageTemplateProps['noDataConfig'] => ({
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
index 6d66542380e69..ad760ca06d215 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
@@ -7,18 +7,19 @@
 import React from 'react';
 import type { UseQueryResult } from 'react-query';
 import { render, screen } from '@testing-library/react';
+import { of } from 'rxjs';
 import { useKubebeatDataView } from '../../common/api/use_kubebeat_data_view';
 import { Findings } from './findings';
 import { TestProvider } from '../../test/test_provider';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { UnifiedSearchPublicPluginStart } from '../../../../../../src/plugins/unified_search/public';
-import { unifiedSearchPluginMock } from '../../../../../../src/plugins/unified_search/public/mocks';
-import { createStubDataView } from '../../../../../../src/plugins/data_views/public/data_views/data_view.stub';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { createStubDataView } from '@kbn/data-views-plugin/public/data_views/data_view.stub';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import * as TEST_SUBJECTS from './test_subjects';
 import { useCisKubernetesIntegration } from '../../common/api/use_cis_kubernetes_integration';
-import type { DataView } from '../../../../../../src/plugins/data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 
 jest.mock('../../common/api/use_kubebeat_data_view');
 jest.mock('../../common/api/use_cis_kubernetes_integration');
@@ -48,9 +49,7 @@ describe('<Findings />', () => {
     (useCisKubernetesIntegration as jest.Mock).mockImplementation(() => ({
       data: { item: { status: 'installed' } },
     }));
-    (source.fetch$ as jest.Mock).mockReturnValue({
-      toPromise: () => Promise.resolve({ rawResponse: { hits: { hits: [] } } }),
-    });
+    (source.fetch$ as jest.Mock).mockReturnValue(of({ rawResponse: { hits: { hits: [] } } }));
 
     (useKubebeatDataView as jest.Mock).mockReturnValue({
       status: 'success',
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.test.tsx
new file mode 100644
index 0000000000000..ea2cd9ce7c0cf
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.test.tsx
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { render } from '@testing-library/react';
+import { FindingsContainer, getDefaultQuery } from './findings_container';
+import { createStubDataView } from '@kbn/data-views-plugin/common/mocks';
+import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { TestProvider } from '../../test/test_provider';
+import { getFindingsQuery } from './use_findings';
+import { encodeQuery } from '../../common/navigation/query_utils';
+import { useLocation } from 'react-router-dom';
+import { RisonObject } from 'rison-node';
+import { buildEsQuery } from '@kbn/es-query';
+import { getFindingsCountAggQuery } from './use_findings_count';
+
+jest.mock('../../common/api/use_kubebeat_data_view');
+jest.mock('../../common/api/use_cis_kubernetes_integration');
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({ push: jest.fn() }),
+  useLocation: jest.fn(),
+}));
+
+beforeEach(() => {
+  jest.restoreAllMocks();
+});
+
+describe('<FindingsContainer />', () => {
+  it('data#search.search fn called with URL query', () => {
+    const query = getDefaultQuery();
+    const dataMock = dataPluginMock.createStartContract();
+    const dataView = createStubDataView({
+      spec: {
+        id: CSP_KUBEBEAT_INDEX_PATTERN,
+      },
+    });
+
+    (useLocation as jest.Mock).mockReturnValue({
+      search: encodeQuery(query as unknown as RisonObject),
+    });
+
+    render(
+      <TestProvider
+        deps={{
+          data: dataMock,
+          unifiedSearch: unifiedSearchPluginMock.createStartContract(),
+        }}
+      >
+        <FindingsContainer dataView={dataView} />
+      </TestProvider>
+    );
+
+    const baseQuery = {
+      index: dataView.title,
+      query: buildEsQuery(dataView, query.query, query.filters),
+    };
+
+    expect(dataMock.search.search).toHaveBeenNthCalledWith(1, {
+      params: getFindingsCountAggQuery(baseQuery),
+    });
+
+    expect(dataMock.search.search).toHaveBeenNthCalledWith(2, {
+      params: getFindingsQuery({
+        ...baseQuery,
+        sort: query.sort,
+        size: query.size,
+        from: query.from,
+      }),
+    });
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx
index 5b1d60b69e069..e41a4be639d20 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_container.tsx
@@ -4,38 +4,130 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React from 'react';
-import { EuiSpacer, EuiTitle, useEuiTheme } from '@elastic/eui';
+import React, { useEffect, useMemo } from 'react';
+import { EuiComboBoxOptionOption, EuiSpacer, EuiTitle, useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import type { DataView } from '@kbn/data-plugin/common';
+import { SortDirection } from '@kbn/data-plugin/common';
+import { buildEsQuery } from '@kbn/es-query';
 import { FindingsTable } from './findings_table';
 import { FindingsSearchBar } from './findings_search_bar';
 import * as TEST_SUBJECTS from './test_subjects';
-import type { DataView } from '../../../../../../src/plugins/data/common';
-import { SortDirection } from '../../../../../../src/plugins/data/common';
 import { useUrlQuery } from '../../common/hooks/use_url_query';
 import { useFindings, type CspFindingsRequest } from './use_findings';
+import { FindingsGroupBySelector } from './findings_group_by_selector';
+import { INTERNAL_FEATURE_FLAGS } from '../../../common/constants';
+import { useFindingsCounter } from './use_findings_count';
+import { FindingsDistributionBar } from './findings_distribution_bar';
+import type { CspClientPluginStartDeps } from '../../types';
+import { useKibana } from '../../common/hooks/use_kibana';
+import * as TEXT from './translations';
+
+export type GroupBy = 'none' | 'resourceType';
+export type FindingsBaseQuery = ReturnType<typeof getFindingsBaseEsQuery>;
 
 // TODO: define this as a schema with default values
-const getDefaultQuery = (): CspFindingsRequest => ({
+export const getDefaultQuery = (): CspFindingsRequest & { groupBy: GroupBy } => ({
   query: { language: 'kuery', query: '' },
   filters: [],
   sort: [{ ['@timestamp']: SortDirection.desc }],
   from: 0,
   size: 10,
+  groupBy: 'none',
 });
 
+const getGroupByOptions = (): Array<EuiComboBoxOptionOption<GroupBy>> => [
+  {
+    value: 'none',
+    label: i18n.translate('xpack.csp.findings.groupBySelector.groupByNoneLabel', {
+      defaultMessage: 'None',
+    }),
+  },
+  {
+    value: 'resourceType',
+    label: i18n.translate('xpack.csp.findings.groupBySelector.groupByResourceTypeLabel', {
+      defaultMessage: 'Resource Type',
+    }),
+  },
+];
+
+const getFindingsBaseEsQuery = ({
+  query,
+  dataView,
+  filters,
+  queryService,
+}: Pick<CspFindingsRequest, 'filters' | 'query'> & {
+  dataView: DataView;
+  queryService: CspClientPluginStartDeps['data']['query'];
+}) => {
+  if (query) queryService.queryString.setQuery(query);
+  queryService.filterManager.setFilters(filters);
+
+  try {
+    return {
+      index: dataView.title,
+      query: buildEsQuery(
+        dataView,
+        queryService.queryString.getQuery(),
+        queryService.filterManager.getFilters()
+      ),
+    };
+  } catch (error) {
+    return {
+      error:
+        error instanceof Error
+          ? error
+          : new Error(
+              i18n.translate('xpack.csp.findings.unknownError', {
+                defaultMessage: 'Unknown Error',
+              })
+            ),
+    };
+  }
+};
+
 export const FindingsContainer = ({ dataView }: { dataView: DataView }) => {
-  const { urlQuery: findingsQuery, setUrlQuery, key } = useUrlQuery(getDefaultQuery);
-  const findingsResult = useFindings(dataView, findingsQuery, key);
   const { euiTheme } = useEuiTheme();
+  const groupByOptions = useMemo(getGroupByOptions, []);
+  const {
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
+
+  const {
+    urlQuery: { groupBy, ...findingsQuery },
+    setUrlQuery,
+  } = useUrlQuery(getDefaultQuery);
+
+  const baseQuery = useMemo(
+    () => getFindingsBaseEsQuery({ ...findingsQuery, dataView, queryService: data.query }),
+    [data.query, dataView, findingsQuery]
+  );
+
+  const countResult = useFindingsCounter(baseQuery);
+  const findingsResult = useFindings({
+    ...baseQuery,
+    size: findingsQuery.size,
+    from: findingsQuery.from,
+    sort: findingsQuery.sort,
+  });
+
+  useEffect(() => {
+    if (baseQuery.error) {
+      toasts.addError(baseQuery.error, { title: TEXT.SEARCH_FAILED });
+    }
+  }, [baseQuery.error, toasts]);
+
   return (
     <div data-test-subj={TEST_SUBJECTS.FINDINGS_CONTAINER}>
       <FindingsSearchBar
         dataView={dataView}
         setQuery={setUrlQuery}
-        {...findingsQuery}
-        {...findingsResult}
+        query={findingsQuery.query}
+        filters={findingsQuery.filters}
+        loading={findingsResult.isLoading}
       />
       <div
         css={css`
@@ -44,7 +136,34 @@ export const FindingsContainer = ({ dataView }: { dataView: DataView }) => {
       >
         <PageTitle />
         <EuiSpacer />
-        <FindingsTable setQuery={setUrlQuery} {...findingsQuery} {...findingsResult} />
+        {INTERNAL_FEATURE_FLAGS.showFindingsGroupBy && (
+          <FindingsGroupBySelector
+            type={groupBy}
+            onChange={(type) => setUrlQuery({ groupBy: type[0]?.value })}
+            options={groupByOptions}
+          />
+        )}
+        <EuiSpacer />
+        {groupBy === 'none' && (
+          <>
+            <FindingsDistributionBar
+              total={findingsResult.data?.total || 0}
+              passed={countResult.data?.passed || 0}
+              failed={countResult.data?.failed || 0}
+              pageStart={findingsQuery.from + 1} // API index is 0, but UI is 1
+              pageEnd={findingsQuery.from + findingsQuery.size}
+            />
+            <EuiSpacer />
+            <FindingsTable
+              {...findingsQuery}
+              setQuery={setUrlQuery}
+              data={findingsResult.data}
+              error={findingsResult.error}
+              loading={findingsResult.isLoading}
+            />
+          </>
+        )}
+        {groupBy === 'resourceType' && <div />}
       </div>
     </div>
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_distribution_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_distribution_bar.tsx
new file mode 100644
index 0000000000000..0654f7d9f0999
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_distribution_bar.tsx
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { useMemo } from 'react';
+import { css } from '@emotion/react';
+import {
+  EuiHealth,
+  EuiBadge,
+  EuiTextColor,
+  EuiSpacer,
+  EuiFlexGroup,
+  EuiFlexItem,
+  useEuiTheme,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import numeral from '@elastic/numeral';
+
+interface Props {
+  total: number;
+  passed: number;
+  failed: number;
+  pageStart: number;
+  pageEnd: number;
+}
+
+const formatNumber = (value: number) => (value < 1000 ? value : numeral(value).format('0.0a'));
+
+export const FindingsDistributionBar = ({ failed, passed, total, pageEnd, pageStart }: Props) => {
+  const count = useMemo(
+    () =>
+      total
+        ? { total, passed: passed / total, failed: failed / total }
+        : { total: 0, passed: 0, failed: 0 },
+    [total, failed, passed]
+  );
+
+  return (
+    <div>
+      <Counters {...{ failed, passed, total, pageEnd, pageStart }} />
+      <EuiSpacer size="s" />
+      <DistributionBar {...count} />
+    </div>
+  );
+};
+
+const Counters = ({ pageStart, pageEnd, total, failed, passed }: Props) => (
+  <EuiFlexGroup justifyContent="spaceBetween">
+    <EuiFlexItem>
+      {!!total && <CurrentPageOfTotal pageStart={pageStart} pageEnd={pageEnd} total={total} />}
+    </EuiFlexItem>
+    <EuiFlexItem
+      css={css`
+        align-items: flex-end;
+      `}
+    >
+      {!!total && <PassedFailedCounters passed={passed} failed={failed} />}
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
+
+const PassedFailedCounters = ({ passed, failed }: Pick<Props, 'passed' | 'failed'>) => {
+  const { euiTheme } = useEuiTheme();
+  return (
+    <div
+      css={css`
+        display: grid;
+        grid-template-columns: auto auto;
+        grid-column-gap: ${euiTheme.size.m};
+      `}
+    >
+      <Counter
+        label={i18n.translate('xpack.csp.findings.distributionBar.totalPassedLabel', {
+          defaultMessage: 'Passed',
+        })}
+        color={euiTheme.colors.success}
+        value={passed}
+      />
+      <Counter
+        label={i18n.translate('xpack.csp.findings.distributionBar.totalFailedLabel', {
+          defaultMessage: 'Failed',
+        })}
+        color={euiTheme.colors.danger}
+        value={failed}
+      />
+    </div>
+  );
+};
+
+const CurrentPageOfTotal = ({
+  pageEnd,
+  pageStart,
+  total,
+}: Pick<Props, 'pageEnd' | 'pageStart' | 'total'>) => (
+  <EuiTextColor color="subdued">
+    <FormattedMessage
+      id="xpack.csp.findings.distributionBar.showingPageOfTotalLabel"
+      defaultMessage="Showing {pageStart}-{pageEnd} of {total} Findings"
+      values={{
+        pageStart: <b>{pageStart}</b>,
+        pageEnd: <b>{pageEnd}</b>,
+        total: <b>{formatNumber(total)}</b>,
+      }}
+    />
+  </EuiTextColor>
+);
+
+const DistributionBar: React.FC<Omit<Props, 'pageEnd' | 'pageStart'>> = ({ passed, failed }) => {
+  const { euiTheme } = useEuiTheme();
+  return (
+    <EuiFlexGroup
+      gutterSize="none"
+      css={css`
+        height: 8px;
+        background: ${euiTheme.colors.subdued};
+      `}
+    >
+      <DistributionBarPart value={passed} color={euiTheme.colors.success} />
+      <DistributionBarPart value={failed} color={euiTheme.colors.danger} />
+    </EuiFlexGroup>
+  );
+};
+
+const DistributionBarPart = ({ value, color }: { value: number; color: string }) => (
+  <div
+    css={css`
+      flex: ${value};
+      background: ${color};
+      height: 100%;
+    `}
+  />
+);
+
+const Counter = ({ label, value, color }: { label: string; value: number; color: string }) => (
+  <EuiFlexGroup gutterSize="s" alignItems="center">
+    <EuiFlexItem>
+      <EuiHealth color={color}>{label}</EuiHealth>
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <EuiBadge>{formatNumber(value)}</EuiBadge>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_flyout.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_flyout.tsx
index f53d76b82c177..65493bd493342 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_flyout.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_flyout.tsx
@@ -21,12 +21,15 @@ import {
   EuiFlexGrid,
   EuiCard,
   EuiFlexGroup,
+  EuiIcon,
   type PropsOf,
 } from '@elastic/eui';
 import { assertNever } from '@kbn/std';
 import type { CspFinding } from './types';
 import { CspEvaluationBadge } from '../../components/csp_evaluation_badge';
 import * as TEXT from './translations';
+import cisLogoIcon from '../../assets/icons/cis_logo.svg';
+import k8sLogoIcon from '../../assets/icons/k8s_logo.svg';
 
 const tabs = ['remediation', 'resource', 'general'] as const;
 
@@ -163,7 +166,17 @@ const getGeneralCards = ({ rule }: CspFinding): Card[] => [
       [TEXT.SEVERITY, ''],
       [TEXT.INDEX, ''],
       [TEXT.RULE_EVALUATED_AT, ''],
-      [TEXT.FRAMEWORK_SOURCES, ''],
+      [
+        TEXT.FRAMEWORK_SOURCES,
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem grow={false}>
+            <EuiIcon type={cisLogoIcon} size="xxl" />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiIcon type={k8sLogoIcon} size="xxl" />
+          </EuiFlexItem>
+        </EuiFlexGroup>,
+      ],
       [TEXT.SECTION, ''],
       [TEXT.PROFILE_APPLICABILITY, ''],
       [TEXT.AUDIT, ''],
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_group_by_selector.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_group_by_selector.tsx
new file mode 100644
index 0000000000000..c6e61c16299a3
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_group_by_selector.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { EuiComboBox, EuiFormLabel, type EuiComboBoxOptionOption } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import type { GroupBy } from './findings_container';
+
+interface Props {
+  type: GroupBy;
+  options: Array<EuiComboBoxOptionOption<GroupBy>>;
+  onChange(selectedOptions: Array<EuiComboBoxOptionOption<GroupBy>>): void;
+}
+
+export const FindingsGroupBySelector = ({ type, options, onChange }: Props) => (
+  <EuiComboBox
+    prepend={<GroupByLabel />}
+    singleSelection={{ asPlainText: true }}
+    options={options}
+    selectedOptions={options.filter((o) => o.value === type)}
+    onChange={onChange}
+  />
+);
+
+const GroupByLabel = () => (
+  <EuiFormLabel>
+    <FormattedMessage
+      id="xpack.csp.findings.groupBySelector.groupByLabel"
+      defaultMessage="Group by"
+    />
+  </EuiFormLabel>
+);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
index ee0202786f042..a3c1a0bfccb9a 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
@@ -7,27 +7,26 @@
 import React from 'react';
 import { css } from '@emotion/react';
 import { EuiThemeComputed, useEuiTheme } from '@elastic/eui';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-plugin/common';
 import * as TEST_SUBJECTS from './test_subjects';
-import type { CspFindingsRequest, CspFindingsResponse } from './use_findings';
+import type { CspFindingsRequest, CspFindingsResult } from './use_findings';
 import type { CspClientPluginStartDeps } from '../../types';
 import { PLUGIN_NAME } from '../../../common';
-import type { DataView } from '../../../../../../src/plugins/data/common';
 import { FINDINGS_SEARCH_PLACEHOLDER } from './translations';
 
 type SearchBarQueryProps = Pick<CspFindingsRequest, 'query' | 'filters'>;
 
-interface BaseFindingsSearchBarProps extends SearchBarQueryProps {
+interface FindingsSearchBarProps extends SearchBarQueryProps {
   setQuery(v: Partial<SearchBarQueryProps>): void;
+  loading: CspFindingsResult['loading'];
 }
 
-type FindingsSearchBarProps = CspFindingsResponse & BaseFindingsSearchBarProps;
-
 export const FindingsSearchBar = ({
   dataView,
   query,
   filters,
-  status,
+  loading,
   setQuery,
 }: FindingsSearchBarProps & { dataView: DataView }) => {
   const { euiTheme } = useEuiTheme();
@@ -47,7 +46,7 @@ export const FindingsSearchBar = ({
         showQueryInput={true}
         showDatePicker={false}
         showSaveQuery={false}
-        isLoading={status === 'loading'}
+        isLoading={loading}
         indexPatterns={[dataView]}
         query={query}
         filters={filters}
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
index 2d7955dfd0213..28d14b42ae099 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.test.tsx
@@ -14,7 +14,7 @@ import type { CspFinding } from './types';
 
 const chance = new Chance();
 
-const getFakeFindings = (): CspFinding & { id: string } => ({
+const getFakeFindings = (name: string): CspFinding & { id: string } => ({
   id: chance.word(),
   result: {
     evaluation: chance.weighted(['passed', 'failed'], [0.5, 0.5]),
@@ -23,7 +23,7 @@ const getFakeFindings = (): CspFinding & { id: string } => ({
     },
   },
   rule: {
-    name: chance.word(),
+    name,
     description: chance.paragraph(),
     impact: chance.word(),
     remediation: chance.word(),
@@ -54,12 +54,11 @@ const getFakeFindings = (): CspFinding & { id: string } => ({
 
 type TableProps = PropsOf<typeof FindingsTable>;
 
-// FLAKY: https://github.com/elastic/kibana/issues/126664
-describe.skip('<FindingsTable />', () => {
+describe('<FindingsTable />', () => {
   it('renders the zero state when status success and data has a length of zero ', async () => {
     const props: TableProps = {
-      status: 'success',
-      data: { data: [], total: 0 },
+      loading: false,
+      data: { page: [], total: 0 },
       error: null,
       sort: [],
       from: 1,
@@ -73,11 +72,12 @@ describe.skip('<FindingsTable />', () => {
   });
 
   it('renders the table with provided items', () => {
-    const data = Array.from({ length: 10 }, getFakeFindings);
+    const names = chance.unique(chance.sentence, 10);
+    const data = names.map(getFakeFindings);
 
     const props: TableProps = {
-      status: 'success',
-      data: { data, total: 10 },
+      loading: false,
+      data: { page: data, total: 10 },
       error: null,
       sort: [],
       from: 0,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx
index c4bb50ca74b2e..b1e404767d03e 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_table.tsx
@@ -16,13 +16,13 @@ import {
   EuiBasicTableProps,
 } from '@elastic/eui';
 import moment from 'moment';
+import { SortDirection } from '@kbn/data-plugin/common';
 import { extractErrorMessage } from '../../../common/utils/helpers';
 import * as TEST_SUBJECTS from './test_subjects';
 import * as TEXT from './translations';
 import type { CspFinding } from './types';
 import { CspEvaluationBadge } from '../../components/csp_evaluation_badge';
-import type { CspFindingsRequest, CspFindingsResponse } from './use_findings';
-import { SortDirection } from '../../../../../../src/plugins/data/common';
+import type { CspFindingsRequest, CspFindingsResult } from './use_findings';
 import { FindingsRuleFlyout } from './findings_flyout';
 
 type TableQueryProps = Pick<CspFindingsRequest, 'sort' | 'from' | 'size'>;
@@ -31,7 +31,7 @@ interface BaseFindingsTableProps extends TableQueryProps {
   setQuery(query: Partial<TableQueryProps>): void;
 }
 
-type FindingsTableProps = CspFindingsResponse & BaseFindingsTableProps;
+type FindingsTableProps = CspFindingsResult & BaseFindingsTableProps;
 
 const FindingsTableComponent = ({
   setQuery,
@@ -39,7 +39,8 @@ const FindingsTableComponent = ({
   size,
   sort = [],
   error,
-  ...props
+  data,
+  loading,
 }: FindingsTableProps) => {
   const [selectedFinding, setSelectedFinding] = useState<CspFinding>();
 
@@ -48,9 +49,9 @@ const FindingsTableComponent = ({
       getEuiPaginationFromEsSearchSource({
         from,
         size,
-        total: props.status === 'success' ? props.data.total : 0,
+        total: data?.total,
       }),
-    [from, size, props]
+    [from, size, data]
   );
 
   const sorting = useMemo(() => getEuiSortFromEsSearchSource(sort), [sort]);
@@ -70,7 +71,7 @@ const FindingsTableComponent = ({
   );
 
   // Show "zero state"
-  if (props.status === 'success' && !props.data.data.length)
+  if (!loading && !data?.page.length)
     // TODO: use our own logo
     return (
       <EuiEmptyPrompt
@@ -84,9 +85,9 @@ const FindingsTableComponent = ({
     <>
       <EuiBasicTable
         data-test-subj={TEST_SUBJECTS.FINDINGS_TABLE}
-        loading={props.status === 'loading'}
+        loading={loading}
         error={error ? extractErrorMessage(error) : undefined}
-        items={props.data?.data || []}
+        items={data?.page || []}
         columns={columns}
         pagination={pagination}
         sorting={sorting}
@@ -108,11 +109,11 @@ const getEuiPaginationFromEsSearchSource = ({
   size: pageSize,
   total,
 }: Pick<FindingsTableProps, 'from' | 'size'> & {
-  total: number;
+  total: number | undefined;
 }): EuiBasicTableProps<CspFinding>['pagination'] => ({
   pageSize,
   pageIndex: Math.ceil(pageIndex / pageSize),
-  totalItemCount: total,
+  totalItemCount: total || 0,
   pageSizeOptions: [10, 25, 100],
   showPerPageOptions: true,
 });
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
index f9e2a59d6316c..8754bdf390ef7 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings.ts
@@ -4,42 +4,41 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Filter } from '@kbn/es-query';
 import { type UseQueryResult, useQuery } from 'react-query';
-import type { AggregationsAggregate, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import { number } from 'io-ts';
-import { extractErrorMessage } from '../../../common/utils/helpers';
+import type { Filter } from '@kbn/es-query';
+import { lastValueFrom } from 'rxjs';
 import type {
-  DataView,
   EsQuerySortValue,
-  IKibanaSearchResponse,
+  IEsSearchResponse,
   SerializedSearchSourceFields,
-} from '../../../../../../src/plugins/data/common';
-import type { CspClientPluginStartDeps } from '../../types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/common';
+import type { CoreStart } from '@kbn/core/public';
+import { extractErrorMessage } from '../../../common/utils/helpers';
 import * as TEXT from './translations';
-import type { CoreStart } from '../../../../../../src/core/public';
 import type { CspFinding } from './types';
-
-interface CspFindings {
-  data: CspFinding[];
-  total: number;
-}
+import { useKibana } from '../../common/hooks/use_kibana';
+import type { FindingsBaseQuery } from './findings_container';
 
 export interface CspFindingsRequest
   extends Required<Pick<SerializedSearchSourceFields, 'sort' | 'size' | 'from' | 'query'>> {
   filters: Filter[];
 }
 
-type ResponseProps = 'data' | 'error' | 'status';
-type Result = UseQueryResult<CspFindings, unknown>;
+type UseFindingsOptions = FindingsBaseQuery & Omit<CspFindingsRequest, 'filters' | 'query'>;
+
+interface CspFindingsData {
+  page: CspFinding[];
+  total: number;
+}
+
+type Result = UseQueryResult<CspFindingsData, unknown>;
 
-// TODO: use distributive Pick
-export type CspFindingsResponse =
-  | Pick<Extract<Result, { status: 'success' }>, ResponseProps>
-  | Pick<Extract<Result, { status: 'error' }>, ResponseProps>
-  | Pick<Extract<Result, { status: 'idle' }>, ResponseProps>
-  | Pick<Extract<Result, { status: 'loading' }>, ResponseProps>;
+export interface CspFindingsResult {
+  loading: Result['isLoading'];
+  error: Result['error'];
+  data: CspFindingsData | undefined;
+}
 
 const FIELDS_WITHOUT_KEYWORD_MAPPING = new Set(['@timestamp']);
 
@@ -64,72 +63,50 @@ const mapEsQuerySortKey = (sort: readonly EsQuerySortValue[]): EsQuerySortValue[
     return acc;
   }, []);
 
-const showResponseErrorToast =
-  ({ toasts }: CoreStart['notifications']) =>
-  (error: unknown): void => {
-    if (error instanceof Error) toasts.addError(error, { title: TEXT.SEARCH_FAILED });
-    else toasts.addDanger(extractErrorMessage(error, TEXT.SEARCH_FAILED));
-  };
+export const showErrorToast = (
+  toasts: CoreStart['notifications']['toasts'],
+  error: unknown
+): void => {
+  if (error instanceof Error) toasts.addError(error, { title: TEXT.SEARCH_FAILED });
+  else toasts.addDanger(extractErrorMessage(error, TEXT.SEARCH_FAILED));
+};
 
-const extractFindings = ({
-  rawResponse: { hits },
-}: IKibanaSearchResponse<
-  SearchResponse<CspFinding, Record<string, AggregationsAggregate>>
->): CspFindings => ({
-  // TODO: use 'fields' instead of '_source' ?
-  data: hits.hits.map((hit) => hit._source!),
-  total: number.is(hits.total) ? hits.total : 0,
+export const getFindingsQuery = ({
+  index,
+  query,
+  size,
+  from,
+  sort,
+}: Omit<UseFindingsOptions, 'error'>) => ({
+  index,
+  query,
+  size,
+  from,
+  sort: mapEsQuerySortKey(sort),
 });
 
-const createFindingsSearchSource = (
-  {
-    query,
-    dataView,
-    filters,
-    ...rest
-  }: Omit<CspFindingsRequest, 'queryKey'> & { dataView: DataView },
-  queryService: CspClientPluginStartDeps['data']['query']
-): SerializedSearchSourceFields => {
-  if (query) queryService.queryString.setQuery(query);
-
-  return {
-    ...rest,
-    sort: mapEsQuerySortKey(rest.sort),
-    filter: queryService.filterManager.getFilters(),
-    query: queryService.queryString.getQuery(),
-    index: dataView.id, // TODO: constant
-  };
-};
-
-/**
- * @description a react-query#mutation wrapper on the data plugin searchSource
- * @todo use 'searchAfter'. currently limited to 10k docs. see https://github.com/elastic/kibana/issues/116776
- */
-export const useFindings = (
-  dataView: DataView,
-  searchProps: CspFindingsRequest,
-  urlKey?: string // Needed when URL query (searchProps) didn't change (now-15) but require a refetch
-): CspFindingsResponse => {
+export const useFindings = ({ error, index, query, sort, from, size }: UseFindingsOptions) => {
   const {
-    notifications,
-    data: { query, search },
-  } = useKibana<CspClientPluginStartDeps>().services;
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
 
   return useQuery(
-    ['csp_findings', { searchProps, urlKey }],
-    async () => {
-      const source = await search.searchSource.create(
-        createFindingsSearchSource({ ...searchProps, dataView }, query)
-      );
-
-      const response = await source.fetch$().toPromise();
-
-      return response;
-    },
+    ['csp_findings', { from, size, query, sort }],
+    () =>
+      lastValueFrom<IEsSearchResponse<CspFinding>>(
+        data.search.search({
+          params: getFindingsQuery({ index, query, sort, from, size }),
+        })
+      ),
     {
-      cacheTime: 0,
-      onError: showResponseErrorToast(notifications!),
-      select: extractFindings,
+      enabled: !error,
+      select: ({ rawResponse: { hits } }) => ({
+        // TODO: use 'fields' instead of '_source' ?
+        page: hits.hits.map((hit) => hit._source!),
+        total: number.is(hits.total) ? hits.total : 0,
+      }),
+      onError: (err) => showErrorToast(toasts, err),
     }
   );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_count.ts b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_count.ts
new file mode 100644
index 0000000000000..5a9e0411910e6
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/use_findings_count.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { useQuery } from 'react-query';
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { lastValueFrom } from 'rxjs';
+import type { IKibanaSearchRequest, IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { useKibana } from '../../common/hooks/use_kibana';
+import { showErrorToast } from './use_findings';
+import type { FindingsBaseQuery } from './findings_container';
+
+type FindingsAggRequest = IKibanaSearchRequest<estypes.SearchRequest>;
+type FindingsAggResponse = IKibanaSearchResponse<estypes.SearchResponse<{}, FindingsAggs>>;
+interface FindingsAggs extends estypes.AggregationsMultiBucketAggregateBase {
+  count: {
+    buckets: Array<{
+      key: string;
+      doc_count: number;
+    }>;
+  };
+}
+
+export const getFindingsCountAggQuery = ({ index, query }: Omit<FindingsBaseQuery, 'error'>) => ({
+  index,
+  size: 0,
+  track_total_hits: true,
+  body: {
+    query,
+    aggs: { count: { terms: { field: 'result.evaluation.keyword' } } },
+  },
+});
+
+export const useFindingsCounter = ({ index, query, error }: FindingsBaseQuery) => {
+  const {
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
+
+  return useQuery(
+    ['csp_findings_counts', { index, query }],
+    () =>
+      lastValueFrom(
+        data.search.search<FindingsAggRequest, FindingsAggResponse>({
+          params: getFindingsCountAggQuery({ index, query }),
+        })
+      ),
+    {
+      enabled: !error,
+      onError: (err) => showErrorToast(toasts, err),
+      select: (response) =>
+        Object.fromEntries(
+          response.rawResponse.aggregations!.count.buckets.map((bucket) => [
+            bucket.key,
+            bucket.doc_count,
+          ])!
+        ) as Record<'passed' | 'failed', number>,
+    }
+  );
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx
index 288f9e2f30c01..6157a22c9738d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/index.tsx
@@ -9,10 +9,10 @@ import React, { useMemo } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiTextColor, EuiEmptyPrompt } from '@elastic/eui';
 import * as t from 'io-ts';
+import type { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { RulesContainer, type PageUrlParams } from './rules_container';
 import { allNavigationItems } from '../../common/navigation/constants';
 import { useCspBreadcrumbs } from '../../common/navigation/use_csp_breadcrumbs';
-import type { KibanaPageTemplateProps } from '../../../../../../src/plugins/kibana_react/public';
 import { CspNavigationItem } from '../../common/navigation/types';
 import { extractErrorMessage } from '../../../common/utils/helpers';
 import { useCspIntegration } from './use_csp_integration';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx
index 5801d293114bd..47d0bc0a9dd22 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { LOADING_STATE_TEST_SUBJECT } from '../../components/csp_page_template';
-import { Rules } from './index';
+import { Rules } from '.';
 import { render, screen } from '@testing-library/react';
 import { QueryClient } from 'react-query';
 import { TestProvider } from '../../test/test_provider';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx
index 96659337e0c1a..cf77fba3c513f 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_container.tsx
@@ -15,6 +15,7 @@ import {
 } from '@elastic/eui';
 import { useParams } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { extractErrorMessage, isNonNullable } from '../../../common/utils/helpers';
 import { RulesTable } from './rules_table';
 import { RulesBottomBar } from './rules_bottom_bar';
@@ -28,7 +29,6 @@ import {
 } from './use_csp_rules';
 import * as TEST_SUBJECTS from './test_subjects';
 import { RuleFlyout } from './rules_flyout';
-import { pagePathGetters } from '../../../../fleet/public';
 import { useKibana } from '../../common/hooks/use_kibana';
 
 interface RulesPageData {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx
index 52e07ae9e016c..358db6edb7bb1 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_integration.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import { useQuery } from 'react-query';
+import { type PackagePolicy, packagePolicyRouteService } from '@kbn/fleet-plugin/common';
 import { type PageUrlParams } from './rules_container';
 import { useKibana } from '../../common/hooks/use_kibana';
-import { type PackagePolicy, packagePolicyRouteService } from '../../../../../plugins/fleet/common';
 
 export const useCspIntegration = ({ packagePolicyId }: PageUrlParams) => {
   const { http } = useKibana().services;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts
index 32e1a2635a857..87f06fe70df76 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts
@@ -6,8 +6,8 @@
  */
 import { useQuery, useMutation, useQueryClient } from 'react-query';
 import { FunctionKeys } from 'utility-types';
+import type { SavedObjectsFindOptions, SimpleSavedObject } from '@kbn/core/public';
 import { cspRuleAssetSavedObjectType, type CspRuleSchema } from '../../../common/schemas/csp_rule';
-import type { SavedObjectsFindOptions, SimpleSavedObject } from '../../../../../../src/core/public';
 import { useKibana } from '../../common/hooks/use_kibana';
 import { UPDATE_FAILED } from './translations';
 
diff --git a/x-pack/plugins/cloud_security_posture/public/plugin.ts b/x-pack/plugins/cloud_security_posture/public/plugin.ts
index d4cdeddd48d92..e0fccaf23e048 100755
--- a/x-pack/plugins/cloud_security_posture/public/plugin.ts
+++ b/x-pack/plugins/cloud_security_posture/public/plugin.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { AppMountParameters, CoreSetup, CoreStart, Plugin } from '../../../../src/core/public';
+import type { AppMountParameters, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 import type {
   CspClientPluginSetup,
   CspClientPluginStart,
@@ -13,7 +14,6 @@ import type {
   CspClientPluginStartDeps,
 } from './types';
 import { PLUGIN_NAME, PLUGIN_ID } from '../common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 
 export class CspPlugin
   implements
@@ -35,7 +35,7 @@ export class CspPlugin
       category: DEFAULT_APP_CATEGORIES.security,
       async mount(params: AppMountParameters) {
         // Load application bundle
-        const { renderApp } = await import('./application/index');
+        const { renderApp } = await import('./application');
         // Get start services as specified in kibana.json
         const [coreStart, depsStart] = await core.getStartServices();
         // Render the application
diff --git a/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx b/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx
index 3806dcb955587..068285abacdcc 100755
--- a/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/test/test_provider.tsx
@@ -9,9 +9,9 @@ import React, { useMemo } from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Router, Switch, Route } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import type { CspAppDeps } from '../application/app';
 
 export const TestProvider: React.FC<Partial<CspAppDeps>> = ({
diff --git a/x-pack/plugins/cloud_security_posture/public/types.ts b/x-pack/plugins/cloud_security_posture/public/types.ts
index 7fc100ebeffbd..54cd9e22eb45f 100755
--- a/x-pack/plugins/cloud_security_posture/public/types.ts
+++ b/x-pack/plugins/cloud_security_posture/public/types.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CspClientPluginSetup {}
diff --git a/x-pack/plugins/cloud_security_posture/server/config.ts b/x-pack/plugins/cloud_security_posture/server/config.ts
index e40adadc55e98..5e258bffc2670 100644
--- a/x-pack/plugins/cloud_security_posture/server/config.ts
+++ b/x-pack/plugins/cloud_security_posture/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, type TypeOf } from '@kbn/config-schema';
-import type { PluginConfigDescriptor } from 'kibana/server';
+import type { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: false }),
diff --git a/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts b/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts
index f98122bf28bc7..c30bf09a60e0f 100644
--- a/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts
+++ b/x-pack/plugins/cloud_security_posture/server/create_indices/create_transforms_indices.ts
@@ -6,7 +6,7 @@
  */
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient, Logger } from '../../../../../src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { benchmarkScoreMapping } from './benchmark_score_mapping';
 import { latestFindingsMapping } from './latest_findings_mapping';
 import {
@@ -21,20 +21,22 @@ export const initializeCspTransformsIndices = async (
   esClient: ElasticsearchClient,
   logger: Logger
 ) => {
-  createIndexIfNotExists(
-    esClient,
-    LATEST_FINDINGS_INDEX_NAME,
-    LATEST_FINDINGS_INDEX_PATTERN,
-    latestFindingsMapping,
-    logger
-  );
-  createIndexIfNotExists(
-    esClient,
-    BENCHMARK_SCORE_INDEX_NAME,
-    BENCHMARK_SCORE_INDEX_PATTERN,
-    benchmarkScoreMapping,
-    logger
-  );
+  return Promise.all([
+    createIndexIfNotExists(
+      esClient,
+      LATEST_FINDINGS_INDEX_NAME,
+      LATEST_FINDINGS_INDEX_PATTERN,
+      latestFindingsMapping,
+      logger
+    ),
+    createIndexIfNotExists(
+      esClient,
+      BENCHMARK_SCORE_INDEX_NAME,
+      BENCHMARK_SCORE_INDEX_PATTERN,
+      benchmarkScoreMapping,
+      logger
+    ),
+  ]);
 };
 
 export const createIndexIfNotExists = async (
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/benchmark_score_transform.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/benchmark_score_transform.ts
new file mode 100644
index 0000000000000..8837fea0fa183
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/benchmark_score_transform.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/types';
+import {
+  LATEST_FINDINGS_INDEX_PATTERN,
+  BENCHMARK_SCORE_INDEX_PATTERN,
+} from '../../common/constants';
+
+export const benchmarkScoreTransform: TransformPutTransformRequest = {
+  transform_id: 'cloud_security_posture.score-default-0.0.1',
+  description: 'Calculate latest findings score',
+  source: {
+    index: LATEST_FINDINGS_INDEX_PATTERN,
+  },
+  dest: {
+    index: BENCHMARK_SCORE_INDEX_PATTERN,
+  },
+  frequency: '30m',
+  sync: {
+    time: {
+      field: 'event.ingested',
+      delay: '60s',
+    },
+  },
+  retention_policy: {
+    time: {
+      field: '@timestamp',
+      max_age: '30d',
+    },
+  },
+  pivot: {
+    group_by: {
+      '@timestamp': {
+        date_histogram: {
+          field: '@timestamp',
+          calendar_interval: '1m',
+        },
+      },
+    },
+    aggregations: {
+      total_findings: {
+        value_count: {
+          field: 'result.evaluation.keyword',
+        },
+      },
+      passed_findings: {
+        filter: {
+          term: {
+            'result.evaluation.keyword': 'passed',
+          },
+        },
+      },
+      failed_findings: {
+        filter: {
+          term: {
+            'result.evaluation.keyword': 'failed',
+          },
+        },
+      },
+      score_by_cluster_id: {
+        terms: {
+          field: 'cluster_id.keyword',
+        },
+        aggregations: {
+          total_findings: {
+            value_count: {
+              field: 'result.evaluation.keyword',
+            },
+          },
+          passed_findings: {
+            filter: {
+              term: {
+                'result.evaluation.keyword': 'passed',
+              },
+            },
+          },
+          failed_findings: {
+            filter: {
+              term: {
+                'result.evaluation.keyword': 'failed',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+  _meta: {
+    managed: 'true',
+  },
+};
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.test.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.test.ts
new file mode 100644
index 0000000000000..65a4507de2511
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.test.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { createTransformIfNotExists, startTransformIfNotStarted } from './create_transforms';
+import { latestFindingsTransform } from './latest_findings_transform';
+
+const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
+
+describe('createTransformIfNotExist', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    jest.resetAllMocks();
+  });
+
+  it('expect not to create if already exists', async () => {
+    mockEsClient.transform.getTransform.mockResolvedValue({ transforms: [], count: 1 });
+    await createTransformIfNotExists(mockEsClient, latestFindingsTransform, logger);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledTimes(0);
+  });
+
+  it('expect to create if does not already exist', async () => {
+    mockEsClient.transform.getTransform.mockRejectedValue({ statusCode: 404 });
+    await createTransformIfNotExists(mockEsClient, latestFindingsTransform, logger);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledWith(latestFindingsTransform);
+  });
+
+  it('expect not to create if get error is not 404', async () => {
+    mockEsClient.transform.getTransform.mockRejectedValue({ statusCode: 400 });
+    await createTransformIfNotExists(mockEsClient, latestFindingsTransform, logger);
+    expect(mockEsClient.transform.getTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.putTransform).toHaveBeenCalledTimes(0);
+  });
+});
+
+function getTransformWithState(state: string) {
+  return {
+    state,
+    checkpointing: { last: { checkpoint: 1 } },
+    id: '',
+    stats: {
+      documents_indexed: 0,
+      documents_processed: 0,
+      exponential_avg_checkpoint_duration_ms: 0,
+      exponential_avg_documents_indexed: 0,
+      exponential_avg_documents_processed: 0,
+      index_failures: 0,
+      index_time_in_ms: 0,
+      index_total: 0,
+      pages_processed: 0,
+      processing_time_in_ms: 0,
+      processing_total: 0,
+      search_failures: 0,
+      search_time_in_ms: 0,
+      search_total: 0,
+      trigger_count: 0,
+    },
+  };
+}
+
+describe('startTransformIfNotStarted', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    jest.resetAllMocks();
+  });
+
+  ['failed', 'stopping', 'started', 'aborting', 'indexing'].forEach((state) =>
+    it(`expect not to start if state is ${state}`, async () => {
+      mockEsClient.transform.getTransformStats.mockResolvedValue({
+        transforms: [getTransformWithState(state)],
+        count: 1,
+      });
+      await startTransformIfNotStarted(mockEsClient, latestFindingsTransform.transform_id, logger);
+      expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
+      expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledWith({
+        transform_id: latestFindingsTransform.transform_id,
+      });
+      expect(mockEsClient.transform.startTransform).toHaveBeenCalledTimes(0);
+    })
+  );
+
+  it('expect not to start if transform not found', async () => {
+    mockEsClient.transform.getTransformStats.mockResolvedValue({
+      transforms: [],
+      count: 0,
+    });
+    await startTransformIfNotStarted(mockEsClient, latestFindingsTransform.transform_id, logger);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.startTransform).toHaveBeenCalledTimes(0);
+  });
+
+  it('expect to start if state is stopped', async () => {
+    mockEsClient.transform.getTransformStats.mockResolvedValue({
+      transforms: [getTransformWithState('stopped')],
+      count: 1,
+    });
+    await startTransformIfNotStarted(mockEsClient, latestFindingsTransform.transform_id, logger);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.getTransformStats).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+    expect(mockEsClient.transform.startTransform).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.transform.startTransform).toHaveBeenCalledWith({
+      transform_id: latestFindingsTransform.transform_id,
+    });
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.ts
new file mode 100644
index 0000000000000..3347d5f36b5d8
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/create_transforms.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { transformError } from '@kbn/securitysolution-es-utils';
+import { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/types';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { latestFindingsTransform } from './latest_findings_transform';
+import { benchmarkScoreTransform } from './benchmark_score_transform';
+
+// TODO: Move transforms to integration package
+export const initializeCspTransforms = async (esClient: ElasticsearchClient, logger: Logger) => {
+  return Promise.all([
+    initializeTransform(esClient, latestFindingsTransform, logger),
+    initializeTransform(esClient, benchmarkScoreTransform, logger),
+  ]);
+};
+
+export const initializeTransform = async (
+  esClient: ElasticsearchClient,
+  transform: TransformPutTransformRequest,
+  logger: Logger
+) => {
+  return createTransformIfNotExists(esClient, transform, logger).then((succeeded) => {
+    if (succeeded) {
+      startTransformIfNotStarted(esClient, transform.transform_id, logger);
+    }
+  });
+};
+
+/**
+ * Checks if a transform exists, And if not creates it
+ *
+ * @param transform - the transform to create. If a transform with the same transform_id already exists, nothing is created or updated.
+ *
+ * @return true if the transform exits or created, false otherwise.
+ */
+export const createTransformIfNotExists = async (
+  esClient: ElasticsearchClient,
+  transform: TransformPutTransformRequest,
+  logger: Logger
+) => {
+  try {
+    await esClient.transform.getTransform({
+      transform_id: transform.transform_id,
+    });
+    return true;
+  } catch (existErr) {
+    const existError = transformError(existErr);
+    if (existError.statusCode === 404) {
+      try {
+        await esClient.transform.putTransform(transform);
+        return true;
+      } catch (createErr) {
+        const createError = transformError(createErr);
+        logger.error(
+          `Failed to create transform ${transform.transform_id}: ${createError.message}`
+        );
+      }
+    } else {
+      logger.error(
+        `Failed to check if transform ${transform.transform_id} exists: ${existError.message}`
+      );
+    }
+  }
+  return false;
+};
+
+export const startTransformIfNotStarted = async (
+  esClient: ElasticsearchClient,
+  transformId: string,
+  logger: Logger
+) => {
+  try {
+    const transformStats = await esClient.transform.getTransformStats({
+      transform_id: transformId,
+    });
+    if (transformStats.count <= 0) {
+      logger.error(`Failed starting transform ${transformId}: couldn't find transform`);
+      return;
+    }
+    const fetchedTransformStats = transformStats.transforms[0];
+    if (fetchedTransformStats.state === 'stopped') {
+      try {
+        return await esClient.transform.startTransform({ transform_id: transformId });
+      } catch (startErr) {
+        const startError = transformError(startErr);
+        logger.error(`Failed starting transform ${transformId}: ${startError.message}`);
+      }
+    } else if (
+      fetchedTransformStats.state === 'stopping' ||
+      fetchedTransformStats.state === 'aborting' ||
+      fetchedTransformStats.state === 'failed'
+    ) {
+      logger.error(
+        `Not starting transform ${transformId} since it's state is: ${fetchedTransformStats.state}`
+      );
+    }
+  } catch (statsErr) {
+    const statsError = transformError(statsErr);
+    logger.error(`Failed to check if transform ${transformId} is started: ${statsError.message}`);
+  }
+};
diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_findings_transform.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_findings_transform.ts
new file mode 100644
index 0000000000000..fc042149f3193
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_findings_transform.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { TransformPutTransformRequest } from '@elastic/elasticsearch/lib/api/types';
+import { FINDINGS_INDEX_PATTERN, LATEST_FINDINGS_INDEX_PATTERN } from '../../common/constants';
+
+export const latestFindingsTransform: TransformPutTransformRequest = {
+  transform_id: 'cloud_security_posture.findings_latest-default-0.0.1',
+  description: 'Defines findings transformation to view only the latest finding per resource',
+  source: {
+    index: FINDINGS_INDEX_PATTERN,
+  },
+  dest: {
+    index: LATEST_FINDINGS_INDEX_PATTERN,
+  },
+  frequency: '5m',
+  sync: {
+    time: {
+      field: 'event.ingested',
+      delay: '60s',
+    },
+  },
+  retention_policy: {
+    time: {
+      field: '@timestamp',
+      max_age: '3d',
+    },
+  },
+  latest: {
+    sort: '@timestamp',
+    unique_key: ['resource_id.keyword', 'rule.name.keyword', 'agent.id.keyword'],
+  },
+  _meta: {
+    managed: 'true',
+  },
+};
diff --git a/x-pack/plugins/cloud_security_posture/server/index.ts b/x-pack/plugins/cloud_security_posture/server/index.ts
index 82f2872a859f7..16fc2a2434bf9 100755
--- a/x-pack/plugins/cloud_security_posture/server/index.ts
+++ b/x-pack/plugins/cloud_security_posture/server/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { PluginInitializerContext } from '../../../../src/core/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 import { CspPlugin } from './plugin';
 
 export type { CspServerPluginSetup, CspServerPluginStart } from './types';
diff --git a/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts b/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts
index f769ea171c176..a455bf46d66c7 100644
--- a/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts
+++ b/x-pack/plugins/cloud_security_posture/server/lib/csp_app_services.ts
@@ -10,7 +10,7 @@ import {
   PackageService,
   AgentPolicyServiceInterface,
   PackagePolicyServiceInterface,
-} from '../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 
 export interface CspAppServiceDependencies {
   packageService: PackageService;
diff --git a/x-pack/plugins/cloud_security_posture/server/plugin.ts b/x-pack/plugins/cloud_security_posture/server/plugin.ts
index 386eb2373ad63..b2108dc24a926 100755
--- a/x-pack/plugins/cloud_security_posture/server/plugin.ts
+++ b/x-pack/plugins/cloud_security_posture/server/plugin.ts
@@ -11,7 +11,7 @@ import type {
   CoreStart,
   Plugin,
   Logger,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 import { CspAppService } from './lib/csp_app_services';
 import type {
   CspServerPluginSetup,
@@ -25,6 +25,7 @@ import { cspRuleTemplateAssetType } from './saved_objects/csp_rule_template';
 import { cspRuleAssetType } from './saved_objects/csp_rule_type';
 import { initializeCspRules } from './saved_objects/initialize_rules';
 import { initializeCspTransformsIndices } from './create_indices/create_transforms_indices';
+import { initializeCspTransforms } from './create_transforms/create_transforms';
 
 export interface CspAppContext {
   logger: Logger;
@@ -72,7 +73,10 @@ export class CspPlugin
     });
 
     initializeCspRules(core.savedObjects.createInternalRepository());
-    initializeCspTransformsIndices(core.elasticsearch.client.asInternalUser, this.logger);
+    initializeCspTransformsIndices(core.elasticsearch.client.asInternalUser, this.logger).then(
+      (_) => initializeCspTransforms(core.elasticsearch.client.asInternalUser, this.logger)
+    );
+
     return {};
   }
   public stop() {}
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts
index 384c1d49f03b7..4ed7bdb000344 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.test.ts
@@ -9,13 +9,13 @@ import {
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   ElasticsearchClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server/elasticsearch/client/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'src/core/server/http/router/request';
+import { KibanaRequest } from '@kbn/core/server/http/router/request';
 import {
   benchmarksInputSchema,
   DEFAULT_BENCHMARKS_PER_PAGE,
@@ -28,13 +28,13 @@ import {
   createBenchmarkEntry,
 } from './benchmarks';
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   createMockAgentPolicyService,
   createPackagePolicyServiceMock,
-} from '../../../../fleet/server/mocks';
-import { createPackagePolicyMock } from '../../../../fleet/common/mocks';
-import { AgentPolicy } from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/server/mocks';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
+import { AgentPolicy } from '@kbn/fleet-plugin/common';
 
 import { CspAppService } from '../../lib/csp_app_services';
 import { CspAppContext } from '../../plugin';
@@ -88,7 +88,7 @@ describe('benchmarks API', () => {
 
     const [config] = router.get.mock.calls[0];
 
-    expect(config.path).toEqual('/api/csp/benchmarks');
+    expect(config.path).toEqual('/internal/cloud_security_posture/benchmarks');
   });
 
   it('should accept to a user with fleet.all privilege', async () => {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
index 9b862be55988a..f0c1dc6e1bf96 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
@@ -6,19 +6,19 @@
  */
 
 import { uniq, map } from 'lodash';
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import type {
   PackagePolicyServiceInterface,
   AgentPolicyServiceInterface,
   AgentService,
-} from '../../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import type {
   GetAgentPoliciesResponseItem,
   PackagePolicy,
   AgentPolicy,
   ListResult,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { BENCHMARKS_ROUTE_PATH, CIS_KUBERNETES_PACKAGE_NAME } from '../../../common/constants';
 import {
   BENCHMARK_PACKAGE_POLICY_PREFIX,
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts
index 95addd9c055de..bc67722a81c99 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.test.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { httpServerMock, httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServerMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-'src/core/server/elasticsearch/client/mocks';
+'@kbn/core/server/elasticsearch/client/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'src/core/server/http/router/request';
+import { KibanaRequest } from '@kbn/core/server/http/router/request';
 import { defineGetComplianceDashboardRoute } from './compliance_dashboard';
 
 import { CspAppService } from '../../lib/csp_app_services';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
index 99046d38dfcc6..0cd301dde8d6d 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import type {
   AggregationsMultiBucketAggregateBase as Aggregation,
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
index a030a744c2d2d..076205289b8b3 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   AggregationsMultiBucketAggregateBase as Aggregation,
   QueryDslQueryContainer,
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts
index 8d31fb7a8e88d..703c2ee0f5107 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_resources_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   AggregationsMultiBucketAggregateBase as Aggregation,
   QueryDslQueryContainer,
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
index 82d1dd9a5d49f..a0840fd3c5ad0 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { QueryDslQueryContainer, SearchRequest } from '@elastic/elasticsearch/lib/api/types';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import type { ComplianceDashboardData, Score } from '../../../common/types';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
index a432d275fdb64..f5c3d16241408 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { BENCHMARK_SCORE_INDEX_PATTERN } from '../../../common/constants';
 import { Stats } from '../../../common/types';
 import { calculatePostureScore } from './get_stats';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts
index c558caea1e9d9..fda7edcf5d877 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import {
   savedObjectsClientMock,
   httpServiceMock,
   loggingSystemMock,
   httpServerMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   convertRulesConfigToYaml,
   createRulesConfig,
@@ -23,8 +23,8 @@ import {
 
 import { CspAppService } from '../../lib/csp_app_services';
 import { CspAppContext } from '../../plugin';
-import { createPackagePolicyMock } from '../../../../fleet/common/mocks';
-import { createPackagePolicyServiceMock } from '../../../../fleet/server/mocks';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
 
 import { cspRuleAssetSavedObjectType, CspRuleSchema } from '../../../common/schemas/csp_rule';
 import {
@@ -32,7 +32,7 @@ import {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { Chance } from 'chance';
 
 describe('Update rules configuration API', () => {
@@ -58,7 +58,7 @@ describe('Update rules configuration API', () => {
 
     const [config, _] = router.post.mock.calls[0];
 
-    expect(config.path).toEqual('/api/csp/update_rules_config');
+    expect(config.path).toEqual('/internal/cloud_security_posture/update_rules_config');
   });
 
   it('should accept to a user with fleet.all privilege', async () => {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts
index a57d3902f266c..91bc47a19dad9 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/configuration/update_rules_configuration.ts
@@ -8,7 +8,7 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { schema as rt } from '@kbn/config-schema';
 import { transformError } from '@kbn/securitysolution-es-utils';
 
@@ -16,13 +16,13 @@ import { produce } from 'immer';
 import { unset } from 'lodash';
 import yaml from 'js-yaml';
 
-import { PackagePolicy, PackagePolicyConfigRecord } from '../../../../fleet/common';
+import { PackagePolicy, PackagePolicyConfigRecord } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { CspAppContext } from '../../plugin';
 import { CspRulesConfigSchema } from '../../../common/schemas/csp_configuration';
 import { CspRuleSchema, cspRuleAssetSavedObjectType } from '../../../common/schemas/csp_rule';
 import { UPDATE_RULES_CONFIG_ROUTE_PATH } from '../../../common/constants';
 import { CIS_KUBERNETES_PACKAGE_NAME } from '../../../common/constants';
-import { PackagePolicyServiceInterface } from '../../../../fleet/server';
 import { CspRouter } from '../../types';
 
 export const getPackagePolicy = async (
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts
index c41245db04685..35d359929af99 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.test.ts
@@ -8,10 +8,10 @@ import {
   elasticsearchClientMock,
   ElasticsearchClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server/elasticsearch/client/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'src/core/server/http/router/request';
-import { httpServerMock, httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server/http/router/request';
+import { httpServerMock, httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { CspAppService } from '../../lib/csp_app_services';
 import { CspAppContext } from '../../plugin';
 import {
@@ -54,7 +54,7 @@ describe('findings API', () => {
 
     const [config, _] = router.get.mock.calls[0];
 
-    expect(config.path).toEqual('/api/csp/findings');
+    expect(config.path).toEqual('/internal/cloud_security_posture/findings');
   });
 
   it('should accept to a user with fleet.all privilege', async () => {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts
index cdbbfbe5ff69d..832a9266441ff 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/findings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { SearchRequest, QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { QueryDslBoolQuery } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts
index 53dcb705d0fc1..38a67e95df4a7 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle.test.ts
@@ -8,8 +8,8 @@
 import {
   elasticsearchClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server/elasticsearch/client/mocks';
-import { loggingSystemMock } from 'src/core/server/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getLatestCycleIds } from './get_latest_cycle_ids';
 
 const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts
index 4b4119801e2b5..781a60727f596 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/findings/get_latest_cycle_ids.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { AggregationsFiltersAggregate, SearchRequest } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { AGENT_LOGS_INDEX_PATTERN } from '../../../common/constants';
 
 const getAgentLogsEsQuery = (): SearchRequest => ({
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.ts
index 8f3d6df65b6b5..4e01301e2783a 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/cis_1_4_1/rules.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsBulkCreateObject } from 'src/core/server';
+import type { SavedObjectsBulkCreateObject } from '@kbn/core/server';
 import type { CspRuleSchema } from '../../../common/schemas/csp_rule';
 import { cspRuleAssetSavedObjectType } from '../../../common/schemas/csp_rule';
 
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts
index e1082cc59db3f..a75386728ce8b 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   type CloudSecurityPostureRuleTemplateSchema,
   cloudSecurityPostureRuleTemplateSavedObjectType,
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts
index 4b323c127c0e6..7d40d4f6a1928 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/csp_rule_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { SavedObjectsType, SavedObjectsValidationMap } from '../../../../../src/core/server';
+import type { SavedObjectsType, SavedObjectsValidationMap } from '@kbn/core/server';
 import {
   type CspRuleSchema,
   cspRuleSchema,
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.ts
index 71e7697296acb..6ec6d572209c5 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/initialize_rules.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISavedObjectsRepository } from 'src/core/server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
 import { CIS_BENCHMARK_1_4_1_RULES } from './cis_1_4_1/rules';
 import { cspRuleAssetSavedObjectType } from '../../common/schemas/csp_rule';
 
diff --git a/x-pack/plugins/cloud_security_posture/server/types.ts b/x-pack/plugins/cloud_security_posture/server/types.ts
index 9fe602424321c..ccbded12bddb2 100644
--- a/x-pack/plugins/cloud_security_posture/server/types.ts
+++ b/x-pack/plugins/cloud_security_posture/server/types.ts
@@ -8,16 +8,11 @@
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
-import type {
-  RouteMethod,
-  KibanaResponseFactory,
-  RequestHandler,
-  IRouter,
-} from '../../../../src/core/server';
+import type { RouteMethod, KibanaResponseFactory, RequestHandler, IRouter } from '@kbn/core/server';
 
-import type { FleetStartContract, FleetRequestHandlerContext } from '../../fleet/server';
+import type { FleetStartContract, FleetRequestHandlerContext } from '@kbn/fleet-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CspServerPluginSetup {}
diff --git a/x-pack/plugins/cross_cluster_replication/common/constants/index.ts b/x-pack/plugins/cross_cluster_replication/common/constants/index.ts
index a800afcf77ae4..327e83250e021 100644
--- a/x-pack/plugins/cross_cluster_replication/common/constants/index.ts
+++ b/x-pack/plugins/cross_cluster_replication/common/constants/index.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const platinumLicense: LicenseType = 'platinum';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js
index b47dc3e321f8b..e04cbb836157f 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/auto_follow_pattern_add.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import './mocks';
 import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './helpers';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js
index 61d5eae72bcfd..b8566af668230 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/follower_index_add.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import './mocks';
 import { setupEnvironment, pageHelpers, nextTick, delay } from './helpers';
 import { RemoteClustersFormField } from '../../app/components';
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js
index 43bdcd8b3a414..8e54f122d8d42 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/http_requests.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../../common/constants';
 
 // Register helpers to mock HTTP Requests
diff --git a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
index 1d030dff5f2f7..f906501fcc4c4 100644
--- a/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
+++ b/x-pack/plugins/cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { docLinksServiceMock } from '../../../../../../../src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 import { init as initDocumentation } from '../../../app/services/documentation_links';
 import { init as initHttpRequests } from './http_requests';
 import { setHttpClient } from '../../../app/services/api';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/app.tsx b/x-pack/plugins/cross_cluster_replication/public/app/app.tsx
index 90d26f0d68288..fcfe84b3c37e8 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/app.tsx
+++ b/x-pack/plugins/cross_cluster_replication/public/app/app.tsx
@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react';
 import { Route, Switch, Router, Redirect } from 'react-router-dom';
-import { ScopedHistory, ApplicationStart } from 'kibana/public';
+import { ScopedHistory, ApplicationStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
index 449a43bc4e5bf..55eee4a03e760 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
@@ -30,7 +30,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 import { extractQueryParams, indices } from '../../shared_imports';
 import { routing } from '../services/routing';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js
index 5420681335504..64d9de4f16098 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_actions_providers/follower_index_resume_provider.js
@@ -11,7 +11,7 @@ import { connect } from 'react-redux';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiConfirmModal, EuiLink } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { routing } from '../../services/routing';
 import { resumeFollowerIndex } from '../../store/actions';
 import { arrify } from '../../../../common/services/utils';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/index.tsx b/x-pack/plugins/cross_cluster_replication/public/app/index.tsx
index cee244c2de006..318cdfb2a1c92 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/index.tsx
+++ b/x-pack/plugins/cross_cluster_replication/public/app/index.tsx
@@ -18,7 +18,7 @@ import {
   DocLinksStart,
   CoreTheme,
   ExecutionContextStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { KibanaThemeProvider, useExecutionContext } from '../shared_imports';
 import { init as initBreadcrumbs, SetBreadcrumbs } from './services/breadcrumbs';
 import { init as initDocumentation } from './services/documentation_links';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js
index ac568a233e7c1..917477503a067 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js
@@ -13,7 +13,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiPageContent, EuiEmptyPrompt, EuiPageContentBody } from '@elastic/eui';
 
 import { listBreadcrumb, editBreadcrumb, setBreadcrumbs } from '../../services/breadcrumbs';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import {
   AutoFollowPatternForm,
   AutoFollowPatternPageTitle,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js
index ffec09844326d..684246f103b19 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { setBreadcrumbs, listBreadcrumb, editBreadcrumb } from '../../services/breadcrumbs';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import {
   FollowerIndexForm,
   FollowerIndexPageTitle,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
index 3921fee1b12e0..7f2093602331b 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContent, EuiButton, EuiEmptyPrompt, EuiText, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, PageError, PageLoading } from '../../../../shared_imports';
 import { trackUiMetric, METRIC_TYPE } from '../../../services/track_ui_metric';
 import { API_STATUS, UIM_AUTO_FOLLOW_PATTERN_LIST_LOAD } from '../../../constants';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
index 1776e06cea8df..5c966eac9219d 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
@@ -18,7 +18,7 @@ import {
   EuiOverlayMask,
   EuiHealth,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { API_STATUS, UIM_AUTO_FOLLOW_PATTERN_SHOW_DETAILS_CLICK } from '../../../../../constants';
 import {
   AutoFollowPatternDeleteProvider,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js
index aa7bc965465c6..9718f6f34eef8 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/detail_panel/detail_panel.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n-react';
 import moment from 'moment';
 
-import { getIndexListUri } from '../../../../../../../../../plugins/index_management/public';
+import { getIndexListUri } from '@kbn/index-management-plugin/public';
 
 import {
   EuiButtonEmpty,
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js
index 5d5d29e4cdba4..75263594d5a42 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js
@@ -33,7 +33,7 @@ import {
 import 'react-ace';
 import 'brace/theme/textmate';
 
-import { getIndexListUri } from '../../../../../../../../../plugins/index_management/public';
+import { getIndexListUri } from '@kbn/index-management-plugin/public';
 import { routing } from '../../../../../services/routing';
 import { API_STATUS } from '../../../../../constants';
 import { ContextMenu } from '../context_menu';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js
index c0a05f1d86c5b..6b4170cf18c02 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js
@@ -23,7 +23,7 @@ import { FollowerIndexActionsProvider } from '../../../../../components';
 import { routing } from '../../../../../services/routing';
 import { trackUiMetric } from '../../../../../services/track_ui_metric';
 import { ContextMenu } from '../context_menu';
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 const actionI18nTexts = {
   pause: i18n.translate(
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
index 072e081de8df8..a91df597c3f03 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContent, EuiButton, EuiEmptyPrompt, EuiText, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, PageLoading, PageError } from '../../../../shared_imports';
 import { trackUiMetric, METRIC_TYPE } from '../../../services/track_ui_metric';
 import { API_STATUS, UIM_FOLLOWER_INDEX_LIST_LOAD } from '../../../constants';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js b/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
index d7fda8dc25aca..3b07c8972815c 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
@@ -9,7 +9,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { indices } from '../../shared_imports';
 
 const { indexNameBeginsWithPeriod, findIllegalCharactersInIndexName, indexNameContainsSpaces } =
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts
index 5682c87a15faf..4ccd6c5f74901 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/breadcrumbs.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 export type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts
index 65bbfd919f94d..267f71b58bbdb 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/documentation_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DocLinksStart } from 'src/core/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 export let documentationLinks: DocLinksStart['links'];
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts
index b9612e1671708..e0ef03e12da04 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IToasts, FatalErrorsSetup } from 'src/core/public';
+import { IToasts, FatalErrorsSetup } from '@kbn/core/public';
 
 let _toasts: IToasts;
 let _fatalErrors: FatalErrorsSetup;
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts b/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts
index 14e053a251a3f..f6f2d7c562690 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/track_ui_metric.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
 
 import { UIM_APP_NAME } from '../constants';
diff --git a/x-pack/plugins/cross_cluster_replication/public/index.ts b/x-pack/plugins/cross_cluster_replication/public/index.ts
index 205c1e7bd01b2..9f94ab24826d3 100644
--- a/x-pack/plugins/cross_cluster_replication/public/index.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { CrossClusterReplicationPlugin } from './plugin';
 
diff --git a/x-pack/plugins/cross_cluster_replication/public/plugin.ts b/x-pack/plugins/cross_cluster_replication/public/plugin.ts
index 87b8c93119624..a13fd64d927cd 100644
--- a/x-pack/plugins/cross_cluster_replication/public/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/plugin.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { first } from 'rxjs/operators';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { firstValueFrom } from 'rxjs';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
 import { PLUGIN, MANAGEMENT_ID } from '../common/constants';
 import { init as initUiMetric } from './app/services/track_ui_metric';
@@ -75,7 +75,7 @@ export class CrossClusterReplicationPlugin implements Plugin {
 
     // NOTE: We enable the plugin by default instead of disabling it by default because this
     // creates a race condition that causes functional tests to fail on CI (see #66781).
-    Promise.all([licensing.license$.pipe(first()).toPromise(), getStartServices()]).then(
+    Promise.all([firstValueFrom(licensing.license$), getStartServices()]).then(
       ([license, startServices]) => {
         const licenseStatus = license.check(PLUGIN.ID, PLUGIN.minimumLicenseType);
         const isLicenseOk = licenseStatus.state === 'valid';
diff --git a/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts b/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
index d9a0db5cd1a7d..7bea4593c7054 100644
--- a/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/shared_imports.ts
@@ -11,11 +11,8 @@ export {
   SectionLoading,
   PageError,
   PageLoading,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
diff --git a/x-pack/plugins/cross_cluster_replication/public/types.ts b/x-pack/plugins/cross_cluster_replication/public/types.ts
index 7c7aeebeebe3f..b6130a1ff1343 100644
--- a/x-pack/plugins/cross_cluster_replication/public/types.ts
+++ b/x-pack/plugins/cross_cluster_replication/public/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { IndexManagementPluginSetup } from '../../index_management/public';
-import { RemoteClustersPluginSetup } from '../../remote_clusters/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
+import { RemoteClustersPluginSetup } from '@kbn/remote-clusters-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface PluginDependencies {
   usageCollection: UsageCollectionSetup;
diff --git a/x-pack/plugins/cross_cluster_replication/server/config.ts b/x-pack/plugins/cross_cluster_replication/server/config.ts
index 732137e308a0d..bac5f917f22a6 100644
--- a/x-pack/plugins/cross_cluster_replication/server/config.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/index.ts b/x-pack/plugins/cross_cluster_replication/server/index.ts
index 7a0984a6117bf..a24e95bddede1 100644
--- a/x-pack/plugins/cross_cluster_replication/server/index.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { CrossClusterReplicationServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/cross_cluster_replication/server/plugin.ts b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
index 9e4a8c484964b..657468b76d615 100644
--- a/x-pack/plugins/cross_cluster_replication/server/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
@@ -5,12 +5,11 @@
  * 2.0.
  */
 
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { CoreSetup, CoreStart, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
-import { IScopedClusterClient } from 'kibana/server';
+import { firstValueFrom, Observable } from 'rxjs';
+import { CoreSetup, CoreStart, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
-import { Index } from '../../index_management/server';
+import { Index } from '@kbn/index-management-plugin/server';
 import { PLUGIN } from '../common/constants';
 import { SetupDependencies, StartDependencies } from './types';
 import { registerApiRoutes } from './routes';
@@ -58,23 +57,20 @@ export class CrossClusterReplicationServerPlugin implements Plugin<void, void, a
     { http, getStartServices }: CoreSetup,
     { features, licensing, indexManagement, remoteClusters }: SetupDependencies
   ) {
-    this.config$
-      .pipe(first())
-      .toPromise()
-      .then((config) => {
-        // remoteClusters.isUiEnabled is driven by the xpack.remote_clusters.ui.enabled setting.
-        // The CCR UI depends upon the Remote Clusters UI (e.g. by cross-linking to it), so if
-        // the Remote Clusters UI is disabled we can't show the CCR UI.
-        const isCcrUiEnabled = config.ui.enabled && remoteClusters.isUiEnabled;
+    firstValueFrom(this.config$).then((config) => {
+      // remoteClusters.isUiEnabled is driven by the xpack.remote_clusters.ui.enabled setting.
+      // The CCR UI depends upon the Remote Clusters UI (e.g. by cross-linking to it), so if
+      // the Remote Clusters UI is disabled we can't show the CCR UI.
+      const isCcrUiEnabled = config.ui.enabled && remoteClusters.isUiEnabled;
 
-        // If the UI isn't enabled, then we don't want to expose any CCR concepts in the UI, including
-        // "follower" badges for follower indices.
-        if (isCcrUiEnabled) {
-          if (indexManagement.indexDataEnricher) {
-            indexManagement.indexDataEnricher.add(ccrDataEnricher);
-          }
+      // If the UI isn't enabled, then we don't want to expose any CCR concepts in the UI, including
+      // "follower" badges for follower indices.
+      if (isCcrUiEnabled) {
+        if (indexManagement.indexDataEnricher) {
+          indexManagement.indexDataEnricher.add(ccrDataEnricher);
         }
-      });
+      }
+    });
 
     this.license.setup({
       pluginName: PLUGIN.TITLE,
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts
index f778dc3eedd1a..b0af4faedf325 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts
index 6469b4a2ce576..5818abd739b19 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts
index 67ea716976417..3e137953f8ab7 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts
index a2bf912a99728..aa3197586c3f0 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts
index f74da91047ce7..8f672cc80cd33 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts
index 1837f1c17b384..9f1da2bd45534 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts
index 19d165a80eb3b..b7cd60b61d67d 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts
index 8de168e8a17d1..90573088b47e2 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts
index 3d818f40b0262..0513f75edb33b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts
index a0af8827b8744..11b13beef0ad3 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts
index 920de2777ad2e..cf8b3a66c6fbd 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts
index 1cd54a898dc39..ac2959486859b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts
index 8ef9c84594a46..7dde0daa4ebdc 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense, mockError } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
index d2cd579687106..0e098da67a25b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { handleEsError } from '../../../shared_imports';
 import { mockRouteContext, mockLicense } from '../test_lib';
diff --git a/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts b/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts
index c125d6b4552fd..057f4a9863e45 100644
--- a/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/test_lib.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandlerContext } from 'src/core/server';
+import { RequestHandlerContext } from '@kbn/core/server';
 import { License } from '../../shared_imports';
 
 export function mockRouteContext(mockedFunctions: unknown): RequestHandlerContext {
diff --git a/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts b/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts
index e9e3ed72aed64..ad01d3942d4d2 100644
--- a/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export { License } from '../../license_api_guard/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export { License } from '@kbn/license-api-guard-plugin/server';
diff --git a/x-pack/plugins/cross_cluster_replication/server/types.ts b/x-pack/plugins/cross_cluster_replication/server/types.ts
index 18d2c45039eba..6752bf397203b 100644
--- a/x-pack/plugins/cross_cluster_replication/server/types.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
-import { IndexManagementPluginSetup } from '../../index_management/server';
-import { RemoteClustersPluginSetup } from '../../remote_clusters/server';
+import { IRouter } from '@kbn/core/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
+import { RemoteClustersPluginSetup } from '@kbn/remote-clusters-plugin/server';
 import { License, handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts
index 7a7a70472b7df..61c42b74e9e83 100644
--- a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts
+++ b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { createExtract, createInject } from './dashboard_drilldown_persistable_state';
-import { SerializedEvent } from '../../../../ui_actions_enhanced/common';
+import { SerializedEvent } from '@kbn/ui-actions-enhanced-plugin/common';
 
 const drilldownId = 'test_id';
 const extract = createExtract({ drilldownId });
diff --git a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts
index 04ee451c91c75..fe71ebd65ea8f 100644
--- a/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts
+++ b/x-pack/plugins/dashboard_enhanced/common/drilldowns/dashboard_drilldown/dashboard_drilldown_persistable_state.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from '../../../../../../src/core/types';
-import { PersistableStateService } from '../../../../../../src/plugins/kibana_utils/common';
-import { SerializedAction, SerializedEvent } from '../../../../ui_actions_enhanced/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
+import { SerializedAction, SerializedEvent } from '@kbn/ui-actions-enhanced-plugin/common';
 import { DrilldownConfig } from './types';
 
 type DashboardDrilldownPersistableState = PersistableStateService<SerializedEvent>;
diff --git a/x-pack/plugins/dashboard_enhanced/public/index.ts b/x-pack/plugins/dashboard_enhanced/public/index.ts
index 545696abb0ac5..ce765b86aeb54 100644
--- a/x-pack/plugins/dashboard_enhanced/public/index.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DashboardEnhancedPlugin } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/dashboard_enhanced/public/plugin.ts b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
index 339269f95e51e..8c16c8c7d14bb 100644
--- a/x-pack/plugins/dashboard_enhanced/public/plugin.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/plugin.ts
@@ -5,13 +5,16 @@
  * 2.0.
  */
 
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { SharePluginStart, SharePluginSetup } from '../../../../src/plugins/share/public';
-import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import {
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
 import { DashboardDrilldownsService } from './services';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/public';
-import { DashboardStart } from '../../../../src/plugins/dashboard/public';
 
 export interface SetupDependencies {
   uiActionsEnhanced: AdvancedUiActionsSetup;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
index 1e58b13c00004..22f0f9148861c 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/abstract_dashboard_drilldown.tsx
@@ -5,24 +5,24 @@
  * 2.0.
  */
 
-import type { KibanaLocation } from 'src/plugins/share/public';
+import type { KibanaLocation } from '@kbn/share-plugin/public';
 import React from 'react';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { DashboardStart } from 'src/plugins/dashboard/public';
-import { DrilldownConfig } from '../../../../common/drilldowns/dashboard_drilldown/types';
-import { reactToUiComponent } from '../../../../../../../src/plugins/kibana_react/public';
-import { CollectConfigContainer } from './components';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
 import {
   AdvancedUiActionsStart,
   UiActionsEnhancedBaseActionFactoryContext as BaseActionFactoryContext,
   UiActionsEnhancedDrilldownDefinition as Drilldown,
-} from '../../../../../ui_actions_enhanced/public';
-import { txtGoToDashboard } from './i18n';
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import {
   CollectConfigProps,
   StartServicesGetter,
   UiComponent,
-} from '../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
+import { DrilldownConfig } from '../../../../common/drilldowns/dashboard_drilldown/types';
+import { CollectConfigContainer } from './components';
+import { txtGoToDashboard } from './i18n';
 import { Config } from './types';
 
 export interface Params {
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx
index 7b6caabfd5a7e..4a9818b3f23f5 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/components/collect_config_container.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 import { debounce, findIndex } from 'lodash';
-import { SimpleSavedObject } from '../../../../../../../../src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
 import { DashboardDrilldownConfig } from './dashboard_drilldown_config';
 import { txtDestinationDashboardNotFound } from './i18n';
-import { CollectConfigProps } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { Config } from '../types';
 import { Params } from '../abstract_dashboard_drilldown';
 
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts
index 13f29ea490f7f..599ecce6217e2 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/abstract_dashboard_drilldown/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UiActionsEnhancedBaseActionFactoryContext } from '../../../../../ui_actions_enhanced/public';
+import { UiActionsEnhancedBaseActionFactoryContext } from '@kbn/ui-actions-enhanced-plugin/public';
 import { DrilldownConfig } from '../../../../common';
 
 export type Config = DrilldownConfig;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts
index ce96b3497e9ff..b9cfe79e19fa9 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/drilldown_shared.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { APPLY_FILTER_TRIGGER } from '../../../../../../../src/plugins/data/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
 import {
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
   IEmbeddable,
   Container as EmbeddableContainer,
-} from '../../../../../../../src/plugins/embeddable/public';
-import { isEnhancedEmbeddable } from '../../../../../embeddable_enhanced/public';
-import { UiActionsEnhancedDrilldownTemplate as DrilldownTemplate } from '../../../../../ui_actions_enhanced/public';
+} from '@kbn/embeddable-plugin/public';
+import { isEnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
+import { UiActionsEnhancedDrilldownTemplate as DrilldownTemplate } from '@kbn/ui-actions-enhanced-plugin/public';
 
 /**
  * We know that VALUE_CLICK_TRIGGER and SELECT_RANGE_TRIGGER are also triggering APPLY_FILTER_TRIGGER.
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
index 2026781c705d7..295bf8968bd5d 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx
@@ -10,11 +10,11 @@ import {
   FlyoutCreateDrilldownAction,
   OpenFlyoutAddDrilldownParams,
 } from './flyout_create_drilldown';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
-import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
-import { UiActionsEnhancedActionFactory } from '../../../../../../ui_actions_enhanced/public/';
+import { uiActionsEnhancedPluginMock } from '@kbn/ui-actions-enhanced-plugin/public/mocks';
+import { UiActionsEnhancedActionFactory } from '@kbn/ui-actions-enhanced-plugin/public';
 
 const overlays = coreMock.createStart().overlays;
 const uiActionsEnhanced = uiActionsEnhancedPluginMock.createStartContract();
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
index e1627ea1cb6c3..c8715c9e3b416 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx
@@ -9,19 +9,15 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { distinctUntilChanged, filter, map, skip, take, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { Action } from '../../../../../../../../src/plugins/ui_actions/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
-import {
-  CONTEXT_MENU_TRIGGER,
-  EmbeddableContext,
-  ViewMode,
-} from '../../../../../../../../src/plugins/embeddable/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { CONTEXT_MENU_TRIGGER, EmbeddableContext, ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   isEnhancedEmbeddable,
   embeddableEnhancedDrilldownGrouping,
-} from '../../../../../../embeddable_enhanced/public';
+} from '@kbn/embeddable-enhanced-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { StartDependencies } from '../../../../plugin';
-import { StartServicesGetter } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { ensureNestedTriggers, createDrilldownTemplatesFromSiblings } from '../drilldown_shared';
 
 export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
index e4c2d5b657630..b0aef4d4eb719 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx
@@ -7,10 +7,10 @@
 
 import { Subject } from 'rxjs';
 import { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_edit_drilldown';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
-import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
-import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { uiActionsEnhancedPluginMock } from '@kbn/ui-actions-enhanced-plugin/public/mocks';
+import { EnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
 import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
 
 const overlays = coreMock.createStart().overlays;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
index 09ea886f9a2d0..44bfbb26421c6 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx
@@ -8,24 +8,17 @@
 import React from 'react';
 import { distinctUntilChanged, filter, map, skip, take, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { Action } from '../../../../../../../../src/plugins/ui_actions/public';
-import {
-  reactToUiComponent,
-  toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
-import {
-  EmbeddableContext,
-  ViewMode,
-  CONTEXT_MENU_TRIGGER,
-} from '../../../../../../../../src/plugins/embeddable/public';
-import { txtDisplayName } from './i18n';
-import { MenuItem } from './menu_item';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { reactToUiComponent, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { EmbeddableContext, ViewMode, CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 import {
   isEnhancedEmbeddable,
   embeddableEnhancedDrilldownGrouping,
-} from '../../../../../../embeddable_enhanced/public';
+} from '@kbn/embeddable-enhanced-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { txtDisplayName } from './i18n';
+import { MenuItem } from './menu_item';
 import { StartDependencies } from '../../../../plugin';
-import { StartServicesGetter } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { createDrilldownTemplatesFromSiblings, ensureNestedTriggers } from '../drilldown_shared';
 
 export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
index 5c03d90212ff2..d266e1b6faf5f 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.test.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { render, act } from '@testing-library/react';
 import { MenuItem } from './menu_item';
-import { createStateContainer } from '../../../../../../../../src/plugins/kibana_utils/public';
-import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../../../../../ui_actions_enhanced/public';
-import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
+import { createStateContainer } from '@kbn/kibana-utils-plugin/public';
+import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '@kbn/ui-actions-enhanced-plugin/public';
+import { EnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
 
 test('<MenuItem/>', () => {
   const state = createStateContainer<{ events: object[] }>({ events: [] });
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
index b7cc002a7120b..eb0dab1c46856 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/menu_item.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import { EuiNotificationBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { useContainerState } from '../../../../../../../../src/plugins/kibana_utils/public';
-import { EnhancedEmbeddableContext } from '../../../../../../embeddable_enhanced/public';
+import { useContainerState } from '@kbn/kibana-utils-plugin/public';
+import { EnhancedEmbeddableContext } from '@kbn/embeddable-enhanced-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { txtDisplayName } from './i18n';
-import { ActionExecutionContext } from '../../../../../../../../src/plugins/ui_actions/public';
 
 export const MenuItem: React.FC<{ context: ActionExecutionContext<EnhancedEmbeddableContext> }> = ({
   context,
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
index fa25a48ba0c91..067b27fd12e5b 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/test_helpers.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Embeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public';
-import { EnhancedEmbeddable } from '../../../../../embeddable_enhanced/public';
+import { Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { EnhancedEmbeddable } from '@kbn/embeddable-enhanced-plugin/public';
 import {
   UiActionsEnhancedMemoryActionStorage as MemoryActionStorage,
   UiActionsEnhancedDynamicActionManager as DynamicActionManager,
   AdvancedUiActionsStart,
-} from '../../../../../ui_actions_enhanced/public';
-import { uiActionsEnhancedPluginMock } from '../../../../../ui_actions_enhanced/public/mocks';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { uiActionsEnhancedPluginMock } from '@kbn/ui-actions-enhanced-plugin/public/mocks';
 
 export class MockEmbeddable extends Embeddable {
   public rootType = 'dashboard';
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
index 0ecd403edaaf3..cc65ae1556e08 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { SetupDependencies, StartDependencies } from '../../plugin';
-import { CONTEXT_MENU_TRIGGER } from '../../../../../../src/plugins/embeddable/public';
 import { FlyoutCreateDrilldownAction, FlyoutEditDrilldownAction } from './actions';
 import { EmbeddableToDashboardDrilldown } from './embeddable_to_dashboard_drilldown';
-import { createStartServicesGetter } from '../../../../../../src/plugins/kibana_utils/public';
 
 interface BootstrapParams {
   enableDrilldowns: boolean;
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
index 6c4a9d31c583c..abc2c8b33e5de 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
@@ -8,16 +8,16 @@
 import type { Filter, RangeFilter } from '@kbn/es-query';
 import { EmbeddableToDashboardDrilldown } from './embeddable_to_dashboard_drilldown';
 import { AbstractDashboardDrilldownConfig as Config } from '../abstract_dashboard_drilldown';
-import { savedObjectsServiceMock } from '../../../../../../../src/core/public/mocks';
-import { FilterStateStore, Query, TimeRange } from '../../../../../../../src/plugins/data/common';
-import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/unified_search/public';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import { FilterStateStore, Query, TimeRange } from '@kbn/data-plugin/common';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
 import {
   DashboardAppLocatorDefinition,
   DashboardAppLocatorParams,
-} from '../../../../../../../src/plugins/dashboard/public/locator';
+} from '@kbn/dashboard-plugin/public/locator';
 import { StartDependencies } from '../../../plugin';
-import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_utils/public/core';
-import { EnhancedEmbeddableContext } from '../../../../../embeddable_enhanced/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public/core';
+import { EnhancedEmbeddableContext } from '@kbn/embeddable-enhanced-plugin/public';
 
 describe('.isConfigValid()', () => {
   const drilldown = new EmbeddableToDashboardDrilldown({} as any);
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
index d3478013b96d0..bf625aabe8cb8 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
@@ -5,12 +5,9 @@
  * 2.0.
  */
 import { type Filter, isFilters, isFilterPinned } from '@kbn/es-query';
-import type { KibanaLocation } from 'src/plugins/share/public';
-import {
-  DashboardAppLocatorParams,
-  cleanEmptyKeys,
-} from '../../../../../../../src/plugins/dashboard/public';
-import { setStateToKbnUrl } from '../../../../../../../src/plugins/kibana_utils/public';
+import type { KibanaLocation } from '@kbn/share-plugin/public';
+import { DashboardAppLocatorParams, cleanEmptyKeys } from '@kbn/dashboard-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import {
   APPLY_FILTER_TRIGGER,
   isQuery,
@@ -18,9 +15,10 @@ import {
   Query,
   TimeRange,
   extractTimeRange,
-} from '../../../../../../../src/plugins/data/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/unified_search/public';
-import { IEmbeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/data-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
+import { IEmbeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { EnhancedEmbeddableContext } from '@kbn/embeddable-enhanced-plugin/public';
 import {
   AbstractDashboardDrilldown,
   AbstractDashboardDrilldownParams,
@@ -28,7 +26,6 @@ import {
 } from '../abstract_dashboard_drilldown';
 import { EMBEDDABLE_TO_DASHBOARD_DRILLDOWN } from './constants';
 import { createExtract, createInject } from '../../../../common';
-import { EnhancedEmbeddableContext } from '../../../../../embeddable_enhanced/public';
 
 interface EmbeddableQueryInput extends EmbeddableInput {
   query?: Query;
diff --git a/x-pack/plugins/dashboard_enhanced/server/index.ts b/x-pack/plugins/dashboard_enhanced/server/index.ts
index 3351cd9547903..8fa8ea33c1788 100644
--- a/x-pack/plugins/dashboard_enhanced/server/index.ts
+++ b/x-pack/plugins/dashboard_enhanced/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DashboardEnhancedPlugin } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/dashboard_enhanced/server/plugin.ts b/x-pack/plugins/dashboard_enhanced/server/plugin.ts
index 89d4d70a1f6f4..18ae458ea9873 100644
--- a/x-pack/plugins/dashboard_enhanced/server/plugin.ts
+++ b/x-pack/plugins/dashboard_enhanced/server/plugin.ts
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server';
-import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import {
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '@kbn/ui-actions-enhanced-plugin/server';
 import { EMBEDDABLE_TO_DASHBOARD_DRILLDOWN, createExtract, createInject } from '../common';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/data_enhanced/config.ts b/x-pack/plugins/data_enhanced/config.ts
index e08381316a29c..eb3ee0da41839 100644
--- a/x-pack/plugins/data_enhanced/config.ts
+++ b/x-pack/plugins/data_enhanced/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { searchSessionsConfigSchema } from '../../../src/plugins/data/config';
+import { searchSessionsConfigSchema } from '@kbn/data-plugin/config';
 
 export const configSchema = schema.object({
   search: schema.object({
diff --git a/x-pack/plugins/data_enhanced/public/index.ts b/x-pack/plugins/data_enhanced/public/index.ts
index 38b8d7d5c5fdf..7af1aff1b3106 100644
--- a/x-pack/plugins/data_enhanced/public/index.ts
+++ b/x-pack/plugins/data_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { DataEnhancedPlugin, DataEnhancedSetup, DataEnhancedStart } from './plugin';
 import { ConfigSchema } from '../config';
 
@@ -14,7 +14,4 @@ export const plugin = (initializerContext: PluginInitializerContext<ConfigSchema
 
 export type { DataEnhancedSetup, DataEnhancedStart };
 
-export {
-  ENHANCED_ES_SEARCH_STRATEGY,
-  EQL_SEARCH_STRATEGY,
-} from '../../../../src/plugins/data/common';
+export { ENHANCED_ES_SEARCH_STRATEGY, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
diff --git a/x-pack/plugins/data_enhanced/public/plugin.ts b/x-pack/plugins/data_enhanced/public/plugin.ts
index ee76cce9b9d2b..f1bb9d7b4b4b6 100644
--- a/x-pack/plugins/data_enhanced/public/plugin.ts
+++ b/x-pack/plugins/data_enhanced/public/plugin.ts
@@ -7,22 +7,22 @@
 
 import React from 'react';
 import moment from 'moment';
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,
   SearchUsageCollector,
-} from '../../../../src/plugins/data/public';
-import { BfetchPublicSetup } from '../../../../src/plugins/bfetch/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { SharePluginStart } from '../../../../src/plugins/share/public';
+} from '@kbn/data-plugin/public';
+import { BfetchPublicSetup } from '@kbn/bfetch-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { ScreenshotModePluginStart } from '@kbn/screenshot-mode-plugin/public';
 import { registerSearchSessionsMgmt } from './search/sessions_mgmt';
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
 import { createConnectedSearchSessionIndicator } from './search';
 import { ConfigSchema } from '../config';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { ScreenshotModePluginStart } from '../../../../src/plugins/screenshot_mode/public';
 
 export interface DataEnhancedSetupDependencies {
   bfetch: BfetchPublicSetup;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx
index 7f5117740f38c..d2be863170a4b 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/index.tsx
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
-import type { ManagementAppMountParams } from 'src/plugins/management/public';
+import { CoreSetup } from '@kbn/core/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import type {
   AppDependencies,
   IManagementSectionsPluginsSetup,
   IManagementSectionsPluginsStart,
   SessionsConfigSchema,
-} from '../';
-import { APP } from '../';
+} from '..';
+import { APP } from '..';
 import { SearchSessionsMgmtAPI } from '../lib/api';
 import { AsyncSearchIntroDocumentation } from '../lib/documentation';
 import { renderApp } from './render';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx
index 1406cf98a843e..563179064062b 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/application/render.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { AppDependencies } from '../';
-import { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { AppDependencies } from '..';
 import { SearchSessionsMgmtMain } from '../components/main';
 
 export const renderApp = (
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx
index 127a63b647a24..d612aada1084a 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx
@@ -9,10 +9,10 @@ import { EuiConfirmModal } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
-import { CoreStart } from 'kibana/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
-import { IClickActionDescriptor } from '../';
+import { IClickActionDescriptor } from '..';
 import { OnActionDismiss } from './types';
 import { UISession } from '../../types';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx
index d8b5e9de16688..bb64fef09aba8 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/extend_button.tsx
@@ -10,10 +10,10 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
 import moment from 'moment';
-import { CoreStart } from 'kibana/public';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
-import { IClickActionDescriptor } from '../';
+import { IClickActionDescriptor } from '..';
 import { OnActionDismiss } from './types';
 import { UISession } from '../../types';
 import extendSessionIcon from '../../icons/extend_session.svg';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx
index c3860fe3e276b..4ab246b5ee403 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { IClickActionDescriptor } from '../';
+import { CoreStart } from '@kbn/core/public';
+import { IClickActionDescriptor } from '..';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { UISession } from '../../types';
 import { createDeleteActionDescriptor } from './delete_button';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx
index 2b917c28c4b3b..823ab99c0213f 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/inspect_button.tsx
@@ -8,14 +8,14 @@
 import { EuiFlyoutBody, EuiFlyoutHeader, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
-import { CoreStart } from 'kibana/public';
-import { UISession } from '../../types';
-import { IClickActionDescriptor } from '..';
+import { CoreStart } from '@kbn/core/public';
 import {
   CodeEditor,
   createKibanaReactContext,
   toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { UISession } from '../../types';
+import { IClickActionDescriptor } from '..';
 import './inspect_button.scss';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx
index dbacb6d094391..35661dce80da6 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx
@@ -17,7 +17,7 @@ import {
   EuiContextMenuPanelItemSeparator,
 } from '@elastic/eui/src/components/context_menu/context_menu';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React, { useState } from 'react';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { UISession } from '../../types';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx
index e87b19ed20b10..1891892b93c74 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/rename_button.tsx
@@ -20,10 +20,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useState } from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
-import { IClickActionDescriptor } from '../';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { IClickActionDescriptor } from '..';
 import { OnActionDismiss } from './types';
 import { UISession } from '../../types';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx
index b79a4939b3fdd..fac9cda42eef2 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.test.tsx
@@ -7,21 +7,21 @@
 
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { mount, ReactWrapper } from 'enzyme';
-import { CoreSetup, CoreStart, DocLinksStart } from 'kibana/public';
+import { CoreSetup, CoreStart, DocLinksStart } from '@kbn/core/public';
 import moment from 'moment';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
-import { SessionsClient } from 'src/plugins/data/public/search';
+import { coreMock } from '@kbn/core/public/mocks';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
 import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '..';
 import { SearchSessionsMgmtAPI } from '../lib/api';
 import { AsyncSearchIntroDocumentation } from '../lib/documentation';
 import { LocaleWrapper } from '../__mocks__';
 import { SearchSessionsMgmtMain } from './main';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { managementPluginMock } from '../../../../../../../src/plugins/management/public/mocks';
-import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
-import { sharePluginMock } from '../../../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
 let mockCoreStart: MockedKeys<CoreStart>;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx
index 8d83b9ab60138..e065a20003dd9 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/main.tsx
@@ -7,10 +7,10 @@
 
 import { EuiButtonEmpty, EuiPageHeader, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { CoreStart, HttpStart } from 'kibana/public';
+import type { CoreStart, HttpStart } from '@kbn/core/public';
 import React from 'react';
-import type { SessionsConfigSchema } from '../';
-import { IManagementSectionsPluginsSetup } from '../';
+import type { SessionsConfigSchema } from '..';
+import { IManagementSectionsPluginsSetup } from '..';
 import type { SearchSessionsMgmtAPI } from '../lib/api';
 import type { AsyncSearchIntroDocumentation } from '../lib/documentation';
 import { SearchSessionsMgmtTable } from './table';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx
index b3d299bd30613..83f4494dff504 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.test.tsx
@@ -8,7 +8,7 @@
 import { EuiTextProps, EuiToolTipProps } from '@elastic/eui';
 import { mount } from 'enzyme';
 import React from 'react';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common/';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { UISession } from '../types';
 import { LocaleWrapper } from '../__mocks__';
 import { getStatusText, StatusIndicator } from './status';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx
index 1f62ca05f50cb..577e89f2c761b 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/status.tsx
@@ -8,10 +8,10 @@
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { ReactElement } from 'react';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { dateString } from '../lib/date_string';
 import { UISession } from '../types';
-import { StatusDef as StatusAttributes, TableText } from './';
+import { StatusDef as StatusAttributes, TableText } from '.';
 
 // Shared helper function
 export const getStatusText = (statusType: string): string => {
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx
index 791c3e5d939a1..33e085fbb646d 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/status_filter.tsx
@@ -8,7 +8,7 @@
 import { FieldValueOptionType, SearchFilterConfig } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { TableText } from '../';
+import { TableText } from '..';
 import { UISession } from '../../types';
 import { getStatusText } from '../status';
 
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx
index eb1f82cc01e37..2023aed902c9f 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.test.tsx
@@ -8,20 +8,20 @@
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { act, waitFor } from '@testing-library/react';
 import { mount, ReactWrapper } from 'enzyme';
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import React from 'react';
-import { coreMock } from 'src/core/public/mocks';
-import { SessionsClient } from 'src/plugins/data/public/search';
-import { SearchSessionStatus } from '../../../../../../../../src/plugins/data/common';
-import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../../';
+import { coreMock } from '@kbn/core/public/mocks';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
+import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../..';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { LocaleWrapper } from '../../__mocks__';
 import { SearchSessionsMgmtTable } from './table';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { managementPluginMock } from '../../../../../../../../src/plugins/management/public/mocks';
-import { SharePluginStart } from '../../../../../../../../src/plugins/share/public';
-import { sharePluginMock } from '../../../../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
 let mockCoreStart: CoreStart;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx
index 5dbcb1cfb9990..88ffb5ed2d749 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/table/table.tsx
@@ -7,14 +7,14 @@
 
 import { EuiButton, EuiInMemoryTable, EuiSearchBarProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 import useInterval from 'react-use/lib/useInterval';
-import { TableText } from '../';
+import { SEARCH_SESSIONS_TABLE_ID } from '@kbn/data-plugin/common';
+import { TableText } from '..';
 import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../..';
-import { SEARCH_SESSIONS_TABLE_ID } from '../../../../../../../../src/plugins/data/common/';
 import { SearchSessionsMgmtAPI } from '../../lib/api';
 import { getColumns } from '../../lib/get_columns';
 import { UISession } from '../../types';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
index 87d3792df2fb7..35eb3cb4e36a4 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
@@ -6,16 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { CoreStart, HttpStart, I18nStart, IUiSettingsClient } from 'kibana/public';
-import { CoreSetup } from 'kibana/public';
-import type { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { CoreStart, HttpStart, I18nStart, IUiSettingsClient } from '@kbn/core/public';
+import { CoreSetup } from '@kbn/core/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import { SEARCH_SESSIONS_MANAGEMENT_ID } from '@kbn/data-plugin/public';
 import type { ConfigSchema } from '../../../config';
 import type { DataEnhancedStartDependencies } from '../../plugin';
 import type { SearchSessionsMgmtAPI } from './lib/api';
 import type { AsyncSearchIntroDocumentation } from './lib/documentation';
-import { SEARCH_SESSIONS_MANAGEMENT_ID } from '../../../../../../src/plugins/data/public';
 
 export interface IManagementSectionsPluginsSetup {
   data: DataPublicPluginSetup;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts
index a0b6aa80f2500..69c0d165ac6c0 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts
@@ -6,16 +6,16 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import moment from 'moment';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { SavedObjectsFindResponse } from 'src/core/server';
-import { SessionsClient } from 'src/plugins/data/public/search';
-import type { SessionsConfigSchema } from '../';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
-import { sharePluginMock } from '../../../../../../../src/plugins/share/public/mocks';
-import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
+import type { SessionsConfigSchema } from '..';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { SearchSessionsMgmtAPI } from './api';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
index fbd7f472177cb..bb58efd01d957 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts
@@ -6,17 +6,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ApplicationStart, NotificationsStart, SavedObject } from 'kibana/public';
+import type { ApplicationStart, NotificationsStart, SavedObject } from '@kbn/core/public';
 import moment from 'moment';
 import { from, race, timer } from 'rxjs';
 import { mapTo, tap } from 'rxjs/operators';
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 import { SerializableRecord } from '@kbn/utility-types';
-import {
-  ISessionsClient,
-  SearchUsageCollector,
-} from '../../../../../../../src/plugins/data/public';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { ISessionsClient, SearchUsageCollector } from '@kbn/data-plugin/public';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { ACTION } from '../components/actions';
 import {
   PersistedSearchSessionSavedObjectAttributes,
@@ -133,10 +130,6 @@ export class SearchSessionsMgmtAPI {
   ) {}
 
   public async fetchTableData(): Promise<UISession[]> {
-    interface FetchResult {
-      saved_objects: object[];
-    }
-
     const mgmtConfig = this.config.management;
 
     const refreshTimeout = moment.duration(mgmtConfig.refreshTimeout);
@@ -165,7 +158,7 @@ export class SearchSessionsMgmtAPI {
 
     // fetch the search sessions before timeout triggers
     try {
-      const result = await race<FetchResult | null>(fetch$, timeout$).toPromise();
+      const result = await race(fetch$, timeout$).toPromise();
       if (result && result.saved_objects) {
         const savedObjects = result.saved_objects as Array<
           SavedObject<PersistedSearchSessionSavedObjectAttributes>
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts
index 545c7f7ec26b2..03279199912c0 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export class AsyncSearchIntroDocumentation {
   private docUrl: string = '';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx
index 9578d56e44b1c..35da6b995169a 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.test.tsx
@@ -8,21 +8,21 @@
 import { EuiTableFieldDataColumnType } from '@elastic/eui';
 import { MockedKeys } from '@kbn/utility-types/jest';
 import { mount } from 'enzyme';
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import { ReactElement } from 'react';
-import { coreMock } from 'src/core/public/mocks';
-import { SessionsClient } from 'src/plugins/data/public/search';
-import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { SessionsClient } from '@kbn/data-plugin/public/search';
+import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '..';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { OnActionComplete } from '../components';
 import { UISession } from '../types';
 import { SearchSessionsMgmtAPI } from './api';
 import { getColumns } from './get_columns';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { managementPluginMock } from '../../../../../../../src/plugins/management/public/mocks';
-import { SharePluginStart } from '../../../../../../../src/plugins/share/public';
-import { sharePluginMock } from '../../../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 let mockCoreSetup: MockedKeys<CoreSetup>;
 let mockCoreStart: CoreStart;
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
index 375f642b29d8f..d9a71639f8fe2 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_columns.tsx
@@ -17,16 +17,16 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { capitalize } from 'lodash';
 import React from 'react';
-import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
-import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '../';
-import { SearchSessionStatus } from '../../../../../../../src/plugins/data/common';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
+import { IManagementSectionsPluginsSetup, SessionsConfigSchema } from '..';
 import { TableText } from '../components';
 import { OnActionComplete, PopoverActionsMenu } from '../components';
 import { StatusIndicator } from '../components/status';
-import { dateString } from '../lib/date_string';
+import { dateString } from './date_string';
 import { SearchSessionsMgmtAPI } from './api';
 import { getExpirationStatus } from './get_expiration_status';
 import { UISession } from '../types';
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts
index bbd769207b567..a220b414ba659 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/get_expiration_status.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import { SessionsConfigSchema } from '../';
+import { SessionsConfigSchema } from '..';
 
 export const getExpirationStatus = (config: SessionsConfigSchema, expires: string | null) => {
   const tNow = moment.utc().valueOf();
diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts
index 7489a1ce26aa5..c66290a968240 100644
--- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts
+++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  SearchSessionSavedObjectAttributes,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
+import { SearchSessionSavedObjectAttributes, SearchSessionStatus } from '@kbn/data-plugin/common';
 import { ACTION } from './components/actions';
 
 export const DATE_STRING_FORMAT = 'D MMM, YYYY, HH:mm:ss';
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
index 5f5753b8858e0..7c93d5cd78e68 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx
@@ -8,22 +8,23 @@
 import React, { ReactNode } from 'react';
 import { StubBrowserStorage } from '@kbn/test-jest-helpers';
 import { render, waitFor, screen, act } from '@testing-library/react';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public/';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createConnectedSearchSessionIndicator } from './connected_search_session_indicator';
 import { BehaviorSubject } from 'rxjs';
+import { map } from 'rxjs/operators';
 import {
   ISessionService,
   RefreshInterval,
   SearchSessionState,
   SearchUsageCollector,
   TimefilterContract,
-} from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+} from '@kbn/data-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { TOUR_RESTORE_STEP_KEY, TOUR_TAKING_TOO_LONG_STEP_KEY } from './search_session_tour';
 import userEvent from '@testing-library/user-event';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { createSearchUsageCollectorMock } from '../../../../../../../src/plugins/data/public/search/collectors/mocks';
+import { createSearchUsageCollectorMock } from '@kbn/data-plugin/public/search/collectors/mocks';
 
 const coreStart = coreMock.createStart();
 const application = coreStart.application;
@@ -35,7 +36,7 @@ let usageCollector: jest.Mocked<SearchUsageCollector>;
 
 const refreshInterval$ = new BehaviorSubject<RefreshInterval>({ value: 0, pause: true });
 const timeFilter = dataStart.query.timefilter.timefilter as jest.Mocked<TimefilterContract>;
-timeFilter.getRefreshIntervalUpdate$.mockImplementation(() => refreshInterval$);
+timeFilter.getRefreshIntervalUpdate$.mockImplementation(() => refreshInterval$.pipe(map(() => {})));
 timeFilter.getRefreshInterval.mockImplementation(() => refreshInterval$.getValue());
 
 const disableSaveAfterSessionCompletesTimeout = 5 * 60 * 1000;
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
index f1ce93181f1ac..23abbf3084073 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx
@@ -10,15 +10,11 @@ import { debounce, distinctUntilChanged, mapTo, switchMap, tap } from 'rxjs/oper
 import { merge, of, timer } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 import { i18n } from '@kbn/i18n';
+import { ISessionService, SearchSessionState, SearchUsageCollector } from '@kbn/data-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { ApplicationStart, IBasePath } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { SearchSessionIndicator, SearchSessionIndicatorRef } from '../search_session_indicator';
-import {
-  ISessionService,
-  SearchSessionState,
-  SearchUsageCollector,
-} from '../../../../../../../src/plugins/data/public';
-import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
-import { ApplicationStart, IBasePath } from '../../../../../../../src/core/public';
-import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
 import { useSearchSessionTour } from './search_session_tour';
 
 export interface SearchSessionIndicatorDeps {
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx
index 50ee3737ad92b..2d9c29681a41c 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx
@@ -7,12 +7,9 @@
 
 import { useCallback, useEffect } from 'react';
 import { once } from 'lodash';
-import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { SearchSessionState, SearchUsageCollector } from '@kbn/data-plugin/public';
 import { SearchSessionIndicatorRef } from '../search_session_indicator';
-import {
-  SearchSessionState,
-  SearchUsageCollector,
-} from '../../../../../../../src/plugins/data/public';
 
 const TOUR_TAKING_TOO_LONG_TIMEOUT = 10000;
 export const TOUR_TAKING_TOO_LONG_STEP_KEY = `data.searchSession.tour.takingTooLong`;
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx
index e9577c3464d11..654dfee17c5a2 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { SearchSessionState } from '@kbn/data-plugin/public';
 import { SearchSessionIndicator } from './search_session_indicator';
-import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
 
 storiesOf('components/SearchSessionIndicator', module).add('default', () => {
   const [searchSessionName, setSearchSessionName] = React.useState('Discover session');
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
index 69bd6931b6c5b..26563bfa02fa7 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.test.tsx
@@ -10,7 +10,7 @@ import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { SearchSessionIndicator } from './search_session_indicator';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
+import { SearchSessionState } from '@kbn/data-plugin/public';
 
 function Container({ children }: { children?: ReactNode }) {
   return <IntlProvider locale="en">{children}</IntlProvider>;
diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx
index 205f04b07a944..540cb6b5bebd4 100644
--- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx
+++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx
@@ -22,9 +22,9 @@ import {
 import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { SearchSessionState } from '@kbn/data-plugin/public';
 import { CheckInEmptyCircle, PartialClock } from './custom_icons';
 import './search_session_indicator.scss';
-import { SearchSessionState } from '../../../../../../../src/plugins/data/public';
 import { SearchSessionName } from './components';
 
 export interface SearchSessionIndicatorProps {
diff --git a/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts b/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts
index ed079fe948750..260577298e81b 100644
--- a/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts
+++ b/x-pack/plugins/data_enhanced/server/collectors/fetch.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers, Logger } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers, Logger } from '@kbn/core/server';
 import { fetchProvider } from './fetch';
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 describe('fetchProvider', () => {
   let fetchFn: any;
diff --git a/x-pack/plugins/data_enhanced/server/collectors/fetch.ts b/x-pack/plugins/data_enhanced/server/collectors/fetch.ts
index 82597a9003051..eb3b50b3a64e9 100644
--- a/x-pack/plugins/data_enhanced/server/collectors/fetch.ts
+++ b/x-pack/plugins/data_enhanced/server/collectors/fetch.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'kibana/server';
-import { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
-import { SEARCH_SESSION_TYPE } from '../../../../../src/plugins/data/common';
+import { Logger } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
+import { SEARCH_SESSION_TYPE } from '@kbn/data-plugin/common';
 import { ReportedUsage } from './register';
 
 interface SessionPersistedTermsBucket {
diff --git a/x-pack/plugins/data_enhanced/server/collectors/register.ts b/x-pack/plugins/data_enhanced/server/collectors/register.ts
index 6e482a618a292..6b98627fce11f 100644
--- a/x-pack/plugins/data_enhanced/server/collectors/register.ts
+++ b/x-pack/plugins/data_enhanced/server/collectors/register.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { fetchProvider } from './fetch';
 
 export interface ReportedUsage {
diff --git a/x-pack/plugins/data_enhanced/server/index.ts b/x-pack/plugins/data_enhanced/server/index.ts
index 4f9f78f2fc783..a56f7216c4706 100644
--- a/x-pack/plugins/data_enhanced/server/index.ts
+++ b/x-pack/plugins/data_enhanced/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { EnhancedDataServerPlugin } from './plugin';
 import { configSchema, ConfigSchema } from '../config';
 
@@ -20,9 +20,6 @@ export function plugin(initializerContext: PluginInitializerContext<ConfigSchema
   return new EnhancedDataServerPlugin(initializerContext);
 }
 
-export {
-  ENHANCED_ES_SEARCH_STRATEGY,
-  EQL_SEARCH_STRATEGY,
-} from '../../../../src/plugins/data/common';
+export { ENHANCED_ES_SEARCH_STRATEGY, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 
 export { EnhancedDataServerPlugin as Plugin };
diff --git a/x-pack/plugins/data_enhanced/server/plugin.ts b/x-pack/plugins/data_enhanced/server/plugin.ts
index 28df0a5aa70cf..007764ec95f0c 100644
--- a/x-pack/plugins/data_enhanced/server/plugin.ts
+++ b/x-pack/plugins/data_enhanced/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { registerSessionRoutes } from './routes';
 import { searchSessionSavedObjectType } from './saved_objects';
 import type {
diff --git a/x-pack/plugins/data_enhanced/server/routes/session.test.ts b/x-pack/plugins/data_enhanced/server/routes/session.test.ts
index ebc501346aed2..507bb173baf67 100644
--- a/x-pack/plugins/data_enhanced/server/routes/session.test.ts
+++ b/x-pack/plugins/data_enhanced/server/routes/session.test.ts
@@ -7,13 +7,13 @@
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
 
-import type { CoreSetup, Logger } from 'kibana/server';
-import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import type { CoreSetup, Logger } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type {
   PluginStart as DataPluginStart,
   DataRequestHandlerContext,
-} from '../../../../../src/plugins/data/server';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+} from '@kbn/data-plugin/server';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 import { registerSessionRoutes } from './session';
 
 enum PostHandlerIndex {
diff --git a/x-pack/plugins/data_enhanced/server/routes/session.ts b/x-pack/plugins/data_enhanced/server/routes/session.ts
index 3f36bd0a75746..399c9b236b35a 100644
--- a/x-pack/plugins/data_enhanced/server/routes/session.ts
+++ b/x-pack/plugins/data_enhanced/server/routes/session.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
-import { reportServerError } from '../../../../../src/plugins/kibana_utils/server';
+import { Logger } from '@kbn/core/server';
+import { reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { DataEnhancedPluginRouter } from '../type';
 
 const STORE_SEARCH_SESSIONS_ROLE_TAG = `access:store_search_session`;
diff --git a/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts b/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts
index f921ed78eb247..68f37e1e2adac 100644
--- a/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts
+++ b/x-pack/plugins/data_enhanced/server/saved_objects/search_session.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
-import { SEARCH_SESSION_TYPE } from '../../../../../src/plugins/data/common';
+import { SavedObjectsType } from '@kbn/core/server';
+import { SEARCH_SESSION_TYPE } from '@kbn/data-plugin/common';
 import { searchSessionSavedObjectMigrations } from './search_session_migration';
 
 export const searchSessionSavedObjectType: SavedObjectsType = {
diff --git a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts
index aa344da68f931..a94b22de5b0ed 100644
--- a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts
+++ b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.test.ts
@@ -11,9 +11,9 @@ import {
   SearchSessionSavedObjectAttributesPre$7$14$0,
   SearchSessionSavedObjectAttributesPre$8$0$0,
 } from './search_session_migration';
-import { SavedObject } from '../../../../../src/core/types';
-import { SEARCH_SESSION_TYPE, SearchSessionStatus } from '../../../../../src/plugins/data/common';
-import { SavedObjectMigrationContext } from 'kibana/server';
+import { SavedObject } from '@kbn/core/types';
+import { SEARCH_SESSION_TYPE, SearchSessionStatus } from '@kbn/data-plugin/common';
+import { SavedObjectMigrationContext } from '@kbn/core/server';
 
 describe('7.12.0 -> 7.13.0', () => {
   const mockCompletedSessionSavedObject: SavedObject<SearchSessionSavedObjectAttributesPre$7$13$0> =
diff --git a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts
index 4fa5964929f7c..f2de5df91de95 100644
--- a/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts
+++ b/x-pack/plugins/data_enhanced/server/saved_objects/search_session_migration.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationMap, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import {
   SearchSessionSavedObjectAttributes as SearchSessionSavedObjectAttributesLatest,
   SearchSessionStatus,
-} from '../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 
 /**
  * Search sessions were released in 7.12.0
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts
index 85bfbc8d037db..d7e472f4b3245 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.test.ts
@@ -11,15 +11,15 @@ import {
   SearchSessionSavedObjectAttributes,
   ENHANCED_ES_SEARCH_STRATEGY,
   EQL_SEARCH_STRATEGY,
-} from '../../../../../../src/plugins/data/common';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+} from '@kbn/data-plugin/common';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchStatus } from './types';
 import moment from 'moment';
 import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsDeleteOptions,
   SavedObjectsClientContract,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 jest.useFakeTimers();
 
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts
index 180f276620a6c..20903d4508bb1 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_non_persisted_sessions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult } from 'kibana/server';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 import moment from 'moment';
 import { EMPTY } from 'rxjs';
 import { catchError, concatMap } from 'rxjs/operators';
@@ -16,7 +16,7 @@ import {
   SearchSessionSavedObjectAttributes,
   SearchSessionStatus,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchStatus } from './types';
 import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
index e0b1b74b57d02..f27dba05d88e1 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { checkPersistedSessionsProgress } from './check_persisted_sessions';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionsConfig } from './types';
 import moment from 'moment';
-import { SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 describe('checkPersistedSessionsProgress', () => {
   let mockClient: any;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
index 3e89383c16d5e..2f4cfaaa015c6 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/check_persisted_sessions.ts
@@ -12,7 +12,7 @@ import {
   SEARCH_SESSION_TYPE,
   SearchSessionStatus,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchSessionsResponse } from './types';
 import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
index 61d1635dabe1b..dfc77935d2275 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/expire_persisted_sessions.ts
@@ -12,7 +12,7 @@ import {
   SEARCH_SESSION_TYPE,
   SearchSessionStatus,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
 import { SearchSessionsConfig, CheckSearchSessionsDeps, SearchSessionsResponse } from './types';
 import { bulkUpdateSessions, getAllSessionsStatusUpdates } from './update_session_status';
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
index df2b7d964642d..d78e0567eaec4 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.test.ts
@@ -6,14 +6,11 @@
  */
 
 import { checkSearchSessionsByPage, getSearchSessionsPage$ } from './get_search_session_page';
-import {
-  SearchSessionStatus,
-  ENHANCED_ES_SEARCH_STRATEGY,
-} from '../../../../../../src/plugins/data/common';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchSessionStatus, ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionsConfig, SearchStatus } from './types';
 import moment from 'moment';
-import { SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { of, Subject, throwError } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 jest.useFakeTimers();
@@ -245,7 +242,7 @@ describe('checkSearchSessionsByPage', () => {
 
     test('fetching is abortable', async () => {
       let i = 0;
-      const abort$ = new Subject();
+      const abort$ = new Subject<void>();
 
       const checkFn = jest.fn().mockImplementation(() => {
         if (++i === 2) {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
index 74306bac39f7d..f59883350898b 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_session_page.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { SavedObjectsClientContract, Logger } from '@kbn/core/server';
 import { from, Observable, EMPTY } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import {
   SearchSessionSavedObjectAttributes,
   SEARCH_SESSION_TYPE,
   KueryNode,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { CheckSearchSessionsDeps, CheckSearchSessionsFn, SearchSessionsConfig } from './types';
 
 export interface GetSessionsDeps {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts b/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts
index aa8c2c0e3aa00..26a31fdbac20d 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_search_status.ts
@@ -7,10 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import type { TransportResult } from '@elastic/elasticsearch';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { SearchSessionRequestInfo } from '@kbn/data-plugin/common';
+import { AsyncSearchStatusResponse } from '@kbn/data-plugin/server';
 import { SearchStatus } from './types';
-import { SearchSessionRequestInfo } from '../../../../../../src/plugins/data/common';
-import { AsyncSearchStatusResponse } from '../../../../../../src/plugins/data/server';
 
 export async function getSearchStatus(
   client: ElasticsearchClient,
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
index 336bc890268ce..e15e494fdd6b9 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.test.ts
@@ -7,7 +7,7 @@
 
 import { SearchSessionsConfig, SearchStatus } from './types';
 import { getSessionStatus } from './get_session_status';
-import { SearchSessionStatus } from '../../../../../../src/plugins/data/common';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import moment from 'moment';
 
 describe('getSessionStatus', () => {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
index e7ae52b6c88ae..d6a4670c5e396 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/get_session_status.ts
@@ -6,10 +6,7 @@
  */
 
 import moment from 'moment';
-import {
-  SearchSessionSavedObjectAttributes,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common/';
+import { SearchSessionSavedObjectAttributes, SearchSessionStatus } from '@kbn/data-plugin/common';
 import { SearchSessionsConfig, SearchStatus } from './types';
 
 export function getSessionStatus(
diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
index 437e146f0d0f7..0f7f4975082a6 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts
@@ -9,21 +9,17 @@ import {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchSessionService } from './session_service';
 import { createRequestHash } from './utils';
 import moment from 'moment';
-import { coreMock } from '../../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { ConfigSchema } from '../../../config';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { AuthenticatedUser } from '../../../../security/common/model';
-import {
-  nodeBuilder,
-  SEARCH_SESSION_TYPE,
-  SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
-import { TaskManagerStartContract } from '../../../../task_manager/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { nodeBuilder, SEARCH_SESSION_TYPE, SearchSessionStatus } from '@kbn/data-plugin/common';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 const MAX_UPDATE_RETRIES = 3;
 
diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
index 84266e2545810..a22e559ecd142 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts
@@ -17,27 +17,24 @@ import {
   SavedObject,
   SavedObjectsFindOptions,
   SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   IKibanaSearchRequest,
   ISearchOptions,
   ENHANCED_ES_SEARCH_STRATEGY,
   SEARCH_SESSION_TYPE,
-} from '../../../../../../src/plugins/data/common';
-import {
-  ISearchSessionService,
-  NoSearchIdInSessionError,
-} from '../../../../../../src/plugins/data/server';
-import { AuthenticatedUser, SecurityPluginSetup } from '../../../../security/server';
+} from '@kbn/data-plugin/common';
+import { ISearchSessionService, NoSearchIdInSessionError } from '@kbn/data-plugin/server';
+import { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import {
   SearchSessionRequestInfo,
   SearchSessionSavedObjectAttributes,
   SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { createRequestHash } from './utils';
 import { ConfigSchema } from '../../../config';
 import {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts b/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
index a4c9b6039ff64..a8d47d5babd57 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/setup_task.ts
@@ -8,9 +8,9 @@
 import { Duration } from 'moment';
 import { filter, takeUntil } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
-import { RunContext, TaskRunCreatorFunction } from '../../../../task_manager/server';
-import { CoreSetup, SavedObjectsClient } from '../../../../../../src/core/server';
-import { SEARCH_SESSION_TYPE } from '../../../../../../src/plugins/data/common';
+import { RunContext, TaskRunCreatorFunction } from '@kbn/task-manager-plugin/server';
+import { CoreSetup, SavedObjectsClient } from '@kbn/core/server';
+import { SEARCH_SESSION_TYPE } from '@kbn/data-plugin/common';
 import { DataEnhancedStartDependencies } from '../../type';
 import {
   SearchSessionTaskSetupDeps,
diff --git a/x-pack/plugins/data_enhanced/server/search/session/types.ts b/x-pack/plugins/data_enhanced/server/search/session/types.ts
index eadc3821c1043..37e1cb2486154 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/types.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/types.ts
@@ -10,13 +10,13 @@ import {
   Logger,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { Observable } from 'rxjs';
-import { KueryNode, SearchSessionSavedObjectAttributes } from 'src/plugins/data/common';
+import { KueryNode, SearchSessionSavedObjectAttributes } from '@kbn/data-plugin/common';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../../x-pack/plugins/task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ConfigSchema } from '../../../config';
 
 export enum SearchStatus {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
index 3b6b0a7a16d85..03bdad773f647 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.test.ts
@@ -6,18 +6,15 @@
  */
 
 import { bulkUpdateSessions, updateSessionStatus } from './update_session_status';
-import {
-  SearchSessionStatus,
-  SearchSessionSavedObjectAttributes,
-} from '../../../../../../src/plugins/data/common';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { SearchSessionStatus, SearchSessionSavedObjectAttributes } from '@kbn/data-plugin/common';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SearchStatus } from './types';
 import moment from 'moment';
 import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsClientContract,
   SavedObjectsFindResult,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 describe('bulkUpdateSessions', () => {
   let mockClient: any;
diff --git a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
index 4758e7cb22684..2f6ef6ab3fc53 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/update_session_status.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult, SavedObjectsUpdateResponse } from 'kibana/server';
+import { SavedObjectsFindResult, SavedObjectsUpdateResponse } from '@kbn/core/server';
 import {
   SearchSessionRequestInfo,
   SearchSessionSavedObjectAttributes,
   SearchSessionStatus,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import { getSearchStatus } from './get_search_status';
 import { getSessionStatus } from './get_session_status';
 import {
diff --git a/x-pack/plugins/data_enhanced/server/search/session/utils.ts b/x-pack/plugins/data_enhanced/server/search/session/utils.ts
index 55c875602694f..f7f3c3c17505b 100644
--- a/x-pack/plugins/data_enhanced/server/search/session/utils.ts
+++ b/x-pack/plugins/data_enhanced/server/search/session/utils.ts
@@ -7,9 +7,9 @@
 
 import { createHash } from 'crypto';
 import stringify from 'json-stable-stringify';
-import { SavedObjectsFindResult } from 'kibana/server';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 import moment from 'moment';
-import { SearchSessionSavedObjectAttributes } from 'src/plugins/data/common';
+import { SearchSessionSavedObjectAttributes } from '@kbn/data-plugin/common';
 
 /**
  * Generate the hash for this request so that, in the future, this hash can be used to look up
diff --git a/x-pack/plugins/data_enhanced/server/type.ts b/x-pack/plugins/data_enhanced/server/type.ts
index 215700c5dcc5c..df465cdbb381d 100644
--- a/x-pack/plugins/data_enhanced/server/type.ts
+++ b/x-pack/plugins/data_enhanced/server/type.ts
@@ -5,15 +5,18 @@
  * 2.0.
  */
 
-import type { IRouter } from 'kibana/server';
-import type { DataRequestHandlerContext } from '../../../../src/plugins/data/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+import type { IRouter } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+} from '@kbn/data-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 /**
  * @internal
diff --git a/x-pack/plugins/data_visualizer/common/constants.ts b/x-pack/plugins/data_visualizer/common/constants.ts
index 55b37f9667e57..f31a42cc7784c 100644
--- a/x-pack/plugins/data_visualizer/common/constants.ts
+++ b/x-pack/plugins/data_visualizer/common/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KBN_FIELD_TYPES } from '../../../../src/plugins/data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 export const APP_ID = 'data_visualizer';
 export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize';
diff --git a/x-pack/plugins/data_visualizer/common/services/time_buckets.js b/x-pack/plugins/data_visualizer/common/services/time_buckets.js
index 92b60cbf6ca10..4b1d61e26d66f 100644
--- a/x-pack/plugins/data_visualizer/common/services/time_buckets.js
+++ b/x-pack/plugins/data_visualizer/common/services/time_buckets.js
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { FIELD_FORMAT_IDS } from '../../../../../src/plugins/field_formats/common';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { ary, assign, isPlainObject, isString, sortBy } from 'lodash';
 import moment from 'moment';
 import dateMath from '@kbn/datemath';
diff --git a/x-pack/plugins/data_visualizer/common/types/field_request_config.ts b/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
index e15e39ffb46de..5f21748575831 100644
--- a/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
+++ b/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { JobFieldType } from './index';
+import type { JobFieldType } from '.';
 
 export interface Percentile {
   percent: number;
diff --git a/x-pack/plugins/data_visualizer/common/types/field_stats.ts b/x-pack/plugins/data_visualizer/common/types/field_stats.ts
index c874f163acebc..fe8d1960876b6 100644
--- a/x-pack/plugins/data_visualizer/common/types/field_stats.ts
+++ b/x-pack/plugins/data_visualizer/common/types/field_stats.ts
@@ -7,8 +7,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Query } from '@kbn/es-query';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from '../utils/object_utils';
-import { IKibanaSearchResponse } from '../../../../../src/plugins/data/common';
 import { TimeBucketsInterval } from '../services/time_buckets';
 
 export interface FieldData {
diff --git a/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts b/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts
index dcd7da74b85ef..7f2419cc009db 100644
--- a/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts
+++ b/x-pack/plugins/data_visualizer/common/types/field_vis_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Percentile, JobFieldType, FieldVisStats } from './index';
+import type { Percentile, JobFieldType, FieldVisStats } from '.';
 export interface MetricFieldVisStats {
   avg?: number;
   distribution?: {
diff --git a/x-pack/plugins/data_visualizer/common/types/index.ts b/x-pack/plugins/data_visualizer/common/types/index.ts
index 381f7a556b18d..6ab0649bfb9e6 100644
--- a/x-pack/plugins/data_visualizer/common/types/index.ts
+++ b/x-pack/plugins/data_visualizer/common/types/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SimpleSavedObject } from 'kibana/public';
+import type { SimpleSavedObject } from '@kbn/core/public';
 import { isPopulatedObject } from '../utils/object_utils';
 export type { JobFieldType } from './job_field_type';
 export type {
diff --git a/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
index a9ec27c7b1577..6b2cb78d73274 100644
--- a/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
+++ b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from './object_utils';
-import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
 
diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
index f3fbc867e77c0..65b1035640405 100644
--- a/x-pack/plugins/data_visualizer/kibana.json
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -25,7 +25,6 @@
     "cloud"
   ],
   "requiredBundles": [
-    "home",
     "kibanaReact",
     "maps",
     "esUiShared",
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
index 7ebc4476e0cba..2498797b761a7 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
@@ -19,6 +19,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { CombinedField } from './types';
 import { GeoPointForm } from './geo_point';
 import { CombinedFieldLabel } from './combined_field_label';
@@ -29,7 +30,6 @@ import {
   removeCombinedFieldsFromMappings,
   removeCombinedFieldsFromPipeline,
 } from './utils';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   mappingsString: string;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
index 24f933f015366..3d5bcb94a596a 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
@@ -21,6 +21,7 @@ import {
   EuiFormErrorText,
 } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { CombinedField } from './types';
 import {
   createGeoPointCombinedField,
@@ -29,7 +30,6 @@ import {
   getFieldNames,
   getNameCollisionMsg,
 } from './utils';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   addCombinedField: (combinedField: CombinedField) => void;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
index 84f67c3222885..cb0763ecde504 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
@@ -8,12 +8,12 @@
 import { i18n } from '@kbn/i18n';
 import { cloneDeep } from 'lodash';
 import uuid from 'uuid/v4';
-import { CombinedField } from './types';
 import type {
   FindFileStructureResponse,
   IngestPipeline,
   Mappings,
-} from '../../../../../../file_upload/common';
+} from '@kbn/file-upload-plugin/common';
+import { CombinedField } from './types';
 
 const COMMON_LAT_NAMES = ['latitude', 'lat'];
 const COMMON_LON_NAMES = ['longitude', 'long', 'lon'];
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
index 52ae5e685316d..34885090d643f 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
@@ -10,11 +10,7 @@ import { Subscription } from 'rxjs';
 import { debounce } from 'lodash';
 
 import { EuiSuperDatePicker, OnRefreshProps } from '@elastic/eui';
-import {
-  TimeHistoryContract,
-  TimeRange,
-  UI_SETTINGS,
-} from '../../../../../../../../src/plugins/data/public';
+import { TimeHistoryContract, TimeRange, UI_SETTINGS } from '@kbn/data-plugin/public';
 
 import { useUrlState } from '../../util/url_state';
 import { useDataVisualizerKibana } from '../../../kibana_context';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
index d38e93b66a8da..2ef8759441fc1 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
@@ -20,9 +20,9 @@ import {
   XYBrushEvent,
 } from '@elastic/charts';
 import moment from 'moment';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '@kbn/charts-plugin/common';
 import { useDataVisualizerKibana } from '../../../../kibana_context';
-import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../../../../src/plugins/charts/common';
 
 export interface DocumentCountChartPoint {
   time: number | string;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
index 6be247f5f39c9..38689f73541d6 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
@@ -8,20 +8,20 @@
 import React, { useEffect, useRef, useState } from 'react';
 
 import { htmlIdGenerator } from '@elastic/eui';
-import { INITIAL_LOCATION, LayerDescriptor } from '../../../../../../maps/common';
+import { INITIAL_LOCATION, LayerDescriptor } from '@kbn/maps-plugin/common';
 import {
   MapEmbeddable,
   MapEmbeddableInput,
   MapEmbeddableOutput,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../maps/public/embeddable';
-import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../../maps/public';
+} from '@kbn/maps-plugin/public/embeddable';
+import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   isErrorEmbeddable,
   ViewMode,
-} from '../../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 import './_embedded_map.scss';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
index 202f9f9620b67..216ed34e0333a 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
@@ -7,8 +7,8 @@
 
 import { Feature, Point } from 'geojson';
 import { euiPaletteColorBlind } from '@elastic/eui';
+import { LAYER_TYPE, SOURCE_TYPES } from '@kbn/maps-plugin/common';
 import { DEFAULT_GEO_REGEX } from './geo_point_content';
-import { LAYER_TYPE, SOURCE_TYPES } from '../../../../../../../maps/common';
 
 export const convertWKTGeoToLonLat = (
   value: string | number
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
index 77ce45b4f2296..8a0b1d7a3dfe6 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
@@ -6,7 +6,8 @@
  */
 
 import React, { FC, useEffect, useState } from 'react';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { ES_GEO_FIELD_TYPE, LayerDescriptor } from '@kbn/maps-plugin/common';
 import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content';
 import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
@@ -14,7 +15,6 @@ import { ExamplesList } from '../../examples_list';
 import { FieldVisConfig } from '../../stats_table/types';
 import { useDataVisualizerKibana } from '../../../../kibana_context';
 import { JOB_FIELD_TYPES } from '../../../../../../common/constants';
-import { ES_GEO_FIELD_TYPE, LayerDescriptor } from '../../../../../../../maps/common';
 import { EmbeddedMapComponent } from '../../embedded_map';
 import { ExpandedRowPanel } from '../../stats_table/components/field_data_expanded_row/expanded_row_panel';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
index 17e9c9b4e2b1c..c108ca238de8a 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
@@ -6,6 +6,7 @@
  */
 
 import React from 'react';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { GeoPointContentWithMap } from './geo_point_content_with_map';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
 import {
@@ -19,7 +20,6 @@ import {
 } from '../stats_table/components/field_data_expanded_row';
 import { NotInDocsContent } from '../not_in_docs_content';
 import { FieldVisConfig } from '../stats_table/types';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query';
 import { LoadingIndicator } from '../loading_indicator';
 import { ErrorMessageContent } from '../stats_table/components/field_data_expanded_row/error_message';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
index 88304972ef491..73e69b00132d3 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
@@ -8,8 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { Action } from '@elastic/eui/src/components/basic_table/action_types';
 import { MutableRefObject } from 'react';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
 import { getCompatibleLensDataType, getLensAttributes } from './lens_utils';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { FieldVisConfig } from '../../stats_table/types';
 import { DataVisualizerKibanaReactContextValue } from '../../../../kibana_context';
@@ -18,7 +19,6 @@ import {
   Refresh,
 } from '../../../../index_data_visualizer/services/timefilter_refresh_service';
 import { JOB_FIELD_TYPES } from '../../../../../../common/constants';
-import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../../../../../../src/plugins/ui_actions/public';
 import { APP_ID } from '../../../../../../common/constants';
 
 export function getActions(
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
index 7043d7fc47cbc..731499cee2f89 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
@@ -7,8 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
-import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
+import { DataView } from '@kbn/data-views-plugin/public';
 import type {
   DateHistogramIndexPatternColumn,
   GenericIndexPatternColumn,
@@ -16,8 +15,9 @@ import type {
   TermsIndexPatternColumn,
   TypedLensByValueInput,
   XYLayerConfig,
-} from '../../../../../../../lens/public';
-import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '../../../../../../../lens/common/constants';
+} from '@kbn/lens-plugin/public';
+import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '@kbn/lens-plugin/common/constants';
+import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
 import { FieldVisConfig } from '../../stats_table/types';
 import { JOB_FIELD_TYPES } from '../../../../../../common/constants';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
index 26002f0404c44..05d07111c80ac 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { getFieldNames, getSupportedFieldType } from './get_field_names';
 import { FileBasedFieldVisConfig } from '../stats_table/types';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
index dae5c6524d168..ec6243d45d508 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo, FC, useState } from 'react';
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
-import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import type { DataVisualizerTableState } from '../../../../../common/types';
 import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table';
 import type { FileBasedFieldVisConfig } from '../../../../../common/types/field_vis_config';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
index 8ac53aaf3b3a7..b6868ced4de69 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
@@ -6,8 +6,8 @@
  */
 
 import { difference } from 'lodash';
-import { ES_FIELD_TYPES } from '../../../../../../../../src/plugins/data/common';
-import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
+import type { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import type { JobFieldType } from '../../../../../common/types';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
 export function getFieldNames(results: FindFileStructureResponse) {
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
index 54dfbe72c3c7f..9d93106f7e609 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 
 export function createFilebeatConfig(
   index: string,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
index 4766228fc2bf8..b4ebc4094d503 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
@@ -21,9 +21,9 @@ import {
   EuiCode,
   EuiCopy,
 } from '@elastic/eui';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { createFilebeatConfig } from './filebeat_config';
 import { useDataVisualizerKibana } from '../../../kibana_context'; // copy context?
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 export enum EDITOR_MODE {
   HIDDEN,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
index be734b33e9b92..57395b506af28 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
@@ -9,9 +9,9 @@ import React, { FC, useState, useEffect } from 'react';
 import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui';
-import { TimeRange, RefreshInterval } from '../../../../../../../../src/plugins/data/public';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
-import type { FileUploadPluginStart } from '../../../../../../file_upload/public';
+import { TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 
 type LinkType = 'file' | 'index';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
index bf767c7e65207..6587bc6dd66e2 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
@@ -16,8 +16,8 @@ import {
   STYLE_TYPE,
   COLOR_MAP_TYPE,
   VectorLayerDescriptor,
-} from '../../../../../../../../maps/common';
-import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
+} from '@kbn/maps-plugin/common';
+import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import { EmbeddedMapComponent } from '../../../embedded_map';
 import { FieldVisStats } from '../../../../../../../common/types';
 import { ExpandedRowPanel } from './expanded_row_panel';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
index 18e079bbf4d1f..c10d4cdbc7c1c 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { FC, useCallback, useEffect, useState } from 'react';
+import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import type { FieldDataRowProps } from '../../types/field_data_row';
 import { TopValues } from '../../../top_values';
-import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
 import { useDataVisualizerKibana } from '../../../../../kibana_context';
 import { DocumentStatsTable } from './document_stats';
 import { ExpandedRowContent } from './expanded_row_content';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
index d20217f673449..73f2643cb7ae8 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
@@ -10,7 +10,7 @@ import { render } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import '@testing-library/jest-dom/extend-expect';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
index 60199859458f9..e8c619072c534 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
@@ -15,7 +15,7 @@ import { euiPaletteColorBlind, EuiDataGridColumn } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
index fd34fe40d31ea..d202b4f5a268c 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataViewField } from '../../../../../../../../../src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import {
   FieldVisConfig,
   FileBasedFieldVisConfig,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx
index f98ff857a0778..594ac9c72c306 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.tsx
@@ -19,11 +19,11 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 import { roundToDecimalPlace, kibanaFieldFormat } from '../utils';
 import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header';
 import { FieldVisStats } from '../../../../../common/types';
 import { ExpandedRowPanel } from '../stats_table/components/field_data_expanded_row/expanded_row_panel';
-import { DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 
 interface Props {
   stats: FieldVisStats | undefined;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts
index fdac866c286c2..bce8ce3bfef0c 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEqual } from 'lodash';
-import type { AnalysisResult, InputOverrides } from '../../../../../../file_upload/common';
+import type { AnalysisResult, InputOverrides } from '@kbn/file-upload-plugin/common';
 import { MB, FILE_FORMATS } from '../../../../../common/constants';
 
 export const DEFAULT_LINES_TO_SAMPLE = 1000;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
index d9c791b2a67ff..d9617ae61e2ec 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { JOB_FIELD_TYPES } from '../../../../common/constants';
-import { DataViewField } from '../../../../../../../src/plugins/data_views/public';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
 
 export const getJobTypeLabel = (type: string) => {
   return type in jobTypeLabels ? jobTypeLabels[type as keyof typeof jobTypeLabels] : null;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
index b0bd51e1b9a39..91baf60ed065a 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { FC } from 'react';
 
 import { EuiTitle, EuiSpacer, EuiDescriptionList } from '@elastic/eui';
-import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { FILE_FORMATS } from '../../../../../common/constants';
 
 export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ results }) => {
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
index 9fbed83136f8f..d10f978c120ea 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
@@ -33,7 +33,7 @@ import {
   // getCharsetOptions,
 } from './options';
 import { isTimestampFormatValid } from './overrides_validation';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { replaceFieldInGrokPattern } from '../../../common/util/grok_pattern';
 import {
   convertDelimiter,
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
index a81b3b5865008..e035d0ececd8c 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
@@ -11,7 +11,7 @@ import { FILE_FORMATS } from '../../../../../common/constants';
 
 import { Overrides } from './overrides';
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
index dd9c2a8331079..aa368695ce46c 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
@@ -20,7 +20,7 @@ import {
   EuiText,
   EuiSubSteps,
 } from '@elastic/eui';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 
 interface Props {
   results: FindFileStructureResponse;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
index ae0a979008eff..0d3408a77e7c8 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
@@ -30,7 +30,7 @@ import {
   processResults,
 } from '../../../common/components/utils';
 
-import { Chat } from '../../../../../../cloud/public';
+import { Chat } from '@kbn/cloud-plugin/public';
 
 import { MODE } from './constants';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
index c2c0910098a18..8bf6682768226 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
@@ -11,8 +11,8 @@ import React, { FC } from 'react';
 import { EuiCallOut, EuiSpacer, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui';
 
 import numeral from '@elastic/numeral';
+import { FindFileStructureErrorResponse } from '@kbn/file-upload-plugin/common';
 import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../../common/constants';
-import { FindFileStructureErrorResponse } from '../../../../../../file_upload/common';
 
 interface FileTooLargeProps {
   fileSize: number;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
index bba52ff16e302..4e3da71e83ebb 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
@@ -18,9 +18,9 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { CombinedField, CombinedFieldsForm } from '../../../common/components/combined_fields';
 import { JsonEditor, EDITOR_MODE } from '../json_editor';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 import { CreateDataViewToolTip } from './create_data_view_tooltip';
 const EDITOR_HEIGHT = '300px';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
index 4ac0f07b124f0..ccf5b2d5f43ee 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
@@ -10,10 +10,10 @@ import React, { FC } from 'react';
 
 import { EuiTabbedContent, EuiSpacer } from '@elastic/eui';
 
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 import { SimpleSettings } from './simple';
 import { AdvancedSettings } from './advanced';
 import { CombinedField } from '../../../common/components/combined_fields';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 
 interface Props {
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
index 8968f626c9d45..15df480ff6a8b 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
@@ -19,7 +19,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import { FindFileStructureResponse } from '@kbn/file-upload-plugin/common';
 
 import { FileContents } from '../file_contents';
 import { AnalysisSummary } from '../analysis_summary';
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx
index bd0438319fd52..60a67ef8e33d5 100644
--- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx
@@ -6,14 +6,11 @@
  */
 import '../_index.scss';
 import React, { FC } from 'react';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { getCoreStart, getPluginsStart } from '../../kibana_services';
 
 // @ts-ignore
-import { FileDataVisualizerView } from './components/file_data_visualizer_view/index';
+import { FileDataVisualizerView } from './components/file_data_visualizer_view';
 import { ResultLink } from '../common/components/results_links';
 
 interface Props {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
index 9f7ac3b270410..c3bb0eef960ba 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
@@ -10,7 +10,7 @@ import React, { FC, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiTitle } from '@elastic/eui';
-import { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 import { useUrlState } from '../../../common/util/url_state';
 import { LinkCard } from '../../../common/components/link_card';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx
index 26c4a2126303c..bd8c888e8bd52 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/data_view_management/data_view_management.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { EuiButtonIcon, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { useDataVisualizerKibana } from '../../../kibana_context';
 import { dataVisualizerRefresh$, Refresh } from '../../services/timefilter_refresh_service';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx
index cbb90672297fe..aeebdcd6b89f6 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, useCallback, useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { TimefilterContract } from 'src/plugins/data/public';
-import { DataView } from 'src/plugins/data/common';
+import { TimefilterContract } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
 
 import {
   EuiButton,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
index 3cc3fa329359d..c7cfc11c4d630 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -6,12 +6,12 @@
  */
 
 import moment from 'moment';
-import { TimefilterContract } from 'src/plugins/data/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 import dateMath from '@kbn/datemath';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { i18n } from '@kbn/i18n';
-import type { ToastsStart } from 'kibana/public';
-import { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { ToastsStart } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
 import { getTimeFieldRange } from '../../services/time_field_range';
 import type { GetTimeFieldRangeResponse } from '../../../../../common/types/time_field_request';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
index 733f7d6bcd3e3..9ce1fb4f552e5 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
@@ -21,7 +21,8 @@ import {
 import { Required } from 'utility-types';
 import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
-import { Query, generateFilters } from '../../../../../../../../src/plugins/data/public';
+import { Query, generateFilters } from '@kbn/data-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { FullTimeRangeSelector } from '../full_time_range_selector';
 import { usePageUrlState, useUrlState } from '../../../common/util/url_state';
 import {
@@ -48,7 +49,6 @@ import { HelpMenu } from '../../../common/components/help_menu';
 import { createMergedEsQuery } from '../../utils/saved_search_utils';
 import { DataVisualizerDataViewManagement } from '../data_view_management';
 import { ResultLink } from '../../../common/components/results_links';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 import { useDataVisualizerGridData } from '../../hooks/use_data_visualizer_grid_data';
 import { DataVisualizerGridInput } from '../../embeddables/grid_embeddable/grid_embeddable';
 import './_index.scss';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
index 138c9e50b90a7..e7ac50c906660 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
@@ -9,11 +9,11 @@ import React, { FC, useEffect, useState } from 'react';
 import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Query, Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { ShardSizeFilter } from './shard_size_select';
 import { DataVisualizerFieldNamesFilter } from './field_name_filter';
 import { DataVisualizerFieldTypeFilter } from './field_type_filter';
-import { TimeRange } from '../../../../../../../../src/plugins/data/common';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
 import { JobFieldType } from '../../../../../common/types';
 import { SearchQueryLanguage } from '../../types/combined_query';
 import { useDataVisualizerKibana } from '../../../kibana_context';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
index c44932470c7e8..b50428100675c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable.tsx
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subject } from 'rxjs';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React, { Suspense, useCallback, useEffect, useState } from 'react';
 import useObservable from 'react-use/lib/useObservable';
@@ -19,17 +19,14 @@ import {
   EmbeddableInput,
   EmbeddableOutput,
   IContainer,
-} from '../../../../../../../../src/plugins/embeddable/public';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/embeddable-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Query } from '@kbn/data-plugin/common';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { SavedSearch } from '@kbn/discover-plugin/public';
 import { DATA_VISUALIZER_GRID_EMBEDDABLE_TYPE } from './constants';
 import { EmbeddableLoading } from './embeddable_loading_fallback';
 import { DataVisualizerStartDependencies } from '../../../../plugin';
-import { Query } from '../../../../../../../../src/plugins/data/common';
-import { DataView, DataViewField } from '../../../../../../../../src/plugins/data_views/public';
-import { SavedSearch } from '../../../../../../../../src/plugins/discover/public';
 import {
   DataVisualizerTable,
   ItemIdToExpandedRowMap,
@@ -189,7 +186,7 @@ export class DataVisualizerGridEmbeddable extends Embeddable<
   DataVisualizerGridEmbeddableOutput
 > {
   private node?: HTMLElement;
-  private reload$ = new Subject();
+  private reload$ = new Subject<void>();
   public readonly type: string = DATA_VISUALIZER_GRID_EMBEDDABLE_TYPE;
 
   constructor(
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx
index 08ddc2d5fe3c2..8394c21ba8d3e 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/grid_embeddable_factory.tsx
@@ -6,11 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { StartServicesAccessor } from 'kibana/public';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../../../src/plugins/embeddable/public';
+import { StartServicesAccessor } from '@kbn/core/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { DATA_VISUALIZER_GRID_EMBEDDABLE_TYPE } from './constants';
 import {
   DataVisualizerGridEmbeddableInput,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts
index add99a8d2501d..bb3d541e3ca79 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
-import { EmbeddableSetup } from '../../../../../../../src/plugins/embeddable/public';
+import { CoreSetup } from '@kbn/core/public';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/public';
 import { DataVisualizerGridEmbeddableFactory } from './grid_embeddable/grid_embeddable_factory';
 import { DataVisualizerPluginStart, DataVisualizerStartDependencies } from '../../../plugin';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
index 7c821f698d8df..eecebf6b9f947 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { merge } from 'rxjs';
 import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types';
 import { i18n } from '@kbn/i18n';
+import { DataViewField, KBN_FIELD_TYPES, UI_SETTINGS } from '@kbn/data-plugin/common';
 import { DataVisualizerIndexBasedAppState } from '../types/index_data_visualizer_state';
 import { useDataVisualizerKibana } from '../../kibana_context';
 import { getEsQueryFromSavedSearch } from '../utils/saved_search_utils';
@@ -17,11 +18,6 @@ import { MetricFieldsStats } from '../../common/components/stats_table/component
 import { useTimefilter } from './use_time_filter';
 import { dataVisualizerRefresh$ } from '../services/timefilter_refresh_service';
 import { TimeBuckets } from '../../../../common/services/time_buckets';
-import {
-  DataViewField,
-  KBN_FIELD_TYPES,
-  UI_SETTINGS,
-} from '../../../../../../../src/plugins/data/common';
 import { FieldVisConfig } from '../../common/components/stats_table/types';
 import {
   JOB_FIELD_TYPES,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
index 750c1d417e84d..b6b1a21f312f9 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { last, cloneDeep } from 'lodash';
 import { mergeMap, switchMap } from 'rxjs/operators';
 import { Comparators } from '@elastic/eui';
+import type { ISearchOptions } from '@kbn/data-plugin/common';
 import type {
   DataStatsFetchProgress,
   FieldStatsSearchStrategyReturnBase,
@@ -28,7 +29,6 @@ import {
 import type { FieldStats, FieldStatsError } from '../../../../common/types/field_stats';
 import { getInitialProgress, getReducer } from '../progress_utils';
 import { MAX_EXAMPLES_DEFAULT } from '../search_strategy/requests/constants';
-import type { ISearchOptions } from '../../../../../../../src/plugins/data/common';
 import { getFieldsStats } from '../search_strategy/requests/get_fields_stats';
 import { MAX_CONCURRENT_REQUESTS } from '../constants/index_data_visualizer_viewer';
 import { filterFields } from '../../common/components/fields_stats_grid/filter_fields';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
index 0ad8ec7037153..4eb9f71d00d66 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
@@ -9,8 +9,13 @@ import { useCallback, useEffect, useState, useRef, useMemo, useReducer } from 'r
 import { from, of, Subscription, Observable } from 'rxjs';
 import { mergeMap, last, map, toArray } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import type { ToastsStart } from 'kibana/public';
+import type { ToastsStart } from '@kbn/core/public';
 import { chunk } from 'lodash';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+} from '@kbn/data-plugin/common';
 import { useDataVisualizerKibana } from '../../kibana_context';
 import {
   AggregatableFieldOverallStats,
@@ -20,11 +25,6 @@ import {
   processAggregatableFieldsExistResponse,
   processNonAggregatableFieldsExistResponse,
 } from '../search_strategy/requests/overall_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-} from '../../../../../../../src/plugins/data/common';
 import type { OverallStats } from '../types/overall_stats';
 import { getDefaultPageState } from '../components/index_data_visualizer_view/index_data_visualizer_view';
 import { extractErrorProperties } from '../utils/error_utils';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
index bdb2d7b77d0e9..0a11f51fa3a26 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
@@ -10,12 +10,10 @@ import { useHistory, useLocation } from 'react-router-dom';
 import { parse, stringify } from 'query-string';
 import { isEqual } from 'lodash';
 import { encode } from 'rison-node';
-import { SimpleSavedObject } from 'kibana/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { getCoreStart, getPluginsStart } from '../../kibana_services';
 import {
   IndexDataVisualizerViewProps,
@@ -31,7 +29,6 @@ import {
   isRisonSerializationRequired,
 } from '../common/util/url_state';
 import { useDataVisualizerKibana } from '../kibana_context';
-import { DataView } from '../../../../../../src/plugins/data_views/public';
 import { ResultLink } from '../common/components/results_links';
 import { DATA_VISUALIZER_APP_LOCATOR, IndexDataVisualizerLocatorParams } from './locator';
 import { DATA_VISUALIZER_INDEX_VIEWER } from './constants/index_data_visualizer_viewer';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts
index 970707e3efca9..0f197f4a13ddd 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/locator/locator.ts
@@ -8,9 +8,9 @@ import { encode } from 'rison-node';
 import { stringify } from 'query-string';
 import { SerializableRecord } from '@kbn/utility-types';
 import { Filter } from '@kbn/es-query';
-import { RefreshInterval, TimeRange } from '../../../../../../../src/plugins/data/common';
-import { LocatorDefinition, LocatorPublic } from '../../../../../../../src/plugins/share/common';
-import { QueryState } from '../../../../../../../src/plugins/data/public';
+import { RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
+import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
+import { QueryState } from '@kbn/data-plugin/public';
 import { Dictionary, isRisonSerializationRequired } from '../../common/util/url_state';
 import { SearchQueryLanguage } from '../types/combined_query';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
index b5359915ef63e..bceb354295d9c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
@@ -8,6 +8,12 @@ import { get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import {
   buildSamplerAggregation,
   getSamplerAggregationsResponsePath,
@@ -20,12 +26,6 @@ import type {
   FieldStatsCommonRequestParams,
 } from '../../../../../common/types/field_stats';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { extractErrorProperties } from '../../utils/error_utils';
 
 export const getBooleanFieldsStatsRequest = (
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
index 07bdc8c14301c..705fe8c002319 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
@@ -9,6 +9,12 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import {
   buildSamplerAggregation,
   getSamplerAggregationsResponsePath,
@@ -16,12 +22,6 @@ import {
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
 import type { FieldStatsCommonRequestParams } from '../../../../../common/types/field_stats';
 import type { Field, DateFieldStats, Aggs } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 import { extractErrorProperties } from '../../utils/error_utils';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
index 618e47bb97e1d..8b057caecee7c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
@@ -8,6 +8,12 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { combineLatest, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import { buildBaseFilterCriteria } from '../../../../../common/utils/query_utils';
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
 import type {
@@ -15,12 +21,6 @@ import type {
   FieldExamples,
   FieldStatsCommonRequestParams,
 } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 import { extractErrorProperties } from '../../utils/error_utils';
 import { MAX_EXAMPLES_DEFAULT } from './constants';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts
index 747d4007ac1ff..4dd0b3a7ba40a 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_fields_stats.ts
@@ -6,10 +6,10 @@
  */
 
 import type { Observable } from 'rxjs';
+import type { ISearchOptions } from '@kbn/data-plugin/common';
+import { ISearchStart } from '@kbn/data-plugin/public';
 import type { FieldStatsCommonRequestParams } from '../../../../../common/types/field_stats';
 import type { FieldStatsError } from '../../../../../common/types/field_stats';
-import type { ISearchOptions } from '../../../../../../../../src/plugins/data/common';
-import { ISearchStart } from '../../../../../../../../src/plugins/data/public';
 import type { FieldStats } from '../../../../../common/types/field_stats';
 import { JOB_FIELD_TYPES } from '../../../../../common/constants';
 import { fetchDateFieldsStats } from './get_date_field_stats';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
index a9746917082ad..163cb2585f3a6 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
@@ -10,6 +10,12 @@ import { find, get } from 'lodash';
 import { catchError, map } from 'rxjs/operators';
 import { Observable, of } from 'rxjs';
 import { AggregationsTermsAggregation } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+} from '@kbn/data-plugin/common';
+import type { ISearchStart } from '@kbn/data-plugin/public';
 import {
   MAX_PERCENT,
   PERCENTILE_SPACING,
@@ -29,12 +35,6 @@ import type {
   FieldStatsError,
 } from '../../../../../common/types/field_stats';
 import { processDistributionData } from '../../utils/process_distribution_data';
-import {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-} from '../../../../../../../../src/plugins/data/common';
-import type { ISearchStart } from '../../../../../../../../src/plugins/data/public';
 import { extractErrorProperties } from '../../utils/error_utils';
 import { isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
index 024464c1947c8..af4777a677bf9 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
@@ -9,6 +9,12 @@ import { get } from 'lodash';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { AggregationsTermsAggregation } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  ISearchOptions,
+  ISearchStart,
+} from '@kbn/data-plugin/public';
 import { SAMPLER_TOP_TERMS_SHARD_SIZE, SAMPLER_TOP_TERMS_THRESHOLD } from './constants';
 import {
   buildSamplerAggregation,
@@ -22,12 +28,6 @@ import type {
   FieldStatsCommonRequestParams,
   StringFieldStats,
 } from '../../../../../common/types/field_stats';
-import type {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  ISearchOptions,
-  ISearchStart,
-} from '../../../../../../../../src/plugins/data/public';
 import { FieldStatsError, isIKibanaSearchResponse } from '../../../../../common/types/field_stats';
 import { extractErrorProperties } from '../../utils/error_utils';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts
index a96244ece334a..3ede45b2ae66d 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/overall_stats.ts
@@ -8,6 +8,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { Query } from '@kbn/es-query';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
 import {
   buildBaseFilterCriteria,
   buildSamplerAggregation,
@@ -16,7 +17,6 @@ import {
 } from '../../../../../common/utils/query_utils';
 import { getDatafeedAggregations } from '../../../../../common/utils/datafeed_utils';
 import { isPopulatedObject } from '../../../../../common/utils/object_utils';
-import { IKibanaSearchResponse } from '../../../../../../../../src/plugins/data/common';
 import { AggregatableField, NonAggregatableField } from '../../types/overall_stats';
 import { AggCardinality, Aggs } from '../../../../../common/types/field_stats';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
index 81c5a9097e0ef..4a1506dc5b56f 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { Query } from '../../../../../../../src/plugins/data/common/query';
+import { Query } from '@kbn/data-plugin/common/query';
 import { SearchQueryLanguage } from './combined_query';
 
 export interface ListingPageUrlState {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
index 58c4c820c28d7..d89a9aca112b3 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/error_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import Boom from '@hapi/boom';
 import { isPopulatedObject } from '../../../../common/utils/object_utils';
 
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts
index 22ed1ca637717..4fa100c3fcb92 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts
@@ -11,12 +11,12 @@ import {
   getEsQueryFromSavedSearch,
 } from './saved_search_utils';
 import type { SavedSearchSavedObject } from '../../../../common/types';
-import type { SavedSearch } from '../../../../../../../src/plugins/discover/public';
+import type { SavedSearch } from '@kbn/discover-plugin/public';
 import type { Filter, FilterStateStore } from '@kbn/es-query';
-import { stubbedSavedObjectIndexPattern } from '../../../../../../../src/plugins/data_views/common/data_view.stub';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { fieldFormatsMock } from '../../../../../../../src/plugins/field_formats/common/mocks';
-import { uiSettingsServiceMock } from 'src/core/public/mocks';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 // helper function to create data views
 function createMockDataView(id: string) {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
index 4d3db6092f835..7a5231a89abd0 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import {
   fromKueryExpression,
   toElasticsearchQuery,
@@ -16,13 +16,13 @@ import {
   Filter,
 } from '@kbn/es-query';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { isSavedSearchSavedObject, SavedSearchSavedObject } from '../../../../common/types';
-import { SearchSource } from '../../../../../../../src/plugins/data/common';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
+import { SearchSource } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SavedSearch } from '@kbn/discover-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../types/combined_query';
-import { SavedSearch } from '../../../../../../../src/plugins/discover/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
+import { isSavedSearchSavedObject, SavedSearchSavedObject } from '../../../../common/types';
 
 const DEFAULT_QUERY = {
   bool: {
diff --git a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
index 83fcc104fbe4b..7c4a213432f86 100644
--- a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
+++ b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { KibanaReactContextValue, useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaReactContextValue, useKibana } from '@kbn/kibana-react-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { DataVisualizerStartDependencies } from '../plugin';
-import type { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 
 export type StartServices = CoreStart &
   DataVisualizerStartDependencies & {
diff --git a/x-pack/plugins/data_visualizer/public/application/shared_imports.ts b/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
index df07c0cc0d161..33a84886aaaec 100644
--- a/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
+++ b/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-export { EuiCodeEditor } from '../../../../../src/plugins/es_ui_shared/public';
-export type { EuiCodeEditorProps } from '../../../../../src/plugins/es_ui_shared/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+export type { EuiCodeEditorProps } from '@kbn/es-ui-shared-plugin/public';
 
-import { XJson } from '../../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
 export { XJsonMode } from '@kbn/ace';
diff --git a/x-pack/plugins/data_visualizer/public/kibana_services.ts b/x-pack/plugins/data_visualizer/public/kibana_services.ts
index 458d3aca9e525..0d4ab456db835 100644
--- a/x-pack/plugins/data_visualizer/public/kibana_services.ts
+++ b/x-pack/plugins/data_visualizer/public/kibana_services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { DataVisualizerStartDependencies } from './plugin';
 
 let coreStart: CoreStart;
diff --git a/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts
index f04c611c2fae9..0eddbbc248ed9 100644
--- a/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts
+++ b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application';
 import { getCoreStart } from '../kibana_services';
 
diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts
index f73d155c87d31..a18d7f730d8b1 100644
--- a/x-pack/plugins/data_visualizer/public/plugin.ts
+++ b/x-pack/plugins/data_visualizer/public/plugin.ts
@@ -5,29 +5,29 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import type { CloudStart } from '../../cloud/public';
-import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
-import type { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
-import { Plugin } from '../../../../src/core/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { CloudStart } from '@kbn/cloud-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import { Plugin } from '@kbn/core/public';
 
-import { setStartServices } from './kibana_services';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
-import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { MapsStartApi } from '../../maps/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import type { LensPublicStart } from '../../lens/public';
-import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api';
 import { getMaxBytesFormatted } from './application/common/util/get_max_bytes';
 import { registerHomeAddData, registerHomeFeatureCatalogue } from './register_home';
 import { registerEmbeddables } from './application/index_data_visualizer/embeddables';
-import { FieldFormatsStart } from '../../../../src/plugins/field_formats/public';
-import type { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { setStartServices } from './kibana_services';
 import { IndexDataVisualizerLocatorDefinition } from './application/index_data_visualizer/locator';
 
 export interface DataVisualizerSetupDependencies {
diff --git a/x-pack/plugins/data_visualizer/public/register_home.ts b/x-pack/plugins/data_visualizer/public/register_home.ts
index 0619382bd994c..ec7fd39762d08 100644
--- a/x-pack/plugins/data_visualizer/public/register_home.ts
+++ b/x-pack/plugins/data_visualizer/public/register_home.ts
@@ -6,8 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { FileDataVisualizerWrapper } from './lazy_load_bundle/component_wrapper';
 import {
   featureTitle,
@@ -36,7 +35,7 @@ export function registerHomeFeatureCatalogue(home: HomePublicPluginSetup) {
     icon: 'document',
     path: applicationPath,
     showOnHomePage: true,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
     order: 520,
   });
 }
diff --git a/x-pack/plugins/data_visualizer/server/index.ts b/x-pack/plugins/data_visualizer/server/index.ts
index f88303829c558..08b06005539b0 100644
--- a/x-pack/plugins/data_visualizer/server/index.ts
+++ b/x-pack/plugins/data_visualizer/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DataVisualizerPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) => new DataVisualizerPlugin();
diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts
index 9ef6ca5ae6a69..5f16df8b5ffb7 100644
--- a/x-pack/plugins/data_visualizer/server/plugin.ts
+++ b/x-pack/plugins/data_visualizer/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { StartDeps, SetupDeps } from './types';
 import { registerWithCustomIntegrations } from './register_custom_integration';
 
diff --git a/x-pack/plugins/data_visualizer/server/register_custom_integration.ts b/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
index 5ff58c5ed4d90..d41538a87a147 100644
--- a/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
+++ b/x-pack/plugins/data_visualizer/server/register_custom_integration.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { applicationPath, featureId, featureTitle } from '../common/constants';
 
 export function registerWithCustomIntegrations(customIntegrations: CustomIntegrationsPluginSetup) {
diff --git a/x-pack/plugins/data_visualizer/server/types/deps.ts b/x-pack/plugins/data_visualizer/server/types/deps.ts
index 8ee8c75abe543..aeb2fcf3af921 100644
--- a/x-pack/plugins/data_visualizer/server/types/deps.ts
+++ b/x-pack/plugins/data_visualizer/server/types/deps.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { SecurityPluginStart } from '../../../security/server';
-import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
-import { CustomIntegrationsPluginSetup } from '../../../../../src/plugins/custom_integrations/server';
-import { HomeServerPluginSetup } from '../../../../../src/plugins/home/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
 export interface StartDeps {
   security?: SecurityPluginStart;
diff --git a/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
index e0e6e263128e9..b49887655e91c 100644
--- a/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
+++ b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CustomHttpResponseOptions, ResponseError } from 'kibana/server';
+import { CustomHttpResponseOptions, ResponseError } from '@kbn/core/server';
 import { boomify, isBoom } from '@hapi/boom';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
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 52b60012f62f2..be15cc0b27153 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
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DiscoverStart } from '../../../../../../src/plugins/discover/public';
-import { ViewMode, IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
-import { StartServicesGetter } from '../../../../../../src/plugins/kibana_utils/public';
-import { CoreStart } from '../../../../../../src/core/public';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
-import { DOC_TYPE as LENS_DOC_TYPE } from '../../../../lens/common/constants';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { ViewMode, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
+import { DOC_TYPE as LENS_DOC_TYPE } from '@kbn/lens-plugin/common/constants';
 import * as shared from './shared';
 
 export const ACTION_EXPLORE_DATA = 'ACTION_EXPLORE_DATA';
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
index f4c6e89280274..5ac612c8c5fd2 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
@@ -7,16 +7,16 @@
 import type { Filter, RangeFilter } from '@kbn/es-query';
 import { ExploreDataChartAction } from './explore_data_chart_action';
 import { Params, PluginDeps } from './abstract_explore_data_action';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ExploreDataChartActionContext } from './explore_data_chart_action';
 import { i18n } from '@kbn/i18n';
 import {
   VisualizeEmbeddableContract,
   VISUALIZE_EMBEDDABLE_TYPE,
-} from '../../../../../../src/plugins/visualizations/public';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
-import { DiscoverAppLocator } from '../../../../../../src/plugins/discover/public';
-import { sharePluginMock } from '../../../../../../src/plugins/share/public/mocks';
+} from '@kbn/visualizations-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { DiscoverAppLocator } from '@kbn/discover-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 const i18nTranslateSpy = i18n.translate as unknown as jest.SpyInstance;
 
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 94ebece3a77d8..a213563a04a46 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
@@ -5,15 +5,12 @@
  * 2.0.
  */
 
-import { Action } from '../../../../../../src/plugins/ui_actions/public';
-import {
-  DiscoverAppLocatorParams,
-  SearchInput,
-} from '../../../../../../src/plugins/discover/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
-import { extractTimeRange } from '../../../../../../src/plugins/data/public';
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { DiscoverAppLocatorParams, SearchInput } from '@kbn/discover-plugin/public';
+import { ApplyGlobalFilterActionContext } from '@kbn/unified-search-plugin/public';
+import { extractTimeRange } from '@kbn/data-plugin/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import * as shared from './shared';
 import { AbstractExploreDataAction } from './abstract_explore_data_action';
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
index 7008800e9c9f4..974f4126778fb 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
@@ -7,15 +7,15 @@
 
 import { ExploreDataContextMenuAction } from './explore_data_context_menu_action';
 import { Params, PluginDeps } from './abstract_explore_data_action';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { i18n } from '@kbn/i18n';
 import {
   VisualizeEmbeddableContract,
   VISUALIZE_EMBEDDABLE_TYPE,
-} from '../../../../../../src/plugins/visualizations/public';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
-import { DiscoverAppLocator } from '../../../../../../src/plugins/discover/public';
-import { sharePluginMock } from '../../../../../../src/plugins/share/public/mocks';
+} from '@kbn/visualizations-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { DiscoverAppLocator } from '@kbn/discover-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 const i18nTranslateSpy = i18n.translate as unknown as jest.SpyInstance;
 
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 28f41fdb18711..ce0d6e8c912fa 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
@@ -5,15 +5,11 @@
  * 2.0.
  */
 import type { Filter } from '@kbn/es-query';
-import { Action } from '../../../../../../src/plugins/ui_actions/public';
-import {
-  EmbeddableContext,
-  EmbeddableInput,
-  IEmbeddable,
-} from '../../../../../../src/plugins/embeddable/public';
-import { Query, TimeRange } from '../../../../../../src/plugins/data/public';
-import { DiscoverAppLocatorParams } from '../../../../../../src/plugins/discover/public';
-import { KibanaLocation } from '../../../../../../src/plugins/share/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableContext, EmbeddableInput, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
+import { DiscoverAppLocatorParams } from '@kbn/discover-plugin/public';
+import { KibanaLocation } from '@kbn/share-plugin/public';
 import * as shared from './shared';
 import { AbstractExploreDataAction } from './abstract_explore_data_action';
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts
index b2370a0f5e264..e4adad896052c 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/shared.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
 
 const isOutputWithIndexPatterns = (
   output: unknown
diff --git a/x-pack/plugins/discover_enhanced/public/index.ts b/x-pack/plugins/discover_enhanced/public/index.ts
index ed00872d1c8d2..da1a00bc059ca 100644
--- a/x-pack/plugins/discover_enhanced/public/index.ts
+++ b/x-pack/plugins/discover_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializerContext } from 'kibana/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import { DiscoverEnhancedPlugin } from './plugin';
 
 export type { ExploreDataContextMenuAction, ExploreDataChartAction } from './actions';
diff --git a/x-pack/plugins/discover_enhanced/public/plugin.ts b/x-pack/plugins/discover_enhanced/public/plugin.ts
index 63a7e1b6c1c6b..e1fd9e0c74951 100644
--- a/x-pack/plugins/discover_enhanced/public/plugin.ts
+++ b/x-pack/plugins/discover_enhanced/public/plugin.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { PluginInitializerContext } from 'kibana/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../src/plugins/data/public';
-import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';
-import { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
-import { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
+import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
 import {
   EmbeddableSetup,
   EmbeddableStart,
   CONTEXT_MENU_TRIGGER,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { ExploreDataContextMenuAction, ExploreDataChartAction } from './actions';
 import { Config } from '../common';
 
diff --git a/x-pack/plugins/discover_enhanced/server/config.ts b/x-pack/plugins/discover_enhanced/server/config.ts
index 95ac46a662ea0..7e07c978f13b2 100644
--- a/x-pack/plugins/discover_enhanced/server/config.ts
+++ b/x-pack/plugins/discover_enhanced/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 export const configSchema = schema.object({
   actions: schema.object({
diff --git a/x-pack/plugins/discover_enhanced/server/index.ts b/x-pack/plugins/discover_enhanced/server/index.ts
index 1d9535801f6f9..95ce6a4b8d3ba 100644
--- a/x-pack/plugins/discover_enhanced/server/index.ts
+++ b/x-pack/plugins/discover_enhanced/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { DiscoverEnhancedPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/discover_enhanced/server/plugin.ts b/x-pack/plugins/discover_enhanced/server/plugin.ts
index d5dd32791dcd5..32ceb730309ba 100644
--- a/x-pack/plugins/discover_enhanced/server/plugin.ts
+++ b/x-pack/plugins/discover_enhanced/server/plugin.ts
@@ -5,15 +5,9 @@
  * 2.0.
  */
 
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import {
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  PluginInitializerContext,
-} from '../../../../src/core/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { firstValueFrom, Observable } from 'rxjs';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { Config } from '../common';
 
 interface SetupDependencies {
@@ -46,7 +40,7 @@ export class DiscoverEnhancedPlugin
         },
         isReady: () => true,
         fetch: async () => {
-          const config = await this.config$.pipe(take(1)).toPromise();
+          const config = await firstValueFrom(this.config$);
           return {
             exploreDataInChartActionEnabled: config.actions.exploreDataInChart.enabled,
           };
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/index.ts b/x-pack/plugins/drilldowns/url_drilldown/public/index.ts
index 62b200c7fe6c6..43a7b23a14a08 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/index.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UrlDrilldownPlugin } from './plugin';
 
 export function plugin(context: PluginInitializerContext) {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts
index 07ad8de533a9a..22ec6ed873fa1 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/test/data.ts
@@ -5,13 +5,9 @@
  * 2.0.
  */
 
-import { DatatableColumnType } from '../../../../../../../src/plugins/expressions/common';
-import { Query, Filter, TimeRange } from '../../../../../../../src/plugins/data/public';
-import {
-  Embeddable,
-  EmbeddableInput,
-  EmbeddableOutput,
-} from '../../../../../../../src/plugins/embeddable/public';
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import { Query, Filter, TimeRange } from '@kbn/data-plugin/public';
+import { Embeddable, EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
 
 export const createPoint = ({
   field,
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts
index c8d187549a66b..58af9e619111a 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.test.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { IExternalUrl } from 'src/core/public';
-import { uiSettingsServiceMock } from 'src/core/public/mocks';
+import { IExternalUrl } from '@kbn/core/public';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { UrlDrilldown, ActionContext, Config } from './url_drilldown';
 import {
   IEmbeddable,
   VALUE_CLICK_TRIGGER,
   SELECT_RANGE_TRIGGER,
   CONTEXT_MENU_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { DatatableColumnType } from '../../../../../../src/plugins/expressions/common';
-import { of } from '../../../../../../src/plugins/kibana_utils';
+} from '@kbn/embeddable-plugin/public';
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import { of } from '@kbn/kibana-utils-plugin';
 import { createPoint, rowClickData, TestEmbeddable } from './test/data';
-import { ROW_CLICK_TRIGGER } from '../../../../../../src/plugins/ui_actions/public';
+import { ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
 
 const mockDataPoints = [
   {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx
index f56fb7a9df933..eebd8afc5460d 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/url_drilldown.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { IExternalUrl, IUiSettingsClient } from 'src/core/public';
+import { IExternalUrl, IUiSettingsClient } from '@kbn/core/public';
 import {
   ChartActionContext,
   CONTEXT_MENU_TRIGGER,
@@ -14,15 +14,15 @@ import {
   EmbeddableInput,
   SELECT_RANGE_TRIGGER,
   VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
-import { ROW_CLICK_TRIGGER } from '../../../../../../src/plugins/ui_actions/public';
-import { Query, Filter, TimeRange } from '../../../../../../src/plugins/data/public';
-import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/embeddable-plugin/public';
+import { ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import { Query, Filter, TimeRange } from '@kbn/data-plugin/public';
+import { CollectConfigProps as CollectConfigPropsBase } from '@kbn/kibana-utils-plugin/public';
 import {
   reactToUiComponent,
   UrlTemplateEditorVariable,
   KibanaContextProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import {
   UiActionsEnhancedDrilldownDefinition as Drilldown,
   UrlDrilldownGlobalScope,
@@ -31,7 +31,7 @@ import {
   urlDrilldownValidateUrlTemplate,
   urlDrilldownCompileUrl,
   UiActionsEnhancedBaseActionFactoryContext as BaseActionFactoryContext,
-} from '../../../../ui_actions_enhanced/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import { txtUrlDrilldownDisplayName } from './i18n';
 import { getEventVariableList, getEventScopeValues } from './variables/event_variables';
 import { getContextVariableList, getContextScopeValues } from './variables/context_variables';
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts
index 491501b9dd4a7..6940fb61ed38d 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/context_variables.ts
@@ -8,16 +8,13 @@
 import { i18n } from '@kbn/i18n';
 import { monaco } from '@kbn/monaco';
 import { getFlattenedObject } from '@kbn/std';
+import type { Filter, Query, TimeRange } from '@kbn/data-plugin/public';
+import { EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
+import type { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import { txtValue } from './i18n';
-import type { Filter, Query, TimeRange } from '../../../../../../../src/plugins/data/public';
-import {
-  EmbeddableInput,
-  EmbeddableOutput,
-} from '../../../../../../../src/plugins/embeddable/public';
 import type { EmbeddableWithQueryInput } from '../url_drilldown';
 import { deleteUndefinedKeys } from './util';
 import type { ActionFactoryContext } from '../url_drilldown';
-import type { UrlTemplateEditorVariable } from '../../../../../../../src/plugins/kibana_react/public';
 
 /**
  * Part of context scope extracted from an embeddable
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts
index d66d998d7440c..924fdcd1db515 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.test.ts
@@ -10,10 +10,7 @@ import {
   getEventVariableList,
   ValueClickTriggerEventScope,
 } from './event_variables';
-import {
-  RowClickContext,
-  ROW_CLICK_TRIGGER,
-} from '../../../../../../../src/plugins/ui_actions/public';
+import { RowClickContext, ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
 import { createPoint, rowClickData } from '../test/data';
 
 describe('VALUE_CLICK_TRIGGER', () => {
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts
index 8eb798eea74cb..fa3358fe096a2 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/event_variables.ts
@@ -16,17 +16,14 @@ import {
   SELECT_RANGE_TRIGGER,
   ValueClickContext,
   VALUE_CLICK_TRIGGER,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { RowClickContext, ROW_CLICK_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import type { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import type {
   ActionContext,
   ActionFactoryContext,
   EmbeddableWithQueryInput,
 } from '../url_drilldown';
-import {
-  RowClickContext,
-  ROW_CLICK_TRIGGER,
-} from '../../../../../../../src/plugins/ui_actions/public';
-import type { UrlTemplateEditorVariable } from '../../../../../../../src/plugins/kibana_react/public';
 import { deleteUndefinedKeys, toPrimitiveOrUndefined, Primitive } from './util';
 
 /**
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts
index 7338e6b471211..90edc4b70c0a1 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/lib/variables/global_variables.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { monaco } from '@kbn/monaco';
+import { UrlDrilldownGlobalScope } from '@kbn/ui-actions-enhanced-plugin/public';
+import type { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import { txtValue } from './i18n';
-import { UrlDrilldownGlobalScope } from '../../../../../ui_actions_enhanced/public';
-import type { UrlTemplateEditorVariable } from '../../../../../../../src/plugins/kibana_react/public';
 
 const kind = monaco.languages.CompletionItemKind.Constant;
 const sortPrefix = '3.';
diff --git a/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts b/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts
index 053803d69a3e6..aa1b4500a2298 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts
+++ b/x-pack/plugins/drilldowns/url_drilldown/public/plugin.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import {
   AdvancedUiActionsSetup,
   AdvancedUiActionsStart,
   urlDrilldownGlobalScopeProvider,
-} from '../../../ui_actions_enhanced/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { UrlDrilldown } from './lib';
-import { createStartServicesGetter } from '../../../../../src/plugins/kibana_utils/public';
 
 export interface SetupDependencies {
   embeddable: EmbeddableSetup;
diff --git a/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts b/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts
index 62af88f843b83..86ca2030d2ae7 100644
--- a/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/actions/drilldown_grouping.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { UiActionsPresentableGrouping as PresentableGrouping } from '../../../../../src/plugins/ui_actions/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { UiActionsPresentableGrouping as PresentableGrouping } from '@kbn/ui-actions-plugin/public';
 
 export const drilldownGrouping: PresentableGrouping<{
   embeddable?: IEmbeddable;
diff --git a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts
index 5b15306eae554..87f0d4e8cf04c 100644
--- a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.test.ts
@@ -7,7 +7,7 @@
 
 import { PanelNotificationsAction } from './panel_notifications_action';
 import { EnhancedEmbeddableContext } from '../types';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 const createContext = (events: unknown[] = [], isEditMode = false): EnhancedEmbeddableContext =>
   ({
diff --git a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts
index 2675d3449d693..8f8004c363aac 100644
--- a/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/actions/panel_notifications_action.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { EnhancedEmbeddableContext, EnhancedEmbeddable } from '../types';
 
 export const txtOneDrilldown = i18n.translate(
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
index 3cbd9cc85feba..c96a325b55f27 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { Embeddable, ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { Embeddable, ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   EmbeddableActionStorage,
   EmbeddableWithDynamicActionsInput,
 } from './embeddable_action_storage';
-import { UiActionsEnhancedSerializedEvent } from '../../../ui_actions_enhanced/public';
-import { of } from '../../../../../src/plugins/kibana_utils/public';
+import { UiActionsEnhancedSerializedEvent } from '@kbn/ui-actions-enhanced-plugin/public';
+import { of } from '@kbn/kibana-utils-plugin/public';
 // use real const to make test fail in case someone accidentally changes it
-import { APPLY_FILTER_TRIGGER } from '../../../../../src/plugins/data/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
 
 class TestEmbeddable extends Embeddable<EmbeddableWithDynamicActionsInput> {
   public readonly type = 'test';
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
index 65904ab5826ff..63291f652d3f3 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/embeddable_action_storage.ts
@@ -10,12 +10,8 @@ import {
   DynamicActionsState,
   UiActionsEnhancedAbstractActionStorage as AbstractActionStorage,
   UiActionsEnhancedSerializedEvent as SerializedEvent,
-} from '../../../ui_actions_enhanced/public';
-import {
-  EmbeddableInput,
-  EmbeddableOutput,
-  IEmbeddable,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/ui-actions-enhanced-plugin/public';
+import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from '@kbn/embeddable-plugin/public';
 
 export interface EmbeddableWithDynamicActionsInput extends EmbeddableInput {
   enhancements?: {
diff --git a/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts b/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts
index faf1bdd5c4855..7a2dc821180b2 100644
--- a/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/embeddables/is_enhanced_embeddable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
 import { EnhancedEmbeddable } from '../types';
 
 export const isEnhancedEmbeddable = <E>(
diff --git a/x-pack/plugins/embeddable_enhanced/public/index.ts b/x-pack/plugins/embeddable_enhanced/public/index.ts
index 8c64f376754a5..63bd6d17ddcb9 100644
--- a/x-pack/plugins/embeddable_enhanced/public/index.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { EmbeddableEnhancedPlugin } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/embeddable_enhanced/public/plugin.ts b/x-pack/plugins/embeddable_enhanced/public/plugin.ts
index 4e83b5b0ffcd2..8f82efdb10671 100644
--- a/x-pack/plugins/embeddable_enhanced/public/plugin.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { SavedObjectAttributes } from 'kibana/public';
+import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
@@ -18,17 +18,17 @@ import {
   defaultEmbeddableFactoryProvider,
   EmbeddableContext,
   PANEL_NOTIFICATION_TRIGGER,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import {
+  UiActionsEnhancedDynamicActionManager as DynamicActionManager,
+  AdvancedUiActionsSetup,
+  AdvancedUiActionsStart,
+} from '@kbn/ui-actions-enhanced-plugin/public';
 import { EnhancedEmbeddable } from './types';
 import {
   EmbeddableActionStorage,
   EmbeddableWithDynamicActions,
 } from './embeddables/embeddable_action_storage';
-import {
-  UiActionsEnhancedDynamicActionManager as DynamicActionManager,
-  AdvancedUiActionsSetup,
-  AdvancedUiActionsStart,
-} from '../../ui_actions_enhanced/public';
 import { PanelNotificationsAction } from './actions';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/embeddable_enhanced/public/types.ts b/x-pack/plugins/embeddable_enhanced/public/types.ts
index 3a930f3f9ff58..7500a37e120cc 100644
--- a/x-pack/plugins/embeddable_enhanced/public/types.ts
+++ b/x-pack/plugins/embeddable_enhanced/public/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IEmbeddable } from '../../../../src/plugins/embeddable/public';
-import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../ui_actions_enhanced/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '@kbn/ui-actions-enhanced-plugin/public';
 
 export type EnhancedEmbeddable<E extends IEmbeddable = IEmbeddable> = E & {
   enhancements: {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts b/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts
index be05825192d35..ed519de96b52b 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/create_migration.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
 import { getCreateMigration } from './create_migration';
 import { EncryptionError, EncryptionErrorOperation } from './crypto';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts b/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts
index f166e018d9c9d..6ef6b82d20e0a 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts
@@ -11,7 +11,7 @@ import type {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectUnsanitizedDoc,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { EncryptionError } from './crypto';
 import type { EncryptedSavedObjectsService, EncryptedSavedObjectTypeRegistration } from './crypto';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
index 3b87362b6dea1..57238786dd499 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
@@ -8,9 +8,9 @@
 import type { Crypto } from '@elastic/node-crypto';
 import nodeCrypto from '@elastic/node-crypto';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { mockAuthenticatedUser } from '@kbn/security-plugin/common/model/authenticated_user.mock';
 
-import { mockAuthenticatedUser } from '../../../security/common/model/authenticated_user.mock';
 import { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError } from './encryption_error';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
index 1e1f09dabcf53..321b93c8452ee 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
@@ -9,9 +9,9 @@ import type { Crypto, EncryptOutput } from '@elastic/node-crypto';
 import stringify from 'json-stable-stringify';
 import typeDetect from 'type-detect';
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
+import type { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
-import type { AuthenticatedUser } from '../../../security/common/model';
 import { EncryptedSavedObjectAttributesDefinition } from './encrypted_saved_object_type_definition';
 import { EncryptionError, EncryptionErrorOperation } from './encryption_error';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts
index 3f343f4a0e15b..a1c598bef2413 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.test.ts
@@ -9,14 +9,14 @@ import type {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   loggingSystemMock,
   savedObjectsClientMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError, EncryptionErrorOperation } from './encryption_error';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
index 1a6d1173d1652..6caf76e63508a 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ISavedObjectTypeRegistry,
   KibanaRequest,
@@ -13,9 +12,10 @@ import type {
   SavedObject,
   SavedObjectsBulkUpdateObject,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { AuthenticatedUser, SecurityPluginSetup } from '../../../security/server';
 import { getDescriptorNamespace } from '../saved_objects/get_descriptor_namespace';
 import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError } from './encryption_error';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/index.ts b/x-pack/plugins/encrypted_saved_objects/server/index.ts
index fef302739b7ad..4a75e0f6855b8 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { EncryptedSavedObjectsPlugin } from './plugin';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
index 9d345c5e0af0f..f4708e182ad31 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
-import { securityMock } from '../../security/server/mocks';
 import { ConfigSchema } from './config';
 import { EncryptedSavedObjectsPlugin } from './plugin';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
index 23738026e0ab6..5ba387128ef7e 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
@@ -7,9 +7,9 @@
 
 import nodeCrypto from '@elastic/node-crypto';
 
-import type { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import type { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
-import type { SecurityPluginSetup } from '../../security/server';
 import type { ConfigType } from './config';
 import type { CreateEncryptedSavedObjectsMigrationFn } from './create_migration';
 import { getCreateMigration } from './create_migration';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
index 9c8add9da3ad3..822427687759f 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/index.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { ConfigType } from '../config';
 import { ConfigSchema } from '../config';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts
index 680ad0be015c0..d0318c0bb06d3 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { IRouter, Logger } from '@kbn/core/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { IRouter, Logger } from 'src/core/server';
 
 import type { ConfigType } from '../config';
 import type { EncryptionKeyRotationService } from '../crypto';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
index a052b847a50f7..b1c7f3b38139b 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { Type } from '@kbn/config-schema';
-import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { IRouter, RequestHandler, RequestHandlerContext, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { EncryptionKeyRotationService } from '../crypto';
 import { routeDefinitionParamsMock } from './index.mock';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
index f59c4fa61f4aa..9305446767e9d 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from './';
+import type { RouteDefinitionParams } from '.';
 
 /**
  * The default maximum value of from + size for searches to .kibana index. Since we cannot use scroll
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
index 116a112fa1652..724178f9b7088 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import type { SavedObjectsBulkResolveResponse, SavedObjectsClientContract } from 'src/core/server';
-import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
+import type { SavedObjectsBulkResolveResponse, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks';
+import { mockAuthenticatedUser } from '@kbn/security-plugin/common/model/authenticated_user.mock';
 
-import { mockAuthenticatedUser } from '../../../security/common/model/authenticated_user.mock';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptionError } from '../crypto';
 import { EncryptionErrorOperation } from '../crypto/encryption_error';
 import { encryptedSavedObjectsServiceMock } from '../crypto/index.mock';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
-jest.mock('src/core/server/saved_objects/service/lib/utils', () => {
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => {
   const { SavedObjectsUtils } = jest.requireActual(
-    'src/core/server/saved_objects/service/lib/utils'
+    '@kbn/core/server/saved_objects/service/lib/utils'
   );
   return {
     SavedObjectsUtils: {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
index 2cdbc76504fb4..84141db8967a7 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
@@ -33,10 +33,10 @@ import type {
   SavedObjectsUpdateObjectsSpacesOptions,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
+import type { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
-import { SavedObjectsUtils } from '../../../../../src/core/server';
-import type { AuthenticatedUser } from '../../../security/common/model';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { getDescriptorNamespace } from './get_descriptor_namespace';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts
index bb4ae1f59f02f..e70888f8b20f0 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
+import { savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks';
 
 import { getDescriptorNamespace } from './get_descriptor_namespace';
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts
index 4e01c516dc3af..b7eed57731ed0 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/get_descriptor_namespace.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import type { ISavedObjectTypeRegistry } from 'src/core/server';
-
-import { SavedObjectsUtils } from '../../../../../src/core/server';
+import type { ISavedObjectTypeRegistry } from '@kbn/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 export const getDescriptorNamespace = (
   typeRegistry: ISavedObjectTypeRegistry,
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
index 972292670d05f..032842e0047c0 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
@@ -9,20 +9,20 @@ import type {
   ISavedObjectsRepository,
   ISavedObjectTypeRegistry,
   SavedObject,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsRepositoryMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
-import { securityMock } from '../../../security/server/mocks';
+import type { ClientInstanciator } from '.';
+import { setupSavedObjects } from '.';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { encryptedSavedObjectsServiceMock } from '../crypto/index.mock';
-import type { ClientInstanciator } from './';
-import { setupSavedObjects } from './';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
 describe('#setupSavedObjects', () => {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
index 1268113eb19bb..3d9d36206b5c9 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ISavedObjectsRepository,
   ISavedObjectTypeRegistry,
@@ -13,9 +12,10 @@ import type {
   SavedObjectsBaseOptions,
   SavedObjectsServiceSetup,
   StartServicesAccessor,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { SecurityPluginSetup } from '../../../security/server';
 import type { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 import { getDescriptorNamespace, normalizeNamespace } from './get_descriptor_namespace';
diff --git a/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts b/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts
index 4cd7ceef0b758..b3860fca6159d 100644
--- a/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts
+++ b/x-pack/plugins/enterprise_search/common/is_version_mismatch/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { isVersionMismatch } from './index';
+import { isVersionMismatch } from '.';
 
 describe('isVersionMismatch', () => {
   it('no mismatch if major and minor are the same', () => {
diff --git a/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts b/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts
index fe027f8fe756c..b9747998ab73d 100644
--- a/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts
+++ b/x-pack/plugins/enterprise_search/common/strip_slashes/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { stripTrailingSlash, stripLeadingSlash } from './';
+import { stripTrailingSlash, stripLeadingSlash } from '.';
 
 describe('Strip Trailing Slash helper', () => {
   it('strips trailing slashes', () => {
diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json
index c09f40ba8d303..bc12b7f447ab4 100644
--- a/x-pack/plugins/enterprise_search/kibana.json
+++ b/x-pack/plugins/enterprise_search/kibana.json
@@ -7,7 +7,7 @@
   "optionalPlugins": ["usageCollection", "home", "cloud", "customIntegrations"],
   "server": true,
   "ui": true,
-  "requiredBundles": ["home", "kibanaReact"],
+  "requiredBundles": ["kibanaReact"],
   "owner": {
     "name": "Enterprise Search",
     "githubTeam": "enterprise-search-frontend"
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
index 24dcf601442ad..ba8ed14a7ba35 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 export const mockHttpValues = {
   http: httpServiceMock.createSetupContract(),
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
index f2c6ccfacf2bb..e65f0a542ada5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
-import { securityMock } from '../../../../../security/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 
 import { mockHistory } from '../react_router/state.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
index f227928b45821..0ea858d0f2f50 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 
 export const mockLicensingValues = {
   license: licensingMock.createLicense(),
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx
index 0923f9497a8fe..d36ac9c2ced4a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.tsx
@@ -20,7 +20,7 @@ import { LogRetentionTooltip, LogRetentionCallout, LogRetentionOptions } from '.
 import { AnalyticsFilters } from './components';
 import { ANALYTICS_TITLE } from './constants';
 
-import { AnalyticsLogic } from './';
+import { AnalyticsLogic } from '.';
 
 interface Props {
   title: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
index a87555c58014a..cf0d36ef3e95d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_logic.test.ts
@@ -17,7 +17,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { DEFAULT_START_DATE, DEFAULT_END_DATE } from './constants';
 
-import { AnalyticsLogic } from './';
+import { AnalyticsLogic } from '.';
 
 describe('AnalyticsLogic', () => {
   const { mount } = new LogicMounter(AnalyticsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx
index 68f08d8d84724..c69eb768183fd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_router.test.tsx
@@ -13,7 +13,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { AnalyticsRouter } from './';
+import { AnalyticsRouter } from '.';
 
 describe('AnalyticsRouter', () => {
   // Detailed route testing is better done via E2E tests
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx
index 8883d0d1ffcbd..c8158137fe602 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_cards.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiStat } from '@elastic/eui';
 
-import { AnalyticsCards } from './';
+import { AnalyticsCards } from '.';
 
 describe('AnalyticsCards', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx
index 8a5d2cbf89c4a..c1b5ce46ad682 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_chart.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { Chart, Settings, LineSeries, Axis } from '@elastic/charts';
 
-import { AnalyticsChart } from './';
+import { AnalyticsChart } from '.';
 
 describe('AnalyticsChart', () => {
   const MOCK_DATA = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx
index 7abb02110e2d9..51da936216241 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.test.tsx
@@ -16,7 +16,7 @@ import { EuiSelect, EuiDatePickerRange, EuiButton } from '@elastic/eui';
 
 import { DEFAULT_START_DATE, DEFAULT_END_DATE } from '../constants';
 
-import { AnalyticsFilters } from './';
+import { AnalyticsFilters } from '.';
 
 describe('AnalyticsFilters', () => {
   const { history } = mockKibanaValues;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
index dd99d368a0105..e1d985ad92b48 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_filters.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { KibanaLogic } from '../../../../shared/kibana';
 
 import { DEFAULT_START_DATE, DEFAULT_END_DATE, SERVER_DATE_FORMAT } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx
index de04a21d48a23..4fbd70069f9d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_search.test.tsx
@@ -15,7 +15,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFieldSearch } from '@elastic/eui';
 
-import { AnalyticsSearch } from './';
+import { AnalyticsSearch } from '.';
 
 describe('AnalyticsSearch', () => {
   const { navigateToUrl } = mockKibanaValues;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx
index b561a57120440..f4272a7ea1337 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_section.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiIcon } from '@elastic/eui';
 
-import { AnalyticsSection } from './';
+import { AnalyticsSection } from '.';
 
 describe('AnalyticsSection', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx
index e25e4d8c16bb2..7ed8f59e379e5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/analytics_table.test.tsx
@@ -17,7 +17,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 
 import { runActionColumnTests } from './test_helpers/shared_columns_tests';
 
-import { AnalyticsTable } from './';
+import { AnalyticsTable } from '.';
 
 describe('AnalyticsTable', () => {
   const items = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx
index 00cb12060822e..9e87bbb6dcea5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/query_clicks_table.test.tsx
@@ -15,7 +15,7 @@ import { EuiBasicTable, EuiLink, EuiBadge, EuiEmptyPrompt } from '@elastic/eui';
 
 import { mountWithIntl } from '../../../../../test_helpers';
 
-import { QueryClicksTable } from './';
+import { QueryClicksTable } from '.';
 
 describe('QueryClicksTable', () => {
   const items = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx
index 6ec89751a62e9..c3cfdf33f9d8a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/recent_queries_table.test.tsx
@@ -17,7 +17,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 
 import { runActionColumnTests } from './test_helpers/shared_columns_tests';
 
-import { RecentQueriesTable } from './';
+import { RecentQueriesTable } from '.';
 
 describe('RecentQueriesTable', () => {
   const items = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx
index aa949a01f7d79..dd88d6ed28e35 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.tsx
@@ -12,6 +12,7 @@ import { useValues } from 'kea';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '..';
 import { EuiButtonEmptyTo } from '../../../../shared/react_router_helpers';
 import { CursorIcon } from '../../../icons';
 
@@ -39,7 +40,6 @@ import {
   TOP_QUERIES_NO_CLICKS,
   RECENT_QUERIES,
 } from '../constants';
-import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '../index';
 
 import './analytics.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx
index f3fee2553d2fd..0eb3002f6472f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.test.tsx
@@ -15,7 +15,7 @@ import { shallow } from 'enzyme';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsCards, AnalyticsChart, QueryClicksTable } from '../components';
 
-import { QueryDetail } from './';
+import { QueryDetail } from '.';
 
 describe('QueryDetail', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx
index 814173744249f..8c2819e86bf40 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/query_detail.tsx
@@ -12,11 +12,11 @@ import { useValues } from 'kea';
 import { EuiPanel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '..';
 import { useDecodedParams } from '../../../utils/encode_path_params';
 
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSection, QueryClicksTable } from '../components';
-import { AnalyticsLogic, AnalyticsCards, AnalyticsChart, convertToChartData } from '../index';
 
 const QUERY_DETAIL_TITLE = i18n.translate(
   'xpack.enterpriseSearch.appSearch.engine.analytics.queryDetail.title',
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx
index 20a25db3a7adf..46f4e9d2f3ee0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { RecentQueriesTable } from '../components';
 
-import { RecentQueries } from './';
+import { RecentQueries } from '.';
 
 describe('RecentQueries', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx
index 7a86da9dfd8c1..df6efdf06bc26 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/recent_queries.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, RecentQueriesTable } from '../components';
 import { RECENT_QUERIES } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx
index 98362e42c5536..f69d10f42d174 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueries } from './';
+import { TopQueries } from '.';
 
 describe('TopQueries', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx
index 81b3d08770be6..f43bb807140a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx
index dfbda1c68ca84..6898d32879f9c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueriesNoClicks } from './';
+import { TopQueriesNoClicks } from '.';
 
 describe('TopQueriesNoClicks', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx
index 2aec88bd372fe..413ca7594a9bd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_clicks.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES_NO_CLICKS } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx
index 60e33660f87d7..e644e338db034 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueriesNoResults } from './';
+import { TopQueriesNoResults } from '.';
 
 describe('TopQueriesNoResults', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx
index 835b259330c83..df76d8349f70c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_no_results.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES_NO_RESULTS } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx
index b4c9f0fb40f71..c966624f14757 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { AnalyticsTable } from '../components';
 
-import { TopQueriesWithClicks } from './';
+import { TopQueriesWithClicks } from '.';
 
 describe('TopQueriesWithClicks', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx
index 9bea265df55ae..fcc87848fd58d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/top_queries_with_clicks.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { AnalyticsLogic } from '../';
+import { AnalyticsLogic } from '..';
 import { AnalyticsLayout } from '../analytics_layout';
 import { AnalyticsSearch, AnalyticsTable } from '../components';
 import { TOP_QUERIES_WITH_CLICKS } from '../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx
index 25fdfbdec8fdf..2caf70fe6d2b0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.tsx
@@ -28,7 +28,7 @@ import { i18n } from '@kbn/i18n';
 
 import { getStatusColor, attemptToFormatJson } from '../utils';
 
-import { ApiLogLogic } from './';
+import { ApiLogLogic } from '.';
 
 export const ApiLogFlyout: React.FC = () => {
   const { isFlyoutOpen, apiLog } = useValues(ApiLogLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx
index e0d7c30bd0141..25e6803a9883b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_logic.test.tsx
@@ -8,7 +8,7 @@
 import { LogicMounter } from '../../../../__mocks__/kea_logic';
 import { mockApiLog } from '../__mocks__/api_log.mock';
 
-import { ApiLogLogic } from './';
+import { ApiLogLogic } from '.';
 
 describe('ApiLogLogic', () => {
   const { mount } = new LogicMounter(ApiLogLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx
index 5b082ce8d26ba..94aa8e6faeae0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.test.tsx
@@ -18,7 +18,7 @@ import { LogRetentionCallout, LogRetentionTooltip } from '../log_retention';
 
 import { ApiLogsTable, NewApiEventsPrompt } from './components';
 
-import { ApiLogs } from './';
+import { ApiLogs } from '.';
 
 describe('ApiLogs', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx
index d3eef77db21f0..06bf16cbcbddf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs.tsx
@@ -19,7 +19,7 @@ import { ApiLogFlyout } from './api_log';
 import { ApiLogsTable, NewApiEventsPrompt, EmptyState } from './components';
 import { API_LOGS_TITLE, RECENT_API_EVENTS } from './constants';
 
-import { ApiLogsLogic } from './';
+import { ApiLogsLogic } from '.';
 
 export const ApiLogs: React.FC = () => {
   const { dataLoading, apiLogs, meta } = useValues(ApiLogsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
index 35fa74374acb2..614f3506b4ef9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_logs_logic.test.ts
@@ -19,7 +19,7 @@ import { DEFAULT_META } from '../../../shared/constants';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { ApiLogsLogic } from './';
+import { ApiLogsLogic } from '.';
 
 describe('ApiLogsLogic', () => {
   const { mount, unmount } = new LogicMounter(ApiLogsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx
index 55d1bb1198fda..4580f8313fa05 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.test.tsx
@@ -23,7 +23,7 @@ import { EuiBasicTable, EuiBadge, EuiHealth, EuiButtonEmpty } from '@elastic/eui
 import { DEFAULT_META } from '../../../../shared/constants';
 import { mountWithIntl } from '../../../../test_helpers';
 
-import { ApiLogsTable } from './';
+import { ApiLogsTable } from '.';
 
 describe('ApiLogsTable', () => {
   const apiLogs = [
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx
index 17a05a8e24ed6..454b68398b4ff 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/api_logs_table.tsx
@@ -19,14 +19,14 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedRelative } from '@kbn/i18n-react';
 
+import { ApiLogsLogic } from '..';
 import { convertMetaToPagination, handlePageChange } from '../../../../shared/table_pagination';
 
 import { ApiLogLogic } from '../api_log';
-import { ApiLogsLogic } from '../index';
 import { ApiLog } from '../types';
 import { getStatusColor } from '../utils';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 import './api_logs_table.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx
index cb1c34a19c018..46aabf57da0c7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx
index 5fd1d12f24842..1f7f6f7f96488 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiButtonEmpty } from '@elastic/eui';
 
-import { NewApiEventsPrompt } from './';
+import { NewApiEventsPrompt } from '.';
 
 describe('NewApiEventsPrompt', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx
index 1f834e061bd2c..8ac6b3a921ee0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/components/new_api_events_prompt.tsx
@@ -12,7 +12,7 @@ import { useValues, useActions } from 'kea';
 import { EuiPanel, EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { ApiLogsLogic } from '../';
+import { ApiLogsLogic } from '..';
 
 import './new_api_events_prompt.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx
index 128dcdcb778cf..4533ca04c75bc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/manage_crawls_popover/automatic_crawl_scheduler.tsx
@@ -29,13 +29,13 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { CANCEL_BUTTON_LABEL, SAVE_BUTTON_LABEL } from '../../../../../shared/constants';
 import {
   DAYS_UNIT_LABEL,
   HOURS_UNIT_LABEL,
   MONTHS_UNIT_LABEL,
   WEEKS_UNIT_LABEL,
-} from '../../../../..//shared/constants/units';
-import { CANCEL_BUTTON_LABEL, SAVE_BUTTON_LABEL } from '../../../../../shared/constants';
+} from '../../../../../shared/constants/units';
 
 import { WEB_CRAWLER_DOCS_URL } from '../../../../routes';
 import { CrawlUnits } from '../../types';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx
index a206cdef4a737..240295394a2d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_name.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFieldText, EuiFormRow } from '@elastic/eui';
 
-import { FormKeyName } from './';
+import { FormKeyName } from '.';
 
 describe('FormKeyName', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx
index 6f52a27dd628d..0128509da1928 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_read_write_access.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCheckbox } from '@elastic/eui';
 
-import { FormKeyReadWriteAccess } from './';
+import { FormKeyReadWriteAccess } from '.';
 
 describe('FormKeyReadWriteAccess', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx
index 9cd518be2aaa5..f3af239a02992 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_type.test.tsx
@@ -15,7 +15,7 @@ import { EuiSelect } from '@elastic/eui';
 
 import { ApiTokenTypes, TOKEN_TYPE_INFO } from '../../constants';
 
-import { FormKeyType } from './';
+import { FormKeyType } from '.';
 
 describe('FormKeyType', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx
index 38eec0b371576..de1e3ad2358de 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_update_warning.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { FormKeyUpdateWarning } from './';
+import { FormKeyUpdateWarning } from '.';
 
 describe('FormKeyUpdateWarning', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx
index b86c1c592c4cd..904a3b76d1486 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlyout } from '@elastic/eui';
 
-import { CredentialsFlyout } from './';
+import { CredentialsFlyout } from '.';
 
 describe('CredentialsFlyout', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx
index 84acd7e38a291..8a0539b70d542 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx
@@ -19,7 +19,7 @@ import { ApiToken } from '../types';
 
 import { Key } from './key';
 
-import { CredentialsList } from './';
+import { CredentialsList } from '.';
 
 describe('CredentialsList', () => {
   const apiToken: ApiToken = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx
index 69c2cc4b987b1..7608e4d0861f9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
index c2b40a2c0aa08..c15089726b6fc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation.test.tsx
@@ -23,7 +23,7 @@ import { AutomatedCuration } from './automated_curation';
 
 import { ManualCuration } from './manual_curation';
 
-import { Curation } from './';
+import { Curation } from '.';
 
 describe('Curation', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts
index 193d397b1fb50..4e25477d65dbf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/curation_logic.test.ts
@@ -17,7 +17,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../../test_helpers';
 
-import { CurationLogic } from './';
+import { CurationLogic } from '.';
 
 describe('CurationLogic', () => {
   const { mount } = new LogicMounter(CurationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx
index 7160931bcf402..823189c006c8d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/hidden_documents.test.tsx
@@ -16,7 +16,7 @@ import { EuiEmptyPrompt, EuiButtonEmpty, EuiBadge } from '@elastic/eui';
 import { DataPanel } from '../../../data_panel';
 import { CurationResult } from '../results';
 
-import { HiddenDocuments } from './';
+import { HiddenDocuments } from '.';
 
 describe('HiddenDocuments', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx
index eaf3e16774420..e7e98feba4ecb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/organic_documents.test.tsx
@@ -18,7 +18,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 import { DataPanel } from '../../../data_panel';
 import { CurationResult } from '../results';
 
-import { OrganicDocuments } from './';
+import { OrganicDocuments } from '.';
 
 describe('OrganicDocuments', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx
index 4d8e9e9ed3d4a..0df3e20c52fbd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/documents/promoted_documents.test.tsx
@@ -23,7 +23,7 @@ import { mountWithIntl } from '../../../../../test_helpers';
 import { DataPanel } from '../../../data_panel';
 import { CurationResult } from '../results';
 
-import { PromotedDocuments } from './';
+import { PromotedDocuments } from '.';
 
 describe('PromotedDocuments', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx
index f27c7ef959b50..5b3ef09ffd2ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/active_query_select.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiSelect } from '@elastic/eui';
 
-import { ActiveQuerySelect } from './';
+import { ActiveQuerySelect } from '.';
 
 describe('ActiveQuerySelect', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx
index 1ff34c5875a0c..a305ab53b4258 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/queries/manage_queries_modal.test.tsx
@@ -15,7 +15,7 @@ import { EuiButton, EuiModal } from '@elastic/eui';
 
 import { MultiInputRows } from '../../../multi_input_rows';
 
-import { ManageQueriesModal } from './';
+import { ManageQueriesModal } from '.';
 
 describe('ManageQueriesModal', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx
index 5b5c814a24c5b..9a180ff64774b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiButton } from '@elastic/eui';
 
-import { AddResultButton } from './';
+import { AddResultButton } from '.';
 
 describe('AddResultButton', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx
index 956b0ba0645c2..912764d4db255 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_button.tsx
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 
 import { CurationLogic } from '..';
 
-import { AddResultLogic } from './';
+import { AddResultLogic } from '.';
 
 export const AddResultButton: React.FC = () => {
   const { openFlyout } = useActions(AddResultLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx
index 71469e4e3f8cb..e544b6f7dccf8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlyout, EuiFieldSearch, EuiEmptyPrompt } from '@elastic/eui';
 
-import { CurationResult, AddResultFlyout } from './';
+import { CurationResult, AddResultFlyout } from '.';
 
 describe('AddResultFlyout', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx
index 4c5ba8f1447fd..adee89181d43f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_flyout.tsx
@@ -36,7 +36,7 @@ import {
 } from '../../constants';
 import { CurationLogic } from '../curation_logic';
 
-import { AddResultLogic, CurationResult } from './';
+import { AddResultLogic, CurationResult } from '.';
 
 export const AddResultFlyout: React.FC = () => {
   const searchLogic = SearchLogic({ id: 'add-results-flyout' });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts
index f1013fa4a6dfb..a1f485ac2503e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.test.ts
@@ -8,7 +8,7 @@
 import { LogicMounter } from '../../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/engine_logic.mock';
 
-import { AddResultLogic } from './';
+import { AddResultLogic } from '.';
 
 describe('AddResultLogic', () => {
   const { mount } = new LogicMounter(AddResultLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx
index 36a2f47956c21..d50234b74c820 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/curation_result.test.tsx
@@ -14,7 +14,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { Result } from '../../../result';
 
-import { CurationResult } from './';
+import { CurationResult } from '.';
 
 describe('CurationResult', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts
index d8fcc01c29a96..80719bf829a21 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_logic.test.ts
@@ -19,7 +19,7 @@ import { DEFAULT_META } from '../../../shared/constants';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { CurationsLogic } from './';
+import { CurationsLogic } from '.';
 
 describe('CurationsLogic', () => {
   const { mount } = new LogicMounter(CurationsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx
index 9598212d3e0c9..2a67d21399454 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curations_router.test.tsx
@@ -12,7 +12,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { CurationsRouter } from './';
+import { CurationsRouter } from '.';
 
 describe('CurationsRouter', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx
index 9aa1759cec5c0..6cd475a125cb2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.tsx
@@ -12,6 +12,7 @@ import { useActions } from 'kea';
 import { EuiPanel, EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { CurationsLogic } from '..';
 import { AppSearchPageTemplate } from '../../layout';
 import { MultiInputRows } from '../../multi_input_rows';
 
@@ -20,7 +21,6 @@ import {
   QUERY_INPUTS_BUTTON,
   QUERY_INPUTS_PLACEHOLDER,
 } from '../constants';
-import { CurationsLogic } from '../index';
 import { getCurationsBreadcrumbs } from '../utils';
 
 export const CurationCreation: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts
index fe1beea237818..797d8012f76b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_suggestion/curation_suggestion_logic.ts
@@ -6,7 +6,8 @@
  */
 
 import { kea, MakeLogicType } from 'kea';
-import { HttpSetup } from 'kibana/public';
+
+import { HttpSetup } from '@kbn/core/public';
 
 import { i18n } from '@kbn/i18n';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
index ba3ac33be3c47..3de39f21e1de0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
@@ -98,26 +98,6 @@ describe('Curations', () => {
     expect(tabs.length).toBe(2);
   });
 
-  it('renders a New! badge  when suggestions are not active', () => {
-    setMockValues(set('engine.adaptive_relevance_suggestions_active', false, values));
-    const wrapper = shallow(<Curations />);
-
-    expect(getPageTitle(wrapper)).toEqual('Curated results');
-
-    const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
-    expect(tabs.at(1).prop('append')).not.toBeUndefined();
-  });
-
-  it('hides the badge when suggestions are active', () => {
-    setMockValues(set('engine.adaptive_relevance_suggestions_active', true, values));
-    const wrapper = shallow(<Curations />);
-
-    expect(getPageTitle(wrapper)).toEqual('Curated results');
-
-    const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
-    expect(tabs.at(2).prop('append')).toBeUndefined();
-  });
-
   it('renders an overview view', () => {
     setMockValues({ ...values, selectedPageTab: 'overview' });
     const wrapper = shallow(<Curations />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
index 048566409ab9f..5edfd1b969964 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
@@ -9,7 +9,6 @@ import React, { useEffect } from 'react';
 
 import { useValues, useActions } from 'kea';
 
-import { EuiBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { EuiButtonTo } from '../../../../shared/react_router_helpers';
@@ -33,8 +32,6 @@ export const Curations: React.FC = () => {
     engine: { adaptive_relevance_suggestions_active: adaptiveRelevanceSuggestionsActive },
   } = useValues(EngineLogic);
 
-  const suggestionsEnabled = adaptiveRelevanceSuggestionsActive;
-
   const OVERVIEW_TAB = {
     label: i18n.translate(
       'xpack.enterpriseSearch.appSearch.engine.curations.overviewPageTabLabel',
@@ -63,13 +60,6 @@ export const Curations: React.FC = () => {
     ),
     isSelected: selectedPageTab === 'settings',
     onClick: () => onSelectPageTab('settings'),
-    append: suggestionsEnabled ? undefined : (
-      <EuiBadge color="success">
-        {i18n.translate('xpack.enterpriseSearch.appSearch.engine.curations.newBadgeLabel', {
-          defaultMessage: 'New!',
-        })}
-      </EuiBadge>
-    ),
   };
 
   const pageTabs = adaptiveRelevanceSuggestionsActive
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx
index e86b06b423a9d..7bbe276aedf69 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.tsx
@@ -28,6 +28,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
 import { getEnterpriseSearchUrl } from '../../../../shared/enterprise_search_url';
 import { API_CLIENTS_DOCS_URL, INDEXING_DOCS_URL } from '../../../routes';
@@ -35,7 +36,6 @@ import { EngineLogic } from '../../engine';
 import { EngineDetails } from '../../engine/types';
 
 import { DOCUMENTS_API_JSON_EXAMPLE, FLYOUT_ARIA_LABEL_ID } from '../constants';
-import { DocumentCreationLogic } from '../index';
 
 export const ApiCodeExample: React.FC = () => (
   <>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx
index 8fec70d7abcdd..b7dce0f996a6c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/elasticsearch_index.tsx
@@ -25,11 +25,11 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
 
 import { FLYOUT_ARIA_LABEL_ID } from '../constants';
 import { Errors } from '../creation_response_components';
-import { DocumentCreationLogic } from '../index';
 
 import './paste_json_text.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx
index a31a46007a8b4..d70cd260d573f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.test.tsx
@@ -19,7 +19,7 @@ import {
   UploadJsonFileTabContent,
   PasteJsonTextFooterContent,
   UploadJsonFileFooterContent,
-} from './';
+} from '.';
 
 describe('JsonFlyout', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx
index 3f78c10ee2195..f9ed45bf38996 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/json_flyout.tsx
@@ -20,16 +20,16 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic, ActiveJsonTab } from '..';
 import { FLYOUT_ARIA_LABEL_ID } from '../constants';
 import { Errors } from '../creation_response_components';
-import { DocumentCreationLogic, ActiveJsonTab } from '../index';
 
 import {
   PasteJsonTextTabContent,
   UploadJsonFileTabContent,
   PasteJsonTextFooterContent,
   UploadJsonFileFooterContent,
-} from './';
+} from '.';
 
 import './json_flyout.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx
index 4eae3b4f520de..2fd7aac12a5e5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.tsx
@@ -20,11 +20,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL, CONTINUE_BUTTON_LABEL } from '../../../../shared/constants';
 import { AppLogic } from '../../../app_logic';
 
-import { DocumentCreationLogic } from '../index';
-
 import './paste_json_text.scss';
 
 export const PasteJsonTextTabContent: React.FC = () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx
index 1087e3d927559..343d2ca4470d3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.test.tsx
@@ -13,9 +13,9 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiButtonEmpty } from '@elastic/eui';
 
-import { DocumentCreationButtons } from '../';
+import { DocumentCreationButtons } from '..';
 
-import { ShowCreationModes } from './';
+import { ShowCreationModes } from '.';
 
 describe('ShowCreationModes', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx
index ff34f0ff7a0b7..7380e085a5e3c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/show_creation_modes.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic, DocumentCreationButtons } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../../../shared/constants';
 import { FLYOUT_ARIA_LABEL_ID } from '../constants';
-import { DocumentCreationLogic, DocumentCreationButtons } from '../index';
 
 export const ShowCreationModes: React.FC = () => {
   const { closeDocumentCreation } = useActions(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx
index ec172f0434dc3..8d9dd2419d2bb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.tsx
@@ -20,11 +20,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic } from '..';
 import { CANCEL_BUTTON_LABEL, CONTINUE_BUTTON_LABEL } from '../../../../shared/constants';
 import { AppLogic } from '../../../app_logic';
 
-import { DocumentCreationLogic } from '../index';
-
 export const UploadJsonFileTabContent: React.FC = () => {
   const {
     configuredLimits: {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx
index 3a3e7fd66d314..b0f7180700525 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { Errors } from './';
+import { Errors } from '.';
 
 describe('Errors', () => {
   it('does not render if no errors or warnings to render', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx
index 3564d8ad088ee..755b8b3c1c916 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/errors.tsx
@@ -11,8 +11,8 @@ import { useValues } from 'kea';
 
 import { EuiCallOut } from '@elastic/eui';
 
+import { DocumentCreationLogic } from '..';
 import { DOCUMENT_CREATION_ERRORS, DOCUMENT_CREATION_WARNINGS } from '../constants';
-import { DocumentCreationLogic } from '../index';
 
 export const Errors: React.FC = () => {
   const { errors, warnings } = useValues(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx
index 39608c6e8f81d..13c629f758a59 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.test.tsx
@@ -20,7 +20,7 @@ import {
   SchemaFieldsSummary,
 } from './summary_sections';
 
-import { Summary } from './';
+import { Summary } from '.';
 
 describe('Summary', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx
index 9452bbbf85935..430155a7471c8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary.tsx
@@ -21,9 +21,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { DocumentCreationLogic } from '..';
 import { CLOSE_BUTTON_LABEL } from '../../../../shared/constants';
 import { FLYOUT_ARIA_LABEL_ID, DOCUMENT_CREATION_ERRORS } from '../constants';
-import { DocumentCreationLogic } from '../index';
 import { DocumentCreationStep } from '../types';
 
 import {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx
index f2e863c2a9983..e156b0fb0a708 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.tsx
@@ -12,7 +12,7 @@ import { useValues } from 'kea';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DocumentCreationLogic } from '../';
+import { DocumentCreationLogic } from '..';
 
 import { ExampleDocumentJson, MoreDocumentsText } from './summary_documents';
 import { SummarySectionAccordion, SummarySectionEmpty } from './summary_section';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx
index 3671f69356de7..a99987272fe23 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.test.tsx
@@ -19,7 +19,7 @@ import { EuiCard, EuiText } from '@elastic/eui';
 
 import { EuiCardTo } from '../../../shared/react_router_helpers';
 
-import { DocumentCreationButtons } from './';
+import { DocumentCreationButtons } from '.';
 
 describe('DocumentCreationButtons', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx
index 838c47e62cc5d..07de7b3ec0c34 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_buttons.tsx
@@ -33,7 +33,7 @@ import { generateEnginePath } from '../engine';
 
 import illustration from './illustration.svg';
 
-import { DocumentCreationLogic } from './';
+import { DocumentCreationLogic } from '.';
 
 interface Props {
   isFlyout?: boolean;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx
index 2e8111eb00f1e..ad137906aeb92 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.tsx
@@ -21,7 +21,7 @@ import {
 import { Summary } from './creation_response_components';
 import { DocumentCreationStep } from './types';
 
-import { DocumentCreationLogic } from './';
+import { DocumentCreationLogic } from '.';
 
 export const DocumentCreationFlyout: React.FC = () => {
   const { closeDocumentCreation } = useActions(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts
index e0f49c788a9e1..3e39c50ff8de7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_logic.test.ts
@@ -23,7 +23,7 @@ jest.mock('./utils', () => ({
 }));
 import { readUploadedFileAsText } from './utils';
 
-import { DocumentCreationLogic } from './';
+import { DocumentCreationLogic } from '.';
 
 describe('DocumentCreationLogic', () => {
   const { mount } = new LogicMounter(DocumentCreationLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx
index b8bb26fa9ad63..88f255f5a3a47 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx
index 3e8a9c1ab307c..2871e4f96015f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience.test.tsx
@@ -25,7 +25,7 @@ import { CustomizationModal } from './customization_modal';
 import { SearchExperienceContent } from './search_experience_content';
 import { Fields } from './types';
 
-import { SearchExperience } from './';
+import { SearchExperience } from '.';
 
 describe('SearchExperience', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
index 2b65c627793e2..acd53a89a7f1f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
@@ -18,7 +18,7 @@ import { ApiTokenTypes } from '../credentials/constants';
 
 import { EngineTypes } from './types';
 
-import { EngineLogic } from './';
+import { EngineLogic } from '.';
 
 describe('EngineLogic', () => {
   const { mount, unmount } = new LogicMounter(EngineLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
index 76a7278df6ee6..a50fdb1c1f988 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
@@ -42,7 +42,7 @@ import { SCHEMA_TITLE } from '../schema';
 import { SEARCH_UI_TITLE } from '../search_ui';
 import { SYNONYMS_TITLE } from '../synonyms';
 
-import { EngineLogic, generateEnginePath } from './';
+import { EngineLogic, generateEnginePath } from '.';
 
 import './engine_nav.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
index 669a729000744..251a51f402bf2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
@@ -46,7 +46,7 @@ import { SearchUI } from '../search_ui';
 import { SourceEngines } from '../source_engines';
 import { Synonyms } from '../synonyms';
 
-import { EngineLogic, getEngineBreadcrumbs } from './';
+import { EngineLogic, getEngineBreadcrumbs } from '.';
 
 export const EngineRouter: React.FC = () => {
   const {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts
index 820d89e473922..28121607cf897 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/utils.ts
@@ -10,7 +10,7 @@ import { generateEncodedPath } from '../../utils/encode_path_params';
 
 import { ENGINES_TITLE } from '../engines';
 
-import { EngineLogic } from './';
+import { EngineLogic } from '.';
 
 /**
  * Generate a path with engineName automatically filled from EngineLogic state
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx
index 7d033cf3d8282..1faf2f93fa1b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation.test.tsx
@@ -14,7 +14,7 @@ import { useLocation } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { EngineCreation } from './';
+import { EngineCreation } from '.';
 
 describe('EngineCreation', () => {
   const DEFAULT_VALUES = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx
index 136c9c6603e5c..99990e2b32aea 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.tsx
@@ -11,6 +11,7 @@ import { useValues } from 'kea';
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
+import { EngineOverviewLogic } from '..';
 import { EuiButtonEmptyTo } from '../../../../shared/react_router_helpers';
 import { ENGINE_ANALYTICS_PATH, ENGINE_API_LOGS_PATH } from '../../../routes';
 import { AnalyticsChart, convertToChartData } from '../../analytics';
@@ -19,7 +20,6 @@ import { DataPanel } from '../../data_panel';
 import { generateEnginePath } from '../../engine';
 
 import { VIEW_ANALYTICS, VIEW_API_LOGS, LAST_7_DAYS } from '../constants';
-import { EngineOverviewLogic } from '../index';
 
 export const TotalCharts: React.FC = () => {
   const { startDate, queriesPerDay, operationsPerDay } = useValues(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx
index 35c6fa439a416..9a5fd0066db37 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
+import { EngineOverviewLogic } from '..';
 import { AnalyticsCards } from '../../analytics';
 import { TOTAL_QUERIES, TOTAL_DOCUMENTS, TOTAL_CLICKS } from '../../analytics/constants';
-import { EngineOverviewLogic } from '../index';
 
 export const TotalStats: React.FC = () => {
   const { totalQueries, documentCount, totalClicks } = useValues(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
index be416b69b1aa9..943158a1935bb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
@@ -14,7 +14,7 @@ import { shallow } from 'enzyme';
 import { EmptyEngineOverview } from './engine_overview_empty';
 import { EngineOverviewMetrics } from './engine_overview_metrics';
 
-import { EngineOverview } from './';
+import { EngineOverview } from '.';
 
 describe('EngineOverview', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
index 6f0454ca73754..69e7cf3053d30 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_logic.test.ts
@@ -15,7 +15,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { EngineOverviewLogic } from './';
+import { EngineOverviewLogic } from '.';
 
 describe('EngineOverviewLogic', () => {
   const { mount } = new LogicMounter(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
index d245b293467f3..66292e0d3618d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview_metrics.tsx
@@ -19,7 +19,7 @@ import { TotalStats, TotalCharts, RecentApiLogs } from './components';
 
 import { SuggestedCurationsCallout } from './components/suggested_curations_callout';
 
-import { EngineOverviewLogic } from './';
+import { EngineOverviewLogic } from '.';
 
 export const EngineOverviewMetrics: React.FC = () => {
   const { loadOverviewMetrics } = useActions(EngineOverviewLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx
index 350412825b996..ceee401b637b1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_meta_engines_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyMetaEnginesState } from './';
+import { EmptyMetaEnginesState } from '.';
 
 describe('EmptyMetaEnginesState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx
index 9117fdd0be87d..8fcb57a510a2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/empty_state.test.tsx
@@ -15,7 +15,7 @@ import { EuiEmptyPrompt } from '@elastic/eui';
 
 import { SampleEngineCreationCta } from '../../sample_engine_creation_cta';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   describe('when the user can manage/create engines', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts
index 4ab9137436ffe..bc954790debba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/__mocks__/engines_logic.mock.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-jest.mock('../../../../engines', () => ({
+jest.mock('../../..', () => ({
   EnginesLogic: { actions: { deleteEngine: jest.fn() } },
 }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
index b0ca36a777838..1e76ab2b749fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
@@ -15,10 +15,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedNumber } from '@kbn/i18n-react';
 
+import { EnginesLogic } from '../..';
 import { MANAGE_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../../../../../shared/constants';
 import { FormattedDateTime } from '../../../../utils/formatted_date_time';
 import { EngineDetails } from '../../../engine/types';
-import { EnginesLogic } from '../../../engines';
 
 import { navigateToEngine } from './engine_link_helpers';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx
index b46dfa7e19dd9..d67f2bd776db2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/test_helpers/shared_columns.tsx
@@ -12,10 +12,9 @@ import { ShallowWrapper } from 'enzyme';
 
 import { EuiBasicTable, EuiButtonIcon } from '@elastic/eui';
 
+import { EnginesLogic } from '../../..';
 import { rerender } from '../../../../../../test_helpers';
 
-import { EnginesLogic } from '../../../../engines';
-
 import * as engineLinkHelpers from '../engine_link_helpers';
 
 export const runSharedColumnsTests = (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts
index 9659745aeb61d..2624df01c5c09 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_logic.test.ts
@@ -18,7 +18,7 @@ import { DEFAULT_META } from '../../../shared/constants';
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 import { EngineDetails, EngineTypes } from '../engine/types';
 
-import { EnginesLogic } from './';
+import { EnginesLogic } from '.';
 
 describe('EnginesLogic', () => {
   const { mount } = new LogicMounter(EnginesLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx
index 90fc47a8d493a..e7d11b0ad5ec5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/engines_overview.test.tsx
@@ -17,7 +17,7 @@ import { rerender } from '../../../test_helpers';
 import { EnginesTable } from './components/tables/engines_table';
 import { MetaEnginesTable } from './components/tables/meta_engines_table';
 
-import { EnginesOverview } from './';
+import { EnginesOverview } from '.';
 
 describe('EnginesOverview', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
index e1c9ea53c0c0b..b307835534dd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorConnecting } from './';
+import { ErrorConnecting } from '.';
 
 describe('ErrorConnecting', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
index 84dcb07a07474..4eb1eb0a3d36b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx
index c6ccdc78b16f3..2cbcf54748661 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.test.tsx
@@ -14,11 +14,10 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 
+import { LogRetentionOptions } from '..';
 import { mountWithIntl } from '../../../../test_helpers';
 
-import { LogRetentionOptions } from '../index';
-
-import { LogRetentionCallout } from './';
+import { LogRetentionCallout } from '.';
 
 describe('LogRetentionCallout', () => {
   const actions = { fetchLogRetention: jest.fn() };
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx
index 6c0f6bd3dd31f..387b98a67eaf1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_callout.tsx
@@ -13,6 +13,7 @@ import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { LogRetentionLogic, LogRetentionOptions, renderLogRetentionDate } from '..';
 import { EuiLinkTo } from '../../../../shared/react_router_helpers';
 
 import { AppLogic } from '../../../app_logic';
@@ -21,8 +22,6 @@ import { ANALYTICS_TITLE } from '../../analytics';
 import { API_LOGS_TITLE } from '../../api_logs';
 import { CRAWLER_TITLE } from '../../crawler';
 
-import { LogRetentionLogic, LogRetentionOptions, renderLogRetentionDate } from '../index';
-
 export const AUDIT_LOGS_TITLE = i18n.translate('xpack.enterpriseSearch.appSearch.audit.title', {
   defaultMessage: 'Audit',
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx
index db5f058b28015..f42dc80fe235d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.test.tsx
@@ -14,9 +14,9 @@ import { shallow, mount } from 'enzyme';
 
 import { EuiIconTip } from '@elastic/eui';
 
-import { LogRetentionOptions, LogRetentionMessage } from '../';
+import { LogRetentionOptions, LogRetentionMessage } from '..';
 
-import { LogRetentionTooltip } from './';
+import { LogRetentionTooltip } from '.';
 
 describe('LogRetentionTooltip', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx
index ac701d4cc067b..98c5c95978a1d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/components/log_retention_tooltip.tsx
@@ -12,10 +12,9 @@ import { useValues, useActions } from 'kea';
 import { EuiIconTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { LogRetentionLogic, LogRetentionMessage, LogRetentionOptions } from '..';
 import { AppLogic } from '../../../app_logic';
 
-import { LogRetentionLogic, LogRetentionMessage, LogRetentionOptions } from '../index';
-
 interface Props {
   type: LogRetentionOptions;
   position?: 'top' | 'right' | 'bottom' | 'left';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts
index 0a41ae4e87266..fba8b118d4d24 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/log_retention_logic.test.ts
@@ -15,7 +15,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { LogRetentionOptions } from './types';
 
-import { LogRetentionLogic } from './';
+import { LogRetentionLogic } from '.';
 
 describe('LogRetentionLogic', () => {
   const { mount } = new LogicMounter(LogRetentionLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx
index 9ae85e65eea99..31c8b4d492752 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/log_retention/messaging/log_retention_message.test.tsx
@@ -15,7 +15,7 @@ import { mountWithIntl } from '../../../../test_helpers';
 
 import { LogRetentionOptions } from '../types';
 
-import { LogRetentionMessage } from './';
+import { LogRetentionMessage } from '.';
 
 describe('LogRetentionMessage', () => {
   const analytics = LogRetentionOptions.Analytics;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx
index fe7ea2d959289..7697fc1ca9b19 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation.test.tsx
@@ -14,7 +14,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { MetaEngineCreation } from './';
+import { MetaEngineCreation } from '.';
 
 const DEFAULT_VALUES = {
   // MetaEngineLogic
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
index 63952bc2a6de7..a0f2cb30e33e6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows.test.tsx
@@ -21,7 +21,7 @@ jest.mock('./multi_input_rows_logic', () => ({
 }));
 import { MultiInputRowsLogic } from './multi_input_rows_logic';
 
-import { MultiInputRows } from './';
+import { MultiInputRows } from '.';
 
 describe('MultiInputRows', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
index 6fed726eb5e0b..add77d2d1e6c3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/not_found/not_found.test.tsx
@@ -13,7 +13,7 @@ import { NotFoundPrompt } from '../../../shared/not_found';
 import { SendAppSearchTelemetry } from '../../../shared/telemetry';
 import { AppSearchPageTemplate } from '../layout';
 
-import { NotFound } from './';
+import { NotFound } from '.';
 
 describe('NotFound', () => {
   const wrapper = shallow(<NotFound />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx
index 4f6c1c4248fe6..10da642cf7248 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 
 import { useActions } from 'kea';
 
+import { RelevanceTuningLogic } from '../..';
 import { MultiInputRows } from '../../../multi_input_rows';
 
-import { RelevanceTuningLogic } from '../../index';
 import { ValueBoost } from '../../types';
 
 interface Props {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx
index 454437a203bc2..371aa1c61095e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx
index 0d09148d3de3f..b2067e90ac94a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/components/value_badge.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { ValueBadge } from './';
+import { ValueBadge } from '.';
 
 describe('ValueBadge', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
index 605c5ee9d7e80..6fb6dee86aea5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts
@@ -18,7 +18,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { Boost, BoostOperation, BoostType, FunctionalBoostFunction } from './types';
 
-import { RelevanceTuningLogic } from './';
+import { RelevanceTuningLogic } from '.';
 
 describe('RelevanceTuningLogic', () => {
   const { mount } = new LogicMounter(RelevanceTuningLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx
index 8798c1a4bc529..99f43e70a6fdc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
index d6802c303807b..e78c1805c6ee7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.test.ts
@@ -113,13 +113,6 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
-    it('setRoleMappings', () => {
-      RoleMappingsLogic.actions.setRoleMappings({ roleMappings: [asRoleMapping] });
-
-      expect(RoleMappingsLogic.values.roleMappings).toEqual([asRoleMapping]);
-      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
-    });
-
     describe('setElasticsearchUser', () => {
       it('sets user', () => {
         RoleMappingsLogic.actions.setElasticsearchUser(elasticsearchUsers[0]);
@@ -323,7 +316,10 @@ describe('RoleMappingsLogic', () => {
   describe('listeners', () => {
     describe('enableRoleBasedAccess', () => {
       it('calls API and sets values', async () => {
-        const setRoleMappingsSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappings');
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
         RoleMappingsLogic.actions.enableRoleBasedAccess();
 
@@ -333,7 +329,7 @@ describe('RoleMappingsLogic', () => {
           '/internal/app_search/role_mappings/enable_role_based_access'
         );
         await nextTick();
-        expect(setRoleMappingsSpy).toHaveBeenCalledWith(mappingsServerProps);
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
       itShowsServerErrorAsFlashMessage(http.post, () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
index 39e7df34f2aca..0579eef8ea5fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_logic.ts
@@ -47,9 +47,6 @@ const emptyUser = { username: '', email: '' } as ElasticsearchUser;
 interface RoleMappingsActions extends RoleMappingsBaseActions {
   setRoleMapping(roleMapping: ASRoleMapping): { roleMapping: ASRoleMapping };
   setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
-  setRoleMappings({ roleMappings }: { roleMappings: ASRoleMapping[] }): {
-    roleMappings: ASRoleMapping[];
-  };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
   handleAccessAllEnginesChange(selected: boolean): { selected: boolean };
   handleEngineSelectionChange(engineNames: string[]): { engineNames: string[] };
@@ -322,8 +319,8 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const route = '/internal/app_search/role_mappings/enable_role_based_access';
 
       try {
-        const response = await http.post<{ roleMappings: ASRoleMapping[] }>(route);
-        actions.setRoleMappings(response);
+        await http.post<{ roleMappings: ASRoleMapping[] }>(route);
+        actions.initializeRoleMappings();
       } catch (e) {
         flashAPIErrors(e);
       }
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx
index c3c1c07f27078..a445b3108c447 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/empty_state.test.tsx
@@ -17,7 +17,7 @@ import { docLinks } from '../../../../shared/doc_links';
 
 import { SchemaAddFieldModal } from '../../../../shared/schema';
 
-import { EmptyState } from './';
+import { EmptyState } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx
index 5d2b5c8a8eacf..cc4d5cfcdb66b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.test.tsx
@@ -13,7 +13,7 @@ import { mount } from 'enzyme';
 
 import { EuiTable, EuiTableHeaderCell, EuiTableRow } from '@elastic/eui';
 
-import { MetaEnginesConflictsTable } from './';
+import { MetaEnginesConflictsTable } from '.';
 
 describe('MetaEnginesConflictsTable', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx
index a37caafe69a59..d433015d8de2c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_conflicts_table.tsx
@@ -24,7 +24,7 @@ import { ENGINES_TITLE } from '../../engines';
 
 import { MetaEngineSchemaLogic } from '../schema_meta_engine_logic';
 
-import { TruncatedEnginesList } from './';
+import { TruncatedEnginesList } from '.';
 
 export const MetaEnginesConflictsTable: React.FC = () => {
   const { conflictingFields } = useValues(MetaEngineSchemaLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx
index e4235336b1d4b..c54a4a5ea32cb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.test.tsx
@@ -13,7 +13,7 @@ import { mount } from 'enzyme';
 
 import { EuiTable, EuiTableHeaderCell, EuiTableRow, EuiTableRowCell } from '@elastic/eui';
 
-import { MetaEnginesSchemaTable } from './';
+import { MetaEnginesSchemaTable } from '.';
 
 describe('MetaEnginesSchemaTable', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx
index 2367ad4e0c53e..207674438e139 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/meta_engines_schema_table.tsx
@@ -25,7 +25,7 @@ import { ENGINES_TITLE } from '../../engines';
 
 import { MetaEngineSchemaLogic } from '../schema_meta_engine_logic';
 
-import { TruncatedEnginesList } from './';
+import { TruncatedEnginesList } from '.';
 
 export const MetaEnginesSchemaTable: React.FC = () => {
   const { schema, fields } = useValues(MetaEngineSchemaLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx
index 452cfe648e28f..09fd2a8b5cd11 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_callouts.test.tsx
@@ -20,7 +20,7 @@ import {
   ConfirmSchemaButton,
 } from './schema_callouts';
 
-import { SchemaCallouts } from './';
+import { SchemaCallouts } from '.';
 
 describe('SchemaCallouts', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx
index bf9596b061acf..65debc9b790e8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/schema_table.test.tsx
@@ -15,7 +15,7 @@ import { EuiTable, EuiTableHeaderCell, EuiTableRow, EuiHealth } from '@elastic/e
 
 import { SchemaFieldTypeSelect } from '../../../../shared/schema';
 
-import { SchemaTable } from './';
+import { SchemaTable } from '.';
 
 describe('SchemaTable', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx
index 193d727be00b5..34e66e7c496fa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/components/truncated_engines_list.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { TruncatedEnginesList } from './';
+import { TruncatedEnginesList } from '.';
 
 describe('TruncatedEnginesList', () => {
   it('renders a list of engines with links to their schema pages', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx
index 4dd7a869ca27e..4c97cbdf0ed48 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job.test.tsx
@@ -16,7 +16,7 @@ import { shallow } from 'enzyme';
 
 import { SchemaErrorsAccordion } from '../../../../shared/schema';
 
-import { ReindexJob } from './';
+import { ReindexJob } from '.';
 
 describe('ReindexJob', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx
index f1713c36045e9..42a09ddc5b345 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_router.test.tsx
@@ -18,7 +18,7 @@ import { rerender } from '../../../test_helpers';
 import { ReindexJob } from './reindex_job';
 import { Schema, MetaEngineSchema } from './views';
 
-import { SchemaRouter } from './';
+import { SchemaRouter } from '.';
 
 describe('SchemaRouter', () => {
   const wrapper = shallow(<SchemaRouter />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx
index 60a0513b774fd..c654ce8d9f601 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/meta_engine_schema.test.tsx
@@ -17,7 +17,7 @@ import { EuiCallOut } from '@elastic/eui';
 
 import { MetaEnginesSchemaTable, MetaEnginesConflictsTable } from '../components';
 
-import { MetaEngineSchema } from './';
+import { MetaEngineSchema } from '.';
 
 describe('MetaEngineSchema', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx
index 02d3fd19afffe..7ec8d4731e550 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/views/schema.test.tsx
@@ -20,7 +20,7 @@ import { getPageHeaderActions, getPageTitle, getPageDescription } from '../../..
 
 import { SchemaCallouts, SchemaTable } from '../components';
 
-import { Schema } from './';
+import { Schema } from '.';
 
 describe('Schema', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx
index f9f0dd611b953..0fb691827c4bc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui.test.tsx
@@ -17,7 +17,7 @@ import { shallow } from 'enzyme';
 import { SearchUIForm } from './components/search_ui_form';
 import { SearchUIGraphic } from './components/search_ui_graphic';
 
-import { SearchUI } from './';
+import { SearchUI } from '.';
 
 describe('SearchUI', () => {
   const actions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts
index 58f6f3d98eb28..7e1bbf6cdb84e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.test.ts
@@ -18,7 +18,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { ActiveField } from './types';
 
-import { SearchUILogic } from './';
+import { SearchUILogic } from '.';
 
 describe('SearchUILogic', () => {
   const { mount } = new LogicMounter(SearchUILogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
index ddbf046d75ec1..647f4589295d6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
@@ -11,7 +11,7 @@ import { AppSearchPageTemplate } from '../layout';
 
 import { LogRetentionPanel, LogRetentionConfirmationModal } from './log_retention';
 
-import { SETTINGS_TITLE } from './';
+import { SETTINGS_TITLE } from '.';
 
 export const Settings: React.FC = () => {
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx
index 0b4a86870a69d..9a059e1d2015c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.test.tsx
@@ -12,7 +12,7 @@ import { shallow } from 'enzyme';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SetupGuideLayout } from '../../../shared/setup_guide';
 
-import { SetupGuide } from './';
+import { SetupGuide } from '.';
 
 describe('SetupGuide', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx
index cdfdbadf6759c..cb059a5b86e7d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.test.tsx
@@ -13,7 +13,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { docLinks } from '../../../../shared/doc_links';
 
-import { EmptyState, SynonymModal } from './';
+import { EmptyState, SynonymModal } from '.';
 
 describe('EmptyState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx
index ac8383ccea9ee..ef5e1dafa443f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/empty_state.tsx
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 
 import { SYNONYMS_DOCS_URL } from '../../../routes';
 
-import { SynonymModal, SynonymIcon } from './';
+import { SynonymModal, SynonymIcon } from '.';
 
 export const EmptyState: React.FC = () => {
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx
index 7a1ba289865ee..a617c9286cc2a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCard, EuiButton } from '@elastic/eui';
 
-import { SynonymCard, SynonymIcon } from './';
+import { SynonymCard, SynonymIcon } from '.';
 
 describe('SynonymCard', () => {
   const MOCK_SYNONYM_SET = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx
index 9670abc4a09e5..28f6a251240cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_card.tsx
@@ -11,12 +11,12 @@ import { useActions } from 'kea';
 
 import { EuiCard, EuiFlexGroup, EuiFlexItem, EuiText, EuiButton } from '@elastic/eui';
 
+import { SynonymsLogic } from '..';
 import { MANAGE_BUTTON_LABEL } from '../../../../shared/constants';
 
-import { SynonymsLogic } from '../index';
 import { SynonymSet } from '../types';
 
-import { SynonymIcon } from './';
+import { SynonymIcon } from '.';
 
 export const SynonymCard: React.FC<SynonymSet> = (synonymSet) => {
   const { openModal } = useActions(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx
index 8120532fbd6f6..9418c3f396c5e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_icon.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SynonymIcon } from './';
+import { SynonymIcon } from '.';
 
 describe('SynonymIcon', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx
index 15b74d1cdbca9..ec0dde74ecf32 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.test.tsx
@@ -15,7 +15,7 @@ import { EuiModal } from '@elastic/eui';
 
 import { MultiInputRows } from '../../multi_input_rows';
 
-import { SynonymModal } from './';
+import { SynonymModal } from '.';
 
 describe('SynonymModal', () => {
   const MOCK_SYNONYM_SET = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx
index 3db4f4b732675..5df254768faac 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/components/synonym_modal.tsx
@@ -22,6 +22,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { SynonymsLogic } from '..';
 import {
   CANCEL_BUTTON_LABEL,
   DELETE_BUTTON_LABEL,
@@ -31,7 +32,6 @@ import { FlashMessages } from '../../../../shared/flash_messages';
 import { MultiInputRows } from '../../multi_input_rows';
 
 import { SYNONYM_CREATE_TITLE, SYNONYM_UPDATE_TITLE, DELETE_CONFIRMATION } from '../constants';
-import { SynonymsLogic } from '../index';
 
 export const SynonymModal: React.FC = () => {
   const { isModalOpen, modalLoading, activeSynonymSet } = useValues(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx
index 64ac3066b51a5..11a04825e2f20 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.test.tsx
@@ -19,7 +19,7 @@ import { rerender, getPageHeaderActions } from '../../../test_helpers';
 
 import { SynonymCard, SynonymModal } from './components';
 
-import { Synonyms } from './';
+import { Synonyms } from '.';
 
 describe('Synonyms', () => {
   const MOCK_SYNONYM_SET = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx
index 4a68bc381f764..14108f11487b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms.tsx
@@ -18,7 +18,7 @@ import { AppSearchPageTemplate } from '../layout';
 import { SynonymCard, SynonymModal, EmptyState } from './components';
 import { SYNONYMS_TITLE } from './constants';
 
-import { SynonymsLogic } from './';
+import { SynonymsLogic } from '.';
 
 export const Synonyms: React.FC = () => {
   const { loadSynonyms, onPaginate, openModal } = useActions(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts
index b00619359f6c8..92f07030e76b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/synonyms/synonyms_logic.test.ts
@@ -18,7 +18,7 @@ import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
 import { SYNONYMS_PAGE_META } from './constants';
 
-import { SynonymsLogic } from './';
+import { SynonymsLogic } from '.';
 
 describe('SynonymsLogic', () => {
   const { mount } = new LogicMounter(SynonymsLogic);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 9e45f833162c9..19cfa874fc76c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -33,7 +33,7 @@ import { RoleMappings } from './components/role_mappings';
 import { Settings } from './components/settings';
 import { SetupGuide } from './components/setup_guide';
 
-import { AppSearch, AppSearchUnconfigured, AppSearchConfigured } from './';
+import { AppSearch, AppSearchUnconfigured, AppSearchConfigured } from '.';
 
 describe('AppSearch', () => {
   it('always renders the Setup Guide', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts
index f7464d1861265..74a2b78410db0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/encode_path_params/index.test.ts
@@ -7,7 +7,7 @@
 
 import { mockUseParams } from '../../../__mocks__/react_router';
 
-import { encodePathParams, generateEncodedPath, useDecodedParams } from './';
+import { encodePathParams, generateEncodedPath, useDecodedParams } from '.';
 
 describe('encodePathParams', () => {
   it('encodeURIComponent()s all object values', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx
index 47d1fe6b69d56..d29c58bca81e2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/formatted_date_time/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { mountWithIntl } from '../../../test_helpers';
 
-import { FormattedDateTime } from './';
+import { FormattedDateTime } from '.';
 
 describe('FormattedDateTime', () => {
   it('renders a standard i18n-friendly combined date & time stamp', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts
index 2eb7f5cb3cdfb..ccf1bf0bd9272 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/recursively_fetch_engines/index.test.ts
@@ -11,7 +11,7 @@ import { nextTick } from '@kbn/test-jest-helpers';
 
 import { itShowsServerErrorAsFlashMessage } from '../../../test_helpers';
 
-import { recursivelyFetchEngines } from './';
+import { recursivelyFetchEngines } from '.';
 
 describe('recursivelyFetchEngines', () => {
   const { http } = mockHttpValues;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
index b9db9e11d2a8d..af0a31945d61f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
@@ -7,7 +7,7 @@
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../../../common/__mocks__';
 
-import { getRoleAbilities } from './';
+import { getRoleAbilities } from '.';
 
 describe('getRoleAbilities', () => {
   const mockRole = DEFAULT_INITIAL_APP_DATA.appSearch.role as any;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts
index ecbf885ac3b5c..f63b80e4ce894 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/has_scoped_engines.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { roleHasScopedEngines } from './';
+import { roleHasScopedEngines } from '.';
 
 describe('roleHasScopedEngines', () => {
   it('returns false for owner and admin roles', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx
index e1c9ea53c0c0b..b307835534dd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorConnecting } from './';
+import { ErrorConnecting } from '.';
 
 describe('ErrorConnecting', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx
index 5787af231e2ec..3922084352e15 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/error_connecting/error_connecting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SetEnterpriseSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx
index b0d40cf1ccca4..a7757c6410c82 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/nav.test.tsx
@@ -12,7 +12,7 @@ jest.mock('../search_index/index_nav', () => ({
   useSearchIndicesNav: () => [],
 }));
 
-import { useEnterpriseSearchContentNav } from './';
+import { useEnterpriseSearchContentNav } from '.';
 
 describe('useEnterpriseSearchContentNav', () => {
   it('returns an array of top-level Enterprise Search nav items', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx
index c9fcf95474544..8f01c875a625f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/not_found/not_found.test.tsx
@@ -13,7 +13,7 @@ import { NotFoundPrompt } from '../../../shared/not_found';
 import { SendEnterpriseSearchTelemetry } from '../../../shared/telemetry';
 import { EnterpriseSearchContentPageTemplate } from '../layout';
 
-import { NotFound } from './';
+import { NotFound } from '.';
 
 describe('NotFound', () => {
   const wrapper = shallow(<NotFound />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx
index daa79a5c75299..306389ad0018d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index_router.test.tsx
@@ -12,7 +12,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { SearchIndexRouter } from './';
+import { SearchIndexRouter } from '.';
 
 describe('SearchIndexRouter', () => {
   it('renders Search index routes', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx
index bb6297c55f145..51f2e8c5dc719 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices_router.test.tsx
@@ -12,7 +12,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
-import { SearchIndicesRouter } from './';
+import { SearchIndicesRouter } from '.';
 
 describe('SearchIndicesRouter', () => {
   it('renders Search index routes', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx
index 0672d4c7eca30..4d96af036d52f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/index.test.tsx
@@ -28,7 +28,7 @@ import {
   EnterpriseSearchContent,
   EnterpriseSearchContentUnconfigured,
   EnterpriseSearchContentConfigured,
-} from './';
+} from '.';
 
 describe('EnterpriseSearchContent', () => {
   it('always renders the Setup Guide', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx
index 8f30abf2daaa0..a6070724bb878 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_cloud_id/elasticsearch_cloud_id.test.tsx
@@ -13,7 +13,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiButtonIcon, EuiCopy, EuiFieldText } from '@elastic/eui';
 
-import { ElasticsearchCloudId } from './';
+import { ElasticsearchCloudId } from '.';
 
 const execCommandMock = (global.document.execCommand = jest.fn());
 const warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx
index 7dce063701072..07849ce476268 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/elasticsearch_guide/elasticsearch_guide.test.tsx
@@ -13,7 +13,7 @@ import { EuiSteps, EuiSelect } from '@elastic/eui';
 
 import { ElasticsearchClientInstructions } from '../elasticsearch_client_instructions';
 
-import { ElasticsearchGuide } from './';
+import { ElasticsearchGuide } from '.';
 
 describe('Elasticsearch Guide Component', () => {
   let wrapper: ShallowWrapper;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
index e1c9ea53c0c0b..b307835534dd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorConnecting } from './';
+import { ErrorConnecting } from '.';
 
 describe('ErrorConnecting', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
index 979847b4cf1c6..b0299930d514d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/error_connecting/error_connecting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SendEnterpriseSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx
index 2551628ddcfe3..411bda5dfe2be 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/layout/nav.test.tsx
@@ -9,7 +9,7 @@ jest.mock('../../../shared/layout', () => ({
   generateNavLink: jest.fn(({ to, items }) => ({ href: to, items })),
 }));
 
-import { useEnterpriseSearchOverviewNav } from './';
+import { useEnterpriseSearchOverviewNav } from '.';
 
 describe('useEnterpriseSearchOverviewNav', () => {
   it('returns an array of top-level Enterprise Search nav items', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
index 75a9700691ebb..746a681452973 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/license_callout/license_callout.test.tsx
@@ -15,7 +15,7 @@ import { EuiPanel, EuiText } from '@elastic/eui';
 
 import { ManageLicenseButton } from '../../../shared/licensing';
 
-import { LicenseCallout } from './';
+import { LicenseCallout } from '.';
 
 describe('LicenseCallout', () => {
   it('renders when non-platinum or on trial', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
index d15cb817f9064..e19f731611d01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_card/product_card.test.tsx
@@ -16,7 +16,7 @@ import { EuiCard } from '@elastic/eui';
 import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { EuiButtonTo } from '../../../shared/react_router_helpers';
 
-import { ProductCard } from './';
+import { ProductCard } from '.';
 
 describe('ProductCard', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
index 0af49e71880ab..0a6b331b36540 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.test.tsx
@@ -21,7 +21,7 @@ import { ProductCard } from '../product_card';
 import { SetupGuideCta } from '../setup_guide';
 import { TrialCallout } from '../trial_callout';
 
-import { ProductSelector } from './';
+import { ProductSelector } from '.';
 
 const props = {
   access: {},
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
index 4ed45acdfbbae..d525e6ec4eb52 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/product_selector/product_selector.tsx
@@ -20,14 +20,15 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import { Chat } from '@kbn/cloud-plugin/public';
 import { i18n } from '@kbn/i18n';
 
 import {
   KibanaPageTemplate,
   KibanaPageTemplateSolutionNavAvatar,
   NO_DATA_PAGE_TEMPLATE_PROPS,
-} from '../../../../../../../../src/plugins/kibana_react/public';
-import { Chat } from '../../../../../../cloud/public';
+} from '@kbn/kibana-react-plugin/public';
+
 import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { docLinks } from '../../../shared/doc_links';
 import { KibanaLogic } from '../../../shared/kibana';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
index 44f06de7ff137..be42627debc73 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide.test.tsx
@@ -12,7 +12,7 @@ import { shallow } from 'enzyme';
 import { SetEnterpriseSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SetupGuideLayout } from '../../../shared/setup_guide';
 
-import { SetupGuide } from './';
+import { SetupGuide } from '.';
 
 describe('SetupGuide', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
index dd18d0d59c056..2516382914d6e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/setup_guide/setup_guide_cta.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SetupGuideCta } from './';
+import { SetupGuideCta } from '.';
 
 describe('SetupGuideCta', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
index 72958acacb034..add9ea062a179 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/components/trial_callout/trial_callout.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { TrialCallout } from './';
+import { TrialCallout } from '.';
 
 describe('TrialCallout', () => {
   it('renders when non-platinum or on trial', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
index e5d883ee819f7..50bec925e1ce8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_overview/index.test.tsx
@@ -18,7 +18,7 @@ import { ErrorConnecting } from './components/error_connecting';
 import { ProductSelector } from './components/product_selector';
 import { SetupGuide } from './components/setup_guide';
 
-import { EnterpriseSearchOverview } from './';
+import { EnterpriseSearchOverview } from '.';
 
 describe('EnterpriseSearchOverview', () => {
   it('renders the Setup Guide and Product Selector', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index cb47dfe124780..c8722adfebbd2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -9,17 +9,17 @@ import React from 'react';
 
 import { getContext } from 'kea';
 
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { licensingMock } from '../../../licensing/public/mocks';
-import { securityMock } from '../../../security/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 
 import { AppSearch } from './app_search';
 import { EnterpriseSearchOverview } from './enterprise_search_overview';
 import { KibanaLogic } from './shared/kibana';
 import { WorkplaceSearch } from './workplace_search';
 
-import { renderApp, renderHeaderActions } from './';
+import { renderApp, renderHeaderActions } from '.';
 
 describe('renderApp', () => {
   const kibanaDeps = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index 62c9835b5aec6..45179f6b55deb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -13,13 +13,11 @@ import { Router } from 'react-router-dom';
 import { getContext, resetContext } from 'kea';
 import { Store } from 'redux';
 
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { AppMountParameters, CoreStart } from '../../../../../src/core/public';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+
 import { InitialAppData } from '../../common/types';
 import { PluginsStart, ClientConfigType, ClientData } from '../plugin';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts
index b14af1c69795a..6b98606649331 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { docLinksServiceMock } from '../../../../../../../src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
-import { docLinks } from './';
+import { docLinks } from '.';
 
 describe('DocLinks', () => {
   it('setDocLinks', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
index 6030609e8a1a0..5911b76e723a3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 class DocLinks {
   public appSearchApis: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts
index 784e09671013a..01d5eb741cb01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/enterprise_search_url/external_url.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { externalUrl, getEnterpriseSearchUrl, getAppSearchUrl, getWorkplaceSearchUrl } from './';
+import { externalUrl, getEnterpriseSearchUrl, getAppSearchUrl, getWorkplaceSearchUrl } from '.';
 
 describe('Enterprise Search external URL helpers', () => {
   describe('getter/setter tests', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx
index 38b12d8070fa1..867702b8326ab 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.test.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 
 import { mountWithIntl } from '../../test_helpers';
 
-import { ErrorStatePrompt } from './';
+import { ErrorStatePrompt } from '.';
 
 describe('ErrorState', () => {
   const values = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
index d807f1d2322ff..4e2ee38b8a464 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
@@ -10,11 +10,10 @@ import React, { useEffect } from 'react';
 import { useValues } from 'kea';
 
 import { EuiEmptyPrompt, EuiCode, EuiLink, EuiCodeBlock } from '@elastic/eui';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { CloudSetup } from '../../../../../cloud/public';
-
 import { HttpLogic } from '../http';
 import { KibanaLogic } from '../kibana';
 import { EuiButtonTo, EuiLinkTo } from '../react_router_helpers';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
index 40863087004d6..20a20ddba6ab8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
+import { HttpResponse } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
-import { HttpResponse } from 'src/core/public';
-
 import { FlashMessagesLogic } from './flash_messages_logic';
 import { flashErrorToast } from './set_message_helpers';
 import { IFlashMessage } from './types';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
index 4151cd67882ff..1d4372ca5b734 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
@@ -7,7 +7,7 @@
 
 import { resetContext } from 'kea';
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import { HttpLogic, HttpValues, mountHttpLogic } from './http_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
index 9b9600e2ce8f4..f9b3a758885cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
@@ -7,7 +7,7 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { HttpSetup, HttpInterceptorResponseError, HttpResponse } from 'src/core/public';
+import { HttpSetup, HttpInterceptorResponseError, HttpResponse } from '@kbn/core/public';
 
 import { ERROR_CONNECTING_HEADER, READ_ONLY_MODE_HEADER } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
index 704542bca918f..873357e0528af 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
@@ -10,10 +10,10 @@ import { FC } from 'react';
 import { History } from 'history';
 import { kea, MakeLogicType } from 'kea';
 
-import { ApplicationStart, ChromeBreadcrumb } from '../../../../../../../src/core/public';
-import { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
-import { CloudSetup } from '../../../../../cloud/public';
-import { SecurityPluginStart } from '../../../../../security/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
+import { ApplicationStart, ChromeBreadcrumb } from '@kbn/core/public';
+import { SecurityPluginStart } from '@kbn/security-plugin/public';
 
 import { HttpLogic } from '../http';
 import { createHref, CreateHrefOptions } from '../react_router_helpers';
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 d396aba895587..f4867468d5477 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
@@ -32,7 +32,7 @@ jest.mock('./generate_title', () => ({
 }));
 import { enterpriseSearchTitle, appSearchTitle, workplaceSearchTitle } from './generate_title';
 
-import { SetEnterpriseSearchChrome, SetAppSearchChrome, SetWorkplaceSearchChrome } from './';
+import { SetEnterpriseSearchChrome, SetAppSearchChrome, SetWorkplaceSearchChrome } from '.';
 
 describe('Set Kibana Chrome helpers', () => {
   const mockCurrentPath = (pathname: string) =>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
index 22c976dfa7638..37082a23f4440 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
@@ -13,7 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
-import { KibanaPageTemplate } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+
 import { FlashMessages } from '../flash_messages';
 import { Loading } from '../loading';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
index 934d571418d0e..0597ea1b0dbbe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
@@ -13,10 +13,7 @@ import { useValues } from 'kea';
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  KibanaPageTemplate,
-  KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate, KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 
 import { FlashMessages } from '../flash_messages';
 import { HttpLogic } from '../http';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
index 5d210cee1a926..85a26abeef1e1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
@@ -8,7 +8,7 @@
 import { resetContext } from 'kea';
 import { BehaviorSubject } from 'rxjs';
 
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 
 import { LicensingLogic, mountLicensingLogic } from './licensing_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
index f94a1fff0cd31..ca7bf87e130bf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
@@ -8,7 +8,7 @@
 import { kea, MakeLogicType } from 'kea';
 import { Observable, Subscription } from 'rxjs';
 
-import { ILicense } from '../../../../../licensing/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 
 interface LicensingValues {
   license: ILicense | null;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx
index 07c71def01bed..ec96ca66c706c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/manage_license_button.test.tsx
@@ -13,11 +13,11 @@ import { shallow } from 'enzyme';
 
 import { EuiButton } from '@elastic/eui';
 
-import { docLinks } from '../../shared/doc_links';
+import { docLinks } from '../doc_links';
 
 import { EuiButtonTo } from '../react_router_helpers';
 
-import { ManageLicenseButton } from './';
+import { ManageLicenseButton } from '.';
 
 describe('ManageLicenseButton', () => {
   describe('when the user can access license management', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
index eb3e5f027a2d4..21ebdc92c6af4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/loading/loading.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiLoadingLogo, EuiLoadingSpinner } from '@elastic/eui';
 
-import { Loading, LoadingOverlay } from './';
+import { Loading, LoadingOverlay } from '.';
 
 describe('Loading', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
index 683b378942558..11ae0dbeafa76 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EntSearchLogStream } from './';
+import { EntSearchLogStream } from '.';
 
 const fakeSourceId = 'fake-source-id';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
index e7e796797cbac..bd06139cd18a1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { LogStream, LogStreamProps } from '../../../../../infra/public';
+import { LogStream, LogStreamProps } from '@kbn/infra-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 /*
  * EnterpriseSearchLogStream is a light wrapper on top of infra's embeddable LogStream component.
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
index c21aeff2780b6..0301d4528b7ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found_prompt.test.tsx
@@ -15,7 +15,7 @@ import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
 import { EuiButtonTo } from '../react_router_helpers';
 
-import { NotFoundPrompt } from './';
+import { NotFoundPrompt } from '.';
 
 describe('NotFoundPrompt', () => {
   const subject = (props?: object) =>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts
index fea67df216f77..20254c59439c4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/query_params/query_params.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { parseQueryParams } from './';
+import { parseQueryParams } from '.';
 
 describe('parseQueryParams', () => {
   it('parse query strings', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts
index 2ffe87279d44f..146624e8462dc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.test.ts
@@ -7,9 +7,9 @@
 
 import { mockHistory } from '../../__mocks__/react_router';
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { createHref } from './';
+import { createHref } from '.';
 
 describe('createHref', () => {
   const dependencies = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts
index ea28fc4d440c5..a399d632140b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/create_href.ts
@@ -7,7 +7,7 @@
 
 import { History } from 'history';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 /**
  * This helper uses React Router's createHref function to generate links with router basenames included.
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx
index df942ea10975f..357d60f588469 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-jest.mock('./', () => ({
+jest.mock('.', () => ({
   generateReactRouterProps: ({ to }: { to: string }) => ({
     href: `/app/enterprise_search${to}`,
     onClick: () => {},
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
index e47c02be84232..a48827de4b86b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.tsx
@@ -24,7 +24,7 @@ import {
 } from '@elastic/eui';
 import { EuiPanelProps } from '@elastic/eui/src/components/panel/panel';
 
-import { generateReactRouterProps, ReactRouterProps } from './';
+import { generateReactRouterProps, ReactRouterProps } from '.';
 
 /**
  * Correctly typed component helpers with React-Router-friendly `href` and `onClick` props
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts
index dc8bf28a44407..05e00eb8cc3a6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.test.ts
@@ -8,7 +8,7 @@
 import { mockKibanaValues } from '../../__mocks__/kea_logic';
 import { mockHistory } from '../../__mocks__/react_router';
 
-import { generateReactRouterProps } from './';
+import { generateReactRouterProps } from '.';
 
 describe('generateReactRouterProps', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts
index d80eca19207bd..994468721856f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/generate_react_router_props.ts
@@ -10,7 +10,7 @@ import React from 'react';
 import { HttpLogic } from '../http';
 import { KibanaLogic } from '../kibana';
 
-import { letBrowserHandleEvent, createHref } from './';
+import { letBrowserHandleEvent, createHref } from '.';
 
 /**
  * Generates the `href` and `onClick` props for React-Router-friendly links
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts
index 9668ca69c73bb..1046f47f8f380 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/link_events.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { letBrowserHandleEvent } from '../react_router_helpers';
+import { letBrowserHandleEvent } from '.';
 
 describe('letBrowserHandleEvent', () => {
   const event = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
index 5bae7b00dda10..c5b1cfc866b08 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/deactivated_user_callout.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { DeactivatedUserCallout } from './';
+import { DeactivatedUserCallout } from '.';
 
 describe('DeactivatedUserCallout', () => {
   it('renders with new', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
index bcaf26ccf2cfc..5f4ba7ba4cb7a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
@@ -22,7 +22,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { CANCEL_BUTTON_LABEL } from '../../shared/constants/actions';
+import { CANCEL_BUTTON_LABEL } from '../constants/actions';
 
 import {
   ROLE_MAPPING_FLYOUT_CREATE_TITLE,
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
index b325863b54430..516882922223b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/roles_empty_prompt.tsx
@@ -11,7 +11,8 @@ import { useValues } from 'kea';
 
 import { EuiEmptyPrompt, EuiButton, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
 
-import type { AuthenticatedUser } from '../../../../../security/public';
+import type { AuthenticatedUser } from '@kbn/security-plugin/public';
+
 import { KibanaLogic } from '../kibana/kibana_logic';
 import { ProductName } from '../types';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
index 5c4eac2d93f33..a8c96b874fec9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/types.ts
@@ -7,7 +7,7 @@
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { AttributeName, ElasticsearchUser } from '../../shared/types';
+import { AttributeName, ElasticsearchUser } from '../types';
 
 export interface RoleMappingsBaseServerDetails {
   attributes: string[];
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
index 05ccafbe3e38f..f14e1ec20154f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_added_info.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { UserAddedInfo } from './';
+import { UserAddedInfo } from '.';
 
 describe('UserAddedInfo', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
index 9e516192772d6..2ca96706db4d0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_flyout.test.tsx
@@ -19,7 +19,7 @@ import {
   UPDATE_USER_DESCRIPTION,
 } from './constants';
 
-import { UserFlyout } from './';
+import { UserFlyout } from '.';
 
 describe('UserFlyout', () => {
   const closeUserFlyout = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
index d5272a26715b6..920704baddf91 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_invitation_callout.test.tsx
@@ -13,7 +13,7 @@ import { EuiText, EuiButtonIcon, EuiCopy } from '@elastic/eui';
 
 import { EXISTING_INVITATION_LABEL } from './constants';
 
-import { UserInvitationCallout } from './';
+import { UserInvitationCallout } from '.';
 
 describe('UserInvitationCallout', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
index bc700268d46fc..874c506e57bc9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.test.tsx
@@ -17,7 +17,7 @@ import { RoleTypes as ASRole } from '../../app_search/types';
 
 import { REQUIRED_LABEL, USERNAME_NO_USERS_TEXT } from './constants';
 
-import { UserSelector } from './';
+import { UserSelector } from '.';
 
 const simulatedEvent = {
   target: { value: 'foo' },
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
index 077ef44c66b2f..a1c456d518d8e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/user_selector.tsx
@@ -18,11 +18,11 @@ import {
 } from '@elastic/eui';
 
 import { RoleTypes as ASRole } from '../../app_search/types';
-import { ElasticsearchUser } from '../../shared/types';
 import { Role as WSRole } from '../../workplace_search/types';
 
 import { USERNAME_LABEL, EMAIL_LABEL } from '../constants';
 import { docLinks } from '../doc_links';
+import { ElasticsearchUser } from '../types';
 
 const SMTP_URL = `${docLinks.enterpriseSearchMailService}`;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
index 9110c09827c49..74989b3ebddca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_empty_prompt.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 
-import { UsersEmptyPrompt } from './';
+import { UsersEmptyPrompt } from '.';
 
 describe('UsersEmptyPrompt', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
index 9bae93079e89f..fe7dfb841d0e3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_heading.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiButton, EuiText, EuiTitle } from '@elastic/eui';
 
-import { UsersHeading } from './';
+import { UsersHeading } from '.';
 
 describe('UsersHeading', () => {
   const onClick = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
index 02204d7079b0c..b890d1a257cb1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.test.tsx
@@ -24,7 +24,7 @@ import { engines } from '../../app_search/__mocks__/engines.mock';
 
 import { UsersAndRolesRowActions } from './users_and_roles_row_actions';
 
-import { UsersTable } from './';
+import { UsersTable } from '.';
 
 describe('UsersTable', () => {
   const initializeSingleUserRoleMapping = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
index 4caeeada29b7b..44c2a78b090f5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/users_table.tsx
@@ -11,8 +11,8 @@ import { EuiBadge, EuiBasicTableColumn, EuiInMemoryTable, EuiTextColor } from '@
 import type { EuiSearchBarOnChangeArgs } from '@elastic/eui';
 
 import { ASRoleMapping } from '../../app_search/types';
-import { SingleUserRoleMapping } from '../../shared/types';
 import { WSRoleMapping } from '../../workplace_search/types';
+import { SingleUserRoleMapping } from '../types';
 
 import {
   INVITATION_PENDING_LABEL,
@@ -27,7 +27,7 @@ import {
   ENGINES_LABEL,
 } from './constants';
 
-import { UsersAndRolesRowActions } from './';
+import { UsersAndRolesRowActions } from '.';
 
 interface AccessItem {
   name: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx
index e81f530f02ee9..8da4a7d6abce1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.test.tsx
@@ -12,10 +12,10 @@ import { shallow, mount } from 'enzyme';
 import { EuiForm, EuiFieldText, EuiModal } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { SchemaFieldTypeSelect } from '../index';
+import { SchemaFieldTypeSelect } from '..';
 import { SchemaType } from '../types';
 
-import { SchemaAddFieldModal } from './';
+import { SchemaAddFieldModal } from '.';
 
 describe('SchemaAddFieldModal', () => {
   const addNewField = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx
index 6b85ba4f681f9..32191abbbae21 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/add_field_modal/index.tsx
@@ -24,9 +24,9 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { SchemaFieldTypeSelect } from '..';
 import { CANCEL_BUTTON_LABEL } from '../../constants';
 import { FIELD_NAME, FIELD_TYPE } from '../constants';
-import { SchemaFieldTypeSelect } from '../index';
 import { SchemaType } from '../types';
 
 import {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
index 19d04ea3de17e..0ba15ed5fbf2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
@@ -15,7 +15,7 @@ import { EuiLinkTo } from '../../react_router_helpers';
 
 import { SchemaType } from '../types';
 
-import { SchemaErrorsAccordion } from './';
+import { SchemaErrorsAccordion } from '.';
 
 describe('SchemaErrorsAccordion', () => {
   const props = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx
index 332317fde1835..8e11e572c69f2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/errors_callout/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { SchemaErrorsCallout } from './';
+import { SchemaErrorsCallout } from '.';
 
 describe('SchemaErrorsCallout', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx
index 6d51a06273712..c3bd26947244d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/field_type_select/index.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiSelect } from '@elastic/eui';
 
-import { SchemaFieldTypeSelect } from './';
+import { SchemaFieldTypeSelect } from '.';
 
 describe('SchemaFieldTypeSelect', () => {
   const updateExistingFieldType = jest.fn();
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx
index e33b9d29689c4..34edb9eb8be7b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/setup_guide.test.tsx
@@ -18,7 +18,7 @@ import { rerender } from '../../test_helpers';
 import { CloudSetupInstructions } from './cloud/instructions';
 import { SetupInstructions } from './instructions';
 
-import { SetupGuideLayout } from './';
+import { SetupGuideLayout } from '.';
 
 describe('SetupGuideLayout', () => {
   let wrapper: ShallowWrapper;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts
index 32059f4dc7ae5..ea9297acae0a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/table_pagination/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { convertMetaToPagination, handlePageChange, updateMetaPageIndex } from './';
+import { convertMetaToPagination, handlePageChange, updateMetaPageIndex } from '.';
 
 describe('convertMetaToPagination', () => {
   expect(
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx
index bd9b7fb5bfbe3..3ec501b1e79ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/send_telemetry.test.tsx
@@ -16,7 +16,7 @@ import {
   SendEnterpriseSearchTelemetry,
   SendAppSearchTelemetry,
   SendWorkplaceSearchTelemetry,
-} from './';
+} from '.';
 
 describe('Telemetry component helpers', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
index f9bf55b4fe800..6d8329fa64979 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { TruncatedContent } from './';
+import { TruncatedContent } from '.';
 
 const content = 'foobarbaz';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
index e4738d0af8bca..56ee678742933 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { truncate, truncateBeginning } from './';
+import { truncate, truncateBeginning } from '.';
 
 import './truncated_content.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx
index f60ccf2d19e50..38630969010df 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/version_mismatch/version_mismatch_page.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { VersionMismatchError } from './version_mismatch_error';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts b/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts
index 8f17edf6628fa..0340f7d130b5d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/test_helpers/error_handling.ts
@@ -7,8 +7,8 @@
 
 import { mockFlashMessageHelpers } from '../__mocks__/kea_logic';
 
+import { HttpHandler } from '@kbn/core/public';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { HttpHandler } from 'src/core/public';
 
 export const itShowsServerErrorAsFlashMessage = (httpMethod: HttpHandler, callback: () => void) => {
   const { flashAPIErrors } = mockFlashMessageHelpers;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx
index 9df11ab2308da..4cd5250ae058e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiHeader, EuiPopover } from '@elastic/eui';
 
-import { AccountHeader } from './';
+import { AccountHeader } from '.';
 
 describe('AccountHeader', () => {
   const mockValues = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx
index 188949b2539c2..58b5065e7dbda 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/kibana_header_actions.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { externalUrl } from '../../../shared/enterprise_search_url';
 
-import { WorkplaceSearchHeaderActions } from './';
+import { WorkplaceSearchHeaderActions } from '.';
 
 describe('WorkplaceSearchHeaderActions', () => {
   const ENT_SEARCH_URL = 'http://localhost:3002';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
index 01df4bdd02d55..1e73c6156619e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/nav.test.tsx
@@ -18,7 +18,7 @@ jest.mock('../../views/settings/components/settings_sub_nav', () => ({
   useSettingsSubNav: () => [],
 }));
 
-import { useWorkplaceSearchNav } from './';
+import { useWorkplaceSearchNav } from '.';
 
 describe('useWorkplaceSearchNav', () => {
   it('returns an array of top-level Workplace Search nav items', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx
index 6847e91d46f6e..b916f401480d9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.test.tsx
@@ -14,12 +14,11 @@ import { shallow } from 'enzyme';
 
 import { EuiCallOut } from '@elastic/eui';
 
+import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '..';
 import { FlashMessages } from '../../../../shared/flash_messages';
 import { SetWorkplaceSearchChrome } from '../../../../shared/kibana_chrome';
 import { Loading } from '../../../../shared/loading';
 
-import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '../index';
-
 import { PersonalDashboardLayout } from './personal_dashboard_layout';
 
 describe('PersonalDashboardLayout', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx
index 141c87325a08d..dfbed1a0d2007 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/personal_dashboard_layout/personal_dashboard_layout.tsx
@@ -19,6 +19,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '..';
 import { FlashMessages } from '../../../../shared/flash_messages';
 import { HttpLogic } from '../../../../shared/http';
 import { SetWorkplaceSearchChrome } from '../../../../shared/kibana_chrome';
@@ -27,7 +28,6 @@ import { Loading } from '../../../../shared/loading';
 
 import { PRIVATE_SOURCES_PATH, PERSONAL_SETTINGS_PATH } from '../../../routes';
 import { PERSONAL_DASHBOARD_READ_ONLY_MODE_WARNING } from '../../../views/content_sources/constants';
-import { AccountHeader, AccountSettingsSidebar, PrivateSourcesSidebar } from '../index';
 
 import './personal_dashboard_layout.scss';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx
index 32f21c158736f..a08fe0fc0a999 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/api_key/api_key.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCodeBlock, EuiFormLabel } from '@elastic/eui';
 
-import { ApiKey } from './';
+import { ApiKey } from '.';
 
 const key = '123abc';
 const label = 'foo';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts
index 5b893250235f7..238082054e53a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/index.ts
@@ -15,13 +15,17 @@ import googleDrive from './google_drive.svg';
 import jira from './jira.svg';
 import jiraServer from './jira_server.svg';
 import loadingSmall from './loading_small.svg';
+import networkDrive from './network_drive.svg';
 import oneDrive from './onedrive.svg';
+import outlook from './outlook.svg';
 import salesforce from './salesforce.svg';
 import serviceNow from './servicenow.svg';
 import sharePoint from './sharepoint.svg';
 import sharePointServer from './sharepoint_server.svg';
 import slack from './slack.svg';
+import teams from './teams.svg';
 import zendesk from './zendesk.svg';
+import zoom from './zoom.svg';
 
 export const images = {
   box,
@@ -42,12 +46,16 @@ export const images = {
   jiraServer,
   jiraCloud: jira,
   loadingSmall,
+  networkDrive,
   oneDrive,
+  outlook,
   salesforce,
   salesforceSandbox: salesforce,
   serviceNow,
   sharePoint,
   sharePointServer,
   slack,
+  teams,
   zendesk,
+  zoom,
 } as { [key: string]: string };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/network_drive.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/network_drive.svg
new file mode 100644
index 0000000000000..cc07fbbc50877
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/network_drive.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m0 0h100v100h-100z"/></clipPath><g clip-path="url(#a)"><path d="m50.8142 23.5717h-4.2c4.143 8.1938 6.3015 17.2469 6.3015 26.4286 0 9.1816-2.1585 18.2347-6.3015 26.4285h4.5714c7.0093 0 13.7316-2.7844 18.6879-7.7407s7.7407-11.6785 7.7407-18.6878-2.7844-13.7315-7.7407-18.6879c-4.9563-4.9563-11.6786-7.7407-18.6879-7.7407zm-.8142-23.5857279c-6.6174-.0042253-13.1691 1.3119779-19.2715 3.8714579 5.3516 4.32083 9.9142 9.53597 13.4857 15.41427h8.0714l.0715.0857c7.7784.5043 15.0733 3.9498 20.4037 9.637s8.2968 13.1897 8.2968 20.9844-2.9664 15.2973-8.2968 20.9845-12.6253 9.1327-20.4037 9.6369l-.0715.1001h-8.0714c-3.5715 5.8782-8.1341 11.0935-13.4857 15.4143 6.8282 2.8556 14.2051 4.1594 21.5985 3.8181 7.3933-.3415 14.6186-2.3201 21.1544-5.7929 6.5358-3.4729 12.2191-8.3534 16.6398-14.2894 4.4206-5.936 7.4683-12.7794 8.9231-20.0362 1.4547-7.2568 1.2807-14.7461-.5104-21.9274-1.791-7.1813-5.1539-13.8753-9.846-19.5991s-10.5964-10.33458-17.2868-13.49953c-6.6903-3.16494-13.9999-4.8051405-21.4011-4.8021979zm-10.8714 19.2857279c-3.4579-5.1394-7.7617-9.65573-12.7287-13.35712-7.308 3.93332-13.5268 9.61712-18.09986 16.54282 4.21966-2.0886 8.86316-3.1785 13.57146-3.1857zm0 61.4286h-17.2571c-4.7102-.005-9.3553-1.1002-13.57146-3.2 4.57606 6.9408 10.80566 12.6353 18.12846 16.5714 4.9508-3.7106 9.2437-8.2257 12.7001-13.3571zm2.6428-4.2858c4.4971-8.0826 6.8574-17.1791 6.8574-26.4285 0-9.2495-2.3603-18.346-6.8574-26.4286h-19.8999c-6.6584-.0024-13.07027 2.5194-17.94297 7.0571-.04357.1274-.09606.2515-.15712.3715 1.44454-1.374 3.03486-2.586 4.74278-3.6143-1.70792 1.0283-3.29824 2.2403-4.74278 3.6143-5.02806 12.1627-5.02806 25.823 0 37.9857.06106.12.11355.244.15712.3714 4.87578 4.5328 11.28557 7.0539 17.94297 7.0571z" fill="#0060d5"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/outlook.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/outlook.svg
new file mode 100644
index 0000000000000..932a3756a522b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/outlook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="62" height="62" viewBox="19 19 62 62" fill="none"><g clip-path="url(#C)"><path d="M83.65 51.55a1.49 1.49 0 0 0-.71-1.279h-.008l-.028-.016-23.095-13.671a3.15 3.15 0 0 0-.31-.184 3.1 3.1 0 0 0-2.843 0 3.15 3.15 0 0 0-.31.184L33.252 50.256l-.028.016c-.706.439-.922 1.367-.483 2.073.129.208.308.381.519.505L56.355 66.52a3.48 3.48 0 0 0 .31.184 3.1 3.1 0 0 0 2.843 0 3.48 3.48 0 0 0 .31-.184l23.095-13.671c.461-.269.743-.765.738-1.299z" fill="#0a2767"/><path d="M35.944 42.422H51.1v13.893H35.944V42.422zM80.55 28.3v-6.355A2.88 2.88 0 0 0 77.74 19H38.41a2.88 2.88 0 0 0-2.81 2.945V28.3l23.25 6.2 21.7-6.2z" fill="#0364b8"/><path d="M35.6 28.3h15.5v13.95H35.6V28.3z" fill="#0078d4"/><path d="M66.6 28.3H51.1v13.95L66.6 56.2h13.95V42.25L66.6 28.3z" fill="#28a8ea"/><path d="M51.1 42.25h15.5V56.2H51.1V42.25z" fill="#0078d4"/><path d="M51.1 56.2h15.5v13.95H51.1V56.2z" fill="#0364b8"/><path d="M35.944 56.315H51.1v12.629H35.944V56.315z" fill="#14447d"/><path d="M66.6 56.2h13.95v13.95H66.6V56.2z" fill="#0078d4"/><path d="M82.94 52.764l-.029.016-23.095 12.989-.31.174a3.22 3.22 0 0 1-1.252.31l-1.262-.738c-.107-.053-.21-.113-.31-.178L33.277 51.978h-.011l-.766-.428v26.294A3.18 3.18 0 0 0 35.698 81h44.804c.026 0 .05-.012.078-.012a3.92 3.92 0 0 0 1.085-.226 3.13 3.13 0 0 0 .436-.226c.104-.059.282-.187.282-.187a3.13 3.13 0 0 0 1.268-2.503V51.55c-.001.503-.272.967-.71 1.214z" fill="url(#A)"/><path opacity=".5" d="M82.41 51.446v1.612L58.261 69.685 33.26 51.989c0-.009-.007-.016-.016-.016l-2.294-1.379v-1.163l.945-.015 2 1.147.046.016.17.109 23.56 13.438.899.527a4.29 4.29 0 0 1 .248-.093c.047-.031 23.328-13.128 23.328-13.128l.264.016z" fill="#0a2767"/><path d="M82.94 52.764l-.029.017L59.816 65.77l-.31.174a3.24 3.24 0 0 1-2.843 0 3.52 3.52 0 0 1-.31-.174L33.258 52.781l-.028-.017c-.446-.242-.725-.706-.73-1.214v26.294c.011 1.754 1.442 3.167 3.196 3.156h44.758c1.754.011 3.185-1.402 3.196-3.156V51.55c-.001.503-.272.967-.71 1.214z" fill="#1490df"/><g fill="#000"><path opacity=".1" d="M60.152 65.578l-.346.194a3.35 3.35 0 0 1-.31.175 3.21 3.21 0 0 1-1.218.322l8.787 10.391 15.328 3.694a3.16 3.16 0 0 0 .972-1.214L60.152 65.578z"/><path opacity=".05" d="M61.717 64.697l-1.911 1.074c-.1.064-.204.122-.31.175a3.21 3.21 0 0 1-1.218.322l4.117 11.351 20.003 2.73c.788-.592 1.252-1.519 1.252-2.505v-.339L61.717 64.697z"/></g><path d="M35.74 81h44.71c.688.004 1.359-.214 1.914-.62L56.99 65.517c-.107-.054-.21-.113-.31-.178L33.275 51.981h-.011l-.764-.431v26.204c-.002 1.791 1.449 3.244 3.239 3.246z" fill="#28a8ea"/><g fill="#000"><path opacity=".1" d="M54.2 34.241v33.061a2.85 2.85 0 0 1-1.783 2.635 2.67 2.67 0 0 1-1.054.217H32.5V32.95h3.1V31.4h15.764a2.85 2.85 0 0 1 2.837 2.841z"/><path opacity=".2" d="M52.65 35.791v33.061c.004.374-.075.745-.233 1.085-.43 1.061-1.459 1.757-2.604 1.762H32.5V32.95h17.313a2.6 2.6 0 0 1 1.287.326 2.82 2.82 0 0 1 1.55 2.516z"/><path opacity=".2" d="M52.65 35.791v29.962a2.86 2.86 0 0 1-2.837 2.847H32.5V32.95h17.313a2.6 2.6 0 0 1 1.287.326 2.82 2.82 0 0 1 1.55 2.516z"/><path opacity=".2" d="M51.1 35.791v29.961a2.85 2.85 0 0 1-2.837 2.847H32.5V32.95h15.764a2.84 2.84 0 0 1 2.837 2.84z"/></g><path d="M19.841 32.95h28.418a2.84 2.84 0 0 1 2.841 2.841v28.418a2.84 2.84 0 0 1-2.841 2.841H19.841A2.84 2.84 0 0 1 17 64.209V35.791a2.84 2.84 0 0 1 2.841-2.841z" fill="url(#B)"/><path d="M25.88 44.866c.7-1.492 1.831-2.741 3.246-3.585 1.567-.897 3.352-1.345 5.157-1.293 1.673-.036 3.324.388 4.773 1.226a8.19 8.19 0 0 1 3.157 3.425c.761 1.568 1.14 3.294 1.107 5.038a11.67 11.67 0 0 1-1.139 5.27c-.715 1.474-1.847 2.707-3.255 3.545-1.504.864-3.216 1.299-4.951 1.259a9.33 9.33 0 0 1-4.878-1.24c-1.374-.813-2.484-2.005-3.199-3.432-.765-1.546-1.149-3.252-1.119-4.977-.032-1.806.345-3.596 1.102-5.236zm3.46 8.417c.373.943 1.006 1.761 1.826 2.359a4.77 4.77 0 0 0 2.852.859c1.084.043 2.153-.268 3.044-.887a5.14 5.14 0 0 0 1.773-2.359 9.16 9.16 0 0 0 .566-3.291 10.02 10.02 0 0 0-.533-3.332 5.27 5.27 0 0 0-1.717-2.458c-.869-.648-1.935-.976-3.018-.93a4.92 4.92 0 0 0-2.919.867 5.41 5.41 0 0 0-1.86 2.379c-.846 2.186-.851 4.608-.012 6.797l-.002-.003z" fill="#fff"/><path d="M66.6 28.3h13.95v13.95H66.6V28.3z" fill="#50d9ff"/></g><defs><linearGradient id="A" x1="58.075" y1="51.55" x2="58.075" y2="81" gradientUnits="userSpaceOnUse"><stop stop-color="#35b8f1"/><stop offset="1" stop-color="#28a8ea"/></linearGradient><linearGradient id="B" x1="22.924" y1="30.73" x2="45.176" y2="69.27" gradientUnits="userSpaceOnUse"><stop stop-color="#1784d9"/><stop offset=".5" stop-color="#107ad5"/><stop offset="1" stop-color="#0a63c9"/></linearGradient><clipPath id="C"><path fill="#fff" transform="translate(17 19)" d="M0 0h66.65v62H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/teams.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/teams.svg
new file mode 100644
index 0000000000000..bf3aef9277eb6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/teams.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62" height="62" viewBox="19 19 62 62" fill="none"><g clip-path="url(#B)"><g fill="#5059c9"><path d="M62.246 42.628h16.015a2.74 2.74 0 0 1 2.74 2.74v14.587a10.07 10.07 0 0 1-10.068 10.069h-.048a10.07 10.07 0 0 1-10.07-10.067V44.06a1.43 1.43 0 0 1 1.432-1.432zm10.824-2.884a6.49 6.49 0 0 0 6.488-6.488 6.49 6.49 0 0 0-6.488-6.488 6.49 6.49 0 0 0-6.488 6.488 6.49 6.49 0 0 0 6.488 6.488z"/></g><g fill="#7b83eb"><path d="M52.884 39.744c5.176 0 9.372-4.196 9.372-9.372S58.06 21 52.884 21s-9.372 4.196-9.372 9.372 4.196 9.372 9.372 9.372zm12.496 2.884H38.945a2.71 2.71 0 0 0-2.643 2.773v16.638c-.209 8.972 6.889 16.417 15.86 16.636 8.971-.22 16.069-7.665 15.861-16.636V45.401a2.71 2.71 0 0 0-2.643-2.773z"/></g><g fill="#000"><path opacity=".1" d="M53.605 42.628v23.315c-.007 1.069-.655 2.03-1.644 2.437-.315.133-.653.202-.995.202H37.571l-.505-1.442c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h14.664z"/><path opacity=".2" d="M52.163 42.628v24.757c0 .342-.069.68-.202.995-.407.989-1.368 1.636-2.437 1.644H38.249l-.678-1.442a14.29 14.29 0 0 1-.505-1.442c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h13.222z"/><path opacity=".2" d="M52.163 42.628v21.873a2.66 2.66 0 0 1-2.639 2.639H37.067c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h13.222z"/><path opacity=".2" d="M50.721 42.628v21.873a2.66 2.66 0 0 1-2.639 2.639H37.067c-.505-1.654-.762-3.375-.764-5.104V45.396c-.035-1.493 1.146-2.731 2.639-2.768h11.78z"/><path opacity=".1" d="M53.605 35.174v4.542l-.721.029c-.245 0-.476-.014-.721-.029a7.91 7.91 0 0 1-1.442-.231 9.37 9.37 0 0 1-6.488-5.508c-.199-.465-.353-.948-.462-1.442h7.195a2.65 2.65 0 0 1 2.639 2.638z"/><use xlink:href="#C" opacity=".2"/><use xlink:href="#C" opacity=".2"/><path opacity=".2" d="M50.721 36.615v2.869a9.37 9.37 0 0 1-6.488-5.508h3.85a2.65 2.65 0 0 1 2.639 2.639z"/></g><path d="M21.643 33.977h26.435c1.46 0 2.643 1.183 2.643 2.643v26.435c0 1.46-1.183 2.643-2.643 2.643H21.643c-1.46 0-2.643-1.183-2.643-2.643V36.62c0-1.46 1.183-2.643 2.643-2.643z" fill="url(#A)"/><path d="M41.816 44.038h-5.284v14.39h-3.367v-14.39h-5.26v-2.791h13.911v2.791z" fill="#fff"/></g><defs><linearGradient id="A" x1="24.511" y1="31.911" x2="45.21" y2="67.763" gradientUnits="userSpaceOnUse"><stop stop-color="#5a62c3"/><stop offset=".5" stop-color="#4d55bd"/><stop offset="1" stop-color="#3940ab"/></linearGradient><clipPath id="B"><path fill="#fff" transform="translate(19 21)" d="M0 0h62v57.674H0z"/></clipPath><path id="C" d="M52.163 36.615v3.1a7.91 7.91 0 0 1-1.442-.231 9.37 9.37 0 0 1-6.489-5.508h5.292a2.65 2.65 0 0 1 2.639 2.639z"/></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/zoom.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/zoom.svg
new file mode 100644
index 0000000000000..d7498817bc62d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/source_icons/zoom.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="62" height="62" viewBox="19 19 62 62" fill="none"><path d="M19 39.46C19 28.16 28.16 19 39.46 19h21.08C71.84 19 81 28.16 81 39.46v21.08C81 71.84 71.84 81 60.54 81H39.46C28.16 81 19 71.84 19 60.54V39.46z" fill="url(#A)"/><path d="M32.764 42.56a2.23 2.23 0 0 1 2.232-2.232h16.678c3.287 0 5.952 2.665 5.952 5.952v11.16a2.23 2.23 0 0 1-2.232 2.232H38.716c-3.287 0-5.952-2.665-5.952-5.952V42.56zm26.164 4.981a3.75 3.75 0 0 1 1.348-2.876l4.163-3.454c1.581-1.312 2.859-.706 2.859 1.348v14.88c0 2.054-1.278 2.66-2.859 1.348l-4.163-3.454a3.75 3.75 0 0 1-1.348-2.876v-4.918z" fill="#fff"/><defs><linearGradient id="A" x1="50" y1="-49.26" x2="50" y2="148.862" gradientUnits="userSpaceOnUse"><stop stop-color="#57a2ff"/><stop offset="1" stop-color="#3c82fb"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx
index 991c7a061b4bb..16ba01e4e57ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/component_loader/component_loader.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiLoadingSpinner, EuiTextColor } from '@elastic/eui';
 
-import { ComponentLoader } from './';
+import { ComponentLoader } from '.';
 
 describe('ComponentLoader', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx
index 9301ebb85582f..6e060ee4f2e5a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/content_section/content_section.test.tsx
@@ -13,7 +13,7 @@ import { EuiSpacer } from '@elastic/eui';
 
 import { ViewContentHeader } from '../view_content_header';
 
-import { ContentSection } from './';
+import { ContentSection } from '.';
 
 const props = {
   children: <div className="children" />,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx
index 101d1e0eb2239..023707459566f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiCopy, EuiButtonIcon, EuiFieldText } from '@elastic/eui';
 
-import { CredentialItem } from './';
+import { CredentialItem } from '.';
 
 const label = 'Credential';
 const testSubj = 'CredentialItemTest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx
index 97abb3929f985..4fdb17eae0acd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_badge/license_badge.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiBadge } from '@elastic/eui';
 
-import { LicenseBadge } from './';
+import { LicenseBadge } from '.';
 
 describe('LicenseBadge', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx
index 6133bd30eec16..5be6a508fd74f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/product_button/product_button.test.tsx
@@ -14,7 +14,7 @@ import { shallow } from 'enzyme';
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { ProductButton } from './';
+import { ProductButton } from '.';
 
 describe('ProductButton', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
index 68f83d935aadc..ec7742e68dd84 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiIcon } from '@elastic/eui';
 
-import { SourceIcon } from './';
+import { SourceIcon } from '.';
 
 describe('SourceIcon', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
index b19aa44446f75..03f5afba25be0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
@@ -15,7 +15,7 @@ import { EuiTableRow, EuiSwitch, EuiIcon } from '@elastic/eui';
 
 import { SourceIcon } from '../source_icon';
 
-import { SourceRow } from './';
+import { SourceRow } from '.';
 
 const onToggle = jest.fn();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
index 63ca5e8153d41..00ae2d2d9b214 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
@@ -15,7 +15,7 @@ import { EuiTable, EuiTableHeaderCell } from '@elastic/eui';
 
 import { SourceRow } from '../source_row';
 
-import { SourcesTable } from './';
+import { SourcesTable } from '.';
 
 const onToggle = jest.fn();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx
index c1c18b51f9fd3..5abc4af128680 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/status_item/status_item.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiPopover, EuiCopy, EuiButton, EuiButtonIcon } from '@elastic/eui';
 
-import { StatusItem } from './';
+import { StatusItem } from '.';
 
 describe('SourceRow', () => {
   const details = ['foo', 'bar'];
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
index d22ddcce49dc4..a0c8337ae795d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlexGroup, EuiTablePagination } from '@elastic/eui';
 
-import { TablePaginationBar } from './';
+import { TablePaginationBar } from '.';
 
 const onChange = jest.fn();
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
index f15c74ed1054b..ea3b1cde69cf9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
@@ -13,7 +13,7 @@ import { shallow } from 'enzyme';
 
 import { EuiTableRow } from '@elastic/eui';
 
-import { UserRow } from './';
+import { UserRow } from '.';
 
 describe('SourcesTable', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx
index 9b96e1deabe65..aec065266e0ba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/view_content_header/view_content_header.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { EuiFlexGroup } from '@elastic/eui';
 
-import { ViewContentHeader } from './';
+import { ViewContentHeader } from '.';
 
 const props = {
   title: 'Header',
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
index 5a06cd0907187..f7a1bf1261406 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -173,9 +173,18 @@ export const SOURCE_NAMES = {
     'xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.jiraServer',
     { defaultMessage: 'Jira (Server)' }
   ),
+  NETWORK_DRVE: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.networkDrive',
+    {
+      defaultMessage: 'Network Drive',
+    }
+  ),
   ONEDRIVE: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.oneDrive', {
     defaultMessage: 'OneDrive',
   }),
+  OUTLOOK: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.outlook', {
+    defaultMessage: 'Outlook',
+  }),
   SALESFORCE: i18n.translate(
     'xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.salesforce',
     { defaultMessage: 'Salesforce' }
@@ -199,9 +208,15 @@ export const SOURCE_NAMES = {
   SLACK: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.slack', {
     defaultMessage: 'Slack',
   }),
+  TEAMS: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.teams', {
+    defaultMessage: 'Teams',
+  }),
   ZENDESK: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zendesk', {
     defaultMessage: 'Zendesk',
   }),
+  ZOOM: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.zoom', {
+    defaultMessage: 'Zoom',
+  }),
   CUSTOM: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.sourceNames.custom', {
     defaultMessage: 'Custom API Source',
   }),
@@ -336,6 +351,39 @@ export const SOURCE_OBJ_TYPES = {
   ),
 };
 
+export const SOURCE_CATEGORIES = {
+  CLOUD: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud', {
+    defaultMessage: 'Cloud',
+  }),
+  COMMUNICATIONS: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.categories.communications',
+    {
+      defaultMessage: 'Communications',
+    }
+  ),
+  FILE_SHARING: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing',
+    {
+      defaultMessage: 'File Sharing',
+    }
+  ),
+  MICROSOFT: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft', {
+    defaultMessage: 'Microsoft',
+  }),
+  OFFICE_365: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.office', {
+    defaultMessage: 'Office 365',
+  }),
+  PRODUCTIVITY: i18n.translate(
+    'xpack.enterpriseSearch.workplaceSearch.sources.categories.productivity',
+    {
+      defaultMessage: 'Productivity',
+    }
+  ),
+  STORAGE: i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.storage', {
+    defaultMessage: 'Storage',
+  }),
+};
+
 export const API_KEYS_TITLE = i18n.translate(
   'xpack.enterpriseSearch.workplaceSearch.sources.apiKeysTitle',
   {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index c4944e36ea188..f68d1cb3b3d0b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -23,7 +23,7 @@ import { ErrorState } from './views/error_state';
 import { Overview } from './views/overview';
 import { SetupGuide } from './views/setup_guide';
 
-import { WorkplaceSearch, WorkplaceSearchUnconfigured, WorkplaceSearchConfigured } from './';
+import { WorkplaceSearch, WorkplaceSearchUnconfigured, WorkplaceSearchConfigured } from '.';
 
 describe('WorkplaceSearch', () => {
   it('renders VersionMismatchPage when there are mismatching versions', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts
index 36df182b99b85..648aeb5fd000d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/get_as_local_datetime_string.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getAsLocalDateTimeString } from './';
+import { getAsLocalDateTimeString } from '.';
 
 describe('getAsLocalDateTimeString', () => {
   it('returns localized date if string can be parsed as date', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts
index 48b874484a0ce..4aafb729aaa77 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/mime_types.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mimeType } from './';
+import { mimeType } from '.';
 
 describe('mimeType', () => {
   it('should return correct mimeType when present', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts
index 2aedbbb798f58..44822b31e4d19 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/utils/read_uploaded_file_as_base64.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { readUploadedFileAsBase64 } from './';
+import { readUploadedFileAsBase64 } from '.';
 
 describe('readUploadedFileAsBase64', () => {
   it('reads a file and returns base64 string', async () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx
index c675a57ab18d8..c89a1647af331 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.test.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { AccountSettings } from './';
+import { AccountSettings } from '.';
 
 describe('AccountSettings', () => {
   const {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx
index b26650875f3ef..4173dcdca0724 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx
@@ -9,7 +9,8 @@ import React, { useState, useEffect, useMemo } from 'react';
 
 import { useValues } from 'kea';
 
-import type { AuthenticatedUser } from '../../../../../../security/public';
+import type { AuthenticatedUser } from '@kbn/security-plugin/public';
+
 import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
 import { PersonalDashboardLayout } from '../../components/layout';
 import { ACCOUNT_SETTINGS_TITLE } from '../../constants';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx
index de87d82d8712e..9e5e3ac2782ee 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_custom_source/save_custom.tsx
@@ -19,11 +19,12 @@ import {
   EuiTitle,
   EuiPanel,
   EuiCallOut,
+  EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { EuiButtonTo, EuiLinkTo } from '../../../../../../shared/react_router_helpers';
+import { EuiButtonTo } from '../../../../../../shared/react_router_helpers';
 import { AppLogic } from '../../../../../app_logic';
 import { SOURCES_PATH, getSourcesPath } from '../../../../../routes';
 
@@ -104,13 +105,13 @@ export const SaveCustom: React.FC = () => {
                 heading="h3"
                 size="s"
                 title={
-                  <EuiLinkTo target="_blank" to={'https://www.elastic.co/kibana/feedback'}>
+                  <EuiLink href="https://www.elastic.co/kibana/feedback" external>
                     <FormattedMessage
                       id="xpack.enterpriseSearch.workplaceSearch.sources.feedbackLinkLabel"
                       defaultMessage="Have feedback about deploying a {name} connector? Let us know."
                       values={{ name }}
                     />
-                  </EuiLinkTo>
+                  </EuiLink>
                 }
                 iconType="email"
               />
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx
index 97225144a3324..5a2558f141ea0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_external_connector/external_connector_config.tsx
@@ -31,9 +31,10 @@ import { SourceDataItem } from '../../../../../types';
 
 import { staticExternalSourceData } from '../../../source_data';
 
-import { AddSourceHeader } from './../add_source_header';
-import { ConfigDocsLinks } from './../config_docs_links';
-import { OAUTH_SAVE_CONFIG_BUTTON, OAUTH_BACK_BUTTON } from './../constants';
+import { AddSourceHeader } from '../add_source_header';
+import { ConfigDocsLinks } from '../config_docs_links';
+import { OAUTH_SAVE_CONFIG_BUTTON, OAUTH_BACK_BUTTON } from '../constants';
+
 import { ExternalConnectorDocumentation } from './external_connector_documentation';
 import { ExternalConnectorFormFields } from './external_connector_form_fields';
 import { ExternalConnectorLogic } from './external_connector_logic';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx
index fbcb8685f7ff9..06815ab3330f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/available_sources_list.test.tsx
@@ -26,7 +26,7 @@ describe('AvailableSourcesList', () => {
     const wrapper = shallow(<AvailableSourcesList sources={mergedAvailableSources} />);
 
     expect(wrapper.find(EuiTitle)).toHaveLength(1);
-    expect(wrapper.find('[data-test-subj="AvailableSourceListItem"]')).toHaveLength(20);
+    expect(wrapper.find('[data-test-subj="AvailableSourceListItem"]')).toHaveLength(24);
     expect(wrapper.find('[data-test-subj="CustomAPISourceLink"]')).toHaveLength(1);
   });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx
index f0e81748a6561..5b23368289f1a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.test.tsx
@@ -24,12 +24,12 @@ describe('ConfiguredSourcesList', () => {
   it('renders', () => {
     const wrapper = shallow(<ConfiguredSourcesList {...props} />);
 
-    expect(wrapper.find('[data-test-subj="UnConnectedTooltip"]')).toHaveLength(16);
+    expect(wrapper.find('[data-test-subj="UnConnectedTooltip"]')).toHaveLength(20);
     expect(wrapper.find('[data-test-subj="AccountOnlyTooltip"]')).toHaveLength(2);
-    expect(wrapper.find('[data-test-subj="ConfiguredSourcesListItem"]')).toHaveLength(19);
+    expect(wrapper.find('[data-test-subj="ConfiguredSourcesListItem"]')).toHaveLength(23);
   });
 
-  it('does not show connect button for a connected external source', () => {
+  it('does show connect button for a connected external source', () => {
     const wrapper = shallow(
       <ConfiguredSourcesList
         {...{
@@ -38,7 +38,7 @@ describe('ConfiguredSourcesList', () => {
         }}
       />
     );
-    expect(wrapper.find(EuiButtonEmptyTo)).toHaveLength(0);
+    expect(wrapper.find(EuiButtonEmptyTo)).toHaveLength(1);
   });
 
   it('does show connect button for an unconnected external source', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
index 6e4e4dcec2ba0..bbec096ae07d8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configured_sources_list.tsx
@@ -124,39 +124,32 @@ export const ConfiguredSourcesList: React.FC<ConfiguredSourcesProps> = ({
                     </EuiFlexGroup>
                   </EuiSplitPanel.Inner>
                   <EuiSplitPanel.Inner color="subdued" paddingSize="none">
-                    {
-                      // TODO: Remove this once external connectors are multi-tenant
-                      // This prevents connecting more than one external content source
-                      (serviceType !== 'external' || !connected) &&
-                        (((!isOrganization || (isOrganization && !accountContextOnly)) && (
-                          <EuiButtonEmptyTo
-                            className="eui-fullWidth"
-                            to={`${getSourcesPath(getAddPath(serviceType), isOrganization)}/${
-                              hasMultipleConnectorOptions(sourceData) && isOrganization
-                                ? ''
-                                : 'connect'
-                            }`}
-                          >
-                            {!connected
-                              ? i18n.translate(
-                                  'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton',
-                                  {
-                                    defaultMessage: 'Connect',
-                                  }
-                                )
-                              : i18n.translate(
-                                  'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton',
-                                  {
-                                    defaultMessage: 'Connect another',
-                                  }
-                                )}
-                          </EuiButtonEmptyTo>
-                        )) || (
-                          <EuiButtonEmpty className="eui-fullWidth" isDisabled>
-                            {ADD_SOURCE_ORG_SOURCES_TITLE}
-                          </EuiButtonEmpty>
-                        ))
-                    }
+                    {((!isOrganization || (isOrganization && !accountContextOnly)) && (
+                      <EuiButtonEmptyTo
+                        className="eui-fullWidth"
+                        to={`${getSourcesPath(getAddPath(serviceType), isOrganization)}/${
+                          hasMultipleConnectorOptions(sourceData) && isOrganization ? '' : 'connect'
+                        }`}
+                      >
+                        {!connected
+                          ? i18n.translate(
+                              'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectButton',
+                              {
+                                defaultMessage: 'Connect',
+                              }
+                            )
+                          : i18n.translate(
+                              'xpack.enterpriseSearch.workplaceSearch.contentSource.configuredSources.connectAnotherButton',
+                              {
+                                defaultMessage: 'Connect another',
+                              }
+                            )}
+                      </EuiButtonEmptyTo>
+                    )) || (
+                      <EuiButtonEmpty className="eui-fullWidth" isDisabled>
+                        {ADD_SOURCE_ORG_SOURCES_TITLE}
+                      </EuiButtonEmpty>
+                    )}
                   </EuiSplitPanel.Inner>
                 </EuiSplitPanel.Outer>
               </EuiCard>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
index 0ae176dbef019..3e850277c0b72 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.test.tsx
@@ -40,9 +40,9 @@ describe('ConnectInstance', () => {
     redirectFormCreated();
   });
 
-  const credentialsSourceData = staticSourceData[13];
-  const oauthSourceData = staticSourceData[0];
-  const subdomainSourceData = staticSourceData[18];
+  const credentialsSourceData = staticSourceData[15]; // salesforce_sandbox
+  const oauthSourceData = staticSourceData[0]; // box
+  const subdomainSourceData = staticSourceData[21]; // zendesk
 
   const props = {
     ...credentialsSourceData,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx
index c2c53bc33a64a..d660b4499e210 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx
@@ -43,7 +43,7 @@ import {
 } from '../../../constants';
 import { getEditPath } from '../../../routes';
 import { handlePrivateKeyUpload } from '../../../utils';
-import { AddSourceLogic } from '../components/add_source/add_source_logic';
+
 import {
   SOURCE_SETTINGS_HEADING,
   SOURCE_SETTINGS_TITLE,
@@ -59,6 +59,8 @@ import {
 } from '../constants';
 import { SourceLogic } from '../source_logic';
 
+import { AddSourceLogic } from './add_source/add_source_logic';
+
 import { DownloadDiagnosticsButton } from './download_diagnostics_button';
 
 import { SourceLayout } from './source_layout';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
index 258fa97da6e7e..282de2590df7f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
@@ -9,7 +9,12 @@ import { i18n } from '@kbn/i18n';
 
 import { docLinks } from '../../../shared/doc_links';
 
-import { SOURCE_NAMES, SOURCE_OBJ_TYPES, GITHUB_LINK_TITLE } from '../../constants';
+import {
+  SOURCE_CATEGORIES,
+  SOURCE_NAMES,
+  SOURCE_OBJ_TYPES,
+  GITHUB_LINK_TITLE,
+} from '../../constants';
 import { FeatureIds, SourceDataItem } from '../../types';
 
 export const staticExternalSourceData: SourceDataItem = {
@@ -23,7 +28,7 @@ export const staticExternalSourceData: SourceDataItem = {
     documentationUrl: docLinks.workplaceSearchExternalSharePointOnline,
     applicationPortalUrl: 'https://portal.azure.com/',
   },
-  objTypes: [SOURCE_OBJ_TYPES.FOLDERS, SOURCE_OBJ_TYPES.SITES, SOURCE_OBJ_TYPES.ALL_FILES],
+  objTypes: [SOURCE_OBJ_TYPES.ALL_STORED_FILES],
   features: {
     basicOrgContext: [
       FeatureIds.SyncFrequency,
@@ -366,6 +371,23 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
+  {
+    name: SOURCE_NAMES.NETWORK_DRVE,
+    iconName: SOURCE_NAMES.NETWORK_DRVE,
+    categories: [SOURCE_CATEGORIES.STORAGE],
+    serviceType: 'network_drive', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-network-drive-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
   {
     name: SOURCE_NAMES.ONEDRIVE,
     iconName: SOURCE_NAMES.ONEDRIVE,
@@ -395,6 +417,27 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
+  {
+    name: SOURCE_NAMES.OUTLOOK,
+    iconName: SOURCE_NAMES.OUTLOOK,
+    categories: [
+      SOURCE_CATEGORIES.COMMUNICATIONS,
+      SOURCE_CATEGORIES.PRODUCTIVITY,
+      SOURCE_CATEGORIES.MICROSOFT,
+    ],
+    serviceType: 'outlook', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-outlook-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
   {
     name: SOURCE_NAMES.SALESFORCE,
     iconName: SOURCE_NAMES.SALESFORCE,
@@ -431,7 +474,6 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
-
   {
     name: SOURCE_NAMES.SALESFORCE_SANDBOX,
     iconName: SOURCE_NAMES.SALESFORCE_SANDBOX,
@@ -527,7 +569,6 @@ export const staticSourceData: SourceDataItem[] = [
         FeatureIds.SyncedItems,
       ],
     },
-
     accountContextOnly: false,
     internalConnectorAvailable: true,
     externalConnectorAvailable: true,
@@ -537,21 +578,11 @@ export const staticSourceData: SourceDataItem[] = [
     name: SOURCE_NAMES.SHAREPOINT_SERVER,
     iconName: SOURCE_NAMES.SHAREPOINT_SERVER,
     categories: [
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.fileSharing', {
-        defaultMessage: 'File Sharing',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.storage', {
-        defaultMessage: 'Storage',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.cloud', {
-        defaultMessage: 'Cloud',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.microsoft', {
-        defaultMessage: 'Microsoft',
-      }),
-      i18n.translate('xpack.enterpriseSearch.workplaceSearch.sources.categories.office', {
-        defaultMessage: 'Office 365',
-      }),
+      SOURCE_CATEGORIES.FILE_SHARING,
+      SOURCE_CATEGORIES.STORAGE,
+      SOURCE_CATEGORIES.CLOUD,
+      SOURCE_CATEGORIES.MICROSOFT,
+      SOURCE_CATEGORIES.OFFICE_365,
     ],
     serviceType: 'share_point_server', // this doesn't exist on the BE
     configuration: {
@@ -588,7 +619,27 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: true,
     internalConnectorAvailable: true,
   },
-
+  {
+    name: SOURCE_NAMES.TEAMS,
+    iconName: SOURCE_NAMES.TEAMS,
+    categories: [
+      SOURCE_CATEGORIES.COMMUNICATIONS,
+      SOURCE_CATEGORIES.PRODUCTIVITY,
+      SOURCE_CATEGORIES.MICROSOFT,
+    ],
+    serviceType: 'teams', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-teams-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
   {
     name: SOURCE_NAMES.ZENDESK,
     iconName: SOURCE_NAMES.ZENDESK,
@@ -618,6 +669,23 @@ export const staticSourceData: SourceDataItem[] = [
     accountContextOnly: false,
     internalConnectorAvailable: true,
   },
+  {
+    name: SOURCE_NAMES.ZOOM,
+    iconName: SOURCE_NAMES.ZOOM,
+    categories: [SOURCE_CATEGORIES.COMMUNICATIONS, SOURCE_CATEGORIES.PRODUCTIVITY],
+    serviceType: 'zoom', // this doesn't exist on the BE
+    configuration: {
+      isPublicKey: false,
+      hasOauthRedirect: false,
+      needsBaseUrl: false,
+      documentationUrl: docLinks.workplaceSearchCustomSources, // TODO Update this when we have a doclink
+      applicationPortalUrl: '',
+      githubRepository: 'elastic/enterprise-search-zoom-connector',
+    },
+    accountContextOnly: false,
+    internalConnectorAvailable: false,
+    customConnectorAvailable: true,
+  },
 ];
 
 export const staticCustomSourceData: SourceDataItem = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
index 6cb9ea6bc681b..ed65b83e6cf25 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.tsx
@@ -25,7 +25,7 @@ import {
   getContentSourcePath as sourcePath,
   getSourcesPath,
 } from '../../routes';
-import { NotFound } from '../../views/not_found';
+import { NotFound } from '../not_found';
 
 import { DisplaySettingsRouter } from './components/display_settings';
 import { Overview } from './components/overview';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts
index 37c79d26d9fce..0f113ad402f28 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.test.ts
@@ -322,7 +322,7 @@ describe('SourcesLogic', () => {
     it('availableSources & configuredSources have correct length', () => {
       SourcesLogic.actions.onInitializeSources(serverResponse);
 
-      expect(SourcesLogic.values.availableSources).toHaveLength(14);
+      expect(SourcesLogic.values.availableSources).toHaveLength(18);
       expect(SourcesLogic.values.configuredSources).toHaveLength(5);
     });
     it('externalConfigured is set to true if external is configured', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx
index c380c18b8c51b..0fa263beab539 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_router.test.tsx
@@ -34,7 +34,7 @@ describe('SourcesRouter', () => {
   });
 
   it('renders sources routes', () => {
-    const TOTAL_ROUTES = 87;
+    const TOTAL_ROUTES = 103;
     const wrapper = shallow(<SourcesRouter />);
 
     expect(wrapper.find(Switch)).toHaveLength(1);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
index f3060db430071..2c3b49230e394 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 
 import { ErrorStatePrompt } from '../../../shared/error_state';
 
-import { ErrorState } from './';
+import { ErrorState } from '.';
 
 describe('ErrorState', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
index 83ac3a26c44e5..92fd7ac9650b3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { ErrorStatePrompt } from '../../../shared/error_state';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
index 0e388a73f0e18..b974e770dd906 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/not_found/not_found.test.tsx
@@ -13,7 +13,7 @@ import { NotFoundPrompt } from '../../../shared/not_found';
 import { SendWorkplaceSearchTelemetry } from '../../../shared/telemetry';
 import { WorkplaceSearchPageTemplate, PersonalDashboardLayout } from '../../components/layout';
 
-import { NotFound } from './';
+import { NotFound } from '.';
 
 describe('NotFound', () => {
   it('renders the shared not found prompt', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
index b3246171ee5a7..d14a2adea82b8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.test.ts
@@ -118,13 +118,6 @@ describe('RoleMappingsLogic', () => {
       });
     });
 
-    it('setRoleMappings', () => {
-      RoleMappingsLogic.actions.setRoleMappings({ roleMappings: [wsRoleMapping] });
-
-      expect(RoleMappingsLogic.values.roleMappings).toEqual([wsRoleMapping]);
-      expect(RoleMappingsLogic.values.dataLoading).toEqual(false);
-    });
-
     describe('setElasticsearchUser', () => {
       it('sets user', () => {
         RoleMappingsLogic.actions.setElasticsearchUser(elasticsearchUsers[0]);
@@ -283,7 +276,10 @@ describe('RoleMappingsLogic', () => {
   describe('listeners', () => {
     describe('enableRoleBasedAccess', () => {
       it('calls API and sets values', async () => {
-        const setRoleMappingsSpy = jest.spyOn(RoleMappingsLogic.actions, 'setRoleMappings');
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         http.post.mockReturnValue(Promise.resolve(mappingsServerProps));
         RoleMappingsLogic.actions.enableRoleBasedAccess();
 
@@ -293,7 +289,7 @@ describe('RoleMappingsLogic', () => {
           '/internal/workplace_search/org/role_mappings/enable_role_based_access'
         );
         await nextTick();
-        expect(setRoleMappingsSpy).toHaveBeenCalledWith(mappingsServerProps);
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
       itShowsServerErrorAsFlashMessage(http.post, () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
index ea01d0049992f..010ae01ab1a71 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_logic.ts
@@ -46,9 +46,6 @@ interface RoleMappingsActions extends RoleMappingsBaseActions {
   setDefaultGroup(availableGroups: RoleGroup[]): { availableGroups: RoleGroup[] };
   setRoleMapping(roleMapping: WSRoleMapping): { roleMapping: WSRoleMapping };
   setSingleUserRoleMapping(data?: UserMapping): { singleUserRoleMapping: UserMapping };
-  setRoleMappings({ roleMappings }: { roleMappings: WSRoleMapping[] }): {
-    roleMappings: WSRoleMapping[];
-  };
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
   handleAllGroupsSelectionChange(selected: boolean): { selected: boolean };
   handleGroupSelectionChange(groupIds: string[]): { groupIds: string[] };
@@ -322,10 +319,8 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       const route = '/internal/workplace_search/org/role_mappings/enable_role_based_access';
 
       try {
-        const response = await http.post<{
-          roleMappings: WSRoleMapping[];
-        }>(route);
-        actions.setRoleMappings(response);
+        await http.post<{ roleMappings: WSRoleMapping[] }>(route);
+        actions.initializeRoleMappings();
       } catch (e) {
         flashAPIErrors(e);
       }
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
index 6b03e86080402..2d0c7e9e420b3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
@@ -12,7 +12,7 @@ import { shallow } from 'enzyme';
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SetupGuideLayout } from '../../../shared/setup_guide';
 
-import { SetupGuide } from './';
+import { SetupGuide } from '.';
 
 describe('SetupGuide', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/index.ts b/x-pack/plugins/enterprise_search/public/index.ts
index b7131e70fec07..b24616fc4b3d8 100644
--- a/x-pack/plugins/enterprise_search/public/index.ts
+++ b/x-pack/plugins/enterprise_search/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { EnterpriseSearchPlugin } from './plugin';
 
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 5331a7ed81e11..68bf6ca6f23b1 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { CloudSetup, CloudStart } from '@kbn/cloud-plugin/public';
 import {
   AppMountParameters,
   CoreStart,
@@ -13,16 +15,11 @@ import {
   Plugin,
   PluginInitializerContext,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/public';
-import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { CloudSetup, CloudStart } from '../../cloud/public';
-import { LicensingPluginStart } from '../../licensing/public';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/public';
+} from '@kbn/core/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/public';
 
 import {
   APP_SEARCH_PLUGIN,
@@ -37,6 +34,7 @@ import { docLinks } from './applications/shared/doc_links';
 export interface ClientConfigType {
   host?: string;
 }
+
 export interface ClientData extends InitialAppData {
   publicUrl?: string;
   errorConnectingMessage?: string;
@@ -47,6 +45,7 @@ interface PluginsSetup {
   home?: HomePublicPluginSetup;
   security: SecurityPluginSetup;
 }
+
 export interface PluginsStart {
   cloud?: CloudSetup & CloudStart;
   licensing: LicensingPluginStart;
@@ -174,7 +173,7 @@ export class EnterpriseSearchPlugin implements Plugin {
         icon: 'appSearchApp',
         description: APP_SEARCH_PLUGIN.DESCRIPTION,
         path: APP_SEARCH_PLUGIN.URL,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         showOnHomePage: false,
       });
 
@@ -184,7 +183,7 @@ export class EnterpriseSearchPlugin implements Plugin {
         icon: 'workplaceSearchApp',
         description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION,
         path: WORKPLACE_SEARCH_PLUGIN.URL,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         showOnHomePage: false,
       });
     }
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
index 43a08aa90ce6f..b7048256790cb 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
@@ -10,8 +10,8 @@ import {
   KibanaRequest,
   RequestHandlerContext,
   RouteValidatorConfig,
-} from 'src/core/server';
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 /**
  * Test helper that mocks Kibana's router and DRYs out various helper (callRoute, schema validation)
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
index 1bd47c94a84b7..af11762f117d1 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 export const mockLogger = loggingSystemMock.createLogger().get();
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
index 4dca6ed58e0c5..cbec4ea374c7e 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
@@ -7,8 +7,8 @@
 
 import { get } from 'lodash';
 
-import { SavedObjectsServiceStart, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceStart, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { getSavedObjectAttributesFromRepo } from '../lib/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts
index f71c8a5444c9c..0e4140b90eaf7 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/telemetry.ts
@@ -7,8 +7,8 @@
 
 import { get } from 'lodash';
 
-import { SavedObjectsServiceStart, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceStart, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { getSavedObjectAttributesFromRepo } from '../lib/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
index 5e12a5a13ba00..0914e84404365 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
@@ -7,12 +7,12 @@
 
 import { mockLogger } from '../../__mocks__';
 
-jest.mock('../../../../../../src/core/server', () => ({
+jest.mock('@kbn/core/server', () => ({
   SavedObjectsErrorHelpers: {
     isNotFoundError: jest.fn(),
   },
 }));
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 import { getSavedObjectAttributesFromRepo, incrementUICounter } from './telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts
index cc850017a4e5e..37c2c2a5c7154 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts
@@ -10,10 +10,10 @@ import {
   SavedObjectsServiceStart,
   SavedObjectAttributes,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 // This throws `Error: Cannot find module 'src/core/server'` if I import it via alias ¯\_(ツ)_/¯
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 /**
  * Fetches saved objects attributes - used by collectors
diff --git a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
index e36ce94066789..1d28f895d8489 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
@@ -7,8 +7,8 @@
 
 import { get } from 'lodash';
 
-import { SavedObjectsServiceStart, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsServiceStart, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { getSavedObjectAttributesFromRepo } from '../lib/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/index.ts b/x-pack/plugins/enterprise_search/server/index.ts
index f332f425ecdcf..1a1951348f106 100644
--- a/x-pack/plugins/enterprise_search/server/index.ts
+++ b/x-pack/plugins/enterprise_search/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 
 import { EnterpriseSearchPlugin } from './plugin';
 
diff --git a/x-pack/plugins/enterprise_search/server/integrations.ts b/x-pack/plugins/enterprise_search/server/integrations.ts
index ebe98d4e805ac..2a5ed4be69cfa 100644
--- a/x-pack/plugins/enterprise_search/server/integrations.ts
+++ b/x-pack/plugins/enterprise_search/server/integrations.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { i18n } from '@kbn/i18n';
-import type { HttpServiceSetup } from 'src/core/server';
+import type { HttpServiceSetup } from '@kbn/core/server';
 
-import type { IntegrationCategory } from '../../../../src/plugins/custom_integrations/common';
-import type { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
+import type { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { i18n } from '@kbn/i18n';
 
 interface WorkplaceSearchIntegration {
   id: string;
diff --git a/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts b/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts
index 9d62c0794651e..28d9fe363ff0f 100644
--- a/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/check_access.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { spacesMock } from '../../../spaces/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
 import { checkAccess } from './check_access';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/check_access.ts b/x-pack/plugins/enterprise_search/server/lib/check_access.ts
index d933b9ac41412..a77415f2c2f12 100644
--- a/x-pack/plugins/enterprise_search/server/lib/check_access.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/check_access.ts
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'src/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 
-import { SecurityPluginSetup } from '../../../security/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+
+import { ConfigType } from '..';
 import { ProductAccess } from '../../common/types';
-import { ConfigType } from '../index';
 
 import { callEnterpriseSearchConfigAPI } from './enterprise_search_config_api';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
index f6e3280a8abb2..5f8b261f82f16 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../common/__mocks__';
-import '../__mocks__/http_agent.mock.ts';
+import '../__mocks__/http_agent.mock';
 
 jest.mock('node-fetch');
 import fetch from 'node-fetch';
@@ -17,7 +17,7 @@ jest.mock('@kbn/utils', () => ({
   kibanaPackageJson: { version: '1.0.0' },
 }));
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import {
   callEnterpriseSearchConfigAPI,
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
index a427beb6769c9..7e27480426525 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
@@ -8,14 +8,13 @@
 import AbortController from 'abort-controller';
 import fetch from 'node-fetch';
 
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import { kibanaPackageJson } from '@kbn/utils';
 
-import { KibanaRequest, Logger } from 'src/core/server';
-
+import { ConfigType } from '..';
 import { isVersionMismatch } from '../../common/is_version_mismatch';
 import { stripTrailingSlash } from '../../common/strip_slashes';
 import { InitialAppData } from '../../common/types';
-import { ConfigType } from '../index';
 
 import { entSearchHttpAgent } from './enterprise_search_http_agent';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
index f4bdfd8d2cb0f..c8a7ba93c456c 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
@@ -11,7 +11,7 @@ import { readFileSync } from 'fs';
 import http from 'http';
 import https from 'https';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 import { entSearchHttpAgent } from './enterprise_search_http_agent';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
index b117918311120..68c605e24c3a6 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
@@ -10,7 +10,7 @@ import http from 'http';
 import https from 'https';
 import { PeerCertificate } from 'tls';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 export type HttpAgent = http.Agent | https.Agent;
 interface AgentOptions {
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
index 8b3b7d04115ec..0f2c33519ca9f 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
@@ -14,9 +14,9 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import { ConfigType } from '../';
+import { ConfigType } from '..';
 
 import {
   ENTERPRISE_SEARCH_KIBANA_COOKIE,
diff --git a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts
index 6bf95487a0022..6365e89fb9184 100644
--- a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.test.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-
 import { ByteSizeValue } from '@kbn/config-schema';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { fetchIndices } from './fetch_indices';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts
index b355df2c56843..ac811ba9ed4f7 100644
--- a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-
 import { ByteSizeValue } from '@kbn/config-schema';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { ElasticsearchIndex } from '../../common/types';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts b/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
index 554fe127b4353..8f602d163c297 100644
--- a/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
+import { schema } from '@kbn/config-schema';
 import {
   DestructiveRouteMethod,
   RouteConfig,
   RouteConfigOptions,
   RouteMethod,
   RouteValidatorFullConfig,
-} from 'kibana/server';
-
-import { schema } from '@kbn/config-schema';
+} from '@kbn/core/server';
 
 type Config<Method extends DestructiveRouteMethod> = RouteConfig<unknown, unknown, unknown, Method>;
 
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index ef75cc680d2f6..0389faa25f4f8 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -14,13 +14,13 @@ import {
   IRouter,
   KibanaRequest,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { InfraPluginSetup } from '../../infra/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/core/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { InfraPluginSetup } from '@kbn/infra-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import {
   ENTERPRISE_SEARCH_OVERVIEW_PLUGIN,
@@ -53,7 +53,7 @@ import { appSearchTelemetryType } from './saved_objects/app_search/telemetry';
 import { enterpriseSearchTelemetryType } from './saved_objects/enterprise_search/telemetry';
 import { workplaceSearchTelemetryType } from './saved_objects/workplace_search/telemetry';
 
-import { ConfigType } from './';
+import { ConfigType } from '.';
 
 interface PluginsSetup {
   usageCollection?: UsageCollectionSetup;
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts
index 18e4366ce496e..61249f79ff44b 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/index.test.ts
@@ -7,7 +7,7 @@
 
 import { mockDependencies, MockRouter } from '../../__mocks__';
 
-import { registerAppSearchRoutes } from './';
+import { registerAppSearchRoutes } from '.';
 
 describe('registerAppSearchRoutes', () => {
   it('runs without errors', () => {
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
index d8c38204f75a9..01cf70cdd3945 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
@@ -7,7 +7,7 @@
 
 import { MockRouter, mockLogger, mockDependencies } from '../../__mocks__';
 
-import { savedObjectsServiceMock } from 'src/core/server/mocks';
+import { savedObjectsServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../collectors/lib/telemetry', () => ({
   incrementUICounter: jest.fn(),
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts
index 833cc805093f2..65cacd69b29a7 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/index.test.ts
@@ -7,7 +7,7 @@
 
 import { mockDependencies, MockRouter } from '../../__mocks__';
 
-import { registerWorkplaceSearchRoutes } from './';
+import { registerWorkplaceSearchRoutes } from '.';
 
 describe('registerWorkplaceSearchRoutes', () => {
   it('runs without errors', () => {
diff --git a/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts
index ab873b6678885..63b90ceb9520b 100644
--- a/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/saved_objects/app_search/telemetry.ts
@@ -7,7 +7,7 @@
 
 /* istanbul ignore file */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { AS_TELEMETRY_NAME } from '../../collectors/app_search/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts
index e2edff1b6a213..cd7ce03738a71 100644
--- a/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/telemetry.ts
@@ -7,7 +7,7 @@
 
 /* istanbul ignore file */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { ES_TELEMETRY_NAME } from '../../collectors/enterprise_search/telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts
index af4d5908dec67..3020b85493264 100644
--- a/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/telemetry.ts
@@ -7,7 +7,7 @@
 
 /* istanbul ignore file */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { WS_TELEMETRY_NAME } from '../../collectors/workplace_search/telemetry';
 
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index 56a708ef51b67..ed740a27b81e4 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   ClusterClientAdapter,
   IClusterClientAdapter,
@@ -44,7 +44,7 @@ describe('indexDocument', () => {
     });
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
-      body: [{ create: { _index: 'event-log' } }, { message: 'foo' }],
+      body: [{ create: { _index: 'event-log', require_alias: true } }, { message: 'foo' }],
     });
   });
 
@@ -55,7 +55,7 @@ describe('indexDocument', () => {
       return logger.error.mock.calls.length !== 0;
     });
 
-    const expectedMessage = `error writing bulk events: "expected failure"; docs: [{"create":{"_index":"event-log"}},{"message":"foo"}]`;
+    const expectedMessage = `error writing bulk events: "expected failure"; docs: [{"create":{"_index":"event-log","require_alias":true}},{"message":"foo"}]`;
     expect(logger.error).toHaveBeenCalledWith(expectedMessage);
   });
 });
@@ -92,7 +92,10 @@ describe('buffering documents', () => {
 
     const expectedBody = [];
     for (let i = 0; i < EVENT_BUFFER_LENGTH - 1; i++) {
-      expectedBody.push({ create: { _index: 'event-log' } }, { message: `foo ${i}` });
+      expectedBody.push(
+        { create: { _index: 'event-log', require_alias: true } },
+        { message: `foo ${i}` }
+      );
     }
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
@@ -112,7 +115,10 @@ describe('buffering documents', () => {
 
     const expectedBody = [];
     for (let i = 0; i < EVENT_BUFFER_LENGTH; i++) {
-      expectedBody.push({ create: { _index: 'event-log' } }, { message: `foo ${i}` });
+      expectedBody.push(
+        { create: { _index: 'event-log', require_alias: true } },
+        { message: `foo ${i}` }
+      );
     }
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(1, {
@@ -120,7 +126,7 @@ describe('buffering documents', () => {
     });
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(2, {
-      body: [{ create: { _index: 'event-log' } }, { message: `foo 100` }],
+      body: [{ create: { _index: 'event-log', require_alias: true } }, { message: `foo 100` }],
     });
   });
 
@@ -146,7 +152,7 @@ describe('buffering documents', () => {
       const expectedBody = [];
       for (let j = 0; j < EVENT_BUFFER_LENGTH; j++) {
         expectedBody.push(
-          { create: { _index: 'event-log' } },
+          { create: { _index: 'event-log', require_alias: true } },
           { message: `foo ${i * EVENT_BUFFER_LENGTH + j}` }
         );
       }
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 502e48795f0cc..a3ea88cfb526b 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -9,7 +9,7 @@ import { Subject } from 'rxjs';
 import { bufferTime, filter as rxFilter, switchMap } from 'rxjs/operators';
 import { reject, isUndefined, isNumber, pick } from 'lodash';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { Logger, ElasticsearchClient } from 'src/core/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 import util from 'util';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
@@ -123,7 +123,7 @@ export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string }
     for (const doc of docs) {
       if (doc.body === undefined) continue;
 
-      bulkBody.push({ create: { _index: doc.index } });
+      bulkBody.push({ create: { _index: doc.index, require_alias: true } });
       bulkBody.push(doc.body);
     }
 
diff --git a/x-pack/plugins/event_log/server/es/context.mock.ts b/x-pack/plugins/event_log/server/es/context.mock.ts
index ababa4f9a75f7..e0c3e34f84431 100644
--- a/x-pack/plugins/event_log/server/es/context.mock.ts
+++ b/x-pack/plugins/event_log/server/es/context.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { EsContext } from './context';
 import { namesMock } from './names.mock';
diff --git a/x-pack/plugins/event_log/server/es/context.test.ts b/x-pack/plugins/event_log/server/es/context.test.ts
index f6b4178ce7f11..dd985ec80b3fc 100644
--- a/x-pack/plugins/event_log/server/es/context.test.ts
+++ b/x-pack/plugins/event_log/server/es/context.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { createEsContext } from './context';
-import { Logger } from '../../../../../src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../lib/../../../../package.json', () => ({ version: '1.2.3' }));
 jest.mock('./init');
diff --git a/x-pack/plugins/event_log/server/es/context.ts b/x-pack/plugins/event_log/server/es/context.ts
index f6ae0a2002dd4..2cb7a89a0c429 100644
--- a/x-pack/plugins/event_log/server/es/context.ts
+++ b/x-pack/plugins/event_log/server/es/context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, ElasticsearchClient } from 'src/core/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 
 import { EsNames, getEsNames } from './names';
 import { initializeEs } from './init';
diff --git a/x-pack/plugins/event_log/server/event_log_client.test.ts b/x-pack/plugins/event_log/server/event_log_client.test.ts
index 9ee75dd97ed19..a0d086ceaece4 100644
--- a/x-pack/plugins/event_log/server/event_log_client.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { EventLogClient } from './event_log_client';
 import { EsContext } from './es';
 import { contextMock } from './es/context.mock';
diff --git a/x-pack/plugins/event_log/server/event_log_client.ts b/x-pack/plugins/event_log/server/event_log_client.ts
index c832ab9056be1..9e4d579c54fc1 100644
--- a/x-pack/plugins/event_log/server/event_log_client.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.ts
@@ -8,9 +8,9 @@
 import { omit } from 'lodash';
 import { Observable } from 'rxjs';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { IClusterClient, KibanaRequest } from 'src/core/server';
+import { IClusterClient, KibanaRequest } from '@kbn/core/server';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { SpacesServiceStart } from '../../spaces/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 import { EsContext } from './es';
 import { IEventLogClient } from './types';
diff --git a/x-pack/plugins/event_log/server/event_log_service.test.ts b/x-pack/plugins/event_log/server/event_log_service.test.ts
index aad51a03b2f06..4f6b53c6cca0e 100644
--- a/x-pack/plugins/event_log/server/event_log_service.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.test.ts
@@ -8,7 +8,7 @@
 import { IEventLogConfig } from './types';
 import { EventLogService } from './event_log_service';
 import { contextMock } from './es/context.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { savedObjectProviderRegistryMock } from './saved_object_provider_registry.mock';
 
 const loggingService = loggingSystemMock.create();
diff --git a/x-pack/plugins/event_log/server/event_log_service.ts b/x-pack/plugins/event_log/server/event_log_service.ts
index 5611a70563358..0a9319db9cd50 100644
--- a/x-pack/plugins/event_log/server/event_log_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { IClusterClient, PluginInitializerContext } from 'src/core/server';
+import { IClusterClient, PluginInitializerContext } from '@kbn/core/server';
 
 import { Plugin } from './plugin';
 import { EsContext } from './es';
diff --git a/x-pack/plugins/event_log/server/event_log_start_service.test.ts b/x-pack/plugins/event_log/server/event_log_start_service.test.ts
index 1534623100f5d..6d647af4e9450 100644
--- a/x-pack/plugins/event_log/server/event_log_start_service.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_start_service.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { EventLogClientService } from './event_log_start_service';
 import { contextMock } from './es/context.mock';
diff --git a/x-pack/plugins/event_log/server/event_log_start_service.ts b/x-pack/plugins/event_log/server/event_log_start_service.ts
index 65e01b85b2883..94962c59f4dfc 100644
--- a/x-pack/plugins/event_log/server/event_log_start_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_start_service.ts
@@ -6,8 +6,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { IClusterClient, KibanaRequest } from 'src/core/server';
-import { SpacesServiceStart } from '../../spaces/server';
+import { IClusterClient, KibanaRequest } from '@kbn/core/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 import { EsContext } from './es';
 import { IEventLogClientService } from './types';
diff --git a/x-pack/plugins/event_log/server/event_logger.test.ts b/x-pack/plugins/event_log/server/event_logger.test.ts
index 43d791a18b5fc..636e377ed6636 100644
--- a/x-pack/plugins/event_log/server/event_logger.test.ts
+++ b/x-pack/plugins/event_log/server/event_logger.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IEvent, IEventLogger, IEventLogService } from './index';
+import { IEvent, IEventLogger, IEventLogService } from '.';
 import { ECS_VERSION } from './types';
 import { EventLogService } from './event_log_service';
 import { EsContext } from './es/context';
 import { contextMock } from './es/context.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { delay } from './lib/delay';
 import { EVENT_LOGGED_PREFIX } from './event_logger';
 import { savedObjectProviderRegistryMock } from './saved_object_provider_registry.mock';
diff --git a/x-pack/plugins/event_log/server/event_logger.ts b/x-pack/plugins/event_log/server/event_logger.ts
index 97335f9cda8d1..89d0cbc9ab94d 100644
--- a/x-pack/plugins/event_log/server/event_logger.ts
+++ b/x-pack/plugins/event_log/server/event_logger.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { merge } from 'lodash';
 
 import { coerce } from 'semver';
diff --git a/x-pack/plugins/event_log/server/index.ts b/x-pack/plugins/event_log/server/index.ts
index 42fc2e9792014..c69d7780a6204 100644
--- a/x-pack/plugins/event_log/server/index.ts
+++ b/x-pack/plugins/event_log/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { ConfigSchema, IEventLogConfig } from './types';
 import { Plugin } from './plugin';
 
diff --git a/x-pack/plugins/event_log/server/plugin.test.ts b/x-pack/plugins/event_log/server/plugin.test.ts
index fa66d4b0b02b3..fcfd921557645 100644
--- a/x-pack/plugins/event_log/server/plugin.test.ts
+++ b/x-pack/plugins/event_log/server/plugin.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { IEventLogService } from './index';
+import { CoreSetup, CoreStart } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { IEventLogService } from '.';
 import { Plugin } from './plugin';
-import { spacesMock } from '../../spaces/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
 describe('event_log plugin', () => {
   it('can setup and start', () => {
diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
index 83bd8582636dd..98ddd770ac962 100644
--- a/x-pack/plugins/event_log/server/plugin.ts
+++ b/x-pack/plugins/event_log/server/plugin.ts
@@ -13,8 +13,8 @@ import {
   PluginInitializerContext,
   IClusterClient,
   IContextProvider,
-} from 'src/core/server';
-import { SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/core/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 import type {
   EventLogRequestHandlerContext,
diff --git a/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
index 3cd8e5eaae2ba..78c0917929c7a 100644
--- a/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
@@ -6,10 +6,10 @@
  */
 
 import { identity, merge } from 'lodash';
-import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from 'src/core/server';
+import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import type { MethodKeysOf } from '@kbn/utility-types';
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { IEventLogClient } from '../types';
 
 export function mockHandlerArguments(
diff --git a/x-pack/plugins/event_log/server/routes/find.test.ts b/x-pack/plugins/event_log/server/routes/find.test.ts
index c51c8f3adf1e5..ee7985d34d249 100644
--- a/x-pack/plugins/event_log/server/routes/find.test.ts
+++ b/x-pack/plugins/event_log/server/routes/find.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { findRoute } from './find';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { mockHandlerArguments, fakeEvent } from './_mock_handler_arguments';
 import { eventLogClientMock } from '../event_log_client.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 const eventLogClient = eventLogClientMock.create();
 const systemLogger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/event_log/server/routes/find.ts b/x-pack/plugins/event_log/server/routes/find.ts
index fdb699b70e26c..fd940d0f64ad5 100644
--- a/x-pack/plugins/event_log/server/routes/find.ts
+++ b/x-pack/plugins/event_log/server/routes/find.ts
@@ -11,7 +11,7 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { EventLogRouter, EventLogRequestHandlerContext } from '../types';
 import { BASE_EVENT_LOG_API_PATH } from '../../common';
 import { queryOptionsSchema, FindOptionsType } from '../event_log_client';
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
index 065174abcd9fd..81172f2119410 100644
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
+++ b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { mockHandlerArguments, fakeEvent } from './_mock_handler_arguments';
 import { eventLogClientMock } from '../event_log_client.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { findByIdsRoute } from './find_by_ids';
 
 const eventLogClient = eventLogClientMock.create();
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
index 324dbc7f568ba..85346b1e87be5 100644
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.ts
+++ b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
@@ -11,7 +11,7 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import type { EventLogRouter, EventLogRequestHandlerContext } from '../types';
 
 import { BASE_EVENT_LOG_API_PATH } from '../../common';
diff --git a/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts b/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts
index d3b4ec4648b9f..7ae2c5e577811 100644
--- a/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts
+++ b/x-pack/plugins/event_log/server/saved_object_provider_registry.test.ts
@@ -7,8 +7,8 @@
 
 import { SavedObjectProviderRegistry } from './saved_object_provider_registry';
 import uuid from 'uuid';
-import { KibanaRequest } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 describe('SavedObjectProviderRegistry', () => {
   beforeEach(() => jest.resetAllMocks());
diff --git a/x-pack/plugins/event_log/server/saved_object_provider_registry.ts b/x-pack/plugins/event_log/server/saved_object_provider_registry.ts
index 916757859e6df..8ad1079e95941 100644
--- a/x-pack/plugins/event_log/server/saved_object_provider_registry.ts
+++ b/x-pack/plugins/event_log/server/saved_object_provider_registry.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, SavedObjectsClientContract } from 'src/core/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { fromNullable, getOrElse } from 'fp-ts/lib/Option';
 import { pipe } from 'fp-ts/lib/pipeable';
diff --git a/x-pack/plugins/event_log/server/types.ts b/x-pack/plugins/event_log/server/types.ts
index 34aa67f313ee3..10a472e802b9f 100644
--- a/x-pack/plugins/event_log/server/types.ts
+++ b/x-pack/plugins/event_log/server/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import type { IRouter, KibanaRequest, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 
 export type { IEvent, IValidatedEvent } from '../generated/schemas';
 export { EventSchema, ECS_VERSION } from '../generated/schemas';
diff --git a/x-pack/plugins/features/common/kibana_feature.ts b/x-pack/plugins/features/common/kibana_feature.ts
index 089389c7bc7fa..2989872d024c9 100644
--- a/x-pack/plugins/features/common/kibana_feature.ts
+++ b/x-pack/plugins/features/common/kibana_feature.ts
@@ -6,8 +6,8 @@
  */
 
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { AppCategory } from 'src/core/types';
-import { LicenseType } from '../../licensing/common/types';
+import { AppCategory } from '@kbn/core/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { FeatureKibanaPrivileges } from './feature_kibana_privileges';
 import { SubFeatureConfig, SubFeature as KibanaSubFeature } from './sub_feature';
 import { ReservedKibanaPrivilege } from './reserved_kibana_privilege';
diff --git a/x-pack/plugins/features/common/sub_feature.ts b/x-pack/plugins/features/common/sub_feature.ts
index eb1c2531c84b6..2795e50bce473 100644
--- a/x-pack/plugins/features/common/sub_feature.ts
+++ b/x-pack/plugins/features/common/sub_feature.ts
@@ -6,7 +6,7 @@
  */
 
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { FeatureKibanaPrivileges } from './feature_kibana_privileges';
 
 /**
diff --git a/x-pack/plugins/features/public/features_api_client.test.ts b/x-pack/plugins/features/public/features_api_client.test.ts
index 0a9488c11d496..e40cb75baed4f 100644
--- a/x-pack/plugins/features/public/features_api_client.test.ts
+++ b/x-pack/plugins/features/public/features_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { FeaturesAPIClient } from './features_api_client';
 
 describe('Features API Client', () => {
diff --git a/x-pack/plugins/features/public/features_api_client.ts b/x-pack/plugins/features/public/features_api_client.ts
index 161d88c51dfab..59616588db869 100644
--- a/x-pack/plugins/features/public/features_api_client.ts
+++ b/x-pack/plugins/features/public/features_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { KibanaFeatureConfig, KibanaFeature } from '.';
 
 export class FeaturesAPIClient {
diff --git a/x-pack/plugins/features/public/index.ts b/x-pack/plugins/features/public/index.ts
index 2895d83ed114e..c5100722795bc 100644
--- a/x-pack/plugins/features/public/index.ts
+++ b/x-pack/plugins/features/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { FeaturesPlugin, FeaturesPluginSetup, FeaturesPluginStart } from './plugin';
 
 export type {
diff --git a/x-pack/plugins/features/public/plugin.test.ts b/x-pack/plugins/features/public/plugin.test.ts
index 7a6f9d02e7a41..7087e483f0ec1 100644
--- a/x-pack/plugins/features/public/plugin.test.ts
+++ b/x-pack/plugins/features/public/plugin.test.ts
@@ -7,7 +7,7 @@
 
 import { FeaturesPlugin } from './plugin';
 
-import { coreMock, httpServiceMock } from 'src/core/public/mocks';
+import { coreMock, httpServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('./features_api_client', () => {
   const instance = {
diff --git a/x-pack/plugins/features/public/plugin.ts b/x-pack/plugins/features/public/plugin.ts
index 136e73b9dafd2..81c3f566bea18 100644
--- a/x-pack/plugins/features/public/plugin.ts
+++ b/x-pack/plugins/features/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'src/core/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 import { FeaturesAPIClient } from './features_api_client';
 
 export class FeaturesPlugin implements Plugin<FeaturesPluginSetup, FeaturesPluginStart> {
diff --git a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts
index d7ba5f05e691b..c77df4b5b0f74 100644
--- a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts
+++ b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { LicenseType } from '../../../licensing/common/types';
-import { LICENSE_TYPE } from '../../../licensing/server';
-import { KibanaFeature } from '../';
+import type { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/server';
+import { KibanaFeature } from '..';
 import { SubFeaturePrivilegeConfig } from '../../common';
 import type { FeaturePrivilegeIteratorOptions } from './feature_privilege_iterator';
 import { featurePrivilegeIterator } from './feature_privilege_iterator';
diff --git a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts
index 86a232ca68d2f..533e526f53b37 100644
--- a/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts
+++ b/x-pack/plugins/features/server/feature_privilege_iterator/feature_privilege_iterator.ts
@@ -7,8 +7,8 @@
 
 import _ from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../';
-import type { LicenseType } from '../../../licensing/server';
+import type { LicenseType } from '@kbn/licensing-plugin/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '..';
 import { subFeaturePrivilegeIterator } from './sub_feature_privilege_iterator';
 
 /**
diff --git a/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts b/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts
index 8dffd553bfe14..8bebd64bf58bd 100644
--- a/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts
+++ b/x-pack/plugins/features/server/feature_privilege_iterator/sub_feature_privilege_iterator.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { LicenseType } from '@kbn/licensing-plugin/server';
 import type { KibanaFeature, SubFeaturePrivilegeConfig } from '../../common';
-import type { LicenseType } from '../../../licensing/server';
 
 /**
  * Utility for iterating through all sub-feature privileges belonging to a specific feature.
diff --git a/x-pack/plugins/features/server/feature_registry.test.ts b/x-pack/plugins/features/server/feature_registry.test.ts
index 984d76a17d159..b8f96ad517882 100644
--- a/x-pack/plugins/features/server/feature_registry.test.ts
+++ b/x-pack/plugins/features/server/feature_registry.test.ts
@@ -7,7 +7,7 @@
 
 import { FeatureRegistry } from './feature_registry';
 import { ElasticsearchFeatureConfig, KibanaFeatureConfig } from '../common';
-import { licensingMock } from '../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 describe('FeatureRegistry', () => {
   describe('Kibana Features', () => {
diff --git a/x-pack/plugins/features/server/feature_registry.ts b/x-pack/plugins/features/server/feature_registry.ts
index 3a532a4aaa1e7..46c422b931822 100644
--- a/x-pack/plugins/features/server/feature_registry.ts
+++ b/x-pack/plugins/features/server/feature_registry.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneDeep, uniq } from 'lodash';
-import { ILicense } from '../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import {
   KibanaFeatureConfig,
   KibanaFeature,
diff --git a/x-pack/plugins/features/server/feature_schema.ts b/x-pack/plugins/features/server/feature_schema.ts
index 8738e8691572a..f701a3a45b685 100644
--- a/x-pack/plugins/features/server/feature_schema.ts
+++ b/x-pack/plugins/features/server/feature_schema.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { difference } from 'lodash';
-import { Capabilities as UICapabilities } from '../../../../src/core/server';
+import { Capabilities as UICapabilities } from '@kbn/core/server';
 import { KibanaFeatureConfig } from '../common';
 import { FeatureKibanaPrivileges, ElasticsearchFeatureConfig } from '.';
 
diff --git a/x-pack/plugins/features/server/index.ts b/x-pack/plugins/features/server/index.ts
index 934fcd9d556f6..5882d0a4e339a 100644
--- a/x-pack/plugins/features/server/index.ts
+++ b/x-pack/plugins/features/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FeaturesPlugin } from './plugin';
 
 // These exports are part of public Features plugin contract, any change in signature of exported
diff --git a/x-pack/plugins/features/server/oss_features.test.ts b/x-pack/plugins/features/server/oss_features.test.ts
index 7a1c5951192ec..f7e5b7644c596 100644
--- a/x-pack/plugins/features/server/oss_features.test.ts
+++ b/x-pack/plugins/features/server/oss_features.test.ts
@@ -8,7 +8,7 @@
 import { buildOSSFeatures } from './oss_features';
 import { featurePrivilegeIterator } from './feature_privilege_iterator';
 import { KibanaFeature } from '.';
-import { LicenseType, LICENSE_TYPE } from '../../licensing/server';
+import { LicenseType, LICENSE_TYPE } from '@kbn/licensing-plugin/server';
 
 describe('buildOSSFeatures', () => {
   it('returns features including reporting subfeatures', () => {
diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts
index daab87b1063d2..a18cbdb62d59c 100644
--- a/x-pack/plugins/features/server/oss_features.ts
+++ b/x-pack/plugins/features/server/oss_features.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import type { KibanaFeatureConfig, SubFeatureConfig } from '../common';
 
 export interface BuildOSSFeaturesParams {
diff --git a/x-pack/plugins/features/server/plugin.test.ts b/x-pack/plugins/features/server/plugin.test.ts
index e5940bc73ae97..89e04de8ffa91 100644
--- a/x-pack/plugins/features/server/plugin.test.ts
+++ b/x-pack/plugins/features/server/plugin.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, savedObjectsServiceMock } from 'src/core/server/mocks';
+import { coreMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import { FeaturesPlugin } from './plugin';
 
 describe('Features Plugin', () => {
diff --git a/x-pack/plugins/features/server/plugin.ts b/x-pack/plugins/features/server/plugin.ts
index efca9f19230b0..3a394e2524027 100644
--- a/x-pack/plugins/features/server/plugin.ts
+++ b/x-pack/plugins/features/server/plugin.ts
@@ -14,8 +14,8 @@ import {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from '../../../../src/core/server';
-import { Capabilities as UICapabilities } from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { Capabilities as UICapabilities } from '@kbn/core/server';
 import { FeatureRegistry } from './feature_registry';
 import { uiCapabilitiesForFeatures } from './ui_capabilities_for_features';
 import { buildOSSFeatures } from './oss_features';
diff --git a/x-pack/plugins/features/server/routes/index.test.ts b/x-pack/plugins/features/server/routes/index.test.ts
index 04a3d6486c5af..4d61d131cc0ac 100644
--- a/x-pack/plugins/features/server/routes/index.test.ts
+++ b/x-pack/plugins/features/server/routes/index.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { FeatureRegistry } from '../feature_registry';
-import { defineRoutes } from './index';
+import { defineRoutes } from '.';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../src/core/server/mocks';
-import { LicenseType } from '../../../licensing/server/';
-import { licensingMock } from '../../../licensing/server/mocks';
-import { RequestHandler } from '../../../../../src/core/server';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
+import { LicenseType } from '@kbn/licensing-plugin/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { RequestHandler } from '@kbn/core/server';
 import { FeatureKibanaPrivileges, KibanaFeatureConfig, SubFeatureConfig } from '../../common';
 
 function createContextMock(licenseType: LicenseType = 'platinum') {
diff --git a/x-pack/plugins/features/server/types.ts b/x-pack/plugins/features/server/types.ts
index 209d7ef13aa31..826d4282cc425 100644
--- a/x-pack/plugins/features/server/types.ts
+++ b/x-pack/plugins/features/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { RequestHandlerContext, IRouter } from 'src/core/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { RequestHandlerContext, IRouter } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 /**
  * @internal
diff --git a/x-pack/plugins/features/server/ui_capabilities_for_features.ts b/x-pack/plugins/features/server/ui_capabilities_for_features.ts
index 4225f52081c75..84cd78a3fa548 100644
--- a/x-pack/plugins/features/server/ui_capabilities_for_features.ts
+++ b/x-pack/plugins/features/server/ui_capabilities_for_features.ts
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import type { RecursiveReadonly, Writable } from '@kbn/utility-types';
-import { Capabilities as UICapabilities } from '../../../../src/core/server';
+import { Capabilities as UICapabilities } from '@kbn/core/server';
 import { ElasticsearchFeature, KibanaFeature } from '../common';
 
 const ELIGIBLE_FLAT_MERGE_KEYS = ['catalogue'] as const;
diff --git a/x-pack/plugins/file_upload/common/types.ts b/x-pack/plugins/file_upload/common/types.ts
index 5a4ec4a3872ad..46c3153e702ce 100644
--- a/x-pack/plugins/file_upload/common/types.ts
+++ b/x-pack/plugins/file_upload/common/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ES_FIELD_TYPES } from 'src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 export interface InputOverrides {
   [key: string]: string | undefined;
diff --git a/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx b/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx
index 382e2eedebe24..ff915c493b93d 100644
--- a/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx
+++ b/x-pack/plugins/file_upload/public/api/index_name_form_async_wrapper.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiLoadingContent } from '@elastic/eui';
 import { lazyLoadModules } from '../lazy_load_bundle';
-import { IndexNameFormProps } from '../index';
+import { IndexNameFormProps } from '..';
 
 interface State {
   IndexNameForm: React.ComponentType<IndexNameFormProps> | null;
diff --git a/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx b/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
index 16306673b246c..43dde2580b66d 100644
--- a/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
+++ b/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
@@ -8,8 +8,8 @@
 import React, { ChangeEvent, Component } from 'react';
 import { EuiForm, EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { GeoFilePicker, OnFileSelectParameters } from './geo_file_picker';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 import { IndexNameForm } from './index_name_form';
 import { validateIndexName } from '../../validate_index_name';
 
diff --git a/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx b/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx
index 24fcbdd7e1ed0..adbce777a4942 100644
--- a/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx
+++ b/x-pack/plugins/file_upload/public/components/geo_upload_wizard.tsx
@@ -8,10 +8,10 @@
 import React, { Component, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiProgress, EuiText } from '@elastic/eui';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getDataViewsService } from '../kibana_services';
 import { GeoUploadForm, OnFileSelectParameters } from './geo_upload_form';
 import { ImportCompleteView } from './import_complete_view';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/public';
 import type { FileUploadComponentProps, FileUploadGeoResults } from '../lazy_load_bundle';
 import { ImportResults } from '../importer';
 import { GeoFileImporter } from '../importer/geo';
diff --git a/x-pack/plugins/file_upload/public/components/import_complete_view.tsx b/x-pack/plugins/file_upload/public/components/import_complete_view.tsx
index 5a7483328112e..5ec4e6f0ddf37 100644
--- a/x-pack/plugins/file_upload/public/components/import_complete_view.tsx
+++ b/x-pack/plugins/file_upload/public/components/import_complete_view.tsx
@@ -19,7 +19,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { CodeEditor, KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { CodeEditor, KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { getDocLinks, getHttp, getUiSettings } from '../kibana_services';
 import { ImportResults } from '../importer';
 
diff --git a/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx b/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx
index 59262984fd0e2..31132e0d9698d 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx
+++ b/x-pack/plugins/file_upload/public/importer/geo/abstract_geo_file_importer.tsx
@@ -8,10 +8,10 @@
 import { ReactNode } from 'react';
 import { Feature } from 'geojson';
 import { i18n } from '@kbn/i18n';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { GeoFileImporter, GeoFilePreview } from './types';
 import { CreateDocsResponse, ImportResults } from '../types';
 import { callImportRoute, Importer, IMPORT_RETRIES, MAX_CHUNK_CHAR_COUNT } from '../importer';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 import { MB } from '../../../common/constants';
 import type { ImportDoc, ImportFailure, ImportResponse } from '../../../common/types';
 // @ts-expect-error
diff --git a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts
index 2f244e0fc93dc..7ba31fbf8364a 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts
+++ b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.test.ts
@@ -7,7 +7,7 @@
 
 import { Feature } from 'geojson';
 import { createChunks, toEsDoc } from './create_chunks';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 const FEATURE_COLLECTION = {
   type: 'FeatureCollection',
diff --git a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts
index cac21001e64a5..33188e608587e 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts
+++ b/x-pack/plugins/file_upload/public/importer/geo/create_chunks.ts
@@ -6,7 +6,7 @@
  */
 
 import { Feature, Point } from 'geojson';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import type { ImportDoc } from '../../../common/types';
 
 export function createChunks(
diff --git a/x-pack/plugins/file_upload/public/importer/geo/types.ts b/x-pack/plugins/file_upload/public/importer/geo/types.ts
index c616324f7e9be..3c9115f1c27ac 100644
--- a/x-pack/plugins/file_upload/public/importer/geo/types.ts
+++ b/x-pack/plugins/file_upload/public/importer/geo/types.ts
@@ -7,8 +7,8 @@
 
 import { Feature } from 'geojson';
 import { ReactNode } from 'react';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { IImporter } from '../types';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 
 export interface GeoFilePreview {
   features: Feature[];
diff --git a/x-pack/plugins/file_upload/public/kibana_services.ts b/x-pack/plugins/file_upload/public/kibana_services.ts
index 76dd6f660da51..c45df38883400 100644
--- a/x-pack/plugins/file_upload/public/kibana_services.ts
+++ b/x-pack/plugins/file_upload/public/kibana_services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { FileUploadStartDependencies } from './plugin';
 
 let coreStart: CoreStart;
diff --git a/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts b/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts
index 97aef4365c508..0066a2efbc5cb 100644
--- a/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts
+++ b/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { FeatureCollection } from 'geojson';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { IImporter, ImportFactoryOptions } from '../importer';
 import { getHttp } from '../kibana_services';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/public';
-import { IndexNameFormProps } from '../';
+import { IndexNameFormProps } from '..';
 
 export interface FileUploadGeoResults {
   indexPatternId: string;
diff --git a/x-pack/plugins/file_upload/public/plugin.ts b/x-pack/plugins/file_upload/public/plugin.ts
index 38f19675028d8..cbf64371fc4c3 100644
--- a/x-pack/plugins/file_upload/public/plugin.ts
+++ b/x-pack/plugins/file_upload/public/plugin.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart, Plugin } from '../../../../src/core/public';
+import { CoreStart, Plugin } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   FileUploadStartApi,
   FileUploadComponent,
@@ -17,7 +18,6 @@ import {
   analyzeFile,
 } from './api';
 import { setStartServices } from './kibana_services';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { getMaxBytes, getMaxBytesFormatted } from './importer/get_max_bytes';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/plugins/file_upload/server/analyze_file.tsx b/x-pack/plugins/file_upload/server/analyze_file.tsx
index ae2b1aeef81bd..13ceea39cb794 100644
--- a/x-pack/plugins/file_upload/server/analyze_file.tsx
+++ b/x-pack/plugins/file_upload/server/analyze_file.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type {
   AnalysisResult,
   FormattedOverrides,
diff --git a/x-pack/plugins/file_upload/server/capabilities.test.ts b/x-pack/plugins/file_upload/server/capabilities.test.ts
index 53f9da26060af..bece0196f5fea 100644
--- a/x-pack/plugins/file_upload/server/capabilities.test.ts
+++ b/x-pack/plugins/file_upload/server/capabilities.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { setupCapabilities } from './capabilities';
-import { coreMock, httpServerMock } from '../../../../src/core/server/mocks';
-import { Capabilities, CoreStart } from 'kibana/server';
-import { securityMock } from '../../security/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { Capabilities, CoreStart } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
 describe('setupCapabilities', () => {
   it('registers a capabilities provider for the file upload feature', () => {
diff --git a/x-pack/plugins/file_upload/server/capabilities.ts b/x-pack/plugins/file_upload/server/capabilities.ts
index 585aca196c66e..5e0f338e4ba6c 100644
--- a/x-pack/plugins/file_upload/server/capabilities.ts
+++ b/x-pack/plugins/file_upload/server/capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { checkFileUploadPrivileges } from './check_privileges';
 import { StartDeps } from './types';
 
diff --git a/x-pack/plugins/file_upload/server/check_privileges.ts b/x-pack/plugins/file_upload/server/check_privileges.ts
index 5f8b521506840..07e137241115d 100644
--- a/x-pack/plugins/file_upload/server/check_privileges.ts
+++ b/x-pack/plugins/file_upload/server/check_privileges.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { AuthorizationServiceSetup, CheckPrivilegesPayload } from '../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { AuthorizationServiceSetup, CheckPrivilegesPayload } from '@kbn/security-plugin/server';
 
 interface Deps {
   request: KibanaRequest;
diff --git a/x-pack/plugins/file_upload/server/error_wrapper.ts b/x-pack/plugins/file_upload/server/error_wrapper.ts
index 64395f601f9ac..212c7a53ca122 100644
--- a/x-pack/plugins/file_upload/server/error_wrapper.ts
+++ b/x-pack/plugins/file_upload/server/error_wrapper.ts
@@ -6,7 +6,7 @@
  */
 
 import { boomify, isBoom } from '@hapi/boom';
-import { ResponseError, CustomHttpResponseOptions } from 'kibana/server';
+import { ResponseError, CustomHttpResponseOptions } from '@kbn/core/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
   const boom = isBoom(error)
diff --git a/x-pack/plugins/file_upload/server/get_time_field_range.ts b/x-pack/plugins/file_upload/server/get_time_field_range.ts
index 9da8e7fb2b7e4..e8b21e6807a8f 100644
--- a/x-pack/plugins/file_upload/server/get_time_field_range.ts
+++ b/x-pack/plugins/file_upload/server/get_time_field_range.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { isPopulatedObject } from '../common/utils';
diff --git a/x-pack/plugins/file_upload/server/import_data.ts b/x-pack/plugins/file_upload/server/import_data.ts
index c093cfcee190c..f8555cbd7f1d3 100644
--- a/x-pack/plugins/file_upload/server/import_data.ts
+++ b/x-pack/plugins/file_upload/server/import_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { INDEX_META_DATA_CREATED_BY } from '../common/constants';
 import {
   ImportResponse,
diff --git a/x-pack/plugins/file_upload/server/index.ts b/x-pack/plugins/file_upload/server/index.ts
index 4d38bff8fa26f..c818e74c0ddc5 100644
--- a/x-pack/plugins/file_upload/server/index.ts
+++ b/x-pack/plugins/file_upload/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FileUploadPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/file_upload/server/plugin.ts b/x-pack/plugins/file_upload/server/plugin.ts
index 9ec234c415e14..1a1a67cd212fe 100644
--- a/x-pack/plugins/file_upload/server/plugin.ts
+++ b/x-pack/plugins/file_upload/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { fileUploadRoutes } from './routes';
 import { initFileUploadTelemetry } from './telemetry';
diff --git a/x-pack/plugins/file_upload/server/routes.ts b/x-pack/plugins/file_upload/server/routes.ts
index 82c66d9c73313..0abab34ebef7b 100644
--- a/x-pack/plugins/file_upload/server/routes.ts
+++ b/x-pack/plugins/file_upload/server/routes.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
-import { CoreSetup, Logger } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { MAX_FILE_SIZE_BYTES } from '../common/constants';
 import type { IngestPipelineWrapper, InputData, Mappings, Settings } from '../common/types';
 import { wrapError } from './error_wrapper';
diff --git a/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts b/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts
index b9c8147fac5f4..9b823a0ffba32 100644
--- a/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/internal_repository.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsServiceStart, ISavedObjectsRepository } from 'kibana/server';
+import { SavedObjectsServiceStart, ISavedObjectsRepository } from '@kbn/core/server';
 
 let internalRepository: ISavedObjectsRepository | null = null;
 export const setInternalRepository = (
diff --git a/x-pack/plugins/file_upload/server/telemetry/mappings.ts b/x-pack/plugins/file_upload/server/telemetry/mappings.ts
index 04f9f55031111..a01ed92a7bfee 100644
--- a/x-pack/plugins/file_upload/server/telemetry/mappings.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { TELEMETRY_DOC_ID } from './telemetry';
 
 export const telemetryMappingsType: SavedObjectsType = {
diff --git a/x-pack/plugins/file_upload/server/telemetry/telemetry.ts b/x-pack/plugins/file_upload/server/telemetry/telemetry.ts
index deb739f6dcfa8..7b16d72a7bc6b 100644
--- a/x-pack/plugins/file_upload/server/telemetry/telemetry.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/telemetry.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash';
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 
 import { getInternalRepository } from './internal_repository';
 
diff --git a/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts b/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts
index 27ee6900d6ed5..20e34fcaf60e2 100644
--- a/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts
+++ b/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getTelemetry, initTelemetry, Telemetry } from './telemetry';
 import { telemetryMappingsType } from './mappings';
 import { setInternalRepository } from './internal_repository';
diff --git a/x-pack/plugins/file_upload/server/types.ts b/x-pack/plugins/file_upload/server/types.ts
index 241abadaf750f..9a2e229282d4b 100644
--- a/x-pack/plugins/file_upload/server/types.ts
+++ b/x-pack/plugins/file_upload/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SecurityPluginStart } from '../..//security/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 export interface StartDeps {
   security?: SecurityPluginStart;
diff --git a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts
index 7ae8242fc9965..0daf9713d8263 100644
--- a/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts
+++ b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+import { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from '../../common/utils';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
diff --git a/x-pack/plugins/fleet/.storybook/context/application.ts b/x-pack/plugins/fleet/.storybook/context/application.ts
index 4cae11dd79c07..dd75d859daa64 100644
--- a/x-pack/plugins/fleet/.storybook/context/application.ts
+++ b/x-pack/plugins/fleet/.storybook/context/application.ts
@@ -8,7 +8,7 @@
 import { of } from 'rxjs';
 import { action } from '@storybook/addon-actions';
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 const applications = new Map();
 
diff --git a/x-pack/plugins/fleet/.storybook/context/chrome.ts b/x-pack/plugins/fleet/.storybook/context/chrome.ts
index 9956f6ae6968a..1eba49cb61f02 100644
--- a/x-pack/plugins/fleet/.storybook/context/chrome.ts
+++ b/x-pack/plugins/fleet/.storybook/context/chrome.ts
@@ -6,7 +6,7 @@
  */
 
 import { action } from '@storybook/addon-actions';
-import type { ChromeStart } from 'kibana/public';
+import type { ChromeStart } from '@kbn/core/public';
 
 export const getChrome = () => {
   const chrome: ChromeStart = {
diff --git a/x-pack/plugins/fleet/.storybook/context/cloud.ts b/x-pack/plugins/fleet/.storybook/context/cloud.ts
index bed72c8ac4db7..1291f94cea788 100644
--- a/x-pack/plugins/fleet/.storybook/context/cloud.ts
+++ b/x-pack/plugins/fleet/.storybook/context/cloud.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CloudSetup } from '../../../cloud/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
 
 export const getCloud = ({ isCloudEnabled }: { isCloudEnabled: boolean }) => {
   const cloud: CloudSetup = {
diff --git a/x-pack/plugins/fleet/.storybook/context/doc_links.ts b/x-pack/plugins/fleet/.storybook/context/doc_links.ts
index bb6d8086d1cd8..e121d1bb77e6b 100644
--- a/x-pack/plugins/fleet/.storybook/context/doc_links.ts
+++ b/x-pack/plugins/fleet/.storybook/context/doc_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 export const getDocLinks = () => {
   const docLinks: DocLinksStart = {
diff --git a/x-pack/plugins/fleet/.storybook/context/execution_context.ts b/x-pack/plugins/fleet/.storybook/context/execution_context.ts
index d3a15e200129b..63c1686fc14bc 100644
--- a/x-pack/plugins/fleet/.storybook/context/execution_context.ts
+++ b/x-pack/plugins/fleet/.storybook/context/execution_context.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ExecutionContextSetup } from 'kibana/public';
+import type { ExecutionContextSetup } from '@kbn/core/public';
 import { of } from 'rxjs';
 
 export const getExecutionContext = () => {
diff --git a/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts b/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts
index db3725ffe664c..c655577bb5ede 100644
--- a/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts
+++ b/x-pack/plugins/fleet/.storybook/context/fixtures/replacement_integrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CustomIntegration } from '../../../../../../src/plugins/custom_integrations/common';
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
 
 export const integrations: CustomIntegration[] = [
   {
diff --git a/x-pack/plugins/fleet/.storybook/context/http.ts b/x-pack/plugins/fleet/.storybook/context/http.ts
index 491b62201e532..5167ad5500364 100644
--- a/x-pack/plugins/fleet/.storybook/context/http.ts
+++ b/x-pack/plugins/fleet/.storybook/context/http.ts
@@ -6,7 +6,7 @@
  */
 
 import { action } from '@storybook/addon-actions';
-import type { HttpFetchOptions, HttpHandler, HttpStart } from 'kibana/public';
+import type { HttpFetchOptions, HttpHandler, HttpStart } from '@kbn/core/public';
 
 const BASE_PATH = '';
 
diff --git a/x-pack/plugins/fleet/.storybook/context/index.tsx b/x-pack/plugins/fleet/.storybook/context/index.tsx
index 4f21614a00849..a60ecaf5a1572 100644
--- a/x-pack/plugins/fleet/.storybook/context/index.tsx
+++ b/x-pack/plugins/fleet/.storybook/context/index.tsx
@@ -13,8 +13,9 @@ import { createBrowserHistory } from 'history';
 
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { ScopedHistory } from '../../../../../src/core/public';
-import { getStorybookContextProvider } from '../../../../../src/plugins/custom_integrations/storybook';
+import { ScopedHistory } from '@kbn/core/public';
+import { getStorybookContextProvider } from '@kbn/custom-integrations-plugin/storybook';
+
 import { IntegrationsAppContext } from '../../public/applications/integrations/app';
 import type { FleetConfigType, FleetStartServices } from '../../public/plugin';
 
diff --git a/x-pack/plugins/fleet/.storybook/context/notifications.ts b/x-pack/plugins/fleet/.storybook/context/notifications.ts
index c1e9ef26a41d7..f1a95797cb5ba 100644
--- a/x-pack/plugins/fleet/.storybook/context/notifications.ts
+++ b/x-pack/plugins/fleet/.storybook/context/notifications.ts
@@ -8,7 +8,7 @@
 import uuid from 'uuid';
 import { of } from 'rxjs';
 import { action } from '@storybook/addon-actions';
-import type { NotificationsStart } from 'kibana/public';
+import type { NotificationsStart } from '@kbn/core/public';
 
 const handler = (type: string, ...rest: any[]) => {
   action(`${type} Toast`)(rest);
diff --git a/x-pack/plugins/fleet/.storybook/context/share.ts b/x-pack/plugins/fleet/.storybook/context/share.ts
index b6a8dfbcdcb67..e79713ee80bff 100644
--- a/x-pack/plugins/fleet/.storybook/context/share.ts
+++ b/x-pack/plugins/fleet/.storybook/context/share.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 
 export const getShare = () => {
   const share: SharePluginStart = {
diff --git a/x-pack/plugins/fleet/.storybook/context/ui_settings.ts b/x-pack/plugins/fleet/.storybook/context/ui_settings.ts
index fe2e8d98cd6df..f2ad92b545cf7 100644
--- a/x-pack/plugins/fleet/.storybook/context/ui_settings.ts
+++ b/x-pack/plugins/fleet/.storybook/context/ui_settings.ts
@@ -6,7 +6,7 @@
  */
 
 import { of } from 'rxjs';
-import type { IUiSettingsClient } from 'kibana/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 
 const settings: Record<string, any> = {
   'theme:darkMode': false,
diff --git a/x-pack/plugins/fleet/common/services/license.ts b/x-pack/plugins/fleet/common/services/license.ts
index a5fdfb1e74149..c8e418deede5a 100644
--- a/x-pack/plugins/fleet/common/services/license.ts
+++ b/x-pack/plugins/fleet/common/services/license.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { ILicense, LicenseType } from '../../../licensing/common/types';
+import type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 
 // Generic license service class that works with the license observable
 // Both server and client plugins instancates a singleton version of this class
diff --git a/x-pack/plugins/fleet/common/services/package_to_package_policy.ts b/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
index 0d40adb4bf7dc..3b8a384ede0b6 100644
--- a/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
+++ b/x-pack/plugins/fleet/common/services/package_to_package_policy.ts
@@ -17,7 +17,7 @@ import type {
   PackagePolicyConfigRecordEntry,
 } from '../types';
 
-import { doesPackageHaveIntegrations } from './';
+import { doesPackageHaveIntegrations } from '.';
 
 export const getStreamsForInputType = (
   inputType: string,
diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
index 2a8c187d71629..4d54fda6e5df5 100644
--- a/x-pack/plugins/fleet/common/services/validate_package_policy.ts
+++ b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
@@ -19,7 +19,7 @@ import type {
   RegistryVarsEntry,
 } from '../types';
 
-import { isValidNamespace, doesPackageHaveIntegrations } from './';
+import { isValidNamespace, doesPackageHaveIntegrations } from '.';
 
 type Errors = string[] | null;
 
diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
index 4d87d10385617..c289ebf32fd16 100644
--- a/x-pack/plugins/fleet/common/types/models/agent_policy.ts
+++ b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -6,7 +6,7 @@
  */
 
 import type { agentPolicyStatuses } from '../../constants';
-import type { MonitoringType, ValueOf } from '../../types';
+import type { MonitoringType, ValueOf } from '..';
 
 import type { PackagePolicy, PackagePolicyPackage } from './package_policy';
 import type { Output } from './output';
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index 060606251a6a5..41564fdb10b3b 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -8,7 +8,9 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // Follow pattern from https://github.com/elastic/kibana/pull/52447
 // TODO: Update when https://github.com/elastic/kibana/issues/53021 is closed
-import type { SavedObject, SavedObjectAttributes, SavedObjectReference } from 'src/core/public';
+import type { SavedObject, SavedObjectAttributes, SavedObjectReference } from '@kbn/core/public';
+
+import type { CustomIntegrationIcon } from '@kbn/custom-integrations-plugin/common';
 
 import type {
   ASSETS_SAVED_OBJECT_TYPE,
@@ -17,9 +19,7 @@ import type {
   monitoringTypes,
   installationStatuses,
 } from '../../constants';
-import type { ValueOf } from '../../types';
-
-import type { CustomIntegrationIcon } from '../../../../../../src/plugins/custom_integrations/common';
+import type { ValueOf } from '..';
 
 import type {
   PackageSpecManifest,
diff --git a/x-pack/plugins/fleet/common/types/models/output.ts b/x-pack/plugins/fleet/common/types/models/output.ts
index dbdde9cf34e5b..49115ffbeeed1 100644
--- a/x-pack/plugins/fleet/common/types/models/output.ts
+++ b/x-pack/plugins/fleet/common/types/models/output.ts
@@ -6,7 +6,7 @@
  */
 
 import type { outputType } from '../../constants';
-import type { ValueOf } from '../index';
+import type { ValueOf } from '..';
 
 export type OutputType = typeof outputType;
 
diff --git a/x-pack/plugins/fleet/common/types/models/settings.ts b/x-pack/plugins/fleet/common/types/models/settings.ts
index 15d7492868797..1b8eeac9356fd 100644
--- a/x-pack/plugins/fleet/common/types/models/settings.ts
+++ b/x-pack/plugins/fleet/common/types/models/settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectAttributes } from 'src/core/public';
+import type { SavedObjectAttributes } from '@kbn/core/public';
 
 export interface BaseSettings {
   has_seen_add_data_notice?: boolean;
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/common.ts b/x-pack/plugins/fleet/common/types/rest_spec/common.ts
index 15a280a62450a..7a0390d830de3 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/common.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpFetchQuery } from 'src/core/public';
+import type { HttpFetchQuery } from '@kbn/core/public';
 
 export interface ListWithKuery extends HttpFetchQuery {
   page?: number;
diff --git a/x-pack/plugins/fleet/kibana.json b/x-pack/plugins/fleet/kibana.json
index 67ee2daf63725..66301f6b6fb9c 100644
--- a/x-pack/plugins/fleet/kibana.json
+++ b/x-pack/plugins/fleet/kibana.json
@@ -11,5 +11,5 @@
   "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations", "share", "spaces", "security"],
   "optionalPlugins": ["features", "cloud", "usageCollection", "home", "globalSearch", "telemetry"],
   "extraPublicDirs": ["common"],
-  "requiredBundles": ["kibanaReact", "cloud", "esUiShared", "home", "infra", "kibanaUtils", "usageCollection", "unifiedSearch"]
+  "requiredBundles": ["kibanaReact", "cloud", "esUiShared", "infra", "kibanaUtils", "usageCollection", "unifiedSearch"]
 }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index cd4ba97019766..b871f6d4e690b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -7,7 +7,7 @@
 
 import type { FunctionComponent } from 'react';
 import React, { memo, useEffect, useState } from 'react';
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel } from '@elastic/eui';
 import type { History } from 'history';
 import { Router, Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
@@ -16,16 +16,14 @@ import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import useObservable from 'react-use/lib/useObservable';
 
-import type { TopNavMenuData } from 'src/plugins/navigation/public';
+import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import type { FleetConfigType, FleetStartServices } from '../../plugin';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
 
 import { PackageInstallProvider } from '../integrations/hooks';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
index 40e0fc5aca40d..fb1a1c9965780 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
@@ -9,9 +9,10 @@ import React, { useState, useEffect, useMemo } from 'react';
 
 import { fromKueryExpression } from '@kbn/es-query';
 
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+
 import { useStartServices } from '../hooks';
 import { INDEX_NAME, AGENTS_PREFIX } from '../constants';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx
index 2d83be3875089..70b0f366404e7 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_breadcrumbs.tsx
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ChromeBreadcrumb } from 'src/core/public';
+import type { ChromeBreadcrumb } from '@kbn/core/public';
 
 import type { Page, DynamicPagePathValues } from '../constants';
 import { FLEET_BASE_PATH, INTEGRATIONS_BASE_PATH, pagePathGetters } from '../constants';
 
-import { useStartServices } from './';
+import { useStartServices } from '.';
 
 interface AdditionalBreadcrumbOptions {
   useIntegrationsBasePath: boolean;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/index.tsx
index 8946e6af0ce75..a2a91b1055684 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import type { RouteProps } from 'react-router-dom';
 import { Redirect, Route } from 'react-router-dom';
-import type { CoreStart, AppMountParameters } from 'src/core/public';
+import type { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 import type { FleetConfigType, FleetStartServices } from '../../plugin';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
index b4fbd874ebf13..2e06887cb8015 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_create_inline.tsx
@@ -23,12 +23,13 @@ import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 
 import { dataTypes } from '../../../../../../common';
-import { agentPolicyFormValidation } from '../components';
 
 import type { AgentPolicy, NewAgentPolicy } from '../../../types';
 
 import { sendCreateAgentPolicy } from '../../../hooks';
 
+import { agentPolicyFormValidation } from '.';
+
 import { AgentPolicyAdvancedOptionsContent } from './agent_policy_advanced_fields';
 import { AgentPolicyFormSystemMonitoringCheckbox } from './agent_policy_system_monitoring_field';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
index 3d4d3d59bcbb2..10878a3c0af91 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
@@ -19,8 +19,9 @@ import {
 } from '@elastic/eui';
 import styled from 'styled-components';
 
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+
 import type { RegistryVarsEntry } from '../../../../types';
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
 
 import { MultiTextInput } from './multi_text_input';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx
index 23429cc40c388..0f719f6a61585 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.test.tsx
@@ -23,7 +23,7 @@ import {
   useGetPackageInfoByKey,
 } from '../../../hooks';
 
-import { CreatePackagePolicyPage } from './index';
+import { CreatePackagePolicyPage } from '.';
 
 jest.mock('../../../hooks', () => {
   return {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
index e41b98c05e41c..2d339013f5033 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
@@ -9,7 +9,7 @@ import { safeLoad } from 'js-yaml';
 
 import type { PackagePolicyConfigRecord, RegistryVarsEntry } from '../../../../types';
 
-import { validatePackagePolicyConfig } from './';
+import { validatePackagePolicyConfig } from '.';
 
 export const hasInvalidButRequiredVar = (
   registryVars?: RegistryVarsEntry[],
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts
index f6db6aaf73cc1..cfedc62c30d3e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/utils/append_on_save_query_params.test.ts
@@ -8,7 +8,7 @@ import { parse } from 'query-string';
 
 import type { PackagePolicy, OnSaveQueryParamKeys } from '../../../../types';
 
-import { appendOnSaveQueryParamsToPath } from './';
+import { appendOnSaveQueryParamsToPath } from '.';
 
 const mockPolicy: PackagePolicy = { policy_id: '1234' } as PackagePolicy;
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
index c0685f72d9e5c..14fc3eb1d24c3 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
@@ -27,10 +27,11 @@ import { fromKueryExpression } from '@kbn/es-query';
 import semverGte from 'semver/functions/gte';
 import semverCoerce from 'semver/functions/coerce';
 
-import { createStateContainerReactHelpers } from '../../../../../../../../../../../src/plugins/kibana_utils/public';
-import { RedirectAppLinks } from '../../../../../../../../../../../src/plugins/kibana_react/public';
-import type { TimeRange } from '../../../../../../../../../../../src/plugins/data/public';
-import { LogStream } from '../../../../../../../../../infra/public';
+import { createStateContainerReactHelpers } from '@kbn/kibana-utils-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import type { TimeRange } from '@kbn/data-plugin/public';
+import { LogStream } from '@kbn/infra-plugin/public';
+
 import type { Agent, AgentPolicy } from '../../../../../types';
 import { useLink, useStartServices } from '../../../../../hooks';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx
index 76a7f0514a8a2..abb4f46c90c85 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/index.tsx
@@ -7,16 +7,13 @@
 
 import React, { memo, useEffect, useState, useMemo } from 'react';
 
-import type {
-  INullableBaseStateContainer,
-  PureTransition,
-} from '../../../../../../../../../../../src/plugins/kibana_utils/public';
+import type { INullableBaseStateContainer, PureTransition } from '@kbn/kibana-utils-plugin/public';
 import {
   createStateContainer,
   syncState,
   createKbnUrlStateStorage,
   getStateFromKbnUrl,
-} from '../../../../../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
 import { DEFAULT_LOGS_STATE, STATE_STORAGE_KEY } from './constants';
 import type { AgentLogsProps, AgentLogsState } from './agent_logs';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
index 6fa49491b2c62..149540b152b7f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
@@ -8,9 +8,10 @@
 import React, { memo, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import type { FieldSpec } from '../../../../../../../../../../../src/plugins/data/common';
-import { QueryStringInput } from '../../../../../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../../../../../src/plugins/data_views/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+
 import { useStartServices } from '../../../../../hooks';
 
 import {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx
index beff83dd4d814..bee7fbfd85371 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx
@@ -11,7 +11,7 @@ import styled from 'styled-components';
 
 import { useStartServices, sendGetPermissionsCheck } from '../../../hooks';
 
-import { FleetServerMissingPrivileges } from '../../agents/components/fleet_server_callouts';
+import { FleetServerMissingPrivileges } from '../components/fleet_server_callouts';
 
 import { Loading } from '../../../components';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx
index bd486f3c95641..0d71fa8459f47 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.test.tsx
@@ -14,7 +14,7 @@ import { useFleetStatus } from '../../../../../../hooks/use_fleet_status';
 import { EditOutputFlyout } from '.';
 
 // mock yaml code editor
-jest.mock('../../../../../../../../../../src/plugins/kibana_react/public/code_editor', () => ({
+jest.mock('@kbn/kibana-react-plugin/public/code_editor', () => ({
   CodeEditor: () => <>CODE EDITOR</>,
 }));
 jest.mock('../../../../../../hooks/use_fleet_status', () => ({
@@ -53,7 +53,7 @@ describe('EditOutputFlyout', () => {
     // Does not show logstash SSL inputs
     expect(utils.queryByLabelText('Client SSL certificate key')).toBeNull();
     expect(utils.queryByLabelText('Client SSL certificate')).toBeNull();
-    expect(utils.queryByLabelText('Server SSL certificate authorities')).toBeNull();
+    expect(utils.queryByLabelText('Server SSL certificate authorities (optional)')).toBeNull();
   });
 
   it('should render the flyout if the output provided is a logstash output', async () => {
@@ -68,7 +68,7 @@ describe('EditOutputFlyout', () => {
     // Show logstash SSL inputs
     expect(utils.queryByLabelText('Client SSL certificate key')).not.toBeNull();
     expect(utils.queryByLabelText('Client SSL certificate')).not.toBeNull();
-    expect(utils.queryByLabelText('Server SSL certificate authorities')).not.toBeNull();
+    expect(utils.queryByLabelText('Server SSL certificate authorities (optional)')).not.toBeNull();
   });
 
   it('should show a callout in the flyout if the selected output is logstash and no encrypted key is set', async () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
index c0b8f158f43de..09bd7d2280756 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/index.tsx
@@ -260,7 +260,7 @@ export const EditOutputFlyout: React.FunctionComponent<EditOutputFlyoutProps> =
               label={i18n.translate(
                 'xpack.fleet.settings.editOutputFlyout.sslCertificateAuthoritiesInputLabel',
                 {
-                  defaultMessage: 'Server SSL certificate authorities',
+                  defaultMessage: 'Server SSL certificate authorities (optional)',
                 }
               )}
               multiline={true}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx
index 21581677e093a..8cec82b11c990 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/edit_output_flyout/yaml_code_editor_with_placeholder.tsx
@@ -11,8 +11,8 @@ import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import { EuiCodeBlock, EuiTextColor } from '@elastic/eui';
 
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
-import type { CodeEditorProps } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import type { CodeEditorProps } from '@kbn/kibana-react-plugin/public';
 
 const CodeEditorContainer = styled.div`
   min-height: 0;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
index afe96713f065d..ac196576ba889 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/fleet_server_hosts_flyout/use_fleet_server_host_form.tsx
@@ -77,7 +77,14 @@ function validateFleetServerHosts(value: string[]) {
   const res: Array<{ message: string; index: number }> = [];
   const hostIndexes: { [key: string]: number[] } = {};
   value.forEach((val, idx) => {
-    if (!val.match(URL_REGEX)) {
+    if (!val) {
+      res.push({
+        message: i18n.translate('xpack.fleet.settings.fleetServerHostsRequiredError', {
+          defaultMessage: 'Host URL is required',
+        }),
+        index: idx,
+      });
+    } else if (!val.match(URL_REGEX)) {
       res.push({
         message: i18n.translate('xpack.fleet.settings.fleetServerHostsError', {
           defaultMessage: 'Invalid URL',
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx
index 1239233b4e12d..9fbeb6eb120c8 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/helpers.tsx
@@ -6,7 +6,7 @@
  */
 
 export const LOGSTASH_CONFIG_PIPELINES = `- pipeline.id: elastic-agent-pipeline
-  path.config: "/etc/path/to/elastic-agent-pipeline.config"
+  path.config: "/etc/path/to/elastic-agent-pipeline.conf"
 `;
 
 export function getLogstashPipeline(apiKey?: string) {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx
index 1fdffd1c8a30b..e87e0049bde89 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/logstash_instructions/index.tsx
@@ -12,6 +12,7 @@ import {
   EuiButton,
   EuiSpacer,
   EuiLink,
+  EuiCode,
   EuiCodeBlock,
   EuiCopy,
   EuiButtonIcon,
@@ -150,7 +151,10 @@ const LogstashInstructionSteps = () => {
           <>
             <FormattedMessage
               id="xpack.fleet.settings.logstashInstructions.addPipelineStepDescription"
-              defaultMessage="In your Logstash configuration directory, open the pipelines.yml file and add the following configuration. Replace the path to your file."
+              defaultMessage="In your Logstash configuration directory, open the {pipelineFile} file and add the following configuration. Replace the path to your file."
+              values={{
+                pipelineFile: <EuiCode>pipelines.yml</EuiCode>,
+              }}
             />
             <EuiSpacer size="m" />
             <EuiCodeBlock paddingSize="m" language="yaml" isCopyable>
@@ -164,7 +168,10 @@ const LogstashInstructionSteps = () => {
           <>
             <FormattedMessage
               id="xpack.fleet.settings.logstashInstructions.editPipelineStepDescription"
-              defaultMessage="Next, open the elastic-agent-pipeline.config file and insert the following content:"
+              defaultMessage="Next, open the {pipelineConfFile} file and insert the following content:"
+              values={{
+                pipelineConfFile: <EuiCode>elastic-agent-pipeline.conf</EuiCode>,
+              }}
             />
             <EuiSpacer size="m" />
             <EuiCodeBlock paddingSize="m" language="yaml" isCopyable>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx
index 1497d2a422ce4..8bb0a565be040 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/multi_row_input/index.tsx
@@ -28,7 +28,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import type { EuiTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 export interface MultiRowInputProps {
   id: string;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index 2c5b3b98c3e9a..717e528443a3f 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -6,24 +6,21 @@
  */
 
 import React, { memo } from 'react';
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 import { EuiErrorBoundary } from '@elastic/eui';
 import type { History } from 'history';
 import { Router, Redirect, Route, Switch } from 'react-router-dom';
 import useObservable from 'react-use/lib/useObservable';
 
-import { ConfigContext, FleetStatusProvider, KibanaVersionContext } from '../../hooks';
+import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { Chat } from '@kbn/cloud-plugin/public';
 
-import type { FleetConfigType, FleetStartServices } from '../../plugin';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
-import { Chat } from '../../../../cloud/public';
+import type { FleetConfigType, FleetStartServices } from '../../plugin';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { ConfigContext, FleetStatusProvider, KibanaVersionContext } from '../../hooks';
 
 import { AgentPolicyContextProvider } from './hooks';
 import { INTEGRATIONS_ROUTING_PATHS, pagePathGetters } from './constants';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
index b594171a7bae0..782d06d319d99 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiHeaderSectionItem, EuiHeaderSection, EuiHeaderLinks } from '@elastic/eui';
 
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 
 import { HeaderPortal } from './header_portal';
 import { DeploymentDetails } from './deployment_details';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
index ed6a94ff077dc..190a6e1ba49c7 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header_portal.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
 import type { FC } from 'react';
 import React, { useEffect, useMemo } from 'react';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
 
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export interface Props {
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
index fd1dd8157c5c3..28f41fcabfcba 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
@@ -7,12 +7,12 @@
 
 import { useRef } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { ChromeBreadcrumb } from 'src/core/public';
+import type { ChromeBreadcrumb } from '@kbn/core/public';
 
 import type { Page, DynamicPagePathValues } from '../constants';
 import { INTEGRATIONS_BASE_PATH, pagePathGetters } from '../constants';
 
-import { useStartServices } from './index';
+import { useStartServices } from '.';
 
 const BASE_BREADCRUMB: ChromeBreadcrumb = {
   href: pagePathGetters.integrations()[1],
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts
index f69132d9a6452..05e460e056c49 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.test.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import type { PackageListItem } from '../../../../common/types/models';
-import type { CustomIntegration } from '../../../../../../../src/plugins/custom_integrations/common';
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
 
-import type { IntegrationCategory } from '../../../../../../../src/plugins/custom_integrations/common';
+import type { PackageListItem } from '../../../../common/types/models';
 
 import { useMergeEprPackagesWithReplacements } from './use_merge_epr_with_replacements';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts
index ff1b51ef19a81..89163e0438a2d 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_merge_epr_with_replacements.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+import { filterCustomIntegrations } from '@kbn/custom-integrations-plugin/public';
+
 import type { PackageListItem } from '../../../../common/types/models';
-import type { CustomIntegration } from '../../../../../../../src/plugins/custom_integrations/common';
-import { filterCustomIntegrations } from '../../../../../../../src/plugins/custom_integrations/public';
 import { FLEET_APM_PACKAGE } from '../../../../common/constants';
 
 // Export this as a utility to find replacements for a package (e.g. in the overview-page for an EPR package)
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
index 832397cbc93fd..cf60b3d783f3e 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
@@ -9,11 +9,12 @@ import createContainer from 'constate';
 import React, { useCallback, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { NotificationsStart } from 'src/core/public';
+import type { NotificationsStart } from '@kbn/core/public';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
 import type { PackageInfo } from '../../../types';
 import { sendInstallPackage, sendRemovePackage, useLink } from '../../../hooks';
 import { InstallStatus } from '../../../types';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
index 1edf5775e3df3..adf57e23dbcf1 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
@@ -9,7 +9,7 @@ import ReactDOM from 'react-dom';
 import { Redirect, Route } from 'react-router-dom';
 import type { RouteProps } from 'react-router-dom';
 
-import type { CoreStart, AppMountParameters } from 'src/core/public';
+import type { CoreStart, AppMountParameters } from '@kbn/core/public';
 
 import type { FleetConfigType, FleetStartServices } from '../../plugin';
 import { licenseService } from '../../hooks';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
index 920cdeb2d8faa..2554a8b730938 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { useLink } from '../../../hooks';
 import type { Section } from '../sections';
 
-import { WithHeaderLayout } from './';
+import { WithHeaderLayout } from '.';
 
 interface Props {
   section?: Section;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
index 499b5f2512e7c..ff98fb988d04b 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.stories.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import type { SavedObject } from 'src/core/public';
+import type { SavedObject } from '@kbn/core/public';
 
 import type { Installation } from '../../../../../../common';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
index 7181241776dda..a97a9ec8c1c24 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { EuiCard, EuiFlexItem, EuiBadge, EuiToolTip, EuiSpacer } from '@elastic/eui';
 
-import { TrackApplicationView } from '../../../../../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 
 import { CardIcon } from '../../../../../components/package_icon';
 import type { IntegrationCardItem } from '../../../../../../common/types/models/epm';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
index b0e1189f131ba..c65749178ddee 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/assets.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { groupBy } from 'lodash';
 
-import type { ResolvedSimpleSavedObject } from 'src/core/public';
+import type { ResolvedSimpleSavedObject } from '@kbn/core/public';
 
 import { Loading, Error, ExtensionWrapper } from '../../../../../components';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts
index 26a6729be3623..59ae6636aa8ff 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/assets/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SimpleSavedObject } from 'src/core/public';
+import type { SimpleSavedObject } from '@kbn/core/public';
 
 import type { KibanaAssetType } from '../../../../../types';
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
index 9448294109819..e4341af45cf41 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
@@ -32,7 +32,7 @@ import {
 import type { MockedFleetStartServices, TestRenderer } from '../../../../../../mock';
 import { createIntegrationsTestRendererMock } from '../../../../../../mock';
 
-import { Detail } from './index';
+import { Detail } from '.';
 
 describe('when on integration detail', () => {
   const pkgkey = 'nginx-0.3.7';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
index 0d7ae2d9053aa..83631c674f754 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
@@ -18,7 +18,9 @@ import {
 } from '@elastic/eui';
 import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+
+import { withSuspense, LazyReplacementCard } from '@kbn/custom-integrations-plugin/public';
 
 import type {
   PackageInfo,
@@ -30,11 +32,6 @@ import { entries } from '../../../../../types';
 import { useGetCategories } from '../../../../../hooks';
 import { AssetTitleMap, DisplayedAssets, ServiceTitleMap } from '../../../constants';
 
-import {
-  withSuspense,
-  LazyReplacementCard,
-} from '../../../../../../../../../../../src/plugins/custom_integrations/public';
-
 import { NoticeModal } from './notice_modal';
 
 const ReplacementCard = withSuspense(LazyReplacementCard);
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
index 09db4208f40fc..9202d89d7c93b 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
@@ -23,7 +23,7 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
 
 import type { PackageInfo, UpgradePackagePolicyDryRunResponse } from '../../../../../types';
 import { InstallStatus } from '../../../../../types';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx
index bea7b80015cc8..b409e6b09fa5f 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/update_button.tsx
@@ -19,7 +19,9 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import type {
   GetAgentPoliciesResponse,
@@ -38,7 +40,6 @@ import {
   useAuthz,
   useLink,
 } from '../../../../../hooks';
-import { toMountPoint } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 
 interface UpdateButtonProps extends Pick<PackageInfo, 'name' | 'title' | 'version'> {
   dryRunData?: UpgradePackagePolicyDryRunResponse | null;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
index 7547e06201171..88343528afa0c 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/available_packages.tsx
@@ -22,8 +22,11 @@ import {
   EuiLink,
 } from '@elastic/eui';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
+
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+
 import { useStartServices } from '../../../../hooks';
-import { TrackApplicationView } from '../../../../../../../../../../src/plugins/usage_collection/public';
 
 import { pagePathGetters } from '../../../../constants';
 import {
@@ -38,8 +41,6 @@ import { doesPackageHaveIntegrations } from '../../../../services';
 import type { PackageList } from '../../../../types';
 import { PackageListGrid } from '../../components/package_list_grid';
 
-import type { CustomIntegration } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-
 import type { PackageListItem } from '../../../../types';
 
 import type { IntegrationCardItem } from '../../../../../../../common/types/models';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
index e3fc5e15488e6..944cb8f94cfb2 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
@@ -8,13 +8,14 @@
 import React, { memo } from 'react';
 import { Switch, Route } from 'react-router-dom';
 
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
+
+import type { CustomIntegration } from '@kbn/custom-integrations-plugin/common';
+
 import type { DynamicPage, DynamicPagePathValues, StaticPage } from '../../../../constants';
 import { INTEGRATIONS_ROUTING_PATHS, INTEGRATIONS_SEARCH_QUERYPARAM } from '../../../../constants';
 import { DefaultLayout } from '../../../../layouts';
 
-import type { IntegrationCategory } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-import type { CustomIntegration } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-
 import type { PackageListItem } from '../../../../types';
 
 import type { IntegrationCardItem } from '../../../../../../../common/types/models';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts
index 70902b2bc1897..b46381886e762 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/util.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IntegrationCategory } from '../../../../../../../../../../src/plugins/custom_integrations/common';
-import { INTEGRATION_CATEGORY_DISPLAY } from '../../../../../../../../../../src/plugins/custom_integrations/common';
+import type { IntegrationCategory } from '@kbn/custom-integrations-plugin/common';
+import { INTEGRATION_CATEGORY_DISPLAY } from '@kbn/custom-integrations-plugin/common';
 
 import type { IntegrationCardItem } from '../../../../../../../common/types/models';
 
diff --git a/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx b/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
index fd502f768656f..ad4e13a35f244 100644
--- a/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
+++ b/x-pack/plugins/fleet/public/components/add_agent_help_popover.tsx
@@ -13,7 +13,7 @@ import type { NoArgCallback } from '@elastic/eui';
 import { EuiTourStep, EuiLink, EuiText } from '@elastic/eui';
 import { useTheme } from 'styled-components';
 
-import type { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 import { useStartServices } from '../hooks';
 
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
index 7a4d1ed44c406..b2680129dd7d5 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
@@ -11,9 +11,9 @@ import React from 'react';
 import { registerTestBed } from '@kbn/test-jest-helpers';
 import { act } from '@testing-library/react';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import type { AgentPolicy } from '../../../common';
 import { useGetSettings, sendGetOneAgentPolicy, useGetAgents } from '../../hooks/use_request';
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
index 63737adb5caea..768decc54ee40 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -119,6 +119,7 @@ export const AgentPolicySelection: React.FC<Props> = (props) => {
           />
         )}
       </EuiText>
+      <EuiSpacer size="m" />
       <AgentPolicyFormRow
         fullWidth={true}
         label={
@@ -165,14 +166,14 @@ export const AgentPolicySelection: React.FC<Props> = (props) => {
           />
         </>
       )}
-      {props.withKeySelection && props.onKeyChange && (
+      {props.withKeySelection && props.onKeyChange && selectedPolicy?.id && (
         <>
-          <EuiSpacer />
+          <EuiSpacer size="m" />
           <AdvancedAgentAuthenticationSettings
             selectedApiKeyId={props.selectedApiKeyId}
             onKeyChange={props.onKeyChange}
             initialAuthenticationSettingsOpen={!props.selectedApiKeyId}
-            agentPolicyId={selectedPolicy?.id}
+            agentPolicyId={selectedPolicy.id}
           />
         </>
       )}
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
index b74129e443e45..021acfbb17644 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/confirm_incoming_data.tsx
@@ -6,7 +6,8 @@
  */
 
 import React from 'react';
-import { EuiCallOut, EuiText, EuiSpacer, EuiButton } from '@elastic/eui';
+import { EuiCallOut, EuiText, EuiSpacer, EuiButton, EuiLink } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
 import type { InstalledIntegrationPolicy } from './use_get_agent_incoming_data';
@@ -17,6 +18,7 @@ interface Props {
   installedPolicy?: InstalledIntegrationPolicy;
   agentDataConfirmed: boolean;
   setAgentDataConfirmed: (v: boolean) => void;
+  troubleshootLink: string;
 }
 
 export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
@@ -24,6 +26,7 @@ export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
   installedPolicy,
   agentDataConfirmed,
   setAgentDataConfirmed,
+  troubleshootLink,
 }) => {
   const { incomingData, isLoading } = usePollingIncomingData(agentIds);
 
@@ -37,11 +40,21 @@ export const ConfirmIncomingData: React.FunctionComponent<Props> = ({
   }
   if (!agentDataConfirmed) {
     return (
-      <EuiText size="s">
-        {i18n.translate('xpack.fleet.confirmIncomingData.loading', {
-          defaultMessage:
-            'It may take a few minutes for data to arrive in Elasticsearch. If the system is not generating data, it may help to generate some to ensure data is being collected correctly. If you’re having trouble, see our troubleshooting guide. You may close this dialog and check later by viewing our integration assets.',
-        })}
+      <EuiText>
+        <FormattedMessage
+          id="xpack.fleet.confirmIncomingData.loading"
+          defaultMessage="It may take a few minutes for data to arrive in Elasticsearch. If the system is not generating data, it may help to generate some to ensure data is being collected correctly. If you’re having trouble, see our {link}. You may close this dialog and check later by viewing your integration assets."
+          values={{
+            link: (
+              <EuiLink target="_blank" external href={troubleshootLink}>
+                <FormattedMessage
+                  id="xpack.fleet.enrollmentInstructions.troubleshootingLink"
+                  defaultMessage="troubleshooting guide"
+                />
+              </EuiLink>
+            ),
+          }}
+        />
       </EuiText>
     );
   }
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx
new file mode 100644
index 0000000000000..5134c6ff03060
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx
@@ -0,0 +1,187 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useMemo, useState } from 'react';
+import {
+  EuiText,
+  EuiButton,
+  EuiSpacer,
+  EuiCode,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiCopy,
+  EuiCodeBlock,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import semverMajor from 'semver/functions/major';
+import semverMinor from 'semver/functions/minor';
+import semverPatch from 'semver/functions/patch';
+
+import { useGetSettings, useKibanaVersion, useStartServices } from '../../hooks';
+
+import { agentPolicyRouteService } from '../../../common';
+
+import { sendGetK8sManifest } from '../../hooks/use_request/k8s';
+
+interface Props {
+  hasFleetServer: boolean;
+  isK8s?: string;
+  enrollmentAPIKey?: string;
+}
+
+export const DownloadInstructions: React.FunctionComponent<Props> = ({
+  hasFleetServer,
+  isK8s,
+  enrollmentAPIKey,
+}) => {
+  const kibanaVersion = useKibanaVersion();
+  const core = useStartServices();
+  const settings = useGetSettings();
+  const kibanaVersionURLString = useMemo(
+    () =>
+      `${semverMajor(kibanaVersion)}-${semverMinor(kibanaVersion)}-${semverPatch(kibanaVersion)}`,
+    [kibanaVersion]
+  );
+  const { notifications } = core;
+
+  const [yaml, setYaml] = useState<string>('');
+  const [fleetServer, setFleetServer] = useState<string | ''>();
+
+  useEffect(() => {
+    async function fetchK8sManifest() {
+      try {
+        if (isK8s !== 'IS_KUBERNETES') {
+          return;
+        }
+        const fleetServerHosts = settings.data?.item.fleet_server_hosts;
+        let host = '';
+        if (fleetServerHosts !== undefined && fleetServerHosts.length !== 0) {
+          setFleetServer(fleetServerHosts[0]);
+          host = fleetServerHosts[0];
+        }
+        const query = { fleetServer: host, enrolToken: enrollmentAPIKey };
+        const res = await sendGetK8sManifest(query);
+        if (res.error) {
+          throw res.error;
+        }
+
+        if (!res.data) {
+          throw new Error('No data while fetching agent manifest');
+        }
+
+        setYaml(res.data.item);
+      } catch (error) {
+        notifications.toasts.addError(error, {
+          title: i18n.translate('xpack.fleet.agentEnrollment.loadk8sManifestErrorTitle', {
+            defaultMessage: 'Error while fetching agent manifest',
+          }),
+        });
+      }
+    }
+    fetchK8sManifest();
+  }, [isK8s, notifications.toasts, enrollmentAPIKey, settings.data?.item.fleet_server_hosts]);
+
+  const downloadDescription = hasFleetServer ? (
+    <FormattedMessage
+      id="xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer"
+      defaultMessage="Fleet Server runs on an Elastic Agent. Install this agent on a centralized host so that other hosts you wish to monitor can connect to it. In production, we recommend using one or more dedicated hosts. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
+    />
+  ) : isK8s === 'IS_KUBERNETES' ? (
+    <FormattedMessage
+      id="xpack.fleet.agentEnrollment.downloadDescriptionForK8s"
+      defaultMessage="Copy or download the Kubernetes manifest inside the Kubernetes cluster. Check {FleetUrlVariable} and {FleetTokenVariable} in the Daemonset environment variables and apply the manifest."
+      values={{
+        FleetUrlVariable: <EuiCode>FLEET_URL</EuiCode>,
+        FleetTokenVariable: <EuiCode>FLEET_ENROLLMENT_TOKEN</EuiCode>,
+      }}
+    />
+  ) : (
+    <FormattedMessage
+      id="xpack.fleet.agentEnrollment.downloadDescription"
+      defaultMessage="Install the Elastic Agent on the hosts you wish to monitor. Do not install this agent policy on a host containing Fleet Server. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
+    />
+  );
+
+  const linuxUsers =
+    isK8s !== 'IS_KUBERNETES' ? (
+      <FormattedMessage
+        id="xpack.fleet.agentEnrollment.downloadUseLinuxInstaller"
+        defaultMessage="Linux users: We recommend the installer (TAR) over system packages (RPM/DEB) because it lets you upgrade your agent in Fleet."
+      />
+    ) : (
+      ''
+    );
+
+  const k8sCopyYaml =
+    isK8s === 'IS_KUBERNETES' ? (
+      <EuiCopy textToCopy={yaml}>
+        {(copy) => (
+          <EuiButton onClick={copy} iconType="copyClipboard">
+            <FormattedMessage
+              id="xpack.fleet.agentEnrollment.copyPolicyButton"
+              defaultMessage="Copy to clipboard"
+            />
+          </EuiButton>
+        )}
+      </EuiCopy>
+    ) : (
+      ''
+    );
+
+  const k8sYaml =
+    isK8s === 'IS_KUBERNETES' ? (
+      <EuiCodeBlock language="yaml" style={{ maxHeight: 300 }} fontSize="m">
+        {yaml}
+      </EuiCodeBlock>
+    ) : (
+      ''
+    );
+
+  const downloadLink =
+    isK8s === 'IS_KUBERNETES'
+      ? core.http.basePath.prepend(
+          `${agentPolicyRouteService.getK8sFullDownloadPath()}?fleetServer=${fleetServer}&enrolToken=${enrollmentAPIKey}`
+        )
+      : `https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`;
+
+  const downloadMsg =
+    isK8s === 'IS_KUBERNETES' ? (
+      <FormattedMessage
+        id="xpack.fleet.agentEnrollment.downloadManifestButtonk8s"
+        defaultMessage="Download Manifest"
+      />
+    ) : (
+      <FormattedMessage
+        id="xpack.fleet.agentEnrollment.downloadLink"
+        defaultMessage="Go to download page"
+      />
+    );
+
+  return (
+    <>
+      <EuiText>{downloadDescription}</EuiText>
+      <EuiSpacer size="s" />
+      <EuiText size="s">
+        <>{linuxUsers}</>
+      </EuiText>
+      <EuiSpacer size="m" />
+      <EuiFlexGroup gutterSize="m">
+        <EuiFlexItem grow={false}>
+          <EuiButton href={downloadLink} target="_blank" iconSide="right" iconType="popout">
+            <>{downloadMsg}</>
+          </EuiButton>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <>{k8sCopyYaml}</>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="m" />
+      <>{k8sYaml}</>
+    </>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
index 0adcfb26aa9c2..cde975fed45dd 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
@@ -59,7 +59,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<FlyOutProps> = ({
   const [isFleetServerPolicySelected, setIsFleetServerPolicySelected] = useState<boolean>(false);
   const [selectedApiKeyId, setSelectedAPIKeyId] = useState<string | undefined>();
   const [mode, setMode] = useState<FlyoutMode>(defaultMode);
-  const [selectionType, setSelectionType] = useState<SelectionType>('tabs');
+  const [selectionType, setSelectionType] = useState<SelectionType>();
 
   const {
     agentPolicies,
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx
index 6bb178921c2a9..81404df2eeabd 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/installation_message.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { useMemo } from 'react';
-import { EuiText, EuiLink } from '@elastic/eui';
+import { EuiText, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import semverMajor from 'semver/functions/major';
@@ -14,7 +14,13 @@ import semverPatch from 'semver/functions/patch';
 
 import { useKibanaVersion } from '../../hooks';
 
-export const InstallationMessage: React.FunctionComponent = () => {
+import type { K8sMode } from './types';
+
+interface Props {
+  isK8s?: K8sMode;
+}
+
+export const InstallationMessage: React.FunctionComponent<Props> = ({ isK8s }) => {
   const kibanaVersion = useKibanaVersion();
   const kibanaVersionURLString = useMemo(
     () =>
@@ -23,37 +29,47 @@ export const InstallationMessage: React.FunctionComponent = () => {
   );
 
   return (
-    <EuiText>
-      <FormattedMessage
-        id="xpack.fleet.enrollmentInstructions.installationMessage"
-        defaultMessage="Select the appropriate platform and run commands to install, enroll, and start Elastic Agent. Reuse commands to set up agents on more than one host. For aarch64, see our {downloadLink}. For additional guidance, see our {installationLink}."
-        values={{
-          downloadLink: (
-            <EuiLink
-              target="_blank"
-              external
-              href={`https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`}
-            >
-              <FormattedMessage
-                id="xpack.fleet.enrollmentInstructions.downloadLink"
-                defaultMessage="downloads page"
-              />
-            </EuiLink>
-          ),
-          installationLink: (
-            <EuiLink
-              target="_blank"
-              external
-              href="https://www.elastic.co/guide/en/fleet/current/elastic-agent-installation.html"
-            >
-              <FormattedMessage
-                id="xpack.fleet.enrollmentInstructions.installationMessage.link"
-                defaultMessage="installation docs"
-              />
-            </EuiLink>
-          ),
-        }}
-      />
-    </EuiText>
+    <>
+      <EuiText>
+        {isK8s === 'IS_KUBERNETES' ? (
+          <FormattedMessage
+            id="xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s"
+            defaultMessage="From the directory where the Kubernetes manifest is downloaded, run the apply command."
+          />
+        ) : (
+          <FormattedMessage
+            id="xpack.fleet.enrollmentInstructions.installationMessage"
+            defaultMessage="Select the appropriate platform and run commands to install, enroll, and start Elastic Agent. Reuse commands to set up agents on more than one host. For aarch64, see our {downloadLink}. For additional guidance, see our {installationLink}."
+            values={{
+              downloadLink: (
+                <EuiLink
+                  target="_blank"
+                  external
+                  href={`https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`}
+                >
+                  <FormattedMessage
+                    id="xpack.fleet.enrollmentInstructions.downloadLink"
+                    defaultMessage="downloads page"
+                  />
+                </EuiLink>
+              ),
+              installationLink: (
+                <EuiLink
+                  target="_blank"
+                  external
+                  href="https://www.elastic.co/guide/en/fleet/current/elastic-agent-installation.html"
+                >
+                  <FormattedMessage
+                    id="xpack.fleet.enrollmentInstructions.installationMessage.link"
+                    defaultMessage="installation docs"
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        )}
+      </EuiText>
+      <EuiSpacer size="l" />
+    </>
   );
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
index 32ac217c353e8..5e6ea53261cd8 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
@@ -32,6 +32,7 @@ export const Instructions = (props: InstructionProps) => {
     isFleetServerPolicySelected,
     settings,
     isLoadingAgentPolicies,
+    selectionType,
     setSelectionType,
     mode,
     isIntegrationFlow,
@@ -89,13 +90,17 @@ export const Instructions = (props: InstructionProps) => {
     } else if (showAgentEnrollment) {
       return (
         <>
-          <EuiText>
-            <FormattedMessage
-              id="xpack.fleet.agentEnrollment.managedDescription"
-              defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
-            />
-          </EuiText>
-          <EuiSpacer size="l" />
+          {selectionType === 'tabs' && (
+            <>
+              <EuiText>
+                <FormattedMessage
+                  id="xpack.fleet.agentEnrollment.managedDescription"
+                  defaultMessage="Enroll an Elastic Agent in Fleet to automatically deploy updates and centrally manage the agent."
+                />
+              </EuiText>
+              <EuiSpacer size="l" />
+            </>
+          )}
           {isFleetServerPolicySelected ? (
             <FleetServerSteps {...props} />
           ) : (
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx
index 743bf1a7fa578..13fb858739e7d 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/agent_enrollment_confirmation_step.tsx
@@ -26,7 +26,7 @@ export const AgentEnrollmentConfirmationStep = ({
 }): EuiContainedStepProps => {
   return {
     title: i18n.translate('xpack.fleet.agentEnrollment.stepAgentEnrollmentConfirmation', {
-      defaultMessage: 'Confirm agent Enrollment',
+      defaultMessage: 'Confirm agent enrollment',
     }),
     children: (
       <ConfirmAgentEnrollment
@@ -36,6 +36,6 @@ export const AgentEnrollmentConfirmationStep = ({
         agentCount={agentCount}
       />
     ),
-    status: !agentCount ? 'incomplete' : 'complete',
+    status: !agentCount ? undefined : 'complete',
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
index cae508299f259..46224e9e836ae 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
@@ -16,7 +16,7 @@ import type { FullAgentPolicy } from '../../../../common/types/models/agent_poli
 
 import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../services';
 
-import { StandaloneInstructions } from '../../enrollment_instructions/standalone';
+import { StandaloneInstructions, ManualInstructions } from '../../enrollment_instructions';
 
 import {
   useGetOneEnrollmentAPIKey,
@@ -45,6 +45,7 @@ import {
   AgentEnrollmentConfirmationStep,
   InstallManagedAgentStep,
   IncomingDataConfirmationStep,
+  DownloadStep,
 } from '.';
 
 export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
@@ -145,7 +146,9 @@ export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
       : [];
 
     if (selectionType === 'radio') {
-      steps.push(InstallationModeSelectionStep({ mode, setMode }));
+      steps.push(
+        InstallationModeSelectionStep({ selectedPolicyId: selectedPolicy?.id, mode, setMode })
+      );
     }
 
     steps.push(
@@ -161,7 +164,6 @@ export const StandaloneSteps: React.FunctionComponent<InstructionProps> = ({
       InstallStandaloneAgentStep({
         installCommand: standaloneInstallCommands,
         isK8s,
-        selectedPolicyId: selectedPolicy?.id,
       })
     );
 
@@ -201,7 +203,9 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
   onClickViewAgents,
   isK8s,
   installedPackagePolicy,
+  isFleetServerPolicySelected,
 }) => {
+  const kibanaVersion = useKibanaVersion();
   const core = useStartServices();
   const { docLinks } = core;
   const link = docLinks.links.fleet.troubleshooting;
@@ -209,11 +213,14 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
 
   const apiKey = useGetOneEnrollmentAPIKey(selectedApiKeyId);
   const apiKeyData = apiKey?.data;
+  const enrollToken = apiKey.data ? apiKey.data.item.api_key : '';
+
   const enrolledAgentIds = usePollingAgentCount(selectedPolicy?.id || '');
 
   const fleetServerHosts = useMemo(() => {
     return settings?.fleet_server_hosts || [];
   }, [settings]);
+  const installManagedCommands = ManualInstructions(enrollToken, fleetServerHosts, kibanaVersion);
 
   const instructionsSteps = useMemo(() => {
     const steps: EuiContainedStepProps[] = !agentPolicy
@@ -236,14 +243,22 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
         ];
 
     if (selectionType === 'radio') {
-      steps.push(InstallationModeSelectionStep({ mode, setMode }));
+      steps.push(
+        InstallationModeSelectionStep({ selectedPolicyId: selectedPolicy?.id, mode, setMode })
+      );
+    }
+
+    if (isK8s === 'IS_KUBERNETES') {
+      steps.push(
+        DownloadStep(isFleetServerPolicySelected || false, isK8s || '', enrollToken || '')
+      );
     }
 
     steps.push(
       InstallManagedAgentStep({
+        installCommand: installManagedCommands,
         apiKeyData,
         selectedApiKeyId,
-        fleetServerHosts,
         isK8s,
       })
     );
@@ -257,13 +272,14 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
         })
       );
     }
-    if (selectedPolicy && enrolledAgentIds.length) {
+    if (selectedPolicy) {
       steps.push(
         IncomingDataConfirmationStep({
           agentIds: enrolledAgentIds,
           agentDataConfirmed,
           setAgentDataConfirmed,
           installedPolicy: installedPackagePolicy,
+          troubleshootLink: link,
         })
       );
     }
@@ -278,14 +294,16 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
     setSelectedPolicyId,
     refreshAgentPolicies,
     selectionType,
-    apiKeyData,
-    fleetServerHosts,
     isK8s,
+    installManagedCommands,
+    apiKeyData,
+    enrolledAgentIds,
     mode,
     setMode,
+    isFleetServerPolicySelected,
+    enrollToken,
     onClickViewAgents,
     link,
-    enrolledAgentIds,
     agentDataConfirmed,
     installedPackagePolicy,
   ]);
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx
index c0b64a88e19cc..39a7943ac0e32 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/configure_standalone_agent_step.tsx
@@ -111,6 +111,6 @@ export const ConfigureStandaloneAgentStep = ({
         )}
       </>
     ),
-    status: !yaml ? 'loading' : 'incomplete',
+    status: !yaml ? 'loading' : undefined,
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx
index 5004fc0a6444e..2b0815fb64cde 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/download_step.tsx
@@ -5,83 +5,18 @@
  * 2.0.
  */
 
-import React, { useEffect, useMemo, useState } from 'react';
-import {
-  EuiText,
-  EuiButton,
-  EuiSpacer,
-  EuiCode,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiCopy,
-  EuiCodeBlock,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
 import { i18n } from '@kbn/i18n';
-import semverMajor from 'semver/functions/major';
-import semverMinor from 'semver/functions/minor';
-import semverPatch from 'semver/functions/patch';
 
 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 
-import { useGetSettings, useKibanaVersion, useStartServices } from '../../../hooks';
-
-import { agentPolicyRouteService } from '../../../../common';
-
-import { sendGetK8sManifest } from '../../../hooks/use_request/k8s';
+import { DownloadInstructions } from '../download_instructions';
 
 export const DownloadStep = (
   hasFleetServer: boolean,
   isK8s?: string,
   enrollmentAPIKey?: string
 ): EuiContainedStepProps => {
-  const kibanaVersion = useKibanaVersion();
-  const core = useStartServices();
-  const settings = useGetSettings();
-  const kibanaVersionURLString = useMemo(
-    () =>
-      `${semverMajor(kibanaVersion)}-${semverMinor(kibanaVersion)}-${semverPatch(kibanaVersion)}`,
-    [kibanaVersion]
-  );
-  const { notifications } = core;
-
-  const [yaml, setYaml] = useState<any | undefined>();
-  const [fleetServer, setFleetServer] = useState<string | ''>();
-
-  useEffect(() => {
-    async function fetchK8sManifest() {
-      try {
-        if (isK8s !== 'IS_KUBERNETES') {
-          return;
-        }
-        const fleetServerHosts = settings.data?.item.fleet_server_hosts;
-        let host = '';
-        if (fleetServerHosts !== undefined && fleetServerHosts.length !== 0) {
-          setFleetServer(fleetServerHosts[0]);
-          host = fleetServerHosts[0];
-        }
-        const query = { fleetServer: host, enrolToken: enrollmentAPIKey };
-        const res = await sendGetK8sManifest(query);
-        if (res.error) {
-          throw res.error;
-        }
-
-        if (!res.data) {
-          throw new Error('No data while fetching agent manifest');
-        }
-
-        setYaml(res.data.item);
-      } catch (error) {
-        notifications.toasts.addError(error, {
-          title: i18n.translate('xpack.fleet.agentEnrollment.loadk8sManifestErrorTitle', {
-            defaultMessage: 'Error while fetching agent manifest',
-          }),
-        });
-      }
-    }
-    fetchK8sManifest();
-  }, [isK8s, notifications.toasts, enrollmentAPIKey, settings.data?.item.fleet_server_hosts]);
-
   const altTitle =
     isK8s === 'IS_KUBERNETES'
       ? i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentForK8sTitle', {
@@ -90,116 +25,21 @@ export const DownloadStep = (
       : i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentTitle', {
           defaultMessage: 'Download the Elastic Agent to your host',
         });
+
   const title = hasFleetServer
     ? i18n.translate('xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle', {
         defaultMessage: 'Download the Fleet Server to a centralized host',
       })
     : altTitle;
 
-  const altDownloadDescription =
-    isK8s === 'IS_KUBERNETES' ? (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadDescriptionForK8s"
-        defaultMessage="Copy or download the Kubernetes manifest inside the Kubernetes cluster. Check {FleetUrlVariable} and {FleetTokenVariable} in the Daemonset environment variables and apply the manifest."
-        values={{
-          FleetUrlVariable: <EuiCode>FLEET_URL</EuiCode>,
-          FleetTokenVariable: <EuiCode>FLEET_ENROLLMENT_TOKEN</EuiCode>,
-        }}
-      />
-    ) : (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadDescription"
-        defaultMessage="Install the Elastic Agent on the hosts you wish to monitor. Do not install this agent policy on a host containing Fleet Server. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
-      />
-    );
-
-  const downloadDescription = hasFleetServer ? (
-    <FormattedMessage
-      id="xpack.fleet.agentEnrollment.downloadDescriptionForFleetServer"
-      defaultMessage="Fleet Server runs on an Elastic Agent. Install this agent on a centralized host so that other hosts you wish to monitor can connect to it. In production, we recommend using one or more dedicated hosts. You can download the Elastic Agent binaries and verification signatures from Elastic’s download page."
-    />
-  ) : (
-    altDownloadDescription
-  );
-
-  const linuxUsers =
-    isK8s !== 'IS_KUBERNETES' ? (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadUseLinuxInstaller"
-        defaultMessage="Linux users: We recommend the installer (TAR) over system packages (RPM/DEB) because it lets you upgrade your agent in Fleet."
-      />
-    ) : (
-      ''
-    );
-
-  const k8sCopyYaml =
-    isK8s === 'IS_KUBERNETES' ? (
-      <EuiCopy textToCopy={yaml}>
-        {(copy) => (
-          <EuiButton onClick={copy} iconType="copyClipboard">
-            <FormattedMessage
-              id="xpack.fleet.agentEnrollment.copyPolicyButton"
-              defaultMessage="Copy to clipboard"
-            />
-          </EuiButton>
-        )}
-      </EuiCopy>
-    ) : (
-      ''
-    );
-
-  const k8sYaml =
-    isK8s === 'IS_KUBERNETES' ? (
-      <EuiCodeBlock language="yaml" style={{ maxHeight: 300 }} fontSize="m">
-        {yaml}
-      </EuiCodeBlock>
-    ) : (
-      ''
-    );
-
-  const downloadLink =
-    isK8s === 'IS_KUBERNETES'
-      ? core.http.basePath.prepend(
-          `${agentPolicyRouteService.getK8sFullDownloadPath()}?fleetServer=${fleetServer}&enrolToken=${enrollmentAPIKey}`
-        )
-      : `https://www.elastic.co/downloads/past-releases/elastic-agent-${kibanaVersionURLString}`;
-
-  const downloadMsg =
-    isK8s === 'IS_KUBERNETES' ? (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadManifestButtonk8s"
-        defaultMessage="Download Manifest"
-      />
-    ) : (
-      <FormattedMessage
-        id="xpack.fleet.agentEnrollment.downloadLink"
-        defaultMessage="Go to download page"
-      />
-    );
-
   return {
     title,
     children: (
-      <>
-        <EuiText>{downloadDescription}</EuiText>
-        <EuiSpacer size="s" />
-        <EuiText size="s">
-          <>{linuxUsers}</>
-        </EuiText>
-        <EuiSpacer size="m" />
-        <EuiFlexGroup gutterSize="m">
-          <EuiFlexItem grow={false}>
-            <EuiButton href={downloadLink} target="_blank" iconSide="right" iconType="popout">
-              <>{downloadMsg}</>
-            </EuiButton>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <>{k8sCopyYaml}</>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer size="m" />
-        <>{k8sYaml}</>
-      </>
+      <DownloadInstructions
+        hasFleetServer={hasFleetServer}
+        isK8s={isK8s}
+        enrollmentAPIKey={enrollmentAPIKey}
+      />
     ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
index 76cd1c07f4630..a35a318f40c5a 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/incoming_data_confirmation_step.tsx
@@ -20,11 +20,13 @@ export const IncomingDataConfirmationStep = ({
   installedPolicy,
   agentDataConfirmed,
   setAgentDataConfirmed,
+  troubleshootLink,
 }: {
   agentIds: string[];
   installedPolicy?: InstalledIntegrationPolicy;
   agentDataConfirmed: boolean;
   setAgentDataConfirmed: (v: boolean) => void;
+  troubleshootLink: string;
 }): EuiContainedStepProps => {
   return {
     title: !agentDataConfirmed
@@ -34,14 +36,16 @@ export const IncomingDataConfirmationStep = ({
       : i18n.translate('xpack.fleet.agentEnrollment.stepConfirmIncomingData.completed', {
           defaultMessage: 'Incoming data confirmed',
         }),
-    children: (
-      <ConfirmIncomingData
-        agentIds={agentIds}
-        installedPolicy={installedPolicy}
-        agentDataConfirmed={agentDataConfirmed}
-        setAgentDataConfirmed={setAgentDataConfirmed}
-      />
-    ),
-    status: !agentDataConfirmed ? 'loading' : 'complete',
+    children:
+      agentIds.length > 0 ? (
+        <ConfirmIncomingData
+          agentIds={agentIds}
+          installedPolicy={installedPolicy}
+          agentDataConfirmed={agentDataConfirmed}
+          setAgentDataConfirmed={setAgentDataConfirmed}
+          troubleshootLink={troubleshootLink}
+        />
+      ) : null,
+    status: agentIds.length > 0 ? (!agentDataConfirmed ? 'loading' : 'complete') : 'disabled',
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
index 03e8c305a6fcb..59f6fdeafe727 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
@@ -13,29 +13,29 @@ import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/st
 
 import type { GetOneEnrollmentAPIKeyResponse } from '../../../../common/types/rest_spec/enrollment_api_key';
 
-import { ManualInstructions } from '../../enrollment_instructions';
+import { InstallSection } from '../../enrollment_instructions/install_section';
+import type { CommandsByPlatform } from '../../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
+
+import type { K8sMode } from '../types';
 
 export const InstallManagedAgentStep = ({
+  installCommand,
   selectedApiKeyId,
   apiKeyData,
-  fleetServerHosts,
   isK8s,
 }: {
-  fleetServerHosts: string[];
   selectedApiKeyId?: string;
   apiKeyData?: GetOneEnrollmentAPIKeyResponse | null;
-  isK8s?: string;
+  isK8s?: K8sMode;
+  installCommand: CommandsByPlatform;
 }): EuiContainedStepProps => {
   return {
+    status: selectedApiKeyId ? undefined : 'disabled',
     title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
       defaultMessage: 'Install Elastic Agent on your host',
     }),
     children: selectedApiKeyId && apiKeyData && (
-      <ManualInstructions
-        apiKey={apiKeyData.item}
-        fleetServerHosts={fleetServerHosts}
-        isK8s={isK8s}
-      />
+      <InstallSection installCommand={installCommand} isK8s={isK8s} />
     ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx
index f1c6ce88233db..fb6ddfd393dcc 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_standalone_agent_step.tsx
@@ -11,37 +11,21 @@ import { i18n } from '@kbn/i18n';
 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 
 import type { CommandsByPlatform } from '../../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
-import { PlatformSelector } from '../../enrollment_instructions/manual/platform_selector';
-
-import { InstallationMessage } from '../installation_message';
+import { InstallSection } from '../../enrollment_instructions/install_section';
 
 import type { K8sMode } from '../types';
 
 export const InstallStandaloneAgentStep = ({
   installCommand,
   isK8s,
-  selectedPolicyId,
 }: {
   installCommand: CommandsByPlatform;
   isK8s?: K8sMode;
-  selectedPolicyId?: string;
 }): EuiContainedStepProps => {
   return {
     title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
       defaultMessage: 'Install Elastic Agent on your host',
     }),
-    children: (
-      <>
-        <InstallationMessage />
-        <PlatformSelector
-          linuxCommand={installCommand.linux}
-          macCommand={installCommand.mac}
-          windowsCommand={installCommand.windows}
-          linuxDebCommand={installCommand.deb}
-          linuxRpmCommand={installCommand.rpm}
-          isK8s={isK8s === 'IS_KUBERNETES'}
-        />
-      </>
-    ),
+    children: <InstallSection installCommand={installCommand} isK8s={isK8s} />,
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
index 3864599fb6a94..c5213f061bceb 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
@@ -15,9 +15,11 @@ import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/st
 import type { FlyoutMode } from '../types';
 
 export const InstallationModeSelectionStep = ({
+  selectedPolicyId,
   mode,
   setMode,
 }: {
+  selectedPolicyId: string | undefined;
   mode: FlyoutMode;
   setMode: (v: FlyoutMode) => void;
 }): EuiContainedStepProps => {
@@ -32,10 +34,11 @@ export const InstallationModeSelectionStep = ({
   };
 
   return {
+    status: selectedPolicyId ? undefined : 'disabled',
     title: i18n.translate('xpack.fleet.agentEnrollment.stepInstallType', {
       defaultMessage: 'Enroll in Fleet?',
     }),
-    children: (
+    children: selectedPolicyId ? (
       <EuiRadioGroup
         options={[
           {
@@ -83,6 +86,6 @@ export const InstallationModeSelectionStep = ({
         onChange={onChangeCallback}
         name={`radio group ${radioSuffix}`}
       />
-    ),
+    ) : null,
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts
index 0c2d9361aa3d6..7c501df0b3f3b 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/types.ts
@@ -11,7 +11,7 @@ import type { InstalledIntegrationPolicy } from './use_get_agent_incoming_data';
 
 export type K8sMode = 'IS_LOADING' | 'IS_KUBERNETES' | 'IS_NOT_KUBERNETES';
 export type FlyoutMode = 'managed' | 'standalone';
-export type SelectionType = 'tabs' | 'radio';
+export type SelectionType = 'tabs' | 'radio' | undefined;
 
 export interface BaseProps {
   /**
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx
index 4922a7d10c78c..6422d1bc40acc 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/use_get_agent_incoming_data.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import type { IncomingDataList } from '../../../common/types/rest_spec/agent';
 
-import { sendGetAgentIncomingData, useLink } from '../../hooks/index';
+import { sendGetAgentIncomingData, useLink } from '../../hooks';
 
 export interface InstalledIntegrationPolicy {
   name: string;
diff --git a/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx b/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx
index 01cd86064e6e6..09e7a30fa5f83 100644
--- a/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_policy_package_badge.tsx
@@ -8,9 +8,10 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
 
-import { PackageIcon } from '../components';
 import { FLEET_SERVER_PACKAGE } from '../../common/constants';
 
+import { PackageIcon } from '.';
+
 interface Props {
   excludeFleetServer?: boolean;
   pkgName: string;
diff --git a/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx b/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx
index f4dd3a7deaaab..1194cd496c1dc 100644
--- a/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx
+++ b/x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx
@@ -19,9 +19,10 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+
 import { AssetTitleMap } from '../applications/integrations/sections/epm/constants';
 import { useStartServices } from '../hooks';
-import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public';
 
 export interface CustomAssetsAccordionProps {
   views: Array<{
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx
index 49b12112d1e7c..a6c799410e670 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/index.tsx
@@ -6,3 +6,4 @@
  */
 
 export { ManualInstructions } from './manual';
+export { StandaloneInstructions } from './standalone';
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/install_section.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/install_section.tsx
new file mode 100644
index 0000000000000..0cf43902db7e2
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/install_section.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { InstallationMessage } from '../agent_enrollment_flyout/installation_message';
+
+import type { K8sMode } from '../agent_enrollment_flyout/types';
+
+import type { CommandsByPlatform } from '../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
+
+import { PlatformSelector } from './manual/platform_selector';
+
+interface Props {
+  installCommand: CommandsByPlatform;
+  isK8s: K8sMode | undefined;
+}
+
+export const InstallSection: React.FunctionComponent<Props> = ({ installCommand, isK8s }) => {
+  return (
+    <>
+      <InstallationMessage isK8s={isK8s} />
+      <PlatformSelector
+        linuxCommand={installCommand.linux}
+        macCommand={installCommand.mac}
+        windowsCommand={installCommand.windows}
+        linuxDebCommand={installCommand.deb}
+        linuxRpmCommand={installCommand.rpm}
+        isK8s={isK8s === 'IS_KUBERNETES'}
+      />
+    </>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx
index 077f9db0b05a2..5b777803552fb 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/index.tsx
@@ -5,32 +5,16 @@
  * 2.0.
  */
 
-import React from 'react';
-
-import { useKibanaVersion } from '../../../hooks';
-import type { EnrollmentAPIKey } from '../../../types';
-
-import { InstallationMessage } from '../../agent_enrollment_flyout/installation_message';
-
-import { PlatformSelector } from './platform_selector';
-
-interface Props {
-  fleetServerHosts: string[];
-  apiKey: EnrollmentAPIKey;
-  isK8s: string | undefined;
-}
-
-function getfleetServerHostsEnrollArgs(apiKey: EnrollmentAPIKey, fleetServerHosts: string[]) {
-  return `--url=${fleetServerHosts[0]} --enrollment-token=${apiKey.api_key}`;
+function getfleetServerHostsEnrollArgs(apiKey: string, fleetServerHosts: string[]) {
+  return `--url=${fleetServerHosts[0]} --enrollment-token=${apiKey}`;
 }
 
-export const ManualInstructions: React.FunctionComponent<Props> = ({
-  apiKey,
-  fleetServerHosts,
-  isK8s,
-}) => {
+export const ManualInstructions = (
+  apiKey: string,
+  fleetServerHosts: string[],
+  kibanaVersion: string
+) => {
   const enrollArgs = getfleetServerHostsEnrollArgs(apiKey, fleetServerHosts);
-  const kibanaVersion = useKibanaVersion();
 
   const linuxCommand = `curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-${kibanaVersion}-linux-x86_64.tar.gz
 tar xzvf elastic-agent-${kibanaVersion}-linux-x86_64.tar.gz
@@ -55,17 +39,11 @@ sudo elastic-agent enroll ${enrollArgs} \nsudo systemctl enable elastic-agent \n
 sudo rpm -vi elastic-agent-${kibanaVersion}-x86_64.rpm
 sudo elastic-agent enroll ${enrollArgs} \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
 
-  return (
-    <>
-      <InstallationMessage />
-      <PlatformSelector
-        linuxCommand={linuxCommand}
-        macCommand={macCommand}
-        windowsCommand={windowsCommand}
-        linuxDebCommand={linuxDebCommand}
-        linuxRpmCommand={linuxRpmCommand}
-        isK8s={isK8s === 'IS_KUBERNETES'}
-      />
-    </>
-  );
+  return {
+    linux: linuxCommand,
+    mac: macCommand,
+    windows: windowsCommand,
+    deb: linuxDebCommand,
+    rpm: linuxRpmCommand,
+  };
 };
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx
index 9551d9a7eae87..e03e43907f829 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/manual/platform_selector.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { EuiText, EuiSpacer, EuiCodeBlock, EuiButtonGroup, EuiCallOut } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiSpacer, EuiCodeBlock, EuiButtonGroup, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import type { PLATFORM_TYPE } from '../../../hooks';
@@ -53,21 +52,6 @@ export const PlatformSelector: React.FunctionComponent<Props> = ({
 
   return (
     <>
-      <EuiText>
-        {isK8s ? (
-          <FormattedMessage
-            id="xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s"
-            defaultMessage="From the directory where the Kubernetes manifest is downloaded, run the apply command."
-          />
-        ) : (
-          <FormattedMessage
-            id="xpack.fleet.agentEnrollment.stepRunAgentDescription"
-            defaultMessage="From the agent directory, run this command to install, enroll and start an Elastic Agent. You can reuse this command to set up agents on more than one host. Requires administrator privileges."
-          />
-        )}
-      </EuiText>
-      <EuiSpacer size="l" />
-
       {isK8s ? (
         <EuiCodeBlock fontSize="m" isCopyable={true} paddingSize="m">
           <CommandCode>{K8S_COMMAND}</CommandCode>
diff --git a/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx b/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx
index db36c16934e4b..89c1dfe3cac37 100644
--- a/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx
+++ b/x-pack/plugins/fleet/public/components/enrollment_instructions/standalone/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { CommandsByPlatform } from '../../../applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils';
-import type { K8sMode } from '../../../components/agent_enrollment_flyout/types';
+import type { K8sMode } from '../../agent_enrollment_flyout/types';
 
 export const StandaloneInstructions = (
   kibanaVersion: string,
@@ -29,10 +29,10 @@ cd elastic-agent-${kibanaVersion}-windows-x86_64
 .\\elastic-agent.exe install`;
 
   const linuxDebCommand = `curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-${kibanaVersion}-amd64.deb
-  sudo dpkg -i elastic-agent-${kibanaVersion}-amd64.deb \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
+sudo dpkg -i elastic-agent-${kibanaVersion}-amd64.deb \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
 
   const linuxRpmCommand = `curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-${kibanaVersion}-x86_64.rpm
-  sudo rpm -vi elastic-agent-${kibanaVersion}-x86_64.rpm \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
+sudo rpm -vi elastic-agent-${kibanaVersion}-x86_64.rpm \nsudo systemctl enable elastic-agent \nsudo systemctl start elastic-agent`;
 
   const linuxCommand =
     isK8s === 'IS_KUBERNETES' ? KUBERNETES_RUN_INSTRUCTIONS : STANDALONE_RUN_INSTRUCTIONS_LINUX;
diff --git a/x-pack/plugins/fleet/public/components/home_integration/index.tsx b/x-pack/plugins/fleet/public/components/home_integration/index.tsx
index 56123e5f32dee..c5f5b552caaf9 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/index.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import type {
   TutorialDirectoryHeaderLinkComponent,
   TutorialModuleNoticeComponent,
-} from 'src/plugins/home/public';
+} from '@kbn/home-plugin/public';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 const TutorialDirectoryHeaderLinkLazy = React.lazy(
diff --git a/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
index f72cb809f4c64..772a0fa905873 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
@@ -8,9 +8,10 @@
 import React, { memo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButtonEmpty } from '@elastic/eui';
-import type { TutorialDirectoryHeaderLinkComponent } from 'src/plugins/home/public';
+import type { TutorialDirectoryHeaderLinkComponent } from '@kbn/home-plugin/public';
+
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 
-import { RedirectAppLinks } from '../../../../../../src/plugins/kibana_react/public';
 import { useLink, useStartServices } from '../../hooks';
 
 const TutorialDirectoryHeaderLink: TutorialDirectoryHeaderLinkComponent = memo(() => {
diff --git a/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
index ec608fe27549f..905f2c82e85c7 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
@@ -9,7 +9,7 @@ import React, { memo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiText, EuiLink, EuiSpacer, EuiIcon } from '@elastic/eui';
-import type { TutorialModuleNoticeComponent } from 'src/plugins/home/public';
+import type { TutorialModuleNoticeComponent } from '@kbn/home-plugin/public';
 
 import { useGetPackages, useLink, useStartServices } from '../../hooks';
 import { pkgKeyFromPackageInfo } from '../../services';
diff --git a/x-pack/plugins/fleet/public/hooks/use_core.ts b/x-pack/plugins/fleet/public/hooks/use_core.ts
index 2c817bfc938f8..0e65686ac38a7 100644
--- a/x-pack/plugins/fleet/public/hooks/use_core.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_core.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+
 import type { FleetStartServices } from '../plugin';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 
 export function useStartServices(): FleetStartServices {
   const { services } = useKibana<FleetStartServices>();
diff --git a/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts b/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
index 3ad01620b9780..7ab1b17b77caa 100644
--- a/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import { KibanaAssetType } from '../types';
 
-import { useStartServices } from './';
+import { useStartServices } from '.';
 
 const KIBANA_BASE_PATH = '/app/kibana';
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_link.ts b/x-pack/plugins/fleet/public/hooks/use_link.ts
index b04f51ef790fe..83dcc42c8b945 100644
--- a/x-pack/plugins/fleet/public/hooks/use_link.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_link.ts
@@ -8,7 +8,7 @@
 import { pagePathGetters, PLUGIN_ID } from '../constants';
 import type { StaticPage, DynamicPage, DynamicPagePathValues } from '../constants';
 
-import { useStartServices } from './';
+import { useStartServices } from '.';
 
 const getSeparatePaths = (
   page: StaticPage | DynamicPage,
diff --git a/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts b/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
index 733aaef8b9267..9c93117196e6f 100644
--- a/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
@@ -14,7 +14,7 @@ import type { PackageInfo, PackageListItem } from '../types';
 // Import the specific hook to avoid a circular dependency in Babel
 import { useLinks as useEPMLinks } from '../applications/integrations/hooks/use_links';
 
-import { sendGetPackageInfoByKey } from './index';
+import { sendGetPackageInfoByKey } from '.';
 
 type Package = PackageInfo | PackageListItem;
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts b/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
index 138c291a7226e..79afb6e2238da 100644
--- a/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
@@ -6,21 +6,21 @@
  */
 
 import { useState, useEffect } from 'react';
-import type { HttpSetup } from 'src/core/public';
+import type { HttpSetup } from '@kbn/core/public';
 
 import {
   sendRequest as _sendRequest,
   useRequest as _useRequest,
-} from '../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 import type {
   SendRequestConfig,
   SendRequestResponse,
   UseRequestConfig,
-} from '../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 let httpClient: HttpSetup;
 
-export type { UseRequestConfig } from '../../../../../../src/plugins/es_ui_shared/public';
+export type { UseRequestConfig } from '@kbn/es-ui-shared-plugin/public';
 
 /**
  * @internal
diff --git a/x-pack/plugins/fleet/public/index.ts b/x-pack/plugins/fleet/public/index.ts
index ee4fe526fb0e4..25714ead50a30 100644
--- a/x-pack/plugins/fleet/public/index.ts
+++ b/x-pack/plugins/fleet/public/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110901
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 import { FleetPlugin } from './plugin';
 
diff --git a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
index 5952fbebcf272..53e18896ca1f2 100644
--- a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
+++ b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
@@ -13,10 +13,11 @@ import { render as reactRender, act } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import type { RenderHookResult } from '@testing-library/react-hooks';
 
-import { themeServiceMock } from 'src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { ScopedHistory } from '@kbn/core/public';
 
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { ScopedHistory } from '../../../../../src/core/public';
 import { FleetAppContext } from '../applications/fleet/app';
 import { IntegrationsAppContext } from '../applications/integrations/app';
 import type { FleetConfigType } from '../plugin';
diff --git a/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx b/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
index edc9ac8b8fb3a..86188d15b5191 100644
--- a/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
+++ b/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
@@ -9,9 +9,10 @@ import React from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { MockedKeys } from '@kbn/utility-types/jest';
 
-import { coreMock } from '../../../../../src/core/public/mocks';
-import type { IStorage } from '../../../../../src/plugins/kibana_utils/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import type { IStorage } from '@kbn/kibana-utils-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+
 import { setHttpClient } from '../hooks/use_request';
 
 import type { FleetAuthz } from '../../common';
diff --git a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
index 842b690eb978f..e86503e0216db 100644
--- a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
+++ b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { licensingMock } from '../../../licensing/public/mocks';
-import { cloudMock } from '../../../cloud/public/mocks';
-import { homePluginMock } from '../../../../../src/plugins/home/public/mocks';
-import { navigationPluginMock } from '../../../../../src/plugins/navigation/public/mocks';
-import { customIntegrationsMock } from '../../../../../src/plugins/custom_integrations/public/mocks';
-import { sharePluginMock } from '../../../../../src/plugins/share/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { cloudMock } from '@kbn/cloud-plugin/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
+import { navigationPluginMock } from '@kbn/navigation-plugin/public/mocks';
+import { customIntegrationsMock } from '@kbn/custom-integrations-plugin/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 export const createSetupDepsMock = () => {
   const cloud = cloudMock.createSetup();
diff --git a/x-pack/plugins/fleet/public/plugin.ts b/x-pack/plugins/fleet/public/plugin.ts
index 4848b05084676..b84562098fc76 100644
--- a/x-pack/plugins/fleet/public/plugin.ts
+++ b/x-pack/plugins/fleet/public/plugin.ts
@@ -12,38 +12,35 @@ import type {
   Plugin,
   PluginInitializerContext,
   CoreStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 
-import type { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 
 import type {
   CustomIntegrationsStart,
   CustomIntegrationsSetup,
-} from 'src/plugins/custom_integrations/public';
+} from '@kbn/custom-integrations-plugin/public';
 
-import type { SharePluginStart } from 'src/plugins/share/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 
 import { once } from 'lodash';
 
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
-import type { CloudStart } from '../../cloud/public';
+import type { CloudStart } from '@kbn/cloud-plugin/public';
 
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
-import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../src/core/public';
+import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '@kbn/core/public';
+
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
+import type { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/public';
 
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { LicensingPluginStart } from '../../licensing/public';
-import type { CloudSetup } from '../../cloud/public';
-import type { GlobalSearchPluginSetup } from '../../global_search/public';
 import {
   PLUGIN_ID,
   INTEGRATIONS_PLUGIN_ID,
@@ -238,7 +235,7 @@ export class FleetPlugin implements Plugin<FleetSetup, FleetStart, FleetSetupDep
         icon: 'indexManagementApp',
         showOnHomePage: true,
         path: INTEGRATIONS_BASE_PATH,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         order: 510,
       });
     }
diff --git a/x-pack/plugins/fleet/public/search_provider.test.ts b/x-pack/plugins/fleet/public/search_provider.test.ts
index 43e6d93c8031c..9a053d1c859a5 100644
--- a/x-pack/plugins/fleet/public/search_provider.test.ts
+++ b/x-pack/plugins/fleet/public/search_provider.test.ts
@@ -8,7 +8,7 @@
 import { TestScheduler } from 'rxjs/testing';
 import { NEVER } from 'rxjs';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { createPackageSearchProvider, toSearchResult } from './search_provider';
 import type { GetPackagesResponse } from './types';
diff --git a/x-pack/plugins/fleet/public/search_provider.ts b/x-pack/plugins/fleet/public/search_provider.ts
index fe7cca92cf48d..9ce1ebc14c5e9 100644
--- a/x-pack/plugins/fleet/public/search_provider.ts
+++ b/x-pack/plugins/fleet/public/search_provider.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { CoreSetup, CoreStart, ApplicationStart, IBasePath } from 'src/core/public';
+import type { CoreSetup, CoreStart, ApplicationStart, IBasePath } from '@kbn/core/public';
 
 import type { Observable } from 'rxjs';
 import { from, of, combineLatest } from 'rxjs';
@@ -15,7 +15,7 @@ import { ICON_TYPES } from '@elastic/eui';
 import type {
   GlobalSearchResultProvider,
   GlobalSearchProviderResult,
-} from '../../global_search/public';
+} from '@kbn/global-search-plugin/public';
 
 import { epmRouteService, INTEGRATIONS_PLUGIN_ID } from '../common';
 
diff --git a/x-pack/plugins/fleet/public/services/custom_integrations.ts b/x-pack/plugins/fleet/public/services/custom_integrations.ts
index 6f6ee744005f2..14da59c416da7 100644
--- a/x-pack/plugins/fleet/public/services/custom_integrations.ts
+++ b/x-pack/plugins/fleet/public/services/custom_integrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CustomIntegrationsSetup } from '../../../../../src/plugins/custom_integrations/public';
+import type { CustomIntegrationsSetup } from '@kbn/custom-integrations-plugin/public';
 
 let customIntegrations: CustomIntegrationsSetup;
 
diff --git a/x-pack/plugins/fleet/public/types/intra_app_route_state.ts b/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
index 0ea40e6fe5695..a36a72ee3516c 100644
--- a/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
+++ b/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 /**
  * Supported query parameters for CreatePackagePolicyRouteState
diff --git a/x-pack/plugins/fleet/public/types/ui_extensions.ts b/x-pack/plugins/fleet/public/types/ui_extensions.ts
index 6c959bec1d785..233d9cf5385d6 100644
--- a/x-pack/plugins/fleet/public/types/ui_extensions.ts
+++ b/x-pack/plugins/fleet/public/types/ui_extensions.ts
@@ -8,7 +8,7 @@
 import type { EuiStepProps } from '@elastic/eui';
 import type { ComponentType, LazyExoticComponent } from 'react';
 
-import type { NewPackagePolicy, PackageInfo, PackagePolicy } from './index';
+import type { NewPackagePolicy, PackageInfo, PackagePolicy } from '.';
 
 /** Register a Fleet UI extension */
 export type UIExtensionRegistrationCallback = (extensionPoint: UIExtensionPoint) => void;
diff --git a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
index 9b7d48328467d..4828967462116 100644
--- a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
+++ b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClient, ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClient, ElasticsearchClient } from '@kbn/core/server';
 
 import type { FleetConfigType } from '../../common/types';
 import * as AgentService from '../services/agents';
diff --git a/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts b/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
index 9a1aca9486c60..f89b471a8d083 100644
--- a/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
+++ b/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
@@ -6,7 +6,7 @@
  */
 
 import { isBoom } from '@hapi/boom';
-import type { SavedObjectsClient, ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClient, ElasticsearchClient } from '@kbn/core/server';
 
 import { packagePolicyService, settingsService } from '../services';
 import { getAgentStatusForAgentPolicy } from '../services/agents';
diff --git a/x-pack/plugins/fleet/server/collectors/helpers.ts b/x-pack/plugins/fleet/server/collectors/helpers.ts
index 83970b0aa0d54..654d5936d7698 100644
--- a/x-pack/plugins/fleet/server/collectors/helpers.ts
+++ b/x-pack/plugins/fleet/server/collectors/helpers.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/server';
+import type { CoreSetup } from '@kbn/core/server';
 
-import { SavedObjectsClient } from '../../../../../src/core/server';
-import type { ElasticsearchClient } from '../../../../../src/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 export async function getInternalClients(
   core: CoreSetup
diff --git a/x-pack/plugins/fleet/server/collectors/package_collectors.ts b/x-pack/plugins/fleet/server/collectors/package_collectors.ts
index 01d1c2d966c78..228507d73993f 100644
--- a/x-pack/plugins/fleet/server/collectors/package_collectors.ts
+++ b/x-pack/plugins/fleet/server/collectors/package_collectors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClient } from 'kibana/server';
+import type { SavedObjectsClient } from '@kbn/core/server';
 import _ from 'lodash';
 
 import { getPackageSavedObjects } from '../services/epm/packages/get';
diff --git a/x-pack/plugins/fleet/server/collectors/register.ts b/x-pack/plugins/fleet/server/collectors/register.ts
index a097d423e7dd2..a0a373d0f435f 100644
--- a/x-pack/plugins/fleet/server/collectors/register.ts
+++ b/x-pack/plugins/fleet/server/collectors/register.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import type { CoreSetup } from 'kibana/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { CoreSetup } from '@kbn/core/server';
 
 import type { FleetConfigType } from '..';
 
diff --git a/x-pack/plugins/fleet/server/errors/handlers.test.ts b/x-pack/plugins/fleet/server/errors/handlers.test.ts
index 2d3fddeb951f4..95850829e9f97 100644
--- a/x-pack/plugins/fleet/server/errors/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/errors/handlers.test.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { createAppContextStartContractMock } from '../mocks';
 import { appContextService } from '../services';
@@ -17,7 +17,7 @@ import {
   PackageNotFoundError,
   PackageUnsupportedMediaTypeError,
   defaultIngestErrorHandler,
-} from './index';
+} from '.';
 
 describe('defaultIngestErrorHandler', () => {
   let mockContract: ReturnType<typeof createAppContextStartContractMock>;
diff --git a/x-pack/plugins/fleet/server/errors/handlers.ts b/x-pack/plugins/fleet/server/errors/handlers.ts
index e171a5bafba90..b42d2d4e0e5a4 100644
--- a/x-pack/plugins/fleet/server/errors/handlers.ts
+++ b/x-pack/plugins/fleet/server/errors/handlers.ts
@@ -12,8 +12,8 @@ import type {
   IKibanaResponse,
   KibanaResponseFactory,
   RequestHandlerContext,
-} from 'src/core/server';
-import type { KibanaRequest } from 'src/core/server';
+} from '@kbn/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { appContextService } from '../services';
 
@@ -27,7 +27,7 @@ import {
   RegistryConnectionError,
   RegistryError,
   RegistryResponseError,
-} from './index';
+} from '.';
 
 type IngestErrorHandler = (
   params: IngestErrorHandlerParams
diff --git a/x-pack/plugins/fleet/server/errors/index.ts b/x-pack/plugins/fleet/server/errors/index.ts
index ca3209a58b2a5..cb1de48ad1958 100644
--- a/x-pack/plugins/fleet/server/errors/index.ts
+++ b/x-pack/plugins/fleet/server/errors/index.ts
@@ -6,7 +6,7 @@
  */
 
 /* eslint-disable max-classes-per-file */
-import type { ElasticsearchErrorDetails } from 'src/core/server';
+import type { ElasticsearchErrorDetails } from '@kbn/core/server';
 
 import { isESClientError } from './utils';
 
diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
index efeac499bf953..3228c03959322 100644
--- a/x-pack/plugins/fleet/server/index.ts
+++ b/x-pack/plugins/fleet/server/index.ts
@@ -9,7 +9,7 @@ import path from 'path';
 
 import { schema } from '@kbn/config-schema';
 import type { TypeOf } from '@kbn/config-schema';
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import {
   PreconfiguredPackagesSchema,
@@ -39,6 +39,7 @@ export type {
   PostPackagePolicyDeleteCallback,
   PostPackagePolicyCreateCallback,
   FleetRequestHandlerContext,
+  PostPackagePolicyPostCreateCallback,
 } from './types';
 export { AgentNotFoundError, FleetUnauthorizedError } from './errors';
 
diff --git a/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap b/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap
index 40a8ceadbfdc8..26f2200cf4cce 100644
--- a/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap
+++ b/x-pack/plugins/fleet/server/integration_tests/__snapshots__/cloud_preconfiguration.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Fleet preconfiguration reset Preconfigred cloud policy Create correct .fleet-policies 1`] = `
+exports[`Fleet preconfiguration reset Preconfigured cloud policy With a full preconfigured cloud policy Create correct .fleet-policies 1`] = `
 Object {
   "agent": Object {
     "monitoring": Object {
diff --git a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
index f3a4e045d042d..2e0f19dfcbbcc 100644
--- a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
@@ -7,14 +7,18 @@
 
 import Path from 'path';
 
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import { AGENT_POLICY_INDEX } from '../../common';
 import type { PackagePolicySOAttributes } from '../../common';
 import type { AgentPolicySOAttributes } from '../types';
 
 import { useDockerRegistry, waitForFleetSetup } from './helpers';
-import { CLOUD_KIBANA_CONFIG } from './fixtures/cloud_kibana_config';
+import {
+  CLOUD_KIBANA_CONFIG,
+  CLOUD_KIBANA_CONFIG_WITHOUT_APM,
+  CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG,
+} from './fixtures';
 
 const logFilePath = Path.join(__dirname, 'logs.log');
 
@@ -24,7 +28,7 @@ describe('Fleet preconfiguration reset', () => {
 
   const registryUrl = useDockerRegistry();
 
-  const startServers = async () => {
+  const startServers = async (defaultKbnConfig: any = CLOUD_KIBANA_CONFIG) => {
     const { startES } = kbnTestServer.createTestServers({
       adjustTimeout: (t) => jest.setTimeout(t),
       settings: {
@@ -36,13 +40,17 @@ describe('Fleet preconfiguration reset', () => {
     });
 
     esServer = await startES();
-    const startKibana = async () => {
+    const startOrRestartKibana = async (kbnConfig: any = defaultKbnConfig) => {
+      if (kbnServer) {
+        await kbnServer.stop();
+      }
+
       const root = kbnTestServer.createRootWithCorePlugins(
         {
           xpack: {
-            ...CLOUD_KIBANA_CONFIG.xpack,
+            ...kbnConfig.xpack,
             fleet: {
-              ...CLOUD_KIBANA_CONFIG.xpack.fleet,
+              ...kbnConfig.xpack.fleet,
               registryUrl,
             },
           },
@@ -75,15 +83,19 @@ describe('Fleet preconfiguration reset', () => {
       const coreSetup = await root.setup();
       const coreStart = await root.start();
 
-      return {
+      kbnServer = {
         root,
         coreSetup,
         coreStart,
         stop: async () => await root.shutdown(),
       };
+      await waitForFleetSetup(kbnServer.root);
+    };
+    await startOrRestartKibana();
+
+    return {
+      startOrRestartKibana,
     };
-    kbnServer = await startKibana();
-    await waitForFleetSetup(kbnServer.root);
   };
 
   const stopServers = async () => {
@@ -98,63 +110,65 @@ describe('Fleet preconfiguration reset', () => {
     await new Promise((res) => setTimeout(res, 10000));
   };
 
-  // Share the same servers for all the test to make test a lot faster (but test are not isolated anymore)
-  beforeAll(async () => {
-    await startServers();
-  });
+  describe('Preconfigured cloud policy', () => {
+    describe('With a full preconfigured cloud policy', () => {
+      beforeAll(async () => {
+        await startServers();
+      });
 
-  afterAll(async () => {
-    await stopServers();
-  });
+      afterAll(async () => {
+        await stopServers();
+      });
 
-  describe('Preconfigred cloud policy', () => {
-    it('Works and preconfigure correctly agent policies', async () => {
-      const agentPolicies = await kbnServer.coreStart.savedObjects
-        .createInternalRepository()
-        .find<AgentPolicySOAttributes>({
-          type: 'ingest-agent-policies',
-          perPage: 10000,
-        });
+      it('Works and preconfigure correctly agent policies', async () => {
+        const agentPolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<AgentPolicySOAttributes>({
+            type: 'ingest-agent-policies',
+            perPage: 10000,
+          });
 
-      expect(agentPolicies.total).toBe(2);
-      expect(
-        agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
-      ).toBeDefined();
-      expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
-    });
+        expect(agentPolicies.total).toBe(2);
+        expect(
+          agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
+        ).toBeDefined();
+        expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
+      });
+
+      it('Create correct .fleet-policies', async () => {
+        const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
+          index: AGENT_POLICY_INDEX,
+          q: `policy_id:policy-elastic-agent-on-cloud`,
+          sort: 'revision_idx:desc',
+        });
 
-    it('Create correct .fleet-policies', async () => {
-      const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
-        index: AGENT_POLICY_INDEX,
-        q: `policy_id:policy-elastic-agent-on-cloud`,
-        sort: 'revision_idx:desc',
+        expect((res.hits.hits[0]._source as any)!.data).toMatchSnapshot();
       });
 
-      expect((res.hits.hits[0]._source as any)!.data).toMatchSnapshot();
-    });
+      it('Create correct package policies', async () => {
+        const packagePolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<PackagePolicySOAttributes>({
+            type: 'ingest-package-policies',
+            perPage: 10000,
+          });
 
-    it('Create correct package policies', async () => {
-      const packagePolicies = await kbnServer.coreStart.savedObjects
-        .createInternalRepository()
-        .find<PackagePolicySOAttributes>({
-          type: 'ingest-package-policies',
-          perPage: 10000,
-        });
+        expect(packagePolicies.total).toBe(3);
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-fleet-server')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-apm')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'default-system')
+        ).toBeDefined();
 
-      expect(packagePolicies.total).toBe(3);
-      expect(
-        packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-fleet-server')
-      ).toBeDefined();
-      expect(
-        packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-apm')
-      ).toBeDefined();
-      expect(packagePolicies.saved_objects.find((so) => so.id === 'default-system')).toBeDefined();
-
-      const fleetServerPackagePolicy = packagePolicies.saved_objects.find(
-        (so) => so.id === 'elastic-cloud-fleet-server'
-      );
-      expect(fleetServerPackagePolicy?.attributes.vars).toMatchInlineSnapshot(`undefined`);
-      expect(fleetServerPackagePolicy?.attributes.inputs).toMatchInlineSnapshot(`
+        const fleetServerPackagePolicy = packagePolicies.saved_objects.find(
+          (so) => so.id === 'elastic-cloud-fleet-server'
+        );
+        expect(fleetServerPackagePolicy?.attributes.vars).toMatchInlineSnapshot(`undefined`);
+        expect(fleetServerPackagePolicy?.attributes.inputs).toMatchInlineSnapshot(`
         Array [
           Object {
             "compiled_input": Object {
@@ -195,6 +209,117 @@ describe('Fleet preconfiguration reset', () => {
           },
         ]
       `);
+      });
+    });
+    describe('Adding APM to a preconfigured agent policy after first setup', () => {
+      beforeAll(async () => {
+        // 1. Start with a preconfigured policy withtout APM
+        const { startOrRestartKibana } = await startServers(CLOUD_KIBANA_CONFIG_WITHOUT_APM);
+
+        // 2. Add APM to the preconfigured policy
+        await startOrRestartKibana(CLOUD_KIBANA_CONFIG);
+      });
+
+      afterAll(async () => {
+        await stopServers();
+      });
+
+      it('Works and preconfigure correctly agent policies', async () => {
+        const agentPolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<AgentPolicySOAttributes>({
+            type: 'ingest-agent-policies',
+            perPage: 10000,
+          });
+
+        expect(agentPolicies.total).toBe(2);
+        expect(
+          agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
+        ).toBeDefined();
+        expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
+      });
+
+      it('Create a .fleet-policies document with the APM package policy', async () => {
+        const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
+          index: AGENT_POLICY_INDEX,
+          q: `policy_id:policy-elastic-agent-on-cloud`,
+          sort: 'revision_idx:desc',
+        });
+
+        expect(
+          (res.hits.hits[0]._source as any)!.data.inputs.find(
+            (input: any) => input.meta.package.name === 'apm'
+          )
+        ).toBeDefined();
+      });
+
+      it('Create correct package policies', async () => {
+        const packagePolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<PackagePolicySOAttributes>({
+            type: 'ingest-package-policies',
+            perPage: 10000,
+          });
+
+        expect(packagePolicies.total).toBe(3);
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-fleet-server')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'elastic-cloud-apm')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.id === 'default-system')
+        ).toBeDefined();
+      });
+    });
+
+    describe('Adding package policy id to a preconfigured package policy after first setup', () => {
+      beforeAll(async () => {
+        // 1. Start with a preconfigured policy withtout APM
+        const { startOrRestartKibana } = await startServers(
+          CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG
+        );
+
+        // 2. Add pacakge policy ids to the preconfigured policy
+        await startOrRestartKibana(CLOUD_KIBANA_CONFIG);
+      });
+
+      afterAll(async () => {
+        await stopServers();
+      });
+
+      it('Works and preconfigure correctly agent policies', async () => {
+        const agentPolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<AgentPolicySOAttributes>({
+            type: 'ingest-agent-policies',
+            perPage: 10000,
+          });
+
+        expect(agentPolicies.total).toBe(2);
+        expect(
+          agentPolicies.saved_objects.find((so) => so.id === 'policy-elastic-agent-on-cloud')
+        ).toBeDefined();
+        expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
+      });
+
+      it('Create correct package policies and use the name of package policies instead of id', async () => {
+        const packagePolicies = await kbnServer.coreStart.savedObjects
+          .createInternalRepository()
+          .find<PackagePolicySOAttributes>({
+            type: 'ingest-package-policies',
+            perPage: 10000,
+          });
+
+        expect(packagePolicies.total).toBe(3);
+        expect(
+          packagePolicies.saved_objects.find((so) => so.attributes.name === 'Fleet Server')
+        ).toBeDefined();
+        expect(
+          packagePolicies.saved_objects.find((so) => so.attributes.name === 'Elastic APM')
+        ).toBeDefined();
+      });
     });
   });
 });
diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_apm.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_apm.ts
new file mode 100644
index 0000000000000..07699a7880d62
--- /dev/null
+++ b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_apm.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const CLOUD_KIBANA_CONFIG_WITHOUT_APM = {
+  xpack: {
+    fleet: {
+      packages: [
+        {
+          name: 'fleet_server',
+          version: 'latest',
+        },
+        {
+          name: 'system',
+          version: 'latest',
+        },
+      ],
+      outputs: [
+        {
+          name: 'Elastic Cloud internal output',
+          type: 'elasticsearch',
+          id: 'es-containerhost',
+          hosts: ['https://cloudinternales:9200'],
+        },
+      ],
+      agentPolicies: [
+        {
+          name: 'Elastic Cloud agent policy',
+          description: 'Default agent policy for agents hosted on Elastic Cloud',
+          id: 'policy-elastic-agent-on-cloud',
+          data_output_id: 'es-containerhost',
+          monitoring_output_id: 'es-containerhost',
+          is_default: false,
+          is_managed: true,
+          is_default_fleet_server: false,
+          namespace: 'default',
+          monitoring_enabled: [],
+          unenroll_timeout: 86400,
+          package_policies: [
+            {
+              name: 'Fleet Server',
+              id: 'elastic-cloud-fleet-server',
+              package: {
+                name: 'fleet_server',
+              },
+              inputs: [
+                {
+                  type: 'fleet-server',
+                  keep_enabled: true,
+                  vars: [
+                    {
+                      name: 'host',
+                      value: '0.0.0.0',
+                      frozen: true,
+                    },
+                    {
+                      name: 'port',
+                      value: 8220,
+                      frozen: true,
+                    },
+                    {
+                      name: 'custom',
+                      value:
+                        'server.runtime:\n  gc_percent: 20          # Force the GC to execute more frequently: see https://golang.org/pkg/runtime/debug/#SetGCPercent\n',
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          name: 'Default policy',
+          id: 'default-policy',
+          description: 'Default agent policy created by Kibana',
+          is_default: true,
+          is_managed: false,
+          namespace: 'default',
+          monitoring_enabled: ['logs', 'metrics'],
+          package_policies: [
+            {
+              name: 'system-1',
+              id: 'default-system',
+              package: {
+                name: 'system',
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+};
diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_policy_id.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_policy_id.ts
new file mode 100644
index 0000000000000..8cc9b340ce50d
--- /dev/null
+++ b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config_without_policy_id.ts
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG = {
+  xpack: {
+    fleet: {
+      packages: [
+        {
+          name: 'apm',
+          version: 'latest',
+        },
+        {
+          name: 'fleet_server',
+          version: 'latest',
+        },
+        {
+          name: 'system',
+          version: 'latest',
+        },
+      ],
+      outputs: [
+        {
+          name: 'Elastic Cloud internal output',
+          type: 'elasticsearch',
+          id: 'es-containerhost',
+          hosts: ['https://cloudinternales:9200'],
+        },
+      ],
+      agentPolicies: [
+        {
+          name: 'Elastic Cloud agent policy',
+          description: 'Default agent policy for agents hosted on Elastic Cloud',
+          id: 'policy-elastic-agent-on-cloud',
+          data_output_id: 'es-containerhost',
+          monitoring_output_id: 'es-containerhost',
+          is_default: false,
+          is_managed: true,
+          is_default_fleet_server: false,
+          namespace: 'default',
+          monitoring_enabled: [],
+          unenroll_timeout: 86400,
+          package_policies: [
+            {
+              name: 'Fleet Server',
+              package: {
+                name: 'fleet_server',
+              },
+              inputs: [
+                {
+                  type: 'fleet-server',
+                  keep_enabled: true,
+                  vars: [
+                    {
+                      name: 'host',
+                      value: '0.0.0.0',
+                      frozen: true,
+                    },
+                    {
+                      name: 'port',
+                      value: 8220,
+                      frozen: true,
+                    },
+                    {
+                      name: 'custom',
+                      value:
+                        'server.runtime:\n  gc_percent: 20          # Force the GC to execute more frequently: see https://golang.org/pkg/runtime/debug/#SetGCPercent\n',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              name: 'Elastic APM',
+              package: {
+                name: 'apm',
+              },
+              inputs: [
+                {
+                  type: 'apm',
+                  keep_enabled: true,
+                  vars: [
+                    {
+                      name: 'api_key_enabled',
+                      value: true,
+                    },
+                    {
+                      name: 'host',
+                      value: '0.0.0.0:8200',
+                      frozen: true,
+                    },
+                    {
+                      name: 'secret_token',
+                      value: 'CLOUD_SECRET_TOKEN',
+                    },
+                    {
+                      name: 'tls_enabled',
+                      value: true,
+                      frozen: true,
+                    },
+                    {
+                      name: 'tls_certificate',
+                      value: '/app/config/certs/node.crt',
+                      frozen: true,
+                    },
+                    {
+                      name: 'tls_key',
+                      value: '/app/config/certs/node.key',
+                      frozen: true,
+                    },
+                    {
+                      name: 'url',
+                      value: 'CLOUD_APM_URL',
+                      frozen: true,
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          name: 'Default policy',
+          id: 'default-policy',
+          description: 'Default agent policy created by Kibana',
+          is_default: true,
+          is_managed: false,
+          namespace: 'default',
+          monitoring_enabled: ['logs', 'metrics'],
+          package_policies: [
+            {
+              name: 'system-1',
+              id: 'default-system',
+              package: {
+                name: 'system',
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+};
diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/index.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/index.ts
new file mode 100644
index 0000000000000..90a83fab0360e
--- /dev/null
+++ b/x-pack/plugins/fleet/server/integration_tests/fixtures/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { CLOUD_KIBANA_CONFIG_WITHOUT_APM } from './cloud_kibana_config_without_apm';
+export { CLOUD_KIBANA_CONFIG } from './cloud_kibana_config';
+export { CLOUD_KIBANA_WITHOUT_PACKAGE_POLICY_ID_CONFIG } from './cloud_kibana_config_without_policy_id';
diff --git a/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts b/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
index 2a3a35072b0b3..b1c795ca93b38 100644
--- a/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
@@ -9,8 +9,8 @@ import Path from 'path';
 
 import { range } from 'lodash';
 
-import type { ISavedObjectsRepository } from 'src/core/server';
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import type {
   AgentPolicySOAttributes,
diff --git a/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts b/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts
index b413211fe9ae7..ff0cc32ab996d 100644
--- a/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/helpers/index.ts
@@ -7,8 +7,8 @@
 
 import { adminTestUser } from '@kbn/test';
 
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
-import type { HttpMethod } from 'src/core/test_helpers/kbn_server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
+import type { HttpMethod } from '@kbn/core/test_helpers/kbn_server';
 
 type Root = ReturnType<typeof kbnTestServer.createRoot>;
 
diff --git a/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
index 1c387dc628cbb..30bdf452cde12 100644
--- a/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
@@ -7,7 +7,7 @@
 
 import Path from 'path';
 
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import type { AgentPolicySOAttributes } from '../types';
 import { PRECONFIGURATION_DELETION_RECORD_SAVED_OBJECT_TYPE } from '../../common';
diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
index b229677a4ded9..8fd23dfbbac83 100644
--- a/x-pack/plugins/fleet/server/mocks/index.ts
+++ b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -12,11 +12,12 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
-} from '../../../../../src/core/server/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
-import { licensingMock } from '../../../../plugins/licensing/server/mocks';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
+} from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+
 import type { PackagePolicyServiceInterface } from '../services/package_policy';
 import type { AgentPolicyServiceInterface } from '../services';
 import type { FleetAppContext } from '../plugin';
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index b94c80be75c4b..20d55409e50d2 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -23,28 +23,27 @@ import type {
   ServiceStatus,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
-import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
+import type { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server';
 
-import {
-  DEFAULT_APP_CATEGORIES,
-  SavedObjectsClient,
-  ServiceStatusLevels,
-} from '../../../../src/core/server';
-import type { PluginStart as DataPluginStart } from '../../../../src/plugins/data/server';
-import type { LicensingPluginStart } from '../../licensing/server';
+import { DEFAULT_APP_CATEGORIES, SavedObjectsClient, ServiceStatusLevels } from '@kbn/core/server';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type {
   EncryptedSavedObjectsPluginStart,
   EncryptedSavedObjectsPluginSetup,
-} from '../../encrypted_saved_objects/server';
-import type { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
+
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+
 import type { FleetConfigType, FleetAuthz } from '../common';
 import { INTEGRATIONS_PLUGIN_ID } from '../common';
-import type { CloudSetup } from '../../cloud/server';
-import type { SpacesPluginStart } from '../../spaces/server';
 
 import {
   PLUGIN_ID,
diff --git a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts
index b31cda7cbf61d..85f7ea672ecb4 100644
--- a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.test.ts
@@ -10,12 +10,12 @@ import type {
   KibanaResponseFactory,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   httpServerMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { NewAgentActionSchema } from '../../types/models';
 import type { ActionsService } from '../../services/agents';
diff --git a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts
index 42769d4caf6cb..265fe4d9e4221 100644
--- a/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts
@@ -7,7 +7,7 @@
 
 // handlers that handle agent actions request
 
-import type { RequestHandler } from 'kibana/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type { PostNewAgentActionRequestSchema } from '../../types/rest_spec';
diff --git a/x-pack/plugins/fleet/server/routes/agent/handlers.ts b/x-pack/plugins/fleet/server/routes/agent/handlers.ts
index eb2fde7b5894b..b0c6a975dfead 100644
--- a/x-pack/plugins/fleet/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/handlers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
diff --git a/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts b/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts
index 40dbc2fc49e66..57752ae5caf6e 100644
--- a/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
diff --git a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
index 472f7378028bc..dd33752574690 100644
--- a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 import semverCoerce from 'semver/functions/coerce';
 
diff --git a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
index f0ed469ad8443..34dc29d89e6c4 100644
--- a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
@@ -6,7 +6,7 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { RequestHandler, ResponseHeaders } from 'src/core/server';
+import type { RequestHandler, ResponseHeaders } from '@kbn/core/server';
 import pMap from 'p-map';
 import { safeDump } from 'js-yaml';
 
diff --git a/x-pack/plugins/fleet/server/routes/app/index.ts b/x-pack/plugins/fleet/server/routes/app/index.ts
index 079850dc07478..fa4841c50e5bf 100644
--- a/x-pack/plugins/fleet/server/routes/app/index.ts
+++ b/x-pack/plugins/fleet/server/routes/app/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import { APP_API_ROUTES } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
index 437806abf4e9e..d7081a91453f9 100644
--- a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
@@ -6,7 +6,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { keyBy, keys, merge } from 'lodash';
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 
 import type { DataStream } from '../../types';
 import { KibanaSavedObjectType } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
index 862da50abf71b..1dc088cfe9a3e 100644
--- a/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
diff --git a/x-pack/plugins/fleet/server/routes/epm/handlers.ts b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
index 7ba2d3f194eeb..62a9661c328ab 100644
--- a/x-pack/plugins/fleet/server/routes/epm/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
@@ -10,7 +10,7 @@ import path from 'path';
 import type { TypeOf } from '@kbn/config-schema';
 import mime from 'mime-types';
 import semverValid from 'semver/functions/valid';
-import type { ResponseHeaders, KnownHeaders } from 'src/core/server';
+import type { ResponseHeaders, KnownHeaders } from '@kbn/core/server';
 
 import type {
   GetInfoResponse,
diff --git a/x-pack/plugins/fleet/server/routes/epm/index.ts b/x-pack/plugins/fleet/server/routes/epm/index.ts
index 544ab8b288cb4..2fe8727066e7d 100644
--- a/x-pack/plugins/fleet/server/routes/epm/index.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IKibanaResponse } from 'src/core/server';
+import type { IKibanaResponse } from '@kbn/core/server';
 
 import type {
   DeletePackageResponse,
diff --git a/x-pack/plugins/fleet/server/routes/output/handler.ts b/x-pack/plugins/fleet/server/routes/output/handler.ts
index d4372c22f32de..7f97477d89306 100644
--- a/x-pack/plugins/fleet/server/routes/output/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/output/handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler } from 'src/core/server';
+import type { RequestHandler } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
index 25d0f5c577667..1041dcc0579aa 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
-import type { KibanaRequest } from 'kibana/server';
-import type { RouteConfig } from 'kibana/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { RouteConfig } from '@kbn/core/server';
 
 import { PACKAGE_POLICY_API_ROUTES } from '../../../common/constants';
 import { appContextService, packagePolicyService } from '../../services';
@@ -26,7 +26,7 @@ import type { FleetAuthzRouter } from '../security';
 import type { FleetRequestHandler } from '../../types';
 import type { PackagePolicy } from '../../types';
 
-import { registerRoutes } from './index';
+import { registerRoutes } from '.';
 
 const packagePolicyServiceMock = packagePolicyService as jest.Mocked<PackagePolicyServiceInterface>;
 
@@ -263,6 +263,38 @@ describe('When calling package policy', () => {
         });
       });
     });
+
+    describe('postCreate callback registration', () => {
+      it('should call to packagePolicyCreate and packagePolicyPostCreate call backs', async () => {
+        const request = getCreateKibanaRequest();
+        await routeHandler(context, request, response);
+
+        expect(response.ok).toHaveBeenCalled();
+        expect(packagePolicyService.runExternalCallbacks).toBeCalledTimes(2);
+
+        const firstCB = packagePolicyServiceMock.runExternalCallbacks.mock.calls[0][0];
+        const secondCB = packagePolicyServiceMock.runExternalCallbacks.mock.calls[1][0];
+
+        expect(firstCB).toEqual('packagePolicyCreate');
+        expect(secondCB).toEqual('packagePolicyPostCreate');
+      });
+
+      it('should not call packagePolicyPostCreate call back in case of packagePolicy create failed', async () => {
+        const request = getCreateKibanaRequest();
+
+        packagePolicyServiceMock.create.mockImplementationOnce(
+          async (soClient, esClient, newData) => {
+            throw new Error('foo');
+          }
+        );
+
+        await routeHandler(context, request, response);
+        const firstCB = packagePolicyServiceMock.runExternalCallbacks.mock.calls[0][0];
+
+        expect(firstCB).toEqual('packagePolicyCreate');
+        expect(packagePolicyService.runExternalCallbacks).toBeCalledTimes(1);
+      });
+    });
   });
 
   describe('update api handler', () => {
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
index de2045ff3e47c..e0dc77fc57dcb 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
@@ -8,8 +8,9 @@
 import type { TypeOf } from '@kbn/config-schema';
 import Boom from '@hapi/boom';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import type { RequestHandler } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import type { RequestHandler } from '@kbn/core/server';
+
 import { appContextService, packagePolicyService } from '../../services';
 import type {
   GetPackagePoliciesRequestSchema,
@@ -110,7 +111,16 @@ export const createPackagePolicyHandler: FleetRequestHandler<
       force,
       spaceId,
     });
-    const body: CreatePackagePolicyResponse = { item: packagePolicy };
+
+    const enrichedPackagePolicy = await packagePolicyService.runExternalCallbacks(
+      'packagePolicyPostCreate',
+      packagePolicy,
+      context,
+      request
+    );
+
+    const body: CreatePackagePolicyResponse = { item: enrichedPackagePolicy };
+
     return response.ok({
       body,
     });
diff --git a/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts b/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts
index 79fbfc7f9a686..aa9d6acbbc472 100644
--- a/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/preconfiguration/handler.ts
@@ -16,7 +16,7 @@ import type {
 } from '../../types';
 import { defaultIngestErrorHandler } from '../../errors';
 import { ensurePreconfiguredPackagesAndPolicies, outputService } from '../../services';
-import { resetPreconfiguredAgentPolicies } from '../../services/preconfiguration/index';
+import { resetPreconfiguredAgentPolicies } from '../../services/preconfiguration/reset_agent_policies';
 
 export const updatePreconfigurationHandler: FleetRequestHandler<
   undefined,
diff --git a/x-pack/plugins/fleet/server/routes/security.test.ts b/x-pack/plugins/fleet/server/routes/security.test.ts
index 67ffb074c705d..fac6252cc1e16 100644
--- a/x-pack/plugins/fleet/server/routes/security.test.ts
+++ b/x-pack/plugins/fleet/server/routes/security.test.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandler, RouteConfig } from '../../../../../src/core/server';
-import { coreMock } from '../../../../../src/core/server/mocks';
-import type { AuthenticatedUser, CheckPrivilegesPayload } from '../../../security/server';
-import type { CheckPrivilegesResponse } from '../../../security/server/authorization/types';
-import type { CheckPrivilegesDynamically } from '../../../security/server/authorization/check_privileges_dynamically';
+import type { IRouter, RequestHandler, RouteConfig } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import type { AuthenticatedUser, CheckPrivilegesPayload } from '@kbn/security-plugin/server';
+import type { CheckPrivilegesResponse } from '@kbn/security-plugin/server/authorization/types';
+import type { CheckPrivilegesDynamically } from '@kbn/security-plugin/server/authorization/check_privileges_dynamically';
+
 import { createAppContextStartContractMock } from '../mocks';
 import { appContextService } from '../services';
 import type { FleetRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/fleet/server/routes/security.ts b/x-pack/plugins/fleet/server/routes/security.ts
index cdf997a4d0ead..7b860af6e1170 100644
--- a/x-pack/plugins/fleet/server/routes/security.ts
+++ b/x-pack/plugins/fleet/server/routes/security.ts
@@ -13,7 +13,7 @@ import type {
   RequestHandler,
   RequestHandlerContext,
   OnPostAuthHandler,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { FleetAuthz } from '../../common';
 import { calculateAuthz, INTEGRATIONS_PLUGIN_ID } from '../../common';
diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
index bacbff982daec..971684daff650 100644
--- a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { httpServerMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PostFleetSetupResponse } from '../../../common';
 import { RegistryError } from '../../errors';
diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts
index 915d841dd287e..2a8f14f795f7c 100644
--- a/x-pack/plugins/fleet/server/saved_objects/index.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/index.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-import type { SavedObjectsServiceSetup, SavedObjectsType } from 'kibana/server';
+import type { SavedObjectsServiceSetup, SavedObjectsType } from '@kbn/core/server';
+
+import type { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 
-import type { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import {
   OUTPUT_SAVED_OBJECT_TYPE,
   AGENT_POLICY_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts
index 13a4b185e5ea8..4461cf288dc9d 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts
index c17a167184b4b..3dfb9b649b6fc 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_11_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts
index d64fb55ba65a2..ef26ab759999e 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts
index 4fc8c15044e82..67ba8c1073c7f 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_12_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts
index 75e2922bd5149..be6888f802400 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeepWith, cloneDeep } from 'lodash';
 
-import type { PackagePolicy } from '../../../../common';
+import { migrationMocks } from '@kbn/core/server/mocks';
 
-import { migrationMocks } from '../../../../../../../src/core/server/mocks';
+import type { PackagePolicy } from '../../../../common';
 
 import { migrateEndpointPackagePolicyToV7130 } from './to_v7_13_0';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts
index 655ce37b4faaf..0953eb92fcb4c 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_13_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 import { relativeDownloadUrlFromArtifact } from '../../../services/artifacts/mappings';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts
index 1d3f3782d482a..3340d4af0085b 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts
index a56ef13375149..0c711ed4b935d 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_14_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts
index 6064bcaf99e37..38866e7f971dd 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts
index 7f96cda589462..350ac4f60275b 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_15_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts
index 5311d9c8cd7ee..a062f3f4097f6 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts
index ca565ca086756..240ba86b9b1af 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v7_16_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts
index dabd76dd48635..c6e853569b594 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts
index d6610915c0031..b20a2b87944c6 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_2_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { cloneDeep } from 'lodash';
 
 import type { PackagePolicy } from '../../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts
index bb54c55ac75a6..7c5c3c6fb4cf1 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_10_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { AgentPolicy, PackagePolicy, Settings } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts
index fde71388cbbde..ab62c741a32a9 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { AgentPolicy } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts
index eede38aca78e9..a2cbebd74de70 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_13_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { Settings } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts
index 90c9ac5f8e89b..fea88312d9542 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_14_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy, Installation } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts
index 27758296d8d95..36788d2af9d09 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_15_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts
index 66331dab47cc8..0091aec0de5f2 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_16_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { Installation, PackagePolicy } from '../../../common';
 import {
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts
index 61db35fd9faf5..b4474b46013d2 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_0_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { Installation, Output } from '../../../common';
 import { AUTO_UPGRADE_POLICIES_PACKAGES } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts
index e75bafb9e24c0..a880e2c85f12a 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v8_2_0.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 import type { PackagePolicy } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts
index ba9252dd09a8f..f283581466664 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { AgentPolicy, Output } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
index 3114ac3c0a8ed..a4b618d0323a1 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/full_agent_policy.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { safeLoad } from 'js-yaml';
 
 import type {
@@ -27,7 +27,7 @@ import { getSettings } from '../settings';
 import { DEFAULT_OUTPUT } from '../../constants';
 
 import { getMonitoringPermissions } from './monitoring_permissions';
-import { storedPackagePoliciesToAgentInputs } from './';
+import { storedPackagePoliciesToAgentInputs } from '.';
 
 export async function getFullAgentPolicy(
   soClient: SavedObjectsClientContract,
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
index 097cbd551fad5..f336fd093c3af 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { Installation, PackageInfo } from '../../types';
 import { getPackageInfo, getInstallation } from '../epm/packages';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
index 7e897d62c8be9..11e6a486d69c3 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/monitoring_permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { getPackageInfo, getInstallation } from '../epm/packages';
 import { getDataStreamPrivileges } from '../package_policies_to_agent_permissions';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts
index 4bbcdaabe9b50..ebc596cb59ac6 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/output_helpers.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { appContextService } from '..';
 import { outputService } from '../output';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts b/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts
index 42a48f66de919..a3e0c295933af 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/outputs_helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { AgentPolicySOAttributes } from '../../types';
 import { LICENCE_FOR_PER_POLICY_OUTPUT, outputType } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts
index 0812e3f593c66..a3c4f7754f5fa 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PackagePolicy, PackagePolicyInput } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
index f2c11c2067ee7..9189d99bed488 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { merge } from 'lodash';
 
 import { isPackageLimited } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
index 214237868dd83..a71180f235288 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 import type {
   AgentPolicy,
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
index 37af4e646658b..d3ce069ed5cc6 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -14,9 +14,10 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   SavedObjectsBulkUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
+
+import type { AuthenticatedUser } from '@kbn/security-plugin/server';
 
-import type { AuthenticatedUser } from '../../../security/server';
 import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   AGENTS_PREFIX,
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts b/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts
index 6be992b7f7a8b..c477d08395552 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_create.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { AgentPolicy, PackagePolicy } from '../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_create.ts b/x-pack/plugins/fleet/server/services/agent_policy_create.ts
index 7ec6662192a05..888dd3eb34df2 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_create.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_create.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
-import type { AuthenticatedUser } from '../../../security/common/model';
+import type { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
 import {
   FLEET_ELASTIC_AGENT_PACKAGE,
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_update.ts b/x-pack/plugins/fleet/server/services/agent_policy_update.ts
index 30472c242ba45..7ff4383afd337 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_update.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_update.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { generateEnrollmentAPIKey, deleteEnrollmentApiKeyForAgentPolicyId } from './api_keys';
 import { unenrollForAgentPolicyId } from './agents';
diff --git a/x-pack/plugins/fleet/server/services/agents/actions.ts b/x-pack/plugins/fleet/server/services/agents/actions.ts
index dbd7105fd5607..3ea8060e8e492 100644
--- a/x-pack/plugins/fleet/server/services/agents/actions.ts
+++ b/x-pack/plugins/fleet/server/services/agents/actions.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { Agent, AgentAction, FleetServerAgentAction } from '../../../common/types/models';
 import { AGENT_ACTIONS_INDEX } from '../../../common/constants';
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts b/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
index 7ccc37c9d9867..3a49fb99dfb0e 100644
--- a/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
@@ -9,8 +9,9 @@ jest.mock('../../routes/security');
 jest.mock('./crud');
 jest.mock('./status');
 
-import type { ElasticsearchClient } from '../../../../../../src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from '../../../../../../src/core/server/mocks';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
+
 import { FleetUnauthorizedError } from '../../errors';
 
 import { getAuthzFromRequest } from '../../routes/security';
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_service.ts b/x-pack/plugins/fleet/server/services/agents/agent_service.ts
index d23f3b0c88ad9..bf0ee1f92871f 100644
--- a/x-pack/plugins/fleet/server/services/agents/agent_service.ts
+++ b/x-pack/plugins/fleet/server/services/agents/agent_service.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable max-classes-per-file */
 
-import type { ElasticsearchClient, KibanaRequest } from 'kibana/server';
+import type { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
 
 import type { AgentStatus, ListWithKuery } from '../../types';
 import type { Agent, GetAgentStatusResponse } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.test.ts b/x-pack/plugins/fleet/server/services/agents/crud.test.ts
index f6988c1c7d280..5a1b47a7b359a 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { Agent } from '../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts
index 03b71ceb496f2..258f0bf7d4898 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.ts
@@ -7,13 +7,13 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 
 import type { KueryNode } from '@kbn/es-query';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 
 import type { AgentSOAttributes, Agent, BulkActionResult, ListWithKuery } from '../../types';
-import { appContextService, agentPolicyService } from '../../services';
+import { appContextService, agentPolicyService } from '..';
 import type { FleetServerAgent } from '../../../common';
 import { isAgentUpgradeable, SO_SEARCH_LIMIT } from '../../../common';
 import { AGENTS_PREFIX, AGENTS_INDEX } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/services/agents/helpers.ts b/x-pack/plugins/fleet/server/services/agents/helpers.ts
index 2b18336f298d2..08c0c7ba964dc 100644
--- a/x-pack/plugins/fleet/server/services/agents/helpers.ts
+++ b/x-pack/plugins/fleet/server/services/agents/helpers.ts
@@ -7,7 +7,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { SearchHit } from '../../../../../../src/core/types/elasticsearch';
+import type { SearchHit } from '@kbn/core/types/elasticsearch';
+
 import type { Agent, AgentSOAttributes, FleetServerAgent } from '../../types';
 import { getAgentStatus } from '../../../common/services/agent_status';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
index 3a25efc6d49d1..59267ab6de6db 100644
--- a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObject } from 'kibana/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import type { AgentPolicy } from '../../types';
 import { HostedAgentPolicyRestrictionRelatedError } from '../../errors';
diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.ts b/x-pack/plugins/fleet/server/services/agents/reassign.ts
index ee64504292874..d342e8d54bb84 100644
--- a/x-pack/plugins/fleet/server/services/agents/reassign.ts
+++ b/x-pack/plugins/fleet/server/services/agents/reassign.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 
 import type { Agent, BulkActionResult } from '../../types';
@@ -19,7 +19,7 @@ import {
   updateAgent,
   bulkUpdateAgents,
 } from './crud';
-import type { GetAgentsOptions } from './index';
+import type { GetAgentsOptions } from '.';
 import { createAgentAction, bulkCreateAgentActions } from './actions';
 import { searchHitToAgent } from './helpers';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/saved_objects.ts b/x-pack/plugins/fleet/server/services/agents/saved_objects.ts
index eec9c9c7c16ff..a26194ef6ddeb 100644
--- a/x-pack/plugins/fleet/server/services/agents/saved_objects.ts
+++ b/x-pack/plugins/fleet/server/services/agents/saved_objects.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import type {
   Agent,
diff --git a/x-pack/plugins/fleet/server/services/agents/setup.ts b/x-pack/plugins/fleet/server/services/agents/setup.ts
index ffbfb589b10f2..75ab47ae90375 100644
--- a/x-pack/plugins/fleet/server/services/agents/setup.ts
+++ b/x-pack/plugins/fleet/server/services/agents/setup.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { SO_SEARCH_LIMIT } from '../../constants';
 import { agentPolicyService } from '../agent_policy';
diff --git a/x-pack/plugins/fleet/server/services/agents/status.test.ts b/x-pack/plugins/fleet/server/services/agents/status.test.ts
index a6fd604ea0e30..d1993200c7ce5 100644
--- a/x-pack/plugins/fleet/server/services/agents/status.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/status.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { getAgentStatusById } from './status';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/status.ts b/x-pack/plugins/fleet/server/services/agents/status.ts
index 90113d1d177ef..15a43c6ac3999 100644
--- a/x-pack/plugins/fleet/server/services/agents/status.ts
+++ b/x-pack/plugins/fleet/server/services/agents/status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import pMap from 'p-map';
 
 import type { KueryNode } from '@kbn/es-query';
diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
index 181b517159c6f..e6327c16c3ccc 100644
--- a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
-import type { SavedObject } from 'kibana/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import type { SavedObject } from '@kbn/core/server';
 
 import type { AgentPolicy } from '../../types';
 import { HostedAgentPolicyRestrictionRelatedError } from '../../errors';
diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.ts
index 4d062e8bd5368..461caff1ada6c 100644
--- a/x-pack/plugins/fleet/server/services/agents/unenroll.ts
+++ b/x-pack/plugins/fleet/server/services/agents/unenroll.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { Agent, BulkActionResult } from '../../types';
 import * as APIKeyService from '../api_keys';
diff --git a/x-pack/plugins/fleet/server/services/agents/update.ts b/x-pack/plugins/fleet/server/services/agents/update.ts
index cbe7853425fa6..913796f6e7489 100644
--- a/x-pack/plugins/fleet/server/services/agents/update.ts
+++ b/x-pack/plugins/fleet/server/services/agents/update.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { AGENTS_PREFIX } from '../../constants';
 
diff --git a/x-pack/plugins/fleet/server/services/agents/upgrade.ts b/x-pack/plugins/fleet/server/services/agents/upgrade.ts
index 5f0218480788f..36568ca6e0004 100644
--- a/x-pack/plugins/fleet/server/services/agents/upgrade.ts
+++ b/x-pack/plugins/fleet/server/services/agents/upgrade.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { Agent, BulkActionResult } from '../../types';
-import { agentPolicyService } from '../../services';
+import { agentPolicyService } from '..';
 import {
   AgentReassignmentError,
   HostedAgentPolicyRestrictionRelatedError,
diff --git a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
index ee5d982811e31..0f49cbe6c9fe2 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/enrollment_api_key.ts
@@ -9,11 +9,12 @@ import uuid from 'uuid';
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
 import { errors } from '@elastic/elasticsearch';
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
 
 import { toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
 
-import type { ESSearchResponse as SearchResponse } from '../../../../../../src/core/types/elasticsearch';
+import type { ESSearchResponse as SearchResponse } from '@kbn/core/types/elasticsearch';
+
 import type { EnrollmentAPIKey, FleetServerEnrollmentAPIKey } from '../../types';
 import { IngestManagerError } from '../../errors';
 import { ENROLLMENT_API_KEYS_INDEX } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
index d55aa37fd5150..8d1b0b24743ac 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Check if an esClient has enought permission to create a valid API key for logstash
diff --git a/x-pack/plugins/fleet/server/services/app_context.ts b/x-pack/plugins/fleet/server/services/app_context.ts
index 3adace700f796..71409f8d115c6 100644
--- a/x-pack/plugins/fleet/server/services/app_context.ts
+++ b/x-pack/plugins/fleet/server/services/app_context.ts
@@ -8,31 +8,34 @@
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 import { kibanaPackageJson } from '@kbn/utils';
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import type {
   ElasticsearchClient,
   SavedObjectsServiceStart,
   HttpServiceSetup,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import type { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import type {
   EncryptedSavedObjectsClient,
   EncryptedSavedObjectsPluginSetup,
-} from '../../../encrypted_saved_objects/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+
+import type { SecurityPluginStart, SecurityPluginSetup } from '@kbn/security-plugin/server';
+
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
 
-import type { SecurityPluginStart, SecurityPluginSetup } from '../../../security/server';
 import type { FleetConfigType } from '../../common';
 import type {
   ExternalCallback,
   ExternalCallbacksStorage,
   PostPackagePolicyCreateCallback,
   PostPackagePolicyDeleteCallback,
+  PostPackagePolicyPostCreateCallback,
   PutPackagePolicyUpdateCallback,
 } from '../types';
 import type { FleetAppContext } from '../plugin';
-import type { CloudSetup } from '../../../cloud/server';
 import type { TelemetryEventsSender } from '../telemetry/sender';
 
 class AppContextService {
@@ -183,6 +186,8 @@ class AppContextService {
           ? PostPackagePolicyCreateCallback
           : T extends 'postPackagePolicyDelete'
           ? PostPackagePolicyDeleteCallback
+          : T extends 'packagePolicyPostCreate'
+          ? PostPackagePolicyPostCreateCallback
           : PutPackagePolicyUpdateCallback
       >
     | undefined {
@@ -192,6 +197,8 @@ class AppContextService {
           ? PostPackagePolicyCreateCallback
           : T extends 'postPackagePolicyDelete'
           ? PostPackagePolicyDeleteCallback
+          : T extends 'packagePolicyPostCreate'
+          ? PostPackagePolicyPostCreateCallback
           : PutPackagePolicyUpdateCallback
       >;
     }
diff --git a/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts b/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts
index 3f0c5af247eb5..2c9d93ee47f32 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/artifacts.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { errors } from '@elastic/elasticsearch';
 
diff --git a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
index c6e77301bed25..6948cf55e0eb8 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
@@ -11,7 +11,7 @@ import { promisify } from 'util';
 import type { BinaryLike } from 'crypto';
 import { createHash } from 'crypto';
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { ListResult } from '../../../common';
 import { FLEET_SERVER_ARTIFACTS_INDEX } from '../../../common';
diff --git a/x-pack/plugins/fleet/server/services/artifacts/client.test.ts b/x-pack/plugins/fleet/server/services/artifacts/client.test.ts
index d5aa2765908c1..f2acdc59e10de 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/client.test.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { ArtifactsClientAccessDeniedError, ArtifactsClientError } from '../../errors';
 
diff --git a/x-pack/plugins/fleet/server/services/artifacts/client.ts b/x-pack/plugins/fleet/server/services/artifacts/client.ts
index 42355aee8e4fb..36d1c9eb96aca 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/client.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/client.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import type { ListResult } from '../../../common';
 
diff --git a/x-pack/plugins/fleet/server/services/artifacts/mappings.ts b/x-pack/plugins/fleet/server/services/artifacts/mappings.ts
index 10dab0400d5aa..993e3d90d4640 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/mappings.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SearchHit } from '../../../../../../src/core/types/elasticsearch';
+import type { SearchHit } from '@kbn/core/types/elasticsearch';
 
 import type { Artifact, ArtifactElasticsearchProperties, NewArtifact } from './types';
 import { ARTIFACT_DOWNLOAD_RELATIVE_PATH } from './constants';
diff --git a/x-pack/plugins/fleet/server/services/artifacts/mocks.ts b/x-pack/plugins/fleet/server/services/artifacts/mocks.ts
index 9eee24afe08b2..74be6eff7db5a 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/mocks.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/mocks.ts
@@ -9,8 +9,8 @@ import { URL } from 'url';
 import type { TransportResult } from '@elastic/elasticsearch';
 import { errors } from '@elastic/elasticsearch';
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
-import type { SearchHit, ESSearchResponse } from '../../../../../../src/core/types/elasticsearch';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { SearchHit, ESSearchResponse } from '@kbn/core/types/elasticsearch';
 
 import type {
   Artifact,
diff --git a/x-pack/plugins/fleet/server/services/config.ts b/x-pack/plugins/fleet/server/services/config.ts
index f26099ad9c4db..e44c23cbdbd95 100644
--- a/x-pack/plugins/fleet/server/services/config.ts
+++ b/x-pack/plugins/fleet/server/services/config.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { FleetConfigType } from '../';
+import type { FleetConfigType } from '..';
 
 /**
  * Kibana config observable service, *NOT* agent policy
diff --git a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
index 4ce39483f09a3..77fe33df4ca48 100644
--- a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
+++ b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
@@ -222,8 +222,7 @@ metadata:
 ---
 `;
 
-export const elasticAgentManagedManifest = `
-apiVersion: apps/v1
+export const elasticAgentManagedManifest = `apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: elastic-agent
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/cache.ts b/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
index 676c3aa571a0f..ea94823287735 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/cache.ts
@@ -6,9 +6,9 @@
  */
 
 import type { ArchivePackage, RegistryPackage } from '../../../../common';
-import { appContextService } from '../../';
+import { appContextService } from '../..';
 
-import type { ArchiveEntry } from './index';
+import type { ArchiveEntry } from '.';
 
 const archiveEntryCache: Map<ArchiveEntry['path'], ArchiveEntry['buffer']> = new Map();
 export const getArchiveEntry = (key: string) => archiveEntryCache.get(key);
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/extract.ts b/x-pack/plugins/fleet/server/services/epm/archive/extract.ts
index 0bdb07df26814..03caf8901f40b 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/extract.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/extract.ts
@@ -10,7 +10,7 @@ import yauzl from 'yauzl';
 
 import { bufferToStream, streamToBuffer } from '../streams';
 
-import type { ArchiveEntry } from './index';
+import type { ArchiveEntry } from '.';
 
 export async function untarBuffer(
   buffer: Buffer,
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/parse.ts b/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
index 828a31b3ab03e..14b1eb8c305b8 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
@@ -28,7 +28,7 @@ import {
 import { PackageInvalidArchiveError } from '../../../errors';
 import { pkgToPkgKey } from '../registry';
 
-import { unpackBufferEntries } from './index';
+import { unpackBufferEntries } from '.';
 
 const MANIFESTS: Record<string, Buffer> = {};
 const MANIFEST_NAME = 'manifest.yml';
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
index d2a96921bf033..cb9f5650550e8 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
@@ -12,7 +12,7 @@ import { safeLoad } from 'js-yaml';
 import { isBinaryFile } from 'isbinaryfile';
 import mime from 'mime-types';
 import uuidv5 from 'uuid/v5';
-import type { SavedObjectsClientContract, SavedObjectsBulkCreateObject } from 'src/core/server';
+import type { SavedObjectsClientContract, SavedObjectsBulkCreateObject } from '@kbn/core/server';
 
 import { ASSETS_SAVED_OBJECT_TYPE } from '../../../../common';
 import type {
@@ -25,8 +25,8 @@ import { pkgToPkgKey } from '../registry';
 
 import { appContextService } from '../../app_context';
 
-import { getArchiveEntry, setArchiveEntry, setArchiveFilelist, setPackageInfo } from './index';
-import type { ArchiveEntry } from './index';
+import { getArchiveEntry, setArchiveEntry, setArchiveFilelist, setPackageInfo } from '.';
+import type { ArchiveEntry } from '.';
 import { parseAndVerifyPolicyTemplates, parseAndVerifyStreams } from './parse';
 
 const ONE_BYTE = 1024 * 1024;
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
index a1075b15a6462..4f18966a61307 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../../common/types/models';
 import type {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
index e45e2f59efe26..1d98a9339c907 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type { EsAssetReference } from '../../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts
index b77a787090ed6..9b64ec89507dc 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import type { InstallablePackage } from '../../../../types';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
index e4fae7ca0ca41..fb89c117ae16b 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/index.test.ts
@@ -7,7 +7,7 @@
 
 import type { RegistryDataStream } from '../../../types';
 
-import { getRegistryDataStreamAssetBaseName } from './index';
+import { getRegistryDataStreamAssetBaseName } from '.';
 
 test('getBaseName', () => {
   const dataStream: RegistryDataStream = {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
index 7f7e7b2ec10e9..c6830d5bb9a03 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/install.ts
@@ -6,7 +6,7 @@
  */
 
 import type { TransportRequestOptions } from '@elastic/elasticsearch';
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type { EsAssetReference, RegistryDataStream, InstallablePackage } from '../../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
index b7de8fd8ff5ed..e9d693bdbfaa8 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
-import { appContextService } from '../../../';
+import { appContextService } from '../../..';
 import { ElasticsearchAssetType } from '../../../../types';
 import { IngestManagerError } from '../../../../errors';
 import { getInstallation } from '../../packages/get';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
index 52951377c6e2e..13b3de989e620 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
 
 import { saveInstalledEsRefs } from '../../packages/install';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts
index 7fd70302d2acf..3abd19bd8035e 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ml_model/remove.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { appContextService } from '../../../app_context';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts
index ea2d0868c6d17..1ade871b27ef6 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/default_settings.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { loggerMock } from '@kbn/logging-mocks';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 import { appContextService } from '../../../app_context';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
index 84dbe324891bc..48f070434530a 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { loggerMock } from '@kbn/logging-mocks';
 
 import { createAppContextStartContractMock } from '../../../../mocks';
-import { appContextService } from '../../../../services';
+import { appContextService } from '../../..';
 
 import type { RegistryDataStream } from '../../../../types';
 import type { Field } from '../../fields/field';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
index a77f843aef2d3..6d953835dfe6c 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
@@ -7,7 +7,7 @@
 
 import { merge } from 'lodash';
 import Boom from '@hapi/boom';
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
index 77ce3779f2319..d565a22347b39 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -10,10 +10,10 @@ import path from 'path';
 
 import { safeLoad } from 'js-yaml';
 import { loggerMock } from '@kbn/logging-mocks';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { createAppContextStartContractMock } from '../../../../mocks';
-import { appContextService } from '../../../../services';
+import { appContextService } from '../../..';
 import type { RegistryDataStream } from '../../../../types';
 import { processFields } from '../../fields/field';
 import type { Field } from '../../fields/field';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index 909b593649fcd..c87df0921e745 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import type { IndicesIndexSettings } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import type { Field, Fields } from '../../fields/field';
@@ -15,8 +15,8 @@ import type {
   IndexTemplate,
   IndexTemplateMappings,
 } from '../../../../types';
-import { appContextService } from '../../../';
-import { getRegistryDataStreamAssetBaseName } from '../index';
+import { appContextService } from '../../..';
+import { getRegistryDataStreamAssetBaseName } from '..';
 import {
   FLEET_GLOBALS_COMPONENT_TEMPLATE_NAME,
   FLEET_AGENT_ID_VERIFY_COMPONENT_TEMPLATE_NAME,
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
index 144f994646fe9..fea12f4b139c6 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import { errors } from '@elastic/elasticsearch';
 
 import { saveInstalledEsRefs } from '../../packages/install';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts
index 5f1d8db121a41..cd544eef82150 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/saved_objects/service/saved_objects_client.mock';
+import { savedObjectsClientMock } from '@kbn/core/server/saved_objects/service/saved_objects_client.mock';
 
 import type { EsAssetReference } from '../../../../../common/types/models';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
index 07748c1635b3a..f10eddd3d5e65 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/remove.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
 import type { EsAssetReference } from '../../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
index 4a1909cc813e7..16384b8bfba19 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
@@ -19,16 +19,17 @@ jest.mock('./common', () => {
 });
 
 import { errors } from '@elastic/elasticsearch';
-import type { SavedObject, SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import { loggerMock } from '@kbn/logging-mocks';
 
-import { ElasticsearchAssetType } from '../../../../types';
-import type { Installation, RegistryPackage } from '../../../../types';
-import { getInstallation, getInstallationObject } from '../../packages';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/saved_objects/service/saved_objects_client.mock';
+import { savedObjectsClientMock } from '@kbn/core/server/saved_objects/service/saved_objects_client.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+
+import { getInstallation, getInstallationObject } from '../../packages';
+import type { Installation, RegistryPackage } from '../../../../types';
+import { ElasticsearchAssetType } from '../../../../types';
 import { appContextService } from '../../../app_context';
 
 import { getESAssetMetadata } from '../meta';
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
index 51aee45c83cf3..0d12a501f86b1 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.test.ts
@@ -9,9 +9,9 @@ import type {
   SavedObjectsImportFailure,
   SavedObjectsImportSuccess,
   SavedObjectsImportResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { ArchiveAsset } from './install';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
index b8ef796f8817c..ce8d7e7be2bb9 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
@@ -13,8 +13,8 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsImporter,
   Logger,
-} from 'src/core/server';
-import type { SavedObjectsImportSuccess, SavedObjectsImportFailure } from 'src/core/server/types';
+} from '@kbn/core/server';
+import type { SavedObjectsImportSuccess, SavedObjectsImportFailure } from '@kbn/core/server/types';
 import { createListStream } from '@kbn/utils';
 import { partition } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
index c42029f2c453d..1637bf19d8df4 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { dataTypes, installationStatuses } from '../../../../../common/constants';
-import { appContextService } from '../../../../services';
+import { appContextService } from '../../..';
 import { getPackageSavedObjects } from '../../packages/get';
 const INDEX_PATTERN_SAVED_OBJECT_TYPE = 'index-pattern';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.test.ts b/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
index 5c48ddb050ff2..31bf9e47a4ae0 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
@@ -9,16 +9,13 @@ jest.mock('../../routes/security');
 
 import type { MockedLogger } from '@kbn/logging-mocks';
 
-import type {
-  ElasticsearchClient,
-  SavedObjectsClientContract,
-} from '../../../../../../src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { FleetUnauthorizedError } from '../../errors';
 import type { InstallablePackage } from '../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.ts b/x-pack/plugins/fleet/server/services/epm/package_service.ts
index cac69fe4bd3b8..573ca3508e947 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.ts
@@ -12,7 +12,7 @@ import type {
   ElasticsearchClient,
   SavedObjectsClientContract,
   Logger,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import type {
   EsAssetReference,
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts
index 5bbfb4f9d15ab..c0e4404345902 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
-import { savedObjectsClientMock, elasticsearchServiceMock } from 'src/core/server/mocks';
+import type { SavedObjectsClientContract, ElasticsearchClient } from '@kbn/core/server';
+import { savedObjectsClientMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { loggerMock } from '@kbn/logging-mocks';
 
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import { appContextService } from '../../app_context';
 import { createAppContextStartContractMock } from '../../../mocks';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
index 05ed45a0e0c7a..b4e673b8a9da4 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
@@ -11,7 +11,7 @@ import type {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsImporter,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import {
   MAX_TIME_COMPLETE_INSTALL,
@@ -27,13 +27,13 @@ import {
   installPipelines,
   isTopLevelPipeline,
   deletePreviousPipelines,
-} from '../elasticsearch/ingest_pipeline/';
+} from '../elasticsearch/ingest_pipeline';
 import { getAllTemplateRefs } from '../elasticsearch/template/install';
 import { installILMPolicy } from '../elasticsearch/ilm/install';
 import { installKibanaAssets, getKibanaAssets } from '../kibana/assets/install';
 import { updateCurrentWriteIndices } from '../elasticsearch/template/template';
 import { installTransform } from '../elasticsearch/transform/install';
-import { installMlModel } from '../elasticsearch/ml_model/';
+import { installMlModel } from '../elasticsearch/ml_model';
 import { installIlmForDataStream } from '../elasticsearch/datastream_ilm/install';
 import { saveArchiveEntries } from '../archive/storage';
 import { ConcurrentInstallOperationError } from '../../../errors';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts b/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts
index d68b2f67e3295..a9d027ce51c8a 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/bulk_install_packages.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { appContextService } from '../../app_context';
 import * as Registry from '../registry';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts
index 07fd2d400b8d5..94d6bf8c165b1 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PackagePolicyServiceInterface } from '../../package_policy';
 import * as storage from '../archive/storage';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts
index 87eaa82aa85f0..2ee5e6fe79feb 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/cleanup.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { removeArchiveEntries } from '../archive/storage';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts
index b15c61cebd778..040bb79b9fc78 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.test.ts
@@ -7,10 +7,11 @@
 
 jest.mock('../registry');
 
-import type { SavedObjectsClientContract, SavedObjectsFindResult } from 'kibana/server';
+import type { SavedObjectsClientContract, SavedObjectsFindResult } from '@kbn/core/server';
+
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
 import { PACKAGES_SAVED_OBJECT_TYPE, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../common';
 import type { PackagePolicySOAttributes, RegistryPackage } from '../../../../common';
 
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get.ts b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
index fd24b3f438319..de4ce6a1e84b5 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract, SavedObjectsFindOptions } from 'src/core/server';
+import type { SavedObjectsClientContract, SavedObjectsFindOptions } from '@kbn/core/server';
 
 import {
   isPackageLimited,
@@ -22,13 +22,13 @@ import type {
 } from '../../../../common/types';
 import type { Installation, PackageInfo } from '../../../types';
 import { IngestManagerError, PackageNotFoundError } from '../../../errors';
-import { appContextService } from '../../';
+import { appContextService } from '../..';
 import * as Registry from '../registry';
 import { getEsPackage } from '../archive/storage';
 import { getArchivePackage } from '../archive';
 import { normalizeKuery } from '../../saved_object';
 
-import { createInstallableFrom } from './index';
+import { createInstallableFrom } from '.';
 
 export type { SearchParams } from '../registry';
 export { getFile } from '../registry';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts
index 341cc90dab9ea..e67f59aaba55b 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get_install_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import { ElasticsearchAssetType, KibanaSavedObjectType } from '../../../types';
 import type { Installation } from '../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/index.ts b/x-pack/plugins/fleet/server/services/epm/packages/index.ts
index d742103dccf12..30d2b5ec3fd22 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
 import { installationStatuses, KibanaSavedObjectType } from '../../../../common';
 import { KibanaAssetType } from '../../../types';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts
index 973e2624af5d9..76cf09b0cad06 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/install.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import * as Registry from '../registry';
 
@@ -19,7 +19,7 @@ import { licenseService } from '../../license';
 
 import { installPackage } from './install';
 import * as install from './_install_package';
-import * as obj from './index';
+import * as obj from '.';
 import { getBundledPackages } from './bundled_packages';
 
 jest.mock('../../app_context', () => {
@@ -35,7 +35,7 @@ jest.mock('../../app_context', () => {
     },
   };
 });
-jest.mock('./index');
+jest.mock('.');
 jest.mock('../registry');
 jest.mock('../../upgrade_sender');
 jest.mock('../../license');
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/install.ts b/x-pack/plugins/fleet/server/services/epm/packages/install.ts
index 8a4271c20be65..3ecec951dde7e 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/install.ts
@@ -8,10 +8,15 @@
 import { i18n } from '@kbn/i18n';
 import semverLt from 'semver/functions/lt';
 import type Boom from '@hapi/boom';
-import type { ElasticsearchClient, SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import type {
+  ElasticsearchClient,
+  SavedObject,
+  SavedObjectsClientContract,
+} from '@kbn/core/server';
+
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import { generateESIndexPatterns } from '../elasticsearch/template/template';
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
 import type {
   BulkInstallPackageInfo,
   EpmPackageInstallStatus,
@@ -22,7 +27,7 @@ import { AUTO_UPGRADE_POLICIES_PACKAGES } from '../../../../common';
 import { IngestManagerError, PackageOutdatedError } from '../../../errors';
 import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '../../../constants';
 import type { KibanaAssetType } from '../../../types';
-import { licenseService } from '../../';
+import { licenseService } from '../..';
 import type {
   Installation,
   AssetType,
@@ -43,7 +48,7 @@ import type { ArchiveAsset } from '../kibana/assets/install';
 import type { PackageUpdateEvent } from '../../upgrade_sender';
 import { sendTelemetryEvents, UpdateEventType } from '../../upgrade_sender';
 
-import { getInstallation, getInstallationObject } from './index';
+import { getInstallation, getInstallationObject } from '.';
 import { removeInstallation } from './remove';
 import { getPackageSavedObjects } from './get';
 import { _installPackage } from './_install_package';
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
index b3b99bfd05e03..7edf5b6020be8 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
@@ -5,16 +5,19 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import Boom from '@hapi/boom';
 
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
-import { SavedObjectsClient } from '../../../../../../../src/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE, PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
-import { DEFAULT_SPACE_ID } from '../../../../../spaces/common/constants';
 import { ElasticsearchAssetType } from '../../../types';
 import type {
   AssetReference,
@@ -23,7 +26,7 @@ import type {
   KibanaAssetReference,
   Installation,
 } from '../../../types';
-import { deletePipeline } from '../elasticsearch/ingest_pipeline/';
+import { deletePipeline } from '../elasticsearch/ingest_pipeline';
 import { removeUnusedIndexPatterns } from '../kibana/index_pattern/install';
 import { deleteTransforms } from '../elasticsearch/transform/remove';
 import { deleteMlModel } from '../elasticsearch/ml_model';
@@ -31,9 +34,8 @@ import { packagePolicyService, appContextService } from '../..';
 import { deletePackageCache } from '../archive';
 import { deleteIlms } from '../elasticsearch/datastream_ilm/remove';
 import { removeArchiveEntries } from '../archive/storage';
-import { SavedObjectsUtils } from '../../../../../../../src/core/server';
 
-import { getInstallation, kibanaSavedObjectTypes } from './index';
+import { getInstallation, kibanaSavedObjectTypes } from '.';
 
 export async function removeInstallation(options: {
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/update.ts b/x-pack/plugins/fleet/server/services/epm/packages/update.ts
index 84c756983fa07..4ab47954f51ca 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/update.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/update.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import { PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts b/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts
index 1eeea399ff8a4..62ea278734795 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/index.test.ts
@@ -8,7 +8,7 @@
 import type { AssetParts } from '../../../types';
 import { getBufferExtractor, getPathParts, untarBuffer, unzipBuffer } from '../archive';
 
-import { splitPkgKey } from './index';
+import { splitPkgKey } from '.';
 
 const testPaths = [
   {
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts b/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts
index ec0a8458ee5f7..8b1529de93b3c 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/proxy.ts
@@ -12,7 +12,7 @@ import type {
   HttpsProxyAgent as IHttpsProxyAgent,
 } from 'https-proxy-agent';
 
-import { appContextService } from '../../index';
+import { appContextService } from '../..';
 
 export interface RegistryProxySettings {
   proxyUrl: string;
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
index bcaf5ac1f0634..407a61ad7a912 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { appContextService } from '../../';
+import { appContextService } from '../..';
 
 // from https://github.com/elastic/package-registry#docker (maybe from OpenAPI one day)
 // the unused variables cause a TS warning about unused values
diff --git a/x-pack/plugins/fleet/server/services/es_index_pattern.ts b/x-pack/plugins/fleet/server/services/es_index_pattern.ts
index 993a8bebe42c7..acf537303a97e 100644
--- a/x-pack/plugins/fleet/server/services/es_index_pattern.ts
+++ b/x-pack/plugins/fleet/server/services/es_index_pattern.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
-import type { ESIndexPatternService } from '../../server';
+import type { ESIndexPatternService } from '..';
 
 import { getInstallation } from './epm/packages';
 
diff --git a/x-pack/plugins/fleet/server/services/fleet_server/index.ts b/x-pack/plugins/fleet/server/services/fleet_server/index.ts
index 43403bf3c9460..6ba6dfcc24910 100644
--- a/x-pack/plugins/fleet/server/services/fleet_server/index.ts
+++ b/x-pack/plugins/fleet/server/services/fleet_server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 import { FLEET_SERVER_SERVERS_INDEX } from '../../constants';
 
diff --git a/x-pack/plugins/fleet/server/services/index.ts b/x-pack/plugins/fleet/server/services/index.ts
index 55769928548e3..226d40cfd640a 100644
--- a/x-pack/plugins/fleet/server/services/index.ts
+++ b/x-pack/plugins/fleet/server/services/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { agentPolicyService } from './agent_policy';
 import * as settingsService from './settings';
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
index 6cbb21a37a196..5a1d86574f07b 100644
--- a/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
+++ b/x-pack/plugins/fleet/server/services/managed_package_policies.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { upgradeManagedPackagePolicies } from './managed_package_policies';
 import { packagePolicyService } from './package_policy';
diff --git a/x-pack/plugins/fleet/server/services/managed_package_policies.ts b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
index e17ca5ebcd1de..706fa89a9e6fb 100644
--- a/x-pack/plugins/fleet/server/services/managed_package_policies.ts
+++ b/x-pack/plugins/fleet/server/services/managed_package_policies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import semverLt from 'semver/functions/lt';
 
 import type { UpgradePackagePolicyDryRunResponseItem } from '../../common';
diff --git a/x-pack/plugins/fleet/server/services/output.test.ts b/x-pack/plugins/fleet/server/services/output.test.ts
index 0a7d5393a63e1..893c77578f0e5 100644
--- a/x-pack/plugins/fleet/server/services/output.test.ts
+++ b/x-pack/plugins/fleet/server/services/output.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+
 import type { OutputSOAttributes } from '../types';
 
 import { outputService, outputIdToUuid } from './output';
diff --git a/x-pack/plugins/fleet/server/services/output.ts b/x-pack/plugins/fleet/server/services/output.ts
index 4aecbd6e03349..8d7aeecb97a4c 100644
--- a/x-pack/plugins/fleet/server/services/output.ts
+++ b/x-pack/plugins/fleet/server/services/output.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest, SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import type { KibanaRequest, SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid/v5';
 import { omit } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts
index bd4223fbe7019..0a9030fa746e4 100644
--- a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { packagePolicyService } from '../package_policy';
 
diff --git a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts
index b7ebec3415453..63631fb785754 100644
--- a/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies/package_policy_name_helper.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { SO_SEARCH_LIMIT, getMaxPackageName } from '../../../common';
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../constants';
diff --git a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
index fbf0dbe22c51a..120520db780a5 100644
--- a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
@@ -6,9 +6,10 @@
  */
 
 jest.mock('./epm/packages');
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 import type { PackagePolicy, RegistryDataStream } from '../types';
 
 import { getPackageInfo } from './epm/packages';
diff --git a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
index d361c583c8f6c..968282e2e587a 100644
--- a/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.ts
@@ -4,13 +4,15 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { FullAgentPolicyOutputPermissions, RegistryDataStreamPrivileges } from '../../common';
 import { PACKAGE_POLICY_DEFAULT_INDEX_PRIVILEGES } from '../constants';
-import { getPackageInfo } from '../../server/services/epm/packages';
+
 import type { PackagePolicy } from '../types';
 
+import { getPackageInfo } from './epm/packages';
+
 export const DEFAULT_CLUSTER_PERMISSIONS = ['monitor'];
 
 export async function storedPackagePoliciesToAgentPermissions(
diff --git a/x-pack/plugins/fleet/server/services/package_policy.test.ts b/x-pack/plugins/fleet/server/services/package_policy.test.ts
index 2fde004048a36..53218e7cda8f9 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.test.ts
@@ -9,14 +9,14 @@ import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   httpServerMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { produce } from 'immer';
 import type {
   SavedObjectsClient,
   SavedObjectsClientContract,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
-import type { KibanaRequest } from 'kibana/server';
+} from '@kbn/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type {
   PackageInfo,
@@ -26,6 +26,7 @@ import type {
   RegistryDataStream,
   PackagePolicyInputStream,
   PackagePolicy,
+  PostPackagePolicyPostCreateCallback,
 } from '../types';
 import { createPackagePolicyMock } from '../../common/mocks';
 
@@ -1356,6 +1357,100 @@ describe('Package policy service', () => {
     });
   });
 
+  describe('runPostPackagePolicyPostCreateCallback', () => {
+    let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+    let request: KibanaRequest;
+    const packagePolicy = {
+      id: '93ac25fe-0467-4fcc-a3c5-57a26a8496e2',
+      version: 'WzYyMzcsMV0=',
+      name: 'my-cis_kubernetes_benchmark',
+      namespace: 'default',
+      description: '',
+      package: {
+        name: 'cis_kubernetes_benchmark',
+        title: 'CIS Kubernetes Benchmark',
+        version: '0.0.3',
+      },
+      enabled: true,
+      policy_id: '1e6d0690-b995-11ec-a355-d35391e25881',
+      output_id: '',
+      inputs: [
+        {
+          type: 'cloudbeat',
+          policy_template: 'findings',
+          enabled: true,
+          streams: [
+            {
+              enabled: true,
+              data_stream: {
+                type: 'logs',
+                dataset: 'cis_kubernetes_benchmark.findings',
+              },
+              id: 'cloudbeat-cis_kubernetes_benchmark.findings-66b402b3-f24a-4018-b3d0-b88582a836ab',
+              compiled_stream: {
+                processors: [
+                  {
+                    add_cluster_id: null,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+      vars: {
+        dataYaml: {
+          type: 'yaml',
+        },
+      },
+      elasticsearch: undefined,
+      revision: 1,
+      created_at: '2022-04-11T12:44:43.385Z',
+      created_by: 'elastic',
+      updated_at: '2022-04-11T12:44:43.385Z',
+      updated_by: 'elastic',
+    };
+    const callbackCallingOrder: string[] = [];
+
+    beforeEach(() => {
+      context = xpackMocks.createRequestHandlerContext();
+      request = httpServerMock.createKibanaRequest();
+      appContextService.start(createAppContextStartContractMock());
+    });
+
+    afterEach(() => {
+      appContextService.stop();
+      jest.clearAllMocks();
+      callbackCallingOrder.length = 0;
+    });
+
+    it('should execute PostPackagePolicyPostCreateCallback external callbacks', async () => {
+      const callbackA: PostPackagePolicyPostCreateCallback = jest.fn(async (ds) => {
+        callbackCallingOrder.push('a');
+        return ds;
+      });
+
+      const callbackB: PostPackagePolicyPostCreateCallback = jest.fn(async (ds) => {
+        callbackCallingOrder.push('b');
+        return ds;
+      });
+
+      appContextService.addExternalCallback('packagePolicyPostCreate', callbackA);
+      appContextService.addExternalCallback('packagePolicyPostCreate', callbackB);
+
+      await packagePolicyService.runExternalCallbacks(
+        'packagePolicyPostCreate',
+        packagePolicy,
+        context,
+        request
+      );
+
+      expect(callbackA).toHaveBeenCalledWith(packagePolicy, context, request);
+      expect(callbackB).toHaveBeenCalledWith(packagePolicy, context, request);
+      expect(callbackCallingOrder).toEqual(['a', 'b']);
+    });
+  });
+
   describe('preconfigurePackageInputs', () => {
     describe('when variable is already defined', () => {
       it('override original variable value', () => {
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index a6c67ff529a85..04abb2f54228e 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -9,18 +9,19 @@ import { omit, partition, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import semverLt from 'semver/functions/lt';
 import { getFlattenedObject } from '@kbn/std';
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import type {
   ElasticsearchClient,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import uuid from 'uuid';
 import { safeLoad } from 'js-yaml';
 
-import { DEFAULT_SPACE_ID } from '../../../spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+
+import type { AuthenticatedUser } from '@kbn/security-plugin/server';
 
-import type { AuthenticatedUser } from '../../../security/server';
 import {
   packageToPackagePolicy,
   packageToPackagePolicyInputs,
@@ -53,13 +54,15 @@ import {
   PackagePolicyIneligibleForUpgradeError,
   PackagePolicyValidationError,
 } from '../errors';
-import { NewPackagePolicySchema, UpdatePackagePolicySchema } from '../types';
+import { NewPackagePolicySchema, PackagePolicySchema, UpdatePackagePolicySchema } from '../types';
 import type {
   NewPackagePolicy,
   UpdatePackagePolicy,
   PackagePolicy,
   PackagePolicySOAttributes,
   DryRunPackagePolicy,
+  PostPackagePolicyCreateCallback,
+  PostPackagePolicyPostCreateCallback,
 } from '../types';
 import type { ExternalCallback } from '..';
 
@@ -869,16 +872,24 @@ class PackagePolicyService implements PackagePolicyServiceInterface {
     externalCallbackType: A,
     packagePolicy: A extends 'postPackagePolicyDelete'
       ? DeletePackagePoliciesResponse
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
       : NewPackagePolicy,
     context: RequestHandlerContext,
     request: KibanaRequest
-  ): Promise<A extends 'postPackagePolicyDelete' ? void : NewPackagePolicy>;
+  ): Promise<
+    A extends 'postPackagePolicyDelete'
+      ? void
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
+      : NewPackagePolicy
+  >;
   public async runExternalCallbacks(
     externalCallbackType: ExternalCallback[0],
-    packagePolicy: NewPackagePolicy | DeletePackagePoliciesResponse,
+    packagePolicy: PackagePolicy | NewPackagePolicy | DeletePackagePoliciesResponse,
     context: RequestHandlerContext,
     request: KibanaRequest
-  ): Promise<NewPackagePolicy | void> {
+  ): Promise<PackagePolicy | NewPackagePolicy | void> {
     if (externalCallbackType === 'postPackagePolicyDelete') {
       return await this.runDeleteExternalCallbacks(packagePolicy as DeletePackagePoliciesResponse);
     } else {
@@ -888,7 +899,21 @@ class PackagePolicyService implements PackagePolicyServiceInterface {
         if (externalCallbacks && externalCallbacks.size > 0) {
           let updatedNewData = newData;
           for (const callback of externalCallbacks) {
-            const result = await callback(updatedNewData, context, request);
+            let result;
+            if (externalCallbackType === 'packagePolicyPostCreate') {
+              result = await (callback as PostPackagePolicyPostCreateCallback)(
+                updatedNewData as PackagePolicy,
+                context,
+                request
+              );
+              updatedNewData = PackagePolicySchema.validate(result);
+            } else {
+              result = await (callback as PostPackagePolicyCreateCallback)(
+                updatedNewData as NewPackagePolicy,
+                context,
+                request
+              );
+            }
             if (externalCallbackType === 'packagePolicyCreate') {
               updatedNewData = NewPackagePolicySchema.validate(result);
             } else if (externalCallbackType === 'packagePolicyUpdate') {
@@ -1276,10 +1301,18 @@ export interface PackagePolicyServiceInterface {
     externalCallbackType: A,
     packagePolicy: A extends 'postPackagePolicyDelete'
       ? DeletePackagePoliciesResponse
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
       : NewPackagePolicy,
     context: RequestHandlerContext,
     request: KibanaRequest
-  ): Promise<A extends 'postPackagePolicyDelete' ? void : NewPackagePolicy>;
+  ): Promise<
+    A extends 'postPackagePolicyDelete'
+      ? void
+      : A extends 'packagePolicyPostCreate'
+      ? PackagePolicy
+      : NewPackagePolicy
+  >;
 
   runDeleteExternalCallbacks(deletedPackagePolicies: DeletePackagePoliciesResponse): Promise<void>;
 
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.test.ts b/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
index 862b589896793..1664215613cb3 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
@@ -7,10 +7,10 @@
 
 import uuid from 'uuid';
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
-import { DEFAULT_SPACE_ID } from '../../../spaces/common/constants';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import type {
   InstallResult,
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
index c11925fa8f2f3..b425cc4ca4035 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { groupBy, omit, pick, isEqual } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts
index b461bc5463d68..122a01153791c 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { PreconfiguredOutput } from '../../../common/types';
 import type { Output } from '../../types';
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts
index 83ceb6237b67e..53e2b110f7ed8 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration/outputs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { isEqual } from 'lodash';
 import { safeDump } from 'js-yaml';
 
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts b/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts
index 513d061d3cf0d..30484f93c0157 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration/reset_agent_policies.ts
@@ -6,7 +6,7 @@
  */
 
 import pMap from 'p-map';
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
 
 import { appContextService } from '../app_context';
 import { setupFleet } from '../setup';
diff --git a/x-pack/plugins/fleet/server/services/saved_object.ts b/x-pack/plugins/fleet/server/services/saved_object.ts
index 244de5f88ba1b..6a45061d89334 100644
--- a/x-pack/plugins/fleet/server/services/saved_object.ts
+++ b/x-pack/plugins/fleet/server/services/saved_object.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract, SavedObjectsFindResponse } from 'src/core/server';
+import type { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
 
 import { SO_SEARCH_LIMIT } from '../constants';
 import type { ListWithKuery } from '../types';
diff --git a/x-pack/plugins/fleet/server/services/settings.test.ts b/x-pack/plugins/fleet/server/services/settings.test.ts
index 75712c471f20c..df4f103ef6b50 100644
--- a/x-pack/plugins/fleet/server/services/settings.test.ts
+++ b/x-pack/plugins/fleet/server/services/settings.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { appContextService } from './app_context';
 import { getCloudFleetServersHosts, settingsSetup } from './settings';
diff --git a/x-pack/plugins/fleet/server/services/settings.ts b/x-pack/plugins/fleet/server/services/settings.ts
index 0e7b7c5e7a093..d0c09e1891215 100644
--- a/x-pack/plugins/fleet/server/services/settings.ts
+++ b/x-pack/plugins/fleet/server/services/settings.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import {
   decodeCloudId,
diff --git a/x-pack/plugins/fleet/server/services/setup.test.ts b/x-pack/plugins/fleet/server/services/setup.test.ts
index cd760adf7c8cb..c9dc4227ae48d 100644
--- a/x-pack/plugins/fleet/server/services/setup.test.ts
+++ b/x-pack/plugins/fleet/server/services/setup.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
-import type { ElasticsearchClientMock } from 'src/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import type { ElasticsearchClientMock } from '@kbn/core/server/mocks';
 
 import { createAppContextStartContractMock, xpackMocks } from '../mocks';
 
@@ -18,7 +18,7 @@ import { upgradeManagedPackagePolicies } from './managed_package_policies';
 import { setupFleet } from './setup';
 
 jest.mock('./preconfiguration');
-jest.mock('./preconfiguration/index');
+jest.mock('./preconfiguration/outputs');
 jest.mock('./settings');
 jest.mock('./output');
 jest.mock('./epm/packages');
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
index 6e3aed538fb07..50819d7a2640d 100644
--- a/x-pack/plugins/fleet/server/services/setup.ts
+++ b/x-pack/plugins/fleet/server/services/setup.ts
@@ -7,7 +7,9 @@
 
 import { compact } from 'lodash';
 
-import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 import { AUTO_UPDATE_PACKAGES } from '../../common';
 import type {
@@ -18,12 +20,11 @@ import type {
 } from '../../common';
 
 import { SO_SEARCH_LIMIT } from '../constants';
-import { DEFAULT_SPACE_ID } from '../../../spaces/common/constants';
 
 import { appContextService } from './app_context';
 import { agentPolicyService } from './agent_policy';
 import { ensurePreconfiguredPackagesAndPolicies } from './preconfiguration';
-import { ensurePreconfiguredOutputs } from './preconfiguration/index';
+import { ensurePreconfiguredOutputs } from './preconfiguration/outputs';
 import { outputService } from './output';
 
 import { generateEnrollmentAPIKey, hasEnrollementAPIKeysForPolicy } from './api_keys';
diff --git a/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts b/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts
index c8a64a7172b39..41efa8e5bc811 100644
--- a/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts
+++ b/x-pack/plugins/fleet/server/services/upgrade_sender.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import type { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { TelemetryEventsSender } from '../telemetry/sender';
 import { createMockTelemetryEventsSender } from '../telemetry/__mocks__';
diff --git a/x-pack/plugins/fleet/server/services/upgrade_sender.ts b/x-pack/plugins/fleet/server/services/upgrade_sender.ts
index 9069ab68b55a3..c125bf145d0f3 100644
--- a/x-pack/plugins/fleet/server/services/upgrade_sender.ts
+++ b/x-pack/plugins/fleet/server/services/upgrade_sender.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 import type { TelemetryEventsSender } from '../telemetry/sender';
 import type { InstallType } from '../types';
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.test.ts b/x-pack/plugins/fleet/server/telemetry/sender.test.ts
index 1ed77d43b06ad..cc9949ea5f9b8 100644
--- a/x-pack/plugins/fleet/server/telemetry/sender.test.ts
+++ b/x-pack/plugins/fleet/server/telemetry/sender.test.ts
@@ -13,7 +13,7 @@ import axios from 'axios';
 
 import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { UpdateEventType } from '../services/upgrade_sender';
 
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.ts b/x-pack/plugins/fleet/server/telemetry/sender.ts
index 47f8a90f6cd68..a2f9bcafbcbb8 100644
--- a/x-pack/plugins/fleet/server/telemetry/sender.ts
+++ b/x-pack/plugins/fleet/server/telemetry/sender.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreStart, ElasticsearchClient, Logger } from 'src/core/server';
-import type { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
+import type { CoreStart, ElasticsearchClient, Logger } from '@kbn/core/server';
+import type { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 
 import { cloneDeep } from 'lodash';
 
diff --git a/x-pack/plugins/fleet/server/types/extensions.ts b/x-pack/plugins/fleet/server/types/extensions.ts
index a7f4a422cc2ae..7cb14f80e78fc 100644
--- a/x-pack/plugins/fleet/server/types/extensions.ts
+++ b/x-pack/plugins/fleet/server/types/extensions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest, RequestHandlerContext } from 'kibana/server';
+import type { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 
 import type { DeepReadonly } from 'utility-types';
 
@@ -13,6 +13,7 @@ import type {
   DeletePackagePoliciesResponse,
   NewPackagePolicy,
   UpdatePackagePolicy,
+  PackagePolicy,
 } from '../../common';
 
 export type PostPackagePolicyDeleteCallback = (
@@ -25,6 +26,12 @@ export type PostPackagePolicyCreateCallback = (
   request: KibanaRequest
 ) => Promise<NewPackagePolicy>;
 
+export type PostPackagePolicyPostCreateCallback = (
+  packagePolicy: PackagePolicy,
+  context: RequestHandlerContext,
+  request: KibanaRequest
+) => Promise<PackagePolicy>;
+
 export type PutPackagePolicyUpdateCallback = (
   updatePackagePolicy: UpdatePackagePolicy,
   context: RequestHandlerContext,
@@ -32,6 +39,10 @@ export type PutPackagePolicyUpdateCallback = (
 ) => Promise<UpdatePackagePolicy>;
 
 export type ExternalCallbackCreate = ['packagePolicyCreate', PostPackagePolicyCreateCallback];
+export type ExternalCallbackPostCreate = [
+  'packagePolicyPostCreate',
+  PostPackagePolicyPostCreateCallback
+];
 export type ExternalCallbackDelete = ['postPackagePolicyDelete', PostPackagePolicyDeleteCallback];
 export type ExternalCallbackUpdate = ['packagePolicyUpdate', PutPackagePolicyUpdateCallback];
 
@@ -40,6 +51,7 @@ export type ExternalCallbackUpdate = ['packagePolicyUpdate', PutPackagePolicyUpd
  */
 export type ExternalCallback =
   | ExternalCallbackCreate
+  | ExternalCallbackPostCreate
   | ExternalCallbackDelete
   | ExternalCallbackUpdate;
 
diff --git a/x-pack/plugins/fleet/server/types/models/package_policy.ts b/x-pack/plugins/fleet/server/types/models/package_policy.ts
index 1d4dc1c1b3b65..c4f8ab2c1437e 100644
--- a/x-pack/plugins/fleet/server/types/models/package_policy.ts
+++ b/x-pack/plugins/fleet/server/types/models/package_policy.ts
@@ -55,6 +55,7 @@ const PackagePolicyStreamsSchema = {
       })
     )
   ),
+  compiled_stream: schema.maybe(schema.any()),
 };
 
 const PackagePolicyInputsSchema = {
@@ -150,4 +151,24 @@ export const PackagePolicySchema = schema.object({
   ...PackagePolicyBaseSchema,
   id: schema.string(),
   version: schema.maybe(schema.string()),
+  revision: schema.number(),
+  updated_at: schema.string(),
+  updated_by: schema.string(),
+  created_at: schema.string(),
+  created_by: schema.string(),
+  elasticsearch: schema.maybe(
+    schema.object({
+      privileges: schema.maybe(
+        schema.object({
+          cluster: schema.maybe(schema.arrayOf(schema.string())),
+        })
+      ),
+    })
+  ),
+  inputs: schema.arrayOf(
+    schema.object({
+      ...PackagePolicyInputsSchema,
+      compiled_input: schema.maybe(schema.any()),
+    })
+  ),
 });
diff --git a/x-pack/plugins/fleet/server/types/request_context.ts b/x-pack/plugins/fleet/server/types/request_context.ts
index 0f570f1877627..0621319ba011c 100644
--- a/x-pack/plugins/fleet/server/types/request_context.ts
+++ b/x-pack/plugins/fleet/server/types/request_context.ts
@@ -12,7 +12,8 @@ import type {
   RouteMethod,
   SavedObjectsClientContract,
   IRouter,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
+
 import type { FleetAuthz } from '../../common/authz';
 import type { AgentClient } from '../services';
 
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts b/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts
index 257cc90d453c8..1f793445bf630 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/agent_policy.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 
 import { NewAgentPolicySchema } from '../models';
 
-import { ListWithKuerySchema } from './index';
+import { ListWithKuerySchema } from '.';
 
 export const GetAgentPoliciesRequestSchema = {
   query: ListWithKuerySchema.extends({
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts b/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts
index 010cd10492bf0..7f54b9c742d08 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/package_policy.ts
@@ -12,7 +12,7 @@ import {
   UpdatePackagePolicyRequestBodySchema,
 } from '../models';
 
-import { ListWithKuerySchema } from './index';
+import { ListWithKuerySchema } from '.';
 
 export const GetPackagePoliciesRequestSchema = {
   query: ListWithKuerySchema,
diff --git a/x-pack/plugins/global_search/common/license_checker.test.ts b/x-pack/plugins/global_search/common/license_checker.test.ts
index e3e7364481236..45c086a0727d5 100644
--- a/x-pack/plugins/global_search/common/license_checker.test.ts
+++ b/x-pack/plugins/global_search/common/license_checker.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Observable, of, BehaviorSubject } from 'rxjs';
-import { licenseMock } from '../../licensing/common/licensing.mock';
-import { ILicense, LicenseCheck } from '../../licensing/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { ILicense, LicenseCheck } from '@kbn/licensing-plugin/common/types';
 import { LicenseChecker } from './license_checker';
 
 describe('LicenseChecker', () => {
diff --git a/x-pack/plugins/global_search/common/license_checker.ts b/x-pack/plugins/global_search/common/license_checker.ts
index 3bfa7e4a218ac..2a4341d988c90 100644
--- a/x-pack/plugins/global_search/common/license_checker.ts
+++ b/x-pack/plugins/global_search/common/license_checker.ts
@@ -7,7 +7,7 @@
 
 import { Observable, Subscription } from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { ILicense } from '../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 export type LicenseState = { valid: false; message: string } | { valid: true };
 
diff --git a/x-pack/plugins/global_search/public/index.ts b/x-pack/plugins/global_search/public/index.ts
index 55a16407eb603..588b290a61a58 100644
--- a/x-pack/plugins/global_search/public/index.ts
+++ b/x-pack/plugins/global_search/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   GlobalSearchPlugin,
   GlobalSearchPluginSetupDeps,
diff --git a/x-pack/plugins/global_search/public/plugin.ts b/x-pack/plugins/global_search/public/plugin.ts
index 00f320d23b606..4678b043e3f92 100644
--- a/x-pack/plugins/global_search/public/plugin.ts
+++ b/x-pack/plugins/global_search/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-import { LicensingPluginStart } from '../../licensing/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { LicenseChecker, ILicenseChecker } from '../common/license_checker';
 import { GlobalSearchPluginSetup, GlobalSearchPluginStart } from './types';
 import { GlobalSearchClientConfigType } from './config';
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts b/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
index 2411ca8a491cd..6d3c12a2de66f 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_results.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import { lastValueFrom } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { GlobalSearchResult } from '../../common/types';
 import { fetchServerResults } from './fetch_server_results';
 
@@ -55,11 +56,9 @@ describe('fetchServerResults', () => {
 
     http.post.mockResolvedValue({ results: [resultA, resultB] });
 
-    const results = await fetchServerResults(
-      http,
-      { term: 'some term' },
-      { preference: 'pref' }
-    ).toPromise();
+    const results = await lastValueFrom(
+      fetchServerResults(http, { term: 'some term' }, { preference: 'pref' })
+    );
 
     expect(http.post).toHaveBeenCalledTimes(1);
     expect(results).toHaveLength(2);
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_results.ts b/x-pack/plugins/global_search/public/services/fetch_server_results.ts
index 4f4069ac90ad2..26d174621fabc 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_results.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_results.ts
@@ -7,7 +7,7 @@
 
 import { Observable, from, EMPTY } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { GlobalSearchResult, GlobalSearchProviderFindParams } from '../../common/types';
 import { GlobalSearchFindOptions } from './types';
 
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts
index a3b791eb29d17..7f87b21f46bd3 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { fetchServerSearchableTypes } from './fetch_server_searchable_types';
 
 describe('fetchServerSearchableTypes', () => {
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts
index b3b4b60f9ede7..62fad1542159b 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_searchable_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 interface ServerSearchableTypesResponse {
   types: string[];
diff --git a/x-pack/plugins/global_search/public/services/search_service.test.ts b/x-pack/plugins/global_search/public/services/search_service.test.ts
index b0e6a72290438..bf12f7a6d77da 100644
--- a/x-pack/plugins/global_search/public/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.test.ts
@@ -11,11 +11,10 @@ import {
   fetchServerSearchableTypesMock,
 } from './search_service.test.mocks';
 
-import { Observable, of } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { duration } from 'moment';
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { licenseCheckerMock } from '../../common/license_checker.mock';
 import { GlobalSearchProviderResult, GlobalSearchResult } from '../../common/types';
 import { GlobalSearchFindError } from '../../common/errors';
@@ -472,7 +471,7 @@ describe('SearchService', () => {
         registerResultProvider(provider);
 
         const { find } = service.start(startDeps());
-        const batch = await find({ term: 'foobar' }, {}).pipe(take(1)).toPromise();
+        const batch = await firstValueFrom(find({ term: 'foobar' }, {}));
 
         expect(batch.results).toHaveLength(2);
         expect(batch.results[0]).toEqual({
diff --git a/x-pack/plugins/global_search/public/services/search_service.ts b/x-pack/plugins/global_search/public/services/search_service.ts
index 85f4d4143a609..975dc4a253f4d 100644
--- a/x-pack/plugins/global_search/public/services/search_service.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.ts
@@ -10,7 +10,7 @@ import { map, takeUntil, catchError } from 'rxjs/operators';
 import { uniq } from 'lodash';
 import { duration } from 'moment';
 import { i18n } from '@kbn/i18n';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   GlobalSearchFindParams,
   GlobalSearchProviderResult,
diff --git a/x-pack/plugins/global_search/server/config.ts b/x-pack/plugins/global_search/server/config.ts
index c71637b8b49ed..798c59408dbe4 100644
--- a/x-pack/plugins/global_search/server/config.ts
+++ b/x-pack/plugins/global_search/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   search_timeout: schema.duration({ defaultValue: '30s' }),
diff --git a/x-pack/plugins/global_search/server/index.ts b/x-pack/plugins/global_search/server/index.ts
index d98e10f404306..107486c857f94 100644
--- a/x-pack/plugins/global_search/server/index.ts
+++ b/x-pack/plugins/global_search/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import {
   GlobalSearchPlugin,
   GlobalSearchPluginSetupDeps,
diff --git a/x-pack/plugins/global_search/server/mocks.ts b/x-pack/plugins/global_search/server/mocks.ts
index 2dfcbad0b964f..b27c9f7a9e6b8 100644
--- a/x-pack/plugins/global_search/server/mocks.ts
+++ b/x-pack/plugins/global_search/server/mocks.ts
@@ -6,6 +6,7 @@
  */
 
 import { of } from 'rxjs';
+import { coreMock } from '@kbn/core/server/mocks';
 import {
   GlobalSearchPluginSetup,
   GlobalSearchPluginStart,
@@ -14,7 +15,6 @@ import {
 } from './types';
 import { searchServiceMock } from './services/search_service.mock';
 import { contextMock } from './services/context.mock';
-import { coreMock } from '../../../../src/core/server/mocks';
 
 const createSetupMock = (): jest.Mocked<GlobalSearchPluginSetup> => {
   const searchMock = searchServiceMock.createSetupContract();
diff --git a/x-pack/plugins/global_search/server/plugin.test.ts b/x-pack/plugins/global_search/server/plugin.test.ts
index 9323f38240d8e..457e83100e4d9 100644
--- a/x-pack/plugins/global_search/server/plugin.test.ts
+++ b/x-pack/plugins/global_search/server/plugin.test.ts
@@ -7,7 +7,7 @@
 
 import { registerRoutesMock } from './plugin.test.mocks';
 
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { GlobalSearchPlugin } from './plugin';
 
 describe('GlobalSearchPlugin', () => {
diff --git a/x-pack/plugins/global_search/server/plugin.ts b/x-pack/plugins/global_search/server/plugin.ts
index 688691d8941e2..cee90ef66beee 100644
--- a/x-pack/plugins/global_search/server/plugin.ts
+++ b/x-pack/plugins/global_search/server/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server';
-import { LicensingPluginStart } from '../../licensing/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { LicenseChecker, ILicenseChecker } from '../common/license_checker';
 import { SearchService, SearchServiceStart } from './services';
 import { registerRoutes } from './routes';
diff --git a/x-pack/plugins/global_search/server/routes/index.test.ts b/x-pack/plugins/global_search/server/routes/index.test.ts
index fccfa9344b53d..da0da89052e32 100644
--- a/x-pack/plugins/global_search/server/routes/index.test.ts
+++ b/x-pack/plugins/global_search/server/routes/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../src/core/server/mocks';
-import { registerRoutes } from './index';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { registerRoutes } from '.';
 
 describe('registerRoutes', () => {
   it('foo', () => {
diff --git a/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts b/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts
index 1fe6e73969e3b..56cd4edaef253 100644
--- a/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts
+++ b/x-pack/plugins/global_search/server/routes/integration_tests/find.test.ts
@@ -7,7 +7,7 @@
 
 import { of, throwError } from 'rxjs';
 import supertest from 'supertest';
-import { setupServer } from '../../../../../../src/core/server/test_utils';
+import { setupServer } from '@kbn/core/server/test_utils';
 import { GlobalSearchResult, GlobalSearchBatchedResults } from '../../../common/types';
 import { GlobalSearchFindError } from '../../../common/errors';
 import { globalSearchPluginMock } from '../../mocks';
diff --git a/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts b/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts
index f6ddf0c1ac1df..a72cb9975db19 100644
--- a/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts
+++ b/x-pack/plugins/global_search/server/routes/integration_tests/get_searchable_types.test.ts
@@ -6,7 +6,7 @@
  */
 
 import supertest from 'supertest';
-import { setupServer } from '../../../../../../src/core/server/test_utils';
+import { setupServer } from '@kbn/core/server/test_utils';
 import { globalSearchPluginMock } from '../../mocks';
 import { registerInternalSearchableTypesRoute } from '../get_searchable_types';
 
diff --git a/x-pack/plugins/global_search/server/services/context.mock.ts b/x-pack/plugins/global_search/server/services/context.mock.ts
index c7f43ad5b8ff0..7e56a2c29aa29 100644
--- a/x-pack/plugins/global_search/server/services/context.mock.ts
+++ b/x-pack/plugins/global_search/server/services/context.mock.ts
@@ -6,13 +6,13 @@
  */
 
 import { of } from 'rxjs';
-import { Capabilities } from 'src/core/server';
+import { Capabilities } from '@kbn/core/server';
 import {
   savedObjectsTypeRegistryMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
   capabilitiesServiceMock,
-} from '../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 const createContextMock = (capabilities: Partial<Capabilities> = {}) => {
   return {
diff --git a/x-pack/plugins/global_search/server/services/context.test.ts b/x-pack/plugins/global_search/server/services/context.test.ts
index 580083efbb303..f90c0bc0f6c84 100644
--- a/x-pack/plugins/global_search/server/services/context.test.ts
+++ b/x-pack/plugins/global_search/server/services/context.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock, coreMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { getContextFactory } from './context';
 
 describe('getContextFactory', () => {
diff --git a/x-pack/plugins/global_search/server/services/context.ts b/x-pack/plugins/global_search/server/services/context.ts
index b0669f35b99b9..02d86c909ab72 100644
--- a/x-pack/plugins/global_search/server/services/context.ts
+++ b/x-pack/plugins/global_search/server/services/context.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { CoreStart, KibanaRequest } from 'src/core/server';
+import { CoreStart, KibanaRequest } from '@kbn/core/server';
 import { GlobalSearchProviderContext } from '../types';
 
 export type GlobalSearchContextFactory = (request: KibanaRequest) => GlobalSearchProviderContext;
diff --git a/x-pack/plugins/global_search/server/services/search_service.test.ts b/x-pack/plugins/global_search/server/services/search_service.test.ts
index 45824fde26afe..2ac13dc117dc0 100644
--- a/x-pack/plugins/global_search/server/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.test.ts
@@ -5,11 +5,10 @@
  * 2.0.
  */
 
-import { Observable, of } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { duration } from 'moment';
-import { httpServiceMock, httpServerMock, coreMock } from '../../../../../src/core/server/mocks';
+import { httpServiceMock, httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import { licenseCheckerMock } from '../../common/license_checker.mock';
 import { GlobalSearchProviderResult } from '../../common/types';
 import { GlobalSearchFindError } from '../../common/errors';
@@ -324,7 +323,7 @@ describe('SearchService', () => {
         registerResultProvider(provider);
 
         const { find } = service.start({ core: coreStart, licenseChecker });
-        const batch = await find({ term: 'foobar' }, {}, request).pipe(take(1)).toPromise();
+        const batch = await firstValueFrom(find({ term: 'foobar' }, {}, request));
 
         expect(batch.results).toHaveLength(2);
         expect(batch.results[0]).toEqual({
diff --git a/x-pack/plugins/global_search/server/services/search_service.ts b/x-pack/plugins/global_search/server/services/search_service.ts
index 22bac036544ab..8aedd2426c136 100644
--- a/x-pack/plugins/global_search/server/services/search_service.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.ts
@@ -9,7 +9,7 @@ import { Observable, timer, merge, throwError, EMPTY } from 'rxjs';
 import { map, takeUntil, catchError } from 'rxjs/operators';
 import { uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest, CoreStart, IBasePath } from 'src/core/server';
+import { KibanaRequest, CoreStart, IBasePath } from '@kbn/core/server';
 import {
   GlobalSearchProviderResult,
   GlobalSearchBatchedResults,
diff --git a/x-pack/plugins/global_search/server/services/utils.test.ts b/x-pack/plugins/global_search/server/services/utils.test.ts
index 8ff33761d57d4..20e484b378019 100644
--- a/x-pack/plugins/global_search/server/services/utils.test.ts
+++ b/x-pack/plugins/global_search/server/services/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 import { getRequestBasePath } from './utils';
 
 describe('getRequestBasePath', () => {
diff --git a/x-pack/plugins/global_search/server/services/utils.ts b/x-pack/plugins/global_search/server/services/utils.ts
index 08a3dc62981a3..a4d37110153fa 100644
--- a/x-pack/plugins/global_search/server/services/utils.ts
+++ b/x-pack/plugins/global_search/server/services/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IBasePath, KibanaRequest } from 'src/core/server';
+import type { IBasePath, KibanaRequest } from '@kbn/core/server';
 import type { IBasePath as BasePathAccessor } from '../../common/utils';
 
 export const getRequestBasePath = (
diff --git a/x-pack/plugins/global_search/server/types.ts b/x-pack/plugins/global_search/server/types.ts
index 363f837f4bd2e..5f20f4f181db3 100644
--- a/x-pack/plugins/global_search/server/types.ts
+++ b/x-pack/plugins/global_search/server/types.ts
@@ -13,7 +13,7 @@ import type {
   Capabilities,
   IRouter,
   RequestHandlerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   GlobalSearchBatchedResults,
   GlobalSearchProviderFindOptions,
diff --git a/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx b/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx
index 4cc75d207e287..d1a875e56c95f 100644
--- a/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/result_tag_list.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBadge } from '@elastic/eui';
-import type { Tag } from '../../../saved_objects_tagging/public';
+import type { Tag } from '@kbn/saved-objects-tagging-plugin/public';
 
 const MAX_TAGS_TO_SHOW = 3;
 
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
index df9096fa1d0fa..78f38087b9ad1 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { act, render, screen, fireEvent } from '@testing-library/react';
 import { of, BehaviorSubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { applicationServiceMock } from '../../../../../src/core/public/mocks';
-import { globalSearchPluginMock } from '../../../global_search/public/mocks';
-import { GlobalSearchBatchedResults, GlobalSearchResult } from '../../../global_search/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/public/mocks';
+import { GlobalSearchBatchedResults, GlobalSearchResult } from '@kbn/global-search-plugin/public';
 import { SearchBar } from './search_bar';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
index ab7bea265c626..cc90a6858823f 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -21,13 +21,13 @@ import {
 } from '@elastic/eui';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import type {
   GlobalSearchPluginStart,
   GlobalSearchResult,
   GlobalSearchFindParams,
-} from '../../../global_search/public';
-import type { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+} from '@kbn/global-search-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 import { parseSearchParams } from '../search_syntax';
 import { getSuggestions, SearchSuggestion } from '../suggestions';
 import { resultToOption, suggestionToOption } from '../lib';
diff --git a/x-pack/plugins/global_search_bar/public/index.ts b/x-pack/plugins/global_search_bar/public/index.ts
index fc696d8e7f337..f6676587f83a4 100644
--- a/x-pack/plugins/global_search_bar/public/index.ts
+++ b/x-pack/plugins/global_search_bar/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { GlobalSearchBarPlugin } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, {}, {}> = () => new GlobalSearchBarPlugin();
diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
index ab935522ab921..c1ae52b5a2167 100644
--- a/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
+++ b/x-pack/plugins/global_search_bar/public/lib/result_to_option.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { GlobalSearchResult } from '../../../global_search/common/types';
+import type { GlobalSearchResult } from '@kbn/global-search-plugin/common/types';
 import { resultToOption } from './result_to_option';
 
 const createSearchResult = (parts: Partial<GlobalSearchResult> = {}): GlobalSearchResult => ({
diff --git a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
index 85bf99f5e5a6d..f09b45c6e19a5 100644
--- a/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
+++ b/x-pack/plugins/global_search_bar/public/lib/result_to_option.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import type { EuiSelectableTemplateSitewideOption } from '@elastic/eui';
-import type { GlobalSearchResult } from '../../../global_search/common/types';
-import type { SavedObjectTaggingPluginStart, Tag } from '../../../saved_objects_tagging/public';
+import type { GlobalSearchResult } from '@kbn/global-search-plugin/common/types';
+import type { SavedObjectTaggingPluginStart, Tag } from '@kbn/saved-objects-tagging-plugin/public';
 import { ResultTagList } from '../components/result_tag_list';
 
 const cleanMeta = (str: string) => (str.charAt(0).toUpperCase() + str.slice(1)).replace(/-/g, ' ');
diff --git a/x-pack/plugins/global_search_bar/public/plugin.tsx b/x-pack/plugins/global_search_bar/public/plugin.tsx
index f2917e27bb556..dbafebbad157b 100644
--- a/x-pack/plugins/global_search_bar/public/plugin.tsx
+++ b/x-pack/plugins/global_search_bar/public/plugin.tsx
@@ -9,11 +9,11 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { UiCounterMetricType } from '@kbn/analytics';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
-import { CoreStart, Plugin } from 'src/core/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { GlobalSearchPluginStart } from '../../global_search/public';
-import { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { CoreStart, Plugin } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { GlobalSearchPluginStart } from '@kbn/global-search-plugin/public';
+import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 import { SearchBar } from './components/search_bar';
 
 export interface GlobalSearchBarPluginStartDeps {
diff --git a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts
index 75571d63d352d..b729ef9c8e23b 100644
--- a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts
+++ b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { taggingApiMock } from '../../../saved_objects_tagging/public/mocks';
-import { Tag } from '../../../../../src/plugins/saved_objects_tagging_oss/common';
+import { taggingApiMock } from '@kbn/saved-objects-tagging-plugin/public/mocks';
+import { Tag } from '@kbn/saved-objects-tagging-oss-plugin/common';
 import { getSuggestions } from './get_suggestions';
 
 const createTag = (parts: Partial<Tag> = {}): Tag => ({
diff --git a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts
index 6c1625ae18fe6..893e103a42347 100644
--- a/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts
+++ b/x-pack/plugins/global_search_bar/public/suggestions/get_suggestions.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ITagsCache } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 interface GetSuggestionOptions {
   searchTerm: string;
diff --git a/x-pack/plugins/global_search_providers/public/index.ts b/x-pack/plugins/global_search_providers/public/index.ts
index fdb0cabb6623e..dcbc55e308ff5 100644
--- a/x-pack/plugins/global_search_providers/public/index.ts
+++ b/x-pack/plugins/global_search_providers/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { GlobalSearchProvidersPlugin, GlobalSearchProvidersPluginSetupDeps } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> = () =>
diff --git a/x-pack/plugins/global_search_providers/public/plugin.test.ts b/x-pack/plugins/global_search_providers/public/plugin.test.ts
index d1e9256f9466a..b33f31287c439 100644
--- a/x-pack/plugins/global_search_providers/public/plugin.test.ts
+++ b/x-pack/plugins/global_search_providers/public/plugin.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../src/core/public/mocks';
-import { globalSearchPluginMock } from '../../global_search/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/public/mocks';
 import { GlobalSearchProvidersPlugin } from './plugin';
 
 describe('GlobalSearchProvidersPlugin', () => {
diff --git a/x-pack/plugins/global_search_providers/public/plugin.ts b/x-pack/plugins/global_search_providers/public/plugin.ts
index 89e8e9f57a3de..49440b921394a 100644
--- a/x-pack/plugins/global_search_providers/public/plugin.ts
+++ b/x-pack/plugins/global_search_providers/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/public';
-import { GlobalSearchPluginSetup } from '../../global_search/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
+import { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/public';
 import { createApplicationResultProvider } from './providers';
 
 export interface GlobalSearchProvidersPluginSetupDeps {
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.test.ts b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
index aa54f3a0e5ff2..353c7829dbc97 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.test.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
@@ -9,12 +9,12 @@ import { getAppResultsMock } from './application.test.mocks';
 
 import { EMPTY, of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { ApplicationStart, AppNavLinkStatus, AppStatus, PublicAppInfo } from 'src/core/public';
+import { ApplicationStart, AppNavLinkStatus, AppStatus, PublicAppInfo } from '@kbn/core/public';
 import {
   GlobalSearchProviderFindOptions,
   GlobalSearchProviderResult,
-} from '../../../global_search/public';
-import { applicationServiceMock } from 'src/core/public/mocks';
+} from '@kbn/global-search-plugin/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { createApplicationResultProvider } from './application';
 
 const getTestScheduler = () =>
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.ts b/x-pack/plugins/global_search_providers/public/providers/application.ts
index ba5dfbb603da0..dd4219d2b08bd 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.ts
@@ -7,8 +7,8 @@
 
 import { from, of } from 'rxjs';
 import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs/operators';
-import { ApplicationStart } from 'src/core/public';
-import { GlobalSearchResultProvider } from '../../../global_search/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/public';
 import { getAppResults } from './get_app_results';
 
 const applicationType = 'application';
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
index db64e2972e932..0b0bb0012102a 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
@@ -10,7 +10,7 @@ import {
   AppStatus,
   PublicAppInfo,
   DEFAULT_APP_CATEGORIES,
-} from 'src/core/public';
+} from '@kbn/core/public';
 import {
   AppLink,
   appToResult,
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
index ece173777f3e1..00c4a9959f8a2 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
@@ -6,8 +6,8 @@
  */
 
 import levenshtein from 'js-levenshtein';
-import { PublicAppInfo, PublicAppDeepLinkInfo } from 'src/core/public';
-import { GlobalSearchProviderResult } from '../../../global_search/public';
+import { PublicAppInfo, PublicAppDeepLinkInfo } from '@kbn/core/public';
+import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/public';
 
 /** Type used internally to represent an application unrolled into its separate deepLinks */
 export interface AppLink {
diff --git a/x-pack/plugins/global_search_providers/server/index.ts b/x-pack/plugins/global_search_providers/server/index.ts
index bd6610429ced8..92b3a4347492e 100644
--- a/x-pack/plugins/global_search_providers/server/index.ts
+++ b/x-pack/plugins/global_search_providers/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { GlobalSearchProvidersPlugin, GlobalSearchProvidersPluginSetupDeps } from './plugin';
 
 export const plugin: PluginInitializer<{}, {}, GlobalSearchProvidersPluginSetupDeps, {}> = () =>
diff --git a/x-pack/plugins/global_search_providers/server/plugin.test.ts b/x-pack/plugins/global_search_providers/server/plugin.test.ts
index e582f514d8d43..eae5e8633daaf 100644
--- a/x-pack/plugins/global_search_providers/server/plugin.test.ts
+++ b/x-pack/plugins/global_search_providers/server/plugin.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../src/core/server/mocks';
-import { globalSearchPluginMock } from '../../global_search/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/server/mocks';
 import { GlobalSearchProvidersPlugin } from './plugin';
 
 describe('GlobalSearchProvidersPlugin', () => {
diff --git a/x-pack/plugins/global_search_providers/server/plugin.ts b/x-pack/plugins/global_search_providers/server/plugin.ts
index dae346144bce3..c7b0da5c8d10d 100644
--- a/x-pack/plugins/global_search_providers/server/plugin.ts
+++ b/x-pack/plugins/global_search_providers/server/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/server';
-import { GlobalSearchPluginSetup } from '../../global_search/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/server';
 import { createSavedObjectsResultProvider } from './providers';
 
 export interface GlobalSearchProvidersPluginSetupDeps {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts
index 3a8494cb7d0e8..f21251ca5fc83 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectTypeRegistry } from '../../../../../../src/core/server';
+import { SavedObjectTypeRegistry } from '@kbn/core/server';
 import { getSearchableTypes } from './get_searchable_types';
 
 describe('getSearchableTypes', () => {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts
index fa8153dc161ca..eda2f7762f439 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/get_searchable_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISavedObjectTypeRegistry, SavedObjectsType } from 'src/core/server';
+import type { ISavedObjectTypeRegistry, SavedObjectsType } from '@kbn/core/server';
 
 export const getSearchableTypes = (typeRegistry: ISavedObjectTypeRegistry, types?: string[]) => {
   const typeFilter = types
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
index 3b6011aeab7fc..7f5a894a32e53 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.test.ts
@@ -10,9 +10,9 @@ import {
   SavedObjectsType,
   SavedObjectTypeRegistry,
   Capabilities,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { mapToResult, mapToResults } from './map_object_to_result';
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 
 const createType = (props: Partial<SavedObjectsType>): SavedObjectsType => {
   return {
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
index 871710abee11b..676c92fba0b4c 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/map_object_to_result.ts
@@ -11,8 +11,8 @@ import {
   ISavedObjectTypeRegistry,
   SavedObjectsFindResult,
   Capabilities,
-} from 'src/core/server';
-import { GlobalSearchProviderResult } from '../../../../global_search/server';
+} from '@kbn/core/server';
+import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/server';
 
 export const mapToResults = (
   objects: Array<SavedObjectsFindResult<unknown>>,
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
index f332747f1ccfc..1943e08df2119 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
@@ -13,12 +13,12 @@ import {
   SavedObjectsFindResult,
   SavedObjectsType,
   SavedObjectTypeRegistry,
-} from 'src/core/server';
-import { globalSearchPluginMock } from '../../../../global_search/server/mocks';
+} from '@kbn/core/server';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/server/mocks';
 import {
   GlobalSearchResultProvider,
   GlobalSearchProviderFindOptions,
-} from '../../../../global_search/server';
+} from '@kbn/global-search-plugin/server';
 import { createSavedObjectsResultProvider } from './provider';
 
 const getTestScheduler = () =>
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
index ae1f6da10bc6e..5eba3d940ccb1 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
@@ -7,8 +7,8 @@
 
 import { from, combineLatest, of } from 'rxjs';
 import { map, takeUntil, first } from 'rxjs/operators';
-import { SavedObjectsFindOptionsReference } from 'src/core/server';
-import { GlobalSearchResultProvider } from '../../../../global_search/server';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/server';
+import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/server';
 import { mapToResults } from './map_object_to_result';
 import { getSearchableTypes } from './get_searchable_types';
 
diff --git a/x-pack/plugins/graph/common/check_license.ts b/x-pack/plugins/graph/common/check_license.ts
index 8357efbbba643..2b4ac145fb785 100644
--- a/x-pack/plugins/graph/common/check_license.ts
+++ b/x-pack/plugins/graph/common/check_license.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ILicense } from '../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 // Can be used in switch statements to ensure we perform exhaustive checks, see
 // https://www.typescriptlang.org/docs/handbook/advanced-types.html#exhaustiveness-checking
diff --git a/x-pack/plugins/graph/kibana.json b/x-pack/plugins/graph/kibana.json
index 86ff0cf5d6c4f..3ea4d3cdca356 100644
--- a/x-pack/plugins/graph/kibana.json
+++ b/x-pack/plugins/graph/kibana.json
@@ -22,8 +22,7 @@
   "requiredBundles": [
     "unifiedSearch",
     "kibanaUtils",
-    "kibanaReact",
-    "home"
+    "kibanaReact"
   ],
   "owner": {
     "name": "Data Discovery",
diff --git a/x-pack/plugins/graph/public/application.tsx b/x-pack/plugins/graph/public/application.tsx
index adc396965f6a7..bc0ee0b3ee55b 100644
--- a/x-pack/plugins/graph/public/application.tsx
+++ b/x-pack/plugins/graph/public/application.tsx
@@ -18,22 +18,22 @@ import {
   IUiSettingsClient,
   Capabilities,
   ScopedHistory,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { DataPlugin, DataViewsContract } from '../../../../src/plugins/data/public';
-import { LicensingPluginStart } from '../../licensing/public';
-import { checkLicense } from '../common/check_license';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
+import { DataPlugin, DataViewsContract } from '@kbn/data-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import './index.scss';
 import('./font_awesome');
-import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
+import { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { GraphSavePolicy } from './types';
 import { graphRouter } from './router';
-import { SpacesApi } from '../../spaces/public';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+import { checkLicense } from '../common/check_license';
 
 /**
  * These are dependencies of the Graph app besides the base dependencies
diff --git a/x-pack/plugins/graph/public/apps/listing_route.tsx b/x-pack/plugins/graph/public/apps/listing_route.tsx
index dc70d84155bf9..cf9a5ea88d2a8 100644
--- a/x-pack/plugins/graph/public/apps/listing_route.tsx
+++ b/x-pack/plugins/graph/public/apps/listing_route.tsx
@@ -9,23 +9,26 @@ import React, { Fragment, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiLink, EuiButton } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { useHistory, useLocation } from 'react-router-dom';
-import { TableListView } from '../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '@kbn/kibana-react-plugin/public';
 import { deleteSavedWorkspace, findSavedWorkspace } from '../helpers/saved_workspace_utils';
 import { getEditPath, getEditUrl, getNewPath, setBreadcrumbs } from '../services/url';
 import { GraphWorkspaceSavedObject } from '../types';
 import { GraphServices } from '../application';
 
+const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
+const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage';
+
 export interface ListingRouteProps {
-  deps: GraphServices;
+  deps: Omit<GraphServices, 'savedObjects'>;
 }
 
 export function ListingRoute({
-  deps: { chrome, savedObjects, savedObjectsClient, coreStart, capabilities, addBasePath },
+  deps: { chrome, savedObjectsClient, coreStart, capabilities, addBasePath, uiSettings },
 }: ListingRouteProps) {
-  const listingLimit = savedObjects.settings.getListingLimit();
-  const initialPageSize = savedObjects.settings.getPerPage();
+  const listingLimit = uiSettings.get(SAVED_OBJECTS_LIMIT_SETTING);
+  const initialPageSize = uiSettings.get(SAVED_OBJECTS_PER_PAGE_SETTING);
   const history = useHistory();
   const query = new URLSearchParams(useLocation().search);
   const initialFilter = query.get('filter') || '';
@@ -103,6 +106,7 @@ export function ListingRoute({
           defaultMessage: 'Graphs',
         })}
         theme={coreStart.theme}
+        application={coreStart.application}
       />
     </I18nProvider>
   );
diff --git a/x-pack/plugins/graph/public/apps/workspace_route.tsx b/x-pack/plugins/graph/public/apps/workspace_route.tsx
index 2961d0eea08ec..e8850e4817d50 100644
--- a/x-pack/plugins/graph/public/apps/workspace_route.tsx
+++ b/x-pack/plugins/graph/public/apps/workspace_route.tsx
@@ -9,8 +9,8 @@ import React, { useMemo, useRef, useState } from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Provider } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { showSaveModal } from '../../../../../src/plugins/saved_objects/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { showSaveModal } from '@kbn/saved-objects-plugin/public';
 import { Workspace } from '../types';
 import { createGraphStore } from '../state_management';
 import { createWorkspace } from '../services/workspace/graph_client_workspace';
diff --git a/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx b/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
index 3dd863ac1a124..e6cf2eacc0d87 100644
--- a/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
+++ b/x-pack/plugins/graph/public/components/guidance_panel/guidance_panel.tsx
@@ -20,7 +20,8 @@ import { i18n } from '@kbn/i18n';
 import classNames from 'classnames';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { connect } from 'react-redux';
-import { IDataPluginServices } from 'src/plugins/data/public';
+import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   GraphState,
   hasDatasourceSelector,
@@ -31,8 +32,6 @@ import {
 import { IndexPatternSavedObject } from '../../types';
 import { openSourceModal } from '../../services/source_modal';
 
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-
 export interface GuidancePanelProps {
   onFillWorkspace: () => void;
   onOpenFieldPicker: () => void;
diff --git a/x-pack/plugins/graph/public/components/inspect_panel.tsx b/x-pack/plugins/graph/public/components/inspect_panel.tsx
index 6881a750f76ed..e6197bac16ba7 100644
--- a/x-pack/plugins/graph/public/components/inspect_panel.tsx
+++ b/x-pack/plugins/graph/public/components/inspect_panel.tsx
@@ -9,8 +9,8 @@ import React, { useMemo, useState } from 'react';
 import { EuiTab, EuiTabs, EuiText } from '@elastic/eui';
 import { monaco, XJsonLang } from '@kbn/monaco';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CodeEditor } from '../../../../../src/plugins/kibana_react/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 interface InspectPanelProps {
   showInspect: boolean;
diff --git a/x-pack/plugins/graph/public/components/save_modal.tsx b/x-pack/plugins/graph/public/components/save_modal.tsx
index 1048d329faee1..557ce2de114ec 100644
--- a/x-pack/plugins/graph/public/components/save_modal.tsx
+++ b/x-pack/plugins/graph/public/components/save_modal.tsx
@@ -8,7 +8,7 @@
 import React, { useState } from 'react';
 import { EuiFormRow, EuiTextArea, EuiCallOut, EuiSpacer, EuiSwitch } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectSaveModal, OnSaveProps } from '../../../../../src/plugins/saved_objects/public';
+import { SavedObjectSaveModal, OnSaveProps } from '@kbn/saved-objects-plugin/public';
 
 import { GraphSavePolicy } from '../types/config';
 
diff --git a/x-pack/plugins/graph/public/components/search_bar.test.tsx b/x-pack/plugins/graph/public/components/search_bar.test.tsx
index 9a5b464e01e8f..3589c6c25b29a 100644
--- a/x-pack/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.test.tsx
@@ -15,12 +15,12 @@ import {
   NotificationsStart,
   OverlayStart,
   SavedObjectsStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { act } from 'react-dom/test-utils';
-import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider, InjectedIntl } from '@kbn/i18n-react';
 
 import { openSourceModal } from '../services/source_modal';
diff --git a/x-pack/plugins/graph/public/components/search_bar.tsx b/x-pack/plugins/graph/public/components/search_bar.tsx
index f28f9245db23d..762a2e87d2a5a 100644
--- a/x-pack/plugins/graph/public/components/search_bar.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.tsx
@@ -11,6 +11,10 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { connect } from 'react-redux';
 import { toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IDataPluginServices, Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { IndexPatternSavedObject, IndexPatternProvider, WorkspaceField } from '../types';
 import { openSourceModal } from '../services/source_modal';
 import {
@@ -22,11 +26,7 @@ import {
   selectedFieldsSelector,
 } from '../state_management';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { IDataPluginServices, Query } from '../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
 import { TooltipWrapper } from './tooltip_wrapper';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface SearchBarProps {
   isLoading: boolean;
diff --git a/x-pack/plugins/graph/public/components/source_picker.tsx b/x-pack/plugins/graph/public/components/source_picker.tsx
index 1fddd9401db25..85f1e325ba748 100644
--- a/x-pack/plugins/graph/public/components/source_picker.tsx
+++ b/x-pack/plugins/graph/public/components/source_picker.tsx
@@ -8,8 +8,8 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 
-import { CoreStart } from 'src/core/public';
-import { SavedObjectFinderUi } from '../../../../../src/plugins/saved_objects/public';
+import { CoreStart } from '@kbn/core/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { IndexPatternSavedObject } from '../types';
 
 export interface SourcePickerProps {
diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx
index c535c9e32d335..57b4ff613c88b 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { WorkspaceLayoutComponent } from '.';
-import { coreMock } from 'src/core/public/mocks';
-import { spacesPluginMock } from '../../../../spaces/public/mocks';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../src/plugins/navigation/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
 import { GraphSavePolicy, GraphWorkspaceSavedObject, IndexPatternProvider } from '../../types';
-import { OverlayStart, Capabilities } from 'kibana/public';
+import { OverlayStart, Capabilities } from '@kbn/core/public';
 import { SharingSavedObjectProps } from '../../helpers/use_workspace_loader';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
index 3e7ff634eef0e..ecbe8f676f50a 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_layout.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
 import { connect } from 'react-redux';
 import { useLocation } from 'react-router-dom';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SearchBar } from '../search_bar';
 import {
   GraphState,
@@ -17,7 +18,6 @@ import {
   workspaceInitializedSelector,
 } from '../../state_management';
 import { FieldManager } from '../field_manager';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
 import {
   ControlType,
   IndexPatternProvider,
diff --git a/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx b/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx
index f3bebfa68ca4a..2fcae33d6cf7e 100644
--- a/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx
+++ b/x-pack/plugins/graph/public/components/workspace_layout/workspace_top_nav_menu.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Provider, useStore } from 'react-redux';
-import { AppMountParameters, Capabilities, CoreStart } from 'kibana/public';
+import { AppMountParameters, Capabilities, CoreStart } from '@kbn/core/public';
 import { useHistory, useLocation } from 'react-router-dom';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../src/plugins/navigation/public';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { datasourceSelector, hasFieldsSelector } from '../../state_management';
 import { GraphSavePolicy, GraphWorkspaceSavedObject, Workspace } from '../../types';
 import { AsObservable, Settings, SettingsWorkspaceProps } from '../settings';
diff --git a/x-pack/plugins/graph/public/helpers/format_http_error.ts b/x-pack/plugins/graph/public/helpers/format_http_error.ts
index 13ab8c02848bf..e3d1919209ca0 100644
--- a/x-pack/plugins/graph/public/helpers/format_http_error.ts
+++ b/x-pack/plugins/graph/public/helpers/format_http_error.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 export function formatHttpError(
   error: IHttpFetchError<ResponseErrorBody & { status: number; statusText: string }>
diff --git a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
index 03091fd1fdc0d..72cca61832ca0 100644
--- a/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
+++ b/x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts
@@ -12,19 +12,19 @@ import {
   OverlayStart,
   SavedObjectsClientContract,
   SavedObjectAttributes,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 import {
   SavedObjectSaveOpts,
   checkForDuplicateTitle,
   saveWithConfirmation,
   isErrorNonFatal,
-} from '../../../../../src/plugins/saved_objects/public';
+} from '@kbn/saved-objects-plugin/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import {
   injectReferences,
   extractReferences,
 } from '../services/persistence/saved_workspace_references';
-import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/public';
 import { GraphWorkspaceSavedObject } from '../types';
 
 const savedWorkspaceType = 'graph-workspace';
diff --git a/x-pack/plugins/graph/public/helpers/use_graph_loader.ts b/x-pack/plugins/graph/public/helpers/use_graph_loader.ts
index c895d4156fa7b..470cac2d0863c 100644
--- a/x-pack/plugins/graph/public/helpers/use_graph_loader.ts
+++ b/x-pack/plugins/graph/public/helpers/use_graph_loader.ts
@@ -6,8 +6,8 @@
  */
 
 import { useCallback, useState } from 'react';
-import { ToastsStart } from 'kibana/public';
-import { IHttpFetchError, ResponseErrorBody, CoreStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
+import { IHttpFetchError, ResponseErrorBody, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ExploreRequest, GraphExploreCallback, GraphSearchCallback, SearchRequest } from '../types';
 import { formatHttpError } from './format_http_error';
diff --git a/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx b/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx
index db23a59f8e902..0c05fce5a4558 100644
--- a/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx
+++ b/x-pack/plugins/graph/public/helpers/use_workspace_loader.test.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 import { useWorkspaceLoader, UseWorkspaceLoaderProps } from './use_workspace_loader';
-import { coreMock } from 'src/core/public/mocks';
-import { spacesPluginMock } from '../../../spaces/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { createMockGraphStore } from '../state_management/mocks';
 import { Workspace } from '../types';
-import { SavedObjectsClientCommon } from 'src/plugins/data/common';
+import { SavedObjectsClientCommon } from '@kbn/data-plugin/common';
 import { renderHook, act, RenderHookOptions } from '@testing-library/react-hooks';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts b/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts
index 07fc58c9ffbdd..75b4cf9584f31 100644
--- a/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts
+++ b/x-pack/plugins/graph/public/helpers/use_workspace_loader.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
-import type { SavedObjectsResolveResponse } from 'src/core/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
 import { useEffect, useState } from 'react';
 import { useHistory, useLocation, useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import { GraphStore } from '../state_management';
 import { GraphWorkspaceSavedObject, IndexPatternSavedObject, Workspace } from '../types';
 import { getEmptyWorkspace, getSavedWorkspace } from './saved_workspace_utils';
 import { getEditUrl } from '../services/url';
-import { SpacesApi } from '../../../spaces/public';
 export interface UseWorkspaceLoaderProps {
   store: GraphStore;
   workspaceRef: React.MutableRefObject<Workspace | undefined>;
diff --git a/x-pack/plugins/graph/public/index.ts b/x-pack/plugins/graph/public/index.ts
index af57d3f005382..63e68eae586b0 100644
--- a/x-pack/plugins/graph/public/index.ts
+++ b/x-pack/plugins/graph/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { GraphPlugin } from './plugin';
 import { ConfigSchema } from '../config';
 
diff --git a/x-pack/plugins/graph/public/plugin.ts b/x-pack/plugins/graph/public/plugin.ts
index 1782f8202c415..0d9fac79600ad 100644
--- a/x-pack/plugins/graph/public/plugin.ts
+++ b/x-pack/plugins/graph/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
-import { SpacesApi } from '../../spaces/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import {
   AppNavLinkStatus,
   AppUpdater,
@@ -17,21 +17,17 @@ import {
   Plugin,
   PluginInitializerContext,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-import { LicensingPluginStart } from '../../licensing/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
 import { checkLicense } from '../common/check_license';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-  HomePublicPluginStart,
-} from '../../../../src/plugins/home/public';
 import { ConfigSchema } from '../config';
-import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
 
 export interface GraphPluginSetupDependencies {
   home?: HomePublicPluginSetup;
@@ -67,7 +63,7 @@ export class GraphPlugin
         icon: 'graphApp',
         path: '/app/graph',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
         solutionId: 'kibana',
         order: 600,
       });
diff --git a/x-pack/plugins/graph/public/services/fetch_top_nodes.ts b/x-pack/plugins/graph/public/services/fetch_top_nodes.ts
index 1b1e91ac7277b..b0c6e09bbd9ff 100644
--- a/x-pack/plugins/graph/public/services/fetch_top_nodes.ts
+++ b/x-pack/plugins/graph/public/services/fetch_top_nodes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { WorkspaceField, ServerResultNode } from '../types';
 
 const DEFAULT_SHARD_SIZE = 5000;
diff --git a/x-pack/plugins/graph/public/services/index_pattern_cache.ts b/x-pack/plugins/graph/public/services/index_pattern_cache.ts
index d6156bc9d0626..1f3824e8629b6 100644
--- a/x-pack/plugins/graph/public/services/index_pattern_cache.ts
+++ b/x-pack/plugins/graph/public/services/index_pattern_cache.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { IndexPatternProvider } from '../types';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export function createCachedIndexPatternProvider(
   indexPatternGetter: (id: string) => Promise<DataView>
diff --git a/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts b/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts
index cc180065d3aca..38efc43e502dc 100644
--- a/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts
+++ b/x-pack/plugins/graph/public/services/persistence/deserialize.test.ts
@@ -7,9 +7,9 @@
 
 import { GraphWorkspaceSavedObject, IndexPatternSavedObject, Workspace } from '../../types';
 import { migrateLegacyIndexPatternRef, savedWorkspaceToAppState, mapFields } from './deserialize';
-import { createWorkspace } from '../../services/workspace/graph_client_workspace';
+import { createWorkspace } from '../workspace/graph_client_workspace';
 import { outlinkEncoders } from '../../helpers/outlink_encoders';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 describe('deserialize', () => {
   let savedWorkspace: GraphWorkspaceSavedObject;
diff --git a/x-pack/plugins/graph/public/services/persistence/deserialize.ts b/x-pack/plugins/graph/public/services/persistence/deserialize.ts
index 1223c03b6f6c1..0a30907f7e1aa 100644
--- a/x-pack/plugins/graph/public/services/persistence/deserialize.ts
+++ b/x-pack/plugins/graph/public/services/persistence/deserialize.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { indexPatterns as indexPatternsUtils } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import {
   SerializedNode,
   UrlTemplate,
@@ -25,8 +27,6 @@ import {
   colorChoices,
   iconChoicesByClass,
 } from '../../helpers/style_choices';
-import { indexPatterns as indexPatternsUtils } from '../../../../../../src/plugins/data/public';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
 
 const defaultAdvancedSettings: AdvancedSettings = {
   useSignificance: true,
diff --git a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
index cf315b0a8c8ce..95036f4b324ec 100644
--- a/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
+++ b/x-pack/plugins/graph/public/services/persistence/saved_workspace_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectAttributes, SavedObjectReference } from 'kibana/public';
+import { SavedObjectAttributes, SavedObjectReference } from '@kbn/core/public';
 
 export function extractReferences({
   attributes,
diff --git a/x-pack/plugins/graph/public/services/save_modal.tsx b/x-pack/plugins/graph/public/services/save_modal.tsx
index f1603ed790d3a..9e95a53c12f9a 100644
--- a/x-pack/plugins/graph/public/services/save_modal.tsx
+++ b/x-pack/plugins/graph/public/services/save_modal.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { ReactElement } from 'react';
-import { I18nStart, OverlayStart, SavedObjectsClientContract } from 'src/core/public';
-import { SaveResult } from 'src/plugins/saved_objects/public';
+import { I18nStart, OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import { SaveResult } from '@kbn/saved-objects-plugin/public';
 import { GraphWorkspaceSavedObject, GraphSavePolicy } from '../types';
 import { SaveModal, OnSaveGraphProps } from '../components/save_modal';
 
diff --git a/x-pack/plugins/graph/public/services/source_modal.tsx b/x-pack/plugins/graph/public/services/source_modal.tsx
index fc91762b537b1..cf20e01733139 100644
--- a/x-pack/plugins/graph/public/services/source_modal.tsx
+++ b/x-pack/plugins/graph/public/services/source_modal.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
-import { KibanaReactOverlays } from 'src/plugins/kibana_react/public';
+import { KibanaReactOverlays } from '@kbn/kibana-react-plugin/public';
 import { SourceModal } from '../components/source_modal';
 import { IndexPatternSavedObject } from '../types';
 
diff --git a/x-pack/plugins/graph/public/services/url.ts b/x-pack/plugins/graph/public/services/url.ts
index b33fdc82d8642..65607a9b3cd96 100644
--- a/x-pack/plugins/graph/public/services/url.ts
+++ b/x-pack/plugins/graph/public/services/url.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
 import { GraphWorkspaceSavedObject } from '../types';
 import { MetaDataState } from '../state_management';
 
diff --git a/x-pack/plugins/graph/public/state_management/datasource.sagas.ts b/x-pack/plugins/graph/public/state_management/datasource.sagas.ts
index bbab3cd13b7a9..9f03ecc1993e1 100644
--- a/x-pack/plugins/graph/public/state_management/datasource.sagas.ts
+++ b/x-pack/plugins/graph/public/state_management/datasource.sagas.ts
@@ -8,6 +8,7 @@
 import { takeLatest, put, call, select } from 'redux-saga/effects';
 import { i18n } from '@kbn/i18n';
 import { Action } from 'typescript-fsa';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { GraphStoreDependencies } from './store';
 import { loadFields } from './fields';
 import { mapFields } from '../services/persistence';
@@ -18,7 +19,6 @@ import {
   setDatasource,
   requestDatasource,
 } from './datasource';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 /**
  * Saga loading field information when the datasource is switched. This will overwrite current settings
diff --git a/x-pack/plugins/graph/public/state_management/datasource.test.ts b/x-pack/plugins/graph/public/state_management/datasource.test.ts
index ab37ed76ac08b..527f0fe66249c 100644
--- a/x-pack/plugins/graph/public/state_management/datasource.test.ts
+++ b/x-pack/plugins/graph/public/state_management/datasource.test.ts
@@ -11,7 +11,7 @@ import { datasourceSelector, requestDatasource } from './datasource';
 import { datasourceSaga } from './datasource.sagas';
 import { fieldsSelector } from './fields';
 import { updateSettings } from './advanced_settings';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 const waitForPromise = () => new Promise((r) => setTimeout(r));
 
diff --git a/x-pack/plugins/graph/public/state_management/mocks.ts b/x-pack/plugins/graph/public/state_management/mocks.ts
index 06f9fe52f936a..00619f118a1d0 100644
--- a/x-pack/plugins/graph/public/state_management/mocks.ts
+++ b/x-pack/plugins/graph/public/state_management/mocks.ts
@@ -10,13 +10,13 @@ import {
   HttpStart,
   OverlayStart,
   SavedObjectsClientContract,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import createSagaMiddleware from 'redux-saga';
 import { createStore, applyMiddleware, AnyAction } from 'redux';
-import { ChromeStart } from 'kibana/public';
+import { ChromeStart } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { GraphStoreDependencies, createRootReducer, GraphStore, GraphState } from './store';
 import { Workspace } from '../types';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface MockedGraphEnvironment {
   store: GraphStore;
diff --git a/x-pack/plugins/graph/public/state_management/persistence.ts b/x-pack/plugins/graph/public/state_management/persistence.ts
index d043df2510ed6..2df2c98a10d77 100644
--- a/x-pack/plugins/graph/public/state_management/persistence.ts
+++ b/x-pack/plugins/graph/public/state_management/persistence.ts
@@ -8,6 +8,7 @@
 import actionCreatorFactory, { Action } from 'typescript-fsa';
 import { i18n } from '@kbn/i18n';
 import { takeLatest, call, put, select, cps } from 'redux-saga/effects';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { GraphWorkspaceSavedObject, IndexPatternSavedObject, Workspace } from '../types';
 import { GraphStoreDependencies, GraphState, submitSearch } from '.';
 import { datasourceSelector } from './datasource';
@@ -25,7 +26,6 @@ import { updateMetaData, metaDataSelector } from './meta_data';
 import { openSaveModal, SaveWorkspaceHandler } from '../services/save_modal';
 import { getEditPath } from '../services/url';
 import { saveSavedWorkspace } from '../helpers/saved_workspace_utils';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface LoadSavedWorkspacePayload {
   indexPatterns: IndexPatternSavedObject[];
diff --git a/x-pack/plugins/graph/public/state_management/store.ts b/x-pack/plugins/graph/public/state_management/store.ts
index b2b685f51573b..657f3021e24e5 100644
--- a/x-pack/plugins/graph/public/state_management/store.ts
+++ b/x-pack/plugins/graph/public/state_management/store.ts
@@ -7,8 +7,8 @@
 
 import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
 import { combineReducers, createStore, Store, AnyAction, Dispatch, applyMiddleware } from 'redux';
-import { ChromeStart, I18nStart, OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import { CoreStart } from 'src/core/public';
+import { ChromeStart, I18nStart, OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { ReactElement } from 'react';
 import {
   fieldsReducer,
diff --git a/x-pack/plugins/graph/public/types/app_state.ts b/x-pack/plugins/graph/public/types/app_state.ts
index 0d707cef9543b..2dbbad2a4a1a5 100644
--- a/x-pack/plugins/graph/public/types/app_state.ts
+++ b/x-pack/plugins/graph/public/types/app_state.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SimpleSavedObject } from 'src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { FontawesomeIcon } from '../helpers/style_choices';
 import { OutlinkEncoder } from '../helpers/outlink_encoders';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 export interface UrlTemplate {
   url: string;
diff --git a/x-pack/plugins/graph/server/index.ts b/x-pack/plugins/graph/server/index.ts
index 10ddca631a898..886c8e4267cb6 100644
--- a/x-pack/plugins/graph/server/index.ts
+++ b/x-pack/plugins/graph/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { configSchema, ConfigSchema } from '../config';
 import { GraphPlugin } from './plugin';
diff --git a/x-pack/plugins/graph/server/lib/license_state.ts b/x-pack/plugins/graph/server/lib/license_state.ts
index d23a4f330d9f3..c962666b14d33 100644
--- a/x-pack/plugins/graph/server/lib/license_state.ts
+++ b/x-pack/plugins/graph/server/lib/license_state.ts
@@ -8,8 +8,8 @@
 import Boom from '@hapi/boom';
 import { map } from 'rxjs/operators';
 import { Observable, Subscription } from 'rxjs';
-import { LicensingPluginStart } from '../../../licensing/server';
-import { ILicense } from '../../../licensing/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { checkLicense, GraphLicenseInformation } from '../../common/check_license';
 
 export class LicenseState {
diff --git a/x-pack/plugins/graph/server/plugin.ts b/x-pack/plugins/graph/server/plugin.ts
index 32dac5fba86f9..3043ab7e5aae1 100644
--- a/x-pack/plugins/graph/server/plugin.ts
+++ b/x-pack/plugins/graph/server/plugin.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup, CoreStart } from 'src/core/server';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { LicenseState } from './lib/license_state';
 import { registerSearchRoute } from './routes/search';
 import { registerExploreRoute } from './routes/explore';
-import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
 import { registerSampleData } from './sample_data';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import { graphWorkspace } from './saved_objects';
 
 export class GraphPlugin implements Plugin {
diff --git a/x-pack/plugins/graph/server/routes/explore.ts b/x-pack/plugins/graph/server/routes/explore.ts
index 6318d8574c397..b3dddfb21cb92 100644
--- a/x-pack/plugins/graph/server/routes/explore.ts
+++ b/x-pack/plugins/graph/server/routes/explore.ts
@@ -6,7 +6,7 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import Boom from '@hapi/boom';
 import { LicenseState, verifyApiAccess } from '../lib/license_state';
diff --git a/x-pack/plugins/graph/server/routes/search.ts b/x-pack/plugins/graph/server/routes/search.ts
index ba169bf291751..8d5827fe13316 100644
--- a/x-pack/plugins/graph/server/routes/search.ts
+++ b/x-pack/plugins/graph/server/routes/search.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 import { LicenseState, verifyApiAccess } from '../lib/license_state';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/server';
 
 export function registerSearchRoute({
   router,
diff --git a/x-pack/plugins/graph/server/sample_data/ecommerce.ts b/x-pack/plugins/graph/server/sample_data/ecommerce.ts
index fe2f319acef88..1a2677e6ed67c 100644
--- a/x-pack/plugins/graph/server/sample_data/ecommerce.ts
+++ b/x-pack/plugins/graph/server/sample_data/ecommerce.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { APP_ICON, createWorkspacePath } from '../../common/constants';
 
 const datasetId = 'ecommerce';
diff --git a/x-pack/plugins/graph/server/sample_data/flights.ts b/x-pack/plugins/graph/server/sample_data/flights.ts
index f378c916e4b87..5f61ae150d579 100644
--- a/x-pack/plugins/graph/server/sample_data/flights.ts
+++ b/x-pack/plugins/graph/server/sample_data/flights.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { APP_ICON, createWorkspacePath } from '../../common/constants';
 
 const datasetId = 'flights';
diff --git a/x-pack/plugins/graph/server/sample_data/logs.ts b/x-pack/plugins/graph/server/sample_data/logs.ts
index af1132f5d37bc..0d5ec41cfbdb4 100644
--- a/x-pack/plugins/graph/server/sample_data/logs.ts
+++ b/x-pack/plugins/graph/server/sample_data/logs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { APP_ICON, createWorkspacePath } from '../../common/constants';
 
 const datasetId = 'logs';
diff --git a/x-pack/plugins/graph/server/sample_data/register_sample_data.ts b/x-pack/plugins/graph/server/sample_data/register_sample_data.ts
index 44930365e6f10..0833f8d0065f2 100644
--- a/x-pack/plugins/graph/server/sample_data/register_sample_data.ts
+++ b/x-pack/plugins/graph/server/sample_data/register_sample_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SampleDataRegistrySetup } from '../../../../../src/plugins/home/server';
+import { SampleDataRegistrySetup } from '@kbn/home-plugin/server';
 import { registerLogsSampleData, registerLogsSampleDataLink } from './logs';
 import { registerEcommerceSampleData, registerEcommerceSampleDataLink } from './ecommerce';
 import { registerFlightsSampleData, registerFlightsSampleDataLink } from './flights';
diff --git a/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts b/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts
index beb7dbf921e20..4a53bba847543 100644
--- a/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts
+++ b/x-pack/plugins/graph/server/saved_objects/graph_workspace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { graphMigrations } from './migrations';
 
 export const graphWorkspace: SavedObjectsType = {
diff --git a/x-pack/plugins/graph/server/saved_objects/migrations.test.ts b/x-pack/plugins/graph/server/saved_objects/migrations.test.ts
index c141a33f653b1..7f033869f4859 100644
--- a/x-pack/plugins/graph/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/graph/server/saved_objects/migrations.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { graphMigrations } from './migrations';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 describe('graph-workspace', () => {
   describe('7.0.0', () => {
diff --git a/x-pack/plugins/graph/server/saved_objects/migrations.ts b/x-pack/plugins/graph/server/saved_objects/migrations.ts
index 0957866f7cf60..cbf5384487460 100644
--- a/x-pack/plugins/graph/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/graph/server/saved_objects/migrations.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 export const graphMigrations = {
   '7.0.0': (doc: SavedObjectUnsanitizedDoc<any>) => {
diff --git a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
index 348c23c63937a..d73b69df6eaac 100644
--- a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
+++ b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
@@ -26,7 +26,7 @@ import { PatternInput } from '../pattern_input';
 import { CustomPatternsInput } from '../custom_patterns_input';
 import { EventOutput } from '../event_output';
 import { GrokdebuggerRequest } from '../../models/grokdebugger_request';
-import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 const i18nTexts = {
diff --git a/x-pack/plugins/grokdebugger/public/plugin.js b/x-pack/plugins/grokdebugger/public/plugin.js
index b92cfce6ec0ef..0a8ff824e7130 100644
--- a/x-pack/plugins/grokdebugger/public/plugin.js
+++ b/x-pack/plugins/grokdebugger/public/plugin.js
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 
 import { PLUGIN } from '../common/constants';
 import { registerFeature } from './register_feature';
@@ -24,7 +24,7 @@ export class GrokDebuggerUIPlugin {
       enableRouting: false,
       async mount({ element, theme$ }) {
         const [coreStart] = await coreSetup.getStartServices();
-        const license = await plugins.licensing.license$.pipe(first()).toPromise();
+        const license = await firstValueFrom(plugins.licensing.license$);
         const { renderApp } = await import('./render_app');
         return renderApp(license, element, coreStart, theme$);
       },
diff --git a/x-pack/plugins/grokdebugger/public/register_feature.ts b/x-pack/plugins/grokdebugger/public/register_feature.ts
index 2f80ac6561ad7..d23d2fb603ec6 100644
--- a/x-pack/plugins/grokdebugger/public/register_feature.ts
+++ b/x-pack/plugins/grokdebugger/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export const registerFeature = (homePlugin: HomePublicPluginSetup) => {
   homePlugin.featureCatalogue.register({
@@ -23,6 +20,6 @@ export const registerFeature = (homePlugin: HomePublicPluginSetup) => {
     icon: 'grokApp',
     path: '/app/dev_tools#/grokdebugger',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
   });
 };
diff --git a/x-pack/plugins/grokdebugger/public/shared_imports.ts b/x-pack/plugins/grokdebugger/public/shared_imports.ts
index 2779673d665b9..b2e82bce637f1 100644
--- a/x-pack/plugins/grokdebugger/public/shared_imports.ts
+++ b/x-pack/plugins/grokdebugger/public/shared_imports.ts
@@ -5,9 +5,6 @@
  * 2.0.
  */
 
-export { EuiCodeEditor } from '../../../../src/plugins/es_ui_shared/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts b/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts
index 7e302c24fc5ba..1862533feb67a 100644
--- a/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts
+++ b/x-pack/plugins/grokdebugger/server/lib/kibana_framework.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup, IRouter, RouteMethod, RouteConfig, RequestHandler } from 'src/core/server';
+import { CoreSetup, IRouter, RouteMethod, RouteConfig, RequestHandler } from '@kbn/core/server';
 
-import { ILicense } from '../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 type GrokDebuggerRouteConfig<Params, Query, Body, Method extends RouteMethod> = {
   method: RouteMethod;
diff --git a/x-pack/plugins/grokdebugger/server/shared_imports.ts b/x-pack/plugins/grokdebugger/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/grokdebugger/server/shared_imports.ts
+++ b/x-pack/plugins/grokdebugger/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx
index 7c6d891042493..9364d07d82382 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.helpers.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test-jest-helpers';
-import { docLinksServiceMock, executionContextServiceMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { docLinksServiceMock, executionContextServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { createBreadcrumbsMock } from '../../../public/application/services/breadcrumbs.mock';
-import { licensingMock } from '../../../../licensing/public/mocks';
 import { App } from '../../../public/application/app';
 
 const breadcrumbService = createBreadcrumbsMock();
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
index 57a70237be6e1..05370558ae69d 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/frozen_phase.test.ts
@@ -8,7 +8,7 @@
 import { act } from 'react-dom/test-utils';
 import { TestBed } from '@kbn/test-jest-helpers';
 
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { setupEnvironment } from '../../helpers';
 import { initTestBed } from '../init_test_bed';
 
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
index a620f6e1268be..571170b78b66b 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/searchable_snapshots.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { setupEnvironment } from '../../helpers';
 import { getDefaultHotPhasePolicy } from '../constants';
 import {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.tsx
index 64d5cd65cda68..6e68032d9b0ea 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/init_test_bed.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { registerTestBed, TestBedConfig } from '@kbn/test-jest-helpers';
-import { docLinksServiceMock } from 'src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 import '../helpers/global_mocks';
 
-import { licensingMock } from '../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { EditPolicy } from '../../../public/application/sections/edit_policy';
 import { KibanaContextProvider } from '../../../public/shared_imports';
 import { AppServicesContext } from '../../../public/types';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
index be196a377edb4..4e3d9fe737f4c 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/serialization/policy_serialization.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { licensingMock } from '../../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { setupEnvironment } from '../../helpers';
 import {
   getDefaultHotPhasePolicy,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
index 4bc223943c6c7..d317b09d4d305 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/phases.ts
@@ -16,7 +16,7 @@ import {
   createNodeAllocationActions,
   createReplicasAction,
   createSnapshotPolicyActions,
-} from './';
+} from '.';
 
 export const createHotPhaseActions = (testBed: TestBed) => {
   return {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts
index 3926a90f85a14..eb212787fa62f 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/setup_environment.ts
@@ -8,18 +8,13 @@
 import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { notificationServiceMock, fatalErrorsServiceMock } from '@kbn/core/public/mocks';
 import { init as initHttp } from '../../../public/application/services/http';
 import { init as initHttpRequests } from './http_requests';
 import { init as initUiMetric } from '../../../public/application/services/ui_metric';
 import { init as initNotification } from '../../../public/application/services/notification';
 
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
-
-import {
-  notificationServiceMock,
-  fatalErrorsServiceMock,
-} from '../../../../../../src/core/public/mocks';
-
 const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
 
 export const setupEnvironment = () => {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
index 544aad4c52088..a769a310fff5d 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
@@ -10,7 +10,7 @@ import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 import { Index } from '../common/types';
 import {
   retryLifecycleActionExtension,
@@ -31,8 +31,8 @@ import { init as initUiMetric } from '../public/application/services/ui_metric';
 initHttp(axios.create({ adapter: axiosXhrAdapter }));
 initUiMetric(usageCollectionPluginMock.createSetupContract());
 
-jest.mock('../../../plugins/index_management/public', async () => {
-  const { indexManagementMock } = await import('../../../plugins/index_management/public/mocks');
+jest.mock('@kbn/index-management-plugin/public', async () => {
+  const { indexManagementMock } = await import('@kbn/index-management-plugin/public/mocks');
   return indexManagementMock.createSetup();
 });
 
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx
index 89f7d4795429a..771cf70e3daea 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/policy_table.test.tsx
@@ -15,9 +15,9 @@ import {
   fatalErrorsServiceMock,
   injectedMetadataServiceMock,
   docLinksServiceMock,
-} from '../../../../src/core/public/mocks';
-import { HttpService } from '../../../../src/core/public/http';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/public/mocks';
+} from '@kbn/core/public/mocks';
+import { HttpService } from '@kbn/core/public/http';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import { PolicyFromES } from '../common/types';
 import { PolicyList } from '../public/application/sections/policy_list/policy_list';
@@ -25,7 +25,7 @@ import { init as initHttp } from '../public/application/services/http';
 import { init as initUiMetric } from '../public/application/services/ui_metric';
 import { KibanaContextProvider } from '../public/shared_imports';
 import { PolicyListContextProvider } from '../public/application/sections/policy_list/policy_list_context';
-import { executionContextServiceMock } from 'src/core/public/execution_context/execution_context_service.mock';
+import { executionContextServiceMock } from '@kbn/core/public/execution_context/execution_context_service.mock';
 
 initHttp(
   new HttpService().setup({
diff --git a/x-pack/plugins/index_lifecycle_management/common/constants/license.ts b/x-pack/plugins/index_lifecycle_management/common/constants/license.ts
index 2d09d3516be9d..bb0872bae1ac1 100644
--- a/x-pack/plugins/index_lifecycle_management/common/constants/license.ts
+++ b/x-pack/plugins/index_lifecycle_management/common/constants/license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export const MIN_PLUGIN_LICENSE: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/index_lifecycle_management/common/types/policies.ts b/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
index ad1b1b2b28880..018938e4c0e62 100644
--- a/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
+++ b/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Index as IndexInterface } from '../../../index_management/common/types';
+import { Index as IndexInterface } from '@kbn/index-management-plugin/common/types';
 
 export type Phase = keyof Phases;
 
diff --git a/x-pack/plugins/index_lifecycle_management/kibana.json b/x-pack/plugins/index_lifecycle_management/kibana.json
index bccb3cd78e78d..a9e8eff953633 100644
--- a/x-pack/plugins/index_lifecycle_management/kibana.json
+++ b/x-pack/plugins/index_lifecycle_management/kibana.json
@@ -10,5 +10,5 @@
   "requiredPlugins": ["licensing", "management", "features", "share"],
   "optionalPlugins": ["cloud", "usageCollection", "indexManagement", "home"],
   "configPath": ["xpack", "ilm"],
-  "requiredBundles": ["indexManagement", "kibanaReact", "esUiShared", "home"]
+  "requiredBundles": ["indexManagement", "kibanaReact", "esUiShared"]
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/app.tsx b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
index 0e41b2043e8e0..dea2dcb185327 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
@@ -7,7 +7,7 @@
 
 import React, { useEffect } from 'react';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 
 import { useKibana, useExecutionContext } from '../shared_imports';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx b/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx
index 5015e724ee75d..e78679776f59e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/components/index_templates_flyout.tsx
@@ -18,8 +18,8 @@ import {
   EuiLink,
   EuiTitle,
 } from '@elastic/eui';
+import { getTemplateDetailsLink } from '@kbn/index-management-plugin/public';
 import { useKibana } from '../../shared_imports';
-import { getTemplateDetailsLink } from '../../../../index_management/public/';
 
 interface Props {
   policyName: string;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
index b9323a56529a3..c604679c4c7d8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
@@ -14,8 +14,8 @@ import {
   ApplicationStart,
   UnmountCallback,
   CoreTheme,
-} from 'src/core/public';
-import { DocLinksStart, ExecutionContextStart } from 'kibana/public';
+} from '@kbn/core/public';
+import { DocLinksStart, ExecutionContextStart } from '@kbn/core/public';
 
 import {
   CloudSetup,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
index 8905200779d23..75b32fa074870 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
@@ -21,7 +21,7 @@ import { useEditPolicyContext } from '../../../edit_policy_context';
 
 import { ROLLOVER_FORM_PATHS, isUsingDefaultRolloverPath } from '../../../constants';
 
-import { LearnMoreLink, DescribedFormRow } from '../../';
+import { LearnMoreLink, DescribedFormRow } from '../..';
 
 import {
   ForcemergeField,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx
index 01f10cf2d98ce..45cff38a60e17 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/no_custom_attributes_messages.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 export interface Props {
   docLinks: DocLinksStart;
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
index 04a57fd2d9ace..356eff73150b7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
@@ -17,7 +17,7 @@ import { useEditPolicyContext } from '../../../edit_policy_context';
 
 import { UseField } from '../../../form';
 
-import { LearnMoreLink, DescribedFormRow } from '../../';
+import { LearnMoreLink, DescribedFormRow } from '../..';
 
 interface Props {
   phase: 'hot' | 'warm';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
index ac15441a49590..fbf5dc5c5af4b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
@@ -14,7 +14,7 @@ import { EuiTextColor, EuiSpacer, EuiCallOut, EuiLink } from '@elastic/eui';
 import { useKibana, useFormData } from '../../../../../../../shared_imports';
 import { useEditPolicyContext } from '../../../../edit_policy_context';
 import { useConfiguration, UseField, globalFields } from '../../../../form';
-import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../../';
+import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../..';
 import { SearchableSnapshotDataProvider } from './searchable_snapshot_data_provider';
 import { RepositoryComboBoxField } from './repository_combobox_field';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
index adcc33fdc8697..e26b300d2c663 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
@@ -16,7 +16,7 @@ import { useEditPolicyContext } from '../../../edit_policy_context';
 import { UseField, useGlobalFields } from '../../../form';
 import { i18nTexts } from '../../../i18n_texts';
 
-import { LearnMoreLink, DescribedFormRow } from '../../';
+import { LearnMoreLink, DescribedFormRow } from '../..';
 import { byteSizeUnits } from '../../../constants';
 import { UnitField } from './unit_field';
 import { useKibana } from '../../../../../../shared_imports';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
index 791a70ae6212d..62f322e4f48f3 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
@@ -23,7 +23,7 @@ import { useLoadSnapshotPolicies } from '../../../../../services/api';
 
 import { UseField } from '../../../form';
 
-import { FieldLoadingError, LearnMoreLink, OptionalLabel } from '../../';
+import { FieldLoadingError, LearnMoreLink, OptionalLabel } from '../..';
 
 const waitForSnapshotFormField = 'phases.delete.actions.wait_for_snapshot.policy';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
index 0e760af8f1c1e..7ec02cbe3137c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useRef, useMemo, useCallback } from 'react';
 
 // We wrap this component for edit policy so we do not export it from the "shared_imports" dir to avoid
 // accidentally using the non-enhanced version.
-import { UseField } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+import { UseField } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 import { Phases } from '../../../../../../common/types';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx
index 0cbee8832c55b..12078f9c3f549 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/phase_timings_context.tsx
@@ -8,7 +8,7 @@
 import React, { createContext, FunctionComponent, useContext } from 'react';
 import { useFormData } from '../../../../shared_imports';
 import { FormInternal } from '../types';
-import { useGlobalFields } from './index';
+import { useGlobalFields } from '.';
 
 export interface PhaseTimingConfiguration {
   /**
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx
index 61ce87860d897..8a89759a4225e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/components/policy_table.tsx
@@ -14,7 +14,7 @@ import moment from 'moment';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { useHistory } from 'react-router-dom';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { PolicyFromES } from '../../../../../common/types';
 import { useKibana } from '../../../../shared_imports';
 import { getIndicesListPath, getPolicyEditPath } from '../../../services/navigation';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx
index 30d882e760297..386050adc65c8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_list/policy_list.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiButton, EuiEmptyPrompt, EuiSpacer, EuiPageHeader, EuiPageContent } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { PolicyFromES } from '../../../../common/types';
 import { PolicyTable } from './components/policy_table';
 import { getPolicyCreatePath } from '../../services/navigation';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
index a87138c46ccba..640460e9d9814 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
@@ -7,7 +7,7 @@
 
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { IndexSettings } from '../../../../index_management/common';
+import { IndexSettings } from '@kbn/index-management-plugin/common';
 
 import {
   PolicyFromES,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts
index 5fcc0054cdeb0..4e4303017dd9a 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { fatalErrors, toasts } from './notification';
 
 interface CommonErrorBody extends ResponseErrorBody {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts
index 62c8abc86f123..22f197bb9d855 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/breadcrumbs.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'kibana/public';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
index c828097fd94c9..9b82a6c071309 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
@@ -11,11 +11,8 @@
  * in future. The pattern in this file is legacy and should be updated to conform to the plugin lifecycle.
  */
 
-import { HttpSetup } from 'src/core/public';
-import {
-  UseRequestConfig,
-  useRequest as _useRequest,
-} from '../../../../../../src/plugins/es_ui_shared/public';
+import { HttpSetup } from '@kbn/core/public';
+import { UseRequestConfig, useRequest as _useRequest } from '@kbn/es-ui-shared-plugin/public';
 
 interface GenericObject {
   [key: string]: any;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
index 53b27161f9c57..f967f503a79a7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/navigation.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { getIndexListUri } from '../../../../index_management/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { getIndexListUri } from '@kbn/index-management-plugin/public';
 
 export const ROUTES = {
   list: '/policies',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
index 8ec008915a5b5..be0c5a77b4f04 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/notification.ts
@@ -11,7 +11,7 @@
  * in future. The pattern in this file is legacy and should be updated to conform to the plugin lifecycle.
  */
 
-import { IToasts, FatalErrorsSetup } from 'src/core/public';
+import { IToasts, FatalErrorsSetup } from '@kbn/core/public';
 
 export let toasts: IToasts;
 export let fatalErrors: FatalErrorsSetup;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
index 891109fd22027..e096be3fe3a95 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
@@ -10,7 +10,7 @@ import {
   UIM_CONFIG_WARM_PHASE,
   UIM_CONFIG_SET_PRIORITY,
   defaultIndexPriority,
-} from '../constants/';
+} from '../constants';
 
 import { getUiMetricsForPhases } from './ui_metric';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
index fa9a8d44e9774..45c15ea88b6fe 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -11,7 +11,7 @@
  * in future. The pattern in this file is legacy and should be updated to conform to the plugin lifecycle.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { UiCounterMetricType } from '@kbn/analytics';
 
 import {
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx
index 94071271eac2d..015c1576de5db 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/add_lifecycle_confirm_modal.tsx
@@ -9,7 +9,7 @@ import React, { Component, Fragment } from 'react';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
 import {
   EuiLink,
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx
index fa148a5ba960b..af3f16216813b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx
@@ -24,7 +24,7 @@ import {
   EuiPopoverTitle,
 } from '@elastic/eui';
 
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 import { getPolicyEditPath } from '../../application/services/navigation';
 import { Index, IndexLifecyclePolicy } from '../../../common/types';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx
index d3214b5851bf6..57434c71f1045 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { get, every, some } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiSearchBar } from '@elastic/eui';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
 
-import { IndexManagementPluginSetup } from '../../../index_management/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
 
 import { retryLifecycleForIndex } from '../application/services/api';
 import { IndexLifecycleSummary } from './components/index_lifecycle_summary';
diff --git a/x-pack/plugins/index_lifecycle_management/public/index.ts b/x-pack/plugins/index_lifecycle_management/public/index.ts
index 2b8573902781b..40f0a4fb6ebf7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { IndexLifecycleManagementPlugin } from './plugin';
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/locator.ts b/x-pack/plugins/index_lifecycle_management/public/locator.ts
index 4df7cf85ddebb..24599b6a6b47e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/locator.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 import {
   getPoliciesListPath,
   getPolicyCreatePath,
diff --git a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
index 3ab758c05b6e9..a1496a06fe8a8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, PluginInitializerContext, Plugin } from 'src/core/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import { CoreSetup, PluginInitializerContext, Plugin } from '@kbn/core/public';
 import { PLUGIN } from '../common/constants';
 import { init as initHttp } from './application/services/http';
 import { init as initUiMetric } from './application/services/ui_metric';
@@ -59,7 +58,7 @@ export class IndexLifecycleManagementPlugin
             executionContext,
           } = coreStart;
 
-          const license = await licensing.license$.pipe(first()).toPromise();
+          const license = await firstValueFrom(licensing.license$);
 
           docTitle.change(PLUGIN.TITLE);
           this.breadcrumbService.setup(setBreadcrumbs);
@@ -99,7 +98,7 @@ export class IndexLifecycleManagementPlugin
           icon: 'indexRollupApp',
           path: '/app/management/data/index_lifecycle_management',
           showOnHomePage: true,
-          category: FeatureCatalogueCategory.ADMIN,
+          category: 'admin',
           order: 640,
         });
       }
@@ -117,5 +116,6 @@ export class IndexLifecycleManagementPlugin
   }
 
   public start() {}
+
   public stop() {}
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
index f5a4356b9323e..30481afc2c24c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { useKibana as _useKibana } from '@kbn/kibana-react-plugin/public';
 import { AppServicesContext } from './types';
-import { useKibana as _useKibana } from '../../../../src/plugins/kibana_react/public';
 
 export type {
   FormHook,
@@ -19,7 +19,7 @@ export type {
   FormSchema,
   ValidationConfig,
   ValidationError,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   useForm,
@@ -28,9 +28,9 @@ export {
   getFieldValidityAndErrorMessage,
   useFormContext,
   UseMultiFields,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   ToggleField,
@@ -40,21 +40,21 @@ export {
   ComboBoxField,
   TextField,
   CheckBoxField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { attemptToURIDecode } from '../../../../src/plugins/es_ui_shared/public';
+export { attemptToURIDecode } from '@kbn/es-ui-shared-plugin/public';
 
 export {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export const useKibana = () => _useKibana<AppServicesContext>();
 
-export type { CloudSetup } from '../../cloud/public';
+export type { CloudSetup } from '@kbn/cloud-plugin/public';
 
-export type { ILicense } from '../../licensing/public';
+export type { ILicense } from '@kbn/licensing-plugin/public';
diff --git a/x-pack/plugins/index_lifecycle_management/public/types.ts b/x-pack/plugins/index_lifecycle_management/public/types.ts
index 6c8239fd44da3..40772dbe12884 100644
--- a/x-pack/plugins/index_lifecycle_management/public/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/types.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { DocLinksStart } from 'src/core/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { IndexManagementPluginSetup } from '../../index_management/public';
-import { SharePluginSetup } from '../../../../src/plugins/share/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { DocLinksStart } from '@kbn/core/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
 
-import { CloudSetup } from '../../cloud/public';
-import { LicensingPluginStart, ILicense } from '../../licensing/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
+import { LicensingPluginStart, ILicense } from '@kbn/licensing-plugin/public';
 
 import { BreadcrumbService } from './application/services/breadcrumbs';
 
diff --git a/x-pack/plugins/index_lifecycle_management/server/config.ts b/x-pack/plugins/index_lifecycle_management/server/config.ts
index 691cc06708bb5..737cc6a472c7a 100644
--- a/x-pack/plugins/index_lifecycle_management/server/config.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/index_lifecycle_management/server/index.ts b/x-pack/plugins/index_lifecycle_management/server/index.ts
index 6a74b4c80b2d3..2f4c3a4706534 100644
--- a/x-pack/plugins/index_lifecycle_management/server/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IndexLifecycleManagementServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
index e8f675ea7e674..011825ed9bf77 100644
--- a/x-pack/plugins/index_lifecycle_management/server/plugin.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
-import { IScopedClusterClient } from 'kibana/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
-import { Index as IndexWithoutIlm } from '../../index_management/common/types';
+import { Index as IndexWithoutIlm } from '@kbn/index-management-plugin/common/types';
 import { PLUGIN } from '../common/constants';
 import { Index } from '../common/types';
 import { Dependencies } from './types';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
index a18459d5d21b9..da4668ab3ead3 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_add_policy_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
index ef9fc66b359ba..08ea60cb806ae 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_remove_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
index a7857eae46c1a..d229e82504c9d 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/index/register_retry_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
index 5ac37f4eeb215..909f6ca7bf5a8 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
index eed36962a78e5..9927f093aef25 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
index ed292579e12cc..09f28679d58b2 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_fetch_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { TransportResult } from '@elastic/elasticsearch';
 
 import { PolicyFromES, SerializedPolicy } from '../../../../common/types';
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts
index 6003ddf712a70..ebe8a2388a025 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_policies/register_fetch_route.ts
@@ -5,24 +5,16 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
-
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
-async function fetchSnapshotPolicies(client: ElasticsearchClient): Promise<any> {
-  const response = await client.slm.getLifecycle();
-  return response.body;
-}
-
 export function registerFetchRoute({ router, license, lib: { handleEsError } }: RouteDependencies) {
   router.get(
     { path: addBasePath('/snapshot_policies'), validate: false },
     license.guardApiRoute(async (context, request, response) => {
       try {
-        const policiesByName = await fetchSnapshotPolicies(
-          context.core.elasticsearch.client.asCurrentUser
-        );
+        const policiesByName =
+          await context.core.elasticsearch.client.asCurrentUser.slm.getLifecycle();
         return response.ok({ body: Object.keys(policiesByName) });
       } catch (error) {
         return handleEsError({ error, response });
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts
index 8787be8e936ba..a4bdbd5fc7afc 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/snapshot_repositories/register_fetch_route.ts
@@ -32,7 +32,7 @@ export const registerFetchRoute = ({ router, license }: RouteDependencies) => {
           name: '*',
         });
         const repos: ListSnapshotReposResponse = {
-          repositories: Object.keys(esResult.body),
+          repositories: Object.keys(esResult),
         };
         return response.ok({ body: repos });
       } catch (e) {
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
index 4b28ee885ec7c..8b8b50834c69a 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_add_policy_route.ts
@@ -7,11 +7,11 @@
 
 import { merge } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 
-import { TemplateFromEs, TemplateSerialized } from '../../../../../index_management/common/types';
-import { LegacyTemplateSerialized } from '../../../../../index_management/server';
+import { TemplateFromEs, TemplateSerialized } from '@kbn/index-management-plugin/common/types';
+import { LegacyTemplateSerialized } from '@kbn/index-management-plugin/server';
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
index b14dd17d3c11c..dfa3f0c6b64c9 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/templates/register_fetch_route.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
 import {
   IndexSettings,
   LegacyTemplateSerialized,
   TemplateFromEs,
-} from '../../../../../index_management/common/types';
+} from '@kbn/index-management-plugin/common/types';
 import { RouteDependencies } from '../../../types';
 import { addBasePath } from '../../../services';
 
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/index.ts b/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
index 8af612ebfa23e..82a7d350eb54d 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/index.ts
@@ -7,7 +7,7 @@
 
 import { RouteDependencies } from '../types';
 
-import { registerIndexRoutes } from './api/index';
+import { registerIndexRoutes } from './api/index/index';
 import { registerNodesRoutes } from './api/nodes';
 import { registerPoliciesRoutes } from './api/policies';
 import { registerTemplatesRoutes } from './api/templates';
diff --git a/x-pack/plugins/index_lifecycle_management/server/services/license.ts b/x-pack/plugins/index_lifecycle_management/server/services/license.ts
index 4dd33f96b7874..e51ecac56327e 100644
--- a/x-pack/plugins/index_lifecycle_management/server/services/license.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/services/license.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { LicenseType, ILicense } from '../shared_imports';
 
 export interface LicenseStatus {
diff --git a/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts
index 4598814d63c02..d5c4585231800 100644
--- a/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export type { ILicense, LicenseType } from '../../licensing/common/types';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
diff --git a/x-pack/plugins/index_lifecycle_management/server/types.ts b/x-pack/plugins/index_lifecycle_management/server/types.ts
index c003c7604596f..dcffbaded6b5c 100644
--- a/x-pack/plugins/index_lifecycle_management/server/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { IndexManagementPluginSetup } from '../../index_management/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
 import { License } from './services';
 import { IndexLifecycleManagementConfig } from './config';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts
index 2be3d9c9460cf..c49d3ccaba890 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 
 type HttpResponse = Record<string, any> | any[];
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
index b469b0293123d..b9f20307a67a9 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,15 +9,15 @@ import React from 'react';
 import { merge } from 'lodash';
 import SemVer from 'semver/classes/semver';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   uiSettingsServiceMock,
   executionContextServiceMock,
-} from '../../../../../../src/core/public/mocks';
-import { GlobalFlyout } from '../../../../../../src/plugins/es_ui_shared/public';
-import { createKibanaReactContext } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public/mocks';
+import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 
 import { MAJOR_VERSION } from '../../../common';
 import { AppContextProvider } from '../../../public/application/app_context';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
index 9eeab1d3ca78b..e38359a6d9f37 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
@@ -15,7 +15,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { DataStream } from '../../../common';
 import { IndexManagementHome } from '../../../public/application/sections/home';
 import { indexManagementStore } from '../../../public/application/store';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts
index b73985dc8372b..25b1f985d441b 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/home.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { IndexManagementHome } from '../../../public/application/sections/home';
 import { indexManagementStore } from '../../../public/application/store';
 import { WithAppDependencies, services, TestSubjects } from '../helpers';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts
index a16ba0768e675..e992ff4e3b589 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/index_templates_tab.helpers.ts
@@ -13,7 +13,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateList } from '../../../public/application/sections/home/template_list';
 import { TemplateDeserialized } from '../../../common';
 import { WithAppDependencies, TestSubjects } from '../helpers';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
index 5feb7840f259c..008dcf9b25b80 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.helpers.ts
@@ -14,7 +14,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { IndexManagementHome } from '../../../public/application/sections/home';
 import { indexManagementStore } from '../../../public/application/store';
 import { WithAppDependencies, services, TestSubjects } from '../helpers';
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
index 541f2b587b69f..cbf2bc4df7dd2 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/home/indices_tab.test.ts
@@ -18,7 +18,7 @@ import { createDataStreamPayload, createNonDataStreamIndex } from './data_stream
 // mocking the returned instance of the editor to always have the same values.
 const mockGetAceEditorValue = jest.fn().mockReturnValue(`{}`);
 
-jest.mock('../../../public/application/lib/ace.js', () => {
+jest.mock('../../../public/application/lib/ace', () => {
   const createAceEditor = () => {
     return {
       getValue: mockGetAceEditorValue,
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts
index 2ee82c2b4c418..d6d1b51e4621a 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_clone.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateClone } from '../../../public/application/sections/template_clone';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts
index e57e89a6762c2..c495d458205d1 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_create.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateCreate } from '../../../public/application/sections/template_create';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts
index 97166970568d3..04e963ec271ed 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { TemplateEdit } from '../../../public/application/sections/template_edit';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
index bf5ab6541bad8..740e19bc62671 100644
--- a/x-pack/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -8,10 +8,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
-import axios from 'axios';
-import sinon from 'sinon';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
 /**
  * The below import is required to avoid a console error warn from brace package
@@ -20,8 +17,9 @@ import axiosXhrAdapter from 'axios/lib/adapters/xhr';
           at createWorker (/<path-to-repo>/node_modules/brace/index.js:17992:5)
  */
 import { mountWithIntl, stubWebWorker } from '@kbn/test-jest-helpers'; // eslint-disable-line no-unused-vars
+import { init as initHttpRequests } from '../client_integration/helpers/http_requests';
 
-import { BASE_PATH, API_BASE_PATH } from '../../common/constants';
+import { BASE_PATH } from '../../common/constants';
 import { AppWithoutRouter } from '../../public/application/app';
 import { AppContextProvider } from '../../public/application/app_context';
 import { loadIndicesSuccess } from '../../public/application/store/actions';
@@ -35,14 +33,8 @@ import { setExtensionsService } from '../../public/application/store/selectors/e
 import { ExtensionsService } from '../../public/services';
 import { kibanaVersion } from '../client_integration/helpers';
 
-import {
-  notificationServiceMock,
-  executionContextServiceMock,
-} from '../../../../../src/core/public/mocks';
+import { notificationServiceMock, executionContextServiceMock } from '@kbn/core/public/mocks';
 
-const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
-
-let server = null;
 let store = null;
 const indices = [];
 
@@ -149,6 +141,8 @@ const getActionMenuButtons = (rendered) => {
     .map((span) => span.text());
 };
 describe('index table', () => {
+  const { httpSetup, httpRequestsMockHelpers } = initHttpRequests();
+
   beforeEach(() => {
     // Mock initialization of services
     const services = {
@@ -159,8 +153,7 @@ describe('index table', () => {
     setExtensionsService(services.extensionsService);
     setUiMetricService(services.uiMetricService);
 
-    // @ts-ignore
-    httpService.setup(mockHttpClient);
+    httpService.setup(httpSetup);
     breadcrumbService.setup(() => undefined);
     notificationService.setup(notificationServiceMock.createStartContract());
 
@@ -186,33 +179,9 @@ describe('index table', () => {
     );
 
     store.dispatch(loadIndicesSuccess({ indices }));
-    server = sinon.fakeServer.create();
-
-    server.respondWith(`${API_BASE_PATH}/indices`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(indices),
-    ]);
-
-    server.respondWith([
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify({ acknowledged: true }),
-    ]);
-
-    server.respondWith(`${API_BASE_PATH}/indices/reload`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(indices),
-    ]);
-
-    server.respondImmediately = true;
-  });
-  afterEach(() => {
-    if (!server) {
-      return;
-    }
-    server.restore();
+
+    httpRequestsMockHelpers.setLoadIndicesResponse(indices);
+    httpRequestsMockHelpers.setReloadIndicesResponse(indices);
   });
 
   test('should change pages when a pagination link is clicked on', async () => {
@@ -476,22 +445,17 @@ describe('index table', () => {
   });
 
   test('close index button works from context menu', async () => {
-    const rendered = mountWithIntl(component);
-    await runAllPromises();
-    rendered.update();
-
     const modifiedIndices = indices.map((index) => {
       return {
         ...index,
         status: index.name === 'testy0' ? 'close' : index.status,
       };
     });
+    httpRequestsMockHelpers.setReloadIndicesResponse(modifiedIndices);
 
-    server.respondWith(`${API_BASE_PATH}/indices/reload`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(modifiedIndices),
-    ]);
+    const rendered = mountWithIntl(component);
+    await runAllPromises();
+    rendered.update();
 
     testAction(rendered, 'closeIndexMenuButton');
   });
@@ -503,16 +467,12 @@ describe('index table', () => {
         status: index.name === 'testy1' ? 'closed' : index.status,
       };
     });
-
-    server.respondWith(`${API_BASE_PATH}/indices`, [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(modifiedIndices),
-    ]);
+    httpRequestsMockHelpers.setLoadIndicesResponse(modifiedIndices);
 
     const rendered = mountWithIntl(component);
     await runAllPromises();
     rendered.update();
+
     testAction(rendered, 'openIndexMenuButton', 'testy1');
   });
 
diff --git a/x-pack/plugins/index_management/common/constants/plugin.ts b/x-pack/plugins/index_management/common/constants/plugin.ts
index 64619afcfb11b..ddbe0f0c2403c 100644
--- a/x-pack/plugins/index_management/common/constants/plugin.ts
+++ b/x-pack/plugins/index_management/common/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/index_management/public/application/app.tsx b/x-pack/plugins/index_management/public/application/app.tsx
index f52479f41708b..52aad9756f855 100644
--- a/x-pack/plugins/index_management/public/application/app.tsx
+++ b/x-pack/plugins/index_management/public/application/app.tsx
@@ -9,7 +9,7 @@ import React, { useEffect } from 'react';
 
 import { METRIC_TYPE } from '@kbn/analytics';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { UIM_APP_LOAD } from '../../common/constants';
 import { useExecutionContext } from '../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/app_context.tsx b/x-pack/plugins/index_management/public/application/app_context.tsx
index e5120fff11627..76a91dd82819d 100644
--- a/x-pack/plugins/index_management/public/application/app_context.tsx
+++ b/x-pack/plugins/index_management/public/application/app_context.tsx
@@ -8,8 +8,8 @@
 import React, { createContext, useContext } from 'react';
 import { Observable } from 'rxjs';
 import SemVer from 'semver/classes/semver';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import {
   ApplicationStart,
   CoreTheme,
@@ -18,8 +18,8 @@ import {
   DocLinksStart,
   IUiSettingsClient,
   ExecutionContextStart,
-} from 'src/core/public';
-import { SharePluginStart } from 'src/plugins/share/public';
+} from '@kbn/core/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
 import { ExtensionsService } from '../services';
 import { UiMetricService, NotificationService, HttpService } from './services';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
index 81f43a1b46073..01a82696d9aea 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_create.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 
-import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 import '../../../../../../test/global_mocks';
 import { setupEnvironment } from './helpers';
 import { API_BASE_PATH } from './helpers/constants';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts
index 846c921e776c3..2cdc974dde0ed 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_create.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_PATH } from '../../../../../../../common';
 import { ComponentTemplateCreate } from '../../../component_template_wizard';
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
index 18fe2b59f21c6..e2f41bbe246f2 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { WithAppDependencies } from './setup_environment';
 import { ComponentTemplateDetailsFlyoutContent } from '../../../component_template_details';
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts
index dfc73e0ccafb0..e9afc7e5efb20 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_PATH } from '../../../../../../../common';
 import { ComponentTemplateEdit } from '../../../component_template_wizard';
 
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts
index 3005eae0d6bf1..9fec92812fd1a 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_list.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   registerTestBed,
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts
index 025f34066908c..f3019e12eea9c 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from './constants';
 
 type HttpResponse = Record<string, any> | any[];
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
index b3da9622ce984..8fcae47fc494e 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
@@ -7,15 +7,15 @@
 
 import React from 'react';
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   applicationServiceMock,
   executionContextServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 
-import { GlobalFlyout } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
+import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
 import { AppContextProvider } from '../../../../../app_context';
 import { MappingsEditorProvider } from '../../../../mappings_editor';
 import { ComponentTemplatesProvider } from '../../../component_templates_context';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx
index c314dd1ce0b99..548c6ba114ab8 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx
@@ -10,7 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 
 import {
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx
index 32b093a9caf07..5b59523ff2548 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx
@@ -18,7 +18,7 @@ import {
   EuiLink,
   EuiBadge,
 } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { ComponentTemplateListItem, reactRouterNavigate } from '../shared_imports';
 import { UIM_COMPONENT_TEMPLATE_DETAILS } from '../constants';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx
index d652cca47e1d1..e67d5fe122a34 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_templates_context.tsx
@@ -14,8 +14,8 @@ import {
   NotificationsSetup,
   CoreStart,
   ExecutionContextStart,
-} from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+} from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { getApi, getUseRequest, getSendRequest, getDocumentation, getBreadcrumbs } from './lib';
 
 const ComponentTemplatesContext = createContext<Context | undefined>(undefined);
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts b/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts
index 3357ede3e62c5..7b162487f1475 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/lib/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 export const getBreadcrumbs = (setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']) => {
   const baseBreadcrumbs = [
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts b/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts
index 185e521e4a5b8..83118271a5cde 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/lib/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const getDocumentation = ({ links }: DocLinksStart) => {
   const esDocsBase = links.elasticsearch.docsBase;
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts b/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts
index 92847bbe5dc05..7bb4b90da2fed 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/lib/request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   UseRequestConfig,
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts b/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts
index d205a7436d00e..64ee7a16ef2fb 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/shared_imports.ts
@@ -11,7 +11,7 @@ export type {
   SendRequestConfig,
   SendRequestResponse,
   Error,
-} from '../../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 export {
   sendRequest,
   useRequest,
@@ -26,33 +26,30 @@ export {
   Forms,
   GlobalFlyout,
   attemptToURIDecode,
-} from '../../../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   serializers,
   fieldValidators,
   fieldFormatters,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
+} from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export type {
-  FormSchema,
-  FieldConfig,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+export type { FormSchema, FieldConfig } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   FIELD_TYPES,
   VALIDATION_TYPES,
   useForm,
   Form,
   getUseField,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   getFormRow,
   Field,
   JsonEditorField,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { isJSON } from '../../../../../../../src/plugins/es_ui_shared/static/validators/string';
+export { isJSON } from '@kbn/es-ui-shared-plugin/static/validators/string';
 
 export type { CommonWizardSteps } from '../shared';
 export {
@@ -72,7 +69,4 @@ export type {
 
 export { serializeComponentTemplate } from '../../../../common/lib';
 
-export {
-  reactRouterNavigate,
-  useExecutionContext,
-} from '../../../../../../../src/plugins/kibana_react/public';
+export { reactRouterNavigate, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx b/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx
index 165288fa5946a..ac3beaa7b0b52 100644
--- a/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx
+++ b/x-pack/plugins/index_management/public/application/components/index_templates/legacy_index_template_deprecation.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { reactRouterNavigate } from '../../../shared_imports';
 import { documentationService } from '../../services/documentation';
 
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
index 3cc3c8997a83c..85bd92461b001 100644
--- 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
@@ -10,6 +10,6 @@ export {
   Form,
   getUseField,
   FormDataProvider,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { CheckBoxField } from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
+export { CheckBoxField } from '@kbn/es-ui-shared-plugin/static/forms/components';
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
index 49922b45f2fde..76bc66b2f1df8 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,12 +9,9 @@ import React, { ComponentType, MemoExoticComponent } from 'react';
 import SemVer from 'semver/classes/semver';
 
 /* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
-import '../../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
-import { GlobalFlyout } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
-import {
-  docLinksServiceMock,
-  uiSettingsServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
+import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
+import { docLinksServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { MAJOR_VERSION } from '../../../../../../../common';
 import { MappingsEditorProvider } from '../../../mappings_editor_context';
 import { createKibanaReactContext } from '../../../shared_imports';
@@ -52,10 +49,8 @@ jest.mock('@elastic/eui', () => {
   };
 });
 
-jest.mock('../../../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual(
-    '../../../../../../../../../../src/plugins/kibana_react/public'
-  );
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   const CodeEditorMock = (props: any) => (
     <input
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx
index 8ef59302f6a01..41419d127e16b 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/alias_type.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 
 import { PathParameter } from '../../../field_parameters';
-import { ComponentProps } from './index';
+import { ComponentProps } from '.';
 
 export const AliasTypeRequiredParameters = ({ allFields }: ComponentProps) => {
   return <PathParameter allFields={allFields} />;
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 2db0d2b6c544b..83a6ceeab88f4 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
@@ -7,7 +7,7 @@
 
 import React, { useEffect, useMemo } from 'react';
 
-import { useKibana } from '../../../../../../index';
+import { useKibana } from '../../../../../..';
 import { useForm } from '../../../../shared_imports';
 import { useDispatch, useMappingsState } from '../../../../mappings_state_context';
 import { Field } from '../../../../types';
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
index c2502f14facfb..2965fd1cec670 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 
 jest.mock('lodash', () => {
   const original = jest.requireActual('lodash');
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts
index 61c9a8dfe4f1c..418a90f27220f 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/search_fields.test.ts
@@ -7,7 +7,7 @@
 
 import { searchFields } from './search_fields';
 import { NormalizedField } from '../types';
-import { getUniqueId } from '../lib';
+import { getUniqueId } from '.';
 
 const irrelevantProps = {
   canHaveChildFields: false,
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts
index de9c1985239f5..fb152a41db568 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/shared_imports.ts
@@ -15,7 +15,7 @@ export type {
   ArrayItem,
   ValidationFunc,
   ValidationFuncArg,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   FIELD_TYPES,
   Form,
@@ -27,7 +27,7 @@ export {
   useFormContext,
   UseMultiFields,
   VALIDATION_TYPES,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   CheckBoxField,
@@ -42,24 +42,21 @@ export {
   ComboBoxField,
   ToggleField,
   JsonEditorField,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export {
-  fieldFormatters,
-  fieldValidators,
-} from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldFormatters, fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export type { OnJsonEditorUpdateHandler } from '../../../../../../../src/plugins/es_ui_shared/public';
-export { JsonEditor, GlobalFlyout } from '../../../../../../../src/plugins/es_ui_shared/public';
+export type { OnJsonEditorUpdateHandler } from '@kbn/es-ui-shared-plugin/public';
+export { JsonEditor, GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
 
 export { documentationService } from '../../services/documentation';
 
 export type {
   RuntimeField,
   RuntimeFieldEditorFlyoutContentProps,
-} from '../../../../../runtime_fields/public';
-export { RuntimeFieldEditorFlyoutContent } from '../../../../../runtime_fields/public';
+} from '@kbn/runtime-fields-plugin/public';
+export { RuntimeFieldEditorFlyoutContent } from '@kbn/runtime-fields-plugin/public';
 
-export { createKibanaReactContext } from '../../../../../../../src/plugins/kibana_react/public';
+export { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 
-export type { DocLinksStart } from '../../../../../../../src/core/public';
+export type { DocLinksStart } from '@kbn/core/public';
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 03b3452642c96..725d770c4bdb7 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
@@ -9,7 +9,7 @@ import React, { useState, useCallback, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSpacer, EuiButton, EuiPageHeader } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateDeserialized } from '../../../../common';
 import { serializers, Forms, GlobalFlyout } from '../../../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/index.tsx b/x-pack/plugins/index_management/public/application/index.tsx
index 5477e7702ef6f..5067e47fc4a81 100644
--- a/x-pack/plugins/index_management/public/application/index.tsx
+++ b/x-pack/plugins/index_management/public/application/index.tsx
@@ -10,7 +10,7 @@ import { Provider } from 'react-redux';
 import { render, unmountComponentAtNode } from 'react-dom';
 import SemVer from 'semver/classes/semver';
 
-import { CoreStart, CoreSetup } from '../../../../../src/core/public';
+import { CoreStart, CoreSetup } from '@kbn/core/public';
 
 import { API_BASE_PATH } from '../../common';
 import {
diff --git a/x-pack/plugins/index_management/public/application/mount_management_section.ts b/x-pack/plugins/index_management/public/application/mount_management_section.ts
index 7562f5e410750..a0df94324ccde 100644
--- a/x-pack/plugins/index_management/public/application/mount_management_section.ts
+++ b/x-pack/plugins/index_management/public/application/mount_management_section.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import SemVer from 'semver/classes/semver';
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 import { UIM_APP_NAME } from '../../common/constants';
 import { PLUGIN } from '../../common/constants/plugin';
diff --git a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
index a9e21c4d28bbb..9ff009c9d6101 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_list.tsx
@@ -20,7 +20,7 @@ import {
   EuiEmptyPrompt,
   EuiLink,
 } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import {
   PageLoading,
diff --git a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
index 44ffe4741e471..8e070ae7fe125 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/data_stream_list/data_stream_table/data_stream_table.tsx
@@ -9,7 +9,7 @@ import React, { useState, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiInMemoryTable, EuiBasicTableColumn, EuiButton, EuiLink } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { DataStream } from '../../../../../../common/types';
 import { UseRequestResponse, reactRouterNavigate } from '../../../../../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx
index cd7615ddfb1b9..136fa6a63fa41 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/legacy_templates/template_table/template_table.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiInMemoryTable, EuiButton, EuiLink, EuiBasicTableColumn } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { UseRequestResponse, reactRouterNavigate } from '../../../../../../shared_imports';
 import { TemplateListItem } from '../../../../../../../common';
 import { UIM_TEMPLATE_SHOW_DETAILS_CLICK } from '../../../../../../../common/constants';
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx
index c29fbfde16f5d..111ff83a14edd 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_list.tsx
@@ -10,7 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 import {
   EuiEmptyPrompt,
   EuiSpacer,
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
index 08b00b8376520..8a6ed8ac079a2 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { EuiInMemoryTable, EuiBasicTableColumn, EuiButton, EuiLink, EuiIcon } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateListItem } from '../../../../../../common';
 import { UIM_TEMPLATE_SHOW_DETAILS_CLICK } from '../../../../../../common/constants';
diff --git a/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx b/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx
index 5c871a8f8cef5..97b4c48c19b01 100644
--- a/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/template_clone/template_clone.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContentBody } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { PageLoading, PageError, Error } from '../../../shared_imports';
 import { TemplateDeserialized } from '../../../../common';
diff --git a/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx b/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx
index 31646164a6623..691af04ec8d11 100644
--- a/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/template_create/template_create.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContentBody } from '@elastic/eui';
 import { useLocation } from 'react-router-dom';
 import { parse } from 'query-string';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateDeserialized } from '../../../../common';
 import { TemplateForm } from '../../components';
diff --git a/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx b/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx
index e15e25d88df2e..e585bd2bbd056 100644
--- a/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/template_edit/template_edit.tsx
@@ -10,7 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPageContentBody, EuiSpacer, EuiCallOut } from '@elastic/eui';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { TemplateDeserialized } from '../../../../common';
 import { PageError, PageLoading, attemptToURIDecode, Error } from '../../../shared_imports';
diff --git a/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts b/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts
index 96aece6bd64d8..75ad96d276b90 100644
--- a/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts
+++ b/x-pack/plugins/index_management/public/application/services/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/index_management/public/application/services/documentation.ts b/x-pack/plugins/index_management/public/application/services/documentation.ts
index 1bb8faa5e51ba..20280695c775a 100644
--- a/x-pack/plugins/index_management/public/application/services/documentation.ts
+++ b/x-pack/plugins/index_management/public/application/services/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from '../../../../../../src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { DataType } from '../components/mappings_editor/types';
 import { TYPE_DEFINITION } from '../components/mappings_editor/constants';
 
diff --git a/x-pack/plugins/index_management/public/application/services/http.ts b/x-pack/plugins/index_management/public/application/services/http.ts
index 19800d3b5a8c5..c4fe4ba6ac6b6 100644
--- a/x-pack/plugins/index_management/public/application/services/http.ts
+++ b/x-pack/plugins/index_management/public/application/services/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 export class HttpService {
   private client: any;
diff --git a/x-pack/plugins/index_management/public/application/services/notification.ts b/x-pack/plugins/index_management/public/application/services/notification.ts
index 866989d207e27..dcce95e0db38b 100644
--- a/x-pack/plugins/index_management/public/application/services/notification.ts
+++ b/x-pack/plugins/index_management/public/application/services/notification.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { NotificationsStart } from '../../../../../../src/core/public';
+import { NotificationsStart } from '@kbn/core/public';
 
 export class NotificationService {
   private _toasts: any;
diff --git a/x-pack/plugins/index_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_management/public/application/services/ui_metric.ts
index 16e8f7a4cf1a4..5b9e145ed9286 100644
--- a/x-pack/plugins/index_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_management/public/application/services/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UsageCollectionSetup } from '../../../../../../src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 let uiMetricService: UiMetricService;
 
diff --git a/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts b/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts
index d60cd1cf8aabf..88c2c4424684e 100644
--- a/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts
+++ b/x-pack/plugins/index_management/public/application/services/use_ilm_locator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useLocatorUrl } from '../../../../../../src/plugins/share/public';
+import { useLocatorUrl } from '@kbn/share-plugin/public';
 import { useAppContext } from '../app_context';
 import { ILM_LOCATOR_ID } from '../constants';
 
diff --git a/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js b/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js
index 179aa73b4f0a8..3a64adb7f576d 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/clear_cache_indices.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { clearCacheIndices as request } from '../../services';
 import { notificationService } from '../../services/notification';
 
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 
 export const clearCacheIndicesStart = createAction('INDEX_MANAGEMENT_CLEAR_CACHE_INDICES_START');
 export const clearCacheIndices =
diff --git a/x-pack/plugins/index_management/public/application/store/actions/close_indices.js b/x-pack/plugins/index_management/public/application/store/actions/close_indices.js
index 1669d6b1b022f..ed88e3ec7f433 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/close_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/close_indices.js
@@ -9,7 +9,7 @@ import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { closeIndices as request } from '../../services';
 import { notificationService } from '../../services/notification';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 
 export const closeIndicesStart = createAction('INDEX_MANAGEMENT_CLOSE_INDICES_START');
 export const closeIndices =
diff --git a/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js b/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js
index 307c359b0fe21..235fa84f7f545 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/delete_indices.js
@@ -9,7 +9,7 @@ import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { deleteIndices as request } from '../../services';
 import { notificationService } from '../../services/notification';
-import { clearRowStatus } from '../actions';
+import { clearRowStatus } from '.';
 
 export const deleteIndicesSuccess = createAction('INDEX_MANAGEMENT_DELETE_INDICES_SUCCESS');
 export const deleteIndices =
diff --git a/x-pack/plugins/index_management/public/application/store/actions/extension_action.js b/x-pack/plugins/index_management/public/application/store/actions/extension_action.js
index eda9d32d75fba..0fb49eea24b4d 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/extension_action.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/extension_action.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { reloadIndices } from '../actions';
+import { reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 import { httpService } from '../../services/http';
 
diff --git a/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js b/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js
index 364b87e9f2bb7..0de326f4b1b72 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/flush_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { flushIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const flushIndicesStart = createAction('INDEX_MANAGEMENT_FLUSH_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js b/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js
index 60f5da7d4925d..1bbbc976d55c4 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/forcemerge_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { forcemergeIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const forcemergeIndicesStart = createAction('INDEX_MANAGEMENT_FORCEMERGE_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/open_indices.js b/x-pack/plugins/index_management/public/application/store/actions/open_indices.js
index 73a4a3350b841..63d0bb6d984eb 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/open_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/open_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { openIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const openIndicesStart = createAction('INDEX_MANAGEMENT_OPEN_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js b/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js
index 77944344c47c7..ec95389ceb198 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/refresh_indices.js
@@ -9,7 +9,7 @@ import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 
 import { refreshIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const refreshIndicesStart = createAction('INDEX_MANAGEMENT_REFRESH_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js b/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js
index 96d38c48f240d..24b3a2a498245 100644
--- a/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js
+++ b/x-pack/plugins/index_management/public/application/store/actions/unfreeze_indices.js
@@ -8,7 +8,7 @@
 import { createAction } from 'redux-actions';
 import { i18n } from '@kbn/i18n';
 import { unfreezeIndices as request } from '../../services';
-import { clearRowStatus, reloadIndices } from '../actions';
+import { clearRowStatus, reloadIndices } from '.';
 import { notificationService } from '../../services/notification';
 
 export const unfreezeIndicesStart = createAction('INDEX_MANAGEMENT_UNFREEZE_INDICES_START');
diff --git a/x-pack/plugins/index_management/public/application/store/store.js b/x-pack/plugins/index_management/public/application/store/store.js
index bdacc170418b9..012574c934ff4 100644
--- a/x-pack/plugins/index_management/public/application/store/store.js
+++ b/x-pack/plugins/index_management/public/application/store/store.js
@@ -9,7 +9,7 @@ import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
 import { defaultTableState } from './reducers/table_state';
 
-import { getReducer } from './reducers/';
+import { getReducer } from './reducers';
 
 export function indexManagementStore(services) {
   const toggleNameToVisibleMap = {};
diff --git a/x-pack/plugins/index_management/public/index.ts b/x-pack/plugins/index_management/public/index.ts
index 01635ed2a9b8f..b8cde1fdf36e7 100644
--- a/x-pack/plugins/index_management/public/index.ts
+++ b/x-pack/plugins/index_management/public/index.ts
@@ -6,7 +6,7 @@
  */
 
 import './index.scss';
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { IndexMgmtUIPlugin } from './plugin';
 
 /** @public */
diff --git a/x-pack/plugins/index_management/public/plugin.ts b/x-pack/plugins/index_management/public/plugin.ts
index 2394167ca61b2..a63ee693aa19f 100644
--- a/x-pack/plugins/index_management/public/plugin.ts
+++ b/x-pack/plugins/index_management/public/plugin.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import SemVer from 'semver/classes/semver';
 
-import { CoreSetup, PluginInitializerContext } from '../../../../src/core/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 import { setExtensionsService } from './application/store/selectors/extension_service';
 
 import { ExtensionsService } from './services';
diff --git a/x-pack/plugins/index_management/public/shared_imports.ts b/x-pack/plugins/index_management/public/shared_imports.ts
index 210eb30cc82da..8be95e6e7cef9 100644
--- a/x-pack/plugins/index_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/shared_imports.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export type {
   SendRequestConfig,
@@ -13,7 +13,7 @@ export type {
   UseRequestConfig,
   UseRequestResponse,
   Error,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   sendRequest,
@@ -26,12 +26,9 @@ export {
   PageError,
   SectionLoading,
   EuiCodeEditor,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export type {
-  FormSchema,
-  FieldConfig,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+export type { FormSchema, FieldConfig } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   FIELD_TYPES,
@@ -42,22 +39,22 @@ export {
   getUseField,
   UseField,
   FormDataProvider,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   fieldFormatters,
   fieldValidators,
   serializers,
-} from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+} from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   getFormRow,
   Field,
   ToggleField,
   JsonEditorField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export { isJSON } from '../../../../src/plugins/es_ui_shared/static/validators/string';
+export { isJSON } from '@kbn/es-ui-shared-plugin/static/validators/string';
 
 export {
   createKibanaReactContext,
@@ -65,4 +62,4 @@ export {
   useKibana,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/index_management/public/types.ts b/x-pack/plugins/index_management/public/types.ts
index e0af6b160cf11..57c7e11b6262b 100644
--- a/x-pack/plugins/index_management/public/types.ts
+++ b/x-pack/plugins/index_management/public/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import { ExtensionsSetup } from './services';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { SharePluginStart } from '../../../../src/plugins/share/public';
 
 export interface IndexManagementPluginSetup {
   extensionsService: ExtensionsSetup;
diff --git a/x-pack/plugins/index_management/server/config.ts b/x-pack/plugins/index_management/server/config.ts
index 88a714db5edca..157d6d3da8737 100644
--- a/x-pack/plugins/index_management/server/config.ts
+++ b/x-pack/plugins/index_management/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/index_management/server/index.ts b/x-pack/plugins/index_management/server/index.ts
index 8eb882d29de2d..ab6b0741274ff 100644
--- a/x-pack/plugins/index_management/server/index.ts
+++ b/x-pack/plugins/index_management/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { IndexMgmtServerPlugin } from './plugin';
 
diff --git a/x-pack/plugins/index_management/server/lib/fetch_indices.ts b/x-pack/plugins/index_management/server/lib/fetch_indices.ts
index 78d74fe630055..8635b9fd4f196 100644
--- a/x-pack/plugins/index_management/server/lib/fetch_indices.ts
+++ b/x-pack/plugins/index_management/server/lib/fetch_indices.ts
@@ -6,9 +6,9 @@
  */
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { IndexDataEnricher } from '../services';
-import { Index } from '../index';
+import { Index } from '..';
 
 async function fetchIndicesCall(
   client: IScopedClusterClient,
diff --git a/x-pack/plugins/index_management/server/lib/get_managed_templates.ts b/x-pack/plugins/index_management/server/lib/get_managed_templates.ts
index c224799a8c35c..7ed38224dcac8 100644
--- a/x-pack/plugins/index_management/server/lib/get_managed_templates.ts
+++ b/x-pack/plugins/index_management/server/lib/get_managed_templates.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 // Cloud has its own system for managing templates and we want to make
 // this clear in the UI when a template is used in a Cloud deployment.
diff --git a/x-pack/plugins/index_management/server/plugin.ts b/x-pack/plugins/index_management/server/plugin.ts
index a339349c0a5a9..a36101ad2911e 100644
--- a/x-pack/plugins/index_management/server/plugin.ts
+++ b/x-pack/plugins/index_management/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN } from '../common/constants/plugin';
 import { Dependencies } from './types';
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts
index 296dcd726e52a..cc98035f37c5c 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_create_route.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import { serializeComponentTemplate } from '../../../../common/lib';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { componentTemplateSchema } from './schema_validation';
 
 export const registerCreateRoute = ({
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts
index 67991ec708946..34a644d607162 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   names: schema.string(),
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts
index 9e54e80c71484..caca3c8ce853f 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_get_route.ts
@@ -13,7 +13,7 @@ import {
 } from '../../../../common/lib';
 import { ComponentTemplateFromEs } from '../../../../common';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   name: schema.string(),
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts
index dd37ad56ea4b4..dc4214ae43f73 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
-import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from 'src/core/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
+import { kibanaResponseFactory, RequestHandlerContext, RequestHandler } from '@kbn/core/server';
 
 import { IndexDataEnricher } from '../../../services/index_data_enricher';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts
index 63bd4a1ca14d8..d2fe85d219ef1 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_privileges_route.ts
@@ -6,9 +6,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Privileges } from 'src/plugins/es_ui_shared/public';
+import { Privileges } from '@kbn/es-ui-shared-plugin/public';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const extractMissingPrivileges = (privilegesObject: { [key: string]: boolean } = {}): string[] =>
   Object.keys(privilegesObject).reduce((privileges: string[], privilegeName: string): string[] => {
diff --git a/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts b/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts
index 97d7c52dde044..016e379165d49 100644
--- a/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/component_templates/register_update_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { componentTemplateSchema } from './schema_validation';
 
 const paramsSchema = schema.object({
diff --git a/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts
index 9e7b57079cc3c..0602aaaaafc6c 100644
--- a/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/data_streams/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   dataStreams: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
index 4c44d1a8212f9..a698be6f913d3 100644
--- a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
@@ -7,11 +7,11 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { deserializeDataStream, deserializeDataStreamList } from '../../../../common/lib';
 import { DataStreamFromEs } from '../../../../common/types';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 interface PrivilegesFromEs {
   username: string;
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts
index e704ad1fb3cd5..9e7c4a82bca59 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts
index 6d4488634a2aa..7d549dadd010c 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts
index 5afebf4b21c96..8f97711858059 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts
index 5e84bac60bd1e..d8215849d2de5 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts
index d0dda14d944c7..d9bdd572b63f3 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts
index d8a7fcb29bb35..cbdfee665cfec 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts
@@ -7,7 +7,7 @@
 
 import { fetchIndices } from '../../../lib/fetch_indices';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerListRoute({
   router,
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts
index fc64afd86b9bf..b7aa023c27433 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts
index bb47d1f3a2319..ba7d3f19dbb23 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts
index 4c5bd1fb030e8..05951629bcb2d 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
 import { fetchIndices } from '../../../lib/fetch_indices';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.maybe(
   schema.object({
diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts b/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts
index 71a7c27ad2cba..e0447efe1090f 100644
--- a/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/indices/register_unfreeze_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({
   indices: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts b/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts
index cef20539f9403..c2dbcc92144b2 100644
--- a/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   indexName: schema.string(),
diff --git a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts
index fb104b3dc868f..9fe4a57f7a055 100644
--- a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts
+++ b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { registerNodesRoute } from './register_nodes_route';
 import { RouterMock, routeDependencies, RequestMock } from '../../../test/helpers';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts
index 5c9751c8506cf..8702a6bdd2037 100644
--- a/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/nodes/register_nodes_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerNodesRoute({ router, lib: { handleEsError } }: RouteDependencies) {
   // Retrieve the es plugins installed on the cluster nodes
diff --git a/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts b/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts
index ceb59916811d8..fc8600182dd13 100644
--- a/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   indexName: schema.string(),
diff --git a/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts b/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts
index b7a38cb04782e..31f04a20c5dbe 100644
--- a/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.any();
 
diff --git a/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts b/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts
index f178cc8ace6bc..a81aba00901eb 100644
--- a/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const paramsSchema = schema.object({
   indexName: schema.string(),
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/lib.ts b/x-pack/plugins/index_management/server/routes/api/templates/lib.ts
index 413e73ff93d5f..f900e76ac17f5 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/lib.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/lib.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { serializeTemplate, serializeLegacyTemplate } from '../../../../common/lib';
 import { TemplateDeserialized, LegacyTemplateSerialized } from '../../../../common';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts
index 20a3e1e97dd6c..7463f41cb18ac 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_create_route.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import { TemplateDeserialized } from '../../../../common';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { templateSchema } from './validate_schemas';
 import { saveTemplate, doesTemplateExist } from './lib';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts
index fbfcab3a8f5ed..585408bbfe233 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_delete_route.ts
@@ -8,7 +8,7 @@
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { TemplateDeserialized } from '../../../../common';
 
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts
index 93d65e162da71..f8966b1355ffe 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts
@@ -15,7 +15,7 @@ import {
 } from '../../../../common/lib';
 import { getCloudManagedTemplatePrefix } from '../../../lib/get_managed_templates';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerGetAllRoute({ router, lib: { handleEsError } }: RouteDependencies) {
   router.get(
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts
index ab937fc366d4c..13833cb889362 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts
@@ -8,7 +8,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 const bodySchema = schema.object({}, { unknowns: 'allow' });
 
diff --git a/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts b/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts
index f700497e924b4..7d89d0ff8af09 100644
--- a/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts
+++ b/x-pack/plugins/index_management/server/routes/api/templates/register_update_route.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 
 import { TemplateDeserialized } from '../../../../common';
 import { RouteDependencies } from '../../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 import { templateSchema } from './validate_schemas';
 import { saveTemplate, doesTemplateExist } from './lib';
 
diff --git a/x-pack/plugins/index_management/server/services/index_data_enricher.ts b/x-pack/plugins/index_management/server/services/index_data_enricher.ts
index 532485201b99e..bf49d8cc5ae37 100644
--- a/x-pack/plugins/index_management/server/services/index_data_enricher.ts
+++ b/x-pack/plugins/index_management/server/services/index_data_enricher.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { Index } from '../index';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { Index } from '..';
 
 export type Enricher = (indices: Index[], client: IScopedClusterClient) => Promise<Index[]>;
 
diff --git a/x-pack/plugins/index_management/server/shared_imports.ts b/x-pack/plugins/index_management/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/index_management/server/shared_imports.ts
+++ b/x-pack/plugins/index_management/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/index_management/server/test/helpers/router_mock.ts b/x-pack/plugins/index_management/server/test/helpers/router_mock.ts
index 92aef94570fc8..65536f34d6290 100644
--- a/x-pack/plugins/index_management/server/test/helpers/router_mock.ts
+++ b/x-pack/plugins/index_management/server/test/helpers/router_mock.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { IRouter } from 'src/core/server';
+import type { IRouter } from '@kbn/core/server';
 import { get } from 'lodash';
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type RequestHandler = (...params: any[]) => any;
 
diff --git a/x-pack/plugins/index_management/server/types.ts b/x-pack/plugins/index_management/server/types.ts
index ba40d22f2eafc..fc245fb664f9c 100644
--- a/x-pack/plugins/index_management/server/types.ts
+++ b/x-pack/plugins/index_management/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
+import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { IndexDataEnricher } from './services';
 import { handleEsError } from './shared_imports';
 
diff --git a/x-pack/plugins/index_management/test/global_mocks.tsx b/x-pack/plugins/index_management/test/global_mocks.tsx
index 342d74bce853e..5fe9f3c28c301 100644
--- a/x-pack/plugins/index_management/test/global_mocks.tsx
+++ b/x-pack/plugins/index_management/test/global_mocks.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 // is imported. Typically this means just importing above your other imports.
 // See https://jestjs.io/docs/manual-mocks for more info.
 
-jest.mock('../../../../src/plugins/es_ui_shared/public', () => {
-  const original = jest.requireActual('../../../../src/plugins/es_ui_shared/public');
+jest.mock('@kbn/es-ui-shared-plugin/public', () => {
+  const original = jest.requireActual('@kbn/es-ui-shared-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts b/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts
index b6d09e1004a70..9fbb5fa9e4e98 100644
--- a/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts
+++ b/x-pack/plugins/infra/common/alerting/metrics/alert_link.ts
@@ -8,7 +8,7 @@
 import { ALERT_RULE_PARAMETERS, TIMESTAMP } from '@kbn/rule-data-utils';
 import { encode } from 'rison-node';
 import { stringify } from 'query-string';
-import { ParsedTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
 
 export const getInventoryViewInAppUrl = (
   fields: ParsedTechnicalFields & Record<string, any>
diff --git a/x-pack/plugins/infra/common/alerting/metrics/types.ts b/x-pack/plugins/infra/common/alerting/metrics/types.ts
index 6a29d5c16e65c..60c01beacd158 100644
--- a/x-pack/plugins/infra/common/alerting/metrics/types.ts
+++ b/x-pack/plugins/infra/common/alerting/metrics/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import * as rt from 'io-ts';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import { SnapshotCustomMetricInput } from '../../http_api';
 import { ANOMALY_THRESHOLD } from '../../infra_ml';
 import { InventoryItemType, SnapshotMetricType } from '../../inventory_models/types';
-import { TimeUnitChar } from '../../../../observability/common/utils/formatters/duration';
 
 export const METRIC_THRESHOLD_ALERT_TYPE_ID = 'metrics.alert.threshold';
 export const METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID = 'metrics.alert.inventory.threshold';
diff --git a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
index 46f961d6de472..80c0f324e793f 100644
--- a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
+++ b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { from, of } from 'rxjs';
+import { firstValueFrom, from, of } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/common';
-import { fieldList, FieldSpec } from '../../../../../src/plugins/data/common';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/common';
+import { fieldList, FieldSpec } from '@kbn/data-plugin/common';
 
 type IndexPatternMock = Pick<
   DataView,
@@ -68,13 +68,13 @@ export const createIndexPatternsMock = (
       const indexPatterns$ = of(
         indexPatterns.map(({ id = 'unknown_id', title }) => ({ id, title }))
       );
-      return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+      return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
     },
     async get(indexPatternId: string) {
       const indexPatterns$ = from(
         indexPatterns.filter((indexPattern) => indexPattern.id === indexPatternId)
       );
-      return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+      return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
     },
   };
 };
diff --git a/x-pack/plugins/infra/common/http_api/metadata_api.ts b/x-pack/plugins/infra/common/http_api/metadata_api.ts
index 0f847f19f75d3..66d1d01f8175d 100644
--- a/x-pack/plugins/infra/common/http_api/metadata_api.ts
+++ b/x-pack/plugins/infra/common/http_api/metadata_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { ItemTypeRT } from '../../common/inventory_models/types';
+import { ItemTypeRT } from '../inventory_models/types';
 
 export const InfraMetadataRequestRT = rt.type({
   nodeId: rt.string,
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
index 1125c725f9e9a..4d676dfce8ecb 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../public/pages/metrics/metric_detail/componen
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
index ba533592003d3..96d82343f593c 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_rds/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../public/pages/metrics/metric_detail/components/
 import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
index 1568665093d3c..d068748f134a5 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_s3/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../public/pages/metrics/metric_detail/components/
 import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx b/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
index 7e9eae66eb136..a06e5b0bb1add 100644
--- a/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../public/pages/metrics/metric_detail/components/
 import { SubSection } from '../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 
diff --git a/x-pack/plugins/infra/common/inventory_models/container/layout.tsx b/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
index be85804342cbd..11a84abe1bf67 100644
--- a/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/container/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../public/pages/metrics/metric_detail/componen
 import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutContent } from '../../../public/pages/metrics/metric_detail/components/layout_content';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
diff --git a/x-pack/plugins/infra/common/inventory_models/host/layout.tsx b/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
index c28a29f9c0751..0f634048a5a8b 100644
--- a/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/host/layout.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
diff --git a/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx b/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
index 7eae83cd1cb66..88c5a25d17b9d 100644
--- a/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/pod/layout.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../public/pages/metrics/metric_detail/componen
 import { GaugesSectionVis } from '../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../src/plugins/kibana_react/common';
 import * as Nginx from '../shared/layouts/nginx';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { MetadataDetails } from '../../../public/pages/metrics/metric_detail/components/metadata_details';
diff --git a/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx b/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx
index 5223e287d07e2..8a8964f121f03 100644
--- a/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/shared/layouts/aws.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -17,7 +18,6 @@ import { SubSection } from '../../../../public/pages/metrics/metric_detail/compo
 import { GaugesSectionVis } from '../../../../public/pages/metrics/metric_detail/components/gauges_section_vis';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../../src/plugins/kibana_react/common';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
diff --git a/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx b/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx
index d3f69fac6df32..d679a596d51e3 100644
--- a/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx
+++ b/x-pack/plugins/infra/common/inventory_models/shared/layouts/nginx.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LayoutPropsWithTheme } from '../../../../public/pages/metrics/metric_detail/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -15,7 +16,6 @@ import { Section } from '../../../../public/pages/metrics/metric_detail/componen
 import { SubSection } from '../../../../public/pages/metrics/metric_detail/components/sub_section';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ChartSectionVis } from '../../../../public/pages/metrics/metric_detail/components/chart_section_vis';
-import { withTheme } from '../../../../../../../src/plugins/kibana_react/common';
 
 export const Layout = withTheme(({ metrics, onChangeRangeTime, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
diff --git a/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts b/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts
index a951f88f0c2a5..268b2f692f62a 100644
--- a/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts
+++ b/x-pack/plugins/infra/common/log_views/resolved_log_view.mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DataViewsContract, fieldList } from 'src/plugins/data_views/common';
-import { createStubDataView } from 'src/plugins/data_views/common/stubs';
+import { DataViewsContract, fieldList } from '@kbn/data-views-plugin/common';
+import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
 import { defaultLogViewsStaticConfig } from './defaults';
 import { ResolvedLogView, resolveLogView } from './resolved_log_view';
 import { LogViewAttributes } from './types';
diff --git a/x-pack/plugins/infra/common/log_views/resolved_log_view.ts b/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
index 19369a022a923..d7e155172a57e 100644
--- a/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
+++ b/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
@@ -6,11 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import {
-  DataView,
-  DataViewsContract,
-  FieldSpec,
-} from '../../../../../src/plugins/data_views/common';
+import { DataView, DataViewsContract, FieldSpec } from '@kbn/data-views-plugin/common';
 import { TIEBREAKER_FIELD, TIMESTAMP_FIELD } from '../constants';
 import { ResolveLogViewError } from './errors';
 import { LogViewAttributes, LogViewColumnConfiguration, LogViewsStaticConfig } from './types';
diff --git a/x-pack/plugins/infra/common/runtime_types.ts b/x-pack/plugins/infra/common/runtime_types.ts
index 223a22ca0ed05..d77caa52c3c98 100644
--- a/x-pack/plugins/infra/common/runtime_types.ts
+++ b/x-pack/plugins/infra/common/runtime_types.ts
@@ -10,7 +10,7 @@ import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Context, Errors, IntersectionType, Type, UnionType, ValidationError } from 'io-ts';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { RouteValidationFunction } from 'kibana/server';
+import type { RouteValidationFunction } from '@kbn/core/server';
 
 type ErrorFactory = (message: string) => Error;
 
diff --git a/x-pack/plugins/infra/common/saved_objects/inventory_view.ts b/x-pack/plugins/infra/common/saved_objects/inventory_view.ts
index 9f7984f9c40e4..4921f38853d12 100644
--- a/x-pack/plugins/infra/common/saved_objects/inventory_view.ts
+++ b/x-pack/plugins/infra/common/saved_objects/inventory_view.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const inventoryViewSavedObjectName = 'inventory-view';
 
diff --git a/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts b/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
index b77f9643b3c91..71b7887263989 100644
--- a/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
+++ b/x-pack/plugins/infra/common/saved_objects/metrics_explorer_view.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const metricsExplorerViewSavedObjectName = 'metrics-explorer-view';
 
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index c2a04c7a0ff39..2eec94187900f 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -27,7 +27,6 @@
     "licenseManagement",
     "kibanaUtils",
     "kibanaReact",
-    "home",
     "ml",
     "embeddable"
   ],
diff --git a/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
index 07249d15eccee..f429a743250c8 100644
--- a/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx
@@ -14,7 +14,7 @@ import {
   EuiContextMenuPanelDescriptor,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PrefilledInventoryAlertFlyout } from '../../inventory/components/alert_flyout';
 import { PrefilledThresholdAlertFlyout } from '../../metric_threshold/components/alert_flyout';
 import { InfraClientStartDeps } from '../../../types';
diff --git a/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx b/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
index 5a162ef1d6941..a7ed12eda1ed7 100644
--- a/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
@@ -14,7 +14,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo, useState } from 'react';
-import { FieldSpec } from 'src/plugins/data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 import { GroupBySelector } from './selector';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx b/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
index 4e5a574d67e9b..dc7e02f7d782f 100644
--- a/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
+++ b/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
@@ -7,7 +7,7 @@
 
 import { EuiComboBox } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
-import { FieldSpec } from 'src/plugins/data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 
 interface Props {
   selectedGroups?: string[];
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 c0a475ea8029b..9f30a7c9980db 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
@@ -11,7 +11,7 @@ import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { InfraWaffleMapOptions } from '../../../lib/lib';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
-import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
+import { useAlertPrefillContext } from '../../use_alert_prefill';
 
 interface Props {
   visible?: boolean;
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
index d34f6b369b2df..591014472d81a 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.test.tsx
@@ -9,10 +9,11 @@ import { mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import { Comparator, InventoryMetricConditions } from '../../../../common/alerting/metrics';
 import { SnapshotCustomMetricInput } from '../../../../common/http_api/snapshot_api';
 import { AlertContextMeta, defaultExpression, ExpressionRow, Expressions } from './expression';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('../../../containers/metrics_source/use_source_via_http', () => ({
   useSourceViaHttp: () => ({
@@ -34,6 +35,8 @@ const exampleCustomMetric = {
   type: 'custom',
 } as SnapshotCustomMetricInput;
 
+const dataViewMock = dataViewPluginMocks.createStartContract();
+
 describe('Expression', () => {
   async function setup(currentOptions: AlertContextMeta) {
     const ruleParams = {
@@ -51,6 +54,7 @@ describe('Expression', () => {
         setRuleParams={(key, value) => Reflect.set(ruleParams, key, value)}
         setRuleProperty={() => {}}
         metadata={currentOptions}
+        dataViews={dataViewMock}
       />
     );
 
@@ -116,6 +120,7 @@ describe('Expression', () => {
         setRuleParams={(key, value) => Reflect.set(ruleParams, key, value)}
         setRuleProperty={() => {}}
         metadata={{}}
+        dataViews={dataViewMock}
       />
     );
 
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 05396f780aefe..6db6587f2b475 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -22,13 +22,14 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce, omit } from 'lodash';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   ForLastExpression,
   IErrorObject,
   RuleTypeParamsExpressionProps,
   ThresholdExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import {
   Comparator,
   FilterQuery,
@@ -62,7 +63,6 @@ import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
 import { ExpressionChart } from './expression_chart';
 import { MetricExpression } from './metric';
 import { NodeTypeExpression } from './node_type';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
index c35335afe493f..dccd03414f3d5 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx
@@ -8,7 +8,7 @@
 import { EuiContextMenuItem } from '@elastic/eui';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { InfraClientStartDeps } from '../../../types';
 
 export const ManageAlertsContextMenuItem = () => {
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 ba5316cbcfebd..d5796ec45d107 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/metric.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import { IErrorObject } from '../../../../../triggers_actions_ui/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label';
 import {
   SnapshotCustomAggregation,
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
index e093ea789cf79..5a3415be429ca 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ValidationResult } from '../../../../../triggers_actions_ui/public';
+import type { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   FilterQuery,
diff --git a/x-pack/plugins/infra/public/alerting/inventory/index.ts b/x-pack/plugins/infra/public/alerting/inventory/index.ts
index 300832d8a47ed..c9b825340496a 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/index.ts
+++ b/x-pack/plugins/infra/public/alerting/inventory/index.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { RuleTypeParams } from '../../../../alerting/common';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import {
   InventoryMetricConditions,
   METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
diff --git a/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts
index a419bef9f6c76..001e96d9961fd 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts
+++ b/x-pack/plugins/infra/public/alerting/inventory/rule_data_formatters.ts
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import { ObservabilityRuleTypeFormatter } from '@kbn/observability-plugin/public';
 import { getInventoryViewInAppUrl } from '../../../common/alerting/metrics/alert_link';
 
 export const formatReason: ObservabilityRuleTypeFormatter = ({ fields }) => {
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
index 2c279f6413353..34551ca1fae0b 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
@@ -21,7 +21,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { isFinite, isNumber } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import type { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import type { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   ComparatorToi18nMap,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
index 2188454c80b13..5ffefdd57119e 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/charts';
 import { EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   ChartContainer,
   LoadingState,
@@ -44,7 +44,7 @@ import { Color, colorTransformer } from '../../../../../common/color_palette';
 import {
   GetLogAlertsChartPreviewDataAlertParamsSubset,
   getLogAlertsChartPreviewDataAlertParamsSubsetRT,
-} from '../../../../../common/http_api/log_alerts/';
+} from '../../../../../common/http_api/log_alerts';
 import { useChartPreviewData } from './hooks/use_chart_preview_data';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import { useKibanaTimeZoneSetting } from '../../../../hooks/use_kibana_time_zone_setting';
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
index 920c3cbf1e873..a5affb24cd843 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
@@ -9,11 +9,11 @@ import { EuiButton, EuiCallOut, EuiLoadingSpinner, EuiSpacer } from '@elastic/eu
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useMemo, useState } from 'react';
 import useMount from 'react-use/lib/useMount';
-import { ResolvedLogViewField } from '../../../../../common/log_views';
 import {
   ForLastExpression,
   RuleTypeParamsExpressionProps,
-} from '../../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { ResolvedLogViewField } from '../../../../../common/log_views';
 import {
   Comparator,
   isOptimizableGroupedThreshold,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
index 1568b5f0b7898..9b9dc501e1591 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
@@ -6,8 +6,8 @@
  */
 
 import { useState, useMemo } from 'react';
-import { HttpHandler } from 'kibana/public';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { HttpHandler } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useTrackedPromise } from '../../../../../utils/use_tracked_promise';
 import {
   GetLogAlertsChartPreviewDataSuccessResponsePayload,
@@ -16,7 +16,7 @@ import {
   LOG_ALERTS_CHART_PREVIEW_DATA_PATH,
 } from '../../../../../../common/http_api';
 import { decodeOrThrow } from '../../../../../../common/runtime_types';
-import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../common/http_api/log_alerts/';
+import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../common/http_api/log_alerts';
 
 interface Options {
   sourceId: string;
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
index 6b3023123cd8c..40eb6f2a2076a 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
@@ -18,7 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { isFinite, isNumber } from 'lodash';
 import React, { useState } from 'react';
-import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   ComparatorToi18nMap,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx
index 7d89dac681743..fa32b92806dcd 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import {
   LOG_DOCUMENT_COUNT_RULE_TYPE_ID,
   PartialRuleParams,
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
index 888646856e119..3fc9f6752da1a 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/rule_data_formatters.ts
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_REASON, ALERT_START } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import { ObservabilityRuleTypeFormatter } from '@kbn/observability-plugin/public';
 import { getLogsAppAlertUrl } from '../../../common/formatters/alert_link';
 
 export const formatRuleData: ObservabilityRuleTypeFormatter = ({ fields }) => {
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
index 740805006785b..59cae9c53c7ff 100644
--- a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
+++ b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import * as rt from 'io-ts';
 import { isNumber, isFinite } from 'lodash';
-import { IErrorObject, ValidationResult } from '../../../../triggers_actions_ui/public';
+import { IErrorObject, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   PartialCountCriteria,
   isRatioRule,
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
index e0e9946b1c789..705ab03d5a500 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/alert_flyout.tsx
@@ -11,7 +11,7 @@ import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { InfraWaffleMapOptions } from '../../../lib/lib';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
-import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
+import { useAlertPrefillContext } from '../../use_alert_prefill';
 
 interface Props {
   visible?: boolean;
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx
index e40c72171f72b..f18f3752b2745 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.test.tsx
@@ -7,10 +7,11 @@
 
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import React from 'react';
 import { Expression, AlertContextMeta } from './expression';
 import { act } from 'react-dom/test-utils';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('../../../containers/metrics_source/use_source_via_http', () => ({
   useSourceViaHttp: () => ({
@@ -38,6 +39,8 @@ jest.mock('../../../containers/ml/infra_ml_capabilities', () => ({
   }),
 }));
 
+const dataViewMock = dataViewPluginMocks.createStartContract();
+
 describe('Expression', () => {
   async function setup(currentOptions: AlertContextMeta) {
     const ruleParams = {
@@ -55,6 +58,7 @@ describe('Expression', () => {
         setRuleParams={(key, value) => Reflect.set(ruleParams, key, value)}
         setRuleProperty={() => {}}
         metadata={currentOptions}
+        dataViews={dataViewMock}
       />
     );
 
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
index bd4f0de2bfec2..74affe264027b 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
@@ -9,12 +9,12 @@ import { EuiFlexGroup, EuiLoadingContent, EuiSpacer, EuiText } from '@elastic/eu
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { euiStyled, EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   RuleTypeParams,
   RuleTypeParamsExpressionProps,
   WhenExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { MetricAnomalyParams } from '../../../../common/alerting/metrics';
 import { ANOMALY_THRESHOLD } from '../../../../common/infra_ml';
 import { findInventoryModel } from '../../../../common/inventory_models';
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx
index a4eda632b2fdd..fa278674d55e8 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/validation.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ValidationResult } from '../../../../../triggers_actions_ui/public';
+import type { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 
 export function validateMetricAnomaly({
   hasInfraMLCapabilities,
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts b/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts
index 7591f2e35d59e..2dfee3891b86b 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../common/alerting/metrics';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
-import { RuleTypeParams } from '../../../../alerting/common';
 import { validateMetricAnomaly } from './components/validation';
 
 interface MetricAnomalyRuleTypeParams extends RuleTypeParams {
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
index 642b7dbf079c0..3fb06d38e3088 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
@@ -10,7 +10,7 @@ import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { METRIC_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { MetricsExplorerSeries } from '../../../../common/http_api/metrics_explorer';
 import { MetricsExplorerOptions } from '../../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
-import { useAlertPrefillContext } from '../../../alerting/use_alert_prefill';
+import { useAlertPrefillContext } from '../../use_alert_prefill';
 
 interface Props {
   visible?: boolean;
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
index 309808bf48352..02f8f59c174e1 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
@@ -9,10 +9,11 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import { Comparator } from '../../../../common/alerting/metrics';
 import { MetricsExplorerMetric } from '../../../../common/http_api/metrics_explorer';
 import { Expressions } from './expression';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 
 jest.mock('../../../containers/metrics_source/use_source_via_http', () => ({
   useSourceViaHttp: () => ({
@@ -27,6 +28,8 @@ jest.mock('../../../hooks/use_kibana', () => ({
   }),
 }));
 
+const dataViewMock = dataViewPluginMocks.createStartContract();
+
 describe('Expression', () => {
   async function setup(currentOptions: {
     metrics?: MetricsExplorerMetric[];
@@ -51,6 +54,7 @@ describe('Expression', () => {
         metadata={{
           currentOptions,
         }}
+        dataViews={dataViewMock}
       />
     );
 
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
index c7cb031b75516..7b332a2a4ce8a 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -26,7 +26,8 @@ import {
   IErrorObject,
   RuleTypeParams,
   RuleTypeParamsExpressionProps,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import { Aggregators, Comparator, QUERY_INVALID } from '../../../../common/alerting/metrics';
 import { useSourceViaHttp } from '../../../containers/metrics_source/use_source_via_http';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
@@ -37,7 +38,6 @@ import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
 import { AlertContextMeta, AlertParams, MetricExpression } from '../types';
 import { ExpressionChart } from './expression_chart';
 import { ExpressionRow } from './expression_row';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
 type Props = Omit<
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
index e5c6e1a4d8984..d9db49192d5c4 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx
@@ -10,7 +10,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 import { Aggregators, Comparator } from '../../../../common/alerting/metrics';
 import { MetricsSourceConfiguration } from '../../../../common/metrics_sources';
 import { MetricExpression } from '../types';
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 6f1d1ed6e12c0..2209e1810a788 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
@@ -18,14 +18,14 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { omit } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   builtInComparators,
   IErrorObject,
   OfExpression,
   ThresholdExpression,
   WhenExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { Comparator } from '../../../../common/alerting/metrics';
 import { decimalToPct, pctToDecimal } from '../../../../common/utils/corrected_percent_convert';
 import { DerivedIndexPattern } from '../../../containers/metrics_source';
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
index 8634c3686087f..bc75b2512fbc1 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ValidationResult } from '../../../../../triggers_actions_ui/public';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   Comparator,
   FilterQuery,
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts
index 39b632b82fd97..c707d98f36227 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/index.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { RuleTypeParams } from '../../../../alerting/common';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import {
   MetricExpressionParams,
   METRIC_THRESHOLD_ALERT_TYPE_ID,
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts
index 268d0d2113381..a377396b5eb89 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/rule_data_formatters.ts
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeFormatter } from '../../../../observability/public';
+import { ObservabilityRuleTypeFormatter } from '@kbn/observability-plugin/public';
 import { LINK_TO_METRICS_EXPLORER } from '../../../common/alerting/metrics';
 export const formatReason: ObservabilityRuleTypeFormatter = ({ fields }) => {
   const reason = fields[ALERT_REASON] ?? '-';
diff --git a/x-pack/plugins/infra/public/apps/common_providers.tsx b/x-pack/plugins/infra/public/apps/common_providers.tsx
index 2463485137ba3..a1d1b1b7c4dd2 100644
--- a/x-pack/plugins/infra/public/apps/common_providers.tsx
+++ b/x-pack/plugins/infra/public/apps/common_providers.tsx
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import { NavigationWarningPromptProvider } from '../../../observability/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
+} from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { NavigationWarningPromptProvider } from '@kbn/observability-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { useKibanaContextForPluginProvider } from '../hooks/use_kibana';
 import { InfraClientStartDeps, InfraClientStartExports } from '../types';
 import { HeaderActionMenuProvider } from '../utils/header_action_menu_provider';
diff --git a/x-pack/plugins/infra/public/apps/common_styles.ts b/x-pack/plugins/infra/public/apps/common_styles.ts
index 68c820d538ca9..acc5156121292 100644
--- a/x-pack/plugins/infra/public/apps/common_styles.ts
+++ b/x-pack/plugins/infra/public/apps/common_styles.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export const CONTAINER_CLASSNAME = 'infra-container-element';
 
diff --git a/x-pack/plugins/infra/public/apps/legacy_app.tsx b/x-pack/plugins/infra/public/apps/legacy_app.tsx
index 8aeb99c426651..d444225a4070d 100644
--- a/x-pack/plugins/infra/public/apps/legacy_app.tsx
+++ b/x-pack/plugins/infra/public/apps/legacy_app.tsx
@@ -7,7 +7,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import { createBrowserHistory, History } from 'history';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, RouteProps, Router, Switch } from 'react-router-dom';
diff --git a/x-pack/plugins/infra/public/apps/logs_app.tsx b/x-pack/plugins/infra/public/apps/logs_app.tsx
index fd507ef822893..0b345150daf8d 100644
--- a/x-pack/plugins/infra/public/apps/logs_app.tsx
+++ b/x-pack/plugins/infra/public/apps/logs_app.tsx
@@ -6,12 +6,12 @@
  */
 
 import { History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import { AppMountParameters } from '../../../../../src/core/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import '../index.scss';
 import { NotFoundPage } from '../pages/404';
 import { LinkToLogsPage } from '../pages/link_to/link_to_logs';
diff --git a/x-pack/plugins/infra/public/apps/metrics_app.tsx b/x-pack/plugins/infra/public/apps/metrics_app.tsx
index 7aeb56369cd00..2fe724e0cfb15 100644
--- a/x-pack/plugins/infra/public/apps/metrics_app.tsx
+++ b/x-pack/plugins/infra/public/apps/metrics_app.tsx
@@ -6,12 +6,12 @@
  */
 
 import { History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import { AppMountParameters } from '../../../../../src/core/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import '../index.scss';
 import { NotFoundPage } from '../pages/404';
 import { LinkToMetricsPage } from '../pages/link_to/link_to_metrics';
diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx b/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
index 4aa0edb406856..82f5516f0831e 100644
--- a/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
+++ b/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx
@@ -7,8 +7,8 @@
 
 import { EuiFieldSearch, EuiOutsideClickDetector, EuiPanel } from '@elastic/eui';
 import React from 'react';
-import { QuerySuggestion } from '../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { composeStateUpdaters } from '../../utils/typed_react';
 import { SuggestionItem } from './suggestion_item';
 
diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
index 3681bf26987cc..47a5114f79173 100644
--- a/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
+++ b/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
@@ -8,8 +8,8 @@
 import { EuiIcon } from '@elastic/eui';
 import { transparentize } from 'polished';
 import React from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../../../../src/plugins/data/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/data-plugin/public';
 
 interface Props {
   isSelected?: boolean;
diff --git a/x-pack/plugins/infra/public/components/centered_flyout_body.tsx b/x-pack/plugins/infra/public/components/centered_flyout_body.tsx
index 981f9319bf5a1..57bda793eeafb 100644
--- a/x-pack/plugins/infra/public/components/centered_flyout_body.tsx
+++ b/x-pack/plugins/infra/public/components/centered_flyout_body.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiFlyoutBody } from '@elastic/eui';
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const CenteredEuiFlyoutBody = euiStyled(EuiFlyoutBody)`
   & .euiFlyoutBody__overflow {
diff --git a/x-pack/plugins/infra/public/components/empty_states/no_data.tsx b/x-pack/plugins/infra/public/components/empty_states/no_data.tsx
index a743ad9fbf273..cdcb86c86074b 100644
--- a/x-pack/plugins/infra/public/components/empty_states/no_data.tsx
+++ b/x-pack/plugins/infra/public/components/empty_states/no_data.tsx
@@ -8,7 +8,7 @@
 import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface NoDataProps {
   titleText: string;
diff --git a/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx b/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx
index f1a793d11166c..95f45562c6241 100644
--- a/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx
+++ b/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx
@@ -8,7 +8,7 @@
 import { EuiPanel } from '@elastic/eui';
 import { FunctionComponent } from 'react';
 import { StyledComponent } from 'styled-components';
-import { euiStyled, EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 // The return type of this component needs to be specified because the inferred
 // return type depends on types that are not exported from EUI. You get a TS4023
diff --git a/x-pack/plugins/infra/public/components/fixed_datepicker.tsx b/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
index dfaf0a490225a..2d11fd155aa28 100644
--- a/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
+++ b/x-pack/plugins/infra/public/components/fixed_datepicker.tsx
@@ -8,7 +8,7 @@
 import { EuiDatePicker, EuiDatePickerProps } from '@elastic/eui';
 import React, { FunctionComponent } from 'react';
 import { StyledComponent } from 'styled-components';
-import { euiStyled, EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled, EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 // The return type of this component needs to be specified because the inferred
 // return type depends on types that are not exported from EUI. You get a TS4023
diff --git a/x-pack/plugins/infra/public/components/help_center_content.tsx b/x-pack/plugins/infra/public/components/help_center_content.tsx
index 8d1b489e7e542..76b8475dc7d42 100644
--- a/x-pack/plugins/infra/public/components/help_center_content.tsx
+++ b/x-pack/plugins/infra/public/components/help_center_content.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useEffect } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface HelpCenterContentProps {
   feedbackLink: string;
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx
index 44bfa1be3e331..9b4d3938e7d4c 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCard } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Meta } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { decorateWithGlobalStorybookThemeProviders } from '../../../test_utils/use_global_storybook_theme';
 import { ContainerMetricsTable } from './container_metrics_table';
 import type { ContainerMetricsTableProps } from './container_metrics_table';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx
index baec88e65c854..6da64bdb58805 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.test.tsx
@@ -7,7 +7,7 @@
 
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import type { HttpFetchOptions } from '../../../../../../../src/core/public';
+import type { HttpFetchOptions } from '@kbn/core/public';
 import type {
   DataResponseMock,
   NodeMetricsTableFetchMock,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx
index 5c80223e31e1c..862d55a45c094 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCard } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Meta } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { decorateWithGlobalStorybookThemeProviders } from '../../../test_utils/use_global_storybook_theme';
 import { HostMetricsTable } from './host_metrics_table';
 import type { HostMetricsTableProps } from './host_metrics_table';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx
index 63b6b87202776..5648c077a527a 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.test.tsx
@@ -7,7 +7,7 @@
 
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import type { HttpFetchOptions } from '../../../../../../../src/core/public';
+import type { HttpFetchOptions } from '@kbn/core/public';
 import type {
   DataResponseMock,
   NodeMetricsTableFetchMock,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx
index 50a9a95f8b73e..44e7779a0f680 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCard } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Meta } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { decorateWithGlobalStorybookThemeProviders } from '../../../test_utils/use_global_storybook_theme';
 import { PodMetricsTable } from './pod_metrics_table';
 import type { PodMetricsTableProps } from './pod_metrics_table';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx
index 21d26bd42827c..a27b3d59eefb2 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.test.tsx
@@ -7,7 +7,7 @@
 
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import type { HttpFetchOptions } from '../../../../../../../src/core/public';
+import type { HttpFetchOptions } from '@kbn/core/public';
 import type {
   DataResponseMock,
   NodeMetricsTableFetchMock,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx
index cb83afbc10e3f..93c591d3e5ec8 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/metrics_node_details_link.tsx
@@ -8,7 +8,7 @@
 import { parse } from '@kbn/datemath';
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
-import { useLinkProps } from '../../../../../../observability/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import type { InventoryItemType } from '../../../../../common/inventory_models/types';
 import { getNodeDetailUrl } from '../../../../pages/link_to';
 import type { MetricsExplorerTimeOptions } from '../../../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx
index 71305061ccb55..41a4013ef08ca 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/components/stepwise_pagination.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPagination } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface CursorPaginationProps {
   ariaLabel: string;
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts
index f3daa1b429aca..e165ee4d6ac48 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/shared/hooks/use_infrastructure_node_metrics.ts
@@ -8,7 +8,7 @@
 import { parse } from '@kbn/datemath';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { useEffect, useMemo, useState } from 'react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type {
   MetricsExplorerResponse,
   MetricsExplorerSeries,
diff --git a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts
index 5509e59266ec4..b4c5639b00711 100644
--- a/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts
+++ b/x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/test_helpers.ts
@@ -6,8 +6,8 @@
  */
 
 import { DeepPartial } from 'utility-types';
-import type { HttpFetchOptions } from '../../../../../../src/core/public';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import type { HttpFetchOptions } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { MetricsExplorerResponse } from '../../../common/http_api/metrics_explorer';
 import type { MetricsSourceConfigurationResponse } from '../../../common/metrics_sources';
 import type { CoreProvidersProps } from '../../apps/common_providers';
diff --git a/x-pack/plugins/infra/public/components/loading/index.tsx b/x-pack/plugins/infra/public/components/loading/index.tsx
index aba4df1c472ab..b4d8a4867c71e 100644
--- a/x-pack/plugins/infra/public/components/loading/index.tsx
+++ b/x-pack/plugins/infra/public/components/loading/index.tsx
@@ -8,7 +8,7 @@
 import { EuiLoadingChart, EuiPanel, EuiText } from '@elastic/eui';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface InfraLoadingProps {
   text: string | JSX.Element;
diff --git a/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx b/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx
index 9c84ac4ba8da3..fb5776c7ecc07 100644
--- a/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx
+++ b/x-pack/plugins/infra/public/components/loading_overlay_wrapper.tsx
@@ -9,7 +9,7 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import { transparentize } from 'polished';
 import React from 'react';
 
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const LoadingOverlayWrapper: React.FC<
   React.HTMLAttributes<HTMLDivElement> & {
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx
index d8c9b0ac4fac0..083c8401dd6fa 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.story_decorators.tsx
@@ -13,14 +13,14 @@ import {
   ENHANCED_ES_SEARCH_STRATEGY,
   ES_SEARCH_STRATEGY,
   FieldSpec,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import {
   IEsSearchResponse,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
   ISearchOptions,
-} from '../../../../../../src/plugins/data/public';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { getLogViewResponsePayloadRT } from '../../../common/http_api/log_views';
 import { defaultLogViewAttributes } from '../../../common/log_views';
 import {
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
index 9561e7b684657..109451697aca8 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
@@ -9,9 +9,9 @@ import { buildEsQuery, Filter, Query } from '@kbn/es-query';
 import { JsonValue } from '@kbn/utility-types';
 import { noop } from 'lodash';
 import React, { useCallback, useEffect, useMemo } from 'react';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { LogEntryCursor } from '../../../common/log_entry';
 import { defaultLogViewsStaticConfig } from '../../../common/log_views';
 import { BuiltEsQuery, useLogStream } from '../../containers/logs/log_stream';
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
index a834bc0af02a8..2cdc7c803b93d 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable.tsx
@@ -6,17 +6,13 @@
  */
 
 import { Query, Filter } from '@kbn/es-query';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
-import { TimeRange } from '../../../../../../src/plugins/data/public';
-import {
-  Embeddable,
-  EmbeddableInput,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
+import { TimeRange } from '@kbn/data-plugin/public';
+import { Embeddable, EmbeddableInput, IContainer } from '@kbn/embeddable-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { CoreProviders } from '../../apps/common_providers';
 import { InfraClientStartDeps, InfraClientStartExports } from '../../types';
 import { datemathToEpochMillis } from '../../utils/datemath';
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts
index 10ca4c942cce3..3d472654c0860 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream_embeddable_factory.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { InfraClientStartServicesAccessor } from '../../types';
 import {
   LogStreamEmbeddable,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx
index 170764f917abb..cc218953e33f9 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_job_status/quality_warning_notices.tsx
@@ -17,7 +17,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { groupBy } from 'lodash';
 import React, { Fragment, useState } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   CategoryQualityWarning,
   CategoryQualityWarningReason,
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 1e6556065ae44..a0ec73133839b 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
@@ -8,8 +8,8 @@
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
+import { shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-import { shouldHandleLinkEvent } from '../../../../../observability/public';
 
 export const AnalyzeInMlButton: React.FunctionComponent<{
   href?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
index 20fe816d1dab2..87ab4eaa4d627 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
@@ -7,7 +7,7 @@
 
 import { EuiHealth } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { getFormattedSeverityScore } from '../../../../../ml/public';
+import { getFormattedSeverityScore } from '@kbn/ml-plugin/public';
 import { getSeverityCategoryForScore, ML_SEVERITY_COLORS } from '../../../../common/log_analysis';
 
 export const AnomalySeverityIndicator: React.FunctionComponent<{
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
index b07a22b9eeb35..849b8cdaa4546 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/category_expression.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { memo } from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const RegularExpressionRepresentation: React.FunctionComponent<{
   maximumSegmentCount?: number;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx
index d1514301ebde8..97eeeabe8721b 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_results_privileges_prompt.tsx
@@ -7,7 +7,7 @@
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   missingMlPrivilegesTitle,
   missingMlResultsPrivilegesDescription,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx
index 709dbf0bdc111..f959c5035d1a4 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/missing_setup_privileges_prompt.tsx
@@ -7,7 +7,7 @@
 
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   missingMlPrivilegesTitle,
   missingMlSetupPrivilegesDescription,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
index 1d013b65c5b22..c772d5d268865 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const MlUnavailablePrompt: React.FunctionComponent<{}> = () => (
   <EmptyPrompt
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 0731801094703..0a455b80dbe5e 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
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useEffect, useState } from 'react';
 import { SetupStatus } from '../../../../../common/log_analysis';
 import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
-import { CreateJobButton, RecreateJobButton } from '../../log_analysis_setup/create_job_button';
+import { CreateJobButton, RecreateJobButton } from '../create_job_button';
 
 export const LogAnalysisModuleListCard: React.FC<{
   jobId: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
index bf11c22bde995..f9430570004ba 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface Props {
   retry: () => void;
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
index 206db81193967..14d69ac6c9fd1 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/user_management_link.tsx
@@ -8,7 +8,7 @@
 import { EuiButton, EuiButtonProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { useLinkProps } from '../../../../../observability/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 
 export const UserManagementLink: React.FunctionComponent<EuiButtonProps> = (props) => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx
index 3820327030bba..bae2ab06b7dca 100644
--- a/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx
@@ -9,7 +9,7 @@ import { EuiButtonEmpty, EuiPopover } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface LogCustomizationMenuState {
   isShown: boolean;
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx
index 506c09bcfc6b9..ed2546d9b8d67 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryExampleMessagesEmptyIndicator } from './log_entry_examples_empty_indicator';
 import { LogEntryExampleMessagesFailureIndicator } from './log_entry_examples_failure_indicator';
 import { LogEntryExampleMessagesLoadingIndicator } from './log_entry_examples_loading_indicator';
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
index de3a7bb0f323a..8bc4e5f16cf81 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
@@ -11,8 +11,8 @@ import { act } from 'react-dom/test-utils';
 
 import { mount } from 'enzyme';
 import { LogEntryActionsMenu } from './log_entry_actions_menu';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const coreStartMock = coreMock.createStart();
 coreStartMock.application.getUrlForApp.mockImplementation((app, options) => {
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
index e1b3a39fd65e9..a72b74d267115 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
@@ -8,9 +8,9 @@
 import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useMemo } from 'react';
+import { getApmTraceUrl } from '@kbn/observability-plugin/public';
+import { useLinkProps, LinkDescriptor } from '@kbn/observability-plugin/public';
 import { useVisibilityState } from '../../../utils/use_visibility_state';
-import { getApmTraceUrl } from '../../../../../observability/public';
-import { useLinkProps, LinkDescriptor } from '../../../../../observability/public';
 import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';
 
 const UPTIME_FIELDS = ['container.id', 'host.ip', 'kubernetes.pod.uid'];
diff --git a/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
index 79425a6ec913f..2fc287d405d6a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_highlights_menu.tsx
@@ -19,7 +19,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useVisibilityState } from '../../utils/use_visibility_state';
 
 interface LogHighlightsMenuProps {
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
index d85459d3dae8d..0d2133e0bd6fc 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx
@@ -10,7 +10,7 @@ import { area, curveMonotoneY } from 'd3-shape';
 import { max } from 'lodash';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntriesSummaryBucket } from '../../../../common/http_api';
 
 interface DensityChartProps {
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx
index ab289f17df38f..f08d7a8ab579b 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface HighlightedIntervalProps {
   className?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
index b0ee59d5d3bea..a43da182f656f 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
@@ -8,7 +8,7 @@
 import { scaleLinear } from 'd3-scale';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryTime } from '../../../../common/log_entry';
 import { DensityChart } from './density_chart';
 import { HighlightedInterval } from './highlighted_interval';
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx
index 9006aa1d1b6d8..9687cc302e1ef 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx
@@ -8,7 +8,7 @@
 import { FormattedMessage } from '@kbn/i18n-react';
 import * as React from 'react';
 
-import { euiStyled, keyframes } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, keyframes } from '@kbn/kibana-react-plugin/common';
 import { LogEntryTime } from '../../../../common/log_entry';
 import { SearchMarkerTooltip } from './search_marker_tooltip';
 import { LogEntriesSummaryHighlightsBucket } from '../../../../common/http_api';
diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
index 6588d87982cf4..11be87ce295a1 100644
--- a/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx
@@ -8,7 +8,7 @@
 import { scaleTime } from 'd3-scale';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { getTimeLabelFormat } from './time_label_formatter';
 
 interface TimeRulerProps {
diff --git a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx
index 28a5aa0152cb1..471b6c75a652a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import classNames from 'classnames';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface LogSearchInputProps {
   className?: string;
diff --git a/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx b/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
index ab4d763ab1f95..dafa60696abd0 100644
--- a/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_source_error_page.tsx
@@ -8,8 +8,8 @@
 import { EuiButton, EuiButtonEmpty, EuiCallOut, EuiEmptyPrompt, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/common';
-import { useLinkProps } from '../../../../observability/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import {
   FetchLogViewStatusError,
   FetchLogViewError,
diff --git a/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx b/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx
index e78c6970653c7..45020d9aaca14 100644
--- a/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const LogStatusbar = euiStyled(EuiFlexGroup).attrs(() => ({
   alignItems: 'center',
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
index 477fbb31bf81f..d8c1fe071fe92 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { transparentize } from 'polished';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   LogEntryColumn,
   LogEntryColumnContent,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx
index e52d302a9193f..91b5406ebb6bc 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/field_value.tsx
@@ -8,7 +8,7 @@
 import stringify from 'json-stable-stringify';
 import React from 'react';
 import { JsonArray, JsonValue } from '@kbn/utility-types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ActiveHighlightMarker, highlightFieldValue, HighlightMarker } from './highlighting';
 
 export const FieldValue: React.FC<{
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx
index 13f8b3be05747..7868a9cc5fc24 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/highlighting.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { chooseLightOrDarkColor, tintOrShade } from '../../../utils/styles';
 
 export const ActiveHighlightMarker = euiStyled.mark`
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx
index 9371bc9a8a216..3d6eca7688af0 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/jump_to_tail.tsx
@@ -9,7 +9,7 @@ import { EuiButtonEmpty, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 interface LogTextStreamJumpToTailProps {
   onClickJump?: () => void;
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
index f6e3ff27f2467..23a2201d609ec 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
@@ -17,7 +17,7 @@ import { FormattedMessage, FormattedTime, FormattedRelative } from '@kbn/i18n-re
 import * as React from 'react';
 import { Unit } from '@kbn/datemath';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogTextSeparator } from './log_text_separator';
 import { extendDatemath } from '../../../utils/datemath';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx
index a37886876618c..9f84592d0768a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_column.tsx
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TextScale } from '../../../../common/log_text_scale';
 import {
   LogColumnRenderConfiguration,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx
index c3c10165919ab..e8bb7b5dcb09a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_context_menu.tsx
@@ -15,7 +15,7 @@ import {
   EuiContextMenuItem,
 } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryColumnContent } from './log_entry_column';
 
 interface LogEntryContextMenuItem {
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
index a715286ef4f33..ac80e7e9bb205 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { LogFieldColumn } from '../../../../common/log_entry';
 import { LogEntryFieldColumn } from './log_entry_field_column';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
index d8021aa0279d5..47b6f1acfe844 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { JsonValue } from '@kbn/utility-types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogColumn } from '../../../../common/log_entry';
 import { isFieldColumn, isHighlightFieldColumn } from '../../../utils/log_entry';
 import { FieldValue } from './field_value';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
index 801fede1e36fc..56b2e761bae6a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { LogMessageColumn } from '../../../../common/log_entry';
 import { LogEntryMessageColumn } from './log_entry_message_column';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
index b95b57890b48e..b7f9bd58070ae 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogColumn, LogMessagePart } from '../../../../common/log_entry';
 import {
   isConstantSegment,
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
index c871011d0f01a..6d7358af73381 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx
@@ -8,8 +8,8 @@
 import React, { memo, useState, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { isTimestampColumn } from '../../../utils/log_entry';
 import { TextScale } from '../../../../common/log_text_scale';
 import { LogEntryColumn, LogEntryColumnWidths, iconColumnId } from './log_entry_column';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx
index 6082f1eb77176..d864fa4c35fbf 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_timestamp_column.tsx
@@ -7,7 +7,7 @@
 
 import React, { memo } from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TimeFormat, useFormattedTime } from '../../formatted_time';
 import { LogEntryColumnContent } from './log_entry_column';
 
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index 32d8497632021..3cfce6589154d 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
 import moment from 'moment';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TextScale } from '../../../../common/log_text_scale';
 import { TimeKey, UniqueTimeKey } from '../../../../common/time';
 import { callWithoutRepeats } from '../../../utils/handlers';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx
index d1330bdb44b33..d15da6ccf76d5 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo, useState, useCallback } from 'react';
 
-import { euiStyled, css } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled, css } from '@kbn/kibana-react-plugin/common';
 import { TextScale } from '../../../../common/log_text_scale';
 
 export type WrapMode = 'none' | 'pre-wrapped' | 'long';
diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
index 7e13f8b4131fe..81d77aa66c1a5 100644
--- a/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
@@ -9,7 +9,7 @@ import { bisector } from 'd3-array';
 import { sortBy, throttle } from 'lodash';
 import * as React from 'react';
 
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { Rect } from './measurable_item_view';
 
 interface VerticalScrollPanelProps<Child> {
diff --git a/x-pack/plugins/infra/public/components/page.tsx b/x-pack/plugins/infra/public/components/page.tsx
index 7ba744ca25c85..ae961c899a5d1 100644
--- a/x-pack/plugins/infra/public/components/page.tsx
+++ b/x-pack/plugins/infra/public/components/page.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPage } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const ColumnarPage = euiStyled.div`
   display: flex;
diff --git a/x-pack/plugins/infra/public/components/page_template.tsx b/x-pack/plugins/infra/public/components/page_template.tsx
index 1a10a6cd831b9..0c5afd09b75f3 100644
--- a/x-pack/plugins/infra/public/components/page_template.tsx
+++ b/x-pack/plugins/infra/public/components/page_template.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../hooks/use_kibana';
-import type { LazyObservabilityPageTemplateProps } from '../../../observability/public';
 
 export const PageTemplate: React.FC<LazyObservabilityPageTemplateProps> = (pageTemplateProps) => {
   const {
diff --git a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
index 7b7c256d5ad59..58c0a60a8827c 100644
--- a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
@@ -8,10 +8,10 @@
 import React, { useCallback, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiPopover, EuiListGroup, EuiListGroupItem } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { SavedViewCreateModal } from './create_modal';
 import { SavedViewUpdateModal } from './update_modal';
 import { SavedViewManageViewsFlyout } from './manage_views_flyout';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useSavedViewContext } from '../../containers/saved_view/saved_view';
 import { SavedViewListModal } from './view_list_modal';
 
diff --git a/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx b/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
index f7c1a5763ba07..10ddd8ca1d359 100644
--- a/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
+++ b/x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
-import { useLinkProps } from '../../../../observability/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 
 interface ViewSourceConfigurationButtonProps {
   'data-test-subj'?: string;
diff --git a/x-pack/plugins/infra/public/components/subscription_splash_content.tsx b/x-pack/plugins/infra/public/components/subscription_splash_content.tsx
index 947a5ed395315..5a4776938ff68 100644
--- a/x-pack/plugins/infra/public/components/subscription_splash_content.tsx
+++ b/x-pack/plugins/infra/public/components/subscription_splash_content.tsx
@@ -9,12 +9,12 @@ import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiText, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { HttpStart } from '../../../../../src/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { HttpStart } from '@kbn/core/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { useTrialStatus } from '../hooks/use_trial_status';
-import { LoadingPrompt } from '../components/loading_page';
+import { LoadingPrompt } from './loading_page';
 import { PageTemplate } from './page_template';
-import type { LazyObservabilityPageTemplateProps } from '../../../observability/public';
 
 const loadingMessage = i18n.translate('xpack.infra.ml.splash.loadingMessage', {
   defaultMessage: 'Checking license...',
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts
index d715fb9f45194..f1d9553806290 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/get_latest_categories_datasets_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   CategorizerStatus,
   getLatestLogEntryCategoryDatasetsStatsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
index 40b58c2cfdf55..17377e1484e26 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getDatafeedId, getJobId } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
index 2a5f68b3c32e2..142304269687e 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobId, jobCustomSettingsRT } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
@@ -47,6 +47,7 @@ const datafeedStateRT = rt.keyof({
   '': null,
 });
 
+// this is the union of the ML API's job state and block reasons
 const jobStateRT = rt.keyof({
   closed: null,
   closing: null,
@@ -54,6 +55,8 @@ const jobStateRT = rt.keyof({
   failed: null,
   opened: null,
   opening: null,
+  resetting: null,
+  reverting: null,
 });
 
 const jobAnalysisConfigRT = rt.partial({
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
index 49fdd55c0e12d..11a423c9ba438 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { jobCustomSettingsRT } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
index 7e3c2cc10d7da..39c8668c535b2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobIdPrefix, jobCustomSettingsRT } from '../../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
index 94bb3d8e66cbf..2e626b03755d2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   LOG_ANALYSIS_VALIDATE_DATASETS_PATH,
   validateLogEntryDatasetsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
index 8a9f960b54afa..d748647935356 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx
index 3aaf41fad2cd8..cab64a4069c3c 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_cleanup.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { getJobId } from '../../../../common/log_analysis';
 import { callDeleteJobs, callGetJobDeletionTasks, callStopDatafeeds } from './api/ml_cleanup';
 
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx
index d844b7439710c..29e5508b24d38 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx
@@ -6,12 +6,12 @@
  */
 
 import { useCallback, useMemo } from 'react';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { DatasetFilter } from '../../../../common/log_analysis';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 import { useTrackedPromise } from '../../../utils/use_tracked_promise';
 import { useModuleStatus } from './log_analysis_module_status';
 import { ModuleDescriptor, ModuleSourceConfiguration } from './log_analysis_module_types';
-import { useUiTracker } from '../../../../../observability/public';
 
 export const useLogAnalysisModule = <JobType extends string>({
   sourceConfiguration,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx
index 9b0946c87dd10..5c4623075dec2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_status.tsx
@@ -225,8 +225,9 @@ const getJobStatus =
         ) {
           return 'stopped';
         } else if (
-          jobSummary.jobState === 'opening' &&
-          jobSummary.awaitingNodeAssignment === false
+          (jobSummary.jobState === 'opening' && jobSummary.awaitingNodeAssignment === false) ||
+          jobSummary.jobState === 'resetting' ||
+          jobSummary.jobState === 'reverting'
         ) {
           return 'initializing';
         } else if (
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
index c8ce9a7b0127b..b26916a22f7b0 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   ValidateLogEntryDatasetsResponsePayload,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
index 9ef41042302a1..02e977dfadd32 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   bucketSpan,
   categoriesMessageField,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
index 214faaf9a3012..8acf7ce9d9a5b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   bucketSpan,
   DatasetFilter,
diff --git a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts
index 8f383fbf62936..87d70cbfd8e18 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_entries_highlights.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
index aeb8a5e6b93e6..3686f4e0fdefe 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 
 import {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
index b4bdd72b3c5ee..1e9e1dd48a47b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
@@ -9,7 +9,7 @@ import { JsonObject } from '@kbn/utility-types';
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
 import { exhaustMap } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { LogEntryAfterCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration } from '../../../../common/log_views';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
index b9acb0bb38692..6e72fce5a1d2b 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
@@ -9,7 +9,7 @@ import { JsonObject } from '@kbn/utility-types';
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
 import { exhaustMap } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { LogEntryBeforeCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration } from '../../../../common/log_views';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts b/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
index 4e0d1671e7de5..552dea6612bec 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 
 import {
diff --git a/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx b/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
index c17c0ffbe5443..138d9c3d174cf 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
@@ -7,7 +7,7 @@
 
 import { renderHook } from '@testing-library/react-hooks';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
-import { coreMock as mockCoreMock } from 'src/core/public/mocks';
+import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 
 import { useLogSummary } from './log_summary';
 
diff --git a/x-pack/plugins/infra/public/containers/metrics_source/source.tsx b/x-pack/plugins/infra/public/containers/metrics_source/source.tsx
index 474f0994da02f..1b90106d69ed2 100644
--- a/x-pack/plugins/infra/public/containers/metrics_source/source.tsx
+++ b/x-pack/plugins/infra/public/containers/metrics_source/source.tsx
@@ -8,6 +8,7 @@
 import createContainer from 'constate';
 import { useEffect, useMemo, useState } from 'react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   MetricsSourceConfigurationResponse,
   MetricsSourceConfiguration,
@@ -15,7 +16,6 @@ import {
 } from '../../../common/metrics_sources';
 
 import { useTrackedPromise } from '../../utils/use_tracked_promise';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 export const pickIndexPattern = (
   source: MetricsSourceConfiguration | undefined,
diff --git a/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts b/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts
index c7da5afd8dcd6..13a6c6b6abdce 100644
--- a/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts
+++ b/x-pack/plugins/infra/public/containers/metrics_source/use_source_via_http.ts
@@ -10,8 +10,8 @@ import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import createContainer from 'constate';
-import { HttpHandler } from 'src/core/public';
-import { ToastInput } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+import { ToastInput } from '@kbn/core/public';
 import {
   metricsSourceConfigurationResponseRT,
   MetricsSourceConfigurationResponse,
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts
index 2f98f954a5997..915240c6c6cec 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_cleanup.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { getDatafeedId, getJobId } from '../../../../common/infra_ml';
 import { decodeOrThrow } from '../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts
index c7dc1d509cf11..58baccbcedbb9 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_get_jobs_summary_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobId, jobCustomSettingsRT } from '../../../../common/infra_ml';
 import { decodeOrThrow } from '../../../../common/runtime_types';
@@ -47,6 +47,7 @@ const datafeedStateRT = rt.keyof({
   '': null,
 });
 
+// this is the union of the ML API's job state and block reasons
 const jobStateRT = rt.keyof({
   closed: null,
   closing: null,
@@ -54,6 +55,8 @@ const jobStateRT = rt.keyof({
   failed: null,
   opened: null,
   opening: null,
+  resetting: null,
+  reverting: null,
 });
 
 const jobCategorizationStatusRT = rt.keyof({
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts
index 063f6254385d2..9d24693c720ca 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_get_module.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { jobCustomSettingsRT } from '../../../../common/log_analysis';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts b/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts
index af98d598fa063..e9392062c3118 100644
--- a/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts
+++ b/x-pack/plugins/infra/public/containers/ml/api/ml_setup_module_api.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import { getJobIdPrefix, jobCustomSettingsRT } from '../../../../common/infra_ml';
 import { decodeOrThrow } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx b/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx
index 6a80c5200e678..9190122f30b46 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_cleanup.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import { getJobId } from '../../../common/infra_ml';
 import { callDeleteJobs, callGetJobDeletionTasks, callStopDatafeeds } from './api/ml_cleanup';
 
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx
index bc1f4b00c4cbe..fc41e67c2bd2c 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_status.tsx
@@ -225,8 +225,9 @@ const getJobStatus =
           ) {
             return 'stopped';
           } else if (
-            jobSummary.jobState === 'opening' &&
-            jobSummary.awaitingNodeAssignment === false
+            (jobSummary.jobState === 'opening' && jobSummary.awaitingNodeAssignment === false) ||
+            jobSummary.jobState === 'resetting' ||
+            jobSummary.jobState === 'reverting'
           ) {
             return 'initializing';
           } else if (
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
index 9b172a7c82a98..0115d321164ee 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   ValidateLogEntryDatasetsResponsePayload,
   ValidationIndicesResponsePayload,
diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
index f87cd78f4ff34..69c21dd1cfc7d 100644
--- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
@@ -6,7 +6,19 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_out.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_out.json';
 import { ModuleDescriptor, SetUpModuleArgs } from '../../infra_ml_module_types';
 import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup';
 import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api';
@@ -19,18 +31,6 @@ import {
   bucketSpan,
 } from '../../../../../common/infra_ml';
 import { TIMESTAMP_FIELD } from '../../../../../common/constants';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_out.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_out.json';
 
 type JobType = 'hosts_memory_usage' | 'hosts_network_in' | 'hosts_network_out';
 const moduleId = 'metrics_ui_hosts';
diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
index 388a7dd0a5656..e1290833dc934 100644
--- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
@@ -6,7 +6,19 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutJob from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_out.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutDatafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_out.json';
 import { ModuleDescriptor, SetUpModuleArgs } from '../../infra_ml_module_types';
 import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup';
 import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api';
@@ -19,18 +31,6 @@ import {
   bucketSpan,
 } from '../../../../../common/infra_ml';
 import { TIMESTAMP_FIELD } from '../../../../../common/constants';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_memory_usage.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_in.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_out.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_out.json';
 
 type JobType = 'k8s_memory_usage' | 'k8s_network_in' | 'k8s_network_out';
 export const DEFAULT_K8S_PARTITION_FIELD = 'kubernetes.namespace';
diff --git a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
index 44792019a5f9c..e2bb50e0dc2da 100644
--- a/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
+++ b/x-pack/plugins/infra/public/containers/saved_view/saved_view.tsx
@@ -12,7 +12,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { constant, identity } from 'fp-ts/lib/function';
 import { useCallback, useMemo, useState, useEffect, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
-import { SimpleSavedObject, SavedObjectAttributes } from 'kibana/public';
+import { SimpleSavedObject, SavedObjectAttributes } from '@kbn/core/public';
 import { useUrlState } from '../../utils/use_url_state';
 import { useFindSavedObject } from '../../hooks/use_find_saved_object';
 import { useCreateSavedObject } from '../../hooks/use_create_saved_object';
diff --git a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
index 2b0aaf5175b88..5da13a4fed711 100644
--- a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
+++ b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import { DataViewBase } from '@kbn/es-query';
-import { QuerySuggestion, DataPublicPluginStart } from 'src/plugins/data/public';
+import { QuerySuggestion, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   withKibana,
   KibanaReactContextValue,
   KibanaServices,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { RendererFunction } from '../utils/typed_react';
 
 interface WithKueryAutocompletionLifecycleProps {
diff --git a/x-pack/plugins/infra/public/containers/with_source/with_source.tsx b/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
index 10eaefba57df8..148b679018c7d 100644
--- a/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
+++ b/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
@@ -13,7 +13,7 @@ import {
 } from '../../../common/metrics_sources';
 import { RendererFunction } from '../../utils/typed_react';
 import { Source } from '../metrics_source';
-import { CreateDerivedIndexPattern } from '../../containers/metrics_source';
+import { CreateDerivedIndexPattern } from '../metrics_source';
 
 interface WithSourceProps {
   children: RendererFunction<{
diff --git a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
index 92a3b581d0bca..37801c16bcf1f 100644
--- a/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useEffect } from 'react';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { observabilityTitle } from '../translations';
 import { useKibanaContextForPlugin } from './use_kibana';
-import { useLinkProps } from '../../../observability/public';
 
 type AppId = 'logs' | 'metrics';
 
diff --git a/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx
index bcfff06d2cd69..e7c77096b7978 100644
--- a/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_bulk_get_saved_object.tsx
@@ -6,8 +6,8 @@
  */
 
 import { useState, useCallback } from 'react';
-import { SavedObjectsBatchResponse } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectsBatchResponse } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useBulkGetSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx
index f27b91891efd5..e034b2bc66f18 100644
--- a/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx
@@ -10,8 +10,8 @@ import {
   SavedObjectAttributes,
   SavedObjectsCreateOptions,
   SimpleSavedObject,
-} from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useCreateSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx
index 032533e32757a..1bacf1efa487a 100644
--- a/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_delete_saved_object.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useCallback } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useDeleteSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
index df6cef5df7bea..60754961e05ab 100644
--- a/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useState, useCallback } from 'react';
-import { SavedObjectAttributes, SavedObjectsBatchResponse } from 'src/core/public';
-import { useUiTracker } from '../../../observability/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectAttributes, SavedObjectsBatchResponse } from '@kbn/core/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useFindSavedObject = <SavedObjectType extends SavedObjectAttributes>(type: string) => {
   const trackMetric = useUiTracker({ app: 'infra_metrics' });
diff --git a/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
index 1d82ac5294737..0dad4a8d2cb56 100644
--- a/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx
@@ -6,8 +6,8 @@
  */
 
 import { useState, useCallback } from 'react';
-import { SavedObjectAttributes, SimpleSavedObject } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectAttributes, SimpleSavedObject } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useGetSavedObject = <SavedObjectType extends SavedObjectAttributes>(type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/hooks/use_http_request.tsx b/x-pack/plugins/infra/public/hooks/use_http_request.tsx
index 1d5c1ef4abfbb..b83c22abf9588 100644
--- a/x-pack/plugins/infra/public/hooks/use_http_request.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_http_request.tsx
@@ -7,10 +7,10 @@
 
 import React, { useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { HttpHandler } from 'src/core/public';
-import { ToastInput } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
+import { ToastInput } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useTrackedPromise, CanceledPromiseError } from '../utils/use_tracked_promise';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { InfraHttpError } from '../types';
 
 export function useHTTPRequest<Response>(
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana.tsx b/x-pack/plugins/infra/public/hooks/use_kibana.tsx
index e7f9295a09bae..0055d01a23bec 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana.tsx
@@ -7,12 +7,12 @@
 
 import type { PropsOf } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { CoreStart } from '../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import {
   createKibanaReactContext,
   KibanaReactContextValue,
   useKibana,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { InfraClientCoreSetup, InfraClientStartDeps, InfraClientStartExports } from '../types';
 
 export type PluginKibanaContextValue = CoreStart & InfraClientStartDeps & InfraClientStartExports;
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
index 99cd094b50e1e..2a72a2d3b3d68 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
@@ -6,13 +6,13 @@
  */
 
 import React, { useMemo } from 'react';
-import { from, of } from 'rxjs';
+import { firstValueFrom, from, of } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { CoreStart } from '../../../../../src/core/public';
-import { FieldSpec } from '../../../../../src/plugins/data/common';
-import { DataView, DataViewsContract } from '../../../../../src/plugins/data_views/public';
-import { DataViewField } from '../../../../../src/plugins/data_views/common';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { FieldSpec } from '@kbn/data-plugin/common';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { Pick2 } from '../../common/utility_types';
 
 type MockIndexPattern = Pick<
@@ -60,13 +60,13 @@ export const createIndexPatternsMock = (
       const indexPatterns$ = of(
         indexPatterns.map(({ id = 'unknown_id', title }) => ({ id, title }))
       );
-      return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+      return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
     },
     async get(indexPatternId: string) {
       const indexPatterns$ = from(
         indexPatterns.filter((indexPattern) => indexPattern.id === indexPatternId)
       );
-      return await indexPatterns$.pipe(delay(asyncDelay)).toPromise();
+      return await firstValueFrom(indexPatterns$.pipe(delay(asyncDelay)));
     },
   };
 };
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_space.ts b/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
index 3c20642d32eb2..5a90327ff0581 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
@@ -6,8 +6,8 @@
  */
 
 import useAsync from 'react-use/lib/useAsync';
-import { useKibanaContextForPlugin } from '../hooks/use_kibana';
-import type { Space } from '../../../spaces/public';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { useKibanaContextForPlugin } from './use_kibana';
 
 export type ActiveSpace =
   | { isLoading: true; error: undefined; space: undefined }
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts b/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts
index 7f3e11e9429e0..411b6013154cd 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_time_zone_setting.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 
 export function useKibanaTimeZoneSetting() {
   const [kibanaTimeZone] = useUiSetting$<string>(UI_SETTINGS.DATEFORMAT_TZ);
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
index 15eb525dca734..4128c2b17f624 100644
--- a/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
@@ -9,8 +9,8 @@ import { useCallback, useEffect } from 'react';
 
 import useUpdateEffect from 'react-use/lib/useUpdateEffect';
 import useMount from 'react-use/lib/useMount';
+import { TimeRange, TimefilterContract } from '@kbn/data-plugin/public';
 import { useKibanaContextForPlugin } from './use_kibana';
-import { TimeRange, TimefilterContract } from '../../../../../src/plugins/data/public';
 
 export const useKibanaTimefilterTime = ({
   from: fromDefault,
diff --git a/x-pack/plugins/infra/public/hooks/use_log_view.ts b/x-pack/plugins/infra/public/hooks/use_log_view.ts
index 95363d12a9135..b1b8bb6e33cc9 100644
--- a/x-pack/plugins/infra/public/hooks/use_log_view.ts
+++ b/x-pack/plugins/infra/public/hooks/use_log_view.ts
@@ -7,7 +7,7 @@
 
 import createContainer from 'constate';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { LogView, LogViewAttributes, LogViewStatus, ResolvedLogView } from '../../common/log_views';
 import type { ILogViewsClient } from '../services/log_views';
 import { isRejectedPromiseState, useTrackedPromise } from '../utils/use_tracked_promise';
diff --git a/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx b/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx
index e00e5b4818ba6..d2fc556caa57b 100644
--- a/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_logs_breadcrumbs.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useBreadcrumbs } from './use_breadcrumbs';
 import { LOGS_APP } from '../../common/constants';
 import { logsTitle } from '../translations';
diff --git a/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx b/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx
index e55f65a97b63e..4679d4fe67f7e 100644
--- a/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_metrics_breadcrumbs.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { useBreadcrumbs } from './use_breadcrumbs';
 import { METRICS_APP } from '../../common/constants';
 import { metricsTitle } from '../translations';
diff --git a/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx b/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx
index a0b0558e0393d..293a5de99ceb5 100644
--- a/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_readonly_badge.tsx
@@ -7,7 +7,7 @@
 
 import { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useReadOnlyBadge = (isReadOnly = false) => {
   const chrome = useKibana().services.chrome;
diff --git a/x-pack/plugins/infra/public/hooks/use_trial_status.tsx b/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
index 41faa9b97ccbb..48576498e47da 100644
--- a/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
@@ -8,10 +8,10 @@
 import { boolean } from 'io-ts';
 import { i18n } from '@kbn/i18n';
 import { useState } from 'react';
-import { HttpStart, NotificationsStart } from 'src/core/public';
+import { HttpStart, NotificationsStart } from '@kbn/core/public';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { API_BASE_PATH as LICENSE_MANAGEMENT_API_BASE_PATH } from '../../../license_management/common/constants';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { API_BASE_PATH as LICENSE_MANAGEMENT_API_BASE_PATH } from '@kbn/license-management-plugin/common/constants';
 import { useTrackedPromise } from '../utils/use_tracked_promise';
 import { decodeOrThrow } from '../../common/runtime_types';
 
diff --git a/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx b/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
index 563e0e43cc3b8..0f0d38648169e 100644
--- a/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx
@@ -10,8 +10,8 @@ import {
   SavedObjectAttributes,
   SavedObjectsCreateOptions,
   SimpleSavedObject,
-} from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const useUpdateSavedObject = (type: string) => {
   const kibana = useKibana();
diff --git a/x-pack/plugins/infra/public/index.ts b/x-pack/plugins/infra/public/index.ts
index 929a430286b93..0ab52ad7ad623 100644
--- a/x-pack/plugins/infra/public/index.ts
+++ b/x-pack/plugins/infra/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import { Plugin } from './plugin';
 import {
   InfraClientSetupExports,
diff --git a/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts b/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
index 2f09fde24cada..e4704c69b446b 100644
--- a/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
+++ b/x-pack/plugins/infra/public/metrics_overview_fetchers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createMetricsFetchData, createMetricsHasData } from './metrics_overview_fetchers';
 import { createInfraPluginStartMock } from './mocks';
 import { FAKE_OVERVIEW_RESPONSE } from './test_utils';
diff --git a/x-pack/plugins/infra/public/metrics_overview_fetchers.ts b/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
index 831d05fee58a2..9a78d72ad2413 100644
--- a/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
+++ b/x-pack/plugins/infra/public/metrics_overview_fetchers.ts
@@ -13,7 +13,7 @@
  * 2.0.
  */
 
-import { FetchDataParams, MetricsFetchDataResponse } from '../../observability/public';
+import { FetchDataParams, MetricsFetchDataResponse } from '@kbn/observability-plugin/public';
 import { TopNodesRequest, TopNodesResponse } from '../common/http_api/overview_api';
 import { InfraStaticSourceConfiguration } from '../common/source_configuration/source_configuration';
 import { InfraClientStartServicesAccessor } from './types';
diff --git a/x-pack/plugins/infra/public/pages/error.tsx b/x-pack/plugins/infra/public/pages/error.tsx
index f133bd70c230a..e102b2bac29a0 100644
--- a/x-pack/plugins/infra/public/pages/error.tsx
+++ b/x-pack/plugins/infra/public/pages/error.tsx
@@ -17,7 +17,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
 
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ColumnarPage, PageContent } from '../components/page';
 
 const DetailPageContent = euiStyled(PageContent)`
diff --git a/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx b/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx
index ae564622c1ba2..841ecbff9ddfb 100644
--- a/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/link_to_logs.test.tsx
@@ -9,8 +9,8 @@ import { render, waitFor } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
-import { httpServiceMock } from 'src/core/public/mocks';
-import { KibanaContextProvider, KibanaPageTemplate } from 'src/plugins/kibana_react/public';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { useLogView } from '../../hooks/use_log_view';
 import {
   createLoadedUseLogViewMock,
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
index e3d17f17af586..c31f54bd2f72e 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 
+import { LinkDescriptor } from '@kbn/observability-plugin/public';
 import { replaceMetricTimeInQueryString } from '../metrics/metric_detail/hooks/use_metrics_time';
 import { getFromFromLocation, getToFromLocation } from './query_params';
 import { InventoryItemType } from '../../../common/inventory_models/types';
-import { LinkDescriptor } from '../../../../observability/public';
 
 type RedirectToNodeDetailProps = RouteComponentProps<{
   nodeId: string;
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index c8bd111402d46..737e4b35fe15e 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -10,7 +10,7 @@ import { flowRight } from 'lodash';
 import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 import useMount from 'react-use/lib/useMount';
-import { LinkDescriptor } from '../../../../observability/public';
+import { LinkDescriptor } from '@kbn/observability-plugin/public';
 import { findInventoryFields } from '../../../common/inventory_models';
 import { InventoryItemType } from '../../../common/inventory_models/types';
 import { LoadingPage } from '../../components/loading_page';
diff --git a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts
index 0e6edac7a4644..150416a204b05 100644
--- a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts
+++ b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.test.ts
@@ -15,7 +15,7 @@ const renderUseHostIpToNameHook = () =>
 
 const mockedFetch = jest.fn();
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
+jest.mock('@kbn/kibana-react-plugin/public', () => {
   return {
     useKibana: () => {
       return {
diff --git a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts
index e2c25ba6fcfe2..29b9dd20d61ce 100644
--- a/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts
+++ b/x-pack/plugins/infra/public/pages/link_to/use_host_ip_to_name.ts
@@ -6,8 +6,8 @@
  */
 
 import { useState, useEffect } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { IpToHostResponse } from '../../../common/http_api/ip_to_hostname';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 export const useHostIpToName = (ipAddress: string | null, indexPattern: string | null) => {
   const fetch = useKibana().services.http?.fetch;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
index 252d4ff737c15..6c5151dd2587d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect } from 'react';
-import type { LazyObservabilityPageTemplateProps } from '../../../../../observability/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { LoadingPage } from '../../../components/loading_page';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
index 34faac3aefa0c..13dd004a1a5ce 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_results_content.tsx
@@ -11,10 +11,10 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import useInterval from 'react-use/lib/useInterval';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { MLJobsAwaitingNodeWarning, ML_PAGES, useMlHref } from '../../../../../ml/public';
-import { useTrackPageview } from '../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MLJobsAwaitingNodeWarning, ML_PAGES, useMlHref } from '@kbn/ml-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { TimeRange } from '../../../../common/time/time_range';
 import { CategoryJobNoticesSection } from '../../../components/logging/log_analysis_job_status';
 import { AnalyzeInMlButton } from '../../../components/logging/log_analysis_results';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
index ead8590ca3398..24b0985b15aac 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 interface LogEntryCategoriesSetupContentProps {
   onOpenSetup: () => void;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
index 1b172135cfc6c..4d17b6ed9e8c5 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/analyze_dataset_in_ml_action.tsx
@@ -9,11 +9,11 @@ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
+import { shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import { TimeRange } from '../../../../../../common/time/time_range';
-import { useMlHref, ML_PAGES } from '../../../../../../../ml/public';
 import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
-import { shouldHandleLinkEvent } from '../../../../../../../observability/public';
 
 export const AnalyzeCategoryDatasetInMlAction: React.FunctionComponent<{
   categorizationJobId: string;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
index f18d8b4d3e04d..be5806d2b3064 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/category_example_message.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { encode } from 'rison-node';
 import moment from 'moment';
 
+import { useUiTracker, useLinkProps } from '@kbn/observability-plugin/public';
 import { LogEntry, LogEntryContext } from '../../../../../../common/log_entry';
 import { TimeRange } from '../../../../../../common/time';
 import {
@@ -26,7 +27,6 @@ import {
 } from '../../../../../components/logging/log_text_stream';
 import { LogColumnConfiguration } from '../../../../../utils/source_configuration';
 import { LogEntryContextMenu } from '../../../../../components/logging/log_text_stream/log_entry_context_menu';
-import { useUiTracker, useLinkProps } from '../../../../../../../observability/public';
 
 export const exampleMessageScale = 'medium' as const;
 export const exampleTimestampFormat = 'dateTime' as const;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
index b01b89ca6a738..271eac8bf641d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/datasets_list.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntryCategoryDataset } from '../../../../../../common/log_analysis';
 import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
 
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx
index fe9297b9409c7..40cf29c8e6eb6 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/single_metric_comparison.tsx
@@ -10,7 +10,7 @@ import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const SingleMetricComparison: React.FunctionComponent<{
   currentValue: number;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
index 1c9e1c335ebf7..805670da93806 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/sections/top_categories/top_categories_table.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import React, { useMemo, useCallback } from 'react';
 import useSet from 'react-use/lib/useSet';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   LogEntryCategory,
   LogEntryCategoryDataset,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts
index e3c191d42dace..51d4a69ada295 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_datasets.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryCategoryDatasetsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts
index 5d1beadab29cd..90727fd6f0853 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_log_entry_category_examples.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryCategoryExamplesRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
index 9a3ae61d6db62..9472991e15c66 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/service_calls/get_top_log_entry_categories.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryCategoriesRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
index ece7a6b7358eb..ace38262e8a14 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { memo, useCallback, useEffect } from 'react';
 import useInterval from 'react-use/lib/useInterval';
-import type { LazyObservabilityPageTemplateProps } from '../../../../../observability/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
 import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { LoadingPage } from '../../../components/loading_page';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
index cf7a4789a687d..fc87ba8cd3cb9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
@@ -11,9 +11,9 @@ import moment from 'moment';
 import { stringify } from 'query-string';
 import React, { useCallback, useMemo } from 'react';
 import { encode, RisonValue } from 'rison-node';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { MLJobsAwaitingNodeWarning } from '../../../../../ml/public';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { TimeKey } from '../../../../common/time';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
index b94eb1ebd8748..6418142eaec0b 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 interface LogEntryRateSetupContentProps {
   onOpenSetup: () => void;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx
index b0e85a4648d6e..bd4e90faa6c19 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/anomalies_swimlane_visualisation.tsx
@@ -7,13 +7,13 @@
 
 import React, { useMemo } from 'react';
 import moment from 'moment';
-import { AutoRefresh } from '../../use_log_entry_rate_results_url_state';
-import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import {
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
   AnomalySwimlaneEmbeddableInput,
-} from '../../../../../../../ml/public';
-import { EmbeddableRenderer } from '../../../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/ml-plugin/public';
+import { EmbeddableRenderer } from '@kbn/embeddable-plugin/public';
+import { AutoRefresh } from '../../use_log_entry_rate_results_url_state';
+import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
 import { partitionField } from '../../../../../../common/infra_ml';
 import { MissingEmbeddableFactoryCallout } from '../../../../../components/missing_embeddable_factory_callout';
 import { TimeRange } from '../../../../../../common/time/time_range';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
index 85f96884fbae5..ef5db53ebdc31 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx
@@ -10,7 +10,7 @@ import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import useMount from 'react-use/lib/useMount';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { isCategoryAnomaly, LogEntryAnomaly } from '../../../../../../common/log_analysis';
 import { TimeRange } from '../../../../../../common/time/time_range';
 import { LogEntryExampleMessages } from '../../../../../components/logging/log_entry_examples/log_entry_examples';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
index be20e44a1434e..0e15a51f02d35 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
@@ -9,9 +9,10 @@ import React, { useMemo, useCallback, useState } from 'react';
 import moment from 'moment';
 import { encode } from 'rison-node';
 import { i18n } from '@kbn/i18n';
-import { useMlHref, ML_PAGES } from '../../../../../../../ml/public';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps, shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
 import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
 import {
   LogEntryColumn,
@@ -27,7 +28,6 @@ import {
   LogColumnHeadersWrapper,
   LogColumnHeader,
 } from '../../../../../components/logging/log_text_stream/column_headers';
-import { useLinkProps, shouldHandleLinkEvent } from '../../../../../../../observability/public';
 import { TimeRange } from '../../../../../../common/time/time_range';
 import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
 import { LogEntryExample, isCategoryAnomaly } from '../../../../../../common/log_analysis';
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
index 2a329ffd76499..5f0f95a3e7976 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import {
   getLogEntryAnomaliesRequestPayloadRT,
   getLogEntryAnomaliesSuccessReponsePayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts
index 8b7d85645c0a8..9b560845186f7 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_anomalies_datasets.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import {
   getLogEntryAnomaliesDatasetsRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts
index 7f12d6ed713c7..5844e00ebfe4e 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_examples.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpHandler } from 'src/core/public';
+import type { HttpHandler } from '@kbn/core/public';
 
 import {
   getLogEntryExamplesRequestPayloadRT,
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
index 3231a21ac1978..5bcf6455310b9 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_dataset_filtering.ts
@@ -7,8 +7,8 @@
 
 import { Filter } from '@kbn/es-query';
 import { useEffect, useReducer, useCallback } from 'react';
+import { CONTROLLED_BY_SWIM_LANE_FILTER } from '@kbn/ml-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
-import { CONTROLLED_BY_SWIM_LANE_FILTER } from '../../../../../ml/public';
 
 interface ReducerState {
   selectedDatasets: string[];
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx
index 73d0046ce9643..eb130a2e38c5d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_results_url_state.tsx
@@ -10,7 +10,7 @@ import useInterval from 'react-use/lib/useInterval';
 import datemath from '@kbn/datemath';
 import moment from 'moment';
 import * as rt from 'io-ts';
-import { TimeRange as KibanaTimeRange } from '../../../../../../../src/plugins/data/public';
+import { TimeRange as KibanaTimeRange } from '@kbn/data-plugin/public';
 import { TimeRange } from '../../../../common/time/time_range';
 import { useUrlState } from '../../../utils/use_url_state';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
index 785a1d5f691da..e42cfc2d7c54a 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -9,8 +9,8 @@ import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { HeaderMenuPortal, useLinkProps } from '../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-plugin/public';
 import { AlertDropdown } from '../../alerting/log_threshold';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
diff --git a/x-pack/plugins/infra/public/pages/logs/page_template.tsx b/x-pack/plugins/infra/public/pages/logs/page_template.tsx
index 6de13b495f0ba..be7a03256cfdf 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_template.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_template.tsx
@@ -7,12 +7,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import { KibanaPageTemplateProps, useKibana } from '@kbn/kibana-react-plugin/public';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
-import type { LazyObservabilityPageTemplateProps } from '../../../../observability/public';
-import {
-  KibanaPageTemplateProps,
-  useKibana,
-} from '../../../../../../src/plugins/kibana_react/public';
 
 interface LogsPageTemplateProps extends LazyObservabilityPageTemplateProps {
   hasData?: boolean;
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx b/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
index c076b2063825e..175b30de4e0b5 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
@@ -16,7 +16,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
 import { v4 as uuidv4 } from 'uuid';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogColumnConfiguration } from '../../../utils/source_configuration';
 import { useVisibilityState } from '../../../utils/use_visibility_state';
 
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx
index 20b40f5599976..2b26afda19041 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/index_names_configuration_panel.tsx
@@ -8,7 +8,7 @@
 import { EuiCode, EuiDescribedFormGroup, EuiFieldText, EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { LogIndexNameReference } from '../../../../common/log_views';
 import { FormElement } from './form_elements';
 import { getFormRowProps, getInputFieldProps } from './form_field_props';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
index 0b9f9ceae99cf..91936df960f22 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/index_pattern_configuration_panel.tsx
@@ -8,9 +8,9 @@
 import { EuiDescribedFormGroup, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { LogDataViewReference } from '../../../../common/log_views';
-import { useLinkProps } from '../../../../../observability/public';
 import { FormElement } from './form_elements';
 import { getFormRowProps } from './form_field_props';
 import { IndexPatternSelector } from './index_pattern_selector';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
index 8ebf2bed2b8df..d581c5feb3d6b 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
@@ -6,13 +6,13 @@
  */
 
 import { useMemo } from 'react';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import {
   LogDataViewReference,
   LogIndexNameReference,
   logIndexNameReferenceRT,
 } from '../../../../common/log_views';
-import { SavedObjectNotFound } from '../../../../../../../src/plugins/kibana_utils/common';
-import { useUiTracker } from '../../../../../observability/public';
 import { useKibanaIndexPatternService } from '../../../hooks/use_kibana_index_patterns';
 import { useFormElement } from './form_elements';
 import {
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
index 2edc00f44aea9..563057fb5de97 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
@@ -9,7 +9,7 @@ import { EuiCodeBlock, EuiPage, EuiPageBody, EuiPageContent, PropsOf } from '@el
 import { I18nProvider } from '@kbn/i18n-react';
 import { Meta, Story } from '@storybook/react/types-6-0';
 import React from 'react';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import {
   MockIndexPatternsKibanaContextProvider,
   MockIndexPatternSpec,
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
index 4127299d8db3b..70499975b77b2 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
@@ -8,7 +8,7 @@
 import { EuiCheckableCard, EuiFormFieldset, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
-import { useUiTracker } from '../../../../../observability/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import {
   logIndexNameReferenceRT,
   LogDataViewReference,
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
index de435500d3b32..2b59464d7c0ab 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
@@ -22,7 +22,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback } from 'react';
-import { DragHandleProps, DropResult } from '../../../../../observability/public';
+import { DragHandleProps, DropResult } from '@kbn/observability-plugin/public';
 import {
   FieldLogColumnConfiguration,
   getLogColumnConfigurationId,
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
index afb8e1346bed6..3909070178cd6 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
@@ -16,8 +16,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { Prompt, useTrackPageview } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { Prompt, useTrackPageview } from '@kbn/observability-plugin/public';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs';
 import { useLogViewContext } from '../../../hooks/use_log_view';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts b/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts
index 896fecc8d70dd..f8e4862817bae 100644
--- a/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts
+++ b/x-pack/plugins/infra/public/pages/logs/settings/validation_errors.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 export interface GenericValidationError {
   type: 'generic';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
index 2ac307570cc97..bb8e4307fe3b9 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
@@ -7,7 +7,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs';
 import { StreamPageContent } from './page_content';
 import { StreamPageHeader } from './page_header';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
index 3b59e097e7f97..fd1e4058e6745 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogSourceErrorPage } from '../../../components/logging/log_source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogViewContext } from '../../../hooks/use_log_view';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index a1b3f6d33324a..2cb7b2c6f5a7b 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -9,7 +9,7 @@ import { EuiSpacer } from '@elastic/eui';
 import type { Query } from '@kbn/es-query';
 import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import usePrevious from 'react-use/lib/usePrevious';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntry } from '../../../../common/log_entry';
 import { TimeKey } from '../../../../common/time';
 import { AutoSizer } from '../../../components/auto_sizer';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
index 7475ca331aadd..a579d519c5038 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
@@ -9,10 +9,10 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { NoIndices } from '../../../components/empty_states/no_indices';
 import { ViewSourceConfigurationButton } from '../../../components/source_configuration/view_source_configuration_button';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { useLinkProps } from '../../../../../observability/public';
 
 export const LogsPageNoIndicesContent = () => {
   const {
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
index b699a585ab4c7..e3b2f01b6712e 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -9,9 +9,9 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { Query } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogCustomizationMenu } from '../../../components/logging/log_customization_menu';
 import { LogDatepicker } from '../../../components/logging/log_datepicker';
 import { LogHighlightsMenu } from '../../../components/logging/log_highlights_menu';
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
index 954384b50ffa1..c2f08256bd130 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
@@ -16,10 +16,10 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import React, { useCallback, useContext, useMemo } from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { LogEntry } from '../../../../common/log_entry';
 import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
 import { useViewportDimensions } from '../../../utils/use_viewport_dimensions';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { LogStream } from '../../../components/log_stream';
 
 const MODAL_MARGIN = 25;
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index ffa799d93a20a..f4d42b5994eb5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -11,6 +11,9 @@ import React, { useContext } from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
@@ -27,7 +30,6 @@ import { SnapshotPage } from './inventory_view';
 import { MetricDetail } from './metric_detail';
 import { MetricsSettingsPage } from './settings';
 import { SourceLoadingPage } from '../../components/source_loading_page';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WaffleOptionsProvider } from './inventory_view/hooks/use_waffle_options';
 import { WaffleTimeProvider } from './inventory_view/hooks/use_waffle_time';
 import { WaffleFiltersProvider } from './inventory_view/hooks/use_waffle_filters';
@@ -37,9 +39,7 @@ import { SavedViewProvider } from '../../containers/saved_view/saved_view';
 import { AlertPrefillProvider } from '../../alerting/use_alert_prefill';
 import { InfraMLCapabilitiesProvider } from '../../containers/ml/infra_ml_capabilities';
 import { AnomalyDetectionFlyout } from './inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout';
-import { HeaderMenuPortal } from '../../../../observability/public';
 import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';
-import { useLinkProps } from '../../../../observability/public';
 import { CreateDerivedIndexPattern } from '../../containers/metrics_source';
 
 const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
index ad548a632573f..9e81d1310e1f9 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
-import { useUiTracker } from '../../../../../../observability/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useWaffleOptionsContext } from '../hooks/use_waffle_options';
 import { InfraFormatter } from '../../../../lib/lib';
 import { Timeline } from './timeline/timeline';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
index 3a1d52cc5664f..89bc192606944 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/dropdown_button.tsx
@@ -7,7 +7,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import React, { ReactNode } from 'react';
-import { withTheme, EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 interface Props {
   'data-test-subj'?: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
index 7f3de57b610a4..c05f07fb5e933 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import useInterval from 'react-use/lib/useInterval';
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SnapshotNode } from '../../../../../common/http_api';
 import { SavedView } from '../../../../containers/saved_view/saved_view';
 import { AutoSizer } from '../../../../components/auto_sizer';
@@ -23,7 +24,6 @@ import {
   WaffleLegendOptions,
 } from '../hooks/use_waffle_options';
 import { InfraFormatterType, InfraWaffleMapBounds } from '../../../../lib/lib';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { Toolbar } from './toolbars/toolbar';
 import { ViewSwitcher } from './waffle/view_switcher';
 import { createInventoryMetricFormatter } from '../lib/create_inventory_metric_formatter';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
index 41dde2ee02582..d86e0f9993d1e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
@@ -27,10 +27,11 @@ import {
   OnTimeChangeProps,
 } from '@elastic/eui';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n-react';
+import { withTheme } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { datemathToEpochMillis } from '../../../../../../../utils/datemath';
 import { SnapshotMetricType } from '../../../../../../../../common/inventory_models/types';
-import { withTheme } from '../../../../../../../../../../../src/plugins/kibana_react/common';
-import { useLinkProps } from '../../../../../../../../../observability/public';
 import { useSorting } from '../../../../../../../hooks/use_sorting';
 import { useMetricsK8sAnomaliesResults } from '../../../../hooks/use_metrics_k8s_anomalies';
 import { useMetricsHostsAnomaliesResults } from '../../../../hooks/use_metrics_hosts_anomalies';
@@ -45,7 +46,6 @@ import { AnomalySeverityIndicator } from '../../../../../../../components/loggin
 import { useSourceContext } from '../../../../../../../containers/metrics_source';
 import { createResultsUrl } from '../flyout_home';
 import { useWaffleViewState, WaffleViewState } from '../../../../hooks/use_waffle_view_state';
-import { useUiTracker } from '../../../../../../../../../observability/public';
 type JobType = 'k8s' | 'hosts';
 type SortField = 'anomalyScore' | 'startTime';
 interface JobOption {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
index 1918d17b5e53a..eff62e8a7e6ee 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
@@ -16,7 +16,8 @@ import { EuiButtonEmpty } from '@elastic/eui';
 import moment from 'moment';
 import { EuiTabs } from '@elastic/eui';
 import { EuiTab } from '@elastic/eui';
-import { MLJobsAwaitingNodeWarning } from '../../../../../../../../ml/public';
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { SubscriptionSplashPrompt } from '../../../../../../components/subscription_splash_content';
 import { useInfraMLCapabilitiesContext } from '../../../../../../containers/ml/infra_ml_capabilities';
 import {
@@ -26,7 +27,6 @@ import {
 import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module';
 import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module';
 import { LoadingPrompt } from '../../../../../../components/loading_page';
-import { useLinkProps } from '../../../../../../../../observability/public';
 import { AnomaliesTable } from './anomalies_table/anomalies_table';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
index da439d71b6b89..ddc537201181f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
@@ -17,6 +17,7 @@ import moment, { Moment } from 'moment';
 import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
+import { useUiTracker } from '@kbn/observability-plugin/public';
 import { useSourceViaHttp } from '../../../../../../containers/metrics_source/use_source_via_http';
 import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module';
 import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module';
@@ -24,7 +25,6 @@ import { FixedDatePicker } from '../../../../../../components/fixed_datepicker';
 import { DEFAULT_K8S_PARTITION_FIELD } from '../../../../../../containers/ml/modules/metrics_k8s/module_descriptor';
 import { MetricsExplorerKueryBar } from '../../../../metrics_explorer/components/kuery_bar';
 import { convertKueryToElasticSearchQuery } from '../../../../../../utils/kuery';
-import { useUiTracker } from '../../../../../../../../observability/public';
 
 interface Props {
   jobType: 'hosts' | 'kubernetes';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
index 5c416b8a10333..d4e0b351fbe44 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/overlay.tsx
@@ -11,18 +11,18 @@ import React, { useMemo, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { EuiOutsideClickDetector } from '@elastic/eui';
 import { EuiIcon, EuiButtonIcon } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
 import { InventoryItemType } from '../../../../../../common/inventory_models/types';
 import { MetricsTab } from './tabs/metrics/metrics';
 import { LogsTab } from './tabs/logs';
 import { ProcessesTab } from './tabs/processes';
-import { PropertiesTab } from './tabs/properties/index';
+import { PropertiesTab } from './tabs/properties';
 import { AnomaliesTab } from './tabs/anomalies/anomalies';
 import { OsqueryTab } from './tabs/osquery';
 import { OVERLAY_Y_START, OVERLAY_BOTTOM_MARGIN } from './tabs/shared';
-import { useLinkProps } from '../../../../../../../observability/public';
 import { getNodeDetailUrl } from '../../../../link_to';
 import { findInventoryModel } from '../../../../../../common/inventory_models';
 import { navigateToUptime } from '../../lib/navigate_to_uptime';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
index 058928d1c8591..896b7157057e8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/logs.tsx
@@ -13,11 +13,11 @@ import { EuiFieldSearch } from '@elastic/eui';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiFlexItem } from '@elastic/eui';
 import { EuiButtonEmpty } from '@elastic/eui';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { TabContent, TabProps } from './shared';
 import { LogStream } from '../../../../../../components/log_stream';
 import { useWaffleOptionsContext } from '../../../hooks/use_waffle_options';
 import { findInventoryFields } from '../../../../../../../common/inventory_models';
-import { useLinkProps } from '../../../../../../../../observability/public';
 import { getNodeLogsUrl } from '../../../../../link_to';
 
 const TabComponent = (props: TabProps) => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx
index 9c9e91b814fad..2c371691f4587 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_header.tsx
@@ -10,9 +10,9 @@ import { EuiFlexItem } from '@elastic/eui';
 import React from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { colorTransformer } from '../../../../../../../../common/color_palette';
 import { MetricsExplorerOptionsMetric } from '../../../../../metrics_explorer/hooks/use_metrics_explorer_options';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   title: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx
index c8f924042b195..6c6992c118ca5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/chart_section.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/charts';
 import React from 'react';
 import moment from 'moment';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { MetricsExplorerSeries } from '../../../../../../../../common/http_api';
 import { MetricExplorerSeriesChart } from '../../../../../metrics_explorer/components/series_chart';
 import {
@@ -25,7 +26,6 @@ import {
 } from '../../../../../metrics_explorer/hooks/use_metrics_explorer_options';
 import { ChartHeader } from './chart_header';
 import { getTimelineChartTheme } from '../../../../../metrics_explorer/components/helpers/get_chart_theme';
-import { useUiSetting } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 
 const CHART_SIZE: ChartSizeArray = ['100%', 160];
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx
index 98944dd3f30c9..b9d314459477e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/metrics/metrics.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { Chart, niceTimeFormatter, PointerEvent } from '@elastic/charts';
 import { EuiLoadingChart, EuiSpacer, EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
 import { first, last } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TabContent, TabProps } from '../shared';
 import { useSnapshot } from '../../../../hooks/use_snaphot';
 import { useWaffleOptionsContext } from '../../../../hooks/use_waffle_options';
@@ -28,7 +29,6 @@ import {
 } from '../../../../../../../../common/http_api';
 import { createInventoryMetricFormatter } from '../../../../lib/create_inventory_metric_formatter';
 import { calculateDomain } from '../../../../../metrics_explorer/components/helpers/calculate_domain';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { ChartSection } from './chart_section';
 import {
   SYSTEM_METRIC_NAME,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx
index 2b772378ba590..d05c49c724579 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row.tsx
@@ -21,8 +21,8 @@ import {
   EuiButton,
   EuiSpacer,
 } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { AutoSizer } from '../../../../../../../components/auto_sizer';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { Process } from './types';
 import { ProcessRowCharts } from './process_row_charts';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx
index a847b4a808a73..2270b1e827e1b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/process_row_charts.tsx
@@ -18,15 +18,15 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { Axis, Chart, Settings, Position, TooltipValue, niceTimeFormatter } from '@elastic/charts';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { createFormatter } from '../../../../../../../../common/formatters';
-import { useUiSetting } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 import { getChartTheme } from '../../../../../metrics_explorer/components/helpers/get_chart_theme';
 import { calculateDomain } from '../../../../../metrics_explorer/components/helpers/calculate_domain';
 import { MetricsExplorerChartType } from '../../../../../metrics_explorer/hooks/use_metrics_explorer_options';
 import { MetricExplorerSeriesChart } from '../../../../../metrics_explorer/components/series_chart';
 import { MetricsExplorerAggregation } from '../../../../../../../../common/http_api';
 import { Color } from '../../../../../../../../common/color_palette';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { useProcessListRowChart } from '../../../../hooks/use_process_list_row_chart';
 import { Process } from './types';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx
index 1f6bed056f238..113daaa84461f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/processes_table.tsx
@@ -24,9 +24,9 @@ import {
   LEFT_ALIGNMENT,
   RIGHT_ALIGNMENT,
 } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ProcessListAPIResponse } from '../../../../../../../../common/http_api';
 import { FORMATTERS } from '../../../../../../../../common/formatters';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { SortBy } from '../../../../hooks/use_process_list';
 import { Process } from './types';
 import { ProcessRow } from './process_row';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx
index e1b3d1d616837..7df1e49bd46f0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/processes/summary_table.tsx
@@ -17,7 +17,7 @@ import {
   EuiDescriptionListDescription,
   EuiHorizontalRule,
 } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ProcessListAPIResponse } from '../../../../../../../../common/http_api';
 import { STATE_NAMES } from './states';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx
index 010a1a9941335..22c2af5496a60 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/properties/index.tsx
@@ -8,6 +8,7 @@
 import React, { useCallback, useContext, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingChart } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TabContent, TabProps } from '../shared';
 import { Source } from '../../../../../../../containers/metrics_source';
 import { findInventoryModel } from '../../../../../../../../common/inventory_models';
@@ -16,7 +17,6 @@ import { useMetadata } from '../../../../../metric_detail/hooks/use_metadata';
 import { getFields } from './build_fields';
 import { useWaffleTimeContext } from '../../../../hooks/use_waffle_time';
 import { Table } from './table';
-import { euiStyled } from '../../../../../../../../../../../src/plugins/kibana_react/common';
 import { useWaffleFiltersContext } from '../../../../hooks/use_waffle_filters';
 
 const TabComponent = (props: TabProps) => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx
index f011f91a2e9df..41449e195ade8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/node_details/tabs/shared.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InventoryItemType } from '../../../../../../../common/inventory_models/types';
 import { InfraWaffleMapOptions, InfraWaffleMapNode } from '../../../../../../lib/lib';
-import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 export interface TabProps {
   options: InfraWaffleMapOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
index cec595e4be3d6..ab0a75e1cd9f5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/nodes_overview.tsx
@@ -9,8 +9,8 @@ import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
 import { getBreakpoint } from '@elastic/eui';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { InfraWaffleMapBounds, InfraWaffleMapOptions, InfraFormatter } from '../../../../lib/lib';
 import { NoData } from '../../../../components/empty_states';
 import { InfraLoadingPanel } from '../../../../components/loading';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx
index 70e613d536ef3..0477998bb41b2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/timeline/timeline.tsx
@@ -26,7 +26,8 @@ import {
 import { EuiFlexItem } from '@elastic/eui';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiIcon } from '@elastic/eui';
-import { useUiSetting } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { toMetricOpt } from '../../../../../../common/snapshot_metric_i18n';
 import { MetricsExplorerAggregation } from '../../../../../../common/http_api';
 import { colorTransformer, Color } from '../../../../../../common/color_palette';
@@ -40,7 +41,6 @@ import { MetricsExplorerChartType } from '../../../metrics_explorer/hooks/use_me
 import { getTimelineChartTheme } from '../../../metrics_explorer/components/helpers/get_chart_theme';
 import { calculateDomain } from '../../../metrics_explorer/components/helpers/calculate_domain';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { InfraFormatter } from '../../../../../lib/lib';
 import { useMetricsHostsAnomaliesResults } from '../../hooks/use_metrics_hosts_anomalies';
 import { useMetricsK8sAnomaliesResults } from '../../hooks/use_metrics_k8s_anomalies';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
index d8b578769a1cb..0f517b1f12aee 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ConditionalToolTip } from './conditional_tooltip';
 import { InfraWaffleMapNode } from '../../../../../lib/lib';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx
index a47512906abd1..fdc4ff0124cf6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/conditional_tooltip.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { first } from 'lodash';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { getCustomMetricLabel } from '../../../../../../common/formatters/get_custom_metric_label';
 import { SnapshotCustomMetricInput } from '../../../../../../common/http_api';
-import { withTheme, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { useSourceContext } from '../../../../../containers/metrics_source';
 import { findInventoryModel } from '../../../../../../common/inventory_models';
 import {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx
index 062349fa3ec6c..99d5cadde8a8e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/gradient_legend.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraFormatter,
   InfraWaffleMapBounds,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
index 6e1c75ad22bb0..6de97efef44ad 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
@@ -8,7 +8,7 @@
 import { EuiLink, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InfraWaffleMapGroup, InfraWaffleMapOptions } from '../../../../../lib/lib';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
index 755512e0f6d40..634d98f28d8b5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapGroupOfGroups,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
index c6291d4ec4050..043586b682693 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { isEqual } from 'lodash';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapGroupOfNodes,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx
index 853aa98bf6244..0679926470ff2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraFormatter,
   InfraWaffleMapBounds,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
index 8c5fe72c4f48a..e0d03284d63fc 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/map.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { nodesToWaffleMap } from '../../lib/nodes_to_wafflemap';
 import { isWaffleMapGroupWithGroups, isWaffleMapGroupWithNodes } from '../../lib/type_guards';
 import { InfraWaffleMapBounds, InfraWaffleMapOptions } from '../../../../../lib/lib';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
index b1dd72b572a89..c55bdba5179b6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.tsx
@@ -22,13 +22,13 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import {
   SnapshotCustomAggregation,
   SnapshotCustomMetricInput,
   SNAPSHOT_CUSTOM_AGGREGATIONS,
   SnapshotCustomAggregationRT,
 } from '../../../../../../../common/http_api/snapshot_api';
-import { EuiTheme, withTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
 import { DerivedIndexPattern } from '../../../../../../containers/metrics_source';
 
 interface SelectedOption {
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 58088f0b208f8..8ea98859b2c16 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
@@ -8,9 +8,9 @@
 import React from 'react';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import { getCustomMetricLabel } from '../../../../../../../common/formatters/get_custom_metric_label';
 import { SnapshotCustomMetricInput } from '../../../../../../../common/http_api/snapshot_api';
-import { EuiTheme, withTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   theme: EuiTheme | undefined;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
index 8c2cb77d339e2..a27e21e7f511a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/metric_control/mode_switcher.tsx
@@ -9,9 +9,9 @@ import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiButton } from '@elastic/e
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import { CustomMetricMode } from './types';
 import { SnapshotCustomMetricInput } from '../../../../../../../common/http_api/snapshot_api';
-import { EuiTheme, withTheme } from '../../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   theme: EuiTheme | undefined;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
index 7c626e7a74736..0eda4c4b72cd1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node.tsx
@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 
 import { first } from 'lodash';
 import { EuiPopover, EuiToolTip } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraWaffleMapNode,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
index 88b7bfeeec4d7..88fbb10b62ead 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/node_context_menu.tsx
@@ -10,13 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import React, { useMemo, useState } from 'react';
-import { AlertFlyout } from '../../../../../alerting/inventory/components/alert_flyout';
-import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
-import { getNodeDetailUrl, getNodeLogsUrl } from '../../../../link_to';
-import { findInventoryModel, findInventoryFields } from '../../../../../../common/inventory_models';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
-import { InventoryItemType } from '../../../../../../common/inventory_models/types';
-import { withTheme, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import {
   Section,
   SectionLinkProps,
@@ -25,8 +20,13 @@ import {
   SectionLinks,
   SectionLink,
   ActionMenuDivider,
-} from '../../../../../../../observability/public';
-import { useLinkProps } from '../../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
+import { AlertFlyout } from '../../../../../alerting/inventory/components/alert_flyout';
+import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
+import { getNodeDetailUrl, getNodeLogsUrl } from '../../../../link_to';
+import { findInventoryModel, findInventoryFields } from '../../../../../../common/inventory_models';
+import { InventoryItemType } from '../../../../../../common/inventory_models/types';
 import { navigateToUptime } from '../../lib/navigate_to_uptime';
 import { InfraClientCoreStart, InfraClientStartDeps } from '../../../../../types';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx
index 4c00b9afa225a..132982eae69b9 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/palette_preview.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InventoryColorPalette } from '../../../../../lib/lib';
 import { getColorPalette } from '../../lib/get_color_palette';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
index 339426b126b9e..9185a6398f162 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/stepped_gradient_legend.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiText } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraWaffleMapBounds,
   InfraFormatter,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx
index e3c3fde300677..9d39f8a7f4a1a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/steps_legend.tsx
@@ -8,7 +8,7 @@
 import { darken } from 'polished';
 import React from 'react';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import {
   InfraFormatter,
   InfraWaffleMapRuleOperator,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx
index 1e24da81ab379..419e41ae04557 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_group_by_controls.tsx
@@ -15,9 +15,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InfraGroupByOptions } from '../../../../../lib/lib';
 import { CustomFieldPanel } from './custom_field_panel';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { InventoryItemType } from '../../../../../../common/inventory_models/types';
 import { SnapshotGroupBy } from '../../../../../../common/http_api/snapshot_api';
 import { DropdownButton } from '../dropdown_button';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
index dd5b1857e1e64..f4515ac3be7d0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_sort_controls.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useMemo, useState, ReactNode } from 'react';
 import { EuiSwitch, EuiContextMenuPanelDescriptor, EuiPopover, EuiContextMenu } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { EuiTheme, withTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
 import { WaffleSortOption } from '../../hooks/use_waffle_options';
 import { DropdownButton } from '../dropdown_button';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
index eda92f8dfb0ea..64c0f36a9cf92 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/waffle_time_controls.tsx
@@ -9,8 +9,8 @@ import { EuiButton, EuiDatePicker, EuiFlexGroup, EuiFlexItem, EuiToolTip } from
 import { FormattedMessage } from '@kbn/i18n-react';
 import moment, { Moment } from 'moment';
 import React, { useCallback } from 'react';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { convertIntervalToString } from '../../../../../utils/convert_interval_to_string';
-import { withTheme, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { useWaffleTimeContext } from '../../hooks/use_waffle_time';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts
index b28a0ff0b4788..ce2c05c103811 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_hosts_anomalies.ts
@@ -6,7 +6,7 @@
  */
 
 import { useMemo, useState, useCallback, useEffect, useReducer } from 'react';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   INFA_ML_GET_METRICS_HOSTS_ANOMALIES_PATH,
   Metric,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts
index 986c4dfa2f8e8..0545c98656652 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_metrics_k8s_anomalies.ts
@@ -6,7 +6,7 @@
  */
 
 import { useMemo, useState, useCallback, useEffect, useReducer } from 'react';
-import { HttpHandler } from 'src/core/public';
+import { HttpHandler } from '@kbn/core/public';
 import {
   Sort,
   Pagination,
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
index 87765088d6343..47e8d739d73e8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
@@ -8,6 +8,9 @@
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { FilterBar } from './components/filter_bar';
 
 import { DocumentTitle } from '../../../components/document_title';
@@ -15,15 +18,12 @@ import { DocumentTitle } from '../../../components/document_title';
 import { SourceErrorPage } from '../../../components/source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { Source } from '../../../containers/metrics_source';
-import { useTrackPageview } from '../../../../../observability/public';
 import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
 import { LayoutView } from './components/layout_view';
 import { SavedViewProvider } from '../../../containers/saved_view/saved_view';
 import { DEFAULT_WAFFLE_VIEW_STATE } from './hooks/use_waffle_view_state';
 import { useWaffleOptionsContext } from './hooks/use_waffle_options';
 import { MetricsPageTemplate } from '../page_template';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
 import { inventoryTitle } from '../../../translations';
 import { SavedViews } from './components/saved_views';
 import { SnapshotContainer } from './components/snapshot_container';
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts
index 1ad00e82a6ac3..74ce3dc55e999 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/navigate_to_uptime.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { uptimeOverviewLocatorID } from '@kbn/observability-plugin/public';
+import { LocatorClient } from '@kbn/share-plugin/common/url_service/locators';
 import { InfraWaffleMapNode } from '../../../../lib/lib';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
-import { uptimeOverviewLocatorID } from '../../../../../../observability/public';
-import { LocatorClient } from '../../../../../../../../src/plugins/share/common/url_service/locators';
 
 export const navigateToUptime = (
   locators: LocatorClient,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
index 0affa883ed134..38db16c314a70 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
@@ -18,6 +18,7 @@ import {
   BrushEndListener,
 } from '@elastic/charts';
 import { EuiPageContentBody } from '@elastic/eui';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { getChartTheme } from '../../metrics_explorer/components/helpers/get_chart_theme';
 import { SeriesChart } from './series_chart';
 import {
@@ -30,7 +31,6 @@ import {
 } from './helpers';
 import { ErrorMessage } from './error_message';
 import { useKibanaUiSetting } from '../../../../utils/use_kibana_ui_setting';
-import { useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { VisSectionProps } from '../types';
 
 export const ChartSectionVis = ({
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
index 709357719763b..9afa35e0acc9f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
@@ -17,7 +17,7 @@ import {
 import { get, last, max } from 'lodash';
 import React, { ReactText } from 'react';
 
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { createFormatter } from '../../../../../common/formatters';
 import { InventoryFormatterType } from '../../../../../common/inventory_models/types';
 import { SeriesOverrides, VisSectionProps } from '../types';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
index 14cc8d4d3eb1b..2d7820af4bd4a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/invalid_node.tsx
@@ -8,9 +8,9 @@
 import { EuiButton, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { ViewSourceConfigurationButton } from '../../../../components/source_configuration/view_source_configuration_button';
-import { useLinkProps } from '../../../../../../observability/public';
 
 interface InvalidNodeErrorProps {
   nodeName: string;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
index 37fe0d523073c..cea4c92e1d113 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
@@ -6,7 +6,7 @@
  */
 
 import { EuiPageContent } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 export const LayoutContent = euiStyled(EuiPageContent)`
   position: relative;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx
index fa1ff9d60505b..924e82fc4a4df 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/metadata_details.tsx
@@ -9,8 +9,8 @@ import React, { useContext, useState, useCallback, useMemo } from 'react';
 import { EuiButtonIcon, EuiFlexGrid, EuiFlexItem, EuiTitle, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { InfraMetadata } from '../../../../../common/http_api';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { MetadataContext } from '../containers/metadata_context';
 
 interface FieldDef {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx
index b141bcd0d6283..ddc418c50ce8a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/time_controls.tsx
@@ -7,8 +7,8 @@
 
 import { EuiSuperDatePicker, OnRefreshChangeProps, OnTimeChangeProps } from '@elastic/eui';
 import React, { useCallback } from 'react';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { MetricsTimeInput } from '../hooks/use_metrics_time';
 import { useKibanaUiSetting } from '../../../../utils/use_kibana_ui_setting';
 import { mapKibanaQuickRangesToDatePickerRanges } from '../../../../utils/map_timepicker_quickranges_to_datepicker_ranges';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx
index 5260cd4d680f6..c3c37b4146a7a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/hooks/metrics_time.test.tsx
@@ -9,7 +9,7 @@ import { createMemoryHistory } from 'history';
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { mountHook } from '@kbn/test-jest-helpers';
-import { ScopedHistory } from '../../../../../../../../src/core/public';
+import { ScopedHistory } from '@kbn/core/public';
 import { useMetricsTime } from './use_metrics_time';
 
 describe('useMetricsTime hook', () => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
index 7d5c9b78b0095..e6843b98cf701 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/index.tsx
@@ -7,7 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useContext, useState } from 'react';
-import { EuiTheme, withTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { DocumentTitle } from '../../../components/document_title';
 import { withMetricPageProviders } from './page_providers';
 import { useMetadata } from './hooks/use_metadata';
@@ -19,7 +20,6 @@ import { NavItem } from './lib/side_nav_context';
 import { NodeDetailsPage } from './components/node_details_page';
 import { InventoryItemType } from '../../../../common/inventory_models/types';
 import { useMetricsTimeContext } from './hooks/use_metrics_time';
-import { useLinkProps } from '../../../../../observability/public';
 import { MetricsPageTemplate } from '../page_template';
 import { inventoryTitle } from '../../../translations';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts b/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts
index 2b67e3af02c2f..31399b5f8696c 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/types.ts
@@ -6,7 +6,7 @@
  */
 
 import rt from 'io-ts';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { InventoryFormatterTypeRT } from '../../../../common/inventory_models/types';
 import { MetricsTimeInput } from './hooks/use_metrics_time';
 import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
index c178532c13b92..92297b1e47b22 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
@@ -19,6 +19,8 @@ import {
 } from '@elastic/charts';
 import { first, last } from 'lodash';
 import moment from 'moment';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
 import {
@@ -27,7 +29,6 @@ import {
   MetricsExplorerYAxisMode,
   MetricsExplorerChartOptions,
 } from '../hooks/use_metrics_explorer_options';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { createFormatterForMetric } from './helpers/create_formatter_for_metric';
 import { MetricExplorerSeriesChart } from './series_chart';
 import { MetricsExplorerChartContextMenu } from './chart_context_menu';
@@ -36,7 +37,6 @@ import { MetricsExplorerNoMetrics } from './no_metrics';
 import { getChartTheme } from './helpers/get_chart_theme';
 import { useKibanaUiSetting } from '../../../../utils/use_kibana_ui_setting';
 import { calculateDomain } from './helpers/calculate_domain';
-import { useKibana, useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ChartTitle } from './chart_title';
 
 interface Props {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx
index 49568bdd8404c..8f9106ed04539 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.test.tsx
@@ -14,9 +14,9 @@ import {
   timeRange,
   chartOptions,
 } from '../../../../utils/fixtures/metrics_explorer';
-import { Capabilities } from 'src/core/public';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { Capabilities } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const coreStartMock = coreMock.createStart();
 const series = { id: 'exmaple-01', rows: [], columns: [] };
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
index 9a2b8366f920f..65770d4b97889 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
@@ -15,7 +15,8 @@ import {
   EuiPopover,
 } from '@elastic/eui';
 import DateMath from '@kbn/datemath';
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
+import { useLinkProps } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import { AlertFlyout } from '../../../../alerting/metric_threshold/components/alert_flyout';
 import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
@@ -28,7 +29,6 @@ import { createTSVBLink } from './helpers/create_tsvb_link';
 import { getNodeDetailUrl } from '../../../link_to/redirect_to_node_detail';
 import { InventoryItemType } from '../../../../../common/inventory_models/types';
 import { HOST_FIELD, POD_FIELD, CONTAINER_FIELD } from '../../../../../common/constants';
-import { useLinkProps } from '../../../../../../observability/public';
 
 export interface Props {
   options: MetricsExplorerOptions;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
index 7c6e77876ac67..7db25ae6898f1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
@@ -8,6 +8,7 @@
 import { encode } from 'rison-node';
 import uuid from 'uuid';
 import { set } from '@elastic/safer-lodash-set';
+import { LinkDescriptor } from '@kbn/observability-plugin/public';
 import { TIMESTAMP_FIELD } from '../../../../../../common/constants';
 import { MetricsSourceConfigurationProperties } from '../../../../../../common/metrics_sources';
 import { colorTransformer, Color } from '../../../../../../common/color_palette';
@@ -23,7 +24,6 @@ import {
 import { metricToFormat } from './metric_to_format';
 import { InfraFormatterType } from '../../../../../lib/lib';
 import { createMetricLabel } from './create_metric_label';
-import { LinkDescriptor } from '../../../../../../../observability/public';
 
 /*
  We've recently changed the default index pattern in Metrics UI from `metricbeat-*` to
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
index 710f547d003ca..ff3cbdceefb3f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/kuery_bar.tsx
@@ -9,9 +9,9 @@ import { i18n } from '@kbn/i18n';
 import { fromKueryExpression } from '@kbn/es-query';
 import React, { useEffect, useState } from 'react';
 import { DataViewBase } from '@kbn/es-query';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
 import { WithKueryAutocompletion } from '../../../../containers/with_kuery_autocompletion';
 import { AutocompleteField } from '../../../../components/autocomplete_field';
-import { QuerySuggestion } from '../../../../../../../../src/plugins/data/public';
 
 type LoadSuggestionsFn = (
   e: string,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
index 92d196c68f59f..747b90367e4b0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/toolbar.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiSuperDatePicker, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import {
   MetricsExplorerMetric,
   MetricsExplorerAggregation,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
index 0f903e4c4553a..1813b2a81c101 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { useMetricsExplorerData } from './use_metrics_explorer_data';
 
 import { renderHook } from '@testing-library/react-hooks';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import {
   options,
@@ -21,7 +21,7 @@ import {
 } from '../../../../utils/fixtures/metrics_explorer';
 import { MetricsExplorerOptions, MetricsExplorerTimeOptions } from './use_metrics_explorer_options';
 import { DataViewBase } from '@kbn/es-query';
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 
 const mockedFetch = jest.fn();
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
index ab4bf11dadb35..2c1be3d17f6f8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
@@ -10,6 +10,7 @@ import { useEffect, useState } from 'react';
 import { DataViewBase } from '@kbn/es-query';
 import { isEqual } from 'lodash';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import {
   MetricsExplorerResponse,
@@ -17,7 +18,6 @@ import {
 } from '../../../../../common/http_api/metrics_explorer';
 import { convertKueryToElasticSearchQuery } from '../../../../utils/kuery';
 import { MetricsExplorerOptions, MetricsExplorerTimeOptions } from './use_metrics_explorer_options';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { decodeOrThrow } from '../../../../../common/runtime_types';
 import { useTrackedPromise } from '../../../../utils/use_tracked_promise';
 
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
index 7f331d54b9839..a475ae1c88c9a 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
@@ -8,8 +8,8 @@
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useContext } from 'react';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../../common/metrics_sources';
-import { useTrackPageview } from '../../../../../observability/public';
 import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
 import { DocumentTitle } from '../../../components/document_title';
 import { NoData } from '../../../components/empty_states';
diff --git a/x-pack/plugins/infra/public/pages/metrics/page_template.tsx b/x-pack/plugins/infra/public/pages/metrics/page_template.tsx
index 4da671283644d..3d6e8e6743947 100644
--- a/x-pack/plugins/infra/public/pages/metrics/page_template.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/page_template.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
-import type { LazyObservabilityPageTemplateProps } from '../../../../observability/public';
-import { KibanaPageTemplateProps } from '../../../../../../src/plugins/kibana_react/public';
 
 interface MetricsPageTemplateProps extends LazyObservabilityPageTemplateProps {
   hasData?: boolean;
diff --git a/x-pack/plugins/infra/public/pages/metrics/settings.tsx b/x-pack/plugins/infra/public/pages/metrics/settings.tsx
index c54725ab39754..62d23ef4f8470 100644
--- a/x-pack/plugins/infra/public/pages/metrics/settings.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/settings.tsx
@@ -7,7 +7,7 @@
 
 import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { SourceConfigurationSettings } from './settings/source_configuration_settings';
 
 export const MetricsSettingsPage = () => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
index 076110a7a79c2..eab8a82bc2d1e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/settings/source_configuration_settings.tsx
@@ -16,10 +16,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useContext, useMemo } from 'react';
+import { Prompt } from '@kbn/observability-plugin/public';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { Source } from '../../../containers/metrics_source';
 import { useInfraMLCapabilitiesContext } from '../../../containers/ml/infra_ml_capabilities';
-import { Prompt } from '../../../../../observability/public';
 import { IndicesConfigurationPanel } from './indices_configuration_panel';
 import { MLConfigurationPanel } from './ml_configuration_panel';
 import { NameConfigurationPanel } from './name_configuration_panel';
diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
index 623fab62f6286..f591acbde9d92 100644
--- a/x-pack/plugins/infra/public/plugin.ts
+++ b/x-pack/plugins/infra/public/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AppMountParameters, PluginInitializerContext } from 'kibana/public';
+import { AppMountParameters, PluginInitializerContext } from '@kbn/core/public';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 import { defaultLogViewsStaticConfig } from '../common/log_views';
 import { InfraPublicConfig } from '../common/plugin_config_types';
 import { createInventoryMetricRuleType } from './alerting/inventory';
diff --git a/x-pack/plugins/infra/public/register_feature.ts b/x-pack/plugins/infra/public/register_feature.ts
index 116308b95f6f9..968dc72f217e6 100644
--- a/x-pack/plugins/infra/public/register_feature.ts
+++ b/x-pack/plugins/infra/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  HomePublicPluginSetup,
-  FeatureCatalogueCategory,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
   homePlugin.featureCatalogue.register({
@@ -24,7 +21,7 @@ export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
     icon: 'metricsApp',
     path: `/app/metrics`,
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
   });
 
   homePlugin.featureCatalogue.register({
@@ -39,6 +36,6 @@ export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
     icon: 'logsApp',
     path: `/app/logs`,
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
   });
 };
diff --git a/x-pack/plugins/infra/public/services/log_views/log_views_client.ts b/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
index 75974e50351c6..0de44f87d719e 100644
--- a/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
+++ b/x-pack/plugins/infra/public/services/log_views/log_views_client.ts
@@ -6,9 +6,10 @@
  */
 
 import * as rt from 'io-ts';
-import { HttpStart } from 'src/core/public';
-import { ISearchGeneric } from 'src/plugins/data/public';
-import { DataViewsContract } from 'src/plugins/data_views/public';
+import { HttpStart } from '@kbn/core/public';
+import { ISearchGeneric } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { lastValueFrom } from 'rxjs';
 import {
   getLogViewResponsePayloadRT,
   getLogViewUrl,
@@ -57,39 +58,39 @@ export class LogViewsClient implements ILogViewsClient {
   }
 
   public async getResolvedLogViewStatus(resolvedLogView: ResolvedLogView): Promise<LogViewStatus> {
-    const indexStatus = await this.search({
-      params: {
-        ignore_unavailable: true,
-        allow_no_indices: true,
-        index: resolvedLogView.indices,
-        size: 0,
-        terminate_after: 1,
-        track_total_hits: 1,
-      },
-    })
-      .toPromise()
-      .then(
-        ({ rawResponse }) => {
-          if (rawResponse._shards.total <= 0) {
-            return 'missing' as const;
-          }
+    const indexStatus = await lastValueFrom(
+      this.search({
+        params: {
+          ignore_unavailable: true,
+          allow_no_indices: true,
+          index: resolvedLogView.indices,
+          size: 0,
+          terminate_after: 1,
+          track_total_hits: 1,
+        },
+      })
+    ).then(
+      ({ rawResponse }) => {
+        if (rawResponse._shards.total <= 0) {
+          return 'missing' as const;
+        }
 
-          const totalHits = decodeTotalHits(rawResponse.hits.total);
-          if (typeof totalHits === 'number' ? totalHits > 0 : totalHits.value > 0) {
-            return 'available' as const;
-          }
+        const totalHits = decodeTotalHits(rawResponse.hits.total);
+        if (typeof totalHits === 'number' ? totalHits > 0 : totalHits.value > 0) {
+          return 'available' as const;
+        }
 
-          return 'empty' as const;
-        },
-        (err) => {
-          if (err.status === 404) {
-            return 'missing' as const;
-          }
-          throw new FetchLogViewStatusError(
-            `Failed to check status of log indices of "${resolvedLogView.indices}": ${err}`
-          );
+        return 'empty' as const;
+      },
+      (err) => {
+        if (err.status === 404) {
+          return 'missing' as const;
         }
-      );
+        throw new FetchLogViewStatusError(
+          `Failed to check status of log indices of "${resolvedLogView.indices}": ${err}`
+        );
+      }
+    );
 
     return {
       index: indexStatus,
diff --git a/x-pack/plugins/infra/public/services/log_views/types.ts b/x-pack/plugins/infra/public/services/log_views/types.ts
index 12dac93af6fa9..20e176db4cab4 100644
--- a/x-pack/plugins/infra/public/services/log_views/types.ts
+++ b/x-pack/plugins/infra/public/services/log_views/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { HttpStart } from 'src/core/public';
-import { ISearchStart } from 'src/plugins/data/public';
-import { DataViewsContract } from 'src/plugins/data_views/public';
+import { HttpStart } from '@kbn/core/public';
+import { ISearchStart } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
 import {
   LogView,
   LogViewAttributes,
diff --git a/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx b/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx
index 9330f83cd968a..7d32cb6360fdf 100644
--- a/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx
+++ b/x-pack/plugins/infra/public/test_utils/use_global_storybook_theme.tsx
@@ -8,9 +8,9 @@
 import type { StoryContext } from '@storybook/addons';
 import React, { useEffect, useMemo, useState } from 'react';
 import { BehaviorSubject } from 'rxjs';
-import type { CoreTheme } from '../../../../../src/core/public';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import type { CoreTheme } from '@kbn/core/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
 export const useGlobalStorybookTheme = ({ globals: { euiTheme } }: StoryContext) => {
   const theme = useMemo(() => euiThemeFromId(euiTheme), [euiTheme]);
diff --git a/x-pack/plugins/infra/public/types.ts b/x-pack/plugins/infra/public/types.ts
index b4410b87d9b79..ab7df75592712 100644
--- a/x-pack/plugins/infra/public/types.ts
+++ b/x-pack/plugins/infra/public/types.ts
@@ -5,29 +5,29 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Plugin as PluginClass } from 'kibana/public';
-import { IHttpFetchError } from 'src/core/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
-import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
+import type { CoreSetup, CoreStart, Plugin as PluginClass } from '@kbn/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
 import type {
   UsageCollectionSetup,
   UsageCollectionStart,
-} from '../../../../src/plugins/usage_collection/public';
+} from '@kbn/usage-collection-plugin/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../plugins/triggers_actions_ui/public';
-import type { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public';
-import { MlPluginSetup, MlPluginStart } from '../../ml/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { DataEnhancedSetup, DataEnhancedStart } from '@kbn/data-enhanced-plugin/public';
+import { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
 import type {
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../observability/public';
+} from '@kbn/observability-plugin/public';
 // import type { OsqueryPluginStart } from '../../osquery/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { UnwrapPromise } from '../common/utility_types';
 import type {
   SourceProviderProps,
diff --git a/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts b/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts
index 9f04cae475c00..52f08f39bc2d4 100644
--- a/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/flatten_data_search_response.ts
@@ -6,7 +6,7 @@
  */
 
 import { map } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { ParsedDataSearchRequestDescriptor } from './types';
 
 export const flattenDataSearchResponseDescriptor = <
diff --git a/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts b/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts
index 71975af168f9f..0056b7466759a 100644
--- a/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/normalize_data_search_responses.ts
@@ -7,8 +7,8 @@
 
 import { Observable, of } from 'rxjs';
 import { catchError, map, startWith } from 'rxjs/operators';
-import { IKibanaSearchResponse } from '../../../../../../src/plugins/data/public';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/public';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/public';
 import { SearchStrategyError } from '../../../common/search_strategies/common/errors';
 import { ParsedKibanaSearchResponse } from './types';
 
diff --git a/x-pack/plugins/infra/public/utils/data_search/types.ts b/x-pack/plugins/infra/public/utils/data_search/types.ts
index 5d68bddc23be0..3e2c6a15487b8 100644
--- a/x-pack/plugins/infra/public/utils/data_search/types.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/types.ts
@@ -10,7 +10,7 @@ import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
   ISearchOptions,
-} from '../../../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { SearchStrategyError } from '../../../common/search_strategies/common/errors';
 
 export interface DataSearchRequestDescriptor<Request extends IKibanaSearchRequest, RawResponse> {
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
index 85bd1a694f135..06f8ca1b82eb7 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.test.tsx
@@ -7,16 +7,15 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import React from 'react';
-import { Observable, of, Subject } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom, Observable, of, Subject } from 'rxjs';
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   ISearchGeneric,
   ISearchStart,
-} from '../../../../../../src/plugins/data/public';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { createKibanaReactContext } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { PluginKibanaContextValue } from '../../hooks/use_kibana';
 import { normalizeDataSearchResponses } from './normalize_data_search_responses';
 import { useDataSearch } from './use_data_search_request';
@@ -92,7 +91,7 @@ describe('useDataSearch hook', () => {
     expect(dataMock.search.search).not.toHaveBeenCalled();
 
     // execute requests$ observable
-    const firstRequestPromise = result.current.requests$.pipe(take(1)).toPromise();
+    const firstRequestPromise = firstValueFrom(result.current.requests$);
 
     act(() => {
       result.current.search('first', 'second');
@@ -161,7 +160,7 @@ describe('useDataSearch hook', () => {
     expect(dataMock.search.search).not.toHaveBeenCalled();
 
     // execute requests$ observable
-    const firstRequestPromise = result.current.requests$.pipe(take(1)).toPromise();
+    const firstRequestPromise = firstValueFrom(result.current.requests$);
 
     act(() => {
       result.current.search('first', 'second');
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts
index f2dd5b9e87c93..230c2d87e0654 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_request.ts
@@ -12,7 +12,7 @@ import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
   ISearchOptions,
-} from '../../../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
 import { useKibanaContextForPlugin } from '../../hooks/use_kibana';
 import { tapUnsubscribe, useObservable } from '../use_observable';
 import { ParsedDataSearchRequestDescriptor, ParsedKibanaSearchResponse } from './types';
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts b/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts
index 4c98649a0168a..c8ec672beb842 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/use_data_search_response_state.ts
@@ -7,7 +7,7 @@
 
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { useObservableState } from '../use_observable';
 import { ParsedDataSearchResponseDescriptor } from './types';
 
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
index 71c49ef75023e..a48cf2c7ccdc4 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
+++ b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { ParsedDataSearchRequestDescriptor, ParsedKibanaSearchResponse } from './types';
 import { useLatestPartialDataSearchResponse } from './use_latest_partial_data_search_response';
 
diff --git a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
index 2cafceaad3cb5..48ff61eb676b9 100644
--- a/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
+++ b/x-pack/plugins/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
@@ -7,7 +7,7 @@
 
 import { Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { IKibanaSearchRequest } from '../../../../../../src/plugins/data/public';
+import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { useOperator } from '../use_observable';
 import { flattenDataSearchResponseDescriptor } from './flatten_data_search_response';
 import { ParsedDataSearchRequestDescriptor, ParsedDataSearchResponseDescriptor } from './types';
diff --git a/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx b/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
index bd54af25987eb..4e6381c9e6719 100644
--- a/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
+++ b/x-pack/plugins/infra/public/utils/header_action_menu_provider.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 interface ContextProps {
   setHeaderActionMenu?: AppMountParameters['setHeaderActionMenu'];
diff --git a/x-pack/plugins/infra/public/utils/history_context.ts b/x-pack/plugins/infra/public/utils/history_context.ts
index ee9e595306280..07efcab8d0f6d 100644
--- a/x-pack/plugins/infra/public/utils/history_context.ts
+++ b/x-pack/plugins/infra/public/utils/history_context.ts
@@ -6,7 +6,7 @@
  */
 
 import { createContext, useContext } from 'react';
-import { ScopedHistory } from 'src/core/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 export const HistoryContext = createContext<ScopedHistory | undefined>(undefined);
 
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
index ffcffa29949e8..3ca7540e52bc1 100644
--- a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
+++ b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
@@ -7,7 +7,11 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { encode } from 'rison-node';
-import { FetchData, FetchDataParams, LogsFetchDataResponse } from '../../../observability/public';
+import {
+  FetchData,
+  FetchDataParams,
+  LogsFetchDataResponse,
+} from '@kbn/observability-plugin/public';
 import { DEFAULT_SOURCE_ID, TIMESTAMP_FIELD } from '../../common/constants';
 import { InfraClientStartDeps, InfraClientStartServicesAccessor } from '../types';
 
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
index 81077f82d048d..dad3dedc4bb46 100644
--- a/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
+++ b/x-pack/plugins/infra/public/utils/logs_overview_fetches.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { of } from 'rxjs';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createResolvedLogViewMock } from '../../common/log_views/resolved_log_view.mock';
 import { createInfraPluginStartMock } from '../mocks';
 import { InfraClientStartDeps, InfraClientStartExports } from '../types';
diff --git a/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx b/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
index c4e633b1727d2..ff8b4b89a19fd 100644
--- a/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
+++ b/x-pack/plugins/infra/public/utils/triggers_actions_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import * as React from 'react';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 
 interface ContextProps {
   triggersActionsUI: TriggersAndActionsUIPublicPluginStart | null;
diff --git a/x-pack/plugins/infra/public/utils/url_state.tsx b/x-pack/plugins/infra/public/utils/url_state.tsx
index 8148463ab3fe3..77f04292cbde2 100644
--- a/x-pack/plugins/infra/public/utils/url_state.tsx
+++ b/x-pack/plugins/infra/public/utils/url_state.tsx
@@ -11,7 +11,7 @@ import { throttle } from 'lodash';
 import React from 'react';
 import { Route, RouteProps } from 'react-router-dom';
 import { decode, encode, RisonValue } from 'rison-node';
-import { url } from '../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 interface UrlStateContainerProps<UrlState> {
   urlState: UrlState | undefined;
diff --git a/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts b/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts
index 5c75e67f62306..521cd0142303b 100644
--- a/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts
+++ b/x-pack/plugins/infra/public/utils/use_kibana_query_settings.ts
@@ -8,8 +8,8 @@
 import type { EsQueryConfig } from '@kbn/es-query';
 import { SerializableRecord } from '@kbn/utility-types';
 import { useMemo } from 'react';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 
 export const useKibanaQuerySettings = (): EsQueryConfig => {
   const [allowLeadingWildcards] = useUiSetting$<boolean>(UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS);
diff --git a/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts b/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts
index c361beb91a6df..588ad0507dcd4 100644
--- a/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts
+++ b/x-pack/plugins/infra/public/utils/use_kibana_ui_setting.ts
@@ -6,7 +6,7 @@
  */
 
 import { useMemo } from 'react';
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 
 /**
  * This hook behaves like a `useState` hook in that it provides a requested
diff --git a/x-pack/plugins/infra/public/utils/use_url_state.ts b/x-pack/plugins/infra/public/utils/use_url_state.ts
index eef82438ff017..309bdd3106f89 100644
--- a/x-pack/plugins/infra/public/utils/use_url_state.ts
+++ b/x-pack/plugins/infra/public/utils/use_url_state.ts
@@ -10,7 +10,7 @@ import { Location } from 'history';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { decode, encode, RisonValue } from 'rison-node';
 import { useHistory } from 'react-router-dom';
-import { url } from '../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 export const useUrlState = <State>({
   defaultState,
diff --git a/x-pack/plugins/infra/server/deprecations.ts b/x-pack/plugins/infra/server/deprecations.ts
index 5e016bc094826..51616f4c1a528 100644
--- a/x-pack/plugins/infra/server/deprecations.ts
+++ b/x-pack/plugins/infra/server/deprecations.ts
@@ -12,7 +12,7 @@ import {
   ConfigDeprecation,
   DeprecationsDetails,
   GetDeprecationsContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   TIMESTAMP_FIELD,
   TIEBREAKER_FIELD,
diff --git a/x-pack/plugins/infra/server/features.ts b/x-pack/plugins/infra/server/features.ts
index 4c9b4ba531d80..73e247c495fc2 100644
--- a/x-pack/plugins/infra/server/features.ts
+++ b/x-pack/plugins/infra/server/features.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import { LOG_DOCUMENT_COUNT_RULE_TYPE_ID } from '../common/alerting/logs/log_threshold/types';
 import {
   METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
diff --git a/x-pack/plugins/infra/server/index.ts b/x-pack/plugins/infra/server/index.ts
index dcaa3df2db23c..2bfd868831ecc 100644
--- a/x-pack/plugins/infra/server/index.ts
+++ b/x-pack/plugins/infra/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { config, InfraConfig, InfraServerPlugin } from './plugin';
 
 export type { InfraPluginSetup, InfraPluginStart, InfraRequestHandlerContext } from './types';
diff --git a/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
index 268afccd4c2bc..59f6781cda4aa 100644
--- a/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FieldSpec } from 'src/plugins/data/common';
+import { FieldSpec } from '@kbn/data-plugin/common';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
 import { KibanaFramework } from '../framework/kibana_framework_adapter';
 import { FieldsAdapter, IndexFieldDescriptor } from './adapter_types';
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
index 7a0f44883f036..64d389a1c0bf7 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts
@@ -7,21 +7,21 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Lifecycle } from '@hapi/hapi';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { JsonArray, JsonValue } from '@kbn/utility-types';
-import { RouteConfig, RouteMethod } from '../../../../../../../src/core/server';
+import { RouteConfig, RouteMethod } from '@kbn/core/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../../../../src/plugins/data/server';
-import { PluginStart as DataViewsPluginStart } from '../../../../../../../src/plugins/data_views/server';
-import { HomeServerPluginSetup } from '../../../../../../../src/plugins/home/server';
-import { VisTypeTimeseriesSetup } from '../../../../../../../src/plugins/vis_types/timeseries/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../plugins/features/server';
-import { SpacesPluginSetup } from '../../../../../../plugins/spaces/server';
-import { PluginSetupContract as AlertingPluginContract } from '../../../../../alerting/server';
-import { MlPluginSetup } from '../../../../../ml/server';
-import { RuleRegistryPluginSetupContract } from '../../../../../rule_registry/server';
+} from '@kbn/data-plugin/server';
+import { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import { PluginSetupContract as AlertingPluginContract } from '@kbn/alerting-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
+import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 
 export interface InfraServerPluginSetupDeps {
   data: DataPluginSetup;
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index d5c33945b8a5e..28592e430c163 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -7,16 +7,10 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TransportRequestParams } from '@elastic/elasticsearch';
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import {
-  CoreSetup,
-  IRouter,
-  KibanaRequest,
-  RequestHandler,
-  RouteMethod,
-} from '../../../../../../../src/core/server';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/server';
-import { TimeseriesVisData } from '../../../../../../../src/plugins/vis_types/timeseries/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { CoreSetup, IRouter, KibanaRequest, RequestHandler, RouteMethod } from '@kbn/core/server';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
+import { TimeseriesVisData } from '@kbn/vis-type-timeseries-plugin/server';
 import { TSVBMetricModel } from '../../../../common/inventory_models/types';
 import { InfraConfig } from '../../../plugin';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
index e0c7600250bc9..9e8b243433f66 100644
--- a/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
 import {
   NodeDetailsRequest,
diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
index 3e1be0196231a..9708761daad61 100644
--- a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
@@ -6,8 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { flatten, get } from 'lodash';
+import { isVisSeriesData } from '@kbn/vis-type-timeseries-plugin/server';
 import { TIMESTAMP_FIELD } from '../../../../common/constants';
 import { NodeDetailsMetricData } from '../../../../common/http_api/node_details_api';
 import { KibanaFramework } from '../framework/kibana_framework_adapter';
@@ -22,7 +23,6 @@ import {
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
 import { CallWithRequestParams, InfraDatabaseSearchResponse } from '../framework';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
-import { isVisSeriesData } from '../../../../../../../src/plugins/vis_types/timeseries/server';
 
 export class KibanaMetricsAdapter implements InfraMetricsAdapter {
   private framework: KibanaFramework;
diff --git a/x-pack/plugins/infra/server/lib/alerting/common/messages.ts b/x-pack/plugins/infra/server/lib/alerting/common/messages.ts
index d61d4dd95b05e..3ca8160d2dda8 100644
--- a/x-pack/plugins/infra/server/lib/alerting/common/messages.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/common/messages.ts
@@ -6,11 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AlertStates, Comparator } from '../../../../common/alerting/metrics';
 import {
   formatDurationFromTimeUnitChar,
   TimeUnitChar,
-} from '../../../../../observability/common/utils/formatters/duration';
+} from '@kbn/observability-plugin/common/utils/formatters/duration';
+import { AlertStates, Comparator } from '../../../../common/alerting/metrics';
 import { UNGROUPED_FACTORY_KEY } from './utils';
 
 export const DOCUMENT_COUNT_I18N = i18n.translate(
diff --git a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts
index e5e93ae4aa360..2618af72168cd 100644
--- a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts
@@ -8,10 +8,10 @@
 import { isEmpty, isError } from 'lodash';
 import { schema } from '@kbn/config-schema';
 import { Logger, LogMeta } from '@kbn/logging';
-import type { IBasePath } from 'kibana/server';
+import type { IBasePath } from '@kbn/core/server';
 import { ALERT_RULE_PARAMETERS, TIMESTAMP } from '@kbn/rule-data-utils';
+import { parseTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
 import { getInventoryViewInAppUrl } from '../../../../common/alerting/metrics/alert_link';
-import { parseTechnicalFields } from '../../../../../rule_registry/common/parse_technical_fields';
 import {
   AlertExecutionDetails,
   InventoryMetricConditions,
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 7aaee25304a08..d059e7a6a09ce 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,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { mapValues } from 'lodash';
 import { Logger } from '@kbn/logging';
 import { InventoryMetricConditions } from '../../../../common/alerting/metrics';
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 f7d07c4e0e118..972f40bcb16ef 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
@@ -14,8 +14,8 @@ import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
   RecoveredActionGroup,
-} from '../../../../../alerting/common';
-import { Alert, RuleTypeState } from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { Alert, RuleTypeState } from '@kbn/alerting-plugin/server';
 import { AlertStates, InventoryMetricThresholdParams } from '../../../../common/alerting/metrics';
 import { createFormatter } from '../../../../common/formatters';
 import { getCustomMetricLabel } from '../../../../common/formatters/get_custom_metric_label';
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts
index 91f298f2bf082..2dda6fd98ce8e 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/create_request.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ESSearchRequest } from 'src/core/types/elasticsearch';
+import { ESSearchRequest } from '@kbn/core/types/elasticsearch';
 import { findInventoryFields } from '../../../../../common/inventory_models';
 import { InfraTimerangeInput, SnapshotCustomMetricInput } from '../../../../../common/http_api';
 import {
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts
index c29c802f9391d..09ac4b47f2c9a 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/lib/get_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Logger } from '@kbn/logging';
 import { InventoryMetricConditions } from '../../../../../common/alerting/metrics';
 import { InfraTimerangeInput, SnapshotCustomMetricInput } from '../../../../../common/http_api';
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts
index f7d1e80346d71..78898e9b5da56 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts
@@ -7,7 +7,8 @@
 
 import { schema, Type } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { PluginSetupContract } from '../../../../../alerting/server';
+import { PluginSetupContract } from '@kbn/alerting-plugin/server';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import {
   Comparator,
   METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
@@ -39,7 +40,6 @@ import {
   FIRED_ACTIONS_ID,
   WARNING_ACTIONS,
 } from './inventory_metric_threshold_executor';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 
 const condition = schema.object({
   threshold: schema.arrayOf(schema.number()),
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
index 12b523d126f80..042489a383766 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
@@ -12,7 +12,7 @@ import {
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   ActionGroup,
   ActionGroupIdsOf,
@@ -20,7 +20,7 @@ import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
   RuleTypeState,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 
 import {
   RuleParams,
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
index 5f43ac01485ed..38dc96fe4ce69 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/reason_formatters.ts
@@ -6,14 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { formatDurationFromTimeUnitChar, TimeUnitChar } from '@kbn/observability-plugin/common';
 import {
   Comparator,
   ComparatorToi18nSymbolsMap,
   TimeUnit,
 } from '../../../../common/alerting/logs/log_threshold/types';
 
-import { formatDurationFromTimeUnitChar, TimeUnitChar } from '../../../../../observability/common';
-
 export const getReasonMessageForUngroupedCountAlert = (
   actualCount: number,
   expectedCount: number,
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
index d7b73ce187396..50cc7b80603d9 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/register_log_threshold_rule_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { PluginSetupContract } from '../../../../../alerting/server';
+import { PluginSetupContract } from '@kbn/alerting-plugin/server';
 import { createLogThresholdExecutor, FIRED_ACTIONS } from './log_threshold_executor';
 import {
   LOG_DOCUMENT_COUNT_RULE_TYPE_ID,
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts
index 78ed4cb4b7bbd..d625361be1472 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/metric_anomaly_executor.ts
@@ -6,16 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { first } from 'lodash';
 import moment from 'moment';
 import {
   ActionGroup,
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
-} from '../../../../../alerting/common';
-import { RuleExecutorOptions } from '../../../../../alerting/server';
-import { MlPluginSetup } from '../../../../../ml/server';
+} from '@kbn/alerting-plugin/common';
+import { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { AlertStates, MetricAnomalyParams } from '../../../../common/alerting/metrics';
 import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds';
 import { MappedAnomalyHit } from '../../infra_ml';
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts
index 02e6028765bee..b27ae6889fd28 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_anomaly/register_metric_anomaly_rule_type.ts
@@ -7,12 +7,13 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { MlPluginSetup } from '../../../../../ml/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import {
   RuleType,
   AlertInstanceState as AlertState,
   AlertInstanceContext as AlertContext,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { RecoveredActionGroupId } from '@kbn/alerting-plugin/common';
 import {
   createMetricAnomalyExecutor,
   FIRED_ACTIONS,
@@ -22,7 +23,6 @@ import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../../common/alerting/metric
 import { InfraBackendLibs } from '../../infra_types';
 import { oneOfLiterals, validateIsStringElasticsearchJSONFilter } from '../common/utils';
 import { alertStateActionVariableDescription } from '../common/messages';
-import { RecoveredActionGroupId } from '../../../../../alerting/common';
 
 export type MetricAnomalyAllowedActionGroups = typeof FIRED_ACTIONS_ID;
 
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
index 81c714b30cb0d..05168edcac45c 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import moment from 'moment';
 import { difference, first, has, isNaN, isNumber, isObject, last, mapValues } from 'lodash';
 import {
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 95b10842d9b35..c215470a6d74e 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
@@ -8,16 +8,16 @@
 import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 // import { RecoveredActionGroup } from '../../../../../alerting/common';
 import {
   AlertInstanceMock,
   RuleExecutorServicesMock,
   alertsMock,
-} from '../../../../../alerting/server/mocks';
-import { LifecycleAlertServices } from '../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../rule_registry/server/mocks';
-import { createLifecycleRuleExecutorMock } from '../../../../../rule_registry/server/utils/create_lifecycle_rule_executor_mock';
+} from '@kbn/alerting-plugin/server/mocks';
+import { LifecycleAlertServices } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { createLifecycleRuleExecutorMock } from '@kbn/rule-registry-plugin/server/utils/create_lifecycle_rule_executor_mock';
 import {
   Aggregators,
   Comparator,
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 0b089c5eb5a86..c69595ee65207 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
@@ -13,8 +13,9 @@ import {
   AlertInstanceContext as AlertContext,
   AlertInstanceState as AlertState,
   RecoveredActionGroup,
-} from '../../../../../alerting/common';
-import { Alert, RuleTypeState } from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { Alert, RuleTypeState } from '@kbn/alerting-plugin/server';
+import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
 import { AlertStates, Comparator } from '../../../../common/alerting/metrics';
 import { createFormatter } from '../../../../common/formatters';
 import { InfraBackendLibs } from '../../infra_types';
@@ -30,7 +31,6 @@ import { UNGROUPED_FACTORY_KEY, getViewInAppUrl } from '../common/utils';
 import { LINK_TO_METRICS_EXPLORER } from '../../../../common/alerting/metrics';
 
 import { EvaluatedRuleParams, evaluateRule } from './lib/evaluate_rule';
-import { TimeUnitChar } from '../../../../../observability/common/utils/formatters/duration';
 
 export type MetricThresholdRuleParams = Record<string, any>;
 export type MetricThresholdRuleTypeState = RuleTypeState & {
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts
index a4ec6e4c4930e..e414214c60104 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_rule_type.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { ActionGroupIdsOf } from '../../../../../alerting/common';
-import { PluginSetupContract, RuleType } from '../../../../../alerting/server';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { PluginSetupContract, RuleType } from '@kbn/alerting-plugin/server';
 import { Comparator, METRIC_THRESHOLD_ALERT_TYPE_ID } from '../../../../common/alerting/metrics';
 import { METRIC_EXPLORER_AGGREGATIONS } from '../../../../common/http_api';
 import { InfraBackendLibs } from '../../infra_types';
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
index ee9a34ef9233a..37e59700b0488 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import * as utils from '../../alerting/common/utils';
+import * as utils from '../common/utils';
 jest
   .spyOn(utils, 'getViewInAppUrl')
   .mockReturnValue('http://localhost:5601/eyg/app/metrics/explorer');
diff --git a/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts b/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts
index a60de8b9c0ff9..e27c5b7fd4809 100644
--- a/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/register_rule_types.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { PluginSetupContract } from '../../../../alerting/server';
+import { PluginSetupContract } from '@kbn/alerting-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { registerMetricThresholdRuleType } from './metric_threshold/register_metric_threshold_rule_type';
 import { registerMetricInventoryThresholdRuleType } from './inventory_metric_threshold/register_inventory_metric_threshold_rule_type';
 import { registerMetricAnomalyRuleType } from './metric_anomaly/register_metric_anomaly_rule_type';
 import { registerLogThresholdRuleType } from './log_threshold/register_log_threshold_rule_type';
 import { InfraBackendLibs } from '../infra_types';
-import { MlPluginSetup } from '../../../../ml/server';
 
 const registerRuleTypes = (
   alertingPlugin: PluginSetupContract,
diff --git a/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts b/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts
index 1e948bce490f4..44c1d850c5724 100644
--- a/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import type { InfraPluginRequestHandlerContext } from '../../types';
 import { InfraMetricsAdapter, InfraMetricsRequestOptions } from '../adapters/metrics/adapter_types';
 import { NodeDetailsMetricData } from '../../../common/http_api/node_details_api';
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/errors.ts b/x-pack/plugins/infra/server/lib/infra_ml/errors.ts
index 2ec11aa1da5e4..02762940ae9ea 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/errors.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/errors.ts
@@ -11,7 +11,7 @@ import {
   UnknownMLCapabilitiesError,
   InsufficientMLCapabilities,
   MLPrivilegesUninitialized,
-} from '../../../../ml/server';
+} from '@kbn/ml-plugin/server';
 
 export class NoLogAnalysisMlJobError extends Error {
   constructor(message?: string) {
diff --git a/x-pack/plugins/infra/server/lib/infra_types.ts b/x-pack/plugins/infra/server/lib/infra_types.ts
index 0a627e9de9c35..a4636daa7986e 100644
--- a/x-pack/plugins/infra/server/lib/infra_types.ts
+++ b/x-pack/plugins/infra/server/lib/infra_types.ts
@@ -6,8 +6,8 @@
  */
 
 import { Logger } from '@kbn/logging';
-import type { IBasePath } from 'kibana/server';
-import { handleEsError } from '../../../../../src/plugins/es_ui_shared/server';
+import type { IBasePath } from '@kbn/core/server';
+import { handleEsError } from '@kbn/es-ui-shared-plugin/server';
 import { RulesServiceSetup } from '../services/rules';
 import { InfraConfig, InfraPluginStartServicesAccessor } from '../types';
 import { KibanaFramework } from './adapters/framework/kibana_framework_adapter';
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/errors.ts b/x-pack/plugins/infra/server/lib/log_analysis/errors.ts
index 2ec11aa1da5e4..02762940ae9ea 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/errors.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/errors.ts
@@ -11,7 +11,7 @@ import {
   UnknownMLCapabilitiesError,
   InsufficientMLCapabilities,
   MLPrivilegesUninitialized,
-} from '../../../../ml/server';
+} from '@kbn/ml-plugin/server';
 
 export class NoLogAnalysisMlJobError extends Error {
   constructor(message?: string) {
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
index d4679c7919535..9152945002e2a 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import {
   CategoriesSort,
   compareDatasetsByMaximumAnomalyScore,
diff --git a/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts b/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts
index 1538f40095c0e..65a87e1662c40 100644
--- a/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts
+++ b/x-pack/plugins/infra/server/lib/metrics/lib/calculate_bucket_size/calculate_bucket_size.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { calculateBucketSize } from './';
+import { calculateBucketSize } from '.';
 import moment from 'moment';
 
 const timerange = {
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts
index 7dde0c590a968..0ee09ba4129bc 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { convertLogAliasToLogIndices } from './7_13_0_convert_log_alias_to_log_indices';
 import { infraSourceConfigurationSavedObjectName } from '../saved_object_type';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts
index 599f2de191172..a996c9a2a51a7 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_13_0_convert_log_alias_to_log_indices.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { LOGS_INDEX_PATTERN } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts
index 465545618c8d7..7efb0b5370c47 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
-import { SavedObjectReference } from '../../../../../../../src/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   inventoryDefaultViewReferenceName,
   logIndexPatternReferenceName,
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts
index 745359270cc4c..bc2f7b11b574e 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_inventory_default_view_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { extractInventorySavedViewReferences } from '../saved_object_references';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts
index 6a97193211034..9c007607c0954 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
-import { SavedObjectReference } from '../../../../../../../src/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   logIndexPatternReferenceName,
   metricsExplorerDefaultViewReferenceName,
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts
index 4ef9024ccb9ce..81b1d4bde03ec 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_16_2_extract_metrics_explorer_default_view_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { extractMetricsExplorerSavedViewReferences } from '../saved_object_references';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts
index 21b7643ca6a7f..82ab55cf5f3e7 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { migrationMocks } from 'src/core/server/mocks';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { addNewIndexingStrategyIndexNames } from './7_9_0_add_new_indexing_strategy_index_names';
 import { infraSourceConfigurationSavedObjectName } from '../saved_object_type';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts
index 8c9a3ca1d5a06..fd8be33877248 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/7_9_0_add_new_indexing_strategy_index_names.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 
 type SevenNineZeroSourceConfig = Omit<InfraSourceConfiguration, 'logIndices'> & {
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts
index f7612fbe1dbcb..5cec2e3c94452 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectUnsanitizedDoc } from '../../../../../../../src/core/server';
-import { migrationMocks } from '../../../../../../../src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { composeMigrations } from './compose_migrations';
 
 type TestDocument = SavedObjectUnsanitizedDoc<{
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts
index 561685eb47127..e1d9e338d4630 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/compose_migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from '../../../../../../../src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 
 type InputAttributesOf<MigrationFn> = MigrationFn extends SavedObjectMigrationFn<
   infer InputAttributes,
diff --git a/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts b/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts
index daf8f60885811..bdef0bf02390a 100644
--- a/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts
+++ b/x-pack/plugins/infra/server/lib/sources/migrations/create_test_source_configuration.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  SavedObjectReference,
-  SavedObjectUnsanitizedDoc,
-} from '../../../../../../../src/core/server';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { InfraSourceConfiguration } from '../../../../common/source_configuration/source_configuration';
 import { infraSourceConfigurationSavedObjectName } from '../saved_object_type';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts b/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts
index ee65bd2d5ebeb..594a2408ecf62 100644
--- a/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts
+++ b/x-pack/plugins/infra/server/lib/sources/saved_object_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   InfraSavedSourceConfiguration,
   InfraSourceConfiguration,
diff --git a/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts b/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
index c150a51d78c9c..ed9f5b9f1da5f 100644
--- a/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
+++ b/x-pack/plugins/infra/server/lib/sources/saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { addNewIndexingStrategyIndexNames } from './migrations/7_9_0_add_new_indexing_strategy_index_names';
 import { convertLogAliasToLogIndices } from './migrations/7_13_0_convert_log_alias_to_log_indices';
 import { composeMigrations } from './migrations/compose_migrations';
diff --git a/x-pack/plugins/infra/server/lib/sources/sources.test.ts b/x-pack/plugins/infra/server/lib/sources/sources.test.ts
index 983b9d2142b5c..22e6d4912a402 100644
--- a/x-pack/plugins/infra/server/lib/sources/sources.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/sources.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from '../../../../../../src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { infraSourceConfigurationSavedObjectName } from './saved_object_type';
 import { InfraSources } from './sources';
 
diff --git a/x-pack/plugins/infra/server/lib/sources/sources.ts b/x-pack/plugins/infra/server/lib/sources/sources.ts
index 7448b7cb8d7e0..e24c6ddc46de8 100644
--- a/x-pack/plugins/infra/server/lib/sources/sources.ts
+++ b/x-pack/plugins/infra/server/lib/sources/sources.ts
@@ -10,7 +10,7 @@ import { constant, identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { failure } from 'io-ts/lib/PathReporter';
 import { inRange } from 'lodash';
-import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   InfraSavedSourceConfiguration,
   InfraSource,
@@ -20,7 +20,7 @@ import {
   sourceConfigurationConfigFilePropertiesRT,
   SourceConfigurationSavedObjectRuntimeType,
 } from '../../../common/source_configuration/source_configuration';
-import { InfraConfig } from '../../../server';
+import { InfraConfig } from '../..';
 import { defaultSourceConfiguration } from './defaults';
 import { AnomalyThresholdRangeError, NotFoundError } from './errors';
 import {
diff --git a/x-pack/plugins/infra/server/plugin.ts b/x-pack/plugins/infra/server/plugin.ts
index e77f94dfe38f1..a0d0b617f3f41 100644
--- a/x-pack/plugins/infra/server/plugin.ts
+++ b/x-pack/plugins/infra/server/plugin.ts
@@ -14,8 +14,8 @@ import {
   Plugin,
   PluginConfigDescriptor,
   PluginInitializerContext,
-} from 'src/core/server';
-import { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+} from '@kbn/core/server';
+import { handleEsError } from '@kbn/es-ui-shared-plugin/server';
 import { LOGS_FEATURE_ID, METRICS_FEATURE_ID } from '../common/constants';
 import { defaultLogViewsStaticConfig } from '../common/log_views';
 import { publicConfigKeys } from '../common/plugin_config_types';
diff --git a/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts b/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts
index 09b1098af6a61..9202227867dca 100644
--- a/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts
+++ b/x-pack/plugins/infra/server/saved_objects/log_view/log_view_saved_object.ts
@@ -7,7 +7,7 @@
 
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
-import { SavedObject, SavedObjectsType } from 'src/core/server';
+import { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import { logViewSavedObjectRT } from './types';
 
 export const logViewSavedObjectName = 'infrastructure-monitoring-log-view';
diff --git a/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts b/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts
index 461bbccb6e414..ea45be30bc0b7 100644
--- a/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts
+++ b/x-pack/plugins/infra/server/saved_objects/log_view/references/log_indices.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/server';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../../../../src/plugins/data_views/common';
+import { SavedObjectReference } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { LogViewAttributes } from '../../../../common/log_views';
 import {
   SavedObjectAttributesWithReferences,
diff --git a/x-pack/plugins/infra/server/saved_objects/references.test.ts b/x-pack/plugins/infra/server/saved_objects/references.test.ts
index 13675c03564a1..674aabbd9d058 100644
--- a/x-pack/plugins/infra/server/saved_objects/references.test.ts
+++ b/x-pack/plugins/infra/server/saved_objects/references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   extractSavedObjectReferences,
   resolveSavedObjectReferences,
diff --git a/x-pack/plugins/infra/server/saved_objects/references.ts b/x-pack/plugins/infra/server/saved_objects/references.ts
index 3a2347faeb9db..13b64ab6e6e73 100644
--- a/x-pack/plugins/infra/server/saved_objects/references.ts
+++ b/x-pack/plugins/infra/server/saved_objects/references.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { SavedObject, SavedObjectReference } from 'src/core/server';
+import { SavedObject, SavedObjectReference } from '@kbn/core/server';
 
 export type SavedObjectAttributesWithReferences<SavedObjectAttributes> = Pick<
   SavedObject<SavedObjectAttributes>,
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
index 2f91c65205b55..99579c5a588c6 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.test.ts
@@ -6,20 +6,20 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { of, throwError } from 'rxjs';
+import { lastValueFrom, of, throwError } from 'rxjs';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   IEsSearchRequest,
   IEsSearchResponse,
   ISearchStrategy,
   SearchStrategyDependencies,
-} from 'src/plugins/data/server';
-import { createSearchSessionsClientMock } from '../../../../../../src/plugins/data/server/search/mocks';
+} from '@kbn/data-plugin/server';
+import { createSearchSessionsClientMock } from '@kbn/data-plugin/server/search/mocks';
 import { createResolvedLogViewMock } from '../../../common/log_views/resolved_log_view.mock';
 import { createLogViewsClientMock } from '../log_views/log_views_client.mock';
 import { createLogViewsServiceStartMock } from '../log_views/log_views_service.mock';
@@ -53,8 +53,8 @@ describe('LogEntries search strategy', () => {
       logViews: logViewsMock,
     });
 
-    const response = await logEntriesSearchStrategy
-      .search(
+    const response = await lastValueFrom(
+      logEntriesSearchStrategy.search(
         {
           params: {
             sourceId: 'SOURCE_ID',
@@ -66,7 +66,7 @@ describe('LogEntries search strategy', () => {
         {},
         mockDependencies
       )
-      .toPromise();
+    );
 
     expect(logViewsMock.getScopedClient).toHaveBeenCalled();
     expect(logViewsClientMock.getResolvedLogView).toHaveBeenCalled();
@@ -138,8 +138,8 @@ describe('LogEntries search strategy', () => {
       esRequestId: 'ASYNC_REQUEST_ID',
     });
 
-    const response = await logEntriesSearchStrategy
-      .search(
+    const response = await lastValueFrom(
+      logEntriesSearchStrategy.search(
         {
           id: requestId,
           params: {
@@ -152,7 +152,7 @@ describe('LogEntries search strategy', () => {
         {},
         mockDependencies
       )
-      .toPromise();
+    );
 
     expect(logViewsMock.getScopedClient).toHaveBeenCalled();
     expect(logViewsClientMock.getResolvedLogView).toHaveBeenCalled();
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
index 15f53d0236594..81ef319828be1 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_search_strategy.ts
@@ -13,11 +13,8 @@ import type {
   IEsSearchRequest,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
-} from '../../../../../../src/plugins/data/common';
-import type {
-  ISearchStrategy,
-  PluginStart as DataPluginStart,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/common';
+import type { ISearchStrategy, PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import {
   getLogEntryCursorFromHit,
   LogColumn,
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts b/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts
index 0c5e32a9514f3..b9270f5ab38ae 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entries_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { LOG_ENTRY_SEARCH_STRATEGY } from '../../../common/search_strategies/log_entries/log_entry';
 import { LOG_ENTRIES_SEARCH_STRATEGY } from '../../../common/search_strategies/log_entries/log_entries';
 import { logEntriesSearchStrategyProvider } from './log_entries_search_strategy';
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
index c6ee6fb92ca47..4d2d3115d19f1 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.test.ts
@@ -6,20 +6,20 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { of, throwError } from 'rxjs';
+import { lastValueFrom, of, throwError } from 'rxjs';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   IEsSearchRequest,
   IEsSearchResponse,
   ISearchStrategy,
   SearchStrategyDependencies,
-} from 'src/plugins/data/server';
-import { createSearchSessionsClientMock } from '../../../../../../src/plugins/data/server/search/mocks';
+} from '@kbn/data-plugin/server';
+import { createSearchSessionsClientMock } from '@kbn/data-plugin/server/search/mocks';
 import { createResolvedLogViewMock } from '../../../common/log_views/resolved_log_view.mock';
 import { createLogViewsClientMock } from '../log_views/log_views_client.mock';
 import { createLogViewsServiceStartMock } from '../log_views/log_views_service.mock';
@@ -53,15 +53,15 @@ describe('LogEntry search strategy', () => {
       logViews: logViewsMock,
     });
 
-    const response = await logEntrySearchStrategy
-      .search(
+    const response = await lastValueFrom(
+      logEntrySearchStrategy.search(
         {
           params: { sourceId: 'SOURCE_ID', logEntryId: 'LOG_ENTRY_ID' },
         },
         {},
         mockDependencies
       )
-      .toPromise();
+    );
 
     expect(logViewsMock.getScopedClient).toHaveBeenCalled();
     expect(logViewsClientMock.getResolvedLogView).toHaveBeenCalled();
@@ -137,8 +137,8 @@ describe('LogEntry search strategy', () => {
       esRequestId: 'ASYNC_REQUEST_ID',
     });
 
-    const response = await logEntrySearchStrategy
-      .search(
+    const response = await lastValueFrom(
+      logEntrySearchStrategy.search(
         {
           id: requestId,
           params: { sourceId: 'SOURCE_ID', logEntryId: 'LOG_ENTRY_ID' },
@@ -146,7 +146,7 @@ describe('LogEntry search strategy', () => {
         {},
         mockDependencies
       )
-      .toPromise();
+    );
 
     expect(logViewsMock.getScopedClient).not.toHaveBeenCalled();
     expect(logViewsClientMock.getResolvedLogView).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts
index 6cd6e87810553..714e0b792c612 100644
--- a/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/log_entry_search_strategy.ts
@@ -12,11 +12,8 @@ import type {
   IEsSearchRequest,
   IKibanaSearchRequest,
   IKibanaSearchResponse,
-} from '../../../../../../src/plugins/data/common';
-import type {
-  ISearchStrategy,
-  PluginStart as DataPluginStart,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/common';
+import type { ISearchStrategy, PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import { getLogEntryCursorFromHit } from '../../../common/log_entry';
 import { decodeOrThrow } from '../../../common/runtime_types';
 import {
diff --git a/x-pack/plugins/infra/server/services/log_entries/types.ts b/x-pack/plugins/infra/server/services/log_entries/types.ts
index e3ebe0eeece56..191e77f069142 100644
--- a/x-pack/plugins/infra/server/services/log_entries/types.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/types.ts
@@ -8,7 +8,7 @@
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 import type { LogViewsServiceStart } from '../log_views/types';
 
 export interface LogEntriesServiceSetupDeps {
diff --git a/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts b/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts
index c99930c7c47a5..7b1debf981f8c 100644
--- a/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts
+++ b/x-pack/plugins/infra/server/services/log_views/log_views_client.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { loggerMock } from '@kbn/logging-mocks';
-import { SavedObject, SavedObjectsUtils } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { createStubDataView } from 'src/plugins/data_views/common/stubs';
-import { dataViewsService as dataViewsServiceMock } from 'src/plugins/data_views/server/mocks';
+import { SavedObject, SavedObjectsUtils } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
+import { dataViewsService as dataViewsServiceMock } from '@kbn/data-views-plugin/server/mocks';
 import {
   defaultLogViewId,
   LogView,
diff --git a/x-pack/plugins/infra/server/services/log_views/log_views_client.ts b/x-pack/plugins/infra/server/services/log_views/log_views_client.ts
index a4c64288d0ac0..ef12bcefa233a 100644
--- a/x-pack/plugins/infra/server/services/log_views/log_views_client.ts
+++ b/x-pack/plugins/infra/server/services/log_views/log_views_client.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+import type { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import {
   Logger,
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsUtils,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   defaultLogViewAttributes,
   defaultLogViewId,
diff --git a/x-pack/plugins/infra/server/services/log_views/log_views_service.ts b/x-pack/plugins/infra/server/services/log_views/log_views_service.ts
index f5385b9d2873c..169092d997570 100644
--- a/x-pack/plugins/infra/server/services/log_views/log_views_service.ts
+++ b/x-pack/plugins/infra/server/services/log_views/log_views_service.ts
@@ -10,7 +10,7 @@ import {
   KibanaRequest,
   Logger,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { LogView, LogViewAttributes } from '../../../common/log_views';
 import { LogViewsClient } from './log_views_client';
 import { LogViewsServiceSetup, LogViewsServiceStart, LogViewsServiceStartDeps } from './types';
diff --git a/x-pack/plugins/infra/server/services/log_views/types.ts b/x-pack/plugins/infra/server/services/log_views/types.ts
index 0052db19ee4de..4146b6e2fd7e3 100644
--- a/x-pack/plugins/infra/server/services/log_views/types.ts
+++ b/x-pack/plugins/infra/server/services/log_views/types.ts
@@ -11,8 +11,8 @@ import {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'src/core/server';
-import { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+} from '@kbn/core/server';
+import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import {
   LogView,
   LogViewAttributes,
diff --git a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
index 3156a0dacad61..4fcbaf2084362 100644
--- a/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
+++ b/x-pack/plugins/infra/server/services/rules/rule_data_client.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
-import { mappingFromFieldMap } from '../../../../rule_registry/common/mapping_from_field_map';
-import { experimentalRuleFieldMap } from '../../../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
 
-import { Dataset, RuleRegistryPluginSetupContract } from '../../../../rule_registry/server';
+import { Dataset, RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import type { InfraFeatureId } from '../../../common/constants';
 import { RuleRegistrationContext, RulesServiceStartDeps } from './types';
 
diff --git a/x-pack/plugins/infra/server/services/rules/rules_service.ts b/x-pack/plugins/infra/server/services/rules/rules_service.ts
index 9341fc59d75b8..85d3d8548fbe6 100644
--- a/x-pack/plugins/infra/server/services/rules/rules_service.ts
+++ b/x-pack/plugins/infra/server/services/rules/rules_service.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
-import { createLifecycleExecutor } from '../../../../rule_registry/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { createLifecycleExecutor } from '@kbn/rule-registry-plugin/server';
 import { InfraFeatureId } from '../../../common/constants';
 import { createRuleDataClient } from './rule_data_client';
 import {
diff --git a/x-pack/plugins/infra/server/services/rules/types.ts b/x-pack/plugins/infra/server/services/rules/types.ts
index daa44381650e0..55d799b85c001 100644
--- a/x-pack/plugins/infra/server/services/rules/types.ts
+++ b/x-pack/plugins/infra/server/services/rules/types.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../alerting/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
 import {
   createLifecycleExecutor,
   IRuleDataClient,
   RuleRegistryPluginSetupContract,
-} from '../../../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
 
 type LifecycleRuleExecutorCreator = ReturnType<typeof createLifecycleExecutor>;
 
diff --git a/x-pack/plugins/infra/server/types.ts b/x-pack/plugins/infra/server/types.ts
index 42c27085380f7..a791c15d9e6b9 100644
--- a/x-pack/plugins/infra/server/types.ts
+++ b/x-pack/plugins/infra/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup, RequestHandlerContext } from 'src/core/server';
-import type { SearchRequestHandlerContext } from '../../../../src/plugins/data/server';
-import type { MlPluginSetup } from '../../ml/server';
+import type { CoreSetup, RequestHandlerContext } from '@kbn/core/server';
+import type { SearchRequestHandlerContext } from '@kbn/data-plugin/server';
+import type { MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { InfraStaticSourceConfiguration } from '../common/source_configuration/source_configuration';
 import { InfraServerPluginStartDeps } from './lib/adapters/framework';
 import { LogViewsServiceSetup, LogViewsServiceStart } from './services/log_views/types';
diff --git a/x-pack/plugins/infra/server/usage/usage_collector.ts b/x-pack/plugins/infra/server/usage/usage_collector.ts
index 4b5e128148888..6e181c09512a8 100644
--- a/x-pack/plugins/infra/server/usage/usage_collector.ts
+++ b/x-pack/plugins/infra/server/usage/usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { InventoryItemType } from '../../common/inventory_models/types';
 
 interface InfraopsSum {
diff --git a/x-pack/plugins/infra/types/redux_observable.d.ts b/x-pack/plugins/infra/types/redux_observable.d.ts
index f5072e33f70cb..c1f9a2dda3352 100644
--- a/x-pack/plugins/infra/types/redux_observable.d.ts
+++ b/x-pack/plugins/infra/types/redux_observable.d.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { Action, MiddlewareAPI } from 'redux';
-import { ActionsObservable, Epic } from 'redux-observable';
-import { Observable } from 'rxjs';
+import { Action } from 'redux';
+import { Epic } from 'redux-observable';
 
 declare module 'redux-observable' {
   function combineEpics<
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts
index 7029e47b29229..d7c833ef85403 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 
 type HttpMethod = 'GET' | 'PUT' | 'DELETE' | 'POST';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts
index 6091dd0ef9587..03b3bb605e120 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_clone.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PipelinesClone } from '../../../public/application/sections/pipelines_clone';
 import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts
index 7394552494f3c..108e4d908d801 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PipelinesCreate } from '../../../public/application/sections/pipelines_create';
 import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts
index 3f68b174f3c4f..674855abd6d02 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_create_from_csv.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
 
 import { PipelinesCreateFromCsv } from '../../../public/application/sections/pipelines_create_from_csv';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts
index 1902e5c1f2aed..02a2c0f890182 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PipelinesEdit } from '../../../public/application/sections/pipelines_edit';
 import { getFormActions, PipelineFormTestSubjects } from './pipeline_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts
index 33d3fb31ef81f..19de9b8253101 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/pipelines_list.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   registerTestBed,
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx
index 7b7a467d59a91..01efbc3063870 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/helpers/setup_environment.tsx
@@ -7,21 +7,21 @@
 
 import React from 'react';
 import { LocationDescriptorObject } from 'history';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
-import { ApplicationStart } from 'src/core/public';
-import { MockUrlService } from 'src/plugins/share/common/mocks';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { sharePluginMock } from '../../../../../../src/plugins/share/public/mocks';
+import { ApplicationStart } from '@kbn/core/public';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import {
   notificationServiceMock,
   docLinksServiceMock,
   scopedHistoryMock,
   uiSettingsServiceMock,
   applicationServiceMock,
-} from '../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 
 import {
   breadcrumbService,
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
index 4ac864e1ca36f..8440def61cac5 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create_from_csv.test.tsx
@@ -31,8 +31,8 @@ jest.mock('@elastic/eui', () => {
   };
 });
 
-jest.mock('../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/ingest_pipelines/common/constants.ts b/x-pack/plugins/ingest_pipelines/common/constants.ts
index 231440a88676a..741eda0664b94 100644
--- a/x-pack/plugins/ingest_pipelines/common/constants.ts
+++ b/x-pack/plugins/ingest_pipelines/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts
index 516e104b37b3f..7888bcfde2570 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/http_requests.helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../../../common/constants';
 
 type HttpResponse = Record<string, any> | any[];
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx
index 3874fd84932ee..625ccd1f62a3f 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/pipeline_processors_editor.helpers.tsx
@@ -9,7 +9,7 @@ import { act } from 'react-dom/test-utils';
 import React from 'react';
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
-import { Props } from '../';
+import { Props } from '..';
 import { ProcessorsEditorWithDeps } from './processors_editor';
 
 jest.mock('@elastic/eui', () => {
@@ -31,8 +31,8 @@ jest.mock('@elastic/eui', () => {
   };
 });
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx
index af3651525d6a3..f35e05b800f14 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/append.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const APPEND_TYPE = 'append';
 
@@ -14,6 +14,8 @@ describe('Processor: Append', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
 
+  const { httpSetup } = setupEnvironment();
+
   beforeAll(() => {
     jest.useFakeTimers();
   });
@@ -26,7 +28,7 @@ describe('Processor: Append', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx
index 51117c3b517f9..d4ac176d6aaf5 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/bytes.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const BYTES_TYPE = 'bytes';
 
 describe('Processor: Bytes', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Bytes', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
index b8c8f6c58f711..00153471ea65e 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const CIRCLE_TYPE = 'circle';
 
 describe('Processor: Circle', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Circle', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx
index af5c8c50abf7b..ebffd5adf78c1 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/common_processor_fields.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const BYTES_TYPE = 'bytes';
 
 describe('Processor: Common Fields For All Processors', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Common Fields For All Processors', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx
index 0338cb8e04348..e571474576ff2 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/community_id.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const COMMUNITY_ID_TYPE = 'community_id';
 
 describe('Processor: Community id', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Community id', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx
index 5a58a7b595c90..3090e59b32e0b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/convert.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the `convert processor` when saved
 const defaultConvertParameters = {
@@ -23,6 +23,7 @@ const CONVERT_TYPE = 'convert';
 describe('Processor: Convert', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -36,7 +37,7 @@ describe('Processor: Convert', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx
index b40b46967dae5..6414976b56f9a 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/csv.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the CSV processor when saved
 const defaultCSVParameters = {
@@ -26,6 +26,7 @@ const CSV_TYPE = 'csv';
 describe('Processor: CSV', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -39,7 +40,7 @@ describe('Processor: CSV', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx
index 390f8e0191ce9..22666ebbe2a98 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const DATE_TYPE = 'date';
 
 describe('Processor: Date', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Date', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx
index 264db2c5b65c0..b9e990f36c15b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/date_index.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const DATE_INDEX_TYPE = 'date_index_name';
 
 describe('Processor: Date Index Name', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Date Index Name', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx
index eb93f4ea86449..7ebad2de01a92 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/dot_expander.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const DOT_EXPANDER_TYPE = 'dot_expander';
 
 describe('Processor: Dot Expander', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Dot Expander', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx
index db5840379536a..9b8148bd0dffd 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fail.test.tsx
@@ -6,12 +6,13 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const FAIL_TYPE = 'fail';
 describe('Processor: Fail', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -25,7 +26,7 @@ describe('Processor: Fail', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx
index 7c2ca012a0460..49d7937fab002 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/fingerprint.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the registered domain processor when saved
 const defaultFingerprintParameters = {
@@ -25,6 +25,7 @@ const FINGERPRINT_TYPE = 'fingerprint';
 describe('Processor: Fingerprint', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -38,7 +39,7 @@ describe('Processor: Fingerprint', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/grok.test.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/grok.test.ts
new file mode 100644
index 0000000000000..b488e69ed84da
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/grok.test.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { act } from 'react-dom/test-utils';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
+
+const GROK_TYPE = 'grok';
+
+describe('Processor: Grok', () => {
+  let onUpdate: jest.Mock;
+  let testBed: SetupResult;
+  let clickAddPattern: () => Promise<void>;
+  const { httpSetup } = setupEnvironment();
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+    // disable all react-beautiful-dnd development warnings
+    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = true;
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+    // enable all react-beautiful-dnd development warnings
+    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = false;
+  });
+
+  beforeEach(async () => {
+    onUpdate = jest.fn();
+
+    await act(async () => {
+      testBed = await setup(httpSetup, {
+        value: {
+          processors: [],
+        },
+        onFlyoutOpen: jest.fn(),
+        onUpdate,
+      });
+    });
+
+    const { find, component, actions } = testBed;
+
+    clickAddPattern = async () => {
+      await act(async () => {
+        find('droppableList.addButton').simulate('click');
+      });
+      component.update();
+    };
+
+    component.update();
+
+    // Open flyout to add new processor
+    actions.addProcessor();
+    // Add type (the other fields are not visible until a type is selected)
+    await actions.addProcessorType(GROK_TYPE);
+  });
+
+  test('prevents form submission if required fields are not provided', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+      exists,
+    } = testBed;
+
+    // Click submit button with only the type defined
+    await saveNewProcessor();
+
+    // Expect form error as "field" is a required parameter
+    expect(form.getErrorsMessages()).toEqual(['A field value is required.']);
+    // Patterns field is also required; it uses EuiDraggable and only shows an error icon when invalid
+    expect(exists('droppableList.errorIcon')).toBe(true);
+  });
+
+  test('saves with default parameter values', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Add "field" value
+    form.setInputValue('fieldNameField.input', 'test_grok_processor');
+
+    // Add pattern 1
+    form.setInputValue('droppableList.input-0', 'pattern1');
+
+    // Add pattern 2
+    await clickAddPattern();
+    form.setInputValue('droppableList.input-1', 'pattern2');
+
+    // Add pattern 3
+    await clickAddPattern();
+    form.setInputValue('droppableList.input-2', 'pattern3');
+
+    // Save the field
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, GROK_TYPE);
+
+    expect(processors[0][GROK_TYPE]).toEqual({
+      field: 'test_grok_processor',
+      patterns: ['pattern1', 'pattern2', 'pattern3'],
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
index 7a4c55d6f5e02..4f92aec06efd3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/network_direction.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the network direction processor when saved
 const defaultNetworkDirectionParameters = {
@@ -27,6 +27,7 @@ const NETWORK_DIRECTION_TYPE = 'network_direction';
 describe('Processor: Network Direction', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -40,7 +41,7 @@ describe('Processor: Network Direction', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
index ec68c3b3bfdf6..ade7077e3fd10 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor.helpers.tsx
@@ -7,22 +7,21 @@
 
 import { act } from 'react-dom/test-utils';
 import React from 'react';
-import axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { stubWebWorker } from '@kbn/test-jest-helpers';
 import { uiMetricService, apiService } from '../../../../services';
-import { Props } from '../../';
+import { Props } from '../..';
 import { initHttpRequests } from '../http_requests.helpers';
 import { ProcessorsEditorWithDeps } from '../processors_editor';
 
 stubWebWorker();
 
-jest.mock('../../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
@@ -102,7 +101,9 @@ const createActions = (testBed: TestBed<TestSubject>) => {
   };
 };
 
-export const setup = async (props: Props): Promise<SetupResult> => {
+export const setup = async (httpSetup: HttpSetup, props: Props): Promise<SetupResult> => {
+  apiService.setup(httpSetup, uiMetricService);
+
   const testBed = testBedSetup(props);
   return {
     ...testBed,
@@ -110,19 +111,11 @@ export const setup = async (props: Props): Promise<SetupResult> => {
   };
 };
 
-const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
-
 export const setupEnvironment = () => {
   // Initialize mock services
   uiMetricService.setup(usageCollectionPluginMock.createSetupContract());
-  // @ts-ignore
-  apiService.setup(mockHttpClient, uiMetricService);
-
-  const { httpRequestsMockHelpers } = initHttpRequests();
 
-  return {
-    httpRequestsMockHelpers,
-  };
+  return initHttpRequests();
 };
 
 export const getProcessorValue = (onUpdate: jest.Mock, type: string) => {
@@ -187,4 +180,9 @@ type TestSubject =
   | 'transportField.input'
   | 'seedField.input'
   | 'copyFromInput'
-  | 'trimSwitch.input';
+  | 'trimSwitch.input'
+  | 'droppableList.addButton'
+  | 'droppableList.errorIcon'
+  | 'droppableList.input-0'
+  | 'droppableList.input-1'
+  | 'droppableList.input-2';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx
index de0061dcb0407..b2e2fb81f2c86 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/processor_form.test.tsx
@@ -6,11 +6,12 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult } from './processor.helpers';
+import { setup, SetupResult, setupEnvironment } from './processor.helpers';
 
 describe('Processor: Bytes', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -24,7 +25,7 @@ describe('Processor: Bytes', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx
index 962e099f5b667..dcf332912a94b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/registered_domain.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the registered domain processor when saved
 const defaultRegisteredDomainParameters = {
@@ -21,6 +21,7 @@ const REGISTERED_DOMAIN_TYPE = 'registered_domain';
 describe('Processor: Registered Domain', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -34,7 +35,7 @@ describe('Processor: Registered Domain', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx
index 544b8aeb51c05..ebfa678648904 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.tsx
@@ -6,13 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 const SET_TYPE = 'set';
 
 describe('Processor: Set', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -26,7 +27,7 @@ describe('Processor: Set', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx
index 442788a7f75aa..9062fcc02f7f8 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/uri_parts.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the URI parts processor when saved
 const defaultUriPartsParameters = {
@@ -19,6 +19,7 @@ const URI_PARTS_TYPE = 'uri_parts';
 describe('Processor: URI parts', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -32,7 +33,7 @@ describe('Processor: URI parts', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
index fa1c24c9dfb39..ed778aa1cc1f3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/user_agent.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+import { setup, SetupResult, getProcessorValue, setupEnvironment } from './processor.helpers';
 
 // Default parameter values automatically added to the user agent processor when saved
 const defaultUserAgentParameters = {
@@ -24,6 +24,7 @@ const USER_AGENT_TYPE = 'user_agent';
 describe('Processor: User Agent', () => {
   let onUpdate: jest.Mock;
   let testBed: SetupResult;
+  const { httpSetup } = setupEnvironment();
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -37,7 +38,7 @@ describe('Processor: User Agent', () => {
     onUpdate = jest.fn();
 
     await act(async () => {
-      testBed = await setup({
+      testBed = await setup(httpSetup, {
         value: {
           processors: [],
         },
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx
index 109d53eff895b..896017d72a242 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors_editor.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 
-import { notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
+import { notificationServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 
 import { LocationDescriptorObject } from 'history';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { ProcessorsEditorContextProvider, Props, PipelineEditor } from '../';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { ProcessorsEditorContextProvider, Props, PipelineEditor } from '..';
 
 import {
   breadcrumbService,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
index 0ec9ee1c1e1ac..2da97306eee1c 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/test_pipeline.helpers.tsx
@@ -8,23 +8,23 @@
 import { act } from 'react-dom/test-utils';
 import React from 'react';
 
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
-import { HttpSetup } from 'src/core/public';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { stubWebWorker } from '@kbn/test-jest-helpers';
 
 /* eslint-disable-next-line @kbn/eslint/no-restricted-paths */
-import '../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 import { uiMetricService, apiService } from '../../../services';
-import { Props } from '../';
+import { Props } from '..';
 import { initHttpRequests } from './http_requests.helpers';
 import { ProcessorsEditorWithDeps } from './processors_editor';
 
 stubWebWorker();
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
index 9392fe2398e2f..2cf8dc3ee1a25 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/load_from_json/modal_provider.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import '../../../../../../../../../src/plugins/es_ui_shared/public/components/code_editor/jest_mock';
+import '@kbn/es-ui-shared-plugin/public/components/code_editor/jest_mock';
 import { ModalProvider, OnDoneLoadJsonHandler } from './modal_provider';
 
 jest.mock('lodash', () => {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
index 7a0ea533b0d68..d574479b03e7b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/field_components/drag_and_drop_text_list.tsx
@@ -87,7 +87,12 @@ function DragAndDropTextListComponent({
     [onMove]
   );
   return (
-    <EuiFormRow isInvalid={typeof error === 'string'} error={error} fullWidth>
+    <EuiFormRow
+      isInvalid={typeof error === 'string'}
+      error={error}
+      fullWidth
+      data-test-subj="droppableList"
+    >
       <>
         {/* Label and help text. Also wire up the htmlFor so the label points to the first text field. */}
         <EuiFlexGroup
@@ -158,6 +163,7 @@ function DragAndDropTextListComponent({
                                   <EuiFlexGroup gutterSize="none" alignItems="center">
                                     <EuiFlexItem>
                                       <EuiFieldText
+                                        data-test-subj={`input-${idx}`}
                                         id={idx === 0 ? firstItemId : undefined}
                                         isInvalid={isInvalid}
                                         value={field.value}
@@ -168,7 +174,10 @@ function DragAndDropTextListComponent({
                                     </EuiFlexItem>
                                     {typeof errorMessage === 'string' && (
                                       <EuiFlexItem grow={false}>
-                                        <div className="pipelineProcessorsEditor__form__dragAndDropList__errorIcon">
+                                        <div
+                                          className="pipelineProcessorsEditor__form__dragAndDropList__errorIcon"
+                                          data-test-subj="errorIcon"
+                                        >
                                           <EuiIconTip
                                             aria-label={errorMessage}
                                             content={errorMessage}
@@ -208,7 +217,7 @@ function DragAndDropTextListComponent({
               })}
             </EuiDroppable>
           </EuiDragDropContext>
-          <EuiButtonEmpty iconType="plusInCircle" onClick={onAdd}>
+          <EuiButtonEmpty iconType="plusInCircle" onClick={onAdd} data-test-subj="addButton">
             {addLabel}
           </EuiButtonEmpty>
         </div>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx
index 1160038b52af8..756368d3b76ee 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/common_fields/processor_type_field.tsx
@@ -11,6 +11,10 @@ import React, { FunctionComponent, ReactNode } from 'react';
 import { flow } from 'fp-ts/lib/function';
 import { map } from 'fp-ts/lib/Array';
 
+import {
+  FieldValidateResponse,
+  VALIDATION_TYPES,
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import {
   FIELD_TYPES,
   FieldConfig,
@@ -20,10 +24,6 @@ import {
 } from '../../../../../../../shared_imports';
 
 import { getProcessorDescriptor, mapProcessorTypeToDescriptor } from '../../../shared';
-import {
-  FieldValidateResponse,
-  VALIDATION_TYPES,
-} from '../../../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 
 const extractProcessorTypesAndLabels = flow(
   Object.entries,
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/grok.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/grok.test.tsx
deleted file mode 100644
index 7d556cc41d109..0000000000000
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/grok.test.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mount } from 'enzyme';
-
-import {
-  uiSettingsServiceMock,
-  i18nServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
-
-import { Form, useForm, KibanaContextProvider } from '../../../../../../shared_imports';
-import { Grok } from './grok';
-
-// @ts-ignore
-window.Worker = function () {
-  this.postMessage = () => {};
-  (this as any).terminate = () => {};
-};
-
-describe('<Grok/>', () => {
-  const setup = (props?: { defaultValue: Record<string, any> }) => {
-    function MyComponent() {
-      const { form } = useForm({ defaultValue: props?.defaultValue });
-      const i18n = i18nServiceMock.createStartContract();
-      return (
-        <KibanaContextProvider
-          services={{ uiSettings: uiSettingsServiceMock.createSetupContract() }}
-        >
-          <i18n.Context>
-            <Form form={form}>
-              <Grok />
-            </Form>
-          </i18n.Context>
-        </KibanaContextProvider>
-      );
-    }
-    return mount(<MyComponent />);
-  };
-
-  beforeAll(() => {
-    // disable all react-beautiful-dnd development warnings
-    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = true;
-  });
-
-  afterAll(() => {
-    // enable all react-beautiful-dnd development warnings
-    (window as any)['__react-beautiful-dnd-disable-dev-warnings'] = false;
-  });
-  test('smoke', () => {
-    setup({ defaultValue: { type: 'grok', fields: { patterns: ['test'] } } });
-  });
-});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx
index bb973f000574c..ceda66bfc35a7 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processors_header.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { useKibana } from '../../../../shared_imports';
 
-import { LoadFromJsonButton, OnDoneLoadJsonHandler, TestPipelineActions } from './';
+import { LoadFromJsonButton, OnDoneLoadJsonHandler, TestPipelineActions } from '.';
 
 export interface Props {
   onLoadJson: OnDoneLoadJsonHandler;
diff --git a/x-pack/plugins/ingest_pipelines/public/application/index.tsx b/x-pack/plugins/ingest_pipelines/public/application/index.tsx
index 91c7665503a66..56ae3e8da6d95 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/index.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/index.tsx
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import React, { ReactNode } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
 
-import { ApplicationStart } from 'src/core/public';
-import { NotificationsSetup, IUiSettingsClient, CoreTheme } from 'kibana/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { FileUploadPluginStart } from '../../../file_upload/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { NotificationsSetup, IUiSettingsClient, CoreTheme } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
 import { KibanaContextProvider, KibanaThemeProvider } from '../shared_imports';
 
 import { API_BASE_PATH } from '../../common/constants';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts b/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts
index a032b3a66347b..bc6077cc77d7b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/mount_management_section.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 import { StartDependencies } from '../types';
 import {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx
index 02ea88bee3673..b7efea0bab8cc 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_create_from_csv/pipelines_preview.tsx
@@ -21,7 +21,7 @@ import {
 import { XJsonLang } from '@kbn/monaco';
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditorField } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   processors: object[];
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
index 29ee4d24ae7e2..c622dc13f2657 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
@@ -17,8 +17,8 @@ import {
   EuiContextMenu,
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { ScopedHistory } from '@kbn/core/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../../../shared_imports';
 import { getCreateFromCsvPath, getCreatePath } from '../../services/navigation';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
index 0bb65bb647019..c094799524893 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/table.tsx
@@ -17,7 +17,7 @@ import {
   EuiPopover,
   EuiContextMenu,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { Pipeline } from '../../../../common/types';
 import { useKibana } from '../../../shared_imports';
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 e1a9bdbd4e026..f687c80351075 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { FieldCopyAction, Pipeline } from '../../../common/types';
 import { API_BASE_PATH } from '../../../common/constants';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts b/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts
index f1b2d22e776b9..f09b1325f7982 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts b/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts
index a9f39b2fcc956..cc558fce051f3 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export class DocumentationService {
   private esDocBasePath: string = '';
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts b/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
index b982f8f4a7314..2c3b1db301b96 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 import { UIM_APP_NAME } from '../constants';
 
diff --git a/x-pack/plugins/ingest_pipelines/public/locator.test.ts b/x-pack/plugins/ingest_pipelines/public/locator.test.ts
index 31558363513d9..b553de9b83036 100644
--- a/x-pack/plugins/ingest_pipelines/public/locator.test.ts
+++ b/x-pack/plugins/ingest_pipelines/public/locator.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { ManagementAppLocatorDefinition } from 'src/plugins/management/common/locator';
+import { ManagementAppLocatorDefinition } from '@kbn/management-plugin/common/locator';
 import { IngestPipelinesLocatorDefinition, INGEST_PIPELINES_PAGES } from './locator';
-import { sharePluginMock } from '../../../../src/plugins/share/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 describe('Ingest pipeline locator', () => {
   const setup = () => {
diff --git a/x-pack/plugins/ingest_pipelines/public/locator.ts b/x-pack/plugins/ingest_pipelines/public/locator.ts
index e4d6bf3539492..03316ff33e662 100644
--- a/x-pack/plugins/ingest_pipelines/public/locator.ts
+++ b/x-pack/plugins/ingest_pipelines/public/locator.ts
@@ -6,12 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import {
-  LocatorPublic,
-  LocatorDefinition,
-  KibanaLocation,
-} from '../../../../src/plugins/share/public';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorPublic, LocatorDefinition, KibanaLocation } from '@kbn/share-plugin/public';
 import {
   getClonePath,
   getCreatePath,
diff --git a/x-pack/plugins/ingest_pipelines/public/plugin.ts b/x-pack/plugins/ingest_pipelines/public/plugin.ts
index 68dc2c1801e0c..674c549e0f34c 100644
--- a/x-pack/plugins/ingest_pipelines/public/plugin.ts
+++ b/x-pack/plugins/ingest_pipelines/public/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin } from 'src/core/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 
 import { PLUGIN_ID } from '../common/constants';
 import { uiMetricService, apiService } from './application/services';
diff --git a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
index 1fde3a1930ba9..f7b451058ade1 100644
--- a/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
+++ b/x-pack/plugins/ingest_pipelines/public/shared_imports.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useKibana as _useKibana, CodeEditor } from '../../../../src/plugins/kibana_react/public';
+import { useKibana as _useKibana, CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { AppServices } from './application';
 
 export { CodeEditor };
@@ -16,7 +16,7 @@ export type {
   SendRequestResponse,
   UseRequestConfig,
   OnJsonEditorUpdateHandler,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   AuthorizationProvider,
@@ -31,7 +31,7 @@ export {
   JsonEditor,
   attemptToURIDecode,
   ViewApiRequestFlyout,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export type {
   FormSchema,
@@ -47,7 +47,7 @@ export type {
   ValidationConfig,
   FormOptions,
   SerializerFunc,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   FIELD_TYPES,
@@ -61,12 +61,9 @@ export {
   FormDataProvider,
   getFieldValidityAndErrorMessage,
   useFormData,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export {
-  fieldFormatters,
-  fieldValidators,
-} from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldFormatters, fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
 export {
   getFormRow,
@@ -80,17 +77,14 @@ export {
   SelectField,
   CheckBoxField,
   TextField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
 
-export {
-  isJSON,
-  isEmptyString,
-} from '../../../../src/plugins/es_ui_shared/static/validators/string';
+export { isJSON, isEmptyString } from '@kbn/es-ui-shared-plugin/static/validators/string';
 
 export {
   KibanaContextProvider,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
 export const useKibana = () => _useKibana<AppServices>();
diff --git a/x-pack/plugins/ingest_pipelines/public/types.ts b/x-pack/plugins/ingest_pipelines/public/types.ts
index e135f8fed58a7..e937051e656df 100644
--- a/x-pack/plugins/ingest_pipelines/public/types.ts
+++ b/x-pack/plugins/ingest_pipelines/public/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ManagementSetup } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { SharePluginStart, SharePluginSetup } from 'src/plugins/share/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { SharePluginStart, SharePluginSetup } from '@kbn/share-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
 
 export interface SetupDependencies {
   management: ManagementSetup;
diff --git a/x-pack/plugins/ingest_pipelines/server/plugin.ts b/x-pack/plugins/ingest_pipelines/server/plugin.ts
index f67243478fe90..ea1d9fc01c42a 100644
--- a/x-pack/plugins/ingest_pipelines/server/plugin.ts
+++ b/x-pack/plugins/ingest_pipelines/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'kibana/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
 
 import { ApiRoutes } from './routes';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
index c1d79eabceb04..114a5b8840336 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/privileges.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Privileges } from '@kbn/es-ui-shared-plugin/common';
 import { RouteDependencies } from '../../types';
 import { API_BASE_PATH, APP_CLUSTER_REQUIRED_PRIVILEGES } from '../../../common/constants';
-import { Privileges } from '../../../../../../src/plugins/es_ui_shared/common';
 
 const extractMissingPrivileges = (privilegesObject: { [key: string]: boolean } = {}): string[] =>
   Object.keys(privilegesObject).reduce((privileges: string[], privilegeName: string): string[] => {
diff --git a/x-pack/plugins/ingest_pipelines/server/shared_imports.ts b/x-pack/plugins/ingest_pipelines/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/ingest_pipelines/server/shared_imports.ts
+++ b/x-pack/plugins/ingest_pipelines/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/ingest_pipelines/server/types.ts b/x-pack/plugins/ingest_pipelines/server/types.ts
index efc0679708a5d..ea94ea5204e1e 100644
--- a/x-pack/plugins/ingest_pipelines/server/types.ts
+++ b/x-pack/plugins/ingest_pipelines/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import { IRouter } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { handleEsError } from './shared_imports';
 
 export interface Dependencies {
diff --git a/x-pack/plugins/lens/common/constants.ts b/x-pack/plugins/lens/common/constants.ts
index d0bfecbd386be..65cd5cdc73a9a 100644
--- a/x-pack/plugins/lens/common/constants.ts
+++ b/x-pack/plugins/lens/common/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import rison from 'rison-node';
-import type { TimeRange } from '../../../../src/plugins/data/common/query';
+import type { TimeRange } from '@kbn/data-plugin/common/query';
 
 export const PLUGIN_ID = 'lens';
 export const APP_ID = 'lens';
diff --git a/x-pack/plugins/lens/common/embeddable_factory/index.ts b/x-pack/plugins/lens/common/embeddable_factory/index.ts
index b93aa97c1e2a0..c4b03ae280778 100644
--- a/x-pack/plugins/lens/common/embeddable_factory/index.ts
+++ b/x-pack/plugins/lens/common/embeddable_factory/index.ts
@@ -6,10 +6,10 @@
  */
 
 import { SerializableRecord, Serializable } from '@kbn/utility-types';
-import { SavedObjectReference } from 'src/core/types';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { SavedObjectReference } from '@kbn/core/types';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 
 export type LensEmbeddablePersistableState = EmbeddableStateWithType & {
   attributes: SerializableRecord;
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
index 1fb2e2d4dd55d..32a37e0cf949e 100644
--- a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
+++ b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { counterRate, CounterRateArgs } from './index';
+import { counterRate, CounterRateArgs } from '.';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Datatable } from 'src/plugins/expressions/public';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 
 describe('lens_counter_rate', () => {
   const fn = functionWrapper(counterRate);
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts
index 6412b508b9649..e4dbef592143a 100644
--- a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate_fn.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  buildResultColumns,
-  getBucketIdentifier,
-} from '../../../../../../src/plugins/expressions/common';
+import { buildResultColumns, getBucketIdentifier } from '@kbn/expressions-plugin/common';
 import type { CounterRateExpressionFunction } from './types';
 
 export const counterRateFn: CounterRateExpressionFunction['fn'] = (
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/types.ts b/x-pack/plugins/lens/common/expressions/counter_rate/types.ts
index f9e1cbbb43de3..0bcb23a112238 100644
--- a/x-pack/plugins/lens/common/expressions/counter_rate/types.ts
+++ b/x-pack/plugins/lens/common/expressions/counter_rate/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Datatable, ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions';
-import { CounterRateArgs } from './index';
+import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { CounterRateArgs } from '.';
 
 export type CounterRateExpressionFunction = ExpressionFunctionDefinition<
   'lens_counter_rate',
diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
index 6c84e2d7a9532..84aba75239ed0 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/datatable.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ExecutionContext } from '../../../../../../src/plugins/expressions/common';
+import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import type { FormatFactory } from '../../types';
 import type { ColumnConfigArg } from './datatable_column';
 import type { DatatableExpressionFunction } from './types';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts
index 55bef8c29a3af..46e483f263b9b 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/datatable_column.ts
@@ -7,12 +7,9 @@
 
 import type { Direction } from '@elastic/eui';
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
+import type { CustomPaletteState } from '@kbn/charts-plugin/common';
+import type { ExpressionFunctionDefinition, DatatableColumn } from '@kbn/expressions-plugin/common';
 import { SortingHint } from '../..';
-import type { CustomPaletteState } from '../../../../../../src/plugins/charts/common';
-import type {
-  ExpressionFunctionDefinition,
-  DatatableColumn,
-} from '../../../../../../src/plugins/expressions/common';
 
 export type LensGridDirection = 'none' | Direction;
 
diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts
index 9c4d81cf087e0..713f929d74420 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts
@@ -7,15 +7,12 @@
 
 import { cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils';
+import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
+import type { DatatableColumnMeta, ExecutionContext } from '@kbn/expressions-plugin';
 import { FormatFactory, LensMultiTable } from '../../types';
 import { transposeTable } from './transpose_helpers';
 import { computeSummaryRowForColumn } from './summary';
 import { getSortingCriteria } from './sorting';
-import type {
-  DatatableColumnMeta,
-  ExecutionContext,
-} from '../../../../../../src/plugins/expressions';
 import type { DatatableExpressionFunction } from './types';
 
 function isRange(meta: { params?: { id?: string } } | undefined) {
diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx
index 24dca87c7f138..99f41c6785ae2 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx
+++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { getSortingCriteria } from './sorting';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
-import { DatatableColumnType } from 'src/plugins/expressions';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { DatatableColumnType } from '@kbn/expressions-plugin';
 
 function getMockFormatter() {
   return { convert: (v: unknown) => `${v as string}` } as FieldFormat;
diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx
index d4a3ba0ea6908..bfae4544c597c 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx
+++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.tsx
@@ -9,7 +9,7 @@ import versionCompare from 'compare-versions';
 import valid from 'semver/functions/valid';
 import ipaddr from 'ipaddr.js';
 import type { IPv4, IPv6 } from 'ipaddr.js';
-import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 
 function isIPv6Address(ip: IPv4 | IPv6): ip is IPv6 {
   return ip.kind() === 'ipv6';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts
index 61e74e0ef3bc7..3307007e7f0fc 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IFieldFormat } from 'src/plugins/field_formats/common';
-import { Datatable } from 'src/plugins/expressions';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin';
 import { computeSummaryRowForColumn, getFinalSummaryConfiguration } from './summary';
 
 describe('Summary row helpers', () => {
diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.ts
index 76c607ca4c4ee..fe45a91b9a86f 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/summary.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/summary.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common';
-import type { Datatable } from '../../../../../../src/plugins/expressions/common';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { ColumnConfigArg } from './datatable_column';
 import { getOriginalId } from './transpose_helpers';
 import { isNumericFieldForDatatable } from './utils';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts
index ae6e20d976b5e..e99de0186222b 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { FieldFormat } from 'src/plugins/field_formats/common';
-import type { Datatable } from 'src/plugins/expressions';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { DatatableArgs } from './datatable';
 
 import { transposeTable } from './transpose_helpers';
diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts
index e2d928fda24ed..076ebdf08a7b2 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import type {
-  Datatable,
-  DatatableColumn,
-  DatatableRow,
-} from '../../../../../../src/plugins/expressions';
-import type { FieldFormat } from '../../../../../../src/plugins/field_formats/common';
+import type { Datatable, DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
 import type { DatatableArgs } from './datatable';
 import type { ColumnConfig, ColumnConfigArg } from './datatable_column';
 
diff --git a/x-pack/plugins/lens/common/expressions/datatable/types.ts b/x-pack/plugins/lens/common/expressions/datatable/types.ts
index 340f3eb0576b0..9e6315bb856d0 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/types.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 import type { LensMultiTable } from '../../types';
 import type { DatatableArgs } from './datatable';
 
diff --git a/x-pack/plugins/lens/common/expressions/datatable/utils.ts b/x-pack/plugins/lens/common/expressions/datatable/utils.ts
index e8d683a478c79..933d78500815e 100644
--- a/x-pack/plugins/lens/common/expressions/datatable/utils.ts
+++ b/x-pack/plugins/lens/common/expressions/datatable/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Datatable } from '../../../../../../src/plugins/expressions/common';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { getOriginalId } from './transpose_helpers';
 
 function isValidNumber(value: unknown): boolean {
diff --git a/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts b/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts
index 8817f9315e182..2e1ce28534a27 100644
--- a/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts
+++ b/x-pack/plugins/lens/common/expressions/expression_types/lens_multitable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExpressionTypeDefinition } from '../../../../../../src/plugins/expressions/common';
+import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common';
 import { LensMultiTable } from '../../types';
 
 const name = 'lens_multitable';
diff --git a/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts b/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
index 29948c63dc004..63e32ffbf1df6 100644
--- a/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
+++ b/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
@@ -6,9 +6,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Datatable, DatatableColumn } from 'src/plugins/expressions/public';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
-import { formatColumn } from './index';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/public';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
+import { formatColumn } from '.';
 
 describe('format_column', () => {
   const fn = functionWrapper(formatColumn);
diff --git a/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts b/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
index 183ec74ac301d..bca56b2dbddbe 100644
--- a/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SerializedFieldFormat } from 'src/plugins/field_formats/common';
+import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 import { supportedFormats } from './supported_formats';
-import type { DatatableColumn } from '../../../../../../src/plugins/expressions';
-import type { FormatColumnArgs } from './index';
+import type { FormatColumnArgs } from '.';
 import type { FormatColumnExpressionFunction } from './types';
 
 function isNestedFormat(params: DatatableColumn['meta']['params']) {
diff --git a/x-pack/plugins/lens/common/expressions/format_column/types.ts b/x-pack/plugins/lens/common/expressions/format_column/types.ts
index 589422b253b93..c91dcfd5a8f6e 100644
--- a/x-pack/plugins/lens/common/expressions/format_column/types.ts
+++ b/x-pack/plugins/lens/common/expressions/format_column/types.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import type {
-  Datatable,
-  ExpressionFunctionDefinition,
-} from '../../../../../../src/plugins/expressions';
-import type { FormatColumnArgs } from './index';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { FormatColumnArgs } from '.';
 
 export type FormatColumnExpressionFunction = ExpressionFunctionDefinition<
   'lens_format_column',
diff --git a/x-pack/plugins/lens/common/expressions/merge_tables/index.ts b/x-pack/plugins/lens/common/expressions/merge_tables/index.ts
index 2bf955d9e3ed3..2e0dbc4b44264 100644
--- a/x-pack/plugins/lens/common/expressions/merge_tables/index.ts
+++ b/x-pack/plugins/lens/common/expressions/merge_tables/index.ts
@@ -10,12 +10,12 @@ import type {
   ExpressionFunctionDefinition,
   Datatable,
   ExecutionContext,
-} from '../../../../../../src/plugins/expressions/common';
-import { toAbsoluteDates } from '../../../../../../src/plugins/data/common';
-import type { ExpressionValueSearchContext } from '../../../../../../src/plugins/data/common';
+} from '@kbn/expressions-plugin/common';
+import { toAbsoluteDates } from '@kbn/data-plugin/common';
+import type { ExpressionValueSearchContext } from '@kbn/data-plugin/common';
 
+import type { Adapters } from '@kbn/inspector-plugin/common';
 import type { LensMultiTable } from '../../types';
-import type { Adapters } from '../../../../../../src/plugins/inspector/common';
 
 interface MergeTables {
   layerIds: string[];
diff --git a/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts b/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
index 39156c82a2fc0..4c8a3bf9aa310 100644
--- a/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
+++ b/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
@@ -6,15 +6,15 @@
  */
 
 import moment from 'moment';
-import { mergeTables } from './index';
+import { mergeTables } from '.';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionValueSearchContext } from 'src/plugins/data/public';
+import { ExpressionValueSearchContext } from '@kbn/data-plugin/public';
 import {
   Datatable,
   ExecutionContext,
   DefaultInspectorAdapters,
   TablesAdapter,
-} from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin';
 
 describe('lens_merge_tables', () => {
   const sampleTable1: Datatable = {
diff --git a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts
index 3bfed88625c89..2047e4647cb4c 100644
--- a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts
+++ b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { renameColumns } from './rename_columns';
-import { Datatable } from '../../../../../../src/plugins/expressions/common';
-import { createMockExecutionContext } from '../../../../../../src/plugins/expressions/common/mocks';
+import { Datatable } from '@kbn/expressions-plugin/common';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 
 describe('rename_columns', () => {
   it('should rename columns of a given datatable', async () => {
diff --git a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts
index c201c5f8f07e1..3cf4293ffa9f2 100644
--- a/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/rename_columns/rename_columns_fn.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DatatableColumn } from '../../../../../../src/plugins/expressions/common';
+import type { DatatableColumn } from '@kbn/expressions-plugin/common';
 import type { OriginalColumn, RenameColumnsExpressionFunction } from './types';
 
 function getColumnName(originalColumn: OriginalColumn, newColumn: DatatableColumn) {
diff --git a/x-pack/plugins/lens/common/expressions/rename_columns/types.ts b/x-pack/plugins/lens/common/expressions/rename_columns/types.ts
index 685ccfb89e4ca..6edfda41cc62f 100644
--- a/x-pack/plugins/lens/common/expressions/rename_columns/types.ts
+++ b/x-pack/plugins/lens/common/expressions/rename_columns/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datatable, ExpressionFunctionDefinition } from '../../../../../../src/plugins/expressions';
+import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export type OriginalColumn = { id: string; label: string } & (
   | { operationType: 'date_histogram'; sourceField: string }
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
index bebf67da13546..dd3e18c720c0a 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
@@ -7,14 +7,14 @@
 
 import moment from 'moment';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { TimeRange } from 'src/plugins/data/public';
-import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
+import type { TimeRange } from '@kbn/data-plugin/public';
+import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 
 // mock the specific inner variable:
 // there are intra dependencies in the data plugin we might break trying to mock the whole thing
-jest.mock('../../../../../../src/plugins/data/common/query/timefilter/get_time', () => {
+jest.mock('@kbn/data-plugin/common/query/timefilter/get_time', () => {
   const localMoment = jest.requireActual('moment');
   return {
     calculateBounds: jest.fn(({ from, to }) => ({
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts
index 21bef6de980ac..2cef5bf5b441f 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ExecutionContext } from '../../../../../../src/plugins/expressions/common';
+import type { ExecutionContext } from '@kbn/expressions-plugin/common';
 import type { TimeScaleExpressionFunction } from './types';
 
 export const getTimeScale = (
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts
index 5217d6a7db167..6f971b9193307 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/time_scale_fn.ts
@@ -7,16 +7,12 @@
 
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
-import {
-  buildResultColumns,
-  Datatable,
-  ExecutionContext,
-} from '../../../../../../src/plugins/expressions/common';
+import { buildResultColumns, Datatable, ExecutionContext } from '@kbn/expressions-plugin/common';
 import {
   calculateBounds,
   getDateHistogramMetaDataByDatatableColumn,
   parseInterval,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import type { TimeScaleExpressionFunction, TimeScaleUnit, TimeScaleArgs } from './types';
 
 const unitInMs: Record<TimeScaleUnit, number> = {
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/types.ts b/x-pack/plugins/lens/common/expressions/time_scale/types.ts
index 58c5e5723a7c1..407a8c101e177 100644
--- a/x-pack/plugins/lens/common/expressions/time_scale/types.ts
+++ b/x-pack/plugins/lens/common/expressions/time_scale/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import type {
-  Datatable,
-  ExpressionFunctionDefinition,
-} from '../../../../../../src/plugins/expressions';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
 
 export type TimeScaleUnit = 's' | 'm' | 'h' | 'd';
 
diff --git a/x-pack/plugins/lens/common/suffix_formatter/index.ts b/x-pack/plugins/lens/common/suffix_formatter/index.ts
index d2af0df25f132..9c88c24157e4c 100644
--- a/x-pack/plugins/lens/common/suffix_formatter/index.ts
+++ b/x-pack/plugins/lens/common/suffix_formatter/index.ts
@@ -7,10 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
-import {
-  FieldFormat,
-  FieldFormatInstanceType,
-} from '../../../../../src/plugins/field_formats/common';
+import { FieldFormat, FieldFormatInstanceType } from '@kbn/field-formats-plugin/common';
 import type { FormatFactory } from '../types';
 import type { TimeScaleUnit } from '../expressions/time_scale';
 
diff --git a/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts b/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts
index dea0957c4215a..a8a39ad738801 100644
--- a/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts
+++ b/x-pack/plugins/lens/common/suffix_formatter/suffix_formatter.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { FormatFactory } from '../types';
-import { getSuffixFormatter } from './index';
+import { getSuffixFormatter } from '.';
 
 describe('suffix formatter', () => {
   it('should call nested formatter and apply suffix', () => {
diff --git a/x-pack/plugins/lens/common/types.ts b/x-pack/plugins/lens/common/types.ts
index 6922deaebd681..f4111d51e2918 100644
--- a/x-pack/plugins/lens/common/types.ts
+++ b/x-pack/plugins/lens/common/types.ts
@@ -9,12 +9,9 @@ import type { Filter, FilterMeta } from '@kbn/es-query';
 import { Position } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import type { CustomPaletteParams, PaletteOutput } from '@kbn/coloring';
-import type {
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../src/plugins/field_formats/common';
-import type { Datatable } from '../../../../src/plugins/expressions/common';
-import type { ColorMode } from '../../../../src/plugins/charts/common';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/common';
+import type { ColorMode } from '@kbn/charts-plugin/common';
 import {
   CategoryDisplay,
   layerTypes,
diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index f5da098e028f9..bfad8dcd3f0ee 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -21,22 +21,22 @@ import {
   mockStoreDeps,
 } from '../mocks';
 import { I18nProvider } from '@kbn/i18n-react';
-import { SavedObjectSaveModal } from '../../../../../src/plugins/saved_objects/public';
+import { SavedObjectSaveModal } from '@kbn/saved-objects-plugin/public';
 import { checkForDuplicateTitle } from '../persistence';
 import { createMemoryHistory } from 'history';
-import { FilterManager, Query } from '../../../../../src/plugins/data/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import { FilterManager, Query } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { buildExistsFilter, FilterStateStore } from '@kbn/es-query';
-import type { FieldSpec } from '../../../../../src/plugins/data/common';
-import { TopNavMenuData } from '../../../../../src/plugins/navigation/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import { LensByValueInput } from '../embeddable/embeddable';
-import { SavedObjectReference } from '../../../../../src/core/types';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import moment from 'moment';
 
-import { setState, LensAppState } from '../state_management/index';
+import { setState, LensAppState } from '../state_management';
 jest.mock('../editor_frame_service/editor_frame/expression_helpers');
-jest.mock('src/core/public');
+jest.mock('@kbn/core/public');
 jest.mock('../persistence/saved_objects_utils/check_for_duplicate_title', () => ({
   checkForDuplicateTitle: jest.fn(),
 }));
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
index 19b213815145a..937323518e74a 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -9,13 +9,10 @@ import './app.scss';
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBreadcrumb, EuiConfirmModal } from '@elastic/eui';
-import {
-  createKbnUrlStateStorage,
-  withNotifyOnErrors,
-} from '../../../../../src/plugins/kibana_utils/public';
-import { useExecutionContext, useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { OnSaveProps } from '../../../../../src/plugins/saved_objects/public';
-import { syncQueryStateWithUrl } from '../../../../../src/plugins/data/public';
+import { createKbnUrlStateStorage, withNotifyOnErrors } from '@kbn/kibana-utils-plugin/public';
+import { useExecutionContext, useKibana } from '@kbn/kibana-react-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import { syncQueryStateWithUrl } from '@kbn/data-plugin/public';
 import { LensAppProps, LensAppServices } from './types';
 import { LensTopNavMenu } from './lens_top_nav';
 import { LensByReferenceInput } from '../embeddable';
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts b/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts
index 59a8aadbe62ec..879713dbd7b3c 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts
+++ b/x-pack/plugins/lens/public/app_plugin/lens_document_equality.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEqual, intersection, union } from 'lodash';
-import { FilterManager } from 'src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { Document } from '../persistence/saved_object_store';
 import { DatasourceMap } from '../types';
 import { removePinnedFilters } from './save_modal_container';
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
index d3ac59e87a23e..e532c82b7b3be 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -9,19 +9,19 @@ import { isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useStore } from 'react-redux';
-import { TopNavMenuData } from '../../../../../src/plugins/navigation/public';
+import { TopNavMenuData } from '@kbn/navigation-plugin/public';
+import { downloadMultipleAs } from '@kbn/share-plugin/public';
+import { tableHasFormulas } from '@kbn/data-plugin/common';
+import { exporters } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { trackUiEvent } from '../lens_ui_telemetry';
 import {
   LensAppServices,
   LensTopNavActions,
   LensTopNavMenuProps,
   LensTopNavTooltips,
 } from './types';
-import { downloadMultipleAs } from '../../../../../src/plugins/share/public';
-import { trackUiEvent } from '../lens_ui_telemetry';
-import { tableHasFormulas } from '../../../../../src/plugins/data/common';
-import { exporters } from '../../../../../src/plugins/data/public';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { toggleSettingsMenuOpen } from './settings_menu';
 import {
   setState,
@@ -31,11 +31,7 @@ import {
   DispatchSetState,
 } from '../state_management';
 import { getIndexPatternsObjects, getIndexPatternsIds, getResolvedDateRange } from '../utils';
-import {
-  combineQueryAndFilters,
-  getLayerMetaInfo,
-  getShowUnderlyingDataLabel,
-} from './show_underlying_data';
+import { combineQueryAndFilters, getLayerMetaInfo } from './show_underlying_data';
 
 function getLensTopNavConfig(options: {
   showSaveAndReturn: boolean;
@@ -103,11 +99,15 @@ function getLensTopNavConfig(options: {
   }
 
   if (showOpenInDiscover) {
+    const exploreDataInDiscoverLabel = i18n.translate('xpack.lens.app.exploreDataInDiscover', {
+      defaultMessage: 'Explore data in Discover',
+    });
+
     topNavMenu.push({
-      label: getShowUnderlyingDataLabel(),
+      label: exploreDataInDiscoverLabel,
       run: () => {},
       testId: 'lnsApp_openInDiscover',
-      description: getShowUnderlyingDataLabel(),
+      description: exploreDataInDiscoverLabel,
       disableButton: Boolean(tooltips.showUnderlyingDataWarning()),
       tooltip: tooltips.showUnderlyingDataWarning,
       target: '_blank',
diff --git a/x-pack/plugins/lens/public/app_plugin/mounter.tsx b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
index e1419c8fe96f2..f7d865e92853e 100644
--- a/x-pack/plugins/lens/public/app_plugin/mounter.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/mounter.tsx
@@ -7,15 +7,18 @@
 
 import React, { FC, useCallback } from 'react';
 import { PreloadedState } from '@reduxjs/toolkit';
-import { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreSetup, CoreStart } from '@kbn/core/public';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { HashRouter, Route, RouteComponentProps, Switch } from 'react-router-dom';
 import { History } from 'history';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { Provider } from 'react-redux';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
+import { ACTION_VISUALIZE_LENS_FIELD } from '@kbn/ui-actions-plugin/public';
+import { ACTION_CONVERT_TO_LENS } from '@kbn/visualizations-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { LensReportManager, setReportManager, trackUiEvent } from '../lens_ui_telemetry';
 
 import { App } from './app';
@@ -28,14 +31,8 @@ import {
   LensByReferenceInput,
   LensByValueInput,
 } from '../embeddable/embeddable';
-import { ACTION_VISUALIZE_LENS_FIELD } from '../../../../../src/plugins/ui_actions/public';
-import { ACTION_CONVERT_TO_LENS } from '../../../../../src/plugins/visualizations/public';
 import { LensAttributeService } from '../lens_attribute_service';
 import { LensAppServices, RedirectToOriginProps, HistoryLocationState } from './types';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
 import {
   makeConfigureStore,
   navigateAway,
diff --git a/x-pack/plugins/lens/public/app_plugin/save_modal.tsx b/x-pack/plugins/lens/public/app_plugin/save_modal.tsx
index 124702e0dd90e..1a4d7c5bfb028 100644
--- a/x-pack/plugins/lens/public/app_plugin/save_modal.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/save_modal.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import type { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 
 import {
   TagEnhancedSavedObjectSaveModalOrigin,
diff --git a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
index 7fc03fd2a6551..9107141f655de 100644
--- a/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/save_modal_container.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { isFilterPinned } from '@kbn/es-query';
 
-import type { SavedObjectReference } from 'kibana/public';
+import type { SavedObjectReference } from '@kbn/core/public';
 import { SaveModal } from './save_modal';
 import type { LensAppProps, LensAppServices } from './types';
 import type { SaveProps } from './app';
diff --git a/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx b/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx
index 1adebcf123df9..cf5d00585090b 100644
--- a/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/settings_menu.tsx
@@ -7,15 +7,15 @@
 
 import React, { useCallback } from 'react';
 import ReactDOM from 'react-dom';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { EuiPopoverTitle, EuiSwitch, EuiWrappingPopover } from '@elastic/eui';
 import { Observable } from 'rxjs';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { Store } from 'redux';
 import { Provider } from 'react-redux';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   disableAutoApply,
   enableAutoApply,
diff --git a/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx b/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx
index e1df6ca60dd6e..24eeffd283f5f 100644
--- a/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/shared/saved_modal_lazy.tsx
@@ -8,7 +8,7 @@
 import React, { Suspense, useEffect, useState } from 'react';
 
 import { EuiLoadingSpinner, EuiOverlayMask } from '@elastic/eui';
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import type { SaveModalContainerProps } from '../save_modal_container';
 import type { LensPluginStartDependencies } from '../../plugin';
 import type { LensAppServices } from '../types';
diff --git a/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts b/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts
index fd7a9911c32f9..e673108585524 100644
--- a/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts
+++ b/x-pack/plugins/lens/public/app_plugin/show_underlying_data.ts
@@ -15,16 +15,11 @@ import {
 } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { Capabilities } from 'kibana/public';
+import { Capabilities } from '@kbn/core/public';
 import { partition } from 'lodash';
 import { TableInspectorAdapter } from '../editor_frame_service/types';
 import { Datasource } from '../types';
 
-export const getShowUnderlyingDataLabel = () =>
-  i18n.translate('xpack.lens.app.exploreRawData', {
-    defaultMessage: 'Explore data in Discover',
-  });
-
 /**
  * Joins a series of queries.
  *
diff --git a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx
index 96139799ca210..761f46cbbd2c9 100644
--- a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_dashboard_wrapper.tsx
@@ -6,13 +6,13 @@
  */
 
 import React, { FC, useState, useMemo, useCallback } from 'react';
-import { OnSaveProps } from '../../../../../src/plugins/saved_objects/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import {
   SaveModalDashboardProps,
   LazySavedObjectSaveModalDashboard,
   withSuspense,
-} from '../../../../../src/plugins/presentation_util/public';
-import { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+} from '@kbn/presentation-util-plugin/public';
+import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 
 export type DashboardSaveProps = OnSaveProps & {
   returnToOrigin: boolean;
diff --git a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx
index 4e1bb05ee8515..e689ab2b49ce1 100644
--- a/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/tags_saved_object_save_modal_origin_wrapper.tsx
@@ -11,8 +11,8 @@ import {
   SavedObjectSaveModalOrigin,
   OnSaveProps,
   SaveModalState,
-} from '../../../../../src/plugins/saved_objects/public';
-import { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
+} from '@kbn/saved-objects-plugin/public';
+import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
 
 export type OriginSaveProps = OnSaveProps & { returnToOrigin: boolean; newTags?: string[] };
 
diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts
index 1812e7dd8cdb0..94507754b893f 100644
--- a/x-pack/plugins/lens/public/app_plugin/types.ts
+++ b/x-pack/plugins/lens/public/app_plugin/types.ts
@@ -6,10 +6,10 @@
  */
 
 import type { History } from 'history';
-import type { OnSaveProps } from 'src/plugins/saved_objects/public';
-import { DiscoverStart } from 'src/plugins/discover/public';
+import type { OnSaveProps } from '@kbn/saved-objects-plugin/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
 import { Observable } from 'rxjs';
-import { SpacesApi } from '../../../spaces/public';
+import { SpacesApi } from '@kbn/spaces-plugin/public';
 import type {
   ApplicationStart,
   AppMountParameters,
@@ -21,26 +21,20 @@ import type {
   NotificationsStart,
   OverlayStart,
   SavedObjectsStart,
-} from '../../../../../src/core/public';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
-import type { UsageCollectionStart } from '../../../../../src/plugins/usage_collection/public';
-import type { DashboardStart } from '../../../../../src/plugins/dashboard/public';
-import type { LensEmbeddableInput } from '../embeddable/embeddable';
-import type { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
-import type { LensAttributeService } from '../lens_attribute_service';
-import type { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
-import type { DashboardFeatureFlagConfig } from '../../../../../src/plugins/dashboard/public';
-import type { SavedObjectTaggingPluginStart } from '../../../saved_objects_tagging/public';
-import {
-  VisualizeFieldContext,
-  ACTION_VISUALIZE_LENS_FIELD,
-} from '../../../../../src/plugins/ui_actions/public';
-import { ACTION_CONVERT_TO_LENS } from '../../../../../src/plugins/visualizations/public';
-import type {
-  EmbeddableEditorState,
-  EmbeddableStateTransfer,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DashboardFeatureFlagConfig } from '@kbn/dashboard-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
+import { VisualizeFieldContext, ACTION_VISUALIZE_LENS_FIELD } from '@kbn/ui-actions-plugin/public';
+import { ACTION_CONVERT_TO_LENS } from '@kbn/visualizations-plugin/public';
+import type { EmbeddableEditorState, EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type {
   DatasourceMap,
   EditorFrameInstance,
@@ -48,8 +42,8 @@ import type {
   LensTopNavMenuEntryGenerator,
   VisualizationMap,
 } from '../types';
-import type { PresentationUtilPluginStart } from '../../../../../src/plugins/presentation_util/public';
-import type { FieldFormatsStart } from '../../../../../src/plugins/field_formats/public';
+import type { LensAttributeService } from '../lens_attribute_service';
+import type { LensEmbeddableInput } from '../embeddable/embeddable';
 import type { LensInspector } from '../lens_inspector_service';
 
 export interface RedirectToOriginProps {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
index f383c13e275aa..54321d5005f47 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.test.tsx
@@ -9,14 +9,14 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { DataContext } from './table_basic';
 import { createGridCell } from './cell_value';
-import type { FieldFormat } from 'src/plugins/field_formats/common';
-import { Datatable } from 'src/plugins/expressions/public';
-import { IUiSettingsClient } from 'kibana/public';
+import type { FieldFormat } from '@kbn/field-formats-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { act } from 'react-dom/test-utils';
 import { ReactWrapper } from 'enzyme';
 import { DatatableArgs, ColumnConfigArg } from '../../../common/expressions';
 import { DataContextType } from './types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 describe('datatable cell renderer', () => {
   const table: Datatable = {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
index 9ecd7579aa17f..a7c3e8d832a12 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/cell_value.tsx
@@ -7,7 +7,7 @@
 
 import React, { useContext, useEffect } from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import classNames from 'classnames';
 import type { FormatFactory } from '../../../common';
 import { getOriginalId } from '../../../common/expressions';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
index 69447fa09a718..84395ac7dfdfc 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx
@@ -13,7 +13,7 @@ import {
   EuiDataGridColumnCellActionProps,
   EuiListGroupItemProps,
 } from '@elastic/eui';
-import type { Datatable, DatatableColumn, DatatableColumnMeta } from 'src/plugins/expressions';
+import type { Datatable, DatatableColumn, DatatableColumnMeta } from '@kbn/expressions-plugin';
 import type { FormatFactory } from '../../../common';
 import type { ColumnConfig } from '../../../common/expressions';
 
@@ -43,7 +43,8 @@ export const createGridColumns = (
   onColumnHide: ((eventData: { columnId: string }) => void) | undefined,
   alignments: Record<string, 'left' | 'right' | 'center'>,
   headerRowHeight: 'auto' | 'single' | 'custom',
-  headerRowLines: number
+  headerRowLines: number,
+  closeCellPopover?: Function
 ) => {
   const columnsReverseLookup = table.columns.reduce<
     Record<string, { name: string; index: number; meta?: DatatableColumnMeta }>
@@ -73,7 +74,7 @@ export const createGridColumns = (
     const cellActions =
       filterable && handleFilterClick
         ? [
-            ({ rowIndex, columnId, Component, closePopover }: EuiDataGridColumnCellActionProps) => {
+            ({ rowIndex, columnId, Component }: EuiDataGridColumnCellActionProps) => {
               const { rowValue, contentsIsDefined, cellContent } = getContentData({
                 rowIndex,
                 columnId,
@@ -102,7 +103,7 @@ export const createGridColumns = (
                     data-test-subj="lensDatatableFilterFor"
                     onClick={() => {
                       handleFilterClick(field, rowValue, colIndex, rowIndex);
-                      closePopover?.();
+                      closeCellPopover?.();
                     }}
                     iconType="plusInCircle"
                   >
@@ -111,7 +112,7 @@ export const createGridColumns = (
                 )
               );
             },
-            ({ rowIndex, columnId, Component, closePopover }: EuiDataGridColumnCellActionProps) => {
+            ({ rowIndex, columnId, Component }: EuiDataGridColumnCellActionProps) => {
               const { rowValue, contentsIsDefined, cellContent } = getContentData({
                 rowIndex,
                 columnId,
@@ -140,7 +141,7 @@ export const createGridColumns = (
                     aria-label={filterOutAriaLabel}
                     onClick={() => {
                       handleFilterClick(field, rowValue, colIndex, rowIndex, true);
-                      closePopover?.();
+                      closeCellPopover?.();
                     }}
                     iconType="minusInCircle"
                   >
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx
index 4004164a9427d..64517c92dc77e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.test.tsx
@@ -17,7 +17,7 @@ import { DatatableVisualizationState } from '../visualization';
 import { createMockDatasource, createMockFramePublicAPI } from '../../mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { TableDimensionEditor } from './dimension_editor';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { act } from 'react-dom/test-utils';
 import { PalettePanelContainer } from '../../shared_components';
 import { layerTypes } from '../../../common';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx
index 62eacd23f7143..11fc3fc1e8a6c 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx
@@ -29,7 +29,7 @@ import {
   useDebouncedValue,
   PalettePanelContainer,
   findMinMaxByColumnId,
-} from '../../shared_components/';
+} from '../../shared_components';
 import type { ColumnState } from '../../../common/expressions';
 import {
   isNumericFieldForDatatable,
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts
index 515f5a40fd58a..118abdcb77c8a 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts
@@ -8,7 +8,7 @@
 import React from 'react';
 
 import { EuiDataGridSorting } from '@elastic/eui';
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 
 import {
   createGridFilterHandler,
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
index c37ab22002c1c..817b1d10fd82e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts
@@ -6,7 +6,7 @@
  */
 
 import type { EuiDataGridSorting } from '@elastic/eui';
-import type { Datatable, DatatableColumn } from 'src/plugins/expressions';
+import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin';
 import type { LensFilterEvent } from '../../types';
 import type { LensMultiTable } from '../../../common';
 import type { LensResizeAction, LensSortAction, LensToggleAction } from './types';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
index 2ad20bf0a43e2..96ffbf371525e 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx
@@ -10,21 +10,21 @@ import { ReactWrapper, shallow, mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { EuiDataGrid } from '@elastic/eui';
-import { IAggType } from 'src/plugins/data/public';
+import { IAggType } from '@kbn/data-plugin/public';
 import {
   FieldFormatParams,
   IFieldFormat,
   SerializedFieldFormat,
-} from 'src/plugins/field_formats/common';
+} from '@kbn/field-formats-plugin/common';
 import { VisualizationContainer } from '../../visualization_container';
-import { EmptyPlaceholder } from '../../../../../../src/plugins/charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import { LensIconChartDatatable } from '../../assets/chart_datatable';
 import { DataContext, DatatableComponent } from './table_basic';
 import { LensMultiTable } from '../../../common';
 import { DatatableProps } from '../../../common/expressions';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { IUiSettingsClient } from 'kibana/public';
-import { RenderMode } from 'src/plugins/expressions';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { RenderMode } from '@kbn/expressions-plugin';
 
 import { LENS_EDIT_PAGESIZE_ACTION } from './constants';
 
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
index 7c90f19949332..76d677f74fe91 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx
@@ -13,12 +13,13 @@ import useDeepCompareEffect from 'react-use/lib/useDeepCompareEffect';
 import {
   EuiButtonIcon,
   EuiDataGrid,
+  EuiDataGridRefProps,
   EuiDataGridControlColumn,
   EuiDataGridColumn,
   EuiDataGridSorting,
   EuiDataGridStyle,
 } from '@elastic/eui';
-import { EmptyPlaceholder } from '../../../../../../src/plugins/charts/public';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import type { LensFilterEvent, LensTableRowContextMenuEvent } from '../../types';
 import type { FormatFactory } from '../../../common';
 import type { LensGridDirection } from '../../../common/expressions';
@@ -55,6 +56,8 @@ export const DEFAULT_PAGE_SIZE = 10;
 const PAGE_SIZE_OPTIONS = [DEFAULT_PAGE_SIZE, 20, 30, 50, 100];
 
 export const DatatableComponent = (props: DatatableRenderProps) => {
+  const dataGridRef = useRef<EuiDataGridRefProps>(null);
+
   const [firstTable] = Object.values(props.data.tables);
 
   const isInteractive = props.interactive;
@@ -272,7 +275,8 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
         onColumnHide,
         alignments,
         headerRowHeight,
-        headerRowLines
+        headerRowLines,
+        dataGridRef.current?.closeCellPopover
       ),
     [
       bucketColumns,
@@ -454,6 +458,7 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
           onColumnResize={onColumnResize}
           toolbarVisibility={false}
           renderFooterCellValue={renderSummaryRow}
+          ref={dataGridRef}
         />
       </DataContext.Provider>
     </VisualizationContainer>
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx
index 974b26211e729..6c69b855dd65a 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.test.tsx
@@ -10,7 +10,7 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DataTableToolbar } from './toolbar';
 import { DatatableVisualizationState } from '../visualization';
 import { FramePublicAPI, VisualizationToolbarProps } from '../../types';
-import { ToolbarButton } from 'src/plugins/kibana_react/public';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import { ReactWrapper } from 'enzyme';
 import { PagingState } from '../../../common/expressions';
 import { EuiButtonGroup, EuiRange } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
index a2801424701b3..656f8efcc09ee 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/toolbar.tsx
@@ -49,7 +49,7 @@ export function DataTableToolbar(props: VisualizationToolbarProps<DatatableVisua
   }, [setState, state]);
 
   return (
-    <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
       <ToolbarPopover
         title={i18n.translate('xpack.lens.table.valuesVisualOptions', {
           defaultMessage: 'Visual options',
diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts
index 139a070e3476b..40477b98bec23 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { CustomPaletteState } from 'src/plugins/charts/public';
-import type { IAggType } from 'src/plugins/data/public';
-import type { Datatable, RenderMode } from 'src/plugins/expressions';
+import { CustomPaletteState } from '@kbn/charts-plugin/public';
+import type { IAggType } from '@kbn/data-plugin/public';
+import type { Datatable, RenderMode } from '@kbn/expressions-plugin';
 import type { ILensInterpreterRenderHandlers, LensEditEvent } from '../../types';
 import {
   LENS_EDIT_SORT_ACTION,
diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
index 74c33a2b02a5b..8a899780515b2 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
@@ -7,7 +7,7 @@
 
 import type { DatatableProps } from '../../common/expressions';
 import type { LensMultiTable } from '../../common';
-import { createMockExecutionContext } from '../../../../../src/plugins/expressions/common/mocks';
+import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
 import type { FormatFactory } from '../../common';
 import { getDatatable } from '../../common/expressions';
 
diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
index 9c00aa3c71308..1053eadce1363 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
@@ -10,10 +10,10 @@ import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { IAggType } from 'src/plugins/data/public';
-import { IUiSettingsClient, ThemeServiceStart } from 'kibana/public';
-import { ExpressionRenderDefinition } from 'src/plugins/expressions';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import type { IAggType } from '@kbn/data-plugin/public';
+import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { DatatableComponent } from './components/table_basic';
 
 import type { ILensInterpreterRenderHandlers } from '../types';
diff --git a/x-pack/plugins/lens/public/datatable_visualization/index.ts b/x-pack/plugins/lens/public/datatable_visualization/index.ts
index 5ab970e84d043..f19c731517c2d 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/index.ts
+++ b/x-pack/plugins/lens/public/datatable_visualization/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import type { ChartsPluginSetup } from 'src/plugins/charts/public';
-import type { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
 import type { FormatFactory } from '../../common';
 
 interface DatatableVisualizationPluginStartPlugins {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx
index 93421117f59dc..5e86aa9becc66 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { Ast } from '@kbn/interpreter';
-import { buildExpression } from '../../../../../src/plugins/expressions/public';
+import { buildExpression } from '@kbn/expressions-plugin/public';
 import { createMockDatasource, createMockFramePublicAPI, DatasourceMock } from '../mocks';
 import { DatatableVisualizationState, getDatatableVisualization } from './visualization';
 import {
@@ -16,9 +16,9 @@ import {
   TableSuggestionColumn,
   VisualizationDimensionGroupConfig,
 } from '../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { layerTypes } from '../../common';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 function mockFrame(): FramePublicAPI {
   return {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
index a5e2e4e0f2675..8087f43b90e72 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
@@ -11,19 +11,19 @@ import { Ast } from '@kbn/interpreter';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { PaletteRegistry, CUSTOM_PALETTE } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 import type {
   SuggestionRequest,
   Visualization,
   VisualizationSuggestion,
-  DatasourcePublicAPI,
+  DatasourceLayers,
 } from '../types';
 import { LensIconChartDatatable } from '../assets/chart_datatable';
 import { TableDimensionEditor } from './components/dimension_editor';
 import { LayerType, layerTypes } from '../../common';
 import { getDefaultSummaryLabel, PagingState } from '../../common/expressions';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
 import type { ColumnState, SortingState } from '../../common/expressions';
 import { DataTableToolbar } from './components/toolbar';
 
@@ -492,7 +492,7 @@ export const getDatatableVisualization = ({
 
 function getDataSourceAndSortedColumns(
   state: DatatableVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   layerId: string
 ) {
   const datasource = datasourceLayers[state.layerId];
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
index dbbc6932220dc..c38a9a3493708 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
@@ -64,7 +64,6 @@ export function AddLayerButton({
         position="bottom"
       >
         <EuiButton
-          className="lnsConfigPanel__addLayerBtn"
           fullWidth
           data-test-subj="lnsLayerAddButton"
           aria-label={i18n.translate('xpack.lens.configPanel.addLayerButton', {
@@ -88,7 +87,6 @@ export function AddLayerButton({
       data-test-subj="lnsConfigPanel__addLayerPopover"
       button={
         <EuiButton
-          className="lnsConfigPanel__addLayerBtn"
           fullWidth
           data-test-subj="lnsLayerAddButton"
           aria-label={i18n.translate('xpack.lens.configPanel.addLayerButton', {
@@ -116,6 +114,7 @@ export function AddLayerButton({
             title: i18n.translate('xpack.lens.configPanel.selectLayerType', {
               defaultMessage: 'Select layer type',
             }),
+            width: 300,
             items: supportedLayers.map(({ type, label, icon, disabled, toolTipContent }) => {
               return {
                 toolTipContent,
@@ -143,7 +142,6 @@ export function AddLayerButton({
                     <span className="lnsLayerAddButtonLabel">{label}</span>
                   ),
                 className: 'lnsLayerAddButton',
-                width: 300,
                 icon: icon && <EuiIcon size="m" type={icon} />,
                 ['data-test-subj']: `lnsLayerAddButton-${type}`,
                 onClick: () => {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx
index b234b18f5262f..fd43fdf6e1a0f 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.test.tsx
@@ -17,7 +17,7 @@ import {
 import { Visualization } from '../../../types';
 import { LayerPanels } from './config_panel';
 import { LayerPanel } from './layer_panel';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { generateId } from '../../../id_generator';
 import { mountWithProvider } from '../../../mocks';
 import { LayerType, layerTypes } from '../../../../common';
@@ -422,6 +422,7 @@ describe('ConfigPanel', () => {
           datasourceLayers: {
             a: expect.anything(),
           },
+          dateRange: expect.anything(),
         },
         groupId: 'a',
         layerId: 'newId',
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
index 343cd746ba2ac..69e2ee99460bc 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
@@ -148,4 +148,4 @@
     @include passDownFocusRing('.lnsLayerPanel__triggerTextLabel');
     background-color: transparent;
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
index 0f28e54df17d9..2955c6a8cd935 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
@@ -11,7 +11,7 @@ import { EuiFormRow } from '@elastic/eui';
 import { FramePublicAPI, Visualization } from '../../../types';
 import { LayerPanel } from './layer_panel';
 import { ChildDragDropProvider, DragDrop } from '../../../drag_drop';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { generateId } from '../../../id_generator';
 import {
   createMockVisualization,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx
index 64656a2eedf63..cd7d325d5830d 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { DataPanelWrapper } from './data_panel_wrapper';
 import { Datasource, DatasourceDataPanelProps } from '../../types';
 import { DragDropIdentifier } from '../../drag_drop';
-import { UiActionsStart } from 'src/plugins/ui_actions/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { mockStoreDeps, mountWithProvider } from '../../mocks';
 import { disableAutoApply } from '../../state_management/lens_slice';
 import { selectTriggerApplyChanges } from '../../state_management';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx
index 17f3d385123c2..a12578c66b0c9 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/data_panel_wrapper.tsx
@@ -10,10 +10,10 @@ import './data_panel_wrapper.scss';
 import React, { useMemo, memo, useContext, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiPopover, EuiButtonIcon, EuiContextMenuPanel, EuiContextMenuItem } from '@elastic/eui';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { NativeRenderer } from '../../native_renderer';
 import { DragContext, DragDropIdentifier } from '../../drag_drop';
 import { StateSetter, DatasourceDataPanelProps, DatasourceMap } from '../../types';
-import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
 import {
   switchDatasource,
   useLensDispatch,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
index faf36a3b519c5..91ca494866f30 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
@@ -31,7 +31,7 @@ import { EuiPanel, EuiToolTip } from '@elastic/eui';
 import { EditorFrame, EditorFrameProps } from './editor_frame';
 import { DatasourcePublicAPI, DatasourceSuggestion, Visualization } from '../../types';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { fromExpression } from '@kbn/interpreter';
 import {
   createMockVisualization,
@@ -40,12 +40,12 @@ import {
   createExpressionRendererMock,
   mockStoreDeps,
 } from '../../mocks';
-import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
-import { ReactExpressionRendererType } from 'src/plugins/expressions/public';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
 import { DragDrop } from '../../drag_drop';
-import { uiActionsPluginMock } from '../../../../../../src/plugins/ui_actions/public/mocks';
-import { chartPluginMock } from '../../../../../../src/plugins/charts/public/mocks';
-import { expressionsPluginMock } from '../../../../../../src/plugins/expressions/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { mockDataPlugin, mountWithProvider } from '../../mocks';
 import { setState } from '../../state_management';
 import { getLensInspectorService } from '../../lens_inspector_service';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx
index 7f1c673d0d1dd..16a3a6f96827a 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { useCallback, useRef } from 'react';
-import { CoreStart } from 'kibana/public';
-import { ReactExpressionRendererType } from '../../../../../../src/plugins/expressions/public';
+import { CoreStart } from '@kbn/core/public';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
 import { DatasourceMap, FramePublicAPI, VisualizationMap, Suggestion } from '../../types';
 import { DataPanelWrapper } from './data_panel_wrapper';
 import { ConfigPanelWrapper } from './config_panel';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
index 600341931f575..cecf75cd58676 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/expression_helpers.ts
@@ -7,7 +7,7 @@
 
 import { Ast, AstFunction, fromExpression } from '@kbn/interpreter';
 import { DatasourceStates } from '../../state_management';
-import { Visualization, DatasourcePublicAPI, DatasourceMap } from '../../types';
+import { Visualization, DatasourceMap, DatasourceLayers } from '../../types';
 
 export function prependDatasourceExpression(
   visualizationExpression: Ast | string | null,
@@ -74,7 +74,7 @@ export function buildExpression({
   visualizationState: unknown;
   datasourceMap: DatasourceMap;
   datasourceStates: DatasourceStates;
-  datasourceLayers: Record<string, DatasourcePublicAPI>;
+  datasourceLayers: DatasourceLayers;
 }): Ast | null {
   if (visualization === null) {
     return null;
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts
index 95626b7657e59..1790a18ad1248 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/state_helpers.ts
@@ -5,13 +5,14 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { Ast } from '@kbn/interpreter';
 import memoizeOne from 'memoize-one';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import {
   Datasource,
+  DatasourceLayers,
   DatasourceMap,
-  DatasourcePublicAPI,
   FramePublicAPI,
   InitializationOptions,
   Visualization,
@@ -20,7 +21,6 @@ import {
 } from '../../types';
 import { buildExpression } from './expression_helpers';
 import { Document } from '../../persistence/saved_object_store';
-import { VisualizeFieldContext } from '../../../../../../src/plugins/ui_actions/public';
 import { getActiveDatasourceIdFromDoc } from '../../utils';
 import { ErrorMessage } from '../types';
 import {
@@ -62,7 +62,7 @@ export const getDatasourceLayers = memoizeOne(function getDatasourceLayers(
   datasourceStates: DatasourceStates,
   datasourceMap: DatasourceMap
 ) {
-  const datasourceLayers: Record<string, DatasourcePublicAPI> = {};
+  const datasourceLayers: DatasourceLayers = {};
   Object.keys(datasourceMap)
     .filter((id) => datasourceStates[id] && !datasourceStates[id].isLoading)
     .forEach((id) => {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts
index f24158d2db501..d21940d4ed561 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 import type { PaletteOutput } from '@kbn/coloring';
-import { VisualizeFieldContext } from '../../../../../../src/plugins/ui_actions/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import {
   Visualization,
   Datasource,
   TableSuggestion,
   DatasourceSuggestion,
-  DatasourcePublicAPI,
   DatasourceMap,
   VisualizationMap,
   VisualizeEditorContext,
   Suggestion,
+  DatasourceLayers,
 } from '../../types';
 import { DragDropIdentifier } from '../../drag_drop';
 import { LayerType, layerTypes } from '../../../common';
@@ -261,7 +261,7 @@ export function switchToSuggestion(
 }
 
 export function getTopSuggestionForField(
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   visualization: VisualizationState,
   datasourceStates: DatasourceStates,
   visualizationMap: Record<string, Visualization<unknown>>,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
index 2c9c837c45298..cda496aa693e8 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
@@ -15,7 +15,7 @@ import {
   createMockFramePublicAPI,
 } from '../../mocks';
 import { act } from 'react-dom/test-utils';
-import { ReactExpressionRendererType } from '../../../../../../src/plugins/expressions/public';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
 import { SuggestionPanel, SuggestionPanelProps, SuggestionPanelWrapper } from './suggestion_panel';
 import { getSuggestions } from './suggestion_helpers';
 import { EuiIcon, EuiPanel, EuiToolTip, EuiAccordion } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
index 69de606a77ca7..770d25be5388f 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
@@ -25,20 +25,20 @@ import { IconType } from '@elastic/eui/src/components/icon/icon';
 import { Ast, toExpression } from '@kbn/interpreter';
 import { i18n } from '@kbn/i18n';
 import classNames from 'classnames';
-import { ExecutionContextSearch } from 'src/plugins/data/public';
+import { ExecutionContextSearch } from '@kbn/data-plugin/public';
+import {
+  ReactExpressionRendererProps,
+  ReactExpressionRendererType,
+} from '@kbn/expressions-plugin/public';
 import {
   Datasource,
   Visualization,
   FramePublicAPI,
-  DatasourcePublicAPI,
   DatasourceMap,
   VisualizationMap,
+  DatasourceLayers,
 } from '../../types';
 import { getSuggestions, switchToSuggestion } from './suggestion_helpers';
-import {
-  ReactExpressionRendererProps,
-  ReactExpressionRendererType,
-} from '../../../../../../src/plugins/expressions/public';
 import { prependDatasourceExpression } from './expression_helpers';
 import { trackUiEvent, trackSuggestionEvent } from '../../lens_ui_telemetry';
 import {
@@ -491,7 +491,9 @@ function getPreviewExpression(
     return null;
   }
 
-  const suggestionFrameApi: FramePublicAPI = { datasourceLayers: { ...frame.datasourceLayers } };
+  const suggestionFrameApi: Pick<FramePublicAPI, 'datasourceLayers' | 'activeData'> = {
+    datasourceLayers: { ...frame.datasourceLayers },
+  };
 
   // use current frame api and patch apis for changed datasource layers
   if (
@@ -501,7 +503,7 @@ function getPreviewExpression(
   ) {
     const datasource = datasources[visualizableState.datasourceId];
     const datasourceState = visualizableState.datasourceState;
-    const updatedLayerApis: Record<string, DatasourcePublicAPI> = pick(
+    const updatedLayerApis: DatasourceLayers = pick(
       frame.datasourceLayers,
       visualizableState.keptLayerIds
     );
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss
index a4e22b4ef558c..9cd11cf1396db 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.scss
@@ -6,9 +6,18 @@
 }
 
 .lnsChartSwitch__summaryIcon {
-  margin-right: $euiSizeS;
   transform: translateY(-1px);
   color: $euiTextSubduedColor;
+
+  @include euiBreakpoint('xl') {
+    margin-right: $euiSizeS;
+  }
+}
+
+.lnsChartSwitch__summaryText {
+  @include euiBreakpoint('xs', 's', 'm', 'l') {
+    @include euiScreenReaderOnly;
+  }
 }
 
 .lnsChartSwitch__append {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx
index d90fcddec46ce..a611d6d43638d 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.tsx
@@ -20,6 +20,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import {
   Visualization,
   FramePublicAPI,
@@ -30,7 +31,6 @@ import {
 } from '../../../types';
 import { getSuggestions, switchToSuggestion } from '../suggestion_helpers';
 import { trackUiEvent } from '../../../lens_ui_telemetry';
-import { ToolbarButton } from '../../../../../../../src/plugins/kibana_react/public';
 import {
   insertLayer,
   removeLayers,
@@ -92,7 +92,7 @@ function VisualizationSummary({
       {description.icon && (
         <EuiIcon size="l" className="lnsChartSwitch__summaryIcon" type={description.icon} />
       )}
-      {description.label}
+      <span className="lnsChartSwitch__summaryText">{description.label}</span>
     </>
   );
 }
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx
index 44d6a7118aca9..3b5724b6d72f6 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel.tsx
@@ -9,10 +9,7 @@ import React from 'react';
 import { EuiPageContentBody, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import {
-  UiActionsStart,
-  VISUALIZE_GEO_FIELD_TRIGGER,
-} from '../../../../../../../src/plugins/ui_actions/public';
+import { UiActionsStart, VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
 import { getVisualizeGeoFieldMessage } from '../../../utils';
 import { DragDrop } from '../../../drag_drop';
 import { GlobeIllustration } from '../../../assets/globe_illustration';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss
index 19f815dfb7114..ca1d4b2e2caff 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.scss
@@ -1,5 +1,7 @@
-.lnsWorkspaceWarning__button {
-  color: $euiColorWarningText;
+.lnsWorkspaceWarning__buttonText {
+  @include euiBreakpoint('xs', 's', 'm', 'l') {
+    @include euiScreenReaderOnly;
+  }
 }
 
 .lnsWorkspaceWarningList {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx
index 51df2d83d1832..6f90bd340c1eb 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/warnings_popover.tsx
@@ -31,16 +31,21 @@ export const WarningsPopover = ({
       panelPaddingSize="none"
       button={
         <EuiButtonEmpty
+          color="warning"
           onClick={onButtonClick}
           iconType="alert"
           className="lnsWorkspaceWarning__button"
         >
-          {i18n.translate('xpack.lens.chartWarnings.number', {
-            defaultMessage: `{warningsCount} {warningsCount, plural, one {warning} other {warnings}}`,
-            values: {
-              warningsCount,
-            },
-          })}
+          {warningsCount}
+          <span className="lnsWorkspaceWarning__buttonText">
+            {' '}
+            {i18n.translate('xpack.lens.chartWarnings.number', {
+              defaultMessage: `{warningsCount, plural, one {warning} other {warnings}}`,
+              values: {
+                warningsCount,
+              },
+            })}
+          </span>
         </EuiButtonEmpty>
       }
       isOpen={isPopoverOpen}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
index 70ed86c2eef37..6e546459a7011 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { ReactExpressionRendererProps } from '../../../../../../../src/plugins/expressions/public';
+import { ReactExpressionRendererProps } from '@kbn/expressions-plugin/public';
 import { FramePublicAPI, Visualization } from '../../../types';
 import {
   createMockVisualization,
@@ -28,13 +28,13 @@ import { ReactWrapper } from 'enzyme';
 import { DragDrop, ChildDragDropProvider } from '../../../drag_drop';
 import { fromExpression } from '@kbn/interpreter';
 import { buildExistsFilter } from '@kbn/es-query';
-import { coreMock } from 'src/core/public/mocks';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
-import { UiActionsStart } from '../../../../../../../src/plugins/ui_actions/public';
-import { uiActionsPluginMock } from '../../../../../../../src/plugins/ui_actions/public/mocks';
-import { TriggerContract } from '../../../../../../../src/plugins/ui_actions/public/triggers';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../../../src/plugins/visualizations/public/embeddable';
+import { coreMock } from '@kbn/core/public/mocks';
+import { DataView } from '@kbn/data-views-plugin/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { TriggerContract } from '@kbn/ui-actions-plugin/public/triggers';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public/embeddable';
 import {
   applyChanges,
   setState,
@@ -42,7 +42,7 @@ import {
   updateVisualizationState,
 } from '../../../state_management';
 import { getLensInspectorService } from '../../../lens_inspector_service';
-import { inspectorPluginMock } from '../../../../../../../src/plugins/inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { disableAutoApply, enableAutoApply } from '../../../state_management/lens_slice';
 
 const defaultPermissions: Record<string, Record<string, boolean | Record<string, boolean>>> = {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
index d349428902c82..9fbe03bc8561e 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
@@ -22,14 +22,18 @@ import {
   EuiSpacer,
   EuiTextColor,
 } from '@elastic/eui';
-import type { CoreStart, ApplicationStart } from 'kibana/public';
-import type { DataPublicPluginStart, ExecutionContextSearch } from 'src/plugins/data/public';
-import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public';
+import type { CoreStart, ApplicationStart } from '@kbn/core/public';
+import type { DataPublicPluginStart, ExecutionContextSearch } from '@kbn/data-plugin/public';
+import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import type {
   ExpressionRendererEvent,
   ExpressionRenderError,
   ReactExpressionRendererType,
-} from '../../../../../../../src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import type { DefaultInspectorAdapters } from '@kbn/expressions-plugin/common';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import {
   FramePublicAPI,
   isLensBrushEvent,
@@ -44,8 +48,6 @@ import { DragDrop, DragContext, DragDropIdentifier } from '../../../drag_drop';
 import { switchToSuggestion } from '../suggestion_helpers';
 import { buildExpression } from '../expression_helpers';
 import { trackUiEvent } from '../../../lens_ui_telemetry';
-import { UiActionsStart } from '../../../../../../../src/plugins/ui_actions/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../../../src/plugins/visualizations/public';
 import { WorkspacePanelWrapper } from './workspace_panel_wrapper';
 import { DropIllustration } from '../../../assets/drop_illustration';
 import applyChangesIllustrationDark from '../../../assets/render_dark@2x.png';
@@ -55,7 +57,6 @@ import {
   getUnknownVisualizationTypeError,
 } from '../../error_helper';
 import { getMissingIndexPattern, validateDatasourceAndVisualization } from '../state_helpers';
-import type { DefaultInspectorAdapters } from '../../../../../../../src/plugins/expressions/common';
 import {
   onActiveDataChange,
   useLensDispatch,
@@ -78,7 +79,6 @@ import {
 import type { LensInspector } from '../../../lens_inspector_service';
 import { inferTimeField } from '../../../utils';
 import { setChangesApplied } from '../../../state_management/lens_slice';
-import type { Datatable } from '../../../../../../../src/plugins/expressions/public';
 import { DONT_CLOSE_DIMENSION_CONTAINER_ON_CLICK_CLASS } from '../config_panel/dimension_container';
 
 export interface WorkspacePanelProps {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
index a3287179f13cd..4d07441287cbd 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
@@ -87,15 +87,19 @@
 }
 
 .lnsWorkspacePanelWrapper__toolbar {
-  margin-bottom: 0;
+  margin-bottom: $euiSizeXS;
+}
 
-  &.lnsWorkspacePanelWrapper__toolbar--fullscreen {
-    padding: $euiSizeS $euiSizeS 0 $euiSizeS;
-    background-color: #FFF;
-  }
+.lnsWorkspacePanelWrapper__toolbar--fullscreen {
+  background-color: $euiColorEmptyShade;
+  justify-content: flex-end;
+  margin-bottom: 0;
+  padding: $euiSizeS $euiSizeS 0;
+}
 
-  & > .euiFlexItem {
-    min-height: $euiButtonHeightSmall;
+.lnsWorkspacePanelWrapper__applyButton .euiButton__text {
+  @include euiBreakpoint('xs', 's', 'm', 'l') {
+    @include euiScreenReaderOnly;
   }
 }
 
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
index bb85ed4019412..d476a8689f06b 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
@@ -103,80 +103,76 @@ export function WorkspacePanelWrapper({
   return (
     <>
       {!(isFullscreen && (autoApplyEnabled || warningMessages?.length)) && (
-        <div>
-          <EuiFlexGroup
-            alignItems="center"
-            gutterSize="m"
-            direction="row"
-            responsive={false}
-            wrap={true}
-            justifyContent="spaceBetween"
-            className={classNames('lnsWorkspacePanelWrapper__toolbar', {
-              'lnsWorkspacePanelWrapper__toolbar--fullscreen': isFullscreen,
-            })}
-          >
-            {!isFullscreen && (
-              <EuiFlexItem grow={false}>
-                <EuiFlexGroup gutterSize="m" justifyContent="flexStart">
-                  <EuiFlexItem grow={false}>
-                    <ChartSwitch
-                      data-test-subj="lnsChartSwitcher"
-                      visualizationMap={visualizationMap}
-                      datasourceMap={datasourceMap}
-                      framePublicAPI={framePublicAPI}
-                    />
-                  </EuiFlexItem>
-                  {activeVisualization && activeVisualization.renderToolbar && (
-                    <EuiFlexItem grow={false}>
-                      <NativeRenderer
-                        render={activeVisualization.renderToolbar}
-                        nativeProps={{
-                          frame: framePublicAPI,
-                          state: visualizationState,
-                          setState: setVisualizationState,
-                        }}
-                      />
-                    </EuiFlexItem>
-                  )}
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            )}
+        <EuiFlexGroup
+          alignItems="flexEnd"
+          gutterSize="s"
+          direction="row"
+          className={classNames('lnsWorkspacePanelWrapper__toolbar', {
+            'lnsWorkspacePanelWrapper__toolbar--fullscreen': isFullscreen,
+          })}
+          responsive={false}
+        >
+          {!isFullscreen && (
             <EuiFlexItem>
-              <EuiFlexGroup
-                alignItems="center"
-                justifyContent="flexEnd"
-                gutterSize="s"
-                responsive={false}
-              >
+              <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false} wrap={true}>
                 <EuiFlexItem grow={false}>
-                  {warningMessages?.length ? (
-                    <WarningsPopover>{warningMessages}</WarningsPopover>
-                  ) : null}
+                  <ChartSwitch
+                    data-test-subj="lnsChartSwitcher"
+                    visualizationMap={visualizationMap}
+                    datasourceMap={datasourceMap}
+                    framePublicAPI={framePublicAPI}
+                  />
                 </EuiFlexItem>
-                {!autoApplyEnabled && (
+
+                {activeVisualization && activeVisualization.renderToolbar && (
                   <EuiFlexItem grow={false}>
-                    <div>
-                      <EuiButton
-                        disabled={autoApplyEnabled || changesApplied}
-                        fill
-                        className={DONT_CLOSE_DIMENSION_CONTAINER_ON_CLICK_CLASS}
-                        iconType="checkInCircleFilled"
-                        onClick={() => dispatchLens(applyChanges())}
-                        size="m"
-                        data-test-subj="lnsApplyChanges__toolbar"
-                      >
-                        <FormattedMessage
-                          id="xpack.lens.editorFrame.applyChangesLabel"
-                          defaultMessage="Apply changes"
-                        />
-                      </EuiButton>
-                    </div>
+                    <NativeRenderer
+                      render={activeVisualization.renderToolbar}
+                      nativeProps={{
+                        frame: framePublicAPI,
+                        state: visualizationState,
+                        setState: setVisualizationState,
+                      }}
+                    />
                   </EuiFlexItem>
                 )}
               </EuiFlexGroup>
             </EuiFlexItem>
-          </EuiFlexGroup>
-        </div>
+          )}
+
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+              {warningMessages?.length ? (
+                <EuiFlexItem grow={false}>
+                  <WarningsPopover>{warningMessages}</WarningsPopover>
+                </EuiFlexItem>
+              ) : null}
+
+              {!autoApplyEnabled && (
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    disabled={autoApplyEnabled || changesApplied}
+                    fill
+                    className={
+                      'lnsWorkspacePanelWrapper__applyButton ' +
+                      DONT_CLOSE_DIMENSION_CONTAINER_ON_CLICK_CLASS
+                    }
+                    iconType="checkInCircleFilled"
+                    onClick={() => dispatchLens(applyChanges())}
+                    size="m"
+                    data-test-subj="lnsApplyChanges__toolbar"
+                    minWidth="auto"
+                  >
+                    <FormattedMessage
+                      id="xpack.lens.editorFrame.applyChangesLabel"
+                      defaultMessage="Apply changes"
+                    />
+                  </EuiButton>
+                </EuiFlexItem>
+              )}
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
       )}
 
       <EuiPageContent
diff --git a/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts b/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
index 7d237cb783c5e..f9a2c2efcdc22 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/error_helper.ts
@@ -7,9 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { isEqual, uniqWith } from 'lodash';
-import { ExpressionRenderError } from '../../../../../src/plugins/expressions/public';
-import { isEsError } from '../../../../../src/plugins/data/public';
-import type { IEsError, Reason } from '../../../../../src/plugins/data/public';
+import { ExpressionRenderError } from '@kbn/expressions-plugin/public';
+import { isEsError } from '@kbn/data-plugin/public';
+import type { IEsError, Reason } from '@kbn/data-plugin/public';
 
 type ErrorCause = Required<IEsError>['attributes'];
 
diff --git a/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx b/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx
index db8cd2aeabf6b..edccc071a57d1 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx
@@ -6,12 +6,12 @@
  */
 
 import type { PaletteDefinition } from '@kbn/coloring';
-import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/expressions/public';
-import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
-import { expressionsPluginMock } from '../../../../../src/plugins/expressions/public/mocks';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EditorFrameSetupPlugins, EditorFrameStartPlugins } from './service';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
 
 export function createMockPaletteDefinition(): jest.Mocked<PaletteDefinition> {
   return {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/service.tsx b/x-pack/plugins/lens/public/editor_frame_service/service.tsx
index ff05f7e5f0bb9..3eb0b14ae49fb 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/service.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/service.tsx
@@ -6,14 +6,15 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'kibana/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/expressions/public';
-import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
-import {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../../src/plugins/data/public';
+import { CoreStart } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ExpressionsSetup, ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { DashboardStart } from '@kbn/dashboard-plugin/public';
+import { Document } from '../persistence/saved_object_store';
 import {
   Datasource,
   Visualization,
@@ -21,10 +22,6 @@ import {
   EditorFrameInstance,
   EditorFrameStart,
 } from '../types';
-import { Document } from '../persistence/saved_object_store';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
-import { DashboardStart } from '../../../../../src/plugins/dashboard/public';
 
 export interface EditorFrameSetupPlugins {
   data: DataPublicPluginSetup;
diff --git a/x-pack/plugins/lens/public/editor_frame_service/types.ts b/x-pack/plugins/lens/public/editor_frame_service/types.ts
index 9435faf374420..2d50e96ec280e 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/types.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datatable } from 'src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 
 export type TableInspectorAdapter = Record<string, Datatable>;
 
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx
index f37b0dfe4ad1e..7423d30331414 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.test.tsx
@@ -14,24 +14,24 @@ import {
   LensSavedObjectAttributes,
   LensUnwrapResult,
 } from './embeddable';
-import { ReactExpressionRendererProps } from 'src/plugins/expressions/public';
-import { spacesPluginMock } from '../../../spaces/public/mocks';
+import { ReactExpressionRendererProps } from '@kbn/expressions-plugin/public';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { Filter } from '@kbn/es-query';
-import { Query, TimeRange, FilterManager } from 'src/plugins/data/public';
-import type { DataViewsContract } from 'src/plugins/data_views/public';
+import { Query, TimeRange, FilterManager } from '@kbn/data-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { Document } from '../persistence';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public/embeddable';
-import { coreMock, httpServiceMock, themeServiceMock } from '../../../../../src/core/public/mocks';
-import { IBasePath } from '../../../../../src/core/public';
-import { AttributeService, ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public/embeddable';
+import { coreMock, httpServiceMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { IBasePath } from '@kbn/core/public';
+import { AttributeService, ViewMode } from '@kbn/embeddable-plugin/public';
 import { LensAttributeService } from '../lens_attribute_service';
-import { OnSaveProps } from '../../../../../src/plugins/saved_objects/public/save_modal';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public/save_modal';
 import { act } from 'react-dom/test-utils';
-import { inspectorPluginMock } from '../../../../../src/plugins/inspector/public/mocks';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
 import { Visualization } from '../types';
 
-jest.mock('../../../../../src/plugins/inspector/public/', () => ({
+jest.mock('@kbn/inspector-plugin/public', () => ({
   isAvailable: false,
   open: false,
 }));
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
index 9c4e04a0c5795..fe26e635542aa 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
@@ -17,22 +17,22 @@ import {
   TimefilterContract,
   TimeRange,
   FilterManager,
-} from 'src/plugins/data/public';
-import type { Start as InspectorStart } from 'src/plugins/inspector/public';
+} from '@kbn/data-plugin/public';
+import type { Start as InspectorStart } from '@kbn/inspector-plugin/public';
 
 import { Subscription } from 'rxjs';
 import { toExpression, Ast } from '@kbn/interpreter';
-import { RenderMode } from 'src/plugins/expressions';
+import { RenderMode } from '@kbn/expressions-plugin';
 import { map, distinctUntilChanged, skip } from 'rxjs/operators';
 import fastIsEqual from 'fast-deep-equal';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { METRIC_TYPE } from '@kbn/analytics';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   ExpressionRendererEvent,
   ReactExpressionRendererType,
-} from '../../../../../src/plugins/expressions/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
+} from '@kbn/expressions-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 
 import {
   Embeddable as AbstractEmbeddable,
@@ -41,10 +41,18 @@ import {
   IContainer,
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
+import type {
+  Capabilities,
+  IBasePath,
+  KibanaExecutionContext,
+  ThemeServiceStart,
+} from '@kbn/core/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { Document } from '../persistence';
 import { ExpressionWrapper, ExpressionWrapperProps } from './expression_wrapper';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import {
   isLensBrushEvent,
   isLensFilterEvent,
@@ -59,19 +67,11 @@ import {
   Datasource,
 } from '../types';
 
-import type { DataViewsContract, DataView } from '../../../../../src/plugins/data_views/public';
 import { getEditPath, DOC_TYPE, PLUGIN_ID } from '../../common';
-import type {
-  Capabilities,
-  IBasePath,
-  KibanaExecutionContext,
-  ThemeServiceStart,
-} from '../../../../../src/core/public';
 import { LensAttributeService } from '../lens_attribute_service';
 import type { ErrorMessage, TableInspectorAdapter } from '../editor_frame_service/types';
 import { getLensInspectorService, LensInspector } from '../lens_inspector_service';
 import { SharingSavedObjectProps } from '../types';
-import type { SpacesPluginStart } from '../../../spaces/public';
 import { getActiveDatasourceIdFromDoc, getIndexPatternsObjects, inferTimeField } from '../utils';
 import { getLayerMetaInfo, combineQueryAndFilters } from '../app_plugin/show_underlying_data';
 
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx b/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
index 802e1f2b38213..6797ca674a06b 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable_component.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { FC, useEffect } from 'react';
-import type { CoreStart, ThemeServiceStart } from 'kibana/public';
-import type { Action, UiActionsStart } from 'src/plugins/ui_actions/public';
-import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
+import type { CoreStart, ThemeServiceStart } from '@kbn/core/public';
+import type { Action, UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
 import { EuiLoadingChart } from '@elastic/eui';
 import {
   EmbeddableFactory,
@@ -19,7 +19,7 @@ import {
   EmbeddableStart,
   IEmbeddable,
   useEmbeddableFactory,
-} from '../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import type { LensByReferenceInput, LensByValueInput } from './embeddable';
 import type { Document } from '../persistence';
 import type { IndexPatternPersistedState } from '../indexpattern_datasource/types';
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts b/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts
index 77a4acfa7d433..1e3f6836f1a7b 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts
+++ b/x-pack/plugins/lens/public/embeddable/embeddable_factory.ts
@@ -5,27 +5,24 @@
  * 2.0.
  */
 
-import type { Capabilities, HttpSetup, ThemeServiceStart } from 'kibana/public';
+import type { Capabilities, HttpSetup, ThemeServiceStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { Ast } from '@kbn/interpreter';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { FilterManager, TimefilterContract } from '../../../../../src/plugins/data/public';
-import type { DataViewsContract } from '../../../../../src/plugins/data_views/public';
-import { ReactExpressionRendererType } from '../../../../../src/plugins/expressions/public';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../src/plugins/embeddable/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { FilterManager, TimefilterContract } from '@kbn/data-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { ReactExpressionRendererType } from '@kbn/expressions-plugin/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { LensByReferenceInput, LensEmbeddableInput } from './embeddable';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
 import { Document } from '../persistence/saved_object_store';
 import { LensAttributeService } from '../lens_attribute_service';
 import { DOC_TYPE } from '../../common/constants';
 import { ErrorMessage } from '../editor_frame_service/types';
 import { extract, inject } from '../../common/embeddable_factory';
-import type { SpacesPluginStart } from '../../../spaces/public';
 import { DatasourceMap, VisualizationMap } from '../types';
 
 export interface LensEmbeddableStartServices {
diff --git a/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx b/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx
index b93f2a3280ebc..c2b9d1d2dbb31 100644
--- a/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx
+++ b/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx
@@ -13,10 +13,10 @@ import {
   ExpressionRendererEvent,
   ReactExpressionRendererType,
   ReactExpressionRendererProps,
-} from 'src/plugins/expressions/public';
-import type { KibanaExecutionContext } from 'src/core/public';
-import { ExecutionContextSearch } from 'src/plugins/data/public';
-import { DefaultInspectorAdapters, RenderMode } from 'src/plugins/expressions';
+} from '@kbn/expressions-plugin/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { ExecutionContextSearch } from '@kbn/data-plugin/public';
+import { DefaultInspectorAdapters, RenderMode } from '@kbn/expressions-plugin';
 import classNames from 'classnames';
 import { getOriginalRequestErrorMessages } from '../editor_frame_service/error_helper';
 import { ErrorMessage } from '../editor_frame_service/types';
diff --git a/x-pack/plugins/lens/public/expressions.ts b/x-pack/plugins/lens/public/expressions.ts
index 40fee07f5d95a..ba8c07078a208 100644
--- a/x-pack/plugins/lens/public/expressions.ts
+++ b/x-pack/plugins/lens/public/expressions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ExpressionsSetup } from 'src/plugins/expressions/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
 import { getDatatable } from '../common/expressions/datatable/datatable';
 import { datatableColumn } from '../common/expressions/datatable/datatable_column';
 import { mergeTables } from '../common/expressions/merge_tables';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/constants.ts b/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
index 449261dbc69fe..270d45ce3cec5 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HeatmapIcon } from '../../../../../src/plugins/chart_expressions/expression_heatmap/public';
+import { HeatmapIcon } from '@kbn/expression-heatmap-plugin/public';
 
 export const LENS_HEATMAP_RENDERER = 'lens_heatmap_renderer';
 
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx b/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx
index 489f181d72761..ae7f01a7cebd3 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/dimension_editor.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { CustomizablePalette, FIXED_PROGRESSION, PaletteRegistry } from '@kbn/coloring';
 import type { VisualizationDimensionEditorProps } from '../types';
-import { PalettePanelContainer } from '../shared_components/';
+import { PalettePanelContainer } from '../shared_components';
 import './dimension_editor.scss';
 import type { HeatmapVisualizationState } from './types';
 import { getSafePaletteParams } from './utils';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/index.ts b/x-pack/plugins/lens/public/heatmap_visualization/index.ts
index fbf8f5e0510ac..e6bebd087c5b3 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/index.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 
 export interface HeatmapVisualizationPluginSetupPlugins {
   editorFrame: EditorFrameSetup;
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
index ae8f9c32d4358..cb6e6e030eaac 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
@@ -50,9 +50,9 @@ export const HeatmapToolbar = memo(
       frame.datasourceLayers
     ).truncateText;
     return (
-      <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
-        <EuiFlexItem>
-          <EuiFlexGroup gutterSize="none" responsive={false}>
+      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
             <ToolbarPopover
               title={i18n.translate('xpack.lens.shared.curveLabel', {
                 defaultMessage: 'Visual options',
@@ -71,6 +71,7 @@ export const HeatmapToolbar = memo(
                 }}
               />
             </ToolbarPopover>
+
             <LegendSettingsPopover
               groupPosition={'right'}
               legendOptions={legendOptions}
@@ -124,8 +125,9 @@ export const HeatmapToolbar = memo(
             />
           </EuiFlexGroup>
         </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFlexGroup gutterSize="none" responsive={false}>
+
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
             <TooltipWrapper
               tooltipContent={i18n.translate('xpack.lens.heatmap.verticalAxisDisabledHelpText', {
                 defaultMessage: 'This setting only applies when vertical axis is enabled.',
@@ -161,6 +163,7 @@ export const HeatmapToolbar = memo(
                 />
               </ToolbarPopover>
             </TooltipWrapper>
+
             <TooltipWrapper
               tooltipContent={i18n.translate('xpack.lens.heatmap.horizontalAxisDisabledHelpText', {
                 defaultMessage: 'This setting only applies when horizontal axis is enabled.',
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/types.ts b/x-pack/plugins/lens/public/heatmap_visualization/types.ts
index 68ef18939e0e6..1b92dca12ac25 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/types.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
-import type { HeatmapArguments } from '../../../../../src/plugins/chart_expressions/expression_heatmap/common';
+import type { HeatmapArguments } from '@kbn/expression-heatmap-plugin/common';
 import type { LayerType } from '../../common';
 export type ChartShapes = 'heatmap';
 
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/utils.ts b/x-pack/plugins/lens/public/heatmap_visualization/utils.ts
index e94fcac18e7af..92030fd7b1369 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/utils.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PaletteRegistry } from '@kbn/coloring';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { applyPaletteParams, findMinMaxByColumnId } from '../shared_components';
 import { DEFAULT_PALETTE_NAME } from './constants';
 import type { HeatmapVisualizationState, Palette } from './types';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
index f181167cd8d9c..afec1743d47f5 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
@@ -20,10 +20,10 @@ import {
 } from './constants';
 import { Position } from '@elastic/charts';
 import type { HeatmapVisualizationState } from './types';
-import type { DatasourcePublicAPI, OperationDescriptor } from '../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import type { DatasourceLayers, OperationDescriptor } from '../types';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { layerTypes } from '../../common';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 function exampleState(): HeatmapVisualizationState {
   return {
@@ -355,7 +355,7 @@ describe('heatmap', () => {
   });
 
   describe('#toExpression', () => {
-    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+    let datasourceLayers: DatasourceLayers;
 
     beforeEach(() => {
       const mockDatasource = createMockDatasource('testDatasource');
@@ -476,7 +476,7 @@ describe('heatmap', () => {
   });
 
   describe('#toPreviewExpression', () => {
-    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+    let datasourceLayers: DatasourceLayers;
 
     beforeEach(() => {
       const mockDatasource = createMockDatasource('testDatasource');
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
index 08256c75db22c..23b484f4cfd13 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
@@ -12,9 +12,9 @@ import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { Ast } from '@kbn/interpreter';
 import { Position } from '@elastic/charts';
 import { CUSTOM_PALETTE, PaletteRegistry, CustomPaletteParams } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { HeatmapIcon } from '../../../../../src/plugins/chart_expressions/expression_heatmap/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { HeatmapIcon } from '@kbn/expression-heatmap-plugin/public';
 import type { OperationMetadata, Visualization } from '../types';
 import type { HeatmapVisualizationState } from './types';
 import { getSuggestions } from './suggestions';
diff --git a/x-pack/plugins/lens/public/help_menu_util.tsx b/x-pack/plugins/lens/public/help_menu_util.tsx
index 38b81b514defc..82f5247fcc6d3 100644
--- a/x-pack/plugins/lens/public/help_menu_util.tsx
+++ b/x-pack/plugins/lens/public/help_menu_util.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeStart, DocLinksStart } from 'kibana/public';
+import { ChromeStart, DocLinksStart } from '@kbn/core/public';
 
 export function addHelpMenuToAppChrome(chrome: ChromeStart, docLinks: DocLinksStart) {
   chrome.setHelpExtension({
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
index 4cdbe464bd302..942df72957fc7 100644
--- a/x-pack/plugins/lens/public/index.ts
+++ b/x-pack/plugins/lens/public/index.ts
@@ -103,7 +103,7 @@ export type {
   LabelsOrientationConfigResult,
   ReferenceLineLayerConfigResult,
   AxisTitlesVisibilityConfigResult,
-} from '../../../../src/plugins/chart_expressions/expression_xy/common';
+} from '@kbn/expression-xy-plugin/common';
 export type { LensEmbeddableInput } from './embeddable';
 export { layerTypes } from '../common';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
index d5fabb9d7ef80..1baad07b2198c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { EuiPopover, EuiPopoverTitle, EuiSelectable, EuiSelectableProps } from '@elastic/eui';
+import { ToolbarButton, ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { IndexPatternRef } from './types';
 import { trackUiEvent } from '../lens_ui_telemetry';
-import { ToolbarButton, ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
 
 export type ChangeIndexPatternTriggerProps = ToolbarButtonProps & {
   label: string;
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 93000db126e65..512ef627c9116 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
@@ -9,24 +9,24 @@ import React from 'react';
 import { waitFor } from '@testing-library/react';
 import ReactDOM from 'react-dom';
 import { createMockedDragDropContext } from './mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../src/plugins/data_views/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { InnerIndexPatternDataPanel, IndexPatternDataPanel, MemoizedDataPanel } from './datapanel';
 import { FieldList } from './field_list';
 import { FieldItem } from './field_item';
 import { NoFieldsCallout } from './no_fields_callout';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { IndexPatternPrivateState } from './types';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import { ChangeIndexPattern } from './change_indexpattern';
 import { EuiProgress, EuiLoadingSpinner } from '@elastic/eui';
 import { documentField } from './document_field';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { indexPatternFieldEditorPluginMock } from '../../../../../src/plugins/data_view_field_editor/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
 import { getFieldByNameFactory } from './pure_helpers';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 import { TermsIndexPatternColumn } from './operations';
 import { DOCUMENT_FIELD_NAME } from '../../common';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
index 4f8c492de3c17..ab437b9328e7e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
@@ -25,11 +25,16 @@ import {
 import { i18n } from '@kbn/i18n';
 import type { EsQueryConfig, Query, Filter } from '@kbn/es-query';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { CoreStart } from 'kibana/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { htmlIdGenerator } from '@elastic/eui';
 import { buildEsQuery } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { DatasourceDataPanelProps, DataType, StateSetter } from '../types';
 import { ChildDragDropProvider, DragContextState } from '../drag_drop';
 import type {
@@ -42,10 +47,6 @@ import { trackUiEvent } from '../lens_ui_telemetry';
 import { loadIndexPatterns, syncExistingFields } from './loader';
 import { fieldExists } from './pure_helpers';
 import { Loader } from '../loader';
-import { getEsQueryConfig } from '../../../../../src/plugins/data/public';
-import { IndexPatternFieldEditorStart } from '../../../../../src/plugins/data_view_field_editor/public';
-import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../../src/plugins/ui_actions/public';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
 
 export type Props = Omit<DatasourceDataPanelProps<IndexPatternPrivateState>, 'core'> & {
   data: DataPublicPluginStart;
@@ -62,7 +63,6 @@ export type Props = Omit<DatasourceDataPanelProps<IndexPatternPrivateState>, 'co
 };
 import { LensFieldIcon } from './lens_field_icon';
 import { ChangeIndexPattern } from './change_indexpattern';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import { FieldGroups, FieldList } from './field_list';
 
 function sortFields(fieldA: IndexPatternField, fieldB: IndexPatternField) {
@@ -82,6 +82,7 @@ const supportedFieldTypes = new Set([
   'document',
   'geo_point',
   'geo_shape',
+  'murmur3',
 ]);
 
 const fieldTypeNames: Record<DataType, string> = {
@@ -94,6 +95,7 @@ const fieldTypeNames: Record<DataType, string> = {
   histogram: i18n.translate('xpack.lens.datatypes.histogram', { defaultMessage: 'histogram' }),
   geo_point: i18n.translate('xpack.lens.datatypes.geoPoint', { defaultMessage: 'geo_point' }),
   geo_shape: i18n.translate('xpack.lens.datatypes.geoShape', { defaultMessage: 'geo_shape' }),
+  murmur3: i18n.translate('xpack.lens.datatypes.murmur3', { defaultMessage: 'murmur3' }),
 };
 
 // Wrapper around buildEsQuery, handling errors (e.g. because a query can't be parsed) by
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 356ad5ac9543e..f4d27a16f19f0 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
@@ -16,14 +16,19 @@ import {
   EuiSelect,
   EuiButtonIcon,
 } from '@elastic/eui';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   IndexPatternDimensionEditorComponent,
   IndexPatternDimensionEditorProps,
 } from './dimension_panel';
 import { mountWithIntl as mount, shallowWithIntl as shallow } from '@kbn/test-jest-helpers';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreSetup,
+} from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { generateId } from '../../id_generator';
 import { IndexPatternPrivateState } from '../types';
 import {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
index 84e84c3a79a9a..cdccdb65e70db 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
@@ -6,10 +6,10 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { DatasourceDimensionTriggerProps, DatasourceDimensionEditorProps } from '../../types';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
 import { GenericIndexPatternColumn } from '../indexpattern';
 import { isColumnInvalid } from '../utils';
 import { IndexPatternPrivateState } from '../types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts
index 778b589d283e1..c5da32f3a7baa 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable/droppable.test.ts
@@ -5,12 +5,17 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { IndexPatternDimensionEditorProps } from '../dimension_panel';
 import { onDrop } from './on_drop_handler';
 import { getDropProps } from './get_drop_props';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreSetup,
+} from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { IndexPatternLayer, IndexPatternPrivateState } from '../../types';
 import { documentField } from '../../document_field';
 import { OperationMetadata, DropType } from '../../../types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx
index ffa2dd7b7d2f1..d026df5fff4f2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/filtering.tsx
@@ -18,7 +18,7 @@ import {
   EuiPopoverProps,
   EuiIconTip,
 } from '@elastic/eui';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import { GenericIndexPatternColumn, operationDefinitionMap } from '../operations';
 import { validateQuery } from '../operations/definitions/filters';
 import { QueryInput } from '../query_input';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
index 5131a1224341e..1cfea4b6c32e0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.test.tsx
@@ -10,9 +10,9 @@ import { ReactWrapper, ShallowWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiComboBox } from '@elastic/eui';
 import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { OperationMetadata } from '../../types';
 import { createMockedIndexPattern, createMockedIndexPatternWithoutType } from '../mocks';
 import { ReferenceEditor, ReferenceEditorProps } from './reference_editor';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx
index a59229ad093b6..4e373859d6258 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/reference_editor.tsx
@@ -15,9 +15,9 @@ import {
   EuiComboBox,
   EuiComboBoxOptionOption,
 } from '@elastic/eui';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { DateRange } from '../../../common';
 import type { OperationSupportMatrix } from './operation_support';
 import type { OperationType } from '../indexpattern';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
index b7563f28aac5c..5199227fe83f5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
@@ -10,8 +10,8 @@ import { EuiFormRow, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useRef, useState } from 'react';
-import { Query } from 'src/plugins/data/public';
-import { parseTimeShift } from '../../../../../../src/plugins/data/common';
+import { Query } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import {
   adjustTimeScaleLabelSuffix,
   GenericIndexPatternColumn,
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 c20f1c37c6c67..625eed9cf5604 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
@@ -10,14 +10,14 @@ import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiLoadingSpinner, EuiPopover } from '@elastic/eui';
 import { InnerFieldItem, FieldItemProps } from './field_item';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { IndexPattern } from './types';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { documentField } from './document_field';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
-import { FieldFormatsStart } from '../../../../../src/plugins/field_formats/public';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DOCUMENT_FIELD_NAME } from '../../common';
 
 const chartsThemeService = chartPluginMock.createSetupContract().theme;
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 82b4a0aa33409..318441daa045d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx
@@ -37,23 +37,18 @@ import {
 } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import { FieldButton } from '@kbn/react-field';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { EuiHighlight } from '@elastic/eui';
 import { Filter, buildEsQuery } from '@kbn/es-query';
-import {
-  Query,
-  KBN_FIELD_TYPES,
-  ES_FIELD_TYPES,
-  getEsQueryConfig,
-} from '../../../../../src/plugins/data/public';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import { Query, KBN_FIELD_TYPES, ES_FIELD_TYPES, getEsQueryConfig } from '@kbn/data-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { DragDrop, DragDropIdentifier } from '../drag_drop';
 import { DatasourceDataPanelProps, DataType } from '../types';
 import { BucketedAggregation, FieldStatsResponse } from '../../common';
 import { IndexPattern, IndexPatternField, DraggedField } from './types';
 import { LensFieldIcon } from './lens_field_icon';
 import { trackUiEvent } from '../lens_ui_telemetry';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import { VisualizeGeoFieldButton } from './visualize_geo_field_button';
 import { getVisualizeGeoFieldMessage } from '../utils';
 
@@ -472,6 +467,18 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
         </EuiText>
       </>
     );
+  } else if (field.type === 'murmur3') {
+    return (
+      <>
+        <EuiPopoverTitle>{panelHeader}</EuiPopoverTitle>
+
+        <EuiText size="s">
+          {i18n.translate('xpack.lens.indexPattern.fieldStatsMurmur3Limited', {
+            defaultMessage: `Summary information is not available for murmur3 fields.`,
+          })}
+        </EuiText>
+      </>
+    );
   } else if (field.type === 'geo_point' || field.type === 'geo_shape') {
     return (
       <>
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx
index 13d5d25bc2ea2..efaaf86217f06 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_list.tsx
@@ -9,12 +9,12 @@ import './field_list.scss';
 import { throttle } from 'lodash';
 import React, { useState, Fragment, useCallback, useMemo, useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { FieldItem } from './field_item';
 import { NoFieldsCallout } from './no_fields_callout';
 import { IndexPatternField } from './types';
 import { FieldItemSharedProps, FieldsAccordion } from './fields_accordion';
 import { DatasourceDataPanelProps } from '../types';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 const PAGINATION_SIZE = 50;
 
 export type FieldGroups = Record<
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
index b886cc5539d40..cc79941d2cdfe 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.test.tsx
@@ -7,14 +7,14 @@
 
 import React from 'react';
 import { EuiLoadingSpinner, EuiNotificationBadge } from '@elastic/eui';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { IndexPattern } from './types';
 import { FieldItem } from './field_item';
 import { FieldsAccordion, FieldsAccordionProps, FieldItemSharedProps } from './fields_accordion';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 
 describe('Fields Accordion', () => {
   let defaultProps: FieldsAccordionProps;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
index d2c5801908f6f..509106f683984 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
@@ -17,15 +17,15 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 import classNames from 'classnames';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { Filter } from '@kbn/es-query';
+import { Query } from '@kbn/data-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { IndexPatternField } from './types';
 import { FieldItem } from './field_item';
-import { Query } from '../../../../../src/plugins/data/public';
 import { DatasourceDataPanelProps } from '../types';
 import { IndexPattern } from './types';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 
 export interface FieldItemSharedProps {
   core: DatasourceDataPanelProps['core'];
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
index b95bc1be0ed58..d5ac84568ff1d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
@@ -5,22 +5,16 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import { createStartServicesGetter, Storage } from '../../../../../src/plugins/kibana_utils/public';
-import type { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
-import type { IndexPatternFieldEditorStart } from '../../../../../src/plugins/data_view_field_editor/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
+import type { CoreSetup } from '@kbn/core/public';
+import { createStartServicesGetter, Storage } from '@kbn/kibana-utils-plugin/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { FieldFormatsStart, FieldFormatsSetup } from '@kbn/field-formats-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import type {
-  FieldFormatsStart,
-  FieldFormatsSetup,
-} from '../../../../../src/plugins/field_formats/public';
 
 export type { PersistedIndexPatternLayer, IndexPattern, FormulaPublicApi } from './types';
 
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 8dc3125dea57d..57ebd7c6e963b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -6,15 +6,15 @@
  */
 
 import React from 'react';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { getIndexPatternDatasource, GenericIndexPatternColumn } from './indexpattern';
 import { DatasourcePublicAPI, Datasource, FramePublicAPI, OperationDescriptor } from '../types';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { IndexPatternPersistedState, IndexPatternPrivateState } from './types';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../src/plugins/data_views/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { Ast } from '@kbn/interpreter';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { getFieldByNameFactory } from './pure_helpers';
 import {
   operationDefinitionMap,
@@ -28,11 +28,11 @@ import {
   FiltersIndexPatternColumn,
 } from './operations';
 import { createMockedFullReference } from './operations/mocks';
-import { indexPatternFieldEditorPluginMock } from 'src/plugins/data_view_field_editor/public/mocks';
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { TinymathAST } from '@kbn/tinymath';
-import { SavedObjectReference } from 'kibana/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { cloneDeep } from 'lodash';
 
 jest.mock('./loader');
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
index 1911fe764a086..b5fc2d012c2ec 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -8,13 +8,18 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { CoreStart, SavedObjectReference } from 'kibana/public';
+import type { CoreStart, SavedObjectReference } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { isEqual } from 'lodash';
-import type { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
-import type { IndexPatternFieldEditorStart } from '../../../../../src/plugins/data_view_field_editor/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { DataPublicPluginStart, ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import type {
   DatasourceDimensionEditorProps,
   DatasourceDimensionTriggerProps,
@@ -64,17 +69,9 @@ import {
   IndexPatternPersistedState,
   IndexPattern,
 } from './types';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
-import { DataPublicPluginStart, ES_FIELD_TYPES } from '../../../../../src/plugins/data/public';
-import { VisualizeFieldContext } from '../../../../../src/plugins/ui_actions/public';
 import { mergeLayer } from './state_helpers';
 import { Datasource, StateSetter, VisualizeEditorContext } from '../types';
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import { deleteColumn, isReferenced } from './operations';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import { GeoFieldWorkspacePanel } from '../editor_frame_service/editor_frame/workspace_panel/geo_field_workspace_panel';
 import { DraggingIdentifier } from '../drag_drop';
 import { getStateTimeShiftWarningMessages } from './time_shift_utils';
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 cca739c949d4f..2101172a1bf0c 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
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { VisualizeEditorLayersContext } from '../../../../../src/plugins/visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import { DatasourceSuggestion } from '../types';
 import { generateId } from '../id_generator';
 import type { IndexPatternPrivateState } from './types';
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 8b1c2a3b799e8..720c917dcbc53 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -7,7 +7,7 @@
 
 import { flatten, minBy, pick, mapValues, partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import type { VisualizeEditorLayersContext } from '../../../../../src/plugins/visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import { generateId } from '../id_generator';
 import type { DatasourceSuggestion, TableChangeType } from '../types';
 import { columnToOperation } from './indexpattern';
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 15391aaf95c80..2a2b2a1ecebc4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { last } from 'lodash';
 import {
   loadInitialState,
@@ -16,8 +16,8 @@ import {
   extractReferences,
   injectReferences,
 } from './loader';
-import { DataViewsContract } from '../../../../../src/plugins/data_views/public';
-import { HttpFetchError } from '../../../../../src/core/public';
+import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   IndexPatternPersistedState,
   IndexPatternPrivateState,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
index a8ad1885b3350..5ccfc1ebefc15 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
@@ -6,8 +6,11 @@
  */
 
 import { uniq, mapValues, difference } from 'lodash';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import type { HttpSetup, SavedObjectReference } from 'kibana/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { HttpSetup, SavedObjectReference } from '@kbn/core/public';
+import type { DataViewsContract, DataView } from '@kbn/data-views-plugin/public';
+import { isNestedField } from '@kbn/data-views-plugin/common';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import type {
   DatasourceDataPanelProps,
   InitializationOptions,
@@ -25,9 +28,6 @@ import {
 import { updateLayerIndexPattern, translateToOperationName } from './operations';
 import { DateRange, ExistingFields } from '../../common/types';
 import { BASE_API_URL } from '../../common';
-import type { DataViewsContract, DataView } from '../../../../../src/plugins/data_views/public';
-import { isNestedField } from '../../../../../src/plugins/data_views/common';
-import { VisualizeFieldContext } from '../../../../../src/plugins/ui_actions/public';
 import { documentField } from './document_field';
 import { readFromStorage, writeToStorage } from '../settings_storage';
 import { getFieldByNameFactory } from './pure_helpers';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts
index 5277e09189b0d..178a98074ad8a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/overall_metric.test.ts
@@ -12,7 +12,7 @@ import {
   overallMaxOperation,
   overallMinOperation,
   overallSumOperation,
-} from '../index';
+} from '..';
 
 describe('overall_metric', () => {
   const indexPattern = createMockedIndexPattern();
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 e65d89547d567..b8f6aa433c5f7 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
@@ -9,9 +9,9 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { EuiSwitch } from '@elastic/eui';
 import { euiThemeVars } from '@kbn/ui-theme';
-import { AggFunctionsMapping } from '../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition, ParamEditorProps } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition, ParamEditorProps } from '.';
 import { FieldBasedIndexPatternColumn, ValueFormatConfig } from './column_types';
 
 import {
@@ -35,6 +35,7 @@ const supportedTypes = new Set([
   'ip_range',
   'date',
   'date_range',
+  'murmur3',
 ]);
 
 const SCALE = 'ratio';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
index 029f2b7bed7de..21ba19d5fb047 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import type { Operation } from '../../../types';
 import type { TimeScaleUnit } from '../../../../common/expressions';
-import type { OperationType } from '../definitions';
+import type { OperationType } from '.';
 
 export interface BaseIndexPatternColumn extends Operation {
   // Private
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 0643e6b2ca365..437ee4bf8b22d 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
@@ -9,9 +9,9 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { EuiSwitch } from '@elastic/eui';
-import { AggFunctionsMapping } from '../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition, ParamEditorProps } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition, ParamEditorProps } from '.';
 import { FieldBasedIndexPatternColumn, ValueFormatConfig } from './column_types';
 import { IndexPatternField } from '../../types';
 import {
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 886ea04048a58..cc1303a2a4f62 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
@@ -7,16 +7,13 @@
 
 import React from 'react';
 import type { DateHistogramIndexPatternColumn } from './date_histogram';
-import { dateHistogramOperation } from './index';
+import { dateHistogramOperation } from '.';
 import { shallow } from 'enzyme';
 import { EuiSwitch } from '@elastic/eui';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
-import {
-  dataPluginMock,
-  getCalculateAutoTimeExpression,
-} from '../../../../../../../src/plugins/data/public/mocks';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { dataPluginMock, getCalculateAutoTimeExpression } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
 import type { IndexPatternLayer, IndexPattern } from '../../types';
 import { getFieldByNameFactory } from '../../pure_helpers';
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 f5bc98cb00900..f96e584326340 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
@@ -23,18 +23,18 @@ import {
   EuiSwitchEvent,
   EuiTextColor,
 } from '@elastic/eui';
-import { updateColumnParam } from '../layer_helpers';
-import { OperationDefinition, ParamEditorProps } from './index';
-import { FieldBasedIndexPatternColumn } from './column_types';
 import {
   AggFunctionsMapping,
   DataPublicPluginStart,
   IndexPatternAggRestrictions,
   search,
   UI_SETTINGS,
-} from '../../../../../../../src/plugins/data/public';
-import { extendedBoundsToAst } from '../../../../../../../src/plugins/data/common';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
+} from '@kbn/data-plugin/public';
+import { extendedBoundsToAst } from '@kbn/data-plugin/common';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { updateColumnParam } from '../layer_helpers';
+import { OperationDefinition, ParamEditorProps } from '.';
+import { FieldBasedIndexPatternColumn } from './column_types';
 import { getInvalidFieldMessage, getSafeName } from './helpers';
 import { HelpPopover, HelpPopoverButton } from '../../help_popover';
 import { IndexPatternLayer } from '../../types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
index 109a3a4c80249..0fc67aca36747 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
@@ -13,14 +13,14 @@ import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
 import { LabelInput } from '../shared_components';
 import { QueryInput } from '../../../query_input';
-import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 
 jest.mock('.', () => ({
   isQueryValid: () => true,
   defaultLabel: 'label',
 }));
 
-jest.mock('../../../../../../../../src/plugins/unified_search/public', () => ({
+jest.mock('@kbn/unified-search-plugin/public', () => ({
   QueryStringInput: () => {
     return 'QueryStringInput';
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
index b0e0c6c1dfa41..46d69a550adfa 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
@@ -9,9 +9,9 @@ import './filter_popover.scss';
 
 import React from 'react';
 import { EuiPopover, EuiSpacer } from '@elastic/eui';
+import { Query } from '@kbn/data-plugin/public';
 import { FilterValue, defaultLabel, isQueryValid } from '.';
 import { IndexPattern } from '../../../types';
-import { Query } from '../../../../../../../../src/plugins/data/public';
 import { LabelInput } from '../shared_components';
 import { QueryInput } from '../../../query_input';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
index 7be85ddc997f2..0e35a7e96cd7d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
+import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import type { FiltersIndexPatternColumn } from '.';
-import { filtersOperation } from '../index';
+import { filtersOperation } from '..';
 import type { IndexPatternLayer } from '../../../types';
 import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
@@ -288,7 +288,7 @@ describe('filters', () => {
   describe('popover param editor', () => {
     // @ts-expect-error
     window['__react-beautiful-dnd-disable-dev-warnings'] = true; // issue with enzyme & react-beautiful-dnd throwing errors: https://github.com/atlassian/react-beautiful-dnd/issues/1593
-    jest.mock('../../../../../../../../src/plugins/unified_search/public', () => ({
+    jest.mock('@kbn/unified-search-plugin/public', () => ({
       QueryStringInput: () => {
         return 'QueryStringInput';
       },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
index 8df49e03da4d0..8b5f8e0c3dcc7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
@@ -11,14 +11,14 @@ import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@k
 import { omit } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiLink, htmlIdGenerator } from '@elastic/eui';
+import type { AggFunctionsMapping, Query } from '@kbn/data-plugin/public';
+import { queryFilterToAst } from '@kbn/data-plugin/common';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { updateColumnParam } from '../../layer_helpers';
-import type { OperationDefinition } from '../index';
+import type { OperationDefinition } from '..';
 import type { BaseIndexPatternColumn } from '../column_types';
 import { FilterPopover } from './filter_popover';
 import type { IndexPattern } from '../../../types';
-import type { AggFunctionsMapping, Query } from '../../../../../../../../src/plugins/data/public';
-import { queryFilterToAst } from '../../../../../../../../src/plugins/data/common';
-import { buildExpressionFunction } from '../../../../../../../../src/plugins/expressions/public';
 import { NewBucketButton, DragDropBuckets, DraggableBucketContainer } from '../shared_components';
 
 const generateId = htmlIdGenerator();
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
index 62a681ac3d604..fe579e2e5a5f5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_editor.tsx
@@ -22,10 +22,10 @@ import {
 import useUnmount from 'react-use/lib/useUnmount';
 import { monaco } from '@kbn/monaco';
 import classNames from 'classnames';
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
-import type { CodeEditorProps } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
+import type { CodeEditorProps } from '@kbn/kibana-react-plugin/public';
 import { TooltipWrapper, useDebounceWithOptions } from '../../../../../shared_components';
-import { ParamEditorProps } from '../../index';
+import { ParamEditorProps } from '../..';
 import { getManagedColumnsFrom } from '../../../layer_helpers';
 import { ErrorWrapper, runASTValidation, tryToParse } from '../validation';
 import {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
index 203774c6b1561..3059318bd562d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/formula_help.tsx
@@ -20,7 +20,7 @@ import {
   EuiHighlight,
   EuiSpacer,
 } from '@elastic/eui';
-import { Markdown } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { Markdown } from '@kbn/kibana-react-plugin/public';
 import { IndexPattern } from '../../../../types';
 import { tinymathFunctions } from '../util';
 import { getPossibleFunctions } from './math_completion';
@@ -31,7 +31,7 @@ import type {
   GenericIndexPatternColumn,
   OperationDefinition,
   ParamEditorProps,
-} from '../../index';
+} from '../..';
 import type { FormulaIndexPatternColumn } from '../formula';
 
 function FormulaHelp({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
index 612ae892146fc..92014b340e412 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.test.ts
@@ -8,10 +8,10 @@
 import { parse } from '@kbn/tinymath';
 import { monaco } from '@kbn/monaco';
 import { createMockedIndexPattern } from '../../../../mocks';
-import { GenericOperationDefinition } from '../../index';
+import { GenericOperationDefinition } from '../..';
 import type { IndexPatternField } from '../../../../types';
 import type { OperationMetadata } from '../../../../../types';
-import { dataPluginMock } from '../../../../../../../../../src/plugins/data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { tinymathFunctions } from '../util';
 import {
   getSignatureHelp,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
index ece41a95130bf..33dc7a343be4d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/editor/math_completion.ts
@@ -16,10 +16,8 @@ import {
   TinymathVariable,
   TinymathNamedArgument,
 } from '@kbn/tinymath';
-import type {
-  DataPublicPluginStart,
-  QuerySuggestion,
-} from '../../../../../../../../../src/plugins/data/public';
+import type { DataPublicPluginStart, QuerySuggestion } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import { IndexPattern } from '../../../../types';
 import { memoizedGetAvailableOperationsByMetadata } from '../../../operations';
 import { tinymathFunctions, groupArgsByType, unquotedStringRegex } from '../util';
@@ -27,7 +25,6 @@ import type { GenericOperationDefinition } from '../..';
 import { getFunctionSignatureLabel, getHelpTextContent } from './formula_help';
 import { hasFunctionFieldArgument } from '../validation';
 import { timeShiftOptions, timeShiftOptionOrder } from '../../../../time_shift_utils';
-import { parseTimeShift } from '../../../../../../../../../src/plugins/data/common';
 
 export enum SUGGESTION_TYPE {
   FIELD = 'field',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
index 51e7d363ac39d..f4b17bded5f07 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { createMockedIndexPattern } from '../../../mocks';
-import { formulaOperation, GenericOperationDefinition, GenericIndexPatternColumn } from '../index';
+import { formulaOperation, GenericOperationDefinition, GenericIndexPatternColumn } from '..';
 import { FormulaIndexPatternColumn } from './formula';
 import { insertOrReplaceFormulaColumn } from './parse';
 import type { IndexPattern, IndexPatternField, IndexPatternLayer } from '../../../types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
index 1f0fbceff3d5b..1d08873a160e9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { BaseIndexPatternColumn, OperationDefinition } from '../index';
+import type { BaseIndexPatternColumn, OperationDefinition } from '..';
 import type { ReferenceBasedIndexPatternColumn } from '../column_types';
 import type { IndexPattern } from '../../../types';
 import { runASTValidation, tryToParse } from './validation';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts
index 640915ed96ed7..d1ee2023e1d1c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.test.ts
@@ -9,7 +9,7 @@ import { convertDataViewIntoLensIndexPattern } from '../../../loader';
 import { insertOrReplaceFormulaColumn } from './parse';
 import { createFormulaPublicApi, FormulaPublicApi } from './formula_public_api';
 
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DateHistogramIndexPatternColumn, PersistedIndexPatternLayer } from '../../../types';
 
 jest.mock('./parse', () => ({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts
index 63255ad2bf9dc..8069bf66053d0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula_public_api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import type { IndexPattern, PersistedIndexPatternLayer } from '../../../types';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
 
 import { insertOrReplaceFormulaColumn } from './parse';
 import { convertDataViewIntoLensIndexPattern } from '../../../loader';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
index a36f24ef7d048..42f211cad2eb5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/generate.ts
@@ -10,7 +10,7 @@ import {
   FieldBasedIndexPatternColumn,
   GenericOperationDefinition,
   GenericIndexPatternColumn,
-} from '../index';
+} from '..';
 import { BaseIndexPatternColumn, ReferenceBasedIndexPatternColumn } from '../column_types';
 import { IndexPatternLayer } from '../../../types';
 import { unquotedStringRegex } from './util';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx
index 4797ac348c71f..10e319404c9bb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/math.tsx
@@ -6,7 +6,7 @@
  */
 
 import type { TinymathAST } from '@kbn/tinymath';
-import { OperationDefinition } from '../index';
+import { OperationDefinition } from '..';
 import { ValueFormatConfig, ReferenceBasedIndexPatternColumn } from '../column_types';
 import { IndexPattern } from '../../../types';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
index 81a6943e600d0..371c7e268388b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
@@ -13,7 +13,7 @@ import {
   GenericOperationDefinition,
   GenericIndexPatternColumn,
   operationDefinitionMap,
-} from '../index';
+} from '..';
 import type { IndexPattern, IndexPatternLayer } from '../../../types';
 import { mathOperation } from './math';
 import { documentField } from '../../../document_field';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
index 9e313d43972d6..75d72190cab3d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/util.ts
@@ -13,12 +13,12 @@ import type {
   TinymathNamedArgument,
   TinymathVariable,
 } from '@kbn/tinymath';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import type {
   OperationDefinition,
   GenericIndexPatternColumn,
   GenericOperationDefinition,
-} from '../index';
+} from '..';
 import type { GroupedNodes } from './types';
 
 export const unquotedStringRegex = /[^0-9A-Za-z._@\[\]/]/;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
index c7743619b43bb..742072ffe5c73 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/validation.ts
@@ -10,7 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { parse, TinymathLocation, TinymathVariable } from '@kbn/tinymath';
 import type { TinymathAST, TinymathFunction, TinymathNamedArgument } from '@kbn/tinymath';
 import { luceneStringToDsl, toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import {
   findMathNodes,
   findVariables,
@@ -25,10 +26,9 @@ import type {
   OperationDefinition,
   GenericIndexPatternColumn,
   GenericOperationDefinition,
-} from '../index';
+} from '..';
 import type { IndexPattern, IndexPatternLayer } from '../../../types';
 import type { TinymathNodeTypes } from './types';
-import { parseTimeShift } from '../../../../../../../../src/plugins/data/common';
 
 interface ValidationErrors {
   missingField: { message: string; type: { variablesLength: number; variablesList: string } };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
index 5e7a79dc3a127..9ac5d683b74ad 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
@@ -5,8 +5,15 @@
  * 2.0.
  */
 
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreStart } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreStart,
+} from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { ExpressionAstFunction } from '@kbn/expressions-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { termsOperation } from './terms';
 import { filtersOperation } from './filters';
 import { cardinalityOperation } from './cardinality';
@@ -43,8 +50,6 @@ import type {
 } from './column_types';
 import { IndexPattern, IndexPatternField, IndexPatternLayer } from '../../types';
 import { DateRange, LayerType } from '../../../../common';
-import { ExpressionAstFunction } from '../../../../../../../src/plugins/expressions/public';
-import { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
 import { rangeOperation } from './ranges';
 import { IndexPatternDimensionEditorProps, OperationSupportMatrix } from '../../dimension_panel';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx
index 8e5773ad6868e..556c91d3fa46d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.test.tsx
@@ -8,12 +8,12 @@
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { EuiComboBox, EuiFormRow } from '@elastic/eui';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
 import { LastValueIndexPatternColumn } from './last_value';
-import { lastValueOperation } from './index';
+import { lastValueOperation } from '.';
 import type { IndexPattern, IndexPatternLayer } from '../../types';
 import { TermsIndexPatternColumn } from './terms';
 import { EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx
index b8fe5a1584d35..40b4d53154ba7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx
@@ -15,9 +15,9 @@ import {
   EuiSwitch,
   EuiToolTip,
 } from '@elastic/eui';
-import { AggFunctionsMapping } from '../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition } from '.';
 import { FieldBasedIndexPatternColumn, ValueFormatConfig } from './column_types';
 import { IndexPatternField, IndexPattern } from '../../types';
 import { adjustColumnReferencesForChangedColumn, updateColumnParam } from '../layer_helpers';
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 438902962fbcf..55df2b8e0ff1a 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
@@ -9,8 +9,8 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { EuiSwitch } from '@elastic/eui';
 import { euiThemeVars } from '@kbn/ui-theme';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition, ParamEditorProps } from './index';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition, ParamEditorProps } from '.';
 import {
   getFormatFromPreviousColumn,
   getInvalidFieldMessage,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx
index f5e21c5d8aeeb..a900e4cc29ae7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.test.tsx
@@ -7,11 +7,11 @@
 
 import React, { ChangeEvent } from 'react';
 import { shallow, mount } from 'enzyme';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
-import { percentileOperation } from './index';
+import { percentileOperation } from '.';
 import { IndexPattern, IndexPatternLayer } from '../../types';
 import { PercentileIndexPatternColumn } from './percentile';
 import { EuiRange } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx
index 73536ae4893a6..0699ad5f88405 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx
@@ -8,9 +8,9 @@
 import { EuiFormRow, EuiRange, EuiRangeProps } from '@elastic/eui';
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
-import { AggFunctionsMapping } from 'src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
-import { OperationDefinition } from './index';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { OperationDefinition } from '.';
 import {
   getFormatFromPreviousColumn,
   getInvalidFieldMessage,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
index 7591a5d545c3c..f0611f5ec194e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/advanced_editor.tsx
@@ -22,8 +22,8 @@ import {
   htmlIdGenerator,
   keys,
 } from '@elastic/eui';
+import { IFieldFormat } from '@kbn/field-formats-plugin/common';
 import { useDebounceWithOptions } from '../../../../shared_components';
-import { IFieldFormat } from '../../../../../../../../src/plugins/field_formats/common';
 import { RangeTypeLens, isValidRange } from './ranges';
 import { FROM_PLACEHOLDER, TO_PLACEHOLDER, TYPING_DEBOUNCE_TIME } from './constants';
 import {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx
index 2f0802a4827f0..e7cf46e1e3e81 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/range_editor.tsx
@@ -20,8 +20,8 @@ import {
   EuiSwitch,
   EuiSpacer,
 } from '@elastic/eui';
-import type { IFieldFormat } from 'src/plugins/field_formats/common';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { RangeColumnParams, UpdateParamsFnType, MODES_TYPES } from './ranges';
 import { AdvancedRangeEditor } from './advanced_editor';
 import { TYPING_DEBOUNCE_TIME, MODES, MIN_HISTOGRAM_BARS } from './constants';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
index 77d849ac7af17..534fcdbaf2d02 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
@@ -9,11 +9,11 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiFieldNumber, EuiRange, EuiButtonEmpty, EuiLink, EuiText } from '@elastic/eui';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { IndexPatternLayer, IndexPattern } from '../../../types';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { rangeOperation } from '../index';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { rangeOperation } from '..';
 import { RangeIndexPatternColumn } from './ranges';
 import {
   MODES,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
index 36505120d75df..11754e1f90005 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
@@ -8,17 +8,11 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { AggFunctionsMapping, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
-import {
-  extendedBoundsToAst,
-  numericalRangeToAst,
-} from '../../../../../../../../src/plugins/data/common';
-import {
-  buildExpressionFunction,
-  Range,
-} from '../../../../../../../../src/plugins/expressions/public';
+import { AggFunctionsMapping, UI_SETTINGS } from '@kbn/data-plugin/public';
+import { extendedBoundsToAst, numericalRangeToAst } from '@kbn/data-plugin/common';
+import { buildExpressionFunction, Range } from '@kbn/expressions-plugin/public';
 import { RangeEditor } from './range_editor';
-import { OperationDefinition } from '../index';
+import { OperationDefinition } from '..';
 import { FieldBasedIndexPatternColumn } from '../column_types';
 import { updateColumnParam } from '../../layer_helpers';
 import { supportedFormats } from '../../../../../common/expressions/format_column/supported_formats';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx
index 4339fa3e7ae51..101eca3ab1785 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/shared_components/buckets.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiIcon } from '@elastic/eui';
-import { DragDropBuckets, DraggableBucketContainer } from '../shared_components';
+import { DragDropBuckets, DraggableBucketContainer } from '.';
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx
index 6d9a39887b940..546e25308346a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.test.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../mocks';
-import { staticValueOperation } from './index';
+import { staticValueOperation } from '.';
 import { IndexPattern, IndexPatternLayer } from '../../types';
 import { StaticValueIndexPatternColumn } from './static_value';
 import { EuiFieldNumber } from '@elastic/eui';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx
index 39122808c9c0b..555360a2f7f6c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/static_value.tsx
@@ -7,7 +7,7 @@
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormLabel, EuiSpacer } from '@elastic/eui';
-import { OperationDefinition } from './index';
+import { OperationDefinition } from '.';
 import {
   ReferenceBasedIndexPatternColumn,
   GenericIndexPatternColumn,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts
index 9f907c5584802..438af2bfc7ab2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import type { FrameDatasourceAPI } from '../../../../types';
-import type { CountIndexPatternColumn } from '../index';
+import type { CountIndexPatternColumn } from '..';
 import type { TermsIndexPatternColumn } from './types';
 import type { GenericIndexPatternColumn } from '../../../indexpattern';
 import { createMockedIndexPattern } from '../../../mocks';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts
index 95fffca1212b3..3f4bd781e8ff8 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/helpers.ts
@@ -7,16 +7,16 @@
 
 import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import { buildEsQuery } from '@kbn/es-query';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/public';
-import { GenericIndexPatternColumn, operationDefinitionMap } from '../index';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { GenericIndexPatternColumn, operationDefinitionMap } from '..';
 import { defaultLabel } from '../filters';
 import { isReferenced } from '../../layer_helpers';
 
 import type { FieldStatsResponse } from '../../../../../common';
 import type { FrameDatasourceAPI } from '../../../../types';
-import type { FiltersIndexPatternColumn } from '../index';
+import type { FiltersIndexPatternColumn } from '..';
 import type { TermsIndexPatternColumn } from './types';
 import { LastValueIndexPatternColumn } from '../last_value';
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
index c881bc898e8ad..3d66c9a42abfd 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx
@@ -19,11 +19,11 @@ import {
   EuiButtonGroup,
 } from '@elastic/eui';
 import { uniq } from 'lodash';
-import { AggFunctionsMapping } from '../../../../../../../../src/plugins/data/public';
-import { buildExpressionFunction } from '../../../../../../../../src/plugins/expressions/public';
+import { AggFunctionsMapping } from '@kbn/data-plugin/public';
+import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import { insertOrReplaceColumn, updateColumnParam, updateDefaultLabels } from '../../layer_helpers';
 import type { DataType } from '../../../../types';
-import { OperationDefinition } from '../index';
+import { OperationDefinition } from '..';
 import { FieldBasedIndexPatternColumn } from '../column_types';
 import { ValuesInput } from './values_input';
 import { getInvalidFieldMessage } from '../helpers';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
index a72250c2265c4..6273d77fa2fb2 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/terms.test.tsx
@@ -14,13 +14,13 @@ import type {
   SavedObjectsClientContract,
   HttpSetup,
   CoreStart,
-} from 'kibana/public';
-import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
+} from '@kbn/core/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { createMockedIndexPattern } from '../../../mocks';
 import { ValuesInput } from './values_input';
 import type { TermsIndexPatternColumn } from '.';
-import { GenericOperationDefinition, termsOperation, LastValueIndexPatternColumn } from '../index';
+import { GenericOperationDefinition, termsOperation, LastValueIndexPatternColumn } from '..';
 import { IndexPattern, IndexPatternLayer, IndexPatternPrivateState } from '../../../types';
 import { FrameDatasourceAPI } from '../../../../types';
 import { DateHistogramIndexPatternColumn } from '../date_histogram';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
index ab9916ad05df1..02eaf87518b11 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.test.ts
@@ -19,7 +19,7 @@ import {
   isReferenced,
   getReferenceRoot,
 } from './layer_helpers';
-import { operationDefinitionMap, OperationType } from '../operations';
+import { operationDefinitionMap, OperationType } from '.';
 import { TermsIndexPatternColumn } from './definitions/terms';
 import { DateHistogramIndexPatternColumn } from './definitions/date_histogram';
 import { AvgIndexPatternColumn } from './definitions/metrics';
@@ -37,9 +37,9 @@ import {
   OperationDefinition,
 } from './definitions';
 import { TinymathAST } from '@kbn/tinymath';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
-jest.mock('../operations');
+jest.mock('.');
 jest.mock('../../id_generator');
 
 const indexPatternFields = [
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
index 29df2914214ef..d1297fc476772 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/layer_helpers.ts
@@ -6,10 +6,10 @@
  */
 
 import { partition, mapValues, pickBy, isArray } from 'lodash';
-import { CoreStart } from 'kibana/public';
-import { Query } from 'src/plugins/data/common';
+import { CoreStart } from '@kbn/core/public';
+import { Query } from '@kbn/data-plugin/common';
 import memoizeOne from 'memoize-one';
-import type { VisualizeEditorLayersContext } from '../../../../../../src/plugins/visualizations/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
 import type {
   DatasourceFixAction,
   FrameDatasourceAPI,
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 94bb7c50adad7..aff48326fb92e 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getOperationTypesForField, getAvailableOperationsByMetadata } from './index';
+import { getOperationTypesForField, getAvailableOperationsByMetadata } from '.';
 import { getFieldByNameFactory } from '../pure_helpers';
 
 jest.mock('../loader');
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
index abb0712cd04d2..850f9d096d232 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
-import { Query } from '../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { useDebouncedValue } from '../shared_components';
 
 export const QueryInput = ({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
index 90353ac087436..9c95a7f6293a4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
@@ -9,15 +9,15 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { uniq } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { Datatable } from '@kbn/expressions-plugin';
+import { search } from '@kbn/data-plugin/public';
+import { parseTimeShift } from '@kbn/data-plugin/common';
 import {
   IndexPattern,
   GenericIndexPatternColumn,
   IndexPatternLayer,
   IndexPatternPrivateState,
 } from './types';
-import { Datatable } from '../../../../../src/plugins/expressions';
-import { search } from '../../../../../src/plugins/data/public';
-import { parseTimeShift } from '../../../../../src/plugins/data/common';
 import { FramePublicAPI } from '../types';
 
 export const timeShiftOptions = [
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
index f229407ce23ff..aee1abd34e7cb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
@@ -5,21 +5,21 @@
  * 2.0.
  */
 
-import type { IUiSettingsClient } from 'kibana/public';
+import type { IUiSettingsClient } from '@kbn/core/public';
 import { partition } from 'lodash';
 import {
   AggFunctionsMapping,
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../../../../src/plugins/data/public';
-import { queryToAst } from '../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/public';
+import { queryToAst } from '@kbn/data-plugin/common';
 import {
   buildExpression,
   buildExpressionFunction,
   ExpressionAstExpression,
   ExpressionAstExpressionBuilder,
   ExpressionAstFunction,
-} from '../../../../../src/plugins/expressions/public';
+} from '@kbn/expressions-plugin/public';
 import { GenericIndexPatternColumn } from './indexpattern';
 import { operationDefinitionMap } from './operations';
 import { IndexPattern, IndexPatternPrivateState, IndexPatternLayer } from './types';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
index 5d518b4048ed0..6800a3a3ecb27 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { IncompleteColumn, GenericIndexPatternColumn } from './operations';
-import type { IndexPatternAggRestrictions } from '../../../../../src/plugins/data/public';
-import type { FieldSpec } from '../../../../../src/plugins/data/common';
+import type { IndexPatternAggRestrictions } from '@kbn/data-plugin/public';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import type { FieldFormatParams } from '@kbn/field-formats-plugin/common';
 import type { DragDropIdentifier } from '../drag_drop/providers';
-import type { FieldFormatParams } from '../../../../../src/plugins/field_formats/common';
+import type { IncompleteColumn, GenericIndexPatternColumn } from './operations';
 
 export type {
   GenericIndexPatternColumn,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx
index ede2a38605d3f..e7c7bc089895c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 import { getPrecisionErrorWarningMessages } from './utils';
 import type { IndexPatternPrivateState, GenericIndexPatternColumn } from './types';
 import type { FramePublicAPI } from '../types';
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 import { EuiButton } from '@elastic/eui';
 
 describe('indexpattern_datasource utils', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx
index 4062f2b2613fe..9effcd249b4fb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx
@@ -8,11 +8,12 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 import { EuiLink, EuiTextColor, EuiButton, EuiSpacer } from '@elastic/eui';
 
-import { DatatableColumn } from 'src/plugins/expressions';
+import { DatatableColumn } from '@kbn/expressions-plugin';
 import { groupBy, escape } from 'lodash';
+import { checkColumnForPrecisionError, Query } from '@kbn/data-plugin/common';
 import type { FramePublicAPI, StateSetter } from '../types';
 import type { IndexPattern, IndexPatternLayer, IndexPatternPrivateState } from './types';
 import type { ReferenceBasedIndexPatternColumn } from './operations/definitions/column_types';
@@ -30,7 +31,6 @@ import {
 
 import { getInvalidFieldMessage, isColumnOfType } from './operations/definitions/helpers';
 import { FiltersIndexPatternColumn, isQueryValid } from './operations/definitions/filters';
-import { checkColumnForPrecisionError, Query } from '../../../../../src/plugins/data/common';
 import { hasField } from './pure_utils';
 import { mergeLayer } from './state_helpers';
 import { supportsRarityRanking } from './operations/definitions/terms';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx
index 6a23539f2650f..81e31ab4c64a3 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/visualize_geo_field_button.tsx
@@ -12,7 +12,7 @@ import {
   visualizeGeoFieldTrigger,
   VISUALIZE_GEO_FIELD_TRIGGER,
   UiActionsStart,
-} from '../../../../../src/plugins/ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
 import { APP_ID } from '../../common/constants';
 
 interface Props {
diff --git a/x-pack/plugins/lens/public/lens_attribute_service.ts b/x-pack/plugins/lens/public/lens_attribute_service.ts
index 93e7a5886ac32..6181fbf22ab26 100644
--- a/x-pack/plugins/lens/public/lens_attribute_service.ts
+++ b/x-pack/plugins/lens/public/lens_attribute_service.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-import type { CoreStart } from '../../../../src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { AttributeService } from '@kbn/embeddable-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import type { LensPluginStartDependencies } from './plugin';
-import type { AttributeService } from '../../../../src/plugins/embeddable/public';
 import type {
   LensSavedObjectAttributes,
   LensByValueInput,
@@ -16,7 +17,6 @@ import type {
   LensByReferenceInput,
 } from './embeddable/embeddable';
 import { SavedObjectIndexStore, checkForDuplicateTitle } from './persistence';
-import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 import { DOC_TYPE } from '../common/constants';
 
 export type LensAttributeService = AttributeService<
diff --git a/x-pack/plugins/lens/public/lens_inspector_service.ts b/x-pack/plugins/lens/public/lens_inspector_service.ts
index 6cac381871d73..4de0a8ec1340f 100644
--- a/x-pack/plugins/lens/public/lens_inspector_service.ts
+++ b/x-pack/plugins/lens/public/lens_inspector_service.ts
@@ -10,9 +10,9 @@ import type {
   InspectorOptions,
   InspectorSession,
   Start as InspectorStartContract,
-} from '../../../../src/plugins/inspector/public';
+} from '@kbn/inspector-plugin/public';
 
-import { createDefaultInspectorAdapters } from '../../../../src/plugins/expressions/public';
+import { createDefaultInspectorAdapters } from '@kbn/expressions-plugin/public';
 
 export const getLensInspectorService = (inspector: InspectorStartContract) => {
   const adapters: Adapters = createDefaultInspectorAdapters();
diff --git a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts
index f332eeeea4c8e..080e2cf5d495f 100644
--- a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts
+++ b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.test.ts
@@ -12,9 +12,9 @@ import {
   trackUiEvent,
   trackSuggestionEvent,
 } from './factory';
-import { coreMock } from 'src/core/public/mocks';
-import { HttpSetup } from 'kibana/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 jest.useFakeTimers();
 
diff --git a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts
index f010c0b8114b5..bad1bad481e8b 100644
--- a/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts
+++ b/x-pack/plugins/lens/public/lens_ui_telemetry/factory.ts
@@ -6,9 +6,9 @@
  */
 
 import moment from 'moment';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { BASE_API_URL } from '../../common';
 
 const STORAGE_KEY = 'lens-ui-telemetry';
diff --git a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx
index 6165659012281..c83e83aad7b1b 100644
--- a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.test.tsx
@@ -11,8 +11,8 @@ import { FramePublicAPI, VisualizationDimensionEditorProps } from '../types';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { MetricDimensionEditor } from './dimension_editor';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { ColorMode } from 'src/plugins/charts/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { ColorMode } from '@kbn/charts-plugin/public';
 import {
   CustomizablePalette,
   PaletteOutput,
diff --git a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx
index 161418c000b4c..dfa25c4b62fc7 100644
--- a/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/dimension_editor.tsx
@@ -21,7 +21,7 @@ import {
 } from '@kbn/coloring';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useState } from 'react';
-import { ColorMode } from '../../../../../src/plugins/charts/common';
+import { ColorMode } from '@kbn/charts-plugin/common';
 import type { MetricState } from '../../common/types';
 import { isNumericFieldForDatatable } from '../../common/expressions';
 import { applyPaletteParams, PalettePanelContainer } from '../shared_components';
diff --git a/x-pack/plugins/lens/public/metric_visualization/index.ts b/x-pack/plugins/lens/public/metric_visualization/index.ts
index c96bb59151c20..8728975916a65 100644
--- a/x-pack/plugins/lens/public/metric_visualization/index.ts
+++ b/x-pack/plugins/lens/public/metric_visualization/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../types';
 
 export interface MetricVisualizationPluginSetupPlugins {
diff --git a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx
index f2b97454df9df..a400e42ac08f5 100644
--- a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/align_options.tsx
@@ -15,6 +15,8 @@ export interface TitlePositionProps {
   setState: (newState: MetricState) => void;
 }
 
+export const DEFAULT_TEXT_ALIGNMENT = 'left';
+
 const alignButtonIcons = [
   {
     id: `left`,
@@ -46,7 +48,7 @@ export const AlignOptions: React.FC<TitlePositionProps> = ({ state, setState })
         defaultMessage: 'Align',
       })}
       options={alignButtonIcons}
-      idSelected={state.textAlign ?? 'center'}
+      idSelected={state.textAlign ?? DEFAULT_TEXT_ALIGNMENT}
       onChange={(id) => {
         setState({ ...state, textAlign: id as MetricState['textAlign'] });
       }}
diff --git a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx
index 17142ab77ab35..5a4ca7f644956 100644
--- a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/size_options.tsx
@@ -15,6 +15,8 @@ export interface TitlePositionProps {
   setState: (newState: MetricState) => void;
 }
 
+export const DEFAULT_TITLE_SIZE = 'm';
+
 const titleSizes = [
   {
     id: 'xs',
@@ -55,7 +57,9 @@ const titleSizes = [
 ];
 
 export const SizeOptions: React.FC<TitlePositionProps> = ({ state, setState }) => {
-  const currSizeIndex = titleSizes.findIndex((size) => size.id === (state.size || 'xl'));
+  const currSizeIndex = titleSizes.findIndex(
+    (size) => size.id === (state.size || DEFAULT_TITLE_SIZE)
+  );
 
   const changeSize = (change: number) => {
     setState({ ...state, size: titleSizes[currSizeIndex + change].id });
@@ -86,7 +90,7 @@ export const SizeOptions: React.FC<TitlePositionProps> = ({ state, setState }) =
           inputDisplay: position.label,
         };
       })}
-      valueOfSelected={state.size ?? 'xl'}
+      valueOfSelected={state.size ?? DEFAULT_TITLE_SIZE}
       onChange={(value) => {
         setState({ ...state, size: value });
       }}
diff --git a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx
index acaa11f477226..c58854647c1e7 100644
--- a/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/metric_config_panel/title_position_option.tsx
@@ -15,9 +15,19 @@ export interface TitlePositionProps {
   setState: (newState: MetricState) => void;
 }
 
+export const DEFAULT_TITLE_POSITION = 'top';
+
 const titlePositions = [
-  { id: 'top', label: 'Top' },
-  { id: 'bottom', label: 'Bottom' },
+  {
+    id: 'top',
+    label: i18n.translate('xpack.lens.metricChart.titlePositions.top', { defaultMessage: 'Top' }),
+  },
+  {
+    id: 'bottom',
+    label: i18n.translate('xpack.lens.metricChart.titlePositions.bottom', {
+      defaultMessage: 'Bottom',
+    }),
+  },
 ];
 
 export const TitlePositionOptions: React.FC<TitlePositionProps> = ({ state, setState }) => {
@@ -38,7 +48,7 @@ export const TitlePositionOptions: React.FC<TitlePositionProps> = ({ state, setS
         data-test-subj="lnsMissingValuesSelect"
         legend="This is a basic group"
         options={titlePositions}
-        idSelected={state.titlePosition ?? 'bottom'}
+        idSelected={state.titlePosition ?? DEFAULT_TITLE_POSITION}
         onChange={(value) => {
           setState({ ...state, titlePosition: value as MetricState['titlePosition'] });
         }}
diff --git a/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx b/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx
index fa4a7343f53d6..b44e94d84e0a9 100644
--- a/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/palette_config.tsx
@@ -6,7 +6,7 @@
  */
 
 import { RequiredPaletteParamTypes } from '@kbn/coloring';
-import { defaultPaletteParams as sharedDefaultParams } from '../shared_components/';
+import { defaultPaletteParams as sharedDefaultParams } from '../shared_components';
 
 export const DEFAULT_PALETTE_NAME = 'status';
 export const DEFAULT_COLOR_STEPS = 3;
diff --git a/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts b/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts
index c7e01b0c6a137..85f14fee1b4e6 100644
--- a/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/metric_visualization/visualization.test.ts
@@ -11,9 +11,9 @@ import { layerTypes } from '../../common';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { generateId } from '../id_generator';
 import { DatasourcePublicAPI, FramePublicAPI } from '../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { ColorMode } from 'src/plugins/charts/common';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { ColorMode } from '@kbn/charts-plugin/common';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../id_generator');
 
@@ -301,13 +301,13 @@ describe('metric_visualization', () => {
                       Object {
                         "arguments": Object {
                           "align": Array [
-                            "center",
+                            "left",
                           ],
                           "lHeight": Array [
-                            127.5,
+                            82.5,
                           ],
                           "size": Array [
-                            85,
+                            55,
                           ],
                           "sizeUnit": Array [
                             "px",
@@ -329,13 +329,13 @@ describe('metric_visualization', () => {
                       Object {
                         "arguments": Object {
                           "align": Array [
-                            "center",
+                            "left",
                           ],
                           "lHeight": Array [
-                            40.5,
+                            24,
                           ],
                           "size": Array [
-                            27,
+                            16,
                           ],
                           "sizeUnit": Array [
                             "px",
@@ -349,7 +349,7 @@ describe('metric_visualization', () => {
                   },
                 ],
                 "labelPosition": Array [
-                  "bottom",
+                  "top",
                 ],
                 "metric": Array [
                   Object {
diff --git a/x-pack/plugins/lens/public/metric_visualization/visualization.tsx b/x-pack/plugins/lens/public/metric_visualization/visualization.tsx
index 87414e20f5abd..62c607f69265e 100644
--- a/x-pack/plugins/lens/public/metric_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/visualization.tsx
@@ -12,16 +12,19 @@ import { euiThemeVars } from '@kbn/ui-theme';
 import { render } from 'react-dom';
 import { Ast } from '@kbn/interpreter';
 import { PaletteOutput, PaletteRegistry, CUSTOM_PALETTE, shiftPalette } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { ColorMode, CustomPaletteState } from '../../../../../src/plugins/charts/common';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getSuggestions } from './metric_suggestions';
 import { LensIconChartMetric } from '../assets/chart_metric';
-import { Visualization, OperationMetadata, DatasourcePublicAPI } from '../types';
+import { Visualization, OperationMetadata, DatasourceLayers } from '../types';
 import type { MetricState } from '../../common/types';
 import { layerTypes } from '../../common';
 import { MetricDimensionEditor } from './dimension_editor';
 import { MetricToolbar } from './metric_config_panel';
+import { DEFAULT_TITLE_POSITION } from './metric_config_panel/title_position_option';
+import { DEFAULT_TITLE_SIZE } from './metric_config_panel/size_options';
+import { DEFAULT_TEXT_ALIGNMENT } from './metric_config_panel/align_options';
 
 interface MetricConfig extends Omit<MetricState, 'palette' | 'colorMode'> {
   title: string;
@@ -45,7 +48,7 @@ const getFontSizeAndUnit = (fontSize: string) => {
 const toExpression = (
   paletteService: PaletteRegistry,
   state: MetricState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   attributes?: Partial<Omit<MetricConfig, keyof MetricState>>
 ): Ast | null => {
   if (!state.accessor) {
@@ -82,7 +85,7 @@ const toExpression = (
     xxl: getFontSizeAndUnit(euiThemeVars.euiFontSizeXXL),
   };
 
-  const labelFont = fontSizes[state?.size || 'xl'];
+  const labelFont = fontSizes[state?.size || DEFAULT_TITLE_SIZE];
   const labelToMetricFontSizeMap: Record<string, number> = {
     xs: fontSizes.xs.size * 2,
     s: fontSizes.m.size * 2.5,
@@ -91,7 +94,7 @@ const toExpression = (
     xl: fontSizes.xxl.size * 2.5,
     xxl: fontSizes.xxl.size * 3,
   };
-  const metricFontSize = labelToMetricFontSizeMap[state?.size || 'xl'];
+  const metricFontSize = labelToMetricFontSizeMap[state?.size || DEFAULT_TITLE_SIZE];
 
   return {
     type: 'expression',
@@ -100,7 +103,7 @@ const toExpression = (
         type: 'function',
         function: 'metricVis',
         arguments: {
-          labelPosition: [state?.titlePosition || 'bottom'],
+          labelPosition: [state?.titlePosition || DEFAULT_TITLE_POSITION],
           font: [
             {
               type: 'expression',
@@ -109,7 +112,7 @@ const toExpression = (
                   type: 'function',
                   function: 'font',
                   arguments: {
-                    align: [state?.textAlign || 'center'],
+                    align: [state?.textAlign || DEFAULT_TEXT_ALIGNMENT],
                     size: [metricFontSize],
                     weight: ['600'],
                     lHeight: [metricFontSize * 1.5],
@@ -127,7 +130,7 @@ const toExpression = (
                   type: 'function',
                   function: 'font',
                   arguments: {
-                    align: [state?.textAlign || 'center'],
+                    align: [state?.textAlign || DEFAULT_TEXT_ALIGNMENT],
                     size: [labelFont.size],
                     lHeight: [labelFont.size * 1.5],
                     sizeUnit: [labelFont.sizeUnit],
diff --git a/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts b/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts
index 881b8fa887c66..157c910440fb6 100644
--- a/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts
+++ b/x-pack/plugins/lens/public/mocks/data_plugin_mock.ts
@@ -9,7 +9,7 @@ import { isEqual } from 'lodash';
 import { Observable, Subject } from 'rxjs';
 import moment from 'moment';
 import { isFilterPinned, Filter } from '@kbn/es-query';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 function createMockTimefilter() {
   const unsubscribe = jest.fn();
diff --git a/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx b/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
index 644021e8a69c2..141ec881359d8 100644
--- a/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/expression_renderer_mock.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { ReactExpressionRendererProps } from 'src/plugins/expressions/public';
+import { ReactExpressionRendererProps } from '@kbn/expressions-plugin/public';
 
 export function createExpressionRendererMock(): jest.Mock<
   React.ReactElement,
diff --git a/x-pack/plugins/lens/public/mocks/index.ts b/x-pack/plugins/lens/public/mocks/index.ts
index 4c97fea960eac..ab6f2066e8804 100644
--- a/x-pack/plugins/lens/public/mocks/index.ts
+++ b/x-pack/plugins/lens/public/mocks/index.ts
@@ -31,6 +31,7 @@ export type FrameMock = jest.Mocked<FramePublicAPI>;
 
 export const createMockFramePublicAPI = (): FrameMock => ({
   datasourceLayers: {},
+  dateRange: { fromDate: 'now-7d', toDate: 'now' },
 });
 
 export type FrameDatasourceMock = jest.Mocked<FrameDatasourceAPI>;
diff --git a/x-pack/plugins/lens/public/mocks/services_mock.tsx b/x-pack/plugins/lens/public/mocks/services_mock.tsx
index 28a05d0e58ae2..f5e94d374481a 100644
--- a/x-pack/plugins/lens/public/mocks/services_mock.tsx
+++ b/x-pack/plugins/lens/public/mocks/services_mock.tsx
@@ -7,32 +7,32 @@
 
 import React from 'react';
 import { Subject } from 'rxjs';
-import { coreMock } from 'src/core/public/mocks';
-import { navigationPluginMock } from '../../../../../src/plugins/navigation/public/mocks';
-import { LensAppServices } from '../app_plugin/types';
-import { DOC_TYPE } from '../../common';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { inspectorPluginMock } from '../../../../../src/plugins/inspector/public/mocks';
-import { spacesPluginMock } from '../../../spaces/public/mocks';
-import { dashboardPluginMock } from '../../../../../src/plugins/dashboard/public/mocks';
-import { dataViewPluginMocks } from '../../../../../src/plugins/data_views/public/mocks';
-import { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { navigationPluginMock } from '@kbn/navigation-plugin/public/mocks';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { inspectorPluginMock } from '@kbn/inspector-plugin/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
+import { dashboardPluginMock } from '@kbn/dashboard-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
+import {
+  mockAttributeService,
+  createEmbeddableStateTransferMock,
+} from '@kbn/embeddable-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import type { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+
+import { presentationUtilPluginMock } from '@kbn/presentation-util-plugin/public/mocks';
+import type { LensAttributeService } from '../lens_attribute_service';
 import type {
   LensByValueInput,
   LensByReferenceInput,
   LensSavedObjectAttributes,
   LensUnwrapMetaInfo,
 } from '../embeddable/embeddable';
-import {
-  mockAttributeService,
-  createEmbeddableStateTransferMock,
-} from '../../../../../src/plugins/embeddable/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import type { LensAttributeService } from '../lens_attribute_service';
-import type { EmbeddableStateTransfer } from '../../../../../src/plugins/embeddable/public';
-
-import { presentationUtilPluginMock } from '../../../../../src/plugins/presentation_util/public/mocks';
+import { DOC_TYPE } from '../../common';
+import { LensAppServices } from '../app_plugin/types';
 import { mockDataPlugin } from './data_plugin_mock';
 import { getLensInspectorService } from '../lens_inspector_service';
 
diff --git a/x-pack/plugins/lens/public/mocks/store_mocks.tsx b/x-pack/plugins/lens/public/mocks/store_mocks.tsx
index a4067bc955368..2e6bc86a9d33e 100644
--- a/x-pack/plugins/lens/public/mocks/store_mocks.tsx
+++ b/x-pack/plugins/lens/public/mocks/store_mocks.tsx
@@ -15,12 +15,7 @@ import { act } from 'react-dom/test-utils';
 import { PreloadedState } from '@reduxjs/toolkit';
 import { LensAppServices } from '../app_plugin/types';
 
-import {
-  makeConfigureStore,
-  LensAppState,
-  LensState,
-  LensStoreDeps,
-} from '../state_management/index';
+import { makeConfigureStore, LensAppState, LensState, LensStoreDeps } from '../state_management';
 import { getResolvedDateRange } from '../utils';
 import { DatasourceMap, VisualizationMap } from '../types';
 import { mockVisualizationMap } from './visualization_mock';
diff --git a/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts b/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
index 9d6b120653d79..2a080c8923356 100644
--- a/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_object_store.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { SavedObjectIndexStore } from './saved_object_store';
 
 describe('LensStore', () => {
diff --git a/x-pack/plugins/lens/public/persistence/saved_object_store.ts b/x-pack/plugins/lens/public/persistence/saved_object_store.ts
index 769f50f901243..fe0601c525016 100644
--- a/x-pack/plugins/lens/public/persistence/saved_object_store.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_object_store.ts
@@ -11,8 +11,8 @@ import {
   SavedObjectsClientContract,
   SavedObjectReference,
   ResolvedSimpleSavedObject,
-} from 'kibana/public';
-import { Query } from '../../../../../src/plugins/data/public';
+} from '@kbn/core/public';
+import { Query } from '@kbn/data-plugin/public';
 import { DOC_TYPE } from '../../common';
 import { LensSavedObjectAttributes } from '../async_services';
 
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts
index d9d29a6fdb2d7..8d6ca5c3b7640 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import type { SavedObject } from 'src/plugins/saved_objects/public';
+import type { OverlayStart, SavedObjectsClientContract } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { findObjectByTitle } from './find_object_by_title';
 import { displayDuplicateTitleConfirmModal } from './display_duplicate_title_confirm_modal';
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx b/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx
index 120be6b66b339..c788660eea647 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/confirm_modal_promise.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import type { OverlayStart } from 'kibana/public';
+import type { OverlayStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export function confirmModalPromise(
   message = '',
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts
index f40224e42923c..6c5a94c8c3216 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/display_duplicate_title_confirm_modal.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { OverlayStart } from 'kibana/public';
-import type { SavedObject } from 'src/plugins/saved_objects/public';
+import type { OverlayStart } from '@kbn/core/public';
+import type { SavedObject } from '@kbn/saved-objects-plugin/public';
 import { SAVE_DUPLICATE_REJECTED } from './constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts
index 72d8dcafcf348..a07a20ee1f284 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { findObjectByTitle } from './find_object_by_title';
-import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from 'src/core/public';
+import { SimpleSavedObject, SavedObjectsClientContract, SavedObject } from '@kbn/core/public';
 
 describe('findObjectByTitle', () => {
   const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
diff --git a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts
index 93c86eeb5f3b0..b556f960d6e24 100644
--- a/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts
+++ b/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts
@@ -9,7 +9,7 @@ import type {
   SavedObjectsClientContract,
   SimpleSavedObject,
   SavedObjectAttributes,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 /** Returns an object matching a given title */
 export async function findObjectByTitle<T extends SavedObjectAttributes>(
diff --git a/x-pack/plugins/lens/public/pie_visualization/index.ts b/x-pack/plugins/lens/public/pie_visualization/index.ts
index b86c2fc90e4fa..6b7a9d68115d6 100644
--- a/x-pack/plugins/lens/public/pie_visualization/index.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../types';
-import type { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 
 export interface PieVisualizationPluginSetupPlugins {
   editorFrame: EditorFrameSetup;
diff --git a/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts b/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts
index d77a09ae10689..44aa3b3a92b12 100644
--- a/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import type { EuiIconProps } from '@elastic/eui';
 
-import type { DatatableColumn } from '../../../../../src/plugins/expressions';
+import type { DatatableColumn } from '@kbn/expressions-plugin';
 import { LensIconChartDonut } from '../assets/chart_donut';
 import { LensIconChartPie } from '../assets/chart_pie';
 import { LensIconChartTreemap } from '../assets/chart_treemap';
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts b/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts
index bf09b3f2706e5..6fe4d9b60420e 100644
--- a/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/render_helpers.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 
 import { checkTableForContainsSmallValues, shouldShowValuesInLegend } from './render_helpers';
 import { PieLayerState, PieChartTypes } from '../../common';
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts b/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts
index 1f6d40abc32ec..b34385d55b44f 100644
--- a/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/render_helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import type { PieChartType, PieLayerState } from '../../common/types';
 import { PartitionChartsMeta } from './partition_charts_meta';
 
diff --git a/x-pack/plugins/lens/public/pie_visualization/to_expression.ts b/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
index bacbc8f0720a3..9f506c7beb878 100644
--- a/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
@@ -9,11 +9,8 @@ import type { Ast } from '@kbn/interpreter';
 import { Position } from '@elastic/charts';
 import type { PaletteOutput, PaletteRegistry } from '@kbn/coloring';
 
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../src/plugins/expressions/public';
-import type { Operation, DatasourcePublicAPI } from '../types';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import type { Operation, DatasourcePublicAPI, DatasourceLayers } from '../types';
 import { DEFAULT_PERCENT_DECIMALS } from './constants';
 import { shouldShowValuesInLegend } from './render_helpers';
 import {
@@ -43,7 +40,7 @@ type GenerateExpressionAstFunction = (
   attributes: Attributes,
   operations: OperationColumnId[],
   layer: PieLayerState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry
 ) => Ast | null;
 
@@ -52,7 +49,7 @@ type GenerateExpressionAstArguments = (
   attributes: Attributes,
   operations: OperationColumnId[],
   layer: PieLayerState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry
 ) => Ast['chain'][number]['arguments'];
 
@@ -246,7 +243,7 @@ const generateExprAst: GenerateExpressionAstFunction = (state, ...restArgs) =>
 
 function expressionHelper(
   state: PieVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Attributes = { isPreview: false }
 ): Ast | null {
@@ -270,7 +267,7 @@ function expressionHelper(
 
 export function toExpression(
   state: PieVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Partial<{ title: string; description: string }> = {}
 ) {
@@ -282,7 +279,7 @@ export function toExpression(
 
 export function toPreviewExpression(
   state: PieVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry
 ) {
   return expressionHelper(state, datasourceLayers, paletteService, { isPreview: true });
diff --git a/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx b/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
index dac889fc99df6..67659d91ecefe 100644
--- a/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
@@ -156,7 +156,7 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
   ).truncateText;
 
   return (
-    <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
       <ToolbarPopover
         title={i18n.translate('xpack.lens.pieChart.valuesLabel', {
           defaultMessage: 'Labels',
@@ -183,7 +183,7 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
           </EuiFormRow>
         ) : null}
 
-        {numberOptions.length ? (
+        {numberOptions.length && layer.categoryDisplay !== 'hide' ? (
           <EuiFormRow
             label={i18n.translate('xpack.lens.pieChart.numberLabels', {
               defaultMessage: 'Values',
@@ -193,8 +193,7 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
           >
             <EuiSuperSelect
               compressed
-              disabled={layer.categoryDisplay === 'hide'}
-              valueOfSelected={layer.categoryDisplay === 'hide' ? 'hidden' : layer.numberDisplay}
+              valueOfSelected={layer.numberDisplay}
               options={numberOptions}
               onChange={onNumberDisplayChange}
             />
diff --git a/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts b/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts
index c178613657947..a911b5f0e1ba3 100644
--- a/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/visualization.test.ts
@@ -14,10 +14,10 @@ import {
   LegendDisplay,
 } from '../../common';
 import { layerTypes } from '../../common';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { FramePublicAPI } from '../types';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../id_generator');
 
diff --git a/x-pack/plugins/lens/public/pie_visualization/visualization.tsx b/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
index 621570e3086b8..665fd5522c36f 100644
--- a/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
@@ -10,9 +10,9 @@ import { render } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { ThemeServiceStart } from 'kibana/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 import type {
   Visualization,
   OperationMetadata,
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index dbecf1e7d779f..f2d82e96b98cd 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -5,43 +5,47 @@
  * 2.0.
  */
 
-import type { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
-import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
-import type { FieldFormatsSetup, FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { AppMountParameters, CoreSetup, CoreStart } from '@kbn/core/public';
+import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
+import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type {
   UsageCollectionSetup,
   UsageCollectionStart,
-} from 'src/plugins/usage_collection/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
+} from '@kbn/usage-collection-plugin/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   CONTEXT_MENU_TRIGGER,
   EmbeddableSetup,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
-import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
-import type { DashboardStart } from '../../../../src/plugins/dashboard/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+} from '@kbn/embeddable-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type {
   ExpressionsServiceSetup,
   ExpressionsSetup,
   ExpressionsStart,
-} from '../../../../src/plugins/expressions/public';
-import type {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../src/plugins/visualizations/public';
-import type { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
-import type { UrlForwardingSetup } from '../../../../src/plugins/url_forwarding/public';
-import type { GlobalSearchPluginSetup } from '../../global_search/public';
-import type { ChartsPluginSetup, ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import type { EventAnnotationPluginSetup } from '../../../../src/plugins/event_annotation/public';
-import type { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public';
-import { EmbeddableStateTransfer } from '../../../../src/plugins/embeddable/public';
+} from '@kbn/expressions-plugin/public';
+import type { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import type { UrlForwardingSetup } from '@kbn/url-forwarding-plugin/public';
+import type { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/public';
+import type { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+import {
+  UiActionsStart,
+  ACTION_VISUALIZE_FIELD,
+  VISUALIZE_FIELD_TRIGGER,
+} from '@kbn/ui-actions-plugin/public';
+import { VISUALIZE_EDITOR_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { createStartServicesGetter } from '@kbn/kibana-utils-plugin/public';
+import type { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
 import type { EditorFrameService as EditorFrameServiceType } from './editor_frame_service';
-import { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
 import type {
   IndexPatternDatasource as IndexPatternDatasourceType,
   IndexPatternDatasourceSetupPlugins,
@@ -65,16 +69,7 @@ import type {
 } from './pie_visualization';
 import type { HeatmapVisualization as HeatmapVisualizationType } from './heatmap_visualization';
 import type { GaugeVisualization as GaugeVisualizationType } from './visualizations/gauge';
-import type { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
 
-import { AppNavLinkStatus } from '../../../../src/core/public';
-
-import {
-  UiActionsStart,
-  ACTION_VISUALIZE_FIELD,
-  VISUALIZE_FIELD_TRIGGER,
-} from '../../../../src/plugins/ui_actions/public';
-import { VISUALIZE_EDITOR_TRIGGER } from '../../../../src/plugins/visualizations/public';
 import { APP_ID, getEditPath, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../common/constants';
 import type { FormatFactory } from '../common/types';
 import type {
@@ -97,10 +92,8 @@ import {
 import { getSaveModalComponent } from './app_plugin/shared/saved_modal_lazy';
 import type { SaveModalContainerProps } from './app_plugin/save_modal_container';
 
-import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';
 import { setupExpressions } from './expressions';
 import { getSearchProvider } from './search_provider';
-import type { DiscoverSetup, DiscoverStart } from '../../../../src/plugins/discover/public';
 
 export interface LensPluginSetupDependencies {
   urlForwarding: UrlForwardingSetup;
diff --git a/x-pack/plugins/lens/public/search_provider.ts b/x-pack/plugins/lens/public/search_provider.ts
index a0d41da2d9740..8156d10e3a729 100644
--- a/x-pack/plugins/lens/public/search_provider.ts
+++ b/x-pack/plugins/lens/public/search_provider.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import { from, of } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { GlobalSearchResultProvider } from '@kbn/global-search-plugin/public';
 import { getFullPath } from '../common/constants';
 
-import type { GlobalSearchResultProvider } from '../../global_search/public';
-
 /**
  * Global search provider adding a Lens entry.
  * This is necessary because Lens does not show up in the nav bar and is filtered out by the
diff --git a/x-pack/plugins/lens/public/settings_storage.tsx b/x-pack/plugins/lens/public/settings_storage.tsx
index ebe812915242e..bf896f222ceaa 100644
--- a/x-pack/plugins/lens/public/settings_storage.tsx
+++ b/x-pack/plugins/lens/public/settings_storage.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const STORAGE_KEY = 'lens-settings';
 
diff --git a/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx b/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx
index ff7b058873bbc..8e0c98ad61e8a 100644
--- a/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/axis_title_settings.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback, useState } from 'react';
 import { EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { AxesSettingsConfig } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { LabelMode, useDebouncedValue, VisLabel } from './';
+import { AxesSettingsConfig } from '@kbn/expression-xy-plugin/common';
+import { LabelMode, useDebouncedValue, VisLabel } from '.';
 
 type AxesSettingsConfigKeys = keyof AxesSettingsConfig;
 
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts b/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts
index 5c7944d2aab58..834f3f5b1bf3c 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts
+++ b/x-pack/plugins/lens/public/shared_components/coloring/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { applyPaletteParams, getContrastColor } from './utils';
 
 describe('applyPaletteParams', () => {
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
index b1ab5193c8cc4..abe22d82ceb93 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
+++ b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
@@ -19,7 +19,7 @@ import {
   getPaletteStops,
   CUSTOM_PALETTE,
 } from '@kbn/coloring';
-import { Datatable } from '../../../../../../src/plugins/expressions';
+import { Datatable } from '@kbn/expressions-plugin';
 
 export function getContrastColor(
   color: string,
diff --git a/x-pack/plugins/lens/public/shared_components/columns_number_setting.test.tsx b/x-pack/plugins/lens/public/shared_components/columns_number_setting.test.tsx
deleted file mode 100644
index 50f2dc2fb93dc..0000000000000
--- a/x-pack/plugins/lens/public/shared_components/columns_number_setting.test.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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
-import { ColumnsNumberSetting } from './columns_number_setting';
-
-describe('Columns Number Setting', () => {
-  it('should have default the columns input to 1 when no value is given', () => {
-    const component = mount(<ColumnsNumberSetting isDisabled={false} isLegendOutside={false} />);
-    expect(
-      component.find('[data-test-subj="lens-legend-location-columns-input"]').at(0).prop('value')
-    ).toEqual(1);
-  });
-});
diff --git a/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx b/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx
index 6a1d1ec6d0306..3cfd03d53c51d 100644
--- a/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx
+++ b/x-pack/plugins/lens/public/shared_components/columns_number_setting.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
 import { useDebouncedValue } from './debounced_value';
-import { TooltipWrapper } from './tooltip_wrapper';
 
 export const DEFAULT_FLOATING_COLUMNS = 1;
 
@@ -22,10 +21,6 @@ interface ColumnsNumberSettingProps {
    * Callback on horizontal alignment option change
    */
   onFloatingColumnsChange?: (value: number) => void;
-  /**
-   * Flag to disable the location settings
-   */
-  isDisabled: boolean;
   /**
    * Indicates if legend is located outside
    */
@@ -35,7 +30,6 @@ interface ColumnsNumberSettingProps {
 export const ColumnsNumberSetting = ({
   floatingColumns,
   onFloatingColumnsChange = () => {},
-  isDisabled,
   isLegendOutside,
 }: ColumnsNumberSettingProps) => {
   const { inputValue, handleInputChange } = useDebouncedValue({
@@ -43,6 +37,8 @@ export const ColumnsNumberSetting = ({
     onChange: onFloatingColumnsChange,
   });
 
+  if (isLegendOutside) return null;
+
   return (
     <EuiFormRow
       label={i18n.translate('xpack.lens.shared.legendInsideColumnsLabel', {
@@ -51,34 +47,17 @@ export const ColumnsNumberSetting = ({
       fullWidth
       display="columnCompressed"
     >
-      <TooltipWrapper
-        tooltipContent={
-          isDisabled
-            ? i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
-              })
-            : i18n.translate('xpack.lens.shared.legendInsideTooltip', {
-                defaultMessage: 'Requires legend to be located inside visualization',
-              })
-        }
-        condition={isDisabled || isLegendOutside}
-        position="top"
-        delay="regular"
-        display="block"
-      >
-        <EuiFieldNumber
-          data-test-subj="lens-legend-location-columns-input"
-          value={inputValue}
-          min={1}
-          max={5}
-          compressed
-          disabled={isDisabled || isLegendOutside}
-          onChange={(e) => {
-            handleInputChange(Number(e.target.value));
-          }}
-          step={1}
-        />
-      </TooltipWrapper>
+      <EuiFieldNumber
+        data-test-subj="lens-legend-location-columns-input"
+        value={inputValue}
+        min={1}
+        max={5}
+        compressed
+        onChange={(e) => {
+          handleInputChange(Number(e.target.value));
+        }}
+        step={1}
+      />
     </EuiFormRow>
   );
 };
diff --git a/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts b/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts
index 250c5614fe093..a0b6f767b287b 100644
--- a/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts
+++ b/x-pack/plugins/lens/public/shared_components/datasource_default_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DatasourcePublicAPI } from '../types';
+import { DatasourceLayers } from '../types';
 
 type VisState = { layers: Array<{ layerId: string }> } | { layerId: string };
 
@@ -28,7 +28,7 @@ function mergeValues(memo: MappedVisualValue, values: Partial<MappedVisualValue>
 
 export function getDefaultVisualValuesForLayer(
   state: VisState | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>
+  datasourceLayers: DatasourceLayers
 ): MappedVisualValue {
   const defaultValues = { truncateText: true };
   if (!state) {
diff --git a/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx b/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx
index f4b5ced490663..d318a19014928 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_location_settings.test.tsx
@@ -32,11 +32,9 @@ describe('Legend Location Settings', () => {
     expect(props.onPositionChange).toHaveBeenCalled();
   });
 
-  it('should disable the position group if isDisabled prop is true', () => {
+  it('should hide the position group if isDisabled prop is true', () => {
     const component = shallow(<LegendLocationSettings {...props} isDisabled />);
-    expect(
-      component.find('[data-test-subj="lens-legend-position-btn"]').prop('isDisabled')
-    ).toEqual(true);
+    expect(component.exists('[data-test-subj="lens-legend-position-btn"]')).toEqual(false);
   });
 
   it('should hide the position button group if location inside is given', () => {
@@ -104,18 +102,14 @@ describe('Legend Location Settings', () => {
     expect(newProps.onAlignmentChange).toHaveBeenCalled();
   });
 
-  it('should disable the components when is Disabled is true', () => {
+  it('should hide the components when is Disabled is true', () => {
     const newProps = {
       ...props,
       location: 'inside',
       isDisabled: true,
     } as LegendLocationSettingsProps;
     const component = shallow(<LegendLocationSettings {...newProps} />);
-    expect(
-      component.find('[data-test-subj="lens-legend-location-btn"]').prop('isDisabled')
-    ).toEqual(true);
-    expect(
-      component.find('[data-test-subj="lens-legend-inside-alignment-btn"]').prop('isDisabled')
-    ).toEqual(true);
+    expect(component.exists('[data-test-subj="lens-legend-location-btn"]')).toEqual(false);
+    expect(component.exists('[data-test-subj="lens-legend-inside-alignment-btn"]')).toEqual(false);
   });
 });
diff --git a/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx b/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx
index f3ac54ab00a05..7372b727268bd 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_location_settings.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiButtonGroup } from '@elastic/eui';
 import { VerticalAlignment, HorizontalAlignment, Position } from '@elastic/charts';
-import { TooltipWrapper } from './tooltip_wrapper';
 
 export interface LegendLocationSettingsProps {
   /**
@@ -151,6 +150,7 @@ export const LegendLocationSettings: React.FunctionComponent<LegendLocationSetti
   const alignment = `${verticalAlignment || VerticalAlignment.Top}_${
     horizontalAlignment || HorizontalAlignment.Right
   }`;
+  if (isDisabled) return null;
   return (
     <>
       {location && (
@@ -160,32 +160,22 @@ export const LegendLocationSettings: React.FunctionComponent<LegendLocationSetti
             defaultMessage: 'Location',
           })}
         >
-          <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-              defaultMessage: 'Requires legend to be shown',
+          <EuiButtonGroup
+            isFullWidth
+            legend={i18n.translate('xpack.lens.shared.legendLocationLabel', {
+              defaultMessage: 'Location',
             })}
-            condition={isDisabled}
-            position="top"
-            delay="regular"
-            display="block"
-          >
-            <EuiButtonGroup
-              isFullWidth
-              legend={i18n.translate('xpack.lens.shared.legendLocationLabel', {
-                defaultMessage: 'Location',
-              })}
-              data-test-subj="lens-legend-location-btn"
-              name="legendLocation"
-              buttonSize="compressed"
-              options={locationOptions}
-              isDisabled={isDisabled}
-              idSelected={locationOptions.find(({ value }) => value === location)!.id}
-              onChange={(optionId) => {
-                const newLocation = locationOptions.find(({ id }) => id === optionId)!.value;
-                onLocationChange(newLocation);
-              }}
-            />
-          </TooltipWrapper>
+            data-test-subj="lens-legend-location-btn"
+            name="legendLocation"
+            buttonSize="compressed"
+            options={locationOptions}
+            isDisabled={isDisabled}
+            idSelected={locationOptions.find(({ value }) => value === location)!.id}
+            onChange={(optionId) => {
+              const newLocation = locationOptions.find(({ id }) => id === optionId)!.value;
+              onLocationChange(newLocation);
+            }}
+          />
         </EuiFormRow>
       )}
       <EuiFormRow
@@ -196,62 +186,42 @@ export const LegendLocationSettings: React.FunctionComponent<LegendLocationSetti
       >
         <>
           {(!location || location === 'outside') && (
-            <TooltipWrapper
-              tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
+            <EuiButtonGroup
+              legend={i18n.translate('xpack.lens.shared.legendAlignmentLabel', {
+                defaultMessage: 'Alignment',
               })}
-              condition={isDisabled}
-              position="top"
-              delay="regular"
-              display="block"
-            >
-              <EuiButtonGroup
-                legend={i18n.translate('xpack.lens.shared.legendAlignmentLabel', {
-                  defaultMessage: 'Alignment',
-                })}
-                isDisabled={isDisabled}
-                data-test-subj="lens-legend-position-btn"
-                name="legendPosition"
-                buttonSize="compressed"
-                options={toggleButtonsIcons}
-                idSelected={position || Position.Right}
-                onChange={onPositionChange}
-                isIconOnly
-              />
-            </TooltipWrapper>
+              isDisabled={isDisabled}
+              data-test-subj="lens-legend-position-btn"
+              name="legendPosition"
+              buttonSize="compressed"
+              options={toggleButtonsIcons}
+              idSelected={position || Position.Right}
+              onChange={onPositionChange}
+              isIconOnly
+            />
           )}
           {location === 'inside' && (
-            <TooltipWrapper
-              tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
+            <EuiButtonGroup
+              legend={i18n.translate('xpack.lens.shared.legendInsideLocationAlignmentLabel', {
+                defaultMessage: 'Alignment',
               })}
-              condition={isDisabled}
-              position="top"
-              delay="regular"
-              display="block"
-            >
-              <EuiButtonGroup
-                legend={i18n.translate('xpack.lens.shared.legendInsideLocationAlignmentLabel', {
-                  defaultMessage: 'Alignment',
-                })}
-                type="single"
-                data-test-subj="lens-legend-inside-alignment-btn"
-                name="legendInsideAlignment"
-                buttonSize="compressed"
-                isDisabled={isDisabled}
-                options={locationAlignmentButtonsIcons}
-                idSelected={
-                  locationAlignmentButtonsIcons.find(({ value }) => value === alignment)!.id
-                }
-                onChange={(optionId) => {
-                  const newAlignment = locationAlignmentButtonsIcons.find(
-                    ({ id }) => id === optionId
-                  )!.value;
-                  onAlignmentChange(newAlignment);
-                }}
-                isIconOnly
-              />
-            </TooltipWrapper>
+              type="single"
+              data-test-subj="lens-legend-inside-alignment-btn"
+              name="legendInsideAlignment"
+              buttonSize="compressed"
+              isDisabled={isDisabled}
+              options={locationAlignmentButtonsIcons}
+              idSelected={
+                locationAlignmentButtonsIcons.find(({ value }) => value === alignment)!.id
+              }
+              onChange={(optionId) => {
+                const newAlignment = locationAlignmentButtonsIcons.find(
+                  ({ id }) => id === optionId
+                )!.value;
+                onAlignmentChange(newAlignment);
+              }}
+              isIconOnly
+            />
           )}
         </>
       </EuiFormRow>
diff --git a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx
index e76426515548f..9bf9a1885e6ac 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.test.tsx
@@ -56,7 +56,7 @@ describe('Legend Settings', () => {
   });
 
   it('should have default the max lines input to 1 when no value is given', () => {
-    const component = shallow(<LegendSettingsPopover {...props} />);
+    const component = shallow(<LegendSettingsPopover {...props} shouldTruncate />);
     expect(component.find(MaxLinesInput).prop('value')).toEqual(1);
   });
 
@@ -74,9 +74,9 @@ describe('Legend Settings', () => {
     ).toEqual(false);
   });
 
-  it('should have disabled the max lines input when truncate is set to false', () => {
+  it('should hide the max lines input when truncate is set to false', () => {
     const component = shallow(<LegendSettingsPopover {...props} shouldTruncate={false} />);
-    expect(component.find(MaxLinesInput).prop('isDisabled')).toEqual(true);
+    expect(component.exists(MaxLinesInput)).toEqual(false);
   });
 
   it('should have called the onTruncateLegendChange function on truncate switch change', () => {
@@ -115,12 +115,10 @@ describe('Legend Settings', () => {
     expect(nestedProps.onNestedLegendChange).toHaveBeenCalled();
   });
 
-  it('should disable switch group on hide mode', () => {
+  it('should hide switch group on hide mode', () => {
     const component = shallow(
       <LegendSettingsPopover {...props} mode="hide" renderNestedLegendSwitch />
     );
-    expect(component.find('[data-test-subj="lens-legend-nested-switch"]').prop('disabled')).toEqual(
-      true
-    );
+    expect(component.exists('[data-test-subj="lens-legend-nested-switch"]')).toEqual(false);
   });
 });
diff --git a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx
index 481c38815d43d..560a695eaa089 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_settings_popover.tsx
@@ -15,12 +15,11 @@ import {
   EuiFieldNumber,
 } from '@elastic/eui';
 import { Position, VerticalAlignment, HorizontalAlignment } from '@elastic/charts';
-import { ToolbarPopover } from '../shared_components';
+import { ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
+import { ToolbarPopover } from '.';
 import { LegendLocationSettings } from './legend_location_settings';
 import { ColumnsNumberSetting } from './columns_number_setting';
 import { LegendSizeSettings } from './legend_size_settings';
-import { ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
-import { TooltipWrapper } from './tooltip_wrapper';
 import { useDebouncedValue } from './debounced_value';
 
 export interface LegendSettingsPopoverProps {
@@ -137,11 +136,9 @@ const MIN_TRUNCATE_LINES = 1;
 export const MaxLinesInput = ({
   value,
   setValue,
-  isDisabled,
 }: {
   value: number;
   setValue: (value: number) => void;
-  isDisabled: boolean;
 }) => {
   const { inputValue, handleInputChange } = useDebouncedValue({ value, onChange: setValue });
   return (
@@ -152,7 +149,6 @@ export const MaxLinesInput = ({
       max={MAX_TRUNCATE_LINES}
       step={1}
       compressed
-      disabled={isDisabled}
       onChange={(e) => {
         const val = Number(e.target.value);
         // we want to automatically change the values to the limits
@@ -218,146 +214,101 @@ export const LegendSettingsPopover: React.FunctionComponent<LegendSettingsPopove
           onChange={onDisplayChange}
         />
       </EuiFormRow>
-      <LegendLocationSettings
-        location={location}
-        onLocationChange={onLocationChange}
-        verticalAlignment={verticalAlignment}
-        horizontalAlignment={horizontalAlignment}
-        onAlignmentChange={onAlignmentChange}
-        isDisabled={mode === 'hide'}
-        position={position}
-        onPositionChange={onPositionChange}
-      />
-      <LegendSizeSettings
-        legendSize={legendSize}
-        onLegendSizeChange={onLegendSizeChange}
-        isVerticalLegend={!position || position === Position.Left || position === Position.Right}
-        isDisabled={mode === 'hide'}
-      />
-      {location && (
-        <ColumnsNumberSetting
-          floatingColumns={floatingColumns}
-          onFloatingColumnsChange={onFloatingColumnsChange}
-          isDisabled={mode === 'hide'}
-          isLegendOutside={location === 'outside'}
-        />
-      )}
-      <EuiFormRow
-        display="columnCompressedSwitch"
-        label={i18n.translate('xpack.lens.shared.truncateLegend', {
-          defaultMessage: 'Truncate text',
-        })}
-      >
-        <TooltipWrapper
-          tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-            defaultMessage: 'Requires legend to be shown',
-          })}
-          condition={mode === 'hide'}
-          position="top"
-          delay="regular"
-          display="block"
-        >
-          <EuiSwitch
-            compressed
-            label={i18n.translate('xpack.lens.shared.truncateLegend', {
-              defaultMessage: 'Truncate text',
-            })}
-            data-test-subj="lens-legend-truncate-switch"
-            showLabel={false}
-            disabled={mode === 'hide'}
-            checked={shouldTruncate ?? true}
-            onChange={onTruncateLegendChange}
+      {mode !== 'hide' && (
+        <>
+          <LegendLocationSettings
+            location={location}
+            onLocationChange={onLocationChange}
+            verticalAlignment={verticalAlignment}
+            horizontalAlignment={horizontalAlignment}
+            onAlignmentChange={onAlignmentChange}
+            position={position}
+            onPositionChange={onPositionChange}
           />
-        </TooltipWrapper>
-      </EuiFormRow>
-      <EuiFormRow
-        label={i18n.translate('xpack.lens.shared.maxLinesLabel', {
-          defaultMessage: 'Maximum lines',
-        })}
-        fullWidth
-        display="columnCompressed"
-      >
-        <TooltipWrapper
-          tooltipContent={
-            mode === 'hide'
-              ? i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                  defaultMessage: 'Requires legend to be shown',
-                })
-              : i18n.translate('xpack.lens.shared.legendIsTruncated', {
-                  defaultMessage: 'Requires text to be truncated',
-                })
-          }
-          condition={mode === 'hide' || !shouldTruncate}
-          position="top"
-          delay="regular"
-          display="block"
-        >
-          <MaxLinesInput
-            value={maxLines ?? DEFAULT_TRUNCATE_LINES}
-            setValue={onMaxLinesChange}
-            isDisabled={mode === 'hide' || !shouldTruncate}
+          <LegendSizeSettings
+            legendSize={legendSize}
+            onLegendSizeChange={onLegendSizeChange}
+            isVerticalLegend={
+              !position || position === Position.Left || position === Position.Right
+            }
           />
-        </TooltipWrapper>
-      </EuiFormRow>
-      {renderNestedLegendSwitch && (
-        <EuiFormRow
-          display="columnCompressedSwitch"
-          label={i18n.translate('xpack.lens.shared.nestedLegendLabel', {
-            defaultMessage: 'Nested',
-          })}
-        >
-          <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-              defaultMessage: 'Requires legend to be shown',
+          {location && (
+            <ColumnsNumberSetting
+              floatingColumns={floatingColumns}
+              onFloatingColumnsChange={onFloatingColumnsChange}
+              isLegendOutside={location === 'outside'}
+            />
+          )}
+          <EuiFormRow
+            display="columnCompressedSwitch"
+            label={i18n.translate('xpack.lens.shared.truncateLegend', {
+              defaultMessage: 'Truncate text',
             })}
-            condition={mode === 'hide'}
-            position="top"
-            delay="regular"
-            display="block"
           >
             <EuiSwitch
               compressed
-              label={i18n.translate('xpack.lens.pieChart.nestedLegendLabel', {
-                defaultMessage: 'Nested',
+              label={i18n.translate('xpack.lens.shared.truncateLegend', {
+                defaultMessage: 'Truncate text',
               })}
-              data-test-subj="lens-legend-nested-switch"
+              data-test-subj="lens-legend-truncate-switch"
               showLabel={false}
-              disabled={mode === 'hide'}
-              checked={!!nestedLegend}
-              onChange={onNestedLegendChange}
+              checked={shouldTruncate ?? true}
+              onChange={onTruncateLegendChange}
             />
-          </TooltipWrapper>
-        </EuiFormRow>
-      )}
-      {renderValueInLegendSwitch && (
-        <EuiFormRow
-          display="columnCompressedSwitch"
-          label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
-            defaultMessage: 'Show value',
-          })}
-        >
-          <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-              defaultMessage: 'Requires legend to be shown',
-            })}
-            condition={mode === 'hide'}
-            position="top"
-            delay="regular"
-            display="block"
-          >
-            <EuiSwitch
-              compressed
+          </EuiFormRow>
+          {shouldTruncate && (
+            <EuiFormRow
+              label={i18n.translate('xpack.lens.shared.maxLinesLabel', {
+                defaultMessage: 'Maximum lines',
+              })}
+              fullWidth
+              display="columnCompressed"
+            >
+              <MaxLinesInput
+                value={maxLines ?? DEFAULT_TRUNCATE_LINES}
+                setValue={onMaxLinesChange}
+              />
+            </EuiFormRow>
+          )}
+          {renderNestedLegendSwitch && (
+            <EuiFormRow
+              display="columnCompressedSwitch"
+              label={i18n.translate('xpack.lens.shared.nestedLegendLabel', {
+                defaultMessage: 'Nested',
+              })}
+            >
+              <EuiSwitch
+                compressed
+                label={i18n.translate('xpack.lens.pieChart.nestedLegendLabel', {
+                  defaultMessage: 'Nested',
+                })}
+                data-test-subj="lens-legend-nested-switch"
+                showLabel={false}
+                checked={!!nestedLegend}
+                onChange={onNestedLegendChange}
+              />
+            </EuiFormRow>
+          )}
+          {renderValueInLegendSwitch && (
+            <EuiFormRow
+              display="columnCompressedSwitch"
               label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
                 defaultMessage: 'Show value',
               })}
-              data-test-subj="lens-legend-show-value"
-              showLabel={false}
-              disabled={mode === 'hide'}
-              checked={!!valueInLegend}
-              onChange={onValueInLegendChange}
-            />
-          </TooltipWrapper>
-        </EuiFormRow>
+            >
+              <EuiSwitch
+                compressed
+                label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
+                  defaultMessage: 'Show value',
+                })}
+                data-test-subj="lens-legend-show-value"
+                showLabel={false}
+                checked={!!valueInLegend}
+                onChange={onValueInLegendChange}
+              />
+            </EuiFormRow>
+          )}
+        </>
       )}
     </ToolbarPopover>
   );
diff --git a/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx b/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx
index a596bb7189571..53da283de0b68 100644
--- a/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend_size_settings.tsx
@@ -8,7 +8,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiSuperSelect } from '@elastic/eui';
-import { TooltipWrapper } from './tooltip_wrapper';
 
 export enum LegendSizes {
   AUTO = '0',
@@ -22,7 +21,6 @@ interface LegendSizeSettingsProps {
   legendSize: number | undefined;
   onLegendSizeChange: (size?: number) => void;
   isVerticalLegend: boolean;
-  isDisabled: boolean;
 }
 
 const legendSizeOptions: Array<{ value: LegendSizes; inputDisplay: string }> = [
@@ -65,7 +63,6 @@ export const LegendSizeSettings = ({
   legendSize,
   onLegendSizeChange,
   isVerticalLegend,
-  isDisabled,
 }: LegendSizeSettingsProps) => {
   useEffect(() => {
     if (legendSize && !isVerticalLegend) {
@@ -78,6 +75,8 @@ export const LegendSizeSettings = ({
     [onLegendSizeChange]
   );
 
+  if (!isVerticalLegend) return null;
+
   return (
     <EuiFormRow
       display="columnCompressed"
@@ -86,29 +85,12 @@ export const LegendSizeSettings = ({
       })}
       fullWidth
     >
-      <TooltipWrapper
-        tooltipContent={
-          isDisabled
-            ? i18n.translate('xpack.lens.shared.legendVisibleTooltip', {
-                defaultMessage: 'Requires legend to be shown',
-              })
-            : i18n.translate('xpack.lens.legendSizeSetting.legendVertical', {
-                defaultMessage: 'Requires legend to be right or left aligned',
-              })
-        }
-        condition={isDisabled || !isVerticalLegend}
-        position="top"
-        delay="regular"
-        display="block"
-      >
-        <EuiSuperSelect
-          compressed
-          valueOfSelected={legendSize?.toString() ?? LegendSizes.AUTO}
-          options={legendSizeOptions}
-          onChange={onLegendSizeOptionChange}
-          disabled={isDisabled || !isVerticalLegend}
-        />
-      </TooltipWrapper>
+      <EuiSuperSelect
+        compressed
+        valueOfSelected={legendSize?.toString() ?? LegendSizes.AUTO}
+        options={legendSizeOptions}
+        onChange={onLegendSizeOptionChange}
+      />
     </EuiFormRow>
   );
 };
diff --git a/x-pack/plugins/lens/public/shared_components/name_input.tsx b/x-pack/plugins/lens/public/shared_components/name_input.tsx
index b59946ec42aa9..0b65b26021628 100644
--- a/x-pack/plugins/lens/public/shared_components/name_input.tsx
+++ b/x-pack/plugins/lens/public/shared_components/name_input.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { useDebouncedValue } from '../shared_components';
+import { useDebouncedValue } from '.';
 
 export const NameInput = ({
   value,
diff --git a/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx b/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx
index e6bb2fcdc0825..9d806b79f8311 100644
--- a/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/toolbar_popover.tsx
@@ -8,8 +8,8 @@
 import './toolbar_popover.scss';
 import React, { useState } from 'react';
 import { EuiFlexItem, EuiPopover, EuiIcon, EuiPopoverTitle, IconType } from '@elastic/eui';
+import { ToolbarButton, ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { EuiIconLegend } from '../assets/legend';
-import { ToolbarButton, ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
 
 const typeToIconMap: { [type: string]: string | IconType } = {
   legend: EuiIconLegend as IconType,
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts b/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts
index e958650d8b5c6..19e40577acad6 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/index.test.ts
@@ -9,7 +9,7 @@ import { PayloadAction } from '@reduxjs/toolkit';
 import moment from 'moment';
 
 import { contextMiddleware } from '.';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { applyChanges, initialState } from '../lens_slice';
 import { LensAppState } from '../types';
 import { mockDataPlugin, mockStoreDeps } from '../../mocks';
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/index.ts b/x-pack/plugins/lens/public/state_management/context_middleware/index.ts
index ada5bc3c1c39e..65507a6767166 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/index.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/index.ts
@@ -7,7 +7,7 @@
 
 import { Dispatch, MiddlewareAPI, PayloadAction } from '@reduxjs/toolkit';
 import moment from 'moment';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   setState,
   LensDispatch,
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts b/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
index 6bee355b10659..60a4f5670070e 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
@@ -7,11 +7,8 @@
 
 import { delay, finalize, switchMap, tap } from 'rxjs/operators';
 import { debounce, isEqual } from 'lodash';
+import { waitUntilNextSessionCompletes$, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { trackUiEvent } from '../../lens_ui_telemetry';
-import {
-  waitUntilNextSessionCompletes$,
-  DataPublicPluginStart,
-} from '../../../../../../src/plugins/data/public';
 import { setState, LensGetState, LensDispatch } from '..';
 import { getResolvedDateRange } from '../../utils';
 
diff --git a/x-pack/plugins/lens/public/state_management/init_middleware/index.ts b/x-pack/plugins/lens/public/state_management/init_middleware/index.ts
index 164941d5d5f89..0858d9d8af783 100644
--- a/x-pack/plugins/lens/public/state_management/init_middleware/index.ts
+++ b/x-pack/plugins/lens/public/state_management/init_middleware/index.ts
@@ -6,11 +6,11 @@
  */
 
 import { Dispatch, MiddlewareAPI, PayloadAction } from '@reduxjs/toolkit';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { LensStoreDeps } from '..';
 import { loadInitial as loadInitialAction } from '..';
 import { loadInitial } from './load_initial';
 import { readFromStorage } from '../../settings_storage';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { AUTO_APPLY_DISABLED_STORAGE_KEY } from '../../editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper';
 
 const autoApplyDisabled = () => {
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.test.ts b/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
index 4a183c11d896b..1896db481dbed 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { EnhancedStore } from '@reduxjs/toolkit';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import {
   switchDatasource,
   switchVisualization,
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.ts b/x-pack/plugins/lens/public/state_management/lens_slice.ts
index 959db8ca006fe..df728e2bf8501 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.ts
@@ -6,7 +6,7 @@
  */
 
 import { createAction, createReducer, current, PayloadAction } from '@reduxjs/toolkit';
-import { VisualizeFieldContext } from 'src/plugins/ui_actions/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import { mapValues } from 'lodash';
 import { History } from 'history';
 import { LensEmbeddableInput } from '..';
@@ -632,6 +632,7 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
           ? (current(state.activeData) as TableInspectorAdapter)
           : undefined,
         datasourceLayers: getDatasourceLayers(state.datasourceStates, datasourceMap),
+        dateRange: current(state.resolvedDateRange),
       };
 
       const activeDatasource = datasourceMap[state.activeDatasourceId];
@@ -690,6 +691,7 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
             ? (current(state.activeData) as TableInspectorAdapter)
             : undefined,
           datasourceLayers: getDatasourceLayers(state.datasourceStates, datasourceMap),
+          dateRange: current(state.resolvedDateRange),
         },
         activeVisualization,
         activeDatasource,
diff --git a/x-pack/plugins/lens/public/state_management/selectors.ts b/x-pack/plugins/lens/public/state_management/selectors.ts
index 351496ca3e37b..57cb43452232a 100644
--- a/x-pack/plugins/lens/public/state_management/selectors.ts
+++ b/x-pack/plugins/lens/public/state_management/selectors.ts
@@ -6,8 +6,8 @@
  */
 
 import { createSelector } from '@reduxjs/toolkit';
-import { FilterManager } from 'src/plugins/data/public';
-import { SavedObjectReference } from 'kibana/public';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { SavedObjectReference } from '@kbn/core/public';
 import { LensState } from './types';
 import { Datasource, DatasourceMap, VisualizationMap } from '../types';
 import { getDatasourceLayers } from '../editor_frame_service/editor_frame';
@@ -162,11 +162,13 @@ export const selectFramePublicAPI = createSelector(
     selectCurrentDatasourceStates,
     selectActiveData,
     selectInjectedDependencies as SelectInjectedDependenciesFunction<DatasourceMap>,
+    selectResolvedDateRange,
   ],
-  (datasourceStates, activeData, datasourceMap) => {
+  (datasourceStates, activeData, datasourceMap, dateRange) => {
     return {
       datasourceLayers: getDatasourceLayers(datasourceStates, datasourceMap),
       activeData,
+      dateRange,
     };
   }
 );
diff --git a/x-pack/plugins/lens/public/state_management/types.ts b/x-pack/plugins/lens/public/state_management/types.ts
index 0c902f944072d..efba6312e8ba6 100644
--- a/x-pack/plugins/lens/public/state_management/types.ts
+++ b/x-pack/plugins/lens/public/state_management/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { VisualizeFieldContext } from 'src/plugins/ui_actions/public';
-import { EmbeddableEditorState } from 'src/plugins/embeddable/public';
+import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
+import { EmbeddableEditorState } from '@kbn/embeddable-plugin/public';
 import { Filter } from '@kbn/es-query';
-import { Query, SavedQuery } from '../../../../../src/plugins/data/public';
+import { Query, SavedQuery } from '@kbn/data-plugin/public';
 import { Document } from '../persistence';
 
 import { TableInspectorAdapter } from '../editor_frame_service/types';
diff --git a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
index 321f87d42fc39..084bd65b70d31 100644
--- a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { DiscoverStart } from '../../../../../src/plugins/discover/public';
-import type { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { DOC_TYPE } from '../../common';
 import { Embeddable } from '../embeddable';
 import { createOpenInDiscoverAction } from './open_in_discover_action';
diff --git a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts
index d2b4c787f1304..bd666f52bf0bc 100644
--- a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { IEmbeddable } from 'src/plugins/embeddable/public';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { Embeddable } from '../embeddable';
-import type { DiscoverStart } from '../../../../../src/plugins/discover/public';
 import { DOC_TYPE } from '../../common';
-import { getShowUnderlyingDataLabel } from '../app_plugin/show_underlying_data';
 
 const ACTION_OPEN_IN_DISCOVER = 'ACTION_OPEN_IN_DISCOVER';
 
@@ -20,7 +20,10 @@ export const createOpenInDiscoverAction = (discover: DiscoverStart, hasDiscoverA
     id: ACTION_OPEN_IN_DISCOVER,
     order: 19, // right after Inspect which is 20
     getIconType: () => 'popout',
-    getDisplayName: () => getShowUnderlyingDataLabel(),
+    getDisplayName: () =>
+      i18n.translate('xpack.lens.app.exploreDataInDiscover', {
+        defaultMessage: 'Explore data in Discover',
+      }),
     isCompatible: async (context: { embeddable: IEmbeddable }) => {
       if (!hasDiscoverAccess) return false;
       return (
diff --git a/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts b/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts
index 4e105ed9db499..4f5c9aaad7c42 100644
--- a/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/visualize_field_actions.ts
@@ -10,8 +10,8 @@ import {
   createAction,
   ACTION_VISUALIZE_LENS_FIELD,
   VisualizeFieldContext,
-} from '../../../../../src/plugins/ui_actions/public';
-import type { ApplicationStart } from '../../../../../src/core/public';
+} from '@kbn/ui-actions-plugin/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 export const visualizeFieldAction = (application: ApplicationStart) =>
   createAction<VisualizeFieldContext>({
diff --git a/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts b/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts
index 6694efac7bec7..535bfa14ba5c8 100644
--- a/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/visualize_tsvb_actions.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { ACTION_CONVERT_TO_LENS } from '../../../../../src/plugins/visualizations/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { ACTION_CONVERT_TO_LENS } from '@kbn/visualizations-plugin/public';
+import type { ApplicationStart } from '@kbn/core/public';
 import type { VisualizeEditorContext } from '../types';
-import type { ApplicationStart } from '../../../../../src/core/public';
 
 export const visualizeTSVBAction = (application: ApplicationStart) =>
   createAction<{ [key: string]: VisualizeEditorContext }>({
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 8d2a5b881392e..22d794e803df1 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -6,9 +6,13 @@
  */
 import { Ast } from '@kbn/interpreter';
 import type { IconType } from '@elastic/eui/src/components/icon/icon';
-import type { CoreSetup, SavedObjectReference, SavedObjectsResolveResponse } from 'kibana/public';
+import type {
+  CoreSetup,
+  SavedObjectReference,
+  SavedObjectsResolveResponse,
+} from '@kbn/core/public';
 import type { PaletteOutput } from '@kbn/coloring';
-import type { TopNavMenuData } from 'src/plugins/navigation/public';
+import type { TopNavMenuData } from '@kbn/navigation-plugin/public';
 import type { MutableRefObject } from 'react';
 import { Filter } from '@kbn/es-query';
 import type {
@@ -16,26 +20,23 @@ import type {
   ExpressionRendererEvent,
   IInterpreterRenderHandlers,
   Datatable,
-} from '../../../../src/plugins/expressions/public';
-import type { VisualizeEditorLayersContext } from '../../../../src/plugins/visualizations/public';
+} from '@kbn/expressions-plugin/public';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
+import type { Query } from '@kbn/data-plugin/public';
+import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
+import type {
+  UiActionsStart,
+  RowClickContext,
+  VisualizeFieldContext,
+} from '@kbn/ui-actions-plugin/public';
 import { DraggingIdentifier, DragDropIdentifier, DragContextState } from './drag_drop';
 import type { DateRange, LayerType, SortingHint } from '../common';
-import type { Query } from '../../../../src/plugins/data/public';
-import type {
-  RangeSelectContext,
-  ValueClickContext,
-} from '../../../../src/plugins/embeddable/public';
 import type {
   LensSortActionData,
   LensResizeActionData,
   LensToggleActionData,
   LensPagesizeActionData,
 } from './datatable_visualization/components/types';
-import type {
-  UiActionsStart,
-  RowClickContext,
-  VisualizeFieldContext,
-} from '../../../../src/plugins/ui_actions/public';
 
 import {
   LENS_EDIT_SORT_ACTION,
@@ -476,7 +477,13 @@ export type DatasourceDimensionDropHandlerProps<T> = DatasourceDimensionDropProp
   dropType: DropType;
 };
 
-export type FieldOnlyDataType = 'document' | 'ip' | 'histogram' | 'geo_point' | 'geo_shape';
+export type FieldOnlyDataType =
+  | 'document'
+  | 'ip'
+  | 'histogram'
+  | 'geo_point'
+  | 'geo_shape'
+  | 'murmur3';
 export type DataType = 'string' | 'number' | 'date' | 'boolean' | FieldOnlyDataType;
 
 // An operation represents a column in a table, not any information
@@ -585,7 +592,7 @@ interface VisualizationDimensionChangeProps<T> {
   layerId: string;
   columnId: string;
   prevState: T;
-  frame: Pick<FramePublicAPI, 'datasourceLayers' | 'activeData'>;
+  frame: FramePublicAPI;
 }
 export interface Suggestion {
   visualizationId: string;
@@ -677,9 +684,11 @@ export interface VisualizationSuggestion<T = unknown> {
   previewIcon: IconType;
 }
 
+export type DatasourceLayers = Record<string, DatasourcePublicAPI>;
+
 export interface FramePublicAPI {
-  datasourceLayers: Record<string, DatasourcePublicAPI>;
-  appliedDatasourceLayers?: Record<string, DatasourcePublicAPI>; // this is only set when auto-apply is turned off
+  datasourceLayers: DatasourceLayers;
+  dateRange: DateRange;
   /**
    * Data of the chart currently rendered in the preview.
    * This data might be not available (e.g. if the chart can't be rendered) or outdated and belonging to another chart.
@@ -688,7 +697,6 @@ export interface FramePublicAPI {
   activeData?: Record<string, Datatable>;
 }
 export interface FrameDatasourceAPI extends FramePublicAPI {
-  dateRange: DateRange;
   query: Query;
   filters: Filter[];
 }
@@ -878,7 +886,7 @@ export interface Visualization<T = unknown> {
 
   toExpression: (
     state: T,
-    datasourceLayers: Record<string, DatasourcePublicAPI>,
+    datasourceLayers: DatasourceLayers,
     attributes?: Partial<{ title: string; description: string }>
   ) => ExpressionAstExpression | string | null;
   /**
@@ -887,7 +895,7 @@ export interface Visualization<T = unknown> {
    */
   toPreviewExpression?: (
     state: T,
-    datasourceLayers: Record<string, DatasourcePublicAPI>
+    datasourceLayers: DatasourceLayers
   ) => ExpressionAstExpression | string | null;
   /**
    * The frame will call this function on all visualizations at few stages (pre-build/build error) in order
@@ -895,7 +903,7 @@ export interface Visualization<T = unknown> {
    */
   getErrorMessages: (
     state: T,
-    datasourceLayers?: Record<string, DatasourcePublicAPI>
+    datasourceLayers?: DatasourceLayers
   ) =>
     | Array<{
         shortMessage: string;
diff --git a/x-pack/plugins/lens/public/utils.test.ts b/x-pack/plugins/lens/public/utils.test.ts
index 857f30e692305..1d39c830c5b10 100644
--- a/x-pack/plugins/lens/public/utils.test.ts
+++ b/x-pack/plugins/lens/public/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datatable } from 'src/plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { inferTimeField } from './utils';
 
 const table: Datatable = {
diff --git a/x-pack/plugins/lens/public/utils.ts b/x-pack/plugins/lens/public/utils.ts
index 09fed81d34602..b5ada350b2aaa 100644
--- a/x-pack/plugins/lens/public/utils.ts
+++ b/x-pack/plugins/lens/public/utils.ts
@@ -8,9 +8,10 @@ import { uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
 
-import type { TimefilterContract } from 'src/plugins/data/public';
-import type { IUiSettingsClient, SavedObjectReference } from 'kibana/public';
-import type { DataView, DataViewsContract } from '../../../../src/plugins/data_views/public';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient, SavedObjectReference } from '@kbn/core/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { search } from '@kbn/data-plugin/public';
 import type { Document } from './persistence/saved_object_store';
 import type {
   Datasource,
@@ -19,7 +20,6 @@ import type {
   LensFilterEvent,
   Visualization,
 } from './types';
-import { search } from '../../../../src/plugins/data/public';
 import type { DatasourceStates, VisualizationState } from './state_management';
 
 export function getVisualizeGeoFieldMessage(fieldType: string) {
diff --git a/x-pack/plugins/lens/public/vis_type_alias.ts b/x-pack/plugins/lens/public/vis_type_alias.ts
index 96332e07069b0..be8a5620ce614 100644
--- a/x-pack/plugins/lens/public/vis_type_alias.ts
+++ b/x-pack/plugins/lens/public/vis_type_alias.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { VisTypeAlias } from 'src/plugins/visualizations/public';
+import type { VisTypeAlias } from '@kbn/visualizations-plugin/public';
 import { getBasePath, getEditPath } from '../common/constants';
 
 export const getLensAliasConfig = (): VisTypeAlias => ({
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/constants.ts b/x-pack/plugins/lens/public/visualizations/gauge/constants.ts
index 134b3bee70c8c..3c6ab9f8471b8 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/constants.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/constants.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { GaugeState as GaugeStateOriginal } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
-import { LayerType } from '../../../common/';
+import { GaugeState as GaugeStateOriginal } from '@kbn/expression-gauge-plugin/common';
+import { LayerType } from '../../../common';
 
 export const LENS_GAUGE_ID = 'lnsGauge';
 
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
index 3f7454f33c755..056b96619949d 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
@@ -23,20 +23,10 @@ import {
   CUSTOM_PALETTE,
   FIXED_PROGRESSION,
 } from '@kbn/coloring';
-import {
-  GaugeTicksPositions,
-  GaugeColorModes,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
-import {
-  getMaxValue,
-  getMinValue,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/public';
+import { GaugeTicksPositions, GaugeColorModes } from '@kbn/expression-gauge-plugin/common';
+import { getMaxValue, getMinValue } from '@kbn/expression-gauge-plugin/public';
 import { isNumericFieldForDatatable } from '../../../common/expressions';
-import {
-  applyPaletteParams,
-  PalettePanelContainer,
-  TooltipWrapper,
-} from '../../shared_components/';
+import { applyPaletteParams, PalettePanelContainer, TooltipWrapper } from '../../shared_components';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import './dimension_editor.scss';
 import { GaugeVisualizationState } from './constants';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/index.ts b/x-pack/plugins/lens/public/visualizations/gauge/index.ts
index f683ef54b4857..26973009c4f6a 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/index.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { EditorFrameSetup } from '../../types';
-import type { ChartsPluginSetup } from '../../../../../../src/plugins/charts/public';
 import { transparentizePalettes } from './palette_config';
 
 export interface GaugeVisualizationPluginSetupPlugins {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts
index fe468dd82e3cf..f144a2f9f87f4 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { transparentizePalettes } from './palette_config';
-import { chartPluginMock } from '../../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
 const paletteServiceMock = chartPluginMock.createPaletteRegistry();
 
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx
index 877e7b0bdcf41..9588262a6b992 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/palette_config.tsx
@@ -14,7 +14,7 @@ import {
 } from '@kbn/coloring';
 
 import Color from 'color';
-import { defaultPaletteParams as sharedDefaultParams } from '../../shared_components/';
+import { defaultPaletteParams as sharedDefaultParams } from '../../shared_components';
 
 export const DEFAULT_PALETTE_NAME = 'gray';
 export const DEFAULT_COLOR_STEPS = 3;
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts
index 630978f69a1dd..0b974cd3de8f3 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.test.ts
@@ -7,7 +7,7 @@
 
 import { getSuggestions } from './suggestions';
 import { layerTypes } from '../../../common';
-import { GaugeShapes } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import { GaugeShapes } from '@kbn/expression-gauge-plugin/common';
 import { GaugeVisualizationState } from './constants';
 
 const metricColumn = {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts
index d99d585b4c447..46688d3021fe6 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/suggestions.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { GaugeShape } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { GaugeShape } from '@kbn/expression-gauge-plugin/common';
 import {
   GaugeShapes,
   GaugeTicksPositions,
   GaugeLabelMajorModes,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+} from '@kbn/expression-gauge-plugin/common';
 import type { TableSuggestion, Visualization } from '../../types';
 import { layerTypes } from '../../../common';
 import { GaugeVisualizationState } from './constants';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx
index 1c3a5fdea5593..d203cc86f5de8 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/gauge_toolbar.test.tsx
@@ -7,7 +7,7 @@
 
 import React, { FormEvent } from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { ToolbarButton } from 'src/plugins/kibana_react/public';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { FramePublicAPI, VisualizationToolbarProps } from '../../../types';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
index efa6e49a2bdbd..81f4c8f6d1170 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
@@ -8,7 +8,7 @@
 import React, { memo, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { GaugeLabelMajorMode } from '../../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { GaugeLabelMajorMode } from '@kbn/expression-gauge-plugin/common';
 import type { VisualizationToolbarProps } from '../../../types';
 import { ToolbarPopover, useDebouncedValue, VisLabel } from '../../../shared_components';
 import './gauge_config_panel.scss';
@@ -30,9 +30,9 @@ export const GaugeToolbar = memo((props: VisualizationToolbarProps<GaugeVisualiz
   });
 
   return (
-    <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
           <ToolbarPopover
             handleClose={() => {
               setSubtitleMode(inputValue.labelMinor ? 'custom' : 'none');
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/utils.ts b/x-pack/plugins/lens/public/visualizations/gauge/utils.ts
index 353db3bf7a43b..5c95e1205568c 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/utils.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/utils.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Accessors } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { Accessors } from '@kbn/expression-gauge-plugin/common';
 import { GaugeVisualizationState } from './constants';
 
 export const getAccessorsFromState = (state?: GaugeVisualizationState): Accessors | undefined => {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts
index 58637b95fce67..25b9aa0fc65b9 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.test.ts
@@ -9,8 +9,8 @@ import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
 import { getGaugeVisualization, isNumericDynamicMetric, isNumericMetric } from './visualization';
 import { createMockDatasource, createMockFramePublicAPI } from '../../mocks';
 import { GROUP_ID } from './constants';
-import type { DatasourcePublicAPI, OperationDescriptor } from '../../types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import type { DatasourceLayers, OperationDescriptor } from '../../types';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { layerTypes } from '../../../common';
 import type { GaugeVisualizationState } from './constants';
 
@@ -455,7 +455,7 @@ describe('gauge', () => {
   });
 
   describe('#toExpression', () => {
-    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+    let datasourceLayers: DatasourceLayers;
     beforeEach(() => {
       const mockDatasource = createMockDatasource('testDatasource');
       mockDatasource.publicAPIMock.getOperationForColumnId.mockReturnValue({
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx
index 72d0db1c851b1..74f7d518e1166 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx
@@ -10,13 +10,10 @@ import { render } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { Ast } from '@kbn/interpreter';
-import { DatatableRow } from 'src/plugins/expressions';
+import { DatatableRow } from '@kbn/expressions-plugin';
 import { PaletteRegistry, CustomPaletteParams, CUSTOM_PALETTE } from '@kbn/coloring';
-import type { GaugeArguments } from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
-import {
-  GaugeShapes,
-  EXPRESSION_GAUGE_NAME,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/common';
+import type { GaugeArguments } from '@kbn/expression-gauge-plugin/common';
+import { GaugeShapes, EXPRESSION_GAUGE_NAME } from '@kbn/expression-gauge-plugin/common';
 import {
   getGoalValue,
   getMaxValue,
@@ -24,8 +21,8 @@ import {
   getValueFromAccessor,
   VerticalBulletIcon,
   HorizontalBulletIcon,
-} from '../../../../../../src/plugins/chart_expressions/expression_gauge/public';
-import type { DatasourcePublicAPI, OperationMetadata, Visualization } from '../../types';
+} from '@kbn/expression-gauge-plugin/public';
+import type { DatasourceLayers, OperationMetadata, Visualization } from '../../types';
 import { getSuggestions } from './suggestions';
 import {
   GROUP_ID,
@@ -115,7 +112,7 @@ const checkInvalidConfiguration = (row?: DatatableRow, state?: GaugeVisualizatio
 const toExpression = (
   paletteService: PaletteRegistry,
   state: GaugeVisualizationState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   attributes?: Partial<Omit<GaugeArguments, keyof GaugeExpressionState | 'ariaLabel'>>
 ): Ast | null => {
   const datasource = datasourceLayers[state.layerId];
diff --git a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts
index fbf13db7fa7a5..1e02f929e90ce 100644
--- a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.test.ts
@@ -8,13 +8,17 @@
 import { FramePublicAPI } from '../../types';
 import { getStaticDate } from './helpers';
 
+const frame = {
+  datasourceLayers: {},
+  dateRange: { fromDate: '2022-02-01T00:00:00.000Z', toDate: '2022-04-20T00:00:00.000Z' },
+};
+
 describe('annotations helpers', () => {
   describe('getStaticDate', () => {
-    it('should return `now` value on when nothing is configured', () => {
-      jest.spyOn(Date, 'now').mockReturnValue(new Date('2022-04-08T11:01:58.135Z').valueOf());
-      expect(getStaticDate([], undefined)).toBe('2022-04-08T11:01:58.135Z');
+    it('should return the middle of the date range on when nothing is configured', () => {
+      expect(getStaticDate([], frame)).toBe('2022-03-12T00:00:00.000Z');
     });
-    it('should return `now` value on when there is no active data', () => {
+    it('should return the middle of the date range value on when there is no active data', () => {
       expect(
         getStaticDate(
           [
@@ -26,9 +30,9 @@ describe('annotations helpers', () => {
               xAccessor: 'a',
             },
           ],
-          undefined
+          frame
         )
-      ).toBe('2022-04-08T11:01:58.135Z');
+      ).toBe('2022-03-12T00:00:00.000Z');
     });
 
     it('should return timestamp value for single active data point', () => {
@@ -66,11 +70,57 @@ describe('annotations helpers', () => {
               xAccessor: 'a',
             },
           ],
-          activeData as FramePublicAPI['activeData']
+          {
+            ...frame,
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
         )
       ).toBe('2022-02-27T23:00:00.000Z');
     });
 
+    it('should return the middle of the date range value on when there the active data lies outside of the timerange (auto apply off case)', () => {
+      const activeData = {
+        layerId: {
+          type: 'datatable',
+          rows: [
+            {
+              a: 1642673600000, // smaller than dateRange.fromDate
+              b: 1050,
+            },
+          ],
+          columns: [
+            {
+              id: 'a',
+              name: 'order_date per week',
+              meta: { type: 'date' },
+            },
+            {
+              id: 'b',
+              name: 'Count of records',
+              meta: { type: 'number', params: { id: 'number' } },
+            },
+          ],
+        },
+      };
+      expect(
+        getStaticDate(
+          [
+            {
+              layerId: 'layerId',
+              accessors: ['b'],
+              seriesType: 'bar_stacked',
+              layerType: 'data',
+              xAccessor: 'a',
+            },
+          ],
+          {
+            ...frame,
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
+        )
+      ).toBe('2022-03-12T00:00:00.000Z');
+    });
+
     it('should correctly calculate middle value for active data', () => {
       const activeData = {
         layerId: {
@@ -118,7 +168,10 @@ describe('annotations helpers', () => {
               xAccessor: 'a',
             },
           ],
-          activeData as FramePublicAPI['activeData']
+          {
+            ...frame,
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
         )
       ).toBe('2022-03-26T05:00:00.000Z');
     });
@@ -202,7 +255,11 @@ describe('annotations helpers', () => {
               xAccessor: 'd',
             },
           ],
-          activeData as FramePublicAPI['activeData']
+          {
+            ...frame,
+            dateRange: { fromDate: '2020-02-01T00:00:00.000Z', toDate: '2022-09-20T00:00:00.000Z' },
+            activeData: activeData as FramePublicAPI['activeData'],
+          }
         )
       ).toBe('2020-08-24T12:06:40.000Z');
     });
diff --git a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx
index c7370c17c6fec..fe120dc71b17a 100644
--- a/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/annotations/helpers.tsx
@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
+import { defaultAnnotationColor } from '@kbn/event-annotation-plugin/public';
 import { layerTypes } from '../../../common';
 import type { FramePublicAPI, Visualization } from '../../types';
 import { isHorizontalChart } from '../state_helpers';
@@ -20,7 +21,6 @@ import {
 } from '../visualization_helpers';
 import { LensIconChartBarAnnotations } from '../../assets/chart_bar_annotations';
 import { generateId } from '../../id_generator';
-import { defaultAnnotationColor } from '../../../../../../src/plugins/event_annotation/public';
 
 const MAX_DATE = 8640000000000000;
 const MIN_DATE = -8640000000000000;
@@ -29,13 +29,14 @@ export const defaultAnnotationLabel = i18n.translate('xpack.lens.xyChart.default
   defaultMessage: 'Event',
 });
 
-export function getStaticDate(
-  dataLayers: XYDataLayerConfig[],
-  activeData: FramePublicAPI['activeData']
-) {
-  const fallbackValue = moment().toISOString();
-
+export function getStaticDate(dataLayers: XYDataLayerConfig[], frame: FramePublicAPI) {
   const dataLayersId = dataLayers.map(({ layerId }) => layerId);
+  const { activeData, dateRange } = frame;
+
+  const dateRangeMinValue = moment(dateRange.fromDate).valueOf();
+  const dateRangeMaxValue = moment(dateRange.toDate).valueOf();
+  const fallbackValue = moment((dateRangeMinValue + dateRangeMaxValue) / 2).toISOString();
+
   if (
     !activeData ||
     Object.entries(activeData)
@@ -57,7 +58,11 @@ export function getStaticDate(
     return lastTimestamp && lastTimestamp > acc ? lastTimestamp : acc;
   }, MIN_DATE);
   const middleDate = (minDate + maxDate) / 2;
-  return moment(middleDate).toISOString();
+
+  if (dateRangeMinValue < middleDate && dateRangeMaxValue > middleDate) {
+    return moment(middleDate).toISOString();
+  }
+  return fallbackValue;
 }
 
 export const getAnnotationsSupportedLayer = (
@@ -124,7 +129,7 @@ export const setAnnotationsDimension: Visualization<XYState>['setDimension'] = (
       label: defaultAnnotationLabel,
       key: {
         type: 'point_in_time',
-        timestamp: getStaticDate(getDataLayers(prevState.layers), frame?.activeData),
+        timestamp: getStaticDate(getDataLayers(prevState.layers), frame),
       },
       icon: 'triangle',
       ...previousConfig,
@@ -167,7 +172,7 @@ export const getAnnotationsConfiguration = ({
   layer,
 }: {
   state: XYState;
-  frame: FramePublicAPI;
+  frame: Pick<FramePublicAPI, 'datasourceLayers'>;
   layer: XYAnnotationLayerConfig;
 }) => {
   const dataLayers = getDataLayers(state.layers);
diff --git a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts
index a733f83b46338..db8ae7122c538 100644
--- a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { DataLayerConfigResult } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { DataLayerConfigResult } from '@kbn/expression-xy-plugin/common';
 import { layerTypes } from '../../common';
-import { Datatable } from '../../../../../src/plugins/expressions/public';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { getAxesConfiguration } from './axes_configuration';
 
 describe('axes_configuration', () => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts
index b9b2c2ae86e42..786c184e20dfa 100644
--- a/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/axes_configuration.ts
@@ -5,13 +5,10 @@
  * 2.0.
  */
 
+import { AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
+import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { FormatFactory } from '../../common';
-import { AxisExtentConfig } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { Datatable } from '../../../../../src/plugins/expressions/public';
-import type {
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../src/plugins/field_formats/common';
 import { XYDataLayerConfig } from './types';
 
 interface FormattedMetric {
diff --git a/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts b/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
index 462551e168aa6..e927266a8385c 100644
--- a/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
@@ -7,7 +7,7 @@
 
 import { uniq, mapValues } from 'lodash';
 import type { PaletteOutput, PaletteRegistry } from '@kbn/coloring';
-import type { Datatable } from 'src/plugins/expressions';
+import type { Datatable } from '@kbn/expressions-plugin';
 import { euiLightVars } from '@kbn/ui-theme';
 import type { AccessorConfig, FramePublicAPI } from '../types';
 import { getColumnToLabelMap } from './state_helpers';
diff --git a/x-pack/plugins/lens/public/xy_visualization/index.ts b/x-pack/plugins/lens/public/xy_visualization/index.ts
index daae9a5ef56ff..f9f1558468cfc 100644
--- a/x-pack/plugins/lens/public/xy_visualization/index.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/index.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/public';
-import { EventAnnotationPluginSetup } from '../../../../../src/plugins/event_annotation/public';
-import type { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
+import type { CoreSetup } from '@kbn/core/public';
+import { EventAnnotationPluginSetup } from '@kbn/event-annotation-plugin/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { LEGACY_TIME_AXIS } from '@kbn/charts-plugin/common';
 import type { EditorFrameSetup } from '../types';
-import type { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import type { LensPluginStartDependencies } from '../plugin';
 import type { FormatFactory } from '../../common';
-import { LEGACY_TIME_AXIS } from '../../../../../src/plugins/charts/common';
 
 export interface XyVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
diff --git a/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx
index af679d1354792..c7e615bb29e12 100644
--- a/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/reference_line_helpers.tsx
@@ -7,13 +7,10 @@
 
 import { groupBy, partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import type { YAxisMode, YConfig } from '@kbn/expression-xy-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/public';
 import { layerTypes } from '../../common';
-import type {
-  YAxisMode,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { Datatable } from '../../../../../src/plugins/expressions/public';
-import type { DatasourcePublicAPI, FramePublicAPI, Visualization } from '../types';
+import type { DatasourceLayers, FramePublicAPI, Visualization } from '../types';
 import { groupAxesByType } from './axes_configuration';
 import { isHorizontalChart, isPercentageSeries, isStackedChart } from './state_helpers';
 import type { XYState, XYDataLayerConfig, XYReferenceLineLayerConfig } from './types';
@@ -40,7 +37,7 @@ export interface ReferenceLineBase {
 export function getGroupsToShow<T extends ReferenceLineBase & { config?: YConfig[] }>(
   referenceLayers: T[],
   state: XYState | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   tables: Record<string, Datatable> | undefined
 ): Array<T & { valid: boolean }> {
   if (!state) {
@@ -60,7 +57,7 @@ export function getGroupsToShow<T extends ReferenceLineBase & { config?: YConfig
 export function getGroupsRelatedToData<T extends ReferenceLineBase>(
   referenceLayers: T[],
   state: XYState | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   tables: Record<string, Datatable> | undefined
 ): T[] {
   if (!state) {
@@ -75,7 +72,7 @@ export function getGroupsRelatedToData<T extends ReferenceLineBase>(
  */
 export function getGroupsAvailableInData(
   dataLayers: XYDataLayerConfig[],
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   tables: Record<string, Datatable> | undefined
 ) {
   const hasNumberHistogram = dataLayers.some(
@@ -384,7 +381,7 @@ export const getReferenceConfiguration = ({
   sortedAccessors,
 }: {
   state: XYState;
-  frame: FramePublicAPI;
+  frame: Pick<FramePublicAPI, 'activeData' | 'datasourceLayers'>;
   layer: XYReferenceLineLayerConfig;
   sortedAccessors: string[];
 }) => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts b/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
index d3c8efae33836..06ea897afa1e7 100644
--- a/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/state_helpers.ts
@@ -6,12 +6,8 @@
  */
 
 import { EuiIconType } from '@elastic/eui/src/components/icon/icon';
+import type { SeriesType, YConfig, ValidLayer } from '@kbn/expression-xy-plugin/common';
 import type { FramePublicAPI, DatasourcePublicAPI } from '../types';
-import type {
-  SeriesType,
-  YConfig,
-  ValidLayer,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import {
   visualizationTypes,
   XYLayerConfig,
diff --git a/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts b/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts
index c04781198c78f..7cd9a43540c0a 100644
--- a/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/to_expression.test.ts
@@ -7,15 +7,15 @@
 
 import { Ast } from '@kbn/interpreter';
 import { Position } from '@elastic/charts';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { getXyVisualization } from './xy_visualization';
 import { OperationDescriptor } from '../types';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { layerTypes } from '../../common';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { eventAnnotationServiceMock } from '../../../../../src/plugins/event_annotation/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
 import { defaultReferenceLineColor } from './color_assignment';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 describe('#toExpression', () => {
   const xyVisualization = getXyVisualization({
diff --git a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
index 7f1bd96b50044..eeb56bd7ee115 100644
--- a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
@@ -9,19 +9,16 @@ import { Ast } from '@kbn/interpreter';
 import { ScaleType } from '@elastic/charts';
 import type { PaletteRegistry } from '@kbn/coloring';
 
-import { EventAnnotationServiceType } from 'src/plugins/event_annotation/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import type { ValidLayer, YConfig } from '@kbn/expression-xy-plugin/common';
 import {
   State,
   XYDataLayerConfig,
   XYReferenceLineLayerConfig,
   XYAnnotationLayerConfig,
 } from './types';
-import { OperationMetadata, DatasourcePublicAPI } from '../types';
+import { OperationMetadata, DatasourcePublicAPI, DatasourceLayers } from '../types';
 import { getColumnToLabelMap } from './state_helpers';
-import type {
-  ValidLayer,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { hasIcon } from './xy_config_panel/shared/icon_select';
 import { defaultReferenceLineColor } from './color_assignment';
 import { getDefaultVisualValuesForLayer } from '../shared_components/datasource_default_values';
@@ -50,7 +47,7 @@ export const getSortedAccessors = (
 
 export const toExpression = (
   state: State,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Partial<{ title: string; description: string }> = {},
   eventAnnotationService: EventAnnotationServiceType
@@ -107,7 +104,7 @@ const simplifiedLayerExpression = {
 
 export function toPreviewExpression(
   state: State,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   eventAnnotationService: EventAnnotationServiceType
 ) {
@@ -158,7 +155,7 @@ export function getScaleType(metadata: OperationMetadata | null, defaultScale: S
 export const buildExpression = (
   state: State,
   metadata: Record<string, Record<string, OperationMetadata | null>>,
-  datasourceLayers: Record<string, DatasourcePublicAPI>,
+  datasourceLayers: DatasourceLayers,
   paletteService: PaletteRegistry,
   attributes: Partial<{ title: string; description: string }> = {},
   eventAnnotationService: EventAnnotationServiceType
diff --git a/x-pack/plugins/lens/public/xy_visualization/types.ts b/x-pack/plugins/lens/public/xy_visualization/types.ts
index 5c8e9c73a66bc..276e338807a35 100644
--- a/x-pack/plugins/lens/public/xy_visualization/types.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/types.ts
@@ -7,6 +7,18 @@
 
 import { i18n } from '@kbn/i18n';
 import type { PaletteOutput } from '@kbn/coloring';
+import type {
+  SeriesType,
+  LegendConfig,
+  AxisExtentConfig,
+  XYCurveType,
+  AxesSettingsConfig,
+  FittingFunction,
+  LabelsOrientationConfig,
+  EndValue,
+  YConfig,
+} from '@kbn/expression-xy-plugin/common';
+import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common';
 import { LensIconChartArea } from '../assets/chart_area';
 import { LensIconChartAreaStacked } from '../assets/chart_area_stacked';
 import { LensIconChartAreaPercentage } from '../assets/chart_area_percentage';
@@ -19,18 +31,6 @@ import { LensIconChartBarHorizontalPercentage } from '../assets/chart_bar_horizo
 import { LensIconChartLine } from '../assets/chart_line';
 
 import type { VisualizationType, Suggestion } from '../types';
-import type {
-  SeriesType,
-  LegendConfig,
-  AxisExtentConfig,
-  XYCurveType,
-  AxesSettingsConfig,
-  FittingFunction,
-  LabelsOrientationConfig,
-  EndValue,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
-import { EventAnnotationConfig } from '../../../../../src/plugins/event_annotation/common';
 import type { ValueLabelConfig } from '../../common/types';
 
 export interface XYDataLayerConfig {
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
index 18cd16c17b365..e1c63e4bb54d9 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
@@ -16,17 +16,17 @@ import type {
   XYDataLayerConfig,
   XYReferenceLineLayerConfig,
 } from './types';
-import type { SeriesType } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { SeriesType } from '@kbn/expression-xy-plugin/common';
 import { layerTypes } from '../../common';
 import { createMockDatasource, createMockFramePublicAPI } from '../mocks';
 import { LensIconChartBar } from '../assets/chart_bar';
-import type { VisualizeEditorLayersContext } from '../../../../../src/plugins/visualizations/public';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { Datatable } from 'src/plugins/expressions';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
-import { eventAnnotationServiceMock } from 'src/plugins/event_annotation/public/mocks';
-import { EventAnnotationConfig } from 'src/plugins/event_annotation/common';
+import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { Datatable } from '@kbn/expressions-plugin';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
+import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common';
 
 const exampleAnnotation: EventAnnotationConfig = {
   id: 'an1',
@@ -332,16 +332,18 @@ describe('xy_visualization', () => {
         { columnId: 'c', fields: [] },
       ]);
 
-      frame.datasourceLayers = {
-        first: mockDatasource.publicAPIMock,
-      };
-
-      frame.activeData = {
-        first: {
-          type: 'datatable',
-          rows: [],
-          columns: [],
+      frame = {
+        datasourceLayers: {
+          first: mockDatasource.publicAPIMock,
+        },
+        activeData: {
+          first: {
+            type: 'datatable',
+            rows: [],
+            columns: [],
+          },
         },
+        dateRange: { fromDate: '2022-04-10T00:00:00.000Z', toDate: '2022-04-20T00:00:00.000Z' },
       };
     });
 
@@ -436,7 +438,6 @@ describe('xy_visualization', () => {
 
     describe('annotations', () => {
       it('should add a dimension to a annotation layer', () => {
-        jest.spyOn(Date, 'now').mockReturnValue(new Date('2022-04-18T11:01:58.135Z').valueOf());
         expect(
           xyVisualization.setDimension({
             frame,
@@ -463,7 +464,7 @@ describe('xy_visualization', () => {
               icon: 'triangle',
               id: 'newCol',
               key: {
-                timestamp: '2022-04-18T11:01:58.135Z',
+                timestamp: '2022-04-15T00:00:00.000Z',
                 type: 'point_in_time',
               },
               label: 'Event',
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
index d8fae2657db23..d67adb3b860e3 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
@@ -11,22 +11,17 @@ import { Position } from '@elastic/charts';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { ThemeServiceStart } from 'kibana/public';
-import { EventAnnotationServiceType } from '../../../../../src/plugins/event_annotation/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../../../../src/plugins/visualizations/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
+import { FillStyle, SeriesType, YAxisMode, YConfig } from '@kbn/expression-xy-plugin/common';
 import { getSuggestions } from './xy_suggestions';
 import { XyToolbar } from './xy_config_panel';
 import { DimensionEditor } from './xy_config_panel/dimension_editor';
 import { LayerHeader } from './xy_config_panel/layer_header';
 import type { Visualization, AccessorConfig, FramePublicAPI } from '../types';
-import {
-  FillStyle,
-  SeriesType,
-  YAxisMode,
-  YConfig,
-} from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { State, visualizationTypes, XYSuggestion, XYLayerConfig, XYDataLayerConfig } from './types';
 import { layerTypes } from '../../common';
 import { isHorizontalChart } from './state_helpers';
@@ -663,7 +658,7 @@ const getMappedAccessors = ({
   layer,
 }: {
   accessors: string[];
-  frame: FramePublicAPI;
+  frame: Pick<FramePublicAPI, 'activeData' | 'datasourceLayers'>;
   paletteService: PaletteRegistry;
   fieldFormats: FieldFormatsStart;
   state: XYState;
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx b/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx
index d680494ef8315..d390d081258a5 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization_helpers.tsx
@@ -7,7 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
-import { DatasourcePublicAPI, OperationMetadata, VisualizationType } from '../types';
+import { SeriesType } from '@kbn/expression-xy-plugin/common';
+import { DatasourceLayers, OperationMetadata, VisualizationType } from '../types';
 import {
   State,
   visualizationTypes,
@@ -18,7 +19,6 @@ import {
   XYReferenceLineLayerConfig,
 } from './types';
 import { isHorizontalChart } from './state_helpers';
-import { SeriesType } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { layerTypes } from '..';
 import { LensIconChartBarHorizontal } from '../assets/chart_bar_horizontal';
 import { LensIconChartMixedXy } from '../assets/chart_mixed_xy';
@@ -63,10 +63,7 @@ export function getAxisName(
 // * 2 or more layers
 // * at least one with date histogram
 // * at least one with interval function
-export function checkXAccessorCompatibility(
-  state: XYState,
-  datasourceLayers: Record<string, DatasourcePublicAPI>
-) {
+export function checkXAccessorCompatibility(state: XYState, datasourceLayers: DatasourceLayers) {
   const dataLayers = getDataLayers(state.layers);
   const errors = [];
   const hasDateHistogramSet = dataLayers.some(
@@ -116,7 +113,7 @@ export function checkXAccessorCompatibility(
 export function checkScaleOperation(
   scaleType: 'ordinal' | 'interval' | 'ratio',
   dataType: 'date' | 'number' | 'string' | undefined,
-  datasourceLayers: Record<string, DatasourcePublicAPI>
+  datasourceLayers: DatasourceLayers
 ) {
   return (layer: XYDataLayerConfig) => {
     const datasourceAPI = datasourceLayers[layer.layerId];
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx
index 647626b9e6282..6435f4c7ba2b8 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/annotations_config_panel/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiDatePicker, EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
 import moment from 'moment';
-import { EventAnnotationConfig } from 'src/plugins/event_annotation/common/types';
+import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common/types';
 import type { VisualizationDimensionEditorProps } from '../../../types';
 import { State, XYState, XYAnnotationLayerConfig } from '../../types';
 import { FormatFactory } from '../../../../common';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx
index 87ccf41e91143..b5c45cd517432 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.test.tsx
@@ -89,11 +89,9 @@ describe('Axes Settings', () => {
     expect(props.setOrientation).toHaveBeenCalled();
   });
 
-  it('should disable the orientation group if the tickLabels are set to not visible', () => {
+  it('should hide the orientation group if the tickLabels are set to not visible', () => {
     const component = shallow(<AxisSettingsPopover {...props} areTickLabelsVisible={false} />);
-    expect(
-      component.find('[data-test-subj="lnsXY_axisOrientation_groups"]').prop('isDisabled')
-    ).toEqual(true);
+    expect(component.exists('[data-test-subj="lnsXY_axisOrientation_groups"]')).toEqual(false);
   });
 
   it('hides the endzone visibility flag if no setter is passed in', () => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx
index 340a9211fcdee..28faaf6a9e0b4 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/axis_settings_popover.tsx
@@ -17,23 +17,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
-import {
-  AxesSettingsConfig,
-  AxisExtentConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { AxesSettingsConfig, AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
+import { ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { XYLayerConfig } from '../types';
-import {
-  ToolbarPopover,
-  useDebouncedValue,
-  TooltipWrapper,
-  AxisTitleSettings,
-} from '../../shared_components';
+import { ToolbarPopover, useDebouncedValue, AxisTitleSettings } from '../../shared_components';
 import { isHorizontalChart } from '../state_helpers';
 import { EuiIconAxisBottom } from '../../assets/axis_bottom';
 import { EuiIconAxisLeft } from '../../assets/axis_left';
 import { EuiIconAxisRight } from '../../assets/axis_right';
 import { EuiIconAxisTop } from '../../assets/axis_top';
-import { ToolbarButtonProps } from '../../../../../../src/plugins/kibana_react/public';
 import { validateExtent } from '../axes_configuration';
 
 import './axis_settings_popover.scss';
@@ -312,20 +304,13 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
           showLabel={false}
         />
       </EuiFormRow>
-      <EuiFormRow
-        display="columnCompressed"
-        fullWidth
-        isDisabled={useMultilayerTimeAxis}
-        label={i18n.translate('xpack.lens.xyChart.axisOrientation.label', {
-          defaultMessage: 'Orientation',
-        })}
-      >
-        <TooltipWrapper
-          tooltipContent={i18n.translate('xpack.lens.xyChart.axisOrientationMultilayer.disabled', {
-            defaultMessage: 'These options can be configured only with non-time-based axes',
+      {!useMultilayerTimeAxis && areTickLabelsVisible && (
+        <EuiFormRow
+          display="columnCompressed"
+          fullWidth
+          label={i18n.translate('xpack.lens.xyChart.axisOrientation.label', {
+            defaultMessage: 'Orientation',
           })}
-          condition={Boolean(useMultilayerTimeAxis)}
-          display="block"
         >
           <EuiButtonGroup
             isFullWidth
@@ -334,7 +319,6 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
             })}
             data-test-subj="lnsXY_axisOrientation_groups"
             name="axisOrientation"
-            isDisabled={!areTickLabelsVisible || Boolean(useMultilayerTimeAxis)}
             buttonSize="compressed"
             options={axisOrientationOptions}
             idSelected={axisOrientationOptions.find(({ value }) => value === orientation)!.id}
@@ -345,8 +329,8 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
               setOrientation(axis, newOrientation);
             }}
           />
-        </TooltipWrapper>
-      </EuiFormRow>
+        </EuiFormRow>
+      )}
       {setEndzoneVisibility && (
         <EuiFormRow
           display="columnCompressedSwitch"
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx
index 2c4d060e55a07..37ee50f527d43 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx
@@ -9,7 +9,7 @@ import React, { useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiColorPicker, EuiColorPickerProps, EuiToolTip, EuiIcon } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
-import { defaultAnnotationColor } from '../../../../../../src/plugins/event_annotation/public';
+import { defaultAnnotationColor } from '@kbn/event-annotation-plugin/public';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { State, XYDataLayerConfig } from '../types';
 import { FormatFactory } from '../../../common';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx
index 4bb90882c5859..39d08e4c710bd 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/dimension_editor.tsx
@@ -9,13 +9,10 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow, htmlIdGenerator } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
+import { YAxisMode, YConfig } from '@kbn/expression-xy-plugin/common';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { State, XYState, XYDataLayerConfig } from '../types';
 import { FormatFactory } from '../../../common';
-import {
-  YAxisMode,
-  YConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { isHorizontalChart } from '../state_helpers';
 import { ColorPicker } from './color_picker';
 import { PalettePicker, useDebouncedValue } from '../../shared_components';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx
index 42cf49c04fbd8..b61f4694f8a91 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/index.tsx
@@ -9,12 +9,9 @@ import React, { memo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Position, ScaleType, VerticalAlignment, HorizontalAlignment } from '@elastic/charts';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { AxesSettingsConfig, AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
 import type { VisualizationToolbarProps, FramePublicAPI } from '../../types';
 import { State, XYState } from '../types';
-import {
-  AxesSettingsConfig,
-  AxisExtentConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { isHorizontalChart } from '../state_helpers';
 import { LegendSettingsPopover } from '../../shared_components';
 import { AxisSettingsPopover } from './axis_settings_popover';
@@ -297,14 +294,15 @@ export const XyToolbar = memo(function XyToolbar(
   ).truncateText;
 
   return (
-    <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+    <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
           <VisualOptionsPopover
             state={state}
             setState={setState}
             datasourceLayers={frame.datasourceLayers}
           />
+
           <LegendSettingsPopover
             legendOptions={legendOptions}
             mode={legendMode}
@@ -410,8 +408,9 @@ export const XyToolbar = memo(function XyToolbar(
           />
         </EuiFlexGroup>
       </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
           <TooltipWrapper
             tooltipContent={
               shouldRotate
@@ -449,6 +448,7 @@ export const XyToolbar = memo(function XyToolbar(
               hasPercentageAxis={hasPercentageAxis(axisGroups, 'left', state)}
             />
           </TooltipWrapper>
+
           <AxisSettingsPopover
             axis="x"
             layers={state?.layers}
@@ -470,6 +470,7 @@ export const XyToolbar = memo(function XyToolbar(
               isTimeHistogramModeEnabled && !useLegacyTimeAxis && !shouldRotate
             }
           />
+
           <TooltipWrapper
             tooltipContent={
               shouldRotate
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx
index 2aabf255c5993..367785da2d6b1 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/layer_header.tsx
@@ -8,13 +8,13 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiIcon, EuiPopover, EuiSelectable, EuiText, EuiPopoverTitle } from '@elastic/eui';
+import { SeriesType } from '@kbn/expression-xy-plugin/common';
+import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import type { VisualizationLayerWidgetProps, VisualizationType } from '../../types';
 import { State, visualizationTypes, XYDataLayerConfig } from '../types';
-import { SeriesType } from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { isHorizontalChart, isHorizontalSeries } from '../state_helpers';
 import { trackUiEvent } from '../../lens_ui_telemetry';
 import { StaticHeader } from '../../shared_components';
-import { ToolbarButton } from '../../../../../../src/plugins/kibana_react/public';
 import { LensIconChartBarReferenceLine } from '../../assets/chart_bar_reference_line';
 import { LensIconChartBarAnnotations } from '../../assets/chart_bar_annotations';
 import { updateLayer } from '.';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx
index 2e320cc3da0a1..d5a3e8ffd7a46 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/reference_line_panel.tsx
@@ -9,13 +9,10 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
+import { FillStyle, YConfig } from '@kbn/expression-xy-plugin/common';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { State, XYState, XYReferenceLineLayerConfig } from '../types';
 import { FormatFactory } from '../../../common';
-import {
-  FillStyle,
-  YConfig,
-} from '../../../../../../src/plugins/chart_expressions/expression_xy/common';
 
 import { ColorPicker } from './color_picker';
 import { updateLayer } from '.';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx
index 8ae86c2fd5b46..af3c5a2a297cf 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/line_style_settings.tsx
@@ -14,7 +14,7 @@ import {
   EuiFlexItem,
   EuiFormRow,
 } from '@elastic/eui';
-import { LineStyle } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { LineStyle } from '@kbn/expression-xy-plugin/common';
 
 import { idPrefix } from '../dimension_editor';
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
index 26723abc55fad..b780737877388 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/shared/marker_decoration_settings.tsx
@@ -8,10 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
-import {
-  IconPosition,
-  YAxisMode,
-} from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import { IconPosition, YAxisMode } from '@kbn/expression-xy-plugin/common';
 
 import { TooltipWrapper } from '../../../shared_components';
 import { hasIcon, IconSelect, IconSet } from './icon_select';
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts
index 1ecd260b04a30..38168ddad08a5 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/end_value_definitions.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { EndValue } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { EndValue } from '@kbn/expression-xy-plugin/common';
 
 export const endValueDefinitions: Array<{ id: EndValue } & Record<string, string>> = [
   {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts
index a357f7c2f92ca..c2286a942baca 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/fitting_function_definitions.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { FittingFunction } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { FittingFunction } from '@kbn/expression-xy-plugin/common';
 
 export const fittingFunctionDefinitions: Array<{ id: FittingFunction } & Record<string, string>> = [
   {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
index 00903e1107c91..d4edb960e70f7 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
@@ -7,13 +7,13 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { ValidLayer } from '@kbn/expression-xy-plugin/common';
 import { ToolbarPopover, TooltipWrapper, ValueLabelsSettings } from '../../../shared_components';
 import { MissingValuesOptions } from './missing_values_option';
 import { LineCurveOption } from './line_curve_option';
 import { FillOpacityOption } from './fill_opacity_option';
 import { XYState } from '../../types';
 import { hasHistogramSeries } from '../../state_helpers';
-import { ValidLayer } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
 import type { FramePublicAPI } from '../../../types';
 import { getDataLayers } from '../../visualization_helpers';
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx
index 9e69c427d99fe..127444f1496bc 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/line_curve_option.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiSwitch } from '@elastic/eui';
-import type { XYCurveType } from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
+import type { XYCurveType } from '@kbn/expression-xy-plugin/common';
 
 export interface LineCurveOptionProps {
   /**
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
index 645b740fc9dad..d5861229be5fc 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
@@ -8,12 +8,9 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiIconTip, EuiSuperSelect, EuiSwitch, EuiText } from '@elastic/eui';
+import type { FittingFunction, EndValue } from '@kbn/expression-xy-plugin/common';
 import { fittingFunctionDefinitions } from './fitting_function_definitions';
 import { endValueDefinitions } from './end_value_definitions';
-import type {
-  FittingFunction,
-  EndValue,
-} from '../../../../../../../src/plugins/chart_expressions/expression_xy/common';
 
 export interface MissingValuesOptionProps {
   fittingFunction?: FittingFunction;
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx
index 953828db48a72..ad643aa34ac50 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/xy_config_panel.test.tsx
@@ -15,7 +15,7 @@ import { FramePublicAPI } from '../../types';
 import { State, XYState, XYDataLayerConfig } from '../types';
 import { Position } from '@elastic/charts';
 import { createMockFramePublicAPI, createMockDatasource } from '../../mocks';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { EuiColorPicker } from '@elastic/eui';
 import { layerTypes } from '../../../common';
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
index 03e9830b32b31..f309164b7fc4e 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
@@ -16,12 +16,12 @@ import {
 } from './types';
 import { generateId } from '../id_generator';
 import { getXyVisualization } from './xy_visualization';
-import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
-import { eventAnnotationServiceMock } from '../../../../../src/plugins/event_annotation/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks';
 import type { PaletteOutput } from '@kbn/coloring';
 import { layerTypes } from '../../common';
-import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_formats/public/mocks';
-import { themeServiceMock } from '../../../../../src/core/public/mocks';
+import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../id_generator');
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
index 05bdb4fd65c88..912d5adf53c8f 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { partition } from 'lodash';
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
+import type { SeriesType } from '@kbn/expression-xy-plugin/common';
 import {
   SuggestionRequest,
   VisualizationSuggestion,
@@ -17,7 +18,6 @@ import {
   TableChangeType,
 } from '../types';
 import { State, XYState, visualizationTypes, XYLayerConfig, XYDataLayerConfig } from './types';
-import type { SeriesType } from '../../../../../src/plugins/chart_expressions/expression_xy/common';
 import { layerTypes } from '../../common';
 import { getIconForSeries } from './state_helpers';
 import { getDataLayers, isDataLayer } from './visualization_helpers';
@@ -32,6 +32,7 @@ const columnSortOrder = {
   histogram: 6,
   geo_point: 7,
   geo_shape: 8,
+  murmur3: 9,
 };
 
 /**
diff --git a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts
index 655291ec357f4..3bd45dfe873f3 100644
--- a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts
+++ b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.test.ts
@@ -9,7 +9,7 @@ import semverGte from 'semver/functions/gte';
 import { makeLensEmbeddableFactory } from './make_lens_embeddable_factory';
 import { getAllMigrations } from '../migrations/saved_object_migrations';
 import { Filter } from '@kbn/es-query';
-import { GetMigrationFunctionObjectFn } from 'src/plugins/kibana_utils/common';
+import { GetMigrationFunctionObjectFn } from '@kbn/kibana-utils-plugin/common';
 
 describe('embeddable migrations', () => {
   test('should have all saved object migrations versions (>7.13.0)', () => {
diff --git a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
index 7b17dc9977e6d..0f996e428ed2c 100644
--- a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
+++ b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
@@ -5,15 +5,16 @@
  * 2.0.
  */
 
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import type { SerializableRecord } from '@kbn/utility-types';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
-} from '../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import { DOC_TYPE } from '../../common';
 import {
   commonEnhanceTableRowHeight,
+  commonLockOldMetricVisSettings,
   commonMakeReversePaletteAsCustom,
   commonRemoveTimezoneDateHistogramParam,
   commonRenameFilterReferences,
@@ -103,6 +104,14 @@ export const makeLensEmbeddableFactory =
                 attributes: migratedLensState,
               } as unknown as SerializableRecord;
             },
+            '8.3.0': (state) => {
+              const lensState = state as unknown as { attributes: LensDocShape810<VisState810> };
+              const migratedLensState = commonLockOldMetricVisSettings(lensState.attributes);
+              return {
+                ...lensState,
+                attributes: migratedLensState,
+              } as unknown as SerializableRecord;
+            },
           }),
           getLensCustomVisualizationMigrations(customVisualizationMigrations)
         ),
diff --git a/x-pack/plugins/lens/server/expressions/expressions.ts b/x-pack/plugins/lens/server/expressions/expressions.ts
index 9b23c1741556a..b124a9cbaf33b 100644
--- a/x-pack/plugins/lens/server/expressions/expressions.ts
+++ b/x-pack/plugins/lens/server/expressions/expressions.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'kibana/server';
+import type { CoreSetup } from '@kbn/core/server';
+import type { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import {
   counterRate,
   formatColumn,
@@ -17,7 +18,6 @@ import {
 import { getFormatFactory, getTimeZoneFactory } from './utils';
 
 import type { PluginStartContract } from '../plugin';
-import type { ExpressionsServerSetup } from '../../../../../src/plugins/expressions/server';
 
 export const setupExpressions = (
   core: CoreSetup<PluginStartContract>,
diff --git a/x-pack/plugins/lens/server/expressions/utils.ts b/x-pack/plugins/lens/server/expressions/utils.ts
index 40bee0386cc95..c7683ffa90fbb 100644
--- a/x-pack/plugins/lens/server/expressions/utils.ts
+++ b/x-pack/plugins/lens/server/expressions/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/server';
-import { ExecutionContext } from '../../../../../src/plugins/expressions';
+import { CoreSetup, CoreStart } from '@kbn/core/server';
+import { ExecutionContext } from '@kbn/expressions-plugin';
 import { PluginStartContract } from '../plugin';
 
 const getUiSettings = (coreStart: CoreStart, context: ExecutionContext) => {
diff --git a/x-pack/plugins/lens/server/index.ts b/x-pack/plugins/lens/server/index.ts
index a87cd3b2d5fad..d05a7b303a566 100644
--- a/x-pack/plugins/lens/server/index.ts
+++ b/x-pack/plugins/lens/server/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { LensServerPlugin } from './plugin';
 
 export type { LensServerPluginSetup } from './plugin';
diff --git a/x-pack/plugins/lens/server/migrations/common_migrations.ts b/x-pack/plugins/lens/server/migrations/common_migrations.ts
index 0a76b0a5e6b45..df0ce94abca84 100644
--- a/x-pack/plugins/lens/server/migrations/common_migrations.ts
+++ b/x-pack/plugins/lens/server/migrations/common_migrations.ts
@@ -12,7 +12,7 @@ import {
   mergeMigrationFunctionMaps,
   MigrateFunction,
   MigrateFunctionsObject,
-} from '../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import {
   LensDocShapePre712,
   OperationTypePre712,
@@ -28,7 +28,7 @@ import {
   CustomVisualizationMigrations,
   LensDocShape810,
 } from './types';
-import { DOCUMENT_FIELD_NAME, layerTypes } from '../../common';
+import { DOCUMENT_FIELD_NAME, layerTypes, MetricState } from '../../common';
 import { LensDocShape } from './saved_object_migrations';
 
 export const commonRenameOperationsForFormula = (
@@ -239,6 +239,21 @@ export const commonSetIncludeEmptyRowsDateHistogram = (
   return newAttributes;
 };
 
+export const commonLockOldMetricVisSettings = (
+  attributes: LensDocShape810
+): LensDocShape810<VisState820> => {
+  const newAttributes = cloneDeep(attributes);
+  if (newAttributes.visualizationType !== 'lnsMetric') {
+    return newAttributes;
+  }
+
+  const visState = newAttributes.state.visualization as MetricState;
+  visState.textAlign = visState.textAlign ?? 'center';
+  visState.titlePosition = visState.titlePosition ?? 'bottom';
+  visState.size = visState.size ?? 'xl';
+  return newAttributes;
+};
+
 const getApplyCustomVisualizationMigrationToLens = (id: string, migration: MigrateFunction) => {
   return (savedObject: { attributes: LensDocShape }) => {
     if (savedObject.attributes.visualizationType !== id) return savedObject;
diff --git a/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts b/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts
index 5d93e648124b1..7fb9c350a0fa5 100644
--- a/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts
+++ b/x-pack/plugins/lens/server/migrations/saved_object_migrations.test.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectMigrationContext,
   SavedObjectMigrationFn,
   SavedObjectUnsanitizedDoc,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   LensDocShape715,
   LensDocShape810,
@@ -22,7 +22,7 @@ import {
   VisState810,
   VisState820,
 } from './types';
-import { layerTypes } from '../../common';
+import { layerTypes, MetricState } from '../../common';
 import { Filter } from '@kbn/es-query';
 
 describe('Lens migrations', () => {
@@ -2064,4 +2064,53 @@ describe('Lens migrations', () => {
       expect(layer2Columns['4'].params).toHaveProperty('includeEmptyRows', true);
     });
   });
+  describe('8.3.0 old metric visualization defaults', () => {
+    const context = { log: { warning: () => {} } } as unknown as SavedObjectMigrationContext;
+    const example = {
+      type: 'lens',
+      id: 'mocked-saved-object-id',
+      attributes: {
+        savedObjectId: '1',
+        title: 'MyRenamedOps',
+        description: '',
+        visualizationType: 'lnsMetric',
+        state: {
+          visualization: {},
+        },
+      },
+    } as unknown as SavedObjectUnsanitizedDoc<LensDocShape810>;
+
+    it('preserves current config for existing visualizations that are using the DEFAULTS', () => {
+      const result = migrations['8.3.0'](example, context) as ReturnType<
+        SavedObjectMigrationFn<LensDocShape, LensDocShape>
+      >;
+      const visState = result.attributes.state.visualization as MetricState;
+      expect(visState.textAlign).toBe('center');
+      expect(visState.titlePosition).toBe('bottom');
+      expect(visState.size).toBe('xl');
+    });
+
+    it('preserves current config for existing visualizations that are using CUSTOM settings', () => {
+      const result = migrations['8.3.0'](
+        {
+          ...example,
+          attributes: {
+            ...example.attributes,
+            state: {
+              visualization: {
+                textAlign: 'right',
+                titlePosition: 'top',
+                size: 's',
+              },
+            },
+          },
+        },
+        context
+      ) as ReturnType<SavedObjectMigrationFn<LensDocShape, LensDocShape>>;
+      const visState = result.attributes.state.visualization as MetricState;
+      expect(visState.textAlign).toBe('right');
+      expect(visState.titlePosition).toBe('top');
+      expect(visState.size).toBe('s');
+    });
+  });
 });
diff --git a/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts b/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
index 6fb8044baf8ea..f5fa4b27447ac 100644
--- a/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
+++ b/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
@@ -12,12 +12,12 @@ import {
   SavedObjectMigrationFn,
   SavedObjectReference,
   SavedObjectUnsanitizedDoc,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { Filter } from '@kbn/es-query';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
-import { mergeSavedObjectMigrationMaps } from '../../../../../src/core/server';
-import { MigrateFunctionsObject } from '../../../../../src/plugins/kibana_utils/common';
+import { Query } from '@kbn/data-plugin/public';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { PersistableFilter } from '../../common';
 import {
   LensDocShapePost712,
@@ -44,6 +44,7 @@ import {
   commonSetLastValueShowArrayValues,
   commonEnhanceTableRowHeight,
   commonSetIncludeEmptyRowsDateHistogram,
+  commonLockOldMetricVisSettings,
 } from './common_migrations';
 
 interface LensDocShapePre710<VisualizationState = unknown> {
@@ -485,6 +486,10 @@ const setIncludeEmptyRowsDateHistogram: SavedObjectMigrationFn<LensDocShape810,
   return { ...doc, attributes: commonSetIncludeEmptyRowsDateHistogram(doc.attributes) };
 };
 
+const lockOldMetricVisSettings: SavedObjectMigrationFn<LensDocShape810, LensDocShape810> = (
+  doc
+) => ({ ...doc, attributes: commonLockOldMetricVisSettings(doc.attributes) });
+
 const lensMigrations: SavedObjectMigrationMap = {
   '7.7.0': removeInvalidAccessors,
   // The order of these migrations matter, since the timefield migration relies on the aggConfigs
@@ -504,6 +509,7 @@ const lensMigrations: SavedObjectMigrationMap = {
     setIncludeEmptyRowsDateHistogram,
     enhanceTableRowHeight
   ),
+  '8.3.0': lockOldMetricVisSettings,
 };
 
 export const getAllMigrations = (
diff --git a/x-pack/plugins/lens/server/migrations/types.ts b/x-pack/plugins/lens/server/migrations/types.ts
index de4143e3d00c5..9b66f7023cdeb 100644
--- a/x-pack/plugins/lens/server/migrations/types.ts
+++ b/x-pack/plugins/lens/server/migrations/types.ts
@@ -8,8 +8,8 @@
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
 import { Filter } from '@kbn/es-query';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
-import type { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+import { Query } from '@kbn/data-plugin/public';
+import type { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import type { LayerType, PersistableFilter } from '../../common';
 
 export type CustomVisualizationMigrations = Record<string, () => MigrateFunctionsObject>;
diff --git a/x-pack/plugins/lens/server/plugin.tsx b/x-pack/plugins/lens/server/plugin.tsx
index b63ea52f115f8..f7b39832eca03 100644
--- a/x-pack/plugins/lens/server/plugin.tsx
+++ b/x-pack/plugins/lens/server/plugin.tsx
@@ -5,18 +5,22 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { PluginStart as DataViewsServerPluginStart } from 'src/plugins/data_views/server';
+import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import {
   PluginStart as DataPluginStart,
   PluginSetup as DataPluginSetup,
-} from 'src/plugins/data/server';
-import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import type { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
+} from '@kbn/data-plugin/server';
+import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import { setupRoutes } from './routes';
 import { getUiSettings } from './ui_settings';
 import {
@@ -25,7 +29,6 @@ import {
   scheduleLensTelemetry,
 } from './usage';
 import { setupSavedObjects } from './saved_objects';
-import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
 import { setupExpressions } from './expressions';
 import { makeLensEmbeddableFactory } from './embeddable/make_lens_embeddable_factory';
 import type { CustomVisualizationMigrations } from './migrations/types';
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.test.ts b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
index ad5f9559f6562..7c0257c7808ba 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.test.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data_views/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { legacyExistingFields, existingFields, Field, buildFieldList } from './existing_fields';
 
 describe('existingFields', () => {
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
index bb235774da3bf..542cdb33df8ab 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -9,12 +9,12 @@ import Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema } from '@kbn/config-schema';
-import { RequestHandlerContext, ElasticsearchClient } from 'src/core/server';
-import { CoreSetup, Logger } from 'src/core/server';
-import { RuntimeField } from 'src/plugins/data/common';
-import { DataViewsService, DataView, FieldSpec } from 'src/plugins/data_views/common';
+import { RequestHandlerContext, ElasticsearchClient } from '@kbn/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { RuntimeField } from '@kbn/data-plugin/common';
+import { DataViewsService, DataView, FieldSpec } from '@kbn/data-views-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/server';
 import { BASE_API_URL } from '../../common';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/server';
 import { FIELD_EXISTENCE_SETTING } from '../ui_settings';
 import { PluginStartContract } from '../plugin';
 
diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
index 2a719957cd851..1da732ab60ab2 100644
--- a/x-pack/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/plugins/lens/server/routes/field_stats.ts
@@ -8,10 +8,10 @@ import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import DateMath from '@kbn/datemath';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup } from 'src/core/server';
-import type { DataViewField } from 'src/plugins/data_views/common';
-import { SavedObjectNotFound } from '../../../../../src/plugins/kibana_utils/common';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
+import { CoreSetup } from '@kbn/core/server';
+import type { DataViewField } from '@kbn/data-views-plugin/common';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
 import { FieldStatsResponse, BASE_API_URL } from '../../common';
 import { PluginStartContract } from '../plugin';
 
diff --git a/x-pack/plugins/lens/server/routes/index.ts b/x-pack/plugins/lens/server/routes/index.ts
index ec1ca81ca41a4..d040812c27264 100644
--- a/x-pack/plugins/lens/server/routes/index.ts
+++ b/x-pack/plugins/lens/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { PluginStartContract } from '../plugin';
 import { existingFieldsRoute } from './existing_fields';
 import { initFieldsRoute } from './field_stats';
diff --git a/x-pack/plugins/lens/server/routes/telemetry.ts b/x-pack/plugins/lens/server/routes/telemetry.ts
index efcde9d14ebbe..8ef45a5029e93 100644
--- a/x-pack/plugins/lens/server/routes/telemetry.ts
+++ b/x-pack/plugins/lens/server/routes/telemetry.ts
@@ -6,9 +6,9 @@
  */
 
 import { errors } from '@elastic/elasticsearch';
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { BASE_API_URL } from '../../common';
 import { PluginStartContract } from '../plugin';
 
diff --git a/x-pack/plugins/lens/server/saved_objects.ts b/x-pack/plugins/lens/server/saved_objects.ts
index e36421d26e3c2..fdae8df746db8 100644
--- a/x-pack/plugins/lens/server/saved_objects.ts
+++ b/x-pack/plugins/lens/server/saved_objects.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
-import { MigrateFunctionsObject } from '../../../../src/plugins/kibana_utils/common';
+import { CoreSetup } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
 import { getEditPath } from '../common';
 import { getAllMigrations } from './migrations/saved_object_migrations';
 import { CustomVisualizationMigrations } from './migrations/types';
diff --git a/x-pack/plugins/lens/server/ui_settings.ts b/x-pack/plugins/lens/server/ui_settings.ts
index 63f16f3aeebb7..ddeca9e4917ef 100644
--- a/x-pack/plugins/lens/server/ui_settings.ts
+++ b/x-pack/plugins/lens/server/ui_settings.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { UiSettingsParams } from 'kibana/server';
+import { UiSettingsParams } from '@kbn/core/server';
 
 export const FIELD_EXISTENCE_SETTING = 'lens:useFieldExistenceSampling';
 
diff --git a/x-pack/plugins/lens/server/usage/collectors.ts b/x-pack/plugins/lens/server/usage/collectors.ts
index 87567a1281d0a..b857b31129398 100644
--- a/x-pack/plugins/lens/server/usage/collectors.ts
+++ b/x-pack/plugins/lens/server/usage/collectors.ts
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import { get } from 'lodash';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { TaskManagerStartContract } from '../../../task_manager/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 import { LensUsage, LensTelemetryState } from './types';
 import { lensUsageSchema } from './schema';
diff --git a/x-pack/plugins/lens/server/usage/multiterms_count.ts b/x-pack/plugins/lens/server/usage/multiterms_count.ts
index a245bb1bb4322..26ebbb8393892 100644
--- a/x-pack/plugins/lens/server/usage/multiterms_count.ts
+++ b/x-pack/plugins/lens/server/usage/multiterms_count.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { createMetricQuery } from './saved_objects_metric_factory';
 import { LensMultitermsUsage } from './types';
 
diff --git a/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts b/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts
index 568b79ca47780..890c2ec29decc 100644
--- a/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts
+++ b/x-pack/plugins/lens/server/usage/saved_objects_metric_factory.ts
@@ -9,7 +9,7 @@ import {
   AggregationsAggregationContainer,
   MappingRuntimeFields,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { GenericSavedUsage } from './types';
 
 export function createMetricQuery(
diff --git a/x-pack/plugins/lens/server/usage/schema.ts b/x-pack/plugins/lens/server/usage/schema.ts
index 6d580ba8f6c27..08264de0be416 100644
--- a/x-pack/plugins/lens/server/usage/schema.ts
+++ b/x-pack/plugins/lens/server/usage/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { LensUsage } from './types';
 
 const eventsSchema: MakeSchemaFrom<LensUsage['events_30_days']> = {
diff --git a/x-pack/plugins/lens/server/usage/task.ts b/x-pack/plugins/lens/server/usage/task.ts
index 53af2e5551b6a..f4a805bef7401 100644
--- a/x-pack/plugins/lens/server/usage/task.ts
+++ b/x-pack/plugins/lens/server/usage/task.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger, ElasticsearchClient } from 'kibana/server';
+import { CoreSetup, Logger, ElasticsearchClient } from '@kbn/core/server';
 import moment from 'moment';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
 import { getVisualizationCounts } from './visualization_counts';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
 import { getMultitermsCounts } from './multiterms_count';
 
 // This task is responsible for running daily and aggregating all the Lens click event objects
diff --git a/x-pack/plugins/lens/server/usage/visualization_counts.ts b/x-pack/plugins/lens/server/usage/visualization_counts.ts
index d5d75fe68110d..34d9c2c4ee49e 100644
--- a/x-pack/plugins/lens/server/usage/visualization_counts.ts
+++ b/x-pack/plugins/lens/server/usage/visualization_counts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { createMetricQuery } from './saved_objects_metric_factory';
 import { LensVisualizationUsage } from './types';
 
diff --git a/x-pack/plugins/license_api_guard/server/license.test.ts b/x-pack/plugins/license_api_guard/server/license.test.ts
index 400af7261ff87..9f20a3e20e995 100644
--- a/x-pack/plugins/license_api_guard/server/license.test.ts
+++ b/x-pack/plugins/license_api_guard/server/license.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { of } from 'rxjs';
-import type { Logger, KibanaRequest, RequestHandlerContext } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { Logger, KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { License } from './license';
 import { LicenseCheckState, licensingMock, LicenseType } from './shared_imports';
 
diff --git a/x-pack/plugins/license_api_guard/server/license.ts b/x-pack/plugins/license_api_guard/server/license.ts
index 66e47f02b6e28..feceb0097ef21 100644
--- a/x-pack/plugins/license_api_guard/server/license.ts
+++ b/x-pack/plugins/license_api_guard/server/license.ts
@@ -12,7 +12,7 @@ import {
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { ILicense, LicenseType, LicenseCheckState, LicensingPluginStart } from './shared_imports';
 
diff --git a/x-pack/plugins/license_api_guard/server/shared_imports.ts b/x-pack/plugins/license_api_guard/server/shared_imports.ts
index 1318706df11c9..f3f1faf0d9f56 100644
--- a/x-pack/plugins/license_api_guard/server/shared_imports.ts
+++ b/x-pack/plugins/license_api_guard/server/shared_imports.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-export type { ILicense, LicenseType, LicenseCheckState } from '../../licensing/common/types';
+export type { ILicense, LicenseType, LicenseCheckState } from '@kbn/licensing-plugin/common/types';
 
-export type { LicensingPluginStart } from '../../licensing/server';
+export type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
-export { licensingMock } from '../../licensing/server/mocks';
+export { licensingMock } from '@kbn/licensing-plugin/server/mocks';
diff --git a/x-pack/plugins/license_management/__jest__/upload_license.test.tsx b/x-pack/plugins/license_management/__jest__/upload_license.test.tsx
index 62b7dbf6c1a78..eb38aab4470d8 100644
--- a/x-pack/plugins/license_management/__jest__/upload_license.test.tsx
+++ b/x-pack/plugins/license_management/__jest__/upload_license.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { LocationDescriptorObject } from 'history';
-import { httpServiceMock, scopedHistoryMock } from '../../../../src/core/public/mocks';
+import { httpServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
 // @ts-ignore
diff --git a/x-pack/plugins/license_management/__jest__/util/util.js b/x-pack/plugins/license_management/__jest__/util/util.js
index 25ef77612ca2c..7e6ffdd60431c 100644
--- a/x-pack/plugins/license_management/__jest__/util/util.js
+++ b/x-pack/plugins/license_management/__jest__/util/util.js
@@ -11,7 +11,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { httpServiceMock, scopedHistoryMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { licenseManagementStore } from '../../public/application/store/store';
 import { AppContextProvider } from '../../public/application/app_context';
 
diff --git a/x-pack/plugins/license_management/public/application/app_context.tsx b/x-pack/plugins/license_management/public/application/app_context.tsx
index 4500965b15c37..3be069bc818e7 100644
--- a/x-pack/plugins/license_management/public/application/app_context.tsx
+++ b/x-pack/plugins/license_management/public/application/app_context.tsx
@@ -8,9 +8,9 @@
 import React, { createContext, useContext } from 'react';
 import { Observable } from 'rxjs';
 
-import { CoreStart, ScopedHistory, CoreTheme } from '../../../../../src/core/public';
-import { LicensingPluginSetup, ILicense } from '../../../licensing/public';
-import { TelemetryPluginStart } from '../../../../../src/plugins/telemetry/public';
+import { CoreStart, ScopedHistory, CoreTheme } from '@kbn/core/public';
+import { LicensingPluginSetup, ILicense } from '@kbn/licensing-plugin/public';
+import { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
 import { ClientConfigType } from '../types';
 import { BreadcrumbService } from './breadcrumbs';
 
diff --git a/x-pack/plugins/license_management/public/application/breadcrumbs.ts b/x-pack/plugins/license_management/public/application/breadcrumbs.ts
index ec25699f51704..d546f4c23dd99 100644
--- a/x-pack/plugins/license_management/public/application/breadcrumbs.ts
+++ b/x-pack/plugins/license_management/public/application/breadcrumbs.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx b/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx
index 7fea09e82a9e1..fb28221fb160a 100644
--- a/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx
+++ b/x-pack/plugins/license_management/public/application/components/telemetry_opt_in/opt_in_example_flyout.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { OptInExampleFlyout } from '../../../../../../../src/plugins/telemetry_management_section/public';
+import { OptInExampleFlyout } from '@kbn/telemetry-management-section-plugin/public';
 
 // required for lazy loading
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/plugins/license_management/public/application/lib/es.ts b/x-pack/plugins/license_management/public/application/lib/es.ts
index fa104cc6ffe8a..ac14b5342cead 100644
--- a/x-pack/plugins/license_management/public/application/lib/es.ts
+++ b/x-pack/plugins/license_management/public/application/lib/es.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../common/constants';
 
 export function putLicense(http: HttpSetup, license: string, acknowledge: boolean) {
diff --git a/x-pack/plugins/license_management/public/application/lib/telemetry.ts b/x-pack/plugins/license_management/public/application/lib/telemetry.ts
index 45a6adad16341..b930036055051 100644
--- a/x-pack/plugins/license_management/public/application/lib/telemetry.ts
+++ b/x-pack/plugins/license_management/public/application/lib/telemetry.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { TelemetryPluginStart } from '../../../../../../src/plugins/telemetry/public';
+import type { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
 
-export type { TelemetryPluginStart } from '../../../../../../src/plugins/telemetry/public';
+export type { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
 export { shouldShowTelemetryOptIn };
 
 function shouldShowTelemetryOptIn(
diff --git a/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js b/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js
index c0abdda244140..3cfa42866d617 100644
--- a/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js
+++ b/x-pack/plugins/license_management/public/application/sections/license_dashboard/add_license/add_license.js
@@ -11,7 +11,7 @@ import { EuiCard, EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useAppContext } from '../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 export const AddLicense = ({ uploadPath = `/upload_license` }) => {
   const { services } = useAppContext();
diff --git a/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js b/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
index 02a448655cbab..e36f2961c2d3d 100644
--- a/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
+++ b/x-pack/plugins/license_management/public/application/sections/upload_license/upload_license.js
@@ -24,7 +24,7 @@ import { TelemetryOptIn } from '../../components/telemetry_opt_in';
 import { shouldShowTelemetryOptIn } from '../../lib/telemetry';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 export class UploadLicense extends React.PureComponent {
   state = {
diff --git a/x-pack/plugins/license_management/public/index.ts b/x-pack/plugins/license_management/public/index.ts
index c63cab6f4ad09..6c23d2f22d230 100644
--- a/x-pack/plugins/license_management/public/index.ts
+++ b/x-pack/plugins/license_management/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { LicenseManagementUIPlugin } from './plugin';
 import './application/index.scss';
 
diff --git a/x-pack/plugins/license_management/public/plugin.ts b/x-pack/plugins/license_management/public/plugin.ts
index 67d954240d3c3..204fa3511ad3f 100644
--- a/x-pack/plugins/license_management/public/plugin.ts
+++ b/x-pack/plugins/license_management/public/plugin.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { firstValueFrom } from 'rxjs';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
 
-import { TelemetryPluginStart } from '../../../../src/plugins/telemetry/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { LicensingPluginSetup } from '../../../plugins/licensing/public';
+import { TelemetryPluginStart } from '@kbn/telemetry-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import { PLUGIN } from '../common/constants';
 import { ClientConfigType } from './types';
 import { AppDependencies } from './application';
@@ -59,7 +59,7 @@ export class LicenseManagementUIPlugin
       order: 0,
       mount: async ({ element, setBreadcrumbs, history, theme$ }) => {
         const [coreStart, { telemetry }] = await getStartServices();
-        const initialLicense = await plugins.licensing.license$.pipe(first()).toPromise();
+        const initialLicense = await firstValueFrom(plugins.licensing.license$);
 
         // Setup documentation links
         const {
diff --git a/x-pack/plugins/license_management/public/shared_imports.ts b/x-pack/plugins/license_management/public/shared_imports.ts
index ad4d91b1473f6..5651102fbcfc5 100644
--- a/x-pack/plugins/license_management/public/shared_imports.ts
+++ b/x-pack/plugins/license_management/public/shared_imports.ts
@@ -5,9 +5,6 @@
  * 2.0.
  */
 
-export { SectionLoading } from '../../../../src/plugins/es_ui_shared/public/';
+export { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/license_management/server/config.ts b/x-pack/plugins/license_management/server/config.ts
index e378a10191684..42beba0ea5c09 100644
--- a/x-pack/plugins/license_management/server/config.ts
+++ b/x-pack/plugins/license_management/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/license_management/server/index.ts b/x-pack/plugins/license_management/server/index.ts
index 7aa6bfb06d54d..1a8eba1e2610e 100644
--- a/x-pack/plugins/license_management/server/index.ts
+++ b/x-pack/plugins/license_management/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { LicenseManagementServerPlugin } from './plugin';
 
diff --git a/x-pack/plugins/license_management/server/lib/license.ts b/x-pack/plugins/license_management/server/lib/license.ts
index 915d3a8b50a3d..228c8eff01a21 100644
--- a/x-pack/plugins/license_management/server/lib/license.ts
+++ b/x-pack/plugins/license_management/server/lib/license.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { LicensingPluginStart } from '../../../licensing/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 interface PutLicenseArg {
   acknowledge: boolean;
diff --git a/x-pack/plugins/license_management/server/lib/permissions.ts b/x-pack/plugins/license_management/server/lib/permissions.ts
index 64ccabcd5ee68..f362a331c2aef 100644
--- a/x-pack/plugins/license_management/server/lib/permissions.ts
+++ b/x-pack/plugins/license_management/server/lib/permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 interface GetPermissionsArg {
   isSecurityEnabled: boolean;
diff --git a/x-pack/plugins/license_management/server/lib/start_basic.ts b/x-pack/plugins/license_management/server/lib/start_basic.ts
index 8c077332f0709..f7ccc2686c6ae 100644
--- a/x-pack/plugins/license_management/server/lib/start_basic.ts
+++ b/x-pack/plugins/license_management/server/lib/start_basic.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
-import { LicensingPluginStart } from '../../../licensing/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 interface StartBasicArg {
   acknowledge: boolean;
diff --git a/x-pack/plugins/license_management/server/lib/start_trial.ts b/x-pack/plugins/license_management/server/lib/start_trial.ts
index dfacee52c5c75..8abfc28629a54 100644
--- a/x-pack/plugins/license_management/server/lib/start_trial.ts
+++ b/x-pack/plugins/license_management/server/lib/start_trial.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
-import { LicensingPluginStart } from '../../../licensing/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 export async function canStartTrial(client: IScopedClusterClient) {
   try {
diff --git a/x-pack/plugins/license_management/server/plugin.ts b/x-pack/plugins/license_management/server/plugin.ts
index daf872148de0a..6368d973a10eb 100644
--- a/x-pack/plugins/license_management/server/plugin.ts
+++ b/x-pack/plugins/license_management/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 import { ApiRoutes } from './routes';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/license_management/server/shared_imports.ts b/x-pack/plugins/license_management/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/license_management/server/shared_imports.ts
+++ b/x-pack/plugins/license_management/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/license_management/server/types.ts b/x-pack/plugins/license_management/server/types.ts
index 68219380c6e83..c888bb30c2265 100644
--- a/x-pack/plugins/license_management/server/types.ts
+++ b/x-pack/plugins/license_management/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, IRouter } from 'kibana/server';
+import { IScopedClusterClient, IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginStart } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
diff --git a/x-pack/plugins/licensing/common/license_update.test.ts b/x-pack/plugins/licensing/common/license_update.test.ts
index c0a3c23c124ad..1612f934fb45b 100644
--- a/x-pack/plugins/licensing/common/license_update.test.ts
+++ b/x-pack/plugins/licensing/common/license_update.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Subject } from 'rxjs';
+import { firstValueFrom, Subject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 
 import { ILicense } from './types';
@@ -13,10 +13,10 @@ import { createLicenseUpdate } from './license_update';
 import { licenseMock } from './licensing.mock';
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-const stop$ = new Subject();
+const stop$ = new Subject<void>();
 describe('licensing update', () => {
   it('loads updates when triggered', async () => {
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
     const fetcher = jest
       .fn()
       .mockResolvedValueOnce(licenseMock.createLicense({ license: { type: 'basic' } }))
@@ -27,23 +27,23 @@ describe('licensing update', () => {
     expect(fetcher).toHaveBeenCalledTimes(0);
 
     trigger$.next();
-    const first = await license$.pipe(take(1)).toPromise();
+    const first = await firstValueFrom(license$);
     expect(first.type).toBe('basic');
 
     trigger$.next();
-    const [, second] = await license$.pipe(take(2), toArray()).toPromise();
+    const [, second] = await firstValueFrom(license$.pipe(take(2), toArray()));
     expect(second.type).toBe('gold');
   });
 
   it('starts with initial value if presents', async () => {
     const initialLicense = licenseMock.createLicense({ license: { type: 'platinum' } });
     const fetchedLicense = licenseMock.createLicense({ license: { type: 'gold' } });
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
 
     const fetcher = jest.fn().mockResolvedValue(fetchedLicense);
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher, initialLicense);
     trigger$.next();
-    const [first, second] = await license$.pipe(take(2), toArray()).toPromise();
+    const [first, second] = await firstValueFrom(license$.pipe(take(2), toArray()));
 
     expect(first.type).toBe('platinum');
     expect(second.type).toBe('gold');
@@ -51,7 +51,7 @@ describe('licensing update', () => {
   });
 
   it('does not emit if license has not changed', async () => {
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
 
     const fetcher = jest
       .fn()
@@ -62,7 +62,7 @@ describe('licensing update', () => {
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
     trigger$.next();
 
-    const [first] = await license$.pipe(take(1), toArray()).toPromise();
+    const [first] = await firstValueFrom(license$.pipe(take(1), toArray()));
 
     expect(first.type).toBe('basic');
 
@@ -71,14 +71,14 @@ describe('licensing update', () => {
     await Promise.resolve();
     trigger$.next();
 
-    const [, second] = await license$.pipe(take(2), toArray()).toPromise();
+    const [, second] = await firstValueFrom(license$.pipe(take(2), toArray()));
 
     expect(second.type).toBe('gold');
     expect(fetcher).toHaveBeenCalledTimes(3);
   });
 
   it('new subscriptions does not force re-fetch', async () => {
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
 
     const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
 
@@ -103,7 +103,7 @@ describe('licensing update', () => {
           );
         })
     );
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
     const values: ILicense[] = [];
     license$.subscribe((license) => values.push(license));
@@ -119,7 +119,7 @@ describe('licensing update', () => {
   });
 
   it('completes license$ stream when stop$ is triggered', () => {
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
     const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
@@ -131,7 +131,7 @@ describe('licensing update', () => {
   });
 
   it('stops fetching when stop$ is triggered', () => {
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
     const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
@@ -145,7 +145,7 @@ describe('licensing update', () => {
   });
 
   it(`refreshManually multiple times gets new license`, async () => {
-    const trigger$ = new Subject();
+    const trigger$ = new Subject<void>();
     const firstLicense = licenseMock.createLicense({ license: { uid: 'first', type: 'basic' } });
     const secondLicense = licenseMock.createLicense({ license: { uid: 'second', type: 'gold' } });
 
diff --git a/x-pack/plugins/licensing/common/license_update.ts b/x-pack/plugins/licensing/common/license_update.ts
index b43bfaa109059..227886879e4e5 100644
--- a/x-pack/plugins/licensing/common/license_update.ts
+++ b/x-pack/plugins/licensing/common/license_update.ts
@@ -5,18 +5,9 @@
  * 2.0.
  */
 
-import { ConnectableObservable, Observable, Subject, from, merge } from 'rxjs';
-
-import {
-  filter,
-  map,
-  pairwise,
-  exhaustMap,
-  publishReplay,
-  share,
-  take,
-  takeUntil,
-} from 'rxjs/operators';
+import { ConnectableObservable, Observable, Subject, from, merge, firstValueFrom } from 'rxjs';
+
+import { filter, map, pairwise, exhaustMap, publishReplay, share, takeUntil } from 'rxjs/operators';
 import { hasLicenseInfoChanged } from './has_license_info_changed';
 import { ILicense } from './types';
 
@@ -26,7 +17,7 @@ export function createLicenseUpdate(
   fetcher: () => Promise<ILicense>,
   initialValues?: ILicense
 ) {
-  const manuallyRefresh$ = new Subject();
+  const manuallyRefresh$ = new Subject<void>();
   const fetched$ = merge(triggerRefresh$, manuallyRefresh$).pipe(exhaustMap(fetcher), share());
 
   const cached$ = fetched$.pipe(
@@ -50,7 +41,7 @@ export function createLicenseUpdate(
   return {
     license$,
     refreshManually() {
-      const licensePromise = fetched$.pipe(take(1)).toPromise();
+      const licensePromise = firstValueFrom(fetched$);
       manuallyRefresh$.next();
       return licensePromise;
     },
diff --git a/x-pack/plugins/licensing/public/expired_banner.tsx b/x-pack/plugins/licensing/public/expired_banner.tsx
index 9a0d7473dc8d9..e9e6af537a4a2 100644
--- a/x-pack/plugins/licensing/public/expired_banner.tsx
+++ b/x-pack/plugins/licensing/public/expired_banner.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EuiCallOut } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   type: string;
diff --git a/x-pack/plugins/licensing/public/index.ts b/x-pack/plugins/licensing/public/index.ts
index ec1c0aa1538cd..eb0b229ca119e 100644
--- a/x-pack/plugins/licensing/public/index.ts
+++ b/x-pack/plugins/licensing/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 import { LicensingPlugin } from './plugin';
 
diff --git a/x-pack/plugins/licensing/public/plugin.test.ts b/x-pack/plugins/licensing/public/plugin.test.ts
index ee13b3dacd726..5c571d0c6a40b 100644
--- a/x-pack/plugins/licensing/public/plugin.test.ts
+++ b/x-pack/plugins/licensing/public/plugin.test.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { firstValueFrom } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 import { mountExpiredBannerMock } from './plugin.test.mocks';
 
@@ -13,8 +14,8 @@ import { LicensingPlugin, licensingSessionStorageKey } from './plugin';
 
 import { License } from '../common/license';
 import { licenseMock } from '../common/licensing.mock';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { HttpInterceptor } from 'src/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { HttpInterceptor } from '@kbn/core/public';
 
 const coreStart = coreMock.createStart();
 describe('licensing plugin', () => {
@@ -85,7 +86,7 @@ describe('licensing plugin', () => {
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start(coreStart);
 
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
         expect(license.isAvailable).toBe(true);
         expect(license.uid).toBe('saved');
 
@@ -107,7 +108,7 @@ describe('licensing plugin', () => {
 
         plugin.setup(coreSetup);
         const { refresh, license$ } = await plugin.start(coreStart);
-        const promise = license$.pipe(take(3), toArray()).toPromise();
+        const promise = firstValueFrom(license$.pipe(take(3), toArray()));
 
         await refresh();
         await refresh();
@@ -131,7 +132,7 @@ describe('licensing plugin', () => {
         const { license$, refresh } = await plugin.start(coreStart);
 
         await refresh();
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
 
         expect(license.uid).toBe('fresh');
 
@@ -157,7 +158,7 @@ describe('licensing plugin', () => {
         const { license$, refresh } = await plugin.start(coreStart);
         await refresh();
 
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
 
         expect(license.isAvailable).toBe(false);
         expect(license.error).toBe('reason');
@@ -233,7 +234,7 @@ describe('licensing plugin', () => {
 
       expect(coreSetup.http.get).toHaveBeenCalledTimes(1);
 
-      const license = await license$.pipe(take(1)).toPromise();
+      const license = await firstValueFrom(license$);
       expect(license.isAvailable).toBe(true);
 
       await registeredInterceptor!.response!(httpResponse as any, null as any);
diff --git a/x-pack/plugins/licensing/public/plugin.ts b/x-pack/plugins/licensing/public/plugin.ts
index f147b560ad5d3..9ef27e22657af 100644
--- a/x-pack/plugins/licensing/public/plugin.ts
+++ b/x-pack/plugins/licensing/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import { Observable, Subject, Subscription } from 'rxjs';
 
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
 import { ILicense } from '../common/types';
 import { LicensingPluginSetup, LicensingPluginStart } from './types';
 import { createLicenseUpdate } from '../common/license_update';
@@ -27,7 +27,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
   /**
    * Used as a flag to halt all other plugin observables.
    */
-  private stop$ = new Subject();
+  private stop$ = new Subject<void>();
 
   /**
    * A function to execute once the plugin's HTTP interceptor needs to stop listening.
@@ -73,7 +73,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
   }
 
   public setup(core: CoreSetup) {
-    const signatureUpdated$ = new Subject();
+    const signatureUpdated$ = new Subject<void>();
 
     const { license$, refreshManually } = createLicenseUpdate(
       signatureUpdated$,
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
index 1a39a9677a04d..1c29cb97c2758 100644
--- a/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { FeatureUsageService } from './feature_usage_service';
 
 describe('FeatureUsageService', () => {
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.ts
index de9dbd59baa4f..5f50f2891aca4 100644
--- a/x-pack/plugins/licensing/public/services/feature_usage_service.ts
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { isDate } from 'lodash';
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 import { LicenseType } from '../../common/types';
 
 /** @public */
diff --git a/x-pack/plugins/licensing/server/index.ts b/x-pack/plugins/licensing/server/index.ts
index a95842308e4eb..4cfa04089d8c5 100644
--- a/x-pack/plugins/licensing/server/index.ts
+++ b/x-pack/plugins/licensing/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { LicensingPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) => new LicensingPlugin(context);
diff --git a/x-pack/plugins/licensing/server/licensing_config.ts b/x-pack/plugins/licensing/server/licensing_config.ts
index 85de9f84a703f..459c69b650dbb 100644
--- a/x-pack/plugins/licensing/server/licensing_config.ts
+++ b/x-pack/plugins/licensing/server/licensing_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   api_polling_frequency: schema.duration({ defaultValue: '30s' }),
diff --git a/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts b/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts
index a35e5be97219b..cf06cbd829f4c 100644
--- a/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts
+++ b/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts
@@ -11,7 +11,7 @@ import { licenseMock } from '../common/licensing.mock';
 import { createRouteHandlerContext } from './licensing_route_handler_context';
 import { featureUsageMock } from './services/feature_usage_service.mock';
 import { FeatureUsageServiceStart } from './services';
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { LicensingPluginStart } from './types';
 
 const createStartServices = (
diff --git a/x-pack/plugins/licensing/server/licensing_route_handler_context.ts b/x-pack/plugins/licensing/server/licensing_route_handler_context.ts
index 8d4735c18c474..fcf2fd6878f49 100644
--- a/x-pack/plugins/licensing/server/licensing_route_handler_context.ts
+++ b/x-pack/plugins/licensing/server/licensing_route_handler_context.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import type { IContextProvider, StartServicesAccessor } from 'src/core/server';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import type { IContextProvider, StartServicesAccessor } from '@kbn/core/server';
+import { firstValueFrom, Observable } from 'rxjs';
 
 import type { ILicense } from '../common/types';
 import type { LicensingPluginStart, LicensingRequestHandlerContext } from './types';
@@ -23,7 +22,7 @@ export function createRouteHandlerContext(
 ): IContextProvider<LicensingRequestHandlerContext, 'licensing'> {
   return async function licensingRouteHandlerContext() {
     const [, , { featureUsage }] = await getStartServices();
-    const license = await license$.pipe(take(1)).toPromise();
+    const license = await firstValueFrom(license$);
 
     return {
       featureUsage,
diff --git a/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts b/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts
index f7b5f887eeaa2..d5a3de7ee8770 100644
--- a/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts
+++ b/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts
@@ -7,7 +7,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { createOnPreResponseHandler } from './on_pre_response_handler';
-import { httpServiceMock, httpServerMock } from '../../../../src/core/server/mocks';
+import { httpServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 import { licenseMock } from '../common/licensing.mock';
 
 describe('createOnPreResponseHandler', () => {
diff --git a/x-pack/plugins/licensing/server/on_pre_response_handler.ts b/x-pack/plugins/licensing/server/on_pre_response_handler.ts
index d5cb2ddab6fe9..6cab0819ca6f7 100644
--- a/x-pack/plugins/licensing/server/on_pre_response_handler.ts
+++ b/x-pack/plugins/licensing/server/on_pre_response_handler.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { OnPreResponseHandler } from '../../../../src/core/server';
+import { firstValueFrom, Observable } from 'rxjs';
+import { OnPreResponseHandler } from '@kbn/core/server';
 import { ILicense } from '../common/types';
 
 export function createOnPreResponseHandler(
@@ -24,7 +23,7 @@ export function createOnPreResponseHandler(
     if (res.statusCode >= 400 && res.statusCode !== 429) {
       await refresh();
     }
-    const license = await license$.pipe(take(1)).toPromise();
+    const license = await firstValueFrom(license$);
     return t.next({
       headers: {
         'kbn-license-sig': license.signature,
diff --git a/x-pack/plugins/licensing/server/plugin.test.ts b/x-pack/plugins/licensing/server/plugin.test.ts
index 88f08a27a255f..b087b6f3f03fa 100644
--- a/x-pack/plugins/licensing/server/plugin.test.ts
+++ b/x-pack/plugins/licensing/server/plugin.test.ts
@@ -11,12 +11,9 @@ import moment from 'moment';
 import { LicenseType } from '../common/types';
 import { ElasticsearchError } from './types';
 import { LicensingPlugin } from './plugin';
-import {
-  coreMock,
-  elasticsearchServiceMock,
-  loggingSystemMock,
-} from '../../../../src/core/server/mocks';
-import { IClusterClient } from '../../../../src/core/server';
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { IClusterClient } from '@kbn/core/server';
+import { firstValueFrom } from 'rxjs';
 
 function buildRawLicense(
   options: Partial<estypes.XpackInfoMinimalLicenseInformation> = {}
@@ -84,7 +81,7 @@ describe('licensing plugin', () => {
         const coreSetup = createCoreSetupWith(esClient);
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
         expect(license.isAvailable).toBe(true);
       });
 
@@ -97,7 +94,7 @@ describe('licensing plugin', () => {
         const coreSetup = createCoreSetupWith(esClient);
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
-        await license$.pipe(take(1)).toPromise();
+        await firstValueFrom(license$);
 
         expect(esClient.asInternalUser.xpack.info).toHaveBeenCalledTimes(1);
       });
@@ -116,7 +113,7 @@ describe('licensing plugin', () => {
         const coreSetup = createCoreSetupWith(esClient);
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
-        const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
+        const [first, second, third] = await firstValueFrom(license$.pipe(take(3), toArray()));
 
         expect(first.type).toBe('basic');
         expect(second.type).toBe('gold');
@@ -131,7 +128,7 @@ describe('licensing plugin', () => {
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
 
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
         expect(license.isAvailable).toBe(false);
         expect(license.error).toBeDefined();
       });
@@ -146,7 +143,7 @@ describe('licensing plugin', () => {
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
 
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
         expect(license.isAvailable).toBe(false);
         expect(license.error).toBe('X-Pack plugin is not installed on the Elasticsearch cluster.');
       });
@@ -175,7 +172,7 @@ describe('licensing plugin', () => {
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
 
-        const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
+        const [first, second, third] = await firstValueFrom(license$.pipe(take(3), toArray()));
 
         expect(first.error).toBe(error1.message);
         expect(second.error).toBe(error2.message);
@@ -235,7 +232,7 @@ describe('licensing plugin', () => {
         await plugin.setup(coreSetup);
         const { license$ } = await plugin.start();
 
-        const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
+        const [first, second, third] = await firstValueFrom(license$.pipe(take(3), toArray()));
         expect(first.signature === third.signature).toBe(true);
         expect(first.signature === second.signature).toBe(false);
       });
@@ -308,7 +305,7 @@ describe('licensing plugin', () => {
         );
         expect(customClient.asInternalUser.xpack.info).toHaveBeenCalledTimes(0);
 
-        const customLicense = await customLicense$.pipe(take(1)).toPromise();
+        const customLicense = await firstValueFrom(customLicense$);
         expect(customClient.asInternalUser.xpack.info).toHaveBeenCalledTimes(1);
 
         await flushPromises(customPollingFrequency * 1.5);
@@ -341,7 +338,7 @@ describe('licensing plugin', () => {
         await refresh();
 
         expect(customClient.asInternalUser.xpack.info).toHaveBeenCalledTimes(1);
-        const license = await license$.pipe(take(1)).toPromise();
+        const license = await firstValueFrom(license$);
         expect(license.type).toBe('gold');
       });
     });
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index 490bf0be3b5a8..98dd1e7cbbb93 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -19,7 +19,7 @@ import {
   Plugin,
   PluginInitializerContext,
   IClusterClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import {
   ILicense,
diff --git a/x-pack/plugins/licensing/server/plugin_status.test.ts b/x-pack/plugins/licensing/server/plugin_status.test.ts
index e099360668827..713392901adaf 100644
--- a/x-pack/plugins/licensing/server/plugin_status.test.ts
+++ b/x-pack/plugins/licensing/server/plugin_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { TestScheduler } from 'rxjs/testing';
-import { ServiceStatusLevels } from '../../../../src/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { licenseMock } from '../common/licensing.mock';
 import { getPluginStatus$ } from './plugin_status';
 import { ILicense } from '../common/types';
diff --git a/x-pack/plugins/licensing/server/plugin_status.ts b/x-pack/plugins/licensing/server/plugin_status.ts
index f830bd966b71b..b1afd9ea21af2 100644
--- a/x-pack/plugins/licensing/server/plugin_status.ts
+++ b/x-pack/plugins/licensing/server/plugin_status.ts
@@ -7,7 +7,7 @@
 
 import { Observable } from 'rxjs';
 import { takeUntil, startWith, map } from 'rxjs/operators';
-import { ServiceStatus, ServiceStatusLevels } from '../../../../src/core/server';
+import { ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import { ILicense } from '../common/types';
 
 export const getPluginStatus$ = (
diff --git a/x-pack/plugins/licensing/server/routes/feature_usage.ts b/x-pack/plugins/licensing/server/routes/feature_usage.ts
index 00c1d807a5e1e..33317ab09cb9d 100644
--- a/x-pack/plugins/licensing/server/routes/feature_usage.ts
+++ b/x-pack/plugins/licensing/server/routes/feature_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { LicensingPluginStart } from '../types';
 import { LicensingRouter } from '../types';
 
diff --git a/x-pack/plugins/licensing/server/routes/index.ts b/x-pack/plugins/licensing/server/routes/index.ts
index 3c17cefdcdfb6..2536f36e313f9 100644
--- a/x-pack/plugins/licensing/server/routes/index.ts
+++ b/x-pack/plugins/licensing/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { StartServicesAccessor } from 'src/core/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { LicensingPluginStart } from '../types';
 import { FeatureUsageServiceSetup } from '../services';
 import { registerInfoRoute } from './info';
diff --git a/x-pack/plugins/licensing/server/types.ts b/x-pack/plugins/licensing/server/types.ts
index 5eba838b956db..59bb2dd5b1045 100644
--- a/x-pack/plugins/licensing/server/types.ts
+++ b/x-pack/plugins/licensing/server/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import type { IClusterClient, IRouter, RequestHandlerContext } from 'src/core/server';
+import type { IClusterClient, IRouter, RequestHandlerContext } from '@kbn/core/server';
 import { ILicense } from '../common/types';
 import { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './services';
 
diff --git a/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts b/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts
index 804783116cd49..f1e93dc9a7b11 100644
--- a/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts
+++ b/x-pack/plugins/licensing/server/wrap_route_with_license_check.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { wrapRouteWithLicenseCheck, CheckLicense } from './wrap_route_with_license_check';
 
diff --git a/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts b/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts
index 9d60737e65656..2358e24b6793a 100644
--- a/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts
+++ b/x-pack/plugins/licensing/server/wrap_route_with_license_check.ts
@@ -5,7 +5,12 @@
  * 2.0.
  */
 
-import { RequestHandler, KibanaRequest, RouteMethod, KibanaResponseFactory } from 'src/core/server';
+import {
+  RequestHandler,
+  KibanaRequest,
+  RouteMethod,
+  KibanaResponseFactory,
+} from '@kbn/core/server';
 
 import { ILicense } from '../common/types';
 import type { LicensingRequestHandlerContext } from './types';
diff --git a/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts
index 908ee9feafcc2..38bb32169beb5 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_item_schema.mock.ts
@@ -17,7 +17,7 @@ import {
   TYPE,
   USER,
   VALUE,
-} from '../../../common/constants.mock';
+} from '../../constants.mock';
 
 export const getListItemResponseMock = (): ListItemSchema => ({
   _version: undefined,
diff --git a/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts
index 64afb1e73beaa..adfe72d5e9125 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_schema.mock.ts
@@ -19,7 +19,7 @@ import {
   TYPE,
   USER,
   VERSION,
-} from '../../../common/constants.mock';
+} from '../../constants.mock';
 
 export const getListResponseMock = (): ListSchema => ({
   _version: undefined,
diff --git a/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts
index d51f454eb3d40..03d71ccaa59b9 100644
--- a/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/search_list_item_schema.mock.ts
@@ -7,7 +7,7 @@
 
 import type { SearchListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { VALUE } from '../../../common/constants.mock';
+import { VALUE } from '../../constants.mock';
 
 import { getListItemResponseMock } from './list_item_schema.mock';
 
diff --git a/x-pack/plugins/lists/public/exceptions/api.test.ts b/x-pack/plugins/lists/public/exceptions/api.test.ts
index 923f4db19f62e..a7d55139b7f5a 100644
--- a/x-pack/plugins/lists/public/exceptions/api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.test.ts
@@ -19,8 +19,8 @@ import {
   updateExceptionList,
   updateExceptionListItem,
 } from '@kbn/securitysolution-list-api';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../src/core/public/mocks';
 import { getExceptionListSchemaMock } from '../../common/schemas/response/exception_list_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../common/schemas/response/exception_list_item_schema.mock';
 import { getCreateExceptionListSchemaMock } from '../../common/schemas/request/create_exception_list_schema.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx
index 74ec0759b057e..b0242ef38b95a 100644
--- a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.stories.tsx
@@ -8,8 +8,7 @@
 import { Story } from '@storybook/react';
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { AndOrBadge, AndOrBadgeProps } from '.';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx
index 26aa41549e61b..457f04d55c4b5 100644
--- a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/index.test.tsx
@@ -7,10 +7,9 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-
-import { AndOrBadge } from './';
+import { AndOrBadge } from '.';
 
 describe('AndOrBadge', () => {
   test('it renders top and bottom antenna bars when "includeAntennas" is true', () => {
diff --git a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx
index dd5ed999dadcd..8b58d4767244b 100644
--- a/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/and_or_badge/rounded_badge_antenna.test.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { RoundedBadgeAntenna } from './rounded_badge_antenna';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx
index 4a1471d9a3e5d..aee4b7e298654 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/and_badge.test.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { BuilderAndBadgeComponent } from './and_badge';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx
index 0f842bb53b99e..ff2efccee90a6 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/builder.stories.tsx
@@ -7,11 +7,11 @@
 
 import { Story, addDecorator } from '@storybook/react';
 import React from 'react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
+import type { AutocompleteStart } from '@kbn/data-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
 import { getEntryMatchMock } from '../../../../common/schemas/types/entry_match.mock';
 import { getEntryExistsMock } from '../../../../common/schemas/types/entry_exists.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx
index 77e255f9ed2ae..6388a9e5b7053 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.stories.tsx
@@ -8,15 +8,14 @@
 import { Story } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import React from 'react';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   ListOperatorEnum as OperatorEnum,
   ListOperatorTypeEnum as OperatorTypeEnum,
 } from '@kbn/securitysolution-io-ts-list-types';
-
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import type { AutocompleteStart } from '@kbn/data-plugin/public';
+import { fields } from '@kbn/data-plugin/common/mocks';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 import { BuilderEntryItem, EntryItemProps } from './entry_renderer';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx
index aa7071a9074a9..4409bd0448ec8 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.test.tsx
@@ -22,11 +22,11 @@ import {
 } from '@kbn/securitysolution-list-utils';
 import { validateFilePathInput } from '@kbn/securitysolution-utils';
 import { useFindLists } from '@kbn/securitysolution-list-hooks';
-import type { FieldSpec } from 'src/plugins/data/common';
+import type { FieldSpec } from '@kbn/data-plugin/common';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { getFoundListSchemaMock } from '../../../../common/schemas/response/found_list_schema.mock';
 
 import { BuilderEntryItem } from './entry_renderer';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
index 3832803a54971..3b65042866c55 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/entry_renderer.tsx
@@ -44,9 +44,9 @@ import {
   validateFilePathInput,
 } from '@kbn/securitysolution-utils';
 import { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import type { AutocompleteStart } from '@kbn/data-plugin/public';
+import { HttpStart } from '@kbn/core/public';
 
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
-import { HttpStart } from '../../../../../../../src/core/public';
 import { getEmptyValue } from '../../../common/empty_value';
 
 import * as i18n from './translations';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx
index fed24ba428e6c..65c1e38215984 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.test.tsx
@@ -7,14 +7,14 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { fields } from '@kbn/data-plugin/common/mocks';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
 import { getExceptionListItemSchemaMock } from '../../../../common/schemas/response/exception_list_item_schema.mock';
 import { getEntryMatchMock } from '../../../../common/schemas/types/entry_match.mock';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
 
 import { BuilderExceptionListItemComponent } from './exception_item_renderer';
 
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx
index febfa54a482b2..a8b6850239757 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_item_renderer.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback, useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import styled from 'styled-components';
-import { HttpStart } from 'kibana/public';
-import type { AutocompleteStart } from 'src/plugins/data/public';
+import { HttpStart } from '@kbn/core/public';
+import type { AutocompleteStart } from '@kbn/data-plugin/public';
 import { ExceptionListType, OsTypeArray } from '@kbn/securitysolution-io-ts-list-types';
 import {
   BuilderEntry,
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx
index d9dfbfeee299d..5e86979432f60 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { ReactWrapper, mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
-import { coreMock } from 'src/core/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
 import { getExceptionListItemSchemaMock } from '../../../../common/schemas/response/exception_list_item_schema.mock';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
 import { getEmptyValue } from '../../../common/empty_value';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx
index c7da32cc1669d..8a04ebed888dd 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/exception_items_renderer.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useEffect, useReducer } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import styled from 'styled-components';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { addIdToItem } from '@kbn/securitysolution-utils';
 import {
   CreateExceptionListItemSchema,
@@ -32,8 +32,8 @@ import {
   getNewExceptionItem,
 } from '@kbn/securitysolution-list-utils';
 import { DataViewBase } from '@kbn/es-query';
+import type { AutocompleteStart } from '@kbn/data-plugin/public';
 
-import type { AutocompleteStart } from '../../../../../../../src/plugins/data/public';
 import { AndOrBadge } from '../and_or_badge';
 
 import { BuilderExceptionListItemComponent } from './exception_item_renderer';
diff --git a/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts b/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts
index 4a0c1ee1533d9..8e1c7e444ab4e 100644
--- a/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/components/builder/helpers.test.ts
@@ -53,12 +53,12 @@ import {
   isOperator,
 } from '@kbn/securitysolution-list-utils';
 import { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
+import type { FieldSpec } from '@kbn/data-plugin/common';
 
 import { ENTRIES_WITH_IDS } from '../../../../common/constants.mock';
 import { getEntryExistsMock } from '../../../../common/schemas/types/entry_exists.mock';
 import { getExceptionListItemSchemaMock } from '../../../../common/schemas/response/exception_list_item_schema.mock';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
 import { getEntryNestedMock } from '../../../../common/schemas/types/entry_nested.mock';
 import { getEntryMatchMock } from '../../../../common/schemas/types/entry_match.mock';
 import { getEntryMatchAnyMock } from '../../../../common/schemas/types/entry_match_any.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
index 6488da2e32523..7cb2311c5e10a 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
@@ -12,9 +12,9 @@ import {
   ReturnPersistExceptionItem,
   usePersistExceptionItem,
 } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { ENTRIES_WITH_IDS } from '../../../common/constants.mock';
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getCreateExceptionListItemSchemaMock } from '../../../common/schemas/request/create_exception_list_item_schema.mock';
 import { getUpdateExceptionListItemSchemaMock } from '../../../common/schemas/request/update_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
index df0160b6e0b5d..09257c489a895 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
@@ -12,8 +12,8 @@ import {
   ReturnPersistExceptionList,
   usePersistExceptionList,
 } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getCreateExceptionListSchemaMock } from '../../../common/schemas/request/create_exception_list_schema.mock';
 import { getUpdateExceptionListSchemaMock } from '../../../common/schemas/request/update_exception_list_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
index 21e08924856c8..0bd97dffb34f8 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
@@ -14,15 +14,15 @@ import type {
   ApiCallByListIdProps,
   UpdateExceptionListItemProps,
 } from '@kbn/securitysolution-io-ts-list-types';
+import { coreMock } from '@kbn/core/public/mocks';
+import { HttpStart } from '@kbn/core/public';
 
 import { ENTRIES_WITH_IDS } from '../../../common/constants.mock';
 import { getUpdateExceptionListItemSchemaMock } from '../../../common/schemas/request/update_exception_list_item_schema.mock';
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import { getCreateExceptionListItemSchemaMock } from '../../../common/schemas/request/create_exception_list_item_schema.mock';
-import { HttpStart } from '../../../../../../src/core/public';
 
 jest.mock('@kbn/securitysolution-list-api');
 
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts
index ef05b5f4750a3..d8ae72d4d6205 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list_items.test.ts
@@ -17,8 +17,8 @@ import {
   transformInput,
   useExceptionListItems,
 } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 
 jest.mock('uuid', () => ({
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts
index 69b157835e882..1f360a671aaae 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_lists.test.ts
@@ -12,8 +12,8 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import * as api from '@kbn/securitysolution-list-api';
 import { ReturnExceptionLists, useExceptionLists } from '@kbn/securitysolution-list-hooks';
+import { coreMock } from '@kbn/core/public/mocks';
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
 import { getFoundExceptionListSchemaMock } from '../../../common/schemas/response/found_exception_list_schema.mock';
 
 const mockKibanaHttpService = coreMock.createStart().http;
diff --git a/x-pack/plugins/lists/public/index.ts b/x-pack/plugins/lists/public/index.ts
index f35de2328714b..0dae8ba93696f 100644
--- a/x-pack/plugins/lists/public/index.ts
+++ b/x-pack/plugins/lists/public/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-export { getExceptionBuilderComponentLazy } from './exceptions/components/builder/index';
-export type { OnChangeProps } from './exceptions/components/builder/index';
+export { getExceptionBuilderComponentLazy } from './exceptions/components/builder';
+export type { OnChangeProps } from './exceptions/components/builder';
 
-import type { PluginInitializerContext } from '../../../../src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 
 import { Plugin } from './plugin';
 import type { PluginSetup, PluginStart } from './types';
diff --git a/x-pack/plugins/lists/public/lists/api.test.ts b/x-pack/plugins/lists/public/lists/api.test.ts
index 8002092235a81..92595193c9957 100644
--- a/x-pack/plugins/lists/public/lists/api.test.ts
+++ b/x-pack/plugins/lists/public/lists/api.test.ts
@@ -13,9 +13,9 @@ import {
   importList,
   readListIndex,
 } from '@kbn/securitysolution-list-api';
+import { HttpFetchOptions } from '@kbn/core/public';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { HttpFetchOptions } from '../../../../../src/core/public';
-import { httpServiceMock } from '../../../../../src/core/public/mocks';
 import { getAcknowledgeSchemaResponseMock } from '../../common/schemas/response/acknowledge_schema.mock';
 import { getListResponseMock } from '../../common/schemas/response/list_schema.mock';
 import { getListItemIndexExistSchemaResponseMock } from '../../common/schemas/response/list_item_index_exist_schema.mock';
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts
index 3a8a334fec319..44b7e57f11cb1 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_create_list_index.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useCreateListIndex } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getAcknowledgeSchemaResponseMock } from '../../../common/schemas/response/acknowledge_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
index 37f09915075f8..aac604a89bc8a 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_delete_list.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useDeleteList } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
index 6ffe5c93bcb04..4977d585fe43b 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_export_list.test.ts
@@ -8,8 +8,7 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useExportList } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
-
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('@kbn/securitysolution-list-api');
 
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
index a766187c50c50..c32ff10509d7a 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_find_lists.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useFindLists } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getFoundListSchemaMock } from '../../../common/schemas/response/found_list_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts
index 209ff113aeaca..4a1557e94fe79 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_import_list.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useImportList } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts b/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts
index 7043812aaa650..d8740b63fac58 100644
--- a/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts
+++ b/x-pack/plugins/lists/public/lists/hooks/use_read_list_index.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useReadListIndex } from '@kbn/securitysolution-list-hooks';
 import * as Api from '@kbn/securitysolution-list-api';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
 import { getAcknowledgeSchemaResponseMock } from '../../../common/schemas/response/acknowledge_schema.mock';
 
 jest.mock('@kbn/securitysolution-list-api');
diff --git a/x-pack/plugins/lists/public/lists/types.ts b/x-pack/plugins/lists/public/lists/types.ts
index 575ccde1ea286..d8b2756240c8a 100644
--- a/x-pack/plugins/lists/public/lists/types.ts
+++ b/x-pack/plugins/lists/public/lists/types.ts
@@ -6,8 +6,7 @@
  */
 
 import type { Type } from '@kbn/securitysolution-io-ts-list-types';
-
-import { HttpStart } from '../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 export interface ApiParams {
   http: HttpStart;
diff --git a/x-pack/plugins/lists/public/plugin.ts b/x-pack/plugins/lists/public/plugin.ts
index 5070c32df9ec8..8c86d42616d63 100644
--- a/x-pack/plugins/lists/public/plugin.ts
+++ b/x-pack/plugins/lists/public/plugin.ts
@@ -10,7 +10,7 @@ import {
   CoreStart,
   Plugin as IPlugin,
   PluginInitializerContext,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 
 import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types';
 
diff --git a/x-pack/plugins/lists/public/shared_exports.ts b/x-pack/plugins/lists/public/shared_exports.ts
index bb75fea9fbe3e..efaec0cb89a8b 100644
--- a/x-pack/plugins/lists/public/shared_exports.ts
+++ b/x-pack/plugins/lists/public/shared_exports.ts
@@ -7,4 +7,4 @@
 
 /** DEPRECATED, TRY NOT TO ADD ANYTHING HERE. INSTEAD TRY TO USE AND/OR CREATE kibana packages @kbn/... */
 
-export * as ExceptionBuilder from './exceptions/components/builder/index';
+export * as ExceptionBuilder from './exceptions/components/builder';
diff --git a/x-pack/plugins/lists/server/get_space_id.test.ts b/x-pack/plugins/lists/server/get_space_id.test.ts
index 840e0eaaf9ad9..ff20282fb41dc 100644
--- a/x-pack/plugins/lists/server/get_space_id.test.ts
+++ b/x-pack/plugins/lists/server/get_space_id.test.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
-import { KibanaRequest } from 'src/core/server';
-
-import { spacesServiceMock } from '../../spaces/server/spaces_service/spaces_service.mock';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { spacesServiceMock } from '@kbn/spaces-plugin/server/spaces_service/spaces_service.mock';
 
 import { getSpaceId } from './get_space_id';
 
diff --git a/x-pack/plugins/lists/server/get_space_id.ts b/x-pack/plugins/lists/server/get_space_id.ts
index 05bfb99e101ce..31c3aff9bac8a 100644
--- a/x-pack/plugins/lists/server/get_space_id.ts
+++ b/x-pack/plugins/lists/server/get_space_id.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-
-import { SpacesServiceStart } from '../../spaces/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 export const getSpaceId = ({
   spaces,
diff --git a/x-pack/plugins/lists/server/get_user.test.ts b/x-pack/plugins/lists/server/get_user.test.ts
index 0d63329bf9040..a05976e7d82f2 100644
--- a/x-pack/plugins/lists/server/get_user.test.ts
+++ b/x-pack/plugins/lists/server/get_user.test.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
-import { KibanaRequest } from 'src/core/server';
-
-import { securityMock } from '../../security/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
 import { getUser } from './get_user';
 
diff --git a/x-pack/plugins/lists/server/get_user.ts b/x-pack/plugins/lists/server/get_user.ts
index f0ee3862a0003..a3adb05ae5ef6 100644
--- a/x-pack/plugins/lists/server/get_user.ts
+++ b/x-pack/plugins/lists/server/get_user.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-
-import { SecurityPluginStart } from '../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface GetUserOptions {
   security: SecurityPluginStart | null | undefined;
diff --git a/x-pack/plugins/lists/server/index.ts b/x-pack/plugins/lists/server/index.ts
index de54dfb3d8494..ef63343d8f5ea 100644
--- a/x-pack/plugins/lists/server/index.ts
+++ b/x-pack/plugins/lists/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { ListPlugin } from './plugin';
diff --git a/x-pack/plugins/lists/server/plugin.ts b/x-pack/plugins/lists/server/plugin.ts
index c824c6889c362..c5cef49e48735 100644
--- a/x-pack/plugins/lists/server/plugin.ts
+++ b/x-pack/plugins/lists/server/plugin.ts
@@ -5,11 +5,15 @@
  * 2.0.
  */
 
-import { Logger, Plugin, PluginInitializerContext } from 'kibana/server';
-import type { CoreSetup, CoreStart } from 'src/core/server';
-
-import type { SecurityPluginStart } from '../../security/server';
-import type { SpacesServiceStart } from '../../spaces/server';
+import type {
+  CoreSetup,
+  CoreStart,
+  Logger,
+  Plugin,
+  PluginInitializerContext,
+} from '@kbn/core/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
 import { ConfigType } from './config';
 import { initRoutes } from './routes/init_routes';
diff --git a/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts b/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts
index fe76de24aa7b9..4a5ed5cc4b0e0 100644
--- a/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts
+++ b/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CustomHttpResponseOptions, KibanaResponseFactory } from 'src/core/server';
+import { CustomHttpResponseOptions, KibanaResponseFactory } from '@kbn/core/server';
 
 /**
  * Copied from x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
diff --git a/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts b/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts
index 9e6064d192d40..aeb5447285939 100644
--- a/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts
+++ b/x-pack/plugins/lists/server/routes/utils/route_validation.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { RouteValidationResultFactory } from 'src/core/server';
+import { RouteValidationResultFactory } from '@kbn/core/server';
 
 import { buildRouteValidation } from './route_validation';
 
diff --git a/x-pack/plugins/lists/server/routes/utils/route_validation.ts b/x-pack/plugins/lists/server/routes/utils/route_validation.ts
index 680b67949bde5..ceeb63c002653 100644
--- a/x-pack/plugins/lists/server/routes/utils/route_validation.ts
+++ b/x-pack/plugins/lists/server/routes/utils/route_validation.ts
@@ -15,12 +15,11 @@ import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import * as rt from 'io-ts';
 import { exactCheck, formatErrors } from '@kbn/securitysolution-io-ts-utils';
-
 import {
   RouteValidationError,
   RouteValidationFunction,
   RouteValidationResultFactory,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 type RequestValidationResult<T> =
   | {
diff --git a/x-pack/plugins/lists/server/saved_objects/exception_list.ts b/x-pack/plugins/lists/server/saved_objects/exception_list.ts
index 3d31bdd561140..be0a9982e2913 100644
--- a/x-pack/plugins/lists/server/saved_objects/exception_list.ts
+++ b/x-pack/plugins/lists/server/saved_objects/exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   exceptionListAgnosticSavedObjectType,
   exceptionListSavedObjectType,
diff --git a/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts b/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts
index a83ab3cc7d13a..3b621a12ad4ef 100644
--- a/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts
+++ b/x-pack/plugins/lists/server/saved_objects/init_saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
 import { exceptionListAgnosticType, exceptionListType } from './exception_list';
 
diff --git a/x-pack/plugins/lists/server/saved_objects/migrations.test.ts b/x-pack/plugins/lists/server/saved_objects/migrations.test.ts
index 7fea07f479cc8..81e290effafb8 100644
--- a/x-pack/plugins/lists/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/lists/server/saved_objects/migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import uuid from 'uuid';
 import {
   ENDPOINT_LIST_ID,
diff --git a/x-pack/plugins/lists/server/saved_objects/migrations.ts b/x-pack/plugins/lists/server/saved_objects/migrations.ts
index ec6617f6b4730..dfa1615f195a6 100644
--- a/x-pack/plugins/lists/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/lists/server/saved_objects/migrations.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { SavedObjectSanitizedDoc, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectSanitizedDoc, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import {
   EntriesArray,
   NonEmptyNestedEntriesArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts b/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts
index 0fbcd08316166..af112a8998212 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/close_point_in_time.ts
@@ -8,7 +8,7 @@
 import type {
   SavedObjectsClientContract,
   SavedObjectsClosePointInTimeResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type { PitId } from '@kbn/securitysolution-io-ts-list-types';
 
 interface ClosePointInTimeOptions {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts
index a677e260d0848..d197aed76a8b6 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_endpoint_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import { Version } from '@kbn/securitysolution-io-ts-types';
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
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
index 4275e23032a76..00b955cda8126 100644
--- 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import type { Version } from '@kbn/securitysolution-io-ts-types';
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts
index 60a53af4deb75..65f06b052565b 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import type {
   Description,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts
index 9771c7d485e50..6c72f546e6694 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/create_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import uuid from 'uuid';
 import type {
   CreateCommentsArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts
index be71f4c79577a..2d7332739e43c 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   ExceptionListSchema,
   IdOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts
index 89ea0baf22caf..380aad63dfc9d 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   ExceptionListItemSchema,
   Id,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts
index c23c8967fef68..6a47052143069 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/delete_exception_list_items_by_list.ts
@@ -12,7 +12,7 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import { asyncForEach } from '@kbn/std';
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { findExceptionListItemPointInTimeFinder } from './find_exception_list_item_point_in_time_finder';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
index eaa4651b384f7..218ccf585dec4 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
@@ -7,7 +7,7 @@
 
 import { Readable } from 'stream';
 
-import { loggingSystemMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import {
   EXCEPTION_LIST_NAMESPACE,
@@ -17,7 +17,8 @@ import type {
   SavedObjectsBulkUpdateObject,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
+import type { SavedObject } from '@kbn/core/types';
 
 import { getFoundExceptionListSchemaMock } from '../../../common/schemas/response/found_exception_list_schema.mock';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
@@ -30,7 +31,6 @@ import {
 import { ExtensionPointStorage, ExtensionPointStorageClientInterface } from '../extension_points';
 import type { ExceptionListSoSchema } from '../../schemas/saved_objects';
 import { DATE_NOW, ID, _VERSION } from '../../../common/constants.mock';
-import type { SavedObject } from '../../../../../../src/core/types';
 
 import { ExceptionListClient } from './exception_list_client';
 import type {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts
index 1a444c403d3c2..89516d5a9caf2 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.test.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { httpServerMock } from '@kbn/core/server/mocks';
+
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
 import {
@@ -12,7 +14,6 @@ import {
   createExtensionPointStorageMock,
 } from '../extension_points/extension_point_storage.mock';
 import type { ExtensionPointCallbackDataArgument } from '../extension_points';
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
 
 import {
   getCreateExceptionListItemOptionsMock,
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 85dbd76e7b7c4..c586a9d764147 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
@@ -10,7 +10,7 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsClosePointInTimeResponse,
   SavedObjectsOpenPointInTimeResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   ExceptionListItemSchema,
   ExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts
index 1f440415fef40..2b3a800ac5a5a 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts
@@ -11,7 +11,7 @@ import type {
   KibanaRequest,
   SavedObjectsClientContract,
   SavedObjectsOpenPointInTimeOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type {
   CreateCommentsArray,
   Description,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts
index 0f8e4bf7bbf45..06e764bd1658b 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts
index b2cd7d38d8d56..fecbb91837b6f 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/export_exception_list_and_items.ts
@@ -14,7 +14,7 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { findExceptionListItemPointInTimeFinder } from './find_exception_list_item_point_in_time_finder';
 import { getExceptionList } from './get_exception_list';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts
index 46d292e93a2d1..4f93527dbec93 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts
index 5c23475573bb6..c08057d77ebbe 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts
index 8b90315c80ada..a43bee154e8da 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_item_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts
index 5b4601dfadc22..f0e1fa07749f8 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   NamespaceTypeArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts
index d9020ee42b6ec..8bd79eaa7f3a2 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_items_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   MaxSizeOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts
index 356735e773a01..77869f2f847fa 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_exception_list_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FilterOrUndefined,
   FoundExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts
index 711c8f9c253d1..88812995f4aa0 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   Id,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts
index e854bd6128746..bc34bb18162f7 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/find_value_list_exception_list_items_point_in_time_finder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   FoundExceptionListItemSchema,
   Id,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts
index b0b66ffb70d77..4d63859669b71 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list.ts
@@ -12,11 +12,8 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
 import { ExceptionListSoSchema } from '../../schemas/saved_objects';
 
 import { transformSavedObjectToExceptionList } from './utils';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts
index 12580af8a1d07..481394e247f70 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_item.ts
@@ -12,11 +12,8 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
 import { ExceptionListSoSchema } from '../../schemas/saved_objects';
 
 import { transformSavedObjectToExceptionListItem } from './utils';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts
index 7f871d9f78ebf..f56410e3a56b5 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.test.ts
@@ -7,9 +7,8 @@
 
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { ExceptionListSummarySchema } from '@kbn/securitysolution-io-ts-list-types';
-
-import type { SavedObjectsClientContract } from '../../../../../../src/core/server';
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { getExceptionListSummary } from './get_exception_list_summary';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts
index 67aaddee502de..081bb1787eff8 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/get_exception_list_summary.ts
@@ -13,11 +13,8 @@ import type {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
+import { SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../src/core/server';
 import { ExceptionListSoSchema } from '../../schemas/saved_objects';
 
 interface GetExceptionListSummaryOptions {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts
index 63f9bd27b888f..375e211cabe46 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.test.ts
@@ -8,7 +8,7 @@
 import {
   getImportExceptionsListItemSchemaMock,
   getImportExceptionsListSchemaMock,
-} from '../../../../lists/common/schemas/request/import_exceptions_schema.mock';
+} from '../../../common/schemas/request/import_exceptions_schema.mock';
 import { createExtensionPointStorageMock } from '../extension_points/extension_point_storage.mock';
 
 import { importExceptionLists } from './utils/import/import_exception_lists';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts
index 0657c3586dd13..deef7b7b21917 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/import_exception_list_and_items.ts
@@ -16,7 +16,7 @@ import {
   ImportExceptionsResponseSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { createPromiseFromStreams } from '@kbn/utils';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { chunk } from 'lodash/fp';
 
 import { importExceptionLists } from './utils/import/import_exception_lists';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts b/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts
index 271676527dd2f..c959a91aad5bb 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/open_point_in_time.ts
@@ -9,7 +9,7 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsOpenPointInTimeOptions,
   SavedObjectsOpenPointInTimeResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type { NamespaceType } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectTypes } from '@kbn/securitysolution-list-utils';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts
index 7efe64fb96070..aab2718b2d84c 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   DescriptionOrUndefined,
   ExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts
index d0505a9513385..81e58709528c7 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/update_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   DescriptionOrUndefined,
   EntriesArray,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts
index 4427b706cf268..a3dbc4cdfa9eb 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { ENTRIES } from '../../../../../common/constants.mock';
 
 import { bulkCreateImportedItems } from './bulk_create_imported_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts
index 3cb45bf035170..55ac181f5e266 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_items.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts
index caf3651935610..9001f225e7364 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 
 import { bulkCreateImportedLists } from './bulk_create_imported_lists';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts
index 5b18315b4cd43..eae8a92d79b2b 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_create_imported_lists.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts
index 5f2fb3f11ef98..d52e07740910e 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { ENTRIES } from '../../../../../common/constants.mock';
 
 import { bulkUpdateImportedItems } from './bulk_update_imported_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts
index 049f93ffe700b..beba05e7fe2aa 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_items.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts
index 16659e2c547cb..39ff7cc7bbf40 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 
 import { bulkUpdateImportedLists } from './bulk_update_imported_lists';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts
index 003ce9d2b029b..61ac39a22406d 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/bulk_update_imported_lists.ts
@@ -6,7 +6,7 @@
  */
 
 import { has } from 'lodash/fp';
-import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsBulkUpdateObject, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects/exceptions_list_so_schema';
 import { ImportResponse } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts
index cc7914d219550..17b0ce12913fb 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { NamespaceType } from '@kbn/securitysolution-io-ts-list-types';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
 import { deleteExceptionListItemByList } from '../../delete_exception_list_items_by_list';
 
 import { deleteListItemsToBeOverwritten } from './delete_list_items_to_overwrite';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts
index f2b3afabcac42..3d0cc609bde51 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/delete_list_items_to_overwrite.ts
@@ -6,7 +6,7 @@
  */
 
 import { NamespaceType } from '@kbn/securitysolution-io-ts-list-types';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { deleteExceptionListItemByList } from '../../delete_exception_list_items_by_list';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts
index 445031e6c105a..60d63c00b0114 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
-import type { SavedObjectsClientContract } from '../../../../../../../../src/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+
 import { getImportExceptionsListItemSchemaDecodedMock } from '../../../../../common/schemas/request/import_exceptions_schema.mock';
 
 import {
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts
index 3884d12b4bb6f..14d12ceb950a3 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_item_types.ts
@@ -11,7 +11,7 @@ import {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectTypes } from '@kbn/securitysolution-list-utils';
-import { SavedObjectsClientContract, SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsClientContract, SavedObjectsFindResponse } from '@kbn/core/server';
 
 import { ExceptionListSoSchema } from '../../../../schemas/saved_objects';
 import { getExceptionListsItemFilter } from '../get_exception_lists_item_filter';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts
index f0e35afe8561d..292455db7a177 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
-import type { SavedObjectsClientContract } from '../../../../../../../../src/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+
 import { findExceptionList } from '../../find_exception_list';
 
 import { findAllListTypes, getAllListTypes, getListFilter } from './find_all_exception_list_types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts
index 51538faa66942..870acc6cc4462 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/find_all_exception_list_types.ts
@@ -11,7 +11,7 @@ import {
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getSavedObjectTypes } from '@kbn/securitysolution-list-utils';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { findExceptionList } from '../../find_exception_list';
 import { CHUNK_PARSED_OBJECT_SIZE } from '../../import_exception_list_and_items';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts
index c19a2bf850d37..acb516993fe60 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_list_items.ts
@@ -9,7 +9,7 @@ import {
   ImportExceptionListItemSchemaDecoded,
   NamespaceType,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
 import { ImportDataResponse, ImportResponse } from '../../import_exception_list_and_items';
 
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts
index 04e629695ef1a..13141a7a16400 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/import_exception_lists.ts
@@ -6,8 +6,8 @@
  */
 
 import { ImportExceptionListSchemaDecoded } from '@kbn/securitysolution-io-ts-list-types';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
-import { SavedObjectsClientContract } from '../../../../../../../../src/core/server/';
 import { ImportDataResponse, ImportResponse } from '../../import_exception_list_and_items';
 
 import { getAllListTypes } from './find_all_exception_list_types';
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts
index da4884506ef45..9bfc1a333969e 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_items_to_create_update.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from '@kbn/core/server';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import {
   BulkErrorSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts
index c27b76004b7f0..3c7e6217559e5 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/import/sort_exception_lists_to_create_update.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from 'kibana/server';
+import { SavedObjectsBulkCreateObject, SavedObjectsBulkUpdateObject } from '@kbn/core/server';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import {
   BulkErrorSchema,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts
index b0b0151e5f537..e61ce820af854 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/index.ts
@@ -6,7 +6,11 @@
  */
 
 import uuid from 'uuid';
-import { SavedObject, SavedObjectsFindResponse, SavedObjectsUpdateResponse } from 'kibana/server';
+import {
+  SavedObject,
+  SavedObjectsFindResponse,
+  SavedObjectsUpdateResponse,
+} from '@kbn/core/server';
 import {
   CommentsArray,
   CreateComment,
diff --git a/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts b/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts
index 10dd4f386d1b3..3317722fb72bc 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/utils/validate_data.test.ts
@@ -15,7 +15,7 @@ import { getCreateExceptionListItemOptionsMock } from '../exception_list_client.
 import { validateData } from './validate_data';
 import { DataValidationError } from './errors';
 
-import { transformCreateExceptionListItemOptionsToCreateExceptionListItemSchema } from './index';
+import { transformCreateExceptionListItemOptionsToCreateExceptionListItemSchema } from '.';
 
 describe('when using `validateData()` utility', () => {
   let data: CreateExceptionListItemSchema;
diff --git a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts
index 80c89e14dc2cf..d8c0596ba3501 100644
--- a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.mock.ts
@@ -6,8 +6,8 @@
  */
 
 import { MockedLogger, loggerMock } from '@kbn/logging-mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import { ExceptionListClient } from '../exception_lists/exception_list_client';
 
 import { ExtensionPointStorage } from './extension_point_storage';
diff --git a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts
index 4e76794f1db1a..03a7d9a7ccc63 100644
--- a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 
 import {
   ExtensionPoint,
diff --git a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts
index 453d5deccc8c8..f2d2035459b54 100644
--- a/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/extension_point_storage_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import type {
   ExtensionPoint,
diff --git a/x-pack/plugins/lists/server/services/extension_points/types.ts b/x-pack/plugins/lists/server/services/extension_points/types.ts
index dd94612a60295..61aa7c451362d 100644
--- a/x-pack/plugins/lists/server/services/extension_points/types.ts
+++ b/x-pack/plugins/lists/server/services/extension_points/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { UnionToIntersection } from '@kbn/utility-types';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 
 import {
   CreateExceptionListItemOptions,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts
index 31befdc2122d3..302b5919fbbdf 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { CreateListItemOptions } from '../items';
 import {
   DATE_NOW,
   LIST_ID,
@@ -20,6 +19,8 @@ import {
   USER,
 } from '../../../common/constants.mock';
 
+import { CreateListItemOptions } from '.';
+
 export const getCreateListItemOptionsMock = (): CreateListItemOptions => ({
   dateNow: DATE_NOW,
   deserializer: undefined,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.test.ts b/x-pack/plugins/lists/server/services/items/create_list_item.test.ts
index 305aa98f0e9ed..ccbfac5819c91 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getListItemResponseMock } from '../../../common/schemas/response/list_item_schema.mock';
 import { LIST_ITEM_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
diff --git a/x-pack/plugins/lists/server/services/items/create_list_item.ts b/x-pack/plugins/lists/server/services/items/create_list_item.ts
index 18a9f3ebe7726..966b8b63d5b68 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_item.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   DeserializerOrUndefined,
   IdOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts
index d2ceb32b91951..68c01610df988 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { CreateListItemsBulkOptions } from '../items';
 import {
   DATE_NOW,
   LIST_ID,
@@ -21,6 +20,8 @@ import {
   VALUE_2,
 } from '../../../common/constants.mock';
 
+import { CreateListItemsBulkOptions } from '.';
+
 export const getCreateListItemBulkOptionsMock = (): CreateListItemsBulkOptions => ({
   dateNow: DATE_NOW,
   deserializer: undefined,
diff --git a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
index d9b3bc322cd7a..83ff9c5bdc95f 100644
--- a/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
+++ b/x-pack/plugins/lists/server/services/items/create_list_items_bulk.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   DeserializerOrUndefined,
   MetaOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts
index 89331d02dc3ff..4b2807fdb5d7f 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { DeleteListItemOptions } from '../items';
 import { LIST_ITEM_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 
+import { DeleteListItemOptions } from '.';
+
 export const getDeleteListItemOptionsMock = (): DeleteListItemOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   id: LIST_ITEM_ID,
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item.ts b/x-pack/plugins/lists/server/services/items/delete_list_item.ts
index c43f2faf8c52d..8fbdae3420acf 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListItem } from '.';
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts
index 54bfe3bae0811..74d7016653c15 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { DeleteListItemByValueOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE } from '../../../common/constants.mock';
 
+import { DeleteListItemByValueOptions } from '.';
+
 export const getDeleteListItemByValueOptionsMock = (): DeleteListItemByValueOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
index cc3dc92f8f152..133beae0e6b62 100644
--- a/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
+++ b/x-pack/plugins/lists/server/services/items/delete_list_item_by_value.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getQueryFilterFromTypeValue } from '../utils';
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts
index 99c2f18877032..7e0c18ebbe487 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.mock.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { LIST_ID, LIST_INDEX, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 import { getShardMock } from '../../schemas/common/get_shard.mock';
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.test.ts b/x-pack/plugins/lists/server/services/items/find_list_item.test.ts
index 48625a74b9ae1..7eee57887f227 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getFoundListItemSchemaMock } from '../../../common/schemas/response/found_list_item_schema.mock';
 import { getShardMock } from '../../schemas/common/get_shard.mock';
diff --git a/x-pack/plugins/lists/server/services/items/find_list_item.ts b/x-pack/plugins/lists/server/services/items/find_list_item.ts
index 459cadfe0abcf..f390929d820eb 100644
--- a/x-pack/plugins/lists/server/services/items/find_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/find_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   FoundListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item.test.ts b/x-pack/plugins/lists/server/services/items/get_list_item.test.ts
index 7b867db9868d4..361b8a8b36327 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getListItemResponseMock } from '../../../common/schemas/response/list_item_schema.mock';
 import {
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item.ts b/x-pack/plugins/lists/server/services/items/get_list_item.ts
index 6a59a7f051fe1..f08900522b722 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { transformElasticToListItem } from '../utils';
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts
index 3cd329fca3708..7847b39c9b6bd 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { GetListItemByValueOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE } from '../../../common/constants.mock';
 
+import { GetListItemByValueOptions } from '.';
+
 export const getListItemByValueOptionsMocks = (): GetListItemByValueOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
index d631720d11cd3..f44a5e2577411 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_value.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListItemByValues } from '.';
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts
index 169934b2ee256..4efa627b90cdf 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { GetListItemByValuesOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE, VALUE_2 } from '../../../common/constants.mock';
 
+import { GetListItemByValuesOptions } from '.';
+
 export const getListItemByValuesOptionsMocks = (): GetListItemByValuesOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts
index d57fe0e2ead92..5d6bef3db9fe7 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import {
   DATE_NOW,
diff --git a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
index b0cdc77724ac7..867d721d8440c 100644
--- a/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
+++ b/x-pack/plugins/lists/server/services/items/get_list_item_by_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { ListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import {
diff --git a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts
index 656b569502fbb..4b085a990627d 100644
--- a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { SearchListItemByValuesOptions } from '../items';
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE, VALUE_2 } from '../../../common/constants.mock';
 
+import { SearchListItemByValuesOptions } from '.';
+
 export const searchListItemByValuesOptionsMocks = (): SearchListItemByValuesOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   listId: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts
index 2511db01d1901..5b75860297ae6 100644
--- a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts
+++ b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { SearchListItemArraySchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { LIST_ID, LIST_ITEM_INDEX, TYPE, VALUE, VALUE_2 } from '../../../common/constants.mock';
diff --git a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts
index 2a39f863311b9..365c5a57c724b 100644
--- a/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts
+++ b/x-pack/plugins/lists/server/services/items/search_list_item_by_values.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { SearchListItemArraySchema, Type } from '@kbn/securitysolution-io-ts-list-types';
 
 import {
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts b/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts
index 705e207853543..c68b278e6b735 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { UpdateListItemOptions } from '../items';
 import {
   DATE_NOW,
   LIST_ITEM_ID,
@@ -18,6 +17,8 @@ import {
   VALUE,
 } from '../../../common/constants.mock';
 
+import { UpdateListItemOptions } from '.';
+
 export const getUpdateListItemOptionsMock = (): UpdateListItemOptions => ({
   _version: undefined,
   dateNow: DATE_NOW,
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.test.ts b/x-pack/plugins/lists/server/services/items/update_list_item.test.ts
index a42253d3c1ae9..c3ff32d4e5074 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.test.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListItemResponseMock } from '../../../common/schemas/response/list_item_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/items/update_list_item.ts b/x-pack/plugins/lists/server/services/items/update_list_item.ts
index 17e706228fb46..71f6f9eba4290 100644
--- a/x-pack/plugins/lists/server/services/items/update_list_item.ts
+++ b/x-pack/plugins/lists/server/services/items/update_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Id,
   ListItemSchema,
diff --git a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts
index 949b7a5c1a691..ff0baba16576d 100644
--- a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { ImportListItemsToStreamOptions, WriteBufferToItemsOptions } from '../items';
 import {
   LIST_ID,
   LIST_INDEX,
@@ -22,6 +21,8 @@ import { getConfigMockDecoded } from '../../config.mock';
 
 import { TestReadable } from './test_readable.mock';
 
+import { ImportListItemsToStreamOptions, WriteBufferToItemsOptions } from '.';
+
 export const getImportListItemsToStreamOptionsMock = (): ImportListItemsToStreamOptions => ({
   config: getConfigMockDecoded(),
   deserializer: undefined,
diff --git a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
index edd78e350054d..9e9b15284cc67 100644
--- a/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
+++ b/x-pack/plugins/lists/server/services/items/write_lines_to_bulk_list_items.ts
@@ -7,7 +7,7 @@
 
 import { Readable } from 'stream';
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   DeserializerOrUndefined,
   ListIdOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts
index 1bc0b708bdc0a..0a5395d022b63 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { LIST_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 import { getSearchListItemMock } from '../../schemas/elastic_response/search_es_list_item_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
index 1e9db1ef062f0..d41dc61828563 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_stream.ts
@@ -8,7 +8,7 @@
 import { PassThrough } from 'stream';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 import { ErrorWithStatusCode } from '../../error_with_status_code';
 import { findSourceValue } from '../utils/find_source_value';
diff --git a/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts b/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts
index 8961d7527ad0b..b725ed7856e91 100644
--- a/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts
+++ b/x-pack/plugins/lists/server/services/items/write_list_items_to_streams.mock.ts
@@ -8,16 +8,17 @@
 import { Stream } from 'stream';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+
+import { LIST_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
+import { getSearchListItemMock } from '../../schemas/elastic_response/search_es_list_item_schema.mock';
 
 import {
   ExportListItemsToStreamOptions,
   GetResponseOptions,
   WriteNextResponseOptions,
   WriteResponseHitsToStreamOptions,
-} from '../items';
-import { LIST_ID, LIST_ITEM_INDEX } from '../../../common/constants.mock';
-import { getSearchListItemMock } from '../../schemas/elastic_response/search_es_list_item_schema.mock';
+} from '.';
 
 export const getExportListItemsToStreamOptionsMock = (): ExportListItemsToStreamOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.mock.ts b/x-pack/plugins/lists/server/services/lists/create_list.mock.ts
index 5e9c8e38c3f5e..3b5522ea4f5a8 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { CreateListOptions } from '../lists';
 import {
   DATE_NOW,
   DESCRIPTION,
@@ -23,6 +22,8 @@ import {
   VERSION,
 } from '../../../common/constants.mock';
 
+import { CreateListOptions } from '.';
+
 export const getCreateListOptionsMock = (): CreateListOptions => ({
   dateNow: DATE_NOW,
   description: DESCRIPTION,
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.test.ts b/x-pack/plugins/lists/server/services/lists/create_list.test.ts
index b2ccbd0d84fa0..1a9a6977ac907 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.test.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/create_list.ts b/x-pack/plugins/lists/server/services/lists/create_list.ts
index eefcd0f41e448..a9f7bd48df5d0 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Description,
   DeserializerOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts b/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts
index f97fbd2d88cc0..cfc5c242f5cc5 100644
--- a/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts
+++ b/x-pack/plugins/lists/server/services/lists/create_list_if_it_does_not_exist.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Description,
   DeserializerOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts b/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts
index 569083aad40db..fc8bdc797465c 100644
--- a/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/delete_list.mock.ts
@@ -6,11 +6,12 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { DeleteListOptions } from '../lists';
 import { LIST_ID, LIST_INDEX, LIST_ITEM_INDEX } from '../../../common/constants.mock';
 
+import { DeleteListOptions } from '.';
+
 export const getDeleteListOptionsMock = (): DeleteListOptions => ({
   esClient: elasticsearchClientMock.createScopedClusterClient().asCurrentUser,
   id: LIST_ID,
diff --git a/x-pack/plugins/lists/server/services/lists/delete_list.ts b/x-pack/plugins/lists/server/services/lists/delete_list.ts
index 517723fc227de..f82845e339ed7 100644
--- a/x-pack/plugins/lists/server/services/lists/delete_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/delete_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getList } from './get_list';
diff --git a/x-pack/plugins/lists/server/services/lists/find_list.ts b/x-pack/plugins/lists/server/services/lists/find_list.ts
index 63f636370a144..7d08302f0bc25 100644
--- a/x-pack/plugins/lists/server/services/lists/find_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/find_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   FoundListSchema,
diff --git a/x-pack/plugins/lists/server/services/lists/get_list.test.ts b/x-pack/plugins/lists/server/services/lists/get_list.test.ts
index f9e64fe70eeca..aa04539c687c9 100644
--- a/x-pack/plugins/lists/server/services/lists/get_list.test.ts
+++ b/x-pack/plugins/lists/server/services/lists/get_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
 import { LIST_ID, LIST_INDEX } from '../../../common/constants.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/get_list.ts b/x-pack/plugins/lists/server/services/lists/get_list.ts
index a1e34bdce6319..32c9efaab8c2a 100644
--- a/x-pack/plugins/lists/server/services/lists/get_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/get_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { Id, ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { transformElasticToList } from '../utils/transform_elastic_to_list';
diff --git a/x-pack/plugins/lists/server/services/lists/list_client.mock.ts b/x-pack/plugins/lists/server/services/lists/list_client.mock.ts
index 5ea6f7a8853d8..6ad3985ccddbf 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client.mock.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { getFoundListItemSchemaMock } from '../../../common/schemas/response/found_list_item_schema.mock';
 import { getFoundListSchemaMock } from '../../../common/schemas/response/found_list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/list_client.ts b/x-pack/plugins/lists/server/services/lists/list_client.ts
index 107bc31f2baea..71eb799fa6859 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import {
   createBootstrapIndex,
   deleteAllIndex,
@@ -26,16 +26,7 @@ import type {
   SearchListItemArraySchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 
-import { ConfigType } from '../../config';
-import {
-  createList,
-  deleteList,
-  findList,
-  getList,
-  getListIndex,
-  getListTemplate,
-  updateList,
-} from '../../services/lists';
+import type { ConfigType } from '../../config';
 import {
   createListItem,
   deleteListItem,
@@ -50,11 +41,11 @@ import {
   importListItemsToStream,
   searchListItemByValues,
   updateListItem,
-} from '../../services/items';
+} from '../items';
 import listsItemsPolicy from '../items/list_item_policy.json';
 
 import listPolicy from './list_policy.json';
-import {
+import type {
   ConstructorOptions,
   CreateListIfItDoesNotExistOptions,
   CreateListItemOptions,
@@ -76,12 +67,41 @@ import {
 } from './list_client_types';
 import { createListIfItDoesNotExist } from './create_list_if_it_does_not_exist';
 
+import {
+  createList,
+  deleteList,
+  findList,
+  getList,
+  getListIndex,
+  getListTemplate,
+  updateList,
+} from '.';
+
+/**
+ * Class for use for value lists are are associated with exception lists.
+ * See {@link https://www.elastic.co/guide/en/security/current/lists-api-create-container.html}
+ */
 export class ListClient {
+  /** Kibana space id the value lists are part of */
   private readonly spaceId: string;
+
+  /** User creating, modifying, deleting, or updating a value list */
   private readonly user: string;
+
+  /** Configuration for determining things such as maximum sizes  */
   private readonly config: ConfigType;
+
+  /** The elastic search client to do the queries with */
   private readonly esClient: ElasticsearchClient;
 
+  /**
+   * Constructs the value list
+   * @param options
+   * @param options.spaceId Kibana space id the value lists are part of
+   * @param options.user The user associated with the value list
+   * @param options.config Configuration for determining things such as maximum sizes
+   * @param options.esClient The elastic search client to do the queries with
+   */
   constructor({ spaceId, user, config, esClient }: ConstructorOptions) {
     this.spaceId = spaceId;
     this.user = user;
@@ -89,6 +109,10 @@ export class ListClient {
     this.esClient = esClient;
   }
 
+  /**
+   * Returns the list index name
+   * @returns The list index name
+   */
   public getListIndex = (): string => {
     const {
       spaceId,
@@ -97,6 +121,10 @@ export class ListClient {
     return getListIndex({ listsIndexName, spaceId });
   };
 
+  /**
+   * Returns the list item index name
+   * @returns The list item index name
+   */
   public getListItemIndex = (): string => {
     const {
       spaceId,
@@ -105,12 +133,34 @@ export class ListClient {
     return getListItemIndex({ listsItemsIndexName, spaceId });
   };
 
+  /**
+   * Given a list id, this will return the list container
+   * @param options
+   * @param options.id The id of the list
+   * @returns The List container if found, otherwise null
+   */
   public getList = async ({ id }: GetListOptions): Promise<ListSchema | null> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return getList({ esClient, id, listIndex });
   };
 
+  /**
+   * Creates a list, if given at least the "name", "description", "type", and "version"
+   * See {@link https://www.elastic.co/guide/en/security/current/lists-api-create-container.html}
+   * for more information around formats of the deserializer and serializer
+   * @param options
+   * @param options.id The id of the list to create or "undefined" if you want an "id" to be auto-created for you
+   * @param options.deserializer A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information.
+   * @param options.immutable Set this to true if this is a list that is "immutable"/"pre-packaged".
+   * @param options.serializer Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information.
+   * @param options.name The name of the list
+   * @param options.description The description of the list
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @param options.meta Additional meta data to associate with the list as an object of "key/value" pairs
+   * @param options.version Version number of the list, typically this should be 1 unless you are re-creating a list you deleted or something unusual.
+   * @returns The list created
+   */
   public createList = async ({
     id,
     deserializer,
@@ -140,6 +190,24 @@ export class ListClient {
     });
   };
 
+  /**
+   * Creates a list, if given at least the "name", "description", "type", and "version"
+   * See {@link https://www.elastic.co/guide/en/security/current/lists-api-create-container.html}
+   * for more information around formats of the deserializer and serializer.
+   * This will create the list if it does not exist. If the list exists, this will ignore creating
+   * anything and just return the existing list.
+   * @param options
+   * @param options.id The id of the list to create or "undefined" if you want an "id" to be auto-created for you
+   * @param options.deserializer A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information.
+   * @param options.immutable Set this to true if this is a list that is "immutable"/"pre-packaged".
+   * @param options.serializer Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information.
+   * @param options.name The name of the list
+   * @param options.description The description of the list
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @param options.meta Additional meta data to associate with the list as an object of "key/value" pairs
+   * @param options.version Version number of the list, typically this should be 1 unless you are re-creating a list you deleted or something unusual.
+   * @returns The list created
+   */
   public createListIfItDoesNotExist = async ({
     id,
     deserializer,
@@ -169,64 +237,108 @@ export class ListClient {
     });
   };
 
+  /**
+   * True if the list index exists, otherwise false
+   * @returns True if the list index exists, otherwise false
+   */
   public getListIndexExists = async (): Promise<boolean> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return getIndexExists(esClient, listIndex);
   };
 
+  /**
+   * True if the list index item exists, otherwise false
+   * @returns True if the list item index exists, otherwise false
+   */
   public getListItemIndexExists = async (): Promise<boolean> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return getIndexExists(esClient, listItemIndex);
   };
 
+  /**
+   * Creates the list boot strap index for ILM policies.
+   * @returns The contents of the bootstrap response from Elasticsearch
+   */
   public createListBootStrapIndex = async (): Promise<unknown> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return createBootstrapIndex(esClient, listIndex);
   };
 
+  /**
+   * Creates the list item boot strap index for ILM policies.
+   * @returns The contents of the bootstrap response from Elasticsearch
+   */
   public createListItemBootStrapIndex = async (): Promise<unknown> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return createBootstrapIndex(esClient, listItemIndex);
   };
 
+  /**
+   * Returns true if the list policy for ILM exists, otherwise false
+   * @returns True if the list policy for ILM exists, otherwise false.
+   */
   public getListPolicyExists = async (): Promise<boolean> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return getPolicyExists(esClient, listIndex);
   };
 
+  /**
+   * Returns true if the list item policy for ILM exists, otherwise false
+   * @returns True if the list item policy for ILM exists, otherwise false.
+   */
   public getListItemPolicyExists = async (): Promise<boolean> => {
     const { esClient } = this;
     const listsItemIndex = this.getListItemIndex();
     return getPolicyExists(esClient, listsItemIndex);
   };
 
+  /**
+   * Returns true if the list template for ILM exists, otherwise false
+   * @returns True if the list template for ILM exists, otherwise false.
+   */
   public getListTemplateExists = async (): Promise<boolean> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return getTemplateExists(esClient, listIndex);
   };
 
+  /**
+   * Returns true if the list item template for ILM exists, otherwise false
+   * @returns True if the list item template for ILM exists, otherwise false.
+   */
   public getListItemTemplateExists = async (): Promise<boolean> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return getTemplateExists(esClient, listItemIndex);
   };
 
+  /**
+   * Returns the list template for ILM.
+   * @returns The contents of the list template for ILM.
+   */
   public getListTemplate = (): Record<string, unknown> => {
     const listIndex = this.getListIndex();
     return getListTemplate(listIndex);
   };
 
+  /**
+   * Returns the list item template for ILM.
+   * @returns The contents of the list item template for ILM.
+   */
   public getListItemTemplate = (): Record<string, unknown> => {
     const listItemIndex = this.getListItemIndex();
     return getListItemTemplate(listItemIndex);
   };
 
+  /**
+   * Sets the list template for ILM.
+   * @returns The contents of the list template for ILM.
+   */
   public setListTemplate = async (): Promise<unknown> => {
     const { esClient } = this;
     const template = this.getListTemplate();
@@ -234,6 +346,10 @@ export class ListClient {
     return setTemplate(esClient, listIndex, template);
   };
 
+  /**
+   * Sets the list item template for ILM.
+   * @returns The contents of the list item template for ILM.
+   */
   public setListItemTemplate = async (): Promise<unknown> => {
     const { esClient } = this;
     const template = this.getListItemTemplate();
@@ -241,60 +357,104 @@ export class ListClient {
     return setTemplate(esClient, listItemIndex, template);
   };
 
+  /**
+   * Sets the list policy
+   * @returns The contents of the list policy set
+   */
   public setListPolicy = async (): Promise<unknown> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return setPolicy(esClient, listIndex, listPolicy);
   };
 
+  /**
+   * Sets the list item policy
+   * @returns The contents of the list policy set
+   */
   public setListItemPolicy = async (): Promise<unknown> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return setPolicy(esClient, listItemIndex, listsItemsPolicy);
   };
 
+  /**
+   * Deletes the list index
+   * @returns True if the list index was deleted, otherwise false
+   */
   public deleteListIndex = async (): Promise<boolean> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return deleteAllIndex(esClient, `${listIndex}-*`);
   };
 
+  /**
+   * Deletes the list item index
+   * @returns True if the list item index was deleted, otherwise false
+   */
   public deleteListItemIndex = async (): Promise<boolean> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return deleteAllIndex(esClient, `${listItemIndex}-*`);
   };
 
+  /**
+   * Deletes the list policy
+   * @returns The contents of the list policy
+   */
   public deleteListPolicy = async (): Promise<unknown> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return deletePolicy(esClient, listIndex);
   };
 
+  /**
+   * Deletes the list item policy
+   * @returns The contents of the list item policy
+   */
   public deleteListItemPolicy = async (): Promise<unknown> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return deletePolicy(esClient, listItemIndex);
   };
 
+  /**
+   * Deletes the list template
+   * @returns The contents of the list template
+   */
   public deleteListTemplate = async (): Promise<unknown> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
     return deleteTemplate(esClient, listIndex);
   };
 
+  /**
+   * Deletes the list item template
+   * @returns The contents of the list item template
+   */
   public deleteListItemTemplate = async (): Promise<unknown> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return deleteTemplate(esClient, listItemIndex);
   };
 
+  /**
+   * Given a list item id, this will delete the single list item
+   * @returns The list item if found, otherwise null
+   */
   public deleteListItem = async ({ id }: DeleteListItemOptions): Promise<ListItemSchema | null> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
     return deleteListItem({ esClient, id, listItemIndex });
   };
 
+  /**
+   * Given a list value, this will delete all list items that have that value
+   * @param options
+   * @param options.listId The "list_id"/list container to delete from
+   * @param options.value The value to delete the list items by
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @returns The list items deleted.
+   */
   public deleteListItemByValue = async ({
     listId,
     value,
@@ -311,6 +471,12 @@ export class ListClient {
     });
   };
 
+  /**
+   * Given a list id, this will delete the list from the id
+   * @param options
+   * @param options.id The id of the list to delete
+   * @returns The list deleted if found, otherwise null
+   */
   public deleteList = async ({ id }: DeleteListOptions): Promise<ListSchema | null> => {
     const { esClient } = this;
     const listIndex = this.getListIndex();
@@ -323,6 +489,13 @@ export class ListClient {
     });
   };
 
+  /**
+   * Exports list items to a stream
+   * @param options
+   * @param options.stringToAppend Optional string to append at the end of each item such as a newline "\n". If undefined is passed, no string is appended.
+   * @param options.listId The list id to export all the item from
+   * @param options.stream The stream to push the export into
+   */
   public exportListItemsToStream = ({
     stringToAppend,
     listId,
@@ -339,6 +512,19 @@ export class ListClient {
     });
   };
 
+  /**
+   * Imports list items to a stream. If the list already exists, this will append the list items to the existing list.
+   * If the list does not exist, this will auto-create the list and then add the items to that list.
+   * See {@link https://www.elastic.co/guide/en/security/current/lists-api-create-container.html}
+   * for more information around formats of the deserializer and serializer.
+   * @param options
+   * @param options.deserializer A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information.
+   * @param options.serializer Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information.
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @param options.stream The stream to pull the import from
+   * @param options.meta Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" for no meta values.
+   * @param options.version Version number of the list, typically this should be 1 unless you are re-creating a list you deleted or something unusual.
+   */
   public importListItemsToStream = async ({
     deserializer,
     serializer,
@@ -367,6 +553,14 @@ export class ListClient {
     });
   };
 
+  /**
+   * Returns all list items found by value.
+   * @param options
+   * @param options.listId The list id to search for the list item by value.
+   * @param options.value The list value to find the list item by.
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @returns The list items by value found.
+   */
   public getListItemByValue = async ({
     listId,
     value,
@@ -383,6 +577,20 @@ export class ListClient {
     });
   };
 
+  /**
+   * Creates a list item given at least "value", "type", and a "listId" where "listId" is the parent container that this list
+   * item belongs to.
+   * See {@link https://www.elastic.co/guide/en/security/current/lists-api-create-container.html}
+   * for more information around formats of the deserializer and serializer.
+   * @param options
+   * @param options.id Optional Elasticsearch id, if none is given an autogenerated one will be used.
+   * @param options.deserializer A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information.
+   * @param options.serializer Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information.
+   * @param options.listId The "list_id" this list item belongs to.
+   * @param options.value The value of the list item.
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @param options.meta Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" for no meta values.
+   */
   public createListItem = async ({
     id,
     deserializer,
@@ -408,6 +616,16 @@ export class ListClient {
     });
   };
 
+  /**
+   * Updates a list item's value given the id of the list item.
+   * See {@link https://www.elastic.co/guide/en/elasticsearch/reference/current/optimistic-concurrency-control.html}
+   * for more information around optimistic concurrency control.
+   * @param options
+   * @param options._version This is the version, useful for optimistic concurrency control.
+   * @param options.id id of the list to replace the list item with.
+   * @param options.value The value of the list item to replace.
+   * @param options.meta Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" to not update meta values.
+   */
   public updateListItem = async ({
     _version,
     id,
@@ -427,6 +645,18 @@ export class ListClient {
     });
   };
 
+  /**
+   * Updates a list container's value given the id of the list.
+   * See {@link https://www.elastic.co/guide/en/elasticsearch/reference/current/optimistic-concurrency-control.html}
+   * for more information around optimistic concurrency control.
+   * @param options
+   * @param options._version This is the version, useful for optimistic concurrency control.
+   * @param options.id id of the list to replace the list container data with.
+   * @param options.name The new name, or "undefined" if this should not be updated.
+   * @param options.description The new description, or "undefined" if this should not be updated.
+   * @param options.meta Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" to not update meta values.
+   * @param options.version Updates the version of the list.
+   */
   public updateList = async ({
     _version,
     id,
@@ -450,6 +680,12 @@ export class ListClient {
     });
   };
 
+  /**
+   * Given a list item id, this returns the list item if it exists, otherwise "null".
+   * @param options
+   * @param options.id The id of the list item to get.
+   * @returns The list item found if it exists, otherwise "null".
+   */
   public getListItem = async ({ id }: GetListItemOptions): Promise<ListItemSchema | null> => {
     const { esClient } = this;
     const listItemIndex = this.getListItemIndex();
@@ -460,6 +696,14 @@ export class ListClient {
     });
   };
 
+  /**
+   * Given a list item value, this returns all list items found with that value.
+   * @param options
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @param options.listId The id of the list container to search for list items.
+   * @param options.value The value to search for list items based off.
+   * @returns All list items that match the value sent in.
+   */
   public getListItemByValues = async ({
     type,
     listId,
@@ -476,6 +720,14 @@ export class ListClient {
     });
   };
 
+  /**
+   * Given a list item value, this search for all list items found with that value.
+   * @param options
+   * @param options.type The type of list such as "boolean", "double", "text", "keyword", etc...
+   * @param options.listId The id of the list container to search for list items.
+   * @param options.value The value to search for list items based off.
+   * @returns All list items that match the value sent in.
+   */
   public searchListItemByValues = async ({
     type,
     listId,
@@ -492,6 +744,19 @@ export class ListClient {
     });
   };
 
+  /**
+   * Finds lists based on a filter passed in. This is a bit complicated as it existed before
+   * PIT (Point in Time) and other mechanisms. This uses an older way of doing "hops" and
+   * accepting a "currentIndexPosition" which acts like a pointer to where the search should continue.
+   * @param options
+   * @param options.filter A KQL string filter to find lists.
+   * @param options.currentIndexPosition The current index position to search from.
+   * @param options.perPage How many per page to return.
+   * @param options.sortField Which field to sort on, "undefined" for no sort field
+   * @param options.sortOrder "asc" or "desc" to sort, otherwise "undefined" if there is no sort order
+   * @param options.searchAfter array of search_after terms, otherwise "undefined" if there is no search_after
+   * @returns All lists found based on the passed in filter.
+   */
   public findList = async ({
     filter,
     currentIndexPosition,
@@ -516,6 +781,21 @@ export class ListClient {
     });
   };
 
+  /**
+   * Finds list items based on a filter passed in. This is a bit complicated as it existed before
+   * PIT (Point in Time) and other mechanisms. This uses an older way of doing "hops" and
+   * accepting a "currentIndexPosition" which acts like a pointer to where the search should continue.
+   * @param options
+   * @param options.listId The list id to search for the list items
+   * @param options.filter A KQL string filter to find list items.
+   * @param options.currentIndexPosition The current index position to search from.
+   * @param options.perPage How many per page to return.
+   * @param options.page The current page number for the current find
+   * @param options.sortField Which field to sort on, "undefined" for no sort field
+   * @param options.sortOrder "asc" or "desc" to sort, otherwise "undefined" if there is no sort order
+   * @param options.searchAfter array of search_after terms, otherwise "undefined" if there is no search_after
+   * @returns All list items found based on the passed in filter.
+   */
   public findListItem = async ({
     listId,
     filter,
diff --git a/x-pack/plugins/lists/server/services/lists/list_client_types.ts b/x-pack/plugins/lists/server/services/lists/list_client_types.ts
index 86b69d5469dc4..af8f1368b823a 100644
--- a/x-pack/plugins/lists/server/services/lists/list_client_types.ts
+++ b/x-pack/plugins/lists/server/services/lists/list_client_types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { PassThrough, Readable } from 'stream';
+import type { PassThrough, Readable } from 'stream';
 
-import { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Description,
   DescriptionOrUndefined,
@@ -29,140 +29,289 @@ import type {
   Type,
   _VersionOrUndefined,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { Version, VersionOrUndefined } from '@kbn/securitysolution-io-ts-types';
+import type { Version, VersionOrUndefined } from '@kbn/securitysolution-io-ts-types';
 
-import { ConfigType } from '../../config';
+import type { ConfigType } from '../../config';
 
+/**
+ * Constructor options to {@link ListClient:constructor}
+ */
 export interface ConstructorOptions {
+  /** The elastic search client to do the queries with */
   esClient: ElasticsearchClient;
+  /** Configuration for determining things such as maximum sizes */
   config: ConfigType;
+  /** Kibana space id the value lists are part of */
   spaceId: string;
+  /** The user associated with the value list */
   user: string;
 }
 
+/**
+ * ListClient.getList
+ * {@link ListClient.getList}
+ */
 export interface GetListOptions {
+  /** The id of the list */
   id: Id;
 }
 
+/**
+ * ListClient.deleteList
+ * {@link ListClient.deleteList}
+ */
 export interface DeleteListOptions {
+  /** The id of the list to delete */
   id: Id;
 }
 
+/**
+ * ListClient.deleteListItem
+ * {@link ListClient.deleteListItem}
+ */
 export interface DeleteListItemOptions {
+  /** The id of the list to delete from */
   id: Id;
 }
 
+/**
+ * ListClient.createList
+ * {@link ListClient.createList}
+ */
 export interface CreateListOptions {
   id: IdOrUndefined;
+  /** A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information. */
   deserializer: DeserializerOrUndefined;
+  /** Set this to true if this is a list that is "immutable"/"pre-packaged" */
   immutable: Immutable;
+  /** Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information. */
   serializer: SerializerOrUndefined;
+  /** The name of the list */
   name: Name;
+  /** The description of the list */
   description: Description;
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
+  /** Additional meta data to associate with the list as an object of "key/value" pairs */
   meta: MetaOrUndefined;
+  /** Version number of the list, typically this should be 1 unless you are re-creating a list you deleted or something unusual. */
   version: Version;
 }
 
+/**
+ * ListClient.createListIfItDoesNotExist
+ * {@link ListClient.createListIfItDoesNotExist}
+ */
 export interface CreateListIfItDoesNotExistOptions {
+  /** The id of the list to create or "undefined" if you want an "id" to be auto-created for you */
   id: Id;
+  /** A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information. */
   deserializer: DeserializerOrUndefined;
+  /** Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information. */
   serializer: SerializerOrUndefined;
+  /** The name of the list */
   name: Name;
+  /** The description of the list */
   description: Description;
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
+  /** Additional meta data to associate with the list as an object of "key/value" pairs */
   meta: MetaOrUndefined;
+  /** Version number of the list, typically this should be 1 unless you are re-creating a list you deleted or something unusual. */
   version: Version;
+  /** Set this to true if this is a list that is "immutable"/"pre-packaged" */
   immutable: Immutable;
 }
 
+/**
+ * ListClient.deleteListItemByValue
+ * {@link ListClient.deleteListItemByValue}
+ */
 export interface DeleteListItemByValueOptions {
+  /** The "list_id"/list container to delete from */
   listId: string;
+  /** The value to delete the list items by */
   value: string;
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
 }
 
+/**
+ * ListClient.getListItemByValue
+ * {@link ListClient.getListItemByValue}
+ */
 export interface GetListItemByValueOptions {
+  /** The list id to search for the list item by value. */
   listId: string;
+  /** The list value to find the list item by. */
   value: string;
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
 }
 
+/**
+ * ListClient.exportListItemsToStream
+ * {@link ListClient.exportListItemsToStream}
+ */
 export interface ExportListItemsToStreamOptions {
+  /** Optional string to append at the end of each item such as a newline "\n". If undefined is passed, no string is appended. */
   stringToAppend: string | null | undefined;
+  /** The list id to export all the item from */
   listId: string;
+  /** The stream to push the export into */
   stream: PassThrough;
 }
 
+/**
+ * ListClient.importListItemsToStream
+ * {@link ListClient.importListItemsToStream}
+ */
 export interface ImportListItemsToStreamOptions {
   listId: ListIdOrUndefined;
+  /** A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information. */
   deserializer: DeserializerOrUndefined;
+  /** Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information. */
   serializer: SerializerOrUndefined;
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
+  /** The stream to pull the import from */
   stream: Readable;
+  /** Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" for no meta values. */
   meta: MetaOrUndefined;
+  /** Version number of the list, typically this should be 1 unless you are re-creating a list you deleted or something unusual. */
   version: Version;
 }
 
+/**
+ * ListClient.createListItem
+ * {@link ListClient.createListItem}
+ */
 export interface CreateListItemOptions {
+  /** Optional Elasticsearch id, if none is given an autogenerated one will be used. */
   id: IdOrUndefined;
+  /** A custom deserializer for the list. Optionally, you an define this as handle bars. See online docs for more information. */
   deserializer: DeserializerOrUndefined;
+  /** Determines how uploaded list item values are parsed. By default, list items are parsed using named regex groups. See online docs for more information. */
   serializer: SerializerOrUndefined;
+  /** The "list_id" this list item belongs to. */
   listId: string;
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
+  /** The value of the list item. */
   value: string;
+  /** Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" for no meta values. */
   meta: MetaOrUndefined;
 }
 
+/**
+ * ListClient.updateListItem
+ * {@link ListClient.updateListItem}
+ */
 export interface UpdateListItemOptions {
+  /** This is the version, useful for optimistic concurrency control. */
   _version: _VersionOrUndefined;
+  /** id of the list to replace the list item with. */
   id: Id;
+  /** The value of the list item to replace. */
   value: string | null | undefined;
+  /** Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" to not update meta values. */
   meta: MetaOrUndefined;
 }
 
+/**
+ * ListClient.updateList
+ * {@link ListClient.updateList}
+ */
 export interface UpdateListOptions {
+  /** This is the version, useful for optimistic concurrency control. */
   _version: _VersionOrUndefined;
+  /** id of the list to replace the list container data with. */
   id: Id;
+  /** The new name, or "undefined" if this should not be updated. */
   name: NameOrUndefined;
+  /** The new description, or "undefined" if this should not be updated. */
   description: DescriptionOrUndefined;
+  /** Additional meta data to associate with the list items as an object of "key/value" pairs. You can set this to "undefined" to not update meta values. */
   meta: MetaOrUndefined;
+  /** Updates the version of the list. */
   version: VersionOrUndefined;
 }
 
+/**
+ * ListClient.getListItem
+ * {@link ListClient.getListItem}
+ */
 export interface GetListItemOptions {
+  /** The id of the list item to get. */
   id: Id;
 }
 
+/**
+ * ListClient.getListItemByValues
+ * {@link ListClient.getListItemByValues}
+ */
 export interface GetListItemsByValueOptions {
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
+  /** The id of the list container to search for list items. */
   listId: string;
+  /** The value to search for list items based off. */
   value: string[];
 }
 
+/**
+ * ListClient.findList
+ * {@link ListClient.findListItem}
+ */
 export interface FindListOptions {
+  /** The current index position to search from. */
   currentIndexPosition: number;
+  /** A KQL string filter to find list items. */
   filter: Filter;
+  /** How many per page to return. */
   perPage: PerPage;
+  /** The current page number for the current find */
   page: Page;
+  /** array of search_after terms, otherwise "undefined" if there is no search_after */
   searchAfter: string[] | undefined;
+  /** Which field to sort on, "undefined" for no sort field */
   sortField: SortFieldOrUndefined;
+  /** "asc" or "desc" to sort, otherwise "undefined" if there is no sort order */
   sortOrder: SortOrderOrUndefined;
 }
 
+/**
+ * ListClient.findListItem
+ * {@link ListClient.findListItem}
+ */
 export interface FindListItemOptions {
+  /** The current index position to search from. */
   currentIndexPosition: number;
+  /** A KQL string filter to find list items. */
   filter: Filter;
+  /** The list id to search for the list items */
   listId: ListId;
+  /** How many per page to return. */
   perPage: PerPage;
+  /** The current page number for the current find */
   page: Page;
+  /** array of search_after terms, otherwise "undefined" if there is no search_after */
   searchAfter: string[] | undefined;
+  /** Which field to sort on, "undefined" for no sort field */
   sortField: SortFieldOrUndefined;
+  /** "asc" or "desc" to sort, otherwise "undefined" if there is no sort order */
   sortOrder: SortOrderOrUndefined;
 }
 
+/**
+ * ListClient.searchListItemByValues
+ * {@link ListClient.findListItem}
+ */
 export interface SearchListItemByValuesOptions {
+  /** The type of list such as "boolean", "double", "text", "keyword", etc... */
   type: Type;
+  /** The id of the list container to search for list items. */
   listId: string;
+  /** The value to search for list items based off. */
   value: unknown[];
 }
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.mock.ts b/x-pack/plugins/lists/server/services/lists/update_list.mock.ts
index 5648a8df7dde8..5b8742b8bf5b3 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.mock.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.mock.ts
@@ -6,9 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
-import { UpdateListOptions } from '../lists';
 import {
   DATE_NOW,
   DESCRIPTION,
@@ -20,6 +19,8 @@ import {
   VERSION,
 } from '../../../common/constants.mock';
 
+import { UpdateListOptions } from '.';
+
 export const getUpdateListOptionsMock = (): UpdateListOptions => ({
   _version: undefined,
   dateNow: DATE_NOW,
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.test.ts b/x-pack/plugins/lists/server/services/lists/update_list.test.ts
index 2b9bdd21a40d1..9d0f9a9d775a3 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.test.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import type { ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import { getListResponseMock } from '../../../common/schemas/response/list_schema.mock';
diff --git a/x-pack/plugins/lists/server/services/lists/update_list.ts b/x-pack/plugins/lists/server/services/lists/update_list.ts
index aed0b409b5bbe..300e4a20946c2 100644
--- a/x-pack/plugins/lists/server/services/lists/update_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/update_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   DescriptionOrUndefined,
   Id,
diff --git a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
index 6e50d7414cf11..ccc2d05d92ae0 100644
--- a/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_search_after_scroll.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   SortFieldOrUndefined,
diff --git a/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts b/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
index 8ca0d574fd6e6..8f6f2e2d51e79 100644
--- a/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
+++ b/x-pack/plugins/lists/server/services/utils/scroll_to_start_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type {
   Filter,
   SortFieldOrUndefined,
diff --git a/x-pack/plugins/lists/server/types.ts b/x-pack/plugins/lists/server/types.ts
index 0c395c438750d..15bbe0d47b6c0 100644
--- a/x-pack/plugins/lists/server/types.ts
+++ b/x-pack/plugins/lists/server/types.ts
@@ -11,10 +11,9 @@ import {
   IRouter,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'kibana/server';
-
-import type { SecurityPluginStart } from '../../security/server';
-import type { SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/core/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 import { ListClient } from './services/lists/list_client';
 import { ExceptionListClient } from './services/exception_lists/exception_list_client';
diff --git a/x-pack/plugins/logstash/kibana.json b/x-pack/plugins/logstash/kibana.json
index a051800d1f5a1..b43f0e0009343 100644
--- a/x-pack/plugins/logstash/kibana.json
+++ b/x-pack/plugins/logstash/kibana.json
@@ -11,5 +11,5 @@
   "optionalPlugins": ["home", "monitoring", "security"],
   "server": true,
   "ui": true,
-  "requiredBundles": ["esUiShared", "home", "kibanaReact"]
+  "requiredBundles": ["esUiShared", "kibanaReact"]
 }
diff --git a/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js b/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
index 47692a5f94767..7fac577ec688c 100644
--- a/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
+++ b/x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
@@ -15,7 +15,7 @@ import 'brace/theme/github';
 
 import { isEmpty } from 'lodash';
 import { TOOLTIPS } from '../../../../common/constants/tooltips';
-import { EuiCodeEditor } from '../../../../../../../src/plugins/es_ui_shared/public';
+import { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
 import {
   EuiButton,
   EuiButtonEmpty,
diff --git a/x-pack/plugins/logstash/public/application/index.tsx b/x-pack/plugins/logstash/public/application/index.tsx
index 8b9aac2b3c341..d4b4a39b6df9f 100644
--- a/x-pack/plugins/logstash/public/application/index.tsx
+++ b/x-pack/plugins/logstash/public/application/index.tsx
@@ -11,9 +11,9 @@ import { Router, Route, Switch, Redirect } from 'react-router-dom';
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
 
-import { CoreStart } from 'src/core/public';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   ClusterService,
   MonitoringService,
diff --git a/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx b/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx
index 3575e46294866..ef75f0e758a3a 100644
--- a/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx
+++ b/x-pack/plugins/logstash/public/application/pipeline_edit_view.tsx
@@ -10,14 +10,14 @@ import usePromise from 'react-use/lib/usePromise';
 import { History } from 'history';
 
 import { i18n } from '@kbn/i18n';
-import { ToastsStart } from 'src/core/public';
+import { ToastsStart } from '@kbn/core/public';
 
-// @ts-ignore
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+// @ts-expect-error
 import { PipelineEditor } from './components/pipeline_editor';
-// @ts-ignore
+// @ts-expect-error
 import { Pipeline } from '../models/pipeline';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
-// @ts-ignore
+// @ts-expect-error
 import * as Breadcrumbs from './breadcrumbs';
 
 const usePipeline = (
diff --git a/x-pack/plugins/logstash/public/plugin.ts b/x-pack/plugins/logstash/public/plugin.ts
index cfca262ec09c1..a937006898bb1 100644
--- a/x-pack/plugins/logstash/public/plugin.ts
+++ b/x-pack/plugins/logstash/public/plugin.ts
@@ -10,13 +10,10 @@ import { Subscription, Subject, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { once } from 'lodash';
 
-import { Capabilities, CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import {
-  HomePublicPluginSetup,
-  FeatureCatalogueCategory,
-} from '../../../../src/plugins/home/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { Capabilities, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 // @ts-ignore
 import { LogstashLicenseService } from './services';
@@ -78,7 +75,7 @@ export class LogstashPlugin implements Plugin<void, void, SetupDeps> {
               icon: 'pipelineApp',
               path: '/app/management/ingest/pipelines',
               showOnHomePage: false,
-              category: FeatureCatalogueCategory.ADMIN,
+              category: 'admin',
             });
           });
         }
diff --git a/x-pack/plugins/logstash/server/index.ts b/x-pack/plugins/logstash/server/index.ts
index 2d2ad27bb2fd1..3e89eeb9b5795 100644
--- a/x-pack/plugins/logstash/server/index.ts
+++ b/x-pack/plugins/logstash/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { LogstashPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) => new LogstashPlugin(context);
diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts b/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts
index 8556104bf1dde..7e80555e38db1 100755
--- a/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts
+++ b/x-pack/plugins/logstash/server/lib/check_license/check_license.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { licensingMock } from '../../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { checkLicense } from './check_license';
 
 describe('check_license', function () {
diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.ts b/x-pack/plugins/logstash/server/lib/check_license/check_license.ts
index e7fd630756bed..da90a30830988 100644
--- a/x-pack/plugins/logstash/server/lib/check_license/check_license.ts
+++ b/x-pack/plugins/logstash/server/lib/check_license/check_license.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { CheckLicense } from '../../../../licensing/server';
+import { CheckLicense } from '@kbn/licensing-plugin/server';
 
 export const checkLicense: CheckLicense = (license) => {
   if (!license.isAvailable) {
diff --git a/x-pack/plugins/logstash/server/plugin.ts b/x-pack/plugins/logstash/server/plugin.ts
index f40e500671fc3..13cd3ba3fc472 100644
--- a/x-pack/plugins/logstash/server/plugin.ts
+++ b/x-pack/plugins/logstash/server/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { registerRoutes } from './routes';
 
 interface SetupDeps {
diff --git a/x-pack/plugins/logstash/server/routes/cluster/load.ts b/x-pack/plugins/logstash/server/routes/cluster/load.ts
index 1c84dd038abf2..e3937071cb98c 100644
--- a/x-pack/plugins/logstash/server/routes/cluster/load.ts
+++ b/x-pack/plugins/logstash/server/routes/cluster/load.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import { Cluster } from '../../models/cluster';
 import { checkLicense } from '../../lib/check_license';
 import type { LogstashPluginRouter } from '../../types';
diff --git a/x-pack/plugins/logstash/server/routes/index.ts b/x-pack/plugins/logstash/server/routes/index.ts
index f69660b43720d..63b2febd3eda7 100644
--- a/x-pack/plugins/logstash/server/routes/index.ts
+++ b/x-pack/plugins/logstash/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type { LogstashPluginRouter } from '../types';
 import { registerClusterLoadRoute } from './cluster';
 import {
diff --git a/x-pack/plugins/logstash/server/routes/pipeline/delete.ts b/x-pack/plugins/logstash/server/routes/pipeline/delete.ts
index 59aaaef63786e..1fb21c0e87013 100644
--- a/x-pack/plugins/logstash/server/routes/pipeline/delete.ts
+++ b/x-pack/plugins/logstash/server/routes/pipeline/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import type { LogstashPluginRouter } from '../../types';
 import { checkLicense } from '../../lib/check_license';
 
diff --git a/x-pack/plugins/logstash/server/routes/pipeline/load.ts b/x-pack/plugins/logstash/server/routes/pipeline/load.ts
index 615e3998dbd24..44811aba0b208 100644
--- a/x-pack/plugins/logstash/server/routes/pipeline/load.ts
+++ b/x-pack/plugins/logstash/server/routes/pipeline/load.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import type { LogstashPluginRouter } from '../../types';
 
 import { Pipeline } from '../../models/pipeline';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
 import { checkLicense } from '../../lib/check_license';
 
 export function registerPipelineLoadRoute(router: LogstashPluginRouter) {
diff --git a/x-pack/plugins/logstash/server/routes/pipeline/save.ts b/x-pack/plugins/logstash/server/routes/pipeline/save.ts
index 83f6ee9b00ba9..703edb95a43ff 100644
--- a/x-pack/plugins/logstash/server/routes/pipeline/save.ts
+++ b/x-pack/plugins/logstash/server/routes/pipeline/save.ts
@@ -8,9 +8,9 @@
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
 
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { Pipeline } from '../../models/pipeline';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
-import { SecurityPluginSetup } from '../../../../security/server';
 import { checkLicense } from '../../lib/check_license';
 import type { LogstashPluginRouter } from '../../types';
 
diff --git a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts b/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
index a532dc6fc4997..4aac23a2921fd 100644
--- a/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
+++ b/x-pack/plugins/logstash/server/routes/pipelines/delete.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ElasticsearchClient } from 'src/core/server';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 
 import { checkLicense } from '../../lib/check_license';
 import type { LogstashPluginRouter } from '../../types';
diff --git a/x-pack/plugins/logstash/server/routes/pipelines/list.ts b/x-pack/plugins/logstash/server/routes/pipelines/list.ts
index a2072a78902ee..884b923eaf87e 100644
--- a/x-pack/plugins/logstash/server/routes/pipelines/list.ts
+++ b/x-pack/plugins/logstash/server/routes/pipelines/list.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { wrapRouteWithLicenseCheck } from '@kbn/licensing-plugin/server';
 import type { LogstashPluginRouter } from '../../types';
-import { wrapRouteWithLicenseCheck } from '../../../../licensing/server';
 
 import { PipelineListItem } from '../../models/pipeline_list_item';
 import { checkLicense } from '../../lib/check_license';
diff --git a/x-pack/plugins/logstash/server/types.ts b/x-pack/plugins/logstash/server/types.ts
index 2177ae9f17f39..69db9753f1e38 100644
--- a/x-pack/plugins/logstash/server/types.ts
+++ b/x-pack/plugins/logstash/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export interface PipelineListItemOptions {
   id: string;
diff --git a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
index 248ac6e91f3a1..ad802e3fab9fa 100644
--- a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
@@ -7,10 +7,10 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import type { Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { MapExtent } from './map_descriptor';
-import { TimeRange } from '../../../../../src/plugins/data/common';
 
 export type Timeslice = {
   from: number;
diff --git a/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
index eb7e0a5059c22..1cd8b254f9e14 100644
--- a/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { Feature } from 'geojson';
 import {
   HeatmapStyleDescriptor,
diff --git a/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
index e35acb50838cf..06dde68b8ff00 100644
--- a/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/source_descriptor_types.ts
@@ -9,8 +9,8 @@
 
 import { FeatureCollection } from 'geojson';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
-import { SortDirection } from 'src/plugins/data/common/search';
+import { Query } from '@kbn/data-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/common/search';
 import {
   AGG_TYPE,
   GRID_RESOLUTION,
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
index 3daca585d4991..76dafc6a6c68e 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import type { DataView, DataViewField } from 'src/plugins/data/common';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
 import { AGG_TYPE, JOIN_FIELD_NAME_PREFIX, TOP_TERM_PERCENTAGE_SUFFIX } from '../constants';
 
 export type BucketProperties = Record<string | number, unknown>;
diff --git a/x-pack/plugins/maps/common/embeddable/extract.ts b/x-pack/plugins/maps/common/embeddable/extract.ts
index 7ae4cba738189..e73b1566c0289 100644
--- a/x-pack/plugins/maps/common/embeddable/extract.ts
+++ b/x-pack/plugins/maps/common/embeddable/extract.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { MapEmbeddablePersistableState } from './types';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { extractReferences } from '../migrations/references';
diff --git a/x-pack/plugins/maps/common/embeddable/inject.ts b/x-pack/plugins/maps/common/embeddable/inject.ts
index b51f169630c04..2e1892b95a0f1 100644
--- a/x-pack/plugins/maps/common/embeddable/inject.ts
+++ b/x-pack/plugins/maps/common/embeddable/inject.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/server';
 import { MapEmbeddablePersistableState } from './types';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { extractReferences, injectReferences } from '../migrations/references';
diff --git a/x-pack/plugins/maps/common/embeddable/types.ts b/x-pack/plugins/maps/common/embeddable/types.ts
index 5684ea83e0d54..f1a9cf98b4b42 100644
--- a/x-pack/plugins/maps/common/embeddable/types.ts
+++ b/x-pack/plugins/maps/common/embeddable/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
 
 export type MapEmbeddablePersistableState = EmbeddableStateWithType & {
   attributes: SerializableRecord;
diff --git a/x-pack/plugins/maps/common/map_saved_object_type.ts b/x-pack/plugins/maps/common/map_saved_object_type.ts
index 63415ddd6540a..b37c1af5949c1 100644
--- a/x-pack/plugins/maps/common/map_saved_object_type.ts
+++ b/x-pack/plugins/maps/common/map_saved_object_type.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { SavedObject } from '../../../../src/core/types/saved_objects';
+import { SavedObject } from '@kbn/core/types/saved_objects';
 
 export type MapSavedObjectAttributes = {
   title: string;
diff --git a/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts b/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts
index 7a933663a60f2..0de5c1718910e 100644
--- a/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts
+++ b/x-pack/plugins/maps/common/migrations/migrate_data_persisted_state.ts
@@ -6,8 +6,8 @@
  */
 
 import { Filter } from '@kbn/es-query';
+import { MigrateFunction } from '@kbn/kibana-utils-plugin/common';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
-import { MigrateFunction } from '../../../../../src/plugins/kibana_utils/common';
 
 export function migrateDataPersistedState(
   {
diff --git a/x-pack/plugins/maps/common/migrations/references.ts b/x-pack/plugins/maps/common/migrations/references.ts
index 1ced7e06c59cc..944789445fa06 100644
--- a/x-pack/plugins/maps/common/migrations/references.ts
+++ b/x-pack/plugins/maps/common/migrations/references.ts
@@ -7,7 +7,7 @@
 
 // Can not use public Layer classes to extract references since this logic must run in both client and server.
 
-import { SavedObjectReference } from '../../../../../src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { LayerDescriptor, VectorLayerDescriptor } from '../descriptor_types';
 
diff --git a/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js b/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js
index fa5b5111ff797..35612f7950c2f 100644
--- a/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js
+++ b/x-pack/plugins/maps/common/migrations/top_hits_time_to_sort.js
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import { SOURCE_TYPES } from '../constants';
-import { SortDirection } from '../../../../../src/plugins/data/common/search';
+import { SortDirection } from '@kbn/data-plugin/common/search';
 
 function isEsDocumentSource(layerDescriptor) {
   const sourceType = _.get(layerDescriptor, 'sourceDescriptor.type');
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index a19f160127eb3..4c4ca64f7ac07 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -25,8 +25,7 @@
     "mapsEms",
     "savedObjects",
     "share",
-    "presentationUtil",
-    "sharedUX"
+    "presentationUtil"
   ],
   "optionalPlugins": [
     "cloud",
@@ -47,7 +46,6 @@
     "kibanaReact",
     "kibanaUtils",
     "usageCollection",
-    "home",
     "unifiedSearch"
   ]
 }
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 730135424a4dd..5788c9360fdf2 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -220,7 +220,7 @@ export function syncDataForLayerId(layerId: string | null, isForceRefresh: boole
   };
 }
 
-function setLayerDataLoadErrorStatus(layerId: string, errorMessage: string | null) {
+export function setLayerDataLoadErrorStatus(layerId: string, errorMessage: string | null) {
   return {
     type: SET_LAYER_ERROR_STATUS,
     isInErrorState: errorMessage !== null,
diff --git a/x-pack/plugins/maps/public/actions/index.ts b/x-pack/plugins/maps/public/actions/index.ts
index f4d6997333c6c..2568a787b3941 100644
--- a/x-pack/plugins/maps/public/actions/index.ts
+++ b/x-pack/plugins/maps/public/actions/index.ts
@@ -15,6 +15,7 @@ export {
   cancelAllInFlightRequests,
   fitToLayerExtent,
   fitToDataBounds,
+  setLayerDataLoadErrorStatus,
 } from './data_request_actions';
 export {
   closeOnClickTooltip,
diff --git a/x-pack/plugins/maps/public/actions/layer_actions.ts b/x-pack/plugins/maps/public/actions/layer_actions.ts
index d66c2d97f55ef..b184cab70d1a7 100644
--- a/x-pack/plugins/maps/public/actions/layer_actions.ts
+++ b/x-pack/plugins/maps/public/actions/layer_actions.ts
@@ -7,7 +7,7 @@
 
 import { AnyAction, Dispatch } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { MapStoreState } from '../reducers/store';
 import {
   createLayerInstance,
diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index 1e55bd6bbb1e5..8a16d036393ad 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -12,7 +12,7 @@ import { ThunkDispatch } from 'redux-thunk';
 import turfBboxPolygon from '@turf/bbox-polygon';
 import turfBooleanContains from '@turf/boolean-contains';
 import { Filter } from '@kbn/es-query';
-import { Query, TimeRange } from 'src/plugins/data/public';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
 import { Geometry, Position } from 'geojson';
 import { asyncForEach, asyncMap } from '@kbn/std';
 import { DRAW_MODE, DRAW_SHAPE, LAYER_STYLE_TYPE } from '../../common/constants';
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
index 5b54cc3666278..13b40962c5461 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { AGG_TYPE } from '../../../../common/constants';
 import { TileMetaFeature } from '../../../../common/descriptor_types';
 import { CountAggField } from './count_agg_field';
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
index ae30e339f88ba..d881accb1e42f 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { DataView } from '@kbn/data-plugin/common';
 import { IField } from '../field';
-import { DataView } from '../../../../../../../src/plugins/data/common';
 import { IESAggSource } from '../../sources/es_agg_source';
 import { FIELD_ORIGIN } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
index d35a61c232adc..03c0d3f0791a5 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { IESAggSource } from '../../sources/es_agg_source';
 import { IVectorSource } from '../../sources/vector_source';
 import { AGG_TYPE, FIELD_ORIGIN } from '../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts
index e0bd7935835b1..9761f1dcdb193 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.test.ts
@@ -7,7 +7,7 @@
 
 import { AGG_TYPE, FIELD_ORIGIN } from '../../../../common/constants';
 import { IESAggSource } from '../../sources/es_agg_source';
-import { IndexPattern } from 'src/plugins/data/public';
+import { IndexPattern } from '@kbn/data-plugin/public';
 import { PercentileAggField } from './percentile_agg_field';
 import { ESDocField } from '../es_doc_field';
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
index b2b5f01c31bed..bc542bf891517 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { AGG_TYPE } from '../../../../common/constants';
 import { IESAggField, CountAggFieldParams } from './agg_field_types';
diff --git a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
index b3f68da99d529..1709da825aa3b 100644
--- a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { FIELD_ORIGIN } from '../../../common/constants';
 import { ESTooltipProperty } from '../tooltips/es_tooltip_property';
 import { ITooltipProperty, TooltipProperty } from '../tooltips/tooltip_property';
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
 import { IField, AbstractField } from './field';
 import { IESSource } from '../sources/es_source';
 import { IVectorSource } from '../sources/vector_source';
diff --git a/x-pack/plugins/maps/public/classes/joins/inner_join.ts b/x-pack/plugins/maps/public/classes/joins/inner_join.ts
index 9f6fec576e9e2..4ccd5bd289e40 100644
--- a/x-pack/plugins/maps/public/classes/joins/inner_join.ts
+++ b/x-pack/plugins/maps/public/classes/joins/inner_join.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { Feature, GeoJsonProperties } from 'geojson';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { ESTermSource } from '../sources/es_term_source';
 import { getComputedFieldNamePrefix } from '../styles/vector/style_util';
 import {
@@ -25,7 +26,6 @@ import { IField } from '../fields/field';
 import { PropertiesMap } from '../../../common/elasticsearch_util';
 import { ITermJoinSource } from '../sources/term_join_source';
 import { TableSource } from '../sources/table_source';
-import { Adapters } from '../../../../../../src/plugins/inspector/common/adapters';
 
 function createJoinTermSource(
   descriptor: Partial<TermJoinSourceDescriptor> | undefined,
diff --git a/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts b/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts
index 4d52dacc63782..52dd93033020d 100644
--- a/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts
+++ b/x-pack/plugins/maps/public/classes/layers/build_vector_request_meta.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { DataFilters, VectorSourceRequestMeta } from '../../../common/descriptor_types';
 import { IVectorSource } from '../sources/vector_source';
 import { ITermJoinSource } from '../sources/term_join_source';
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index 458a8a159a25d..5cc53d44df8ef 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import type { Map as MbMap } from '@kbn/mapbox-gl';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import _ from 'lodash';
 import React, { ReactElement } from 'react';
 import { EuiIcon } from '@elastic/eui';
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts
index 34edf8cd09607..863f4b7f1cb68 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/bounds_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { SOURCE_BOUNDS_DATA_REQUEST_ID } from '../../../../common/constants';
 import { MapExtent } from '../../../../common/descriptor_types';
 import { DataRequestContext } from '../../../actions';
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index 17408a2a22df0..a66135748c521 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import uuid from 'uuid/v4';
 import type { Map as MbMap, AnyLayer as MbLayer } from '@kbn/mapbox-gl';
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { Feature, GeoJsonProperties, Geometry, Position } from 'geojson';
 import _ from 'lodash';
 import { EuiIcon } from '@elastic/eui';
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx
index c935bf0b182c7..7e40f37dce26f 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/choropleth_layer_wizard/layer_template.tsx
@@ -18,7 +18,7 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { DataViewField, DataView } from 'src/plugins/data/common';
+import { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { getDataViewLabel, getDataViewSelectPlaceholder } from '../../../../../common/i18n_getters';
 import { RenderWizardArguments } from '../layer_wizard_registry';
 import { EMSFileSelect } from '../../../../components/ems_file_select';
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx
index ee98781835314..75192de78caf6 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/file_upload_wizard/wizard.tsx
@@ -10,12 +10,12 @@ import { i18n } from '@kbn/i18n';
 import React, { Component } from 'react';
 import { FeatureCollection } from 'geojson';
 import { EuiPanel } from '@elastic/eui';
+import { FileUploadGeoResults } from '@kbn/file-upload-plugin/public';
 import { SCALING_TYPES } from '../../../../../common/constants';
 import { GeoJsonFileSource } from '../../../sources/geojson_file_source';
 import { GeoJsonVectorLayer } from '../../vector_layer';
 import { createDefaultLayerDescriptor } from '../../../sources/es_search_source';
 import { RenderWizardArguments } from '../layer_wizard_registry';
-import { FileUploadGeoResults } from '../../../../../../file_upload/public';
 import { getFileUploadComponent } from '../../../../kibana_services';
 
 export enum UPLOAD_STEPS {
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
index 4f47a1f0e0fd3..413f23d1aeef3 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx
@@ -8,7 +8,7 @@
 import React, { ReactElement } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Feature } from 'geojson';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { FileLayer } from '@elastic/ems-client';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { AbstractVectorSource, GeoJsonWithMeta, IVectorSource } from '../vector_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
index da36b9bf0b7e6..014a34566b59a 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { AbstractSource, SourceEditorArgs } from '../source';
 import { ITMSSource } from '../tms_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
index 7db3652011e9a..ca889e8e07499 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbstractESAggSource } from '../es_agg_source';
+import { AbstractESAggSource } from '.';
 import { IField } from '../../fields/field';
 import { IESAggField } from '../../fields/agg';
 import _ from 'lodash';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
index 610655f0daee5..8def3347c5602 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { GeoJsonProperties } from 'geojson';
+import { DataView } from '@kbn/data-plugin/common';
 import { IESSource } from '../es_source';
 import { AbstractESSource } from '../es_source';
 import { esAggFieldsFactory, IESAggField } from '../../fields/agg';
 import { AGG_TYPE, COUNT_PROP_LABEL, FIELD_ORIGIN } from '../../../../common/constants';
 import { getSourceAggKey } from '../../../../common/get_agg_key';
 import { AbstractESAggSourceDescriptor, AggDescriptor } from '../../../../common/descriptor_types';
-import { DataView } from '../../../../../../../src/plugins/data/common';
 import { IField } from '../../fields/field';
 import { ITooltipProperty } from '../../tooltips/tooltip_property';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
index cd93ccff99a4c..bcbc50c7e0090 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { MapExtent, VectorSourceRequestMeta } from '../../../../common/descriptor_types';
 import {
   getExecutionContext,
@@ -20,7 +20,7 @@ import {
   RENDER_AS,
   SOURCE_TYPES,
 } from '../../../../common/constants';
-import { SearchSource } from 'src/plugins/data/public';
+import { SearchSource } from '@kbn/data-plugin/public';
 import { LICENSED_FEATURES } from '../../../licensed_features';
 
 jest.mock('../../../kibana_services');
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
index 67529edf15b4c..bf69c04ff69bb 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
@@ -10,6 +10,9 @@ import React, { ReactElement } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Feature } from 'geojson';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ISearchSource } from '@kbn/data-plugin/common/search/search_source';
+import { DataView } from '@kbn/data-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { makeESBbox } from '../../../../common/elasticsearch_util';
 import { convertCompositeRespToGeoJson, convertRegularRespToGeoJson } from './convert_to_geojson';
 import { UpdateSourceEditor } from './update_source_editor';
@@ -40,9 +43,6 @@ import {
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
-import { ISearchSource } from '../../../../../../../src/plugins/data/common/search/search_source';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { makePublicExecutionContext } from '../../../util';
 import { isMvt } from './is_mvt';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
index 1ef695e9dcfac..1769c224c37b3 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
@@ -10,6 +10,7 @@ import React, { Fragment, Component } from 'react';
 import uuid from 'uuid/v4';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiSpacer, EuiComboBoxOptionOption, EuiTitle } from '@elastic/eui';
+import { IndexPatternField, indexPatterns } from '@kbn/data-plugin/public';
 import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters';
 import {
   AGG_TYPE,
@@ -22,7 +23,6 @@ import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { ResolutionEditor } from './resolution_editor';
 import { isMetricCountable } from '../../util/is_metric_countable';
-import { IndexPatternField, indexPatterns } from '../../../../../../../src/plugins/data/public';
 import { RenderAsSelect } from './render_as_select';
 import { AggDescriptor } from '../../../../common/descriptor_types';
 import { OnSourceChangeArgs } from '../source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
index dff515a5192dc..8e9b879290c9e 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/create_source_editor.tsx
@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react';
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiPanel } from '@elastic/eui';
 import { SingleFieldSelect } from '../../../components/single_field_select';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
index 4409271260499..86c343af0d113 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
@@ -11,6 +11,7 @@ import React from 'react';
 import { GeoJsonProperties } from 'geojson';
 import { i18n } from '@kbn/i18n';
 import { type Filter, buildPhraseFilter } from '@kbn/es-query';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import {
   EMPTY_FEATURE_COLLECTION,
   FIELD_ORIGIN,
@@ -33,7 +34,6 @@ import { UpdateSourceEditor } from './update_source_editor';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { GeoJsonWithMeta } from '../vector_source';
 import { isValidStringConfig } from '../../util/valid_string_config';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { IField } from '../../fields/field';
 import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
 import { getIsGoldPlus } from '../../../licensed_features';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx
index 129301a96e3b3..e079d25a4c628 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/geo_line_form.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { getTermsFields } from '../../../index_pattern_util';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 
 interface Props {
   indexPattern: DataView;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx
index e5af92ccec7ef..d61d5a56a55de 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/update_source_editor.tsx
@@ -9,8 +9,8 @@ import React, { Fragment, Component } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
-import type { DataViewField, DataView } from 'src/plugins/data/common';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
+import type { DataViewField, DataView } from '@kbn/data-plugin/common';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { GeoLineForm } from './geo_line_form';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js
index 3f3c9c4e3a108..856504c51865e 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js
@@ -12,7 +12,7 @@ import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 export class UpdateSourceEditor extends Component {
   state = {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts
index 5553e925258e9..81e80c7cf739f 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_layer_descriptor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 import { LayerDescriptor } from '../../../../common/descriptor_types';
 import { ES_GEO_FIELD_TYPE, SCALING_TYPES } from '../../../../common/constants';
 import { ESSearchSource } from './es_search_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
index cbf79b7a8b367..6983c1d43faa2 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
@@ -11,7 +11,7 @@ jest.mock('../../../kibana_services');
 jest.mock('./util/load_index_settings');
 
 import { getIndexPatternService, getSearchService, getHttp } from '../../../kibana_services';
-import { SearchSource } from 'src/plugins/data/public';
+import { SearchSource } from '@kbn/data-plugin/public';
 
 import { loadIndexSettings } from './util/load_index_settings';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
index 42fded4fbefb7..34bd92a428a58 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
@@ -10,7 +10,10 @@ import React, { ReactElement } from 'react';
 import { i18n } from '@kbn/i18n';
 import { GeoJsonProperties, Geometry, Position } from 'geojson';
 import { type Filter, buildPhraseFilter } from '@kbn/es-query';
-import type { DataViewField, DataView } from 'src/plugins/data/common';
+import type { DataViewField, DataView } from '@kbn/data-plugin/common';
+import { lastValueFrom } from 'rxjs';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
+import { SortDirection, SortDirectionNumeric, TimeRange } from '@kbn/data-plugin/common';
 import { AbstractESSource } from '../es_source';
 import {
   getHttp,
@@ -51,12 +54,6 @@ import {
   Timeslice,
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
-import {
-  SortDirection,
-  SortDirectionNumeric,
-  TimeRange,
-} from '../../../../../../../src/plugins/data/common';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { IField } from '../../fields/field';
 import { GeoJsonWithMeta, IMvtVectorSource, SourceStatus } from '../vector_source';
@@ -597,12 +594,12 @@ export class ESSearchSource extends AbstractESSource implements IMvtVectorSource
     searchSource.setField('query', query);
     searchSource.setField('fieldsFromSource', this._getTooltipPropertyNames());
 
-    const { rawResponse: resp } = await searchSource
-      .fetch$({
+    const { rawResponse: resp } = await lastValueFrom(
+      searchSource.fetch$({
         legacyHitsTotal: false,
         executionContext: makePublicExecutionContext('es_search_source:load_tooltip_properties'),
       })
-      .toPromise();
+    );
 
     const hit = _.get(resp, 'hits.hits[0]');
     if (!hit) {
@@ -901,14 +898,14 @@ export class ESSearchSource extends AbstractESSource implements IMvtVectorSource
     const maxResultWindow = await this.getMaxResultWindow();
     const searchSource = await this.makeSearchSource(searchFilters, 0);
     searchSource.setField('trackTotalHits', maxResultWindow + 1);
-    const { rawResponse: resp } = await searchSource
-      .fetch$({
+    const { rawResponse: resp } = await lastValueFrom(
+      searchSource.fetch$({
         abortSignal: abortController.signal,
         sessionId: searchFilters.searchSessionId,
         legacyHitsTotal: false,
         executionContext: makePublicExecutionContext('es_search_source:all_doc_counts'),
       })
-      .toPromise();
+    );
     return !isTotalHitsGreaterThan(resp.hits.total as unknown as TotalHits, maxResultWindow);
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx
index 95836d76a2c60..577b5f8b42360 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/create_source_editor.tsx
@@ -8,13 +8,13 @@
 import React, { Component } from 'react';
 import { EuiPanel } from '@elastic/eui';
 
-import type { DataView, DataViewField } from 'src/plugins/data/common';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { SCALING_TYPES } from '../../../../../common/constants';
 import { GeoFieldSelect } from '../../../../components/geo_field_select';
 import { GeoIndexPatternSelect } from '../../../../components/geo_index_pattern_select';
 import { getGeoFields, getTermsFields, getSortFields } from '../../../../index_pattern_util';
 import { ESSearchSourceDescriptor } from '../../../../../common/descriptor_types';
-import { SortDirection } from '../../../../../../../../src/plugins/data/public';
 import { TopHitsForm } from './top_hits_form';
 import { OnSourceChangeArgs } from '../../source';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx
index 072c399544182..8b39310ae13a8 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/top_hits_form.tsx
@@ -8,7 +8,8 @@
 import React, { ChangeEvent, Component, Fragment } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { SingleFieldSelect } from '../../../../components/single_field_select';
 import { getIndexPatternService } from '../../../../kibana_services';
 // @ts-expect-error
@@ -16,7 +17,6 @@ import { ValidatedRange } from '../../../../components/validated_range';
 import { DEFAULT_MAX_INNER_RESULT_WINDOW } from '../../../../../common/constants';
 import { loadIndexSettings } from '../util/load_index_settings';
 import { OnSourceChangeArgs } from '../../source';
-import { SortDirection } from '../../../../../../../../src/plugins/data/public';
 
 interface Props {
   indexPatternId: string;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx
index 788c700d3961c..356dbfe7d03a1 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx
@@ -9,14 +9,14 @@ import React, { Component, Fragment } from 'react';
 import { EuiFormRow, EuiTitle, EuiPanel, EuiSpacer, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
+import { SortDirection } from '@kbn/data-plugin/public';
 import { getDataViewNotFoundMessage } from '../../../../../common/i18n_getters';
 import { FIELD_ORIGIN } from '../../../../../common/constants';
 import { TooltipSelector } from '../../../../components/tooltip_selector';
 
 import { getIndexPatternService } from '../../../../kibana_services';
 import { getTermsFields, getSortFields, getSourceFields } from '../../../../index_pattern_util';
-import { SortDirection } from '../../../../../../../../src/plugins/data/public';
 import { ESDocField } from '../../../fields/es_doc_field';
 import { OnSourceChangeArgs } from '../../source';
 import { TopHitsForm } from './top_hits_form';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
index cde7c8afa7eeb..aa31e9ef85947 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
@@ -20,7 +20,7 @@ import {
   getSourceFields,
   supportsGeoTileAgg,
 } from '../../../index_pattern_util';
-import { SortDirection, indexPatterns } from '../../../../../../../src/plugins/data/public';
+import { SortDirection, indexPatterns } from '@kbn/data-plugin/public';
 import { ESDocField } from '../../fields/es_doc_field';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts
index 5e27f613abdd4..90e674c5da288 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getDocValueAndSourceFields } from './get_docvalue_source_fields';
-import type { IndexPatternField, IndexPattern } from 'src/plugins/data/public';
+import type { IndexPatternField, IndexPattern } from '@kbn/data-plugin/public';
 
 function createMockIndexPattern(fields: IndexPatternField[]): IndexPattern {
   const indexPattern = {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts
index c0ce7488d01ed..100ae961830c0 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/get_docvalue_source_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../../src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import { getField } from '../../../../../common/elasticsearch_util';
 
 export interface ScriptField {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
index ece1ec39f3425..512f7c6bc1501 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
@@ -8,9 +8,12 @@
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { Filter } from '@kbn/es-query';
-import { DataViewField, DataView, ISearchSource } from 'src/plugins/data/common';
-import type { Query } from 'src/plugins/data/common';
-import type { KibanaExecutionContext } from 'kibana/public';
+import { DataViewField, DataView, ISearchSource } from '@kbn/data-plugin/common';
+import type { Query } from '@kbn/data-plugin/common';
+import type { KibanaExecutionContext } from '@kbn/core/public';
+import { lastValueFrom } from 'rxjs';
+import { TimeRange } from '@kbn/data-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { AbstractVectorSource, BoundsRequestMeta } from '../vector_source';
 import {
   getAutocompleteService,
@@ -24,7 +27,6 @@ import { copyPersistentState } from '../../../reducers/copy_persistent_state';
 import { DataRequestAbortError } from '../../util/data_request';
 import { expandToTileBoundaries } from '../../util/geo_tile_utils';
 import { IVectorSource } from '../vector_source';
-import { TimeRange } from '../../../../../../../src/plugins/data/common';
 import {
   AbstractESSourceDescriptor,
   AbstractSourceDescriptor,
@@ -37,7 +39,6 @@ import { IVectorStyle } from '../../styles/vector/vector_style';
 import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
 import { IField } from '../../fields/field';
 import { FieldFormatter } from '../../../../common/constants';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { makePublicExecutionContext } from '../../../util';
 
@@ -176,8 +177,8 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource
     registerCancelCallback(() => abortController.abort());
 
     try {
-      const { rawResponse: resp } = await searchSource
-        .fetch$({
+      const { rawResponse: resp } = await lastValueFrom(
+        searchSource.fetch$({
           abortSignal: abortController.signal,
           sessionId: searchSessionId,
           legacyHitsTotal: false,
@@ -189,7 +190,7 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource
           },
           executionContext,
         })
-        .toPromise();
+      );
       return resp;
     } catch (error) {
       if (isSearchSourceAbortError(error)) {
@@ -279,13 +280,13 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource
     try {
       const abortController = new AbortController();
       registerCancelCallback(() => abortController.abort());
-      const { rawResponse: esResp } = await searchSource
-        .fetch$({
+      const { rawResponse: esResp } = await lastValueFrom(
+        searchSource.fetch$({
           abortSignal: abortController.signal,
           legacyHitsTotal: false,
           executionContext: makePublicExecutionContext('es_source:bounds'),
         })
-        .toPromise();
+      );
 
       if (!esResp.aggregations) {
         return null;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
index b583dc7b281d0..7acf37409df94 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.ts
@@ -7,7 +7,8 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ISearchSource, Query } from 'src/plugins/data/public';
+import { ISearchSource, Query } from '@kbn/data-plugin/public';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import {
   AGG_TYPE,
   DEFAULT_MAX_BUCKETS_LIMIT,
@@ -27,7 +28,6 @@ import {
   ESTermSourceDescriptor,
   VectorJoinSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { PropertiesMap } from '../../../../common/elasticsearch_util';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { ITermJoinSource } from '../term_join_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts b/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts
index 1f9455e01afa0..9cfddb2fae884 100644
--- a/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/geojson_file_source/geojson_file_source.ts
@@ -6,6 +6,7 @@
  */
 
 import { Feature, FeatureCollection } from 'geojson';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { AbstractVectorSource, BoundsRequestMeta, GeoJsonWithMeta } from '../vector_source';
 import { EMPTY_FEATURE_COLLECTION, FIELD_ORIGIN, SOURCE_TYPES } from '../../../../common/constants';
 import {
@@ -16,7 +17,6 @@ import {
 import { registerSource } from '../source_registry';
 import { IField } from '../../fields/field';
 import { getFeatureCollectionBounds } from '../../util/get_feature_collection_bounds';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { InlineField } from '../../fields/inline_field';
 
 function getFeatureCollection(
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
index ef5c05d2df2f5..c0e6e845bec0d 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
@@ -11,8 +11,8 @@ import React, { Fragment, Component, ChangeEvent } from 'react';
 import { EuiFieldText, EuiFormRow, EuiToolTip, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
+import { ValidatedDualRange, Value } from '@kbn/kibana-react-plugin/public';
 import { MAX_ZOOM, MIN_ZOOM } from '../../../../common/constants';
-import { ValidatedDualRange, Value } from '../../../../../../../src/plugins/kibana_react/public';
 import { MVTFieldConfigEditor } from './mvt_field_config_editor';
 import { MVTFieldDescriptor } from '../../../../common/descriptor_types';
 
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
index b3ded0620b256..47c69e89c3c3a 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import React from 'react';
 import { GeoJsonProperties, Geometry, Position } from 'geojson';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { AbstractSource, ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { BoundsRequestMeta, GeoJsonWithMeta, IMvtVectorSource } from '../vector_source';
 import {
@@ -28,7 +29,6 @@ import {
 import { MVTField } from '../../fields/mvt_field';
 import { UpdateSourceEditor } from './update_source_editor';
 import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 
 export const sourceTitle = i18n.translate(
   'xpack.maps.source.MVTSingleLayerVectorSource.sourceTitle',
diff --git a/x-pack/plugins/maps/public/classes/sources/source.ts b/x-pack/plugins/maps/public/classes/sources/source.ts
index 0ecca16fde07b..56a49dd3d5fa6 100644
--- a/x-pack/plugins/maps/public/classes/sources/source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/source.ts
@@ -8,7 +8,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import { ReactElement } from 'react';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { GeoJsonProperties } from 'geojson';
 import { copyPersistentState } from '../../reducers/copy_persistent_state';
 import { IField } from '../fields/field';
diff --git a/x-pack/plugins/maps/public/classes/sources/source_registry.ts b/x-pack/plugins/maps/public/classes/sources/source_registry.ts
index 7be7343889d48..f1dd02148cd19 100644
--- a/x-pack/plugins/maps/public/classes/sources/source_registry.ts
+++ b/x-pack/plugins/maps/public/classes/sources/source_registry.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import type { ISource } from './source';
-import { Adapters } from '../../../../../../src/plugins/inspector/common/adapters';
 
 export type SourceRegistryEntry = {
   ConstructorFunction: new (
diff --git a/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts b/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts
index 768c7cacffab3..d2d6e12036f4c 100644
--- a/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/table_source/table_source.ts
@@ -7,7 +7,8 @@
 
 import uuid from 'uuid';
 import { GeoJsonProperties } from 'geojson';
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
+import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { FIELD_ORIGIN, SOURCE_TYPES, VECTOR_SHAPE_TYPE } from '../../../../common/constants';
 import {
   MapExtent,
@@ -15,7 +16,6 @@ import {
   VectorJoinSourceRequestMeta,
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
 import { ITermJoinSource } from '../term_join_source';
 import { BucketProperties, PropertiesMap } from '../../../../common/elasticsearch_util';
 import { IField } from '../../fields/field';
diff --git a/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts b/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts
index 8cf1a631bf223..5ac7ca822fc93 100644
--- a/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/term_join_source/term_join_source.ts
@@ -6,8 +6,8 @@
  */
 
 import { GeoJsonProperties } from 'geojson';
+import { Query } from '@kbn/data-plugin/common/query';
 import { IField } from '../../fields/field';
-import { Query } from '../../../../../../../src/plugins/data/common/query';
 import { VectorJoinSourceRequestMeta } from '../../../../common/descriptor_types';
 import { PropertiesMap } from '../../../../common/elasticsearch_util';
 import { ITooltipProperty } from '../../tooltips/tooltip_property';
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts
index 8d2c9cfede561..fca72af193ca3 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/mvt_vector_source.ts
@@ -6,7 +6,7 @@
  */
 
 import { VectorSourceRequestMeta } from '../../../../common/descriptor_types';
-import { IVectorSource } from '../vector_source';
+import { IVectorSource } from '.';
 
 export interface IMvtVectorSource extends IVectorSource {
   /*
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
index 49506379898a2..321e10f19885f 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { FeatureCollection, GeoJsonProperties, Geometry, Position } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { VECTOR_SHAPE_TYPE } from '../../../../common/constants';
 import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
 import { AbstractSource, ISource } from '../source';
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js b/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js
index 83ea2e0b3d43c..b47e22fcd318c 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ValidatedDualRange } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { MIN_SIZE, MAX_SIZE } from '../../vector_style_defaults';
 import { i18n } from '@kbn/i18n';
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx
index f1a5653da612b..385e86cbfd693 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { mapboxgl, Map as MapboxMap } from '@kbn/mapbox-gl';
 import { i18n } from '@kbn/i18n';
-import { ResizeChecker } from '.././../../../../../../../../src/plugins/kibana_utils/public';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 import {
   CUSTOM_ICON_PIXEL_RATIO,
   createSdfIcon,
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts
index 24c250c55d708..d7231d917180f 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts
@@ -6,11 +6,11 @@
  */
 
 import { ReactNode } from 'react';
+import { DataView } from '@kbn/data-plugin/common';
 import { ESTooltipProperty } from './es_tooltip_property';
 import { AGG_TYPE } from '../../../common/constants';
 import { ITooltipProperty } from './tooltip_property';
 import { IESAggField } from '../fields/agg';
-import { DataView } from '../../../../../../src/plugins/data/common';
 
 export class ESAggTooltipProperty extends ESTooltipProperty {
   private readonly _aggType: AGG_TYPE;
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts
index e2d93a6937675..385d4254d804d 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IndexPatternField, IndexPattern } from 'src/plugins/data/public';
+import type { IndexPatternField, IndexPattern } from '@kbn/data-plugin/public';
 import { ESTooltipProperty } from './es_tooltip_property';
 import { TooltipProperty } from './tooltip_property';
 import { AbstractField } from '../fields/field';
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx
index de6421895c654..2ede3c565d14a 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.tsx
@@ -8,9 +8,9 @@
 import React, { ReactNode } from 'react';
 import _ from 'lodash';
 import { type Filter, buildExistsFilter, buildPhraseFilter } from '@kbn/es-query';
+import { DataView, DataViewField } from '@kbn/data-plugin/common';
 import { ITooltipProperty } from './tooltip_property';
 import { IField } from '../fields/field';
-import { DataView, DataViewField } from '../../../../../../src/plugins/data/common';
 
 export class ESTooltipProperty implements ITooltipProperty {
   private readonly _tooltipProperty: ITooltipProperty;
diff --git a/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts
index 0a4ca8af5dd79..3c103089eff84 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts
@@ -9,9 +9,9 @@ import _ from 'lodash';
 import { ReactNode } from 'react';
 import { GeoJsonProperties, Geometry } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
-import { RawValue } from '../../../../../plugins/maps/common/constants';
-import type { TooltipFeature } from '../../../../../plugins/maps/common/descriptor_types';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
+import { RawValue } from '../../../common/constants';
+import type { TooltipFeature } from '../../../common/descriptor_types';
 
 export interface ITooltipProperty {
   getPropertyKey(): string;
diff --git a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
index f391d3bfd3307..656ded611a115 100644
--- a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
+++ b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
@@ -5,7 +5,12 @@
  * 2.0.
  */
 
-import { parseTileKey, getTileBoundingBox, expandToTileBoundaries } from './geo_tile_utils';
+import {
+  getTileKey,
+  parseTileKey,
+  getTileBoundingBox,
+  expandToTileBoundaries,
+} from './geo_tile_utils';
 
 it('Should parse tile key', () => {
   expect(parseTileKey('15/23423/1867')).toEqual({
@@ -16,6 +21,10 @@ it('Should parse tile key', () => {
   });
 });
 
+it('Should get tile key', () => {
+  expect(getTileKey(45, 120, 10)).toEqual('10/853/368');
+});
+
 it('Should convert tile key to geojson Polygon', () => {
   const geometry = getTileBoundingBox('15/23423/1867');
   expect(geometry).toEqual({
diff --git a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
index 36c7d9d6c4a11..f3fe55b5e47c6 100644
--- a/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
+++ b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
@@ -60,6 +60,14 @@ export function parseTileKey(tileKey: string): {
   return { x, y, zoom, tileCount };
 }
 
+export function getTileKey(lat: number, lon: number, zoom: number): string {
+  const tileCount = getTileCount(zoom);
+
+  const x = longitudeToTile(lon, tileCount);
+  const y = latitudeToTile(lat, tileCount);
+  return `${zoom}/${x}/${y}`;
+}
+
 function sinh(x: number): number {
   return (Math.exp(x) - Math.exp(-x)) / 2;
 }
diff --git a/x-pack/plugins/maps/public/components/action_select.tsx b/x-pack/plugins/maps/public/components/action_select.tsx
index 156dbd934b2af..7c04686251ec5 100644
--- a/x-pack/plugins/maps/public/components/action_select.tsx
+++ b/x-pack/plugins/maps/public/components/action_select.tsx
@@ -8,7 +8,7 @@
 import React, { Component } from 'react';
 import { EuiFormRow, EuiSuperSelect, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { isUrlDrilldown } from '../trigger_actions/trigger_utils';
 
 interface Props {
diff --git a/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx b/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
index 8089a2e3e50c8..726ce99e33dfe 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
@@ -15,9 +15,9 @@ import {
   EuiTextAlign,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { ActionSelect } from '../action_select';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../src/plugins/unified_search/public';
 
 interface Props {
   className?: string;
diff --git a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
index 24c9082e7c4bb..a0ac0de9121a1 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
@@ -17,11 +17,11 @@ import {
   EuiFormErrorText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { ES_SPATIAL_RELATIONS } from '../../../../common/constants';
 import { getEsSpatialRelationLabel } from '../../../../common/i18n_getters';
 import { ActionSelect } from '../../action_select';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../src/plugins/unified_search/public';
-import { Action, ActionExecutionContext } from '../../../../../../../src/plugins/ui_actions/public';
 
 interface Props {
   buttonLabel: string;
diff --git a/x-pack/plugins/maps/public/components/geo_field_select.tsx b/x-pack/plugins/maps/public/components/geo_field_select.tsx
index 5ee81866784bc..a54f3b69f2eb5 100644
--- a/x-pack/plugins/maps/public/components/geo_field_select.tsx
+++ b/x-pack/plugins/maps/public/components/geo_field_select.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow } from '@elastic/eui';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 import { SingleFieldSelect } from './single_field_select';
 
 interface Props {
diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
index 57f1eee3acf49..61a3ceb2d2f44 100644
--- a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
+++ b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx
@@ -9,7 +9,7 @@ import React, { Component } from 'react';
 import { EuiCallOut, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView } from 'src/plugins/data/common';
+import { DataView } from '@kbn/data-plugin/common';
 import {
   getIndexPatternSelectComponent,
   getIndexPatternService,
diff --git a/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx b/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx
index a28e4e8df6c3b..65cea345d3d29 100644
--- a/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx
+++ b/x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiComboBoxOptionOption, EuiFieldText, EuiFormRow } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 import { MetricSelect } from './metric_select';
 import { SingleFieldSelect } from '../single_field_select';
 import { AggDescriptor } from '../../../common/descriptor_types';
diff --git a/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx b/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx
index bcc77eb972183..2ecc61f9c3e82 100644
--- a/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx
+++ b/x-pack/plugins/maps/public/components/metrics_editor/metrics_editor.tsx
@@ -8,7 +8,7 @@
 import React, { Component, Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButtonEmpty, EuiComboBoxOptionOption, EuiSpacer, EuiTextAlign } from '@elastic/eui';
-import type { IndexPatternField } from 'src/plugins/data/public';
+import type { IndexPatternField } from '@kbn/data-plugin/public';
 import { MetricEditor } from './metric_editor';
 import { DEFAULT_METRIC } from '../../classes/sources/es_agg_source';
 import { AggDescriptor, FieldedAggDescriptor } from '../../../common/descriptor_types';
diff --git a/x-pack/plugins/maps/public/components/single_field_select.tsx b/x-pack/plugins/maps/public/components/single_field_select.tsx
index 8585ed46d3044..835fc99d931f3 100644
--- a/x-pack/plugins/maps/public/components/single_field_select.tsx
+++ b/x-pack/plugins/maps/public/components/single_field_select.tsx
@@ -18,7 +18,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import { FieldIcon } from '@kbn/react-field';
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 
 function fieldsToOptions(
   fields?: IndexPatternField[],
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
index 7ba2f74ddc7d9..bc0071c9dc62c 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
@@ -22,14 +22,14 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { FilterEditor } from './filter_editor';
 import { JoinEditor, JoinField } from './join_editor';
 import { FlyoutFooter } from './flyout_footer';
 import { LayerSettings } from './layer_settings';
 import { StyleSettings } from './style_settings';
 
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { getData, getCore } from '../../kibana_services';
 import { ILayer } from '../../classes/layers/layer';
 import { isVectorLayer, IVectorLayer } from '../../classes/layers/vector_layer';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
index 79e3ce4467227..afb18aa582a3c 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
@@ -23,7 +23,7 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { DataView, Query } from 'src/plugins/data/common';
+import type { DataView, Query } from '@kbn/data-plugin/common';
 import { APP_ID } from '../../../../common/constants';
 import { getIndexPatternService, getData, getSearchBar } from '../../../kibana_services';
 import { GlobalFilterCheckbox } from '../../../components/global_filter_checkbox';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts
index 2277cba3e4744..7c3db15f10236 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/index.ts
@@ -8,7 +8,7 @@
 import { AnyAction } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
 import { connect } from 'react-redux';
-import type { Query } from 'src/plugins/data/public';
+import type { Query } from '@kbn/data-plugin/public';
 import { FilterEditor } from './filter_editor';
 import { getSelectedLayer } from '../../../selectors/map_selectors';
 import { setLayerQuery, updateSourceProp } from '../../../actions';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx
index bb6df355e3ee7..bbfc9bbb0f302 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx
@@ -9,7 +9,8 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 import { EuiFlexItem, EuiFlexGroup, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { DataViewField, DataView, Query } from 'src/plugins/data/common';
+import type { DataViewField, DataView, Query } from '@kbn/data-plugin/common';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { JoinExpression } from './join_expression';
 import { MetricsExpression } from './metrics_expression';
 import { WhereExpression } from './where_expression';
@@ -22,8 +23,6 @@ import {
 } from '../../../../../common/descriptor_types';
 import { ILayer } from '../../../../classes/layers/layer';
 
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
-
 import { getIndexPatternService } from '../../../../kibana_services';
 import { getDataViewNotFoundMessage } from '../../../../../common/i18n_getters';
 import { AGG_TYPE, SOURCE_TYPES } from '../../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx
index 169dceaccc471..8a0cc5de6f373 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { getDataViewSelectPlaceholder } from '../../../../../common/i18n_getters';
 import { DEFAULT_MAX_BUCKETS_LIMIT } from '../../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx
index 1eaa9a5691fb3..01475054da145 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/metrics_expression.tsx
@@ -15,7 +15,7 @@ import {
   EuiFormHelpText,
 } from '@elastic/eui';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { MetricsEditor } from '../../../../components/metrics_editor';
 import { AGG_TYPE } from '../../../../../common/constants';
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
index 79effb98f2c96..8ee0728aa8220 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
@@ -9,7 +9,7 @@ import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiPopover, EuiExpression, EuiFormHelpText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView, Query } from 'src/plugins/data/common';
+import { DataView, Query } from '@kbn/data-plugin/common';
 import { APP_ID } from '../../../../../common/constants';
 import { getData, getSearchBar } from '../../../../kibana_services';
 
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
index 818f4e3dc7f4d..e975834f2cf50 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
@@ -18,10 +18,10 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ValidatedDualRange } from '@kbn/kibana-react-plugin/public';
 import { Attribution } from '../../../../common/descriptor_types';
 import { MAX_ZOOM } from '../../../../common/constants';
 import { AlphaSlider } from '../../../components/alpha_slider';
-import { ValidatedDualRange } from '../../../../../../../src/plugins/kibana_react/public';
 import { ILayer } from '../../../classes/layers/layer';
 import { AttributionFormRow } from './attribution_form_row';
 
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index 6a4162f65a7fb..9d3e875ad0084 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -12,10 +12,10 @@ import { EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { Observable } from 'rxjs';
 import moment from 'moment';
-import { ExitFullScreenButton } from '@kbn/shared-ux-components';
+import { ExitFullScreenButton } from '@kbn/shared-ux-button-exit-full-screen';
 import { MBMap } from '../mb_map';
 import { RightSideControls } from '../right_side_controls';
 import { Timeslider } from '../timeslider';
diff --git a/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx b/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx
index e0a9e9258237c..38d5231ac7b2c 100644
--- a/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_settings_panel/navigation_panel.tsx
@@ -21,8 +21,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ValidatedDualRange, Value } from '@kbn/kibana-react-plugin/public';
 import { MapSettings } from '../../reducers/map';
-import { ValidatedDualRange, Value } from '../../../../../../src/plugins/kibana_react/public';
 import { INITIAL_LOCATION, MAX_ZOOM, MIN_ZOOM } from '../../../common/constants';
 import { MapCenter } from '../../../common/descriptor_types';
 // @ts-ignore
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/index.ts
index df03f755d6d2b..3c9244a74914d 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/index.ts
@@ -16,6 +16,7 @@ import {
   mapExtentChanged,
   mapReady,
   setAreTilesLoaded,
+  setLayerDataLoadErrorStatus,
   setMapInitError,
   setMouseCoordinates,
   updateMetaFromTiles,
@@ -86,6 +87,12 @@ function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyActi
     updateMetaFromTiles(layerId: string, features: TileMetaFeature[]) {
       dispatch(updateMetaFromTiles(layerId, features));
     },
+    clearTileLoadError(layerId: string) {
+      dispatch(setLayerDataLoadErrorStatus(layerId, null));
+    },
+    setTileLoadError(layerId: string, errorMessage: string) {
+      dispatch(setLayerDataLoadErrorStatus(layerId, errorMessage));
+    },
   };
 }
 
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
index 64a66f5eee29c..8c430647cbbd3 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
@@ -7,12 +7,13 @@
 
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { Filter } from '@kbn/es-query';
-import { Action, ActionExecutionContext } from 'src/plugins/ui_actions/public';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 
 import { mapboxgl } from '@kbn/mapbox-gl';
 import type { Map as MapboxMap, MapboxOptions, MapMouseEvent } from '@kbn/mapbox-gl';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 import { DrawFilterControl } from './draw_control/draw_filter_control';
 import { ScaleControl } from './scale_control';
 import { TooltipControl } from './tooltip_control';
@@ -40,7 +41,6 @@ import { getGlyphUrl } from '../../util';
 import { syncLayerOrder } from './sort_layers';
 
 import { getTileMetaFeatures, removeOrphanedSourcesAndLayers } from './utils';
-import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
 import { RenderToolTipContent } from '../../classes/tooltips/tooltip_property';
 import { TileStatusTracker } from './tile_status_tracker';
 import { DrawFeatureControl } from './draw_control/draw_feature_control';
@@ -76,6 +76,8 @@ export interface Props {
   updateMetaFromTiles: (layerId: string, features: TileMetaFeature[]) => void;
   featureModeActive: boolean;
   filterModeActive: boolean;
+  setTileLoadError(layerId: string, errorMessage: string): void;
+  clearTileLoadError(layerId: string): void;
 }
 
 interface State {
@@ -205,8 +207,15 @@ export class MbMap extends Component<Props, State> {
       this._tileStatusTracker = new TileStatusTracker({
         mbMap,
         getCurrentLayerList: () => this.props.layerList,
-        updateTileStatus: (layer: ILayer, areTilesLoaded: boolean) => {
+        updateTileStatus: (layer: ILayer, areTilesLoaded: boolean, errorMessage?: string) => {
           this.props.setAreTilesLoaded(layer.getId(), areTilesLoaded);
+
+          if (errorMessage) {
+            this.props.setTileLoadError(layer.getId(), errorMessage);
+          } else {
+            this.props.clearTileLoadError(layer.getId());
+          }
+
           this._queryForMeta(layer);
         },
       });
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts
index 76052f4590aba..ffc6459262c8b 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.test.ts
@@ -61,6 +61,11 @@ function createMockMbDataEvent(mbSourceId: string, tileKey: string): unknown {
     dataType: 'source',
     tile: {
       tileID: {
+        canonical: {
+          x: 80,
+          y: 10,
+          z: 5,
+        },
         key: tileKey,
       },
     },
@@ -133,7 +138,7 @@ describe('TileStatusTracker', () => {
       },
     });
 
-    expect(mockMbMap.listeners.length).toBe(3);
+    expect(mockMbMap.listeners.length).toBe(4);
     tileStatusTracker.destroy();
     expect(mockMbMap.listeners.length).toBe(0);
   });
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts
index 72d692a147ff2..94a4344bac009 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker.ts
@@ -7,14 +7,21 @@
 
 import type { Map as MapboxMap, MapSourceDataEvent } from '@kbn/mapbox-gl';
 import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
 import { ILayer } from '../../classes/layers/layer';
 import { SPATIAL_FILTERS_LAYER_ID } from '../../../common/constants';
+import { getTileKey } from '../../classes/util/geo_tile_utils';
 
 interface MbTile {
   // references internal object from mapbox
   aborted?: boolean;
 }
 
+type TileError = Error & {
+  status: number;
+  tileZXYKey: string; // format zoom/x/y
+};
+
 interface Tile {
   mbKey: string;
   mbSourceId: string;
@@ -23,9 +30,16 @@ interface Tile {
 
 export class TileStatusTracker {
   private _tileCache: Tile[];
+  private _tileErrorCache: Record<string, TileError[]>;
+  private _prevCenterTileKey?: string;
   private readonly _mbMap: MapboxMap;
-  private readonly _updateTileStatus: (layer: ILayer, areTilesLoaded: boolean) => void;
+  private readonly _updateTileStatus: (
+    layer: ILayer,
+    areTilesLoaded: boolean,
+    errorMessage?: string
+  ) => void;
   private readonly _getCurrentLayerList: () => ILayer[];
+
   private readonly _onSourceDataLoading = (e: MapSourceDataEvent) => {
     if (
       e.sourceId &&
@@ -51,16 +65,29 @@ export class TileStatusTracker {
     }
   };
 
-  private readonly _onError = (e: MapSourceDataEvent) => {
+  private readonly _onError = (e: MapSourceDataEvent & { error: Error & { status: number } }) => {
     if (
       e.sourceId &&
       e.sourceId !== SPATIAL_FILTERS_LAYER_ID &&
       e.tile &&
       (e.source.type === 'vector' || e.source.type === 'raster')
     ) {
+      const targetLayer = this._getCurrentLayerList().find((layer) => {
+        return layer.ownsMbSourceId(e.sourceId);
+      });
+      const layerId = targetLayer ? targetLayer.getId() : undefined;
+      if (layerId) {
+        const layerErrors = this._tileErrorCache[layerId] ? this._tileErrorCache[layerId] : [];
+        layerErrors.push({
+          ...e.error,
+          tileZXYKey: `${e.tile.tileID.canonical.z}/${e.tile.tileID.canonical.x}/${e.tile.tileID.canonical.y}`,
+        } as TileError);
+        this._tileErrorCache[layerId] = layerErrors;
+      }
       this._removeTileFromCache(e.sourceId, e.tile.tileID.key as unknown as string);
     }
   };
+
   private readonly _onSourceData = (e: MapSourceDataEvent) => {
     if (
       e.sourceId &&
@@ -73,16 +100,35 @@ export class TileStatusTracker {
     }
   };
 
+  /*
+   * Clear errors when center tile changes.
+   * Tracking center tile provides the cleanest way to know when a new data fetching cycle is beginning
+   */
+  private readonly _onMove = () => {
+    const center = this._mbMap.getCenter();
+    // Maplibre rounds zoom when 'source.roundZoom' is true and floors zoom when 'source.roundZoom' is false
+    // 'source.roundZoom' is true for raster and video layers
+    // 'source.roundZoom' is false for vector layers
+    // Always floor zoom to keep logic as simple as possible and not have to track center tile by source.
+    // We are mainly concerned with showing errors from Elasticsearch vector tile requests (which are vector sources)
+    const centerTileKey = getTileKey(center.lat, center.lng, Math.floor(this._mbMap.getZoom()));
+    if (this._prevCenterTileKey !== centerTileKey) {
+      this._prevCenterTileKey = centerTileKey;
+      this._tileErrorCache = {};
+    }
+  };
+
   constructor({
     mbMap,
     updateTileStatus,
     getCurrentLayerList,
   }: {
     mbMap: MapboxMap;
-    updateTileStatus: (layer: ILayer, areTilesLoaded: boolean) => void;
+    updateTileStatus: (layer: ILayer, areTilesLoaded: boolean, errorMessage?: string) => void;
     getCurrentLayerList: () => ILayer[];
   }) {
     this._tileCache = [];
+    this._tileErrorCache = {};
     this._updateTileStatus = updateTileStatus;
     this._getCurrentLayerList = getCurrentLayerList;
 
@@ -90,6 +136,7 @@ export class TileStatusTracker {
     this._mbMap.on('sourcedataloading', this._onSourceDataLoading);
     this._mbMap.on('error', this._onError);
     this._mbMap.on('sourcedata', this._onSourceData);
+    this._mbMap.on('move', this._onMove);
   }
 
   _updateTileStatusForAllLayers = _.debounce(() => {
@@ -107,7 +154,31 @@ export class TileStatusTracker {
           break;
         }
       }
-      this._updateTileStatus(layer, !atLeastOnePendingTile);
+      const tileErrorMessages = this._tileErrorCache[layer.getId()]
+        ? this._tileErrorCache[layer.getId()].map((tileError) => {
+            return i18n.translate('xpack.maps.tileStatusTracker.tileErrorMsg', {
+              defaultMessage: `tile '{tileZXYKey}' failed to load: '{status} {message}'`,
+              values: {
+                tileZXYKey: tileError.tileZXYKey,
+                status: tileError.status,
+                message: tileError.message,
+              },
+            });
+          })
+        : [];
+      this._updateTileStatus(
+        layer,
+        !atLeastOnePendingTile,
+        tileErrorMessages.length
+          ? i18n.translate('xpack.maps.tileStatusTracker.layerErrorMsg', {
+              defaultMessage: `Unable to load {count} tiles: {tileErrors}`,
+              values: {
+                count: tileErrorMessages.length,
+                tileErrors: tileErrorMessages.join(', '),
+              },
+            })
+          : undefined
+      );
     }
   }, 100);
 
@@ -126,6 +197,7 @@ export class TileStatusTracker {
     this._mbMap.off('error', this._onError);
     this._mbMap.off('sourcedata', this._onSourceData);
     this._mbMap.off('sourcedataloading', this._onSourceDataLoading);
+    this._mbMap.off('move', this._onMove);
     this._tileCache.length = 0;
   }
 }
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
index 97186854a44d6..1d6c897fcf0d1 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
@@ -9,11 +9,11 @@ import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { Geometry, Polygon } from 'geojson';
 import rison, { RisonObject } from 'rison-node';
-import { URL_MAX_LENGTH } from '../../../../../../../../src/core/public';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
+import { URL_MAX_LENGTH } from '@kbn/core/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import {
   createSpatialFilterWithGeometry,
   PreIndexedShape,
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
index ab505bc023275..1e3bdf8503420 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { FeatureProperties } from './feature_properties';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { ITooltipProperty } from '../../../../classes/tooltips/tooltip_property';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 
 class MockTooltipProperty {
   private _key: string;
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
index edd2802a7eea8..8607f1ce0503a 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
@@ -16,10 +16,10 @@ import {
   EuiContextMenu,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { GeoJsonProperties } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { isUrlDrilldown } from '../../../../trigger_actions/trigger_utils';
 import { RawValue } from '../../../../../common/constants';
 import { ITooltipProperty } from '../../../../classes/tooltips/tooltip_property';
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx
index 235de31f7557d..8032c80af4c2f 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/features_tooltip.tsx
@@ -8,7 +8,7 @@
 import React, { Component, Fragment, ReactNode } from 'react';
 import { EuiIcon, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { GeoJsonProperties } from 'geojson';
 import { Filter } from '@kbn/es-query';
 import { FeatureProperties } from './feature_properties';
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
index f8a720a8fcde0..05c1c8dc8bdfa 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
@@ -18,7 +18,7 @@ import {
 import uuid from 'uuid/v4';
 import { Geometry } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { GEO_JSON_TYPE, LON_INDEX, RawValue } from '../../../../common/constants';
 import {
   GEOMETRY_FILTER_ACTION,
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx
index cc5a862b911be..99b98943b94a9 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.tsx
@@ -10,7 +10,7 @@ import { EuiPopover, EuiText } from '@elastic/eui';
 import type { Map as MbMap } from '@kbn/mapbox-gl';
 import { GeoJsonProperties, Geometry } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { FeaturesTooltip } from './features_tooltip';
 import { LAT_INDEX, LON_INDEX, RawValue } from '../../../../common/constants';
 import { IVectorLayer } from '../../../classes/layers/vector_layer';
diff --git a/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts b/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts
index 7195851aafe2c..01f79114b13d0 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/time_utils.ts
@@ -7,7 +7,7 @@
 
 import moment from 'moment-timezone';
 import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks';
-import { calcAutoIntervalNear } from '../../../../../../src/plugins/data/common';
+import { calcAutoIntervalNear } from '@kbn/data-plugin/common';
 import { getUiSettings } from '../../kibana_services';
 
 function getTimezone() {
diff --git a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
index eaa2aa158e55a..ee5a534f7c6f0 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
@@ -12,8 +12,8 @@ import { EuiRangeTick } from '@elastic/eui/src/components/form/range/range_ticks
 import { i18n } from '@kbn/i18n';
 import { Observable, Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { epochToKbnDateFormat, getInterval, getTicks } from './time_utils';
-import { TimeRange } from '../../../../../../src/plugins/data/common';
 import { getTimeFilter } from '../../kibana_services';
 import { Timeslice } from '../../../common/descriptor_types';
 
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
index 1179f3557c62c..a762b7ceaac3c 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiButtonIcon, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { TrackApplicationView } from '../../../../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { DRAW_SHAPE } from '../../../../../common/constants';
 import { VectorCircleIcon } from '../../icons/vector_circle_icon';
 import { VectorLineIcon } from '../../icons/vector_line_icon';
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx
index 82835f449aeaa..771f10dd15677 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { Filter } from '@kbn/es-query';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { SetViewControl } from './set_view_control';
 import { ToolsControl } from './tools_control';
 import { FeatureEditTools } from './feature_draw_controls/feature_edit_tools';
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
index b140c7ae60bcf..0f5a3a59e762c 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { ActionExecutionContext, Action } from '@kbn/ui-actions-plugin/public';
 import { DRAW_SHAPE, ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../../../../common/constants';
 import { GeometryFilterForm } from '../../../components/draw_forms/geometry_filter_form/geometry_filter_form';
 import { DistanceFilterForm } from '../../../components/draw_forms/distance_filter_form';
diff --git a/x-pack/plugins/maps/public/embeddable/map_component.tsx b/x-pack/plugins/maps/public/embeddable/map_component.tsx
index 6399cb327c14d..f9bc8423f44e0 100644
--- a/x-pack/plugins/maps/public/embeddable/map_component.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_component.tsx
@@ -9,7 +9,7 @@ import React, { Component, RefObject } from 'react';
 import uuid from 'uuid/v4';
 import { EuiLoadingChart } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../src/plugins/data/common';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
 import type { LayerDescriptor, MapCenterAndZoom } from '../../common/descriptor_types';
 import type { MapEmbeddableType } from './types';
 import type { LazyLoadedMapModules } from '../lazy_load_bundle';
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index d572734e816a9..d733c52299993 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -15,7 +15,7 @@ import { Subscription } from 'rxjs';
 import { Unsubscribe } from 'redux';
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { type Filter, compareFilters } from '@kbn/es-query';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import {
   Embeddable,
   IContainer,
@@ -23,10 +23,10 @@ import {
   genericEmbeddableInputIsEqual,
   VALUE_CLICK_TRIGGER,
   omitGenericEmbeddableInput,
-} from '../../../../../src/plugins/embeddable/public';
-import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
-import { APPLY_FILTER_TRIGGER, TimeRange, Query } from '../../../../../src/plugins/data/public';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/unified_search/public';
+} from '@kbn/embeddable-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER, TimeRange, Query } from '@kbn/data-plugin/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '@kbn/unified-search-plugin/public';
 import { createExtentFilter } from '../../common/elasticsearch_util';
 import {
   replaceLayerList,
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
index 4a2048fc40e63..6f823f218ca23 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/constants';
 import { getMapEmbeddableDisplayName } from '../../common/i18n_getters';
 import { extract, inject } from '../../common/embeddable';
diff --git a/x-pack/plugins/maps/public/embeddable/types.ts b/x-pack/plugins/maps/public/embeddable/types.ts
index b401f50c00b07..3b51756dba260 100644
--- a/x-pack/plugins/maps/public/embeddable/types.ts
+++ b/x-pack/plugins/maps/public/embeddable/types.ts
@@ -6,14 +6,14 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import type { DataView } from '../../../../../src/plugins/data/common';
+import type { DataView } from '@kbn/data-plugin/common';
 import {
   Embeddable,
   EmbeddableInput,
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
-} from '../../../../../src/plugins/embeddable/public';
-import { Query, TimeRange } from '../../../../../src/plugins/data/common';
+} from '@kbn/embeddable-plugin/public';
+import { Query, TimeRange } from '@kbn/data-plugin/common';
 import { MapCenterAndZoom, MapExtent } from '../../common/descriptor_types';
 import { MapSavedObjectAttributes } from '../../common/map_saved_object_type';
 import { MapSettings } from '../reducers/map';
diff --git a/x-pack/plugins/maps/public/feature_catalogue_entry.ts b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
index 1902e59b523e1..80d37aa0288e7 100644
--- a/x-pack/plugins/maps/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
 import { APP_ID, APP_ICON } from '../common/constants';
 import { getAppTitle } from '../common/i18n_getters';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 
 export const featureCatalogueEntry = {
   id: APP_ID,
@@ -22,7 +22,7 @@ export const featureCatalogueEntry = {
   icon: APP_ICON,
   path: '/app/maps',
   showOnHomePage: false,
-  category: FeatureCatalogueCategory.DATA,
+  category: 'data' as FeatureCatalogueCategory,
   solutionId: 'kibana',
   order: 400,
 };
diff --git a/x-pack/plugins/maps/public/index.ts b/x-pack/plugins/maps/public/index.ts
index 6b8767abe9c11..cda7c7876c8b6 100644
--- a/x-pack/plugins/maps/public/index.ts
+++ b/x-pack/plugins/maps/public/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/public';
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MapsPlugin, MapsPluginSetup, MapsPluginStart } from './plugin';
 import { MapsXPackConfig } from '../config';
 
diff --git a/x-pack/plugins/maps/public/index_pattern_util.test.ts b/x-pack/plugins/maps/public/index_pattern_util.test.ts
index 71cb11effea64..52c91e05e6132 100644
--- a/x-pack/plugins/maps/public/index_pattern_util.test.ts
+++ b/x-pack/plugins/maps/public/index_pattern_util.test.ts
@@ -14,7 +14,7 @@ import {
   supportsGeoTileAgg,
 } from './index_pattern_util';
 import { ES_GEO_FIELD_TYPE } from '../common/constants';
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IndexPatternField } from '@kbn/data-plugin/public';
 
 describe('getSourceFields', () => {
   test('Should remove multi fields from field list', () => {
diff --git a/x-pack/plugins/maps/public/index_pattern_util.ts b/x-pack/plugins/maps/public/index_pattern_util.ts
index f0762f743184d..fc31b62f79a7b 100644
--- a/x-pack/plugins/maps/public/index_pattern_util.ts
+++ b/x-pack/plugins/maps/public/index_pattern_util.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { DataViewField, DataView } from 'src/plugins/data/common';
+import type { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { asyncMap } from '@kbn/std';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { getIndexPatternService } from './kibana_services';
-import { indexPatterns } from '../../../../src/plugins/data/public';
 import { ES_GEO_FIELD_TYPE, ES_GEO_FIELD_TYPES } from '../common/constants';
 import { getIsGoldPlus } from './licensed_features';
 
diff --git a/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx b/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx
index 77809b81b9077..7f65a630b72bd 100644
--- a/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx
+++ b/x-pack/plugins/maps/public/inspector/map_inspector_view.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { lazy } from 'react';
-import type { Adapters } from 'src/plugins/inspector/public';
+import type { Adapters } from '@kbn/inspector-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { LazyWrapper } from '../lazy_wrapper';
 
diff --git a/x-pack/plugins/maps/public/inspector/map_view_component.tsx b/x-pack/plugins/maps/public/inspector/map_view_component.tsx
index 364f4d4d2d435..a5f25c858cc1a 100644
--- a/x-pack/plugins/maps/public/inspector/map_view_component.tsx
+++ b/x-pack/plugins/maps/public/inspector/map_view_component.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { Component } from 'react';
-import type { Adapters } from 'src/plugins/inspector/public';
+import type { Adapters } from '@kbn/inspector-plugin/public';
 import { MapDetails } from './map_details';
 import { Stats } from './types';
 
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index f2345d2102a12..ebebf4b3ba7fc 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { PaletteRegistry } from '@kbn/coloring';
+import type { EMSSettings } from '@kbn/maps-ems-plugin/common/ems_settings';
+import { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 import type { MapsConfigType } from '../config';
 import type { MapsPluginStartDependencies } from './plugin';
-import type { EMSSettings } from '../../../../src/plugins/maps_ems/common/ems_settings';
-import type { PaletteRegistry } from '../../../../src/plugins/charts/public';
-import { MapsEmsPluginPublicStart } from '../../../../src/plugins/maps_ems/public';
 
 let coreStart: CoreStart;
 let pluginsStart: MapsPluginStartDependencies;
@@ -51,7 +51,6 @@ export const getVisualizeCapabilities = () => coreStart.application.capabilities
 export const getDocLinks = () => coreStart.docLinks;
 export const getCoreOverlays = () => coreStart.overlays;
 export const getData = () => pluginsStart.data;
-export const getSavedObjects = () => pluginsStart.savedObjects;
 export const getUiActions = () => pluginsStart.uiActions;
 export const getCore = () => coreStart;
 export const getNavigation = () => pluginsStart.navigation;
@@ -65,7 +64,7 @@ export const getSecurityService = () => pluginsStart.security;
 export const getSpacesApi = () => pluginsStart.spaces;
 export const getTheme = () => coreStart.theme;
 export const getUsageCollection = () => pluginsStart.usageCollection;
-export const getSharedUXPluginContext = () => pluginsStart.sharedUX;
+export const getApplication = () => coreStart.application;
 
 // xpack.maps.* kibana.yml settings from this plugin
 let mapAppConfig: MapsConfigType;
diff --git a/x-pack/plugins/maps/public/lazy_load_bundle/index.ts b/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
index 8fdae1ae6d197..e65e4599d52c3 100644
--- a/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
+++ b/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IndexPatternsContract } from 'src/plugins/data/public';
-import { AppMountParameters } from 'kibana/public';
-import { IContainer } from '../../../../../src/plugins/embeddable/public';
+import { IndexPatternsContract } from '@kbn/data-plugin/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { IContainer } from '@kbn/embeddable-plugin/public';
 import { LayerDescriptor } from '../../common/descriptor_types';
 import type {
   MapEmbeddableConfig,
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx
index c9e422001da3e..9a79d4f10fd2f 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_editor.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { getData, getShareService } from '../../kibana_services';
 import { ViewInMaps } from '../view_in_maps';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts
index 8a6c3fcc5c3c3..acbbf25c8a49f 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts
@@ -7,12 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
-import type { ExpressionValueSearchContext } from '../../../../../../src/plugins/data/common/search/expressions/kibana_context_type';
-import type {
-  ExpressionFunctionDefinition,
-  Render,
-} from '../../../../../../src/plugins/expressions/public';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
+import type { ExpressionValueSearchContext } from '@kbn/data-plugin/common/search/expressions/kibana_context_type';
+import type { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 import { REGION_MAP_RENDER, REGION_MAP_VIS_TYPE, RegionMapVisConfig } from './types';
 
 interface Arguments {
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx
index 19066a618ee79..532353cea02d8 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx
@@ -7,7 +7,7 @@
 
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import type { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import type { RegionMapVisRenderValue } from './region_map_fn';
 import { LazyWrapper } from '../../lazy_wrapper';
 import { REGION_MAP_RENDER } from './types';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx
index 473f83a270871..b51c4a3b5a23f 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.tsx
@@ -7,8 +7,8 @@
 
 import React, { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { VisTypeDefinition } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { REGION_MAP_VIS_TYPE, RegionMapVisParams } from './types';
 import { LazyWrapper } from '../../lazy_wrapper';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
index efbf93931cbad..8c51e5c38a197 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
 import { RegionMapVisConfig } from './types';
 import type { LazyLoadedMapModules } from '../../lazy_load_bundle';
 import { MapComponent } from '../../embeddable/map_component';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts b/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts
index 49f431980b950..097ce68fc4aca 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/to_ast.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../../src/plugins/expressions/public';
-import { VisToExpressionAst } from '../../../../../../src/plugins/visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { RegionMapExpressionFunctionDefinition } from './region_map_fn';
 import { RegionMapVisParams } from './types';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts b/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts
index a641bbb5a7c39..7116718aa09bd 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { RegionMapVisParams } from './types';
 import { title } from './region_map_vis_type';
 
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx
index 81f440eef233e..59aa745a29c16 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_editor.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
 import { getData, getShareService } from '../../kibana_services';
 import { ViewInMaps } from '../view_in_maps';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts
index e71efccf68d3b..8239a017bf0fa 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts
@@ -7,12 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
-import type { ExpressionValueSearchContext } from '../../../../../../src/plugins/data/common/search/expressions/kibana_context_type';
-import type {
-  ExpressionFunctionDefinition,
-  Render,
-} from '../../../../../../src/plugins/expressions/public';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
+import type { ExpressionValueSearchContext } from '@kbn/data-plugin/common/search/expressions/kibana_context_type';
+import type { ExpressionFunctionDefinition, Render } from '@kbn/expressions-plugin/public';
 import { TILE_MAP_RENDER, TILE_MAP_VIS_TYPE, TileMapVisConfig } from './types';
 
 interface Arguments {
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx
index 75569da5020c7..90b0d0a66fa9d 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx
@@ -7,7 +7,7 @@
 
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import type { ExpressionRenderDefinition } from 'src/plugins/expressions';
+import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
 import type { TileMapVisRenderValue } from './tile_map_fn';
 import { LazyWrapper } from '../../lazy_wrapper';
 import { TILE_MAP_RENDER } from './types';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx
index 3ecf8c24e200a..c0a5fe55259f4 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.tsx
@@ -7,8 +7,8 @@
 
 import React, { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { VisTypeDefinition } from '../../../../../../src/plugins/visualizations/public';
+import type { VisEditorOptionsProps } from '@kbn/visualizations-plugin/public';
+import { VisTypeDefinition } from '@kbn/visualizations-plugin/public';
 import { toExpressionAst } from './to_ast';
 import { MapTypes, TileMapVisParams, TILE_MAP_VIS_TYPE } from './types';
 import { LazyWrapper } from '../../lazy_wrapper';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
index 3213e4053cb5b..abe5c571c1c39 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import type { Filter } from '@kbn/es-query';
-import type { Query, TimeRange } from '../../../../../../src/plugins/data/common';
+import type { Query, TimeRange } from '@kbn/data-plugin/common';
 import { TileMapVisConfig } from './types';
 import type { LazyLoadedMapModules } from '../../lazy_load_bundle';
 import { MapComponent } from '../../embeddable/map_component';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts
index 5417dabfee8d4..4d12770d90cc9 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/to_ast.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  buildExpression,
-  buildExpressionFunction,
-} from '../../../../../../src/plugins/expressions/public';
-import { VisToExpressionAst } from '../../../../../../src/plugins/visualizations/public';
+import { buildExpression, buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { VisToExpressionAst } from '@kbn/visualizations-plugin/public';
 import { TileMapExpressionFunctionDefinition } from './tile_map_fn';
 import { TileMapVisParams } from './types';
 import { extractLayerDescriptorParams } from './utils';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts
index 3fcb3d8915701..114c44b1c057d 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Vis } from '../../../../../../src/plugins/visualizations/public';
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { Vis } from '@kbn/visualizations-plugin/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { TileMapVisParams } from './types';
 import { title } from './tile_map_vis_type';
 
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
index 4fd6dc8994b8c..5089a8cc6c8d5 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import type { FileLayer } from '@elastic/ems-client';
-import { IUiSettingsClient } from 'kibana/public';
-import type { EmbeddableFactory } from 'src/plugins/embeddable/public';
-import type { Datatable } from 'src/plugins/expressions/public';
-import type { FormatFactory } from 'src/plugins/field_formats/common';
+import { IUiSettingsClient } from '@kbn/core/public';
+import type { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
+import type { FormatFactory } from '@kbn/field-formats-plugin/common';
 import {
   FIELD_ORIGIN,
   LAYER_TYPE,
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
index 403f0ed9bfb40..7ed1ddfbd4381 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
-import type { LensMultiTable } from '../../../../lens/common';
+import type { LensMultiTable } from '@kbn/lens-plugin/common';
+import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import type { ChoroplethChartConfig, ChoroplethChartProps } from './types';
 import { RENDERER_ID } from './expression_renderer';
-import { prepareLogTable } from '../../../../../../src/plugins/visualizations/common/utils';
 
 interface ChoroplethChartRender {
   type: 'render';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx
index 0f1649d911c10..4fc96d7625504 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_renderer.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { IInterpreterRenderHandlers } from 'src/plugins/expressions/public';
-import type { EmbeddableFactory } from 'src/plugins/embeddable/public';
-import type { CoreSetup, CoreStart } from 'src/core/public';
+import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
+import type { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import type { CoreSetup, CoreStart } from '@kbn/core/public';
 import type { MapsPluginStartDependencies } from '../../plugin';
 import type { ChoroplethChartProps } from './types';
 import type { MapEmbeddableInput, MapEmbeddableOutput } from '../../embeddable';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts
index 6d8ee4148271e..67836a27c0bfe 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/get_ems_suggestion.ts
@@ -6,7 +6,7 @@
  */
 
 import type { FileLayer } from '@elastic/ems-client';
-import type { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from '@kbn/expressions-plugin/public';
 import { emsAutoSuggest } from '../../ems_autosuggest';
 
 export function getEmsSuggestion(
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts
index 69d575c6f9a8f..626030e72a576 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/setup.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ExpressionsSetup } from 'src/plugins/expressions/public';
-import type { CoreSetup, CoreStart } from 'src/core/public';
-import type { LensPublicSetup } from '../../../../lens/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { CoreSetup, CoreStart } from '@kbn/core/public';
+import type { LensPublicSetup } from '@kbn/lens-plugin/public';
 import type { MapsPluginStartDependencies } from '../../plugin';
 import { getExpressionFunction } from './expression_function';
 import { getExpressionRenderer } from './expression_renderer';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts
index 501cc44567bac..a7caa72c6c5df 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/suggestions.ts
@@ -8,7 +8,7 @@
 import { partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import type { FileLayer } from '@elastic/ems-client';
-import type { SuggestionRequest, VisualizationSuggestion } from '../../../../lens/public';
+import type { SuggestionRequest, VisualizationSuggestion } from '@kbn/lens-plugin/public';
 import type { ChoroplethChartState } from './types';
 import { Icon } from './icon';
 import { getEmsSuggestion } from './get_ems_suggestion';
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
index b9b7f3912f0cc..79c05a93ef2d4 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LensMultiTable } from '../../../../lens/common';
+import type { LensMultiTable } from '@kbn/lens-plugin/common';
 
 export interface ChoroplethChartState {
   layerId: string;
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx
index 93c3bec52471e..cbac26f220163 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/visualization.tsx
@@ -10,12 +10,12 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { render } from 'react-dom';
 import type { FileLayer } from '@elastic/ems-client';
-import { ThemeServiceStart } from 'kibana/public';
-import type { PaletteRegistry } from 'src/plugins/charts/public';
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
+import type { PaletteRegistry } from '@kbn/coloring';
+import { ThemeServiceStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { layerTypes } from '@kbn/lens-plugin/public';
+import type { OperationMetadata, SuggestionRequest, Visualization } from '@kbn/lens-plugin/public';
 import { getSuggestions } from './suggestions';
-import { layerTypes } from '../../../../lens/public';
-import type { OperationMetadata, SuggestionRequest, Visualization } from '../../../../lens/public';
 import type { ChoroplethChartState } from './types';
 import { Icon } from './icon';
 import { RegionKeyEditor } from './region_key_editor';
diff --git a/x-pack/plugins/maps/public/lens/passive_map.tsx b/x-pack/plugins/maps/public/lens/passive_map.tsx
index 3db464405b3a5..1117ad1d6db28 100644
--- a/x-pack/plugins/maps/public/lens/passive_map.tsx
+++ b/x-pack/plugins/maps/public/lens/passive_map.tsx
@@ -8,7 +8,7 @@
 import React, { Component, RefObject } from 'react';
 import uuid from 'uuid/v4';
 import { EuiLoadingChart } from '@elastic/eui';
-import { EmbeddableFactory, ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { EmbeddableFactory, ViewMode } from '@kbn/embeddable-plugin/public';
 import type { LayerDescriptor } from '../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../common';
 import { MapEmbeddable, MapEmbeddableInput, MapEmbeddableOutput } from '../embeddable';
diff --git a/x-pack/plugins/maps/public/licensed_features.ts b/x-pack/plugins/maps/public/licensed_features.ts
index c615d08cfcca4..9c95a389684b9 100644
--- a/x-pack/plugins/maps/public/licensed_features.ts
+++ b/x-pack/plugins/maps/public/licensed_features.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ILicense, LicenseType } from '../../licensing/common/types';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { APP_ID } from '../common/constants';
 
 export enum LICENSED_FEATURES {
diff --git a/x-pack/plugins/maps/public/locators.ts b/x-pack/plugins/maps/public/locators.ts
index cebd9289c44b9..6c5d5a730edf7 100644
--- a/x-pack/plugins/maps/public/locators.ts
+++ b/x-pack/plugins/maps/public/locators.ts
@@ -10,14 +10,9 @@
 import rison from 'rison-node';
 import type { SerializableRecord } from '@kbn/utility-types';
 import { type Filter, isFilterPinned } from '@kbn/es-query';
-import type {
-  TimeRange,
-  Query,
-  QueryState,
-  RefreshInterval,
-} from '../../../../src/plugins/data/public';
-import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
-import type { LocatorDefinition, LocatorPublic } from '../../../../src/plugins/share/public';
+import type { TimeRange, Query, QueryState, RefreshInterval } from '@kbn/data-plugin/public';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 import type { LayerDescriptor } from '../common/descriptor_types';
 import { INITIAL_LAYERS_KEY, APP_ID } from '../common/constants';
 import { lazyLoadMapModules } from './lazy_load_bundle';
diff --git a/x-pack/plugins/maps/public/map_attribute_service.ts b/x-pack/plugins/maps/public/map_attribute_service.ts
index 4abf85fc5eaf1..8ede3e8911461 100644
--- a/x-pack/plugins/maps/public/map_attribute_service.ts
+++ b/x-pack/plugins/maps/public/map_attribute_service.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/types';
-import type { SavedObjectsResolveResponse } from 'src/core/public';
-import { AttributeService } from '../../../../src/plugins/embeddable/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
+import { AttributeService } from '@kbn/embeddable-plugin/public';
+import { checkForDuplicateTitle, OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import { MapSavedObjectAttributes } from '../common/map_saved_object_type';
 import { MAP_SAVED_OBJECT_TYPE } from '../common/constants';
 import { getMapEmbeddableDisplayName } from '../common/i18n_getters';
-import { checkForDuplicateTitle, OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 import { getCoreOverlays, getEmbeddableService, getSavedObjectsClient } from './kibana_services';
 import { extractReferences, injectReferences } from '../common/migrations/references';
 import { MapByValueInput, MapByReferenceInput } from './embeddable/types';
diff --git a/x-pack/plugins/maps/public/maps_vis_type_alias.ts b/x-pack/plugins/maps/public/maps_vis_type_alias.ts
index 9bab4992d1582..e6dad590b037a 100644
--- a/x-pack/plugins/maps/public/maps_vis_type_alias.ts
+++ b/x-pack/plugins/maps/public/maps_vis_type_alias.ts
@@ -6,11 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type {
-  VisualizationsSetup,
-  VisualizationStage,
-} from '../../../../src/plugins/visualizations/public';
-import type { SavedObject } from '../../../../src/core/types/saved_objects';
+import type { VisualizationsSetup, VisualizationStage } from '@kbn/visualizations-plugin/public';
+import type { SavedObject } from '@kbn/core/types/saved_objects';
 import type { MapSavedObject } from '../common/map_saved_object_type';
 import {
   APP_ID,
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 2ab91462cfe7e..5e9662c543641 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -6,65 +6,41 @@
  */
 
 import React from 'react';
-import type { Setup as InspectorSetupContract } from 'src/plugins/inspector/public';
-import type { UiActionsStart } from 'src/plugins/ui_actions/public';
-import type { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import type { Start as InspectorStartContract } from 'src/plugins/inspector/public';
-import type { DashboardStart } from 'src/plugins/dashboard/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
+import type { Setup as InspectorSetupContract } from '@kbn/inspector-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import type { Start as InspectorStartContract } from '@kbn/inspector-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type {
   AppMountParameters,
   CoreSetup,
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from '../../../../src/core/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import { MapInspectorView } from './inspector/map_inspector_view';
-import { setIsCloudEnabled, setMapAppConfig, setStartServices } from './kibana_services';
-import { featureCatalogueEntry } from './feature_catalogue_entry';
-import { getMapsVisTypeAlias } from './maps_vis_type_alias';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../src/plugins/visualizations/public';
-import type { Plugin as ExpressionsPublicPlugin } from '../../../../src/plugins/expressions/public';
-import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
-import { VISUALIZE_GEO_FIELD_TRIGGER } from '../../../../src/plugins/ui_actions/public';
-import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
-import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent_action';
-import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
-import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { CONTEXT_MENU_TRIGGER } from '../../../../src/plugins/embeddable/public';
-import { MapsXPackConfig, MapsConfigType } from '../config';
-import { getAppTitle } from '../common/i18n_getters';
-import { lazyLoadMapModules } from './lazy_load_bundle';
-import {
-  createLayerDescriptors,
-  MapsSetupApi,
-  MapsStartApi,
-  suggestEMSTermJoinConfig,
-} from './api';
-import { registerLayerWizardExternal } from './classes/layers';
-import { registerSource } from './classes/sources/source_registry';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
-import type { MapsEmsPluginPublicStart } from '../../../../src/plugins/maps_ems/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
-import type { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
-import type { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
-import type { PresentationUtilPluginStart } from '../../../../src/plugins/presentation_util/public';
-import { registerLicensedFeatures, setLicensingPluginStart } from './licensed_features';
-import type { SavedObjectTaggingPluginStart } from '../../saved_objects_tagging/public';
-import type { ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import {
-  MapsAppLocatorDefinition,
-  MapsAppRegionMapLocatorDefinition,
-  MapsAppTileMapLocatorDefinition,
-} from './locators';
+} from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
+import type { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
+import { VISUALIZE_GEO_FIELD_TRIGGER } from '@kbn/ui-actions-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { FileUploadPluginStart } from '@kbn/file-upload-plugin/public';
+import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
+import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { SecurityPluginStart } from '@kbn/security-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
+import type { LensPublicSetup } from '@kbn/lens-plugin/public';
 import {
   createRegionMapFn,
   regionMapRenderer,
@@ -73,13 +49,33 @@ import {
   tileMapRenderer,
   tileMapVisType,
 } from './legacy_visualizations';
-import type { SecurityPluginStart } from '../../security/public';
-import type { SpacesPluginStart } from '../../spaces/public';
-import type { CloudSetup } from '../../cloud/public';
-import type { LensPublicSetup } from '../../lens/public';
+import {
+  MapsAppLocatorDefinition,
+  MapsAppRegionMapLocatorDefinition,
+  MapsAppTileMapLocatorDefinition,
+} from './locators';
+import { registerLicensedFeatures, setLicensingPluginStart } from './licensed_features';
+import { registerSource } from './classes/sources/source_registry';
+import { registerLayerWizardExternal } from './classes/layers';
+import {
+  createLayerDescriptors,
+  MapsSetupApi,
+  MapsStartApi,
+  suggestEMSTermJoinConfig,
+} from './api';
+import { lazyLoadMapModules } from './lazy_load_bundle';
+import { getAppTitle } from '../common/i18n_getters';
+import { MapsXPackConfig, MapsConfigType } from '../config';
+import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
+import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent_action';
+import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
+import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+import { getMapsVisTypeAlias } from './maps_vis_type_alias';
+import { featureCatalogueEntry } from './feature_catalogue_entry';
+import { setIsCloudEnabled, setMapAppConfig, setStartServices } from './kibana_services';
+import { MapInspectorView } from './inspector/map_inspector_view';
 
 import { setupLensChoroplethChart } from './lens';
-import { SharedUXPluginStart } from '../../../../src/plugins/shared_ux/public';
 
 export interface MapsPluginSetupDependencies {
   cloud?: CloudSetup;
@@ -115,7 +111,6 @@ export interface MapsPluginStartDependencies {
   spaces?: SpacesPluginStart;
   mapsEms: MapsEmsPluginPublicStart;
   usageCollection?: UsageCollectionSetup;
-  sharedUX: SharedUXPluginStart;
 }
 
 /**
diff --git a/x-pack/plugins/maps/public/reducers/map/types.ts b/x-pack/plugins/maps/public/reducers/map/types.ts
index 9f70c7e67271a..c2ed508992500 100644
--- a/x-pack/plugins/maps/public/reducers/map/types.ts
+++ b/x-pack/plugins/maps/public/reducers/map/types.ts
@@ -7,8 +7,9 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/public';
 import {
   CustomIcon,
   DrawState,
@@ -21,7 +22,6 @@ import {
   TooltipState,
 } from '../../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../../common/constants';
-import { TimeRange } from '../../../../../../src/plugins/data/public';
 
 export interface MapExtentState {
   zoom: number;
diff --git a/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts b/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
index 9808a5e09b8ab..955927ba0c5b4 100644
--- a/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
+++ b/x-pack/plugins/maps/public/reducers/non_serializable_instances.d.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
 import { AnyAction } from 'redux';
 import { MapStoreState } from './store';
 
diff --git a/x-pack/plugins/maps/public/reducers/non_serializable_instances.js b/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
index 9524d25a9a476..7f43fe6f70398 100644
--- a/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
+++ b/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestAdapter } from '../../../../../src/plugins/inspector/common/adapters/request';
+import { RequestAdapter } from '@kbn/inspector-plugin/common/adapters/request';
 import { MapAdapter } from '../inspector/map_adapter';
 import { getShowMapsInspectorAdapter } from '../kibana_services';
 
diff --git a/x-pack/plugins/maps/public/render_app.tsx b/x-pack/plugins/maps/public/render_app.tsx
index 8a3ea87905512..3deea0f82b272 100644
--- a/x-pack/plugins/maps/public/render_app.tsx
+++ b/x-pack/plugins/maps/public/render_app.tsx
@@ -9,9 +9,14 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Switch, Route, Redirect, RouteComponentProps } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import type { AppMountParameters } from 'kibana/public';
-import { SharedUxServicesProvider } from '@kbn/shared-ux-services';
-import { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import { ExitFullScreenButtonKibanaProvider } from '@kbn/shared-ux-button-exit-full-screen';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import {
+  createKbnUrlStateStorage,
+  withNotifyOnErrors,
+  IKbnUrlStateStorage,
+} from '@kbn/kibana-utils-plugin/public';
 import {
   getCoreChrome,
   getCoreI18n,
@@ -19,13 +24,8 @@ import {
   getToasts,
   getEmbeddableService,
   getDocLinks,
-  getSharedUXPluginContext,
+  getCore,
 } from './kibana_services';
-import {
-  createKbnUrlStateStorage,
-  withNotifyOnErrors,
-  IKbnUrlStateStorage,
-} from '../../../../src/plugins/kibana_utils/public';
 import { ListPage, MapPage } from './routes';
 import { MapByValueInput, MapByReferenceInput } from './embeddable/types';
 import { APP_ID } from '../common/constants';
@@ -96,7 +96,7 @@ export async function renderApp(
     }
 
     return (
-      <SharedUxServicesProvider {...getSharedUXPluginContext().getContextServices()}>
+      <ExitFullScreenButtonKibanaProvider coreStart={getCore()}>
         <MapPage
           mapEmbeddableInput={mapEmbeddableInput}
           embeddableId={embeddableId}
@@ -108,7 +108,7 @@ export async function renderApp(
           history={history}
           key={routeProps.match.params.savedMapId ? routeProps.match.params.savedMapId : 'new'}
         />
-      </SharedUxServicesProvider>
+      </ExitFullScreenButtonKibanaProvider>
     );
   }
 
diff --git a/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx b/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx
index feafb34f6a715..bc81924a1f1cd 100644
--- a/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx
+++ b/x-pack/plugins/maps/public/routes/list_page/load_list_and_render.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Redirect } from 'react-router-dom';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 import { getSavedObjectsClient, getToasts } from '../../kibana_services';
 import { MapsListView } from './maps_list_view';
 import { APP_ID, MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
-import { EmbeddableStateTransfer } from '../../../../../../src/plugins/embeddable/public';
 
 export class LoadListAndRender extends React.Component<{ stateTransfer: EmbeddableStateTransfer }> {
   _isMounted: boolean = false;
diff --git a/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx b/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
index dab284b0b71e4..5aa8e7877628a 100644
--- a/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
+++ b/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { MouseEvent } from 'react';
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { i18n } from '@kbn/i18n';
 import { EuiLink } from '@elastic/eui';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
-import { TableListView } from '../../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '@kbn/kibana-react-plugin/public';
 import { goToSpecifiedPath } from '../../render_app';
 import { APP_ID, getEditPath, MAP_PATH, MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
 import {
@@ -21,12 +21,16 @@ import {
   getNavigateToApp,
   getSavedObjectsClient,
   getSavedObjectsTagging,
-  getSavedObjects,
+  getUiSettings,
   getTheme,
+  getApplication,
 } from '../../kibana_services';
 import { getAppTitle } from '../../../common/i18n_getters';
 import { MapSavedObjectAttributes } from '../../../common/map_saved_object_type';
 
+const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
+const SAVED_OBJECTS_PER_PAGE_SETTING = 'savedObjects:perPage';
+
 interface MapItem {
   id: string;
   title: string;
@@ -93,7 +97,7 @@ async function findMaps(searchQuery: string) {
   const resp = await getSavedObjectsClient().find<MapSavedObjectAttributes>({
     type: MAP_SAVED_OBJECT_TYPE,
     search: searchTerm ? `${searchTerm}*` : undefined,
-    perPage: getSavedObjects().settings.getListingLimit(),
+    perPage: getUiSettings().get(SAVED_OBJECTS_LIMIT_SETTING),
     page: 1,
     searchFields: ['title^3', 'description'],
     defaultSearchOperator: 'AND',
@@ -129,6 +133,8 @@ export function MapsListView() {
   });
 
   const isReadOnly = !getMapsCapabilities().save;
+  const listingLimit = getUiSettings().get(SAVED_OBJECTS_LIMIT_SETTING);
+  const initialPageSize = getUiSettings().get(SAVED_OBJECTS_PER_PAGE_SETTING);
 
   getCoreChrome().docTitle.change(getAppTitle());
   getCoreChrome().setBreadcrumbs([{ text: getAppTitle() }]);
@@ -141,9 +147,9 @@ export function MapsListView() {
       findItems={findMaps}
       deleteItems={isReadOnly ? undefined : deleteMaps}
       tableColumns={tableColumns}
-      listingLimit={getSavedObjects().settings.getListingLimit()}
+      listingLimit={listingLimit}
       initialFilter={''}
-      initialPageSize={getSavedObjects().settings.getPerPage()}
+      initialPageSize={initialPageSize}
       entityName={i18n.translate('xpack.maps.mapListing.entityName', {
         defaultMessage: 'map',
       })}
@@ -157,6 +163,7 @@ export function MapsListView() {
       toastNotifications={getToasts()}
       searchFilters={searchFilters}
       theme={getTheme()}
+      application={getApplication()}
     />
   );
 }
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts b/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts
index 032b496728f53..f99d7cee0869f 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/index.ts
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { ThunkDispatch } from 'redux-thunk';
 import { AnyAction } from 'redux';
 import { Filter } from '@kbn/es-query';
-import { Query, TimeRange } from 'src/plugins/data/public';
+import { Query, TimeRange } from '@kbn/data-plugin/public';
 import { MapApp } from './map_app';
 import { getFlyoutDisplay, getIsFullScreen } from '../../../selectors/ui_selectors';
 import {
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
index a354cc5c399dc..0f95c5530e466 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
@@ -9,11 +9,12 @@ import React from 'react';
 import _ from 'lodash';
 import { finalize, switchMap, tap } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { AppLeaveAction, AppMountParameters } from 'kibana/public';
-import { Adapters } from 'src/plugins/embeddable/public';
+import { AppLeaveAction, AppMountParameters } from '@kbn/core/public';
+import { Adapters } from '@kbn/embeddable-plugin/public';
 import { Subscription } from 'rxjs';
 import { type Filter, FilterStateStore } from '@kbn/es-query';
-import type { Query, TimeRange, DataView } from 'src/plugins/data/common';
+import type { Query, TimeRange, DataView } from '@kbn/data-plugin/common';
+import { SavedQuery, QueryStateChange, QueryState } from '@kbn/data-plugin/public';
 import {
   getData,
   getExecutionContext,
@@ -32,11 +33,6 @@ import {
   startGlobalStateSyncing,
   MapsGlobalState,
 } from '../url_state';
-import {
-  SavedQuery,
-  QueryStateChange,
-  QueryState,
-} from '../../../../../../../src/plugins/data/public';
 import { MapContainer } from '../../../connected_components/map_container';
 import { getIndexPatternsFromIds } from '../../../index_pattern_util';
 import { getTopNavConfig } from '../top_nav_config';
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
index 1258539456c63..8a9490239a571 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
@@ -11,7 +11,6 @@ import { getLayerList } from '../../../selectors/map_selectors';
 import { MapStore } from '../../../reducers/store';
 
 export function waitUntilTimeLayersLoad$(store: MapStore) {
-  // @ts-expect-error
   const reduxState$ = from(store);
   return reduxState$.pipe(
     debounceTime(300),
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_page.tsx b/x-pack/plugins/maps/public/routes/map_page/map_page.tsx
index dc7030a805ce1..703e60638649e 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_page.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_page.tsx
@@ -7,8 +7,8 @@
 
 import React, { Component } from 'react';
 import { Provider } from 'react-redux';
-import type { AppMountParameters } from 'kibana/public';
-import type { EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import type { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
 import { MapApp } from './map_app';
 import {
   SavedMap,
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts
index ad5a56dcd4c26..8e816c6930fdb 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_refresh_config.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { QueryState } from 'src/plugins/data/public';
+import { QueryState } from '@kbn/data-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { getUiSettings } from '../../../kibana_services';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
 import { SerializedMapState } from './types';
 
 export function getInitialRefreshConfig({
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts
index 9cb67cefde547..da293d5c52d29 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_initial_time_filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryState } from 'src/plugins/data/public';
+import { QueryState } from '@kbn/data-plugin/public';
 import { getUiSettings } from '../../../kibana_services';
 import { SerializedMapState } from './types';
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
index 7db8606110d01..f8cde28d383ab 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/saved_map.ts
@@ -7,7 +7,8 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import { MapSavedObjectAttributes } from '../../../../common/map_saved_object_type';
 import { APP_ID, MAP_PATH, MAP_SAVED_OBJECT_TYPE } from '../../../../common/constants';
 import { createMapStore, MapStore, MapStoreState } from '../../../reducers/store';
@@ -32,7 +33,6 @@ import {
 } from '../../../actions';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../../selectors/ui_selectors';
 import { getMapAttributeService, SharingSavedObjectProps } from '../../../map_attribute_service';
-import { OnSaveProps } from '../../../../../../../src/plugins/saved_objects/public';
 import { MapByReferenceInput, MapEmbeddableInput } from '../../../embeddable/types';
 import {
   getCoreChrome,
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts b/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts
index 97c839090de61..64a4b19675873 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { Query } from 'src/plugins/data/common';
+import type { Query } from '@kbn/data-plugin/common';
 import { Filter } from '@kbn/es-query';
-import { TimeRange } from '../../../../../../../src/plugins/data/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { MapCenter } from '../../../../common/descriptor_types';
 import { MapSettings } from '../../../reducers/map';
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
index 6a49dd7ba7efe..9ff80168b96ef 100644
--- a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
@@ -7,7 +7,17 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Adapters } from 'src/plugins/inspector/public';
+import { Adapters } from '@kbn/inspector-plugin/public';
+import {
+  checkForDuplicateTitle,
+  SavedObjectSaveModalOrigin,
+  OnSaveProps,
+  showSaveModal,
+} from '@kbn/saved-objects-plugin/public';
+import {
+  LazySavedObjectSaveModalDashboard,
+  withSuspense,
+} from '@kbn/presentation-util-plugin/public';
 import {
   getMapsCapabilities,
   getIsAllowByValueEmbeddables,
@@ -18,19 +28,9 @@ import {
   getSavedObjectsTagging,
   getPresentationUtilContext,
 } from '../../kibana_services';
-import {
-  checkForDuplicateTitle,
-  SavedObjectSaveModalOrigin,
-  OnSaveProps,
-  showSaveModal,
-} from '../../../../../../src/plugins/saved_objects/public';
 import { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
 import { SavedMap } from './saved_map';
 import { getMapEmbeddableDisplayName } from '../../../common/i18n_getters';
-import {
-  LazySavedObjectSaveModalDashboard,
-  withSuspense,
-} from '../../../../../../src/plugins/presentation_util/public';
 
 const SavedObjectSaveModalDashboard = withSuspense(LazySavedObjectSaveModalDashboard);
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts
index 2fb4c98042cf5..b9cd9ddc78a3c 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/app_state_manager.ts
@@ -7,7 +7,7 @@
 
 import { Subject } from 'rxjs';
 import { Filter } from '@kbn/es-query';
-import { Query } from 'src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 export interface MapsAppState {
   query?: Query | null;
@@ -20,7 +20,7 @@ export class AppStateManager {
   _savedQueryId: string = '';
   _filters: Filter[] = [];
 
-  _updated$ = new Subject();
+  _updated$ = new Subject<void>();
 
   setQueryAndFilters({ query, savedQueryId, filters }: MapsAppState) {
     if (query && this._query !== query) {
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
index a0e7399bae492..63461315b0ac1 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
@@ -7,11 +7,8 @@
 
 import { map } from 'rxjs/operators';
 import { FilterStateStore } from '@kbn/es-query';
-import { connectToQueryState } from '../../../../../../../src/plugins/data/public';
-import {
-  syncState,
-  BaseStateContainer,
-} from '../../../../../../../src/plugins/kibana_utils/public';
+import { connectToQueryState } from '@kbn/data-plugin/public';
+import { syncState, BaseStateContainer } from '@kbn/kibana-utils-plugin/public';
 import { getData } from '../../../kibana_services';
 import { kbnUrlStateStorage } from '../../../render_app';
 import { AppStateManager } from './app_state_manager';
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts
index d41be63d0a811..a2070e594424a 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/global_sync.ts
@@ -6,8 +6,8 @@
  */
 
 import { Filter } from '@kbn/es-query';
-import { TimeRange, RefreshInterval } from 'src/plugins/data/public';
-import { syncQueryStateWithUrl } from '../../../../../../../src/plugins/data/public';
+import { TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
+import { syncQueryStateWithUrl } from '@kbn/data-plugin/public';
 import { getData } from '../../../kibana_services';
 import { kbnUrlStateStorage } from '../../../render_app';
 
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.ts b/x-pack/plugins/maps/public/selectors/map_selectors.ts
index 8e99a625cbaa2..7a3b1972671f6 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.ts
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.ts
@@ -8,9 +8,10 @@
 import { createSelector } from 'reselect';
 import { FeatureCollection } from 'geojson';
 import _ from 'lodash';
-import { Adapters } from 'src/plugins/inspector/public';
-import type { Query } from 'src/plugins/data/common';
+import { Adapters } from '@kbn/inspector-plugin/public';
+import type { Query } from '@kbn/data-plugin/common';
 import { Filter } from '@kbn/es-query';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { RasterTileLayer } from '../classes/layers/raster_tile_layer/raster_tile_layer';
 import { EmsVectorTileLayer } from '../classes/layers/ems_vector_tile_layer/ems_vector_tile_layer';
 import {
@@ -55,7 +56,6 @@ import {
   VectorLayerDescriptor,
 } from '../../common/descriptor_types';
 import { MapSettings } from '../reducers/map';
-import { TimeRange } from '../../../../../src/plugins/data/public';
 import { ISource } from '../classes/sources/source';
 import { ITMSSource } from '../classes/sources/tms_source';
 import { IVectorSource } from '../classes/sources/vector_source';
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts
index 7706704cdd63d..1a9a1e8bf92fe 100644
--- a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.ts
@@ -6,13 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  Embeddable,
-  EmbeddableInput,
-  ViewMode,
-} from '../../../../../src/plugins/embeddable/public';
+import { Embeddable, EmbeddableInput, ViewMode } from '@kbn/embeddable-plugin/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
 
 export const FILTER_BY_MAP_EXTENT = 'FILTER_BY_MAP_EXTENT';
 
diff --git a/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts b/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts
index 154eeaf754524..97d66ae5a6aa6 100644
--- a/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Action } from 'src/plugins/ui_actions/public';
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { DatatableColumnType } from '@kbn/expressions-plugin';
 import { RawValue } from '../../common/constants';
-import { DatatableColumnType } from '../../../../../src/plugins/expressions';
 
 export function isUrlDrilldown(action: Action) {
   return action.type === 'URL_DRILLDOWN';
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
index c148770b913ea..cfd140434e022 100644
--- 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
@@ -8,14 +8,14 @@
 import uuid from 'uuid/v4';
 import { i18n } from '@kbn/i18n';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { getUsageCollection } from '../kibana_services';
-import { APP_ID } from '../../common/constants';
-
 import {
   createAction,
   ACTION_VISUALIZE_GEO_FIELD,
   VisualizeFieldContext,
-} from '../../../../../src/plugins/ui_actions/public';
+} from '@kbn/ui-actions-plugin/public';
+import { getUsageCollection } from '../kibana_services';
+import { APP_ID } from '../../common/constants';
+
 import {
   getVisualizeCapabilities,
   getIndexPatternService,
diff --git a/x-pack/plugins/maps/public/util.ts b/x-pack/plugins/maps/public/util.ts
index 66244ea5f6768..d63072b163599 100644
--- a/x-pack/plugins/maps/public/util.ts
+++ b/x-pack/plugins/maps/public/util.ts
@@ -6,7 +6,7 @@
  */
 
 import { EMSClient, FileLayer, TMSService } from '@elastic/ems-client';
-import type { KibanaExecutionContext } from 'kibana/public';
+import type { KibanaExecutionContext } from '@kbn/core/public';
 import { FONTS_API_PATH } from '../common/constants';
 import {
   getHttp,
diff --git a/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts b/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
index 0e595848bd12d..542e61f8af9a6 100644
--- a/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
+++ b/x-pack/plugins/maps/server/data_indexing/create_doc_source.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, IScopedClusterClient } from 'kibana/server';
+import { ElasticsearchClient, IScopedClusterClient } from '@kbn/core/server';
+import { IndexPatternsCommonService } from '@kbn/data-plugin/server';
 import { CreateDocSourceResp, IndexSourceMappings, BodySettings } from '../../common/types';
 import { MAPS_NEW_VECTOR_LAYER_META_CREATED_BY } from '../../common/constants';
-import { IndexPatternsCommonService } from '../../../../../src/plugins/data/server';
 
 const DEFAULT_SETTINGS = { number_of_shards: 1 };
 const DEFAULT_META = {
diff --git a/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts b/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts
index 0760d7a079a3b..da61a88ceb963 100644
--- a/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts
+++ b/x-pack/plugins/maps/server/data_indexing/get_indexes_matching_pattern.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, KibanaResponseFactory, Logger } from 'kibana/server';
+import { IScopedClusterClient, KibanaResponseFactory, Logger } from '@kbn/core/server';
 
 export async function getMatchingIndexes(
   indexPattern: string,
diff --git a/x-pack/plugins/maps/server/data_indexing/index_data.ts b/x-pack/plugins/maps/server/data_indexing/index_data.ts
index 7b26c94e07782..59c90bb279565 100644
--- a/x-pack/plugins/maps/server/data_indexing/index_data.ts
+++ b/x-pack/plugins/maps/server/data_indexing/index_data.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { WriteSettings } from '../../common/types';
 
 export async function writeDataToIndex(
diff --git a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
index 4a7c90439beed..c08bdc8b0d7ea 100644
--- a/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
+++ b/x-pack/plugins/maps/server/data_indexing/indexing_routes.ts
@@ -6,9 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
-import { IRouter } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { Logger } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   INDEX_SOURCE_API_PATH,
   MAX_DRAWING_SIZE_BYTES,
@@ -19,9 +21,7 @@ import {
 } from '../../common/constants';
 import { createDocSource } from './create_doc_source';
 import { writeDataToIndex } from './index_data';
-import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server';
 import { getMatchingIndexes } from './get_indexes_matching_pattern';
-import { SecurityPluginStart } from '../../../security/server';
 
 export function initIndexingRoutes({
   router,
diff --git a/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts b/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts
index 9411869c5ad11..68ecc70df0e9e 100644
--- a/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts
+++ b/x-pack/plugins/maps/server/embeddable/setup_embeddable.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { EmbeddableSetup } from '../../../../../src/plugins/embeddable/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
-} from '../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/kibana-utils-plugin/common';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
 import { extract, inject } from '../../common/embeddable';
 import { embeddableMigrations } from './embeddable_migrations';
diff --git a/x-pack/plugins/maps/server/index.ts b/x-pack/plugins/maps/server/index.ts
index 55eaadcd28063..be2f235a51f4c 100644
--- a/x-pack/plugins/maps/server/index.ts
+++ b/x-pack/plugins/maps/server/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { MapsPlugin } from './plugin';
 import { configSchema, MapsXPackConfig } from '../config';
 
diff --git a/x-pack/plugins/maps/server/kibana_server_services.ts b/x-pack/plugins/maps/server/kibana_server_services.ts
index 6cf208606a4cf..b1dab885ed627 100644
--- a/x-pack/plugins/maps/server/kibana_server_services.ts
+++ b/x-pack/plugins/maps/server/kibana_server_services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from '../../../../src/core/server';
+import { CoreStart } from '@kbn/core/server';
 import { StartDeps } from './types';
 
 let coreStart: CoreStart;
diff --git a/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts b/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts
index 471e0bd77e84b..d044264237b5b 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getMapsTelemetry, MapsUsage } from '../maps_telemetry';
 
 export function registerMapsUsageCollector(usageCollection?: UsageCollectionSetup): void {
diff --git a/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts b/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts
index e4938f4217841..85677ef13bf6b 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/find_maps.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 // @ts-ignore
 import mapSavedObjects from './test_resources/sample_map_saved_objects.json';
 import { findMaps } from './find_maps';
diff --git a/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts b/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts
index 0175b9b3fda5a..cab4b98ffd784 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/find_maps.ts
@@ -6,7 +6,7 @@
  */
 
 import { asyncForEach } from '@kbn/std';
-import { ISavedObjectsRepository } from 'kibana/server';
+import { ISavedObjectsRepository } from '@kbn/core/server';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
 import { MapSavedObject, MapSavedObjectAttributes } from '../../common/map_saved_object_type';
 
diff --git a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts
index 7c76248445edb..02dd0718b3da7 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.test.ts
@@ -8,7 +8,7 @@
 import { asyncForEach } from '@kbn/std';
 // @ts-ignore
 import mapSavedObjects from '../test_resources/sample_map_saved_objects.json';
-import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { IndexPatternStatsCollector } from './index_pattern_stats_collector';
 
 test('returns zeroed telemetry data when there are no saved objects', async () => {
diff --git a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts
index f8fbf907bca94..ad1c0239963b4 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/index_pattern_stats/index_pattern_stats_collector.ts
@@ -7,7 +7,7 @@
 
 import { asyncForEach } from '@kbn/std';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
-import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 import { LAYER_TYPE, SCALING_TYPES, SOURCE_TYPES } from '../../../common/constants';
 import { injectReferences } from '../../../common/migrations/references';
 import {
diff --git a/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts b/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts
index f57c3afa7e0b5..9eeafaec54e22 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/map_stats/map_stats_collector.ts
@@ -6,6 +6,11 @@
  */
 
 import _ from 'lodash';
+import {
+  DEFAULT_EMS_DARKMAP_ID,
+  DEFAULT_EMS_ROADMAP_DESATURATED_ID,
+  DEFAULT_EMS_ROADMAP_ID,
+} from '@kbn/maps-ems-plugin/common';
 import {
   GRID_RESOLUTION,
   LAYER_TYPE,
@@ -22,11 +27,6 @@ import {
   VectorLayerDescriptor,
 } from '../../../common/descriptor_types';
 import { MapSavedObjectAttributes } from '../../../common/map_saved_object_type';
-import {
-  DEFAULT_EMS_DARKMAP_ID,
-  DEFAULT_EMS_ROADMAP_DESATURATED_ID,
-  DEFAULT_EMS_ROADMAP_ID,
-} from '../../../../../../src/plugins/maps_ems/common/';
 import {
   ClusterCountStats,
   EMS_BASEMAP_KEYS,
diff --git a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts
index dee7bf200ca6e..b7497c010f15f 100644
--- a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts
+++ b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { SavedObjectsClient } from '@kbn/core/server';
 import {
   getElasticsearch,
   getIndexPatternsServiceFactory,
   getSavedObjectClient,
 } from '../kibana_server_services';
-import { SavedObjectsClient } from '../../../../../src/core/server';
 import { MapStats, MapStatsCollector } from './map_stats';
 import { IndexPatternStats, IndexPatternStatsCollector } from './index_pattern_stats';
 import { findMaps } from './find_maps';
diff --git a/x-pack/plugins/maps/server/mvt/get_grid_tile.ts b/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
index 754fdb9c1f4d2..e88a0f0314931 100644
--- a/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart, Logger } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { CoreStart, Logger } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import { IncomingHttpHeaders } from 'http';
 import { Stream } from 'stream';
 import { RENDER_AS } from '../../common/constants';
 import { isAbortError } from './util';
@@ -40,7 +41,7 @@ export async function getEsGridTile({
   renderAs: RENDER_AS;
   gridPrecision: number;
   abortController: AbortController;
-}): Promise<Stream | null> {
+}): Promise<{ stream: Stream | null; headers: IncomingHttpHeaders; statusCode: number }> {
   try {
     const path = `/${encodeURIComponent(index)}/_mvt/${geometryFieldName}/${z}/${x}/${y}`;
     const body = {
@@ -80,13 +81,15 @@ export async function getEsGridTile({
       }
     );
 
-    return tile.body as Stream;
+    return { stream: tile.body as Stream, headers: tile.headers, statusCode: tile.statusCode };
   } catch (e) {
-    if (!isAbortError(e)) {
-      // These are often circuit breaking exceptions
-      // Should return a tile with some error message
-      logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    if (isAbortError(e)) {
+      return { stream: null, headers: {}, statusCode: 200 };
     }
-    return null;
+
+    // These are often circuit breaking exceptions
+    // Should return a tile with some error message
+    logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    return { stream: null, headers: {}, statusCode: 500 };
   }
 }
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.ts b/x-pack/plugins/maps/server/mvt/get_tile.ts
index 7e9bc01c5c317..b4ae9e6b698d6 100644
--- a/x-pack/plugins/maps/server/mvt/get_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_tile.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart, Logger } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { CoreStart, Logger } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
+import { IncomingHttpHeaders } from 'http';
 import { Stream } from 'stream';
 import { isAbortError } from './util';
 import { makeExecutionContext } from '../../common/execution_context';
@@ -36,7 +37,7 @@ export async function getEsTile({
   logger: Logger;
   requestBody: any;
   abortController: AbortController;
-}): Promise<Stream | null> {
+}): Promise<{ stream: Stream | null; headers: IncomingHttpHeaders; statusCode: number }> {
   try {
     const path = `/${encodeURIComponent(index)}/_mvt/${geometryFieldName}/${z}/${x}/${y}`;
 
@@ -80,13 +81,15 @@ export async function getEsTile({
       }
     );
 
-    return tile.body as Stream;
+    return { stream: tile.body as Stream, headers: tile.headers, statusCode: tile.statusCode };
   } catch (e) {
-    if (!isAbortError(e)) {
-      // These are often circuit breaking exceptions
-      // Should return a tile with some error message
-      logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    if (isAbortError(e)) {
+      return { stream: null, headers: {}, statusCode: 200 };
     }
-    return null;
+
+    // These are often circuit breaking exceptions
+    // Should return a tile with some error message
+    logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    return { stream: null, headers: {}, statusCode: 500 };
   }
 }
diff --git a/x-pack/plugins/maps/server/mvt/mvt_routes.test.ts b/x-pack/plugins/maps/server/mvt/mvt_routes.test.ts
new file mode 100644
index 0000000000000..9d9ef24ef4795
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/mvt_routes.test.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Readable } from 'stream';
+import sinon from 'sinon';
+import { KibanaResponseFactory } from '@kbn/core/server';
+import { sendResponse } from './mvt_routes';
+
+const mockStream = Readable.from(['{}']);
+
+test('should send error response when status code is above 400', () => {
+  const responseMock = {
+    customError: sinon.spy(),
+    ok: sinon.spy(),
+  };
+  sendResponse(responseMock as unknown as KibanaResponseFactory, mockStream, {}, 400);
+  expect(responseMock.ok.notCalled);
+  expect(responseMock.customError.calledOnce);
+  const firstCallArgs = responseMock.customError.getCall(0).args[0];
+  expect(firstCallArgs.statusCode).toBe(400);
+});
+
+test('should forward content-length and content-encoding elasticsearch headers', () => {
+  const responseMock = {
+    customError: sinon.spy(),
+    ok: sinon.spy(),
+  };
+  sendResponse(
+    responseMock as unknown as KibanaResponseFactory,
+    mockStream,
+    { 'content-encoding': 'gzip', 'content-length': '19326' },
+    200
+  );
+  expect(responseMock.ok.calledOnce);
+  expect(responseMock.customError.notCalled);
+  const firstCallArgs = responseMock.ok.getCall(0).args[0];
+  const headers = { ...firstCallArgs.headers };
+
+  // remove lastModified from comparision check since its a timestamp that changes every run
+  expect(headers).toHaveProperty('Last-Modified');
+  delete headers['Last-Modified'];
+  expect(headers).toEqual({
+    'Cache-Control': 'public, max-age=3600',
+    'Content-Type': 'application/x-protobuf',
+    'content-disposition': 'inline',
+    'content-encoding': 'gzip',
+    'content-length': '19326',
+  });
+});
+
+test('should not set content-encoding when elasticsearch does not provide value', () => {
+  const responseMock = {
+    customError: sinon.spy(),
+    ok: sinon.spy(),
+  };
+  sendResponse(
+    responseMock as unknown as KibanaResponseFactory,
+    mockStream,
+    { 'content-length': '19326' },
+    200
+  );
+  expect(responseMock.ok.calledOnce);
+  expect(responseMock.customError.notCalled);
+  const firstCallArgs = responseMock.ok.getCall(0).args[0];
+  const headers = { ...firstCallArgs.headers };
+
+  // remove lastModified from comparision check since its a timestamp that changes every run
+  expect(headers).toHaveProperty('Last-Modified');
+  delete headers['Last-Modified'];
+  expect(headers).toEqual({
+    'Cache-Control': 'public, max-age=3600',
+    'Content-Type': 'application/x-protobuf',
+    'content-disposition': 'inline',
+    'content-length': '19326',
+  });
+});
diff --git a/x-pack/plugins/maps/server/mvt/mvt_routes.ts b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
index dde68bd0d1335..b7c6a59ba54d4 100644
--- a/x-pack/plugins/maps/server/mvt/mvt_routes.ts
+++ b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
@@ -6,10 +6,11 @@
  */
 
 import { Stream } from 'stream';
+import { IncomingHttpHeaders } from 'http';
 import { schema } from '@kbn/config-schema';
-import { CoreStart, KibanaRequest, KibanaResponseFactory, Logger } from 'src/core/server';
-import { IRouter } from 'src/core/server';
-import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { CoreStart, KibanaRequest, KibanaResponseFactory, Logger } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
+import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 import {
   MVT_GETTILE_API_PATH,
   API_ROOT_PATH,
@@ -57,7 +58,7 @@ export function initMVTRoutes({
 
       const abortController = makeAbortController(request);
 
-      const gzippedTile = await getEsTile({
+      const { stream, headers, statusCode } = await getEsTile({
         url: `${API_ROOT_PATH}/${MVT_GETTILE_API_PATH}/{z}/{x}/{y}.pbf`,
         core,
         logger,
@@ -71,7 +72,7 @@ export function initMVTRoutes({
         abortController,
       });
 
-      return sendResponse(response, gzippedTile);
+      return sendResponse(response, stream, headers, statusCode);
     }
   );
 
@@ -103,7 +104,7 @@ export function initMVTRoutes({
 
       const abortController = makeAbortController(request);
 
-      const gzipTileStream = await getEsGridTile({
+      const { stream, headers, statusCode } = await getEsGridTile({
         url: `${API_ROOT_PATH}/${MVT_GETGRIDTILE_API_PATH}/{z}/{x}/{y}.pbf`,
         core,
         logger,
@@ -119,20 +120,35 @@ export function initMVTRoutes({
         abortController,
       });
 
-      return sendResponse(response, gzipTileStream);
+      return sendResponse(response, stream, headers, statusCode);
     }
   );
 }
 
-function sendResponse(response: KibanaResponseFactory, gzipTileStream: Stream | null) {
+export function sendResponse(
+  response: KibanaResponseFactory,
+  tileStream: Stream | null,
+  headers: IncomingHttpHeaders,
+  statusCode: number
+) {
+  if (statusCode >= 400) {
+    return response.customError({
+      statusCode,
+      body: tileStream ? tileStream : statusCode.toString(),
+    });
+  }
+
   const cacheControl = `public, max-age=${CACHE_TIMEOUT_SECONDS}`;
   const lastModified = `${new Date().toUTCString()}`;
-  if (gzipTileStream) {
+  if (tileStream) {
+    // use the content-encoding and content-length headers from elasticsearch if they exist
+    const { 'content-length': contentLength, 'content-encoding': contentEncoding } = headers;
     return response.ok({
-      body: gzipTileStream,
+      body: tileStream,
       headers: {
         'content-disposition': 'inline',
-        'content-encoding': 'gzip',
+        ...(contentLength && { 'content-length': contentLength }),
+        ...(contentEncoding && { 'content-encoding': contentEncoding }),
         'Content-Type': 'application/x-protobuf',
         'Cache-Control': cacheControl,
         'Last-Modified': lastModified,
diff --git a/x-pack/plugins/maps/server/plugin.ts b/x-pack/plugins/maps/server/plugin.ts
index 05051a861d595..8101018c6db6f 100644
--- a/x-pack/plugins/maps/server/plugin.ts
+++ b/x-pack/plugins/maps/server/plugin.ts
@@ -13,21 +13,21 @@ import {
   Plugin,
   PluginInitializerContext,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
-// @ts-ignore
+} from '@kbn/core/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { EMSSettings } from '@kbn/maps-ems-plugin/server';
+// @ts-expect-error
 import { getEcommerceSavedObjects } from './sample_data/ecommerce_saved_objects';
-// @ts-ignore
-import { getFlightsSavedObjects } from './sample_data/flights_saved_objects.js';
-// @ts-ignore
-import { getWebLogsSavedObjects } from './sample_data/web_logs_saved_objects.js';
+// @ts-expect-error
+import { getFlightsSavedObjects } from './sample_data/flights_saved_objects';
+// @ts-expect-error
+import { getWebLogsSavedObjects } from './sample_data/web_logs_saved_objects';
 import { registerMapsUsageCollector } from './maps_telemetry/collectors/register';
 import { APP_ID, APP_ICON, MAP_SAVED_OBJECT_TYPE, getFullPath } from '../common/constants';
 import { MapsXPackConfig } from '../config';
 import { setStartServices } from './kibana_server_services';
 import { emsBoundariesSpecProvider } from './tutorials/ems';
 import { initRoutes } from './routes';
-import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
-import type { EMSSettings } from '../../../../src/plugins/maps_ems/server';
 import { setupEmbeddable } from './embeddable';
 import { setupSavedObjects } from './saved_objects';
 import { registerIntegrations } from './register_integrations';
@@ -70,7 +70,7 @@ export class MapsPlugin implements Plugin {
       dashboardId: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
       oldEmbeddableId: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
       embeddableId: '2c9c1f60-1909-11e9-919b-ffe5949a18d2',
-      // @ts-ignore
+      // @ts-expect-error
       embeddableType: MAP_SAVED_OBJECT_TYPE,
       embeddableConfig: {
         isLayerTOCOpen: false,
@@ -99,7 +99,7 @@ export class MapsPlugin implements Plugin {
       dashboardId: '7adfa750-4c81-11e8-b3d7-01146121b73d',
       oldEmbeddableId: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
       embeddableId: '5dd88580-1906-11e9-919b-ffe5949a18d2',
-      // @ts-ignore
+      // @ts-expect-error
       embeddableType: MAP_SAVED_OBJECT_TYPE,
       embeddableConfig: {
         isLayerTOCOpen: true,
@@ -126,7 +126,7 @@ export class MapsPlugin implements Plugin {
       dashboardId: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
       oldEmbeddableId: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
       embeddableId: 'de71f4f0-1902-11e9-919b-ffe5949a18d2',
-      // @ts-ignore
+      // @ts-expect-error
       embeddableType: MAP_SAVED_OBJECT_TYPE,
       embeddableConfig: {
         isLayerTOCOpen: false,
diff --git a/x-pack/plugins/maps/server/register_integrations.ts b/x-pack/plugins/maps/server/register_integrations.ts
index 3740ae6242790..63543cb413b87 100644
--- a/x-pack/plugins/maps/server/register_integrations.ts
+++ b/x-pack/plugins/maps/server/register_integrations.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup } from 'kibana/server';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+import { CoreSetup } from '@kbn/core/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 import { APP_ID, OPEN_LAYER_WIZARD, getFullPath, WIZARD_ID } from '../common/constants';
 
 export function registerIntegrations(
diff --git a/x-pack/plugins/maps/server/routes.ts b/x-pack/plugins/maps/server/routes.ts
index 21720afdc7edc..d74deec8eab67 100644
--- a/x-pack/plugins/maps/server/routes.ts
+++ b/x-pack/plugins/maps/server/routes.ts
@@ -8,13 +8,13 @@
 import { schema } from '@kbn/config-schema';
 import fs from 'fs';
 import path from 'path';
-import { CoreSetup, CoreStart, IRouter, Logger } from 'kibana/server';
+import { CoreSetup, CoreStart, IRouter, Logger } from '@kbn/core/server';
+import { DataRequestHandlerContext } from '@kbn/data-plugin/server';
 import { INDEX_SETTINGS_API_PATH, FONTS_API_PATH } from '../common/constants';
 import { getIndexPatternSettings } from './lib/get_index_pattern_settings';
 import { initMVTRoutes } from './mvt/mvt_routes';
 import { initIndexingRoutes } from './data_indexing/indexing_routes';
 import { StartDeps } from './types';
-import { DataRequestHandlerContext } from '../../../../src/plugins/data/server';
 
 export async function initRoutes(coreSetup: CoreSetup, logger: Logger): Promise<void> {
   const router: IRouter<DataRequestHandlerContext> = coreSetup.http.createRouter();
diff --git a/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts b/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts
index f8cd06cf60bfc..e63e214e2572d 100644
--- a/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts
+++ b/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import type { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 import { extractReferences } from '../../common/migrations/references';
 // @ts-expect-error
 import { emsRasterTileToEmsVectorTile } from '../../common/migrations/ems_raster_tile_to_ems_vector_tile';
diff --git a/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts b/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts
index d5c0c0fa6dcf3..7bc209b4b1a9f 100644
--- a/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts
+++ b/x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts
@@ -6,10 +6,10 @@
  */
 
 import { mapValues } from 'lodash';
-import type { CoreSetup, SavedObjectUnsanitizedDoc } from 'kibana/server';
-import type { SavedObjectMigrationMap } from 'src/core/server';
-import { MigrateFunctionsObject } from '../../../../../src/plugins/kibana_utils/common';
-import { mergeSavedObjectMigrationMaps } from '../../../../../src/core/server';
+import type { CoreSetup, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import type { SavedObjectMigrationMap } from '@kbn/core/server';
+import { MigrateFunctionsObject } from '@kbn/kibana-utils-plugin/common';
+import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
 import { APP_ICON, getFullPath } from '../../common/constants';
 import { migrateDataPersistedState } from '../../common/migrations/migrate_data_persisted_state';
 import type { MapSavedObjectAttributes } from '../../common/map_saved_object_type';
diff --git a/x-pack/plugins/maps/server/tutorials/ems/index.ts b/x-pack/plugins/maps/server/tutorials/ems/index.ts
index 2285371444fc7..a180d37698085 100644
--- a/x-pack/plugins/maps/server/tutorials/ems/index.ts
+++ b/x-pack/plugins/maps/server/tutorials/ems/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { TutorialsCategory } from '../../../../../../src/plugins/home/server';
+import { TutorialsCategory } from '@kbn/home-plugin/server';
 import { getNewMapPath, APP_ID } from '../../../common/constants';
 
 export function emsBoundariesSpecProvider({
diff --git a/x-pack/plugins/maps/server/types.ts b/x-pack/plugins/maps/server/types.ts
index 597b826eee56d..912e9edb72e7d 100644
--- a/x-pack/plugins/maps/server/types.ts
+++ b/x-pack/plugins/maps/server/types.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { MapsEmsPluginServerSetup } from '../../../../src/plugins/maps_ems/server';
-import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { MapsEmsPluginServerSetup } from '@kbn/maps-ems-plugin/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { CustomIntegrationsPluginSetup } from '../../../../src/plugins/custom_integrations/server';
+} from '@kbn/data-plugin/server';
+import { CustomIntegrationsPluginSetup } from '@kbn/custom-integrations-plugin/server';
 
 export interface SetupDeps {
   data: DataPluginSetup;
diff --git a/x-pack/plugins/ml/common/constants/messages.test.ts b/x-pack/plugins/ml/common/constants/messages.test.ts
index e77de53b5cb70..b0df17111bc0d 100644
--- a/x-pack/plugins/ml/common/constants/messages.test.ts
+++ b/x-pack/plugins/ml/common/constants/messages.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { docLinksServiceMock } from 'src/core/public/mocks';
+import { docLinksServiceMock } from '@kbn/core/public/mocks';
 
 import { parseMessages } from './messages';
 
diff --git a/x-pack/plugins/ml/common/constants/messages.ts b/x-pack/plugins/ml/common/constants/messages.ts
index fd3b9aa9d19b9..b372f172d5e13 100644
--- a/x-pack/plugins/ml/common/constants/messages.ts
+++ b/x-pack/plugins/ml/common/constants/messages.ts
@@ -8,7 +8,7 @@
 import { once } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 import { JOB_ID_MAX_LENGTH, VALIDATION_STATUS } from './validation';
 
diff --git a/x-pack/plugins/ml/common/license/ml_license.ts b/x-pack/plugins/ml/common/license/ml_license.ts
index e2e50f390fc58..a698b8801ef69 100644
--- a/x-pack/plugins/ml/common/license/ml_license.ts
+++ b/x-pack/plugins/ml/common/license/ml_license.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subscription } from 'rxjs';
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { PLUGIN_ID } from '../constants/app';
 
 export const MINIMUM_LICENSE = 'basic';
diff --git a/x-pack/plugins/ml/common/types/alerts.ts b/x-pack/plugins/ml/common/types/alerts.ts
index 8d5c6831c1ccf..0a6e7813db347 100644
--- a/x-pack/plugins/ml/common/types/alerts.ts
+++ b/x-pack/plugins/ml/common/types/alerts.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { RuleTypeParams, Rule } from '@kbn/alerting-plugin/common';
 import { AnomalyResultType } from './anomalies';
 import { ANOMALY_RESULT_TYPE } from '../constants/anomalies';
-import type { RuleTypeParams, Rule } from '../../../alerting/common';
 
 export type PreviewResultsKeys = 'record_results' | 'bucket_results' | 'influencer_results';
 export type TopHitsResultsKeys = 'top_record_hits' | 'top_bucket_hits' | 'top_influencer_hits';
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts
index 62ed241a733ea..eb7d5ae9bc0b3 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.test.ts
@@ -6,7 +6,7 @@
  */
 
 // @ts-ignore importing JSON file
-import jobConfigFarequote from '../__mocks__/job_config_farequote';
+import jobConfigFarequote from '../__mocks__/job_config_farequote.json';
 import { isCombinedJobWithStats } from './combined_job';
 
 describe('Types: Jobs', () => {
diff --git a/x-pack/plugins/ml/common/types/capabilities.ts b/x-pack/plugins/ml/common/types/capabilities.ts
index 8ea74e4a64673..9ea5c510deaf9 100644
--- a/x-pack/plugins/ml/common/types/capabilities.ts
+++ b/x-pack/plugins/ml/common/types/capabilities.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { PLUGIN_ID } from '../constants/app';
 import {
   ML_JOB_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ml/common/types/fields.ts b/x-pack/plugins/ml/common/types/fields.ts
index bf7876570f485..b63efd4a6a891 100644
--- a/x-pack/plugins/ml/common/types/fields.ts
+++ b/x-pack/plugins/ml/common/types/fields.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 import {
   ML_JOB_AGGREGATION,
   KIBANA_AGGREGATION,
diff --git a/x-pack/plugins/ml/common/types/kibana.ts b/x-pack/plugins/ml/common/types/kibana.ts
index cc7b68b40149f..53325224fce93 100644
--- a/x-pack/plugins/ml/common/types/kibana.ts
+++ b/x-pack/plugins/ml/common/types/kibana.ts
@@ -7,8 +7,8 @@
 
 // custom edits or fixes for default kibana types which are incomplete
 
-import type { SimpleSavedObject } from 'kibana/public';
-import type { FieldFormatsRegistry } from '../../../../../src/plugins/field_formats/common';
+import type { SimpleSavedObject } from '@kbn/core/public';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 
 export type IndexPatternTitle = string;
 
diff --git a/x-pack/plugins/ml/common/types/locator.ts b/x-pack/plugins/ml/common/types/locator.ts
index 56cf3a112f537..933862085b3c6 100644
--- a/x-pack/plugins/ml/common/types/locator.ts
+++ b/x-pack/plugins/ml/common/types/locator.ts
@@ -7,8 +7,8 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { LocatorPublic } from 'src/plugins/share/public';
-import type { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query';
+import type { LocatorPublic } from '@kbn/share-plugin/public';
+import type { RefreshInterval, TimeRange } from '@kbn/data-plugin/common/query';
 import type { JobId } from './anomaly_detection_jobs/job';
 import type { DataFrameAnalysisConfigType } from './data_frame_analytics';
 import type { SearchQueryLanguage } from '../constants/search';
diff --git a/x-pack/plugins/ml/common/types/modules.ts b/x-pack/plugins/ml/common/types/modules.ts
index 617000d017025..6b6fc72c091c2 100644
--- a/x-pack/plugins/ml/common/types/modules.ts
+++ b/x-pack/plugins/ml/common/types/modules.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectAttributes } from 'kibana/public';
+import { SavedObjectAttributes } from '@kbn/core/public';
 import { Datafeed, Job } from './anomaly_detection_jobs';
 import { ErrorType } from '../util/errors';
 
diff --git a/x-pack/plugins/ml/common/types/storage.ts b/x-pack/plugins/ml/common/types/storage.ts
index 22374a5533fab..d1708ae17776b 100644
--- a/x-pack/plugins/ml/common/types/storage.ts
+++ b/x-pack/plugins/ml/common/types/storage.ts
@@ -15,6 +15,8 @@ export const ML_GETTING_STARTED_CALLOUT_DISMISSED = 'ml.gettingStarted.isDismiss
 
 export const ML_FROZEN_TIER_PREFERENCE = 'ml.frozenDataTierPreference';
 
+export const ML_ANOMALY_EXPLORER_PANELS = 'ml.anomalyExplorerPanels';
+
 export type PartitionFieldConfig =
   | {
       /**
@@ -42,11 +44,22 @@ export type PartitionFieldsConfig =
 
 export type ApplyTimeRangeConfig = boolean | undefined;
 
+export interface PanelState {
+  size: number;
+  isCollapsed: boolean;
+}
+
+export interface AnomalyExplorerPanelsState {
+  topInfluencers: PanelState;
+  mainPage: { size: number };
+}
+
 export type MlStorage = Partial<{
   [ML_ENTITY_FIELDS_CONFIG]: PartitionFieldsConfig;
   [ML_APPLY_TIME_RANGE_CONFIG]: ApplyTimeRangeConfig;
   [ML_GETTING_STARTED_CALLOUT_DISMISSED]: boolean | undefined;
   [ML_FROZEN_TIER_PREFERENCE]: 'exclude_frozen' | 'include_frozen';
+  [ML_ANOMALY_EXPLORER_PANELS]: AnomalyExplorerPanelsState | undefined;
 }> | null;
 
 export type MlStorageKey = keyof Exclude<MlStorage, null>;
diff --git a/x-pack/plugins/ml/common/util/date_utils.ts b/x-pack/plugins/ml/common/util/date_utils.ts
index c668eda03a7be..c5f5fdaabf388 100644
--- a/x-pack/plugins/ml/common/util/date_utils.ts
+++ b/x-pack/plugins/ml/common/util/date_utils.ts
@@ -9,7 +9,7 @@
 
 import dateMath from '@kbn/datemath';
 import { formatDate } from '@elastic/eui';
-import { TimeRange } from '../../../../../src/plugins/data/common';
+import { TimeRange } from '@kbn/data-plugin/common';
 import { TIME_FORMAT } from '../constants/time_format';
 
 export function formatHumanReadableDate(ts: number) {
diff --git a/x-pack/plugins/ml/common/util/errors/errors.test.ts b/x-pack/plugins/ml/common/util/errors/errors.test.ts
index 1a933be2243d1..625374857c7ce 100644
--- a/x-pack/plugins/ml/common/util/errors/errors.test.ts
+++ b/x-pack/plugins/ml/common/util/errors/errors.test.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import { extractErrorMessage, MLHttpFetchError, MLResponseError, EsErrorBody } from './index';
+import { extractErrorMessage, MLHttpFetchError, MLResponseError, EsErrorBody } from '.';
 
 describe('ML - error message utils', () => {
   describe('extractErrorMessage', () => {
diff --git a/x-pack/plugins/ml/common/util/errors/types.ts b/x-pack/plugins/ml/common/util/errors/types.ts
index 23d46ad4a8589..d1f0d3216f42e 100644
--- a/x-pack/plugins/ml/common/util/errors/types.ts
+++ b/x-pack/plugins/ml/common/util/errors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import Boom from '@hapi/boom';
 
 export interface EsErrorRootCause {
diff --git a/x-pack/plugins/ml/common/util/fields_utils.ts b/x-pack/plugins/ml/common/util/fields_utils.ts
index 98b0fcd6efd80..9f605899ccd7c 100644
--- a/x-pack/plugins/ml/common/util/fields_utils.ts
+++ b/x-pack/plugins/ml/common/util/fields_utils.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 import {
   Field,
   Aggregation,
@@ -13,7 +14,6 @@ import {
   RollupFields,
   EVENT_RATE_FIELD_ID,
 } from '../types/fields';
-import { ES_FIELD_TYPES } from '../../../../../src/plugins/data/common';
 import { ML_JOB_AGGREGATION } from '../constants/aggregation_types';
 
 // cross reference fields and aggs.
diff --git a/x-pack/plugins/ml/common/util/runtime_field_utils.ts b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
index a9ec27c7b1577..6b2cb78d73274 100644
--- a/x-pack/plugins/ml/common/util/runtime_field_utils.ts
+++ b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isPopulatedObject } from './object_utils';
-import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
 
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index ffba908dcfe89..4218eea4ca72f 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -40,7 +40,6 @@
     "dashboard",
     "esUiShared",
     "fieldFormats",
-    "home",
     "kibanaReact",
     "kibanaUtils",
     "maps",
diff --git a/x-pack/plugins/ml/public/__mocks__/core_start.ts b/x-pack/plugins/ml/public/__mocks__/core_start.ts
index 1fd988c887dda..df48a2d6197eb 100644
--- a/x-pack/plugins/ml/public/__mocks__/core_start.ts
+++ b/x-pack/plugins/ml/public/__mocks__/core_start.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from '../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createMlStartDepsMock } from './ml_start_deps';
 
 export const createCoreStartMock = () =>
diff --git a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
index 42cbb4bf3485b..45bfacc2e458f 100644
--- a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
+++ b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { sharePluginMock } from '../../../../../src/plugins/share/public/mocks';
-import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
-import { triggersActionsUiMock } from '../../../triggers_actions_ui/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
 
 export const createMlStartDepsMock = () => ({
   data: dataPluginMock.createStartContract(),
diff --git a/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx b/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx
index cadd471a1afab..dcbf580461e0f 100644
--- a/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx
+++ b/x-pack/plugins/ml/public/alerting/jobs_health_rule/anomaly_detection_jobs_health_rule_trigger.tsx
@@ -10,7 +10,7 @@ import { EuiComboBoxOptionOption, EuiForm, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useDebounce from 'react-use/lib/useDebounce';
-import { RuleTypeParamsExpressionProps } from '../../../../triggers_actions_ui/public';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../../common/types/alerts';
 import { JobSelectorControl } from '../job_selector';
 import { jobsApiProvider } from '../../application/services/ml_api_service/jobs';
diff --git a/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts b/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts
index 006e765edd07c..b0321604aab19 100644
--- a/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts
+++ b/x-pack/plugins/ml/public/alerting/jobs_health_rule/register_jobs_health_alerting_rule.ts
@@ -7,8 +7,8 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../../triggers_actions_ui/public';
-import { PluginSetupContract as AlertingSetup } from '../../../../alerting/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../../common/types/alerts';
 import { getResultJobsHealthRuleConfig } from '../../../common/util/alerts';
diff --git a/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx b/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
index d06cbbc02f6ed..52707437d3bf9 100644
--- a/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
+++ b/x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
@@ -8,7 +8,7 @@
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 
-import { Rule } from '../../../triggers_actions_ui/public';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { JobId } from '../../common/types/anomaly_detection_jobs';
 import { useMlKibana } from '../application/contexts/kibana';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
diff --git a/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx b/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
index 609baf17a4c58..f025a2d4bd86d 100644
--- a/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
+++ b/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
@@ -9,6 +9,7 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { EuiSpacer, EuiForm } from '@elastic/eui';
 import useMount from 'react-use/lib/useMount';
 import { i18n } from '@kbn/i18n';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { JobSelectorControl } from './job_selector';
 import { useMlKibana } from '../application/contexts/kibana';
 import { jobsApiProvider } from '../application/services/ml_api_service/jobs';
@@ -29,7 +30,6 @@ import { CombinedJobWithStats } from '../../common/types/anomaly_detection_jobs'
 import { AdvancedSettings } from './advanced_settings';
 import { getLookbackInterval, getTopNBuckets } from '../../common/util/alerts';
 import { isDefined } from '../../common/types/guards';
-import { RuleTypeParamsExpressionProps } from '../../../triggers_actions_ui/public';
 import { parseInterval } from '../../common/util/parse_interval';
 import { BetaBadge } from './beta_badge';
 
diff --git a/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts b/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts
index 82925bd1c3175..b3a4c5420ca46 100644
--- a/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts
+++ b/x-pack/plugins/ml/public/alerting/register_ml_alerts.ts
@@ -7,10 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import { lazy } from 'react';
+import type { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
 import type { MlAnomalyDetectionAlertParams } from '../../common/types/alerts';
-import type { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
-import type { PluginSetupContract as AlertingSetup } from '../../../alerting/public';
 import { PLUGIN_ID } from '../../common/constants/app';
 import { formatExplorerUrl } from '../locator/formatters/anomaly_detection';
 import { validateLookbackInterval, validateTopNBucket } from './validators';
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index 2b00d53e35e54..c4ec667e43592 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -9,15 +9,12 @@ import React, { FC } from 'react';
 import './_index.scss';
 import ReactDOM from 'react-dom';
 
-import { AppMountParameters, CoreStart, HttpStart } from 'kibana/public';
+import { AppMountParameters, CoreStart, HttpStart } from '@kbn/core/public';
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { setDependencyCache, clearCache } from './util/dependency_cache';
 import { setLicenseCache } from './license';
 import type { MlSetupDependencies, MlStartDependencies } from '../plugin';
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx b/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx
index bb9fa3a8ec4d6..8c4b35d300576 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotation_description_list/index.test.tsx
@@ -11,7 +11,7 @@ import moment from 'moment-timezone';
 import React from 'react';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 
-import { AnnotationDescriptionList } from './index';
+import { AnnotationDescriptionList } from '.';
 
 describe('AnnotationDescriptionList', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
index 9184ac4b10128..440592c817c98 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.test.tsx
@@ -14,7 +14,7 @@ import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { Annotation } from '../../../../../common/types/annotations';
 import { AnnotationUpdatesService } from '../../../services/annotations_service';
 
-import { AnnotationFlyout } from './index';
+import { AnnotationFlyout } from '.';
 import { MlAnnotationUpdatesContext } from '../../../contexts/ml/ml_annotation_updates_context';
 
 jest.mock('../../../util/dependency_cache', () => ({
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 e580aabdf9fc6..f91d6594c1b33 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
@@ -46,7 +46,7 @@ import {
   ANNOTATION_EVENT_USER,
   ANNOTATION_EVENT_DELAYED_DATA,
 } from '../../../../../common/constants/annotations';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { ML_APP_LOCATOR, ML_PAGES } from '../../../../../common/constants/locator';
 import { timeFormatter } from '../../../../../common/util/date_utils';
 import { MlAnnotationUpdatesContext } from '../../../contexts/ml/ml_annotation_updates_context';
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js
index 1681d151cd31f..2a567231d3aca 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotations_table/annotations_table.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import jobConfig from '../../../../../common/types/__mocks__/job_config_farequote';
+import jobConfig from '../../../../../common/types/__mocks__/job_config_farequote.json';
 import mockAnnotations from './__mocks__/mock_annotations.json';
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
diff --git a/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx b/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx
index 9224f28071c2f..dc8305f3c240b 100644
--- a/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomaly_results_view_selector/anomaly_results_view_selector.test.tsx
@@ -12,13 +12,13 @@ import { createBrowserHistory } from 'history';
 
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { AnomalyResultsViewSelector } from './index';
+import { AnomalyResultsViewSelector } from '.';
 
 jest.mock('../../contexts/kibana', () => {
   return {
     useMlLocator: () =>
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      require('../../../../../../../src/plugins/share/public/mocks').sharePluginMock.createLocator(),
+      require('@kbn/share-plugin/public/mocks').sharePluginMock.createLocator(),
     useNavigateToPath: () => jest.fn(),
   };
 });
diff --git a/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts b/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts
index 337a49ada6f31..97bdbb7e75f91 100644
--- a/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts
+++ b/x-pack/plugins/ml/public/application/components/custom_hooks/use_time_buckets.ts
@@ -6,9 +6,9 @@
  */
 
 import { useMemo } from 'react';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { useUiSettings } from '../../contexts/kibana';
 import { TimeBuckets } from '../../util/time_buckets';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
 
 export const useTimeBuckets = () => {
   const uiSettings = useUiSettings();
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/common.ts b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
index 1a35e8fa34308..4de8caa978e6f 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/common.ts
+++ b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
@@ -13,11 +13,11 @@ import { EuiDataGridCellValueElementProps, EuiDataGridStyle } from '@elastic/eui
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
-import type { DataView, DataViewField } from '../../../../../../../src/plugins/data_views/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
 
 import { DEFAULT_RESULTS_FIELD } from '../../../../common/constants/data_frame_analytics';
 import { extractErrorMessage } from '../../../../common/util/errors';
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
index b6abf321c7c6e..82ae725038387 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
@@ -26,7 +26,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../common/constants/field_histograms';
 
 import { ANALYSIS_CONFIG_TYPE, INDEX_STATUS } from '../../data_frame_analytics/common';
@@ -169,6 +169,8 @@ export const DataGrid: FC<Props> = memo(
             );
           } else if (schema === 'featureInfluence') {
             return <EuiCodeBlock isCopyable={true}>{cellContentsElement.textContent}</EuiCodeBlock>;
+          } else {
+            return <DefaultCellPopover {...popoverProps} />;
           }
         } else {
           return <DefaultCellPopover {...popoverProps} />;
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx
index 631c214dd751c..d3c848fd5cb1e 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.test.tsx
@@ -10,7 +10,7 @@ import { render } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import '@testing-library/jest-dom/extend-expect';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx
index 4764a1674df2f..c81d6516184d9 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/use_column_chart.tsx
@@ -15,7 +15,7 @@ import { euiPaletteColorBlind, EuiDataGridColumn } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
index fb9648f5ef4af..a2ce2dcea2273 100644
--- a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
+++ b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
@@ -6,8 +6,8 @@
  */
 
 import { FC } from 'react';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 declare const DataRecognizer: FC<{
   indexPattern: DataView;
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
index ea444193db0b1..5e4d87901c979 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { FullTimeRangeSelector } from './index';
-import type { Query } from 'src/plugins/data/public';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import { FullTimeRangeSelector } from '.';
+import type { Query } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 // Create a mock for the setFullTimeRange function in the service.
 // The mock is hoisted to the top, so need to prefix the mock function
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
index 44f6fc5e604cb..a3ed913a714b3 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { i18n } from '@kbn/i18n';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { setFullTimeRange } from './full_time_range_selector_service';
 import { useStorage } from '../../contexts/ml/use_storage';
 import { ML_FROZEN_TIER_PREFERENCE } from '../../../../common/types/storage';
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
index b4fecef196ef0..c83836164221d 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -10,9 +10,9 @@ import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import dateMath from '@kbn/datemath';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { getTimefilter, getToastNotifications } from '../../util/dependency_cache';
 import { ml, GetTimeFieldRangeResponse } from '../../services/ml_api_service';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { isPopulatedObject } from '../../../../common/util/object_utils';
 import type { RuntimeMappings } from '../../../../common/types/fields';
 import { addExcludeFrozenToQuery } from '../../../../common/util/query_utils';
diff --git a/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx b/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx
index 4510ddf487d27..858fb0c63a4dd 100644
--- a/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx
+++ b/x-pack/plugins/ml/public/application/components/header_menu_portal/header_menu_portal.tsx
@@ -7,10 +7,7 @@
 
 import React, { FC, ReactNode, useContext, useEffect, useMemo } from 'react';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
-import {
-  KibanaContextProvider,
-  toMountPoint,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { useMlKibana } from '../../contexts/kibana';
 import { MlPageControlsContext } from '../ml_page';
 
diff --git a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
index f09c20eda0389..51dfe193f7ab0 100644
--- a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
@@ -21,7 +21,7 @@ import './_index.scss';
 import { Dictionary } from '../../../../common/types/common';
 import { useUrlState } from '../../util/url_state';
 // @ts-ignore
-import { IdBadges } from './id_badges/index';
+import { IdBadges } from './id_badges';
 import {
   BADGE_LIMIT,
   JobSelectorFlyoutContent,
diff --git a/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx b/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
index 697885304ea18..866878d477e89 100644
--- a/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
+++ b/x-pack/plugins/ml/public/application/components/jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
@@ -10,7 +10,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { EuiCallOut, EuiSpacer, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { JOB_STATE } from '../../../../../common/constants/states';
 import { mlApiServicesProvider } from '../../../services/ml_api_service';
 import { HttpService } from '../../../services/http_service';
diff --git a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
index 02c295e42f225..8d399e9234639 100644
--- a/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_embedded_map/ml_embedded_map.tsx
@@ -8,24 +8,20 @@
 import React, { useEffect, useRef, useState } from 'react';
 
 import { htmlIdGenerator } from '@elastic/eui';
-import {
-  INITIAL_LOCATION,
-  LayerDescriptor,
-  MAP_SAVED_OBJECT_TYPE,
-} from '../../../../../maps/common';
+import { INITIAL_LOCATION, LayerDescriptor, MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/common';
 import type {
   MapEmbeddable,
   MapEmbeddableInput,
   MapEmbeddableOutput,
   RenderTooltipContentParams,
-} from '../../../../../maps/public';
+} from '@kbn/maps-plugin/public';
 
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   isErrorEmbeddable,
   ViewMode,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
 import { useMlKibana } from '../../contexts/kibana';
 
 export function MlEmbeddedMapComponent({
diff --git a/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx b/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
index 328dee63365d4..301939fb6fdbc 100644
--- a/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
@@ -9,7 +9,8 @@ import React, { createContext, FC, useCallback, useMemo, useReducer } from 'reac
 import { EuiLoadingContent, EuiPageContentBody } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Route } from 'react-router-dom';
-import type { AppMountParameters } from 'kibana/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import { KibanaPageTemplate, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import { useSideNavItems } from './side_nav';
 import * as routes from '../../routing/routes';
 import { MlPageWrapper } from '../../routing/ml_page_wrapper';
@@ -17,10 +18,6 @@ import { useMlKibana, useNavigateToPath } from '../../contexts/kibana';
 import { MlRoute, PageDependencies } from '../../routing/router';
 import { DatePickerWrapper } from '../navigation_menu/date_picker_wrapper';
 import { useActiveRoute } from '../../routing/use_active_route';
-import {
-  KibanaPageTemplate,
-  RedirectAppLinks,
-} from '../../../../../../../src/plugins/kibana_react/public';
 import { useDocTitle } from '../../routing/use_doc_title';
 
 export const MlPageControlsContext = createContext<{
diff --git a/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx b/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx
index 20f487da0002e..1d795398d7d71 100644
--- a/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_saved_objects_spaces_list/ml_saved_objects_spaces_list.tsx
@@ -9,12 +9,12 @@ import React, { FC, useCallback, useState } from 'react';
 
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { SpacesPluginStart, ShareToSpaceFlyoutProps } from '@kbn/spaces-plugin/public';
 import {
   ML_JOB_SAVED_OBJECT_TYPE,
   SavedObjectResult,
   MlSavedObjectType,
 } from '../../../../common/types/saved_objects';
-import type { SpacesPluginStart, ShareToSpaceFlyoutProps } from '../../../../../spaces/public';
 import { useMlApiContext } from '../../contexts/kibana';
 import { useToastNotificationService } from '../../services/toast_notification_service';
 
diff --git a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx
index cd2239c4c8f4f..69e1bfe8a062a 100644
--- a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx
+++ b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/create_calendar.tsx
@@ -23,7 +23,7 @@ import {
 
 import { EventRateChart } from '../../../jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart';
 import { Anomaly } from '../../../jobs/new_job/common/results_loader/results_loader';
-import { useCurrentEuiTheme } from '../../../components/color_range_legend';
+import { useCurrentEuiTheme } from '../../color_range_legend';
 import { LineChartPoint } from '../../../jobs/new_job/common/chart_loader/chart_loader';
 
 export interface CalendarEvent {
diff --git a/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx b/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx
index 45ba8f5aa4e0f..6f87de917a0cb 100644
--- a/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx
+++ b/x-pack/plugins/ml/public/application/components/navigation_menu/date_picker_wrapper/date_picker_wrapper.tsx
@@ -19,9 +19,10 @@ import {
   OnRefreshProps,
   OnTimeChangeProps,
 } from '@elastic/eui';
-import { TimeHistoryContract, TimeRange } from 'src/plugins/data/public';
-import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
+import { TimeHistoryContract, TimeRange } from '@kbn/data-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
+import { wrapWithTheme, toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { mlTimefilterRefresh$ } from '../../../services/timefilter_refresh_service';
 import { useUrlState } from '../../../util/url_state';
 import { useMlKibana } from '../../../contexts/kibana';
@@ -30,10 +31,6 @@ import {
   useTimeRangeUpdates,
 } from '../../../contexts/kibana/use_timefilter';
 import { useToastNotificationService } from '../../../services/toast_notification_service';
-import {
-  wrapWithTheme,
-  toMountPoint,
-} from '../../../../../../../../src/plugins/kibana_react/public';
 
 interface TimePickerQuickRange {
   from: string;
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
index 2fbf69c67f26a..087a23b2fce90 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
index 69a71dda38cb4..07e6282451b2b 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
index 5e22b4339a3a9..ed5be09e03b42 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
@@ -51,7 +51,7 @@ import {
   CONDITIONS_NOT_SUPPORTED_FUNCTIONS,
 } from '../../../../common/constants/detector_rule';
 import { getPartitioningFieldNames } from '../../../../common/util/job_utils';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { mlJobService } from '../../services/job_service';
 import { ml } from '../../services/ml_api_service';
 import { extractErrorMessage } from '../../../../common/util/errors';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
index 2553baa11da33..290d815271dcc 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.test.js
@@ -50,7 +50,7 @@ jest.mock('../../capabilities/check_capabilities', () => ({
   checkPermission: () => true,
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
index c030dcfa1f0a4..68ce65ea2c847 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
index 86a777f65a338..145f3d5d53256 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
@@ -6,7 +6,7 @@
  */
 
 // Mock the mlJobService that is imported for saving rules.
-jest.mock('../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../services/job_service', () => 'mlJobService');
 
 // Create a mock for the canGetFilters privilege check.
 // The mock is hoisted to the top, so need to prefix the mock function
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
index 9ae947c404c2e..d8f8f4d5d8f51 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-jest.mock('../../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../../services/job_service', () => 'mlJobService');
 
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
index 7df277ae0b6ab..6f019d973cc8d 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-jest.mock('../../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../../services/job_service', () => 'mlJobService');
 
 // Mock the call for loading a filter.
 // The mock is hoisted to the top, so need to prefix the filter variable
diff --git a/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx b/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
index 9e5123fa275f2..47d94c03e9ccb 100644
--- a/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
+++ b/x-pack/plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
@@ -10,7 +10,7 @@ import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { MlSavedObjectType } from '../../../../common/types/saved_objects';
 import { useMlApiContext } from '../../contexts/kibana';
-import { JobSpacesSyncFlyout } from '../../components/job_spaces_sync';
+import { JobSpacesSyncFlyout } from '../job_spaces_sync';
 import { checkPermission } from '../../capabilities/check_capabilities';
 
 interface Props {
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
index ecaf3515e1634..b93ba79830f98 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
@@ -24,13 +24,13 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { extractErrorMessage } from '../../../../common';
 import { isRuntimeMappings } from '../../../../common/util/runtime_field_utils';
 import { stringHash } from '../../../../common/util/string_utils';
 import { RuntimeMappings } from '../../../../common/types/fields';
 import type { ResultsSearchQuery } from '../../data_frame_analytics/common/analytics';
-import { getCombinedRuntimeMappings } from '../../components/data_grid';
+import { getCombinedRuntimeMappings } from '../data_grid';
 
 import { useMlApiContext } from '../../contexts/kibana';
 
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
index 543ab0a0c0982..fe1a649cdeb06 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { ML__INCREMENTAL_ID } from '../../data_frame_analytics/common/fields';
 
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
index f3431f6052069..af1fb980448be 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
+++ b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.js
@@ -33,7 +33,7 @@ import { VALIDATION_STATUS } from '../../../../common/constants/validation';
 import { Callout, statusToEuiIconType } from '../callout';
 import { getMostSevereMessageStatus } from '../../../../common/util/validation_utils';
 import { toastNotificationServiceProvider } from '../../services/toast_notification_service';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 const defaultIconType = 'questionInCircle';
 const getDefaultState = () => ({
diff --git a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
index b1755660960ad..497e7124623f0 100644
--- a/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
+++ b/x-pack/plugins/ml/public/application/components/validate_job/validate_job_view.test.js
@@ -20,7 +20,7 @@ jest.mock('../../util/dependency_cache', () => ({
   }),
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts
index 33694824a5514..fb9b48f218b7c 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/kibana_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { BehaviorSubject } from 'rxjs';
 
 export const chartsServiceMock = {
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts
index d384e17b2e8fc..b53137aec1838 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/__mocks__/use_timefilter.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { TimefilterContract } from '../../../../../../../../src/plugins/data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 
 export const timefilterMock = dataPluginMock.createStartContract().query.timefilter
   .timefilter as jest.Mocked<TimefilterContract>;
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 0d00095b7f7c5..bfb27e6d4dbbc 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -5,26 +5,23 @@
  * 2.0.
  */
 
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { CoreStart } from 'kibana/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import {
-  useKibana,
-  KibanaReactContextValue,
-} from '../../../../../../../src/plugins/kibana_react/public';
-import type { SecurityPluginSetup } from '../../../../../security/public';
-import type { LicenseManagementUIPluginSetup } from '../../../../../license_management/public';
-import type { SharePluginStart } from '../../../../../../../src/plugins/share/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { useKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { LicenseManagementUIPluginSetup } from '@kbn/license-management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { DataVisualizerPluginStart } from '@kbn/data-visualizer-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
+import type { DashboardSetup } from '@kbn/dashboard-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import type { MlServicesContext } from '../../app';
-import type { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
-import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public';
-import type { MapsStartApi } from '../../../../../maps/public';
-import type { DataVisualizerPluginStart } from '../../../../../data_visualizer/public';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public';
-import type { FieldFormatsRegistry } from '../../../../../../../src/plugins/field_formats/common';
-import type { DashboardSetup } from '../../../../../../../src/plugins/dashboard/public';
-import type { SpacesPluginStart } from '../../../../../spaces/public';
-import type { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
 
 interface StartPlugins {
   data: DataPublicPluginStart;
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts b/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
index c8810545a57d5..2f0165fffd293 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
@@ -6,11 +6,11 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
+import { LocatorGetUrlParams } from '@kbn/share-plugin/common/url_service';
 import { useMlKibana } from './kibana_context';
 import { ML_APP_LOCATOR } from '../../../../common/constants/locator';
 import { MlLocatorParams } from '../../../../common/types/locator';
 import { useUrlState } from '../../util/url_state';
-import { LocatorGetUrlParams } from '../../../../../../../src/plugins/share/common/url_service';
 
 export const useMlLocator = () => {
   const {
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts b/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts
index d089a43b3fb39..113d77d7b16da 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/use_field_formatter.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { useMlKibana } from './kibana_context';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 /**
  * Set of reasonable defaults for formatters for the ML app.
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
index 0d3c0993c880b..fadf9a6830266 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 export const dataViewMock = {
   id: 'the-index-pattern-id',
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
index 61a466b6496ef..46308a9d19cd5 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataViewsContract } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 export const dataViewsContractMock = new (class {
   fieldFormats = [];
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
index d707f56b10a34..2a8806bf3ff38 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
 import { MlServicesContext } from '../../app';
 
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx b/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx
index bc8057938701a..103e8c594d1f7 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/contexts/ml/use_job_selection_flyout.tsx
@@ -7,11 +7,8 @@
 
 import React, { useCallback, useEffect, useRef } from 'react';
 import moment from 'moment';
+import { KibanaContextProvider, KibanaReactOverlays } from '@kbn/kibana-react-plugin/public';
 import { useMlKibana } from '../kibana';
-import {
-  KibanaContextProvider,
-  KibanaReactOverlays,
-} from '../../../../../../../src/plugins/kibana_react/public';
 import { JobSelectorFlyout } from '../../../embeddables/common/components/job_selector_flyout';
 import { getInitialGroupsMap } from '../../components/job_selector/job_selector';
 import type { JobSelectionResult } from '../../components/job_selector/job_selector_flyout';
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 d5e0e736b768e..89c05643f0dc8 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
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { getNumTopClasses, getNumTopFeatureImportanceValues } from './analytics';
 import { Field } from '../../../../common/types/fields';
 import {
@@ -15,7 +16,6 @@ import {
   isOutlierAnalysis,
   isRegressionAnalysis,
 } from '../../../../common/util/analytics_utils';
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 
 import { FEATURE_IMPORTANCE, FEATURE_INFLUENCE, OUTLIER_SCORE, TOP_CLASSES } from './constants';
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 195a7d9b762cf..ff81dc9932e9f 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
@@ -11,7 +11,7 @@ import { extractErrorMessage } from '../../../../common/util/errors';
 import { EsSorting, UseDataGridReturnType, getProcessedFields } from '../../components/data_grid';
 import { ml } from '../../services/ml_api_service';
 
-import { isKeywordAndTextType } from '../common/fields';
+import { isKeywordAndTextType } from './fields';
 import { SavedSearchQuery } from '../../contexts/ml';
 
 import { INDEX_STATUS } from './analytics';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts
index 58146474815c4..50f3fa6aeb659 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/get_index_fields.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 
-import { getDefaultFieldsFromJobCaps, DataFrameAnalyticsConfig } from '../common';
+import { getDefaultFieldsFromJobCaps, DataFrameAnalyticsConfig } from '.';
 
 export interface FieldTypes {
   [key: string]: ES_FIELD_TYPES;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
index 43dff4142023d..df740df7fca3c 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { extractErrorMessage } from '../../../../common/util/errors';
 
@@ -18,7 +18,7 @@ import { ml } from '../../services/ml_api_service';
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { useMlContext } from '../../contexts/ml';
 
-import { DataFrameAnalyticsConfig } from '../common';
+import { DataFrameAnalyticsConfig } from '.';
 
 import { isGetDataFrameAnalyticsStatsResponseOk } from '../pages/analytics_management/services/analytics_service/get_analytics';
 import { DataFrameTaskStateType } from '../pages/analytics_management/components/analytics_list/common';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
index 158410c690a66..b4f55bcae0947 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
@@ -19,6 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { debounce, cloneDeep } from 'lodash';
 
+import { Query } from '@kbn/data-plugin/common/query';
 import { newJobCapsServiceAnalytics } from '../../../../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { useMlContext } from '../../../../../contexts/ml';
 import { getCombinedRuntimeMappings } from '../../../../../components/data_grid/common';
@@ -56,7 +57,6 @@ import { ExplorationQueryBar } from '../../../analytics_exploration/components/e
 import { useSavedSearch, SavedSearchQuery } from './use_saved_search';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../../../common/constants/search';
 import { ExplorationQueryBarProps } from '../../../analytics_exploration/components/exploration_query_bar/exploration_query_bar';
-import { Query } from '../../../../../../../../../../src/plugins/data/common/query';
 
 import { ScatterplotMatrix } from '../../../../../components/scatterplot_matrix';
 import { RuntimeMappings } from '../runtime_mappings';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
index 1fe649ee9519a..881b533efba09 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/form_options_validation.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
 import { AnalyticsJobType } from '../../../analytics_management/hooks/use_create_analytics_form/state';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
index 1efb442425b69..666f990aa4aa1 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
@@ -9,13 +9,13 @@ import React, { FC, Fragment, useState, useEffect } from 'react';
 import { EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { AnalyticsJobType } from '../../../analytics_management/hooks/use_create_analytics_form/state';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
 import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
 import { OMIT_FIELDS } from '../../../../../../../common/constants/field_types';
 import { BASIC_NUMERICAL_TYPES, EXTENDED_NUMERICAL_TYPES } from '../../../../common/fields';
 import { CATEGORICAL_TYPES } from './form_options_validation';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
 import { newJobCapsServiceAnalytics } from '../../../../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
index 28e63d0e002aa..8a74237a28144 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
@@ -11,7 +11,7 @@ import { EuiCallOut, EuiFieldText, EuiForm, EuiFormRow, EuiSpacer } from '@elast
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { useNotifications } from '../../../../../contexts/kibana';
 import { ml } from '../../../../../services/ml_api_service';
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts
index a2d9ba393646f..9f2b2db2f8527 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-export { ConfigurationStep } from './configuration_step/index';
-export { AdvancedStep } from './advanced_step/index';
-export { DetailsStep } from './details_step/index';
-export { CreateStep } from './create_step/index';
-export { ValidationStepWrapper } from './validation_step/index';
+export { ConfigurationStep } from './configuration_step';
+export { AdvancedStep } from './advanced_step';
+export { DetailsStep } from './details_step';
+export { CreateStep } from './create_step';
+export { ValidationStepWrapper } from './validation_step';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
index 13c3e71cd122a..9de32fdd5bd3e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
@@ -20,9 +20,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { XJsonMode } from '@kbn/ace';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import { useMlContext } from '../../../../../contexts/ml';
 import { CreateAnalyticsFormProps } from '../../../analytics_management/hooks/use_create_analytics_form';
-import { XJson } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
 import { getCombinedRuntimeMappings } from '../../../../../components/data_grid/common';
 import { isPopulatedObject } from '../../../../../../../common/util/object_utils';
 import { RuntimeMappingsEditor } from './runtime_mappings_editor';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx
index e499d9625eeab..bb8d098fcf21e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings_editor.tsx
@@ -9,7 +9,7 @@ import { isEqual } from 'lodash';
 import React, { memo, FC } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { isRuntimeMappings } from '../../../../../../../common/util/runtime_field_utils';
 import { XJsonModeType } from './runtime_mappings';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
index b8b8db4c916ae..a865417ff123d 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
@@ -9,9 +9,9 @@ import { useEffect, useMemo, useState } from 'react';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { EuiDataGridColumn } from '@elastic/eui';
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { isRuntimeMappings } from '../../../../../../common/util/runtime_field_utils';
 import { RuntimeMappings } from '../../../../../../common/types/fields';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../../common/constants/field_histograms';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
index 1041fcb7af8ab..f9f218ccd3d6e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiDataGridColumn, EuiSpacer, EuiText } from '@elastic/eui';
 
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import {
   isClassificationAnalysis,
@@ -37,11 +37,7 @@ import {
   getAnalysisType,
 } from '../../../../common';
 
-import {
-  ExpandableSection,
-  ExpandableSectionProps,
-  HEADER_ITEMS_LOADING,
-} from '../expandable_section';
+import { ExpandableSection, ExpandableSectionProps, HEADER_ITEMS_LOADING } from '.';
 import { IndexPatternPrompt } from '../index_pattern_prompt';
 
 const showingDocs = i18n.translate(
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
index 5d8ffd2229d0e..141be7cb00ebf 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
@@ -12,10 +12,10 @@ import { i18n } from '@kbn/i18n';
 import { debounce } from 'lodash';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { Dictionary } from '../../../../../../../common/types/common';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
-import { Query } from '../../../../../../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../../../../../../src/plugins/unified_search/public';
 
 import {
   SEARCH_QUERY_LANGUAGE,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
index 41c434c7160cf..1931fa9100e20 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { getToastNotifications } from '../../../../../util/dependency_cache';
 import { useMlKibana } from '../../../../../contexts/kibana';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
index 6e0d513a35b9a..c0590fd80a5d5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
@@ -9,11 +9,11 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { EuiDataGridColumn } from '@elastic/eui';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { i18n } from '@kbn/i18n';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { MlApiServices } from '../../../../../services/ml_api_service';
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
index d0f048ac02606..45653209cdb8a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
@@ -9,7 +9,7 @@ import { useEffect, useMemo } from 'react';
 
 import { EuiDataGridColumn } from '@elastic/eui';
 
-import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
index 804fe77cf9430..d9a888b9e3147 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_name.test.tsx
@@ -10,10 +10,7 @@ import { fireEvent, render } from '@testing-library/react';
 import * as CheckPrivilige from '../../../../../capabilities/check_capabilities';
 import mockAnalyticsListItem from '../analytics_list/__mocks__/analytics_list_item.json';
 import { I18nProvider } from '@kbn/i18n-react';
-import {
-  coreMock as mockCoreServices,
-  i18nServiceMock,
-} from '../../../../../../../../../../src/core/public/mocks';
+import { coreMock as mockCoreServices, i18nServiceMock } from '@kbn/core/public/mocks';
 
 import { DeleteActionName } from './delete_action_name';
 import { DeleteActionModal } from './delete_action_modal';
@@ -24,7 +21,7 @@ jest.mock('../../../../../capabilities/check_capabilities', () => ({
   createPermissionFailureMessage: jest.fn(),
 }));
 
-jest.mock('../../../../../../application/util/dependency_cache', () => ({
+jest.mock('../../../../../util/dependency_cache', () => ({
   getToastNotifications: () => ({ addSuccess: jest.fn(), addDanger: jest.fn() }),
 }));
 
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 3dfeef18e5102..9ab5e40d1ef21 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
@@ -16,6 +16,7 @@ import {
   EuiSearchBarProps,
   EuiSpacer,
 } from '@elastic/eui';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../../../../common/constants/data_frame_analytics';
 import { DataFrameAnalyticsId, useRefreshAnalyticsList } from '../../../../common';
 import { checkPermission } from '../../../../../capabilities/check_capabilities';
@@ -31,7 +32,6 @@ import {
 import { getAnalyticsFactory } from '../../services/analytics_service';
 import { getTaskStateBadge, getJobTypeBadge, useColumns } from './use_columns';
 import { ExpandedRow } from './expanded_row';
-import type { SpacesPluginStart } from '../../../../../../../../spaces/public';
 import { AnalyticStatsBarStats, StatsBar } from '../../../../../components/stats_bar';
 import { CreateAnalyticsButton } from '../create_analytics_button';
 import { filterAnalytics } from '../../../../common/search_bar_filters';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
index 329120e26be2d..3077f0fb38726 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
@@ -20,6 +20,7 @@ import {
   EuiLink,
   RIGHT_ALIGNMENT,
 } from '@elastic/eui';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { getAnalysisType, DataFrameAnalyticsId } from '../../../../common';
 import {
   getDataFrameAnalyticsProgressPhase,
@@ -33,7 +34,6 @@ import {
 import { useActions } from './use_actions';
 import { useMlLink } from '../../../../../contexts/kibana';
 import { ML_PAGES } from '../../../../../../../common/constants/locator';
-import type { SpacesPluginStart } from '../../../../../../../../spaces/public';
 import { MLSavedObjectsSpacesList } from '../../../../../components/ml_saved_objects_spaces_list';
 
 enum TASK_STATE_COLOR {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
index 436bd060db34f..18b93e35a3f36 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
@@ -14,7 +14,7 @@ import { getDataViewAndSavedSearch, DataViewAndSavedSearch } from '../../../../.
 
 import { SourceSelection } from './source_selection';
 
-jest.mock('../../../../../../../../../../src/plugins/saved_objects/public', () => {
+jest.mock('@kbn/saved-objects-plugin/public', () => {
   const SavedObjectFinderUi = ({
     onChoose,
   }: {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
index 45211c5ef7e24..dd491c85de635 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
@@ -10,9 +10,9 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiCallOut, EuiSpacer, EuiPageBody, EuiPageContent } from '@elastic/eui';
 
-import type { SimpleSavedObject } from 'src/core/public';
+import type { SimpleSavedObject } from '@kbn/core/public';
 
-import { SavedObjectFinderUi } from '../../../../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useMlKibana, useNavigateToPath } from '../../../../../contexts/kibana';
 
 import { useToastNotificationService } from '../../../../../services/toast_notification_service';
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 c49653c5a75c5..5559e7db2d631 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
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { memoize, isEqual } from 'lodash';
 // @ts-ignore
 import numeral from '@elastic/numeral';
+import { indexPatterns } from '@kbn/data-plugin/public';
 import { isValidIndexName } from '../../../../../../../common/util/es_utils';
 
 import { collapseLiteralStrings } from '../../../../../../../shared_imports';
@@ -45,7 +46,6 @@ import {
   TRAINING_PERCENT_MIN,
   TRAINING_PERCENT_MAX,
 } from '../../../../common/analytics';
-import { indexPatterns } from '../../../../../../../../../../src/plugins/data/public';
 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/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 94a12f9ad5235..41a8ae4eeba92 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -9,11 +9,11 @@ import { useReducer } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
+import { DuplicateDataViewError } from '@kbn/data-plugin/public';
 import { extractErrorMessage } from '../../../../../../../common/util/errors';
 import { DeepReadonly } from '../../../../../../../common/types/common';
 import { ml } from '../../../../../services/ml_api_service';
 import { useMlContext } from '../../../../../contexts/ml';
-import { DuplicateDataViewError } from '../../../../../../../../../../src/plugins/data/public';
 
 import { useRefreshAnalyticsList, DataFrameAnalyticsConfig } from '../../../../common';
 import { extractCloningConfig, isAdvancedConfig } from '../../components/action_clone';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
index 0ae82d72cecf2..3420f839d592b 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/page.tsx
@@ -13,7 +13,7 @@ import { useUrlState } from '../../../util/url_state';
 import { NodeAvailableWarning } from '../../../components/node_available_warning';
 import { SavedObjectsWarning } from '../../../components/saved_objects_warning';
 import { UpgradeWarning } from '../../../components/upgrade';
-import { JobMap } from '../job_map';
+import { JobMap } from '.';
 import { HelpMenu } from '../../../components/help_menu';
 import { useMlKibana, useMlApiContext } from '../../../contexts/kibana';
 import { useRefreshAnalyticsList } from '../../common';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx
index b90e5813f0092..4c1d8b478f971 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx
@@ -8,6 +8,7 @@
 import React, { FC, Fragment, useState, useEffect, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { ResultLink, FileDataVisualizerSpec } from '@kbn/data-visualizer-plugin/public';
 import { useTimefilter } from '../../contexts/kibana';
 import { HelpMenu } from '../../components/help_menu';
 import { useMlKibana, useMlLocator } from '../../contexts/kibana';
@@ -16,7 +17,6 @@ import { ML_PAGES } from '../../../../common/constants/locator';
 import { isFullLicense } from '../../license';
 import { mlNodesAvailable, getMlNodeCount } from '../../ml_nodes_check/check_ml_nodes';
 import { checkPermission } from '../../capabilities/check_capabilities';
-import type { ResultLink, FileDataVisualizerSpec } from '../../../../../data_visualizer/public';
 import { MlPageHeader } from '../../components/page_header';
 
 interface GetUrlParams {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts
index 40a8c3a7d8b1b..8fa8d34ad1b6f 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { MlJobFieldType } from '../../../../../common/types/field_types';
 
 export interface FieldRequestConfig {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
index 37045cc3cd7c3..c84e8d9dea760 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
-import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { SavedSearchQuery } from '../../../contexts/ml';
 import { OMIT_FIELDS } from '../../../../../common/constants/field_types';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
index 12672f304be80..5a041df220df9 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
@@ -8,6 +8,7 @@
 import React, { FC, Fragment, useEffect, useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { ResultLink, IndexDataVisualizerSpec } from '@kbn/data-visualizer-plugin/public';
 import { useMlKibana, useTimefilter, useMlLocator } from '../../contexts/kibana';
 import { HelpMenu } from '../../components/help_menu';
 import { ML_PAGES } from '../../../../common/constants/locator';
@@ -15,7 +16,6 @@ import { isFullLicense } from '../../license';
 import { mlNodesAvailable, getMlNodeCount } from '../../ml_nodes_check/check_ml_nodes';
 import { checkPermission } from '../../capabilities/check_capabilities';
 
-import type { ResultLink, IndexDataVisualizerSpec } from '../../../../../data_visualizer/public';
 import { MlPageHeader } from '../../components/page_header';
 
 interface GetUrlParams {
diff --git a/x-pack/plugins/ml/public/application/explorer/_explorer.scss b/x-pack/plugins/ml/public/application/explorer/_explorer.scss
index 04f9d6d2e8c44..4d04a0747e3a9 100644
--- a/x-pack/plugins/ml/public/application/explorer/_explorer.scss
+++ b/x-pack/plugins/ml/public/application/explorer/_explorer.scss
@@ -1,18 +1,7 @@
 $borderRadius: $euiBorderRadius / 2;
 
 .ml-explorer {
-  width: 100%;
-  display: inline-block;
-  color: $euiColorDarkShade;
-
   .results-container {
-    padding: 0 0 $euiSize 0;
-
-    // SASSTODO: Overwrite of bootstrap
-    .col-xs-12 {
-      width: calc(100% - #{$euiSizeXL});
-      padding-left: $euiSize;
-    }
 
     .no-influencers-warning {
       float: left;
diff --git a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
index 217a13490771e..b65daf40f6761 100644
--- a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
+++ b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
@@ -13,6 +13,7 @@ import { forkJoin, of, Observable, Subject } from 'rxjs';
 import { switchMap, map } from 'rxjs/operators';
 
 import { useCallback, useMemo } from 'react';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 import {
   getDateFormatTz,
   getSelectionInfluencers,
@@ -29,7 +30,6 @@ import {
 import { ExplorerState } from '../reducers';
 import { useMlKibana, useTimefilter } from '../../contexts/kibana';
 import { MlResultsService, mlResultsServiceProvider } from '../../services/results_service';
-import { TimefilterContract } from '../../../../../../../src/plugins/data/public';
 import { AnomalyExplorerChartsService } from '../../services/anomaly_explorer_charts_service';
 import type { InfluencersFilterQuery } from '../../../../common/types/es_client';
 import type { TimeBucketsInterval, TimeRangeBounds } from '../../util/time_buckets';
diff --git a/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx b/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
index 48c00ade00bc6..f2d739d2f5852 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
@@ -23,11 +23,11 @@ import {
   STYLE_TYPE,
   COLOR_MAP_TYPE,
   VectorLayerDescriptor,
-} from '../../../../maps/common';
+} from '@kbn/maps-plugin/common';
+import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import { useMlKibana } from '../contexts/kibana';
 import { isDefined } from '../../../common/types/guards';
 import { MlEmbeddedMapComponent } from '../components/ml_embedded_map';
-import { EMSTermJoinConfig } from '../../../../maps/public';
 import { AnomaliesTableRecord } from '../../../common/types/anomalies';
 
 const MAX_ENTITY_VALUES = 3;
diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
index 49e12fbd57f12..31c401b99ae51 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
@@ -16,6 +16,8 @@ import {
   debounceTime,
 } from 'rxjs/operators';
 import { isEqual, sortBy, uniq } from 'lodash';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import type { TimeRangeBounds } from '@kbn/data-plugin/common';
 import { AnomalyTimelineService } from '../services/anomaly_timeline_service';
 import type {
   AppStateSelectedCells,
@@ -25,8 +27,6 @@ import type {
 } from './explorer_utils';
 import type { AnomalyExplorerCommonStateService } from './anomaly_explorer_common_state';
 import type { AnomalyExplorerSwimLaneUrlState } from '../../../common/types/locator';
-import type { TimefilterContract } from '../../../../../../src/plugins/data/public';
-import type { TimeRangeBounds } from '../../../../../../src/plugins/data/common';
 import {
   ANOMALY_SWIM_LANE_HARD_LIMIT,
   SWIMLANE_TYPE,
@@ -259,7 +259,9 @@ export class AnomalyTimelineStateService extends StateService {
           number,
           number,
           AppStateSelectedCells,
-          TimeBucketsInterval
+          TimeBucketsInterval,
+          TimeRangeBounds,
+          Refresh
         ]
       >
     )
@@ -342,7 +344,7 @@ export class AnomalyTimelineStateService extends StateService {
                   latest: overallSwimLaneData!.latest,
                 },
                 selectedJobs,
-                viewBySwimlaneFieldName,
+                viewBySwimlaneFieldName!,
                 ANOMALY_SWIM_LANE_HARD_LIMIT,
                 swimLanePagination.viewByPerPage,
                 swimLanePagination.viewByFromPage,
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
index 14ddcc7b92ddb..7b66b38ca6bff 100644
--- a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -9,9 +9,9 @@ import React, { FC, useState, useEffect } from 'react';
 import { EuiCode, EuiInputPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
-import { Query } from '../../../../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { SEARCH_QUERY_LANGUAGE, ErrorMessage } from '../../../../../common/constants/search';
 import { InfluencersFilterQuery } from '../../../../../common/types/es_client';
 import { useAnomalyExplorerContext } from '../../anomaly_explorer_context';
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx
index be154a3726ae6..2caf5ee97780f 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_anomaly_charts_to_dashboard_controls.tsx
@@ -7,11 +7,11 @@
 import React, { FC, useCallback, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFieldNumber, EuiFormRow, formatDate, htmlIdGenerator } from '@elastic/eui';
+import { TimeRange } from '@kbn/data-plugin/common/query';
 import { useDashboardTable } from './use_dashboards_table';
 import { AddToDashboardControl } from './add_to_dashboard_controls';
 import { useAddToDashboardActions } from './use_add_to_dashboard_actions';
 import { AppStateSelectedCells, getSelectionTimeRange } from '../explorer_utils';
-import { TimeRange } from '../../../../../../../src/plugins/data/common/query';
 import { DEFAULT_MAX_SERIES_TO_PLOT } from '../../services/anomaly_explorer_charts_service';
 import { JobId } from '../../../../common/types/anomaly_detection_jobs';
 import { ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE } from '../../../embeddables';
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx
index 519bbede14029..2e5db456a3153 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/add_swimlane_to_dashboard_controls.tsx
@@ -15,7 +15,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { DashboardSavedObject } from '../../../../../../../src/plugins/dashboard/public';
+import { DashboardSavedObject } from '@kbn/dashboard-plugin/public';
 import { getDefaultSwimlanePanelTitle } from '../../../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
 import { SWIMLANE_TYPE, SwimlaneType } from '../explorer_constants';
 import { JobId } from '../../../../common/types/anomaly_detection_jobs';
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx
index 21d3a320ee591..1dbc5ac051b95 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_add_to_dashboard_actions.tsx
@@ -6,10 +6,10 @@
  */
 
 import { useCallback } from 'react';
+import { DashboardConstants } from '@kbn/dashboard-plugin/public';
 import { DashboardItem } from './use_dashboards_table';
 import { useMlKibana } from '../../contexts/kibana';
 import { useDashboardService } from '../../services/dashboard_service';
-import { DashboardConstants } from '../../../../../../../src/plugins/dashboard/public';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
diff --git a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx
index b114797bbc550..b79f4d93d10d6 100644
--- a/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/dashboard_controls/use_dashboards_table.tsx
@@ -8,7 +8,7 @@
 import type { EuiInMemoryTableProps } from '@elastic/eui';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { debounce } from 'lodash';
-import type { DashboardSavedObject } from '../../../../../../../src/plugins/dashboard/public';
+import type { DashboardSavedObject } from '@kbn/dashboard-plugin/public';
 import { useDashboardService } from '../../services/dashboard_service';
 import { useMlKibana } from '../../contexts/kibana';
 
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.tsx b/x-pack/plugins/ml/public/application/explorer/explorer.tsx
index 9ee9aed31c7af..5352eea1ab505 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { FC, useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import {
@@ -23,8 +23,12 @@ import {
   EuiPanel,
   EuiAccordion,
   EuiBadge,
+  EuiResizableContainer,
+  useIsWithinBreakpoints,
 } from '@elastic/eui';
 import useObservable from 'react-use/lib/useObservable';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import type { TimefilterContract } from '@kbn/data-plugin/public';
 import { AnnotationFlyout } from '../components/annotations/annotation_flyout';
 // @ts-ignore
 import { AnnotationsTable } from '../components/annotations/annotations_table';
@@ -61,14 +65,17 @@ import { AnomaliesMap } from './anomalies_map';
 import { ANOMALY_DETECTION_DEFAULT_TIME_RANGE } from '../../../common/constants/settings';
 import { AnomalyContextMenu } from './anomaly_context_menu';
 import { isDefined } from '../../../common/types/guards';
-import type { DataView } from '../../../../../../src/plugins/data_views/common';
 import type { JobSelectorProps } from '../components/job_selector/job_selector';
 import type { ExplorerState } from './reducers';
-import type { TimefilterContract } from '../../../../../../src/plugins/data/public';
 import type { TimeBuckets } from '../util/time_buckets';
 import { useToastNotificationService } from '../services/toast_notification_service';
 import { useMlKibana, useMlLocator } from '../contexts/kibana';
 import { useAnomalyExplorerContext } from './anomaly_explorer_context';
+import {
+  AnomalyExplorerPanelsState,
+  ML_ANOMALY_EXPLORER_PANELS,
+} from '../../../common/types/storage';
+import { useStorage } from '../contexts/ml/use_storage';
 
 interface ExplorerPageProps {
   jobSelectorProps: JobSelectorProps;
@@ -135,6 +142,19 @@ interface ExplorerUIProps {
   swimLaneSeverity?: number;
 }
 
+export function getDefaultPanelsState() {
+  return {
+    topInfluencers: {
+      isCollapsed: false,
+      size: 20,
+    },
+    mainPage: {
+      isCollapsed: false,
+      size: 80,
+    },
+  };
+}
+
 export const Explorer: FC<ExplorerUIProps> = ({
   invalidTimeRangeError,
   showCharts,
@@ -148,6 +168,93 @@ export const Explorer: FC<ExplorerUIProps> = ({
   explorerState,
   overallSwimlaneData,
 }) => {
+  const isMobile = useIsWithinBreakpoints(['xs', 's']);
+
+  const [anomalyExplorerPanelState, setAnomalyExplorerPanelState] =
+    useStorage<AnomalyExplorerPanelsState>(ML_ANOMALY_EXPLORER_PANELS, {
+      topInfluencers: {
+        isCollapsed: false,
+        size: 20,
+      },
+      mainPage: {
+        size: 80,
+      },
+    });
+
+  const topInfluencersPanelRef = useRef<HTMLDivElement | null>(null);
+
+  const collapseFn = useRef<() => void | undefined>();
+  const panelsInitialized = useRef<boolean>(false);
+
+  useEffect(
+    /**
+     * Preserve collapsible panel state on page load.
+     * TODO Remove when https://github.com/elastic/eui/issues/4736 is resolved.
+     */
+    function initTopInfluencersPanelCollapse() {
+      if (panelsInitialized.current || !collapseFn.current || !topInfluencersPanelRef.current)
+        return;
+
+      panelsInitialized.current = true;
+
+      if (anomalyExplorerPanelState.topInfluencers.isCollapsed) {
+        setTimeout(() => {
+          if (collapseFn.current) {
+            collapseFn.current();
+          }
+        }, 0);
+      }
+    },
+    [
+      collapseFn.current,
+      panelsInitialized,
+      topInfluencersPanelRef.current,
+      anomalyExplorerPanelState,
+    ]
+  );
+
+  const onPanelWidthChange = useCallback(
+    (newSizes) => {
+      setAnomalyExplorerPanelState({
+        mainPage: {
+          size: newSizes.mainPage,
+        },
+        topInfluencers: {
+          ...anomalyExplorerPanelState.topInfluencers,
+          size: newSizes.topInfluencers,
+        },
+      });
+    },
+    [anomalyExplorerPanelState]
+  );
+
+  const onToggleCollapsed = useCallback(() => {
+    panelsInitialized.current = true;
+
+    const isCurrentlyCollapsed = anomalyExplorerPanelState.topInfluencers.isCollapsed;
+
+    if (isCurrentlyCollapsed) {
+      setAnomalyExplorerPanelState({
+        mainPage: {
+          size: 80,
+        },
+        topInfluencers: {
+          size: 20,
+          isCollapsed: !isCurrentlyCollapsed,
+        },
+      });
+      return;
+    }
+
+    setAnomalyExplorerPanelState({
+      mainPage: anomalyExplorerPanelState.mainPage,
+      topInfluencers: {
+        ...anomalyExplorerPanelState.topInfluencers,
+        isCollapsed: !isCurrentlyCollapsed,
+      },
+    });
+  }, [anomalyExplorerPanelState]);
+
   const { displayWarningToast, displayDangerToast } = useToastNotificationService();
   const { anomalyTimelineStateService, anomalyExplorerCommonStateService, chartsStateService } =
     useAnomalyExplorerContext();
@@ -327,225 +434,264 @@ export const Explorer: FC<ExplorerUIProps> = ({
       </ExplorerPage>
     );
   }
-  const mainColumnWidthClassName = noInfluencersConfigured === true ? 'col-xs-12' : 'col-xs-10';
-  const mainColumnClasses = `column ${mainColumnWidthClassName}`;
 
   const bounds = timefilter.getActiveBounds();
   const selectedJobIds = Array.isArray(selectedJobs) ? selectedJobs.map((job) => job.id) : [];
 
-  return (
-    <ExplorerPage
-      jobSelectorProps={jobSelectorProps}
-      noInfluencersConfigured={noInfluencersConfigured}
-      influencers={influencers}
-      filterActive={filterActive}
-      filterPlaceHolder={filterPlaceHolder}
-      indexPattern={indexPattern as DataView}
-      queryString={queryString}
-      updateLanguage={updateLanguage}
-    >
-      <div className="results-container">
-        {noInfluencersConfigured && (
-          <div className="no-influencers-warning">
-            <EuiIconTip
-              content={i18n.translate('xpack.ml.explorer.noConfiguredInfluencersTooltip', {
-                defaultMessage:
-                  'The Top Influencers list is hidden because no influencers have been configured for the selected jobs.',
-              })}
-              position="right"
-              type="iInCircle"
+  const mainPanelContent = (
+    <div>
+      {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(', '),
+              }}
             />
-          </div>
-        )}
-
-        {noInfluencersConfigured === false && (
-          <div className="column col-xs-2" data-test-subj="mlAnomalyExplorerInfluencerList">
-            <EuiSpacer size={'s'} />
-            <EuiTitle className="panel-title">
-              <h2>
-                <FormattedMessage
-                  id="xpack.ml.explorer.topInfuencersTitle"
-                  defaultMessage="Top influencers"
-                />
-                <EuiIconTip
-                  content={
+          }
+        />
+      )}
+
+      <AnomalyTimeline explorerState={explorerState} />
+
+      <EuiSpacer size="m" />
+
+      {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" />
+        </>
+      )}
+      {loading === false && tableData.anomalies?.length ? (
+        <AnomaliesMap anomalies={tableData.anomalies} jobIds={selectedJobIds} />
+      ) : null}
+      {annotationsCnt > 0 && (
+        <>
+          <EuiPanel
+            data-test-subj="mlAnomalyExplorerAnnotationsPanel loaded"
+            hasBorder
+            hasShadow={false}
+          >
+            <EuiAccordion
+              id={htmlIdGen()}
+              buttonContent={
+                <EuiTitle
+                  className="panel-title"
+                  data-test-subj="mlAnomalyExplorerAnnotationsPanelButton"
+                >
+                  <h2>
                     <FormattedMessage
-                      id="xpack.ml.explorer.topInfluencersTooltip"
-                      defaultMessage="View the relative impact of the top influencers in the selected time period and add them as filters on the results. Each influencer has a maximum anomaly score between 0-100 and a total anomaly score for that period."
+                      id="xpack.ml.explorer.annotationsTitle"
+                      defaultMessage="Annotations {badge}"
+                      values={{
+                        badge,
+                      }}
                     />
-                  }
-                  position="right"
-                />
-              </h2>
-            </EuiTitle>
-            {loading ? (
-              <EuiLoadingContent lines={10} />
-            ) : (
-              <InfluencersList influencers={influencers} influencerFilter={applyFilter} />
-            )}
-          </div>
-        )}
-
-        <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(', '),
-                  }}
-                />
+                  </h2>
+                </EuiTitle>
               }
-            />
-          )}
-
-          <AnomalyTimeline explorerState={explorerState} />
-
+            >
+              <>
+                <AnnotationsTable
+                  jobIds={selectedJobIds}
+                  annotations={annotationsData}
+                  drillDown={true}
+                  numberBadge={false}
+                />
+              </>
+            </EuiAccordion>
+          </EuiPanel>
+          <AnnotationFlyout />
           <EuiSpacer size="m" />
-
-          {annotationsError !== undefined && (
-            <>
-              <EuiTitle
-                className="panel-title"
-                data-test-subj="mlAnomalyExplorerAnnotationsPanel error"
-              >
+        </>
+      )}
+      {loading === false && (
+        <EuiPanel hasBorder hasShadow={false}>
+          <EuiFlexGroup direction="row" gutterSize="m" responsive={false} alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiTitle className="panel-title">
                 <h2>
                   <FormattedMessage
-                    id="xpack.ml.explorer.annotationsErrorTitle"
-                    defaultMessage="Annotations"
+                    id="xpack.ml.explorer.anomaliesTitle"
+                    defaultMessage="Anomalies"
                   />
                 </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" />
-            </>
-          )}
-          {loading === false && tableData.anomalies?.length ? (
-            <AnomaliesMap anomalies={tableData.anomalies} jobIds={selectedJobIds} />
-          ) : null}
-          {annotationsCnt > 0 && (
-            <>
-              <EuiPanel
-                data-test-subj="mlAnomalyExplorerAnnotationsPanel loaded"
-                hasBorder
-                hasShadow={false}
-              >
-                <EuiAccordion
-                  id={htmlIdGen()}
-                  buttonContent={
-                    <EuiTitle
-                      className="panel-title"
-                      data-test-subj="mlAnomalyExplorerAnnotationsPanelButton"
-                    >
-                      <h2>
-                        <FormattedMessage
-                          id="xpack.ml.explorer.annotationsTitle"
-                          defaultMessage="Annotations {badge}"
-                          values={{
-                            badge,
-                          }}
-                        />
-                      </h2>
-                    </EuiTitle>
-                  }
-                >
-                  <>
-                    <AnnotationsTable
-                      jobIds={selectedJobIds}
-                      annotations={annotationsData}
-                      drillDown={true}
-                      numberBadge={false}
-                    />
-                  </>
-                </EuiAccordion>
-              </EuiPanel>
-              <AnnotationFlyout />
-              <EuiSpacer size="m" />
-            </>
-          )}
-          {loading === false && (
-            <EuiPanel hasBorder hasShadow={false}>
-              <EuiFlexGroup direction="row" gutterSize="m" responsive={false} alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <EuiTitle className="panel-title">
-                    <h2>
-                      <FormattedMessage
-                        id="xpack.ml.explorer.anomaliesTitle"
-                        defaultMessage="Anomalies"
-                      />
-                    </h2>
-                  </EuiTitle>
-                </EuiFlexItem>
-
-                <EuiFlexItem grow={false} style={{ marginLeft: 'auto', alignSelf: 'baseline' }}>
-                  <AnomalyContextMenu
-                    selectedJobs={selectedJobs!}
-                    selectedCells={selectedCells}
-                    bounds={bounds}
-                    interval={
-                      swimLaneBucketInterval ? swimLaneBucketInterval.asSeconds() : undefined
-                    }
-                    chartsCount={chartsData.seriesToPlot.length}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-
-              <EuiFlexGroup direction="row" gutterSize="l" responsive={true} alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <SelectSeverity />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <SelectInterval />
-                </EuiFlexItem>
-                {chartsData.seriesToPlot.length > 0 && selectedCells !== undefined && (
-                  <EuiFlexItem grow={false}>
-                    <CheckboxShowCharts />
-                  </EuiFlexItem>
-                )}
-              </EuiFlexGroup>
-
-              <EuiSpacer size="m" />
-
-              <div className="euiText explorer-charts">
-                {showCharts ? (
-                  <ExplorerChartsContainer
-                    {...{
-                      ...chartsData,
-                      severity,
-                      timefilter,
-                      mlLocator,
-                      timeBuckets,
-                      onSelectEntity: applyFilter,
-                      chartsService,
-                    }}
-                  />
-                ) : null}
-              </div>
+            </EuiFlexItem>
 
-              <AnomaliesTable
+            <EuiFlexItem grow={false} style={{ marginLeft: 'auto', alignSelf: 'baseline' }}>
+              <AnomalyContextMenu
+                selectedJobs={selectedJobs!}
+                selectedCells={selectedCells}
                 bounds={bounds}
-                tableData={tableData}
-                influencerFilter={applyFilter}
+                interval={swimLaneBucketInterval ? swimLaneBucketInterval.asSeconds() : undefined}
+                chartsCount={chartsData.seriesToPlot.length}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiFlexGroup direction="row" gutterSize="l" responsive={true} alignItems="center">
+            <EuiFlexItem grow={false}>
+              <SelectSeverity />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <SelectInterval />
+            </EuiFlexItem>
+            {chartsData.seriesToPlot.length > 0 && selectedCells !== undefined && (
+              <EuiFlexItem grow={false}>
+                <CheckboxShowCharts />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
+
+          <EuiSpacer size="m" />
+
+          <div className="euiText explorer-charts">
+            {showCharts ? (
+              <ExplorerChartsContainer
+                {...{
+                  ...chartsData,
+                  severity,
+                  timefilter,
+                  mlLocator,
+                  timeBuckets,
+                  onSelectEntity: applyFilter,
+                  chartsService,
+                }}
+              />
+            ) : null}
+          </div>
+
+          <AnomaliesTable bounds={bounds} tableData={tableData} influencerFilter={applyFilter} />
+        </EuiPanel>
+      )}
+    </div>
+  );
+
+  return (
+    <ExplorerPage
+      jobSelectorProps={jobSelectorProps}
+      noInfluencersConfigured={noInfluencersConfigured}
+      influencers={influencers}
+      filterActive={filterActive}
+      filterPlaceHolder={filterPlaceHolder}
+      indexPattern={indexPattern as DataView}
+      queryString={queryString}
+      updateLanguage={updateLanguage}
+    >
+      {noInfluencersConfigured ? (
+        <EuiFlexGroup gutterSize={'s'}>
+          <EuiFlexItem grow={false}>
+            <div className="no-influencers-warning">
+              <EuiIconTip
+                content={i18n.translate('xpack.ml.explorer.noConfiguredInfluencersTooltip', {
+                  defaultMessage:
+                    'The Top Influencers list is hidden because no influencers have been configured for the selected jobs.',
+                })}
+                position="right"
+                type="iInCircle"
               />
-            </EuiPanel>
-          )}
+            </div>
+          </EuiFlexItem>
+          <EuiFlexItem>{mainPanelContent}</EuiFlexItem>
+        </EuiFlexGroup>
+      ) : (
+        <div>
+          <EuiSpacer size={'s'} />
+          <EuiResizableContainer
+            direction={isMobile ? 'vertical' : 'horizontal'}
+            onPanelWidthChange={onPanelWidthChange}
+          >
+            {(EuiResizablePanel, EuiResizableButton, actions) => {
+              collapseFn.current = () =>
+                actions.togglePanel!('topInfluencers', { direction: 'left' });
+
+              return (
+                <>
+                  <EuiResizablePanel
+                    panelRef={topInfluencersPanelRef}
+                    id={'topInfluencers'}
+                    mode={[
+                      'collapsible',
+                      {
+                        'data-test-subj': 'mlTopInfluencersToggle',
+                        position: 'top',
+                      },
+                    ]}
+                    minSize={'200px'}
+                    initialSize={20}
+                    paddingSize={'s'}
+                    onToggleCollapsed={onToggleCollapsed}
+                  >
+                    <div data-test-subj="mlAnomalyExplorerInfluencerList">
+                      <EuiSpacer size={'s'} />
+                      <EuiTitle className="panel-title">
+                        <h2>
+                          <FormattedMessage
+                            id="xpack.ml.explorer.topInfuencersTitle"
+                            defaultMessage="Top influencers"
+                          />
+                          <EuiIconTip
+                            content={
+                              <FormattedMessage
+                                id="xpack.ml.explorer.topInfluencersTooltip"
+                                defaultMessage="View the relative impact of the top influencers in the selected time period and add them as filters on the results. Each influencer has a maximum anomaly score between 0-100 and a total anomaly score for that period."
+                              />
+                            }
+                            position="right"
+                          />
+                        </h2>
+                      </EuiTitle>
+                      {loading ? (
+                        <EuiLoadingContent lines={10} />
+                      ) : (
+                        <InfluencersList influencers={influencers} influencerFilter={applyFilter} />
+                      )}
+                    </div>
+                  </EuiResizablePanel>
+
+                  <EuiResizableButton />
+
+                  <EuiResizablePanel
+                    id="mainPage"
+                    mode="main"
+                    minSize={'70%'}
+                    initialSize={80}
+                    paddingSize={'s'}
+                  >
+                    {mainPanelContent}
+                  </EuiResizablePanel>
+                </>
+              );
+            }}
+          </EuiResizableContainer>
         </div>
-      </div>
+      )}
     </ExplorerPage>
   );
 };
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
index aaad9c35d740f..c5d0600b9e577 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
@@ -9,18 +9,18 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-// @ts-ignore
+import type { TimefilterContract } from '@kbn/data-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+// @ts-expect-error
 import { ExplorerChartsContainer } from './explorer_charts_container';
 import {
   SelectSeverityUI,
   TableSeverity,
 } from '../../components/controls/select_severity/select_severity';
 import type { TimeBuckets } from '../../util/time_buckets';
-import type { TimefilterContract } from '../../../../../../../src/plugins/data/public';
 import type { EntityFieldOperation } from '../../../../common/util/anomaly_utils';
 import type { ExplorerChartsData } from './explorer_charts_container_service';
 import type { MlLocator } from '../../../../common/types/locator';
-import { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
 
 interface ExplorerAnomaliesContainerProps {
   id: string;
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx
index e644a8b91e254..eac522e9e4f99 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_embedded_map.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { useState, useEffect } from 'react';
+import { LayerDescriptor } from '@kbn/maps-plugin/common';
 import { Dictionary } from '../../../../common/types/common';
-import { LayerDescriptor } from '../../../../../maps/common';
 import { getMLAnomaliesActualLayer, getMLAnomaliesTypicalLayer } from './map_config';
 import { MlEmbeddedMapComponent } from '../../components/ml_embedded_map';
 interface Props {
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 13800536f2fae..ddaaa55e7a3a4 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
@@ -33,17 +33,17 @@ import { SEARCH_QUERY_LANGUAGE } from '../../../../common/constants/search';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { MlTooltipComponent } from '../../components/chart_tooltip';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { useMlKibana } from '../../contexts/kibana';
 import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
 import { AnomalySource } from '../../../maps/anomaly_source';
 import { CUSTOM_COLOR_RAMP } from '../../../maps/anomaly_layer_wizard_factory';
-import { LAYER_TYPE, APP_ID as MAPS_APP_ID } from '../../../../../maps/common';
-import { MAPS_APP_LOCATOR } from '../../../../../maps/public';
+import { LAYER_TYPE, APP_ID as MAPS_APP_ID } from '@kbn/maps-plugin/common';
+import { MAPS_APP_LOCATOR } from '@kbn/maps-plugin/public';
 import { ExplorerChartsErrorCallOuts } from './explorer_charts_error_callouts';
 import { addItemToRecentlyAccessed } from '../../util/recently_accessed';
 import { EmbeddedMapComponentWrapper } from './explorer_chart_embedded_map';
-import { useActiveCursor } from '../../../../../../../src/plugins/charts/public';
+import { useActiveCursor } from '@kbn/charts-plugin/public';
 import { ML_ANOMALY_LAYERS } from '../../../maps/util';
 import { Chart, Settings } from '@elastic/charts';
 import useObservable from 'react-use/lib/useObservable';
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
index 0d324a83e27ad..382e41d233458 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_charts_container.test.js
@@ -31,7 +31,7 @@ jest.mock('../../services/job_service', () => ({
   },
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts b/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
index 51b9732aebdd0..e544f65c09188 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '../../../../../maps/common';
+import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '@kbn/maps-plugin/common';
 import { SEVERITY_COLOR_RAMP } from '../../../../common';
 import { AnomaliesTableData } from '../explorer_utils';
 
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts b/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts
index 1700b85e62b68..d2c7c3f1fe2d2 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts
@@ -12,6 +12,7 @@
 import { get, union, uniq } from 'lodash';
 import moment from 'moment-timezone';
 
+import { lastValueFrom } from 'rxjs';
 import {
   ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE,
   ANOMALIES_TABLE_DEFAULT_QUERY_SIZE,
@@ -323,14 +324,14 @@ export function loadOverallAnnotations(
   const timeRange = getSelectionTimeRange(undefined, bounds);
 
   return new Promise((resolve) => {
-    ml.annotations
-      .getAnnotations$({
+    lastValueFrom(
+      ml.annotations.getAnnotations$({
         jobIds,
         earliestMs: timeRange.earliestMs,
         latestMs: timeRange.latestMs,
         maxAnnotations: ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE,
       })
-      .toPromise()
+    )
       .then((resp) => {
         if (resp.error !== undefined || resp.annotations === undefined) {
           const errorMessage = extractErrorMessage(resp.error);
@@ -378,14 +379,14 @@ export function loadAnnotationsTableData(
   const timeRange = getSelectionTimeRange(selectedCells, bounds);
 
   return new Promise((resolve) => {
-    ml.annotations
-      .getAnnotations$({
+    lastValueFrom(
+      ml.annotations.getAnnotations$({
         jobIds,
         earliestMs: timeRange.earliestMs,
         latestMs: timeRange.latestMs,
         maxAnnotations: ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE,
       })
-      .toPromise()
+    )
       .then((resp) => {
         if (resp.error !== undefined || resp.annotations === undefined) {
           const errorMessage = extractErrorMessage(resp.error);
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 c9a09ad5e310d..ee773cdfa24bd 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
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../../../common/constants/index_patterns';
 import {
   getDefaultChartsData,
@@ -12,7 +13,6 @@ import {
 } from '../../explorer_charts/explorer_charts_container_service';
 import { AnomaliesTableData, ExplorerJob } from '../../explorer_utils';
 import { AnnotationsTable } from '../../../../../common/types/annotations';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import type { InfluencerValueData } from '../../../components/influencers_list/influencers_list';
 
 export interface ExplorerState {
diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx
index c8ab280d465e0..91cfac98513e0 100644
--- a/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx
@@ -68,7 +68,7 @@ export const SwimlaneAnnotationContainer: FC<SwimlaneAnnotationContainerProps> =
         )
         .attr('x', Y_AXIS_LABEL_WIDTH - Y_AXIS_LABEL_PADDING)
         .attr('y', ANNOTATION_CONTAINER_HEIGHT / 2)
-        .attr('alignment-baseline', 'middle')
+        .attr('dominant-baseline', 'middle')
         .style('fill', euiTheme.euiTextSubduedColor)
         .style('font-size', euiTheme.euiFontSizeXS);
 
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
index 8fb4c43d77207..18ab8305a1d61 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
@@ -9,14 +9,14 @@
 import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { shallow } from 'enzyme';
 
-jest.mock('../../../services/job_service.js', () => 'mlJobService');
+jest.mock('../../../services/job_service', () => 'mlJobService');
 
 import React from 'react';
 
 import { CustomUrlEditor } from './editor';
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { CustomUrlSettings } from './utils';
-import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 
 function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: UrlConfig) => void) {
   const savedCustomUrls = [
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
index cfe82a9f01880..28e44965c34ba 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
@@ -24,12 +24,12 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { isValidCustomUrlSettingsTimeRange } from './utils';
 import { isValidLabel } from '../../../util/custom_url_utils';
 
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
-import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
 
 function getLinkToOptions() {
   return [
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
index 1c7978a54b2b0..c0005b795070c 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { Job } from '../../../../../common/types/anomaly_detection_jobs';
 import { TimeRangeType } from './constants';
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
index 3ede5cf813f44..4fa5cdcb7c9f7 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_job_flyout.js
@@ -31,7 +31,7 @@ import { loadFullJob } from '../utils';
 import { validateModelMemoryLimit, validateGroupNames, isValidCustomUrls } from '../validate_job';
 import { toastNotificationServiceProvider } from '../../../../services/toast_notification_service';
 import { ml } from '../../../../services/ml_api_service';
-import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { collapseLiteralStrings } from '../../../../../../shared_imports';
 import { DATAFEED_STATE, JOB_STATE } from '../../../../../../common/constants/states';
 import { isManagedJob } from '../../../jobs_utils';
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
index 9e9f112cee25d..fff406bbf726d 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataViewListItem } from 'src/plugins/data_views/common';
+import type { DataViewListItem } from '@kbn/data-views-plugin/common';
 
 export function loadSavedDashboards(maxNumber: number): Promise<any[]>;
 export function loadDataViewListItems(): Promise<DataViewListItem[]>;
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
index 2c17251e15d8d..ff290a482ca23 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
@@ -23,6 +23,8 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { i18n } from '@kbn/i18n';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
+import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { CustomUrlEditor, CustomUrlList } from '../../../../components/custom_url_editor';
 import {
   getNewCustomUrlDefaults,
@@ -32,12 +34,10 @@ import {
   getTestUrl,
   CustomUrlSettings,
 } from '../../../../components/custom_url_editor/utils';
-import { withKibana } from '../../../../../../../../../../src/plugins/kibana_react/public';
 import { loadSavedDashboards, loadDataViewListItems } from '../edit_utils';
 import { openCustomUrlWindow } from '../../../../../util/custom_url_utils';
 import { Job } from '../../../../../../../common/types/anomaly_detection_jobs';
 import { UrlConfig } from '../../../../../../../common/types/custom_urls';
-import { DataViewListItem } from '../../../../../../../../../../src/plugins/data_views/common';
 import { MlKibanaReactContextValue } from '../../../../../contexts/kibana';
 
 const MAX_NUMBER_DASHBOARDS = 1000;
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 dd26d29fc0a82..593a09d377057 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
@@ -28,7 +28,7 @@ import {
   getLatestDataOrBucketTimestamp,
   isTimeSeriesViewJob,
 } from '../../../../../../../common/util/job_utils';
-import { withKibana } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { ML_APP_LOCATOR, ML_PAGES } from '../../../../../../../common/constants/locator';
 import { timeFormatter } from '../../../../../../../common/util/date_utils';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
index 114b1944dfa23..ac29cf3b0a1bf 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
@@ -21,7 +21,7 @@ import { ModelSnapshotTable } from '../../../../components/model_snapshots';
 import { ForecastsTable } from './forecasts_table';
 import { JobDetailsPane } from './job_details_pane';
 import { JobMessagesPane } from './job_messages_pane';
-import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 export class JobDetailsUI extends Component {
   constructor(props) {
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
index 0ef0f69b7736e..1f42028af22db 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/jobs.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 // @ts-ignore
-import { JobsListView } from './components/jobs_list_view/index';
+import { JobsListView } from './components/jobs_list_view';
 import { usePageUrlState } from '../../util/url_state';
 import { ML_PAGES } from '../../../../common/constants/locator';
 import { ListingPageUrlState } from '../../../../common/types/common';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
index 38313b89f1640..3214a9c91bda9 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
@@ -7,6 +7,7 @@
 
 import memoizeOne from 'memoize-one';
 import { isEqual } from 'lodash';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import { IndicesOptions } from '../../../../../../common/types/anomaly_detection_jobs';
 import {
@@ -19,7 +20,6 @@ import { ml } from '../../../../services/ml_api_service';
 import { mlResultsService } from '../../../../services/results_service';
 import { getCategoryFields as getCategoryFieldsOrig } from './searches';
 import { aggFieldPairsCanBeCharted } from '../job_creator/util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/common';
 
 type DetectorIndex = number;
 export interface LineChartPoint {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
index 9667465eb210d..57ff9527a6682 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/index_pattern_context.ts
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { DataView } from '@kbn/data-views-plugin/common';
 
 export type IndexPatternContextValue = DataView | null;
 export const IndexPatternContext = React.createContext<IndexPatternContextValue>(null);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
index fd1df5395ff84..ebf3a43626c99 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
@@ -6,6 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 
 import { JobCreator } from './job_creator';
@@ -21,7 +22,6 @@ import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
 import { isValidJson } from '../../../../../../common/util/validation_utils';
 import { ml } from '../../../../services/ml_api_service';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 
 export interface RichDetector {
   agg: Aggregation | null;
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 0f896fb1606cb..8a8db92dcc45f 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
@@ -6,7 +6,7 @@
  */
 
 import { isEqual } from 'lodash';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, mlCategory } from '../../../../../../common/types/fields';
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 8c5a45137a8a1..750669a794bd8 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
@@ -7,6 +7,8 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { cloneDeep } from 'lodash';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { UrlConfig } from '../../../../../../common/types/custom_urls';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
@@ -15,7 +17,6 @@ import {
   aggregations,
   mlOnlyAggregations,
 } from '../../../../../../common/constants/aggregation_types';
-import { ES_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/public';
 import {
   Job,
   Datafeed,
@@ -40,7 +41,6 @@ import { filterRuntimeMappings } from './util/filter_runtime_mappings';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { Calendar } from '../../../../../../common/types/calendars';
 import { mlCalendarService } from '../../../../services/calendar_service';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { getDatafeedAggregations } from '../../../../../../common/util/datafeed_utils';
 import { getFirstKeyInObject } from '../../../../../../common/util/object_utils';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
index 6af3df888514c..cf4b0be8711f3 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { SingleMetricJobCreator } from './single_metric_job_creator';
 import { MultiMetricJobCreator } from './multi_metric_job_creator';
 import { PopulationJobCreator } from './population_job_creator';
 import { AdvancedJobCreator } from './advanced_job_creator';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { CategorizationJobCreator } from './categorization_job_creator';
 import { RareJobCreator } from './rare_job_creator';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
index 12543f34003d5..1868a43fafef4 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import {
@@ -17,7 +18,6 @@ import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 
 export class MultiMetricJobCreator extends JobCreator {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
index 7f001ce334462..4090303187539 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import {
@@ -17,7 +18,6 @@ import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 
 export class PopulationJobCreator extends JobCreator {
   // a population job has one overall over (split) field, which is the same for all detectors
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
index 8973aa655b83d..9edc3ecdf4fff 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/rare_job_creator.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import { Field, SplitField, Aggregation } from '../../../../../../common/types/fields';
 import { Job, Datafeed, Detector } from '../../../../../../common/types/anomaly_detection_jobs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 import { ML_JOB_AGGREGATION } from '../../../../../../common/constants/aggregation_types';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
index 78b23f6c5d057..ec11b59ff6add 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { JobCreator } from './job_creator';
@@ -22,7 +23,6 @@ import {
 } from '../../../../../../common/constants/aggregation_types';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isSparseDataJob } from './util/general';
 
 export class SingleMetricJobCreator extends JobCreator {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
index 46315ac3b02d8..8f7b66b35ec4f 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
@@ -7,6 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { Job, Datafeed, Detector } from '../../../../../../../common/types/anomaly_detection_jobs';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities/new_job_capabilities_service';
 import { NavigateToPath } from '../../../../../contexts/kibana';
@@ -19,7 +20,6 @@ import {
   DOC_COUNT,
   _DOC_COUNT,
 } from '../../../../../../../common/constants/field_types';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
 import {
   EVENT_RATE_FIELD_ID,
   Field,
@@ -27,7 +27,7 @@ import {
   mlCategory,
 } from '../../../../../../../common/types/fields';
 import { mlJobService } from '../../../../../services/job_service';
-import { JobCreatorType } from '../index';
+import { JobCreatorType } from '..';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../../common/constants/new_job';
 
 const getFieldByIdFactory = (additionalFields: Field[]) => (id: string) => {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
index 6e65bde879379..7ea7d60706f84 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/categorization_examples_loader.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import { CategorizationJobCreator } from '../job_creator';
 import { ml } from '../../../../services/ml_api_service';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
index a01581f7526c5..772a385ed60a0 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, lastValueFrom } from 'rxjs';
 import { JobCreatorType, isMultiMetricJobCreator } from '../job_creator';
 import { mlResultsService, ModelPlotOutputResults } from '../../../../services/results_service';
 import { TimeBuckets } from '../../../../util/time_buckets';
@@ -155,8 +155,8 @@ export class ResultsLoader {
     if (agg === null) {
       return { [dtrIndex]: [emptyModelItem] };
     }
-    const resp = await mlResultsService
-      .getModelPlotOutput(
+    const resp = await lastValueFrom(
+      mlResultsService.getModelPlotOutput(
         this._jobCreator.jobId,
         dtrIndex,
         [],
@@ -165,7 +165,7 @@ export class ResultsLoader {
         this._chartInterval.getInterval().asMilliseconds(),
         agg.mlModelPlotAgg
       )
-      .toPromise();
+    );
 
     return this._createModel(resp, dtrIndex);
   }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
index a217ea0e06088..44f7eaa19193c 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/data_view/change_data_view.tsx
@@ -23,6 +23,7 @@ import {
   EuiModalBody,
 } from '@elastic/eui';
 
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { JobCreatorContext } from '../../../job_creator_context';
 import { AdvancedJobCreator } from '../../../../../common/job_creator';
 import { resetAdvancedJob } from '../../../../../common/job_creator/util/general';
@@ -33,7 +34,6 @@ import {
 import { extractErrorMessage } from '../../../../../../../../../common/util/errors';
 import type { DatafeedValidationResponse } from '../../../../../../../../../common/types/job_validation';
 
-import { SavedObjectFinderUi } from '../../../../../../../../../../../../src/plugins/saved_objects/public';
 import {
   useMlKibana,
   useMlApiContext,
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
index 189a4d471024a..b4c25e177fb63 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx
@@ -9,7 +9,7 @@ import React, { FC } from 'react';
 import { EuiPageBody, EuiPageContent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedObjectFinderUi } from '../../../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useMlKibana, useNavigateToPath } from '../../../../contexts/kibana';
 import { MlPageHeader } from '../../../../components/page_header';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
index d607fd2edf4ba..1b9a3cacc4102 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'kibana/public';
-import type { DataViewsContract } from '../../../../../../../../../src/plugins/data_views/public';
+import type { ApplicationStart } from '@kbn/core/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { mlJobService } from '../../../../services/job_service';
 import { Datafeed } from '../../../../../../common/types/anomaly_detection_jobs';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../common/constants/new_job';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
index 84679a7d4cef4..9767ea8a945f8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/common';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
 import { createSearchItems } from './new_job_utils';
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
index be4d8f16658e1..69bdfc666b06a 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
@@ -14,8 +14,8 @@ import {
   buildQueryFromFilters,
   DataViewBase,
 } from '@kbn/es-query';
-import { IUiSettingsClient } from 'kibana/public';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../common/constants/search';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
 import { getQueryFromSavedSearchObject } from '../../../util/index_utils';
diff --git a/x-pack/plugins/ml/public/application/license/check_license.tsx b/x-pack/plugins/ml/public/application/license/check_license.tsx
index 4574265736303..5427db87cfc65 100644
--- a/x-pack/plugins/ml/public/application/license/check_license.tsx
+++ b/x-pack/plugins/ml/public/application/license/check_license.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicensingPluginSetup } from '../../../../licensing/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import { MlLicense } from '../../../common/license';
 import { MlClientLicense } from './ml_client_license';
 
diff --git a/x-pack/plugins/ml/public/application/license/expired_warning.tsx b/x-pack/plugins/ml/public/application/license/expired_warning.tsx
index 87b69fc54fc28..5d3a8255a6fba 100644
--- a/x-pack/plugins/ml/public/application/license/expired_warning.tsx
+++ b/x-pack/plugins/ml/public/application/license/expired_warning.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiCallOut } from '@elastic/eui';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { getOverlays, getTheme } from '../util/dependency_cache';
 
 let expiredLicenseBannerId: string;
diff --git a/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts b/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts
index 07a948ed9a28c..02a38f152a3ea 100644
--- a/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts
+++ b/x-pack/plugins/ml/public/application/license/ml_client_license.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subject } from 'rxjs';
-import { ILicense } from '../../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 import { MlClientLicense } from './ml_client_license';
 
diff --git a/x-pack/plugins/ml/public/application/management/index.ts b/x-pack/plugins/ml/public/application/management/index.ts
index 9dd71f915e03e..86f7fa0ff92ab 100644
--- a/x-pack/plugins/ml/public/application/management/index.ts
+++ b/x-pack/plugins/ml/public/application/management/index.ts
@@ -7,13 +7,12 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { CoreSetup } from 'kibana/public';
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import type { MlStartDependencies } from '../../plugin';
 
-import type { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
-
 export function registerManagementSection(
   management: ManagementSetup,
   core: CoreSetup<MlStartDependencies>,
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
index fb12ca42a1ec7..54018c6f2023a 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import { EuiEmptyPrompt, EuiLink, EuiPageContent } from '@elastic/eui';
 
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index e107e5bfcdfe6..b3837ceedeb60 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState, Fragment, FC, useMemo, useCallback } from '
 import { Router } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 import {
   EuiButtonEmpty,
@@ -22,21 +22,24 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import { PLUGIN_ID } from '../../../../../../common/constants/app';
-import type { ManagementAppMountParams } from '../../../../../../../../../src/plugins/management/public';
-
-import { checkGetManagementMlJobsResolver } from '../../../../capabilities/check_capabilities';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart, SpacesContextProps } from '@kbn/spaces-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { PLUGIN_ID } from '../../../../../../common/constants/app';
+
+import { checkGetManagementMlJobsResolver } from '../../../../capabilities/check_capabilities';
 
 import { getDocLinks } from '../../../../util/dependency_cache';
 // @ts-ignore undeclared module
-import { JobsListView } from '../../../../jobs/jobs_list/components/jobs_list_view/index';
+import { JobsListView } from '../../../../jobs/jobs_list/components/jobs_list_view';
 import { DataFrameAnalyticsList } from '../../../../data_frame_analytics/pages/analytics_management/components/analytics_list';
 import {
   ModelsList,
@@ -44,8 +47,6 @@ import {
 } from '../../../../trained_models/models_management/models_list';
 import { AccessDeniedPage } from '../access_denied_page';
 import { InsufficientLicensePage } from '../insufficient_license_page';
-import type { SharePluginStart } from '../../../../../../../../../src/plugins/share/public';
-import type { SpacesPluginStart, SpacesContextProps } from '../../../../../../../spaces/public';
 import { JobSpacesSyncFlyout } from '../../../../components/job_spaces_sync';
 import { getDefaultAnomalyDetectionJobsListState } from '../../../../jobs/jobs_list/jobs';
 import { getMlGlobalServices } from '../../../../app';
@@ -53,7 +54,6 @@ import { ListingPageUrlState } from '../../../../../../common/types/common';
 import { getDefaultDFAListState } from '../../../../data_frame_analytics/pages/analytics_management/page';
 import { ExportJobsFlyout, ImportJobsFlyout } from '../../../../components/import_export_jobs';
 import type { JobType, MlSavedObjectType } from '../../../../../../common/types/saved_objects';
-import type { FieldFormatsStart } from '../../../../../../../../../src/plugins/field_formats/public';
 
 interface Tab extends EuiTabbedContentTab {
   'data-test-subj': string;
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
index 547f8c8b622ad..abac7e1c3187c 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
@@ -7,18 +7,18 @@
 
 import ReactDOM, { unmountComponentAtNode } from 'react-dom';
 import React from 'react';
-import type { CoreSetup, CoreStart } from 'kibana/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import type { ManagementAppMountParams } from '../../../../../../../src/plugins/management/public/';
+import type { CoreSetup, CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type { MlStartDependencies } from '../../../plugin';
 import { JobsListPage } from './components';
 import { getJobsListBreadcrumbs } from '../breadcrumbs';
 import { setDependencyCache, clearCache } from '../../util/dependency_cache';
 import './_index.scss';
-import type { SharePluginStart } from '../../../../../../../src/plugins/share/public';
-import type { SpacesPluginStart } from '../../../../../spaces/public';
-import type { FieldFormatsStart } from '../../../../../../../src/plugins/field_formats/public';
 
 const renderApp = (
   element: HTMLElement,
diff --git a/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts b/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts
index d47f144c1df0b..e563831d16376 100644
--- a/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts
+++ b/x-pack/plugins/ml/public/application/routing/breadcrumbs.ts
@@ -9,7 +9,7 @@ import { EuiBreadcrumb } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
 import { NavigateToPath } from '../contexts/kibana';
 
diff --git a/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx b/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx
index e97ab0fb830a5..f1674a12b77c6 100644
--- a/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx
+++ b/x-pack/plugins/ml/public/application/routing/ml_page_wrapper.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { FC } from 'react';
-import { TrackApplicationView } from '../../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 
 export const MlPageWrapper: FC<{ path: string }> = ({ path, children }) => {
   return <TrackApplicationView viewId={path}>{children}</TrackApplicationView>;
diff --git a/x-pack/plugins/ml/public/application/routing/resolvers.ts b/x-pack/plugins/ml/public/application/routing/resolvers.ts
index d95dfc9d2784f..e5a00437bfe66 100644
--- a/x-pack/plugins/ml/public/application/routing/resolvers.ts
+++ b/x-pack/plugins/ml/public/application/routing/resolvers.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { cacheDataViewsContract, loadSavedSearches } from '../util/index_utils';
 import { checkFullLicense } from '../license';
 import { checkGetJobsCapabilitiesResolver } from '../capabilities/check_capabilities';
 import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
 import { loadMlServerInfo } from '../services/ml_server_info';
 
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
-
 export interface Resolvers {
   [name: string]: () => Promise<any>;
 }
diff --git a/x-pack/plugins/ml/public/application/routing/router.tsx b/x-pack/plugins/ml/public/application/routing/router.tsx
index 08ea9ae5768c6..e4e7daa9ee0e1 100644
--- a/x-pack/plugins/ml/public/application/routing/router.tsx
+++ b/x-pack/plugins/ml/public/application/routing/router.tsx
@@ -14,8 +14,8 @@ import type {
   IUiSettingsClient,
   ChromeStart,
   ChromeBreadcrumb,
-} from 'kibana/public';
-import type { DataViewsContract } from 'src/plugins/data_views/public';
+} from '@kbn/core/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 import { EuiLoadingContent } from '@elastic/eui';
 import { MlContext, MlContextValue } from '../contexts/ml';
diff --git a/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts b/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
index 98deb8df7b60d..2ff7d4b024800 100644
--- a/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
@@ -7,11 +7,11 @@
 
 import { renderHook, act } from '@testing-library/react-hooks';
 
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 
 import { useCreateAndNavigateToMlLink } from '../contexts/kibana/use_create_url';
 import { useNotifications } from '../contexts/kibana';
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 
 import { useResolver } from './use_resolver';
 
diff --git a/x-pack/plugins/ml/public/application/routing/use_resolver.ts b/x-pack/plugins/ml/public/application/routing/use_resolver.ts
index 59d64f412cc80..26ecb494ab00d 100644
--- a/x-pack/plugins/ml/public/application/routing/use_resolver.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_resolver.ts
@@ -6,8 +6,9 @@
  */
 
 import { useEffect, useState } from 'react';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import {
   getDataViewById,
   getDataViewAndSavedSearch,
@@ -19,7 +20,6 @@ import { MlContextValue } from '../contexts/ml';
 import { useNotifications } from '../contexts/kibana';
 import { useCreateAndNavigateToMlLink } from '../contexts/kibana/use_create_url';
 import { ML_PAGES } from '../../../common/constants/locator';
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 
 /**
  * Hook to resolve route specific requirements
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
index ff89d29ca4dbb..25b1b6b0f14a7 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
@@ -7,12 +7,12 @@
 
 import { Observable, of } from 'rxjs';
 import { map as mapObservable } from 'rxjs/operators';
+import type { TimefilterContract, TimeRange } from '@kbn/data-plugin/public';
 import type { RecordForInfluencer } from './results_service/results_service';
 import type { EntityField } from '../../../common/util/anomaly_utils';
 import type { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import type { MlApiServices } from './ml_api_service';
 import type { MlResultsService } from './results_service';
-import type { TimefilterContract, TimeRange } from '../../../../../../src/plugins/data/public';
 import { isPopulatedObject } from '../../../common/util/object_utils';
 import { ExplorerChartsData } from '../explorer/explorer_charts/explorer_charts_container_service';
 import type { TimeRangeBounds } from '../util/time_buckets';
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
index e22f5680532ba..76000e93ef4eb 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'kibana/public';
-import {
-  TimefilterContract,
-  TimeRange,
-  UI_SETTINGS,
-} from '../../../../../../src/plugins/data/public';
+import { IUiSettingsClient } from '@kbn/core/public';
+import { TimefilterContract, TimeRange, UI_SETTINGS } from '@kbn/data-plugin/public';
 import {
   getBoundsRoundedToInterval,
   TimeBuckets,
diff --git a/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts b/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts
index 4cc8361be08cc..0fbe372dc24e1 100644
--- a/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts
+++ b/x-pack/plugins/ml/public/application/services/dashboard_service.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { dashboardServiceProvider } from './dashboard_service';
-import { savedObjectsServiceMock } from '../../../../../../src/core/public/mocks';
-import type { DashboardAppLocator } from '../../../../../../src/plugins/dashboard/public';
+import { savedObjectsServiceMock } from '@kbn/core/public/mocks';
+import type { DashboardAppLocator } from '@kbn/dashboard-plugin/public';
 
 describe('DashboardService', () => {
   const mockSavedObjectClient = savedObjectsServiceMock.createStartContract().client;
diff --git a/x-pack/plugins/ml/public/application/services/dashboard_service.ts b/x-pack/plugins/ml/public/application/services/dashboard_service.ts
index f8eb23eae9f4c..ff7b696551f41 100644
--- a/x-pack/plugins/ml/public/application/services/dashboard_service.ts
+++ b/x-pack/plugins/ml/public/application/services/dashboard_service.ts
@@ -5,14 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/public';
+import { SavedObjectsClientContract } from '@kbn/core/public';
 import { useMemo } from 'react';
-import {
-  DashboardSavedObject,
-  DashboardAppLocator,
-} from '../../../../../../src/plugins/dashboard/public';
+import { DashboardSavedObject, DashboardAppLocator } from '@kbn/dashboard-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { useMlKibana } from '../contexts/kibana';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
 
 export type DashboardService = ReturnType<typeof dashboardServiceProvider>;
 
diff --git a/x-pack/plugins/ml/public/application/services/field_format_service.ts b/x-pack/plugins/ml/public/application/services/field_format_service.ts
index ddcb447430a45..6ebd68f6fa8a0 100644
--- a/x-pack/plugins/ml/public/application/services/field_format_service.ts
+++ b/x-pack/plugins/ml/public/application/services/field_format_service.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/public';
 import { mlFunctionToESAggregation } from '../../../common/util/job_utils';
 import { getDataViewById, getDataViewIdFromName } from '../util/index_utils';
 import { mlJobService } from './job_service';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
 
 type FormatsByJobId = Record<string, any>;
 type IndexPatternIdsByJob = Record<string, any>;
diff --git a/x-pack/plugins/ml/public/application/services/http_service.ts b/x-pack/plugins/ml/public/application/services/http_service.ts
index 50e8bdfb5f485..839daf8b35f4e 100644
--- a/x-pack/plugins/ml/public/application/services/http_service.ts
+++ b/x-pack/plugins/ml/public/application/services/http_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { HttpFetchOptionsWithPath, HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptionsWithPath, HttpFetchOptions, HttpStart } from '@kbn/core/public';
 import { getHttp } from '../util/dependency_cache';
 
 function getResultHeaders(headers: HeadersInit) {
diff --git a/x-pack/plugins/ml/public/application/services/job_service.d.ts b/x-pack/plugins/ml/public/application/services/job_service.d.ts
index 3d49d03c1cde6..ad1cef009edba 100644
--- a/x-pack/plugins/ml/public/application/services/job_service.d.ts
+++ b/x-pack/plugins/ml/public/application/services/job_service.d.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { TimeRange } from 'src/plugins/data/common/query/timefilter/types';
+import { TimeRange } from '@kbn/data-plugin/common/query/timefilter/types';
 import { CombinedJob, Datafeed, Job } from '../../../common/types/anomaly_detection_jobs';
 import { Calendar } from '../../../common/types/calendars';
 
diff --git a/x-pack/plugins/ml/public/application/services/job_service.js b/x-pack/plugins/ml/public/application/services/job_service.js
index 4a6f7dbbcc3ff..ebb89b84dd638 100644
--- a/x-pack/plugins/ml/public/application/services/job_service.js
+++ b/x-pack/plugins/ml/public/application/services/job_service.js
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 
 import { ml } from './ml_api_service';
 
-import { getToastNotificationService } from '../services/toast_notification_service';
+import { getToastNotificationService } from './toast_notification_service';
 import { isWebUrl } from '../util/url_utils';
 import { TIME_FORMAT } from '../../../common/constants/time_format';
 import { parseInterval } from '../../../common/util/parse_interval';
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts
index 248b72344dc6b..9e0b1be60460b 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts
@@ -7,7 +7,7 @@
 
 import type { Annotation, GetAnnotationsResponse } from '../../../../common/types/annotations';
 import { http, http$ } from '../http_service';
-import { basePath } from './index';
+import { basePath } from '.';
 
 export const annotations = {
   getAnnotations$(obj: {
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
index 9c98716eab069..e4deb90d81073 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.ts
@@ -7,7 +7,7 @@
 
 import { http } from '../http_service';
 
-import { basePath } from './index';
+import { basePath } from '.';
 import type { DataFrameAnalyticsStats } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/common';
 import type { ValidateAnalyticsJobResponse } from '../../../../common/constants/validation';
 import type {
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts
index cf49031c665e7..e1884b0125858 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/filters.ts
@@ -10,7 +10,7 @@
 
 import { http } from '../http_service';
 
-import { basePath } from './index';
+import { basePath } from '.';
 import type { Filter, FilterStats } from '../../../../common/types/filters';
 
 export const filters = {
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
index 87f1a8eec2478..96001423e7ce7 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Observable } from 'rxjs';
-import type { HttpStart } from 'kibana/public';
+import type { HttpStart } from '@kbn/core/public';
 import { HttpService } from '../http_service';
 
 import { annotations } from './annotations';
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 ea84fcf72f2da..85f5917e2430b 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
@@ -6,8 +6,9 @@
  */
 
 // Service for obtaining data for the ML Results dashboards.
+import type { ESSearchRequest, ESSearchResponse } from '@kbn/core/types/elasticsearch';
 import { HttpService } from '../http_service';
-import { basePath } from './index';
+import { basePath } from '.';
 import { JOB_ID, PARTITION_FIELD_VALUE } from '../../../../common/constants/anomalies';
 import type {
   GetStoppedPartitionResult,
@@ -16,10 +17,6 @@ import type {
 import type { JobId } from '../../../../common/types/anomaly_detection_jobs';
 import type { PartitionFieldsDefinition } from '../results_service/result_service_rx';
 import type { PartitionFieldsConfig } from '../../../../common/types/storage';
-import type {
-  ESSearchRequest,
-  ESSearchResponse,
-} from '../../../../../../../src/core/types/elasticsearch';
 import type { MLAnomalyDoc } from '../../../../common/types/anomalies';
 import type { EntityField } from '../../../../common/util/anomaly_utils';
 import type { InfluencersFilterQuery } from '../../../../common/types/es_client';
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts
index 131244e7122cc..943de0b2df52e 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/saved_objects.ts
@@ -12,7 +12,7 @@ import { useMlKibana } from '../../contexts/kibana';
 
 import { HttpService } from '../http_service';
 
-import { basePath } from './index';
+import { basePath } from '.';
 import type {
   JobType,
   MlSavedObjectType,
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
index 738f5e1ace74a..aefdf0ce6e431 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
@@ -8,9 +8,9 @@
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { useMemo } from 'react';
-import { HttpFetchQuery } from 'kibana/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { HttpService } from '../http_service';
-import { basePath } from './index';
+import { basePath } from '.';
 import { useMlKibana } from '../../contexts/kibana';
 import type {
   TrainedModelConfigResponse,
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
index 8c05d5a418219..c42735388def2 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
+import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import { getDataViewAndSavedSearch } from '../../util/index_utils';
 import { JobType } from '../../../../common/types/saved_objects';
-import { newJobCapsServiceAnalytics } from '../new_job_capabilities/new_job_capabilities_service_analytics';
-import { newJobCapsService } from '../new_job_capabilities/new_job_capabilities_service';
+import { newJobCapsServiceAnalytics } from './new_job_capabilities_service_analytics';
+import { newJobCapsService } from './new_job_capabilities_service';
 
 export const ANOMALY_DETECTOR = 'anomaly-detector';
 export const DATA_FRAME_ANALYTICS = 'data-frame-analytics';
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
index 373de76d59457..3671b7a4ec585 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { newJobCapsService } from './new_job_capabilities_service';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 // there is magic happening here. starting the include name with `mock..`
 // ensures it can be lazily loaded by the jest.mock function below.
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts
index bbb9b141c7349..3d79672bcfed9 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
 import { Aggregation, Field, NewJobCaps } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 
 // create two lists, one removing text fields if there are keyword equivalents and vice versa
 export function processTextAndKeywordFields(fields: Field[]) {
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
index 210c409e8e281..7592a13bdcb76 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
@@ -4,6 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import {
   Field,
   Aggregation,
@@ -11,8 +13,6 @@ import {
   FieldId,
   EVENT_RATE_FIELD_ID,
 } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { ml } from '../ml_api_service';
 import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';
 
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
index 2786c14127ecd..d3b74dea3669d 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { Field, NewJobCapsResponse } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';
 import { ml } from '../ml_api_service';
 
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
index ec2a2a1077a7f..accd8dc9e8cd0 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { removeNestedFieldChildren } from './new_job_capabilities_service_analytics';
-import type { DataView } from '../../../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 // there is magic happening here. starting the include name with `mock..`
 // ensures it can be lazily loaded by the jest.mock function below.
diff --git a/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts b/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
index 22b47f9c28dd9..54dece80f22cf 100644
--- a/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
+++ b/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
@@ -19,7 +19,7 @@ import { Dictionary } from '../../../../common/types/common';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 import { Datafeed, JobId } from '../../../../common/types/anomaly_detection_jobs';
 import { MlApiServices } from '../ml_api_service';
-import { CriteriaField } from './index';
+import { CriteriaField } from '.';
 import { findAggField } from '../../../../common/util/validation_utils';
 import { getDatafeedAggregations } from '../../../../common/util/datafeed_utils';
 import { aggregationTypeTransform, EntityField } from '../../../../common/util/anomaly_utils';
diff --git a/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts b/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts
index 6b8646fec02b7..e967f3547b475 100644
--- a/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts
+++ b/x-pack/plugins/ml/public/application/services/toast_notification_service/toast_notification_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ToastInput, ToastOptions, ToastsStart } from 'kibana/public';
+import { ToastInput, ToastOptions, ToastsStart } from '@kbn/core/public';
 import { useMemo } from 'react';
 import { getToastNotifications } from '../../util/dependency_cache';
 import { useNotifications } from '../../contexts/kibana';
diff --git a/x-pack/plugins/ml/public/application/services/usage_collection.test.ts b/x-pack/plugins/ml/public/application/services/usage_collection.test.ts
index 2c16b028bd277..965d25f6d8322 100644
--- a/x-pack/plugins/ml/public/application/services/usage_collection.test.ts
+++ b/x-pack/plugins/ml/public/application/services/usage_collection.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 import { mlUsageCollectionProvider } from './usage_collection';
 
diff --git a/x-pack/plugins/ml/public/application/services/usage_collection.ts b/x-pack/plugins/ml/public/application/services/usage_collection.ts
index 3ec70b1995c0f..bc90a47a0d71e 100644
--- a/x-pack/plugins/ml/public/application/services/usage_collection.ts
+++ b/x-pack/plugins/ml/public/application/services/usage_collection.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { PLUGIN_ID } from '../../../common/constants/app';
 import { MlUsageEvent } from '../../../common/constants/usage_collection';
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js
index 842ee0e5e55f5..ce1dfe7cd970f 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.js
@@ -17,7 +17,7 @@ import { CalendarForm } from './calendar_form';
 import { NewEventModal } from './new_event_modal';
 import { ImportModal } from './import_modal';
 import { ml } from '../../../services/ml_api_service';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GLOBAL_CALENDAR } from '../../../../../common/constants/calendars';
 import { ML_PAGES } from '../../../../../common/constants/locator';
 import { getDocLinks } from '../../../util/dependency_cache';
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
index 73391f3cba87f..7a5cde3b36187 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/new_calendar.test.js
@@ -61,7 +61,7 @@ jest.mock('./utils', () => ({
       })
   ),
 }));
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js
index 60bdd4bd98e70..9864078aff698 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.js
@@ -17,7 +17,7 @@ import { mlNodesAvailable } from '../../../ml_nodes_check/check_ml_nodes';
 import { deleteCalendars } from './delete_calendars';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { getDocLinks } from '../../../util/dependency_cache';
 import { HelpMenu } from '../../../components/help_menu';
 
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
index ee1879a8a3c7a..bbfdf7ef6b0e4 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
@@ -50,7 +50,7 @@ jest.mock('react', () => {
   return { ...r, memo: (x) => x };
 });
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (node) => {
     return node;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/header.js b/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
index e8feeaaf65ac0..08f345b2de5a2 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/header.js
@@ -23,7 +23,7 @@ import {
   EuiButtonEmpty,
 } from '@elastic/eui';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { MlPageHeader } from '../../../components/page_header';
 
 function CalendarsListHeaderUI({ totalCount, refreshCalendars, kibana }) {
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js b/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
index da470441caa98..ba4d49a31135c 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
+++ b/x-pack/plugins/ml/public/application/settings/calendars/list/header.test.js
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { CalendarsListHeader } from './header';
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js
index 89d4daa07298a..1c6dc162f505f 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.js
@@ -25,7 +25,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { EditFilterListHeader } from './header';
 import { EditFilterListToolbar } from './toolbar';
 import { ItemsGrid } from '../../../components/items_grid';
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js
index c20b8485b7cd1..45c43e04daa68 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/edit/edit_filter_list.test.js
@@ -45,7 +45,7 @@ jest.mock('../../../services/ml_api_service', () => ({
   },
 }));
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (node) => {
     return node;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js
index 4d20ddd0f18b0..352856c6fcf51 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.js
@@ -14,7 +14,7 @@ import { PropTypes } from 'prop-types';
 
 import { i18n } from '@kbn/i18n';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 import { FilterListsHeader } from './header';
 import { FilterListsTable } from './table';
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js
index e6a69e971a864..5d0306564e312 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/filter_lists.test.js
@@ -26,7 +26,7 @@ jest.mock('../../../capabilities/check_capabilities', () => ({
   checkPermission: () => true,
 }));
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
   withKibana: (node) => {
     return node;
   },
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js b/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
index 0da6128b33ed3..63523a3670541 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/list/header.js
@@ -23,7 +23,7 @@ import {
   EuiButtonEmpty,
 } from '@elastic/eui';
 
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { MlPageHeader } from '../../../components/page_header';
 
 function FilterListsHeaderUI({ totalCount, refreshFilterLists, kibana }) {
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer.scss b/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer.scss
index 63cb8a57adba6..dc9178f7062f2 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer.scss
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer.scss
@@ -131,7 +131,6 @@
       stroke-width: 1px;
       stroke: $euiColorDarkShade;
       fill: $euiColorLightShade;
-      pointer-events: none;
     }
 
     .forecast {
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js
index f5d39bea56e72..72120de653b16 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/forecasting_modal/forecasting_modal.js
@@ -27,7 +27,7 @@ import { mlJobService } from '../../../services/job_service';
 import { mlForecastService } from '../../../services/forecast_service';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 export const FORECAST_DURATION_MAX_DAYS = 3650; // Max forecast duration allowed by analytics.
 
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx
index 6713a35269cbd..13d1527bda5b7 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx
@@ -9,6 +9,7 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect, EuiSelectProps } from '@elastic/eui';
 import { debounce } from 'lodash';
+import { lastValueFrom } from 'rxjs';
 import { EntityControl } from '../entity_control';
 import { mlJobService } from '../../../services/job_service';
 import { Detector, JobId } from '../../../../../common/types/anomaly_detection_jobs';
@@ -154,8 +155,8 @@ export const SeriesControls: FC<SeriesControlsProps> = ({
       partition_field: partitionField,
       over_field: overField,
       by_field: byField,
-    } = await mlResultsService
-      .fetchPartitionFieldsValues(
+    } = await lastValueFrom(
+      mlResultsService.fetchPartitionFieldsValues(
         selectedJob.job_id,
         searchTerm,
         [
@@ -168,7 +169,7 @@ export const SeriesControls: FC<SeriesControlsProps> = ({
         bounds.max.valueOf(),
         fieldsConfig
       )
-      .toPromise();
+    );
 
     const entityValuesUpdate: Record<string, any> = {};
     entityControls.forEach((entity) => {
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 9a95cf787c70d..8daf2e8f86891 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
@@ -667,7 +667,8 @@ class TimeseriesChartIntl extends Component {
             return d.lower;
           }
         }
-        return metricValue;
+        // metricValue is undefined for scheduled events when there is no source data.
+        return metricValue || 0;
       });
       yMax = d3.max(combinedData, (d) => {
         let metricValue = d.value;
@@ -675,7 +676,8 @@ class TimeseriesChartIntl extends Component {
           // If an anomaly coincides with a gap in the data, use the anomaly actual value.
           metricValue = Array.isArray(d.actual) ? d.actual[0] : d.actual;
         }
-        return d.upper !== undefined ? Math.max(metricValue, d.upper) : metricValue;
+        // metricValue is undefined for scheduled events when there is no source data.
+        return d.upper !== undefined ? Math.max(metricValue, d.upper) : metricValue || 0;
       });
 
       if (yMax === yMin) {
@@ -701,6 +703,7 @@ class TimeseriesChartIntl extends Component {
         // TODO needs revisiting to be a more robust normalization
         yMax += Math.abs(yMax - yMin) * ((maxLevel + 1) / 5);
       }
+
       this.focusYScale.domain([yMin, yMax]);
     } else {
       // Display 10 unlabelled ticks.
@@ -835,6 +838,10 @@ class TimeseriesChartIntl extends Component {
     scheduledEventMarkers
       .enter()
       .append('rect')
+      .on('mouseover', function (d) {
+        showFocusChartTooltip(d, this);
+      })
+      .on('mouseout', () => hideFocusChartTooltip())
       .attr('width', LINE_CHART_ANOMALY_RADIUS * 2)
       .attr('height', SCHEDULED_EVENT_SYMBOL_HEIGHT)
       .attr('class', 'scheduled-event-marker')
@@ -844,7 +851,10 @@ class TimeseriesChartIntl extends Component {
     // Update all markers to new positions.
     scheduledEventMarkers
       .attr('x', (d) => this.focusXScale(d.date) - LINE_CHART_ANOMALY_RADIUS)
-      .attr('y', (d) => this.focusYScale(d.value) - 3);
+      .attr('y', (d) => {
+        const focusYValue = this.focusYScale(d.value);
+        return isNaN(focusYValue) ? -focusHeight - 3 : focusYValue - 3;
+      });
 
     // Plot any forecast data in scope.
     if (focusForecastData !== undefined) {
@@ -1652,7 +1662,7 @@ class TimeseriesChartIntl extends Component {
           valueAccessor: 'prediction',
         });
       } else {
-        if (marker.value !== undefined) {
+        if (marker.value !== undefined && marker.value !== null) {
           tooltipData.push({
             label: i18n.translate(
               'xpack.ml.timeSeriesExplorer.timeSeriesChart.withoutAnomalyScore.valueLabel',
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/get_function_description.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/get_function_description.ts
index 4d53695c7ab04..f14fe1bba28a1 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/get_function_description.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/get_function_description.ts
@@ -6,6 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { lastValueFrom } from 'rxjs';
 import { mlResultsService } from '../services/results_service';
 import { ToastNotificationService } from '../services/toast_notification_service';
 import { getControlsForDetector } from './get_controls_for_detector';
@@ -54,9 +55,9 @@ export const getFunctionDescription = async (
   const criteriaFields = getCriteriaFields(selectedDetectorIndex, entityControls);
 
   try {
-    const resp = await mlResultsService
-      .getRecordsForCriteria([selectedJob.job_id], criteriaFields, 0, null, null, 1)
-      .toPromise();
+    const resp = await lastValueFrom(
+      mlResultsService.getRecordsForCriteria([selectedJob.job_id], criteriaFields, 0, null, null, 1)
+    );
     if (Array.isArray(resp?.records) && resp.records.length === 1) {
       // grabbing first record because records should have already been sorted by score desc
       const highestScoringAnomaly = resp.records[0];
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 7f7750b904d02..f6fa86c85cccb 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -32,7 +32,7 @@ import {
   EuiAccordion,
   EuiBadge,
 } from '@elastic/eui';
-import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
+import { ResizeChecker } from '@kbn/kibana-utils-plugin/public';
 import { TimeSeriesExplorerHelpPopover } from './timeseriesexplorer_help_popover';
 
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
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 d4548a43f3f2b..80169d8914682 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
@@ -148,7 +148,11 @@ export function getFocusData(
         modelPlotEnabled,
         functionDescription
       );
-      focusChartData = processScheduledEventsForChart(focusChartData, scheduledEvents);
+      focusChartData = processScheduledEventsForChart(
+        focusChartData,
+        scheduledEvents,
+        focusAggregationInterval
+      );
 
       const refreshFocusData: FocusData = {
         scheduledEvents,
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.d.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.d.ts
index 0ff84931a8ba3..11da0acb506f6 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.d.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.d.ts
@@ -21,7 +21,11 @@ export function processDataForFocusAnomalies(
   functionDescription: any
 ): any;
 
-export function processScheduledEventsForChart(chartData: any, scheduledEvents: any): any;
+export function processScheduledEventsForChart(
+  chartData: any,
+  scheduledEvents: any,
+  aggregationInterval: any
+): any;
 
 export function findNearestChartPointToTime(chartData: any, time: any): any;
 
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js
index 588d19cfe9a63..5a508cbf4bb41 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js
@@ -205,16 +205,44 @@ export function processDataForFocusAnomalies(
 
 // Adds a scheduledEvents property to any points in the chart data set
 // which correspond to times of scheduled events for the job.
-export function processScheduledEventsForChart(chartData, scheduledEvents) {
+export function processScheduledEventsForChart(chartData, scheduledEvents, aggregationInterval) {
   if (scheduledEvents !== undefined) {
+    const timesToAddPointsFor = [];
+
+    // Iterate through the scheduled events making sure we have a chart point for each event.
+    const intervalMs = aggregationInterval.asMilliseconds();
+    let lastChartDataPointTime = undefined;
+    if (chartData !== undefined && chartData.length > 0) {
+      lastChartDataPointTime = chartData[chartData.length - 1].date.getTime();
+    }
+
+    // In case there's no chart data/sparse data during these scheduled events
+    // ensure we add chart points at every aggregation interval for these scheduled events.
+    let sortRequired = false;
     each(scheduledEvents, (events, time) => {
-      const chartPoint = findNearestChartPointToTime(chartData, time);
-      if (chartPoint !== undefined) {
-        // Note if the scheduled event coincides with an absence of the underlying metric data,
-        // we don't worry about plotting the event.
-        chartPoint.scheduledEvents = events;
+      const exactChartPoint = findChartPointForScheduledEvent(chartData, +time);
+
+      if (exactChartPoint !== undefined) {
+        exactChartPoint.scheduledEvents = events;
+      } else {
+        const timeToAdd = Math.floor(time / intervalMs) * intervalMs;
+        if (timesToAddPointsFor.indexOf(timeToAdd) === -1 && timeToAdd !== lastChartDataPointTime) {
+          const pointToAdd = {
+            date: new Date(timeToAdd),
+            value: null,
+            scheduledEvents: events,
+          };
+
+          chartData.push(pointToAdd);
+          sortRequired = true;
+        }
       }
     });
+
+    // Sort chart data by time if extra points were added at the end of the array for scheduled events.
+    if (sortRequired === true) {
+      chartData.sort((a, b) => a.date.getTime() - b.date.getTime());
+    }
   }
 
   return chartData;
@@ -240,12 +268,12 @@ export function findNearestChartPointToTime(chartData, time) {
     // grab the current and previous items and compare the time differences
     let foundItem;
     for (let i = 0; i < chartData.length; i++) {
-      const itemTime = chartData[i].date.getTime();
+      const itemTime = chartData[i]?.date?.getTime();
       if (itemTime > time) {
         const item = chartData[i];
         const previousItem = chartData[i - 1];
 
-        const diff1 = Math.abs(time - previousItem.date.getTime());
+        const diff1 = Math.abs(time - previousItem?.date?.getTime());
         const diff2 = Math.abs(time - itemTime);
 
         // foundItem should be the item with a date closest to bucketTime
@@ -300,6 +328,22 @@ export function findChartPointForAnomalyTime(chartData, anomalyTime, aggregation
   return chartPoint;
 }
 
+export function findChartPointForScheduledEvent(chartData, eventTime) {
+  let chartPoint;
+  if (chartData === undefined) {
+    return chartPoint;
+  }
+
+  for (let i = 0; i < chartData.length; i++) {
+    if (chartData[i].date.getTime() === eventTime) {
+      chartPoint = chartData[i];
+      break;
+    }
+  }
+
+  return chartPoint;
+}
+
 export function calculateAggregationInterval(bounds, bucketsTarget, jobs, selectedJob) {
   // Aggregation interval used in queries should be a function of the time span of the chart
   // and the bucket span of the selected job(s).
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts
index 1195e085de795..24d44dc157032 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/validate_job_selection.ts
@@ -9,7 +9,7 @@ import { difference, without } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 
-import { ToastsStart } from 'kibana/public';
+import { ToastsStart } from '@kbn/core/public';
 import { MlJobWithTimeRange } from '../../../../common/types/anomaly_detection_jobs';
 
 import { mlJobService } from '../../services/job_service';
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx
index a50844bdac26f..8b868a088499d 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx
@@ -22,6 +22,7 @@ import {
 } from '@elastic/eui';
 import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import type { ModelItemFull } from './models_list';
 import { isDefined } from '../../../../common/types/guards';
 import { isPopulatedObject } from '../../../../common';
@@ -29,7 +30,6 @@ import { ModelPipelines } from './pipelines';
 import { AllocatedModels } from '../nodes_overview/allocated_models';
 import type { AllocatedModel } from '../../../../common/types/trained_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface ExpandedRowProps {
   item: ModelItemFull;
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx
index 30e110317148b..6a97131723229 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/force_stop_dialog.tsx
@@ -8,9 +8,9 @@
 import React, { FC } from 'react';
 import { EuiConfirmModal } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { OverlayStart, ThemeServiceStart } from 'kibana/public';
+import type { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import type { ModelItem } from './models_list';
-import { toMountPoint, wrapWithTheme } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface ForceStopModelConfirmDialogProps {
   model: ModelItem;
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx
index 0d3b071d5063e..063235e9db9fd 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/models_list.tsx
@@ -25,8 +25,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 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 { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { getAnalysisType } from '../../data_frame_analytics/common';
-import { ModelsTableToConfigMapping } from './index';
+import { ModelsTableToConfigMapping } from '.';
 import { ModelsBarStats, StatsBar } from '../../components/stats_bar';
 import { useMlKibana, useMlLocator, useNavigateToPath, useTimefilter } from '../../contexts/kibana';
 import { useTrainedModelsApiService } from '../../services/ml_api_service/trained_models';
@@ -47,7 +48,6 @@ import { isPopulatedObject } from '../../../../common';
 import { useTableSettings } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings';
 import { useToastNotificationService } from '../../services/toast_notification_service';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 import { useRefresh } from '../../routing/use_refresh';
 import { DEPLOYMENT_STATE, TRAINED_MODEL_TYPE } from '../../../../common/constants/trained_models';
 import { getUserConfirmationProvider } from './force_stop_dialog';
diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx
index e4d18a7f1b0c4..86284bd23796b 100644
--- a/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/models_management/pipelines/expanded_row.tsx
@@ -11,8 +11,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
 import { i18n } from '@kbn/i18n';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { useFieldFormatter } from '../../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../../src/plugins/field_formats/common';
 import { IngestStatsResponse } from './pipelines';
 import { HelpIcon } from '../../../components/help_icon';
 
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
index 79c2cbc1e4a42..e053a2a50819f 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/allocated_models.tsx
@@ -8,12 +8,12 @@ import React, { FC } from 'react';
 import { EuiBadge, EuiInMemoryTable, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import type {
   AllocatedModel,
   NodeDeploymentStatsResponse,
 } from '../../../../common/types/trained_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface AllocatedModelsProps {
   models: NodeDeploymentStatsResponse['allocated_models'];
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx
index b8920acde568e..4c96904862786 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/expanded_row.tsx
@@ -16,11 +16,11 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { cloneDeep } from 'lodash';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { NodeItem } from './nodes_list';
 import { useListItemsFormatter } from '../models_management/expanded_row';
 import { AllocatedModels } from './allocated_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface ExpandedRowProps {
   item: NodeItem;
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx
index e355bc26f7fa7..a9b37d5be1a6c 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/memory_preview_chart.tsx
@@ -19,10 +19,10 @@ import {
   AnnotationDomainType,
 } from '@elastic/charts';
 import { EuiIcon, euiPaletteGray } from '@elastic/eui';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { NodeDeploymentStatsResponse } from '../../../../common/types/trained_models';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
 import { useCurrentEuiTheme } from '../../components/color_range_legend';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 
 interface MemoryPreviewChartProps {
   memoryOverview: NodeDeploymentStatsResponse['memory_overview'];
diff --git a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
index 170d05a16b974..4455e9e2709a1 100644
--- a/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
+++ b/x-pack/plugins/ml/public/application/trained_models/nodes_overview/nodes_list.tsx
@@ -16,6 +16,7 @@ import {
 import { EuiBasicTableColumn } from '@elastic/eui/src/components/basic_table/basic_table';
 import { i18n } from '@kbn/i18n';
 import { cloneDeep } from 'lodash';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { ModelsBarStats, StatsBar } from '../../components/stats_bar';
 import { NodeDeploymentStatsResponse } from '../../../../common/types/trained_models';
 import { usePageUrlState } from '../../util/url_state';
@@ -27,7 +28,6 @@ import { MemoryPreviewChart } from './memory_preview_chart';
 import { useFieldFormatter } from '../../contexts/kibana/use_field_formatter';
 import { ListingPageUrlState } from '../../../../common/types/common';
 import { useToastNotificationService } from '../../services/toast_notification_service';
-import { FIELD_FORMAT_IDS } from '../../../../../../../src/plugins/field_formats/common';
 import { useRefresh } from '../../routing/use_refresh';
 
 export type NodeItem = NodeDeploymentStatsResponse;
diff --git a/x-pack/plugins/ml/public/application/util/chart_utils.test.js b/x-pack/plugins/ml/public/application/util/chart_utils.test.js
index 2c457b079542a..83c7b58afbefd 100644
--- a/x-pack/plugins/ml/public/application/util/chart_utils.test.js
+++ b/x-pack/plugins/ml/public/application/util/chart_utils.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import seriesConfig from '../explorer/explorer_charts/__mocks__/mock_series_config_filebeat';
+import seriesConfig from '../explorer/explorer_charts/__mocks__/mock_series_config_filebeat.json';
 
 jest.mock('./dependency_cache', () => {
   const dateMath = require('@kbn/datemath');
diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
index bba71a23f98c3..e2269524fe6e5 100644
--- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataPublicPluginSetup } from 'src/plugins/data/public';
+import type { DataPublicPluginSetup } from '@kbn/data-plugin/public';
 import type {
   IUiSettingsClient,
   ChromeStart,
@@ -19,14 +19,14 @@ import type {
   ThemeServiceStart,
   ChromeRecentlyAccessed,
   IBasePath,
-} from 'kibana/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { DashboardStart } from 'src/plugins/dashboard/public';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
-import type { SecurityPluginSetup } from '../../../../security/public';
-import type { MapsStartApi } from '../../../../maps/public';
-import type { DataVisualizerPluginStart } from '../../../../data_visualizer/public';
+} from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { DataViewsContract } from '@kbn/data-views-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { MapsStartApi } from '@kbn/maps-plugin/public';
+import type { DataVisualizerPluginStart } from '@kbn/data-visualizer-plugin/public';
 
 export interface DependencyCache {
   timefilter: DataPublicPluginSetup['query']['timefilter'] | null;
diff --git a/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts b/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
index 0c50dc9efa343..655f78c681c93 100644
--- a/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/util/field_types_utils.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
-import { DataViewField } from '../../../../../../src/plugins/data_views/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import {
   kbnTypeToMLJobType,
diff --git a/x-pack/plugins/ml/public/application/util/field_types_utils.ts b/x-pack/plugins/ml/public/application/util/field_types_utils.ts
index c02a1cbec56ec..e996f03ae3982 100644
--- a/x-pack/plugins/ml/public/application/util/field_types_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/field_types_utils.ts
@@ -6,10 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
-import { DataViewField } from '../../../../../../src/plugins/data_views/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 
 // convert kibana types to ML Job types
 // this is needed because kibana types only have string and not text and keyword.
diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts
index 503c20dfc5bdb..89b35624f11a9 100644
--- a/x-pack/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/index_utils.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Query } from '../../../../../../src/plugins/data/public';
-import type { DataView, DataViewsContract } from '../../../../../../src/plugins/data_views/public';
+import type { Query } from '@kbn/data-plugin/public';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
 import type { SavedSearchSavedObject } from '../../../common/types/kibana';
 import { getToastNotifications, getSavedObjectsClient } from './dependency_cache';
 
diff --git a/x-pack/plugins/ml/public/application/util/recently_accessed.ts b/x-pack/plugins/ml/public/application/util/recently_accessed.ts
index 4ab3b3d9a7327..ff995be1c4b82 100644
--- a/x-pack/plugins/ml/public/application/util/recently_accessed.ts
+++ b/x-pack/plugins/ml/public/application/util/recently_accessed.ts
@@ -9,7 +9,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { ChromeRecentlyAccessed } from 'kibana/public';
+import type { ChromeRecentlyAccessed } from '@kbn/core/public';
 import { getRecentlyAccessed } from './dependency_cache';
 
 export function addItemToRecentlyAccessed(
diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.d.ts b/x-pack/plugins/ml/public/application/util/time_buckets.d.ts
index 3ff9ae0d36e26..8d8618aa7c97b 100644
--- a/x-pack/plugins/ml/public/application/util/time_buckets.d.ts
+++ b/x-pack/plugins/ml/public/application/util/time_buckets.d.ts
@@ -6,7 +6,7 @@
  */
 
 import { Moment } from 'moment';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 
 export interface TimeRangeBounds {
   min?: Moment;
diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.js b/x-pack/plugins/ml/public/application/util/time_buckets.js
index 21a991ce0a190..432a97c08189f 100644
--- a/x-pack/plugins/ml/public/application/util/time_buckets.js
+++ b/x-pack/plugins/ml/public/application/util/time_buckets.js
@@ -12,8 +12,8 @@ import dateMath from '@kbn/datemath';
 import { timeBucketsCalcAutoIntervalProvider } from './calc_auto_interval';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { getFieldFormats, getUiSettings } from './dependency_cache';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
-import { FIELD_FORMAT_IDS } from '../../../../../../src/plugins/field_formats/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 
 const unitsDesc = dateMath.unitsDesc;
 
diff --git a/x-pack/plugins/ml/public/application/util/time_buckets.test.js b/x-pack/plugins/ml/public/application/util/time_buckets.test.js
index 7977e5a0286f5..edb2cf538ae37 100644
--- a/x-pack/plugins/ml/public/application/util/time_buckets.test.js
+++ b/x-pack/plugins/ml/public/application/util/time_buckets.test.js
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { TimeBuckets, getBoundsRoundedToInterval, calcEsInterval } from './time_buckets';
 
 describe('ML - time buckets', () => {
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
index 424c1df6497e2..137b9ec260b92 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx
@@ -7,14 +7,12 @@
 
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { Subject } from 'rxjs';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { Embeddable, IContainer } from '../../../../../../src/plugins/embeddable/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { EmbeddableAnomalyChartsContainer } from './embeddable_anomaly_charts_container_lazy';
 import type { JobId } from '../../../common/types/anomaly_detection_jobs';
 import type { MlDependencies } from '../../application/app';
@@ -24,7 +22,6 @@ import {
   AnomalyChartsEmbeddableOutput,
   AnomalyChartsServices,
 } from '..';
-import type { DataView } from '../../../../../../src/plugins/data_views/common';
 import { EmbeddableLoading } from '../common/components/embeddable_loading_fallback';
 export const getDefaultExplorerChartsPanelTitle = (jobIds: JobId[]) =>
   i18n.translate('xpack.ml.anomalyChartsEmbeddable.title', {
@@ -39,7 +36,7 @@ export class AnomalyChartsEmbeddable extends Embeddable<
   AnomalyChartsEmbeddableOutput
 > {
   private node?: HTMLElement;
-  private reload$ = new Subject();
+  private reload$ = new Subject<void>();
   public readonly type: string = ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE;
 
   constructor(
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts
index 40d9e54082c35..dd7408287cbf4 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { AnomalyChartsEmbeddableFactory } from './anomaly_charts_embeddable_factory';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { AnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
 import { AnomalyChartsEmbeddableInput } from '..';
 
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts
index b95c2b18128fe..e502d03bcd964 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable_factory.ts
@@ -7,13 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { StartServicesAccessor } from 'kibana/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
+import type { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { PLUGIN_ICON, PLUGIN_ID, ML_APP_NAME } from '../../../common/constants/app';
-import type {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
 import { HttpService } from '../../application/services/http_service';
 import type { MlPluginStart, MlStartDependencies } from '../../plugin';
 import type { MlDependencies } from '../../application/app';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx
index c4ac15ffdbe76..c65d46d88402e 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_setup_flyout.tsx
@@ -6,9 +6,10 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { lastValueFrom } from 'rxjs';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { VIEW_BY_JOB_LABEL } from '../../application/explorer/explorer_constants';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
 import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
 import { getDefaultExplorerChartsPanelTitle } from './anomaly_charts_embeddable';
 import { HttpService } from '../../application/services/http_service';
@@ -28,7 +29,7 @@ export async function resolveEmbeddableAnomalyChartsUserInput(
     try {
       const { jobIds } = await resolveJobSelection(coreStart, input?.jobIds);
       const title = input?.title ?? getDefaultExplorerChartsPanelTitle(jobIds);
-      const jobs = await anomalyDetectorService.getJobs$(jobIds).toPromise();
+      const jobs = await lastValueFrom(anomalyDetectorService.getJobs$(jobIds));
       const influencers = anomalyDetectorService.extractInfluencers(jobs);
       influencers.push(VIEW_BY_JOB_LABEL);
       const { theme$ } = coreStart.theme;
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx
index 9b38d67847388..5a22cb7809a8c 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.test.tsx
@@ -14,10 +14,10 @@ import {
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
 import { AnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import { MlDependencies } from '../../application/app';
-import { TriggerContract } from 'src/plugins/ui_actions/public/triggers';
+import { TriggerContract } from '@kbn/ui-actions-plugin/public/triggers';
 import { AnomalyChartsEmbeddableInput, AnomalyChartsServices } from '..';
 import { ExplorerAnomaliesContainer } from '../../application/explorer/explorer_charts/explorer_anomalies_container';
 import { createMlResultsServiceMock } from '../../application/services/ml_results_service';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
index e3f8fb3dcdeff..9f31f5777f9de 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
@@ -10,6 +10,7 @@ import { EuiCallOut, EuiLoadingChart, EuiResizeObserver, EuiText } from '@elasti
 import { Observable } from 'rxjs';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { throttle } from 'lodash';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import type { IAnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
 import type {
@@ -23,7 +24,6 @@ import { ExplorerAnomaliesContainer } from '../../application/explorer/explorer_
 import { ML_APP_LOCATOR } from '../../../common/constants/locator';
 import { optionValueToThreshold } from '../../application/components/controls/select_severity/select_severity';
 import { ANOMALY_THRESHOLD } from '../../../common';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { TimeBuckets } from '../../application/util/time_buckets';
 import { EXPLORER_ENTITY_FIELD_SELECTION_TRIGGER } from '../../ui_actions/triggers';
 import { MlLocatorParams } from '../../../common/types/locator';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts
index 6aa148b18ce0c..4231f08b00c45 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.test.ts
@@ -7,8 +7,9 @@
 
 import { renderHook } from '@testing-library/react-hooks';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
+import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { AnomalyChartsEmbeddableInput, AnomalyChartsServices } from '../types';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { MlStartDependencies } from '../../plugin';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import { EmbeddableAnomalyChartsContainerProps } from './embeddable_anomaly_charts_container';
@@ -114,57 +115,60 @@ describe('useAnomalyChartsInputResolver', () => {
     jest.clearAllMocks();
   });
 
-  test('should fetch jobs only when input job ids have been changed', async () => {
-    const { result } = renderHook(() =>
-      useAnomalyChartsInputResolver(
-        embeddableInput as Observable<AnomalyChartsEmbeddableInput>,
-        onInputChange,
-        refresh,
-        services,
-        1000,
-        0,
-        renderCallbacks
-      )
-    );
-
-    expect(result.current.chartsData).toBe(undefined);
-    expect(result.current.error).toBe(undefined);
-    expect(result.current.isLoading).toBe(true);
-    expect(renderCallbacks.onLoading).toHaveBeenCalledTimes(0);
-
-    jest.advanceTimersByTime(501);
-
-    expect(renderCallbacks.onLoading).toHaveBeenCalledTimes(1);
-
-    const explorerServices = services[2];
-
-    expect(explorerServices.anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(1);
-    expect(explorerServices.anomalyExplorerService.getAnomalyData$).toHaveBeenCalledTimes(1);
-
-    expect(renderCallbacks.onRenderComplete).toHaveBeenCalledTimes(1);
-
-    embeddableInput.next({
-      id: 'test-explorer-charts-embeddable',
-      jobIds: ['anotherJobId'],
-      filters: [],
-      query: { language: 'kuery', query: '' },
-      maxSeriesToPlot: 6,
-      timeRange: {
-        from: 'now-3y',
-        to: 'now',
-      },
-    });
-    jest.advanceTimersByTime(501);
+  test(
+    'should fetch jobs only when input job ids have been changed',
+    fakeSchedulers(async (advance) => {
+      const { result } = renderHook(() =>
+        useAnomalyChartsInputResolver(
+          embeddableInput as Observable<AnomalyChartsEmbeddableInput>,
+          onInputChange,
+          refresh,
+          services,
+          1000,
+          0,
+          renderCallbacks
+        )
+      );
+
+      expect(result.current.chartsData).toBe(undefined);
+      expect(result.current.error).toBe(undefined);
+      expect(result.current.isLoading).toBe(true);
+      expect(renderCallbacks.onLoading).toHaveBeenCalledTimes(0);
+
+      advance(501);
+
+      expect(renderCallbacks.onLoading).toHaveBeenCalledTimes(1);
+
+      const explorerServices = services[2];
+
+      expect(explorerServices.anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(1);
+      expect(explorerServices.anomalyExplorerService.getAnomalyData$).toHaveBeenCalledTimes(1);
+
+      expect(renderCallbacks.onRenderComplete).toHaveBeenCalledTimes(1);
+
+      embeddableInput.next({
+        id: 'test-explorer-charts-embeddable',
+        jobIds: ['anotherJobId'],
+        filters: [],
+        query: { language: 'kuery', query: '' },
+        maxSeriesToPlot: 6,
+        timeRange: {
+          from: 'now-3y',
+          to: 'now',
+        },
+      });
+      advance(501);
 
-    expect(renderCallbacks.onLoading).toHaveBeenCalledTimes(2);
+      expect(renderCallbacks.onLoading).toHaveBeenCalledTimes(2);
 
-    expect(explorerServices.anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(2);
-    expect(explorerServices.anomalyExplorerService.getAnomalyData$).toHaveBeenCalledTimes(2);
+      expect(explorerServices.anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(2);
+      expect(explorerServices.anomalyExplorerService.getAnomalyData$).toHaveBeenCalledTimes(2);
 
-    expect(renderCallbacks.onRenderComplete).toHaveBeenCalledTimes(2);
+      expect(renderCallbacks.onRenderComplete).toHaveBeenCalledTimes(2);
 
-    expect(renderCallbacks.onError).toHaveBeenCalledTimes(0);
-  });
+      expect(renderCallbacks.onError).toHaveBeenCalledTimes(0);
+    })
+  );
 
   test.skip('should not complete the observable on error', async () => {
     const { result } = renderHook(() =>
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
index c6dc3ec41ff9e..9d85f4af01f53 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
@@ -8,7 +8,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import { combineLatest, Observable, of, Subject } from 'rxjs';
 import { catchError, debounceTime, skipWhile, startWith, switchMap, tap } from 'rxjs/operators';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { MlStartDependencies } from '../../plugin';
 import {
   AppStateSelectedCells,
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
index e23869cb809b3..bb239868aed77 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
@@ -7,14 +7,11 @@
 
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { Subject } from 'rxjs';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { Embeddable, IContainer } from '../../../../../../src/plugins/embeddable/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import { EmbeddableSwimLaneContainer } from './embeddable_swim_lane_container_lazy';
 import type { JobId } from '../../../common/types/anomaly_detection_jobs';
 import type { MlDependencies } from '../../application/app';
@@ -39,7 +36,7 @@ export class AnomalySwimlaneEmbeddable extends Embeddable<
   AnomalySwimlaneEmbeddableOutput
 > {
   private node?: HTMLElement;
-  private reload$ = new Subject();
+  private reload$ = new Subject<void>();
   public readonly type: string = ANOMALY_SWIMLANE_EMBEDDABLE_TYPE;
 
   constructor(
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
index f318d61014027..cb759f6783b46 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane_embeddable_factory';
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { AnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
 import { AnomalySwimlaneEmbeddableInput } from '..';
 
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
index 1d7e2ddf4d495..806856fbf06ad 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
@@ -7,13 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { StartServicesAccessor } from 'kibana/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
+import type { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { PLUGIN_ID, PLUGIN_ICON, ML_APP_NAME } from '../../../common/constants/app';
-import type {
-  EmbeddableFactoryDefinition,
-  IContainer,
-} from '../../../../../../src/plugins/embeddable/public';
 import { HttpService } from '../../application/services/http_service';
 import type { MlPluginStart, MlStartDependencies } from '../../plugin';
 import type { MlDependencies } from '../../application/app';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
index 28cf197de5dfe..728c89136123b 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
@@ -6,9 +6,10 @@
  */
 
 import React from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { lastValueFrom } from 'rxjs';
+import { toMountPoint, wrapWithTheme } from '@kbn/kibana-react-plugin/public';
 import { VIEW_BY_JOB_LABEL } from '../../application/explorer/explorer_constants';
-import { toMountPoint, wrapWithTheme } from '../../../../../../src/plugins/kibana_react/public';
 import { AnomalySwimlaneInitializer } from './anomaly_swimlane_initializer';
 import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
 import { getDefaultSwimlanePanelTitle } from './anomaly_swimlane_embeddable';
@@ -28,7 +29,7 @@ export async function resolveAnomalySwimlaneUserInput(
     try {
       const { jobIds } = await resolveJobSelection(coreStart, input?.jobIds);
       const title = input?.title ?? getDefaultSwimlanePanelTitle(jobIds);
-      const jobs = await anomalyDetectorService.getJobs$(jobIds).toPromise();
+      const jobs = await lastValueFrom(anomalyDetectorService.getJobs$(jobIds));
       const influencers = anomalyDetectorService.extractInfluencers(jobs);
       influencers.push(VIEW_BY_JOB_LABEL);
       const { theme$ } = coreStart.theme;
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
index e9ff81ac07bdc..d64e1c1cd3d1d 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
@@ -14,12 +14,12 @@ import {
 import { BehaviorSubject, Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
 import { AnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { useSwimlaneInputResolver } from './swimlane_input_resolver';
 import { SWIMLANE_TYPE } from '../../application/explorer/explorer_constants';
 import { SwimlaneContainer } from '../../application/explorer/swimlane_container';
 import { MlDependencies } from '../../application/app';
-import { TriggerContract } from 'src/plugins/ui_actions/public/triggers';
+import { TriggerContract } from '@kbn/ui-actions-plugin/public/triggers';
 import { AnomalySwimlaneEmbeddableInput, AnomalySwimlaneServices } from '..';
 import { createCoreStartMock } from '../../__mocks__/core_start';
 import { createMlStartDepsMock } from '../../__mocks__/ml_start_deps';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
index ac9586bfa69ae..06c400481491a 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
@@ -9,7 +9,7 @@ import React, { FC, useCallback, useState, useEffect } from 'react';
 import { EuiCallOut, EuiEmptyPrompt } from '@elastic/eui';
 import { Observable } from 'rxjs';
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { IAnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
 import { useSwimlaneInputResolver } from './swimlane_input_resolver';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
index de2281b395000..eace431179dad 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
@@ -9,7 +9,7 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { useSwimlaneInputResolver } from './swimlane_input_resolver';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { SWIMLANE_TYPE } from '../../application/explorer/explorer_constants';
-import { CoreStart, IUiSettingsClient } from 'kibana/public';
+import { CoreStart, IUiSettingsClient } from '@kbn/core/public';
 import { MlStartDependencies } from '../../plugin';
 import { AnomalySwimlaneEmbeddableInput, AnomalySwimlaneServices } from '..';
 
@@ -19,6 +19,8 @@ describe('useSwimlaneInputResolver', () => {
   let services: [CoreStart, MlStartDependencies, AnomalySwimlaneServices];
   let onInputChange: jest.Mock;
 
+  const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
   const renderCallbacks = {
     onRenderComplete: jest.fn(),
     onLoading: jest.fn(),
@@ -26,8 +28,6 @@ describe('useSwimlaneInputResolver', () => {
   };
 
   beforeEach(() => {
-    jest.useFakeTimers();
-
     embeddableInput = new BehaviorSubject({
       id: 'test-swimlane-embeddable',
       jobIds: ['test-job'],
@@ -86,7 +86,6 @@ describe('useSwimlaneInputResolver', () => {
   });
 
   afterEach(() => {
-    jest.useRealTimers();
     jest.clearAllMocks();
   });
 
@@ -107,8 +106,7 @@ describe('useSwimlaneInputResolver', () => {
     expect(result.current[1]).toBe(undefined);
 
     await act(async () => {
-      jest.advanceTimersByTime(501);
-      await waitForNextUpdate();
+      await Promise.all([delay(501), waitForNextUpdate()]);
     });
 
     expect(services[2].anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(1);
@@ -125,8 +123,7 @@ describe('useSwimlaneInputResolver', () => {
         filters: [],
         query: { language: 'kuery', query: '' },
       });
-      jest.advanceTimersByTime(501);
-      await waitForNextUpdate();
+      await Promise.all([delay(501), waitForNextUpdate()]);
     });
 
     expect(services[2].anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(2);
@@ -143,8 +140,7 @@ describe('useSwimlaneInputResolver', () => {
         filters: [],
         query: { language: 'kuery', query: '' },
       });
-      jest.advanceTimersByTime(501);
-      await waitForNextUpdate();
+      await Promise.all([delay(501), waitForNextUpdate()]);
     });
 
     expect(services[2].anomalyDetectorService.getJobs$).toHaveBeenCalledTimes(2);
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
index ee3a635071071..9a8a3d2e54b92 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
@@ -19,7 +19,9 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { TimeBuckets } from '../../application/util/time_buckets';
 import { MlStartDependencies } from '../../plugin';
 import {
@@ -28,10 +30,8 @@ import {
   SWIMLANE_TYPE,
   SwimlaneType,
 } from '../../application/explorer/explorer_constants';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
 import { OverallSwimlaneData } from '../../application/explorer/explorer_utils';
 import { isViewBySwimLaneData } from '../../application/explorer/swimlane_container';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
 import {
   AnomalySwimlaneEmbeddableInput,
   AnomalySwimlaneEmbeddableOutput,
diff --git a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
index bf7ea8eac3f50..259eb734f5383 100644
--- a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
+++ b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
@@ -4,19 +4,19 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
 import { takeUntil } from 'rxjs/operators';
 import { from } from 'rxjs';
 import React from 'react';
-import { getInitialGroupsMap } from '../../application/components/job_selector/job_selector';
 import {
   KibanaContextProvider,
   toMountPoint,
   wrapWithTheme,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { DashboardConstants } from '@kbn/dashboard-plugin/public';
+import { getInitialGroupsMap } from '../../application/components/job_selector/job_selector';
 import { getMlGlobalServices } from '../../application/app';
-import { DashboardConstants } from '../../../../../../src/plugins/dashboard/public';
 import { JobId } from '../../../common/types/anomaly_detection_jobs';
 import { JobSelectorFlyout } from './components/job_selector_flyout';
 
diff --git a/x-pack/plugins/ml/public/embeddables/index.ts b/x-pack/plugins/ml/public/embeddables/index.ts
index 2011d7217094b..f3df542bb94f9 100644
--- a/x-pack/plugins/ml/public/embeddables/index.ts
+++ b/x-pack/plugins/ml/public/embeddables/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { EmbeddableSetup } from '@kbn/embeddable-plugin/public';
 import { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane';
 import type { MlCoreSetup } from '../plugin';
-import type { EmbeddableSetup } from '../../../../../src/plugins/embeddable/public';
 import { AnomalyChartsEmbeddableFactory } from './anomaly_charts';
 
 export * from './constants';
diff --git a/x-pack/plugins/ml/public/embeddables/types.ts b/x-pack/plugins/ml/public/embeddables/types.ts
index bf23f397fe08c..228ce092d4cec 100644
--- a/x-pack/plugins/ml/public/embeddables/types.ts
+++ b/x-pack/plugins/ml/public/embeddables/types.ts
@@ -5,16 +5,13 @@
  * 2.0.
  */
 
-import type { CoreStart } from 'kibana/public';
+import type { CoreStart } from '@kbn/core/public';
 import type { Filter, Query } from '@kbn/es-query';
+import type { RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
+import type { EmbeddableInput, EmbeddableOutput, IEmbeddable } from '@kbn/embeddable-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import type { JobId } from '../../common/types/anomaly_detection_jobs';
 import type { SwimlaneType } from '../application/explorer/explorer_constants';
-import type { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common';
-import type {
-  EmbeddableInput,
-  EmbeddableOutput,
-  IEmbeddable,
-} from '../../../../../src/plugins/embeddable/public';
 import type { AnomalyDetectorService } from '../application/services/anomaly_detector_service';
 import type { AnomalyTimelineService } from '../application/services/anomaly_timeline_service';
 import type { MlDependencies } from '../application/app';
@@ -27,7 +24,6 @@ import {
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
 } from './constants';
 import { MlResultsService } from '../application/services/results_service';
-import type { DataView } from '../../../../../src/plugins/data_views/common';
 
 export interface AnomalySwimlaneEmbeddableCustomInput {
   jobIds: JobId[];
diff --git a/x-pack/plugins/ml/public/index.ts b/x-pack/plugins/ml/public/index.ts
index 4913969bf5483..110981e2b5009 100755
--- a/x-pack/plugins/ml/public/index.ts
+++ b/x-pack/plugins/ml/public/index.ts
@@ -9,7 +9,7 @@
 // the ML plugin's page load bundle. You should either just export types or
 // use `getMlSharedImports()` to export static code.
 
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 import {
   MlPlugin,
   MlPluginSetup,
diff --git a/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts b/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts
index c8877a1194bf0..9bf8fea14ce87 100644
--- a/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/anomaly_detection.ts
@@ -6,6 +6,7 @@
  */
 
 import { isEmpty } from 'lodash';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type {
   AnomalyDetectionUrlState,
   ExplorerAppState,
@@ -19,7 +20,6 @@ import type {
 } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
 import { formatGenericMlUrl } from './common';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 import { getGroupQueryText, getJobQueryText } from '../../../common/util/string_utils';
 import { AppPageState, ListingPageUrlState } from '../../../common/types/common';
 
diff --git a/x-pack/plugins/ml/public/locator/formatters/common.ts b/x-pack/plugins/ml/public/locator/formatters/common.ts
index 15b338152649f..33478266696e3 100644
--- a/x-pack/plugins/ml/public/locator/formatters/common.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/common.ts
@@ -6,8 +6,8 @@
  */
 
 import { isEmpty } from 'lodash';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { MlGenericUrlState } from '../../../common/types/locator';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 
 export function extractParams<UrlState>(urlState: UrlState) {
   // page should be guaranteed to exist here but <UrlState> is unknown
diff --git a/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts b/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts
index 72d3b12e9da57..2ba832e9dafee 100644
--- a/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/data_frame_analytics.ts
@@ -9,6 +9,7 @@
  * Creates URL to the DataFrameAnalytics page
  */
 import { isEmpty } from 'lodash';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { formatGenericMlUrl } from './common';
 import {
   DataFrameAnalyticsExplorationQueryState,
@@ -19,7 +20,6 @@ import {
   MlCommonGlobalState,
 } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 import { getGroupQueryText, getJobQueryText } from '../../../common/util/string_utils';
 import { AppPageState, ListingPageUrlState } from '../../../common/types/common';
 
diff --git a/x-pack/plugins/ml/public/locator/formatters/settings.tsx b/x-pack/plugins/ml/public/locator/formatters/settings.tsx
index 7855c6b07351e..038085a144447 100644
--- a/x-pack/plugins/ml/public/locator/formatters/settings.tsx
+++ b/x-pack/plugins/ml/public/locator/formatters/settings.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { CalendarEditUrlState, FilterEditUrlState } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 
 export function formatEditCalendarUrl(
   appBasePath: string,
diff --git a/x-pack/plugins/ml/public/locator/formatters/trained_models.ts b/x-pack/plugins/ml/public/locator/formatters/trained_models.ts
index 9e1c5d92ce451..bebd9461339b0 100644
--- a/x-pack/plugins/ml/public/locator/formatters/trained_models.ts
+++ b/x-pack/plugins/ml/public/locator/formatters/trained_models.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type {
   TrainedModelsNodesUrlState,
   TrainedModelsUrlState,
 } from '../../../common/types/locator';
 import { ML_PAGES } from '../../../common/constants/locator';
 import type { AppPageState, ListingPageUrlState } from '../../../common/types/common';
-import { setStateToKbnUrl } from '../../../../../../src/plugins/kibana_utils/public';
 
 export function formatTrainedModelsManagementUrl(
   appBasePath: string,
diff --git a/x-pack/plugins/ml/public/locator/ml_locator.ts b/x-pack/plugins/ml/public/locator/ml_locator.ts
index c79c93078d04a..dcc31591208cb 100644
--- a/x-pack/plugins/ml/public/locator/ml_locator.ts
+++ b/x-pack/plugins/ml/public/locator/ml_locator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LocatorDefinition, KibanaLocation } from '../../../../../src/plugins/share/public';
+import type { LocatorDefinition, KibanaLocation } from '@kbn/share-plugin/public';
 import {
   DataFrameAnalyticsExplorationUrlState,
   MlLocatorParams,
diff --git a/x-pack/plugins/ml/public/locator/use_ml_href.ts b/x-pack/plugins/ml/public/locator/use_ml_href.ts
index fab668b9464d8..59b34dffa7c13 100644
--- a/x-pack/plugins/ml/public/locator/use_ml_href.ts
+++ b/x-pack/plugins/ml/public/locator/use_ml_href.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlPluginStart } from '../index';
+import { MlPluginStart } from '..';
 import { MlLocatorParams } from '../../common/types/locator';
 
 /**
diff --git a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx
index b45cce35a89ba..46904d5e32c06 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard.tsx
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LAYER_WIZARD_CATEGORY } from '../../../maps/common';
-import type { LayerWizard } from '../../../maps/public';
+import { LAYER_WIZARD_CATEGORY } from '@kbn/maps-plugin/common';
+import type { LayerWizard } from '@kbn/maps-plugin/public';
 
 export const anomalyLayerWizard: Partial<LayerWizard> = {
   categories: [LAYER_WIZARD_CATEGORY.SOLUTIONS, LAYER_WIZARD_CATEGORY.ELASTICSEARCH],
diff --git a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx
index e4309247a272a..b40a08fadd128 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_layer_wizard_factory.tsx
@@ -7,18 +7,18 @@
 
 import React from 'react';
 import { htmlIdGenerator } from '@elastic/eui';
-import type { StartServicesAccessor } from 'kibana/public';
-import { LocatorPublic } from 'src/plugins/share/common';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import { LocatorPublic } from '@kbn/share-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
-import type { LayerWizard, RenderWizardArguments } from '../../../maps/public';
-import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '../../../maps/common';
-import { SEVERITY_COLOR_RAMP } from '../../common';
-import { ML_APP_LOCATOR, ML_PAGES } from '../../common/constants/locator';
-import { CreateAnomalySourceEditor } from './create_anomaly_source_editor';
+import type { LayerWizard, RenderWizardArguments } from '@kbn/maps-plugin/public';
+import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '@kbn/maps-plugin/common';
 import {
   VectorLayerDescriptor,
   VectorStylePropertiesDescriptor,
-} from '../../../maps/common/descriptor_types';
+} from '@kbn/maps-plugin/common/descriptor_types';
+import { SEVERITY_COLOR_RAMP } from '../../common';
+import { ML_APP_LOCATOR, ML_PAGES } from '../../common/constants/locator';
+import { CreateAnomalySourceEditor } from './create_anomaly_source_editor';
 import { AnomalySource, AnomalySourceDescriptor } from './anomaly_source';
 
 import { HttpService } from '../application/services/http_service';
diff --git a/x-pack/plugins/ml/public/maps/anomaly_source.tsx b/x-pack/plugins/ml/public/maps/anomaly_source.tsx
index 1ae65b49adc69..45dba12121b93 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_source.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_source.tsx
@@ -13,21 +13,25 @@ import {
   MIN_ZOOM,
   VECTOR_SHAPE_TYPE,
   VectorSourceRequestMeta,
-} from '../../../maps/common';
-import { AbstractSourceDescriptor, MapExtent } from '../../../maps/common/descriptor_types';
-import { ITooltipProperty, GEOJSON_FEATURE_ID_PROPERTY_NAME } from '../../../maps/public';
+} from '@kbn/maps-plugin/common';
+import { AbstractSourceDescriptor, MapExtent } from '@kbn/maps-plugin/common/descriptor_types';
+import { ITooltipProperty, GEOJSON_FEATURE_ID_PROPERTY_NAME } from '@kbn/maps-plugin/public';
+import type { Adapters } from '@kbn/inspector-plugin/common/adapters';
+import type { GeoJsonWithMeta } from '@kbn/maps-plugin/public';
+import type { IField } from '@kbn/maps-plugin/public';
+import type {
+  Attribution,
+  ImmutableSourceProperty,
+  PreIndexedShape,
+} from '@kbn/maps-plugin/public';
+import type { SourceEditorArgs } from '@kbn/maps-plugin/public';
+import type { DataRequest } from '@kbn/maps-plugin/public';
+import type { IVectorSource, SourceStatus } from '@kbn/maps-plugin/public';
 import {
   AnomalySourceField,
   AnomalySourceTooltipProperty,
   ANOMALY_SOURCE_FIELDS,
 } from './anomaly_source_field';
-import type { Adapters } from '../../../../../src/plugins/inspector/common/adapters';
-import type { GeoJsonWithMeta } from '../../../maps/public';
-import type { IField } from '../../../maps/public';
-import type { Attribution, ImmutableSourceProperty, PreIndexedShape } from '../../../maps/public';
-import type { SourceEditorArgs } from '../../../maps/public';
-import type { DataRequest } from '../../../maps/public';
-import type { IVectorSource, SourceStatus } from '../../../maps/public';
 import { ML_ANOMALY } from './anomaly_source_factory';
 import { getResultsForJobId, ML_ANOMALY_LAYERS, MlAnomalyLayersType } from './util';
 import { UpdateAnomalySourceEditor } from './update_anomaly_source_editor';
diff --git a/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts b/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts
index 71aefbfd0fdb9..81646d98d0c13 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts
+++ b/x-pack/plugins/ml/public/maps/anomaly_source_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { StartServicesAccessor } from 'kibana/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { HttpService } from '../application/services/http_service';
 import type { MlPluginStart, MlStartDependencies } from '../plugin';
 import type { MlApiServices } from '../application/services/ml_api_service';
diff --git a/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx b/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx
index 70eb0a8d9c408..dca5c8fe5644c 100644
--- a/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx
+++ b/x-pack/plugins/ml/public/maps/anomaly_source_field.tsx
@@ -10,11 +10,11 @@ import React, { ReactNode } from 'react';
 import { escape } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Filter } from '@kbn/es-query';
-import { IField, IVectorSource } from '../../../maps/public';
-import { FIELD_ORIGIN, DECIMAL_DEGREES_PRECISION } from '../../../maps/common';
-import { TileMetaFeature } from '../../../maps/common/descriptor_types';
+import { IField, IVectorSource } from '@kbn/maps-plugin/public';
+import { FIELD_ORIGIN, DECIMAL_DEGREES_PRECISION } from '@kbn/maps-plugin/common';
+import { TileMetaFeature } from '@kbn/maps-plugin/common/descriptor_types';
+import { ITooltipProperty } from '@kbn/maps-plugin/public';
 import { AnomalySource } from './anomaly_source';
-import { ITooltipProperty } from '../../../maps/public';
 
 export const ACTUAL_LABEL = i18n.translate('xpack.ml.maps.anomalyLayerActualLabel', {
   defaultMessage: 'Actual',
diff --git a/x-pack/plugins/ml/public/maps/register_map_extension.ts b/x-pack/plugins/ml/public/maps/register_map_extension.ts
index 9112179a6b977..c4d32d5815903 100644
--- a/x-pack/plugins/ml/public/maps/register_map_extension.ts
+++ b/x-pack/plugins/ml/public/maps/register_map_extension.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MapsSetupApi } from '../../../maps/public';
+import { MapsSetupApi } from '@kbn/maps-plugin/public';
 import type { MlCoreSetup } from '../plugin';
 import { AnomalySourceFactory } from './anomaly_source_factory';
 import { AnomalyLayerWizardFactory } from './anomaly_layer_wizard_factory';
diff --git a/x-pack/plugins/ml/public/maps/util.ts b/x-pack/plugins/ml/public/maps/util.ts
index f2a4719bc4ef8..c1cb3f9efaead 100644
--- a/x-pack/plugins/ml/public/maps/util.ts
+++ b/x-pack/plugins/ml/public/maps/util.ts
@@ -8,11 +8,11 @@
 import { FeatureCollection, Feature, Geometry } from 'geojson';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { VectorSourceRequestMeta } from '@kbn/maps-plugin/common';
 import { formatHumanReadableDateTimeSeconds } from '../../common/util/date_utils';
 import type { MlApiServices } from '../application/services/ml_api_service';
 import { MLAnomalyDoc } from '../../common/types/anomalies';
-import { VectorSourceRequestMeta } from '../../../maps/common';
 import { SEARCH_QUERY_LANGUAGE } from '../../common/constants/search';
 import { getIndexPattern } from '../application/explorer/reducers/explorer_reducer/get_index_pattern';
 
diff --git a/x-pack/plugins/ml/public/mocks.ts b/x-pack/plugins/ml/public/mocks.ts
index 6dc2253c94000..13f8952dbad21 100644
--- a/x-pack/plugins/ml/public/mocks.ts
+++ b/x-pack/plugins/ml/public/mocks.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { MlPluginSetup, MlPluginStart } from './plugin';
-import { sharePluginMock } from '../../../../src/plugins/share/public/mocks';
 
 const createSetupContract = (): jest.Mocked<MlPluginSetup> => {
   return {
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 8185c9d250561..b45ee5f5d3956 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -12,45 +12,41 @@ import type {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { SharePluginSetup, SharePluginStart } from 'src/plugins/share/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { EmbeddableSetup, EmbeddableStart } from 'src/plugins/embeddable/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
-import { AppStatus, AppUpdater, DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import type { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { AppStatus, AppUpdater, DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-import type { LicenseManagementUIPluginSetup } from '../../license_management/public';
-import type { LicensingPluginSetup } from '../../licensing/public';
-import type { SecurityPluginSetup } from '../../security/public';
+import type { LicenseManagementUIPluginSetup } from '@kbn/license-management-plugin/public';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
 
-import { PLUGIN_ICON_SOLUTION, PLUGIN_ID } from '../common/constants/app';
-import { isFullLicense, isMlEnabled } from '../common/license';
-
-import { setDependencyCache } from './application/util/dependency_cache';
-import { registerFeature } from './register_feature';
-import { MlLocatorDefinition, MlLocator } from './locator';
-import type { MapsStartApi, MapsSetupApi } from '../../maps/public';
+import type { MapsStartApi, MapsSetupApi } from '@kbn/maps-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
-import type { DataVisualizerPluginStart } from '../../data_visualizer/public';
-import type { PluginSetupContract as AlertingSetup } from '../../alerting/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { DataVisualizerPluginStart } from '@kbn/data-visualizer-plugin/public';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import type { DashboardSetup, DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { registerManagementSection } from './application/management';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import type {
-  FieldFormatsSetup,
-  FieldFormatsStart,
-} from '../../../../src/plugins/field_formats/public';
-import type { DashboardSetup, DashboardStart } from '../../../../src/plugins/dashboard/public';
-import type { ChartsPluginStart } from '../../../../src/plugins/charts/public';
+import { MlLocatorDefinition, MlLocator } from './locator';
+import { setDependencyCache } from './application/util/dependency_cache';
+import { registerFeature } from './register_feature';
+import { isFullLicense, isMlEnabled } from '../common/license';
+import { PLUGIN_ICON_SOLUTION, PLUGIN_ID } from '../common/constants/app';
 
 export interface MlStartDependencies {
   data: DataPublicPluginStart;
diff --git a/x-pack/plugins/ml/public/register_feature.ts b/x-pack/plugins/ml/public/register_feature.ts
index e8d64360df123..bc0f6f751351e 100644
--- a/x-pack/plugins/ml/public/register_feature.ts
+++ b/x-pack/plugins/ml/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { PLUGIN_ID } from '../common/constants/app';
 
 export const registerFeature = (home: HomePublicPluginSetup) => {
@@ -29,7 +26,7 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     icon: 'machineLearningApp',
     path: '/app/ml',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.DATA,
+    category: 'data',
     solutionId: 'kibana',
     order: 500,
   });
diff --git a/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts b/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts
index dd3ca0bb8fa30..a25d7e24a7274 100644
--- a/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts
+++ b/x-pack/plugins/ml/public/register_helper/register_search_links/register_search_links.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
 
-import { AppUpdater } from 'src/core/public';
+import { AppUpdater } from '@kbn/core/public';
 import { getDeepLinks } from './search_deep_links';
 
 export function registerSearchLinks(
diff --git a/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts b/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts
index 29a359d698c33..979027ba30f55 100644
--- a/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts
+++ b/x-pack/plugins/ml/public/register_helper/register_search_links/search_deep_links.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import type { AppDeepLink } from 'src/core/public';
+import type { AppDeepLink } from '@kbn/core/public';
 import { ML_PAGES } from '../../../common/constants/locator';
 
 const OVERVIEW_LINK_DEEP_LINK: AppDeepLink = {
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
index f90c621d71fdc..61556df53db2e 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
@@ -7,9 +7,9 @@
 
 import { Filter } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 import { MlCoreSetup } from '../plugin';
-import { FilterStateStore } from '../../../../../src/plugins/data/common';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
   AnomalyChartsFieldSelectionContext,
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
index 16e66a5930862..3b07b1bf06d95 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
@@ -7,10 +7,10 @@
 
 import { Filter } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 import { MlCoreSetup } from '../plugin';
 import { SWIMLANE_TYPE, VIEW_BY_JOB_LABEL } from '../application/explorer/explorer_constants';
-import { FilterStateStore } from '../../../../../src/plugins/data/common';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
 import { CONTROLLED_BY_SWIM_LANE_FILTER } from './constants';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
index 533a05afc5853..b146202e44bd5 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx b/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx
index c3c9d8befb387..60ef80d68768a 100644
--- a/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/clear_selection_action.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MlCoreSetup } from '../plugin';
 
 export const CLEAR_SELECTION_ACTION = 'clearSelectionAction';
diff --git a/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx b/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx
index 1895ed3acf981..64c4dd4c4407e 100644
--- a/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/edit_anomaly_charts_panel_action.tsx
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
diff --git a/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx b/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
index 173436a1038e1..39ad097c25c4a 100644
--- a/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, EditSwimlanePanelContext } from '../embeddables';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/index.ts b/x-pack/plugins/ml/public/ui_actions/index.ts
index 46e928e5f55eb..a663fa0e2fa01 100644
--- a/x-pack/plugins/ml/public/ui_actions/index.ts
+++ b/x-pack/plugins/ml/public/ui_actions/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
+import { UiActionsSetup } from '@kbn/ui-actions-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 import { createEditSwimlanePanelAction } from './edit_swimlane_panel_action';
 import { createOpenInExplorerAction } from './open_in_anomaly_explorer_action';
-import { UiActionsSetup } from '../../../../../src/plugins/ui_actions/public';
 import { MlPluginStart, MlStartDependencies } from '../plugin';
-import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
 import { createApplyInfluencerFiltersAction } from './apply_influencer_filters_action';
 import {
   entityFieldSelectionTrigger,
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 f4941649ac7a7..1bdbd1a8efb4a 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
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { SerializableRecord } from '@kbn/utility-types';
-import { createAction } from '../../../../../src/plugins/ui_actions/public';
+import { createAction } from '@kbn/ui-actions-plugin/public';
 import { MlCoreSetup } from '../plugin';
 import { ML_APP_LOCATOR } from '../../common/constants/locator';
 import {
diff --git a/x-pack/plugins/ml/public/ui_actions/triggers.ts b/x-pack/plugins/ml/public/ui_actions/triggers.ts
index 05074ce6df271..afed9b246d201 100644
--- a/x-pack/plugins/ml/public/ui_actions/triggers.ts
+++ b/x-pack/plugins/ml/public/ui_actions/triggers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Trigger } from '../../../../../src/plugins/ui_actions/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 
 export const SWIM_LANE_SELECTION_TRIGGER = 'SWIM_LANE_SELECTION_TRIGGER';
 
diff --git a/x-pack/plugins/ml/server/client/error_wrapper.ts b/x-pack/plugins/ml/server/client/error_wrapper.ts
index 64395f601f9ac..212c7a53ca122 100644
--- a/x-pack/plugins/ml/server/client/error_wrapper.ts
+++ b/x-pack/plugins/ml/server/client/error_wrapper.ts
@@ -6,7 +6,7 @@
  */
 
 import { boomify, isBoom } from '@hapi/boom';
-import { ResponseError, CustomHttpResponseOptions } from 'kibana/server';
+import { ResponseError, CustomHttpResponseOptions } from '@kbn/core/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
   const boom = isBoom(error)
diff --git a/x-pack/plugins/ml/server/index.ts b/x-pack/plugins/ml/server/index.ts
index ee889198f59d1..786920ef5e46e 100644
--- a/x-pack/plugins/ml/server/index.ts
+++ b/x-pack/plugins/ml/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { MlServerPlugin } from './plugin';
 export type { MlPluginSetup, MlPluginStart } from './plugin';
 export type {
diff --git a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
index 85b69118334fe..bd0d8df872125 100644
--- a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
@@ -10,6 +10,11 @@ import rison from 'rison-node';
 import { Duration } from 'moment/moment';
 import { memoize } from 'lodash';
 import type { MlDatafeed } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import {
+  FIELD_FORMAT_IDS,
+  IFieldFormat,
+  SerializedFieldFormat,
+} from '@kbn/field-formats-plugin/common';
 import { MlClient } from '../ml_client';
 import {
   MlAnomalyDetectionAlertParams,
@@ -32,11 +37,6 @@ import { getTopNBuckets, resolveLookbackInterval } from '../../../common/util/al
 import type { DatafeedsService } from '../../models/job_service/datafeeds';
 import { getEntityFieldName, getEntityFieldValue } from '../../../common/util/anomaly_utils';
 import { FieldFormatsRegistryProvider } from '../../../common/types/kibana';
-import {
-  FIELD_FORMAT_IDS,
-  IFieldFormat,
-  SerializedFieldFormat,
-} from '../../../../../../src/plugins/field_formats/common';
 import type { AwaitReturnType } from '../../../common/types/common';
 import { getTypicalAndActualValues } from '../../models/results_service/results_service';
 import type { GetDataViewsService } from '../data_views_utils';
diff --git a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts
index b31cd191d3b32..f1ca545da947b 100644
--- a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.test.ts
@@ -7,7 +7,7 @@
 
 import { JobsHealthService, jobsHealthServiceProvider } from './jobs_health_service';
 import type { DatafeedsService } from '../../models/job_service/datafeeds';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { MlClient } from '../ml_client';
 import { MlJob, MlJobStats } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { AnnotationService } from '../../models/annotation_service/annotation';
diff --git a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts
index 805b51ce6567b..bd2503c183c6c 100644
--- a/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/jobs_health_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { groupBy, keyBy, memoize } from 'lodash';
-import { KibanaRequest, Logger, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { MlJob } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MlClient } from '../ml_client';
diff --git a/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts b/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts
index e145ab7197bb9..e34f32d603b2a 100644
--- a/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type.ts
@@ -6,7 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
+import {
+  ActionGroup,
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleTypeState,
+} from '@kbn/alerting-plugin/common';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { PLUGIN_ID } from '../../../common/constants/app';
 import { MINIMUM_FULL_LICENSE } from '../../../common/license';
@@ -16,12 +22,6 @@ import {
 } from '../../routes/schemas/alerting_schema';
 import { RegisterAlertParams } from './register_ml_alerts';
 import { InfluencerAnomalyAlertDoc, RecordAnomalyAlertDoc } from '../../../common/types/alerts';
-import {
-  ActionGroup,
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleTypeState,
-} from '../../../../alerting/common';
 
 export type AnomalyDetectionAlertContext = {
   name: string;
diff --git a/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts b/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts
index 9d1e31612b51e..1414262969153 100644
--- a/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/register_jobs_monitoring_rule_type.ts
@@ -6,12 +6,19 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   MlDatafeedState,
   MlJobState,
   MlJobStats,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import {
+  ActionGroup,
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleTypeState,
+} from '@kbn/alerting-plugin/common';
+import type { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { PLUGIN_ID } from '../../../common/constants/app';
 import { MINIMUM_FULL_LICENSE } from '../../../common/license';
@@ -20,13 +27,6 @@ import {
   AnomalyDetectionJobsHealthRuleParams,
 } from '../../routes/schemas/alerting_schema';
 import { RegisterAlertParams } from './register_ml_alerts';
-import {
-  ActionGroup,
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleTypeState,
-} from '../../../../alerting/common';
-import type { RuleExecutorOptions } from '../../../../alerting/server';
 import type { JobMessage } from '../../../common/types/audit_message';
 
 type ModelSizeStats = MlJobStats['model_size_stats'];
diff --git a/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts b/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts
index 6f1e000c9a430..ab1136b5d1edc 100644
--- a/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/register_ml_alerts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { AlertingPlugin } from '../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { AlertingPlugin } from '@kbn/alerting-plugin/server';
 import { registerAnomalyDetectionAlertType } from './register_anomaly_detection_alert_type';
 import { SharedServices } from '../../shared_services';
 import { registerJobsMonitoringRuleType } from './register_jobs_monitoring_rule_type';
diff --git a/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts b/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts
index 3968c39c59a96..a3fa37920e7f9 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/capabilities_switcher.ts
@@ -6,10 +6,9 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { CapabilitiesSwitcher, CoreSetup, Logger } from 'src/core/server';
-import { ILicense } from '../../../../licensing/common/types';
+import { firstValueFrom, Observable } from 'rxjs';
+import { CapabilitiesSwitcher, CoreSetup, Logger } from '@kbn/core/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { isFullLicense, isMinimumLicense, isMlEnabled } from '../../../common/license';
 import { MlCapabilities, basicLicenseMlCapabilities } from '../../../common/types/capabilities';
 
@@ -30,7 +29,7 @@ function getSwitcher(license$: Observable<ILicense>, logger: Logger): Capabiliti
     }
 
     try {
-      const license = await license$.pipe(take(1)).toPromise();
+      const license = await firstValueFrom(license$);
       const mlEnabled = isMlEnabled(license);
 
       // full license, leave capabilities as they were
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
index 654c3db184aa0..b63de7a22e386 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
@@ -9,7 +9,7 @@ import { getAdminCapabilities, getUserCapabilities } from './__mocks__/ml_capabi
 import { capabilitiesProvider } from './check_capabilities';
 import { MlLicense } from '../../../common/license';
 import { getDefaultCapabilities } from '../../../common/types/capabilities';
-import type { MlClient } from '../../lib/ml_client';
+import type { MlClient } from '../ml_client';
 
 const mlLicense = {
   isSecurityEnabled: () => true,
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
index 013460774bd32..6334ca91bc947 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import type { MlClient } from '../../lib/ml_client';
-import { mlLog } from '../../lib/log';
+import { KibanaRequest } from '@kbn/core/server';
+import type { MlClient } from '../ml_client';
+import { mlLog } from '../log';
 import {
   MlCapabilities,
   adminMlCapabilities,
diff --git a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
index e0c604d80ee63..1f60fc78b9327 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { MlClient } from '../../lib/ml_client';
-import { mlLog } from '../../lib/log';
+import type { MlClient } from '../ml_client';
+import { mlLog } from '../log';
 
 export function upgradeCheckProvider(mlClient: MlClient) {
   async function isUpgradeInProgress(): Promise<boolean> {
diff --git a/x-pack/plugins/ml/server/lib/check_annotations/index.ts b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
index 50c237566761e..29a16548a318a 100644
--- a/x-pack/plugins/ml/server/lib/check_annotations/index.ts
+++ b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { mlLog } from '../../lib/log';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { mlLog } from '../log';
 
 import {
   ML_ANNOTATIONS_INDEX_ALIAS_READ,
diff --git a/x-pack/plugins/ml/server/lib/data_views_utils.ts b/x-pack/plugins/ml/server/lib/data_views_utils.ts
index 67fdc0a16de32..f80f4444df4aa 100644
--- a/x-pack/plugins/ml/server/lib/data_views_utils.ts
+++ b/x-pack/plugins/ml/server/lib/data_views_utils.ts
@@ -9,10 +9,10 @@ import type {
   IScopedClusterClient,
   SavedObjectsClientContract,
   KibanaRequest,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 
 export type GetDataViewsService = () => Promise<DataViewsService>;
 
diff --git a/x-pack/plugins/ml/server/lib/log.ts b/x-pack/plugins/ml/server/lib/log.ts
index 3efd651e91d5b..dfb93d84932ca 100644
--- a/x-pack/plugins/ml/server/lib/log.ts
+++ b/x-pack/plugins/ml/server/lib/log.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 export interface LogInitialization {
   log: Logger;
diff --git a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
index 122162777d9a5..f322f09356c90 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/ml_client.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MLSavedObjectService } from '../../saved_objects';
 import { getJobDetailsFromTrainedModel } from '../../saved_objects/util';
 import { JobType } from '../../../common/types/saved_objects';
diff --git a/x-pack/plugins/ml/server/lib/ml_client/search.ts b/x-pack/plugins/ml/server/lib/ml_client/search.ts
index 1ead8d0fd4ea1..7607ee860aac0 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/search.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/search.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type {
   TransportResult,
diff --git a/x-pack/plugins/ml/server/lib/ml_client/types.ts b/x-pack/plugins/ml/server/lib/ml_client/types.ts
index 7a2a565e5b04a..38e864f034e04 100644
--- a/x-pack/plugins/ml/server/lib/ml_client/types.ts
+++ b/x-pack/plugins/ml/server/lib/ml_client/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { searchProvider } from './search';
 
 type OrigMlClient = ElasticsearchClient['ml'];
diff --git a/x-pack/plugins/ml/server/lib/node_utils.ts b/x-pack/plugins/ml/server/lib/node_utils.ts
index d5ec53148b402..edf5b14c7cb81 100644
--- a/x-pack/plugins/ml/server/lib/node_utils.ts
+++ b/x-pack/plugins/ml/server/lib/node_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MlNodeCount } from '../../common/types/ml_server_info';
 
 export async function getMlNodeCount(client: IScopedClusterClient): Promise<MlNodeCount> {
diff --git a/x-pack/plugins/ml/server/lib/register_settings.ts b/x-pack/plugins/ml/server/lib/register_settings.ts
index 8f279114344e4..fae6e810b187e 100644
--- a/x-pack/plugins/ml/server/lib/register_settings.ts
+++ b/x-pack/plugins/ml/server/lib/register_settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 import {
diff --git a/x-pack/plugins/ml/server/lib/request_authorization.ts b/x-pack/plugins/ml/server/lib/request_authorization.ts
index 873d8a068ace0..63143d9c7c889 100644
--- a/x-pack/plugins/ml/server/lib/request_authorization.ts
+++ b/x-pack/plugins/ml/server/lib/request_authorization.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 
 export interface AuthorizationHeader {
   headers?: { 'es-secondary-authorization': string | string[] };
diff --git a/x-pack/plugins/ml/server/lib/route_guard.ts b/x-pack/plugins/ml/server/lib/route_guard.ts
index 90de46340d873..cd500cfda17cc 100644
--- a/x-pack/plugins/ml/server/lib/route_guard.ts
+++ b/x-pack/plugins/ml/server/lib/route_guard.ts
@@ -12,17 +12,17 @@ import type {
   IScopedClusterClient,
   RequestHandler,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import type { SpacesPluginSetup } from '../../../spaces/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+} from '@kbn/core/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { mlSavedObjectServiceFactory, MLSavedObjectService } from '../saved_objects';
 import type { MlLicense } from '../../common/license';
 
-import { MlClient, getMlClient } from '../lib/ml_client';
-import type { AlertingApiRequestHandlerContext } from '../../../alerting/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+import { MlClient, getMlClient } from './ml_client';
 import { getDataViewsServiceFactory } from './data_views_utils';
 
 type MLRequestHandlerContext = RequestHandlerContext & {
diff --git a/x-pack/plugins/ml/server/lib/spaces_utils.ts b/x-pack/plugins/ml/server/lib/spaces_utils.ts
index 21ef163734883..1db61fb3246e2 100644
--- a/x-pack/plugins/ml/server/lib/spaces_utils.ts
+++ b/x-pack/plugins/ml/server/lib/spaces_utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from '../../../../../src/core/server';
-import { SpacesPluginStart } from '../../../spaces/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { PLUGIN_ID } from '../../common/constants/app';
 
 export function spacesUtilsProvider(
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
index e6aa31501a557..6da67e00f90df 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
@@ -12,7 +12,7 @@ import { ANNOTATION_TYPE } from '../../../common/constants/annotations';
 import { Annotation, isAnnotations } from '../../../common/types/annotations';
 
 import { DeleteParams, GetResponse, IndexAnnotationArgs } from './annotation';
-import { annotationServiceProvider } from './index';
+import { annotationServiceProvider } from '.';
 
 const acknowledgedResponseMock = { acknowledged: true };
 
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
index 60d633b16097d..8d860300979c8 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { each, get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ANNOTATION_EVENT_USER, ANNOTATION_TYPE } from '../../../common/constants/annotations';
diff --git a/x-pack/plugins/ml/server/models/annotation_service/index.ts b/x-pack/plugins/ml/server/models/annotation_service/index.ts
index fc147047e8ab6..fef919b629da9 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/index.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { annotationProvider } from './annotation';
 
 export function annotationServiceProvider(client: IScopedClusterClient) {
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
index 75983975f7acd..30d9c76cd9dcb 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 import { RuntimeMappings } from '../../../common/types/fields';
 import { IndicesOptions } from '../../../common/types/anomaly_detection_jobs';
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
index 6ffb74131bf6e..f103592569b7c 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 import { BucketSpanEstimatorData } from '../../../common/types/job_service';
diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
index 206627005e77d..0528e82ba6015 100644
--- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
@@ -6,7 +6,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import numeral from '@elastic/numeral';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MLCATEGORY } from '../../../common/constants/field_types';
 import { AnalysisConfig, Datafeed } from '../../../common/types/anomaly_detection_jobs';
 import { fieldsServiceProvider } from '../fields_service';
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
index c8395e2eb0ed6..2a84e757cd6b7 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { ML_NOTIFICATION_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { JobMessage } from '../../../common/types/audit_message';
 
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
index c6e44fc5b3f4c..894354a0113fc 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_manager.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   INDEX_CREATED_BY,
   JOB_MAP_NODE_TYPES,
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
index b0135b0295fd8..fc07c69d8dc73 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import { DataViewsService } from '@kbn/data-views-plugin/common';
 
 export class DataViewHandler {
   constructor(private dataViewService: DataViewsService) {}
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts
index bd1b64ba9f37d..cf4ef22b44016 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/models_provider.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { MemoryStatsResponse, ModelService, modelsProvider } from './models_provider';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { MlClient } from '../../lib/ml_client';
 import mockResponse from './__mocks__/mock_deployment_response.json';
 
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
index 580f7d68736dc..4ee77f06eac1f 100644
--- 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { pick } from 'lodash';
 import {
   MlTrainedModelStats,
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts
index f534c9e91cef4..9cd8b67be2a6d 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { getAnalysisType } from '../../../common/util/analytics_utils';
 import { ANALYSIS_CONFIG_TYPE } from '../../../common/constants/data_frame_analytics';
 import {
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index 7d2f37cefb50b..4770f0c51dbc9 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -9,10 +9,10 @@ import type {
   SavedObjectsClientContract,
   KibanaRequest,
   IScopedClusterClient,
-} from 'kibana/server';
-import type { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+} from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Module } from '../../../common/types/modules';
-import { DataRecognizer } from '../data_recognizer';
+import { DataRecognizer } from '.';
 import type { MlClient } from '../../lib/ml_client';
 import type { MLSavedObjectService } from '../../saved_objects';
 
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 3ef36f4ad3b6b..5dc86d3490420 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -12,11 +12,11 @@ import type {
   KibanaRequest,
   IScopedClusterClient,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import moment from 'moment';
 import { merge } from 'lodash';
-import type { DataViewsService } from '../../../../../../src/plugins/data_views/common';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { AnalysisLimits } from '../../../common/types/anomaly_detection_jobs';
 import { getAuthorizationHeader } from '../../lib/request_authorization';
 import type { MlClient } from '../../lib/ml_client';
diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
index eb9e88b62a09a..cbb1c0cc3710d 100644
--- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get, each, last, find } from 'lodash';
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/server';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/server';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import { getSafeAggregationName } from '../../../common/util/job_utils';
 import { stringHash } from '../../../common/util/string_utils';
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
index c8828ab6c5416..a3d6b74e057e0 100644
--- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { duration } from 'moment';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { initCardinalityFieldsCache } from './fields_aggs_cache';
diff --git a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts
index cab1d42743017..36d09d3e236b2 100644
--- a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts
+++ b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ML_NOTIFICATION_INDEX_PATTERN } from '../../../common/constants/index_patterns';
diff --git a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
index c74b8bad75e79..5690d4d345094 100644
--- a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
+++ b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 import { fillResultsWithTimeouts, isRequestTimeout } from './error_utils';
 import { Datafeed, DatafeedStats } from '../../../common/types/anomaly_detection_jobs';
diff --git a/x-pack/plugins/ml/server/models/job_service/index.ts b/x-pack/plugins/ml/server/models/job_service/index.ts
index 94c25581e8e84..33898d35943e5 100644
--- a/x-pack/plugins/ml/server/models/job_service/index.ts
+++ b/x-pack/plugins/ml/server/models/job_service/index.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 import { datafeedsProvider } from './datafeeds';
 import { jobsProvider } from './jobs';
 import { groupsProvider } from './groups';
@@ -13,7 +14,6 @@ import { newJobCapsProvider } from './new_job_caps';
 import { newJobChartsProvider, topCategoriesProvider } from './new_job';
 import { modelSnapshotProvider } from './model_snapshots';
 import type { MlClient } from '../../lib/ml_client';
-import type { RulesClient } from '../../../../alerting/server';
 
 export function jobServiceProvider(
   client: IScopedClusterClient,
diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
index 2f8e17ce142a7..7eb5a1cf1d722 100644
--- a/x-pack/plugins/ml/server/models/job_service/jobs.ts
+++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -7,7 +7,8 @@
 
 import { uniq } from 'lodash';
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 import {
   getSingleMetricViewerJobErrorMessage,
   parseTimeIntervalForJob,
@@ -47,7 +48,6 @@ import {
 import { groupsProvider } from './groups';
 import type { MlClient } from '../../lib/ml_client';
 import { isPopulatedObject } from '../../../common/util/object_utils';
-import type { RulesClient } from '../../../../alerting/server';
 import { ML_ALERT_TYPES } from '../../../common/constants/alerts';
 import { MlAnomalyDetectionAlertParams } from '../../routes/schemas/alerting_schema';
 import type { AuthorizationHeader } from '../../lib/request_authorization';
diff --git a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
index c40f8b78cb209..a081e14ec86ee 100644
--- a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
+++ b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { ModelSnapshot } from '../../../common/types/anomaly_detection_jobs';
 import { datafeedsProvider } from './datafeeds';
 import { FormCalendar, CalendarManager } from '../calendar';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
index f3ea82b837caa..a5cb9e8507429 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { chunk } from 'lodash';
 import { CATEGORY_EXAMPLES_SAMPLE_SIZE } from '../../../../../common/constants/categorization_job';
 import {
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts b/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
index 892b3ea6684ab..740fd73fb36cc 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { newJobLineChartProvider } from './line_chart';
 import { newJobPopulationChartProvider } from './population_chart';
 
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
index 44bf280fcc86a..4b1efbbd7e014 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   AggFieldNamePair,
   EVENT_RATE_FIELD_ID,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
index 5654f48b39596..8d4a5fec9f497 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   AggFieldNamePair,
   EVENT_RATE_FIELD_ID,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
index f553e3ee8ccc1..f17d0a6702e60 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -7,10 +7,10 @@
 
 import { cloneDeep } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Field, FieldId, NewJobCaps, RollupFields } from '../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
-import type { DataViewsService } from '../../../../../../../src/plugins/data_views/common';
 import { combineFieldsAndAggs } from '../../../../common/util/fields_utils';
 import { rollupServiceProvider } from './rollup';
 import { aggregations, mlOnlyAggregations } from '../../../../common/constants/aggregation_types';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
index 021244afce2cb..b31cbf96ae63a 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { newJobCapsProvider } from './index';
-import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
+import { newJobCapsProvider } from '.';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import farequoteFieldCaps from './__mocks__/responses/farequote_field_caps.json';
 import cloudwatchFieldCaps from './__mocks__/responses/cloudwatch_field_caps.json';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
index bab4fb31aa1a9..37e95c4389f6c 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
-import type { DataViewsService } from '../../../../../../../src/plugins/data_views/common';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Aggregation, Field, NewJobCapsResponse } from '../../../../common/types/fields';
 import { _DOC_COUNT } from '../../../../common/constants/field_types';
 import { fieldServiceProvider } from './field_service';
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
index a4eb5b9135c8c..a62535b0c981c 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
@@ -6,11 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient } from 'kibana/server';
-import type {
-  DataViewsService,
-  DataView,
-} from '../../../../../../../src/plugins/data_views/common';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import type { DataViewsService, DataView } from '@kbn/data-views-plugin/common';
 import type { RollupFields } from '../../../../common/types/fields';
 
 export interface RollupJob {
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
index b9ac2831e5bf0..0800d31899fbc 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 import { validateJob, ValidateJobPayload } from './job_validation';
 import { ES_CLIENT_TOTAL_HITS_RELATION } from '../../../common/types/es_client';
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 353e508e30df7..336780a31aec2 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
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { fieldsServiceProvider } from '../fields_service';
 import { getMessages, MessageId, JobValidationMessage } from '../../../common/constants/messages';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
index bd7889c3f4375..75b1b98213036 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { estimateBucketSpanFactory } from '../../models/bucket_span_estimator';
+import { estimateBucketSpanFactory } from '../bucket_span_estimator';
 import { mlFunctionToESAggregation, parseTimeIntervalForJob } from '../../../common/util/job_utils';
 import { SKIP_BUCKET_SPAN_ESTIMATION } from '../../../common/constants/validation';
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
index 7c64f9201c373..a03a3affded39 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
index 151ae4a9e739a..811f52a271d81 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { DataVisualizer } from '../data_visualizer';
 
 import { validateJobObject } from './validate_job_object';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
index 5c50ac31281f2..8c6fcdea57430 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { CombinedJob, Detector } from '../../../common/types/anomaly_detection_jobs';
 import { ModelMemoryEstimateResponse } from '../calculate_model_memory_limit/calculate_model_memory_limit';
 import { validateModelMemoryLimit } from './validate_model_memory_limit';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
index 7687f3acd313e..13ec4da1b0818 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
@@ -6,7 +6,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { validateJobObject } from './validate_job_object';
 import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit';
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
index 0d6840c3574fd..4f6a3f241f0e0 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
index d498114911c23..7578f24d05e02 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/server';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { validateJobObject } from './validate_job_object';
diff --git a/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts b/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
index 84363c12699d5..c5a31106f4ddf 100644
--- a/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
+++ b/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { each, find, get, keyBy, map, reduce, sortBy } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/types';
@@ -48,7 +48,7 @@ import { getDatafeedAggregations } from '../../../common/util/datafeed_utils';
 import { findAggField } from '../../../common/util/validation_utils';
 import { CHART_TYPE, ChartType } from '../../../common/constants/charts';
 import { getChartType } from '../../../common/util/chart_utils';
-import { MlJob } from '../../index';
+import { MlJob } from '../..';
 
 export function chartLimits(data: ChartPoint[] = []) {
   const domain = extent(data, (d) => {
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 9caf41ce97ee3..39fbaeb74b45c 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
@@ -8,7 +8,7 @@
 import { sortBy, slice, get, cloneDeep } from 'lodash';
 import moment from 'moment';
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 8c59c0f9d519b..358fd9b24fce7 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -17,12 +17,13 @@ import type {
   IClusterClient,
   SavedObjectsServiceStart,
   UiSettingsServiceStart,
-} from 'kibana/server';
-import type { SecurityPluginSetup } from '../../security/server';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../src/plugins/data_views/server';
+} from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import type { PluginsSetup, PluginsStart, RouteInitialization } from './types';
-import type { SpacesPluginSetup } from '../../spaces/server';
 import { PLUGIN_ID } from '../common/constants/app';
 import type { MlCapabilities } from '../common/types/capabilities';
 
@@ -61,7 +62,6 @@ import { registerMlAlerts } from './lib/alerts/register_ml_alerts';
 import { ML_ALERT_TYPES } from '../common/constants/alerts';
 import { alertingRoutes } from './routes/alerting';
 import { registerCollector } from './usage';
-import { FieldFormatsStart } from '../../../../src/plugins/field_formats/server';
 import { SavedObjectsSyncService } from './saved_objects/sync_task';
 
 export type MlPluginSetup = SharedServices;
diff --git a/x-pack/plugins/ml/server/routes/annotations.ts b/x-pack/plugins/ml/server/routes/annotations.ts
index 9c148b7658bdc..eb173688dc244 100644
--- a/x-pack/plugins/ml/server/routes/annotations.ts
+++ b/x-pack/plugins/ml/server/routes/annotations.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
 
-import { SecurityPluginSetup } from '../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { isAnnotationsFeatureAvailable } from '../lib/check_annotations';
 import { annotationServiceProvider } from '../models/annotation_service';
 import { wrapError } from '../client/error_wrapper';
diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index b6cf8dd0c2184..1fd79cbe963e6 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import { wrapError } from '../client/error_wrapper';
 import { analyticsAuditMessagesProvider } from '../models/data_frame_analytics/analytics_audit_messages';
 import type { RouteInitialization } from '../types';
@@ -36,7 +37,6 @@ import { fieldServiceProvider } from '../models/job_service/new_job_caps/field_s
 import type { DeleteDataFrameAnalyticsWithIndexStatus } from '../../common/types/data_frame_analytics';
 import { getAuthorizationHeader } from '../lib/request_authorization';
 import type { MlClient } from '../lib/ml_client';
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
 
 function getDataViewId(dataViewsService: DataViewsService, patternName: string) {
   const iph = new DataViewHandler(dataViewsService);
diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts
index fa84779ace71b..88131afd20c08 100644
--- a/x-pack/plugins/ml/server/routes/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { wrapError } from '../client/error_wrapper';
 import { DataVisualizer } from '../models/data_visualizer';
 import { HistogramField } from '../models/data_visualizer/data_visualizer';
diff --git a/x-pack/plugins/ml/server/routes/fields_service.ts b/x-pack/plugins/ml/server/routes/fields_service.ts
index dc43d915e87a2..a0c39d1540cca 100644
--- a/x-pack/plugins/ml/server/routes/fields_service.ts
+++ b/x-pack/plugins/ml/server/routes/fields_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import {
diff --git a/x-pack/plugins/ml/server/routes/job_validation.ts b/x-pack/plugins/ml/server/routes/job_validation.ts
index bceb59fa33fc6..e1bc628529672 100644
--- a/x-pack/plugins/ml/server/routes/job_validation.ts
+++ b/x-pack/plugins/ml/server/routes/job_validation.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import type { AnalysisConfig, Datafeed } from '../../common/types/anomaly_detection_jobs';
 import { wrapError } from '../client/error_wrapper';
diff --git a/x-pack/plugins/ml/server/routes/modules.ts b/x-pack/plugins/ml/server/routes/modules.ts
index 2b366cef9a9f4..fb8a2efed8745 100644
--- a/x-pack/plugins/ml/server/routes/modules.ts
+++ b/x-pack/plugins/ml/server/routes/modules.ts
@@ -11,8 +11,8 @@ import type {
   IScopedClusterClient,
   KibanaRequest,
   SavedObjectsClientContract,
-} from 'kibana/server';
-import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
+} from '@kbn/core/server';
+import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { DatafeedOverride, JobOverride } from '../../common/types/modules';
 import { wrapError } from '../client/error_wrapper';
 import { dataRecognizerFactory } from '../models/data_recognizer';
diff --git a/x-pack/plugins/ml/server/saved_objects/authorization.ts b/x-pack/plugins/ml/server/saved_objects/authorization.ts
index 73d2490ce3ee3..099409958c0cc 100644
--- a/x-pack/plugins/ml/server/saved_objects/authorization.ts
+++ b/x-pack/plugins/ml/server/saved_objects/authorization.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   ML_JOB_SAVED_OBJECT_TYPE,
   ML_TRAINED_MODEL_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/ml/server/saved_objects/checks.ts b/x-pack/plugins/ml/server/saved_objects/checks.ts
index c6abcb79030de..93b68ea3fd990 100644
--- a/x-pack/plugins/ml/server/saved_objects/checks.ts
+++ b/x-pack/plugins/ml/server/saved_objects/checks.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient, KibanaRequest, SavedObjectsFindResult } from 'kibana/server';
+import type { IScopedClusterClient, KibanaRequest, SavedObjectsFindResult } from '@kbn/core/server';
 import type {
   MLSavedObjectService,
   TrainedModelJob,
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts b/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts
index 5e453a613b22d..a6fcad275923c 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, CoreStart, SavedObjectsClientContract } from 'kibana/server';
+import { IScopedClusterClient, CoreStart, SavedObjectsClientContract } from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { savedObjectClientsFactory } from '../util';
 import { syncSavedObjectsFactory } from '../sync';
 import { mlSavedObjectServiceFactory, JobObject } from '../service';
 import { mlLog } from '../../lib/log';
 import { ML_JOB_SAVED_OBJECT_TYPE } from '../../../common/types/saved_objects';
 import { createJobSpaceOverrides } from './space_overrides';
-import type { SecurityPluginSetup } from '../../../../security/server';
 
 /**
  * Creates initializeJobs function which is used to check whether
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
index b7e0affb51fa5..bc2dac56881ad 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/logs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import RE2 from 're2';
 import { mlLog } from '../../../lib/log';
 
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
index e2b8f587c25e6..3ec187555d4b4 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/metrics.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import RE2 from 're2';
 import { mlLog } from '../../../lib/log';
 
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts
index b5b4e8db2dd58..a57a3c046d09a 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { createJobSpaceOverrides } from './space_overrides';
 
 const jobs = [
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts
index 85c2b738ef29b..cae8948f59ca9 100644
--- a/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts
+++ b/x-pack/plugins/ml/server/saved_objects/initialization/space_overrides/space_overrides.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import type { JobSpaceOverrides } from '../../sync';
 import { logJobsSpaces } from './logs';
 import { metricsJobsSpaces } from './metrics';
diff --git a/x-pack/plugins/ml/server/saved_objects/mappings.ts b/x-pack/plugins/ml/server/saved_objects/mappings.ts
index 7560df4b6ab22..de522e3a6347e 100644
--- a/x-pack/plugins/ml/server/saved_objects/mappings.ts
+++ b/x-pack/plugins/ml/server/saved_objects/mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTypeMappingDefinition } from 'kibana/server';
+import { SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
 
 export const mlJob: SavedObjectsTypeMappingDefinition = {
   properties: {
diff --git a/x-pack/plugins/ml/server/saved_objects/migrations.ts b/x-pack/plugins/ml/server/saved_objects/migrations.ts
index b9eec66bdd825..bf5ff05b78517 100644
--- a/x-pack/plugins/ml/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/ml/server/saved_objects/migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap } from '../../../../../src/core/server';
+import { SavedObjectMigrationMap } from '@kbn/core/server';
 
 export const migrations: SavedObjectMigrationMap = {
   '7.9.0': (doc) => doc,
diff --git a/x-pack/plugins/ml/server/saved_objects/saved_objects.ts b/x-pack/plugins/ml/server/saved_objects/saved_objects.ts
index 2fdcd58416e6a..4a939759db097 100644
--- a/x-pack/plugins/ml/server/saved_objects/saved_objects.ts
+++ b/x-pack/plugins/ml/server/saved_objects/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsServiceSetup } from 'kibana/server';
+import { SavedObjectsServiceSetup } from '@kbn/core/server';
 import { mlJob, mlTrainedModel, mlModule } from './mappings';
 
 import { migrations } from './migrations';
diff --git a/x-pack/plugins/ml/server/saved_objects/service.ts b/x-pack/plugins/ml/server/saved_objects/service.ts
index eb3fbee91308d..f473397be9079 100644
--- a/x-pack/plugins/ml/server/saved_objects/service.ts
+++ b/x-pack/plugins/ml/server/saved_objects/service.ts
@@ -12,8 +12,8 @@ import {
   SavedObjectsFindOptions,
   SavedObjectsFindResult,
   IScopedClusterClient,
-} from 'kibana/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+} from '@kbn/core/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type {
   JobType,
   TrainedModelType,
diff --git a/x-pack/plugins/ml/server/saved_objects/sync.ts b/x-pack/plugins/ml/server/saved_objects/sync.ts
index b4573e8b7c8aa..b7d719d6a2c5b 100644
--- a/x-pack/plugins/ml/server/saved_objects/sync.ts
+++ b/x-pack/plugins/ml/server/saved_objects/sync.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import type { JobObject, MLSavedObjectService, TrainedModelObject } from './service';
 import type {
   JobType,
diff --git a/x-pack/plugins/ml/server/saved_objects/sync_task.ts b/x-pack/plugins/ml/server/saved_objects/sync_task.ts
index ce54cc85abc68..aaca13b99131c 100644
--- a/x-pack/plugins/ml/server/saved_objects/sync_task.ts
+++ b/x-pack/plugins/ml/server/saved_objects/sync_task.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Logger, CoreStart, IScopedClusterClient } from 'kibana/server';
+import { Logger, CoreStart, IScopedClusterClient } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
   TaskInstance,
-} from '../../../task_manager/server';
-import type { SecurityPluginSetup } from '../../../security/server';
+} from '@kbn/task-manager-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { savedObjectClientsFactory } from './util';
 import { mlSavedObjectServiceFactory } from './service';
 import { syncSavedObjectsFactory } from './sync';
diff --git a/x-pack/plugins/ml/server/saved_objects/util.ts b/x-pack/plugins/ml/server/saved_objects/util.ts
index f16f80a20390c..561c09af75c98 100644
--- a/x-pack/plugins/ml/server/saved_objects/util.ts
+++ b/x-pack/plugins/ml/server/saved_objects/util.ts
@@ -6,8 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { SavedObjectsServiceStart, KibanaRequest } from 'kibana/server';
-import { SavedObjectsClient } from '../../../../../src/core/server';
+import { SavedObjectsServiceStart, KibanaRequest } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 import { ML_JOB_SAVED_OBJECT_TYPE } from '../../common/types/saved_objects';
 import type { TrainedModelJob } from './service';
 
diff --git a/x-pack/plugins/ml/server/shared.ts b/x-pack/plugins/ml/server/shared.ts
index 97498fc1a6ce5..8760dfb991ab5 100644
--- a/x-pack/plugins/ml/server/shared.ts
+++ b/x-pack/plugins/ml/server/shared.ts
@@ -9,4 +9,4 @@ export * from '../common/types/anomalies';
 export * from '../common/types/anomaly_detection_jobs';
 export * from './lib/capabilities/errors';
 export type { ModuleSetupPayload } from './shared_services/providers/modules';
-export { getHistogramsForFields } from './models/data_visualizer/';
+export { getHistogramsForFields } from './models/data_visualizer';
diff --git a/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts b/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts
index 9d3691a525339..6be71148a3c3a 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/alerting_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { GetGuards } from '../shared_services';
 import { alertingServiceProvider, MlAlertingService } from '../../lib/alerts/alerting_service';
 import { datafeedsProvider } from '../../models/job_service/datafeeds';
diff --git a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
index f091db10b9763..77a47e44a213c 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   Job,
   JobStats,
diff --git a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
index 43a7daba4c34d..fc26e45bae85a 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { jobServiceProvider } from '../../models/job_service';
 import { GetGuards } from '../shared_services';
 
diff --git a/x-pack/plugins/ml/server/shared_services/providers/modules.ts b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
index 10b07a90880de..282715e5e8c17 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/modules.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import type { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../../src/plugins/data_views/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 import type { GetGuards } from '../shared_services';
 import { DataRecognizer, dataRecognizerFactory } from '../../models/data_recognizer';
 import { moduleIdParamSchema, setupModuleBodySchema } from '../../routes/schemas/modules';
diff --git a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
index 254691a9a92e7..799373c0bdc24 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { resultsServiceProvider } from '../../models/results_service';
 import { GetGuards } from '../shared_services';
 
diff --git a/x-pack/plugins/ml/server/shared_services/providers/system.ts b/x-pack/plugins/ml/server/shared_services/providers/system.ts
index 977288210299a..27cb54b6e2b72 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/system.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/system.ts
@@ -7,11 +7,11 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { MlLicense } from '../../../common/license';
-import { CloudSetup } from '../../../../cloud/server';
 import { spacesUtilsProvider } from '../../lib/spaces_utils';
-import { SpacesPluginStart } from '../../../../spaces/server';
 import { capabilitiesProvider } from '../../lib/capabilities';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import { MlCapabilitiesResponse, ResolveMlCapabilities } from '../../../common/types/capabilities';
diff --git a/x-pack/plugins/ml/server/shared_services/shared_services.ts b/x-pack/plugins/ml/server/shared_services/shared_services.ts
index 39ab8a43e3233..839ccb71d5c4a 100644
--- a/x-pack/plugins/ml/server/shared_services/shared_services.ts
+++ b/x-pack/plugins/ml/server/shared_services/shared_services.ts
@@ -10,14 +10,15 @@ import type {
   IScopedClusterClient,
   SavedObjectsClientContract,
   UiSettingsServiceStart,
-} from 'kibana/server';
-import type { SpacesPluginStart } from '../../../spaces/server';
-import { KibanaRequest } from '../../.././../../src/core/server';
+} from '@kbn/core/server';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { KibanaRequest } from '@kbn/core/server';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { MlLicense } from '../../common/license';
 
-import type { CloudSetup } from '../../../cloud/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../../src/plugins/data_views/server';
-import type { SecurityPluginSetup } from '../../../security/server';
 import { licenseChecks } from './license_checks';
 import { MlSystemProvider, getMlSystemProvider } from './providers/system';
 import { JobServiceProvider, getJobServiceProvider } from './providers/job_service';
@@ -44,7 +45,6 @@ import {
   getJobsHealthServiceProvider,
   JobsHealthServiceProvider,
 } from '../lib/alerts/jobs_health_service';
-import type { FieldFormatsStart } from '../../../../../src/plugins/field_formats/server';
 import type { FieldFormatsRegistryProvider } from '../../common/types/kibana';
 import { getDataViewsServiceFactory, GetDataViewsService } from '../lib/data_views_utils';
 
diff --git a/x-pack/plugins/ml/server/types.ts b/x-pack/plugins/ml/server/types.ts
index 8120d5c880b6c..b2090ac6bf7a0 100644
--- a/x-pack/plugins/ml/server/types.ts
+++ b/x-pack/plugins/ml/server/types.ts
@@ -5,30 +5,30 @@
  * 2.0.
  */
 
-import type { HomeServerPluginSetup } from 'src/plugins/home/server';
-import type { IRouter } from 'kibana/server';
-import type { CloudSetup } from '../../cloud/server';
-import type { SecurityPluginSetup } from '../../security/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import type { LicensingPluginSetup } from '../../licensing/server';
-import type { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { IRouter } from '@kbn/core/server';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import type { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
-import type { MlLicense } from '../common/license';
-import type { ResolveMlCapabilities } from '../common/types/capabilities';
-import type { RouteGuard } from './lib/route_guard';
-import type { AlertingPlugin } from '../../alerting/server';
-import type { ActionsPlugin } from '../../actions/server';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import type { AlertingPlugin } from '@kbn/alerting-plugin/server';
+import type { ActionsPlugin } from '@kbn/actions-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import type { PluginStart as DataViewsPluginStart } from '../../../../src/plugins/data_views/server';
-import type {
-  FieldFormatsSetup,
-  FieldFormatsStart,
-} from '../../../../src/plugins/field_formats/server';
-import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/data-plugin/server';
+import type { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
+import type { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import type { RouteGuard } from './lib/route_guard';
+import type { ResolveMlCapabilities } from '../common/types/capabilities';
+import type { MlLicense } from '../common/license';
 
 export interface LicenseCheckResult {
   isAvailable: boolean;
diff --git a/x-pack/plugins/ml/server/usage/collector.ts b/x-pack/plugins/ml/server/usage/collector.ts
index abfef308951a9..44a403b15a9bd 100644
--- a/x-pack/plugins/ml/server/usage/collector.ts
+++ b/x-pack/plugins/ml/server/usage/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
 import { AnomalyResultType } from '../../common/types/anomalies';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../common/types/alerts';
diff --git a/x-pack/plugins/ml/shared_imports.ts b/x-pack/plugins/ml/shared_imports.ts
index e70410c99a8f4..33a84886aaaec 100644
--- a/x-pack/plugins/ml/shared_imports.ts
+++ b/x-pack/plugins/ml/shared_imports.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-export { EuiCodeEditor } from '../../../src/plugins/es_ui_shared/public';
-export type { EuiCodeEditorProps } from '../../../src/plugins/es_ui_shared/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+export type { EuiCodeEditorProps } from '@kbn/es-ui-shared-plugin/public';
 
-import { XJson } from '../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 const { collapseLiteralStrings, expandLiteralStrings } = XJson;
 
 export { XJsonMode } from '@kbn/ace';
diff --git a/x-pack/plugins/monitoring/common/types/alerts.ts b/x-pack/plugins/monitoring/common/types/alerts.ts
index f4b3101b3eaa9..597a70bdb8c6e 100644
--- a/x-pack/plugins/monitoring/common/types/alerts.ts
+++ b/x-pack/plugins/monitoring/common/types/alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Rule, RuleTypeParams, SanitizedRule } from '../../../alerting/common';
+import { Rule, RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 import {
   AlertParamType,
   AlertMessageTokenType,
diff --git a/x-pack/plugins/monitoring/dev_docs/reference/indices.md b/x-pack/plugins/monitoring/dev_docs/reference/indices.md
index c1c95d26842a7..41038ba43b845 100644
--- a/x-pack/plugins/monitoring/dev_docs/reference/indices.md
+++ b/x-pack/plugins/monitoring/dev_docs/reference/indices.md
@@ -33,7 +33,17 @@ When updating the templates, it is important to increment the version number [he
 PRs should add the labels ":Data Management/Monitoring" and "Team:Data Management" to involve the right Elasticsearch members.
 [Reference PR](https://github.com/elastic/elasticsearch/pull/85447)
 
-The `metrics-*` and `metricbeat-*` mappings are managed by metricbeat and elastic agent, **code locations TBD**.
+The `metrics-*` and `metricbeat-*` mappings are managed by metricbeat and elastic agent. The mappings are created by metricbeat programmatically by combining the field definitions of all the contained modules.
+
+## Fields
+
+The best place to reference information for each field is in the metricbeat module documentation for each component.
+
+- [Elasticsearch](https://github.com/elastic/beats/blob/main/metricbeat/module/elasticsearch/_meta/README.md)
+- [Kibana](https://github.com/elastic/beats/blob/main/metricbeat/module/kibana/_meta/README.md)
+- [Logstash](https://github.com/elastic/beats/blob/main/metricbeat/module/logstash/_meta/README.md)
+- [Beat](https://github.com/elastic/beats/blob/main/metricbeat/module/beat/_meta/README.md) (\*beat, apm-server, fleet server)
+- [Enterprise Search](https://github.com/elastic/beats/tree/main/x-pack/metricbeat/module/enterprisesearch/_meta/README.md)
 
 ## Aliasing
 
diff --git a/x-pack/plugins/monitoring/kibana.json b/x-pack/plugins/monitoring/kibana.json
index d10d8d674fcaf..808d052546bf1 100644
--- a/x-pack/plugins/monitoring/kibana.json
+++ b/x-pack/plugins/monitoring/kibana.json
@@ -7,7 +7,7 @@
     "githubTeam": "stack-monitoring-ui"
   },
   "configPath": ["monitoring"],
-  "requiredPlugins": ["licensing", "features", "data", "navigation", "observability"],
+  "requiredPlugins": ["licensing", "features", "data", "navigation", "observability", "dataViews"],
   "optionalPlugins": [
     "infra",
     "usageCollection",
@@ -22,7 +22,6 @@
   "ui": true,
   "requiredBundles": [
     "kibanaUtils",
-    "home",
     "alerting",
     "kibanaReact"
   ]
diff --git a/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx b/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
index edabe65f90df3..592a76744bab7 100644
--- a/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
@@ -13,21 +13,21 @@ import React, { Fragment, lazy } from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { ReactWrapper, mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from 'src/core/public/mocks';
-import { actionTypeRegistryMock } from '../../../triggers_actions_ui/public/application/action_type_registry.mock';
-import { ruleTypeRegistryMock } from '../../../triggers_actions_ui/public/application/rule_type_registry.mock';
+import { coreMock } from '@kbn/core/public/mocks';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
+import { ruleTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/rule_type_registry.mock';
 import {
   ValidationResult,
   Rule,
   ConnectorValidationResult,
   GenericValidationResult,
   RuleTypeModel,
-} from '../../../triggers_actions_ui/public/types';
-import { RuleForm } from '../../../triggers_actions_ui/public/application/sections/rule_form/rule_form';
-import ActionForm from '../../../triggers_actions_ui/public/application/sections/action_connector_form/action_form';
+} from '@kbn/triggers-actions-ui-plugin/public/types';
+import { RuleForm } from '@kbn/triggers-actions-ui-plugin/public/application/sections/rule_form/rule_form';
+import ActionForm from '@kbn/triggers-actions-ui-plugin/public/application/sections/action_connector_form/action_form';
 import { Legacy } from '../legacy_shims';
 import { I18nProvider } from '@kbn/i18n-react';
-import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 
 interface AlertAction {
   group: string;
@@ -36,12 +36,12 @@ interface AlertAction {
   params: unknown;
 }
 
-jest.mock('../../../triggers_actions_ui/public/application/lib/action_connector_api', () => ({
+jest.mock('@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api', () => ({
   loadAllActions: jest.fn(),
   loadActionTypes: jest.fn(),
 }));
 
-jest.mock('../../../triggers_actions_ui/public/application/lib/rule_api', () => ({
+jest.mock('@kbn/triggers-actions-ui-plugin/public/application/lib/rule_api', () => ({
   loadAlertTypes: jest.fn(),
 }));
 
@@ -182,7 +182,7 @@ describe('alert_form', () => {
       async function setup() {
         initLegacyShims();
         const { loadAllActions } = jest.requireMock(
-          '../../../triggers_actions_ui/public/application/lib/action_connector_api'
+          '@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api'
         );
         loadAllActions.mockResolvedValueOnce([
           {
diff --git a/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx b/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx
index 4a5a03dbebc83..5cfdfdc056f5b 100644
--- a/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/alerts_dropdown.tsx
@@ -14,7 +14,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { MonitoringStartServices } from '../types';
 import { useAlertsModal } from '../application/hooks/use_alerts_modal';
 
diff --git a/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx
index 55e8d4c5bd245..4aae64b10fe6c 100644
--- a/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/ccr_read_exceptions_alert/index.tsx
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { RuleTypeParams } from '../../../../alerting/common';
-import type { RuleTypeModel, ValidationResult } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import type { RuleTypeModel, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_CCR_READ_EXCEPTIONS,
   RULE_DETAILS,
diff --git a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx
index f6a673f013668..670b9fe75fc07 100644
--- a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/expression.tsx
@@ -7,7 +7,7 @@
 
 import React, { Fragment, useCallback } from 'react';
 import { EuiForm, EuiFormRow, EuiSpacer } from '@elastic/eui';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { debounce } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { CommonAlertParamDetails } from '../../../../common/types/alerts';
@@ -29,14 +29,14 @@ export interface Props {
   setRuleProperty: (property: string, value: any) => void;
   errors: { [key: string]: string[] };
   paramDetails: CommonAlertParamDetails;
-  data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   config?: MonitoringConfig;
 }
 
 export const Expression: React.FC<Props> = (props) => {
-  const { ruleParams, paramDetails, setRuleParams, errors, config, data } = props;
+  const { ruleParams, paramDetails, setRuleParams, errors, config, dataViews } = props;
 
-  const { derivedIndexPattern } = useDerivedIndexPattern(data, config);
+  const { derivedIndexPattern } = useDerivedIndexPattern(dataViews, config);
 
   const alertParamsUi = Object.keys(paramDetails).map((alertParamName) => {
     const details = paramDetails[alertParamName];
@@ -92,11 +92,12 @@ export const Expression: React.FC<Props> = (props) => {
 
   const onFilterChange = useCallback(
     (filter: string) => {
-      setRuleParams('filterQueryText', filter);
-      setRuleParams(
-        'filterQuery',
-        convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
-      );
+      if (derivedIndexPattern) setRuleParams('filterQueryText', filter);
+      if (derivedIndexPattern)
+        setRuleParams(
+          'filterQuery',
+          convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
+        );
     },
     [setRuleParams, derivedIndexPattern]
   );
@@ -106,6 +107,17 @@ export const Expression: React.FC<Props> = (props) => {
     onFilterChange,
   ]);
 
+  const kueryBar = derivedIndexPattern ? (
+    <KueryBar
+      value={ruleParams.filterQueryText}
+      derivedIndexPattern={derivedIndexPattern}
+      onSubmit={onFilterChange}
+      onChange={debouncedOnFilterChange}
+    />
+  ) : (
+    <></>
+  );
+
   return (
     <Fragment>
       <EuiForm component="form">
@@ -119,12 +131,7 @@ export const Expression: React.FC<Props> = (props) => {
             defaultMessage: 'Use a KQL expression to limit the scope of your alert trigger.',
           })}
         >
-          <KueryBar
-            value={ruleParams.filterQueryText}
-            derivedIndexPattern={derivedIndexPattern}
-            onSubmit={onFilterChange}
-            onChange={debouncedOnFilterChange}
-          />
+          {kueryBar}
         </EuiFormRow>
         <EuiSpacer />
       </EuiForm>
diff --git a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx
index 1f133176a743e..74bd9c4bb4cd6 100644
--- a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/use_derived_index_pattern.tsx
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { DataViewFieldBase } from '@kbn/es-query';
 import { useEffect, useState } from 'react';
-import { DataPublicPluginStart, IIndexPattern } from 'src/plugins/data/public';
+import { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
 import { prefixIndexPattern } from '../../../../common/ccs_utils';
 import {
   INDEX_PATTERN_BEATS,
@@ -20,26 +19,21 @@ import { MonitoringConfig } from '../../../types';
 const INDEX_PATTERNS = `${INDEX_PATTERN_ELASTICSEARCH},${INDEX_PATTERN_KIBANA},${INDEX_PATTERN_LOGSTASH},${INDEX_PATTERN_BEATS}`;
 
 export const useDerivedIndexPattern = (
-  data: DataPublicPluginStart,
+  dataViews: DataViewsPublicPluginStart,
   config?: MonitoringConfig
-): { loading: boolean; derivedIndexPattern: IIndexPattern } => {
+): { loading: boolean; derivedIndexPattern?: DataView } => {
   const indexPattern = prefixIndexPattern(config || ({} as MonitoringConfig), INDEX_PATTERNS, '*');
   const [loading, setLoading] = useState<boolean>(true);
-  const [fields, setFields] = useState<DataViewFieldBase[]>([]);
+  const [dataView, setDataView] = useState<DataView>();
   useEffect(() => {
     (async function fetchData() {
-      const result = await data.indexPatterns.getFieldsForWildcard({
-        pattern: indexPattern,
-      });
-      setFields(result);
+      const result = await dataViews.create({ title: indexPattern });
+      setDataView(result);
       setLoading(false);
     })();
-  }, [indexPattern, data.indexPatterns]);
+  }, [indexPattern, dataViews]);
   return {
     loading,
-    derivedIndexPattern: {
-      title: indexPattern,
-      fields,
-    },
+    derivedIndexPattern: dataView,
   };
 };
diff --git a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx
index c240810786f63..814901e318a3a 100644
--- a/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/components/param_details_form/validation.tsx
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { RuleTypeParams } from '../../../../../alerting/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../../triggers_actions_ui/public/types';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public/types';
 
 export type MonitoringAlertTypeParams = ValidateOptions & RuleTypeParams;
 interface ValidateOptions {
diff --git a/x-pack/plugins/monitoring/public/alerts/configuration.tsx b/x-pack/plugins/monitoring/public/alerts/configuration.tsx
index 6dd62a9a1dae6..0d37b7abc3757 100644
--- a/x-pack/plugins/monitoring/public/alerts/configuration.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/configuration.tsx
@@ -9,10 +9,10 @@ import React, { Fragment, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSwitch } from '@elastic/eui';
+import { BASE_ALERTING_API_PATH } from '@kbn/alerting-plugin/common';
 import { CommonAlert } from '../../common/types/alerts';
 import { Legacy } from '../legacy_shims';
 import { hideBottomBar, showBottomBar } from '../lib/setup_mode';
-import { BASE_ALERTING_API_PATH } from '../../../alerting/common';
 
 interface Props {
   alert: CommonAlert;
diff --git a/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx b/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx
index bc4a494b129bd..fbfc897dd1d6c 100644
--- a/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { RULE_CPU_USAGE, RULE_DETAILS, RULE_REQUIRES_APP_CONTEXT } from '../../../common/constants';
 import type { MonitoringConfig } from '../../types';
 import {
diff --git a/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx
index d9885a363ca89..29a5db3ad45e6 100644
--- a/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_DISK_USAGE,
diff --git a/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx
index 3be2d4477fe10..a97be949e3120 100644
--- a/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/large_shard_size_alert/index.tsx
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { RuleTypeParams } from '../../../../alerting/common';
-import type { RuleTypeModel, ValidationResult } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import type { RuleTypeModel, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_LARGE_SHARD_SIZE,
diff --git a/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx b/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx
index 243db5787228e..475d625195aba 100644
--- a/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/legacy_alert/expression.tsx
@@ -15,15 +15,16 @@ import { Props } from '../components/param_details_form/expression';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
-export const Expression = ({ ruleParams, config, setRuleParams, data }: Props) => {
-  const { derivedIndexPattern } = useDerivedIndexPattern(data, config);
+export const Expression = ({ ruleParams, config, setRuleParams, dataViews }: Props) => {
+  const { derivedIndexPattern } = useDerivedIndexPattern(dataViews, config);
   const onFilterChange = useCallback(
     (filter: string) => {
-      setRuleParams('filterQueryText', filter);
-      setRuleParams(
-        'filterQuery',
-        convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
-      );
+      if (derivedIndexPattern) setRuleParams('filterQueryText', filter);
+      if (derivedIndexPattern)
+        setRuleParams(
+          'filterQuery',
+          convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || ''
+        );
     },
     [setRuleParams, derivedIndexPattern]
   );
@@ -32,6 +33,18 @@ export const Expression = ({ ruleParams, config, setRuleParams, data }: Props) =
   const debouncedOnFilterChange = useCallback(debounce(onFilterChange, FILTER_TYPING_DEBOUNCE_MS), [
     onFilterChange,
   ]);
+
+  const kueryBar = derivedIndexPattern ? (
+    <KueryBar
+      value={ruleParams.filterQueryText}
+      derivedIndexPattern={derivedIndexPattern}
+      onSubmit={onFilterChange}
+      onChange={debouncedOnFilterChange}
+    />
+  ) : (
+    <></>
+  );
+
   return (
     <EuiForm component="form">
       <EuiFormRow
@@ -43,12 +56,7 @@ export const Expression = ({ ruleParams, config, setRuleParams, data }: Props) =
           defaultMessage: 'Use a KQL expression to limit the scope of your alert trigger.',
         })}
       >
-        <KueryBar
-          value={ruleParams.filterQueryText}
-          derivedIndexPattern={derivedIndexPattern}
-          onSubmit={onFilterChange}
-          onChange={debouncedOnFilterChange}
-        />
+        {kueryBar}
       </EuiFormRow>
       <EuiSpacer />
     </EuiForm>
diff --git a/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx b/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx
index 505f18a5fdcf3..c41084bf737d9 100644
--- a/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/legacy_alert/legacy_alert.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   LEGACY_RULES,
   LEGACY_RULE_DETAILS,
diff --git a/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx b/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx
index 18806162b8b30..8652964e706b5 100644
--- a/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiLink } from '@elastic/eui';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Legacy } from '../../legacy_shims';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
 
 export interface EnableAlertResponse {
   isSufficientlySecure?: boolean;
diff --git a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx
index 86fa82b7515a2..445006ecf715e 100644
--- a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_category.test.tsx
@@ -18,7 +18,7 @@ import {
   RULE_DISK_USAGE,
   RULE_MEMORY_USAGE,
 } from '../../../common/constants';
-import { RuleExecutionStatusValues } from '../../../../alerting/common';
+import { RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { AlertState } from '../../../common/types/alerts';
 
 jest.mock('../../legacy_shims', () => ({
diff --git a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx
index 60cd91f76f31e..7e7cd96f75aba 100644
--- a/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/lib/get_alert_panels_by_node.test.tsx
@@ -18,7 +18,7 @@ import {
   RULE_DISK_USAGE,
   RULE_MEMORY_USAGE,
 } from '../../../common/constants';
-import { RuleExecutionStatusValues } from '../../../../alerting/common';
+import { RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { AlertState } from '../../../common/types/alerts';
 
 jest.mock('../../legacy_shims', () => ({
diff --git a/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx
index c4aa9e13b5786..fbf13db2370d7 100644
--- a/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/memory_usage_alert/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_MEMORY_USAGE,
diff --git a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx
index 975e537d868b8..06da171383319 100644
--- a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/missing_monitoring_data_alert.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_MISSING_MONITORING_DATA,
diff --git a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx
index 674576ce5c1a4..b442a60c8506c 100644
--- a/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/missing_monitoring_data_alert/validation.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../triggers_actions_ui/public/types';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public/types';
 
 export function validate(opts: any): ValidationResult {
   const validationResult = { errors: {} };
diff --git a/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
index 4204ea581eeda..5b8030188b456 100644
--- a/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
@@ -8,7 +8,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { RULE_REQUIRES_APP_CONTEXT } from '../../../common/constants';
 import type { CommonAlertParamDetails } from '../../../common/types/alerts';
 import type { MonitoringConfig } from '../../types';
diff --git a/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx b/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx
index bb8195744cc31..6abbc5718ad61 100644
--- a/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx
+++ b/x-pack/plugins/monitoring/public/application/contexts/global_state_context.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import React, { createContext } from 'react';
+import { TimeRange, RefreshInterval } from '@kbn/data-plugin/public';
 import { GlobalState } from '../../url_state';
 import { MonitoringStartPluginDependencies, MonitoringStartServices } from '../../types';
-import { TimeRange, RefreshInterval } from '../../../../../../src/plugins/data/public';
 import { Legacy } from '../../legacy_shims';
 import { shouldOverrideRefreshInterval } from './should_override_refresh_interval';
 
diff --git a/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx b/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx
index 031db07327e36..8e0f4361dcbeb 100644
--- a/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx
+++ b/x-pack/plugins/monitoring/public/application/contexts/header_action_menu_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 
 interface ContextProps {
   setHeaderActionMenu?: AppMountParameters['setHeaderActionMenu'];
diff --git a/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts b/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts
index 9b6c94929862d..ba95e4402d596 100644
--- a/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts
+++ b/x-pack/plugins/monitoring/public/application/contexts/should_override_refresh_interval.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { MonitoringStartPluginDependencies, MonitoringStartServices } from '../../types';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
 
 export const shouldOverrideRefreshInterval = (
   uiSettings: MonitoringStartServices['uiSettings'],
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts b/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts
index 6cbeffd3cb737..5469d02895bfc 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_alerts_modal.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useRequestErrorHandler } from './use_request_error_handler';
 import { EnableAlertResponse, showAlertsToast } from '../../alerts/lib/alerts_toast';
 
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts b/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts
index 0bfd258e7e489..95cae1720fd07 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_breadcrumbs.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import createContainer from 'constate';
 import { History } from 'history';
 import { Observable } from 'rxjs';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface Crumb {
   url?: string | null;
@@ -243,9 +243,11 @@ export const useBreadcrumbs = ({ history }: { history: History }) => {
     (bcrumbs?: BreadcrumbItem[]) => {
       if (!chrome) return;
       if (!bcrumbs) {
-        const currentBreadcrumbs: Observable<any> & {
-          value?: BreadcrumbItem[];
-        } = chrome.getBreadcrumbs$()?.source;
+        const currentBreadcrumbs:
+          | (Observable<any> & {
+              value?: BreadcrumbItem[];
+            })
+          | undefined = chrome.getBreadcrumbs$()?.source;
         if (currentBreadcrumbs && currentBreadcrumbs.value) {
           bcrumbs = currentBreadcrumbs.value;
         }
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx b/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx
index 25d7f139e5bbe..c37fae742d0ca 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_charts.tsx
@@ -7,8 +7,8 @@
 import moment from 'moment';
 import { useContext, useState, useEffect, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { MonitoringTimeContainer } from '../hooks/use_monitoring_time';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { MonitoringTimeContainer } from './use_monitoring_time';
 
 export function useCharts() {
   const { services } = useKibana<{ data: any }>();
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts b/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts
index 1961bd53b909f..473b0b0fd90ab 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useState, useEffect } from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { fetchClusters } from '../../lib/fetch_clusters';
 import { useRequestErrorHandler } from './use_request_error_handler';
 
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts b/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts
index 8f1a5d6f4a9d3..13f40fc89a704 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_monitoring_time.ts
@@ -6,7 +6,7 @@
  */
 import { useCallback, useState, useContext, useEffect } from 'react';
 import createContainer from 'constate';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Legacy } from '../../legacy_shims';
 import { GlobalStateContext } from '../contexts/global_state_context';
 
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx b/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
index ccf58c1f9d47a..ee7a1941bda6e 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_request_error_handler.tsx
@@ -8,11 +8,11 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useHistory } from 'react-router-dom';
 import { includes } from 'lodash';
-import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 import { formatMsg } from '../../lib/format_msg';
-import { toMountPoint, useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { MonitoringStartPluginDependencies } from '../../types';
 
 export function formatMonitoringError(err: IHttpFetchError<ResponseErrorBody>) {
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_table.ts b/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
index be1983c373c27..f611924372af1 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
@@ -7,8 +7,8 @@
 
 import { useState, useCallback } from 'react';
 import { EuiTableSortingType } from '@elastic/eui';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { euiTableStorageGetter, euiTableStorageSetter } from '../../components/table';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { EUI_SORT_ASCENDING } from '../../../common/constants';
 
 interface Pagination {
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_title.ts b/x-pack/plugins/monitoring/public/application/hooks/use_title.ts
index 25cc2c5b40dff..a4661e71eb399 100644
--- a/x-pack/plugins/monitoring/public/application/hooks/use_title.ts
+++ b/x-pack/plugins/monitoring/public/application/hooks/use_title.ts
@@ -6,7 +6,7 @@
  */
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 // TODO: verify that works for all pages
 export function useTitle(cluster: string, suffix: string) {
diff --git a/x-pack/plugins/monitoring/public/application/index.tsx b/x-pack/plugins/monitoring/public/application/index.tsx
index 5d5d0c8bdd8a6..3fd12c312d13f 100644
--- a/x-pack/plugins/monitoring/public/application/index.tsx
+++ b/x-pack/plugins/monitoring/public/application/index.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreStart, AppMountParameters, MountPoint, CoreTheme } from 'kibana/public';
+import { CoreStart, AppMountParameters, MountPoint, CoreTheme } from '@kbn/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Switch, Redirect, Router } from 'react-router-dom';
 import { Observable } from 'rxjs';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { LoadingPage } from './pages/loading_page';
 import { LicensePage } from './pages/license_page';
 import { ClusterOverview } from './pages/cluster/overview_page';
diff --git a/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx b/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
index da245ecd80d81..80c2839131047 100644
--- a/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/access_denied/index.tsx
@@ -11,8 +11,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiPanel, EuiCallOut, EuiButton } from '@elastic/eui';
 import useInterval from 'react-use/lib/useInterval';
 import { Redirect } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { MonitoringStartPluginDependencies } from '../../../types';
 
 export const AccessDeniedPage: React.FC<ComponentProps> = () => {
diff --git a/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx
index 9f8260b4fa0d9..97f19f3cf9204 100644
--- a/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/apm/instance.tsx
@@ -9,9 +9,9 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useCharts } from '../../hooks/use_charts';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
 import { PageTemplate } from '../page_template';
diff --git a/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx
index fa3420d439eca..29f6a1f9e056e 100644
--- a/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/apm/instances.tsx
@@ -8,9 +8,9 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTable } from '../../hooks/use_table';
 import { ApmTemplate } from './apm_template';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx
index 39144505d9818..1cf264daaeea3 100644
--- a/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/apm/overview.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { ApmTemplate } from './apm_template';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { useCharts } from '../../hooks/use_charts';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
 // @ts-ignore
 import { ApmOverview } from '../../../components/apm/overview';
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx
index 70dba8d5f0d3c..68345db40caf2 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instance.tsx
@@ -9,9 +9,9 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useCharts } from '../../hooks/use_charts';
 // @ts-ignore
 import { Beat } from '../../../components/beats/beat';
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
index a677d22cbd3a7..ea4f04151e83a 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/instances.tsx
@@ -8,9 +8,9 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTable } from '../../hooks/use_table';
 import { BeatsTemplate } from './beats_template';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
index fad66cd03e444..610fbe7ce2daf 100644
--- a/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/beats/overview.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { BeatsTemplate } from './beats_template';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { useCharts } from '../../hooks/use_charts';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 // @ts-ignore
 import { BeatsOverview } from '../../../components/beats/overview';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
diff --git a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
index 2ffbc3a75ce05..d128beee7ce87 100644
--- a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
@@ -7,9 +7,9 @@
 
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CODE_PATH_ALL } from '../../../../common/constants';
 import { PageTemplate } from '../page_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { TabMenuItem } from '../page_template';
 import { Overview } from '../../../components/cluster/overview';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx
index 2ab18331d1cdb..cc0113acb3b5f 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { Ccr } from '../../../components/elasticsearch/ccr';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx
index db6018795e01b..925baa5edd052 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ccr_shard_page.tsx
@@ -9,8 +9,8 @@ import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PageTemplate } from '../page_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { CcrShard } from '../../../components/elasticsearch/ccr_shard';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx
index 1982b7de87cae..734d59f310676 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_advanced_page.tsx
@@ -8,7 +8,7 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
 import { useParams } from 'react-router-dom';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 import { SetupModeRenderer, SetupModeProps } from '../../../components/renderers/setup_mode';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx
index 5a3a48bdfe17f..b1029dc0451cc 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/index_page.tsx
@@ -8,10 +8,10 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
-import { Index } from '../../../components/elasticsearch/index/index';
+import { Index } from '../../../components/elasticsearch/index/index.js';
 import { ComponentProps } from '../../route_init';
 import { SetupModeRenderer, SetupModeProps } from '../../../components/renderers/setup_mode';
 import { SetupModeContext } from '../../../components/setup_mode/setup_mode_context';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx
index 6618db7eebe66..d14015532167e 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/indices_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ElasticsearchIndices } from '../../../components/elasticsearch';
 import { ComponentProps } from '../../route_init';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx
index 0f002323c310f..5c7fd227a0a53 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/ml_jobs_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ElasticsearchMLJobs } from '../../../components/elasticsearch';
 import { ComponentProps } from '../../route_init';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
index 820eb2fb20cd8..05394a6d36aec 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
@@ -8,8 +8,8 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ItemTemplate } from './item_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { AdvancedNode } from '../../../components/elasticsearch/node/advanced';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
index e09a1a2343c7b..e41e921985015 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
@@ -8,8 +8,8 @@ import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { find } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ItemTemplate } from './item_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { Node } from '../../../components/elasticsearch';
 import { ComponentProps } from '../../route_init';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
index 5d5fa4df458e1..156d8463b80be 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/nodes_page.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ExternalConfigContext } from '../../contexts/external_config_context';
 import { ElasticsearchNodes } from '../../../components/elasticsearch';
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx
index 16fa6de24b6b7..c4524bb161040 100644
--- a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/overview.tsx
@@ -7,8 +7,8 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ElasticsearchTemplate } from './elasticsearch_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 // @ts-ignore
 import { ElasticsearchOverview } from '../../../components/elasticsearch';
diff --git a/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx
index 50266c90aceeb..75d2d2f89fae1 100644
--- a/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/enterprise_search/overview.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { EntSearchTemplate } from './ent_search_template';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { useCharts } from '../../hooks/use_charts';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { EnterpriseSearchOverview } from '../../../components/enterprise_search/overview';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
 
diff --git a/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx b/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx
index a31f2bc317fa6..80c46342294f5 100644
--- a/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/home/cluster_listing.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { Redirect } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 // @ts-ignore
 import { Listing } from '../../../components/cluster/listing';
 import { EnableAlertsModal } from '../../../alerts/enable_alerts_modal';
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
index 262590b6806af..5332968c1c34a 100644
--- a/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
@@ -18,9 +18,9 @@ import {
   EuiFlexItem,
   EuiPanel,
 } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useCharts } from '../../hooks/use_charts';
 // @ts-ignore
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
index f20099b286808..6f1f822b8488f 100644
--- a/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
@@ -8,9 +8,9 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ComponentProps } from '../../route_init';
 import { GlobalStateContext } from '../../contexts/global_state_context';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTable } from '../../hooks/use_table';
 import { KibanaTemplate } from './kibana_template';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
index 4c480bf1fbb33..078559ac30663 100644
--- a/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
@@ -17,8 +17,8 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { KibanaTemplate } from './kibana_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/license_page.tsx b/x-pack/plugins/monitoring/public/application/pages/license_page.tsx
index 05dcb32b75b98..2f0e424d14238 100644
--- a/x-pack/plugins/monitoring/public/application/pages/license_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/license_page.tsx
@@ -8,11 +8,11 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { PageTemplate } from './page_template';
 import { License } from '../../components';
 import { GlobalStateContext } from '../contexts/global_state_context';
 import { CODE_PATH_LICENSE, STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../common/constants';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { MonitoringTimeContainer } from '../hooks/use_monitoring_time';
 
 const CODE_PATHS = [CODE_PATH_LICENSE];
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx
index abff02ef7b3c3..10c2a1f9761de 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/advanced.tsx
@@ -17,7 +17,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { useRouteMatch } from 'react-router-dom';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx
index aa722e5c3e245..32e4eb1dd7a7b 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/node.tsx
@@ -17,7 +17,7 @@ import {
   EuiFlexGrid,
   EuiFlexItem,
 } from '@elastic/eui';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
index 35f4c0ce2ac44..a04d55a249734 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
@@ -7,22 +7,21 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-// @ts-ignore
 import { useRouteMatch } from 'react-router-dom';
-// @ts-ignore
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+// @ts-expect-error
 import { isPipelineMonitoringSupportedInVersion } from '../../../lib/logstash/pipelines';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
-// @ts-ignore
+// @ts-expect-error
 import { Listing } from '../../../components/logstash/listing';
 import { LogstashTemplate } from './logstash_template';
-// @ts-ignore
+// @ts-expect-error
 import { DetailStatus } from '../../../components/logstash/detail_status';
-// @ts-ignore
+// @ts-expect-error
 import { MonitoringTimeseriesContainer } from '../../../components/chart';
 import { useTable } from '../../hooks/use_table';
-// @ts-ignore
+// @ts-expect-error
 import { PipelineListing } from '../../../components/logstash/pipeline_listing/pipeline_listing';
 import { useCharts } from '../../hooks/use_charts';
 import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
index a603106242082..b350f057aae96 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
index 60c9463d39bda..e8b9dda758713 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 import { useCharts } from '../../hooks/use_charts';
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
index 3d78a98170d50..af68390aa4e76 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
 import moment from 'moment';
 import { useRouteMatch } from 'react-router-dom';
-import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
index ace8c23a480ba..a669b06ac8bcf 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
@@ -7,7 +7,7 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { find } from 'lodash';
-import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../contexts/global_state_context';
 import { ComponentProps } from '../../route_init';
 import { useCharts } from '../../hooks/use_charts';
diff --git a/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx b/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx
index e767074aea42b..d0806c1d86c02 100644
--- a/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/no_data/no_data_page.tsx
@@ -10,9 +10,9 @@ import { Redirect } from 'react-router-dom';
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { NoData } from '../../../components/no_data';
 import { PageTemplate } from '../page_template';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { CODE_PATH_LICENSE, STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
 import { Legacy } from '../../../legacy_shims';
 import { Enabler } from './enabler';
diff --git a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
index 06a274d94be10..6e4209aa6bc4c 100644
--- a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
@@ -16,7 +16,8 @@ import {
 } from '@elastic/eui';
 import React, { useContext, useState, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
-import { IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
+import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
 import { useTitle } from '../hooks/use_title';
 import { MonitoringToolbar } from '../../components/shared/toolbar';
 import { MonitoringTimeContainer } from '../hooks/use_monitoring_time';
@@ -31,8 +32,7 @@ import { SetupModeFeature } from '../../../common/enums';
 import { AlertsDropdown } from '../../alerts/alerts_dropdown';
 import { useRequestErrorHandler } from '../hooks/use_request_error_handler';
 import { SetupModeToggleButton } from '../../components/setup_mode/toggle_button';
-import { HeaderMenuPortal } from '../../../../observability/public';
-import { HeaderActionMenuContext } from '../../application/contexts/header_action_menu_context';
+import { HeaderActionMenuContext } from '../contexts/header_action_menu_context';
 
 export interface TabMenuItem {
   id: string;
diff --git a/x-pack/plugins/monitoring/public/components/apm/status_icon.js b/x-pack/plugins/monitoring/public/components/apm/status_icon.js
index 14a51313e4aa7..5ca93d47e1e18 100644
--- a/x-pack/plugins/monitoring/public/components/apm/status_icon.js
+++ b/x-pack/plugins/monitoring/public/components/apm/status_icon.js
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { StatusIcon, STATUS_ICON_TYPES } from '../../components/status_icon';
+import { StatusIcon, STATUS_ICON_TYPES } from '../status_icon';
 import { i18n } from '@kbn/i18n';
 
 export function ApmStatusIcon({ status, availability = true }) {
diff --git a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
index 4fdda2372dd0d..2a8c9caf19c52 100644
--- a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
@@ -16,7 +16,7 @@ import {
   EuiScreenReaderOnly,
   EuiPanel,
 } from '@elastic/eui';
-import { Stats } from '../../beats';
+import { Stats } from '..';
 import { formatMetric } from '../../../lib/format_number';
 import { EuiMonitoringTable } from '../../table';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/monitoring/public/components/beats/overview/overview.js b/x-pack/plugins/monitoring/public/components/beats/overview/overview.js
index d9762b150974d..e4355aab02a5e 100644
--- a/x-pack/plugins/monitoring/public/components/beats/overview/overview.js
+++ b/x-pack/plugins/monitoring/public/components/beats/overview/overview.js
@@ -9,7 +9,7 @@ import React from 'react';
 import { LatestActive } from './latest_active';
 import { LatestVersions } from './latest_versions';
 import { LatestTypes } from './latest_types';
-import { Stats } from '../';
+import { Stats } from '..';
 import { MonitoringTimeseriesContainer } from '../../chart';
 import {
   EuiCallOut,
diff --git a/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js b/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js
index 2c6200284bdd7..a9590c8d94d2f 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/listing/listing.js
@@ -28,7 +28,7 @@ import { AlertsStatus } from '../../../alerts/status';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
 import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link';
 import './listing.scss';
-import { toMountPoint, useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 
 const IsClusterSupported = ({ isSupported, children }) => {
   return isSupported ? children : '-';
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
index 41663bc0e4e72..66329b52231a8 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js
@@ -6,7 +6,7 @@
  */
 
 import React, { Fragment } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   EuiPage,
   EuiPageBody,
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js
index b749e31226994..97a03d5206276 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_activity/shard_activity.js
@@ -15,7 +15,7 @@ import { FilesProgress, BytesProgress, TranslogProgress } from './progress';
 import { parseProps } from './parse_props';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 const columns = [
   {
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx
index 522256ea49b98..f241bdb798f88 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/autocomplete_field.tsx
@@ -7,8 +7,8 @@
 
 import { EuiFieldSearch, EuiOutsideClickDetector, EuiPanel } from '@elastic/eui';
 import React from 'react';
-import { QuerySuggestion } from '../../../../../../src/plugins/data/public';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { composeStateUpdaters } from '../../lib/typed_react';
 import { SuggestionItem } from './suggestion_item';
 
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx
index 6d79266fe3cc6..9e5588c94a954 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/index.tsx
@@ -8,7 +8,8 @@
 import { fromKueryExpression } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
-import { IIndexPattern, QuerySuggestion } from '../../../../../../src/plugins/data/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { QuerySuggestion } from '@kbn/data-plugin/public';
 import { AutocompleteField } from './autocomplete_field';
 import { WithKueryAutocompletion } from './with_kuery_autocompletion';
 
@@ -21,7 +22,7 @@ type LoadSuggestionsFn = (
 export type CurryLoadSuggestionsType = (loadSuggestions: LoadSuggestionsFn) => LoadSuggestionsFn;
 
 interface Props {
-  derivedIndexPattern: IIndexPattern;
+  derivedIndexPattern: DataView;
   onSubmit: (query: string) => void;
   onChange?: (query: string) => void;
   value?: string | null;
@@ -64,17 +65,12 @@ export const KueryBar = ({
     }
   };
 
-  const filteredDerivedIndexPattern = {
-    ...derivedIndexPattern,
-    fields: derivedIndexPattern.fields,
-  };
-
   const defaultPlaceholder = i18n.translate('xpack.monitoring.alerts.kqlSearchFieldPlaceholder', {
     defaultMessage: 'Search for monitoring data',
   });
 
   return (
-    <WithKueryAutocompletion indexPattern={filteredDerivedIndexPattern}>
+    <WithKueryAutocompletion indexPattern={derivedIndexPattern}>
       {({ isLoadingSuggestions, loadSuggestions, suggestions }) => (
         <AutocompleteField
           aria-label={placeholder}
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx
index 3681bf26987cc..47a5114f79173 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/suggestion_item.tsx
@@ -8,8 +8,8 @@
 import { EuiIcon } from '@elastic/eui';
 import { transparentize } from 'polished';
 import React from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../../../../../src/plugins/data/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/data-plugin/public';
 
 interface Props {
   isSelected?: boolean;
diff --git a/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx b/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx
index 8d79bf4039846..6284b5b60e0e2 100644
--- a/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx
+++ b/x-pack/plugins/monitoring/public/components/kuery_bar/with_kuery_autocompletion.tsx
@@ -6,12 +6,13 @@
  */
 
 import React from 'react';
-import { QuerySuggestion, IIndexPattern, DataPublicPluginStart } from 'src/plugins/data/public';
+import { QuerySuggestion, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import {
   withKibana,
   KibanaReactContextValue,
   KibanaServices,
-} from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { RendererFunction } from '../../lib/typed_react';
 
 interface WithKueryAutocompletionLifecycleProps {
@@ -21,7 +22,7 @@ interface WithKueryAutocompletionLifecycleProps {
     loadSuggestions: (expression: string, cursorPosition: number, maxSuggestions?: number) => void;
     suggestions: QuerySuggestion[];
   }>;
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
 }
 
 interface WithKueryAutocompletionLifecycleState {
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
index 4bf4990553837..5b0e9d586771a 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_listing/pipeline_listing.js
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 import { formatMetric } from '../../../lib/format_number';
 import { ClusterStatus } from '../cluster_status';
-import { Sparkline } from '../../../components/sparkline';
+import { Sparkline } from '../../sparkline';
 import { EuiMonitoringSSPTable } from '../../table';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
index 0247dcf532ceb..0a757f8d88346 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/index.test.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Graph } from './';
+import { Graph } from '.';
 import { Vertex } from './vertex';
 import { PluginVertex } from './plugin_vertex';
 import { Edge } from './edge';
diff --git a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
index ff1226922a29d..e106b3409781d 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/pipeline_viewer/models/graph/vertex.test.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Graph } from './';
+import { Graph } from '.';
 
 describe('Vertex', () => {
   let graph;
diff --git a/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js b/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
index 0c99bf6f3e2f0..784f377c2020c 100644
--- a/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
+++ b/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
@@ -27,7 +27,7 @@ import {
   EuiCheckbox,
 } from '@elastic/eui';
 import { getInstructionSteps } from '../instruction_steps';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import {
   STORAGE_KEY,
   ELASTICSEARCH_SYSTEM_ID,
diff --git a/x-pack/plugins/monitoring/public/components/page_loading/index.tsx b/x-pack/plugins/monitoring/public/components/page_loading/index.tsx
index 383266c62c5f6..54289a2128a29 100644
--- a/x-pack/plugins/monitoring/public/components/page_loading/index.tsx
+++ b/x-pack/plugins/monitoring/public/components/page_loading/index.tsx
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import './page_loading.scss';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 
 function PageLoadingUI() {
   return (
diff --git a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
index 3680a00cbe3c7..8119685dc65f6 100644
--- a/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
+++ b/x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
@@ -15,7 +15,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Fragment } from 'react';
-import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { GlobalStateContext } from '../../application/contexts/global_state_context';
 import { useRequestErrorHandler } from '../../application/hooks/use_request_error_handler';
 import {
diff --git a/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
index 3e931caadcdff..f91641d942815 100644
--- a/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
+++ b/x-pack/plugins/monitoring/public/components/setup_mode/toggle_button.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { METRIC_TYPE, useUiTracker } from '../../../../observability/public';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import { TELEMETRY_METRIC_BUTTON_CLICK } from '../../../common/constants';
 import { SetupModeExitButton } from './exit_button';
 
diff --git a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
index 7ae60d1cc102b..200ce9f849433 100644
--- a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
+++ b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
@@ -7,12 +7,12 @@
 
 import { EuiPageHeader, EuiSuperDatePicker, OnRefreshChangeProps } from '@elastic/eui';
 import React, { useContext, useCallback, useMemo } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { MonitoringTimeContainer } from '../../application/hooks/use_monitoring_time';
 import { GlobalStateContext } from '../../application/contexts/global_state_context';
 import { Legacy } from '../../legacy_shims';
 import { MonitoringStartServices } from '../../types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 interface MonitoringToolbarProps {
   pageTitle?: string;
   onRefresh?: () => void;
diff --git a/x-pack/plugins/monitoring/public/components/table/storage.ts b/x-pack/plugins/monitoring/public/components/table/storage.ts
index 411bd09872858..7d4d3129650ae 100644
--- a/x-pack/plugins/monitoring/public/components/table/storage.ts
+++ b/x-pack/plugins/monitoring/public/components/table/storage.ts
@@ -7,8 +7,8 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import { get } from 'lodash';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { STORAGE_KEY } from '../../../common/constants';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 
 interface TableValues {
   filterText: any;
diff --git a/x-pack/plugins/monitoring/public/index.ts b/x-pack/plugins/monitoring/public/index.ts
index 8f26d5eb16b9d..a3ab14249f905 100644
--- a/x-pack/plugins/monitoring/public/index.ts
+++ b/x-pack/plugins/monitoring/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { MonitoringPlugin } from './plugin';
 
 export function plugin(ctx: PluginInitializerContext) {
diff --git a/x-pack/plugins/monitoring/public/legacy_shims.ts b/x-pack/plugins/monitoring/public/legacy_shims.ts
index ad1cba4620252..7477150b10492 100644
--- a/x-pack/plugins/monitoring/public/legacy_shims.ts
+++ b/x-pack/plugins/monitoring/public/legacy_shims.ts
@@ -15,19 +15,19 @@ import {
   DocLinksStart,
   ChromeStart,
   I18nStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { Observable } from 'rxjs';
-import { HttpRequestInit } from '../../../../src/core/public';
+import { HttpRequestInit } from '@kbn/core/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { TypeRegistry } from '@kbn/triggers-actions-ui-plugin/public/application/type_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ActionTypeModel, RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public/types';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import {
   MonitoringStartPluginDependencies,
   LegacyMonitoringStartPluginDependencies,
 } from './types';
-import { TriggersAndActionsUIPublicPluginStart } from '../../triggers_actions_ui/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { TypeRegistry } from '../../triggers_actions_ui/public/application/type_registry';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ActionTypeModel, RuleTypeModel } from '../../triggers_actions_ui/public/types';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 
 interface BreadcrumbItem {
   ['data-test-subj']?: string;
@@ -99,9 +99,11 @@ export class Legacy {
         set: (breadcrumbs: BreadcrumbItem[]) => this._shims.breadcrumbs.update(breadcrumbs),
         update: (breadcrumbs?: BreadcrumbItem[]) => {
           if (!breadcrumbs) {
-            const currentBreadcrumbs: Observable<any> & {
-              value?: BreadcrumbItem[];
-            } = core.chrome.getBreadcrumbs$()?.source;
+            const currentBreadcrumbs:
+              | (Observable<any> & {
+                  value?: BreadcrumbItem[];
+                })
+              | undefined = core.chrome.getBreadcrumbs$()?.source;
             breadcrumbs = currentBreadcrumbs?.value;
           }
           const globalStateStr = location.hash.split('?')[1];
diff --git a/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts b/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts
index c0ce7ed260889..ddfa158ad21f8 100644
--- a/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts
+++ b/x-pack/plugins/monitoring/public/lib/fetch_alerts.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { CommonAlertFilter } from '../../common/types/alerts';
 import { AlertsByName } from '../alerts/types';
 
diff --git a/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts b/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts
index 41cb1ab288a17..e5c8adf76ab10 100644
--- a/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts
+++ b/x-pack/plugins/monitoring/public/lib/fetch_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpHandler } from 'kibana/public';
+import { HttpHandler } from '@kbn/core/public';
 import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../common/constants';
 
 interface Params {
diff --git a/x-pack/plugins/monitoring/public/lib/kuery.ts b/x-pack/plugins/monitoring/public/lib/kuery.ts
index 67f58360bc27a..06c0fde9859a8 100644
--- a/x-pack/plugins/monitoring/public/lib/kuery.ts
+++ b/x-pack/plugins/monitoring/public/lib/kuery.ts
@@ -6,11 +6,11 @@
  */
 
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
-import { IIndexPattern } from '../../../../../src/plugins/data/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 export const convertKueryToElasticSearchQuery = (
   kueryExpression: string,
-  indexPattern: IIndexPattern
+  indexPattern: DataView
 ) => {
   try {
     return kueryExpression
diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
index eca6ba2818503..4f70e8f9e9030 100644
--- a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
+++ b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { HttpStart, IHttpFetchError, ResponseErrorBody } from 'kibana/public';
+import { HttpStart, IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { Legacy } from '../legacy_shims';
 import { SetupModeFeature } from '../../common/enums';
 import { ISetupModeContext } from '../components/setup_mode/setup_mode_context';
diff --git a/x-pack/plugins/monitoring/public/plugin.ts b/x-pack/plugins/monitoring/public/plugin.ts
index 285ea480027d1..147365697170c 100644
--- a/x-pack/plugins/monitoring/public/plugin.ts
+++ b/x-pack/plugins/monitoring/public/plugin.ts
@@ -13,14 +13,11 @@ import {
   CoreStart,
   Plugin,
   PluginInitializerContext,
-} from 'kibana/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../triggers_actions_ui/public';
+} from '@kbn/core/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RULE_DETAILS,
   RULE_THREAD_POOL_SEARCH_REJECTIONS,
@@ -48,6 +45,7 @@ interface MonitoringSetupPluginDependencies {
   triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
   usageCollection: UsageCollectionSetup;
 }
+
 export class MonitoringPlugin
   implements
     Plugin<void, void, MonitoringSetupPluginDependencies, MonitoringStartPluginDependencies>
@@ -79,7 +77,7 @@ export class MonitoringPlugin
         icon,
         path: '/app/monitoring',
         showOnHomePage: true,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
         description: i18n.translate('xpack.monitoring.featureCatalogueDescription', {
           defaultMessage: 'Track the real-time health and performance of your deployment.',
         }),
@@ -109,6 +107,7 @@ export class MonitoringPlugin
           triggersActionsUi: pluginsStart.triggersActionsUi,
           usageCollection: plugins.usageCollection,
           appMountParameters: params,
+          dataViews: pluginsStart.dataViews,
         };
 
         Legacy.init({
@@ -122,6 +121,7 @@ export class MonitoringPlugin
           triggersActionsUi: deps.triggersActionsUi,
           usageCollection: deps.usageCollection,
           appMountParameters: deps.appMountParameters,
+          dataViews: deps.dataViews,
         });
 
         const config = Object.fromEntries(externalConfig);
diff --git a/x-pack/plugins/monitoring/public/types.ts b/x-pack/plugins/monitoring/public/types.ts
index 35c6b7acf0cf3..554b08f0f6ce2 100644
--- a/x-pack/plugins/monitoring/public/types.ts
+++ b/x-pack/plugins/monitoring/public/types.ts
@@ -5,21 +5,23 @@
  * 2.0.
  */
 
-import { PluginInitializerContext, CoreStart, AppMountParameters } from 'kibana/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../src/plugins/navigation/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../triggers_actions_ui/public';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
+import { PluginInitializerContext, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { NavigationPublicPluginStart as NavigationStart } from '@kbn/navigation-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 export type { MonitoringConfig } from '../server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 export type { MLJobs } from '../server/lib/elasticsearch/get_ml_jobs';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export interface MonitoringStartPluginDependencies {
   navigation: NavigationStart;
   data: DataPublicPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   usageCollection: UsageCollectionSetup;
+  dataViews: DataViewsPublicPluginStart;
 }
 
 interface LegacyStartDependencies {
diff --git a/x-pack/plugins/monitoring/public/url_state.ts b/x-pack/plugins/monitoring/public/url_state.ts
index ab7d578dbca49..e19758d882124 100644
--- a/x-pack/plugins/monitoring/public/url_state.ts
+++ b/x-pack/plugins/monitoring/public/url_state.ts
@@ -6,15 +6,7 @@
  */
 import { Subscription } from 'rxjs';
 import { History, createHashHistory } from 'history';
-import { MonitoringStartPluginDependencies, MonitoringStartServices } from './types';
-import { Legacy } from './legacy_shims';
-
-import {
-  RefreshInterval,
-  TimeRange,
-  syncQueryStateWithUrl,
-} from '../../../../src/plugins/data/public';
-
+import { RefreshInterval, TimeRange, syncQueryStateWithUrl } from '@kbn/data-plugin/public';
 import {
   createStateContainer,
   createKbnUrlStateStorage,
@@ -24,7 +16,9 @@ import {
   ISyncStateRef,
   syncState,
   withNotifyOnErrors,
-} from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
+import { MonitoringStartPluginDependencies, MonitoringStartServices } from './types';
+import { Legacy } from './legacy_shims';
 
 interface RawObject {
   [key: string]: unknown;
diff --git a/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts b/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
index 03727cf1b98bd..9cebe881936a3 100644
--- a/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
+++ b/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
+import { Rule } from '@kbn/alerting-plugin/common';
 import {
   LargeShardSizeRule,
   CCRReadExceptionsRule,
@@ -21,7 +23,7 @@ import {
   KibanaVersionMismatchRule,
   ElasticsearchVersionMismatchRule,
   BaseRule,
-} from './';
+} from '.';
 import {
   RULE_CLUSTER_HEALTH,
   RULE_LICENSE_EXPIRATION,
@@ -38,8 +40,6 @@ import {
   RULE_CCR_READ_EXCEPTIONS,
   RULE_LARGE_SHARD_SIZE,
 } from '../../common/constants';
-import { RulesClient } from '../../../alerting/server';
-import { Rule } from '../../../alerting/common';
 import { CommonAlertParams } from '../../common/types/alerts';
 
 const BY_TYPE = {
diff --git a/x-pack/plugins/monitoring/server/alerts/base_rule.ts b/x-pack/plugins/monitoring/server/alerts/base_rule.ts
index 3769fb8e29912..9c9d993e0a340 100644
--- a/x-pack/plugins/monitoring/server/alerts/base_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/base_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, ElasticsearchClient } from 'kibana/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import {
   RuleType,
@@ -13,9 +13,10 @@ import {
   Alert,
   RulesClient,
   RuleExecutorServices,
-} from '../../../alerting/server';
-import { Rule, RuleTypeParams, RawAlertInstance, SanitizedRule } from '../../../alerting/common';
-import { ActionsClient } from '../../../actions/server';
+} from '@kbn/alerting-plugin/server';
+import { Rule, RuleTypeParams, RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { ActionsClient } from '@kbn/actions-plugin/server';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import {
   AlertState,
   AlertNodeState,
@@ -29,7 +30,6 @@ import {
 } from '../../common/types/alerts';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
 import { AlertSeverity } from '../../common/enums';
-import { parseDuration } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 
 type ExecutedState =
diff --git a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts
index d4f9284b40f8f..6887f3051d727 100644
--- a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.test.ts
@@ -9,7 +9,7 @@ import { CCRReadExceptionsRule } from './ccr_read_exceptions_rule';
 import { RULE_CCR_READ_EXCEPTIONS } from '../../common/constants';
 import { fetchCCRReadExceptions } from '../lib/alerts/fetch_ccr_read_exceptions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type ICCRReadExceptionsRuleMock = CCRReadExceptionsRule & {
   defaultParams: {
diff --git a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts
index 1f90eb588d9c7..1c1bfe7bf3018 100644
--- a/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/ccr_read_exceptions_rule.ts
@@ -6,7 +6,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
+import { SanitizedRule, RawAlertInstance } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -21,12 +24,9 @@ import {
   CommonAlertFilter,
   CCRReadExceptionsStats,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_CCR_READ_EXCEPTIONS, RULE_DETAILS } from '../../common/constants';
 import { fetchCCRReadExceptions } from '../lib/alerts/fetch_ccr_read_exceptions';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { parseDuration } from '../../../alerting/common/parse_duration';
-import { SanitizedRule, RawAlertInstance } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts
index ec4c15afe6731..d67f10613607a 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.test.ts
@@ -10,7 +10,7 @@ import { RULE_CLUSTER_HEALTH } from '../../common/constants';
 import { AlertClusterHealthType, AlertSeverity } from '../../common/enums';
 import { fetchClusterHealth } from '../lib/alerts/fetch_cluster_health';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts
index 256de16821e64..370a1581dc1a0 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_health_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -18,11 +20,9 @@ import {
   AlertClusterHealth,
   AlertInstanceState,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_CLUSTER_HEALTH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertClusterHealthType, AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { fetchClusterHealth } from '../lib/alerts/fetch_cluster_health';
 
 const RED_STATUS_MESSAGE = i18n.translate('xpack.monitoring.alerts.clusterHealth.redMessage', {
diff --git a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts
index cf2e0f29ddbc3..6c5858d48e94e 100644
--- a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.test.ts
@@ -9,7 +9,7 @@ import { CpuUsageRule } from './cpu_usage_rule';
 import { RULE_CPU_USAGE } from '../../common/constants';
 import { fetchCpuUsageNodeStats } from '../lib/alerts/fetch_cpu_usage_node_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts
index a3f849c4736ea..24362f1a9fd8f 100644
--- a/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cpu_usage_rule.ts
@@ -7,7 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -22,14 +25,11 @@ import {
   CommonAlertParams,
   CommonAlertFilter,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_CPU_USAGE, RULE_DETAILS } from '../../common/constants';
 // @ts-ignore
 import { ROUNDED_FLOAT } from '../../common/formatting';
 import { fetchCpuUsageNodeStats } from '../lib/alerts/fetch_cpu_usage_node_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
-import { parseDuration } from '../../../alerting/common/parse_duration';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts
index c08d32c395c1b..c0b9720422e53 100644
--- a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.test.ts
@@ -9,7 +9,7 @@ import { DiskUsageRule } from './disk_usage_rule';
 import { RULE_DISK_USAGE } from '../../common/constants';
 import { fetchDiskUsageNodeStats } from '../lib/alerts/fetch_disk_usage_node_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type IDiskUsageAlertMock = DiskUsageRule & {
   defaultParams: {
diff --git a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts
index f2494ed918d1c..cd19ed72e2b0d 100644
--- a/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/disk_usage_rule.ts
@@ -7,7 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -22,13 +24,11 @@ import {
   AlertDiskUsageNodeStats,
   CommonAlertFilter,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_DISK_USAGE, RULE_DETAILS } from '../../common/constants';
 // @ts-ignore
 import { ROUNDED_FLOAT } from '../../common/formatting';
 import { fetchDiskUsageNodeStats } from '../lib/alerts/fetch_disk_usage_node_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts
index 560ab805a236c..6610efd098c9f 100644
--- a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.test.ts
@@ -9,7 +9,7 @@ import { ElasticsearchVersionMismatchRule } from './elasticsearch_version_mismat
 import { RULE_ELASTICSEARCH_VERSION_MISMATCH } from '../../common/constants';
 import { fetchElasticsearchVersions } from '../lib/alerts/fetch_elasticsearch_versions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts
index 14bdc70054bb9..77ad2dc5f3aa2 100644
--- a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -17,11 +19,9 @@ import {
   CommonAlertParams,
   AlertVersions,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_ELASTICSEARCH_VERSION_MISMATCH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchElasticsearchVersions } from '../lib/alerts/fetch_elasticsearch_versions';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts
index b136d2c71f065..d7032597881a3 100644
--- a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.test.ts
@@ -9,7 +9,7 @@ import { KibanaVersionMismatchRule } from './kibana_version_mismatch_rule';
 import { RULE_KIBANA_VERSION_MISMATCH } from '../../common/constants';
 import { fetchKibanaVersions } from '../lib/alerts/fetch_kibana_versions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts
index bb7522c21dd8c..ff7653dc59e85 100644
--- a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -17,11 +19,9 @@ import {
   CommonAlertParams,
   AlertVersions,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_KIBANA_VERSION_MISMATCH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchKibanaVersions } from '../lib/alerts/fetch_kibana_versions';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
index a82b87cfe8a97..1784ca8c0df71 100644
--- a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.test.ts
@@ -9,7 +9,7 @@ import { LargeShardSizeRule } from './large_shard_size_rule';
 import { RULE_LARGE_SHARD_SIZE } from '../../common/constants';
 import { fetchIndexShardSize } from '../lib/alerts/fetch_index_shard_size';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type ILargeShardSizeRuleMock = LargeShardSizeRule & {
   defaultParams: {
diff --git a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts
index 6a47af79a45d5..528c757299f9c 100644
--- a/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/large_shard_size_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule, RawAlertInstance } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -21,11 +23,9 @@ import {
   CommonAlertFilter,
   IndexShardSizeStats,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_LARGE_SHARD_SIZE, RULE_DETAILS } from '../../common/constants';
 import { fetchIndexShardSize } from '../lib/alerts/fetch_index_shard_size';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { SanitizedRule, RawAlertInstance } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts
index 0a69ee68ffeba..c7bc493cab80a 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.test.ts
@@ -10,7 +10,7 @@ import { RULE_LICENSE_EXPIRATION } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { fetchLicenses } from '../lib/alerts/fetch_licenses';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts
index 460c34ac89f5d..6f395c62e42a2 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration_rule.ts
@@ -6,7 +6,9 @@
  */
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { RuleExecutorOptions, Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -20,11 +22,9 @@ import {
   AlertLicense,
   AlertLicenseState,
 } from '../../common/types/alerts';
-import { RuleExecutorOptions, Alert } from '../../../alerting/server';
 import { RULE_LICENSE_EXPIRATION, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchLicenses } from '../lib/alerts/fetch_licenses';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts
index b7790f81caa3e..c021a0733fa27 100644
--- a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.test.ts
@@ -9,7 +9,7 @@ import { LogstashVersionMismatchRule } from './logstash_version_mismatch_rule';
 import { RULE_LOGSTASH_VERSION_MISMATCH } from '../../common/constants';
 import { fetchLogstashVersions } from '../lib/alerts/fetch_logstash_versions';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts
index e5556c03ccdb9..a21e54c2b3c11 100644
--- a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -17,11 +19,9 @@ import {
   CommonAlertParams,
   AlertVersions,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_LOGSTASH_VERSION_MISMATCH, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { Globals } from '../static_globals';
 import { fetchLogstashVersions } from '../lib/alerts/fetch_logstash_versions';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts
index 785b1013304cd..ad0cc98c51bb0 100644
--- a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.test.ts
@@ -9,7 +9,7 @@ import { MemoryUsageRule } from './memory_usage_rule';
 import { RULE_MEMORY_USAGE } from '../../common/constants';
 import { fetchMemoryUsageNodeStats } from '../lib/alerts/fetch_memory_usage_node_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts
index fe8c2067c8c09..23fc8e9b5c82f 100644
--- a/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/memory_usage_rule.ts
@@ -7,7 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -22,15 +25,12 @@ import {
   AlertMemoryUsageNodeStats,
   CommonAlertFilter,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_MEMORY_USAGE, RULE_DETAILS } from '../../common/constants';
 // @ts-ignore
 import { ROUNDED_FLOAT } from '../../common/formatting';
 import { fetchMemoryUsageNodeStats } from '../lib/alerts/fetch_memory_usage_node_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
-import { parseDuration } from '../../../alerting/common/parse_duration';
 import { Globals } from '../static_globals';
 
 export class MemoryUsageRule extends BaseRule {
diff --git a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts
index b70bfe4bfb375..4ed963f4c9c7e 100644
--- a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.test.ts
@@ -9,7 +9,7 @@ import { MissingMonitoringDataRule } from './missing_monitoring_data_rule';
 import { RULE_MISSING_MONITORING_DATA } from '../../common/constants';
 import { fetchMissingMonitoringData } from '../lib/alerts/fetch_missing_monitoring_data';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts
index e22489c1fabcf..0afd06708767a 100644
--- a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_rule.ts
@@ -7,7 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { RawAlertInstance, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -19,11 +22,8 @@ import {
   CommonAlertFilter,
   AlertNodeState,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_MISSING_MONITORING_DATA, RULE_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance, SanitizedRule } from '../../../alerting/common';
-import { parseDuration } from '../../../alerting/common/parse_duration';
 import { fetchMissingMonitoringData } from '../lib/alerts/fetch_missing_monitoring_data';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
diff --git a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts
index 3704e909101e9..399b5cfe659bd 100644
--- a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.test.ts
@@ -9,7 +9,7 @@ import { NodesChangedRule } from './nodes_changed_rule';
 import { RULE_NODES_CHANGED } from '../../common/constants';
 import { fetchNodesFromClusterStats } from '../lib/alerts/fetch_nodes_from_cluster_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts
index 11617c8247b9c..6c20fe6326630 100644
--- a/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/nodes_changed_rule.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -19,10 +21,8 @@ import {
   AlertInstanceState,
   AlertNodesChangedState,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { RULE_NODES_CHANGED, LEGACY_RULE_DETAILS } from '../../common/constants';
 import { AlertingDefaults } from './alert_helpers';
-import { SanitizedRule } from '../../../alerting/common';
 import { fetchNodesFromClusterStats } from '../lib/alerts/fetch_nodes_from_cluster_stats';
 import { AlertSeverity } from '../../common/enums';
 interface AlertNodesChangedStates {
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts
index a31d37c7a6bc2..e5b4b7d691a52 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_rule_base.ts
@@ -6,7 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Alert } from '@kbn/alerting-plugin/server';
+import { Rule, RawAlertInstance } from '@kbn/alerting-plugin/common';
 import { BaseRule } from './base_rule';
 import {
   AlertData,
@@ -20,10 +22,8 @@ import {
   AlertState,
   AlertThreadPoolRejectionsStats,
 } from '../../common/types/alerts';
-import { Alert } from '../../../alerting/server';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { Rule, RawAlertInstance } from '../../../alerting/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { Globals } from '../static_globals';
 
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts
index 45f8caacbcd41..89578983a52f5 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.test.ts
@@ -9,7 +9,7 @@ import { ThreadPoolSearchRejectionsRule } from './thread_pool_search_rejections_
 import { RULE_THREAD_POOL_SEARCH_REJECTIONS } from '../../common/constants';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts
index 0a13230ff44e5..46356f1b0cc6f 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_search_rejections_rule.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Rule } from '@kbn/alerting-plugin/common';
 import { ThreadPoolRejectionsRuleBase } from './thread_pool_rejections_rule_base';
 import { RULE_THREAD_POOL_SEARCH_REJECTIONS, RULE_DETAILS } from '../../common/constants';
-import { Rule } from '../../../alerting/common';
 
 export class ThreadPoolSearchRejectionsRule extends ThreadPoolRejectionsRuleBase {
   private static TYPE = RULE_THREAD_POOL_SEARCH_REJECTIONS;
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts
index 47f6704eae70f..19a8b471ed421 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.test.ts
@@ -9,7 +9,7 @@ import { ThreadPoolWriteRejectionsRule } from './thread_pool_write_rejections_ru
 import { RULE_THREAD_POOL_WRITE_REJECTIONS } from '../../common/constants';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 const RealDate = Date;
 
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts
index 1247100d54345..11448e9c6fec3 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_write_rejections_rule.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Rule } from '@kbn/alerting-plugin/common';
 import { ThreadPoolRejectionsRuleBase } from './thread_pool_rejections_rule_base';
 import { RULE_THREAD_POOL_WRITE_REJECTIONS, RULE_DETAILS } from '../../common/constants';
-import { Rule } from '../../../alerting/common';
 
 export class ThreadPoolWriteRejectionsRule extends ThreadPoolRejectionsRuleBase {
   private static TYPE = RULE_THREAD_POOL_WRITE_REJECTIONS;
diff --git a/x-pack/plugins/monitoring/server/config.ts b/x-pack/plugins/monitoring/server/config.ts
index 7ba2447b98144..cbec05a566ac6 100644
--- a/x-pack/plugins/monitoring/server/config.ts
+++ b/x-pack/plugins/monitoring/server/config.ts
@@ -6,10 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import {
-  config as ElasticsearchBaseConfig,
-  ElasticsearchConfig,
-} from '../../../../src/core/server/';
+import { config as ElasticsearchBaseConfig, ElasticsearchConfig } from '@kbn/core/server';
 import { MonitoringConfigSchema } from './types';
 
 const hostURISchema = schema.uri({ scheme: ['http', 'https'] });
diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
index ddaf5dc82f4bf..7811d21713319 100644
--- a/x-pack/plugins/monitoring/server/deprecations.ts
+++ b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ConfigDeprecationFactory, ConfigDeprecation } from 'kibana/server';
+import { ConfigDeprecationFactory, ConfigDeprecation } from '@kbn/core/server';
 import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY } from '../common/constants';
 
 /**
diff --git a/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
index 605cf463bc7ef..e2b820fcb7911 100644
--- a/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
+++ b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Logger, ICustomClusterClient, ElasticsearchClientConfig } from 'kibana/server';
+import { Logger, ICustomClusterClient, ElasticsearchClientConfig } from '@kbn/core/server';
 import { monitoringBulk } from '../kibana_monitoring/lib/monitoring_bulk';
 import { monitoringEndpointDisableWatches } from './monitoring_endpoint_disable_watches';
 import { MonitoringElasticsearchConfig } from '../config';
diff --git a/x-pack/plugins/monitoring/server/index.ts b/x-pack/plugins/monitoring/server/index.ts
index a8962b07ae419..62db584a3528e 100644
--- a/x-pack/plugins/monitoring/server/index.ts
+++ b/x-pack/plugins/monitoring/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { MonitoringPlugin } from './plugin';
 import { configSchema } from './config';
 import { deprecations } from './deprecations';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts
index ea5b36710abe0..83f5d2037bd70 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable, Subscription } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import moment from 'moment';
 import type {
   ElasticsearchClient,
@@ -14,8 +14,8 @@ import type {
   OpsMetrics,
   ServiceStatus,
   ServiceStatusLevel,
-} from 'src/core/server';
-import { ServiceStatusLevels } from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { KIBANA_STATS_TYPE_MONITORING, KIBANA_SETTINGS_TYPE } from '../../common/constants';
 
 import { sendBulkPayload } from './lib';
@@ -150,7 +150,7 @@ export class BulkUploader implements IBulkUploader {
       collected_at: collectedAt,
       requests: { statusCodes, ...requests },
       ...lastMetrics
-    } = await this.opsMetrics$.pipe(take(1)).toPromise();
+    } = await firstValueFrom(this.opsMetrics$);
     return {
       ...lastMetrics,
       process,
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
index 76cc9adeb43ec..d522ad106c1f9 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { Collector, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { Collector, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import { KIBANA_SETTINGS_TYPE } from '../../../common/constants';
 import { MonitoringConfig } from '../../config';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
index fa276add71efb..1db4bf6552fe9 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
@@ -7,7 +7,7 @@
 
 import { getMonitoringUsageCollector } from './get_usage_collector';
 import { fetchClusters } from '../../lib/alerts/fetch_clusters';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { MonitoringConfig } from '../../config';
 
 jest.mock('../../lib/alerts/fetch_clusters', () => ({
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
index 0c952949c56b4..6e987f5564244 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { IClusterClient } from 'src/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { IClusterClient } from '@kbn/core/server';
 import { MonitoringConfig } from '../../config';
 import { getStackProductsUsage } from './lib/get_stack_products_usage';
 import { fetchLicenseType } from './lib/fetch_license_type';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
index 9fa7ea8fdaf6a..50d717f032520 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IClusterClient } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { IClusterClient } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { getSettingsCollector } from './get_settings_collector';
 import { getMonitoringUsageCollector } from './get_usage_collector';
 import { MonitoringConfig } from '../../config';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts
index eadf6af15bdc8..d7b19d66ee1b9 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchESUsage } from './fetch_es_usage';
 
 describe('fetchESUsage', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
index c6b62563a88f6..d4e0ec040aa15 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { StackProductUsage } from '../types';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts
index 5069f17d8795b..ba099f1e7e7a8 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchLicenseType } from './fetch_license_type';
 
 describe('fetchLicenseType', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
index 1dedf63065884..6601c350d4922 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../../../common/constants';
 import { getCcsIndexPattern } from '../../../lib/alerts/get_ccs_index_pattern';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts
index bebcdcb80bd34..3daf0c511139f 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { fetchStackProductUsage } from './fetch_stack_product_usage';
 
 describe('fetchStackProductUsage', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
index 2a090f2182931..1508512a10da6 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_stack_product_usage.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MonitoringConfig } from '../../../config';
 // @ts-ignore
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts
index 81a23c5af6765..0ded2dfed347b 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { getStackProductsUsage } from './get_stack_products_usage';
 
 describe('getStackProductsUsage', () => {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
index abe69a9b637c0..bbb1a86791ae2 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/get_stack_products_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { MonitoringClusterStackProductUsage } from '../types';
 import { fetchESUsage } from './fetch_es_usage';
 import { MonitoringConfig } from '../../../config';
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts
index 8be30a29e1f97..1cfdc10616637 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { MONITORING_SYSTEM_API_VERSION, KIBANA_SYSTEM_ID } from '../../../common/constants';
 
 /*
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts b/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts
index cffc5ffbbfda3..5a79cf9fe9184 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/disable_watcher_cluster_alerts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { ElasticsearchClient } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 interface DisableWatchesResponse {
   exporters: Array<
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
index 1c128fb61b760..2fbaac7549ce3 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchAvailableCcs } from './fetch_available_ccs';
 
 describe('fetchAvailableCcs', () => {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
index ff8db2e3a4330..8be48d16463d8 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export async function fetchAvailableCcs(esClient: ElasticsearchClient): Promise<string[]> {
   const availableCcs = [];
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts
index dbfebef6bfe42..c6f63b0a8a63c 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchCCRReadExceptions } from './fetch_ccr_read_exceptions';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
index f6071d84f20d2..749a7fc47e4fe 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_ccr_read_exceptions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { CCRReadExceptionsStats } from '../../../common/types/alerts';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts
index bb2513112af47..1c369c159595a 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchClusterHealth } from './fetch_cluster_health';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
index 5156a865a80e8..e8e96ee623add 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, AlertClusterHealth } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
index 85a027d9cde1d..0de2e5df531c8 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchClusters } from './fetch_clusters';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
index 81eb6b724834c..70e3797af59b9 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster } from '../../../common/types/alerts';
 import { getNewIndexPatterns } from '../cluster/get_index_patterns';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts
index 028cff224afad..af90f99eb8288 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.test.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchCpuUsageNodeStats } from './fetch_cpu_usage_node_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts
index b831db2315e58..4ede40ad13143 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_cpu_usage_node_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import moment from 'moment';
 import { NORMALIZED_DERIVATIVE_UNIT } from '../../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts
index 5126e2d2c408d..3437298e1957e 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchDiskUsageNodeStats } from './fetch_disk_usage_node_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts
index 26512b88a08a9..615d9ed895653 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_disk_usage_node_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertDiskUsageNodeStats } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts
index b29dd722366e0..84bbfa54d0318 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchElasticsearchVersions } from './fetch_elasticsearch_versions';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts
index 9816b6facc43f..56373604183fd 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts
index 41e84be80d2d5..19557dbec944d 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchIndexShardSize } from './fetch_index_shard_size';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
index 5afa9ed007f66..909cfc82662ea 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_index_shard_size.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, IndexShardSizeStats } from '../../../common/types/alerts';
 import { ElasticsearchIndexStats, ElasticsearchResponseHit } from '../../../common/types/es';
 import { ESGlobPatterns, RegExPatterns } from '../../../common/es_glob_patterns';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts
index 07403388c96f8..014441565a8fb 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { fetchKibanaVersions } from './fetch_kibana_versions';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../static_globals', () => ({
   Globals: {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts
index b5ef5d1ade372..a706335876a1c 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_kibana_versions.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
index 35fc50a6014b6..7434ffdcb79ce 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { fetchLicenses } from './fetch_licenses';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../static_globals', () => ({
   Globals: {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
index 32bbe271da76f..7e7eaaf7e1c9b 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertLicense, AlertCluster } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts
index cdb7287ccb77c..523a18fc64f49 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { fetchLogstashVersions } from './fetch_logstash_versions';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../static_globals', () => ({
   Globals: {
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts
index 2a0a4a283a68d..5981628319f8d 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_logstash_versions.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts
index 64fbe542cd35b..d717edf9feb43 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchMemoryUsageNodeStats } from './fetch_memory_usage_node_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
index 644ef03bd3ec4..5874bcbde0768 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertMemoryUsageNodeStats } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
index 9b1f3f71e2a96..90cfbc96617cb 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchMissingMonitoringData } from './fetch_missing_monitoring_data';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
index 60a5352b8e38f..e619da8e1cdf9 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertMissingData } from '../../../common/types/alerts';
 import { Globals } from '../../static_globals';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts
index 328f8b12836f7..12c49f89aa487 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { fetchNodesFromClusterStats } from './fetch_nodes_from_cluster_stats';
 
 jest.mock('../../static_globals', () => ({
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts
index 0c367558732b5..fb221f96967b5 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_nodes_from_cluster_stats.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { AlertCluster, AlertClusterStatsNodes } from '../../../common/types/alerts';
 import { ElasticsearchSource } from '../../../common/types/es';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
index 257f0cec48600..9a0830ab5a1a7 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { AlertInstanceState } from '../../../common/types/alerts';
-import { RulesClient } from '../../../../alerting/server';
 import { AlertsFactory } from '../../alerts';
 import { CommonAlertState, CommonAlertFilter, RulesByType } from '../../../common/types/alerts';
 import { RULES } from '../../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts
index 8226f0dd012fd..110c31da7b639 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_thread_pool_rejections_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { AlertCluster, AlertThreadPoolRejectionsStats } from '../../../common/types/alerts';
 import { createDatasetFilter } from './create_dataset_query_filter';
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js
index 0ddb87104ec71..bab2703d2cdc6 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js
+++ b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import clusters from './__fixtures__/clusters';
+import clusters from './__fixtures__/clusters.json';
 import { getClustersSummary } from './get_clusters_summary';
 
 const mockLog = jest.fn();
diff --git a/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js b/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js
index 3f643cf0be27a..e3f5782680710 100644
--- a/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js
+++ b/x-pack/plugins/monitoring/server/lib/details/get_metrics.test.js
@@ -8,9 +8,9 @@
 import { getMetrics } from './get_metrics';
 import sinon from 'sinon';
 
-import nonDerivMetricsBuckets from './__fixtures__/non_deriv_metrics_buckets';
-import derivMetricsBuckets from './__fixtures__/deriv_metrics_buckets';
-import aggMetricsBuckets from './__fixtures__/agg_metrics_buckets';
+import nonDerivMetricsBuckets from './__fixtures__/non_deriv_metrics_buckets.json';
+import derivMetricsBuckets from './__fixtures__/deriv_metrics_buckets.json';
+import aggMetricsBuckets from './__fixtures__/agg_metrics_buckets.json';
 
 // max / min window that accepts the above buckets/results
 const min = 1498968000000; // 2017-07-02T04:00:00.000Z
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js
index e357f12651830..75d10dd284980 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import clusterDataFixture from './__fixtures__/cluster_data';
+import clusterDataFixture from './__fixtures__/cluster_data.json';
 import { handleResponse } from './handle_response';
 
 const { nodeStats, clusterStats, shardStats, timeOptions } = clusterDataFixture;
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js
index c02f1d95ee402..ac1dde9d402db 100644
--- a/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__fixtures__/index.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import shardStatsFixture from './shard_stats';
-import clusterFixture from './cluster';
+import shardStatsFixture from './shard_stats.json';
+import clusterFixture from './cluster.json';
 
 export { shardStatsFixture, clusterFixture };
diff --git a/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts b/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
index 72a794db76183..6e9bfa772a417 100644
--- a/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
+++ b/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
@@ -6,10 +6,10 @@
  */
 
 // @ts-ignore
+import { InfraPluginSetup } from '@kbn/infra-plugin/server';
 import { prefixIndexPattern } from '../../../common/ccs_utils';
 import { INFRA_SOURCE_ID } from '../../../common/constants';
 import { MonitoringConfig } from '../../config';
-import { InfraPluginSetup } from '../../../../infra/server';
 
 export const initInfraSource = (config: MonitoringConfig, infraPlugin: InfraPluginSetup) => {
   if (infraPlugin) {
diff --git a/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts
index 3f306b3596f6a..b06b74fd255f4 100644
--- a/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts
+++ b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, uniq } from 'lodash';
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import {
   METRICBEAT_INDEX_NAME_UNIQUE_TOKEN,
   ELASTICSEARCH_SYSTEM_ID,
diff --git a/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts b/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts
index 1859c66e9e713..5abdb5a9a4ca0 100644
--- a/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts
+++ b/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.ts
@@ -8,7 +8,7 @@
 import moment from 'moment';
 import { get } from 'lodash';
 import { LegacyRequest } from '../../types';
-import { standaloneClusterFilter } from './';
+import { standaloneClusterFilter } from '.';
 import { Globals } from '../../static_globals';
 import { getLegacyIndexPattern, getNewIndexPatterns } from '../cluster/get_index_patterns';
 
diff --git a/x-pack/plugins/monitoring/server/license_service.ts b/x-pack/plugins/monitoring/server/license_service.ts
index 0ac1c9d3498b1..e647a71560352 100644
--- a/x-pack/plugins/monitoring/server/license_service.ts
+++ b/x-pack/plugins/monitoring/server/license_service.ts
@@ -6,11 +6,11 @@
  */
 
 import { Subscription } from 'rxjs';
-import { ICustomClusterClient } from 'kibana/server';
-import { ILicense, LicenseFeature } from '../../licensing/common/types';
-import { LicensingPluginStart } from '../../licensing/server';
+import { ICustomClusterClient } from '@kbn/core/server';
+import { ILicense, LicenseFeature } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { Logger } from '@kbn/core/server';
 import { MonitoringConfig } from './config';
-import { Logger } from '../../../../src/core/server';
 import { MonitoringLicenseService } from './types';
 
 interface SetupDeps {
diff --git a/x-pack/plugins/monitoring/server/plugin.test.ts b/x-pack/plugins/monitoring/server/plugin.test.ts
index 68453a849a15b..188f1415e69fb 100644
--- a/x-pack/plugins/monitoring/server/plugin.test.ts
+++ b/x-pack/plugins/monitoring/server/plugin.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { MonitoringPlugin } from './plugin';
 import { AlertsFactory } from './alerts';
 
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index ea3df28b1965d..44117a747cbc3 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -19,9 +19,9 @@ import {
   Plugin,
   PluginInitializerContext,
   ResponseError,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { get } from 'lodash';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import {
   KIBANA_MONITORING_LOGGING_TAG,
   KIBANA_STATS_TYPE_MONITORING,
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts
index 1f4d4e9408428..e23e636fe5676 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/enable.ts
@@ -6,13 +6,13 @@
  */
 
 // @ts-ignore
+import { ActionResult } from '@kbn/actions-plugin/common';
+import { RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { handleError } from '../../../../lib/errors';
 import { AlertsFactory } from '../../../../alerts';
 import { LegacyServer, RouteDependencies } from '../../../../types';
 import { ALERT_ACTION_TYPE_LOG } from '../../../../../common/constants';
-import { ActionResult } from '../../../../../../actions/common';
 import { disableWatcherClusterAlerts } from '../../../../lib/alerts/disable_watcher_cluster_alerts';
-import { RuleTypeParams, SanitizedRule } from '../../../../../../alerting/common';
 
 const DEFAULT_SERVER_LOG_NAME = 'Monitoring: Write to Kibana log';
 
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
index 2482517bf4f4a..54bbfb3861878 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/ui.js b/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
index 9cc28d82d7dbb..618d12afedef7 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
@@ -7,7 +7,7 @@
 
 // all routes for the app
 export { checkAccessRoute } from './check_access';
-export * from './alerts/';
+export * from './alerts';
 export { beatsDetailRoute, beatsListingRoute, beatsOverviewRoute } from './beats';
 export { clusterRoute, clustersRoute } from './cluster';
 export {
diff --git a/x-pack/plugins/monitoring/server/static_globals.ts b/x-pack/plugins/monitoring/server/static_globals.ts
index 089d47f4d45d4..e601dd0c55155 100644
--- a/x-pack/plugins/monitoring/server/static_globals.ts
+++ b/x-pack/plugins/monitoring/server/static_globals.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, ElasticsearchClient, Logger, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, ElasticsearchClient, Logger, PluginInitializerContext } from '@kbn/core/server';
 import url from 'url';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MonitoringConfig } from './config';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
index 81bee3ab09197..90bf2e06ebc26 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import { getStackStats, getAllStats, handleAllStats } from './get_all_stats';
 import { ESClusterStats } from './get_es_stats';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
index 256086e3812a4..f1c36f848ca98 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
@@ -9,7 +9,7 @@ import { set } from '@elastic/safer-lodash-set';
 import { get, merge } from 'lodash';
 
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   LOGSTASH_SYSTEM_ID,
   KIBANA_SYSTEM_ID,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
index 9621df5ca04cd..879b5fcd3d6bb 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
@@ -7,9 +7,9 @@
 
 import { fetchBeatsStats, processResults } from './get_beats_stats';
 import sinon from 'sinon';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const beatsStatsResultSet = require('./__mocks__/fixtures/beats_stats_results');
+const beatsStatsResultSet = require('./__mocks__/fixtures/beats_stats_results.json');
 
 const getBaseOptions = () => ({
   clusters: {},
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
index b98daa9dc304c..6b23c04fe9ed6 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import { INDEX_PATTERN_BEATS } from '../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
index b6c9dcd51aa81..991500c650f55 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import {
   getClusterUuids,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
index 4fe0cdd37c341..d7dc3549cd7d3 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import {
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
index 20393be9c8788..96ba9e2005f59 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import {
   fetchElasticsearchStats,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
index 7b2784d9256ee..c8dd75a4c1ab1 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import moment from 'moment';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
index ab394f9ebb058..31366d0febb9c 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import {
   fetchHighLevelStats,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
index 3991df4b83347..4de2c029e0ed1 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import {
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
index df8354716a0c8..cc6a23a0646e1 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
@@ -8,7 +8,7 @@
 import moment from 'moment';
 import { isEmpty } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { KIBANA_SYSTEM_ID, TELEMETRY_COLLECTION_INTERVAL } from '../../common/constants';
 import {
   fetchHighLevelStats,
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
index 8c46c7c5cc237..66ba15f0e71a6 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import sinon from 'sinon';
 import { getLicenses, handleLicenses, fetchLicenses } from './get_licenses';
 
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
index 19ee1f06bd972..19eedb561ae9b 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ESLicense } from '../../../telemetry_collection_xpack/server';
+import { ESLicense } from '@kbn/telemetry-collection-xpack-plugin/server';
 import { INDEX_PATTERN_ELASTICSEARCH, USAGE_FETCH_INTERVAL } from '../../common/constants';
 
 /**
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts
index c477ffe552630..b961170c2cd4b 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.test.ts
@@ -12,10 +12,10 @@ import {
   processLogstashStateResults,
 } from './get_logstash_stats';
 import sinon from 'sinon';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const logstashStatsResultSet = require('./__mocks__/fixtures/logstash_stats_results');
+const logstashStatsResultSet = require('./__mocks__/fixtures/logstash_stats_results.json');
 
 const resultsMap = new Map();
 
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
index a9f1bbc9ffe0b..faaedbabfb20c 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_logstash_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { createQuery } from './create_query';
 import { mapToList } from './get_high_level_stats';
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
index 475da7be32b9b..15bf4b641b5de 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_telemetry_collection.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { IClusterClient } from 'kibana/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import type { UsageStatsPayload } from '../../../../../src/plugins/telemetry_collection_manager/server';
+import type { IClusterClient } from '@kbn/core/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { UsageStatsPayload } from '@kbn/telemetry-collection-manager-plugin/server';
 import type { LogstashBaseStats } from './get_logstash_stats';
 import type { BeatsBaseStats } from './get_beats_stats';
 import { getAllStats } from './get_all_stats';
diff --git a/x-pack/plugins/monitoring/server/types.ts b/x-pack/plugins/monitoring/server/types.ts
index d3809117b90f2..37881544f8c1b 100644
--- a/x-pack/plugins/monitoring/server/types.ts
+++ b/x-pack/plugins/monitoring/server/types.ts
@@ -12,28 +12,28 @@ import type {
   ICustomClusterClient,
   RequestHandlerContext,
   ElasticsearchClient,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import type Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { TypeOf } from '@kbn/config-schema';
-import { LicenseFeature, ILicense } from '../../licensing/server';
+import { LicenseFeature, ILicense } from '@kbn/licensing-plugin/server';
 import type {
   PluginStartContract as ActionsPluginsStartContact,
   ActionsApiRequestHandlerContext,
-} from '../../actions/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { RacApiRequestHandlerContext } from '../../rule_registry/server';
+} from '@kbn/actions-plugin/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { RacApiRequestHandlerContext } from '@kbn/rule-registry-plugin/server';
 import {
   PluginStartContract as AlertingPluginStartContract,
   PluginSetupContract as AlertingPluginSetupContract,
-} from '../../alerting/server';
-import { InfraPluginSetup, InfraRequestHandlerContext } from '../../infra/server';
-import { PluginSetupContract as AlertingPluginSetup } from '../../alerting/server';
-import { LicensingPluginStart } from '../../licensing/server';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
-import { CloudSetup } from '../../cloud/server';
+} from '@kbn/alerting-plugin/server';
+import { InfraPluginSetup, InfraRequestHandlerContext } from '@kbn/infra-plugin/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 import { ElasticsearchModifiedSource } from '../common/types/es';
 import { RulesByType } from '../common/types/alerts';
 import { configSchema, MonitoringConfig } from './config';
diff --git a/x-pack/plugins/monitoring_collection/server/index.ts b/x-pack/plugins/monitoring_collection/server/index.ts
index 1f2d68d6336bf..e6f15bd297dc8 100644
--- a/x-pack/plugins/monitoring_collection/server/index.ts
+++ b/x-pack/plugins/monitoring_collection/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { MonitoringCollectionPlugin } from './plugin';
 import { configSchema } from './config';
 
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts
index 536ecdc076e55..1e60b49181dec 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getESClusterUuid } from '.';
 
 describe('getESClusterUuid', () => {
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts
index cca82537cd9e4..7497846590aee 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_es_cluster_uuid.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from '../../../../../src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 export async function getESClusterUuid(client: IScopedClusterClient) {
   const response = await client.asCurrentUser.info({
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts
index ce0b99afd14eb..ce8f882dfc7ea 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ServiceStatusLevels } from '../../../../../src/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 import { getKibanaStats } from '.';
 
 describe('getKibanaStats', () => {
diff --git a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts
index 2b2d72305c2c7..9fa26b4592c21 100644
--- a/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts
+++ b/x-pack/plugins/monitoring_collection/server/lib/get_kibana_stats.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
-import { ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server';
+import { ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 
 const SNAPSHOT_REGEX = /-snapshot/i;
 
diff --git a/x-pack/plugins/monitoring_collection/server/plugin.test.ts b/x-pack/plugins/monitoring_collection/server/plugin.test.ts
index b9553b68daf24..15b9934525b9e 100644
--- a/x-pack/plugins/monitoring_collection/server/plugin.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/plugin.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { MonitoringCollectionPlugin } from './plugin';
 
 describe('monitoring_collection plugin', () => {
diff --git a/x-pack/plugins/monitoring_collection/server/plugin.ts b/x-pack/plugins/monitoring_collection/server/plugin.ts
index a86a7c51b4850..e1c3a5064a579 100644
--- a/x-pack/plugins/monitoring_collection/server/plugin.ts
+++ b/x-pack/plugins/monitoring_collection/server/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import { JsonObject } from '@kbn/utility-types';
-import { CoreSetup, Plugin, PluginInitializerContext, Logger } from 'kibana/server';
+import { CoreSetup, Plugin, PluginInitializerContext, Logger } from '@kbn/core/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
+import { ServiceStatus } from '@kbn/core/server';
 import { registerDynamicRoute } from './routes';
-import { MakeSchemaFrom } from '../../../../src/plugins/usage_collection/server';
-import { ServiceStatus } from '../../../../src/core/server';
 import { TYPE_ALLOWLIST } from './constants';
 
 export interface MonitoringCollectionSetup {
diff --git a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts
index 88f0f5b7dc8f0..deacfb3fdd992 100644
--- a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts
+++ b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.test.ts
@@ -6,14 +6,10 @@
  */
 
 import { registerDynamicRoute } from './dynamic_route';
-import {
-  KibanaRequest,
-  KibanaResponseFactory,
-  ServiceStatusLevels,
-} from '../../../../../src/core/server';
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
+import { KibanaRequest, KibanaResponseFactory, ServiceStatusLevels } from '@kbn/core/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 beforeEach(() => {
   jest.resetAllMocks();
diff --git a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts
index 817b65fa95d8f..0e11e1495ba5e 100644
--- a/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts
+++ b/x-pack/plugins/monitoring_collection/server/routes/dynamic_route.ts
@@ -6,7 +6,7 @@
  */
 import { JsonObject } from '@kbn/utility-types';
 import { schema } from '@kbn/config-schema';
-import { IRouter, ServiceStatus } from '../../../../../src/core/server';
+import { IRouter, ServiceStatus } from '@kbn/core/server';
 import { getESClusterUuid, getKibanaStats } from '../lib';
 import { MetricResult } from '../plugin';
 
diff --git a/x-pack/plugins/observability/.storybook/preview.js b/x-pack/plugins/observability/.storybook/preview.js
index 18343c15a6465..3200746243d47 100644
--- a/x-pack/plugins/observability/.storybook/preview.js
+++ b/x-pack/plugins/observability/.storybook/preview.js
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { EuiThemeProviderDecorator } from '../../../../src/plugins/kibana_react/common';
+import { EuiThemeProviderDecorator } from '@kbn/kibana-react-plugin/common';
 
 export const decorators = [EuiThemeProviderDecorator];
diff --git a/x-pack/plugins/observability/README.md b/x-pack/plugins/observability/README.md
index f0f66f01def53..aef8cdc59d110 100644
--- a/x-pack/plugins/observability/README.md
+++ b/x-pack/plugins/observability/README.md
@@ -36,6 +36,9 @@ When both of the these are set to `true`, your alerts should show on the alerts
 
 The Observability plugin maintains a navigation registry for Observability solutions, and exposes a shared page template component. Please refer to the docs in [the component directory](public/components/shared/page_template) for more information on registering your solution's navigation structure, and rendering the navigation via the shared component.
 
+## Exploratory view component
+A shared component for visualizing observability data types via lens embeddable. [For further details.](./public/components/shared/exploratory_view/README.md)
+
 ## Unit testing
 
 Note: Run the following commands from `kibana/x-pack/plugins/observability`.
diff --git a/x-pack/plugins/observability/common/utils/get_inspect_response.ts b/x-pack/plugins/observability/common/utils/get_inspect_response.ts
index 3383a912e596b..eaf467cf4c95e 100644
--- a/x-pack/plugins/observability/common/utils/get_inspect_response.ts
+++ b/x-pack/plugins/observability/common/utils/get_inspect_response.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { KibanaRequest } from 'kibana/server';
-import type { RequestStatistics, RequestStatus } from '../../../../../src/plugins/inspector';
+import type { KibanaRequest } from '@kbn/core/server';
+import type { RequestStatistics, RequestStatus } from '@kbn/inspector-plugin';
 import { InspectResponse } from '../../typings/common';
 import { WrappedElasticsearchClientError } from './unwrap_es_response';
 
diff --git a/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts b/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts
index 93be59df9c0ca..5938d952cb42f 100644
--- a/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts
+++ b/x-pack/plugins/observability/common/utils/join_by_key/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { joinByKey } from './';
+import { joinByKey } from '.';
 
 describe('joinByKey', () => {
   it('joins by a string key', () => {
diff --git a/x-pack/plugins/observability/public/application/application.test.tsx b/x-pack/plugins/observability/public/application/application.test.tsx
index cd96b1018cdca..a3160d713d1b7 100644
--- a/x-pack/plugins/observability/public/application/application.test.tsx
+++ b/x-pack/plugins/observability/public/application/application.test.tsx
@@ -9,12 +9,12 @@ import { createMemoryHistory } from 'history';
 import { noop } from 'lodash';
 import React from 'react';
 import { Observable } from 'rxjs';
-import { AppMountParameters, CoreStart } from 'src/core/public';
-import { themeServiceMock } from 'src/core/public/mocks';
-import { KibanaPageTemplate } from 'src/plugins/kibana_react/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import { themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../plugin';
 import { createObservabilityRuleTypeRegistryMock } from '../rules/observability_rule_type_registry_mock';
-import { renderApp } from './';
+import { renderApp } from '.';
 
 describe('renderApp', () => {
   const originalConsole = global.console;
diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx
index 6f8f99a6197ae..bab6c03b5cf54 100644
--- a/x-pack/plugins/observability/public/application/index.tsx
+++ b/x-pack/plugins/observability/public/application/index.tsx
@@ -9,16 +9,16 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import { KibanaFeature } from '../../../features/common';
-import { ConfigSchema } from '..';
-import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '../../../../../src/core/public';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { ConfigSchema } from '..';
 import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template';
 import { DatePickerContextProvider } from '../context/date_picker_context';
 import { HasDataContextProvider } from '../context/has_data_context';
diff --git a/x-pack/plugins/observability/public/application/types.ts b/x-pack/plugins/observability/public/application/types.ts
index 54719622576c8..9e92c74c9bfab 100644
--- a/x-pack/plugins/observability/public/application/types.ts
+++ b/x-pack/plugins/observability/public/application/types.ts
@@ -15,16 +15,16 @@ import type {
   OverlayStart,
   SavedObjectsStart,
   ThemeServiceStart,
-} from 'kibana/public';
-import { EmbeddableStateTransfer } from 'src/plugins/embeddable/public';
-import { NavigationPublicPluginStart } from 'src/plugins/navigation/public';
-import { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { DataViewsPublicPluginStart } from '../../../../../src/plugins/data_views/public';
-import { LensPublicStart } from '../../../lens/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
-import { CasesUiStart } from '../../../cases/public';
-import { TimelinesUIStart } from '../../../timelines/public';
+} from '@kbn/core/public';
+import { EmbeddableStateTransfer } from '@kbn/embeddable-plugin/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { CasesUiStart } from '@kbn/cases-plugin/public';
+import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
 
 export interface ObservabilityAppServices {
   application: ApplicationStart;
diff --git a/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx b/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx
index 404553d80d92e..46bbc71a19a0f 100644
--- a/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/chart_container/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { ChartContainer } from './';
+import { ChartContainer } from '.';
 
 describe('chart container', () => {
   it('shows loading indicator', () => {
diff --git a/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx b/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx
index 7225b9f4d2c70..b2f0e9d1cb2b1 100644
--- a/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/empty_sections/index.tsx
@@ -8,7 +8,7 @@
 import { EuiFlexGrid, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React, { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
 import { useHasData } from '../../../hooks/use_has_data';
diff --git a/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx b/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx
index bd2474a623737..09fea69fa2775 100644
--- a/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/fleet_panel/index.tsx
@@ -8,7 +8,7 @@
 import { EuiCard, EuiLink, EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 
 export function FleetPanel() {
diff --git a/x-pack/plugins/observability/public/components/app/header/header_menu.tsx b/x-pack/plugins/observability/public/components/app/header/header_menu.tsx
index 06062c9fbff97..0d1b08adf9d20 100644
--- a/x-pack/plugins/observability/public/components/app/header/header_menu.tsx
+++ b/x-pack/plugins/observability/public/components/app/header/header_menu.tsx
@@ -8,7 +8,7 @@
 import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 import { usePluginContext } from '../../../hooks/use_plugin_context';
 import HeaderMenuPortal from '../../shared/header_menu_portal';
diff --git a/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx b/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx
index f6e641082e557..065822aba0a05 100644
--- a/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/news_feed/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { NewsItem } from '../../../services/get_news_feed';
 import { render } from '../../../utils/test_helper';
-import { NewsFeed } from './';
+import { NewsFeed } from '.';
 
 const newsFeedItems = [
   {
diff --git a/x-pack/plugins/observability/public/components/app/observability_status/content.ts b/x-pack/plugins/observability/public/components/app/observability_status/content.ts
index ea264a4387a85..6ab022ef81bba 100644
--- a/x-pack/plugins/observability/public/components/app/observability_status/content.ts
+++ b/x-pack/plugins/observability/public/components/app/observability_status/content.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
-import { HttpSetup, DocLinksStart } from 'kibana/public';
+import { HttpSetup, DocLinksStart } from '@kbn/core/public';
 import { ObservabilityFetchDataPlugins } from '../../../typings/fetch_overview_data';
 
 export interface ObservabilityStatusContent {
diff --git a/x-pack/plugins/observability/public/components/app/observability_status/index.tsx b/x-pack/plugins/observability/public/components/app/observability_status/index.tsx
index 08e8b58d19253..f985eac84d72f 100644
--- a/x-pack/plugins/observability/public/components/app/observability_status/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/observability_status/index.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useHasData } from '../../../hooks/use_has_data';
 import { ObservabilityStatusBoxes } from './observability_status_boxes';
 import { getContent } from './content';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../../application/types';
 
 export function ObservabilityStatus() {
diff --git a/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx b/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx
index 3509aa009b753..8aff895651187 100644
--- a/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/observability_status/observability_status_box.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { ObservabilityStatusBox } from './observability_status_box';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { applicationServiceMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 const application = applicationServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/observability/public/components/app/resources/index.test.tsx b/x-pack/plugins/observability/public/components/app/resources/index.test.tsx
index e5a8bd3d097fc..8d51814ecd074 100644
--- a/x-pack/plugins/observability/public/components/app/resources/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/resources/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { Resources } from './';
+import { Resources } from '.';
 
 describe('Resources', () => {
   it('renders resources with all elements', () => {
diff --git a/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx b/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
index 5e212fad04d2b..9c65df16d9060 100644
--- a/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/alerts/index.tsx
@@ -24,11 +24,11 @@ import moment from 'moment';
 import React, { useState, useMemo } from 'react';
 import { EuiSelect } from '@elastic/eui';
 import { uniqBy } from 'lodash';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { usePluginContext } from '../../../../hooks/use_plugin_context';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { getObservabilityAlerts } from '../../../../services/get_observability_alerts';
 import { paths } from '../../../../config';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../../../application/types';
 
 const ALL_TYPES = 'ALL_TYPES';
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
index 24538cb4eb25c..a8f49f7d9cbb4 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.test.tsx
@@ -8,14 +8,14 @@
 import React from 'react';
 import * as fetcherHook from '../../../../hooks/use_fetcher';
 import { render, data as dataMock } from '../../../../utils/test_helper';
-import { APMSection } from './';
+import { APMSection } from '.';
 import { response } from './mock_data/apm.mock';
 import * as hasDataHook from '../../../../hooks/use_has_data';
 import * as pluginContext from '../../../../hooks/use_plugin_context';
 import { HasDataContextValue } from '../../../../context/has_data_context';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
-import { KibanaPageTemplate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 
 jest.mock('react-router-dom', () => ({
   useLocation: () => ({
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
index 9057a08fae361..860e134442ccb 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
@@ -22,7 +22,7 @@ import React, { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import { ThemeContext } from 'styled-components';
 import { useDatePickerContext } from '../../../../hooks/use_date_picker_context';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { useChartTheme } from '../../../../hooks/use_chart_theme';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/observability/public/components/app/section/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/index.test.tsx
index 095cc30972190..7217dd78b677f 100644
--- a/x-pack/plugins/observability/public/components/app/section/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { render } from '../../../utils/test_helper';
-import { SectionContainer } from './';
+import { SectionContainer } from '.';
 
 describe('SectionContainer', () => {
   it('renders section without app link', () => {
diff --git a/x-pack/plugins/observability/public/components/app/section/index.tsx b/x-pack/plugins/observability/public/components/app/section/index.tsx
index c0f765083d8e5..83c105fb3fb8a 100644
--- a/x-pack/plugins/observability/public/components/app/section/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/index.tsx
@@ -15,7 +15,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../application/types';
 import { ErrorPanel } from './error_panel';
 import { ExperimentalBadge } from '../../shared/experimental_badge';
diff --git a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
index 80a14a3824e00..b047d5f7f8925 100644
--- a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
@@ -21,7 +21,7 @@ import { isEmpty } from 'lodash';
 import moment from 'moment';
 import React, { Fragment } from 'react';
 import { useHistory } from 'react-router-dom';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { useChartTheme } from '../../../../hooks/use_chart_theme';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
index 39757d79bab96..ee82b80c3ace4 100644
--- a/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/metrics/index.tsx
@@ -21,7 +21,7 @@ import {
   NumberOrNull,
   StringOrNull,
 } from '../../../..';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { useHasData } from '../../../../hooks/use_has_data';
diff --git a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
index 84779e5270e46..7e5b713c6a238 100644
--- a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
@@ -22,7 +22,7 @@ import moment from 'moment';
 import React, { useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import { ThemeContext } from 'styled-components';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { useChartTheme } from '../../../../hooks/use_chart_theme';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
index 59ea8c49f7f7e..c8f508a366bea 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.test.tsx
@@ -10,7 +10,7 @@ import { HasDataContextValue } from '../../../../context/has_data_context';
 import * as fetcherHook from '../../../../hooks/use_fetcher';
 import * as hasDataHook from '../../../../hooks/use_has_data';
 import { render, data as dataMock } from '../../../../utils/test_helper';
-import { UXSection } from './';
+import { UXSection } from '.';
 import { response } from './mock_data/ux.mock';
 
 jest.mock('react-router-dom', () => ({
diff --git a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
index 4d1ff07c85a08..430285a0941cf 100644
--- a/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/ux/index.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { SectionContainer } from '../';
+import { SectionContainer } from '..';
 import { getDataHandler } from '../../../../data_handler';
 import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { useHasData } from '../../../../hooks/use_has_data';
diff --git a/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx b/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
index 1858a047087fb..91d2f03101bf2 100644
--- a/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
+++ b/x-pack/plugins/observability/public/components/shared/core_web_vitals/__stories__/core_vitals.stories.tsx
@@ -8,8 +8,8 @@
 import React, { ComponentType } from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { Observable } from 'rxjs';
-import { CoreStart } from 'src/core/public';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { CoreVitalItem } from '../core_vital_item';
 import { LCP_HELP_LABEL, LCP_LABEL } from '../translations';
 
diff --git a/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx b/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx
index 98305dbfdd840..11b3473b42264 100644
--- a/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx
+++ b/x-pack/plugins/observability/public/components/shared/core_web_vitals/palette_legends.tsx
@@ -17,8 +17,8 @@ import {
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { euiLightVars, euiDarkVars } from '@kbn/ui-theme';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { getCoreVitalTooltipMessage, Thresholds } from './core_vital_item';
-import { useUiSetting$ } from '../../../../../../../src/plugins/kibana_react/public';
 import {
   LEGEND_NEEDS_IMPROVEMENT_LABEL,
   LEGEND_GOOD_LABEL,
diff --git a/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx b/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx
index 713063e42eda6..138018e104c8a 100644
--- a/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/date_picker/date_picker.test.tsx
@@ -12,8 +12,8 @@ import { createMemoryHistory, MemoryHistory } from 'history';
 import React from 'react';
 import { Router, useLocation } from 'react-router-dom';
 import qs from 'query-string';
-import { DatePicker } from './';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { DatePicker } from '.';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { of } from 'rxjs';
 import { DatePickerContextProvider } from '../../../context/date_picker_context';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/README.md b/x-pack/plugins/observability/public/components/shared/exploratory_view/README.md
new file mode 100644
index 0000000000000..6aea217a1aaa8
--- /dev/null
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/README.md
@@ -0,0 +1,161 @@
+# Exploratory view component
+
+This component is used in observability plugin to show lens embeddable based observability visualizations. 
+The view is populated using configs stored as json within the view for each data type.
+
+This readme file contains few of the concepts being used in the component.
+
+Basic workflow for how exploratory view works, it looks like this
+
+
+![Exploratory view workflow](https://i.imgur.com/Kgyfd29.png)
+
+
+## Report Type
+
+The exploratory view report type controls how the data is visualized in the lens embeddable. The report type defines a set of constraints over the x and y axis. For example, the `kpi-over-time` report type is a time series chart type that plots key performance indicators over time, while the `data-distribution` chart plots the percentage of documents over key performance indicators. Current available data types can be found at `exploratory_view/configurations/constants`.
+
+Each report type has one or more available visualizations to plot data from one or more data types. 
+
+## Data Types
+
+Each available visualization is backed by a data type. A data type consists of a set of configuration for displaying domain-specific visualizations for observability data. Some example data types include apm, metrics, and logs.
+
+For each respective data type, we fetch index pattern string from the app plugin contract, leveraging existing hasData API we have to return the index pattern string as well as a `hasData` boolean from each plugin.
+
+In most cases, there will be a 1-1 relation between apps and data types.
+
+### Observability `dataViews`
+
+Once we have index pattern string for each data type, a respective `dataView` is created. If there is an existing dataView for an index pattern, we will fetch and reuse it.
+
+After the dataView is created we also set field formats to promote human-readability. For example, we set format for monitor duration field, which is monitor.duration.us, from microseconds to seconds for browser monitors.
+
+### Visualization Configuration
+
+Each data type may have one or more visualization configurations. The data type to visualization configuration can be found in [`exploratory_view/obs_exploratory_view`](https://github.com/elastic/kibana/blob/main/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx#L86)
+
+Each visualization configuration is mapped to a single report type.
+
+Visualization configurations are used to define the UI we display for each report type and data type combination in the series builder. 
+Visualization configuration define UI options and display, including available `metrics`, available `filters`, available `breakdown` options, definitions for human-readable `labels`, and more.
+The configuration also defines any custom base filters, which usually get pushed to a query, but are not displayed on the UI. You can also set more custom options on the configuration like colors which get used while rendering the chart.
+
+Visualization configuration can be found at [`exploratory_view/configurations`](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations), where each data type typically has a folder that holds one or more visualization configurations. 
+
+The configuration defined ultimately influences the lens embeddable attributes which get pushed to lens embeddable, rendering the chart.
+
+Some options in configuration are:
+
+#### Definition fields
+They are also filters, but usually main filters, around which usually app UI is based.
+For apm, it could be service name and for uptime, monitor name.
+
+#### Filters
+You can define base filters in kql form or data plugin filter format, filters are strongly typed.
+
+#### Breakdown fields
+List of fields from an index pattern, UI will use this to populate breakdown option select.
+
+#### Labels
+You can set key/value map for your field labels. UI will use these to set labels for data view fields.
+
+Sample config
+```
+{
+    reportType: ReportTypes.KPI,
+    defaultSeriesType: 'bar_stacked',
+    xAxisColumn: {
+      sourceField: '@timestamp',
+    },
+    yAxisColumns: [
+      {
+        sourceField: REPORT_METRIC_FIELD,
+        operationType: 'median',
+      },
+    ],
+    hasOperationType: false,
+    filterFields: ['observer.geo.name', 'monitor.type', 'tags'], // these fields get's resolved from relevant dataView
+    breakdownFields: [
+      'observer.geo.name',
+      'monitor.type',
+      'monitor.name',
+      PERCENTILE,
+    ], // these fields get's resolved from relevant dataView
+    baseFilters: [],
+    palette: { type: 'palette', name: 'status' },
+    definitionFields: [
+      { field: 'monitor.name', nested: SYNTHETICS_STEP_NAME, singleSelection: true },
+      { field: 'url.full', filters: buildExistsFilter('summary.up', dataView) },
+    ],
+    metricOptions: [
+      {
+        label: MONITORS_DURATION_LABEL,
+        field: 'monitor.duration.us',
+        columnType: OPERATION_COLUMN,
+      }
+    ],
+    labels: { ...FieldLabels, [SUMMARY_UP]: UP_LABEL, [SUMMARY_DOWN]: DOWN_LABEL },
+  }
+```
+
+
+
+## Lens Embeddable
+
+Lens embeddable is what actually renders the chart in exploratory view.
+
+Exploratory view generates the lens embeddable attributes as json and pass it to the component.
+
+Based on configuration, exploratory view generates layers and columns.
+
+Add a link to lens embeddable readme
+
+#### Example
+A simple usage of lens embeddable example and playground options
+[embedded_lens_example](../../../../../../examples/embedded_lens_example)
+
+## Exploratory view Embeddable
+
+The primary purpose of the exploratory view is to embed it in observability solutions like uptime to replace
+existing static visualizations,
+
+For that purpose, all the configuration options we define in the exploratory view can be used as an embeddable
+via a component that is exposed using observability plugin contract,
+usage looks like this
+
+`const ExploratoryViewComponent = props.plugins.observability.ExploratoryViewEmbeddable;
+`
+
+```            
+            <ExploratoryViewComponent
+              attributes={[
+                {
+                  name: 'Monitors response duration',
+                  time: {
+                    from: 'now-5d',
+                    to: 'now',
+                  },
+                  reportDefinitions: {
+                    'monitor.id': ['test-id'],
+                  },
+                  breakdown: 'monitor.type',
+                  operationType: 'average',
+                  dataType: 'synthetics',
+                  seriesType: 'line',
+                  selectedMetricField: 'monitor.duration.us',
+                },
+              ]}
+              reportType="kpi-over-time"
+              title={'Monitor response duration'}
+              withActions={['save', 'explore']}
+            />
+```
+
+there is an example in kibana example which you can view using
+`yarn start --run-examples` and view the code at [Exploratory view embeddable](../../../../../../examples/exploratory_view_example)
+
+#### Example
+A simple usage of lens embeddable example and playground options, run kibana with
+`yarn start --run-example` to see this example in action
+source code is defined at [embedded_lens_example](../../../../../../examples/embedded_lens_example)
\ No newline at end of file
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx
index 2b59628c3e8d3..0c2063ba8b1b0 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.test.tsx
@@ -10,7 +10,7 @@ import { fireEvent, screen } from '@testing-library/dom';
 import React from 'react';
 import { sampleAttribute } from '../../configurations/test_data/sample_attribute';
 import * as pluginHook from '../../../../../hooks/use_plugin_context';
-import { TypedLensByValueInput } from '../../../../../../../lens/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { ExpViewActionMenuContent } from './action_menu';
 
 jest.spyOn(pluginHook, 'usePluginContext').mockReturnValue({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx
index 98b0a413fb842..a433a199142b7 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/action_menu.tsx
@@ -8,9 +8,9 @@
 import React, { useState } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { LensEmbeddableInput, TypedLensByValueInput } from '../../../../../../../lens/public';
+import { LensEmbeddableInput, TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../../../../application/types';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { AddToCaseAction } from '../../header/add_to_case_action';
 
 export function ExpViewActionMenuContent({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx
index dfb4ddcaea49c..63ce9162adefc 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/action_menu/index.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { ExpViewActionMenuContent } from './action_menu';
 import HeaderMenuPortal from '../../../header_menu_portal';
-import { TypedLensByValueInput } from '../../../../../../../lens/public';
 import { useExploratoryView } from '../../contexts/exploratory_view_config';
 
 interface Props {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
index 200c332d7aa1d..eab64136bf979 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
@@ -10,8 +10,8 @@ import { EuiDatePicker, EuiDatePickerRange } from '@elastic/eui';
 import { Moment } from 'moment';
 import DateMath from '@kbn/datemath';
 import { i18n } from '@kbn/i18n';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { useSeriesStorage } from '../hooks/use_series_storage';
-import { useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { SeriesUrl } from '../types';
 import { ReportTypes } from '../configurations/constants';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx
index 077e9be4d634a..cb258ccf46f9f 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { useSeriesFilters } from '../hooks/use_series_filters';
 import { FilterValueLabel } from '../../filter_value_label/filter_value_label';
 import { SeriesUrl } from '../types';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx
index 4fed57b1f280b..4e6a02c3ddefb 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/series_date_picker/series_date_picker.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockUseHasData, render } from '../../rtl_helpers';
 import { fireEvent, waitFor } from '@testing-library/react';
-import { SeriesDatePicker } from './index';
+import { SeriesDatePicker } from '.';
 
 describe('SeriesDatePicker', function () {
   it('should render properly', function () {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts
index faddc5ab9596c..9425937442e9e 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/constants.ts
@@ -4,7 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { OperationType } from '../../../../../../../lens/public';
+import { OperationType } from '@kbn/lens-plugin/public';
+import { DOCUMENT_FIELD_NAME } from '@kbn/lens-plugin/common/constants';
 import { ReportViewType } from '../../types';
 import {
   CLS_FIELD,
@@ -67,7 +68,6 @@ import {
   SYNTHETICS_STEP_DURATION,
   SYNTHETICS_STEP_NAME,
 } from './field_names/synthetics';
-import { DOCUMENT_FIELD_NAME } from '../../../../../../../lens/common/constants';
 
 export const DEFAULT_TIME = { from: 'now-1h', to: 'now' };
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts
index 3c3a634af010e..8027a9965f860 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataView } from '@kbn/data-views-plugin/common';
 import { AppDataType, ReportViewType, SeriesConfig } from '../types';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { ReportConfigMap } from '../contexts/exploratory_view_config';
 
 interface Props {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts
index 9a41fec6fc391..6ff6e8ed3f586 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts
@@ -28,9 +28,10 @@ import {
   SumIndexPatternColumn,
   TermsIndexPatternColumn,
   CardinalityIndexPatternColumn,
-} from '../../../../../../lens/public';
+} from '@kbn/lens-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import { urlFiltersToKueryString } from '../utils/stringify_kueries';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import {
   FILTER_RECORDS,
   USE_BREAK_DOWN_COLUMN,
@@ -43,7 +44,6 @@ import {
   ReportTypes,
 } from './constants';
 import { ColumnFilter, SeriesConfig, UrlFilter, URLReportDefinition } from '../types';
-import { PersistableFilter } from '../../../../../../lens/common';
 import { parseRelativeDate } from '../components/date_range_picker';
 import { getDistributionInPercentageColumn } from './lens_columns/overall_column';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx
index 35121f6df94b3..a3f55385d60fa 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_columns/overall_column.tsx
@@ -11,7 +11,7 @@ import {
   MathIndexPatternColumn,
   FormulaIndexPatternColumn,
   OverallSumIndexPatternColumn,
-} from '../../../../../../../lens/public';
+} from '@kbn/lens-plugin/public';
 import { RECORDS_FIELD } from '../constants';
 
 export function getDistributionInPercentageColumn({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
index e2cd05087188f..cdc5690622380 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts
@@ -13,11 +13,11 @@ import {
   buildPhrasesFilter as esBuildPhrasesFilter,
   buildExistsFilter as esBuildExistsFilter,
 } from '@kbn/es-query';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import type { ReportViewType, SeriesUrl, UrlFilter } from '../types';
 import type { AllSeries, AllShortSeries } from '../hooks/use_series_storage';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { URL_KEYS } from './constants/url_constants';
-import { PersistableFilter } from '../../../../../../lens/common';
 
 export function convertToShortUrl(series: SeriesUrl) {
   const {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx
index c464e4a536851..442f50158b399 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/contexts/exploratory_view_config.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import type { AppDataType, ConfigProps, ReportViewType, SeriesConfig } from '../types';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx
index fbaed83c30549..fecb9e7172cc6 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import Embeddable from './embeddable';
-import { LensPublicStart } from '../../../../../../lens/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
 import { DataViewState } from '../hooks/use_app_data_view';
 import { render } from '../rtl_helpers';
 import { AddToCaseAction } from '../header/add_to_case_action';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx
index 84ce40f0fe6c4..51768bcde3891 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/embeddable.tsx
@@ -8,18 +8,18 @@
 import React, { useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle } from '@elastic/eui';
 import styled from 'styled-components';
+import { LensEmbeddableInput, LensPublicStart, XYState } from '@kbn/lens-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/common';
 import { AllSeries, useTheme } from '../../../..';
 import { LayerConfig, LensAttributes } from '../configurations/lens_attributes';
 import { AppDataType, ReportViewType } from '../types';
 import { getLayerConfigs } from '../hooks/use_lens_attributes';
-import { LensEmbeddableInput, LensPublicStart, XYState } from '../../../../../../lens/public';
 import { OperationTypeComponent } from '../series_editor/columns/operation_type_select';
 import { DataViewState } from '../hooks/use_app_data_view';
 import { ReportConfigMap } from '../contexts/exploratory_view_config';
 import { obsvReportConfigMap } from '../obsv_exploratory_view';
 import { ActionTypes, useActions } from './use_actions';
 import { AddToCaseAction } from '../header/add_to_case_action';
-import { ViewMode } from '../../../../../../../../src/plugins/embeddable/common';
 import { observabilityFeatureId } from '../../../../../common';
 import { SingleMetric, SingleMetricOptions } from './single_metric';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
index 6e9a2c26580de..449dc297bcf6b 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/index.tsx
@@ -7,12 +7,12 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import type { ExploratoryEmbeddableProps, ExploratoryEmbeddableComponentProps } from './embeddable';
 import { ObservabilityDataViews } from '../../../../utils/observability_data_views';
 import { ObservabilityPublicPluginsStart } from '../../../../plugin';
 import type { DataViewState } from '../hooks/use_app_data_view';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
 import type { AppDataType } from '../types';
 
 const Embeddable = React.lazy(() => import('./embeddable'));
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts
index 26190637d84ce..019aa4ac8f29d 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/embeddable/use_actions.ts
@@ -7,14 +7,11 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { createExploratoryViewRoutePath, createExploratoryViewUrl } from '../configurations/utils';
 import { ReportViewType } from '../types';
 import { AllSeries } from '../hooks/use_series_storage';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import {
-  Action,
-  ActionExecutionContext,
-} from '../../../../../../../../src/plugins/ui_actions/public';
 import { ObservabilityAppServices } from '../../../../application/types';
 
 export type ActionTypes = 'explore' | 'save' | 'addToCase' | 'openInLens';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx
index 5273cc3643cba..f6a41fb6bef67 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.test.tsx
@@ -11,7 +11,7 @@ import { render, mockAppDataView } from './rtl_helpers';
 import { ExploratoryView } from './exploratory_view';
 import * as obsvDataViews from '../../../utils/observability_data_views/observability_data_views';
 import * as pluginHook from '../../../hooks/use_plugin_context';
-import { createStubIndexPattern } from '../../../../../../../src/plugins/data/common/stubs';
+import { createStubIndexPattern } from '@kbn/data-plugin/common/stubs';
 
 jest.spyOn(pluginHook, 'usePluginContext').mockReturnValue({
   appMountParameters: {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
index 4c48ab292b217..da1fbd9fa5362 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/exploratory_view.tsx
@@ -17,11 +17,11 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { PanelDirection } from '@elastic/eui/src/components/resizable_container/types';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
 import { useSeriesStorage } from './hooks/use_series_storage';
 import { useLensAttributes } from './hooks/use_lens_attributes';
-import { TypedLensByValueInput } from '../../../../../lens/public';
 import { useAppDataViewContext } from './hooks/use_app_data_view';
 import { SeriesViews } from './views/series_views';
 import { LensEmbeddable } from './lens_embeddable';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx
index 3cde63c227b3a..17cde17d8b7f9 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/add_to_case_action.tsx
@@ -8,14 +8,14 @@
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect } from 'react';
-import { toMountPoint, useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { ObservabilityAppServices } from '../../../../application/types';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   CasesDeepLinkId,
   generateCaseViewPath,
   GetAllCasesSelectorModalProps,
-} from '../../../../../../cases/public';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
+} from '@kbn/cases-plugin/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { ObservabilityAppServices } from '../../../../application/types';
 import { useAddToCase } from '../hooks/use_add_to_case';
 import { observabilityFeatureId, observabilityAppId } from '../../../../../common';
 import { parseRelativeDate } from '../components/date_range_picker';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
index 793e5d39653df..9534f66a38cfd 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
@@ -7,13 +7,13 @@
 
 import { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { HttpSetup, MountPoint } from 'kibana/public';
+import { HttpSetup, MountPoint } from '@kbn/core/public';
+import { Case } from '@kbn/cases-plugin/common';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { CasesDeepLinkId, DRAFT_COMMENT_STORAGE_ID } from '@kbn/cases-plugin/public';
 import { useKibana } from '../../../../utils/kibana_react';
-import { Case } from '../../../../../../cases/common';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
 import { AddToCaseProps } from '../header/add_to_case_action';
 import { observabilityFeatureId } from '../../../../../common';
-import { CasesDeepLinkId, DRAFT_COMMENT_STORAGE_ID } from '../../../../../../cases/public';
 
 async function addToCase(
   http: HttpSetup,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx
index ecc6ac3c63eda..670ddb8187c01 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_data_view.tsx
@@ -6,15 +6,15 @@
  */
 
 import React, { createContext, useContext, Context, useState, useCallback, useMemo } from 'react';
-import { HttpFetchError } from 'kibana/public';
-import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { HttpFetchError } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { DataViewInsufficientAccessError } from '@kbn/data-views-plugin/common';
 import { AppDataType } from '../types';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityPublicPluginsStart } from '../../../../plugin';
 import { ObservabilityDataViews } from '../../../../utils/observability_data_views';
 import { getDataHandler } from '../../../../data_handler';
 import { useExploratoryView } from '../contexts/exploratory_view_config';
-import { DataViewInsufficientAccessError } from '../../../../../../../../src/plugins/data_views/common';
 import { getApmDataViewTitle } from '../utils/utils';
 
 export interface DataViewContext {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx
index d50e2134546c4..a3f270a3a10a4 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.test.tsx
@@ -12,14 +12,14 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useLensAttributes } from './use_lens_attributes';
 import { ReportTypes } from '../configurations/constants';
 import { mockDataView } from '../rtl_helpers';
-import { createKbnUrlStateStorage } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { TRANSACTION_DURATION } from '../configurations/constants/elasticsearch_fieldnames';
 import * as lensAttributes from '../configurations/lens_attributes';
 import * as useAppDataViewHook from './use_app_data_view';
 import * as theme from '../../../../hooks/use_theme';
 import { dataTypes, obsvReportConfigMap, reportTypesList } from '../obsv_exploratory_view';
 import { ExploratoryViewContextProvider } from '../contexts/exploratory_view_config';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 const mockSingleSeries = [
   {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
index 748d2e8fd6d0c..8d47d42e2007e 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
@@ -7,7 +7,8 @@
 
 import { useMemo } from 'react';
 import { isEmpty } from 'lodash';
-import { TypedLensByValueInput } from '../../../../../../lens/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { LayerConfig, LensAttributes } from '../configurations/lens_attributes';
 import {
   AllSeries,
@@ -22,7 +23,6 @@ import { ReportViewType, SeriesUrl, UrlFilter } from '../types';
 import { DataViewState, useAppDataViewContext } from './use_app_data_view';
 import { ALL_VALUES_SELECTED } from '../../field_value_suggestions/field_value_combobox';
 import { useTheme } from '../../../../hooks/use_theme';
-import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
 import { LABEL_FIELDS_BREAKDOWN } from '../configurations/constants';
 import { ReportConfigMap, useExploratoryView } from '../contexts/exploratory_view_config';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
index 3fca13f7978d6..24d5fc1d20615 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
@@ -6,10 +6,8 @@
  */
 
 import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
-import {
-  IKbnUrlStateStorage,
-  ISessionStorageStateStorage,
-} from '../../../../../../../../src/plugins/kibana_utils/public';
+import { IKbnUrlStateStorage, ISessionStorageStateStorage } from '@kbn/kibana-utils-plugin/public';
+import { OperationType, SeriesType } from '@kbn/lens-plugin/public';
 import { useUiTracker } from '../../../../hooks/use_track_metric';
 import type {
   AppDataType,
@@ -19,7 +17,6 @@ import type {
   URLReportDefinition,
 } from '../types';
 import { convertToShortUrl } from '../configurations/utils';
-import { OperationType, SeriesType } from '../../../../../../lens/public';
 import { URL_KEYS } from '../configurations/constants/url_constants';
 import { trackTelemetryOnApply } from '../utils/telemetry';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx
index edac44cf22e38..b97e3cc3c6923 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_time_range.test.tsx
@@ -11,7 +11,7 @@ import { allSeriesKey, reportTypeKey, UrlStorageContextProvider } from './use_se
 import { renderHook } from '@testing-library/react-hooks';
 import { useExpViewTimeRange } from './use_time_range';
 import { ReportTypes } from '../configurations/constants';
-import { createKbnUrlStateStorage } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import {
   TRANSACTION_DURATION,
   METRIC_SYSTEM_MEMORY_USAGE,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx
index 94954ff5522dc..f9a58a8ff7433 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/index.tsx
@@ -8,19 +8,19 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { useHistory } from 'react-router-dom';
-import { ExploratoryView } from './exploratory_view';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { ObservabilityPublicPluginsStart } from '../../../plugin';
-import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
-import { DataViewContextProvider } from './hooks/use_app_data_view';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   createKbnUrlStateStorage,
   withNotifyOnErrors,
   createSessionStorageStateStorage,
-} from '../../../../../../../src/plugins/kibana_utils/public/';
+} from '@kbn/kibana-utils-plugin/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { ExploratoryView } from './exploratory_view';
+import { ObservabilityPublicPluginsStart } from '../../../plugin';
+import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
+import { DataViewContextProvider } from './hooks/use_app_data_view';
 import { UrlStorageContextProvider } from './hooks/use_series_storage';
 import { useTrackPageview } from '../../..';
-import { TypedLensByValueInput } from '../../../../../lens/public';
 import { usePluginContext } from '../../../hooks/use_plugin_context';
 
 const PAGE_TITLE = i18n.translate('xpack.observability.expView.heading.label', {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
index d5cd5379daca0..cd1fd4cc014bc 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
@@ -8,11 +8,11 @@
 import { i18n } from '@kbn/i18n';
 import React, { Dispatch, SetStateAction, useCallback, useState } from 'react';
 import styled from 'styled-components';
-import { LensEmbeddableInput, TypedLensByValueInput } from '../../../../../lens/public';
+import { LensEmbeddableInput, TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useUiTracker } from '../../../hooks/use_track_metric';
 import { useSeriesStorage } from './hooks/use_series_storage';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useExpViewTimeRange } from './hooks/use_time_range';
 import { parseRelativeDate } from './components/date_range_picker';
 import { trackTelemetryOnLoad } from './utils/telemetry';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
index c6760aec6814a..18c6020ff8b26 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiErrorBoundary } from '@elastic/eui';
-import { ExploratoryViewPage } from './index';
+import { ExploratoryViewPage } from '.';
 import { ExploratoryViewContextProvider } from './contexts/exploratory_view_config';
 import { AppDataType, ReportViewType } from './types';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
index 360f7cd064cb7..23c635be3ba81 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
@@ -16,16 +16,20 @@ import {
 } from '@testing-library/react';
 import { Route, Router } from 'react-router-dom';
 import { createMemoryHistory, History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
-import {
-  KibanaContextProvider,
-  KibanaServices,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider, KibanaServices } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { lensPluginMock } from '@kbn/lens-plugin/public/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { setIndexPatterns } from '@kbn/unified-search-plugin/public/services';
+import type { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
+import { createStubDataView } from '@kbn/data-views-plugin/common/stubs';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { casesPluginMock } from '@kbn/cases-plugin/public/mocks';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { lensPluginMock } from '../../../../../lens/public/mocks';
 import * as useAppDataViewHook from './hooks/use_app_data_view';
 import { DataViewContext, DataViewContextProvider } from './hooks/use_app_data_view';
 import {
@@ -41,20 +45,10 @@ import * as useHasDataHook from '../../../hooks/use_has_data';
 import * as useValuesListHook from '../../../hooks/use_values_list';
 
 import dataViewData from './configurations/test_data/test_data_view.json';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setIndexPatterns } from '../../../../../../../src/plugins/unified_search/public/services';
-import type {
-  DataView,
-  DataViewsContract,
-} from '../../../../../../../src/plugins/data_views/public';
 
 import { AppDataType, SeriesUrl, UrlFilter } from './types';
-import { createStubDataView } from '../../../../../../../src/plugins/data_views/common/stubs';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { dataViewPluginMocks } from '../../../../../../../src/plugins/data_views/public/mocks';
 import { ListItem } from '../../../hooks/use_values_list';
 import { TRANSACTION_DURATION } from './configurations/constants/elasticsearch_fieldnames';
-import { casesPluginMock } from '../../../../../cases/public/mocks';
 import { dataTypes, obsvReportConfigMap, reportTypesList } from './obsv_exploratory_view';
 import { ExploratoryViewContextProvider } from './contexts/exploratory_view_config';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
index 6f88de5cc2afc..cacf043d65d68 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
@@ -8,9 +8,9 @@
 import React, { useState } from 'react';
 import { EuiPopover, EuiToolTip, EuiButtonEmpty, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../../../../../plugin';
-import { SeriesUrl, useFetcher } from '../../../../../index';
+import { SeriesUrl, useFetcher } from '../../../../..';
 import { SeriesConfig } from '../../types';
 import { SeriesChartTypesSelect } from './chart_types';
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
index 27d846502dbe6..b75a3adcc8ae0 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiIcon, EuiSuperSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { SeriesType } from '@kbn/lens-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../../../../../plugin';
 import { SeriesUrl, useFetcher } from '../../../../..';
 import { useSeriesStorage } from '../../hooks/use_series_storage';
-import { SeriesType } from '../../../../../../../lens/public';
 
 const CHART_TYPE_LABEL = i18n.translate('xpack.observability.expView.chartTypes.label', {
   defaultMessage: 'Chart type',
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx
index 234b19fefb02c..5ad043a6b3b96 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx
@@ -8,9 +8,9 @@ import { i18n } from '@kbn/i18n';
 
 import React, { useMemo } from 'react';
 import { EuiFilterButton, hexToRgb } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useAppDataViewContext } from '../../hooks/use_app_data_view';
 import { useSeriesFilters } from '../../hooks/use_series_filters';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import FieldValueSuggestions from '../../../field_value_suggestions';
 import { SeriesUrl } from '../../types';
 import { NestedFilterOpen } from './filter_expanded';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
index 3d005e04e9928..53669084de8ad 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSuperSelect } from '@elastic/eui';
 
+import { OperationType } from '@kbn/lens-plugin/public';
 import { useSeriesStorage } from '../../hooks/use_series_storage';
-import { OperationType } from '../../../../../../../lens/public';
 import { SeriesUrl } from '../../types';
 
 export function OperationTypeSelect({
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx
index b518993a51940..d47b602492000 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx
@@ -8,10 +8,10 @@
 import React, { useMemo } from 'react';
 import { isEmpty } from 'lodash';
 import { ExistsFilter, PhraseFilter } from '@kbn/es-query';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import FieldValueSuggestions from '../../../field_value_suggestions';
 import { useAppDataViewContext } from '../../hooks/use_app_data_view';
-import { ESFilter } from '../../../../../../../../../src/core/types/elasticsearch';
-import { PersistableFilter } from '../../../../../../../lens/common';
 import { buildPhrasesFilter } from '../../configurations/utils';
 import { SeriesConfig, SeriesUrl } from '../../types';
 import { ALL_VALUES_SELECTED } from '../../../field_value_suggestions/field_value_combobox';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx
index a6942418c609b..13aee75979145 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/components/filter_values_list.tsx
@@ -11,8 +11,8 @@ import { rgba } from 'polished';
 import styled from 'styled-components';
 import { map } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FilterValueButton } from '../columns/filter_value_btn';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { FilterProps, NestedFilterOpen } from '../columns/filter_expanded';
 import { UrlFilter } from '../../types';
 import { ListItem } from '../../../../../hooks/use_values_list';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx
index 7819c8bae7688..ad2226c34c94a 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/series_editor.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiFormRow, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { rgba } from 'polished';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { AppDataType, ReportViewType, BuilderItem } from '../types';
 import { SeriesContextValue, useSeriesStorage } from '../hooks/use_series_storage';
 import { DataViewState, useAppDataViewContext } from '../hooks/use_app_data_view';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts
index 848bd6b44ea16..e131425da8add 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts
@@ -6,11 +6,11 @@
  */
 import { ExistsFilter, isExistsFilter } from '@kbn/es-query';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { PersistableFilter } from '@kbn/lens-plugin/common';
 import { useValuesList } from '../../../../hooks/use_values_list';
 import { FilterProps } from './columns/filter_expanded';
 import { useAppDataViewContext } from '../hooks/use_app_data_view';
-import { ESFilter } from '../../../../../../../../src/core/types/elasticsearch';
-import { PersistableFilter } from '../../../../../../lens/common';
 
 export function useFilterValues(
   { field, series, baseFilters, label }: FilterProps,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts
index 775c989df2aec..072f6e42d1cd8 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { PaletteOutput } from 'src/plugins/charts/public';
-import { ExistsFilter, PhraseFilter } from '@kbn/es-query';
-import {
+import type { PaletteOutput } from '@kbn/coloring';
+import type { ExistsFilter, PhraseFilter } from '@kbn/es-query';
+import type {
   LastValueIndexPatternColumn,
   DateHistogramIndexPatternColumn,
   FieldBasedIndexPatternColumn,
   SeriesType,
   OperationType,
   YConfig,
-} from '../../../../../lens/public';
+} from '@kbn/lens-plugin/public';
 
-import { PersistableFilter } from '../../../../../lens/common';
-import type { DataView } from '../../../../../../../src/plugins/data_views/common';
+import type { PersistableFilter } from '@kbn/lens-plugin/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 
 export const ReportViewTypes = {
   dist: 'data-distribution',
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
index e15e5709bc341..0916cc4673129 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/__stories__/field_value_selection.stories.tsx
@@ -8,9 +8,9 @@
 import React, { ComponentType, useEffect, useState } from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { Observable } from 'rxjs';
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { text } from '@storybook/addon-knobs';
-import { createKibanaReactContext } from '../../../../../../../../src/plugins/kibana_react/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { FieldValueSelectionProps } from '../types';
 import { FieldValueSelection } from '../field_value_selection';
 
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx
index 3b9f6264c773a..42f08adadec43 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount, render } from 'enzyme';
 import { FieldValueSelection } from './field_value_selection';
 import { EuiButton, EuiSelectableList } from '@elastic/eui';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 const values = [
   { label: 'elastic co frontend', count: 1 },
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx
index dfcd917cf534b..b258c4f4700e0 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/field_value_selection.tsx
@@ -20,8 +20,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import { isEqual, map } from 'lodash';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FieldValueSelectionProps, ListItem } from './types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 
 const Counter = euiStyled.div`
   border-radius: ${({ theme }) => theme.eui.euiBorderRadius};
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx
index 6671c43dd8c7b..249913e91b4e4 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/index.test.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { FieldValueSuggestions } from './index';
+import { FieldValueSuggestions } from '.';
 import { render, screen, fireEvent, waitForElementToBeRemoved } from '@testing-library/react';
 import * as searchHook from '../../../hooks/use_es_search';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 jest.setTimeout(30000);
 
diff --git a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts
index 1ee477e05fbc0..745f19f49225b 100644
--- a/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts
+++ b/x-pack/plugins/observability/public/components/shared/field_value_suggestions/types.ts
@@ -7,8 +7,8 @@
 
 import { PopoverAnchorPosition } from '@elastic/eui';
 import { Dispatch, SetStateAction } from 'react';
-import { ESFilter } from 'src/core/types/elasticsearch';
-import { IInspectorInfo } from '../../../../../../../src/plugins/data/common';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { IInspectorInfo } from '@kbn/data-plugin/common';
 
 interface CommonProps {
   selectedValue?: string[];
diff --git a/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx b/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
index d65c64fab3e59..5d6577dad8c9c 100644
--- a/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
+++ b/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { injectI18n } from '@kbn/i18n-react';
 import { Filter, buildPhrasesFilter, buildPhraseFilter } from '@kbn/es-query';
-import { FilterItem } from '../../../../../../../src/plugins/unified_search/public';
-import type { DataView } from '../../../../../../../src/plugins/data_views/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { FilterItem } from '@kbn/unified-search-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export function buildFilterLabel({
   field,
diff --git a/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx b/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx
index a3254b6d98b7a..055c974dcf6db 100644
--- a/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/header_menu_portal.test.tsx
@@ -8,7 +8,7 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 import HeaderMenuPortal from './header_menu_portal';
-import { themeServiceMock } from '../../../../../../src/core/public/mocks';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 describe('HeaderMenuPortal', () => {
   describe('when unmounted', () => {
diff --git a/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx b/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx
index 5b645605f7f1b..02d16c13ce4e8 100644
--- a/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx
+++ b/x-pack/plugins/observability/public/components/shared/header_menu_portal.tsx
@@ -7,7 +7,7 @@
 
 import React, { useEffect, useMemo } from 'react';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { HeaderMenuPortalProps } from './types';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/plugins/observability/public/components/shared/index.tsx b/x-pack/plugins/observability/public/components/shared/index.tsx
index cdbc6ec8a9513..2b70a5a4a7bd3 100644
--- a/x-pack/plugins/observability/public/components/shared/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/index.tsx
@@ -9,14 +9,14 @@ import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import type { CoreVitalProps, HeaderMenuPortalProps } from './types';
 import type { FieldValueSuggestionsProps } from './field_value_suggestions/types';
-import type { DatePickerProps } from './date_picker/index';
+import type { DatePickerProps } from './date_picker';
 import type { FilterValueLabelProps } from './filter_value_label/filter_value_label';
 import type { SelectableUrlListProps } from './exploratory_view/components/url_search/selectable_url_list';
-import type { ExploratoryViewPageProps } from './exploratory_view/index';
+import type { ExploratoryViewPageProps } from './exploratory_view';
 export { createLazyObservabilityPageTemplate } from './page_template';
 export type { LazyObservabilityPageTemplateProps } from './page_template';
 
-const CoreVitalsLazy = lazy(() => import('./core_web_vitals/index'));
+const CoreVitalsLazy = lazy(() => import('./core_web_vitals'));
 
 export function getCoreVitalsComponent(props: CoreVitalProps) {
   return (
@@ -36,7 +36,7 @@ export function HeaderMenuPortal(props: HeaderMenuPortalProps) {
   );
 }
 
-const FieldValueSuggestionsLazy = lazy(() => import('./field_value_suggestions/index'));
+const FieldValueSuggestionsLazy = lazy(() => import('./field_value_suggestions'));
 
 export function FieldValueSuggestions(props: FieldValueSuggestionsProps) {
   return (
@@ -68,7 +68,7 @@ export function SelectableUrlList(props: SelectableUrlListProps) {
   );
 }
 
-const ExploratoryViewLazy = lazy(() => import('./exploratory_view/index'));
+const ExploratoryViewLazy = lazy(() => import('./exploratory_view'));
 
 export function ExploratoryView(props: ExploratoryViewPageProps) {
   return (
@@ -78,7 +78,7 @@ export function ExploratoryView(props: ExploratoryViewPageProps) {
   );
 }
 
-const DatePickerLazy = lazy(() => import('./date_picker/index'));
+const DatePickerLazy = lazy(() => import('./date_picker'));
 
 export function DatePicker(props: DatePickerProps) {
   return (
diff --git a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
index ce27bba1445e0..9e0460c64777f 100644
--- a/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
+++ b/x-pack/plugins/observability/public/components/shared/page_template/page_template.tsx
@@ -11,11 +11,8 @@ import React, { useMemo } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
-import type { ApplicationStart } from '../../../../../../../src/core/public';
-import {
-  KibanaPageTemplate,
-  KibanaPageTemplateProps,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import type { ApplicationStart } from '@kbn/core/public';
+import { KibanaPageTemplate, KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import type { NavigationSection } from '../../../services/navigation_registry';
 import { NavNameWithBadge, hideBadge } from './nav_name_with_badge';
 
diff --git a/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx b/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx
index 9dbe7cf9fdf90..ce7fc4f53f799 100644
--- a/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/timestamp_tooltip/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import moment from 'moment-timezone';
-import { TimestampTooltip } from './index';
+import { TimestampTooltip } from '.';
 
 function mockNow(date: string | number | Date) {
   const fakeNow = new Date(date).getTime();
diff --git a/x-pack/plugins/observability/public/components/shared/types.ts b/x-pack/plugins/observability/public/components/shared/types.ts
index e08d2f19e5706..856a534a107f1 100644
--- a/x-pack/plugins/observability/public/components/shared/types.ts
+++ b/x-pack/plugins/observability/public/components/shared/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { ReactNode } from 'react';
-import { AppMountParameters } from '../../../../../../src/core/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { UXMetrics } from './core_web_vitals';
 
 export interface HeaderMenuPortalProps {
diff --git a/x-pack/plugins/observability/public/context/date_picker_context.tsx b/x-pack/plugins/observability/public/context/date_picker_context.tsx
index 711d0adc0e522..f37aba3cc7c6c 100644
--- a/x-pack/plugins/observability/public/context/date_picker_context.tsx
+++ b/x-pack/plugins/observability/public/context/date_picker_context.tsx
@@ -9,8 +9,8 @@ import React, { createContext, useState, useMemo, useCallback } from 'react';
 import useMount from 'react-use/lib/useMount';
 import { useLocation, useHistory } from 'react-router-dom';
 import { parse } from 'query-string';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { fromQuery, ObservabilityPublicPluginsStart, toQuery } from '..';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { getAbsoluteTime } from '../utils/date';
 
 export interface DatePickerContextValue {
diff --git a/x-pack/plugins/observability/public/context/has_data_context.test.tsx b/x-pack/plugins/observability/public/context/has_data_context.test.tsx
index 5c03c802c5e7e..1cac519680272 100644
--- a/x-pack/plugins/observability/public/context/has_data_context.test.tsx
+++ b/x-pack/plugins/observability/public/context/has_data_context.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { registerDataHandler, unregisterDataHandler } from '../data_handler';
 import { useHasData } from '../hooks/use_has_data';
 import { HasData, ObservabilityFetchDataPlugins } from '../typings/fetch_overview_data';
diff --git a/x-pack/plugins/observability/public/context/has_data_context.tsx b/x-pack/plugins/observability/public/context/has_data_context.tsx
index cbdbe0c679156..e5e281979ef2f 100644
--- a/x-pack/plugins/observability/public/context/has_data_context.tsx
+++ b/x-pack/plugins/observability/public/context/has_data_context.tsx
@@ -9,13 +9,13 @@ import { isEmpty, uniqueId } from 'lodash';
 import React, { createContext, useEffect, useState } from 'react';
 import { useRouteMatch } from 'react-router-dom';
 import { asyncForEach } from '@kbn/std';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { getDataHandler } from '../data_handler';
 import { FETCH_STATUS } from '../hooks/use_fetcher';
 import { useDatePickerContext } from '../hooks/use_date_picker_context';
 import { getObservabilityAlerts } from '../services/get_observability_alerts';
 import { ObservabilityFetchDataPlugins } from '../typings/fetch_overview_data';
 import { ApmIndicesConfig } from '../../common/typings';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../application/types';
 
 type DataContextApps = ObservabilityFetchDataPlugins | 'alert';
diff --git a/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx b/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx
index 56498fcaecd5c..b5bc254dd6308 100644
--- a/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx
+++ b/x-pack/plugins/observability/public/context/inspector/inspector_context.tsx
@@ -7,7 +7,7 @@
 
 import React, { createContext, ReactNode, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
-import { RequestAdapter } from '../../../../../../src/plugins/inspector/common';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { FetcherResult } from '../../hooks/use_fetcher';
 import { InspectResponse } from '../../../typings/common';
 
diff --git a/x-pack/plugins/observability/public/context/plugin_context.tsx b/x-pack/plugins/observability/public/context/plugin_context.tsx
index e4e1ddb420340..37dffe4daa178 100644
--- a/x-pack/plugins/observability/public/context/plugin_context.tsx
+++ b/x-pack/plugins/observability/public/context/plugin_context.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { AppMountParameters } from 'kibana/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { createContext } from 'react';
-import { KibanaFeature } from '../../../features/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
 import { ConfigSchema } from '..';
 import { ObservabilityRuleTypeRegistry } from '../rules/create_observability_rule_type_registry';
 import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template';
diff --git a/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts b/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts
index 3df79bec1a8f2..f3111328edbea 100644
--- a/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts
+++ b/x-pack/plugins/observability/public/hooks/use_alert_permission.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getAlertsPermissions, useGetUserAlertsPermissions } from './use_alert_permission';
-import { applicationServiceMock } from 'src/core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { renderHook } from '@testing-library/react-hooks';
 
 describe('getAlertsPermissions', () => {
diff --git a/x-pack/plugins/observability/public/hooks/use_alert_permission.ts b/x-pack/plugins/observability/public/hooks/use_alert_permission.ts
index 2b7eddd5c7182..8669f187dc975 100644
--- a/x-pack/plugins/observability/public/hooks/use_alert_permission.ts
+++ b/x-pack/plugins/observability/public/hooks/use_alert_permission.ts
@@ -7,7 +7,7 @@
 
 import { useEffect, useState } from 'react';
 import { RecursiveReadonly } from '@kbn/utility-types';
-import { Capabilities } from 'src/core/types';
+import { Capabilities } from '@kbn/core/types';
 
 export interface UseGetUserAlertsPermissionsProps {
   crud: boolean;
diff --git a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx
index e5efca1d67a25..08778d8bc3a4d 100644
--- a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.test.tsx
@@ -8,8 +8,8 @@
 import { renderHook } from '@testing-library/react-hooks';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { useBreadcrumbs } from './use_breadcrumbs';
 
 const setBreadcrumbs = jest.fn();
diff --git a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts
index 899308e6d73bf..fe828ca663abd 100644
--- a/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { MouseEvent, useEffect } from 'react';
 import { useKibana } from '../utils/kibana_react';
 import { useQueryParams } from './use_query_params';
diff --git a/x-pack/plugins/observability/public/hooks/use_es_search.ts b/x-pack/plugins/observability/public/hooks/use_es_search.ts
index 94126d6c1540e..2215d31c838fb 100644
--- a/x-pack/plugins/observability/public/hooks/use_es_search.ts
+++ b/x-pack/plugins/observability/public/hooks/use_es_search.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { IInspectorInfo, isCompleteResponse } from '../../../../../src/plugins/data/common';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IInspectorInfo, isCompleteResponse } from '@kbn/data-plugin/common';
 import { FETCH_STATUS, useFetcher } from './use_fetcher';
 import { useInspectorContext } from '../context/inspector/use_inspector_context';
 import { getInspectResponse } from '../../common/utils/get_inspect_response';
diff --git a/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts b/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts
index e3a1ab9c0137c..b241cb3529f89 100644
--- a/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts
+++ b/x-pack/plugins/observability/public/hooks/use_fetch_rules.ts
@@ -7,7 +7,7 @@
 
 import { useEffect, useState, useCallback } from 'react';
 import { isEmpty } from 'lodash';
-import { loadRules, Rule } from '../../../triggers_actions_ui/public';
+import { loadRules, Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { RULES_LOAD_ERROR } from '../pages/rules/translations';
 import { FetchRulesProps } from '../pages/rules/types';
 import { OBSERVABILITY_RULE_TYPES } from '../pages/rules/config';
diff --git a/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts b/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts
index 6bb8b476b4d01..3f23aec4a6058 100644
--- a/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts
+++ b/x-pack/plugins/observability/public/hooks/use_get_user_cases_permissions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { applicationServiceMock } from 'src/core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 import { casesFeatureId } from '../../common';
 import { useGetUserCasesPermissions } from './use_get_user_cases_permissions';
 import { kibanaStartMock } from '../utils/kibana_react.mock';
diff --git a/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx b/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx
index d16fbf6f7cd14..f448e07125d8b 100644
--- a/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_kibana_ui_settings.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export { UI_SETTINGS };
 
diff --git a/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx b/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
index 5741b20e693a2..e4fb3b6bd9ddb 100644
--- a/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_link_props.test.tsx
@@ -10,9 +10,9 @@ import { createMemoryHistory } from 'history';
 import React, { PropsWithChildren } from 'react';
 import { Router } from 'react-router-dom';
 import { encode } from 'rison-node';
-import { coreMock } from 'src/core/public/mocks';
-import { ScopedHistory } from '../../../../../src/core/public';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ScopedHistory } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { LinkDescriptor, useLinkProps } from './use_link_props';
 
 const PREFIX = '/test-basepath/s/test-space/app/';
diff --git a/x-pack/plugins/observability/public/hooks/use_link_props.ts b/x-pack/plugins/observability/public/hooks/use_link_props.ts
index 8777d2a944ddf..55746add79ccc 100644
--- a/x-pack/plugins/observability/public/hooks/use_link_props.ts
+++ b/x-pack/plugins/observability/public/hooks/use_link_props.ts
@@ -7,9 +7,9 @@
 
 import { useMemo } from 'react';
 import { stringify } from 'query-string';
-import { url as urlUtils } from '../../../../../src/plugins/kibana_utils/public';
+import { url as urlUtils } from '@kbn/kibana-utils-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { usePrefixPathWithBasepath } from './use_prefix_path_with_basepath';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { useNavigationWarningPrompt } from '../utils/navigation_warning_prompt';
 
 type Search = Record<string, string | string[]>;
diff --git a/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx b/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
index 7c5496faaf4a3..05fde570878da 100644
--- a/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_prefix_path_with_basepath.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useMemo } from 'react';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const usePrefixPathWithBasepath = () => {
   const getUrlForApp = useKibana().services.application?.getUrlForApp;
diff --git a/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx b/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx
index 198b4092b0ed6..a6b4e78d86b89 100644
--- a/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_quick_time_ranges.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { useUiSetting } from '../../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { TimePickerQuickRange } from '../components/shared/exploratory_view/components/series_date_picker';
 
 export function useQuickTimeRanges() {
diff --git a/x-pack/plugins/observability/public/hooks/use_theme.tsx b/x-pack/plugins/observability/public/hooks/use_theme.tsx
index 4e8aded2b8037..f0957c15ae1d6 100644
--- a/x-pack/plugins/observability/public/hooks/use_theme.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_theme.tsx
@@ -7,7 +7,7 @@
 
 import { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
-import { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 export function useTheme() {
   const theme: EuiTheme = useContext(ThemeContext);
diff --git a/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts b/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts
index b82a35ce1f462..24f0c4f93a9e8 100644
--- a/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts
+++ b/x-pack/plugins/observability/public/hooks/use_timefilter_service.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { ObservabilityPublicPluginsStart } from '../';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ObservabilityPublicPluginsStart } from '..';
 
 export function useTimefilterService() {
   const { services } = useKibana<ObservabilityPublicPluginsStart>();
diff --git a/x-pack/plugins/observability/public/hooks/use_track_metric.tsx b/x-pack/plugins/observability/public/hooks/use_track_metric.tsx
index b2327b590156a..6a3f0c3e8965d 100644
--- a/x-pack/plugins/observability/public/hooks/use_track_metric.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_track_metric.tsx
@@ -7,8 +7,8 @@
 
 import { useEffect, useMemo } from 'react';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityApp } from '../../typings/common';
 
 /**
diff --git a/x-pack/plugins/observability/public/hooks/use_values_list.ts b/x-pack/plugins/observability/public/hooks/use_values_list.ts
index 5ab9b41ca6f9a..f6c75c6abbaf0 100644
--- a/x-pack/plugins/observability/public/hooks/use_values_list.ts
+++ b/x-pack/plugins/observability/public/hooks/use_values_list.ts
@@ -8,9 +8,9 @@
 import { capitalize, uniqBy } from 'lodash';
 import { useEffect, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
-import { ESFilter } from '../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { IInspectorInfo } from '@kbn/data-plugin/common';
 import { createEsParams, useEsSearch } from './use_es_search';
-import { IInspectorInfo } from '../../../../../src/plugins/data/common';
 import { TRANSACTION_URL } from '../components/shared/exploratory_view/configurations/constants/elasticsearch_fieldnames';
 
 export interface Props {
diff --git a/x-pack/plugins/observability/public/index.ts b/x-pack/plugins/observability/public/index.ts
index 73290929088c9..cfabbaaec4afa 100644
--- a/x-pack/plugins/observability/public/index.ts
+++ b/x-pack/plugins/observability/public/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110905
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext, PluginInitializer } from 'kibana/public';
+import { PluginInitializerContext, PluginInitializer } from '@kbn/core/public';
 import { lazy } from 'react';
 import {
   Plugin,
@@ -49,9 +49,9 @@ export const plugin: PluginInitializer<
   return new Plugin(context);
 };
 
-export * from './components/shared/action_menu/';
+export * from './components/shared/action_menu';
 
-export type { UXMetrics } from './components/shared/core_web_vitals/';
+export type { UXMetrics } from './components/shared/core_web_vitals';
 export { DatePickerContextProvider } from './context/date_picker_context';
 export {
   getCoreVitalsComponent,
@@ -61,7 +61,7 @@ export {
   SelectableUrlList,
   ExploratoryView,
   DatePicker,
-} from './components/shared/';
+} from './components/shared';
 
 export type { LazyObservabilityPageTemplateProps } from './components/shared';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx
index 31c8f69757c9d..498ba57fcd2b4 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.stories.tsx
@@ -7,7 +7,7 @@
 
 import { ALERT_UUID } from '@kbn/rule-data-utils';
 import React, { ComponentType } from 'react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { PluginContext, PluginContextValue } from '../../../../context/plugin_context';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
 import { apmAlertResponseExample } from './example_data';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx
index 13fb5d805fb81..23f000235aeca 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import * as useUiSettingHook from '../../../../../../../../src/plugins/kibana_react/public/ui_settings/use_ui_setting';
+import * as useUiSettingHook from '@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
 import { render } from '../../../../utils/test_helper';
 import type { TopAlert } from '../../containers/alerts_page';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx
index 893fdf7e8d7e0..d0957f0224b53 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_flyout/alerts_flyout.tsx
@@ -33,8 +33,8 @@ import {
 } from '@kbn/rule-data-utils';
 import moment from 'moment-timezone';
 import React, { useMemo } from 'react';
+import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
 import type { TopAlert } from '../../containers';
-import { useKibana, useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { asDuration } from '../../../../../common/utils/formatters';
 import type { ObservabilityRuleTypeRegistry } from '../../../../rules/create_observability_rule_type_registry';
 import { parseAlert } from '../parse_alert';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
index 28b9b3c0758e8..0798e3afded80 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
@@ -7,10 +7,10 @@
 
 import { DataViewBase } from '@kbn/es-query';
 import React, { useMemo, useState } from 'react';
-import { TimeHistory } from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { TimeHistory } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { translations } from '../../../config';
 
 type QueryLanguageType = 'lucene' | 'kuery';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx b/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx
index 5126647161fa5..115fa703459b9 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/default_cell_actions.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { getMappedNonEcsValue } from './render_cell_value';
+import { TimelineNonEcsData } from '@kbn/timelines-plugin/common/search_strategy';
+import { TGridCellAction } from '@kbn/timelines-plugin/common/types/timeline';
+import { getPageRowIndex } from '@kbn/timelines-plugin/public';
 import FilterForValueButton from './filter_for_value';
-import { TimelineNonEcsData } from '../../../../../timelines/common/search_strategy';
-import { TGridCellAction } from '../../../../../timelines/common/types/timeline';
-import { getPageRowIndex } from '../../../../../timelines/public';
+import { getMappedNonEcsValue } from './render_cell_value';
 
 export const FILTER_FOR_VALUE = i18n.translate('xpack.observability.hoverActions.filterForValue', {
   defaultMessage: 'Filter for value',
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts b/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts
index 6577e022a2a6d..c8838e197981b 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/components/parse_alert.ts
@@ -13,10 +13,10 @@ import {
   ALERT_RULE_NAME,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import type { TopAlert } from '../';
-import { experimentalRuleFieldMap } from '../../../../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
-import { parseTechnicalFields } from '../../../../../rule_registry/common/parse_technical_fields';
-import { parseExperimentalFields } from '../../../../../rule_registry/common/parse_experimental_fields';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
+import { parseTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
+import { parseExperimentalFields } from '@kbn/rule-registry-plugin/common/parse_experimental_fields';
+import type { TopAlert } from '..';
 import { asDuration, asPercent } from '../../../../common/utils/formatters';
 import { ObservabilityRuleTypeRegistry } from '../../../rules/create_observability_rule_type_registry';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
index babb60d4a80f0..1c680f0e1618f 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { ALERT_STATUS, ALERT_STATUS_ACTIVE, ALERT_STATUS_RECOVERED } from '@kbn/rule-data-utils';
-import type { CellValueElementProps } from '../../../../../../timelines/common';
+import type { CellValueElementProps } from '@kbn/timelines-plugin/common';
 import { createObservabilityRuleTypeRegistryMock } from '../../../../rules/observability_rule_type_registry_mock';
 import * as PluginHook from '../../../../hooks/use_plugin_context';
 import { render } from '../../../../utils/test_helper';
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx
index 27b88fa60d282..2c707503af44a 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/render_cell_value/render_cell_value.tsx
@@ -15,12 +15,12 @@ import {
   ALERT_REASON,
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
-import type { CellValueElementProps, TimelineNonEcsData } from '../../../../../../timelines/common';
+import type { CellValueElementProps, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
 import { AlertStatusIndicator } from '../../../../components/shared/alert_status_indicator';
 import { TimestampTooltip } from '../../../../components/shared/timestamp_tooltip';
 import { asDuration } from '../../../../../common/utils/formatters';
 import { SeverityBadge } from '../severity_badge';
-import { TopAlert } from '../../';
+import { TopAlert } from '../..';
 import { parseAlert } from '../parse_alert';
 import { usePluginContext } from '../../../../hooks/use_plugin_context';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
index dbe095c311c0f..e9256993c5857 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_page/alerts_page.tsx
@@ -13,14 +13,14 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { ALERT_STATUS, AlertStatus } from '@kbn/rule-data-utils';
 
-import { observabilityFeatureId } from '../../../../../common';
-import { useGetUserCasesPermissions } from '../../../../hooks/use_get_user_cases_permissions';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { loadRuleAggregations } from '../../../../../../../plugins/triggers_actions_ui/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { loadRuleAggregations } from '@kbn/triggers-actions-ui-plugin/public';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
+import { ParsedExperimentalFields } from '@kbn/rule-registry-plugin/common/parse_experimental_fields';
 import { AlertStatusFilterButton } from '../../../../../common/typings';
-import { ParsedTechnicalFields } from '../../../../../../rule_registry/common/parse_technical_fields';
-import { ParsedExperimentalFields } from '../../../../../../rule_registry/common/parse_experimental_fields';
+import { useGetUserCasesPermissions } from '../../../../hooks/use_get_user_cases_permissions';
+import { observabilityFeatureId } from '../../../../../common';
 import { ExperimentalBadge } from '../../../../components/shared/experimental_badge';
 import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs';
 import { useAlertIndexNames } from '../../../../hooks/use_alert_index_names';
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts
index d22daeba10ecb..ef36911a93530 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/add_display_names.ts
@@ -6,8 +6,8 @@
  */
 import { ALERT_DURATION, ALERT_REASON, ALERT_STATUS, TIMESTAMP } from '@kbn/rule-data-utils';
 import { EuiDataGridColumn } from '@elastic/eui';
+import type { ColumnHeaderOptions } from '@kbn/timelines-plugin/common';
 import { translations } from '../../../../config';
-import type { ColumnHeaderOptions } from '../../../../../../timelines/common';
 
 export const addDisplayNames = (
   column: Pick<EuiDataGridColumn, 'display' | 'displayAsText' | 'id' | 'initialWidth'> &
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx
index 9e76a1809d309..a151cfabf280b 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/alerts_table_t_grid/alerts_table_t_grid.tsx
@@ -38,22 +38,24 @@ import styled from 'styled-components';
 import React, { Suspense, useMemo, useState, useCallback, useEffect } from 'react';
 
 import { pick } from 'lodash';
-import { getAlertsPermissions } from '../../../../hooks/use_alert_permission';
 import type {
   TGridType,
   TGridState,
   TGridModel,
   SortDirection,
-} from '../../../../../../timelines/public';
-
-import type { TopAlert } from '../alerts_page/alerts_page';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/timelines-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type {
   ActionProps,
   ColumnHeaderOptions,
   ControlColumnProps,
   RowRenderer,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
+import { CaseAttachments } from '@kbn/cases-plugin/public';
+import { CommentType } from '@kbn/cases-plugin/common';
+import { getAlertsPermissions } from '../../../../hooks/use_alert_permission';
+
+import type { TopAlert } from '../alerts_page/alerts_page';
 
 import { getRenderCellValue } from '../../components/render_cell_value';
 import { observabilityAppId, observabilityFeatureId } from '../../../../../common';
@@ -63,8 +65,6 @@ import { LazyAlertsFlyout } from '../../../..';
 import { parseAlert } from '../../components/parse_alert';
 import { translations, paths } from '../../../../config';
 import { addDisplayNames } from './add_display_names';
-import { CaseAttachments } from '../../../../../../cases/public';
-import { CommentType } from '../../../../../../cases/common';
 import { ADD_TO_EXISTING_CASE, ADD_TO_NEW_CASE } from './translations';
 import { ObservabilityAppServices } from '../../../../application/types';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx
index 02311833325f3..392340fc80b2d 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/state_container.tsx
@@ -8,7 +8,7 @@
 import {
   createStateContainer,
   createStateContainerReactHelpers,
-} from '../../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 
 interface AlertsPageContainerState {
   rangeFrom: string;
diff --git a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx
index 0e6c6c7c7a20b..0b9fb864b098e 100644
--- a/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/containers/state_container/use_alerts_page_state_container.tsx
@@ -8,13 +8,13 @@
 import { useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 
-import { TimefilterContract } from '../../../../../../../../src/plugins/data/public';
+import { TimefilterContract } from '@kbn/data-plugin/public';
 import {
   createKbnUrlStateStorage,
   syncState,
   IKbnUrlStateStorage,
   useContainerSelector,
-} from '../../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/kibana-utils-plugin/public';
 import { useTimefilterService } from '../../../../hooks/use_timefilter_service';
 
 import {
diff --git a/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx b/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx
index 9cb41a99404a5..8f5297c264f80 100644
--- a/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/cases/cases.stories.tsx
@@ -7,15 +7,12 @@
 
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { AppMountParameters } from 'kibana/public';
-import { CoreStart } from '../../../../../../src/core/public';
-import {
-  createKibanaReactContext,
-  KibanaPageTemplate,
-} from '../../../../../../src/plugins/kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { casesFeatureId } from '../../../common';
 import { PluginContext, PluginContextValue } from '../../context/plugin_context';
-import { CasesPage } from './';
+import { CasesPage } from '.';
 
 export default {
   title: 'app/Cases',
diff --git a/x-pack/plugins/observability/public/pages/cases/index.tsx b/x-pack/plugins/observability/public/pages/cases/index.tsx
index e50d8469c84bb..6567725de636b 100644
--- a/x-pack/plugins/observability/public/pages/cases/index.tsx
+++ b/x-pack/plugins/observability/public/pages/cases/index.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Cases } from './cases';
 
 import { CaseFeatureNoPermissions } from './feature_no_permissions';
@@ -15,7 +16,6 @@ import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useHasData } from '../../hooks/use_has_data';
 import { LoadingObservability } from '../overview/loading_observability';
 import { getNoDataConfig } from '../../utils/no_data_config';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../application/types';
 
 export const CasesPage = React.memo(() => {
diff --git a/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts b/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts
index 2ee585b4f81ad..ab917ac3af322 100644
--- a/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts
+++ b/x-pack/plugins/observability/public/pages/cases/use_data_fetcher.ts
@@ -7,7 +7,7 @@
 
 import { useState, useMemo, useEffect } from 'react';
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useKibana } from '../../utils/kibana_react';
 
 type DataFetcher<T, R> = (params: T, ctrl: AbortController, http: HttpSetup) => Promise<R>;
diff --git a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts
index 1e47094be866c..ce1a5ed10a8e0 100644
--- a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts
+++ b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_data.ts
@@ -9,8 +9,8 @@ import { useCallback, useMemo } from 'react';
 import { isEmpty } from 'lodash';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { HttpSetup } from 'kibana/public';
-import { BASE_RAC_ALERTS_API_PATH } from '../../../../rule_registry/common/constants';
+import { HttpSetup } from '@kbn/core/public';
+import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/constants';
 import { useDataFetcher } from './use_data_fetcher';
 
 export const useFetchAlertData = (alertIds: string[]): [boolean, Record<string, unknown>] => {
diff --git a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts
index 4fe66a754056b..3bb13e063b18c 100644
--- a/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts
+++ b/x-pack/plugins/observability/public/pages/cases/use_fetch_alert_detail.ts
@@ -7,10 +7,10 @@
 import { useCallback, useMemo } from 'react';
 import { isEmpty } from 'lodash';
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/constants';
 import { usePluginContext } from '../../hooks/use_plugin_context';
-import { TopAlert, parseAlert } from '../../pages/alerts/';
-import { BASE_RAC_ALERTS_API_PATH } from '../../../../rule_registry/common/constants';
+import { TopAlert, parseAlert } from '../alerts';
 import { ObservabilityRuleTypeRegistry } from '../..';
 import { useDataFetcher } from './use_data_fetcher';
 
diff --git a/x-pack/plugins/observability/public/pages/home/index.test.tsx b/x-pack/plugins/observability/public/pages/home/index.test.tsx
index 60b3e809e7de9..acd8ad7faa97b 100644
--- a/x-pack/plugins/observability/public/pages/home/index.test.tsx
+++ b/x-pack/plugins/observability/public/pages/home/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { HasDataContextValue } from '../../context/has_data_context';
 import * as hasData from '../../hooks/use_has_data';
 import { render } from '../../utils/test_helper';
-import { HomePage } from './';
+import { HomePage } from '.';
 
 const mockHistoryPush = jest.fn();
 jest.mock('react-router-dom', () => ({
diff --git a/x-pack/plugins/observability/public/pages/landing/index.tsx b/x-pack/plugins/observability/public/pages/landing/index.tsx
index 3b00985e1a29a..2deb22010e7f9 100644
--- a/x-pack/plugins/observability/public/pages/landing/index.tsx
+++ b/x-pack/plugins/observability/public/pages/landing/index.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityAppServices } from '../../application/types';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { usePluginContext } from '../../hooks/use_plugin_context';
diff --git a/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx b/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx
index 5078416a7d369..57a6310601190 100644
--- a/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/landing/landing.stories.tsx
@@ -8,10 +8,10 @@
 import { EuiPageTemplate } from '@elastic/eui';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../src/core/public';
-import { createKibanaReactContext } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { PluginContext, PluginContextValue } from '../../context/plugin_context';
-import { LandingPage } from './';
+import { LandingPage } from '.';
 
 export default {
   title: 'app/Landing',
diff --git a/x-pack/plugins/observability/public/pages/overview/empty_section.ts b/x-pack/plugins/observability/public/pages/overview/empty_section.ts
index d2050f159fc25..9e74ec482f50d 100644
--- a/x-pack/plugins/observability/public/pages/overview/empty_section.ts
+++ b/x-pack/plugins/observability/public/pages/overview/empty_section.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ISection } from '../../typings/section';
 
 export const getEmptySections = ({ http }: { http: HttpSetup }): ISection[] => {
diff --git a/x-pack/plugins/observability/public/pages/overview/index.test.tsx b/x-pack/plugins/observability/public/pages/overview/index.test.tsx
index 682f979f44ec5..45206e4440205 100644
--- a/x-pack/plugins/observability/public/pages/overview/index.test.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/index.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import * as PluginContext from '../../hooks/use_plugin_context';
 import { PluginContextValue } from '../../context/plugin_context';
-import { OverviewPage } from './';
+import { OverviewPage } from '.';
 import { OverviewPage as OldOverviewPage } from './old_overview_page';
 import { OverviewPage as NewOverviewPage } from './overview_page';
 
diff --git a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
index f396f594e0779..4afe1fe7dedb1 100644
--- a/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/old_overview_page.tsx
@@ -19,9 +19,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import React, { useMemo, useRef, useCallback, useState } from 'react';
+import React, { useMemo, useRef, useCallback, useState, useEffect } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { observabilityFeatureId } from '../../../common';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useTrackPageview, useUiTracker } from '../..';
 import { EmptySections } from '../../components/app/empty_sections';
 import { ObservabilityHeaderMenu } from '../../components/app/header';
@@ -52,6 +52,9 @@ interface Props {
   routeParams: RouteParams<'/overview'>;
 }
 export type BucketSize = ReturnType<typeof calculateBucketSize>;
+
+const CAPABILITIES_KEYS = ['logs', 'infrastructure', 'apm', 'uptime'];
+
 function calculateBucketSize({ start, end }: { start?: number; end?: number }) {
   if (start && end) {
     return getBucketSize({ start, end, minInterval: '60s' });
@@ -72,9 +75,14 @@ export function OverviewPage({ routeParams }: Props) {
   const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
 
   const indexNames = useAlertIndexNames();
-  const { cases, docLinks, http } = useKibana<ObservabilityAppServices>().services;
-  const { ObservabilityPageTemplate, config } = usePluginContext();
+  const {
+    cases,
+    docLinks,
+    http,
+    application: { capabilities },
+  } = useKibana<ObservabilityAppServices>().services;
 
+  const { ObservabilityPageTemplate, config } = usePluginContext();
   const { relativeStart, relativeEnd, absoluteStart, absoluteEnd } = useDatePickerContext();
 
   const { data: newsFeed } = useFetcher(() => getNewsFeed({ http }), [http]);
@@ -112,6 +120,20 @@ export function OverviewPage({ routeParams }: Props) {
   const CasesContext = cases.ui.getCasesContext();
   const userPermissions = useGetUserCasesPermissions();
 
+  useEffect(() => {
+    if (hasAnyData !== true) {
+      return;
+    }
+
+    CAPABILITIES_KEYS.forEach((feature) => {
+      if (capabilities[feature].show === false) {
+        trackMetric({
+          metric: `oblt_disabled_feature_${feature === 'infrastructure' ? 'metrics' : feature}`,
+        });
+      }
+    });
+  }, [capabilities, hasAnyData, trackMetric]);
+
   if (hasAnyData === undefined) {
     return <LoadingObservability />;
   }
diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
index 956dc76a8e2fe..b975e45ac06df 100644
--- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx
@@ -7,14 +7,15 @@
 
 import { makeDecorator } from '@storybook/addons';
 import { storiesOf } from '@storybook/react';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { createKibanaReactContext, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
 import { HasDataContextProvider } from '../../context/has_data_context';
 import { PluginContext } from '../../context/plugin_context';
 import { registerDataHandler, unregisterDataHandler } from '../../data_handler';
-import { OverviewPage } from './';
+import { OverviewPage } from '.';
 import { alertsFetchData } from './mock/alerts.mock';
 import { emptyResponse as emptyAPMResponse, fetchApmData } from './mock/apm.mock';
 import { emptyResponse as emptyLogsResponse, fetchLogsData } from './mock/logs.mock';
@@ -22,10 +23,6 @@ import { emptyResponse as emptyMetricsResponse, fetchMetricsData } from './mock/
 import { newsFeedFetchData } from './mock/news_feed.mock';
 import { emptyResponse as emptyUptimeResponse, fetchUptimeData } from './mock/uptime.mock';
 import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock';
-import {
-  createKibanaReactContext,
-  KibanaPageTemplate,
-} from '../../../../../../src/plugins/kibana_react/public';
 import { ApmIndicesConfig } from '../../../common/typings';
 
 function unregisterAll() {
diff --git a/x-pack/plugins/observability/public/pages/overview/overview_page.tsx b/x-pack/plugins/observability/public/pages/overview/overview_page.tsx
index 4d5622f99e8a8..7f81f71cf6683 100644
--- a/x-pack/plugins/observability/public/pages/overview/overview_page.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/overview_page.tsx
@@ -7,6 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
 import { EuiButton, EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useTrackPageview } from '../..';
 import { DatePicker } from '../../components/shared/date_picker';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
@@ -17,7 +18,6 @@ import { RouteParams } from '../../routes';
 import { getNoDataConfig } from '../../utils/no_data_config';
 import { LoadingObservability } from './loading_observability';
 import { ObservabilityStatus } from '../../components/app/observability_status';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityAppServices } from '../../application/types';
 
 interface Props {
diff --git a/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx b/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx
index b09d31ba59c78..61eec8b8c3ea8 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/delete_modal_confirmation.tsx
@@ -7,7 +7,7 @@
 
 import { EuiConfirmModal } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useKibana } from '../../../utils/kibana_react';
 import {
   confirmModalText,
diff --git a/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx b/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx
index 6bb1e0865fccc..81dfe9ebd1606 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/execution_status.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiHealth, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { RuleExecutionStatusErrorReasons } from '../../../../../alerting/common';
+import { RuleExecutionStatusErrorReasons } from '@kbn/alerting-plugin/common';
 import { getHealthColor, rulesStatusesTranslationsMapping } from '../config';
 import { RULE_STATUS_LICENSE_ERROR } from '../translations';
 import { ExecutionStatusProps } from '../types';
diff --git a/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx b/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx
index 1ed2b681bfe2c..d7154c47fecf7 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/last_response_filter.tsx
@@ -16,7 +16,7 @@ import {
   EuiFilterSelectItem,
   EuiHealth,
 } from '@elastic/eui';
-import { RuleExecutionStatuses, RuleExecutionStatusValues } from '../../../../../alerting/common';
+import { RuleExecutionStatuses, RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { getHealthColor, rulesStatusesTranslationsMapping } from '../config';
 import { StatusFilterProps } from '../types';
 
diff --git a/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx b/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx
index db1febf8d3edd..2909121aa8cd4 100644
--- a/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/components/rules_table.tsx
@@ -6,8 +6,8 @@
  */
 import React, { useCallback } from 'react';
 import { EuiBasicTable, EuiSpacer, EuiTableSortingType } from '@elastic/eui';
+import { RuleTableItem } from '@kbn/triggers-actions-ui-plugin/public';
 import { RulesTableProps } from '../types';
-import { RuleTableItem } from '../../../../../triggers_actions_ui/public';
 
 export interface Pagination {
   index: number;
diff --git a/x-pack/plugins/observability/public/pages/rules/config.ts b/x-pack/plugins/observability/public/pages/rules/config.ts
index bd4e95638a072..9da846c2c1cc4 100644
--- a/x-pack/plugins/observability/public/pages/rules/config.ts
+++ b/x-pack/plugins/observability/public/pages/rules/config.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { RuleExecutionStatuses } from '@kbn/alerting-plugin/common';
+import { Rule, RuleTypeIndex, RuleType } from '@kbn/triggers-actions-ui-plugin/public';
 import { Status, RuleStatus } from './types';
 import {
   RULE_STATUS_OK,
@@ -17,8 +19,6 @@ import {
   RULE_STATUS_DISABLED,
   RULE_STATUS_SNOOZED_INDEFINITELY,
 } from './translations';
-import { RuleExecutionStatuses } from '../../../../alerting/common';
-import { Rule, RuleTypeIndex, RuleType } from '../../../../triggers_actions_ui/public';
 
 export const statusMap: Status = {
   [RuleStatus.enabled]: {
diff --git a/x-pack/plugins/observability/public/pages/rules/index.tsx b/x-pack/plugins/observability/public/pages/rules/index.tsx
index 02137f13e3ebd..03e8ca86b2fa2 100644
--- a/x-pack/plugins/observability/public/pages/rules/index.tsx
+++ b/x-pack/plugins/observability/public/pages/rules/index.tsx
@@ -22,6 +22,16 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import {
+  deleteRules,
+  RuleTableItem,
+  enableRule,
+  disableRule,
+  muteRule,
+  useLoadRuleTypes,
+  unmuteRule,
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleExecutionStatus, ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { useKibana } from '../../utils/kibana_react';
@@ -38,16 +48,6 @@ import { DeleteModalConfirmation } from './components/delete_modal_confirmation'
 import { NoDataPrompt } from './components/prompts/no_data_prompt';
 import { NoPermissionPrompt } from './components/prompts/no_permission_prompt';
 import { CenterJustifiedSpinner } from './components/center_justified_spinner';
-import {
-  deleteRules,
-  RuleTableItem,
-  enableRule,
-  disableRule,
-  muteRule,
-  useLoadRuleTypes,
-  unmuteRule,
-} from '../../../../triggers_actions_ui/public';
-import { RuleExecutionStatus, ALERTS_FEATURE_ID } from '../../../../alerting/common';
 import { Pagination } from './types';
 import {
   DEFAULT_SEARCH_PAGE_SIZE,
@@ -83,7 +83,7 @@ export function RulesPage() {
     application: { capabilities },
     notifications: { toasts },
   } = useKibana().services;
-  const documentationLink = docLinks.links.alerting.guide;
+  const documentationLink = docLinks.links.observability.createAlerts;
   const ruleTypeRegistry = triggersActionsUi.ruleTypeRegistry;
   const canExecuteActions = hasExecuteActionsCapability(capabilities);
   const [page, setPage] = useState<Pagination>({ index: 0, size: DEFAULT_SEARCH_PAGE_SIZE });
diff --git a/x-pack/plugins/observability/public/pages/rules/types.ts b/x-pack/plugins/observability/public/pages/rules/types.ts
index 1854713e6f913..c3e2d8248e2fe 100644
--- a/x-pack/plugins/observability/public/pages/rules/types.ts
+++ b/x-pack/plugins/observability/public/pages/rules/types.ts
@@ -6,8 +6,8 @@
  */
 import { Dispatch, SetStateAction } from 'react';
 import { EuiTableSortingType, EuiBasicTableColumn } from '@elastic/eui';
-import { RuleExecutionStatus } from '../../../../alerting/common';
-import { RuleTableItem, Rule } from '../../../../triggers_actions_ui/public';
+import { RuleExecutionStatus } from '@kbn/alerting-plugin/common';
+import { RuleTableItem, Rule } from '@kbn/triggers-actions-ui-plugin/public';
 export interface StatusProps {
   type: RuleStatus;
   disabled: boolean;
diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts
index 2fe097cf8eb10..a19c5dfa0c3ce 100644
--- a/x-pack/plugins/observability/public/plugin.ts
+++ b/x-pack/plugins/observability/public/plugin.ts
@@ -8,7 +8,6 @@
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject, from } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ConfigSchema } from '.';
 import {
   AppDeepLink,
   AppMountParameters,
@@ -19,25 +18,21 @@ import {
   DEFAULT_APP_CATEGORIES,
   Plugin as PluginClass,
   PluginInitializerContext,
-} from '../../../../src/core/public';
-import type {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import type { DataViewsPublicPluginStart } from '../../../../src/plugins/data_views/public';
-import type { DiscoverStart } from '../../../../src/plugins/discover/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { FeaturesPluginStart } from '../../features/public';
-import type {
-  HomePublicPluginSetup,
-  HomePublicPluginStart,
-} from '../../../../src/plugins/home/public';
-import { CasesDeepLinkId, CasesUiStart, getCasesDeepLinks } from '../../cases/public';
-import type { LensPublicStart } from '../../lens/public';
+} from '@kbn/core/public';
+import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { CasesDeepLinkId, CasesUiStart, getCasesDeepLinks } from '@kbn/cases-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { ConfigSchema } from '.';
 import { observabilityAppId, observabilityFeatureId, casesPath } from '../common';
 import { createLazyObservabilityPageTemplate } from './components/shared';
 import { registerDataHandler } from './data_handler';
@@ -49,7 +44,6 @@ import { getExploratoryViewEmbeddable } from './components/shared/exploratory_vi
 import { createExploratoryViewUrl } from './components/shared/exploratory_view/configurations/utils';
 import { createUseRulesLink } from './hooks/create_use_rules_link';
 import getAppDataView from './utils/observability_data_views/get_app_data_view';
-import { KibanaFeature } from '../../features/common';
 
 export type ObservabilityPublicSetup = ReturnType<Plugin['setup']>;
 
diff --git a/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts b/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts
index 07d18eb8083d0..5612601ebd803 100644
--- a/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts
+++ b/x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts
@@ -9,8 +9,8 @@ import {
   RuleTypeModel,
   RuleTypeParams,
   RuleTypeRegistryContract,
-} from '../../../triggers_actions_ui/public';
-import { ParsedTechnicalFields } from '../../../rule_registry/common/parse_technical_fields';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { ParsedTechnicalFields } from '@kbn/rule-registry-plugin/common/parse_technical_fields';
 import { AsDuration, AsPercent } from '../../common/utils/formatters';
 
 export type ObservabilityRuleTypeFormatter = (options: {
diff --git a/x-pack/plugins/observability/public/services/call_observability_api/index.ts b/x-pack/plugins/observability/public/services/call_observability_api/index.ts
index 9cb17373bfe48..881ea80a4de47 100644
--- a/x-pack/plugins/observability/public/services/call_observability_api/index.ts
+++ b/x-pack/plugins/observability/public/services/call_observability_api/index.ts
@@ -8,7 +8,7 @@
 // @ts-expect-error
 import { formatRequest } from '@kbn/server-route-repository/target_node/format_request';
 import type { formatRequest as formatRequestType } from '@kbn/server-route-repository/target_types/format_request';
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 import type { AbstractObservabilityClient, ObservabilityClient } from './types';
 
 export let callObservabilityApi: ObservabilityClient = () => {
diff --git a/x-pack/plugins/observability/public/services/call_observability_api/types.ts b/x-pack/plugins/observability/public/services/call_observability_api/types.ts
index f517772821f42..014688826ada7 100644
--- a/x-pack/plugins/observability/public/services/call_observability_api/types.ts
+++ b/x-pack/plugins/observability/public/services/call_observability_api/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { RouteRepositoryClient } from '@kbn/server-route-repository';
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 import type {
   AbstractObservabilityServerRouteRepository,
   ObservabilityServerRouteRepository,
diff --git a/x-pack/plugins/observability/public/services/get_news_feed.test.ts b/x-pack/plugins/observability/public/services/get_news_feed.test.ts
index f7b3b90b09a4b..3a35e87166720 100644
--- a/x-pack/plugins/observability/public/services/get_news_feed.test.ts
+++ b/x-pack/plugins/observability/public/services/get_news_feed.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getNewsFeed } from './get_news_feed';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 describe('getNewsFeed', () => {
   const originalConsole = global.console;
diff --git a/x-pack/plugins/observability/public/services/get_news_feed.ts b/x-pack/plugins/observability/public/services/get_news_feed.ts
index 58a9d0e3048c5..31c7c6cd30ea8 100644
--- a/x-pack/plugins/observability/public/services/get_news_feed.ts
+++ b/x-pack/plugins/observability/public/services/get_news_feed.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 
 export interface NewsItem {
   title: { en: string };
diff --git a/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts b/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts
index 466f802913cb7..f7e550f4a3c5f 100644
--- a/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts
+++ b/x-pack/plugins/observability/public/services/get_observability_alerts.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'kibana/public';
+import type { HttpSetup } from '@kbn/core/public';
 import { getObservabilityAlerts } from './get_observability_alerts';
 
 const basePath = { prepend: (path: string) => path };
diff --git a/x-pack/plugins/observability/public/services/get_observability_alerts.ts b/x-pack/plugins/observability/public/services/get_observability_alerts.ts
index bb9f2080b9dad..57cc6cec10c83 100644
--- a/x-pack/plugins/observability/public/services/get_observability_alerts.ts
+++ b/x-pack/plugins/observability/public/services/get_observability_alerts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'kibana/public';
-import { Rule } from '../../../alerting/common';
+import type { HttpSetup } from '@kbn/core/public';
+import { Rule } from '@kbn/alerting-plugin/common';
 
 const allowedConsumers = ['apm', 'uptime', 'logs', 'infrastructure', 'alerts'];
 
diff --git a/x-pack/plugins/observability/public/services/navigation_registry.test.ts b/x-pack/plugins/observability/public/services/navigation_registry.test.ts
index 8e46ed8aacabe..7b330abc0f95d 100644
--- a/x-pack/plugins/observability/public/services/navigation_registry.test.ts
+++ b/x-pack/plugins/observability/public/services/navigation_registry.test.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { firstValueFrom } from '@kbn/std';
-import { of } from 'rxjs';
+import { of, firstValueFrom } from 'rxjs';
 import { createNavigationRegistry } from './navigation_registry';
 
 describe('Navigation registry', () => {
diff --git a/x-pack/plugins/observability/public/update_global_navigation.test.tsx b/x-pack/plugins/observability/public/update_global_navigation.test.tsx
index f575771e1bafe..abbfc7e0e8ba2 100644
--- a/x-pack/plugins/observability/public/update_global_navigation.test.tsx
+++ b/x-pack/plugins/observability/public/update_global_navigation.test.tsx
@@ -7,13 +7,7 @@
 
 import { Subject } from 'rxjs';
 import { ConfigSchema } from '.';
-import {
-  App,
-  AppDeepLink,
-  ApplicationStart,
-  AppNavLinkStatus,
-  AppUpdater,
-} from '../../../../src/core/public';
+import { App, AppDeepLink, ApplicationStart, AppNavLinkStatus, AppUpdater } from '@kbn/core/public';
 import { casesFeatureId } from '../common';
 import { updateGlobalNavigation } from './update_global_navigation';
 
diff --git a/x-pack/plugins/observability/public/update_global_navigation.tsx b/x-pack/plugins/observability/public/update_global_navigation.tsx
index 3e720ac170e8b..ce4ba47065ea4 100644
--- a/x-pack/plugins/observability/public/update_global_navigation.tsx
+++ b/x-pack/plugins/observability/public/update_global_navigation.tsx
@@ -6,14 +6,9 @@
  */
 
 import { Subject } from 'rxjs';
+import { AppNavLinkStatus, AppUpdater, ApplicationStart, AppDeepLink } from '@kbn/core/public';
+import { CasesDeepLinkId } from '@kbn/cases-plugin/public';
 import { ConfigSchema } from '.';
-import {
-  AppNavLinkStatus,
-  AppUpdater,
-  ApplicationStart,
-  AppDeepLink,
-} from '../../../../src/core/public';
-import { CasesDeepLinkId } from '../../cases/public';
 import { casesFeatureId } from '../common';
 
 export function updateGlobalNavigation({
diff --git a/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts b/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts
index 461afab6233f2..e91b6b44dee7f 100644
--- a/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts
+++ b/x-pack/plugins/observability/public/utils/get_bucket_size/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getBucketSize } from './index';
+import { getBucketSize } from '.';
 import moment from 'moment';
 
 describe('getBuckets', () => {
diff --git a/x-pack/plugins/observability/public/utils/kibana_react.mock.ts b/x-pack/plugins/observability/public/utils/kibana_react.mock.ts
index 5cb00169abfb9..54de7f25f12d7 100644
--- a/x-pack/plugins/observability/public/utils/kibana_react.mock.ts
+++ b/x-pack/plugins/observability/public/utils/kibana_react.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, notificationServiceMock, overlayServiceMock } from 'src/core/public/mocks';
+import { coreMock, notificationServiceMock, overlayServiceMock } from '@kbn/core/public/mocks';
 import { observabilityPublicPluginsStartMock } from '../observability_public_plugins_start.mock';
 
 export const kibanaStartMock = {
diff --git a/x-pack/plugins/observability/public/utils/kibana_react.ts b/x-pack/plugins/observability/public/utils/kibana_react.ts
index 532003e30a160..baf0f7d674015 100644
--- a/x-pack/plugins/observability/public/utils/kibana_react.ts
+++ b/x-pack/plugins/observability/public/utils/kibana_react.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { ObservabilityPublicPluginsStart } from '../plugin';
 
 export type StartServices = CoreStart &
diff --git a/x-pack/plugins/observability/public/utils/no_data_config.ts b/x-pack/plugins/observability/public/utils/no_data_config.ts
index fdd70401e7097..dd22a0055ee6c 100644
--- a/x-pack/plugins/observability/public/utils/no_data_config.ts
+++ b/x-pack/plugins/observability/public/utils/no_data_config.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IBasePath } from '../../../../../src/core/public';
-import { KibanaPageTemplateProps } from '../../../../../src/plugins/kibana_react/public';
+import { IBasePath } from '@kbn/core/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 
 export function getNoDataConfig({
   docsLink,
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts b/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts
index 4b4b03412c0c7..4b3af576f6d0d 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/get_app_data_view.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { AppDataType } from '../../components/shared/exploratory_view/types';
-import type { DataViewsPublicPluginStart } from '../../../../../../src/plugins/data_views/public';
 
 const getAppDataView = (data: DataViewsPublicPluginStart) => {
   return async (appId: AppDataType, indexPattern?: string) => {
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
index eb7df98da599b..e1d930d539842 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.test.ts
@@ -7,7 +7,7 @@
 
 import { dataViewList, ObservabilityDataViews } from './observability_data_views';
 import { mockCore, mockDataView } from '../../components/shared/exploratory_view/rtl_helpers';
-import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/public';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 
 const fieldFormats = {
   'transaction.duration.us': {
diff --git a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
index 4d4a4fc2cc353..bc88769db43bf 100644
--- a/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
+++ b/x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { FieldFormat as IFieldFormat } from 'src/plugins/field_formats/common';
-import { SavedObjectNotFound } from '../../../../../../src/plugins/kibana_utils/public';
+import type { FieldFormat as IFieldFormat } from '@kbn/field-formats-plugin/common';
+import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/public';
 import type {
   DataViewsPublicPluginStart,
   DataView,
   DataViewSpec,
-} from '../../../../../../src/plugins/data_views/public';
+} from '@kbn/data-views-plugin/public';
 import { rumFieldFormats } from '../../components/shared/exploratory_view/configurations/rum/field_formats';
 import { syntheticsFieldFormats } from '../../components/shared/exploratory_view/configurations/synthetics/field_formats';
 import {
diff --git a/x-pack/plugins/observability/public/utils/test_helper.tsx b/x-pack/plugins/observability/public/utils/test_helper.tsx
index b8d16f481c499..d5607b5ee8b48 100644
--- a/x-pack/plugins/observability/public/utils/test_helper.tsx
+++ b/x-pack/plugins/observability/public/utils/test_helper.tsx
@@ -6,18 +6,15 @@
  */
 
 import { render as testLibRender } from '@testing-library/react';
-import { AppMountParameters } from 'kibana/public';
-import { coreMock } from 'src/core/public/mocks';
+import { AppMountParameters } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import React from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import {
-  KibanaContextProvider,
-  KibanaPageTemplate,
-} from '../../../../../src/plugins/kibana_react/public';
-import translations from '../../../translations/translations/ja-JP.json';
+import { KibanaContextProvider, KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import translations from '@kbn/translations-plugin/translations/ja-JP.json';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { PluginContext } from '../context/plugin_context';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
 import { createObservabilityRuleTypeRegistryMock } from '../rules/observability_rule_type_registry_mock';
 
 const appMountParameters = { setHeaderActionMenu: () => {} } as unknown as AppMountParameters;
diff --git a/x-pack/plugins/observability/public/utils/url.ts b/x-pack/plugins/observability/public/utils/url.ts
index c6507ab762244..5dda5ce95c6e5 100644
--- a/x-pack/plugins/observability/public/utils/url.ts
+++ b/x-pack/plugins/observability/public/utils/url.ts
@@ -6,7 +6,7 @@
  */
 
 import { parse, stringify } from 'query-string';
-import { url } from '../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 export function toQuery(search?: string) {
   return search ? parse(search.slice(1), { sort: false }) : {};
diff --git a/x-pack/plugins/observability/server/index.ts b/x-pack/plugins/observability/server/index.ts
index a26bafbf89acc..39537a67a8cbf 100644
--- a/x-pack/plugins/observability/server/index.ts
+++ b/x-pack/plugins/observability/server/index.ts
@@ -9,7 +9,7 @@
 /* eslint-disable @kbn/eslint/no_export_all */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { ObservabilityPlugin, ObservabilityPluginSetup } from './plugin';
 import { createOrUpdateIndex, Mappings } from './utils/create_or_update_index';
 import { ScopedAnnotationsClient } from './lib/annotations/bootstrap_annotations';
diff --git a/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts b/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
index 83f324c05e45e..45fe9fd4b920c 100644
--- a/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/bootstrap_annotations.ts
@@ -10,8 +10,8 @@ import {
   PluginInitializerContext,
   KibanaRequest,
   RequestHandlerContext,
-} from 'kibana/server';
-import { LicensingApiRequestHandlerContext } from '../../../../licensing/server';
+} from '@kbn/core/server';
+import { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 import { createAnnotationsClient } from './create_annotations_client';
 import { registerAnnotationAPIs } from './register_annotation_apis';
 
diff --git a/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts b/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
index 3fa81e77165d4..fc74ffa880fc2 100644
--- a/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/create_annotations_client.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import * as t from 'io-ts';
 import Boom from '@hapi/boom';
-import { ILicense } from '../../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import {
   createAnnotationRt,
   deleteAnnotationRt,
diff --git a/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts b/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
index 797516830e4b1..216c83feb53df 100644
--- a/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/register_annotation_apis.ts
@@ -7,7 +7,7 @@
 
 import * as t from 'io-ts';
 import { schema } from '@kbn/config-schema';
-import { CoreSetup, RequestHandler, Logger } from 'kibana/server';
+import { CoreSetup, RequestHandler, Logger } from '@kbn/core/server';
 import { PathReporter } from 'io-ts/lib/PathReporter';
 import { isLeft } from 'fp-ts/lib/Either';
 import {
diff --git a/x-pack/plugins/observability/server/plugin.ts b/x-pack/plugins/observability/server/plugin.ts
index cb4f85a44d12c..3dd5ca74a16d1 100644
--- a/x-pack/plugins/observability/server/plugin.ts
+++ b/x-pack/plugins/observability/server/plugin.ts
@@ -11,15 +11,15 @@ import {
   Plugin,
   CoreSetup,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
+import { PluginSetupContract as FeaturesSetup } from '@kbn/features-plugin/server';
 import { ObservabilityConfig } from '.';
 import {
   bootstrapAnnotations,
   ScopedAnnotationsClientFactory,
   AnnotationsAPI,
 } from './lib/annotations/bootstrap_annotations';
-import { RuleRegistryPluginSetupContract } from '../../rule_registry/server';
-import { PluginSetupContract as FeaturesSetup } from '../../features/server';
 import { uiSettings } from './ui_settings';
 import { registerRoutes } from './routes/register_routes';
 import { getGlobalObservabilityServerRouteRepository } from './routes/get_global_observability_server_route_repository';
diff --git a/x-pack/plugins/observability/server/routes/register_routes.ts b/x-pack/plugins/observability/server/routes/register_routes.ts
index 15651e9e73986..a352fb0024d3a 100644
--- a/x-pack/plugins/observability/server/routes/register_routes.ts
+++ b/x-pack/plugins/observability/server/routes/register_routes.ts
@@ -10,10 +10,10 @@ import {
   parseEndpoint,
   routeValidationObject,
 } from '@kbn/server-route-repository';
-import { CoreSetup, CoreStart, Logger, RouteRegistrar } from 'kibana/server';
+import { CoreSetup, CoreStart, Logger, RouteRegistrar } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
-import { RuleDataPluginService } from '../../../rule_registry/server';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import { ObservabilityRequestHandlerContext } from '../types';
 import { AbstractObservabilityServerRouteRepository } from './types';
 
diff --git a/x-pack/plugins/observability/server/routes/rules.ts b/x-pack/plugins/observability/server/routes/rules.ts
index 845ac00a70eec..b6163347d47c6 100644
--- a/x-pack/plugins/observability/server/routes/rules.ts
+++ b/x-pack/plugins/observability/server/routes/rules.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { Dataset } from '../../../rule_registry/server';
+import { Dataset } from '@kbn/rule-registry-plugin/server';
 import { createObservabilityServerRoute } from './create_observability_server_route';
 
 const alertsDynamicIndexPatternRoute = createObservabilityServerRoute({
diff --git a/x-pack/plugins/observability/server/routes/types.ts b/x-pack/plugins/observability/server/routes/types.ts
index adb29bcd4f8cb..768b94b0b7335 100644
--- a/x-pack/plugins/observability/server/routes/types.ts
+++ b/x-pack/plugins/observability/server/routes/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import type { EndpointOf, ReturnOf, ServerRouteRepository } from '@kbn/server-route-repository';
-import { CoreSetup, CoreStart, KibanaRequest, Logger } from 'kibana/server';
-import { RuleDataPluginService } from '../../../rule_registry/server';
+import { CoreSetup, CoreStart, KibanaRequest, Logger } from '@kbn/core/server';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 
 import { ObservabilityServerRouteRepository } from './get_global_observability_server_route_repository';
 import { ObservabilityRequestHandlerContext } from '../types';
diff --git a/x-pack/plugins/observability/server/types.ts b/x-pack/plugins/observability/server/types.ts
index da13e60804a60..0a3e2054f9213 100644
--- a/x-pack/plugins/observability/server/types.ts
+++ b/x-pack/plugins/observability/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export type {
   ObservabilityRouteCreateOptions,
diff --git a/x-pack/plugins/observability/server/ui_settings.ts b/x-pack/plugins/observability/server/ui_settings.ts
index 60dcc1384aa22..1fec1883cd6f4 100644
--- a/x-pack/plugins/observability/server/ui_settings.ts
+++ b/x-pack/plugins/observability/server/ui_settings.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { UiSettingsParams } from '../../../../src/core/types';
+import { UiSettingsParams } from '@kbn/core/types';
 import { observabilityFeatureId } from '../common';
 import {
   enableComparisonByDefault,
diff --git a/x-pack/plugins/observability/server/utils/create_or_update_index.ts b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
index af7dc670b0be8..eaea86c18b19f 100644
--- a/x-pack/plugins/observability/server/utils/create_or_update_index.ts
+++ b/x-pack/plugins/observability/server/utils/create_or_update_index.ts
@@ -6,7 +6,7 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import pRetry from 'p-retry';
-import { Logger, ElasticsearchClient } from 'src/core/server';
+import { Logger, ElasticsearchClient } from '@kbn/core/server';
 
 export type Mappings = Required<estypes.IndicesCreateRequest>['body']['mappings'] &
   Required<estypes.IndicesPutMappingRequest>['body'];
diff --git a/x-pack/plugins/observability/typings/common.ts b/x-pack/plugins/observability/typings/common.ts
index 0afcb3a2eeef4..1904728896d82 100644
--- a/x-pack/plugins/observability/typings/common.ts
+++ b/x-pack/plugins/observability/typings/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Request } from '../../../../src/plugins/inspector';
+import { Request } from '@kbn/inspector-plugin';
 
 export type ObservabilityApp =
   | 'infra_metrics'
@@ -19,6 +19,6 @@ export type ObservabilityApp =
   | 'ux'
   | 'fleet';
 
-export type { Coordinates } from '../public/typings/fetch_overview_data/';
+export type { Coordinates } from '../public/typings/fetch_overview_data';
 
 export type InspectResponse = Request[];
diff --git a/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts b/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts
index 184e6b4f32566..af8c3ded4a1d1 100644
--- a/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts
+++ b/x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts
@@ -11,5 +11,6 @@ export const extendMap = (
 ): Readonly<Record<string, string>> =>
   Object.entries(map).reduce<Record<string, string>>((accum, [key, value]) => {
     accum[`${path}.${key}`] = `${path}.${value}`;
+
     return accum;
   }, {});
diff --git a/x-pack/plugins/osquery/common/search_strategy/common/index.ts b/x-pack/plugins/osquery/common/search_strategy/common/index.ts
index 05c47605b4951..0fbb0cf22ecf3 100644
--- a/x-pack/plugins/osquery/common/search_strategy/common/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/common/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 export type Maybe<T> = T | null;
 
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts
index 22edbf25cc412..3e7c574dae963 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/actions/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated } from '../../common';
 import { RequestOptions, RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts
index 57c7a42f2a481..3e7422adc91a2 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/agents/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated } from '../../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
index d0d67c8546b61..9367449a1c5bb 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   ActionsStrategyResponse,
diff --git a/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts b/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts
index f08d9f88e705d..d60b972ea6441 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/results/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated, SortField } from '../../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/osquery/common/shared_imports.ts b/x-pack/plugins/osquery/common/shared_imports.ts
index 298cf92c4eeb2..2123d29301754 100644
--- a/x-pack/plugins/osquery/common/shared_imports.ts
+++ b/x-pack/plugins/osquery/common/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export type { Agent } from '../../fleet/common';
+export type { Agent } from '@kbn/fleet-plugin/common';
diff --git a/x-pack/plugins/osquery/common/types.ts b/x-pack/plugins/osquery/common/types.ts
index 2d3fc6e972c7c..6704761fe558f 100644
--- a/x-pack/plugins/osquery/common/types.ts
+++ b/x-pack/plugins/osquery/common/types.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { PackagePolicy, PackagePolicyInput, PackagePolicyInputStream } from '../../fleet/common';
+import {
+  PackagePolicy,
+  PackagePolicyInput,
+  PackagePolicyInputStream,
+} from '@kbn/fleet-plugin/common';
 
 export const savedQuerySavedObjectType = 'osquery-saved-query';
 export const packSavedObjectType = 'osquery-pack';
diff --git a/x-pack/plugins/osquery/common/utils/build_query/filters.ts b/x-pack/plugins/osquery/common/utils/build_query/filters.ts
index a1d1590bae1ce..d37fb0cf39fd4 100644
--- a/x-pack/plugins/osquery/common/utils/build_query/filters.ts
+++ b/x-pack/plugins/osquery/common/utils/build_query/filters.ts
@@ -7,7 +7,7 @@
 
 import { isEmpty, isString } from 'lodash/fp';
 
-import { ESQuery } from '../../../common/typed_json';
+import { ESQuery } from '../../typed_json';
 
 export const createQueryFilterClauses = (filterQuery: ESQuery | string | undefined) =>
   !isEmpty(filterQuery) ? [isString(filterQuery) ? JSON.parse(filterQuery) : filterQuery] : [];
diff --git a/x-pack/plugins/osquery/cypress/plugins/index.ts b/x-pack/plugins/osquery/cypress/plugins/index.ts
index 5c0aa5e4c4cfd..7e135eb15c56e 100644
--- a/x-pack/plugins/osquery/cypress/plugins/index.ts
+++ b/x-pack/plugins/osquery/cypress/plugins/index.ts
@@ -25,6 +25,7 @@
 module.exports = (on: any, config: any) => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-extraneous-dependencies
   require('@cypress/code-coverage/task')(on, config);
+
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
   return config;
diff --git a/x-pack/plugins/osquery/cypress/tasks/login.ts b/x-pack/plugins/osquery/cypress/tasks/login.ts
index 9dbdc40a35605..77d53ab470830 100644
--- a/x-pack/plugins/osquery/cypress/tasks/login.ts
+++ b/x-pack/plugins/osquery/cypress/tasks/login.ts
@@ -64,6 +64,7 @@ export const getUrlWithRoute = (role: ROLES, route: string) => {
     port: kibana.port,
   } as UrlObject)}${route.startsWith('/') ? '' : '/'}${route}`;
   cy.log(`origin: ${theUrl}`);
+
   return theUrl;
 };
 
@@ -92,6 +93,7 @@ export const constructUrlWithUser = (user: User, route: string) => {
   const builtUrl = new URL(strUrl);
 
   cy.log(`origin: ${builtUrl.href}`);
+
   return builtUrl.href;
 };
 
diff --git a/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx b/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx
index def52bf511215..9a826457cf8cd 100644
--- a/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx
+++ b/x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx
@@ -27,15 +27,18 @@ export const AgentStatusBar: React.FC<{
 }> = ({ agentStatus }) => {
   const palette = useMemo(() => {
     let stop = 0;
+
     return AGENT_STATUSES.reduce((acc, status) => {
       stop += agentStatus[status] || 0;
       acc.push({
         stop,
         color: getColorForAgentStatus(status),
       });
+
       return acc;
     }, [] as Array<{ stop: number; color: string }>);
   }, [agentStatus]);
+
   return (
     <StyledEuiColorPaletteDisplay
       className="osquery-action-agent-status-bar"
diff --git a/x-pack/plugins/osquery/public/action_results/use_action_results.ts b/x-pack/plugins/osquery/public/action_results/use_action_results.ts
index 0d3396d7331a1..e567c7ccdb635 100644
--- a/x-pack/plugins/osquery/public/action_results/use_action_results.ts
+++ b/x-pack/plugins/osquery/public/action_results/use_action_results.ts
@@ -9,6 +9,7 @@ import { flatten, reverse, uniqBy } from 'lodash/fp';
 import { useQuery } from 'react-query';
 
 import { i18n } from '@kbn/i18n';
+import { firstValueFrom } from 'rxjs';
 import {
   createFilter,
   getInspectResponse,
@@ -67,8 +68,8 @@ export const useActionResults = ({
   return useQuery(
     ['actionResults', { actionId }],
     async () => {
-      const responseData = await data.search
-        .search<ActionResultsRequestOptions, ActionResultsStrategyResponse>(
+      const responseData = await firstValueFrom(
+        data.search.search<ActionResultsRequestOptions, ActionResultsStrategyResponse>(
           {
             actionId,
             factoryQueryType: OsqueryQueries.actionResults,
@@ -83,7 +84,7 @@ export const useActionResults = ({
             strategy: 'osquerySearchStrategy',
           }
         )
-        .toPromise();
+      );
 
       const totalResponded =
         // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/actions/use_action_details.ts b/x-pack/plugins/osquery/public/actions/use_action_details.ts
index 61ba6a3340bdb..1a6550d8f47dd 100644
--- a/x-pack/plugins/osquery/public/actions/use_action_details.ts
+++ b/x-pack/plugins/osquery/public/actions/use_action_details.ts
@@ -8,6 +8,7 @@
 import { useQuery } from 'react-query';
 
 import { i18n } from '@kbn/i18n';
+import { firstValueFrom } from 'rxjs';
 import { createFilter } from '../common/helpers';
 import { useKibana } from '../common/lib/kibana';
 import {
@@ -36,8 +37,8 @@ export const useActionDetails = ({ actionId, filterQuery, skip = false }: UseAct
   return useQuery(
     ['actionDetails', { actionId, filterQuery }],
     async () => {
-      const responseData = await data.search
-        .search<ActionDetailsRequestOptions, ActionDetailsStrategyResponse>(
+      const responseData = await firstValueFrom(
+        data.search.search<ActionDetailsRequestOptions, ActionDetailsStrategyResponse>(
           {
             actionId,
             factoryQueryType: OsqueryQueries.actionDetails,
@@ -47,7 +48,7 @@ export const useActionDetails = ({ actionId, filterQuery, skip = false }: UseAct
             strategy: 'osquerySearchStrategy',
           }
         )
-        .toPromise();
+      );
 
       if (!responseData.actionDetails) throw new Error();
 
diff --git a/x-pack/plugins/osquery/public/actions/use_all_actions.ts b/x-pack/plugins/osquery/public/actions/use_all_actions.ts
index 4951b3c9d8fd1..d1fe00c81a0b5 100644
--- a/x-pack/plugins/osquery/public/actions/use_all_actions.ts
+++ b/x-pack/plugins/osquery/public/actions/use_all_actions.ts
@@ -8,6 +8,7 @@
 import { useQuery } from 'react-query';
 
 import { i18n } from '@kbn/i18n';
+import { firstValueFrom } from 'rxjs';
 import {
   createFilter,
   generateTablePaginationOptions,
@@ -59,8 +60,8 @@ export const useAllActions = ({
   return useQuery(
     ['actions', { activePage, direction, limit, sortField }],
     async () => {
-      const responseData = await data.search
-        .search<ActionsRequestOptions, ActionsStrategyResponse>(
+      const responseData = await firstValueFrom(
+        data.search.search<ActionsRequestOptions, ActionsStrategyResponse>(
           {
             factoryQueryType: OsqueryQueries.actions,
             filterQuery: createFilter(filterQuery),
@@ -74,7 +75,7 @@ export const useAllActions = ({
             strategy: 'osquerySearchStrategy',
           }
         )
-        .toPromise();
+      );
 
       return {
         ...responseData,
diff --git a/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx b/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx
index fe84b856e4977..2899b38aa26b7 100644
--- a/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx
+++ b/x-pack/plugins/osquery/public/agent_policies/agents_policy_link.tsx
@@ -9,8 +9,8 @@ import { EuiLink } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useKibana, isModifiedEvent, isLeftClickEvent } from '../common/lib/kibana';
 import { useAgentPolicy } from './use_agent_policy';
 
diff --git a/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts b/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
index ea5e5a768f0af..d405593910763 100644
--- a/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
+++ b/x-pack/plugins/osquery/public/agent_policies/use_agent_policies.ts
@@ -9,8 +9,8 @@ import { mapKeys } from 'lodash';
 import { useQuery } from 'react-query';
 
 import { i18n } from '@kbn/i18n';
+import { GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
-import { GetAgentPoliciesResponseItem } from '../../../fleet/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useAgentPolicies = () => {
diff --git a/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts b/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts
index 13c073c3bf8be..423b608f6092a 100644
--- a/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts
+++ b/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts
@@ -40,6 +40,7 @@ export function genAgent(policyId: string, hostname: string, id: string): Groupe
     },
   };
 }
+
 export const groupData: GroupData = {
   [AGENT_GROUP_KEY.Platform]: new Array(3).fill('test platform ').map((el, i) => genGroup(el + i)),
   [AGENT_GROUP_KEY.Policy]: new Array(3).fill('test policy ').map((el, i) => genGroup(el + i)),
@@ -109,6 +110,7 @@ describe('AgentGrouper', () => {
         });
       };
     }
+
     it('should generate policy options', genGroupTest(AGENT_GROUP_KEY.Policy, 'policy'));
     it('should generate platform options', genGroupTest(AGENT_GROUP_KEY.Platform, 'platform'));
   });
diff --git a/x-pack/plugins/osquery/public/agents/agent_grouper.ts b/x-pack/plugins/osquery/public/agents/agent_grouper.ts
index 8d234ec8cf905..f0bf423672269 100644
--- a/x-pack/plugins/osquery/public/agents/agent_grouper.ts
+++ b/x-pack/plugins/osquery/public/agents/agent_grouper.ts
@@ -78,12 +78,14 @@ export class AgentGrouper {
     if (!data?.length || key === AGENT_GROUP_KEY.All) {
       return;
     }
+
     const group = this.groups[key];
     if (append) {
       group.data.push(...data);
     } else {
       group.data = data;
     }
+
     group.size = data.length;
   }
 
@@ -91,6 +93,7 @@ export class AgentGrouper {
     if (total < 0) {
       return;
     }
+
     this.groups[AGENT_GROUP_KEY.All].size = total;
   }
 
@@ -124,6 +127,7 @@ export class AgentGrouper {
           break;
       }
     }
+
     return opts;
   }
 }
diff --git a/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx b/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx
index f45affa803673..fa8bfa6e6dca9 100644
--- a/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx
+++ b/x-pack/plugins/osquery/public/agents/agent_id_to_name.tsx
@@ -8,9 +8,9 @@
 import { EuiLink, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useAgentDetails } from './use_agent_details';
-import { PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
 import { useKibana } from '../common/lib/kibana';
 
 interface AgentIdToNameProps {
diff --git a/x-pack/plugins/osquery/public/agents/agents_table.tsx b/x-pack/plugins/osquery/public/agents/agents_table.tsx
index fac74086670c2..55e63456fe916 100644
--- a/x-pack/plugins/osquery/public/agents/agents_table.tsx
+++ b/x-pack/plugins/osquery/public/agents/agents_table.tsx
@@ -108,6 +108,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
             getNumOverlapped(selectedGroups, groups.overlap)
         );
       }
+
       onChange(newAgentSelection);
       setSelectedOptions(selection);
     },
@@ -131,6 +132,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
         }
       }
     };
+
     if (agentSelection && !defaultValueInitialized.current && options.length) {
       if (agentSelection.allAgentsSelected) {
         const allAgentsOptions = find(['label', ALL_AGENTS_LABEL], options);
@@ -175,6 +177,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
 
   const renderOption = useCallback((option, searchVal, contentClassName) => {
     const { label, value } = option;
+
     return value?.groupType === AGENT_GROUP_KEY.Agent ? (
       <EuiHealth color={value?.status === 'online' ? 'success' : 'danger'}>
         <span className={contentClassName}>
diff --git a/x-pack/plugins/osquery/public/agents/helpers.ts b/x-pack/plugins/osquery/public/agents/helpers.ts
index 71a67ef1f623a..1c23eac3ca201 100644
--- a/x-pack/plugins/osquery/public/agents/helpers.ts
+++ b/x-pack/plugins/osquery/public/agents/helpers.ts
@@ -30,8 +30,10 @@ export const getNumOverlapped = (
       sum += policies[pol] ?? 0;
     });
   });
+
   return sum;
 };
+
 interface Aggs extends estypes.AggregationsTermsAggregateBase {
   buckets: AggregationDataPoint[];
 }
@@ -51,6 +53,7 @@ export const processAggregations = (aggs: Record<string, estypes.AggregationsAgg
       if (platformPolicies?.buckets && policies.length > 0) {
         overlap[key] = platformPolicies.buckets.reduce((acc: { [key: string]: number }, pol) => {
           acc[pol.key] = pol.doc_count;
+
           return acc;
         }, {} as { [key: string]: number });
       }
@@ -63,13 +66,16 @@ export const processAggregations = (aggs: Record<string, estypes.AggregationsAgg
     policies,
   };
 };
+
 export const generateColorPicker = () => {
   const visColorsBehindText = euiPaletteColorBlindBehindText();
   const typeColors = new Map<AGENT_GROUP_KEY, string>();
+
   return (type: AGENT_GROUP_KEY) => {
     if (!typeColors.has(type)) {
       typeColors.set(type, visColorsBehindText[typeColors.size]);
     }
+
     return typeColors.get(type);
   };
 };
@@ -80,6 +86,7 @@ export const getNumAgentsInGrouping = (selectedGroups: SelectedGroups) => {
     const group = selectedGroups[g];
     sum += Object.keys(group).reduce((acc, k) => acc + group[k], 0);
   });
+
   return sum;
 };
 
@@ -90,6 +97,7 @@ export const generateAgentCheck =
       .map((group) => {
         const selectedGroup = selectedGroups[group];
         const agentGroup = groups[group];
+
         // check if the agent platform/policy is selected
         return selectedGroup[agentGroup];
       })
@@ -124,6 +132,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to calculate diffs when all agents are selected
           selectedGroups.platform[key] = value.size;
         }
+
         newAgentSelection.platformsSelected.push(key);
         break;
       case AGENT_GROUP_KEY.Policy:
@@ -132,6 +141,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to calculate diffs when all agents are selected
           selectedGroups.policy[key] = value.size;
         }
+
         newAgentSelection.policiesSelected.push(key);
         break;
       case AGENT_GROUP_KEY.Agent:
@@ -140,6 +150,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to count how many agents are selected if they are all selected
           selectedAgents.push(value);
         }
+
         newAgentSelection.agents.push(key);
         break;
       default:
@@ -148,5 +159,6 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
         console.error(`unknown group type ${groupType}`);
     }
   }
+
   return { newAgentSelection, selectedGroups, selectedAgents };
 };
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_details.ts b/x-pack/plugins/osquery/public/agents/use_agent_details.ts
index e639701b5dd2f..b343d75262905 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_details.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_details.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { GetOneAgentResponse } from '../../../fleet/common';
+import { GetOneAgentResponse } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
@@ -21,6 +21,7 @@ interface UseAgentDetails {
 export const useAgentDetails = ({ agentId, silent, skip }: UseAgentDetails) => {
   const { http } = useKibana().services;
   const setErrorToast = useErrorToast();
+
   return useQuery<GetOneAgentResponse, unknown, GetOneAgentResponse['item']>(
     ['agentDetails', agentId],
     () => http.get(`/internal/osquery/fleet_wrapper/agents/${agentId}`),
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_groups.ts b/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
index 6821217c30cbf..2dba1c471a786 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_groups.ts
@@ -7,6 +7,7 @@
 import { useState } from 'react';
 import { useQuery } from 'react-query';
 import { i18n } from '@kbn/i18n';
+import { firstValueFrom } from 'rxjs';
 import { useKibana } from '../common/lib/kibana';
 import { useAgentPolicies } from './use_agent_policies';
 
@@ -39,8 +40,8 @@ export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseA
   const { isFetched } = useQuery(
     ['agentGroups'],
     async () => {
-      const responseData = await data.search
-        .search<AgentsRequestOptions, AgentsStrategyResponse>(
+      const responseData = await firstValueFrom(
+        data.search.search<AgentsRequestOptions, AgentsStrategyResponse>(
           {
             filterQuery: { terms: { policy_id: osqueryPolicies } },
             factoryQueryType: OsqueryQueries.agents,
@@ -73,7 +74,7 @@ export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseA
             strategy: 'osquerySearchStrategy',
           }
         )
-        .toPromise();
+      );
 
       if (responseData.rawResponse.aggregations) {
         const {
@@ -87,6 +88,7 @@ export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseA
         setPolicies(
           newPolicies.map((p) => {
             const name = agentPolicyById[p.id]?.name ?? p.name;
+
             return {
               ...p,
               name,
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_policies.ts b/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
index cdccd3aa21af8..0d96c88771858 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_policies.ts
@@ -8,8 +8,8 @@
 import { mapKeys } from 'lodash';
 import { useQueries, UseQueryResult } from 'react-query';
 import { i18n } from '@kbn/i18n';
+import { GetOneAgentPolicyResponse } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
-import { GetOneAgentPolicyResponse } from '../../../fleet/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 
 export const useAgentPolicies = (policyIds: string[] = []) => {
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts b/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts
index 77ca08e284182..1359ec6706ea5 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_policy_agent_ids.ts
@@ -9,7 +9,7 @@ import { map } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { AGENTS_PREFIX, Agent } from '../../../fleet/common';
+import { AGENTS_PREFIX, Agent } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
diff --git a/x-pack/plugins/osquery/public/agents/use_agent_status.ts b/x-pack/plugins/osquery/public/agents/use_agent_status.ts
index a94bb5631343d..8da32307f9188 100644
--- a/x-pack/plugins/osquery/public/agents/use_agent_status.ts
+++ b/x-pack/plugins/osquery/public/agents/use_agent_status.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { GetAgentStatusResponse } from '../../../fleet/common';
+import { GetAgentStatusResponse } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
diff --git a/x-pack/plugins/osquery/public/agents/use_all_agents.ts b/x-pack/plugins/osquery/public/agents/use_all_agents.ts
index 03660a970aeef..9ffcaae16bc6d 100644
--- a/x-pack/plugins/osquery/public/agents/use_all_agents.ts
+++ b/x-pack/plugins/osquery/public/agents/use_all_agents.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useQuery } from 'react-query';
 
-import { GetAgentsResponse } from '../../../fleet/common';
+import { GetAgentsResponse } from '@kbn/fleet-plugin/common';
 import { useErrorToast } from '../common/hooks/use_error_toast';
 import { useKibana } from '../common/lib/kibana';
 
diff --git a/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts b/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
index 759e9f22c71b8..679aeef1bd23b 100644
--- a/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
+++ b/x-pack/plugins/osquery/public/agents/use_osquery_policies.ts
@@ -33,6 +33,7 @@ export const useOsqueryPolicies = () => {
         }),
     }
   );
+
   return useMemo(
     () => ({ osqueryPoliciesLoading, osqueryPolicies }),
     [osqueryPoliciesLoading, osqueryPolicies]
diff --git a/x-pack/plugins/osquery/public/application.tsx b/x-pack/plugins/osquery/public/application.tsx
index 754d924529b19..4cc7afc54203f 100644
--- a/x-pack/plugins/osquery/public/application.tsx
+++ b/x-pack/plugins/osquery/public/application.tsx
@@ -15,9 +15,9 @@ import { ThemeProvider } from 'styled-components';
 import { QueryClientProvider } from 'react-query';
 import { ReactQueryDevtools } from 'react-query/devtools';
 
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { useUiSetting$, KibanaThemeProvider } from './shared_imports';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { AppMountParameters, CoreStart } from '../../../../src/core/public';
 import { AppPluginStartDependencies } from './types';
 import { OsqueryApp } from './components/app';
 import { DEFAULT_DARK_MODE, PLUGIN_NAME } from '../common';
diff --git a/x-pack/plugins/osquery/public/assets/use_assets_status.ts b/x-pack/plugins/osquery/public/assets/use_assets_status.ts
index 41307952b222c..fd6a2fecb2793 100644
--- a/x-pack/plugins/osquery/public/assets/use_assets_status.ts
+++ b/x-pack/plugins/osquery/public/assets/use_assets_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { useQuery } from 'react-query';
 import { useKibana } from '../common/lib/kibana';
 import { INTEGRATION_ASSETS_STATUS_ID } from './constants';
diff --git a/x-pack/plugins/osquery/public/common/helpers.ts b/x-pack/plugins/osquery/public/common/helpers.ts
index 4f9efbe839ffd..5f83330fe9ee1 100644
--- a/x-pack/plugins/osquery/public/common/helpers.ts
+++ b/x-pack/plugins/osquery/public/common/helpers.ts
@@ -26,6 +26,7 @@ export const generateTablePaginationOptions = (
   limit: number
 ): PaginationInputPaginated => {
   const cursorStart = activePage * limit;
+
   return {
     activePage,
     cursorStart,
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx b/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx
index 6bef0ee38c24e..5891fd4ae9d78 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { ChromeBreadcrumb } from 'src/core/public';
+import type { ChromeBreadcrumb } from '@kbn/core/public';
 
 import { BASE_PATH } from '../../../common/constants';
 import type { Page, DynamicPagePathValues } from '../page_paths';
@@ -163,6 +163,7 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
       const href = breadcrumb.href
         ? http.basePath.prepend(`${BASE_PATH}${breadcrumb.href}`)
         : undefined;
+
       return {
         ...breadcrumb,
         href,
@@ -171,6 +172,7 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
               if (ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
                 return;
               }
+
               ev.preventDefault();
               application.navigateToUrl(href);
             }
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx b/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx
index d930d867c7a8b..ca294c044d05b 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx
@@ -7,7 +7,7 @@
 
 import { useCallback, useEffect, useState } from 'react';
 
-import { FilterStateStore } from '../../../../../../src/plugins/data/common';
+import { FilterStateStore } from '@kbn/data-plugin/common';
 import { useKibana, isModifiedEvent, isLeftClickEvent } from '../lib/kibana';
 
 interface UseDiscoverLink {
@@ -43,6 +43,7 @@ export const useDiscoverLink = ({ filters }: UseDiscoverLink) => {
       });
       setDiscoverUrl(newUrl);
     };
+
     getDiscoverUrl();
   }, [filters, locator]);
 
diff --git a/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx b/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
index 0289c53e72017..42a8b23143a53 100644
--- a/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
+++ b/x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx
@@ -5,19 +5,21 @@
  * 2.0.
  */
 
-import { ErrorToastOptions, Toast } from 'kibana/public';
+import { ErrorToastOptions, Toast } from '@kbn/core/public';
 import { useState } from 'react';
-import { useKibana } from '../../common/lib/kibana';
+import { useKibana } from '../lib/kibana';
 
 export const useErrorToast = () => {
   const [errorToast, setErrorToast] = useState<Toast>();
   const {
     notifications: { toasts },
   } = useKibana().services;
+
   return (error?: unknown, opts?: ErrorToastOptions) => {
     if (errorToast) {
       toasts.remove(errorToast);
     }
+
     if (error) {
       setErrorToast(
         // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts
index bd72d4eb91353..f58467cc9a5dc 100644
--- a/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts
@@ -16,7 +16,7 @@ import {
   useUiSetting$,
   withKibana,
   reactRouterNavigate,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
 
 export type KibanaContext = KibanaReactContextValue<StartServices>;
@@ -36,6 +36,7 @@ const useRouterNavigate = (
   onClickCallback?: Parameters<typeof reactRouterNavigate>[2]
 ) => {
   const history = useHistory();
+
   return reactRouterNavigate(history, to, onClickCallback);
 };
 
diff --git a/x-pack/plugins/osquery/public/components/empty_state.tsx b/x-pack/plugins/osquery/public/components/empty_state.tsx
index 1ca16dae28deb..d789aa28204eb 100644
--- a/x-pack/plugins/osquery/public/components/empty_state.tsx
+++ b/x-pack/plugins/osquery/public/components/empty_state.tsx
@@ -9,9 +9,9 @@ import React, { useCallback, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton } from '@elastic/eui';
 
-import { KibanaPageTemplate } from '../../../../../src/plugins/kibana_react/public';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
+import { KibanaPageTemplate } from '@kbn/kibana-react-plugin/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { isModifiedEvent, isLeftClickEvent, useKibana } from '../common/lib/kibana';
 import { OsqueryIcon } from './osquery_icon';
 import { useBreadcrumbs } from '../common/hooks/use_breadcrumbs';
@@ -38,6 +38,7 @@ const OsqueryAppEmptyStateComponent = () => {
     (event) => {
       if (!isModifiedEvent(event) && isLeftClickEvent(event)) {
         event.preventDefault();
+
         return navigateToApp(INTEGRATIONS_PLUGIN_ID, {
           path: pagePathGetters.integration_details_overview({
             pkgkey: OSQUERY_INTEGRATION_NAME,
diff --git a/x-pack/plugins/osquery/public/components/main_navigation.tsx b/x-pack/plugins/osquery/public/components/main_navigation.tsx
index 73b6435fd8f33..db016575db866 100644
--- a/x-pack/plugins/osquery/public/components/main_navigation.tsx
+++ b/x-pack/plugins/osquery/public/components/main_navigation.tsx
@@ -22,6 +22,7 @@ enum Section {
 export const MainNavigation = () => {
   const location = useLocation();
   const section = useMemo(() => location.pathname.split('/')[1] ?? 'overview', [location.pathname]);
+
   return (
     <Nav>
       <EuiFlexGroup gutterSize="l" alignItems="center">
diff --git a/x-pack/plugins/osquery/public/components/manage_integration_link.tsx b/x-pack/plugins/osquery/public/components/manage_integration_link.tsx
index 4eedf58466383..44ae6421a6c25 100644
--- a/x-pack/plugins/osquery/public/components/manage_integration_link.tsx
+++ b/x-pack/plugins/osquery/public/components/manage_integration_link.tsx
@@ -9,8 +9,8 @@ import React, { useCallback, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButtonEmpty, EuiFlexItem } from '@elastic/eui';
 
-import { INTEGRATIONS_PLUGIN_ID } from '../../../fleet/common';
-import { pagePathGetters } from '../../../fleet/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useKibana, isModifiedEvent, isLeftClickEvent } from '../common/lib/kibana';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 
@@ -33,6 +33,7 @@ const ManageIntegrationLinkComponent = () => {
     (event) => {
       if (!isModifiedEvent(event) && isLeftClickEvent(event)) {
         event.preventDefault();
+
         return navigateToApp(INTEGRATIONS_PLUGIN_ID, {
           path: pagePathGetters.integration_details_policies({
             pkgkey: OSQUERY_INTEGRATION_NAME,
diff --git a/x-pack/plugins/osquery/public/editor/index.tsx b/x-pack/plugins/osquery/public/editor/index.tsx
index 761daa1523a9b..191fe1e7ea548 100644
--- a/x-pack/plugins/osquery/public/editor/index.tsx
+++ b/x-pack/plugins/osquery/public/editor/index.tsx
@@ -11,7 +11,7 @@ import 'brace/theme/tomorrow';
 
 import { EuiCodeEditor, EuiCodeEditorProps } from '../shared_imports';
 
-import './osquery_mode.ts';
+import './osquery_mode';
 
 const EDITOR_SET_OPTIONS = {
   enableBasicAutocompletion: true,
@@ -40,6 +40,7 @@ const OsqueryEditorComponent: React.FC<OsqueryEditorProps> = ({
   ]);
 
   useEffect(() => setEditorValue(defaultValue), [defaultValue]);
+
   return (
     <EuiCodeEditor
       value={editorValue}
diff --git a/x-pack/plugins/osquery/public/editor/osquery_tables.ts b/x-pack/plugins/osquery/public/editor/osquery_tables.ts
index 7437ffbb72595..752e8af9edc7a 100644
--- a/x-pack/plugins/osquery/public/editor/osquery_tables.ts
+++ b/x-pack/plugins/osquery/public/editor/osquery_tables.ts
@@ -13,11 +13,14 @@ type TablesJSON = Array<{
 export const normalizeTables = (tablesJSON: TablesJSON) => sortBy(tablesJSON, 'name');
 
 let osqueryTables: TablesJSON | null = null;
+
 export const getOsqueryTables = () => {
   if (!osqueryTables) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     osqueryTables = normalizeTables(require('../common/schemas/osquery/v5.2.2.json'));
   }
+
   return osqueryTables;
 };
+
 export const getOsqueryTableNames = () => flatMap(getOsqueryTables(), 'name');
diff --git a/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx b/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx
index 5f07a3a5740cd..b93c475f1e04e 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx
@@ -48,6 +48,7 @@ const ConfigUploaderComponent: React.FC<ConfigUploaderProps> = ({ onChange }) =>
           // remove any multiple spaces from the query
           return value.replaceAll(/\s(?=\s)/gm, '');
         }
+
         return value;
       });
 
@@ -95,6 +96,7 @@ const ConfigUploaderComponent: React.FC<ConfigUploaderProps> = ({ onChange }) =>
         );
         // @ts-expect-error update types
         filePickerRef.current?.removeFiles(new Event('fake'));
+
         return;
       }
 
diff --git a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx
index e547686c0166b..6d1ae8f63cf1f 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx
@@ -6,13 +6,14 @@
  */
 
 import { lazy } from 'react';
-import { PackageCustomExtensionComponent } from '../../../fleet/public';
+import { PackageCustomExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyOsqueryManagedCustomButtonExtension = lazy<PackageCustomExtensionComponent>(
   async () => {
     const { OsqueryManagedCustomButtonExtension } = await import(
       './osquery_managed_custom_button_extension'
     );
+
     return {
       default: OsqueryManagedCustomButtonExtension,
     };
diff --git a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx
index a32f0b862250e..7783f4a4b6dd7 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx
@@ -6,13 +6,14 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyOsqueryManagedPolicyCreateImportExtension =
   lazy<PackagePolicyCreateExtensionComponent>(async () => {
     const { OsqueryManagedPolicyCreateImportExtension } = await import(
       './osquery_managed_policy_create_import_extension'
     );
+
     return {
       default: OsqueryManagedPolicyCreateImportExtension,
     };
diff --git a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx
index 787a39f3a34b7..ac4f50e6a97b3 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx
@@ -6,13 +6,14 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyOsqueryManagedPolicyEditExtension = lazy<PackagePolicyEditExtensionComponent>(
   async () => {
     const { OsqueryManagedPolicyCreateImportExtension } = await import(
       './osquery_managed_policy_create_import_extension'
     );
+
     return {
       default: OsqueryManagedPolicyCreateImportExtension,
     };
diff --git a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx
index 0f5caca5d19bd..393c3a00991b2 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_custom_button_extension.tsx
@@ -8,7 +8,7 @@
 import { EuiLoadingContent } from '@elastic/eui';
 import React from 'react';
 
-import { PackageCustomExtensionComponentProps } from '../../../fleet/public';
+import { PackageCustomExtensionComponentProps } from '@kbn/fleet-plugin/public';
 import { NavigationButtons } from './navigation_buttons';
 import { DisabledCallout } from './disabled_callout';
 import { MissingPrivileges } from '../routes/components/missing_privileges';
diff --git a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
index aaedec1e0dbe1..2cc6a3230d0ea 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/osquery_managed_policy_create_import_extension.tsx
@@ -26,12 +26,12 @@ import {
   agentPolicyRouteService,
   AgentPolicy,
   PLUGIN_ID,
-} from '../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import {
   pagePathGetters,
   PackagePolicyCreateExtensionComponentProps,
   PackagePolicyEditExtensionComponentProps,
-} from '../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 import { useKibana } from '../common/lib/kibana';
 import { NavigationButtons } from './navigation_buttons';
 import { DisabledCallout } from './disabled_callout';
@@ -245,6 +245,7 @@ export const OsqueryManagedPolicyCreateImportExtension = React.memo<
         } else {
           set(draft, 'inputs[0].config.osquery.value', parsedConfig);
         }
+
         return draft;
       });
 
@@ -322,6 +323,7 @@ export const OsqueryManagedPolicyCreateImportExtension = React.memo<
               policy_template: 'osquery_manager',
             });
           }
+
           return draft;
         });
 
diff --git a/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx b/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx
index 3f86675f8be41..051897eca1259 100644
--- a/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx
+++ b/x-pack/plugins/osquery/public/fleet_integration/use_fetch_status.tsx
@@ -29,6 +29,7 @@ export const useFetchStatus = () => {
           }
         });
     };
+
     fetchStatus();
   }, [http]);
 
diff --git a/x-pack/plugins/osquery/public/index.ts b/x-pack/plugins/osquery/public/index.ts
index fadd61cce85ef..fe8eba699f030 100644
--- a/x-pack/plugins/osquery/public/index.ts
+++ b/x-pack/plugins/osquery/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { OsqueryPlugin } from './plugin';
 
 // This exports static code and TypeScript types,
@@ -13,4 +13,5 @@ import { OsqueryPlugin } from './plugin';
 export function plugin(initializerContext: PluginInitializerContext) {
   return new OsqueryPlugin(initializerContext);
 }
+
 export type { OsqueryPluginSetup, OsqueryPluginStart } from './types';
diff --git a/x-pack/plugins/osquery/public/live_queries/form/index.tsx b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
index 2d244a14a386f..f082ca0baeebe 100644
--- a/x-pack/plugins/osquery/public/live_queries/form/index.tsx
+++ b/x-pack/plugins/osquery/public/live_queries/form/index.tsx
@@ -444,13 +444,16 @@ const LiveQueryFormComponent: React.FC<LiveQueryFormProps> = ({
     if (defaultValue?.agentSelection) {
       setFieldValue('agentSelection', defaultValue?.agentSelection);
     }
+
     if (defaultValue?.query) {
       setFieldValue('query', defaultValue?.query);
     }
+
     // TODO: Set query and ECS mapping from savedQueryId object
     if (defaultValue?.savedQueryId) {
       setFieldValue('savedQueryId', defaultValue?.savedQueryId);
     }
+
     if (!isEmpty(defaultValue?.ecs_mapping)) {
       setFieldValue('ecs_mapping', defaultValue?.ecs_mapping);
     }
diff --git a/x-pack/plugins/osquery/public/packs/active_state_switch.tsx b/x-pack/plugins/osquery/public/packs/active_state_switch.tsx
index 1dbb145430a3e..4223409166956 100644
--- a/x-pack/plugins/osquery/public/packs/active_state_switch.tsx
+++ b/x-pack/plugins/osquery/public/packs/active_state_switch.tsx
@@ -11,7 +11,7 @@ import { useQueryClient } from 'react-query';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 
-import { PackagePolicy } from '../../../fleet/common';
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
 import { useAgentPolicies } from '../agent_policies/use_agent_policies';
 import { ConfirmDeployAgentPolicyModal } from './form/confirmation_modal';
diff --git a/x-pack/plugins/osquery/public/packs/form/index.tsx b/x-pack/plugins/osquery/public/packs/form/index.tsx
index 41f51181aa304..262b57f7d2ec8 100644
--- a/x-pack/plugins/osquery/public/packs/form/index.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/index.tsx
@@ -162,6 +162,7 @@ const PackFormComponent: React.FC<PackFormProps> = ({
         policyIds,
         (acc, policyId) => {
           const agentPolicy = agentPoliciesById && agentPoliciesById[policyId];
+
           return acc + (agentPolicy?.agents ?? 0);
         },
         0
@@ -177,6 +178,7 @@ const PackFormComponent: React.FC<PackFormProps> = ({
   const handleSaveClick = useCallback(() => {
     if (agentCount) {
       setShowConfirmationModal(true);
+
       return;
     }
 
diff --git a/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx b/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx
index 1687213f1a67e..8955b8dac88c1 100644
--- a/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/pack_uploader.tsx
@@ -47,10 +47,12 @@ const OsqueryPackUploaderComponent: React.FC<OsqueryPackUploaderProps> = ({ onCh
           // remove any multiple spaces from the query
           return value.replaceAll(/\s(?=\s)/gm, '');
         }
+
         if (key === 'interval') {
           // convert interval int to string
           return `${value}`;
         }
+
         return value;
       });
 
@@ -82,6 +84,7 @@ const OsqueryPackUploaderComponent: React.FC<OsqueryPackUploaderProps> = ({ onCh
     (inputFiles) => {
       if (!inputFiles.length) {
         packName.current = '';
+
         return;
       }
 
@@ -103,6 +106,7 @@ const OsqueryPackUploaderComponent: React.FC<OsqueryPackUploaderProps> = ({ onCh
         );
         // @ts-expect-error update types
         filePickerRef.current?.removeFiles(new Event('fake'));
+
         return;
       }
 
diff --git a/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx b/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx
index fa579b43b3159..4b4420ec8bfd5 100644
--- a/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/policy_id_combobox_field.tsx
@@ -11,7 +11,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiTextColor, EuiComboBoxOptionOption } from
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { GetAgentPoliciesResponseItem } from '../../../../fleet/common';
+import { GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 import { ComboBoxField, FieldHook } from '../../shared_imports';
 
 // Custom styling for drop down list items due to:
@@ -106,6 +106,7 @@ const PolicyIdComboBoxFieldComponent: React.FC<PolicyIdComboBoxFieldProps> = ({
       value,
       (acc, policyId) => {
         const agentPolicy = agentPoliciesById && agentPoliciesById[policyId];
+
         return acc + (agentPolicy?.agents ?? 0);
       },
       0
diff --git a/x-pack/plugins/osquery/public/packs/form/queries_field.tsx b/x-pack/plugins/osquery/public/packs/form/queries_field.tsx
index 8e049e3fc5fc1..ecb05884a5182 100644
--- a/x-pack/plugins/osquery/public/packs/form/queries_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/form/queries_field.tsx
@@ -113,6 +113,7 @@ const QueriesFieldComponent: React.FC<QueriesFieldProps> = ({
         setValue(
           produce((draft) => {
             draft.push(newQuery);
+
             return draft;
           })
         );
diff --git a/x-pack/plugins/osquery/public/packs/form/utils.ts b/x-pack/plugins/osquery/public/packs/form/utils.ts
index 5a4ff8ec13bb1..446172c1cd5ce 100644
--- a/x-pack/plugins/osquery/public/packs/form/utils.ts
+++ b/x-pack/plugins/osquery/public/packs/form/utils.ts
@@ -17,6 +17,7 @@ export const convertPackQueriesToSO = (queries) =>
         id: key,
         ...pick(value, ['query', 'interval', 'platform', 'version', 'ecs_mapping']),
       });
+
       return acc;
     },
     []
@@ -28,6 +29,7 @@ export const convertSOQueriesToPack = (queries) =>
     queries,
     (acc, { id: queryId, ...query }) => {
       acc[queryId] = query;
+
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx b/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx
index c99662804b1e2..70282ab0819fd 100644
--- a/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx
+++ b/x-pack/plugins/osquery/public/packs/pack_queries_status_table.tsx
@@ -29,9 +29,9 @@ import type {
   PersistedIndexPatternLayer,
   PieVisualizationState,
   TermsIndexPatternColumn,
-} from '../../../lens/public';
-import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '../../../lens/common/constants';
-import { FilterStateStore, DataView } from '../../../../../src/plugins/data/common';
+} from '@kbn/lens-plugin/public';
+import { DOCUMENT_FIELD_NAME as RECORDS_FIELD } from '@kbn/lens-plugin/common/constants';
+import { FilterStateStore, DataView } from '@kbn/data-plugin/common';
 import { useKibana } from '../common/lib/kibana';
 import { OsqueryManagerPackagePolicyInputStream } from '../../common/types';
 import { ScheduledQueryErrorsTable } from './scheduled_query_errors_table';
@@ -234,6 +234,7 @@ const ViewResultsInLensActionComponent: React.FC<ViewResultsInDiscoverActionProp
   if (!isLensAvailable) {
     return null;
   }
+
   if (buttonType === ViewResultsActionButtonType.button) {
     return (
       <EuiButtonEmpty size="xs" iconType="lensApp" onClick={handleClick} disabled={false}>
@@ -335,12 +336,14 @@ const ViewResultsInDiscoverActionComponent: React.FC<ViewResultsInDiscoverAction
       });
       setDiscoverUrl(newUrl);
     };
+
     getDiscoverUrl();
   }, [actionId, agentIds, endDate, startDate, locator]);
 
   if (!discoverPermissions.show) {
     return null;
   }
+
   if (buttonType === ViewResultsActionButtonType.button) {
     return (
       <EuiButtonEmpty size="xs" iconType="discoverApp" href={discoverUrl} target="_blank">
@@ -618,6 +621,7 @@ const PackQueriesStatusTableComponent: React.FC<PackQueriesStatusTableProps> = (
 
       setLogsDataView(dataView[0]);
     };
+
     fetchLogsDataView();
   }, [dataViews]);
 
@@ -644,6 +648,7 @@ const PackQueriesStatusTableComponent: React.FC<PackQueriesStatusTableProps> = (
           />
         );
       }
+
       setItemIdToExpandedRowMap(itemIdToExpandedRowMapValues);
     },
     [agentIds, itemIdToExpandedRowMap, packName]
diff --git a/x-pack/plugins/osquery/public/packs/packs_table.tsx b/x-pack/plugins/osquery/public/packs/packs_table.tsx
index f8599cc1fc51e..b64d999b4ecf6 100644
--- a/x-pack/plugins/osquery/public/packs/packs_table.tsx
+++ b/x-pack/plugins/osquery/public/packs/packs_table.tsx
@@ -104,6 +104,7 @@ const PacksTableComponent = () => {
       item.attributes.updated_by !== item.attributes.created_by
         ? ` @ ${item.attributes.updated_by}`
         : '';
+
     return updatedAt ? (
       <EuiToolTip content={`${moment(updatedAt).fromNow()}${updatedBy}`}>
         <UpdatedBy>{`${moment(updatedAt).fromNow()}${updatedBy}`}</UpdatedBy>
diff --git a/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx b/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx
index b5bfe1a234d91..bca3036d19f4c 100644
--- a/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/ecs_mapping_editor_field.tsx
@@ -404,6 +404,7 @@ const OsqueryColumnFieldComponent: React.FC<OsqueryColumnFieldProps> = ({
         } else {
           setValue([trimmedNewOption]);
         }
+
         inputRef.current?.blur();
       } else {
         setValue(trimmedNewOption);
@@ -675,9 +676,11 @@ export const ECSMappingEditorForm = forwardRef<ECSMappingEditorFormRef, ECSMappi
         if (onAdd) {
           onAdd(serializedData);
         }
+
         if (onChange) {
           onChange(serializedData);
         }
+
         reset();
       }
     }, [validate, validateFields, submit, onAdd, onChange, reset]);
@@ -840,6 +843,7 @@ export const ECSMappingEditorField = React.memo(
           const validations = await Promise.all(
             Object.values(formRefs.current).map(async (formRef) => {
               const { data, isValid } = await formRef.validate();
+
               return [data, isValid];
             })
           );
@@ -945,6 +949,7 @@ export const ECSMappingEditorField = React.memo(
                           },
                         }))
                       );
+
                       return acc;
                     },
                     [] as OsquerySchemaOption[]
@@ -961,6 +966,7 @@ export const ECSMappingEditorField = React.memo(
 
                 if (column === '*' && astOsqueryTables[table]) {
                   const { columns: osqueryColumns, order: tableOrder } = astOsqueryTables[table];
+
                   return osqueryColumns.map((osqueryColumn) => ({
                     label: osqueryColumn.name,
                     value: {
@@ -1050,6 +1056,7 @@ export const ECSMappingEditorField = React.memo(
           setValue(
             produce((draft) => {
               draft[newRow.key] = newRow.value;
+
               return draft;
             })
           );
@@ -1085,6 +1092,7 @@ export const ECSMappingEditorField = React.memo(
               if (draft[key]) {
                 delete draft[key];
               }
+
               return draft;
             })
           );
diff --git a/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx b/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx
index 843fa41cfb0f6..c9e29abb34fea 100644
--- a/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/platform_checkbox_group_field.tsx
@@ -91,6 +91,7 @@ export const PlatformCheckBoxGroupField = ({
     () =>
       (options as EuiCheckboxGroupOption[]).reduce((acc, option) => {
         acc[option.id] = isEmpty(field.value) ? true : field.value?.includes(option.id) ?? false;
+
         return acc;
       }, {} as Record<string, boolean>)
   );
@@ -116,6 +117,7 @@ export const PlatformCheckBoxGroupField = ({
     setCheckboxIdToSelectedMap(() =>
       (options as EuiCheckboxGroupOption[]).reduce((acc, option) => {
         acc[option.id] = isEmpty(field.value) ? true : field.value?.includes(option.id) ?? false;
+
         return acc;
       }, {} as Record<string, boolean>)
     );
diff --git a/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx b/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx
index 362fa5c67e6f9..b669b10d78b00 100644
--- a/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/platforms/helpers.tsx
@@ -43,12 +43,14 @@ export const getSupportedPlatforms = (payload: string) => {
           acc.push(PlatformType.darwin);
           acc.push(PlatformType.linux);
         }
+
         if (nextPlatform === 'ubuntu') {
           acc.push(PlatformType.linux);
         }
       } else {
         acc.push(nextPlatform);
       }
+
       return acc;
     }, [] as string[])
   ).join(',');
diff --git a/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx b/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx
index b8af2790c6f36..aa72bf291eba7 100644
--- a/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/platforms/index.tsx
@@ -27,6 +27,7 @@ const PlatformIconsComponent: React.FC<PlatformIconsProps> = ({ platform }) => {
         } catch (e) {
           return prevValue;
         }
+
         return platformArray;
       } else {
         return SUPPORTED_PLATFORMS;
diff --git a/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx b/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx
index 8ddd2d14bf145..8590968b58fb0 100644
--- a/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/query_flyout.tsx
@@ -65,6 +65,7 @@ const QueryFlyoutComponent: React.FC<QueryFlyoutProps> = ({
           });
           onClose();
         }
+
         resolve();
       });
     },
diff --git a/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx b/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx
index a6cb38e248774..b46230a65267e 100644
--- a/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx
+++ b/x-pack/plugins/osquery/public/packs/queries/use_pack_query_form.tsx
@@ -84,10 +84,12 @@ export const usePackQueryForm = ({
         if (isArray(draft.platform)) {
           draft.platform.join(',');
         }
+
         if (draft.platform?.split(',').length === 3) {
           // if all platforms are checked then use undefined
           delete draft.platform;
         }
+
         if (isArray(draft.version)) {
           if (!draft.version.length) {
             delete draft.version;
@@ -95,9 +97,11 @@ export const usePackQueryForm = ({
             draft.version = draft.version[0];
           }
         }
+
         if (isEmpty(draft.ecs_mapping)) {
           delete draft.ecs_mapping;
         }
+
         return draft;
       }),
     // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/packs/queries/validations.ts b/x-pack/plugins/osquery/public/packs/queries/validations.ts
index 1c568337524c7..765207a21cbec 100644
--- a/x-pack/plugins/osquery/public/packs/queries/validations.ts
+++ b/x-pack/plugins/osquery/public/packs/queries/validations.ts
@@ -34,6 +34,7 @@ const createUniqueIdValidation = (ids: Set<string>) => {
       };
     }
   };
+
   return uniqueIdCheck;
 };
 
diff --git a/x-pack/plugins/osquery/public/packs/types.ts b/x-pack/plugins/osquery/public/packs/types.ts
index 07f4149cab1ef..7b8b23a36629b 100644
--- a/x-pack/plugins/osquery/public/packs/types.ts
+++ b/x-pack/plugins/osquery/public/packs/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 
 export interface IQueryPayload {
   attributes?: {
diff --git a/x-pack/plugins/osquery/public/packs/use_create_pack.ts b/x-pack/plugins/osquery/public/packs/use_create_pack.ts
index 61287730b54c4..a926730ca9f23 100644
--- a/x-pack/plugins/osquery/public/packs/use_create_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_create_pack.ts
@@ -43,6 +43,7 @@ export const useCreatePack = ({ withRedirect }: UseCreatePackProps) => {
         if (withRedirect) {
           navigateToApp(PLUGIN_ID, { path: pagePathGetters.packs() });
         }
+
         toasts.addSuccess(
           i18n.translate('xpack.osquery.newPack.successToastMessageText', {
             defaultMessage: 'Successfully created "{packName}" pack',
diff --git a/x-pack/plugins/osquery/public/packs/use_delete_pack.ts b/x-pack/plugins/osquery/public/packs/use_delete_pack.ts
index 1e5b55b90600f..505a941753a8a 100644
--- a/x-pack/plugins/osquery/public/packs/use_delete_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_delete_pack.ts
@@ -40,6 +40,7 @@ export const useDeletePack = ({ packId, withRedirect }: UseDeletePackProps) => {
       if (withRedirect) {
         navigateToApp(PLUGIN_ID, { path: pagePathGetters.packs() });
       }
+
       toasts.addSuccess(
         i18n.translate('xpack.osquery.deletePack.successToastMessageText', {
           defaultMessage: 'Successfully deleted pack',
diff --git a/x-pack/plugins/osquery/public/packs/use_pack.ts b/x-pack/plugins/osquery/public/packs/use_pack.ts
index 6aadedab206c4..fb9d92dec81b2 100644
--- a/x-pack/plugins/osquery/public/packs/use_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_pack.ts
@@ -7,8 +7,8 @@
 
 import { useQuery } from 'react-query';
 
+import { GetOnePackagePolicyResponse } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../common/lib/kibana';
-import { GetOnePackagePolicyResponse } from '../../../fleet/common';
 import { OsqueryManagerPackagePolicy } from '../../common/types';
 
 interface UsePack {
diff --git a/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts b/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts
index ae22b83b40b02..fbb16d011fe62 100644
--- a/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts
+++ b/x-pack/plugins/osquery/public/packs/use_pack_query_errors.ts
@@ -6,7 +6,8 @@
  */
 
 import { useQuery } from 'react-query';
-import { DataView, SortDirection } from '../../../../../src/plugins/data/common';
+import { lastValueFrom } from 'rxjs';
+import { DataView, SortDirection } from '@kbn/data-plugin/common';
 
 import { useKibana } from '../common/lib/kibana';
 
@@ -69,7 +70,8 @@ export const usePackQueryErrors = ({
       });
 
       searchSource.setField('index', logsDataView);
-      return searchSource.fetch$().toPromise();
+
+      return lastValueFrom(searchSource.fetch$());
     },
     {
       keepPreviousData: true,
diff --git a/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts b/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts
index 7f9adb1434367..a68f361d850fb 100644
--- a/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts
+++ b/x-pack/plugins/osquery/public/packs/use_pack_query_last_results.ts
@@ -7,7 +7,8 @@
 
 import { useQuery } from 'react-query';
 import moment from 'moment-timezone';
-import { DataView, SortDirection } from '../../../../../src/plugins/data/common';
+import { lastValueFrom } from 'rxjs';
+import { DataView, SortDirection } from '@kbn/data-plugin/common';
 import { useKibana } from '../common/lib/kibana';
 
 interface UsePackQueryLastResultsProps {
@@ -48,7 +49,7 @@ export const usePackQueryLastResults = ({
 
       lastResultsSearchSource.setField('index', logsDataView);
 
-      const lastResultsResponse = await lastResultsSearchSource.fetch$().toPromise();
+      const lastResultsResponse = await lastValueFrom(lastResultsSearchSource.fetch$());
       const timestamp = lastResultsResponse.rawResponse?.hits?.hits[0]?.fields?.['@timestamp'][0];
 
       if (timestamp) {
diff --git a/x-pack/plugins/osquery/public/packs/use_update_pack.ts b/x-pack/plugins/osquery/public/packs/use_update_pack.ts
index cc88279802d03..829db7b081aca 100644
--- a/x-pack/plugins/osquery/public/packs/use_update_pack.ts
+++ b/x-pack/plugins/osquery/public/packs/use_update_pack.ts
@@ -46,6 +46,7 @@ export const useUpdatePack = ({ withRedirect, options }: UseUpdatePackProps) =>
         if (withRedirect) {
           navigateToApp(PLUGIN_ID, { path: pagePathGetters.packs() });
         }
+
         toasts.addSuccess(
           i18n.translate('xpack.osquery.updatePack.successToastMessageText', {
             defaultMessage: 'Successfully updated "{packName}" pack',
diff --git a/x-pack/plugins/osquery/public/plugin.ts b/x-pack/plugins/osquery/public/plugin.ts
index 8a0b61d7aaba6..e88a866cc545f 100644
--- a/x-pack/plugins/osquery/public/plugin.ts
+++ b/x-pack/plugins/osquery/public/plugin.ts
@@ -12,8 +12,8 @@ import {
   PluginInitializerContext,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import {
   OsqueryPluginSetup,
   OsqueryPluginStart,
@@ -50,6 +50,7 @@ export class OsqueryPlugin implements Plugin<OsqueryPluginSetup, OsqueryPluginSt
         const [coreStart, depsStart] = await core.getStartServices();
         // Load application bundle
         const { renderApp } = await import('./application');
+
         // Render the application
         return renderApp(
           coreStart,
diff --git a/x-pack/plugins/osquery/public/results/results_table.tsx b/x-pack/plugins/osquery/public/results/results_table.tsx
index d01886113b31a..dec1d08a0d012 100644
--- a/x-pack/plugins/osquery/public/results/results_table.tsx
+++ b/x-pack/plugins/osquery/public/results/results_table.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { createContext, useEffect, useState, useCallback, useContext, useMemo } from 'react';
 
-import { pagePathGetters } from '../../../fleet/public';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { useAllResults } from './use_all_results';
 import { Direction, ResultEdges } from '../../common/search_strategy';
 import { useKibana } from '../common/lib/kibana';
@@ -195,6 +195,7 @@ const ResultsTableComponent: React.FC<ResultsTableComponentProps> = ({
           // @ts-expect-error update types
           acc[value?.field] = [...(acc[value?.field] ?? []), key];
         }
+
         return acc;
       },
       {},
@@ -274,6 +275,7 @@ const ResultsTableComponent: React.FC<ResultsTableComponentProps> = ({
             });
             seen.add(fieldName);
           }
+
           return acc;
         }
 
@@ -291,6 +293,7 @@ const ResultsTableComponent: React.FC<ResultsTableComponentProps> = ({
             });
             seen.add(displayAsText);
           }
+
           return acc;
         }
 
diff --git a/x-pack/plugins/osquery/public/results/use_all_results.ts b/x-pack/plugins/osquery/public/results/use_all_results.ts
index 16c5d221cfdd9..c35ce881586b1 100644
--- a/x-pack/plugins/osquery/public/results/use_all_results.ts
+++ b/x-pack/plugins/osquery/public/results/use_all_results.ts
@@ -8,6 +8,7 @@
 import { useQuery } from 'react-query';
 
 import { i18n } from '@kbn/i18n';
+import { firstValueFrom } from 'rxjs';
 import {
   createFilter,
   generateTablePaginationOptions,
@@ -61,8 +62,8 @@ export const useAllResults = ({
   return useQuery(
     ['allActionResults', { actionId, activePage, limit, sort }],
     async () => {
-      const responseData = await data.search
-        .search<ResultsRequestOptions, ResultsStrategyResponse>(
+      const responseData = await firstValueFrom(
+        data.search.search<ResultsRequestOptions, ResultsStrategyResponse>(
           {
             actionId,
             factoryQueryType: OsqueryQueries.results,
@@ -74,7 +75,7 @@ export const useAllResults = ({
             strategy: 'osquerySearchStrategy',
           }
         )
-        .toPromise();
+      );
 
       if (!responseData?.edges?.length && responseData.totalCount) {
         throw new Error('Empty edges while positive totalCount');
diff --git a/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx b/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx
index d019b831d96f5..e742958b989f0 100644
--- a/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx
+++ b/x-pack/plugins/osquery/public/routes/saved_queries/list/index.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useHistory } from 'react-router-dom';
 
-import { SavedObject } from 'kibana/public';
+import { SavedObject } from '@kbn/core/public';
 import { ECSMapping } from '../../../../common/schemas/common';
 import { WithHeaderLayout } from '../../../components/layouts';
 import { useBreadcrumbs } from '../../../common/hooks/use_breadcrumbs';
@@ -141,6 +141,7 @@ const SavedQueriesPageComponent = () => {
       item.attributes.updated_by !== item.attributes.created_by
         ? ` @ ${item.attributes.updated_by}`
         : '';
+
     return updatedAt ? `${moment(updatedAt).fromNow()}${updatedBy}` : '-';
   }, []);
 
diff --git a/x-pack/plugins/osquery/public/saved_queries/form/index.tsx b/x-pack/plugins/osquery/public/saved_queries/form/index.tsx
index 33bb7672618e4..cc0aa8ee08ca4 100644
--- a/x-pack/plugins/osquery/public/saved_queries/form/index.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/form/index.tsx
@@ -73,6 +73,7 @@ const SavedQueryFormComponent = forwardRef<SavedQueryFormRefObject, SavedQueryFo
           if (ecsFieldRef.current) {
             return ecsFieldRef.current.validate();
           }
+
           return Promise.resolve(false);
         },
       }),
diff --git a/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx b/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx
index 39e2f6ca51cbc..bf4123fd86128 100644
--- a/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/form/use_saved_query_form.tsx
@@ -38,12 +38,14 @@ export const useSavedQueryForm = ({
     const res = new Set<string>(ids);
     // @ts-expect-error update types
     if (defaultValue && defaultValue.id) res.delete(defaultValue.id);
+
     return res;
   }, [ids, defaultValue]);
   const formSchema = useMemo<ReturnType<typeof createFormSchema>>(
     () => createFormSchema(idSet),
     [idSet]
   );
+
   return useForm({
     id: SAVED_QUERY_FORM_ID + uuid.v4(),
     schema: formSchema,
@@ -70,6 +72,7 @@ export const useSavedQueryForm = ({
           // @ts-expect-error update types
           delete draft.platform;
         }
+
         if (isArray(draft.version)) {
           if (!draft.version.length) {
             // @ts-expect-error update types
@@ -78,12 +81,15 @@ export const useSavedQueryForm = ({
             draft.version = draft.version[0];
           }
         }
+
         if (isEmpty(draft.ecs_mapping)) {
           // @ts-expect-error update types
           delete draft.ecs_mapping;
         }
+
         // @ts-expect-error update types
         draft.interval = draft.interval + '';
+
         return draft;
       }),
     // @ts-expect-error update types
diff --git a/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx b/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx
index 32812b9331811..4d352b7fd2516 100644
--- a/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx
+++ b/x-pack/plugins/osquery/public/saved_queries/saved_queries_dropdown.tsx
@@ -8,7 +8,7 @@
 import { find } from 'lodash/fp';
 import { EuiCodeBlock, EuiFormRow, EuiComboBox, EuiTextColor } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { SimpleSavedObject } from 'kibana/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import styled from 'styled-components';
@@ -75,6 +75,7 @@ const SavedQueriesDropdownComponent: React.FC<SavedQueriesDropdownProps> = ({
       if (!newSelectedOptions.length) {
         onChange(null);
         setSelectedOptions(newSelectedOptions);
+
         return;
       }
 
diff --git a/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts b/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts
index 3ecab8a6d2c4d..ecbaf8d08f71a 100644
--- a/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts
+++ b/x-pack/plugins/osquery/public/saved_queries/use_create_saved_query.ts
@@ -45,6 +45,7 @@ export const useCreateSavedQuery = ({ withRedirect }: UseCreateSavedQueryProps)
         if (withRedirect) {
           navigateToApp(PLUGIN_ID, { path: pagePathGetters.saved_queries() });
         }
+
         toasts.addSuccess(
           i18n.translate('xpack.osquery.newSavedQuery.successToastMessageText', {
             defaultMessage: 'Successfully saved "{savedQueryId}" query',
diff --git a/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx b/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx
index 57f96c1f9bc03..5e158c51c02d1 100644
--- a/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx
+++ b/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action.tsx
@@ -11,6 +11,7 @@ import React, { lazy, Suspense } from 'react';
 // eslint-disable-next-line react/display-name
 export const getLazyOsqueryAction = (services) => (props) => {
   const OsqueryAction = lazy(() => import('./osquery_action'));
+
   return (
     <Suspense fallback={null}>
       <OsqueryAction services={services} {...props} />
diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts
index 595296e4d7b60..5cd84739cd7d1 100644
--- a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts
+++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available.ts
@@ -39,6 +39,7 @@ export const useIsOsqueryAvailable = (agentId?: string) => {
       'package.name',
       OSQUERY_INTEGRATION_NAME,
     ]);
+
     return osqueryPackageInstalled?.enabled;
   }, [agentPolicyData?.package_policies, policyError]);
 
diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts
index c293e4c75a910..77c91957b10dc 100644
--- a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts
+++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.test.ts
@@ -7,9 +7,9 @@
 import { useKibana } from '../../common/lib/kibana';
 import { useIsOsqueryAvailableSimple } from './use_is_osquery_available_simple';
 import { renderHook } from '@testing-library/react-hooks';
-import { createStartServicesMock } from '../../../../triggers_actions_ui/public/common/lib/kibana/kibana_react.mock';
+import { createStartServicesMock } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana/kibana_react.mock';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../common/lib/kibana');
 
diff --git a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx
index efe34b51ea0a3..e871e185b830f 100644
--- a/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx
+++ b/x-pack/plugins/osquery/public/shared_components/osquery_action/use_is_osquery_available_simple.tsx
@@ -8,9 +8,9 @@
 import { useEffect, useState } from 'react';
 
 import { find } from 'lodash';
+import { AgentPolicy, FleetServerAgent, NewPackagePolicy } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../../common/lib/kibana';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { AgentPolicy, FleetServerAgent, NewPackagePolicy } from '../../../../fleet/common';
 
 interface IProps {
   agentId: string;
diff --git a/x-pack/plugins/osquery/public/shared_imports.ts b/x-pack/plugins/osquery/public/shared_imports.ts
index c8f163b5bccfc..4e08bcd46d9ee 100644
--- a/x-pack/plugins/osquery/public/shared_imports.ts
+++ b/x-pack/plugins/osquery/public/shared_imports.ts
@@ -15,7 +15,7 @@ export type {
   ValidationError,
   ValidationFunc,
   ValidationFuncArg,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   getUseField,
   getFieldValidityAndErrorMessage,
@@ -29,7 +29,7 @@ export {
   useFormContext,
   useFormData,
   VALIDATION_TYPES,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 export {
   Field,
@@ -37,10 +37,10 @@ export {
   ToggleField,
   SelectField,
   JsonEditorField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/components';
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
-export type { ERROR_CODE } from '../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
+} from '@kbn/es-ui-shared-plugin/static/forms/components';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
+export type { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
 
-export { EuiCodeEditor } from '../../../../src/plugins/es_ui_shared/public';
-export type { EuiCodeEditorProps } from '../../../../src/plugins/es_ui_shared/public';
-export { useUiSetting$, KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+export { EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+export type { EuiCodeEditorProps } from '@kbn/es-ui-shared-plugin/public';
+export { useUiSetting$, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/osquery/public/types.ts b/x-pack/plugins/osquery/public/types.ts
index 91095b6f169c1..8679f4fa9373f 100644
--- a/x-pack/plugins/osquery/public/types.ts
+++ b/x-pack/plugins/osquery/public/types.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { DiscoverStart } from '../../../../src/plugins/discover/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { FleetStart } from '../../fleet/public';
-import { LensPublicStart } from '../../lens/public';
-import { SecurityPluginStart } from '../../security/public';
-import { CoreStart } from '../../../../src/core/public';
-import { NavigationPublicPluginStart } from '../../../../src/plugins/navigation/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { FleetStart } from '@kbn/fleet-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { SecurityPluginStart } from '@kbn/security-plugin/public';
+import { CoreStart } from '@kbn/core/public';
+import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { getLazyOsqueryAction } from './shared_components';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/plugins/osquery/server/common/types.ts b/x-pack/plugins/osquery/server/common/types.ts
index 3021cadb6cae3..30e504e10996e 100644
--- a/x-pack/plugins/osquery/server/common/types.ts
+++ b/x-pack/plugins/osquery/server/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 
 export interface IQueryPayload {
   attributes?: {
diff --git a/x-pack/plugins/osquery/server/create_config.ts b/x-pack/plugins/osquery/server/create_config.ts
index 6e4a4e7742f7a..cf07e739ded29 100644
--- a/x-pack/plugins/osquery/server/create_config.ts
+++ b/x-pack/plugins/osquery/server/create_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigType } from './config';
 
diff --git a/x-pack/plugins/osquery/server/index.ts b/x-pack/plugins/osquery/server/index.ts
index 03da89d72d7b9..7b47aec4c6caa 100644
--- a/x-pack/plugins/osquery/server/index.ts
+++ b/x-pack/plugins/osquery/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { OsqueryPlugin } from './plugin';
 import { ConfigSchema, ConfigType } from './config';
 
diff --git a/x-pack/plugins/osquery/server/lib/fleet_integration.ts b/x-pack/plugins/osquery/server/lib/fleet_integration.ts
index 87d48c95648bb..b0cfcbd32a029 100644
--- a/x-pack/plugins/osquery/server/lib/fleet_integration.ts
+++ b/x-pack/plugins/osquery/server/lib/fleet_integration.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectReference, SavedObjectsClient } from 'kibana/server';
+import { SavedObjectReference, SavedObjectsClient } from '@kbn/core/server';
 import { filter, map } from 'lodash';
+import { PostPackagePolicyDeleteCallback } from '@kbn/fleet-plugin/server';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { packSavedObjectType } from '../../common/types';
-import { PostPackagePolicyDeleteCallback } from '../../../fleet/server';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 
 export const getPackagePolicyDeleteCallback =
diff --git a/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts b/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts
index 2816231cd094e..a7191712f8dc7 100644
--- a/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts
+++ b/x-pack/plugins/osquery/server/lib/osquery_app_context_services.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger, LoggerFactory } from '../../../../../src/core/server';
-import { SecurityPluginStart } from '../../../security/server';
+import { CoreSetup, Logger, LoggerFactory } from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   AgentService,
   FleetStartContract,
   PackageService,
   AgentPolicyServiceInterface,
   PackagePolicyServiceInterface,
-} from '../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import { ConfigType } from '../config';
 import { TelemetryEventsSender } from './telemetry/sender';
 
diff --git a/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts b/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
index d4d92d968e49d..b586ef309b202 100644
--- a/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
+++ b/x-pack/plugins/osquery/server/lib/parse_agent_groups.ts
@@ -6,8 +6,8 @@
  */
 
 import { uniq } from 'lodash';
-import type { SavedObjectsClientContract } from 'src/core/server';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 import { OsqueryAppContext } from './osquery_app_context_services';
 
@@ -30,6 +30,7 @@ const aggregateResults = async (
     const { results: additionalResults } = await generator(currPage++, PER_PAGE);
     results.push(...additionalResults);
   }
+
   return uniq<string>(results);
 };
 
@@ -52,6 +53,7 @@ export const parseAgentSelection = async (
         perPage,
         page,
       });
+
       return { results: items.map((it) => it.policy_id), total };
     });
     kueryFragments.push(`policy_id:(${uniq(osqueryPolicies).join(' or ')})`);
@@ -64,6 +66,7 @@ export const parseAgentSelection = async (
           kuery,
           showInactive: false,
         });
+
         return { results: res.agents.map((agent) => agent.id), total: res.total };
       });
       fetchedAgents.forEach(addAgent);
@@ -73,9 +76,11 @@ export const parseAgentSelection = async (
         if (platformsSelected.length) {
           groupFragments.push(`local_metadata.os.platform:(${platformsSelected.join(' or ')})`);
         }
+
         if (policiesSelected.length) {
           groupFragments.push(`policy_id:(${policiesSelected.join(' or ')})`);
         }
+
         kueryFragments.push(`(${groupFragments.join(' or ')})`);
         const kuery = kueryFragments.join(' and ');
         const fetchedAgents = await aggregateResults(async (page, perPage) => {
@@ -85,6 +90,7 @@ export const parseAgentSelection = async (
             kuery,
             showInactive: false,
           });
+
           return { results: res.agents.map((agent) => agent.id), total: res.total };
         });
         fetchedAgents.forEach(addAgent);
diff --git a/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts b/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts
index db9b3f05ecd45..cbf94bb2e5250 100644
--- a/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts
+++ b/x-pack/plugins/osquery/server/lib/saved_query/saved_object_mappings.ts
@@ -6,7 +6,7 @@
  */
 
 import { produce } from 'immer';
-import { SavedObjectsType } from '../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import {
   savedQuerySavedObjectType,
   packSavedObjectType,
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts b/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts
index 4b1186299be53..e5814e6db55ee 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/__mocks__/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ConcreteTaskInstance, TaskStatus } from '../../../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TelemetryEventsSender } from '../sender';
 import { TelemetryReceiver } from '../receiver';
 import { OsqueryTelemetryTaskConfig } from '../task';
-import { PackagePolicy } from '../../../../../fleet/common/types/models/package_policy';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
 
 export const createMockTelemetryEventsSender = (
   enableTelemetry?: boolean
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/filters.ts b/x-pack/plugins/osquery/server/lib/telemetry/filters.ts
index 9ef572e6879e2..513242ffb583d 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/filters.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/filters.ts
@@ -49,18 +49,21 @@ export function copyAllowlistedFields(
         return { ...newEvent, [allowKey]: eventValue };
       } else if (typeof allowValue === 'object' && Array.isArray(eventValue)) {
         const subValues = eventValue.filter((v) => typeof v === 'object');
+
         return {
           ...newEvent,
           [allowKey]: subValues.map((v) => copyAllowlistedFields(allowValue, v as TelemetryEvent)),
         };
       } else if (typeof allowValue === 'object' && typeof eventValue === 'object') {
         const values = copyAllowlistedFields(allowValue, eventValue as TelemetryEvent);
+
         return {
           ...newEvent,
           ...(Object.keys(values).length > 0 ? { [allowKey]: values } : {}),
         };
       }
     }
+
     return newEvent;
   }, {});
 }
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts b/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts
index 061f3b9905f8b..3e4f957b29cef 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { SavedObjectsFindResponse } from 'kibana/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { copyAllowlistedFields, packEventFields, savedQueryEventFields } from './filters';
 import type { ESClusterInfo, ESLicense, ListTemplate, TelemetryEvent } from './types';
 
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts b/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts
index 59280ab342a97..393f6b502c2a9 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/receiver.ts
@@ -10,10 +10,10 @@ import {
   CoreStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
+import { AgentClient, AgentPolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { packSavedObjectType, savedQuerySavedObjectType } from '../../../common/types';
-import { AgentClient, AgentPolicyServiceInterface } from '../../../../fleet/server';
 import type { ESLicense, ESClusterInfo } from './types';
 import { OsqueryAppContextService } from '../osquery_app_context_services';
 
@@ -111,6 +111,7 @@ export class TelemetryReceiver {
       return (await ret).license;
     } catch (err) {
       this.logger.debug(`failed retrieving license: ${err}`);
+
       return undefined;
     }
   }
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts b/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts
index c4e30f97fffcc..7a572a1849f11 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/sender.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable dot-notation */
 import { TelemetryEventsSender } from './sender';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { URL } from 'url';
 
 describe('TelemetryEventsSender', () => {
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/sender.ts b/x-pack/plugins/osquery/server/lib/telemetry/sender.ts
index 84fd4d3004c92..ab5af7d60f466 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/sender.ts
@@ -9,13 +9,13 @@ import axios from 'axios';
 import { URL } from 'url';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { TelemetryReceiver } from './receiver';
 import { createTelemetryTaskConfigs } from './tasks';
 import { createUsageCounterLabel } from './helpers';
@@ -59,6 +59,7 @@ export class TelemetryEventsSender {
         (config: OsqueryTelemetryTaskConfig) => {
           const task = new OsqueryTelemetryTask(config, this.logger, this, telemetryReceiver);
           task.register(taskManager);
+
           return task;
         }
       );
@@ -128,6 +129,7 @@ export class TelemetryEventsSender {
 
   public async isTelemetryOptedIn() {
     this.isOptedIn = await this.telemetryStart?.getIsOptedIn();
+
     return this.isOptedIn === true;
   }
 
@@ -148,6 +150,7 @@ export class TelemetryEventsSender {
         this.logger.debug(`Telemetry is not opted-in.`);
         this.queue = [];
         this.isSending = false;
+
         return;
       }
 
@@ -183,6 +186,7 @@ export class TelemetryEventsSender {
     } catch (err) {
       this.queue = [];
     }
+
     this.isSending = false;
   }
 
@@ -229,6 +233,7 @@ export class TelemetryEventsSender {
     if (!telemetryUrl) {
       throw Error("Couldn't get telemetry URL");
     }
+
     return this.getV3UrlFromV2(telemetryUrl.toString(), channel);
   }
 
@@ -242,6 +247,7 @@ export class TelemetryEventsSender {
     } else {
       url.pathname = `/v3-dev/send/${channel}`;
     }
+
     return url.toString();
   }
 
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts b/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts
index eaa0aa4f20464..9af355a2fd00a 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/task.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { SuccessfulRunResult } from '../../../../task_manager/server/task';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { SuccessfulRunResult } from '@kbn/task-manager-plugin/server/task';
 import { OsqueryTelemetryTask } from './task';
 import {
   createMockTaskInstance,
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/task.ts b/x-pack/plugins/osquery/server/lib/telemetry/task.ts
index aff75ef28a41b..30ce7c8ce925a 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/task.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/task.ts
@@ -6,12 +6,12 @@
  */
 
 import moment from 'moment';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { TelemetryReceiver } from './receiver';
 import { TelemetryEventsSender } from './sender';
 
@@ -131,16 +131,19 @@ export class OsqueryTelemetryTask {
     this.logger.debug(`[task ${taskId}]: attempting to run`);
     if (taskId !== this.getTaskId()) {
       this.logger.debug(`[task ${taskId}]: outdated task`);
+
       return 0;
     }
 
     const isOptedIn = await this.sender.isTelemetryOptedIn();
     if (!isOptedIn) {
       this.logger.debug(`[task ${taskId}]: telemetry is not opted-in`);
+
       return 0;
     }
 
     this.logger.debug(`[task ${taskId}]: running task`);
+
     return this.config.runTask(taskId, this.logger, this.receiver, this.sender, executionPeriod);
   };
 }
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts b/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts
index e863481a725f1..fdc4ce088b288 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/tasks/packs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TELEMETRY_CHANNEL_PACKS } from '../constants';
 import { templatePacks } from '../helpers';
 import { TelemetryEventsSender } from '../sender';
@@ -43,6 +43,7 @@ export function createTelemetryPacksTaskConfig() {
 
       if (!packsResponse?.total) {
         logger.debug('no packs found');
+
         return 0;
       }
 
diff --git a/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts b/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts
index 962e0d2379696..86218710ca67a 100644
--- a/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts
+++ b/x-pack/plugins/osquery/server/lib/telemetry/tasks/saved_queries.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TELEMETRY_CHANNEL_SAVED_QUERIES } from '../constants';
 import { templateSavedQueries } from '../helpers';
 import { TelemetryEventsSender } from '../sender';
@@ -43,6 +43,7 @@ export function createTelemetrySavedQueriesTaskConfig() {
 
       if (!savedQueriesResponse?.total) {
         logger.debug('no saved queries found');
+
         return 0;
       }
 
diff --git a/x-pack/plugins/osquery/server/plugin.ts b/x-pack/plugins/osquery/server/plugin.ts
index 0533b770e8895..6f0cf824684e7 100644
--- a/x-pack/plugins/osquery/server/plugin.ts
+++ b/x-pack/plugins/osquery/server/plugin.ts
@@ -14,8 +14,8 @@ import {
   Logger,
   SavedObjectsClient,
   DEFAULT_APP_CATEGORIES,
-} from '../../../../src/core/server';
-import { UsageCounter } from '../../../../src/plugins/usage_collection/server';
+} from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 import { createConfig } from './create_config';
 import { OsqueryPluginSetup, OsqueryPluginStart, SetupPlugins, StartPlugins } from './types';
diff --git a/x-pack/plugins/osquery/server/routes/action/create_action_route.ts b/x-pack/plugins/osquery/server/routes/action/create_action_route.ts
index b37e6032331dd..ee9338fc50108 100644
--- a/x-pack/plugins/osquery/server/routes/action/create_action_route.ts
+++ b/x-pack/plugins/osquery/server/routes/action/create_action_route.ts
@@ -9,7 +9,7 @@ import { pickBy, isEmpty } from 'lodash';
 import uuid from 'uuid';
 import moment from 'moment-timezone';
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 import { parseAgentSelection, AgentSelection } from '../../lib/parse_agent_groups';
@@ -75,6 +75,7 @@ export const createActionRoute = (router: IRouter, osqueryContext: OsqueryAppCon
       incrementCount(internalSavedObjectsClient, 'live_query');
       if (!selectedAgents.length) {
         incrementCount(internalSavedObjectsClient, 'live_query', 'errors');
+
         return response.badRequest({ body: new Error('No agents found for selection') });
       }
 
@@ -111,6 +112,7 @@ export const createActionRoute = (router: IRouter, osqueryContext: OsqueryAppCon
         });
       } catch (error) {
         incrementCount(internalSavedObjectsClient, 'live_query', 'errors');
+
         return response.customError({
           statusCode: 500,
           body: new Error(`Error occurred while processing ${error}`),
diff --git a/x-pack/plugins/osquery/server/routes/action/index.ts b/x-pack/plugins/osquery/server/routes/action/index.ts
index fcf89d79dd0ee..92793aeff44f1 100644
--- a/x-pack/plugins/osquery/server/routes/action/index.ts
+++ b/x-pack/plugins/osquery/server/routes/action/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { createActionRoute } from './create_action_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
diff --git a/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts b/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts
index 539f7083f0f2e..d2b590f08f453 100644
--- a/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/get_assets_status_route.ts
@@ -8,12 +8,12 @@
 import { filter } from 'lodash/fp';
 import { schema } from '@kbn/config-schema';
 import { asyncForEach } from '@kbn/std';
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 
+import { KibanaAssetReference } from '@kbn/fleet-plugin/common';
 import { packAssetSavedObjectType, packSavedObjectType } from '../../../common/types';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
-import { KibanaAssetReference } from '../../../../fleet/common';
 
 export const getAssetsStatusRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
   router.get(
diff --git a/x-pack/plugins/osquery/server/routes/asset/index.ts b/x-pack/plugins/osquery/server/routes/asset/index.ts
index d232d499f9bd0..72294d8cf4b5b 100644
--- a/x-pack/plugins/osquery/server/routes/asset/index.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { getAssetsStatusRoute } from './get_assets_status_route';
 import { updateAssetsRoute } from './update_assets_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
diff --git a/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts b/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
index f3c2261389718..a852d02d0115b 100644
--- a/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/update_assets_route.ts
@@ -11,13 +11,13 @@ import { schema } from '@kbn/config-schema';
 import { asyncForEach } from '@kbn/std';
 import deepmerge from 'deepmerge';
 
+import { IRouter } from '@kbn/core/server';
+import { KibanaAssetReference } from '@kbn/fleet-plugin/common';
 import { packAssetSavedObjectType, packSavedObjectType } from '../../../common/types';
 import { combineMerge } from './utils';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertSOQueriesToPack, convertPackQueriesToSO } from '../pack/utils';
-import { KibanaAssetReference } from '../../../../fleet/common';
 import { PackSavedObjectAttributes } from '../../common/types';
 
 export const updateAssetsRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/asset/utils.ts b/x-pack/plugins/osquery/server/routes/asset/utils.ts
index 4ad80c924920d..c1910bd09078e 100644
--- a/x-pack/plugins/osquery/server/routes/asset/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/asset/utils.ts
@@ -22,5 +22,6 @@ export const combineMerge = (target, source, options) => {
       destination.push(item);
     }
   });
+
   return destination;
 };
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts
index e2b11b21429e3..38642bc0bb770 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_details.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const getAgentDetailsRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts
index f190f9abfaf78..4dcaf33200dda 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policies.ts
@@ -13,9 +13,9 @@ import {
   GetAgentPoliciesResponseItem,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PackagePolicy,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { OSQUERY_INTEGRATION_NAME, PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
 
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts
index 9f2e523941bc2..3532f8352cd76 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_policy.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
 
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts
index 18fc42d725c10..52c35cfe669e1 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agent_status_for_agent_policy.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { GetAgentStatusResponse } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { GetAgentStatusResponse } from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const getAgentStatusForAgentPolicyRoute = (
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts
index 7f5c80cf48d61..c742e6abdde84 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_agents.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const getAgentsRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts
index 36d22abc1fd05..255b532558d69 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/get_package_policies.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
 
diff --git a/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts b/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts
index 1821e19da975e..394ca5bbcad72 100644
--- a/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts
+++ b/x-pack/plugins/osquery/server/routes/fleet_wrapper/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { getAgentPoliciesRoute } from './get_agent_policies';
 import { getAgentPolicyRoute } from './get_agent_policy';
diff --git a/x-pack/plugins/osquery/server/routes/index.ts b/x-pack/plugins/osquery/server/routes/index.ts
index 5eb35f2a444a8..f723fe9dbd9ae 100644
--- a/x-pack/plugins/osquery/server/routes/index.ts
+++ b/x-pack/plugins/osquery/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { initActionRoutes } from './action';
 import { OsqueryAppContext } from '../lib/osquery_app_context_services';
 import { initSavedQueryRoutes } from './saved_query';
diff --git a/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
index 69384619596a2..14158a4d5fb08 100644
--- a/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/create_pack_route.ts
@@ -13,8 +13,8 @@ import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PackagePolicy,
-} from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { PLUGIN_ID } from '../../../common';
@@ -135,9 +135,11 @@ export const createPackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                   if (!has(draft, 'inputs[0].streams')) {
                     set(draft, 'inputs[0].streams', []);
                   }
+
                   set(draft, `inputs[0].config.osquery.value.packs.${packSO.attributes.name}`, {
                     queries,
                   });
+
                   return draft;
                 })
               );
diff --git a/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts
index aa4496035f774..a32a0feac4784 100644
--- a/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/delete_pack_route.ts
@@ -8,11 +8,11 @@
 import { has, filter, unset } from 'lodash';
 import { produce } from 'immer';
 import { schema } from '@kbn/config-schema';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { PLUGIN_ID } from '../../../common';
 
-import { IRouter } from '../../../../../../src/core/server';
 import { packSavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
@@ -62,6 +62,7 @@ export const deletePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                 draft,
                 `inputs[0].config.osquery.value.packs.${[currentPackSO.attributes.name]}`
               );
+
               return draft;
             })
           )
diff --git a/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts
index 4f09ad1dcffbe..333a6a7cdeecf 100644
--- a/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/find_pack_route.ts
@@ -8,8 +8,8 @@
 import { filter, map } from 'lodash';
 import { schema } from '@kbn/config-schema';
 
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { packSavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { PLUGIN_ID } from '../../../common';
@@ -53,6 +53,7 @@ export const findPackRoute = (router: IRouter, osqueryContext: OsqueryAppContext
 
         // @ts-expect-error update types
         pack.policy_ids = policyIds;
+
         return pack;
       });
 
diff --git a/x-pack/plugins/osquery/server/routes/pack/index.ts b/x-pack/plugins/osquery/server/routes/pack/index.ts
index 7e7d338de2358..0af02dd9694f5 100644
--- a/x-pack/plugins/osquery/server/routes/pack/index.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 import { createPackRoute } from './create_pack_route';
diff --git a/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts
index a181b4c52a730..53845de3f48ab 100644
--- a/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/read_pack_route.ts
@@ -7,11 +7,11 @@
 
 import { filter, map } from 'lodash';
 import { schema } from '@kbn/config-schema';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 import { PackSavedObjectAttributes } from '../../common/types';
 import { PLUGIN_ID } from '../../../common';
 
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
 import { packSavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertSOQueriesToPack } from './utils';
diff --git a/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts b/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
index f04a0a37d0c5d..c37e7fb184b50 100644
--- a/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts
@@ -13,8 +13,8 @@ import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   PackagePolicy,
-} from '../../../../fleet/common';
-import { IRouter } from '../../../../../../src/core/server';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
 
 import { OSQUERY_INTEGRATION_NAME } from '../../../common';
 import { packSavedObjectType } from '../../../common/types';
@@ -192,6 +192,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                     if (!has(draft, 'inputs[0].streams')) {
                       set(draft, 'inputs[0].streams', []);
                     }
+
                     set(
                       draft,
                       `inputs[0].config.osquery.value.packs.${updatedPackSO.attributes.name}`,
@@ -199,6 +200,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                         queries: updatedPackSO.attributes.queries,
                       }
                     );
+
                     return draft;
                   })
                 );
@@ -221,6 +223,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                     draft,
                     `inputs[0].config.osquery.value.packs.${currentPackSO.attributes.name}`
                   );
+
                   return draft;
                 })
               );
@@ -248,6 +251,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                     draft,
                     `inputs[0].config.osquery.value.packs.${currentPackSO.attributes.name}`
                   );
+
                   return draft;
                 })
               );
@@ -280,6 +284,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                       queries: updatedPackSO.attributes.queries,
                     }
                   );
+
                   return draft;
                 })
               );
@@ -301,6 +306,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                   if (!(draft.inputs.length && draft.inputs[0].streams.length)) {
                     set(draft, 'inputs[0].streams', []);
                   }
+
                   set(
                     draft,
                     `inputs[0].config.osquery.value.packs.${updatedPackSO.attributes.name}`,
@@ -308,6 +314,7 @@ export const updatePackRoute = (router: IRouter, osqueryContext: OsqueryAppConte
                       queries: updatedPackSO.attributes.queries,
                     }
                   );
+
                   return draft;
                 })
               );
diff --git a/x-pack/plugins/osquery/server/routes/pack/utils.ts b/x-pack/plugins/osquery/server/routes/pack/utils.ts
index 004ba7c6d2700..9edb750263209 100644
--- a/x-pack/plugins/osquery/server/routes/pack/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/pack/utils.ts
@@ -19,6 +19,7 @@ export const convertPackQueriesToSO = (queries) =>
         ...pick(value, ['query', 'interval', 'platform', 'version']),
         ...(ecsMapping ? { ecs_mapping: ecsMapping } : {}),
       });
+
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -35,6 +36,7 @@ export const convertSOQueriesToPack = (queries) =>
         ...query,
         ecs_mapping: convertECSMappingToObject(ecs_mapping),
       };
+
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/plugins/osquery/server/routes/privileges_check/index.ts b/x-pack/plugins/osquery/server/routes/privileges_check/index.ts
index 8932b23b85f5a..d05b914ade03f 100644
--- a/x-pack/plugins/osquery/server/routes/privileges_check/index.ts
+++ b/x-pack/plugins/osquery/server/routes/privileges_check/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { privilegesCheckRoute } from './privileges_check_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
diff --git a/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts b/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts
index bbfdfc0ab044a..376f131f09b8e 100644
--- a/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts
+++ b/x-pack/plugins/osquery/server/routes/privileges_check/privileges_check_route.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { IRouter } from '@kbn/core/server';
 import { OSQUERY_INTEGRATION_NAME, PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
 export const privilegesCheckRoute = (router: IRouter, osqueryContext: OsqueryAppContext) => {
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
index 66c114012fd78..9a62ad3e2a380 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/create_saved_query_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty, pickBy } from 'lodash';
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
 import {
   createSavedQueryRequestSchema,
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts
index 6c36d965d2314..c8c08904a240b 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/delete_saved_query_route.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 
 export const deleteSavedQueryRoute = (router: IRouter) => {
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts
index e6ce8b0f768cc..cd1200a5d7778 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/find_saved_query_route.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 import { convertECSMappingToObject } from '../utils';
 
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/index.ts b/x-pack/plugins/osquery/server/routes/saved_query/index.ts
index 1a8c43599b261..e0bf4f622c42c 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/index.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 import { createSavedQueryRoute } from './create_saved_query_route';
 import { deleteSavedQueryRoute } from './delete_saved_query_route';
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts
index a84ec5a262a64..7887fdce22f0c 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/read_saved_query_route.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 import { convertECSMappingToObject } from '../utils';
 
diff --git a/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts b/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
index 7431050996deb..5ac4ad711c2a6 100644
--- a/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
+++ b/x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts
@@ -8,8 +8,8 @@
 import { filter } from 'lodash';
 import { schema } from '@kbn/config-schema';
 
+import { IRouter } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { savedQuerySavedObjectType } from '../../../common/types';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertECSMappingToArray, convertECSMappingToObject } from '../utils';
diff --git a/x-pack/plugins/osquery/server/routes/status/create_status_route.ts b/x-pack/plugins/osquery/server/routes/status/create_status_route.ts
index 871e112abc6c2..613ad6e7720af 100644
--- a/x-pack/plugins/osquery/server/routes/status/create_status_route.ts
+++ b/x-pack/plugins/osquery/server/routes/status/create_status_route.ts
@@ -8,13 +8,13 @@
 import { produce } from 'immer';
 import { satisfies } from 'semver';
 import { filter, reduce, mapKeys, each, set, unset, uniq, map, has } from 'lodash';
-import { packSavedObjectType } from '../../../common/types';
 import {
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   AGENT_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { IRouter } from '@kbn/core/server';
+import { packSavedObjectType } from '../../../common/types';
 import { PLUGIN_ID, OSQUERY_INTEGRATION_NAME } from '../../../common';
-import { IRouter } from '../../../../../../src/core/server';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 import { convertPackQueriesToSO } from '../pack/utils';
 import { getInternalSavedObjectsClient } from '../../usage/collector';
@@ -78,6 +78,7 @@ export const createStatusRoute = (router: IRouter, osqueryContext: OsqueryAppCon
                           const { id: queryId, ...query } = stream.compiled_stream;
                           queries[queryId] = query;
                         }
+
                         return queries;
                       },
                       {} as Record<string, unknown>
diff --git a/x-pack/plugins/osquery/server/routes/status/index.ts b/x-pack/plugins/osquery/server/routes/status/index.ts
index 9e85613165b16..4844547d369fe 100644
--- a/x-pack/plugins/osquery/server/routes/status/index.ts
+++ b/x-pack/plugins/osquery/server/routes/status/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { createStatusRoute } from './create_status_route';
 import { OsqueryAppContext } from '../../lib/osquery_app_context_services';
 
diff --git a/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts b/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts
index ae93f08d76bd5..97109a7211d9d 100644
--- a/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts
+++ b/x-pack/plugins/osquery/server/routes/usage/recorder.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { usageMetricSavedObjectType } from '../../../common/types';
 
@@ -82,6 +82,7 @@ describe('Usage metric recorder', () => {
           count: 0,
           errors: 0,
         };
+
         return acc;
       }, {} as { [key: string]: CounterValue });
       get.mockClear();
diff --git a/x-pack/plugins/osquery/server/routes/usage/recorder.ts b/x-pack/plugins/osquery/server/routes/usage/recorder.ts
index cd374b9020979..78e2fdf96c1d7 100644
--- a/x-pack/plugins/osquery/server/routes/usage/recorder.ts
+++ b/x-pack/plugins/osquery/server/routes/usage/recorder.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { usageMetricSavedObjectType } from '../../../common/types';
 import { LiveQuerySessionUsage } from '../../usage/types';
 
diff --git a/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts b/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts
index 603bcad87cf80..b149fa6d3e69f 100644
--- a/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts
+++ b/x-pack/plugins/osquery/server/routes/usage/saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { usageMetricSavedObjectType } from '../../../common/types';
 
diff --git a/x-pack/plugins/osquery/server/routes/utils.ts b/x-pack/plugins/osquery/server/routes/utils.ts
index 62464ec5d6336..c454cf9882d22 100644
--- a/x-pack/plugins/osquery/server/routes/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/utils.ts
@@ -22,6 +22,7 @@ export const convertECSMappingToObject = (
     ecsMapping,
     (acc, value) => {
       acc[value.key] = value.value;
+
       return acc;
     },
     {} as Record<string, { field?: string; value?: string }>
diff --git a/x-pack/plugins/osquery/server/saved_objects.ts b/x-pack/plugins/osquery/server/saved_objects.ts
index 3080c728a4d3c..4281d02c84339 100644
--- a/x-pack/plugins/osquery/server/saved_objects.ts
+++ b/x-pack/plugins/osquery/server/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 
 import { savedQueryType, packType, packAssetType } from './lib/saved_query/saved_object_mappings';
 import { usageMetricType } from './routes/usage/saved_object_mappings';
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts
index e05bd15bcc722..d66d71413b07d 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
   ActionsStrategyResponse,
@@ -21,6 +21,7 @@ export const allActions: OsqueryFactory<OsqueryQueries.actions> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildActionsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts
index 5162475529792..1f920d00a13b0 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/all/query.all_actions.dsl.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { AgentsRequestOptions } from '../../../../../../common/search_strategy';
 // import { createQueryFilterClauses } from '../../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts
index 057af159a5e3e..bdef6fb3bf868 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   ActionDetailsStrategyResponse,
   ActionDetailsRequestOptions,
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts
index 41f2875b1d4c8..3551493baca9c 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/details/query.action_details.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { ActionDetailsRequestOptions } from '../../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts
index 50fcf938bdd79..b7de47f60e5dd 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
   ActionResultsStrategyResponse,
@@ -22,6 +22,7 @@ export const actionResults: OsqueryFactory<OsqueryQueries.actionResults> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildActionResultsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
index 96d5ad60cd54c..47f4f814c45a3 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/actions/results/query.action_results.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { ActionResultsRequestOptions } from '../../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts
index 7e0532dfec1af..194d9eac5d697 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../common/constants';
 import {
   AgentsStrategyResponse,
@@ -23,6 +23,7 @@ export const allAgents: OsqueryFactory<OsqueryQueries.agents> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildAgentsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts
index 314de574f0a70..45e03f6f5da65 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/agents/query.all_agents.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ISearchRequestParams } from '../../../../../../../../src/plugins/data/common';
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { AgentsRequestOptions } from '../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts
index 93cba882e39ed..fa0bdd2899288 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../common/constants';
 import {
   ResultsStrategyResponse,
@@ -21,6 +21,7 @@ export const allResults: OsqueryFactory<OsqueryQueries.results> = {
     if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
+
     return buildResultsQuery(options);
   },
   parse: async (
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
index 59326d6c50155..c269789fd56a3 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/results/query.all_results.dsl.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../../../../common';
-import { ISearchRequestParams } from '../../../../../../../../src/plugins/data/common';
 import { ResultsRequestOptions } from '../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../common/utils/build_query';
 
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts
index ea03692bf7b01..2c241583e4aa8 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/factory/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  IEsSearchResponse,
-  ISearchRequestParams,
-} from '../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse, ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   FactoryQueryTypes,
   StrategyRequestType,
diff --git a/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts b/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
index 6242d91b7b94b..1b96296659092 100644
--- a/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
+++ b/x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
@@ -6,12 +6,8 @@
  */
 
 import { map, mergeMap } from 'rxjs/operators';
-import {
-  ISearchStrategy,
-  PluginStart,
-  shimHitsTotal,
-} from '../../../../../../src/plugins/data/server';
-import { ENHANCED_ES_SEARCH_STRATEGY } from '../../../../../../src/plugins/data/common';
+import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 import {
   FactoryQueryTypes,
   StrategyResponseType,
@@ -30,6 +26,7 @@ export const osquerySearchStrategyProvider = <T extends FactoryQueryTypes>(
       if (request.factoryQueryType == null) {
         throw new Error('factoryQueryType is required');
       }
+
       const queryFactory: OsqueryFactory<T> = osqueryFactory[request.factoryQueryType];
       const dsl = queryFactory.buildDsl(request);
 
diff --git a/x-pack/plugins/osquery/server/types.ts b/x-pack/plugins/osquery/server/types.ts
index b07958eaa0d6a..05679cb19c56e 100644
--- a/x-pack/plugins/osquery/server/types.ts
+++ b/x-pack/plugins/osquery/server/types.ts
@@ -5,20 +5,20 @@
  * 2.0.
  */
 
-import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
-import type { ActionsPlugin } from '../../actions/server';
+import type { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server';
+import type { ActionsPlugin } from '@kbn/actions-plugin/server';
 import type {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import type { FleetStartContract } from '../../fleet/server';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import type { PluginSetupContract } from '../../features/server';
-import type { SecurityPluginStart } from '../../security/server';
+} from '@kbn/data-plugin/server';
+import type { FleetStartContract } from '@kbn/fleet-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { PluginSetupContract } from '@kbn/features-plugin/server';
+import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   TaskManagerSetupContract as TaskManagerPluginSetup,
   TaskManagerStartContract as TaskManagerPluginStart,
-} from '../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface OsqueryPluginSetup {}
diff --git a/x-pack/plugins/osquery/server/usage/collector.ts b/x-pack/plugins/osquery/server/usage/collector.ts
index b04fc34e52453..c08776b2d7601 100644
--- a/x-pack/plugins/osquery/server/usage/collector.ts
+++ b/x-pack/plugins/osquery/server/usage/collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, SavedObjectsClient } from '../../../../../src/core/server';
-import { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
+import { CoreSetup, SavedObjectsClient } from '@kbn/core/server';
+import { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import { getBeatUsage, getLiveQueryUsage, getPolicyLevelUsage } from './fetchers';
 import { CollectorDependencies, usageSchema, UsageData } from './types';
 
@@ -15,6 +15,7 @@ export const getInternalSavedObjectsClient = async (
   getStartServices: CoreSetup['getStartServices']
 ) => {
   const [coreStart] = await getStartServices();
+
   return new SavedObjectsClient(coreStart.savedObjects.createInternalRepository());
 };
 
@@ -22,6 +23,7 @@ export const registerCollector: RegisterCollector = ({ core, osqueryContext, usa
   if (!usageCollection) {
     return;
   }
+
   const collector = usageCollection.makeUsageCollector<UsageData>({
     type: 'osquery',
     schema: usageSchema,
diff --git a/x-pack/plugins/osquery/server/usage/fetchers.ts b/x-pack/plugins/osquery/server/usage/fetchers.ts
index 8565d6ccf4289..737c0160166db 100644
--- a/x-pack/plugins/osquery/server/usage/fetchers.ts
+++ b/x-pack/plugins/osquery/server/usage/fetchers.ts
@@ -11,10 +11,14 @@ import {
   AggregationsRateAggregate,
   SearchResponse,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { PackagePolicyServiceInterface } from '../../../fleet/server';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import {
+  ListResult,
+  PackagePolicy,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+} from '@kbn/fleet-plugin/common';
 import { getRouteMetric } from '../routes/usage';
-import { ElasticsearchClient, SavedObjectsClientContract } from '../../../../../src/core/server';
-import { ListResult, PackagePolicy, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../fleet/common';
 import { OSQUERY_INTEGRATION_NAME } from '../../common';
 import { METRICS_INDICES } from './constants';
 import { AgentInfo, BeatMetricsUsage, LiveQueryUsage } from './types';
@@ -32,6 +36,7 @@ export async function getPolicyLevelUsage(
   if (!packagePolicyService) {
     return {};
   }
+
   const packagePolicies = await packagePolicyService.list(soClient, {
     kuery: `${PACKAGE_POLICY_SAVED_OBJECT_TYPE}.package.name:${OSQUERY_INTEGRATION_NAME}`,
     perPage: 10_000,
@@ -74,6 +79,7 @@ export async function getPolicyLevelUsage(
       enrolled: policied.doc_count,
     };
   }
+
   return result;
 }
 
@@ -82,6 +88,7 @@ export function getPackageVersions(packagePolicies: ListResult<PackagePolicy>) {
     if (item.package) {
       acc[item.package.version] = (acc[item.package.version] ?? 0) + 1;
     }
+
     return acc;
   }, {} as { [version: string]: number });
 }
@@ -101,6 +108,7 @@ export function getScheduledQueryUsage(packagePolicies: ListResult<PackagePolicy
       if (policyAgents === 0) {
         ++acc.queryGroups.empty;
       }
+
       return acc;
     },
     {
@@ -202,6 +210,7 @@ export function extractBeatUsageMetrics(
       }
     }
   }
+
   return result;
 }
 
diff --git a/x-pack/plugins/osquery/server/usage/types.ts b/x-pack/plugins/osquery/server/usage/types.ts
index 6ad7295438a1f..9da333599e785 100644
--- a/x-pack/plugins/osquery/server/usage/types.ts
+++ b/x-pack/plugins/osquery/server/usage/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { OsqueryAppContext } from '../lib/osquery_app_context_services';
-import { MakeSchemaFrom } from '../../../../../src/plugins/usage_collection/server';
 import { SetupPlugins } from '../types';
 
 export type CollectorDependencies = {
diff --git a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts
index 0d5b7ecfa94f0..6d1dceb482332 100644
--- a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts
+++ b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { RouteValidationResultFactory } from 'src/core/server';
+import { RouteValidationResultFactory } from '@kbn/core/server';
 
 import { buildRouteValidation, buildRouteValidationWithExcess } from './route_validation';
 
diff --git a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts
index a0c797193a0c3..7590bb7bbde05 100644
--- a/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts
+++ b/x-pack/plugins/osquery/server/utils/build_validation/route_validation.ts
@@ -13,7 +13,7 @@ import {
   RouteValidationFunction,
   RouteValidationResultFactory,
   RouteValidationError,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import { excess, GenericIntersectionC } from '../runtime_types';
 
 type RequestValidationResult<T> =
diff --git a/x-pack/plugins/osquery/server/utils/runtime_types.ts b/x-pack/plugins/osquery/server/utils/runtime_types.ts
index 492cbf07cdeb6..8bc781bfe3b14 100644
--- a/x-pack/plugins/osquery/server/utils/runtime_types.ts
+++ b/x-pack/plugins/osquery/server/utils/runtime_types.ts
@@ -45,14 +45,18 @@ const getProps = (
   if (codec == null) {
     return null;
   }
+
   switch (codec._tag) {
     case 'DictionaryType': {
       if (codec.codomain.props != null) {
         return codec.codomain.props;
       }
+
       const dTypes: rt.HasProps[] = codec.codomain.types;
+
       return dTypes.reduce<rt.Props>((props, type) => Object.assign(props, getProps(type)), {});
     }
+
     case 'RefinementType':
     case 'ReadonlyType':
       return getProps(codec.type);
@@ -62,11 +66,13 @@ const getProps = (
       return codec.props;
     case 'IntersectionType': {
       const iTypes = codec.types as rt.HasProps[];
+
       return iTypes.reduce<rt.Props>(
         (props, type) => Object.assign(props, getProps(type) as rt.Props),
         {} as rt.Props
       ) as rt.Props;
     }
+
     default:
       return null;
   }
@@ -84,6 +90,7 @@ const getExcessProps = (
     const childrenObject = r[k] as Record<string, unknown>;
     if (codecChildren != null && childrenProps != null && codecChildren._tag === 'DictionaryType') {
       const keys = Object.keys(childrenObject);
+
       return [
         ...acc,
         ...keys.reduce<string[]>(
@@ -92,11 +99,13 @@ const getExcessProps = (
         ),
       ];
     }
+
     if (codecChildren != null && childrenProps != null) {
       return [...acc, ...getExcessProps(childrenProps, childrenObject)];
     } else if (codecChildren == null) {
       return [...acc, k];
     }
+
     return acc;
   }, []);
 
@@ -115,6 +124,7 @@ export const excess = <
         if (codecProps == null) {
           return rt.failure(i, c, 'unknown codec');
         }
+
         const ex = getExcessProps(codecProps, s);
 
         return ex.length > 0
@@ -128,5 +138,6 @@ export const excess = <
     codec.encode,
     codecProps
   );
+
   return r as C;
 };
diff --git a/x-pack/plugins/painless_lab/common/constants.ts b/x-pack/plugins/painless_lab/common/constants.ts
index 932e7cde94ac9..b28cf4aa023de 100644
--- a/x-pack/plugins/painless_lab/common/constants.ts
+++ b/x-pack/plugins/painless_lab/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/painless_lab/public/application/components/editor.tsx b/x-pack/plugins/painless_lab/public/application/components/editor.tsx
index 6c4bd5da47911..06cf1a9fb46f9 100644
--- a/x-pack/plugins/painless_lab/public/application/components/editor.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/editor.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { PainlessLang, PainlessContext } from '@kbn/monaco';
 
-import { CodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 interface Props {
   code: string;
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
index a2f72ae0f8108..03384b6ae50c4 100644
--- a/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/context_tab.tsx
@@ -20,7 +20,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { PainlessContext } from '@kbn/monaco';
 
-import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { painlessContextOptions } from '../../constants';
 import { useAppContext } from '../../context';
 
diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
index c0233947ff064..ba6bc83367956 100644
--- a/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/parameters_tab.tsx
@@ -10,7 +10,7 @@ import { EuiFormRow, EuiSpacer, EuiIcon, EuiToolTip, EuiLink, EuiText } from '@e
 import { FormattedMessage } from '@kbn/i18n-react';
 import { monaco } from '@kbn/monaco';
 import { i18n } from '@kbn/i18n';
-import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { useAppContext } from '../../context';
 
diff --git a/x-pack/plugins/painless_lab/public/application/context/context.tsx b/x-pack/plugins/painless_lab/public/application/context/context.tsx
index a2e64f1d845f1..896d5ebda15f7 100644
--- a/x-pack/plugins/painless_lab/public/application/context/context.tsx
+++ b/x-pack/plugins/painless_lab/public/application/context/context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, ReactNode, useState, useContext } from 'react';
-import { HttpSetup, ChromeStart } from 'src/core/public';
+import { HttpSetup, ChromeStart } from '@kbn/core/public';
 
 import { Links } from '../../links';
 import { Store, Payload, Validation } from '../types';
diff --git a/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts b/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
index 11cde8ad03d57..733aa0f86035f 100644
--- a/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
+++ b/x-pack/plugins/painless_lab/public/application/hooks/use_submit_code.ts
@@ -6,7 +6,7 @@
  */
 
 import { useRef, useCallback, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { debounce } from 'lodash';
 
 import { API_BASE_PATH } from '../../../common/constants';
diff --git a/x-pack/plugins/painless_lab/public/application/index.tsx b/x-pack/plugins/painless_lab/public/application/index.tsx
index 81696c6f568bb..470982244c257 100644
--- a/x-pack/plugins/painless_lab/public/application/index.tsx
+++ b/x-pack/plugins/painless_lab/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreSetup, CoreStart, HttpSetup, ChromeStart, CoreTheme } from 'src/core/public';
+import { CoreSetup, CoreStart, HttpSetup, ChromeStart, CoreTheme } from '@kbn/core/public';
 
 import { createKibanaReactContext, KibanaThemeProvider } from '../shared_imports';
 
diff --git a/x-pack/plugins/painless_lab/public/links.ts b/x-pack/plugins/painless_lab/public/links.ts
index f8c4b55e521ec..254ac28594bac 100644
--- a/x-pack/plugins/painless_lab/public/links.ts
+++ b/x-pack/plugins/painless_lab/public/links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export type Links = ReturnType<typeof getLinks>;
 
diff --git a/x-pack/plugins/painless_lab/public/plugin.tsx b/x-pack/plugins/painless_lab/public/plugin.tsx
index 0a8499b2f5b7b..bf013bc1661f3 100644
--- a/x-pack/plugins/painless_lab/public/plugin.tsx
+++ b/x-pack/plugins/painless_lab/public/plugin.tsx
@@ -5,17 +5,15 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup } from 'src/core/public';
-
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import { Plugin, CoreSetup } from '@kbn/core/public';
 
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { PLUGIN } from '../common/constants';
 
 import { PluginDependencies } from './types';
 import { getLinks } from './links';
-import { ILicense } from '../../licensing/common/types';
 
 const checkLicenseStatus = (license: ILicense) => {
   const { state, message } = license.check(PLUGIN.id, PLUGIN.minimumLicenseType);
@@ -38,7 +36,7 @@ export class PainlessLabUIPlugin implements Plugin<void, void, PluginDependencie
       icon: 'empty',
       path: '/app/dev_tools#/painless_lab',
       showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
     });
 
     const devTool = devTools.register({
@@ -60,7 +58,7 @@ export class PainlessLabUIPlugin implements Plugin<void, void, PluginDependencie
           chrome,
         } = core;
 
-        const license = await licensing.license$.pipe(first()).toPromise();
+        const license = await firstValueFrom(licensing.license$);
         const licenseStatus = checkLicenseStatus(license);
 
         if (!licenseStatus.valid) {
diff --git a/x-pack/plugins/painless_lab/public/shared_imports.ts b/x-pack/plugins/painless_lab/public/shared_imports.ts
index 92e3b31f921ba..20a5ade3ca7c2 100644
--- a/x-pack/plugins/painless_lab/public/shared_imports.ts
+++ b/x-pack/plugins/painless_lab/public/shared_imports.ts
@@ -5,7 +5,4 @@
  * 2.0.
  */
 
-export {
-  createKibanaReactContext,
-  KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
+export { createKibanaReactContext, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/painless_lab/public/types.ts b/x-pack/plugins/painless_lab/public/types.ts
index c05093e64ec8a..afdc1e8c11b3d 100644
--- a/x-pack/plugins/painless_lab/public/types.ts
+++ b/x-pack/plugins/painless_lab/public/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { DevToolsSetup } from '../../../../src/plugins/dev_tools/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { DevToolsSetup } from '@kbn/dev-tools-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface PluginDependencies {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/painless_lab/server/index.ts b/x-pack/plugins/painless_lab/server/index.ts
index 3093ce7f04154..b94cccf8480cf 100644
--- a/x-pack/plugins/painless_lab/server/index.ts
+++ b/x-pack/plugins/painless_lab/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { PainlessLabServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => {
diff --git a/x-pack/plugins/painless_lab/server/plugin.ts b/x-pack/plugins/painless_lab/server/plugin.ts
index 996adfdc13f64..1d20ab1d13896 100644
--- a/x-pack/plugins/painless_lab/server/plugin.ts
+++ b/x-pack/plugins/painless_lab/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN } from '../common/constants';
 import { License } from './services';
diff --git a/x-pack/plugins/painless_lab/server/services/license.ts b/x-pack/plugins/painless_lab/server/services/license.ts
index 05878b170ff1d..5abedb2870fe4 100644
--- a/x-pack/plugins/painless_lab/server/services/license.ts
+++ b/x-pack/plugins/painless_lab/server/services/license.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
-import { LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/painless_lab/server/shared_imports.ts b/x-pack/plugins/painless_lab/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/painless_lab/server/shared_imports.ts
+++ b/x-pack/plugins/painless_lab/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/painless_lab/server/types.ts b/x-pack/plugins/painless_lab/server/types.ts
index b0e40c9f05257..bd4c7d94da0ae 100644
--- a/x-pack/plugins/painless_lab/server/types.ts
+++ b/x-pack/plugins/painless_lab/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { IRouter } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { License } from './services';
 
 export interface RouteDependencies {
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx b/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx
index 385815f3133db..2721cf0082493 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/add/remote_clusters_add.helpers.tsx
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { RemoteClusterAdd } from '../../../public/application/sections';
 import { createRemoteClustersStore } from '../../../public/application/store';
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx b/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx
index 87561ccd79c4d..798e26cd413d2 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/edit/remote_clusters_edit.helpers.tsx
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { RemoteClusterEdit } from '../../../public/application/sections';
 import { createRemoteClustersStore } from '../../../public/application/store';
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts
index 92b5e4ccbb1ce..c20cdf3f14660 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common/constants';
 import { Cluster } from '../../../common/lib';
 
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx
index 31eec97c83ff7..7502e14186bf3 100644
--- a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.tsx
@@ -6,16 +6,16 @@
  */
 
 import React from 'react';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   notificationServiceMock,
   fatalErrorsServiceMock,
   docLinksServiceMock,
   executionContextServiceMock,
-} from '../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/mocks';
 import { AppContextProvider } from '../../../public/application/app_context';
-import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
 
 import { init as initBreadcrumb } from '../../../public/application/services/breadcrumb';
 import { init as initHttp } from '../../../public/application/services/http';
diff --git a/x-pack/plugins/remote_clusters/common/constants.ts b/x-pack/plugins/remote_clusters/common/constants.ts
index fca751da37b90..c07d060fb4842 100644
--- a/x-pack/plugins/remote_clusters/common/constants.ts
+++ b/x-pack/plugins/remote_clusters/common/constants.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/app_context.tsx b/x-pack/plugins/remote_clusters/public/application/app_context.tsx
index 5f3bae6133dfd..49679657139aa 100644
--- a/x-pack/plugins/remote_clusters/public/application/app_context.tsx
+++ b/x-pack/plugins/remote_clusters/public/application/app_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { ExecutionContextStart } from 'kibana/public';
+import { ExecutionContextStart } from '@kbn/core/public';
 
 export interface Context {
   isCloudEnabled: boolean;
diff --git a/x-pack/plugins/remote_clusters/public/application/index.d.ts b/x-pack/plugins/remote_clusters/public/application/index.d.ts
index 9f8f80d46a507..26c0721e81b60 100644
--- a/x-pack/plugins/remote_clusters/public/application/index.d.ts
+++ b/x-pack/plugins/remote_clusters/public/application/index.d.ts
@@ -6,7 +6,7 @@
  */
 import { Observable } from 'rxjs';
 
-import { ScopedHistory, CoreTheme, ExecutionContextStart } from 'kibana/public';
+import { ScopedHistory, CoreTheme, ExecutionContextStart } from '@kbn/core/public';
 import { RegisterManagementAppArgs, I18nStart } from '../types';
 
 export declare const renderApp: (
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
index 60a837dce53fe..4e540d18f7fb8 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiButton, EuiCallOut, EuiEmptyPrompt, EuiPageContent, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, SectionLoading } from '../../../shared_imports';
 import { getRouter, redirect } from '../../services';
 import { setBreadcrumbs } from '../../services/breadcrumb';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
index 85cbf119c5302..e31df9c9fccee 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
@@ -31,7 +31,7 @@ import {
   EuiTextColor,
   EuiTitle,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { PROXY_MODE } from '../../../../../common/constants';
 import { ConfiguredByNodeWarning } from '../../components';
 import { ConnectionStatus, RemoveClusterButtonProvider } from '../components';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
index b4af79416c49e..96cdfc81abc6e 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
@@ -21,7 +21,7 @@ import {
 } from '@elastic/eui';
 
 import { remoteClustersUrl } from '../../services/documentation';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { extractQueryParams, SectionLoading } from '../../../shared_imports';
 import { setBreadcrumbs } from '../../services/breadcrumb';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
index b53c735ef9fbb..35c51268f71e8 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
@@ -20,7 +20,7 @@ import {
   EuiLink,
   EuiToolTip,
 } from '@elastic/eui';
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { UIM_SHOW_DETAILS_CLICK } from '../../../constants';
 import { PROXY_MODE } from '../../../../../common/constants';
 import { trackUiMetric, METRIC_TYPE, getRouter } from '../../../services';
diff --git a/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts b/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts
index 1f10478bf3543..75df621bc7fcd 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/api_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError } from 'kibana/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { toasts, fatalError } from './notification';
 
 interface CommonErrorBody {
diff --git a/x-pack/plugins/remote_clusters/public/application/services/documentation.ts b/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
index e17c3b2563b74..df6f570c14cca 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export let skippingDisconnectedClustersUrl: string;
 export let remoteClustersUrl: string;
diff --git a/x-pack/plugins/remote_clusters/public/application/services/http.ts b/x-pack/plugins/remote_clusters/public/application/services/http.ts
index c2273e827289e..21897029703c0 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/http.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup, HttpResponse } from 'kibana/public';
+import { HttpSetup, HttpResponse } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../common/constants';
 import { Cluster } from '../../../common/lib';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/services/notification.ts b/x-pack/plugins/remote_clusters/public/application/services/notification.ts
index 7ba0e22464c99..7038b365901ee 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/notification.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/notification.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { NotificationsSetup, FatalErrorsSetup } from 'src/core/public';
+import { NotificationsSetup, FatalErrorsSetup } from '@kbn/core/public';
 
 export let toasts: NotificationsSetup['toasts'];
 export let fatalError: FatalErrorsSetup;
diff --git a/x-pack/plugins/remote_clusters/public/application/services/redirect.ts b/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
index e339ebb2abaab..079eb1160528a 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 
 let navigateToApp: CoreStart['application']['navigateToApp'];
 
diff --git a/x-pack/plugins/remote_clusters/public/application/services/routing.ts b/x-pack/plugins/remote_clusters/public/application/services/routing.ts
index 636fe2616f8d3..25136cd3f73bc 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/routing.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/routing.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 /**
  * This file based on guidance from https://github.com/elastic/eui/blob/master/wiki/react-router.md
diff --git a/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
index 0d75613dec024..ac60c8bc3645d 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType, METRIC_TYPE } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { UIM_APP_NAME } from '../constants';
 
 export { METRIC_TYPE };
diff --git a/x-pack/plugins/remote_clusters/public/index.ts b/x-pack/plugins/remote_clusters/public/index.ts
index f2f50a8825e11..2ad0901c4b9b1 100644
--- a/x-pack/plugins/remote_clusters/public/index.ts
+++ b/x-pack/plugins/remote_clusters/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { RemoteClustersUIPlugin } from './plugin';
 
 export type { RemoteClustersPluginSetup } from './plugin';
diff --git a/x-pack/plugins/remote_clusters/public/locator.ts b/x-pack/plugins/remote_clusters/public/locator.ts
index c6ea66f4c4328..636cc619f06e1 100644
--- a/x-pack/plugins/remote_clusters/public/locator.ts
+++ b/x-pack/plugins/remote_clusters/public/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 
 export const REMOTE_CLUSTERS_LOCATOR_ID = 'REMOTE_CLUSTERS_LOCATOR';
 
diff --git a/x-pack/plugins/remote_clusters/public/plugin.ts b/x-pack/plugins/remote_clusters/public/plugin.ts
index c3d00bb0b2f48..aad03252191e2 100644
--- a/x-pack/plugins/remote_clusters/public/plugin.ts
+++ b/x-pack/plugins/remote_clusters/public/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, CoreStart, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, Plugin, CoreStart, PluginInitializerContext } from '@kbn/core/public';
 
 import { PLUGIN } from '../common/constants';
 import { init as initBreadcrumbs } from './application/services/breadcrumb';
diff --git a/x-pack/plugins/remote_clusters/public/shared_imports.ts b/x-pack/plugins/remote_clusters/public/shared_imports.ts
index 2cf69938d5464..130415a327bab 100644
--- a/x-pack/plugins/remote_clusters/public/shared_imports.ts
+++ b/x-pack/plugins/remote_clusters/public/shared_imports.ts
@@ -5,13 +5,6 @@
  * 2.0.
  */
 
-export {
-  extractQueryParams,
-  indices,
-  SectionLoading,
-} from '../../../../src/plugins/es_ui_shared/public';
+export { extractQueryParams, indices, SectionLoading } from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/remote_clusters/public/types.ts b/x-pack/plugins/remote_clusters/public/types.ts
index ad26e388c9fcd..30fe29e41ff64 100644
--- a/x-pack/plugins/remote_clusters/public/types.ts
+++ b/x-pack/plugins/remote_clusters/public/types.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ManagementSetup } from 'src/plugins/management/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { RegisterManagementAppArgs } from 'src/plugins/management/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import { I18nStart } from 'kibana/public';
-import { CloudSetup } from '../../cloud/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { I18nStart } from '@kbn/core/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
 
 export interface Dependencies {
   management: ManagementSetup;
diff --git a/x-pack/plugins/remote_clusters/server/config.ts b/x-pack/plugins/remote_clusters/server/config.ts
index 5b4972f0a5259..32db006e8171a 100644
--- a/x-pack/plugins/remote_clusters/server/config.ts
+++ b/x-pack/plugins/remote_clusters/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/remote_clusters/server/index.ts b/x-pack/plugins/remote_clusters/server/index.ts
index 9447f9d9209e3..8325b869b150d 100644
--- a/x-pack/plugins/remote_clusters/server/index.ts
+++ b/x-pack/plugins/remote_clusters/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { RemoteClustersServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts b/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts
index 2723d3bf6badd..4655ed78a1f1d 100644
--- a/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts
+++ b/x-pack/plugins/remote_clusters/server/lib/does_cluster_exist.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 
 export async function doesClusterExist(
   clusterClient: IScopedClusterClient,
diff --git a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts
index 4cd49771f052e..602b9ae075d8b 100644
--- a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts
+++ b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.test.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
-import { licensePreRoutingFactory } from '../license_pre_routing_factory';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { licensePreRoutingFactory } from '.';
 import { LicenseStatus } from '../../types';
 
 describe('licensePreRoutingFactory()', () => {
diff --git a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
index 994805762f664..30b6aaf0901e0 100644
--- a/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
+++ b/x-pack/plugins/remote_clusters/server/lib/license_pre_routing_factory/license_pre_routing_factory.ts
@@ -10,7 +10,7 @@ import {
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { RouteDependencies } from '../../types';
 
 export const licensePreRoutingFactory = (
diff --git a/x-pack/plugins/remote_clusters/server/plugin.ts b/x-pack/plugins/remote_clusters/server/plugin.ts
index fde71677b8448..1e34a650cfd2b 100644
--- a/x-pack/plugins/remote_clusters/server/plugin.ts
+++ b/x-pack/plugins/remote_clusters/server/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN } from '../common/constants';
 import { Dependencies, LicenseStatus, RouteDependencies } from './types';
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
index fffddbd8e56c1..3fe04be97abfc 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
index 915af70f7ffd5..85e8193a0eb2e 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
 import { serializeCluster, Cluster } from '../../../common/lib';
 import { doesClusterExist } from '../../lib/does_cluster_exist';
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
index 7b9b6fae0f66e..0dc48d82cdb09 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory, RequestHandler } from '../../../../../../src/core/server';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 import { register } from './delete_route';
 import { API_BASE_PATH } from '../../../common/constants';
 
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
 import { handleEsError } from '../../shared_imports';
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
index bb2bd4a073245..9d24efc1a554c 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
 import { RouteDependencies } from '../../types';
 import { serializeCluster } from '../../../common/lib';
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
index 8fbbb33415fda..9bb877b8bff1b 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
@@ -7,12 +7,12 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
index 3e0d5846387b1..7b12ad8d4418c 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 import { deserializeCluster } from '../../../common/lib';
 import { API_BASE_PATH } from '../../../common/constants';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/types.ts b/x-pack/plugins/remote_clusters/server/routes/api/types.ts
index 5a2fd20ba4d35..95778390bfc8d 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/types.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 export type ScopedClusterClientMock = ReturnType<
   typeof elasticsearchServiceMock.createScopedClusterClient
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
index 89ab33da0ad94..65939be965c15 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { RequestHandler } from 'src/core/server';
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
+import { RequestHandler } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
-import { httpServerMock, httpServiceMock, coreMock } from '../../../../../../src/core/server/mocks';
+import { httpServerMock, httpServiceMock, coreMock } from '@kbn/core/server/mocks';
 
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
index d4547b135ed1d..db9b3184ac1e7 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { RequestHandler } from 'src/core/server';
+import { RequestHandler } from '@kbn/core/server';
 
 import { API_BASE_PATH, SNIFF_MODE, PROXY_MODE } from '../../../common/constants';
 import { serializeCluster, deserializeCluster, Cluster, ClusterInfoEs } from '../../../common/lib';
diff --git a/x-pack/plugins/remote_clusters/server/shared_imports.ts b/x-pack/plugins/remote_clusters/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/remote_clusters/server/shared_imports.ts
+++ b/x-pack/plugins/remote_clusters/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/remote_clusters/server/types.ts b/x-pack/plugins/remote_clusters/server/types.ts
index 89d1ebfb5cf4e..8c1711e189c34 100644
--- a/x-pack/plugins/remote_clusters/server/types.ts
+++ b/x-pack/plugins/remote_clusters/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { CloudSetup } from '../../cloud/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 
 import { handleEsError } from './shared_imports';
 
diff --git a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts
index 5f2082d413778..f846bb2c7bb91 100644
--- a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts
+++ b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { mapToReportingError } from './map_to_reporting_error';
-import { errors } from '../../../screenshotting/common';
+import { errors } from '@kbn/screenshotting-plugin/common';
 import {
   UnknownError,
   BrowserCouldNotLaunchError,
diff --git a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts
index 0e38890817140..eafd4ed683627 100644
--- a/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts
+++ b/x-pack/plugins/reporting/common/errors/map_to_reporting_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { errors } from '../../../screenshotting/common';
+import { errors } from '@kbn/screenshotting-plugin/common';
 import {
   UnknownError,
   ReportingError,
diff --git a/x-pack/plugins/reporting/common/test/fixtures.ts b/x-pack/plugins/reporting/common/test/fixtures.ts
index 5cc6cf274c340..f3ad13e7eb5a8 100644
--- a/x-pack/plugins/reporting/common/test/fixtures.ts
+++ b/x-pack/plugins/reporting/common/test/fixtures.ts
@@ -84,7 +84,7 @@ export const mockJobs: ReportApiJSON[] = [
       content_type: 'application/pdf',
       size: 49468,
       warnings: [
-        'An error occurred when trying to read the page for visualization panel info. You may need to increase \'xpack.reporting.capture.timeouts.waitForElements\'. TimeoutError: waiting for selector "[data-shared-item],[data-shared-items-count]" failed: timeout 30000ms exceeded',
+        'An error occurred when trying to read the page for visualization panel info. You may need to increase \'xpack.screenshotting.capture.timeouts.waitForElements\'. TimeoutError: waiting for selector "[data-shared-item],[data-shared-items-count]" failed: timeout 30000ms exceeded',
       ],
     },
     payload: {
diff --git a/x-pack/plugins/reporting/common/types/base.ts b/x-pack/plugins/reporting/common/types/base.ts
index 6d5e6c1479da0..5f5a6f360c2a4 100644
--- a/x-pack/plugins/reporting/common/types/base.ts
+++ b/x-pack/plugins/reporting/common/types/base.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Ensure, SerializableRecord } from '@kbn/utility-types';
-import type { LayoutParams } from '../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import { LocatorParams } from './url';
 
 export type JobId = string;
diff --git a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts
index 7138958316a6a..9943deb642e88 100644
--- a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsCSV {
diff --git a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts
index 3d89051fd82e4..b7954f3b936d8 100644
--- a/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/csv_searchsource_immediate.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface FakeRequest {
   headers: Record<string, string>;
diff --git a/x-pack/plugins/reporting/common/types/export_types/png.ts b/x-pack/plugins/reporting/common/types/export_types/png.ts
index 635de9823c8b3..4a5367c754f4c 100644
--- a/x-pack/plugins/reporting/common/types/export_types/png.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/png.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LayoutParams } from '../../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsPNG {
diff --git a/x-pack/plugins/reporting/common/types/export_types/png_v2.ts b/x-pack/plugins/reporting/common/types/export_types/png_v2.ts
index 1469437fe6199..ff3ff5a692edb 100644
--- a/x-pack/plugins/reporting/common/types/export_types/png_v2.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/png_v2.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { LocatorParams } from '../url';
-import type { LayoutParams } from '../../../../screenshotting/common';
 import type { BaseParams, BasePayload } from '../base';
 
 // Job params: structure of incoming user request data
diff --git a/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts b/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts
index e22b45f021b9e..240cc778b269d 100644
--- a/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/printable_pdf.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LayoutParams } from '../../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsPDF {
diff --git a/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts b/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts
index b3fbbc1653dfb..58462b84c5eec 100644
--- a/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts
+++ b/x-pack/plugins/reporting/common/types/export_types/printable_pdf_v2.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { LocatorParams } from '../url';
-import type { LayoutParams } from '../../../../screenshotting/common';
 import type { BaseParams, BasePayload } from '../base';
 
 interface BaseParamsPDFV2 {
diff --git a/x-pack/plugins/reporting/common/types/index.ts b/x-pack/plugins/reporting/common/types/index.ts
index 88496a0182929..8b95fdb54b1e0 100644
--- a/x-pack/plugins/reporting/common/types/index.ts
+++ b/x-pack/plugins/reporting/common/types/index.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { PdfScreenshotResult, PngScreenshotResult } from '../../../screenshotting/server';
+import type { PdfScreenshotResult, PngScreenshotResult } from '@kbn/screenshotting-plugin/server';
 import type { BaseParams, BaseParamsV2, BasePayload, BasePayloadV2, JobId } from './base';
 
 export type { JobParamsPNGDeprecated } from './export_types/png';
diff --git a/x-pack/plugins/reporting/public/index.ts b/x-pack/plugins/reporting/public/index.ts
index 1026a718b95ea..87938f646e7ce 100644
--- a/x-pack/plugins/reporting/public/index.ts
+++ b/x-pack/plugins/reporting/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializerContext } from '@kbn/core/public';
 import { ReportingPublicPlugin } from './plugin';
 import type { ReportingPublicComponents } from './shared/get_shared_components';
 
diff --git a/x-pack/plugins/reporting/public/lib/license_check.ts b/x-pack/plugins/reporting/public/lib/license_check.ts
index 2b844eac2c1b7..80ecaefe8a853 100644
--- a/x-pack/plugins/reporting/public/lib/license_check.ts
+++ b/x-pack/plugins/reporting/public/lib/license_check.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseCheck } from '../../../licensing/public';
+import { LicenseCheck } from '@kbn/licensing-plugin/public';
 import { LicenseCheckResults } from '../../common/types';
 
 export const checkLicense = (checkResults: LicenseCheck): LicenseCheckResults => {
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx b/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx
index d53c69ae22e7f..326c89d97d366 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/context.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup } from 'src/core/public';
+import type { HttpSetup } from '@kbn/core/public';
 import type { FunctionComponent } from 'react';
 import React, { createContext, useContext } from 'react';
 
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts
index e477f00f307d9..3a0086e642f56 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.test.ts
@@ -8,8 +8,8 @@
 jest.mock('moment', () => ({ tz: { guess: jest.fn() } }));
 
 import { tz } from 'moment';
-import { HttpSetup, IUiSettingsClient } from 'src/core/public';
-import { httpServiceMock, uiSettingsServiceMock } from 'src/core/public/mocks';
+import { HttpSetup, IUiSettingsClient } from '@kbn/core/public';
+import { httpServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { Job } from '../job';
 import { ReportingAPIClient } from './reporting_api_client';
 
diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
index d76f06e00586f..b217332856c21 100644
--- a/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
+++ b/x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
@@ -8,8 +8,8 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { stringify } from 'query-string';
 import rison from 'rison-node';
-import type { HttpFetchQuery } from 'src/core/public';
-import { HttpSetup, IUiSettingsClient } from 'src/core/public';
+import type { HttpFetchQuery } from '@kbn/core/public';
+import { HttpSetup, IUiSettingsClient } from '@kbn/core/public';
 import { buildKibanaPath } from '../../../common/build_kibana_path';
 import {
   API_BASE_GENERATE,
diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
index 4863a9f7e1e36..895266bdd568b 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
@@ -6,8 +6,8 @@
  */
 
 import sinon, { stub } from 'sinon';
-import { NotificationsStart } from 'src/core/public';
-import { coreMock, themeServiceMock } from '../../../../../src/core/public/mocks';
+import { NotificationsStart } from '@kbn/core/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { JobSummary, ReportApiJSON } from '../../common/types';
 import { Job } from './job';
 import { ReportingAPIClient } from './reporting_api_client';
diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.ts b/x-pack/plugins/reporting/public/lib/stream_handler.ts
index 80932f8ddeeee..2ff8b8bd4ebda 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import * as Rx from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
-import { NotificationsSetup, ThemeServiceStart } from 'src/core/public';
+import { NotificationsSetup, ThemeServiceStart } from '@kbn/core/public';
 import { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY, JOB_STATUSES } from '../../common/constants';
 import { JobId, JobSummary, JobSummarySet } from '../../common/types';
 import {
diff --git a/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx b/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
index 3200a3305ebcd..94828369d5148 100644
--- a/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
+++ b/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
@@ -11,16 +11,16 @@ import { act } from 'react-dom/test-utils';
 import { Observable } from 'rxjs';
 import { SerializableRecord } from '@kbn/utility-types';
 
-import type { NotificationsSetup } from '../../../../../../src/core/public';
+import type { NotificationsSetup } from '@kbn/core/public';
 import {
   applicationServiceMock,
   httpServiceMock,
   notificationServiceMock,
   coreMock,
-} from '../../../../../../src/core/public/mocks';
-import type { LocatorPublic, SharePluginSetup } from '../../../../../../src/plugins/share/public';
+} from '@kbn/core/public/mocks';
+import type { LocatorPublic, SharePluginSetup } from '@kbn/share-plugin/public';
 
-import type { ILicense } from '../../../../licensing/public';
+import type { ILicense } from '@kbn/licensing-plugin/public';
 
 import { mockJobs } from '../../../common/test';
 
@@ -30,7 +30,7 @@ import { IlmPolicyStatusContextProvider } from '../../lib/ilm_policy_status_cont
 import { InternalApiClientProvider, ReportingAPIClient } from '../../lib/reporting_api_client';
 import { Job } from '../../lib/job';
 
-import { ListingProps as Props, ReportListing } from '../';
+import { ListingProps as Props, ReportListing } from '..';
 
 export interface TestDependencies {
   http: ReturnType<typeof httpServiceMock.createSetupContract>;
diff --git a/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx b/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx
index 3fdc83c341ed9..092f33d06215c 100644
--- a/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx
+++ b/x-pack/plugins/reporting/public/management/components/ilm_policy_link.tsx
@@ -9,7 +9,7 @@ import type { FunctionComponent } from 'react';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty } from '@elastic/eui';
-import type { ApplicationStart } from 'src/core/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 import { ILM_POLICY_NAME } from '../../../common/constants';
 import { LocatorPublic, SerializableRecord } from '../../shared_imports';
diff --git a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx
index 9e41a47de8b58..a1b0dbcd24c30 100644
--- a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx
+++ b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/ilm_policy_migration_needed_callout.tsx
@@ -12,7 +12,7 @@ import React, { useState } from 'react';
 import useMountedState from 'react-use/lib/useMountedState';
 import { EuiCallOut, EuiButton, EuiCode } from '@elastic/eui';
 
-import type { NotificationsSetup } from 'src/core/public';
+import type { NotificationsSetup } from '@kbn/core/public';
 
 import { ILM_POLICY_NAME } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx
index 0c2359acdb679..43c617b2ba972 100644
--- a/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx
+++ b/x-pack/plugins/reporting/public/management/components/migrate_ilm_policy_callout/index.tsx
@@ -9,7 +9,7 @@ import type { FunctionComponent } from 'react';
 import React from 'react';
 import { EuiSpacer, EuiFlexItem } from '@elastic/eui';
 
-import { NotificationsSetup } from 'src/core/public';
+import { NotificationsSetup } from '@kbn/core/public';
 
 import { useIlmPolicyStatus } from '../../../lib/ilm_policy_status_context';
 
diff --git a/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx b/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx
index d91560ddd86f5..2ba476982ce5e 100644
--- a/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx
+++ b/x-pack/plugins/reporting/public/management/components/report_delete_button.tsx
@@ -9,7 +9,7 @@ import { EuiButton, EuiConfirmModal } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment, PureComponent } from 'react';
 import { Job } from '../../lib/job';
-import { ListingProps } from '../';
+import { ListingProps } from '..';
 
 type DeleteFn = () => Promise<void>;
 type Props = { jobsToDelete: Job[]; performDelete: DeleteFn } & ListingProps;
diff --git a/x-pack/plugins/reporting/public/management/index.ts b/x-pack/plugins/reporting/public/management/index.ts
index 491e2df445d32..fa9f1fd00cbce 100644
--- a/x-pack/plugins/reporting/public/management/index.ts
+++ b/x-pack/plugins/reporting/public/management/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ApplicationStart, ToastsSetup } from 'src/core/public';
-import { LicensingPluginStart } from '../../../licensing/public';
+import { ApplicationStart, ToastsSetup } from '@kbn/core/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { UseIlmPolicyStatusReturn } from '../lib/ilm_policy_status_context';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
 import { ClientConfigType } from '../plugin';
diff --git a/x-pack/plugins/reporting/public/management/mount_management_section.tsx b/x-pack/plugins/reporting/public/management/mount_management_section.tsx
index 6d888c6071a78..9e709f317b7f0 100644
--- a/x-pack/plugins/reporting/public/management/mount_management_section.tsx
+++ b/x-pack/plugins/reporting/public/management/mount_management_section.tsx
@@ -9,8 +9,8 @@ import { I18nProvider } from '@kbn/i18n-react';
 import * as React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { CoreSetup, CoreStart } from 'src/core/public';
-import { ILicense } from '../../../licensing/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { ReportingAPIClient, InternalApiClientProvider } from '../lib/reporting_api_client';
 import { IlmPolicyStatusContextProvider } from '../lib/ilm_policy_status_context';
 import { ClientConfigType } from '../plugin';
diff --git a/x-pack/plugins/reporting/public/management/report_listing.test.ts b/x-pack/plugins/reporting/public/management/report_listing.test.ts
index ee15e881db62a..2a43ae4fdb0c9 100644
--- a/x-pack/plugins/reporting/public/management/report_listing.test.ts
+++ b/x-pack/plugins/reporting/public/management/report_listing.test.ts
@@ -8,7 +8,7 @@
 import type { Observable } from 'rxjs';
 import { act } from 'react-dom/test-utils';
 
-import type { ILicense } from '../../../licensing/public';
+import type { ILicense } from '@kbn/licensing-plugin/public';
 import type { IlmPolicyMigrationStatus } from '../../common/types';
 
 import { ListingProps as Props } from '.';
diff --git a/x-pack/plugins/reporting/public/management/report_listing.tsx b/x-pack/plugins/reporting/public/management/report_listing.tsx
index b289f0894a9ff..338fe6fdc37ba 100644
--- a/x-pack/plugins/reporting/public/management/report_listing.tsx
+++ b/x-pack/plugins/reporting/public/management/report_listing.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Component, default as React, Fragment } from 'react';
 import { Subscription } from 'rxjs';
-import { ILicense } from '../../../licensing/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { REPORT_TABLE_ID, REPORT_TABLE_ROW_ID } from '../../common/constants';
 import { prettyPrintJobType } from '../../common/job_utils';
 import { Poller } from '../../common/poller';
@@ -30,7 +30,7 @@ import { Job } from '../lib/job';
 import { checkLicense } from '../lib/license_check';
 import { useInternalApiClient } from '../lib/reporting_api_client';
 import { useKibana } from '../shared_imports';
-import { ListingProps as Props } from './';
+import { ListingProps as Props } from '.';
 import {
   IlmPolicyLink,
   MigrateIlmPolicyCallOut,
diff --git a/x-pack/plugins/reporting/public/mocks.ts b/x-pack/plugins/reporting/public/mocks.ts
index 83806455cbfd4..894fb68a86c69 100644
--- a/x-pack/plugins/reporting/public/mocks.ts
+++ b/x-pack/plugins/reporting/public/mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ReportingAPIClient } from './lib/reporting_api_client';
 import { ReportingSetup } from '.';
 import { getSharedComponents } from './shared';
diff --git a/x-pack/plugins/reporting/public/notifier/general_error.tsx b/x-pack/plugins/reporting/public/notifier/general_error.tsx
index 4a66be603300f..35907886abcc2 100644
--- a/x-pack/plugins/reporting/public/notifier/general_error.tsx
+++ b/x-pack/plugins/reporting/public/notifier/general_error.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 export const getGeneralErrorToast = (
   errorText: string,
diff --git a/x-pack/plugins/reporting/public/notifier/job_failure.tsx b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
index fff496a90cf64..e653c974861ab 100644
--- a/x-pack/plugins/reporting/public/notifier/job_failure.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_failure.tsx
@@ -9,8 +9,8 @@ import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import type { JobSummary, ManagementLinkFn } from '../../common/types';
 
 export const getFailureToast = (
diff --git a/x-pack/plugins/reporting/public/notifier/job_success.tsx b/x-pack/plugins/reporting/public/notifier/job_success.tsx
index b5ff57b1c21cc..44389e164472a 100644
--- a/x-pack/plugins/reporting/public/notifier/job_success.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_success.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/notifier/job_warning.tsx b/x-pack/plugins/reporting/public/notifier/job_warning.tsx
index 463bbd964273f..9df5bbbc913e2 100644
--- a/x-pack/plugins/reporting/public/notifier/job_warning.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_warning.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx b/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
index 8fcf0144006dc..314610b9b9f29 100644
--- a/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_warning_formulas.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx b/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
index ccc133249505a..41d97ae4d7f3e 100644
--- a/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
+++ b/x-pack/plugins/reporting/public/notifier/job_warning_max_size.tsx
@@ -7,8 +7,8 @@
 
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { ThemeServiceStart, ToastInput } from 'src/core/public';
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
+import { ThemeServiceStart, ToastInput } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { JobId, JobSummary } from '../../common/types';
 import { DownloadButton } from './job_download_button';
 import { ReportLink } from './report_link';
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
index 1ca76de5439f9..5829481b6033f 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
@@ -7,13 +7,13 @@
 
 import * as Rx from 'rxjs';
 import { first } from 'rxjs/operators';
-import { CoreStart } from 'src/core/public';
-import type { SearchSource } from 'src/plugins/data/common';
-import type { SavedSearch } from 'src/plugins/discover/public';
-import { LicenseCheckState } from '../../../licensing/public';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import type { SearchSource } from '@kbn/data-plugin/common';
+import type { SavedSearch } from '@kbn/discover-plugin/public';
+import { LicenseCheckState } from '@kbn/licensing-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
 import type { ReportingPublicPluginStartDendencies } from '../plugin';
 import type { ActionContext } from './get_csv_panel_action';
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
index 255fb91946a13..7685b3d0924b7 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
@@ -7,18 +7,14 @@
 
 import { i18n } from '@kbn/i18n';
 import * as Rx from 'rxjs';
-import { first } from 'rxjs/operators';
-import type { CoreSetup, NotificationsSetup } from 'src/core/public';
-import { CoreStart } from 'src/core/public';
-import type { ISearchEmbeddable, SavedSearch } from '../../../../../src/plugins/discover/public';
-import {
-  loadSharingDataHelpers,
-  SEARCH_EMBEDDABLE_TYPE,
-} from '../../../../../src/plugins/discover/public';
-import type { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { ViewMode } from '../../../../../src/plugins/embeddable/public';
-import type { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
-import { IncompatibleActionError } from '../../../../../src/plugins/ui_actions/public';
+import type { CoreSetup, NotificationsSetup } from '@kbn/core/public';
+import { CoreStart } from '@kbn/core/public';
+import type { ISearchEmbeddable, SavedSearch } from '@kbn/discover-plugin/public';
+import { loadSharingDataHelpers, SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-plugin/public';
+import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import type { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
 import { CSV_REPORTING_ACTION } from '../../common/constants';
 import { checkLicense } from '../lib/license_check';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
@@ -73,7 +69,7 @@ export class ReportingCsvPanelAction implements ActionDefinition<ActionContext>
   }
 
   public async getSearchSource(savedSearch: SavedSearch, _embeddable: ISearchEmbeddable) {
-    const [{ uiSettings }, { data }] = await this.startServices$.pipe(first()).toPromise();
+    const [{ uiSettings }, { data }] = await Rx.firstValueFrom(this.startServices$);
     const { getSharingData } = await loadSharingDataHelpers();
     return await getSharingData(savedSearch.searchSource, savedSearch, { uiSettings, data });
   }
diff --git a/x-pack/plugins/reporting/public/plugin.ts b/x-pack/plugins/reporting/public/plugin.ts
index 39edef1cb6b0d..252745c0cec1f 100644
--- a/x-pack/plugins/reporting/public/plugin.ts
+++ b/x-pack/plugins/reporting/public/plugin.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import * as Rx from 'rxjs';
 import { catchError, filter, map, mergeMap, takeUntil } from 'rxjs/operators';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   CoreSetup,
   CoreStart,
@@ -18,19 +18,15 @@ import {
   Plugin,
   PluginInitializerContext,
   ThemeServiceStart,
-} from 'src/core/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
-import { CONTEXT_MENU_TRIGGER } from '../../../../src/plugins/embeddable/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-  HomePublicPluginStart,
-} from '../../../../src/plugins/home/public';
-import { ManagementSetup, ManagementStart } from '../../../../src/plugins/management/public';
-import { LicensingPluginStart } from '../../licensing/public';
+} from '@kbn/core/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
+import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
+import { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { durationToNumber } from '../common/schema_utils';
 import { JobId, JobSummarySet } from '../common/types';
-import { ReportingSetup, ReportingStart } from './';
+import { ReportingSetup, ReportingStart } from '.';
 import { ReportingAPIClient } from './lib/reporting_api_client';
 import { ReportingNotifierStreamHandler as StreamHandler } from './lib/stream_handler';
 import { getGeneralErrorToast } from './notifier';
@@ -107,7 +103,7 @@ export class ReportingPublicPlugin
 {
   private kibanaVersion: string;
   private apiClient?: ReportingAPIClient;
-  private readonly stop$ = new Rx.ReplaySubject(1);
+  private readonly stop$ = new Rx.ReplaySubject<void>(1);
   private readonly title = i18n.translate('xpack.reporting.management.reportingTitle', {
     defaultMessage: 'Reporting',
   });
@@ -170,7 +166,7 @@ export class ReportingPublicPlugin
       icon: 'reportingApp',
       path: '/app/management/insightsAndAlerting/reporting',
       showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
     });
 
     management.sections.section.insightsAndAlerting.registerApp({
diff --git a/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx b/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx
index 20a6ee4eebac0..5ddbff5af0b93 100644
--- a/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx
+++ b/x-pack/plugins/reporting/public/redirect/mount_redirect_app.tsx
@@ -9,8 +9,8 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import React from 'react';
 import { EuiErrorBoundary } from '@elastic/eui';
 
-import type { AppMountParameters } from 'kibana/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { AppMountParameters } from '@kbn/core/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 import type { SharePluginSetup } from '../shared_imports';
 import type { ReportingAPIClient } from '../lib/reporting_api_client';
 
diff --git a/x-pack/plugins/reporting/public/redirect/redirect_app.tsx b/x-pack/plugins/reporting/public/redirect/redirect_app.tsx
index 31b5f2fa454de..c7ce0b8d5b24f 100644
--- a/x-pack/plugins/reporting/public/redirect/redirect_app.tsx
+++ b/x-pack/plugins/reporting/public/redirect/redirect_app.tsx
@@ -11,8 +11,8 @@ import { parse } from 'query-string';
 import { i18n } from '@kbn/i18n';
 import { EuiCallOut, EuiCodeBlock } from '@elastic/eui';
 
-import type { ScopedHistory } from 'src/core/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScopedHistory } from '@kbn/core/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
 import { REPORTING_REDIRECT_LOCATOR_STORE_KEY } from '../../common/constants';
 import { LocatorParams } from '../../common/types';
diff --git a/x-pack/plugins/reporting/public/share_context_menu/index.ts b/x-pack/plugins/reporting/public/share_context_menu/index.ts
index 1a16804411c44..1d3760edd2625 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/index.ts
+++ b/x-pack/plugins/reporting/public/share_context_menu/index.ts
@@ -10,9 +10,9 @@ import type {
   IUiSettingsClient,
   ThemeServiceSetup,
   ToastsSetup,
-} from 'src/core/public';
-import { ILicense } from '../../../licensing/public';
-import type { LayoutParams } from '../../../screenshotting/common';
+} from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import type { ReportingAPIClient } from '../lib/reporting_api_client';
 
 export interface ExportPanelShareOpts {
diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
index 23ecb01eddcf9..eada57161e3a3 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx
@@ -7,11 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import type { SearchSourceFields } from 'src/plugins/data/common';
-import { ShareContext, ShareMenuProvider } from 'src/plugins/share/public';
+import type { SearchSourceFields } from '@kbn/data-plugin/common';
+import { ShareContext, ShareMenuProvider } from '@kbn/share-plugin/public';
 import { CSV_JOB_TYPE } from '../../common/constants';
 import { checkLicense } from '../lib/license_check';
-import { ExportPanelShareOpts } from './';
+import { ExportPanelShareOpts } from '.';
 import { ReportingPanelContent } from './reporting_panel_content_lazy';
 
 export const reportingCsvShareProvider = ({
diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
index b898a93c28880..8ea26a6964be6 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx
@@ -7,11 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { ShareContext, ShareMenuProvider } from 'src/plugins/share/public';
+import { ShareContext, ShareMenuProvider } from '@kbn/share-plugin/public';
 import { isJobV2Params } from '../../common/job_utils';
 import { checkLicense } from '../lib/license_check';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
-import { ExportPanelShareOpts, JobParamsProviderOptions, ReportingSharingData } from './';
+import { ExportPanelShareOpts, JobParamsProviderOptions, ReportingSharingData } from '.';
 import { ScreenCapturePanelContent } from './screen_capture_panel_content_lazy';
 
 const getJobParams =
diff --git a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx
index 82dfe8e167dfa..6859d48c3c86d 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.test.tsx
@@ -12,7 +12,7 @@ import {
   notificationServiceMock,
   themeServiceMock,
   uiSettingsServiceMock,
-} from 'src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { ReportingAPIClient } from '../../lib/reporting_api_client';
 import { ReportingPanelContent, ReportingPanelProps as Props } from '.';
 import { ErrorUnsavedWorkPanel } from './components';
diff --git a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
index d5f5a44837158..55e5f74caa9a5 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
@@ -18,9 +18,9 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import React, { Component, ReactElement } from 'react';
-import { IUiSettingsClient, ThemeServiceSetup, ToastsSetup } from 'src/core/public';
+import { IUiSettingsClient, ThemeServiceSetup, ToastsSetup } from '@kbn/core/public';
 import url from 'url';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import {
   CSV_REPORT_TYPE,
   PDF_REPORT_TYPE,
diff --git a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
index ebf741c79bd86..49accae696876 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.test.tsx
@@ -8,7 +8,7 @@
 import { mount } from 'enzyme';
 import React from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
 import { ScreenCapturePanelContent } from './screen_capture_panel_content';
 
diff --git a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
index f9e2908c0f733..59d6e696af6fb 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/screen_capture_panel_content.tsx
@@ -8,7 +8,7 @@
 import { EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Component } from 'react';
-import type { LayoutParams } from '../../../screenshotting/common';
+import type { LayoutParams } from '@kbn/screenshotting-plugin/common';
 import { ReportingPanelContent, ReportingPanelProps } from './reporting_panel_content';
 
 export interface Props extends ReportingPanelProps {
diff --git a/x-pack/plugins/reporting/public/shared/get_shared_components.tsx b/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
index 3a0374a957832..ba6b1c6d1a929 100644
--- a/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
+++ b/x-pack/plugins/reporting/public/shared/get_shared_components.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import React from 'react';
 import { PDF_REPORT_TYPE, PDF_REPORT_TYPE_V2, PNG_REPORT_TYPE_V2 } from '../../common/constants';
 import { ReportingAPIClient } from '../lib/reporting_api_client';
diff --git a/x-pack/plugins/reporting/public/shared_imports.ts b/x-pack/plugins/reporting/public/shared_imports.ts
index 037dc5e374d25..976cb4bc349d0 100644
--- a/x-pack/plugins/reporting/public/shared_imports.ts
+++ b/x-pack/plugins/reporting/public/shared_imports.ts
@@ -5,23 +5,23 @@
  * 2.0.
  */
 
-export type { SharePluginSetup, SharePluginStart, LocatorPublic } from 'src/plugins/share/public';
+export type { SharePluginSetup, SharePluginStart, LocatorPublic } from '@kbn/share-plugin/public';
 
-export { AppNavLinkStatus } from '../../../../src/core/public';
+export { AppNavLinkStatus } from '@kbn/core/public';
 
-export type { UseRequestResponse } from '../../../../src/plugins/es_ui_shared/public';
-export { useRequest } from '../../../../src/plugins/es_ui_shared/public';
+export type { UseRequestResponse } from '@kbn/es-ui-shared-plugin/public';
+export { useRequest } from '@kbn/es-ui-shared-plugin/public';
 
-export { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
+export { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana as _useKibana } from '../../../../src/plugins/kibana_react/public';
+import { useKibana as _useKibana } from '@kbn/kibana-react-plugin/public';
 import type { KibanaContext } from './types';
 export const useKibana = () => _useKibana<KibanaContext>();
 
 export type { SerializableRecord } from '@kbn/utility-types';
 
-export type { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
+export type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
-export type { ManagementAppMountParams } from 'src/plugins/management/public';
+export type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
-export type { LicenseCheck } from '../../licensing/public';
+export type { LicenseCheck } from '@kbn/licensing-plugin/public';
diff --git a/x-pack/plugins/reporting/public/types.ts b/x-pack/plugins/reporting/public/types.ts
index 25b7738ff1981..8a745a237ee57 100644
--- a/x-pack/plugins/reporting/public/types.ts
+++ b/x-pack/plugins/reporting/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpSetup, ApplicationStart, CoreSetup } from 'src/core/public';
+import type { HttpSetup, ApplicationStart, CoreSetup } from '@kbn/core/public';
 
 export interface KibanaContext {
   http: HttpSetup;
diff --git a/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap b/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap
index 65f3c45fb2255..690259a1c240e 100644
--- a/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap
+++ b/x-pack/plugins/reporting/server/config/__snapshots__/schema.test.ts.snap
@@ -3,14 +3,7 @@
 exports[`Reporting Config Schema context {"dev":false,"dist":false} produces correct config 1`] = `
 Object {
   "capture": Object {
-    "loadDelay": "PT3S",
     "maxAttempts": 1,
-    "timeouts": Object {
-      "openUrl": "PT1M",
-      "renderComplete": "PT30S",
-      "waitForElements": "PT30S",
-    },
-    "zoom": 2,
   },
   "csv": Object {
     "checkForFormulas": true,
@@ -57,14 +50,7 @@ Object {
 exports[`Reporting Config Schema context {"dev":false,"dist":true} produces correct config 1`] = `
 Object {
   "capture": Object {
-    "loadDelay": "PT3S",
     "maxAttempts": 3,
-    "timeouts": Object {
-      "openUrl": "PT1M",
-      "renderComplete": "PT30S",
-      "waitForElements": "PT30S",
-    },
-    "zoom": 2,
   },
   "csv": Object {
     "checkForFormulas": true,
diff --git a/x-pack/plugins/reporting/server/config/config.ts b/x-pack/plugins/reporting/server/config/config.ts
index 269a66503a741..9bfca505e4b1f 100644
--- a/x-pack/plugins/reporting/server/config/config.ts
+++ b/x-pack/plugins/reporting/server/config/config.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { first } from 'rxjs/operators';
-import type { CoreSetup, Logger, PluginInitializerContext } from 'kibana/server';
+import type { CoreSetup, Logger, PluginInitializerContext } from '@kbn/core/server';
 import { createConfig$ } from './create_config';
 import { ReportingConfigType } from './schema';
 
diff --git a/x-pack/plugins/reporting/server/config/create_config.test.ts b/x-pack/plugins/reporting/server/config/create_config.test.ts
index 498281c56424f..d2fd645fcc26d 100644
--- a/x-pack/plugins/reporting/server/config/create_config.test.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.test.ts
@@ -6,10 +6,10 @@
  */
 
 import * as Rx from 'rxjs';
-import type { CoreSetup, HttpServerInfo, Logger, PluginInitializerContext } from 'kibana/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { CoreSetup, HttpServerInfo, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { createMockConfigSchema } from '../test_helpers';
-import type { ReportingConfigType } from './';
+import type { ReportingConfigType } from '.';
 import { createConfig$ } from './create_config';
 
 const createMockConfig = (
@@ -39,7 +39,7 @@ describe('Reporting server createConfig$', () => {
       encryptionKey: undefined,
     });
     const mockConfig$ = createMockConfig(mockInitContext);
-    const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
+    const result = await Rx.lastValueFrom(createConfig$(mockCoreSetup, mockConfig$, mockLogger));
 
     expect(result.encryptionKey).toMatch(/\S{32,}/); // random 32 characters
     expect(mockLogger.warn).toHaveBeenCalledTimes(1);
@@ -55,7 +55,7 @@ describe('Reporting server createConfig$', () => {
       })
     );
     const mockConfig$ = createMockConfig(mockInitContext);
-    const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
+    const result = await Rx.lastValueFrom(createConfig$(mockCoreSetup, mockConfig$, mockLogger));
     expect(result.encryptionKey).toMatch('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii');
     expect(mockLogger.warn).not.toHaveBeenCalled();
   });
@@ -77,14 +77,7 @@ describe('Reporting server createConfig$', () => {
     expect(result).toMatchInlineSnapshot(`
       Object {
         "capture": Object {
-          "loadDelay": 1,
           "maxAttempts": 1,
-          "timeouts": Object {
-            "openUrl": 100,
-            "renderComplete": 100,
-            "waitForElements": 100,
-          },
-          "zoom": 1,
         },
         "csv": Object {},
         "encryptionKey": "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
diff --git a/x-pack/plugins/reporting/server/config/create_config.ts b/x-pack/plugins/reporting/server/config/create_config.ts
index ff8d00c30d4f8..453a349c7ff4d 100644
--- a/x-pack/plugins/reporting/server/config/create_config.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.ts
@@ -7,7 +7,7 @@
 
 import crypto from 'crypto';
 import ipaddr from 'ipaddr.js';
-import type { CoreSetup, Logger } from 'kibana/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 import { sum } from 'lodash';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts
index 7c428a29ca741..22b1f2f043802 100644
--- a/x-pack/plugins/reporting/server/config/index.test.ts
+++ b/x-pack/plugins/reporting/server/config/index.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../../../src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.reporting';
 
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index c068b30f43266..ca044e5a9cfeb 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { get } from 'lodash';
 import { ConfigSchema, ReportingConfigType } from './schema';
 export { buildConfig } from './config';
@@ -64,11 +64,7 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
     },
   ],
   exposeToUsage: {
-    capture: {
-      maxAttempts: true,
-      timeouts: { openUrl: true, renderComplete: true, waitForElements: true },
-      zoom: true,
-    },
+    capture: { maxAttempts: true },
     csv: { maxSizeBytes: true, scroll: { size: true, duration: true } },
     kibanaServer: false, // show as [redacted]
     queue: { indexInterval: true, pollEnabled: true, timeout: true },
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
index 3af7a4e5cfe4c..6e6cd3ab07578 100644
--- a/x-pack/plugins/reporting/server/config/schema.test.ts
+++ b/x-pack/plugins/reporting/server/config/schema.test.ts
@@ -16,28 +16,6 @@ describe('Reporting Config Schema', () => {
     expect(ConfigSchema.validate({}, { dev: false, dist: true })).toMatchSnapshot();
   });
 
-  it('allows Duration values for certain keys', () => {
-    expect(ConfigSchema.validate({ queue: { timeout: '2m' } }).queue.timeout).toMatchInlineSnapshot(
-      `"PT2M"`
-    );
-
-    expect(
-      ConfigSchema.validate({ capture: { loadDelay: '3s' } }).capture.loadDelay
-    ).toMatchInlineSnapshot(`"PT3S"`);
-
-    expect(
-      ConfigSchema.validate({
-        capture: { timeouts: { openUrl: '1m', waitForElements: '30s', renderComplete: '10s' } },
-      }).capture.timeouts
-    ).toMatchInlineSnapshot(`
-      Object {
-        "openUrl": "PT1M",
-        "renderComplete": "PT10S",
-        "waitForElements": "PT30S",
-      }
-    `);
-  });
-
   it('allows ByteSizeValue values for certain keys', () => {
     expect(ConfigSchema.validate({ csv: { maxSizeBytes: '12mb' } }).csv.maxSizeBytes)
       .toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
index c031ed4f94f9d..c5ec1a7c22c8d 100644
--- a/x-pack/plugins/reporting/server/config/schema.ts
+++ b/x-pack/plugins/reporting/server/config/schema.ts
@@ -47,21 +47,6 @@ const QueueSchema = schema.object({
 });
 
 const CaptureSchema = schema.object({
-  timeouts: schema.object({
-    openUrl: schema.oneOf([schema.number(), schema.duration()], {
-      defaultValue: moment.duration({ minutes: 1 }),
-    }),
-    waitForElements: schema.oneOf([schema.number(), schema.duration()], {
-      defaultValue: moment.duration({ seconds: 30 }),
-    }),
-    renderComplete: schema.oneOf([schema.number(), schema.duration()], {
-      defaultValue: moment.duration({ seconds: 30 }),
-    }),
-  }),
-  zoom: schema.number({ defaultValue: 2 }),
-  loadDelay: schema.oneOf([schema.number(), schema.duration()], {
-    defaultValue: moment.duration({ seconds: 3 }),
-  }),
   maxAttempts: schema.conditional(
     schema.contextRef('dist'),
     true,
diff --git a/x-pack/plugins/reporting/server/config/ui_settings.ts b/x-pack/plugins/reporting/server/config/ui_settings.ts
index bd13dcb8320ff..09b6b0237f534 100644
--- a/x-pack/plugins/reporting/server/config/ui_settings.ts
+++ b/x-pack/plugins/reporting/server/config/ui_settings.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, UiSettingsParams } from 'kibana/server';
+import { CoreSetup, UiSettingsParams } from '@kbn/core/server';
 import { PLUGIN_ID, UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../common/constants';
 
 const kbToBase64Length = (kb: number) => Math.floor((kb * 1024 * 8) / 6);
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index adf8fb952f103..bb24630d70a19 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -6,8 +6,6 @@
  */
 
 import Hapi from '@hapi/hapi';
-import * as Rx from 'rxjs';
-import { filter, first, map, switchMap, take } from 'rxjs/operators';
 import type {
   BasePath,
   IClusterClient,
@@ -18,31 +16,35 @@ import type {
   SavedObjectsServiceStart,
   StatusServiceSetup,
   UiSettingsServiceStart,
-} from 'src/core/server';
-import type { PluginStart as DataPluginStart } from 'src/plugins/data/server';
-import type { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import { KibanaRequest, ServiceStatusLevels } from '../../../../src/core/server';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import type { LicensingPluginStart } from '../../licensing/server';
+} from '@kbn/core/server';
+import { KibanaRequest, ServiceStatusLevels } from '@kbn/core/server';
+import type { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import {
   PdfScreenshotResult,
   PngScreenshotResult,
   ScreenshotOptions,
   ScreenshottingStart,
-} from '../../screenshotting/server';
-import type { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { DEFAULT_SPACE_ID } from '../../spaces/common/constants';
-import type { SpacesPluginSetup } from '../../spaces/server';
-import type { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/screenshotting-plugin/server';
+import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import type {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import * as Rx from 'rxjs';
+import { filter, first, map, switchMap, take } from 'rxjs/operators';
+import type { ReportingConfig, ReportingSetup } from '.';
 import { REPORTING_REDIRECT_LOCATOR_STORE_KEY } from '../common/constants';
-import { durationToNumber } from '../common/schema_utils';
-import type { ReportingConfig, ReportingSetup } from './';
 import { ReportingConfigType } from './config';
 import { checkLicense, getExportTypesRegistry } from './lib';
 import { reportingEventLoggerFactory } from './lib/event_logger/logger';
 import type { IReport, ReportingStore } from './lib/store';
 import { ExecuteReportTask, MonitorReportsTask, ReportTaskParams } from './lib/tasks';
-import type { ReportingPluginRouter, PngScreenshotOptions, PdfScreenshotOptions } from './types';
+import type { PdfScreenshotOptions, PngScreenshotOptions, ReportingPluginRouter } from './types';
 
 export interface ReportingInternalSetup {
   basePath: Pick<BasePath, 'set'>;
@@ -163,7 +165,7 @@ export class ReportingCore {
     if (this.pluginSetupDeps && this.config) {
       return true;
     }
-    return await this.pluginSetup$.pipe(take(2)).toPromise(); // once for pluginSetupDeps (sync) and twice for config (async)
+    return await Rx.firstValueFrom(this.pluginSetup$.pipe(take(2))); // once for pluginSetupDeps (sync) and twice for config (async)
   }
 
   /*
@@ -250,7 +252,7 @@ export class ReportingCore {
       return this.pluginStartDeps;
     }
 
-    return await this.pluginStart$.pipe(first()).toPromise();
+    return await Rx.firstValueFrom(this.pluginStart$);
   }
 
   public getExportTypesRegistry() {
@@ -269,12 +271,9 @@ export class ReportingCore {
     const { license$ } = (await this.getPluginStartDeps()).licensing;
     const registry = this.getExportTypesRegistry();
 
-    return await license$
-      .pipe(
-        map((license) => checkLicense(registry, license)),
-        first()
-      )
-      .toPromise();
+    return await Rx.firstValueFrom(
+      license$.pipe(map((license) => checkLicense(registry, license)))
+    );
   }
 
   /*
@@ -369,21 +368,8 @@ export class ReportingCore {
   ): Rx.Observable<PngScreenshotResult | PdfScreenshotResult> {
     return Rx.defer(() => this.getPluginStartDeps()).pipe(
       switchMap(({ screenshotting }) => {
-        const config = this.getConfig();
         return screenshotting.getScreenshots({
           ...options,
-          timeouts: {
-            loadDelay: durationToNumber(config.get('capture', 'loadDelay')),
-            openUrl: durationToNumber(config.get('capture', 'timeouts', 'openUrl')),
-            waitForElements: durationToNumber(config.get('capture', 'timeouts', 'waitForElements')),
-            renderComplete: durationToNumber(config.get('capture', 'timeouts', 'renderComplete')),
-          },
-
-          layout: {
-            zoom: config.get('capture', 'zoom'),
-            ...options.layout,
-          },
-
           urls: options.urls.map((url) =>
             typeof url === 'string'
               ? url
diff --git a/x-pack/plugins/reporting/server/deprecations/index.ts b/x-pack/plugins/reporting/server/deprecations/index.ts
index 9ecb3b7ab88ad..651defbb5d688 100644
--- a/x-pack/plugins/reporting/server/deprecations/index.ts
+++ b/x-pack/plugins/reporting/server/deprecations/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { ReportingCore } from '../core';
 
 import { getDeprecationsInfo as getIlmPolicyDeprecationsInfo } from './migrate_existing_indices_ilm_policy';
diff --git a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts
index ca838c2d09914..551bf76465642 100644
--- a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts
+++ b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { GetDeprecationsContext } from 'src/core/server';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import type { GetDeprecationsContext } from '@kbn/core/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { ReportingCore } from '../core';
 import { createMockConfigSchema, createMockReportingCore } from '../test_helpers';
diff --git a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
index 9e3304e78e000..7ce888b57727f 100644
--- a/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
+++ b/x-pack/plugins/reporting/server/deprecations/migrate_existing_indices_ilm_policy.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DeprecationsDetails, GetDeprecationsContext } from 'src/core/server';
+import { DeprecationsDetails, GetDeprecationsContext } from '@kbn/core/server';
 import { API_MIGRATE_ILM_POLICY_URL, ILM_POLICY_NAME } from '../../common/constants';
 import { ReportingCore } from '../core';
 import { deprecations } from '../lib/deprecations';
diff --git a/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts b/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts
index 03765801b2629..81d0c8bcc24f1 100644
--- a/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts
+++ b/x-pack/plugins/reporting/server/deprecations/reporting_role.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { GetDeprecationsContext, IScopedClusterClient } from 'kibana/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { GetDeprecationsContext, IScopedClusterClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '..';
 import {
   createMockConfigSchema,
diff --git a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
index 453620bccc01d..0d9361f859c82 100644
--- a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
+++ b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
@@ -14,8 +14,8 @@ import type {
   DeprecationsDetails,
   ElasticsearchClient,
   GetDeprecationsContext,
-} from 'src/core/server';
-import { ReportingCore } from '../';
+} from '@kbn/core/server';
+import { ReportingCore } from '..';
 import { deprecations } from '../lib/deprecations';
 
 const REPORTING_USER_ROLE_NAME = 'reporting_user';
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
index 56a1c39e75aa4..a65be580adca3 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { cryptoFactory } from '../../lib';
-import { decryptJobHeaders } from './';
+import { decryptJobHeaders } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
index 3dfcfe362abd4..13b8b4804e6fb 100644
--- a/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/decrypt_job_headers.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { cryptoFactory } from '../../lib';
 
 export const decryptJobHeaders = async (
diff --git a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
index aa62b2355d652..aa7cad00a8faf 100644
--- a/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/generate_png.ts
@@ -6,11 +6,11 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import * as Rx from 'rxjs';
 import { finalize, map, tap } from 'rxjs/operators';
-import type { ReportingCore } from '../../';
-import { LayoutTypes } from '../../../../screenshotting/common';
+import { LayoutTypes } from '@kbn/screenshotting-plugin/common';
+import type { ReportingCore } from '../..';
 import { REPORTING_TRANSACTION_TYPE } from '../../../common/constants';
 import type { PngMetrics } from '../../../common/types';
 import type { PngScreenshotOptions } from '../../types';
@@ -27,7 +27,7 @@ export function generatePngObservable(
   options: Omit<PngScreenshotOptions, 'format'>
 ): Rx.Observable<PngResult> {
   const apmTrans = apm.startTransaction('generate-png', REPORTING_TRANSACTION_TYPE);
-  if (!options.layout.dimensions) {
+  if (!options.layout?.dimensions) {
     throw new Error(`LayoutParams.Dimensions is undefined.`);
   }
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
index 850d0ae507e12..99fa554b4f400 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { ReportingCore } from '../../';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { ReportingCore } from '../..';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
 import { getCustomLogo } from './get_custom_logo';
 
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
index 1087315503988..d327ebde912e5 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_custom_logo.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { Headers, Logger } from 'kibana/server';
-import { ReportingCore } from '../../';
+import type { Headers, Logger } from '@kbn/core/server';
+import { ReportingCore } from '../..';
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
 
 export const getCustomLogo = async (
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
index a69de1034f5a4..aae2a06a130eb 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ReportingConfig } from '../../';
+import { ReportingConfig } from '../..';
 import { createMockConfig } from '../../test_helpers';
 import { TaskPayloadPNG } from '../png/types';
 import { TaskPayloadPDF } from '../printable_pdf/types';
diff --git a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
index 5ae4092a466fa..069c882794ebd 100644
--- a/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/get_full_urls.ts
@@ -11,7 +11,7 @@ import {
   UrlWithParsedQuery,
   UrlWithStringQuery,
 } from 'url';
-import { ReportingConfig } from '../../';
+import { ReportingConfig } from '../..';
 import { TaskPayloadPNG } from '../png/types';
 import { TaskPayloadPDF } from '../printable_pdf/types';
 import { getAbsoluteUrlFactory } from './get_absolute_url';
diff --git a/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts b/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts
index aaffd6254cceb..9c329db64fa1a 100644
--- a/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/v2/get_full_redirect_app_url.ts
@@ -6,7 +6,7 @@
  */
 
 import { format } from 'url';
-import { ReportingConfig } from '../../../';
+import { ReportingConfig } from '../../..';
 import { getRedirectAppPath } from '../../../../common/constants';
 import { buildKibanaPath } from '../../../../common/build_kibana_path';
 
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
index 5a8c4f1fd760c..e0966cffd3ba9 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/execute_job.test.ts
@@ -17,9 +17,9 @@ jest.mock('./generate_csv/generate_csv', () => ({
 }));
 
 import nodeCrypto from '@elastic/node-crypto';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
 import { runTaskFnFactory } from './execute_job';
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
index 5c52a6b74e67d..ecdbd99e4770a 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { errors as esErrors } from '@elastic/elasticsearch';
-import type { IScopedClusterClient, IUiSettingsClient, SearchResponse } from 'kibana/server';
+import type { IScopedClusterClient, IUiSettingsClient, SearchResponse } from '@kbn/core/server';
 import { identity, range } from 'lodash';
 import * as Rx from 'rxjs';
 import {
@@ -14,14 +14,14 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
-import { ISearchStartSearchSource } from 'src/plugins/data/common';
-import { searchSourceInstanceMock } from 'src/plugins/data/common/search/search_source/mocks';
-import { IScopedSearchClient } from 'src/plugins/data/server';
-import { dataPluginMock } from 'src/plugins/data/server/mocks';
-import { FieldFormatsRegistry } from 'src/plugins/field_formats/common';
+} from '@kbn/core/server/mocks';
+import { ISearchStartSearchSource } from '@kbn/data-plugin/common';
+import { searchSourceInstanceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
+import { IScopedSearchClient } from '@kbn/data-plugin/server';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import { Writable } from 'stream';
-import { ReportingConfig } from '../../../';
+import { ReportingConfig } from '../../..';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import {
   UI_SETTINGS_CSV_QUOTE_VALUES,
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
index dc2067490521c..3b219db0bc71c 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
@@ -7,26 +7,19 @@
 
 import { errors as esErrors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IScopedClusterClient, IUiSettingsClient, Logger } from 'kibana/server';
-import type { IScopedSearchClient } from 'src/plugins/data/server';
-import type { Datatable } from 'src/plugins/expressions/server';
+import type { IScopedClusterClient, IUiSettingsClient, Logger } from '@kbn/core/server';
+import type { IScopedSearchClient } from '@kbn/data-plugin/server';
+import type { Datatable } from '@kbn/expressions-plugin/server';
 import type { Writable } from 'stream';
-import type { ReportingConfig } from '../../..';
-import type {
-  DataView,
-  ISearchSource,
-  ISearchStartSearchSource,
-} from '../../../../../../../src/plugins/data/common';
-import {
-  cellHasFormulas,
-  ES_SEARCH_STRATEGY,
-  tabifyDocs,
-} from '../../../../../../../src/plugins/data/common';
+import { lastValueFrom } from 'rxjs';
+import type { DataView, ISearchSource, ISearchStartSearchSource } from '@kbn/data-plugin/common';
+import { cellHasFormulas, ES_SEARCH_STRATEGY, tabifyDocs } from '@kbn/data-plugin/common';
 import type {
   FieldFormat,
   FieldFormatConfig,
   IFieldFormatsRegistry,
-} from '../../../../../../../src/plugins/field_formats/common';
+} from '@kbn/field-formats-plugin/common';
+import type { ReportingConfig } from '../../..';
 import type { CancellationToken } from '../../../../common/cancellation_token';
 import { CONTENT_TYPE_CSV } from '../../../../common/constants';
 import { AuthenticationExpiredError, ReportingError } from '../../../../common/errors';
@@ -78,7 +71,7 @@ export class CsvGenerator {
     };
 
     const results = (
-      await this.clients.data.search(searchParams, { strategy: ES_SEARCH_STRATEGY }).toPromise()
+      await lastValueFrom(this.clients.data.search(searchParams, { strategy: ES_SEARCH_STRATEGY }))
     ).rawResponse as estypes.SearchResponse<unknown>;
 
     return results;
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
index ef0f0062bf19b..863425822d7dd 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.test.ts
@@ -11,12 +11,12 @@ import {
   UI_SETTINGS_CSV_SEPARATOR,
   UI_SETTINGS_SEARCH_INCLUDE_FROZEN,
 } from '../../../../common/constants';
-import { IUiSettingsClient } from 'kibana/server';
+import { IUiSettingsClient } from '@kbn/core/server';
 import {
   loggingSystemMock,
   savedObjectsClientMock,
   uiSettingsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { createMockConfig, createMockConfigSchema } from '../../../test_helpers';
 import { getExportSettings } from './get_export_settings';
 
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
index 6a07e3184eb48..dff80970dff74 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/get_export_settings.ts
@@ -6,9 +6,9 @@
  */
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import type { IUiSettingsClient, Logger } from 'kibana/server';
-import { createEscapeValue } from '../../../../../../../src/plugins/data/common';
-import { ReportingConfig } from '../../../';
+import type { IUiSettingsClient, Logger } from '@kbn/core/server';
+import { createEscapeValue } from '@kbn/data-plugin/common';
+import { ReportingConfig } from '../../..';
 import {
   CSV_BOM_CHARS,
   UI_SETTINGS_CSV_QUOTE_VALUES,
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
index 50ae2ab10f6e7..efe905eedd9ae 100644
--- a/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv_searchsource_immediate/execute_job.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { Writable } from 'stream';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { TaskRunResult } from '../../lib/tasks';
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
index bc37978372ba6..75496330a54d9 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.test.ts
@@ -6,9 +6,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { cryptoFactory } from '../../../lib';
 import {
@@ -18,7 +18,7 @@ import {
 } from '../../../test_helpers';
 import { generatePngObservable } from '../../common';
 import { TaskPayloadPNG } from '../types';
-import { runTaskFnFactory } from './';
+import { runTaskFnFactory } from '.';
 
 jest.mock('../../common/generate_png');
 
diff --git a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
index 4e5d6d519c10e..53497e2eeaea3 100644
--- a/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts
@@ -41,8 +41,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPNG>> =
               ...job.layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: job.layout?.id as PngScreenshotOptions['layout']['id'],
-            },
+              id: job.layout?.id,
+            } as PngScreenshotOptions['layout'],
           });
         }),
         tap(({ buffer }) => stream.write(buffer)),
@@ -56,6 +56,6 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPNG>> =
       );
 
       const stop$ = Rx.fromEventPattern(cancellationToken.on);
-      return process$.pipe(takeUntil(stop$)).toPromise();
+      return Rx.lastValueFrom(process$.pipe(takeUntil(stop$)));
     };
   };
diff --git a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
index 1403873e8da4b..1160347c95273 100644
--- a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.test.ts
@@ -6,9 +6,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { LocatorParams } from '../../../common/types';
 import { cryptoFactory } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
index a2e220b9e55dd..bd32bdad4e605 100644
--- a/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/png_v2/execute_job.ts
@@ -42,8 +42,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPNGV2>> =
               ...job.layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: job.layout?.id as PngScreenshotOptions['layout']['id'],
-            },
+              id: job.layout?.id,
+            } as PngScreenshotOptions['layout'],
             urls: [[url, locatorParams]],
           });
         }),
@@ -58,6 +58,6 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPNGV2>> =
       );
 
       const stop$ = Rx.fromEventPattern(cancellationToken.on);
-      return process$.pipe(takeUntil(stop$)).toPromise();
+      return Rx.lastValueFrom(process$.pipe(takeUntil(stop$)));
     };
   };
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
index 6741b6928e33a..4be1446c18e25 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.test.ts
@@ -6,15 +6,15 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { CancellationToken } from '../../../../common/cancellation_token';
 import { cryptoFactory } from '../../../lib';
 import { createMockConfigSchema, createMockReportingCore } from '../../../test_helpers';
 import { generatePdfObservable } from '../lib/generate_pdf';
 import { TaskPayloadPDF } from '../types';
-import { runTaskFnFactory } from './';
+import { runTaskFnFactory } from '.';
 
 jest.mock('../lib/generate_pdf');
 
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
index c14b2f864ada9..6341d0a253e50 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/execute_job/index.ts
@@ -47,8 +47,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPDF>> =
               ...layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: layout?.id as PdfScreenshotOptions['layout']['id'],
-            },
+              id: layout?.id,
+            } as PdfScreenshotOptions['layout'],
           });
         }),
         tap(({ buffer }) => {
@@ -71,6 +71,6 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPDF>> =
       const stop$ = Rx.fromEventPattern(cancellationToken.on);
 
       apmTrans?.end();
-      return process$.pipe(takeUntil(stop$)).toPromise();
+      return Rx.lastValueFrom(process$.pipe(takeUntil(stop$)));
     };
   };
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
index e6cdcf8c07d7c..0a77762011d4b 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf/lib/generate_pdf.ts
@@ -7,7 +7,7 @@
 
 import * as Rx from 'rxjs';
 import { mergeMap, tap } from 'rxjs/operators';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { PdfScreenshotOptions } from '../../../types';
 import type { PdfMetrics } from '../../../../common/types';
 import { getTracker } from '../../common/pdf_tracker';
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
index 205c55ab4e996..99250c522e2cf 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.test.ts
@@ -8,9 +8,9 @@
 jest.mock('./lib/generate_pdf');
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { Writable } from 'stream';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { LocatorParams } from '../../../common/types';
 import { cryptoFactory } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
index acdde21d25716..b7e6a25f1848f 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/execute_job.ts
@@ -45,8 +45,8 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPDFV2>> =
               ...layout,
               // TODO: We do not do a runtime check for supported layout id types for now. But technically
               // we should.
-              id: layout?.id as PdfScreenshotOptions['layout']['id'],
-            },
+              id: layout?.id,
+            } as PdfScreenshotOptions['layout'],
           });
         }),
         tap(({ buffer }) => {
@@ -70,6 +70,6 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<TaskPayloadPDFV2>> =
       const stop$ = Rx.fromEventPattern(cancellationToken.on);
 
       apmTrans?.end();
-      return process$.pipe(takeUntil(stop$)).toPromise();
+      return Rx.lastValueFrom(process$.pipe(takeUntil(stop$)));
     };
   };
diff --git a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
index a8d0e15d45ba2..b29b3f90861e6 100644
--- a/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
+++ b/x-pack/plugins/reporting/server/export_types/printable_pdf_v2/lib/generate_pdf.ts
@@ -7,7 +7,7 @@
 
 import * as Rx from 'rxjs';
 import { mergeMap, tap } from 'rxjs/operators';
-import type { ReportingCore } from '../../../';
+import type { ReportingCore } from '../../..';
 import type { LocatorParams, PdfMetrics, UrlOrUrlLocatorTuple } from '../../../../common/types';
 import type { PdfScreenshotOptions } from '../../../types';
 import { getFullRedirectAppUrl } from '../../common/v2/get_full_redirect_app_url';
diff --git a/x-pack/plugins/reporting/server/index.ts b/x-pack/plugins/reporting/server/index.ts
index fd967b08e383c..8c715ee9df271 100644
--- a/x-pack/plugins/reporting/server/index.ts
+++ b/x-pack/plugins/reporting/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { ReportingConfigType } from './config';
 import { ReportingPlugin } from './plugin';
 
diff --git a/x-pack/plugins/reporting/server/lib/check_license.test.ts b/x-pack/plugins/reporting/server/lib/check_license.test.ts
index 5265c04eeada6..d95babcd72c69 100644
--- a/x-pack/plugins/reporting/server/lib/check_license.test.ts
+++ b/x-pack/plugins/reporting/server/lib/check_license.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { checkLicense } from './check_license';
-import { ILicense } from '../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { ExportTypesRegistry } from './export_types_registry';
 
 describe('check_license', () => {
diff --git a/x-pack/plugins/reporting/server/lib/check_license.ts b/x-pack/plugins/reporting/server/lib/check_license.ts
index 008c6c1c37fbc..107b683cd621b 100644
--- a/x-pack/plugins/reporting/server/lib/check_license.ts
+++ b/x-pack/plugins/reporting/server/lib/check_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { ExportTypeDefinition } from '../types';
 import { ExportTypesRegistry } from './export_types_registry';
 
diff --git a/x-pack/plugins/reporting/server/lib/check_params_version.ts b/x-pack/plugins/reporting/server/lib/check_params_version.ts
index 79237ba56677a..b154c839f7fd7 100644
--- a/x-pack/plugins/reporting/server/lib/check_params_version.ts
+++ b/x-pack/plugins/reporting/server/lib/check_params_version.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { UNVERSIONED_VERSION } from '../../common/constants';
 import type { BaseParams } from '../../common/types';
 
diff --git a/x-pack/plugins/reporting/server/lib/content_stream.test.ts b/x-pack/plugins/reporting/server/lib/content_stream.test.ts
index 069ac22258ad1..aa0d5c85acedf 100644
--- a/x-pack/plugins/reporting/server/lib/content_stream.test.ts
+++ b/x-pack/plugins/reporting/server/lib/content_stream.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { set } from 'lodash';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { ContentStream } from './content_stream';
 
 describe('ContentStream', () => {
diff --git a/x-pack/plugins/reporting/server/lib/content_stream.ts b/x-pack/plugins/reporting/server/lib/content_stream.ts
index b09e446ff576c..0228132200e62 100644
--- a/x-pack/plugins/reporting/server/lib/content_stream.ts
+++ b/x-pack/plugins/reporting/server/lib/content_stream.ts
@@ -6,11 +6,11 @@
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ByteSizeValue } from '@kbn/config-schema';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { defaults, get } from 'lodash';
 import Puid from 'puid';
 import { Duplex } from 'stream';
-import type { ReportingCore } from '../';
+import type { ReportingCore } from '..';
 import type { ReportSource } from '../../common/types';
 
 /**
diff --git a/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts b/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts
index c3aea64171444..da23ea8d2c5e1 100644
--- a/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts
+++ b/x-pack/plugins/reporting/server/lib/deprecations/check_ilm_migration_status.ts
@@ -7,7 +7,7 @@
 
 import { ILM_POLICY_NAME } from '../../../common/constants';
 import { IlmPolicyMigrationStatus } from '../../../common/types';
-import { IlmPolicyManager } from '../../lib/store/ilm_policy_manager';
+import { IlmPolicyManager } from '../store/ilm_policy_manager';
 import type { DeprecationsDependencies } from './types';
 
 export const checkIlmMigrationStatus = async ({
diff --git a/x-pack/plugins/reporting/server/lib/deprecations/index.ts b/x-pack/plugins/reporting/server/lib/deprecations/index.ts
index 5d8a95695a129..205c1c3199bab 100644
--- a/x-pack/plugins/reporting/server/lib/deprecations/index.ts
+++ b/x-pack/plugins/reporting/server/lib/deprecations/index.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import { DeprecationsDetails } from 'kibana/server';
+import { DeprecationsDetails } from '@kbn/core/server';
 import { checkIlmMigrationStatus } from './check_ilm_migration_status';
 
 function deprecationError(title: string, error: Error): DeprecationsDetails[] {
diff --git a/x-pack/plugins/reporting/server/lib/deprecations/types.ts b/x-pack/plugins/reporting/server/lib/deprecations/types.ts
index c6e9e3b7ad920..6df429d2b2ed9 100644
--- a/x-pack/plugins/reporting/server/lib/deprecations/types.ts
+++ b/x-pack/plugins/reporting/server/lib/deprecations/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type { ReportingCore } from '../../core';
 
 export interface DeprecationsDependencies {
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts b/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
index 90c546b198a08..b22b6db9c8d4c 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { LogMeta } from 'kibana/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { LogMeta } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { EcsLogAdapter } from './adapter';
 
 describe('EcsLogAdapter', () => {
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts b/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
index 71116d8f334b5..e41c6306c7ad7 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/adapter.ts
@@ -6,7 +6,7 @@
  */
 
 import deepMerge from 'deepmerge';
-import type { Logger, LogMeta } from 'kibana/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 import type { IReportingEventLogger } from './logger';
 
 /** @internal */
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
index 13c932c0efe1a..cbff4ed0c1d83 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/logger.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { ConcreteTaskInstance } from '../../../../task_manager/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { BasePayload } from '../../types';
 import { Report } from '../store';
 import { ReportingEventLogger, reportingEventLoggerFactory } from './logger';
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
index 6a3df43136c4f..b7bd05e67ff5e 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/logger.ts
@@ -6,11 +6,11 @@
  */
 
 import deepMerge from 'deepmerge';
-import type { Logger, LogMeta } from 'kibana/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 import { PLUGIN_ID } from '../../../common/constants';
 import type { TaskRunMetrics } from '../../../common/types';
 import { IReport } from '../store';
-import { ActionType } from './';
+import { ActionType } from '.';
 import { EcsLogAdapter } from './adapter';
 import {
   ClaimedTask,
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/types.ts b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
index 950c3d89a184b..f56ed90890065 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/types.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { LogMeta } from 'src/core/server';
+import { LogMeta } from '@kbn/core/server';
 import type { TaskRunMetrics } from '../../../common/types';
-import { ActionType } from './';
+import { ActionType } from '.';
 
 export interface ReportingAction<A extends ActionType> extends LogMeta {
   event: {
diff --git a/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts b/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts
index e0569883fbbe2..48a45be80f716 100644
--- a/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts
+++ b/x-pack/plugins/reporting/server/lib/store/ilm_policy_manager/ilm_policy_manager.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { ILM_POLICY_NAME } from '../../../../common/constants';
 
 import { reportingIlmPolicy } from './constants';
diff --git a/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts b/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts
index c8b2abda88c79..dd58bcacf0b96 100644
--- a/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/saved_report.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedReport } from './';
+import { SavedReport } from '.';
 
 test('SavedReport should succeed if report has ES document fields present', () => {
   const createInstance = () => {
diff --git a/x-pack/plugins/reporting/server/lib/store/saved_report.ts b/x-pack/plugins/reporting/server/lib/store/saved_report.ts
index 0c3621d995d7f..c4d46c167a312 100644
--- a/x-pack/plugins/reporting/server/lib/store/saved_report.ts
+++ b/x-pack/plugins/reporting/server/lib/store/saved_report.ts
@@ -6,7 +6,7 @@
  */
 
 import { ReportDocumentHead, ReportSource } from '../../../common/types';
-import { Report } from './';
+import { Report } from '.';
 
 /*
  * Class for a report document that is saved in Elasticsearch
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 7ceafef261dd4..2a54ea49e455b 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { ReportingCore } from '../../';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { ReportingCore } from '../..';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
-import { Report, ReportDocument, ReportingStore, SavedReport } from './';
+import { Report, ReportDocument, ReportingStore, SavedReport } from '.';
 
 describe('ReportingStore', () => {
   const mockLogger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/reporting/server/lib/store/store.ts b/x-pack/plugins/reporting/server/lib/store/store.ts
index ffb4ba96bfd3c..883cd3d404590 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.ts
@@ -7,14 +7,14 @@
 
 import moment from 'moment';
 import { IndexResponse, UpdateResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
-import { statuses } from '../';
-import type { ReportingCore } from '../../';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { statuses } from '..';
+import type { ReportingCore } from '../..';
 import { ILM_POLICY_NAME, REPORTING_SYSTEM_INDEX } from '../../../common/constants';
 import type { JobStatus, ReportOutput, ReportSource } from '../../../common/types';
 import type { ReportTaskParams } from '../tasks';
-import type { IReport, Report, ReportDocument } from './';
-import { SavedReport } from './';
+import type { IReport, Report, ReportDocument } from '.';
+import { SavedReport } from '.';
 import { IlmPolicyManager } from './ilm_policy_manager';
 import { indexTimestamp } from './index_timestamp';
 import { mapping } from './mapping';
diff --git a/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts b/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts
index 302088e6a6eb1..86fb3655ad6af 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/error_logger.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { errorLogger } from './error_logger';
 
 const logger = loggingSystemMock.createLogger();
diff --git a/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts b/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts
index a67e3caeb2c78..2e72cc2c14550 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/error_logger.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 
 const MAX_PARTIAL_ERROR_LENGTH = 1000; // 1000 of beginning, 1000 of end
 const ERROR_PARTIAL_SEPARATOR = '...';
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
index 9f016a6a54a10..47bb4458cb10c 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '../..';
-import { RunContext } from '../../../../task_manager/server';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { KibanaShuttingDownError } from '../../../common/errors';
 import type { SavedReport } from '../store';
 import { ReportingConfigType } from '../../config';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
-import { ExecuteReportTask } from './';
+import { ExecuteReportTask } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
index bd4c57437b353..73dc29801ac0d 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
@@ -6,19 +6,19 @@
  */
 
 import { UpdateResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import moment from 'moment';
 import * as Rx from 'rxjs';
 import { timeout } from 'rxjs/operators';
 import { finished, Writable } from 'stream';
 import { promisify } from 'util';
-import { getContentStream } from '../';
-import type { ReportingCore } from '../../';
 import type {
   RunContext,
   TaskManagerStartContract,
   TaskRunCreatorFunction,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+import { getContentStream } from '..';
+import type { ReportingCore } from '../..';
 import { CancellationToken } from '../../../common/cancellation_token';
 import { mapToReportingError } from '../../../common/errors/map_to_reporting_error';
 import { ReportingError, QueueTimeoutError, KibanaShuttingDownError } from '../../../common/errors';
@@ -35,7 +35,7 @@ import {
   REPORTING_EXECUTE_TYPE,
   ReportTaskParams,
   TaskRunResult,
-} from './';
+} from '.';
 import { errorLogger } from './error_logger';
 
 type CompletedReportOutput = Omit<ReportOutput, 'content'>;
@@ -259,9 +259,11 @@ export class ExecuteReportTask implements ReportingTask {
     // run the report
     // if workerFn doesn't finish before timeout, call the cancellationToken and throw an error
     const queueTimeout = durationToNumber(this.config.queue.timeout);
-    return Rx.from(runner.jobExecutor(task.id, task.payload, cancellationToken, stream))
-      .pipe(timeout(queueTimeout)) // throw an error if a value is not emitted before timeout
-      .toPromise();
+    return Rx.lastValueFrom(
+      Rx.from(runner.jobExecutor(task.id, task.payload, cancellationToken, stream)).pipe(
+        timeout(queueTimeout)
+      ) // throw an error if a value is not emitted before timeout
+    );
   }
 
   public async _completeJob(
diff --git a/x-pack/plugins/reporting/server/lib/tasks/index.ts b/x-pack/plugins/reporting/server/lib/tasks/index.ts
index 6be8299d1d26a..522c092f5e32d 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/index.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TaskRunCreatorFunction } from '../../../../task_manager/server';
+import { TaskRunCreatorFunction } from '@kbn/task-manager-plugin/server';
 import { ReportSource, TaskRunResult } from '../../../common/types';
 import { BasePayload } from '../../types';
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts b/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts
index b7e75de247535..7bf6dd7e50678 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/monitor_report.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '../..';
-import { RunContext } from '../../../../task_manager/server';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
+import { RunContext } from '@kbn/task-manager-plugin/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 import { ReportingConfigType } from '../../config';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
-import { MonitorReportsTask } from './';
+import { MonitorReportsTask } from '.';
 
 const logger = loggingSystemMock.createLogger();
 
diff --git a/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts b/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
index 56e12d7d5512b..fa599d225b77d 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/monitor_reports.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import moment from 'moment';
-import { ReportingStore } from '../';
-import { ReportingCore } from '../../';
-import { TaskManagerStartContract, TaskRunCreatorFunction } from '../../../../task_manager/server';
+import { TaskManagerStartContract, TaskRunCreatorFunction } from '@kbn/task-manager-plugin/server';
+import { ReportingStore } from '..';
+import { ReportingCore } from '../..';
 import { numberToDuration } from '../../../common/schema_utils';
 import { ReportingConfigType } from '../../config';
 import { statuses } from '../statuses';
 import { SavedReport } from '../store';
-import { ReportingTask, ReportingTaskStatus, REPORTING_MONITOR_TYPE, ReportTaskParams } from './';
+import { ReportingTask, ReportingTaskStatus, REPORTING_MONITOR_TYPE, ReportTaskParams } from '.';
 
 /*
  * Task for finding the ReportingRecords left in the ReportingStore (.reporting index) and stuck in
diff --git a/x-pack/plugins/reporting/server/plugin.test.ts b/x-pack/plugins/reporting/server/plugin.test.ts
index 98f02668323b1..e12c1b238daa6 100644
--- a/x-pack/plugins/reporting/server/plugin.test.ts
+++ b/x-pack/plugins/reporting/server/plugin.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Logger } from 'kibana/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { CoreSetup, CoreStart, Logger } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import type { ReportingCore, ReportingInternalStart } from './core';
 import { ReportingPlugin } from './plugin';
 import {
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
index 52a72e7139020..81094a7649a0d 100644
--- a/x-pack/plugins/reporting/server/plugin.ts
+++ b/x-pack/plugins/reporting/server/plugin.ts
@@ -5,9 +5,15 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import type {
+  CoreSetup,
+  CoreStart,
+  Logger,
+  Plugin,
+  PluginInitializerContext,
+} from '@kbn/core/server';
 import { PLUGIN_ID } from '../common/constants';
-import { ReportingCore } from './';
+import { ReportingCore } from '.';
 import { buildConfig, registerUiSettings, ReportingConfigType } from './config';
 import { registerDeprecations } from './deprecations';
 import { ReportingStore } from './lib';
diff --git a/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts b/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts
index 89d55ff04ab8f..ecb8dc16435f3 100644
--- a/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts
+++ b/x-pack/plugins/reporting/server/routes/deprecations/deprecations.ts
@@ -6,7 +6,7 @@
  */
 import { errors } from '@elastic/elasticsearch';
 import type { SecurityHasPrivilegesIndexPrivilegesCheck } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { Logger, RequestHandler } from 'kibana/server';
+import type { Logger, RequestHandler } from '@kbn/core/server';
 import {
   API_GET_ILM_POLICY_STATUS,
   API_MIGRATE_ILM_POLICY_URL,
diff --git a/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts b/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts
index 9c76aade058f0..1a13a3d1efa67 100644
--- a/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts
+++ b/x-pack/plugins/reporting/server/routes/deprecations/integration_tests/deprecations.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { licensingMock } from '../../../../../licensing/server/mocks';
-import { securityMock } from '../../../../../security/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { API_GET_ILM_POLICY_STATUS } from '../../../../common/constants';
 import {
   createMockConfigSchema,
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts b/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts
index fb95ad9e31880..5e57c212b45ab 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/browser.ts
@@ -6,11 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
+import { lastValueFrom } from 'rxjs';
 import type { ReportingCore } from '../..';
 import { API_DIAGNOSE_URL } from '../../../common/constants';
 import { authorizedUserPreRouting } from '../lib/authorized_user_pre_routing';
-import type { DiagnosticResponse } from './';
+import type { DiagnosticResponse } from '.';
 
 const logsToHelpMap = {
   'error while loading shared libraries': i18n.translate(
@@ -34,7 +35,7 @@ const logsToHelpMap = {
   ),
 
   'No usable sandbox': i18n.translate('xpack.reporting.diagnostic.noUsableSandbox', {
-    defaultMessage: `Unable to use Chromium sandbox. This can be disabled at your own risk with 'xpack.reporting.capture.browser.chromium.disableSandbox'. Please see {url}`,
+    defaultMessage: `Unable to use Chromium sandbox. This can be disabled at your own risk with 'xpack.screenshotting.browser.chromium.disableSandbox'. Please see {url}`,
     values: {
       url: 'https://www.elastic.co/guide/en/kibana/current/reporting-troubleshooting.html#reporting-troubleshooting-sandbox-dependency',
     },
@@ -52,7 +53,7 @@ export const registerDiagnoseBrowser = (reporting: ReportingCore, logger: Logger
     authorizedUserPreRouting(reporting, async (_user, _context, _req, res) => {
       try {
         const { screenshotting } = await reporting.getPluginStartDeps();
-        const logs = await screenshotting.diagnose().toPromise();
+        const logs = await lastValueFrom(screenshotting.diagnose());
         const knownIssues = Object.keys(logsToHelpMap) as Array<keyof typeof logsToHelpMap>;
 
         const boundSuccessfully = logs.includes(`DevTools listening on`);
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/index.ts b/x-pack/plugins/reporting/server/routes/diagnostic/index.ts
index b5e2a8585afb3..952163a260806 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/index.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import type { ReportingCore } from '../../core';
 import { registerDiagnoseBrowser } from './browser';
 import { registerDiagnoseScreenshot } from './screenshot';
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts
index dc8fdb7e6d0c8..80be0f8f3a54c 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/browser.test.ts
@@ -6,11 +6,11 @@
  */
 
 import * as Rx from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
-import type { ScreenshottingStart } from '../../../../../screenshotting/server';
+import { ReportingCore } from '../../..';
+import type { ScreenshottingStart } from '@kbn/screenshotting-plugin/server';
 import {
   createMockConfigSchema,
   createMockPluginSetup,
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts
index 3bc3f5bbb5e28..fd514302ecae5 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/integration_tests/screenshot.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
+import { ReportingCore } from '../../..';
 import { generatePngObservable } from '../../../export_types/common';
 import {
   createMockConfigSchema,
@@ -17,6 +17,7 @@ import {
 } from '../../../test_helpers';
 import type { ReportingRequestHandlerContext } from '../../../types';
 import { registerDiagnoseScreenshot } from '../screenshot';
+import { defer } from 'rxjs';
 
 jest.mock('../../../export_types/common/generate_png');
 
@@ -30,9 +31,8 @@ describe('POST /diagnose/screenshot', () => {
 
   const setScreenshotResponse = (resp: object | Error) => {
     const generateMock = {
-      pipe: () => ({
-        toPromise: () => (resp instanceof Error ? Promise.reject(resp) : Promise.resolve(resp)),
-      }),
+      pipe: () =>
+        defer(() => (resp instanceof Error ? Promise.reject(resp) : Promise.resolve(resp))),
     };
     (generatePngObservable as jest.Mock).mockReturnValue(generateMock);
   };
diff --git a/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts b/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts
index 6819970fe753a..7874686c05f24 100644
--- a/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts
+++ b/x-pack/plugins/reporting/server/routes/diagnostic/screenshot.ts
@@ -6,14 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
+import { lastValueFrom } from 'rxjs';
+import { APP_WRAPPER_CLASS } from '@kbn/core/server';
 import { ReportingCore } from '../..';
-import { APP_WRAPPER_CLASS } from '../../../../../../src/core/server';
 import { API_DIAGNOSE_URL } from '../../../common/constants';
 import { generatePngObservable } from '../../export_types/common';
 import { getAbsoluteUrlFactory } from '../../export_types/common/get_absolute_url';
 import { authorizedUserPreRouting } from '../lib/authorized_user_pre_routing';
-import { DiagnosticResponse } from './';
+import { DiagnosticResponse } from '.';
 
 export const registerDiagnoseScreenshot = (reporting: ReportingCore, logger: Logger) => {
   const setupDeps = reporting.getPluginSetupDeps();
@@ -50,14 +51,16 @@ export const registerDiagnoseScreenshot = (reporting: ReportingCore, logger: Log
         },
       };
 
-      return generatePngObservable(reporting, logger, {
-        layout,
-        request,
-        browserTimezone: 'America/Los_Angeles',
-        urls: [hashUrl],
-      })
-        .pipe()
-        .toPromise()
+      return lastValueFrom(
+        generatePngObservable(reporting, logger, {
+          layout,
+          request,
+          browserTimezone: 'America/Los_Angeles',
+          urls: [hashUrl],
+        })
+          // Pipe is required to ensure that we can subscribe to it
+          .pipe()
+      )
         .then((screenshot) => {
           // NOTE: the screenshot could be returned as a string using `data:image/png;base64,` + results.buffer.toString('base64')
           if (screenshot.warnings.length) {
diff --git a/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts b/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts
index 19687b9d3ec9b..4218d500dae66 100644
--- a/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts
+++ b/x-pack/plugins/reporting/server/routes/generate/csv_searchsource_immediate.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { KibanaRequest, Logger } from 'kibana/server';
-import type { ReportingCore } from '../../';
+import type { KibanaRequest, Logger } from '@kbn/core/server';
+import type { ReportingCore } from '../..';
 import { CSV_SEARCHSOURCE_IMMEDIATE_TYPE } from '../../../common/constants';
 import { runTaskFnFactory } from '../../export_types/csv_searchsource_immediate/execute_job';
 import type { JobParamsDownloadCSV } from '../../export_types/csv_searchsource_immediate/types';
diff --git a/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts b/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts
index c5e7bb2197d72..fc4c17201d796 100644
--- a/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts
+++ b/x-pack/plugins/reporting/server/routes/generate/generate_from_jobparams.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import rison from 'rison-node';
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import type { ReportingCore } from '../..';
 import { API_BASE_URL } from '../../../common/constants';
 import type { BaseParams } from '../../types';
diff --git a/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts b/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts
index f0db06485cf44..48823aca67ee4 100644
--- a/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts
+++ b/x-pack/plugins/reporting/server/routes/generate/integration_tests/generation_from_jobparams.test.ts
@@ -7,11 +7,11 @@
 
 import rison from 'rison-node';
 import { BehaviorSubject } from 'rxjs';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { setupServer } from 'src/core/server/test_utils';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { setupServer } from '@kbn/core/server/test_utils';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
-import { licensingMock } from '../../../../../licensing/server/mocks';
+import { ReportingCore } from '../../..';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { ReportingStore } from '../../../lib';
 import { ExportTypesRegistry } from '../../../lib/export_types_registry';
 import { Report } from '../../../lib/store';
diff --git a/x-pack/plugins/reporting/server/routes/index.ts b/x-pack/plugins/reporting/server/routes/index.ts
index 0cc0d1bdc6796..570d74f3e02ab 100644
--- a/x-pack/plugins/reporting/server/routes/index.ts
+++ b/x-pack/plugins/reporting/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import { ReportingCore } from '..';
 import { registerDeprecationsRoutes } from './deprecations/deprecations';
 import { registerDiagnosticRoutes } from './diagnostic';
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 51e0994b59109..dba962f481b78 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
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
-import { ReportingCore } from '../../';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { ReportingCore } from '../..';
 import { ReportingInternalSetup, ReportingInternalStart } from '../../core';
 import {
   createMockConfigSchema,
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 7cf7e0b365f26..9b35b6fdbef10 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
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RequestHandler, RouteMethod } from 'src/core/server';
-import { AuthenticatedUser } from '../../../../security/server';
+import { RequestHandler, RouteMethod } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
 import { ReportingCore } from '../../core';
 import { getUser } from './get_user';
 import type { ReportingRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts b/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts
index 89e6fcf7df21d..02f1eb5dee12e 100644
--- a/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/get_document_payload.ts
@@ -10,7 +10,7 @@ import { Stream } from 'stream';
 import contentDisposition from 'content-disposition';
 import { CSV_JOB_TYPE, CSV_JOB_TYPE_DEPRECATED } from '../../../common/constants';
 import { ReportApiJSON } from '../../../common/types';
-import { ReportingCore } from '../../';
+import { ReportingCore } from '../..';
 import { getContentStream, statuses } from '../../lib';
 import { ExportTypeDefinition } from '../../types';
 import { jobsQueryFactory } from './jobs_query';
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 837acf74ba885..589643781db19 100644
--- a/x-pack/plugins/reporting/server/routes/lib/get_user.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/get_user.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { SecurityPluginStart } from '../../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export function getUser(request: KibanaRequest, security?: SecurityPluginStart) {
   return security?.authc.getCurrentUser(request) ?? false;
diff --git a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts
index 88e55e54be539..5bf87885dc431 100644
--- a/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/job_response_handler.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Readable, Writable } from 'stream';
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { CSV_JOB_TYPE, PDF_JOB_TYPE } from '../../../common/constants';
 import { ReportingCore } from '../..';
 import { ContentStream, getContentStream } from '../../lib';
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 4033b317bef62..379454de7a0a8 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 { promisify } from 'util';
-import { kibanaResponseFactory } from 'kibana/server';
-import { ReportingCore } from '../../';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { ReportingCore } from '../..';
 import { ALLOWED_JOB_CONTENT_TYPES } from '../../../common/constants';
 import { getContentStream } from '../../lib';
 import { ReportingUser } from '../../types';
diff --git a/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts b/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts
index cc0df8c80fabc..0f72863ee03dd 100644
--- a/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/jobs_query.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { set } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { statuses } from '../../lib';
 import { createMockConfigSchema, createMockReportingCore } from '../../test_helpers';
 
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 af679b403cbaf..ed5df4e2db8ae 100644
--- a/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/jobs_query.ts
@@ -14,8 +14,8 @@ import {
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { errors } from '@elastic/elasticsearch';
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchClient } from 'src/core/server';
-import { ReportingCore } from '../../';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { ReportingCore } from '../..';
 import { REPORTING_SYSTEM_INDEX } from '../../../common/constants';
 import { ReportApiJSON, ReportSource } from '../../../common/types';
 import { statuses } from '../../lib/statuses';
diff --git a/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts b/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts
index c97ec3285839d..97b85f8d2d5cd 100644
--- a/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/request_handler.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest, KibanaResponseFactory } from 'kibana/server';
-import { coreMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { ReportingCore } from '../..';
 import { JobParamsPDFDeprecated, TaskPayloadPDF } from '../../export_types/printable_pdf/types';
 import { Report, ReportingStore } from '../../lib/store';
diff --git a/x-pack/plugins/reporting/server/routes/lib/request_handler.ts b/x-pack/plugins/reporting/server/routes/lib/request_handler.ts
index b8a3a4c69802c..8528afa709362 100644
--- a/x-pack/plugins/reporting/server/routes/lib/request_handler.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/request_handler.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-import type { KibanaRequest, KibanaResponseFactory, Logger } from 'kibana/server';
+import type { KibanaRequest, KibanaResponseFactory, Logger } from '@kbn/core/server';
 import type { ReportingCore } from '../..';
 import { API_BASE_URL } from '../../../common/constants';
 import { checkParamsVersion, cryptoFactory } from '../../lib';
diff --git a/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts b/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts
index 41165894464f1..ed7edf1ff6895 100644
--- a/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts
+++ b/x-pack/plugins/reporting/server/routes/management/integration_tests/jobs.test.ts
@@ -8,13 +8,13 @@
 jest.mock('../../../lib/content_stream', () => ({
   getContentStream: jest.fn(),
 }));
-import type { ElasticsearchClientMock } from '../../../../../../../src/core/server/mocks';
+import type { ElasticsearchClientMock } from '@kbn/core/server/mocks';
 import { BehaviorSubject } from 'rxjs';
-import { setupServer } from 'src/core/server/test_utils';
+import { setupServer } from '@kbn/core/server/test_utils';
 import { Readable } from 'stream';
 import supertest from 'supertest';
-import { ReportingCore } from '../../../';
-import { licensingMock } from '../../../../../licensing/server/mocks';
+import { ReportingCore } from '../../..';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { ReportingInternalSetup, ReportingInternalStart } from '../../../core';
 import { ContentStream, ExportTypesRegistry, getContentStream } from '../../../lib';
 import {
diff --git a/x-pack/plugins/reporting/server/routes/management/jobs.ts b/x-pack/plugins/reporting/server/routes/management/jobs.ts
index 54fc13ffbb613..0e017ece629e0 100644
--- a/x-pack/plugins/reporting/server/routes/management/jobs.ts
+++ b/x-pack/plugins/reporting/server/routes/management/jobs.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { ReportingCore } from '../../';
-import { ROUTE_TAG_CAN_REDIRECT } from '../../../../security/server';
+import { ROUTE_TAG_CAN_REDIRECT } from '@kbn/security-plugin/server';
+import { ReportingCore } from '../..';
 import { API_BASE_URL } from '../../../common/constants';
 import { authorizedUserPreRouting } from '../lib/authorized_user_pre_routing';
 import { jobsQueryFactory } from '../lib/jobs_query';
diff --git a/x-pack/plugins/reporting/server/services.ts b/x-pack/plugins/reporting/server/services.ts
index 55f32e21e4784..a09442ec32793 100644
--- a/x-pack/plugins/reporting/server/services.ts
+++ b/x-pack/plugins/reporting/server/services.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import { createGetterSetter } from '../../../../src/plugins/kibana_utils/server';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/server';
 
 export const [getFieldFormats, setFieldFormats] =
   createGetterSetter<FieldFormatsStart>('FieldFormats');
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
index 5b92c1f7d5983..4ec1cab671000 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts
@@ -15,18 +15,18 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
   statusServiceMock,
-} from 'src/core/server/mocks';
-import { dataPluginMock } from 'src/plugins/data/server/mocks';
-import { FieldFormatsRegistry } from 'src/plugins/field_formats/common';
-import { fieldFormatsMock } from 'src/plugins/field_formats/common/mocks';
+} from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { DeepPartial } from 'utility-types';
-import { ReportingConfig, ReportingCore } from '../';
-import { featuresPluginMock } from '../../../features/server/mocks';
-import { licensingMock } from '../../../licensing/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createMockScreenshottingStart } from '../../../screenshotting/server/mock';
-import { securityMock } from '../../../security/server/mocks';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+import { createMockScreenshottingStart } from '@kbn/screenshotting-plugin/server/mock';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { ReportingConfig, ReportingCore } from '..';
 import { buildConfig, ReportingConfigType } from '../config';
 import { ReportingInternalSetup, ReportingInternalStart } from '../core';
 import { ReportingStore } from '../lib';
@@ -118,16 +118,7 @@ export const createMockConfigSchema = (
       enabled: false,
       ...overrides.roles,
     },
-    capture: {
-      maxAttempts: 1,
-      loadDelay: 1,
-      timeouts: {
-        openUrl: 100,
-        renderComplete: 100,
-        waitForElements: 100,
-      },
-      zoom: 1,
-    },
+    capture: { maxAttempts: 1 },
   } as ReportingConfigType;
 };
 
diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
index 5ff13a72ea83d..b272f9687c14b 100644
--- a/x-pack/plugins/reporting/server/types.ts
+++ b/x-pack/plugins/reporting/server/types.ts
@@ -5,27 +5,30 @@
  * 2.0.
  */
 
-import type { IRouter, Logger, RequestHandlerContext } from 'kibana/server';
+import type { IRouter, Logger, RequestHandlerContext } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DataPluginStart } from 'src/plugins/data/server/plugin';
-import { FieldFormatsStart } from 'src/plugins/field_formats/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { DataPluginStart } from '@kbn/data-plugin/server/plugin';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type { Writable } from 'stream';
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import type { LicensingPluginStart } from '../../licensing/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type {
   PngScreenshotOptions as BasePngScreenshotOptions,
   PdfScreenshotOptions as BasePdfScreenshotOptions,
   ScreenshottingStart,
-} from '../../screenshotting/server';
+} from '@kbn/screenshotting-plugin/server';
 import type {
   AuthenticatedUser,
   SecurityPluginSetup,
   SecurityPluginStart,
-} from '../../security/server';
-import type { SpacesPluginSetup } from '../../spaces/server';
-import type { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/security-plugin/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+import type {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
 import type { CancellationToken } from '../common/cancellation_token';
 import type { BaseParams, BasePayload, TaskRunResult, UrlOrUrlLocatorTuple } from '../common/types';
 import type { ReportingConfigType } from './config';
@@ -48,7 +51,6 @@ export interface ReportingSetup {
 export type ReportingStart = ReportingSetup;
 export type ReportingUser = { username: AuthenticatedUser['username'] } | false;
 
-export type CaptureConfig = ReportingConfigType['capture'];
 export type ScrollConfig = ReportingConfigType['csv']['scroll'];
 
 /**
diff --git a/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts b/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts
index 6eda1bc5abfa9..0737e522c6347 100644
--- a/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts
+++ b/x-pack/plugins/reporting/server/usage/get_export_type_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import { ExportTypesRegistry } from '../lib/export_types_registry';
-import { FeaturesAvailability } from './';
+import { FeaturesAvailability } from '.';
 import { JobTypes } from './types';
 
 /*
diff --git a/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts b/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts
index a4d0ca9c66a0c..36f3bce78f624 100644
--- a/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts
+++ b/x-pack/plugins/reporting/server/usage/get_reporting_usage.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { REPORTING_SYSTEM_INDEX } from '../../common/constants';
 import type { ExportTypesRegistry } from '../lib/export_types_registry';
-import type { GetLicense } from './';
+import type { GetLicense } from '.';
 import { getExportStats } from './get_export_stats';
 import { getExportTypesHandler } from './get_export_type_handler';
 import type {
diff --git a/x-pack/plugins/reporting/server/usage/index.ts b/x-pack/plugins/reporting/server/usage/index.ts
index 041c4982b7757..d15846227f920 100644
--- a/x-pack/plugins/reporting/server/usage/index.ts
+++ b/x-pack/plugins/reporting/server/usage/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/server';
+import { LicenseType } from '@kbn/licensing-plugin/server';
 
 export interface FeaturesAvailability {
   isAvailable: () => boolean;
diff --git a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
index 1dcf0d680fdb4..730f2ec5282df 100644
--- a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
+++ b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
@@ -6,15 +6,15 @@
  */
 
 import { loggerMock } from '@kbn/logging-mocks';
-import type { ElasticsearchClientMock } from '../../../../../src/core/server/mocks';
+import type { ElasticsearchClientMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
   usageCollectionPluginMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { getExportTypesRegistry } from '../lib/export_types_registry';
 import { createMockConfigSchema, createMockReportingCore } from '../test_helpers';
-import { FeaturesAvailability } from './';
+import { FeaturesAvailability } from '.';
 import {
   getReportingUsageCollector,
   registerReportingUsageCollector,
diff --git a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
index c7c8dfd620da1..6af917247725e 100644
--- a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
+++ b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import { first, map } from 'rxjs/operators';
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { ReportingCore } from '../';
+import { firstValueFrom } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { ReportingCore } from '..';
 import { ExportTypesRegistry } from '../lib/export_types_registry';
-import { GetLicense } from './';
+import { GetLicense } from '.';
 import { getReportingUsage } from './get_reporting_usage';
 import { ReportingUsageType } from './types';
 import { reportingSchema } from './schema';
@@ -44,17 +45,16 @@ export function registerReportingUsageCollector(
   const exportTypesRegistry = reporting.getExportTypesRegistry();
   const getLicense = async () => {
     const { licensing } = await reporting.getPluginStartDeps();
-    return await licensing.license$
-      .pipe(
+    return await firstValueFrom(
+      licensing.license$.pipe(
         map(({ isAvailable, type }) => ({
           isAvailable: () => isAvailable,
           license: {
             getType: () => type,
           },
-        })),
-        first()
+        }))
       )
-      .toPromise();
+    );
   };
   const collectionIsReady = reporting.pluginStartsUp.bind(reporting);
 
diff --git a/x-pack/plugins/reporting/server/usage/schema.ts b/x-pack/plugins/reporting/server/usage/schema.ts
index dde4b5647fd9e..a4cd8a3e51bfa 100644
--- a/x-pack/plugins/reporting/server/usage/schema.ts
+++ b/x-pack/plugins/reporting/server/usage/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import {
   AppCounts,
   AvailableTotal,
diff --git a/x-pack/plugins/rollup/common/index.ts b/x-pack/plugins/rollup/common/index.ts
index c912a905d061d..56197d59fd546 100644
--- a/x-pack/plugins/rollup/common/index.ts
+++ b/x-pack/plugins/rollup/common/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/rollup/kibana.json b/x-pack/plugins/rollup/kibana.json
index 20f284686f3b5..c5b2511ccec63 100644
--- a/x-pack/plugins/rollup/kibana.json
+++ b/x-pack/plugins/rollup/kibana.json
@@ -11,5 +11,5 @@
   "requiredPlugins": ["management", "licensing", "features"],
   "optionalPlugins": ["home", "indexManagement", "usageCollection", "visTypeTimeseries"],
   "configPath": ["xpack", "rollup"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "home", "esUiShared", "data"]
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "esUiShared", "data"]
 }
diff --git a/x-pack/plugins/rollup/public/application.tsx b/x-pack/plugins/rollup/public/application.tsx
index 6e216f87ce6dc..38a7bb16af828 100644
--- a/x-pack/plugins/rollup/public/application.tsx
+++ b/x-pack/plugins/rollup/public/application.tsx
@@ -9,7 +9,8 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Provider } from 'react-redux';
 
-import { CoreSetup, ExecutionContextStart } from 'kibana/public';
+import { CoreSetup, ExecutionContextStart } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { KibanaContextProvider, KibanaThemeProvider, useExecutionContext } from './shared_imports';
 // @ts-ignore
 import { rollupJobsStore } from './crud_app/store';
@@ -18,8 +19,6 @@ import { App } from './crud_app/app';
 
 import './index.scss';
 
-import { ManagementAppMountParams } from '../../../../src/plugins/management/public';
-
 const AppWithExecutionContext = ({
   history,
   executionContext,
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
index 97602238dc5ee..22bc32a1498ce 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/job_create.js
@@ -12,7 +12,7 @@ import { cloneDeep, debounce, first, mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 import {
   EuiCallOut,
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
index eea02c941261a..7acb96fb7827a 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
@@ -25,7 +25,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { search } from '../../../../../../../../src/plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 const { parseEsInterval } = search.aggs;
 
 import { documentationLinks } from '../../../services/documentation_links';
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
index 2e54176a71e88..a3c594f439c37 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
@@ -25,8 +25,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { CronEditor } from '../../../../../../../../src/plugins/es_ui_shared/public';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { CronEditor } from '@kbn/es-ui-shared-plugin/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 
 import { indices } from '../../../../shared_imports';
 import { documentationLinks } from '../../../services/documentation_links';
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js
index e79416b2ef277..eb7767c52f368 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_date_histogram_interval.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { search } from '../../../../../../../../src/plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 const { InvalidEsIntervalFormatError, InvalidEsCalendarIntervalError, parseEsInterval } =
   search.aggs;
 
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
index 6ccda42b9007f..e11714ebf1eba 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '@kbn/data-plugin/public';
 export function validateIndexPattern(indexPattern, rollupIndex) {
   if (!indexPattern || !indexPattern.trim()) {
     return [
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js
index 454e0a25c9fee..2a38ed7c2da88 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_rollup_delay.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { search } from '../../../../../../../../src/plugins/data/public';
+import { search } from '@kbn/data-plugin/public';
 const { InvalidEsIntervalFormatError, InvalidEsCalendarIntervalError, parseEsInterval } =
   search.aggs;
 
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
index 81df23b853008..e5c04dc6fffef 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
@@ -19,7 +19,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 
 import { extractQueryParams, SectionLoading } from '../../../shared_imports';
 import { getRouterLinkProps, listBreadcrumb } from '../../services';
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
index ba82e3b9b9f5e..d15376323c0d3 100644
--- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
+++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
@@ -10,8 +10,8 @@ import { registerTestBed } from '@kbn/test-jest-helpers';
 import { rollupJobsStore } from '../../store';
 import { JobList } from './job_list';
 
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 jest.mock('../../services', () => {
@@ -23,7 +23,7 @@ jest.mock('../../services', () => {
 });
 
 jest.mock('../../services/documentation_links', () => {
-  const coreMocks = jest.requireActual('../../../../../../../src/core/public/mocks');
+  const coreMocks = jest.requireActual('@kbn/core/public/mocks');
 
   return {
     init: jest.fn(),
diff --git a/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts b/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts
index a2adfd7a38529..84e38ac9c3cb1 100644
--- a/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts
+++ b/x-pack/plugins/rollup/public/crud_app/services/api_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { getNotifications, getFatalErrors } from '../../kibana_services';
 
 function createToastConfig(
diff --git a/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts b/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts
index 65bbfd919f94d..267f71b58bbdb 100644
--- a/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts
+++ b/x-pack/plugins/rollup/public/crud_app/services/documentation_links.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DocLinksStart } from 'src/core/public';
+import type { DocLinksStart } from '@kbn/core/public';
 
 export let documentationLinks: DocLinksStart['links'];
 
diff --git a/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts b/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts
index 0ca5991c5b1e1..d450ccbe2d11e 100644
--- a/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts
+++ b/x-pack/plugins/rollup/public/crud_app/services/http_provider.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 
 let _http: HttpStart | null = null;
 
diff --git a/x-pack/plugins/rollup/public/index.ts b/x-pack/plugins/rollup/public/index.ts
index f740971b4bcb0..47b9b5648247e 100644
--- a/x-pack/plugins/rollup/public/index.ts
+++ b/x-pack/plugins/rollup/public/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import { RollupPlugin } from './plugin';
 
diff --git a/x-pack/plugins/rollup/public/kibana_services.ts b/x-pack/plugins/rollup/public/kibana_services.ts
index 0bfce1e041f20..04927c9e8faf9 100644
--- a/x-pack/plugins/rollup/public/kibana_services.ts
+++ b/x-pack/plugins/rollup/public/kibana_services.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { NotificationsStart, FatalErrorsSetup } from 'kibana/public';
+import { NotificationsStart, FatalErrorsSetup } from '@kbn/core/public';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { createGetterSetter } from '../../../../src/plugins/kibana_utils/common';
+import { createGetterSetter } from '@kbn/kibana-utils-plugin/common';
 
 let notifications: NotificationsStart | null = null;
 let fatalErrors: FatalErrorsSetup | null = null;
diff --git a/x-pack/plugins/rollup/public/plugin.ts b/x-pack/plugins/rollup/public/plugin.ts
index 6d0273e3750f0..27e8ad8b59d34 100644
--- a/x-pack/plugins/rollup/public/plugin.ts
+++ b/x-pack/plugins/rollup/public/plugin.ts
@@ -6,19 +6,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_management';
 import { UIM_APP_NAME } from '../common';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { IndexManagementPluginSetup } from '../../index_management/public';
 // @ts-ignore
-import { setHttp, init as initDocumentation } from './crud_app/services/index';
+import { setHttp, init as initDocumentation } from './crud_app/services';
 import { setNotifications, setFatalErrors, setUiStatsReporter } from './kibana_services';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { ClientConfigType } from './types';
 
 export interface RollupPluginSetupDependencies {
@@ -60,7 +57,7 @@ export class RollupPlugin implements Plugin {
         icon: 'indexRollupApp',
         path: `/app/management/data/rollup_jobs/job_list`,
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
diff --git a/x-pack/plugins/rollup/public/shared_imports.ts b/x-pack/plugins/rollup/public/shared_imports.ts
index 83182f2e05fe7..cee1fe39bc16a 100644
--- a/x-pack/plugins/rollup/public/shared_imports.ts
+++ b/x-pack/plugins/rollup/public/shared_imports.ts
@@ -10,10 +10,10 @@ export {
   indices,
   SectionLoading,
   EuiCodeEditor,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   KibanaContextProvider,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx b/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx
index 5e5c8bb1f071d..6b763fec07a66 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx
+++ b/x-pack/plugins/rollup/public/test/client_integration/helpers/jest.mocks.tsx
@@ -11,7 +11,7 @@ jest.mock('lodash', () => ({
 }));
 
 jest.mock('../../../crud_app/services/documentation_links', () => {
-  const coreMocks = jest.requireActual('../../../../../../../src/core/public/mocks');
+  const coreMocks = jest.requireActual('@kbn/core/public/mocks');
 
   return {
     init: jest.fn(),
diff --git a/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx b/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx
index c5e5ed1bdd2e3..ca8c80cea87b6 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx
+++ b/x-pack/plugins/rollup/public/test/client_integration/helpers/setup_context.tsx
@@ -7,8 +7,8 @@
 
 import React, { FunctionComponent } from 'react';
 
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 const startMock = coreMock.createStart();
 
 const services = {
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js
index 0b314d9174d0d..7a4eae8d0841f 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_clone.test.js
@@ -10,7 +10,7 @@ import { mockHttpRequest, pageHelpers } from './helpers';
 import { act } from 'react-dom/test-utils';
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
 import { JOB_TO_CLONE, JOB_CLONE_INDEX_PATTERN_CHECK } from './helpers/constants';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobClone;
 const {
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js
index dda79395dd4a7..565badc85403e 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_date_histogram.test.js
@@ -9,7 +9,7 @@ import { mockHttpRequest, pageHelpers } from './helpers';
 
 import moment from 'moment-timezone';
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { docLinksServiceMock, coreMock } from '../../../../../../src/core/public/mocks';
+import { docLinksServiceMock, coreMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js
index 50615ed00a680..1166462a833de 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_histogram.test.js
@@ -8,7 +8,7 @@
 import { mockHttpRequest, pageHelpers } from './helpers';
 
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js
index 667e3b569518a..540b9b7bb0dbc 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_logistics.test.js
@@ -8,8 +8,8 @@
 import { mockHttpRequest, pageHelpers } from './helpers';
 
 import { act } from 'react-dom/test-utils';
-import { indexPatterns } from '../../../../../../src/plugins/data/public';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { indexPatterns } from '@kbn/data-plugin/public';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
 
 const { setup } = pageHelpers.jobCreate;
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js
index 659bcbce1c8eb..9f8b108049e23 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_metrics.test.js
@@ -8,7 +8,7 @@
 import { mockHttpRequest, pageHelpers } from './helpers';
 
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js
index bbd2e72c6eee1..4927233b958b9 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js
@@ -9,7 +9,7 @@ import { pageHelpers, mockHttpRequest } from './helpers';
 
 import { act } from 'react-dom/test-utils';
 import { first } from 'lodash';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { setHttp } from '../../crud_app/services';
 import { JOBS } from './helpers/constants';
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js
index b84aad9bf9aa4..e4998d7e41ca7 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_terms.test.js
@@ -8,7 +8,7 @@
 import { pageHelpers, mockHttpRequest } from './helpers';
 
 import { setHttp, init as initDocumentation } from '../../crud_app/services';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 const { setup } = pageHelpers.jobCreate;
 
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
index 18ffce77b9656..ccb177c17a14b 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
@@ -10,7 +10,7 @@ import { mockHttpRequest, pageHelpers } from './helpers';
 import { act } from 'react-dom/test-utils';
 import { getRouter, setHttp, init as initDocumentation } from '../../crud_app/services';
 import { JOBS } from './helpers/constants';
-import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../crud_app/services', () => {
   const services = jest.requireActual('../../crud_app/services');
diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js
index 1e24a4f92666c..03833cb3a02e8 100644
--- a/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js
+++ b/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js
@@ -11,7 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { JOB_TO_CLONE, JOB_CLONE_INDEX_PATTERN_CHECK } from './helpers/constants';
 import { getRouter } from '../../crud_app/services/routing';
 import { setHttp } from '../../crud_app/services';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../kibana_services', () => {
   const services = jest.requireActual('../../kibana_services');
diff --git a/x-pack/plugins/rollup/server/collectors/helpers.test.ts b/x-pack/plugins/rollup/server/collectors/helpers.test.ts
index 68fd1c24ea91b..d1ecfe1aa5980 100644
--- a/x-pack/plugins/rollup/server/collectors/helpers.test.ts
+++ b/x-pack/plugins/rollup/server/collectors/helpers.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   fetchRollupIndexPatterns,
   fetchRollupSavedSearches,
diff --git a/x-pack/plugins/rollup/server/collectors/helpers.ts b/x-pack/plugins/rollup/server/collectors/helpers.ts
index a00ad10237ee9..c7ff8a2c42f34 100644
--- a/x-pack/plugins/rollup/server/collectors/helpers.ts
+++ b/x-pack/plugins/rollup/server/collectors/helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 // elasticsearch index.max_result_window default value
 const ES_MAX_RESULT_WINDOW_DEFAULT_VALUE = 1000;
diff --git a/x-pack/plugins/rollup/server/collectors/register.test.ts b/x-pack/plugins/rollup/server/collectors/register.test.ts
index 30aae2cd14b57..5180c54c9d41a 100644
--- a/x-pack/plugins/rollup/server/collectors/register.test.ts
+++ b/x-pack/plugins/rollup/server/collectors/register.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createUsageCollectionSetupMock } from 'src/plugins/usage_collection/server/mocks';
+import { createUsageCollectionSetupMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { registerRollupUsageCollector } from './register';
 
 describe('registerRollupUsageCollector', () => {
diff --git a/x-pack/plugins/rollup/server/collectors/register.ts b/x-pack/plugins/rollup/server/collectors/register.ts
index 83b20d0708fbc..6fe44ee0309f9 100644
--- a/x-pack/plugins/rollup/server/collectors/register.ts
+++ b/x-pack/plugins/rollup/server/collectors/register.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup, CollectorFetchContext } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup, CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import {
   fetchRollupIndexPatterns,
   fetchRollupSavedSearches,
diff --git a/x-pack/plugins/rollup/server/config.ts b/x-pack/plugins/rollup/server/config.ts
index c0cca4bbb4d33..235202a23db24 100644
--- a/x-pack/plugins/rollup/server/config.ts
+++ b/x-pack/plugins/rollup/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common';
 
diff --git a/x-pack/plugins/rollup/server/index.ts b/x-pack/plugins/rollup/server/index.ts
index 6ae1d9f24b8b9..8f41f7f9cf6fe 100644
--- a/x-pack/plugins/rollup/server/index.ts
+++ b/x-pack/plugins/rollup/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { RollupPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/rollup/server/plugin.ts b/x-pack/plugins/rollup/server/plugin.ts
index 93b216f05d37e..91538ae9a375d 100644
--- a/x-pack/plugins/rollup/server/plugin.ts
+++ b/x-pack/plugins/rollup/server/plugin.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
+import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
 import { PLUGIN, CONFIG_ROLLUPS } from '../common';
 import { Dependencies } from './types';
 import { registerApiRoutes } from './routes';
@@ -18,7 +19,6 @@ import { rollupDataEnricher } from './rollup_data_enricher';
 import { IndexPatternsFetcher } from './shared_imports';
 import { handleEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
-import { getCapabilitiesForRollupIndices } from '../../../../src/plugins/data/server';
 
 export class RollupPlugin implements Plugin<void, void, any, any> {
   private readonly logger: Logger;
diff --git a/x-pack/plugins/rollup/server/rollup_data_enricher.ts b/x-pack/plugins/rollup/server/rollup_data_enricher.ts
index 599a53734605f..b1da5526c8f58 100644
--- a/x-pack/plugins/rollup/server/rollup_data_enricher.ts
+++ b/x-pack/plugins/rollup/server/rollup_data_enricher.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
-import { Index } from '../../../plugins/index_management/server';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { Index } from '@kbn/index-management-plugin/server';
 
 export const rollupDataEnricher = async (indicesList: Index[], client: IScopedClusterClient) => {
   if (!indicesList || !indicesList.length) {
diff --git a/x-pack/plugins/rollup/server/services/license.ts b/x-pack/plugins/rollup/server/services/license.ts
index 1b88a4020afa6..3a10e9a4b9ce2 100644
--- a/x-pack/plugins/rollup/server/services/license.ts
+++ b/x-pack/plugins/rollup/server/services/license.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Logger, RequestHandlerContext } from 'src/core/server';
-import { KibanaRequest, KibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { Logger, RequestHandlerContext } from '@kbn/core/server';
+import { KibanaRequest, KibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
-import { LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/rollup/server/shared_imports.ts b/x-pack/plugins/rollup/server/shared_imports.ts
index fe157644c6b3d..8cc3879d70c91 100644
--- a/x-pack/plugins/rollup/server/shared_imports.ts
+++ b/x-pack/plugins/rollup/server/shared_imports.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-export { IndexPatternsFetcher } from '../../../../src/plugins/data/server';
+export { IndexPatternsFetcher } from '@kbn/data-plugin/server';
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/rollup/server/types.ts b/x-pack/plugins/rollup/server/types.ts
index a3e826fefa0bf..177efe0915fcf 100644
--- a/x-pack/plugins/rollup/server/types.ts
+++ b/x-pack/plugins/rollup/server/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { VisTypeTimeseriesSetup } from 'src/plugins/vis_types/timeseries/server';
+import { IRouter } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
 
-import { getCapabilitiesForRollupIndices } from 'src/plugins/data/server';
-import { IndexManagementPluginSetup } from '../../index_management/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { getCapabilitiesForRollupIndices } from '@kbn/data-plugin/server';
+import { IndexManagementPluginSetup } from '@kbn/index-management-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { License } from './services';
 import { IndexPatternsFetcher } from './shared_imports';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts b/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts
index e93254c3c5a66..8c661ed1e4f4f 100644
--- a/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts
+++ b/x-pack/plugins/rule_registry/common/pick_with_patterns/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { pickWithPatterns } from './';
+import { pickWithPatterns } from '.';
 
 describe('pickWithPatterns', () => {
   const fieldMap = {
diff --git a/x-pack/plugins/rule_registry/common/search_strategy/index.ts b/x-pack/plugins/rule_registry/common/search_strategy/index.ts
index b0f41129b8149..1f3b415e53926 100644
--- a/x-pack/plugins/rule_registry/common/search_strategy/index.ts
+++ b/x-pack/plugins/rule_registry/common/search_strategy/index.ts
@@ -6,9 +6,9 @@
  */
 import { ValidFeatureId } from '@kbn/rule-data-utils';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Ecs } from 'kibana/server';
+import { Ecs } from '@kbn/core/server';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IEsSearchRequest, IEsSearchResponse } from 'src/plugins/data/common';
+import { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
 
 export type RuleRegistrySearchRequest = IEsSearchRequest & {
   featureIds: ValidFeatureId[];
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
index a0b3d2154d688..b5df5dc830d48 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -21,16 +21,16 @@ import {
   InlineScript,
   QueryDslQueryContainer,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RuleTypeParams } from '../../../alerting/server';
+import { RuleTypeParams } from '@kbn/alerting-plugin/server';
 import {
   ReadOperations,
   AlertingAuthorization,
   WriteOperations,
   AlertingAuthorizationEntity,
-} from '../../../alerting/server';
-import { Logger, ElasticsearchClient, EcsEventOutcome } from '../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { Logger, ElasticsearchClient, EcsEventOutcome } from '@kbn/core/server';
+import { AuditLogger } from '@kbn/security-plugin/server';
 import { alertAuditEvent, operationAlertAuditActionMap } from './audit_events';
-import { AuditLogger } from '../../../security/server';
 import {
   ALERT_WORKFLOW_STATUS,
   ALERT_RULE_CONSUMER,
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
index c8660fc69c224..35e80fb271f34 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.test.ts
@@ -8,11 +8,11 @@
 import { Request } from '@hapi/hapi';
 
 import { AlertsClientFactory, AlertsClientFactoryProps } from './alerts_client_factory';
-import { ElasticsearchClient, KibanaRequest } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
+import { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
 import { ruleDataServiceMock } from '../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 jest.mock('./alerts_client');
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
index 8225394c2dba7..dd924ba0b8144 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client_factory.ts
@@ -6,9 +6,9 @@
  */
 
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { ElasticsearchClient, KibanaRequest, Logger } from 'src/core/server';
-import { AlertingAuthorization } from '../../../alerting/server';
-import { SecurityPluginSetup } from '../../../security/server';
+import { ElasticsearchClient, KibanaRequest, Logger } from '@kbn/core/server';
+import { AlertingAuthorization } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { IRuleDataService } from '../rule_data_plugin_service';
 import { AlertsClient } from './alerts_client';
 
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts b/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts
index 4b983e986f859..36a6a497203e7 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/audit_events.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { EcsEventOutcome, EcsEventType } from 'src/core/server';
-import { AuditEvent } from '../../../security/server';
-import { ReadOperations, WriteOperations } from '../../../alerting/server';
+import { EcsEventOutcome, EcsEventType } from '@kbn/core/server';
+import { AuditEvent } from '@kbn/security-plugin/server';
+import { ReadOperations, WriteOperations } from '@kbn/alerting-plugin/server';
 
 export enum AlertAuditAction {
   GET = 'alert_get',
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
index 3c57d8269f42b..3f9143ac7922b 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/bulk_update.test.ts
@@ -13,12 +13,12 @@ import {
   ALERT_RULE_TYPE_ID,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
index 7c4085cb5837f..b818ff183f3e0 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
@@ -12,12 +12,12 @@ import {
   ALERT_WORKFLOW_STATUS,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
index e3f186ce8c0c8..a9bfe02443f73 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
@@ -13,12 +13,12 @@ import {
   ALERT_RULE_TYPE_ID,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
index 8c540fc19f537..785926656b825 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/update.test.ts
@@ -12,12 +12,12 @@ import {
   ALERT_RULE_TYPE_ID,
 } from '@kbn/rule-data-utils';
 import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertingAuthorizationMock } from '../../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../../alerting/server';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
 import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
diff --git a/x-pack/plugins/rule_registry/server/config.ts b/x-pack/plugins/rule_registry/server/config.ts
index c0b9739910982..d3b297db070ad 100644
--- a/x-pack/plugins/rule_registry/server/config.ts
+++ b/x-pack/plugins/rule_registry/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 export const config: PluginConfigDescriptor = {
   deprecations: ({ unused }) => [unused('unsafe.indexUpgrade.enabled', { level: 'warning' })],
diff --git a/x-pack/plugins/rule_registry/server/index.ts b/x-pack/plugins/rule_registry/server/index.ts
index d52cd0ebf608c..c39aeb158be74 100644
--- a/x-pack/plugins/rule_registry/server/index.ts
+++ b/x-pack/plugins/rule_registry/server/index.ts
@@ -8,7 +8,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110907
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { RuleRegistryPlugin } from './plugin';
 
 export type { RuleRegistryPluginSetupContract, RuleRegistryPluginStartContract } from './plugin';
diff --git a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts
index 3b79c7a5bad8a..026a63bc86b11 100644
--- a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts
+++ b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.test.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { ReadOperations } from '../../../alerting/server';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { ReadOperations } from '@kbn/alerting-plugin/server';
 import { getAuthzFilter } from './get_authz_filter';
 
 describe('getAuthzFilter()', () => {
diff --git a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts
index 88b8feb2ca97c..35bab55c7c4e3 100644
--- a/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts
+++ b/x-pack/plugins/rule_registry/server/lib/get_authz_filter.ts
@@ -11,7 +11,7 @@ import {
   AlertingAuthorization,
   AlertingAuthorizationEntity,
   AlertingAuthorizationFilterType,
-} from '../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import {
   ALERT_RULE_CONSUMER,
   ALERT_RULE_TYPE_ID,
diff --git a/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts b/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts
index c0961b84c7c28..5ff07750d8f87 100644
--- a/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts
+++ b/x-pack/plugins/rule_registry/server/lib/get_is_kibana_request.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Headers } from 'kibana/server';
+import type { Headers } from '@kbn/core/server';
 
 /**
  * Taken from
diff --git a/x-pack/plugins/rule_registry/server/plugin.ts b/x-pack/plugins/rule_registry/server/plugin.ts
index df32abcc80865..955d606dda507 100644
--- a/x-pack/plugins/rule_registry/server/plugin.ts
+++ b/x-pack/plugins/rule_registry/server/plugin.ts
@@ -13,15 +13,15 @@ import {
   KibanaRequest,
   CoreStart,
   IContextProvider,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
-import { PluginStartContract as AlertingStart } from '../../alerting/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { SpacesPluginStart } from '../../spaces/server';
+import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   PluginStart as DataPluginStart,
   PluginSetup as DataPluginSetup,
-} from '../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
 import { RuleRegistryPluginConfig } from './config';
 import { IRuleDataService, RuleDataService } from './rule_data_plugin_service';
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts
index 4521ba770d806..317379aba8405 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { coreMock, elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { alertsClientMock } from '../../alert_data_client/alerts_client.mock';
 import { RacRequestHandlerContext } from '../../types';
 
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts
index 7952b33dcf9b1..6afba9e232c5e 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/response_adapters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 const responseMock = {
   create: httpServerMock.createResponseFactory,
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts
index ade72435c57d9..963cea0e1e937 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RequestHandler, RouteConfig, KibanaRequest } from 'src/core/server';
-import { httpServerMock, httpServiceMock } from 'src/core/server/mocks';
+import { RequestHandler, RouteConfig, KibanaRequest } from '@kbn/core/server';
+import { httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
 import { RacRequestHandlerContext } from '../../types';
 import { requestContextMock } from './request_context';
 import { responseAdapter } from './response_adapters';
diff --git a/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts b/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts
index afeddee5ff876..4d297c56fe28b 100644
--- a/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts
+++ b/x-pack/plugins/rule_registry/server/routes/bulk_update_alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
diff --git a/x-pack/plugins/rule_registry/server/routes/find.ts b/x-pack/plugins/rule_registry/server/routes/find.ts
index 8fb3c116e171c..abf465fc5238d 100644
--- a/x-pack/plugins/rule_registry/server/routes/find.ts
+++ b/x-pack/plugins/rule_registry/server/routes/find.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
diff --git a/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts b/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts
index 9ddec56055a5a..86e2b25850aaf 100644
--- a/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts
+++ b/x-pack/plugins/rule_registry/server/routes/get_alert_by_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
diff --git a/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts b/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts
index 758057c21c43e..650c47f53f692 100644
--- a/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts
+++ b/x-pack/plugins/rule_registry/server/routes/get_alert_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
diff --git a/x-pack/plugins/rule_registry/server/routes/index.ts b/x-pack/plugins/rule_registry/server/routes/index.ts
index 4de121c7b9b5e..625869ecbe1a8 100644
--- a/x-pack/plugins/rule_registry/server/routes/index.ts
+++ b/x-pack/plugins/rule_registry/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { RacRequestHandlerContext } from '../types';
 import { getAlertByIdRoute } from './get_alert_by_id';
 import { updateAlertByIdRoute } from './update_alert_by_id';
diff --git a/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts b/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts
index a77688a514e77..1dcf7d28380dd 100644
--- a/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts
+++ b/x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import * as t from 'io-ts';
 import { id as _id } from '@kbn/securitysolution-io-ts-list-types';
 import { transformError } from '@kbn/securitysolution-es-utils';
diff --git a/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts b/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts
index 680b67949bde5..910d712a75d75 100644
--- a/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts
+++ b/x-pack/plugins/rule_registry/server/routes/utils/route_validation.ts
@@ -20,7 +20,7 @@ import {
   RouteValidationError,
   RouteValidationFunction,
   RouteValidationResultFactory,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 type RequestValidationResult<T> =
   | {
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts
index 0a700cab50ee6..2fa05e0cf27ca 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.test.ts
@@ -10,9 +10,9 @@ import { RuleDataClient, RuleDataClientConstructorOptions, WaitResult } from './
 import { IndexInfo } from '../rule_data_plugin_service/index_info';
 import { Dataset, RuleDataWriterInitializationError } from '..';
 import { resourceInstallerMock } from '../rule_data_plugin_service/resource_installer.mock';
-import { loggingSystemMock, elasticsearchServiceMock } from 'src/core/server/mocks';
-import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
-import { createNoMatchingIndicesError } from '../../../../../src/plugins/data_views/server/fetcher/lib/errors';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { IndexPatternsFetcher } from '@kbn/data-plugin/server';
+import { createNoMatchingIndicesError } from '@kbn/data-views-plugin/server/fetcher/lib/errors';
 
 const mockLogger = loggingSystemMock.create().get();
 const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient().asInternalUser;
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
index 6fe9d43ddbee0..e8c57c7c4ee4a 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/rule_data_client.ts
@@ -9,9 +9,9 @@ import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Either, isLeft } from 'fp-ts/lib/Either';
 
-import { ElasticsearchClient } from 'kibana/server';
-import { Logger } from 'kibana/server';
-import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
+import { IndexPatternsFetcher } from '@kbn/data-plugin/server';
 
 import {
   RuleDataWriteDisabledError,
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/types.ts b/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
index 55a03fda14624..7b59a64047d04 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/types.ts
@@ -8,8 +8,8 @@
 import type { TransportResult } from '@elastic/elasticsearch';
 import { BulkRequest, BulkResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ESSearchRequest, ESSearchResponse } from 'src/core/types/elasticsearch';
-import { FieldDescriptor } from 'src/plugins/data/server';
+import { ESSearchRequest, ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { FieldDescriptor } from '@kbn/data-plugin/server';
 import { ParsedExperimentalFields } from '../../common/parse_experimental_fields';
 import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
 
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts
index 0685fcc5bab93..f908224bb7a7b 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.test.ts
@@ -11,7 +11,7 @@ import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { Dataset } from './index_options';
 import { IndexInfo } from './index_info';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   DEFAULT_ILM_POLICY_ID,
   ECS_COMPONENT_TEMPLATE_NAME,
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
index ab7bc28af8c13..264df190b4839 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/resource_installer.ts
@@ -8,7 +8,7 @@
 import { get, isEmpty } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import { PublicMethodsOf } from '@kbn/utility-types';
 import {
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts
index befc42278196d..916ab9d7b7940 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.test.ts
@@ -7,7 +7,7 @@
 
 import { loggerMock } from '@kbn/logging-mocks';
 import { RuleDataService } from './rule_data_plugin_service';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 import { Dataset } from './index_options';
 import { RuleDataClient } from '../rule_data_client/rule_data_client';
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
index b916091510319..a940201841e6f 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.ts
@@ -8,7 +8,7 @@
 import { Either, isLeft, left, right } from 'fp-ts/lib/Either';
 import { ValidFeatureId } from '@kbn/rule-data-utils';
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import { INDEX_PREFIX } from '../config';
 import { IRuleDataClient, RuleDataClient, WaitResult } from '../rule_data_client';
diff --git a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts
index f5f7d8d164b48..79b9a8cd75c58 100644
--- a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts
+++ b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.test.ts
@@ -14,11 +14,11 @@ import {
   RULE_SEARCH_STRATEGY_NAME,
 } from './search_strategy';
 import { ruleDataServiceMock } from '../rule_data_plugin_service/rule_data_plugin_service.mock';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
-import { SearchStrategyDependencies } from '../../../../../src/plugins/data/server';
-import { alertsMock } from '../../../alerting/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { spacesMock } from '../../../spaces/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
+import { SearchStrategyDependencies } from '@kbn/data-plugin/server';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 import { RuleRegistrySearchRequest } from '../../common/search_strategy';
 import { IndexInfo } from '../rule_data_plugin_service/index_info';
 import * as getAuthzFilterImport from '../lib/get_authz_filter';
diff --git a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
index da32d68a85f86..851ffbdc098da 100644
--- a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
+++ b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
@@ -7,22 +7,22 @@
 import { map, mergeMap, catchError } from 'rxjs/operators';
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { from, of } from 'rxjs';
 import { isValidFeatureId, AlertConsumers } from '@kbn/rule-data-utils';
-import { ENHANCED_ES_SEARCH_STRATEGY } from '../../../../../src/plugins/data/common';
-import { ISearchStrategy, PluginStart } from '../../../../../src/plugins/data/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
+import { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
+import { ReadOperations, PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   RuleRegistrySearchRequest,
   RuleRegistrySearchResponse,
 } from '../../common/search_strategy';
-import { ReadOperations, PluginStartContract as AlertingStart } from '../../../alerting/server';
-import { SecurityPluginSetup } from '../../../security/server';
-import { SpacesPluginStart } from '../../../spaces/server';
 import { IRuleDataService } from '..';
 import { Dataset } from '../rule_data_plugin_service/index_options';
 import { MAX_ALERT_SEARCH_SIZE } from '../../common/constants';
-import { AlertAuditAction, alertAuditEvent } from '../';
+import { AlertAuditAction, alertAuditEvent } from '..';
 import { getSpacesFilter, getAuthzFilter } from '../lib';
 import { getIsKibanaRequest } from '../lib/get_is_kibana_request';
 
diff --git a/x-pack/plugins/rule_registry/server/types.ts b/x-pack/plugins/rule_registry/server/types.ts
index 752a573630af7..b634d352aaf8e 100644
--- a/x-pack/plugins/rule_registry/server/types.ts
+++ b/x-pack/plugins/rule_registry/server/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { RequestHandlerContext } from 'kibana/server';
+import { RequestHandlerContext } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../alerting/common';
-import { RuleExecutorOptions, RuleExecutorServices, RuleType } from '../../alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { RuleExecutorOptions, RuleExecutorServices, RuleType } from '@kbn/alerting-plugin/server';
 import { AlertsClient } from './alert_data_client/alerts_client';
 
 type SimpleAlertType<
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
index c31c4f15039cd..f38e73ca3a9a2 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
@@ -18,7 +18,7 @@ import {
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { ParsedExperimentalFields } from '../../common/parse_experimental_fields';
 import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
 import {
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts
index 0833a1c08d452..bf0d98d5156af 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_executor_mock.ts
@@ -10,7 +10,7 @@ import {
   RuleTypeState,
   AlertInstanceState,
   AlertInstanceContext,
-} from '../../../../plugins/alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { AlertExecutorOptionsWithExtraServices } from '../types';
 
 import { LifecycleAlertServices, LifecycleRuleExecutor } from './create_lifecycle_executor';
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
index 79ab866c62802..7894478aedf22 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
@@ -18,7 +18,7 @@ import { castArray, omit } from 'lodash';
 import { RuleDataClient } from '../rule_data_client';
 import { createRuleDataClientMock } from '../rule_data_client/rule_data_client.mock';
 import { createLifecycleRuleTypeFactory } from './create_lifecycle_rule_type_factory';
-import { ISearchStartSearchSource } from '../../../../../src/plugins/data/common';
+import { ISearchStartSearchSource } from '@kbn/data-plugin/common';
 
 type RuleTestHelpers = ReturnType<typeof createRule>;
 
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts
index 68f6340dfb513..bde184013df9b 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type_factory.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 import { Logger } from '@kbn/logging';
-import { IRuleDataClient } from '../rule_data_client';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { IRuleDataClient } from '../rule_data_client';
 import { AlertTypeWithExecutor } from '../types';
 import { LifecycleAlertService, createLifecycleExecutor } from './create_lifecycle_executor';
 
diff --git a/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts b/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts
index 256843a2646da..1aec64a408060 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_wrapper.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { alertsMock } from '../../../alerting/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { PersistenceServices } from './persistence_types';
 
 export const createPersistenceServicesMock = (): jest.Mocked<PersistenceServices> => {
diff --git a/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts b/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts
index a033890746f48..be611d8e959b2 100644
--- a/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts
+++ b/x-pack/plugins/rule_registry/server/utils/get_common_alert_fields.ts
@@ -18,7 +18,7 @@ import {
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
 
-import { RuleExecutorOptions } from '../../../alerting/server';
+import { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
 import { CommonAlertFieldsLatest } from '../../common/schemas';
 
 export const getCommonAlertFields = (
diff --git a/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts b/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts
index f1660628b4080..5465e7a7922c5 100644
--- a/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts
+++ b/x-pack/plugins/rule_registry/server/utils/lifecycle_alert_services_mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { AlertInstanceContext, AlertInstanceState } from '../../../alerting/server';
-import { alertsMock } from '../../../alerting/server/mocks';
+import { AlertInstanceContext, AlertInstanceState } from '@kbn/alerting-plugin/server';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { LifecycleAlertServices } from './create_lifecycle_executor';
 
 /**
diff --git a/x-pack/plugins/rule_registry/server/utils/persistence_types.ts b/x-pack/plugins/rule_registry/server/utils/persistence_types.ts
index 8bc511e83ac21..5390b275f73b7 100644
--- a/x-pack/plugins/rule_registry/server/utils/persistence_types.ts
+++ b/x-pack/plugins/rule_registry/server/utils/persistence_types.ts
@@ -13,8 +13,8 @@ import {
   RuleType,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/server';
-import { WithoutReservedActionGroups } from '../../../alerting/common';
+} from '@kbn/alerting-plugin/server';
+import { WithoutReservedActionGroups } from '@kbn/alerting-plugin/common';
 import { IRuleDataClient } from '../rule_data_client';
 import { BulkResponseErrorAggregation } from './utils';
 import { AlertWithCommonFieldsLatest } from '../../common/schemas';
diff --git a/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts b/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts
index c9b7138348c3d..05c069d80ed3e 100644
--- a/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts
+++ b/x-pack/plugins/rule_registry/server/utils/rule_executor_test_utils.ts
@@ -9,16 +9,16 @@ import {
   savedObjectsClientMock,
   httpServerMock,
   uiSettingsServiceMock,
-} from '../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   RuleExecutorOptions,
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeParams,
   RuleTypeState,
-} from '../../../alerting/server';
-import { alertsMock } from '../../../alerting/server/mocks';
-import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks';
+} from '@kbn/alerting-plugin/server';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
 
 export const createDefaultAlertExecutorOptions = <
   Params extends RuleTypeParams = never,
diff --git a/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts b/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts
index 91bd168257aaa..3863267373c15 100644
--- a/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts
+++ b/x-pack/plugins/rule_registry/server/utils/with_rule_data_client_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AlertInstanceContext, RuleTypeParams, RuleTypeState } from '../../../alerting/common';
+import { AlertInstanceContext, RuleTypeParams, RuleTypeState } from '@kbn/alerting-plugin/common';
 import { IRuleDataClient } from '../rule_data_client';
 import { AlertTypeWithExecutor } from '../types';
 
diff --git a/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx b/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx
index 336fb52f4cd00..770a718e7da97 100644
--- a/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx
+++ b/x-pack/plugins/runtime_fields/public/__jest__/setup_environment.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
-jest.mock('../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   const CodeEditorMock = (props: any) => (
     <input
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx
index 421be063dc508..4a7f8d07db7e1 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import '../../__jest__/setup_environment';
 import { registerTestBed, TestBed } from '../../test_utils';
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx
index ed08a2362416a..34b4ee50c84a2 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor/runtime_field_editor.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import { RuntimeField } from '../../types';
 import { getLinks } from '../../lib';
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx
index abcff4a79a475..64f5c6468ce1b 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import '../../__jest__/setup_environment';
 import { registerTestBed, TestBed } from '../../test_utils';
diff --git a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx
index 9d13b1b5004ae..33a77d46f774a 100644
--- a/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx
+++ b/x-pack/plugins/runtime_fields/public/components/runtime_field_editor_flyout_content/runtime_field_editor_flyout_content.tsx
@@ -19,7 +19,7 @@ import {
   EuiSpacer,
   EuiCallOut,
 } from '@elastic/eui';
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 import { RuntimeField } from '../../types';
 import { FormState } from '../runtime_field_form';
diff --git a/x-pack/plugins/runtime_fields/public/lib/documentation.ts b/x-pack/plugins/runtime_fields/public/lib/documentation.ts
index dfdd50b07d769..9e7829a6a548d 100644
--- a/x-pack/plugins/runtime_fields/public/lib/documentation.ts
+++ b/x-pack/plugins/runtime_fields/public/lib/documentation.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'src/core/public';
+import { DocLinksStart } from '@kbn/core/public';
 
 export const getLinks = ({ links }: DocLinksStart) => {
   const runtimePainless = `${links.runtimeFields.mapping}`;
diff --git a/x-pack/plugins/runtime_fields/public/load_editor.tsx b/x-pack/plugins/runtime_fields/public/load_editor.tsx
index 6aec33b90466f..8b5a188ecd4fb 100644
--- a/x-pack/plugins/runtime_fields/public/load_editor.tsx
+++ b/x-pack/plugins/runtime_fields/public/load_editor.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { CoreSetup, OverlayRef } from 'src/core/public';
+import { CoreSetup, OverlayRef } from '@kbn/core/public';
 
 import { toMountPoint, createKibanaReactContext } from './shared_imports';
 import { LoadEditorResponse, RuntimeField } from './types';
diff --git a/x-pack/plugins/runtime_fields/public/plugin.test.ts b/x-pack/plugins/runtime_fields/public/plugin.test.ts
index fc36eecc12f0a..38a37839145d6 100644
--- a/x-pack/plugins/runtime_fields/public/plugin.test.ts
+++ b/x-pack/plugins/runtime_fields/public/plugin.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { CoreSetup } from '@kbn/core/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
-jest.mock('../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/runtime_fields/public/plugin.ts b/x-pack/plugins/runtime_fields/public/plugin.ts
index 32b3981e90caa..84661c6ee5956 100644
--- a/x-pack/plugins/runtime_fields/public/plugin.ts
+++ b/x-pack/plugins/runtime_fields/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 
 import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types';
 import { getRuntimeFieldEditorLoader } from './load_editor';
diff --git a/x-pack/plugins/runtime_fields/public/shared_imports.ts b/x-pack/plugins/runtime_fields/public/shared_imports.ts
index 61b517a4e1117..6fa74f6676a2c 100644
--- a/x-pack/plugins/runtime_fields/public/shared_imports.ts
+++ b/x-pack/plugins/runtime_fields/public/shared_imports.ts
@@ -10,20 +10,20 @@ export type {
   FormHook,
   ValidationFunc,
   FieldConfig,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   useForm,
   useFormData,
   Form,
   UseField,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
 
-export { TextField } from '../../../../src/plugins/es_ui_shared/static/forms/components';
+export { TextField } from '@kbn/es-ui-shared-plugin/static/forms/components';
 
 export {
   CodeEditor,
   toMountPoint,
   createKibanaReactContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/runtime_fields/public/types.ts b/x-pack/plugins/runtime_fields/public/types.ts
index bc23547103ef7..3cd8506c01b10 100644
--- a/x-pack/plugins/runtime_fields/public/types.ts
+++ b/x-pack/plugins/runtime_fields/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 import { RUNTIME_FIELD_TYPES } from './constants';
 import { OpenRuntimeFieldEditorProps } from './load_editor';
diff --git a/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts b/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts
index d12f5b5af458e..bc7864c7d6546 100644
--- a/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/capabilities.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'src/core/types';
+import { Capabilities } from '@kbn/core/types';
 import { getTagsCapabilities } from './capabilities';
 import { tagFeatureId } from './constants';
 
diff --git a/x-pack/plugins/saved_objects_tagging/common/capabilities.ts b/x-pack/plugins/saved_objects_tagging/common/capabilities.ts
index c0054608a97f4..f25652960da41 100644
--- a/x-pack/plugins/saved_objects_tagging/common/capabilities.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Capabilities } from 'src/core/types';
+import { Capabilities } from '@kbn/core/types';
 import { tagFeatureId } from './constants';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/common/references.test.ts b/x-pack/plugins/saved_objects_tagging/common/references.test.ts
index 87dea5f13aa1d..cc8093a5cebb2 100644
--- a/x-pack/plugins/saved_objects_tagging/common/references.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { tagIdToReference, replaceTagReferences, updateTagReferences } from './references';
 
 const ref = (type: string, id: string): SavedObjectReference => ({
diff --git a/x-pack/plugins/saved_objects_tagging/common/references.ts b/x-pack/plugins/saved_objects_tagging/common/references.ts
index 8c60e16d7a573..4328f006307a7 100644
--- a/x-pack/plugins/saved_objects_tagging/common/references.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/references.ts
@@ -6,7 +6,7 @@
  */
 
 import { uniq, intersection } from 'lodash';
-import { SavedObjectReference } from '../../../../src/core/types';
+import { SavedObjectReference } from '@kbn/core/types';
 import { tagSavedObjectTypeName } from './constants';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts b/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts
index a7420a54d9563..401c28c1b5c68 100644
--- a/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/test_utils/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/types';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
 import { Tag, TagAttributes } from '../types';
 import { TagsCapabilities } from '../capabilities';
 import { AssignableObject } from '../assignments';
diff --git a/x-pack/plugins/saved_objects_tagging/common/types.ts b/x-pack/plugins/saved_objects_tagging/common/types.ts
index c0b92a71a3d1b..9d5e4bb0377ea 100644
--- a/x-pack/plugins/saved_objects_tagging/common/types.ts
+++ b/x-pack/plugins/saved_objects_tagging/common/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject } from 'src/core/types';
-import type { Tag, TagAttributes } from '../../../../src/plugins/saved_objects_tagging_oss/common';
+import { SavedObject } from '@kbn/core/types';
+import type { Tag, TagAttributes } from '@kbn/saved-objects-tagging-oss-plugin/common';
 
 export type TagSavedObject = SavedObject<TagAttributes>;
 
@@ -23,4 +23,4 @@ export type {
   TagAttributes,
   GetAllTagsOptions,
   ITagsClient,
-} from '../../../../src/plugins/saved_objects_tagging_oss/common';
+} from '@kbn/saved-objects-tagging-oss-plugin/common';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx
index b0c18a8ca5fad..2187f3d20a04c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/assign_flyout.tsx
@@ -8,7 +8,7 @@
 import React, { FC, useState, useEffect, useCallback } from 'react';
 import { EuiFlyoutFooter, EuiFlyoutHeader, EuiFlexItem, Query } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart } from 'src/core/public';
+import { NotificationsStart } from '@kbn/core/public';
 import { AssignableObject } from '../../../common/assignments';
 import { ITagAssignmentService, ITagsCache } from '../../services';
 import { parseQuery, computeRequiredChanges } from './lib';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx
index 641bf7e22165b..175c20322607c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/assign_flyout/open_assign_flyout.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui';
-import { NotificationsStart, OverlayStart, ThemeServiceStart, OverlayRef } from 'src/core/public';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart, OverlayRef } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { ITagAssignmentService, ITagsCache } from '../../services';
 
 export interface GetAssignFlyoutOpenerOptions {
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx
index 3eb31100a2a01..240318ffd9cbb 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/saved_object_save_modal_tag_selector.tsx
@@ -9,7 +9,7 @@ import React, { FC, useCallback, useState } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedObjectSaveModalTagSelectorComponentProps } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectSaveModalTagSelectorComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../../common';
 import { TagSelector } from '../base';
 import { ITagsCache } from '../../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx
index fcd36e3749221..cd41ffc21ec6d 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_list.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
-import { SavedObject } from 'src/core/types';
-import { TagListComponentProps } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObject } from '@kbn/core/types';
+import { TagListComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { Tag } from '../../../common/types';
 import { getObjectTags } from '../../utils';
 import { TagList } from '../base';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx
index 942a7ee4f0a8f..f5d8ea56cf0ac 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/connected/tag_selector.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 import useObservable from 'react-use/lib/useObservable';
-import { TagSelectorComponentProps } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { TagSelectorComponentProps } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../../common';
 import { TagSelector } from '../base';
 import { ITagsCache } from '../../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx
index 8dc9f6d04d5de..da0338da3dca1 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/create_or_edit_modal.tsx
@@ -34,7 +34,7 @@ import {
   tagNameMaxLength,
   tagDescriptionMaxLength,
 } from '../../../common';
-import { TagBadge } from '../../components';
+import { TagBadge } from '..';
 import { getRandomColor, useIfMounted } from './utils';
 
 interface CreateOrEditModalProps {
diff --git a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx
index a4085f75d6ce5..66ec3139a89f9 100644
--- a/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui';
-import { OverlayStart, OverlayRef, ThemeServiceStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { OverlayStart, OverlayRef, ThemeServiceStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Tag, TagAttributes } from '../../../common/types';
 import { ITagInternalClient } from '../../services';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/index.ts b/x-pack/plugins/saved_objects_tagging/public/index.ts
index 1da147f4f168a..aecd9405af01a 100644
--- a/x-pack/plugins/saved_objects_tagging/public/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { SavedObjectTaggingPlugin } from './plugin';
 
 export type { SavedObjectTaggingPluginStart } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
index c4e4706353045..80a784612d8cd 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
@@ -8,7 +8,7 @@
 import { Observable, from } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart, OverlayStart, ThemeServiceStart } from 'kibana/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
 import { ITagsCache } from '../../services/tags';
 import { getAssignFlyoutOpener } from '../../components/assign_flyout';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts
index f3e4bb75236b1..87dec36680db3 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart, OverlayStart } from 'kibana/public';
+import { NotificationsStart, OverlayStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
 import { ITagInternalClient } from '../../services/tags';
 import { TagAction } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts
index f970a15806972..57955c05a2ac4 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/edit.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NotificationsStart, OverlayStart, ThemeServiceStart } from 'kibana/public';
+import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
 import { ITagInternalClient } from '../../services/tags';
 import { getEditModalOpener } from '../../components/edition_modal';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts
index bdb998d89010b..8aa7b160b0c21 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Observable } from 'rxjs';
-import { getTableActions } from './index';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { getTableActions } from '.';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createTagCapabilities } from '../../../common/test_utils';
 import { TagsCapabilities } from '../../../common/capabilities';
 import { tagClientMock } from '../../services/tags/tags_client.mock';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts
index f4eb3b2ab6fc0..2d143faa8fa78 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { TagsCapabilities } from '../../../common';
 import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../../services';
 import { TagAction } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
index 8bb81fe017237..f09051678b06c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
@@ -7,7 +7,7 @@
 
 import { from } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { OverlayStart, NotificationsStart, ThemeServiceStart } from 'src/core/public';
+import { OverlayStart, NotificationsStart, ThemeServiceStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ITagsCache, ITagAssignmentService } from '../../services';
 import { TagBulkAction } from '../types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts
index 0de647f13b0e5..843b953168c4c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.test.ts
@@ -6,10 +6,7 @@
  */
 
 import { Subject } from 'rxjs';
-import {
-  overlayServiceMock,
-  notificationServiceMock,
-} from '../../../../../../src/core/public/mocks';
+import { overlayServiceMock, notificationServiceMock } from '@kbn/core/public/mocks';
 import { tagClientMock } from '../../services/tags/tags_client.mock';
 import { TagBulkAction } from '../types';
 import { getBulkDeleteAction } from './bulk_delete';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts
index b555c245d2115..9f1b443586f49 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_delete.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { OverlayStart, NotificationsStart } from 'src/core/public';
+import { OverlayStart, NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ITagInternalClient } from '../../services';
 import { TagBulkAction } from '../types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts
index de25a09660fc9..43935c9ab441f 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { createTagCapabilities } from '../../../common/test_utils';
 import { TagsCapabilities } from '../../../common/capabilities';
 import { tagClientMock } from '../../services/tags/tags_client.mock';
@@ -13,7 +13,7 @@ import { tagsCacheMock } from '../../services/tags/tags_cache.mock';
 import { assignmentServiceMock } from '../../services/assignments/assignment_service.mock';
 import { TagBulkAction } from '../types';
 
-import { getBulkActions } from './index';
+import { getBulkActions } from '.';
 
 describe('getBulkActions', () => {
   let core: ReturnType<typeof coreMock.createStart>;
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts
index be580239cbf99..c7fba98247919 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { TagsCapabilities } from '../../../common';
 import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../../services';
 import { TagBulkAction } from '../types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx b/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx
index 8c9fad8c31726..72ac1863075f7 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/management/mount_section.tsx
@@ -8,9 +8,9 @@
 import React, { FC } from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
-import { CoreSetup, ApplicationStart } from 'src/core/public';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
+import { CoreSetup, ApplicationStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { getTagsCapabilities } from '../../common';
 import { SavedObjectTaggingPluginStart } from '../types';
 import { ITagInternalClient, ITagAssignmentService, ITagsCache } from '../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
index 9fdcbb81907c2..3bad8d82b664c 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs';
 import useMount from 'react-use/lib/useMount';
 import { Query } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ChromeBreadcrumb, CoreStart } from 'src/core/public';
+import { ChromeBreadcrumb, CoreStart } from '@kbn/core/public';
 import { EuiSpacer } from '@elastic/eui';
 import { TagWithRelations, TagsCapabilities } from '../../common';
 import { getCreateModalOpener } from '../components/edition_modal';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts
index a8637f086cc9b..81f91bdeefcb1 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getTagConnectionsUrl } from './get_tag_connections_url';
 import { TagWithRelations } from '../../../common/types';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts
index 566da19b3ccad..0afa8d6781732 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/utils/get_tag_connections_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IBasePath } from 'src/core/public';
+import { IBasePath } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common/types';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/public/mocks.ts b/x-pack/plugins/saved_objects_tagging/public/mocks.ts
index 0580a9802c8d8..92efe9d4220a5 100644
--- a/x-pack/plugins/saved_objects_tagging/public/mocks.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/mocks.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { taggingApiMock } from '../../../../src/plugins/saved_objects_tagging_oss/public/mocks';
+export { taggingApiMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
diff --git a/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts b/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts
index 0afd875b52832..e38d0ccfceb61 100644
--- a/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/plugin.test.ts
@@ -7,9 +7,9 @@
 
 import moment from 'moment';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { managementPluginMock } from '../../../../src/plugins/management/public/mocks';
-import { savedObjectTaggingOssPluginMock } from '../../../../src/plugins/saved_objects_tagging_oss/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
+import { savedObjectTaggingOssPluginMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
 import { SavedObjectTaggingPlugin } from './plugin';
 import { SavedObjectsTaggingClientConfigRawType } from './config';
 import { TagsCache } from './services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/plugin.ts b/x-pack/plugins/saved_objects_tagging/public/plugin.ts
index db314e0597803..c8a1ff1554ce2 100644
--- a/x-pack/plugins/saved_objects_tagging/public/plugin.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/plugin.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from 'src/core/public';
-import { ManagementSetup } from '../../../../src/plugins/management/public';
-import { SavedObjectTaggingOssPluginSetup } from '../../../../src/plugins/saved_objects_tagging_oss/public';
+import { CoreSetup, CoreStart, PluginInitializerContext, Plugin } from '@kbn/core/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SavedObjectTaggingOssPluginSetup } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { tagManagementSectionId } from '../common/constants';
 import { getTagsCapabilities } from '../common/capabilities';
 import { SavedObjectTaggingPluginStart } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts
index 70b911c498c84..65c8a2074b7b3 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { createAssignableObject } from '../../../common/test_utils';
 import { TagAssignmentService } from './assignment_service';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts
index 2e90ec3036af7..f923724c93b4e 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/assignments/assignment_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   UpdateTagAssignmentsOptions,
   FindAssignableObjectsOptions,
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
index 15d207aca47c0..478218c3f3597 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
@@ -8,7 +8,7 @@
 import { Duration } from 'moment';
 import { Observable, BehaviorSubject, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { ITagsCache } from '../../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { Tag, TagAttributes } from '../../../common/types';
 
 export type { ITagsCache };
@@ -46,7 +46,7 @@ export class TagsCache implements ITagsCache, ITagsChangeListener {
     this.refreshHandler = refreshHandler;
     this.refreshInterval = refreshInterval;
 
-    this.stop$ = new Subject();
+    this.stop$ = new Subject<void>();
     this.internal$ = new BehaviorSubject<Tag[]>([]);
     this.public$ = this.internal$.pipe(takeUntil(this.stop$));
   }
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts
index 24409e8596265..8b99336bfa1be 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { Tag } from '../../../common/types';
 import { createTag, createTagAttributes } from '../../../common/test_utils';
 import { tagsCacheMock } from './tags_cache.mock';
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts
index ef484f0a550b1..1ac2cd55d96b2 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import {
   Tag,
   TagAttributes,
diff --git a/x-pack/plugins/saved_objects_tagging/public/types.ts b/x-pack/plugins/saved_objects_tagging/public/types.ts
index 7e8000e835840..9ceaa6c72b9fc 100644
--- a/x-pack/plugins/saved_objects_tagging/public/types.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/types.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import type { SavedObjectsTaggingApi } from '../../../../src/plugins/saved_objects_tagging_oss/public';
+import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 export type SavedObjectTaggingPluginStart = SavedObjectsTaggingApi;
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts
index 042ce8495e012..36f4f61f4d582 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/components.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { SavedObjectsTaggingApiUiComponent } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { SavedObjectsTaggingApiUiComponent } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../common';
 import { ITagInternalClient, ITagsCache } from '../services';
 import {
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts
index aac9dc9bfcacf..034005791d757 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/convert_name_to_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 import { convertTagNameToId } from '../utils';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts
index 3f46e70f50183..96a498580c2e4 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { tagsCacheMock } from '../services/tags/tags_cache.mock';
 import { Tag } from '../../common/types';
 import { createTag } from '../../common/test_utils';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx
index 5e42b396b900d..5ce3a8fd8b731 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_search_bar_filter.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import {
   SavedObjectsTaggingApiUi,
   GetSearchBarFilterOptions,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 import { TagSearchBarOption } from '../components';
 import { byNameTagSorter } from '../utils';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts
index 8114be0080f7e..d51e0e8bd03b1 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
-import { taggingApiMock } from '../../../../../src/plugins/saved_objects_tagging_oss/public/mocks';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
+import { taggingApiMock } from '@kbn/saved-objects-tagging-oss-plugin/public/mocks';
 import { tagsCacheMock } from '../services/tags/tags_cache.mock';
 import { createTagReference, createSavedObject, createTag } from '../../common/test_utils';
 import { buildGetTableColumnDefinition } from './get_table_column_definition';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx
index ba1ee4e80dd2a..ffde6e2e5e825 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/get_table_column_definition.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectReference } from 'src/core/public';
+import { SavedObject, SavedObjectReference } from '@kbn/core/public';
 import {
   SavedObjectsTaggingApiUi,
   SavedObjectsTaggingApiUiComponent,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 import { getTagsFromReferences, byNameTagSorter } from '../utils';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts
index bd27e8558b635..6dccf97f0a672 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/has_tag_decoration.ts
@@ -8,7 +8,7 @@
 import {
   SavedObjectsTaggingApiUi,
   TagDecoratedSavedObject,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 
 export const hasTagDecoration: SavedObjectsTaggingApiUi['hasTagDecoration'] = (
   object
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts
index cc2838a1e5bd8..6b4eddf357478 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { OverlayStart, ThemeServiceStart } from 'src/core/public';
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { OverlayStart, ThemeServiceStart } from '@kbn/core/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { TagsCapabilities } from '../../common';
 import { ITagsCache, ITagInternalClient } from '../services';
 import {
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts
index 478032651855b..02de2673885e3 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsTaggingApiUi } from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+import { SavedObjectsTaggingApiUi } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { tagsCacheMock } from '../services/tags/tags_cache.mock';
 import { createTag } from '../../common/test_utils';
 import { buildParseSearchQuery } from './parse_search_query';
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
index 8d8a73db1d120..a5ac82f8c9821 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
@@ -6,11 +6,11 @@
  */
 
 import { Query } from '@elastic/eui';
-import { SavedObjectsFindOptionsReference } from 'src/core/public';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
 import {
   ParseSearchQueryOptions,
   SavedObjectsTaggingApiUi,
-} from '../../../../../src/plugins/saved_objects_tagging_oss/public';
+} from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { ITagsCache } from '../services';
 
 export interface BuildParseSearchQueryOptions {
diff --git a/x-pack/plugins/saved_objects_tagging/public/utils.test.ts b/x-pack/plugins/saved_objects_tagging/public/utils.test.ts
index 779340fc86822..4bcbe5877dfcd 100644
--- a/x-pack/plugins/saved_objects_tagging/public/utils.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/types';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
 import {
   getObjectTags,
   convertTagNameToId,
diff --git a/x-pack/plugins/saved_objects_tagging/public/utils.ts b/x-pack/plugins/saved_objects_tagging/public/utils.ts
index a355ee33e2f66..f0235416f75d5 100644
--- a/x-pack/plugins/saved_objects_tagging/public/utils.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/utils.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'src/core/types';
-import { SavedObjectsFindOptionsReference } from 'src/core/public';
+import { SavedObject, SavedObjectReference } from '@kbn/core/types';
+import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
 import { Tag, tagSavedObjectTypeName } from '../common';
 
 type SavedObjectReferenceLike = SavedObjectReference | SavedObjectsFindOptionsReference;
diff --git a/x-pack/plugins/saved_objects_tagging/server/config.ts b/x-pack/plugins/saved_objects_tagging/server/config.ts
index 9d676576a03c3..4ae3075b12dcc 100644
--- a/x-pack/plugins/saved_objects_tagging/server/config.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 const configSchema = schema.object({
   cache_refresh_interval: schema.duration({ defaultValue: '15m' }),
diff --git a/x-pack/plugins/saved_objects_tagging/server/features.ts b/x-pack/plugins/saved_objects_tagging/server/features.ts
index b31b94a31df13..aaaf030f2c27e 100644
--- a/x-pack/plugins/saved_objects_tagging/server/features.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/features.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { KibanaFeatureConfig } from '../../features/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/server';
 import { tagSavedObjectTypeName, tagManagementSectionId, tagFeatureId } from '../common/constants';
 
 export const savedObjectsTaggingFeature: KibanaFeatureConfig = {
diff --git a/x-pack/plugins/saved_objects_tagging/server/index.ts b/x-pack/plugins/saved_objects_tagging/server/index.ts
index e45ddbe5d07c8..5f731c77caac7 100644
--- a/x-pack/plugins/saved_objects_tagging/server/index.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SavedObjectTaggingPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts b/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts
index 5b514ff4bdd5b..a62952937bc21 100644
--- a/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/plugin.test.ts
@@ -7,9 +7,9 @@
 
 import { registerRoutesMock, createTagUsageCollectorMock } from './plugin.test.mocks';
 
-import { coreMock } from '../../../../src/core/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
-import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { SavedObjectTaggingPlugin } from './plugin';
 import { savedObjectsTaggingFeature } from './features';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/plugin.ts b/x-pack/plugins/saved_objects_tagging/server/plugin.ts
index 6c5cd66595f7c..bc43d4d65c828 100644
--- a/x-pack/plugins/saved_objects_tagging/server/plugin.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/plugin.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
-import { SecurityPluginSetup } from '../../security/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { savedObjectsTaggingFeature } from './features';
 import { tagType } from './saved_objects';
 import type { TagsHandlerContext } from './types';
diff --git a/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts b/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts
index 35268f6d436ee..09c9f77d69572 100644
--- a/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { RequestHandlerContext, KibanaRequest } from 'src/core/server';
-import { SecurityPluginSetup } from '../../security/server';
+import type { RequestHandlerContext, KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { ITagsClient } from '../common/types';
 import { ITagsRequestHandlerContext } from './types';
 import { TagsClient, IAssignmentService, AssignmentService } from './services';
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
index aa2e87a71fcbb..e0fe44d65c015 100644
--- a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindOptionsReference,
   SavedObject,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { tagSavedObjectTypeName } from '../../../common/constants';
 import { Tag, TagAttributes, TagWithRelations } from '../../../common/types';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts b/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts
index c6dacbd81a0e9..d9e51dddea553 100644
--- a/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/saved_objects/tag.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsType } from 'src/core/server';
+import { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import { tagSavedObjectTypeName, TagAttributes } from '../../common';
 
 export const tagType: SavedObjectsType = {
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts
index 3d9a7c7ef2c36..3cc4c00da5b30 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.test.ts
@@ -10,8 +10,8 @@ import {
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsTypeRegistryMock,
-} from '../../../../../../src/core/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+} from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { createSavedObject, createReference } from '../../../common/test_utils';
 import { taggableTypes } from '../../../common/constants';
 import { AssignmentService } from './assignment_service';
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts
index 222de82b35f6f..d6d14f68357be 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/assignment_service.ts
@@ -12,8 +12,8 @@ import {
   ISavedObjectTypeRegistry,
   KibanaRequest,
   SavedObjectsBulkGetObject,
-} from 'src/core/server';
-import { SecurityPluginSetup } from '../../../../security/server';
+} from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import {
   AssignableObject,
   UpdateTagAssignmentsOptions,
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts
index 1e4d5f960b2e9..51bcae2b0c515 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/get_updatable_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
-import { SecurityPluginSetup } from '../../../../security/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 export const getUpdatableSavedObjectTypes = async ({
   request,
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts
index 544f0d9a33722..ef7b037c58af2 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsType } from 'kibana/server';
+import type { SavedObjectsType } from '@kbn/core/server';
 import { createSavedObject, createReference } from '../../../common/test_utils';
 import { toAssignableObject } from './utils';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts
index b77944d5da39c..e2a9866cf4cfb 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/assignments/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObject, SavedObjectsType } from 'kibana/server';
+import type { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import { AssignableObject } from '../../../common/assignments';
 import { tagSavedObjectTypeName } from '../../../common';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
index eb6f7eec3075f..6d3b6011cac99 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
@@ -7,7 +7,7 @@
 
 import { validateTagMock } from './tags_client.test.mocks';
 
-import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { TagAttributes, TagSavedObject } from '../../../common/types';
 import { TagValidation } from '../../../common/validation';
 import { TagsClient } from './tags_client';
diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
index 32bb5d6e4e3eb..5535e334c06fb 100644
--- a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { TagSavedObject, TagAttributes, ITagsClient } from '../../../common/types';
 import { tagSavedObjectTypeName } from '../../../common/constants';
 import { TagValidationError } from './errors';
diff --git a/x-pack/plugins/saved_objects_tagging/server/types.ts b/x-pack/plugins/saved_objects_tagging/server/types.ts
index 8082109e842be..92618c7d3fb53 100644
--- a/x-pack/plugins/saved_objects_tagging/server/types.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
 import { ITagsClient } from '../common/types';
 import { IAssignmentService } from './services';
 
diff --git a/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts b/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts
index a234fd20f529c..8e10bfd5ad1f5 100644
--- a/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/usage/fetch_tag_usage_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { TaggingUsageData, ByTypeTaggingUsageData } from './types';
 
 /**
diff --git a/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts b/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
index 70cc799a1df8b..a05efd957e695 100644
--- a/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/usage/schema.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MakeSchemaFrom } from '../../../../../src/plugins/usage_collection/server';
+import { MakeSchemaFrom } from '@kbn/usage-collection-plugin/server';
 import { TaggingUsageData, ByTypeTaggingUsageData } from './types';
 
 const perTypeSchema: MakeSchemaFrom<ByTypeTaggingUsageData> = {
diff --git a/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts b/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts
index 3362965044bfd..6e4494f225fe7 100644
--- a/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts
+++ b/x-pack/plugins/saved_objects_tagging/server/usage/tag_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { TaggingUsageData } from './types';
 import { fetchTagUsageData } from './fetch_tag_usage_data';
 import { tagUsageCollectorSchema } from './schema';
diff --git a/x-pack/plugins/screenshotting/README.md b/x-pack/plugins/screenshotting/README.md
index d72ec8eed3781..aefa4cc90762b 100644
--- a/x-pack/plugins/screenshotting/README.md
+++ b/x-pack/plugins/screenshotting/README.md
@@ -3,18 +3,154 @@
 This plugin provides functionality to take screenshots of the Kibana pages.
 It uses Chromium and Puppeteer underneath to run the browser in headless mode.
 
-## API
+## Capabilities
+- Canvas workpads screenshots.
+- Dashboards screenshots.
+- Expressions screenshots.
+- PDF generation.
+- Batch screenshotting.
 
-The plugin exposes most of the functionality in the start contract.
-The Chromium download and setup is happening during the setup stage.
+## Usage
 
-To learn more about the public API, please use automatically generated API reference or generated TypeDoc comments.
+### Getting started
+After listing the `screenshotting` plugin in your dependencies, the plugin will be intitalized on the setup stage.
+The intitalization process downloads (if it is not already present) and verifies the Chromium build.
 
-## Testing Chromium downloads
+The start contract exposes a public API to interact with the plugin.
+Apart from the actual screenshotting functionality, it also provides a way for self-diagnostics.
 
-To download all Chromium browsers for all platforms and architectures:
+Here is an example of how you can take a screenshot of a Kibana URL.
+
+```typescript
+import { lastValueFrom } from 'rxjs';
+import type { CoreSetup, Plugin } from 'src/core/server';
+import type { ScreenshottingStart } from 'x-pack/plugins/screenshotting/server';
+
+
+interface StartDeps {
+  screenshotting: ScreenshottingStart;
+}
+
+class ExamplePlugin implements Plugin<void, void, void, StartDeps> {
+  setup({ http, getStartServices }: CoreSetup<StartDeps>) {
+    const router = http.createRouter();
+
+    router.get(
+      {
+        path: '/api/capture',
+        validate: {
+          query: schema.object({
+            id: schema.string(),
+          }),
+        },
+      },
+      async (context, request, response) => {
+        const [, { screenshotting }] = await getStartServices();
+        const { metrics, results } = await lastValueFrom(
+          screenshotting.getScreenshots({
+            request,
+            urls: [`http://localhost/app/canvas#/workpad/workpad-${request.query.id}`],
+          })
+        );
+
+        return response.ok({
+          body: JSON.stringify({
+            metrics,
+            image: results[0]?.screenshots[0]?.data.toString('base64'),
+            errors: results[0]?.renderErrors,
+          } as ScreenshottingExpressionResponse),
+        });
+      }
+    );
+  }
+
+  start() {}
+}
+
+export function plugin() {
+  return new ExamplePlugin();
+}
+```
+
+### API
+Please use automatically generated API reference or generated TypeDoc comments to find the complete documentation.
+
+#### `getScreenshots(options): Observable`
+Takes screenshots of multiple pages or an expression and returns an observable with the screenshotting results.
 
+The `options` parameter is an object with parameters of the screenshotting session.
+Option | Required | Default | Description
+--- | :---: | --- | ---
+`browserTimezone` | no | _none_ | The browser timezone that will be emulated in the browser instance. This option should be used to keep timezone on server and client in sync.
+`expression` | no | _none_ | An expression to capture screenshot of. Mutually exclusive with the `urls` parameter.
+`format` | no | `'png'` | An output format. It can either be PDF or PNG. In case of capturing multiple URLs, all the screenshots will be combined into one document for PDF format. For PNG format, an array of screenshots will be returned.
+`headers` | no | _none_ | Custom headers to be sent with each request. The headers will be used for authorization.
+`input` | no | `undefined` | The expression input.
+`layout` | no | `{}` | Page layout parameters describing characteristics of the capturing screenshot (e.g., dimensions, zoom, etc.).
+`request` | no | _none_ | Kibana Request reference to extract headers from.
+`timeouts` | no | _none_ | Timeouts for each phase of the screenshot.
+`timeouts.loadDelay` | no | `3000` | The amount of time in milliseconds before taking a screenshot when visualizations are not evented. All visualizations that ship with Kibana are evented, so this setting should not have much effect. If you are seeing empty images instead of visualizations, try increasing this value.
+`timeouts.openUrl` | no | `60000` | The timeout in milliseconds to allow the Chromium browser to wait for the "Loading…" screen to dismiss and find the initial data for the page. If the time is exceeded, a screenshot is captured showing the current page, and the result structure contains an error message.
+`timeouts.renderComplete` | no | `30000` | The timeout in milliseconds to allow the Chromium browser to wait for all visualizations to fetch and render the data. If the time is exceeded, a screenshot is captured showing the current page, and the result structure contains an error message.
+`timeouts.waitForElements` | no | `30000` | The timeout in milliseconds to allow the Chromium browser to wait for all visualization panels to load on the page. If the time is exceeded, a screenshot is captured showing the current page, and the result structure contains an error message.
+`urls` | no | `[]` | The list or URL to take screenshots of. Every item can either be a string or a tuple containing a URL and a context. The contextual data can be gathered using the screenshot mode plugin. Mutually exclusive with the `expression` parameter.
+
+#### `diagnose(flags?: string[]): Observable`
+Runs browser diagnostics.
+The diagnostic implementation launches Chromium and emits the output in the resulting observable.
+
+There is a way to override some Chromium command line arguments using the `flags` parameter.
+
+### Configuration
+Option | Default | Description
+--- | --- | ---
+`xpack.screenshotting.networkPolicy.enabled` | `true` | Capturing a screenshot from a Kibana page involves sending out requests for all the linked web assets. For example, a Markdown visualization can show an image from a remote server. 
+`xpack.screenshotting.networkPolicy.rules` | Allow http, https, ws, wss, and data. | A policy is specified as an array of objects that describe what to allow or deny based on a host or protocol. If a host or protocol is not specified, the rule matches any host or protocol.
+`xpack.screenshotting.browser.autoDownload` | Depends on the `dist` parameter. | Flag to automatically download chromium distribution.
+`xpack.screenshotting.browser.chromium.inspect` | Depends on the `dist` parameter. | Connects to the browser over a pipe instead of a WebSocket. See [puppeteer](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md#puppeteerlaunchoptions) documentation.
+`xpack.screenshotting.browser.chromium.disableSandbox` | Defaults to `false` for all operating systems except Debian and Red Hat Linux, which use `true`. | It is recommended that you research the feasibility of enabling unprivileged user namespaces. An exception is if you are running Kibana in Docker because the container runs in a user namespace with the built-in seccomp/bpf filters. For more information, refer to [Chromium sandbox](https://chromium.googlesource.com/chromium/src/+/HEAD/docs/linux/sandboxing.md).
+`xpack.screenshotting.browser.chromium.proxy.enabled` | `false` | Enables the proxy for Chromium to use. 
+`xpack.screenshotting.browser.chromium.proxy.server` | _none_ | The uri for the proxy server. Providing the username and password for the proxy server via the uri is not supported.
+`xpack.screenshotting.browser.chromium.proxy.bypass` | `[]` | An array of hosts that should not go through the proxy server and should use a direct connection instead. Examples of valid entries are "elastic.co", "*.elastic.co", ".elastic.co", ".elastic.co:5601".
+
+## How It Works
+```mermaid
+sequenceDiagram
+  participant User
+  participant Screenshotting
+  participant Browser
+
+  User ->> Screenshotting: API call
+  Screenshotting ->> Browser: Launch browser
+  activate Browser
+  Screenshotting ->> Browser: Create page
+  Screenshotting ->> Browser: Set parameters
+  Note over Screenshotting,Browser: timezone
+
+  Screenshotting ->> Browser: Open URL
+  Screenshotting ->> Browser: Set contextual data
+  Note over Screenshotting,Browser: custom context, screenshot mode flag
+  Browser ->> Screenshotting: Rendering
+
+  Screenshotting ->> Browser: Wait for visualizations
+  Note over Screenshotting,Browser: poll for a number of DOM nodes to match <br> the number of dashboard elements
+  Screenshotting ->> Browser: Wait for render completion
+  Note over Screenshotting,Browser: poll for selectors indicating rendering completion
+  Browser ->> Screenshotting: Page is ready
+
+  Screenshotting ->> Browser: Take screenshot
+  Browser ->> Screenshotting: Return PNG buffer
+  Screenshotting ->> User: Return screenshot
 ```
+
+## Testing
+### Integration
+There is an example plugin that demonstrates integration with the screenshotting plugin. That plugin utilizes expression capturing.
+
+### Chromium Downloads
+To download all Chromium browsers for all platforms and architectures:
+
+```bash
 cd x-pack
 npx gulp downloadChromium
 ```
diff --git a/x-pack/plugins/screenshotting/public/app/app.tsx b/x-pack/plugins/screenshotting/public/app/app.tsx
index 95bc3388cfb59..9dcfce5c16c28 100644
--- a/x-pack/plugins/screenshotting/public/app/app.tsx
+++ b/x-pack/plugins/screenshotting/public/app/app.tsx
@@ -15,8 +15,8 @@ import {
   EuiPageContent,
   EuiPageContentBody,
 } from '@elastic/eui';
-import type { ExpressionRendererParams } from 'src/plugins/expressions/public';
-import { useExpressionRenderer } from '../../../../../src/plugins/expressions/public';
+import type { ExpressionRendererParams } from '@kbn/expressions-plugin/public';
+import { useExpressionRenderer } from '@kbn/expressions-plugin/public';
 import { SCREENSHOTTING_EXPRESSION, SCREENSHOTTING_EXPRESSION_INPUT } from '../../common';
 import { ScreenshotModeContext } from './screenshot_mode_context';
 
diff --git a/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts b/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts
index 24b3ca9d99178..1bba86912d722 100644
--- a/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts
+++ b/x-pack/plugins/screenshotting/public/app/screenshot_mode_context.ts
@@ -6,7 +6,7 @@
  */
 
 import { createContext } from 'react';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
 
 export const ScreenshotModeContext = createContext<ScreenshotModePluginSetup | undefined>(
   undefined
diff --git a/x-pack/plugins/screenshotting/public/plugin.tsx b/x-pack/plugins/screenshotting/public/plugin.tsx
index 33b854f022648..68707cc16ed72 100755
--- a/x-pack/plugins/screenshotting/public/plugin.tsx
+++ b/x-pack/plugins/screenshotting/public/plugin.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { AppMountParameters, CoreSetup, Plugin } from 'src/core/public';
-import type { ExpressionsSetup } from 'src/plugins/expressions/public';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
-import { AppNavLinkStatus } from '../../../../src/core/public';
+import type { AppMountParameters, CoreSetup, Plugin } from '@kbn/core/public';
+import type { ExpressionsSetup } from '@kbn/expressions-plugin/public';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { SCREENSHOTTING_APP_ID } from '../common';
 import { App, ScreenshotModeContext } from './app';
 
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
index f9bf31ad35f6f..fd09396d6c86d 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
@@ -9,11 +9,11 @@ import { truncate } from 'lodash';
 import open from 'opn';
 import puppeteer, { ElementHandle, EvaluateFn, Page, SerializableOrJSHandle } from 'puppeteer';
 import { parse as parseUrl } from 'url';
-import { Headers, Logger } from 'src/core/server';
+import { Headers, Logger } from '@kbn/core/server';
 import {
   KBN_SCREENSHOT_MODE_HEADER,
   ScreenshotModePluginSetup,
-} from '../../../../../../src/plugins/screenshot_mode/server';
+} from '@kbn/screenshot-mode-plugin/server';
 import { ConfigType } from '../../config';
 import { allowRequest } from '../network_policy';
 import { stripUnsafeHeaders } from './strip_unsafe_headers';
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
index 5c9136b272831..a0ddfccf592bd 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
@@ -8,8 +8,8 @@
 import puppeteer from 'puppeteer';
 import * as Rx from 'rxjs';
 import { mergeMap, take } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+import type { Logger } from '@kbn/core/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { ConfigType } from '../../../config';
 import { HeadlessChromiumDriverFactory, DEFAULT_VIEWPORT } from '.';
 
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
index 27bb4e79374f7..7d31cdc0c6b8c 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
@@ -15,7 +15,6 @@ import path from 'path';
 import puppeteer, { Browser, ConsoleMessage, HTTPRequest, Page } from 'puppeteer';
 import { createInterface } from 'readline';
 import * as Rx from 'rxjs';
-import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
 import {
   catchError,
   ignoreElements,
@@ -26,11 +25,11 @@ import {
   takeUntil,
   tap,
 } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+import type { Logger } from '@kbn/core/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { ConfigType } from '../../../config';
 import { errors } from '../../../../common';
-import { getChromiumDisconnectedError } from '../';
+import { getChromiumDisconnectedError } from '..';
 import { safeChildProcess } from '../../safe_child_process';
 import { HeadlessChromiumDriver } from '../driver';
 import { args } from './args';
@@ -137,146 +136,146 @@ export class HeadlessChromiumDriverFactory {
     { browserTimezone, openUrlTimeout, defaultViewport }: CreatePageOptions,
     pLogger = this.logger
   ): Rx.Observable<CreatePageResult> {
-    // FIXME: 'create' is deprecated
-    return Rx.Observable.create(async (observer: InnerSubscriber<unknown, unknown>) => {
+    return new Rx.Observable((observer) => {
       const logger = pLogger.get('browser-driver');
       logger.info(`Creating browser page driver`);
 
       const chromiumArgs = this.getChromiumArgs();
       logger.debug(`Chromium launch args set to: ${chromiumArgs}`);
+      (async () => {
+        let browser: Browser | undefined;
+        try {
+          browser = await puppeteer.launch({
+            pipe: !this.config.browser.chromium.inspect,
+            userDataDir: this.userDataDir,
+            executablePath: this.binaryPath,
+            ignoreHTTPSErrors: true,
+            handleSIGHUP: false,
+            args: chromiumArgs,
+
+            // We optionally set this at page creation to reduce the chances of
+            // browser reflow. In most cases only the height needs to be adjusted
+            // before taking a screenshot.
+            // NOTE: _.defaults assigns to the target object, so we copy it.
+            // NOTE NOTE: _.defaults is not the same as { ...DEFAULT_VIEWPORT, ...defaultViewport }
+            defaultViewport: _.defaults({ ...defaultViewport }, DEFAULT_VIEWPORT),
+            env: {
+              TZ: browserTimezone,
+            },
+          });
+        } catch (err) {
+          observer.error(
+            new errors.FailedToSpawnBrowserError(`Error spawning Chromium browser! ${err}`)
+          );
+          return;
+        }
 
-      let browser: Browser | undefined;
-      try {
-        browser = await puppeteer.launch({
-          pipe: !this.config.browser.chromium.inspect,
-          userDataDir: this.userDataDir,
-          executablePath: this.binaryPath,
-          ignoreHTTPSErrors: true,
-          handleSIGHUP: false,
-          args: chromiumArgs,
-
-          // We optionally set this at page creation to reduce the chances of
-          // browser reflow. In most cases only the height needs to be adjusted
-          // before taking a screenshot.
-          // NOTE: _.defaults assigns to the target object, so we copy it.
-          // NOTE NOTE: _.defaults is not the same as { ...DEFAULT_VIEWPORT, ...defaultViewport }
-          defaultViewport: _.defaults({ ...defaultViewport }, DEFAULT_VIEWPORT),
-          env: {
-            TZ: browserTimezone,
-          },
-        });
-      } catch (err) {
-        observer.error(
-          new errors.FailedToSpawnBrowserError(`Error spawning Chromium browser! ${err}`)
-        );
-        return;
-      }
+        const page = await browser.newPage();
+        const devTools = await page.target().createCDPSession();
 
-      const page = await browser.newPage();
-      const devTools = await page.target().createCDPSession();
+        await devTools.send('Performance.enable', { timeDomain: 'timeTicks' });
+        const startMetrics = await devTools.send('Performance.getMetrics');
 
-      await devTools.send('Performance.enable', { timeDomain: 'timeTicks' });
-      const startMetrics = await devTools.send('Performance.getMetrics');
+        // Log version info for debugging / maintenance
+        const versionInfo = await devTools.send('Browser.getVersion');
+        logger.debug(`Browser version: ${JSON.stringify(versionInfo)}`);
 
-      // Log version info for debugging / maintenance
-      const versionInfo = await devTools.send('Browser.getVersion');
-      logger.debug(`Browser version: ${JSON.stringify(versionInfo)}`);
+        await page.emulateTimezone(browserTimezone);
 
-      await page.emulateTimezone(browserTimezone);
+        // Set the default timeout for all navigation methods to the openUrl timeout
+        // All waitFor methods have their own timeout config passed in to them
+        page.setDefaultTimeout(openUrlTimeout);
 
-      // Set the default timeout for all navigation methods to the openUrl timeout
-      // All waitFor methods have their own timeout config passed in to them
-      page.setDefaultTimeout(openUrlTimeout);
+        logger.debug(`Browser page driver created`);
 
-      logger.debug(`Browser page driver created`);
+        const childProcess = {
+          async kill(): Promise<ClosePageResult> {
+            if (page.isClosed()) {
+              return {};
+            }
 
-      const childProcess = {
-        async kill(): Promise<ClosePageResult> {
-          if (page.isClosed()) {
-            return {};
-          }
+            let metrics: PerformanceMetrics | undefined;
 
-          let metrics: PerformanceMetrics | undefined;
+            try {
+              if (devTools && startMetrics) {
+                const endMetrics = await devTools.send('Performance.getMetrics');
+                metrics = getMetrics(startMetrics, endMetrics);
+                const { cpuInPercentage, memoryInMegabytes } = metrics;
 
-          try {
-            if (devTools && startMetrics) {
-              const endMetrics = await devTools.send('Performance.getMetrics');
-              metrics = getMetrics(startMetrics, endMetrics);
-              const { cpuInPercentage, memoryInMegabytes } = metrics;
+                logger.debug(
+                  `Chromium consumed CPU ${cpuInPercentage}% Memory ${memoryInMegabytes}MB`
+                );
+              }
+            } catch (error) {
+              logger.error(error);
+            }
 
-              logger.debug(
-                `Chromium consumed CPU ${cpuInPercentage}% Memory ${memoryInMegabytes}MB`
-              );
+            try {
+              logger.debug('Attempting to close browser...');
+              await browser?.close();
+              logger.debug('Browser closed.');
+            } catch (err) {
+              // do not throw
+              logger.error(err);
             }
-          } catch (error) {
-            logger.error(error);
-          }
 
-          try {
-            logger.debug('Attempting to close browser...');
-            await browser?.close();
-            logger.debug('Browser closed.');
-          } catch (err) {
-            // do not throw
-            logger.error(err);
-          }
+            return { metrics };
+          },
+        };
+        const { terminate$ } = safeChildProcess(logger, childProcess);
+
+        // Ensure that the browser is closed once the observable completes.
+        observer.add(() => {
+          if (page.isClosed()) return; // avoid emitting a log unnecessarily
+          logger.debug(`It looks like the browser is no longer being used. Closing the browser...`);
+          childProcess.kill(); // ignore async
+        });
+
+        // make the observer subscribe to terminate$
+        observer.add(
+          terminate$
+            .pipe(
+              tap((signal) => {
+                logger.debug(`Termination signal received: ${signal}`);
+              }),
+              ignoreElements()
+            )
+            .subscribe(observer)
+        );
+
+        // taps the browser log streams and combine them to Kibana logs
+        this.getBrowserLogger(page, logger).subscribe();
+        this.getProcessLogger(browser, logger).subscribe();
 
-          return { metrics };
-        },
-      };
-      const { terminate$ } = safeChildProcess(logger, childProcess);
-
-      // Ensure that the browser is closed once the observable completes.
-      observer.add(() => {
-        if (page.isClosed()) return; // avoid emitting a log unnecessarily
-        logger.debug(`It looks like the browser is no longer being used. Closing the browser...`);
-        childProcess.kill(); // ignore async
-      });
-
-      // make the observer subscribe to terminate$
-      observer.add(
-        terminate$
-          .pipe(
-            tap((signal) => {
-              logger.debug(`Termination signal received: ${signal}`);
-            }),
-            ignoreElements()
-          )
-          .subscribe(observer)
-      );
-
-      // taps the browser log streams and combine them to Kibana logs
-      this.getBrowserLogger(page, logger).subscribe();
-      this.getProcessLogger(browser, logger).subscribe();
-
-      // HeadlessChromiumDriver: object to "drive" a browser page
-      const driver = new HeadlessChromiumDriver(
-        this.screenshotMode,
-        this.config,
-        this.basePath,
-        page
-      );
-
-      // Rx.Observable<never>: stream to interrupt page capture
-      const unexpectedExit$ = this.getPageExit(browser, page);
-
-      observer.next({
-        driver,
-        unexpectedExit$,
-        close: () => Rx.from(childProcess.kill()),
-      });
-
-      // unsubscribe logic makes a best-effort attempt to delete the user data directory used by chromium
-      observer.add(() => {
-        const userDataDir = this.userDataDir;
-        logger.debug(`deleting chromium user data directory at [${userDataDir}]`);
-        // the unsubscribe function isn't `async` so we're going to make our best effort at
-        // deleting the userDataDir and if it fails log an error.
-        del(userDataDir, { force: true }).catch((error) => {
-          logger.error(`error deleting user data directory at [${userDataDir}]!`);
-          logger.error(error);
+        // HeadlessChromiumDriver: object to "drive" a browser page
+        const driver = new HeadlessChromiumDriver(
+          this.screenshotMode,
+          this.config,
+          this.basePath,
+          page
+        );
+
+        // Rx.Observable<never>: stream to interrupt page capture
+        const unexpectedExit$ = this.getPageExit(browser, page);
+
+        observer.next({
+          driver,
+          unexpectedExit$,
+          close: () => Rx.from(childProcess.kill()),
+        });
+
+        // unsubscribe logic makes a best-effort attempt to delete the user data directory used by chromium
+        observer.add(() => {
+          const userDataDir = this.userDataDir;
+          logger.debug(`deleting chromium user data directory at [${userDataDir}]`);
+          // the unsubscribe function isn't `async` so we're going to make our best effort at
+          // deleting the userDataDir and if it fails log an error.
+          del(userDataDir, { force: true }).catch((error) => {
+            logger.error(`error deleting user data directory at [${userDataDir}]!`);
+            logger.error(error);
+          });
         });
-      });
+      })();
     });
   }
 
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts
index 7e3f46775ea4e..e718570b9b2e2 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/strip_unsafe_headers.ts
@@ -6,7 +6,7 @@
  */
 
 import { omitBy } from 'lodash';
-import type { Headers } from 'src/core/server';
+import type { Headers } from '@kbn/core/server';
 
 // @see https://github.com/chromium/chromium/blob/3611052c055897e5ebbc5b73ea295092e0c20141/services/network/public/cpp/header_util_unittest.cc#L50
 // For a list of headers that chromium doesn't like
diff --git a/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts b/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts
index aa52f7a4491c4..ba3e083816937 100644
--- a/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/download/fetch.ts
@@ -11,7 +11,7 @@ import { closeSync, mkdirSync, openSync, writeSync } from 'fs';
 import { dirname } from 'path';
 import { finished, Readable } from 'stream';
 import { promisify } from 'util';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 /**
  * Download a url and calculate it's checksum
diff --git a/x-pack/plugins/screenshotting/server/browsers/download/index.ts b/x-pack/plugins/screenshotting/server/browsers/download/index.ts
index 47d9c867cdd60..b488d1bfe32fd 100644
--- a/x-pack/plugins/screenshotting/server/browsers/download/index.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/download/index.ts
@@ -7,7 +7,7 @@
 
 import { existsSync } from 'fs';
 import del from 'del';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { ChromiumArchivePaths, PackageInfo } from '../chromium';
 import { md5 } from './checksum';
 import { fetch } from './fetch';
diff --git a/x-pack/plugins/screenshotting/server/browsers/install.ts b/x-pack/plugins/screenshotting/server/browsers/install.ts
index 30cb101c7be72..42a7999cab18c 100644
--- a/x-pack/plugins/screenshotting/server/browsers/install.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/install.ts
@@ -7,7 +7,7 @@
 
 import del from 'del';
 import path from 'path';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { ChromiumArchivePaths, PackageInfo } from './chromium';
 import { download } from './download';
 import { md5 } from './download/checksum';
diff --git a/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts b/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
index 8447e56324a25..f0675b7fdf16d 100644
--- a/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
@@ -7,7 +7,7 @@
 
 import { fromEvent, merge, Observable } from 'rxjs';
 import { take, share, mapTo, delay, tap } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 
 interface IChild {
   kill(signal: string): Promise<unknown>;
diff --git a/x-pack/plugins/screenshotting/server/config/create_config.test.ts b/x-pack/plugins/screenshotting/server/config/create_config.test.ts
index 18ac6ceb6874d..4bc5ff65727d0 100644
--- a/x-pack/plugins/screenshotting/server/config/create_config.test.ts
+++ b/x-pack/plugins/screenshotting/server/config/create_config.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createConfig } from './create_config';
 import { ConfigType } from './schema';
 
diff --git a/x-pack/plugins/screenshotting/server/config/create_config.ts b/x-pack/plugins/screenshotting/server/config/create_config.ts
index d56dd2489f4b8..f12f2205d3a57 100644
--- a/x-pack/plugins/screenshotting/server/config/create_config.ts
+++ b/x-pack/plugins/screenshotting/server/config/create_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneDeep, set, upperFirst } from 'lodash';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { getDefaultChromiumSandboxDisabled } from './default_chromium_sandbox_disabled';
 import { ConfigType } from './schema';
 
diff --git a/x-pack/plugins/screenshotting/server/config/index.ts b/x-pack/plugins/screenshotting/server/config/index.ts
index 225c0cb957c62..468f092780112 100644
--- a/x-pack/plugins/screenshotting/server/config/index.ts
+++ b/x-pack/plugins/screenshotting/server/config/index.ts
@@ -5,9 +5,19 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor } from 'src/core/server';
+import type { PluginConfigDescriptor } from '@kbn/core/server';
 import { ConfigSchema, ConfigType } from './schema';
 
+/**
+ * Helper function
+ */
+export const durationToNumber = (value: number | moment.Duration): number => {
+  if (typeof value === 'number') {
+    return value;
+  }
+  return value.asMilliseconds();
+};
+
 /**
  * Screenshotting plugin configuration schema.
  */
@@ -47,9 +57,35 @@ export const config: PluginConfigDescriptor<ConfigType> = {
       'xpack.screenshotting.browser.chromium.proxy.bypass',
       { level: 'warning' }
     ),
+    renameFromRoot(
+      'xpack.reporting.capture.timeouts.openUrl',
+      'xpack.screenshotting.capture.timeouts.openUrl',
+      { level: 'warning' }
+    ),
+    renameFromRoot(
+      'xpack.reporting.capture.timeouts.renderComplete',
+      'xpack.screenshotting.capture.timeouts.renderComplete',
+      { level: 'warning' }
+    ),
+    renameFromRoot(
+      'xpack.reporting.capture.timeouts.waitForElements',
+      'xpack.screenshotting.capture.timeouts.waitForElements',
+      { level: 'warning' }
+    ),
+    renameFromRoot('xpack.reporting.capture.zoom', 'xpack.screenshotting.capture.zoom', {
+      level: 'warning',
+    }),
+    renameFromRoot('xpack.reporting.capture.loadDelay', 'xpack.screenshotting.capture.loadDelay', {
+      level: 'warning',
+    }),
   ],
   exposeToUsage: {
     networkPolicy: false, // show as [redacted]
+    capture: {
+      timeouts: { openUrl: true, renderComplete: true, waitForElements: true },
+      loadDelay: true,
+      zoom: true,
+    },
   },
 };
 
diff --git a/x-pack/plugins/screenshotting/server/config/schema.test.ts b/x-pack/plugins/screenshotting/server/config/schema.test.ts
index e25791b0ebad9..58fb4b5ab559e 100644
--- a/x-pack/plugins/screenshotting/server/config/schema.test.ts
+++ b/x-pack/plugins/screenshotting/server/config/schema.test.ts
@@ -19,6 +19,15 @@ describe('ConfigSchema', () => {
             },
           },
         },
+        "capture": Object {
+          "loadDelay": "PT3S",
+          "timeouts": Object {
+            "openUrl": "PT1M",
+            "renderComplete": "PT30S",
+            "waitForElements": "PT30S",
+          },
+          "zoom": 2,
+        },
         "networkPolicy": Object {
           "enabled": true,
           "rules": Array [
@@ -71,6 +80,15 @@ describe('ConfigSchema', () => {
             },
           },
         },
+        "capture": Object {
+          "loadDelay": "PT3S",
+          "timeouts": Object {
+            "openUrl": "PT1M",
+            "renderComplete": "PT30S",
+            "waitForElements": "PT30S",
+          },
+          "zoom": 2,
+        },
         "networkPolicy": Object {
           "enabled": true,
           "rules": Array [
@@ -145,4 +163,28 @@ describe('ConfigSchema', () => {
       }
     `);
   });
+
+  it('allows Duration values for certain keys', () => {
+    expect(
+      ConfigSchema.validate({ capture: { loadDelay: '3s' } }).capture.loadDelay
+    ).toMatchInlineSnapshot(`"PT3S"`);
+
+    expect(
+      ConfigSchema.validate({
+        capture: {
+          timeouts: {
+            openUrl: '1m',
+            waitForElements: '30s',
+            renderComplete: '10s',
+          },
+        },
+      }).capture.timeouts
+    ).toMatchInlineSnapshot(`
+      Object {
+        "openUrl": "PT1M",
+        "renderComplete": "PT10S",
+        "waitForElements": "PT30S",
+      }
+    `);
+  });
 });
diff --git a/x-pack/plugins/screenshotting/server/config/schema.ts b/x-pack/plugins/screenshotting/server/config/schema.ts
index 7711ffe1ea8e8..1e103a6b6e4d0 100644
--- a/x-pack/plugins/screenshotting/server/config/schema.ts
+++ b/x-pack/plugins/screenshotting/server/config/schema.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import moment from 'moment';
 
 const RulesSchema = schema.object({
   allow: schema.boolean(),
@@ -67,6 +68,23 @@ export const ConfigSchema = schema.object({
       }),
     }),
   }),
+  capture: schema.object({
+    timeouts: schema.object({
+      openUrl: schema.oneOf([schema.number(), schema.duration()], {
+        defaultValue: moment.duration({ minutes: 1 }),
+      }),
+      waitForElements: schema.oneOf([schema.number(), schema.duration()], {
+        defaultValue: moment.duration({ seconds: 30 }),
+      }),
+      renderComplete: schema.oneOf([schema.number(), schema.duration()], {
+        defaultValue: moment.duration({ seconds: 30 }),
+      }),
+    }),
+    zoom: schema.number({ defaultValue: 2 }),
+    loadDelay: schema.oneOf([schema.number(), schema.duration()], {
+      defaultValue: moment.duration({ seconds: 3 }),
+    }),
+  }),
   poolSize: schema.number({ defaultValue: 1, min: 1 }),
 });
 
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/index.ts b/x-pack/plugins/screenshotting/server/formats/pdf/index.ts
index b7718155c5424..7a2453b2a426b 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/index.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/index.ts
@@ -7,7 +7,7 @@
 
 import { groupBy } from 'lodash';
 import type { Values } from '@kbn/utility-types';
-import type { Logger, PackageInfo } from 'src/core/server';
+import type { Logger, PackageInfo } from '@kbn/core/server';
 import type { LayoutParams } from '../../../common';
 import { LayoutTypes } from '../../../common';
 import type { Layout } from '../../layouts';
@@ -46,7 +46,7 @@ export interface PdfScreenshotOptions extends CaptureOptions {
   /**
    * We default to the "print" layout if no ID is specified for the layout
    */
-  layout: PdfLayoutParams;
+  layout?: PdfLayoutParams;
 }
 
 export interface PdfScreenshotMetrics extends Partial<CaptureMetrics> {
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts
index 2c5439267ffc4..be69ec4c5e141 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger, PackageInfo } from 'src/core/server';
+import type { Logger, PackageInfo } from '@kbn/core/server';
 import { PdfMaker } from './pdfmaker';
 import type { Layout } from '../../../layouts';
 import { getTracker } from './tracker';
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts
index e08cf808abbc5..663863bec9757 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/integration_tests/pdfmaker.test.ts
@@ -7,9 +7,9 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { PackageInfo } from 'kibana/server';
+import { PackageInfo } from '@kbn/core/server';
 import path from 'path';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { isUint8Array } from 'util/types';
 import { errors } from '../../../../../common';
 import { createMockLayout } from '../../../../layouts/mock';
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts
index a10f259e5c9e5..afd9e294e9ae0 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/pdfmaker.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger, PackageInfo } from 'src/core/server';
+import type { Logger, PackageInfo } from '@kbn/core/server';
 import { SerializableRecord } from '@kbn/utility-types';
 import path from 'path';
 import { Content, ContentImage, ContentText } from 'pdfmake/interfaces';
diff --git a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js
index e180c130bc4af..0b6dde0a3eeb0 100644
--- a/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js
+++ b/x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/worker_src_harness.js
@@ -11,4 +11,5 @@
  */
 
 require('../../../../../../../src/setup_node_env');
+// eslint-disable-next-line @kbn/imports/uniform_imports
 require('./worker.ts');
diff --git a/x-pack/plugins/screenshotting/server/formats/png.ts b/x-pack/plugins/screenshotting/server/formats/png.ts
index 1f2244255e9ae..c3338f5a9194f 100644
--- a/x-pack/plugins/screenshotting/server/formats/png.ts
+++ b/x-pack/plugins/screenshotting/server/formats/png.ts
@@ -24,7 +24,7 @@ export interface PngScreenshotOptions extends CaptureOptions {
    */
   format?: 'png';
 
-  layout: PngLayoutParams;
+  layout?: PngLayoutParams;
 }
 
 /**
diff --git a/x-pack/plugins/screenshotting/server/layouts/index.ts b/x-pack/plugins/screenshotting/server/layouts/index.ts
index d21b06e6a688a..bf34fdf68719f 100644
--- a/x-pack/plugins/screenshotting/server/layouts/index.ts
+++ b/x-pack/plugins/screenshotting/server/layouts/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { LayoutSelectorDictionary, Size } from '../../common/layout';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { BaseLayout } from './base_layout';
diff --git a/x-pack/plugins/screenshotting/server/plugin.test.ts b/x-pack/plugins/screenshotting/server/plugin.test.ts
index 22cd2c2f75ac5..7624d9adceeba 100644
--- a/x-pack/plugins/screenshotting/server/plugin.test.ts
+++ b/x-pack/plugins/screenshotting/server/plugin.test.ts
@@ -7,9 +7,9 @@
 
 jest.mock('./browsers/install');
 
-import type { CoreSetup, CoreStart, PluginInitializerContext } from 'kibana/server';
-import { coreMock } from 'src/core/server/mocks';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+import type { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { install } from './browsers/install';
 import { ScreenshottingPlugin } from './plugin';
 
diff --git a/x-pack/plugins/screenshotting/server/plugin.ts b/x-pack/plugins/screenshotting/server/plugin.ts
index 2f675335d4393..23f688206d394 100755
--- a/x-pack/plugins/screenshotting/server/plugin.ts
+++ b/x-pack/plugins/screenshotting/server/plugin.ts
@@ -14,8 +14,8 @@ import type {
   PackageInfo,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
-import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
+} from '@kbn/core/server';
+import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import { ChromiumArchivePaths, HeadlessChromiumDriverFactory, install } from './browsers';
 import { ConfigType, createConfig } from './config';
 import { Screenshots } from './screenshots';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/__snapshots__/index.test.ts.snap b/x-pack/plugins/screenshotting/server/screenshots/__snapshots__/index.test.ts.snap
new file mode 100644
index 0000000000000..c0971c9b95763
--- /dev/null
+++ b/x-pack/plugins/screenshotting/server/screenshots/__snapshots__/index.test.ts.snap
@@ -0,0 +1,300 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Screenshot Observable Pipeline error handling recovers if waitForSelector fails 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {},
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 100,
+            "left": 0,
+            "top": 0,
+            "width": 100,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": undefined,
+        "title": undefined,
+      },
+    ],
+    "timeRange": null,
+  },
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {},
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 100,
+            "left": 0,
+            "top": 0,
+            "width": 100,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": undefined,
+        "title": undefined,
+      },
+    ],
+    "timeRange": null,
+  },
+]
+`;
+
+exports[`Screenshot Observable Pipeline error handling uses defaults for element positions and size when Kibana page is not ready 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {},
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 1200,
+            "left": 0,
+            "top": 0,
+            "width": 1950,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": undefined,
+        "title": undefined,
+      },
+    ],
+    "timeRange": undefined,
+  },
+]
+`;
+
+exports[`Screenshot Observable Pipeline pipelines a single url into screenshot and timeRange 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {
+          "description": "Default ",
+          "title": "Default Mock Title",
+        },
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 600,
+            "left": 0,
+            "top": 0,
+            "width": 800,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+          ],
+          "type": "Buffer",
+        },
+        "description": "Default ",
+        "title": "Default Mock Title",
+      },
+    ],
+    "timeRange": "Default GetTimeRange Result",
+  },
+]
+`;
+
+exports[`Screenshot Observable Pipeline pipelines multiple urls into 1`] = `
+Array [
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {
+          "description": "Default ",
+          "title": "Default Mock Title",
+        },
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 600,
+            "left": 0,
+            "top": 0,
+            "width": 800,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            111,
+            109,
+            101,
+            32,
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+            115,
+          ],
+          "type": "Buffer",
+        },
+        "description": "Default ",
+        "title": "Default Mock Title",
+      },
+    ],
+    "timeRange": "Default GetTimeRange Result",
+  },
+  Object {
+    "elementsPositionAndAttributes": Array [
+      Object {
+        "attributes": Object {
+          "description": "Default ",
+          "title": "Default Mock Title",
+        },
+        "position": Object {
+          "boundingClientRect": Object {
+            "height": 600,
+            "left": 0,
+            "top": 0,
+            "width": 800,
+          },
+          "scroll": Object {
+            "x": 0,
+            "y": 0,
+          },
+        },
+      },
+    ],
+    "error": undefined,
+    "renderErrors": undefined,
+    "screenshots": Array [
+      Object {
+        "data": Object {
+          "data": Array [
+            115,
+            111,
+            109,
+            101,
+            32,
+            115,
+            99,
+            114,
+            101,
+            101,
+            110,
+            115,
+            104,
+            111,
+            116,
+            115,
+          ],
+          "type": "Buffer",
+        },
+        "description": "Default ",
+        "title": "Default Mock Title",
+      },
+    ],
+    "timeRange": "Default GetTimeRange Result",
+  },
+]
+`;
diff --git a/x-pack/plugins/screenshotting/server/screenshots/constants.ts b/x-pack/plugins/screenshotting/server/screenshots/constants.ts
index b1064ec147745..de7278d60840a 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/constants.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/server';
+import { APP_WRAPPER_CLASS } from '@kbn/core/server';
 export const DEFAULT_PAGELOAD_SELECTOR = `.${APP_WRAPPER_CLASS}`;
 
 export const CONTEXT_GETNUMBEROFITEMS = 'GetNumberOfItems';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts
index 7d5791f0dfeb1..915b036acf22e 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getElementPositionAndAttributes } from './get_element_position_data';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts
index 0e2106a98d8b0..e3235c6d23253 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_element_position_data.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_ELEMENTATTRIBUTES } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts
index e5e70f617339d..34b8291eb03da 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getNumberOfItems } from './get_number_of_items';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts
index 39976d2a6d656..9dab001e4730d 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_number_of_items.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_GETNUMBEROFITEMS, CONTEXT_READMETADATA } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts
index 75576d7221f5e..a475e3c614c15 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getRenderErrors } from './get_render_errors';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts
index 007b3eb48d1c9..e8beb18911210 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_render_errors.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { Layout } from '../layouts';
 import { CONTEXT_GETRENDERERRORS } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts
index 2bb00413c8231..1f104b9bf2d80 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { getScreenshots } from './get_screenshots';
 
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts
index 26ef272e7f18e..53829b098ee8c 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_screenshots.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { ElementsPositionAndAttribute } from './get_element_position_data';
 
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts
index d277690a08282..8484412f5fd94 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
 import { createMockLayout } from '../layouts/mock';
 import { getTimeRange } from './get_time_range';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts
index 6734a35932b59..41d902436d36b 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/get_time_range.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_GETTIMERANGE } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
index eef98ceea34ba..3833cfcc45932 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.test.ts
@@ -5,22 +5,22 @@
  * 2.0.
  */
 
-import { of, throwError } from 'rxjs';
-import type { Logger, PackageInfo } from 'src/core/server';
-import { httpServiceMock } from 'src/core/server/mocks';
+import type { Logger, PackageInfo } from '@kbn/core/server';
+import { httpServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { lastValueFrom, of, throwError } from 'rxjs';
+import { ScreenshotOptions, Screenshots } from '.';
 import {
   SCREENSHOTTING_APP_ID,
   SCREENSHOTTING_EXPRESSION,
   SCREENSHOTTING_EXPRESSION_INPUT,
 } from '../../common';
-import type { ConfigType } from '../config';
-import { createMockBrowserDriver, createMockBrowserDriverFactory } from '../browsers/mock';
 import type { HeadlessChromiumDriverFactory } from '../browsers';
+import { createMockBrowserDriver, createMockBrowserDriverFactory } from '../browsers/mock';
+import type { ConfigType } from '../config';
+import type { PngScreenshotOptions } from '../formats';
 import * as Layouts from '../layouts/create_layout';
 import { createMockLayout } from '../layouts/mock';
-import type { PngScreenshotOptions } from '../formats';
 import { CONTEXT_ELEMENTATTRIBUTES } from './constants';
-import { Screenshots, ScreenshotOptions } from '.';
 
 /*
  * Tests
@@ -34,17 +34,15 @@ describe('Screenshot Observable Pipeline', () => {
   let packageInfo: Readonly<PackageInfo>;
   let options: ScreenshotOptions;
   let screenshots: Screenshots;
+  let config: ConfigType;
 
   beforeEach(async () => {
     driver = createMockBrowserDriver();
     driverFactory = createMockBrowserDriverFactory(driver);
     http = httpServiceMock.createSetupContract();
     layout = createMockLayout();
-    logger = {
-      debug: jest.fn(),
-      error: jest.fn(),
-      info: jest.fn(),
-    } as unknown as jest.Mocked<Logger>;
+    logger = loggingSystemMock.createLogger();
+
     packageInfo = {
       branch: 'screenshot-test',
       buildNum: 567891011,
@@ -56,17 +54,24 @@ describe('Screenshot Observable Pipeline', () => {
       browserTimezone: 'UTC',
       headers: {},
       layout: {},
-      timeouts: {
-        loadDelay: 2000,
-        openUrl: 120000,
-        waitForElements: 20000,
-        renderComplete: 10000,
-      },
       urls: ['/welcome/home/start/index.htm'],
-    } as unknown as typeof options;
-    screenshots = new Screenshots(driverFactory, logger, packageInfo, http, {
+    };
+    config = {
       poolSize: 1,
-    } as ConfigType);
+      capture: {
+        timeouts: {
+          openUrl: 30000,
+          waitForElements: 30000,
+          renderComplete: 30000,
+        },
+        loadDelay: 5000000000,
+        zoom: 2,
+      },
+      networkPolicy: { enabled: false, rules: [] },
+      browser: {} as ConfigType['browser'],
+    };
+
+    screenshots = new Screenshots(driverFactory, logger, packageInfo, http, config);
 
     jest.spyOn(Layouts, 'createLayout').mockReturnValue(layout);
 
@@ -78,179 +83,23 @@ describe('Screenshot Observable Pipeline', () => {
   });
 
   it('pipelines a single url into screenshot and timeRange', async () => {
-    const result = await screenshots.getScreenshots(options as PngScreenshotOptions).toPromise();
+    const result = await lastValueFrom(screenshots.getScreenshots(options as PngScreenshotOptions));
 
     expect(result).toHaveProperty('results');
-    expect(result.results).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "elementsPositionAndAttributes": Array [
-            Object {
-              "attributes": Object {
-                "description": "Default ",
-                "title": "Default Mock Title",
-              },
-              "position": Object {
-                "boundingClientRect": Object {
-                  "height": 600,
-                  "left": 0,
-                  "top": 0,
-                  "width": 800,
-                },
-                "scroll": Object {
-                  "x": 0,
-                  "y": 0,
-                },
-              },
-            },
-          ],
-          "error": undefined,
-          "renderErrors": undefined,
-          "screenshots": Array [
-            Object {
-              "data": Object {
-                "data": Array [
-                  115,
-                  99,
-                  114,
-                  101,
-                  101,
-                  110,
-                  115,
-                  104,
-                  111,
-                  116,
-                ],
-                "type": "Buffer",
-              },
-              "description": "Default ",
-              "title": "Default Mock Title",
-            },
-          ],
-          "timeRange": "Default GetTimeRange Result",
-        },
-      ]
-    `);
+    expect(result.results).toMatchSnapshot();
   });
 
   it('pipelines multiple urls into', async () => {
     driver.screenshot.mockResolvedValue(Buffer.from('some screenshots'));
-    const result = await screenshots
-      .getScreenshots({
+    const result = await lastValueFrom(
+      screenshots.getScreenshots({
         ...options,
         urls: ['/welcome/home/start/index2.htm', '/welcome/home/start/index.php3?page=./home.php'],
       } as PngScreenshotOptions)
-      .toPromise();
+    );
 
     expect(result).toHaveProperty('results');
-    expect(result.results).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "elementsPositionAndAttributes": Array [
-            Object {
-              "attributes": Object {
-                "description": "Default ",
-                "title": "Default Mock Title",
-              },
-              "position": Object {
-                "boundingClientRect": Object {
-                  "height": 600,
-                  "left": 0,
-                  "top": 0,
-                  "width": 800,
-                },
-                "scroll": Object {
-                  "x": 0,
-                  "y": 0,
-                },
-              },
-            },
-          ],
-          "error": undefined,
-          "renderErrors": undefined,
-          "screenshots": Array [
-            Object {
-              "data": Object {
-                "data": Array [
-                  115,
-                  111,
-                  109,
-                  101,
-                  32,
-                  115,
-                  99,
-                  114,
-                  101,
-                  101,
-                  110,
-                  115,
-                  104,
-                  111,
-                  116,
-                  115,
-                ],
-                "type": "Buffer",
-              },
-              "description": "Default ",
-              "title": "Default Mock Title",
-            },
-          ],
-          "timeRange": "Default GetTimeRange Result",
-        },
-        Object {
-          "elementsPositionAndAttributes": Array [
-            Object {
-              "attributes": Object {
-                "description": "Default ",
-                "title": "Default Mock Title",
-              },
-              "position": Object {
-                "boundingClientRect": Object {
-                  "height": 600,
-                  "left": 0,
-                  "top": 0,
-                  "width": 800,
-                },
-                "scroll": Object {
-                  "x": 0,
-                  "y": 0,
-                },
-              },
-            },
-          ],
-          "error": undefined,
-          "renderErrors": undefined,
-          "screenshots": Array [
-            Object {
-              "data": Object {
-                "data": Array [
-                  115,
-                  111,
-                  109,
-                  101,
-                  32,
-                  115,
-                  99,
-                  114,
-                  101,
-                  101,
-                  110,
-                  115,
-                  104,
-                  111,
-                  116,
-                  115,
-                ],
-                "type": "Buffer",
-              },
-              "description": "Default ",
-              "title": "Default Mock Title",
-            },
-          ],
-          "timeRange": "Default GetTimeRange Result",
-        },
-      ]
-    `);
+    expect(result.results).toMatchSnapshot();
 
     expect(driver.open).toHaveBeenCalledTimes(2);
     expect(driver.open).nthCalledWith(
@@ -294,107 +143,18 @@ describe('Screenshot Observable Pipeline', () => {
       driver.waitForSelector.mockImplementation((selectorArg: string) => {
         throw new Error('Mock error!');
       });
-      const result = await screenshots
-        .getScreenshots({
+      const result = await lastValueFrom(
+        screenshots.getScreenshots({
           ...options,
           urls: [
             '/welcome/home/start/index2.htm',
             '/welcome/home/start/index.php3?page=./home.php3',
           ],
         } as PngScreenshotOptions)
-        .toPromise();
+      );
 
       expect(result).toHaveProperty('results');
-      expect(result.results).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "elementsPositionAndAttributes": Array [
-              Object {
-                "attributes": Object {},
-                "position": Object {
-                  "boundingClientRect": Object {
-                    "height": 100,
-                    "left": 0,
-                    "top": 0,
-                    "width": 100,
-                  },
-                  "scroll": Object {
-                    "x": 0,
-                    "y": 0,
-                  },
-                },
-              },
-            ],
-            "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
-            "renderErrors": undefined,
-            "screenshots": Array [
-              Object {
-                "data": Object {
-                  "data": Array [
-                    115,
-                    99,
-                    114,
-                    101,
-                    101,
-                    110,
-                    115,
-                    104,
-                    111,
-                    116,
-                  ],
-                  "type": "Buffer",
-                },
-                "description": undefined,
-                "title": undefined,
-              },
-            ],
-            "timeRange": null,
-          },
-          Object {
-            "elementsPositionAndAttributes": Array [
-              Object {
-                "attributes": Object {},
-                "position": Object {
-                  "boundingClientRect": Object {
-                    "height": 100,
-                    "left": 0,
-                    "top": 0,
-                    "width": 100,
-                  },
-                  "scroll": Object {
-                    "x": 0,
-                    "y": 0,
-                  },
-                },
-              },
-            ],
-            "error": [Error: The "wait for elements" phase encountered an error: Error: An error occurred when trying to read the page for visualization panel info: Mock error!],
-            "renderErrors": undefined,
-            "screenshots": Array [
-              Object {
-                "data": Object {
-                  "data": Array [
-                    115,
-                    99,
-                    114,
-                    101,
-                    101,
-                    110,
-                    115,
-                    104,
-                    111,
-                    116,
-                  ],
-                  "type": "Buffer",
-                },
-                "description": undefined,
-                "title": undefined,
-              },
-            ],
-            "timeRange": null,
-          },
-        ]
-      `);
+      expect(result.results).toMatchSnapshot();
     });
 
     it('observes page exit', async () => {
@@ -417,56 +177,12 @@ describe('Screenshot Observable Pipeline', () => {
       );
 
       layout.getViewport = () => null;
-      const result = await screenshots.getScreenshots(options as PngScreenshotOptions).toPromise();
+      const result = await lastValueFrom(
+        screenshots.getScreenshots(options as PngScreenshotOptions)
+      );
 
       expect(result).toHaveProperty('results');
-      expect(result.results).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "elementsPositionAndAttributes": Array [
-              Object {
-                "attributes": Object {},
-                "position": Object {
-                  "boundingClientRect": Object {
-                    "height": 1200,
-                    "left": 0,
-                    "top": 0,
-                    "width": 1950,
-                  },
-                  "scroll": Object {
-                    "x": 0,
-                    "y": 0,
-                  },
-                },
-              },
-            ],
-            "error": undefined,
-            "renderErrors": undefined,
-            "screenshots": Array [
-              Object {
-                "data": Object {
-                  "data": Array [
-                    115,
-                    99,
-                    114,
-                    101,
-                    101,
-                    110,
-                    115,
-                    104,
-                    111,
-                    116,
-                  ],
-                  "type": "Buffer",
-                },
-                "description": undefined,
-                "title": undefined,
-              },
-            ],
-            "timeRange": undefined,
-          },
-        ]
-      `);
+      expect(result.results).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/plugins/screenshotting/server/screenshots/index.ts b/x-pack/plugins/screenshotting/server/screenshots/index.ts
index cfd5c76093d3b..3fa0f1d222c3d 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/index.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/index.ts
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
-import ipaddr from 'ipaddr.js';
-import { sum } from 'lodash';
-import apm from 'elastic-apm-node';
-import type { Transaction } from 'elastic-apm-node';
-import { from, of, Observable } from 'rxjs';
+import type { HttpServiceSetup, KibanaRequest, Logger, PackageInfo } from '@kbn/core/server';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 import type { Optional } from '@kbn/utility-types';
+import type { Transaction } from 'elastic-apm-node';
+import apm from 'elastic-apm-node';
+import ipaddr from 'ipaddr.js';
+import { defaultsDeep, sum } from 'lodash';
+import { from, Observable, of } from 'rxjs';
 import {
   catchError,
   concatMap,
@@ -22,18 +24,15 @@ import {
   tap,
   toArray,
 } from 'rxjs/operators';
-import type { HttpServiceSetup, KibanaRequest, Logger, PackageInfo } from 'src/core/server';
-import type { ExpressionAstExpression } from 'src/plugins/expressions/common';
 import {
   LayoutParams,
   SCREENSHOTTING_APP_ID,
   SCREENSHOTTING_EXPRESSION,
   SCREENSHOTTING_EXPRESSION_INPUT,
 } from '../../common';
-import type { ConfigType } from '../config';
 import type { HeadlessChromiumDriverFactory, PerformanceMetrics } from '../browsers';
-import { createLayout } from '../layouts';
-import type { Layout } from '../layouts';
+import type { ConfigType } from '../config';
+import { durationToNumber } from '../config';
 import {
   PdfScreenshotOptions,
   PdfScreenshotResult,
@@ -42,12 +41,13 @@ import {
   toPdf,
   toPng,
 } from '../formats';
-import { ScreenshotObservableHandler, UrlOrUrlWithContext } from './observable';
+import type { Layout } from '../layouts';
+import { createLayout } from '../layouts';
 import type { ScreenshotObservableOptions, ScreenshotObservableResult } from './observable';
+import { ScreenshotObservableHandler, UrlOrUrlWithContext } from './observable';
 import { Semaphore } from './semaphore';
 
-export type { UrlOrUrlWithContext } from './observable';
-export type { ScreenshotObservableResult } from './observable';
+export type { ScreenshotObservableResult, UrlOrUrlWithContext } from './observable';
 
 export interface CaptureOptions extends Optional<ScreenshotObservableOptions, 'urls'> {
   /**
@@ -63,7 +63,7 @@ export interface CaptureOptions extends Optional<ScreenshotObservableOptions, 'u
   /**
    * Layout parameters.
    */
-  layout: LayoutParams;
+  layout?: LayoutParams;
 
   /**
    * Source Kibana request object from where the headers will be extracted.
@@ -101,14 +101,14 @@ export class Screenshots {
     private readonly logger: Logger,
     private readonly packageInfo: PackageInfo,
     private readonly http: HttpServiceSetup,
-    { poolSize }: ConfigType
+    private readonly config: ConfigType
   ) {
-    this.semaphore = new Semaphore(poolSize);
+    this.semaphore = new Semaphore(config.poolSize);
   }
 
   private createLayout(transaction: Transaction | null, options: CaptureOptions): Layout {
     const apmCreateLayout = transaction?.startSpan('create-layout', 'setup');
-    const layout = createLayout(options.layout);
+    const layout = createLayout(options.layout ?? {});
     this.logger.debug(`Layout: width=${layout.width} height=${layout.height}`);
     apmCreateLayout?.end();
 
@@ -121,16 +121,13 @@ export class Screenshots {
     options: ScreenshotObservableOptions
   ): Observable<CaptureResult> {
     const apmCreatePage = transaction?.startSpan('create-page', 'wait');
-    const {
-      browserTimezone,
-      timeouts: { openUrl: openUrlTimeout },
-    } = options;
+    const { browserTimezone } = options;
 
     return this.browserDriverFactory
       .createPage(
         {
           browserTimezone,
-          openUrlTimeout,
+          openUrlTimeout: durationToNumber(this.config.capture.timeouts.openUrl),
           defaultViewport: { height: layout.height, width: layout.width },
         },
         this.logger
@@ -141,7 +138,13 @@ export class Screenshots {
           apmCreatePage?.end();
           unexpectedExit$.subscribe({ error: () => transaction?.end() });
 
-          const screen = new ScreenshotObservableHandler(driver, this.logger, layout, options);
+          const screen = new ScreenshotObservableHandler(
+            driver,
+            this.config,
+            this.logger,
+            layout,
+            options
+          );
 
           return from(options.urls).pipe(
             concatMap((url, index) =>
@@ -188,30 +191,52 @@ export class Screenshots {
     return `${protocol}://${hostname}:${port}${this.http.basePath.serverBasePath}/app/${SCREENSHOTTING_APP_ID}`;
   }
 
-  getScreenshots(options: PngScreenshotOptions): Observable<PngScreenshotResult>;
-  getScreenshots(options: PdfScreenshotOptions): Observable<PdfScreenshotResult>;
-  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult>;
-  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult> {
-    const transaction = apm.startTransaction('screenshot-pipeline', 'screenshotting');
-    const layout = this.createLayout(transaction, options);
-    const headers = { ...(options.request?.headers ?? {}), ...(options.headers ?? {}) };
-    const urls = options.expression
+  private getCaptureOptions({
+    expression,
+    input,
+    request,
+    ...options
+  }: ScreenshotOptions): ScreenshotObservableOptions {
+    const headers = { ...(request?.headers ?? {}), ...(options.headers ?? {}) };
+    const urls = expression
       ? [
           [
             this.getScreenshottingAppUrl(),
             {
-              [SCREENSHOTTING_EXPRESSION]: options.expression,
-              [SCREENSHOTTING_EXPRESSION_INPUT]: options.input,
+              [SCREENSHOTTING_EXPRESSION]: expression,
+              [SCREENSHOTTING_EXPRESSION_INPUT]: input,
             },
           ] as UrlOrUrlWithContext,
         ]
-      : options.urls ?? [];
+      : options.urls;
+
+    return defaultsDeep(
+      {
+        ...options,
+        headers,
+        urls,
+      },
+      {
+        timeouts: {
+          openUrl: 60000,
+          waitForElements: 30000,
+          renderComplete: 30000,
+          loadDelay: 3000,
+        },
+        urls: [],
+      }
+    );
+  }
+
+  getScreenshots(options: PngScreenshotOptions): Observable<PngScreenshotResult>;
+  getScreenshots(options: PdfScreenshotOptions): Observable<PdfScreenshotResult>;
+  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult>;
+  getScreenshots(options: ScreenshotOptions): Observable<ScreenshotResult> {
+    const transaction = apm.startTransaction('screenshot-pipeline', 'screenshotting');
+    const layout = this.createLayout(transaction, options);
+    const captureOptions = this.getCaptureOptions(options);
 
-    return this.captureScreenshots(layout, transaction, {
-      ...options,
-      headers,
-      urls,
-    }).pipe(
+    return this.captureScreenshots(layout, transaction, captureOptions).pipe(
       mergeMap((result) => {
         switch (options.format) {
           case 'pdf':
diff --git a/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts b/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts
index 30b7867a0e9b2..a77cfa8c9e8e6 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/inject_css.ts
@@ -8,7 +8,7 @@
 import fs from 'fs';
 import { promisify } from 'util';
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_INJECTCSS } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
index 83800a168ddbe..d3acc96411dc6 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
@@ -5,31 +5,38 @@
  * 2.0.
  */
 
-import { interval, throwError, of } from 'rxjs';
+import { interval, of, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import { createMockBrowserDriver } from '../browsers/mock';
+import type { ConfigType } from '../config';
 import { createMockLayout } from '../layouts/mock';
 import { ScreenshotObservableHandler, ScreenshotObservableOptions } from './observable';
 
 describe('ScreenshotObservableHandler', () => {
   let browser: ReturnType<typeof createMockBrowserDriver>;
+  let config: ConfigType;
   let layout: ReturnType<typeof createMockLayout>;
   let logger: jest.Mocked<Logger>;
   let options: ScreenshotObservableOptions;
 
   beforeEach(async () => {
     browser = createMockBrowserDriver();
+    config = {
+      capture: {
+        timeouts: {
+          openUrl: 30000,
+          waitForElements: 30000,
+          renderComplete: 30000,
+        },
+        loadDelay: 5000,
+        zoom: 13,
+      },
+    } as ConfigType;
     layout = createMockLayout();
     logger = { error: jest.fn() } as unknown as jest.Mocked<Logger>;
     options = {
       headers: { testHeader: 'testHeadValue' },
-      timeouts: {
-        loadDelay: 5000,
-        openUrl: 30000,
-        waitForElements: 30000,
-        renderComplete: 30000,
-      },
       urls: [],
     };
 
@@ -37,8 +44,12 @@ describe('ScreenshotObservableHandler', () => {
   });
 
   describe('waitUntil', () => {
+    let screenshots: ScreenshotObservableHandler;
+    beforeEach(() => {
+      screenshots = new ScreenshotObservableHandler(browser, config, logger, layout, options);
+    });
+
     it('catches TimeoutError and references the timeout config in a custom message', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = interval(1000).pipe(screenshots.waitUntil(200, 'Test Config'));
 
       const testPipeline = () => test$.toPromise();
@@ -48,7 +59,6 @@ describe('ScreenshotObservableHandler', () => {
     });
 
     it('catches other Errors and explains where they were thrown', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = throwError(new Error(`Test Error to Throw`)).pipe(
         screenshots.waitUntil(200, 'Test Config')
       );
@@ -60,7 +70,6 @@ describe('ScreenshotObservableHandler', () => {
     });
 
     it('is a pass-through if there is no Error', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = of('nice to see you').pipe(screenshots.waitUntil(20, 'xxxxxxxxxxx'));
 
       await expect(test$.toPromise()).resolves.toBe(`nice to see you`);
@@ -68,9 +77,13 @@ describe('ScreenshotObservableHandler', () => {
   });
 
   describe('checkPageIsOpen', () => {
+    let screenshots: ScreenshotObservableHandler;
+    beforeEach(() => {
+      screenshots = new ScreenshotObservableHandler(browser, config, logger, layout, options);
+    });
+
     it('throws a decorated Error when page is not open', async () => {
       browser.isPageOpen.mockReturnValue(false);
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = of(234455).pipe(
         map((input) => {
           screenshots.checkPageIsOpen();
@@ -84,7 +97,6 @@ describe('ScreenshotObservableHandler', () => {
     });
 
     it('is a pass-through when the page is open', async () => {
-      const screenshots = new ScreenshotObservableHandler(browser, logger, layout, options);
       const test$ = of(234455).pipe(
         map((input) => {
           screenshots.checkPageIsOpen();
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
index fbc147102e0af..b19f3f254b2a2 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
@@ -6,45 +6,29 @@
  */
 
 import type { Transaction } from 'elastic-apm-node';
-import { defer, forkJoin, throwError, Observable } from 'rxjs';
+import { defer, forkJoin, Observable, throwError } from 'rxjs';
 import { catchError, mergeMap, switchMapTo, timeoutWith } from 'rxjs/operators';
-import type { Headers, Logger } from 'src/core/server';
+import type { Headers, Logger } from '@kbn/core/server';
 import { errors } from '../../common';
 import type { Context, HeadlessChromiumDriver } from '../browsers';
-import { getChromiumDisconnectedError, DEFAULT_VIEWPORT } from '../browsers';
+import { DEFAULT_VIEWPORT, getChromiumDisconnectedError } from '../browsers';
+import { durationToNumber as toNumber, ConfigType } from '../config';
 import type { Layout } from '../layouts';
 import type { ElementsPositionAndAttribute } from './get_element_position_data';
 import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getNumberOfItems } from './get_number_of_items';
 import { getRenderErrors } from './get_render_errors';
-import { getScreenshots } from './get_screenshots';
 import type { Screenshot } from './get_screenshots';
+import { getScreenshots } from './get_screenshots';
 import { getTimeRange } from './get_time_range';
 import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { waitForRenderComplete } from './wait_for_render';
 import { waitForVisualizations } from './wait_for_visualizations';
 
-export interface PhaseTimeouts {
-  /**
-   * Open URL phase timeout.
-   */
-  openUrl: number;
-
-  /**
-   * Timeout of the page readiness phase.
-   */
-  waitForElements: number;
-
-  /**
-   * Timeout of the page render phase.
-   */
-  renderComplete: number;
-
-  /**
-   * An additional delay to wait until the visualizations are ready.
-   */
-  loadDelay: number;
+type CaptureTimeouts = ConfigType['capture']['timeouts'];
+export interface PhaseTimeouts extends CaptureTimeouts {
+  loadDelay: ConfigType['capture']['loadDelay'];
 }
 
 type Url = string;
@@ -63,11 +47,6 @@ export interface ScreenshotObservableOptions {
    */
   headers?: Headers;
 
-  /**
-   * Timeouts for each phase of the screenshot.
-   */
-  timeouts: PhaseTimeouts;
-
   /**
    * The list or URL to take screenshots of.
    * Every item can either be a string or a tuple containing a URL and a context.
@@ -138,6 +117,7 @@ const getDefaultViewPort = () => ({
 export class ScreenshotObservableHandler {
   constructor(
     private readonly driver: HeadlessChromiumDriver,
+    private readonly config: ConfigType,
     private readonly logger: Logger,
     private readonly layout: Layout,
     private options: ScreenshotObservableOptions
@@ -175,18 +155,18 @@ export class ScreenshotObservableHandler {
       return openUrl(
         this.driver,
         this.logger,
-        this.options.timeouts.openUrl,
+        toNumber(this.config.capture.timeouts.openUrl),
         index,
         url,
         { ...(context ?? {}), layout: this.layout.id },
         this.options.headers ?? {}
       );
-    }).pipe(this.waitUntil(this.options.timeouts.openUrl, 'open URL'));
+    }).pipe(this.waitUntil(toNumber(this.config.capture.timeouts.openUrl), 'open URL'));
   }
 
   private waitForElements() {
     const driver = this.driver;
-    const waitTimeout = this.options.timeouts.waitForElements;
+    const waitTimeout = toNumber(this.config.capture.timeouts.waitForElements);
 
     return defer(() => getNumberOfItems(driver, this.logger, waitTimeout, this.layout)).pipe(
       mergeMap(async (itemsCount) => {
@@ -217,7 +197,7 @@ export class ScreenshotObservableHandler {
       await layout.positionElements?.(driver, logger);
       apmPositionElements?.end();
 
-      await waitForRenderComplete(driver, logger, this.options.timeouts.loadDelay, layout);
+      await waitForRenderComplete(driver, logger, toNumber(this.config.capture.loadDelay), layout);
     }).pipe(
       mergeMap(() =>
         forkJoin({
@@ -226,7 +206,7 @@ export class ScreenshotObservableHandler {
           renderErrors: getRenderErrors(driver, logger, layout),
         })
       ),
-      this.waitUntil(this.options.timeouts.renderComplete, 'render complete')
+      this.waitUntil(toNumber(this.config.capture.timeouts.renderComplete), 'render complete')
     );
   }
 
diff --git a/x-pack/plugins/screenshotting/server/screenshots/open_url.ts b/x-pack/plugins/screenshotting/server/screenshots/open_url.ts
index 8b26f35961db4..c557374ff9876 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/open_url.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/open_url.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Headers, Logger } from 'src/core/server';
+import type { Headers, Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import type { Context } from '../browsers';
 import { DEFAULT_PAGELOAD_SELECTOR } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts b/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts
index 16f0d5a6da774..cee23616faeac 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/wait_for_render.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_WAITFORRENDER } from './constants';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts b/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts
index 0c439f765163c..a7485545cdef0 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/wait_for_visualizations.ts
@@ -6,7 +6,7 @@
  */
 
 import apm from 'elastic-apm-node';
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import type { HeadlessChromiumDriver } from '../browsers';
 import { Layout } from '../layouts';
 import { CONTEXT_WAITFORELEMENTSTOBEINDOM } from './constants';
diff --git a/x-pack/plugins/searchprofiler/common/constants.ts b/x-pack/plugins/searchprofiler/common/constants.ts
index 930336fbf2065..a50ed281c2bd0 100644
--- a/x-pack/plugins/searchprofiler/common/constants.ts
+++ b/x-pack/plugins/searchprofiler/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 const basicLicense: LicenseType = 'basic';
 
diff --git a/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx b/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx
index 90756b93cf1d7..dab6c9573cb1f 100644
--- a/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/contexts/app_context.tsx
@@ -8,7 +8,7 @@
 import React, { useContext, createContext, useCallback } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 
-import { HttpSetup, ToastsSetup } from 'kibana/public';
+import { HttpSetup, ToastsSetup } from '@kbn/core/public';
 import { LicenseStatus } from '../../../common';
 
 export interface ContextArgs {
diff --git a/x-pack/plugins/searchprofiler/public/application/index.tsx b/x-pack/plugins/searchprofiler/public/application/index.tsx
index 419455c119fc2..644a2764e85c7 100644
--- a/x-pack/plugins/searchprofiler/public/application/index.tsx
+++ b/x-pack/plugins/searchprofiler/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { HttpStart as Http, ToastsSetup, CoreTheme } from 'kibana/public';
+import { HttpStart as Http, ToastsSetup, CoreTheme } from '@kbn/core/public';
 import { RouteComponentProps } from 'react-router-dom';
 
 import { LicenseStatus } from '../../common';
diff --git a/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts b/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts
index e3a7d7e3db361..f1288431f0b3b 100644
--- a/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts
+++ b/x-pack/plugins/searchprofiler/public/application/lib/check_for_json_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { XJson } from '../../../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 const { collapseLiteralStrings } = XJson;
 
diff --git a/x-pack/plugins/searchprofiler/public/locator.ts b/x-pack/plugins/searchprofiler/public/locator.ts
index 40d79d0e5fc27..b6680686bb50d 100644
--- a/x-pack/plugins/searchprofiler/public/locator.ts
+++ b/x-pack/plugins/searchprofiler/public/locator.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 
 export const SEARCH_PROFILER_LOCATOR_ID = 'SEARCH_PROFILER_LOCATOR';
 
diff --git a/x-pack/plugins/searchprofiler/public/plugin.ts b/x-pack/plugins/searchprofiler/public/plugin.ts
index 6b0b0bd831c13..a039de9fa0f66 100644
--- a/x-pack/plugins/searchprofiler/public/plugin.ts
+++ b/x-pack/plugins/searchprofiler/public/plugin.ts
@@ -5,12 +5,10 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup } from 'src/core/public';
-
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import { ILicense } from '../../licensing/common/types';
+import { Plugin, CoreSetup } from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 
 import { PLUGIN } from '../common';
 import { AppPublicPluginDependencies } from './types';
@@ -37,7 +35,7 @@ export class SearchProfilerUIPlugin implements Plugin<void, void, AppPublicPlugi
       icon: 'searchProfilerApp',
       path: '/app/dev_tools#/searchprofiler',
       showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
     });
 
     const devTool = devTools.register({
@@ -52,7 +50,7 @@ export class SearchProfilerUIPlugin implements Plugin<void, void, AppPublicPlugi
         const { notifications, i18n: i18nDep } = coreStart;
         const { renderApp } = await import('./application');
 
-        const license = await licensing.license$.pipe(first()).toPromise();
+        const license = await firstValueFrom(licensing.license$);
         const initialLicenseStatus = checkLicenseStatus(license);
 
         return renderApp({
diff --git a/x-pack/plugins/searchprofiler/public/shared_imports.ts b/x-pack/plugins/searchprofiler/public/shared_imports.ts
index f90a782e6a8ed..cdb8bffe65b50 100644
--- a/x-pack/plugins/searchprofiler/public/shared_imports.ts
+++ b/x-pack/plugins/searchprofiler/public/shared_imports.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-export { ace } from '../../../../src/plugins/es_ui_shared/public';
+export { ace } from '@kbn/es-ui-shared-plugin/public';
 
-export { KibanaThemeProvider } from '../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/searchprofiler/public/types.ts b/x-pack/plugins/searchprofiler/public/types.ts
index 219ba28fb1a81..50c72993352ad 100644
--- a/x-pack/plugins/searchprofiler/public/types.ts
+++ b/x-pack/plugins/searchprofiler/public/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import { DevToolsSetup } from '../../../../src/plugins/dev_tools/public';
-import { SharePluginSetup } from '../../../../src/plugins/share/public';
-import { LicensingPluginSetup } from '../../licensing/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { DevToolsSetup } from '@kbn/dev-tools-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface AppPublicPluginDependencies {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/searchprofiler/server/index.ts b/x-pack/plugins/searchprofiler/server/index.ts
index e76a79b44c9ac..95f5b28435738 100644
--- a/x-pack/plugins/searchprofiler/server/index.ts
+++ b/x-pack/plugins/searchprofiler/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SearchProfilerServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => {
diff --git a/x-pack/plugins/searchprofiler/server/plugin.ts b/x-pack/plugins/searchprofiler/server/plugin.ts
index ed85febac9a45..cf37c97b85000 100644
--- a/x-pack/plugins/searchprofiler/server/plugin.ts
+++ b/x-pack/plugins/searchprofiler/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { LicenseStatus, PLUGIN } from '../common';
 import { AppServerPluginDependencies } from './types';
diff --git a/x-pack/plugins/searchprofiler/server/types.ts b/x-pack/plugins/searchprofiler/server/types.ts
index 589cd627ef2ba..edba476428a12 100644
--- a/x-pack/plugins/searchprofiler/server/types.ts
+++ b/x-pack/plugins/searchprofiler/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { IRouter, Logger } from 'kibana/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { IRouter, Logger } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { LicenseStatus } from '../common';
 
 export interface AppServerPluginDependencies {
diff --git a/x-pack/plugins/security/common/licensing/index.mock.ts b/x-pack/plugins/security/common/licensing/index.mock.ts
index f9e6a0b756d00..8a9320b97c4ed 100644
--- a/x-pack/plugins/security/common/licensing/index.mock.ts
+++ b/x-pack/plugins/security/common/licensing/index.mock.ts
@@ -7,8 +7,9 @@
 
 import { of } from 'rxjs';
 
-import type { LicenseType } from '../../../licensing/common/types';
-import { LICENSE_TYPE } from '../../../licensing/common/types';
+import type { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/common/types';
+
 import type { SecurityLicenseFeatures } from './license_features';
 import type { SecurityLicense } from './license_service';
 
diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
index ca38a623bba37..09598fc22c042 100644
--- a/x-pack/plugins/security/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -7,7 +7,8 @@
 
 import { BehaviorSubject, of } from 'rxjs';
 
-import { licenseMock } from '../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+
 import { SecurityLicenseService } from './license_service';
 
 describe('license features', function () {
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
index fdc99c3923983..dc1dcda89e4af 100644
--- a/x-pack/plugins/security/common/licensing/license_service.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -8,7 +8,8 @@
 import type { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import type { ILicense, LicenseType } from '../../../licensing/common/types';
+import type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
+
 import type { SecurityLicenseFeatures } from './license_features';
 
 export interface SecurityLicense {
diff --git a/x-pack/plugins/security/common/model/deprecations.ts b/x-pack/plugins/security/common/model/deprecations.ts
index e990f370c5173..66dd7d7dabac5 100644
--- a/x-pack/plugins/security/common/model/deprecations.ts
+++ b/x-pack/plugins/security/common/model/deprecations.ts
@@ -6,7 +6,8 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { DeprecationsDetails, GetDeprecationsContext } from '../../../../../src/core/server';
+import type { DeprecationsDetails, GetDeprecationsContext } from '@kbn/core/server';
+
 import type { Role } from './role';
 
 export interface PrivilegeDeprecationsRolesByFeatureIdResponse {
diff --git a/x-pack/plugins/security/common/model/role.test.ts b/x-pack/plugins/security/common/model/role.test.ts
index 0d08c60ff7115..0aa34fefc73e5 100644
--- a/x-pack/plugins/security/common/model/role.test.ts
+++ b/x-pack/plugins/security/common/model/role.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Role } from '../../common/model';
+import type { Role } from '.';
 import {
   copyRole,
   getExtendedRoleDeprecationNotice,
@@ -14,7 +14,7 @@ import {
   isRoleReadOnly,
   isRoleReserved,
   prepareRoleClone,
-} from '../../common/model';
+} from '.';
 
 describe('role', () => {
   describe('isRoleEnabled', () => {
diff --git a/x-pack/plugins/security/kibana.json b/x-pack/plugins/security/kibana.json
index e6956aad64d00..881f67dcf22cb 100644
--- a/x-pack/plugins/security/kibana.json
+++ b/x-pack/plugins/security/kibana.json
@@ -14,7 +14,6 @@
   "ui": true,
   "enabledOnAnonymousPages": true,
   "requiredBundles": [
-    "home",
     "kibanaReact",
     "spaces",
     "esUiShared"
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.test.ts b/x-pack/plugins/security/public/account_management/account_management_app.test.ts
index 11b188a1d1370..3ebeefd9c945b 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.test.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.test.ts
@@ -7,9 +7,9 @@
 
 jest.mock('./account_management_page');
 
-import type { AppMount } from 'src/core/public';
-import { AppNavLinkStatus } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { UserAPIClient } from '../management';
 import { securityMock } from '../mocks';
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.ts b/x-pack/plugins/security/public/account_management/account_management_app.ts
index d95b86194f54f..98d810805a16c 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
+import { AppNavLinkStatus } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
-import { AppNavLinkStatus } from '../../../../../src/core/public';
 import type { AuthenticationServiceSetup } from '../authentication';
 
 interface CreateDeps {
diff --git a/x-pack/plugins/security/public/account_management/account_management_page.test.tsx b/x-pack/plugins/security/public/account_management/account_management_page.test.tsx
index fb73322655399..976f437beaa6b 100644
--- a/x-pack/plugins/security/public/account_management/account_management_page.test.tsx
+++ b/x-pack/plugins/security/public/account_management/account_management_page.test.tsx
@@ -8,8 +8,8 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { AuthenticatedUser } from '../../common/model';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
diff --git a/x-pack/plugins/security/public/account_management/account_management_page.tsx b/x-pack/plugins/security/public/account_management/account_management_page.tsx
index bc5229ba6bc9f..5eb396204b6e8 100644
--- a/x-pack/plugins/security/public/account_management/account_management_page.tsx
+++ b/x-pack/plugins/security/public/account_management/account_management_page.tsx
@@ -9,11 +9,11 @@ import { EuiPage, EuiPageBody, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui
 import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart, NotificationsStart } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { AppMountParameters, CoreStart, NotificationsStart } from 'src/core/public';
 
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 import type { AuthenticatedUser } from '../../common/model';
 import { getUserDisplayName } from '../../common/model';
 import type { AuthenticationServiceSetup } from '../authentication';
diff --git a/x-pack/plugins/security/public/account_management/change_password/change_password.tsx b/x-pack/plugins/security/public/account_management/change_password/change_password.tsx
index 8c85b47675c54..c78929cd3ba83 100644
--- a/x-pack/plugins/security/public/account_management/change_password/change_password.tsx
+++ b/x-pack/plugins/security/public/account_management/change_password/change_password.tsx
@@ -8,9 +8,9 @@
 import { EuiDescribedFormGroup } from '@elastic/eui';
 import React, { Component } from 'react';
 
+import type { NotificationsSetup } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsSetup } from 'src/core/public';
 
 import type { AuthenticatedUser } from '../../../common/model';
 import { canUserChangePassword } from '../../../common/model';
diff --git a/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx b/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx
index a4ad769146e59..92dbb572df045 100644
--- a/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx
+++ b/x-pack/plugins/security/public/account_management/change_password/change_password_async.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import { UserAPIClient } from '../../management/users';
 import type { ChangePasswordProps } from './change_password';
diff --git a/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts b/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts
index 7f72fe9eaa0f1..1cd7247a1319d 100644
--- a/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts
+++ b/x-pack/plugins/security/public/anonymous_access/anonymous_access_service.ts
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import type { Capabilities, HttpStart } from 'src/core/public';
-
+import type { Capabilities, HttpStart } from '@kbn/core/public';
 import type {
   AnonymousAccessServiceContract,
   AnonymousAccessState,
-} from '../../../../../src/plugins/share/common';
-import type { SharePluginSetup } from '../../../../../src/plugins/share/public';
+} from '@kbn/share-plugin/common';
+import type { SharePluginSetup } from '@kbn/share-plugin/public';
 
 const DEFAULT_ANONYMOUS_ACCESS_STATE = Object.freeze<AnonymousAccessState>({
   isEnabled: false,
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
index e76a4ca20b59c..40f667996e590 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./access_agreement_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { accessAgreementApp } from './access_agreement_app';
 
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
index 44fd5048cc60b..b32056094cd7f 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
 interface CreateDeps {
   application: ApplicationSetup;
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
index a7a43077fbc46..a8d5c22e6a5f8 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
@@ -10,8 +10,8 @@ import { act } from '@testing-library/react';
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { AccessAgreementPage } from './access_agreement_page';
 
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
index 978880d797189..6e53d3b76fcc6 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
@@ -21,17 +21,17 @@ import React, { useCallback, useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 import ReactMarkdown from 'react-markdown';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import type {
   AppMountParameters,
   CoreStart,
   FatalErrorsStart,
   HttpStart,
   NotificationsStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { parseNext } from '../../../common/parse_next';
 import { AuthenticationStatePage } from '../components';
 
diff --git a/x-pack/plugins/security/public/authentication/authentication_service.ts b/x-pack/plugins/security/public/authentication/authentication_service.ts
index 202fc1b98452c..5cbf5007be218 100644
--- a/x-pack/plugins/security/public/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/public/authentication/authentication_service.ts
@@ -10,7 +10,7 @@ import type {
   FatalErrorsSetup,
   HttpSetup,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import type { AuthenticatedUser } from '../../common/model';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
index 0283df88fdb87..df32f2962f71c 100644
--- a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { captureURLApp } from './capture_url_app';
 
diff --git a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts
index 97bbd0848e9c4..f27d5ea7b5466 100644
--- a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts
+++ b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationSetup, FatalErrorsSetup, HttpSetup } from 'src/core/public';
+import type { ApplicationSetup, FatalErrorsSetup, HttpSetup } from '@kbn/core/public';
 
 import { AUTH_URL_HASH_QUERY_STRING_PARAMETER } from '../../../common/constants';
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
index fff6c9e69c5c0..b36330bb9f1b1 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./logged_out_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { loggedOutApp } from './logged_out_app';
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
index b84bf9b21f2fc..7abad1d6388fc 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type {
   ApplicationSetup,
   AppMountParameters,
   HttpSetup,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
 
 interface CreateDeps {
   application: ApplicationSetup;
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx
index d21cf1bb5677c..db23c3231c6ae 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.test.tsx
@@ -8,8 +8,8 @@
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { LoggedOutPage } from './logged_out_page';
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx
index 93ab443693e73..ac0efab5d58a4 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx
@@ -9,10 +9,10 @@ import { EuiButton } from '@elastic/eui';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart, IBasePath } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { AppMountParameters, CoreStart, IBasePath } from 'src/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { parseNext } from '../../../common/parse_next';
 import { AuthenticationStatePage } from '../components';
 
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
index 9de62907261c1..595a9442caef1 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
@@ -11,8 +11,8 @@ import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { LoginForm, MessageType, PageMode } from './login_form';
 
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
index e1c51e612ff11..0d4aec220c493 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
@@ -29,9 +29,9 @@ import type { ChangeEvent, FormEvent, MouseEvent } from 'react';
 import React, { Component, Fragment } from 'react';
 import ReactMarkdown from 'react-markdown';
 
+import type { HttpStart, IHttpFetchError, NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { HttpStart, IHttpFetchError, NotificationsStart } from 'src/core/public';
 
 import type { LoginSelector, LoginSelectorProvider } from '../../../../../common/login_state';
 import { LoginValidator } from './validate_login';
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.test.ts b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
index 31cc86f540456..ed27b118024d3 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./login_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { loginApp } from './login_app';
 
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.ts b/x-pack/plugins/security/public/authentication/login/login_app.ts
index e09f8d931844a..41fa37a4072af 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type {
   ApplicationSetup,
   AppMountParameters,
   HttpSetup,
   StartServicesAccessor,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
 
 import type { ConfigType } from '../../config';
 
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
index 6507355221259..faf13036ae81e 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
@@ -10,8 +10,8 @@ import { act } from '@testing-library/react';
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER } from '../../../common/constants';
 import type { LoginState } from '../../../common/login_state';
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.tsx b/x-pack/plugins/security/public/authentication/login/login_page.tsx
index fa5050cf90ea8..16b2d32cd1c66 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.tsx
@@ -21,17 +21,17 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import { BehaviorSubject } from 'rxjs';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import type {
   AppMountParameters,
   CoreStart,
   FatalErrorsStart,
   HttpStart,
   NotificationsStart,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
   LOGOUT_REASON_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
index f60dcfb3e7abe..8c1e78ccb68ea 100644
--- a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { logoutApp } from './logout_app';
 
diff --git a/x-pack/plugins/security/public/authentication/logout/logout_app.ts b/x-pack/plugins/security/public/authentication/logout/logout_app.ts
index 84fc510e96ced..c670727769805 100644
--- a/x-pack/plugins/security/public/authentication/logout/logout_app.ts
+++ b/x-pack/plugins/security/public/authentication/logout/logout_app.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { CoreSetup, HttpSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { CoreSetup, HttpSetup } from 'src/core/public';
 
 interface CreateDeps {
   application: CoreSetup['application'];
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
index 6fb40181e1b77..ac7238f8db7a8 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
@@ -7,8 +7,8 @@
 
 jest.mock('./overwritten_session_page');
 
-import type { AppMount } from 'src/core/public';
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import type { AppMount } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { securityMock } from '../../mocks';
 import { overwrittenSessionApp } from './overwritten_session_app';
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
index d03f300f67608..ccd8377cbdd43 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
 import type { AuthenticationServiceSetup } from '../authentication_service';
 
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx
index 66b2408338391..d33d9432279a4 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.test.tsx
@@ -9,8 +9,8 @@ import { EuiButton } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { AuthenticationStatePage } from '../components/authentication_state_page';
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx
index 810d094490dca..4720a829674ee 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx
@@ -9,10 +9,10 @@ import { EuiButton } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart, IBasePath } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { AppMountParameters, CoreStart, IBasePath } from 'src/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { parseNext } from '../../../common/parse_next';
 import type { AuthenticationServiceSetup } from '../authentication_service';
 import { AuthenticationStatePage } from '../components';
diff --git a/x-pack/plugins/security/public/components/breadcrumb.test.tsx b/x-pack/plugins/security/public/components/breadcrumb.test.tsx
index 00cd4be90a780..a0714c7d1fe4c 100644
--- a/x-pack/plugins/security/public/components/breadcrumb.test.tsx
+++ b/x-pack/plugins/security/public/components/breadcrumb.test.tsx
@@ -7,7 +7,7 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { Breadcrumb, BreadcrumbsProvider, createBreadcrumbsChangeHandler } from './breadcrumb';
 
diff --git a/x-pack/plugins/security/public/components/breadcrumb.tsx b/x-pack/plugins/security/public/components/breadcrumb.tsx
index 4706f60712ad5..8027147cf22da 100644
--- a/x-pack/plugins/security/public/components/breadcrumb.tsx
+++ b/x-pack/plugins/security/public/components/breadcrumb.tsx
@@ -9,9 +9,8 @@ import type { EuiBreadcrumb } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React, { createContext, useContext, useEffect, useRef } from 'react';
 
-import type { ChromeStart } from 'src/core/public';
-
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import type { ChromeStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface BreadcrumbsContext {
   parents: BreadcrumbProps[];
diff --git a/x-pack/plugins/security/public/components/doc_link.tsx b/x-pack/plugins/security/public/components/doc_link.tsx
index c3565818090ee..c23a8f31d4b58 100644
--- a/x-pack/plugins/security/public/components/doc_link.tsx
+++ b/x-pack/plugins/security/public/components/doc_link.tsx
@@ -9,9 +9,8 @@ import { EuiLink } from '@elastic/eui';
 import type { FunctionComponent } from 'react';
 import React, { useCallback } from 'react';
 
-import type { DocLinksStart } from 'kibana/public';
-
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import type { DocLinksStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export type DocLinks = DocLinksStart['links'];
 export type GetDocLinkFunction = (app: string, doc: string) => string;
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
index 552442c0b8611..158af4f2de8d2 100644
--- a/x-pack/plugins/security/public/index.ts
+++ b/x-pack/plugins/security/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializer, PluginInitializerContext } from 'src/core/public';
+import type { PluginInitializer, PluginInitializerContext } from '@kbn/core/public';
 
 import type {
   PluginSetupDependencies,
@@ -18,7 +18,7 @@ import { SecurityPlugin } from './plugin';
 export type { SecurityPluginSetup, SecurityPluginStart };
 export type { AuthenticatedUser } from '../common/model';
 export type { SecurityLicense, SecurityLicenseFeatures } from '../common/licensing';
-export type { UserMenuLink, SecurityNavControlServiceStart } from '../public/nav_control';
+export type { UserMenuLink, SecurityNavControlServiceStart } from './nav_control';
 export type { UiApi } from './ui_api';
 export type { PersonalInfoProps, ChangePasswordProps } from './account_management';
 
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts
index 03c256942ea5d..ea30710e2fac9 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import { APIKeysAPIClient } from './api_keys_api_client';
 
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts
index 96f4506e09b71..fd6c856425cd4 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { ApiKey, ApiKeyRoleDescriptors, ApiKeyToInvalidate } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
index 1e944e1f31353..276e4585dea0c 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx
@@ -9,7 +9,8 @@ import { render } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+
 import { mockAuthenticatedUser } from '../../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../../mocks';
 import { Providers } from '../api_keys_management_app';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
index dabcce11d319f..031f84f38ec32 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx
@@ -28,14 +28,14 @@ import moment from 'moment-timezone';
 import React, { Component } from 'react';
 import { Route } from 'react-router-dom';
 
+import type { NotificationsStart } from '@kbn/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
-import { APP_WRAPPER_CLASS } from '../../../../../../../src/core/public';
-import { SectionLoading } from '../../../../../../../src/plugins/es_ui_shared/public';
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { ApiKey, ApiKeyToInvalidate } from '../../../../common/model';
 import { Breadcrumb } from '../../../components/breadcrumb';
 import { SelectableTokenField } from '../../../components/token_field';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx
index 0ba56570b9983..7a36d9b3e0194 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/create_api_key_flyout.tsx
@@ -26,8 +26,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { CodeEditorField, useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { CodeEditorField, useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import type { ApiKeyRoleDescriptors } from '../../../../common/model';
 import { DocLink } from '../../../components/doc_link';
 import type { FormFlyoutProps } from '../../../components/form_flyout';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx
index 26d1e1f72d31f..8dcf9b42d1fb6 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx
@@ -8,9 +8,9 @@
 import { EuiConfirmModal } from '@elastic/eui';
 import React, { Fragment, useRef, useState } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { ApiKeyToInvalidate } from '../../../../../common/model';
 import type { APIKeysAPIClient } from '../../api_keys_api_client';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx
index 9edd8debe2783..2f6db19d26f16 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/not_enabled/not_enabled.tsx
@@ -9,8 +9,7 @@ import { EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const NotEnabled: React.FunctionComponent = () => {
   const docLinks = useKibana().services.docLinks!;
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx
index 83fe807f9a3c6..514e9aa5e306c 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.test.tsx
@@ -11,8 +11,8 @@ jest.mock('./api_keys_grid', () => ({
 
 import { act } from '@testing-library/react';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
 import { securityMock } from '../../mocks';
 import { apiKeysManagementApp } from './api_keys_management_app';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
index 2532c72d34e83..8145a31f3f6f4 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
@@ -12,19 +12,12 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Router } from 'react-router-dom';
 import type { Observable } from 'rxjs';
 
+import type { CoreStart, CoreTheme, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import type {
-  CoreStart,
-  CoreTheme,
-  StartServicesAccessor,
-} from '../../../../../../src/core/public';
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
-import type { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
 import type { AuthenticationServiceSetup } from '../../authentication';
 import type { BreadcrumbsChangeHandler } from '../../components/breadcrumb';
 import {
diff --git a/x-pack/plugins/security/public/management/management_service.test.ts b/x-pack/plugins/security/public/management/management_service.test.ts
index b0f35e76b6dfa..49fdd6864ec3d 100644
--- a/x-pack/plugins/security/public/management/management_service.test.ts
+++ b/x-pack/plugins/security/public/management/management_service.test.ts
@@ -7,13 +7,13 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import type {
   DefinedSections,
   ManagementApp,
   ManagementSetup,
-} from 'src/plugins/management/public';
-import { createManagementSectionMock } from 'src/plugins/management/public/mocks';
+} from '@kbn/management-plugin/public';
+import { createManagementSectionMock } from '@kbn/management-plugin/public/mocks';
 
 import { licenseMock } from '../../common/licensing/index.mock';
 import type { SecurityLicenseFeatures } from '../../common/licensing/license_features';
diff --git a/x-pack/plugins/security/public/management/management_service.ts b/x-pack/plugins/security/public/management/management_service.ts
index af1b05e64e37c..c6d760ef87d80 100644
--- a/x-pack/plugins/security/public/management/management_service.ts
+++ b/x-pack/plugins/security/public/management/management_service.ts
@@ -7,12 +7,12 @@
 
 import type { Subscription } from 'rxjs';
 
-import type { Capabilities, FatalErrorsSetup, StartServicesAccessor } from 'src/core/public';
+import type { Capabilities, FatalErrorsSetup, StartServicesAccessor } from '@kbn/core/public';
 import type {
   ManagementApp,
   ManagementSection,
   ManagementSetup,
-} from 'src/plugins/management/public';
+} from '@kbn/management-plugin/public';
 
 import type { SecurityLicense } from '../../common/licensing';
 import type { AuthenticationServiceSetup } from '../authentication';
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx
index 55b6cbee4783a..171f592988ba9 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.test.tsx
@@ -9,8 +9,8 @@ import { EuiConfirmModal } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { RoleMapping } from '../../../../../common/model';
 import { roleMappingsAPIClientMock } from '../../index.mock';
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx
index 9130a6ba1830c..c957ad82e63dc 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx
@@ -9,9 +9,9 @@ import { EuiConfirmModal } from '@elastic/eui';
 import type { ReactElement } from 'react';
 import React, { Fragment, useRef, useState } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../../common/model';
 import type { RoleMappingsAPIClient } from '../../role_mappings_api_client';
diff --git a/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx b/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
index ed264a2adb53d..e85e336bf77b0 100644
--- a/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/components/no_compatible_realms/no_compatible_realms.tsx
@@ -9,8 +9,7 @@ import { EuiCallOut, EuiLink } from '@elastic/eui';
 import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 export const NoCompatibleRealms: React.FunctionComponent = () => {
   const docLinks = useKibana().services.docLinks!;
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
index 083b742a21fe7..30f63b16c0e0d 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx
@@ -12,10 +12,10 @@ import '@kbn/test-jest-helpers/target_node/stub_web_worker';
 
 import React from 'react';
 
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 
 import type { Role } from '../../../../common/model';
 import { RoleComboBox } from '../../role_combo_box';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx
index 89fb13c05f729..73678e46ead98 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx
@@ -18,10 +18,10 @@ import {
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
+import type { DocLinksStart, NotificationsStart, ScopedHistory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart, NotificationsStart, ScopedHistory } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../common/model';
 import type { RolesAPIClient } from '../../roles';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx
index dd3bd25a745ca..577c7111092be 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Role, RoleMapping } from '../../../../../common/model';
 import type { RolesAPIClient } from '../../../roles';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx
index 88dc0155c939e..b691c3accd83a 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx
@@ -20,10 +20,10 @@ import {
 import type { ChangeEvent } from 'react';
 import React, { Component, Fragment } from 'react';
 
+import type { DocLinksStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../../common/model';
 import type { RolesAPIClient } from '../../../roles';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
index 06437675a8270..e3394bbdf37e8 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.test.tsx
@@ -15,15 +15,15 @@ import '@kbn/test-jest-helpers/target_node//stub_web_worker';
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import type { monaco } from '@kbn/monaco';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { CodeEditorField } from 'src/plugins/kibana_react/public';
 
 import { AllRule, AnyRule, ExceptAllRule, ExceptAnyRule, FieldRule } from '../../model';
 import { JSONRuleEditor } from './json_rule_editor';
 
-jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
-  ...jest.requireActual('../../../../../../../../src/plugins/kibana_react/public'),
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
+  ...jest.requireActual('@kbn/kibana-react-plugin/public'),
   useKibana: jest.fn().mockReturnValue({
     services: { docLinks: { links: { apis: { createRoleMapping: 'createRoleMappingLink' } } } },
   }),
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx
index 23901e8cd3696..a36e9420c7cf9 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/json_rule_editor.tsx
@@ -14,12 +14,9 @@ import React, { Fragment, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { CodeEditorField, useKibana } from '@kbn/kibana-react-plugin/public';
 import { XJsonLang } from '@kbn/monaco';
 
-import {
-  CodeEditorField,
-  useKibana,
-} from '../../../../../../../../src/plugins/kibana_react/public';
 import type { Rule } from '../../model';
 import { generateRulesFromRaw, RuleBuilderError } from '../../model';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
index 36b1390072408..df9fd8848e403 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.test.tsx
@@ -13,9 +13,9 @@ import '@kbn/test-jest-helpers/target_node/stub_web_worker';
 import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 
 import { AllRule, FieldRule } from '../../model';
 import { JSONRuleEditor } from './json_rule_editor';
diff --git a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx
index 89eb8118733fa..7d2d55b18d460 100644
--- a/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/rule_editor_panel/rule_editor_panel.tsx
@@ -21,9 +21,9 @@ import {
 } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { DocLinksStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { DocLinksStart } from 'src/core/public';
 
 import type { RoleMapping } from '../../../../../common/model';
 import type { Rule } from '../../model';
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts b/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
index f8474b91f26f4..79e2335919b1a 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { RoleMapping } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx
index 7e04b45e7fd8e..4aa55840cc7f8 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/create_role_mapping_button/create_role_mapping_button.tsx
@@ -8,10 +8,10 @@
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
 
+import type { ScopedHistory } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ScopedHistory } from 'src/core/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
 import { EDIT_ROLE_MAPPING_PATH } from '../../../management_urls';
 
 interface CreateRoleMappingButtonProps {
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx
index 9a65792bcb943..9db5b1c5db091 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/empty_prompt/empty_prompt.tsx
@@ -8,8 +8,8 @@
 import { EuiEmptyPrompt } from '@elastic/eui';
 import React, { Fragment } from 'react';
 
+import type { ScopedHistory } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ScopedHistory } from 'src/core/public';
 
 import { CreateRoleMappingButton } from '../create_role_mapping_button';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
index 3ac54cb7863fd..79d97346de8dd 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.test.tsx
@@ -9,10 +9,10 @@ import { EuiLink } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import type { CoreStart } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { CoreStart } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 
 import { rolesAPIClientMock } from '../../roles/index.mock';
 import { NoCompatibleRealms, PermissionDenied, SectionLoading } from '../components';
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx
index 0a25b69dad4be..81fc3b91ae274 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx
@@ -19,17 +19,17 @@ import {
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ApplicationStart,
   DocLinksStart,
   NotificationsStart,
   ScopedHistory,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Role, RoleMapping } from '../../../../common/model';
 import { DisabledBadge, EnabledBadge } from '../../badges';
 import {
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx
index 3b7e96ffabd1e..04db6c58c27d1 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.test.tsx
@@ -8,8 +8,8 @@
 import { act } from '@testing-library/react';
 import { noop } from 'lodash';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
 import { roleMappingsManagementApp } from './role_mappings_management_app';
 
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
index 9367e7cd447f2..981638ccaca28 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx
@@ -9,14 +9,11 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Route, Router, useParams } from 'react-router-dom';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
 import {
   Breadcrumb,
   BreadcrumbsProvider,
diff --git a/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx b/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx
index ac3ba0bd20118..454b8d9461c49 100644
--- a/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx
+++ b/x-pack/plugins/security/public/management/role_table_display/role_table_display.tsx
@@ -8,7 +8,7 @@
 import { EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
 import React from 'react';
 
-import type { ApplicationStart } from 'src/core/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 import type { Role } from '../../../common/model';
 import { getExtendedRoleDeprecationNotice, isRoleDeprecated } from '../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
index 5132757e84613..282bf7beb68be 100644
--- a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../../features/public';
-import { KibanaFeature } from '../../../../../features/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
+import { KibanaFeature } from '@kbn/features-plugin/public';
 
 export const createFeature = (
   config: Pick<
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
index cd72085c9a16d..ac466d2d72540 100644
--- a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_privileges.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../../../features/public';
+import type { KibanaFeature } from '@kbn/features-plugin/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { featuresPluginMock } from '../../../../../features/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { LicenseType } from '../../../../../licensing/server';
+import type { LicenseType } from '@kbn/licensing-plugin/server';
+
 import type { SecurityLicenseFeatures } from '../../../../common/licensing';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { Actions } from '../../../../server/authorization';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
index e7c3490d2ce13..ae64ad4655ba5 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx
@@ -9,13 +9,13 @@ import { act } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import type { Capabilities } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/public';
+import type { Space } from '@kbn/spaces-plugin/public';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { Capabilities } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
 
-import { KibanaFeature } from '../../../../../features/public';
-import type { Space } from '../../../../../spaces/public';
 import { licenseMock } from '../../../../common/licensing/index.mock';
 import type { Role } from '../../../../common/model';
 import { userAPIClientMock } from '../../users/index.mock';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
index f868fabdaf76b..1cda335ace204 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
@@ -22,9 +22,6 @@ import {
 import type { ChangeEvent, FunctionComponent, HTMLProps } from 'react';
 import React, { Fragment, useCallback, useEffect, useRef, useState } from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   Capabilities,
   DocLinksStart,
@@ -33,13 +30,16 @@ import type {
   IHttpFetchError,
   NotificationsStart,
   ScopedHistory,
-} from 'src/core/public';
-import type { DataViewsContract } from 'src/plugins/data/public';
+} from '@kbn/core/public';
+import type { DataViewsContract } from '@kbn/data-plugin/public';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
-import type { KibanaFeature } from '../../../../../features/common';
-import type { FeaturesPluginStart } from '../../../../../features/public';
-import type { Space, SpacesApiUi } from '../../../../../spaces/public';
 import type { SecurityLicense } from '../../../../common/licensing';
 import type {
   BuiltinESPrivileges,
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
index 9db96be27faaa..2c47d70b94100 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
@@ -179,7 +179,6 @@ exports[`it renders without crashing 1`] = `
     license={
       Object {
         "features$": Observable {
-          "_isScalar": false,
           "_subscribe": [Function],
         },
         "getFeatures": [MockFunction],
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap
index 12824eb9193d1..722fdf32a62b3 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap
@@ -20,7 +20,6 @@ exports[`it renders without crashing 1`] = `
   license={
     Object {
       "features$": Observable {
-        "_isScalar": false,
         "_subscribe": [Function],
       },
       "getFeatures": [MockFunction],
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
index 9585db6efda25..717700cc82278 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { licenseMock } from '../../../../../../common/licensing/index.mock';
 import { indicesAPIClientMock } from '../../../index.mock';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
index cc62824ecd9b2..55b89d8832c75 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
@@ -18,10 +18,10 @@ import {
 } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { DocLinksStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart } from 'src/core/public';
 
 import type { SecurityLicense } from '../../../../../../common/licensing';
 import type { BuiltinESPrivileges, Role } from '../../../../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
index d61fd1e17e33b..af5ef0a0ccb00 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
@@ -8,13 +8,10 @@
 import { EuiButtonIcon, EuiComboBox, EuiTextArea } from '@elastic/eui';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { CodeEditorField, KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import {
-  CodeEditorField,
-  KibanaContextProvider,
-} from '../../../../../../../../../src/plugins/kibana_react/public';
 import { indicesAPIClientMock } from '../../../index.mock';
 import { RoleValidator } from '../../validate_role';
 import { IndexPrivilegeForm } from './index_privilege_form';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
index 024dba981b23b..fbc440c0ed984 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
@@ -21,10 +21,10 @@ import React, { Component, Fragment } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import type { monaco } from '@kbn/monaco';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import { CodeEditorField } from '../../../../../../../../../src/plugins/kibana_react/public';
 import type { RoleIndexPrivilege } from '../../../../../../common/model';
 import type { IndicesAPIClient } from '../../../indices_api_client';
 import type { RoleValidator } from '../../validate_role';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
index 440d5132baa33..cdc8ac71fd38d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { licenseMock } from '../../../../../../common/licensing/index.mock';
 import { indicesAPIClientMock } from '../../../index.mock';
 import { RoleValidator } from '../../validate_role';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
index 4014a2a265abd..ffe5417616dd9 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
@@ -8,9 +8,9 @@
 import { EuiAccordion } from '@elastic/eui';
 import React from 'react';
 
+import type { KibanaFeature, SubFeatureConfig } from '@kbn/features-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import type { KibanaFeature, SubFeatureConfig } from '../../../../../../../../features/public';
 import type { Role } from '../../../../../../../common/model';
 import { createFeature, kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
index e14c28db3e740..43d23fa7a584d 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
@@ -24,9 +24,9 @@ import {
 import type { ReactElement } from 'react';
 import React, { Component } from 'react';
 
+import type { AppCategory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { AppCategory } from 'src/core/public';
 
 import type { Role } from '../../../../../../../common/model';
 import type { KibanaPrivileges, SecuredFeature } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
index c73dbb2616d2d..12a9a8a79944b 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/sub_feature_form.test.tsx
@@ -9,9 +9,9 @@ import { EuiButtonGroup, EuiCheckbox } from '@elastic/eui';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { KibanaFeature } from '@kbn/features-plugin/public';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { KibanaFeature } from '../../../../../../../../features/public';
 import type { Role } from '../../../../../../../common/model';
 import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
index 0aba384ede90e..612bcf05aab56 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx
@@ -7,9 +7,9 @@
 
 import React, { Component } from 'react';
 
-import type { Capabilities } from 'src/core/public';
+import type { Capabilities } from '@kbn/core/public';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../spaces/public';
 import type { Role } from '../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../model';
 import { CollapsiblePanel } from '../../collapsible_panel';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
index 928a9f5d28fea..2a33d01c6e38c 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.test.tsx
@@ -8,11 +8,11 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { spacesManagerMock } from '../../../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../../../spaces/public/ui_api';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
index aafa431bee2b3..2aaec1ae95d87 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
@@ -17,8 +17,8 @@ import {
 import React, { Fragment, useState } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import type { Role } from '../../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../../model';
 import { PrivilegeSummaryTable } from './privilege_summary_table';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
index 0a3620aaa4114..d54866c88f7ef 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.test.tsx
@@ -8,11 +8,11 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { spacesManagerMock } from '../../../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../../../spaces/public/ui_api';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
index 8e5954f50a943..f8e5867443b3f 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
@@ -20,8 +20,8 @@ import {
 import React, { Fragment, useMemo, useState } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import { ALL_SPACES_ID } from '../../../../../../../common/constants';
 import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
 import type { KibanaPrivileges, PrimaryFeaturePrivilege, SecuredFeature } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
index e3746e7fb1051..015dd8a5548cd 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
@@ -8,12 +8,12 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { SpaceAvatarInternal } from '@kbn/spaces-plugin/public/space_avatar/space_avatar_internal';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import { SpaceAvatarInternal } from '../../../../../../../../spaces/public/space_avatar/space_avatar_internal';
-import { spacesManagerMock } from '../../../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../../../spaces/public/ui_api';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { SpacesPopoverList } from '../../../spaces_popover_list';
 import { SpaceColumnHeader } from './space_column_header';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
index 2460c5e9f5f32..99a4cb0020aed 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
@@ -9,8 +9,8 @@ import React, { Fragment, useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import type { RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
 import { SpacesPopoverList } from '../../../spaces_popover_list';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
index 8eaae663e7e80..8f10acb2403aa 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
@@ -8,9 +8,9 @@
 import { EuiButtonGroup } from '@elastic/eui';
 import React from 'react';
 
+import type { Space } from '@kbn/spaces-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import type { Space } from '../../../../../../../../spaces/public';
 import type { Role } from '../../../../../../../common/model';
 import { createFeature, kibanaFeatures } from '../../../../__fixtures__/kibana_features';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
index 54c5c8770a981..52b8025b2b668 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
@@ -28,8 +28,8 @@ import React, { Component, Fragment } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space } from '@kbn/spaces-plugin/public';
 
-import type { Space } from '../../../../../../../../spaces/public';
 import { ALL_SPACES_ID } from '../../../../../../../common/constants';
 import type { FeaturesPrivileges, Role } from '../../../../../../../common/model';
 import { copyRole } from '../../../../../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
index 9b86ad54c4d35..36755875848dc 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.test.tsx
@@ -9,9 +9,9 @@ import { EuiBadge, EuiInMemoryTable } from '@elastic/eui';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { KibanaFeature } from '@kbn/features-plugin/public';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { KibanaFeature } from '../../../../../../../../features/public';
 import type { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
 import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileges';
 import { PrivilegeFormCalculator } from '../privilege_form_calculator';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 1c256846a6c91..b7ce0ac2d3b1e 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -22,9 +22,9 @@ import React, { Component } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { getSpaceColor } from '@kbn/spaces-plugin/public';
 
-import type { Space } from '../../../../../../../../spaces/public';
-import { getSpaceColor } from '../../../../../../../../spaces/public';
 import type { FeaturesPrivileges, Role } from '../../../../../../../common/model';
 import { copyRole } from '../../../../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
index d6032e9149364..84ba0c7020efb 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
@@ -17,11 +17,11 @@ import {
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
 
+import type { Capabilities } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { Capabilities } from 'src/core/public';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
-import type { Space, SpacesApiUi } from '../../../../../../../../spaces/public';
 import type { Role } from '../../../../../../../common/model';
 import { isRoleReserved } from '../../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index 3e84e02a00008..99e9edb48d556 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -10,9 +10,8 @@ import { EuiComboBox, EuiHealth, EuiHighlight } from '@elastic/eui';
 import React, { Component } from 'react';
 
 import { i18n } from '@kbn/i18n';
-
-import type { Space } from '../../../../../../../../spaces/public';
-import { getSpaceColor } from '../../../../../../../../spaces/public';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { getSpaceColor } from '@kbn/spaces-plugin/public';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
index 572822db3ca2a..cecf01c66d241 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.test.tsx
@@ -15,13 +15,13 @@ import {
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import type { Space } from '@kbn/spaces-plugin/public';
+import { SpaceAvatarInternal } from '@kbn/spaces-plugin/public/space_avatar/space_avatar_internal';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import type { Space } from '../../../../../../spaces/public';
-import { SpaceAvatarInternal } from '../../../../../../spaces/public/space_avatar/space_avatar_internal';
-import { spacesManagerMock } from '../../../../../../spaces/public/spaces_manager/mocks';
-import { getUiApi } from '../../../../../../spaces/public/ui_api';
 import { SpacesPopoverList } from './spaces_popover_list';
 
 const mockSpaces = [
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
index 457d74edf79ff..20c2d3f4c4bc8 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
@@ -19,9 +19,8 @@ import React, { Component, memo } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../spaces/common';
-import type { Space, SpacesApiUi } from '../../../../../../spaces/public';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '@kbn/spaces-plugin/common';
+import type { Space, SpacesApiUi } from '@kbn/spaces-plugin/public';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts b/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts
index feb0c73aa5bb2..c2af251e72139 100644
--- a/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/roles/indices_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { IndicesAPIClient } from './indices_api_client';
 
diff --git a/x-pack/plugins/security/public/management/roles/indices_api_client.ts b/x-pack/plugins/security/public/management/roles/indices_api_client.ts
index 5d2ead1961fc6..4305444b6447b 100644
--- a/x-pack/plugins/security/public/management/roles/indices_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/indices_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 export class IndicesAPIClient {
   private readonly fieldCache = new Map<string, string[]>();
diff --git a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
index 67e000348f016..b48fc18527cd6 100644
--- a/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
+++ b/x-pack/plugins/security/public/management/roles/model/kibana_privileges.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../../../features/common';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
+
 import type { RawKibanaPrivileges, RoleKibanaPrivilege } from '../../../../common/model';
 import { isGlobalPrivilegeDefinition } from '../edit_role/privilege_utils';
 import { KibanaPrivilege } from './kibana_privilege';
diff --git a/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts b/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
index cda4d203305b4..f9513c8ebb4d3 100644
--- a/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
+++ b/x-pack/plugins/security/public/management/roles/model/primary_feature_privilege.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/public';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/public';
+
 import { KibanaPrivilege } from './kibana_privilege';
 
 export class PrimaryFeaturePrivilege extends KibanaPrivilege {
diff --git a/x-pack/plugins/security/public/management/roles/model/secured_feature.ts b/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
index d5fb7ef628657..d11b45129e6f9 100644
--- a/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
+++ b/x-pack/plugins/security/public/management/roles/model/secured_feature.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../../features/common';
-import { KibanaFeature } from '../../../../../features/common';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+
 import { PrimaryFeaturePrivilege } from './primary_feature_privilege';
 import { SecuredSubFeature } from './secured_sub_feature';
 import type { SubFeaturePrivilege } from './sub_feature_privilege';
diff --git a/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts b/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
index d143d7f217547..1f76b17a39e59 100644
--- a/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
+++ b/x-pack/plugins/security/public/management/roles/model/secured_sub_feature.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { SubFeatureConfig } from '../../../../../features/common';
-import { SubFeature } from '../../../../../features/common';
+import type { SubFeatureConfig } from '@kbn/features-plugin/common';
+import { SubFeature } from '@kbn/features-plugin/common';
+
 import { SubFeaturePrivilege } from './sub_feature_privilege';
 import { SubFeaturePrivilegeGroup } from './sub_feature_privilege_group';
 
diff --git a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
index a10c38cb3f818..45a51a45533c1 100644
--- a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
+++ b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { SubFeaturePrivilegeConfig } from '../../../../../features/public';
+import type { SubFeaturePrivilegeConfig } from '@kbn/features-plugin/public';
+
 import { KibanaPrivilege } from './kibana_privilege';
 
 export class SubFeaturePrivilege extends KibanaPrivilege {
diff --git a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
index ca18ef28e0a73..e3325a2f3a63b 100644
--- a/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
+++ b/x-pack/plugins/security/public/management/roles/model/sub_feature_privilege_group.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { SubFeaturePrivilegeGroupConfig } from '../../../../../features/common';
+import type { SubFeaturePrivilegeGroupConfig } from '@kbn/features-plugin/common';
+
 import { SubFeaturePrivilege } from './sub_feature_privilege';
 
 export class SubFeaturePrivilegeGroup {
diff --git a/x-pack/plugins/security/public/management/roles/privileges_api_client.ts b/x-pack/plugins/security/public/management/roles/privileges_api_client.ts
index 0bb89eebb6b11..b4b372faec710 100644
--- a/x-pack/plugins/security/public/management/roles/privileges_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/privileges_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { BuiltinESPrivileges, RawKibanaPrivileges } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
index 5d510da8a331b..917843666378e 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import type { Role } from '../../../common/model';
 import { RolesAPIClient } from './roles_api_client';
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
index 5de8827207ced..20c26cc7a02ae 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { Role, RoleIndexPrivilege } from '../../../common/model';
 import { copyRole } from '../../../common/model';
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx
index 55b7a17f3e26f..186f9bc4a4cb5 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/confirm_delete/confirm_delete.tsx
@@ -17,10 +17,10 @@ import {
 } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { RolesAPIClient } from '../../roles_api_client';
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
index 7041a61a850d0..881b0a2ee3203 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.test.tsx
@@ -9,9 +9,9 @@ import { EuiBasicTable, EuiIcon } from '@elastic/eui';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
 
 import { DisabledBadge, ReservedBadge } from '../../badges';
 import { rolesAPIClientMock } from '../index.mock';
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
index 76bc17f9115e4..e5212c9071570 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/roles_grid_page.tsx
@@ -22,12 +22,12 @@ import {
 import _ from 'lodash';
 import React, { Component } from 'react';
 
+import type { NotificationsStart, ScopedHistory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart, ScopedHistory } from 'src/core/public';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Role } from '../../../../common/model';
 import {
   getExtendedRoleDeprecationNotice,
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
index 1601ea481cf2d..327499c64bb76 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.test.tsx
@@ -8,10 +8,10 @@
 import { act } from '@testing-library/react';
 import { noop } from 'lodash';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
-import { featuresPluginMock } from '../../../../features/public/mocks';
 import { licenseMock } from '../../../common/licensing/index.mock';
 import { rolesManagementApp } from './roles_management_app';
 
@@ -104,7 +104,7 @@ describe('rolesManagementApp', () => {
     expect(docTitle.reset).not.toHaveBeenCalled();
     expect(container).toMatchInlineSnapshot(`
       <div>
-        Role Edit Page: {"action":"edit","rolesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"userAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"indicesAPIClient":{"fieldCache":{},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"privilegesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}},"notifications":{"toasts":{}},"fatalErrors":{},"license":{"features$":{"_isScalar":false}},"docLinks":{},"uiCapabilities":{"catalogue":{},"management":{},"navLinks":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/edit","search":"","hash":""}}}
+        Role Edit Page: {"action":"edit","rolesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"userAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"indicesAPIClient":{"fieldCache":{},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"privilegesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}},"notifications":{"toasts":{}},"fatalErrors":{},"license":{"features$":{}},"docLinks":{},"uiCapabilities":{"catalogue":{},"management":{},"navLinks":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/edit","search":"","hash":""}}}
       </div>
     `);
 
@@ -129,7 +129,7 @@ describe('rolesManagementApp', () => {
     expect(docTitle.reset).not.toHaveBeenCalled();
     expect(container).toMatchInlineSnapshot(`
       <div>
-        Role Edit Page: {"action":"edit","roleName":"role@name","rolesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"userAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"indicesAPIClient":{"fieldCache":{},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"privilegesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}},"notifications":{"toasts":{}},"fatalErrors":{},"license":{"features$":{"_isScalar":false}},"docLinks":{},"uiCapabilities":{"catalogue":{},"management":{},"navLinks":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/edit/role@name","search":"","hash":""}}}
+        Role Edit Page: {"action":"edit","roleName":"role@name","rolesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"userAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"indicesAPIClient":{"fieldCache":{},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"privilegesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}},"notifications":{"toasts":{}},"fatalErrors":{},"license":{"features$":{}},"docLinks":{},"uiCapabilities":{"catalogue":{},"management":{},"navLinks":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/edit/role@name","search":"","hash":""}}}
       </div>
     `);
 
@@ -154,7 +154,7 @@ describe('rolesManagementApp', () => {
     expect(docTitle.reset).not.toHaveBeenCalled();
     expect(container).toMatchInlineSnapshot(`
       <div>
-        Role Edit Page: {"action":"clone","roleName":"someRoleName","rolesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"userAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"indicesAPIClient":{"fieldCache":{},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"privilegesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}},"notifications":{"toasts":{}},"fatalErrors":{},"license":{"features$":{"_isScalar":false}},"docLinks":{},"uiCapabilities":{"catalogue":{},"management":{},"navLinks":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/clone/someRoleName","search":"","hash":""}}}
+        Role Edit Page: {"action":"clone","roleName":"someRoleName","rolesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"userAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"indicesAPIClient":{"fieldCache":{},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"privilegesAPIClient":{"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}}},"http":{"basePath":{"basePath":"","serverBasePath":""},"anonymousPaths":{},"externalUrl":{}},"notifications":{"toasts":{}},"fatalErrors":{},"license":{"features$":{}},"docLinks":{},"uiCapabilities":{"catalogue":{},"management":{},"navLinks":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/clone/someRoleName","search":"","hash":""}}}
       </div>
     `);
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
index 18a0ad37b88fc..e0939d5cbf48b 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
@@ -9,14 +9,11 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Route, Router, useParams } from 'react-router-dom';
 
+import type { FatalErrorsSetup, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { FatalErrorsSetup, StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
 import type { SecurityLicense } from '../../../common/licensing';
 import {
   Breadcrumb,
diff --git a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx
index cf1959f8a389f..a5f459dfc1124 100644
--- a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx
+++ b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.test.tsx
@@ -9,8 +9,8 @@ import { EuiFieldPassword } from '@elastic/eui';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { User } from '../../../../../common/model';
 import { userAPIClientMock } from '../../index.mock';
diff --git a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx
index 787aa9627b5a8..d30eabc7f35e4 100644
--- a/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx
+++ b/x-pack/plugins/security/public/management/users/components/change_password_form/change_password_form.tsx
@@ -18,10 +18,10 @@ import _ from 'lodash';
 import type { ChangeEvent } from 'react';
 import React, { Component } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { User } from '../../../../../common/model';
 import type { UserAPIClient } from '../../user_api_client';
diff --git a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx
index 2668050645f33..30335fd7cbb60 100644
--- a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx
+++ b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { userAPIClientMock } from '../../index.mock';
 import { ConfirmDeleteUsers } from './confirm_delete_users';
diff --git a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx
index dad1b6de72291..e6e5f682f7b31 100644
--- a/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx
+++ b/x-pack/plugins/security/public/management/users/components/confirm_delete_users/confirm_delete_users.tsx
@@ -8,11 +8,11 @@
 import { EuiConfirmModal } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { asyncForEach } from '@kbn/std';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { UserAPIClient } from '../../user_api_client';
 
diff --git a/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx b/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx
index 2ad27a77c07b8..53c298e270112 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/change_password_flyout.tsx
@@ -22,8 +22,8 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { FormFlyout } from '../../../components/form_flyout';
 import { useCurrentUser } from '../../../components/use_current_user';
 import type { ValidationErrors } from '../../../components/use_form';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx b/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx
index 560898229d0d2..b90a28364ee77 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/confirm_delete_users.tsx
@@ -12,9 +12,9 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import { UserAPIClient } from '..';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export interface ConfirmDeleteUsersProps {
   usernames: string[];
diff --git a/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx b/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx
index fb90d7cf9eec9..49628d88a8a25 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/confirm_disable_users.tsx
@@ -12,9 +12,9 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import { UserAPIClient } from '..';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export interface ConfirmDisableUsersProps {
   usernames: string[];
diff --git a/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx b/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx
index 88b8e4e5065e4..d0210b2a6f5c1 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/confirm_enable_users.tsx
@@ -12,9 +12,9 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import { UserAPIClient } from '..';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export interface ConfirmEnableUsersProps {
   usernames: string[];
diff --git a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx
index 5ae0a3c85cd0a..525df66251057 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/create_user_page.test.tsx
@@ -9,7 +9,7 @@ import { fireEvent, render, waitFor, within } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { securityMock } from '../../../mocks';
 import { Providers } from '../users_management_app';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
index 3e0970b66563b..2d024c7826a6f 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
@@ -9,7 +9,7 @@ import { fireEvent, render } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import React from 'react';
 
-import { coreMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
 
 import { securityMock } from '../../../mocks';
 import { Providers } from '../users_management_app';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
index 19a2f964a357c..a64ca3aca99eb 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
@@ -27,8 +27,8 @@ import { useHistory } from 'react-router-dom';
 import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { getUserDisplayName } from '../../../../common/model';
 import { UserAPIClient } from '../user_api_client';
 import { isUserDeprecated, isUserReserved } from '../user_utils';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx b/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
index 722f9a3f17f6d..d1134d0959a16 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/user_form.tsx
@@ -25,8 +25,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { MAX_NAME_LENGTH, NAME_REGEX } from '../../../../common/constants';
 import type { Role, User } from '../../../../common/model';
 import { isRoleDeprecated } from '../../../../common/model';
diff --git a/x-pack/plugins/security/public/management/users/user_api_client.ts b/x-pack/plugins/security/public/management/users/user_api_client.ts
index 9197634383504..071aa9e95171b 100644
--- a/x-pack/plugins/security/public/management/users/user_api_client.ts
+++ b/x-pack/plugins/security/public/management/users/user_api_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'src/core/public';
+import type { HttpStart } from '@kbn/core/public';
 
 import type { EditUser, User } from '../../../common/model';
 
diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx
index 898fec5709c56..99de5391c0416 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.test.tsx
@@ -10,9 +10,9 @@ import type { ReactWrapper } from 'enzyme';
 import type { LocationDescriptorObject } from 'history';
 import React from 'react';
 
+import type { CoreStart, ScopedHistory } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { CoreStart, ScopedHistory } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
 
 import type { User } from '../../../../common/model';
 import { rolesAPIClientMock } from '../../roles/index.mock';
diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
index 1c3bd98d834aa..3952bd019ec74 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
@@ -20,12 +20,12 @@ import {
 } from '@elastic/eui';
 import React, { Component } from 'react';
 
+import type { ApplicationStart, NotificationsStart, ScopedHistory } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { ApplicationStart, NotificationsStart, ScopedHistory } from 'src/core/public';
 
-import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Role, User } from '../../../../common/model';
 import { DeprecatedBadge, DisabledBadge, ReservedBadge } from '../../badges';
 import { RoleTableDisplay } from '../../role_table_display';
diff --git a/x-pack/plugins/security/public/management/users/users_management_app.test.tsx b/x-pack/plugins/security/public/management/users/users_management_app.test.tsx
index 84a6e82bf12ae..ec7b1d19226ba 100644
--- a/x-pack/plugins/security/public/management/users/users_management_app.test.tsx
+++ b/x-pack/plugins/security/public/management/users/users_management_app.test.tsx
@@ -8,8 +8,8 @@
 import { act } from '@testing-library/react';
 import { noop } from 'lodash';
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
-import type { Unmount } from 'src/plugins/management/public/types';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import type { Unmount } from '@kbn/management-plugin/public/types';
 
 import { securityMock } from '../../mocks';
 import { usersManagementApp } from './users_management_app';
diff --git a/x-pack/plugins/security/public/management/users/users_management_app.tsx b/x-pack/plugins/security/public/management/users/users_management_app.tsx
index 88fad7b1a3a3f..de7a4110a3f3f 100644
--- a/x-pack/plugins/security/public/management/users/users_management_app.tsx
+++ b/x-pack/plugins/security/public/management/users/users_management_app.tsx
@@ -13,15 +13,12 @@ import type { RouteComponentProps } from 'react-router-dom';
 import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import type { Observable } from 'rxjs';
 
+import type { CoreStart, CoreTheme, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
-import type { CoreStart, CoreTheme, StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../../src/plugins/kibana_react/public';
 import type { AuthenticationServiceSetup } from '../../authentication';
 import type { BreadcrumbsChangeHandler } from '../../components/breadcrumb';
 import {
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts b/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts
index 21352f16d2354..3e871c4979804 100644
--- a/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts
+++ b/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts
@@ -7,10 +7,10 @@
 
 import { BehaviorSubject } from 'rxjs';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import type { ILicense } from '@kbn/licensing-plugin/public';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
-import type { ILicense } from '../../../licensing/public';
 import { SecurityLicenseService } from '../../common/licensing';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { securityMock } from '../mocks';
@@ -85,7 +85,7 @@ describe('SecurityNavControlService', () => {
                   >
                     <div
                       aria-label="some-user"
-                      class="euiAvatar euiAvatar--s euiAvatar--user"
+                      class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                       data-test-subj="userMenuAvatar"
                       role="img"
                       style="background-color: rgb(255, 126, 98); color: rgb(0, 0, 0);"
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
index 0db60c83f55d7..63e753f8646cd 100644
--- a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
+++ b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
@@ -12,9 +12,9 @@ import type { Observable, Subscription } from 'rxjs';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 import type { SecurityLicense } from '../../common/licensing';
 import type { AuthenticationServiceSetup } from '../authentication';
 import type { UserMenuLink } from './nav_control_component';
@@ -51,7 +51,7 @@ export class SecurityNavControlService {
 
   private securityFeaturesSubscription?: Subscription;
 
-  private readonly stop$ = new ReplaySubject(1);
+  private readonly stop$ = new ReplaySubject<void>(1);
   private userMenuLinks$ = new BehaviorSubject<UserMenuLink[]>([]);
 
   public setup({ securityLicense, authc, logoutUrl }: SetupDeps) {
diff --git a/x-pack/plugins/security/public/plugin.test.tsx b/x-pack/plugins/security/public/plugin.test.tsx
index 98d0ea0ab25a2..5a7cbd659ca7e 100644
--- a/x-pack/plugins/security/public/plugin.test.tsx
+++ b/x-pack/plugins/security/public/plugin.test.tsx
@@ -8,13 +8,13 @@
 import { enforceOptions } from 'broadcast-channel';
 import { Observable } from 'rxjs';
 
-import type { CoreSetup } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import { managementPluginMock } from 'src/plugins/management/public/mocks';
+import type { CoreSetup } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
 
-import type { FeaturesPluginStart } from '../../features/public';
-import { licensingMock } from '../../licensing/public/mocks';
 import { ManagementService } from './management';
 import type { PluginStartDependencies } from './plugin';
 import { SecurityPlugin } from './plugin';
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index cd34e8eac8c6b..7ca2e2f353efa 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -5,23 +5,22 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type {
   CoreSetup,
   CoreStart,
   HttpSetup,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/public';
-import type { DataViewsPublicPluginStart } from 'src/plugins/data_views/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { ManagementSetup, ManagementStart } from 'src/plugins/management/public';
-
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
-import type { FeaturesPluginStart } from '../../features/public';
-import type { LicensingPluginSetup } from '../../licensing/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+} from '@kbn/core/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { i18n } from '@kbn/i18n';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+
 import { SecurityLicenseService } from '../common/licensing';
 import type { SecurityLicense } from '../common/licensing';
 import { accountManagementApp } from './account_management';
@@ -126,7 +125,7 @@ export class SecurityPlugin
         icon: 'securityApp',
         path: '/app/management/security/roles',
         showOnHomePage: true,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
         order: 600,
       });
     }
diff --git a/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx b/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx
index 4279b9f31f7b7..34710ba650f54 100644
--- a/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx
+++ b/x-pack/plugins/security/public/security_checkup/components/insecure_cluster_alert.tsx
@@ -16,9 +16,9 @@ import {
 import React, { useState } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
+import type { DocLinksStart, MountPoint } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
-import type { DocLinksStart, MountPoint } from 'src/core/public';
 
 export const insecureClusterAlertTitle = i18n.translate(
   'xpack.security.checkup.insecureClusterTitle',
diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts b/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts
index b71d42fb08adc..438e498deb41b 100644
--- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts
+++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { DocLinksStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import type { DocLinksStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { ConfigType } from '../config';
 import { SecurityCheckupService } from './security_checkup_service';
diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
index 4d2e92d2a5079..e90adf7a004a2 100644
--- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
+++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
@@ -14,7 +14,7 @@ import type {
   HttpStart,
   NotificationsStart,
   Toast,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import type { SecurityCheckupState } from '../../common/types';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/public/session/session_expiration_toast.tsx b/x-pack/plugins/security/public/session/session_expiration_toast.tsx
index 5dd0bcc4fd6f5..9bdee832e9b66 100644
--- a/x-pack/plugins/security/public/session/session_expiration_toast.tsx
+++ b/x-pack/plugins/security/public/session/session_expiration_toast.tsx
@@ -12,11 +12,11 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useObservable from 'react-use/lib/useObservable';
 import type { Observable } from 'rxjs';
 
+import type { ToastInput } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n-react';
-import type { ToastInput } from 'src/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
 import { SESSION_GRACE_PERIOD_MS } from '../../common/constants';
 import type { SessionState } from './session_timeout';
 
diff --git a/x-pack/plugins/security/public/session/session_expired.test.ts b/x-pack/plugins/security/public/session/session_expired.test.ts
index 6901e2cdefa76..02a41f1b80b80 100644
--- a/x-pack/plugins/security/public/session/session_expired.test.ts
+++ b/x-pack/plugins/security/public/session/session_expired.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { applicationServiceMock } from 'src/core/public/mocks';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
 
 import { LogoutReason } from '../../common/types';
 import { SessionExpired } from './session_expired';
diff --git a/x-pack/plugins/security/public/session/session_expired.ts b/x-pack/plugins/security/public/session/session_expired.ts
index 44b1d47b7d66a..9f0d42e769aae 100644
--- a/x-pack/plugins/security/public/session/session_expired.ts
+++ b/x-pack/plugins/security/public/session/session_expired.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ApplicationStart } from 'src/core/public';
+import type { ApplicationStart } from '@kbn/core/public';
 
 import {
   LOGOUT_PROVIDER_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/public/session/session_timeout.test.ts b/x-pack/plugins/security/public/session/session_timeout.test.ts
index dc046824dc9a8..09b67082b1a97 100644
--- a/x-pack/plugins/security/public/session/session_timeout.test.ts
+++ b/x-pack/plugins/security/public/session/session_timeout.test.ts
@@ -7,8 +7,8 @@
 
 import type { BroadcastChannel } from 'broadcast-channel';
 
-import type { ToastInputFields } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
+import type { ToastInputFields } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import {
   SESSION_CHECK_MS,
diff --git a/x-pack/plugins/security/public/session/session_timeout.ts b/x-pack/plugins/security/public/session/session_timeout.ts
index f3f58b63c0e7f..be7fc4dba883c 100644
--- a/x-pack/plugins/security/public/session/session_timeout.ts
+++ b/x-pack/plugins/security/public/session/session_timeout.ts
@@ -15,7 +15,7 @@ import type {
   HttpSetup,
   NotificationsSetup,
   Toast,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import {
   SESSION_CHECK_MS,
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
index c3b29dd5abfa6..d82a041a4fe28 100644
--- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
@@ -8,8 +8,8 @@
 // @ts-ignore
 import fetchMock from 'fetch-mock/es5/client';
 
-import { applicationServiceMock } from 'src/core/public/mocks';
-import { setup } from 'src/core/test_helpers/http_test_setup';
+import { applicationServiceMock } from '@kbn/core/public/mocks';
+import { setup } from '@kbn/core/test_helpers/http_test_setup';
 
 import { SessionExpired } from './session_expired';
 import { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor';
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
index 92c5c4485bcad..4d0327da2e48d 100644
--- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
@@ -10,7 +10,7 @@ import type {
   HttpInterceptorResponseError,
   IAnonymousPaths,
   IHttpInterceptController,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import { LogoutReason } from '../../common/types';
 import type { SessionExpired } from './session_expired';
diff --git a/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx b/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx
index 313401ff45bd9..6046f52b4d063 100644
--- a/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx
+++ b/x-pack/plugins/security/public/suspense_error_boundary/suspense_error_boundary.tsx
@@ -9,8 +9,8 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import type { PropsWithChildren } from 'react';
 import React, { Component, Suspense } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { NotificationsStart } from 'src/core/public';
 
 interface Props {
   notifications: NotificationsStart;
diff --git a/x-pack/plugins/security/public/ui_api/components.tsx b/x-pack/plugins/security/public/ui_api/components.tsx
index a488bc359b538..5c899ab8c5ab5 100644
--- a/x-pack/plugins/security/public/ui_api/components.tsx
+++ b/x-pack/plugins/security/public/ui_api/components.tsx
@@ -8,7 +8,7 @@
 import type { FC, PropsWithChildren, PropsWithRef } from 'react';
 import React from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 /**
  * We're importing specific files here instead of passing them
diff --git a/x-pack/plugins/security/public/ui_api/index.mock.ts b/x-pack/plugins/security/public/ui_api/index.mock.ts
index c35f9342be6ca..165a1e4cb76c5 100644
--- a/x-pack/plugins/security/public/ui_api/index.mock.ts
+++ b/x-pack/plugins/security/public/ui_api/index.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UiApi } from './';
+import type { UiApi } from '.';
 
 export const getUiApiMock = {
   createStart: (): jest.Mocked<UiApi> => ({
diff --git a/x-pack/plugins/security/public/ui_api/index.ts b/x-pack/plugins/security/public/ui_api/index.ts
index e53564074940a..ba2e1bfb5f36b 100644
--- a/x-pack/plugins/security/public/ui_api/index.ts
+++ b/x-pack/plugins/security/public/ui_api/index.ts
@@ -7,7 +7,7 @@
 
 import type { ReactElement } from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import type { ChangePasswordProps, PersonalInfoProps } from '../account_management';
 import { getComponents } from './components';
diff --git a/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx b/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx
index 6a37b35df7327..3ac1901511b20 100644
--- a/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx
+++ b/x-pack/plugins/security/public/ui_api/lazy_wrapper.tsx
@@ -8,7 +8,7 @@
 import type { FC, PropsWithChildren, PropsWithRef, ReactElement } from 'react';
 import React, { lazy, useMemo } from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import { SuspenseErrorBoundary } from '../suspense_error_boundary';
 
diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts
index b305685f9a233..3f0a0924d67ae 100644
--- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts
+++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { capabilitiesServiceMock } from 'src/core/server/mocks';
+import { capabilitiesServiceMock } from '@kbn/core/server/mocks';
 
 import type { AnonymousAccessServiceStart } from './anonymous_access_service';
 
diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts
index 5bbf6b317e3c5..63486b4dad703 100644
--- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts
+++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.test.ts
@@ -7,15 +7,15 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { Logger } from 'src/core/server';
+import type { Logger } from '@kbn/core/server';
 import {
   coreMock,
   elasticsearchServiceMock,
   httpServerMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
-import { spacesMock } from '../../../spaces/server/mocks';
 import { ConfigSchema, createConfig } from '../config';
 import { securityMock } from '../mocks';
 import { AnonymousAccessService } from './anonymous_access_service';
diff --git a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts
index 3d8601ab4734a..6507f579841c3 100644
--- a/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts
+++ b/x-pack/plugins/security/server/anonymous_access/anonymous_access_service.ts
@@ -13,11 +13,11 @@ import type {
   IBasePath,
   IClusterClient,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { KibanaRequest } from '@kbn/core/server';
+import { addSpaceIdToPath } from '@kbn/spaces-plugin/common';
+import type { SpacesServiceStart } from '@kbn/spaces-plugin/server';
 
-import { KibanaRequest } from '../../../../../src/core/server';
-import { addSpaceIdToPath } from '../../../spaces/common';
-import type { SpacesServiceStart } from '../../../spaces/server';
 import { AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER } from '../../common/constants';
 import type { HTTPAuthorizationHeader } from '../authentication';
 import { AnonymousAuthenticationProvider } from '../authentication';
diff --git a/x-pack/plugins/security/server/audit/audit_events.test.ts b/x-pack/plugins/security/server/audit/audit_events.test.ts
index 7ebc07a37b5c9..73523b4a3e009 100644
--- a/x-pack/plugins/security/server/audit/audit_events.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_events.test.ts
@@ -7,7 +7,7 @@
 
 import { URL } from 'url';
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { AuthenticationResult } from '../authentication';
diff --git a/x-pack/plugins/security/server/audit/audit_events.ts b/x-pack/plugins/security/server/audit/audit_events.ts
index c896b6cea9947..dd767df83b692 100644
--- a/x-pack/plugins/security/server/audit/audit_events.ts
+++ b/x-pack/plugins/security/server/audit/audit_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EcsEventOutcome, EcsEventType, KibanaRequest, LogMeta } from 'src/core/server';
+import type { EcsEventOutcome, EcsEventType, KibanaRequest, LogMeta } from '@kbn/core/server';
 
 import type { AuthenticationProvider } from '../../common/model';
 import type { AuthenticationResult } from '../authentication/authentication_result';
diff --git a/x-pack/plugins/security/server/audit/audit_service.test.ts b/x-pack/plugins/security/server/audit/audit_service.test.ts
index eb1a22e0b3543..d750fa2fc36b9 100644
--- a/x-pack/plugins/security/server/audit/audit_service.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_service.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Observable, of } from 'rxjs';
+import { lastValueFrom, Observable, of } from 'rxjs';
 
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { licenseMock } from '../../common/licensing/index.mock';
 import type { ConfigType } from '../config';
@@ -382,8 +382,8 @@ describe('#createLoggingConfig', () => {
       allowAuditLogging: true,
     });
 
-    const loggingConfig = await features$
-      .pipe(
+    const loggingConfig = await lastValueFrom(
+      features$.pipe(
         createLoggingConfig({
           enabled: false,
           appender: {
@@ -394,7 +394,7 @@ describe('#createLoggingConfig', () => {
           },
         })
       )
-      .toPromise();
+    );
 
     expect(loggingConfig.loggers![0].level).toEqual('off');
   });
@@ -404,8 +404,8 @@ describe('#createLoggingConfig', () => {
       allowAuditLogging: false,
     });
 
-    const loggingConfig = await features$
-      .pipe(
+    const loggingConfig = await lastValueFrom(
+      features$.pipe(
         createLoggingConfig({
           enabled: true,
           appender: {
@@ -416,7 +416,7 @@ describe('#createLoggingConfig', () => {
           },
         })
       )
-      .toPromise();
+    );
 
     expect(loggingConfig.loggers![0].level).toEqual('off');
   });
diff --git a/x-pack/plugins/security/server/audit/audit_service.ts b/x-pack/plugins/security/server/audit/audit_service.ts
index 6f81164be5a89..89b288d07e9fe 100644
--- a/x-pack/plugins/security/server/audit/audit_service.ts
+++ b/x-pack/plugins/security/server/audit/audit_service.ts
@@ -13,9 +13,9 @@ import type {
   Logger,
   LoggerContextConfigInput,
   LoggingServiceSetup,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 
-import type { SpacesPluginSetup } from '../../../spaces/server';
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../common/licensing';
 import type { ConfigType } from '../config';
 import type { SecurityPluginSetup } from '../plugin';
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
index 8b29d5ed17c1c..b5332a7296062 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import {
+  elasticsearchServiceMock,
+  httpServerMock,
+  loggingSystemMock,
+} from '@kbn/core/server/mocks';
 
 import type { SecurityLicense } from '../../../common/licensing';
 import { licenseMock } from '../../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
index 6ad05dcf67b77..82b27212182d6 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IClusterClient, KibanaRequest, Logger } from 'src/core/server';
+import type { IClusterClient, KibanaRequest, Logger } from '@kbn/core/server';
 
 import type { SecurityLicense } from '../../../common/licensing';
 import {
diff --git a/x-pack/plugins/security/server/authentication/authentication_result.ts b/x-pack/plugins/security/server/authentication/authentication_result.ts
index a5b1e11754d97..842689b99a446 100644
--- a/x-pack/plugins/security/server/authentication/authentication_result.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_result.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { AuthHeaders } from 'src/core/server';
+import type { AuthHeaders } from '@kbn/core/server';
 
 import type { AuthenticatedUser } from '../../common/model';
 
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.test.ts b/x-pack/plugins/security/server/authentication/authentication_service.test.ts
index b740a2a2db085..585dd54dd8d5a 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.test.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.test.ts
@@ -12,7 +12,6 @@ import { mockCanRedirectRequest } from './authentication_service.test.mocks';
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   AuthenticationHandler,
   AuthToolkit,
@@ -26,14 +25,15 @@ import type {
   UnauthorizedError,
   UnauthorizedErrorHandler,
   UnauthorizedErrorHandlerToolkit,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { AuthenticatedUser, SecurityLicense } from '../../common';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts
index 96dcf23af4fd0..ed461b0148a89 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   ElasticsearchServiceSetup,
   HttpServiceSetup,
@@ -14,7 +13,8 @@ import type {
   KibanaRequest,
   Logger,
   LoggerFactory,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { AuthenticatedUser, SecurityLicense } from '../../common';
 import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../common/constants';
diff --git a/x-pack/plugins/security/server/authentication/authenticator.test.ts b/x-pack/plugins/security/server/authentication/authenticator.test.ts
index 1559a6fa4a5d7..3bbb1e5a48be2 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.test.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.test.ts
@@ -12,13 +12,13 @@ jest.mock('./providers/http');
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts
index 3cddcd48dda7e..7164b5e98b2f6 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import type { IBasePath, IClusterClient, LoggerFactory } from '@kbn/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import type { Logger } from '@kbn/logging';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { IBasePath, IClusterClient, LoggerFactory } from 'src/core/server';
 
-import { KibanaRequest } from '../../../../../src/core/server';
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
   AUTH_URL_HASH_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts b/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts
index 805d647757ca5..f3e82d45d2e21 100644
--- a/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts
+++ b/x-pack/plugins/security/server/authentication/can_redirect_request.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { ROUTE_TAG_API, ROUTE_TAG_CAN_REDIRECT } from '../routes/tags';
 import { canRedirectRequest } from './can_redirect_request';
diff --git a/x-pack/plugins/security/server/authentication/can_redirect_request.ts b/x-pack/plugins/security/server/authentication/can_redirect_request.ts
index 5a3a09f17eb86..37e6d6b7061f7 100644
--- a/x-pack/plugins/security/server/authentication/can_redirect_request.ts
+++ b/x-pack/plugins/security/server/authentication/can_redirect_request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { ROUTE_TAG_API, ROUTE_TAG_CAN_REDIRECT } from '../routes/tags';
 
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
index 008afcf2a9389..5e79623b2febf 100644
--- a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
+++ b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { HTTPAuthorizationHeader } from './http_authorization_header';
 
diff --git a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
index 97d1f0c9b9c00..78008de3ef359 100644
--- a/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
+++ b/x-pack/plugins/security/server/authentication/http_authentication/http_authorization_header.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 export class HTTPAuthorizationHeader {
   /**
diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts
index 0ed18b1cf5b0a..b6c1eb4e12b0a 100644
--- a/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/anonymous.test.ts
@@ -7,8 +7,8 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/anonymous.ts b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
index fdb58f52f9f2e..fb48a2ddcd0f6 100644
--- a/x-pack/plugins/security/server/authentication/providers/anonymous.ts
+++ b/x-pack/plugins/security/server/authentication/providers/anonymous.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { getErrorStatusCode } from '../../errors';
 import { AuthenticationResult } from '../authentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/base.mock.ts b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
index 6554b525fc9e0..2abe3cf6277a5 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.mock.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
@@ -9,7 +9,7 @@ import {
   elasticsearchServiceMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 export type MockAuthenticationProviderOptions = ReturnType<
   typeof mockAuthenticationProviderOptions
diff --git a/x-pack/plugins/security/server/authentication/providers/base.ts b/x-pack/plugins/security/server/authentication/providers/base.ts
index a6e5e19939c13..a344243ba97a7 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { deepFreeze } from '@kbn/std';
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   Headers,
   HttpServiceSetup,
   IClusterClient,
   KibanaRequest,
   Logger,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { deepFreeze } from '@kbn/std';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { AuthenticatedUser } from '../../../common/model';
 import type { AuthenticationInfo } from '../../elasticsearch';
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.test.ts b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
index 1a4998bf27cbf..3fbaa82f15cdc 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.test.ts
@@ -7,8 +7,8 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.ts b/x-pack/plugins/security/server/authentication/providers/basic.ts
index d0a3a90cae908..02094d680fb07 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../../common/constants';
 import { AuthenticationResult } from '../authentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/http.test.ts b/x-pack/plugins/security/server/authentication/providers/http.test.ts
index c67ca0cb31160..6e257c7f6b7ab 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.test.ts
@@ -7,8 +7,8 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/http.ts b/x-pack/plugins/security/server/authentication/providers/http.ts
index 2d5b4c5e82772..958b125a75c17 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { AuthenticationResult } from '../authentication_result';
 import { DeauthenticationResult } from '../deauthentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
index 91475a845d8b0..2db1d149962b1 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.test.ts
@@ -8,8 +8,8 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest, ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { KibanaRequest, ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
index 5cb1b01dddf9a..9b793e886b74c 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { AuthenticationInfo } from '../../elasticsearch';
 import { getDetailedErrorMessage, getErrorStatusCode } from '../../errors';
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
index c21327fe0674a..097491d61d4ca 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
@@ -8,8 +8,8 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { KibanaRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.ts b/x-pack/plugins/security/server/authentication/providers/oidc.ts
index cad10be6b4aa2..44aa56bd2a298 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import type from 'type-detect';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.test.ts b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
index 04d7013e496b7..b099ad87460de 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.test.ts
@@ -14,8 +14,8 @@ import { Socket } from 'net';
 import type { PeerCertificate } from 'tls';
 import { TLSSocket } from 'tls';
 
-import type { KibanaRequest, ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { KibanaRequest, ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.ts b/x-pack/plugins/security/server/authentication/providers/pki.ts
index 1bb02671b97be..adba9efd3e81e 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.ts
@@ -8,7 +8,7 @@
 import Boom from '@hapi/boom';
 import type { DetailedPeerCertificate } from 'tls';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { AuthenticationInfo } from '../../elasticsearch';
 import { AuthenticationResult } from '../authentication_result';
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
index 046ae16c7e318..07cc8a9d1bb07 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index fc9704747cf95..0adb2fb565996 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import {
   AUTH_PROVIDER_HINT_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/authentication/providers/token.test.ts b/x-pack/plugins/security/server/authentication/providers/token.test.ts
index 989fc717d003d..30ca1c2561123 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.test.ts
@@ -8,8 +8,8 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { ScopeableRequest } from 'src/core/server';
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import type { ScopeableRequest } from '@kbn/core/server';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { securityMock } from '../../mocks';
diff --git a/x-pack/plugins/security/server/authentication/providers/token.ts b/x-pack/plugins/security/server/authentication/providers/token.ts
index c66ab7e80332d..1bbf6605ff135 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.ts
@@ -7,7 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { NEXT_URL_QUERY_STRING_PARAMETER } from '../../../common/constants';
 import type { AuthenticationInfo } from '../../elasticsearch';
diff --git a/x-pack/plugins/security/server/authentication/tokens.test.ts b/x-pack/plugins/security/server/authentication/tokens.test.ts
index e86b441826e54..a5ebc432454a7 100644
--- a/x-pack/plugins/security/server/authentication/tokens.test.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.test.ts
@@ -7,7 +7,7 @@
 
 import { errors } from '@elastic/elasticsearch';
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { securityMock } from '../mocks';
diff --git a/x-pack/plugins/security/server/authentication/tokens.ts b/x-pack/plugins/security/server/authentication/tokens.ts
index 2629807e8d3ab..55572087f4d3b 100644
--- a/x-pack/plugins/security/server/authentication/tokens.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import type { AuthenticationInfo } from '../elasticsearch';
 import { getDetailedErrorMessage, getErrorStatusCode } from '../errors';
diff --git a/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx b/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx
index 5cb6c899d7560..708ca11ca8f78 100644
--- a/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx
+++ b/x-pack/plugins/security/server/authentication/unauthenticated_page.test.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-import { coreMock } from '../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+
 import { UnauthenticatedPage } from './unauthenticated_page';
 
-jest.mock('src/core/server/rendering/views/fonts', () => ({
+jest.mock('@kbn/core/server/rendering/views/fonts', () => ({
   Fonts: () => <>MockedFonts</>,
 }));
 
diff --git a/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx b/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx
index 79aab20d5f33b..2fb8776fd27b2 100644
--- a/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx
+++ b/x-pack/plugins/security/server/authentication/unauthenticated_page.tsx
@@ -10,9 +10,9 @@ import { EuiButton } from '@elastic/eui/lib/components/button';
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
+import type { IBasePath } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IBasePath } from 'src/core/server';
 
 import { PromptPage } from '../prompt_page';
 
diff --git a/x-pack/plugins/security/server/authorization/actions/ui.ts b/x-pack/plugins/security/server/authorization/actions/ui.ts
index 42513708def2a..c6ce36dd903a8 100644
--- a/x-pack/plugins/security/server/authorization/actions/ui.ts
+++ b/x-pack/plugins/security/server/authorization/actions/ui.ts
@@ -7,9 +7,8 @@
 
 import { isString } from 'lodash';
 
-import type { Capabilities as UICapabilities } from 'src/core/server';
-
-import { uiCapabilitiesRegex } from '../../../../features/server';
+import type { Capabilities as UICapabilities } from '@kbn/core/server';
+import { uiCapabilitiesRegex } from '@kbn/features-plugin/server';
 
 export class UIActions {
   private readonly prefix: string;
diff --git a/x-pack/plugins/security/server/authorization/api_authorization.test.ts b/x-pack/plugins/security/server/authorization/api_authorization.test.ts
index e34fc2cc2cdb2..762a9a617498a 100644
--- a/x-pack/plugins/security/server/authorization/api_authorization.test.ts
+++ b/x-pack/plugins/security/server/authorization/api_authorization.test.ts
@@ -10,7 +10,7 @@ import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { initAPIAuthorization } from './api_authorization';
 import { authorizationMock } from './index.mock';
diff --git a/x-pack/plugins/security/server/authorization/api_authorization.ts b/x-pack/plugins/security/server/authorization/api_authorization.ts
index dbf99bbfdf5f2..2c1bc6a5523f3 100644
--- a/x-pack/plugins/security/server/authorization/api_authorization.ts
+++ b/x-pack/plugins/security/server/authorization/api_authorization.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpServiceSetup, Logger } from 'src/core/server';
+import type { HttpServiceSetup, Logger } from '@kbn/core/server';
 
 import type { AuthorizationServiceSetup } from './authorization_service';
 
diff --git a/x-pack/plugins/security/server/authorization/app_authorization.test.ts b/x-pack/plugins/security/server/authorization/app_authorization.test.ts
index 0e4d902105efa..d745cf2f60769 100644
--- a/x-pack/plugins/security/server/authorization/app_authorization.test.ts
+++ b/x-pack/plugins/security/server/authorization/app_authorization.test.ts
@@ -10,10 +10,10 @@ import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import type { PluginSetupContract as FeaturesSetupContract } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 
-import type { PluginSetupContract as FeaturesSetupContract } from '../../../features/server';
-import { featuresPluginMock } from '../../../features/server/mocks';
 import { initAppAuthorization } from './app_authorization';
 import { authorizationMock } from './index.mock';
 
diff --git a/x-pack/plugins/security/server/authorization/app_authorization.ts b/x-pack/plugins/security/server/authorization/app_authorization.ts
index b57523581bc5c..0d6d1ef01d381 100644
--- a/x-pack/plugins/security/server/authorization/app_authorization.ts
+++ b/x-pack/plugins/security/server/authorization/app_authorization.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { HttpServiceSetup, Logger } from 'src/core/server';
+import type { HttpServiceSetup, Logger } from '@kbn/core/server';
+import type { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
-import type { PluginSetupContract as FeaturesPluginSetup } from '../../../features/server';
 import type { AuthorizationServiceSetup } from './authorization_service';
 
 class ProtectedApplications {
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.test.ts b/x-pack/plugins/security/server/authorization/authorization_service.test.ts
index 61ca8423fc626..65a8905c21b9a 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.test.ts
+++ b/x-pack/plugins/security/server/authorization/authorization_service.test.ts
@@ -7,8 +7,9 @@
 
 import { Subject } from 'rxjs';
 
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
 
 // Note: this import must be before other relative imports for the mocks to work as intended.
 // eslint-disable-next-line import/order
@@ -21,7 +22,6 @@ import {
   mockRegisterPrivilegesWithCluster,
 } from './service.test.mocks';
 
-import { featuresPluginMock } from '../../../features/server/mocks';
 import { licenseMock } from '../../common/licensing/index.mock';
 import type { OnlineStatusRetryScheduler } from '../elasticsearch';
 import { AuthorizationService } from './authorization_service';
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.tsx b/x-pack/plugins/security/server/authorization/authorization_service.tsx
index 96bb1c6289b4a..4fae3be180ddb 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.tsx
+++ b/x-pack/plugins/security/server/authorization/authorization_service.tsx
@@ -17,13 +17,13 @@ import type {
   KibanaRequest,
   Logger,
   LoggerFactory,
-} from 'src/core/server';
-import type { Capabilities as UICapabilities } from 'src/core/types';
-
+} from '@kbn/core/server';
+import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../../features/server';
+} from '@kbn/features-plugin/server';
+
 import { APPLICATION_PREFIX } from '../../common/constants';
 import type { SecurityLicense } from '../../common/licensing';
 import type { AuthenticatedUser } from '../../common/model';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
index 79ae84562cd8e..617c2fcd3a545 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.test.ts
@@ -7,7 +7,7 @@
 
 import { uniq } from 'lodash';
 
-import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { GLOBAL_RESOURCE } from '../../common/constants';
 import { checkPrivilegesWithRequestFactory } from './check_privileges';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges.ts b/x-pack/plugins/security/server/authorization/check_privileges.ts
index 0459d8ccde293..2b282f9dae676 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges.ts
@@ -8,7 +8,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { pick, transform, uniq } from 'lodash';
 
-import type { IClusterClient, KibanaRequest } from 'src/core/server';
+import type { IClusterClient, KibanaRequest } from '@kbn/core/server';
 
 import { GLOBAL_RESOURCE } from '../../common/constants';
 import { ResourceSerializer } from './resource_serializer';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts
index 9fd14c6d29806..2d506a70610d3 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { checkPrivilegesDynamicallyWithRequestFactory } from './check_privileges_dynamically';
 import type { CheckPrivilegesOptions } from './types';
diff --git a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
index d4e335ba04058..b5ff420b420e9 100644
--- a/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
+++ b/x-pack/plugins/security/server/authorization/check_privileges_dynamically.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { SpacesService } from '../plugin';
 import type {
diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
index 8436295b74989..e2e988e7f5317 100644
--- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SpacesService } from '../plugin';
 import { checkSavedObjectsPrivilegesWithRequestFactory } from './check_saved_objects_privileges';
diff --git a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
index f640848c9b08e..ca14802903c6d 100644
--- a/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/check_saved_objects_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import { ALL_SPACES_ID } from '../../common/constants';
 import type { SpacesService } from '../plugin';
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
index 15fb7ab39a044..dd07324835303 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { ElasticsearchFeature, KibanaFeature } from '@kbn/features-plugin/server';
 
-import { ElasticsearchFeature, KibanaFeature } from '../../../features/server';
 import type { AuthenticatedUser } from '../../common/model';
 import { Actions } from './actions';
 import { disableUICapabilitiesFactory } from './disable_ui_capabilities';
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
index 76f270f297820..161366cb7309c 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
@@ -7,15 +7,15 @@
 
 import { flatten, isObject, mapValues } from 'lodash';
 
-import type { RecursiveReadonly, RecursiveReadonlyArray } from '@kbn/utility-types';
-import type { KibanaRequest, Logger } from 'src/core/server';
-import type { Capabilities as UICapabilities } from 'src/core/types';
-
+import type { KibanaRequest, Logger } from '@kbn/core/server';
+import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import type {
   ElasticsearchFeature,
   FeatureElasticsearchPrivileges,
   KibanaFeature,
-} from '../../../features/server';
+} from '@kbn/features-plugin/server';
+import type { RecursiveReadonly, RecursiveReadonlyArray } from '@kbn/utility-types';
+
 import type { AuthenticatedUser } from '../../common/model';
 import type { AuthorizationServiceSetup } from './authorization_service';
 import type { CheckPrivilegesResponse } from './types';
diff --git a/x-pack/plugins/security/server/authorization/mode.test.ts b/x-pack/plugins/security/server/authorization/mode.test.ts
index f0f01d500fede..b0c73b1eda51d 100644
--- a/x-pack/plugins/security/server/authorization/mode.test.ts
+++ b/x-pack/plugins/security/server/authorization/mode.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from 'src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityLicense } from '../../common/licensing';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/authorization/mode.ts b/x-pack/plugins/security/server/authorization/mode.ts
index c2f6fcb0ac5cd..d40d7fba3ca88 100644
--- a/x-pack/plugins/security/server/authorization/mode.ts
+++ b/x-pack/plugins/security/server/authorization/mode.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { SecurityLicense } from '../../common/licensing';
 
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts
index dc574251029e2..8596f80d09d46 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
-import { KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { Actions } from '../../actions';
 import { FeaturePrivilegeAlertingBuilder } from './alerting';
 
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts
index 800e8297d7fb1..c23a989951f52 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/alerting.ts
@@ -7,7 +7,8 @@
 
 import { get, uniq } from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 enum AlertingEntity {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
index 5fe6b55f1c709..ede2d0e964a37 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/api.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeApiBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
index f88d315fa1ef1..7d3caefd6e752 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/app.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeAppBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
index b7550a0717a28..2ac5ecd695a65 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
-import { KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { Actions } from '../../actions';
 import { FeaturePrivilegeCasesBuilder } from './cases';
 
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
index a5a3c76c30c77..86a4cffc7d1ea 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
@@ -7,7 +7,8 @@
 
 import { uniq } from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export type CasesSupportedOperations = typeof allOperations[number];
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
index 0cfc31975cc2f..15ee7cefd2ac2 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/catalogue.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeCatalogueBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts
index b62e5094ba09b..90dc182b6e76c 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/feature_privilege_builder.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import type { Actions } from '../../actions';
 
 export interface FeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
index 795246eedb121..f6a80929dfd90 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/index.ts
@@ -7,7 +7,8 @@
 
 import { flatten } from 'lodash';
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import type { Actions } from '../../actions';
 import { FeaturePrivilegeAlertingBuilder } from './alerting';
 import { FeaturePrivilegeApiBuilder } from './api';
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
index dd6a916618492..72cc28f5570b5 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/management.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeManagementBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
index b1d9c06b4cef9..1d027bcbcdd10 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/navlink.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeNavlinkBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
index ea373b72aec24..330eebc1602b4 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/saved_object.ts
@@ -7,7 +7,8 @@
 
 import { flatten, uniq } from 'lodash';
 
-import type { FeatureKibanaPrivileges } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 const readOperations: string[] = [
diff --git a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts
index e1d76d3d92022..a89b0912bd445 100644
--- a/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/ui.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import type { FeatureKibanaPrivileges, KibanaFeature } from '@kbn/features-plugin/server';
+
 import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
 
 export class FeaturePrivilegeUIBuilder extends BaseFeaturePrivilegeBuilder {
diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
index 9581db9410832..d9c82403a582a 100644
--- a/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/privileges.test.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../../features/server';
-import { featuresPluginMock } from '../../../../features/server/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+
 import { licenseMock } from '../../../common/licensing/index.mock';
 import { Actions } from '../actions';
 import { privilegesFactory } from './privileges';
diff --git a/x-pack/plugins/security/server/authorization/privileges/privileges.ts b/x-pack/plugins/security/server/authorization/privileges/privileges.ts
index 16a53411d9c3d..3684014fd5b1d 100644
--- a/x-pack/plugins/security/server/authorization/privileges/privileges.ts
+++ b/x-pack/plugins/security/server/authorization/privileges/privileges.ts
@@ -10,7 +10,8 @@ import { uniq } from 'lodash';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   KibanaFeature,
-} from '../../../../features/server';
+} from '@kbn/features-plugin/server';
+
 import type { SecurityLicense } from '../../../common/licensing';
 import type { RawKibanaPrivileges } from '../../../common/model';
 import type { Actions } from '../actions';
diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
index 17ed6b11630e3..4216500da2bd1 100644
--- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
+++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import type { Logger } from 'src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { Logger } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { RawKibanaPrivileges } from '../../common/model';
 import { registerPrivilegesWithCluster } from './register_privileges_with_cluster';
diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
index 2fcdc0b8dbcc9..b8fb5f83aadcf 100644
--- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
+++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.ts
@@ -7,7 +7,7 @@
 
 import { difference, isEqual, isEqualWith } from 'lodash';
 
-import type { IClusterClient, Logger } from 'src/core/server';
+import type { IClusterClient, Logger } from '@kbn/core/server';
 
 import type { PrivilegesService } from './privileges';
 import { serializePrivileges } from './privileges_serializer';
diff --git a/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx b/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx
index d5e27c9d39ffd..d5bce1e146eb1 100644
--- a/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx
+++ b/x-pack/plugins/security/server/authorization/reset_session_page.test.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-import { coreMock } from '../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+
 import { ResetSessionPage } from './reset_session_page';
 
-jest.mock('src/core/server/rendering/views/fonts', () => ({
+jest.mock('@kbn/core/server/rendering/views/fonts', () => ({
   Fonts: () => <>MockedFonts</>,
 }));
 
diff --git a/x-pack/plugins/security/server/authorization/reset_session_page.tsx b/x-pack/plugins/security/server/authorization/reset_session_page.tsx
index 49555da9cd320..cd6f49eef755e 100644
--- a/x-pack/plugins/security/server/authorization/reset_session_page.tsx
+++ b/x-pack/plugins/security/server/authorization/reset_session_page.tsx
@@ -9,9 +9,9 @@
 import { EuiButton, EuiButtonEmpty } from '@elastic/eui/lib/components/button';
 import React from 'react';
 
+import type { IBasePath } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { IBasePath } from 'src/core/server';
 
 import { PromptPage } from '../prompt_page';
 
diff --git a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts
index ba7f453aded75..bfb26bdef7c67 100644
--- a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts
+++ b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.test.ts
@@ -6,7 +6,8 @@
  */
 import { omit, pick } from 'lodash';
 
-import { KibanaFeature } from '../../../../features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { transformElasticsearchRoleToRole } from './elasticsearch_role';
 import type { ElasticsearchRole } from './elasticsearch_role';
 
diff --git a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
index ec1f6e026b143..8d7553507f85f 100644
--- a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
+++ b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../../features/common';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
+
 import {
   GLOBAL_RESOURCE,
   RESERVED_PRIVILEGES_APPLICATION_WILDCARD,
diff --git a/x-pack/plugins/security/server/authorization/types.ts b/x-pack/plugins/security/server/authorization/types.ts
index aee059fb8becb..d7f0f70b229c6 100644
--- a/x-pack/plugins/security/server/authorization/types.ts
+++ b/x-pack/plugins/security/server/authorization/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 export interface HasPrivilegesResponseApplication {
   [resource: string]: {
diff --git a/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts b/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
index d17fce5d26552..b92a9e1f4b2e8 100644
--- a/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/validate_feature_privileges.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { validateFeaturePrivileges } from './validate_feature_privileges';
 
 it('allows features to be defined without privileges', () => {
diff --git a/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts b/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
index 8bb53b076d46c..5693cb1bb5108 100644
--- a/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/validate_feature_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../features/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 
 export function validateFeaturePrivileges(features: KibanaFeature[]) {
   for (const feature of features) {
diff --git a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts
index 41746b4827c96..06051ecbbfcb5 100644
--- a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts
+++ b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+
 import { validateReservedPrivileges } from './validate_reserved_privileges';
 
 it('allows features to be defined without privileges', () => {
diff --git a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts
index 7dd6ec21bdf30..bbd58e19753ab 100644
--- a/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts
+++ b/x-pack/plugins/security/server/authorization/validate_reserved_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaFeature } from '../../../features/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 
 export function validateReservedPrivileges(features: KibanaFeature[]) {
   const seenPrivilegeIds = new Set<string>();
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 9ebdcb5e4d05f..17fddf3c0ace9 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -14,7 +14,7 @@ jest.mock('@kbn/utils', () => ({
   getLogsPath: () => '/mock/kibana/logs/path',
 }));
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { ConfigSchema, createConfig } from './config';
 
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index f993707bd8d9e..8d31e8ec95bfd 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -11,11 +11,11 @@ import path from 'path';
 
 import type { Type, TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
+import type { AppenderConfigType, Logger } from '@kbn/core/server';
+import { config as coreConfig } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { getLogsPath } from '@kbn/utils';
-import type { AppenderConfigType, Logger } from 'src/core/server';
 
-import { config as coreConfig } from '../../../../src/core/server';
 import type { AuthenticationProvider } from '../common/model';
 
 export type ConfigType = ReturnType<typeof createConfig>;
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
index 150e878f4297f..5bd4bf0fa3f52 100644
--- a/x-pack/plugins/security/server/config_deprecations.test.ts
+++ b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -8,8 +8,8 @@
 import { cloneDeep } from 'lodash';
 
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
-import { configDeprecationsMock } from '../../../../src/core/server/mocks';
 import { securityConfigDeprecationProvider } from './config_deprecations';
 
 const deprecationContext = configDeprecationsMock.createContext();
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index 8b778950036b5..b4625c521e036 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ConfigDeprecationProvider } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { ConfigDeprecationProvider } from 'src/core/server';
 
 export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   rename,
diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts
index 6f9a8e8763528..338e278e50768 100644
--- a/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts
+++ b/x-pack/plugins/security/server/deprecations/kibana_user_role.test.ts
@@ -8,13 +8,13 @@
 import { errors } from '@elastic/elasticsearch';
 import type { SecurityRoleMapping, SecurityUser } from '@elastic/elasticsearch/lib/api/types';
 
-import type { PackageInfo, RegisterDeprecationsConfig } from 'src/core/server';
+import type { PackageInfo, RegisterDeprecationsConfig } from '@kbn/core/server';
 import {
   deprecationsServiceMock,
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { licenseMock } from '../../common/licensing/index.mock';
 import { securityMock } from '../mocks';
diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
index 12961f223c243..f6c3cc4113ed7 100644
--- a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
+++ b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
@@ -10,14 +10,14 @@ import type {
   SecurityGetUserResponse,
 } from '@elastic/elasticsearch/lib/api/types';
 
-import { i18n } from '@kbn/i18n';
 import type {
   DeprecationsDetails,
   DeprecationsServiceSetup,
   ElasticsearchClient,
   Logger,
   PackageInfo,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { i18n } from '@kbn/i18n';
 
 import type { SecurityLicense } from '../../common';
 import { getDetailedErrorMessage, getErrorStatusCode } from '../errors';
diff --git a/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts b/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
index cf0ab329b7686..a3836c4773595 100644
--- a/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
+++ b/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { GetDeprecationsContext } from 'src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { GetDeprecationsContext } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { getPrivilegeDeprecationsService } from '.';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts b/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts
index 05a81936bfdff..e735f01ed6c8c 100644
--- a/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts
+++ b/x-pack/plugins/security/server/deprecations/privilege_deprecations.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { Logger } from '@kbn/core/server';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 import { i18n } from '@kbn/i18n';
-import type { Logger } from 'src/core/server';
 
-import type { KibanaFeature } from '../../../features/common';
 import type { SecurityLicense } from '../../common/licensing';
 import type {
   PrivilegeDeprecationsRolesByFeatureIdRequest,
diff --git a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts
index 0cbf04aac4f58..219158bdda472 100644
--- a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts
+++ b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.test.ts
@@ -7,10 +7,10 @@
 
 import { BehaviorSubject } from 'rxjs';
 
+import type { CoreStatus } from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import type { CoreStatus } from 'src/core/server';
-import { ServiceStatusLevels } from 'src/core/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../common/licensing';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
index 873ed32d4b8a2..88fe5caf2cac3 100644
--- a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
+++ b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
@@ -9,9 +9,9 @@ import type { Observable } from 'rxjs';
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { distinctUntilChanged, filter, map, shareReplay, tap } from 'rxjs/operators';
 
-import type { Logger, StatusServiceSetup } from 'src/core/server';
+import type { Logger, StatusServiceSetup } from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
 
-import { ServiceStatusLevels } from '../../../../../src/core/server';
 import type { SecurityLicense } from '../../common/licensing';
 
 export interface ElasticsearchServiceSetupParams {
diff --git a/x-pack/plugins/security/server/errors.ts b/x-pack/plugins/security/server/errors.ts
index 2f2573b171ae2..5de4af5fe6709 100644
--- a/x-pack/plugins/security/server/errors.ts
+++ b/x-pack/plugins/security/server/errors.ts
@@ -8,7 +8,7 @@
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
 
-import type { CustomHttpResponseOptions, ResponseError } from 'src/core/server';
+import type { CustomHttpResponseOptions, ResponseError } from '@kbn/core/server';
 
 export function wrapError(error: any) {
   return Boom.boomify(error, { statusCode: getErrorStatusCode(error) });
diff --git a/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts b/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts
index d8385867e93d6..575a120546810 100644
--- a/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts
+++ b/x-pack/plugins/security/server/feature_usage/feature_usage_service.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
-import type { FeatureUsageServiceSetup, FeatureUsageServiceStart } from '../../../licensing/server';
+import type {
+  FeatureUsageServiceSetup,
+  FeatureUsageServiceStart,
+} from '@kbn/licensing-plugin/server';
 
 interface SetupDeps {
   featureUsage: FeatureUsageServiceSetup;
diff --git a/x-pack/plugins/security/server/features/security_features.ts b/x-pack/plugins/security/server/features/security_features.ts
index 4477ca2409faa..b741d8091518d 100644
--- a/x-pack/plugins/security/server/features/security_features.ts
+++ b/x-pack/plugins/security/server/features/security_features.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchFeatureConfig } from '../../../features/server';
+import type { ElasticsearchFeatureConfig } from '@kbn/features-plugin/server';
 
 const userManagementFeature: ElasticsearchFeatureConfig = {
   id: 'users',
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index bc23a094634ff..f05cc66c882c3 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -6,12 +6,12 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { RecursiveReadonly } from '@kbn/utility-types';
 import type {
   PluginConfigDescriptor,
   PluginInitializer,
   PluginInitializerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import type { RecursiveReadonly } from '@kbn/utility-types';
 
 import { ConfigSchema } from './config';
 import { securityConfigDeprecationProvider } from './config_deprecations';
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index f4294ecbb6c11..c1fddb1751189 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -8,11 +8,11 @@
 import { of } from 'rxjs';
 
 import { ByteSizeValue } from '@kbn/config-schema';
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
 
-import { featuresPluginMock } from '../../features/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
-import { taskManagerMock } from '../../task_manager/server/mocks';
 import { ConfigSchema } from './config';
 import type { PluginSetupDependencies, PluginStartDependencies } from './plugin';
 import { SecurityPlugin } from './plugin';
@@ -111,13 +111,8 @@ describe('Security Plugin', () => {
           },
           "license": Object {
             "features$": Observable {
-              "_isScalar": false,
-              "operator": MapOperator {
-                "project": [Function],
-                "thisArg": undefined,
-              },
+              "operator": [Function],
               "source": Observable {
-                "_isScalar": false,
                 "_subscribe": [Function],
               },
             },
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index b02f852551948..6e3b67b3eedba 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -16,16 +16,19 @@ import type {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-
+} from '@kbn/core/server';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../features/server';
-import type { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
-import type { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
-import type { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+} from '@kbn/features-plugin/server';
+import type { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
+import type { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import type {
+  TaskManagerSetupContract,
+  TaskManagerStartContract,
+} from '@kbn/task-manager-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+
 import type { AuthenticatedUser, PrivilegeDeprecationsService, SecurityLicense } from '../common';
 import { SecurityLicenseService } from '../common/licensing';
 import type { AnonymousAccessServiceStart } from './anonymous_access';
diff --git a/x-pack/plugins/security/server/prompt_page.test.tsx b/x-pack/plugins/security/server/prompt_page.test.tsx
index 01c4488576f57..11b45f62f05d6 100644
--- a/x-pack/plugins/security/server/prompt_page.test.tsx
+++ b/x-pack/plugins/security/server/prompt_page.test.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+
 import { PromptPage } from './prompt_page';
 
-jest.mock('src/core/server/rendering/views/fonts', () => ({
+jest.mock('@kbn/core/server/rendering/views/fonts', () => ({
   Fonts: () => <>MockedFonts</>,
 }));
 
diff --git a/x-pack/plugins/security/server/prompt_page.tsx b/x-pack/plugins/security/server/prompt_page.tsx
index a803b39bd2463..ad53013156463 100644
--- a/x-pack/plugins/security/server/prompt_page.tsx
+++ b/x-pack/plugins/security/server/prompt_page.tsx
@@ -13,14 +13,13 @@ import { appendIconComponentCache } from '@elastic/eui/lib/components/icon/icon'
 import type { ReactNode } from 'react';
 import React from 'react';
 
+import type { IBasePath } from '@kbn/core/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { Fonts } from '@kbn/core/server/rendering/views/fonts';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import UiSharedDepsNpm from '@kbn/ui-shared-deps-npm';
 import * as UiSharedDepsSrc from '@kbn/ui-shared-deps-src';
-import type { IBasePath } from 'src/core/server';
-
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Fonts } from '../../../../src/core/server/rendering/views/fonts';
 
 // Preload the alert icon used by `EuiEmptyPrompt` to ensure that it's loaded
 // in advance the first time this page is rendered server-side. If not, the
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts
index d840351ea7dc6..3a794c9ac5f36 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock';
 import { defineAnonymousAccessGetCapabilitiesRoutes } from './get_capabilities';
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts
index 2a2f495cf062f..220fb1515df46 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines route that returns capabilities of the anonymous service account.
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts
index 80dbf5cada9ee..85cc04cf63e70 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_state.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { AnonymousAccessServiceStart } from '../../anonymous_access';
 import { routeDefinitionParamsMock, securityRequestHandlerContextMock } from '../index.mock';
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts b/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts
index f817ade1a10fd..28745c80a5f44 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/get_state.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import type { AnonymousAccessState } from '@kbn/share-plugin/common';
+
 import type { RouteDefinitionParams } from '..';
-import type { AnonymousAccessState } from '../../../../../../src/plugins/share/common';
 
 /**
  * Defines route that returns the state of anonymous access -- whether anonymous access is enabled, and what additional parameters should be
diff --git a/x-pack/plugins/security/server/routes/anonymous_access/index.ts b/x-pack/plugins/security/server/routes/anonymous_access/index.ts
index 53ed33e8741db..c634d721c3354 100644
--- a/x-pack/plugins/security/server/routes/anonymous_access/index.ts
+++ b/x-pack/plugins/security/server/routes/anonymous_access/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineAnonymousAccessGetCapabilitiesRoutes } from './get_capabilities';
 import { defineAnonymousAccessGetStateRoutes } from './get_state';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/create.test.ts b/x-pack/plugins/security/server/routes/api_keys/create.test.ts
index 67c0571b2b075..e88b4f0537d0c 100644
--- a/x-pack/plugins/security/server/routes/api_keys/create.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/create.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
+import type { RequestHandler } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { InternalAuthenticationServiceStart } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
diff --git a/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts b/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts
index b46cdb80c966f..d768a421316f1 100644
--- a/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/enabled.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
+import type { RequestHandler } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { InternalAuthenticationServiceStart } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
diff --git a/x-pack/plugins/security/server/routes/api_keys/enabled.ts b/x-pack/plugins/security/server/routes/api_keys/enabled.ts
index e788f3e6ff950..c94c8af61e24f 100644
--- a/x-pack/plugins/security/server/routes/api_keys/enabled.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/enabled.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/get.test.ts b/x-pack/plugins/security/server/routes/api_keys/get.test.ts
index cba705eccfcae..f05f4d5c37337 100644
--- a/x-pack/plugins/security/server/routes/api_keys/get.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/get.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineGetApiKeysRoutes } from './get';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/get.ts b/x-pack/plugins/security/server/routes/api_keys/get.ts
index 1b06dd00fc384..5907dacb21a9b 100644
--- a/x-pack/plugins/security/server/routes/api_keys/get.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/get.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/index.ts b/x-pack/plugins/security/server/routes/api_keys/index.ts
index aa1e3b858ea58..ba97b451d6452 100644
--- a/x-pack/plugins/security/server/routes/api_keys/index.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineCreateApiKeyRoutes } from './create';
 import { defineEnabledApiKeysRoutes } from './enabled';
 import { defineGetApiKeysRoutes } from './get';
diff --git a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts
index 7ec7eabf32c25..386e894eb3354 100644
--- a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts
@@ -8,10 +8,10 @@
 import Boom from '@hapi/boom';
 
 import type { Type } from '@kbn/config-schema';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineInvalidateApiKeysRoutes } from './invalidate';
 
diff --git a/x-pack/plugins/security/server/routes/api_keys/invalidate.ts b/x-pack/plugins/security/server/routes/api_keys/invalidate.ts
index fe4884250e83d..179df26a874b8 100644
--- a/x-pack/plugins/security/server/routes/api_keys/invalidate.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/invalidate.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import type { ApiKey } from '../../../common/model';
 import { wrapError, wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
diff --git a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts
index dc8b7f4d9fc1e..06e978e94758c 100644
--- a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineCheckPrivilegesRoutes } from './privileges';
diff --git a/x-pack/plugins/security/server/routes/api_keys/privileges.ts b/x-pack/plugins/security/server/routes/api_keys/privileges.ts
index ffd7e9e805754..7fa92e21ddba6 100644
--- a/x-pack/plugins/security/server/routes/api_keys/privileges.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts
index 6a318c953bcf5..6903cc23b02f5 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { Type } from '@kbn/config-schema';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
diff --git a/x-pack/plugins/security/server/routes/authentication/common.ts b/x-pack/plugins/security/server/routes/authentication/common.ts
index b16aac9743676..696c3f625425d 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.ts
@@ -8,7 +8,7 @@
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { parseNext } from '../../../common/parse_next';
 import {
   BasicAuthenticationProvider,
diff --git a/x-pack/plugins/security/server/routes/authentication/index.test.ts b/x-pack/plugins/security/server/routes/authentication/index.test.ts
index d1648797d45bf..b077e6155cf62 100644
--- a/x-pack/plugins/security/server/routes/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { defineAuthenticationRoutes } from '.';
 import { routeDefinitionParamsMock } from '../index.mock';
-import { defineAuthenticationRoutes } from './';
 
 describe('Authentication routes', () => {
   it('does not register any SAML related routes if SAML auth provider is not enabled', () => {
diff --git a/x-pack/plugins/security/server/routes/authentication/index.ts b/x-pack/plugins/security/server/routes/authentication/index.ts
index 3b879eadf240b..e7051f9ad67bd 100644
--- a/x-pack/plugins/security/server/routes/authentication/index.ts
+++ b/x-pack/plugins/security/server/routes/authentication/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineCommonRoutes } from './common';
 import { defineOIDCRoutes } from './oidc';
 import { defineSAMLRoutes } from './saml';
diff --git a/x-pack/plugins/security/server/routes/authentication/oidc.ts b/x-pack/plugins/security/server/routes/authentication/oidc.ts
index 0216001449d36..2c4ab9de1491b 100644
--- a/x-pack/plugins/security/server/routes/authentication/oidc.ts
+++ b/x-pack/plugins/security/server/routes/authentication/oidc.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import type { KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { KibanaRequest, KibanaResponseFactory } from 'src/core/server';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { OIDCAuthenticationProvider, OIDCLogin } from '../../authentication';
 import type { ProviderLoginAttempt } from '../../authentication/providers/oidc';
 import { wrapIntoCustomErrorResponse } from '../../errors';
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.test.ts b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
index 2ed6727492768..a38b53933132e 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { Type } from '@kbn/config-schema';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import type { InternalAuthenticationServiceStart } from '../../authentication';
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.ts b/x-pack/plugins/security/server/routes/authentication/saml.ts
index 11baa10c342e1..c1fa0cfc8e4ef 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { SAMLAuthenticationProvider, SAMLLogin } from '../../authentication';
 import { ROUTE_TAG_AUTH_FLOW, ROUTE_TAG_CAN_REDIRECT } from '../tags';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/index.ts b/x-pack/plugins/security/server/routes/authorization/index.ts
index 1fecd45f795a3..c2d2b3cdf8eaf 100644
--- a/x-pack/plugins/security/server/routes/authorization/index.ts
+++ b/x-pack/plugins/security/server/routes/authorization/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { definePrivilegesRoutes } from './privileges';
 import { resetSessionPageRoutes } from './reset_session_page';
 import { defineRolesRoutes } from './roles';
diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts
index 2bf3eea2ebda5..30a740cc3a984 100644
--- a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import type { RawKibanaPrivileges } from '../../../../common/model';
 import type { SecurityRequestHandlerContext } from '../../../types';
 import { routeDefinitionParamsMock } from '../../index.mock';
diff --git a/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts b/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts
index 05fe1a7d01175..67254735b9a16 100644
--- a/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts
+++ b/x-pack/plugins/security/server/routes/authorization/reset_session_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 export function resetSessionPageRoutes({ httpResources }: RouteDefinitionParams) {
   httpResources.register(
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts
index e2ecd92b9a942..3f5a17fd38589 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../../index.mock';
 import { defineDeleteRolesRoutes } from './delete';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/delete.ts b/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
index aa2fc0e417e4d..e30221b2e9e98 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '../..';
 import { wrapIntoCustomErrorResponse } from '../../../errors';
-import type { RouteDefinitionParams } from '../../index';
 import { createLicensedRouteHandler } from '../../licensed_route_handler';
 
 export function defineDeleteRolesRoutes({ router }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts
index 1311897f5a564..1a7e56e157558 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../../index.mock';
 import { defineGetRolesRoutes } from './get';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts
index 39ea6fd715a8b..3c7c8a0ebf6b1 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts
@@ -7,10 +7,10 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../../index.mock';
 import { defineGetAllRolesRoutes } from './get_all';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
index 377729dc5b095..7600c99a1caf7 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { KibanaFeature } from '../../../../../../features/common';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+
 import { ALL_SPACES_ID } from '../../../../../common/constants';
 import { getPutPayloadSchema, validateKibanaPrivileges } from './put_payload';
 
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
index 015891b7d7ffa..62e4a499e2e1c 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
@@ -9,9 +9,9 @@ import _ from 'lodash';
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 
 import type { ElasticsearchRole } from '.';
-import type { KibanaFeature } from '../../../../../../features/common';
 import { ALL_SPACES_ID, GLOBAL_RESOURCE } from '../../../../../common/constants';
 import { PrivilegeSerializer } from '../../../../authorization/privilege_serializer';
 import { ResourceSerializer } from '../../../../authorization/resource_serializer';
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
index fac13a655892a..425115da1e20b 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
@@ -6,11 +6,11 @@
  */
 
 import type { Type } from '@kbn/config-schema';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/server';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import { KibanaFeature } from '../../../../../features/server';
-import type { LicenseCheck } from '../../../../../licensing/server';
 import { GLOBAL_RESOURCE } from '../../../../common/constants';
 import { securityFeatureUsageServiceMock } from '../../../feature_usage/index.mock';
 import { routeDefinitionParamsMock } from '../../index.mock';
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
index 06e731dc2d543..60e24dcfec1c1 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
@@ -7,10 +7,10 @@
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 
-import type { KibanaFeature } from '../../../../../features/common';
+import type { RouteDefinitionParams } from '../..';
 import { wrapIntoCustomErrorResponse } from '../../../errors';
-import type { RouteDefinitionParams } from '../../index';
 import { createLicensedRouteHandler } from '../../licensed_route_handler';
 import {
   getPutPayloadSchema,
diff --git a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
index 43865a0a6b66b..e8ab87a504458 100644
--- a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import type { RouteDefinitionParams } from '../..';
 import type { CheckPrivileges } from '../../../authorization/types';
diff --git a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts
index 07e4ac087f591..574be3ce37a01 100644
--- a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts
+++ b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '../..';
 import { wrapIntoCustomErrorResponse } from '../../../errors';
-import type { RouteDefinitionParams } from '../../index';
 import { createLicensedRouteHandler } from '../../licensed_route_handler';
 
 export function defineShareSavedObjectPermissionRoutes({ router, authz }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/deprecations/index.ts b/x-pack/plugins/security/server/routes/deprecations/index.ts
index cbc186ed2e925..46c681052efb0 100644
--- a/x-pack/plugins/security/server/routes/deprecations/index.ts
+++ b/x-pack/plugins/security/server/routes/deprecations/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineKibanaUserRoleDeprecationRoutes } from './kibana_user_role';
 
 export function defineDeprecationsRoutes(params: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts
index 8b8a10e917f1a..9dc0c34ef8818 100644
--- a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts
+++ b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.test.ts
@@ -8,10 +8,10 @@
 import { errors } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
 
 import { securityMock } from '../../mocks';
 import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
diff --git a/x-pack/plugins/security/server/routes/index.mock.ts b/x-pack/plugins/security/server/routes/index.mock.ts
index 9b6e7948838c8..939ed36ab04d2 100644
--- a/x-pack/plugins/security/server/routes/index.mock.ts
+++ b/x-pack/plugins/security/server/routes/index.mock.ts
@@ -7,22 +7,22 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import {
   coreMock,
   httpResourcesMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 
-import { licensingMock } from '../../../licensing/server/mocks';
+import type { RouteDefinitionParams } from '.';
 import { licenseMock } from '../../common/licensing/index.mock';
 import { authenticationServiceMock } from '../authentication/authentication_service.mock';
 import { authorizationMock } from '../authorization/index.mock';
 import { ConfigSchema, createConfig } from '../config';
 import { sessionMock } from '../session_management/session.mock';
 import type { SecurityRequestHandlerContext } from '../types';
-import type { RouteDefinitionParams } from './';
 
 export const routeDefinitionParamsMock = {
   create: (rawConfig: Record<string, unknown> = {}) => {
diff --git a/x-pack/plugins/security/server/routes/index.ts b/x-pack/plugins/security/server/routes/index.ts
index 6785fe57c6b32..afb799cf73150 100644
--- a/x-pack/plugins/security/server/routes/index.ts
+++ b/x-pack/plugins/security/server/routes/index.ts
@@ -7,10 +7,10 @@
 
 import type { Observable } from 'rxjs';
 
+import type { HttpResources, IBasePath, Logger } from '@kbn/core/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { HttpResources, IBasePath, Logger } from 'src/core/server';
 
-import type { KibanaFeature } from '../../../features/server';
 import type { SecurityLicense } from '../../common';
 import type { AnonymousAccessServiceStart } from '../anonymous_access';
 import type { InternalAuthenticationServiceStart } from '../authentication';
diff --git a/x-pack/plugins/security/server/routes/indices/get_fields.test.ts b/x-pack/plugins/security/server/routes/indices/get_fields.test.ts
index 386d528080ab5..5396a16763f8d 100644
--- a/x-pack/plugins/security/server/routes/indices/get_fields.test.ts
+++ b/x-pack/plugins/security/server/routes/indices/get_fields.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineGetFieldsRoutes } from './get_fields';
diff --git a/x-pack/plugins/security/server/routes/indices/get_fields.ts b/x-pack/plugins/security/server/routes/indices/get_fields.ts
index 873ed0e1b4b92..da1a742560053 100644
--- a/x-pack/plugins/security/server/routes/indices/get_fields.ts
+++ b/x-pack/plugins/security/server/routes/indices/get_fields.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 
 export function defineGetFieldsRoutes({ router }: RouteDefinitionParams) {
   router.get(
diff --git a/x-pack/plugins/security/server/routes/indices/index.ts b/x-pack/plugins/security/server/routes/indices/index.ts
index bfc1d341b9f2f..4e8475b1c3b12 100644
--- a/x-pack/plugins/security/server/routes/indices/index.ts
+++ b/x-pack/plugins/security/server/routes/indices/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineGetFieldsRoutes } from './get_fields';
 
 export function defineIndicesRoutes(params: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/licensed_route_handler.ts b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
index b4e6871c7a963..cf631c64c4a31 100644
--- a/x-pack/plugins/security/server/routes/licensed_route_handler.ts
+++ b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaResponseFactory, RequestHandler, RouteMethod } from 'src/core/server';
+import type { KibanaResponseFactory, RequestHandler, RouteMethod } from '@kbn/core/server';
 
 import type { SecurityRequestHandlerContext } from '../types';
 
diff --git a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts
index f652d370f3601..9a63c16a6ef4a 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingDeleteRoutes } from './delete';
diff --git a/x-pack/plugins/security/server/routes/role_mapping/delete.ts b/x-pack/plugins/security/server/routes/role_mapping/delete.ts
index bf6353d5abd55..c413ca012fb6d 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/delete.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/delete.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapError } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
index 06c6f02fad4fe..9aa0639b74ce6 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { LicenseCheck } from '@kbn/licensing-plugin/server';
 
-import type { LicenseCheck } from '../../../../licensing/server';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingFeatureCheckRoute } from './feature_check';
 
diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
index 4976b7411008f..46e0c608b7b0a 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 interface NodeSettingsResponse {
diff --git a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts
index 8aa9d60f8271e..2b7dcf857bf57 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts
@@ -7,8 +7,8 @@
 
 import Boom from '@hapi/boom';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingGetRoutes } from './get';
diff --git a/x-pack/plugins/security/server/routes/role_mapping/get.ts b/x-pack/plugins/security/server/routes/role_mapping/get.ts
index dbe99fd804e25..005ba083db579 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/get.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/get.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import type { RoleMapping } from '../../../common/model';
 import { wrapError } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
diff --git a/x-pack/plugins/security/server/routes/role_mapping/index.ts b/x-pack/plugins/security/server/routes/role_mapping/index.ts
index acb14a072ef3f..3b9eca33a66f4 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/index.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineRoleMappingDeleteRoutes } from './delete';
 import { defineRoleMappingFeatureCheckRoute } from './feature_check';
 import { defineRoleMappingGetRoutes } from './get';
diff --git a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts
index e06d57b76098f..e85438ec26031 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { routeDefinitionParamsMock } from '../index.mock';
 import { defineRoleMappingPostRoutes } from './post';
diff --git a/x-pack/plugins/security/server/routes/role_mapping/post.ts b/x-pack/plugins/security/server/routes/role_mapping/post.ts
index e7d55d93e541a..1a276e46e2427 100644
--- a/x-pack/plugins/security/server/routes/role_mapping/post.ts
+++ b/x-pack/plugins/security/server/routes/role_mapping/post.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapError } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts b/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts
index 9986c1e979b8b..152c06b83dd1f 100644
--- a/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts
+++ b/x-pack/plugins/security/server/routes/security_checkup/get_state.test.ts
@@ -11,8 +11,8 @@ import { mockCreateClusterDataCheck } from './get_state.test.mock';
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityLicenseFeatures } from '../../../common/licensing';
 import { licenseMock } from '../../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/routes/session_management/extend.test.ts b/x-pack/plugins/security/server/routes/session_management/extend.test.ts
index 5af59a6386754..428621316ec18 100644
--- a/x-pack/plugins/security/server/routes/session_management/extend.test.ts
+++ b/x-pack/plugins/security/server/routes/session_management/extend.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
diff --git a/x-pack/plugins/security/server/routes/session_management/extend.ts b/x-pack/plugins/security/server/routes/session_management/extend.ts
index 0e89d6cb67981..b1626ba4660b3 100644
--- a/x-pack/plugins/security/server/routes/session_management/extend.ts
+++ b/x-pack/plugins/security/server/routes/session_management/extend.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the session extension.
diff --git a/x-pack/plugins/security/server/routes/session_management/index.ts b/x-pack/plugins/security/server/routes/session_management/index.ts
index 16cda7b7b409d..0ac63704ea3b3 100644
--- a/x-pack/plugins/security/server/routes/session_management/index.ts
+++ b/x-pack/plugins/security/server/routes/session_management/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineSessionExtendRoutes } from './extend';
 import { defineSessionInfoRoutes } from './info';
 import { defineInvalidateSessionsRoutes } from './invalidate';
diff --git a/x-pack/plugins/security/server/routes/session_management/info.test.ts b/x-pack/plugins/security/server/routes/session_management/info.test.ts
index f133a5ab31961..4f88147be0190 100644
--- a/x-pack/plugins/security/server/routes/session_management/info.test.ts
+++ b/x-pack/plugins/security/server/routes/session_management/info.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
 
 import { SESSION_EXPIRATION_WARNING_MS } from '../../../common/constants';
 import type { Session } from '../../session_management';
diff --git a/x-pack/plugins/security/server/routes/session_management/info.ts b/x-pack/plugins/security/server/routes/session_management/info.ts
index b141f42c4b072..bba5e38567213 100644
--- a/x-pack/plugins/security/server/routes/session_management/info.ts
+++ b/x-pack/plugins/security/server/routes/session_management/info.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { SESSION_EXPIRATION_WARNING_MS } from '../../../common/constants';
 import type { SessionInfo } from '../../../common/types';
 
diff --git a/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts b/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts
index ebe795788329c..c0bb04fc3bad9 100644
--- a/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts
+++ b/x-pack/plugins/security/server/routes/session_management/invalidate.test.ts
@@ -6,11 +6,11 @@
  */
 
 import type { ObjectType } from '@kbn/config-schema';
+import type { RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { RequestHandler, RouteConfig } from '../../../../../../src/core/server';
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
-import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import type { Session } from '../../session_management';
 import { sessionMock } from '../../session_management/session.mock';
 import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts
index 35972e103855e..e51824a4332de 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.test.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts
@@ -8,11 +8,11 @@
 import { errors } from '@elastic/elasticsearch';
 
 import type { ObjectType } from '@kbn/config-schema';
+import type { Headers, RequestHandler, RouteConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { Headers, RequestHandler, RouteConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { AuthenticationResult } from '../../authentication';
diff --git a/x-pack/plugins/security/server/routes/users/change_password.ts b/x-pack/plugins/security/server/routes/users/change_password.ts
index d9863b5061391..4dddd0cb07588 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { canUserChangePassword } from '../../../common/model';
 import {
   BasicHTTPAuthorizationHeaderCredentials,
diff --git a/x-pack/plugins/security/server/routes/users/create_or_update.ts b/x-pack/plugins/security/server/routes/users/create_or_update.ts
index 6527d9afc9842..75838240e79f3 100644
--- a/x-pack/plugins/security/server/routes/users/create_or_update.ts
+++ b/x-pack/plugins/security/server/routes/users/create_or_update.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/users/delete.ts b/x-pack/plugins/security/server/routes/users/delete.ts
index 767cda4b566a5..cc86b522f1c49 100644
--- a/x-pack/plugins/security/server/routes/users/delete.ts
+++ b/x-pack/plugins/security/server/routes/users/delete.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineDeleteUserRoutes({ router }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/users/disable.ts b/x-pack/plugins/security/server/routes/users/disable.ts
index 0a5c4c03f4fb0..d68da8b8490fc 100644
--- a/x-pack/plugins/security/server/routes/users/disable.ts
+++ b/x-pack/plugins/security/server/routes/users/disable.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineDisableUserRoutes({ router }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/users/enable.ts b/x-pack/plugins/security/server/routes/users/enable.ts
index 8f8d91cf42aca..8a522e63f7fd6 100644
--- a/x-pack/plugins/security/server/routes/users/enable.ts
+++ b/x-pack/plugins/security/server/routes/users/enable.ts
@@ -7,8 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineEnableUserRoutes({ router }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/users/get.ts b/x-pack/plugins/security/server/routes/users/get.ts
index 8844ed0da4ea7..3f2804e3c1616 100644
--- a/x-pack/plugins/security/server/routes/users/get.ts
+++ b/x-pack/plugins/security/server/routes/users/get.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/users/get_all.ts b/x-pack/plugins/security/server/routes/users/get_all.ts
index 4572d3929fed3..ce9d84aca2a09 100644
--- a/x-pack/plugins/security/server/routes/users/get_all.ts
+++ b/x-pack/plugins/security/server/routes/users/get_all.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { RouteDefinitionParams } from '..';
 import { wrapIntoCustomErrorResponse } from '../../errors';
-import type { RouteDefinitionParams } from '../index';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
 export function defineGetAllUsersRoutes({ router }: RouteDefinitionParams) {
diff --git a/x-pack/plugins/security/server/routes/users/index.ts b/x-pack/plugins/security/server/routes/users/index.ts
index b6bb694b5efe6..410bedb5b7fb9 100644
--- a/x-pack/plugins/security/server/routes/users/index.ts
+++ b/x-pack/plugins/security/server/routes/users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../index';
+import type { RouteDefinitionParams } from '..';
 import { defineChangeUserPasswordRoutes } from './change_password';
 import { defineCreateOrUpdateUserRoutes } from './create_or_update';
 import { defineDeleteUserRoutes } from './delete';
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
index 9d88526a85116..9b4bdb4d4329d 100644
--- a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
+++ b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   HttpResources,
   HttpResourcesRequestHandler,
   RequestHandler,
   RouteConfig,
-} from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
 import type { AuthenticationProvider } from '../../../common/model';
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.ts b/x-pack/plugins/security/server/routes/views/access_agreement.ts
index 292c484690ec8..83e640f43dee9 100644
--- a/x-pack/plugins/security/server/routes/views/access_agreement.ts
+++ b/x-pack/plugins/security/server/routes/views/access_agreement.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import type { ConfigType } from '../../config';
 import { createLicensedRouteHandler } from '../licensed_route_handler';
 
diff --git a/x-pack/plugins/security/server/routes/views/account_management.ts b/x-pack/plugins/security/server/routes/views/account_management.ts
index bab0faedcd9cc..af49f325a25d2 100644
--- a/x-pack/plugins/security/server/routes/views/account_management.ts
+++ b/x-pack/plugins/security/server/routes/views/account_management.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Account Management view.
diff --git a/x-pack/plugins/security/server/routes/views/capture_url.test.ts b/x-pack/plugins/security/server/routes/views/capture_url.test.ts
index 6fdb01ad13a8c..13f07b528996c 100644
--- a/x-pack/plugins/security/server/routes/views/capture_url.test.ts
+++ b/x-pack/plugins/security/server/routes/views/capture_url.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { Type } from '@kbn/config-schema';
-import type { HttpResources, HttpResourcesRequestHandler, RouteConfig } from 'src/core/server';
-import { httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
+import type { HttpResources, HttpResourcesRequestHandler, RouteConfig } from '@kbn/core/server';
+import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityRequestHandlerContext } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
diff --git a/x-pack/plugins/security/server/routes/views/capture_url.ts b/x-pack/plugins/security/server/routes/views/capture_url.ts
index d345639b58cb2..8eff92d78999d 100644
--- a/x-pack/plugins/security/server/routes/views/capture_url.ts
+++ b/x-pack/plugins/security/server/routes/views/capture_url.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Capture URL view.
diff --git a/x-pack/plugins/security/server/routes/views/index.test.ts b/x-pack/plugins/security/server/routes/views/index.test.ts
index be85498f0bb1e..755a5a1202c73 100644
--- a/x-pack/plugins/security/server/routes/views/index.test.ts
+++ b/x-pack/plugins/security/server/routes/views/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { defineViewRoutes } from '.';
 import { routeDefinitionParamsMock } from '../index.mock';
-import { defineViewRoutes } from './';
 
 describe('View routes', () => {
   it('does not register Login routes if both `basic` and `token` providers are disabled', () => {
diff --git a/x-pack/plugins/security/server/routes/views/index.ts b/x-pack/plugins/security/server/routes/views/index.ts
index 5993808d0cfb0..ad2585cb0b771 100644
--- a/x-pack/plugins/security/server/routes/views/index.ts
+++ b/x-pack/plugins/security/server/routes/views/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import { defineAccessAgreementRoutes } from './access_agreement';
 import { defineAccountManagementRoutes } from './account_management';
 import { defineCaptureURLRoutes } from './capture_url';
diff --git a/x-pack/plugins/security/server/routes/views/logged_out.test.ts b/x-pack/plugins/security/server/routes/views/logged_out.test.ts
index 9b0eea0c74634..0795b2a9a8e15 100644
--- a/x-pack/plugins/security/server/routes/views/logged_out.test.ts
+++ b/x-pack/plugins/security/server/routes/views/logged_out.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { HttpResourcesRequestHandler, RouteConfig } from '@kbn/core/server';
+import { httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { HttpResourcesRequestHandler, RouteConfig } from 'src/core/server';
-import { httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
 
 import type { Session } from '../../session_management';
 import { sessionMock } from '../../session_management/session.mock';
diff --git a/x-pack/plugins/security/server/routes/views/logged_out.ts b/x-pack/plugins/security/server/routes/views/logged_out.ts
index 8d22e4efc3ddc..6eb4d10bf6bbd 100644
--- a/x-pack/plugins/security/server/routes/views/logged_out.ts
+++ b/x-pack/plugins/security/server/routes/views/logged_out.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Logged Out view.
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index ee728c29bdc92..00ddd746adaa8 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -13,9 +13,9 @@ import type {
   HttpResourcesRequestHandler,
   RequestHandler,
   RouteConfig,
-} from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpResourcesMock, httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpResourcesMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import type { SecurityLicense } from '../../../common/licensing';
 import type { LoginSelectorProvider } from '../../../common/login_state';
diff --git a/x-pack/plugins/security/server/routes/views/login.ts b/x-pack/plugins/security/server/routes/views/login.ts
index 990ac4075efe0..9a7145b0e09df 100644
--- a/x-pack/plugins/security/server/routes/views/login.ts
+++ b/x-pack/plugins/security/server/routes/views/login.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 import {
   LOGOUT_REASON_QUERY_STRING_PARAMETER,
   NEXT_URL_QUERY_STRING_PARAMETER,
diff --git a/x-pack/plugins/security/server/routes/views/logout.ts b/x-pack/plugins/security/server/routes/views/logout.ts
index 5e5d5c0bb6f01..3fb905ee10d37 100644
--- a/x-pack/plugins/security/server/routes/views/logout.ts
+++ b/x-pack/plugins/security/server/routes/views/logout.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Logout out view.
diff --git a/x-pack/plugins/security/server/routes/views/overwritten_session.ts b/x-pack/plugins/security/server/routes/views/overwritten_session.ts
index 7ed5cffbc56f8..115f7ea0a093f 100644
--- a/x-pack/plugins/security/server/routes/views/overwritten_session.ts
+++ b/x-pack/plugins/security/server/routes/views/overwritten_session.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RouteDefinitionParams } from '../';
+import type { RouteDefinitionParams } from '..';
 
 /**
  * Defines routes required for the Overwritten Session view.
diff --git a/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts b/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts
index 0f6ae5e282609..a5a6529d9d850 100644
--- a/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts
+++ b/x-pack/plugins/security/server/saved_objects/ensure_authorized.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { CheckSavedObjectsPrivileges } from '../authorization';
 import { Actions } from '../authorization';
diff --git a/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts b/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts
index c3457e75f9644..f7005c1d4f86e 100644
--- a/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts
+++ b/x-pack/plugins/security/server/saved_objects/ensure_authorized.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'src/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 import type { Actions, CheckSavedObjectsPrivileges } from '../authorization';
 import type { CheckPrivilegesResponse } from '../authorization/types';
diff --git a/x-pack/plugins/security/server/saved_objects/index.ts b/x-pack/plugins/security/server/saved_objects/index.ts
index 07bfe97f9de7d..71a945e951771 100644
--- a/x-pack/plugins/security/server/saved_objects/index.ts
+++ b/x-pack/plugins/security/server/saved_objects/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/server';
+import type { CoreSetup } from '@kbn/core/server';
+import { SavedObjectsClient } from '@kbn/core/server';
 
-import { SavedObjectsClient } from '../../../../../src/core/server';
 import type { AuditServiceSetup } from '../audit';
 import type { AuthorizationServiceSetupInternal } from '../authorization';
 import type { SpacesService } from '../plugin';
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 7e45946c7452d..45a09f9a38967 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
@@ -14,8 +14,8 @@ import type {
   SavedObjectsClientContract,
   SavedObjectsResolveResponse,
   SavedObjectsUpdateObjectsSpacesResponseObject,
-} from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import type { AuditEvent } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
@@ -23,9 +23,9 @@ import { Actions } from '../authorization';
 import type { SavedObjectActions } from '../authorization/actions/saved_object';
 import { SecureSavedObjectsClientWrapper } from './secure_saved_objects_client_wrapper';
 
-jest.mock('src/core/server/saved_objects/service/lib/utils', () => {
+jest.mock('@kbn/core/server/saved_objects/service/lib/utils', () => {
   const { SavedObjectsUtils } = jest.requireActual(
-    'src/core/server/saved_objects/service/lib/utils'
+    '@kbn/core/server/saved_objects/service/lib/utils'
   );
   return {
     SavedObjectsUtils: {
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 6c6220cb4ab75..f45563d20946e 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
@@ -27,9 +27,9 @@ import type {
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
   SavedObjectsUpdateOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '../../../../../src/core/server';
 import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../common/constants';
 import type { AuditLogger } from '../audit';
 import { SavedObjectAction, savedObjectEvent } from '../audit';
diff --git a/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts b/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts
index 95ad22c79c1fb..2ddbebe1672db 100644
--- a/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts
+++ b/x-pack/plugins/security/server/security_checkup/check_cluster_data.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { createClusterDataCheck } from './check_cluster_data';
 
diff --git a/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts b/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts
index 03d2d89e70034..f996c079ea865 100644
--- a/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts
+++ b/x-pack/plugins/security/server/security_checkup/check_cluster_data.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 export const createClusterDataCheck = () => {
   let clusterHasUserData = false;
diff --git a/x-pack/plugins/security/server/session_management/session.test.ts b/x-pack/plugins/security/server/session_management/session.test.ts
index e1c67dca667f7..11fbd168780d1 100644
--- a/x-pack/plugins/security/server/session_management/session.test.ts
+++ b/x-pack/plugins/security/server/session_management/session.test.ts
@@ -8,8 +8,8 @@
 import nodeCrypto from '@elastic/node-crypto';
 import crypto from 'crypto';
 
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
 import { ConfigSchema, createConfig } from '../config';
diff --git a/x-pack/plugins/security/server/session_management/session.ts b/x-pack/plugins/security/server/session_management/session.ts
index 8d2b56b4d2b7a..febeb6db55f76 100644
--- a/x-pack/plugins/security/server/session_management/session.ts
+++ b/x-pack/plugins/security/server/session_management/session.ts
@@ -10,8 +10,8 @@ import nodeCrypto from '@elastic/node-crypto';
 import { createHash, randomBytes } from 'crypto';
 import { promisify } from 'util';
 
+import type { KibanaRequest, Logger } from '@kbn/core/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { KibanaRequest, Logger } from 'src/core/server';
 
 import type { AuthenticationProvider } from '../../common/model';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security/server/session_management/session_cookie.test.ts b/x-pack/plugins/security/server/session_management/session_cookie.test.ts
index 40b5fe3821200..35f59b2a5a892 100644
--- a/x-pack/plugins/security/server/session_management/session_cookie.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_cookie.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { SessionStorage } from 'src/core/server';
+import type { SessionStorage } from '@kbn/core/server';
 import {
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   sessionStorageMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import type { SessionCookieOptions } from './session_cookie';
 import { SessionCookie } from './session_cookie';
diff --git a/x-pack/plugins/security/server/session_management/session_cookie.ts b/x-pack/plugins/security/server/session_management/session_cookie.ts
index e747b15e78e89..4f5289490678c 100644
--- a/x-pack/plugins/security/server/session_management/session_cookie.ts
+++ b/x-pack/plugins/security/server/session_management/session_cookie.ts
@@ -10,7 +10,7 @@ import type {
   KibanaRequest,
   Logger,
   SessionStorageFactory,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { ConfigType } from '../config';
 
diff --git a/x-pack/plugins/security/server/session_management/session_index.test.ts b/x-pack/plugins/security/server/session_management/session_index.test.ts
index b19f580f2d8dd..f6405bf56bda7 100644
--- a/x-pack/plugins/security/server/session_management/session_index.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_index.test.ts
@@ -13,7 +13,7 @@ import type {
   SearchResponse,
 } from '@elastic/elasticsearch/lib/api/types';
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import type { AuditLogger } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
diff --git a/x-pack/plugins/security/server/session_management/session_index.ts b/x-pack/plugins/security/server/session_management/session_index.ts
index 2a677f6ecf561..1103b9bb9c833 100644
--- a/x-pack/plugins/security/server/session_management/session_index.ts
+++ b/x-pack/plugins/security/server/session_management/session_index.ts
@@ -10,7 +10,7 @@ import type {
   SortResults,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { ElasticsearchClient, Logger } from 'src/core/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 import type { AuthenticationProvider } from '../../common/model';
 import type { AuditLogger } from '../audit';
diff --git a/x-pack/plugins/security/server/session_management/session_management_service.test.ts b/x-pack/plugins/security/server/session_management/session_management_service.test.ts
index 6c7df0540d1f9..000d9151d9fdc 100644
--- a/x-pack/plugins/security/server/session_management/session_management_service.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_management_service.test.ts
@@ -7,14 +7,14 @@
 
 import { Subject } from 'rxjs';
 
-import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import type {
   TaskManagerStartContract,
   TaskRunCreatorFunction,
-} from '../../../task_manager/server';
-import { taskManagerMock } from '../../../task_manager/server/mocks';
+} from '@kbn/task-manager-plugin/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { nextTick } from '@kbn/test-jest-helpers';
+
 import type { AuditLogger } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
 import { ConfigSchema, createConfig } from '../config';
diff --git a/x-pack/plugins/security/server/session_management/session_management_service.ts b/x-pack/plugins/security/server/session_management/session_management_service.ts
index 03a5d6130c3c1..ee79e2eb0f1d3 100644
--- a/x-pack/plugins/security/server/session_management/session_management_service.ts
+++ b/x-pack/plugins/security/server/session_management/session_management_service.ts
@@ -7,13 +7,13 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { ElasticsearchClient, HttpServiceSetup, Logger } from 'src/core/server';
-
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import type { ElasticsearchClient, HttpServiceSetup, Logger } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import type {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+
 import type { AuditLogger } from '../audit';
 import type { ConfigType } from '../config';
 import type { OnlineStatusRetryScheduler } from '../elasticsearch';
diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
index 607ea032078ee..e0e0a925c8b27 100644
--- a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
+++ b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
@@ -7,17 +7,17 @@
 
 import { mockEnsureAuthorized } from './secure_spaces_client_wrapper.test.mocks';
 
-import { deepFreeze } from '@kbn/std';
 import type {
   EcsEventOutcome,
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
-} from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import type { GetAllSpacesPurpose, LegacyUrlAliasTarget, Space } from '@kbn/spaces-plugin/server';
+import { spacesClientMock } from '@kbn/spaces-plugin/server/mocks';
+import { deepFreeze } from '@kbn/std';
 
-import type { GetAllSpacesPurpose, LegacyUrlAliasTarget, Space } from '../../../spaces/server';
-import { spacesClientMock } from '../../../spaces/server/mocks';
 import type { AuditEvent, AuditLogger } from '../audit';
 import { SavedObjectAction, SpaceAuditAction } from '../audit';
 import { auditLoggerMock } from '../audit/mocks';
diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
index c43216643205f..37de2293785a3 100644
--- a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
+++ b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
@@ -7,8 +7,7 @@
 
 import Boom from '@hapi/boom';
 
-import type { KibanaRequest, SavedObjectsClientContract } from 'src/core/server';
-
+import type { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   GetAllSpacesOptions,
   GetAllSpacesPurpose,
@@ -16,7 +15,8 @@ import type {
   ISpacesClient,
   LegacyUrlAliasTarget,
   Space,
-} from '../../../spaces/server';
+} from '@kbn/spaces-plugin/server';
+
 import { ALL_SPACES_ID } from '../../common/constants';
 import type { AuditLogger } from '../audit';
 import { SavedObjectAction, savedObjectEvent, SpaceAuditAction, spaceAuditEvent } from '../audit';
diff --git a/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts b/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts
index e151b943e2b04..179f6cfa1cf0a 100644
--- a/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts
+++ b/x-pack/plugins/security/server/spaces/setup_spaces_client.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
+import { spacesMock } from '@kbn/spaces-plugin/server/mocks';
 
-import { spacesMock } from '../../../spaces/server/mocks';
 import { auditServiceMock } from '../audit/mocks';
 import { authorizationMock } from '../authorization/index.mock';
 import { setupSpacesClient } from './setup_spaces_client';
diff --git a/x-pack/plugins/security/server/spaces/setup_spaces_client.ts b/x-pack/plugins/security/server/spaces/setup_spaces_client.ts
index 0d2f90290425f..a13c7f6434365 100644
--- a/x-pack/plugins/security/server/spaces/setup_spaces_client.ts
+++ b/x-pack/plugins/security/server/spaces/setup_spaces_client.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsClient } from '../../../../../src/core/server';
-import type { SpacesPluginSetup } from '../../../spaces/server';
+import { SavedObjectsClient } from '@kbn/core/server';
+import type { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
+
 import type { AuditServiceSetup } from '../audit';
 import type { AuthorizationServiceSetup } from '../authorization';
 import { SecureSpacesClientWrapper } from './secure_spaces_client_wrapper';
diff --git a/x-pack/plugins/security/server/types.ts b/x-pack/plugins/security/server/types.ts
index 1ce8a19d46180..1f8e2d0ca0b95 100644
--- a/x-pack/plugins/security/server/types.ts
+++ b/x-pack/plugins/security/server/types.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 /**
  * @internal
diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts
index 72ef6bc5817b2..3b6e28765f69f 100644
--- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts
+++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.test.ts
@@ -6,11 +6,11 @@
  */
 
 import type { TypeOf } from '@kbn/config-schema';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   createCollectorFetchContextMock,
   usageCollectionPluginMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 
 import type { SecurityLicenseFeatures } from '../../common/licensing';
 import { licenseMock } from '../../common/licensing/index.mock';
diff --git a/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts b/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts
index 9b3826372bce2..0b1ef3a3d1f39 100644
--- a/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts
+++ b/x-pack/plugins/security/server/usage_collector/security_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 
 import type { SecurityLicense } from '../../common/licensing';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index 3b820b16ef8a4..74f9bff078b89 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -235,6 +235,12 @@ export const DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL =
 export const DETECTION_ENGINE_RULES_BULK_ACTION =
   `${DETECTION_ENGINE_RULES_URL}/_bulk_action` as const;
 export const DETECTION_ENGINE_RULES_PREVIEW = `${DETECTION_ENGINE_RULES_URL}/preview` as const;
+export const DETECTION_ENGINE_RULES_BULK_DELETE =
+  `${DETECTION_ENGINE_RULES_URL}/_bulk_delete` as const;
+export const DETECTION_ENGINE_RULES_BULK_CREATE =
+  `${DETECTION_ENGINE_RULES_URL}/_bulk_create` as const;
+export const DETECTION_ENGINE_RULES_BULK_UPDATE =
+  `${DETECTION_ENGINE_RULES_URL}/_bulk_update` as const;
 
 /**
  * Internal detection engine routes
diff --git a/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts b/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts
index 09208f6a7fe3d..f81c9fef7e1e2 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/get_query_filter.test.ts
@@ -7,7 +7,7 @@
 
 import { getQueryFilter, getAllFilters } from './get_query_filter';
 import type { Filter } from '@kbn/es-query';
-import { getExceptionListItemSchemaMock } from '../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('get_filter', () => {
   describe('getQueryFilter', () => {
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts
index f695aad1eb125..40f6144b5ac17 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/alerts/8.0.0/index.ts
@@ -49,6 +49,7 @@ import {
   Threats,
   Type,
 } from '@kbn/securitysolution-io-ts-alerting-types';
+import { AlertWithCommonFields800 } from '@kbn/rule-registry-plugin/common/schemas/8.0.0';
 import {
   ALERT_ANCESTORS,
   ALERT_DEPTH,
@@ -70,7 +71,6 @@ import {
 } from '../../../../field_maps/field_names';
 // TODO: Create and import 8.0.0 versioned RuleAlertAction type
 import { RuleAlertAction, SearchTypes } from '../../../types';
-import { AlertWithCommonFields800 } from '../../../../../../rule_registry/common/schemas/8.0.0';
 
 /* DO NOT MODIFY THIS SCHEMA TO ADD NEW FIELDS. These types represent the alerts that shipped in 8.0.0.
 Any changes to these types should be bug fixes so the types more accurately represent the alerts from 8.0.0.
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts
index a47d57c299117..b16b29c533d77 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/export_rules_details_schema.mock.ts
@@ -9,7 +9,7 @@ import { ExportRulesDetails } from './export_rules_details_schema';
 import {
   ExportExceptionDetailsMock,
   getExceptionExportDetailsMock,
-} from '../../../../../lists/common/schemas/response/exception_export_details_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/response/exception_export_details_schema.mock';
 
 interface RuleDetailsMock {
   totalCount?: number;
diff --git a/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts b/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts
index acc58a96981a0..33bcd0e82972f 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/transform_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleAction } from '../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 import { RuleAlertAction } from './types';
 
 export const transformRuleToAlertAction = ({
diff --git a/x-pack/plugins/security_solution/common/detection_engine/types.ts b/x-pack/plugins/security_solution/common/detection_engine/types.ts
index d563d1333cd04..b8994266707a4 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleAction } from '../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 export type RuleAlertAction = Omit<RuleAction, 'actionTypeId'> & {
   action_type_id: string;
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
index 8f69df325fe42..599072a1b90e9 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
@@ -8,8 +8,8 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { DeepPartial } from 'utility-types';
 import { merge } from 'lodash';
+import { Agent, AGENTS_INDEX, AgentStatus, FleetServerAgent } from '@kbn/fleet-plugin/common';
 import { BaseDataGenerator } from './base_data_generator';
-import { Agent, AGENTS_INDEX, AgentStatus, FleetServerAgent } from '../../../../fleet/common';
 
 const agentStatusList: readonly AgentStatus[] = [
   'offline',
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts
index e19a814ab07e4..cdc27c9da57e5 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_policy_generator.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { agentPolicyStatuses, GetAgentPoliciesResponseItem } from '@kbn/fleet-plugin/common';
 import { BaseDataGenerator } from './base_data_generator';
-import { agentPolicyStatuses, GetAgentPoliciesResponseItem } from '../../../../fleet/common';
 
 export class FleetAgentPolicyGenerator extends BaseDataGenerator<GetAgentPoliciesResponseItem> {
   generate(overrides: Partial<GetAgentPoliciesResponseItem> = {}): GetAgentPoliciesResponseItem {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts
index e9d609585841a..4fe7d06868355 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_package_policy_generator.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
 import { BaseDataGenerator } from './base_data_generator';
-import { PackagePolicy } from '../../../../fleet/common';
 import { policyFactory } from '../models/policy_config';
 import { PolicyData } from '../types';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts
index ecffe5c41dcab..a54f3b6a21aa0 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/host_isolation_exception_generator.ts
@@ -7,8 +7,8 @@
 
 import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { BaseDataGenerator } from './base_data_generator';
-import { getCreateExceptionListItemSchemaMock } from '../../../../lists/common/schemas/request/create_exception_list_item_schema.mock';
 
 const EFFECT_SCOPE_TYPES = ['policy:', 'policy:all'];
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts
index dc0f2b29ec94b..369b1fff5fe39 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_fleet_actions.ts
@@ -7,6 +7,7 @@
 
 import { Client } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
 import {
   EndpointAction,
   EndpointActionResponse,
@@ -15,7 +16,6 @@ import {
   LogsEndpointActionResponse,
 } from '../types';
 import { ENDPOINT_ACTIONS_INDEX, ENDPOINT_ACTION_RESPONSES_INDEX } from '../constants';
-import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '../../../../fleet/common';
 import { FleetActionGenerator } from '../data_generators/fleet_action_generator';
 import { wrapErrorAndRejectPromise } from './utils';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
index d2c42a1b40094..7d9d08021fe54 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
@@ -12,7 +12,7 @@ import uuid from 'uuid';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { KbnClient } from '@kbn/test';
 import { DeleteByQueryResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Agent, CreatePackagePolicyResponse, GetPackagesResponse } from '../../../../fleet/common';
+import { Agent, CreatePackagePolicyResponse, GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import { EndpointDocGenerator } from '../generate_data';
 import { HostMetadata, HostPolicyResponse } from '../types';
 import {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
index 263b6bc175688..70b1e1c52a77b 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
@@ -10,13 +10,13 @@ import { AxiosResponse } from 'axios';
 import { DeleteByQueryResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { KbnClient } from '@kbn/test';
-import { HostMetadata } from '../types';
 import {
   Agent,
   AGENT_API_ROUTES,
   FleetServerAgent,
   GetOneAgentResponse,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { HostMetadata } from '../types';
 import { FleetAgentGenerator } from '../data_generators/fleet_agent_generator';
 import { wrapErrorAndRejectPromise } from './utils';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts
index bc8c7a0525b24..37c0e37a4fbf8 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy.ts
@@ -18,7 +18,7 @@ import {
   DeleteAgentPolicyResponse,
   DeletePackagePoliciesResponse,
   PACKAGE_POLICY_API_ROUTES,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { PolicyData } from '../types';
 import { policyFactory as policyConfigFactory } from '../models/policy_config';
 import { wrapErrorAndRejectPromise } from './utils';
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts
index 11f262156d0a8..c11c2025ee88e 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_server.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { FLEET_SERVER_SERVERS_INDEX } from '../../../../fleet/common';
+import { FLEET_SERVER_SERVERS_INDEX } from '@kbn/fleet-plugin/common';
 import { wrapErrorAndRejectPromise } from './utils';
 
 /**
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts
index a236b56737e03..762fd556dc698 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint.ts
@@ -16,7 +16,7 @@ import {
   IBulkInstallPackageHTTPError,
   PostFleetSetupResponse,
   SETUP_API_ROUTE,
-} from '../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { EndpointDataLoadingError, wrapErrorAndRejectPromise } from './utils';
 
 export interface SetupFleetForEndpointResponse {
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 443b27802c538..a571c7848bdf3 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -8,6 +8,13 @@
 import seedrandom from 'seedrandom';
 import semverLte from 'semver/functions/lte';
 import { assertNever } from '@kbn/std';
+import {
+  GetAgentPoliciesResponseItem,
+  GetPackagesResponse,
+  EsAssetReference,
+  KibanaAssetReference,
+  agentPolicyStatuses,
+} from '@kbn/fleet-plugin/common';
 import {
   AlertEvent,
   DataStream,
@@ -28,13 +35,6 @@ import {
   processNameSafeVersion,
   timestampSafeVersion,
 } from './models/event';
-import {
-  GetAgentPoliciesResponseItem,
-  GetPackagesResponse,
-  EsAssetReference,
-  KibanaAssetReference,
-  agentPolicyStatuses,
-} from '../../../fleet/common';
 import { firstNonNullValue } from './models/ecs_safety_helpers';
 import { EventOptions } from './types/generator';
 import { BaseDataGenerator } from './data_generators/base_data_generator';
diff --git a/x-pack/plugins/security_solution/common/endpoint/index_data.ts b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
index 57c20ffa242ea..a783c523f07b0 100644
--- a/x-pack/plugins/security_solution/common/endpoint/index_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
@@ -11,12 +11,12 @@ import seedrandom from 'seedrandom';
 import { KbnClient } from '@kbn/test';
 import { AxiosResponse } from 'axios';
 import { merge } from 'lodash';
-import { EndpointDocGenerator, TreeOptions } from './generate_data';
 import {
   CreatePackagePolicyResponse,
   EPM_API_ROUTES,
   GetPackagesResponse,
-} from '../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { EndpointDocGenerator, TreeOptions } from './generate_data';
 import {
   deleteIndexedEndpointHosts,
   DeleteIndexedEndpointHostsResponse,
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts
index 3d64bd98b758e..545473405ea46 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { calculateEndpointAuthz, getEndpointAuthzInitialState } from './authz';
-import { createFleetAuthzMock, FleetAuthz } from '../../../../../fleet/common';
+import { createFleetAuthzMock, FleetAuthz } from '@kbn/fleet-plugin/common';
 import { createLicenseServiceMock } from '../../../license/mocks';
 import { EndpointAuthzKeyList } from '../../types/authz';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts
index f2e59a57c20a1..782ff51ccb532 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/authz/authz.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { FleetAuthz } from '@kbn/fleet-plugin/common';
 import { LicenseService } from '../../../license';
-import { FleetAuthz } from '../../../../../fleet/common';
 import { EndpointAuthz } from '../../types/authz';
 import { MaybeImmutable } from '../../types';
 
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/generator.ts b/x-pack/plugins/security_solution/common/endpoint/types/generator.ts
index b512697fb5d01..edfdbee854f67 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/generator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataStream } from './index';
+import { DataStream } from '.';
 
 /**
  * The configuration options for generating an event.
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
index 5aa38617f0331..72a1b3e2a4bee 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ApplicationStart } from 'kibana/public';
-import { Agent, PackagePolicy, UpdatePackagePolicy } from '../../../../fleet/common';
+import { ApplicationStart } from '@kbn/core/public';
+import { Agent, PackagePolicy, UpdatePackagePolicy } from '@kbn/fleet-plugin/common';
 import { ManifestSchema } from '../schema/manifest';
 
 export * from './actions';
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index 374901358650e..63a626055c7cb 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -16,12 +16,11 @@ export const allowedExperimentalValues = Object.freeze({
   tGridEnabled: true,
   tGridEventRenderedViewEnabled: true,
   excludePoliciesInFilterEnabled: false,
-  usersEnabled: false,
+  usersEnabled: true,
   detectionResponseEnabled: false,
   disableIsolationUIPendingStatuses: false,
   riskyHostsEnabled: false,
   riskyUsersEnabled: false,
-  securityRulesCancelEnabled: false,
   pendingActionResponsesWithAck: true,
   policyListEnabled: true,
 
diff --git a/x-pack/plugins/security_solution/common/license/license.ts b/x-pack/plugins/security_solution/common/license/license.ts
index 1b4cce0762edf..4761d40c440de 100644
--- a/x-pack/plugins/security_solution/common/license/license.ts
+++ b/x-pack/plugins/security_solution/common/license/license.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, Subscription } from 'rxjs';
-import { ILicense, LicenseType } from '../../../licensing/common/types';
+import { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 
 // Generic license service class that works with the license observable
 // Both server and client plugins instancates a singleton version of this class
diff --git a/x-pack/plugins/security_solution/common/license/policy_config.test.ts b/x-pack/plugins/security_solution/common/license/policy_config.test.ts
index e08a096be82ef..e62b063fd3dfe 100644
--- a/x-pack/plugins/security_solution/common/license/policy_config.test.ts
+++ b/x-pack/plugins/security_solution/common/license/policy_config.test.ts
@@ -16,7 +16,7 @@ import {
   policyFactoryWithSupportedFeatures,
   policyFactoryWithoutPaidFeatures,
 } from '../endpoint/models/policy_config';
-import { licenseMock } from '../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 import { ProtectionModes } from '../endpoint/types';
 
 describe('policy_config and licenses', () => {
diff --git a/x-pack/plugins/security_solution/common/license/policy_config.ts b/x-pack/plugins/security_solution/common/license/policy_config.ts
index 7342968a380b1..7827722c410b3 100644
--- a/x-pack/plugins/security_solution/common/license/policy_config.ts
+++ b/x-pack/plugins/security_solution/common/license/policy_config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { isAtLeast } from './license';
 import { PolicyConfig } from '../endpoint/types';
 import {
diff --git a/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts b/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts
index 79a0084f91923..68a29dd3c55b9 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/empty_ml_capabilities.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
-import { getDefaultMlCapabilities } from '../../../ml/common';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
+import { getDefaultMlCapabilities } from '@kbn/ml-plugin/common';
 
 export const emptyMlCapabilities: MlCapabilitiesResponse = {
   capabilities: getDefaultMlCapabilities(),
diff --git a/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts b/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts
index 76799249c70be..6c27f1b7603d8 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/has_ml_admin_permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 
 export const hasMlAdminPermissions = (capabilities: MlCapabilitiesResponse): boolean =>
   getDataFeedPermissions(capabilities) &&
diff --git a/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts b/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts
index 1aef515f85c0e..600670af1b588 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/has_ml_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 
 export const hasMlLicense = (capabilities: MlCapabilitiesResponse): boolean =>
   capabilities.isPlatinumOrTrialLicense;
diff --git a/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts b/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts
index ba61afba74745..bfc9c302193fc 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/has_ml_user_permissions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 
 export const hasMlUserPermissions = (capabilities: MlCapabilitiesResponse): boolean =>
   capabilities.capabilities.canGetJobs &&
diff --git a/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts
index 1a6fbbf6cfcb6..a3e0c078449ab 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/is_security_job.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlSummaryJob } from '../../../ml/common/types/anomaly_detection_jobs';
+import { MlSummaryJob } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { isSecurityJob } from './is_security_job';
 
 describe('isSecurityJob', () => {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
index f1a2977b27e19..1cbe165e9f0d9 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/common/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { IEsSearchResponse } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 export type {
   Inspect,
   SortField,
@@ -13,8 +13,8 @@ export type {
   DocValueFields,
   CursorType,
   TotalValue,
-} from '../../../../timelines/common';
-export { Direction } from '../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
+export { Direction } from '@kbn/timelines-plugin/common';
 
 export type Maybe<T> = T | null;
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
index 86bc11f7a596d..9750fbde2db47 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
@@ -13,9 +13,9 @@ export type {
   IndexFieldsStrategyResponse,
   BrowserField,
   BrowserFields,
-} from '../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
 export {
   EMPTY_BROWSER_FIELDS,
   EMPTY_DOCVALUE_FIELD,
   EMPTY_INDEX_FIELDS,
-} from '../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
index 24b65377af5f0..40fc2b7e0830e 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.mock.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { IEsSearchResponse } from 'src/plugins/data/public';
+import type { IEsSearchResponse } from '@kbn/data-plugin/public';
 
 import {
   CtiEnrichment,
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts
index 6877ceec5ea57..f4ac81a6e9d34 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/cti/index.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { IEsSearchResponse, IEsSearchRequest } from 'src/plugins/data/public';
+import { IEsSearchResponse, IEsSearchRequest } from '@kbn/data-plugin/public';
 import { FactoryQueryTypes } from '../..';
 import { EVENT_ENRICHMENT_INDICATOR_FIELD_MAP } from '../../../cti/constants';
 import { Inspect, Maybe, TimerangeInput } from '../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
index feb2f6e19e491..124388b84c3c8 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { HostItem, HostsFields } from '../common';
 import { CursorType, Direction, Inspect, Maybe, PageInfoPaginated } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
index e17703ff57a2a..2271f18ad326a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/details/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, TimerangeInput } from '../../../common';
 import { HostItem, HostsFields } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
index 70a7af9356d1a..3281fabe30829 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, Direction } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 import { HostsFields } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts
index b120161210745..4a9a1383e228f 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/authentications/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { HostsKpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts
index ca03a9a7252b2..535a5f57cf724 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/hosts/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { HostsKpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts
index a51b08ad77f56..b0c3edde0dda7 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/kpi/unique_ips/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { HostsKpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
index dcf10173ccfd9..791da07d26cd9 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, SearchHit } from '../../../common';
 import { RequestBasicOptions } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts
index 0b987f4bf3f42..c4bb787ba8198 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/uncommon_processes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { HostEcs } from '../../../../ecs/host';
 import { UserEcs } from '../../../../ecs/user';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
index f2d9e0e36bd0e..57a511d934879 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   HostDetailsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts
index d1d9a8f5d9d3e..ecd00cefd5f88 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/matrix_histogram/index.ts
@@ -6,9 +6,9 @@
  */
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, TimerangeInput } from '../../common';
-import { AuthenticationHit, RequestBasicOptions } from '../';
+import { AuthenticationHit, RequestBasicOptions } from '..';
 import { AlertsGroupData } from './alerts';
 import { AnomaliesActionGroupData, AnomalyHit } from './anomalies';
 import { DnsHistogramGroupData } from './dns';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts
index 0495ad24a6b16..3235c0871fd3c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { HostEcs } from '../../../../ecs/host';
 import { GeoEcs } from '../../../../ecs/geo';
 import { Inspect, Maybe, TotalValue, Hit, ShardsResponse } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts
index bd79532e4885a..ba298fab2771c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/dns/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated, SortField } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
index 0b19f475c452b..26eab7b3877db 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Maybe, CursorType, Inspect, PageInfoPaginated, GenericBuckets } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts
index 8e631ffcdb746..70328ffaad991 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/dns/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts
index 5a404c2c0c0a1..75889617fb050 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/network_events/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts
index c772d5d0c6ceb..88259a74df110 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/tls_handshakes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts
index 9f72eac8afad0..4a71c01ba7c03 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_flows/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts
index f1b06c68e3786..fb5fc0596435f 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/kpi/unique_private_ips/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts
index 22325dff8e148..7fff355e54c1b 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/overview/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe, SearchHit } from '../../../common';
 import { RequestBasicOptions } from '../..';
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
index c4c3ece61005a..d512f12bcbb6b 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 import { FlowTargetSourceDest } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts
index 7de0bbbb53f50..3a94d92a6c844 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_countries/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
 import {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts
index 676daa1086921..7f663d76accd0 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/top_n_flow/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   GeoItem,
   FlowTargetSourceDest,
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts
index 029ae4aa62335..a58dbe7fd6e22 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { CursorType, Inspect, Maybe, PageInfoPaginated, SortField } from '../../../common';
 import { FlowTarget } from '../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts
index 4c65f9db1b14a..0ee560090090c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/all/index.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
+import type { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FactoryQueryTypes } from '../..';
-import type {
-  IEsSearchRequest,
-  IEsSearchResponse,
-} from '../../../../../../../../src/plugins/data/common';
 
 import { ESQuery } from '../../../../typed_json';
 import { Inspect, Maybe, SortField, TimerangeInput } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts
index c1943059e1536..fad454918ce5a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/common/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getHostRiskIndex, getUserRiskIndex } from './';
+import { getHostRiskIndex, getUserRiskIndex } from '.';
 
 describe('hosts risk search_strategy getHostRiskIndex', () => {
   it('should properly return host index if space is specified', () => {
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts
index 895a3d15476f1..6f1dd9ec0e991 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/risk_score/kpi/index.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
+import type { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FactoryQueryTypes, RiskScoreAggByFields, RiskSeverity } from '../..';
-import type {
-  IEsSearchRequest,
-  IEsSearchResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { ESQuery } from '../../../../typed_json';
 
 import { Inspect, Maybe } from '../../../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts
index 3e50bbe68b5f8..67b65fa098c2a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/all/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { RequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts
index f4b6cdcbe6e55..c412c96204138 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/authentications/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { UserEcs } from '../../../../ecs/user';
 import { SourceEcs } from '../../../../ecs/source';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
index 2b74a1c251385..3fc5d86b61a24 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { Inspect, Maybe, TimerangeInput } from '../../../common';
 import { UserItem } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts
index 9069393102a5b..6aac185f71238 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/kpi/total_users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../../common';
 import { RequestBasicOptions } from '../../..';
 import { KpiHistogramData } from '../common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
index 4e5f8af41a2ef..e85679e6c5dd8 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
@@ -11,4 +11,4 @@ export type {
   TimelineNonEcsData,
   TimelineEventsAllStrategyResponse,
   TimelineEventsAllRequestOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts
index e4d2ea52ffdff..8a5154f56f4c0 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/common/index.ts
@@ -5,8 +5,4 @@
  * 2.0.
  */
 
-export type {
-  TimelineEdges,
-  TimelineItem,
-  TimelineNonEcsData,
-} from '../../../../../../timelines/common';
+export type { TimelineEdges, TimelineItem, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts
index 3fd13e56cc7e7..b8994774a1887 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/details/index.ts
@@ -9,4 +9,4 @@ export type {
   TimelineEventsDetailsItem,
   TimelineEventsDetailsStrategyResponse,
   TimelineEventsDetailsRequestOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts
index 10e9bbd7670cd..38ebb27e0416a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/eql/index.ts
@@ -11,4 +11,4 @@ export type {
   EqlOptionsData,
   EqlOptionsSelected,
   FieldsEqlOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts
index d6735b59c229d..924fff0230a14 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/last_event_time/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export { LastEventIndexKey } from '../../../../../../timelines/common';
+export { LastEventIndexKey } from '@kbn/timelines-plugin/common';
 
 export type {
   LastTimeDetails,
@@ -13,4 +13,4 @@ export type {
   TimelineKpiStrategyRequest,
   TimelineKpiStrategyResponse,
   TimelineEventsLastEventTimeRequestOptions,
-} from '../../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
index a66a10110f5b2..b293ad9660988 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   TimelineEventsQueries,
diff --git a/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts b/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts
index 782af107417c2..c3778b43bcae9 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/actions/index.ts
@@ -11,4 +11,4 @@ export type {
   HeaderCellRender,
   RowCellRender,
   ControlColumnProps,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts b/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts
index 83b0ced332a62..22c230db559f1 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export type { CellValueElementProps } from '../../../../../timelines/common';
+export type { CellValueElementProps } from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts b/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts
index ee4d621e35d6c..f58558be948de 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/columns/index.ts
@@ -10,4 +10,4 @@ export type {
   ColumnId,
   ColumnHeaderOptions,
   ColumnRenderer,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts b/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts
index f363176ac0a88..cfc33d5aa960f 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/data_provider/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-export { IS_OPERATOR, EXISTS_OPERATOR } from '../../../../../timelines/common';
+export { IS_OPERATOR, EXISTS_OPERATOR } from '@kbn/timelines-plugin/common';
 
 export type {
   QueryOperator,
@@ -12,4 +12,4 @@ export type {
   QueryMatch,
   DataProvider,
   DataProvidersAnd,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts b/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts
index ae2d19a5e2ca8..ea92167769108 100644
--- a/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts
+++ b/x-pack/plugins/security_solution/common/types/timeline/rows/index.ts
@@ -4,4 +4,4 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-export type { RowRenderer } from '../../../../../timelines/common';
+export type { RowRenderer } from '@kbn/timelines-plugin/common';
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_alerts/attach_to_case.spec.ts b/x-pack/plugins/security_solution/cypress/integration/cases/attach_alert_to_case.spec.ts
similarity index 100%
rename from x-pack/plugins/security_solution/cypress/integration/detection_alerts/attach_to_case.spec.ts
rename to x-pack/plugins/security_solution/cypress/integration/cases/attach_alert_to_case.spec.ts
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_alerts/alerts_details.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_alerts/alerts_details.spec.ts
index 3e9adc9e66b44..e3612a9a125c9 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_alerts/alerts_details.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_alerts/alerts_details.spec.ts
@@ -31,8 +31,6 @@ describe('Alert details with unmapped fields', () => {
     esArchiverLoad('unmapped_fields');
     login();
     createCustomRuleEnabled(getUnmappedRule());
-  });
-  beforeEach(() => {
     visitWithoutDateRange(ALERTS_URL);
     waitForAlertsToPopulate();
     expandFirstAlert();
@@ -52,10 +50,8 @@ describe('Alert details with unmapped fields', () => {
     });
   });
 
-  // This test needs to be updated to not look for the field in a specific row, as it prevents us from adding/removing fields
-  it.skip('Displays the unmapped field on the table', () => {
+  it('Displays the unmapped field on the table', () => {
     const expectedUnmmappedField = {
-      row: 83,
       field: 'unmapped',
       text: 'This is the unmapped field',
     };
@@ -63,10 +59,9 @@ describe('Alert details with unmapped fields', () => {
     openTable();
     cy.get(ALERT_FLYOUT)
       .find(TABLE_ROWS)
-      .eq(expectedUnmmappedField.row)
       .within(() => {
-        cy.get(CELL_TEXT).eq(2).should('have.text', expectedUnmmappedField.field);
-        cy.get(CELL_TEXT).eq(4).should('have.text', expectedUnmmappedField.text);
+        cy.get(CELL_TEXT).should('contain', expectedUnmmappedField.field);
+        cy.get(CELL_TEXT).should('contain', expectedUnmmappedField.text);
       });
   });
 
diff --git a/x-pack/plugins/security_solution/cypress/objects/rule.ts b/x-pack/plugins/security_solution/cypress/objects/rule.ts
index 4c257ed5bbd6b..bc86c03732741 100644
--- a/x-pack/plugins/security_solution/cypress/objects/rule.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/rule.ts
@@ -7,7 +7,7 @@
 
 import type { RulesSchema } from '../../common/detection_engine/schemas/response';
 /* eslint-disable @kbn/eslint/no-restricted-paths */
-import { rawRules } from '../../server/lib/detection_engine/rules/prepackaged_rules/index';
+import { rawRules } from '../../server/lib/detection_engine/rules/prepackaged_rules';
 import { getMockThreatData } from '../../public/detections/mitre/mitre_tactics_techniques';
 import { getTimeline, CompleteTimeline, getIndicatorMatchTimelineTemplate } from './timeline';
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index 20baf7e8bbc29..9916dfbc6abdf 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -73,7 +73,7 @@ import {
 } from '../screens/timeline';
 import { REFRESH_BUTTON, TIMELINE } from '../screens/timelines';
 
-import { closeFieldsBrowser, filterFieldsBrowser } from '../tasks/fields_browser';
+import { closeFieldsBrowser, filterFieldsBrowser } from './fields_browser';
 
 export const hostExistsQuery = 'host.name: *';
 
diff --git a/x-pack/plugins/security_solution/package.json b/x-pack/plugins/security_solution/package.json
index a899f5948c780..fb0a9a7ed1d78 100644
--- a/x-pack/plugins/security_solution/package.json
+++ b/x-pack/plugins/security_solution/package.json
@@ -13,6 +13,7 @@
     "cypress:open-as-ci": "node ../../../scripts/functional_tests --config ../../test/security_solution_cypress/visual_config.ts",
     "cypress:open:upgrade": "yarn cypress:open --config integrationFolder=./cypress/upgrade_integration",
     "cypress:run": "yarn cypress:run:reporter --browser chrome --spec './cypress/integration/**/*.spec.ts'; status=$?; yarn junit:merge && exit $status",
+    "cypress:run:cases": "yarn cypress:run:reporter --browser chrome --spec './cypress/integration/cases/*.spec.ts'; status=$?; yarn junit:merge && exit $status",
     "cypress:run:firefox": "yarn cypress:run:reporter --browser firefox --spec './cypress/integration/**/*.spec.ts'; status=$?; yarn junit:merge && exit $status",
     "cypress:run:reporter": "yarn cypress run --config-file ./cypress/cypress.json --reporter ../../../node_modules/cypress-multi-reporters --reporter-options configFile=./cypress/reporter_config.json",
     "cypress:run:ccs": "yarn cypress:run:reporter --browser chrome --config integrationFolder=./cypress/ccs_integration; status=$?; yarn junit:merge && exit $status",
diff --git a/x-pack/plugins/security_solution/public/app/app.tsx b/x-pack/plugins/security_solution/public/app/app.tsx
index 184ea12903b19..244d59a2e76cb 100644
--- a/x-pack/plugins/security_solution/public/app/app.tsx
+++ b/x-pack/plugins/security_solution/public/app/app.tsx
@@ -11,20 +11,25 @@ import { Store, Action } from 'redux';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { EuiErrorBoundary } from '@elastic/eui';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { AppLeaveHandler, AppMountParameters } from '../../../../../src/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { AppLeaveHandler, AppMountParameters } from '@kbn/core/public';
 
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ManageUserInfo } from '../detections/components/user_info';
-import { DEFAULT_DARK_MODE, APP_NAME } from '../../common/constants';
+import { DEFAULT_DARK_MODE, APP_NAME, APP_ID } from '../../common/constants';
 import { ErrorToastDispatcher } from '../common/components/error_toast_dispatcher';
 import { MlCapabilitiesProvider } from '../common/components/ml/permissions/ml_capabilities_provider';
 import { GlobalToaster, ManageGlobalToaster } from '../common/components/toasters';
-import { KibanaContextProvider, useKibana, useUiSetting$ } from '../common/lib/kibana';
+import {
+  KibanaContextProvider,
+  useGetUserCasesPermissions,
+  useKibana,
+  useUiSetting$,
+} from '../common/lib/kibana';
 import { State } from '../common/store';
 
 import { StartServices } from '../types';
 import { PageRouter } from './routes';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
 import { UserPrivilegesProvider } from '../common/components/user_privileges/user_privileges_context';
 import { ReactQueryClientProvider } from '../common/containers/query_client/query_client_provider';
 
@@ -48,9 +53,11 @@ const StartAppComponent: FC<StartAppComponent> = ({
   const {
     i18n,
     application: { capabilities },
+    cases,
   } = useKibana().services;
   const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
-
+  const casesPermissions = useGetUserCasesPermissions();
+  const CasesContext = cases.ui.getCasesContext();
   return (
     <EuiErrorBoundary>
       <i18n.Context>
@@ -62,13 +69,18 @@ const StartAppComponent: FC<StartAppComponent> = ({
                   <UserPrivilegesProvider kibanaCapabilities={capabilities}>
                     <ManageUserInfo>
                       <ReactQueryClientProvider>
-                        <PageRouter
-                          history={history}
-                          onAppLeave={onAppLeave}
-                          setHeaderActionMenu={setHeaderActionMenu}
+                        <CasesContext
+                          owner={[APP_ID]}
+                          userCanCrud={casesPermissions?.crud ?? false}
                         >
-                          {children}
-                        </PageRouter>
+                          <PageRouter
+                            history={history}
+                            onAppLeave={onAppLeave}
+                            setHeaderActionMenu={setHeaderActionMenu}
+                          >
+                            {children}
+                          </PageRouter>
+                        </CasesContext>
                       </ReactQueryClientProvider>
                     </ManageUserInfo>
                   </UserPrivilegesProvider>
diff --git a/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts b/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts
index 0676c516ede64..1a0e9bd1cdd70 100644
--- a/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts
+++ b/x-pack/plugins/security_solution/public/app/deep_links/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { getDeepLinks } from '.';
-import { AppDeepLink, Capabilities } from '../../../../../../src/core/public';
+import { AppDeepLink, Capabilities } from '@kbn/core/public';
 import { SecurityPageName } from '../types';
 import { mockGlobalState } from '../../common/mock';
 import { CASES_FEATURE_ID, SERVER_APP_ID } from '../../../common/constants';
@@ -142,7 +142,11 @@ describe('deepLinks', () => {
 
   describe('experimental flags', () => {
     it('should return NO users link when enableExperimental.usersEnabled === false', () => {
-      const deepLinks = getDeepLinks(mockGlobalState.app.enableExperimental);
+      const deepLinks = getDeepLinks({
+        ...mockGlobalState.app.enableExperimental,
+        usersEnabled: false,
+      });
+
       expect(findDeepLink(SecurityPageName.users, deepLinks)).toBeFalsy();
     });
 
diff --git a/x-pack/plugins/security_solution/public/app/deep_links/index.ts b/x-pack/plugins/security_solution/public/app/deep_links/index.ts
index c80f2ca282f47..2a006c51bc7a4 100644
--- a/x-pack/plugins/security_solution/public/app/deep_links/index.ts
+++ b/x-pack/plugins/security_solution/public/app/deep_links/index.ts
@@ -8,10 +8,10 @@
 import { i18n } from '@kbn/i18n';
 
 import { get } from 'lodash';
-import { LicenseType } from '../../../../licensing/common/types';
-import { getCasesDeepLinks } from '../../../../cases/public';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { getCasesDeepLinks } from '@kbn/cases-plugin/public';
+import { AppDeepLink, AppNavLinkStatus, Capabilities } from '@kbn/core/public';
 import { SecurityPageName } from '../types';
-import { AppDeepLink, AppNavLinkStatus, Capabilities } from '../../../../../../src/core/public';
 import {
   OVERVIEW,
   DETECTION_RESPONSE,
diff --git a/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx b/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx
index 54e57dc5595ce..ff082a27e575e 100644
--- a/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/global_header/index.test.tsx
@@ -18,7 +18,7 @@ import {
 } from '../../../common/mock';
 import { TimelineId } from '../../../../common/types/timeline';
 import { createStore } from '../../../common/store';
-import { kibanaObservable } from '../../../../../timelines/public/mock';
+import { kibanaObservable } from '@kbn/timelines-plugin/public/mock';
 import { sourcererPaths } from '../../../common/containers/sourcerer';
 
 jest.mock('react-router-dom', () => {
diff --git a/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx b/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx
index 1abda9ca59354..768f05a36527c 100644
--- a/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/global_header/index.tsx
@@ -15,12 +15,12 @@ import { useLocation } from 'react-router-dom';
 import { createPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
 import { i18n } from '@kbn/i18n';
 
-import { AppMountParameters } from '../../../../../../../src/core/public';
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { MlPopover } from '../../../common/components/ml_popover/ml_popover';
 import { useKibana } from '../../../common/lib/kibana';
 import { ADD_DATA_PATH } from '../../../../common/constants';
-import { isDetectionsPath } from '../../../../public/helpers';
+import { isDetectionsPath } from '../../../helpers';
 import { Sourcerer } from '../../../common/components/sourcerer';
 import { TimelineId } from '../../../../common/types/timeline';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
diff --git a/x-pack/plugins/security_solution/public/app/home/index.tsx b/x-pack/plugins/security_solution/public/app/home/index.tsx
index 19d4e5cc57b3b..602e2709f2a2a 100644
--- a/x-pack/plugins/security_solution/public/app/home/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/index.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { useLocation } from 'react-router-dom';
 
+import { AppLeaveHandler, AppMountParameters } from '@kbn/core/public';
 import { DragDropContextWrapper } from '../../common/components/drag_and_drop/drag_drop_context_wrapper';
-import { AppLeaveHandler, AppMountParameters } from '../../../../../../src/core/public';
 import { SecuritySolutionAppWrapper } from '../../common/components/page';
 import { HelpMenu } from '../../common/components/help_menu';
 import { UseUrlState } from '../../common/components/url_state';
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx
index 6d09f369be044..9b74a2410a7e8 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/bottom_bar/index.tsx
@@ -8,8 +8,8 @@
 /* eslint-disable react/display-name */
 
 import React from 'react';
-import { KibanaPageTemplateProps } from '../../../../../../../../src/plugins/kibana_react/public';
-import { AppLeaveHandler } from '../../../../../../../../src/core/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
+import { AppLeaveHandler } from '@kbn/core/public';
 import { useShowTimeline } from '../../../../common/utils/timeline/use_show_timeline';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { TimelineId } from '../../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
index e81684200913a..0403071391d0d 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
@@ -9,7 +9,7 @@ import { render } from '@testing-library/react';
 import React from 'react';
 
 import { TestProviders } from '../../../common/mock';
-import { SecuritySolutionTemplateWrapper } from './';
+import { SecuritySolutionTemplateWrapper } from '.';
 
 jest.mock('./bottom_bar', () => ({
   ...jest.requireActual('./bottom_bar'),
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
index b9f18e7335a4d..d72e004345942 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
@@ -9,11 +9,8 @@ import React, { useMemo } from 'react';
 import styled from 'styled-components';
 import { EuiPanel } from '@elastic/eui';
 import { IS_DRAGGING_CLASS_NAME } from '@kbn/securitysolution-t-grid';
-import { AppLeaveHandler } from '../../../../../../../src/core/public';
-import {
-  KibanaPageTemplate,
-  NO_DATA_PAGE_TEMPLATE_PROPS,
-} from '../../../../../../../src/plugins/kibana_react/public';
+import { AppLeaveHandler } from '@kbn/core/public';
+import { KibanaPageTemplate, NO_DATA_PAGE_TEMPLATE_PROPS } from '@kbn/kibana-react-plugin/public';
 import { useSecuritySolutionNavigation } from '../../../common/components/navigation/use_security_solution_navigation';
 import { TimelineId } from '../../../../common/types/timeline';
 import { getTimelineShowStatusByIdSelector } from '../../../timelines/components/flyout/selectors';
diff --git a/x-pack/plugins/security_solution/public/app/routes.tsx b/x-pack/plugins/security_solution/public/app/routes.tsx
index a9a94a6998286..587c4dd230191 100644
--- a/x-pack/plugins/security_solution/public/app/routes.tsx
+++ b/x-pack/plugins/security_solution/public/app/routes.tsx
@@ -10,7 +10,7 @@ import React, { FC, memo, useEffect } from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
-import { AppLeaveHandler, AppMountParameters } from '../../../../../src/core/public';
+import { AppLeaveHandler, AppMountParameters } from '@kbn/core/public';
 import { ManageRoutesSpy } from '../common/utils/route/manage_spy_routes';
 import { RouteCapture } from '../common/components/endpoint/route_capture';
 import { AppAction } from '../common/store/actions';
diff --git a/x-pack/plugins/security_solution/public/app/types.ts b/x-pack/plugins/security_solution/public/app/types.ts
index 15365e3420f9d..455420472e5af 100644
--- a/x-pack/plugins/security_solution/public/app/types.ts
+++ b/x-pack/plugins/security_solution/public/app/types.ts
@@ -16,8 +16,8 @@ import {
   CombinedState,
 } from 'redux';
 import { RouteProps } from 'react-router-dom';
-import { AppMountParameters } from '../../../../../src/core/public';
-import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/public';
+import { AppMountParameters } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { StartServices } from '../types';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/cases/pages/index.tsx b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
index 5b5e455563412..a3bfdab9f9114 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useRef } from 'react';
 import { useDispatch } from 'react-redux';
-import { CaseViewRefreshPropInterface } from '../../../../cases/common';
+import { CaseViewRefreshPropInterface } from '@kbn/cases-plugin/common';
 import { TimelineId } from '../../../common/types/timeline';
 
 import { getRuleDetailsUrl, useFormatUrl } from '../../common/components/link_to';
diff --git a/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts b/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts
index d39549a5bbac8..73a41cfdddbab 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts
+++ b/x-pack/plugins/security_solution/public/cases/pages/use_fetch_alert_data.ts
@@ -6,10 +6,10 @@
  */
 
 import { useMemo } from 'react';
+import { Ecs } from '@kbn/cases-plugin/common';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../common/store/sourcerer/model';
 import { useQueryAlerts } from '../../detections/containers/detection_engine/alerts/use_query';
-import { Ecs } from '../../../../cases/common';
 import { buildAlertsQuery, formatAlertToEcsSignal, SignalHit } from '../../common/utils/alerts';
 
 export const useFetchAlertData = (alertIds: string[]): [boolean, Record<string, unknown>] => {
diff --git a/x-pack/plugins/security_solution/public/cases/routes.tsx b/x-pack/plugins/security_solution/public/cases/routes.tsx
index 19421940e338d..8774b3e11a556 100644
--- a/x-pack/plugins/security_solution/public/cases/routes.tsx
+++ b/x-pack/plugins/security_solution/public/cases/routes.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { SecuritySubPluginRoutes } from '../app/types';
 import { CASES_PATH } from '../../common/constants';
 import { Cases } from './pages';
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
index 7e71174c85a14..75b3965736d25 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
@@ -8,6 +8,7 @@
 import React, { useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import type { Filter } from '@kbn/es-query';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineActions } from '../../../timelines/store/timeline';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 import { StatefulEventsViewer } from '../events_viewer';
@@ -20,7 +21,6 @@ import { useKibana } from '../../lib/kibana';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_features';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants';
-import type { EntityType } from '../../../../../timelines/common';
 import { getDefaultControlColumn } from '../../../timelines/components/timeline/body/control_columns';
 
 export interface OwnProps {
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts
index 010c8b4e0e8e5..6c9e5dc704ecb 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import type { EntityType } from '../../../../../timelines/common';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 import { HostsComponentsQueryProps } from '../../../hosts/pages/navigation/types';
 import { NetworkComponentQueryProps } from '../../../network/pages/navigation/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx
index e36123ac817ec..98f69640db555 100644
--- a/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/and_or_badge/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
-import { AndOrBadge } from './';
+import { AndOrBadge } from '.';
 import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({ eui: { euiColorLightShade: '#ece' } });
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx
index 9138e35252597..422ec6b384531 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_host_table.test.tsx
@@ -12,11 +12,11 @@ import '../../mock/match_media';
 import * as i18n from './translations';
 import { AuthenticationsHostTable } from './authentications_host_table';
 import { hostsModel } from '../../../hosts/store';
-import { TestProviders } from '../../../common/mock';
-import { useAuthentications } from '../../../common/containers/authentications';
-import { useQueryToggle } from '../../../common/containers/query_toggle';
+import { TestProviders } from '../../mock';
+import { useAuthentications } from '../../containers/authentications';
+import { useQueryToggle } from '../../containers/query_toggle';
 
-jest.mock('../../../common/containers/query_toggle', () => ({
+jest.mock('../../containers/query_toggle', () => ({
   useQueryToggle: jest.fn().mockReturnValue({ toggleStatus: true, setToggleStatus: jest.fn() }),
 }));
 jest.mock('../../containers/authentications', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx
index 45aa387ca1bcc..6936c147ae928 100644
--- a/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/authentication/authentications_user_table.test.tsx
@@ -9,14 +9,14 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import '../../mock/match_media';
 
-import { TestProviders } from '../../../common/mock';
-import { useAuthentications } from '../../../common/containers/authentications';
-import { useQueryToggle } from '../../../common/containers/query_toggle';
+import { TestProviders } from '../../mock';
+import { useAuthentications } from '../../containers/authentications';
+import { useQueryToggle } from '../../containers/query_toggle';
 import { AuthenticationsUserTable } from './authentications_user_table';
 import { usersModel } from '../../../users/store';
 import { AuthStackByField } from '../../../../common/search_strategy';
 
-jest.mock('../../../common/containers/query_toggle', () => ({
+jest.mock('../../containers/query_toggle', () => ({
   useQueryToggle: jest.fn().mockReturnValue({ toggleStatus: true, setToggleStatus: jest.fn() }),
 }));
 jest.mock('../../containers/authentications', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx b/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx
index 8547f0d13a9a7..e7085b7ee22aa 100644
--- a/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/auto_download/auto_download.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { globalNode } from '../../../common/mock';
+import { globalNode } from '../../mock';
 import { AutoDownload } from './auto_download';
 
 describe('AutoDownload', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
index deee4f9733108..55a4cc5840259 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
@@ -19,7 +19,7 @@ import { useTimeZone } from '../../lib/kibana';
 import { defaultLegendColors } from '../matrix_histogram/utils';
 import { useThrottledResizeObserver } from '../utils';
 import { hasValueToDisplay } from '../../utils/validators';
-import { EMPTY_VALUE_LABEL } from '../charts/translation';
+import { EMPTY_VALUE_LABEL } from './translation';
 
 import { ChartPlaceHolder } from './chart_place_holder';
 import {
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx
index 6261783a53a68..a712296873b88 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/draggable_legend_item.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../mock';
 
 import { DraggableLegendItem, LegendItem } from './draggable_legend_item';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
diff --git a/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx b/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx
index fd200d900147f..11ca7cc1bda3c 100644
--- a/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/current_license/index.tsx
@@ -8,9 +8,9 @@
 import React, { FC, memo, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { licenseService } from '../../hooks/use_license';
 import { AppAction } from '../../store/actions';
-import { ILicense } from '../../../../../licensing/common/types';
 
 export const CurrentLicense: FC = memo(({ children }) => {
   const dispatch = useDispatch<Dispatch<AppAction>>();
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
index da7313e85e631..bb600238da135 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
@@ -13,6 +13,10 @@ import { Dispatch } from 'redux';
 import deepEqual from 'fast-deep-equal';
 import { IS_DRAGGING_CLASS_NAME } from '@kbn/securitysolution-t-grid';
 
+import {
+  addFieldToTimelineColumns,
+  getTimelineIdFromColumnDroppableId,
+} from '@kbn/timelines-plugin/public';
 import { BeforeCapture } from './drag_drop_context';
 import { BrowserFields } from '../../containers/source';
 import { dragAndDropSelectors } from '../../store';
@@ -37,10 +41,6 @@ import {
 import { useDeepEqualSelector } from '../../hooks/use_selector';
 import { useKibana } from '../../lib/kibana';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
-import {
-  addFieldToTimelineColumns,
-  getTimelineIdFromColumnDroppableId,
-} from '../../../../../timelines/public';
 import { alertsHeaders } from '../alerts_viewer/default_headers';
 
 // @ts-expect-error
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts
index 7dfb23c1f84b9..e03c7586ba621 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.test.ts
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash/fp';
 import { DropResult } from 'react-beautiful-dnd';
-import { getTimelineIdFromColumnDroppableId } from '../../../../../timelines/public';
+import { getTimelineIdFromColumnDroppableId } from '@kbn/timelines-plugin/public';
 
 import { IdToDataProvider } from '../../store/drag_and_drop/model';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
index 85bb689806b8a..05b8b50bc8896 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { EmptyPage } from './index';
+import { EmptyPage } from '.';
 
 describe('EmptyPage component', () => {
   it('renders actions without descriptions', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap
index 142ed7a0d7175..77edd4e1fe991 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap
@@ -2,6 +2,6 @@
 
 exports[`EmptyValue it renders against snapshot 1`] = `
 <p>
-  (Empty String)
+  (Empty string)
 </p>
 `;
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx b/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx
index c455ed1953c28..c869bb5e6810c 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/empty_value/empty_value.test.tsx
@@ -39,7 +39,7 @@ describe('EmptyValue', () => {
           <p>{getEmptyString()}</p>
         </ThemeProvider>
       );
-      expect(wrapper.text()).toBe('(Empty String)');
+      expect(wrapper.text()).toBe('(Empty string)');
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts b/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts
index d598f4856413e..9eaddfd8650f0 100644
--- a/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/empty_value/translations.ts
@@ -10,6 +10,6 @@ import { i18n } from '@kbn/i18n';
 export const EMPTY_STRING = i18n.translate(
   'xpack.securitySolution.emptyString.emptyStringDescription',
   {
-    defaultMessage: 'Empty String',
+    defaultMessage: 'Empty string',
   }
 );
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx
index b410a1689b476..a8bbf1833b4db 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { MutableRefObject, useContext } from 'react';
-import { CaseViewRefreshPropInterface } from '../../../../../../cases/common';
+import { CaseViewRefreshPropInterface } from '@kbn/cases-plugin/common';
 
 /**
  * React Context that can hold the `Ref` that is created an passed to `CaseViewProps['refreshRef`]`, enabling
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx
index 466107f75abfc..881cea7c3c276 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/isolate_success.tsx
@@ -10,7 +10,7 @@ import { EuiCallOut, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { GET_ISOLATION_SUCCESS_MESSAGE, GET_UNISOLATION_SUCCESS_MESSAGE } from './translations';
 import { useCasesFromAlerts } from '../../../../detections/containers/detection_engine/alerts/use_cases_from_alerts';
-import { CaseDetailsLink } from '../../../../common/components/links';
+import { CaseDetailsLink } from '../../links';
 
 export interface EndpointIsolateSuccessProps {
   hostName: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx
index e7e03d828d62d..632f77dde9a20 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/link_to_app.test.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { LinkToApp } from './link_to_app';
-import { CoreStart } from 'kibana/public';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 type LinkToAppOnClickMock<Return = void> = jest.Mock<
   Return,
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 a5e0c90402df4..cbbec4a623e6b 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
@@ -8,9 +8,9 @@
 import React, { memo, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
+import { TimelineId } from '@kbn/timelines-plugin/common';
 import { AppLocation } from '../../../../common/endpoint/types';
 import { timelineActions } from '../../../timelines/store/timeline';
-import { TimelineId } from '../../../../../timelines/common';
 
 /**
  * This component should be used above all routes, but below the Provider.
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx
index 3986b37656ac0..cfccea2cadf81 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.test.tsx
@@ -12,11 +12,11 @@ import { TestProviders } from '../../../mock';
 import { render } from '@testing-library/react';
 import { buildEventEnrichmentMock } from '../../../../../common/search_strategy/security_solution/cti/index.mock';
 import { mockAlertDetailsData } from '../__mocks__';
-import { TimelineEventsDetailsItem } from '../../../../../../timelines/common';
+import { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import { mockBrowserFields } from '../../../containers/source/mock';
-import { mockTimelines } from '../../../../common/mock/mock_timelines_plugin';
+import { mockTimelines } from '../../../mock/mock_timelines_plugin';
 
-jest.mock('../../../../common/lib/kibana', () => ({
+jest.mock('../../../lib/kibana', () => ({
   useKibana: () => ({
     services: {
       timelines: { ...mockTimelines },
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx
index f7df157ed4602..12b5bc755d35f 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_details.test.tsx
@@ -21,7 +21,7 @@ import { TimelineEventsDetailsItem } from '../../../../common/search_strategy';
 import { TimelineTabs } from '../../../../common/types/timeline';
 import { useInvestigationTimeEnrichment } from '../../containers/cti/event_enrichment';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 jest.mock('../../containers/cti/event_enrichment');
 
 jest.mock('../../../detections/containers/detection_engine/rules/use_rule_with_fallback', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx
index e7547a8259514..4aeb63862a8e0 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/event_fields_browser.tsx
@@ -17,7 +17,7 @@ import {
   DATA_ROWINDEX_ATTRIBUTE,
   isTab,
   onKeyDownFocusHandler,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 
 import { ADD_TIMELINE_BUTTON_CLASS_NAME } from '../../../timelines/components/flyout/add_timeline_button';
 import { timelineActions, timelineSelectors } from '../../../timelines/store/timeline';
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
index a58ac79ee25ae..a7f9801bc082e 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/helpers.tsx
@@ -13,7 +13,7 @@ import {
   getTableSkipFocus,
   handleSkipFocus,
   stopPropagationAndPreventDefault,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { BrowserField, BrowserFields } from '../../containers/source';
 import {
   DEFAULT_DATE_COLUMN_MIN_WIDTH,
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/investigation_guide_view.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/investigation_guide_view.tsx
index b4abd253b4a96..dfec4ab07db16 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/investigation_guide_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/investigation_guide_view.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiSpacer, EuiHorizontalRule, EuiTitle, EuiText } from '@elastic/eui';
+import { EuiSpacer, EuiTitle, EuiText } from '@elastic/eui';
 import { ALERT_RULE_UUID } from '@kbn/rule-data-utils';
 
 import React, { useMemo } from 'react';
@@ -39,7 +39,7 @@ const InvestigationGuideViewComponent: React.FC<{
 
   return (
     <>
-      <EuiHorizontalRule />
+      <EuiSpacer size="l" />
       <EuiTitle size="xxxs" data-test-subj="summary-view-guide">
         <h5>{i18n.INVESTIGATION_GUIDE}</h5>
       </EuiTitle>
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx
index 52e038fa07c56..11ffa44a17a3b 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { Overview } from './';
-import { TestProviders } from '../../../../common/mock';
+import { Overview } from '.';
+import { TestProviders } from '../../../mock';
 
 jest.mock('../../../lib/kibana');
 jest.mock('../../utils', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx
index 39fbf36ef5cd8..965766dddf923 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/index.tsx
@@ -10,8 +10,8 @@ import React, { useMemo } from 'react';
 import { chunk, find } from 'lodash/fp';
 import type { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import type { BrowserFields } from '../../../containers/source';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import type { TimelineEventsDetailsItem } from '../../../../../common/search_strategy/timeline';
 import type { EnrichedFieldInfo, EnrichedFieldInfoWithValues } from '../types';
 import { getEnrichedFieldInfo } from '../helpers';
@@ -26,11 +26,11 @@ import {
   SIGNAL_STATUS_FIELD_NAME,
 } from '../../../../timelines/components/timeline/body/renderers/constants';
 import { FormattedFieldValue } from '../../../../timelines/components/timeline/body/renderers/formatted_field';
-import { OverviewCardWithActions, OverviewCard } from '../overview/overview_card';
-import { StatusPopoverButton } from '../overview/status_popover_button';
-import { SeverityBadge } from '../../../../../public/detections/components/rules/severity_badge';
+import { OverviewCardWithActions, OverviewCard } from './overview_card';
+import { StatusPopoverButton } from './status_popover_button';
+import { SeverityBadge } from '../../../../detections/components/rules/severity_badge';
 import { useThrottledResizeObserver } from '../../utils';
-import { isNotNull } from '../../../../../public/timelines/store/timeline/helpers';
+import { isNotNull } from '../../../../timelines/store/timeline/helpers';
 
 export const NotGrowingFlexGroup = euiStyled(EuiFlexGroup)`
   flex-grow: 0;
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx
index 8ed3dc7e36165..5ae2e6dfb5c29 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { OverviewCardWithActions } from './overview_card';
-import { TestProviders } from '../../../../common/mock';
-import { SeverityBadge } from '../../../../../public/detections/components/rules/severity_badge';
+import { TestProviders } from '../../../mock';
+import { SeverityBadge } from '../../../../detections/components/rules/severity_badge';
 
 const props = {
   title: 'Severity',
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx
index d3cf8c3840497..7984c23a337de 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/overview_card.tsx
@@ -6,10 +6,10 @@
  */
 
 import { EuiFlexGroup, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
-import React from 'react';
+import React, { useState } from 'react';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ActionCell } from '../table/action_cell';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { EnrichedFieldInfo } from '../types';
 
 const ActionWrapper = euiStyled.div`
@@ -19,7 +19,9 @@ const ActionWrapper = euiStyled.div`
   margin-left: ${({ theme }) => theme.eui.paddingSizes.s};
 `;
 
-const OverviewPanel = euiStyled(EuiPanel)`
+const OverviewPanel = euiStyled(EuiPanel)<{
+  $isPopoverVisible: boolean;
+}>`
   &&& {
     background-color: ${({ theme }) => theme.eui.euiColorLightestShade};
     padding: ${({ theme }) => theme.eui.paddingSizes.s};
@@ -45,15 +47,35 @@ const OverviewPanel = euiStyled(EuiPanel)`
         transform: translate(0);
       }
     }
+
+    ${(props) =>
+      props.$isPopoverVisible &&
+      `
+      & ${ActionWrapper} {
+        width: auto;
+        transform: translate(0);
+      }
+    `}
   }
 `;
 
 interface OverviewCardProps {
+  isPopoverVisible?: boolean; // Prevent the hover actions from collapsing on each other when not directly hovered on
   title: string;
 }
 
-export const OverviewCard: React.FC<OverviewCardProps> = ({ title, children }) => (
-  <OverviewPanel borderRadius="none" hasShadow={false} hasBorder={false} paddingSize="s">
+export const OverviewCard: React.FC<OverviewCardProps> = ({
+  title,
+  children,
+  isPopoverVisible = false, // default to false as this behavior is only really necessary in the situation without an overflow
+}) => (
+  <OverviewPanel
+    borderRadius="none"
+    hasShadow={false}
+    hasBorder={false}
+    paddingSize="s"
+    $isPopoverVisible={isPopoverVisible}
+  >
     <EuiText size="s">{title}</EuiText>
     <EuiSpacer size="s" />
     {children}
@@ -85,13 +107,20 @@ export const OverviewCardWithActions: React.FC<OverviewCardWithActionsProps> = (
   dataTestSubj,
   enrichedFieldInfo,
 }) => {
+  const [isPopoverVisisble, setIsPopoverVisible] = useState(false);
+
   return (
-    <OverviewCard title={title}>
+    <OverviewCard title={title} isPopoverVisible={isPopoverVisisble}>
       <EuiFlexGroup alignItems="center" gutterSize="none">
         <ClampedContent data-test-subj={dataTestSubj}>{children}</ClampedContent>
 
         <ActionWrapper>
-          <ActionCell {...enrichedFieldInfo} contextId={contextId} applyWidthAndPadding={false} />
+          <ActionCell
+            {...enrichedFieldInfo}
+            contextId={contextId}
+            setIsPopoverVisible={setIsPopoverVisible}
+            applyWidthAndPadding={false}
+          />
         </ActionWrapper>
       </EuiFlexGroup>
     </OverviewCard>
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx
index 3c3316618a72c..593cf44aa92f3 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/overview/status_popover_button.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { StatusPopoverButton } from './status_popover_button';
-import { TestProviders } from '../../../../common/mock';
+import { TestProviders } from '../../../mock';
 
 const props = {
   eventId: 'testid',
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx
index 523b56e9ecf76..d8081414cdacf 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/action_cell.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { useCallback, useState, useContext } from 'react';
+import { TimelineContext } from '@kbn/timelines-plugin/public';
 import { HoverActions } from '../../hover_actions';
 import { useActionCellDataProvider } from './use_action_cell_data_provider';
 import { EnrichedFieldInfo } from '../types';
 import { ColumnHeaderOptions } from '../../../../../common/types/timeline';
-import { TimelineContext } from '../../../../../../timelines/public';
 
 interface Props extends EnrichedFieldInfo {
   contextId: string;
@@ -18,6 +18,7 @@ interface Props extends EnrichedFieldInfo {
   disabled?: boolean;
   getLinkValue?: (field: string) => string | null;
   onFilterAdded?: () => void;
+  setIsPopoverVisible?: (isVisible: boolean) => void;
   toggleColumn?: (column: ColumnHeaderOptions) => void;
   hideAddToTimeline?: boolean;
 }
@@ -32,6 +33,7 @@ export const ActionCell: React.FC<Props> = React.memo(
     getLinkValue,
     linkValue,
     onFilterAdded,
+    setIsPopoverVisible,
     timelineId,
     toggleColumn,
     values,
@@ -55,9 +57,10 @@ export const ActionCell: React.FC<Props> = React.memo(
     const toggleTopN = useCallback(() => {
       setShowTopN((prevShowTopN) => {
         const newShowTopN = !prevShowTopN;
+        if (setIsPopoverVisible) setIsPopoverVisible(newShowTopN);
         return newShowTopN;
       });
-    }, []);
+    }, [setIsPopoverVisible]);
 
     const closeTopN = useCallback(() => {
       setShowTopN(false);
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx
index e97971b51cd4c..396ecbc5484ed 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_name_cell.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge, EuiText, EuiToolTip } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import { FieldIcon } from '@kbn/react-field';
+import type { DataViewField } from '@kbn/data-views-plugin/common';
 import * as i18n from '../translations';
-import type { DataViewField } from '../../../../../../../../src/plugins/data_views/common';
 import { getExampleText } from '../helpers';
 import { BrowserField } from '../../../containers/source';
 import { EventFieldsData } from '../types';
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
index 6a0e6bf4e6b9d..e7a24fd7c7a31 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
@@ -15,7 +15,7 @@ import { EventFieldsData } from '../types';
 import { TimelineId } from '../../../../../common/types';
 import { AlertSummaryRow } from '../helpers';
 import { useAlertPrevalence } from '../../../containers/alerts/use_alert_prevalence';
-import { getEmptyValue } from '../../../components/empty_value';
+import { getEmptyValue } from '../../empty_value';
 
 jest.mock('../../../lib/kibana');
 jest.mock('../../../containers/alerts/use_alert_prevalence', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
index 46de86d4bff1b..2a11736f52c42 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 import { AlertSummaryRow } from '../helpers';
-import { defaultToEmptyTag } from '../../../components/empty_value';
+import { defaultToEmptyTag } from '../../empty_value';
 import { useAlertPrevalence } from '../../../containers/alerts/use_alert_prevalence';
 
 const PrevalenceCell = React.memo<AlertSummaryRow['description']>(
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx
index b51aeb3253eee..10c4c839ee2e6 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx
@@ -14,6 +14,7 @@ import { TestProviders } from '../../../mock';
 import { EventFieldsData } from '../types';
 import { AlertSummaryRow } from '../helpers';
 import { TimelineId } from '../../../../../common/types';
+import { AGENT_STATUS_FIELD_NAME } from '../../../../timelines/components/timeline/body/renderers/constants';
 
 jest.mock('../../../lib/kibana');
 
@@ -52,6 +53,27 @@ const enrichedHostIpData: AlertSummaryRow['description'] = {
   values: [...hostIpValues],
 };
 
+const enrichedAgentStatusData: AlertSummaryRow['description'] = {
+  data: {
+    field: AGENT_STATUS_FIELD_NAME,
+    format: '',
+    type: '',
+    aggregatable: false,
+    description: '',
+    example: '',
+    category: '',
+    fields: {},
+    indexes: [],
+    name: AGENT_STATUS_FIELD_NAME,
+    searchable: false,
+    readFromDocValues: false,
+    isObjectArray: false,
+  },
+  eventId,
+  values: [],
+  timelineId: TimelineId.test,
+};
+
 describe('SummaryValueCell', () => {
   test('it should render', async () => {
     render(
@@ -64,8 +86,8 @@ describe('SummaryValueCell', () => {
     expect(screen.getAllByTestId('test-filter-out')).toHaveLength(1);
   });
 
-  describe('When in the timeline flyout with timelineId active', () => {
-    test('it should not render the default hover actions', async () => {
+  describe('Without hover actions', () => {
+    test('When in the timeline flyout with timelineId active', async () => {
       render(
         <TestProviders>
           <SummaryValueCell {...enrichedHostIpData} timelineId={TimelineId.active} />
@@ -75,5 +97,17 @@ describe('SummaryValueCell', () => {
       expect(screen.queryByTestId('test-filter-for')).toBeNull();
       expect(screen.queryByTestId('test-filter-out')).toBeNull();
     });
+
+    test('When rendering the host status field', async () => {
+      render(
+        <TestProviders>
+          <SummaryValueCell {...enrichedAgentStatusData} />
+        </TestProviders>
+      );
+
+      expect(screen.getByTestId('event-field-agent.status')).toBeInTheDocument();
+      expect(screen.queryByTestId('test-filter-for')).toBeNull();
+      expect(screen.queryByTestId('test-filter-out')).toBeNull();
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.tsx
index ad9ca84429f00..1c9c0292ed912 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.tsx
@@ -12,6 +12,10 @@ import { FieldValueCell } from './field_value_cell';
 import { AlertSummaryRow } from '../helpers';
 import { TimelineId } from '../../../../../common/types';
 
+import { AGENT_STATUS_FIELD_NAME } from '../../../../timelines/components/timeline/body/renderers/constants';
+
+const FIELDS_WITHOUT_ACTIONS: { [field: string]: boolean } = { [AGENT_STATUS_FIELD_NAME]: true };
+
 export const SummaryValueCell: React.FC<AlertSummaryRow['description']> = ({
   data,
   eventId,
@@ -33,7 +37,7 @@ export const SummaryValueCell: React.FC<AlertSummaryRow['description']> = ({
       style={{ flexGrow: 0 }}
       values={values}
     />
-    {timelineId !== TimelineId.active && !isReadOnly && (
+    {timelineId !== TimelineId.active && !isReadOnly && !FIELDS_WITHOUT_ACTIONS[data.field] && (
       <ActionCell
         contextId={timelineId}
         data={data}
diff --git a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx
index 7abca14a2e55f..956a4f9da3c99 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.test.tsx
@@ -12,7 +12,7 @@ import { HostsType } from '../../../hosts/store/model';
 import { TestProviders } from '../../mock';
 import { EventsQueryTabBody, EventsQueryTabBodyComponentProps } from './events_query_tab_body';
 import { useGlobalFullScreen } from '../../containers/use_full_screen';
-import * as tGridActions from '../../../../../timelines/public/store/t_grid/actions';
+import * as tGridActions from '@kbn/timelines-plugin/public/store/t_grid/actions';
 
 jest.mock('../../lib/kibana', () => {
   const original = jest.requireActual('../../lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx
index 30b7bd4f53e60..e98c397d41991 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_tab/events_query_tab_body.tsx
@@ -24,7 +24,7 @@ import { DefaultCellRenderer } from '../../../timelines/components/timeline/cell
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_features';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants';
-import { getEventsHistogramLensAttributes } from '../../../common/components/visualization_actions/lens_attributes/hosts/events';
+import { getEventsHistogramLensAttributes } from '../visualization_actions/lens_attributes/hosts/events';
 import { defaultCellActions } from '../../lib/cell_actions/default_cell_actions';
 import { GlobalTimeArgs } from '../../containers/use_global_time';
 import { MatrixHistogramConfigs, MatrixHistogramOption } from '../matrix_histogram/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx
index 9da27bc470a94..124dc4eefb997 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.test.tsx
@@ -15,7 +15,7 @@ import { TestProviders } from '../../mock';
 import { mockEventViewerResponse } from './mock';
 import { StatefulEventsViewer } from '.';
 import { eventsDefaultModel } from './default_model';
-import { EntityType } from '../../../../../timelines/common';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { TimelineId } from '../../../../common/types/timeline';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { DefaultCellRenderer } from '../../../timelines/components/timeline/cell_rendering/default_cell_renderer';
@@ -25,13 +25,13 @@ import { defaultRowRenderers } from '../../../timelines/components/timeline/body
 import { defaultCellActions } from '../../lib/cell_actions/default_cell_actions';
 import { UseFieldBrowserOptionsProps } from '../../../timelines/components/fields_browser';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 jest.mock('../../../timelines/containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
 
-jest.mock('../../components/url_state/normalize_time_range.ts');
+jest.mock('../url_state/normalize_time_range');
 
 const mockUseFieldBrowserOptions = jest.fn();
 jest.mock('../../../timelines/components/fields_browser', () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
index 7dfa75d6daaa2..fa03522f54ef6 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -9,10 +9,12 @@ import React, { useRef, useCallback, useMemo, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import type { Filter } from '@kbn/es-query';
+import type { EntityType } from '@kbn/timelines-plugin/common';
+import { TGridCellAction } from '@kbn/timelines-plugin/common/types';
 import { inputsModel, State } from '../../store';
 import { inputsActions } from '../../store/actions';
 import { ControlColumnProps, RowRenderer, TimelineId } from '../../../../common/types/timeline';
-import { APP_ID, APP_UI_ID } from '../../../../common/constants';
+import { APP_UI_ID } from '../../../../common/constants';
 import { timelineActions } from '../../../timelines/store/timeline';
 import type { SubsetTimelineModel } from '../../../timelines/store/timeline/model';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
@@ -22,11 +24,9 @@ import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_fe
 import { eventsViewerSelector } from './selectors';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useSourcererDataView } from '../../containers/sourcerer';
-import type { EntityType } from '../../../../../timelines/common';
-import { TGridCellAction } from '../../../../../timelines/common/types';
 import { CellValueElementProps } from '../../../timelines/components/timeline/cell_rendering';
 import { FIELDS_WITHOUT_CELL_ACTIONS } from '../../lib/cell_actions/constants';
-import { useGetUserCasesPermissions, useKibana } from '../../lib/kibana';
+import { useKibana } from '../../lib/kibana';
 import { GraphOverlay } from '../../../timelines/components/graph_overlay';
 import {
   useFieldBrowserOptions,
@@ -114,7 +114,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
     } = defaultModel,
   } = useSelector((state: State) => eventsViewerSelector(state, id));
 
-  const { timelines: timelinesUi, cases } = useKibana().services;
+  const { timelines: timelinesUi } = useKibana().services;
   const {
     browserFields,
     dataViewId,
@@ -201,62 +201,58 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
     editorActionsRef,
   });
 
-  const casesPermissions = useGetUserCasesPermissions();
-  const CasesContext = cases.ui.getCasesContext();
   const isLive = input.policy.kind === 'interval';
 
   return (
     <>
-      <CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
-        <FullScreenContainer $isFullScreen={globalFullScreen}>
-          <InspectButtonContainer>
-            {timelinesUi.getTGrid<'embedded'>({
-              additionalFilters,
-              appId: APP_UI_ID,
-              browserFields,
-              bulkActions,
-              columns,
-              dataProviders,
-              dataViewId,
-              defaultCellActions,
-              deletedEventIds,
-              disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
-              docValueFields,
-              end,
-              entityType,
-              fieldBrowserOptions,
-              filters: globalFilters,
-              filterStatus: currentFilter,
-              globalFullScreen,
-              graphEventId,
-              graphOverlay,
-              hasAlertsCrud,
-              id,
-              indexNames: selectedPatterns,
-              indexPattern,
-              isLive,
-              isLoadingIndexPattern,
-              itemsPerPage,
-              itemsPerPageOptions,
-              kqlMode,
-              leadingControlColumns,
-              onRuleChange,
-              query,
-              renderCellValue,
-              rowRenderers,
-              runtimeMappings,
-              setQuery,
-              sort,
-              start,
-              tGridEventRenderedViewEnabled,
-              trailingControlColumns,
-              type: 'embedded',
-              unit,
-            })}
-          </InspectButtonContainer>
-        </FullScreenContainer>
-        {DetailsPanel}
-      </CasesContext>
+      <FullScreenContainer $isFullScreen={globalFullScreen}>
+        <InspectButtonContainer>
+          {timelinesUi.getTGrid<'embedded'>({
+            additionalFilters,
+            appId: APP_UI_ID,
+            browserFields,
+            bulkActions,
+            columns,
+            dataProviders,
+            dataViewId,
+            defaultCellActions,
+            deletedEventIds,
+            disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
+            docValueFields,
+            end,
+            entityType,
+            fieldBrowserOptions,
+            filters: globalFilters,
+            filterStatus: currentFilter,
+            globalFullScreen,
+            graphEventId,
+            graphOverlay,
+            hasAlertsCrud,
+            id,
+            indexNames: selectedPatterns,
+            indexPattern,
+            isLive,
+            isLoadingIndexPattern,
+            itemsPerPage,
+            itemsPerPageOptions,
+            kqlMode,
+            leadingControlColumns,
+            onRuleChange,
+            query,
+            renderCellValue,
+            rowRenderers,
+            runtimeMappings,
+            setQuery,
+            sort,
+            start,
+            tGridEventRenderedViewEnabled,
+            trailingControlColumns,
+            type: 'embedded',
+            unit,
+          })}
+        </InspectButtonContainer>
+      </FullScreenContainer>
+      {DetailsPanel}
     </>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx
index d61501fb08be7..623ab9b282480 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.test.tsx
@@ -12,16 +12,16 @@ import { waitFor } from '@testing-library/react';
 
 import { AddExceptionFlyout } from '.';
 import { useCurrentUser } from '../../../lib/kibana';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 import { useAsync } from '@kbn/securitysolution-hook-utils';
-import { getExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { useFetchIndex } from '../../../containers/source';
-import { stubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
 import * as helpers from '../helpers';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import type { EntriesArray, ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
 import {
@@ -44,7 +44,7 @@ const mockTheme = getMockTheme({
 });
 
 jest.mock('../../../../detections/containers/detection_engine/alerts/use_signal_index');
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 jest.mock('../../../containers/source');
 jest.mock('../../../../detections/containers/detection_engine/rules');
 jest.mock('../use_add_exception');
@@ -54,7 +54,7 @@ jest.mock('@kbn/securitysolution-hook-utils', () => ({
   useAsync: jest.fn(),
 }));
 jest.mock('../../../../detections/containers/detection_engine/rules/use_rule_async');
-jest.mock('../../../../../../lists/public');
+jest.mock('@kbn/lists-plugin/public');
 
 const mockGetExceptionBuilderComponentLazy = getExceptionBuilderComponentLazy as jest.Mock<
   ReturnType<typeof getExceptionBuilderComponentLazy>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx
index 464e966f36349..9e93c4d67aa30 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_flyout/index.tsx
@@ -34,13 +34,13 @@ import type {
   CreateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { ExceptionsBuilderExceptionItem } from '@kbn/securitysolution-list-utils';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 import {
   hasEqlSequenceQuery,
   isEqlRule,
   isThresholdRule,
 } from '../../../../../common/detection_engine/utils';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
 import * as i18nCommon from '../../../translations';
 import * as i18n from './translations';
 import * as sharedI18n from '../translations';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx
index daa4efa9f6874..12d322fd03008 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.test.tsx
@@ -13,10 +13,10 @@ import { mount, ReactWrapper } from 'enzyme';
 import { EditExceptionFlyout } from '.';
 import { useCurrentUser } from '../../../lib/kibana';
 import { useFetchIndex } from '../../../containers/source';
-import { stubIndexPattern, createStubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern, createStubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import type { EntriesArray } from '@kbn/securitysolution-io-ts-list-types';
 import {
   getRulesEqlSchemaMock,
@@ -24,7 +24,7 @@ import {
 } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
 import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import { getMockTheme } from '../../../lib/kibana/kibana_react.mock';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 
 const mockTheme = getMockTheme({
   eui: {
@@ -37,14 +37,14 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 jest.mock('../../../../detections/containers/detection_engine/rules');
 jest.mock('../use_add_exception');
 jest.mock('../../../containers/source');
 jest.mock('../use_fetch_or_create_rule_exception_list');
 jest.mock('../../../../detections/containers/detection_engine/alerts/use_signal_index');
 jest.mock('../../../../detections/containers/detection_engine/rules/use_rule_async');
-jest.mock('../../../../../../lists/public');
+jest.mock('@kbn/lists-plugin/public');
 
 const mockGetExceptionBuilderComponentLazy = getExceptionBuilderComponentLazy as jest.Mock<
   ReturnType<typeof getExceptionBuilderComponentLazy>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx
index 0ed810b4ad263..cfa8b08b901d5 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_flyout/index.tsx
@@ -31,6 +31,7 @@ import type {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
 import {
   hasEqlSequenceQuery,
   isEqlRule,
@@ -39,7 +40,6 @@ import {
 import { useFetchIndex } from '../../../containers/source';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
 import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
-import { getExceptionBuilderComponentLazy } from '../../../../../../lists/public';
 
 import * as i18n from './translations';
 import * as sharedI18n from '../translations';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
index 6c3dba5f2e22b..5c9bf4cda17d7 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { getListMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
 import { ErrorCallout } from './error_callout';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
index 67522cfdc8d58..1964e5238371e 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 
 import type { List } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpSetup } from '../../../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { Rule } from '../../../detections/containers/detection_engine/rules/types';
 import * as i18n from './translations';
 import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json b/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json
index 5c483e83a5ae0..a4babfaaa538f 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/exceptionable_endpoint_fields.json
@@ -117,7 +117,15 @@
   "user.id",
   "Ransomware.feature",
   "Ransomware.files.data",
+  "Ransomware.files.entropy",
+  "Ransomware.files.extension",
+  "Ransomware.files.operation",
+  "Ransomware.files.path",
   "Ransomware.child_processes.files.data",
+  "Ransomware.child_processes.files.entropy",
+  "Ransomware.child_processes.files.extension",
+  "Ransomware.child_processes.files.operation",
+  "Ransomware.child_processes.files.path",
   "Memory_protection.feature",
   "Memory_protection.self_injection",
   "dll.path",
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
index 8f1b31a7e004c..855d855852ddd 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
@@ -37,11 +37,11 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { DataViewBase } from '@kbn/es-query';
 
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntryMatchMock } from '../../../../../lists/common/schemas/types/entry_match.mock';
-import { getCommentsArrayMock } from '../../../../../lists/common/schemas/types/comment.mock';
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
-import { ENTRIES, OLD_DATE_RELATIVE_TO_DATE_NOW } from '../../../../../lists/common/constants.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntryMatchMock } from '@kbn/lists-plugin/common/schemas/types/entry_match.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
+import { fields } from '@kbn/data-plugin/common/mocks';
+import { ENTRIES, OLD_DATE_RELATIVE_TO_DATE_NOW } from '@kbn/lists-plugin/common/constants.mock';
 import { CodeSignature } from '../../../../common/ecs/file';
 import {
   ALERT_ORIGINAL_EVENT_KIND,
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
index 564bb965a8782..f547089077f31 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
@@ -7,16 +7,16 @@
 
 import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaServices } from '../../../common/lib/kibana';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaServices } from '../../lib/kibana';
 
 import * as alertsApi from '../../../detections/containers/detection_engine/alerts/api';
 import * as listsApi from '@kbn/securitysolution-list-api';
 import * as getQueryFilterHelper from '../../../../common/detection_engine/get_query_filter';
 import * as buildFilterHelpers from '../../../detections/components/alerts_table/default_config';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getUpdateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/update_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
 import type {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
@@ -32,7 +32,7 @@ import {
 
 const mockKibanaHttpService = coreMock.createStart().http;
 const mockKibanaServices = KibanaServices.get as jest.Mock;
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 jest.mock('@kbn/securitysolution-list-api');
 
 const fetchMock = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
index 71c49f7c2daad..c740957ab8d77 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
@@ -12,7 +12,7 @@ import type {
   CreateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { useApi } from '@kbn/securitysolution-list-hooks';
-import { HttpStart } from '../../../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 import { updateAlertStatus } from '../../../detections/containers/detection_engine/alerts/api';
 import { getUpdateAlertsQuery } from '../../../detections/components/alerts_table/actions';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
index d96171652d947..dee56966ccc20 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
@@ -7,10 +7,10 @@
 
 import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks';
 
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import * as rulesApi from '../../../detections/containers/detection_engine/rules/api';
 import * as listsApi from '@kbn/securitysolution-list-api';
-import { getExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock';
 import type {
   ExceptionListType,
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
index 4d6464d09ee60..3aef525e26ad6 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
@@ -18,7 +18,7 @@ import {
   addEndpointExceptionList,
 } from '@kbn/securitysolution-list-api';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from '../../../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 import { Rule } from '../../../detections/containers/detection_engine/rules/types';
 import {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx
index 1d5094021c3d3..20c58985344f8 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.test.tsx
@@ -11,8 +11,8 @@ import { mount } from 'enzyme';
 import moment from 'moment-timezone';
 
 import { ExceptionDetails } from './exception_details';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCommentsArrayMock } from '../../../../../../../lists/common/schemas/types/comment.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
 import { getMockTheme } from '../../../../lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx
index 24c22f8ef1ded..30ca4428aa008 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.stories.tsx
@@ -11,9 +11,9 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { euiLightVars } from '@kbn/ui-theme';
 
-import { ExceptionItem } from './';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCommentsArrayMock } from '../../../../../../../lists/common/schemas/types/comment.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
+import { ExceptionItem } from '.';
 
 addDecorator((storyFn) => (
   <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>{storyFn()}</ThemeProvider>
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx
index 983d837267795..e1afc8f44b354 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/index.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
-import { ExceptionItem } from './';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCommentsArrayMock } from '../../../../../../../lists/common/schemas/types/comment.mock';
+import { ExceptionItem } from '.';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCommentsArrayMock } from '@kbn/lists-plugin/common/schemas/types/comment.mock';
 import { getMockTheme } from '../../../../lib/kibana/kibana_react.mock';
 
 jest.mock('../../../../lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx
index 612fab4395b9f..7b65190de1bd7 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exceptions_viewer_items.test.tsx
@@ -10,7 +10,7 @@ import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
 import * as i18n from '../translations';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { ExceptionsViewerItems } from './exceptions_viewer_items';
 import { getMockTheme } from '../../../lib/kibana/kibana_react.mock';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
index 25e260e67855a..aee9ca3d87611 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
@@ -9,11 +9,11 @@ import moment from 'moment-timezone';
 
 import { getFormattedEntries, formatEntry, getDescriptionListContent } from './helpers';
 import { FormattedEntry } from '../types';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntriesArrayMock } from '../../../../../../lists/common/schemas/types/entries.mock';
-import { getEntryMatchMock } from '../../../../../../lists/common/schemas/types/entry_match.mock';
-import { getEntryMatchAnyMock } from '../../../../../../lists/common/schemas/types/entry_match_any.mock';
-import { getEntryExistsMock } from '../../../../../../lists/common/schemas/types/entry_exists.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntriesArrayMock } from '@kbn/lists-plugin/common/schemas/types/entries.mock';
+import { getEntryMatchMock } from '@kbn/lists-plugin/common/schemas/types/entry_match.mock';
+import { getEntryMatchAnyMock } from '@kbn/lists-plugin/common/schemas/types/entry_match_any.mock';
+import { getEntryExistsMock } from '@kbn/lists-plugin/common/schemas/types/entry_exists.mock';
 
 describe('Exception viewer helpers', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx
index 65a0798037cf1..473d494da38be 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.test.tsx
@@ -9,13 +9,13 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { ThemeProvider } from 'styled-components';
 
-import { ExceptionsViewer } from './';
-import { useKibana } from '../../../../common/lib/kibana';
+import { ExceptionsViewer } from '.';
+import { useKibana } from '../../../lib/kibana';
 import { useExceptionListItems, useApi } from '@kbn/securitysolution-list-hooks';
 
 import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
-import { getExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_schema.mock';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { getMockTheme } from '../../../lib/kibana/kibana_react.mock';
 
 const mockTheme = getMockTheme({
@@ -30,7 +30,7 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 jest.mock('@kbn/securitysolution-list-hooks');
 
 describe('ExceptionsViewer', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
index 61e0aee13e923..21c041df34136 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
@@ -18,10 +18,10 @@ import type {
 import { useApi, useExceptionListItems } from '@kbn/securitysolution-list-hooks';
 import * as i18n from '../translations';
 import { useStateToaster } from '../../toasters';
-import { useUserData } from '../../../../../public/detections/components/user_info';
-import { useKibana } from '../../../../common/lib/kibana';
-import { Panel } from '../../../../common/components/panel';
-import { Loader } from '../../../../common/components/loader';
+import { useUserData } from '../../../../detections/components/user_info';
+import { useKibana } from '../../../lib/kibana';
+import { Panel } from '../../panel';
+import { Loader } from '../../loader';
 import { ExceptionsViewerHeader } from './exceptions_viewer_header';
 import { ExceptionListItemIdentifiers, Filter } from '../types';
 import { allExceptionItemsReducer, State, ViewerFlyoutName } from './reducer';
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx
index 5968322ac3539..84843e8be90ed 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/index.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 
 import '../../mock/match_media';
 import { TestProviders } from '../../mock';
-import { HeaderPage } from './index';
+import { HeaderPage } from '.';
 import { useMountAppended } from '../../utils/use_mount_appended';
 import { SecurityPageName } from '../../../app/types';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
index 2296dc78241f2..a03999479e398 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.test.tsx
@@ -10,7 +10,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { HeaderSection } from './index';
+import { HeaderSection } from '.';
 
 describe('HeaderSection', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx
index ab5ad74c0bf15..0051ec412eadb 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/actions/show_top_n.test.tsx
@@ -7,7 +7,7 @@
 import { EuiButtonEmpty, EuiContextMenuItem } from '@elastic/eui';
 import { mount } from 'enzyme';
 import React from 'react';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 import { TestProviders } from '../../../mock';
 import { ShowTopNButton } from './show_top_n';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx
index 02a59b41f2ee9..ca526bf39264f 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/index.tsx
@@ -11,8 +11,8 @@ import { DraggableId } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 
+import { stopPropagationAndPreventDefault } from '@kbn/timelines-plugin/public';
 import { ColumnHeaderOptions, DataProvider, TimelineId } from '../../../../common/types/timeline';
-import { stopPropagationAndPreventDefault } from '../../../../../timelines/public';
 import { SHOW_TOP_N_KEYBOARD_SHORTCUT } from './keyboard_shortcut_constants';
 import { useHoverActionItems } from './use_hover_action_items';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx
index 528519e913f1e..71989f9673907 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_action_items.tsx
@@ -11,6 +11,7 @@ import { DraggableId } from 'react-beautiful-dnd';
 
 import { isEmpty } from 'lodash';
 
+import { FilterManager } from '@kbn/data-plugin/public';
 import { useKibana } from '../../lib/kibana';
 import { getAllFieldsByName } from '../../containers/source';
 import { allowTopN } from '../drag_and_drop/helpers';
@@ -20,7 +21,6 @@ import { SourcererScopeName } from '../../store/sourcerer/model';
 import { useSourcererDataView } from '../../containers/sourcerer';
 import { timelineSelectors } from '../../../timelines/store/timeline';
 import { ShowTopNButton } from './actions/show_top_n';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
 
 export interface UseHoverActionItemsProps {
   dataProvider?: DataProvider | DataProvider[];
diff --git a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx
index 177faf3ac435c..13ade71212a22 100644
--- a/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/hover_actions/use_hover_actions.tsx
@@ -7,8 +7,8 @@
 
 import React, { useCallback, useMemo, useState, useRef, useContext } from 'react';
 import { DraggableProvided, DraggableStateSnapshot } from 'react-beautiful-dnd';
+import { TimelineContext } from '@kbn/timelines-plugin/public';
 import { HoverActions } from '.';
-import { TimelineContext } from '../../../../../timelines/public';
 
 import { DataProvider } from '../../../../common/types';
 import { ProviderContentWrapper } from '../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
index c4ae10b732ad1..642f5b6dcabaa 100644
--- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { ImportDataModalComponent } from './index';
+import { ImportDataModalComponent } from '.';
 jest.mock('../../lib/kibana');
 
 describe('ImportDataModal', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx
index 0e27280cc2c4f..d2cff22a32f89 100644
--- a/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/landing_page/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { LandingPageComponent } from './index';
+import { LandingPageComponent } from '.';
 
 describe('LandingPageComponent component', () => {
   it('renders page properly', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx
index dd50c1c772c57..76163bd335a68 100644
--- a/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/last_event_time/index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import '../../../common/mock/formatted_relative';
+import '../../mock/formatted_relative';
 import { getEmptyValue } from '../empty_value';
 import { LastEventIndexKey } from '../../../../common/search_strategy';
 import { mockLastEventTimeQuery } from '../../containers/events/last_event_time/mock';
diff --git a/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx
index d9b36202e703e..12accb94a7454 100644
--- a/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/link_icon/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { LinkIcon } from './index';
+import { LinkIcon } from '.';
 
 describe('LinkIcon', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx
index 8b0b2cdef72ed..fcf9b44dd8f87 100644
--- a/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/loader/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { Loader } from './index';
+import { Loader } from '.';
 
 describe('rendering', () => {
   test('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx
index 1de9e08b4c65c..a80ad6aa3f0be 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.test.tsx
@@ -18,7 +18,6 @@ import { useRouteSpy } from '../../utils/route/use_route_spy';
 import { useQueryToggle } from '../../containers/query_toggle';
 
 jest.mock('../../containers/query_toggle');
-jest.mock('../../lib/kibana');
 
 jest.mock('./matrix_loader', () => ({
   MatrixLoader: () => <div className="matrixLoader" />,
@@ -40,7 +39,7 @@ jest.mock('../inspect', () => ({
   InspectButton: jest.fn(() => <div data-test-subj="mock-inspect" />),
 }));
 
-jest.mock('../../components/matrix_histogram/utils', () => ({
+jest.mock('./utils', () => ({
   getBarchartConfigs: jest.fn(),
   getCustomChartData: jest.fn().mockReturnValue(true),
 }));
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
index 7626abd6af08d..83fbf6e61b08e 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
@@ -18,21 +18,22 @@ import { MatrixLoader } from './matrix_loader';
 import { Panel } from '../panel';
 import { getBarchartConfigs, getCustomChartData } from './utils';
 import { useMatrixHistogramCombined } from '../../containers/matrix_histogram';
-import { MatrixHistogramProps, MatrixHistogramOption, MatrixHistogramQueryProps } from './types';
-import { MatrixHistogramType } from '../../../../common/search_strategy/security_solution';
 import {
+  MatrixHistogramProps,
+  MatrixHistogramOption,
+  MatrixHistogramQueryProps,
   MatrixHistogramMappingTypes,
   GetTitle,
   GetSubTitle,
-} from '../../components/matrix_histogram/types';
+} from './types';
+import { MatrixHistogramType } from '../../../../common/search_strategy/security_solution';
 import { GlobalTimeArgs } from '../../containers/use_global_time';
 import { setAbsoluteRangeDatePicker } from '../../store/inputs/actions';
 import { InputsModelId } from '../../store/inputs/constants';
 import { HoverVisibilityContainer } from '../hover_visibility_container';
 import { HISTOGRAM_ACTIONS_BUTTON_CLASS, VisualizationActions } from '../visualization_actions';
 import { GetLensAttributes, LensAttributes } from '../visualization_actions/types';
-import { useKibana, useGetUserCasesPermissions } from '../../lib/kibana';
-import { APP_ID, SecurityPageName } from '../../../../common/constants';
+import { SecurityPageName } from '../../../../common/constants';
 import { useRouteSpy } from '../../utils/route/use_route_spy';
 import { useQueryToggle } from '../../containers/query_toggle';
 
@@ -104,10 +105,6 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
   skip,
 }) => {
   const dispatch = useDispatch();
-  const { cases } = useKibana().services;
-  const CasesContext = cases.ui.getCasesContext();
-  const userPermissions = useGetUserCasesPermissions();
-  const userCanCrud = userPermissions?.crud ?? false;
 
   const handleBrushEnd = useCallback(
     ({ x }) => {
@@ -267,18 +264,16 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
             <EuiFlexGroup alignItems="center" gutterSize="none">
               {onHostOrNetworkOrUserPage && (getLensAttributes || lensAttributes) && timerange && (
                 <EuiFlexItem grow={false}>
-                  <CasesContext owner={[APP_ID]} userCanCrud={userCanCrud ?? false}>
-                    <VisualizationActions
-                      className="histogram-viz-actions"
-                      getLensAttributes={getLensAttributes}
-                      isInspectButtonDisabled={filterQuery === undefined}
-                      lensAttributes={lensAttributes}
-                      queryId={id}
-                      stackByField={selectedStackByOption.value}
-                      timerange={timerange}
-                      title={title}
-                    />
-                  </CasesContext>
+                  <VisualizationActions
+                    className="histogram-viz-actions"
+                    getLensAttributes={getLensAttributes}
+                    isInspectButtonDisabled={filterQuery === undefined}
+                    lensAttributes={lensAttributes}
+                    queryId={id}
+                    stackByField={selectedStackByOption.value}
+                    timerange={timerange}
+                    title={title}
+                  />
                 </EuiFlexItem>
               )}
               <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts
index 1c617d36b828f..e35d4cc8293d2 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CombinedJobWithStats } from '../../../../../../ml/common/types/anomaly_detection_jobs';
-import { HttpSetup } from '../../../../../../../../src/core/public';
+import { CombinedJobWithStats } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { HttpSetup } from '@kbn/core/public';
 
 export interface GetJobsArgs {
   http: HttpSetup;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts
index aeaba20a187bc..41d2248f261f5 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/api/get_jobs_summary.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../../../src/core/public';
-import { MlSummaryJob } from '../../../../../../ml/public';
+import { HttpSetup } from '@kbn/core/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 
 export interface GetJobsSummaryArgs {
   http: HttpSetup;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts b/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts
index b9cc1ecc731b3..f0a45d1cd6840 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/api/get_ml_capabilities.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../../../src/core/public';
-import { MlCapabilitiesResponse } from '../../../../../../ml/public';
+import { HttpSetup } from '@kbn/core/public';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/public';
 import { InfluencerInput } from '../types';
 
 export interface Body {
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx
index f92512cec5c72..7dcaa1de58d10 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx
@@ -10,11 +10,11 @@ import React from 'react';
 
 import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
 
+import { url as urlUtils } from '@kbn/kibana-utils-plugin/public';
 import { addEntitiesToKql } from './add_entities_to_kql';
 import { replaceKQLParts } from './replace_kql_parts';
 import { emptyEntity, multipleEntities, getMultipleEntities } from './entity_helpers';
 import { HostsTableType } from '../../../../hosts/store/model';
-import { url as urlUtils } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { HOSTS_PATH } from '../../../../../common/constants';
 interface QueryStringType {
   '?_g': string;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx
index a144898b4d95c..a8dcf18702b97 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx
@@ -9,11 +9,11 @@ import { parse, stringify } from 'query-string';
 import React from 'react';
 
 import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
+import { url as urlUtils } from '@kbn/kibana-utils-plugin/public';
 import { addEntitiesToKql } from './add_entities_to_kql';
 import { replaceKQLParts } from './replace_kql_parts';
 import { emptyEntity, getMultipleEntities, multipleEntities } from './entity_helpers';
 
-import { url as urlUtils } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { NETWORK_PATH } from '../../../../../common/constants';
 interface QueryStringType {
   '?_g': string;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx
index 587d518bc11f0..5f093db3f69bb 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.test.tsx
@@ -13,7 +13,7 @@ import { EntityDraggableComponent } from './entity_draggable';
 import { TestProviders } from '../../mock/test_providers';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts
index 73eee942ccd46..4f7c48b101725 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_get_jobs.ts
@@ -7,8 +7,8 @@
 
 import { useEffect, useState } from 'react';
 import { useAsync, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
+import { CombinedJobWithStats } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { getJobs } from '../api/get_jobs';
-import { CombinedJobWithStats } from '../../../../../../ml/common/types/anomaly_detection_jobs';
 
 import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions';
 import { hasMlLicense } from '../../../../../common/machine_learning/has_ml_license';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
index 7bdad2514c82e..5bec2ce09e22a 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
@@ -7,7 +7,7 @@
 
 import { useEffect, useState } from 'react';
 
-import { MlSummaryJob } from '../../../../../../ml/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions';
 import { hasMlLicense } from '../../../../../common/machine_learning/has_ml_license';
 import { isSecurityJob } from '../../../../../common/machine_learning/is_security_job';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx
index a0eaa79440859..0e622d0d4fa40 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.test.tsx
@@ -10,9 +10,9 @@ import { render, act } from '@testing-library/react';
 import { mockAnomalies } from '../mock';
 import { cloneDeep } from 'lodash/fp';
 import { ExplorerLink } from './create_explorer_link';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public/context';
-import { MlLocatorDefinition } from '../../../../../../ml/public/locator';
-import { MockUrlService } from '../../../../../../../../src/plugins/share/common/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public/context';
+import { MlLocatorDefinition } from '@kbn/ml-plugin/public/locator';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
 
 describe('create_explorer_link', () => {
   let anomalies = cloneDeep(mockAnomalies);
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx
index b5bffb623581d..4d5845845596b 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/links/create_explorer_link.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { EuiLink } from '@elastic/eui';
+import { useMlHref } from '@kbn/ml-plugin/public';
 import { Anomaly } from '../types';
 import { useKibana } from '../../../lib/kibana';
-import { useMlHref } from '../../../../../../ml/public';
 
 interface ExplorerLinkProps {
   score: Anomaly;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx
index f24a8fafe1be2..a1e27cbb14414 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/permissions/ml_capabilities_provider.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState, useEffect } from 'react';
 
-import { MlCapabilitiesResponse } from '../../../../../../ml/public';
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/public';
 import { emptyMlCapabilities } from '../../../../../common/machine_learning/empty_ml_capabilities';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { useHttp } from '../../../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx
index b760b8b2e04dd..045f96cfe8963 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/create_description_list.tsx
@@ -13,7 +13,7 @@ import { DescriptionList } from '../../../../../common/utility_types';
 import { Anomaly, NarrowDateRange } from '../types';
 import { getScoreString } from './score_health';
 import { PreferenceFormattedDate } from '../../formatted_date';
-import { createInfluencers } from './../influencers/create_influencers';
+import { createInfluencers } from '../influencers/create_influencers';
 import * as i18n from './translations';
 import { ExplorerLink } from '../links/create_explorer_link';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx
index 96917bb8ed739..c1628961a832b 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx
@@ -10,7 +10,7 @@ import { getAnomaliesNetworkTableColumnsCurated } from './get_anomalies_network_
 import { NetworkType } from '../../../../network/store/model';
 import * as i18n from './translations';
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 
 const startDate = new Date(2001).toISOString();
 const endDate = new Date(3000).toISOString();
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx
index 3df8d545d2871..068128544f7e6 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/tables/get_anomalies_table_columns.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../../mock';
 import { useMountAppended } from '../../../utils/use_mount_appended';
 import { getAnomaliesDefaultTableColumns } from './get_anomalies_table_columns';
 
-jest.mock('../../../../common/lib/kibana');
+jest.mock('../../../lib/kibana');
 
 const startDate = new Date(2001).toISOString();
 const endDate = new Date(3000).toISOString();
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/types.ts b/x-pack/plugins/security_solution/public/common/components/ml/types.ts
index c5be26fb57648..01889e6bb5bd8 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Influencer } from '../../../../../ml/public';
+import { Influencer } from '@kbn/ml-plugin/public';
 import { FlowTarget } from '../../../../common/search_strategy';
 
 import { HostsType } from '../../../hosts/store/model';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts b/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts
index 6c960cfeab4cb..12bf4b1e824e3 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/api.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MlSummaryJob } from '../../../../../ml/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import {
   Group,
   Module,
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx
index 666e6bacc15fc..d2d7e198d47f3 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs_helpers.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import {
   AugmentedSecurityJobFields,
   Module,
@@ -13,7 +14,6 @@ import {
   SecurityJob,
 } from '../types';
 import { mlModules } from '../ml_modules';
-import { MlSummaryJob } from '../../../../../../ml/public';
 
 /**
  * Helper function for converting from ModuleJob -> SecurityJob
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
index 2d03c73d0c5dc..842b199e4b7aa 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/jobs_table/jobs_table.tsx
@@ -21,11 +21,11 @@ import {
 } from '@elastic/eui';
 
 import styled from 'styled-components';
+import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
 import { useBasePath, useKibana } from '../../../lib/kibana';
 import * as i18n from './translations';
 import { JobSwitch } from './job_switch';
 import { SecurityJob } from '../types';
-import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
 
 const JobNameWrapper = styled.div`
   margin: 5px 0;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx b/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx
index f24b1e5e6c010..4d7ec7b484818 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/ml_popover.tsx
@@ -17,6 +17,7 @@ import moment from 'moment';
 import React, { Dispatch, useCallback, useReducer, useState, useMemo } from 'react';
 import styled from 'styled-components';
 
+import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
 import { useKibana } from '../../lib/kibana';
 import { METRIC_TYPE, TELEMETRY_EVENT, track } from '../../lib/telemetry';
 import { errorToToaster, useStateToaster, ActionToaster } from '../toasters';
@@ -30,7 +31,6 @@ import * as i18n from './translations';
 import { JobsFilters, SecurityJob } from './types';
 import { UpgradeContents } from './upgrade_contents';
 import { useSecurityJobs } from './hooks/use_security_jobs';
-import { MLJobsAwaitingNodeWarning } from '../../../../../ml/public';
 
 const PopoverContentsDiv = styled.div`
   max-width: 684px;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts b/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
index e85419940bbd6..64fe2b7e1fe81 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import { MlError } from '../ml/types';
-import { MlSummaryJob } from '../../../../../ml/public';
 
 export interface Group {
   id: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
index fead76ff1b2eb..5020e910dfaa6 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/breadcrumbs/index.ts
@@ -8,7 +8,7 @@
 import { getOr, omit } from 'lodash/fp';
 
 import { useDispatch } from 'react-redux';
-import { ChromeBreadcrumb } from '../../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { APP_NAME, APP_UI_ID } from '../../../../../common/constants';
 import { StartServices } from '../../../../types';
 import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../../hosts/pages/details/utils';
@@ -27,7 +27,7 @@ import {
   UsersRouteSpyState,
 } from '../../../utils/route/types';
 import { getAppLandingUrl } from '../../link_to/redirect_to_landing';
-import { timelineActions } from '../../../../../public/timelines/store/timeline';
+import { timelineActions } from '../../../../timelines/store/timeline';
 import { TimelineId } from '../../../../../common/types/timeline';
 import { TabNavigationProps } from '../tab_navigation/types';
 import { getSearch } from '../helpers';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx
index 393a3d3e0aaba..d14c8a51a66ee 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/index.test.tsx
@@ -9,7 +9,7 @@ import { mount } from 'enzyme';
 import React from 'react';
 
 import { CONSTANTS } from '../url_state/constants';
-import { TabNavigationComponent } from './';
+import { TabNavigationComponent } from '.';
 import { navTabs } from '../../../app/home/home_navigations';
 import { HostsTableType } from '../../../hosts/store/model';
 import { RouteSpyState } from '../../utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx
index d90709f69ee03..b71da7cbdd6ff 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.test.tsx
@@ -13,12 +13,12 @@ import { navTabsHostDetails } from '../../../../hosts/pages/details/nav_tabs';
 import { HostsTableType } from '../../../../hosts/store/model';
 import { RouteSpyState } from '../../../utils/route/types';
 import { CONSTANTS } from '../../url_state/constants';
-import { TabNavigationComponent } from './';
+import { TabNavigationComponent } from '.';
 import { TabNavigationProps } from './types';
 
 jest.mock('../../link_to');
 jest.mock('../../../lib/kibana/kibana_react', () => {
-  const originalModule = jest.requireActual('../../../../common/lib/kibana/kibana_react');
+  const originalModule = jest.requireActual('../../../lib/kibana/kibana_react');
   return {
     ...originalModule,
     useKibana: jest.fn().mockReturnValue({
@@ -126,4 +126,22 @@ describe('Table Navigation', () => {
       `/app/securitySolutionUI/hosts/siem-window/authentications${SEARCH_QUERY}`
     );
   });
+
+  test('it renders a EuiBetaBadge only on the sessions tab', () => {
+    Object.keys(HostsTableType).forEach((tableType) => {
+      if (tableType !== HostsTableType.sessions) {
+        const wrapper = mount(<TabNavigationComponent {...mockProps} />);
+
+        const betaBadge = wrapper.find(
+          `EuiTab[data-test-subj="navigation-${tableType}"] EuiBetaBadge`
+        );
+
+        if (tableType === HostsTableType.sessions) {
+          expect(betaBadge).toBeTruthy();
+        } else {
+          expect(betaBadge).toEqual({});
+        }
+      }
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.tsx
index 4d9a8a704dde5..03437bab93f38 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiTab, EuiTabs } from '@elastic/eui';
+import { EuiTab, EuiTabs, EuiBetaBadge } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -14,6 +14,7 @@ import deepEqual from 'fast-deep-equal';
 import { useNavigation } from '../../../lib/kibana';
 import { track, METRIC_TYPE, TELEMETRY_EVENT } from '../../../lib/telemetry';
 import { TabNavigationProps, TabNavigationItemProps } from './types';
+import { BETA } from '../../../translations';
 
 const TabNavigationItemComponent = ({
   disabled,
@@ -21,6 +22,7 @@ const TabNavigationItemComponent = ({
   id,
   name,
   isSelected,
+  isBeta,
 }: TabNavigationItemProps) => {
   const { getAppUrl, navigateTo } = useNavigation();
 
@@ -45,6 +47,7 @@ const TabNavigationItemComponent = ({
       isSelected={isSelected}
       href={appHref}
       onClick={handleClick}
+      append={isBeta && <EuiBetaBadge label={BETA} size="s" />}
     >
       {name}
     </EuiTab>
@@ -92,6 +95,7 @@ export const TabNavigationComponent: React.FC<TabNavigationProps> = ({
             name={tab.name}
             disabled={tab.disabled}
             isSelected={isSelected}
+            isBeta={tab.isBeta}
           />
         );
       }),
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/types.ts b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/types.ts
index 75f18abf75559..5630978bae87a 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/tab_navigation/types.ts
@@ -32,4 +32,5 @@ export interface TabNavigationItemProps {
   disabled: boolean;
   name: string;
   isSelected: boolean;
+  isBeta?: boolean;
 }
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/types.ts b/x-pack/plugins/security_solution/public/common/components/navigation/types.ts
index b1903ef869d3d..1cb8a918ea481 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/types.ts
@@ -38,6 +38,7 @@ export interface NavTab {
   disabled: boolean;
   urlKey?: UrlStateType;
   pageId?: SecurityPageName;
+  isBeta?: boolean;
 }
 
 export type SecurityNavKey =
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
index c76ba7a43cb30..3f30facd5e41e 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { KibanaPageTemplateProps } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../../../lib/kibana/kibana_react';
 import { useGetUserCasesPermissions } from '../../../lib/kibana';
 import { SecurityPageName } from '../../../../app/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
index c1abcc1177c80..da03e6cf35e21 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
@@ -8,9 +8,9 @@
 import { useEffect, useState, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { PrimaryNavigationProps } from './types';
 import { usePrimaryNavigationItems } from './use_navigation_items';
-import { KibanaPageTemplateProps } from '../../../../../../../../src/plugins/kibana_react/public';
 
 const translatedNavTitle = i18n.translate('xpack.securitySolution.navigation.mainLabel', {
   defaultMessage: 'Security',
diff --git a/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx b/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx
index 606991bc08910..b2d442b963cb0 100644
--- a/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/overview_description_list/index.tsx
@@ -9,7 +9,7 @@ import { EuiFlexItem } from '@elastic/eui';
 import React from 'react';
 
 import { DescriptionList } from '../../../../common/utility_types';
-import { DescriptionListStyled } from '../../../common/components/page';
+import { DescriptionListStyled } from '../page';
 
 export const OverviewDescriptionList = ({
   dataTestSubj,
diff --git a/x-pack/plugins/security_solution/public/common/components/page/index.tsx b/x-pack/plugins/security_solution/public/common/components/page/index.tsx
index c85e7b9f36ac1..ff03eae0c3b9f 100644
--- a/x-pack/plugins/security_solution/public/common/components/page/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page/index.tsx
@@ -75,17 +75,17 @@ export const AppGlobalStyle = createGlobalStyle<{ theme: { eui: { euiColorPrimar
 
     .euiPopoverFooter {
       border: 0;
+      margin-top: 0 !important;
       .euiFlexGroup {
         flex-direction: column;
+      }
+    }
 
-        .euiButtonEmpty .euiButtonContent {
-          justify-content: left;
-        }
-
-        .euiFlexItem:first-child,
-        .euiFlexItem:nth-child(2) {
-            display: none;
-        }
+    // Hide EUI's 'Filter in' and 'Filter out' footer buttons - replaced with our own buttons
+    .euiPopoverFooter:nth-child(2) {
+      .euiFlexItem:first-child,
+      .euiFlexItem:nth-child(2) {
+          display: none;
       }
     }
   }
diff --git a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx
index f6ebf2a90abb4..687370cdc8018 100644
--- a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { SecuritySolutionPageWrapper } from './index';
+import { SecuritySolutionPageWrapper } from '.';
 
 describe('SecuritySolutionPageWrapper', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx
index 82e0ded264b06..94ac38d312d21 100644
--- a/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/page_wrapper/index.tsx
@@ -12,7 +12,7 @@ import { CommonProps } from '@elastic/eui';
 
 import { useGlobalFullScreen } from '../../containers/use_full_screen';
 import { gutterTimeline } from '../../lib/helpers';
-import { AppGlobalStyle } from '../page/index';
+import { AppGlobalStyle } from '../page';
 
 const Wrapper = styled.div`
   &.securitySolutionWrapper--fullHeight {
diff --git a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx
index 2d728ffa915fc..5a247fa30d92f 100644
--- a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.mock.tsx
@@ -7,7 +7,7 @@
 
 import { getOrEmptyTagFromValue } from '../empty_value';
 
-import { Columns, ItemsPerRow } from './index';
+import { Columns, ItemsPerRow } from '.';
 
 export const mockData = {
   Hosts: {
diff --git a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx
index 57686126dfb10..2ca85d4a3ccb9 100644
--- a/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/paginated_table/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants';
 
-import { BasicTableProps, PaginatedTable } from './index';
+import { BasicTableProps, PaginatedTable } from '.';
 import { getHostsColumns, mockData, rowItems, sortedHosts } from './index.mock';
 import { ThemeProvider } from 'styled-components';
 import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
diff --git a/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx
index 506cdf5be99a7..61fe1226b7e5d 100644
--- a/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/progress_inline/index.test.tsx
@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { ProgressInline } from './index';
+import { ProgressInline } from '.';
 
 describe('ProgressInline', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
index 63e90848483c0..f3f9d8dde9c57 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
@@ -8,11 +8,11 @@
 import { mount } from 'enzyme';
 import React from 'react';
 import { render, waitFor } from '@testing-library/react';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants';
 import { TestProviders, mockIndexPattern } from '../../mock';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
-import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
 import { QueryBar, QueryBarComponentProps } from '.';
 
 const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
index 2632930782910..15fd5927b7f75 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
@@ -15,10 +15,10 @@ import {
   TimeRange,
   SavedQuery,
   SavedQueryTimeFilter,
-} from '../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 export interface QueryBarComponentProps {
   dataTestSubj?: string;
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
index 9d24114688e7d..bcf340427620a 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
@@ -10,8 +10,8 @@ import { render, fireEvent } from '@testing-library/react';
 import { InputsModelId } from '../../store/inputs/constants';
 import { SearchBarComponent } from '.';
 import { TestProviders } from '../../mock';
-import { FilterManager } from '../../../../../../../src/plugins/data/public';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { FilterManager } from '@kbn/data-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const mockFilterManager = new FilterManager(coreMock.createStart().uiSettings);
 jest.mock('../../lib/kibana', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
index d5624421c0006..d1d5c2fcebc12 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
@@ -8,15 +8,15 @@
 import { set } from '@elastic/safer-lodash-set/fp';
 import { getOr } from 'lodash/fp';
 import React, { memo, useEffect, useCallback, useMemo } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
+import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 import { Subscription } from 'rxjs';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import type { FilterManager, TimeRange, SavedQuery } from 'src/plugins/data/public';
-import type { DataView } from 'src/plugins/data_views/public';
+import type { FilterManager, TimeRange, SavedQuery } from '@kbn/data-plugin/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import { OnTimeChangeProps } from '@elastic/eui';
 
@@ -35,10 +35,11 @@ import {
   startSelector,
   toStrSelector,
 } from './selectors';
-import { hostsActions } from '../../../hosts/store';
-import { networkActions } from '../../../network/store';
 import { timelineActions } from '../../../timelines/store/timeline';
 import { useKibana } from '../../lib/kibana';
+import { usersActions } from '../../../users/store';
+import { hostsActions } from '../../../hosts/store';
+import { networkActions } from '../../../network/store';
 
 const APP_STATE_STORAGE_KEY = 'securitySolution.searchBar.appState';
 
@@ -91,16 +92,25 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
       },
     } = useKibana().services;
 
+    const dispatch = useDispatch();
+    const setTablesActivePageToZero = useCallback(() => {
+      dispatch(usersActions.setUsersTablesActivePageToZero());
+      dispatch(hostsActions.setHostTablesActivePageToZero());
+      dispatch(networkActions.setNetworkTablesActivePageToZero());
+    }, [dispatch]);
+
     useEffect(() => {
       if (fromStr != null && toStr != null) {
         timefilter.setTime({ from: fromStr, to: toStr });
       } else if (start != null && end != null) {
+        setTablesActivePageToZero();
+
         timefilter.setTime({
           from: new Date(start).toISOString(),
           to: new Date(end).toISOString(),
         });
       }
-    }, [end, fromStr, start, timefilter, toStr]);
+    }, [end, fromStr, start, timefilter, toStr, setTablesActivePageToZero]);
 
     const onQuerySubmit = useCallback(
       (payload: { dateRange: TimeRange; query?: Query }) => {
@@ -119,6 +129,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           isQuickSelection,
           updateTime: false,
           filterManager,
+          setTablesActivePageToZero,
         };
         let isStateUpdated = false;
 
@@ -164,6 +175,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
         filterQuery,
         queries,
         updateSearch,
+        setTablesActivePageToZero,
       ]
     );
 
@@ -178,12 +190,13 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
             isQuickSelection: true,
             updateTime: true,
             filterManager,
+            setTablesActivePageToZero,
           });
         } else {
           queries.forEach((q) => q.refetch && (q.refetch as inputsModel.Refetch)());
         }
       },
-      [updateSearch, id, filterManager, queries]
+      [updateSearch, id, filterManager, queries, setTablesActivePageToZero]
     );
 
     const onSaved = useCallback(
@@ -209,6 +222,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           isQuickSelection,
           updateTime: false,
           filterManager,
+          setTablesActivePageToZero,
         };
 
         if (savedQueryUpdated.attributes.timefilter) {
@@ -226,7 +240,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
 
         updateSearch(updateSearchBar);
       },
-      [id, toStr, end, fromStr, start, filterManager, updateSearch]
+      [id, toStr, end, fromStr, start, filterManager, updateSearch, setTablesActivePageToZero]
     );
 
     const onClearSavedQuery = useCallback(() => {
@@ -246,9 +260,20 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           resetSavedQuery: true,
           savedQuery: undefined,
           filterManager,
+          setTablesActivePageToZero,
         });
       }
-    }, [savedQuery, updateSearch, id, toStr, end, fromStr, start, filterManager]);
+    }, [
+      savedQuery,
+      updateSearch,
+      id,
+      toStr,
+      end,
+      fromStr,
+      start,
+      filterManager,
+      setTablesActivePageToZero,
+    ]);
 
     const saveAppStateToStorage = useCallback(
       (filters: Filter[]) => storage.set(APP_STATE_STORAGE_KEY, filters),
@@ -273,6 +298,8 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
                 id,
                 filters: filterManager.getFilters(),
               });
+
+              setTablesActivePageToZero();
             }
           },
         })
@@ -369,6 +396,7 @@ interface UpdateReduxSearchBar extends OnTimeChangeProps {
   resetSavedQuery?: boolean;
   timelineId?: string;
   updateTime: boolean;
+  setTablesActivePageToZero: () => void;
 }
 
 export const dispatchUpdateSearch =
@@ -385,6 +413,7 @@ export const dispatchUpdateSearch =
     timelineId,
     filterManager,
     updateTime = false,
+    setTablesActivePageToZero,
   }: UpdateReduxSearchBar): void => {
     if (updateTime) {
       const fromDate = formatDate(start);
@@ -446,8 +475,7 @@ export const dispatchUpdateSearch =
       dispatch(inputsActions.setSavedQuery({ id, savedQuery }));
     }
 
-    dispatch(hostsActions.setHostTablesActivePageToZero());
-    dispatch(networkActions.setNetworkTablesActivePageToZero());
+    setTablesActivePageToZero();
   };
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts b/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts
index 3e4f7acd1ee85..c84b319d5609b 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/selectors.ts
@@ -7,8 +7,8 @@
 
 import { createSelector } from 'reselect';
 import type { Query } from '@kbn/es-query';
+import type { SavedQuery } from '@kbn/data-plugin/public';
 import { InputsRange } from '../../store/inputs/model';
-import type { SavedQuery } from '../../../../../../../src/plugins/data/public';
 
 export {
   endSelector,
diff --git a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx
index eb1b75b81a94b..043a2aa378427 100644
--- a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/index.test.tsx
@@ -9,13 +9,13 @@ import React, { useEffect } from 'react';
 import { waitFor, render } from '@testing-library/react';
 import { TestProviders } from '../../mock';
 import { TEST_ID, SessionsView, defaultSessionsFilter } from '.';
-import { EntityType, TimelineId } from '../../../../../timelines/common';
+import { EntityType, TimelineId } from '@kbn/timelines-plugin/common';
 import { SessionsComponentsProps } from './types';
 import { TimelineModel } from '../../../timelines/store/timeline/model';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
-jest.mock('../../components/url_state/normalize_time_range.ts');
+jest.mock('../url_state/normalize_time_range');
 
 const startDate = '2022-03-22T22:10:56.794Z';
 const endDate = '2022-03-21T22:10:56.791Z';
@@ -62,8 +62,8 @@ const SessionsViewerTGrid: React.FC<Props> = ({ columns, start, end, id, filters
   );
 };
 
-jest.mock('../../../../../timelines/public/mock/plugin_mock.tsx', () => {
-  const originalModule = jest.requireActual('../../../../../timelines/public/mock/plugin_mock.tsx');
+jest.mock('@kbn/timelines-plugin/public/mock/plugin_mock', () => {
+  const originalModule = jest.requireActual('@kbn/timelines-plugin/public/mock/plugin_mock');
   return {
     ...originalModule,
     createTGridMocks: () => ({
diff --git a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts
index 3c1a73a3292b3..b7ea5fc39a1bc 100644
--- a/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/sessions_viewer/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { Filter } from '@kbn/es-query';
-import type { EntityType } from '../../../../../timelines/common';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { QueryTabBodyProps } from '../../../hosts/pages/navigation/types';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
index 05b24600ff9af..1be29dae13449 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
@@ -10,7 +10,7 @@ import { mount, ReactWrapper } from 'enzyme';
 import { cloneDeep } from 'lodash';
 
 import { initialSourcererState, SourcererScopeName } from '../../store/sourcerer/model';
-import { Sourcerer } from './index';
+import { Sourcerer } from '.';
 import { sourcererActions, sourcererModel } from '../../store/sourcerer';
 import {
   createSecuritySolutionStorageMock,
@@ -43,8 +43,8 @@ jest.mock('react-redux', () => {
   };
 });
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
@@ -1000,6 +1000,14 @@ describe('Update available', () => {
     expect(wrapper.find(`[data-test-subj="sourcerer-deprecated-callout"]`).first().text()).toEqual(
       'This timeline uses a legacy data view selector'
     );
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-current-patterns-message"]`).first().text()
+    ).toEqual('The active index patterns in this timeline are: myFakebeat-*');
+
+    expect(wrapper.find(`[data-test-subj="sourcerer-deprecated-message"]`).first().text()).toEqual(
+      "We have preserved your timeline by creating a temporary data view. If you'd like to modify your data, we can recreate your temporary data view with the new data view selector. You can also manually select a data view here."
+    );
   });
 
   test('Show Add index pattern in UpdateDefaultDataViewModal', () => {
@@ -1103,6 +1111,10 @@ describe('Update available for timeline template', () => {
     expect(wrapper.find(`[data-test-subj="sourcerer-deprecated-callout"]`).first().text()).toEqual(
       'This timeline template uses a legacy data view selector'
     );
+
+    expect(wrapper.find(`[data-test-subj="sourcerer-deprecated-message"]`).first().text()).toEqual(
+      "We have preserved your timeline template by creating a temporary data view. If you'd like to modify your data, we can recreate your temporary data view with the new data view selector. You can also manually select a data view here."
+    );
   });
 });
 
@@ -1179,6 +1191,20 @@ describe('Missing index patterns', () => {
     expect(wrapper.find(`[data-test-subj="sourcerer-deprecated-callout"]`).first().text()).toEqual(
       'This timeline is out of date with the Security Data View'
     );
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-current-patterns-message"]`).first().text()
+    ).toEqual('The active index patterns in this timeline are: myFakebeat-*');
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-missing-patterns-callout"]`).first().text()
+    ).toEqual('Security Data View is missing the following index patterns: myFakebeat-*');
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-missing-patterns-message"]`).first().text()
+    ).toEqual(
+      "We have preserved your timeline by creating a temporary data view. If you'd like to modify your data, we can add the missing index patterns to the Security Data View. You can also manually select a data view here."
+    );
   });
 
   test('Show UpdateDefaultDataViewModal CallOut for timeline template', () => {
@@ -1201,5 +1227,19 @@ describe('Missing index patterns', () => {
     expect(wrapper.find(`[data-test-subj="sourcerer-deprecated-callout"]`).first().text()).toEqual(
       'This timeline template is out of date with the Security Data View'
     );
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-current-patterns-message"]`).first().text()
+    ).toEqual('The active index patterns in this timeline template are: myFakebeat-*');
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-missing-patterns-callout"]`).first().text()
+    ).toEqual('Security Data View is missing the following index patterns: myFakebeat-*');
+
+    expect(
+      wrapper.find(`[data-test-subj="sourcerer-missing-patterns-message"]`).first().text()
+    ).toEqual(
+      "We have preserved your timeline template by creating a temporary data view. If you'd like to modify your data, we can add the missing index patterns to the Security Data View. You can also manually select a data view here."
+    );
   });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/temporary.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/temporary.tsx
index 156d08df79d06..e4cfaea78b48d 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/temporary.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/temporary.tsx
@@ -8,7 +8,6 @@
 import { FormattedMessage } from '@kbn/i18n-react';
 import {
   EuiCallOut,
-  EuiLink,
   EuiText,
   EuiTextColor,
   EuiSpacer,
@@ -16,7 +15,6 @@ import {
   EuiFlexItem,
   EuiButton,
   EuiToolTip,
-  EuiIcon,
 } from '@elastic/eui';
 import React, { useMemo } from 'react';
 import * as i18n from './translations';
@@ -26,6 +24,12 @@ import { TimelineId, TimelineType } from '../../../../common/types';
 import { timelineSelectors } from '../../../timelines/store/timeline';
 import { useDeepEqualSelector } from '../../hooks/use_selector';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
+import {
+  BadCurrentPatternsMessage,
+  CurrentPatternsMessage,
+  DeprecatedMessage,
+  MissingPatternsMessage,
+} from './utils';
 
 interface Props {
   activePatterns?: string[];
@@ -116,66 +120,33 @@ export const TemporarySourcererComp = React.memo<Props>(
           <EuiTextColor color="subdued">
             <p>
               {activePatterns && activePatterns.length > 0 ? (
-                <FormattedMessage
-                  id="xpack.securitySolution.indexPatterns.currentPatterns"
-                  defaultMessage="The active index patterns in this timeline are{tooltip}: {callout}"
-                  values={{
-                    tooltip:
-                      deadPatterns.length > 0 ? (
-                        <EuiToolTip
-                          content={
-                            <FormattedMessage
-                              id="xpack.securitySolution.indexPatterns.noMatchData"
-                              defaultMessage="The following index patterns are saved to this timeline but do not match any data streams, indices, or index aliases: {aliases}"
-                              values={{
-                                aliases: selectedPatterns
-                                  .filter((p) => !activePatterns.includes(p))
-                                  .join(', '),
-                              }}
-                            />
-                          }
-                        >
-                          <EuiIcon type="questionInCircle" title={i18n.INACTIVE_PATTERNS} />
-                        </EuiToolTip>
-                      ) : null,
-                    callout: <Blockquote>{activePatterns.join(', ')}</Blockquote>,
-                  }}
+                <CurrentPatternsMessage
+                  timelineType={timelineType}
+                  activePatterns={activePatterns}
+                  deadPatterns={deadPatterns}
+                  selectedPatterns={selectedPatterns}
                 />
               ) : (
-                <FormattedMessage
-                  id="xpack.securitySolution.indexPatterns.currentPatternsBad"
-                  defaultMessage="The current index patterns in this timeline are: {callout}"
-                  values={{
-                    callout: <Blockquote>{selectedPatterns.join(', ')}</Blockquote>,
-                  }}
+                <BadCurrentPatternsMessage
+                  timelineType={timelineType}
+                  selectedPatterns={selectedPatterns}
                 />
               )}
 
               {isModified === 'deprecated' && (
-                <FormattedMessage
-                  id="xpack.securitySolution.indexPatterns.toggleToNewSourcerer"
-                  defaultMessage="We have preserved your timeline by creating a temporary data view. If you'd like to modify your data, we can recreate your temporary data view with the new data view selector. You can also manually select a data view {link}."
-                  values={{
-                    link: <EuiLink onClick={onReset}>{i18n.TOGGLE_TO_NEW_SOURCERER}</EuiLink>,
-                  }}
-                />
+                <DeprecatedMessage timelineType={timelineType} onReset={onReset} />
               )}
               {isModified === 'missingPatterns' && (
                 <>
                   <FormattedMessage
+                    data-test-subj="sourcerer-missing-patterns-callout"
                     id="xpack.securitySolution.indexPatterns.missingPatterns.callout"
                     defaultMessage="Security Data View is missing the following index patterns: {callout}"
                     values={{
                       callout: <Blockquote>{missingPatterns.join(', ')}</Blockquote>,
                     }}
                   />
-                  <FormattedMessage
-                    id="xpack.securitySolution.indexPatterns.missingPatterns.description"
-                    defaultMessage="We have preserved your timeline by creating a temporary data view. If you'd like to modify your data, we can add the missing index patterns to the Security Data View. You can also manually select a data view {link}."
-                    values={{
-                      link: <EuiLink onClick={onReset}>{i18n.TOGGLE_TO_NEW_SOURCERER}</EuiLink>,
-                    }}
-                  />
+                  <MissingPatternsMessage timelineType={timelineType} onReset={onReset} />
                 </>
               )}
             </p>
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx
index 384ba0f16427a..4b88b5cca19ab 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.test.tsx
@@ -29,8 +29,8 @@ jest.mock('../../lib/kibana', () => {
     useKibana: () => mockedUseKibana,
   };
 });
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
 
   return {
     ...original,
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx
index fdaf733e49d95..867c45e7a8e06 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_update_data_view.tsx
@@ -8,10 +8,10 @@
 import React, { useCallback } from 'react';
 import { EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../../lib/kibana';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import { ensurePatternFormat } from '../../store/sourcerer/helpers';
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
 import * as i18n from './translations';
 import { RefreshButton } from './refresh_button';
 import { useAppToasts } from '../../hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/utils.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/utils.tsx
new file mode 100644
index 0000000000000..18fba2648c25e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/utils.tsx
@@ -0,0 +1,201 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React, { useMemo } from 'react';
+import { TimelineType } from '../../../../common/types';
+import { Blockquote } from './helpers';
+import * as i18n from './translations';
+
+export const CurrentPatternsMessage = ({
+  activePatterns,
+  deadPatterns,
+  selectedPatterns,
+  timelineType,
+}: {
+  activePatterns: string[];
+  deadPatterns: string[];
+  selectedPatterns: string[];
+  timelineType: TimelineType;
+}) => {
+  const tooltip = useMemo(
+    () =>
+      deadPatterns.length > 0 ? (
+        <EuiToolTip
+          content={
+            <NoMatchDataMessage
+              activePatterns={activePatterns}
+              selectedPatterns={selectedPatterns}
+              timelineType={timelineType}
+            />
+          }
+        >
+          <EuiIcon type="questionInCircle" title={i18n.INACTIVE_PATTERNS} />
+        </EuiToolTip>
+      ) : null,
+    [activePatterns, deadPatterns.length, selectedPatterns, timelineType]
+  );
+
+  if (timelineType === TimelineType.template) {
+    return (
+      <FormattedMessage
+        data-test-subj="sourcerer-current-patterns-message"
+        id="xpack.securitySolution.indexPatterns.timelineTemplate.currentPatterns"
+        defaultMessage="The active index patterns in this timeline template are{tooltip}: {callout}"
+        values={{
+          tooltip,
+          callout: <Blockquote>{activePatterns.join(', ')}</Blockquote>,
+        }}
+      />
+    );
+  }
+
+  return (
+    <FormattedMessage
+      data-test-subj="sourcerer-current-patterns-message"
+      id="xpack.securitySolution.indexPatterns.timeline.currentPatterns"
+      defaultMessage="The active index patterns in this timeline are{tooltip}: {callout}"
+      values={{
+        tooltip,
+        callout: <Blockquote>{activePatterns.join(', ')}</Blockquote>,
+      }}
+    />
+  );
+};
+
+export const NoMatchDataMessage = ({
+  activePatterns,
+  selectedPatterns,
+  timelineType,
+}: {
+  activePatterns: string[];
+  selectedPatterns: string[];
+  timelineType: TimelineType;
+}) => {
+  const aliases = useMemo(
+    () => selectedPatterns.filter((p) => !activePatterns.includes(p)).join(', '),
+    [activePatterns, selectedPatterns]
+  );
+  if (timelineType === TimelineType.template) {
+    return (
+      <FormattedMessage
+        id="xpack.securitySolution.indexPatterns.timelineTemplate.noMatchData"
+        defaultMessage="The following index patterns are saved to this timeline template but do not match any data streams, indices, or index aliases: {aliases}"
+        values={{
+          aliases,
+        }}
+      />
+    );
+  }
+
+  return (
+    <FormattedMessage
+      id="xpack.securitySolution.indexPatterns.timeline.noMatchData"
+      defaultMessage="The following index patterns are saved to this timeline but do not match any data streams, indices, or index aliases: {aliases}"
+      values={{
+        aliases,
+      }}
+    />
+  );
+};
+
+export const BadCurrentPatternsMessage = ({
+  timelineType,
+  selectedPatterns,
+}: {
+  timelineType: TimelineType;
+  selectedPatterns: string[];
+}) => {
+  const callout = useMemo(
+    () => <Blockquote>{selectedPatterns.join(', ')}</Blockquote>,
+    [selectedPatterns]
+  );
+
+  if (timelineType === TimelineType.template) {
+    return (
+      <FormattedMessage
+        id="xpack.securitySolution.indexPatterns.timelineTemplate.currentPatternsBad"
+        defaultMessage="The current index patterns in this timeline template are: {callout}"
+        values={{
+          callout,
+        }}
+      />
+    );
+  }
+  return (
+    <FormattedMessage
+      id="xpack.securitySolution.indexPatterns.timeline.currentPatternsBad"
+      defaultMessage="The current index patterns in this timeline are: {callout}"
+      values={{
+        callout,
+      }}
+    />
+  );
+};
+
+export const DeprecatedMessage = ({
+  onReset,
+  timelineType,
+}: {
+  onReset: () => void;
+  timelineType: TimelineType;
+}) => {
+  if (timelineType === TimelineType.template) {
+    return (
+      <FormattedMessage
+        data-test-subj="sourcerer-deprecated-message"
+        id="xpack.securitySolution.indexPatterns.timelineTemplate.toggleToNewSourcerer"
+        defaultMessage="We have preserved your timeline template by creating a temporary data view. If you'd like to modify your data, we can recreate your temporary data view with the new data view selector. You can also manually select a data view {link}."
+        values={{
+          link: <EuiLink onClick={onReset}>{i18n.TOGGLE_TO_NEW_SOURCERER}</EuiLink>,
+        }}
+      />
+    );
+  }
+  return (
+    <FormattedMessage
+      data-test-subj="sourcerer-deprecated-message"
+      id="xpack.securitySolution.indexPatterns.timeline.toggleToNewSourcerer"
+      defaultMessage="We have preserved your timeline by creating a temporary data view. If you'd like to modify your data, we can recreate your temporary data view with the new data view selector. You can also manually select a data view {link}."
+      values={{
+        link: <EuiLink onClick={onReset}>{i18n.TOGGLE_TO_NEW_SOURCERER}</EuiLink>,
+      }}
+    />
+  );
+};
+
+export const MissingPatternsMessage = ({
+  onReset,
+  timelineType,
+}: {
+  timelineType: TimelineType;
+  onReset: () => void;
+}) => {
+  if (timelineType === TimelineType.template) {
+    return (
+      <FormattedMessage
+        data-test-subj="sourcerer-missing-patterns-message"
+        id="xpack.securitySolution.indexPatterns.missingPatterns.timelineTemplate.description"
+        defaultMessage="We have preserved your timeline template by creating a temporary data view. If you'd like to modify your data, we can add the missing index patterns to the Security Data View. You can also manually select a data view {link}."
+        values={{
+          link: <EuiLink onClick={onReset}>{i18n.TOGGLE_TO_NEW_SOURCERER}</EuiLink>,
+        }}
+      />
+    );
+  }
+  return (
+    <FormattedMessage
+      data-test-subj="sourcerer-missing-patterns-message"
+      id="xpack.securitySolution.indexPatterns.missingPatterns.timeline.description"
+      defaultMessage="We have preserved your timeline by creating a temporary data view. If you'd like to modify your data, we can add the missing index patterns to the Security Data View. You can also manually select a data view {link}."
+      values={{
+        link: <EuiLink onClick={onReset}>{i18n.TOGGLE_TO_NEW_SOURCERER}</EuiLink>,
+      }}
+    />
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx
index f9030e1862d98..bd136f95257e5 100644
--- a/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/subtitle/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { Subtitle } from './index';
+import { Subtitle } from '.';
 
 describe('Subtitle', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx
index bc397292af4ec..36acb0abc219e 100644
--- a/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/tables/helpers.test.tsx
@@ -58,7 +58,7 @@ describe('Table Helpers', () => {
       });
       const wrapper = mount(<TestProviders>{rowItem}</TestProviders>);
       expect(wrapper.find('[data-test-subj="render-content-attrName"]').first().text()).toBe(
-        '(Empty String)'
+        '(Empty string)'
       );
     });
 
@@ -119,7 +119,7 @@ describe('Table Helpers', () => {
       });
       const wrapper = mount(<TestProviders>{rowItems}</TestProviders>);
       expect(wrapper.find('[data-test-subj="render-content-attrName"]').first().text()).toBe(
-        '(Empty String)'
+        '(Empty string)'
       );
     });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx
index f9f2d13bce2d9..a6092ed423d01 100644
--- a/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/tables/helpers.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/eui';
 import styled from 'styled-components';
 
+import { TimelineContext } from '@kbn/timelines-plugin/public';
 import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper';
 import { escapeDataProviderId } from '../drag_and_drop/helpers';
 import { defaultToEmptyTag, getEmptyTagValue } from '../empty_value';
@@ -25,7 +26,6 @@ import { IS_OPERATOR } from '../../../timelines/components/timeline/data_provide
 import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
 import { HoverActions } from '../hover_actions';
 import { DataProvider, QueryOperator } from '../../../../common/types';
-import { TimelineContext } from '../../../../../timelines/public';
 
 const Subtext = styled.div`
   font-size: ${(props) => props.theme.eui.euiFontSizeXS};
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx
index d99d813e1af8f..658f430f219fb 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx
@@ -10,10 +10,10 @@ import React from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
 import { EntryItem } from './entry_item';
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 import type { DataViewBase } from '@kbn/es-query';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 describe('EntryItem', () => {
   test('it renders field labels if "showLabel" is "true"', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx
index 272d056eed143..3767f2bac18af 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { fields, getField } from '../../../../../../../src/plugins/data/common/mocks';
+import { fields, getField } from '@kbn/data-plugin/common/mocks';
 import { Entry, EmptyEntry, ThreatMapEntries, FormattedEntry } from './types';
-import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
+import type { FieldSpec } from '@kbn/data-plugin/common';
 import type { DataViewBase } from '@kbn/es-query';
 import moment from 'moment-timezone';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx
index 2358f4dd5b9c1..db6c7a4261c5e 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx
@@ -11,9 +11,9 @@ import { addIdToItem } from '@kbn/securitysolution-utils';
 import { ThreatMap, threatMap, ThreatMapping } from '@kbn/securitysolution-io-ts-alerting-types';
 
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { ValidationFunc } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+import { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
 import { Entry, FormattedEntry, ThreatMapEntries, EmptyEntry } from './types';
-import { ValidationFunc } from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-import { ERROR_CODE } from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
 
 /**
  * Formats the entry into one that is easily usable for the UI.
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
index 20fd2821ed9be..65f07f56f69f7 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx
@@ -10,11 +10,11 @@ import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
+import { fields } from '@kbn/data-plugin/common/mocks';
 
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 
-import { ThreatMatchComponent } from './';
+import { ThreatMatchComponent } from '.';
 import { ThreatMapEntries } from './types';
 import type { DataViewBase } from '@kbn/es-query';
 import { getMockTheme } from '../../lib/kibana/kibana_react.mock';
@@ -25,7 +25,7 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 const getPayLoad = (): ThreatMapEntries[] => [
   { entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] },
diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx
index 0cb1ed830ceca..b49bb1a7fb893 100644
--- a/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mount } from 'enzyme';
 
-import { useKibana } from '../../../common/lib/kibana';
-import { fields } from '../../../../../../../src/plugins/data/common/mocks';
+import { useKibana } from '../../lib/kibana';
+import { fields } from '@kbn/data-plugin/common/mocks';
 
 import { ListItemComponent } from './list_item';
 import { ThreatMapEntries } from './types';
@@ -23,7 +23,7 @@ const mockTheme = getMockTheme({
   },
 });
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 const singlePayload = (): ThreatMapEntries => ({
   entries: [
diff --git a/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts b/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts
index 04ceafde7ef74..aa548c5cc5836 100644
--- a/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/components/toasters/utils.ts
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import { isError } from 'lodash/fp';
 import { isAppError } from '@kbn/securitysolution-t-grid';
 
-import { AppToast, ActionToaster } from './';
+import { AppToast, ActionToaster } from '.';
 import { isToasterError } from './errors';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
index 28f942dfa61cb..9277d3b296874 100644
--- a/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.tsx
@@ -9,10 +9,10 @@ import React, { useMemo } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useGlobalTime } from '../../containers/use_global_time';
 import { BrowserFields } from '../../containers/source';
 import { useKibana } from '../../lib/kibana';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { inputsModel, inputsSelectors, State } from '../../store';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
 import { timelineSelectors } from '../../../timelines/store/timeline';
diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
index e5ce8e4105cac..4430c8f030122 100644
--- a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
+++ b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
@@ -12,7 +12,7 @@ import * as H from 'history';
 
 import type { Filter, Query } from '@kbn/es-query';
 
-import { url } from '../../../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 import { TimelineId, TimelineTabs } from '../../../../common/types/timeline';
 import { SecurityPageName } from '../../../app/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/types.ts b/x-pack/plugins/security_solution/public/common/components/url_state/types.ts
index d9c91f3371856..f43eaba280d7a 100644
--- a/x-pack/plugins/security_solution/public/common/components/url_state/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/url_state/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import type { FilterManager, SavedQueryService } from 'src/plugins/data/public';
+import type { FilterManager, SavedQueryService } from '@kbn/data-plugin/public';
 import { UrlInputsModel } from '../../store/inputs/model';
 import { TimelineUrl } from '../../../timelines/store/timeline/model';
 import { RouteSpyState } from '../../utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts
index c410de5d696f0..75f3175744429 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.test.ts
@@ -8,8 +8,8 @@
 import { act, renderHook, RenderHookResult, RenderResult } from '@testing-library/react-hooks';
 import { useCurrentUser, useKibana } from '../../../lib/kibana';
 import { useEndpointPrivileges } from './use_endpoint_privileges';
-import { securityMock } from '../../../../../../security/public/mocks';
-import { AuthenticatedUser } from '../../../../../../security/common';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+import { AuthenticatedUser } from '@kbn/security-plugin/common';
 import { licenseService } from '../../../hooks/use_license';
 import { getEndpointPrivilegesInitialStateMock } from './mocks';
 import { EndpointPrivileges } from '../../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts
index dcd602290d85c..25cfdb11e732b 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/endpoint/use_endpoint_privileges.ts
@@ -6,6 +6,7 @@
  */
 
 import { useEffect, useMemo, useRef, useState } from 'react';
+import { FleetAuthz } from '@kbn/fleet-plugin/common';
 import { useCurrentUser, useKibana } from '../../../lib/kibana';
 import { useLicense } from '../../../hooks/use_license';
 import {
@@ -17,7 +18,6 @@ import {
   calculateEndpointAuthz,
   getEndpointAuthzInitialState,
 } from '../../../../../common/endpoint/service/authz';
-import { FleetAuthz } from '../../../../../../fleet/common';
 import { useSecuritySolutionStartDependencies } from './security_solution_start_dependencies';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx b/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx
index 5c681e5dbbaec..5a3ec5affe4c7 100644
--- a/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/user_privileges/user_privileges_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useEffect, useState } from 'react';
-import { Capabilities } from '../../../../../../../src/core/types';
+import { Capabilities } from '@kbn/core/types';
 import { SERVER_APP_ID } from '../../../../common/constants';
 import { useFetchListPrivileges } from '../../../detections/components/user_privileges/use_fetch_list_privileges';
 import { useFetchDetectionEnginePrivileges } from '../../../detections/components/user_privileges/use_fetch_detection_engine_privileges';
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx
index ac4b2d44204d1..c5fc48562add6 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar.test.tsx
@@ -16,7 +16,7 @@ import {
   UtilityBarGroup,
   UtilityBarSection,
   UtilityBarText,
-} from './index';
+} from '.';
 
 describe('UtilityBar', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx
index e462416fc0091..c43bb321a3586 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_action.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarAction } from './index';
+import { UtilityBarAction } from '.';
 
 describe('UtilityBarAction', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx
index 4359f6eb32a03..cd9ce57bb98a8 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_group.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarGroup, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarText } from '.';
 
 describe('UtilityBarGroup', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx
index b3decccda5f5c..7d7624d6f0171 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_section.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from './index';
+import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from '.';
 
 describe('UtilityBarSection', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx
index b4297af892988..44b4b68678884 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/utility_bar_text.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import { UtilityBarText } from './index';
+import { UtilityBarText } from '.';
 
 describe('UtilityBarText', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx
index 00ae0873472e9..b06fde164af76 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/index.test.tsx
@@ -20,7 +20,7 @@ import { UpdateQueryParams, upsertQuery } from '../../store/inputs/helpers';
 import { cloneDeep } from 'lodash';
 import { useKibana } from '../../lib/kibana/kibana_react';
 import { CASES_FEATURE_ID } from '../../../../common/constants';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
   return {
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
index 9fc193e71b40d..6bc0a63c57df5 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TypedLensByValueInput } from '../../../../../lens/public';
+import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { InputsModelId } from '../../store/inputs/constants';
 
 export type LensAttributes = TypedLensByValueInput['attributes'];
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx
index af0b41ad87bca..5b16527fff54e 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { renderHook } from '@testing-library/react-hooks';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { useKibana } from '../../lib/kibana';
 import { kpiHostMetricLensAttributes } from './lens_attributes/hosts/kpi_host_metric';
 import { useAddToExistingCase } from './use_add_to_existing_case';
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx
index fc2a1893e1ad0..d8946da8a63b4 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_existing_case.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useCallback, useMemo } from 'react';
-import { CommentType } from '../../../../../cases/common';
+import { CommentType } from '@kbn/cases-plugin/common';
 
 import { APP_ID } from '../../../../common/constants';
 import { useKibana } from '../../lib/kibana/kibana_react';
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx
index 758f7e664fb03..35a05281b9325 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { renderHook } from '@testing-library/react-hooks';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { useKibana } from '../../lib/kibana';
 import { kpiHostMetricLensAttributes } from './lens_attributes/hosts/kpi_host_metric';
 import { useAddToNewCase } from './use_add_to_new_case';
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx
index 6958b2cb97892..51ad9a8fdaa79 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/use_add_to_new_case.tsx
@@ -6,7 +6,7 @@
  */
 import { useCallback, useMemo } from 'react';
 
-import { CommentType } from '../../../../../cases/common';
+import { CommentType } from '@kbn/cases-plugin/common';
 
 import { APP_ID } from '../../../../common/constants';
 import { useKibana } from '../../lib/kibana/kibana_react';
diff --git a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts
index 97b0f34db9651..c7b46a6394b86 100644
--- a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/types.ts
@@ -10,7 +10,7 @@ import { NarrowDateRange } from '../../../components/ml/types';
 import { UpdateDateRange } from '../../../components/charts/common';
 import { GlobalTimeArgs } from '../../use_global_time';
 import { HostsType } from '../../../../hosts/store/model';
-import { NetworkType } from '../../../../network/store//model';
+import { NetworkType } from '../../../../network/store/model';
 import { FlowTarget } from '../../../../../common/search_strategy';
 import { UsersType } from '../../../../users/store/model';
 
diff --git a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts
index 9a9b5b13137e6..2c5940f6662fe 100644
--- a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts
@@ -7,7 +7,7 @@
 
 import deepmerge from 'deepmerge';
 
-import { MlSummaryJob } from '../../../../../../ml/public';
+import { MlSummaryJob } from '@kbn/ml-plugin/public';
 import { FlowTarget } from '../../../../../common/search_strategy';
 import { ESTermQuery } from '../../../../../common/typed_json';
 import { createFilter } from '../../helpers';
diff --git a/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx b/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx
index cf7953bb8922c..7c61c56f3c3b2 100644
--- a/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/authentications/index.test.tsx
@@ -7,9 +7,9 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { AuthStackByField } from '../../../../common/search_strategy';
-import { TestProviders } from '../../../common/mock';
+import { TestProviders } from '../../mock';
 import { HostsType } from '../../../hosts/store/model';
-import { useAuthentications } from './index';
+import { useAuthentications } from '.';
 
 describe('authentications', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx b/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx
index 543ebc3e15e9a..408d29f4e972a 100644
--- a/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/authentications/index.tsx
@@ -10,7 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   AuthenticationsEdges,
   AuthStackByField,
@@ -21,15 +21,15 @@ import {
 import { PageInfoPaginated, DocValueFields, SortField } from '../../../../common/search_strategy';
 import { ESTermQuery } from '../../../../common/typed_json';
 
-import { inputsModel } from '../../../common/store';
-import { createFilter } from '../../../common/containers/helpers';
-import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers';
-import { useKibana } from '../../../common/lib/kibana';
+import { inputsModel } from '../../store';
+import { createFilter } from '../helpers';
+import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
+import { useKibana } from '../../lib/kibana';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 
 import * as i18n from './translations';
-import { useAppToasts } from '../../../common/hooks/use_app_toasts';
+import { useAppToasts } from '../../hooks/use_app_toasts';
 
 export interface AuthenticationArgs {
   authentications: AuthenticationsEdges[];
diff --git a/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts b/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
index f668f96cce966..f4d3cde6e811d 100644
--- a/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
@@ -8,11 +8,8 @@
 import { Observable } from 'rxjs';
 import { filter } from 'rxjs/operators';
 
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import {
-  isErrorResponse,
-  isCompleteResponse,
-} from '../../../../../../../../src/plugins/data/common';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { isErrorResponse, isCompleteResponse } from '@kbn/data-plugin/common';
 import {
   CtiEventEnrichmentRequestOptions,
   CtiEventEnrichmentStrategyResponse,
diff --git a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts
index 21791952fec06..1bd188d01cb51 100644
--- a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.test.ts
@@ -9,7 +9,7 @@ import { act, renderHook } from '@testing-library/react-hooks';
 import { noop } from 'lodash/fp';
 import { useTimelineLastEventTime, UseTimelineLastEventTimeArgs } from '.';
 import { LastEventIndexKey } from '../../../../../common/search_strategy';
-import { useKibana } from '../../../../common/lib/kibana';
+import { useKibana } from '../../../lib/kibana';
 
 const mockSearchStrategy = jest.fn();
 const mockUseKibana = {
@@ -41,7 +41,7 @@ const mockUseKibana = {
   },
 };
 
-jest.mock('../../../../common/lib/kibana', () => ({
+jest.mock('../../../lib/kibana', () => ({
   useKibana: jest.fn(),
   useToasts: jest.fn().mockReturnValue({
     addError: jest.fn(),
diff --git a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
index c1d45f605c821..953812687b68e 100644
--- a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
@@ -10,8 +10,9 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
-import { inputsModel } from '../../../../common/store';
-import { useKibana } from '../../../../common/lib/kibana';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { inputsModel } from '../../../store';
+import { useKibana } from '../../../lib/kibana';
 import {
   TimelineEventsQueries,
   TimelineEventsLastEventTimeRequestOptions,
@@ -19,10 +20,6 @@ import {
   LastTimeDetails,
   LastEventIndexKey,
 } from '../../../../../common/search_strategy/timeline';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { DocValueFields } from '../../../../../common/search_strategy';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx b/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx
index ab8e7cf97d34c..e3f78cee0faae 100644
--- a/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback } from 'react';
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 
 export interface UseMessagesStorage {
   getMessages: (plugin: string) => string[];
diff --git a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts
index 138fa99ef4074..bb65e5def2792 100644
--- a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 import { useMatrixHistogram, useMatrixHistogramCombined } from '.';
 import { MatrixHistogramType } from '../../../../common/search_strategy';
 import { TestProviders } from '../../mock/test_providers';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 
 const basicResponse = {
   isPartial: false,
diff --git a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
index e22960e833b9a..a423de8f4436d 100644
--- a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
@@ -10,10 +10,11 @@ import { getOr, isEmpty, noop } from 'lodash/fp';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isErrorResponse, isCompleteResponse } from '@kbn/data-plugin/common';
 import { MatrixHistogramQueryProps } from '../../components/matrix_histogram/types';
-import { inputsModel } from '../../../common/store';
-import { createFilter } from '../../../common/containers/helpers';
-import { useKibana } from '../../../common/lib/kibana';
+import { inputsModel } from '../../store';
+import { createFilter } from '../helpers';
+import { useKibana } from '../../lib/kibana';
 import {
   MatrixHistogramQuery,
   MatrixHistogramRequestOptions,
@@ -21,7 +22,6 @@ import {
   MatrixHistogramData,
   MatrixHistogramTypeToAggName,
 } from '../../../../common/search_strategy/security_solution';
-import { isErrorResponse, isCompleteResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/index.tsx b/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
index 7cc37b5f7e6e3..39626f7c14562 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/source/index.tsx
@@ -11,7 +11,6 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import type { DataViewBase } from '@kbn/es-query';
 import { Subscription } from 'rxjs';
 
-import { useKibana } from '../../lib/kibana';
 import {
   BrowserField,
   BrowserFields,
@@ -19,8 +18,9 @@ import {
   IndexField,
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse,
-} from '../../../../../timelines/common';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
+} from '@kbn/timelines-plugin/common';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { useKibana } from '../../lib/kibana';
 import * as i18n from './translations';
 import { useAppToasts } from '../../hooks/use_app_toasts';
 
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx b/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
index 66087f91ac6c2..0833f6ca3f1ce 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx
@@ -10,9 +10,6 @@ import { Subscription } from 'rxjs';
 import { useDispatch } from 'react-redux';
 import memoizeOne from 'memoize-one';
 import { omit, pick } from 'lodash/fp';
-import { useKibana } from '../../lib/kibana';
-import { useAppToasts } from '../../hooks/use_app_toasts';
-import { sourcererActions } from '../../store/sourcerer';
 import {
   BrowserField,
   DELETED_SECURITY_SOLUTION_DATA_VIEW,
@@ -20,12 +17,11 @@ import {
   IndexField,
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse,
-} from '../../../../../timelines/common';
-import {
-  FieldSpec,
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/timelines-plugin/common';
+import { FieldSpec, isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { useKibana } from '../../lib/kibana';
+import { useAppToasts } from '../../hooks/use_app_toasts';
+import { sourcererActions } from '../../store/sourcerer';
 import * as i18n from './translations';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { getSourcererDataview } from '../sourcerer/api';
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts
index ecbf7058fded2..fc0455348c4e6 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useSearchStrategy } from './index';
+import { useSearchStrategy } from '.';
 import { act, renderHook } from '@testing-library/react-hooks';
 
 import { useObservable } from '@kbn/securitysolution-hook-utils';
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
index 916ed4aad3e47..2ffbf706ec1a2 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
@@ -11,6 +11,13 @@ import { Observable } from 'rxjs';
 
 import { OptionalSignalArgs, useObservable } from '@kbn/securitysolution-hook-utils';
 
+import { IKibanaSearchResponse } from '@kbn/data-plugin/common';
+import {
+  DataPublicPluginStart,
+  isCompleteResponse,
+  isErrorResponse,
+} from '@kbn/data-plugin/public';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import * as i18n from './translations';
 
 import {
@@ -19,17 +26,10 @@ import {
   StrategyRequestType,
   StrategyResponseType,
 } from '../../../../common/search_strategy/security_solution';
-import { IKibanaSearchResponse } from '../../../../../../../src/plugins/data/common';
-import {
-  DataPublicPluginStart,
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../src/plugins/data/public';
 import { getInspectResponse } from '../../../helpers';
 import { inputsModel } from '../../store';
 import { useKibana } from '../../lib/kibana';
 import { useAppToasts } from '../../hooks/use_app_toasts';
-import { AbortError } from '../../../../../../../src/plugins/kibana_utils/common';
 
 type UseSearchStrategyRequestArgs = RequestBasicOptions & {
   data: DataPublicPluginStart;
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 ed75e3bbbe926..3a1dff65943d7 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
@@ -6,7 +6,7 @@
  */
 
 import { MouseEventHandler, useCallback } from 'react';
-import { ApplicationStart, NavigateToAppOptions } from 'kibana/public';
+import { ApplicationStart, NavigateToAppOptions } from '@kbn/core/public';
 import { useKibana } from '../../lib/kibana';
 
 type NavigateToAppHandlerOptions<S = unknown> = NavigateToAppOptions & {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts
index a5b73517c4fb5..e29ebad739960 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/api.ts
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
+import { firstValueFrom } from 'rxjs';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   EqlSearchStrategyRequest,
   EqlSearchStrategyResponse,
   EQL_SEARCH_STRATEGY,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import {
   getValidationErrors,
   isErrorResponse,
@@ -30,8 +31,8 @@ export const validateEql = async ({
   query,
   signal,
 }: Params): Promise<{ valid: boolean; errors: string[] }> => {
-  const { rawResponse: response } = await data.search
-    .search<EqlSearchStrategyRequest, EqlSearchStrategyResponse>(
+  const { rawResponse: response } = await firstValueFrom(
+    data.search.search<EqlSearchStrategyRequest, EqlSearchStrategyResponse>(
       {
         params: { index: index.join(), body: { query, size: 0 } },
         options: { ignore: [400] },
@@ -41,7 +42,7 @@ export const validateEql = async ({
         abortSignal: signal,
       }
     )
-    .toPromise();
+  );
 
   if (isValidationErrorResponse(response.body)) {
     return { valid: false, errors: getValidationErrors(response.body) };
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts
index 278e84f327d08..f17c1f84de000 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/eql_search_response.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { Source } from './types';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
 import type { Connection } from '@elastic/elasticsearch';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts
index abdb3d2d06e9c..5eb3e042cbf2b 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.test.ts
@@ -7,10 +7,10 @@
 
 import moment from 'moment';
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { Source } from './types';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
-import { inputsModel } from '../../../common/store';
+import { inputsModel } from '../../store';
 
 import {
   calculateBucketForHour,
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts
index 63c1dd7f2d927..a70617447e4f9 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/helpers.ts
@@ -7,9 +7,9 @@
 
 import moment from 'moment';
 import { Unit } from '@kbn/datemath';
-import { inputsModel } from '../../../common/store';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
+import { inputsModel } from '../../store';
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
 import { InspectResponse } from '../../../types';
 import { EqlPreviewResponse, Source } from './types';
 import { BaseHit, EqlSearchResponse } from '../../../../common/detection_engine/types';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts
index 06fb0e1c72b3e..0e329a47012ac 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/types.ts
@@ -9,7 +9,7 @@ import { Unit } from '@kbn/datemath';
 
 import { InspectResponse } from '../../../types';
 import { ChartData } from '../../components/charts/common';
-import { inputsModel } from '../../../common/store';
+import { inputsModel } from '../../store';
 
 export interface EqlPreviewRequest {
   to: string;
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts
index 36246cc602f11..47c084661a5fc 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.test.ts
@@ -11,15 +11,15 @@ import { of, throwError } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
 import * as i18n from '../translations';
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { Source } from './types';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
-import { useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../lib/kibana';
 import { useEqlPreview } from '.';
 import { getMockEqlResponse } from './eql_search_response.mock';
 import { useAppToasts } from '../use_app_toasts';
 
-jest.mock('../../../common/lib/kibana');
+jest.mock('../../lib/kibana');
 jest.mock('../use_app_toasts');
 
 describe('useEqlPreview', () => {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts
index 2c9e37c6930f4..4addd9048a565 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/eql/use_eql_preview.ts
@@ -11,22 +11,22 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
-import * as i18n from '../translations';
-import { useKibana } from '../../../common/lib/kibana';
 import {
   isCompleteResponse,
   isErrorResponse,
   isPartialResponse,
   EqlSearchStrategyRequest,
   EqlSearchStrategyResponse,
-} from '../../../../../../../src/plugins/data/common';
-import { AbortError } from '../../../../../../../src/plugins/kibana_utils/common';
+} from '@kbn/data-plugin/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
+import { EQL_SEARCH_STRATEGY } from '@kbn/data-enhanced-plugin/public';
+import * as i18n from '../translations';
+import { useKibana } from '../../lib/kibana';
 import { formatInspect, getEqlAggsData } from './helpers';
 import { EqlPreviewResponse, EqlPreviewRequest, Source } from './types';
 import { hasEqlSequenceQuery } from '../../../../common/detection_engine/utils';
 import { EqlSearchResponse } from '../../../../common/detection_engine/types';
-import { inputsModel } from '../../../common/store';
-import { EQL_SEARCH_STRATEGY } from '../../../../../data_enhanced/public';
+import { inputsModel } from '../../store';
 import { useAppToasts } from '../use_app_toasts';
 
 export const useEqlPreview = (): [
@@ -37,7 +37,7 @@ export const useEqlPreview = (): [
   const { data } = useKibana().services;
   const refetch = useRef<inputsModel.Refetch>(noop);
   const abortCtrl = useRef(new AbortController());
-  const unsubscribeStream = useRef(new Subject());
+  const unsubscribeStream = useRef(new Subject<void>());
   const [loading, setLoading] = useState(false);
   const didCancel = useRef(false);
   const { addError, addWarning } = useAppToasts();
diff --git a/x-pack/plugins/security_solution/public/common/hooks/types.ts b/x-pack/plugins/security_solution/public/common/hooks/types.ts
index 770e4e75c5269..d24f4a95f4041 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/types.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SimpleSavedObject } from '../../../../../../src/core/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type IndexPatternSavedObjectAttributes = { title: string };
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts
index 786f25d8c6aba..9bea6282e3ad6 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import type { IEsError } from 'src/plugins/data/public';
+import type { IEsError } from '@kbn/data-plugin/public';
 import { KibanaError, SecurityAppError } from '@kbn/securitysolution-t-grid';
 
 import { useToasts } from '../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts
index b0719960ff2c8..4b3b28a54c642 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_app_toasts.ts
@@ -14,9 +14,9 @@ import {
   isSecurityAppError,
 } from '@kbn/securitysolution-t-grid';
 
-import { IEsError, isEsError } from '../../../../../../src/plugins/data/public';
+import { IEsError, isEsError } from '@kbn/data-plugin/public';
 
-import { ErrorToastOptions, ToastsStart, Toast } from '../../../../../../src/core/public';
+import { ErrorToastOptions, ToastsStart, Toast } from '@kbn/core/public';
 import { useToasts } from '../lib/kibana';
 
 export type UseAppToasts = Pick<ToastsStart, 'addSuccess' | 'addWarning'> & {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts b/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts
index 9a6b8c54f2bc6..3132ae70381a2 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_experimental_features.ts
@@ -6,7 +6,7 @@
  */
 
 import { useSelector } from 'react-redux';
-import { State } from '../../common/store';
+import { State } from '../store';
 import {
   ExperimentalFeatures,
   getExperimentalAllowedValues,
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx
index bafbe078cdbdb..b7bec2b490300 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_conflict.test.tsx
@@ -21,7 +21,7 @@ jest.mock('react-router-dom', () => {
 });
 jest.mock('../lib/kibana');
 jest.mock('./use_selector');
-jest.mock('../../timelines/store/timeline/', () => ({
+jest.mock('../../timelines/store/timeline', () => ({
   timelineSelectors: {
     getTimelineByIdSelector: () => jest.fn(),
   },
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts
index 1f1e089f9249d..204900f746966 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.test.ts
@@ -22,7 +22,7 @@ jest.mock('react-router-dom', () => {
 });
 jest.mock('../lib/kibana');
 jest.mock('./use_selector');
-jest.mock('../../timelines/store/timeline/', () => ({
+jest.mock('../../timelines/store/timeline', () => ({
   timelineSelectors: {
     getTimelineByIdSelector: () => jest.fn(),
   },
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts
index 52b22829e6a61..93f74db0d3c8f 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_resolve_redirect.ts
@@ -9,7 +9,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useDeepEqualSelector } from './use_selector';
 import { TimelineId } from '../../../common/types/timeline';
-import { timelineSelectors } from '../../timelines/store/timeline/';
+import { timelineSelectors } from '../../timelines/store/timeline';
 import { timelineDefaults } from '../../timelines/store/timeline/defaults';
 import { decodeRisonUrlState, encodeRisonUrlState } from '../components/url_state/helpers';
 import { useKibana } from '../lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx
index 3e6dd399a3094..4131f2345b454 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_secuirty_packages.test.tsx
@@ -9,7 +9,7 @@ import React, { memo } from 'react';
 import { useKibana } from '../lib/kibana';
 import { renderHook as _renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import { useUpgradeSecurityPackages } from './use_upgrade_security_packages';
-import { epmRouteService } from '../../../../fleet/common';
+import { epmRouteService } from '@kbn/fleet-plugin/common';
 
 jest.mock('../components/user_privileges', () => {
   return {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
index c09ae2715277a..fd5183bc79fb8 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_upgrade_security_packages.ts
@@ -6,9 +6,9 @@
  */
 
 import { useEffect } from 'react';
-import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptions, HttpStart } from '@kbn/core/public';
+import { epmRouteService, BulkInstallPackagesResponse } from '@kbn/fleet-plugin/common';
 import { useKibana } from '../lib/kibana';
-import { epmRouteService, BulkInstallPackagesResponse } from '../../../../fleet/common';
 import { useUserPrivileges } from '../components/user_privileges';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
index 8a7d6c3b27b8d..0467f0f50fc71 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.test.tsx
@@ -8,8 +8,8 @@ import { EuiDataGridColumn } from '@elastic/eui';
 import type {
   BrowserFields,
   TimelineNonEcsData,
-} from '../../../../../timelines/common/search_strategy';
-import { TGridCellAction } from '../../../../../timelines/common/types';
+} from '@kbn/timelines-plugin/common/search_strategy';
+import { TGridCellAction } from '@kbn/timelines-plugin/common/types';
 import { Ecs } from '../../../../common/ecs';
 import { ColumnHeaderType } from '../../../timelines/store/timeline/model';
 
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
index d4a1f4952a888..d9511f89c9c81 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/default_cell_actions.tsx
@@ -9,13 +9,13 @@ import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
 import { head, getOr, get, isEmpty } from 'lodash/fp';
 import React, { useMemo } from 'react';
 
-import type { TimelineNonEcsData } from '../../../../../timelines/common/search_strategy';
+import type { TimelineNonEcsData } from '@kbn/timelines-plugin/common/search_strategy';
 import {
   ColumnHeaderOptions,
   DataProvider,
   TGridCellAction,
-} from '../../../../../timelines/common/types';
-import { getPageRowIndex } from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/common/types';
+import { getPageRowIndex } from '@kbn/timelines-plugin/public';
 import { Ecs } from '../../../../common/ecs';
 import { useGetMappedNonEcsValue } from '../../../timelines/components/timeline/body/data_driven_columns';
 import { FormattedFieldValue } from '../../../timelines/components/timeline/body/renderers/formatted_field';
@@ -281,19 +281,20 @@ export const cellActions: TGridCellAction[] = [
     header,
     timelineId,
     pageSize,
+    closeCellPopover,
   }: {
     data: TimelineNonEcsData[][];
     ecsData: Ecs[];
     header?: ColumnHeaderOptions;
     timelineId: string;
     pageSize: number;
+    closeCellPopover?: () => void;
   }) => {
     if (header !== undefined) {
       return function FieldValue({
         rowIndex,
         columnId,
         Component,
-        closePopover,
       }: EuiDataGridColumnCellActionProps) {
         const {
           pageRowIndex,
@@ -331,7 +332,7 @@ export const cellActions: TGridCellAction[] = [
             truncate={false}
             title={title}
             linkValue={linkValue}
-            onClick={closePopover}
+            onClick={closeCellPopover}
           />
         ) : (
           // data grid expects each cell action always return an element, it crashes if returns null
diff --git a/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
index 94ae557dfc300..5a238c19511ad 100644
--- a/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/cell_actions/expanded_cell_value_actions.tsx
@@ -10,7 +10,7 @@ import { noop } from 'lodash/fp';
 import React, { useMemo, useState, useCallback } from 'react';
 import styled from 'styled-components';
 import type { Filter } from '@kbn/es-query';
-import { BrowserFields } from '../../../../../timelines/common/search_strategy';
+import { BrowserFields } from '@kbn/timelines-plugin/common/search_strategy';
 import { allowTopN } from '../../components/drag_and_drop/helpers';
 import { ShowTopNButton } from '../../components/hover_actions/actions/show_top_n';
 import { getAllFieldsByName } from '../../containers/source';
diff --git a/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts b/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts
index 690a3e3e196fc..b680eb05dca9b 100644
--- a/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/endpoint_isolation/index.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { KibanaServices } from '../kibana';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { isolateHost, unIsolateHost } from './index';
+import { coreMock } from '@kbn/core/public/mocks';
+import { isolateHost, unIsolateHost } from '.';
 import { ISOLATE_HOST_ROUTE, UNISOLATE_HOST_ROUTE } from '../../../../common/endpoint/constants';
 import { hostIsolationRequestBodyMock } from './mocks';
 
diff --git a/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts
index a90f9a3508cd8..19badb56007aa 100644
--- a/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/endpoint_pending_actions/endpoint_pending_actions.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { KibanaServices } from '../kibana';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { fetchPendingActionsByAgentId } from './endpoint_pending_actions';
 import { pendingActionsHttpMock, pendingActionsResponseMock } from './mocks';
 import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
diff --git a/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx b/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx
index cbc9e4eb44286..047e83a0f0dc4 100644
--- a/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/helpers/index.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { asArrayIfExists, decodeIpv6, encodeIpv6 } from '../helpers';
+import { asArrayIfExists, decodeIpv6, encodeIpv6 } from '.';
 
 describe('Helpers', () => {
   describe('#encodeIpv6', () => {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
index b76b5ee99843e..c4c5c36497289 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { notificationServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createTGridMocks } from '../../../../../../timelines/public/mock';
+import { createTGridMocks } from '@kbn/timelines-plugin/public/mock';
 
 import {
   createKibanaContextProviderMock,
@@ -18,7 +18,7 @@ import {
   createWithKibanaMock,
 } from '../kibana_react.mock';
 import { APP_UI_ID } from '../../../../../common/constants';
-import { mockCasesContract } from '../../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 const mockStartServicesMock = createStartServicesMock();
 export const KibanaServices = { get: jest.fn(), getKibanaVersion: jest.fn(() => '8.0.0') };
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts
index ebf361914ca3b..97befebc04d50 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/hooks.ts
@@ -12,6 +12,8 @@ import { i18n } from '@kbn/i18n';
 
 import { camelCase, isArray, isObject } from 'lodash';
 import { set } from '@elastic/safer-lodash-set';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import {
   APP_UI_ID,
   CASES_FEATURE_ID,
@@ -19,8 +21,6 @@ import {
   DEFAULT_DATE_FORMAT_TZ,
 } from '../../../../common/constants';
 import { errorToToaster, useStateToaster } from '../../components/toasters';
-import { AuthenticatedUser } from '../../../../../security/common/model';
-import { NavigateToAppOptions } from '../../../../../../../src/core/public';
 import { StartServices } from '../../../types';
 import { useUiSetting, useKibana } from './kibana_react';
 
@@ -169,19 +169,19 @@ export const useGetUserCasesPermissions = () => {
  * Returns a full URL to the provided page path by using
  * kibana's `getUrlForApp()`
  */
+
+export type GetAppUrl = (param: {
+  appId?: string;
+  deepLinkId?: string;
+  path?: string;
+  absolute?: boolean;
+}) => string;
+
 export const useAppUrl = () => {
   const { getUrlForApp } = useKibana().services.application;
 
-  const getAppUrl = useCallback(
-    ({
-      appId = APP_UI_ID,
-      ...options
-    }: {
-      appId?: string;
-      deepLinkId?: string;
-      path?: string;
-      absolute?: boolean;
-    }) => getUrlForApp(appId, options),
+  const getAppUrl = useCallback<GetAppUrl>(
+    ({ appId = APP_UI_ID, ...options }) => getUrlForApp(appId, options),
     [getUrlForApp]
   );
   return { getAppUrl };
@@ -191,18 +191,19 @@ export const useAppUrl = () => {
  * Navigate to any app using kibana's `navigateToApp()`
  * or by url using `navigateToUrl()`
  */
+
+export type NavigateTo = (
+  param: {
+    url?: string;
+    appId?: string;
+  } & NavigateToAppOptions
+) => void;
+
 export const useNavigateTo = () => {
   const { navigateToApp, navigateToUrl } = useKibana().services.application;
 
-  const navigateTo = useCallback(
-    ({
-      url,
-      appId = APP_UI_ID,
-      ...options
-    }: {
-      url?: string;
-      appId?: string;
-    } & NavigateToAppOptions) => {
+  const navigateTo = useCallback<NavigateTo>(
+    ({ url, appId = APP_UI_ID, ...options }) => {
       if (url) {
         navigateToUrl(url);
       } else {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
index a0053bba304cc..4cab4e2722ee2 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
@@ -10,10 +10,10 @@
 import React from 'react';
 
 import { RecursivePartial } from '@elastic/eui/src/components/common';
-import { coreMock, themeServiceMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { securityMock } from '../../../../../../plugins/security/public/mocks';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 import {
   DEFAULT_APP_REFRESH_INTERVAL,
   DEFAULT_APP_TIME_RANGE,
@@ -35,10 +35,10 @@ import {
 } from '../../../../common/constants';
 import { StartServices } from '../../../types';
 import { createSecuritySolutionStorageMock } from '../../mock/mock_local_storage';
-import { MlLocatorDefinition } from '../../../../../ml/public';
-import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-import { MockUrlService } from 'src/plugins/share/common/mocks';
-import { fleetMock } from '../../../../../fleet/public/mocks';
+import { MlLocatorDefinition } from '@kbn/ml-plugin/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
+import { fleetMock } from '@kbn/fleet-plugin/public/mocks';
 
 const mockUiSettings: Record<string, unknown> = {
   [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts
index 88213d2b03452..32641541df6d9 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.ts
@@ -12,7 +12,7 @@ import {
   useUiSetting,
   useUiSetting$,
   withKibana,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../../types';
 
 export type KibanaContext = KibanaReactContextValue<StartServices>;
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
index 5a2619a00417e..a4ec5a081304b 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from '../../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { StartPlugins } from '../../../types';
 
 type GlobalServices = Pick<CoreStart, 'http' | 'uiSettings' | 'notifications'> &
diff --git a/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts b/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts
index 901f3eb61d28b..006e7f840329a 100644
--- a/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/telemetry/middleware.ts
@@ -7,7 +7,7 @@
 
 import { Action, Dispatch, MiddlewareAPI } from 'redux';
 
-import { track, METRIC_TYPE, TELEMETRY_EVENT } from './';
+import { track, METRIC_TYPE, TELEMETRY_EVENT } from '.';
 import * as timelineActions from '../../../timelines/store/timeline/actions';
 
 export const telemetryMiddleware = (api: MiddlewareAPI) => (next: Dispatch) => (action: Action) => {
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
index 440ea57ec58ad..6fdbffe83efcb 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
@@ -9,9 +9,10 @@ import React from 'react';
 import { createMemoryHistory, MemoryHistory } from 'history';
 import { render as reactRender, RenderOptions, RenderResult } from '@testing-library/react';
 import { Action, Reducer, Store } from 'redux';
-import { AppDeepLink } from 'kibana/public';
+import { AppDeepLink } from '@kbn/core/public';
 import { QueryClient, QueryClientProvider, setLogger } from 'react-query';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
 import { StartPlugins, StartServices } from '../../../types';
 import { depsStartMock } from './dependencies_start_mock';
 import { MiddlewareActionSpyHelper, createSpyMiddleware } from '../../store/test_utils';
@@ -22,13 +23,12 @@ import { managementMiddlewareFactory } from '../../../management/store/middlewar
 import { createStartServicesMock } from '../../lib/kibana/kibana_react.mock';
 import { SUB_PLUGINS_REDUCER, mockGlobalState, createSecuritySolutionStorageMock } from '..';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
-import { PLUGIN_ID } from '../../../../../fleet/common';
 import { APP_UI_ID, APP_PATH } from '../../../../common/constants';
 import { KibanaContextProvider, KibanaServices } from '../../lib/kibana';
 import { getDeepLinks } from '../../../app/deep_links';
 import { fleetGetPackageListHttpMock } from '../../../management/pages/mocks';
 
-type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
+export type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
 // hide react-query output in console
 setLogger({
@@ -69,7 +69,7 @@ export interface AppContextTestRender {
   setExperimentalFlag: (flags: Partial<ExperimentalFeatures>) => void;
 }
 
-// Defined a private custom reducer that reacts to an action that enables us to updat the
+// Defined a private custom reducer that reacts to an action that enables us to update the
 // store with new values for technical preview features/flags. Because the `action.type` is a `Symbol`,
 // and its not exported the action can only be `dispatch`'d from this module
 const UpdateExperimentalFeaturesTestActionType = Symbol('updateExperimentalFeaturesTestAction');
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx
index 63b11d3d07543..83dee8742bef0 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_root_provider.tsx
@@ -12,11 +12,11 @@ import { Router } from 'react-router-dom';
 import { History } from 'history';
 import useObservable from 'react-use/lib/useObservable';
 import { Store } from 'redux';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { RouteCapture } from '../../components/endpoint/route_capture';
 import { StartPlugins } from '../../../types';
-import { CoreStart } from '../../../../../../../src/core/public';
 
 /**
  * Provides the context for rendering the endpoint app
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 5e296d4bb30e6..bdc3afbf7a99a 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
@@ -5,14 +5,11 @@
  * 2.0.
  */
 
-import { FleetStart } from '../../../../../fleet/public';
-import {
-  dataPluginMock,
-  Start as DataPublicStartMock,
-} from '../../../../../../../src/plugins/data/public/mocks';
-import type { UnifiedSearchPublicPluginStart } from '../../../../../../../src/plugins/unified_search/public';
-import { fleetMock } from '../../../../../fleet/public/mocks';
-import { unifiedSearchPluginMock } from '../../../../../../../src/plugins/unified_search/public/mocks';
+import { FleetStart } from '@kbn/fleet-plugin/public';
+import { dataPluginMock, Start as DataPublicStartMock } from '@kbn/data-plugin/public/mocks';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { fleetMock } from '@kbn/fleet-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 
 type DataMock = Omit<DataPublicStartMock, 'indexPatterns' | 'query'> & {
   indexPatterns: Omit<DataPublicStartMock['indexPatterns'], 'getFieldsForWildcard'> & {
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts
index 9adc946bc397e..9feee6cb614bb 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/http_handler_mock_factory.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import type { HttpFetchOptions, HttpFetchOptionsWithPath, HttpStart } from 'kibana/public';
+import type { HttpFetchOptions, HttpFetchOptionsWithPath, HttpStart } from '@kbn/core/public';
 import { merge } from 'lodash';
 import { act } from '@testing-library/react';
 
diff --git a/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts b/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
index 9748c36e544b3..d76140f60fca8 100644
--- a/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IStorage, Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { IStorage, Storage } from '@kbn/kibana-utils-plugin/public';
 
 export const localStorageMock = (): IStorage => {
   let store: Record<string, unknown> = {};
diff --git a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
index f183198e6f5c5..23a01bfc5f9e2 100644
--- a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
@@ -14,7 +14,7 @@ import { Provider as ReduxStoreProvider } from 'react-redux';
 import { Store } from 'redux';
 import { BehaviorSubject } from 'rxjs';
 import { ThemeProvider } from 'styled-components';
-import { Capabilities } from 'src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import { createStore, State } from '../store';
diff --git a/x-pack/plugins/security_solution/public/common/mock/utils.ts b/x-pack/plugins/security_solution/public/common/mock/utils.ts
index e0c57f90b4986..f405ebd59de9d 100644
--- a/x-pack/plugins/security_solution/public/common/mock/utils.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/utils.ts
@@ -8,7 +8,7 @@
 import { AnyAction, Reducer } from 'redux';
 import reduceReducers from 'reduce-reducers';
 
-import { tGridReducer } from '../../../../timelines/public';
+import { tGridReducer } from '@kbn/timelines-plugin/public';
 
 import { hostsReducer } from '../../hosts/store';
 import { networkReducer } from '../../network/store';
diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts b/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
index 3e3643fe6dbe0..ede7e2af44025 100644
--- a/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
+++ b/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
@@ -8,11 +8,10 @@
 import actionCreatorFactory from 'typescript-fsa';
 
 import type { Filter } from '@kbn/es-query';
+import type { SavedQuery } from '@kbn/data-plugin/public';
 import { InspectQuery, Refetch, RefetchKql } from './model';
 import { InputsModelId } from './constants';
 
-import type { SavedQuery } from '../../../../../../../src/plugins/data/public';
-
 const actionCreator = actionCreatorFactory('x-pack/security_solution/local/inputs');
 
 export const setAbsoluteRangeDatePicker = actionCreator<{
diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/model.ts b/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
index f5e31d42e22ea..66ab38cf77a95 100644
--- a/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
+++ b/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
@@ -7,9 +7,9 @@
 
 import { Dispatch } from 'redux';
 import type { Filter, Query } from '@kbn/es-query';
+import type { SavedQuery } from '@kbn/data-plugin/public';
 import { InputsModelId } from './constants';
 import { CONSTANTS } from '../../components/url_state/constants';
-import type { SavedQuery } from '../../../../../../../src/plugins/data/public';
 
 export interface AbsoluteTimeRange {
   kind: 'absolute';
diff --git a/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts b/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts
index 61377662fa812..9b43b504c6e7d 100644
--- a/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts
+++ b/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts
@@ -12,7 +12,7 @@ import {
   EMPTY_BROWSER_FIELDS,
   EMPTY_DOCVALUE_FIELD,
   EMPTY_INDEX_FIELDS,
-} from '../../../../../timelines/common';
+} from '@kbn/timelines-plugin/common';
 import { SecuritySolutionDataViewBase } from '../../types';
 /** Uniquely identifies a Sourcerer Scope */
 export enum SourcererScopeName {
diff --git a/x-pack/plugins/security_solution/public/common/store/store.ts b/x-pack/plugins/security_solution/public/common/store/store.ts
index a289eaf5cf853..02bee6595b1e1 100644
--- a/x-pack/plugins/security_solution/public/common/store/store.ts
+++ b/x-pack/plugins/security_solution/public/common/store/store.ts
@@ -20,6 +20,8 @@ import {
 import { createEpicMiddleware } from 'redux-observable';
 import { Observable } from 'rxjs';
 
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { telemetryMiddleware } from '../lib/telemetry';
 import { appSelectors } from './app';
 import { timelineSelectors } from '../../timelines/store/timeline';
@@ -29,8 +31,6 @@ import { createRootEpic } from './epic';
 import { AppAction } from './actions';
 import { Immutable } from '../../../common/endpoint/types';
 import { State } from './types';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-import { CoreStart } from '../../../../../../src/core/public';
 import { TimelineEpicDependencies } from '../../timelines/store/timeline/types';
 
 type ComposeType = typeof compose;
diff --git a/x-pack/plugins/security_solution/public/common/store/types.ts b/x-pack/plugins/security_solution/public/common/store/types.ts
index ac9a9643914da..226ab872ca2ee 100644
--- a/x-pack/plugins/security_solution/public/common/store/types.ts
+++ b/x-pack/plugins/security_solution/public/common/store/types.ts
@@ -7,7 +7,7 @@
 
 import { Dispatch, Action, Middleware, CombinedState } from 'redux';
 
-import { CoreStart } from '../../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { StartPlugins } from '../../types';
 import { AppAction } from './actions';
 import { Immutable } from '../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/common/translations.ts b/x-pack/plugins/security_solution/public/common/translations.ts
index 2058eaf03b5e1..64d31e7f6530d 100644
--- a/x-pack/plugins/security_solution/public/common/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/translations.ts
@@ -63,6 +63,10 @@ export const EMPTY_ACTION_ENDPOINT_DESCRIPTION = i18n.translate(
   }
 );
 
+export const BETA = i18n.translate('xpack.securitySolution.pages.common.beta', {
+  defaultMessage: 'Beta',
+});
+
 export const UPDATE_ALERT_STATUS_FAILED = (conflicts: number) =>
   i18n.translate('xpack.securitySolution.pages.common.updateAlertStatusFailed', {
     values: { conflicts },
diff --git a/x-pack/plugins/security_solution/public/common/types.ts b/x-pack/plugins/security_solution/public/common/types.ts
index 9399c5d31733f..1e0391b99c5be 100644
--- a/x-pack/plugins/security_solution/public/common/types.ts
+++ b/x-pack/plugins/security_solution/public/common/types.ts
@@ -6,9 +6,9 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ResponseErrorAttributes } from 'kibana/server';
+import { ResponseErrorAttributes } from '@kbn/core/server';
 import type { DataViewBase } from '@kbn/es-query';
-import { FieldSpec } from '../../../../../src/plugins/data_views/common';
+import { FieldSpec } from '@kbn/data-views-plugin/common';
 
 export interface ServerApiError {
   statusCode: number;
diff --git a/x-pack/plugins/security_solution/public/common/utils/alerts.ts b/x-pack/plugins/security_solution/public/common/utils/alerts.ts
index b147bc4dd61d1..b8843f447627d 100644
--- a/x-pack/plugins/security_solution/public/common/utils/alerts.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/alerts.ts
@@ -7,7 +7,7 @@
 
 import { merge } from '@kbn/std';
 import { isPlainObject } from 'lodash';
-import { Ecs } from '../../../../cases/common';
+import { Ecs } from '@kbn/cases-plugin/common';
 
 // TODO we need to allow ->  docValueFields: [{ field: "@timestamp" }],
 export const buildAlertsQuery = (alertIds: string[]) => {
diff --git a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts
index a6eb5909c0027..d24de08051115 100644
--- a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { cloneHttpFetchQuery } from './clone_http_fetch_query';
-import { HttpFetchQuery } from '../../../../../../src/core/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { Immutable } from '../../../common/endpoint/types';
 
 describe('cloneHttpFetchQuery', () => {
diff --git a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts
index dae3740a09fa3..0f230e3b72f95 100644
--- a/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/clone_http_fetch_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchQuery } from '../../../../../../src/core/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { Immutable } from '../../../common/endpoint/types';
 
 export function cloneHttpFetchQuery(query: Immutable<HttpFetchQuery>): HttpFetchQuery {
diff --git a/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx b/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx
index b46b3b4177239..7cf603cc7bfd3 100644
--- a/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/utils/empty_view/use_show_pages_with_empty_view.test.tsx
@@ -17,7 +17,7 @@ jest.mock('../route/use_route_spy', () => ({
     .mockImplementationOnce(() => [{ pageName: 'get_started' }])
     .mockImplementationOnce(() => [{ pageName: 'get_started' }]),
 }));
-jest.mock('../../../common/containers/sourcerer', () => ({
+jest.mock('../../containers/sourcerer', () => ({
   useSourcererDataView: jest
     .fn()
     .mockImplementationOnce(() => [{ indicesExist: false }])
diff --git a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
index 58bad0f698d68..abc5f1fb3f414 100644
--- a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
@@ -6,7 +6,7 @@
  */
 
 import { find, getOr, some } from 'lodash/fp';
-import { TimelineEventsDetailsItem } from '../../../../timelines/common';
+import { TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common';
 import { Ecs } from '../../../common/ecs';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx b/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx
index a5c4d81b1728c..46a3a86a47924 100644
--- a/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/utils/saved_query_services/index.tsx
@@ -6,10 +6,7 @@
  */
 
 import { useState, useEffect } from 'react';
-import {
-  SavedQueryService,
-  createSavedQueryService,
-} from '../../../../../../../src/plugins/data/public';
+import { SavedQueryService, createSavedQueryService } from '@kbn/data-plugin/public';
 
 import { useKibana } from '../../lib/kibana';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
index 4fc47421a720e..94e009a067fb5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/index.test.tsx
@@ -11,7 +11,7 @@ import { waitFor, act } from '@testing-library/react';
 import { mount } from 'enzyme';
 import { TestProviders } from '../../../../common/mock';
 
-import { AlertsCountPanel } from './index';
+import { AlertsCountPanel } from '.';
 import { useQueryToggle } from '../../../../common/containers/query_toggle';
 
 jest.mock('../../../../common/containers/query_toggle');
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
index 3135e2e173793..3c82161851dd3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../../../common/mock';
 import { SecurityPageName } from '../../../../app/types';
 import { MatrixLoader } from '../../../../common/components/matrix_histogram/matrix_loader';
 
-import { AlertsHistogramPanel } from './index';
+import { AlertsHistogramPanel } from '.';
 import * as helpers from './helpers';
 import { useQueryToggle } from '../../../../common/containers/query_toggle';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
index 84476c3ee6885..297027fdb9ab6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.tsx
@@ -15,13 +15,13 @@ import { isEmpty } from 'lodash/fp';
 import uuid from 'uuid';
 
 import { Filter, buildEsQuery, Query } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useGlobalTime } from '../../../../common/containers/use_global_time';
 import { DEFAULT_NUMBER_FORMAT, APP_UI_ID } from '../../../../../common/constants';
 import type { UpdateDateRange } from '../../../../common/components/charts/common';
 import type { LegendItem } from '../../../../common/components/charts/draggable_legend_item';
 import { escapeDataProviderId } from '../../../../common/components/drag_and_drop/helpers';
 import { HeaderSection } from '../../../../common/components/header_section';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useQueryAlerts } from '../../../containers/detection_engine/alerts/use_query';
 import { getDetectionEngineUrl, useFormatUrl } from '../../../../common/components/link_to';
 import { defaultLegendColors } from '../../../../common/components/matrix_histogram/utils';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/components.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/components.tsx
index 27f33409ae1a5..a72746f729ad5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/components.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/components.tsx
@@ -64,6 +64,7 @@ export const StackByComboBox: React.FC<StackedBySelectProps> = ({ selected, onSe
         placeholder={i18n.STACK_BY_PLACEHOLDER}
         prepend={i18n.STACK_BY_LABEL}
         singleSelection={singleSelection}
+        isClearable={false}
         sortMatchesBy="startsWith"
         options={stackOptions}
         selectedOptions={selectedOptions}
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts
index 85d8be5a2e846..a666c1781dba2 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts
@@ -8,7 +8,7 @@
 import { useEffect, useState, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import type { EuiComboBoxOptionOption } from '@elastic/eui';
-import type { BrowserField } from '../../../../../../timelines/common';
+import type { BrowserField } from '@kbn/timelines-plugin/common';
 import type { GlobalTimeArgs } from '../../../../common/containers/use_global_time';
 import { getScopeFromPath, useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { getAllFieldsByName } from '../../../../common/containers/source';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index dd79a244d2b1b..be4668282cad3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -18,7 +18,7 @@ import {
   mockTimelineDetails,
   mockTimelineResult,
   mockAADEcsDataWithAlert,
-} from '../../../common/mock/';
+} from '../../../common/mock';
 import { CreateTimeline, UpdateTimelineLoading } from './types';
 import { Ecs } from '../../../../common/ecs';
 import {
@@ -27,8 +27,8 @@ import {
   TimelineStatus,
   TimelineTabs,
 } from '../../../../common/types/timeline';
-import type { ISearchStart } from '../../../../../../../src/plugins/data/public';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import type { ISearchStart } from '@kbn/data-plugin/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { getTimelineTemplate } from '../../../timelines/containers/api';
 import { defaultHeaders } from '../../../timelines/components/timeline/body/column_headers/default_headers';
 import { KibanaServices } from '../../../common/lib/kibana';
@@ -47,7 +47,8 @@ import {
   NAMESPACE_TYPE,
   TIE_BREAKER,
   USER,
-} from '../../../../../lists/common/constants.mock';
+} from '@kbn/lists-plugin/common/constants.mock';
+import { of } from 'rxjs';
 
 jest.mock('../../../timelines/containers/api', () => ({
   getTimelineTemplate: jest.fn(),
@@ -156,9 +157,7 @@ describe('alert actions', () => {
       ...dataPluginMock.createStartContract().search,
       aggs: {} as ISearchStart['aggs'],
       showError: jest.fn(),
-      search: jest
-        .fn()
-        .mockImplementation(() => ({ toPromise: () => ({ data: mockTimelineDetails }) })),
+      search: jest.fn().mockImplementation(() => of({ data: mockTimelineDetails })),
       searchSource: {} as ISearchStart['searchSource'],
     };
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
index 1c3c010c972f7..c4b8d30f60635 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
@@ -26,6 +26,7 @@ import {
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { buildExceptionFilter } from '@kbn/securitysolution-list-utils';
 
+import { lastValueFrom } from 'rxjs';
 import {
   ALERT_ORIGINAL_TIME,
   ALERT_GROUP_ID,
@@ -530,8 +531,11 @@ export const sendAlertToTimelineAction = async ({
       updateTimelineIsLoading({ id: TimelineId.active, isLoading: true });
       const [responseTimeline, eventDataResp] = await Promise.all([
         getTimelineTemplate(timelineId),
-        searchStrategyClient
-          .search<TimelineEventsDetailsRequestOptions, TimelineEventsDetailsStrategyResponse>(
+        lastValueFrom(
+          searchStrategyClient.search<
+            TimelineEventsDetailsRequestOptions,
+            TimelineEventsDetailsStrategyResponse
+          >(
             {
               defaultIndex: [],
               docValueFields: [],
@@ -543,7 +547,7 @@ export const sendAlertToTimelineAction = async ({
               strategy: 'timelineSearchStrategy',
             }
           )
-          .toPromise(),
+        ),
       ]);
       const resultingTimeline: TimelineResult = getOr({}, 'data.getOneTimeline', responseTimeline);
       const eventData: TimelineEventsDetailsItem[] = eventDataResp.data ?? [];
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx
index 7c0b7cae95d03..4a56616ca8547 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_filter_group/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AlertsTableFilterGroup } from './index';
+import { AlertsTableFilterGroup } from '.';
 
 describe('AlertsTableFilterGroup', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx
index a3d3bf4834376..a9a0875a6f29a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_utility_bar/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 
-import { AlertsUtilityBar, AlertsUtilityBarProps } from './index';
+import { AlertsUtilityBar, AlertsUtilityBarProps } from '.';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
 jest.useFakeTimers();
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
index dba7915460ada..304f0ac180821 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
@@ -11,7 +11,7 @@ import { shallow } from 'enzyme';
 import '../../../common/mock/match_media';
 import { TimelineId } from '../../../../common/types/timeline';
 import { TestProviders } from '../../../common/mock';
-import { AlertsTableComponent } from './index';
+import { AlertsTableComponent } from '.';
 
 describe('AlertsTableComponent', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index b4f81e3e5f0e4..61199141c5ece 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -10,8 +10,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 import type { Filter } from '@kbn/es-query';
-import { APP_ID } from '../../../../common/constants';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
 import { RowRendererId, TimelineIdLiteral } from '../../../../common/types/timeline';
 import { StatefulEventsViewer } from '../../../common/components/events_viewer';
@@ -25,7 +24,7 @@ import { useAppToasts } from '../../../common/hooks/use_app_toasts';
 import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 import { useInvalidFilterQuery } from '../../../common/hooks/use_invalid_filter_query';
 import { defaultCellActions } from '../../../common/lib/cell_actions/default_cell_actions';
-import { useGetUserCasesPermissions, useKibana } from '../../../common/lib/kibana';
+import { useKibana } from '../../../common/lib/kibana';
 import { inputsModel, inputsSelectors, State } from '../../../common/store';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import * as i18nCommon from '../../../common/translations';
@@ -365,34 +364,29 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
 
   const leadingControlColumns = useMemo(() => getDefaultControlColumn(ACTION_BUTTON_COUNT), []);
 
-  const casesPermissions = useGetUserCasesPermissions();
-  const CasesContext = kibana.services.cases.ui.getCasesContext();
-
   if (loading || isEmpty(selectedPatterns)) {
     return null;
   }
 
   return (
-    <CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
-      <StatefulEventsViewer
-        additionalFilters={additionalFiltersComponent}
-        currentFilter={filterGroup}
-        defaultCellActions={defaultCellActions}
-        defaultModel={alertsDefaultModel}
-        end={to}
-        entityType="events"
-        hasAlertsCrud={hasIndexWrite && hasIndexMaintenance}
-        id={timelineId}
-        leadingControlColumns={leadingControlColumns}
-        onRuleChange={onRuleChange}
-        pageFilters={defaultFiltersMemo}
-        renderCellValue={RenderCellValue}
-        rowRenderers={defaultRowRenderers}
-        scopeId={SourcererScopeName.detections}
-        start={from}
-        utilityBar={utilityBarCallback}
-      />
-    </CasesContext>
+    <StatefulEventsViewer
+      additionalFilters={additionalFiltersComponent}
+      currentFilter={filterGroup}
+      defaultCellActions={defaultCellActions}
+      defaultModel={alertsDefaultModel}
+      end={to}
+      entityType="events"
+      hasAlertsCrud={hasIndexWrite && hasIndexMaintenance}
+      id={timelineId}
+      leadingControlColumns={leadingControlColumns}
+      onRuleChange={onRuleChange}
+      pageFilters={defaultFiltersMemo}
+      renderCellValue={RenderCellValue}
+      rowRenderers={defaultRowRenderers}
+      scopeId={SourcererScopeName.detections}
+      start={from}
+      utilityBar={utilityBarCallback}
+    />
   );
 };
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
index d5fc54c5cbac7..0f613aff8d456 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
@@ -12,7 +12,7 @@ import { TestProviders } from '../../../../common/mock';
 import React from 'react';
 import { Ecs } from '../../../../../common/ecs';
 import { mockTimelines } from '../../../../common/mock/mock_timelines_plugin';
-import { mockCasesContract } from '../../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 const ecsRowData: Ecs = {
   _id: '1',
@@ -61,12 +61,9 @@ jest.mock('../../../../common/lib/kibana', () => ({
   }),
 }));
 
-jest.mock(
-  '../../../../detections/containers/detection_engine/alerts/use_alerts_privileges',
-  () => ({
-    useAlertsPrivileges: jest.fn().mockReturnValue({ hasIndexWrite: true, hasKibanaCRUD: true }),
-  })
-);
+jest.mock('../../../containers/detection_engine/alerts/use_alerts_privileges', () => ({
+  useAlertsPrivileges: jest.fn().mockReturnValue({ hasIndexWrite: true, hasKibanaCRUD: true }),
+}));
 
 const actionMenuButton = '[data-test-subj="timeline-context-menu-button"] button';
 const addToExistingCaseButton = '[data-test-subj="add-to-existing-case-action"]';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
index 3d1fe638eab5a..a6af9febe8b3e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
@@ -12,11 +12,11 @@ import { indexOf } from 'lodash';
 import { connect, ConnectedProps } from 'react-redux';
 import { ExceptionListType } from '@kbn/securitysolution-io-ts-list-types';
 import { get } from 'lodash/fp';
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { useRouteSpy } from '../../../../common/utils/route/use_route_spy';
 import { buildGetAlertByIdQuery } from '../../../../common/components/exceptions/helpers';
 import { useUserPrivileges } from '../../../../common/components/user_privileges';
 import { EventsTdContent } from '../../../../timelines/components/timeline/styles';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../timelines/public';
 import { Ecs } from '../../../../../common/ecs';
 import {
   AddExceptionFlyout,
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx
index 9564347e88ccd..151c390fda5ee 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.test.tsx
@@ -10,7 +10,7 @@ import { TestProviders } from '../../../../common/mock';
 import { KibanaServices, useKibana } from '../../../../common/lib/kibana';
 import { Ecs } from '../../../../../common/ecs';
 import * as actions from '../actions';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { SendAlertToTimelineActionProps } from '../types';
 import { InvestigateInTimelineAction } from './investigate_in_timeline_action';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx
index 34807e368cbe4..b6c8f5aea2ce5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_add_to_case_actions.tsx
@@ -7,8 +7,8 @@
 
 import React, { useCallback, useMemo } from 'react';
 import { EuiContextMenuItem } from '@elastic/eui';
-import { CommentType } from '../../../../../../cases/common';
-import { CaseAttachments } from '../../../../../../cases/public';
+import { CommentType } from '@kbn/cases-plugin/common';
+import { CaseAttachments } from '@kbn/cases-plugin/public';
 import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import type { TimelineNonEcsData } from '../../../../../common/search_strategy';
 import { TimelineId } from '../../../../../common/types';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
index b87cea7008442..828c72aad3986 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_alerts_actions.tsx
@@ -8,7 +8,7 @@
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { useStatusBulkActionItems } from '../../../../../../timelines/public';
+import { useStatusBulkActionItems } from '@kbn/timelines-plugin/public';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { timelineActions } from '../../../../timelines/store/timeline';
 import { useAlertsPrivileges } from '../../../containers/detection_engine/alerts/use_alerts_privileges';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx
index 7dea1581e9f0f..dad495cdc507d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.test.tsx
@@ -11,7 +11,7 @@ import { KibanaServices, useKibana } from '../../../../common/lib/kibana';
 import { Ecs } from '../../../../../common/ecs';
 import { useInvestigateInTimeline } from './use_investigate_in_timeline';
 import * as actions from '../actions';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import type { SendAlertToTimelineActionProps } from '../types';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
index 6773a4fddaeaf..e564bc221e275 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
@@ -7,7 +7,7 @@
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import type { ISearchStart } from '../../../../../../../src/plugins/data/public';
+import type { ISearchStart } from '@kbn/data-plugin/public';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
 import { Ecs } from '../../../../common/ecs';
 import { NoteResult } from '../../../../common/types/timeline/note';
diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx
index 23f6eea435d72..889f19acae630 100644
--- a/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/callouts/ml_job_compatibility_callout/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../../common/mock';
 import { useInstalledSecurityJobs } from '../../../../common/components/ml/hooks/use_installed_security_jobs';
-import { MlJobCompatibilityCallout } from './index';
+import { MlJobCompatibilityCallout } from '.';
 
 jest.mock('../../../../common/components/ml/hooks/use_installed_security_jobs');
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx
index 66b2bae98c1ae..1ca40a32195f8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/callouts/need_admin_for_update_callout/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { mount } from 'enzyme';
 import React from 'react';
-import { NeedAdminForUpdateRulesCallOut } from './index';
+import { NeedAdminForUpdateRulesCallOut } from '.';
 import { TestProviders } from '../../../../common/mock';
 import * as userInfo from '../../user_info';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx
index 8157cf9057690..ee7b8723ae1bc 100644
--- a/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/callouts/no_api_integration_callout/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { NoApiIntegrationKeyCallOut } from './index';
+import { NoApiIntegrationKeyCallOut } from '.';
 
 describe('no_api_integration_callout', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx
index acbae367fe75e..929b7c4109787 100644
--- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo } from 'react';
 import { find } from 'lodash/fp';
-import { Maybe } from '../../../../../observability/common/typings';
+import { Maybe } from '@kbn/observability-plugin/common/typings';
 import { useCasesFromAlerts } from '../../containers/detection_engine/alerts/use_cases_from_alerts';
 import { TimelineEventsDetailsItem } from '../../../../common/search_strategy';
 import { IsolateHost } from './isolate';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx
index fc0757baecbeb..6ed37e16ec747 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/accordion_title/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AccordionTitle } from './index';
+import { AccordionTitle } from '.';
 
 describe('AccordionTitle', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx
index a125d3e4f0f8c..575baa1647d5e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/add_item_form/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AddItem } from './index';
+import { AddItem } from '.';
 import { useFormFieldMock } from '../../../../common/mock/test_providers';
 
 describe('AddItem', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx
index b219d0d026380..ec0b95aab778a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/anomaly_threshold_slider/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AnomalyThresholdSlider } from './index';
+import { AnomalyThresholdSlider } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('AnomalyThresholdSlider', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx
index 3c733870e8498..41db125b70a16 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx
@@ -9,7 +9,7 @@ import React, { useCallback, useMemo } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { FieldComponent } from '@kbn/securitysolution-autocomplete';
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
-import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+import { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
 interface AutocompleteFieldProps {
   dataTestSubj: string;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx
index 8618575a7a4c9..066a29b4c05b7 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/actions_description.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { startCase } from 'lodash/fp';
-import { RuleAction } from '../../../../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 const ActionsDescription = ({ actions }: { actions: RuleAction[] }) => {
   if (!actions.length) return null;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
index 2e34935d0f281..2cefb21e81294 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { FilterManager, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
-import { FilterLabel } from '../../../../../../../../src/plugins/unified_search/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { FilterManager, UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FilterLabel } from '@kbn/unified-search-plugin/public';
 import { DataViewBase, FilterStateStore } from '@kbn/es-query';
 import { SeverityBadge } from '../severity_badge';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
index 42104c5052548..df407e4e88ecf 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
@@ -24,13 +24,13 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { ThreatMapping, Type } from '@kbn/securitysolution-io-ts-alerting-types';
+import { getDisplayValueFromFilter } from '@kbn/data-plugin/public';
+import { FilterLabel } from '@kbn/unified-search-plugin/public';
 import { MATCHES, AND, OR } from '../../../../common/components/threat_match/translations';
 import { assertUnreachable } from '../../../../../common/utility_types';
 import * as i18nSeverity from '../severity_mapping/translations';
 import * as i18nRiskScore from '../risk_score_mapping/translations';
 import { Threshold } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { getDisplayValueFromFilter } from '../../../../../../../../src/plugins/data/public';
-import { FilterLabel } from '../../../../../../../../src/plugins/unified_search/public';
 import {
   subtechniquesOptions,
   tacticsOptions,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx
index 70fc4cf61503b..109b59b89ea16 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.test.tsx
@@ -15,13 +15,13 @@ import {
   getDescriptionItem,
 } from '.';
 
-import { FilterManager, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager, UI_SETTINGS } from '@kbn/data-plugin/public';
 import { Filter, FilterStateStore } from '@kbn/es-query';
 import {
   mockAboutStepRule,
   mockDefineStepRule,
 } from '../../../pages/detection_engine/rules/all/__mocks__/mock';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
index 62ea034dd0b33..c72b96242df07 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
@@ -12,7 +12,7 @@ import styled from 'styled-components';
 
 import { ThreatMapping, Threats, Type } from '@kbn/securitysolution-io-ts-alerting-types';
 import { DataViewBase, Filter, FilterStateStore } from '@kbn/es-query';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations';
 import { useKibana } from '../../../../common/lib/kibana';
 import { AboutStepRiskScore, AboutStepSeverity } from '../../../pages/detection_engine/rules/types';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx
index 4b61504ec997a..9aff7d8effd30 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/ml_job_description.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { EuiBadge, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui';
 
-import { ML_PAGES, MlSummaryJob, useMlHref } from '../../../../../../ml/public';
+import { ML_PAGES, MlSummaryJob, useMlHref } from '@kbn/ml-plugin/public';
 import { isJobStarted } from '../../../../../common/machine_learning/helpers';
 import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/use_security_jobs';
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts
index ab7c0ea9ed47d..7820cc5a09c87 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts
@@ -8,7 +8,7 @@
 import { ReactNode } from 'react';
 import { Threats } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { DataViewBase, Filter } from '@kbn/es-query';
-import type { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
 export interface ListItems {
   title: NonNullable<ReactNode>;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx
index 588c058aade2e..4728507abab4c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/mitre/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { AddMitreAttackThreat } from './index';
+import { AddMitreAttackThreat } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('AddMitreThreat', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx
index 0de48057cc8dc..5323ac16bff4f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/ml_job_select/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { MlJobSelect } from './index';
+import { MlJobSelect } from '.';
 import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/use_security_jobs';
 import { useFormFieldMock } from '../../../../common/mock';
 jest.mock('../../../../common/components/ml_popover/hooks/use_security_jobs');
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx
index 9fa75161e027e..462855bbf9618 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/next_step/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { NextStep } from './index';
+import { NextStep } from '.';
 
 describe('NextStep', () => {
   test('renders correctly against snapshot', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx
index bb34eddfb6b32..48f1e7b603d1b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/optional_field_label/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 
-import { OptionalFieldLabel } from './index';
+import { OptionalFieldLabel } from '.';
 
 describe('OptionalFieldLabel', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx
index 5f1ecf04c0ee9..a7e07e4178c5f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/pick_timeline/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { PickTimeline } from './index';
+import { PickTimeline } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('PickTimeline', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx
index 460f984202327..793e138cebfa4 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { QueryBarDefineRule } from './index';
+import { QueryBarDefineRule } from '.';
 import {
   TestProviders,
   useFormFieldMock,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx
index a2d2a2ab10f81..2ce403a832906 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/query_bar/index.tsx
@@ -11,7 +11,7 @@ import { Subscription } from 'rxjs';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import { FilterManager, SavedQuery } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager, SavedQuery } from '@kbn/data-plugin/public';
 
 import { BrowserFields } from '../../../../common/containers/source';
 import { OpenTimelineModal } from '../../../../timelines/components/open_timeline/open_timeline_modal';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
index fcc95f2398cf7..bad1c644ccdbe 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
@@ -22,8 +22,8 @@ import { noop } from 'lodash/fp';
 import { RiskScoreMapping } from '@kbn/securitysolution-io-ts-alerting-types';
 import { FieldComponent } from '@kbn/securitysolution-autocomplete';
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import * as i18n from './translations';
-import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 import { AboutStepRiskScore } from '../../../pages/detection_engine/rules/types';
 
 const NestedContent = styled.div`
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
index 93c429bb84797..a438af12f8d71 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { getSupportedActions, RuleActionsField } from './index';
+import { getSupportedActions, RuleActionsField } from '.';
 import { useForm, Form } from '../../../../shared_imports';
 import { useKibana } from '../../../../common/lib/kibana';
 import { useFormFieldMock } from '../../../../common/mock';
-import { ActionType } from '../../../../../../actions/common';
+import { ActionType } from '@kbn/actions-plugin/common';
 jest.mock('../../../../common/lib/kibana');
 
 describe('RuleActionsField', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
index 5fb7266e228a5..01e978ca2e61c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
@@ -12,15 +12,15 @@ import deepMerge from 'deepmerge';
 import ReactMarkdown from 'react-markdown';
 import styled from 'styled-components';
 
-import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../common/constants';
-import { FieldHook, useFormContext } from '../../../../shared_imports';
 import {
   ActionForm,
   ActionType,
   loadActionTypes,
   ActionVariables,
-} from '../../../../../../triggers_actions_ui/public';
-import { RuleAction } from '../../../../../../alerting/common';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleAction } from '@kbn/alerting-plugin/common';
+import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../common/constants';
+import { FieldHook, useFormContext } from '../../../../shared_imports';
 import { convertArrayToCamelCase, useKibana } from '../../../../common/lib/kibana';
 import { FORM_ERRORS_TITLE } from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx
index 71fabef22c904..6085fab4419ab 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.test.tsx
@@ -12,7 +12,7 @@ import {
   goToRuleEditPage,
   executeRulesBulkAction,
 } from '../../../pages/detection_engine/rules/all/actions';
-import { RuleActionsOverflow } from './index';
+import { RuleActionsOverflow } from '.';
 import { mockRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock';
 
 jest.mock('../../../../common/hooks/use_app_toasts');
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx
index 0bf229000088a..e6aaa976ef3d5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 
 import { TestProviders } from '../../../../common/mock';
-import { RulePreview, RulePreviewProps } from './';
+import { RulePreview, RulePreviewProps } from '.';
 import { usePreviewRoute } from './use_preview_route';
 import { usePreviewHistogram } from './use_preview_histogram';
 
@@ -85,44 +85,44 @@ describe('PreviewQuery', () => {
     jest.clearAllMocks();
   });
 
-  test('it renders timeframe select and preview button on render', () => {
+  test('it renders timeframe select and preview button on render', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} />
       </TestProviders>
     );
 
-    expect(wrapper.findByTestId('rule-preview')).toBeTruthy();
-    expect(wrapper.findByTestId('preview-time-frame')).toBeTruthy();
+    expect(await wrapper.findByTestId('rule-preview')).toBeTruthy();
+    expect(await wrapper.findByTestId('preview-time-frame')).toBeTruthy();
   });
 
-  test('it renders preview button disabled if "isDisabled" is true', () => {
+  test('it renders preview button disabled if "isDisabled" is true', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} isDisabled={true} />
       </TestProviders>
     );
 
-    expect(wrapper.getByTestId('queryPreviewButton').closest('button')).toBeDisabled();
+    expect(await wrapper.getByTestId('queryPreviewButton').closest('button')).toBeDisabled();
   });
 
-  test('it renders preview button enabled if "isDisabled" is false', () => {
+  test('it renders preview button enabled if "isDisabled" is false', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} />
       </TestProviders>
     );
 
-    expect(wrapper.getByTestId('queryPreviewButton').closest('button')).not.toBeDisabled();
+    expect(await wrapper.getByTestId('queryPreviewButton').closest('button')).not.toBeDisabled();
   });
 
-  test('does not render histogram when there is no previewId', () => {
+  test('does not render histogram when there is no previewId', async () => {
     const wrapper = render(
       <TestProviders>
         <RulePreview {...defaultProps} />
       </TestProviders>
     );
 
-    expect(wrapper.queryByTestId('[data-test-subj="preview-histogram-panel"]')).toBeNull();
+    expect(await wrapper.queryByTestId('[data-test-subj="preview-histogram-panel"]')).toBeNull();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx
index 1286f6d5758c7..237f4806a58e6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/index.tsx
@@ -17,7 +17,7 @@ import {
   EuiButton,
   EuiSpacer,
 } from '@elastic/eui';
-import { useSecurityJobs } from '../../../../../public/common/components/ml_popover/hooks/use_security_jobs';
+import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/use_security_jobs';
 import { FieldValueQueryBar } from '../query_bar';
 import * as i18n from './translations';
 import { usePreviewRoute } from './use_preview_route';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx
index 1f16ddf3f845e..59c0af79391bd 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.test.tsx
@@ -8,7 +8,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 
-import * as i18n from '../rule_preview/translations';
 import { useGlobalTime } from '../../../../common/containers/use_global_time';
 import { TestProviders } from '../../../../common/mock';
 import { usePreviewHistogram } from './use_preview_histogram';
@@ -19,7 +18,7 @@ import { ALL_VALUES_ZEROS_TITLE } from '../../../../common/components/charts/tra
 jest.mock('../../../../common/lib/kibana');
 jest.mock('../../../../common/containers/use_global_time');
 jest.mock('./use_preview_histogram');
-jest.mock('../../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../../common/components/url_state/normalize_time_range');
 
 describe('PreviewHistogram', () => {
   const mockSetQuery = jest.fn();
@@ -49,7 +48,7 @@ describe('PreviewHistogram', () => {
       },
     ]);
 
-    test('it renders an empty histogram and table', () => {
+    test('it renders an empty histogram and table', async () => {
       const wrapper = render(
         <TestProviders>
           <PreviewHistogram
@@ -63,37 +62,38 @@ describe('PreviewHistogram', () => {
         </TestProviders>
       );
 
-      expect(wrapper.findByText('hello grid')).toBeTruthy();
-      expect(wrapper.findByText(ALL_VALUES_ZEROS_TITLE)).toBeTruthy();
+      expect(await wrapper.findByText('hello grid')).toBeTruthy();
+      expect(await wrapper.findByText(ALL_VALUES_ZEROS_TITLE)).toBeTruthy();
     });
   });
 
-  test('it renders loader when isLoading is true', () => {
-    (usePreviewHistogram as jest.Mock).mockReturnValue([
-      true,
-      {
-        inspect: { dsl: [], response: [] },
-        totalCount: 1,
-        refetch: jest.fn(),
-        data: [],
-        buckets: [],
-      },
-    ]);
+  describe('when there is data', () => {
+    test('it renders loader when isLoading is true', async () => {
+      (usePreviewHistogram as jest.Mock).mockReturnValue([
+        true,
+        {
+          inspect: { dsl: [], response: [] },
+          totalCount: 1,
+          refetch: jest.fn(),
+          data: [],
+          buckets: [],
+        },
+      ]);
 
-    const wrapper = render(
-      <TestProviders>
-        <PreviewHistogram
-          addNoiseWarning={jest.fn()}
-          timeFrame="M"
-          previewId={'test-preview-id'}
-          spaceId={'default'}
-          ruleType={'query'}
-          index={['']}
-        />
-      </TestProviders>
-    );
+      const wrapper = render(
+        <TestProviders>
+          <PreviewHistogram
+            addNoiseWarning={jest.fn()}
+            timeFrame="M"
+            previewId={'test-preview-id'}
+            spaceId={'default'}
+            ruleType={'query'}
+            index={['']}
+          />
+        </TestProviders>
+      );
 
-    expect(wrapper.findByTestId('preview-histogram-loading')).toBeTruthy();
-    expect(wrapper.findByText(i18n.QUERY_PREVIEW_SUBTITLE_LOADING)).toBeTruthy();
+      expect(await wrapper.findByTestId('preview-histogram-loading')).toBeTruthy();
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.tsx
index 2119ab75ee67b..c311736107194 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_histogram.tsx
@@ -28,7 +28,7 @@ import { alertsPreviewDefaultModel } from '../../alerts_table/default_config';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
 import { defaultRowRenderers } from '../../../../timelines/components/timeline/body/renderers';
 import { TimelineId } from '../../../../../common/types';
-import { APP_ID, APP_UI_ID, DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
+import { APP_UI_ID, DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
 import { FIELDS_WITHOUT_CELL_ACTIONS } from '../../../../common/lib/cell_actions/constants';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { DetailsPanel } from '../../../../timelines/components/side_panel';
@@ -74,7 +74,7 @@ export const PreviewHistogram = ({
 }: PreviewHistogramProps) => {
   const dispatch = useDispatch();
   const { setQuery, isInitializing } = useGlobalTime();
-  const { timelines: timelinesUi, cases } = useKibana().services;
+  const { timelines: timelinesUi } = useKibana().services;
   const from = useMemo(() => `now-1${timeFrame}`, [timeFrame]);
   const to = useMemo(() => 'now', []);
   const startDate = useMemo(() => formatDate(from), [from]);
@@ -155,8 +155,6 @@ export const PreviewHistogram = ({
 
   const chartData = useMemo((): ChartSeriesData[] => [{ key: 'hits', value: data }], [data]);
 
-  const CasesContext = cases.ui.getCasesContext();
-
   return (
     <>
       <Panel height={DEFAULT_HISTOGRAM_HEIGHT} data-test-subj={'preview-histogram-panel'}>
@@ -194,54 +192,52 @@ export const PreviewHistogram = ({
         </EuiFlexGroup>
       </Panel>
       <EuiSpacer />
-      <CasesContext owner={[APP_ID]} userCanCrud={false}>
-        <FullScreenContainer $isFullScreen={globalFullScreen}>
-          <InspectButtonContainer>
-            {timelinesUi.getTGrid<'embedded'>({
-              additionalFilters: <></>,
-              appId: APP_UI_ID,
-              browserFields,
-              columns,
-              dataProviders,
-              deletedEventIds,
-              disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
-              docValueFields,
-              end: endDate,
-              entityType: 'events',
-              filters: [],
-              globalFullScreen,
-              hasAlertsCrud: false,
-              id: TimelineId.rulePreview,
-              indexNames: [`${DEFAULT_PREVIEW_INDEX}-${spaceId}`],
-              indexPattern,
-              isLive: false,
-              isLoadingIndexPattern,
-              itemsPerPage,
-              itemsPerPageOptions,
-              kqlMode,
-              query: { query: `kibana.alert.rule.uuid:${previewId}`, language: 'kuery' },
-              renderCellValue: PreviewRenderCellValue,
-              rowRenderers: defaultRowRenderers,
-              runtimeMappings,
-              setQuery: () => {},
-              sort,
-              start: startDate,
-              tGridEventRenderedViewEnabled,
-              type: 'embedded',
-              leadingControlColumns: getPreviewTableControlColumn(1.5),
-            })}
-          </InspectButtonContainer>
-        </FullScreenContainer>
-        <DetailsPanel
-          browserFields={browserFields}
-          entityType={'events'}
-          docValueFields={docValueFields}
-          isFlyoutView
-          runtimeMappings={runtimeMappings}
-          timelineId={TimelineId.rulePreview}
-          isReadOnly
-        />
-      </CasesContext>
+      <FullScreenContainer $isFullScreen={globalFullScreen}>
+        <InspectButtonContainer>
+          {timelinesUi.getTGrid<'embedded'>({
+            additionalFilters: <></>,
+            appId: APP_UI_ID,
+            browserFields,
+            columns,
+            dataProviders,
+            deletedEventIds,
+            disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
+            docValueFields,
+            end: endDate,
+            entityType: 'events',
+            filters: [],
+            globalFullScreen,
+            hasAlertsCrud: false,
+            id: TimelineId.rulePreview,
+            indexNames: [`${DEFAULT_PREVIEW_INDEX}-${spaceId}`],
+            indexPattern,
+            isLive: false,
+            isLoadingIndexPattern,
+            itemsPerPage,
+            itemsPerPageOptions,
+            kqlMode,
+            query: { query: `kibana.alert.rule.uuid:${previewId}`, language: 'kuery' },
+            renderCellValue: PreviewRenderCellValue,
+            rowRenderers: defaultRowRenderers,
+            runtimeMappings,
+            setQuery: () => {},
+            sort,
+            start: startDate,
+            tGridEventRenderedViewEnabled,
+            type: 'embedded',
+            leadingControlColumns: getPreviewTableControlColumn(1.5),
+          })}
+        </InspectButtonContainer>
+      </FullScreenContainer>
+      <DetailsPanel
+        browserFields={browserFields}
+        entityType={'events'}
+        docValueFields={docValueFields}
+        isFlyoutView
+        runtimeMappings={runtimeMappings}
+        timelineId={TimelineId.rulePreview}
+        isReadOnly
+      />
     </>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx
index 37b03dbc3fd88..d4c57910a9269 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.test.tsx
@@ -15,7 +15,7 @@ import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../com
 import { PreviewTableCellRenderer } from './preview_table_cell_renderer';
 import { getColumnRenderer } from '../../../../timelines/components/timeline/body/renderers/get_column_renderer';
 import { DroppableWrapper } from '../../../../common/components/drag_and_drop/droppable_wrapper';
-import { BrowserFields } from '../../../../../../timelines/common/search_strategy';
+import { BrowserFields } from '@kbn/timelines-plugin/common/search_strategy';
 import { Ecs } from '../../../../../common/ecs';
 import { columnRenderers } from '../../../../timelines/components/timeline/body/renderers';
 
@@ -114,7 +114,6 @@ describe('PreviewTableCellRenderer', () => {
 
     expect(mockImplementation.renderColumn).toBeCalledWith({
       asPlainText: false,
-      browserFields,
       columnName: header.id,
       ecsData,
       eventId,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx
index 0e9df27827e47..8d9edd2ebc92b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_cell_renderer.tsx
@@ -7,18 +7,17 @@
 
 import React, { useMemo } from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
+import { CellValueElementProps } from '@kbn/timelines-plugin/common';
 import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { StyledContent } from '../../../../common/lib/cell_actions/expanded_cell_value_actions';
 import { getLinkColumnDefinition } from '../../../../common/lib/cell_actions/helpers';
 import { useGetMappedNonEcsValue } from '../../../../timelines/components/timeline/body/data_driven_columns';
 import { columnRenderers } from '../../../../timelines/components/timeline/body/renderers';
 import { getColumnRenderer } from '../../../../timelines/components/timeline/body/renderers/get_column_renderer';
-import { CellValueElementProps } from '../../../../../../timelines/common';
 
 export const PreviewRenderCellValue: React.FC<
   EuiDataGridCellValueElementProps & CellValueElementProps
 > = ({
-  browserFields,
   columnId,
   data,
   ecsData,
@@ -38,7 +37,6 @@ export const PreviewRenderCellValue: React.FC<
   truncate,
 }) => (
   <PreviewTableCellRenderer
-    browserFields={browserFields}
     columnId={columnId}
     data={data}
     ecsData={ecsData}
@@ -60,7 +58,6 @@ export const PreviewRenderCellValue: React.FC<
 );
 
 export const PreviewTableCellRenderer: React.FC<CellValueElementProps> = ({
-  browserFields,
   data,
   ecsData,
   eventId,
@@ -95,7 +92,6 @@ export const PreviewTableCellRenderer: React.FC<CellValueElementProps> = ({
       <StyledContent className={styledContentClassName} $isDetails={isDetails}>
         {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
           asPlainText,
-          browserFields,
           columnName: header.id,
           ecsData,
           eventId,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx
index c8f59149ea1a2..a110ceb8edaf6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/preview_table_control_columns.tsx
@@ -8,11 +8,8 @@
 import { EuiToolTip, EuiButtonIcon } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
-import { ControlColumnProps, ActionProps } from '../../../../../../timelines/common';
-import {
-  getActionsColumnWidth,
-  DEFAULT_ACTION_BUTTON_WIDTH,
-} from '../../../../../../timelines/public';
+import { ControlColumnProps, ActionProps } from '@kbn/timelines-plugin/common';
+import { getActionsColumnWidth, DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import * as i18n from './translations';
 
 const EventsTdContent = styled.div.attrs(({ className }) => ({
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts
index 81ff4b8cfc440..3be499b5a60d0 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/translations.ts
@@ -146,13 +146,6 @@ export const ML_PREVIEW_HISTOGRAM_DISCLAIMER = i18n.translate(
   }
 );
 
-export const QUERY_PREVIEW_SUBTITLE_LOADING = i18n.translate(
-  'xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading',
-  {
-    defaultMessage: '...loading',
-  }
-);
-
 export const QUERY_PREVIEW_EQL_SEQUENCE_TITLE = i18n.translate(
   'xpack.securitySolution.detectionEngine.queryPreview.queryPreviewEqlSequenceTitle',
   {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx
index d336c75bb5f49..d65fd91e6b891 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview/use_preview_histogram.tsx
@@ -6,10 +6,10 @@
  */
 import { useMemo } from 'react';
 import { Type } from '@kbn/securitysolution-io-ts-alerting-types';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useMatrixHistogramCombined } from '../../../../common/containers/matrix_histogram';
 import { MatrixHistogramType } from '../../../../../common/search_strategy';
 import { convertToBuildEsQuery } from '../../../../common/lib/keury';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useKibana } from '../../../../common/lib/kibana';
 import { QUERY_PREVIEW_ERROR } from './translations';
 import { DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx
index ec643962d41a6..68e7d9a973b85 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_switch/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { waitFor } from '@testing-library/react';
 
 import { performBulkAction } from '../../../containers/detection_engine/rules';
-import { RuleSwitchComponent } from './index';
+import { RuleSwitchComponent } from '.';
 import { getRulesSchemaMock } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
 import { useRulesTableContextOptional } from '../../../pages/detection_engine/rules/all/rules_table/rules_table_context';
 import { useRulesTableContextMock } from '../../../pages/detection_engine/rules/all/rules_table/__mocks__/rules_table_context';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx
index 11393c0fdda2a..057ecbdae5fc8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/schedule_item_form/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { ScheduleItem } from './index';
+import { ScheduleItem } from '.';
 import { TestProviders, useFormFieldMock } from '../../../../common/mock';
 
 describe('ScheduleItem', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx
index 7270145bdbbb3..c751780a1c333 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { SelectRuleType } from './index';
+import { SelectRuleType } from '.';
 import { TestProviders, useFormFieldMock } from '../../../../common/mock';
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx
index cff7b50a5ea28..fd636814d921d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/severity_badge/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { SeverityBadge } from './index';
+import { SeverityBadge } from '.';
 
 describe('SeverityBadge', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
index da7b1e0067691..4ea2ece016680 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
@@ -30,8 +30,8 @@ import {
 } from '@kbn/securitysolution-autocomplete';
 
 import type { DataViewBase, DataViewFieldBase } from '@kbn/es-query';
+import { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import * as i18n from './translations';
-import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 import { SeverityOptionItem } from '../step_about_rule/data';
 import { AboutStepSeverity } from '../../../pages/detection_engine/rules/types';
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx
index 7afcad39d5a70..810bab87e5f97 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/status_icon/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { TestProviders } from '../../../../common/mock';
-import { RuleStatusIcon } from './index';
+import { RuleStatusIcon } from '.';
 jest.mock('../../../../common/lib/kibana');
 
 describe('RuleStatusIcon', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
index 3c34897fe2e65..02600b80c3b66 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
@@ -10,7 +10,7 @@ import { mount, shallow } from 'enzyme';
 import { ThemeProvider } from 'styled-components';
 import { act } from '@testing-library/react';
 
-import { stubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { StepAboutRule } from '.';
 import { useFetchIndex } from '../../../../common/containers/source';
 import { mockAboutStepRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock';
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx
index 0c6dbe73933af..a631fbc70d016 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_content_wrapper/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepContentWrapper } from './index';
+import { StepContentWrapper } from '.';
 
 describe('StepContentWrapper', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx
index 10d07d87b09fd..6c19a49c7f491 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.test.tsx
@@ -8,11 +8,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepDefineRule } from './index';
+import { StepDefineRule, aggregatableFields } from '.';
 import mockBrowserFields from './mock_browser_fields.json';
 
-import { aggregatableFields } from '.';
-
 jest.mock('../../../../common/lib/kibana');
 
 test('aggregatableFields', function () {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx
index 6b3e9500040c4..f10459999e82f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_panel/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepPanel } from './index';
+import { StepPanel } from '.';
 
 describe('StepPanel', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx
index 24bd485d83d15..2589ff1a30c62 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { StepRuleActions } from './index';
+import { StepRuleActions } from '.';
 
 jest.mock('../../../../common/lib/kibana', () => ({
   useKibana: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
index 94a883e6bae19..2fa0919a072ef 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.tsx
@@ -17,7 +17,7 @@ import {
 import { findIndex } from 'lodash/fp';
 import React, { FC, memo, useCallback, useEffect, useMemo } from 'react';
 
-import { ActionVariables } from '../../../../../../triggers_actions_ui/public';
+import { ActionVariables } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   RuleStep,
   RuleStepProps,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
index d40d7c776c0d5..016100c762eb7 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
@@ -7,7 +7,7 @@
 
 import { validateSingleAction, validateRuleActionsField } from './schema';
 import { getActionTypeName, validateMustache, validateActionParams } from './utils';
-import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 import { FormHook } from '../../../../shared_imports';
 jest.mock('./utils');
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
index 936dd283793cb..ceaa3365e2785 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
@@ -9,10 +9,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  RuleAction,
-  ActionTypeRegistryContract,
-} from '../../../../../../triggers_actions_ui/public';
+import { RuleAction, ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   FormSchema,
   ValidationFunc,
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx
index 6fd90adfc0e06..57dd5670dba80 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/use_manage_case_action.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useEffect, useRef, useState } from 'react';
-import { getAllConnectorsUrl, getCreateConnectorUrl } from '../../../../../../cases/common';
+import { getAllConnectorsUrl, getCreateConnectorUrl } from '@kbn/cases-plugin/common';
 import { convertArrayToCamelCase, KibanaServices } from '../../../../common/lib/kibana';
 
 interface CaseAction {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
index 575791afd110b..a793306c70323 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
+import { actionTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/action_type_registry.mock';
 import { getActionTypeName, validateMustache, validateActionParams } from './utils';
 
 describe('stepRuleActions utils', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
index 4826a10e978bd..b16ea4e3a667b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
@@ -8,10 +8,7 @@
 import mustache from 'mustache';
 import { uniq, startCase, flattenDeep, isArray, isString } from 'lodash/fp';
 
-import {
-  RuleAction,
-  ActionTypeRegistryContract,
-} from '../../../../../../triggers_actions_ui/public';
+import { RuleAction, ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
 import * as I18n from './translations';
 
 export const getActionTypeName = (actionTypeId: RuleAction['actionTypeId']) => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx
index 687b1a52560a4..83141e7d886a8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_schedule_rule/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 
 import { TestProviders } from '../../../../common/mock';
-import { StepScheduleRule } from './index';
+import { StepScheduleRule } from '.';
 
 describe('StepScheduleRule', () => {
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx
index 61e893bdb3d00..c27031617a3ea 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/throttle_select_field/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { ThrottleSelectField } from './index';
+import { ThrottleSelectField } from '.';
 import { useFormFieldMock } from '../../../../common/mock';
 
 describe('ThrottleSelectField', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
index bbc10fcb2dfd4..eaa492b2effd3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
@@ -17,7 +17,7 @@ import { TestProviders } from '../../../common/mock';
 import { mockTimelines } from '../../../common/mock/mock_timelines_plugin';
 import { createStartServicesMock } from '../../../common/lib/kibana/kibana_react.mock';
 import { useKibana } from '../../../common/lib/kibana';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { initialUserPrivilegesState as mockInitialUserPrivilegesState } from '../../../common/components/user_privileges/user_privileges_context';
 import { useUserPrivileges } from '../../../common/components/user_privileges';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx
index 32911a2c8e4ab..bb49f47596fc8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/user_info/index.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useUserInfo, ManageUserInfo } from './index';
-import { Capabilities } from 'src/core/public';
+import { useUserInfo, ManageUserInfo } from '.';
+import { Capabilities } from '@kbn/core/public';
 
 import { useKibana } from '../../../common/lib/kibana';
 import * as api from '../../containers/detection_engine/alerts/api';
diff --git a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
index 58331add50dce..164d333650443 100644
--- a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { getListResponseMock } from '../../../../../lists/common/schemas/response/list_schema.mock';
+import { getListResponseMock } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
 import { useDeleteList, useFindLists } from '@kbn/securitysolution-list-hooks';
 import { exportList } from '@kbn/securitysolution-list-api';
 import type { ListSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
index 06fb89da85c0a..fb39e60bbad16 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/observablity_alerts/render_cell_value.test.tsx
@@ -21,7 +21,7 @@ import { ColumnHeaderOptions } from '../../../../../common/types';
 
 import { RenderCellValue } from '.';
 
-jest.mock('../../../../common/lib/kibana/');
+jest.mock('../../../../common/lib/kibana');
 
 describe('RenderCellValue', () => {
   const columnId = '@timestamp';
diff --git a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
index 2070a620183d6..728f9eaaee0d0 100644
--- a/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/configurations/examples/security_solution_rac/render_cell_value.test.tsx
@@ -19,7 +19,7 @@ import { DefaultCellRenderer } from '../../../../timelines/components/timeline/c
 import { RenderCellValue } from '.';
 import { ColumnHeaderOptions } from '../../../../../common/types';
 
-jest.mock('../../../../common/lib/kibana/');
+jest.mock('../../../../common/lib/kibana');
 
 describe('RenderCellValue', () => {
   const columnId = '@timestamp';
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts
index fa850ce6b36ea..adbb0048818fe 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.test.ts
@@ -22,7 +22,7 @@ import {
   createSignalIndex,
   createHostIsolation,
 } from './api';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const abortCtrl = new AbortController();
 const mockKibanaServices = KibanaServices.get as jest.Mock;
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts
index 9816eea9e1675..fd7d364239226 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/api.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { getCasesFromAlertsUrl } from '../../../../../../cases/common';
+import { getCasesFromAlertsUrl } from '@kbn/cases-plugin/common';
 import { HostIsolationResponse, HostInfo } from '../../../../../common/endpoint/types';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
index 7223e11eed76d..cb78a7a116ae4 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/api.ts
@@ -7,7 +7,7 @@
 
 import { camelCase } from 'lodash';
 import dateMath from '@kbn/datemath';
-import { HttpStart } from 'src/core/public';
+import { HttpStart } from '@kbn/core/public';
 
 import {
   DETECTION_ENGINE_RULES_URL,
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
index 0138dcee514c2..65bb1b5e06820 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import * as api from './api';
 import { getRulesSchemaMock } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
index cf2500cd4036e..1c9dd79d36031 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
@@ -8,7 +8,7 @@
 import { useEffect, useState, useRef } from 'react';
 
 import type { List } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpStart } from '../../../../../../../../src/core/public';
+import { HttpStart } from '@kbn/core/public';
 import { patchRule } from './api';
 
 type Func = (lists: List[]) => void;
diff --git a/x-pack/plugins/security_solution/public/detections/index.ts b/x-pack/plugins/security_solution/public/detections/index.ts
index ca35efe4d9294..9b7345fe1ac15 100644
--- a/x-pack/plugins/security_solution/public/detections/index.ts
+++ b/x-pack/plugins/security_solution/public/detections/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { getTimelinesInStorageByIds } from '../timelines/containers/local_storage';
 import { TimelineIdLiteral, TimelineId } from '../../common/types/timeline';
 import { routes } from './routes';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx
index 3cf344c691ccd..9945d5225ea02 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/index.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { ALERTS_PATH, SecurityPageName } from '../../../../common/constants';
 import { NotFoundPage } from '../../../app/404';
 import * as i18n from './translations';
-import { TrackApplicationView } from '../../../../../../../src/plugins/usage_collection/public';
-import { DetectionEnginePage } from '../../pages/detection_engine/detection_engine';
+import { DetectionEnginePage } from '../detection_engine/detection_engine';
 import { SpyRoute } from '../../../common/utils/route/spy_routes';
 import { useReadonlyHeader } from '../../../use_readonly_header';
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
index 1f3cacbefcc3b..a783ac7e1e260 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
@@ -24,7 +24,7 @@ import { createStore, State } from '../../../common/store';
 import { mockHistory, Router } from '../../../common/mock/router';
 import { mockTimelines } from '../../../common/mock/mock_timelines_plugin';
 import { mockBrowserFields } from '../../../common/containers/source/mock';
-import { mockCasesContext } from '../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
index 3fc05c0ef428f..2b1607550a8ff 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
@@ -23,8 +23,8 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 
+import { isTab } from '@kbn/timelines-plugin/public';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
-import { isTab } from '../../../../../timelines/public';
 import { useDeepEqualSelector, useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { SecurityPageName } from '../../../app/types';
 import { TimelineId } from '../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts
index 488fd3625bf59..2f03b1ebc6b90 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { NavigateToAppOptions } from '../../../../../../../../../src/core/public';
+import type { NavigateToAppOptions } from '@kbn/core/public';
 import { APP_UI_ID } from '../../../../../../common/constants';
 import {
   BulkAction,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx
index d35a89484f264..3908c890b1f89 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/translations.tsx
@@ -13,14 +13,14 @@ export const bulkApplyTimelineTemplate = {
   FORM_TITLE: i18n.translate(
     'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.formTitle',
     {
-      defaultMessage: 'Apply timeline template',
+      defaultMessage: 'Apply Timeline template',
     }
   ),
 
   TEMPLATE_SELECTOR_LABEL: i18n.translate(
     'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorLabel',
     {
-      defaultMessage: 'Apply timeline template to selected rules',
+      defaultMessage: 'Apply Timeline template to selected rules',
     }
   ),
 
@@ -28,7 +28,7 @@ export const bulkApplyTimelineTemplate = {
     'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.templateSelectorHelpText',
     {
       defaultMessage:
-        'Select which timeline to apply to selected rules when investigating generated alerts.',
+        'Select which Timeline to apply to selected rules when investigating generated alerts.',
     }
   ),
 
@@ -42,8 +42,8 @@ export const bulkApplyTimelineTemplate = {
   warningCalloutMessage: (rulesCount: number): JSX.Element => (
     <FormattedMessage
       id="xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.edit.applyTimelineTemplate.warningCalloutMessage"
-      defaultMessage="You are about to apply changes to {rulesCount, plural, one {# selected rule} other {# selected rules}}.
-      If you already applied any templates to these rules, they will be overwritten or (if you select 'None') reset to none."
+      defaultMessage="You're about to apply changes to {rulesCount, plural, one {# selected rule} other {# selected rules}}.
+      If you previously applied Timeline templates to these rules, they will be overwritten or (if you select 'None') reset to none."
       values={{ rulesCount }}
     />
   ),
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx
index 9aa175002af7b..44f040bb1ab1e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/bulk_actions/use_bulk_actions.tsx
@@ -18,8 +18,8 @@ import {
 import { euiThemeVars } from '@kbn/ui-theme';
 import { useIsMounted } from '@kbn/securitysolution-hook-utils';
 
-import type { Toast } from '../../../../../../../../../../src/core/public';
-import { mountReactNode } from '../../../../../../../../../../src/core/public/utils';
+import type { Toast } from '@kbn/core/public';
+import { mountReactNode } from '@kbn/core/public/utils';
 import {
   BulkAction,
   BulkActionEditType,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
index 15b0392c7f3bd..4a81e239527e0 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.test.tsx
@@ -10,7 +10,7 @@ import { mount } from 'enzyme';
 
 import { TestProviders } from '../../../../../../common/mock';
 import { mockHistory } from '../../../../../../common/utils/route/index.test';
-import { getExceptionListSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { useUserData } from '../../../../../components/user_info';
 
 import { ExceptionListsTable } from './exceptions_table';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
index 3b24dda539174..c5146f245cc8e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
@@ -12,12 +12,12 @@ import { useKibana } from '../../../../../common/lib/kibana';
 import { TestProviders } from '../../../../../common/mock';
 import '../../../../../common/mock/formatted_relative';
 import '../../../../../common/mock/match_media';
-import { AllRules } from './index';
+import { AllRules } from '.';
 
 jest.mock('../../../../../common/components/link_to');
 jest.mock('../../../../../common/lib/kibana');
 jest.mock('../../../../containers/detection_engine/rules');
-jest.mock('../../../../pages/detection_engine/rules/all/rules_table/rules_table_context');
+jest.mock('./rules_table/rules_table_context');
 
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx
index 9f0c0d0cb9695..91aa36b62f9f7 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_table_actions.tsx
@@ -12,7 +12,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import React from 'react';
-import { NavigateToAppOptions } from '../../../../../../../../../src/core/public';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import { BulkAction } from '../../../../../../common/detection_engine/schemas/common/schemas';
 import { UseAppToasts } from '../../../../../common/hooks/use_app_toasts';
 import { canEditRuleWithActions } from '../../../../../common/utils/privileges';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
index b3cf1ded717fa..a834f42545ee4 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 
 import '../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../common/mock';
-import { CreateRulePage } from './index';
+import { CreateRulePage } from '.';
 import { useUserData } from '../../../../components/user_info';
 import { useAppToastsMock } from '../../../../../common/hooks/use_app_toasts.mock';
 import { useAppToasts } from '../../../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx
index 5242b6dbe0313..c48f5d6971d23 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/execution_log_table/execution_log_columns.tsx
@@ -8,7 +8,7 @@
 import { EuiBasicTableColumn, EuiHealth, EuiLink, EuiText } from '@elastic/eui';
 import { capitalize } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import React from 'react';
 import {
   AggregateRuleExecutionEvent,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
index 84e6d6879bb8b..8212bebabb5c3 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
@@ -17,7 +17,7 @@ import {
   TestProviders,
   SUB_PLUGINS_REDUCER,
 } from '../../../../../common/mock';
-import { RuleDetailsPage } from './index';
+import { RuleDetailsPage } from '.';
 import { createStore, State } from '../../../../../common/store';
 import { useUserData } from '../../../../components/user_info';
 import { useRuleWithFallback } from '../../../../containers/detection_engine/rules/use_rule_with_fallback';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
index 791a3fcd0a5b4..8550d03eca2aa 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -33,7 +33,7 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 
 import { Dispatch } from 'redux';
-import { isTab } from '../../../../../../../timelines/public';
+import { isTab } from '@kbn/timelines-plugin/public';
 import {
   useDeepEqualSelector,
   useShallowEqualSelector,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
index 4532982032772..c990621acd47b 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 
 import '../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../common/mock';
-import { EditRulePage } from './index';
+import { EditRulePage } from '.';
 import { useUserData } from '../../../../components/user_info';
 import { useParams } from 'react-router-dom';
 import { useAppToastsMock } from '../../../../../common/hooks/use_app_toasts.mock';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
index d91eed9301ae4..a8037ea9216a3 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
@@ -20,7 +20,7 @@ import {
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 import type { Filter } from '@kbn/es-query';
-import { ActionVariables } from '../../../../../../triggers_actions_ui/public';
+import { ActionVariables } from '@kbn/triggers-actions-ui-plugin/public';
 import { normalizeThresholdField } from '../../../../../common/detection_engine/utils';
 import { RuleAlertAction } from '../../../../../common/detection_engine/types';
 import { assertUnreachable } from '../../../../../common/utility_types';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
index 4f40f1c86c697..05867a9830ad1 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { shallow, mount, ReactWrapper } from 'enzyme';
 
 import '../../../../common/mock/match_media';
-import { RulesPage } from './index';
+import { RulesPage } from '.';
 import { useUserData } from '../../../components/user_info';
 import { waitFor } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
@@ -27,7 +27,7 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-jest.mock('../../../pages/detection_engine/rules/all/rules_table/rules_table_context');
+jest.mock('./all/rules_table/rules_table_context');
 jest.mock('../../../containers/detection_engine/lists/use_lists_config');
 jest.mock('../../../containers/detection_engine/rules/use_find_rules_query');
 jest.mock('../../../../common/components/link_to');
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
index 09949cc5c1a09..7071ef95c8c7e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
@@ -196,7 +196,7 @@ export const BULK_ACTION_DELETE_TAGS = i18n.translate(
 export const BULK_ACTION_APPLY_TIMELINE_TEMPLATE = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.applyTimelineTemplateTitle',
   {
-    defaultMessage: 'Apply timeline template',
+    defaultMessage: 'Apply Timeline template',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
index 567e408089883..e94365da0a3a7 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
@@ -16,8 +16,8 @@ import {
   Severity,
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { Filter } from '@kbn/es-query';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 import { RuleAlertAction } from '../../../../../common/detection_engine/types';
-import { RuleAction } from '../../../../../../alerting/common';
 import { FieldValueQueryBar } from '../../../components/rules/query_bar';
 import { FieldValueTimeline } from '../../../components/rules/pick_timeline';
 import { FieldValueThreshold } from '../../../components/rules/threshold_input';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts
index d4ce5da4a1413..b4778bb8c24ea 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/utils.ts
@@ -7,7 +7,7 @@
 
 import { isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import {
   getRulesUrl,
   getRuleDetailsUrl,
diff --git a/x-pack/plugins/security_solution/public/exceptions/index.ts b/x-pack/plugins/security_solution/public/exceptions/index.ts
index eccb2ba7578c7..6854612c7db92 100644
--- a/x-pack/plugins/security_solution/public/exceptions/index.ts
+++ b/x-pack/plugins/security_solution/public/exceptions/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { SecuritySubPlugin } from '../app/types';
 import { DETECTIONS_TIMELINE_IDS } from '../detections';
diff --git a/x-pack/plugins/security_solution/public/exceptions/routes.tsx b/x-pack/plugins/security_solution/public/exceptions/routes.tsx
index 262db114ae84e..5e89ec8e4d40b 100644
--- a/x-pack/plugins/security_solution/public/exceptions/routes.tsx
+++ b/x-pack/plugins/security_solution/public/exceptions/routes.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import * as i18n from './translations';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { EXCEPTIONS_PATH, SecurityPageName } from '../../common/constants';
 import { ExceptionListsTable } from '../detections/pages/detection_engine/rules/all/exceptions/exceptions_table';
 import { SpyRoute } from '../common/utils/route/spy_routes';
diff --git a/x-pack/plugins/security_solution/public/helpers.test.tsx b/x-pack/plugins/security_solution/public/helpers.test.tsx
index 4f39ea32c6d5d..63d7bc4b1699f 100644
--- a/x-pack/plugins/security_solution/public/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/helpers.test.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Capabilities } from '../../../../src/core/public';
+import { Capabilities } from '@kbn/core/public';
 import { CASES_FEATURE_ID, SERVER_APP_ID } from '../common/constants';
 import { mockEcsDataWithAlert } from './common/mock';
 import { ALERT_RULE_UUID, ALERT_RULE_NAME, ALERT_RULE_PARAMETERS } from '@kbn/rule-data-utils';
diff --git a/x-pack/plugins/security_solution/public/helpers.tsx b/x-pack/plugins/security_solution/public/helpers.tsx
index adc22b96d2050..ce4e2a448763c 100644
--- a/x-pack/plugins/security_solution/public/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/helpers.tsx
@@ -10,7 +10,7 @@ import { has, get, isEmpty } from 'lodash/fp';
 import React from 'react';
 import { matchPath, RouteProps, Redirect } from 'react-router-dom';
 
-import { Capabilities, CoreStart } from '../../../../src/core/public';
+import { Capabilities, CoreStart } from '@kbn/core/public';
 import {
   ALERTS_PATH,
   APP_UI_ID,
diff --git a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx
index 88d041775320c..e8dc9a0da8b10 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/columns.tsx
@@ -18,7 +18,7 @@ import { FormattedRelativePreferenceDate } from '../../../common/components/form
 import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider';
 import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
 import { DefaultDraggable } from '../../../common/components/draggables';
-import { HostsTableColumns } from './';
+import { HostsTableColumns } from '.';
 
 import * as i18n from './translations';
 import { Maybe, RiskSeverity } from '../../../../common/search_strategy';
diff --git a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
index 43dc31c68d1bc..f606b1ff67dee 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.test.tsx
@@ -18,9 +18,9 @@ import {
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { createStore, State } from '../../../common/store';
-import { hostsModel } from '../../../hosts/store';
-import { HostsTableType } from '../../../hosts/store/model';
-import { HostsTable } from './index';
+import { hostsModel } from '../../store';
+import { HostsTableType } from '../../store/model';
+import { HostsTable } from '.';
 import { mockData } from './mock';
 import { render } from '@testing-library/react';
 import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx
index 164b88399bbe9..08e517921e974 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/authentications/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { HostsKpiAuthentications } from './index';
+import { HostsKpiAuthentications } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_hosts/authentications');
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/common/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/common/index.tsx
index 4296ae4984b95..77098daa4747f 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/common/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/common/index.tsx
@@ -22,8 +22,6 @@ import {
   StatItems,
 } from '../../../../common/components/stat_items';
 import { UpdateDateRange } from '../../../../common/components/charts/common';
-import { useKibana, useGetUserCasesPermissions } from '../../../../common/lib/kibana';
-import { APP_ID } from '../../../../../common/constants';
 import { UserskKpiStrategyResponse } from '../../../../../common/search_strategy/security_solution/users';
 
 const kpiWidgetHeight = 247;
@@ -47,11 +45,6 @@ interface KpiBaseComponentProps {
 
 export const KpiBaseComponent = React.memo<KpiBaseComponentProps>(
   ({ fieldsMapping, data, id, loading = false, from, to, narrowDateRange, setQuerySkip }) => {
-    const { cases } = useKibana().services;
-    const CasesContext = cases.ui.getCasesContext();
-    const userPermissions = useGetUserCasesPermissions();
-    const userCanCrud = userPermissions?.crud ?? false;
-
     const statItemsProps: StatItemsProps[] = useKpiMatrixStatus(
       fieldsMapping,
       data,
@@ -65,11 +58,9 @@ export const KpiBaseComponent = React.memo<KpiBaseComponentProps>(
 
     return (
       <EuiFlexGroup wrap>
-        <CasesContext owner={[APP_ID]} userCanCrud={userCanCrud ?? false}>
-          {statItemsProps.map((mappedStatItemProps) => (
-            <StatItemsComponent {...mappedStatItemProps} showInspectButton={false} />
-          ))}
-        </CasesContext>
+        {statItemsProps.map((mappedStatItemProps) => (
+          <StatItemsComponent {...mappedStatItemProps} showInspectButton={false} />
+        ))}
       </EuiFlexGroup>
     );
   },
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx
index 49b6986515564..5b03586b86513 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/hosts/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { HostsKpiHosts } from './index';
+import { HostsKpiHosts } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_hosts/hosts');
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx
index b000b2f22dc95..2ca32c6063ea6 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/risky_hosts/index.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { render } from '@testing-library/react';
 
-import { RiskyHosts } from './';
+import { RiskyHosts } from '.';
 import { TestProviders } from '../../../../common/mock';
 import { KpiRiskScoreStrategyResponse } from '../../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx
index 20de5db340b5e..0e82bf5b39a1b 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/kpi_hosts/unique_ips/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { HostsKpiUniqueIps } from './index';
+import { HostsKpiUniqueIps } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_hosts/unique_ips');
diff --git a/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx
index a3b7022ee83ef..ceb4394619fc5 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/top_host_score_contributors/index.tsx
@@ -15,10 +15,10 @@ import {
   EuiTableFieldDataColumnType,
 } from '@elastic/eui';
 
+import { Direction } from '@kbn/timelines-plugin/common';
 import { HeaderSection } from '../../../common/components/header_section';
 import { InspectButton, InspectButtonContainer } from '../../../common/components/inspect';
 import * as i18n from './translations';
-import { Direction } from '../../../../../timelines/common';
 
 import { buildHostNamesFilter, RiskScoreFields } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx
index a0f4386be59a4..f78307d7a61a7 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { useKibana } from '../../../../common/lib/kibana';
@@ -21,10 +22,6 @@ import {
 } from '../../../../../common/search_strategy/security_solution/hosts';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
index 59b08a1b7c07d..e6174801e69cb 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
@@ -9,6 +9,7 @@ import deepEqual from 'fast-deep-equal';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useKibana } from '../../../../common/lib/kibana';
 import {
@@ -19,10 +20,6 @@ import {
 
 import * as i18n from './translations';
 import { Direction, DocValueFields } from '../../../../../common/search_strategy';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 
 const ID = 'firstLastSeenHostQuery';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx
index df64f4cd6f81a..8047f5699e208 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useAllHost } from './index';
+import { useAllHost } from '.';
 import { HostsType } from '../../store/model';
 
 describe('useAllHost', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
index a951712f97022..6d4b311712953 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { inputsModel, State } from '../../../common/store';
 import { createFilter } from '../../../common/containers/helpers';
 import { useKibana } from '../../../common/lib/kibana';
@@ -27,7 +28,6 @@ import {
 import { ESTermQuery } from '../../../../common/typed_json';
 
 import * as i18n from './translations';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx
index f62fc3a77786e..3fd27eecaa912 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useHostsKpiAuthentications } from './index';
+import { useHostsKpiAuthentications } from '.';
 
 describe('kpi hosts - authentications', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx
index f12b92f0661bc..69155eb7c979d 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useHostsKpiHosts } from './index';
+import { useHostsKpiHosts } from '.';
 
 describe('kpi hosts - hosts', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx
index ec8c73ad1d6a6..f50f46bdf90d2 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useHostsKpiUniqueIps } from './index';
+import { useHostsKpiUniqueIps } from '.';
 
 describe('kpi hosts - Unique Ips', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx
index e334465fdbc1c..b6e7ef1f2da9f 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useUncommonProcesses } from './index';
+import { useUncommonProcesses } from '.';
 import { HostsType } from '../../store/model';
 
 describe('useUncommonProcesses', () => {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
index d196c4ea01af1..a2c5cb20d2bca 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
@@ -10,7 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 
 import { inputsModel, State } from '../../../common/store';
 import { useKibana } from '../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/hosts/index.ts b/x-pack/plugins/security_solution/public/hosts/index.ts
index f818a812b57a3..9820f76762b93 100644
--- a/x-pack/plugins/security_solution/public/hosts/index.ts
+++ b/x-pack/plugins/security_solution/public/hosts/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelineIdLiteral, TimelineId } from '../../common/types/timeline';
 import { SecuritySubPluginWithStore } from '../app/types';
 import { getTimelinesInStorageByIds } from '../timelines/containers/local_storage';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
index f0ac78e3950d4..90fd6ab1e77b6 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.test.tsx
@@ -18,7 +18,7 @@ import { type } from './utils';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { getHostDetailsPageFilters } from './helpers';
 import { HostsTableType } from '../../store/model';
-import { mockCasesContract } from '../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../common/lib/kibana', () => {
   const original = jest.requireActual('../../../common/lib/kibana');
@@ -36,7 +36,7 @@ jest.mock('../../../common/lib/kibana', () => {
   };
 });
 
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 
 jest.mock('../../../common/containers/source', () => ({
   useFetchIndex: () => [false, { indicesExist: true, indexPatterns: mockIndexPattern }],
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx
index f1b03c7a3c4c4..1ee0821579646 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/index.tsx
@@ -11,6 +11,7 @@ import React, { useEffect, useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
 import type { Filter } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { HostItem, LastEventIndexKey } from '../../../../common/search_strategy';
 import { SecurityPageName } from '../../../app/types';
 import { UpdateDateRange } from '../../../common/components/charts/common';
@@ -34,7 +35,6 @@ import { inputsSelectors } from '../../../common/store';
 import { setHostDetailsTablesActivePageToZero } from '../../store/actions';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { SpyRoute } from '../../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 
 import { HostDetailsTabs } from './details_tabs';
 import { navTabsHostDetails } from './nav_tabs';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts b/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts
index 346ac7bf3517b..859790b4f342e 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts
+++ b/x-pack/plugins/security_solution/public/hosts/pages/details/utils.ts
@@ -7,7 +7,7 @@
 
 import { get, isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { hostsModel } from '../../store';
 import { HostsTableType } from '../../store/model';
 import { getHostDetailsUrl } from '../../../common/components/link_to/redirect_to_hosts';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
index bdf249dc07526..565ab35ca4c6d 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/hosts.test.tsx
@@ -24,7 +24,7 @@ import { State, createStore } from '../../common/store';
 import { Hosts } from './hosts';
 import { HostsTabs } from './hosts_tabs';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
-import { mockCasesContract } from '../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 jest.mock('../../common/containers/sourcerer');
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
index 859e20607a4f7..efeff5cdea54d 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
@@ -12,7 +12,8 @@ import React, { useCallback, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import { Filter } from '@kbn/es-query';
-import { isTab } from '../../../../timelines/public';
+import { isTab } from '@kbn/timelines-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../app/types';
 import { UpdateDateRange } from '../../common/components/charts/common';
 import { FiltersGlobal } from '../../common/components/filters_global';
@@ -33,7 +34,6 @@ import { inputsSelectors, State } from '../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../common/store/inputs/actions';
 
 import { SpyRoute } from '../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../src/plugins/data/common';
 import { useMlCapabilities } from '../../common/components/ml/hooks/use_ml_capabilities';
 import { Display } from './display';
 import { HostsTabs } from './hosts_tabs';
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/nav_tabs.tsx b/x-pack/plugins/security_solution/public/hosts/pages/nav_tabs.tsx
index 59fb0d08f7dc7..ea46180f8df80 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/nav_tabs.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/nav_tabs.tsx
@@ -71,6 +71,7 @@ export const navTabsHosts = ({
       name: i18n.NAVIGATION_SESSIONS_TITLE,
       href: getTabsOnHostsUrl(HostsTableType.sessions),
       disabled: false,
+      isBeta: true,
     },
   };
 
diff --git a/x-pack/plugins/security_solution/public/hosts/routes.tsx b/x-pack/plugins/security_solution/public/hosts/routes.tsx
index 1eeddf2155613..683a4a66ab383 100644
--- a/x-pack/plugins/security_solution/public/hosts/routes.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/routes.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { HostsContainer } from './pages';
 import { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { HOSTS_PATH } from '../../common/constants';
 
 export const HostsRoutes = () => (
diff --git a/x-pack/plugins/security_solution/public/index.ts b/x-pack/plugins/security_solution/public/index.ts
index 5f2f6014822ab..ab20271b4bda3 100644
--- a/x-pack/plugins/security_solution/public/index.ts
+++ b/x-pack/plugins/security_solution/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { Plugin } from './plugin';
 import { PluginSetup } from './types';
 export type { TimelineModel } from './timelines/store/timeline/model';
diff --git a/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts b/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts
index 40a726bdf42e4..49b4214d60bd6 100644
--- a/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts
+++ b/x-pack/plugins/security_solution/public/management/common/breadcrumbs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { AdministrationSubTab } from '../types';
 import { ENDPOINTS_TAB, EVENT_FILTERS_TAB, POLICIES_TAB, TRUSTED_APPS_TAB } from './translations';
 import { AdministrationRouteSpyState } from '../../common/utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
index 6482fc3d3331e..fb0f55f9e5f72 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/test_utils.ts
@@ -8,8 +8,8 @@
 import { cloneDeep } from 'lodash';
 import uuid from 'uuid';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { TrustedAppGenerator } from '../../../../common/endpoint/data_generators/trusted_app_generator';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { TrustedApp } from '../../../../common/endpoint/types';
 
 const getCommonItemDataOverrides = () => {
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx
index 383a72031ed76..79a7578bf230f 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/artifact_list_page.test.tsx
@@ -113,7 +113,7 @@ describe('When using the ArtifactListPage component', () => {
       });
     });
 
-    it('should persist pagination `page size` changes to the URL', async () => {
+    it('should persist pagination `pageSize` changes to the URL', async () => {
       const { getByTestId } = await renderWithListData();
       act(() => {
         userEvent.click(getByTestId('tablePaginationPopoverButton'));
@@ -122,6 +122,8 @@ describe('When using the ArtifactListPage component', () => {
         await waitFor(() => {
           expect(getByTestId('tablePagination-20-rows'));
         });
+      });
+      act(() => {
         userEvent.click(getByTestId('tablePagination-20-rows'));
       });
 
@@ -157,7 +159,9 @@ describe('When using the ArtifactListPage component', () => {
         const { getByTestId } = await renderWithListData();
         await clickCardAction('delete');
 
-        expect(getByTestId('testPage-deleteModal')).toBeTruthy();
+        await waitFor(() => {
+          expect(getByTestId('testPage-deleteModal')).toBeTruthy();
+        });
       });
     });
 
@@ -257,7 +261,6 @@ describe('When using the ArtifactListPage component', () => {
         });
 
         await waitFor(() => {
-          // console.log(`\n\n${renderResult.getByTestId('testPage-list').outerHTML}\n\n\n`);
           expect(renderResult.getByTestId('testPage-list-noResults')).toBeTruthy();
         });
       });
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx
index ba37f1ab167e2..81dc91dbae32c 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.test.tsx
@@ -10,7 +10,7 @@ import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { getArtifactListPageRenderingSetup, getDeferred, getFormComponentMock } from '../mocks';
 import { ExceptionsListItemGenerator } from '../../../../../common/endpoint/data_generators/exceptions_list_item_generator';
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../../common/endpoint/service/artifacts';
 import { getEndpointPrivilegesInitialStateMock } from '../../../../common/components/user_privileges/endpoint/mocks';
 import { AppContextTestRender } from '../../../../common/mock/endpoint';
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx
index 4b126d6e747db..e30160028defa 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/components/artifact_flyout.tsx
@@ -7,6 +7,7 @@
 
 import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { DocLinks } from '@kbn/doc-links';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   EuiButton,
@@ -20,8 +21,9 @@ import {
   EuiFlyoutHeader,
   EuiTitle,
 } from '@elastic/eui';
+
 import { EuiFlyoutSize } from '@elastic/eui/src/components/flyout/flyout';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useUrlParams } from '../../hooks/use_url_params';
 import { useIsFlyoutOpened } from '../hooks/use_is_flyout_opened';
 import { useTestIdGenerator } from '../../hooks/use_test_id_generator';
@@ -33,7 +35,7 @@ import {
 } from '../types';
 import { ManagementPageLoader } from '../../management_page_loader';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
-import { useToasts } from '../../../../common/lib/kibana';
+import { useKibana, useToasts } from '../../../../common/lib/kibana';
 import { createExceptionListItemForCreate } from '../../../../../common/endpoint/service/artifacts/utils';
 import { useWithArtifactSubmitData } from '../hooks/use_with_artifact_submit_data';
 import { useIsArtifactAllowedPerPolicyUsage } from '../hooks/use_is_artifact_allowed_per_policy_usage';
@@ -96,7 +98,7 @@ export const ARTIFACT_FLYOUT_LABELS = Object.freeze({
    *   );
    * }
    */
-  flyoutDowngradedLicenseDocsInfo: (): React.ReactNode =>
+  flyoutDowngradedLicenseDocsInfo: (_: DocLinks['securitySolution']): React.ReactNode =>
     i18n.translate('xpack.securitySolution.artifactListPage.flyoutDowngradedLicenseDocsInfo', {
       defaultMessage: 'For more information, see our documentation.',
     }),
@@ -188,6 +190,11 @@ export const ArtifactFlyout = memo<ArtifactFlyoutProps>(
     'data-test-subj': dataTestSubj,
     size = 'm',
   }) => {
+    const {
+      docLinks: {
+        links: { securitySolution },
+      },
+    } = useKibana().services;
     const getTestId = useTestIdGenerator(dataTestSubj);
     const toasts = useToasts();
     const isFlyoutOpened = useIsFlyoutOpened();
@@ -364,7 +371,8 @@ export const ArtifactFlyout = memo<ArtifactFlyoutProps>(
             iconType="help"
             data-test-subj={getTestId('expiredLicenseCallout')}
           >
-            {`${labels.flyoutDowngradedLicenseInfo} ${labels.flyoutDowngradedLicenseDocsInfo()}`}
+            {labels.flyoutDowngradedLicenseInfo}{' '}
+            {labels.flyoutDowngradedLicenseDocsInfo(securitySolution)}
           </EuiCallOut>
         )}
 
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts
index df47472861a59..73e5a9d66a15d 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_delete_item.ts
@@ -8,7 +8,7 @@
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { i18n } from '@kbn/i18n';
 import { useMemo } from 'react';
-import type { HttpFetchError } from 'kibana/public';
+import type { HttpFetchError } from '@kbn/core/public';
 import { useToasts } from '../../../../common/lib/kibana';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { useDeleteArtifact } from '../../../hooks/artifacts';
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts
index b1742c761ba49..c0a292ea54fb2 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/hooks/use_with_artifact_list_data.ts
@@ -10,16 +10,14 @@ import { Pagination } from '@elastic/eui';
 import { useQuery } from 'react-query';
 import type { ServerApiError } from '../../../../common/types';
 import { useIsMounted } from '../../hooks/use_is_mounted';
-import {
-  MANAGEMENT_DEFAULT_PAGE_SIZE,
-  MANAGEMENT_PAGE_SIZE_OPTIONS,
-} from '../../../common/constants';
+import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../../common/constants';
 import { useUrlParams } from '../../hooks/use_url_params';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { ArtifactListPageUrlParams } from '../types';
 import { MaybeImmutable } from '../../../../../common/endpoint/types';
 import { useKueryFromExceptionsSearchFilter } from './use_kuery_from_exceptions_search_filter';
 import { useListArtifact } from '../../../hooks/artifacts';
+import { useUrlPagination } from '../../hooks/use_url_pagination';
 
 type WithArtifactListDataInterface = ReturnType<typeof useListArtifact> & {
   /**
@@ -46,9 +44,13 @@ export const useWithArtifactListData = (
   const isMounted = useIsMounted();
 
   const {
-    urlParams: { page = 1, pageSize = MANAGEMENT_DEFAULT_PAGE_SIZE, filter, includedPolicies },
+    urlParams: { filter, includedPolicies },
   } = useUrlParams<ArtifactListPageUrlParams>();
 
+  const {
+    pagination: { page, pageSize },
+  } = useUrlPagination();
+
   // Used to determine if the `does data exist` check should be done.
   const kuery = useKueryFromExceptionsSearchFilter(filter, searchableFields, includedPolicies);
 
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts
index d8a5e316d2b7d..fc39b75a643d8 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_list_page/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import type {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx b/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx
index 81f3cc5fa3737..c9f62001035ea 100644
--- a/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/context_menu_with_router_support/context_menu_item_nav_by_router.tsx
@@ -13,7 +13,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import styled from 'styled-components';
-import { NavigateToAppOptions } from 'kibana/public';
+import { NavigateToAppOptions } from '@kbn/core/public';
 import { useNavigateToAppEventHandler } from '../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import { useTestIdGenerator } from '../hooks/use_test_id_generator';
 
diff --git a/x-pack/plugins/apm/ftr_e2e/services.ts b/x-pack/plugins/security_solution/public/management/components/no_permissons/index.ts
similarity index 83%
rename from x-pack/plugins/apm/ftr_e2e/services.ts
rename to x-pack/plugins/security_solution/public/management/components/no_permissons/index.ts
index 5e063134081ad..25421ba1dcd1a 100644
--- a/x-pack/plugins/apm/ftr_e2e/services.ts
+++ b/x-pack/plugins/security_solution/public/management/components/no_permissons/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from '../../../test/common/services';
+export { NoPermissions } from './no_permissions';
diff --git a/x-pack/plugins/security_solution/public/management/components/no_permissons/no_permissions.tsx b/x-pack/plugins/security_solution/public/management/components/no_permissons/no_permissions.tsx
new file mode 100644
index 0000000000000..87a5b5cf7142b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/no_permissons/no_permissions.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+export const NoPermissions = memo(() => {
+  return (
+    <>
+      <EuiEmptyPrompt
+        iconType="alert"
+        iconColor="danger"
+        titleSize="l"
+        data-test-subj="noIngestPermissions"
+        title={
+          <FormattedMessage
+            id="xpack.securitySolution.endpointManagemnet.noPermissionsText"
+            defaultMessage="You do not have the required Kibana permissions to use Elastic Security Administration"
+          />
+        }
+        body={
+          <EuiText color="subdued">
+            <FormattedMessage
+              id="xpack.securitySolution.endpointManagement.noPermissionsSubText"
+              defaultMessage="You must have the superuser role to use this feature. If you do not have the superuser role and do not have permissions to edit user roles, contact your Kibana administrator."
+            />
+          </EuiText>
+        }
+      />
+    </>
+  );
+});
+NoPermissions.displayName = 'NoPermissions';
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx
index a27a0e949835a..63e5871f67f7f 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useBulkDeleteArtifact } from './use_bulk_delete_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Bulk delete artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx
index 9957ff27d4bf9..994ed4f466d00 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_delete_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import pMap from 'p-map';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx
index 7309979266e2c..973955135c0f6 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useBulkUpdateArtifact } from './use_bulk_update_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Bulk update artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx
index b4854209fa07b..3389b3563577a 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_bulk_update_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import pMap from 'p-map';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   UpdateExceptionListItemSchema,
   ExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx
index 6bc703939bdf7..9ea5f6aca0201 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCreateArtifact } from './use_create_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Create artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx
index 74aa6752f371c..c1aed4be8005b 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_create_artifact.tsx
@@ -8,7 +8,7 @@ import {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx
index c4195c3a63886..89c04f5e1bb93 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useDeleteArtifact } from './use_delete_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Delete artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx
index e072eecb06130..16568a0766444 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_delete_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx
index ad66381c8185a..88992960421a9 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useGetArtifact } from './use_get_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderQuery,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('Get artifact hook', () => {
   let result: ReturnType<typeof useGetArtifact>;
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx
index 676c424e1a278..eb80a689e5a0d 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_get_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx
index 75387e3d01b1b..300910e5c7afd 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useListArtifact } from './use_list_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   getFakeListId,
   getFakeListDefinition,
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx
index b3e1451218750..68bee6de0113a 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_list_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { FoundExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
 import { useMemo } from 'react';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx
index 32c14ece79a78..666587ace1dd0 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import { useSummaryArtifact } from './use_summary_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   getFakeListId,
   getFakeListDefinition,
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx
index b92929f10503f..513c3ff8c6b31 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_summary_artifact.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ExceptionListSummarySchema } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
 import { parsePoliciesAndFilterToKql, parseQueryFilterToKQL } from '../../common/utils';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx
index 3673114041552..d545216354b4e 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useUpdateArtifact } from './use_update_artifact';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import {
   getFakeListId,
@@ -14,7 +14,7 @@ import {
   getFakeHttpService,
   renderMutation,
 } from '../test_utils';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { act } from '@testing-library/react-hooks';
 
 describe('Update artifact hook', () => {
diff --git a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx
index 54acea6489574..92da096f71e66 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/artifacts/use_update_artifact.tsx
@@ -8,7 +8,7 @@ import {
   UpdateExceptionListItemSchema,
   ExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { useMutation, UseMutationResult, UseQueryOptions } from 'react-query';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx b/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx
index 7d7f999831363..f1818babd8b30 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx
+++ b/x-pack/plugins/security_solution/public/management/hooks/test_utils.tsx
@@ -6,9 +6,9 @@
  */
 import React from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { CreateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ReactQueryClientProvider } from '../../common/containers/query_client/query_client_provider';
 
 export const getFakeListId: () => string = () => 'FAKE_LIST_ID';
diff --git a/x-pack/plugins/security_solution/public/management/index.ts b/x-pack/plugins/security_solution/public/management/index.ts
index 4ca8adee5f9a8..2bd23c6cb0a12 100644
--- a/x-pack/plugins/security_solution/public/management/index.ts
+++ b/x-pack/plugins/security_solution/public/management/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { Reducer, CombinedState } from 'redux';
 import { routes } from './routes';
 import { StartPlugins } from '../types';
diff --git a/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts
index 9c02729c68273..b8e3078533b7c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/blocklist/services/blocklists_api_client.ts
@@ -12,7 +12,7 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_BLOCKLISTS_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ConditionEntry } from '../../../../../common/endpoint/types';
 import {
   conditionEntriesToEntries,
diff --git a/x-pack/plugins/security_solution/public/management/pages/blocklist/translations.ts b/x-pack/plugins/security_solution/public/management/pages/blocklist/translations.ts
index 4a0901798841b..1ce96f5267916 100644
--- a/x-pack/plugins/security_solution/public/management/pages/blocklist/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/blocklist/translations.ts
@@ -8,95 +8,95 @@
 import { i18n } from '@kbn/i18n';
 import { BlocklistConditionEntryField } from '@kbn/securitysolution-utils';
 
-export const DETAILS_HEADER = i18n.translate('xpack.securitySolution.blocklists.details.header', {
+export const DETAILS_HEADER = i18n.translate('xpack.securitySolution.blocklist.details.header', {
   defaultMessage: 'Details',
 });
 
 export const DETAILS_HEADER_DESCRIPTION = i18n.translate(
-  'xpack.securitySolution.blocklists.details.header.description',
+  'xpack.securitySolution.blocklist.details.header.description',
   {
     defaultMessage:
       'The blocklist prevents selected applications from running on your hosts by extending the list of processes the Endpoint considers malicious.',
   }
 );
 
-export const NAME_LABEL = i18n.translate('xpack.securitySolution.blocklists.name.label', {
+export const NAME_LABEL = i18n.translate('xpack.securitySolution.blocklist.name.label', {
   defaultMessage: 'Name',
 });
 
 export const DESCRIPTION_LABEL = i18n.translate(
-  'xpack.securitySolution.blocklists.description.label',
+  'xpack.securitySolution.blocklist.description.label',
   {
     defaultMessage: 'Description',
   }
 );
 
 export const CONDITIONS_HEADER = i18n.translate(
-  'xpack.securitySolution.blocklists.conditions.header',
+  'xpack.securitySolution.blocklist.conditions.header',
   {
     defaultMessage: 'Conditions',
   }
 );
 
 export const CONDITIONS_HEADER_DESCRIPTION = i18n.translate(
-  'xpack.securitySolution.blocklists.conditions.header.description',
+  'xpack.securitySolution.blocklist.conditions.header.description',
   {
     defaultMessage:
       'Select an operating system and add conditions. Availability of conditions may depend on your chosen OS.',
   }
 );
 
-export const SELECT_OS_LABEL = i18n.translate('xpack.securitySolution.blocklists.os.label', {
+export const SELECT_OS_LABEL = i18n.translate('xpack.securitySolution.blocklist.os.label', {
   defaultMessage: 'Select operating system',
 });
 
-export const FIELD_LABEL = i18n.translate('xpack.securitySolution.blocklists.field.label', {
+export const FIELD_LABEL = i18n.translate('xpack.securitySolution.blocklist.field.label', {
   defaultMessage: 'Field',
 });
 
-export const OPERATOR_LABEL = i18n.translate('xpack.securitySolution.blocklists.operator.label', {
+export const OPERATOR_LABEL = i18n.translate('xpack.securitySolution.blocklist.operator.label', {
   defaultMessage: 'Operator',
 });
 
-export const VALUE_LABEL = i18n.translate('xpack.securitySolution.blocklists.value.label', {
+export const VALUE_LABEL = i18n.translate('xpack.securitySolution.blocklist.value.label', {
   defaultMessage: 'Value',
 });
 
 export const VALUE_LABEL_HELPER = i18n.translate(
-  'xpack.securitySolution.blocklists.value.label.helper',
+  'xpack.securitySolution.blocklist.value.label.helper',
   {
     defaultMessage: 'Type or copy & paste one or multiple comma delimited values',
   }
 );
 
 export const CONDITION_FIELD_TITLE: { [K in BlocklistConditionEntryField]: string } = {
-  'file.hash.*': i18n.translate('xpack.securitySolution.blocklists.entry.field.hash', {
+  'file.hash.*': i18n.translate('xpack.securitySolution.blocklist.entry.field.hash', {
     defaultMessage: 'Hash',
   }),
-  'file.path': i18n.translate('xpack.securitySolution.blocklists.entry.field.path', {
+  'file.path': i18n.translate('xpack.securitySolution.blocklist.entry.field.path', {
     defaultMessage: 'Path',
   }),
   'file.Ext.code_signature': i18n.translate(
-    'xpack.securitySolution.blocklists.entry.field.signature',
+    'xpack.securitySolution.blocklist.entry.field.signature',
     { defaultMessage: 'Signature' }
   ),
 };
 
 export const CONDITION_FIELD_DESCRIPTION: { [K in BlocklistConditionEntryField]: string } = {
-  'file.hash.*': i18n.translate('xpack.securitySolution.blocklists.entry.field.description.hash', {
+  'file.hash.*': i18n.translate('xpack.securitySolution.blocklist.entry.field.description.hash', {
     defaultMessage: 'md5, sha1, or sha256',
   }),
-  'file.path': i18n.translate('xpack.securitySolution.blocklists.entry.field.description.path', {
+  'file.path': i18n.translate('xpack.securitySolution.blocklist.entry.field.description.path', {
     defaultMessage: 'The full path of the application',
   }),
   'file.Ext.code_signature': i18n.translate(
-    'xpack.securitySolution.blocklists.entry.field.description.signature',
+    'xpack.securitySolution.blocklist.entry.field.description.signature',
     { defaultMessage: 'The signer of the application' }
   ),
 };
 
 export const POLICY_SELECT_DESCRIPTION = i18n.translate(
-  'xpack.securitySolution.blocklists.policyAssignmentSectionDescription',
+  'xpack.securitySolution.blocklist.policyAssignmentSectionDescription',
   {
     defaultMessage:
       'Assign this blocklist globally across all policies, or assign it to specific policies.',
@@ -104,26 +104,32 @@ export const POLICY_SELECT_DESCRIPTION = i18n.translate(
 );
 
 export const ERRORS = {
-  NAME_REQUIRED: i18n.translate('xpack.securitySolution.blocklists.errors.name.required', {
+  NAME_REQUIRED: i18n.translate('xpack.securitySolution.blocklist.errors.name.required', {
     defaultMessage: 'Name is required',
   }),
-  VALUE_REQUIRED: i18n.translate('xpack.securitySolution.blocklists.errors.values.required', {
+  VALUE_REQUIRED: i18n.translate('xpack.securitySolution.blocklist.errors.values.required', {
     defaultMessage: 'Field entry must have a value',
   }),
-  INVALID_HASH: i18n.translate('xpack.securitySolution.blocklists.errors.values.invalidHash', {
+  INVALID_HASH: i18n.translate('xpack.securitySolution.blocklist.errors.values.invalidHash', {
     defaultMessage: 'Invalid hash value',
   }),
-  INVALID_PATH: i18n.translate('xpack.securitySolution.blocklists.warnings.values.invalidPath', {
+  INVALID_PATH: i18n.translate('xpack.securitySolution.blocklist.warnings.values.invalidPath', {
     defaultMessage: 'Path may be formed incorrectly; verify value',
   }),
+  WILDCARD_PRESENT: i18n.translate(
+    'xpack.securitySolution.blocklist.warnings.values.wildcardPresent',
+    {
+      defaultMessage: "A wildcard in the filename will affect the endpoint's performance",
+    }
+  ),
   DUPLICATE_VALUE: i18n.translate(
-    'xpack.securitySolution.blocklists.warnings.values.duplicateValue',
+    'xpack.securitySolution.blocklist.warnings.values.duplicateValue',
     {
       defaultMessage: 'This value already exists',
     }
   ),
   DUPLICATE_VALUES: i18n.translate(
-    'xpack.securitySolution.blocklists.warnings.values.duplicateValues',
+    'xpack.securitySolution.blocklist.warnings.values.duplicateValues',
     {
       defaultMessage: 'One or more duplicate values removed',
     }
diff --git a/x-pack/plugins/security_solution/public/management/pages/blocklist/view/blocklist.tsx b/x-pack/plugins/security_solution/public/management/pages/blocklist/view/blocklist.tsx
index c4d4edb5e1331..a48d770460ec9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/blocklist/view/blocklist.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/blocklist/view/blocklist.tsx
@@ -7,6 +7,9 @@
 
 import React, { memo } from 'react';
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { DocLinks } from '@kbn/doc-links';
+import { EuiLink } from '@elastic/eui';
 
 import { useHttp } from '../../../../common/lib/kibana';
 import { ArtifactListPage, ArtifactListPageProps } from '../../../components/artifact_list_page';
@@ -48,7 +51,7 @@ const BLOCKLIST_PAGE_LABELS: ArtifactListPageProps['labels'] = {
   ),
   flyoutCreateSubmitSuccess: ({ name }) =>
     i18n.translate('xpack.securitySolution.blocklist.flyoutCreateSubmitSuccess', {
-      defaultMessage: '"{name}" has been added to your blocklist.', // FIXME: match this to design (needs count of items)
+      defaultMessage: '"{name}" has been added to your blocklist.',
       values: { name },
     }),
   flyoutEditSubmitSuccess: ({ name }) =>
@@ -56,28 +59,23 @@ const BLOCKLIST_PAGE_LABELS: ArtifactListPageProps['labels'] = {
       defaultMessage: '"{name}" has been updated.',
       values: { name },
     }),
-  flyoutDowngradedLicenseDocsInfo: () => {
-    return 'tbd...';
-    // FIXME: define docs link for license downgrade message. sample code below
-
-    // const { docLinks } = useKibana().services;
-    // return (
-    //   <FormattedMessage
-    //     id="some-id-1"
-    //     defaultMessage="For more information, see our {link}."
-    //     value={{
-    //       link: (
-    //         <EuiLink target="_blank" href={`${docLinks.links.securitySolution.eventFilters}`}>
-    //           {' '}
-    //           <FormattedMessage
-    //             id="dome-id-2"
-    //             defaultMessage="Event filters documentation"
-    //           />{' '}
-    //         </EuiLink>
-    //       ),
-    //     }}
-    //   />
-    // );
+  flyoutDowngradedLicenseDocsInfo: (
+    securitySolutionDocsLinks: DocLinks['securitySolution']
+  ): React.ReactNode => {
+    return (
+      <>
+        <FormattedMessage
+          id="xpack.securitySolution.blocklist.flyoutDowngradedLicenseDocsInfo"
+          defaultMessage="For more information, see our "
+        />
+        <EuiLink target="_blank" href={`${securitySolutionDocsLinks.blocklist}`}>
+          <FormattedMessage
+            id="xpack.securitySolution.blocklist.flyoutDowngradedLicenseDocsLink"
+            defaultMessage="Blocklist documentation"
+          />
+        </EuiLink>
+      </>
+    );
   },
   deleteActionSuccess: (itemName) =>
     i18n.translate('xpack.securitySolution.blocklist.deleteSuccess', {
@@ -85,15 +83,15 @@ const BLOCKLIST_PAGE_LABELS: ArtifactListPageProps['labels'] = {
       values: { itemName },
     }),
   emptyStateTitle: i18n.translate('xpack.securitySolution.blocklist.emptyStateTitle', {
-    defaultMessage: 'Add your first blocklist',
+    defaultMessage: 'Add your first blocklist entry',
+  }),
+  emptyStateInfo: i18n.translate('xpack.securitySolution.blocklist.emptyStateInfo', {
+    defaultMessage:
+      'The blocklist prevents selected applications from running on your hosts by extending the list of processes the Endpoint considers malicious.',
   }),
-  emptyStateInfo: i18n.translate(
-    'xpack.securitySolution.blocklist.emptyStateInfo',
-    { defaultMessage: 'Add a blocklist to prevent execution on the endpoint' } // FIXME: need wording here form PM
-  ),
   emptyStatePrimaryButtonLabel: i18n.translate(
     'xpack.securitySolution.blocklist.emptyStatePrimaryButtonLabel',
-    { defaultMessage: 'Add blocklist' }
+    { defaultMessage: 'Add blocklist entry' }
   ),
   searchPlaceholderInfo: i18n.translate('xpack.securitySolution.blocklist.searchPlaceholderInfo', {
     defaultMessage: 'Search on the fields below: name, description, value',
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts
index 969bac811e632..83f643ec6a437 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/endpoint_pagination.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 import { History, createBrowserHistory } from 'history';
 import { applyMiddleware, Store, createStore } from 'redux';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { AppLocation, MetadataListResponse } from '../../../../../common/endpoint/types';
 import { DepsStartMock, depsStartMock } from '../../../../common/mock/endpoint';
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 ab24e2a41a64e..57cdaca1f2147 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
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 import { applyMiddleware, createStore, Store } from 'redux';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { History, createBrowserHistory } from 'history';
 import { DepsStartMock, depsStartMock } from '../../../../common/mock/endpoint';
 import {
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 2d433a4cdf8c5..af2aa3e87326d 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
@@ -6,10 +6,10 @@
  */
 
 import type { DataViewBase, Query } from '@kbn/es-query';
-import { CoreStart, HttpStart } from 'kibana/public';
+import { CoreStart, HttpStart } from '@kbn/core/public';
 import { Dispatch } from 'redux';
 import semverGte from 'semver/functions/gte';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../fleet/common';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import {
   BASE_POLICY_RESPONSE_ROUTE,
   ENDPOINT_ACTION_LOG_ROUTE,
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 3c0d7163ef723..c3975f63aac1e 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
@@ -5,7 +5,13 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
+import {
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetPackagesResponse,
+  GetAgentsResponse,
+} from '@kbn/fleet-plugin/common/types/rest_spec';
 import {
   GetHostPolicyResponse,
   HostInfo,
@@ -21,12 +27,6 @@ import {
   INGEST_API_PACKAGE_POLICIES,
   INGEST_API_FLEET_AGENTS,
 } from '../../../services/policies/ingest';
-import {
-  GetAgentPoliciesResponse,
-  GetAgentPoliciesResponseItem,
-  GetPackagesResponse,
-  GetAgentsResponse,
-} from '../../../../../../fleet/common/types/rest_spec';
 import { GetPolicyListResponse } from '../../policy/types';
 import { pendingActionsResponseMock } from '../../../../common/lib/endpoint_pending_actions/mocks';
 import {
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 7757aa7f1329b..67fc0eec6d0a3 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
@@ -7,6 +7,7 @@
 
 import { EuiSuperDatePickerRecentRange } from '@elastic/eui';
 import type { DataViewBase } from '@kbn/es-query';
+import { GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import {
   ActivityLog,
   HostInfo,
@@ -20,7 +21,6 @@ import {
   EndpointPendingActions,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
-import { GetPackagesResponse } from '../../../../../fleet/common';
 import { AsyncResourceState } from '../../state';
 import { TRANSFORM_STATES } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
index 00afb94addafb..889c5005ec193 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
@@ -10,10 +10,10 @@ import { useHistory } from 'react-router-dom';
 import { encode, RisonValue } from 'rison-node';
 import styled from 'styled-components';
 import type { Query } from '@kbn/es-query';
-import { TimeHistory } from '../../../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
-import { SearchBar } from '../../../../../../../../../src/plugins/unified_search/public';
-import { Storage } from '../../../../../../../../../src/plugins/kibana_utils/public';
+import { TimeHistory } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { SearchBar } from '@kbn/unified-search-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { urlFromQueryParams } from '../url_from_query_params';
 import { useEndpointSelector } from '../hooks';
 import * as selectors from '../../store/selectors';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
index 717368a1ff3a0..a0dc4d030277b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
@@ -8,6 +8,7 @@
 import React, { ComponentType } from 'react';
 import moment from 'moment';
 
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   ActivityLog,
   Immutable,
@@ -16,7 +17,6 @@ import {
 import { EndpointDetailsFlyoutTabs } from './components/endpoint_details_tabs';
 import { EndpointActivityLog } from './endpoint_activity_log';
 import { EndpointDetailsFlyout } from '.';
-import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { AsyncResourceState } from '../../../../state';
 
 export const dummyEndpointActivityLog = (
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
index e8fa53e2cf920..5ad2c15366eb0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
@@ -7,6 +7,7 @@
 
 import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { EndpointState } from '../../types';
 import { State } from '../../../../../common/store';
 import {
@@ -14,7 +15,6 @@ import {
   MANAGEMENT_STORE_GLOBAL_NAMESPACE,
 } from '../../../../common/constants';
 import { useAppUrl } from '../../../../../common/lib/kibana';
-import { pagePathGetters } from '../../../../../../../fleet/public';
 
 export function useEndpointSelector<TSelected>(selector: (state: EndpointState) => TSelected) {
   return useSelector(function (state: State) {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
index cbaa6ce4bf56d..2b30d6b4682cb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
@@ -7,8 +7,8 @@
 
 import React, { useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { APP_UI_ID } from '../../../../../../common/constants';
-import { pagePathGetters } from '../../../../../../../fleet/public';
 import { getEndpointDetailsPath } from '../../../../common/routing';
 import { HostMetadata, MaybeImmutable } from '../../../../../../common/endpoint/types';
 import { useEndpointSelector } from './hooks';
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 9e86b0389c19d..39b1c9aecaf65 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,10 +8,10 @@
 import React from 'react';
 import * as reactTestingLibrary from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { EndpointList } from './index';
+import { EndpointList } from '.';
 import '../../../../common/mock/match_media';
 
-import { createUseUiSetting$Mock } from '../../../../../public/common/lib/kibana/kibana_react.mock';
+import { createUseUiSetting$Mock } from '../../../../common/lib/kibana/kibana_react.mock';
 
 import {
   mockEndpointDetailsApiResult,
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 441f2502fa3f7..97bae3e150848 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
@@ -27,6 +27,12 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { createStructuredSelector } from 'reselect';
 import { useDispatch } from 'react-redux';
+import {
+  CreatePackagePolicyRouteState,
+  AgentPolicyDetailsDeployAgentAction,
+  pagePathGetters,
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { EndpointDetailsFlyout } from './details';
 import * as selectors from '../store/selectors';
 import { useEndpointSelector } from './hooks';
@@ -40,11 +46,6 @@ 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 { EndpointPolicyLink } from '../../../components/endpoint_policy_link';
-import {
-  CreatePackagePolicyRouteState,
-  AgentPolicyDetailsDeployAgentAction,
-  pagePathGetters,
-} from '../../../../../../fleet/public';
 import { SecurityPageName } from '../../../../app/types';
 import {
   getEndpointListPath,
@@ -57,7 +58,6 @@ import { EndpointAction } from '../store/action';
 import { OutOfDate } from './components/out_of_date';
 import { AdminSearchBar } from './components/search_bar';
 import { AdministrationListPage } from '../../../components/administration_list_page';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { LinkToApp } from '../../../../common/components/endpoint/link_to_app';
 import { TableRowActions } from './components/table_row_actions';
 import { EndpointAgentStatus } from './components/endpoint_agent_status';
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts
index 89cf2f0cbd276..cccb37ebf0af3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/event_filters_api_client.ts
@@ -6,7 +6,7 @@
  */
 
 import { ENDPOINT_EVENT_FILTERS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { EVENT_FILTER_LIST_DEFINITION } from '../constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts
index a2b0575601123..a1259647ddbe8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import type {
   FoundExceptionListItemSchema,
   ExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts
index 787d8495a3d45..05c00a291c510 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/service/service_actions.ts
@@ -12,7 +12,7 @@ import {
   FoundExceptionListItemSchema,
   UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import {
   EXCEPTION_LIST_ITEM_URL,
   EXCEPTION_LIST_URL,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts
index 45c6ad0d453d9..9ec7e84d693fd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/middleware.test.ts
@@ -19,7 +19,7 @@ import { initialEventFiltersPageState } from './builders';
 import { getInitialExceptionFromEvent } from './utils';
 import { createdEventFilterEntryMock, ecsEventMock } from '../test_utils';
 import { EventFiltersListPageState, EventFiltersService } from '../types';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { isFailedResourceState, isLoadedResourceState } from '../../../state';
 import { getListFetchError } from './selector';
 import type {
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
index 671479e099a59..fa3a519bc1908 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/store/selectors.test.ts
@@ -29,7 +29,7 @@ import { ecsEventMock } from '../test_utils';
 import { getInitialExceptionFromEvent } from './utils';
 import { EventFiltersListPageState, EventFiltersPageLocation } from '../types';
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../../common/constants';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   asStaleResourceState,
   createFailedResourceState,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts
index 9f30fcd8ccd2a..398b3d9fa6d37 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/test_utils/index.ts
@@ -12,6 +12,9 @@ import type {
   ExceptionListSummarySchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getSummaryExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_summary_schema.mock';
 import { Ecs } from '../../../../../common/ecs';
 
 import {
@@ -24,9 +27,6 @@ import {
   httpHandlerMockFactory,
   ResponseProvidersInterface,
 } from '../../../../common/mock/endpoint/http_handler_mock_factory';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getSummaryExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_summary_schema.mock';
 
 export const createGlobalNoMiddlewareStore = () => {
   return createStore(
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
index 2c09eed85b191..9e245e5c8214e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/event_filter_delete_modal.test.tsx
@@ -13,7 +13,7 @@ import {
 import { act } from '@testing-library/react';
 import { fireEvent } from '@testing-library/dom';
 import { EventFilterDeleteModal } from './event_filter_delete_modal';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { showDeleteModal } from '../../store/selector';
 import { isFailedResourceState, isLoadedResourceState } from '../../../../state';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
index 8ff68d266031a..0ba0a3385dcb6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.test.tsx
@@ -24,7 +24,8 @@ import { getFormEntryState, isUninitialisedForm } from '../../../store/selector'
 import { EventFiltersListPageState } from '../../../types';
 import { useKibana } from '../../../../../../common/lib/kibana';
 import { licenseService } from '../../../../../../common/hooks/use_license';
-import { getExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { of } from 'rxjs';
 
 jest.mock('../../../../../../common/lib/kibana');
 jest.mock('../form');
@@ -92,7 +93,7 @@ describe('Event filter flyout', () => {
         http: {},
         data: {
           search: {
-            search: jest.fn().mockImplementation(() => ({ toPromise: () => esResponseData() })),
+            search: jest.fn().mockImplementation(() => of(esResponseData())),
           },
         },
         notifications: {},
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx
index 4107c971cc3b2..ed4e0e11975c7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx
@@ -25,6 +25,7 @@ import {
   EuiCallOut,
   EuiLink,
 } from '@elastic/eui';
+import { lastValueFrom } from 'rxjs';
 import { AppAction } from '../../../../../../common/store/actions';
 import { EventFiltersForm } from '../form';
 import { useEventFiltersSelector, useEventFiltersNotification } from '../../hooks';
@@ -105,8 +106,8 @@ export const EventFiltersFlyout: React.FC<EventFiltersFlyoutProps> = memo(
     useEffect(() => {
       const enrichEvent = async () => {
         if (!data || !data._index) return;
-        const searchResponse = await search
-          .search({
+        const searchResponse = await lastValueFrom(
+          search.search({
             params: {
               index: data._index,
               body: {
@@ -118,7 +119,7 @@ export const EventFiltersFlyout: React.FC<EventFiltersFlyoutProps> = memo(
               },
             },
           })
-          .toPromise();
+        );
 
         setEnrichedData({
           ...data,
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
index dc1721d2580e8..a9778329ff2f7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { EventFiltersForm } from '.';
 import { RenderResult, act } from '@testing-library/react';
 import { fireEvent, waitFor } from '@testing-library/dom';
-import { stubIndexPattern } from 'src/plugins/data/common/stubs';
+import { stubIndexPattern } from '@kbn/data-plugin/common/stubs';
 import { getInitialExceptionFromEvent } from '../../../store/utils';
 import { useFetchIndex } from '../../../../../../common/containers/source';
 import { ecsEventMock } from '../../../test_utils';
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
index 027d6e2bacfa6..0bd785a28eff0 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
@@ -27,6 +27,8 @@ import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-t
 import { EVENT_FILTERS_OPERATORS } from '@kbn/securitysolution-list-utils';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
 
+import { getExceptionBuilderComponentLazy } from '@kbn/lists-plugin/public';
+import type { OnChangeProps } from '@kbn/lists-plugin/public';
 import { PolicyData } from '../../../../../../../common/endpoint/types';
 import { AddExceptionComments } from '../../../../../../common/components/exceptions/add_exception_comments';
 import { filterIndexPatterns } from '../../../../../../common/components/exceptions/helpers';
@@ -34,8 +36,6 @@ import { Loader } from '../../../../../../common/components/loader';
 import { useKibana } from '../../../../../../common/lib/kibana';
 import { useFetchIndex } from '../../../../../../common/containers/source';
 import { AppAction } from '../../../../../../common/store/actions';
-import { getExceptionBuilderComponentLazy } from '../../../../../../../../lists/public';
-import type { OnChangeProps } from '../../../../../../../../lists/public';
 import { useEventFiltersSelector } from '../../hooks';
 import { getFormEntryStateMutable, getHasNameError, getNewComment } from '../../../store/selector';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
index 82fe231505ad5..7643125c587e7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/use_event_filters_notification.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { renderHook, act } from '@testing-library/react-hooks';
 
-import { NotificationsStart } from 'kibana/public';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public/context';
+import { NotificationsStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public/context';
 import type {
   CreateExceptionListItemSchema,
   ExceptionListItemSchema,
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts
index 7e711732fa6f3..cdb5b35be03fd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/host_isolation_exceptions_api_client.ts
@@ -6,7 +6,7 @@
  */
 
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../services/exceptions_list/exceptions_list_api_client';
 import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from './constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
index 6fd0b77abfffc..8cec854778e4f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
@@ -14,7 +14,7 @@ import {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { transformNewItemOutput, transformOutput } from '@kbn/securitysolution-list-hooks';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '../event_filters/constants';
 import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from './constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
index 0477e8fa5055d..fdaa3f6842e68 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/delete_modal.test.tsx
@@ -9,7 +9,7 @@ import { waitFor } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import uuid from 'uuid';
-import { getExceptionListItemSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
index 46ea59a802c49..9bdf88e8a6b37 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.test.tsx
@@ -24,7 +24,7 @@ import {
 import { createEmptyHostIsolationException } from '../../utils';
 import { HostIsolationExceptionsFormFlyout } from './form_flyout';
 
-jest.mock('../../service.ts');
+jest.mock('../../service');
 jest.mock('../../../../../common/hooks/use_license');
 jest.mock('../../../../services/policies/policies');
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
index e84dfeb336f1f..69d0a0aa0a75d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
@@ -8,7 +8,7 @@
 import { act, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { HOST_ISOLATION_EXCEPTIONS_PATH } from '../../../../../common/constants';
 import { EndpointPrivileges } from '../../../../../common/endpoint/types';
 import { useUserPrivileges as _useUserPrivileges } from '../../../../common/components/user_privileges';
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 5abdb5020110e..e4516110c91ab 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,8 +7,8 @@
 
 import React from 'react';
 
-import { ManagementContainer } from './index';
-import '../../common/mock/match_media.ts';
+import { ManagementContainer } from '.';
+import '../../common/mock/match_media';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../common/mock/endpoint';
 import { useUserPrivileges } from '../../common/components/user_privileges';
 import { endpointPageHttpMock } from './endpoint_hosts/mocks';
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 fb23b7466623c..2da77bb24c919 100644
--- a/x-pack/plugins/security_solution/public/management/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/index.tsx
@@ -7,8 +7,8 @@
 
 import React, { memo } from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
-import { EuiEmptyPrompt, EuiLoadingSpinner, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import {
   MANAGEMENT_ROUTING_ENDPOINTS_PATH,
   MANAGEMENT_ROUTING_EVENT_FILTERS_PATH,
@@ -18,7 +18,6 @@ import {
   MANAGEMENT_ROUTING_BLOCKLIST_PATH,
 } from '../common/constants';
 import { NotFoundPage } from '../../app/404';
-import { TrackApplicationView } from '../../../../../../src/plugins/usage_collection/public';
 import { EndpointsContainer } from './endpoint_hosts';
 import { PolicyContainer } from './policy';
 import { TrustedAppsContainer } from './trusted_apps';
@@ -29,35 +28,7 @@ import { getEndpointListPath } from '../common/routing';
 import { useUserPrivileges } from '../../common/components/user_privileges';
 import { HostIsolationExceptionsContainer } from './host_isolation_exceptions';
 import { BlocklistContainer } from './blocklist';
-
-const NoPermissions = memo(() => {
-  return (
-    <>
-      <EuiEmptyPrompt
-        iconType="alert"
-        iconColor="danger"
-        titleSize="l"
-        data-test-subj="noIngestPermissions"
-        title={
-          <FormattedMessage
-            id="xpack.securitySolution.endpointManagemnet.noPermissionsText"
-            defaultMessage="You do not have the required Kibana permissions to use Elastic Security Administration"
-          />
-        }
-        body={
-          <EuiText color="subdued">
-            <FormattedMessage
-              id="xpack.securitySolution.endpointManagement.noPermissionsSubText"
-              defaultMessage="You must have the superuser role to use this feature. If you do not have the superuser role and do not have permissions to edit user roles, contact your Kibana administrator."
-            />
-          </EuiText>
-        }
-      />
-      <SpyRoute pageName={SecurityPageName.administration} />
-    </>
-  );
-});
-NoPermissions.displayName = 'NoPermissions';
+import { NoPermissions } from '../components/no_permissons';
 
 const EndpointTelemetry = () => (
   <TrackApplicationView viewId={SecurityPageName.endpoints}>
@@ -99,7 +70,12 @@ export const ManagementContainer = memo(() => {
   }
 
   if (!canAccessEndpointManagement) {
-    return <Route path="*" component={NoPermissions} />;
+    return (
+      <>
+        <Route path="*" component={NoPermissions} />
+        <SpyRoute pageName={SecurityPageName.administration} />
+      </>
+    );
   }
 
   return (
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/exceptions_list_http_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/exceptions_list_http_mocks.ts
new file mode 100644
index 0000000000000..28fb4a844c896
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/exceptions_list_http_mocks.ts
@@ -0,0 +1,259 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  ExceptionListItemSchema,
+  FoundExceptionListItemSchema,
+  FindExceptionListItemSchema,
+  UpdateExceptionListItemSchema,
+  ReadExceptionListItemSchema,
+  CreateExceptionListItemSchema,
+  DeleteExceptionListItemSchema,
+  ExceptionListSchema,
+  ExceptionListSummarySchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import {
+  composeHttpHandlerMocks,
+  httpHandlerMockFactory,
+  ResponseProvidersInterface,
+} from '../../../common/mock/endpoint/http_handler_mock_factory';
+import { ExceptionsListItemGenerator } from '../../../../common/endpoint/data_generators/exceptions_list_item_generator';
+import {
+  BY_POLICY_ARTIFACT_TAG_PREFIX,
+  GLOBAL_ARTIFACT_TAG,
+} from '../../../../common/endpoint/service/artifacts';
+
+interface FindExceptionListItemSchemaQueryParams
+  extends Omit<FindExceptionListItemSchema, 'page' | 'per_page'> {
+  page?: number;
+  per_page?: number;
+}
+
+export type ExceptionsFindHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionsFind: (options: HttpFetchOptionsWithPath) => FoundExceptionListItemSchema;
+}>;
+/**
+ * HTTP mock for retrieving list of Exception
+ */
+export const exceptionsFindHttpMocks = httpHandlerMockFactory<ExceptionsFindHttpMocksInterface>([
+  {
+    id: 'exceptionsFind',
+    path: `${EXCEPTION_LIST_ITEM_URL}/_find`,
+    method: 'get',
+    handler: ({ query }): FoundExceptionListItemSchema => {
+      const apiQueryParams = query as unknown as FindExceptionListItemSchemaQueryParams;
+      const generator = new ExceptionsListItemGenerator('seed');
+      const perPage = apiQueryParams.per_page ?? 10;
+      const data = Array.from({ length: Math.min(perPage, 50) }, () =>
+        generator.generate({ tags: [GLOBAL_ARTIFACT_TAG] })
+      );
+
+      // If we have more than 2 items, then set policy ids on the per-policy trusted app
+      if (data.length > 2) {
+        // FIXME: remove hard-coded IDs below adn get them from the new FleetPackagePolicyGenerator (#2262)
+
+        // Change the 3rd entry (index 2) to be policy specific
+        data[2].tags = [
+          // IDs below are those generated by the `fleetGetEndpointPackagePolicyListHttpMock()` mock,
+          // so if using in combination with that API mock, these should just "work"
+          `${BY_POLICY_ARTIFACT_TAG_PREFIX}ddf6570b-9175-4a6d-b288-61a09771c647`,
+          `${BY_POLICY_ARTIFACT_TAG_PREFIX}b8e616ae-44fc-4be7-846c-ce8fa5c082dd`,
+        ];
+      }
+
+      return {
+        page: apiQueryParams.page ?? 1,
+        per_page: perPage,
+        total: 20,
+        data,
+      };
+    },
+  },
+]);
+
+export type ExceptionsPutHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionUpdate: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mocks that support updating a single Exception
+ */
+export const exceptionPutHttpMocks = httpHandlerMockFactory<ExceptionsPutHttpMocksInterface>([
+  {
+    id: 'exceptionUpdate',
+    path: EXCEPTION_LIST_ITEM_URL,
+    method: 'put',
+    handler: ({ body, path }): ExceptionListItemSchema => {
+      const updatedExceptionItem = JSON.parse(
+        body as string
+      ) as Required<UpdateExceptionListItemSchema>;
+      const response: ExceptionListItemSchema = {
+        ...updatedExceptionItem,
+        id: path.split('/').pop() ?? 'unknown-id',
+        list_id: 'endpoint_list_id',
+        comments: [],
+        created_at: '2021-10-12T16:02:55.856Z',
+        created_by: 'elastic',
+        updated_at: '2021-10-13T16:02:55.856Z',
+        updated_by: 'elastic',
+        _version: 'abc',
+        tie_breaker_id: '1111',
+      };
+
+      return response;
+    },
+  },
+]);
+
+export type ExceptionsGetOneHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionGetOne: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mock for retrieving one Exception
+ */
+export const exceptionsGetOneHttpMocks = httpHandlerMockFactory<ExceptionsGetOneHttpMocksInterface>(
+  [
+    {
+      id: 'exceptionGetOne',
+      path: EXCEPTION_LIST_ITEM_URL,
+      method: 'get',
+      handler: ({ query }): ExceptionListItemSchema => {
+        const apiQueryParams = query as ReadExceptionListItemSchema;
+        const exceptionItem = new ExceptionsListItemGenerator('seed').generate({
+          os_types: ['windows'],
+          tags: [GLOBAL_ARTIFACT_TAG],
+        });
+
+        exceptionItem.item_id = apiQueryParams.item_id ?? exceptionItem.item_id;
+        exceptionItem.namespace_type =
+          apiQueryParams.namespace_type ?? exceptionItem.namespace_type;
+
+        return exceptionItem;
+      },
+    },
+  ]
+);
+
+export type ExceptionsDeleteOneHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionDelete: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mock for deleting one Exception
+ */
+export const exceptionsDeleteOneHttpMocks =
+  httpHandlerMockFactory<ExceptionsDeleteOneHttpMocksInterface>([
+    {
+      id: 'exceptionDelete',
+      path: EXCEPTION_LIST_ITEM_URL,
+      method: 'delete',
+      handler: ({ query }): ExceptionListItemSchema => {
+        const apiQueryParams = query as DeleteExceptionListItemSchema;
+        const exceptionItem = new ExceptionsListItemGenerator('seed').generate({
+          os_types: ['windows'],
+          tags: [GLOBAL_ARTIFACT_TAG],
+        });
+
+        exceptionItem.item_id = apiQueryParams.item_id ?? exceptionItem.item_id;
+        exceptionItem.id = apiQueryParams.id ?? exceptionItem.id;
+        exceptionItem.namespace_type =
+          apiQueryParams.namespace_type ?? exceptionItem.namespace_type;
+
+        return exceptionItem;
+      },
+    },
+  ]);
+
+export type ExceptionsPostHttpMocksInterface = ResponseProvidersInterface<{
+  exceptionCreate: (options: HttpFetchOptionsWithPath) => ExceptionListItemSchema;
+}>;
+/**
+ * HTTP mocks that support creating a single Exception
+ */
+export const exceptionPostHttpMocks = httpHandlerMockFactory<ExceptionsPostHttpMocksInterface>([
+  {
+    id: 'exceptionCreate',
+    path: EXCEPTION_LIST_ITEM_URL,
+    method: 'post',
+    handler: ({ body, path }): ExceptionListItemSchema => {
+      const { comments, ...updatedExceptionItem } = JSON.parse(
+        body as string
+      ) as CreateExceptionListItemSchema;
+      const response: ExceptionListItemSchema = {
+        ...new ExceptionsListItemGenerator('seed').generate({
+          os_types: ['windows'],
+          tags: [GLOBAL_ARTIFACT_TAG],
+        }),
+        ...updatedExceptionItem,
+      };
+      response.id = path.split('/').pop() ?? response.id;
+
+      return response;
+    },
+  },
+]);
+
+export type ExceptionsPostCreateListHttpMockInterface = ResponseProvidersInterface<{
+  exceptionCreateList: (options: HttpFetchOptionsWithPath) => ExceptionListSchema;
+}>;
+/**
+ * HTTP mocks that support updating a single Exception
+ */
+export const exceptionsPostCreateListHttpMock =
+  httpHandlerMockFactory<ExceptionsPostCreateListHttpMockInterface>([
+    {
+      id: 'exceptionCreateList',
+      path: EXCEPTION_LIST_URL,
+      method: 'post',
+      handler: (): ExceptionListSchema => {
+        return getExceptionListSchemaMock();
+      },
+    },
+  ]);
+
+export type ExceptionsGetSummaryHttpMockInterface = ResponseProvidersInterface<{
+  exceptionsSummary: (options: HttpFetchOptionsWithPath) => ExceptionListSummarySchema;
+}>;
+/**
+ * HTTP mocks that support updating a single Exception
+ */
+export const exceptionsGetSummaryHttpMock =
+  httpHandlerMockFactory<ExceptionsGetSummaryHttpMockInterface>([
+    {
+      id: 'exceptionsSummary',
+      path: `${EXCEPTION_LIST_URL}/summary`,
+      method: 'get',
+      handler: (): ExceptionListSummarySchema => {
+        return {
+          total: 10,
+          linux: 2,
+          macos: 3,
+          windows: 5,
+        };
+      },
+    },
+  ]);
+
+export type ExceptionsListAllHttpMocksInterface = ExceptionsFindHttpMocksInterface &
+  ExceptionsGetOneHttpMocksInterface &
+  ExceptionsPutHttpMocksInterface &
+  ExceptionsDeleteOneHttpMocksInterface &
+  ExceptionsPostHttpMocksInterface &
+  ExceptionsPostCreateListHttpMockInterface &
+  ExceptionsGetSummaryHttpMockInterface;
+/** Use this HTTP mock when wanting to mock the API calls done by the Exception Http service */
+export const exceptionsListAllHttpMocks =
+  composeHttpHandlerMocks<ExceptionsListAllHttpMocksInterface>([
+    exceptionsFindHttpMocks,
+    exceptionsGetOneHttpMocks,
+    exceptionPutHttpMocks,
+    exceptionPostHttpMocks,
+    exceptionsPostCreateListHttpMock,
+    exceptionsDeleteOneHttpMocks,
+    exceptionsGetSummaryHttpMock,
+  ]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
index f015943b994b5..c134d7825a0fb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/fleet_mocks.ts
@@ -6,10 +6,6 @@
  */
 
 import { fromKueryExpression } from '@kbn/es-query';
-import {
-  httpHandlerMockFactory,
-  ResponseProvidersInterface,
-} from '../../../common/mock/endpoint/http_handler_mock_factory';
 import {
   AGENT_API_ROUTES,
   AGENT_POLICY_API_ROUTES,
@@ -21,7 +17,11 @@ import {
   GetAgentStatusResponse,
   GetPackagesResponse,
   PACKAGE_POLICY_API_ROUTES,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
+import {
+  httpHandlerMockFactory,
+  ResponseProvidersInterface,
+} from '../../../common/mock/endpoint/http_handler_mock_factory';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse, GetPolicyResponse } from '../policy/types';
 import { FleetAgentPolicyGenerator } from '../../../../common/endpoint/data_generators/fleet_agent_policy_generator';
diff --git a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
index 8e5f780bbab39..612793ade703e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/mocks/trusted_apps_http_mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import {
   ENDPOINT_TRUSTED_APPS_LIST_ID,
   EXCEPTION_LIST_ITEM_URL,
@@ -21,13 +21,13 @@ import {
   DeleteExceptionListItemSchema,
   ExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
+import { getTrustedAppsListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   composeHttpHandlerMocks,
   httpHandlerMockFactory,
   ResponseProvidersInterface,
 } from '../../../common/mock/endpoint/http_handler_mock_factory';
 import { ExceptionsListItemGenerator } from '../../../../common/endpoint/data_generators/exceptions_list_item_generator';
-import { getTrustedAppsListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
 import {
   fleetGetAgentPolicyListHttpMock,
   FleetGetAgentPolicyListHttpMockInterface,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts
index eec0ab1c6445c..3b578f85364c3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/action/policy_settings_action.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../../../../../../licensing/common/types';
-import { GetAgentStatusResponse } from '../../../../../../../../fleet/common/types/rest_spec';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { GetAgentStatusResponse } from '@kbn/fleet-plugin/common/types/rest_spec';
 import { PolicyData, UIPolicyConfig } from '../../../../../../../common/endpoint/types';
 import { ServerApiError } from '../../../../../../common/types';
 import { PolicyDetailsState } from '../../../types';
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 1fe646c86bd6a..96375cae68be9 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
@@ -7,7 +7,7 @@
 
 import { PolicyDetailsState } from '../../types';
 import { applyMiddleware, createStore, Dispatch, Store } from 'redux';
-import { policyDetailsReducer, PolicyDetailsAction, policyDetailsMiddlewareFactory } from './index';
+import { policyDetailsReducer, PolicyDetailsAction, policyDetailsMiddlewareFactory } from '.';
 import { policyConfig } from './selectors';
 import { policyFactory } from '../../../../../../common/endpoint/models/policy_config';
 import { PolicyData } from '../../../../../../common/endpoint/types';
@@ -19,9 +19,9 @@ import {
   AppContextTestRender,
   createAppRootMockRenderer,
 } from '../../../../../common/mock/endpoint';
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 import { cloneDeep } from 'lodash';
-import { licenseMock } from '../../../../../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 
 describe('policy details: ', () => {
   let store: Store;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts
index f90fdf1213581..32f8bf44a4831 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/middleware/policy_settings_middleware.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError } from 'kibana/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import {
   DefaultPolicyNotificationMessage,
   DefaultPolicyRuleNotificationMessage,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts
index eda993be89848..fc2a6f160fce9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/selectors/policy_settings_selectors.ts
@@ -7,7 +7,7 @@
 
 import { matchPath } from 'react-router-dom';
 import { createSelector } from 'reselect';
-import { ILicense } from '../../../../../../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { unsetPolicyFeaturesAccordingToLicenseLevel } from '../../../../../../../common/license/policy_config';
 import { PolicyDetailsState } from '../../../types';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts
index bfd4637a1f416..129f904b39b51 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/test_mock_utils.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import {
   INGEST_API_EPM_PACKAGES,
   INGEST_API_PACKAGE_POLICIES,
 } from '../../../services/policies/ingest';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { GetPolicyListResponse } from '../types';
-import { GetPackagesResponse } from '../../../../../../fleet/common';
 
 const generator = new EndpointDocGenerator('policy-list');
 
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 dfdd0145992bf..bba1d87f307f7 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
@@ -5,8 +5,14 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { ILicense } from '../../../../../licensing/common/types';
+import { CoreStart } from '@kbn/core/public';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import {
+  GetAgentStatusResponse,
+  GetOnePackagePolicyResponse,
+  GetPackagePoliciesResponse,
+  UpdatePackagePolicyResponse,
+} from '@kbn/fleet-plugin/common';
 import {
   AppLocation,
   Immutable,
@@ -19,12 +25,6 @@ import {
   PutTrustedAppUpdateResponse,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
-import {
-  GetAgentStatusResponse,
-  GetOnePackagePolicyResponse,
-  GetPackagePoliciesResponse,
-  UpdatePackagePolicyResponse,
-} from '../../../../../fleet/common';
 import { ImmutableMiddlewareAPI } from '../../../common/store';
 import { AppAction } from '../../../common/store/actions';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx
index ed5553337d6ac..c30b5a8887338 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.test.tsx
@@ -10,7 +10,7 @@ import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import uuid from 'uuid';
-import { getExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx
index a92411c22ce2b..172a8e671d2ad 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/delete_modal/policy_artifacts_delete_modal.tsx
@@ -7,7 +7,7 @@
 
 import { EuiCallOut, EuiConfirmModal, EuiSpacer, EuiText } from '@elastic/eui';
 import { useQueryClient } from 'react-query';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import React, { useCallback } from 'react';
 import { useBulkUpdateArtifact } from '../../../../../hooks/artifacts';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx
index f93cb91ba8384..edf9f5b21d8b4 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.test.tsx
@@ -9,8 +9,8 @@ import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import uuid from 'uuid';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx
index 3372d4e122f7c..3ee0159e959cc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/flyout/policy_artifacts_flyout.tsx
@@ -26,7 +26,7 @@ import {
 import { SearchExceptions } from '../../../../../components/search_exceptions';
 import { ImmutableObject, PolicyData } from '../../../../../../../common/endpoint/types';
 import { useToasts } from '../../../../../../common/lib/kibana';
-import { PolicyArtifactsAssignableList } from '../../artifacts/assignable';
+import { PolicyArtifactsAssignableList } from '../assignable';
 import { ExceptionsListApiClient } from '../../../../../services/exceptions_list/exceptions_list_api_client';
 import { useListArtifact, useBulkUpdateArtifact } from '../../../../../hooks/artifacts';
 import { POLICY_ARTIFACT_FLYOUT_LABELS } from './translations';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx
index 62342b4e64fcd..453c84f63689e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/layout/policy_artifacts_layout.test.tsx
@@ -21,7 +21,7 @@ import { PolicyArtifactsLayout } from './policy_artifacts_layout';
 import { ImmutableObject, PolicyData } from '../../../../../../../common/endpoint/types';
 import { parsePoliciesAndFilterToKql } from '../../../../../common/utils';
 import { eventFiltersListQueryHttpMock } from '../../../../event_filters/test_utils';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import { getEndpointPrivilegesInitialStateMock } from '../../../../../../common/components/user_privileges/endpoint/mocks';
 import { POLICY_ARTIFACT_EVENT_FILTERS_LABELS } from '../../tabs/event_filters_translations';
 import { EventFiltersApiClient } from '../../../../event_filters/service/event_filters_api_client';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx
index 76d4bb4535bc7..de2f245a9c098 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/artifacts/list/policy_artifacts_list.test.tsx
@@ -8,7 +8,7 @@
 import { act, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
 import {
   AppContextTestRender,
   createAppRootMockRenderer,
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx
index c079ae8a3a7da..77debc1c866b6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/components/events_form/index.tsx
@@ -21,7 +21,7 @@ import {
 import { OperatingSystem } from '@kbn/securitysolution-utils';
 import { ThemeContext } from 'styled-components';
 import { PolicyOperatingSystem, UIPolicyConfig } from '../../../../../../../common/endpoint/types';
-import { ConfigForm, ConfigFormHeading } from '../../components/config_form';
+import { ConfigForm, ConfigFormHeading } from '../config_form';
 
 const OPERATING_SYSTEM_TO_TEST_SUBJ: { [K in OperatingSystem]: string } = {
   [OperatingSystem.WINDOWS]: 'Windows',
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx
index 781aa880d1483..f15382d983f99 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_custom_assets_extension.tsx
@@ -8,13 +8,13 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { useKibana } from '../../../../../common/lib/kibana';
-import { APP_PATH } from '../../../../../../common/constants';
 import {
   CustomAssetsAccordionProps,
   CustomAssetsAccordion,
   PackageAssetsComponent,
-} from '../../../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '../../../../../common/lib/kibana';
+import { APP_PATH } from '../../../../../../common/constants';
 
 export const EndpointCustomAssetsExtension: PackageAssetsComponent = () => {
   const { http } = useKibana().services;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
index 973d0d457756d..c98def71f8a59 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
@@ -10,7 +10,7 @@ import { ThemeProvider } from 'styled-components';
 import { I18nProvider } from '@kbn/i18n-react';
 import { ExceptionItemsSummary } from './exception_items_summary';
 import * as reactTestingLibrary from '@testing-library/react';
-import { getMockTheme } from '../../../../../../../../public/common/lib/kibana/kibana_react.mock';
+import { getMockTheme } from '../../../../../../../common/lib/kibana/kibana_react.mock';
 import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
 
 const mockTheme = getMockTheme({
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx
index dc8256d93ae00..a5380c740ed9c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_artifacts_card.tsx
@@ -9,12 +9,9 @@ import React, { memo, useMemo } from 'react';
 import { EuiPanel, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  PackageCustomExtensionComponentProps,
-  pagePathGetters,
-} from '../../../../../../../../../fleet/public';
+import { PackageCustomExtensionComponentProps, pagePathGetters } from '@kbn/fleet-plugin/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
 import { ListPageRouteState } from '../../../../../../../../common/endpoint/types';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../../fleet/common';
 import { useToasts } from '../../../../../../../common/lib/kibana';
 import { useAppUrl } from '../../../../../../../common/lib/kibana/hooks';
 import { LinkWithIcon } from './link_with_icon';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx
index 7989bb2646483..c88f54f01fd2b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.test.tsx
@@ -18,7 +18,7 @@ import { FleetIntegrationArtifactsCard } from './fleet_integration_artifacts_car
 import { EndpointDocGenerator } from '../../../../../../../../common/endpoint/generate_data';
 import { getPolicyEventFiltersPath } from '../../../../../../common/routing';
 import { PolicyData } from '../../../../../../../../common/endpoint/types';
-import { getSummaryExceptionListSchemaMock } from '../../../../../../../../../lists/common/schemas/response/exception_list_summary_schema.mock';
+import { getSummaryExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_summary_schema.mock';
 import { EventFiltersApiClient } from '../../../../../event_filters/service/event_filters_api_client';
 import { SEARCHABLE_FIELDS } from '../../../../../event_filters/constants';
 import { EVENT_FILTERS_LABELS } from '../../endpoint_policy_edit_extension';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx
index 6ed604df57918..ce846ccb14560 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_integration_artifacts_card.tsx
@@ -9,8 +9,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { memo, useMemo } from 'react';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../../../../../../../fleet/common';
-import { pagePathGetters } from '../../../../../../../../../fleet/public';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
+import { pagePathGetters } from '@kbn/fleet-plugin/public';
 import { PolicyDetailsRouteState } from '../../../../../../../../common/endpoint/types';
 import { useAppUrl, useToasts } from '../../../../../../../common/lib/kibana';
 import { ExceptionItemsSummary } from './exception_items_summary';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.test.tsx
new file mode 100644
index 0000000000000..96828a12871ae
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.test.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { AppContextTestRender } from '../../../../../../common/mock/endpoint';
+import { createFleetContextRendererMock, generateFleetPackageInfo } from '../mocks';
+import { EndpointPackageCustomExtension } from './endpoint_package_custom_extension';
+import { useEndpointPrivileges as _useEndpointPrivileges } from '../../../../../../common/components/user_privileges/endpoint/use_endpoint_privileges';
+import { getEndpointPrivilegesInitialStateMock } from '../../../../../../common/components/user_privileges/endpoint/mocks';
+import { exceptionsListAllHttpMocks } from '../../../../mocks/exceptions_list_http_mocks';
+import { waitFor } from '@testing-library/react';
+
+jest.mock('../../../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
+const useEndpointPrivilegesMock = _useEndpointPrivileges as jest.Mock;
+
+describe('When displaying the EndpointPackageCustomExtension fleet UI extension', () => {
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let http: AppContextTestRender['coreStart']['http'];
+
+  beforeEach(() => {
+    const mockedTestContext = createFleetContextRendererMock();
+    http = mockedTestContext.coreStart.http;
+    render = () => {
+      renderResult = mockedTestContext.render(
+        <EndpointPackageCustomExtension
+          pkgkey="endpoint-8.2.0"
+          packageInfo={generateFleetPackageInfo()}
+        />
+      );
+
+      return renderResult;
+    };
+  });
+
+  afterEach(() => {
+    useEndpointPrivilegesMock.mockReturnValue(getEndpointPrivilegesInitialStateMock());
+  });
+
+  it.each([
+    ['trusted apps', 'trustedApps-fleetCard'],
+    ['event filters', 'eventFilters-fleetCard'],
+    ['host isolation exceptions', 'hostIsolationExceptions-fleetCard'],
+    ['bLocklist', 'blocklists-fleetCard'],
+  ])('should show %s card', (_, testId) => {
+    render();
+
+    expect(renderResult.getByTestId(testId)).toBeTruthy();
+  });
+
+  it('should show Host Isolations Exceptions if user has no authz but entries exist', async () => {
+    useEndpointPrivilegesMock.mockReturnValue({
+      ...getEndpointPrivilegesInitialStateMock(),
+      canIsolateHost: false,
+    });
+    // Mock APIs. Using Trusted Apps http mock here, which will still work
+    // for exceptions since the mocks don't currently check for list id
+    exceptionsListAllHttpMocks(http);
+    render();
+
+    await waitFor(() => {
+      expect(renderResult.getByTestId('hostIsolationExceptions-fleetCard')).toBeTruthy();
+    });
+  });
+
+  it('should NOT show Host Isolation Exceptions if user has no authz and no entries exist', () => {
+    useEndpointPrivilegesMock.mockReturnValue({
+      ...getEndpointPrivilegesInitialStateMock(),
+      canIsolateHost: false,
+    });
+    render();
+
+    expect(renderResult.queryByTestId('hostIsolationExceptions-fleetCard')).toBeNull();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.tsx
new file mode 100644
index 0000000000000..e6984087bef5a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/endpoint_package_custom_extension.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useMemo } from 'react';
+import { EuiSpacer } from '@elastic/eui';
+import { PackageCustomExtensionComponentProps } from '@kbn/fleet-plugin/public';
+import { useHttp } from '../../../../../../common/lib/kibana';
+import { useCanSeeHostIsolationExceptionsMenu } from '../../../../host_isolation_exceptions/view/hooks';
+import { TrustedAppsApiClient } from '../../../../trusted_apps/service/trusted_apps_api_client';
+import { EventFiltersApiClient } from '../../../../event_filters/service/event_filters_api_client';
+import { HostIsolationExceptionsApiClient } from '../../../../host_isolation_exceptions/host_isolation_exceptions_api_client';
+import { BlocklistsApiClient } from '../../../../blocklist/services';
+import { FleetArtifactsCard } from './components/fleet_artifacts_card';
+import {
+  getBlocklistsListPath,
+  getEventFiltersListPath,
+  getHostIsolationExceptionsListPath,
+  getTrustedAppsListPath,
+} from '../../../../../common/routing';
+import {
+  BLOCKLISTS_LABELS,
+  EVENT_FILTERS_LABELS,
+  HOST_ISOLATION_EXCEPTIONS_LABELS,
+  TRUSTED_APPS_LABELS,
+} from './translations';
+import { useEndpointPrivileges } from '../../../../../../common/components/user_privileges/endpoint';
+import { NoPermissions } from '../../../../../components/no_permissons';
+
+export const EndpointPackageCustomExtension = memo<PackageCustomExtensionComponentProps>(
+  (props) => {
+    const http = useHttp();
+    const canSeeHostIsolationExceptions = useCanSeeHostIsolationExceptionsMenu();
+    const { canAccessEndpointManagement } = useEndpointPrivileges();
+
+    const trustedAppsApiClientInstance = useMemo(
+      () => TrustedAppsApiClient.getInstance(http),
+      [http]
+    );
+
+    const eventFiltersApiClientInstance = useMemo(
+      () => EventFiltersApiClient.getInstance(http),
+      [http]
+    );
+
+    const hostIsolationExceptionsApiClientInstance = useMemo(
+      () => HostIsolationExceptionsApiClient.getInstance(http),
+      [http]
+    );
+
+    const blocklistsApiClientInstance = useMemo(
+      () => BlocklistsApiClient.getInstance(http),
+      [http]
+    );
+
+    const artifactCards = useMemo(
+      () => (
+        <div data-test-subj="fleetEndpointPackageCustomContent">
+          <FleetArtifactsCard
+            {...props}
+            artifactApiClientInstance={trustedAppsApiClientInstance}
+            getArtifactsPath={getTrustedAppsListPath}
+            labels={TRUSTED_APPS_LABELS}
+            data-test-subj="trustedApps"
+          />
+          <EuiSpacer />
+          <FleetArtifactsCard
+            {...props}
+            artifactApiClientInstance={eventFiltersApiClientInstance}
+            getArtifactsPath={getEventFiltersListPath}
+            labels={EVENT_FILTERS_LABELS}
+            data-test-subj="eventFilters"
+          />
+          {canSeeHostIsolationExceptions && (
+            <>
+              <EuiSpacer />
+              <FleetArtifactsCard
+                {...props}
+                artifactApiClientInstance={hostIsolationExceptionsApiClientInstance}
+                getArtifactsPath={getHostIsolationExceptionsListPath}
+                labels={HOST_ISOLATION_EXCEPTIONS_LABELS}
+                data-test-subj="hostIsolationExceptions"
+              />
+            </>
+          )}
+          <EuiSpacer />
+          <FleetArtifactsCard
+            {...props}
+            artifactApiClientInstance={blocklistsApiClientInstance}
+            getArtifactsPath={getBlocklistsListPath}
+            labels={BLOCKLISTS_LABELS}
+            data-test-subj="blocklists"
+          />
+        </div>
+      ),
+      [
+        blocklistsApiClientInstance,
+        canSeeHostIsolationExceptions,
+        eventFiltersApiClientInstance,
+        hostIsolationExceptionsApiClientInstance,
+        trustedAppsApiClientInstance,
+        props,
+      ]
+    );
+
+    return canAccessEndpointManagement ? artifactCards : <NoPermissions />;
+  }
+);
+
+EndpointPackageCustomExtension.displayName = 'EndpointPackageCustomExtension';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx
index b6b91d8d64e4f..dde0dc54ecab3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/index.tsx
@@ -5,156 +5,5 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { EuiSpacer } from '@elastic/eui';
-import React, { memo, useMemo } from 'react';
-import { useHttp } from '../../../../../../common/lib/kibana/hooks';
-import { PackageCustomExtensionComponentProps } from '../../../../../../../../fleet/public';
-import { FleetArtifactsCard } from './components/fleet_artifacts_card';
-import {
-  getBlocklistsListPath,
-  getEventFiltersListPath,
-  getHostIsolationExceptionsListPath,
-  getTrustedAppsListPath,
-} from '../../../../../common/routing';
-import { TrustedAppsApiClient } from '../../../../trusted_apps/service/trusted_apps_api_client';
-import { EventFiltersApiClient } from '../../../../event_filters/service/event_filters_api_client';
-import { HostIsolationExceptionsApiClient } from '../../../../host_isolation_exceptions/host_isolation_exceptions_api_client';
-import { BlocklistsApiClient } from '../../../../blocklist/services';
-import { useCanSeeHostIsolationExceptionsMenu } from '../../../../host_isolation_exceptions/view/hooks';
-
-export const TRUSTED_APPS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error',
-      {
-        defaultMessage: 'There was an error trying to fetch trusted applications stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title"
-      defaultMessage="Trusted applications"
-    />
-  ),
-};
-
-export const EVENT_FILTERS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error',
-      {
-        defaultMessage: 'There was an error trying to fetch event filters stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title"
-      defaultMessage="Event filters"
-    />
-  ),
-};
-
-export const HOST_ISOLATION_EXCEPTIONS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error',
-      {
-        defaultMessage:
-          'There was an error trying to fetch host isolation exceptions stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title"
-      defaultMessage="Host isolation exceptions"
-    />
-  ),
-};
-
-export const BLOCKLISTS_LABELS = {
-  artifactsSummaryApiError: (error: string) =>
-    i18n.translate(
-      'xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error',
-      {
-        defaultMessage: 'There was an error trying to fetch blocklist stats: "{error}"',
-        values: { error },
-      }
-    ),
-  cardTitle: (
-    <FormattedMessage
-      id="xpack.securitySolution.endpoint.blocklists.fleetIntegration.title"
-      defaultMessage="Blocklist"
-    />
-  ),
-};
-
-export const EndpointPackageCustomExtension = memo<PackageCustomExtensionComponentProps>(
-  (props) => {
-    const http = useHttp();
-    const canSeeHostIsolationExceptions = useCanSeeHostIsolationExceptionsMenu();
-
-    const trustedAppsApiClientInstance = useMemo(
-      () => TrustedAppsApiClient.getInstance(http),
-      [http]
-    );
-
-    const eventFiltersApiClientInstance = useMemo(
-      () => EventFiltersApiClient.getInstance(http),
-      [http]
-    );
-
-    const hostIsolationExceptionsApiClientInstance = useMemo(
-      () => HostIsolationExceptionsApiClient.getInstance(http),
-      [http]
-    );
-
-    const bloklistsApiClientInstance = useMemo(() => BlocklistsApiClient.getInstance(http), [http]);
-
-    return (
-      <div data-test-subj="fleetEndpointPackageCustomContent">
-        <FleetArtifactsCard
-          {...props}
-          artifactApiClientInstance={trustedAppsApiClientInstance}
-          getArtifactsPath={getTrustedAppsListPath}
-          labels={TRUSTED_APPS_LABELS}
-          data-test-subj="trustedApps"
-        />
-        <EuiSpacer />
-        <FleetArtifactsCard
-          {...props}
-          artifactApiClientInstance={eventFiltersApiClientInstance}
-          getArtifactsPath={getEventFiltersListPath}
-          labels={EVENT_FILTERS_LABELS}
-          data-test-subj="eventFilters"
-        />
-        {canSeeHostIsolationExceptions && (
-          <>
-            <EuiSpacer />
-            <FleetArtifactsCard
-              {...props}
-              artifactApiClientInstance={hostIsolationExceptionsApiClientInstance}
-              getArtifactsPath={getHostIsolationExceptionsListPath}
-              labels={HOST_ISOLATION_EXCEPTIONS_LABELS}
-              data-test-subj="hostIsolationExceptions"
-            />
-          </>
-        )}
-        <EuiSpacer />
-        <FleetArtifactsCard
-          {...props}
-          artifactApiClientInstance={bloklistsApiClientInstance}
-          getArtifactsPath={getBlocklistsListPath}
-          labels={BLOCKLISTS_LABELS}
-          data-test-subj="blocklists"
-        />
-      </div>
-    );
-  }
-);
-
-EndpointPackageCustomExtension.displayName = 'EndpointPackageCustomExtension';
+export { EndpointPackageCustomExtension } from './endpoint_package_custom_extension';
+export * from './translations';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/translations.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/translations.tsx
new file mode 100644
index 0000000000000..ad694b54c7459
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/translations.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+export const TRUSTED_APPS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.trustedAppsSummarySummary.error',
+      {
+        defaultMessage: 'There was an error trying to fetch trusted applications stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.trustedApps.fleetIntegration.title"
+      defaultMessage="Trusted applications"
+    />
+  ),
+};
+
+export const EVENT_FILTERS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.eventFiltersSummarySummary.error',
+      {
+        defaultMessage: 'There was an error trying to fetch event filters stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.eventFilters.fleetIntegration.title"
+      defaultMessage="Event filters"
+    />
+  ),
+};
+
+export const HOST_ISOLATION_EXCEPTIONS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.hostIsolationExceptionsSummarySummary.error',
+      {
+        defaultMessage:
+          'There was an error trying to fetch host isolation exceptions stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title"
+      defaultMessage="Host isolation exceptions"
+    />
+  ),
+};
+
+export const BLOCKLISTS_LABELS = {
+  artifactsSummaryApiError: (error: string) =>
+    i18n.translate(
+      'xpack.securitySolution.endpoint.fleetCustomExtension.blocklistsSummarySummary.error',
+      {
+        defaultMessage: 'There was an error trying to fetch blocklist stats: "{error}"',
+        values: { error },
+      }
+    ),
+  cardTitle: (
+    <FormattedMessage
+      id="xpack.securitySolution.endpoint.blocklists.fleetIntegration.title"
+      defaultMessage="Blocklist"
+    />
+  ),
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx
index 7fe0bd80f91d2..20a904844e74e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_create_extension.tsx
@@ -8,7 +8,7 @@
 import React, { memo, useEffect } from 'react';
 import { EuiCallOut, EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { PackagePolicyCreateExtensionComponentProps } from '../../../../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public';
 
 /**
  * Exports Endpoint-specific package policy instructions
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx
index 24aad4e9ed686..87537014e6b0f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_policy_edit_extension.tsx
@@ -13,7 +13,7 @@ import { useDispatch } from 'react-redux';
 import {
   PackagePolicyEditExtensionComponentProps,
   NewPackagePolicy,
-} from '../../../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 import { useHttp } from '../../../../../common/lib/kibana/hooks';
 import {
   getPolicyDetailPath,
@@ -41,6 +41,7 @@ import { SEARCHABLE_FIELDS as BLOCKLIST_SEARCHABLE_FIELDS } from '../../../block
 import { SEARCHABLE_FIELDS as HOST_ISOLATION_EXCEPTIONS_SEARCHABLE_FIELDS } from '../../../host_isolation_exceptions/constants';
 import { SEARCHABLE_FIELDS as EVENT_FILTERS_SEARCHABLE_FIELDS } from '../../../event_filters/constants';
 import { SEARCHABLE_FIELDS as TRUSTED_APPS_SEARCHABLE_FIELDS } from '../../../trusted_apps/constants';
+import { useEndpointPrivileges } from '../../../../../common/components/user_privileges/endpoint';
 
 export const BLOCKLISTS_LABELS = {
   artifactsSummaryApiError: (error: string) =>
@@ -50,7 +51,7 @@ export const BLOCKLISTS_LABELS = {
     }),
   cardTitle: (
     <FormattedMessage
-      id="xpack.securitySolution.endpoint.blocklists.fleetIntegration.title"
+      id="xpack.securitySolution.endpoint.blocklist.fleetIntegration.title"
       defaultMessage="Blocklist"
     />
   ),
@@ -158,6 +159,7 @@ const WrappedPolicyDetailsForm = memo<{
 
   const http = useHttp();
   const blocklistsApiClientInstance = useMemo(() => BlocklistsApiClient.getInstance(http), [http]);
+  const { canAccessEndpointManagement } = useEndpointPrivileges();
 
   const hostIsolationExceptionsApiClientInstance = useMemo(
     () => HostIsolationExceptionsApiClient.getInstance(http),
@@ -225,8 +227,8 @@ const WrappedPolicyDetailsForm = memo<{
     });
   }, [onChange, updatedPolicy]);
 
-  return (
-    <div data-test-subj="endpointIntegrationPolicyForm">
+  const artifactCards = useMemo(
+    () => (
       <>
         <div>
           <EuiText>
@@ -276,6 +278,22 @@ const WrappedPolicyDetailsForm = memo<{
           />
         </div>
         <EuiSpacer size="l" />
+      </>
+    ),
+    [
+      blocklistsApiClientInstance,
+      eventFiltersApiClientInstance,
+      hostIsolationExceptionsApiClientInstance,
+      policyId,
+      privileges.canIsolateHost,
+      trustedAppsApiClientInstance,
+    ]
+  );
+
+  return (
+    <div data-test-subj="endpointIntegrationPolicyForm">
+      <>
+        {canAccessEndpointManagement && artifactCards}
         <div>
           <EuiText>
             <h5>
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx
index 2a3134b1986ec..56a8144d08a25 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_package_custom_extension.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { lazy } from 'react';
+import { PackageCustomExtensionComponent } from '@kbn/fleet-plugin/public';
 import { StartPlugins } from '../../../../../types';
-import { PackageCustomExtensionComponent } from '../../../../../../../fleet/public';
 
 export const getLazyEndpointPackageCustomExtension = (
   coreStart: CoreStart,
@@ -16,7 +16,7 @@ export const getLazyEndpointPackageCustomExtension = (
 ) => {
   return lazy<PackageCustomExtensionComponent>(async () => {
     const [{ withSecurityContext }, { EndpointPackageCustomExtension }] = await Promise.all([
-      import('./with_security_context'),
+      import('./with_security_context/with_security_context'),
       import('./endpoint_package_custom_extension'),
     ]);
     return {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx
index c217b0ecb9770..eb4a9b98084dc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_create_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazyEndpointPolicyCreateExtension = lazy<PackagePolicyCreateExtensionComponent>(
   async () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx
index 1c4d37268b80e..23fe4a959cfc5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/lazy_endpoint_policy_edit_extension.tsx
@@ -6,11 +6,11 @@
  */
 
 import { lazy } from 'react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import {
   PackagePolicyEditExtensionComponent,
   PackagePolicyEditExtensionComponentProps,
-} from '../../../../../../../fleet/public';
+} from '@kbn/fleet-plugin/public';
 import { StartPlugins } from '../../../../../types';
 
 export const getLazyEndpointPolicyEditExtension = (
@@ -19,7 +19,7 @@ export const getLazyEndpointPolicyEditExtension = (
 ) => {
   return lazy<PackagePolicyEditExtensionComponent>(async () => {
     const [{ withSecurityContext }, { EndpointPolicyEditExtension }] = await Promise.all([
-      import('./with_security_context'),
+      import('./with_security_context/with_security_context'),
       import('./endpoint_policy_edit_extension'),
     ]);
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/mocks.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/mocks.tsx
new file mode 100644
index 0000000000000..a6e0a80d9793c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/mocks.tsx
@@ -0,0 +1,196 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useMemo } from 'react';
+import { Action, Reducer } from 'redux';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { render as reactRender, RenderOptions } from '@testing-library/react';
+import { I18nProvider } from '@kbn/i18n-react';
+import type { PackageInfo } from '@kbn/fleet-plugin/common/types';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import {
+  AppContextTestRender,
+  createAppRootMockRenderer,
+  UiRender,
+} from '../../../../../common/mock/endpoint';
+import { createFleetContextReduxStore } from './with_security_context/store';
+import {
+  allowedExperimentalValues,
+  ExperimentalFeatures,
+} from '../../../../../../common/experimental_features';
+import { State } from '../../../../../common/store';
+import { mockGlobalState } from '../../../../../common/mock';
+import { managementReducer } from '../../../../store/reducer';
+import { appReducer } from '../../../../../common/store/app';
+import { ExperimentalFeaturesService } from '../../../../../common/experimental_features_service';
+import { RenderContextProviders } from './with_security_context/render_context_providers';
+import { AppAction } from '../../../../../common/store/actions';
+
+// Defined a private custom reducer that reacts to an action that enables us to update the
+// store with new values for technical preview features/flags. Because the `action.type` is a `Symbol`,
+// and its not exported the action can only be `dispatch`'d from this module
+const UpdateExperimentalFeaturesTestActionType = Symbol('updateExperimentalFeaturesTestAction');
+
+type UpdateExperimentalFeaturesTestAction = Action<
+  typeof UpdateExperimentalFeaturesTestActionType
+> & {
+  payload: Partial<ExperimentalFeatures>;
+};
+
+const experimentalFeaturesReducer: Reducer<
+  State['app'],
+  AppAction | UpdateExperimentalFeaturesTestAction
+> = (state = mockGlobalState.app, action) => {
+  if (action.type === UpdateExperimentalFeaturesTestActionType) {
+    return {
+      ...state,
+      enableExperimental: {
+        ...state.enableExperimental,
+        ...action.payload,
+      },
+    };
+  }
+  return state;
+};
+
+export const createFleetContextRendererMock = (): AppContextTestRender => {
+  ExperimentalFeaturesService.init({
+    experimentalFeatures: { ...allowedExperimentalValues },
+  });
+
+  const mockedContext = createAppRootMockRenderer();
+  const store = createFleetContextReduxStore({
+    coreStart: mockedContext.coreStart,
+    depsStart: mockedContext.depsStart,
+    reducersObject: {
+      management: managementReducer,
+      app: (state, action: AppAction | UpdateExperimentalFeaturesTestAction) => {
+        return appReducer(experimentalFeaturesReducer(state, action), action);
+      },
+    },
+    preloadedState: {
+      // @ts-expect-error TS2322
+      management: undefined,
+      // @ts-expect-error TS2322
+      app: {
+        enableExperimental: ExperimentalFeaturesService.get(),
+      },
+    },
+    additionalMiddleware: [mockedContext.middlewareSpy.actionSpyMiddleware],
+  });
+
+  const Wrapper: RenderOptions['wrapper'] = ({ children }) => {
+    const services = useMemo(() => {
+      const { http, notifications, application } = mockedContext.coreStart;
+
+      return {
+        http,
+        notifications,
+        application,
+        data: mockedContext.depsStart.data,
+      };
+    }, []);
+
+    useEffect(() => {
+      return () => {
+        // When the component un-mounts, reset the Experimental features since
+        // `ExperimentalFeaturesService` is a global singleton
+        ExperimentalFeaturesService.init({
+          experimentalFeatures: { ...allowedExperimentalValues },
+        });
+      };
+    }, []);
+
+    return (
+      <I18nProvider>
+        <EuiThemeProvider>
+          <KibanaContextProvider services={services}>
+            <RenderContextProviders store={store} depsStart={mockedContext.depsStart}>
+              {children}
+            </RenderContextProviders>
+          </KibanaContextProvider>
+        </EuiThemeProvider>
+      </I18nProvider>
+    );
+  };
+
+  const render: UiRender = (ui, options) => {
+    return reactRender(ui, {
+      wrapper: Wrapper,
+      ...options,
+    });
+  };
+
+  const setExperimentalFlag: AppContextTestRender['setExperimentalFlag'] = (flags) => {
+    // TODO: Is this context even using the Redux store `app` namespace?
+    //    `ExperimentalFeaturesService` seems to be used instead
+    store.dispatch({
+      type: UpdateExperimentalFeaturesTestActionType,
+      payload: flags,
+    });
+
+    ExperimentalFeaturesService.init({
+      experimentalFeatures: { ...allowedExperimentalValues, ...flags },
+    });
+  };
+
+  return {
+    ...mockedContext,
+    store,
+    render,
+    setExperimentalFlag,
+  };
+};
+
+export const generateFleetPackageInfo = (): PackageInfo => {
+  // Copied from: x-pack/plugins/fleet/common/services/package_to_package_policy.test.ts
+  const mockPackage: PackageInfo = {
+    name: 'endpoint',
+    title: 'Endpoint mock package',
+    version: '0.0.0',
+    latestVersion: '0.0.0',
+    description: 'description',
+    type: 'integration',
+    categories: [],
+    conditions: { kibana: { version: '' } },
+    format_version: '',
+    download: '',
+    path: '',
+    assets: {
+      kibana: {
+        csp_rule_template: [],
+        dashboard: [],
+        visualization: [],
+        search: [],
+        index_pattern: [],
+        map: [],
+        lens: [],
+        ml_module: [],
+        security_rule: [],
+        tag: [],
+        osquery_pack_asset: [],
+      },
+      elasticsearch: {
+        ingest_pipeline: [],
+        component_template: [],
+        index_template: [],
+        transform: [],
+        ilm_policy: [],
+        data_stream_ilm_policy: [],
+        ml_model: [],
+      },
+    },
+    status: 'not_installed',
+    release: 'experimental',
+    owner: {
+      github: 'elastic/fleet',
+    },
+  };
+
+  return mockPackage;
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context.tsx
deleted file mode 100644
index 06a099ed119ab..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { ComponentType, memo } from 'react';
-import { CoreStart } from 'kibana/public';
-import { combineReducers, createStore, compose, applyMiddleware } from 'redux';
-import { Provider as ReduxStoreProvider } from 'react-redux';
-import { CurrentLicense } from '../../../../../common/components/current_license';
-import { StartPlugins } from '../../../../../types';
-import { managementReducer } from '../../../../store/reducer';
-import { managementMiddlewareFactory } from '../../../../store/middleware';
-import { appReducer } from '../../../../../common/store/app';
-import { ExperimentalFeaturesService } from '../../../../../common/experimental_features_service';
-import { SecuritySolutionStartDependenciesContext } from '../../../../../common/components/user_privileges/endpoint/security_solution_start_dependencies';
-import { ReactQueryClientProvider } from '../../../../../common/containers/query_client/query_client_provider';
-
-type ComposeType = typeof compose;
-declare global {
-  interface Window {
-    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: ComposeType;
-  }
-}
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-
-interface WithSecurityContextProps<P extends {}> {
-  coreStart: CoreStart;
-  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
-  WrappedComponent: ComponentType<P>;
-}
-
-/**
- * Returns a new component that wraps the provided `WrappedComponent` in a bare minimum set of rendering context
- * needed to render Security Solution components that may be dependent on a Redux store and/or Security Solution
- * specific context based functionality
- *
- * @param coreStart
- * @param depsStart
- * @param WrappedComponent
- */
-export const withSecurityContext = <P extends {}>({
-  coreStart,
-  depsStart,
-  WrappedComponent,
-}: WithSecurityContextProps<P>): ComponentType<P> => {
-  let store: ReturnType<typeof createStore>; // created on first render
-
-  return memo((props) => {
-    if (!store) {
-      // Most of the code here was copied form
-      // x-pack/plugins/security_solution/public/management/index.ts
-      store = createStore(
-        combineReducers({
-          management: managementReducer,
-          app: appReducer,
-        }),
-        {
-          management: undefined,
-          // ignore this error as we just need the enableExperimental and it's temporary
-          // @ts-expect-error TS2739
-          app: {
-            enableExperimental: ExperimentalFeaturesService.get(),
-          },
-        },
-        composeEnhancers(applyMiddleware(...managementMiddlewareFactory(coreStart, depsStart)))
-      );
-    }
-
-    return (
-      <ReduxStoreProvider store={store}>
-        <ReactQueryClientProvider>
-          <SecuritySolutionStartDependenciesContext.Provider value={depsStart}>
-            <CurrentLicense>
-              <WrappedComponent {...props} />
-            </CurrentLicense>
-          </SecuritySolutionStartDependenciesContext.Provider>
-        </ReactQueryClientProvider>
-      </ReduxStoreProvider>
-    );
-  });
-};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/index.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/index.ts
new file mode 100644
index 0000000000000..4007729b248f6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { withSecurityContext } from './with_security_context';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/render_context_providers.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/render_context_providers.tsx
new file mode 100644
index 0000000000000..6da311d467e49
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/render_context_providers.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, PropsWithChildren } from 'react';
+import { Provider as ReduxStoreProvider } from 'react-redux';
+import { Store } from 'redux';
+import { ReactQueryClientProvider } from '../../../../../../common/containers/query_client/query_client_provider';
+import { SecuritySolutionStartDependenciesContext } from '../../../../../../common/components/user_privileges/endpoint/security_solution_start_dependencies';
+import { CurrentLicense } from '../../../../../../common/components/current_license';
+import { StartPlugins } from '../../../../../../types';
+
+export type RenderContextProvidersProps = PropsWithChildren<{
+  store: Store;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+}>;
+
+export const RenderContextProviders = memo<RenderContextProvidersProps>(
+  ({ store, depsStart, children }) => {
+    return (
+      <ReduxStoreProvider store={store}>
+        <ReactQueryClientProvider>
+          <SecuritySolutionStartDependenciesContext.Provider value={depsStart}>
+            <CurrentLicense>{children}</CurrentLicense>
+          </SecuritySolutionStartDependenciesContext.Provider>
+        </ReactQueryClientProvider>
+      </ReduxStoreProvider>
+    );
+  }
+);
+RenderContextProviders.displayName = 'RenderContextProviders';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/store.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/store.ts
new file mode 100644
index 0000000000000..7524dce744204
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/store.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  applyMiddleware,
+  combineReducers,
+  compose,
+  createStore,
+  Dispatch,
+  Middleware,
+  PreloadedState,
+  ReducersMapObject,
+} from 'redux';
+import { CoreStart } from '@kbn/core/public';
+import { managementReducer } from '../../../../../store/reducer';
+import { appReducer } from '../../../../../../common/store/app';
+import { ExperimentalFeaturesService } from '../../../../../../common/experimental_features_service';
+import { managementMiddlewareFactory } from '../../../../../store/middleware';
+import type { StartPlugins } from '../../../../../../types';
+import type { State } from '../../../../../../common/store';
+import type { AppAction } from '../../../../../../common/store/actions';
+import type { Immutable } from '../../../../../../../common/endpoint/types';
+
+type ComposeType = typeof compose;
+declare global {
+  interface Window {
+    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: ComposeType;
+  }
+}
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+
+interface CreateFleetContextReduxStoreProps {
+  coreStart: CoreStart;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+  /** `reducersObject` should be used for testing only */
+  reducersObject?: ReducersMapObject;
+  /** `preloadedState` should be used for testing only */
+  preloadedState?: PreloadedState<Pick<State, 'management' | 'app'>>;
+  /** `additionalMiddleware` should be used for testing only */
+  additionalMiddleware?: Array<Middleware<{}, State, Dispatch<AppAction | Immutable<AppAction>>>>;
+}
+
+export const createFleetContextReduxStore = ({
+  coreStart,
+  depsStart,
+  reducersObject = {
+    management: managementReducer,
+    app: appReducer,
+  },
+  preloadedState = {
+    // @ts-expect-error TS2322
+    management: undefined,
+    // @ts-expect-error TS2322
+    app: {
+      enableExperimental: ExperimentalFeaturesService.get(),
+    },
+  },
+  additionalMiddleware = [],
+}: CreateFleetContextReduxStoreProps) => {
+  // Most of the code here was copied form
+  // x-pack/plugins/security_solution/public/management/index.ts
+  return createStore(
+    combineReducers(reducersObject),
+    preloadedState,
+    composeEnhancers(
+      applyMiddleware(...managementMiddlewareFactory(coreStart, depsStart), ...additionalMiddleware)
+    )
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/with_security_context.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/with_security_context.tsx
new file mode 100644
index 0000000000000..91355c0edc2e8
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/with_security_context/with_security_context.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { ComponentType, memo } from 'react';
+import { CoreStart } from '@kbn/core/public';
+import { StartPlugins } from '../../../../../../types';
+import { createFleetContextReduxStore } from './store';
+import { RenderContextProviders } from './render_context_providers';
+
+interface WithSecurityContextProps<P extends {}> {
+  coreStart: CoreStart;
+  depsStart: Pick<StartPlugins, 'data' | 'fleet'>;
+  WrappedComponent: ComponentType<P>;
+}
+
+/**
+ * Returns a new component that wraps the provided `WrappedComponent` in a bare minimum set of rendering context
+ * needed to render Security Solution components that may be dependent on a Redux store and/or Security Solution
+ * specific context based functionality
+ *
+ * @param coreStart
+ * @param depsStart
+ * @param WrappedComponent
+ */
+export const withSecurityContext = <P extends {}>({
+  coreStart,
+  depsStart,
+  WrappedComponent,
+}: WithSecurityContextProps<P>): ComponentType<P> => {
+  let store: ReturnType<typeof createFleetContextReduxStore>; // created on first render
+
+  return memo((props) => {
+    if (!store) {
+      store = createFleetContextReduxStore({ coreStart, depsStart });
+    }
+
+    return (
+      <RenderContextProviders store={store} depsStart={depsStart}>
+        <WrappedComponent {...props} />
+      </RenderContextProviders>
+    );
+  });
+};
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 fdbe4ae83b043..08f2f9d2845d7 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,8 +8,8 @@
 import { waitFor } from '@testing-library/react';
 import { mount } from 'enzyme';
 import React from 'react';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { AGENT_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '../../../../../../fleet/common';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { AGENT_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '@kbn/fleet-plugin/common';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { useUserPrivileges } from '../../../../common/components/user_privileges';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../../../common/mock/endpoint';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
index 2702aec1cbabe..7068d20308309 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 
 import { PolicyFormLayout } from './policy_form_layout';
-import '../../../../../../common/mock/match_media.ts';
+import '../../../../../../common/mock/match_media';
 import { EndpointDocGenerator } from '../../../../../../../common/endpoint/generate_data';
 import {
   AppContextTestRender,
@@ -18,7 +18,7 @@ import {
 import { getPolicyDetailPath, getEndpointListPath } from '../../../../../common/routing';
 import { policyListApiPathHandlers } from '../../../store/test_mock_utils';
 import { licenseService } from '../../../../../../common/hooks/use_license';
-import { PACKAGE_POLICY_API_ROOT, AGENT_API_ROUTES } from '../../../../../../../../fleet/common';
+import { PACKAGE_POLICY_API_ROOT, AGENT_API_ROUTES } from '@kbn/fleet-plugin/common';
 
 jest.mock('../../../../../../common/hooks/use_license');
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
index 1d1aeeb660632..27eac2e5d69cd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.tsx
@@ -19,7 +19,8 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useDispatch } from 'react-redux';
 import { useLocation } from 'react-router-dom';
-import { ApplicationStart } from 'kibana/public';
+import { ApplicationStart } from '@kbn/core/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { usePolicyDetailsSelector } from '../../policy_hooks';
 import {
   policyDetails,
@@ -28,7 +29,6 @@ import {
   isLoading,
 } from '../../../store/policy_details/selectors';
 
-import { toMountPoint } from '../../../../../../../../../../src/plugins/kibana_react/public';
 import { useToasts, useKibana } from '../../../../../../common/lib/kibana';
 import { AppAction } from '../../../../../../common/store/actions';
 import { SpyRoute } from '../../../../../../common/utils/route/spy_routes';
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 bdc0c7d779b15..884a8572ecfe2 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
@@ -19,6 +19,8 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useLocation } from 'react-router-dom';
+import { AgentPolicy } from '@kbn/fleet-plugin/common';
+import { CreatePackagePolicyRouteState, pagePathGetters } from '@kbn/fleet-plugin/public';
 import { AdministrationListPage } from '../../../components/administration_list_page';
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { EndpointPolicyLink } from '../../../components/endpoint_policy_link';
@@ -29,10 +31,8 @@ import {
   useGetEndpointSecurityPackage,
   useGetEndpointSpecificPolicies,
 } from '../../../services/policies/hooks';
-import { AgentPolicy } from '../../../../../../fleet/common';
 import { PolicyEmptyState } from '../../../components/management_empty_state';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
-import { CreatePackagePolicyRouteState, pagePathGetters } from '../../../../../../fleet/public';
 import { APP_UI_ID } from '../../../../../common/constants';
 import { getPoliciesPath } from '../../../common/routing';
 import { useAppUrl, useToasts } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/blocklists_translations.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/blocklists_translations.ts
index 0bc32d35ea341..bf695c92b51ff 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/blocklists_translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/blocklists_translations.ts
@@ -10,27 +10,27 @@ import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types'
 
 export const POLICY_ARTIFACT_BLOCKLISTS_LABELS = Object.freeze({
   deleteModalTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.list.removeDialog.title',
+    'xpack.securitySolution.endpoint.policy.blocklist.list.removeDialog.title',
     {
       defaultMessage: 'Remove blocklist entry from policy',
     }
   ),
   deleteModalImpactInfo: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.list.removeDialog.messageCallout',
+    'xpack.securitySolution.endpoint.policy.blocklist.list.removeDialog.messageCallout',
     {
       defaultMessage:
         'This blocklist entry will be removed only from this policy and can still be found and managed from the artifact page.',
     }
   ),
   deleteModalErrorMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.list.removeDialog.errorToastTitle',
+    'xpack.securitySolution.endpoint.policy.blocklist.list.removeDialog.errorToastTitle',
     {
       defaultMessage: 'Error while attempting to remove blocklist entry',
     }
   ),
   flyoutWarningCalloutMessage: (maxNumber: number) =>
     i18n.translate(
-      'xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.searchWarning.text',
+      'xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.searchWarning.text',
       {
         defaultMessage:
           'Only the first {maxNumber} blocklist entries are displayed. Please use the search bar to refine the results.',
@@ -38,30 +38,30 @@ export const POLICY_ARTIFACT_BLOCKLISTS_LABELS = Object.freeze({
       }
     ),
   flyoutNoArtifactsToBeAssignedMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.noAssignable',
+    'xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.noAssignable',
     {
       defaultMessage: 'There are no blocklist entries that can be assigned to this policy.',
     }
   ),
   flyoutTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.title',
+    'xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.title',
     {
       defaultMessage: 'Assign blocklist entries',
     }
   ),
   flyoutSubtitle: (policyName: string): string =>
-    i18n.translate('xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.subtitle', {
+    i18n.translate('xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.subtitle', {
       defaultMessage: 'Select blocklist entries to add to {policyName}',
       values: { policyName },
     }),
   flyoutSearchPlaceholder: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.layout.search.label',
+    'xpack.securitySolution.endpoint.policy.blocklist.layout.search.label',
     {
       defaultMessage: 'Search blocklist entries',
     }
   ),
   flyoutErrorMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.toastError.text',
+    'xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.toastError.text',
     {
       defaultMessage: `An error occurred updating blocklist entry`,
     }
@@ -69,53 +69,53 @@ export const POLICY_ARTIFACT_BLOCKLISTS_LABELS = Object.freeze({
   flyoutSuccessMessageText: (updatedExceptions: ExceptionListItemSchema[]): string =>
     updatedExceptions.length > 1
       ? i18n.translate(
-          'xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.toastSuccess.textMultiples',
+          'xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.toastSuccess.textMultiples',
           {
             defaultMessage: '{count} blocklist entries have been added to your list.',
             values: { count: updatedExceptions.length },
           }
         )
       : i18n.translate(
-          'xpack.securitySolution.endpoint.policy.blocklists.layout.flyout.toastSuccess.textSingle',
+          'xpack.securitySolution.endpoint.policy.blocklist.layout.flyout.toastSuccess.textSingle',
           {
             defaultMessage: '"{name}" blocklist has been added to your list.',
             values: { name: updatedExceptions[0].name },
           }
         ),
   emptyUnassignedTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.empty.unassigned.title',
+    'xpack.securitySolution.endpoint.policy.blocklist.empty.unassigned.title',
     { defaultMessage: 'No assigned blocklist entries' }
   ),
   emptyUnassignedMessage: (policyName: string): string =>
-    i18n.translate('xpack.securitySolution.endpoint.policy.blocklists.empty.unassigned.content', {
+    i18n.translate('xpack.securitySolution.endpoint.policy.blocklist.empty.unassigned.content', {
       defaultMessage:
         'There are currently no blocklist entries assigned to {policyName}. Assign blocklist entries now or add and manage them on the blocklist page.',
       values: { policyName },
     }),
   emptyUnassignedPrimaryActionButtonTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.empty.unassigned.primaryAction',
+    'xpack.securitySolution.endpoint.policy.blocklist.empty.unassigned.primaryAction',
     {
       defaultMessage: 'Assign blocklist entry',
     }
   ),
   emptyUnassignedSecondaryActionButtonTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.empty.unassigned.secondaryAction',
+    'xpack.securitySolution.endpoint.policy.blocklist.empty.unassigned.secondaryAction',
     {
       defaultMessage: 'Manage blocklist entries',
     }
   ),
   emptyUnexistingTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.empty.unexisting.title',
-    { defaultMessage: 'No blocklist entries exist' }
+    'xpack.securitySolution.endpoint.policy.blocklist.empty.unexisting.title',
+    { defaultMessage: 'No blocklists entries exist' }
   ),
   emptyUnexistingMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.empty.unexisting.content',
+    'xpack.securitySolution.endpoint.policy.blocklist.empty.unexisting.content',
     {
       defaultMessage: 'There are currently no blocklist entries applied to your endpoints.',
     }
   ),
   emptyUnexistingPrimaryActionButtonTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.empty.unexisting.action',
+    'xpack.securitySolution.endpoint.policy.blocklist.empty.unexisting.action',
     { defaultMessage: 'Add blocklist entry' }
   ),
   listTotalItemCountMessage: (totalItemsCount: number): string =>
@@ -125,28 +125,28 @@ export const POLICY_ARTIFACT_BLOCKLISTS_LABELS = Object.freeze({
       values: { totalItemsCount },
     }),
   listRemoveActionNotAllowedMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.list.removeActionNotAllowed',
+    'xpack.securitySolution.endpoint.policy.blocklist.list.removeActionNotAllowed',
     {
       defaultMessage: 'Globally applied blocklist cannot be removed from policy.',
     }
   ),
   listSearchPlaceholderMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.list.search.placeholder',
+    'xpack.securitySolution.endpoint.policy.blocklist.list.search.placeholder',
     {
       defaultMessage: `Search on the fields below: name, description, value`,
     }
   ),
-  layoutTitle: i18n.translate('xpack.securitySolution.endpoint.policy.blocklists.layout.title', {
+  layoutTitle: i18n.translate('xpack.securitySolution.endpoint.policy.blocklist.layout.title', {
     defaultMessage: 'Assigned blocklist entries',
   }),
   layoutAssignButtonTitle: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.layout.assignToPolicy',
+    'xpack.securitySolution.endpoint.policy.blocklist.layout.assignToPolicy',
     {
       defaultMessage: 'Assign blocklist entry to policy',
     }
   ),
   layoutViewAllLinkMessage: i18n.translate(
-    'xpack.securitySolution.endpoint.policy.blocklists.layout.about.viewAllLinkLabel',
+    'xpack.securitySolution.endpoint.policy.blocklist.layout.about.viewAllLinkLabel',
     {
       defaultMessage: 'view all blocklist entries',
     }
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx
index 6b40477c7bb6f..58f29265f3963 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/tabs/policy_tabs.tsx
@@ -9,7 +9,7 @@ import { EuiSpacer, EuiTabbedContent, EuiTabbedContentTab } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useCallback, useEffect, useMemo } from 'react';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { useUserPrivileges } from '../../../../../common/components/user_privileges';
 import {
   getPolicyDetailPath,
@@ -50,6 +50,7 @@ import { SEARCHABLE_FIELDS as TRUSTED_APPS_SEARCHABLE_FIELDS } from '../../../tr
 import { SEARCHABLE_FIELDS as EVENT_FILTERS_SEARCHABLE_FIELDS } from '../../../event_filters/constants';
 import { SEARCHABLE_FIELDS as HOST_ISOLATION_EXCEPTIONS_SEARCHABLE_FIELDS } from '../../../host_isolation_exceptions/constants';
 import { SEARCHABLE_FIELDS as BLOCKLISTS_SEARCHABLE_FIELDS } from '../../../blocklist/constants';
+import { PolicyDetailsRouteState } from '../../../../../../common/endpoint/types';
 
 const enum PolicyTabKeys {
   SETTINGS = 'settings',
@@ -76,6 +77,7 @@ export const PolicyTabs = React.memo(() => {
   const policyId = usePolicyDetailsSelector(policyIdFromParams);
   const policyItem = usePolicyDetailsSelector(policyDetails);
   const privileges = useUserPrivileges().endpointPrivileges;
+  const { state: routeState = {} } = useLocation<PolicyDetailsRouteState>();
 
   const allPolicyHostIsolationExceptionsListRequest = useFetchHostIsolationExceptionsList({
     page: 1,
@@ -155,7 +157,7 @@ export const PolicyTabs = React.memo(() => {
       ...POLICY_ARTIFACT_BLOCKLISTS_LABELS,
       layoutAboutMessage: (count: number, link: React.ReactElement): React.ReactNode => (
         <FormattedMessage
-          id="xpack.securitySolution.endpoint.policy.blocklists.list.about"
+          id="xpack.securitySolution.endpoint.policy.blocklist.list.about"
           defaultMessage="There {count, plural, one {is} other {are}} {count} {count, plural, =1 {blocklist} other {blocklist entries}} associated with this policy. Click here to {link}"
           values={{ count, link }}
         />
@@ -320,9 +322,9 @@ export const PolicyTabs = React.memo(() => {
           path = getPolicyBlocklistsPath(policyId);
           break;
       }
-      history.push(path);
+      history.push(path, routeState?.backLink ? { backLink: routeState.backLink } : null);
     },
-    [history, policyId]
+    [history, policyId, routeState]
   );
 
   // show loader for privileges validation
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts
index 590df456322b5..e122571837c4a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/vertical_divider.ts
@@ -6,7 +6,7 @@
  */
 
 import styled from 'styled-components';
-import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
 
 type SpacingOptions = keyof EuiTheme['eui']['spacerSizes'];
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.ts
index 4d1f0170b4117..574f32dca6b33 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_api_client.ts
@@ -6,7 +6,7 @@
  */
 
 import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { ExceptionsListApiClient } from '../../../services/exceptions_list/exceptions_list_api_client';
 import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '../constants';
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts
index 6e883b614f01f..a16ccd9169dbe 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/trusted_apps_http_service.ts
@@ -16,7 +16,7 @@ import {
   EXCEPTION_LIST_ITEM_URL,
   EXCEPTION_LIST_URL,
 } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import pMap from 'p-map';
 import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
 import {
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts
index 60568594c7784..69b281e88fc9b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/validate_trusted_app_http_request_body.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { HttpStart } from 'kibana/public';
+import type { HttpStart } from '@kbn/core/public';
+import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import {
   PostTrustedAppCreateRequest,
   PutTrustedAppUpdateRequest,
 } from '../../../../../common/endpoint/types';
 import { HttpRequestValidationError } from './errors';
 import { sendGetAgentPolicyList } from '../../../services/policies/ingest';
-import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../fleet/common';
 
 /**
  * Validates that the Trusted App is valid for sending to the API (`POST` + 'PUT')
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
index 665122574de70..8b496dcb519b9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
@@ -660,7 +660,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -725,7 +725,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -1042,7 +1042,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -1107,7 +1107,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -1424,7 +1424,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -1489,7 +1489,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -1806,7 +1806,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -1871,7 +1871,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -2188,7 +2188,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -2253,7 +2253,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -2570,7 +2570,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -2635,7 +2635,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -2952,7 +2952,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -3017,7 +3017,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -3334,7 +3334,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -3399,7 +3399,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -3716,7 +3716,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -3781,7 +3781,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -4098,7 +4098,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -4163,7 +4163,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -4812,7 +4812,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -4877,7 +4877,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -5194,7 +5194,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -5259,7 +5259,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -5576,7 +5576,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -5641,7 +5641,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -5958,7 +5958,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -6023,7 +6023,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -6340,7 +6340,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -6405,7 +6405,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -6722,7 +6722,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -6787,7 +6787,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -7104,7 +7104,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -7169,7 +7169,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -7486,7 +7486,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -7551,7 +7551,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -7868,7 +7868,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -7933,7 +7933,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -8250,7 +8250,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -8315,7 +8315,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -8921,7 +8921,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -8986,7 +8986,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -9303,7 +9303,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -9368,7 +9368,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -9685,7 +9685,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -9750,7 +9750,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -10067,7 +10067,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -10132,7 +10132,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -10449,7 +10449,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -10514,7 +10514,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -10831,7 +10831,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -10896,7 +10896,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -11213,7 +11213,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -11278,7 +11278,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -11595,7 +11595,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -11660,7 +11660,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -11977,7 +11977,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -12042,7 +12042,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -12359,7 +12359,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-createdBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
@@ -12424,7 +12424,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                             >
                               <div
                                 aria-label="someone"
-                                class="euiAvatar euiAvatar--s euiAvatar--user"
+                                class="euiAvatar euiAvatar--s euiAvatar--user css-1e7wq2y-euiAvatar-s-user"
                                 data-test-subj="trustedAppCard-subHeader-touchedBy-updatedBy-avatar"
                                 role="img"
                                 style="background-color: rgb(245, 163, 92); color: rgb(0, 0, 0);"
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx
index 79ada90287192..682d689c7e82c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.stories.tsx
@@ -12,7 +12,7 @@ import { storiesOf } from '@storybook/react';
 import { euiLightVars } from '@kbn/ui-theme';
 import { EuiHorizontalRule } from '@elastic/eui';
 
-import { KibanaContextProvider } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 import {
   createGlobalNoMiddlewareStore,
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx
index d5eca75f9c2b5..6cc292b5a6d3e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/index.test.tsx
@@ -19,7 +19,7 @@ import {
   createGlobalNoMiddlewareStore,
 } from '../../../test_utils';
 import { TrustedAppsGrid } from '.';
-import { EuiThemeProvider } from '../../../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => 'mockId',
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx
index ff170906309c8..ebd1e06abdc4f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_notifications.test.tsx
@@ -9,10 +9,10 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { render } from '@testing-library/react';
 
-import { NotificationsStart } from 'kibana/public';
+import { NotificationsStart } from '@kbn/core/public';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public/context';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public/context';
 
 import {
   createGlobalNoMiddlewareStore,
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
index 6c1319ca6e9e3..d3bf8fe6ed46a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
@@ -13,7 +13,7 @@ import { fireEvent } from '@testing-library/dom';
 import { MiddlewareActionSpyHelper } from '../../../../common/store/test_utils';
 import { ConditionEntryField, OperatingSystem } from '@kbn/securitysolution-utils';
 import { TrustedApp } from '../../../../../common/endpoint/types';
-import { HttpFetchOptions, HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptions, HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { isFailedResourceState, isLoadedResourceState } from '../state';
 import { forceHTMLElementOffsetWidth } from '../../../components/effected_policy_select/test_utils';
 import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
diff --git a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts
index c27d983fec128..a8c6b0eda16a8 100644
--- a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreStart, HttpSetup } from 'kibana/public';
+import { CoreStart, HttpSetup } from '@kbn/core/public';
 import { CreateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ExceptionsListItemGenerator } from '../../../../common/endpoint/data_generators/exceptions_list_item_generator';
 import { ExceptionsListApiClient } from './exceptions_list_api_client';
 
diff --git a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts
index b8afc98b6f1e5..832a3248c5753 100644
--- a/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts
+++ b/x-pack/plugins/security_solution/public/management/services/exceptions_list/exceptions_list_api_client.ts
@@ -15,7 +15,7 @@ import {
   UpdateExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { HttpStart } from 'kibana/public';
+import { HttpStart } from '@kbn/core/public';
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../common/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts b/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts
index aa7b50c69ed56..aa4aeafb096ff 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/hooks.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { useGetEndpointSecurityPackage } from './hooks';
-import { HttpFetchError, HttpSetup } from 'kibana/public';
+import { HttpFetchError, HttpSetup } from '@kbn/core/public';
 import { getFakeHttpService, renderQuery } from '../../hooks/test_utils';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { UseQueryOptions } from 'react-query';
-import { GetPackagesResponse } from '../../../../../fleet/common';
+import { GetPackagesResponse } from '@kbn/fleet-plugin/common';
 import { useHttp } from '../../../common/lib/kibana';
 
 jest.mock('../../../common/lib/kibana');
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts b/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts
index 649dd39e38da6..6cc6140d336d2 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/hooks.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import { QueryObserverResult, useQuery, UseQueryOptions } from 'react-query';
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   GetAgentPoliciesResponse,
   GetPackagesResponse,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { useHttp } from '../../../common/lib/kibana';
 import { MANAGEMENT_DEFAULT_PAGE_SIZE } from '../../common/constants';
 import { sendGetAgentPolicyList, sendGetEndpointSecurityPackage } from './ingest';
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts b/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts
index bd34f7c14e22a..d29eedd06f765 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/ingest.test.ts
@@ -10,8 +10,8 @@ import {
   sendGetPackagePolicy,
   sendGetEndpointSecurityPackage,
 } from './ingest';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { EPM_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '../../../../../fleet/common';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { EPM_API_ROUTES, PACKAGE_POLICY_API_ROOT } from '@kbn/fleet-plugin/common';
 import { policyListApiPathHandlers } from '../../pages/policy/store/test_mock_utils';
 
 describe('ingest service', () => {
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts b/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts
index 0863682357aca..447984e1e1a3c 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/ingest.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptions, HttpStart } from '@kbn/core/public';
 import {
   GetAgentStatusResponse,
   GetAgentsResponse,
@@ -14,7 +14,7 @@ import {
   GetPackagesResponse,
   GetAgentPoliciesRequest,
   GetAgentPoliciesResponse,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { NewPolicyData } from '../../../../common/endpoint/types';
 import { GetPolicyResponse, UpdatePolicyResponse } from '../../pages/policy/types';
 
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts b/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts
index acdecd7072366..86715ebff3f75 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/policies.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../fleet/common';
-import { PACKAGE_POLICY_API_ROUTES } from '../../../../../fleet/common/constants/routes';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { PACKAGE_POLICY_API_ROUTES } from '@kbn/fleet-plugin/common/constants/routes';
 import { sendGetEndpointSpecificPackagePolicies } from './policies';
 
 describe('ingest service', () => {
diff --git a/x-pack/plugins/security_solution/public/management/services/policies/policies.ts b/x-pack/plugins/security_solution/public/management/services/policies/policies.ts
index 219bf7698baaa..e78237c87827b 100644
--- a/x-pack/plugins/security_solution/public/management/services/policies/policies.ts
+++ b/x-pack/plugins/security_solution/public/management/services/policies/policies.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { HttpFetchOptions, HttpStart } from '@kbn/core/public';
 import {
   GetPackagePoliciesRequest,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../../fleet/common';
+} from '@kbn/fleet-plugin/common';
 import { GetPolicyListResponse } from '../../pages/policy/types';
 import { INGEST_API_PACKAGE_POLICIES } from './ingest';
 
diff --git a/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx
index fb24289c52642..be5ed7b88eb69 100644
--- a/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/details/index.test.tsx
@@ -20,7 +20,7 @@ import {
 import { createStore, State } from '../../../common/store';
 import { networkModel } from '../../store';
 
-import { IpOverview } from './index';
+import { IpOverview } from '.';
 import { mockData } from './mock';
 import { mockAnomalies } from '../../../common/components/ml/mock';
 import { NarrowDateRange } from '../../../common/components/ml/types';
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts b/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts
index db6acd6d2a3bb..7067407e8a01f 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/__mocks__/mock.ts
@@ -7,7 +7,7 @@
 
 import { IndexPatternMapping } from '../types';
 import { IndexPatternSavedObject } from '../../../../common/hooks/types';
-import { LAYER_TYPE } from '../../../../../../maps/common';
+import { LAYER_TYPE } from '@kbn/maps-plugin/common';
 
 export const mockIndexPatternIds: IndexPatternMapping[] = [
   { title: 'filebeat-*', id: '8c7323ac-97ad-4b53-ac0a-40f8f691a918' },
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx
index 083f858dc7742..f3b6a394db0ff 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.tsx
@@ -12,10 +12,9 @@ import { createPortalNode, InPortal } from 'react-reverse-portal';
 import styled, { css } from 'styled-components';
 
 import type { Filter, Query } from '@kbn/es-query';
-import {
-  ErrorEmbeddable,
-  isErrorEmbeddable,
-} from '../../../../../../../src/plugins/embeddable/public';
+import { ErrorEmbeddable, isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { MapEmbeddable } from '@kbn/maps-plugin/public/embeddable';
 import { Loader } from '../../../common/components/loader';
 import { displayErrorToast, useStateToaster } from '../../../common/components/toasters';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
@@ -24,8 +23,6 @@ import { createEmbeddable } from './embedded_map_helpers';
 import { IndexPatternsMissingPrompt } from './index_patterns_missing_prompt';
 import { MapToolTip } from './map_tool_tip/map_tool_tip';
 import * as i18n from './translations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { MapEmbeddable } from '../../../../../../plugins/maps/public/embeddable';
 import { useKibana } from '../../../common/lib/kibana';
 import { getLayerList } from './map_config';
 import { sourcererSelectors } from '../../../common/store/sourcerer';
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx
index 613a6ce4c00da..b7e27b2422451 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { embeddablePluginMock } from '../../../../../../../src/plugins/embeddable/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { createEmbeddable, findMatchingIndexPatterns } from './embedded_map_helpers';
 import { createPortalNode } from 'react-reverse-portal';
 import {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx
index 3789c41f23a78..8a68ea87682e2 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map_helpers.tsx
@@ -10,23 +10,23 @@ import React from 'react';
 import { OutPortal, PortalNode } from 'react-reverse-portal';
 import minimatch from 'minimatch';
 import type { Filter, Query } from '@kbn/es-query';
-import { IndexPatternMapping } from './types';
-import { getLayerList } from './map_config';
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../maps/public';
+import { MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/public';
 import type {
   RenderTooltipContentParams,
   MapEmbeddable,
   MapEmbeddableInput,
-} from '../../../../../../plugins/maps/public';
-import * as i18n from './translations';
-
+} from '@kbn/maps-plugin/public';
 import {
   EmbeddableStart,
   isErrorEmbeddable,
   EmbeddableOutput,
   ViewMode,
   ErrorEmbeddable,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { IndexPatternMapping } from './types';
+import { getLayerList } from './map_config';
+import * as i18n from './translations';
+
 import { IndexPatternSavedObject } from '../../../common/hooks/types';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts b/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts
index 348dd996b64c2..757c5391e6f3a 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_config.ts
@@ -7,6 +7,7 @@
 
 import uuid from 'uuid';
 import { euiPaletteColorBlind } from '@elastic/eui';
+import { LAYER_TYPE, SCALING_TYPES, SOURCE_TYPES } from '@kbn/maps-plugin/common';
 import {
   IndexPatternMapping,
   LayerMapping,
@@ -14,7 +15,6 @@ import {
   LayerMappingDetails,
 } from './types';
 import * as i18n from './translations';
-import { LAYER_TYPE, SCALING_TYPES, SOURCE_TYPES } from '../../../../../maps/common';
 const euiVisColorPalette = euiPaletteColorBlind();
 
 // Update field mappings to modify what fields will be returned to map tooltip
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
index 951434f21cc8b..b74d8a86bfea6 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
@@ -19,7 +19,7 @@ import {
 import {
   ITooltipProperty,
   TooltipProperty,
-} from '../../../../../../maps/public/classes/tooltips/tooltip_property';
+} from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 
 describe('LineToolTipContent', () => {
   const mockFeatureProps: ITooltipProperty[] = [
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
index 134fd0b90cb78..c344c6e0c4317 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
@@ -8,6 +8,8 @@
 import React from 'react';
 import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import styled from 'styled-components';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ITooltipProperty } from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { SourceDestinationArrows } from '../../source_destination/source_destination_arrows';
 import {
   SUM_OF_CLIENT_BYTES,
@@ -17,8 +19,6 @@ import {
 } from '../map_config';
 
 import * as i18n from '../translations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ITooltipProperty } from '../../../../../../maps/public/classes/tooltips/tooltip_property';
 
 const FlowBadge = styled(EuiBadge)`
   height: 45px;
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
index 7d5e34df8c8fc..611690b1d1a79 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 import '../../../../common/mock/match_media';
 import { MapToolTipComponent } from './map_tool_tip';
-import { TooltipFeature } from '../../../../../../maps/common';
+import { TooltipFeature } from '@kbn/maps-plugin/common';
 
 describe('MapToolTip', () => {
   test('placeholder component renders correctly against snapshot', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx
index 665ea0e885439..39960df0f1c17 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx
@@ -13,14 +13,14 @@ import {
   EuiOutsideClickDetector,
 } from '@elastic/eui';
 import { Geometry } from 'geojson';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ITooltipProperty } from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { MapToolTipProps } from '../types';
 import { ToolTipFooter } from './tooltip_footer';
 import { LineToolTipContent } from './line_tool_tip_content';
 import { PointToolTipContent } from './point_tool_tip_content';
 import { Loader } from '../../../../common/components/loader';
 import * as i18n from '../translations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ITooltipProperty } from '../../../../../../maps/public/classes/tooltips/tooltip_property';
 
 export const MapToolTipComponent = ({
   closeTooltip,
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
index 7b3f9e956c765..b75b5075e33ff 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
@@ -16,7 +16,7 @@ import { HostDetailsLink, NetworkDetailsLink } from '../../../../common/componen
 import {
   TooltipProperty,
   ITooltipProperty,
-} from '../../../../../../maps/public/classes/tooltips/tooltip_property';
+} from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { FlowTarget } from '../../../../../common/search_strategy';
 
 describe('PointToolTipContent', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
index 0fa59c6fd9e42..6483cd2ab30f3 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
@@ -6,6 +6,8 @@
  */
 
 import React, { useMemo } from 'react';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ITooltipProperty } from '@kbn/maps-plugin/public/classes/tooltips/tooltip_property';
 import { sourceDestinationFieldMappings } from '../map_config';
 import {
   getEmptyTagValue,
@@ -14,8 +16,6 @@ import {
 import { DescriptionListStyled } from '../../../../common/components/page';
 import { HostDetailsLink, NetworkDetailsLink } from '../../../../common/components/links';
 import { DefaultFieldRenderer } from '../../../../timelines/components/field_renderers/field_renderers';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ITooltipProperty } from '../../../../../../maps/public/classes/tooltips/tooltip_property';
 import { FlowTarget } from '../../../../../common/search_strategy';
 
 interface PointToolTipContentProps {
diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts b/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts
index 6317cad7f8d98..c6e32210f7835 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RenderTooltipContentParams } from '../../../../../maps/public';
+import type { RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 
 export interface IndexPatternMapping {
   title: string;
diff --git a/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx
index 8794d48b5aa13..8a964d53c9123 100644
--- a/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/flow_target_select_connected/index.test.tsx
@@ -11,7 +11,7 @@ import { MemoryRouter } from 'react-router-dom';
 
 import '../../../common/mock/match_media';
 import { TestProviders } from '../../../common/mock';
-import { FlowTargetSelectConnectedComponent } from './index';
+import { FlowTargetSelectConnectedComponent } from '.';
 import { FlowTarget } from '../../../../common/search_strategy';
 
 describe('Flow Target Select Connected', () => {
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx
index d5dee1b84f8d7..e055154728e85 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/dns/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiDns } from './index';
+import { NetworkKpiDns } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/dns');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx
index 87f1a173740f3..4b27cff48ac4e 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/network_events/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiNetworkEvents } from './index';
+import { NetworkKpiNetworkEvents } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/network_events');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx
index 28bf73eb6b2d6..3af02cb1d17cb 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/tls_handshakes/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiTlsHandshakes } from './index';
+import { NetworkKpiTlsHandshakes } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/tls_handshakes');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx
index c1a28bdc28692..5f5da4e3c1ba1 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_flows/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiUniqueFlows } from './index';
+import { NetworkKpiUniqueFlows } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/unique_flows');
diff --git a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx
index 25807f3dc2cad..03ad5b9ee6e3c 100644
--- a/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/kpi_network/unique_private_ips/index.test.tsx
@@ -10,7 +10,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { NetworkKpiUniquePrivateIps } from './index';
+import { NetworkKpiUniquePrivateIps } from '.';
 
 jest.mock('../../../../common/containers/query_toggle');
 jest.mock('../../../containers/kpi_network/unique_private_ips');
diff --git a/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
index bb8b4683c9d30..ee35ebb74767f 100644
--- a/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/source_destination/index.test.tsx
@@ -24,7 +24,7 @@ import {
   DESTINATION_PACKETS_FIELD_NAME,
   SOURCE_BYTES_FIELD_NAME,
   SOURCE_PACKETS_FIELD_NAME,
-} from '../source_destination/source_destination_arrows';
+} from './source_destination_arrows';
 import * as i18n from '../../../timelines/components/timeline/body/renderers/translations';
 
 import { SourceDestination } from '.';
diff --git a/x-pack/plugins/security_solution/public/network/containers/details/index.tsx b/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
index b86ff666bec7c..cadc0e0000e6a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useKibana } from '../../../common/lib/kibana';
@@ -20,7 +21,6 @@ import {
   NetworkDetailsRequestOptions,
   NetworkDetailsStrategyResponse,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx
index 44b8472a0606c..1c84df8b6e57a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiDns } from './index';
+import { useNetworkKpiDns } from '.';
 
 describe('kpi network - dns', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
index 9e6cf9f620287..03f7e589b1953 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx
index 4171a86fae9cc..4c82590b1b0c4 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiNetworkEvents } from './index';
+import { useNetworkKpiNetworkEvents } from '.';
 
 describe('kpi network - network events', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
index b5c8058f5035c..3d8168c0beb89 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx
index bad0e6ad71512..b431a55d05741 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiTlsHandshakes } from './index';
+import { useNetworkKpiTlsHandshakes } from '.';
 
 describe('kpi network - tls handshakes', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
index b5e1eaa401a46..644dd5f71e4b2 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx
index 83cb2a40aabce..037db82c2d660 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiUniqueFlows } from './index';
+import { useNetworkKpiUniqueFlows } from '.';
 
 describe('kpi network - unique flows', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
index 130efc8d755a6..f348ddabf8c6a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -22,10 +23,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx
index 370c4e671e886..30653ce2e638c 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
-import { useNetworkKpiUniquePrivateIps } from './index';
+import { useNetworkKpiUniquePrivateIps } from '.';
 
 describe('kpi network - unique private ips', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
index fafd38cf15f73..bcd573d85b9d8 100644
--- a/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { createFilter } from '../../../../common/containers/helpers';
@@ -23,10 +24,6 @@ import {
 import { ESTermQuery } from '../../../../../common/typed_json';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx
index f303cdf85a5f8..7c0655cddf2fd 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkDns } from './index';
+import { useNetworkDns } from '.';
 import { NetworkType } from '../../store/model';
 
 describe('useNetworkDns', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
index 86949777dd535..e052a1b5cbe5a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -26,7 +27,6 @@ import {
   NetworkDnsEdges,
   PageInfoPaginated,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx
index b687896efcea4..19a40f1b14cb7 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkHttp } from './index';
+import { useNetworkHttp } from '.';
 import { NetworkType } from '../../store/model';
 
 describe('useNetworkHttp', () => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
index eba2b22f30e29..e75f1aaa91f40 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -25,7 +26,6 @@ import {
   NetworkHttpStrategyResponse,
   SortField,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { InspectResponse } from '../../../types';
 import { getInspectResponse } from '../../../helpers';
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx
index fe7507c85567a..2e485454a4300 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkTopCountries } from './index';
+import { useNetworkTopCountries } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTargetSourceDest } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
index 4bb8f62b10a87..3b3aa6778876a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -25,7 +26,6 @@ import {
   NetworkTopCountriesStrategyResponse,
   PageInfoPaginated,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx
index c31dec3ce0aed..a58e6fecd2091 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkTopNFlow } from './index';
+import { useNetworkTopNFlow } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTargetSourceDest } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
index 26d2f7a9d1df5..89eb4d006bc73 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -25,7 +26,6 @@ import {
   NetworkTopNFlowStrategyResponse,
   PageInfoPaginated,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx
index 6b236d4ddfb20..342f6f1174a70 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkTls } from './index';
+import { useNetworkTls } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTargetSourceDest } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
index ed771455446c0..00b539faf4d3b 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { inputsModel } from '../../../common/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
@@ -22,7 +23,6 @@ import {
   NetworkTlsRequestOptions,
   NetworkTlsStrategyResponse,
 } from '../../../../common/search_strategy/security_solution/network';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
diff --git a/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx b/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx
index 4a6c1fac4191c..b7eb0835071f3 100644
--- a/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/users/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkUsers } from './index';
+import { useNetworkUsers } from '.';
 import { NetworkType } from '../../store/model';
 import { FlowTarget } from '../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/public/network/containers/users/index.tsx b/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
index 9ad2c59f6bb79..e56cd466e5eb2 100644
--- a/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
@@ -10,6 +10,7 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
@@ -24,7 +25,6 @@ import {
   NetworkUsersRequestOptions,
   NetworkUsersStrategyResponse,
 } from '../../../../common/search_strategy/security_solution/network';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
diff --git a/x-pack/plugins/security_solution/public/network/index.ts b/x-pack/plugins/security_solution/public/network/index.ts
index f34ebcc6e33b9..882921ba9f657 100644
--- a/x-pack/plugins/security_solution/public/network/index.ts
+++ b/x-pack/plugins/security_solution/public/network/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { SecuritySubPluginWithStore } from '../app/types';
 import { routes } from './routes';
 import { initialNetworkState, networkReducer, NetworkState } from './store';
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx b/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
index 7d8389d95f33e..237c25ffcc1d9 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/details/index.test.tsx
@@ -20,7 +20,7 @@ import {
 } from '../../../common/mock';
 import { useMountAppended } from '../../../common/utils/use_mount_appended';
 import { createStore, State } from '../../../common/store';
-import { NetworkDetails } from './index';
+import { NetworkDetails } from '.';
 import { FlowTarget } from '../../../../common/search_strategy';
 
 jest.mock('@elastic/eui', () => {
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/index.tsx b/x-pack/plugins/security_solution/public/network/pages/details/index.tsx
index f8aa0a5d85730..e01ab13722bf2 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/details/index.tsx
@@ -10,6 +10,7 @@ import React, { useCallback, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import {
   FlowTarget,
@@ -33,7 +34,7 @@ import { useNetworkDetails, ID } from '../../containers/details';
 import { useKibana } from '../../../common/lib/kibana';
 import { decodeIpv6 } from '../../../common/lib/helpers';
 import { convertToBuildEsQuery } from '../../../common/lib/keury';
-import { ConditionalFlexGroup } from '../../pages/navigation/conditional_flex_group';
+import { ConditionalFlexGroup } from '../navigation/conditional_flex_group';
 import { inputsSelectors } from '../../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { setNetworkDetailsTablesActivePageToZero } from '../../store/actions';
@@ -44,7 +45,6 @@ import { NetworkTopNFlowQueryTable } from './network_top_n_flow_query_table';
 import { TlsQueryTable } from './tls_query_table';
 import { UsersQueryTable } from './users_query_table';
 import { AnomaliesQueryTabBody } from '../../../common/containers/anomalies/anomalies_query_tab_body';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { networkModel } from '../../store';
 import { SecurityPageName } from '../../../app/types';
 import { useSourcererDataView } from '../../../common/containers/sourcerer';
diff --git a/x-pack/plugins/security_solution/public/network/pages/details/utils.ts b/x-pack/plugins/security_solution/public/network/pages/details/utils.ts
index 7bcf79ba4b434..98094665cbcd2 100644
--- a/x-pack/plugins/security_solution/public/network/pages/details/utils.ts
+++ b/x-pack/plugins/security_solution/public/network/pages/details/utils.ts
@@ -7,7 +7,7 @@
 
 import { get, isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { decodeIpv6 } from '../../../common/lib/helpers';
 import { getNetworkDetailsUrl } from '../../../common/components/link_to/redirect_to_network';
 import { networkModel } from '../../store';
diff --git a/x-pack/plugins/security_solution/public/network/pages/network.test.tsx b/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
index bf300569d6e23..a52c4e1560893 100644
--- a/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/network.test.tsx
@@ -24,7 +24,7 @@ import { inputsActions } from '../../common/store/inputs';
 
 import { Network } from './network';
 import { NetworkRoutes } from './navigation';
-import { mockCasesContract } from '../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 jest.mock('../../common/containers/sourcerer');
diff --git a/x-pack/plugins/security_solution/public/network/pages/network.tsx b/x-pack/plugins/security_solution/public/network/pages/network.tsx
index 634a96b0e74df..fffb202959182 100644
--- a/x-pack/plugins/security_solution/public/network/pages/network.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/network.tsx
@@ -12,8 +12,8 @@ import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import styled from 'styled-components';
 
-import { isTab } from '../../../../timelines/public';
-import { getEsQueryConfig } from '../../../../../../src/plugins/data/common';
+import { isTab } from '@kbn/timelines-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../app/types';
 import { UpdateDateRange } from '../../common/components/charts/common';
 import { EmbeddedMap } from '../components/embeddables/embedded_map';
diff --git a/x-pack/plugins/security_solution/public/network/routes.tsx b/x-pack/plugins/security_solution/public/network/routes.tsx
index 32fbe96a21caa..21e018c959234 100644
--- a/x-pack/plugins/security_solution/public/network/routes.tsx
+++ b/x-pack/plugins/security_solution/public/network/routes.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { NetworkContainer } from './pages';
 
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
 import { NETWORK_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx
index 3402a7bef4905..21f1e2bbf25cf 100644
--- a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.test.tsx
@@ -15,7 +15,7 @@ import { waitFor } from '@testing-library/react';
 import { mockIndexPattern, TestProviders } from '../../../common/mock';
 
 import { AlertsByCategory } from '.';
-import { mockCasesContext } from '../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 import { useRouteSpy } from '../../../common/utils/route/use_route_spy';
 
 jest.mock('../../../common/components/link_to');
diff --git a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
index da01092ed1409..5d8e1ab5fa7dc 100644
--- a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
@@ -12,12 +12,12 @@ import styled from 'styled-components';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
 import { EuiButton } from '@elastic/eui';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { DEFAULT_NUMBER_FORMAT, APP_UI_ID } from '../../../../common/constants';
 import { SHOWING, UNIT } from '../../../common/components/alerts_viewer/translations';
 import { MatrixHistogram } from '../../../common/components/matrix_histogram';
 import { useKibana, useUiSetting$ } from '../../../common/lib/kibana';
 import { convertToBuildEsQuery } from '../../../common/lib/keury';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { HostsTableType } from '../../../hosts/store/model';
 
 import * as i18n from '../../pages/translations';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/index.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/index.tsx
new file mode 100644
index 0000000000000..3be512cbb38a1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/index.tsx
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { RuleAlertsTable } from './rule_alerts_table';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/mock_data.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/mock_data.ts
new file mode 100644
index 0000000000000..8fb1279d75fff
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/mock_data.ts
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { RuleAlertsItem, SeverityRuleAlertsAggsResponse } from './use_rule_alerts_items';
+
+export const from = '2022-04-05T12:00:00.000Z';
+export const to = '2022-04-08T12:00:00.000Z';
+
+export const severityRuleAlertsQuery = {
+  size: 0,
+  query: {
+    bool: {
+      filter: [
+        { term: { 'kibana.alert.workflow_status': 'open' } },
+        { range: { '@timestamp': { gte: from, lte: to } } },
+      ],
+    },
+  },
+  aggs: {
+    alertsByRule: {
+      terms: {
+        // top 4 rules sorted by severity counters
+        field: 'kibana.alert.rule.uuid',
+        size: 4,
+        order: [{ critical: 'desc' }, { high: 'desc' }, { medium: 'desc' }, { low: 'desc' }],
+      },
+      aggs: {
+        // severity aggregations for sorting
+        critical: { filter: { term: { 'kibana.alert.severity': 'critical' } } },
+        high: { filter: { term: { 'kibana.alert.severity': 'high' } } },
+        medium: { filter: { term: { 'kibana.alert.severity': 'medium' } } },
+        low: { filter: { term: { 'kibana.alert.severity': 'low' } } },
+        // get the newest alert to extract timestamp and rule name
+        lastRuleAlert: {
+          top_hits: {
+            size: 1,
+            sort: {
+              '@timestamp': 'desc',
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const mockSeverityRuleAlertsResponse: { aggregations: SeverityRuleAlertsAggsResponse } = {
+  aggregations: {
+    alertsByRule: {
+      buckets: [
+        {
+          key: '79ec0270-b4c5-11ec-970e-8f7c5a7144f7',
+          doc_count: 54,
+          lastRuleAlert: {
+            hits: {
+              total: {
+                value: 54,
+              },
+              hits: [
+                {
+                  _source: {
+                    'kibana.alert.rule.name': 'RULE_1',
+                    '@timestamp': '2022-04-05T15:58:35.079Z',
+                    'kibana.alert.severity': 'critical',
+                  },
+                },
+              ],
+            },
+          },
+        },
+        {
+          key: '955c79d0-b403-11ec-b5a7-6dc1ed01bdd7',
+          doc_count: 112,
+          lastRuleAlert: {
+            hits: {
+              total: {
+                value: 112,
+              },
+              hits: [
+                {
+                  _source: {
+                    'kibana.alert.rule.name': 'RULE_2',
+                    '@timestamp': '2022-04-05T15:58:47.164Z',
+                    'kibana.alert.severity': 'high',
+                  },
+                },
+              ],
+            },
+          },
+        },
+        {
+          key: '13bc7bc0-b1d6-11ec-a799-67811b37527a',
+          doc_count: 170,
+          lastRuleAlert: {
+            hits: {
+              total: {
+                value: 170,
+              },
+              hits: [
+                {
+                  _source: {
+                    'kibana.alert.rule.name': 'RULE_3',
+                    '@timestamp': '2022-04-05T15:56:16.606Z',
+                    'kibana.alert.severity': 'low',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      ],
+    },
+  },
+};
+
+export const severityRuleAlertsResponseParsed: RuleAlertsItem[] = [
+  {
+    alert_count: 54,
+    id: '79ec0270-b4c5-11ec-970e-8f7c5a7144f7',
+    last_alert_at: '2022-04-05T15:58:35.079Z',
+    name: 'RULE_1',
+    severity: 'critical',
+  },
+  {
+    alert_count: 112,
+    id: '955c79d0-b403-11ec-b5a7-6dc1ed01bdd7',
+    last_alert_at: '2022-04-05T15:58:47.164Z',
+    name: 'RULE_2',
+    severity: 'high',
+  },
+  {
+    alert_count: 170,
+    id: '13bc7bc0-b1d6-11ec-a799-67811b37527a',
+    last_alert_at: '2022-04-05T15:56:16.606Z',
+    name: 'RULE_3',
+    severity: 'low',
+  },
+];
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.test.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.test.tsx
new file mode 100644
index 0000000000000..f41e05a2c04dc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.test.tsx
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { TestProviders } from '../../../../common/mock';
+import { RuleAlertsTable, RuleAlertsTableProps } from './rule_alerts_table';
+import { RuleAlertsItem, UseRuleAlertsItems } from './use_rule_alerts_items';
+import moment from 'moment';
+import { SecurityPageName } from '../../../../../common/constants';
+
+const mockGetAppUrl = jest.fn();
+jest.mock('../../../../common/lib/kibana/hooks', () => {
+  const original = jest.requireActual('../../../../common/lib/kibana/hooks');
+  return {
+    ...original,
+    useNavigation: () => ({
+      getAppUrl: mockGetAppUrl,
+    }),
+  };
+});
+
+type UseRuleAlertsItemsReturn = ReturnType<UseRuleAlertsItems>;
+const defaultUseRuleAlertsItemsReturn: UseRuleAlertsItemsReturn = {
+  items: [],
+  isLoading: false,
+  updatedAt: Date.now(),
+};
+const mockUseRuleAlertsItems = jest.fn(() => defaultUseRuleAlertsItemsReturn);
+const mockUseRuleAlertsItemsReturn = (param: Partial<UseRuleAlertsItemsReturn>) => {
+  mockUseRuleAlertsItems.mockReturnValueOnce({ ...defaultUseRuleAlertsItemsReturn, ...param });
+};
+jest.mock('./use_rule_alerts_items', () => ({
+  useRuleAlertsItems: () => mockUseRuleAlertsItems(),
+}));
+
+const defaultProps: RuleAlertsTableProps = {
+  signalIndexName: '',
+};
+const items: RuleAlertsItem[] = [
+  {
+    id: 'ruleId',
+    name: 'ruleName',
+    last_alert_at: moment().subtract(1, 'day').format(),
+    alert_count: 10,
+    severity: 'high',
+  },
+];
+
+describe('RuleAlertsTable', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render empty table', () => {
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByTestId('severityRuleAlertsPanel')).toBeInTheDocument();
+    expect(result.getByText('No alerts to display')).toBeInTheDocument();
+    expect(result.getByTestId('severityRuleAlertsButton')).toBeInTheDocument();
+  });
+
+  it('should render a loading table', () => {
+    mockUseRuleAlertsItemsReturn({ isLoading: true });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByText('Updating...')).toBeInTheDocument();
+    expect(result.getByTestId('severityRuleAlertsButton')).toBeInTheDocument();
+    expect(result.getByTestId('severityRuleAlertsTable')).toHaveClass('euiBasicTable-loading');
+  });
+
+  it('should render the updated at subtitle', () => {
+    mockUseRuleAlertsItemsReturn({ isLoading: false });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByText('Updated now')).toBeInTheDocument();
+  });
+
+  it('should render the table columns', () => {
+    mockUseRuleAlertsItemsReturn({ items });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    const columnHeaders = result.getAllByRole('columnheader');
+    expect(columnHeaders.at(0)).toHaveTextContent('Rule name');
+    expect(columnHeaders.at(1)).toHaveTextContent('Last alert');
+    expect(columnHeaders.at(2)).toHaveTextContent('Alert count');
+    expect(columnHeaders.at(3)).toHaveTextContent('Severity');
+  });
+
+  it('should render the table items', () => {
+    mockUseRuleAlertsItemsReturn({ items });
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(result.getByTestId('severityRuleAlertsTable-name')).toHaveTextContent('ruleName');
+    expect(result.getByTestId('severityRuleAlertsTable-lastAlertAt')).toHaveTextContent(
+      'yesterday'
+    );
+    expect(result.getByTestId('severityRuleAlertsTable-alertCount')).toHaveTextContent('10');
+    expect(result.getByTestId('severityRuleAlertsTable-severity')).toHaveTextContent('High');
+  });
+
+  it('should generate the table items links', () => {
+    const linkUrl = '/fake/link';
+    mockGetAppUrl.mockReturnValue(linkUrl);
+    mockUseRuleAlertsItemsReturn({ items });
+
+    const result = render(
+      <TestProviders>
+        <RuleAlertsTable {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(mockGetAppUrl).toBeCalledWith({
+      deepLinkId: SecurityPageName.rules,
+      path: `id/${items[0].id}`,
+    });
+
+    expect(result.getByTestId('severityRuleAlertsTable-name')).toHaveAttribute('href', linkUrl);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.tsx
new file mode 100644
index 0000000000000..7a053fd0366dd
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/rule_alerts_table.tsx
@@ -0,0 +1,138 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useCallback, useMemo } from 'react';
+import { capitalize } from 'lodash';
+import {
+  EuiBasicTable,
+  EuiBasicTableColumn,
+  EuiButton,
+  EuiEmptyPrompt,
+  EuiHealth,
+  EuiLink,
+  EuiPanel,
+  EuiSpacer,
+  EuiToolTip,
+} from '@elastic/eui';
+import { FormattedRelative } from '@kbn/i18n-react';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { HeaderSection } from '../../../../common/components/header_section';
+
+import { LastUpdatedAt, SEVERITY_COLOR } from '../util';
+import * as i18n from '../translations';
+import { useRuleAlertsItems, RuleAlertsItem } from './use_rule_alerts_items';
+import { useNavigation, NavigateTo, GetAppUrl } from '../../../../common/lib/kibana';
+import { SecurityPageName } from '../../../../../common/constants';
+import { useQueryToggle } from '../../../../common/containers/query_toggle';
+
+export interface RuleAlertsTableProps {
+  signalIndexName: string | null;
+}
+
+export type GetTableColumns = (params: {
+  getAppUrl: GetAppUrl;
+  navigateTo: NavigateTo;
+}) => Array<EuiBasicTableColumn<RuleAlertsItem>>;
+
+const DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID =
+  'detection-response-rule-alerts-severity-table' as const;
+
+export const getTableColumns: GetTableColumns = ({ getAppUrl, navigateTo }) => [
+  {
+    field: 'name',
+    name: i18n.RULE_ALERTS_COLUMN_RULE_NAME,
+    render: (name: string, { id }) => {
+      const url = getAppUrl({ deepLinkId: SecurityPageName.rules, path: `id/${id}` });
+      return (
+        <EuiToolTip data-test-subj={`${id}-tooltip`} content={i18n.OPEN_RULE_DETAIL_TOOLTIP}>
+          {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
+          <EuiLink
+            data-test-subj="severityRuleAlertsTable-name"
+            href={url}
+            onClick={(ev?: React.MouseEvent) => {
+              if (ev) {
+                ev.preventDefault();
+              }
+              navigateTo({ url });
+            }}
+          >
+            {name}
+          </EuiLink>
+        </EuiToolTip>
+      );
+    },
+  },
+  {
+    field: 'last_alert_at',
+    name: i18n.RULE_ALERTS_COLUMN_LAST_ALERT,
+    'data-test-subj': 'severityRuleAlertsTable-lastAlertAt',
+    render: (lastAlertAt: string) => <FormattedRelative value={new Date(lastAlertAt)} />,
+  },
+  {
+    field: 'alert_count',
+    name: i18n.RULE_ALERTS_COLUMN_ALERT_COUNT,
+    'data-test-subj': 'severityRuleAlertsTable-alertCount',
+  },
+  {
+    field: 'severity',
+    name: i18n.RULE_ALERTS_COLUMN_SEVERITY,
+    'data-test-subj': 'severityRuleAlertsTable-severity',
+    render: (severity: Severity) => (
+      <EuiHealth color={SEVERITY_COLOR[severity]}>{capitalize(severity)}</EuiHealth>
+    ),
+  },
+];
+
+export const RuleAlertsTable = React.memo<RuleAlertsTableProps>(({ signalIndexName }) => {
+  const { getAppUrl, navigateTo } = useNavigation();
+  const { toggleStatus, setToggleStatus } = useQueryToggle(DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID);
+  const { items, isLoading, updatedAt } = useRuleAlertsItems({
+    signalIndexName,
+    queryId: DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID,
+    skip: !toggleStatus,
+  });
+
+  const navigateToAlerts = useCallback(() => {
+    navigateTo({ deepLinkId: SecurityPageName.alerts });
+  }, [navigateTo]);
+
+  const columns = useMemo(
+    () => getTableColumns({ getAppUrl, navigateTo }),
+    [getAppUrl, navigateTo]
+  );
+
+  return (
+    <EuiPanel hasBorder data-test-subj="severityRuleAlertsPanel">
+      <HeaderSection
+        id={DETECTION_RESPONSE_RULE_ALERTS_QUERY_ID}
+        title={i18n.RULE_ALERTS_SECTION_TITLE}
+        titleSize="s"
+        toggleStatus={toggleStatus}
+        toggleQuery={setToggleStatus}
+        subtitle={<LastUpdatedAt updatedAt={updatedAt} isUpdating={isLoading} />}
+      />
+      {toggleStatus && (
+        <>
+          <EuiBasicTable
+            data-test-subj="severityRuleAlertsTable"
+            columns={columns}
+            items={items}
+            loading={isLoading}
+            noItemsMessage={
+              <EuiEmptyPrompt title={<h3>{i18n.NO_ALERTS_FOUND}</h3>} titleSize="xs" />
+            }
+          />
+          <EuiSpacer size="m" />
+          <EuiButton data-test-subj="severityRuleAlertsButton" onClick={navigateToAlerts}>
+            {i18n.OPEN_ALL_ALERTS_BUTTON}
+          </EuiButton>
+        </>
+      )}
+    </EuiPanel>
+  );
+});
+RuleAlertsTable.displayName = 'RuleAlertsTable';
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.test.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.test.ts
new file mode 100644
index 0000000000000..85d4c8e5b6a93
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.test.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+import { TestProviders } from '../../../../common/mock';
+import {
+  from,
+  mockSeverityRuleAlertsResponse,
+  severityRuleAlertsQuery,
+  severityRuleAlertsResponseParsed,
+  to,
+} from './mock_data';
+import {
+  useRuleAlertsItems,
+  UseRuleAlertsItems,
+  UseRuleAlertsItemsProps,
+} from './use_rule_alerts_items';
+
+const dateNow = new Date('2022-04-08T12:00:00.000Z').valueOf();
+const mockDateNow = jest.fn().mockReturnValue(dateNow);
+Date.now = jest.fn(() => mockDateNow()) as unknown as DateConstructor['now'];
+
+const defaultUseQueryAlertsReturn = {
+  loading: false,
+  data: null,
+  setQuery: () => {},
+  response: '',
+  request: '',
+  refetch: () => {},
+};
+const mockUseQueryAlerts = jest.fn().mockReturnValue(defaultUseQueryAlertsReturn);
+jest.mock('../../../../detections/containers/detection_engine/alerts/use_query', () => {
+  return {
+    useQueryAlerts: (...props: unknown[]) => mockUseQueryAlerts(...props),
+  };
+});
+
+const mockUseGlobalTime = jest
+  .fn()
+  .mockReturnValue({ from, to, setQuery: jest.fn(), deleteQuery: jest.fn() });
+jest.mock('../../../../common/containers/use_global_time', () => {
+  return {
+    useGlobalTime: (...props: unknown[]) => mockUseGlobalTime(...props),
+  };
+});
+
+// helper function to render the hook
+const renderUseRuleAlertsItems = (props: Partial<UseRuleAlertsItemsProps> = {}) =>
+  renderHook<UseRuleAlertsItemsProps, ReturnType<UseRuleAlertsItems>>(
+    () =>
+      useRuleAlertsItems({
+        queryId: 'test',
+        signalIndexName: 'signal-alerts',
+        ...props,
+      }),
+    {
+      wrapper: TestProviders,
+    }
+  );
+
+describe('useRuleAlertsItems', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockDateNow.mockReturnValue(dateNow);
+    mockUseQueryAlerts.mockReturnValue(defaultUseQueryAlertsReturn);
+  });
+
+  it('should return default values', () => {
+    const { result } = renderUseRuleAlertsItems();
+
+    expect(result.current).toEqual({
+      items: [],
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+    expect(mockUseQueryAlerts).toBeCalledWith({
+      query: severityRuleAlertsQuery,
+      indexName: 'signal-alerts',
+      skip: false,
+    });
+  });
+
+  it('should return parsed items', () => {
+    mockUseQueryAlerts.mockReturnValue({
+      ...defaultUseQueryAlertsReturn,
+      data: mockSeverityRuleAlertsResponse,
+    });
+
+    const { result } = renderUseRuleAlertsItems();
+
+    expect(result.current).toEqual({
+      items: severityRuleAlertsResponseParsed,
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+  });
+
+  it('should return new updatedAt', () => {
+    const newDateNow = new Date('2022-04-08T14:00:00.000Z').valueOf();
+    mockDateNow.mockReturnValue(newDateNow); // setUpdatedAt call
+    mockDateNow.mockReturnValueOnce(dateNow); // initialization call
+
+    mockUseQueryAlerts.mockReturnValue({
+      ...defaultUseQueryAlertsReturn,
+      data: mockSeverityRuleAlertsResponse,
+    });
+
+    const { result } = renderUseRuleAlertsItems();
+
+    expect(mockDateNow).toHaveBeenCalled();
+    expect(result.current).toEqual({
+      items: severityRuleAlertsResponseParsed,
+      isLoading: false,
+      updatedAt: newDateNow,
+    });
+  });
+
+  it('should skip the query', () => {
+    const { result } = renderUseRuleAlertsItems({ skip: true });
+
+    expect(mockUseQueryAlerts).toBeCalledWith({
+      query: severityRuleAlertsQuery,
+      indexName: 'signal-alerts',
+      skip: true,
+    });
+
+    expect(result.current).toEqual({
+      items: [],
+      isLoading: false,
+      updatedAt: dateNow,
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.ts
new file mode 100644
index 0000000000000..2fd107f3caf39
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/rule_alerts_table/use_rule_alerts_items.ts
@@ -0,0 +1,176 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
+import { useGlobalTime } from '../../../../common/containers/use_global_time';
+import { useQueryAlerts } from '../../../../detections/containers/detection_engine/alerts/use_query';
+import { useQueryInspector } from '../../../../common/components/page/manage_query';
+
+// Formatted item result
+export interface RuleAlertsItem {
+  id: string;
+  name: string;
+  last_alert_at: string;
+  alert_count: number;
+  severity: Severity;
+}
+
+// Raw aggregation response
+export interface SeverityRuleAlertsAggsResponse {
+  alertsByRule: {
+    buckets?: Array<{
+      key: string;
+      doc_count: number;
+      lastRuleAlert: {
+        hits: {
+          total: {
+            value: number;
+          };
+          hits: [
+            {
+              _source: {
+                '@timestamp': string;
+                'kibana.alert.rule.name': string;
+                'kibana.alert.severity': Severity;
+              };
+            }
+          ];
+        };
+      };
+    }>;
+  };
+}
+
+const getSeverityRuleAlertsQuery = ({ from, to }: { from: string; to: string }) => ({
+  size: 0,
+  query: {
+    bool: {
+      filter: [
+        { term: { 'kibana.alert.workflow_status': 'open' } },
+        { range: { '@timestamp': { gte: from, lte: to } } },
+      ],
+    },
+  },
+  aggs: {
+    alertsByRule: {
+      terms: {
+        // top 4 rules sorted by severity counters
+        field: 'kibana.alert.rule.uuid',
+        size: 4,
+        order: [{ critical: 'desc' }, { high: 'desc' }, { medium: 'desc' }, { low: 'desc' }],
+      },
+      aggs: {
+        // severity aggregations for sorting
+        critical: { filter: { term: { 'kibana.alert.severity': 'critical' } } },
+        high: { filter: { term: { 'kibana.alert.severity': 'high' } } },
+        medium: { filter: { term: { 'kibana.alert.severity': 'medium' } } },
+        low: { filter: { term: { 'kibana.alert.severity': 'low' } } },
+        // get the newest alert to extract timestamp and rule name
+        lastRuleAlert: {
+          top_hits: {
+            size: 1,
+            sort: {
+              '@timestamp': 'desc',
+            },
+          },
+        },
+      },
+    },
+  },
+});
+
+const getRuleAlertsItemsFromAggs = (
+  aggregations?: SeverityRuleAlertsAggsResponse
+): RuleAlertsItem[] => {
+  const buckets = aggregations?.alertsByRule.buckets ?? [];
+  return buckets.map<RuleAlertsItem>((bucket) => {
+    const lastAlert = bucket.lastRuleAlert.hits.hits[0]._source;
+    return {
+      id: bucket.key,
+      alert_count: bucket.lastRuleAlert.hits.total.value,
+      name: lastAlert['kibana.alert.rule.name'],
+      last_alert_at: lastAlert['@timestamp'],
+      severity: lastAlert['kibana.alert.severity'],
+    };
+  });
+};
+
+export interface UseRuleAlertsItemsProps {
+  queryId: string;
+  signalIndexName: string | null;
+  skip?: boolean;
+}
+export type UseRuleAlertsItems = (props: UseRuleAlertsItemsProps) => {
+  items: RuleAlertsItem[];
+  isLoading: boolean;
+  updatedAt: number;
+};
+
+export const useRuleAlertsItems: UseRuleAlertsItems = ({
+  queryId,
+  signalIndexName,
+  skip = false,
+}) => {
+  const [items, setItems] = useState<RuleAlertsItem[]>([]);
+  const [updatedAt, setUpdatedAt] = useState(Date.now());
+  const { to, from, deleteQuery, setQuery } = useGlobalTime();
+
+  const {
+    loading: isLoading,
+    data,
+    setQuery: setAlertsQuery,
+    response,
+    request,
+    refetch: refetchQuery,
+  } = useQueryAlerts<{}, SeverityRuleAlertsAggsResponse>({
+    query: getSeverityRuleAlertsQuery({
+      from,
+      to,
+    }),
+    indexName: signalIndexName,
+    skip,
+  });
+
+  useEffect(() => {
+    setAlertsQuery(
+      getSeverityRuleAlertsQuery({
+        from,
+        to,
+      })
+    );
+  }, [setAlertsQuery, from, to]);
+
+  useEffect(() => {
+    if (data == null) {
+      setItems([]);
+    } else {
+      setItems(getRuleAlertsItemsFromAggs(data.aggregations));
+    }
+    setUpdatedAt(Date.now());
+  }, [data]);
+
+  const refetch = useCallback(() => {
+    if (!skip && refetchQuery) {
+      refetchQuery();
+    }
+  }, [skip, refetchQuery]);
+
+  useQueryInspector({
+    deleteQuery,
+    inspect: {
+      dsl: [request],
+      response: [response],
+    },
+    refetch,
+    setQuery,
+    queryId,
+    loading: isLoading,
+  });
+
+  return { items, isLoading, updatedAt };
+};
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/translations.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/translations.ts
new file mode 100644
index 0000000000000..81e3bff33545d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/translations.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const UPDATING = i18n.translate('xpack.securitySolution.detectionResponse.updating', {
+  defaultMessage: 'Updating...',
+});
+export const UPDATED = i18n.translate('xpack.securitySolution.detectionResponse.updated', {
+  defaultMessage: 'Updated',
+});
+export const RULE_ALERTS_SECTION_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsSectionTitle',
+  {
+    defaultMessage: 'Open alerts by rule',
+  }
+);
+export const NO_ALERTS_FOUND = i18n.translate(
+  'xpack.securitySolution.detectionResponse.noRuleAlerts',
+  {
+    defaultMessage: 'No alerts to display',
+  }
+);
+export const RULE_ALERTS_COLUMN_RULE_NAME = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnRuleName',
+  {
+    defaultMessage: 'Rule name',
+  }
+);
+export const RULE_ALERTS_COLUMN_LAST_ALERT = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnLastAlert',
+  {
+    defaultMessage: 'Last alert',
+  }
+);
+export const RULE_ALERTS_COLUMN_ALERT_COUNT = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnAlertCount',
+  {
+    defaultMessage: 'Alert count',
+  }
+);
+export const RULE_ALERTS_COLUMN_SEVERITY = i18n.translate(
+  'xpack.securitySolution.detectionResponse.ruleAlertsColumnSeverity',
+  {
+    defaultMessage: 'Severity',
+  }
+);
+export const OPEN_RULE_DETAIL_TOOLTIP = i18n.translate(
+  'xpack.securitySolution.detectionResponse.openRuleDetailTooltip',
+  {
+    defaultMessage: 'Open rule detail',
+  }
+);
+export const OPEN_RULE_ALERTS_TOOLTIP = i18n.translate(
+  'xpack.securitySolution.detectionResponse.openRuleAlertsTooltip',
+  {
+    defaultMessage: 'Open rule alerts',
+  }
+);
+
+export const OPEN_ALL_ALERTS_BUTTON = i18n.translate(
+  'xpack.securitySolution.detectionResponse.openAllAlertsButton',
+  {
+    defaultMessage: 'View all open alerts',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/util.tsx b/x-pack/plugins/security_solution/public/overview/components/detection_response/util.tsx
new file mode 100644
index 0000000000000..4ceba66773397
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/util.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { FormattedRelative } from '@kbn/i18n-react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import * as i18n from './translations';
+
+export const SEVERITY_COLOR = {
+  critical: '#EF6550',
+  high: '#EE9266',
+  medium: '#F3B689',
+  low: '#F8D9B2',
+} as const;
+
+export interface LastUpdatedAtProps {
+  updatedAt: number;
+  isUpdating: boolean;
+}
+export const LastUpdatedAt: React.FC<LastUpdatedAtProps> = ({ isUpdating, updatedAt }) => (
+  <EuiFlexGroup>
+    {isUpdating ? (
+      <EuiFlexItem grow={false}>{i18n.UPDATING}</EuiFlexItem>
+    ) : (
+      <EuiFlexItem grow={false}>
+        <>{i18n.UPDATED} </>
+        <FormattedRelative
+          data-test-subj="last-updated-at-date"
+          key={`formattedRelative-${Date.now()}`}
+          value={new Date(updatedAt)}
+        />
+      </EuiFlexItem>
+    )}
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx b/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx
index 114813ea50a4f..40e32af9abde7 100644
--- a/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/event_counts/index.tsx
@@ -10,12 +10,12 @@ import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { ID as OverviewHostQueryId } from '../../containers/overview_host';
 import { OverviewHost } from '../overview_host';
 import { OverviewNetwork } from '../overview_network';
 import { useKibana } from '../../../common/lib/kibana';
 import { convertToBuildEsQuery } from '../../../common/lib/keury';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 import { useInvalidFilterQuery } from '../../../common/hooks/use_invalid_filter_query';
 import {
diff --git a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
index 96571d47ab72e..86f791383ba53 100644
--- a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
@@ -13,6 +13,7 @@ import React, { useEffect, useMemo, useCallback } from 'react';
 import type { DataViewBase, Filter, Query } from '@kbn/es-query';
 import styled from 'styled-components';
 import { EuiButton } from '@elastic/eui';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { DEFAULT_NUMBER_FORMAT, APP_UI_ID } from '../../../../common/constants';
 import { SHOWING, UNIT } from '../../../common/components/events_viewer/translations';
 import { getTabsOnHostsUrl } from '../../../common/components/link_to/redirect_to_hosts';
@@ -27,7 +28,6 @@ import {
   eventsStackByOptions,
   histogramConfigs,
 } from '../../../common/components/events_tab/events_query_tab_body';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { HostsTableType } from '../../../hosts/store/model';
 import { InputsModelId } from '../../../common/store/inputs/constants';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
index 7f447670fd1e1..130f9ac8d870e 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
@@ -12,7 +12,7 @@ import '../../../../common/mock/match_media';
 import '../../../../common/mock/react_beautiful_dnd';
 import { TestProviders } from '../../../../common/mock';
 
-import { EndpointOverview } from './index';
+import { EndpointOverview } from '.';
 import {
   EndpointFields,
   HostPolicyResponseActionStatus,
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx
index 28c02c6d8ed4f..d928cc77d73df 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import '../../../common/mock/match_media';
 import { TestProviders } from '../../../common/mock';
 
-import { HostOverview } from './index';
+import { HostOverview } from '.';
 import { mockData } from './mock';
 import { mockAnomalies } from '../../../common/components/ml/mock';
 import { useHostRiskScore } from '../../../risk_score/containers/all';
diff --git a/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx b/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx
index eaa4c9d6fbe44..42457f9b494ab 100644
--- a/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/sidebar/sidebar.test.tsx
@@ -11,7 +11,7 @@ import { waitFor } from '@testing-library/react';
 import { TestProviders } from '../../../common/mock';
 import { Sidebar } from './sidebar';
 import { useGetUserCasesPermissions, useKibana } from '../../../common/lib/kibana';
-import { casesPluginMock, CaseUiClientMock } from '../../../../../cases/public/mocks';
+import { casesPluginMock, CaseUiClientMock } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts
index ad737ac410e3b..a121efed34779 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/api.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { EPM_API_ROUTES } from '@kbn/fleet-plugin/common';
 import { KibanaServices } from '../../../common/lib/kibana';
-import { EPM_API_ROUTES } from '../../../../../fleet/common';
 
 export interface IntegrationResponse {
   id: string;
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx
index b1310e363eef0..5766bd8d6170e 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx
@@ -6,7 +6,7 @@
  */
 import { useState, useEffect, useCallback } from 'react';
 import { SavedObjectAttributes } from '@kbn/securitysolution-io-ts-alerting-types';
-import { TiDataSources } from '../../containers/overview_cti_links/use_ti_data_sources';
+import { TiDataSources } from './use_ti_data_sources';
 import { LinkPanelListItem } from '../../components/link_panel';
 import { useKibana } from '../../../common/lib/kibana';
 
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
index 19ea075aee489..837bc01007601 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
@@ -8,12 +8,12 @@ import { Observable } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { useEffect, useState } from 'react';
 import { useObservable, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
-import { useKibana } from '../../../common/lib/kibana';
 import {
   DataPublicPluginStart,
   isCompleteResponse,
   isErrorResponse,
-} from '../../../../../../../src/plugins/data/public';
+} from '@kbn/data-plugin/public';
+import { useKibana } from '../../../common/lib/kibana';
 import {
   Bucket,
   CtiQueries,
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx
index 53f07d5195c26..27714fd14449d 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useHostOverview } from './index';
+import { useHostOverview } from '.';
 
 describe('useHostOverview', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
index b79169b1ac762..cb6c9d484cf6f 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   HostsQueries,
   HostOverviewRequestOptions,
@@ -19,7 +20,6 @@ import { useKibana } from '../../../common/lib/kibana';
 import { inputsModel } from '../../../common/store/inputs';
 import { createFilter } from '../../../common/containers/helpers';
 import { ESQuery } from '../../../../common/typed_json';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx
index 64cc2e6bbd179..23bfea8ad55bd 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../common/mock';
-import { useNetworkOverview } from './index';
+import { useNetworkOverview } from '.';
 
 describe('useNetworkOverview', () => {
   it('skip = true will cancel any running request', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx
index c2683b74a5b1a..e33060e247b83 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_network/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   NetworkQueries,
   NetworkOverviewRequestOptions,
@@ -19,7 +20,6 @@ import { useKibana } from '../../../common/lib/kibana';
 import { inputsModel } from '../../../common/store/inputs';
 import { createFilter } from '../../../common/containers/helpers';
 import { ESQuery } from '../../../../common/typed_json';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/overview/pages/detection_response.test.tsx b/x-pack/plugins/security_solution/public/overview/pages/detection_response.test.tsx
new file mode 100644
index 0000000000000..8cd387978e97d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/overview/pages/detection_response.test.tsx
@@ -0,0 +1,191 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { render } from '@testing-library/react';
+import { DetectionResponse } from './detection_response';
+import { TestProviders } from '../../common/mock';
+
+jest.mock('../components/detection_response/rule_alerts_table', () => ({
+  RuleAlertsTable: () => <div data-test-subj="mock_RuleAlertsTable" />,
+}));
+// TODO: add all sections mocks
+
+jest.mock('../../common/components/search_bar', () => ({
+  SiemSearchBar: () => <div data-test-subj="mock_globalDatePicker" />,
+}));
+
+const defaultUseSourcererReturn = {
+  indicesExist: true,
+  loading: false,
+  indexPattern: '',
+};
+const mockUseSourcererDataView = jest.fn(() => defaultUseSourcererReturn);
+jest.mock('../../common/containers/sourcerer', () => ({
+  useSourcererDataView: () => mockUseSourcererDataView(),
+}));
+
+const defaultUseUserInfoReturn = {
+  signalIndexName: '',
+  canUserREAD: true,
+  hasIndexRead: true,
+};
+const mockUseUserInfo = jest.fn(() => defaultUseUserInfoReturn);
+jest.mock('../../detections/components/user_info', () => ({
+  useUserInfo: () => mockUseUserInfo(),
+}));
+
+const defaultUseCasesPermissionsReturn = { read: true };
+const mockUseCasesPermissions = jest.fn(() => defaultUseCasesPermissionsReturn);
+jest.mock('../../common/lib/kibana/hooks', () => {
+  const original = jest.requireActual('../../common/lib/kibana/hooks');
+  return {
+    ...original,
+    useGetUserCasesPermissions: () => mockUseCasesPermissions(),
+  };
+});
+
+describe('DetectionResponse', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSourcererDataView.mockReturnValue(defaultUseSourcererReturn);
+    mockUseUserInfo.mockReturnValue(defaultUseUserInfoReturn);
+    mockUseCasesPermissions.mockReturnValue(defaultUseCasesPermissionsReturn);
+  });
+
+  it('should render default page', () => {
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_globalDatePicker')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseSections')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseLoader')).not.toBeInTheDocument();
+    expect(result.getByText('Detection & Response')).toBeInTheDocument();
+  });
+
+  it('should render landing page if index not exist', () => {
+    mockUseSourcererDataView.mockReturnValue({
+      ...defaultUseSourcererReturn,
+      indicesExist: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.getByTestId('siem-landing-page')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponsePage')).not.toBeInTheDocument();
+    expect(result.queryByTestId('mock_globalDatePicker')).not.toBeInTheDocument();
+  });
+
+  it('should render loader if sourcerer is loading', () => {
+    mockUseSourcererDataView.mockReturnValue({
+      ...defaultUseSourcererReturn,
+      loading: true,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_globalDatePicker')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseLoader')).toBeInTheDocument();
+    expect(result.queryByTestId('detectionResponseSections')).not.toBeInTheDocument();
+  });
+
+  it('should not render alerts data sections if user has not index read permission', () => {
+    mockUseUserInfo.mockReturnValue({
+      ...defaultUseUserInfoReturn,
+      hasIndexRead: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_RuleAlertsTable')).not.toBeInTheDocument();
+    // TODO: assert other alert sections are not in the document
+    // TODO: assert cases sections are in the document
+  });
+
+  it('should not render alerts data sections if user has not kibana read permission', () => {
+    mockUseUserInfo.mockReturnValue({
+      ...defaultUseUserInfoReturn,
+      canUserREAD: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_RuleAlertsTable')).not.toBeInTheDocument();
+    // TODO: assert all alert sections are not in the document
+    // TODO: assert all cases sections are in the document
+  });
+
+  it('should not render cases data sections if user has not cases read permission', () => {
+    mockUseCasesPermissions.mockReturnValue({ read: false });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).toBeInTheDocument();
+    expect(result.queryByTestId('mock_RuleAlertsTable')).toBeInTheDocument();
+    // TODO: assert all alert sections are in the document
+    // TODO: assert all cases sections are not in the document
+  });
+
+  it('should render page permissions message if user has any read permission', () => {
+    mockUseCasesPermissions.mockReturnValue({ read: false });
+    mockUseUserInfo.mockReturnValue({
+      ...defaultUseUserInfoReturn,
+      hasIndexRead: false,
+    });
+
+    const result = render(
+      <TestProviders>
+        <MemoryRouter>
+          <DetectionResponse />
+        </MemoryRouter>
+      </TestProviders>
+    );
+
+    expect(result.queryByTestId('detectionResponsePage')).not.toBeInTheDocument();
+    expect(result.queryByTestId('noPermissionPage')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx b/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
index f3dc4d400c9c2..719cb88b62043 100644
--- a/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
+++ b/x-pack/plugins/security_solution/public/overview/pages/detection_response.tsx
@@ -4,89 +4,92 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useEffect, useMemo, useState } from 'react';
-import { FormattedRelative } from '@kbn/i18n-react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import React, { useMemo } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 import { SiemSearchBar } from '../../common/components/search_bar';
 import { SecuritySolutionPageWrapper } from '../../common/components/page_wrapper';
-// import { useGlobalTime } from '../../common/containers/use_global_time';
-
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { SecurityPageName } from '../../app/types';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
-import { useAlertsPrivileges } from '../../detections/containers/detection_engine/alerts/use_alerts_privileges';
+import { useUserInfo } from '../../detections/components/user_info';
 import { HeaderPage } from '../../common/components/header_page';
-import { useShallowEqualSelector } from '../../common/hooks/use_selector';
-import { DETECTION_RESPONSE_TITLE, UPDATED, UPDATING } from './translations';
-import { inputsSelectors } from '../../common/store/selectors';
+import { useKibana, useGetUserCasesPermissions } from '../../common/lib/kibana';
+import { RuleAlertsTable } from '../components/detection_response/rule_alerts_table';
 import { LandingPageComponent } from '../../common/components/landing_page';
+import * as i18n from './translations';
+import { EmptyPage } from '../../common/components/empty_page';
 
-const DetectionResponseComponent = () => {
-  const getGlobalQuery = useMemo(() => inputsSelectors.globalQuery(), []);
-  const { indicesExist, indexPattern, loading: isSourcererLoading } = useSourcererDataView();
-  const [updatedAt, setUpdatedAt] = useState(Date.now());
-  // TODO: link queries with global time queries
-  // const { to, from, deleteQuery, setQuery, isInitializing } = useGlobalTime();
-
-  const queriesLoading: boolean = useShallowEqualSelector(
-    (state) => !!getGlobalQuery(state).find((query) => query.loading)
+const NoPrivilegePage: React.FC = () => {
+  const { docLinks } = useKibana().services;
+  const emptyPageActions = useMemo(
+    () => ({
+      feature: {
+        icon: 'documents',
+        label: i18n.GO_TO_DOCUMENTATION,
+        url: `${docLinks.links.siem.privileges}`,
+        target: '_blank',
+      },
+    }),
+    [docLinks]
   );
-
-  useEffect(() => {
-    if (!queriesLoading) {
-      setUpdatedAt(Date.now());
-    }
-  }, [queriesLoading]);
-
-  const showUpdating = useMemo(
-    () => queriesLoading || isSourcererLoading,
-    [queriesLoading, isSourcererLoading]
+  return (
+    <EmptyPage
+      data-test-subj="noPermissionPage"
+      actions={emptyPageActions}
+      title={i18n.NO_PERMISSIONS_TITLE}
+      message={i18n.NO_PERMISSIONS_MSG}
+    />
   );
+};
 
-  const { hasIndexRead, hasKibanaREAD } = useAlertsPrivileges();
+const DetectionResponseComponent = () => {
+  const { indicesExist, indexPattern, loading: isSourcererLoading } = useSourcererDataView();
+  const { signalIndexName, canUserREAD, hasIndexRead } = useUserInfo();
+  const canReadCases = useGetUserCasesPermissions()?.read;
+  const canReadAlerts = canUserREAD && hasIndexRead;
+
+  if (!canReadAlerts && !canReadCases) {
+    return <NoPrivilegePage />;
+  }
 
   return (
     <>
       {indicesExist ? (
         <>
-          <SecuritySolutionPageWrapper>
-            <HeaderPage title={DETECTION_RESPONSE_TITLE}>
+          <SecuritySolutionPageWrapper data-test-subj="detectionResponsePage">
+            <HeaderPage title={i18n.DETECTION_RESPONSE_TITLE}>
               <SiemSearchBar id="global" indexPattern={indexPattern} hideFilterBar hideQueryInput />
             </HeaderPage>
-            <EuiFlexGroup>
-              {showUpdating ? (
-                <EuiFlexItem grow={false}>{UPDATING}</EuiFlexItem>
-              ) : (
-                <EuiFlexItem grow={false}>
-                  <>{UPDATED} </>
-                  <FormattedRelative
-                    data-test-subj="last-updated-at-date"
-                    key={`formatedRelative-${Date.now()}`}
-                    value={new Date(updatedAt)}
-                  />
+
+            {isSourcererLoading ? (
+              <EuiLoadingSpinner size="l" data-test-subj="detectionResponseLoader" />
+            ) : (
+              <EuiFlexGroup direction="column" data-test-subj="detectionResponseSections">
+                <EuiFlexItem>
+                  <EuiFlexGroup>
+                    {canReadAlerts && <EuiFlexItem>{'[alerts chart]'}</EuiFlexItem>}
+                    {canReadCases && <EuiFlexItem>{'[cases chart]'}</EuiFlexItem>}
+                  </EuiFlexGroup>
                 </EuiFlexItem>
-              )}
-            </EuiFlexGroup>
 
-            <EuiFlexGroup direction="column">
-              <EuiFlexItem>
-                <EuiFlexGroup>
+                {canReadAlerts && (
                   <EuiFlexItem>
-                    {hasIndexRead && hasKibanaREAD && <>{'[alerts charts]'}</>}
+                    <RuleAlertsTable signalIndexName={signalIndexName} />
                   </EuiFlexItem>
-                  <EuiFlexItem>{'[cases chart]'}</EuiFlexItem>
-                </EuiFlexGroup>
-              </EuiFlexItem>
+                )}
 
-              <EuiFlexItem>{'[rules table]'}</EuiFlexItem>
-              <EuiFlexItem>{'[cases table]'}</EuiFlexItem>
-              <EuiFlexItem>
-                <EuiFlexGroup>
-                  <EuiFlexItem>{'[hosts table]'}</EuiFlexItem>
-                  <EuiFlexItem>{'[users table]'}</EuiFlexItem>
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            </EuiFlexGroup>
+                {canReadCases && <EuiFlexItem>{'[cases table]'}</EuiFlexItem>}
+
+                {canReadAlerts && (
+                  <EuiFlexItem>
+                    <EuiFlexGroup>
+                      <EuiFlexItem>{'[hosts table]'}</EuiFlexItem>
+                      <EuiFlexItem>{'[users table]'}</EuiFlexItem>
+                    </EuiFlexGroup>
+                  </EuiFlexItem>
+                )}
+              </EuiFlexGroup>
+            )}
           </SecuritySolutionPageWrapper>
         </>
       ) : (
diff --git a/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx b/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
index cd941e26e20a6..ad3eff86e6753 100644
--- a/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
@@ -16,7 +16,7 @@ import {
   useMessagesStorage,
   UseMessagesStorage,
 } from '../../common/containers/local_storage/use_messages_storage';
-import { Overview } from './index';
+import { Overview } from '.';
 import { useUserPrivileges } from '../../common/components/user_privileges';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
 import { useFetchIndex } from '../../common/containers/source';
@@ -27,7 +27,7 @@ import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experime
 import { initialUserPrivilegesState } from '../../common/components/user_privileges/user_privileges_context';
 import { EndpointPrivileges } from '../../../common/endpoint/types';
 import { useHostRiskScore } from '../../risk_score/containers';
-import { mockCasesContract } from '../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 const mockNavigateToApp = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/overview/pages/translations.ts b/x-pack/plugins/security_solution/public/overview/pages/translations.ts
index b45216f2f528e..414326dd0539b 100644
--- a/x-pack/plugins/security_solution/public/overview/pages/translations.ts
+++ b/x-pack/plugins/security_solution/public/overview/pages/translations.ts
@@ -57,14 +57,25 @@ export const VIEW_EVENTS = i18n.translate('xpack.securitySolution.overview.viewE
 export const DETECTION_RESPONSE_TITLE = i18n.translate(
   'xpack.securitySolution.detectionResponse.pageTitle',
   {
-    defaultMessage: 'Detection & Response - SOC',
+    defaultMessage: 'Detection & Response',
+  }
+);
+export const NO_PERMISSIONS_MSG = i18n.translate(
+  'xpack.securitySolution.detectionResponse.noPagePermissionsMessage',
+  {
+    defaultMessage:
+      'To view this page you must update privileges. For more information, contact your Kibana administrator.',
+  }
+);
+export const NO_PERMISSIONS_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionResponse.noPermissionsTitle',
+  {
+    defaultMessage: 'Privileges required',
+  }
+);
+export const GO_TO_DOCUMENTATION = i18n.translate(
+  'xpack.securitySolution.detectionResponse.goToDocumentationButton',
+  {
+    defaultMessage: 'View documentation',
   }
 );
-
-export const UPDATING = i18n.translate('xpack.securitySolution.detectionResponse.updating', {
-  defaultMessage: 'Updating...',
-});
-
-export const UPDATED = i18n.translate('xpack.securitySolution.detectionResponse.updated', {
-  defaultMessage: 'Updated',
-});
diff --git a/x-pack/plugins/security_solution/public/overview/routes.tsx b/x-pack/plugins/security_solution/public/overview/routes.tsx
index b4aa19e1e9bc1..f1df9517e7d06 100644
--- a/x-pack/plugins/security_solution/public/overview/routes.tsx
+++ b/x-pack/plugins/security_solution/public/overview/routes.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import {
   LANDING_PATH,
   OVERVIEW_PATH,
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index f966586557bd1..1dc14ababd781 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -10,6 +10,18 @@ import reduceReducers from 'reduce-reducers';
 import { BehaviorSubject, Subject, Subscription } from 'rxjs';
 import { pluck } from 'rxjs/operators';
 import { AnyAction, Reducer } from 'redux';
+import {
+  AppMountParameters,
+  AppUpdater,
+  CoreSetup,
+  CoreStart,
+  PluginInitializerContext,
+  Plugin as IPlugin,
+  DEFAULT_APP_CATEGORIES,
+  AppNavLinkStatus,
+} from '@kbn/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { TimelineState } from '@kbn/timelines-plugin/public';
 import type {
   PluginSetup,
   PluginStart,
@@ -20,17 +32,6 @@ import type {
   SubPlugins,
   StartedSubPlugins,
 } from './types';
-import {
-  AppMountParameters,
-  AppUpdater,
-  CoreSetup,
-  CoreStart,
-  PluginInitializerContext,
-  Plugin as IPlugin,
-  DEFAULT_APP_CATEGORIES,
-  AppNavLinkStatus,
-} from '../../../../src/core/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
 import { initTelemetry } from './common/lib/telemetry';
 import { KibanaServices } from './common/lib/kibana/services';
 import { SOLUTION_NAME } from './common/translations';
@@ -60,7 +61,6 @@ import {
   ExperimentalFeatures,
   parseExperimentalConfigValue,
 } from '../common/experimental_features';
-import type { TimelineState } from '../../timelines/public';
 import { LazyEndpointCustomAssetsExtension } from './management/pages/policy/view/ingest_manager_integration/lazy_endpoint_custom_assets_extension';
 import { initDataView, SourcererModel, KibanaDataView } from './common/store/sourcerer/model';
 import { SecurityDataView } from './common/containers/sourcerer/api';
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
index 413007e44632e..758f942966ea1 100644
--- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaReactContextValue } from '../../../../../../src/plugins/kibana_react/public';
+import { KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
 import { StartServices } from '../../types';
 import { DataAccessLayer, TimeRange } from '../types';
 import {
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
index 83af8feafcc7f..c4d6987545939 100644
--- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
@@ -5,9 +5,12 @@
  * 2.0.
  */
 
-import { ResolverNode, SafeResolverEvent } from './../../../../common/endpoint/types/index';
-
-import { ResolverRelatedEvents, ResolverEntityIndex } from '../../../../common/endpoint/types';
+import {
+  ResolverNode,
+  SafeResolverEvent,
+  ResolverRelatedEvents,
+  ResolverEntityIndex,
+} from '../../../../common/endpoint/types';
 import { DataAccessLayer } from '../../types';
 
 type PausableRequests =
diff --git a/x-pack/plugins/security_solution/public/resolver/index.ts b/x-pack/plugins/security_solution/public/resolver/index.ts
index 321d3e483c4a4..1869c3c1b11a5 100644
--- a/x-pack/plugins/security_solution/public/resolver/index.ts
+++ b/x-pack/plugins/security_solution/public/resolver/index.ts
@@ -7,7 +7,7 @@
 
 import { Provider } from 'react-redux';
 import { ResolverPluginSetup } from './types';
-import { resolverStoreFactory } from './store/index';
+import { resolverStoreFactory } from './store';
 import { ResolverWithoutProviders } from './view/resolver_without_providers';
 import { noAncestorsTwoChildrenWithRelatedEventsOnOrigin } from './data_access_layer/mocks/no_ancestors_two_children_with_related_events_on_origin';
 
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts
index e09299909c1f8..450f451b71347 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.test.ts
@@ -9,7 +9,7 @@ import { ResolverNode } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { generateTree, genResolverNode } from '../../mocks/generator';
 import { IndexedProcessTree } from '../../types';
-import { factory } from './index';
+import { factory } from '.';
 
 describe('factory', () => {
   const originID = 'origin';
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
index f1fdd46caa7e1..b83dd4ba13610 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.test.ts
@@ -7,7 +7,7 @@
 
 import { ResolverNode } from '../../../../common/endpoint/types';
 import { isometricTaxiLayoutFactory } from './isometric_taxi_layout';
-import { factory } from './index';
+import { factory } from '.';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { genResolverNode } from '../../mocks/generator';
 import { IsometricTaxiLayout } from '../../types';
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
index 177f96ce8c90e..7d45f4ae6e727 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
@@ -19,7 +19,7 @@ import {
 import * as nodeModel from '../../../../common/endpoint/models/node';
 import { ResolverNode } from '../../../../common/endpoint/types';
 import * as vector2 from '../vector2';
-import * as indexedProcessTreeModel from './index';
+import * as indexedProcessTreeModel from '.';
 import { getFriendlyElapsedTime as elapsedTime } from '../../lib/date';
 
 /**
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
index d1da7e816d01a..a448df4600baf 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
@@ -12,7 +12,7 @@ import * as selectors from './selectors';
 import { DataState, GeneratedTreeMetadata } from '../../types';
 import { DataAction } from './action';
 import { generateTreeWithDAL } from '../../data_access_layer/mocks/generator_tree';
-import { endpointSourceSchema, winlogSourceSchema } from './../../mocks/tree_schema';
+import { endpointSourceSchema, winlogSourceSchema } from '../../mocks/tree_schema';
 import { NewResolverTree, ResolverSchema } from '../../../../common/endpoint/types';
 import { ancestorsWithAncestryField, descendantsLimit } from '../../models/resolver_tree';
 
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
index b864bb254a5fc..0fb86ec93c89f 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
@@ -16,7 +16,7 @@ import {
   mockTreeWith1AncestorAnd2ChildrenAndAllNodesHave2GraphableEvents,
   mockTreeWithNoProcessEvents,
 } from '../../mocks/resolver_tree';
-import { endpointSourceSchema } from './../../mocks/tree_schema';
+import { endpointSourceSchema } from '../../mocks/tree_schema';
 import * as nodeModel from '../../../../common/endpoint/models/node';
 import { mockTreeFetcherParameters } from '../../mocks/tree_fetcher_parameters';
 import { SafeResolverEvent } from '../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
index 5020aadd0f280..71dcbffb5db67 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/visible_entities.test.ts
@@ -13,7 +13,7 @@ import { ResolverNode } from '../../../../common/endpoint/types';
 import { visibleNodesAndEdgeLines } from '../selectors';
 import { mock as mockResolverTree } from '../../models/resolver_tree';
 import { mockTreeFetcherParameters } from '../../mocks/tree_fetcher_parameters';
-import { endpointSourceSchema } from './../../mocks/tree_schema';
+import { endpointSourceSchema } from '../../mocks/tree_schema';
 import { mockResolverNode } from '../../mocks/resolver_node';
 
 describe('resolver visible entities', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
index 26cf874edda00..5a5a1ba14e185 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
@@ -16,7 +16,7 @@ import {
 } from '../mocks/resolver_tree';
 import { ResolverNode } from '../../../common/endpoint/types';
 import { mockTreeFetcherParameters } from '../mocks/tree_fetcher_parameters';
-import { endpointSourceSchema } from './../mocks/tree_schema';
+import { endpointSourceSchema } from '../mocks/tree_schema';
 
 describe('resolver selectors', () => {
   const actions: ResolverAction[] = [];
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 22de53be9379d..7e1f4d4d73ead 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
@@ -9,7 +9,7 @@ import React from 'react';
 import { Store, createStore, applyMiddleware } from 'redux';
 import { mount, ReactWrapper } from 'enzyme';
 import { History as HistoryPackageHistoryInterface, createMemoryHistory } from 'history';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { spyMiddlewareFactory } from '../spy_middleware_factory';
 import { resolverMiddlewareFactory } from '../../store/middleware';
 import { resolverReducer } from '../../store/reducer';
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx
index b8dbb5611b26c..6d5bdbea48f97 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/mock_resolver.tsx
@@ -12,8 +12,8 @@ import { Router } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Provider } from 'react-redux';
 import { Store } from 'redux';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { CoreStart } from '../../../../../../../src/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { ResolverState, SideEffectSimulator, ResolverProps } from '../../types';
 import { ResolverAction } from '../../store/actions';
 import { ResolverWithoutProviders } from '../../view/resolver_without_providers';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx b/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx
index 570f444814d7f..68222ce8cd9e7 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/graph_controls.tsx
@@ -370,7 +370,7 @@ const SchemaInformation = ({
       </EuiPopoverTitle>
       <div
         // Limit the width based on UX design
-        style={{ maxWidth: '256px' }}
+        style={{ maxWidth: '268px' }}
       >
         <StyledDescriptionList
           data-test-subj="resolver:graph-controls:schema-info"
diff --git a/x-pack/plugins/security_solution/public/resolver/view/index.tsx b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
index 3c3e0e3e74319..794658758eccf 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
@@ -9,9 +9,9 @@
 
 import React, { useMemo, useState, useEffect } from 'react';
 import { Provider } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { resolverStoreFactory } from '../store';
 import { StartServices } from '../../types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { DataAccessLayer, ResolverProps } from '../types';
 import { dataAccessLayerFactory } from '../data_access_layer/factory';
 import { ResolverWithoutProviders } from './resolver_without_providers';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx
index 4a702d05a3d1b..668c324565520 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/copyable_panel_field.tsx
@@ -11,7 +11,7 @@ import { EuiToolTip, EuiButtonIcon, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import React, { memo, useState, useCallback, useContext, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useColors } from '../use_colors';
 import { StyledPanel } from '../styles';
 import { SideEffectContext } from '../side_effect_context';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx
index e6140f8834799..1c3f1948edc4d 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.test.tsx
@@ -9,8 +9,8 @@ import { mount } from 'enzyme';
 
 import React from 'react';
 import { useFormattedDate } from './use_formatted_date';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { uiSetting } from '../../mocks/ui_setting';
 
 describe(`useFormattedDate, when the "dateFormat" UI setting is "${uiSetting(
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts
index 53434fb69064c..789f6d8573076 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/use_formatted_date.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
-import { useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 
 const invalidDateText = i18n.translate(
   'xpack.securitySolution.enpdoint.resolver.panelutils.invaliddate',
diff --git a/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx b/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx
index 987ac9849f722..9f73f1080aab8 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/symbol_definitions.tsx
@@ -10,7 +10,7 @@
 import React, { memo } from 'react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
-import { useUiSetting } from '../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { useSymbolIDs } from './use_symbol_ids';
 import { usePaintServerIDs } from './use_paint_server_ids';
 
diff --git a/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx b/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx
index fe91c2fc1af9e..8ddd081088686 100644
--- a/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx
+++ b/x-pack/plugins/security_solution/public/risk_score/containers/all/index.tsx
@@ -10,6 +10,7 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { createFilter } from '../../../common/containers/helpers';
 import { useKibana } from '../../../common/lib/kibana';
 import {
@@ -25,7 +26,6 @@ import {
 import { ESQuery } from '../../../../common/typed_json';
 
 import * as i18n from './translations';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../helpers';
 import { InspectResponse } from '../../../types';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
diff --git a/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx b/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx
index bad3799b42ed3..13335a3e82e40 100644
--- a/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx
+++ b/x-pack/plugins/security_solution/public/risk_score/containers/kpi/index.tsx
@@ -9,6 +9,8 @@ import type { Observable } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { useEffect, useMemo } from 'react';
 import { useObservable, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { createFilter } from '../../../common/containers/helpers';
 
 import {
@@ -21,9 +23,6 @@ import {
   RiskSeverity,
 } from '../../../../common/search_strategy';
 
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
-
 import { useKibana } from '../../../common/lib/kibana';
 import { isIndexNotFoundError } from '../../../common/utils/exceptions';
 import { ESTermQuery } from '../../../../common/typed_json';
diff --git a/x-pack/plugins/security_solution/public/rules/index.ts b/x-pack/plugins/security_solution/public/rules/index.ts
index e74efabad4932..10af0407c18e6 100644
--- a/x-pack/plugins/security_solution/public/rules/index.ts
+++ b/x-pack/plugins/security_solution/public/rules/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { SecuritySubPlugin } from '../app/types';
 import { DETECTIONS_TIMELINE_IDS } from '../detections';
diff --git a/x-pack/plugins/security_solution/public/rules/routes.tsx b/x-pack/plugins/security_solution/public/rules/routes.tsx
index 4172e75a3cd96..468e2b41e9290 100644
--- a/x-pack/plugins/security_solution/public/rules/routes.tsx
+++ b/x-pack/plugins/security_solution/public/rules/routes.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import * as i18n from './translations';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { RULES_PATH, SecurityPageName } from '../../common/constants';
 import { NotFoundPage } from '../app/404';
 import { RulesPage } from '../detections/pages/detection_engine/rules';
diff --git a/x-pack/plugins/security_solution/public/shared_imports.ts b/x-pack/plugins/security_solution/public/shared_imports.ts
index 421b92a6e8b7f..30c2b4d2584ce 100644
--- a/x-pack/plugins/security_solution/public/shared_imports.ts
+++ b/x-pack/plugins/security_solution/public/shared_imports.ts
@@ -13,7 +13,7 @@ export type {
   FormSchema,
   ValidationError,
   ValidationFunc,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 export {
   getUseField,
   getFieldValidityAndErrorMessage,
@@ -26,7 +26,7 @@ export {
   useFormContext,
   useFormData,
   VALIDATION_TYPES,
-} from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-export { Field, SelectField } from '../../../../src/plugins/es_ui_shared/static/forms/components';
-export { fieldValidators } from '../../../../src/plugins/es_ui_shared/static/forms/helpers';
-export type { ERROR_CODE } from '../../../../src/plugins/es_ui_shared/static/forms/helpers/field_validators/types';
+} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+export { Field, SelectField } from '@kbn/es-ui-shared-plugin/static/forms/components';
+export { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
+export type { ERROR_CODE } from '@kbn/es-ui-shared-plugin/static/forms/helpers/field_validators/types';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx
index f81146a612f5c..5f2f47073be6c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.test.tsx
@@ -7,7 +7,7 @@
 
 import { render } from '@testing-library/react';
 import React from 'react';
-import { useCreateFieldButton, UseCreateFieldButton, UseCreateFieldButtonProps } from './index';
+import { useCreateFieldButton, UseCreateFieldButton, UseCreateFieldButtonProps } from '.';
 
 import { TestProviders } from '../../../../common/mock';
 import { renderHook } from '@testing-library/react-hooks';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx
index 6a758d8deb9b0..f20e7dce7d8bd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/create_field_button/index.tsx
@@ -9,7 +9,7 @@ import React, { useCallback } from 'react';
 import { EuiButton } from '@elastic/eui';
 import styled from 'styled-components';
 
-import type { CreateFieldComponent } from '../../../../../../timelines/common/types';
+import type { CreateFieldComponent } from '@kbn/timelines-plugin/common/types';
 import type { OpenFieldEditor } from '..';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx
index 511998d02867f..7b3b303dc2962 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.test.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { useFieldTableColumns, UseFieldTableColumnsProps, UseFieldTableColumns } from './index';
+import { useFieldTableColumns, UseFieldTableColumnsProps, UseFieldTableColumns } from '.';
 
 import { TestProviders } from '../../../../common/mock';
 import { renderHook } from '@testing-library/react-hooks';
-import { BrowserFieldItem } from '../../../../../../timelines/common/types';
+import { BrowserFieldItem } from '@kbn/timelines-plugin/common/types';
 import { EuiInMemoryTable } from '@elastic/eui';
 
 const mockOnHide = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx
index 48354491562d6..29622eadb6a08 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_table_columns/index.tsx
@@ -19,10 +19,7 @@ import {
   EuiHighlight,
 } from '@elastic/eui';
 import { Action } from '@elastic/eui/src/components/basic_table/action_types';
-import type {
-  BrowserFieldItem,
-  GetFieldTableColumns,
-} from '../../../../../../timelines/common/types';
+import type { BrowserFieldItem, GetFieldTableColumns } from '@kbn/timelines-plugin/common/types';
 
 import * as i18n from './translations';
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx
index 03c04066f0c11..8f4fc13ddbe3b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.test.tsx
@@ -12,22 +12,22 @@ import {
   UseFieldBrowserOptionsProps,
   UseFieldBrowserOptions,
   FieldEditorActionsRef,
-} from './index';
+} from '.';
 import {
   indexPatternFieldEditorPluginMock,
   Start,
-} from '../../../../../../../src/plugins/data_view_field_editor/public/mocks';
+} from '@kbn/data-view-field-editor-plugin/public/mocks';
 
 import { TestProviders } from '../../../common/mock';
 import { useKibana } from '../../../common/lib/kibana';
-import type { DataView, DataViewField } from '../../../../../../../src/plugins/data/common';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
 import { TimelineId } from '../../../../common/types';
 import { renderHook, RenderHookResult } from '@testing-library/react-hooks';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import { removeColumn, upsertColumn } from '../../store/timeline/actions';
 import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/constants';
-import { BrowserFieldItem } from '../../../../../timelines/common/types';
+import { BrowserFieldItem } from '@kbn/timelines-plugin/common/types';
 import { EuiInMemoryTable } from '@elastic/eui';
 
 let mockIndexPatternFieldEditor: Start;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
index b38b6d03749c9..35bb1f8e888fe 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
@@ -7,11 +7,11 @@
 
 import { MutableRefObject, useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { DataViewField, DataView } from '../../../../../../../src/plugins/data_views/common';
+import { DataViewField, DataView } from '@kbn/data-views-plugin/common';
 import type {
   CreateFieldComponent,
   GetFieldTableColumns,
-} from '../../../../../timelines/common/types';
+} from '@kbn/timelines-plugin/common/types';
 import { TimelineId } from '../../../../common/types';
 import { useDataView } from '../../../common/containers/source/use_data_view';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx
index 5d85e1c4b3f14..02381f8347ff2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_timeline_button/index.test.tsx
@@ -9,7 +9,7 @@ import { mount, ReactWrapper } from 'enzyme';
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 
-import { AddTimelineButton } from './';
+import { AddTimelineButton } from '.';
 import { useKibana } from '../../../../common/lib/kibana';
 import { TimelineId } from '../../../../../common/types/timeline';
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
index c83507570410d..b48361202e54b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
@@ -10,16 +10,16 @@ import { EuiButton, EuiContextMenuPanel, EuiContextMenuItem, EuiPopover } from '
 import React, { useCallback, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Case } from '../../../../../../cases/common';
+import { Case } from '@kbn/cases-plugin/common';
 import { APP_ID, APP_UI_ID } from '../../../../../common/constants';
-import { timelineSelectors } from '../../../../timelines/store/timeline';
+import { timelineSelectors } from '../../../store/timeline';
 import { setInsertTimeline, showTimeline } from '../../../store/timeline/actions';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import { TimelineStatus, TimelineId, TimelineType } from '../../../../../common/types/timeline';
 import { getCreateCaseUrl, getCaseDetailsUrl } from '../../../../common/components/link_to';
 import { SecurityPageName } from '../../../../app/types';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import * as i18n from '../../timeline/properties/translations';
 
 interface Props {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
index fba78be83fa36..a269ae6989598 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
@@ -21,6 +21,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { FormattedRelative } from '@kbn/i18n-react';
 
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import {
   TimelineStatus,
@@ -30,7 +31,7 @@ import {
 } from '../../../../../common/types/timeline';
 import { State } from '../../../../common/store';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { AddToFavoritesButton } from '../../timeline/properties/helpers';
 import { TimerangeInput } from '../../../../../common/search_strategy';
 import { AddToCaseButton } from '../add_to_case_button';
@@ -39,9 +40,8 @@ import { SaveTimelineButton } from '../../timeline/header/save_timeline_button';
 import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import { InspectButton } from '../../../../common/components/inspect';
 import { useTimelineKpis } from '../../../containers/kpis';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 import {
   startSelector,
   endSelector,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
index aa501965193dd..ab8ab6a3f4383 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/index.tsx
@@ -10,7 +10,7 @@ import { EuiFocusTrap, EuiOutsideClickDetector } from '@elastic/eui';
 import React, { useEffect, useMemo, useCallback, useState, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { AppLeaveHandler } from '../../../../../../../src/core/public';
+import { AppLeaveHandler } from '@kbn/core/public';
 import { TimelineId, TimelineStatus, TimelineTabs } from '../../../../common/types/timeline';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { timelineActions } from '../../store/timeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx
index 8c4356e100c15..ba965cd7ad3d4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/pane/index.test.tsx
@@ -13,7 +13,7 @@ import { TimelineId } from '../../../../../common/types/timeline';
 import { Pane } from '.';
 
 jest.mock('../../../../common/lib/kibana');
-jest.mock('../../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../../common/components/url_state/normalize_time_range');
 
 jest.mock('../../../../common/hooks/use_resolve_conflict', () => {
   return {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx
index 80fdd6dfc7dd4..ee0551c5f5296 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.test.tsx
@@ -8,10 +8,10 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { FormattedIp } from './index';
+import { FormattedIp } from '.';
 import { TestProviders } from '../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../common/types';
-import { StatefulEventContext } from '../../../../../timelines/public';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { timelineActions } from '../../store/timeline';
 import { activeTimeline } from '../../containers/active_timeline_context';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
index e1f0954683e04..72d5ad43e91e2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
@@ -11,6 +11,7 @@ import { useDispatch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { FlowTarget } from '../../../../common/search_strategy/security_solution/network';
 import {
   DragEffects,
@@ -19,12 +20,9 @@ import {
 import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers';
 import { Content } from '../../../common/components/draggables';
 import { getOrEmptyTagFromValue } from '../../../common/components/empty_value';
-import { parseQueryValue } from '../../../timelines/components/timeline/body/renderers/parse_query_value';
-import {
-  DataProvider,
-  IS_OPERATOR,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
-import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
+import { parseQueryValue } from '../timeline/body/renderers/parse_query_value';
+import { DataProvider, IS_OPERATOR } from '../timeline/data_providers/data_provider';
+import { Provider } from '../timeline/data_providers/provider';
 import {
   TimelineExpandedDetailType,
   TimelineId,
@@ -33,7 +31,6 @@ import {
 import { activeTimeline } from '../../containers/active_timeline_context';
 import { timelineActions } from '../../store/timeline';
 import { NetworkDetailsLink } from '../../../common/components/links';
-import { StatefulEventContext } from '../../../../../timelines/public';
 
 const getUniqueId = ({
   contextId,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
index 2087bb1a5e511..7ddb09e28fead 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
@@ -59,7 +59,8 @@ const StyledResolver = styled(Resolver)`
 `;
 
 const ScrollableFlexItem = styled(EuiFlexItem)`
-  ${({ theme }) => `margin: 0 ${theme.eui.euiSizeM};`}
+  ${({ theme }) => `padding: 0 ${theme.eui.euiSizeM};
+  background-color: ${theme.eui.euiColorEmptyShade};`}
   overflow: hidden;
   width: 100%;
 `;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
index 00d2a7b35483e..fb9cdd37bf4db 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/note_cards/index.tsx
@@ -9,7 +9,7 @@ import { EuiFlexGroup, EuiPanel, EuiScreenReaderOnly } from '@elastic/eui';
 import React, { useState, useCallback } from 'react';
 import styled from 'styled-components';
 
-import { getNotesContainerClassName } from '../../../../../../timelines/public';
+import { getNotesContainerClassName } from '@kbn/timelines-plugin/public';
 import { AddNote } from '../add_note';
 import { AssociateNote } from '../helpers';
 import { NotePreviews, NotePreviewsContainer } from '../../open_timeline/note_previews';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
index 225158061ad21..6a7738de7b318 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
@@ -52,7 +52,7 @@ import {
 import { resolveTimeline } from '../../containers/api';
 
 jest.mock('../../../common/store/inputs/actions');
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 jest.mock('../../store/timeline/actions');
 jest.mock('../../../common/store/app/actions');
 jest.mock('uuid', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index 31748f40a4b2a..8d69e822d0990 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -38,9 +38,9 @@ import {
   applyKqlFilterQuery as dispatchApplyKqlFilterQuery,
   addTimeline as dispatchAddTimeline,
   addNote as dispatchAddGlobalTimelineNote,
-} from '../../../timelines/store/timeline/actions';
-import { TimelineModel } from '../../../timelines/store/timeline/model';
-import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
+} from '../../store/timeline/actions';
+import { TimelineModel } from '../../store/timeline/model';
+import { timelineDefaults } from '../../store/timeline/defaults';
 
 import {
   defaultColumnHeaderType,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
index f12731396c053..b6163ea93169e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
@@ -10,12 +10,12 @@ import { useDispatch } from 'react-redux';
 
 import { useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { SortFieldTimeline, TimelineId } from '../../../../common/types/timeline';
-import { TimelineModel } from '../../../timelines/store/timeline/model';
-import { timelineSelectors } from '../../../timelines/store/timeline';
+import { TimelineModel } from '../../store/timeline/model';
+import { timelineSelectors } from '../../store/timeline';
 import {
   createTimeline as dispatchCreateNewTimeline,
   updateIsLoading as dispatchUpdateIsLoading,
-} from '../../../timelines/store/timeline/actions';
+} from '../../store/timeline/actions';
 
 import { useGetAllTimeline } from '../../containers/all';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx
index c23cffa854514..c2423da9ca372 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline_modal/index.tsx
@@ -8,7 +8,7 @@
 import { EuiModal } from '@elastic/eui';
 import React from 'react';
 
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 
 import * as i18n from '../translations';
 import { ActionTimelineToShow } from '../types';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
index b14177b066feb..9c540f54c3824 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
@@ -379,7 +379,7 @@ export const IMPORT_FAILED = (totalTimelines: number) =>
     {
       values: { totalTimelines },
       defaultMessage:
-        'Failed to import {totalTimelines} {totalTimelines, plural, =1 {rule} other {rules}}',
+        'Failed to import {totalTimelines} {totalTimelines, plural, =1 {timeline} other {timelines}}',
     }
   );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx
index 5402210d22cce..66bbca5c7c18c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/use_timeline_types.test.tsx
@@ -31,8 +31,8 @@ jest.mock('../../../common/components/link_to', () => {
   };
 });
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const originalModule = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const originalModule = jest.requireActual('@kbn/kibana-react-plugin/public');
   const useKibana = jest.fn().mockImplementation(() => ({
     services: {
       application: {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx
index d6aa34f2528e5..23456e62a26f7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/alerts.tsx
@@ -24,7 +24,6 @@ const AlertsExampleComponent: React.FC = () => {
   return (
     <>
       {alertsRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndpointProcessExecutionMalwarePreventionAlert,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx
index 2c6ce5886462b..f6b3962412267 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd.tsx
@@ -21,7 +21,6 @@ const AuditdExampleComponent: React.FC = () => {
   return (
     <>
       {auditdRowRenderer.renderRow({
-        browserFields: {},
         data: mockTimelineData[26].ecs,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx
index a525b26571dc8..fff934ed55039 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/auditd_file.tsx
@@ -21,7 +21,6 @@ const AuditdFileExampleComponent: React.FC = () => {
   return (
     <>
       {auditdFileRowRenderer.renderRow({
-        browserFields: {},
         data: mockTimelineData[27].ecs,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx
index f8704b63fe47e..cf1ddafcd4b0a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/library.tsx
@@ -21,7 +21,6 @@ const LibraryExampleComponent: React.FC = () => {
   return (
     <>
       {libraryRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndpointLibraryLoadEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx
index c5a0f09440899..b9755bcf573b5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/netflow.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const NetflowExampleComponent: React.FC = () => (
   <>
     {netflowRowRenderer.renderRow({
-      browserFields: {},
       data: getMockNetflowData(),
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx
index 67859db1a5ea4..8742b0e62dfa3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/registry.tsx
@@ -21,7 +21,6 @@ const RegistryExampleComponent: React.FC = () => {
   return (
     <>
       {registryRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndpointRegistryModificationEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx
index 1e6caca2effa9..1c26ee13229bd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/suricata.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const SuricataExampleComponent: React.FC = () => (
   <>
     {suricataRowRenderer.renderRow({
-      browserFields: {},
       data: mockTimelineData[2].ecs,
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx
index 7d38f8feaace6..649edd08c450f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system.tsx
@@ -21,7 +21,6 @@ const SystemExampleComponent: React.FC = () => {
   return (
     <>
       {systemRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameTerminationEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx
index 72c5060b27701..0566cf503443b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_dns.tsx
@@ -17,7 +17,6 @@ const SystemDnsExampleComponent: React.FC = () => {
   return (
     <>
       {systemDnsRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameDnsRequest,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx
index 6103746b3238b..3af5d401bc3ac 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_endgame_process.tsx
@@ -21,7 +21,6 @@ const SystemEndgameProcessExampleComponent: React.FC = () => {
   return (
     <>
       {systemEndgameProcessRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameCreationEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx
index cb8668536f8d2..d693c7df1b06f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_file.tsx
@@ -21,7 +21,6 @@ const SystemFileExampleComponent: React.FC = () => {
   return (
     <>
       {systemFileRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameFileDeleteEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx
index 12ad132131d1b..257719e573986 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_fim.tsx
@@ -21,7 +21,6 @@ const SystemFimExampleComponent: React.FC = () => {
   return (
     <>
       {systemFimRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameFileCreateEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx
index 8dfb0bf998738..9490a9e776e73 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_security_event.tsx
@@ -19,7 +19,6 @@ const SystemSecurityEventExampleComponent: React.FC = () => {
   return (
     <>
       {systemSecurityEventRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameUserLogon,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx
index 7fa430e812625..47dd0122a47fe 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/system_socket.tsx
@@ -20,7 +20,6 @@ const SystemSocketExampleComponent: React.FC = () => {
   return (
     <>
       {systemSocketRowRenderer.renderRow({
-        browserFields: {},
         data: mockEndgameIpv4ConnectionAcceptEvent,
         isDraggable: false,
         timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx
index 73d458a23ca17..cffa39584a624 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/threat_match.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const ThreatMatchExampleComponent: React.FC = () => (
   <>
     {threatMatchRowRenderer.renderRow({
-      browserFields: {},
       data: mockTimelineData[31].ecs,
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx
index 83d9e0122e971..f47fa275245a6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/examples/zeek.tsx
@@ -14,7 +14,6 @@ import { ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID } from '../constants';
 const ZeekExampleComponent: React.FC = () => (
   <>
     {zeekRowRenderer.renderRow({
-      browserFields: {},
       data: mockTimelineData[13].ecs,
       isDraggable: false,
       timelineId: ROW_RENDERER_BROWSER_EXAMPLE_TIMELINE_ID,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
index ebb807a590124..925b8d5b3027c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
@@ -58,265 +58,256 @@ exports[`Details Panel Component DetailsPanel:EventDetails: rendering it should
   tabType="query"
   timelineId="test"
 >
-  <CasesContextMock
-    owner={
-      Array [
-        "securitySolution",
-      ]
-    }
-    userCanCrud={false}
+  <ExpandableEventTitle
+    handleOnEventClosed={[Function]}
+    isAlert={false}
+    loading={true}
+    ruleName=""
   >
-    <ExpandableEventTitle
-      handleOnEventClosed={[Function]}
-      isAlert={false}
-      loading={true}
-      ruleName=""
+    <Styled(EuiFlexGroup)
+      gutterSize="none"
+      justifyContent="spaceBetween"
+      wrap={true}
     >
-      <Styled(EuiFlexGroup)
+      <EuiFlexGroup
+        className="c0"
         gutterSize="none"
         justifyContent="spaceBetween"
         wrap={true}
       >
-        <EuiFlexGroup
-          className="c0"
-          gutterSize="none"
-          justifyContent="spaceBetween"
-          wrap={true}
+        <div
+          className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
         >
-          <div
-            className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
-              <div
-                className="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
+            />
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <div
+              className="euiFlexItem euiFlexItem--flexGrowZero"
             >
-              <div
-                className="euiFlexItem euiFlexItem--flexGrowZero"
+              <EuiButtonIcon
+                aria-label="close"
+                iconType="cross"
+                onClick={[Function]}
               >
-                <EuiButtonIcon
+                <button
                   aria-label="close"
-                  iconType="cross"
+                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
                   onClick={[Function]}
+                  type="button"
                 >
-                  <button
-                    aria-label="close"
-                    className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                    onClick={[Function]}
-                    type="button"
+                  <EuiIcon
+                    aria-hidden="true"
+                    className="euiButtonIcon__icon"
+                    color="inherit"
+                    size="m"
+                    type="cross"
                   >
-                    <EuiIcon
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       color="inherit"
+                      data-euiicon-type="cross"
                       size="m"
-                      type="cross"
-                    >
-                      <span
-                        aria-hidden="true"
-                        className="euiButtonIcon__icon"
-                        color="inherit"
-                        data-euiicon-type="cross"
-                        size="m"
-                      />
-                    </EuiIcon>
-                  </button>
-                </EuiButtonIcon>
-              </div>
-            </EuiFlexItem>
-          </div>
-        </EuiFlexGroup>
-      </Styled(EuiFlexGroup)>
-    </ExpandableEventTitle>
-    <EuiSpacer
-      size="m"
-    >
-      <div
-        className="euiSpacer euiSpacer--m"
-      />
-    </EuiSpacer>
-    <ExpandableEvent
-      browserFields={Object {}}
-      detailsData={null}
-      event={
-        Object {
-          "eventId": "my-id",
-          "indexName": "my-index",
-        }
+                    />
+                  </EuiIcon>
+                </button>
+              </EuiButtonIcon>
+            </div>
+          </EuiFlexItem>
+        </div>
+      </EuiFlexGroup>
+    </Styled(EuiFlexGroup)>
+  </ExpandableEventTitle>
+  <EuiSpacer
+    size="m"
+  >
+    <div
+      className="euiSpacer euiSpacer--m"
+    />
+  </EuiSpacer>
+  <ExpandableEvent
+    browserFields={Object {}}
+    detailsData={null}
+    event={
+      Object {
+        "eventId": "my-id",
+        "indexName": "my-index",
       }
-      handleOnEventClosed={[Function]}
-      hostRisk={null}
-      isAlert={false}
-      isDraggable={false}
-      loading={true}
-      timelineId="test"
-      timelineTabType="query"
+    }
+    handleOnEventClosed={[Function]}
+    hostRisk={null}
+    isAlert={false}
+    isDraggable={false}
+    loading={true}
+    timelineId="test"
+    timelineTabType="query"
+  >
+    <EuiLoadingContent
+      lines={10}
     >
-      <EuiLoadingContent
-        lines={10}
+      <span
+        className="euiLoadingContent"
       >
         <span
-          className="euiLoadingContent"
+          className="euiLoadingContent__singleLine"
+          key="0"
         >
           <span
-            className="euiLoadingContent__singleLine"
-            key="0"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="1"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="1"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="2"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="2"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="3"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="3"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="4"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="4"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="5"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="5"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="6"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="6"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="7"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="7"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="8"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="8"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
+        </span>
+        <span
+          className="euiLoadingContent__singleLine"
+          key="9"
+        >
           <span
-            className="euiLoadingContent__singleLine"
-            key="9"
-          >
-            <span
-              className="euiLoadingContent__singleLineBackground"
-            />
-          </span>
+            className="euiLoadingContent__singleLineBackground"
+          />
         </span>
-      </EuiLoadingContent>
-    </ExpandableEvent>
-    <Connect(Component)
+      </span>
+    </EuiLoadingContent>
+  </ExpandableEvent>
+  <Connect(Component)
+    detailsData={null}
+    detailsEcsData={null}
+    expandedEvent={
+      Object {
+        "eventId": "my-id",
+        "indexName": "my-index",
+      }
+    }
+    handleOnEventClosed={[Function]}
+    isHostIsolationPanelOpen={false}
+    loadingEventDetails={true}
+    onAddIsolationStatusClick={[Function]}
+    refetchFlyoutData={[Function]}
+    timelineId="test"
+  >
+    <Memo()
       detailsData={null}
       detailsEcsData={null}
+      dispatch={[Function]}
       expandedEvent={
         Object {
           "eventId": "my-id",
           "indexName": "my-index",
         }
       }
+      globalQuery={Array []}
       handleOnEventClosed={[Function]}
       isHostIsolationPanelOpen={false}
       loadingEventDetails={true}
       onAddIsolationStatusClick={[Function]}
       refetchFlyoutData={[Function]}
       timelineId="test"
-    >
-      <Memo()
-        detailsData={null}
-        detailsEcsData={null}
-        dispatch={[Function]}
-        expandedEvent={
-          Object {
-            "eventId": "my-id",
-            "indexName": "my-index",
-          }
-        }
-        globalQuery={Array []}
-        handleOnEventClosed={[Function]}
-        isHostIsolationPanelOpen={false}
-        loadingEventDetails={true}
-        onAddIsolationStatusClick={[Function]}
-        refetchFlyoutData={[Function]}
-        timelineId="test"
-        timelineQuery={
-          Object {
-            "id": "",
-            "inspect": null,
-            "isInspected": false,
-            "loading": false,
-            "refetch": null,
-            "selectedInspectIndex": 0,
-          }
+      timelineQuery={
+        Object {
+          "id": "",
+          "inspect": null,
+          "isInspected": false,
+          "loading": false,
+          "refetch": null,
+          "selectedInspectIndex": 0,
         }
+      }
+    >
+      <EuiFlyoutFooter
+        data-test-subj="side-panel-flyout-footer"
       >
-        <EuiFlyoutFooter
+        <div
+          className="euiFlyoutFooter"
           data-test-subj="side-panel-flyout-footer"
         >
-          <div
-            className="euiFlyoutFooter"
-            data-test-subj="side-panel-flyout-footer"
+          <EuiFlexGroup
+            justifyContent="flexEnd"
           >
-            <EuiFlexGroup
-              justifyContent="flexEnd"
+            <div
+              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
-              <div
-                className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+              <EuiFlexItem
+                grow={false}
               >
-                <EuiFlexItem
-                  grow={false}
-                >
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
-                  />
-                </EuiFlexItem>
-              </div>
-            </EuiFlexGroup>
-          </div>
-        </EuiFlyoutFooter>
-      </Memo()>
-    </Connect(Component)>
-  </CasesContextMock>
+                <div
+                  className="euiFlexItem euiFlexItem--flexGrowZero"
+                />
+              </EuiFlexItem>
+            </div>
+          </EuiFlexGroup>
+        </div>
+      </EuiFlyoutFooter>
+    </Memo()>
+  </Connect(Component)>
 </EventDetailsPanelComponent>
 `;
 
@@ -380,313 +371,6 @@ Array [
         runtimeMappings={Object {}}
         tabType="query"
         timelineId="test"
-      >
-        <CasesContextMock
-          owner={
-            Array [
-              "securitySolution",
-            ]
-          }
-          userCanCrud={false}
-        >
-          <EuiFlyoutHeader
-            hasBorder={false}
-          >
-            <div
-              className="euiFlyoutHeader"
-            >
-              <ExpandableEventTitle
-                isAlert={false}
-                loading={true}
-                ruleName=""
-                timestamp=""
-              >
-                <Styled(EuiFlexGroup)
-                  gutterSize="none"
-                  justifyContent="spaceBetween"
-                  wrap={true}
-                >
-                  <EuiFlexGroup
-                    className="c0"
-                    gutterSize="none"
-                    justifyContent="spaceBetween"
-                    wrap={true}
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
-                    >
-                      <EuiFlexItem
-                        grow={false}
-                      >
-                        <div
-                          className="euiFlexItem euiFlexItem--flexGrowZero"
-                        />
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </Styled(EuiFlexGroup)>
-              </ExpandableEventTitle>
-            </div>
-          </EuiFlyoutHeader>
-          <Styled(EuiFlyoutBody)>
-            <EuiFlyoutBody
-              className="c1"
-            >
-              <div
-                className="euiFlyoutBody c1"
-              >
-                <div
-                  className="euiFlyoutBody__overflow"
-                  tabIndex={0}
-                >
-                  <div
-                    className="euiFlyoutBody__overflowContent"
-                  >
-                    <ExpandableEvent
-                      browserFields={Object {}}
-                      detailsData={null}
-                      event={
-                        Object {
-                          "eventId": "my-id",
-                          "indexName": "my-index",
-                        }
-                      }
-                      handleOnEventClosed={[Function]}
-                      hostRisk={null}
-                      isAlert={false}
-                      isDraggable={false}
-                      loading={true}
-                      timelineId="test"
-                      timelineTabType="flyout"
-                    >
-                      <EuiLoadingContent
-                        lines={10}
-                      >
-                        <span
-                          className="euiLoadingContent"
-                        >
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="0"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="1"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="2"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="3"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="4"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="5"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="6"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="7"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="8"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                          <span
-                            className="euiLoadingContent__singleLine"
-                            key="9"
-                          >
-                            <span
-                              className="euiLoadingContent__singleLineBackground"
-                            />
-                          </span>
-                        </span>
-                      </EuiLoadingContent>
-                    </ExpandableEvent>
-                  </div>
-                </div>
-              </div>
-            </EuiFlyoutBody>
-          </Styled(EuiFlyoutBody)>
-          <Connect(Component)
-            detailsData={null}
-            detailsEcsData={null}
-            expandedEvent={
-              Object {
-                "eventId": "my-id",
-                "indexName": "my-index",
-              }
-            }
-            handleOnEventClosed={[Function]}
-            isHostIsolationPanelOpen={false}
-            loadingEventDetails={true}
-            onAddIsolationStatusClick={[Function]}
-            refetchFlyoutData={[Function]}
-            timelineId="test"
-          >
-            <Memo()
-              detailsData={null}
-              detailsEcsData={null}
-              dispatch={[Function]}
-              expandedEvent={
-                Object {
-                  "eventId": "my-id",
-                  "indexName": "my-index",
-                }
-              }
-              globalQuery={Array []}
-              handleOnEventClosed={[Function]}
-              isHostIsolationPanelOpen={false}
-              loadingEventDetails={true}
-              onAddIsolationStatusClick={[Function]}
-              refetchFlyoutData={[Function]}
-              timelineId="test"
-              timelineQuery={
-                Object {
-                  "id": "",
-                  "inspect": null,
-                  "isInspected": false,
-                  "loading": false,
-                  "refetch": null,
-                  "selectedInspectIndex": 0,
-                }
-              }
-            >
-              <EuiFlyoutFooter
-                data-test-subj="side-panel-flyout-footer"
-              >
-                <div
-                  className="euiFlyoutFooter"
-                  data-test-subj="side-panel-flyout-footer"
-                >
-                  <EuiFlexGroup
-                    justifyContent="flexEnd"
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem
-                        grow={false}
-                      >
-                        <div
-                          className="euiFlexItem euiFlexItem--flexGrowZero"
-                        />
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </EuiFlyoutFooter>
-            </Memo()>
-          </Connect(Component)>
-        </CasesContextMock>
-      </EventDetailsPanelComponent>
-    </div>
-  </EuiFlyout>,
-  .c0 {
-  -webkit-flex: 0 1 auto;
-  -ms-flex: 0 1 auto;
-  flex: 0 1 auto;
-  margin-top: 8px;
-}
-
-.c1 .euiFlyoutBody__overflow {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  overflow: hidden;
-}
-
-.c1 .euiFlyoutBody__overflow .euiFlyoutBody__overflowContent {
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-  overflow: hidden;
-  padding: 0 16px 16px;
-}
-
-<div
-    data-eui="EuiFlyout"
-    data-test-subj="timeline:details-panel:flyout"
-    role="dialog"
-  >
-    <button
-      aria-label="Close this dialog"
-      data-test-subj="euiFlyoutCloseButton"
-      onClick={[Function]}
-      type="button"
-    />
-    <EventDetailsPanelComponent
-      browserFields={Object {}}
-      docValueFields={Array []}
-      expandedEvent={
-        Object {
-          "eventId": "my-id",
-          "indexName": "my-index",
-        }
-      }
-      handleOnEventClosed={[Function]}
-      isDraggable={false}
-      isFlyoutView={true}
-      runtimeMappings={Object {}}
-      tabType="query"
-      timelineId="test"
-    >
-      <CasesContextMock
-        owner={
-          Array [
-            "securitySolution",
-          ]
-        }
-        userCanCrud={false}
       >
         <EuiFlyoutHeader
           hasBorder={false}
@@ -922,7 +606,296 @@ Array [
             </EuiFlyoutFooter>
           </Memo()>
         </Connect(Component)>
-      </CasesContextMock>
+      </EventDetailsPanelComponent>
+    </div>
+  </EuiFlyout>,
+  .c0 {
+  -webkit-flex: 0 1 auto;
+  -ms-flex: 0 1 auto;
+  flex: 0 1 auto;
+  margin-top: 8px;
+}
+
+.c1 .euiFlyoutBody__overflow {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+  overflow: hidden;
+}
+
+.c1 .euiFlyoutBody__overflow .euiFlyoutBody__overflowContent {
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+  overflow: hidden;
+  padding: 0 16px 16px;
+}
+
+<div
+    data-eui="EuiFlyout"
+    data-test-subj="timeline:details-panel:flyout"
+    role="dialog"
+  >
+    <button
+      aria-label="Close this dialog"
+      data-test-subj="euiFlyoutCloseButton"
+      onClick={[Function]}
+      type="button"
+    />
+    <EventDetailsPanelComponent
+      browserFields={Object {}}
+      docValueFields={Array []}
+      expandedEvent={
+        Object {
+          "eventId": "my-id",
+          "indexName": "my-index",
+        }
+      }
+      handleOnEventClosed={[Function]}
+      isDraggable={false}
+      isFlyoutView={true}
+      runtimeMappings={Object {}}
+      tabType="query"
+      timelineId="test"
+    >
+      <EuiFlyoutHeader
+        hasBorder={false}
+      >
+        <div
+          className="euiFlyoutHeader"
+        >
+          <ExpandableEventTitle
+            isAlert={false}
+            loading={true}
+            ruleName=""
+            timestamp=""
+          >
+            <Styled(EuiFlexGroup)
+              gutterSize="none"
+              justifyContent="spaceBetween"
+              wrap={true}
+            >
+              <EuiFlexGroup
+                className="c0"
+                gutterSize="none"
+                justifyContent="spaceBetween"
+                wrap={true}
+              >
+                <div
+                  className="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive euiFlexGroup--wrap c0"
+                >
+                  <EuiFlexItem
+                    grow={false}
+                  >
+                    <div
+                      className="euiFlexItem euiFlexItem--flexGrowZero"
+                    />
+                  </EuiFlexItem>
+                </div>
+              </EuiFlexGroup>
+            </Styled(EuiFlexGroup)>
+          </ExpandableEventTitle>
+        </div>
+      </EuiFlyoutHeader>
+      <Styled(EuiFlyoutBody)>
+        <EuiFlyoutBody
+          className="c1"
+        >
+          <div
+            className="euiFlyoutBody c1"
+          >
+            <div
+              className="euiFlyoutBody__overflow"
+              tabIndex={0}
+            >
+              <div
+                className="euiFlyoutBody__overflowContent"
+              >
+                <ExpandableEvent
+                  browserFields={Object {}}
+                  detailsData={null}
+                  event={
+                    Object {
+                      "eventId": "my-id",
+                      "indexName": "my-index",
+                    }
+                  }
+                  handleOnEventClosed={[Function]}
+                  hostRisk={null}
+                  isAlert={false}
+                  isDraggable={false}
+                  loading={true}
+                  timelineId="test"
+                  timelineTabType="flyout"
+                >
+                  <EuiLoadingContent
+                    lines={10}
+                  >
+                    <span
+                      className="euiLoadingContent"
+                    >
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="0"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="1"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="2"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="3"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="4"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="5"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="6"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="7"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="8"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                      <span
+                        className="euiLoadingContent__singleLine"
+                        key="9"
+                      >
+                        <span
+                          className="euiLoadingContent__singleLineBackground"
+                        />
+                      </span>
+                    </span>
+                  </EuiLoadingContent>
+                </ExpandableEvent>
+              </div>
+            </div>
+          </div>
+        </EuiFlyoutBody>
+      </Styled(EuiFlyoutBody)>
+      <Connect(Component)
+        detailsData={null}
+        detailsEcsData={null}
+        expandedEvent={
+          Object {
+            "eventId": "my-id",
+            "indexName": "my-index",
+          }
+        }
+        handleOnEventClosed={[Function]}
+        isHostIsolationPanelOpen={false}
+        loadingEventDetails={true}
+        onAddIsolationStatusClick={[Function]}
+        refetchFlyoutData={[Function]}
+        timelineId="test"
+      >
+        <Memo()
+          detailsData={null}
+          detailsEcsData={null}
+          dispatch={[Function]}
+          expandedEvent={
+            Object {
+              "eventId": "my-id",
+              "indexName": "my-index",
+            }
+          }
+          globalQuery={Array []}
+          handleOnEventClosed={[Function]}
+          isHostIsolationPanelOpen={false}
+          loadingEventDetails={true}
+          onAddIsolationStatusClick={[Function]}
+          refetchFlyoutData={[Function]}
+          timelineId="test"
+          timelineQuery={
+            Object {
+              "id": "",
+              "inspect": null,
+              "isInspected": false,
+              "loading": false,
+              "refetch": null,
+              "selectedInspectIndex": 0,
+            }
+          }
+        >
+          <EuiFlyoutFooter
+            data-test-subj="side-panel-flyout-footer"
+          >
+            <div
+              className="euiFlyoutFooter"
+              data-test-subj="side-panel-flyout-footer"
+            >
+              <EuiFlexGroup
+                justifyContent="flexEnd"
+              >
+                <div
+                  className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
+                >
+                  <EuiFlexItem
+                    grow={false}
+                  >
+                    <div
+                      className="euiFlexItem euiFlexItem--flexGrowZero"
+                    />
+                  </EuiFlexItem>
+                </div>
+              </EuiFlexGroup>
+            </div>
+          </EuiFlyoutFooter>
+        </Memo()>
+      </Connect(Component)>
     </EventDetailsPanelComponent>
   </div>,
 ]
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx
index ad79e075903a0..55cdcb229bba4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/footer.test.tsx
@@ -14,8 +14,8 @@ import { Ecs } from '../../../../../common/ecs';
 import { mockAlertDetailsData } from '../../../../common/components/event_details/__mocks__';
 import type { TimelineEventsDetailsItem } from '../../../../../common/search_strategy';
 import { KibanaServices, useKibana } from '../../../../common/lib/kibana';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { mockCasesContract } from '../../../../../../cases/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 const ecsData: Ecs = {
   _id: '1',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx
index 5147301b4ea5d..488cd1758565d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.test.tsx
@@ -6,7 +6,7 @@
  */
 import React from 'react';
 import { render } from '@testing-library/react';
-import { EventDetailsPanel } from './';
+import { EventDetailsPanel } from '.';
 import '../../../../common/mock/match_media';
 import { TestProviders } from '../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
@@ -23,8 +23,8 @@ import {
   mockDocValueFields,
   mockRuntimeMappings,
 } from '../../../../common/containers/source/mock';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { coreMock } from '@kbn/core/public/mocks';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
 const ecsData: Ecs = {
   _id: '1',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
index 22d8b9bd2f4aa..a5de47f5e8913 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/event_details/index.tsx
@@ -18,9 +18,8 @@ import React, { useState, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { BrowserFields, DocValueFields } from '../../../../common/containers/source';
-import { useKibana, useGetUserCasesPermissions } from '../../../../common/lib/kibana';
-import { APP_ID } from '../../../../../common/constants';
 import { ExpandableEvent, ExpandableEventTitle } from './expandable_event';
 import { useTimelineEventsDetails } from '../../../containers/details';
 import { TimelineTabs } from '../../../../../common/types/timeline';
@@ -34,7 +33,6 @@ import { getFieldValue } from '../../../../detections/components/host_isolation/
 import { ALERT_DETAILS } from './translations';
 import { useWithCaseDetailsRefresh } from '../../../../common/components/endpoint/host_isolation/endpoint_host_isolation_cases_context';
 import { EventDetailsFooter } from './footer';
-import { EntityType } from '../../../../../../timelines/common';
 import { buildHostNamesFilter } from '../../../../../common/search_strategy';
 import { useHostRiskScore, HostRisk } from '../../../../risk_score/containers';
 
@@ -100,13 +98,6 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
     'isolateHost'
   );
 
-  const {
-    services: { cases },
-  } = useKibana();
-
-  const CasesContext = cases.ui.getCasesContext();
-  const casesPermissions = useGetUserCasesPermissions();
-
   const [isIsolateActionSuccessBannerVisible, setIsIsolateActionSuccessBannerVisible] =
     useState(false);
 
@@ -195,7 +186,7 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
   }
 
   return isFlyoutView ? (
-    <CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
+    <>
       <EuiFlyoutHeader hasBorder={isHostIsolationPanelOpen}>
         {isHostIsolationPanelOpen ? (
           backToAlertDetailsLink
@@ -254,9 +245,9 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
           timelineId={timelineId}
         />
       )}
-    </CasesContext>
+    </>
   ) : (
-    <CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
+    <>
       <ExpandableEventTitle
         isAlert={isAlert}
         loading={loading}
@@ -290,7 +281,7 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
           timelineId={timelineId}
         />
       )}
-    </CasesContext>
+    </>
   );
 };
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
index 4c5f4d048f367..f54b2b2433832 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
@@ -7,8 +7,8 @@
 
 import React, { useMemo, useCallback, useRef } from 'react';
 import { useDispatch } from 'react-redux';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import type { EntityType } from '../../../../../../timelines/common';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
 import { activeTimeline } from '../../../containers/active_timeline_context';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
index 9809a15eee23c..31118e4e66897 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.test.tsx
@@ -17,7 +17,7 @@ import {
   createSecuritySolutionStorageMock,
 } from '../../../common/mock';
 import { createStore, State } from '../../../common/store';
-import { DetailsPanel } from './index';
+import { DetailsPanel } from '.';
 import {
   TimelineExpandedDetail,
   TimelineId,
@@ -26,7 +26,7 @@ import {
 import { FlowTarget } from '../../../../common/search_strategy/security_solution/network';
 import { EventDetailsPanel } from './event_details';
 import { useKibana } from '../../../common/lib/kibana';
-import { mockCasesContext } from '../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
 jest.mock('../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
index b943d3251c476..dee4926cf5bec 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
@@ -10,6 +10,7 @@ import { useDispatch } from 'react-redux';
 import { EuiFlyout, EuiFlyoutProps } from '@elastic/eui';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineActions, timelineSelectors } from '../../store/timeline';
 import { timelineDefaults } from '../../store/timeline/defaults';
 import { BrowserFields, DocValueFields } from '../../../common/containers/source';
@@ -18,7 +19,6 @@ import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { EventDetailsPanel } from './event_details';
 import { HostDetailsPanel } from './host_details';
 import { NetworkDetailsPanel } from './network_details';
-import { EntityType } from '../../../../../timelines/common';
 import { UserDetailsPanel } from './user_details';
 
 interface DetailsPanelProps {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx
index 242767eac2432..440d8280e19aa 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/network_details/expandable_network.tsx
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import React, { useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useInvalidFilterQuery } from '../../../../common/hooks/use_invalid_filter_query';
 import { FlowTarget } from '../../../../../common/search_strategy';
 import { NetworkDetailsLink } from '../../../../common/components/links';
@@ -22,7 +23,6 @@ import { useKibana } from '../../../../common/lib/kibana';
 import { convertToBuildEsQuery } from '../../../../common/lib/keury';
 import { inputsSelectors } from '../../../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../../../common/store/inputs/actions';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { useNetworkDetails } from '../../../../network/containers/details';
 import { networkModel } from '../../../../network/store';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
index 7012cf89896f9..2bcac278f85d9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
@@ -8,8 +8,8 @@
 import React, { MouseEvent } from 'react';
 import { EuiContextMenuItem, EuiButtonIcon, EuiToolTip, EuiText } from '@elastic/eui';
 
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { EventsTdContent } from '../../styles';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 
 interface ActionIconItemProps {
   ariaLabel?: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx
index 0e26edc6ae1c1..2c9a538a96076 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/header_actions.tsx
@@ -16,6 +16,7 @@ import {
 import { useDispatch } from 'react-redux';
 
 import styled from 'styled-components';
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import {
   HeaderActionProps,
   SortDirection,
@@ -28,7 +29,6 @@ import {
   useGlobalFullScreen,
   useTimelineFullScreen,
 } from '../../../../../common/containers/use_full_screen';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 import { StatefulRowRenderersBrowser } from '../../../row_renderers_browser';
 import { EventsTh, EventsThContent } from '../../styles';
 import { EventsSelect } from '../column_headers/events_select';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
index 7a94dcef31cf7..197cf4e1d09a4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
@@ -12,7 +12,7 @@ import { TestProviders, mockTimelineModel, mockTimelineData } from '../../../../
 import { Actions } from '.';
 import { mockTimelines } from '../../../../../common/mock/mock_timelines_plugin';
 import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
-import { mockCasesContract } from '../../../../../../../cases/public/mocks';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../../../detections/components/user_info', () => ({
   useUserData: jest.fn().mockReturnValue([{ canUserCRUD: true, hasIndexWrite: true }]),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
index b319ae12e7613..05815d92b3feb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
@@ -11,6 +11,7 @@ import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elas
 import { noop } from 'lodash/fp';
 import styled from 'styled-components';
 
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { eventHasNotes, getEventType, getPinOnClick } from '../helpers';
 import { AlertContextMenu } from '../../../../../detections/components/alerts_table/timeline_actions/alert_context_menu';
@@ -19,7 +20,6 @@ import { AddEventNoteAction } from './add_note_icon_item';
 import { PinEventAction } from './pin_event_action';
 import { EventsTdContent } from '../../styles';
 import * as i18n from '../translations';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 import { useShallowEqualSelector } from '../../../../../common/hooks/use_selector';
 import {
   setActiveTabTimeline,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
index 9527ad4e3ee44..68773090f06be 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
@@ -8,8 +8,8 @@
 import React, { useMemo } from 'react';
 import { EuiToolTip } from '@elastic/eui';
 
+import { DEFAULT_ACTION_BUTTON_WIDTH } from '@kbn/timelines-plugin/public';
 import { EventsTdContent } from '../../styles';
-import { DEFAULT_ACTION_BUTTON_WIDTH } from '../../../../../../../timelines/public';
 import { eventHasNotes, getPinTooltip } from '../helpers';
 import { Pin } from '../../pin';
 import { TimelineType } from '../../../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx
index 22c0b78885f5d..e3e1d49f2eb9c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx
@@ -8,7 +8,7 @@
 import { mount, shallow } from 'enzyme';
 import React from 'react';
 
-import { ColumnHeaderType } from '../../../../../../timelines/store/timeline/model';
+import { ColumnHeaderType } from '../../../../../store/timeline/model';
 import { defaultHeaders } from '../default_headers';
 
 import { Filter } from '.';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx
index 9df435c277777..e1a193e2a414b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../common/mock/match_media';
-import { getActionsColumnWidth } from '../../../../../../../timelines/public';
+import { getActionsColumnWidth } from '@kbn/timelines-plugin/public';
 import { defaultHeaders } from './default_headers';
 import { mockBrowserFields } from '../../../../../common/containers/source/mock';
 import { Sort } from '../sort';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx
index d1457200bca8a..11e8dd7f4d329 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/control_columns/index.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 
+import { getActionsColumnWidth } from '@kbn/timelines-plugin/public';
 import { ControlColumnProps } from '../../../../../../common/types/timeline';
 import { Actions } from '../actions';
-import { getActionsColumnWidth } from '../../../../../../../timelines/public';
 import * as i18n from '../../../../../common/components/events_viewer/translations';
 
 export const getDefaultControlColumn = (actionButtonCount: number): ControlColumnProps[] => [
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
index d9879cc2e12af..3aa5b2ea7376b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/data_driven_columns/index.tsx
@@ -10,9 +10,9 @@ import React, { useMemo } from 'react';
 import { getOr } from 'lodash/fp';
 import { DRAGGABLE_KEYBOARD_WRAPPER_CLASS_NAME } from '@kbn/securitysolution-t-grid';
 
+import type { SetEventsLoading, SetEventsDeleted } from '@kbn/timelines-plugin/common';
 import { Ecs } from '../../../../../../common/ecs';
 import { TimelineNonEcsData } from '../../../../../../common/search_strategy/timeline';
-import type { SetEventsLoading, SetEventsDeleted } from '../../../../../../../timelines/common';
 import {
   ColumnHeaderOptions,
   CellValueElementProps,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
index ac4a09c01cc06..334bd464f700f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
@@ -19,8 +19,8 @@ import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use
 import { getDefaultControlColumn } from '../control_columns';
 import { testLeadingControlColumn } from '../../../../../common/mock/mock_timeline_control_columns';
 import { mockTimelines } from '../../../../../common/mock/mock_timelines_plugin';
-import { getActionsColumnWidth } from '../../../../../../../timelines/public';
-import { mockCasesContract } from '../../../../../../../cases/public/mocks';
+import { getActionsColumnWidth } from '@kbn/timelines-plugin/public';
+import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
 
 jest.mock('../../../../../common/hooks/use_experimental_features');
 const useIsExperimentalFeatureEnabledMock = useIsExperimentalFeatureEnabled as jest.Mock;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
index 3876b91c8bdaa..ae576e7c81512 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
@@ -7,9 +7,9 @@
 
 import React, { useMemo } from 'react';
 
+import type { SetEventsLoading, SetEventsDeleted } from '@kbn/timelines-plugin/common';
 import { Ecs } from '../../../../../../common/ecs';
 import { TimelineNonEcsData } from '../../../../../../common/search_strategy/timeline';
-import type { SetEventsLoading, SetEventsDeleted } from '../../../../../../../timelines/common';
 import { OnRowSelected } from '../../events';
 import { EventsTrData, EventsTdGroupActions } from '../../styles';
 import { DataDrivenColumns, getMappedNonEcsValue } from '../data_driven_columns';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
index c09de87c87f32..69d97a4e248ea 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { isEmpty } from 'lodash';
 
 import { inputsModel } from '../../../../../common/store';
-import { BrowserFields } from '../../../../../common/containers/source';
 import {
   TimelineItem,
   TimelineNonEcsData,
@@ -31,7 +30,6 @@ const ARIA_ROW_INDEX_OFFSET = 2;
 
 interface Props {
   actionsColumnWidth: number;
-  browserFields: BrowserFields;
   columnHeaders: ColumnHeaderOptions[];
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
   data: TimelineItem[];
@@ -55,7 +53,6 @@ interface Props {
 
 const EventsComponent: React.FC<Props> = ({
   actionsColumnWidth,
-  browserFields,
   columnHeaders,
   containerRef,
   data,
@@ -81,7 +78,6 @@ const EventsComponent: React.FC<Props> = ({
       <StatefulEvent
         actionsColumnWidth={actionsColumnWidth}
         ariaRowindex={i + ARIA_ROW_INDEX_OFFSET}
-        browserFields={browserFields}
         columnHeaders={columnHeaders}
         containerRef={containerRef}
         event={event}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index 3f85551d005d0..1e8835c57d449 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -8,6 +8,8 @@
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
+import type { SetEventsDeleted, SetEventsLoading } from '@kbn/timelines-plugin/common';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { useDeepEqualSelector } from '../../../../../common/hooks/use_selector';
 import {
   ColumnHeaderOptions,
@@ -18,8 +20,6 @@ import {
   TimelineId,
   TimelineTabs,
 } from '../../../../../../common/types/timeline';
-import type { SetEventsDeleted, SetEventsLoading } from '../../../../../../../timelines/common';
-import { BrowserFields } from '../../../../../common/containers/source';
 import {
   TimelineItem,
   TimelineNonEcsData,
@@ -40,12 +40,10 @@ import { StatefulRowRenderer } from './stateful_row_renderer';
 import { NOTES_BUTTON_CLASS_NAME } from '../../properties/helpers';
 import { timelineDefaults } from '../../../../store/timeline/defaults';
 import { useGetMappedNonEcsValue } from '../data_driven_columns';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   actionsColumnWidth: number;
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
-  browserFields: BrowserFields;
   columnHeaders: ColumnHeaderOptions[];
   event: TimelineItem;
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
@@ -78,7 +76,6 @@ EventsTrSupplementContainerWrapper.displayName = 'EventsTrSupplementContainerWra
 
 const StatefulEventComponent: React.FC<Props> = ({
   actionsColumnWidth,
-  browserFields,
   containerRef,
   columnHeaders,
   event,
@@ -236,31 +233,6 @@ const StatefulEventComponent: React.FC<Props> = ({
     [dispatch, timelineId]
   );
 
-  const RowRendererContent = useMemo(
-    () => (
-      <EventsTrSupplement>
-        <StatefulRowRenderer
-          ariaRowindex={ariaRowindex}
-          browserFields={browserFields}
-          containerRef={containerRef}
-          event={event}
-          lastFocusedAriaColindex={lastFocusedAriaColindex}
-          rowRenderers={rowRenderers}
-          timelineId={timelineId}
-        />
-      </EventsTrSupplement>
-    ),
-    [
-      ariaRowindex,
-      browserFields,
-      containerRef,
-      event,
-      lastFocusedAriaColindex,
-      rowRenderers,
-      timelineId,
-    ]
-  );
-
   return (
     <StatefulEventContext.Provider value={activeStatefulEventContext}>
       <EventsTrGroup
@@ -319,7 +291,16 @@ const StatefulEventComponent: React.FC<Props> = ({
             />
           </EventsTrSupplement>
 
-          {RowRendererContent}
+          <EventsTrSupplement>
+            <StatefulRowRenderer
+              ariaRowindex={ariaRowindex}
+              containerRef={containerRef}
+              event={event}
+              lastFocusedAriaColindex={lastFocusedAriaColindex}
+              rowRenderers={rowRenderers}
+              timelineId={timelineId}
+            />
+          </EventsTrSupplement>
         </EventsTrSupplementContainerWrapper>
       </EventsTrGroup>
     </StatefulEventContext.Provider>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
index d71dfcae1b4e6..9d2cd7a03ad55 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
@@ -13,9 +13,8 @@ import {
   ARIA_COLINDEX_ATTRIBUTE,
   ARIA_ROWINDEX_ATTRIBUTE,
   getRowRendererClassName,
-} from '../../../../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { RowRenderer } from '../../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { TimelineItem } from '../../../../../../../common/search_strategy/timeline';
 import { getRowRenderer } from '../../renderers/get_row_renderer';
 import { useStatefulEventFocus } from '../use_stateful_event_focus';
@@ -37,7 +36,6 @@ import * as i18n from '../translations';
  */
 export const StatefulRowRenderer = ({
   ariaRowindex,
-  browserFields,
   containerRef,
   event,
   lastFocusedAriaColindex,
@@ -45,7 +43,6 @@ export const StatefulRowRenderer = ({
   timelineId,
 }: {
   ariaRowindex: number;
-  browserFields: BrowserFields;
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
   event: TimelineItem;
   lastFocusedAriaColindex: number;
@@ -78,7 +75,6 @@ export const StatefulRowRenderer = ({
               </EuiScreenReaderOnly>
               <div onKeyDown={onKeyDown}>
                 {rowRenderer.renderRow({
-                  browserFields,
                   data: event.ecs,
                   isDraggable: true,
                   timelineId,
@@ -90,7 +86,6 @@ export const StatefulRowRenderer = ({
       ),
     [
       ariaRowindex,
-      browserFields,
       event.ecs,
       focusOwnership,
       onFocus,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx
index 3064b29b65640..85a2f0a1e08f2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/use_stateful_event_focus/index.tsx
@@ -13,7 +13,7 @@ import {
   isEscape,
   focusColumn,
   OnColumnFocused,
-} from '../../../../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 
 type FocusOwnership = 'not-owned' | 'owned';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
index 67f67bca5e10f..01953cc1272d6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
@@ -38,7 +38,7 @@ jest.mock('../../../../common/lib/kibana/hooks');
 jest.mock('../../../../common/hooks/use_app_toasts');
 jest.mock('../../../../common/lib/kibana', () => {
   const originalModule = jest.requireActual('../../../../common/lib/kibana');
-  const mockCasesContract = jest.requireActual('../../../../../../cases/public/mocks');
+  const mockCasesContract = jest.requireActual('@kbn/cases-plugin/public/mocks');
   return {
     ...originalModule,
     useKibana: jest.fn().mockReturnValue({
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
index 53a9e3605d9ac..bf4821e132f05 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
@@ -9,15 +9,13 @@ import { noop, isEmpty } from 'lodash/fp';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { APP_ID } from '../../../../../common/constants';
-import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import {
   FIRST_ARIA_INDEX,
   ARIA_COLINDEX_ATTRIBUTE,
   ARIA_ROWINDEX_ATTRIBUTE,
   onKeyDownFocusHandler,
   getActionsColumnWidth,
-} from '../../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { CellValueElementProps } from '../cell_rendering';
 import { DEFAULT_COLUMN_MIN_WIDTH } from './constants';
 import {
@@ -229,65 +227,59 @@ export const StatefulBody = React.memo<Props>(
       },
       [columnHeaders.length, containerRef, data.length]
     );
-    const kibana = useKibana();
-    const casesPermissions = useGetUserCasesPermissions();
-    const CasesContext = kibana.services.cases.ui.getCasesContext();
 
     return (
       <>
         <TimelineBody data-test-subj="timeline-body" ref={containerRef}>
-          <CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
-            <EventsTable
-              $activePage={activePage}
-              $columnCount={columnCount}
-              data-test-subj={`${tabType}-events-table`}
-              columnWidths={totalWidth}
-              onKeyDown={onKeyDown}
-              $rowCount={data.length}
-              $totalPages={totalPages}
-            >
-              <ColumnHeaders
-                actionsColumnWidth={actionsColumnWidth}
-                browserFields={browserFields}
-                columnHeaders={columnHeaders}
-                isEventViewer={isEventViewer}
-                isSelectAllChecked={isSelectAllChecked}
-                onSelectAll={onSelectAll}
-                show={show}
-                showEventsSelect={false}
-                showSelectAllCheckbox={showCheckboxes}
-                sort={sort}
-                tabType={tabType}
-                timelineId={id}
-                leadingControlColumns={leadingControlColumns}
-                trailingControlColumns={trailingControlColumns}
-              />
+          <EventsTable
+            $activePage={activePage}
+            $columnCount={columnCount}
+            data-test-subj={`${tabType}-events-table`}
+            columnWidths={totalWidth}
+            onKeyDown={onKeyDown}
+            $rowCount={data.length}
+            $totalPages={totalPages}
+          >
+            <ColumnHeaders
+              actionsColumnWidth={actionsColumnWidth}
+              browserFields={browserFields}
+              columnHeaders={columnHeaders}
+              isEventViewer={isEventViewer}
+              isSelectAllChecked={isSelectAllChecked}
+              onSelectAll={onSelectAll}
+              show={show}
+              showEventsSelect={false}
+              showSelectAllCheckbox={showCheckboxes}
+              sort={sort}
+              tabType={tabType}
+              timelineId={id}
+              leadingControlColumns={leadingControlColumns}
+              trailingControlColumns={trailingControlColumns}
+            />
 
-              <Events
-                containerRef={containerRef}
-                actionsColumnWidth={actionsColumnWidth}
-                browserFields={browserFields}
-                columnHeaders={columnHeaders}
-                data={data}
-                eventIdToNoteIds={eventIdToNoteIds}
-                id={id}
-                isEventViewer={isEventViewer}
-                lastFocusedAriaColindex={lastFocusedAriaColindex}
-                loadingEventIds={loadingEventIds}
-                onRowSelected={onRowSelected}
-                pinnedEventIds={pinnedEventIds}
-                refetch={refetch}
-                renderCellValue={renderCellValue}
-                rowRenderers={enabledRowRenderers}
-                onRuleChange={onRuleChange}
-                selectedEventIds={selectedEventIds}
-                showCheckboxes={showCheckboxes}
-                leadingControlColumns={leadingControlColumns}
-                trailingControlColumns={trailingControlColumns}
-                tabType={tabType}
-              />
-            </EventsTable>
-          </CasesContext>
+            <Events
+              containerRef={containerRef}
+              actionsColumnWidth={actionsColumnWidth}
+              columnHeaders={columnHeaders}
+              data={data}
+              eventIdToNoteIds={eventIdToNoteIds}
+              id={id}
+              isEventViewer={isEventViewer}
+              lastFocusedAriaColindex={lastFocusedAriaColindex}
+              loadingEventIds={loadingEventIds}
+              onRowSelected={onRowSelected}
+              pinnedEventIds={pinnedEventIds}
+              refetch={refetch}
+              renderCellValue={renderCellValue}
+              rowRenderers={enabledRowRenderers}
+              onRuleChange={onRuleChange}
+              selectedEventIds={selectedEventIds}
+              showCheckboxes={showCheckboxes}
+              leadingControlColumns={leadingControlColumns}
+              trailingControlColumns={trailingControlColumns}
+              tabType={tabType}
+            />
+          </EventsTable>
         </TimelineBody>
         <TimelineBodyGlobalStyle />
       </>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap
index 684764e39848f..12cc57ff09c7d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`GenericRowRenderer #createGenericAuditRowRenderer renders correctly aga
 <span>
   <RowRendererContainer>
     <AuditdGenericDetails
-      browserFields={Object {}}
       contextId="connected-to-test"
       data={
         Object {
@@ -110,7 +109,6 @@ exports[`GenericRowRenderer #createGenericFileRowRenderer renders correctly agai
 <span>
   <RowRendererContainer>
     <AuditdGenericFileDetails
-      browserFields={Object {}}
       contextId="opened-file-test"
       data={
         Object {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx
index e3c82179b91e2..058d8105a4744 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { AuditdGenericDetails, AuditdGenericLine } from './generic_details';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -30,13 +28,10 @@ describe('GenericDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default AuditAcquiredCredsDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <AuditdGenericDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={browserFields}
           data={mockTimelineData[21].ecs}
           timelineId="test"
         />
@@ -50,7 +45,6 @@ describe('GenericDetails', () => {
           <AuditdGenericDetails
             contextId="contextid-123"
             text="generic-text-123"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[19].ecs}
             timelineId="test"
           />
@@ -66,7 +60,6 @@ describe('GenericDetails', () => {
         <AuditdGenericDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={mockBrowserFields}
           data={mockTimelineData[0].ecs}
           timelineId="test"
         />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx
index fb14d44995c95..bfb4b8677d900 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 
@@ -116,7 +115,6 @@ export const AuditdGenericLine = React.memo<Props>(
 AuditdGenericLine.displayName = 'AuditdGenericLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   data: Ecs;
   isDraggable?: boolean;
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
index a4c5944f50623..a28603d827538 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { AuditdGenericFileDetails, AuditdGenericFileLine } from './generic_file_details';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -30,13 +28,10 @@ describe('GenericFileDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default GenericFileDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <AuditdGenericFileDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={browserFields}
           data={mockTimelineData[27].ecs}
           fileIcon="document"
           timelineId="test"
@@ -51,7 +46,6 @@ describe('GenericFileDetails', () => {
           <AuditdGenericFileDetails
             contextId="contextid-123"
             text="generic-text-123"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[19].ecs}
             fileIcon="document"
             timelineId="test"
@@ -68,7 +62,6 @@ describe('GenericFileDetails', () => {
         <AuditdGenericFileDetails
           contextId="contextid-123"
           text="generic-text-123"
-          browserFields={mockBrowserFields}
           data={mockTimelineData[0].ecs}
           fileIcon="document"
           timelineId="test"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx
index 89fbbf751b0ee..dd48571092dec 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer, IconType } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 
@@ -135,7 +134,6 @@ export const AuditdGenericFileLine = React.memo<Props>(
 AuditdGenericFileLine.displayName = 'AuditdGenericFileLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   text: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
index dcfb0efc11455..a5571f9c50b43 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
@@ -10,8 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { RowRenderer } from '../../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -49,10 +47,7 @@ describe('GenericRowRenderer', () => {
       });
     });
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = connectedToRenderer.renderRow({
-        browserFields,
         data: auditd,
         isDraggable: true,
         timelineId: 'test',
@@ -82,7 +77,6 @@ describe('GenericRowRenderer', () => {
 
     test('should render a auditd row', () => {
       const children = connectedToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: auditd,
         isDraggable: true,
         timelineId: 'test',
@@ -113,10 +107,7 @@ describe('GenericRowRenderer', () => {
     });
 
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = fileToRenderer.renderRow({
-        browserFields,
         data: auditdFile,
         isDraggable: true,
         timelineId: 'test',
@@ -146,7 +137,6 @@ describe('GenericRowRenderer', () => {
 
     test('should render a auditd row', () => {
       const children = fileToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: auditdFile,
         isDraggable: true,
         timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
index 8ac1a24c9d389..87baa4aaffac0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
@@ -34,10 +34,9 @@ export const createGenericAuditRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <AuditdGenericDetails
-        browserFields={browserFields}
         data={data}
         isDraggable={isDraggable}
         contextId={`${actionName}-${timelineId}`}
@@ -68,10 +67,9 @@ export const createGenericFileRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <AuditdGenericFileDetails
-        browserFields={browserFields}
         contextId={`${actionName}-${timelineId}`}
         data={data}
         fileIcon={fileIcon}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
index 9dd17ee9ffed9..c10261bfbb3a1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/column_renderer.ts
@@ -7,7 +7,6 @@
 
 import type React from 'react';
 import type { Filter } from '@kbn/es-query';
-import { BrowserFields } from '../../../../../../../timelines/common/search_strategy';
 
 import { ColumnHeaderOptions, RowRenderer } from '../../../../../../common/types';
 import { Ecs } from '../../../../../../common/ecs';
@@ -16,7 +15,6 @@ import { TimelineNonEcsData } from '../../../../../../common/search_strategy/tim
 export interface ColumnRenderer {
   isInstance: (columnName: string, data: TimelineNonEcsData[]) => boolean;
   renderColumn: ({
-    browserFields,
     className,
     columnName,
     eventId,
@@ -31,7 +29,6 @@ export interface ColumnRenderer {
     values,
   }: {
     asPlainText?: boolean;
-    browserFields?: BrowserFields;
     className?: string;
     columnName: string;
     ecsData?: Ecs;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx
index ca15f7f3082a8..8fa827a274fd7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/cti/threat_match_row_renderer.test.tsx
@@ -54,7 +54,6 @@ describe('threatMatchRowRenderer', () => {
   describe('#renderRow', () => {
     it('renders correctly against snapshot', () => {
       const children = threatMatchRowRenderer.renderRow({
-        browserFields: {},
         data: threatMatchData,
         isDraggable: true,
         timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
index 0cf90982c9c31..78a19ba4c1990 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 
 import '../../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../../common/mock';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockEndgameDnsRequest } from '../../../../../../common/mock/mock_endgame_ecs_data';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
 
@@ -32,7 +31,6 @@ describe('DnsRequestEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <DnsRequestEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameDnsRequest}
           timelineId="timeline-id-test"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx
index 90d68eceb7fb3..5c3efba0bc3b6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx
@@ -9,7 +9,6 @@ import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Details } from '../helpers';
 import { Ecs } from '../../../../../../../common/ecs';
 import { NetflowRenderer } from '../netflow';
@@ -17,7 +16,6 @@ import { NetflowRenderer } from '../netflow';
 import { DnsRequestEventDetailsLine } from './dns_request_event_details_line';
 
 interface Props {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
index 438a98e85bb62..b9f3b26feac8b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 
 import '../../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../../common/mock';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import {
   mockEndgameAdminLogon,
   mockEndgameExplicitUserLogon,
@@ -37,7 +36,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameUserLogon}
           timelineId="timeline-id-test"
@@ -53,7 +51,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameAdminLogon}
           timelineId="timeline-id-test"
@@ -69,7 +66,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameExplicitUserLogon}
           timelineId="timeline-id-test"
@@ -85,7 +81,6 @@ describe('EndgameSecurityEventDetails', () => {
     const wrapper = mount(
       <TestProviders>
         <EndgameSecurityEventDetails
-          browserFields={mockBrowserFields}
           contextId="test-context"
           data={mockEndgameUserLogoff}
           timelineId="timeline-id-test"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
index 8f39cf933570f..00d506df424d3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
@@ -9,7 +9,6 @@ import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { NetflowRenderer } from '../netflow';
 
@@ -17,7 +16,6 @@ import { EndgameSecurityEventDetailsLine } from './endgame_security_event_detail
 import { Details } from '../helpers';
 
 interface Props {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index f87c7ae9e58d6..0cc79c6936992 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -17,7 +17,7 @@ import { Bytes, BYTES_FORMAT } from './bytes';
 import { Duration, EVENT_DURATION_FIELD_NAME } from '../../../duration';
 import { getOrEmptyTagFromValue } from '../../../../../common/components/empty_value';
 import { FormattedDate } from '../../../../../common/components/formatted_date';
-import { FormattedIp } from '../../../../components/formatted_ip';
+import { FormattedIp } from '../../../formatted_ip';
 import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { Port } from '../../../../../network/components/port';
 import { PORT_NAMES } from '../../../../../network/components/port/helpers';
@@ -185,6 +185,8 @@ const FormattedFieldValueComponent: React.FC<{
         eventId={eventId}
         fieldName={fieldName}
         isDraggable={isDraggable}
+        isButton={isButton}
+        onClick={onClick}
         linkValue={linkValue}
         title={title}
         truncate={truncate}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx
index 02088b2e7d0cc..04b69cd5fd3ff 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx
@@ -32,17 +32,21 @@ import { useFormatUrl } from '../../../../../common/components/link_to';
 import { useKibana } from '../../../../../common/lib/kibana';
 import { APP_UI_ID } from '../../../../../../common/constants';
 import { LinkAnchor } from '../../../../../common/components/links';
+import { GenericLinkButton } from '../../../../../common/components/links/helpers';
 
 const EventModuleFlexItem = styled(EuiFlexItem)`
   width: 100%;
 `;
 
 interface RenderRuleNameProps {
+  children?: React.ReactNode;
   Component?: typeof EuiButtonEmpty | typeof EuiButtonIcon;
   contextId: string;
   eventId: string;
   fieldName: string;
   isDraggable: boolean;
+  isButton?: boolean;
+  onClick?: () => void;
   linkValue: string | null | undefined;
   truncate?: boolean;
   title?: string;
@@ -50,11 +54,14 @@ interface RenderRuleNameProps {
 }
 
 export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
+  children,
   Component,
   contextId,
   eventId,
   fieldName,
   isDraggable,
+  isButton,
+  onClick,
   linkValue,
   truncate,
   title,
@@ -64,11 +71,6 @@ export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
   const ruleId = linkValue;
   const { search } = useFormatUrl(SecurityPageName.rules);
   const { navigateToApp, getUrlForApp } = useKibana().services.application;
-  const content = truncate ? (
-    <TruncatableText dataTestSubj={`formatted-field-${fieldName}`}>{value}</TruncatableText>
-  ) : (
-    value
-  );
 
   const goToRuleDetails = useCallback(
     (ev) => {
@@ -90,24 +92,59 @@ export const RenderRuleName: React.FC<RenderRuleNameProps> = ({
     [getUrlForApp, ruleId, search]
   );
   const id = `event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}-${ruleId}`;
-
-  if (isString(value) && ruleName.length > 0 && ruleId != null) {
-    const link = Component ? (
-      <Component
-        aria-label={title}
-        data-test-subj={`view-${fieldName}`}
-        iconType="link"
-        onClick={goToRuleDetails}
-        title={title}
-      >
-        {title ?? value}
-      </Component>
+  const link = useMemo(() => {
+    const content = truncate ? (
+      <TruncatableText dataTestSubj={`formatted-field-${fieldName}`}>{value}</TruncatableText>
     ) : (
-      <LinkAnchor onClick={goToRuleDetails} href={href} data-test-subj="ruleName">
-        {content}
-      </LinkAnchor>
+      value
     );
+    if (isButton) {
+      return (
+        <GenericLinkButton
+          Component={Component}
+          dataTestSubj="data-grid-host-details"
+          href={href}
+          iconType="expand"
+          onClick={onClick ?? goToRuleDetails}
+          title={title ?? ruleName}
+        >
+          {children}
+        </GenericLinkButton>
+      );
+    } else if (Component) {
+      return (
+        <Component
+          aria-label={title}
+          data-test-subj={`view-${fieldName}`}
+          iconType="link"
+          onClick={goToRuleDetails}
+          title={title}
+        >
+          {title ?? value}
+        </Component>
+      );
+    } else {
+      return (
+        <LinkAnchor onClick={goToRuleDetails} href={href} data-test-subj="ruleName">
+          {content}
+        </LinkAnchor>
+      );
+    }
+  }, [
+    Component,
+    children,
+    fieldName,
+    goToRuleDetails,
+    href,
+    isButton,
+    onClick,
+    ruleName,
+    title,
+    truncate,
+    value,
+  ]);
 
+  if (isString(value) && ruleName.length > 0 && ruleId != null) {
     return isDraggable ? (
       <DefaultDraggable
         field={fieldName}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx
index edc2f2c0e4690..73bfdfc283361 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx
@@ -11,7 +11,6 @@ import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
 import '../../../../../common/mock/match_media';
-import { mockBrowserFields } from '../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../common/ecs';
 import { mockTimelineData } from '../../../../../common/mock';
 import { TestProviders } from '../../../../../common/mock/test_providers';
@@ -57,7 +56,6 @@ describe('get_column_renderer', () => {
   test('renders correctly against snapshot', () => {
     const rowRenderer = getRowRenderer(nonSuricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: nonSuricata,
       isDraggable: true,
       timelineId: 'test',
@@ -70,7 +68,6 @@ describe('get_column_renderer', () => {
   test('should render plain row data when it is a non suricata row', () => {
     const rowRenderer = getRowRenderer(nonSuricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: nonSuricata,
       isDraggable: true,
       timelineId: 'test',
@@ -86,7 +83,6 @@ describe('get_column_renderer', () => {
   test('should render a suricata row data when it is a suricata row', () => {
     const rowRenderer = getRowRenderer(suricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
@@ -105,7 +101,6 @@ describe('get_column_renderer', () => {
     suricata.event = { ...suricata.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(suricata, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
@@ -124,7 +119,6 @@ describe('get_column_renderer', () => {
     zeek.event = { ...zeek.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(zeek, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: zeek,
       isDraggable: true,
       timelineId: 'test',
@@ -143,7 +137,6 @@ describe('get_column_renderer', () => {
     system.event = { ...system.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(system, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: system,
       isDraggable: true,
       timelineId: 'test',
@@ -162,7 +155,6 @@ describe('get_column_renderer', () => {
     auditd.event = { ...auditd.event, ...{ category: ['network_traffic'] } };
     const rowRenderer = getRowRenderer(auditd, defaultRowRenderers);
     const row = rowRenderer?.renderRow({
-      browserFields: mockBrowserFields,
       data: auditd,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
index 6f2f6c28ecfbe..e8c4c54f868a0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
@@ -11,7 +11,7 @@ import { waitFor } from '@testing-library/react';
 import { HostName } from './host_name';
 import { TestProviders } from '../../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../../common/types';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { timelineActions } from '../../../../store/timeline';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
index 5864e144a681e..2673304d2deb8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useContext, useMemo } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { HostDetailsLink } from '../../../../../common/components/links';
 import {
   TimelineId,
@@ -20,7 +21,6 @@ import { getEmptyTagValue } from '../../../../../common/components/empty_value';
 import { TruncatableText } from '../../../../../common/components/truncatable_text';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 import { timelineActions } from '../../../../store/timeline';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
index 01e05bbc365e9..f2f95dec90144 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { getMockNetflowData, TestProviders } from '../../../../../../common/mock';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -34,9 +32,7 @@ describe('netflowRowRenderer', () => {
   const mount = useMountAppended();
 
   test('renders correctly against snapshot', () => {
-    const browserFields: BrowserFields = {};
     const children = netflowRowRenderer.renderRow({
-      browserFields,
       data: getMockNetflowData(),
       isDraggable: true,
       timelineId: 'test',
@@ -106,7 +102,6 @@ describe('netflowRowRenderer', () => {
 
   test('should render netflow data', () => {
     const children = netflowRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: getMockNetflowData(),
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx
index f28c72253a4e7..da5a71d4c12f8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx
@@ -9,7 +9,6 @@ import { mount, shallow } from 'enzyme';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 
-import { mockBrowserFields } from '../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../common/ecs';
 import { mockTimelineData } from '../../../../../common/mock';
 import { plainRowRenderer } from './plain_row_renderer';
@@ -22,7 +21,6 @@ describe('plain_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: true,
       timelineId: 'test',
@@ -37,7 +35,6 @@ describe('plain_row_renderer', () => {
 
   test('should render a plain row', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
index f71db57c1b42a..77caaabcae3ba 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.test.tsx
@@ -14,11 +14,10 @@ import { reasonColumnRenderer } from './reason_column_renderer';
 import { plainColumnRenderer } from './plain_column_renderer';
 
 import { RowRendererId, ColumnHeaderOptions, RowRenderer } from '../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/search_strategy';
 
 import { render } from '@testing-library/react';
-import { TestProviders } from '../../../../../../../timelines/public/mock';
-import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../../timelines/public/components';
+import { TestProviders } from '@kbn/timelines-plugin/public/mock';
+import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '@kbn/timelines-plugin/public/components';
 import { cloneDeep } from 'lodash';
 jest.mock('./plain_column_renderer');
 
@@ -61,7 +60,6 @@ const rowRenderers: RowRenderer[] = [
     renderRow: () => <span data-test-subj="test-row-render" />,
   },
 ];
-const browserFields: BrowserFields = {};
 
 const defaultProps = {
   columnName: REASON_FIELD_NAME,
@@ -83,19 +81,18 @@ describe('reasonColumnRenderer', () => {
   });
 
   describe('renderColumn', () => {
-    it('calls `plainColumnRenderer.renderColumn` when ecsData, rowRenderers or browserFields is empty', () => {
+    it('calls `plainColumnRenderer.renderColumn` when ecsData, or rowRenderers is empty', () => {
       reasonColumnRenderer.renderColumn(defaultProps);
 
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(1);
     });
 
-    it("doesn't call `plainColumnRenderer.renderColumn` in expanded value when ecsData, rowRenderers or browserFields fields are not empty", () => {
+    it("doesn't call `plainColumnRenderer.renderColumn` in expanded value when ecsData, or rowRenderers fields are not empty", () => {
       reasonColumnRenderer.renderColumn({
         ...defaultProps,
         isDetails: true,
         ecsData: invalidEcs,
         rowRenderers,
-        browserFields,
       });
 
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(0);
@@ -107,7 +104,6 @@ describe('reasonColumnRenderer', () => {
         isDetails: false,
         ecsData: invalidEcs,
         rowRenderers,
-        browserFields,
       });
 
       expect(plainColumnRenderer.renderColumn).toBeCalledTimes(1);
@@ -119,7 +115,6 @@ describe('reasonColumnRenderer', () => {
         isDetails: true,
         ecsData: invalidEcs,
         rowRenderers,
-        browserFields,
       });
 
       const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
@@ -133,7 +128,6 @@ describe('reasonColumnRenderer', () => {
         isDetails: true,
         ecsData: validEcs,
         rowRenderers,
-        browserFields,
       });
 
       const wrapper = render(<TestProviders>{renderedColumn}</TestProviders>);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
index a5ba7360c966f..72fbc7be19dd2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/reason_column_renderer.tsx
@@ -10,7 +10,6 @@ import { isEqual } from 'lodash/fp';
 import React, { useMemo } from 'react';
 
 import { ColumnHeaderOptions, RowRenderer } from '../../../../../../common/types';
-import { BrowserFields } from '../../../../../../common/search_strategy';
 import { Ecs } from '../../../../../../common/ecs';
 import { eventRendererNames } from '../../../row_renderers_browser/catalog/constants';
 import { ColumnRenderer } from './column_renderer';
@@ -23,7 +22,6 @@ export const reasonColumnRenderer: ColumnRenderer = {
   isInstance: isEqual(REASON_FIELD_NAME),
 
   renderColumn: ({
-    browserFields,
     columnName,
     ecsData,
     eventId,
@@ -36,7 +34,6 @@ export const reasonColumnRenderer: ColumnRenderer = {
     truncate,
     values,
   }: {
-    browserFields?: BrowserFields;
     columnName: string;
     ecsData?: Ecs;
     eventId: string;
@@ -49,10 +46,9 @@ export const reasonColumnRenderer: ColumnRenderer = {
     truncate?: boolean;
     values: string[] | undefined | null;
   }) => {
-    if (isDetails && values && ecsData && rowRenderers && browserFields) {
+    if (isDetails && values && ecsData && rowRenderers) {
       return values.map((value, i) => (
         <ReasonCell
-          browserFields={browserFields}
           ecsData={ecsData}
           key={`reason-column-renderer-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}-${i}`}
           rowRenderers={rowRenderers}
@@ -81,21 +77,19 @@ const ReasonCell: React.FC<{
   timelineId: string;
   ecsData: Ecs;
   rowRenderers: RowRenderer[];
-  browserFields: BrowserFields;
-}> = ({ ecsData, rowRenderers, browserFields, timelineId, value }) => {
+}> = ({ ecsData, rowRenderers, timelineId, value }) => {
   const rowRenderer = useMemo(() => getRowRenderer(ecsData, rowRenderers), [ecsData, rowRenderers]);
 
   const rowRender = useMemo(() => {
     return (
       rowRenderer &&
       rowRenderer.renderRow({
-        browserFields,
         data: ecsData,
         isDraggable: false,
         timelineId,
       })
     );
-  }, [rowRenderer, browserFields, ecsData, timelineId]);
+  }, [rowRenderer, ecsData, timelineId]);
 
   return (
     <>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap
index d6fccadf02e9d..36f62dc5ff728 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap
@@ -4,596 +4,6 @@ exports[`suricata_row_renderer renders correctly against snapshot 1`] = `
 <span>
   <RowRendererContainer>
     <SuricataDetails
-      browserFields={
-        Object {
-          "agent": Object {
-            "fields": Object {
-              "agent.ephemeral_id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-                "example": "8a4f500f",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.ephemeral_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.hostname": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.hostname",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-                "example": "8a4f500d",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.name": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-                "example": "foo",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "auditd": Object {
-            "fields": Object {
-              "auditd.data.a0": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a0",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a1": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a1",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a2": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a2",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "base": Object {
-            "fields": Object {
-              "@timestamp": Object {
-                "aggregatable": true,
-                "category": "base",
-                "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-                "example": "2016-05-23T08:05:34.853Z",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "@timestamp",
-                "readFromDocValues": true,
-                "searchable": true,
-                "type": "date",
-              },
-              "_id": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "Each document has an _id that uniquely identifies it",
-                "example": "Y-6TfmcB0WOhS6qyMv3s",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "message": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-                "example": "Hello World",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "message",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "client": Object {
-            "fields": Object {
-              "client.address": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.bytes": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Bytes sent from the client to the server.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "client.domain": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Client domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.geo.country_iso_code": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Country ISO code.",
-                "example": "CA",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.geo.country_iso_code",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "cloud": Object {
-            "fields": Object {
-              "cloud.account.id": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-                "example": "666777888999",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.account.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "cloud.availability_zone": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "Availability zone in which this host is running.",
-                "example": "us-east-1c",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.availability_zone",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "container": Object {
-            "fields": Object {
-              "container.id": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Unique container id.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.name": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Name of the image the container was built on.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.name",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.tag": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Container image tag.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.tag",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "destination": Object {
-            "fields": Object {
-              "destination.address": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.bytes": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Bytes sent from the destination to the source.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "destination.domain": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Destination domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.ip": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "destination.port": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Port of the destination.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "event": Object {
-            "fields": Object {
-              "event.action": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-                "example": "user-password-change",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.action",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.category": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-                "example": "authentication",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.category",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.end": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "event.end contains the date when the event ended or when the activity was last observed.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.end",
-                "searchable": true,
-                "type": "date",
-              },
-              "event.severity": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-                "example": 7,
-                "format": "number",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.severity",
-                "searchable": true,
-                "type": "number",
-              },
-            },
-          },
-          "host": Object {
-            "fields": Object {
-              "host.name": Object {
-                "aggregatable": true,
-                "category": "host",
-                "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "host.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "nestedField": Object {
-            "fields": Object {
-              "nestedField.firstAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.firstAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-              "nestedField.secondAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.secondAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-            },
-          },
-          "source": Object {
-            "fields": Object {
-              "source.ip": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "source.port": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "Port of the source.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "user": Object {
-            "fields": Object {
-              "user.name": Object {
-                "aggregatable": true,
-                "category": "user",
-                "description": "Short name or login of the user.",
-                "example": "albert",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "user.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-        }
-      }
       data={
         Object {
           "_id": "1",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx
index f8693d4a4f8ea..2a4e82a183999 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx
@@ -9,7 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData } from '../../../../../../common/mock';
 import '../../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../../common/mock/test_providers';
@@ -33,24 +32,14 @@ describe('SuricataDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default SuricataDetails', () => {
-      const wrapper = shallow(
-        <SuricataDetails
-          data={mockTimelineData[2].ecs}
-          browserFields={mockBrowserFields}
-          timelineId="test"
-        />
-      );
+      const wrapper = shallow(<SuricataDetails data={mockTimelineData[2].ecs} timelineId="test" />);
       expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns text if the data does contain suricata data', () => {
       const wrapper = mount(
         <TestProviders>
-          <SuricataDetails
-            data={mockTimelineData[2].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <SuricataDetails data={mockTimelineData[2].ecs} timelineId="test" />
         </TestProviders>
       );
       const removeEuiIconText = removeExternalLinkText(wrapper.text()).replaceAll(
@@ -63,13 +52,7 @@ describe('SuricataDetails', () => {
     });
 
     test('it returns null for text if the data contains no suricata data', () => {
-      const wrapper = shallow(
-        <SuricataDetails
-          data={mockTimelineData[0].ecs}
-          browserFields={mockBrowserFields}
-          timelineId="test"
-        />
-      );
+      const wrapper = shallow(<SuricataDetails data={mockTimelineData[0].ecs} timelineId="test" />);
       expect(wrapper.isEmptyRender()).toBeTruthy();
     });
   });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx
index f096cd906f619..08eeb4248b6b6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx
@@ -10,7 +10,6 @@ import { get } from 'lodash/fp';
 import React from 'react';
 import styled from 'styled-components';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 
 import { NetflowRenderer } from '../netflow';
@@ -24,7 +23,6 @@ const Details = styled.div`
 Details.displayName = 'Details';
 
 export const SuricataDetails = React.memo<{
-  browserFields: BrowserFields;
   data: Ecs;
   isDraggable?: boolean;
   timelineId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
index 2022904e548aa..bde4fb7f592aa 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
@@ -10,7 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { mockTimelineData } from '../../../../../../common/mock';
 import '../../../../../../common/mock/match_media';
@@ -42,7 +41,6 @@ describe('suricata_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = suricataRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: nonSuricata,
       isDraggable: true,
       timelineId: 'test',
@@ -62,7 +60,6 @@ describe('suricata_row_renderer', () => {
 
   test('should render a suricata row', () => {
     const children = suricataRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
@@ -85,7 +82,6 @@ describe('suricata_row_renderer', () => {
   test('should render a suricata row even if it does not have a suricata signature', () => {
     delete suricata?.suricata?.eve?.alert?.signature;
     const children = suricataRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: suricata,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
index 887ffdd9584a5..303e0e3f78ba1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
@@ -19,14 +19,9 @@ export const suricataRowRenderer: RowRenderer = {
     const module: string | null | undefined = get('event.module[0]', ecs);
     return module != null && module.toLowerCase() === 'suricata';
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
-      <SuricataDetails
-        data={data}
-        browserFields={browserFields}
-        isDraggable={isDraggable}
-        timelineId={timelineId}
-      />
+      <SuricataDetails data={data} isDraggable={isDraggable} timelineId={timelineId} />
     </RowRendererContainer>
   ),
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap
index 15443058f434e..99d495f3cd96d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`GenericRowRenderer #createGenericFileRowRenderer renders correctly agai
 <span>
   <RowRendererContainer>
     <SystemGenericFileDetails
-      browserFields={Object {}}
       contextId="user_login-test"
       data={
         Object {
@@ -68,7 +67,6 @@ exports[`GenericRowRenderer #createGenericSystemRowRenderer renders correctly ag
 <span>
   <RowRendererContainer>
     <SystemGenericDetails
-      browserFields={Object {}}
       contextId="process_started-test"
       data={
         Object {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx
index 16874b30de835..d9235a5056f3d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 
 import '../../../../../../common/mock/match_media';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { SystemGenericDetails, SystemGenericLine } from './generic_details';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
@@ -32,13 +30,10 @@ describe('SystemGenericDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default SystemGenericDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <SystemGenericDetails
           contextId="[contextid-123]"
           text="[generic-text-123]"
-          browserFields={browserFields}
           data={mockTimelineData[28].ecs}
           timelineId="test"
         />
@@ -52,7 +47,6 @@ describe('SystemGenericDetails', () => {
           <SystemGenericDetails
             contextId="[contextid-123]"
             text="[generic-text-123]"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[28].ecs}
             timelineId="test"
           />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx
index 2cf42ecc9c670..10b2c39ab74ca 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 import { OverflowField } from '../../../../../../common/components/tables/helpers';
@@ -141,7 +140,6 @@ export const SystemGenericLine = React.memo<Props>(
 SystemGenericLine.displayName = 'SystemGenericLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx
index 20a635a16bbaf..ff6ebcbd9ddde 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx
@@ -8,8 +8,6 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import '../../../../../../common/mock/match_media';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { mockEndgameCreationEvent } from '../../../../../../common/mock/mock_endgame_ecs_data';
@@ -43,13 +41,10 @@ describe('SystemGenericFileDetails', () => {
 
   describe('rendering', () => {
     test('it renders the default SystemGenericDetails', () => {
-      // I cannot and do not want to use BrowserFields for the mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const wrapper = shallow(
         <SystemGenericFileDetails
           contextId="[contextid-123]"
           text="[generic-text-123]"
-          browserFields={browserFields}
           data={mockTimelineData[29].ecs}
           timelineId="test"
         />
@@ -63,7 +58,6 @@ describe('SystemGenericFileDetails', () => {
           <SystemGenericFileDetails
             contextId="[contextid-123]"
             text="[generic-text-123]"
-            browserFields={mockBrowserFields}
             data={mockTimelineData[29].ecs}
             timelineId="test"
           />
@@ -80,7 +74,6 @@ describe('SystemGenericFileDetails', () => {
           <SystemGenericFileDetails
             contextId="[contextid-123]"
             text="[generic-text-123]"
-            browserFields={mockBrowserFields}
             data={mockEndgameCreationEvent}
             timelineId="test"
           />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx
index 9722f36e42eb0..d1a29dad8cf23 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx
@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 import { DraggableBadge } from '../../../../../../common/components/draggables';
 import { OverflowField } from '../../../../../../common/components/tables/helpers';
@@ -251,7 +250,6 @@ export const SystemGenericFileLine = React.memo<Props>(
 SystemGenericFileLine.displayName = 'SystemGenericFileLine';
 
 interface GenericDetailsProps {
-  browserFields: BrowserFields;
   contextId: string;
   data: Ecs;
   isDraggable?: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index 4b93c5accb590..3b2b17fc4cc38 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -10,8 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { BrowserFields } from '../../../../../../common/containers/source';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import {
   mockDnsEvent,
@@ -118,10 +116,7 @@ describe('GenericRowRenderer', () => {
       });
     });
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = connectedToRenderer.renderRow({
-        browserFields,
         data: system,
         isDraggable: true,
         timelineId: 'test',
@@ -151,7 +146,6 @@ describe('GenericRowRenderer', () => {
     });
     test('should render a system row', () => {
       const children = connectedToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: system,
         isDraggable: true,
         timelineId: 'test',
@@ -182,10 +176,7 @@ describe('GenericRowRenderer', () => {
     });
 
     test('renders correctly against snapshot', () => {
-      // I cannot and do not want to use BrowserFields mocks for the snapshot tests as they are too heavy
-      const browserFields: BrowserFields = {};
       const children = fileToRenderer.renderRow({
-        browserFields,
         data: systemFile,
         isDraggable: true,
         timelineId: 'test',
@@ -214,7 +205,6 @@ describe('GenericRowRenderer', () => {
 
     test('should render a system row', () => {
       const children = fileToRenderer.renderRow({
-        browserFields: mockBrowserFields,
         data: systemFile,
         isDraggable: true,
         timelineId: 'test',
@@ -246,7 +236,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileCreationMalwarePreventionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileCreationMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -274,7 +263,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileCreationMalwareDetectionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileCreationMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -304,7 +292,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFilesEncryptedRansomwarePreventionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFilesEncryptedRansomwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -334,7 +321,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFilesEncryptedRansomwareDetectionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFilesEncryptedRansomwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -364,7 +350,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFileModificationMalwarePreventionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileModificationMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -394,7 +379,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointFileModificationMalwareDetectionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileModificationMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -422,7 +406,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileRenameMalwarePreventionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileRenameMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -450,7 +433,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointAlertsRowRenderer.isInstance(mockEndpointFileRenameMalwareDetectionAlert) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileRenameMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -480,7 +462,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointProcessExecutionMalwarePreventionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessExecutionMalwarePreventionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -510,7 +491,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointProcessExecutionMalwareDetectionAlert
           ) &&
             endpointAlertsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessExecutionMalwareDetectionAlert,
               isDraggable: true,
               timelineId: 'test',
@@ -538,7 +518,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessExecEvent) &&
             endpointProcessStartRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessExecEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -564,7 +543,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessForkEvent) &&
             endpointProcessStartRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessForkEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -590,7 +568,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessStartEvent) &&
             endpointProcessStartRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessStartEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -619,7 +596,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -645,7 +621,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointProcessEndRowRenderer.isInstance(mockEndpointProcessEndEvent) &&
             endpointProcessEndRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointProcessEndEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -674,7 +649,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessTerminationEventRowRenderer.isInstance(endgameTerminationEvent) &&
             endgameProcessTerminationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameTerminationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -703,7 +677,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -734,7 +707,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -765,7 +737,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameProcessCreationEventRowRenderer.isInstance(endgameCreationEvent) &&
             endgameProcessCreationEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -791,7 +762,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileCreationRowRenderer.isInstance(mockEndpointFileCreationEvent) &&
             endpointFileCreationRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileCreationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -820,7 +790,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileCreateEventRowRenderer.isInstance(endgameFileCreateEvent) &&
             endgameFileCreateEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileCreateEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -846,7 +815,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileDeletionRowRenderer.isInstance(mockEndpointFileDeletionEvent) &&
             endpointFileDeletionRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileDeletionEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -872,7 +840,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileModificationRowRenderer.isInstance(mockEndpointFileModificationEvent) &&
             endpointFileModificationRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileModificationEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -898,7 +865,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileOverwriteRowRenderer.isInstance(mockEndpointFileOverwriteEvent) &&
             endpointFileOverwriteRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileOverwriteEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -924,7 +890,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointFileRenameRowRenderer.isInstance(mockEndpointFileRenameEvent) &&
             endpointFileRenameRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointFileRenameEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -953,7 +918,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileDeleteEventRowRenderer.isInstance(endgameFileDeleteEvent) &&
             endgameFileDeleteEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileDeleteEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -982,7 +946,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {fileCreatedEventRowRenderer.isInstance(fimFileCreatedEvent) &&
             fileCreatedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: fimFileCreatedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1009,7 +972,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {fileDeletedEventRowRenderer.isInstance(fimFileDeletedEvent) &&
             fileDeletedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: fimFileDeletedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1038,7 +1000,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileCreateEventRowRenderer.isInstance(endgameFileCreateEvent) &&
             endgameFileCreateEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileCreateEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1069,7 +1030,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameFileCreateEventRowRenderer.isInstance(endgameFileCreateEvent) &&
             endgameFileCreateEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: endgameFileCreateEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1100,7 +1060,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {fileCreatedEventRowRenderer.isInstance(fimFileCreatedEvent) &&
             fileCreatedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: fimFileCreatedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1128,7 +1087,6 @@ describe('GenericRowRenderer', () => {
             mockEndpointNetworkConnectionAcceptedEvent
           ) &&
             endpointConnectionAcceptedRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkConnectionAcceptedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1157,7 +1115,6 @@ describe('GenericRowRenderer', () => {
               mockEndpointRegistryModificationEvent
             ) &&
               endpointRegistryModificationRowRenderer.renderRow({
-                browserFields: mockBrowserFields,
                 data: mockEndpointRegistryModificationEvent,
                 isDraggable: true,
                 timelineId: 'test',
@@ -1185,7 +1142,6 @@ describe('GenericRowRenderer', () => {
           <TestProviders>
             {endpointLibraryLoadRowRenderer.isInstance(mockEndpointLibraryLoadEvent) &&
               endpointLibraryLoadRowRenderer.renderRow({
-                browserFields: mockBrowserFields,
                 data: mockEndpointLibraryLoadEvent,
                 isDraggable: true,
                 timelineId: 'test',
@@ -1212,7 +1168,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointHttpRequestEventRowRenderer.isInstance(mockEndpointNetworkHttpRequestEvent) &&
             endpointHttpRequestEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkHttpRequestEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1241,7 +1196,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv4ConnectionAcceptEventRowRenderer.isInstance(ipv4ConnectionAcceptEvent) &&
             endgameIpv4ConnectionAcceptEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv4ConnectionAcceptEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1270,7 +1224,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv6ConnectionAcceptEventRowRenderer.isInstance(ipv6ConnectionAcceptEvent) &&
             endgameIpv6ConnectionAcceptEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv6ConnectionAcceptEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1296,7 +1249,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endpointDisconnectReceivedRowRenderer.isInstance(mockEndpointDisconnectReceivedEvent) &&
             endpointDisconnectReceivedRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointDisconnectReceivedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1325,7 +1277,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv4DisconnectReceivedEventRowRenderer.isInstance(ipv4DisconnectReceivedEvent) &&
             endgameIpv4DisconnectReceivedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv4DisconnectReceivedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1354,7 +1305,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv6DisconnectReceivedEventRowRenderer.isInstance(ipv6DisconnectReceivedEvent) &&
             endgameIpv6DisconnectReceivedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv6DisconnectReceivedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1383,7 +1333,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {socketOpenedEventRowRenderer.isInstance(socketOpenedEvent) &&
             socketOpenedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: socketOpenedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1412,7 +1361,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {socketClosedEventRowRenderer.isInstance(socketClosedEvent) &&
             socketClosedEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: socketClosedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1441,7 +1389,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {endgameIpv4ConnectionAcceptEventRowRenderer.isInstance(ipv4ConnectionAcceptEvent) &&
             endgameIpv4ConnectionAcceptEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: ipv4ConnectionAcceptEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1463,7 +1410,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {securityLogOnRowRenderer.isInstance(mockEndpointSecurityLogOnSuccessEvent) &&
             securityLogOnRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointSecurityLogOnSuccessEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1485,7 +1431,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {securityLogOnRowRenderer.isInstance(mockEndpointSecurityLogOnFailureEvent) &&
             securityLogOnRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointSecurityLogOnFailureEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1510,7 +1455,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {userLogonEventRowRenderer.isInstance(userLogonEvent) &&
             userLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: userLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1535,7 +1479,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {adminLogonEventRowRenderer.isInstance(adminLogonEvent) &&
             adminLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: adminLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1560,7 +1503,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {explicitUserLogonEventRowRenderer.isInstance(explicitUserLogonEvent) &&
             explicitUserLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: explicitUserLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1582,7 +1524,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {securityLogOffRowRenderer.isInstance(mockEndpointSecurityLogOffEvent) &&
             securityLogOffRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointSecurityLogOffEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1607,7 +1548,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {userLogoffEventRowRenderer.isInstance(userLogoffEvent) &&
             userLogoffEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: userLogoffEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1632,7 +1572,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {userLogonEventRowRenderer.isInstance(userLogonEvent) &&
             userLogonEventRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: userLogonEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1652,7 +1591,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(mockEndpointNetworkLookupRequestedEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkLookupRequestedEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1672,7 +1610,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(mockEndpointNetworkLookupResultEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: mockEndpointNetworkLookupResultEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1696,7 +1633,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(requestEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: requestEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1720,7 +1656,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(dnsEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: dnsEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1750,7 +1685,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(requestEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: requestEvent,
               isDraggable: true,
               timelineId: 'test',
@@ -1778,7 +1712,6 @@ describe('GenericRowRenderer', () => {
         <TestProviders>
           {dnsRowRenderer.isInstance(requestEvent) &&
             dnsRowRenderer.renderRow({
-              browserFields: mockBrowserFields,
               data: requestEvent,
               isDraggable: true,
               timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx
index ba791aae4b86c..36ba6adb06917 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx
@@ -38,10 +38,9 @@ export const createGenericSystemRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericDetails
-        browserFields={browserFields}
         contextId={`${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -70,10 +69,9 @@ export const createEndgameProcessRowRenderer = ({
       action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         data={data}
         contextId={`endgame-process-${actionName}-${timelineId}`}
         isDraggable={isDraggable}
@@ -102,10 +100,9 @@ export const createFimRowRenderer = ({
       action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         data={data}
         contextId={`fim-${actionName}-${timelineId}`}
         isDraggable={isDraggable}
@@ -152,10 +149,9 @@ export const createEndpointAlertsRowRenderer = ({
       eventActionMatches
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`endpoint-alerts-row-renderer-${eventAction}-${eventCategory}-${eventType}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -184,10 +180,9 @@ export const createEndpointLibraryRowRenderer = ({
       dataset?.toLowerCase() === 'endpoint.events.library' && action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`library-row-renderer-${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -217,10 +212,9 @@ export const createGenericFileRowRenderer = ({
       action.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -243,10 +237,9 @@ export const createSocketRowRenderer = ({
     const action: string | null | undefined = get('event.action[0]', ecs);
     return action != null && action.toLowerCase() === actionName;
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <SystemGenericFileDetails
-        browserFields={browserFields}
         contextId={`socket-${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -273,10 +266,9 @@ export const createSecurityEventRowRenderer = ({
       action?.toLowerCase() === actionName
     );
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <EndgameSecurityEventDetails
-        browserFields={browserFields}
         contextId={`authentication-${actionName}-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
@@ -293,10 +285,9 @@ export const createDnsRowRenderer = (): RowRenderer => ({
     const dnsQuestionName: string | null | undefined = get('dns.question.name[0]', ecs);
     return !isNillEmptyOrNotFinite(dnsQuestionType) && !isNillEmptyOrNotFinite(dnsQuestionName);
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
       <DnsRequestEventDetails
-        browserFields={browserFields}
         contextId={`dns-request-${timelineId}`}
         data={data}
         isDraggable={isDraggable}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
index d81104ff5be03..12d5e808f98fc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
@@ -10,7 +10,7 @@ import { waitFor } from '@testing-library/react';
 
 import { TestProviders } from '../../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../../common/types';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import { timelineActions } from '../../../../store/timeline';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 import { UserName } from './user_name';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
index 61f62ee3c0e29..3d75835a54bac 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useContext, useMemo } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
+import { StatefulEventContext } from '@kbn/timelines-plugin/public';
 import {
   TimelineId,
   TimelineTabs,
@@ -20,7 +21,6 @@ import { UserDetailsLink } from '../../../../../common/components/links';
 import { TruncatableText } from '../../../../../common/components/truncatable_text';
 import { activeTimeline } from '../../../../containers/active_timeline_context';
 import { timelineActions } from '../../../../store/timeline';
-import { StatefulEventContext } from '../../../../../../../timelines/public';
 
 interface Props {
   contextId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap
index 107239a9aa52f..dab754c0fcc14 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap
@@ -2,596 +2,6 @@
 
 exports[`ZeekDetails rendering it renders the default ZeekDetails 1`] = `
 <ZeekDetails
-  browserFields={
-    Object {
-      "agent": Object {
-        "fields": Object {
-          "agent.ephemeral_id": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-            "example": "8a4f500f",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.ephemeral_id",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.hostname": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.hostname",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.id": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-            "example": "8a4f500d",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "agent.name": Object {
-            "aggregatable": true,
-            "category": "agent",
-            "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-            "example": "foo",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "agent.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "auditd": Object {
-        "fields": Object {
-          "auditd.data.a0": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a0",
-            "searchable": true,
-            "type": "string",
-          },
-          "auditd.data.a1": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a1",
-            "searchable": true,
-            "type": "string",
-          },
-          "auditd.data.a2": Object {
-            "aggregatable": true,
-            "category": "auditd",
-            "description": null,
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
-            "name": "auditd.data.a2",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "base": Object {
-        "fields": Object {
-          "@timestamp": Object {
-            "aggregatable": true,
-            "category": "base",
-            "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-            "example": "2016-05-23T08:05:34.853Z",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "@timestamp",
-            "readFromDocValues": true,
-            "searchable": true,
-            "type": "date",
-          },
-          "_id": Object {
-            "aggregatable": false,
-            "category": "base",
-            "description": "Each document has an _id that uniquely identifies it",
-            "example": "Y-6TfmcB0WOhS6qyMv3s",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "_id",
-            "searchable": true,
-            "type": "string",
-          },
-          "message": Object {
-            "aggregatable": false,
-            "category": "base",
-            "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-            "example": "Hello World",
-            "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "message",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "client": Object {
-        "fields": Object {
-          "client.address": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.address",
-            "searchable": true,
-            "type": "string",
-          },
-          "client.bytes": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Bytes sent from the client to the server.",
-            "example": "184",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.bytes",
-            "searchable": true,
-            "type": "number",
-          },
-          "client.domain": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Client domain.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.domain",
-            "searchable": true,
-            "type": "string",
-          },
-          "client.geo.country_iso_code": Object {
-            "aggregatable": true,
-            "category": "client",
-            "description": "Country ISO code.",
-            "example": "CA",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "client.geo.country_iso_code",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "cloud": Object {
-        "fields": Object {
-          "cloud.account.id": Object {
-            "aggregatable": true,
-            "category": "cloud",
-            "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-            "example": "666777888999",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "cloud.account.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "cloud.availability_zone": Object {
-            "aggregatable": true,
-            "category": "cloud",
-            "description": "Availability zone in which this host is running.",
-            "example": "us-east-1c",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "cloud.availability_zone",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "container": Object {
-        "fields": Object {
-          "container.id": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Unique container id.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.id",
-            "searchable": true,
-            "type": "string",
-          },
-          "container.image.name": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Name of the image the container was built on.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.image.name",
-            "searchable": true,
-            "type": "string",
-          },
-          "container.image.tag": Object {
-            "aggregatable": true,
-            "category": "container",
-            "description": "Container image tag.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "container.image.tag",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "destination": Object {
-        "fields": Object {
-          "destination.address": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.address",
-            "searchable": true,
-            "type": "string",
-          },
-          "destination.bytes": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Bytes sent from the destination to the source.",
-            "example": "184",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.bytes",
-            "searchable": true,
-            "type": "number",
-          },
-          "destination.domain": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Destination domain.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.domain",
-            "searchable": true,
-            "type": "string",
-          },
-          "destination.ip": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.ip",
-            "searchable": true,
-            "type": "ip",
-          },
-          "destination.port": Object {
-            "aggregatable": true,
-            "category": "destination",
-            "description": "Port of the destination.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "destination.port",
-            "searchable": true,
-            "type": "long",
-          },
-        },
-      },
-      "event": Object {
-        "fields": Object {
-          "event.action": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-            "example": "user-password-change",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.action",
-            "searchable": true,
-            "type": "string",
-          },
-          "event.category": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-            "example": "authentication",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.category",
-            "searchable": true,
-            "type": "string",
-          },
-          "event.end": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "event.end contains the date when the event ended or when the activity was last observed.",
-            "example": null,
-            "format": "",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.end",
-            "searchable": true,
-            "type": "date",
-          },
-          "event.severity": Object {
-            "aggregatable": true,
-            "category": "event",
-            "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-            "example": 7,
-            "format": "number",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "event.severity",
-            "searchable": true,
-            "type": "number",
-          },
-        },
-      },
-      "host": Object {
-        "fields": Object {
-          "host.name": Object {
-            "aggregatable": true,
-            "category": "host",
-            "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-            "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "traces-apm*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "winlogbeat-*",
-            ],
-            "name": "host.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-      "nestedField": Object {
-        "fields": Object {
-          "nestedField.firstAttributes": Object {
-            "aggregatable": false,
-            "category": "nestedField",
-            "description": "",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "nestedField.firstAttributes",
-            "searchable": true,
-            "subType": Object {
-              "nested": Object {
-                "path": "nestedField",
-              },
-            },
-            "type": "string",
-          },
-          "nestedField.secondAttributes": Object {
-            "aggregatable": false,
-            "category": "nestedField",
-            "description": "",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "nestedField.secondAttributes",
-            "searchable": true,
-            "subType": Object {
-              "nested": Object {
-                "path": "nestedField",
-              },
-            },
-            "type": "string",
-          },
-        },
-      },
-      "source": Object {
-        "fields": Object {
-          "source.ip": Object {
-            "aggregatable": true,
-            "category": "source",
-            "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "source.ip",
-            "searchable": true,
-            "type": "ip",
-          },
-          "source.port": Object {
-            "aggregatable": true,
-            "category": "source",
-            "description": "Port of the source.",
-            "example": "",
-            "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "source.port",
-            "searchable": true,
-            "type": "long",
-          },
-        },
-      },
-      "user": Object {
-        "fields": Object {
-          "user.name": Object {
-            "aggregatable": true,
-            "category": "user",
-            "description": "Short name or login of the user.",
-            "example": "albert",
-            "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
-            "name": "user.name",
-            "searchable": true,
-            "type": "string",
-          },
-        },
-      },
-    }
-  }
   data={
     Object {
       "_id": "4",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap
index 938f047f7014e..a98f0c53fbc8f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap
@@ -4,596 +4,6 @@ exports[`zeek_row_renderer renders correctly against snapshot 1`] = `
 <span>
   <RowRendererContainer>
     <ZeekDetails
-      browserFields={
-        Object {
-          "agent": Object {
-            "fields": Object {
-              "agent.ephemeral_id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Ephemeral identifier of this agent (if one exists). This id normally changes across restarts, but \`agent.id\` does not.",
-                "example": "8a4f500f",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.ephemeral_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.hostname": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.hostname",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.id": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id.",
-                "example": "8a4f500d",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "agent.name": Object {
-                "aggregatable": true,
-                "category": "agent",
-                "description": "Name of the agent. This is a name that can be given to an agent. This can be helpful if for example two Filebeat instances are running on the same host but a human readable separation is needed on which Filebeat instance data is coming from. If no name is given, the name is often left empty.",
-                "example": "foo",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "agent.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "auditd": Object {
-            "fields": Object {
-              "auditd.data.a0": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a0",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a1": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a1",
-                "searchable": true,
-                "type": "string",
-              },
-              "auditd.data.a2": Object {
-                "aggregatable": true,
-                "category": "auditd",
-                "description": null,
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                ],
-                "name": "auditd.data.a2",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "base": Object {
-            "fields": Object {
-              "@timestamp": Object {
-                "aggregatable": true,
-                "category": "base",
-                "description": "Date/time when the event originated. For log events this is the date/time when the event was generated, and not when it was read. Required field for all events.",
-                "example": "2016-05-23T08:05:34.853Z",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "@timestamp",
-                "readFromDocValues": true,
-                "searchable": true,
-                "type": "date",
-              },
-              "_id": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "Each document has an _id that uniquely identifies it",
-                "example": "Y-6TfmcB0WOhS6qyMv3s",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "_id",
-                "searchable": true,
-                "type": "string",
-              },
-              "message": Object {
-                "aggregatable": false,
-                "category": "base",
-                "description": "For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message.",
-                "example": "Hello World",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "message",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "client": Object {
-            "fields": Object {
-              "client.address": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Some event client addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.bytes": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Bytes sent from the client to the server.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "client.domain": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Client domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "client.geo.country_iso_code": Object {
-                "aggregatable": true,
-                "category": "client",
-                "description": "Country ISO code.",
-                "example": "CA",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "client.geo.country_iso_code",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "cloud": Object {
-            "fields": Object {
-              "cloud.account.id": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.",
-                "example": "666777888999",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.account.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "cloud.availability_zone": Object {
-                "aggregatable": true,
-                "category": "cloud",
-                "description": "Availability zone in which this host is running.",
-                "example": "us-east-1c",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "cloud.availability_zone",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "container": Object {
-            "fields": Object {
-              "container.id": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Unique container id.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.id",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.name": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Name of the image the container was built on.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.name",
-                "searchable": true,
-                "type": "string",
-              },
-              "container.image.tag": Object {
-                "aggregatable": true,
-                "category": "container",
-                "description": "Container image tag.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "container.image.tag",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "destination": Object {
-            "fields": Object {
-              "destination.address": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket.  You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.address",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.bytes": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Bytes sent from the destination to the source.",
-                "example": "184",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.bytes",
-                "searchable": true,
-                "type": "number",
-              },
-              "destination.domain": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Destination domain.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.domain",
-                "searchable": true,
-                "type": "string",
-              },
-              "destination.ip": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "IP address of the destination. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "destination.port": Object {
-                "aggregatable": true,
-                "category": "destination",
-                "description": "Port of the destination.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "destination.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "event": Object {
-            "fields": Object {
-              "event.action": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The action captured by the event. This describes the information in the event. It is more specific than \`event.category\`. Examples are \`group-add\`, \`process-started\`, \`file-created\`. The value is normally defined by the implementer.",
-                "example": "user-password-change",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.action",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.category": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "This is one of four ECS Categorization Fields, and indicates the second level in the ECS category hierarchy. \`event.category\` represents the \\"big buckets\\" of ECS categories. For example, filtering on \`event.category:process\` yields all events relating to process activity. This field is closely related to \`event.type\`, which is used as a subcategory. This field is an array. This will allow proper categorization of some events that fall in multiple categories.",
-                "example": "authentication",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.category",
-                "searchable": true,
-                "type": "string",
-              },
-              "event.end": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "event.end contains the date when the event ended or when the activity was last observed.",
-                "example": null,
-                "format": "",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.end",
-                "searchable": true,
-                "type": "date",
-              },
-              "event.severity": Object {
-                "aggregatable": true,
-                "category": "event",
-                "description": "The numeric severity of the event according to your event source. What the different severity values mean can be different between sources and use cases. It's up to the implementer to make sure severities are consistent across events from the same source. The Syslog severity belongs in \`log.syslog.severity.code\`. \`event.severity\` is meant to represent the severity according to the event source (e.g. firewall, IDS). If the event source does not publish its own severity, you may optionally copy the \`log.syslog.severity.code\` to \`event.severity\`.",
-                "example": 7,
-                "format": "number",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "event.severity",
-                "searchable": true,
-                "type": "number",
-              },
-            },
-          },
-          "host": Object {
-            "fields": Object {
-              "host.name": Object {
-                "aggregatable": true,
-                "category": "host",
-                "description": "Name of the host. It can contain what \`hostname\` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.",
-                "format": "string",
-                "indexes": Array [
-                  "apm-*-transaction*",
-                  "traces-apm*",
-                  "auditbeat-*",
-                  "endgame-*",
-                  "filebeat-*",
-                  "logs-*",
-                  "packetbeat-*",
-                  "winlogbeat-*",
-                ],
-                "name": "host.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-          "nestedField": Object {
-            "fields": Object {
-              "nestedField.firstAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.firstAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-              "nestedField.secondAttributes": Object {
-                "aggregatable": false,
-                "category": "nestedField",
-                "description": "",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "nestedField.secondAttributes",
-                "searchable": true,
-                "subType": Object {
-                  "nested": Object {
-                    "path": "nestedField",
-                  },
-                },
-                "type": "string",
-              },
-            },
-          },
-          "source": Object {
-            "fields": Object {
-              "source.ip": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "IP address of the source. Can be one or multiple IPv4 or IPv6 addresses.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.ip",
-                "searchable": true,
-                "type": "ip",
-              },
-              "source.port": Object {
-                "aggregatable": true,
-                "category": "source",
-                "description": "Port of the source.",
-                "example": "",
-                "format": "",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "source.port",
-                "searchable": true,
-                "type": "long",
-              },
-            },
-          },
-          "user": Object {
-            "fields": Object {
-              "user.name": Object {
-                "aggregatable": true,
-                "category": "user",
-                "description": "Short name or login of the user.",
-                "example": "albert",
-                "format": "string",
-                "indexes": Array [
-                  "auditbeat",
-                  "filebeat",
-                  "packetbeat",
-                ],
-                "name": "user.name",
-                "searchable": true,
-                "type": "string",
-              },
-            },
-          },
-        }
-      }
       data={
         Object {
           "_id": "1",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx
index 9af22fca0c707..717c76d0baf7a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
 import '../../../../../../common/mock/match_media';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import { useMountAppended } from '../../../../../../common/utils/use_mount_appended';
 import { ZeekDetails } from './zeek_details';
@@ -39,11 +38,7 @@ describe('ZeekDetails', () => {
     test('it renders the default ZeekDetails', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[2].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[2].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(wrapper.find('ZeekDetails')).toMatchSnapshot();
@@ -52,11 +47,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.connection if the data does contain zeek.connection data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[13].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[13].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -67,11 +58,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.dns if the data does contain zeek.dns data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[14].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[14].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -82,11 +69,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.http if the data does contain zeek.http data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[15].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[15].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -97,11 +80,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.notice if the data does contain zeek.notice data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[16].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[16].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -112,11 +91,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.ssl if the data does contain zeek.ssl data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[17].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[17].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(extractEuiIconText(removeExternalLinkText(wrapper.text()))).toEqual(
@@ -127,11 +102,7 @@ describe('ZeekDetails', () => {
     test('it returns zeek.files if the data does contain zeek.files data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[18].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[18].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(wrapper.text()).toEqual('Cu0n232QMyvNtzb75jfilessha1: fa5195a...md5: f7653f1...');
@@ -140,11 +111,7 @@ describe('ZeekDetails', () => {
     test('it returns null for text if the data contains no zeek data', () => {
       const wrapper = mount(
         <TestProviders>
-          <ZeekDetails
-            data={mockTimelineData[0].ecs}
-            browserFields={mockBrowserFields}
-            timelineId="test"
-          />
+          <ZeekDetails data={mockTimelineData[0].ecs} timelineId="test" />
         </TestProviders>
       );
       expect(wrapper.find('ZeekDetails').children().exists()).toBeFalsy();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx
index a4dbde1a5626d..ac899cad8521e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx
@@ -9,7 +9,6 @@ import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
 
-import { BrowserFields } from '../../../../../../common/containers/source';
 import { Ecs } from '../../../../../../../common/ecs';
 
 import { NetflowRenderer } from '../netflow';
@@ -22,7 +21,6 @@ const Details = styled.div`
 Details.displayName = 'Details';
 
 interface ZeekDetailsProps {
-  browserFields: BrowserFields;
   data: Ecs;
   isDraggable?: boolean;
   timelineId: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
index fda83c0ade12b..80f4aafbcfeb7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
@@ -10,7 +10,6 @@ import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
 import { removeExternalLinkText } from '@kbn/securitysolution-io-ts-utils';
-import { mockBrowserFields } from '../../../../../../common/containers/source/mock';
 import { Ecs } from '../../../../../../../common/ecs';
 import { mockTimelineData, TestProviders } from '../../../../../../common/mock';
 import '../../../../../../common/mock/match_media';
@@ -41,7 +40,6 @@ describe('zeek_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = zeekRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: nonZeek,
       isDraggable: true,
       timelineId: 'test',
@@ -61,7 +59,6 @@ describe('zeek_row_renderer', () => {
 
   test('should render a zeek row', () => {
     const children = zeekRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: zeek,
       isDraggable: true,
       timelineId: 'test',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
index 6786bb996325c..5fd2acd852804 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
@@ -19,14 +19,9 @@ export const zeekRowRenderer: RowRenderer = {
     const module: string | null | undefined = get('event.module[0]', ecs);
     return module != null && module.toLowerCase() === 'zeek';
   },
-  renderRow: ({ browserFields, data, isDraggable, timelineId }) => (
+  renderRow: ({ data, isDraggable, timelineId }) => (
     <RowRendererContainer>
-      <ZeekDetails
-        data={data}
-        browserFields={browserFields}
-        isDraggable={isDraggable}
-        timelineId={timelineId}
-      />
+      <ZeekDetails data={data} isDraggable={isDraggable} timelineId={timelineId} />
     </RowRendererContainer>
   ),
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
index 9e74fa84a5adc..133b3ab5f36db 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.test.tsx
@@ -16,7 +16,7 @@ import { DroppableWrapper } from '../../../../common/components/drag_and_drop/dr
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../common/mock';
 import { DefaultCellRenderer } from './default_cell_renderer';
-import { BrowserFields } from '../../../../../../timelines/common/search_strategy';
+import { BrowserFields } from '@kbn/timelines-plugin/common/search_strategy';
 import { Ecs } from '../../../../../common/ecs';
 
 jest.mock('../../../../common/lib/kibana');
@@ -114,7 +114,6 @@ describe('DefaultCellRenderer', () => {
 
     expect(mockImplementation.renderColumn).toBeCalledWith({
       asPlainText: false,
-      browserFields,
       columnName: header.id,
       ecsData,
       eventId,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
index e075712b0bea2..88de4a9c2c6df 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/cell_rendering/default_cell_renderer.tsx
@@ -60,7 +60,6 @@ export const DefaultCellRenderer: React.FC<CellValueElementProps> = ({
       <StyledContent className={styledContentClassName} $isDetails={isDetails}>
         {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
           asPlainText, // we want to render value with links as plain text but keep other formatters like badge.
-          browserFields,
           columnName: header.id,
           ecsData,
           eventId,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx
index 361fb5a8fecb1..2b4cbc6c74995 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.test.tsx
@@ -15,26 +15,26 @@ import { defaultHeaders, mockTimelineData } from '../../../../common/mock';
 import '../../../../common/mock/match_media';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
-import { EqlTabContentComponent, Props as EqlTabContentComponentProps } from './index';
+import { EqlTabContentComponent, Props as EqlTabContentComponentProps } from '.';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import { useTimelineEvents } from '../../../containers/index';
-import { useTimelineEventsDetails } from '../../../containers/details/index';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
-import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../timelines/public/components';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '@kbn/timelines-plugin/public/components';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
-jest.mock('../../../containers/index', () => ({
+jest.mock('../../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
-jest.mock('../../../containers/details/index', () => ({
+jest.mock('../../../containers/details', () => ({
   useTimelineEventsDetails: jest.fn(),
 }));
 jest.mock('../../fields_browser', () => ({
   useFieldBrowserOptions: jest.fn(),
 }));
-jest.mock('../body/events/index', () => ({
+jest.mock('../body/events', () => ({
   Events: () => <></>,
 }));
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
index 8e15312eeb290..c53871cf2e52b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
@@ -24,7 +24,7 @@ import { InPortal } from 'react-reverse-portal';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { CellValueElementProps } from '../cell_rendering';
 import { TimelineItem } from '../../../../../common/search_strategy';
-import { useTimelineEvents } from '../../../containers/index';
+import { useTimelineEvents } from '../../../containers';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { StatefulBody } from '../body';
 import { Footer, footerHeight } from '../footer';
@@ -43,10 +43,10 @@ import { SuperDatePicker } from '../../../../common/components/super_date_picker
 import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context';
 import { inputsModel, inputsSelectors, State } from '../../../../common/store';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { useEqlEventsCountPortal } from '../../../../common/hooks/use_timeline_events_count';
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 import { TimelineDatePickerLock } from '../date_picker_lock';
 import { useTimelineFullScreen } from '../../../../common/containers/use_full_screen';
 import { activeTimeline } from '../../../containers/active_timeline_context';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
index bb7eda8ef1ff0..4942e92177134 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../../common/mock/test_providers';
 
-import { FooterComponent, PagingControlComponent } from './index';
+import { FooterComponent, PagingControlComponent } from '.';
 
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap
index 3e764b34d74c5..c5494c676118a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap
@@ -10,8 +10,8 @@ exports[`Header rendering renders correctly against snapshot 1`] = `
       FilterManager {
         "extract": [Function],
         "fetch$": Subject {
-          "_isScalar": false,
           "closed": false,
+          "currentObservers": null,
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
@@ -35,8 +35,8 @@ exports[`Header rendering renders correctly against snapshot 1`] = `
           "set": [MockFunction],
         },
         "updated$": Subject {
-          "_isScalar": false,
           "closed": false,
+          "currentObservers": null,
           "hasError": false,
           "isStopped": false,
           "observers": Array [],
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
index d9c5068109cee..196c2655e6ab0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
@@ -8,10 +8,10 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { mockIndexPattern } from '../../../../common/mock';
 import { TestProviders } from '../../../../common/mock/test_providers';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
index 61b9c8b2e9585..052bed15ac8a9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiCallOut } from '@elastic/eui';
 import React from 'react';
-import type { FilterManager } from 'src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
 import { DataProviders } from '../data_providers';
 import { StatefulSearchOrFilter } from '../search_or_filter';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
index e989685130a38..bd267abb23c7d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
@@ -24,7 +24,7 @@ import usePrevious from 'react-use/lib/usePrevious';
 import { getUseField, Field, Form, useForm } from '../../../../shared_imports';
 import { TimelineId, TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
-import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
+import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { NOTES_PANEL_WIDTH } from '../properties/notes_size';
 import { useCreateTimeline } from '../properties/use_create_timeline';
 import * as commonI18n from '../properties/translations';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx
index 04b108835d53c..cbe7a57bc13a3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/helpers.tsx
@@ -15,7 +15,7 @@ import {
   getFocusedAriaColindexCell,
   getTableSkipFocus,
   stopPropagationAndPreventDefault,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { escapeQueryValue, convertToBuildEsQuery } from '../../../common/lib/keury';
 
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
index f138c026c6140..6b29ea26da045 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.test.tsx
@@ -23,7 +23,7 @@ import {
   TestProviders,
 } from '../../../common/mock';
 
-import { StatefulTimeline, Props as StatefulTimelineOwnProps } from './index';
+import { StatefulTimeline, Props as StatefulTimelineOwnProps } from '.';
 import { useTimelineEvents } from '../../containers';
 import { DefaultCellRenderer } from './cell_rendering/default_cell_renderer';
 import { SELECTOR_TIMELINE_GLOBAL_CONTAINER } from './styles';
@@ -32,14 +32,14 @@ import { useSourcererDataView } from '../../../common/containers/sourcerer';
 import { createStore } from '../../../common/store';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 
-jest.mock('../../containers/index', () => ({
+jest.mock('../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
 
 jest.mock('./tabs_content');
 
 jest.mock('../../../common/lib/kibana');
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 jest.mock('@kbn/i18n-react', () => {
   const originalModule = jest.requireActual('@kbn/i18n-react');
   const FormattedRelative = jest.fn().mockImplementation(() => '20 hours ago');
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
index b32246949e2cd..b97885fa84cbc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
@@ -11,9 +11,9 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
-import { isTab, TimelineContext } from '../../../../../timelines/public';
+import { isTab, TimelineContext } from '@kbn/timelines-plugin/public';
 import { timelineActions, timelineSelectors } from '../../store/timeline';
-import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../store/timeline/defaults';
 import { defaultHeaders } from './body/column_headers/default_headers';
 import { CellValueElementProps } from './cell_rendering';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx
index 3f8a5f2457d9e..28c0dfa0d0e7b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pin/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TimelineType } from '../../../../../common/types/timeline';
 
-import { getPinIcon, Pin } from './';
+import { getPinIcon, Pin } from '.';
 
 interface ButtonIcon {
   isDisabled: boolean;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
index b908a9023a684..8a7fd244c6f20 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
@@ -17,25 +17,25 @@ import { defaultRowRenderers } from '../body/renderers';
 import { Sort } from '../body/sort';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import { useTimelineEvents } from '../../../containers/index';
-import { useTimelineEventsDetails } from '../../../containers/details/index';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
 import { PinnedTabContentComponent, Props as PinnedTabContentComponentProps } from '.';
 import { Direction } from '../../../../../common/search_strategy';
-import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '../../../../../../timelines/public/components';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { useDraggableKeyboardWrapper as mockUseDraggableKeyboardWrapper } from '@kbn/timelines-plugin/public/components';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
-jest.mock('../../../containers/index', () => ({
+jest.mock('../../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
-jest.mock('../../../containers/details/index', () => ({
+jest.mock('../../../containers/details', () => ({
   useTimelineEventsDetails: jest.fn(),
 }));
 jest.mock('../../fields_browser', () => ({
   useFieldBrowserOptions: jest.fn(),
 }));
-jest.mock('../body/events/index', () => ({
+jest.mock('../body/events', () => ({
   Events: () => <></>,
 }));
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
index 8abae059e607d..9259039ae2535 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
@@ -17,7 +17,7 @@ import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { HeaderActions } from '../body/actions/header_actions';
 import { CellValueElementProps } from '../cell_rendering';
 import { Direction } from '../../../../../common/search_strategy';
-import { useTimelineEvents } from '../../../containers/index';
+import { useTimelineEvents } from '../../../containers';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { StatefulBody } from '../body';
 import { Footer, footerHeight } from '../footer';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx
index 16b22fe99ac88..1366fe632a000 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.test.tsx
@@ -12,7 +12,7 @@ import { waitFor } from '@testing-library/react';
 import { AddToFavoritesButton, NewTimeline, NewTimelineProps } from './helpers';
 import { useCreateTimelineButton } from './use_create_timeline';
 import { kibanaObservable, TestProviders } from '../../../../common/mock/test_providers';
-import { timelineActions } from '../../../../timelines/store/timeline';
+import { timelineActions } from '../../../store/timeline';
 import { TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 import {
   createSecuritySolutionStorageMock,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
index 7e790ab820039..c59c0a15ff53d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -15,7 +15,7 @@ import {
   TimelineType,
   TimelineStatus,
 } from '../../../../../common/types/timeline';
-import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
+import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { useShallowEqualSelector } from '../../../../common/hooks/use_selector';
 
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
index 066d466bf9149..cae0dda0b4bc3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
@@ -8,14 +8,14 @@
 import { mount } from 'enzyme';
 import React from 'react';
 
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../../common/constants';
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury';
 import { mockIndexPattern, TestProviders } from '../../../../common/mock';
 import { QueryBar } from '../../../../common/components/query_bar';
 import { FilterStateStore } from '@kbn/es-query';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import { FilterManager } from '@kbn/data-plugin/public';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { buildGlobalQuery } from '../helpers';
 
@@ -24,7 +24,7 @@ import {
   QueryBarTimelineComponentProps,
   getDataProviderFilter,
   TIMELINE_FILTER_DROP_AREA,
-} from './index';
+} from '.';
 import { waitFor } from '@testing-library/dom';
 
 const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx
index c561c26383896..6412567174c73 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.tsx
@@ -12,16 +12,12 @@ import { Subscription } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
 
 import { FilterStateStore, Filter, Query } from '@kbn/es-query';
+import type { FilterManager, SavedQuery, SavedQueryTimeFilter } from '@kbn/data-plugin/public';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
 
-import type {
-  FilterManager,
-  SavedQuery,
-  SavedQueryTimeFilter,
-} from '../../../../../../../../src/plugins/data/public';
 import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury';
-import { KqlMode } from '../../../../timelines/store/timeline/model';
+import { KqlMode } from '../../../store/timeline/model';
 import { useSavedQueryServices } from '../../../../common/utils/saved_query_services';
 import { DispatchUpdateReduxTime } from '../../../../common/components/super_date_picker';
 import { QueryBar } from '../../../../common/components/query_bar';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
index 7ae25f5b5b6ab..300d793460c09 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
@@ -14,30 +14,30 @@ import { defaultHeaders, mockTimelineData } from '../../../../common/mock';
 import '../../../../common/mock/match_media';
 import { TestProviders } from '../../../../common/mock/test_providers';
 
-import { QueryTabContentComponent, Props as QueryTabContentComponentProps } from './index';
+import { QueryTabContentComponent, Props as QueryTabContentComponentProps } from '.';
 import { defaultRowRenderers } from '../body/renderers';
 import { Sort } from '../body/sort';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineId, TimelineStatus, TimelineTabs } from '../../../../../common/types/timeline';
-import { useTimelineEvents } from '../../../containers/index';
-import { useTimelineEventsDetails } from '../../../containers/details/index';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
 import { Direction } from '../../../../../common/search_strategy';
 import * as helpers from '../helpers';
-import { mockCasesContext } from '../../../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 
-jest.mock('../../../containers/index', () => ({
+jest.mock('../../../containers', () => ({
   useTimelineEvents: jest.fn(),
 }));
-jest.mock('../../../containers/details/index', () => ({
+jest.mock('../../../containers/details', () => ({
   useTimelineEventsDetails: jest.fn(),
 }));
 jest.mock('../../fields_browser', () => ({
   useFieldBrowserOptions: jest.fn(),
 }));
-jest.mock('../body/events/index', () => ({
+jest.mock('../body/events', () => ({
   Events: () => <></>,
 }));
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
index 1a6fcbf7c25ba..b206260850c4a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
@@ -21,11 +21,13 @@ import { connect, ConnectedProps, useDispatch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 import { InPortal } from 'react-reverse-portal';
 
+import { FilterManager } from '@kbn/data-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { useInvalidFilterQuery } from '../../../../common/hooks/use_invalid_filter_query';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
 import { CellValueElementProps } from '../cell_rendering';
 import { Direction, TimelineItem } from '../../../../../common/search_strategy';
-import { useTimelineEvents } from '../../../containers/index';
+import { useTimelineEvents } from '../../../containers';
 import { useKibana } from '../../../../common/lib/kibana';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { StatefulBody } from '../body';
@@ -33,8 +35,6 @@ import { Footer, footerHeight } from '../footer';
 import { TimelineHeader } from '../header';
 import { calculateTotalPages, combineQueries } from '../helpers';
 import { TimelineRefetch } from '../refetch_timeline';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
-import { getEsQueryConfig } from '../../../../../../../../src/plugins/data/common';
 import {
   ControlColumnProps,
   KueryFilterQueryKind,
@@ -48,10 +48,10 @@ import { SuperDatePicker } from '../../../../common/components/super_date_picker
 import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context';
 import { inputsModel, inputsSelectors, State } from '../../../../common/store';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { useTimelineEventsCountPortal } from '../../../../common/hooks/use_timeline_events_count';
-import { TimelineModel } from '../../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../../store/timeline/model';
 import { TimelineDatePickerLock } from '../date_picker_lock';
 import { useTimelineFullScreen } from '../../../../common/containers/use_full_screen';
 import { activeTimeline } from '../../../containers/active_timeline_context';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx
index 9479c3209ad85..23da1c6b74fd5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/helpers.tsx
@@ -12,7 +12,7 @@ import styled from 'styled-components';
 import { AndOrBadge } from '../../../../common/components/and_or_badge';
 
 import * as i18n from './translations';
-import { KqlMode } from '../../../../timelines/store/timeline/model';
+import { KqlMode } from '../../../store/timeline/model';
 
 const AndOrContainer = styled.div`
   position: relative;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
index 98e74269ae2df..08ac3ff9ff50a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/index.tsx
@@ -12,11 +12,11 @@ import { Dispatch } from 'redux';
 import deepEqual from 'fast-deep-equal';
 import type { Filter } from '@kbn/es-query';
 
-import type { FilterManager } from '../../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 import { State, inputsModel, inputsSelectors } from '../../../../common/store';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import { KqlMode, TimelineModel } from '../../../../timelines/store/timeline/model';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { KqlMode, TimelineModel } from '../../../store/timeline/model';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { dispatchUpdateReduxTime } from '../../../../common/components/super_date_picker';
 import { SearchOrFilter } from './search_or_filter';
 import { SerializedFilterQuery } from '../../../../../common/types/timeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx
index aa2905955210a..17dd6491f2326 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx
@@ -10,8 +10,8 @@ import React, { useCallback } from 'react';
 import styled, { createGlobalStyle } from 'styled-components';
 import type { Filter } from '@kbn/es-query';
 
-import type { FilterManager } from '../../../../../../../../src/plugins/data/public';
-import { KqlMode } from '../../../../timelines/store/timeline/model';
+import type { FilterManager } from '@kbn/data-plugin/public';
+import { KqlMode } from '../../../store/timeline/model';
 import { DispatchUpdateReduxTime } from '../../../../common/components/super_date_picker';
 import { KueryFilterQuery } from '../../../../../common/types/timeline';
 import { DataProvider } from '../data_providers/data_provider';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
index 7269c005e9af5..edaf8728c4e75 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/selectable_timeline/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow, ShallowWrapper, mount } from 'enzyme';
 
 import { SortFieldTimeline, TimelineType } from '../../../../../common/types/timeline';
-import { SelectableTimeline, ORIGINAL_PAGE_SIZE } from './';
+import { SelectableTimeline, ORIGINAL_PAGE_SIZE } from '.';
 import { Direction } from '../../../../../common/search_strategy';
 
 const mockFetchAllTimeline = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx
index 693429ac9fc8c..941b24df76a23 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/session_tab_content/use_session_view.tsx
@@ -9,11 +9,11 @@ import React, { useMemo, useCallback } from 'react';
 import { EuiButtonEmpty, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
-import type { EntityType } from '../../../../../../timelines/common';
+import type { EntityType } from '@kbn/timelines-plugin/common';
 import { timelineSelectors } from '../../../store/timeline';
 import { useKibana } from '../../../../common/lib/kibana';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
-import { timelineDefaults } from '../../../../timelines/store/timeline/defaults';
+import { timelineDefaults } from '../../../store/timeline/defaults';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { useDetailPanel } from '../../side_panel/hooks/use_detail_panel';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
@@ -22,7 +22,7 @@ import {
   SCROLLING_DISABLED_CLASS_NAME,
   FULL_SCREEN_TOGGLED_CLASS_NAME,
 } from '../../../../../common/constants';
-import { FULL_SCREEN } from '../../timeline/body/column_headers/translations';
+import { FULL_SCREEN } from '../body/column_headers/translations';
 import { EXIT_FULL_SCREEN } from '../../../../common/components/exit_full_screen/translations';
 import {
   useTimelineFullScreen,
@@ -32,7 +32,7 @@ import {
   updateTimelineGraphEventId,
   updateTimelineSessionViewConfig,
   setActiveTabTimeline,
-} from '../../../../timelines/store/timeline/actions';
+} from '../../../store/timeline/actions';
 import { detectionsTimelineIds } from '../../../containers/helpers';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
index 2f5262c7c598f..b8b9d73932afd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiBadge, EuiLoadingContent, EuiTabs, EuiTab } from '@elastic/eui';
+import { EuiBadge, EuiBetaBadge, EuiLoadingContent, EuiTabs, EuiTab } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
 import React, { lazy, memo, Suspense, useCallback, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
@@ -37,6 +37,7 @@ import {
   getEventIdToNoteIdsSelector,
 } from './selectors';
 import * as i18n from './translations';
+import { BETA } from '../../../../common/translations';
 
 const HideShowContainer = styled.div.attrs<{ $isVisible: boolean; isOverflowYScroll: boolean }>(
   ({ $isVisible = false, isOverflowYScroll = false }) => ({
@@ -357,6 +358,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
             isSelected={activeTab === TimelineTabs.session}
             disabled={sessionViewConfig === null}
             key={TimelineTabs.session}
+            append={<EuiBetaBadge label={BETA} size="s" />}
           >
             {i18n.SESSION_TAB}
           </EuiTab>
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
index 44a750cc7283b..024a7cd16944c 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -10,7 +10,7 @@ import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { isEmpty } from 'lodash';
 
-import { throwErrors } from '../../../../cases/common';
+import { throwErrors } from '@kbn/cases-plugin/common';
 import {
   TimelineResponse,
   TimelineResponseType,
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx
index cc60e9421d26b..0173b6cfce0ed 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/details/index.tsx
@@ -11,6 +11,8 @@ import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+import { EntityType } from '@kbn/timelines-plugin/common';
 import { useKibana } from '../../../common/lib/kibana';
 import {
   DocValueFields,
@@ -19,10 +21,8 @@ import {
   TimelineEventsDetailsRequestOptions,
   TimelineEventsDetailsStrategyResponse,
 } from '../../../../common/search_strategy';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/common';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
 import * as i18n from './translations';
-import { EntityType } from '../../../../../timelines/common';
 import { Ecs } from '../../../../common/ecs';
 
 export interface EventsArgs {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
index 3586aa186b020..56eb11109d742 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
@@ -12,18 +12,14 @@ import { useDispatch } from 'react-redux';
 import { Subscription } from 'rxjs';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { DataView, isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../../common/typed_json';
-import {
-  DataView,
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../src/plugins/data/common';
 
 import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experimental_features';
 import { inputsModel } from '../../common/store';
 import { useKibana } from '../../common/lib/kibana';
 import { createFilter } from '../../common/containers/helpers';
-import { timelineActions } from '../../timelines/store/timeline';
+import { timelineActions } from '../store/timeline';
 import { detectionsTimelineIds, skipQueryForDetectionsPage } from './helpers';
 import { getInspectResponse } from '../../helpers';
 import {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx
index 3b13c261f970c..de2169bb390c3 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/kpis/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/public';
 import { inputsModel } from '../../../common/store';
 import { useKibana } from '../../../common/lib/kibana';
 import {
@@ -20,7 +21,6 @@ import {
   TimerangeInput,
 } from '../../../../common/search_strategy';
 import { ESQuery } from '../../../../common/typed_json';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../../src/plugins/data/public';
 import { useAppToasts } from '../../../common/hooks/use_app_toasts';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
index c44d1351b0830..b344b5a3fdb82 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelinesStorage } from './types';
 import { useKibana } from '../../../common/lib/kibana';
 import { TimelineModel } from '../../store/timeline/model';
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts
index d6f88698448fb..b8030cc07d6a3 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TimelineModel } from '../../../timelines/store/timeline/model';
+import { TimelineModel } from '../../store/timeline/model';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 
 export interface TimelinesStorage {
diff --git a/x-pack/plugins/security_solution/public/timelines/pages/index.tsx b/x-pack/plugins/security_solution/public/timelines/pages/index.tsx
index 58049ef164e15..b2c813087f8db 100644
--- a/x-pack/plugins/security_solution/public/timelines/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/pages/index.tsx
@@ -9,7 +9,7 @@ import { isEmpty } from 'lodash/fp';
 import React from 'react';
 import { Switch, Route, Redirect } from 'react-router-dom';
 
-import { ChromeBreadcrumb } from '../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 
 import { TimelineType } from '../../../common/types/timeline';
 import { TimelineRouteSpyState } from '../../common/utils/route/types';
diff --git a/x-pack/plugins/security_solution/public/timelines/routes.tsx b/x-pack/plugins/security_solution/public/timelines/routes.tsx
index 0bc95b3b4959f..0b427eeb86767 100644
--- a/x-pack/plugins/security_solution/public/timelines/routes.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/routes.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { Timelines } from './pages';
 import { TIMELINES_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
index 10251f25fb02d..d90813f5288ea 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
@@ -12,7 +12,7 @@ import {
   DataProvider,
   DataProviderType,
   QueryOperator,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
+} from '../../components/timeline/data_providers/data_provider';
 
 import { KqlMode, TimelineModel } from './model';
 import { InsertTimeline } from './types';
@@ -44,7 +44,7 @@ export {
   updateItemsPerPageOptions,
   updateSort,
   upsertColumn,
-} from '../../../../../timelines/public';
+} from '@kbn/timelines-plugin/public';
 import { ResolveTimelineConfig } from '../../components/open_timeline/types';
 import { SessionViewConfig } from '../../components/timeline/session_tab_content/use_session_view';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
index 5748f0e9cf07a..76c94619a7fb3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
@@ -11,7 +11,7 @@ import uuid from 'uuid';
 
 import type { Filter } from '@kbn/es-query';
 
-import { Sort } from '../../../timelines/components/timeline/body/sort';
+import { Sort } from '../../components/timeline/body/sort';
 import {
   DataProvider,
   QueryOperator,
@@ -19,7 +19,7 @@ import {
   DataProviderType,
   IS_OPERATOR,
   EXISTS_OPERATOR,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
+} from '../../components/timeline/data_providers/data_provider';
 import { TimelineNonEcsData } from '../../../../common/search_strategy/timeline';
 import {
   ColumnHeaderOptions,
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
index d0bbd47a10176..5356c4bf3c7e3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { TGridModelForTimeline } from '@kbn/timelines-plugin/public';
 import { EqlOptionsSelected } from '../../../../common/search_strategy/timeline';
 import type {
   TimelineEventsType,
@@ -14,7 +15,6 @@ import type {
   ScrollToTopEvent,
 } from '../../../../common/types/timeline';
 import { PinnedEvent } from '../../../../common/types/timeline/pinned_event';
-import type { TGridModelForTimeline } from '../../../../../timelines/public';
 import { ResolveTimelineConfig } from '../../components/open_timeline/types';
 import type { SessionViewConfig } from '../../components/timeline/session_tab_content/use_session_view';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
index 203b988be378f..b1a92743d13f0 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
@@ -19,12 +19,12 @@ import {
   DataProvider,
   DataProviderType,
   DataProvidersAnd,
-} from '../../../timelines/components/timeline/data_providers/data_provider';
-import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers';
+} from '../../components/timeline/data_providers/data_provider';
+import { defaultColumnHeaderType } from '../../components/timeline/body/column_headers/default_headers';
 import {
   DEFAULT_COLUMN_MIN_WIDTH,
   RESIZED_COLUMN_MIN_WITH,
-} from '../../../timelines/components/timeline/body/constants';
+} from '../../components/timeline/body/constants';
 import { defaultHeaders } from '../../../common/mock';
 
 import {
@@ -52,9 +52,9 @@ import { TimelineModel } from './model';
 import { timelineDefaults } from './defaults';
 import { TimelineById } from './types';
 import { Direction } from '../../../../common/search_strategy';
-import type { FilterManager } from '../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
-jest.mock('../../../common/components/url_state/normalize_time_range.ts');
+jest.mock('../../../common/components/url_state/normalize_time_range');
 jest.mock('../../../common/utils/default_date_settings', () => {
   const actual = jest.requireActual('../../../common/utils/default_date_settings');
   return {
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
index 0dd898f1c4ab9..ec57984ada1f3 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/selectors.ts
@@ -7,7 +7,7 @@
 
 import { createSelector } from 'reselect';
 
-export { getManageTimelineById } from '../../../../../timelines/public';
+export { getManageTimelineById } from '@kbn/timelines-plugin/public';
 import { State } from '../../../common/store/types';
 
 import { TimelineModel } from './model';
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
index d4a96d036bd5f..c91f16b1345ad 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
@@ -8,12 +8,12 @@
 import { Action } from 'redux';
 import { Observable } from 'rxjs';
 
-import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { CoreStart } from '@kbn/core/public';
 import { inputsModel } from '../../../common/store/inputs';
 import { NotesById } from '../../../common/store/app/model';
 
 import { TimelineModel } from './model';
-import { CoreStart } from '../../../../../../../src/core/public';
 
 export interface AutoSavedWarningMsg {
   timelineId: string | null;
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index 05538a1ecbb35..3fa7e964f6ca1 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -5,31 +5,35 @@
  * 2.0.
  */
 
-import type { CoreStart } from '../../../../src/core/public';
-import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { LensPublicStart } from '../../../plugins/lens/public';
-import type { NewsfeedPublicPluginStart } from '../../../../src/plugins/newsfeed/public';
-import type { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
-import type { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
-import type { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
-import type { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { FleetStart } from '../../fleet/public';
-import type { PluginStart as ListsPluginStart } from '../../lists/public';
-import type { SpacesPluginStart } from '../../spaces/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { NewsfeedPublicPluginStart } from '@kbn/newsfeed-plugin/public';
+import type { Start as InspectorStart } from '@kbn/inspector-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { FleetStart } from '@kbn/fleet-plugin/public';
+import type { PluginStart as ListsPluginStart } from '@kbn/lists-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup as TriggersActionsSetup,
   TriggersAndActionsUIPublicPluginStart as TriggersActionsStart,
-} from '../../triggers_actions_ui/public';
-import type { CasesUiStart } from '../../cases/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import type { TimelinesUIStart } from '../../timelines/public';
-import type { SessionViewStart } from '../../session_view/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import type { CasesUiStart } from '@kbn/cases-plugin/public';
+import type { SecurityPluginSetup } from '@kbn/security-plugin/public';
+import type { TimelinesUIStart } from '@kbn/timelines-plugin/public';
+import type { SessionViewStart } from '@kbn/session-view-plugin/public';
+import type { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
+import type { OsqueryPluginStart } from '@kbn/osquery-plugin/public';
+import type { LicensingPluginStart, LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import type { DashboardStart } from '@kbn/dashboard-plugin/public';
+import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { ResolverPluginSetup } from './resolver/types';
 import type { Inspect } from '../common/search_strategy';
-import type { MlPluginSetup, MlPluginStart } from '../../ml/public';
-import type { OsqueryPluginStart } from '../../osquery/public';
 import type { Detections } from './detections';
 import type { Cases } from './cases';
 import type { Exceptions } from './exceptions';
@@ -40,10 +44,6 @@ import type { Overview } from './overview';
 import type { Rules } from './rules';
 import type { Timelines } from './timelines';
 import type { Management } from './management';
-import type { LicensingPluginStart, LicensingPluginSetup } from '../../licensing/public';
-import type { DashboardStart } from '../../../../src/plugins/dashboard/public';
-import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 
 export interface SetupPlugins {
   home?: HomePublicPluginSetup;
diff --git a/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx b/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx
index 117a62e0494df..95cc6ceef4e62 100644
--- a/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/all_users/index.test.tsx
@@ -48,5 +48,29 @@ describe('Users Table Component', () => {
       expect(getAllByRole('columnheader').length).toBe(3);
       expect(getByText(userName)).toBeInTheDocument();
     });
+
+    test('it renders empty string token when users name is empty', () => {
+      const { getByTestId } = render(
+        <TestProviders>
+          <UsersTable
+            users={[{ name: '', lastSeen: '2019-04-08T18:35:45.064Z', domain: 'test domain' }]}
+            fakeTotalCount={50}
+            id="users"
+            loading={false}
+            loadPage={loadPage}
+            showMorePagesIndicator={false}
+            totalCount={0}
+            type={usersModel.UsersType.page}
+            sort={{
+              field: UsersFields.name,
+              direction: Direction.asc,
+            }}
+            setQuerySkip={() => {}}
+          />
+        </TestProviders>
+      );
+
+      expect(getByTestId('table-allUsers-loading-false')).toHaveTextContent('(Empty string)');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx b/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx
index 9a00a637f551d..fff8a188fd0a6 100644
--- a/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/all_users/index.tsx
@@ -10,6 +10,7 @@ import { useDispatch } from 'react-redux';
 
 import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date';
 import { UserDetailsLink } from '../../../common/components/links';
+import { getOrEmptyTagFromValue } from '../../../common/components/empty_value';
 
 import {
   Columns,
@@ -66,12 +67,14 @@ const getUsersColumns = (): UsersTableColumns => [
     sortable: true,
     mobileOptions: { show: true },
     render: (name) =>
-      getRowItemDraggables({
-        rowItems: [name],
-        attrName: 'user.name',
-        idPrefix: `users-table-${name}-name`,
-        render: (item) => <UserDetailsLink userName={item} />,
-      }),
+      name != null && name.length > 0
+        ? getRowItemDraggables({
+            rowItems: [name],
+            attrName: 'user.name',
+            idPrefix: `users-table-${name}-name`,
+            render: (item) => <UserDetailsLink userName={item} />,
+          })
+        : getOrEmptyTagFromValue(name),
   },
   {
     field: 'lastSeen',
@@ -88,11 +91,13 @@ const getUsersColumns = (): UsersTableColumns => [
     truncateText: false,
     mobileOptions: { show: true },
     render: (domain) =>
-      getRowItemDraggables({
-        rowItems: [domain],
-        attrName: 'user.domain',
-        idPrefix: `users-table-${domain}-domain`,
-      }),
+      domain != null && domain.length > 0
+        ? getRowItemDraggables({
+            rowItems: [domain],
+            attrName: 'user.domain',
+            idPrefix: `users-table-${domain}-domain`,
+          })
+        : getOrEmptyTagFromValue(domain),
   },
 ];
 
diff --git a/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx b/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx
index cedfd6b50153d..94c2c6b5755f7 100644
--- a/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/kpi_users/total_users/index.test.tsx
@@ -9,7 +9,7 @@ import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../../../common/mock';
 import React from 'react';
-import { TotalUsersKpi } from './index';
+import { TotalUsersKpi } from '.';
 import { useSearchStrategy } from '../../../../common/containers/use_search_strategy';
 
 jest.mock('../../../../common/containers/query_toggle');
diff --git a/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx b/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx
index 0b87165cbe8ac..121ccae4553fc 100644
--- a/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/components/user_risk_score_table/index.tsx
@@ -20,7 +20,7 @@ import { getUserRiskScoreColumns } from './columns';
 
 import * as i18nUsers from '../../pages/translations';
 import * as i18n from './translations';
-import { usersModel, usersSelectors } from '../../store';
+import { usersModel, usersSelectors, usersActions } from '../../store';
 import {
   UserRiskScoreFields,
   UserRiskScoreItem,
@@ -29,7 +29,6 @@ import { SeverityCount } from '../../../common/components/severity/types';
 import { SeverityBadges } from '../../../common/components/severity/severity_badges';
 import { SeverityBar } from '../../../common/components/severity/severity_bar';
 import { SeverityFilterGroup } from '../../../common/components/severity/severity_filter_group';
-import { usersActions } from '../../../users/store';
 import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
 import { State } from '../../../common/store';
 import {
diff --git a/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx b/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx
index d8687524215d5..effe635ac921c 100644
--- a/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/containers/users/details/index.tsx
@@ -10,15 +10,12 @@ import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Subscription } from 'rxjs';
 
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { inputsModel } from '../../../../common/store';
 import { useKibana } from '../../../../common/lib/kibana';
 
 import * as i18n from './translations';
-import {
-  isCompleteResponse,
-  isErrorResponse,
-} from '../../../../../../../../src/plugins/data/common';
 import { getInspectResponse } from '../../../../helpers';
 import { InspectResponse } from '../../../../types';
 import {
diff --git a/x-pack/plugins/security_solution/public/users/index.ts b/x-pack/plugins/security_solution/public/users/index.ts
index 63fdc52e19e52..1ff1f7056d8de 100644
--- a/x-pack/plugins/security_solution/public/users/index.ts
+++ b/x-pack/plugins/security_solution/public/users/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { SecuritySubPluginWithStore } from '../app/types';
 import { routes } from './routes';
 import { initialUsersState, usersReducer, usersModel } from './store';
diff --git a/x-pack/plugins/security_solution/public/users/pages/details/index.tsx b/x-pack/plugins/security_solution/public/users/pages/details/index.tsx
index 3dfe67de92c81..80c2bab837b00 100644
--- a/x-pack/plugins/security_solution/public/users/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/users/pages/details/index.tsx
@@ -11,6 +11,7 @@ import React, { useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
 import type { Filter } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../../app/types';
 import { FiltersGlobal } from '../../../common/components/filters_global';
 import { HeaderPage } from '../../../common/components/header_page';
@@ -24,7 +25,6 @@ import { inputsSelectors } from '../../../common/store';
 import { setUsersDetailsTablesActivePageToZero } from '../../store/actions';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { SpyRoute } from '../../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 
 import { UsersDetailsTabs } from './details_tabs';
 import { navTabsUsersDetails } from './nav_tabs';
diff --git a/x-pack/plugins/security_solution/public/users/pages/details/utils.ts b/x-pack/plugins/security_solution/public/users/pages/details/utils.ts
index e648a8998a989..4b85d0f59314f 100644
--- a/x-pack/plugins/security_solution/public/users/pages/details/utils.ts
+++ b/x-pack/plugins/security_solution/public/users/pages/details/utils.ts
@@ -7,7 +7,7 @@
 
 import { get, isEmpty } from 'lodash/fp';
 
-import { ChromeBreadcrumb } from '../../../../../../../src/core/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { usersModel } from '../../store';
 import { UsersTableType } from '../../store/model';
 import { getUsersDetailsUrl } from '../../../common/components/link_to/redirect_to_users';
diff --git a/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts b/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts
index d5c49590dad60..d66e6b8d84c29 100644
--- a/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts
+++ b/x-pack/plugins/security_solution/public/users/pages/navigation/types.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { DocValueFields } from '@kbn/timelines-plugin/common';
 import { UsersTableType, UsersType } from '../../store/model';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 import { ESTermQuery } from '../../../../common/typed_json';
-import { DocValueFields } from '../../../../../timelines/common';
 import { NavTab } from '../../../common/components/navigation/types';
 
 type KeyUsersNavTabWithoutMlPermission = UsersTableType.allUsers &
diff --git a/x-pack/plugins/security_solution/public/users/pages/types.ts b/x-pack/plugins/security_solution/public/users/pages/types.ts
index 787f5def1a18c..79336098813da 100644
--- a/x-pack/plugins/security_solution/public/users/pages/types.ts
+++ b/x-pack/plugins/security_solution/public/users/pages/types.ts
@@ -7,10 +7,10 @@
 import { ActionCreator } from 'typescript-fsa';
 
 import { Filter } from '@kbn/es-query';
+import { DocValueFields } from '@kbn/timelines-plugin/common';
 import { GlobalTimeArgs } from '../../common/containers/use_global_time';
 
-import { usersModel } from '../../users/store';
-import { DocValueFields } from '../../../../timelines/common';
+import { usersModel } from '../store';
 import { InputsModelId } from '../../common/store/inputs/constants';
 
 export type UsersTabsProps = GlobalTimeArgs & {
diff --git a/x-pack/plugins/security_solution/public/users/pages/users.tsx b/x-pack/plugins/security_solution/public/users/pages/users.tsx
index 046cf5ead65b7..f1f07249ff19e 100644
--- a/x-pack/plugins/security_solution/public/users/pages/users.tsx
+++ b/x-pack/plugins/security_solution/public/users/pages/users.tsx
@@ -12,7 +12,8 @@ import React, { useCallback, useMemo, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import { Filter } from '@kbn/es-query';
-import { isTab } from '../../../../timelines/public';
+import { isTab } from '@kbn/timelines-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { SecurityPageName } from '../../app/types';
 import { FiltersGlobal } from '../../common/components/filters_global';
 import { HeaderPage } from '../../common/components/header_page';
@@ -29,7 +30,6 @@ import { inputsSelectors, State } from '../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../common/store/inputs/actions';
 
 import { SpyRoute } from '../../common/utils/route/spy_routes';
-import { getEsQueryConfig } from '../../../../../../src/plugins/data/common';
 import { UsersTabs } from './users_tabs';
 import { navTabsUsers } from './nav_tabs';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx b/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx
index c3ffdc646966f..d16dd6053002e 100644
--- a/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx
+++ b/x-pack/plugins/security_solution/public/users/pages/users_tabs.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../common/mock';
 import { SecuritySolutionTabNavigation } from '../../common/components/navigation';
 import { Users } from './users';
 import { useSourcererDataView } from '../../common/containers/sourcerer';
-import { mockCasesContext } from '../../../../cases/public/mocks/mock_cases_context';
+import { mockCasesContext } from '@kbn/cases-plugin/public/mocks/mock_cases_context';
 import { LandingPageComponent } from '../../common/components/landing_page';
 
 jest.mock('../../common/containers/sourcerer');
diff --git a/x-pack/plugins/security_solution/public/users/routes.tsx b/x-pack/plugins/security_solution/public/users/routes.tsx
index dcdda586449f9..426e7090ca845 100644
--- a/x-pack/plugins/security_solution/public/users/routes.tsx
+++ b/x-pack/plugins/security_solution/public/users/routes.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { UsersContainer } from './pages';
 
-import { TrackApplicationView } from '../../../../../src/plugins/usage_collection/public';
 import { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
 import { USERS_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts
index 0866d2d8465c5..48a9cf82d720d 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/random_policy_id_generator.ts
@@ -8,11 +8,11 @@
 import { ToolingLog } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 import { AxiosResponse } from 'axios';
-import { indexFleetEndpointPolicy } from '../../../common/endpoint/data_loaders/index_fleet_endpoint_policy';
 import {
   PACKAGE_POLICY_API_ROUTES,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
-} from '../../../../fleet/common/constants';
+} from '@kbn/fleet-plugin/common/constants';
+import { indexFleetEndpointPolicy } from '../../../common/endpoint/data_loaders/index_fleet_endpoint_policy';
 import { setupFleetForEndpoint } from '../../../common/endpoint/data_loaders/setup_fleet_for_endpoint';
 import { GetPolicyListResponse } from '../../../public/management/pages/policy/types';
 
diff --git a/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts b/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts
index 917eb205837a6..f5764fe28e9d3 100644
--- a/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts
+++ b/x-pack/plugins/security_solution/server/__mocks__/alert.mock.ts
@@ -7,10 +7,10 @@
 
 // See: https://github.com/elastic/kibana/issues/117255, this creates mocks to avoid memory leaks from kibana core.
 
-import { parseDuration } from '../../../alerting/common/parse_duration';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 // We _must_ import from the restricted path or we pull in _everything_ including memory leaks from Kibana core
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ReadOperations, WriteOperations } from '../../../alerting/server/authorization';
+import { ReadOperations, WriteOperations } from '@kbn/alerting-plugin/server/authorization';
 
 module.exports = {
   parseDuration,
diff --git a/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts b/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts
index c5e07f9c135a7..adf7a0a8eb193 100644
--- a/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts
+++ b/x-pack/plugins/security_solution/server/__mocks__/core.mock.ts
@@ -9,7 +9,7 @@
 
 // We _must_ import from the restricted path or we pull in _everything_ including memory leaks from Kibana core
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsUtils } from '../../../../../src/core/server/saved_objects/service/lib/utils';
+import { SavedObjectsUtils } from '@kbn/core/server/saved_objects/service/lib/utils';
 module.exports = {
   SavedObjectsUtils,
 };
diff --git a/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts b/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts
index e61080e56ea69..8a0eb39aa8f23 100644
--- a/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts
+++ b/x-pack/plugins/security_solution/server/__mocks__/task_manager.mock.ts
@@ -8,7 +8,7 @@
 // See: https://github.com/elastic/kibana/issues/117255, this creates mocks to avoid memory leaks from kibana core.
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { TaskStatus } from '../../../task_manager/server/task';
+import { TaskStatus } from '@kbn/task-manager-plugin/server/task';
 module.exports = {
   TaskStatus,
 };
diff --git a/x-pack/plugins/security_solution/server/client/factory.test.ts b/x-pack/plugins/security_solution/server/client/factory.test.ts
index 2a8653a6fc15d..f424b5c6901a1 100644
--- a/x-pack/plugins/security_solution/server/client/factory.test.ts
+++ b/x-pack/plugins/security_solution/server/client/factory.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 import { createMockConfig } from '../lib/detection_engine/routes/__mocks__';
 import { AppClientFactory } from './factory';
 import { AppClient } from './client';
diff --git a/x-pack/plugins/security_solution/server/client/factory.ts b/x-pack/plugins/security_solution/server/client/factory.ts
index 67af254ec37d7..09a6791596ce1 100644
--- a/x-pack/plugins/security_solution/server/client/factory.ts
+++ b/x-pack/plugins/security_solution/server/client/factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from '../../../../../src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { AppClient } from './client';
 import { ConfigType } from '../config';
 
diff --git a/x-pack/plugins/security_solution/server/config.ts b/x-pack/plugins/security_solution/server/config.ts
index d7e8547fd50ef..42eaed75be239 100644
--- a/x-pack/plugins/security_solution/server/config.ts
+++ b/x-pack/plugins/security_solution/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SIGNALS_INDEX_KEY, DEFAULT_SIGNALS_INDEX } from '../common/constants';
 import {
   ExperimentalFeatures,
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 ece99dfd8e443..e65dac1e0b688 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
@@ -5,20 +5,21 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'src/core/server';
-import { ExceptionListClient } from '../../../lists/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import {
   CasesClient,
   PluginStartContract as CasesPluginStartContract,
-} from '../../../cases/server';
-import { SecurityPluginStart } from '../../../security/server';
+} from '@kbn/cases-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   AgentService,
   FleetStartContract,
   AgentPolicyServiceInterface,
   PackagePolicyServiceInterface,
-} from '../../../fleet/server';
-import { PluginStartContract as AlertsPluginStartContract } from '../../../alerting/server';
+} from '@kbn/fleet-plugin/server';
+import { PluginStartContract as AlertsPluginStartContract } from '@kbn/alerting-plugin/server';
+import type { ListsServerExtensionRegistrar } from '@kbn/lists-plugin/server';
 import {
   getPackagePolicyCreateCallback,
   getPackagePolicyUpdateCallback,
@@ -39,7 +40,6 @@ import {
   EndpointInternalFleetServicesInterface,
   EndpointScopedFleetServicesInterface,
 } from './services/fleet/endpoint_fleet_services_factory';
-import type { ListsServerExtensionRegistrar } from '../../../lists/server';
 import { registerListsPluginEndpointExtensionPoints } from '../lists_integration';
 import { EndpointAuthz } from '../../common/endpoint/types/authz';
 import { calculateEndpointAuthz } from '../../common/endpoint/service/authz';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
index 20da1e212f40f..4a1552e2b3a25 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   InternalArtifactSchema,
   InternalArtifactCompleteSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
index 179ea3827df0c..0f4890ac3baba 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ExceptionListClient } from '../../../../../lists/server';
-import { listMock } from '../../../../../lists/server/mocks';
-import { getFoundExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/found_exception_list_item_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getFoundExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/found_exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import type { EntriesArray, EntryList } from '@kbn/securitysolution-io-ts-list-types';
 import { buildArtifact, getEndpointExceptionList, getFilteredEndpointExceptionList } from './lists';
 import { TranslatedEntry, TranslatedExceptionListItem } from '../../schemas/artifacts';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
index 2ea52485e625b..f2fda48dbc05e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
@@ -22,7 +22,7 @@ import {
   ENDPOINT_LIST_ID,
   ENDPOINT_TRUSTED_APPS_LIST_ID,
 } from '@kbn/securitysolution-list-constants';
-import { ExceptionListClient } from '../../../../../lists/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import {
   InternalArtifactCompleteSchema,
   TranslatedEntry,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts
index 5f1fe72b7c0f9..0226e8d47df3d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest_entry.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { relativeDownloadUrlFromArtifact } from '@kbn/fleet-plugin/server';
 import { InternalArtifactSchema } from '../../schemas/artifacts';
 import { CompressionAlgorithm } from '../../../../common/endpoint/schema/common';
 import { ManifestEntrySchema } from '../../../../common/endpoint/schema/manifest';
 import { getArtifactId } from './common';
-import { relativeDownloadUrlFromArtifact } from '../../../../../fleet/server';
 
 export class ManifestEntry {
   private artifact: InternalArtifactSchema;
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts
index aef57f6679b27..ee850f93a7b2a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.test.ts
@@ -8,19 +8,19 @@
 import {
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../../src/core/server/mocks';
+  elasticsearchServiceMock,
+} from '@kbn/core/server/mocks';
 import {
   Logger,
   SavedObjectsClient,
   SavedObjectsFindResponse,
   SavedObjectsFindResult,
-} from 'kibana/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+} from '@kbn/core/server';
 import { migrateArtifactsToFleet } from './migrate_artifacts_to_fleet';
 import { createEndpointArtifactClientMock } from '../../services/artifacts/mocks';
 import { InternalArtifactCompleteSchema } from '../../schemas';
-import { generateArtifactEsGetSingleHitMock } from '../../../../../fleet/server/services/artifacts/mocks';
-import { NewArtifact } from '../../../../../fleet/server/services';
+import { generateArtifactEsGetSingleHitMock } from '@kbn/fleet-plugin/server/services/artifacts/mocks';
+import { NewArtifact } from '@kbn/fleet-plugin/server/services';
 import { CreateRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 describe('When migrating artifacts to fleet', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts
index 53c4d5bafe39c..ee72ccbc73e82 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrate_artifacts_to_fleet.ts
@@ -7,7 +7,7 @@
 
 import { inflate as _inflate } from 'zlib';
 import { promisify } from 'util';
-import { SavedObjectsClient, Logger } from 'kibana/server';
+import { SavedObjectsClient, Logger } from '@kbn/core/server';
 import { EndpointArtifactClientInterface } from '../../services';
 import { InternalArtifactCompleteSchema, InternalArtifactSchema } from '../../schemas';
 import { ArtifactConstants } from './common';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts
index 814a9880014cd..9ec6cd9e26a02 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { ManifestConstants } from './common';
 import { migrations, OldInternalManifestSchema } from './migrations';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts
index e419c4297b23a..057a840d2fc6e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/migrations.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectMigrationMap,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { InternalManifestSchema } from '../../schemas/artifacts';
 
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 172e4656b9754..bf3e4d398933a 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
@@ -6,8 +6,8 @@
  */
 
 import { mapValues } from 'lodash';
-import { PackagePolicy, PackagePolicyConfigRecord } from '../../../../../fleet/common';
-import { createPackagePolicyMock } from '../../../../../fleet/common/mocks';
+import { PackagePolicy, PackagePolicyConfigRecord } from '@kbn/fleet-plugin/common';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
 import {
   getInternalArtifactMock,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
index 2202336ef4519..0805e94262572 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { ArtifactConstants, ManifestConstants } from './common';
 import { migrations } from './migrations';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts
index 396cc402c0ab5..5cd96436489e0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { taskManagerMock } from '../../../../../task_manager/server/mocks';
-import { TaskStatus } from '../../../../../task_manager/server';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { TaskStatus } from '@kbn/task-manager-plugin/server';
 
 import { createMockEndpointAppContext } from '../../mocks';
 
@@ -17,7 +17,7 @@ import { buildManifestManagerMock } from '../../services/artifacts/manifest_mana
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
 import { getMockArtifacts } from './mocks';
 import { InvalidInternalManifestError } from '../../services/artifacts/errors';
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('task', () => {
   const MOCK_TASK_INSTANCE = {
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 06192fa8ba82f..ad31b51cae22b 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
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { EndpointAppContext } from '../../types';
 import { getArtifactId, reportErrors } from './common';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts
index b15101bf3cdb3..0395db54b7a2e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.test.ts
@@ -14,24 +14,20 @@ import {
   BASE_NEXT_ATTEMPT_DELAY,
 } from './check_metadata_transforms_task';
 import { createMockEndpointAppContext } from '../../mocks';
-import { coreMock } from '../../../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../../../../task_manager/server/mocks';
-import { TaskManagerSetupContract, TaskStatus } from '../../../../../task_manager/server';
-import { CoreSetup } from '../../../../../../../src/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { TaskManagerSetupContract, TaskStatus } from '@kbn/task-manager-plugin/server';
+import { CoreSetup } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { TRANSFORM_STATES } from '../../../../common/constants';
 import { METADATA_TRANSFORMS_PATTERN } from '../../../../common/endpoint/constants';
-import { RunResult } from '../../../../../task_manager/server/task';
-import {
-  ElasticsearchAssetType,
-  EsAssetReference,
-  Installation,
-} from '../../../../../fleet/common';
+import { RunResult } from '@kbn/task-manager-plugin/server/task';
+import { ElasticsearchAssetType, EsAssetReference, Installation } from '@kbn/fleet-plugin/common';
 
 import type { EndpointAppContext } from '../../types';
-import type { PackagePolicy } from '../../../../../fleet/common/types/models/package_policy';
-import type { PackageClient } from '../../../../../fleet/server';
+import type { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
+import type { PackageClient } from '@kbn/fleet-plugin/server';
 
 const MOCK_TASK_INSTANCE = {
   id: `${TYPE}:${VERSION}`,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
index 39c93e748d75b..114e29d0a221b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/metadata/check_metadata_transforms_task.ts
@@ -10,18 +10,18 @@ import {
   TransformGetTransformStatsResponse,
   TransformGetTransformStatsTransformStats,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { CoreSetup, ElasticsearchClient, Logger } from 'src/core/server';
+import { CoreSetup, ElasticsearchClient, Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
   throwUnrecoverableError,
-} from '../../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
+import { ElasticsearchAssetType, FLEET_ENDPOINT_PACKAGE } from '@kbn/fleet-plugin/common';
 import { EndpointAppContext } from '../../types';
 import { METADATA_TRANSFORMS_PATTERN } from '../../../../common/endpoint/constants';
 import { WARNING_TRANSFORM_STATES } from '../../../../common/constants';
 import { wrapErrorIfNeeded } from '../../utils';
-import { ElasticsearchAssetType, FLEET_ENDPOINT_PACKAGE } from '../../../../../fleet/common';
 
 const SCOPE = ['securitySolution'];
 const INTERVAL = '2h';
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
index 32d5806a4b47a..d49f07919a9c9 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
@@ -10,15 +10,15 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsServiceMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { LicenseService } from '../../../../common/license';
-import { createPackagePolicyServiceMock } from '../../../../../fleet/server/mocks';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
 import { PolicyWatcher } from './license_watch';
-import { ILicense } from '../../../../../licensing/common/types';
-import { licenseMock } from '../../../../../licensing/common/licensing.mock';
-import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
-import { PackagePolicy } from '../../../../../fleet/common';
-import { createPackagePolicyMock } from '../../../../../fleet/common/mocks';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common';
+import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
 import { policyFactory } from '../../../../common/endpoint/models/policy_config';
 import { PolicyConfig } from '../../../../common/endpoint/types';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
index 8303291b5bcd4..f88b3dab61b26 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
@@ -14,10 +14,10 @@ import {
   Logger,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'src/core/server';
-import { PackagePolicy, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../fleet/common';
-import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
-import { ILicense } from '../../../../../licensing/common/types';
+} from '@kbn/core/server';
+import { PackagePolicy, PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import {
   isEndpointPolicyValidForLicense,
   unsetPolicyFeaturesAccordingToLicenseLevel,
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index d646b3b505ede..46e4df691b086 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -5,20 +5,27 @@
  * 2.0.
  */
 
-import { loggingSystemMock, savedObjectsServiceMock } from '../../../../../src/core/server/mocks';
-import { IScopedClusterClient, SavedObjectsClientContract } from '../../../../../src/core/server';
-import { listMock } from '../../../lists/server/mocks';
-import { securityMock } from '../../../security/server/mocks';
-import { alertsMock } from '../../../alerting/server/mocks';
-import { xpackMocks } from '../fixtures';
-import { FleetStartContract, ExternalCallback } from '../../../fleet/server';
+import { loggingSystemMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
+import { IScopedClusterClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { FleetStartContract, ExternalCallback } from '@kbn/fleet-plugin/server';
 import {
   createPackagePolicyServiceMock,
   createMockAgentPolicyService,
   createMockAgentService,
   createArtifactsClientMock,
   createMockPackageService,
-} from '../../../fleet/server/mocks';
+} from '@kbn/fleet-plugin/server/mocks';
+// A TS error (TS2403) is thrown when attempting to export the mock function below from Cases
+// plugin server `index.ts`. Its unclear what is actually causing the error. Since this is a Mock
+// file and not bundled with the application, adding a eslint disable below and using import from
+// a restricted path.
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createCasesClientMock } from '@kbn/cases-plugin/server/client/mocks';
+import { createFleetAuthzMock } from '@kbn/fleet-plugin/common';
+import { xpackMocks } from '../fixtures';
 import { createMockConfig, requestContextMock } from '../lib/detection_engine/routes/__mocks__';
 import {
   EndpointAppContextService,
@@ -31,15 +38,8 @@ import { EndpointAppContext } from './types';
 import { MetadataRequestContext } from './routes/metadata/handlers';
 import { SecuritySolutionRequestHandlerContext } from '../types';
 import { parseExperimentalConfigValue } from '../../common/experimental_features';
-// A TS error (TS2403) is thrown when attempting to export the mock function below from Cases
-// plugin server `index.ts`. Its unclear what is actually causing the error. Since this is a Mock
-// file and not bundled with the application, adding a eslint disable below and using import from
-// a restricted path.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createCasesClientMock } from '../../../cases/server/client/mocks';
 import { requestContextFactoryMock } from '../request_context_factory.mock';
 import { EndpointMetadataService } from './services/metadata';
-import { createFleetAuthzMock } from '../../../fleet/common';
 import { createMockClients } from '../lib/detection_engine/routes/__mocks__/request_context';
 import { createEndpointMetadataServiceTestContextMock } from './services/metadata/mocks';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
index fe35d4689b487..960969b41966c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
@@ -7,14 +7,14 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import { KibanaResponseFactory, RequestHandler, RouteConfig } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import {
   EndpointActionLogRequestParams,
   EndpointActionLogRequestQuery,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts
index 716c1ab833559..1218df3b42a14 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import {
   EndpointActionLogRequestParams,
   EndpointActionLogRequestQuery,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
index 559ecf0a621d6..e17f48017ba6d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.test.ts
@@ -6,14 +6,19 @@
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { KibanaRequest, KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import {
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandler,
+  RouteConfig,
+} from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
 import { SecuritySolutionRequestHandlerContext } from '../../../types';
 import { EndpointAppContextService } from '../../endpoint_app_context_services';
@@ -27,9 +32,9 @@ import { registerHostIsolationRoutes } from './isolation';
 import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
 import { LicenseService } from '../../../../common/license';
 import { Subject } from 'rxjs';
-import { ILicense } from '../../../../../licensing/common/types';
-import { licenseMock } from '../../../../../licensing/common/licensing.mock';
-import { License } from '../../../../../licensing/common/license';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { License } from '@kbn/licensing-plugin/common/license';
 import {
   ISOLATE_HOST_ROUTE,
   UNISOLATE_HOST_ROUTE,
@@ -45,11 +50,11 @@ import {
 } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { legacyMetadataSearchResponseMock } from '../metadata/support/test_support';
-import { AGENT_ACTIONS_INDEX, ElasticsearchAssetType } from '../../../../../fleet/common';
-import { CasesClientMock } from '../../../../../cases/server/client/mocks';
+import { AGENT_ACTIONS_INDEX, ElasticsearchAssetType } from '@kbn/fleet-plugin/common';
+import { CasesClientMock } from '@kbn/cases-plugin/server/client/mocks';
 import { EndpointAuthz } from '../../../../common/endpoint/types/authz';
-import type { PackageClient } from '../../../../../fleet/server';
-import { createMockPackageService } from '../../../../../fleet/server/mocks';
+import type { PackageClient } from '@kbn/fleet-plugin/server';
+import { createMockPackageService } from '@kbn/fleet-plugin/server/mocks';
 
 interface CallRouteInterface {
   body?: HostIsolationRequestBody;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
index 859a0cc06348a..101a55d7acba3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/isolation.ts
@@ -6,11 +6,12 @@
  */
 
 import moment from 'moment';
-import { RequestHandler, Logger } from 'src/core/server';
+import { RequestHandler, Logger } from '@kbn/core/server';
 import uuid from 'uuid';
 import { TypeOf } from '@kbn/config-schema';
-import { CommentType } from '../../../../../cases/common';
-import { CasesByAlertId } from '../../../../../cases/common/api/cases/case';
+import { CommentType } from '@kbn/cases-plugin/common';
+import { CasesByAlertId } from '@kbn/cases-plugin/common/api/cases/case';
+import { AGENT_ACTIONS_INDEX } from '@kbn/fleet-plugin/common';
 import { HostIsolationRequestSchema } from '../../../../common/endpoint/schema/actions';
 import {
   ENDPOINT_ACTIONS_DS,
@@ -19,7 +20,6 @@ import {
   UNISOLATE_HOST_ROUTE,
   failedFleetActionErrorCode,
 } from '../../../../common/endpoint/constants';
-import { AGENT_ACTIONS_INDEX } from '../../../../../fleet/common';
 import {
   EndpointAction,
   HostMetadata,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
index a239ae03ce135..5a84d7764454c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
@@ -7,14 +7,14 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import { KibanaResponseFactory, RequestHandler, RouteConfig } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { ActionStatusRequestSchema } from '../../../../common/endpoint/schema/actions';
 import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
index 124c01c1dc1cb..9b134e385be6f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { ActionStatusRequestSchema } from '../../../../common/endpoint/schema/actions';
 import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
index 8cbdbc064f8b9..b508469b88f53 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/enrichment.test.ts
@@ -9,7 +9,7 @@ import { HostStatus } from '../../../../common/endpoint/types';
 import { createMockMetadataRequestContext } from '../../mocks';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { enrichHostMetadata, MetadataRequestContext } from './handlers';
-import { AgentClient } from '../../../../../fleet/server';
+import { AgentClient } from '@kbn/fleet-plugin/server';
 
 describe('test document enrichment', () => {
   let metaReqCtx: jest.Mocked<MetadataRequestContext>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
index 1d2c589cd15a2..a8d186e126b62 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts
@@ -13,7 +13,9 @@ import {
   Logger,
   RequestHandler,
   SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
+import { AgentNotFoundError } from '@kbn/fleet-plugin/server';
 import {
   HostInfo,
   HostMetadata,
@@ -24,10 +26,8 @@ import {
 import type { SecuritySolutionRequestHandlerContext } from '../../../types';
 
 import { kibanaRequestToMetadataListESQuery } from './query_builders';
-import { PackagePolicy } from '../../../../../fleet/common/types/models';
-import { AgentNotFoundError } from '../../../../../fleet/server';
 import { EndpointAppContext, HostListQueryResult } from '../../types';
-import { GetMetadataRequestSchema } from './index';
+import { GetMetadataRequestSchema } from '.';
 import { findAllUnenrolledAgentIds } from './support/unenroll';
 import { findAgentIdsByStatus } from './support/agent_status';
 import { EndpointAppContextService } from '../../endpoint_app_context_services';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
index 8998b88391f96..628672b13006e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts
@@ -10,17 +10,17 @@ import {
   RequestHandler,
   RouteConfig,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { HostInfo, HostStatus, MetadataListResponse } from '../../../../common/endpoint/types';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
-import { registerEndpointRoutes } from './index';
+import { registerEndpointRoutes } from '.';
 import {
   createMockEndpointAppContextServiceSetupContract,
   createMockEndpointAppContextServiceStartContract,
@@ -32,12 +32,12 @@ import {
 } from '../../endpoint_app_context_services';
 import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
-import { Agent, ElasticsearchAssetType } from '../../../../../fleet/common/types/models';
+import { Agent, ElasticsearchAssetType } from '@kbn/fleet-plugin/common/types/models';
 import {
   legacyMetadataSearchResponseMock,
   unitedMetadataSearchResponseMock,
 } from './support/test_support';
-import type { AgentClient, PackageService, PackageClient } from '../../../../../fleet/server';
+import type { AgentClient, PackageService, PackageClient } from '@kbn/fleet-plugin/server';
 import {
   HOST_METADATA_GET_ROUTE,
   HOST_METADATA_LIST_ROUTE,
@@ -48,15 +48,15 @@ import {
 } from '../../../../common/endpoint/constants';
 import { TRANSFORM_STATES } from '../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../types';
-import { AgentNotFoundError, PackagePolicyServiceInterface } from '../../../../../fleet/server';
+import { AgentNotFoundError, PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import {
   ClusterClientMock,
   ScopedClusterClientMock,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+} from '@kbn/core/server/elasticsearch/client/mocks';
 import { EndpointHostNotFoundError } from '../../services/metadata';
 import { FleetAgentGenerator } from '../../../../common/endpoint/data_generators/fleet_agent_generator';
-import { createMockAgentClient, createMockPackageService } from '../../../../../fleet/server/mocks';
+import { createMockAgentClient, createMockPackageService } from '@kbn/fleet-plugin/server/mocks';
 import { TransformGetTransformStatsResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { getEndpointAuthzInitialStateMock } from '../../../../common/endpoint/service/authz';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
index 3785f1b7577f6..4c7ca37d53560 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/query_builders.ts
@@ -7,13 +7,13 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   ENDPOINT_DEFAULT_PAGE,
   ENDPOINT_DEFAULT_PAGE_SIZE,
   metadataCurrentIndexPattern,
   METADATA_UNITED_INDEX,
 } from '../../../../common/endpoint/constants';
-import { KibanaRequest } from '../../../../../../../src/core/server';
 import { EndpointAppContext } from '../../types';
 import { buildStatusesKuery } from './support/agent_status';
 import { GetMetadataListRequestQuery } from '../../../../common/endpoint/schema/metadata';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts
index 4fbe94809a1d1..04cbdf0363a52 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/route_schema_test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { endpointFilters } from './index';
+import { endpointFilters } from '.';
 
 describe('Filters Schema Test', () => {
   it('accepts a single host status', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts
index 50961ee494254..427ab33d04b1b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.test.ts
@@ -6,10 +6,10 @@
  */
 
 import { buildStatusesKuery, findAgentIdsByStatus } from './agent_status';
-import { AgentClient } from '../../../../../../fleet/server/services';
-import { createMockAgentClient } from '../../../../../../fleet/server/mocks';
-import { Agent } from '../../../../../../fleet/common/types/models';
-import { AgentStatusKueryHelper } from '../../../../../../fleet/common/services';
+import { AgentClient } from '@kbn/fleet-plugin/server/services';
+import { createMockAgentClient } from '@kbn/fleet-plugin/server/mocks';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
+import { AgentStatusKueryHelper } from '@kbn/fleet-plugin/common/services';
 
 describe('test filtering endpoint hosts by agent status', () => {
   let mockAgentClient: jest.Mocked<AgentClient>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts
index f4fbcb53e4824..058fff6481a4d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/agent_status.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { AgentClient } from '../../../../../../fleet/server';
-import { AgentStatusKueryHelper } from '../../../../../../fleet/common/services';
-import { Agent } from '../../../../../../fleet/common/types/models';
+import { AgentClient } from '@kbn/fleet-plugin/server';
+import { AgentStatusKueryHelper } from '@kbn/fleet-plugin/common/services';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
 import { HostStatus } from '../../../../../common/endpoint/types';
 
 const getStatusQueryMap = (path: string = '') =>
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts
index 6302bb94b1cbd..9577c32d512e7 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { savedObjectsClientMock } from '../../../../../../../../src/core/server/mocks';
-import { createPackagePolicyServiceMock } from '../../../../../../fleet/server/mocks';
-import { PackagePolicy } from '../../../../../../fleet/common/types/models';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { getAllEndpointPackagePolicies } from './endpoint_package_policies';
 
 describe('endpoint_package_policies', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts
index ce8f7bcac510c..2e09360a34901 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/endpoint_package_policies.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
-import { PackagePolicy } from '../../../../../../fleet/common/types/models';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
 
 export const getAllEndpointPackagePolicies = async (
   packagePolicyService: PackagePolicyServiceInterface,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts
index 6f8a0f83bf846..ce78153d78dea 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/test_support.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Agent } from '../../../../../../fleet/common';
+import { Agent } from '@kbn/fleet-plugin/common';
 import { METADATA_UNITED_INDEX } from '../../../../../common/endpoint/constants';
 import { HostMetadata, UnitedAgentMetadata } from '../../../../../common/endpoint/types';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
index 0c1e4578679e0..054dae748b6f3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { findAllUnenrolledAgentIds } from './unenroll';
-import { AgentClient } from '../../../../../../fleet/server/services';
+import { AgentClient } from '@kbn/fleet-plugin/server/services';
 import {
   createMockAgentClient,
   createPackagePolicyServiceMock,
-} from '../../../../../../fleet/server/mocks';
-import { Agent, PackagePolicy } from '../../../../../../fleet/common/types/models';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
+} from '@kbn/fleet-plugin/server/mocks';
+import { Agent, PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 
 describe('test find all unenrolled Agent id', () => {
   let mockAgentClient: jest.Mocked<AgentClient>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
index bf52d34d39932..2163308bd0f91 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { AgentClient } from '../../../../../../fleet/server';
-import { Agent } from '../../../../../../fleet/common/types/models';
+import type { AgentClient } from '@kbn/fleet-plugin/server';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
 
 export async function findAllUnenrolledAgentIds(
   agentClient: AgentClient,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
index ac4a1ee25ebbf..95c3e24709ccc 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.test.ts
@@ -11,28 +11,25 @@ import {
   createMockEndpointAppContextServiceStartContract,
   createRouteHandlerContext,
 } from '../../mocks';
-import { createMockAgentClient, createMockAgentService } from '../../../../../fleet/server/mocks';
+import { createMockAgentClient, createMockAgentService } from '@kbn/fleet-plugin/server/mocks';
 import { getHostPolicyResponseHandler, getAgentPolicySummaryHandler } from './handlers';
-import {
-  KibanaResponseFactory,
-  SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
+import { KibanaResponseFactory, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   httpServerMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { GetHostPolicyResponse, HostPolicyResponse } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
 import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
-import { Agent } from '../../../../../fleet/common/types/models';
-import { AgentClient, AgentService } from '../../../../../fleet/server/services';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
+import { AgentClient, AgentService } from '@kbn/fleet-plugin/server/services';
 import { get } from 'lodash';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ScopedClusterClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { ScopedClusterClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 describe('test policy response handler', () => {
   let endpointAppContextService: EndpointAppContextService;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts
index d02e0402a922e..8a32580f9669a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/handlers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { policyIndexPattern } from '../../../../common/endpoint/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
index 8991dfa9a6bcc..c21a47452b6e8 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import { EndpointAppContext } from '../../types';
 import {
   GetPolicyResponseSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
index 258e1d8ba45b8..1280cfb3db016 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { IScopedClusterClient, KibanaRequest } from '../../../../../../../src/core/server';
+import { IScopedClusterClient, KibanaRequest } from '@kbn/core/server';
+import { Agent } from '@kbn/fleet-plugin/common/types/models';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { GetHostPolicyResponse, HostPolicyResponse } from '../../../../common/endpoint/types';
-import { INITIAL_POLICY_ID } from './index';
-import { Agent } from '../../../../../fleet/common/types/models';
+import { INITIAL_POLICY_ID } from '.';
 import { EndpointAppContext } from '../../types';
-import type { ISearchRequestParams } from '../../../../../../../src/plugins/data/common';
 
 export const getESQueryPolicyResponseByAgentID = (
   agentID: string,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
index 617a1907cf4be..2e50b54f9db70 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter } from '@kbn/core/server';
 import {
   validateEvents,
   validateEntities,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
index f2b29897e2f26..58ccd119c4dde 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { validateEntities } from '../../../../common/endpoint/schema/resolver';
 import { ResolverEntityIndex, ResolverSchema } from '../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
index 6b574b3bcbc27..25d45c54d8b63 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
@@ -6,7 +6,7 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { ResolverPaginatedEvents, SafeResolverEvent } from '../../../../common/endpoint/types';
 import { validateEvents } from '../../../../common/endpoint/schema/resolver';
 import { EventsQuery } from './queries/events';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
index fb7be34a3e5a1..1dab8bd7e1ab3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IScopedClusterClient } from 'kibana/server';
+import type { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { parseFilterQuery } from '../../../../utils/serialized_query';
 import { SafeResolverEvent } from '../../../../../common/endpoint/types';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts
index 675c861b984de..000b8eb60f631 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { RequestHandler } from '@kbn/core/server';
 import { TypeOf } from '@kbn/config-schema';
 import { validateTree } from '../../../../../common/endpoint/schema/resolver';
 import { Fetcher } from './utils/fetch';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts
index 83deae716e12e..09da7f87bf6c8 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/descendants.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { FieldsObject, ResolverSchema } from '../../../../../../common/endpoint/types';
-import { NodeID, TimeRange, docValueFields, validIDs } from '../utils/index';
+import { NodeID, TimeRange, docValueFields, validIDs } from '../utils';
 
 interface DescendantsParams {
   schema: ResolverSchema;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts
index c8a850b49c756..88b2e842ce8cb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/lifecycle.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { FieldsObject, ResolverSchema } from '../../../../../../common/endpoint/types';
-import { NodeID, TimeRange, docValueFields, validIDs } from '../utils/index';
+import { NodeID, TimeRange, docValueFields, validIDs } from '../utils';
 
 interface LifecycleParams {
   schema: ResolverSchema;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts
index 6459792147217..b87b121e5769f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/queries/stats.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { EventStats, ResolverSchema } from '../../../../../../common/endpoint/types';
-import { NodeID, TimeRange } from '../utils/index';
+import { NodeID, TimeRange } from '../utils';
 
 interface AggBucket {
   key: string;
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts
index 8022484b99c53..59be8f76576dd 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.test.ts
@@ -17,8 +17,8 @@ import {
 import { LifecycleQuery } from '../queries/lifecycle';
 import { DescendantsQuery } from '../queries/descendants';
 import { StatsQuery } from '../queries/stats';
-import { IScopedClusterClient } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { IScopedClusterClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   FieldsObject,
   ResolverNode,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts
index 1bbfbde67e981..f7d4b7d97efdb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import {
   firstNonNullValue,
   values,
@@ -17,7 +17,7 @@ import {
   ResolverSchema,
 } from '../../../../../../common/endpoint/types';
 import { DescendantsQuery } from '../queries/descendants';
-import { NodeID } from './index';
+import { NodeID } from '.';
 import { LifecycleQuery } from '../queries/lifecycle';
 import { StatsQuery } from '../queries/stats';
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts
index 0ca051734be19..58082530f8c5b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/tree/utils/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { validIDs } from './index';
+import { validIDs } from '.';
 
 describe('validIDs', () => {
   it('removes empty strings', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts
index a9f43036a118e..607b9a8c23508 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServerMock, loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { RequestHandler } from 'kibana/server';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { RequestHandler } from '@kbn/core/server';
 import { requestContextMock } from '../../lib/detection_engine/routes/__mocks__';
 import { EndpointApiNeededAuthz, withEndpointAuthz } from './with_endpoint_authz';
 import { EndpointAuthz } from '../../../common/endpoint/types/authz';
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts
index e971ef19f8ee9..0ed4adb01a9b6 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/with_endpoint_authz.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandler, Logger } from 'kibana/server';
+import type { RequestHandler, Logger } from '@kbn/core/server';
 import type { EndpointAuthzKeyList } from '../../../common/endpoint/types/authz';
 import type { SecuritySolutionRequestHandlerContext } from '../../types';
 import { EndpointAuthorizationError } from '../errors';
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
index 876949a7ac291..080ee6e588b03 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TransportResult } from '@elastic/elasticsearch';
-import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '../../../../fleet/common';
+import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
 import { ENDPOINT_ACTION_RESPONSES_INDEX_PATTERN } from '../../../common/endpoint/constants';
 import { SecuritySolutionRequestHandlerContext } from '../../types';
 import {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts
index 2987049511c51..b5861a14a6993 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.test.ts
@@ -7,7 +7,7 @@
 
 import { getInternalArtifactMock } from '../../schemas/artifacts/saved_objects.mock';
 import { EndpointArtifactClient } from './artifact_client';
-import { createArtifactsClientMock } from '../../../../../fleet/server/mocks';
+import { createArtifactsClientMock } from '@kbn/fleet-plugin/server/mocks';
 
 describe('artifact_client', () => {
   describe('ArtifactClient sanity checks', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
index 062702bb14a49..0161b9ccb12a2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/artifact_client.ts
@@ -5,13 +5,9 @@
  * 2.0.
  */
 
+import { Artifact, ArtifactsClientInterface, ListArtifactsProps } from '@kbn/fleet-plugin/server';
+import { ListResult } from '@kbn/fleet-plugin/common';
 import { InternalArtifactCompleteSchema } from '../../schemas/artifacts';
-import {
-  Artifact,
-  ArtifactsClientInterface,
-  ListArtifactsProps,
-} from '../../../../../fleet/server';
-import { ListResult } from '../../../../../fleet/common';
 
 export interface EndpointArtifactClientInterface {
   getArtifact(id: string): Promise<InternalArtifactCompleteSchema | undefined>;
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts
index 8b3a4b221b115..72637a3497fff 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { ManifestSchemaVersion } from '../../../../common/endpoint/schema/common';
 import { ManifestConstants } from '../../lib/artifacts';
 import { getInternalManifestMock } from '../../schemas/artifacts/saved_objects.mock';
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts
index 85db51087b609..e20cd1f8c9bf4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_client.ts
@@ -9,7 +9,7 @@ import {
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsUpdateResponse,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import {
   manifestSchemaVersion,
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 a7fb5dc23877c..2928f35c721b5 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,12 +6,12 @@
  */
 
 import LRU from 'lru-cache';
-import { savedObjectsClientMock, loggingSystemMock } from 'src/core/server/mocks';
-import { Logger } from 'src/core/server';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
-import { createPackagePolicyServiceMock } from '../../../../../../fleet/server/mocks';
-import { ExceptionListClient } from '../../../../../../lists/server';
-import { listMock } from '../../../../../../lists/server/mocks';
+import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   createPackagePolicyWithManifestMock,
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 717eadc136331..324d3a1974cd4 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
   ENDPOINT_LIST_ID,
@@ -13,8 +13,8 @@ import {
   ENDPOINT_EVENT_FILTERS_LIST_ID,
   ENDPOINT_BLOCKLISTS_LIST_ID,
 } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { PackagePolicy } from '../../../../../../fleet/common/types/models';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models';
 import { getEmptyInternalArtifactMock } from '../../../schemas/artifacts/saved_objects.mock';
 import {
   InternalArtifactCompleteSchema,
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 a8c63bbb88e13..d1f744b3791c6 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
@@ -9,16 +9,16 @@ import pMap from 'p-map';
 import semver from 'semver';
 import LRU from 'lru-cache';
 import { isEqual, isEmpty } from 'lodash';
-import { Logger, SavedObjectsClientContract } from 'src/core/server';
+import { Logger, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ENDPOINT_EVENT_FILTERS_LIST_ID,
   ENDPOINT_TRUSTED_APPS_LIST_ID,
   ENDPOINT_BLOCKLISTS_LIST_ID,
   ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID,
 } from '@kbn/securitysolution-list-constants';
-import { ListResult } from '../../../../../../fleet/common';
-import { PackagePolicyServiceInterface } from '../../../../../../fleet/server';
-import { ExceptionListClient } from '../../../../../../lists/server';
+import { ListResult } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { ManifestSchemaVersion } from '../../../../../common/endpoint/schema/common';
 import {
   manifestDispatchSchema,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts
index 0a2e6253fd76f..bdaf93e7bea7f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/mocks.ts
@@ -5,17 +5,16 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
-import { savedObjectsClientMock } from 'src/core/server/mocks';
-import { ManifestClient } from './manifest_client';
-import { EndpointArtifactClient, EndpointArtifactClientInterface } from './artifact_client';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { savedObjectsClientMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
-import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 // Because mocks are for testing only, should be ok to import the FleetArtifactsClient directly
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FleetArtifactsClient } from '../../../../../fleet/server/services';
-import { createArtifactsClientMock } from '../../../../../fleet/server/mocks';
+import { FleetArtifactsClient } from '@kbn/fleet-plugin/server/services';
+import { createArtifactsClientMock } from '@kbn/fleet-plugin/server/mocks';
+import { EndpointArtifactClient, EndpointArtifactClientInterface } from './artifact_client';
+import { ManifestClient } from './manifest_client';
 
 export const getManifestClientMock = (
   savedObjectsClient?: SavedObjectsClientContract
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts b/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts
index 337b851466f49..2efc8528e4a5d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/feature_usage/service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Values } from '@kbn/utility-types';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../../../../licensing/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 
 const FEATURES = {
   HOST_ISOLATION: 'Host isolation',
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts b/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
index 7ab263705eaaf..55b737b573fdb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/fleet/endpoint_fleet_services_factory.ts
@@ -5,14 +5,18 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract, SavedObjectsServiceStart } from 'kibana/server';
+import {
+  KibanaRequest,
+  SavedObjectsClientContract,
+  SavedObjectsServiceStart,
+} from '@kbn/core/server';
 import type {
   AgentClient,
   AgentPolicyServiceInterface,
   FleetStartContract,
   PackagePolicyServiceInterface,
   PackageClient,
-} from '../../../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 import { createInternalReadonlySoClient } from '../../utils/create_internal_readonly_so_client';
 
 export interface EndpointFleetServicesFactoryInterface {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts
index 24fdfd15ed105..d8003d368e63e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.test.ts
@@ -9,9 +9,9 @@ import {
   createEndpointMetadataServiceTestContextMock,
   EndpointMetadataServiceTestContextMock,
 } from './mocks';
-import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from '../../../../../../../src/core/server/elasticsearch/client/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import {
   legacyMetadataSearchResponseMock,
   unitedMetadataSearchResponseMock,
@@ -22,8 +22,8 @@ import {
   buildUnitedIndexQuery,
 } from '../../routes/metadata/query_builders';
 import { HostMetadata } from '../../../../common/endpoint/types';
-import { Agent, PackagePolicy } from '../../../../../fleet/common';
-import { AgentPolicyServiceInterface } from '../../../../../fleet/server/services';
+import { Agent, PackagePolicy } from '@kbn/fleet-plugin/common';
+import { AgentPolicyServiceInterface } from '@kbn/fleet-plugin/server/services';
 import { EndpointError } from '../../../../common/endpoint/errors';
 
 describe('EndpointMetadataService', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
index 7ddebf93bb025..4b43d51a44c53 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/endpoint_metadata_service.ts
@@ -10,9 +10,16 @@ import {
   Logger,
   SavedObjectsClientContract,
   SavedObjectsServiceStart,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { SearchTotalHits, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
+import { Agent, AgentPolicy, PackagePolicy } from '@kbn/fleet-plugin/common';
+import {
+  AgentNotFoundError,
+  AgentPolicyServiceInterface,
+  PackagePolicyServiceInterface,
+} from '@kbn/fleet-plugin/server';
+import { getAgentStatus } from '@kbn/fleet-plugin/common/services/agent_status';
 import {
   HostInfo,
   HostMetadata,
@@ -21,12 +28,6 @@ import {
   PolicyData,
   UnitedAgentMetadata,
 } from '../../../../common/endpoint/types';
-import { Agent, AgentPolicy, PackagePolicy } from '../../../../../fleet/common';
-import {
-  AgentNotFoundError,
-  AgentPolicyServiceInterface,
-  PackagePolicyServiceInterface,
-} from '../../../../../fleet/server';
 import {
   EndpointHostNotFoundError,
   EndpointHostUnEnrolledError,
@@ -52,7 +53,6 @@ import {
 import { createInternalReadonlySoClient } from '../../utils/create_internal_readonly_so_client';
 import { METADATA_UNITED_INDEX } from '../../../../common/endpoint/constants';
 import { getAllEndpointPackagePolicies } from '../../routes/metadata/support/endpoint_package_policies';
-import { getAgentStatus } from '../../../../../fleet/common/services/agent_status';
 import { GetMetadataListRequestQuery } from '../../../../common/endpoint/schema/metadata';
 import { EndpointError } from '../../../../common/endpoint/errors';
 import { EndpointFleetServicesInterface } from '../fleet/endpoint_fleet_services_factory';
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts
index 599f153e19e05..ce9f6123635a9 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/metadata/mocks.ts
@@ -5,19 +5,16 @@
  * 2.0.
  */
 
-import { SavedObjectsServiceStart } from 'kibana/server';
-import { EndpointMetadataService } from './endpoint_metadata_service';
-import {
-  loggingSystemMock,
-  savedObjectsServiceMock,
-} from '../../../../../../../src/core/server/mocks';
+import { SavedObjectsServiceStart } from '@kbn/core/server';
+import { loggingSystemMock, savedObjectsServiceMock } from '@kbn/core/server/mocks';
 import {
   createMockAgentPolicyService,
   createMockAgentService,
   createMockPackageService,
   createPackagePolicyServiceMock,
-} from '../../../../../fleet/server/mocks';
-import { AgentPolicyServiceInterface, AgentService } from '../../../../../fleet/server';
+} from '@kbn/fleet-plugin/server/mocks';
+import { AgentPolicyServiceInterface, AgentService } from '@kbn/fleet-plugin/server';
+import { EndpointMetadataService } from './endpoint_metadata_service';
 import {
   EndpointFleetServicesFactory,
   EndpointInternalFleetServicesInterface,
diff --git a/x-pack/plugins/security_solution/server/endpoint/types.ts b/x-pack/plugins/security_solution/server/endpoint/types.ts
index bc52b759b9f0a..acf04c0b0527e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LoggerFactory } from 'kibana/server';
+import { LoggerFactory } from '@kbn/core/server';
 
 import { ConfigType } from '../config';
 import { EndpointAppContextService } from './endpoint_app_context_services';
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts b/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts
index 36c6bffce2c6a..8d9234fab280f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/audit_log_helpers.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { SearchRequest } from 'src/plugins/data/public';
+import type { SearchRequest } from '@kbn/data-plugin/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { TransportResult } from '@elastic/elasticsearch';
-import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '../../../../fleet/common';
+import { AGENT_ACTIONS_INDEX, AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
 import {
   ENDPOINT_ACTIONS_INDEX,
   ENDPOINT_ACTION_RESPONSES_INDEX_PATTERN,
@@ -30,7 +30,7 @@ import {
   LogsEndpointActionResponse,
   ActivityLogEntry,
 } from '../../../common/endpoint/types';
-import { doesLogsEndpointActionsIndexExist } from '../utils';
+import { doesLogsEndpointActionsIndexExist } from '.';
 
 const actionsIndices = [AGENT_ACTIONS_INDEX, ENDPOINT_ACTIONS_INDEX];
 // search all responses indices irrelevant of namespace
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts
index eee6b57232bc1..ab453a574e89c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.test.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  savedObjectsServiceMock,
-  savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { savedObjectsServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   createInternalReadonlySoClient,
   InternalReadonlySoClientMethodNotAllowedError,
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts
index 2a76b24cc4655..962abe330ea39 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/create_internal_readonly_so_client.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract, SavedObjectsServiceStart } from 'kibana/server';
+import {
+  KibanaRequest,
+  SavedObjectsClientContract,
+  SavedObjectsServiceStart,
+} from '@kbn/core/server';
 import { EndpointError } from '../../../common/endpoint/errors';
 
 type SavedObjectsClientContractKeys = keyof SavedObjectsClientContract;
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts b/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts
index 5570de1f63461..d87046b6ea0d1 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/fleet_agent_status_to_endpoint_host_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AgentStatus } from '../../../../fleet/common';
+import { AgentStatus } from '@kbn/fleet-plugin/common';
 import { HostStatus } from '../../../common/endpoint/types';
 
 // For an understanding of how fleet agent status is calculated:
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts
index d2894c8c64c14..43042a332c1d2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.test.ts
@@ -9,7 +9,7 @@ import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { SecuritySolutionRequestHandlerContext } from '../../types';
 import { createRouteHandlerContext } from '../mocks';
 import {
diff --git a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts
index fae38da9a8985..b84a026f9e8e0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/utils/yes_no_data_stream.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { SecuritySolutionRequestHandlerContext } from '../../types';
 
 export const doLogsEndpointActionDsExists = async ({
diff --git a/x-pack/plugins/security_solution/server/features.ts b/x-pack/plugins/security_solution/server/features.ts
index 6fe65ce8692e5..340c4c54c5fc6 100644
--- a/x-pack/plugins/security_solution/server/features.ts
+++ b/x-pack/plugins/security_solution/server/features.ts
@@ -7,11 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { KibanaFeatureConfig, SubFeatureConfig } from '../../features/common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { KibanaFeatureConfig, SubFeatureConfig } from '@kbn/features-plugin/common';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 import { APP_ID, CASES_FEATURE_ID, SERVER_APP_ID } from '../common/constants';
 import { savedObjectTypes } from './saved_objects';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../src/plugins/data_views/common';
 
 export const getCasesKibanaFeature = (): KibanaFeatureConfig => ({
   id: CASES_FEATURE_ID,
diff --git a/x-pack/plugins/security_solution/server/fixtures.ts b/x-pack/plugins/security_solution/server/fixtures.ts
index 0d8f91e481730..2f89cc0153d33 100644
--- a/x-pack/plugins/security_solution/server/fixtures.ts
+++ b/x-pack/plugins/security_solution/server/fixtures.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { coreMock } from '../../../../src/core/server/mocks';
-import { createFleetRequestHandlerContextMock } from '../../fleet/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { createFleetRequestHandlerContextMock } from '@kbn/fleet-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 function createCoreRequestHandlerContextMock() {
   return {
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
index b5e787bd90c98..80bafe6b4799a 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
@@ -7,8 +7,11 @@
 
 import { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
-import { createNewPackagePolicyMock, deletePackagePolicyMock } from '../../../fleet/common/mocks';
+import { httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import {
+  createNewPackagePolicyMock,
+  deletePackagePolicyMock,
+} from '@kbn/fleet-plugin/common/mocks';
 import {
   policyFactory,
   policyFactoryWithoutPaidFeatures,
@@ -19,28 +22,28 @@ import {
   getPackagePolicyDeleteCallback,
   getPackagePolicyUpdateCallback,
 } from './fleet_integration';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { requestContextMock } from '../lib/detection_engine/routes/__mocks__';
 import { requestContextFactoryMock } from '../request_context_factory.mock';
 import { EndpointAppContextServiceStartContract } from '../endpoint/endpoint_app_context_services';
 import { createMockEndpointAppContextServiceStartContract } from '../endpoint/mocks';
-import { licenseMock } from '../../../licensing/common/licensing.mock';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 import { LicenseService } from '../../common/license';
 import { Subject } from 'rxjs';
-import { ILicense } from '../../../licensing/common/types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
 import { EndpointDocGenerator } from '../../common/endpoint/generate_data';
 import { ProtectionModes } from '../../common/endpoint/types';
 import type { SecuritySolutionRequestHandlerContext } from '../types';
-import { getExceptionListClientMock } from '../../../lists/server/services/exception_lists/exception_list_client.mock';
-import { getExceptionListSchemaMock } from '../../../lists/common/schemas/response/exception_list_schema.mock';
-import { ExceptionListClient } from '../../../lists/server';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { InternalArtifactCompleteSchema } from '../endpoint/schemas/artifacts';
 import { ManifestManager } from '../endpoint/services/artifacts/manifest_manager';
 import { getMockArtifacts, toArtifactRecords } from '../endpoint/lib/artifacts/mocks';
 import { Manifest } from '../endpoint/lib/artifacts';
-import { NewPackagePolicy } from '../../../fleet/common/types/models';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/common/types/models';
 import { ManifestSchema } from '../../common/endpoint/schema/manifest';
-import { DeletePackagePoliciesResponse } from '../../../fleet/common';
+import { DeletePackagePoliciesResponse } from '@kbn/fleet-plugin/common';
 import { createMockPolicyData } from '../endpoint/services/feature_usage';
 import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../common/endpoint/service/artifacts/constants';
 
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
index 154b11b88fe5d..a67f08c92d4e4 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger, RequestHandlerContext } from 'kibana/server';
-import { ExceptionListClient } from '../../../lists/server';
-import { PluginStartContract as AlertsStartContract } from '../../../alerting/server';
+import { KibanaRequest, Logger, RequestHandlerContext } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { PluginStartContract as AlertsStartContract } from '@kbn/alerting-plugin/server';
 import {
   PostPackagePolicyCreateCallback,
   PostPackagePolicyDeleteCallback,
   PutPackagePolicyUpdateCallback,
-} from '../../../fleet/server';
+} from '@kbn/fleet-plugin/server';
 
-import { NewPackagePolicy, UpdatePackagePolicy } from '../../../fleet/common';
+import { NewPackagePolicy, UpdatePackagePolicy } from '@kbn/fleet-plugin/common';
 
 import { NewPolicyData, PolicyConfig } from '../../common/endpoint/types';
 import { LicenseService } from '../../common/license';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts
index 2440a0a93187d..6fb356c1906f3 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_policy_artifact_manifest.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { ManifestManager } from '../../endpoint/services';
 import { Manifest, reportErrors } from '../../endpoint/lib/artifacts';
 import { InternalArtifactCompleteSchema } from '../../endpoint/schemas';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
index 01368ccb22c62..609fb8a9554f5 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/install_prepackaged_rules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'kibana/server';
-import { ExceptionListClient } from '../../../../lists/server';
-import { PluginStartContract as AlertsStartContract } from '../../../../alerting/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { PluginStartContract as AlertsStartContract } from '@kbn/alerting-plugin/server';
 import { createDetectionIndex } from '../../lib/detection_engine/routes/index/create_index_route';
 import { createPrepackagedRules } from '../../lib/detection_engine/routes/rules/add_prepackaged_rules_route';
 import { SecuritySolutionApiRequestHandlerContext } from '../../types';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts
index 28ee9d5ad81da..ac666579faa2a 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/remove_policy_from_artifacts.ts
@@ -7,8 +7,8 @@
 
 import pMap from 'p-map';
 
-import { ExceptionListClient } from '../../../../lists/server';
-import { PostPackagePolicyDeleteCallback } from '../../../../fleet/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { PostPackagePolicyDeleteCallback } from '@kbn/fleet-plugin/server';
 import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../../common/endpoint/service/artifacts/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts
index a82f89e31803f..97314d4a39803 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/validate_policy_against_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 import { isEndpointPolicyValidForLicense } from '../../../common/license/policy_config';
 import { PolicyConfig } from '../../../common/endpoint/types';
 import { LicenseService } from '../../../common/license';
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts b/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts
index 6bf77e236212f..2d1618f8f0147 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/notify_protection_feature_usage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { NewPackagePolicy } from '../../../fleet/common';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/common';
 import { PolicyConfig, PolicyOperatingSystem, ProtectionModes } from '../../common/endpoint/types';
 import { EndpointMetadataService } from '../endpoint/services/metadata';
 import { FeatureUsageService } from '../endpoint/services/feature_usage/service';
diff --git a/x-pack/plugins/security_solution/server/index.ts b/x-pack/plugins/security_solution/server/index.ts
index f3ce6e458fe7d..ab133d6c0a4a6 100644
--- a/x-pack/plugins/security_solution/server/index.ts
+++ b/x-pack/plugins/security_solution/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
 import { Plugin, PluginSetup, PluginStart } from './plugin';
 import { configSchema, ConfigSchema, ConfigType } from './config';
 import { SIGNALS_INDEX_KEY } from '../common/constants';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts
index 4fa91bdbfd06d..6cc2a9baef062 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { createMigrationIndex } from './create_migration_index';
 import { createMigration } from './create_migration';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
index c17431c117d82..10f2dbdd93d50 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { SignalsReindexOptions } from '../../../../common/detection_engine/schemas/request/create_signals_migration_schema';
 import { createMigrationIndex } from './create_migration_index';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts
index d74d10e0fc311..e541f7e3e66aa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { createMigrationIndex } from './create_migration_index';
 
 describe('createMigrationIndex', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts
index b1f1ecf85746a..00c6bc369dfc7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Creates the destination index to be used during the migration of a
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts
index 29fd6c21166b0..e8a6e2f1c9692 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { createMigrationSavedObject } from './create_migration_saved_object';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts
index bb9f7599ca6d5..4bee5cbe6dd4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_saved_object.ts
@@ -8,7 +8,7 @@
 import { chain, tryCatch } from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { validateTaskEither } from '@kbn/securitysolution-io-ts-utils';
 import { toError, toPromise } from '@kbn/securitysolution-list-api';
 import { signalsMigrationSOClient } from './saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts
index dce3781b133f8..50fab4a3e1e02 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { deleteMigration } from './delete_migration';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { deleteMigrationSavedObject } from './delete_migration_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts
index db2e0e70889a4..e1e4bfe0bc562 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { deleteMigrationSavedObject } from './delete_migration_saved_object';
 import { isMigrationFailed, isMigrationPending, isMigrationSuccess } from './helpers';
 import { applyMigrationCleanupPolicy } from './migration_cleanup';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts
index 664bd683804b1..97495c1e55ff1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/delete_migration_saved_object.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { signalsMigrationSOClient } from './saved_objects_client';
 
 export const deleteMigrationSavedObject = async ({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts
index 22f4384483715..6c855a5b77748 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getIndexCount } from '@kbn/securitysolution-es-utils';
 import { updateMigrationSavedObject } from './update_migration_saved_object';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts
index b1784d0b2ba1c..21741de8775e8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/finalize_migration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { getIndexCount } from '@kbn/securitysolution-es-utils';
 import { isMigrationPending } from './helpers';
 import { applyMigrationCleanupPolicy } from './migration_cleanup';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts
index 9f0d9b01c43d4..2837dacbd32eb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { findMigrationSavedObjects } from './find_migration_saved_objects';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts
index 2cc73c36500f2..8022b66ed465d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/find_migration_saved_objects.ts
@@ -8,7 +8,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract, SavedObjectsFindOptions } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObjectsFindOptions } from '@kbn/core/server';
 import { validateEither } from '@kbn/securitysolution-io-ts-utils';
 import { signalsMigrationSOClient } from './saved_objects_client';
 import { SignalsMigrationSO, signalsMigrationSOs } from './saved_objects_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts
index cd9d8cdb52a77..2d87ff68d1b99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getIndexVersionsByIndex } from './get_index_versions_by_index';
 
 describe('getIndexVersionsByIndex', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts
index 2de176cebe6ae..49056eecb9454 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_index_versions_by_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export interface IndexMappingsResponse {
   [indexName: string]: { mappings: { _meta: { version: number } } };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts
index 7e678b308e1f9..7b7ff29ec8a5a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   getSignalsMigrationSavedObjectMock,
   getSignalsMigrationSavedObjectErrorMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts
index 66bbc01ef0d68..cdae6104c2945 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_id.ts
@@ -8,7 +8,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { validateEither } from '@kbn/securitysolution-io-ts-utils';
 import { signalsMigrationSOClient } from './saved_objects_client';
 import { SignalsMigrationSO, signalsMigrationSOs } from './saved_objects_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts
index 12b4f06d358ea..713710b6b96f8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { findMigrationSavedObjects } from './find_migration_saved_objects';
 import { getMigrationSavedObjectsByIndex } from './get_migration_saved_objects_by_index';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts
index 18589b8e3ef89..62f748a03547c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_migration_saved_objects_by_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { findMigrationSavedObjects } from './find_migration_saved_objects';
 
 import { SignalsMigrationSO } from './saved_objects_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts
index 2a063a7f7df0e..635880969ea38 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSignalVersionsByIndex } from './get_signal_versions_by_index';
 
 describe('getSignalVersionsByIndex', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts
index a5fd7fbe3ce5a..665bbe86d6b9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signal_versions_by_index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export interface SignalVersionsAggResponse {
   aggregations: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts
index 2ad23ed3584a6..7d77dddc9a7f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSignalsIndicesInRange } from './get_signals_indices_in_range';
 
 describe('getSignalsIndicesInRange', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts
index a03f64c7b8f48..24eb70dde03f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_signals_indices_in_range.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 interface IndexesResponse {
   aggregations: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
index e8b9b000a47d3..ab6a13c96985a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_cleanup.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import migrationCleanupPolicy from './migration_cleanup_policy.json';
 
 export const getMigrationCleanupPolicyName = (alias: string): string =>
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts
index 721b1ce5835be..9c35adba92a2e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/migration_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { SignalsReindexOptions } from '../../../../common/detection_engine/schemas/request/create_signals_migration_schema';
 import { SignalsMigrationSO } from './saved_objects_schema';
 import { createMigrationSavedObject } from './create_migration_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts
index 22cc14be66900..211e81d0168bd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/replace_signals_index_alias.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Updates aliases for the old and new concrete indexes specified, respectively
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts
index c8e3d1275ebfd..7bcc30798806f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const signalsMigrationType = 'security-solution-signals-migration';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts
index 61f35af8cabc8..fe3801cf24276 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/saved_objects_client.ts
@@ -14,7 +14,7 @@ import {
   SavedObjectsBulkGetObject,
   SavedObjectsBulkResponse,
   SavedObjectsBaseOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { signalsMigrationType } from './saved_objects';
 import { SignalsMigrationSOAttributes } from './saved_objects_schema';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts
index 8dbc0c29be3f8..ed4ebea7dfb93 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { SignalsMigrationSOUpdateAttributes } from './saved_objects_schema';
 import { getSignalsMigrationSavedObjectMock } from './saved_objects_schema.mock';
 import { updateMigrationSavedObject } from './update_migration_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts
index 91919246c15a3..a4268895498cc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/update_migration_saved_object.ts
@@ -8,7 +8,7 @@
 import { chain, tryCatch } from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/pipeable';
 
-import { SavedObjectsClientContract, SavedObjectsUpdateResponse } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObjectsUpdateResponse } from '@kbn/core/server';
 import { validateTaskEither } from '@kbn/securitysolution-io-ts-utils';
 import { toError, toPromise } from '@kbn/securitysolution-list-api';
 import { signalsMigrationSOClient } from './saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts
index 23a955423f413..a3c22273ed140 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/get_signals.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import type { SignalSearchResponse, SignalSource } from '../signals/types';
 import { buildSignalsSearchQuery } from './build_signals_query';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts
index cc9e885d49644..077afdd65e504 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { legacyCreateNotifications } from './legacy_create_notifications';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts
index f28dd8b45b035..dec6d51aa9082 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_create_notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SanitizedRule } from '../../../../../alerting/common';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { SERVER_APP_ID, LEGACY_NOTIFICATIONS_ID } from '../../../../common/constants';
 // eslint-disable-next-line no-restricted-imports
 import { CreateNotificationParams, LegacyRuleNotificationAlertTypeParams } from './legacy_types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts
index a7fa01226f008..919af2a131046 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_find_notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams, FindResult } from '../../../../../alerting/server';
+import { RuleTypeParams, FindResult } from '@kbn/alerting-plugin/server';
 import { LEGACY_NOTIFICATIONS_ID } from '../../../../common/constants';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyFindNotificationParams } from './legacy_types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts
index efe4e51e761b9..0980159d67882 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.test.ts
@@ -7,7 +7,7 @@
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyReadNotifications } from './legacy_read_notifications';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   legacyGetNotificationResult,
   legacyGetFindNotificationsResultWithSingleHit,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts
index f6c6f0f982660..05f64e19df26e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_read_notifications.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams, SanitizedRule } from '../../../../../alerting/common';
+import { RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyReadNotificationParams, legacyIsAlertType } from './legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts
index c49e6d060c7c0..0facf29681270 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getAlertMock } from '../routes/__mocks__/request_responses';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRulesNotificationAlertType } from './legacy_rules_notification_alert_type';
 import { buildSignalsSearchQuery } from './build_signals_query';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyNotificationExecutorOptions } from './legacy_types';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts
index 62d187bd3ea0d..55e7b69610501 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_rules_notification_alert_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
 import {
   DEFAULT_RULE_NOTIFICATION_QUERY_SIZE,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts
index 231451947a1dd..f7b97b884a381 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts
index 1461b78ba73a6..1d883cc21cdb0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_references.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { RuleParamsAndRefs } from '../../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { RuleParamsAndRefs } from '@kbn/alerting-plugin/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts
index 8e6732727abf2..05c923a01fc52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts
index 1647e213c1e9e..c223b08b5170c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_extract_rule_id.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyGetRuleReference } from '../../rule_actions/legacy_utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts
index ae34479e73534..214164063c5f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts
index 5a7118d64ba3a..8af032f8b099b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts
index f28d78e5c0304..52a0d6019bfaa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyInjectRuleIdReferences } from './legacy_inject_rule_id_references';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts
index b6ad98eb864ed..da76a562a940e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_saved_object_references/legacy_inject_rule_id_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesNotificationParams } from '../legacy_types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts
index 44cca599a0468..417740ecdea5a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/legacy_types.ts
@@ -16,8 +16,8 @@ import {
   AlertInstanceState,
   AlertInstanceContext,
   RuleExecutorOptions,
-} from '../../../../../alerting/server';
-import { Rule, RuleAction } from '../../../../../alerting/common';
+} from '@kbn/alerting-plugin/server';
+import { Rule, RuleAction } from '@kbn/alerting-plugin/common';
 import { LEGACY_NOTIFICATIONS_ID } from '../../../../common/constants';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
index a10f4a59c7359..d97eff43aeb8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleExecutorServicesMock, alertsMock } from '../../../../../alerting/server/mocks';
+import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { sampleThresholdAlert } from '../rule_types/__mocks__/threshold';
 import {
   NotificationRuleTypeParams,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
index d4cc8385429da..80ed63663a4d0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
@@ -6,7 +6,7 @@
  */
 
 import { mapKeys, snakeCase } from 'lodash/fp';
-import { Alert } from '../../../../../alerting/server';
+import { Alert } from '@kbn/alerting-plugin/server';
 import { expandDottedObject } from '../../../../common/utils/expand_dotted';
 import { RuleParams } from '../schemas/rule_schemas';
 import aadFieldConversion from '../routes/index/signal_aad_mapping.json';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts
index a094a87acfbf6..d7293275c9c49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { alertsMock } from '../../../../../alerting/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { scheduleThrottledNotificationActions } from './schedule_throttle_notification_actions';
 import {
   NotificationRuleTypeParams,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts
index 2399962ad281e..64701060a5418 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_throttle_notification_actions.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObject, Logger } from 'src/core/server';
+import { ElasticsearchClient, SavedObject, Logger } from '@kbn/core/server';
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
-import { Alert } from '../../../../../alerting/server';
+import { Alert } from '@kbn/alerting-plugin/server';
 import { RuleParams } from '../schemas/rule_schemas';
-import { deconflictSignalsAndResults, getNotificationResultsLink } from '../notifications/utils';
+import { deconflictSignalsAndResults, getNotificationResultsLink } from './utils';
 import { DEFAULT_RULE_NOTIFICATION_QUERY_SIZE } from '../../../../common/constants';
-import { getSignals } from '../notifications/get_signals';
+import { getSignals } from './get_signals';
 import {
   NotificationRuleTypeParams,
   scheduleNotificationActions,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts
index 36e0b6a6c02ab..96ea4362b3338 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { SignalSource } from '../signals/types';
 import { deconflictSignalsAndResults, getNotificationResultsLink } from './utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts
index c8fc6febe4d0f..e376d7941fa36 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { APP_PATH } from '../../../../common/constants';
 import { SignalSearchResponse } from '../signals/types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts
index 8a3e779f09d3b..8baa7cd6899ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from '../../../../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 export const requestMock = {
   create: httpServerMock.createKibanaRequest,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
index db4026775a381..ad0c3eace42c8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -6,19 +6,19 @@
  */
 
 import type { MockedKeys } from '@kbn/utility-types/jest';
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
-import { ActionsApiRequestHandlerContext } from '../../../../../../actions/server';
-import { AlertingApiRequestHandlerContext } from '../../../../../../alerting/server';
-import { rulesClientMock } from '../../../../../../alerting/server/mocks';
+import { ActionsApiRequestHandlerContext } from '@kbn/actions-plugin/server';
+import { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 
 // See: https://github.com/elastic/kibana/issues/117255, the moduleNameMapper creates mocks to avoid memory leaks from kibana core.
 // We cannot import from "../../../../../../actions/server" directly here or we have a really bad memory issue. We cannot add this to the existing mocks we created, this fix must be here.
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { actionsClientMock } from '../../../../../../actions/server/actions_client.mock';
-import { licensingMock } from '../../../../../../licensing/server/mocks';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
+import { actionsClientMock } from '@kbn/actions-plugin/server/actions_client.mock';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
 
 import { siemMock } from '../../../../mocks';
 import { createMockConfig } from '../../../../config.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 94c4de459a2ea..b79ae4b38abb9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -9,9 +9,9 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import { ruleTypeMappings } from '@kbn/securitysolution-rules';
 
-import { SavedObjectsFindResponse } from 'src/core/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 
-import { ActionResult } from '../../../../../../actions/server';
+import { ActionResult } from '@kbn/actions-plugin/server';
 import {
   DETECTION_ENGINE_RULES_URL,
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
@@ -24,6 +24,9 @@ import {
   DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL,
   DETECTION_ENGINE_RULES_BULK_ACTION,
   DETECTION_ENGINE_RULE_EXECUTION_EVENTS_URL,
+  DETECTION_ENGINE_RULES_BULK_UPDATE,
+  DETECTION_ENGINE_RULES_BULK_DELETE,
+  DETECTION_ENGINE_RULES_BULK_CREATE,
 } from '../../../../../common/constants';
 import { GetAggregateRuleExecutionEventsResponse } from '../../../../../common/detection_engine/schemas/response';
 import { RuleAlertType, HapiReadableStream } from '../../rules/types';
@@ -35,7 +38,7 @@ import { getFinalizeSignalsMigrationSchemaMock } from '../../../../../common/det
 import { EqlSearchResponse } from '../../../../../common/detection_engine/types';
 import { getSignalsMigrationStatusSchemaMock } from '../../../../../common/detection_engine/schemas/request/get_signals_migration_status_schema.mock';
 import { RuleParams } from '../../schemas/rule_schemas';
-import { SanitizedRule, ResolvedSanitizedRule } from '../../../../../../alerting/common';
+import { SanitizedRule, ResolvedSanitizedRule } from '@kbn/alerting-plugin/common';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 import {
   getPerformBulkActionSchemaMock,
@@ -110,21 +113,21 @@ export const getFindRequest = () =>
 export const getReadBulkRequest = () =>
   requestMock.create({
     method: 'post',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+    path: DETECTION_ENGINE_RULES_BULK_CREATE,
     body: [getCreateRulesSchemaMock()],
   });
 
 export const getUpdateBulkRequest = () =>
   requestMock.create({
     method: 'put',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+    path: DETECTION_ENGINE_RULES_BULK_UPDATE,
     body: [getCreateRulesSchemaMock()],
   });
 
 export const getPatchBulkRequest = () =>
   requestMock.create({
     method: 'patch',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+    path: DETECTION_ENGINE_RULES_BULK_UPDATE,
     body: [getCreateRulesSchemaMock()],
   });
 
@@ -145,28 +148,28 @@ export const getBulkActionEditRequest = () =>
 export const getDeleteBulkRequest = () =>
   requestMock.create({
     method: 'delete',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+    path: DETECTION_ENGINE_RULES_BULK_DELETE,
     body: [{ rule_id: 'rule-1' }],
   });
 
 export const getDeleteBulkRequestById = () =>
   requestMock.create({
     method: 'delete',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+    path: DETECTION_ENGINE_RULES_BULK_DELETE,
     body: [{ id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd' }],
   });
 
 export const getDeleteAsPostBulkRequestById = () =>
   requestMock.create({
     method: 'post',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+    path: DETECTION_ENGINE_RULES_BULK_DELETE,
     body: [{ id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd' }],
   });
 
 export const getDeleteAsPostBulkRequest = () =>
   requestMock.create({
     method: 'post',
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+    path: DETECTION_ENGINE_RULES_BULK_DELETE,
     body: [{ rule_id: 'rule-1' }],
   });
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts
index 9ef6aae00406f..8efe2407f2245 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/response_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServerMock } from '../../../../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 export const responseMock = {
   create: httpServerMock.createResponseFactory,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts
index 4531ca1ed5031..85cf6a07f4d89 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/server.ts
@@ -5,12 +5,8 @@
  * 2.0.
  */
 
-import {
-  RequestHandler,
-  RouteConfig,
-  KibanaRequest,
-} from '../../../../../../../../src/core/server';
-import { httpServiceMock } from '../../../../../../../../src/core/server/mocks';
+import { RequestHandler, RouteConfig, KibanaRequest } from '@kbn/core/server';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { requestContextMock } from './request_context';
 import { responseMock as responseFactoryMock } from './response_factory';
 import { requestMock } from '.';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
index 50ec789266aa0..3a2afef665cf4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { isOutdated } from '../../migrations/helpers';
 import {
   ALIAS_VERSION_FIELD,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
index 5ff76179eeb03..86e06a71b638b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
@@ -7,7 +7,7 @@
 
 import { chunk, get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   transformError,
   getBootstrapIndexExists,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts
index 9d50de51c053c..ea9c36a4f8f41 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/get_index_version.ts
@@ -7,7 +7,7 @@
 
 import { get } from 'lodash';
 import { readIndex } from '@kbn/securitysolution-es-utils';
-import { ElasticsearchClient } from '../../../../../../../../src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export const getIndexVersion = async (
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
index 3b1b27176ef88..24f05c707e3d4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
@@ -6,11 +6,11 @@
  */
 
 import { transformError, getBootstrapIndexExists } from '@kbn/securitysolution-es-utils';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { DETECTION_ENGINE_INDEX_URL } from '../../../../../common/constants';
 
 import { buildSiemResponse } from '../utils';
-import { RuleDataPluginService } from '../../../../../../rule_registry/server';
 import { fieldAliasesOutdated } from './check_template_version';
 import { getIndexVersion } from './get_index_version';
 import { isOutdated } from '../../migrations/helpers';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
index 2c2c65f5f78f7..c4c205e696065 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
@@ -9,7 +9,7 @@ import { readPrivilegesRoute } from './read_privileges_route';
 import { serverMock, requestContextMock } from '../__mocks__';
 import { getPrivilegeRequest, getMockPrivilegesResult } from '../__mocks__/request_responses';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 describe('read_privileges route', () => {
   let server: ReturnType<typeof serverMock.create>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
index 119f7a0b07db5..d5b301364d4ac 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -15,11 +15,11 @@ import {
 import { configMock, requestContextMock, serverMock } from '../__mocks__';
 import { AddPrepackagedRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/add_prepackaged_rules_schema';
 import { addPrepackedRulesRoute, createPrepackagedRules } from './add_prepackaged_rules_route';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { ExceptionListClient } from '../../../../../../lists/server';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { installPrepackagedTimelines } from '../../../timeline/routes/prepackaged_timelines/install_prepackaged_timelines';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 
 jest.mock('../../rules/get_prepackaged_rules', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
index d5c6c0da2cec7..0042030ea21ef 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -8,6 +8,8 @@
 import moment from 'moment';
 import { transformError, getIndexExists } from '@kbn/securitysolution-es-utils';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { RulesClient } from '@kbn/alerting-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import type {
   SecuritySolutionApiRequestHandlerContext,
   SecuritySolutionPluginRouter,
@@ -29,9 +31,7 @@ import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackage
 import { ruleAssetSavedObjectsClientFactory } from '../../rules/rule_asset/rule_asset_saved_objects_client';
 
 import { buildSiemResponse } from '../utils';
-import { RulesClient } from '../../../../../../alerting/server';
 
-import { ExceptionListClient } from '../../../../../../lists/server';
 import { installPrepackagedTimelines } from '../../../timeline/routes/prepackaged_timelines/install_prepackaged_timelines';
 
 export const addPrepackedRulesRoute = (router: SecuritySolutionPluginRouter) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
index 68a3ec0733b60..82813b18cbd04 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { DETECTION_ENGINE_RULES_BULK_CREATE } from '../../../../../common/constants';
 import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks';
 import { buildMlAuthz } from '../../../machine_learning/authz';
 import {
@@ -21,8 +21,9 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { createRulesBulkRoute } from './create_rules_bulk_route';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -38,6 +39,7 @@ describe.each([
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
     ml = mlServicesMock.createSetupContract();
+    const logger = loggingSystemMock.createLogger();
 
     clients.rulesClient.find.mockResolvedValue(getEmptyFindResult()); // no existing rules
     clients.rulesClient.create.mockResolvedValue(
@@ -47,7 +49,7 @@ describe.each([
     context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise(getBasicEmptySearchResponse())
     );
-    createRulesBulkRoute(server.router, ml, isRuleRegistryEnabled);
+    createRulesBulkRoute(server.router, ml, isRuleRegistryEnabled, logger);
   });
 
   describe('status codes', () => {
@@ -137,7 +139,7 @@ describe.each([
     test('returns an error object if duplicate rule_ids found in request payload', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        path: DETECTION_ENGINE_RULES_BULK_CREATE,
         body: [getCreateRulesSchemaMock(), getCreateRulesSchemaMock()],
       });
       const response = await server.inject(request, context);
@@ -158,7 +160,7 @@ describe.each([
     test('allows rule type of query', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        path: DETECTION_ENGINE_RULES_BULK_CREATE,
         body: [{ ...getCreateRulesSchemaMock(), type: 'query' }],
       });
       const result = server.validate(request);
@@ -169,7 +171,7 @@ describe.each([
     test('allows rule type of query and custom from and interval', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        path: DETECTION_ENGINE_RULES_BULK_CREATE,
         body: [{ from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock() }],
       });
       const result = server.validate(request);
@@ -180,7 +182,7 @@ describe.each([
     test('disallows unknown rule type', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        path: DETECTION_ENGINE_RULES_BULK_CREATE,
         body: [{ ...getCreateRulesSchemaMock(), type: 'unexpected_type' }],
       });
       const result = server.validate(request);
@@ -191,7 +193,7 @@ describe.each([
     test('disallows invalid "from" param on rule', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        path: DETECTION_ENGINE_RULES_BULK_CREATE,
         body: [
           {
             from: 'now-3755555555555555.67s',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
index 74f777b29ca01..cf4633b976816 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -7,12 +7,13 @@
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import { getIndexExists } from '@kbn/securitysolution-es-utils';
+import { Logger } from '@kbn/core/server';
 import { createRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/create_rules_type_dependents';
 import { createRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/create_rules_bulk_schema';
 import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/response/rules_bulk_schema';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import {
-  DETECTION_ENGINE_RULES_URL,
+  DETECTION_ENGINE_RULES_BULK_CREATE,
   NOTIFICATION_THROTTLE_NO_ACTIONS,
 } from '../../../../../common/constants';
 import { SetupPlugins } from '../../../../plugin';
@@ -25,15 +26,20 @@ import { buildRouteValidation } from '../../../../utils/build_validation/route_v
 
 import { transformBulkError, createBulkErrorObject, buildSiemResponse } from '../utils';
 import { convertCreateAPIToInternalSchema } from '../../schemas/rule_converters';
+import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
 
+/**
+ * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
+ */
 export const createRulesBulkRoute = (
   router: SecuritySolutionPluginRouter,
   ml: SetupPlugins['ml'],
-  isRuleRegistryEnabled: boolean
+  isRuleRegistryEnabled: boolean,
+  logger: Logger
 ) => {
   router.post(
     {
-      path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+      path: DETECTION_ENGINE_RULES_BULK_CREATE,
       validate: {
         body: buildRouteValidation(createRulesBulkSchema),
       },
@@ -42,6 +48,8 @@ export const createRulesBulkRoute = (
       },
     },
     async (context, request, response) => {
+      logDeprecatedBulkEndpoint(logger, DETECTION_ENGINE_RULES_BULK_CREATE);
+
       const siemResponse = buildSiemResponse(response);
       const rulesClient = context.alerting.getRulesClient();
       const esClient = context.core.elasticsearch.client;
@@ -138,9 +146,16 @@ export const createRulesBulkRoute = (
       ];
       const [validated, errors] = validate(rulesBulk, rulesBulkSchema);
       if (errors != null) {
-        return siemResponse.error({ statusCode: 500, body: errors });
+        return siemResponse.error({
+          statusCode: 500,
+          body: errors,
+          headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_CREATE),
+        });
       } else {
-        return response.ok({ body: validated ?? {} });
+        return response.ok({
+          body: validated ?? {},
+          headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_CREATE),
+        });
       }
     }
   );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
index 122ab20a3ed6b..fb2625f149d86 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -22,7 +22,7 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { createRulesRoute } from './create_rules_route';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
index 4ac4822c412fa..c8d1628ded783 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { DETECTION_ENGINE_RULES_BULK_DELETE } from '../../../../../common/constants';
 import {
   getEmptyFindResult,
   getFindResultWithSingleHit,
@@ -17,6 +17,7 @@ import {
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { deleteRulesBulkRoute } from './delete_rules_bulk_route';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe.each([
   ['Legacy', false],
@@ -28,12 +29,13 @@ describe.each([
   beforeEach(() => {
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
+    const logger = loggingSystemMock.createLogger();
 
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled)); // rule exists
     clients.rulesClient.delete.mockResolvedValue({}); // successful deletion
     clients.savedObjectsClient.find.mockResolvedValue(getEmptySavedObjectsResponse()); // rule status request
 
-    deleteRulesBulkRoute(server.router, isRuleRegistryEnabled);
+    deleteRulesBulkRoute(server.router, isRuleRegistryEnabled, logger);
   });
 
   describe('status codes with actionClient and alertClient', () => {
@@ -42,7 +44,7 @@ describe.each([
       expect(response.status).toEqual(200);
     });
 
-    test('resturns 200 when deleting a single rule and related rule status', async () => {
+    test('returns 200 when deleting a single rule and related rule status', async () => {
       const response = await server.inject(getDeleteBulkRequest(), context);
       expect(response.status).toEqual(200);
     });
@@ -88,7 +90,7 @@ describe.each([
     test('rejects requests without IDs', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+        path: DETECTION_ENGINE_RULES_BULK_DELETE,
         body: [{}],
       });
       const response = await server.inject(request, context);
@@ -104,7 +106,7 @@ describe.each([
     test('rejects requests with both id and rule_id', async () => {
       const request = requestMock.create({
         method: 'post',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+        path: DETECTION_ENGINE_RULES_BULK_DELETE,
         body: [{ id: 'c1e1b359-7ac1-4e96-bc81-c683c092436f', rule_id: 'rule_1' }],
       });
       const response = await server.inject(request, context);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
index 442b707532ea6..674427a0b9229 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
@@ -7,6 +7,7 @@
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 
+import type { RouteConfig, RequestHandler, Logger } from '@kbn/core/server';
 import { queryRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/query_rules_type_dependents';
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import {
@@ -14,18 +15,18 @@ import {
   QueryRulesBulkSchemaDecoded,
 } from '../../../../../common/detection_engine/schemas/request/query_rules_bulk_schema';
 import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/response/rules_bulk_schema';
-import type { RouteConfig, RequestHandler } from '../../../../../../../../src/core/server';
 import type {
   SecuritySolutionPluginRouter,
   SecuritySolutionRequestHandlerContext,
 } from '../../../../types';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { DETECTION_ENGINE_RULES_BULK_DELETE } from '../../../../../common/constants';
 import { getIdBulkError } from './utils';
 import { transformValidateBulkError } from './validate';
 import { transformBulkError, buildSiemResponse, createBulkErrorObject } from '../utils';
 import { deleteRules } from '../../rules/delete_rules';
 import { readRules } from '../../rules/read_rules';
 import { legacyMigrate } from '../../rules/utils';
+import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
 
 type Config = RouteConfig<unknown, unknown, QueryRulesBulkSchemaDecoded, 'delete' | 'post'>;
 type Handler = RequestHandler<
@@ -36,9 +37,13 @@ type Handler = RequestHandler<
   'delete' | 'post'
 >;
 
+/**
+ * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
+ */
 export const deleteRulesBulkRoute = (
   router: SecuritySolutionPluginRouter,
-  isRuleRegistryEnabled: boolean
+  isRuleRegistryEnabled: boolean,
+  logger: Logger
 ) => {
   const config: Config = {
     validate: {
@@ -46,12 +51,14 @@ export const deleteRulesBulkRoute = (
         queryRulesBulkSchema
       ),
     },
-    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+    path: DETECTION_ENGINE_RULES_BULK_DELETE,
     options: {
       tags: ['access:securitySolution'],
     },
   };
   const handler: Handler = async (context, request, response) => {
+    logDeprecatedBulkEndpoint(logger, DETECTION_ENGINE_RULES_BULK_DELETE);
+
     const siemResponse = buildSiemResponse(response);
     const rulesClient = context.alerting.getRulesClient();
     const ruleExecutionLog = context.securitySolution.getRuleExecutionLog();
@@ -102,9 +109,16 @@ export const deleteRulesBulkRoute = (
     );
     const [validated, errors] = validate(rules, rulesBulkSchema);
     if (errors != null) {
-      return siemResponse.error({ statusCode: 500, body: errors });
+      return siemResponse.error({
+        statusCode: 500,
+        body: errors,
+        headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_DELETE),
+      });
     } else {
-      return response.ok({ body: validated ?? {} });
+      return response.ok({
+        body: validated ?? {},
+        headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_DELETE),
+      });
     }
   };
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts
index 84b37cd023036..de66a6e5a9d99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/export_rules_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   exportRulesQuerySchema,
   ExportRulesQuerySchemaDecoded,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
index 176a642a8d163..6183bc78b9160 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 import { requestContextMock, requestMock, serverMock } from '../__mocks__';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts
index 97ab879df1240..e3749888c2d8f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { findRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/find_rules_type_dependents';
 import {
   findRulesSchema,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
index 3d3d80284aaac..10be2ac921c10 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
@@ -13,7 +13,7 @@ import {
   getPrepackagedRulesStatusRequest,
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, createMockConfig } from '../__mocks__';
-import { SecurityPluginSetup } from '../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { checkTimelinesStatus } from '../../../timeline/utils/check_timelines_status';
 import {
   mockCheckTimelinesStatusBeforeInstallResult,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
index a54b373250657..63c25da1c2d4c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -26,7 +26,7 @@ import {
   rulesToNdJsonString,
 } from '../../../../../common/detection_engine/schemas/request/import_rules_schema.mock';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts
index 5908a9dc6e0f8..728c5c479007b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/legacy_create_legacy_notification.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
index 6b3fa7ad83c68..8285c2dad45a8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import {
+  DETECTION_ENGINE_RULES_BULK_UPDATE,
+  DETECTION_ENGINE_RULES_URL,
+} from '../../../../../common/constants';
 import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks';
 import { buildMlAuthz } from '../../../machine_learning/authz';
 import {
@@ -19,6 +22,7 @@ import { serverMock, requestContextMock, requestMock } from '../__mocks__';
 import { patchRulesBulkRoute } from './patch_rules_bulk_route';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -34,13 +38,14 @@ describe.each([
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
     ml = mlServicesMock.createSetupContract();
+    const logger = loggingSystemMock.createLogger();
 
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled)); // rule exists
     clients.rulesClient.update.mockResolvedValue(
       getAlertMock(isRuleRegistryEnabled, getQueryRuleParams())
     ); // update succeeds
 
-    patchRulesBulkRoute(server.router, ml, isRuleRegistryEnabled);
+    patchRulesBulkRoute(server.router, ml, isRuleRegistryEnabled, logger);
   });
 
   describe('status codes', () => {
@@ -96,7 +101,7 @@ describe.each([
       });
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [typicalMlRulePayload()],
       });
       const response = await server.inject(request, context);
@@ -122,7 +127,7 @@ describe.each([
       const { type, ...payloadWithoutType } = typicalMlRulePayload();
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [payloadWithoutType],
       });
       const response = await server.inject(request, context);
@@ -144,7 +149,7 @@ describe.each([
     test('rejects payloads with no ID', async () => {
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), rule_id: undefined }],
       });
       const response = await server.inject(request, context);
@@ -164,7 +169,7 @@ describe.each([
     test('allows query rule type', async () => {
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), type: 'query' }],
       });
       const result = server.validate(request);
@@ -175,7 +180,7 @@ describe.each([
     test('rejects unknown rule type', async () => {
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), type: 'unknown_type' }],
       });
       const result = server.validate(request);
@@ -188,7 +193,7 @@ describe.each([
     test('allows rule type of query and custom from and interval', async () => {
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock() }],
       });
       const result = server.validate(request);
@@ -199,7 +204,7 @@ describe.each([
     test('disallows invalid "from" param on rule', async () => {
       const request = requestMock.create({
         method: 'patch',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [
           {
             from: 'now-3755555555555555.67s',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
index 58d364cb34b5c..a0ed8abb8b9aa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
@@ -6,6 +6,7 @@
  */
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { Logger } from '@kbn/core/server';
 import { RuleAlertAction } from '../../../../../common/detection_engine/types';
 import {
   patchRulesBulkSchema,
@@ -14,7 +15,7 @@ import {
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/response/rules_bulk_schema';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '../../../../../common/constants';
 import { SetupPlugins } from '../../../../plugin';
 import { buildMlAuthz } from '../../../machine_learning/authz';
 import { throwAuthzError } from '../../../machine_learning/validation';
@@ -25,15 +26,20 @@ import { patchRules } from '../../rules/patch_rules';
 import { readRules } from '../../rules/read_rules';
 import { PartialFilter } from '../../types';
 import { legacyMigrate } from '../../rules/utils';
+import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
 
+/**
+ * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
+ */
 export const patchRulesBulkRoute = (
   router: SecuritySolutionPluginRouter,
   ml: SetupPlugins['ml'],
-  isRuleRegistryEnabled: boolean
+  isRuleRegistryEnabled: boolean,
+  logger: Logger
 ) => {
   router.patch(
     {
-      path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+      path: DETECTION_ENGINE_RULES_BULK_UPDATE,
       validate: {
         body: buildRouteValidation<typeof patchRulesBulkSchema, PatchRulesBulkSchemaDecoded>(
           patchRulesBulkSchema
@@ -44,6 +50,8 @@ export const patchRulesBulkRoute = (
       },
     },
     async (context, request, response) => {
+      logDeprecatedBulkEndpoint(logger, DETECTION_ENGINE_RULES_BULK_UPDATE);
+
       const siemResponse = buildSiemResponse(response);
 
       const rulesClient = context.alerting.getRulesClient();
@@ -207,9 +215,16 @@ export const patchRulesBulkRoute = (
 
       const [validated, errors] = validate(rules, rulesBulkSchema);
       if (errors != null) {
-        return siemResponse.error({ statusCode: 500, body: errors });
+        return siemResponse.error({
+          statusCode: 500,
+          body: errors,
+          headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_UPDATE),
+        });
       } else {
-        return response.ok({ body: validated ?? {} });
+        return response.ok({
+          body: validated ?? {},
+          headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_UPDATE),
+        });
       }
     }
   );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
index ecf925bda97e5..e7e960e832458 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
@@ -21,7 +21,7 @@ import {
   getPerformBulkActionSchemaMock,
   getPerformBulkActionEditSchemaMock,
 } from '../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { readRules } from '../../rules/read_rules';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
index 94294192531f8..e5b7dc2ef85ed 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
@@ -8,14 +8,13 @@
 import { truncate } from 'lodash';
 import moment from 'moment';
 import { BadRequestError, transformError } from '@kbn/securitysolution-es-utils';
-import { KibanaResponseFactory, Logger } from 'src/core/server';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { KibanaResponseFactory, Logger, SavedObjectsClientContract } from '@kbn/core/server';
 
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { RuleAlertType } from '../../rules/types';
 
-import type { RulesClient } from '../../../../../../alerting/server';
-import { SanitizedRule } from '../../../../../../alerting/common';
-
 import {
   DETECTION_ENGINE_RULES_BULK_ACTION,
   MAX_RULES_TO_UPDATE_IN_PARALLEL,
@@ -38,11 +37,10 @@ import { deleteRules } from '../../rules/delete_rules';
 import { duplicateRule } from '../../rules/duplicate_rule';
 import { findRules } from '../../rules/find_rules';
 import { readRules } from '../../rules/read_rules';
-import { patchRules } from '../../rules/patch_rules';
+import { editRule } from '../../rules/edit_rule';
 import { applyBulkActionEditToRule } from '../../rules/bulk_action_edit';
 import { getExportByObjectIds } from '../../rules/get_export_by_object_ids';
 import { buildSiemResponse } from '../utils';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { internalRuleToAPIResponse } from '../../schemas/rule_converters';
 import { legacyMigrate } from '../../rules/utils';
 import { RuleParams } from '../../schemas/rule_schemas';
@@ -424,24 +422,18 @@ export const performBulkActionRoute = (
                   rule,
                 });
 
-                const editedRule = body[BulkAction.edit].reduce(
-                  (acc, action) => applyBulkActionEditToRule(acc, action),
-                  migratedRule
-                );
-
-                const { tags, params: { timelineTitle, timelineId } = {} } = editedRule;
-                const index = 'index' in editedRule.params ? editedRule.params.index : undefined;
-
-                await patchRules({
+                const updatedRule = await editRule({
                   rulesClient,
                   rule: migratedRule,
-                  tags,
-                  index,
-                  timelineTitle,
-                  timelineId,
+                  edit: (ruleToEdit) => {
+                    return body[BulkAction.edit].reduce(
+                      (acc, action) => applyBulkActionEditToRule(acc, action),
+                      ruleToEdit
+                    );
+                  },
                 });
 
-                return editedRule;
+                return updatedRule;
               },
               abortSignal: abortController.signal,
             });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts
index 5e7e0504c99ed..c9cc0cad0a65f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/preview_rules_route.ts
@@ -7,8 +7,17 @@
 import moment from 'moment';
 import uuid from 'uuid';
 import { transformError } from '@kbn/securitysolution-es-utils';
-import type { StartServicesAccessor } from 'kibana/server';
-import { IRuleDataClient } from '../../../../../../rule_registry/server';
+import type { StartServicesAccessor } from '@kbn/core/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import {
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleTypeState,
+  parseDuration,
+} from '@kbn/alerting-plugin/common';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ExecutorType } from '@kbn/alerting-plugin/server/types';
+import { Alert } from '@kbn/alerting-plugin/server';
 import type { StartPlugins } from '../../../../plugin';
 import { buildSiemResponse } from '../utils';
 import { convertCreateAPIToInternalSchema } from '../../schemas/rule_converters';
@@ -21,7 +30,10 @@ import { buildRouteValidation } from '../../../../utils/build_validation/route_v
 import { SetupPlugins } from '../../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { createRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/create_rules_type_dependents';
-import { DETECTION_ENGINE_RULES_PREVIEW } from '../../../../../common/constants';
+import {
+  DEFAULT_PREVIEW_INDEX,
+  DETECTION_ENGINE_RULES_PREVIEW,
+} from '../../../../../common/constants';
 import { wrapScopedClusterClient } from './utils/wrap_scoped_cluster_client';
 import {
   previewRulesSchema,
@@ -29,15 +41,6 @@ import {
 } from '../../../../../common/detection_engine/schemas/request';
 import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common';
 
-import {
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleTypeState,
-  parseDuration,
-} from '../../../../../../alerting/common';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExecutorType } from '../../../../../../alerting/server/types';
-import { Alert } from '../../../../../../alerting/server';
 import { ConfigType } from '../../../../config';
 import { alertInstanceFactoryStub } from '../../signals/preview/alert_instance_factory_stub';
 import { CreateRuleOptions, CreateSecurityRuleTypeWrapperProps } from '../../rule_types/types';
@@ -81,7 +84,7 @@ export const previewRulesRoute = async (
         return siemResponse.error({ statusCode: 400, body: validationErrors });
       }
       try {
-        const [, { data }] = await getStartServices();
+        const [, { data, security: securityService }] = await getStartServices();
         const searchSourceClient = data.search.searchSource.asScoped(request);
         const savedObjectsClient = context.core.savedObjects.client;
         const siemClient = context.securitySolution.getAppClient();
@@ -121,6 +124,34 @@ export const previewRulesRoute = async (
         const logs: RulePreviewLogs[] = [];
         let isAborted = false;
 
+        const { hasAllRequested } = await securityService.authz
+          .checkPrivilegesWithRequest(request)
+          .atSpace(spaceId, {
+            elasticsearch: {
+              index: {
+                [`${DEFAULT_PREVIEW_INDEX}`]: ['read'],
+                [`.internal${DEFAULT_PREVIEW_INDEX}-`]: ['read'],
+              },
+              cluster: [],
+            },
+          });
+
+        if (!hasAllRequested) {
+          return response.ok({
+            body: {
+              logs: [
+                {
+                  errors: [
+                    'Missing "read" privileges for the ".preview.alerts-security.alerts" or ".internal.preview.alerts-security.alerts" indices. Without these privileges you cannot use the Rule Preview feature.',
+                  ],
+                  warnings: [],
+                  duration: 0,
+                },
+              ],
+            },
+          });
+        }
+
         const previewRuleTypeWrapper = createSecurityRuleTypeWrapper({
           ...securityRuleTypeOptions,
           ruleDataClient: previewRuleDataClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
index 7237f8f9f22fb..c802f9857ce50 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { readRulesRoute } from './read_rules_route';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts
index 006217028fb87..e1d24677ff4cf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/read_rules_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { queryRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/query_rules_type_dependents';
 import {
   queryRulesSchema,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
index 88c15f99ed6f7..21ac33e294008 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '../../../../../common/constants';
 import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks';
 import { buildMlAuthz } from '../../../machine_learning/authz';
 import {
@@ -20,6 +20,7 @@ import { updateRulesBulkRoute } from './update_rules_bulk_route';
 import { BulkError } from '../utils';
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -35,6 +36,7 @@ describe.each([
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
     ml = mlServicesMock.createSetupContract();
+    const logger = loggingSystemMock.createLogger();
 
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled));
     clients.rulesClient.update.mockResolvedValue(
@@ -43,7 +45,7 @@ describe.each([
 
     clients.appClient.getSignalsIndex.mockReturnValue('.siem-signals-test-index');
 
-    updateRulesBulkRoute(server.router, ml, isRuleRegistryEnabled);
+    updateRulesBulkRoute(server.router, ml, isRuleRegistryEnabled, logger);
   });
 
   describe('status codes', () => {
@@ -90,7 +92,7 @@ describe.each([
       });
       const request = requestMock.create({
         method: 'put',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [typicalMlRulePayload()],
       });
 
@@ -112,7 +114,7 @@ describe.each([
     test('rejects payloads with no ID', async () => {
       const noIdRequest = requestMock.create({
         method: 'put',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), rule_id: undefined }],
       });
       const response = await server.inject(noIdRequest, context);
@@ -127,7 +129,7 @@ describe.each([
     test('allows query rule type', async () => {
       const request = requestMock.create({
         method: 'put',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), type: 'query' }],
       });
       const result = server.validate(request);
@@ -138,7 +140,7 @@ describe.each([
     test('rejects unknown rule type', async () => {
       const request = requestMock.create({
         method: 'put',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ ...getCreateRulesSchemaMock(), type: 'unknown_type' }],
       });
       const result = server.validate(request);
@@ -149,7 +151,7 @@ describe.each([
     test('allows rule type of query and custom from and interval', async () => {
       const request = requestMock.create({
         method: 'put',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [{ from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock(), type: 'query' }],
       });
       const result = server.validate(request);
@@ -160,7 +162,7 @@ describe.each([
     test('disallows invalid "from" param on rule', async () => {
       const request = requestMock.create({
         method: 'put',
-        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        path: DETECTION_ENGINE_RULES_BULK_UPDATE,
         body: [
           {
             from: 'now-3755555555555555.67s',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
index d1df5713914df..0f9bc3535dc57 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -6,12 +6,13 @@
  */
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { Logger } from '@kbn/core/server';
 import { updateRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/update_rules_type_dependents';
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import { updateRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/update_rules_bulk_schema';
 import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/response/rules_bulk_schema';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '../../../../../common/constants';
 import { SetupPlugins } from '../../../../plugin';
 import { buildMlAuthz } from '../../../machine_learning/authz';
 import { throwAuthzError } from '../../../machine_learning/validation';
@@ -21,15 +22,20 @@ import { transformBulkError, buildSiemResponse, createBulkErrorObject } from '..
 import { updateRules } from '../../rules/update_rules';
 import { legacyMigrate } from '../../rules/utils';
 import { readRules } from '../../rules/read_rules';
+import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from './utils/deprecation';
 
+/**
+ * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead
+ */
 export const updateRulesBulkRoute = (
   router: SecuritySolutionPluginRouter,
   ml: SetupPlugins['ml'],
-  isRuleRegistryEnabled: boolean
+  isRuleRegistryEnabled: boolean,
+  logger: Logger
 ) => {
   router.put(
     {
-      path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+      path: DETECTION_ENGINE_RULES_BULK_UPDATE,
       validate: {
         body: buildRouteValidation(updateRulesBulkSchema),
       },
@@ -38,6 +44,8 @@ export const updateRulesBulkRoute = (
       },
     },
     async (context, request, response) => {
+      logDeprecatedBulkEndpoint(logger, DETECTION_ENGINE_RULES_BULK_UPDATE);
+
       const siemResponse = buildSiemResponse(response);
 
       const rulesClient = context.alerting.getRulesClient();
@@ -105,9 +113,16 @@ export const updateRulesBulkRoute = (
 
       const [validated, errors] = validate(rules, rulesBulkSchema);
       if (errors != null) {
-        return siemResponse.error({ statusCode: 500, body: errors });
+        return siemResponse.error({
+          statusCode: 500,
+          body: errors,
+          headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_UPDATE),
+        });
       } else {
-        return response.ok({ body: validated ?? {} });
+        return response.ok({
+          body: validated ?? {},
+          headers: getDeprecatedBulkEndpointHeader(DETECTION_ENGINE_RULES_BULK_UPDATE),
+        });
       }
     }
   );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
index 04823606faf3e..93ec83bb750d1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -27,7 +27,7 @@ import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import { PartialFilter } from '../../types';
 import { BulkError, createBulkErrorObject } from '../utils';
 import { getOutputRuleAlertForRest } from '../__mocks__/utils';
-import { PartialRule } from '../../../../../../alerting/server';
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { createRulesAndExceptionsStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
 import { RuleAlertType } from '../../rules/types';
 import { ImportRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/import_rules_schema';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
index bd74e83f5a664..3c0ad839bc8b3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
@@ -8,15 +8,15 @@
 import { countBy, partition } from 'lodash/fp';
 import uuid from 'uuid';
 import { Action } from '@kbn/securitysolution-io-ts-alerting-types';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import pMap from 'p-map';
 
+import { PartialRule, FindResult } from '@kbn/alerting-plugin/server';
+import { ActionsClient, FindActionResult } from '@kbn/actions-plugin/server';
 import { RuleExecutionSummary } from '../../../../../common/detection_engine/schemas/common';
 import { RulesSchema } from '../../../../../common/detection_engine/schemas/response/rules_schema';
 import { ImportRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/import_rules_schema';
 import { CreateRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/create_rules_bulk_schema';
-import { PartialRule, FindResult } from '../../../../../../alerting/server';
-import { ActionsClient, FindActionResult } from '../../../../../../actions/server';
 import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import { RuleAlertType, isAlertType } from '../../rules/types';
 import { createBulkErrorObject, BulkError, OutputError } from '../utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts
index ebf55011ee6a7..c46efeabd1dac 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/check_rule_exception_references.test.ts
@@ -7,7 +7,7 @@
 
 import { getImportRulesSchemaDecodedMock } from '../../../../../../common/detection_engine/schemas/request/import_rules_schema.mock';
 import { checkRuleExceptionReferences } from './check_rule_exception_references';
-import { getExceptionListSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 
 describe('checkRuleExceptionReferences', () => {
   it('returns empty array if rule has no exception list references', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.ts
new file mode 100644
index 0000000000000..9145eb50f80d7
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/deprecation.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getDocLinks } from '@kbn/doc-links';
+import { Logger } from '@kbn/core/server';
+import { DETECTION_ENGINE_RULES_BULK_ACTION } from '../../../../../../common/constants';
+
+/**
+ * Helper method for building deprecation messages
+ *
+ * @param path Deprecated endpoint path
+ * @returns string
+ */
+export const buildDeprecatedBulkEndpointMessage = (path: string) => {
+  const docsLink = getDocLinks({ kibanaBranch: 'main' }).siem.ruleApiOverview;
+  return `Deprecated endpoint: ${path} API is deprecated since v8.2. Please use the ${DETECTION_ENGINE_RULES_BULK_ACTION} API instead. See ${docsLink} for more detail.`;
+};
+
+/**
+ * Logs usages of a deprecated bulk endpoint
+ *
+ * @param logger System logger
+ * @param path Deprecated endpoint path
+ */
+export const logDeprecatedBulkEndpoint = (logger: Logger, path: string) => {
+  logger.warn(buildDeprecatedBulkEndpointMessage(path), { tags: ['deprecation'] });
+};
+
+/**
+ * Creates a warning header with a message formatted according to RFC7234.
+ * We follow the same formatting as Elasticsearch
+ * https://github.com/elastic/elasticsearch/blob/5baabff6670a8ed49297488ca8cac8ec12a2078d/server/src/main/java/org/elasticsearch/common/logging/HeaderWarning.java#L55
+ *
+ * @param path Deprecated endpoint path
+ */
+export const getDeprecatedBulkEndpointHeader = (path: string) => ({
+  warning: `299 Kibana "${buildDeprecatedBulkEndpointMessage(path)}"`,
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts
index fdc188df1b178..b67db94bcef00 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.test.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 
-import { savedObjectsClientMock } from '../../../../../../../../../src/core/server/mocks';
-import { findExceptionList } from '../../../../../../../lists/server/services/exception_lists/find_exception_list';
-import { getExceptionListSchemaMock } from '../../../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { findExceptionList } from '@kbn/lists-plugin/server/services/exception_lists/find_exception_list';
+import { getExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import { getReferencedExceptionLists } from './gather_referenced_exceptions';
 import { getImportRulesSchemaDecodedMock } from '../../../../../../common/detection_engine/schemas/request/import_rules_schema.mock';
 
-jest.mock('../../../../../../../lists/server/services/exception_lists/find_exception_list');
+jest.mock('@kbn/lists-plugin/server/services/exception_lists/find_exception_list');
 
 describe('getReferencedExceptionLists', () => {
   let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts
index 85d7cc23a6d50..4033e572553f5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/gather_referenced_exceptions.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 import { ExceptionListSchema, ListArray } from '@kbn/securitysolution-io-ts-list-types';
-import { SavedObjectsClientContract } from 'kibana/server';
-import { ImportRulesSchemaDecoded } from '../../../../../../common/detection_engine/schemas/request';
-
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ExceptionListQueryInfo,
   getAllListTypes,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../lists/server/services/exception_lists/utils/import/find_all_exception_list_types';
+} from '@kbn/lists-plugin/server/services/exception_lists/utils/import/find_all_exception_list_types';
+import { ImportRulesSchemaDecoded } from '../../../../../../common/detection_engine/schemas/request';
 
 /**
  * Helper that takes rules, goes through their referenced exception lists and
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts
index 42edd694dedc4..957915a0e7775 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getImportExceptionsListSchemaMock } from '../../../../../../../lists/common/schemas/request/import_exceptions_schema.mock';
+import { getImportExceptionsListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 
 import { importRuleExceptions } from './import_rule_exceptions';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts
index 13ac7dba61509..f2487df4f6615 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rule_exceptions.ts
@@ -10,7 +10,7 @@ import {
   ImportExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 
-import { ExceptionListClient } from '../../../../../../../../plugins/lists/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 
 /**
  * Util to call into exceptions list client import logic
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts
index fd4c751d7fb84..70083f8c04214 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/import_rules_utils.ts
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import {
   ImportExceptionsListSchema,
   ImportExceptionListItemSchema,
   ExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { legacyMigrate } from '../../../rules/utils';
 import { PartialFilter } from '../../../types';
 import { createBulkErrorObject, ImportRuleResponse } from '../../utils';
@@ -22,8 +24,6 @@ import { patchRules } from '../../../rules/patch_rules';
 import { ImportRulesSchemaDecoded } from '../../../../../../common/detection_engine/schemas/request/import_rules_schema';
 import { MlAuthz } from '../../../../machine_learning/authz';
 import { throwAuthzError } from '../../../../machine_learning/validation';
-import { RulesClient } from '../../../../../../../../plugins/alerting/server';
-import { ExceptionListClient } from '../../../../../../../../plugins/lists/server';
 import { checkRuleExceptionReferences } from './check_rule_exception_references';
 
 export type PromiseFromStreams = ImportRulesSchemaDecoded | Error;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts
index ce037566e8284..2c355661ecfba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { wrapScopedClusterClient } from './wrap_scoped_cluster_client';
 
 const esQuery = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts
index f007a7dc745cd..da6264e756ad9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils/wrap_scoped_cluster_client.ts
@@ -20,7 +20,7 @@ import type {
   SearchRequest as SearchRequestWithBody,
   AggregationsAggregate,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient, ElasticsearchClient } from 'src/core/server';
+import { IScopedClusterClient, ElasticsearchClient } from '@kbn/core/server';
 
 interface WrapScopedClusterClientOpts {
   scopedClusterClient: IScopedClusterClient;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
index 293f73b9dcd05..bde5d3ebf2027 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
@@ -7,6 +7,7 @@
 
 import { validateNonExact } from '@kbn/securitysolution-io-ts-utils';
 
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { RuleExecutionSummary } from '../../../../../common/detection_engine/schemas/common';
 import {
   FullResponseSchema,
@@ -16,7 +17,6 @@ import {
   RulesSchema,
   rulesSchema,
 } from '../../../../../common/detection_engine/schemas/response/rules_schema';
-import { PartialRule } from '../../../../../../alerting/server';
 import { isAlertType } from '../../rules/types';
 import { createBulkErrorObject, BulkError } from '../utils';
 import { transform } from './utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
index 84a3a01974710..79fc38e21c7ce 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
@@ -11,8 +11,8 @@ import { getFinalizeSignalsMigrationRequest } from '../__mocks__/request_respons
 import { getMigrationSavedObjectsById } from '../../migrations/get_migration_saved_objects_by_id';
 import { getSignalsMigrationSavedObjectMock } from '../../migrations/saved_objects_schema.mock';
 import { finalizeSignalsMigrationRoute } from './finalize_signals_migration_route';
-import { RuleDataPluginService } from '../../../../../../rule_registry/server';
-import { ruleDataServiceMock } from '../../../../../../rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
+import { ruleDataServiceMock } from '@kbn/rule-registry-plugin/server/rule_data_plugin_service/rule_data_plugin_service.mock';
 
 jest.mock('../../migrations/get_migration_saved_objects_by_id');
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
index c1dc153896d72..a6f5f28fce8e4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
@@ -6,6 +6,7 @@
  */
 
 import { transformError, BadRequestError } from '@kbn/securitysolution-es-utils';
+import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { SetupPlugins } from '../../../../plugin';
 import { DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL } from '../../../../../common/constants';
@@ -16,7 +17,6 @@ import { signalsMigrationService } from '../../migrations/migration_service';
 import { buildSiemResponse } from '../utils';
 
 import { getMigrationSavedObjectsById } from '../../migrations/get_migration_saved_objects_by_id';
-import { RuleDataPluginService } from '../../../../../../rule_registry/server';
 
 export const finalizeSignalsMigrationRoute = (
   router: SecuritySolutionPluginRouter,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
index 54ecd5efcd67c..9cc93bc7f5905 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
@@ -18,7 +18,7 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { SetupPlugins } from '../../../../plugin';
 import { createMockTelemetryEventsSender } from '../../../telemetry/__mocks__';
 import { setSignalsStatusRoute } from './open_close_signals_route';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 describe('set signal status', () => {
   let server: ReturnType<typeof serverMock.create>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
index bf62d7602b2d9..8482dd3b94e18 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
@@ -8,7 +8,7 @@
 import { get } from 'lodash';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { setSignalStatusValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/set_signal_status_type_dependents';
 import {
   SetSignalsStatusSchemaDecoded,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
index 0e436760a88ee..b3de63e6d278c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
@@ -16,7 +16,7 @@ import {
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { querySignalsRoute } from './query_signals_route';
-import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
 
 describe('query for signal', () => {
   let server: ReturnType<typeof serverMock.create>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
index def203f534ad3..3740d187347b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts
@@ -7,6 +7,7 @@
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { transformError } from '@kbn/securitysolution-es-utils';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../common/constants';
 import { buildSiemResponse } from '../utils';
@@ -16,7 +17,6 @@ import {
   querySignalsSchema,
   QuerySignalsSchemaDecoded,
 } from '../../../../../common/detection_engine/schemas/request/query_signals_index_schema';
-import { IRuleDataClient } from '../../../../../../rule_registry/server';
 
 export const querySignalsRoute = (
   router: SecuritySolutionPluginRouter,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts
index 2aad64324cfae..01a99028d1ec0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/telemetry_detection_rules_preview_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { SECURITY_TELEMETRY_URL } from '../../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts
index b7c9215e6c190..2372cb515b4fa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_detecton_rules_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts
index e630ef7f250d3..4fb6ca22070e5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_diagnostics_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts
index 0ac9c95dadd40..5e37baadd02d7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_endpoint_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts
index ac79fea7acf9e..a0a35e2d01088 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/telemetry/utils/get_security_lists_preview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { PreviewTelemetryEventsSender } from '../../../../telemetry/preview_sender';
 import { ITelemetryReceiver } from '../../../../telemetry/receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
index 66418e6f8db24..662e20368ff99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts
@@ -12,7 +12,7 @@ import {
   RouteValidationFunction,
   KibanaResponseFactory,
   CustomHttpResponseOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 import { CustomHttpRequestError } from '../../../utils/custom_http_request_error';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts
index c67db80e18003..514f1b3096ee0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyCreateRuleActionsSavedObject } from './legacy_create_rule_actions_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts
index 55e3ae3b346bc..974aa41b25473 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_create_rule_actions_saved_object.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
@@ -18,7 +19,6 @@ import {
   legacyGetThrottleOptions,
   legacyTransformActionToReference,
 } from './legacy_utils';
-import { RuleAction } from '../../../../../alerting/common';
 
 /**
  * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
index ab5a352747723..92db1aa2a265e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsFindOptions, SavedObjectsFindResult } from 'kibana/server';
+import { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
 
-import { loggingSystemMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyGetBulkRuleActionsSavedObject } from './legacy_get_bulk_rule_actions_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
index df135e9c1c8ef..944c7cd5c2cf8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
@@ -6,10 +6,9 @@
  */
 
 import { chunk } from 'lodash';
-import { SavedObjectsFindOptionsReference } from 'kibana/server';
-import { Logger } from 'src/core/server';
+import { SavedObjectsFindOptionsReference, Logger } from '@kbn/core/server';
 
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts
index 1e38cea801c53..d1798c4065b49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsFindOptions, SavedObjectsFindResult } from 'kibana/server';
-import { loggingSystemMock, savedObjectsClientMock } from 'src/core/server/mocks';
+import { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 // eslint-disable-next-line no-restricted-imports
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts
index de47e127daa73..5f23ceace2b55 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_get_rule_actions_saved_object.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsFindOptionsReference } from 'kibana/server';
-import { Logger } from 'src/core/server';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { SavedObjectsFindOptionsReference, Logger } from '@kbn/core/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts
index 7dd05c5122a61..5837733e75cbd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectReference, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectReference, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { legacyMigrateRuleAlertId, legacyMigrateAlertId } from './legacy_migrations';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts
index aa85898e94a33..9fff45b3cf023 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_migrations.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectSanitizedDoc,
   SavedObjectAttributes,
   SavedObjectReference,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
 
 // eslint-disable-next-line no-restricted-imports
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts
index 835ccd92f9cc4..8a0858830be98 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectMigration } from './legacy_migrations';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts
index 475f17b8b58a3..7ea80663df92e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectAttributes } from 'kibana/server';
-import { RuleActionParams } from '../../../../../alerting/common';
+import { SavedObjectAttributes } from '@kbn/core/server';
+import { RuleActionParams } from '@kbn/alerting-plugin/common';
 
 /**
  * This was the pre-7.16 version of LegacyRuleAlertAction and how it was stored on disk pre-7.16.
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts
index f700f78fd41b6..a6146dcea638f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_or_create_rule_actions_saved_object.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { RuleAction } from '../../../../../alerting/common';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { RuleAction } from '@kbn/alerting-plugin/common';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyGetRuleActionsSavedObject } from './legacy_get_rule_actions_saved_object';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts
index feb6895b87a2f..b524a0127283c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_update_rule_actions_saved_object.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectReference } from 'kibana/server';
-import { RuleExecutorServices } from '../../../../../alerting/server';
+import { SavedObjectReference } from '@kbn/core/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
@@ -21,7 +22,6 @@ import {
 } from './legacy_utils';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyIRuleActionsAttributesSavedObjectAttributes } from './legacy_types';
-import { RuleAction } from '../../../../../alerting/common';
 
 /**
  * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts
index 0d5e4e704d7ff..c3962dc28ae3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsUpdateResponse } from 'kibana/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { SavedObjectsUpdateResponse } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
-import { RuleAction } from '../../../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts
index b84550d56dbd5..8d35272d10fdd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_utils.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { SavedObjectsUpdateResponse } from 'kibana/server';
-import { Logger } from 'src/core/server';
+import { SavedObjectsUpdateResponse, Logger } from '@kbn/core/server';
 
-import { RuleAction } from '../../../../../alerting/common';
+import { RuleAction } from '@kbn/alerting-plugin/common';
 
 // eslint-disable-next-line no-restricted-imports
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts
index 8c3395f02f7d0..73ca6eb2dad9e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_factories.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectsClientContract } from 'src/core/server';
-import { IEventLogClient, IEventLogService } from '../../../../../event_log/server';
+import { Logger, SavedObjectsClientContract } from '@kbn/core/server';
+import { IEventLogClient, IEventLogService } from '@kbn/event-log-plugin/server';
 
 import { IRuleExecutionLogForRoutes } from './client_for_routes/client_interface';
 import { createClientForRoutes } from './client_for_routes/client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts
index e3227373ceaae..b680bcfe261bc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_executors/client.ts
@@ -7,7 +7,7 @@
 
 import { sum } from 'lodash';
 import { Duration } from 'moment';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import {
   RuleExecutionStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts
index 1ee23da39fe74..476b199a1f2f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/client_for_routes/client.ts
@@ -6,7 +6,7 @@
  */
 
 import { chunk, mapValues } from 'lodash';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { GetAggregateRuleExecutionEventsResponse } from '../../../../../common/detection_engine/schemas/response';
 import { initPromisePool } from '../../../../utils/promise_pool';
 import { withSecuritySpan } from '../../../../utils/with_security_span';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts
index f2ee7fa7c3097..78e8e62702d47 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_reader.ts
@@ -7,7 +7,7 @@
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { MAX_EXECUTION_EVENTS_DISPLAYED } from '@kbn/securitysolution-rules';
-import { IEventLogClient } from '../../../../../../event_log/server';
+import { IEventLogClient } from '@kbn/event-log-plugin/server';
 
 import {
   RuleExecutionEvent,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts
index 816aab5cec5ac..9672992a85f57 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/event_log_writer.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsUtils } from '../../../../../../../../src/core/server';
-import { IEventLogService, SAVED_OBJECT_REL_PRIMARY } from '../../../../../../event_log/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
+import { IEventLogService, SAVED_OBJECT_REL_PRIMARY } from '@kbn/event-log-plugin/server';
 import {
   RuleExecutionStatus,
   ruleExecutionStatusOrderByStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts
index baa4dd572ced0..7cee84cd64594 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.test.ts
@@ -20,7 +20,7 @@ import {
   formatSortForTermsSort,
   getExecutionEventAggregation,
   getProviderAndActionFilter,
-} from './index';
+} from '.';
 
 describe('getExecutionEventAggregation', () => {
   test('should throw error when given bad maxExecutions field', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts
index 4b1bd1f185198..4cf8e0bd5f1dc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/get_execution_event_aggregation/index.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
 import { flatMap, get } from 'lodash';
 import { MAX_EXECUTION_EVENTS_DISPLAYED } from '@kbn/securitysolution-rules';
-import { AggregateEventsBySavedObjectResult } from '../../../../../../../event_log/server';
+import { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 import { AggregateRuleExecutionEvent } from '../../../../../../common/detection_engine/schemas/common';
 import { GetAggregateRuleExecutionEventsResponse } from '../../../../../../common/detection_engine/schemas/response';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts
index 7f28715198da6..dc64fe9e1f717 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/event_log/register_event_log_provider.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEventLogService } from '../../../../../../event_log/server';
+import { IEventLogService } from '@kbn/event-log-plugin/server';
 import { RuleExecutionLogAction, RULE_EXECUTION_LOG_PROVIDER } from './constants';
 
 export const registerEventLogProvider = (eventLogService: IEventLogService) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts
index 07307cafd50f2..fcb145dd406e9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_client.ts
@@ -5,11 +5,7 @@
  * 2.0.
  */
 
-import {
-  Logger,
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-} from '../../../../../../../../src/core/server';
+import { Logger, SavedObjectsClientContract, SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 import { withSecuritySpan } from '../../../../utils/with_security_span';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts
index d5a2ecd813d35..f2d1628efd539 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsType } from 'src/core/server';
+import { SavedObject, SavedObjectsType } from '@kbn/core/server';
 import {
   RuleExecutionMetrics,
   RuleExecutionStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts
index c0e0427bf99a7..960197a03cd5d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/execution_saved_object/saved_objects_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import uuidv5 from 'uuid/v5';
-import { SavedObjectReference } from 'src/core/server';
+import { SavedObjectReference } from '@kbn/core/server';
 import { RULE_EXECUTION_SO_TYPE } from './saved_objects_type';
 
 export const getRuleExecutionSoId = (ruleId: string): string => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts
index 4d373f68c00bc..4306fb5e15d9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_execution_log/utils/console_logging.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogMeta } from 'src/core/server';
+import { LogMeta } from '@kbn/core/server';
 import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts
index da65c7e483428..a7eb512564d42 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/eql.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { EqlSearchResponse } from '../../../../../common/detection_engine/types';
 
 export const sequenceResponse = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts
index 2129596a1b204..812b8cdb73e70 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/rule_type.ts
@@ -8,22 +8,22 @@
 import { of } from 'rxjs';
 import { v4 } from 'uuid';
 
-import { Logger, SavedObject } from 'kibana/server';
-import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks';
-import { mlPluginServerMock } from '../../../../../../ml/server/mocks';
+import { Logger, SavedObject } from '@kbn/core/server';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { mlPluginServerMock } from '@kbn/ml-plugin/server/mocks';
 
-import type { IRuleDataClient } from '../../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
-import { eventLogServiceMock } from '../../../../../../event_log/server/mocks';
-import { PluginSetupContract as AlertingPluginSetupContract } from '../../../../../../alerting/server';
+import type { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { eventLogServiceMock } from '@kbn/event-log-plugin/server/mocks';
+import { PluginSetupContract as AlertingPluginSetupContract } from '@kbn/alerting-plugin/server';
 import { ConfigType } from '../../../../config';
 import { AlertAttributes } from '../../signals/types';
 import { createRuleMock } from './rule';
-import { listMock } from '../../../../../../lists/server/mocks';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { QueryRuleParams, RuleParams } from '../../schemas/rule_schemas';
 // this is only used in tests
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createDefaultAlertExecutorOptions } from '../../../../../../rule_registry/server/utils/rule_executor_test_utils';
+import { createDefaultAlertExecutorOptions } from '@kbn/rule-registry-plugin/server/utils/rule_executor_test_utils';
 import { getCompleteRuleMock } from '../../schemas/rule_schemas.mock';
 
 export const createRuleTypeMocks = (
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts
index 177dd3866816c..39c4a922cd008 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/threshold.ts
@@ -24,7 +24,7 @@ import {
 } from '@kbn/rule-data-utils';
 import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
-import { TypeOfFieldMap } from '../../../../../../rule_registry/common/field_map';
+import { TypeOfFieldMap } from '@kbn/rule-registry-plugin/common/field_map';
 import { SERVER_APP_ID } from '../../../../../common/constants';
 import { ANCHOR_DATE } from '../../../../../common/detection_engine/schemas/response/rules_schema.mocks';
 import { getListArrayMock } from '../../../../../common/detection_engine/schemas/types/lists.mock';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
index f25bb16e90004..4501c81a82aaf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
@@ -10,7 +10,7 @@ import { isEmpty } from 'lodash';
 import { parseScheduleDates } from '@kbn/securitysolution-io-ts-utils';
 import agent from 'elastic-apm-node';
 
-import { createPersistenceRuleTypeWrapper } from '../../../../../rule_registry/server';
+import { createPersistenceRuleTypeWrapper } from '@kbn/rule-registry-plugin/server';
 import { buildRuleMessageFactory } from './factories/build_rule_message_factory';
 import {
   checkPrivilegesFromEsClient,
@@ -261,6 +261,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper =
                   tuple,
                   wrapHits,
                   wrapSequences,
+                  ruleDataReader: ruleDataClient.getReader({ namespace: options.spaceId }),
                 },
               });
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts
index 5f0749b6788a5..463d75f8d5bce 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/eql/create_eql_alert_type.ts
@@ -20,7 +20,6 @@ export const createEqlAlertType = (
   return {
     id: EQL_RULE_TYPE_ID,
     name: 'Event Correlation Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts
index 60a3be4b5345f..5d0a870ac553b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/bulk_create_factory.ts
@@ -8,16 +8,16 @@
 import { performance } from 'perf_hooks';
 import { isEmpty } from 'lodash';
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
+import { PersistenceAlertService } from '@kbn/rule-registry-plugin/server';
+import { AlertWithCommonFieldsLatest } from '@kbn/rule-registry-plugin/common/schemas';
 import { BuildRuleMessage } from '../../signals/rule_messages';
 import { makeFloatString } from '../../signals/utils';
 import { RefreshTypes } from '../../types';
-import { PersistenceAlertService } from '../../../../../../rule_registry/server';
 import {
   BaseFieldsLatest,
   WrappedFieldsLatest,
 } from '../../../../../common/detection_engine/schemas/alerts';
-import { AlertWithCommonFieldsLatest } from '../../../../../../rule_registry/common/schemas';
 
 export interface GenericBulkCreateResponse<T extends BaseFieldsLatest> {
   success: boolean;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts
index b1b68829665fc..29ca39442f033 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import { ALERT_RULE_CONSUMER } from '@kbn/rule-data-utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts
index a991da87485a5..445f6944a1835 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_alert_group_from_sequence.ts
@@ -7,7 +7,7 @@
 
 import { ALERT_UUID } from '@kbn/rule-data-utils';
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import type { ConfigType } from '../../../../../config';
 import { Ancestor, SignalSource, SignalSourceHit } from '../../../signals/types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts
index 0aeb8935c6cc0..5bea6e346f438 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/wrap_sequences_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 import { WrapSequences } from '../../signals/types';
 import { buildAlertGroupFromSequence } from './utils/build_alert_group_from_sequence';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts
index 2f75d73455656..7104a739e5d76 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/create_indicator_match_alert_type.ts
@@ -20,7 +20,7 @@ export const createIndicatorMatchAlertType = (
   return {
     id: INDICATOR_RULE_TYPE_ID,
     name: 'Indicator Match Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
+    ruleTaskTimeout: '1h',
     validate: {
       params: {
         validate: (object: unknown) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts
index d7df4f6e4955e..fe2da6ee18696 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/ml/create_ml_alert_type.ts
@@ -16,11 +16,10 @@ import { CreateRuleOptions, SecurityAlertType } from '../types';
 export const createMlAlertType = (
   createOptions: CreateRuleOptions
 ): SecurityAlertType<MachineLearningRuleParams, {}, {}, 'default'> => {
-  const { logger, ml, experimentalFeatures } = createOptions;
+  const { logger, ml } = createOptions;
   return {
     id: ML_RULE_TYPE_ID,
     name: 'Machine Learning Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts
index d9119b3cff8dd..78741552bb7e7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.test.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import { allowedExperimentalValues } from '../../../../../common/experimental_features';
 import { createQueryAlertType } from './create_query_alert_type';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts
index fcd4fd2c7c1a2..26512187010e9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/create_query_alert_type.ts
@@ -20,7 +20,6 @@ export const createQueryAlertType = (
   return {
     id: QUERY_RULE_TYPE_ID,
     name: 'Custom Query Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts
index 2722f31f3eacd..fb4be16c7d51f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/saved_query/create_saved_query_alert_type.ts
@@ -24,7 +24,6 @@ export const createSavedQueryAlertType = (
   return {
     id: SAVED_QUERY_RULE_TYPE_ID,
     name: 'Saved Query Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts
index f7fb8a69fb089..e7743548d5b76 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/create_threshold_alert_type.ts
@@ -21,7 +21,6 @@ export const createThresholdAlertType = (
   return {
     id: THRESHOLD_RULE_TYPE_ID,
     name: 'Threshold Rule',
-    ruleTaskTimeout: experimentalFeatures.securityRulesCancelEnabled ? '5m' : '1d',
     validate: {
       params: {
         validate: (object: unknown): ThresholdRuleParams => {
@@ -51,7 +50,15 @@ export const createThresholdAlertType = (
     producer: SERVER_APP_ID,
     async executor(execOptions) {
       const {
-        runOpts: { buildRuleMessage, bulkCreate, exceptionItems, completeRule, tuple, wrapHits },
+        runOpts: {
+          buildRuleMessage,
+          bulkCreate,
+          exceptionItems,
+          completeRule,
+          tuple,
+          wrapHits,
+          ruleDataReader,
+        },
         services,
         startedAt,
         state,
@@ -70,6 +77,7 @@ export const createThresholdAlertType = (
         tuple,
         version,
         wrapHits,
+        ruleDataReader,
       });
 
       return result;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts
index fdcddd52d5c66..62dc5b3134205 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/types.ts
@@ -10,15 +10,20 @@ import { Moment } from 'moment';
 import { Logger } from '@kbn/logging';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { RuleExecutorOptions, RuleType } from '../../../../../alerting/server';
+import { RuleExecutorOptions, RuleType } from '@kbn/alerting-plugin/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeState,
   WithoutReservedActionGroups,
-} from '../../../../../alerting/common';
-import { ListClient } from '../../../../../lists/server';
-import { PersistenceServices, IRuleDataClient } from '../../../../../rule_registry/server';
+} from '@kbn/alerting-plugin/common';
+import { ListClient } from '@kbn/lists-plugin/server';
+import {
+  PersistenceServices,
+  IRuleDataClient,
+  IRuleDataReader,
+} from '@kbn/rule-registry-plugin/server';
+import { IEventLogService } from '@kbn/event-log-plugin/server';
 import { ConfigType } from '../../../config';
 import { SetupPlugins } from '../../../plugin';
 import { CompleteRule, RuleParams } from '../schemas/rule_schemas';
@@ -30,7 +35,6 @@ import {
   WrapSequences,
 } from '../signals/types';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
-import { IEventLogService } from '../../../../../event_log/server';
 import { ITelemetryEventsSender } from '../../telemetry/sender';
 import { RuleExecutionLogForExecutorsFactory } from '../rule_execution_log';
 
@@ -61,6 +65,7 @@ export interface RunOpts<TParams extends RuleParams> {
   };
   wrapHits: WrapHits;
   wrapSequences: WrapSequences;
+  ruleDataReader: IRuleDataReader;
 }
 
 export type SecurityAlertType<
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts
index 83a473799068a..15b12223d758a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_list_client.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
-import { ExceptionListClient, ListClient, ListPluginSetup } from '../../../../../../lists/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
+import { ExceptionListClient, ListClient, ListPluginSetup } from '@kbn/lists-plugin/server';
 
 export const getListClient = ({
   lists,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
index 59e2b9f2f597b..4624b66d870ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeState } from '../../../../../../alerting/server';
+import { RuleTypeState } from '@kbn/alerting-plugin/server';
 import { SecurityAlertTypeReturnValue } from '../types';
 
 export const createResultObject = <TState extends RuleTypeState>(state: TState) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts
index c3e15b061842e..126726ab08a79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts
@@ -6,7 +6,7 @@
  */
 
 import { CreateRulesOptions } from './types';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 
 export const getCreateRulesOptionsMock = (isRuleRegistryEnabled: boolean): CreateRulesOptions => ({
   isRuleRegistryEnabled,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts
index 863d1104ded36..9ba39746ae4d2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts
@@ -7,12 +7,12 @@
 
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
+import { RuleTypeParams, SanitizedRule } from '@kbn/alerting-plugin/common';
 import {
   normalizeMachineLearningJobIds,
   normalizeThresholdObject,
 } from '../../../../common/detection_engine/utils';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { RuleTypeParams, SanitizedRule } from '../../../../../alerting/common';
 import {
   DEFAULT_INDICATOR_SOURCE_PATH,
   NOTIFICATION_THROTTLE_NO_ACTIONS,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts
index 4fd4dd80a3202..fbbac1609fdea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { ruleExecutionLogMock } from '../rule_execution_log/__mocks__';
 import { deleteRules } from './delete_rules';
 import { DeleteRuleOptions } from './types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts
index 1b15f71a1827c..4efd6934aeee8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.ts
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import { i18n } from '@kbn/i18n';
 import { ruleTypeMappings, SIGNALS_ID } from '@kbn/securitysolution-rules';
 
-import { SanitizedRule } from '../../../../../alerting/common';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { SERVER_APP_ID } from '../../../../common/constants';
 import { InternalRuleCreate, RuleParams } from '../schemas/rule_schemas';
 import { addTags } from './add_tags';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/edit_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/edit_rule.ts
new file mode 100644
index 0000000000000..93a297e6965b4
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/edit_rule.ts
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { cloneDeep, isEqual, pick } from 'lodash';
+import { validate } from '@kbn/securitysolution-io-ts-utils';
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import { RuleAlertType } from './types';
+import { InternalRuleUpdate, internalRuleUpdate } from '../schemas/rule_schemas';
+import { addTags } from './add_tags';
+
+class EditRuleError extends Error {
+  public readonly statusCode: number;
+  constructor(message: string, statusCode: number) {
+    super(message);
+    this.statusCode = statusCode;
+  }
+}
+
+interface EditRuleParams {
+  /** An instance of RulesClient from the Alerting Framework. */
+  rulesClient: RulesClient;
+
+  /** Original, existing rule to be edited. Needs to be fetched from Elasticsearch via RulesClient. */
+  rule: RuleAlertType;
+
+  /** A function that implements in-memory modifications: returns a new rule object with the changes. */
+  edit: (rule: RuleAlertType) => RuleAlertType;
+}
+
+/** At this point we support editing of only these fields. */
+const FIELDS_THAT_CAN_BE_EDITED = ['params', 'tags'] as const;
+
+/**
+ * Applies in-memory modifications to a given rule and updates it in Elasticsearch via RulesClient.
+ *
+ * NOTE: At this point we only support editing of the following fields:
+ *   - rule.params
+ *   - rule.tags
+ * All other changes made by the `edit` function will be ignored.
+ *
+ * @returns The edited rule.
+ */
+export const editRule = async (params: EditRuleParams): Promise<RuleAlertType> => {
+  const { rulesClient, rule, edit } = params;
+  const isPrebuiltRule = rule.params.immutable;
+  const isCustomRule = !rule.params.immutable;
+
+  if (isPrebuiltRule) {
+    throw new EditRuleError('Elastic rule can`t be edited', 400);
+  }
+
+  const editedRule = applyChanges(rule, edit);
+
+  // If the rule wasn't changed by the `edit` function, we don't need to proceed with the update.
+  if (!isRuleChanged(rule, editedRule)) {
+    return rule;
+  }
+
+  // We need to increment the rule's version if it is a custom rule. If the rule is an Elastic
+  // prebuilt rule, we don't want to touch its version - it's managed by the rule authors.
+  // This check is left here explicitly because we're planning to allow editing for prebuilt rules,
+  // and the check for isPrebuiltRule above might be removed.
+  if (isCustomRule) {
+    editedRule.params.version = editedRule.params.version + 1;
+  }
+
+  const updateData = createUpdateData(rule, editedRule);
+  await rulesClient.update({
+    id: rule.id,
+    data: updateData,
+  });
+
+  // It would be great to return the updated rule returned from the RulesClient.update() call.
+  // Note that there's a type mismatch between RuleAlertType and the update method result.
+  return editedRule;
+};
+
+const applyChanges = (
+  originalRule: RuleAlertType,
+  edit: (rule: RuleAlertType) => RuleAlertType
+): RuleAlertType => {
+  // For safety, deeply clone the rule object before applying edits to it.
+  const clonedRule = cloneDeep(originalRule);
+  const editedRule = edit(clonedRule);
+  const sanitizedRule = validateAndSanitizeChanges(originalRule, editedRule);
+  return sanitizedRule;
+};
+
+const validateAndSanitizeChanges = (
+  original: RuleAlertType,
+  changed: RuleAlertType
+): RuleAlertType => {
+  // These checks should never throw unless there's a bug in the passed `edit` function.
+  if (changed.params.immutable !== original.params.immutable) {
+    throw new EditRuleError(`Internal rule editing error: can't change "params.immutable"`, 500);
+  }
+  if (changed.params.version !== original.params.version) {
+    throw new EditRuleError(`Internal rule editing error: can't change "params.version"`, 500);
+  }
+
+  return {
+    ...changed,
+    tags: addTags(changed.tags, changed.params.ruleId, changed.params.immutable),
+  };
+};
+
+const isRuleChanged = (originalRule: RuleAlertType, editedRule: RuleAlertType): boolean => {
+  const originalData = pick(originalRule, FIELDS_THAT_CAN_BE_EDITED);
+  const editedData = pick(editedRule, FIELDS_THAT_CAN_BE_EDITED);
+  return !isEqual(originalData, editedData);
+};
+
+const createUpdateData = (
+  originalRule: RuleAlertType,
+  editedRule: RuleAlertType
+): InternalRuleUpdate => {
+  const data: InternalRuleUpdate = {
+    // At this point we intentionally support updating of only these fields:
+    ...pick(editedRule, FIELDS_THAT_CAN_BE_EDITED),
+    // We omit other fields and get them from the original (unedited) rule:
+    name: originalRule.name,
+    schedule: originalRule.schedule,
+    actions: originalRule.actions,
+    throttle: originalRule.throttle,
+    notifyWhen: originalRule.notifyWhen,
+  };
+
+  const [validatedData, validationError] = validate(data, internalRuleUpdate);
+  if (validationError != null || validatedData === null) {
+    throw new EditRuleError(`Editing rule would create invalid rule: ${validationError}`, 500);
+  }
+
+  return validatedData;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts
index ef1b3fbb28b5a..4f23d1425344f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/find_rules.ts
@@ -7,7 +7,7 @@
 
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
-import { FindResult } from '../../../../../alerting/server';
+import { FindResult } from '@kbn/alerting-plugin/server';
 import { RuleParams } from '../schemas/rule_schemas';
 import { FindRuleOptions } from './types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
index b478cc2df09a1..7ddf4c4427286 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   getAlertMock,
   getFindResultWithSingleHit,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
index caa32a809b0a8..68a0c077e59a4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { INTERNAL_IMMUTABLE_KEY } from '../../../../common/constants';
-import { RulesClient } from '../../../../../alerting/server';
 import { RuleAlertType, isAlertTypes } from './types';
 import { findRules } from './find_rules';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
index 304582378c2f1..b42508b0a73b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
@@ -11,7 +11,7 @@ import {
   FindHit,
   getEmptySavedObjectsResponse,
 } from '../routes/__mocks__/request_responses';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getExportAll } from './get_export_all';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { getThreatMock } from '../../../../common/detection_engine/schemas/types/threat.mock';
@@ -21,8 +21,8 @@ import {
 } from '../../../../common/detection_engine/schemas/response/export_rules_details_schema.mock';
 
 import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
-import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { requestContextMock } from '../routes/__mocks__/request_context';
 
 const exceptionsClient = getExceptionListClientMock();
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
index 81db46bb9fee2..3c2d516b8369d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.ts
@@ -7,9 +7,9 @@
 
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { ExceptionListClient } from '../../../../../lists/server';
-import { RulesClient, RuleExecutorServices } from '../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { RulesClient, RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { getNonPackagedRules } from './get_existing_prepackaged_rules';
 import { getExportDetailsNdjson } from './get_export_details_ndjson';
 import { transformAlertsToRules } from '../routes/rules/utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
index a047100bc5262..7371f2390478e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.test.ts
@@ -12,7 +12,7 @@ import {
   FindHit,
   getEmptySavedObjectsResponse,
 } from '../routes/__mocks__/request_responses';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { getThreatMock } from '../../../../common/detection_engine/schemas/types/threat.mock';
 import {
@@ -20,10 +20,10 @@ import {
   getOutputDetailsSampleWithExceptions,
 } from '../../../../common/detection_engine/schemas/response/export_rules_details_schema.mock';
 import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
-import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
 
 const exceptionsClient = getExceptionListClientMock();
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { requestContextMock } from '../routes/__mocks__/request_context';
 
 describe.each([
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
index 9da3cc3cfdde3..5dde3048b61e7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_by_object_ids.ts
@@ -8,14 +8,14 @@
 import { chunk } from 'lodash';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { ExceptionListClient } from '../../../../../lists/server';
+import { Logger } from '@kbn/core/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
+import { RulesClient, RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
-import { RulesClient, RuleExecutorServices } from '../../../../../alerting/server';
 
 import { getExportDetailsNdjson } from './get_export_details_ndjson';
 
-import { isAlertType } from '../rules/types';
+import { isAlertType } from './types';
 import { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
 import { findRules } from './find_rules';
 import { getRuleExceptionsForExport } from './get_export_rule_exceptions';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
index 614c0ae0a1281..79507a73147a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
@@ -7,9 +7,9 @@
 
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
-import { getDetectionsExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListClientMock } from '@kbn/lists-plugin/server/services/exception_lists/exception_list_client.mock';
+import { getDetectionsExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 import {
   getRuleExceptionsForExport,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
index 6faf3fdfe6104..bafaf29ac9940 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
@@ -9,10 +9,7 @@ import { chunk } from 'lodash/fp';
 import { ListArray } from '@kbn/securitysolution-io-ts-list-types';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 
-import {
-  ExceptionListClient,
-  ExportExceptionListAndItemsReturn,
-} from '../../../../../lists/server';
+import { ExceptionListClient, ExportExceptionListAndItemsReturn } from '@kbn/lists-plugin/server';
 
 const NON_EXPORTABLE_LIST_IDS = [ENDPOINT_LIST_ID];
 export const EXCEPTIONS_EXPORT_CHUNK_SIZE = 50;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
index 8116a42f42827..cc70dd1008de7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_prepackaged_rules.ts
@@ -10,6 +10,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { exactCheck, formatErrors } from '@kbn/securitysolution-io-ts-utils';
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
+import { SavedObjectAttributes } from '@kbn/core/types';
 import {
   addPrepackagedRulesSchema,
   AddPrepackagedRulesSchema,
@@ -20,7 +21,6 @@ import {
 import { rawRules } from './prepackaged_rules';
 import { RuleAssetSavedObjectsClient } from './rule_asset/rule_asset_saved_objects_client';
 import { IRuleAssetSOAttributes } from './types';
-import { SavedObjectAttributes } from '../../../../../../../src/core/types';
 import { ConfigType } from '../../../config';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts
index 59fcca766f1b9..298a87565bdfd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { SanitizedRule, RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { AddPrepackagedRulesSchemaDecoded } from '../../../../common/detection_engine/schemas/request/add_prepackaged_rules_schema';
-import { SanitizedRule, RuleTypeParams } from '../../../../../alerting/common';
-import { RulesClient } from '../../../../../alerting/server';
 import { createRules } from './create_rules';
 import { PartialFilter } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
index 2bd59abb1ea6f..b02e297f78c8d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
@@ -6,7 +6,7 @@
  */
 
 import { PatchRulesOptions } from './types';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getAlertMock } from '../routes/__mocks__/request_responses';
 import { getMlRuleParams, getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts
index b5580de152fcc..e16a108dec907 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.test.ts
@@ -8,7 +8,7 @@
 import { patchRules } from './patch_rules';
 import { getPatchRulesOptionsMock, getPatchMlRulesOptionsMock } from './patch_rules.mock';
 import { PatchRulesOptions } from './types';
-import { RulesClientMock } from '../../../../../alerting/server/rules_client.mock';
+import { RulesClientMock } from '@kbn/alerting-plugin/server/rules_client.mock';
 import { getAlertMock } from '../routes/__mocks__/request_responses';
 import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
index 8b86f139cd742..05f58e44ecaa2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
@@ -7,7 +7,7 @@
 
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import { defaults } from 'lodash/fp';
-import { PartialRule } from '../../../../../alerting/server';
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import {
   normalizeMachineLearningJobIds,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
index 6dbae907d892d..edbf848d78106 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/application_added_to_google_workspace_domain.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
index 5ac169440ce79..1536791a3eb2d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_port_forwarding_added_registry.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Port Forwarding Rule Addition",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Port Forwarding Rule Addition\n\nNetwork port forwarding is a mechanism to redirect incoming TCP connections (IPv4 or IPv6) from the local TCP port to\nany other port number, or even to a port on a remote computer.\n\nAttackers may configure port forwarding rules to bypass network segmentation restrictions, using the host as a jump box\nto access previously unreachable systems.\n\nThis rule monitors the modifications to the `HKLM\\SYSTEM\\*ControlSet*\\Services\\PortProxy\\v4tov4\\` subkeys.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Identify the target host IP address, verify if connections were made from the host where the modification occurred,\nand check what credentials were used to perform it.\n  - Investigate suspicious login activity, such as unauthorized access and logins from outside working hours and unusual locations.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Analysts can dismiss the alert if the Administrator is aware of the activity\nand there are justifications for this configuration.\n- If this activity is expected and noisy in your environment, consider adding exceptions \u2014 preferably with a combination\nof user and command line conditions.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Delete the port forwarding rule.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If potential malware or credential compromise activities were discovered during the alert triage, activate the respective\nincident response plan.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where registry.path : \"HKLM\\\\SYSTEM\\\\*ControlSet*\\\\Services\\\\PortProxy\\\\v4tov4\\\\*\"\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2019/01/bypassing-network-restrictions-through-rdp-tunneling.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
index 81e353ba7aaf7..b3c2e6905ed9b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_rdp_tunnel_plink.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Remote Desktop Tunneling Detected",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Remote Desktop Tunneling Detected\n\nProtocol Tunneling is a mechanism that involves explicitly encapsulating a protocol within another for various use cases,\nranging from providing an outer layer of encryption (similar to a VPN) to enabling traffic that network appliances would\nfilter to reach their destination.\n\nAttackers may tunnel Remote Desktop Protocol (RDP) traffic through other protocols like Secure Shell (SSH) to bypass network restrictions that block incoming RDP\nconnections but may be more permissive to other protocols.\n\nThis rule looks for command lines involving the `3389` port, which RDP uses by default and options commonly associated\nwith tools that perform tunneling.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Determine if the activity is unique by validating if other machines in the organization have similar entries.\n- Examine network data to determine if the host communicated with external servers using the tunnel.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n- Investigate the command line for the execution of programs that are unrelated to tunneling, like Remote Desktop clients.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Take actions to disable the tunneling.\n- Investigate the initial attack vector.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  /* RDP port and usual SSH tunneling related switches in command line */\n  process.args : \"*:3389\" and\n  process.args : (\"-L\", \"-P\", \"-R\", \"-pw\", \"-ssh\")\n",
   "references": [
     "https://blog.netspi.com/how-to-access-rdp-over-a-reverse-ssh-tunnel/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json
index f4c64f6f8f968..6707f4185e125 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_desktopimgdownldr.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via Desktopimgdownldr Utility",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via Desktopimgdownldr Utility\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse signed utilities to drop these files.\n\nThe `Desktopimgdownldr.exe` utility is used to to configure lockscreen/desktop image, and can be abused with the\n`lockscreenurl` argument to download remote files and tools, this rule looks for this behavior.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Determine if the activity is unique by validating if other machines in the organization have similar entries.\n- Check the reputation of the domain or IP address used to host the downloaded file or if the user downloaded the file\nfrom an internal system.\n- Retrieve the file and determine if it is malicious:\n  - Identify the file type.\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity is unusual but can be done by administrators. Benign true positives (B-TPs) can be added as exceptions\nif necessary.\n- Analysts can dismiss the alert if the downloaded file is a legitimate image.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Investigate the initial attack vector.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"desktopimgdownldr.exe\" or process.pe.original_file_name == \"desktopimgdownldr.exe\") and\n  process.args : \"/lockscreenurl:http*\"\n",
   "references": [
     "https://labs.sentinelone.com/living-off-windows-land-a-new-native-file-downldr/"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json
index 703155453e7fc..eb5c0e07a534d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_mpcmdrun.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via MpCmdRun",
-  "note": "## Triage and analysis\n\n### Investigating Remote File Download via MpCmdRun\nVerify details such as the parent process, URL reputation, and downloaded file details. Additionally, `MpCmdRun` logs this information in the Appdata Temp folder in `MpCmdRun.log`.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via MpCmdRun\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse signed utilities to drop these files.\n\nThe `MpCmdRun.exe` is a command-line tool part of Windows Defender and is used to manage various Microsoft Windows\nDefender Antivirus settings and perform certain tasks. It can also be abused by attackers to download remote files,\nincluding malware and offensive tooling. This rule looks for the patterns used to perform downloads using the utility.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check the reputation of the domain or IP address used to host the downloaded file.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Investigate the initial attack vector.\nVerify details such as the parent process, URL reputation, and downloaded file details. Additionally, `MpCmdRun` logs this information in the Appdata Temp folder in `MpCmdRun.log`.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type == \"start\" and\n  (process.name : \"MpCmdRun.exe\" or process.pe.original_file_name == \"MpCmdRun.exe\") and\n   process.args : \"-DownloadFile\" and process.args : \"-url\" and process.args : \"-path\"\n",
   "references": [
     "https://twitter.com/mohammadaskar2/status/1301263551638761477",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json
index 3ffd0391df866..2f30ef0bf0421 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_powershell.json
@@ -12,6 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via PowerShell",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via PowerShell\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse signed utilities to drop these files.\n\nPowerShell is one of system administrators' main tools for automation, report routines, and other tasks. This makes it\navailable for use in various environments and creates an attractive way for attackers to execute code and perform\nactions. This rule correlates network and file events to detect downloads of executable and script files performed using\nPowerShell.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Consider whether the user needs PowerShell to complete its tasks.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check the reputation of the domain or IP address used to host the downloaded file.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- Administrators can use PowerShell legitimately to download executable and script files. Analysts can dismiss the alert\nif the Administrator is aware of the activity and the triage has not identified suspicious or malicious files.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Investigate the initial attack vector.\n",
   "query": "sequence by host.id, process.entity_id with maxspan=30s\n  [network where process.name : (\"powershell.exe\", \"pwsh.exe\", \"powershell_ise.exe\") and network.protocol == \"dns\" and\n   not dns.question.name : (\"localhost\", \"*.microsoft.com\", \"*.azureedge.net\", \"*.powershellgallery.com\", \"*.windowsupdate.com\", \"metadata.google.internal\") and \n   not user.domain : \"NT AUTHORITY\"]\n    [file where process.name : \"powershell.exe\" and event.type == \"creation\" and file.extension : (\"exe\", \"dll\", \"ps1\", \"bat\") and \n   not file.name : \"__PSScriptPolicy*.ps1\"]\n",
   "risk_score": 47,
   "rule_id": "33f306e8-417c-411b-965c-c2812d6d3f4d",
@@ -63,5 +64,5 @@
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
index eed29634daeef..d6d74d8102ee5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_remote_file_copy_scripts.json
@@ -12,6 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Download via Script Interpreter",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Download via Script Interpreter\n\nThe Windows Script Host (WSH) is a Windows automation technology, which is ideal for non-interactive scripting needs,\nsuch as logon scripting, administrative scripting, and machine automation.\n\nAttackers commonly use WSH scripts as their initial access method, acting like droppers for second stage payloads, but\ncan also use them to download tools and utilities needed to accomplish their goals.\n\nThis rule looks for DLLs and executables downloaded using `cscript.exe` or `wscript.exe`.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Retrieve the script file and the executable involved:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n  - Manually analyze the script to determine if malicious capabilities are present.\n- Investigate whether the potential malware ran successfully, is active on the host, or was stopped by defenses.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n\n### False positive analysis\n\n- The usage of these script engines by regular users is unlikely. In the case of authorized benign true positives\n(B-TPs), exceptions can be added.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n- Remove and block malicious artifacts identified on the triage.\n- Reimage the host operating system and restore compromised files to clean versions.\n",
   "query": "sequence by host.id, process.entity_id\n  [network where process.name : (\"wscript.exe\", \"cscript.exe\") and network.protocol != \"dns\" and\n   network.direction : (\"outgoing\", \"egress\") and network.type == \"ipv4\" and destination.ip != \"127.0.0.1\"\n  ]\n  [file where event.type == \"creation\" and file.extension : (\"exe\", \"dll\")]\n",
   "risk_score": 47,
   "rule_id": "1d276579-3380-4095-ad38-e596a01bc64f",
@@ -41,5 +42,5 @@
     }
   ],
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json
index 96d87cc39d82d..2f08c107752ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_sunburst_c2_activity_detected.json
@@ -10,7 +10,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "SUNBURST Command and Control Activity",
-  "note": "## Triage and analysis\n\nThe SUNBURST malware attempts to hide within the Orion Improvement Program (OIP) network traffic. As this rule detects post-exploitation network traffic, investigations into this should be prioritized.",
+  "note": "## Triage and analysis\n\n### Investigating SUNBURST Command and Control Activity\n\nSUNBURST is a trojanized version of a digitally signed SolarWinds Orion plugin called\nSolarWinds.Orion.Core.BusinessLayer.dll. The plugin contains a backdoor that communicates via HTTP to third-party\nservers. After an initial dormant period of up to two weeks, SUNBURST may retrieve and execute commands that instruct\nthe backdoor to transfer files, execute files, profile the system, reboot the system, and disable system services.\nThe malware's network traffic attempts to blend in with legitimate SolarWinds activity by imitating the Orion\nImprovement Program (OIP) protocol, and the malware stores persistent state data within legitimate plugin configuration files. The\nbackdoor uses multiple obfuscated blocklists to identify processes, services, and drivers associated with forensic and\nanti-virus tools.\n\nMore details on SUNBURST can be found on the [Mandiant Report](https://www.mandiant.com/resources/sunburst-additional-technical-details).\n\nThis rule identifies suspicious network connections that attempt to blend in with legitimate SolarWinds activity\nby imitating the Orion Improvement Program (OIP) protocol behavior.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Retrieve the executable involved:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n  - Manually analyze the executable to determine if malicious capabilities are present.\n- Investigate whether the potential malware ran successfully, is active on the host, or was stopped by defenses.\n- Investigate the network traffic.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n\n### False positive analysis\n\n- False positives are unlikely for this rule.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n- Remove and block malicious artifacts identified on the triage.\n- Reimage the host operating system and restore compromised files to clean versions.\n- Upgrade SolarWinds systems to the latest version.\n",
   "query": "network where event.type == \"protocol\" and network.protocol == \"http\" and\n  process.name : (\"ConfigurationWizard.exe\",\n                  \"NetFlowService.exe\",\n                  \"NetflowDatabaseMaintenance.exe\",\n                  \"SolarWinds.Administration.exe\",\n                  \"SolarWinds.BusinessLayerHost.exe\",\n                  \"SolarWinds.BusinessLayerHostx64.exe\",\n                  \"SolarWinds.Collector.Service.exe\",\n                  \"SolarwindsDiagnostics.exe\") and\n  (http.request.body.content : \"*/swip/Upload.ashx*\" and http.request.body.content : (\"POST*\", \"PUT*\")) or\n  (http.request.body.content : (\"*/swip/SystemDescription*\", \"*/swip/Events*\") and http.request.body.content : (\"GET*\", \"HEAD*\")) and\n  not http.request.body.content : \"*solarwinds.com*\"\n",
   "references": [
     "https://www.fireeye.com/blog/threat-research/2020/12/evasive-attacker-leverages-solarwinds-supply-chain-compromises-with-sunburst-backdoor.html"
@@ -73,5 +73,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
index 022ae049f58f2..200c5ebe48356 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_teamviewer_remote_file_copy.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote File Copy via TeamViewer",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote File Copy via TeamViewer\n\nAttackers commonly transfer tooling or malware from external systems into a compromised environment using the command\nand control channel. However, they can also abuse legitimate utilities to drop these files.\n\nTeamViewer is a remote access and remote control tool used by helpdesks and system administrators to perform various\nsupport activities. It is also frequently used by attackers and scammers to deploy malware interactively and other\nmalicious activities. This rule looks for the TeamViewer process creating files with suspicious extensions.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Contact the user to gather information about who and why was conducting the remote access.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check whether the company uses TeamViewer for the support activities and if there is a support ticket related to this\naccess.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Analysts can dismiss the alert if the company relies on TeamViewer to conduct\nremote access and the triage has not identified suspicious or malicious files.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type == \"creation\" and process.name : \"TeamViewer.exe\" and\n  file.extension : (\"exe\", \"dll\", \"scr\", \"com\", \"bat\", \"ps1\", \"vbs\", \"vbe\", \"js\", \"wsh\", \"hta\")\n",
   "references": [
     "https://blog.menasec.net/2019/11/hunting-for-suspicious-use-of.html"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json
index a8a73e2176f03..97ca284b78912 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dcsync_replication_rights.json
@@ -11,7 +11,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Credential Access via DCSync",
-  "note": "## Triage and analysis.\n\n### Investigating Active Directory Replication From User Account\n\nActive Directory replication is the process by which the changes that originate on one domain controller are\nautomatically transferred to other domain controllers that store the same data. \n\nActive Directory data takes the form of objects that have properties, or attributes. Each object is an instance\nof an object class, and object classes and their respective attributes are defined in the Active Directory schema.\nThe values of the attributes define the object, and a change to a value of an attribute must be transferred from\nthe domain controller on which it occurs to every other domain controller that stores a replica of that object.\n\nAdversaries can use the DCSync technique that uses Windows Domain Controller's API to simulate the replication process\nfrom a remote domain controller, compromising major credential material such as the Kerberos krbtgt keys used\nlegitimately for tickets creation, but also tickets forging by attackers. This attack requires some extended privileges\nto succeed (DS-Replication-Get-Changes and DS-Replication-Get-Changes-All), which are granted by default to members of\nthe Administrators, Domain Admins, Enterprise Admins, and Domain Controllers groups. Privileged accounts can be abused\nto grant controlled objects the right to DCsync/Replicate.\n\nMore details can be found on [Threat Hunter Playbook](https://threathunterplaybook.com/library/windows/active_directory_replication.html?highlight=dcsync#directory-replication-services-auditing).\nand [The Hacker Recipes](https://www.thehacker.recipes/ad/movement/credentials/dumping/dcsync)\n\nThis rule will monitor for Event ID 4662 (Operation was performed on an Active Directory object) and identify events that use the access\nmask 0x100 (Control Access) and properties that contain at least one of the following or their equivalent Schema-Id-GUID\n(DS-Replication-Get-Changes, DS-Replication-Get-Changes-All, DS-Replication-Get-Changes-In-Filtered-Set). It also filters out events that\nuse computer accounts and also Azure AD Connect MSOL accounts (more details [here](https://techcommunity.microsoft.com/t5/microsoft-defender-for-identity/ad-connect-msol-user-suspected-dcsync-attack/m-p/788028)).\n\n#### Possible investigation steps:\n\n- Identify the account that performed the action.\n- Confirm whether the account owner is aware of the operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Correlate security events 4662 and 4624 (Logon Type 3) by their Logon ID (`winlog.logon.id`) on the Domain Controller (DC) that received\nthe replication request. This will tell you where the AD replication request came from, and if it came from another DC or not.\n- Investigate which credentials were compromised (e.g. All accounts were replicated or a specific account).\n\n### False Positive Analysis\n\n- This activity should not happen legitimately. Any potential B-TP (Benign True Positive) should be mapped and monitored by the security\nteam as replication should be done by Domain Controllers only. Any account that performs this activity can put the domain at risk for not\nhaving the same security standards (Long, complex, random passwords that change frequently) as computer accounts, exposing it to credential\ncracking attacks (Kerberoasting, brute force, etc.).\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If specific credentials were compromised:\n    - Reset the password for the accounts.\n- If the entire domain or the `krbtgt` user were compromised:\n    - Activate your incident response plan for total Active Directory compromise which should include, but not be limited to, a password\n    reset (twice) of the `krbtgt` user.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nAudit Policies > \nDS Access > \nAudit Directory Service Changes (Success,Failure)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Credential Access via DCSync\n\nActive Directory replication is the process by which the changes that originate on one domain controller are\nautomatically transferred to other domain controllers that store the same data.\n\nActive Directory data consists of objects that have properties, or attributes. Each object is an instance of an object\nclass, and object classes and their respective attributes are defined in the Active Directory schema. Objects are\ndefined by the values of their attributes, and changes to attribute values must be transferred from the domain\ncontroller on which they occur to every other domain controller that stores a replica of an affected object. \n\nAdversaries can use the DCSync technique that uses Windows Domain Controller's API to simulate the replication process\nfrom a remote domain controller, compromising major credential material such as the Kerberos krbtgt keys used\nlegitimately for tickets creation, but also tickets forging by attackers. This attack requires some extended privileges\nto succeed (DS-Replication-Get-Changes and DS-Replication-Get-Changes-All), which are granted by default to members of\nthe Administrators, Domain Admins, Enterprise Admins, and Domain Controllers groups. Privileged accounts can be abused\nto grant controlled objects the right to DCsync/Replicate.\n\nMore details can be found on [Threat Hunter Playbook](https://threathunterplaybook.com/library/windows/active_directory_replication.html?highlight=dcsync#directory-replication-services-auditing) and [The Hacker Recipes](https://www.thehacker.recipes/ad/movement/credentials/dumping/dcsync).\n\nThis rule monitors for Event ID 4662 (Operation was performed on an Active Directory object) and identifies events that\nuse the access mask 0x100 (Control Access) and properties that contain at least one of the following or their equivalent:\nSchema-Id-GUID (DS-Replication-Get-Changes, DS-Replication-Get-Changes-All, DS-Replication-Get-Changes-In-Filtered-Set).\nIt also filters out events that use computer accounts and also Azure AD Connect MSOL accounts (more details [here](https://techcommunity.microsoft.com/t5/microsoft-defender-for-identity/ad-connect-msol-user-suspected-dcsync-attack/m-p/788028)). \n\n#### Possible investigation steps\n\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Correlate security events 4662 and 4624 (Logon Type 3) by their Logon ID (`winlog.logon.id`) on the Domain Controller\n(DC) that received the replication request. This will tell you where the AD replication request came from, and if it\ncame from another DC or not.\n- Investigate which credentials were compromised (for example whether all accounts were replicated, or only a specific account).\n\n### False positive analysis \n\n- This activity should not happen legitimately, since replication should be done by Domain Controllers only. Any\npotential benign true positive (B-TP) should be mapped and monitored by the security team. Any account that performs\nthis activity can put the domain at risk for not having the same security standards as computer accounts (which have\nlong, complex, random passwords that change frequently), exposing it to credential cracking attacks (Kerberoasting,\nbrute force, etc.).\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If specific credentials were compromised:\n  - Reset passwords for affected accounts.\n- If the entire domain or the `krbtgt` user were compromised:\n  - Activate your incident response plan for total Active Directory compromise which should include, but not be limited\n  to, a password reset (twice) of the `krbtgt` user. \n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nAudit Policies >\nDS Access >\nAudit Directory Service Changes (Success,Failure)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "any where event.action == \"Directory Service Access\" and\n  event.code == \"4662\" and winlog.event_data.Properties : (\n\n    /* Control Access Rights/Permissions Symbol */\n\n    \"*DS-Replication-Get-Changes*\",\n    \"*DS-Replication-Get-Changes-All*\",\n    \"*DS-Replication-Get-Changes-In-Filtered-Set*\",\n\n    /* Identifying GUID used in ACE */\n\n    \"*1131f6ad-9c07-11d1-f79f-00c04fc2dcd2*\",\n    \"*1131f6aa-9c07-11d1-f79f-00c04fc2dcd2*\",\n    \"*89e95b76-444d-4c62-991a-0facbeda640c*\") \n    \n    /* The right to perform an operation controlled by an extended access right. */\n\n    and winlog.event_data.AccessMask : \"0x100\" and\n    not winlog.event_data.SubjectUserName : (\"*$\", \"MSOL_*\")\n",
   "references": [
     "https://threathunterplaybook.com/notebooks/windows/06_credential_access/WIN-180815210510.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json
index ed0657315d243..aa19cb45d9352 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_disable_kerberos_preauth.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
index 4688a7b3c9be9..de1cad9c2f081 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_dump_registry_hives.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Credential Acquisition via Registry Hive Dumping",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Credential Acquisition via Registry Hive Dumping\n\nDumping registry hives is a common way to access credential information as some hives store credential material.\n\nFor example, the SAM hive stores locally cached credentials (SAM Secrets), and the SECURITY hive stores domain cached\ncredentials (LSA secrets).\n\nDumping these hives in combination with the SYSTEM hive enables the attacker to decrypt these secrets.\n\nThis rule identifies the usage of `reg.exe` to dump SECURITY and/or SAM hives, which potentially indicates the\ncompromise of the credentials stored in the host.\n\n#### Possible investigation steps\n\n- Investigate script execution chain (parent process tree).\n- Confirm whether the involved account should perform this kind of operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Investigate if the file was exfiltrated or processed locally by other tools.\n- Scope potentially compromised accounts. Analysts can do this by searching for login events (e.g., 4624) to the target\nhost.\n\n### False positive analysis\n\n- Administrators can export registry hives for backup purposes using command line tools like `reg.exe`. Check whether\nthe user is legitamitely performing this kind of activity.\n\n### Related rules\n\n- Registry Hive File Creation via SMB - a4c7473a-5cb4-4bc1-9d06-e4a75adbc494\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- Scope compromised credentials and disable affected accounts.\n- Reset passwords for potentially compromised user and service accounts (Email, services, CRMs, etc.).\n- Reimage the host operating system and restore compromised files to clean versions.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n process.pe.original_file_name == \"reg.exe\" and\n process.args : (\"save\", \"export\") and\n process.args : (\"hklm\\\\sam\", \"hklm\\\\security\")\n",
   "references": [
     "https://medium.com/threatpunter/detecting-attempts-to-steal-passwords-from-the-registry-7512674487f8"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
index 813fa167f6ab1..c42b1a068992d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_kerberoasting_unusual_process.json
@@ -15,7 +15,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Kerberos Traffic from Unusual Process",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Kerberos Traffic from Unusual Process\n\nKerberos is the default authentication protocol in Active Directory, designed to provide strong authentication for\nclient/server applications by using secret-key cryptography.\n\nDomain-joined hosts usually perform Kerberos traffic using the `lsass.exe` process. This rule detects the occurrence of\ntraffic on the Kerberos port (88) by processes other than `lsass.exe` to detect the unusual request and usage of\nKerberos tickets.\n\n#### Possible investigation steps\n\n- Investigate script execution chain (parent process tree).\n- Investigate other alerts related to the host and user in the last 48 hours.\n- Check if the Destination IP is related to a Domain Controller.\n- Review event ID 4769 for suspicious ticket requests.\n\n### False positive analysis\n\n- This rule uses a Kerberos-related port but does not identify the protocol used on that port. HTTP traffic on a\nnon-standard port or destination IP address unrelated to Domain controllers can create false positives.\n- Exceptions can be added for noisy/frequent connections.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Scope possible compromised credentials based on ticket requests.\n- Isolate the involved host to prevent further post-compromise behavior.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "network where event.type == \"start\" and network.direction : (\"outgoing\", \"egress\") and\n destination.port == 88 and source.port >= 49152 and\n process.executable != \"C:\\\\Windows\\\\System32\\\\lsass.exe\" and destination.address !=\"127.0.0.1\" and destination.address !=\"::1\" and\n /* insert false positives here */\n not process.name in (\"swi_fc.exe\", \"fsIPcam.exe\", \"IPCamera.exe\", \"MicrosoftEdgeCP.exe\", \"MicrosoftEdge.exe\", \"iexplore.exe\", \"chrome.exe\", \"msedge.exe\", \"opera.exe\", \"firefox.exe\")\n",
   "risk_score": 47,
   "rule_id": "897dc6b5-b39f-432a-8d75-d3730d50c782",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
index 2f04843ec7a95..db2ddac681a6c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_file_created.json
@@ -56,5 +56,5 @@
   "timeline_title": "Comprehensive File Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json
index 03ae8e244d578..c639af0e1745c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_lsass_memdump_handle_access.json
@@ -11,7 +11,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "LSASS Memory Dump Handle Access",
-  "note": "## Triage and analysis.\n\n### Investigating\n\nLocal Security Authority Server Service (LSASS) is a process in Microsoft Windows operating systems that is responsible\nfor enforcing the security policy on the system. It verifies users logging on to a Windows computer or server, handles\npassword changes, and creates access tokens.\n\nAdversaries may attempt to access credential material stored in the process memory of the LSASS. After a user logs on,\nthe system generates and stores a variety of credential materials in LSASS process memory. This is meant to facilitate\nsingle sign-on (SSO) ensuring a user isn\u2019t prompted each time resource access is requested. These credential materials\ncan be harvested by an adversary using administrative user or SYSTEM privileges to conduct Lateral Movement using\n[Use Alternate Authentication Material](https://attack.mitre.org/techniques/T1550/).\n\n#### Possible investigation steps:\n\n- Validate the correct install path for the process that triggered this detection\n- Confirm that any AV or EDR solutions that trigger this detection have the correct install path\n\n### False Positive Analysis\n\n- There should be very few if any false positives for this rule. However, it may be tripped by AV or EDR solutions.\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage\n- In case of specific credentials were compromised:\n    - Reset the password for the accounts\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested)\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nSystem Audit Policies >\nObject Access >\nAudit File System (Success,Failure)\nAudit Handle Manipulation (Success,Failure)\n```\n\nAlso, this event generates only if the object\u2019s [SACL](https://docs.microsoft.com/en-us/windows/win32/secauthz/access-control-lists) has the required ACE to handle the use of specific access rights.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating LSASS Memory Dump Handle Access\n\nLocal Security Authority Server Service (LSASS) is a process in Microsoft Windows operating systems that is responsible\nfor enforcing security policy on the system. It verifies users logging on to a Windows computer or server, handles\npassword changes, and creates access tokens.\n\nAdversaries may attempt to access credential material stored in LSASS process memory. After a user logs on,the system\ngenerates and stores a variety of credential materials in LSASS process memory. This is meant to facilitate single\nsign-on (SSO) ensuring a user isn\u2019t prompted each time resource access is requested. These credential materials can be\nharvested by an adversary using administrative user or SYSTEM privileges to conduct lateral movement using \n[alternate authentication material](https://attack.mitre.org/techniques/T1550/).\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Validate the correct install path for the process that triggered this detection.\n\n### False positive analysis\n\n- There should be very few if any false positives for this rule. However, it may be tripped by antivirus or endpoint detection and response solutions;\ncheck whether these solutions are installed on the correct paths.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Scope compromised credentials and disable the accounts.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically:\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested)\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nSystem Audit Policies >\nObject Access >\nAudit File System (Success,Failure)\nAudit Handle Manipulation (Success,Failure)\n```\n\nAlso, this event generates only if the object\u2019s [SACL](https://docs.microsoft.com/en-us/windows/win32/secauthz/access-control-lists) has the required access control entry (ACE) to handle the use of specific access rights.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "any where event.action == \"File System\" and event.code == \"4656\" and\n\n    winlog.event_data.ObjectName : (\n        \"?:\\\\Windows\\\\System32\\\\lsass.exe\",\n        \"\\\\Device\\\\HarddiskVolume?\\\\Windows\\\\System32\\\\lsass.exe\",\n        \"\\\\Device\\\\HarddiskVolume??\\\\Windows\\\\System32\\\\lsass.exe\") and\n\n    /* The right to perform an operation controlled by an extended access right. */\n\n    (winlog.event_data.AccessMask : (\"0x1fffff\" , \"0x1010\", \"0x120089\", \"0x1F3FFF\") or\n     winlog.event_data.AccessMaskDescription : (\"READ_CONTROL\", \"Read from process memory\"))\n\n     /* Common Noisy False Positives */\n\n    and not winlog.event_data.ProcessName : (\n        \"?:\\\\Program Files\\\\*.exe\",\n        \"?:\\\\Program Files (x86)\\\\*.exe\",\n        \"?:\\\\Windows\\\\system32\\\\wbem\\\\WmiPrvSE.exe\",\n        \"?:\\\\Windows\\\\System32\\\\dllhost.exe\",\n        \"?:\\\\Windows\\\\System32\\\\svchost.exe\",\n        \"?:\\\\Windows\\\\System32\\\\msiexec.exe\",\n        \"?:\\\\ProgramData\\\\Microsoft\\\\Windows Defender\\\\*.exe\",\n        \"?:\\\\Windows\\\\explorer.exe\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json
index 0cdf87c777ce1..05bcd8d38ac37 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_mimikatz_memssp_default_logs.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Mimikatz Memssp Log File Detected",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis.\n\n### Investigating Mimikatz Memssp Log File Detected\n\n[Mimikatz](https://github.com/gentilkiwi/mimikatz) is an open-source tool used to collect, decrypt, and/or use cached\ncredentials. This tool is commonly abused by adversaries during the post-compromise stage where adversaries have gained\nan initial foothold on an endpoint and are looking to elevate privileges and seek out additional authentication objects\nsuch as tokens/hashes/credentials that can then be used to laterally move and pivot across a network.\n\nThis rule looks for the creation of a file named `mimilsa.log`, which is generated when using the Mimikatz misc::memssp\nmodule, which injects a malicious Windows SSP to collect locally authenticated credentials, which includes the computer\naccount password, running service credentials, and any accounts that logon.\n\n#### Possible investigation steps\n\n- Investigate script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Scope potentially compromised accounts. Analysts can do this by searching for login events (e.g., 4624) to the target\nhost.\n- Retrieve and inspect the log file contents.\n- By default, the log file is created in the same location as the DLL file.\n- Search for DLL files created in the location, and retrieve any DLLs that are not signed:\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of these files.\n    - Search for the existence of these files in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This file name `mimilsa.log` should not legitimately be created.\n\n### Related rules\n\n- Mimikatz Powershell Module Activity - ac96ceb8-4399-4191-af1d-4feeac1f1f46\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- If the host is a Domain Controller (DC):\n  - Activate your incident response plan for total Active Directory compromise.\n  - Review the permissions of users that can access the DCs.\n- Reset passwords for all compromised accounts.\n- Disable remote login for compromised user accounts.\n- Reboot the host to remove the injected SSP from memory.\n- Reimage the host operating system or restore compromised files to clean versions.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where file.name : \"mimilsa.log\" and process.name : \"lsass.exe\"\n",
   "risk_score": 73,
   "rule_id": "ebb200e8-adf0-43f8-a0bb-4ee5b5d852c6",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json
index 4e0abecf3e443..3c6d4d2c1a166 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_moving_registry_hive_via_smb.json
@@ -2,14 +2,15 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies the creation or modification of a medium size registry hive file via the SMB protocol. This may indicate an exfiltration attempt via dumping SAM registry hive in preparation for credential access.",
+  "description": "Identifies the creation or modification of a medium-size registry hive file on an SMB share, which may indicate an exfiltration attempt of a previously dumped SAM registry hive for credential extraction on an attacker-controlled system.",
   "from": "now-9m",
   "index": [
     "logs-endpoint.events.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Registry Hive File Creation via SMB",
+  "name": "Windows Registry File Creation in SMB Share",
+  "note": "## Triage and analysis\n\n### Investigating Windows Registry File Creation in SMB Share\n\nDumping registry hives is a common way to access credential information. Some hives store credential material, as is the\ncase for the SAM hive, which stores locally cached credentials (SAM Secrets), and the SECURITY hive, which stores domain\ncached credentials (LSA secrets). Dumping these hives in combination with the SYSTEM hive enables the attacker to\ndecrypt these secrets.\n\nAttackers can try to evade detection on the host by transferring this data to a system that is not\nmonitored to be parsed and decrypted. This rule identifies the creation or modification of a medium-size registry hive\nfile on an SMB share, which may indicate this kind of exfiltration attempt.\n\n#### Possible investigation steps\n\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Confirm whether the account owner is aware of the operation.\n- Examine command line logs for the period when the alert was triggered.\n- Capture the registry file(s) to scope the compromised credentials in an eventual Incident Response.\n\n### False positive analysis\n\n- Administrators can export registry hives for backup purposes. Check whether the user should be performing this kind of\nactivity and is aware of it.\n\n### Related rules\n\n- Credential Acquisition via Registry Hive Dumping - a7e7bfa3-088e-4f13-b29e-3986e0e756b8\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- Scope compromised credentials and disable associated accounts.\n- Reset passwords for compromised accounts.\n- Reimage the host operating system and restore compromised files to clean versions.\n",
   "query": "file where event.type == \"creation\" and\n /* regf file header */\n file.Ext.header_bytes : \"72656766*\" and file.size >= 30000 and\n process.pid == 4 and user.id : \"s-1-5-21*\"\n",
   "risk_score": 47,
   "rule_id": "a4c7473a-5cb4-4bc1-9d06-e4a75adbc494",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json
index 102056540e0e2..110a71702fb81 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_remote_sam_secretsdump.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Remote Credential Access via Registry",
-  "note": "## Config\n\nThis rule uses Elastic Endpoint file creation and System Integration events for correlation. Both data should be\ncollected from the host for this detection to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Remote Credential Access via Registry\n\nDumping registry hives is a common way to access credential information. Some hives store credential material, \nsuch as the SAM hive, which stores locally cached credentials (SAM Secrets), and the SECURITY hive, which stores domain\ncached credentials (LSA secrets). Dumping these hives in combination with the SYSTEM hive enables the attacker to\ndecrypt these secrets.\n\nAttackers can use tools like secretsdump.py or CrackMapExec to dump the registry hives remotely, and use dumped\ncredentials to access other systems in the domain.\n\n#### Possible investigation steps\n\n- Identify the target host role, involved account, and source host.\n- Determine the privileges assigned to any compromised accounts.\n- Investigate other alerts related to the involved user and source host in the last 48 hours.\n- Scope potentially compromised accounts. Analysts can do this by searching for login events (e.g., 4624) to the target\nhost.\n\n### False positive analysis\n\n- False positives for this rule are unlikely. Any activity that triggered the alert and is not inherently malicious must\nbe monitored by the security team.\n\n### Related rules\n\n- Credential Acquisition via Registry Hive Dumping - a7e7bfa3-088e-4f13-b29e-3986e0e756b8\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved hosts to prevent further post-compromise behavior.\n- Scope compromised credentials and disable the accounts.\n- Reset the passwords of compromised accounts.\n- Determine if other hosts were compromised.\n\n## Config\n\nThis rule uses Elastic Endpoint file creation and System Integration events for correlation. Both data should be\ncollected from the host for this detection to work.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "sequence by host.id, user.id with maxspan=1m\n [authentication where\n   event.outcome == \"success\" and\n   winlog.logon.type == \"Network\" and not user.name == \"ANONYMOUS LOGON\" and\n   not user.domain == \"NT AUTHORITY\" and source.ip != \"127.0.0.1\" and source.ip !=\"::1\"]\n [file where event.action == \"creation\" and process.name : \"svchost.exe\" and\n  file.Ext.header_bytes : \"72656766*\" and user.id : \"S-1-5-21-*\" and file.size >= 30000]\n",
   "references": [
     "https://github.com/SecureAuthCorp/impacket/blob/master/examples/secretsdump.py"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json
index 853b1446cb41f..14a042b2cff52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_seenabledelegationprivilege_assigned_to_user.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json
index 261510427a628..5c9fc3f5777ed 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_shadow_credentials.json
@@ -9,7 +9,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -52,5 +51,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json
index 70f897b2ee83a..71c47ee2a7bc3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_spn_attribute_modified.json
@@ -11,7 +11,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "User account exposed to Kerberoasting",
-  "note": "## Triage and analysis.\n\n### Investigating User account exposed to Kerberoasting\n\nService principal names (SPNs) is the name by which a Kerberos client uniquely identifies an instance of a service for a\ngiven Kerberos target computer. \n\nBy default, only computer accounts have SPNs, and there is no significant risk about this, as machine accounts have a\ndefault domain policy that configures these accounts to rotate their passwords every 30 days, and the password is\ncompound of 120 random characters, making them not to be vulnerable to Kerberoasting.\n\nSo, a user account with an SPN assigned is considered a Service Account, making it available to be accessed by the\nentire domain. If any user in the directory requests a TGS, the domain controller will encrypt it with the secret key of\nthe account executing the service. An attacker can potentially perform a Kerberoasting attack with this information, as\nthe human-defined password is more likely to be less complex.\n\nFor scenarios where SPNs cannot be avoided on user accounts, Microsoft provides the Group Managed Service Accounts (gMSA)\nfeature, which ensures that the account password is robust and changed regularly and automatically. More information can\nbe found [here](https://docs.microsoft.com/en-us/windows-server/security/group-managed-service-accounts/group-managed-service-accounts-overview).\n\nAttackers can also perform \"Targeted Kerberoasting\", which consists of adding fake SPNs to user accounts that they have\nwrite privileges to, making them potentially vulnerable to Kerberoasting.\n\n#### Possible investigation steps:\n\n- Identify the account that performed the action.\n- Check whether this user should be doing this kind of activity.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate if the target account is a member of Privileged groups (Domain Admins, Enterprise Admins, etc).\n- Investigate if tickets have been requested for the target account.\n- Investigate other alerts related to the user in the last 48 hours.\n\n### False Positive Analysis\n\n- The use of user accounts as service accounts is a bad security practice and should not be allowed in the domain. The\nsecurity team should map and monitor any potential B-TP (Benign True Positive), especially if the account is privileged.\nDomain Administrators that define this kind of setting can put the domain at risk as user accounts don't have the same\nsecurity standards (Long, complex, random passwords that change frequently) as computer accounts, exposing them to\ncredential cracking attacks (Kerberoasting, brute force, etc.).\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage\n- Reset the password of the involved accounts. Priority should be given to privileged accounts.\n- Quarantine the involved host for forensic investigation, as well as eradication and recovery activities.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nAudit Policies > \nDS Access > \nAudit Directory Service Changes (Success,Failure)\n```\n\nThe above policy does not cover User objects, so we need to set up an AuditRule using https://github.com/OTRF/Set-AuditRule.\nAs this specifies the servicePrincipalName Attribute GUID, it is expected to be low noise.\n\n```\nSet-AuditRule -AdObjectPath 'AD:\\CN=Users,DC=Domain,DC=com' -WellKnownSidType WorldSid -Rights WriteProperty -InheritanceFlags Children -AttributeGUID f3a64788-5306-11d1-a9c5-0000f80367c1 -AuditFlags Success\n```\n",
+  "note": "## Triage and analysis\n\n### Investigating User account exposed to Kerberoasting\n\nService Principal Names (SPNs) are names by which Kerberos clients uniquely identify service instances for Kerberos target\ncomputers.\n\nBy default, only computer accounts have SPNs, which creates no significant risk, since machine accounts have a default\ndomain policy that rotates their passwords every 30 days, and the password is composed of 120 random characters, making\nthem invulnerable to Kerberoasting.\n\nA user account with an SPN assigned is considered a Service Account, and is accessible to the entire domain. If any\nuser in the directory requests a ticket-granting service (TGS), the domain controller will encrypt it with the secret\nkey of the account executing the service. An attacker can potentially perform a Kerberoasting attack with this\ninformation, as the human-defined password is likely to be less complex.\n\nFor scenarios where SPNs cannot be avoided on user accounts, Microsoft provides the Group Managed Service Accounts (gMSA)\nfeature, which ensures that account passwords are robust and changed regularly and automatically. More information can\nbe found [here](https://docs.microsoft.com/en-us/windows-server/security/group-managed-service-accounts/group-managed-service-accounts-overview).\n\nAttackers can also perform \"Targeted Kerberoasting\", which consists of adding fake SPNs to user accounts that they have\nwrite privileges to, making them potentially vulnerable to Kerberoasting.\n\n#### Possible investigation steps\n\n- Identify the account that performed the action.\n- Check whether this user should be doing this kind of activity.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate if the target account is a member of privileged groups (Domain Admins, Enterprise Admins, etc.).\n- Investigate if tickets have been requested for the target account.\n- Investigate other alerts related to the user in the last 48 hours.\n\n### False positive analysis\n\n- The use of user accounts as service accounts is a bad security practice and should not be allowed in the domain. The\nsecurity team should map and monitor any potential benign true positive (B-TP), especially if the account is privileged.\nDomain Administrators that define this kind of setting can put the domain at risk as user accounts don't have the same\nsecurity standards as computer accounts (which have long, complex, random passwords that change frequently), exposing\nthem to credential cracking attacks (Kerberoasting, brute force, etc.).\n\n### Response and remediation \n\n- Initiate the incident response process based on the outcome of the triage.\n- Reset the passwords of affected accounts, prioritizing privileged accounts.\n- Quarantine the involved host for forensic investigation, as well as eradication and recovery activities.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success, Failure).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nAudit Policies >\nDS Access >\nAudit Directory Service Changes (Success,Failure)\n```\n\nThe above policy does not cover User objects, so we need to set up an AuditRule using https://github.com/OTRF/Set-AuditRule.\nAs this specifies the servicePrincipalName Attribute GUID, it is expected to be low noise.\n\n```\nSet-AuditRule -AdObjectPath 'AD:\\CN=Users,DC=Domain,DC=com' -WellKnownSidType WorldSid -Rights WriteProperty -InheritanceFlags Children -AttributeGUID f3a64788-5306-11d1-a9c5-0000f80367c1 -AuditFlags Success\n```\n",
   "query": "event.action:\"Directory Service Changes\" and event.code:5136 and winlog.event_data.ObjectClass:\"user\" \nand winlog.event_data.AttributeLDAPDisplayName:\"servicePrincipalName\"\n",
   "references": [
     "https://www.thehacker.recipes/ad/movement/access-controls/targeted-kerberoasting",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json
index 1daea178fca7e..32cfc08f94770 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_symbolic_link_to_shadow_copy_created.json
@@ -16,7 +16,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Symbolic Link to Shadow Copy Created",
-  "note": "## Triage and analysis.\n\n### Investigating\n\nShadow copies are backups or snapshots of an endpoints files or volumes at the time of being in use. Adversaries may attempt to discover and create symbolic links to these shadow copies in order to copy sensitive information offline. If Active Directory (AD) is in use, often the ntds.dit file is a target as it contains password hashes but an offline copy is needed to extract these hashes and potentially conduct lateral movement.\n\n#### Possible investigation steps:\n\n- Determine if a volume shadow copy was recently created on this endpoint.\n- Review priviledges of the end user as this requires administrative access.\n- Verify ntds.dit file was successfully copied and the location.\n- Investigate for registry SYSTEM file copies made recently or saved via Reg.exe.\n- Investigate recent deletions of volume shadow copies.\n- Identify other files potentially copied from volume shadow copy paths directly.\n\n### False Positive Analysis\n\n- There should be very little false positive triggers with this rule.\n\n### Related Rules\n- NTDS or SAM Database File Copied - 3bc6deaa-fbd4-433a-ae21-3e892f95624f\n\n### Response and Remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- In case specific credentials were compromised:\n    - Reset the password for the accounts\n- Locate and remove static files copied from volume shadow copies.\n- Command-Line tool mklink should require administrative access by default unless in developer mode.\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested)\n\n```\nComputer Configuration >\nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nSystem Audit Policies >\nObject Access >\nAudit File System (Success,Failure)\nAudit Handle Manipulation (Success,Failure)\n```\n\nThis event will only trigger if symbolic links are created from a new process spawning for cmd.exe or powershell.exe with the correct arguments.\nDirect access to a shell and calling symbolic link creation tools will not generate an event.\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating Symbolic Link to Shadow Copy Created\n\nShadow copies are backups or snapshots of an endpoint's files or volumes while they are in use. Adversaries may attempt\nto discover and create symbolic links to these shadow copies in order to copy sensitive information offline. If Active\nDirectory (AD) is in use, often the ntds.dit file is a target as it contains password hashes, but an offline copy is\nneeded to extract these hashes and potentially conduct lateral movement.\n\n#### Possible investigation steps\n\n- Determine if a volume shadow copy was recently created on this endpoint.\n- Review priviledges of the end user as this requires administrative access.\n- Verify if the ntds.dit file was successfully copied and determine its copy destination.\n- Investigate for registry SYSTEM file copies made recently or saved via Reg.exe.\n- Investigate recent deletions of volume shadow copies.\n- Identify other files potentially copied from volume shadow copy paths directly.\n\n### False positive analysis\n\n- This rule should cause very few false positives. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Related rules \n\n- NTDS or SAM Database File Copied - 3bc6deaa-fbd4-433a-ae21-3e892f95624f\n\n### Response and remediation \n\n- Initiate the incident response process based on the outcome of the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- If the entire domain or the `krbtgt` user was compromised:\n  - Activate your incident response plan for total Active Directory compromise which should include, but not be limited\n  to, a password reset (twice) of the `krbtgt` user.\n- Locate and remove static files copied from volume shadow copies.\n- Command-Line tool mklink should require administrative access by default unless in developer mode.\n\n## Config\n\nEnsure advanced audit policies for Windows are enabled, specifically:\nObject Access policies [Event ID 4656](https://docs.microsoft.com/en-us/windows/security/threat-protection/auditing/event-4656) (Handle to an Object was Requested) \n \n``` \nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nSystem Audit Policies > \nObject Access > \nAudit File System (Success,Failure) \nAudit Handle Manipulation (Success,Failure) \n``` \n \nThis event will only trigger if symbolic links are created from a new process spawning cmd.exe or powershell.exe with the correct arguments. \nDirect access to a shell and calling symbolic link creation tools will not generate an event matching this rule. \n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\",\"process_created\") and \n process.pe.original_file_name in (\"Cmd.Exe\",\"PowerShell.EXE\") and    \n \n /* Create Symbolic Link to Shadow Copies */\n process.args : (\"*mklink*\", \"*SymbolicLink*\") and process.command_line : (\"*HarddiskVolumeShadowCopy*\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/mklink",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
index 03189a0c45a28..791cfb1c3fce1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
@@ -61,5 +61,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 10
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
index eedca883e371c..c79afb655744e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_security_logs.json
@@ -7,7 +7,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -50,5 +49,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
index b5c007363bdb8..0509138cf5238 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_defender_exclusion_via_powershell.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Windows Defender Exclusions Added via PowerShell",
-  "note": "## Triage and analysis\n\n### Investigating Windows Defender Exclusions\n\nMicrosoft Windows Defender is an anti-virus product built-in within Microsoft Windows. Since this software product is\nused to prevent and stop malware, it's important to monitor what specific exclusions are made to the product's configuration\nsettings. These can often be signs of an adversary or malware trying to bypass Windows Defender's capabilities. One of the more\nnotable [examples](https://www.cyberbit.com/blog/endpoint-security/latest-trickbot-variant-has-new-tricks-up-its-sleeve/) was observed in 2018 where Trickbot incorporated mechanisms to disable Windows Defense to avoid detection.\n\n#### Possible investigation steps:\n- With this specific rule, it's completely possible to trigger detections on network administrative activity or benign users\nusing scripting and PowerShell to configure the different exclusions for Windows Defender. Therefore, it's important to\nidentify the source of the activity first and determine if there is any mal-intent behind the events.\n- The actual exclusion such as the process, the file or directory should be reviewed in order to determine the original\nintent behind the exclusion. Is the excluded file or process malicious in nature or is it related to software that needs\nto be legitimately allowlisted from Windows Defender?\n\n### False Positive Analysis\n- This rule has a higher chance to produce false positives based on the nature around configuring exclusions by possibly\na network administrator. In order to validate the activity further, review the specific exclusion and its intent. There\nare many legitimate reasons for exclusions, so it's important to gain context.\n\n### Related Rules\n- Windows Defender Disabled via Registry Modification\n- Disabling Windows Defender Security Settings via PowerShell\n\n### Response and Remediation\n- Since this is related to post-exploitation activity, take immediate action to review, investigate and\npotentially isolate further activity.\n- If further analysis showed malicious intent was behind the Defender exclusions, administrators should remove\nthe exclusion and ensure antimalware capability has not been disabled or deleted.\n- Exclusion lists for antimalware capabilities should always be routinely monitored for review.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Windows Defender Exclusions Added via PowerShell\n\nMicrosoft Windows Defender is an antivirus product built into Microsoft Windows. Since this software product is\nused to prevent and stop malware, it's important to monitor what specific exclusions are made to the product's configuration\nsettings. These can often be signs of an adversary or malware trying to bypass Windows Defender's capabilities. One of\nthe more notable [examples](https://www.cyberbit.com/blog/endpoint-security/latest-trickbot-variant-has-new-tricks-up-its-sleeve/)\nwas observed in 2018 where Trickbot incorporated mechanisms to disable Windows Defender to avoid detection. \n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Examine the exclusion in order to determine the intent behind it.\n- Check for similar behavior in other hosts on the environment.\n- If the exclusion specifies a suspicious file, retrieve it and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This rule has a high chance to produce false positives due to how often network administrators legitimately configure\nexclusions. In order to validate the activity further, review the specific exclusion and its intent. There are many\nlegitimate reasons for exclusions, so it's important to gain context.\n\n### Related rules\n\n- Windows Defender Disabled via Registry Modification - 2ffa1f1e-b6db-47fa-994b-1512743847eb\n- Disabling Windows Defender Security Settings via PowerShell - c8cccb06-faf2-4cd5-886e-2c9636cfcb87\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n    - Immediately block the identified indicators of compromise (IoCs).\n    - Remove and block malicious artifacts identified on the triage.\n- Exclusion lists for antimalware capabilities should always be routinely monitored for review.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type == \"start\" and\n (process.name : (\"powershell.exe\", \"pwsh.exe\", \"powershell_ise.exe\") or process.pe.original_file_name in (\"powershell.exe\", \"pwsh.dll\", \"powershell_ise.exe\")) and\n  process.args : (\"*Add-MpPreference*\", \"*Set-MpPreference*\") and\n  process.args : (\"*-Exclusion*\")\n",
   "references": [
     "https://www.bitdefender.com/files/News/CaseStudies/study/400/Bitdefender-PR-Whitepaper-MosaicLoader-creat5540-en-EN.pdf"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json
index fc5dd888d5d45..96430e3705ce1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_posh_scriptblocklogging.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "PowerShell Script Block Logging Disabled",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating PowerShell Script Block Logging Disabled\n\nPowerShell is one of the main tools system administrators use for automation, report routines, and other tasks, making\nit available in various environments and creating an attractive way for attackers to execute code.\n\nPowerShell Script Block Logging is a feature of PowerShell that records the content of all script blocks that it\nprocesses, giving defenders visibility of PowerShell scripts and sequences of executed commands.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action.\n- Check whether the account should perform this kind of action.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check whether it makes sense for the user to use PowerShell to complete its tasks.\n- Investigate if PowerShell scripts were run after logging was disabled.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Related rules\n\n- PowerShell Suspicious Discovery Related Windows API Functions - 61ac3638-40a3-44b2-855a-985636ca985e\n- PowerShell Keylogging Script - bd2c86a0-8b61-4457-ab38-96943984e889\n- PowerShell Suspicious Script with Audio Capture Capabilities - 2f2f4939-0b34-40c2-a0a3-844eb7889f43\n- Potential Process Injection via PowerShell - 2e29e96a-b67c-455a-afe4-de6183431d0d\n- PowerShell Reflection Assembly Load - e26f042e-c590-4e82-8e05-41e81bd822ad\n- PowerShell Suspicious Payload Encoded and Compressed - 81fe9dc6-a2d7-4192-a2d8-eed98afc766a\n- PowerShell Suspicious Script with Screenshot Capabilities - 959a7353-1129-4aa7-9084-30746b256a70\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Review the implicated user account's privileges.\n- Configure AppLocker or equivalent software to restrict access to PowerShell for regular users.\n\n## Config\n\nThe 'PowerShell Script Block Logging' logging policy must be configured (Enable).\n\nSteps to implement the logging policy with with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nAdministrative Templates > \nWindows PowerShell > \nTurn on PowerShell Script Block Logging (Enable)\n```\n\nSteps to implement the logging policy via registry:\n\n```\nreg add \"hklm\\SOFTWARE\\Policies\\Microsoft\\Windows\\PowerShell\\ScriptBlockLogging\" /v EnableScriptBlockLogging /t REG_DWORD /d 1\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where event.type == \"change\" and\n    registry.path : \n        \"HKLM\\\\SOFTWARE\\\\Policies\\\\Microsoft\\\\Windows\\\\PowerShell\\\\ScriptBlockLogging\\\\EnableScriptBlockLogging\"\n    and registry.data.strings : (\"0\", \"0x00000000\")\n",
   "references": [
     "https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.PowerShell::EnableScriptBlockLogging"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
index 7e5451355c17a..d8901907381ec 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Disable Windows Firewall Rules via Netsh",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Disable Windows Firewall Rules via Netsh\n\nThe Windows Defender Firewall is a native component which provides host-based, two-way network traffic filtering for a\ndevice, and blocks unauthorized network traffic flowing into or out of the local device.\n\nAttackers can disable firewall rules which are intended to prevent lateral movement and command and control traffic to\nenable their operations.\n\nThis rule identifies patterns related to disabling firewall rules using the `netsh.exe` utility.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Contact the user to check if they are aware of the operation.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Analyze the executed command to determine what it allowed.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Check whether the user is legitimately performing this kind of activity.\n- Assess the need to disable the modification of the rule, and whether these actions expose the environment to\nunnecessary risks.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Evaluate exceptions that can be added to the firewall rule and re-enable the rule.\n- Review the implicated account's privileges.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.name : \"netsh.exe\" and\n  (process.args : \"disable\" and process.args : \"firewall\" and process.args : \"set\") or\n  (process.args : \"advfirewall\" and process.args : \"off\" and process.args : \"state\")\n",
   "risk_score": 47,
   "rule_id": "4b438734-3793-4fda-bd42-ceeada0be8f9",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
index 10ed16998c4cc..98c13db978a53 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_enable_inbound_rdp_with_netsh.json
@@ -11,8 +11,8 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Remote Desktop Enabled in Windows Firewall",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "name": "Remote Desktop Enabled in Windows Firewall by Netsh",
+  "note": "## Triage and analysis\n\n### Investigating Remote Desktop Enabled in Windows Firewall by Netsh\n\nMicrosoft Remote Desktop Protocol (RDP) is a proprietary Microsoft protocol that enables remote connections to other\ncomputers, typically over TCP port 3389.\n\nAttackers can use RDP to conduct their actions interactively. Ransomware operators frequently use RDP to access\nvictim servers, often using privileged accounts.\n\nThis rule detects the creation of a Windows Firewall inbound rule that would allow inbound RDP traffic using the\n`netsh.exe` utility.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Contact the user to check if they are aware of the operation.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check whether it makes sense to enable RDP to this host, given its role in the environment.\n- Check if the host is directly exposed to the internet.\n- Check whether privileged accounts accessed the host shortly after the modification.\n\n### False positive analysis\n\n- The `netsh.exe` utility can be used legitimately. Check whether the user should be performing this kind of activity, whether the user is aware\nof it, whether RDP should be open, and whether the action exposes the environment to unnecessary risks.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If RDP is needed, make sure to secure it:\n  - Allowlist RDP traffic to specific trusted hosts.\n  - Restrict RDP logins to authorized non-administrator accounts, where possible.\n- Quarantine the implicated host to prevent further post-compromise behavior.\n- Review the implicated account's privileges.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n (process.name : \"netsh.exe\" or process.pe.original_file_name == \"netsh.exe\") and\n process.args : (\"localport=3389\", \"RemoteDesktop\", \"group=\\\"remote desktop\\\"\") and\n process.args : (\"action=allow\", \"enable=Yes\", \"enable\")\n",
   "risk_score": 47,
   "rule_id": "074464f9-f30d-4029-8c03-0ed237fffec7",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json
index eeb45198e7e21..a4608867ecde7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_lolbas_wuauclt.json
@@ -48,5 +48,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json
index 1ae658f2f14f3..40d25d7813a30 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_suspicious_certutil_commands.json
@@ -52,5 +52,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 11
+  "version": 12
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
index 7ed0cc2f60dcd..4d66650aecb9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_whitespace_padding_in_command_line.json
@@ -40,5 +40,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json
index 06d9dc6fec4e7..9bb002ceecebc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_workfolders_control_execution.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Signed Proxy Execution via MS WorkFolders",
-  "note": "## Triage and analysis\n\n### Investigating control.exe Execution via Work Folders in Current Working Directory\n\nWork Folders is a role service for file servers running Windows Server that provides a consistent way for users to access their work files from their PCs and devices. This allows for users to store work files and access them from anywhere. When called, Work Folders will automatically execute any Portable Executable (PE) named `control.exe` as an argument before accessing the synced share.\n\nUsing Work Folders to execute a masqueraded control.exe could allow an adversary to bypass application controls and increase privileges.\n\n#### Possible investigation steps:\n- Investigate the process tree starting with parent process WorkFolders.exe and child process control.exe to determine if other child processes spawned during execution.\n- Trace the activity related to the `control.exe` binary to determine continued intrusion activity on the host.\n- Examine the location of the WorkFolders.exe binary to determine if it was copied to the location of the control.exe binary as it resides in the System32 directory by default.\n- Review the control.exe binary executed with Work Folders to determine maliciousness such as additional host activity or network traffic generated\n- Determine if control.exe was synced to sync share, indicating potential lateral movement.\n- Review where control.exe originated from on the host in terms of delivery such as email, web download or written to disk from a seperate binary.\n\n### False Positive Analysis\n- Windows Work Folders are used legitimately by end users and administrators for file sharing and syncing but not in the instance where a suspicious `control.exe` is passed as an argument.\n\n### Response and Remediation\n- If identified as a compromise, engage incident response processes and policies.\n- Take immediate action to review, investigate and potentially isolate activity to prevent further post-compromise\nbehavior.\n- Review the Work Folders synced share to determine if the 'control.exe' was shared and if so remove it.\n- If no lateral movement was identified during investigation, take the effected host offline if possible and remove the control.exe binary as well as any additional artifacts identified during investigation.\n- Review integrating Windows Information Protection (WIP) to enforce data protection by encrypting the data on PCs using Work Folders.\n- Confirm with user whether this was expected or not and reset their password.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Signed Proxy Execution via MS WorkFolders\n\nWork Folders is a role service for file servers running Windows Server that provides a consistent way for users to access\ntheir work files from their PCs and devices. This allows users to store work files and access them from anywhere. When\ncalled, Work Folders will automatically execute any Portable Executable (PE) named `control.exe` as an argument before\naccessing the synced share.\n\nUsing Work Folders to execute a masqueraded control.exe could allow an adversary to bypass application controls and\nincrease privileges.\n \n#### Possible investigation steps\n\n- Investigate the process tree starting with parent process WorkFolders.exe and child process control.exe to determine\nif other child processes spawned during execution.\n- Trace the activity related to the `control.exe` binary to identify any continuing intrusion activity on the host.\n- Examine the location of the WorkFolders.exe binary to determine if it was copied to the location of the control.exe\nbinary. It resides in the System32 directory by default.\n- Review the control.exe binary executed with Work Folders to determine maliciousness such as additional host activity\nor network traffic.\n- Determine if control.exe was synced to sync share, indicating potential lateral movement.\n- Review how control.exe was originally delivered on the host, such as emailed, downloaded from the web, or written to\ndisk from a separate binary.\n \n### False positive analysis \n\n- Windows Work Folders are used legitimately by end users and administrators for file sharing and syncing but not in the\ninstance where a suspicious `control.exe` is passed as an argument.\n\n### Response and remediation \n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Review the Work Folders synced share to determine if the 'control.exe' was shared and if so remove it.\n- If no lateral movement was identified during investigation, take the effected host offline if possible and remove the\ncontrol.exe binary as well as any additional artifacts identified during investigation.\n- Review integrating Windows Information Protection (WIP) to enforce data protection by encrypting the data on PCs using\nWork Folders.\n- Confirm with the user whether this was expected or not, and reset their password.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\",\"process_started\")\n    and process.name : \"control.exe\" and process.parent.name : \"WorkFolders.exe\"\n    and not process.executable : (\"?:\\\\Windows\\\\System32\\\\control.exe\", \"?:\\\\Windows\\\\SysWOW64\\\\control.exe\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows-server/storage/work-folders/work-folders-overview",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
index c6fdb26a1eade..26a15cf522b5f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_adfind_command_activity.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "AdFind Command Activity",
-  "note": "## Triage and analysis\n\n### Investigating AdFind Command Activity\n\n[AdFind](http://www.joeware.net/freetools/tools/adfind/) is a freely available command-line tool used to retrieve information from\nActive Directory (AD). Network discovery and enumeration tools like `AdFind` are useful to adversaries in the same ways\nthey are effective for network administrators. This tool provides quick ability to scope AD person/computer objects and\nunderstand subnets and domain information. There are many [examples](https://thedfirreport.com/category/adfind/)\nobserved where this tool has been adopted by ransomware and criminal groups and used in compromises.\n\n#### Possible investigation steps:\n- `AdFind` is a legitimate Active Directory enumeration tool used by network administrators, it's important to understand\nthe source of the activity.  This could involve identifying the account using `AdFind` and determining based on the command-lines\nwhat information was retrieved, then further determining if these actions are in scope of that user's traditional responsibilities.\n- In multiple public references, `AdFind` is leveraged after initial access is achieved. Review previous activity on impacted\nmachines for suspicious indicators such as previous anti-virus/EDR alerts, phishing emails received, or network traffic\nto suspicious infrastructure.\n\n### False Positive Analysis\n- This rule has a high chance to produce false positives as it is a legitimate tool used by network administrators. One\noption could be allowlisting specific users or groups who use the tool as part of their daily responsibilities. This can\nbe done by leveraging the exception workflow in the Kibana Security App or Elasticsearch API to tune this rule to your environment.\n- Malicious behavior with `AdFind` should be investigated as part of a step within an attack chain. It doesn't happen in\nisolation, so reviewing previous logs/activity from impacted machines can be very telling.\n\n### Related Rules\n- Windows Network Enumeration\n- Enumeration of Administrator Accounts\n- Enumeration Command Spawned via WMIPrvSE\n\n### Response and Remediation\n- Take immediate action to validate activity, investigate and potentially isolate activity to prevent further\npost-compromise behavior.\n- It's important to understand that `AdFind` is an Active Directory enumeration tool and can be used for malicious or legitimate\npurposes, so understanding the intent behind the activity will help determine the appropropriate response.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating AdFind Command Activity\n\n[AdFind](http://www.joeware.net/freetools/tools/adfind/) is a freely available command-line tool used to retrieve information\nfrom Active Directory (AD). Network discovery and enumeration tools like `AdFind` are useful to adversaries in the same\nways they are effective for network administrators. This tool provides quick ability to scope AD person/computer objects\nand understand subnets and domain information. There are many [examples](https://thedfirreport.com/category/adfind/) of\nthis tool being adopted by ransomware and criminal groups and used in compromises.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Examine the command line to determine what information was retrieved by the tool.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n\n### False positive analysis\n\n- This rule has a high chance to produce false positives as it is a legitimate tool used by network administrators. One\noption could be allowlisting specific users or groups who use the tool as part of their daily responsibilities. This can\nbe done by leveraging the exception workflow in the Kibana Security App or Elasticsearch API to tune this rule to your environment.\n- Malicious behavior with `AdFind` should be investigated as part of a step within an attack chain. It doesn't happen in\nisolation, so reviewing previous logs/activity from impacted machines can be very telling.\n\n### Related rules\n\n- Windows Network Enumeration - 7b8bfc26-81d2-435e-965c-d722ee397ef1\n- Enumeration of Administrator Accounts - 871ea072-1b71-4def-b016-6278b505138d\n- Enumeration Command Spawned via WMIPrvSE - 770e0c4d-b998-41e5-a62e-c7901fd7f470\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Determine the initial infection vector.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and \n  (process.name : \"AdFind.exe\" or process.pe.original_file_name == \"AdFind.exe\") and \n  process.args : (\"objectcategory=computer\", \"(objectcategory=computer)\", \n                  \"objectcategory=person\", \"(objectcategory=person)\",\n                  \"objectcategory=subnet\", \"(objectcategory=subnet)\",\n                  \"objectcategory=group\", \"(objectcategory=group)\", \n                  \"objectcategory=organizationalunit\", \"(objectcategory=organizationalunit)\",\n                  \"objectcategory=attributeschema\", \"(objectcategory=attributeschema)\",\n                  \"domainlist\", \"dcmodes\", \"adinfo\", \"dclist\", \"computers_pwnotreqd\", \"trustdmp\")\n",
   "references": [
     "http://www.joeware.net/freetools/tools/adfind/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
index 7ac70f0094d17..7f167f0da268e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
@@ -11,9 +11,9 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Net command via SYSTEM account",
+  "name": "Account Discovery Command via SYSTEM Account",
   "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
-  "query": "process where event.type in (\"start\", \"process_started\") and \n  (?process.Ext.token.integrity_level_name : \"System\" or\n  ?winlog.event_data.IntegrityLevel : \"System\") and\n  process.name : \"whoami.exe\" or\n  (process.name : \"net1.exe\" and not process.parent.name : \"net.exe\")\n",
+  "query": "process where event.type in (\"start\", \"process_started\") and \n  (?process.Ext.token.integrity_level_name : \"System\" or\n  ?winlog.event_data.IntegrityLevel : \"System\") and\n  (process.name : \"whoami.exe\" or\n  (process.name : \"net1.exe\" and not process.parent.name : \"net.exe\"))\n",
   "risk_score": 21,
   "rule_id": "2856446a-34e6-435b-9fb5-f8f040bfa7ed",
   "severity": "low",
@@ -43,5 +43,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 10
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json
index 2fdcdbcc948c7..effcfa6aef6f8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_privileged_localgroup_membership.json
@@ -6,7 +6,7 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
index e9f029c6b25bb..9b703f6108231 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/domain_added_to_google_workspace_trusted_domains.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
index 23a8b0820a65c..58aa6445e4c19 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
@@ -45,5 +45,5 @@
   "timeline_title": "Comprehensive Process Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 9
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
index e694e21393324..cdb5051feb498 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_admin_role_deletion.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
index 825ab59886d6f..8c4ba919753ae 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_mfa_enforcement_disabled.json
@@ -33,5 +33,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 9
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
index aae167f36443d..3a18be0ae60c8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/google_workspace_policy_modified.json
@@ -30,5 +30,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 9
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
index f919c2459aa3f..4f7535803cc79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_deleting_backup_catalogs_with_wbadmin.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Deleting Backup Catalogs with Wbadmin",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Deleting Backup Catalogs with Wbadmin\n\nWindows Server Backup stores the details about your backups (what volumes are backed up and where the backups are\nlocated) in a file called a backup catalog, which ransomware victims can use to recover corrupted backup files.\nDeleting these files is a common step in threat actor playbooks.\n\nThis rule identifies the deletion of the backup catalog using the `wbadmin.exe` utility.\n\n#### Possible investigation steps\n\n- Investigate the script execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Confirm whether the account owner is aware of the operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check if any files on the host machine have been encrypted.\n\n### False positive analysis\n\n- Administrators can use this command to delete corrupted catalogs, but overall the activity is unlikely to be legitimate.\n\n### Related rules\n\n- Third-party Backup Files Deleted via Unexpected Process - 11ea6bec-ebde-4d71-a8e9-784948f8e3e9\n- Volume Shadow Copy Deleted or Resized via VssAdmin - b5ea4bfe-a1b2-421f-9d47-22a75a6f2921\n- Volume Shadow Copy Deletion via PowerShell - d99a037b-c8e2-47a5-97b9-170d076827c4\n- Volume Shadow Copy Deletion via WMIC - dc9c1f74-dac3-48e3-b47f-eb79db358f57\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent destructive behavior, which is commonly associated with this activity.\n- Reset the password of the involved accounts.\n- If any other destructive action was identified on the host, it is recommended to prioritize the investigation and look\nfor ransomware preparation and execution activities.\n- If any backups were affected:\n  - Perform data recovery locally or restore the backups from replicated copies (cloud, other servers, etc.).\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"wbadmin.exe\" or process.pe.original_file_name == \"WBADMIN.EXE\") and\n  process.args : \"catalog\" and process.args : \"delete\"\n",
   "risk_score": 21,
   "rule_id": "581add16-df76-42bb-af8e-c979bfb39a59",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json
index c8609bf8b8513..48a6990b9edbf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_hosts_file_modified.json
@@ -58,5 +58,5 @@
   "timeline_title": "Comprehensive File Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
index 2f9efd05d9cba..e3063f78ffd23 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_modification_of_boot_config.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Modification of Boot Configuration",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Modification of Boot Configuration\n\nBoot entry parameters, or boot parameters, are optional, system-specific settings that represent configuration options.\nThese are stored in a boot configuration data (BCD) store, and administrators can use utilities like `bcdedit.exe` to\nconfigure these.\n\nThis rule identifies the usage of `bcdedit.exe` to:\n\n- Disable Windows Error Recovery (recoveryenabled).\n- Ignore errors if there is a failed boot, failed shutdown, or failed checkpoint (bootstatuspolicy ignoreallfailures).\n\nThese are common steps in destructive attacks by adversaries leveraging ransomware.\n\n#### Possible investigation steps\n\n- Investigate the script execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Confirm whether the account owner is aware of the operation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check if any files on the host machine have been encrypted.\n\n### False positive analysis\n\n- The usage of these options is not inherently malicious. Administrators can modify these configurations to force a\nmachine to boot for troubleshooting or data recovery purposes.\n\n### Related rules\n\n- Deleting Backup Catalogs with Wbadmin - 581add16-df76-42bb-af8e-c979bfb39a59\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent destructive behavior, which is commonly associated with this activity.\n- Reset the password of the involved accounts.\n- If any other destructive action was identified on the host, it is recommended to prioritize the investigation and look\nfor ransomware preparation and execution activities.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  (process.name : \"bcdedit.exe\" or process.pe.original_file_name == \"bcdedit.exe\") and\n  (process.args : \"/set\" and process.args : \"bootstatuspolicy\" and process.args : \"ignoreallfailures\") or\n  (process.args : \"no\" and process.args : \"recoveryenabled\")\n",
   "risk_score": 21,
   "rule_id": "69c251fb-a5d6-4035-b5ec-40438bd829ff",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_deletion.json
similarity index 66%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
rename to x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_deletion.json
index c114c26556033..64c28c5033d9f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_cluster_deletion.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_rds_instance_cluster_deletion.json
@@ -2,9 +2,9 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies the deletion of an Amazon Relational Database Service (RDS) Aurora database cluster or global database cluster.",
+  "description": "Identifies the deletion of an Amazon Relational Database Service (RDS) Aurora database cluster, global database cluster, or database instance.",
   "false_positives": [
-    "Clusters may be deleted by a system administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Cluster deletions by unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
+    "Clusters or instances may be deleted by a system administrator. Verify whether the user identity, user agent, and/or hostname should be making changes in your environment. Cluster or instance deletions by unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule."
   ],
   "from": "now-60m",
   "index": [
@@ -14,14 +14,16 @@
   "interval": "10m",
   "language": "kuery",
   "license": "Elastic License v2",
-  "name": "AWS RDS Cluster Deletion",
+  "name": "AWS Deletion of RDS Instance or Cluster",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(DeleteDBCluster or DeleteGlobalCluster) and event.outcome:success\n",
+  "query": "event.dataset:aws.cloudtrail and event.provider:rds.amazonaws.com and event.action:(DeleteDBCluster or DeleteGlobalCluster or DeleteDBInstance) \nand event.outcome:success\n",
   "references": [
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-db-cluster.html",
     "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteDBCluster.html",
     "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-global-cluster.html",
-    "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteGlobalCluster.html"
+    "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteGlobalCluster.html",
+    "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/delete-db-instance.html",
+    "https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteDBInstance.html"
   ],
   "risk_score": 47,
   "rule_id": "9055ece6-2689-4224-a0e0-b04881e1f8ad",
@@ -53,5 +55,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
index ec361a8795538..9b86a862caf19 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/impact_stop_process_service_threshold.json
@@ -12,6 +12,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "High Number of Process and/or Service Terminations",
+  "note": "## Triage and analysis\n\n### Investigating High Number of Process and/or Service Terminations\n\nAttackers can stop services and kill processes for a variety of purposes. For example, they can stop services associated\nwith business applications and databases to release the lock on files used by these applications so they may be encrypted,\nor stop security and backup solutions, etc.\n\nThis rule identifies a high number (10) of service and/or process terminations (stop, delete, or suspend) from the same\nhost within a short time period.\n\n#### Possible investigation steps\n\n- Investigate the script execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Confirm whether the account owner is aware of the operation, and why it was performed.\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check if any files on the host machine have been encrypted.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further destructive behavior, which is commonly associated with this activity.\n- Reset the password of the involved accounts.\n- Reimage the host operating system or restore it to the operational state.\n- If any other destructive action was identified on the host, it is recommended to prioritize the investigation and look\nfor ransomware preparation and execution activities.\n",
   "query": "event.category:process and event.type:start and process.name:(net.exe or sc.exe or taskkill.exe) and\n process.args:(stop or pause or delete or \"/PID\" or \"/IM\" or \"/T\" or \"/F\" or \"/t\" or \"/f\" or \"/im\" or \"/pid\")\n",
   "risk_score": 47,
   "rule_id": "035889c4-2686-4583-a7df-67f89c292f2c",
@@ -47,5 +48,5 @@
     "value": 10
   },
   "type": "threshold",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
index 26629d7155ebc..6bf4a1d804a9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/index.ts
@@ -160,7 +160,7 @@ import rule147 from './defense_evasion_waf_acl_deletion.json';
 import rule148 from './impact_attempt_to_revoke_okta_api_token.json';
 import rule149 from './impact_iam_group_deletion.json';
 import rule150 from './impact_possible_okta_dos_attack.json';
-import rule151 from './impact_rds_cluster_deletion.json';
+import rule151 from './impact_rds_instance_cluster_deletion.json';
 import rule152 from './initial_access_suspicious_activity_reported_by_okta_user.json';
 import rule153 from './okta_attempt_to_deactivate_okta_policy.json';
 import rule154 from './okta_attempt_to_deactivate_okta_policy_rule.json';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json
index 8bb99f6beaa38..dcd4084fb0aac 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/initial_access_script_executing_powershell.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Windows Script Executing PowerShell",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Windows Script Executing PowerShell\n\nThe Windows Script Host (WSH) is an Windows automation technology, which is ideal for non-interactive scripting needs,\nsuch as logon scripting, administrative scripting, and machine automation.\n\nAttackers commonly use WSH scripts as their initial access method, acting like droppers for second stage payloads, but\ncan also use them to download tools and utilities needed to accomplish their goals.\n\nThis rule looks for the spawn of the `powershell.exe` process with `cscript.exe` or `wscript.exe` as its parent process.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate commands executed by the spawned PowerShell process.\n- Retrieve the script file(s) involved:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n  - Manually analyze the script to determine if malicious capabilities are present.\n- Determine how the script file was delivered (email attachment, dropped by other processes, etc.).\n- Investigate other alerts related to the user/host in the last 48 hours.\n\n### False positive analysis\n\n- The usage of these script engines by regular users is unlikely. In the case of authorized benign true positives\n(B-TPs), exceptions can be added.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove and block malicious artifacts identified on the triage.\n- If the malicious file was delivered via phishing:\n  - Block the email sender from sending future emails.\n  - Block the malicious web pages.\n  - Remove emails from the sender from mailboxes.\n- Reimage the host operating system and restore compromised files to clean versions.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : (\"cscript.exe\", \"wscript.exe\") and process.name : \"powershell.exe\"\n",
   "risk_score": 21,
   "rule_id": "f545ff26-3c94-4fd0-bd33-3c7f95a3a0fc",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
index e15da7079788e..48b2151176b1e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_dns_server_overflow.json
@@ -13,7 +13,7 @@
   "language": "kuery",
   "license": "Elastic License v2",
   "name": "Abnormally Large DNS Response",
-  "note": "## Triage and analysis\n\n### Investigating Large DNS Responses\nDetection alerts from this rule indicate possible anomalous activity around large byte DNS responses from a Windows DNS\nserver. This detection rule was created based on activity represented in exploitation of vulnerability (CVE-2020-1350)\nalso known as [SigRed](https://www.elastic.co/blog/detection-rules-for-sigred-vulnerability) during July 2020.\n\n#### Possible investigation steps:\n- This specific rule is sourced from network log activity such as DNS or network level data. It's important to validate\nthe source of the incoming traffic and determine if this activity has been observed previously within an environment.\n- Activity can be further investigated and validated by reviewing available corresponding Intrusion Detection Signatures (IDS) alerts associated with activity.\n- Further examination can include a review of the `dns.question_type` network fieldset with a protocol analyzer, such as Zeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data.\n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale Internet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.\n\n#### False Positive Analysis\n- Based on this rule, which looks for a threshold of 60k bytes, it is possible for activity to be generated under 65k bytes\nand related to legitimate behavior.  In packet capture files received by the [SANS Internet Storm Center](https://isc.sans.edu/forums/diary/PATCH+NOW+SIGRed+CVE20201350+Microsoft+DNS+Server+Vulnerability/26356/), byte responses\nwere all observed as greater than 65k bytes.\n- This activity can be triggered by compliance/vulnerability scanning or compromise assessment, it's\nimportant to determine the source of the activity and potentially allowlist the source host.\n\n\n### Related Rules\n- Unusual Child Process of dns.exe\n- Unusual File Modification by dns.exe\n\n### Response and Remediation\n- Review and implement the above detection logic within your environment using technology such as Endpoint security, Winlogbeat, Packetbeat, or network security monitoring (NSM) platforms such as Zeek or Suricata.\n- Ensure that you have deployed the latest Microsoft [Security Update](https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2020-1350) (Monthly Rollup or Security Only) and restart the\npatched machines. If unable to patch immediately: Microsoft [released](https://support.microsoft.com/en-us/help/4569509/windows-dns-server-remote-code-execution-vulnerability) a registry-based workaround that doesn\u2019t require a\nrestart. This can be used as a temporary solution before the patch is applied.\n- Maintain backups of your critical systems to aid in quick recovery.\n- Perform routine vulnerability scans of your systems, monitor [CISA advisories](https://us-cert.cisa.gov/ncas/current-activity) and patch identified vulnerabilities.\n- If you observe a true positive, implement a remediation plan and monitor host-based artifacts for additional post-exploitation behavior.\n",
+  "note": "## Triage and analysis\n\n### Investigating Abnormally Large DNS Response\n\nDetection alerts from this rule indicate possible anomalous activity around large byte DNS responses from a Windows DNS\nserver. This detection rule was created based on activity represented in exploitation of vulnerability (CVE-2020-1350)\nalso known as [SigRed](https://www.elastic.co/blog/detection-rules-for-sigred-vulnerability) during July 2020.\n\n#### Possible investigation steps\n\n- This specific rule is sourced from network log activity such as DNS or network level data. It's important to validate\nthe source of the incoming traffic and determine if this activity has been observed previously within an environment.\n- Activity can be further investigated and validated by reviewing any associated Intrusion Detection Signatures (IDS) alerts.\n- Further examination can include a review of the `dns.question_type` network fieldset with a protocol analyzer, such as\nZeek, Packetbeat, or Suricata, for `SIG` or `RRSIG` data. \n- Validate the patch level and OS of the targeted DNS server to validate the observed activity was not large-scale\ninternet vulnerability scanning.\n- Validate that the source of the network activity was not from an authorized vulnerability scan or compromise assessment.\n\n#### False positive analysis\n\n- Based on this rule, which looks for a threshold of 60k bytes, it is possible for activity to be generated under 65k bytes\nand related to legitimate behavior.  In packet capture files received by the [SANS Internet Storm Center](https://isc.sans.edu/forums/diary/PATCH+NOW+SIGRed+CVE20201350+Microsoft+DNS+Server+Vulnerability/26356/), byte responses\nwere all observed as greater than 65k bytes.\n- This activity can be triggered by compliance/vulnerability scanning or compromise assessment; it's important to\ndetermine the source of the activity and potentially allowlist the source host.\n\n### Related rules\n\n- Unusual Child Process of dns.exe - 8c37dc0e-e3ac-4c97-8aa0-cf6a9122de45\n- Unusual File Modification by dns.exe - c7ce36c0-32ff-4f9a-bfc2-dcb242bf99f9\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Ensure that you have deployed the latest Microsoft [Security Update](https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2020-1350)\n(Monthly Rollup or Security Only) and restarted the patched machines. If unable to patch immediately, Microsoft [released](https://support.microsoft.com/en-us/help/4569509/windows-dns-server-remote-code-execution-vulnerability)\na registry-based workaround that doesn\u2019t require a restart. This can be used as a temporary solution before the patch is applied. \n- Maintain backups of your critical systems to aid in quick recovery.\n- Perform routine vulnerability scans of your systems, monitor [CISA advisories](https://us-cert.cisa.gov/ncas/current-activity) and patch identified vulnerabilities.\n- If you observe a true positive, implement a remediation plan and monitor host-based artifacts for additional post-exploitation behavior.\n",
   "query": "event.category:(network or network_traffic) and destination.port:53 and\n  (event.dataset:zeek.dns or type:dns or event.type:connection) and network.bytes > 60000\n",
   "references": [
     "https://research.checkpoint.com/2020/resolving-your-way-into-domain-admin-exploiting-a-17-year-old-bug-in-windows-dns-servers/",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
index 37b07aa4b19f0..1a8eb370e9167 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_rdp_enabled_registry.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "RDP Enabled via Registry",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating RDP Enabled via Registry\n\nMicrosoft Remote Desktop Protocol (RDP) is a proprietary Microsoft protocol that enables remote connections to other\ncomputers, typically over TCP port 3389.\n\nAttackers can use RDP to conduct their actions interactively. Ransomware operators frequently use RDP to access\nvictim servers, often using privileged accounts.\n\nThis rule detects modification of the fDenyTSConnections registry key to the value `0`, which specifies that remote\ndesktop connections are enabled. Attackers can abuse remote registry, use psexec, etc., to enable RDP and move laterally.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Contact the user to check if they are aware of the operation.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Check whether it makes sense to enable RDP to this host, given its role in the environment.\n- Check if the host is directly exposed to the internet.\n- Check whether privileged accounts accessed the host shortly after the modification.\n- Review network events within a short timespan of this alert for incoming RDP connection attempts.\n\n### False positive analysis\n\n- This mechanism can be used legitimately. Check whether the user should be performing this kind of activity, whether they are aware\nof it, whether RDP should be open, and whether the action exposes the environment to unnecessary risks.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If RDP is needed, make sure to secure it using firewall rules:\n  - Allowlist RDP traffic to specific trusted hosts.\n  - Restrict RDP logins to authorized non-administrator accounts, where possible.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Review the implicated account's privileges.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where event.type in (\"creation\", \"change\") and\n  registry.path : \"HKLM\\\\SYSTEM\\\\*ControlSet*\\\\Control\\\\Terminal Server\\\\fDenyTSConnections\" and\n  registry.data.strings : (\"0\", \"0x00000000\") and not (process.name : \"svchost.exe\" and user.domain == \"NT AUTHORITY\") and\n  not process.executable : \"C:\\\\Windows\\\\System32\\\\SystemPropertiesRemote.exe\"\n",
   "risk_score": 47,
   "rule_id": "58aa72ca-d968-4f34-b9f7-bea51d75eb50",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
index 95170577bc8c9..d4d82d7532cbe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_scheduled_task_target.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Remote Scheduled Task Creation",
-  "note": "## Triage and analysis\n\n### Investigating Creation of Remote Scheduled Tasks\n\n[Scheduled tasks](https://docs.microsoft.com/en-us/windows/win32/taskschd/about-the-task-scheduler) are a great\nmechanism for persistence and program execution. These features can\nbe used remotely for a variety of legitimate reasons, but at the same time used by malware and adversaries.\nWhen investigating scheduled tasks that were set up remotely, one of the first steps should be to determine the\noriginal intent behind the configuration and to verify if the activity is tied to benign behavior such as software installation or any kind\nof network administrator work. One objective for these alerts is to understand the configured action within the scheduled\ntask. This is captured within the registry event data for this rule and can be base64 decoded to view the value.\n\n#### Possible investigation steps:\n- Review the base64 encoded tasks actions registry value to investigate the task configured action.\n- Determine if task is related to legitimate or benign behavior based on the corresponding process or program tied to the\nscheduled task.\n- Further examination should include both the source and target machines where host-based artifacts and network logs\nshould be reviewed further around the time window of the creation of the scheduled task.\n\n### False Positive Analysis\n- There is a high possibility of benign activity tied to the creation of remote scheduled tasks as it is a general feature\nwithin Windows and used for legitimate purposes for a wide range of activity. Any kind of context should be found to\nfurther understand the source of the activity and determine the intent based on the scheduled task contents.\n\n### Related Rules\n- Service Command Lateral Movement\n- Remotely Started Services via RPC\n\n### Response and Remediation\n- This behavior represents post-exploitation actions such as persistence or lateral movement, immediately review and\ninvestigate the activity and potentially isolate involved machines to prevent further post-compromise\nbehavior.\n- Remove scheduled task and any other related artifacts to the activity.\n- Review privileged account management and user account management settings such as implementing GPO policies to further\nrestrict activity or configure settings that only allow Administrators to create remote scheduled tasks.\n",
+  "note": "## Triage and analysis\n\n### Investigating Remote Scheduled Task Creation\n\n[Scheduled tasks](https://docs.microsoft.com/en-us/windows/win32/taskschd/about-the-task-scheduler) are a great mechanism\nfor persistence and program execution. These features can be used remotely for a variety of legitimate reasons, but at\nthe same time used by malware and adversaries. When investigating scheduled tasks that were set up remotely, one of the\nfirst steps should be to determine the original intent behind the configuration and to verify if the activity is tied to\nbenign behavior such as software installation or any kind of network administrator work. One objective for these alerts\nis to understand the configured action within the scheduled task. This is captured within the registry event data for\nthis rule and can be base64 decoded to view the value.\n\n#### Possible investigation steps\n\n- Review the base64 encoded tasks actions registry value to investigate the task configured action.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate software\ninstallations.\n- Further examination should include review of host-based artifacts and network logs from around when the scheduled task\nwas created, on both the source and target machines.\n\n### False positive analysis\n\n- There is a high possibility of benign activity tied to the creation of remote scheduled tasks as it is a general feature\nwithin Windows and used for legitimate purposes for a wide range of activity. Any kind of context should be found to\nfurther understand the source of the activity and determine the intent based on the scheduled task's contents.\n\n### Related rules\n\n- Service Command Lateral Movement - d61cbcf8-1bc1-4cff-85ba-e7b21c5beedc\n- Remotely Started Services via RPC - aa9a274d-6b53-424d-ac5e-cb8ca4251650\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Remove scheduled task and any other related artifacts.\n- Review privileged account management and user account management settings. Consider implementing group policy object (GPO) policies to further\nrestrict activity, or configuring settings that only allow administrators to create remote scheduled tasks.\n",
   "query": "/* Task Scheduler service incoming connection followed by TaskCache registry modification  */\n\nsequence by host.id, process.entity_id with maxspan = 1m\n   [network where process.name : \"svchost.exe\" and\n   network.direction : (\"incoming\", \"ingress\") and source.port >= 49152 and destination.port >= 49152 and\n   source.ip != \"127.0.0.1\" and source.ip != \"::1\"\n   ]\n   [registry where registry.path : \"HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows NT\\\\CurrentVersion\\\\Schedule\\\\TaskCache\\\\Tasks\\\\*\\\\Actions\"]\n",
   "risk_score": 47,
   "rule_id": "954ee7c8-5437-49ae-b2d6-2960883898e9",
@@ -64,5 +64,5 @@
     }
   ],
   "type": "eql",
-  "version": 7
+  "version": 8
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
index 29fb27e3d944a..87a6618d4c9d8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/mfa_disabled_for_google_workspace_organization.json
@@ -30,5 +30,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 9
+  "version": 11
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json
index 2aa6e71b4f845..cc94c5962192b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ad_adminsdholder.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -41,5 +40,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
index 93d253d1020c8..f64aab9da8fff 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
@@ -12,8 +12,11 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Adobe Hijack Persistence",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Adobe Hijack Persistence\n\nAttackers can replace the `RdrCEF.exe` executable with their own to maintain their access, which will be launched\nwhenever Adobe Acrobat Reader is executed.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positives (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Disable the involved accounts, or restrict their ability to log on remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type == \"creation\" and\n  file.path : (\"?:\\\\Program Files (x86)\\\\Adobe\\\\Acrobat Reader DC\\\\Reader\\\\AcroCEF\\\\RdrCEF.exe\",\n               \"?:\\\\Program Files\\\\Adobe\\\\Acrobat Reader DC\\\\Reader\\\\AcroCEF\\\\RdrCEF.exe\") and\n  not process.name : \"msiexec.exe\"\n",
+  "references": [
+    "https://twitter.com/pabraeken/status/997997818362155008"
+  ],
   "risk_score": 21,
   "rule_id": "2bf78aa2-9c56-48de-b139-f169bf99cf86",
   "severity": "low",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
index 5856c5a7a0111..526438d6bf430 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_ec2_security_group_configuration_change_detection.json
@@ -17,7 +17,7 @@
   "license": "Elastic License v2",
   "name": "AWS Security Group Configuration Change Detection",
   "note": "## Config\n\nThe AWS Fleet integration, Filebeat module, or similarly structured data is required to be compatible with this rule.",
-  "query": "event.dataset:aws.cloudtrail and event.provider:iam.amazonaws.com and event.action:(AuthorizeSecurityGroupEgress or \nCreateSecurityGroup or ModifyInstanceAttribute or ModifySecurityGroupRules or RevokeSecurityGroupEgress or \nRevokeSecurityGroupIngress) and event.outcome:success\n",
+  "query": "event.dataset:aws.cloudtrail and event.provider:ec2.amazonaws.com and event.action:(AuthorizeSecurityGroupEgress or \nCreateSecurityGroup or ModifyInstanceAttribute or ModifySecurityGroupRules or RevokeSecurityGroupEgress or \nRevokeSecurityGroupIngress) and event.outcome:success\n",
   "references": [
     "https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-security-groups.html"
   ],
@@ -67,5 +67,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
index fdf6ef77b87e3..5197c5b9a67bb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_hidden_local_account_creation.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Creation of a Hidden Local User Account",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Creation of a Hidden Local User Account\n\nAttackers can create accounts ending with a `$` symbol to make the account hidden to user enumeration utilities and\nbypass detections that identify computer accounts by this pattern to apply filters.\n\nThis rule uses registry events to identify the creation of local hidden accounts.\n\n#### Possible investigation steps\n\n- Identify the user account which performed the action and whether it should perform this kind of action.\n- Investigate the script execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n\n### False positive analysis\n\n- This activity is unlikely to happen legitimately. Benign true positive (B-TPs) can be added as exceptions if necessary.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Quarantine the involved host to prevent further post-compromise behavior.\n- Delete the hidden account.\n- Review the privileges of the involved accounts.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "registry where registry.path : \"HKLM\\\\SAM\\\\SAM\\\\Domains\\\\Account\\\\Users\\\\Names\\\\*$\\\\\"\n",
   "references": [
     "https://blog.menasec.net/2019/02/threat-hunting-6-hiding-in-plain-sights_8.html",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
index a6b1f077c154b..493cc46dcc860 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_evasion_registry_startup_shell_folder_modified.json
@@ -10,7 +10,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Suspicious Startup Shell Folder Modification",
-  "note": "## Triage and analysis\n\n### Investigating Suspicious Startup Shell Activity\n\nTechniques used within malware and by adversaries often leverage the Windows registry to store malicious programs for\npersistence. Startup shell folders are often targeted as they are not as prevalent as normal Startup folder paths so this\nbehavior may evade existing AV/EDR solutions. These programs may also run with higher privileges which can be ideal for\nan attacker.\n\n#### Possible investigation steps:\n- Review the source process and related file tied to the Windows Registry entry.\n- Validate the activity is not related to planned patches, updates, network administrator activity or legitimate software\ninstallations.\n- Determine if activity is unique by validating if other machines in same organization have similar entry.\n\n### False Positive Analysis\n- There is a high possibility of benign legitimate programs being added to Shell folders. This activity could be based\non new software installations, patches, or any kind of network administrator related activity. Before entering further\ninvestigation, it should be verified that this activity is not benign.\n\n### Related Rules\n- Startup or Run Key Registry Modification\n- Persistent Scripts in the Startup Directory\n\n### Response and Remediation\n- Activity should first be validated as a true positive event if so then take immediate action to review,\ninvestigate and potentially isolate activity to prevent further post-compromise behavior.\n- The respective binary or program tied to this persistence method should be further analyzed and reviewed to understand\nits behavior and capabilities.\n- Since this activity is considered post-exploitation behavior, it's important to understand how the behavior was first\ninitialized such as through a macro-enabled document that was attached in a phishing email. By understanding the source\nof the attack, this information can then be used to search for similar indicators on other machines in the same environment.\n",
+  "note": "## Triage and analysis\n\n### Investigating Suspicious Startup Shell Folder Modification\n\nTechniques used within malware and by adversaries often leverage the Windows registry to store malicious programs for\npersistence. Startup shell folders are often targeted as they are not as prevalent as normal Startup folder paths so this\nbehavior may evade existing AV/EDR solutions. These programs may also run with higher privileges which can be ideal for\nan attacker.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Review the source process and related file tied to the Windows Registry entry.\n- Validate the activity is not related to planned patches, updates, network administrator activity or legitimate software\ninstallations.\n- Determine if activity is unique by validating if other machines in the same organization have similar entries.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- There is a high possibility of benign legitimate programs being added to shell folders. This activity could be based\non new software installations, patches, or other network administrator activity. Before entering further investigation,\nit should be verified that this activity is not benign.\n\n### Related rules\n\n- Startup or Run Key Registry Modification - 97fc44d3-8dae-4019-ae83-298c3015600f\n- Persistent Scripts in the Startup Directory - f7c4dc5a-a58d-491d-9f14-9b66507121c0\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Since this activity is considered post-exploitation behavior, it's important to understand how the behavior was first\ninitialized such as through a macro-enabled document that was attached in a phishing email. After understanding the source\nof the attack, you can use this information to search for similar indicators on other machines in the same environment.\n",
   "query": "registry where\n registry.path : (\n     \"HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\User Shell Folders\\\\Common Startup\",\n     \"HKLM\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\Shell Folders\\\\Common Startup\",\n     \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\User Shell Folders\\\\Startup\",\n     \"HKEY_USERS\\\\*\\\\Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Explorer\\\\Shell Folders\\\\Startup\"\n     ) and\n  registry.data.strings != null and\n  /* Normal Startup Folder Paths */\n  not registry.data.strings : (\n           \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"%ProgramData%\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"%USERPROFILE%\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\",\n           \"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\"\n           )\n",
   "risk_score": 73,
   "rule_id": "c8b150f0-0164-475b-a75e-74b47800a9ff",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
index 1df067ebceeeb..4678055d6a7e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_admin_role_assigned_to_user.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
index ebe596b18864f..1fc8f4de93b72 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_api_access_granted_via_domain_wide_delegation_of_authority.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
index 8cd9d55cd5b6c..eb018b490eb23 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_custom_admin_role_created.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
index 7588bdaad04e1..881e1e8893afe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_google_workspace_role_modified.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 8
+  "version": 10
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json
index ff15cfa02e090..8ac95785e10d3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_creation.json
@@ -51,5 +51,5 @@
     }
   ],
   "type": "eql",
-  "version": 11
+  "version": 12
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json
index 5d5b7b2c10236..2895fef234f7b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_msds_alloweddelegateto_krbtgt.json
@@ -6,7 +6,6 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "kuery",
@@ -63,5 +62,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json
index 89446880d5a0b..a47c158e4af29 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_priv_escalation_via_accessibility_features.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Modification of Accessibility Binaries",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Modification of Accessibility Binaries\n\nAdversaries may establish persistence and/or elevate privileges by executing malicious content triggered by\naccessibility features. Windows contains accessibility features that may be launched with a key combination before a\nuser has logged in (ex: when the user is on the Windows logon screen). An adversary can modify the way these programs\nare launched to get a command prompt or backdoor without logging in to the system.\n\nMore details can be found [here](https://attack.mitre.org/techniques/T1546/008/).\n\nThis rule looks for the execution of supposed accessibility binaries that don't match any of the accessibility features\nbinaries' original file names, which is likely a custom binary deployed by the attacker.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- This activity should not happen legitimately. The security team should address any potential benign true positive\n(B-TP), as this configuration can put the user and the domain at risk.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the IoCs identified.\n- Remove and block malicious artifacts identified on the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\", \"info\") and\n process.parent.name : (\"Utilman.exe\", \"winlogon.exe\") and user.name == \"SYSTEM\" and\n process.args :\n    (\n    \"C:\\\\Windows\\\\System32\\\\osk.exe\",\n    \"C:\\\\Windows\\\\System32\\\\Magnify.exe\",\n    \"C:\\\\Windows\\\\System32\\\\Narrator.exe\",\n    \"C:\\\\Windows\\\\System32\\\\Sethc.exe\",\n    \"utilman.exe\",\n    \"ATBroker.exe\",\n    \"DisplaySwitch.exe\",\n    \"sethc.exe\"\n    )\n and not process.pe.original_file_name in\n    (\n    \"osk.exe\",\n    \"sethc.exe\",\n    \"utilman2.exe\",\n    \"DisplaySwitch.exe\",\n    \"ATBroker.exe\",\n    \"ScreenMagnifier.exe\",\n    \"SR.exe\",\n    \"Narrator.exe\",\n    \"magnify.exe\",\n    \"MAGNIFY.EXE\"\n    )\n\n/* uncomment once in winlogbeat to avoid bypass with rogue process with matching pe original file name */\n/* and process.code_signature.subject_name == \"Microsoft Windows\" and process.code_signature.status == \"trusted\" */\n",
   "references": [
     "https://www.elastic.co/blog/practical-security-engineering-stateful-detection"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
index 86fa0b2ed1204..2ac177bda0b06 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_registry_uncommon.json
@@ -67,5 +67,5 @@
   "timeline_title": "Comprehensive Registry Timeline",
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 6
+  "version": 7
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json
index 2931ecc753ea3..4c7390210eb37 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_remote_password_reset.json
@@ -9,7 +9,7 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json
index d17662494b71e..a3bcd8f8a92e0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_sdprop_exclusion_dsheuristics.json
@@ -11,7 +11,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "AdminSDHolder SDProp Exclusion Added",
-  "note": "## Triage and analysis.\n\n### Investigating AdminSDHolder SDProp Exclusion Added\n\nThe SDProp process compares the permissions on protected objects with those defined on the AdminSDHolder object. If the\npermissions on any of the protected accounts and groups do not match, it resets the permissions on the protected\naccounts and groups to match those defined in the domain AdminSDHolder object.\n\nThe dSHeuristics is a Unicode string attribute, in which each character in the string represents a heuristic that is\nused to determine the behavior of Active Directory.\n\nAdministrators can use the dSHeuristics attribute to exclude privilege groups from the SDProp process by setting the\n16th bit (dwAdminSDExMask) of the string to a certain value, which represents the group(s):\n\n* For example, to exclude the Account Operators group, an administrator would modify the string, so the 16th character\nis set to 1 (i.e., 0000000001000001). \n\nThe usage of this exclusion can leave the accounts unprotected and facilitate the misconfigurations of privilege on the\nexcluded groups, leaving a gap for attackers to add accounts to these groups to maintain long-term persistence with high\nprivileges.\n\nThis rule will monitor changes on the dsHeuristics object where the 16th bit is set to a value other than zero.\n\n#### Possible investigation steps:\n\n- Identify the account that performed the action\n- Confirm whether the account owner is aware of the operation\n- Investigate other alerts related to the user in the last 48 hours.\n- Check the value assigned to the 16th bit of the string on the `winlog.event_data.AttributeValue` field:\n    - Account Operators eq 1\n    - Server Operators eq 2\n    - Print Operators eq 4\n    - Backup Operators eq 8\n    The field value can range from 0 to f (15). If more than one group is specified, the values will be summed together;\n    for example, Backup Operators and Print Operators will set the `c` value on the bit.\n\n### False Positive Analysis\n\n- While this modification can be done legitimately, it is not best practice. Any potential B-TP (Benign True Positive)\nshould be mapped and reviewed by the security team for alternatives as this weakens the security of the privileged group.\n\n### Response and Remediation\n\n- The change can be reverted by setting the dwAdminSDExMask (16th bit) to 0 in dSHeuristics.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies > \nWindows Settings > \nSecurity Settings > \nAdvanced Audit Policies Configuration > \nAudit Policies > \nDS Access > \nAudit Directory Service Changes (Success)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n\n",
+  "note": "## Triage and analysis\n\n### Investigating AdminSDHolder SDProp Exclusion Added\n\nThe SDProp process compares the permissions on protected objects with those defined on the AdminSDHolder object. If the\npermissions on any of the protected accounts and groups do not match, it resets the permissions on the protected\naccounts and groups to match those defined in the domain AdminSDHolder object.\n\nThe dSHeuristics is a Unicode string attribute, in which each character in the string represents a heuristic that is\nused to determine the behavior of Active Directory.\n\nAdministrators can use the dSHeuristics attribute to exclude privilege groups from the SDProp process by setting the\n16th bit (dwAdminSDExMask) of the string to a certain value, which represents the group(s):\n\n* For example, to exclude the Account Operators group, an administrator would modify the string, so the 16th character\nis set to 1 (i.e., 0000000001000001).\n\nThe usage of this exclusion can leave the accounts unprotected and facilitate the misconfiguration of privileges for the\nexcluded groups, enabling attackers to add accounts to these groups to maintain long-term persistence with high\nprivileges.\n\nThis rule matches changes of the dsHeuristics object where the 16th bit is set to a value other than zero.\n\n#### Possible investigation steps\n\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check the value assigned to the 16th bit of the string on the `winlog.event_data.AttributeValue` field:\n    - Account Operators eq 1\n    - Server Operators eq 2\n    - Print Operators eq 4\n    - Backup Operators eq 8\n    The field value can range from 0 to f (15). If more than one group is specified, the values will be summed together;\n    for example, Backup Operators and Print Operators will set the `c` value on the bit.\n\n### False positive analysis\n\n- While this modification can be done legitimately, it is not best practice. Any potential benign true positive (B-TP)\nshould be mapped and reviewed by the security team for alternatives as this weakens the security of the privileged group.\n\n### Response and remediation\n\n- The change can be reverted by setting the dwAdminSDExMask (16th bit) to 0 in dSHeuristics.\n\n## Config\n\nThe 'Audit Directory Service Changes' logging policy must be configured for (Success).\nSteps to implement the logging policy with Advanced Audit Configuration:\n\n```\nComputer Configuration > \nPolicies >\nWindows Settings >\nSecurity Settings >\nAdvanced Audit Policies Configuration >\nAudit Policies >\nDS Access >\nAudit Directory Service Changes (Success)\n```\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "any where event.action == \"Directory Service Changes\" and\n  event.code == \"5136\" and\n  length(winlog.event_data.AttributeValue) > 15 and\n  winlog.event_data.AttributeValue regex~ \"[0-9]{15}([1-9a-f]).*\"\n",
   "references": [
     "https://www.cert.ssi.gouv.fr/uploads/guide-ad.html#dsheuristics_bad",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json
index a18d14e6fb047..b33f7305a5b4b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_suspicious_process.json
@@ -11,8 +11,8 @@
   ],
   "language": "eql",
   "license": "Elastic License v2",
-  "name": "Shortcut File Written or Modified for Persistence",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "name": "Startup Persistence by a Suspicious Process",
+  "note": "## Triage and analysis\n\n### Investigating Startup Persistence by a Suspicious Process\n\nThe Windows Startup folder is a special folder in Windows. Programs added to this folder are executed during account\nlogon, without user interaction, providing an excellent way for attackers to maintain persistence.\n\nThis rule monitors for commonly abused processes writing to the Startup folder locations.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate\nsoftware installations.\n- Determine if activity is unique by validating if other machines in the organization have similar entries.\n- Retrieve the file:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- Administrators may add programs to this mechanism via command-line shells. Before the further investigation, \nverify that this activity is not benign.\n\n### Related rules\n\n- Suspicious Startup Shell Folder Modification - c8b150f0-0164-475b-a75e-74b47800a9ff\n- Persistent Scripts in the Startup Directory - f7c4dc5a-a58d-491d-9f14-9b66507121c0\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove malicious artifacts identified on the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type != \"deletion\" and\n  user.domain != \"NT AUTHORITY\" and\n  file.path : (\"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\\\\*\", \n               \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\StartUp\\\\*\") and\n  process.name : (\"cmd.exe\",\n                  \"powershell.exe\",\n                  \"wmic.exe\",\n                  \"mshta.exe\",\n                  \"pwsh.exe\",\n                  \"cscript.exe\",\n                  \"wscript.exe\",\n                  \"regsvr32.exe\",\n                  \"RegAsm.exe\",\n                  \"rundll32.exe\",\n                  \"EQNEDT32.EXE\",\n                  \"WINWORD.EXE\",\n                  \"EXCEL.EXE\",\n                  \"POWERPNT.EXE\",\n                  \"MSPUB.EXE\",\n                  \"MSACCESS.EXE\",\n                  \"iexplore.exe\",\n                  \"InstallUtil.exe\")\n",
   "risk_score": 47,
   "rule_id": "440e2db4-bc7f-4c96-a068-65b78da59bde",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json
index 99a7e07dfc395..89022325ab5f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_file_written_by_unsigned_process.json
@@ -10,6 +10,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Startup Folder Persistence via Unsigned Process",
+  "note": "## Triage and analysis\n\n### Investigating Startup Folder Persistence via Unsigned Process\n\nThe Windows Startup folder is a special folder in Windows. Programs added to this folder are executed during account\nlogon, without user interaction, providing an excellent way for attackers to maintain persistence.\n\nThis rule looks for unsigned processes writing to the Startup folder locations.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate\nsoftware installations.\n- Determine if activity is unique by validating if other machines in the organization have similar entries.\n- Retrieve the file:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- There is a high possibility of benign legitimate programs being added to Startup folders. This activity could be based\non new software installations, patches, or any kind of network administrator related activity. Before entering further\ninvestigation, verify that this activity is not benign.\n\n### Related rules\n\n- Suspicious Startup Shell Folder Modification - c8b150f0-0164-475b-a75e-74b47800a9ff\n- Persistent Scripts in the Startup Directory - f7c4dc5a-a58d-491d-9f14-9b66507121c0\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove malicious artifacts identified on the triage.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n",
   "query": "sequence by host.id, process.entity_id with maxspan=5s\n  [process where event.type in (\"start\", \"process_started\") and process.code_signature.trusted == false and\n  /* suspicious paths can be added here  */\n   process.executable : (\"C:\\\\Users\\\\*.exe\", \n                         \"C:\\\\ProgramData\\\\*.exe\", \n                         \"C:\\\\Windows\\\\Temp\\\\*.exe\", \n                         \"C:\\\\Windows\\\\Tasks\\\\*.exe\", \n                         \"C:\\\\Intel\\\\*.exe\", \n                         \"C:\\\\PerfLogs\\\\*.exe\")\n   ]\n   [file where event.type != \"deletion\" and user.domain != \"NT AUTHORITY\" and\n    file.path : (\"C:\\\\Users\\\\*\\\\AppData\\\\Roaming\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\Startup\\\\*\", \n                 \"C:\\\\ProgramData\\\\Microsoft\\\\Windows\\\\Start Menu\\\\Programs\\\\StartUp\\\\*\")\n   ]\n",
   "risk_score": 41,
   "rule_id": "2fba96c0-ade5-4bce-b92f-a5df2509da3f",
@@ -46,5 +47,5 @@
     }
   ],
   "type": "eql",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json
index c77e24bc6db41..bee5bf58ea39d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_startup_folder_scripts.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies script engines creating files in the startup folder, or the creation of script files in the startup folder.",
+  "description": "Identifies script engines creating files in the Startup folder, or the creation of script files in the Startup folder. Adversaries may abuse this technique to maintain persistence in an environment.",
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Persistent Scripts in the Startup Directory",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Persistent Scripts in the Startup Directory\n\nThe Windows Startup folder is a special folder in Windows. Programs added to this folder are executed during account\nlogon, without user interaction, providing an excellent way for attackers to maintain persistence.\n\nThis rule looks for shortcuts created by wscript.exe or cscript.exe, or js/vbs scripts created by any process.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Investigate other alerts related to the user/host in the last 48 hours.\n- Validate the activity is not related to planned patches, updates, network administrator activity, or legitimate\nsoftware installations.\n- Determine if activity is unique by validating if other machines in the organization have similar entries.\n- Retrieve the script file:\n  - Use a sandboxed malware analysis system to perform analysis.\n    - Observe attempts to contact external domains and addresses.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- There is a low possibility of benign legitimate scripts being added to Startup folders. Validate whether this activity\nis benign.\n\n\n### Related rules\n\n- Suspicious Startup Shell Folder Modification - c8b150f0-0164-475b-a75e-74b47800a9ff\n- Startup Folder Persistence via Unsigned Process - 2fba96c0-ade5-4bce-b92f-a5df2509da3f\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "file where event.type != \"deletion\" and user.domain != \"NT AUTHORITY\" and\n  \n  /* detect shortcuts created by wscript.exe or cscript.exe */\n  (file.path : \"C:\\\\*\\\\Programs\\\\Startup\\\\*.lnk\" and\n     process.name : (\"wscript.exe\", \"cscript.exe\")) or\n\n  /* detect vbs or js files created by any process */\n  file.path : (\"C:\\\\*\\\\Programs\\\\Startup\\\\*.vbs\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.vbe\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.wsh\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.wsf\", \n               \"C:\\\\*\\\\Programs\\\\Startup\\\\*.js\")\n",
   "risk_score": 47,
   "rule_id": "f7c4dc5a-a58d-491d-9f14-9b66507121c0",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
index 3f869207d8d97..8a06669f42fc5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "System Shells via Services",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating System Shells via Services\n\nAttackers may configure existing services or create new ones to execute system shells to elevate their privileges from\nadministrator to SYSTEM. They can also configure services to execute these shells with persistence payloads.\n\nThis rule looks for system shells being spawned by `services.exe`, which is compatible with the above behavior.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify how the service was created or modified. Look for registry changes events or Windows events related to\nservice activities (for example, 4697 and/or 7045).\n  - Identify the user account that performed the action and whether it should perform this kind of action.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Check for commands executed under the spawned shell.\n\n### False positive analysis\n\n- This activity should not happen legitimately. The security team should address any potential benign true positive\n(B-TP), as this configuration can put the user and the domain at risk.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Delete the service or restore it to the original configuration.\n- Investigate the initial attack vector.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.parent.name : \"services.exe\" and\n  process.name : (\"cmd.exe\", \"powershell.exe\", \"pwsh.exe\", \"powershell_ise.exe\") and\n  \n  /* Third party FP's */\n  not process.args : \"NVDisplay.ContainerLocalSystem\"\n",
   "risk_score": 47,
   "rule_id": "0022d47d-39c7-4f69-a232-4fe9dc7a3acd",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
index 70422a0429998..e85a08f63959d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_added_to_privileged_group_ad.json
@@ -7,13 +7,12 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*",
     "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
   "name": "User Added to Privileged Group in Active Directory",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating User Added to Privileged Group in Active Directory\n\nPrivileged accounts and groups in Active Directory are those to which powerful rights, privileges, and permissions are\ngranted that allow them to perform nearly any action in Active Directory and on domain-joined systems.\n\nAttackers can add users to privileged groups to maintain a level of access if their other privileged accounts are\nuncovered by the security team. This allows them to keep operating after the security team discovers abused accounts.\n\nThis rule monitors events related to a user being added to a privileged group.\n\n#### Possible investigation steps\n\n- Identify the user account that performed the action and whether it should manage members of this group.\n- Contact the account owner and confirm whether they are aware of this activity.\n- Investigate other alerts associated with the user during the past 48 hours.\n\n### False positive analysis\n\n- This attack abuses a legitimate Active Directory mechanism, so it is important to determine whether the activity is\nlegitimate, if the administrator is authorized to perform this operation, and if there is a need to grant the account\nthis level of privilege.\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- If the admin is not aware of the operation, activate your Active Directory incident response plan.\n- If the user does not need the administrator privileges, remove the account from the privileged group.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "iam where event.action == \"added-member-to-group\" and\n  group.name : (\"Admin*\",\n                \"Local Administrators\",\n                \"Domain Admins\",\n                \"Enterprise Admins\",\n                \"Backup Admins\",\n                \"Schema Admins\",\n                \"DnsAdmins\",\n                \"Exchange Organization Administrators\")\n",
   "references": [
     "https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/plan/security-best-practices/appendix-b--privileged-accounts-and-groups-in-active-directory"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
index ec9b8ed562839..d4f289a3e8988 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
@@ -2,7 +2,7 @@
   "author": [
     "Elastic"
   ],
-  "description": "Identifies attempts to create new local users. This is sometimes done by attackers to increase access to a system or domain.",
+  "description": "Identifies attempts to create new users. This is sometimes done by attackers to increase access or establish persistence on a system or domain.",
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "User Account Creation",
-  "note": "## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating User Account Creation\n\nAttackers may create new accounts (both local and domain) to maintain access to victim systems.\n\nThis rule identifies the usage of `net.exe` to create new accounts.\n\n#### Possible investigation steps\n\n- Investigate the process execution chain (parent process tree).\n- Identify the user account that performed the action and whether it should perform this kind of action.\n- Identify if the account was added to privileged groups or assigned special privileges after creation.\n- Investigate other alerts related to the user/host in the last 48 hours.\n\n### False positive analysis\n\n- Account creation is a common administrative task, so there is a high chance of the activity being legitimate. Before\ninvestigating further, verify that this activity is not benign.\n\n### Related rules\n\n- Creation of a Hidden Local User Account - 2edc8076-291e-41e9-81e4-e3fcbc97ae5e\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- Delete the created account.\n- Reset the password for the user account leveraged to create the new account.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "process where event.type in (\"start\", \"process_started\") and\n  process.name : (\"net.exe\", \"net1.exe\") and\n  not process.parent.name : \"net.exe\" and\n  (process.args : \"user\" and process.args : (\"/ad\", \"/add\"))\n",
   "risk_score": 21,
   "rule_id": "1aa9181a-492b-4c01-8b16-fa0735786b2b",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json
index 423fdeb75889c..26e0a95503af9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_installertakeover.json
@@ -12,7 +12,7 @@
   "language": "eql",
   "license": "Elastic License v2",
   "name": "Potential Privilege Escalation via InstallerFileTakeOver",
-  "note": "## Triage and analysis.\n\n### Investigating Potential Priivilege Escalation via InstallerFileTakeOver\n\nInstallerFileTakeOver is a weaponized EoP PoC to the CVE-2021-41379 vulnerability. Upon successful exploitation,\nan unprivileged user will escalate privileges to SYSTEM/NT AUTHORITY.\n\nThis rule detects the default execution of the PoC, which overwrites the `elevation_service.exe` DACL and copies itself\nto the location to escalate privileges. An attacker is able to still take over any file that is not in use (locked), which is outside the scope of this rule.\n\n#### Possible investigation steps:\n\n- Check for the digital signature of the executable.\n- Look for additional processes spawned by the process, command lines, and network communications.\n- Look for additional alerts involving the host and the user.\n\n### False Positive Analysis\n\n- Verify whether the digital signature exists in the executable, and if it is valid.\n\n### Related Rules\n\n- Suspicious DLL Loaded for Persistence or Privilege Escalation - bfeaf89b-a2a7-48a3-817f-e41829dc61ee\n\n### Response and Remediation\n\n- Immediate response steps should be taken to validate, investigate, and potentially contain the activity to prevent\nfurther post-compromise behavior.\n\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
+  "note": "## Triage and analysis\n\n### Investigating Potential Privilege Escalation via InstallerFileTakeOver\n\nInstallerFileTakeOver is a weaponized escalation of privilege proof of concept (EoP PoC) to the CVE-2021-41379 vulnerability. Upon successful exploitation, an\nunprivileged user will escalate privileges to SYSTEM/NT AUTHORITY.\n\nThis rule detects the default execution of the PoC, which overwrites the `elevation_service.exe` DACL and copies itself\nto the location to escalate privileges. An attacker is able to still take over any file that is not in use (locked),\nwhich is outside the scope of this rule.\n\n#### Possible investigation steps:\n\n- Check the executable's digital signature.\n- Look for additional processes spawned by the process, command lines, and network communications.\n- Investigate other alerts associated with the user/host during the past 48 hours.\n- Check for similar behavior in other hosts on the environment.\n- Retrieve the file and determine if it is malicious:\n  - Use a private sandboxed malware analysis system to perform analysis.\n    - Observe and collect information about the following activities:\n      - Attempts to contact external domains and addresses.\n      - File and registry access, modification, and creation activities.\n      - Service creation and launch activities.\n      - Scheduled tasks creation.\n  - Use the PowerShell Get-FileHash cmdlet to get the SHA-256 hash value of the file.\n    - Search for the existence and reputation of this file in resources like VirusTotal, Hybrid-Analysis, CISCO Talos, Any.run, etc.\n\n### False positive analysis\n\n- Verify whether a digital signature exists in the executable, and if it is valid.\n\n### Related rules\n\n- Suspicious DLL Loaded for Persistence or Privilege Escalation - bfeaf89b-a2a7-48a3-817f-e41829dc61ee\n\n### Response and remediation\n\n- Initiate the incident response process based on the outcome of the triage.\n- Isolate the involved host to prevent further post-compromise behavior.\n- If the triage identified malware, search the environment for additional compromised hosts.\n  - Implement any temporary network rules, procedures, and segmentation required to contain the malware.\n  - Immediately block the identified indicators of compromise (IoCs).\n- Remove and block malicious artifacts identified on the triage.\n- Disable user account\u2019s ability to log in remotely.\n- Reset passwords for the user account and other potentially compromised accounts (email, services, CRMs, etc.).\n- Determine the initial infection vector.\n\n## Config\n\nIf enabling an EQL rule on a non-elastic-agent index (such as beats) for versions <8.2, events will not define `event.ingested` and default fallback for EQL rules was not added until 8.2, so you will need to add a custom pipeline to populate `event.ingested` to @timestamp for this rule to work.\n",
   "query": "/* This rule is compatible with both Sysmon and Elastic Endpoint */\n\nprocess where event.type == \"start\" and \n    (?process.Ext.token.integrity_level_name : \"System\" or\n    ?winlog.event_data.IntegrityLevel : \"System\") and\n    (\n      (process.name : \"elevation_service.exe\" and \n       not process.pe.original_file_name == \"elevation_service.exe\") or\n\n      (process.parent.name : \"elevation_service.exe\" and \n       process.name : (\"rundll32.exe\", \"cmd.exe\", \"powershell.exe\")) \n    )\n",
   "references": [
     "https://github.com/klinix5/InstallerFileTakeOver"
@@ -46,5 +46,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json
index f8859ae7b9b60..7e52ab1c3fd52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_samaccountname_spoofing_attack.json
@@ -6,7 +6,7 @@
   "from": "now-9m",
   "index": [
     "winlogbeat-*",
-    "logs-windows.*"
+    "logs-system.*"
   ],
   "language": "eql",
   "license": "Elastic License v2",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json
index 15200e98de46f..b603e25ecf1e5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_printspooler_childprocess.json
@@ -50,5 +50,5 @@
   ],
   "timestamp_override": "event.ingested",
   "type": "eql",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
index 2e17b91fbcd54..683744640dc9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { readRules } from './read_rules';
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   resolveAlertMock,
   getAlertMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts
index b866755e00371..48f3ee86bd0ef 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ResolvedSanitizedRule, SanitizedRule } from '../../../../../alerting/common';
+import { ResolvedSanitizedRule, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
 import { RuleParams } from '../schemas/rule_schemas';
 import { findRules } from './find_rules';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts
index d42248823e733..43a37fc79438f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_object_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 export const ruleAssetSavedObjectType = 'security-rule';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts
index c594385dce22b..93fdbc5cac20e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/rule_asset/rule_asset_saved_objects_client.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindOptions,
   SavedObjectsFindResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { ruleAssetSavedObjectType } from './rule_asset_saved_object_mappings';
 import { IRuleAssetSavedObject } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
index 6c98ba56b9c88..95def15c20e27 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
@@ -7,7 +7,7 @@
 
 import { Readable } from 'stream';
 
-import { SavedObjectAttributes, SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectAttributes, SavedObjectsClientContract } from '@kbn/core/server';
 import type {
   MachineLearningJobIdOrUndefined,
   From,
@@ -42,6 +42,8 @@ import type { VersionOrUndefined, Version } from '@kbn/securitysolution-io-ts-ty
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
 import type { ListArrayOrUndefined, ListArray } from '@kbn/securitysolution-io-ts-list-types';
+import { RulesClient, PartialRule } from '@kbn/alerting-plugin/server';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { UpdateRulesSchema } from '../../../../common/detection_engine/schemas/request';
 import { RuleAlertAction } from '../../../../common/detection_engine/types';
 import {
@@ -93,8 +95,6 @@ import {
   NamespaceOrUndefined,
 } from '../../../../common/detection_engine/schemas/common';
 
-import { RulesClient, PartialRule } from '../../../../../alerting/server';
-import { SanitizedRule } from '../../../../../alerting/common';
 import { PartialFilter } from '../types';
 import { RuleParams } from '../schemas/rule_schemas';
 import { IRuleExecutionLogForRoutes } from '../rule_execution_log';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
index 44a7fa58a385f..ee6179a9c7e68 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
-import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { getFindResultWithSingleHit } from '../routes/__mocks__/request_responses';
 import { updatePrepackagedRules } from './update_prepacked_rules';
 import { patchRules } from './patch_rules';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
index 93b038fbb58ce..b8ff87dbd0ff2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
@@ -6,10 +6,10 @@
  */
 
 import { chunk } from 'lodash/fp';
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { RulesClient, PartialRule } from '@kbn/alerting-plugin/server';
 import { AddPrepackagedRulesSchemaDecoded } from '../../../../common/detection_engine/schemas/request/add_prepackaged_rules_schema';
 import { MAX_RULES_TO_UPDATE_IN_PARALLEL } from '../../../../common/constants';
-import { RulesClient, PartialRule } from '../../../../../alerting/server';
 import { patchRules } from './patch_rules';
 import { readRules } from './read_rules';
 import { PartialFilter } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
index c027f3b8505a9..9482a1d3aa1c4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
-import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import {
   getUpdateMachineLearningSchemaMock,
   getUpdateRulesSchemaMock,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts
index ecf625ceaee17..519ecd0c01ed2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.test.ts
@@ -8,7 +8,7 @@
 import { getAlertMock, resolveAlertMock } from '../routes/__mocks__/request_responses';
 import { updateRules } from './update_rules';
 import { getUpdateRulesOptionsMock, getUpdateMlRulesOptionsMock } from './update_rules.mock';
-import { RulesClientMock } from '../../../../../alerting/server/rules_client.mock';
+import { RulesClientMock } from '@kbn/alerting-plugin/server/rules_client.mock';
 import { getMlRuleParams, getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
 // Failing with rule registry enabled
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
index 23038df541ff2..df9a09ba98bb5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
@@ -7,9 +7,9 @@
 
 /* eslint-disable complexity */
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { PartialRule } from '@kbn/alerting-plugin/server';
 import { DEFAULT_MAX_SIGNALS } from '../../../../common/constants';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { PartialRule } from '../../../../../alerting/server';
 
 import { UpdateRulesOptions } from './types';
 import { addTags } from './add_tags';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
index 06324f4827b84..5151a58d0d885 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
@@ -14,7 +14,7 @@ import {
   transformFromAlertThrottle,
   transformActions,
 } from './utils';
-import { RuleAction, SanitizedRule } from '../../../../../alerting/common';
+import { RuleAction, SanitizedRule } from '@kbn/alerting-plugin/common';
 import { RuleParams } from '../schemas/rule_schemas';
 import {
   NOTIFICATION_THROTTLE_NO_ACTIONS,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
index fe5785d841b8f..c7858a131cb1f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
@@ -28,7 +28,8 @@ import type {
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ListArrayOrUndefined } from '@kbn/securitysolution-io-ts-list-types';
 import type { VersionOrUndefined } from '@kbn/securitysolution-io-ts-types';
-import { RuleAction, RuleNotifyWhenType, SanitizedRule } from '../../../../../alerting/common';
+import { RuleAction, RuleNotifyWhenType, SanitizedRule } from '@kbn/alerting-plugin/common';
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import {
   DescriptionOrUndefined,
   AnomalyThresholdOrUndefined,
@@ -61,7 +62,6 @@ import {
   NOTIFICATION_THROTTLE_NO_ACTIONS,
   NOTIFICATION_THROTTLE_RULE,
 } from '../../../../common/constants';
-import { RulesClient } from '../../../../../alerting/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRuleActions } from '../rule_actions/legacy_types';
 import { FullResponseSchema } from '../../../../common/detection_engine/schemas/request';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts
index d72cdc560543f..b806b42e5180a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_converters.ts
@@ -9,6 +9,7 @@ import uuid from 'uuid';
 
 import { SIGNALS_ID, ruleTypeMappings } from '@kbn/securitysolution-rules';
 
+import { ResolvedSanitizedRule, SanitizedRule } from '@kbn/alerting-plugin/common';
 import {
   normalizeMachineLearningJobIds,
   normalizeThresholdObject,
@@ -31,7 +32,6 @@ import { AppClient } from '../../../types';
 import { addTags } from '../rules/add_tags';
 import { DEFAULT_MAX_SIGNALS, SERVER_APP_ID } from '../../../../common/constants';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { ResolvedSanitizedRule, SanitizedRule } from '../../../../../alerting/common';
 import { transformTags } from '../routes/rules/utils';
 import {
   transformFromAlertThrottle,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts
index 47b66e7cc3bbb..edaacf38d7712 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.mock.ts
@@ -18,7 +18,7 @@ import {
   ThreatRuleParams,
   ThresholdRuleParams,
 } from './rule_schemas';
-import { SanitizedRuleConfig } from '../../../../../alerting/common';
+import { SanitizedRuleConfig } from '@kbn/alerting-plugin/common';
 import { sampleRuleGuid } from '../signals/__mocks__/es_results';
 
 const getBaseRuleParams = (): BaseRuleParams => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts
index 201c4b3957914..47e49e5f9c467 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/schemas/rule_schemas.ts
@@ -37,6 +37,7 @@ import {
   SAVED_QUERY_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 
+import { SanitizedRuleConfig } from '@kbn/alerting-plugin/common';
 import {
   author,
   buildingBlockTypeOrUndefined,
@@ -73,7 +74,6 @@ import {
   updated_at,
 } from '../../../../common/detection_engine/schemas/common/schemas';
 import { SERVER_APP_ID } from '../../../../common/constants';
-import { SanitizedRuleConfig } from '../../../../../alerting/common';
 
 const nonEqlLanguages = t.keyof({ kuery: null, lucene: null });
 export const baseRuleParams = t.exact(
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json
index a35a77ef91991..c1a62bf7ca31f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/detections_admin/detections_role.json
@@ -6,6 +6,8 @@
         "names": [
           ".siem-signals-*",
           ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
           ".lists*",
           ".items*",
           "apm-*-transaction*",
@@ -20,11 +22,7 @@
         "privileges": ["manage", "write", "read"]
       },
       {
-        "names": [
-          "metrics-endpoint.metadata_current_*",
-          ".fleet-agents*",
-          ".fleet-actions*"
-        ],
+        "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
         "privileges": ["read"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json
index cbdef3270ac58..88d863631a90b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/platform_engineer/detections_role.json
@@ -23,7 +23,12 @@
         "privileges": ["all"]
       },
       {
-        "names": [".alerts-security*", ".siem-signals-*"],
+        "names": [
+          ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
+          ".siem-signals-*"
+        ],
         "privileges": ["all"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json
index e8820c5810ae2..ea1fb2bf1433f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/rule_author/detections_role.json
@@ -18,15 +18,16 @@
         "privileges": ["read", "write"]
       },
       {
-        "names": [".alerts-security*", ".siem-signals-*"],
+        "names": [
+          ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
+          ".siem-signals-*"
+        ],
         "privileges": ["read", "write", "maintenance", "view_index_metadata"]
       },
       {
-        "names": [
-          "metrics-endpoint.metadata_current_*",
-          ".fleet-agents*",
-          ".fleet-actions*"
-        ],
+        "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
         "privileges": ["read"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json
index e906e67c4d7b5..4ad6488d0b5ab 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/soc_manager/detections_role.json
@@ -18,15 +18,16 @@
         "privileges": ["read", "write"]
       },
       {
-        "names": [".alerts-security*", ".siem-signals-*"],
+        "names": [
+          ".alerts-security*",
+          ".preview.alerts-security*",
+          ".internal.preview.alerts-security*",
+          ".siem-signals-*"
+        ],
         "privileges": ["read", "write", "manage"]
       },
       {
-        "names": [
-          "metrics-endpoint.metadata_current_*",
-          ".fleet-agents*",
-          ".fleet-actions*"
-        ],
+        "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
         "privileges": ["read"]
       }
     ]
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json
index 1799bf8fa24d5..f8216a613cb5a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/roles_users/t2_analyst/detections_role.json
@@ -2,7 +2,10 @@
   "elasticsearch": {
     "cluster": [],
     "indices": [
-      { "names": [".alerts-security*", ".siem-signals-*"], "privileges": ["read", "write", "maintenance"] },
+      {
+        "names": [".alerts-security*", ".siem-signals-*"],
+        "privileges": ["read", "write", "maintenance"]
+      },
       {
         "names": [
           ".lists*",
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts
index 3ed5dccaccdf2..d699e71947853 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts
@@ -16,8 +16,8 @@ import type {
   AlertAttributes,
   AlertSourceHit,
 } from '../types';
-import { SavedObject } from '../../../../../../../../src/core/server';
-import { loggingSystemMock } from '../../../../../../../../src/core/server/mocks';
+import { SavedObject } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getListArrayMock } from '../../../../../common/detection_engine/schemas/types/lists.mock';
 import { RulesSchema } from '../../../../../common/detection_engine/schemas/response';
 import { RuleParams } from '../../schemas/rule_schemas';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts
index 7a9afe04cfeb0..3b93b38c87a25 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildEqlSearchRequest, buildEventsSearchQuery } from './build_events_query';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('create_signals', () => {
   test('it builds a now-5m up to today filter', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
index fdd6dcf0f4da2..66394d4bca81d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -8,12 +8,12 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { flow, omit } from 'lodash/fp';
 import set from 'set-value';
 
-import { Logger } from '../../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { GenericBulkCreateResponse } from '../rule_types/factories';
 import { AnomalyResults, Anomaly } from '../../machine_learning';
 import { BuildRuleMessage } from './rule_messages';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts
index 288fd7a688e3c..67054b10793cc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.test.ts
@@ -6,11 +6,11 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { eqlExecutor } from './eql';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntryListMock } from '../../../../../../lists/common/schemas/types/entry_list.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntryListMock } from '@kbn/lists-plugin/common/schemas/types/entry_list.mock';
 import { getCompleteRuleMock, getEqlRuleParams } from '../../schemas/rule_schemas.mock';
 import { getIndexVersion } from '../../routes/index/get_index_version';
 import { SIGNALS_TEMPLATE_VERSION } from '../../routes/index/get_signals_template';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts
index 6975445f5d04f..e601f41aa7628 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/eql.ts
@@ -7,12 +7,12 @@
 
 import { performance } from 'perf_hooks';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import { buildEqlSearchRequest } from '../build_events_query';
 import { hasLargeValueItem } from '../../../../../common/detection_engine/utils';
 import { isOutdated } from '../../migrations/helpers';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts
index bc756bf9681e3..94a363333f1e5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.test.ts
@@ -6,16 +6,16 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { mlExecutor } from './ml';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { getCompleteRuleMock, getMlRuleParams } from '../../schemas/rule_schemas.mock';
 import { buildRuleMessageFactory } from '../rule_messages';
-import { getListClientMock } from '../../../../../../lists/server/services/lists/list_client.mock';
+import { getListClientMock } from '@kbn/lists-plugin/server/services/lists/list_client.mock';
 import { findMlSignals } from '../find_ml_signals';
 import { bulkCreateMlSignals } from '../bulk_create_ml_signals';
-import { mlPluginServerMock } from '../../../../../../ml/server/mocks';
+import { mlPluginServerMock } from '@kbn/ml-plugin/server/mocks';
 import { MachineLearningRuleParams } from '../../schemas/rule_schemas';
 
 jest.mock('../find_ml_signals');
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
index d20885ebb9292..2070d487c49d0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { KibanaRequest, Logger } from 'src/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ListClient } from '../../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { isJobStarted } from '../../../../../common/machine_learning/helpers';
 import { CompleteRule, MachineLearningRuleParams } from '../../schemas/rule_schemas';
 import { bulkCreateMlSignals } from '../bulk_create_ml_signals';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts
index da1e93bf76b54..c4d1348741b12 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/query.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ListClient } from '../../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { getFilter } from '../get_filter';
 import { getInputIndex } from '../get_input_output_index';
 import { searchAfterAndBulkCreate } from '../search_after_bulk_create';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts
index 1aedf7111e078..e7cd27549ff4d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threat_match.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ListClient } from '../../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { getInputIndex } from '../get_input_output_index';
 import { RuleRangeTuple, BulkCreate, WrapHits } from '../types';
 import { ITelemetryEventsSender } from '../../../telemetry/sender';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts
index 01e61b6917cc4..0e37cc66d9654 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.test.ts
@@ -6,18 +6,19 @@
  */
 
 import dateMath from '@kbn/datemath';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { thresholdExecutor } from './threshold';
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { getEntryListMock } from '../../../../../../lists/common/schemas/types/entry_list.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getEntryListMock } from '@kbn/lists-plugin/common/schemas/types/entry_list.mock';
 import { getThresholdRuleParams, getCompleteRuleMock } from '../../schemas/rule_schemas.mock';
 import { buildRuleMessageFactory } from '../rule_messages';
 import { sampleEmptyDocSearchResults } from '../__mocks__/es_results';
 import { allowedExperimentalValues } from '../../../../../common/experimental_features';
 import { ThresholdRuleParams } from '../../schemas/rule_schemas';
+import { createRuleDataClientMock } from '@kbn/rule-registry-plugin/server/rule_data_client/rule_data_client.mock';
 
 describe('threshold_executor', () => {
   const version = '8.0.0';
@@ -49,6 +50,7 @@ describe('threshold_executor', () => {
 
   describe('thresholdExecutor', () => {
     it('should set a warning when exception list for threshold rule contains value list exceptions', async () => {
+      const ruleDataClientMock = createRuleDataClientMock();
       const exceptionItems = [getExceptionListItemSchemaMock({ entries: [getEntryListMock()] })];
       const response = await thresholdExecutor({
         completeRule: thresholdCompleteRule,
@@ -69,6 +71,7 @@ describe('threshold_executor', () => {
           createdItems: [],
         })),
         wrapHits: jest.fn(),
+        ruleDataReader: ruleDataClientMock.getReader({ namespace: 'default' }),
       });
       expect(response.warningMessages.length).toEqual(1);
     });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts
index 7055269abacda..0a89f15ad4b01 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/threshold.ts
@@ -8,13 +8,14 @@
 import { SearchHit } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { IRuleDataReader } from '@kbn/rule-registry-plugin/server';
 import { hasLargeValueItem } from '../../../../../common/detection_engine/utils';
 import { CompleteRule, ThresholdRuleParams } from '../../schemas/rule_schemas';
 import { getFilter } from '../get_filter';
@@ -55,6 +56,7 @@ export const thresholdExecutor = async ({
   state,
   bulkCreate,
   wrapHits,
+  ruleDataReader,
 }: {
   completeRule: CompleteRule<ThresholdRuleParams>;
   tuple: RuleRangeTuple;
@@ -68,6 +70,7 @@ export const thresholdExecutor = async ({
   state: ThresholdAlertState;
   bulkCreate: BulkCreate;
   wrapHits: WrapHits;
+  ruleDataReader: IRuleDataReader;
 }): Promise<SearchAfterAndBulkCreateReturnType & { state: ThresholdAlertState }> => {
   let result = createSearchAfterReturnType();
   const ruleParams = completeRule.ruleParams;
@@ -77,15 +80,11 @@ export const thresholdExecutor = async ({
     const { signalHistory, searchErrors: previousSearchErrors } = state.initialized
       ? { signalHistory: state.signalHistory, searchErrors: [] }
       : await getThresholdSignalHistory({
-          indexPattern: ['*'], // TODO: get outputIndex?
           from: tuple.from.toISOString(),
           to: tuple.to.toISOString(),
-          services,
-          logger,
           ruleId: ruleParams.ruleId,
           bucketByFields: ruleParams.threshold.field,
-          timestampOverride: ruleParams.timestampOverride,
-          buildRuleMessage,
+          ruleDataReader,
         });
 
     if (!state.initialized) {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts
index 89820bf504c37..47725bbeefcc2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts
@@ -8,9 +8,9 @@
 import { createFieldAndSetTuples } from './create_field_and_set_tuples';
 import { mockLogger, sampleDocWithSortId } from '../__mocks__/es_results';
 
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import type { EntryList } from '@kbn/securitysolution-io-ts-list-types';
 import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts
index 743218f9ed940..c6061d37f4279 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts
@@ -7,8 +7,8 @@
 
 import { mockLogger, sampleDocWithSortId } from '../__mocks__/es_results';
 
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import { createSetToFilterAgainst } from './create_set_to_filter_against';
 import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts
index 45a058b55d84b..df9bb0cd59f83 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts
@@ -7,8 +7,8 @@
 
 import { sampleDocWithSortId } from '../__mocks__/es_results';
 
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import { filterEvents } from './filter_events';
 import { FieldSet } from './types';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts
index 9e118eaada4b5..8c33cf2ea1314 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts
@@ -10,9 +10,9 @@ import { filterEventsAgainstList } from './filter_events_against_list';
 import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock';
 import { mockLogger, repeatedSearchResultsWithSortId } from '../__mocks__/es_results';
 
-import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
-import { listMock } from '../../../../../../lists/server/mocks';
-import { getSearchListItemResponseMock } from '../../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 
 const someGuids = Array.from({ length: 13 }).map((x) => uuid.v4());
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
index 5feb8e8b92c5b..051685c67db4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import type { Type, ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { ListClient } from '../../../../../../lists/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import { BuildRuleMessage } from '../rule_messages';
 
 export interface FilterEventsAgainstListOptions<T> {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
index 7d2041d86e395..f06d62b8cf302 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
@@ -8,8 +8,8 @@
 import dateMath from '@kbn/datemath';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../../src/core/server';
-import { MlPluginSetup } from '../../../../../ml/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { AnomalyResults, getAnomalies } from '../../machine_learning';
 
 export const findMlSignals = async ({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts
index 6e824a9a639a3..60d630d3e1178 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { getFilter } from './get_filter';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 describe('get_filter', () => {
   let servicesMock: RuleExecutorServicesMock;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
index d674cc9a3e5a1..8b7a531db78b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
@@ -8,6 +8,11 @@
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
 import { Type, LanguageOrUndefined, Language } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  AlertInstanceContext,
+  AlertInstanceState,
+  RuleExecutorServices,
+} from '@kbn/alerting-plugin/server';
 import { assertUnreachable } from '../../../../common/utility_types';
 import { getQueryFilter } from '../../../../common/detection_engine/get_query_filter';
 import {
@@ -15,11 +20,6 @@ import {
   SavedIdOrUndefined,
   IndexOrUndefined,
 } from '../../../../common/detection_engine/schemas/common/schemas';
-import {
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleExecutorServices,
-} from '../../../../../alerting/server';
 import { PartialFilter } from '../types';
 import { withSecuritySpan } from '../../../utils/with_security_span';
 import { ESBoolQuery } from '../../../../common/typed_json';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts
index fea6ac75677bf..5a2150c191a4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import { getInputIndex, GetInputIndex } from './get_input_output_index';
 import { allowedExperimentalValues } from '../../../../common/experimental_features';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts
index c2a77cb608303..9a4d068dc9658 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_input_output_index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import { ExperimentalFeatures } from '../../../../common/experimental_features';
 import { withSecuritySpan } from '../../../utils/with_security_span';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts
index 3958cb2a81a7f..a1d78386fa1ea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/preview/alert_instance_factory_stub.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { RuleParams } from '../../schemas/rule_schemas';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeState,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Alert } from '../../../../../../alerting/server/alert';
+import { Alert } from '@kbn/alerting-plugin/server/alert';
+import { RuleParams } from '../../schemas/rule_schemas';
 
 export const alertInstanceFactoryStub = <
   TParams extends RuleParams,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
index e38d1aa774094..367f9f32d8716 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { extractExceptionsList } from './extract_exceptions_list';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { RuleParams } from '../../schemas/rule_schemas';
 import {
   EXCEPTION_LIST_NAMESPACE,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
index 93deae014005b..34b5b2d205d20 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_exceptions_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { getSavedObjectType } from '@kbn/securitysolution-list-utils';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { getSavedObjectNamePatternForExceptionsList } from './utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
index df5fdf4fcead4..0a06b42049768 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { extractReferences } from './extract_references';
 import { RuleParams } from '../../schemas/rule_schemas';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts
index c24842486c0bb..533055d7cd572 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/extract_references.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
-import { RuleParamsAndRefs } from '../../../../../../alerting/server';
+import { Logger } from '@kbn/core/server';
+import { RuleParamsAndRefs } from '@kbn/alerting-plugin/server';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { extractExceptionsList } from './extract_exceptions_list';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
index 1212b73a6250e..e8addc01720e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
 import { injectExceptionsReferences } from './inject_exceptions_list';
 import { RuleParams } from '../../schemas/rule_schemas';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts
index baaaa2eb60ce9..9e5bb24b2c443 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_exceptions_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { getSavedObjectReferenceForExceptionsList, logMissingSavedObjectError } from './utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
index eae4cb20f7948..daffc56731633 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import { EXCEPTION_LIST_NAMESPACE } from '@kbn/securitysolution-list-constants';
 import { injectReferences } from './inject_references';
 import { RuleParams } from '../../schemas/rule_schemas';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts
index 991a88828d469..3aa1e46331fb1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/inject_references.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { RuleParams } from '../../schemas/rule_schemas';
 import { injectExceptionsReferences } from './inject_exceptions_list';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts
index 70f321eed030e..d64d024c67e76 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import { getSavedObjectReference } from '.';
 
 describe('get_saved_object_reference', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts
index fe3a7393bf377..dca564b9a495b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { getSavedObjectNamePattern } from './get_saved_object_name_pattern';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts
index 9a16037ed7fd5..7bb10a83053e4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObjectReference } from 'src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObjectReference } from '@kbn/core/server';
 import {
   EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME,
   getSavedObjectReferenceForExceptionsList,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts
index d1534cc2a06bb..ddb073da8ef96 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/get_saved_object_reference_for_exceptions_list.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, SavedObjectReference } from 'src/core/server';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import { EXCEPTIONS_SAVED_OBJECT_REFERENCE_NAME } from './constants';
 import { getSavedObjectReference } from './get_saved_object_reference';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts
index d0158be285667..7f96ff68636ad 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { logMissingSavedObjectError } from '.';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts
index 8d448c3cd10c4..303c5b394bcc2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/saved_object_references/utils/log_missing_saved_object_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { RuleParams } from '../../../schemas/rule_schemas';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
index 58e472c75870c..b96b0e6dc7148 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
@@ -15,24 +15,24 @@ import {
   sampleDocWithSortId,
 } from './__mocks__/es_results';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import uuid from 'uuid';
-import { listMock } from '../../../../../lists/server/mocks';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { BulkCreate, BulkResponse, RuleRangeTuple, WrapHits } from './types';
 import type { SearchListItemArraySchema } from '@kbn/securitysolution-io-ts-list-types';
-import { getSearchListItemResponseMock } from '../../../../../lists/common/schemas/response/search_list_item_schema.mock';
+import { getSearchListItemResponseMock } from '@kbn/lists-plugin/common/schemas/response/search_list_item_schema.mock';
 import { getRuleRangeTuples } from './utils';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import { getCompleteRuleMock, getQueryRuleParams } from '../schemas/rule_schemas.mock';
 import { bulkCreateFactory } from '../rule_types/factories/bulk_create_factory';
 import { wrapHitsFactory } from '../rule_types/factories/wrap_hits_factory';
 import { mockBuildRuleMessage } from './__mocks__/build_rule_message.mock';
 import { BuildReasonMessage } from './reason_formatters';
 import { QueryRuleParams } from '../schemas/rule_schemas';
-import { createPersistenceServicesMock } from '../../../../../rule_registry/server/utils/create_persistence_rule_type_wrapper.mock';
-import { PersistenceServices } from '../../../../../rule_registry/server';
+import { createPersistenceServicesMock } from '@kbn/rule-registry-plugin/server/utils/create_persistence_rule_type_wrapper.mock';
+import { PersistenceServices } from '@kbn/rule-registry-plugin/server';
 import {
   ALERT_RULE_CATEGORY,
   ALERT_RULE_CONSUMER,
@@ -46,7 +46,7 @@ import {
   TIMESTAMP,
 } from '@kbn/rule-data-utils';
 import { SERVER_APP_ID } from '../../../../common/constants';
-import { CommonAlertFieldsLatest } from '../../../../../rule_registry/common/schemas';
+import { CommonAlertFieldsLatest } from '@kbn/rule-registry-plugin/common/schemas';
 
 const buildRuleMessage = mockBuildRuleMessage;
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts
index fc3aed36939cd..511f148f13d68 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/send_telemetry_events.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Logger } from '@kbn/core/server';
 import { ITelemetryEventsSender } from '../../telemetry/sender';
 import { TelemetryEvent } from '../../telemetry/types';
 import { BuildRuleMessage } from './rule_messages';
 import { SignalSearchResponse, SignalSource } from './types';
-import { Logger } from '../../../../../../../src/core/server';
 
 interface SearchResultSource {
   _source: SignalSource;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts
index f401e3bd228ce..cc7883ede6c33 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/siem_rule_action_groups.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ActionGroup } from '../../../../../alerting/common';
+import { ActionGroup } from '@kbn/alerting-plugin/common';
 
 export const siemRuleActionGroups: Array<ActionGroup<'default'>> = [
   {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
index 5bbef98b48335..35c1c7c319c3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
@@ -11,10 +11,10 @@ import {
   sampleDocSearchResultsWithSortId,
 } from './__mocks__/es_results';
 import { singleSearchAfter } from './single_search_after';
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { buildRuleMessageFactory } from './rule_messages';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 const buildRuleMessage = buildRuleMessageFactory({
   id: 'fake id',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
index c247cf00b141f..12c08b7fa9824 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
@@ -10,8 +10,8 @@ import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
-import { Logger } from '../../../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { Logger } from '@kbn/core/server';
 import type { SignalSearchResponse, SignalSource } from './types';
 import { BuildRuleMessage } from './rule_messages';
 import { buildEventsSearchQuery } from './build_events_query';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts
index b2b397bf21683..d53d935f1f239 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import moment from 'moment';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getEventCount } from './get_event_count';
 
 describe('getEventCount', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts
index 2c6d3bd8cc38d..ed9e8d68b8c91 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_event_count.ts
@@ -8,7 +8,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { EventCountOptions, EventsOptions, EventDoc } from './types';
 import { getQueryFilter } from '../../../../../common/detection_engine/get_query_filter';
-import { singleSearchAfter } from '../../signals/single_search_after';
+import { singleSearchAfter } from '../single_search_after';
 import { buildEventsSearchQuery } from '../build_events_query';
 
 export const MAX_PER_PAGE = 9000;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts
index 08915efd4f372..1a9264f36b568 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts
@@ -19,13 +19,13 @@ import type {
 } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { OpenPointInTimeResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ListClient } from '../../../../../../lists/server';
+import { ListClient } from '@kbn/lists-plugin/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { ElasticsearchClient, Logger } from '../../../../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ITelemetryEventsSender } from '../../../telemetry/sender';
 import { BuildRuleMessage } from '../rule_messages';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/__snapshots__/get_threshold_signal_history.test.ts.snap b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/__snapshots__/get_threshold_signal_history.test.ts.snap
new file mode 100644
index 0000000000000..de7413fe27926
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/__snapshots__/get_threshold_signal_history.test.ts.snap
@@ -0,0 +1,115 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`buildPreviousThresholdAlertRequest should generate a proper request when bucketByFields contains multiple fields 1`] = `
+Object {
+  "body": Object {
+    "query": Object {
+      "bool": Object {
+        "must": Array [
+          Object {
+            "range": Object {
+              "@timestamp": Object {
+                "format": "strict_date_optional_time",
+                "gte": "now-6m",
+                "lte": "now",
+              },
+            },
+          },
+          Object {
+            "term": Object {
+              "signal.rule.rule_id": "threshold-rule",
+            },
+          },
+          Object {
+            "range": Object {
+              "signal.original_time": Object {
+                "gte": "now-6m",
+              },
+            },
+          },
+          Object {
+            "bool": Object {
+              "minimum_should_match": 1,
+              "should": Array [
+                Object {
+                  "term": Object {
+                    "signal.rule.threshold.field": "host.name",
+                  },
+                },
+                Object {
+                  "term": Object {
+                    "kibana.alert.rule.parameters.threshold.field": "host.name",
+                  },
+                },
+              ],
+            },
+          },
+          Object {
+            "bool": Object {
+              "minimum_should_match": 1,
+              "should": Array [
+                Object {
+                  "term": Object {
+                    "signal.rule.threshold.field": "user.name",
+                  },
+                },
+                Object {
+                  "term": Object {
+                    "kibana.alert.rule.parameters.threshold.field": "user.name",
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      },
+    },
+    "sort": Array [
+      Object {
+        "@timestamp": "desc",
+      },
+    ],
+  },
+  "size": 10000,
+}
+`;
+
+exports[`buildPreviousThresholdAlertRequest should generate a proper request when bucketByFields is empty 1`] = `
+Object {
+  "body": Object {
+    "query": Object {
+      "bool": Object {
+        "must": Array [
+          Object {
+            "range": Object {
+              "@timestamp": Object {
+                "format": "strict_date_optional_time",
+                "gte": "now-6m",
+                "lte": "now",
+              },
+            },
+          },
+          Object {
+            "term": Object {
+              "signal.rule.rule_id": "threshold-rule",
+            },
+          },
+          Object {
+            "range": Object {
+              "signal.original_time": Object {
+                "gte": "now-6m",
+              },
+            },
+          },
+        ],
+      },
+    },
+    "sort": Array [
+      Object {
+        "@timestamp": "desc",
+      },
+    ],
+  },
+  "size": 10000,
+}
+`;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
index f7d0418f63b2c..12a6bef472aaa 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/bulk_create_threshold_signals.ts
@@ -9,13 +9,13 @@ import { TIMESTAMP } from '@kbn/rule-data-utils';
 
 import { get } from 'lodash/fp';
 import set from 'set-value';
-import { ThresholdNormalized } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { Logger } from '../../../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { ThresholdNormalized } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { BaseHit } from '../../../../../common/detection_engine/types';
 import { TermAggregationBucket } from '../../../types';
 import { GenericBulkCreateResponse } from '../../rule_types/factories/bulk_create_factory';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts
deleted file mode 100644
index 3cfa2be0202f5..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { TimestampOverrideOrUndefined } from '../../../../../common/detection_engine/schemas/common/schemas';
-import {
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { Logger } from '../../../../../../../../src/core/server';
-import { BuildRuleMessage } from '../rule_messages';
-import { singleSearchAfter } from '../single_search_after';
-import { SignalSearchResponse } from '../types';
-
-interface FindPreviousThresholdSignalsParams {
-  from: string;
-  to: string;
-  indexPattern: string[];
-  services: RuleExecutorServices<AlertInstanceState, AlertInstanceContext, 'default'>;
-  logger: Logger;
-  ruleId: string;
-  bucketByFields: string[];
-  timestampOverride: TimestampOverrideOrUndefined;
-  buildRuleMessage: BuildRuleMessage;
-}
-
-export const findPreviousThresholdSignals = async ({
-  from,
-  to,
-  indexPattern,
-  services,
-  logger,
-  ruleId,
-  bucketByFields,
-  timestampOverride,
-  buildRuleMessage,
-}: FindPreviousThresholdSignalsParams): Promise<{
-  searchResult: SignalSearchResponse;
-  searchDuration: string;
-  searchErrors: string[];
-}> => {
-  const filter = {
-    bool: {
-      must: [
-        {
-          term: {
-            'signal.rule.rule_id': ruleId,
-          },
-        },
-        // We might find a signal that was generated on the interval for old data... make sure to exclude those.
-        {
-          range: {
-            'signal.original_time': {
-              gte: from,
-            },
-          },
-        },
-        ...bucketByFields.map((field) => {
-          return {
-            term: {
-              'signal.rule.threshold.field': field,
-            },
-          };
-        }),
-      ],
-    },
-  };
-
-  return singleSearchAfter({
-    searchAfterSortIds: undefined,
-    timestampOverride,
-    index: indexPattern,
-    from,
-    to,
-    services,
-    logger,
-    filter,
-    pageSize: 10000, // TODO: multiple pages?
-    buildRuleMessage,
-  });
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts
index 5b0ee22d87093..786739760a68d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../../alerting/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
 import { getQueryFilter } from '../../../../../common/detection_engine/get_query_filter';
 import { mockLogger } from '../__mocks__/es_results';
 import { buildRuleMessageFactory } from '../rule_messages';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts
index 45b56dce7e69e..fe7e5e2c8316e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts
@@ -8,16 +8,16 @@
 import { set } from '@elastic/safer-lodash-set';
 import { TIMESTAMP } from '@kbn/rule-data-utils';
 
-import {
-  ThresholdNormalized,
-  TimestampOverrideOrUndefined,
-} from '../../../../../common/detection_engine/schemas/common/schemas';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { Logger } from '../../../../../../../../src/core/server';
+} from '@kbn/alerting-plugin/server';
+import { Logger } from '@kbn/core/server';
+import {
+  ThresholdNormalized,
+  TimestampOverrideOrUndefined,
+} from '../../../../../common/detection_engine/schemas/common/schemas';
 import { BuildRuleMessage } from '../rule_messages';
 import { singleSearchAfter } from '../single_search_after';
 import type { SignalSearchResponse } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
index bc9dc69dbe19e..9ce6898e084bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_bucket_filters.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Filter } from '@kbn/es-query';
-import { ESFilter } from '../../../../../../../../src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { ThresholdSignalHistory, ThresholdSignalHistoryRecord } from '../types';
 
 /*
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.test.ts
new file mode 100644
index 0000000000000..d9db2972a89d3
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.test.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { buildPreviousThresholdAlertRequest } from './get_threshold_signal_history';
+
+describe('buildPreviousThresholdAlertRequest', () => {
+  it('should generate a proper request when bucketByFields is empty', async () => {
+    const bucketByFields: string[] = [];
+    const to = 'now';
+    const from = 'now-6m';
+    const ruleId = 'threshold-rule';
+
+    expect(
+      buildPreviousThresholdAlertRequest({ from, to, ruleId, bucketByFields })
+    ).toMatchSnapshot();
+  });
+
+  it('should generate a proper request when bucketByFields contains multiple fields', async () => {
+    const bucketByFields: string[] = ['host.name', 'user.name'];
+    const to = 'now';
+    const from = 'now-6m';
+    const ruleId = 'threshold-rule';
+
+    expect(
+      buildPreviousThresholdAlertRequest({ from, to, ruleId, bucketByFields })
+    ).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts
index 097bdfe8d6034..8a4931b3ce2de 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/get_threshold_signal_history.ts
@@ -5,60 +5,114 @@
  * 2.0.
  */
 
-import { TimestampOverrideOrUndefined } from '../../../../../common/detection_engine/schemas/common/schemas';
-import {
-  AlertInstanceContext,
-  AlertInstanceState,
-  RuleExecutorServices,
-} from '../../../../../../alerting/server';
-import { Logger } from '../../../../../../../../src/core/server';
+import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IRuleDataReader } from '@kbn/rule-registry-plugin/server';
 import { ThresholdSignalHistory } from '../types';
-import { BuildRuleMessage } from '../rule_messages';
-import { findPreviousThresholdSignals } from './find_previous_threshold_signals';
 import { buildThresholdSignalHistory } from './build_signal_history';
+import { createErrorsFromShard } from '../utils';
 
 interface GetThresholdSignalHistoryParams {
   from: string;
   to: string;
-  indexPattern: string[];
-  services: RuleExecutorServices<AlertInstanceState, AlertInstanceContext, 'default'>;
-  logger: Logger;
   ruleId: string;
   bucketByFields: string[];
-  timestampOverride: TimestampOverrideOrUndefined;
-  buildRuleMessage: BuildRuleMessage;
+  ruleDataReader: IRuleDataReader;
 }
 
 export const getThresholdSignalHistory = async ({
   from,
   to,
-  indexPattern,
-  services,
-  logger,
   ruleId,
   bucketByFields,
-  timestampOverride,
-  buildRuleMessage,
+  ruleDataReader,
 }: GetThresholdSignalHistoryParams): Promise<{
   signalHistory: ThresholdSignalHistory;
   searchErrors: string[];
 }> => {
-  const { searchResult, searchErrors } = await findPreviousThresholdSignals({
-    indexPattern,
+  const request = buildPreviousThresholdAlertRequest({
     from,
     to,
-    services,
-    logger,
     ruleId,
     bucketByFields,
-    timestampOverride,
-    buildRuleMessage,
   });
 
+  const response = await ruleDataReader.search(request);
   return {
-    signalHistory: buildThresholdSignalHistory({
-      alerts: searchResult.hits.hits,
+    signalHistory: buildThresholdSignalHistory({ alerts: response.hits.hits }),
+    searchErrors: createErrorsFromShard({
+      errors: response._shards.failures ?? [],
     }),
-    searchErrors,
+  };
+};
+
+export const buildPreviousThresholdAlertRequest = ({
+  from,
+  to,
+  ruleId,
+  bucketByFields,
+}: {
+  from: string;
+  to: string;
+  ruleId: string;
+  bucketByFields: string[];
+}): estypes.SearchRequest => {
+  return {
+    size: 10000,
+    // We should switch over to @elastic/elasticsearch/lib/api/types instead of typesWithBodyKey where possible,
+    // but api/types doesn't have a complete type for `sort`
+    body: {
+      sort: [
+        {
+          '@timestamp': 'desc',
+        },
+      ],
+      query: {
+        bool: {
+          must: [
+            {
+              range: {
+                '@timestamp': {
+                  lte: to,
+                  gte: from,
+                  format: 'strict_date_optional_time',
+                },
+              },
+            },
+            {
+              term: {
+                'signal.rule.rule_id': ruleId,
+              },
+            },
+            // We might find a signal that was generated on the interval for old data... make sure to exclude those.
+            {
+              range: {
+                'signal.original_time': {
+                  gte: from,
+                },
+              },
+            },
+            ...bucketByFields.map((field) => {
+              return {
+                bool: {
+                  should: [
+                    {
+                      term: {
+                        'signal.rule.threshold.field': field,
+                      },
+                    },
+                    {
+                      term: {
+                        'kibana.alert.rule.parameters.threshold.field': field,
+                      },
+                    },
+                  ],
+                  minimum_should_match: 1,
+                },
+              };
+            }),
+          ],
+        },
+      },
+    },
   };
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts
index 541d2cd4c19b8..235865a8b60a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts
@@ -8,8 +8,6 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import moment from 'moment';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
-import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
 import {
   RuleType,
   RuleTypeState,
@@ -17,7 +15,13 @@ import {
   AlertInstanceContext,
   RuleExecutorOptions as AlertingRuleExecutorOptions,
   RuleExecutorServices,
-} from '../../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { ListClient } from '@kbn/lists-plugin/server';
+import { Logger } from '@kbn/core/server';
+import { EcsFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/ecs_field_map';
+import { TypeOfFieldMap } from '@kbn/rule-registry-plugin/common/field_map';
+import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
+import { RulesSchema } from '../../../../common/detection_engine/schemas/response/rules_schema';
 import { TermAggregationBucket } from '../../types';
 import {
   BaseHit,
@@ -25,14 +29,10 @@ import {
   SearchTypes,
   EqlSequence,
 } from '../../../../common/detection_engine/types';
-import { ListClient } from '../../../../../lists/server';
-import { Logger } from '../../../../../../../src/core/server';
 import { BuildRuleMessage } from './rule_messages';
 import { ITelemetryEventsSender } from '../../telemetry/sender';
 import { CompleteRule, RuleParams } from '../schemas/rule_schemas';
 import { GenericBulkCreateResponse } from '../rule_types/factories';
-import { EcsFieldMap } from '../../../../../rule_registry/common/assets/field_maps/ecs_field_map';
-import { TypeOfFieldMap } from '../../../../../rule_registry/common/field_map';
 import { BuildReasonMessage } from './reason_formatters';
 import {
   BaseFieldsLatest,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
index 3b0d5d17b4445..9c5becc8353b6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
@@ -10,13 +10,13 @@ import sinon from 'sinon';
 import type { TransportResult } from '@elastic/elasticsearch';
 import { ALERT_REASON, ALERT_RULE_PARAMETERS, ALERT_UUID } from '@kbn/rule-data-utils';
 
-import { alertsMock, RuleExecutorServicesMock } from '../../../../../alerting/server/mocks';
-import { listMock } from '../../../../../lists/server/mocks';
+import { alertsMock, RuleExecutorServicesMock } from '@kbn/alerting-plugin/server/mocks';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { buildRuleMessageFactory } from './rule_messages';
-import { ExceptionListClient } from '../../../../../lists/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { RuleExecutionStatus } from '../../../../common/detection_engine/schemas/common';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
-import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 
 moment.suppressDeprecationWarnings = true;
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
index 738a9d9dd0c50..1f96f7eb9dde7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
@@ -20,24 +20,24 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { hasLargeValueList } from '@kbn/securitysolution-list-utils';
 
-import {
-  TimestampOverrideOrUndefined,
-  Privilege,
-  RuleExecutionStatus,
-} from '../../../../common/detection_engine/schemas/common';
 import type {
   ElasticsearchClient,
   IUiSettingsClient,
   Logger,
   SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   AlertInstanceContext,
   AlertInstanceState,
   RuleExecutorServices,
   parseDuration,
-} from '../../../../../alerting/server';
-import type { ExceptionListClient, ListClient, ListPluginSetup } from '../../../../../lists/server';
+} from '@kbn/alerting-plugin/server';
+import type { ExceptionListClient, ListClient, ListPluginSetup } from '@kbn/lists-plugin/server';
+import {
+  TimestampOverrideOrUndefined,
+  Privilege,
+  RuleExecutionStatus,
+} from '../../../../common/detection_engine/schemas/common';
 import type {
   BulkResponseErrorAggregation,
   SignalHit,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
index 505f8958ca44d..3886a7dacc3b7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { rulesClientMock } from '../../../../../alerting/server/mocks';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import { getAlertMock, getFindResultWithMultiHits } from '../routes/__mocks__/request_responses';
 import { INTERNAL_RULE_ID_KEY, INTERNAL_IDENTIFIER } from '../../../../common/constants';
 import { readRawTags, readTags, convertTagsToSet, convertToTags, isTags } from './read_tags';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts
index 183ac6f777963..da579ee306544 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.ts
@@ -6,8 +6,8 @@
  */
 
 import { has } from 'lodash/fp';
+import { RulesClient } from '@kbn/alerting-plugin/server';
 import { INTERNAL_IDENTIFIER } from '../../../../common/constants';
-import { RulesClient } from '../../../../../alerting/server';
 import { findRules } from '../rules/find_rules';
 
 export interface TagType {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
index d81832d9bbe35..324a16956bf77 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
@@ -28,6 +28,7 @@ import { Version } from '@kbn/securitysolution-io-ts-types';
 
 import type { ListArrayOrUndefined } from '@kbn/securitysolution-io-ts-list-types';
 import type { Filter } from '@kbn/es-query';
+import { RuleTypeParams as AlertingRuleTypeParams } from '@kbn/alerting-plugin/common';
 import {
   AnomalyThresholdOrUndefined,
   Description,
@@ -53,8 +54,6 @@ import {
   EventCategoryOverrideOrUndefined,
 } from '../../../common/detection_engine/schemas/common/schemas';
 
-import { RuleTypeParams as AlertingRuleTypeParams } from '../../../../alerting/common';
-
 export type PartialFilter = Partial<Filter>;
 
 export interface RuleTypeParams extends AlertingRuleTypeParams {
diff --git a/x-pack/plugins/security_solution/server/lib/framework/types.ts b/x-pack/plugins/security_solution/server/lib/framework/types.ts
index 3ecd2adf00242..6b69251e6d7ff 100644
--- a/x-pack/plugins/security_solution/server/lib/framework/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/framework/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { KibanaRequest, RequestHandlerContext } from '../../../../../../src/core/server';
-import { AuthenticatedUser } from '../../../../security/common/model';
+import { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
 export const internalFrameworkRequest = Symbol('internalFrameworkRequest');
 
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts
index d87c53ecfba71..7a0c72c85d62e 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
-import { httpServerMock, savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { httpServerMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions';
 import { mlServicesMock } from './mocks';
 import { hasMlLicense, isMlAdmin, buildMlAuthz } from './authz';
-import { licensingMock } from '../../../../licensing/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 
 jest.mock('../../../common/machine_learning/has_ml_admin_permissions');
 
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
index 3b96de2d4b1d1..ffaedc19a7f7b 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 
 import { Type } from '@kbn/securitysolution-io-ts-alerting-types';
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
-import { ILicense } from '../../../../licensing/server';
-import { MlPluginSetup } from '../../../../ml/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { SetupPlugins } from '../../plugin';
 import { MINIMUM_ML_LICENSE } from '../../../common/constants';
 import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions';
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts
index 41f6833743797..9e6df67b89d87 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
-import { getExceptionListItemSchemaMock } from '../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { getExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import { getAnomalies, AnomaliesSearchParams } from '.';
 
 const getFiltersFromMock = (mock: jest.Mock) => {
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
index 5beba022d8614..3728d6faf79f9 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { buildExceptionFilter } from '@kbn/securitysolution-list-utils';
-import { MlAnomalyRecordDoc as Anomaly } from '../../../../ml/server';
+import { MlAnomalyRecordDoc as Anomaly } from '@kbn/ml-plugin/server';
 
 export type { Anomaly };
 export type AnomalyResults = estypes.SearchResponse<Anomaly>;
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts
index a121a682d2892..b76dba6d072ef 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mlPluginServerMock } from '../../../../ml/server/mocks';
+import { mlPluginServerMock } from '@kbn/ml-plugin/server/mocks';
 
 export const mlServicesMock = mlPluginServerMock;
 
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts
index 9c920a29529ab..46e332ca33e19 100644
--- a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export const findExistingIndices = async (
   indices: string[],
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts
index 1e87a8564df21..08523d2e03340 100644
--- a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createSourcererDataViewRoute } from './';
+import { createSourcererDataViewRoute } from '.';
 import {
   requestMock,
   serverMock,
@@ -13,7 +13,7 @@ import {
 } from '../../detection_engine/routes/__mocks__';
 
 import { SOURCERER_API_URL } from '../../../../common/constants';
-import { StartServicesAccessor } from 'kibana/server';
+import { StartServicesAccessor } from '@kbn/core/server';
 import { StartPlugins } from '../../../plugin';
 
 jest.mock('./helpers', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts
index 9e182793d0b47..4ce0f7be20956 100644
--- a/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/sourcerer/routes/index.ts
@@ -6,12 +6,9 @@
  */
 
 import { transformError } from '@kbn/securitysolution-es-utils';
-import type { ElasticsearchClient, StartServicesAccessor } from 'kibana/server';
+import type { ElasticsearchClient, StartServicesAccessor } from '@kbn/core/server';
 
-import type {
-  DataView,
-  DataViewListItem,
-} from '../../../../../../../src/plugins/data_views/common';
+import type { DataView, DataViewListItem } from '@kbn/data-views-plugin/common';
 import { DEFAULT_TIME_FIELD, SOURCERER_API_URL } from '../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts b/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts
index e18d104b0d73a..b28a5213b4326 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ConcreteTaskInstance, TaskStatus } from '../../../../../task_manager/server';
+import { ConcreteTaskInstance, TaskStatus } from '@kbn/task-manager-plugin/server';
 import { TelemetryEventsSender } from '../sender';
 import { TelemetryReceiver } from '../receiver';
 import { SecurityTelemetryTaskConfig } from '../task';
-import { PackagePolicy } from '../../../../../fleet/common/types/models/package_policy';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
 
 export const createMockTelemetryEventsSender = (
   enableTelemetry?: boolean
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts
index 15f7b0a2a54c8..5a62513b1ab38 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/endpoint_alerts.ts
@@ -62,8 +62,8 @@ const allowlistBaseEventFields: AllowlistFields = {
     directory: true,
     hash: true,
     Ext: {
-      compressed_bytes: true,
-      compressed_bytes_present: true,
+      bytes_compressed: true,
+      bytes_compressed_present: true,
       code_signature: true,
       header_bytes: true,
       header_data: true,
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts
index 7f3756c2971ef..176210b07062b 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { copyAllowlistedFields } from './index';
+import { copyAllowlistedFields } from '.';
 
 describe('Security Telemetry filters', () => {
   describe('allowlistEventFields', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts
index e02e62417f63a..b71ab6118adb5 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filterlists/prebuilt_rules_alerts.ts
@@ -77,7 +77,9 @@ export const prebuiltRuleAllowlistFields: AllowlistFields = {
   group: {
     name: true,
   },
-  host: true,
+  host: {
+    os: true,
+  },
   http: {
     request: {
       body: {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts b/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts
index 9f63775a1bff7..095d55228fa71 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/helpers.ts
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import { PackagePolicy } from '../../../../fleet/common/types/models/package_policy';
-import { copyAllowlistedFields, exceptionListAllowlistFields } from './filterlists/index';
+import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_policy';
+import { copyAllowlistedFields, exceptionListAllowlistFields } from './filterlists';
 import { PolicyData } from '../../../common/endpoint/types';
 import type {
   ExceptionListItem,
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts b/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts
index 367eb92824117..9c7f9aa4f7370 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/insights/insights.ts
@@ -6,7 +6,7 @@
  */
 
 import moment from 'moment';
-import { KibanaRequest } from 'src/core/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { sha256 } from 'js-sha256';
 
 interface AlertContext {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts
index 3c5f3bdd52bde..6499d9328652c 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts
@@ -7,14 +7,14 @@
 
 import axios, { AxiosInstance, AxiosResponse } from 'axios';
 
-import { Logger } from 'src/core/server';
-import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ITelemetryEventsSender } from './sender';
 import { TelemetryEvent } from './types';
 import { ITelemetryReceiver } from './receiver';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts b/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts
index 36dfc191ce335..2f1a5fbd5cc7d 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/receiver.ts
@@ -10,7 +10,7 @@ import {
   CoreStart,
   ElasticsearchClient,
   SavedObjectsClientContract,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   AggregationsAggregate,
   SearchRequest,
@@ -27,9 +27,9 @@ import {
   THRESHOLD_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 import { TransportResult } from '@elastic/elasticsearch';
-import { Agent, AgentPolicy } from '../../../../fleet/common';
-import { AgentClient, AgentPolicyServiceInterface } from '../../../../fleet/server';
-import { ExceptionListClient } from '../../../../lists/server';
+import { Agent, AgentPolicy } from '@kbn/fleet-plugin/common';
+import { AgentClient, AgentPolicyServiceInterface } from '@kbn/fleet-plugin/server';
+import { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../endpoint/endpoint_app_context_services';
 import { TELEMETRY_MAX_BUFFER_SIZE } from './constants';
 import {
@@ -533,8 +533,63 @@ export class TelemetryReceiver implements ITelemetryReceiver {
                 bool: {
                   should: [
                     {
-                      match_phrase: {
-                        'kibana.alert.rule.parameters.immutable': 'true',
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Malware Prevention Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Malware Detection Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Ransomware Prevention Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      bool: {
+                        must_not: {
+                          bool: {
+                            should: [
+                              {
+                                match_phrase: {
+                                  'kibana.alert.rule.name': 'Ransomware Detection Alert',
+                                },
+                              },
+                            ],
+                          },
+                        },
                       },
                     },
                   ],
@@ -542,17 +597,13 @@ export class TelemetryReceiver implements ITelemetryReceiver {
               },
               {
                 bool: {
-                  must_not: {
-                    bool: {
-                      should: [
-                        {
-                          match_phrase: {
-                            'event.module': 'endpoint',
-                          },
-                        },
-                      ],
+                  should: [
+                    {
+                      match_phrase: {
+                        'kibana.alert.rule.parameters.immutable': 'true',
+                      },
                     },
-                  },
+                  ],
                 },
               },
               {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts
index dff3676c20c8a..71e8b8e11c215 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts
@@ -7,8 +7,8 @@
 
 /* eslint-disable dot-notation */
 import { TelemetryEventsSender } from './sender';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import { URL } from 'url';
 
 describe('TelemetryEventsSender', () => {
@@ -59,8 +59,8 @@ describe('TelemetryEventsSender', () => {
             test: 'me',
             another: 'nope',
             Ext: {
-              compressed_bytes: 'data up to 4mb',
-              compressed_bytes_present: 'data up to 4mb',
+              bytes_compressed: 'data up to 4mb',
+              bytes_compressed_present: 'data up to 4mb',
               code_signature: {
                 key1: 'X',
                 key2: 'Y',
@@ -133,8 +133,8 @@ describe('TelemetryEventsSender', () => {
             created: 0,
             path: 'X',
             Ext: {
-              compressed_bytes: 'data up to 4mb',
-              compressed_bytes_present: 'data up to 4mb',
+              bytes_compressed: 'data up to 4mb',
+              bytes_compressed_present: 'data up to 4mb',
               code_signature: {
                 key1: 'X',
                 key2: 'Y',
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
index db35cf0c7ad8a..218afc7bc69a1 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
@@ -9,16 +9,16 @@ import { cloneDeep } from 'lodash';
 import { URL } from 'url';
 import { transformDataToNdjson } from '@kbn/securitysolution-utils';
 
-import { Logger } from 'src/core/server';
-import { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
+import { Logger } from '@kbn/core/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import axios, { AxiosInstance } from 'axios';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ITelemetryReceiver } from './receiver';
-import { copyAllowlistedFields, endpointAllowlistFields } from './filterlists/index';
+import { copyAllowlistedFields, endpointAllowlistFields } from './filterlists';
 import { createTelemetryTaskConfigs } from './tasks';
 import { createUsageCounterLabel } from './helpers';
 import type { TelemetryEvent } from './types';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts
index aa695b92c1455..36a93fd232bb7 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/task.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { taskManagerMock } from '../../../../task_manager/server/mocks';
-import { SuccessfulRunResult } from '../../../../task_manager/server/task';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
+import { SuccessfulRunResult } from '@kbn/task-manager-plugin/server/task';
 import { SecurityTelemetryTask } from './task';
 import {
   createMockTaskInstance,
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/task.ts b/x-pack/plugins/security_solution/server/lib/telemetry/task.ts
index c3d674f721491..dc55d43bd8008 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/task.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/task.ts
@@ -6,12 +6,12 @@
  */
 
 import moment from 'moment';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { ITelemetryReceiver } from './receiver';
 import { ITelemetryEventsSender } from './sender';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts
index 5b0c2e334cec9..9cfbaffbcaa42 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryDetectionRuleListsTaskConfig } from './detection_rule';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts
index 73931f856a336..d5d093a2fa074 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/detection_rule.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { LIST_DETECTION_RULE_EXCEPTION, TELEMETRY_CHANNEL_LISTS } from '../constants';
 import { batchTelemetryRecords, templateExceptionList } from '../helpers';
 import { ITelemetryEventsSender } from '../sender';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts
index 579ec42b1ec32..45d3eeb40a801 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryDiagnosticsTaskConfig } from './diagnostic';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts
index a798077e62aff..efaac1b78e421 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/diagnostic.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { getPreviousDiagTaskTimestamp } from '../helpers';
 import { ITelemetryEventsSender } from '../sender';
 import type { TelemetryEvent } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts
index 16c10a90109b2..ce31247f075d7 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryEndpointTaskConfig } from './endpoint';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts
index c2c318debccda..59bc07f8ca2eb 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/endpoint.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
+import { FLEET_ENDPOINT_PACKAGE } from '@kbn/fleet-plugin/common';
 import { ITelemetryEventsSender } from '../sender';
 import type {
   EndpointMetricsAggregation,
@@ -25,7 +26,6 @@ import {
   isPackagePolicyList,
 } from '../helpers';
 import { PolicyData } from '../../../../common/endpoint/types';
-import { FLEET_ENDPOINT_PACKAGE } from '../../../../../fleet/common';
 import { TELEMETRY_CHANNEL_ENDPOINT_META } from '../constants';
 
 // Endpoint agent uses this Policy ID while it's installing.
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts
index 1efd4299de523..cc784f54a33e0 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetryPrebuiltRuleAlertsTaskConfig } from './prebuilt_rule_alerts';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts
index ad284df0e7c06..20de990816c9e 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/prebuilt_rule_alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { ITelemetryEventsSender } from '../sender';
 import { ITelemetryReceiver } from '../receiver';
 import type { ESClusterInfo, ESLicense } from '../types';
@@ -13,7 +13,7 @@ import { TaskExecutionPeriod } from '../task';
 import { TELEMETRY_CHANNEL_DETECTION_ALERTS } from '../constants';
 import { batchTelemetryRecords } from '../helpers';
 import { TelemetryEvent } from '../types';
-import { copyAllowlistedFields, prebuiltRuleAllowlistFields } from '../filterlists/index';
+import { copyAllowlistedFields, prebuiltRuleAllowlistFields } from '../filterlists';
 
 export function createTelemetryPrebuiltRuleAlertsTaskConfig(maxTelemetryBatch: number) {
   return {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts
index e4e09d308d4c2..7f31066ed90ec 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { createTelemetrySecurityListTaskConfig } from './security_lists';
 import { createMockTelemetryEventsSender, createMockTelemetryReceiver } from '../__mocks__';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts
index f655674b6ca96..54733fe0cc13b 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/tasks/security_lists.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   ENDPOINT_LIST_ID,
   ENDPOINT_EVENT_FILTERS_LIST_ID,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts b/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts
index a6508f609d9d6..00edc25541566 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/__mocks__/resolve_timeline.ts
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { TimelineStatus, TimelineType } from '../../../../common/types/timeline';
-import { ResolvedTimelineWithOutcomeSavedObject } from './../../../../common/types/timeline/index';
+import {
+  TimelineStatus,
+  TimelineType,
+  ResolvedTimelineWithOutcomeSavedObject,
+} from '../../../../common/types/timeline';
 
 export const mockResolvedSavedObject = {
   saved_object: {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts
index 81f62e0c76542..3d66a6507a67b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { TimelineType } from '../../../../../../common/types/timeline';
 
 import {
@@ -73,7 +73,7 @@ describe('clean draft timelines', () => {
       persistNote: mockPersistNote,
     }));
 
-    const cleanDraftTimelinesRoute = jest.requireActual('./index').cleanDraftTimelinesRoute;
+    const cleanDraftTimelinesRoute = jest.requireActual('.').cleanDraftTimelinesRoute;
     cleanDraftTimelinesRoute(server.router, createMockConfig(), securitySetup);
   });
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts
index ec9b4e08a673a..1911f964af4b1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { TimelineType } from '../../../../../../common/types/timeline';
 
 import {
@@ -74,7 +74,7 @@ describe('get draft timelines', () => {
           persistNote: mockPersistNote,
         }));
 
-        const getDraftTimelinesRoute = jest.requireActual('./index').getDraftTimelinesRoute;
+        const getDraftTimelinesRoute = jest.requireActual('.').getDraftTimelinesRoute;
         getDraftTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
index d4425d17671a3..63e8d9afea9d8 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { createPromiseFromStreams } from '@kbn/utils';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import { FrameworkRequest } from '../../../../framework';
 import {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
index 345987a82873f..55f4a06326fe1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
index 18dcdfe103b1f..0270d525ae779 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
@@ -12,7 +12,7 @@ import { FrameworkRequest } from '../../../../framework';
 import { SavedTimeline } from '../../../../../../common/types';
 import { mockTemplate, mockTimeline } from '../../../__mocks__/create_timelines';
 import { buildFrameworkRequest } from '../../../utils/common';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { requestContextMock } from '../../../../detection_engine/routes/__mocks__';
 import {
   getCreateTimelinesRequest,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts
index de11037db7038..5e066e419c4bb 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -89,7 +89,7 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getCreateTimelinesRequest(createTimelineWithoutTimelineId);
@@ -150,7 +150,7 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
@@ -191,7 +191,7 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getCreateTimelinesRequest(createTemplateTimelineWithoutTimelineId);
@@ -257,7 +257,7 @@ describe('create timelines', () => {
           };
         });
 
-        const createTimelinesRoute = jest.requireActual('./index').createTimelinesRoute;
+        const createTimelinesRoute = jest.requireActual('.').createTimelinesRoute;
         createTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
index 832310b57a76c..d117d3d0c1b47 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
@@ -24,7 +24,7 @@ import { convertSavedObjectToSavedNote } from '../../../saved_object/notes/saved
 import { convertSavedObjectToSavedPinnedEvent } from '../../../saved_object/pinned_events';
 import { convertSavedObjectToSavedTimeline } from '../../../saved_object/timelines/convert_saved_object_to_savedtimeline';
 import { mockGetCurrentUser } from '../../../__mocks__/import_timelines';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 jest.mock('../../../saved_object/timelines/convert_saved_object_to_savedtimeline', () => {
   return {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
index edc0afd08c4ef..609b26f89be5c 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
index 54c9345d4ac7f..0298a3f869bd4 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts
index b4e2bc0222dd5..d92d82ea82fc2 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.test.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../../detection_engine/routes/__mocks__';
 import { TIMELINE_EXPORT_URL } from '../../../../../../common/constants';
 import { TimelineStatus, TimelineType } from '../../../../../../common/types/timeline';
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   mockUniqueParsedObjects,
@@ -152,7 +152,7 @@ describe('import timelines', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
@@ -358,7 +358,7 @@ describe('import timelines', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
@@ -472,7 +472,7 @@ describe('import timelines', () => {
         path: TIMELINE_EXPORT_URL,
         body: { id: 'someId' },
       });
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
 
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
       const result = server.validate(request);
@@ -576,7 +576,7 @@ describe('import timeline templates', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
@@ -721,7 +721,7 @@ describe('import timeline templates', () => {
         };
       });
 
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
     });
 
@@ -891,7 +891,7 @@ describe('import timeline templates', () => {
         path: TIMELINE_EXPORT_URL,
         body: { id: 'someId' },
       });
-      const importTimelinesRoute = jest.requireActual('./index').importTimelinesRoute;
+      const importTimelinesRoute = jest.requireActual('.').importTimelinesRoute;
 
       importTimelinesRoute(server.router, createMockConfig(), securitySetup);
       const result = server.validate(request);
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts
index 09316098cea23..ca3482591407a 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SecurityPluginSetup } from '../../../../../../../security/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import {
   serverMock,
@@ -86,7 +86,7 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getUpdateTimelinesRequest(updateTimelineWithTimelineId);
@@ -150,7 +150,7 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
@@ -194,7 +194,7 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
 
         const mockRequest = getUpdateTimelinesRequest(updateTemplateTimelineWithTimelineId);
@@ -270,7 +270,7 @@ describe('update timelines', () => {
           };
         });
 
-        const patchTimelinesRoute = jest.requireActual('./index').patchTimelinesRoute;
+        const patchTimelinesRoute = jest.requireActual('.').patchTimelinesRoute;
         patchTimelinesRoute(server.router, createMockConfig(), securitySetup);
       });
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts
index fcfbb2345c4e4..ecf7b04bc1b1b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/notes/saved_object.ts
@@ -13,8 +13,8 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsFindOptions } from '../../../../../../../../src/core/server';
-import { AuthenticatedUser } from '../../../../../../security/common/model';
+import { SavedObjectsFindOptions } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import {
   SavedNote,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts
index f413c39306bb5..3253deb0194c6 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/pinned_events/index.ts
@@ -11,8 +11,8 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsFindOptions } from '../../../../../../../../src/core/server';
-import { AuthenticatedUser } from '../../../../../../security/common/model';
+import { SavedObjectsFindOptions } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import {
   PinnedEventSavedObject,
@@ -23,7 +23,7 @@ import {
 } from '../../../../../common/types/timeline/pinned_event';
 import { FrameworkRequest } from '../../../framework';
 
-import { createTimeline } from '../../saved_object/timelines';
+import { createTimeline } from '../timelines';
 import { pinnedEventSavedObjectType } from '../../saved_object_mappings/pinned_events';
 import { pinnedEventFieldsMigrator } from './field_migrator';
 import { timelineSavedObjectType } from '../../saved_object_mappings';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts
index 87d3aa4c6f908..c9500d4c3c122 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/field_migrator.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common';
 import { DATA_VIEW_ID_REF_NAME, SAVED_QUERY_ID_REF_NAME, SAVED_QUERY_TYPE } from '../../constants';
 import { FieldMigrator } from '../../utils/migrator';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../../../../../src/plugins/data/common';
 /**
  * A migrator to handle moving specific fields that reference other saved objects to the references field within a saved
  * object.
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
index 00355422687b2..920d9a85ed484 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
@@ -27,7 +27,7 @@ import {
   mockResolveTimelineResponse,
 } from '../../__mocks__/resolve_timeline';
 import { DATA_VIEW_ID_REF_NAME, SAVED_QUERY_ID_REF_NAME, SAVED_QUERY_TYPE } from '../../constants';
-import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../../../../../src/plugins/data_views/common';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/common';
 
 jest.mock('./convert_saved_object_to_savedtimeline', () => ({
   convertSavedObjectToSavedTimeline: jest.fn(),
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
index d9bc1ccfa2fe4..2c573d72dd6e4 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
@@ -7,10 +7,8 @@
 
 import { getOr } from 'lodash/fp';
 
-import {
-  SavedObjectsClientContract,
-  SavedObjectsFindOptions,
-} from '../../../../../../../../src/core/server';
+import { SavedObjectsClientContract, SavedObjectsFindOptions } from '@kbn/core/server';
+import { AuthenticatedUser } from '@kbn/security-plugin/server';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import { NoteSavedObject } from '../../../../../common/types/timeline/note';
 import { PinnedEventSavedObject } from '../../../../../common/types/timeline/pinned_event';
@@ -37,9 +35,8 @@ import * as note from '../notes/saved_object';
 import * as pinnedEvent from '../pinned_events';
 import { convertSavedObjectToSavedTimeline } from './convert_saved_object_to_savedtimeline';
 import { pickSavedTimeline } from './pick_saved_timeline';
-import { timelineSavedObjectType } from '../../saved_object_mappings/';
+import { timelineSavedObjectType } from '../../saved_object_mappings';
 import { draftTimelineDefaults } from '../../utils/default_timeline';
-import { AuthenticatedUser } from '../../../../../../security/server';
 import { Maybe } from '../../../../../common/search_strategy';
 import { timelineFieldsMigrator } from './field_migrator';
 export { pickSavedTimeline } from './pick_saved_timeline';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts
index 39e05b267735d..59899ca564e18 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AuthenticatedUser } from '../../../../../../security/common/model';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 
 import { TimelineStatus, TimelineType, SavedTimeline } from '../../../../../common/types/timeline';
 import { NoteSavedObject } from '../../../../../common/types/timeline/note';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts
index 25a4c98f90ee6..1df6c4f2108e7 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/pick_saved_timeline.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import { AuthenticatedUser } from '../../../../../../security/common/model';
+import { AuthenticatedUser } from '@kbn/security-plugin/common/model';
 import { UNAUTHENTICATED_USER } from '../../../../../common/constants';
 import {
   TimelineType,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts
index 76773b7fcd518..02ca8a4dd63ce 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/notes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap } from 'kibana/server';
+import { SavedObjectMigrationMap } from '@kbn/core/server';
 import { migrateTimelineIdToReferences } from './utils';
 
 export const notesMigrations: SavedObjectMigrationMap = {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts
index 4d21190d9381c..6f960888c83bd 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/pinned_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationMap } from 'kibana/server';
+import { SavedObjectMigrationMap } from '@kbn/core/server';
 import { migrateTimelineIdToReferences } from './utils';
 
 export const pinnedEventsMigrations: SavedObjectMigrationMap = {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts
index 45733d7737b62..ce4ecd1a46479 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/timelines.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectMigrationMap,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { SAVED_QUERY_ID_REF_NAME, SAVED_QUERY_TYPE } from '../../constants';
 import { createMigratedDoc, createReference } from './utils';
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts
index 7bd7bc148c263..fa35c1c622303 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/utils.ts
@@ -9,7 +9,7 @@ import {
   SavedObjectReference,
   SavedObjectSanitizedDoc,
   SavedObjectUnsanitizedDoc,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { timelineSavedObjectType } from '../timelines';
 import { TIMELINE_ID_REF_NAME } from '../../constants';
 import { TimelineId } from './types';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts
index 444acbac4d147..a1d39af289184 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { notesMigrations } from './migrations/notes';
 
 export const noteSavedObjectType = 'siem-ui-timeline-note';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts
index f5ae5f38af3a2..bd21e2a4b1cf7 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { pinnedEventsMigrations } from './migrations/pinned_events';
 
 export const pinnedEventSavedObjectType = 'siem-ui-timeline-pinned-event';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts
index 66c58c5f34446..24fc9ddcbf110 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from '../../../../../../../src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { timelinesMigrations } from './migrations/timelines';
 
 export const timelineSavedObjectType = 'siem-ui-timeline';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
index 91f8e4153a63b..958a5bf061711 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
@@ -12,7 +12,7 @@ import { Readable } from 'stream';
 import { createListStream } from '@kbn/utils';
 import { schema } from '@kbn/config-schema';
 
-import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
+import { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 import { formatErrors } from '@kbn/securitysolution-io-ts-utils';
 import { SetupPlugins, StartPlugins } from '../../../plugin';
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts
index 58379a2af0b71..9e3475d697807 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectReference } from 'kibana/server';
+import { SavedObject, SavedObjectReference } from '@kbn/core/server';
 import { FieldMigrator } from './migrator';
 
 describe('FieldMigrator', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts
index 0392a3e5c7e3f..6267975e3a33b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/migrator.ts
@@ -7,7 +7,7 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import _ from 'lodash';
-import { SavedObject, SavedObjectReference, SavedObjectsUpdateResponse } from 'kibana/server';
+import { SavedObject, SavedObjectReference, SavedObjectsUpdateResponse } from '@kbn/core/server';
 
 interface Field {
   path: string;
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts
index add586c6cb67f..93497f20501ee 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_create_handler.ts
@@ -8,7 +8,7 @@
 import {
   CreateExceptionListItemOptions,
   ExceptionsListPreCreateItemServerExtension,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
 import {
   EventFilterValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts
index 095e4b5631540..ab010d8efe6dd 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_delete_item_handler.ts
@@ -6,8 +6,8 @@
  */
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { ExceptionsListPreDeleteItemServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreDeleteItemServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts
index 8067356532a3a..d14a5792036fa 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_export_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreExportServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreExportServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts
index a21a99eea3a9d..ec5b3f45ea855 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_get_one_handler.ts
@@ -6,8 +6,8 @@
  */
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { ExceptionsListPreGetOneItemServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreGetOneItemServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts
index 96262e5e4459d..2856bb0af867f 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_import_handler.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ExceptionsListPreImportServerExtension } from '../../../../../lists/server';
+import { ExceptionsListPreImportServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointArtifactExceptionValidationError } from '../validators/errors';
 import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../../../common/endpoint/service/artifacts/constants';
 
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts
index 5cfe7311eb9e3..3c8e9382486bb 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_multi_list_find_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreMultiListFindServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreMultiListFindServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts
index 917e6c97b1bfd..cad00afd961e4 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_single_list_find_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreSingleListFindServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreSingleListFindServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts
index 93c1abdcb7d7a..2a459ef99409f 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_summary_handler.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ExceptionsListPreSummaryServerExtension } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
-import { ExceptionsListPreSummaryServerExtension } from '../../../../../lists/server';
 import {
   TrustedAppValidator,
   HostIsolationExceptionsValidator,
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts
index acedbf7d1ed25..1dfa597314f1a 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/handlers/exceptions_pre_update_handler.ts
@@ -8,7 +8,7 @@
 import {
   ExceptionsListPreUpdateItemServerExtension,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
 import { ExceptionItemLikeOptions } from '../types';
 import {
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts
index 98d509ecf928f..6ba50ccaceb9d 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/register_endpoint_extension_points.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { ListsServerExtensionRegistrar } from '@kbn/lists-plugin/server';
 import { EndpointAppContextService } from '../../endpoint/endpoint_app_context_services';
 import { getExceptionsPreCreateItemHandler } from './handlers/exceptions_pre_create_handler';
 import { getExceptionsPreUpdateItemHandler } from './handlers/exceptions_pre_update_handler';
-import type { ListsServerExtensionRegistrar } from '../../../../lists/server';
 import { getExceptionsPreGetOneHandler } from './handlers/exceptions_pre_get_one_handler';
 import { getExceptionsPreSummaryHandler } from './handlers/exceptions_pre_summary_handler';
 import { getExceptionsPreDeleteItemHandler } from './handlers/exceptions_pre_delete_item_handler';
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts
index 4b00bafafc967..9108e83ad0aa3 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CreateExceptionListItemOptions } from '../../../../lists/server';
+import { CreateExceptionListItemOptions } from '@kbn/lists-plugin/server';
 
 /**
  * An Exception Like item is a structure used internally by several of the Exceptions api/service in that
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts
index e06a6b64a9295..cff835ac2d58e 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts
@@ -12,15 +12,15 @@ import {
 } from '../../../endpoint/mocks';
 import { BaseValidatorMock, createExceptionItemLikeOptionsMock } from './mocks';
 import { EndpointArtifactExceptionValidationError } from './errors';
-import { httpServerMock } from '../../../../../../../src/core/server/mocks';
-import { createFleetAuthzMock, PackagePolicy } from '../../../../../fleet/common';
-import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
+import { httpServerMock } from '@kbn/core/server/mocks';
+import { createFleetAuthzMock, PackagePolicy } from '@kbn/fleet-plugin/common';
+import { PackagePolicyServiceInterface } from '@kbn/fleet-plugin/server';
 import { ExceptionItemLikeOptions } from '../types';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
 } from '../../../../common/endpoint/service/artifacts';
-import { securityMock } from '../../../../../security/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 
 describe('When using Artifacts Exceptions BaseValidator', () => {
   let endpointAppContextServices: EndpointAppContextService;
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts
index 293066a3a1824..97c5dc84a8040 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 import { isEqual } from 'lodash/fp';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts
index f6f08d792b115..45d080ab956ee 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/blocklist_validator.ts
@@ -10,12 +10,12 @@ import { ENDPOINT_BLOCKLISTS_LIST_ID } from '@kbn/securitysolution-list-constant
 import { schema, Type, TypeOf } from '@kbn/config-schema';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
-import { BaseValidator } from './base_validator';
-import { ExceptionItemLikeOptions } from '../types';
 import {
   CreateExceptionListItemOptions,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
+import { BaseValidator } from './base_validator';
+import { ExceptionItemLikeOptions } from '../types';
 import { isValidHash } from '../../../../common/endpoint/service/trusted_apps/validations';
 import { EndpointArtifactExceptionValidationError } from './errors';
 
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts
index 69a8d9c5914de..296023317eabc 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ListsErrorWithStatusCode } from '../../../../../lists/server';
+import { ListsErrorWithStatusCode } from '@kbn/lists-plugin/server';
 
 export class EndpointArtifactExceptionValidationError extends ListsErrorWithStatusCode {
   constructor(message: string, statusCode: number = 400) {
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts
index 875bc04646321..e90c6e4263b38 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/event_filter_validator.ts
@@ -12,7 +12,7 @@ import { ENDPOINT_EVENT_FILTERS_LIST_ID } from '@kbn/securitysolution-list-const
 import {
   CreateExceptionListItemOptions,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
 import { EXCEPTIONABLE_ENDPOINT_EVENT_FIELDS } from '../../../../common/endpoint/exceptions/exceptionable_endpoint_event_fields';
 
 import { ExceptionItemLikeOptions } from '../types';
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts
index 6454584783863..5d85866a3918f 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/host_isolation_exceptions_validator.ts
@@ -8,14 +8,14 @@
 import { schema } from '@kbn/config-schema';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
+import {
+  CreateExceptionListItemOptions,
+  UpdateExceptionListItemOptions,
+} from '@kbn/lists-plugin/server';
 import { BaseValidator, BasicEndpointExceptionDataSchema } from './base_validator';
 import { EndpointArtifactExceptionValidationError } from './errors';
 import { ExceptionItemLikeOptions } from '../types';
 
-import {
-  CreateExceptionListItemOptions,
-  UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
 import { isValidIPv4OrCIDR } from '../../../../common/endpoint/utils/is_valid_ip';
 
 function validateIp(value: string) {
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts
index 97a29aee962e5..baaac6debb7c0 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/mocks.ts
@@ -6,9 +6,9 @@
  */
 
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { BaseValidator } from './base_validator';
 import { ExceptionItemLikeOptions } from '../types';
-import { listMock } from '../../../../../lists/server/mocks';
 import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../common/endpoint/service/artifacts';
 
 /**
diff --git a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts
index b2171ebd018bd..b83e536cdee1e 100644
--- a/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts
+++ b/x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/trusted_app_validator.ts
@@ -9,12 +9,12 @@ import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '@kbn/securitysolution-list-consta
 import { schema, TypeOf } from '@kbn/config-schema';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { OperatingSystem, TrustedAppEntryTypes } from '@kbn/securitysolution-utils';
-import { BaseValidator } from './base_validator';
-import { ExceptionItemLikeOptions } from '../types';
 import {
   CreateExceptionListItemOptions,
   UpdateExceptionListItemOptions,
-} from '../../../../../lists/server';
+} from '@kbn/lists-plugin/server';
+import { BaseValidator } from './base_validator';
+import { ExceptionItemLikeOptions } from '../types';
 import { TrustedAppConditionEntry as ConditionEntry } from '../../../../common/endpoint/types';
 import {
   getDuplicateFields,
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index e22886ccd53ff..a313a0b86a246 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -17,16 +17,16 @@ import {
   THRESHOLD_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 
-import { Logger, SavedObjectsClient } from '../../../../src/core/server';
-import { UsageCounter } from '../../../../src/plugins/usage_collection/server';
-
-import { ECS_COMPONENT_TEMPLATE_NAME } from '../../rule_registry/common/assets';
-import { FieldMap } from '../../rule_registry/common/field_map';
-import { technicalRuleFieldMap } from '../../rule_registry/common/assets/field_maps/technical_rule_field_map';
-import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { IRuleDataClient, Dataset } from '../../rule_registry/server';
-import { ListPluginSetup } from '../../lists/server';
-import { ILicense } from '../../licensing/server';
+import { Logger, SavedObjectsClient } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+
+import { ECS_COMPONENT_TEMPLATE_NAME } from '@kbn/rule-registry-plugin/common/assets';
+import { FieldMap } from '@kbn/rule-registry-plugin/common/field_map';
+import { technicalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/technical_rule_field_map';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { IRuleDataClient, Dataset } from '@kbn/rule-registry-plugin/server';
+import { ListPluginSetup } from '@kbn/lists-plugin/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 import {
   createEqlAlertType,
diff --git a/x-pack/plugins/security_solution/server/plugin_contract.ts b/x-pack/plugins/security_solution/server/plugin_contract.ts
index 956daed0a31f7..c07dfa59c3deb 100644
--- a/x-pack/plugins/security_solution/server/plugin_contract.ts
+++ b/x-pack/plugins/security_solution/server/plugin_contract.ts
@@ -5,43 +5,35 @@
  * 2.0.
  */
 
-import {
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  PluginInitializerContext,
-} from '../../../../src/core/server';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
-} from '../../../../src/plugins/data/server';
-import { UsageCollectionSetup as UsageCollectionPluginSetup } from '../../../../src/plugins/usage_collection/server';
+} from '@kbn/data-plugin/server';
+import { UsageCollectionSetup as UsageCollectionPluginSetup } from '@kbn/usage-collection-plugin/server';
 import {
   PluginSetupContract as AlertingPluginSetup,
   PluginStartContract as AlertingPluginStart,
-} from '../../alerting/server';
-import { PluginStartContract as CasesPluginStart } from '../../cases/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
-import { IEventLogClientService, IEventLogService } from '../../event_log/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { FleetStartContract as FleetPluginStart } from '../../fleet/server';
-import { LicensingPluginStart, LicensingPluginSetup } from '../../licensing/server';
-import { ListPluginSetup } from '../../lists/server';
-import { MlPluginSetup } from '../../ml/server';
+} from '@kbn/alerting-plugin/server';
+import { PluginStartContract as CasesPluginStart } from '@kbn/cases-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
+import { IEventLogClientService, IEventLogService } from '@kbn/event-log-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { FleetStartContract as FleetPluginStart } from '@kbn/fleet-plugin/server';
+import { LicensingPluginStart, LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { ListPluginSetup } from '@kbn/lists-plugin/server';
+import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import {
   RuleRegistryPluginSetupContract as RuleRegistryPluginSetup,
   RuleRegistryPluginStartContract as RuleRegistryPluginStart,
-} from '../../rule_registry/server';
-import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
-import { SpacesPluginSetup, SpacesPluginStart } from '../../spaces/server';
+} from '@kbn/rule-registry-plugin/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import {
   TaskManagerSetupContract as TaskManagerPluginSetup,
   TaskManagerStartContract as TaskManagerPluginStart,
-} from '../../task_manager/server';
-import {
-  TelemetryPluginStart,
-  TelemetryPluginSetup,
-} from '../../../../src/plugins/telemetry/server';
+} from '@kbn/task-manager-plugin/server';
+import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 
 export interface SecuritySolutionPluginSetupDependencies {
   alerting: AlertingPluginSetup;
diff --git a/x-pack/plugins/security_solution/server/request_context_factory.ts b/x-pack/plugins/security_solution/server/request_context_factory.ts
index 4d7a34b1cc2ac..b0fe00485e2ad 100644
--- a/x-pack/plugins/security_solution/server/request_context_factory.ts
+++ b/x-pack/plugins/security_solution/server/request_context_factory.ts
@@ -7,8 +7,9 @@
 
 import { memoize } from 'lodash';
 
-import { Logger, KibanaRequest, RequestHandlerContext } from 'kibana/server';
+import { Logger, KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 
+import { FleetAuthz } from '@kbn/fleet-plugin/common';
 import { DEFAULT_SPACE_ID } from '../common/constants';
 import { AppClientFactory } from './client';
 import { ConfigType } from './config';
@@ -29,7 +30,6 @@ import {
   getEndpointAuthzInitialState,
 } from '../common/endpoint/service/authz';
 import { licenseService } from './lib/license';
-import { FleetAuthz } from '../../fleet/common';
 
 export interface IRequestContextFactory {
   create(
diff --git a/x-pack/plugins/security_solution/server/routes/index.ts b/x-pack/plugins/security_solution/server/routes/index.ts
index 2efb132c96ff6..fe093b0b31ee3 100644
--- a/x-pack/plugins/security_solution/server/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/routes/index.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { StartServicesAccessor } from 'kibana/server';
-import { Logger } from 'src/core/server';
-import { IRuleDataClient, RuleDataPluginService } from '../../../rule_registry/server';
+import { StartServicesAccessor, Logger } from '@kbn/core/server';
+import { IRuleDataClient, RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 
 import { SecuritySolutionPluginRouter } from '../types';
 
@@ -112,10 +111,10 @@ export const initRoutes = (
 
   addPrepackedRulesRoute(router);
   getPrepackagedRulesStatusRoute(router, config, security, isRuleRegistryEnabled);
-  createRulesBulkRoute(router, ml, isRuleRegistryEnabled);
-  updateRulesBulkRoute(router, ml, isRuleRegistryEnabled);
-  patchRulesBulkRoute(router, ml, isRuleRegistryEnabled);
-  deleteRulesBulkRoute(router, isRuleRegistryEnabled);
+  createRulesBulkRoute(router, ml, isRuleRegistryEnabled, logger);
+  updateRulesBulkRoute(router, ml, isRuleRegistryEnabled, logger);
+  patchRulesBulkRoute(router, ml, isRuleRegistryEnabled, logger);
+  deleteRulesBulkRoute(router, isRuleRegistryEnabled, logger);
   performBulkActionRoute(router, ml, logger, isRuleRegistryEnabled);
 
   getRuleExecutionEventsRoute(router);
diff --git a/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts b/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts
index 7e0b1686ee467..34ef50a17e02d 100644
--- a/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts
+++ b/x-pack/plugins/security_solution/server/routes/limited_concurrency.ts
@@ -10,7 +10,7 @@ import {
   KibanaRequest,
   LifecycleResponseFactory,
   OnPreAuthToolkit,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { LIMITED_CONCURRENCY_ROUTE_TAG_PREFIX } from '../../common/constants';
 
 class MaxCounter {
diff --git a/x-pack/plugins/security_solution/server/saved_objects.ts b/x-pack/plugins/security_solution/server/saved_objects.ts
index 9b76249c035c5..677bd581d82d4 100644
--- a/x-pack/plugins/security_solution/server/saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 
 import { noteType, pinnedEventType, timelineType } from './lib/timeline/saved_object_mappings';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts
index 6f1c2cc7f60b0..1b21e8f412f56 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/cti/threat_intel_source/index.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { SecuritySolutionFactory } from '../../types';
 import {
   CtiDataSourceStrategyResponse,
   CtiQueries,
   CtiDataSourceRequestOptions,
 } from '../../../../../../common/search_strategy/security_solution/cti';
-import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { buildTiDataSourceQuery } from './query.threat_intel_source.dsl';
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts
index e039eff160241..4f84578118cb6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/__mocks__/index.ts
@@ -5,12 +5,9 @@
  * 2.0.
  */
 
-import {
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../../src/core/server';
-import { elasticsearchServiceMock } from '../../../../../../../../../../src/core/server/mocks';
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { allowedExperimentalValues } from '../../../../../../../common/experimental_features';
 
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
index d05b9e1f8fb1a..8158190eb65ad 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
@@ -7,7 +7,8 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
   HostAggEsItem,
@@ -27,7 +28,6 @@ import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { SecuritySolutionFactory } from '../../types';
 import { buildHostsQuery } from './query.all_hosts.dsl';
 import { formatHostEdgesData, HOSTS_FIELDS } from './helpers';
-import { IScopedClusterClient } from '../../../../../../../../../src/core/server';
 
 import { EndpointAppContext } from '../../../../../endpoint/types';
 import { buildRiskScoreQuery } from '../../risk_score/all/query.risk_score.dsl';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts
index 4419653166519..3e97f2ab28ab4 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildHostsQuery } from './query.all_hosts.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildHostsQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
index d3758df94074f..5afe096b6671d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   Direction,
   HostsRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts
index 0cb4f3dd90074..7b8fae9c77fb1 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   Direction,
   HostsQueries,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
index 28f114b1cccf7..79abb9d7137e6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
@@ -7,11 +7,7 @@
 
 import { set } from '@elastic/safer-lodash-set/fp';
 import { get, has, head } from 'lodash/fp';
-import {
-  IScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../src/core/server';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { hostFieldsMap } from '../../../../../../common/ecs/ecs_fields';
 import { Direction } from '../../../../../../common/search_strategy/common';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx
index 89d691e5c9ce8..6eda020d4decf 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.test.tsx
@@ -12,11 +12,7 @@ import {
   mockSearchStrategyResponse,
   formattedSearchStrategyResponse,
 } from './__mocks__';
-import {
-  IScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../src/core/server';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import { EndpointAppContext } from '../../../../../endpoint/types';
 import { EndpointAppContextService } from '../../../../../endpoint/endpoint_app_context_services';
 import { allowedExperimentalValues } from '../../../../../../common/experimental_features';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts
index aedb1061af2fa..0499d4105f247 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/index.ts
@@ -7,7 +7,8 @@
 
 import { get } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import {
   HostAggEsData,
   HostDetailsStrategyResponse,
@@ -21,11 +22,6 @@ import { SecuritySolutionFactory } from '../../types';
 import { buildHostDetailsQuery } from './query.host_details.dsl';
 import { formatHostItem, getHostEndpoint } from './helpers';
 import { EndpointAppContext } from '../../../../../endpoint/types';
-import {
-  IScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from '../../../../../../../../../src/core/server';
 
 export const hostDetails: SecuritySolutionFactory<HostsQueries.details> = {
   buildDsl: (options: HostDetailsRequestOptions) => buildHostDetailsQuery(options),
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts
index c54e20c70c632..2577d46cc116b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildHostDetailsQuery } from './query.host_details.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 // Failing with rule registry enabled
 describe('buildHostDetailsQuery', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts
index d34e9d9c84537..33867f78c6542 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/query.host_details.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { cloudFieldsMap, hostFieldsMap } from '../../../../../../common/ecs/ecs_fields';
 import { HostDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution';
 import { reduceFields } from '../../../../../utils/build_query/reduce_fields';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts
index d6a1e1a8ac7ec..4ac9098274eae 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/authentications/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsKpiQueries,
   HostsKpiAuthenticationsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts
index c4714e81c6ec4..a06beae77daeb 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/hosts/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsKpiQueries,
   HostsKpiHostsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts
index 17eceea840029..47c4396c142f6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/kpi/unique_ips/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsKpiQueries,
   HostsKpiUniqueIpsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
index bab799620ad6e..80393447d62a8 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostFirstLastSeenStrategyResponse,
   HostsQueries,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts
index 33623c198913a..8775851bb7e7d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   HostOverviewRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
index 19ea4c3bc37d2..f46ee2b8f315d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   HostsOverviewStrategyResponse,
   HostsQueries,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts
index 9c284c4e442cd..cb78d0cdbfbc4 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildOverviewHostQuery as buildQuery } from './query.overview_host.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts
index 7a215a2e781fa..1e85fcd9786bb 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.overview_host.dsl.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
 import { HostOverviewRequestOptions } from '../../../../../../common/search_strategy/security_solution/hosts';
 
 export const buildOverviewHostQuery = ({
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts
index df68256b7be65..594108b72e06e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildQuery } from './query.dsl';
-import { mockOptions, expectedDsl } from '../__mocks__/';
+import { mockOptions, expectedDsl } from '../__mocks__';
 
 describe('buildQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts
index 79cd2973a309b..ae46adca25680 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import { HostsQueries } from '../../../../../../common/search_strategy/security_solution';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
index d41d2ca737f9a..6bd26d6ef8ed8 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { MatrixHistogramStrategyResponse } from '../../../../../../common/search_strategy';
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts
index 76204f0475aa8..19f6dc202824a 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/alerts/query.alerts_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildAlertsHistogramQuery } from './query.alerts_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildAlertsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts
index b8695bef294ed..80e5a64137ae6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/authentications/query.authentications_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildAuthenticationsHistogramQuery } from './query.authentications_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildAuthenticationsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts
index d671973f57572..024bbec987f9f 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/dns/query.dns_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildDnsHistogramQuery } from './query.dns_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildDnsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts
index 895184c9b7be2..6d52262c047d6 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/index.test.ts
@@ -8,7 +8,7 @@
 import { eventsMatrixHistogramConfig } from '.';
 import { buildEventsHistogramQuery } from './query.events_histogram.dsl';
 
-jest.mock('./query.events_histogram.dsl.ts', () => ({
+jest.mock('./query.events_histogram.dsl', () => ({
   buildEventsHistogramQuery: jest.fn(),
 }));
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts
index 1f73770f5fdb4..472b0eb23b0ee 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/events/query.events_histogram.dsl.test.ts
@@ -15,7 +15,7 @@ import {
   expectedThresholdGroupWithCardinalityDsl,
   expectedIpIncludingMissingDataDsl,
   expectedIpNotIncludingMissingDataDsl,
-} from './__mocks__/';
+} from './__mocks__';
 
 describe('buildEventsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts
index 06405fb74bc0f..0b0895beace5b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   FactoryQueryTypes,
   MatrixHistogramRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts
index 005bff5cd47da..e12142e21a156 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildPreviewHistogramQuery } from './query.preview_histogram.dsl';
-import { mockOptions, expectedDsl } from './__mocks__/';
+import { mockOptions, expectedDsl } from './__mocks__';
 
 describe('buildAlertsHistogramQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts
index 12452c7a79fbf..c121a0d7830a7 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   NetworkDetailsRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts
index c5689954942ec..22f207ef3ac17 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/details/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   NetworkDetailsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts
index ac5272b8d04fc..4eff4cb2efe61 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts
index 85f836463686b..78bce6f41f7a3 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/helpers.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkDnsBuckets,
   NetworkDnsEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts
index 87bcc9a1225e8..daa7787411ade 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/dns/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts
index 733b8584e77d4..6c4648728efac 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
index fb0217f0aebf8..377786b05198d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkHttpBuckets,
   NetworkHttpEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
index cada5212b812b..eaa9a39dc5dcd 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts
index 25dd078955203..f2952c1c4c2e7 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/dns/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiDnsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts
index 89773581f6515..e198a98735883 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/network_events/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiNetworkEventsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts
index 1f3c7280cd7c1..1eb3ca9e12581 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/tls_handshakes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiTlsHandshakesStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts
index 2581249d179f5..7c26be3260a00 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_flows/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiUniqueFlowsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts
index 9fa63eb939977..ae1d3b337af81 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/kpi/unique_private_ips/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkKpiQueries,
   NetworkKpiUniquePrivateIpsStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts
index ad2a6dd7cdf73..c2e433e12a379 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   NetworkOverviewRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts
index 473a192b72920..0909c3248689e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/index.ts
@@ -7,7 +7,7 @@
 
 import { get, getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkQueries,
   NetworkOverviewStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts
index d2b530c2b4a1e..c67b11ab42ece 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/overview/query.overview_network.dsl.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
 import { NetworkOverviewRequestOptions } from '../../../../../../common/search_strategy/security_solution/network';
 
 export const buildOverviewNetworkQuery = ({
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts
index 4e5c3f4074b94..1a27c980f8ea2 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
index cabaae2e54b70..50beaddec701b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkTlsBuckets,
   NetworkTlsEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
index 39029089a4306..9c1dd0a0f303b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts
index 79ff8a74c220f..3bed0bd26260d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts
index 9540da3eb65f7..4d86918171b59 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/helpers.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkTopCountriesBuckets,
   NetworkTopCountriesEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts
index ef114dcb6167d..72b608735e249 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_countries/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts
index 59150354613f0..31a6556a26b29 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts
index f504727812760..20a4696b0ba99 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/helpers.ts
@@ -7,8 +7,8 @@
 
 import { getOr } from 'lodash/fp';
 
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { assertUnreachable } from '../../../../../../common/utility_types';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import {
   Direction,
   GeoItem,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts
index 218c9361517ce..59a2ea962ba93 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/top_n_flow/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts
index d36d38564392b..dda794f657ae2 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import {
   Direction,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts
index 0e1286c8c2fc0..baf22028dae68 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, getOr } from 'lodash/fp';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   NetworkUsersBucketsItem,
   NetworkUsersEdges,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts
index 32778ba2bc665..ccbfb68757cd9 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/users/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts
index c1a1cd93dd618..53eef7121517b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/all/index.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { SecuritySolutionFactory } from '../../types';
 import {
   RiskScoreRequestOptions,
   RiskScoreStrategyResponse,
   RiskQueries,
 } from '../../../../../../common/search_strategy';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { buildRiskScoreQuery } from './query.risk_score.dsl';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts
index 088e16a5edbd5..c1b4a1f25e8de 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/risk_score/kpi/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import type {
   KpiRiskScoreRequestOptions,
   KpiRiskScoreStrategyResponse,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts
index 83a6096e51abf..51529bc21d801 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/types.ts
@@ -9,11 +9,8 @@ import type {
   IScopedClusterClient,
   KibanaRequest,
   SavedObjectsClientContract,
-} from '../../../../../../../src/core/server';
-import type {
-  IEsSearchResponse,
-  ISearchRequestParams,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/core/server';
+import type { IEsSearchResponse, ISearchRequestParams } from '@kbn/data-plugin/common';
 import type {
   FactoryQueryTypes,
   StrategyRequestType,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts
index 753a648d307e8..bc31f64fcc626 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Direction } from '../../../../../../../common/search_strategy';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 import { UsersRequestOptions } from '../../../../../../../common/search_strategy/security_solution/users/all';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
index 645a5350ca988..b8babe0b19845 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 
 import { inspectStringifyObject } from '../../../../../utils/build_query';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts
index 3a0e209044514..53bf75521e93f 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildUsersQuery } from './query.all_users.dsl';
-import { mockOptions } from './__mocks__/';
+import { mockOptions } from './__mocks__';
 
 describe('buildUsersQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts
index 850a590fdfe41..82df1d2d97246 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/query.all_users.dsl.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { Direction } from '../../../../../../common/search_strategy';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
 import { UsersRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/all';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts
index 6b57ff7fdb7cd..487f4537cd50d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   UserAuthenticationsRequestOptions,
   AuthenticationHit,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts
index df68256b7be65..594108b72e06e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/dsl/query.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildQuery } from './query.dsl';
-import { mockOptions, expectedDsl } from '../__mocks__/';
+import { mockOptions, expectedDsl } from '../__mocks__';
 
 describe('buildQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx
index e748023bfe76c..5bb62f685ce4b 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/authentications/index.tsx
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
 import {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
index b5eb1b7c3b6e8..33760eec4556e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 
 import { UserDetailsRequestOptions } from '../../../../../../../common/search_strategy/security_solution/users/details';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
index 1ab721cb19a93..26705965ea67e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { SecuritySolutionFactory } from '../../types';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
index c0dde76c77147..394890ad163e1 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { buildUserDetailsQuery } from './query.user_details.dsl';
-import { mockOptions } from './__mocks__/';
+import { mockOptions } from './__mocks__';
 
 describe('buildUserDetailsQuery', () => {
   test('build query from options correctly', () => {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
index 4b91391b698d4..463e27d09356c 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import { UserDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/details';
 import { buildFieldsTermAggregation } from '../../hosts/details/helpers';
 import { USER_FIELDS } from './helpers';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts
index 50e4cfe50bca2..d47a5d96870c1 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/kpi/total_users/index.ts
@@ -13,7 +13,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 import {
   TotalUsersKpiRequestOptions,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
index 7786962d86083..47b6b82c3792c 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
@@ -6,12 +6,9 @@
  */
 
 import { map, mergeMap } from 'rxjs/operators';
-import {
-  ISearchStrategy,
-  PluginStart,
-  shimHitsTotal,
-} from '../../../../../../src/plugins/data/server';
-import { ENHANCED_ES_SEARCH_STRATEGY } from '../../../../../../src/plugins/data/common';
+import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
+import { KibanaRequest } from '@kbn/core/server';
 import {
   FactoryQueryTypes,
   StrategyResponseType,
@@ -20,7 +17,6 @@ import {
 import { securitySolutionFactory } from './factory';
 import { SecuritySolutionFactory } from './factory/types';
 import { EndpointAppContext } from '../../endpoint/types';
-import { KibanaRequest } from '../../../../../../src/core/server';
 
 function isObj(req: unknown): req is Record<string, unknown> {
   return typeof req === 'object' && req !== null;
diff --git a/x-pack/plugins/security_solution/server/types.ts b/x-pack/plugins/security_solution/server/types.ts
index b231d530d8172..c0e496ba4e647 100644
--- a/x-pack/plugins/security_solution/server/types.ts
+++ b/x-pack/plugins/security_solution/server/types.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { ActionsApiRequestHandlerContext } from '../../actions/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { FleetRequestHandlerContext } from '../../fleet/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
-import type { ListsApiRequestHandlerContext, ExceptionListClient } from '../../lists/server';
-import type { IRuleDataService } from '../../rule_registry/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
+import type { ActionsApiRequestHandlerContext } from '@kbn/actions-plugin/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { FleetRequestHandlerContext } from '@kbn/fleet-plugin/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
+import type { ListsApiRequestHandlerContext, ExceptionListClient } from '@kbn/lists-plugin/server';
+import type { IRuleDataService } from '@kbn/rule-registry-plugin/server';
 
 import { AppClient } from './client';
 import { ConfigType } from './config';
diff --git a/x-pack/plugins/security_solution/server/ui_settings.ts b/x-pack/plugins/security_solution/server/ui_settings.ts
index 57b821249e10f..c35e8ea1bad4f 100644
--- a/x-pack/plugins/security_solution/server/ui_settings.ts
+++ b/x-pack/plugins/security_solution/server/ui_settings.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 
-import { CoreSetup, UiSettingsParams } from '../../../../src/core/server';
+import { CoreSetup, UiSettingsParams } from '@kbn/core/server';
 import {
   APP_ID,
   DEFAULT_ANOMALY_SCORE,
diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts
index 1169b04a868e6..eb5099cb7be33 100644
--- a/x-pack/plugins/security_solution/server/usage/collector.ts
+++ b/x-pack/plugins/security_solution/server/usage/collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server';
+import type { CollectorFetchContext } from '@kbn/usage-collection-plugin/server';
 import type { CollectorDependencies } from './types';
 import { getDetectionsMetrics } from './detections/get_metrics';
 import { getInternalSavedObjectsClient } from './get_internal_saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts
index a044c1a22e91e..4e782f914df70 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.test.ts
@@ -11,7 +11,7 @@ import {
   elasticsearchServiceMock,
   loggingSystemMock,
   savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 import { mlServicesMock } from '../../lib/machine_learning/mocks';
 import {
   getMockMlJobSummaryResponse,
diff --git a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts
index 2d44928026859..904c80debf5da 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/get_metrics.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'kibana/server';
-import type { MlPluginSetup } from '../../../../ml/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
+import type { MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { DetectionMetrics } from './types';
 
 import { getMlJobMetrics } from './ml_jobs/get_metrics';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts
index a507a76e0c4f2..0863ca6cef411 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResponse } from 'kibana/server';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 import type { RuleSearchResult } from '../../types';
 
 export const getMockListModulesResponse = () => [
diff --git a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts
index 2eea42f28d953..fc730f36b8a3c 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/ml_jobs/get_metrics.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaRequest, SavedObjectsClientContract, Logger } from 'kibana/server';
-import type { MlDatafeedStats, MlJob, MlPluginSetup } from '../../../../../ml/server';
+import type { KibanaRequest, SavedObjectsClientContract, Logger } from '@kbn/core/server';
+import type { MlDatafeedStats, MlJob, MlPluginSetup } from '@kbn/ml-plugin/server';
 import type { MlJobMetric, MlJobUsageMetric } from './types';
 
 import { isJobStarted } from '../../../../common/machine_learning/helpers';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts
index 8cedbeaec03d7..14663cad3787c 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts
@@ -6,9 +6,9 @@
  */
 
 import type { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import type { SavedObjectsFindResponse } from 'kibana/server';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
+import { CommentAttributes, CommentType } from '@kbn/cases-plugin/common/api/cases/comment';
 import type { AlertAggs, EventLogTypeStatusAggs } from '../../types';
-import { CommentAttributes, CommentType } from '../../../../../cases/common/api/cases/comment';
 import type { EventLogStatusMetric, SingleEventLogStatusMetric } from './types';
 
 export const getMockRuleAlertsResponse = (docCount: number): SearchResponse<never, AlertAggs> => ({
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts
index a6d653632a564..abd9c8b9391a2 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract, Logger } from '@kbn/core/server';
 import type { RuleAdoption } from './types';
 
 import { updateRuleUsage } from './update_usage';
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts
index d7ce790be0750..361b195a06bde 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_cases_map.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult } from 'kibana/server';
-import type { CommentAttributes } from '../../../../../../cases/common/api/cases/comment';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
+import type { CommentAttributes } from '@kbn/cases-plugin/common/api/cases/comment';
 
 export const getRuleIdToCasesMap = (
   cases: Array<SavedObjectsFindResult<CommentAttributes>>
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts
index b280d3a4ba17d..cffe536549e9c 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_id_to_enabled_map.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult } from 'kibana/server';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import type { LegacyIRuleActionsAttributesSavedObjectAttributes } from '../../../../lib/detection_engine/rule_actions/legacy_types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts
index 0c364efe73bd9..169cb502521df 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/rules/transform_utils/get_rule_object_correlations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindResult } from 'kibana/server';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
 import type { RuleMetric } from '../types';
 import type { RuleSearchResult } from '../../../types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts b/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts
index aea462ecf1fa6..85fe139aa36c9 100644
--- a/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/usage/get_internal_saved_objects_client.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { CoreSetup, SavedObjectsClientContract } from 'kibana/server';
+import type { CoreSetup, SavedObjectsClientContract } from '@kbn/core/server';
 
-import { SAVED_OBJECT_TYPES } from '../../../cases/common/constants';
+import { SAVED_OBJECT_TYPES } from '@kbn/cases-plugin/common/constants';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from '../lib/detection_engine/rule_actions/legacy_saved_object_mappings';
 
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts b/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
index 792ca28dcfba3..e80cd4aa88a85 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
@@ -10,7 +10,7 @@ import type {
   AggregationsCompositeAggregation,
   SearchRequest,
 } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ALERT_RULE_UUID } from '@kbn/rule-data-utils';
 import type { AlertBucket, AlertAggs } from '../types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts b/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
index 0a6c7f2fc209a..c39ad34f14b11 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
@@ -10,10 +10,10 @@ import type {
   SavedObjectsFindResult,
   Logger,
   SavedObjectsCreatePointInTimeFinderOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { CASE_COMMENT_SAVED_OBJECT } from '../../../../cases/common/constants';
-import type { CommentAttributes } from '../../../../cases/common/api/cases/comment';
+import { CASE_COMMENT_SAVED_OBJECT } from '@kbn/cases-plugin/common/constants';
+import type { CommentAttributes } from '@kbn/cases-plugin/common/api/cases/comment';
 
 export interface GetCasesOptions {
   savedObjectsClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts b/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
index 62f5691f73d07..36a81c074dc48 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsCreatePointInTimeFinderOptions,
   SavedObjectsClientContract,
   SavedObjectsFindResult,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import {
   SIGNALS_ID,
   EQL_RULE_TYPE_ID,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts b/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
index 4e6d982bf1d7d..6813ffd647819 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, SavedObjectsFindResult } from 'kibana/server';
+import type { ElasticsearchClient, Logger, SavedObjectsFindResult } from '@kbn/core/server';
 import {
   EQL_RULE_TYPE_ID,
   INDICATOR_RULE_TYPE_ID,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts b/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
index 6d720bef7d822..8a3eba441d269 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
@@ -10,7 +10,7 @@ import type {
   SavedObjectsFindResult,
   Logger,
   SavedObjectsCreatePointInTimeFinderOptions,
-} from 'kibana/server';
+} from '@kbn/core/server';
 // eslint-disable-next-line no-restricted-imports
 import type { LegacyIRuleActionsAttributesSavedObjectAttributes } from '../../lib/detection_engine/rule_actions/legacy_types';
 
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts
index 34dc545f9b8bf..c74765ded94f7 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/fetch_hits_with_pit.ts
@@ -11,7 +11,7 @@ import type {
   SortResults,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { SearchRequest } from '@elastic/elasticsearch/lib/api/types';
-import type { ElasticsearchClient, Logger } from 'kibana/server';
+import type { ElasticsearchClient, Logger } from '@kbn/core/server';
 
 export interface FetchWithPitOptions {
   esClient: ElasticsearchClient;
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts
index a1d57387bfb60..7c226fd01bd78 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/get_event_log_by_type_and_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type { EventLogStatusMetric } from '../../detections/rules/types';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { getInitialEventLogUsage } from '../../detections/rules/get_initial_usage';
 import {
   getAllEventLogTransform,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts
index d7299fdb375b2..76389247ffb26 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SingleEventLogStatusMetric } from '../../detections/rules/types';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   getElasticLogCustomRules,
   getEventLogAllRules,
diff --git a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts
index b9b2cba496dfd..461eb5c5e1f14 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/utils/transform_event_log_type_status.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Logger } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
 import type { EventLogTypeStatusAggs } from '../../types';
 import type { SingleEventLogStatusMetric } from '../../detections/rules/types';
 import { getInitialSingleEventLogUsage } from '../../detections/rules/get_initial_usage';
diff --git a/x-pack/plugins/security_solution/server/usage/types.ts b/x-pack/plugins/security_solution/server/usage/types.ts
index 9844d9721af75..fe7711196303c 100644
--- a/x-pack/plugins/security_solution/server/usage/types.ts
+++ b/x-pack/plugins/security_solution/server/usage/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
-import type { SanitizedRule } from '../../../alerting/common/';
+import type { CoreSetup, Logger } from '@kbn/core/server';
+import type { SanitizedRule } from '@kbn/alerting-plugin/common';
 import type { RuleParams } from '../lib/detection_engine/schemas/rule_schemas';
 import type { SetupPlugins } from '../plugin';
 
diff --git a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
index 0d5b7ecfa94f0..6d1dceb482332 100644
--- a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { RouteValidationResultFactory } from 'src/core/server';
+import { RouteValidationResultFactory } from '@kbn/core/server';
 
 import { buildRouteValidation, buildRouteValidationWithExcess } from './route_validation';
 
diff --git a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
index 72f6c114c1c39..41e079a381f50 100644
--- a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
@@ -13,7 +13,7 @@ import {
   RouteValidationFunction,
   RouteValidationResultFactory,
   RouteValidationError,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import { excess, GenericIntersectionC } from '../runtime_types';
 
 type RequestValidationResult<T> =
diff --git a/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts b/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts
index 1203c35a4dc61..c26c5f240354c 100644
--- a/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts
+++ b/x-pack/plugins/security_solution/server/utils/promise_pool.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { initPromisePool } from './promise_pool';
 
 const nextTick = () => new Promise((resolve) => setImmediate(resolve));
diff --git a/x-pack/plugins/security_solution/server/utils/promise_pool.ts b/x-pack/plugins/security_solution/server/utils/promise_pool.ts
index 766ba873fad53..45c1cc9e95013 100644
--- a/x-pack/plugins/security_solution/server/utils/promise_pool.ts
+++ b/x-pack/plugins/security_solution/server/utils/promise_pool.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbortError } from '../../../../../src/plugins/kibana_utils/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 
 interface PromisePoolArgs<Item, Result> {
   concurrency?: number;
diff --git a/x-pack/plugins/session_view/common/constants.ts b/x-pack/plugins/session_view/common/constants.ts
index ed0c21f89a8d6..0e1a7c16172f2 100644
--- a/x-pack/plugins/session_view/common/constants.ts
+++ b/x-pack/plugins/session_view/common/constants.ts
@@ -9,7 +9,7 @@ export const PROCESS_EVENTS_ROUTE = '/internal/session_view/process_events_route
 export const ALERTS_ROUTE = '/internal/session_view/alerts_route';
 export const ALERT_STATUS_ROUTE = '/internal/session_view/alert_status_route';
 export const SESSION_ENTRY_LEADERS_ROUTE = '/internal/session_view/session_entry_leaders_route';
-export const PROCESS_EVENTS_INDEX = 'logs-endpoint.events.process-default';
+export const PROCESS_EVENTS_INDEX = 'logs-endpoint.events.process-*';
 export const PREVIEW_ALERTS_INDEX = '.preview.alerts-security.alerts-default';
 export const ENTRY_SESSION_ENTITY_ID_PROPERTY = 'process.entry_leader.entity_id';
 export const ALERT_UUID_PROPERTY = 'kibana.alert.uuid';
@@ -41,11 +41,11 @@ export const PROCESS_EVENTS_PER_PAGE = 1000;
 // causes a session to only list and highlight up to 1000 alerts, even though there could
 // be far greater than this amount. UX should be added to let the end user know this is
 // happening and to revise their rule to be more specific.
-export const ALERTS_PER_PAGE = 1000;
+export const ALERTS_PER_PAGE = 501;
 
 // when showing the count of alerts in details panel tab, if the number
-// exceeds ALERT_COUNT_THRESHOLD we put a + next to it, e.g  999+
-export const ALERT_COUNT_THRESHOLD = 999;
+// exceeds ALERT_COUNT_THRESHOLD we put a + next to it, e.g  500+
+export const ALERT_COUNT_THRESHOLD = 500;
 
 // react-query caching keys
 export const QUERY_KEY_PROCESS_EVENTS = 'sessionViewProcessEvents';
diff --git a/x-pack/plugins/session_view/common/mocks/constants/session_view_process.mock.ts b/x-pack/plugins/session_view/common/mocks/constants/session_view_process.mock.ts
index 581134eae1782..6def7c7bcbd47 100644
--- a/x-pack/plugins/session_view/common/mocks/constants/session_view_process.mock.ts
+++ b/x-pack/plugins/session_view/common/mocks/constants/session_view_process.mock.ts
@@ -160,6 +160,7 @@ export const mockEvents: ProcessEvent[] = [
       action: EventAction.fork,
       category: 'process',
       kind: EventKind.event,
+      id: '1',
     },
     host: {
       architecture: 'x86_64',
@@ -317,6 +318,7 @@ export const mockEvents: ProcessEvent[] = [
       action: EventAction.exec,
       category: 'process',
       kind: EventKind.event,
+      id: '2',
     },
   },
   {
@@ -459,6 +461,7 @@ export const mockEvents: ProcessEvent[] = [
       action: EventAction.end,
       category: 'process',
       kind: EventKind.event,
+      id: '3',
     },
     host: {
       architecture: 'x86_64',
@@ -621,6 +624,7 @@ export const mockEvents: ProcessEvent[] = [
       action: EventAction.end,
       category: 'process',
       kind: EventKind.event,
+      id: '4',
     },
     host: {
       architecture: 'x86_64',
@@ -809,6 +813,7 @@ export const mockAlerts: ProcessEvent[] = [
       action: EventAction.exec,
       category: 'process',
       kind: EventKind.signal,
+      id: '5',
     },
     host: {
       architecture: 'x86_64',
@@ -995,6 +1000,7 @@ export const mockAlerts: ProcessEvent[] = [
       action: EventAction.end,
       category: 'process',
       kind: EventKind.signal,
+      id: '6',
     },
     host: {
       architecture: 'x86_64',
@@ -1264,6 +1270,7 @@ export const childProcessMock: Process = {
   getAlerts: () => [],
   updateAlertsStatus: (_) => undefined,
   hasExec: () => false,
+  isVerbose: () => true,
   getOutput: () => '',
   getDetails: () =>
     ({
@@ -1272,6 +1279,7 @@ export const childProcessMock: Process = {
         kind: EventKind.event,
         category: 'process',
         action: EventAction.exec,
+        id: '1',
       },
       host: {
         architecture: 'x86_64',
@@ -1326,6 +1334,7 @@ export const childProcessMock: Process = {
   isUserEntered: () => false,
   getMaxAlertLevel: () => null,
   getEndTime: () => '',
+  isDescendantOf: () => false,
 };
 
 export const processMock: Process = {
@@ -1346,6 +1355,7 @@ export const processMock: Process = {
   getAlerts: () => [],
   updateAlertsStatus: (_) => undefined,
   hasExec: () => false,
+  isVerbose: () => true,
   getOutput: () => '',
   getDetails: () =>
     ({
@@ -1354,6 +1364,7 @@ export const processMock: Process = {
         kind: EventKind.event,
         category: 'process',
         action: EventAction.exec,
+        id: '2',
       },
       host: {
         architecture: 'x86_64',
@@ -1390,6 +1401,14 @@ export const processMock: Process = {
         working_directory: '/home/vagrant',
         start: '2021-11-23T15:25:04.210Z',
         pid: 1,
+        user: {
+          id: '1000',
+          name: 'vagrant',
+        },
+        group: {
+          id: '1000',
+          name: 'vagrant',
+        },
         parent: {
           pid: 2442,
           user: {
@@ -1499,6 +1518,7 @@ export const processMock: Process = {
   isUserEntered: () => false,
   getMaxAlertLevel: () => null,
   getEndTime: () => '',
+  isDescendantOf: () => false,
 };
 
 export const sessionViewBasicProcessMock: Process = {
@@ -1544,7 +1564,9 @@ export const mockProcessMap = mockEvents.reduce(
       getDetails: () => event,
       isUserEntered: () => false,
       getMaxAlertLevel: () => null,
+      isVerbose: () => true,
       getEndTime: () => '',
+      isDescendantOf: () => false,
     };
     return processMap;
   },
diff --git a/x-pack/plugins/session_view/common/types/process_tree/index.ts b/x-pack/plugins/session_view/common/types/process_tree/index.ts
index c4cb85a81dd0c..11f5aeb2ffac2 100644
--- a/x-pack/plugins/session_view/common/types/process_tree/index.ts
+++ b/x-pack/plugins/session_view/common/types/process_tree/index.ts
@@ -140,6 +140,7 @@ export interface ProcessEvent {
     kind?: EventKind;
     category?: string;
     action?: EventAction;
+    id?: string;
   };
   user?: User;
   group?: Group;
@@ -178,7 +179,9 @@ export interface Process {
   isUserEntered(): boolean;
   getMaxAlertLevel(): number | null;
   getChildren(verboseMode: boolean): Process[];
+  isVerbose(): boolean;
   getEndTime(): string;
+  isDescendantOf(process: Process): boolean;
 }
 
 export type ProcessMap = {
diff --git a/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx b/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx
index a75977535a12f..9bee1aabefb85 100644
--- a/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/back_to_investigated_alert/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { BUTTON_TEST_ID, BackToInvestigatedAlert } from './index';
+import { BUTTON_TEST_ID, BackToInvestigatedAlert } from '.';
 
 describe('BackToInvestigatedAlert component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx
index 1adc34b230088..85ffc80ce0360 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_accordion/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelAccordion } from './index';
+import { DetailPanelAccordion } from '.';
 
 const TEST_ID = 'test';
 const TEST_LIST_ITEM = [
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx
index 09f107de0dd93..241a052fedd50 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_actions/index.test.tsx
@@ -12,7 +12,7 @@ import {
   BUTTON_TEST_ID,
   SHOW_DETAILS_TEST_ID,
   JUMP_TO_PROCESS_TEST_ID,
-} from './index';
+} from '.';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import userEvent from '@testing-library/user-event';
 import { ProcessEvent } from '../../../common/types/process_tree';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx
index c2f1e8d5a0494..a83e41d793e23 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_group_item/index.tsx
@@ -49,14 +49,18 @@ export const DetailPanelAlertGroupItem = ({
       arrowDisplay="right"
       initialIsOpen={false}
       buttonContent={
-        <EuiText data-test-subj={ALERT_GROUP_ITEM_TITLE_TEST_ID} css={styles.alertTitle} size="s">
-          <p>
+        <EuiText
+          data-test-subj={ALERT_GROUP_ITEM_TITLE_TEST_ID}
+          css={styles.alertTitleContainer}
+          size="s"
+        >
+          <p css={styles.alertTitle}>
             <EuiIcon color="danger" type="alert" css={styles.alertIcon} />
             {dataOrDash(rule?.name)}
           </p>
         </EuiText>
       }
-      css={styles.alertItem}
+      css={styles.alertGroupItem}
       extraAction={
         <EuiNotificationBadge
           data-test-subj={ALERT_GROUP_ITEM_COUNT_TEST_ID}
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx
index b85b3e809e356..1c6dd0a57b7e7 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/index.tsx
@@ -93,8 +93,8 @@ export const DetailPanelAlertListItem = ({
       data-test-subj={ALERT_LIST_ITEM_TEST_ID}
       arrowDisplay={isInvestigated ? 'right' : 'none'}
       buttonContent={
-        <EuiText css={styles.alertTitle} size="s">
-          <p>
+        <EuiText css={styles.alertTitleContainer} size="s">
+          <p css={styles.alertTitle}>
             <EuiIcon color="danger" type="alert" css={styles.alertIcon} />
             {dataOrDash(name)}
           </p>
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts
index 7672bb942ff32..403c6d3e2cacb 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_list_item/styles.ts
@@ -50,10 +50,21 @@ export const useStyles = (minimal = false, isInvestigated = false) => {
       }
     `;
 
-    const alertTitle: CSSObject = {
+    const alertGroupItem = css`
+      ${alertItem}
+
+      & .euiAccordion__childWrapper {
+        overflow: hidden;
+      }
+    `;
+
+    const alertTitleContainer: CSSObject = {
       display: minimal ? 'none' : 'initial',
       color: alertTitleColor,
       fontWeight: font.weight.semiBold,
+    };
+
+    const alertTitle: CSSObject = {
       textOverflow: 'ellipsis',
       overflow: 'hidden',
       whiteSpace: 'nowrap',
@@ -98,6 +109,8 @@ export const useStyles = (minimal = false, isInvestigated = false) => {
 
     return {
       alertItem,
+      alertGroupItem,
+      alertTitleContainer,
       alertTitle,
       alertIcon,
       alertAccordionButton,
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx
index 676757666af51..76f1cf41fb26a 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_alert_tab/index.test.tsx
@@ -8,24 +8,20 @@
 import React from 'react';
 
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelAlertTab } from './index';
+import { DetailPanelAlertTab } from '.';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import { fireEvent } from '@testing-library/dom';
-import {
-  INVESTIGATED_ALERT_TEST_ID,
-  VIEW_MODE_TOGGLE,
-  ALERTS_TAB_EMPTY_STATE_TEST_ID,
-} from './index';
+import { INVESTIGATED_ALERT_TEST_ID, VIEW_MODE_TOGGLE, ALERTS_TAB_EMPTY_STATE_TEST_ID } from '.';
 import {
   ALERT_LIST_ITEM_TEST_ID,
   ALERT_LIST_ITEM_ARGS_TEST_ID,
   ALERT_LIST_ITEM_TIMESTAMP_TEST_ID,
-} from '../detail_panel_alert_list_item/index';
+} from '../detail_panel_alert_list_item';
 import {
   ALERT_GROUP_ITEM_TEST_ID,
   ALERT_GROUP_ITEM_COUNT_TEST_ID,
   ALERT_GROUP_ITEM_TITLE_TEST_ID,
-} from '../detail_panel_alert_group_item/index';
+} from '../detail_panel_alert_group_item';
 
 const ACCORDION_BUTTON_CLASS = '.euiAccordion__button';
 const VIEW_MODE_GROUP = 'groupView';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx
index bb1dd243621bd..4d3c5e16e1bb7 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_copy/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelCopy } from './index';
+import { DetailPanelCopy } from '.';
 
 const TEST_TEXT_COPY = 'copy component test';
 const TEST_CHILD = <span>{TEST_TEXT_COPY}</span>;
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx
index aaf3086aabf5e..69d0d633f8f30 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_description_list/index.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelDescriptionList } from './index';
+import { DetailPanelDescriptionList } from '.';
 
 const TEST_FIRST_TITLE = 'item title';
 const TEST_FIRST_DESCRIPTION = 'item description';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx
index 2df9f47e5a416..17e9102fb8ed9 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_host_tab/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
 import { ProcessEventHost } from '../../../common/types/process_tree';
-import { DetailPanelHostTab } from './index';
+import { DetailPanelHostTab } from '.';
 
 const TEST_ARCHITECTURE = 'x86_64';
 const TEST_HOSTNAME = 'host-james-fleet-714-2';
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx
index e6572a097d85a..3cf7e93494747 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_list_item/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { DetailPanelListItem } from './index';
+import { DetailPanelListItem } from '.';
 
 const TEST_STRING = 'item title';
 const TEST_CHILD = <span>{TEST_STRING}</span>;
diff --git a/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx b/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx
index 0a514e178b4b5..7daaf997e2af8 100644
--- a/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/detail_panel_process_tab/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
 import { DetailPanelProcess, DetailPanelProcessLeader } from '../../types';
-import { DetailPanelProcessTab } from './index';
+import { DetailPanelProcessTab } from '.';
 
 const getLeaderDetail = (leader: string): DetailPanelProcessLeader => ({
   id: `${leader}-id`,
diff --git a/x-pack/plugins/session_view/public/components/process_tree/helpers.test.ts b/x-pack/plugins/session_view/public/components/process_tree/helpers.test.ts
index dcea2249ac198..9f7ce962dec3f 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/helpers.test.ts
+++ b/x-pack/plugins/session_view/public/components/process_tree/helpers.test.ts
@@ -61,7 +61,7 @@ describe('process tree hook helpers tests', () => {
   });
 
   it('searchProcessTree works', () => {
-    const searchResults = searchProcessTree(mockProcessMap, SEARCH_QUERY);
+    const searchResults = searchProcessTree(mockProcessMap, SEARCH_QUERY, true);
 
     // search returns the process with search query in its event args
     expect(searchResults[0].id).toBe(SEARCH_RESULT_PROCESS_ID);
@@ -76,7 +76,7 @@ describe('process tree hook helpers tests', () => {
     processMap[SESSION_ENTITY_ID].children = childProcesses;
 
     expect(processMap[SESSION_ENTITY_ID].autoExpand).toBeFalsy();
-    processMap = autoExpandProcessTree(processMap);
+    processMap = autoExpandProcessTree(processMap, SEARCH_RESULT_PROCESS_ID);
     // session leader should have autoExpand to be true
     expect(processMap[SESSION_ENTITY_ID].autoExpand).toBeTruthy();
   });
diff --git a/x-pack/plugins/session_view/public/components/process_tree/helpers.ts b/x-pack/plugins/session_view/public/components/process_tree/helpers.ts
index 2f383271f498d..ee2670dad47d2 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/helpers.ts
+++ b/x-pack/plugins/session_view/public/components/process_tree/helpers.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { sortProcesses } from '../../../common/utils/sort_processes';
 import {
   AlertStatusEventEntityIdMap,
   EventKind,
@@ -137,13 +138,25 @@ export const buildProcessTree = (
 // this funtion also returns a list of process results which is used by session_view_search_bar to drive
 // result navigation UX
 // FYI: this function mutates properties of models contained in processMap
-export const searchProcessTree = (processMap: ProcessMap, searchQuery: string | undefined) => {
+export const searchProcessTree = (
+  processMap: ProcessMap,
+  searchQuery: string | undefined,
+  verboseMode: boolean
+) => {
   const results = [];
 
   for (const processId of Object.keys(processMap)) {
     const process = processMap[processId];
 
     if (searchQuery) {
+      const details = process.getDetails();
+      const entryLeader = details?.process?.entry_leader;
+
+      // if this is the entry leader process OR verbose mode is OFF and is a verbose process, don't match.
+      if (entryLeader?.entity_id === process.id || (!verboseMode && process.isVerbose())) {
+        continue;
+      }
+
       const event = process.getDetails();
       const { working_directory: workingDirectory, args } = event.process || {};
 
@@ -162,19 +175,19 @@ export const searchProcessTree = (processMap: ProcessMap, searchQuery: string |
     }
   }
 
-  return results;
+  return results.sort(sortProcesses);
 };
 
 // Iterate over all processes in processMap, and mark each process (and it's ancestors) for auto expansion if:
 // a) the process was "user entered" (aka an interactive group leader)
-// b) matches the plain text search above
+// b) we are jumping to a specific process
 // Returns the processMap with it's processes autoExpand bool set to true or false
 // process.autoExpand is read by process_tree_node to determine whether to auto expand it's child processes.
 export const autoExpandProcessTree = (processMap: ProcessMap, jumpToEntityId?: string) => {
   for (const processId of Object.keys(processMap)) {
     const process = processMap[processId];
 
-    if (process.searchMatched || process.isUserEntered() || jumpToEntityId === process.id) {
+    if (process.isUserEntered() || jumpToEntityId === process.id || process.hasAlerts()) {
       let { parent } = process;
       const parentIdSet = new Set<string>();
 
diff --git a/x-pack/plugins/session_view/public/components/process_tree/hooks.ts b/x-pack/plugins/session_view/public/components/process_tree/hooks.ts
index 1725abdcdb5b9..7054bdade9546 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/hooks.ts
+++ b/x-pack/plugins/session_view/public/components/process_tree/hooks.ts
@@ -31,6 +31,7 @@ interface UseProcessTreeDeps {
   alerts: ProcessEvent[];
   searchQuery?: string;
   updatedAlertsStatus: AlertStatusEventEntityIdMap;
+  verboseMode: boolean;
   jumpToEntityId?: string;
 }
 
@@ -54,10 +55,16 @@ export class ProcessImpl implements Process {
     this.searchMatched = null;
   }
 
-  addEvent(event: ProcessEvent) {
+  addEvent(newEvent: ProcessEvent) {
     // rather than push new events on the array, we return a new one
     // this helps the below memoizeOne functions to behave correctly.
-    this.events = this.events.concat(event);
+    const exists = this.events.find((event) => {
+      return event.event?.id === newEvent.event?.id;
+    });
+
+    if (!exists) {
+      this.events = this.events.concat(newEvent);
+    }
   }
 
   addAlert(alert: ProcessEvent) {
@@ -66,7 +73,6 @@ export class ProcessImpl implements Process {
 
   clearSearch() {
     this.searchMatched = null;
-    this.autoExpand = false;
   }
 
   getChildren(verboseMode: boolean) {
@@ -74,28 +80,22 @@ export class ProcessImpl implements Process {
 
     // if there are orphans, we just render them inline with the other child processes (currently only session leader does this)
     if (this.orphans.length) {
-      children = [...children, ...this.orphans].sort(sortProcesses);
+      children = [...children, ...this.orphans];
     }
     // When verboseMode is false, we filter out noise via a few techniques.
     // This option is driven by the "verbose mode" toggle in SessionView/index.tsx
     if (!verboseMode) {
-      return children.filter((child) => {
+      children = children.filter((child) => {
         if (child.events.length === 0) {
           return false;
         }
 
-        const { group_leader: groupLeader, session_leader: sessionLeader } =
-          child.getDetails().process ?? {};
-
-        // search matches or processes with alerts will never be filtered out
-        if (child.autoExpand || child.searchMatched || child.hasAlerts()) {
+        // processes with alerts will never be filtered out
+        if (child.autoExpand || child.hasAlerts()) {
           return true;
         }
 
-        // Hide processes that have their session leader as their process group leader.
-        // This accounts for a lot of noise from bash and other shells forking, running auto completion processes and
-        // other shell startup activities (e.g bashrc .profile etc)
-        if (!groupLeader || !sessionLeader || groupLeader.pid === sessionLeader.pid) {
+        if (child.isVerbose()) {
           return false;
         }
 
@@ -103,7 +103,27 @@ export class ProcessImpl implements Process {
       });
     }
 
-    return children;
+    return children.sort(sortProcesses);
+  }
+
+  isVerbose() {
+    const {
+      group_leader: groupLeader,
+      session_leader: sessionLeader,
+      entry_leader: entryLeader,
+    } = this.getDetails().process ?? {};
+
+    // Processes that have their session leader as their process group leader are considered "verbose"
+    // This accounts for a lot of noise from bash and other shells forking, running auto completion processes and
+    // other shell startup activities (e.g bashrc .profile etc)
+    if (
+      this.id !== entryLeader?.entity_id &&
+      (!groupLeader || !sessionLeader || groupLeader.pid === sessionLeader.pid)
+    ) {
+      return true;
+    }
+
+    return false;
   }
 
   hasOutput() {
@@ -221,6 +241,20 @@ export class ProcessImpl implements Process {
     // If a process has an 'end' event will always be returned (since it is last and includes details like exit_code and end time)
     return filtered[filtered.length - 1] ?? {};
   });
+
+  isDescendantOf(process: Process) {
+    let parent = this.parent;
+
+    while (parent) {
+      if (parent === process) {
+        return true;
+      }
+
+      parent = parent.parent;
+    }
+
+    return false;
+  }
 }
 
 export const useProcessTree = ({
@@ -229,6 +263,7 @@ export const useProcessTree = ({
   alerts,
   searchQuery,
   updatedAlertsStatus,
+  verboseMode,
   jumpToEntityId,
 }: UseProcessTreeDeps) => {
   // initialize map, as well as a placeholder for session leader process
@@ -289,8 +324,9 @@ export const useProcessTree = ({
       setProcessMap({ ...updatedProcessMap });
       setProcessedPages([...processedPages, ...newProcessedPages]);
       setOrphans(newOrphans);
+      autoExpandProcessTree(updatedProcessMap, jumpToEntityId);
     }
-  }, [data, processMap, orphans, processedPages, sessionEntityId]);
+  }, [data, processMap, orphans, processedPages, sessionEntityId, jumpToEntityId]);
 
   useEffect(() => {
     // currently we are loading a single page of alerts, with no pagination
@@ -303,9 +339,8 @@ export const useProcessTree = ({
   }, [processMap, alerts, alertsProcessed]);
 
   useEffect(() => {
-    setSearchResults(searchProcessTree(processMap, searchQuery));
-    autoExpandProcessTree(processMap, jumpToEntityId);
-  }, [searchQuery, processMap, jumpToEntityId]);
+    setSearchResults(searchProcessTree(processMap, searchQuery, verboseMode));
+  }, [searchQuery, processMap, verboseMode]);
 
   // set new orphans array on the session leader
   const sessionLeader = processMap[sessionEntityId];
diff --git a/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx
index 4dfb00025f35a..bdc07b3850987 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree/index.test.tsx
@@ -14,15 +14,13 @@ import {
 } from '../../../common/mocks/constants/session_view_process.mock';
 import { Process } from '../../../common/types/process_tree';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessImpl } from './hooks';
-import { ProcessTreeDeps, ProcessTree } from './index';
+import { ProcessTreeDeps, ProcessTree } from '.';
 
 describe('ProcessTree component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
   let renderResult: ReturnType<typeof render>;
   let mockedContext: AppContextTestRender;
   const sessionLeader = mockData[0].events![0];
-  const sessionLeaderVerboseTest = mockData[0].events![3];
   const props: ProcessTreeDeps = {
     sessionEntityId: sessionLeader.process!.entity_id!,
     data: mockData,
@@ -104,50 +102,13 @@ describe('ProcessTree component', () => {
     });
 
     it('When Verbose mode is OFF, it should not show all childrens', () => {
-      renderResult = mockedContext.render(<ProcessTree {...props} verboseModeOn={false} />);
+      renderResult = mockedContext.render(<ProcessTree {...props} verboseMode={false} />);
       expect(renderResult.queryByText('cat')).toBeFalsy();
-
-      const selectionArea = renderResult.queryAllByTestId('sessionView:processTreeNode');
-      const result = selectionArea.map((a) => a?.getAttribute('data-id'));
-
-      expect(result.includes(sessionLeader.process!.entity_id!)).toBeTruthy();
-      expect(result.includes(sessionLeaderVerboseTest.process!.entity_id!)).toBeFalsy();
     });
 
     it('When Verbose mode is ON, it should show all childrens', () => {
-      renderResult = mockedContext.render(<ProcessTree {...props} verboseModeOn={true} />);
+      renderResult = mockedContext.render(<ProcessTree {...props} verboseMode={true} />);
       expect(renderResult.queryByText('cat')).toBeTruthy();
-
-      const selectionArea = renderResult.queryAllByTestId('sessionView:processTreeNode');
-      const result = selectionArea.map((a) => a?.getAttribute('data-id'));
-
-      expect(result.includes(sessionLeader.process!.entity_id!)).toBeTruthy();
-      expect(result.includes(sessionLeaderVerboseTest.process!.entity_id!)).toBeTruthy();
-    });
-
-    it('should insert a DOM element used to highlight a process when selectedProcess is set', () => {
-      const mockSelectedProcess = new ProcessImpl(mockData[0].events![0].process!.entity_id!);
-
-      renderResult = mockedContext.render(
-        <ProcessTree {...props} selectedProcess={mockSelectedProcess} />
-      );
-
-      expect(
-        renderResult
-          .queryByTestId('sessionView:processTreeSelectionArea')
-          ?.parentElement?.getAttribute('data-id')
-      ).toEqual(mockSelectedProcess.id);
-
-      // change the selected process
-      const mockSelectedProcess2 = new ProcessImpl(mockData[0].events![1].process!.entity_id!);
-
-      renderResult.rerender(<ProcessTree {...props} selectedProcess={mockSelectedProcess2} />);
-
-      expect(
-        renderResult
-          .queryByTestId('sessionView:processTreeSelectionArea')
-          ?.parentElement?.getAttribute('data-id')
-      ).toEqual(mockSelectedProcess2.id);
     });
   });
 });
diff --git a/x-pack/plugins/session_view/public/components/process_tree/index.tsx b/x-pack/plugins/session_view/public/components/process_tree/index.tsx
index 158e5b8faa24a..f2b5fef85002c 100644
--- a/x-pack/plugins/session_view/public/components/process_tree/index.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree/index.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useState, useRef, useEffect, useLayoutEffect, useCallback, useMemo } from 'react';
+import React, { useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { ProcessTreeNode } from '../process_tree_node';
 import { BackToInvestigatedAlert } from '../back_to_investigated_alert';
@@ -62,8 +62,8 @@ export interface ProcessTreeDeps {
   // a map for alerts with updated status and process.entity_id
   updatedAlertsStatus: AlertStatusEventEntityIdMap;
   onShowAlertDetails: (alertUuid: string) => void;
-  timeStampOn?: boolean;
-  verboseModeOn?: boolean;
+  showTimestamp?: boolean;
+  verboseMode?: boolean;
 }
 
 export const ProcessTree = ({
@@ -83,8 +83,8 @@ export const ProcessTree = ({
   setSearchResults,
   updatedAlertsStatus,
   onShowAlertDetails,
-  timeStampOn,
-  verboseModeOn,
+  showTimestamp = true,
+  verboseMode = false,
 }: ProcessTreeDeps) => {
   const [isInvestigatedEventVisible, setIsInvestigatedEventVisible] = useState<boolean>(true);
   const [isInvestigatedEventAbove, setIsInvestigatedEventAbove] = useState<boolean>(false);
@@ -96,6 +96,7 @@ export const ProcessTree = ({
     alerts,
     searchQuery,
     updatedAlertsStatus,
+    verboseMode,
     jumpToEntityId,
   });
 
@@ -109,7 +110,6 @@ export const ProcessTree = ({
   }, [data]);
 
   const scrollerRef = useRef<HTMLDivElement>(null);
-  const selectionAreaRef = useRef<HTMLDivElement>(null);
 
   const onChangeJumpToEventVisibility = useCallback(
     (isVisible: boolean, isAbove: boolean) => {
@@ -143,58 +143,6 @@ export const ProcessTree = ({
     },
   });
 
-  /**
-   * highlights a process in the tree
-   * we do it this way to avoid state changes on potentially thousands of <Process> components
-   */
-  const selectProcess = useCallback(
-    (process: Process) => {
-      if (!selectionAreaRef?.current || !scrollerRef?.current) {
-        return;
-      }
-
-      const selectionAreaEl = selectionAreaRef.current;
-      selectionAreaEl.style.display = 'block';
-
-      // TODO: concept of alert level unknown wrt to elastic security
-      const alertLevel = process.getMaxAlertLevel();
-
-      if (alertLevel && alertLevel >= 0) {
-        selectionAreaEl.style.backgroundColor =
-          alertLevel > 0 ? styles.alertSelected : styles.defaultSelected;
-      } else {
-        selectionAreaEl.style.backgroundColor = '';
-      }
-
-      // find the DOM element for the command which is selected by id
-      const processEl = scrollerRef.current.querySelector<HTMLElement>(`[data-id="${process.id}"]`);
-
-      if (processEl) {
-        processEl.prepend(selectionAreaEl);
-
-        const { height: elHeight, y: elTop } = processEl.getBoundingClientRect();
-        const { y: viewPortElTop, height: viewPortElHeight } =
-          scrollerRef.current.getBoundingClientRect();
-
-        const viewPortElBottom = viewPortElTop + viewPortElHeight;
-        const elBottom = elTop + elHeight;
-        const isVisible = elBottom >= viewPortElTop && elTop <= viewPortElBottom;
-
-        // jest will die when calling scrollIntoView (perhaps not part of the DOM it executes under)
-        if (!isVisible && processEl.scrollIntoView) {
-          processEl.scrollIntoView({ block: 'center' });
-        }
-      }
-    },
-    [styles.alertSelected, styles.defaultSelected]
-  );
-
-  useLayoutEffect(() => {
-    if (selectedProcess) {
-      selectProcess(selectedProcess);
-    }
-  }, [selectedProcess, selectProcess]);
-
   useEffect(() => {
     if (jumpToEntityId) {
       const process = processMap[jumpToEntityId];
@@ -206,14 +154,7 @@ export const ProcessTree = ({
     } else if (!selectedProcess) {
       onProcessSelected(sessionLeader);
     }
-  }, [
-    jumpToEntityId,
-    processMap,
-    onProcessSelected,
-    selectProcess,
-    selectedProcess,
-    sessionLeader,
-  ]);
+  }, [jumpToEntityId, processMap, onProcessSelected, selectedProcess, sessionLeader]);
 
   return (
     <>
@@ -229,12 +170,12 @@ export const ProcessTree = ({
             onProcessSelected={onProcessSelected}
             jumpToEntityId={jumpToEntityId}
             investigatedAlertId={investigatedAlertId}
-            selectedProcessId={selectedProcess?.id}
+            selectedProcess={selectedProcess}
             scrollerRef={scrollerRef}
             onChangeJumpToEventVisibility={onChangeJumpToEventVisibility}
             onShowAlertDetails={onShowAlertDetails}
-            timeStampOn={timeStampOn}
-            verboseModeOn={verboseModeOn}
+            showTimestamp={showTimestamp}
+            verboseMode={verboseMode}
             searchResults={searchResults}
             loadPreviousButton={
               hasPreviousPage ? (
@@ -260,11 +201,6 @@ export const ProcessTree = ({
             }
           />
         )}
-        <div
-          data-test-subj="sessionView:processTreeSelectionArea"
-          ref={selectionAreaRef}
-          css={styles.selectionArea}
-        />
       </div>
       {!isInvestigatedEventVisible && (
         <BackToInvestigatedAlert
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx
index f3b8fec23433c..d0c4ca5256809 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_alert/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessTreeAlertDeps, ProcessTreeAlert } from './index';
+import { ProcessTreeAlertDeps, ProcessTreeAlert } from '.';
 
 const mockAlert = mockAlerts[0];
 const TEST_ID = `sessionView:sessionViewAlertDetail-${mockAlert.kibana?.alert?.uuid}`;
diff --git a/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx
index 54b17bc49dc8e..b0ec485ab5662 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_alerts/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockAlerts } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessTreeAlertsDeps, ProcessTreeAlerts } from './index';
+import { ProcessTreeAlertsDeps, ProcessTreeAlerts } from '.';
 
 describe('ProcessTreeAlerts component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx b/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx
index 7a3e3f775d992..a5e0305595187 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_node/index.test.tsx
@@ -14,7 +14,7 @@ import {
   sessionViewAlertProcessMock,
 } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { ProcessDeps, ProcessTreeNode } from './index';
+import { ProcessDeps, ProcessTreeNode } from '.';
 import { Cancelable } from 'lodash';
 import { DEBOUNCE_TIMEOUT } from '../../../common/constants';
 
@@ -39,6 +39,8 @@ describe('ProcessTreeNode component', () => {
     } as unknown as RefObject<HTMLDivElement>,
     onChangeJumpToEventVisibility: jest.fn(),
     onShowAlertDetails: jest.fn(),
+    showTimestamp: true,
+    verboseMode: false,
   };
 
   beforeEach(() => {
@@ -123,6 +125,10 @@ describe('ProcessTreeNode component', () => {
           },
           process: {
             ...processMock.getDetails().process,
+            user: {
+              id: '-1',
+              name: 'root',
+            },
             parent: {
               ...processMock.getDetails().process!.parent,
               user: {
@@ -176,7 +182,7 @@ describe('ProcessTreeNode component', () => {
     it('When Timestamp is ON, it shows Timestamp', async () => {
       // set a mock where Timestamp is turned ON
       renderResult = mockedContext.render(
-        <ProcessTreeNode {...props} timeStampOn={true} process={processMock} />
+        <ProcessTreeNode {...props} showTimestamp={true} process={processMock} />
       );
 
       expect(renderResult.getByTestId('sessionView:processTreeNodeTimestamp')).toBeTruthy();
@@ -185,7 +191,7 @@ describe('ProcessTreeNode component', () => {
     it('When Timestamp is OFF, it doesnt show Timestamp', async () => {
       // set a mock where Timestamp is turned OFF
       renderResult = mockedContext.render(
-        <ProcessTreeNode {...props} timeStampOn={false} process={processMock} />
+        <ProcessTreeNode {...props} showTimestamp={false} process={processMock} />
       );
 
       expect(renderResult.queryByTestId('sessionView:processTreeNodeTimestamp')).toBeFalsy();
diff --git a/x-pack/plugins/session_view/public/components/process_tree_node/index.tsx b/x-pack/plugins/session_view/public/components/process_tree_node/index.tsx
index 208a0c6fbfd5b..d1b0fded615f6 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_node/index.tsx
+++ b/x-pack/plugins/session_view/public/components/process_tree_node/index.tsx
@@ -41,9 +41,9 @@ export interface ProcessDeps {
   onProcessSelected?: (process: Process) => void;
   jumpToEntityId?: string;
   investigatedAlertId?: string;
-  selectedProcessId?: string;
-  timeStampOn?: boolean;
-  verboseModeOn?: boolean;
+  selectedProcess?: Process | null;
+  showTimestamp: boolean;
+  verboseMode: boolean;
   searchResults?: Process[];
   scrollerRef: RefObject<HTMLDivElement>;
   onChangeJumpToEventVisibility: (isVisible: boolean, isAbove: boolean) => void;
@@ -62,9 +62,9 @@ export function ProcessTreeNode({
   onProcessSelected,
   jumpToEntityId,
   investigatedAlertId,
-  selectedProcessId,
-  timeStampOn = true,
-  verboseModeOn = true,
+  selectedProcess,
+  showTimestamp,
+  verboseMode,
   searchResults,
   scrollerRef,
   onChangeJumpToEventVisibility,
@@ -78,9 +78,18 @@ export function ProcessTreeNode({
   const [alertsExpanded, setAlertsExpanded] = useState(false);
   const { searchMatched } = process;
 
+  // forces nodes to expand if the selected process is a descendant
   useEffect(() => {
-    setChildrenExpanded(isSessionLeader || process.autoExpand);
-  }, [isSessionLeader, process.autoExpand]);
+    if (!childrenExpanded && selectedProcess) {
+      if (selectedProcess.isDescendantOf(process)) {
+        setChildrenExpanded(true);
+      }
+    }
+  }, [selectedProcess, process, childrenExpanded]);
+
+  useEffect(() => {
+    setChildrenExpanded(process.autoExpand);
+  }, [process.autoExpand]);
 
   const alerts = process.getAlerts();
   const hasAlerts = useMemo(() => !!alerts.length, [alerts]);
@@ -94,7 +103,7 @@ export function ProcessTreeNode({
       ),
     [hasAlerts, alerts, investigatedAlertId]
   );
-  const isSelected = selectedProcessId === process.id;
+  const isSelected = selectedProcess?.id === process.id;
   const styles = useStyles({ depth, hasAlerts, hasInvestigatedAlert, isSelected });
   const buttonStyles = useButtonStyles({});
 
@@ -109,6 +118,12 @@ export function ProcessTreeNode({
     shouldAddListener: hasInvestigatedAlert,
   });
 
+  useEffect(() => {
+    if (process.id === selectedProcess?.id && nodeRef.current?.scrollIntoView) {
+      nodeRef.current.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    }
+  }, [selectedProcess, process, nodeRef]);
+
   // Automatically expand alerts list when investigating an alert
   useEffect(() => {
     if (hasInvestigatedAlert) {
@@ -194,15 +209,14 @@ export function ProcessTreeNode({
       // hidden processes.
     }
 
-    return process.getChildren(verboseModeOn);
-  }, [process, verboseModeOn, searchResults]);
+    return process.getChildren(verboseMode);
+  }, [process, verboseMode, searchResults]);
 
   if (!processDetails?.process) {
     return null;
   }
 
   const id = process.id;
-  const { user } = processDetails;
   const {
     args,
     name,
@@ -210,12 +224,13 @@ export function ProcessTreeNode({
     parent,
     working_directory: workingDirectory,
     start,
+    user,
   } = processDetails.process;
 
   const shouldRenderChildren = childrenExpanded && children?.length > 0;
   const childrenTreeDepth = depth + 1;
 
-  const showUserEscalation = !isSessionLeader && !!user?.id && user.id !== parent?.user?.id;
+  const showUserEscalation = !isSessionLeader && !!user?.name && user.name !== parent?.user?.name;
   const interactiveSession = !!tty;
   const sessionIcon = interactiveSession ? 'desktop' : 'gear';
   const iconTestSubj = hasExec
@@ -248,7 +263,7 @@ export function ProcessTreeNode({
             </>
           ) : (
             <span>
-              {timeStampOn && (
+              {showTimestamp && (
                 <span data-test-subj="sessionView:processTreeNodeTimestamp" css={styles.timeStamp}>
                   {timeStampsNormal}
                 </span>
@@ -273,7 +288,7 @@ export function ProcessTreeNode({
                 id="xpack.sessionView.execUserChange"
                 defaultMessage="Exec user change: "
               />
-              <span css={buttonStyles.userChangedButtonUsername}>{user.name}</span>
+              <span>{user.name}</span>
             </EuiButton>
           )}
           {!isSessionLeader && children.length > 0 && (
@@ -293,7 +308,7 @@ export function ProcessTreeNode({
         <ProcessTreeAlerts
           alerts={alerts}
           investigatedAlertId={investigatedAlertId}
-          isProcessSelected={selectedProcessId === process.id}
+          isProcessSelected={selectedProcess?.id === process.id}
           onAlertSelected={onProcessClicked}
           onShowAlertDetails={onShowAlertDetails}
         />
@@ -311,9 +326,9 @@ export function ProcessTreeNode({
                 onProcessSelected={onProcessSelected}
                 jumpToEntityId={jumpToEntityId}
                 investigatedAlertId={investigatedAlertId}
-                selectedProcessId={selectedProcessId}
-                timeStampOn={timeStampOn}
-                verboseModeOn={verboseModeOn}
+                selectedProcess={selectedProcess}
+                showTimestamp={showTimestamp}
+                verboseMode={verboseMode}
                 searchResults={searchResults}
                 scrollerRef={scrollerRef}
                 onChangeJumpToEventVisibility={onChangeJumpToEventVisibility}
diff --git a/x-pack/plugins/session_view/public/components/process_tree_node/styles.ts b/x-pack/plugins/session_view/public/components/process_tree_node/styles.ts
index cd514c2087bdc..6503f373240ad 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_node/styles.ts
+++ b/x-pack/plugins/session_view/public/components/process_tree_node/styles.ts
@@ -53,12 +53,13 @@ export const useStyles = ({ depth, hasAlerts, hasInvestigatedAlert, isSelected }
         borderColor = colors.danger;
       }
 
-      if (hasInvestigatedAlert) {
-        bgColor = transparentize(colors.danger, 0.04);
-      }
-
       if (isSelected) {
         searchResColor = colors.warning;
+        bgColor = `${transparentize(colors.primary, 0.1)}!important`;
+      }
+
+      if (hasInvestigatedAlert) {
+        bgColor = `${transparentize(colors.danger, 0.04)}!important`;
       }
 
       return { bgColor, borderColor, hoverColor, searchResColor };
diff --git a/x-pack/plugins/session_view/public/components/process_tree_node/use_button_styles.ts b/x-pack/plugins/session_view/public/components/process_tree_node/use_button_styles.ts
index 4c713b42a2d7b..67883b12e2bba 100644
--- a/x-pack/plugins/session_view/public/components/process_tree_node/use_button_styles.ts
+++ b/x-pack/plugins/session_view/public/components/process_tree_node/use_button_styles.ts
@@ -75,10 +75,6 @@ export const useButtonStyles = ({ isExpanded }: ButtonStylesDeps) => {
       border: `${border.width.thin} solid ${transparentize(theme.euiColorVis3, 0.48)}`,
     };
 
-    const userChangedButtonUsername: CSSObject = {
-      textTransform: 'capitalize',
-    };
-
     const buttonSize: CSSObject = {
       padding: `0px ${euiTheme.size.xs}`,
     };
@@ -91,7 +87,6 @@ export const useButtonStyles = ({ isExpanded }: ButtonStylesDeps) => {
       alertButton,
       alertsCountNumber,
       userChangedButton,
-      userChangedButtonUsername,
       buttonSize,
       expandedIcon,
     };
diff --git a/x-pack/plugins/session_view/public/components/session_view/hooks.ts b/x-pack/plugins/session_view/public/components/session_view/hooks.ts
index 29beb6368c125..3beb664153e0c 100644
--- a/x-pack/plugins/session_view/public/components/session_view/hooks.ts
+++ b/x-pack/plugins/session_view/public/components/session_view/hooks.ts
@@ -7,8 +7,8 @@
 import { useEffect, useState, useMemo } from 'react';
 import { useQuery, useInfiniteQuery } from 'react-query';
 import { EuiSearchBarOnChangeArgs } from '@elastic/eui';
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   AlertStatusEventEntityIdMap,
   ProcessEvent,
diff --git a/x-pack/plugins/session_view/public/components/session_view/index.test.tsx b/x-pack/plugins/session_view/public/components/session_view/index.test.tsx
index e75c09e393911..262de5aba210e 100644
--- a/x-pack/plugins/session_view/public/components/session_view/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view/index.test.tsx
@@ -9,7 +9,7 @@ import { waitFor, waitForElementToBeRemoved } from '@testing-library/react';
 import React from 'react';
 import { sessionViewProcessEventsMock } from '../../../common/mocks/responses/session_view_process_events.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { SessionView } from './index';
+import { SessionView } from '.';
 import userEvent from '@testing-library/user-event';
 
 describe('SessionView component', () => {
@@ -84,10 +84,6 @@ describe('SessionView component', () => {
         await waitForApiCall();
 
         expect(renderResult.getAllByTestId('sessionView:processTreeNode')).toBeTruthy();
-
-        const selectionArea = renderResult.queryByTestId('sessionView:processTreeSelectionArea');
-
-        expect(selectionArea?.parentElement?.getAttribute('data-id')).toEqual('test-entity-id');
       });
 
       it('should toggle detail panel visibilty when detail button clicked', async () => {
diff --git a/x-pack/plugins/session_view/public/components/session_view/index.tsx b/x-pack/plugins/session_view/public/components/session_view/index.tsx
index 1e41878814697..fee4a67c746fc 100644
--- a/x-pack/plugins/session_view/public/components/session_view/index.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view/index.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useState, useCallback, useEffect } from 'react';
+import React, { useState, useCallback, useEffect, useMemo } from 'react';
 import {
   EuiEmptyPrompt,
   EuiButton,
@@ -72,6 +72,11 @@ export const SessionView = ({
 
   const styles = useStyles({ height, isFullScreen });
 
+  // to give an indication to the user that there may be more search results if they turn on verbose mode.
+  const showVerboseSearchTooltip = useMemo(() => {
+    return !!(!displayOptions?.verboseMode && searchQuery && searchResults?.length === 0);
+  }, [displayOptions?.verboseMode, searchResults, searchQuery]);
+
   const onProcessSelected = useCallback((process: Process | null) => {
     setSelectedProcess(process);
   }, []);
@@ -194,6 +199,7 @@ export const SessionView = ({
               <SessionViewDisplayOptions
                 displayOptions={displayOptions!}
                 onChange={handleOptionChange}
+                showVerboseSearchTooltip={showVerboseSearchTooltip}
               />
             </EuiFlexItem>
 
@@ -273,8 +279,8 @@ export const SessionView = ({
                       setSearchResults={setSearchResults}
                       updatedAlertsStatus={updatedAlertsStatus}
                       onShowAlertDetails={onShowAlertDetails}
-                      timeStampOn={displayOptions?.timestamp}
-                      verboseModeOn={displayOptions?.verboseMode}
+                      showTimestamp={displayOptions?.timestamp}
+                      verboseMode={displayOptions?.verboseMode}
                     />
                   </div>
                 )}
diff --git a/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx b/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx
index 75d04cbf6833b..f2d7249e43c90 100644
--- a/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.test.tsx
@@ -11,7 +11,7 @@ import {
   sessionViewBasicProcessMock,
 } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { SessionViewDetailPanel } from './index';
+import { SessionViewDetailPanel } from '.';
 
 describe('SessionView component', () => {
   let render: () => ReturnType<AppContextTestRender['render']>;
diff --git a/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts b/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts
index a0a1946942941..1d1625fc1cdbd 100644
--- a/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts
+++ b/x-pack/plugins/session_view/public/components/session_view_detail_panel/styles.ts
@@ -12,11 +12,11 @@ import { CSSObject } from '@emotion/react';
 export const useStyles = () => {
   const { euiTheme } = useEuiTheme();
   const cached = useMemo(() => {
-    const { border, colors } = euiTheme;
+    const { border } = euiTheme;
 
     const detailsPanel: CSSObject = {
       borderLeft: border.thin,
-      backgroundColor: colors.emptyShade,
+      height: '100%',
     };
 
     return {
diff --git a/x-pack/plugins/session_view/public/components/session_view_display_options/index.tsx b/x-pack/plugins/session_view/public/components/session_view_display_options/index.tsx
index 7970a3b523e8b..ab381ca757f9f 100644
--- a/x-pack/plugins/session_view/public/components/session_view_display_options/index.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view_display_options/index.tsx
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useEffect, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import {
+  EuiToolTip,
   EuiPopover,
   EuiSelectable,
   EuiPopoverTitle,
@@ -22,17 +23,50 @@ import { useStyles } from './styles';
 
 const TIMESTAMP_OPTION_KEY = 'Timestamp';
 const VERBOSE_MODE_OPTION_KEY = 'Verbose mode';
+const TOOLTIP_SHOW_DELAY = 3000;
+const TOOLTIP_HIDE_DELAY = 5000;
+
+const VERBOSE_TOOLTIP_TITLE = i18n.translate(
+  'xpack.sessionView.sessionViewToggle.sessionViewVerboseTipTitle',
+  {
+    defaultMessage: 'Some results may be hidden',
+  }
+);
+
+const VERBOSE_TOOLTIP_CONTENT = i18n.translate(
+  'xpack.sessionView.sessionViewToggle.sessionViewVerboseTipContent',
+  {
+    defaultMessage: 'For a complete set of results, turn on Verbose mode.',
+  }
+);
 
 export const SessionViewDisplayOptions = ({
   onChange,
   displayOptions,
+  showVerboseSearchTooltip,
 }: {
   onChange: (vars: DisplayOptionsState) => void;
   displayOptions: DisplayOptionsState;
+  showVerboseSearchTooltip: boolean;
 }) => {
   const [isOptionDropdownOpen, setOptionDropdownOpen] = useState(false);
-
   const styles = useStyles();
+  const tooltipRef = useRef(null);
+
+  useEffect(() => {
+    if (tooltipRef.current) {
+      setTimeout(() => {
+        if (tooltipRef.current) {
+          (tooltipRef.current as EuiToolTip).onFocus();
+          setTimeout(() => {
+            if (tooltipRef.current) {
+              (tooltipRef.current as EuiToolTip).onBlur();
+            }
+          }, TOOLTIP_HIDE_DELAY);
+        }
+      }, TOOLTIP_SHOW_DELAY);
+    }
+  }, [showVerboseSearchTooltip]);
 
   const optionsList: EuiSelectableOption[] = useMemo(
     () => [
@@ -106,27 +140,38 @@ export const SessionViewDisplayOptions = ({
     onChange(updateOptionState);
   };
 
-  return (
-    <>
-      <EuiPopover
-        button={OptionButton}
-        isOpen={isOptionDropdownOpen}
-        closePopover={closeOptionButton}
-      >
-        <EuiSelectable options={optionsList} onChange={handleSelect}>
-          {(list) => (
-            <div css={styles.selectable}>
-              <EuiPopoverTitle>
-                <FormattedMessage
-                  defaultMessage="Display options"
-                  id="xpack.sessionView.sessionViewToggle.sessionViewToggleTitle"
-                />
-              </EuiPopoverTitle>
-              {list}
-            </div>
-          )}
-        </EuiSelectable>
-      </EuiPopover>
-    </>
+  const popOver = (
+    <EuiPopover
+      button={OptionButton}
+      isOpen={isOptionDropdownOpen}
+      closePopover={closeOptionButton}
+    >
+      <EuiSelectable options={optionsList} onChange={handleSelect}>
+        {(list) => (
+          <div css={styles.selectable}>
+            <EuiPopoverTitle>
+              <FormattedMessage
+                defaultMessage="Display options"
+                id="xpack.sessionView.sessionViewToggle.sessionViewToggleTitle"
+              />
+            </EuiPopoverTitle>
+            {list}
+          </div>
+        )}
+      </EuiSelectable>
+    </EuiPopover>
+  );
+
+  return !isOptionDropdownOpen && showVerboseSearchTooltip ? (
+    <EuiToolTip
+      ref={tooltipRef}
+      position="bottom"
+      title={VERBOSE_TOOLTIP_TITLE}
+      content={VERBOSE_TOOLTIP_CONTENT}
+    >
+      {popOver}
+    </EuiToolTip>
+  ) : (
+    popOver
   );
 };
diff --git a/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx b/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx
index b27260668af07..67347f2138f0a 100644
--- a/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view_search_bar/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { processMock } from '../../../common/mocks/constants/session_view_process.mock';
 import { AppContextTestRender, createAppRootMockRenderer } from '../../test';
-import { SessionViewSearchBar } from './index';
+import { SessionViewSearchBar } from '.';
 import userEvent from '@testing-library/user-event';
 import { fireEvent } from '@testing-library/dom';
 
diff --git a/x-pack/plugins/session_view/public/components/session_view_search_bar/index.tsx b/x-pack/plugins/session_view/public/components/session_view_search_bar/index.tsx
index 05154fca40769..9c24f6b94199c 100644
--- a/x-pack/plugins/session_view/public/components/session_view_search_bar/index.tsx
+++ b/x-pack/plugins/session_view/public/components/session_view_search_bar/index.tsx
@@ -24,6 +24,10 @@ const translatePlaceholder = {
   }),
 };
 
+const NO_RESULTS = i18n.translate('xpack.sessionView.searchBar.searchBarNoResults', {
+  defaultMessage: 'No results',
+});
+
 /**
  * The main wrapper component for the session view.
  */
@@ -33,7 +37,8 @@ export const SessionViewSearchBar = ({
   onProcessSelected,
   searchResults,
 }: SessionViewSearchBarDeps) => {
-  const showPagination = !!searchResults?.length;
+  const showPagination = !!searchQuery && searchResults?.length !== 0;
+  const noResults = !!searchQuery && searchResults?.length === 0;
 
   const styles = useStyles({ hasSearchResults: showPagination });
 
@@ -62,11 +67,12 @@ export const SessionViewSearchBar = ({
   return (
     <div data-test-subj="sessionView:searchInput" css={styles.searchBarWithResult}>
       <EuiSearchBar query={searchQuery} onChange={onSearch} box={translatePlaceholder} />
+      {noResults && <span css={styles.noResults}>{NO_RESULTS}</span>}
       {showPagination && (
         <EuiPagination
           data-test-subj="sessionView:searchPagination"
           css={styles.pagination}
-          pageCount={searchResults.length}
+          pageCount={searchResults?.length}
           activePage={selectedResult}
           onPageClick={setSelectedResult}
           compressed
diff --git a/x-pack/plugins/session_view/public/components/session_view_search_bar/styles.ts b/x-pack/plugins/session_view/public/components/session_view_search_bar/styles.ts
index 43131a1f5e1cf..ebb1b8f7b340b 100644
--- a/x-pack/plugins/session_view/public/components/session_view_search_bar/styles.ts
+++ b/x-pack/plugins/session_view/public/components/session_view_search_bar/styles.ts
@@ -21,6 +21,19 @@ export const useStyles = ({ hasSearchResults }: StylesDeps) => {
       position: 'absolute',
       top: euiTheme.size.s,
       right: euiTheme.size.xxl,
+      'button[data-test-subj="pagination-button-last"]': {
+        display: 'none',
+      },
+      'button[data-test-subj="pagination-button-first"]': {
+        display: 'none',
+      },
+    };
+
+    const noResults: CSSObject = {
+      position: 'absolute',
+      color: euiTheme.colors.subdued,
+      top: euiTheme.size.m,
+      right: euiTheme.size.xxl,
     };
 
     const searchBarWithResult: CSSObject = {
@@ -33,6 +46,7 @@ export const useStyles = ({ hasSearchResults }: StylesDeps) => {
     return {
       pagination,
       searchBarWithResult,
+      noResults,
     };
   }, [euiTheme, hasSearchResults]);
 
diff --git a/x-pack/plugins/session_view/public/plugin.ts b/x-pack/plugins/session_view/public/plugin.ts
index d51d1bc0e6c67..988068ccda729 100644
--- a/x-pack/plugins/session_view/public/plugin.ts
+++ b/x-pack/plugins/session_view/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from '../../../../src/core/public';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import { SessionViewServices, SessionViewDeps } from './types';
 import { getSessionViewLazy } from './methods';
 
diff --git a/x-pack/plugins/session_view/public/shared_imports.ts b/x-pack/plugins/session_view/public/shared_imports.ts
index 0a087e1ac36ae..db6e521678ead 100644
--- a/x-pack/plugins/session_view/public/shared_imports.ts
+++ b/x-pack/plugins/session_view/public/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { SectionLoading } from '../../../../src/plugins/es_ui_shared/public';
+export { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
diff --git a/x-pack/plugins/session_view/public/test/index.tsx b/x-pack/plugins/session_view/public/test/index.tsx
index e7a990000b018..6174925b6003c 100644
--- a/x-pack/plugins/session_view/public/test/index.tsx
+++ b/x-pack/plugins/session_view/public/test/index.tsx
@@ -13,10 +13,10 @@ import { Router } from 'react-router-dom';
 import { History } from 'history';
 import useObservable from 'react-use/lib/useObservable';
 import { I18nProvider } from '@kbn/i18n-react';
-import { CoreStart } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { EuiThemeProvider } from 'src/plugins/kibana_react/common';
+import { CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 
 type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
diff --git a/x-pack/plugins/session_view/public/types.ts b/x-pack/plugins/session_view/public/types.ts
index 1dcfe4f47c069..8e5b9a7ed83f2 100644
--- a/x-pack/plugins/session_view/public/types.ts
+++ b/x-pack/plugins/session_view/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ReactNode } from 'react';
-import { CoreStart } from '../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 import { Teletype } from '../common/types/process_tree';
 
 export type SessionViewServices = CoreStart;
diff --git a/x-pack/plugins/session_view/server/index.ts b/x-pack/plugins/session_view/server/index.ts
index a86684094dfd7..cd524ea86cde2 100644
--- a/x-pack/plugins/session_view/server/index.ts
+++ b/x-pack/plugins/session_view/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SessionViewPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/session_view/server/plugin.ts b/x-pack/plugins/session_view/server/plugin.ts
index 7347f7676af62..b5847fb9072d5 100644
--- a/x-pack/plugins/session_view/server/plugin.ts
+++ b/x-pack/plugins/session_view/server/plugin.ts
@@ -12,7 +12,7 @@ import {
   Logger,
   PluginInitializerContext,
   IRouter,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 import { SessionViewSetupPlugins, SessionViewStartPlugins } from './types';
 import { registerRoutes } from './routes';
 
diff --git a/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts b/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts
index f546500d803b0..1c91af3ee0ab4 100644
--- a/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts
+++ b/x-pack/plugins/session_view/server/routes/alert_status_route.test.ts
@@ -10,19 +10,19 @@ import {
   SPACE_IDS,
   ALERT_WORKFLOW_STATUS,
 } from '@kbn/rule-data-utils';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { searchAlertByUuid } from './alert_status_route';
 import { mockAlerts } from '../../common/mocks/constants/session_view_process.mock';
 
 import {
   AlertsClient,
   ConstructorOptions,
-} from '../../../rule_registry/server/alert_data_client/alerts_client';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../alerting/server';
-import { ruleDataServiceMock } from '../../../rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock';
+} from '@kbn/rule-registry-plugin/server/alert_data_client/alerts_client';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
+import { ruleDataServiceMock } from '@kbn/rule-registry-plugin/server/rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const auditLogger = auditLoggerMock.create();
diff --git a/x-pack/plugins/session_view/server/routes/alert_status_route.ts b/x-pack/plugins/session_view/server/routes/alert_status_route.ts
index c3708d386ec1b..f8d75b355664d 100644
--- a/x-pack/plugins/session_view/server/routes/alert_status_route.ts
+++ b/x-pack/plugins/session_view/server/routes/alert_status_route.ts
@@ -5,14 +5,17 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
+import type {
+  AlertsClient,
+  RuleRegistryPluginStartContract,
+} from '@kbn/rule-registry-plugin/server';
 import {
   ALERT_STATUS_ROUTE,
   ALERT_UUID_PROPERTY,
   PREVIEW_ALERTS_INDEX,
 } from '../../common/constants';
 import { expandDottedObject } from '../../common/utils/expand_dotted_object';
-import type { AlertsClient, RuleRegistryPluginStartContract } from '../../../rule_registry/server';
 
 export const registerAlertStatusRoute = (
   router: IRouter,
diff --git a/x-pack/plugins/session_view/server/routes/alerts_route.test.ts b/x-pack/plugins/session_view/server/routes/alerts_route.test.ts
index 4c8ee6fb2c83e..d3b50b366362e 100644
--- a/x-pack/plugins/session_view/server/routes/alerts_route.test.ts
+++ b/x-pack/plugins/session_view/server/routes/alerts_route.test.ts
@@ -10,19 +10,19 @@ import {
   SPACE_IDS,
   ALERT_WORKFLOW_STATUS,
 } from '@kbn/rule-data-utils';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { doSearch } from './alerts_route';
 import { mockEvents } from '../../common/mocks/constants/session_view_process.mock';
 
 import {
   AlertsClient,
   ConstructorOptions,
-} from '../../../rule_registry/server/alert_data_client/alerts_client';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { alertingAuthorizationMock } from '../../../alerting/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '../../../security/server/audit/mocks';
-import { AlertingAuthorizationEntity } from '../../../alerting/server';
-import { ruleDataServiceMock } from '../../../rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock';
+} from '@kbn/rule-registry-plugin/server/alert_data_client/alerts_client';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
+import { ruleDataServiceMock } from '@kbn/rule-registry-plugin/server/rule_data_plugin_service/rule_data_plugin_service.mock';
 
 const alertingAuthMock = alertingAuthorizationMock.create();
 const auditLogger = auditLoggerMock.create();
diff --git a/x-pack/plugins/session_view/server/routes/alerts_route.ts b/x-pack/plugins/session_view/server/routes/alerts_route.ts
index 97b72706f5898..f2b1c3b7c809d 100644
--- a/x-pack/plugins/session_view/server/routes/alerts_route.ts
+++ b/x-pack/plugins/session_view/server/routes/alerts_route.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
+import type {
+  AlertsClient,
+  RuleRegistryPluginStartContract,
+} from '@kbn/rule-registry-plugin/server';
 import {
   ALERTS_ROUTE,
   ALERTS_PER_PAGE,
@@ -13,7 +17,6 @@ import {
   PREVIEW_ALERTS_INDEX,
 } from '../../common/constants';
 import { expandDottedObject } from '../../common/utils/expand_dotted_object';
-import type { AlertsClient, RuleRegistryPluginStartContract } from '../../../rule_registry/server';
 
 export const registerAlertsRoute = (
   router: IRouter,
diff --git a/x-pack/plugins/session_view/server/routes/index.ts b/x-pack/plugins/session_view/server/routes/index.ts
index 6980f345b49f9..b981b31f33978 100644
--- a/x-pack/plugins/session_view/server/routes/index.ts
+++ b/x-pack/plugins/session_view/server/routes/index.ts
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
+import { RuleRegistryPluginStartContract } from '@kbn/rule-registry-plugin/server';
 import { registerProcessEventsRoute } from './process_events_route';
 import { registerAlertsRoute } from './alerts_route';
 import { registerAlertStatusRoute } from './alert_status_route';
 import { sessionEntryLeadersRoute } from './session_entry_leaders_route';
-import { RuleRegistryPluginStartContract } from '../../../rule_registry/server';
 
 export const registerRoutes = (router: IRouter, ruleRegistry: RuleRegistryPluginStartContract) => {
   registerProcessEventsRoute(router);
diff --git a/x-pack/plugins/session_view/server/routes/process_events_route.test.ts b/x-pack/plugins/session_view/server/routes/process_events_route.test.ts
index 836db10290b2f..fdf706c0ede25 100644
--- a/x-pack/plugins/session_view/server/routes/process_events_route.test.ts
+++ b/x-pack/plugins/session_view/server/routes/process_events_route.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { doSearch } from './process_events_route';
 import { mockEvents } from '../../common/mocks/constants/session_view_process.mock';
 
diff --git a/x-pack/plugins/session_view/server/routes/process_events_route.ts b/x-pack/plugins/session_view/server/routes/process_events_route.ts
index fc148faf71b7a..c75bdc3fb6ed8 100644
--- a/x-pack/plugins/session_view/server/routes/process_events_route.ts
+++ b/x-pack/plugins/session_view/server/routes/process_events_route.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import type { ElasticsearchClient } from 'kibana/server';
-import { IRouter } from '../../../../../src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
 import {
   PROCESS_EVENTS_ROUTE,
   PROCESS_EVENTS_PER_PAGE,
diff --git a/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts b/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts
index 98aee357fb91e..186195c342a48 100644
--- a/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts
+++ b/x-pack/plugins/session_view/server/routes/session_entry_leaders_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 import { SESSION_ENTRY_LEADERS_ROUTE, PROCESS_EVENTS_INDEX } from '../../common/constants';
 
 export const sessionEntryLeadersRoute = (router: IRouter) => {
diff --git a/x-pack/plugins/session_view/server/types.ts b/x-pack/plugins/session_view/server/types.ts
index 29995077ccfbe..f3585be42e7b5 100644
--- a/x-pack/plugins/session_view/server/types.ts
+++ b/x-pack/plugins/session_view/server/types.ts
@@ -7,7 +7,7 @@
 import {
   RuleRegistryPluginSetupContract as RuleRegistryPluginSetup,
   RuleRegistryPluginStartContract as RuleRegistryPluginStart,
-} from '../../rule_registry/server';
+} from '@kbn/rule-registry-plugin/server';
 
 export interface SessionViewSetupPlugins {
   ruleRegistry: RuleRegistryPluginSetup;
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
index 9970b0100ceb8..5d94e0e960ce5 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/home.helpers.ts
@@ -14,7 +14,7 @@ import {
   AsyncTestBedConfig,
   delay,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { SnapshotRestoreHome } from '../../../public/application/sections/home/home';
 import { BASE_PATH } from '../../../public/application/constants';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts
index 3c14c444d4664..e75d0c3544b74 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { API_BASE_PATH } from '../../../common';
 
 type HttpMethod = 'GET' | 'PUT' | 'POST';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts
index a5cf9aceff8c4..1ad248ba0e9e5 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_add.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PolicyAdd } from '../../../public/application/sections/policy_add';
 import { formSetup, PolicyFormTestSubjects } from './policy_form.helpers';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts
index 3334dc5337a4d..aa6f83ea4f2a7 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/policy_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { PolicyEdit } from '../../../public/application/sections/policy_edit';
 import { WithAppDependencies } from './setup_environment';
 import { POLICY_NAME } from './constant';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts
index c4a5fc4b7be93..ce92c211bc6af 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_add.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { RepositoryType } from '../../../common/types';
 import { RepositoryAdd } from '../../../public/application/sections/repository_add';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts
index 3e8bbf95d5ea9..04ddabf9c1bfd 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/repository_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { RepositoryEdit } from '../../../public/application/sections/repository_edit';
 import { WithAppDependencies } from './setup_environment';
 import { REPOSITORY_NAME } from './constant';
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts
index fe5a82f421def..afc5e14140b01 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/restore_snapshot.helpers.ts
@@ -6,11 +6,11 @@
  */
 import { act } from 'react-dom/test-utils';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
 import { RestoreSnapshot } from '../../../public/application/sections/restore_snapshot';
 import { WithAppDependencies } from './setup_environment';
-import { REPOSITORY_NAME, SNAPSHOT_NAME } from '../helpers/constant';
+import { REPOSITORY_NAME, SNAPSHOT_NAME } from './constant';
 
 const testBedConfig: AsyncTestBedConfig = {
   memoryRouter: {
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx
index 0c961d5e151bc..0ba6ee619b16c 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { LocationDescriptorObject } from 'history';
 
-import { HttpSetup } from 'src/core/public';
-import { coreMock, scopedHistoryMock } from 'src/core/public/mocks';
+import { HttpSetup } from '@kbn/core/public';
+import { coreMock, scopedHistoryMock } from '@kbn/core/public/mocks';
 import { setUiMetricService, httpService } from '../../../public/application/services/http';
 import {
   breadcrumbService,
diff --git a/x-pack/plugins/snapshot_restore/common/constants.ts b/x-pack/plugins/snapshot_restore/common/constants.ts
index d8b159fd01e96..cd323d9bc4819 100644
--- a/x-pack/plugins/snapshot_restore/common/constants.ts
+++ b/x-pack/plugins/snapshot_restore/common/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { RepositoryType } from './types';
 
 const basicLicense: LicenseType = 'basic';
diff --git a/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts b/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts
index 7d911c13d1bb6..0907699b7e6d0 100644
--- a/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts
+++ b/x-pack/plugins/snapshot_restore/common/lib/policy_serialization.ts
@@ -11,7 +11,7 @@ import {
   serializeSnapshotConfig,
   deserializeSnapshotRetention,
   serializeSnapshotRetention,
-} from './';
+} from '.';
 
 export const deserializePolicy = (
   name: string,
diff --git a/x-pack/plugins/snapshot_restore/kibana.json b/x-pack/plugins/snapshot_restore/kibana.json
index 66c4023337af1..114bd866b4746 100644
--- a/x-pack/plugins/snapshot_restore/kibana.json
+++ b/x-pack/plugins/snapshot_restore/kibana.json
@@ -10,5 +10,5 @@
   "requiredPlugins": ["licensing", "management", "features", "share"],
   "optionalPlugins": ["usageCollection", "security", "cloud", "home"],
   "configPath": ["xpack", "snapshot_restore"],
-  "requiredBundles": ["esUiShared", "kibanaReact", "home"]
+  "requiredBundles": ["esUiShared", "kibanaReact"]
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/app.tsx b/x-pack/plugins/snapshot_restore/public/application/app.tsx
index d2de3dba3d25f..641fb809c9ad8 100644
--- a/x-pack/plugins/snapshot_restore/public/application/app.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/app.tsx
@@ -10,7 +10,7 @@ import { Redirect, Route, Switch } from 'react-router-dom';
 import { EuiPageContent } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 import { APP_REQUIRED_CLUSTER_PRIVILEGES } from '../../common';
 import {
diff --git a/x-pack/plugins/snapshot_restore/public/application/app_context.tsx b/x-pack/plugins/snapshot_restore/public/application/app_context.tsx
index 8b94f683a7f2f..4f36da98cfed6 100644
--- a/x-pack/plugins/snapshot_restore/public/application/app_context.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/app_context.tsx
@@ -9,7 +9,7 @@ import React, { createContext, useContext } from 'react';
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
 
-import { CoreStart, ScopedHistory, CoreTheme } from '../../../../../src/core/public';
+import { CoreStart, ScopedHistory, CoreTheme } from '@kbn/core/public';
 import { ClientConfigType } from '../types';
 import { HttpService, UiMetricService } from './services';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx
index 501057066a5b0..9100ce22417e5 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_logistics.tsx
@@ -24,16 +24,15 @@ import {
   EuiCode,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { Repository } from '../../../../../common/types';
 import { Frequency, CronEditor, SectionError } from '../../../../shared_imports';
 import { useCore, useServices } from '../../../app_context';
 import { DEFAULT_POLICY_SCHEDULE, DEFAULT_POLICY_FREQUENCY } from '../../../constants';
 import { useLoadRepositories } from '../../../services/http';
 import { linkToAddRepository } from '../../../services/navigation';
-import { InlineLoading } from '../../';
-import { StepProps } from './';
-
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { InlineLoading } from '../..';
+import { StepProps } from '.';
 
 export const PolicyStepLogistics: React.FunctionComponent<StepProps> = ({
   policy,
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
index c6ae5f0aac11d..c45e49e86db70 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
@@ -20,7 +20,7 @@ import {
 
 import { SlmPolicyPayload } from '../../../../../common/types';
 import { TIME_UNITS } from '../../../../../common/constants';
-import { StepProps } from './';
+import { StepProps } from '.';
 import { textService } from '../../../services/text';
 import { useCore } from '../../../app_context';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx
index f6de83c6b586f..1f744f05d3627 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_review.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { serializePolicy } from '../../../../../common/lib';
 import { useServices } from '../../../app_context';
-import { StepProps } from './';
+import { StepProps } from '.';
 import { CollapsibleIndicesList } from '../../collapsible_lists';
 
 export const PolicyStepReview: React.FunctionComponent<StepProps> = ({
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
index 1abccc789c678..7b74ef05aa0fc 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { SlmPolicyPayload } from '../../../../../../common/types';
-import { StepProps } from '../';
+import { StepProps } from '..';
 
 import { IndicesAndDataStreamsField } from './fields';
 import { useCore } from '../../../../app_context';
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
index 75cf590dfcc94..fc35e05f9b1cc 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
@@ -31,7 +31,7 @@ import { SectionError, Error } from '../../../shared_imports';
 import { useLoadRepositoryTypes } from '../../services/http';
 import { textService } from '../../services/text';
 import { RepositoryValidation } from '../../services/validation';
-import { SectionLoading, RepositoryTypeLogo } from '../';
+import { SectionLoading, RepositoryTypeLogo } from '..';
 import { useCore } from '../../app_context';
 import { getRepositoryTypeDocUrl } from '../../lib/type_to_doc_url';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
index ca9cf20f06393..fa6ee6c91abf1 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
@@ -33,7 +33,7 @@ import { useCore, useServices } from '../../../../app_context';
 import { orderDataStreamsAndIndices } from '../../../lib';
 import { DataStreamBadge } from '../../../data_stream_badge';
 
-import { StepProps } from '../index';
+import { StepProps } from '..';
 
 import { DataStreamsGlobalStateCallOut } from './data_streams_global_state_call_out';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx
index 039cac124d9d3..6ee119a2da62e 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_review.tsx
@@ -25,7 +25,7 @@ import {
 import { serializeRestoreSettings } from '../../../../../common/lib';
 import { EuiCodeEditor } from '../../../../shared_imports';
 import { useServices } from '../../../app_context';
-import { StepProps } from './';
+import { StepProps } from '.';
 import { CollapsibleIndicesList } from '../../collapsible_lists/collapsible_indices_list';
 
 export const RestoreSnapshotStepReview: React.FunctionComponent<StepProps> = ({
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
index c56af689efb28..46ad27e9a997b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
@@ -25,7 +25,7 @@ import { RestoreSettings } from '../../../../../common/types';
 import { EuiCodeEditor } from '../../../../shared_imports';
 import { REMOVE_INDEX_SETTINGS_SUGGESTIONS } from '../../../constants';
 import { useCore, useServices } from '../../../app_context';
-import { StepProps } from './';
+import { StepProps } from '.';
 
 export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = ({
   restoreSettings,
diff --git a/x-pack/plugins/snapshot_restore/public/application/index.tsx b/x-pack/plugins/snapshot_restore/public/application/index.tsx
index 69b4b2dab1b34..733fe14298e0d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/index.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { App } from './app';
 import { AppProviders } from './app_providers';
diff --git a/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts b/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts
index b04c14bd73c25..df949a01f4fb5 100644
--- a/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/lib/type_to_doc_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { RepositoryType } from '../../../common/types';
 import { REPOSITORY_TYPES } from '../../../common';
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts b/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts
index 327328de30f82..352e7c37f7ee2 100644
--- a/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from 'src/plugins/management/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { i18n } from '@kbn/i18n';
 
 import { ClientConfigType } from '../types';
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
index 408587f6465a0..0a283ebab6f61 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
@@ -26,7 +26,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { SlmPolicy } from '../../../../../../common/types';
 import { useServices } from '../../../../app_context';
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx
index 4dff022b82ff0..aee603d5d7f6d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_history.tsx
@@ -21,14 +21,13 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SlmPolicy } from '../../../../../../../common/types';
 import { EuiCodeEditor } from '../../../../../../shared_imports';
 import { FormattedDateTime } from '../../../../../components';
 import { linkToSnapshot } from '../../../../../services/navigation';
 import { useServices } from '../../../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policy: SlmPolicy;
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx
index 22277ca6e50dd..8482eb4520460 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/tabs/tab_summary.tsx
@@ -22,13 +22,12 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SlmPolicy } from '../../../../../../../common/types';
 import { useServices } from '../../../../../app_context';
 import { FormattedDateTime, CollapsibleIndicesList } from '../../../../../components';
 import { linkToSnapshots, linkToRepository } from '../../../../../services/navigation';
 
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policy: SlmPolicy;
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
index c2a8449a2bc94..943f429174dcd 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiPageContent, EuiEmptyPrompt, EuiButton, EuiCallOut, EuiSpacer } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import {
   PageLoading,
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx
index c1d05dfaa450c..84b674099269e 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_table/policy_table.tsx
@@ -21,6 +21,7 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SlmPolicy } from '../../../../../../common/types';
 import { UseRequestResponse } from '../../../../../shared_imports';
 import { UIM_POLICY_SHOW_DETAILS_CLICK } from '../../../../constants';
@@ -32,8 +33,6 @@ import {
 } from '../../../../components';
 import { linkToAddPolicy, linkToEditPolicy } from '../../../../services/navigation';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policies: SlmPolicy[];
   reload: UseRequestResponse['resendRequest'];
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx
index 6e6a84c1d3159..19a76b37e351b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_details/repository_details.tsx
@@ -25,6 +25,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SectionError, Error } from '../../../../../shared_imports';
 
 import { useCore, useServices } from '../../../../app_context';
@@ -50,7 +51,6 @@ import {
 } from '../../../../components';
 import { TypeDetails } from './type_details';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { getRepositoryTypeDocUrl } from '../../../../lib/type_to_doc_url';
 
 interface Props {
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
index 80cf2751143b2..38c7c00aac1f7 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiPageContent, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { Repository } from '../../../../../common/types';
 import { PageLoading, PageError, Error, useExecutionContext } from '../../../../shared_imports';
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx
index e19a5b7845805..abfd7e6f1b624 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_table/repository_table.tsx
@@ -16,6 +16,7 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { REPOSITORY_TYPES } from '../../../../../../common';
 import { Repository, RepositoryType } from '../../../../../../common/types';
 import { UseRequestResponse } from '../../../../../shared_imports';
@@ -25,8 +26,6 @@ import { useServices } from '../../../../app_context';
 import { textService } from '../../../../services/text';
 import { linkToEditRepository, linkToAddRepository } from '../../../../services/navigation';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   repositories: Repository[];
   managedRepository?: string;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx
index 3fde88bf3ca40..3ce492031b866 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/restore_list/restore_list.tsx
@@ -20,6 +20,7 @@ import {
   EuiLoadingSpinner,
   EuiLink,
 } from '@elastic/eui';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { APP_RESTORE_INDEX_PRIVILEGES } from '../../../../../common';
 import {
   WithPrivileges,
@@ -35,8 +36,6 @@ import { linkToSnapshots } from '../../../services/navigation';
 import { useAppContext, useServices } from '../../../app_context';
 import { RestoreTable } from './restore_table';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
-
 const ONE_SECOND_MS = 1000;
 const TEN_SECONDS_MS = 10 * 1000;
 const THIRTY_SECONDS_MS = 30 * 1000;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
index 1b4bf28169044..cbf9903c83f4b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
@@ -23,6 +23,7 @@ import {
 import React, { Fragment, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SnapshotDetails as ISnapshotDetails } from '../../../../../../common/types';
 import { SectionError, Error } from '../../../../../shared_imports';
 import { SectionLoading, SnapshotDeleteProvider } from '../../../../components';
@@ -36,8 +37,6 @@ import { useLoadSnapshot } from '../../../../services/http';
 import { linkToRepository, linkToRestoreSnapshot } from '../../../../services/navigation';
 import { TabSummary, TabFailures } from './tabs';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   repositoryName: string;
   snapshotId: string;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx
index 56317533a3f5a..c633b6cf886d0 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_details/tabs/tab_summary.tsx
@@ -17,6 +17,7 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { SnapshotDetails } from '../../../../../../../common/types';
 import { SNAPSHOT_STATE } from '../../../../../constants';
 import {
@@ -29,8 +30,6 @@ import { linkToPolicy } from '../../../../../services/navigation';
 import { SnapshotState } from './snapshot_state';
 import { useServices } from '../../../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   snapshotDetails: SnapshotDetails;
 }
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts b/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts
index b7c4f1565b9d1..401fd07f2cc4d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/http/http.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from '../../../../../../../src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 export class HttpService {
   private client: HttpSetup | undefined;
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts b/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts
index c02d0f053f783..7ce0f9259cca4 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/http/snapshot_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchQuery } from 'kibana/public';
+import { HttpFetchQuery } from '@kbn/core/public';
 import { API_BASE_PATH } from '../../../../common';
 import { UIM_SNAPSHOT_DELETE, UIM_SNAPSHOT_DELETE_MANY } from '../../constants';
 import { SnapshotListParams } from '../../lib';
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts b/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts
index dce93baa45769..139ea2b5378c8 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/navigation/breadcrumb.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ManagementAppMountParams } from '../../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { textService } from '../text';
 import {
   linkToHome,
@@ -13,7 +13,7 @@ import {
   linkToRepositories,
   linkToPolicies,
   linkToRestoreStatus,
-} from './';
+} from '.';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts b/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts
index 1aa26b393bd84..5788fc73147ec 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/ui_metric/ui_metric.ts
@@ -7,7 +7,7 @@
 
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { UsageCollectionSetup } from '../../../../../../../src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export class UiMetricService {
   private usageCollection: UsageCollectionSetup | undefined;
diff --git a/x-pack/plugins/snapshot_restore/public/index.ts b/x-pack/plugins/snapshot_restore/public/index.ts
index 1248073af5527..da221bf9ce937 100644
--- a/x-pack/plugins/snapshot_restore/public/index.ts
+++ b/x-pack/plugins/snapshot_restore/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 
 import './application/index.scss';
 import { SnapshotRestoreUIPlugin } from './plugin';
diff --git a/x-pack/plugins/snapshot_restore/public/locator.ts b/x-pack/plugins/snapshot_restore/public/locator.ts
index fac7d389d8e96..a1a732d327448 100644
--- a/x-pack/plugins/snapshot_restore/public/locator.ts
+++ b/x-pack/plugins/snapshot_restore/public/locator.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { ManagementAppLocator } from 'src/plugins/management/common';
-import { LocatorDefinition } from '../../../../src/plugins/share/public/';
+import { ManagementAppLocator } from '@kbn/management-plugin/common';
+import { LocatorDefinition } from '@kbn/share-plugin/public';
 import { linkToSnapshots } from './application/services/navigation';
 import { PLUGIN } from '../common/constants';
 
diff --git a/x-pack/plugins/snapshot_restore/public/plugin.ts b/x-pack/plugins/snapshot_restore/public/plugin.ts
index 0351716fad5b5..1f2c31168d7ba 100644
--- a/x-pack/plugins/snapshot_restore/public/plugin.ts
+++ b/x-pack/plugins/snapshot_restore/public/plugin.ts
@@ -6,14 +6,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, PluginInitializerContext } from 'src/core/public';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { ManagementSetup } from 'src/plugins/management/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 import { PLUGIN } from '../common/constants';
 
@@ -83,7 +80,7 @@ export class SnapshotRestoreUIPlugin {
           icon: 'storage',
           path: '/app/management/data/snapshot_restore',
           showOnHomePage: true,
-          category: FeatureCatalogueCategory.ADMIN,
+          category: 'admin',
           order: 630,
         });
       }
@@ -97,5 +94,6 @@ export class SnapshotRestoreUIPlugin {
   }
 
   public start() {}
+
   public stop() {}
 }
diff --git a/x-pack/plugins/snapshot_restore/public/shared_imports.ts b/x-pack/plugins/snapshot_restore/public/shared_imports.ts
index 21792338caece..dae759b818ced 100644
--- a/x-pack/plugins/snapshot_restore/public/shared_imports.ts
+++ b/x-pack/plugins/snapshot_restore/public/shared_imports.ts
@@ -12,7 +12,7 @@ export type {
   SendRequestResponse,
   UseRequestResponse,
   UseRequestConfig,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   AuthorizationProvider,
@@ -26,12 +26,12 @@ export {
   useRequest,
   WithPrivileges,
   EuiCodeEditor,
-} from '../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
 
 export {
   reactRouterNavigate,
   KibanaThemeProvider,
   useExecutionContext,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/snapshot_restore/server/config.ts b/x-pack/plugins/snapshot_restore/server/config.ts
index cc430f4756610..d259b6674391a 100644
--- a/x-pack/plugins/snapshot_restore/server/config.ts
+++ b/x-pack/plugins/snapshot_restore/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/snapshot_restore/server/index.ts b/x-pack/plugins/snapshot_restore/server/index.ts
index 1e9d2b55aa20b..1375cec6846fe 100644
--- a/x-pack/plugins/snapshot_restore/server/index.ts
+++ b/x-pack/plugins/snapshot_restore/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { SnapshotRestoreServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts b/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts
index 0e2f90fe50449..fe684cee8e911 100644
--- a/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts
+++ b/x-pack/plugins/snapshot_restore/server/lib/get_managed_policy_names.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 // Cloud has its own system for managing SLM policies and we want to make
 // this clear when Snapshot and Restore is used in a Cloud deployment.
diff --git a/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts b/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts
index c9ea3cdfffe12..464f90bed9e64 100644
--- a/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts
+++ b/x-pack/plugins/snapshot_restore/server/lib/get_managed_repository_name.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 // Cloud has its own system for managing snapshots and we want to make
 // this clear when Snapshot and Restore is used in a Cloud deployment.
diff --git a/x-pack/plugins/snapshot_restore/server/plugin.ts b/x-pack/plugins/snapshot_restore/server/plugin.ts
index d737807ec8dad..b07570b32f48a 100644
--- a/x-pack/plugins/snapshot_restore/server/plugin.ts
+++ b/x-pack/plugins/snapshot_restore/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'kibana/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN, APP_REQUIRED_CLUSTER_PRIVILEGES } from '../common';
 import { License } from './services';
diff --git a/x-pack/plugins/snapshot_restore/server/routes/api/app.ts b/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
index 7a91cb8dc6848..21938eaecf605 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/app.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Privileges } from '../../../../../../src/plugins/es_ui_shared/common';
+import { Privileges } from '@kbn/es-ui-shared-plugin/common';
 
 import {
   APP_REQUIRED_CLUSTER_PRIVILEGES,
diff --git a/x-pack/plugins/snapshot_restore/server/services/license.ts b/x-pack/plugins/snapshot_restore/server/services/license.ts
index e209edcd899b4..e84ce13767a7e 100644
--- a/x-pack/plugins/snapshot_restore/server/services/license.ts
+++ b/x-pack/plugins/snapshot_restore/server/services/license.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../licensing/server';
-import { LicenseType } from '../../../licensing/common/types';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/snapshot_restore/server/shared_imports.ts b/x-pack/plugins/snapshot_restore/server/shared_imports.ts
index 7f55d189457c7..14f23b7c782f7 100644
--- a/x-pack/plugins/snapshot_restore/server/shared_imports.ts
+++ b/x-pack/plugins/snapshot_restore/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
diff --git a/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts b/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts
index efd0ebd0fd1c4..0d7e0c4ddefa3 100644
--- a/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts
+++ b/x-pack/plugins/snapshot_restore/server/test/helpers/router_mock.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { IRouter } from 'src/core/server';
+import type { IRouter } from '@kbn/core/server';
 import { get } from 'lodash';
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
 type RequestHandler = (...params: any[]) => any;
 
diff --git a/x-pack/plugins/snapshot_restore/server/types.ts b/x-pack/plugins/snapshot_restore/server/types.ts
index 8c2ad74865e45..9e7d97aed39ef 100644
--- a/x-pack/plugins/snapshot_restore/server/types.ts
+++ b/x-pack/plugins/snapshot_restore/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext, IScopedClusterClient } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { CloudSetup } from '../../cloud/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import type { IRouter, RequestHandlerContext, IScopedClusterClient } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { License } from './services';
 import { wrapEsError } from './lib';
 import { handleEsError } from './shared_imports';
diff --git a/x-pack/plugins/spaces/common/licensing/license_service.test.ts b/x-pack/plugins/spaces/common/licensing/license_service.test.ts
index 3d87588bc7497..24895697dab6b 100644
--- a/x-pack/plugins/spaces/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/spaces/common/licensing/license_service.test.ts
@@ -7,9 +7,10 @@
 
 import { of } from 'rxjs';
 
-import { licenseMock } from '../../../licensing/common/licensing.mock';
-import type { LicenseType } from '../../../licensing/common/types';
-import { LICENSE_TYPE } from '../../../licensing/common/types';
+import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import type { LicenseType } from '@kbn/licensing-plugin/common/types';
+import { LICENSE_TYPE } from '@kbn/licensing-plugin/common/types';
+
 import { SpacesLicenseService } from './license_service';
 
 describe('license#isEnabled', function () {
diff --git a/x-pack/plugins/spaces/common/licensing/license_service.ts b/x-pack/plugins/spaces/common/licensing/license_service.ts
index 0836c87613db7..57dffe61b3ae6 100644
--- a/x-pack/plugins/spaces/common/licensing/license_service.ts
+++ b/x-pack/plugins/spaces/common/licensing/license_service.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 
-import type { ILicense } from '../../../licensing/common/types';
+import type { ILicense } from '@kbn/licensing-plugin/common/types';
 
 export interface SpacesLicense {
   isEnabled(): boolean;
diff --git a/x-pack/plugins/spaces/kibana.json b/x-pack/plugins/spaces/kibana.json
index 090e5d0894480..5d7dcae231d3a 100644
--- a/x-pack/plugins/spaces/kibana.json
+++ b/x-pack/plugins/spaces/kibana.json
@@ -20,7 +20,6 @@
   "extraPublicDirs": ["common"],
   "requiredBundles": [
     "esUiShared",
-    "kibanaReact",
-    "home"
+    "kibanaReact"
   ]
 }
diff --git a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
index 28b630efe0b44..6b547bfc9bbf4 100644
--- a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
+++ b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { advancedSettingsMock } from 'src/plugins/advanced_settings/public/mocks';
+import { advancedSettingsMock } from '@kbn/advanced-settings-plugin/public/mocks';
 
 import { AdvancedSettingsService } from './advanced_settings_service';
 
diff --git a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
index 28d64e41fcbe4..52e308d71c8fd 100644
--- a/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
+++ b/x-pack/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import type { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
+import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public';
 
 import type { Space } from '../../common';
 import { AdvancedSettingsSubtitle, AdvancedSettingsTitle } from './components';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
index 858fddaf4698b..d00ae8349e62c 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
@@ -10,8 +10,8 @@ import Boom from '@hapi/boom';
 import { act } from '@testing-library/react';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Space } from '../../../common';
 import { getSpacesContextProviderWrapper } from '../../spaces_context';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index d58490a86b7f5..51701df4d3689 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -20,11 +20,11 @@ import {
 import moment from 'moment';
 import React, { Fragment } from 'react';
 
-import { i18n } from '@kbn/i18n';
 import type {
   SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportConflictError,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import { i18n } from '@kbn/i18n';
 
 import type { SpacesDataEntry } from '../../types';
 import type { SummarizedCopyToSpaceResult } from '../lib';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts
index cf402b0dd4ec2..061900f2b1777 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/process_import_response.ts
@@ -14,7 +14,7 @@ import type {
   SavedObjectsImportSuccess,
   SavedObjectsImportUnknownError,
   SavedObjectsImportUnsupportedTypeError,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 export interface FailedImport {
   obj: Omit<SavedObjectsImportFailure, 'error'>;
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts
index 298b89050b637..faa1d1f4c6871 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FailedImport, ProcessedImportResponse } from '../lib';
+import type { FailedImport, ProcessedImportResponse } from '.';
 import type { CopyToSpaceSavedObjectTarget } from '../types';
 import { summarizeCopyResult } from './summarize_copy_result';
 
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts
index 206952774ff9a..260fee29bf37a 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/lib/summarize_copy_result.ts
@@ -8,9 +8,9 @@
 import type {
   SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportConflictError,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
-import type { FailedImport, ProcessedImportResponse } from '../lib';
+import type { FailedImport, ProcessedImportResponse } from '.';
 import type { CopyToSpaceSavedObjectTarget } from '../types';
 
 export interface SummarizedSavedObjectResult {
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
index 732d779c6f616..43ff6d20c66b4 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from 'src/core/public';
+import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from '@kbn/core/public';
 
 export interface CopyOptions {
   includeRelated: boolean;
diff --git a/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts b/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
index 86b2f0d3ac7fe..886f648cb8274 100644
--- a/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
+++ b/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
+import type { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
 import { i18n } from '@kbn/i18n';
-import type { FeatureCatalogueEntry } from 'src/plugins/home/public';
 
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 import { getSpacesFeatureDescription } from './constants';
 
 export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
@@ -21,6 +20,6 @@ export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
     icon: 'spacesApp',
     path: '/app/management/kibana/spaces',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
   };
 };
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx
index 913d8cf6710e5..e6ac998d3f175 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/embeddable_legacy_url_conflict_internal.tsx
@@ -16,9 +16,9 @@ import {
 import React, { useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { StartServicesAccessor } from 'src/core/public';
 
 import type { PluginsStart } from '../../plugin';
 import type { SpacesManager } from '../../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx
index 5f4f1f845717a..d09e78f1d8213 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.test.tsx
@@ -10,8 +10,8 @@ import { act } from '@testing-library/react';
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { LegacyUrlConflictInternal } from './legacy_url_conflict_internal';
 
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
index 71bcafe2b07fc..91c1de5367282 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
@@ -19,9 +19,9 @@ import React, { useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { first } from 'rxjs/operators';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { StartServicesAccessor } from 'src/core/public';
 
 import { DEFAULT_OBJECT_NOUN } from '../../constants';
 import type { PluginsStart } from '../../plugin';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts
index 4b117cabaeaed..5063288fc8d53 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.test.ts
@@ -7,7 +7,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 import { createRedirectLegacyUrl } from './redirect_legacy_url';
 
diff --git a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
index 5918e678d9bf6..521889e790391 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
@@ -7,8 +7,8 @@
 
 import { first } from 'rxjs/operators';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { StartServicesAccessor } from 'src/core/public';
 
 import { DEFAULT_OBJECT_NOUN } from '../constants';
 import type { PluginsStart } from '../plugin';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/types.ts b/x-pack/plugins/spaces/public/legacy_urls/types.ts
index 9c6f8518107b0..da78792bcf35a 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/types.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsResolveResponse } from 'src/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core/public';
 
 /**
  * Properties for the LegacyUrlConflict component.
diff --git a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
index 00596d665d138..a04f175366705 100644
--- a/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
+++ b/x-pack/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
@@ -13,8 +13,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import type { Space } from '../../../../common';
 import type { SpacesManager } from '../../../spaces_manager';
 
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
index d3f95cadc051f..42a4f2f46832e 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
-import { notificationServiceMock } from 'src/core/public/mocks';
 
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index ab1a40a2ee261..1395867d724d0 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -9,9 +9,9 @@ import type { EuiButtonIconProps } from '@elastic/eui';
 import { EuiButton, EuiButtonIcon } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { NotificationsStart } from 'src/core/public';
 
 import type { Space } from '../../../common';
 import type { SpacesManager } from '../../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
index 5283cfe8ad1a3..27e5dfa8d4137 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
@@ -8,10 +8,10 @@
 import type { EuiCheckboxProps } from '@elastic/eui';
 import React from 'react';
 
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
 import { findTestSubject, mountWithIntl, nextTick, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { DEFAULT_APP_CATEGORIES } from 'src/core/public';
 
-import type { KibanaFeatureConfig } from '../../../../../features/public';
 import { EnabledFeatures } from './enabled_features';
 
 const features: KibanaFeatureConfig[] = [
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 7acca89fe5d2b..07a848e523f10 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -9,11 +9,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from
 import type { FunctionComponent } from 'react';
 import React from 'react';
 
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import type { KibanaFeatureConfig } from '../../../../../features/public';
 import type { Space } from '../../../../common';
 import { SectionPanel } from '../section_panel';
 import { FeatureTable } from './feature_table';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
index 2371a97370b53..bc4b586c6cd1d 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
@@ -23,10 +23,10 @@ import _ from 'lodash';
 import type { ChangeEvent, ReactElement } from 'react';
 import React, { Component } from 'react';
 
+import type { AppCategory } from '@kbn/core/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
 import { i18n } from '@kbn/i18n';
-import type { AppCategory } from 'src/core/public';
 
-import type { KibanaFeatureConfig } from '../../../../../features/public';
 import type { Space } from '../../../../common';
 import { getEnabledFeatures } from '../../lib/feature_utils';
 
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index 55672e9896ea3..071f02e6d3114 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -11,12 +11,12 @@ import { waitFor } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
+import { notificationServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/public';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { DEFAULT_APP_CATEGORIES } from 'src/core/public';
-import { notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
 
-import { KibanaFeature } from '../../../../features/public';
-import { featuresPluginMock } from '../../../../features/public/mocks';
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index 1920aee6c439b..80c99a33f2a10 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -20,12 +20,12 @@ import {
 import { difference } from 'lodash';
 import React, { Component } from 'react';
 
+import type { Capabilities, NotificationsStart, ScopedHistory } from '@kbn/core/public';
+import { SectionLoading } from '@kbn/es-ui-shared-plugin/public';
+import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { Capabilities, NotificationsStart, ScopedHistory } from 'src/core/public';
 
-import { SectionLoading } from '../../../../../../src/plugins/es_ui_shared/public';
-import type { FeaturesPluginStart, KibanaFeature } from '../../../../features/public';
 import type { Space } from '../../../common';
 import { isReservedSpace } from '../../../common';
 import { getSpacesFeatureDescription } from '../../constants';
diff --git a/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts b/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts
index 83a06c8a4b733..6adba1705ac57 100644
--- a/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts
+++ b/x-pack/plugins/spaces/public/management/lib/feature_utils.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../features/public';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/public';
+
 import { getEnabledFeatures } from './feature_utils';
 
 const buildFeatures = () =>
diff --git a/x-pack/plugins/spaces/public/management/lib/feature_utils.ts b/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
index 7598e18d6680c..932792fa7791b 100644
--- a/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
+++ b/x-pack/plugins/spaces/public/management/lib/feature_utils.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import type { KibanaFeatureConfig } from '../../../../features/common';
+import type { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+
 import type { Space } from '../../../common';
 
 export function getEnabledFeatures(features: KibanaFeatureConfig[], space: Partial<Space>) {
diff --git a/x-pack/plugins/spaces/public/management/management_service.test.ts b/x-pack/plugins/spaces/public/management/management_service.test.ts
index d13dee0f4e3c7..7942ad162b147 100644
--- a/x-pack/plugins/spaces/public/management/management_service.test.ts
+++ b/x-pack/plugins/spaces/public/management/management_service.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
-import type { ManagementSection } from 'src/plugins/management/public';
-import { managementPluginMock } from 'src/plugins/management/public/mocks';
+import type { CoreSetup } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import type { ManagementSection } from '@kbn/management-plugin/public';
+import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
 
 import type { PluginsStart } from '../plugin';
 import { spacesManagerMock } from '../spaces_manager/mocks';
diff --git a/x-pack/plugins/spaces/public/management/management_service.tsx b/x-pack/plugins/spaces/public/management/management_service.tsx
index e7446a01076d1..91e0ffaca281d 100644
--- a/x-pack/plugins/spaces/public/management/management_service.tsx
+++ b/x-pack/plugins/spaces/public/management/management_service.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { StartServicesAccessor } from 'src/core/public';
-import type { ManagementApp, ManagementSetup } from 'src/plugins/management/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
+import type { ManagementApp, ManagementSetup } from '@kbn/management-plugin/public';
 
 import type { PluginsStart } from '../plugin';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_page.test.tsx.snap b/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_page.test.tsx.snap
deleted file mode 100644
index 3d6a581d05f51..0000000000000
--- a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_page.test.tsx.snap
+++ /dev/null
@@ -1,242 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SpacesGridPage renders as expected 1`] = `
-<div
-  className="spcGridPage"
-  data-test-subj="spaces-grid-page"
->
-  <EuiPageHeader
-    bottomBorder={true}
-    description="Organize your dashboards and other saved objects into meaningful categories."
-    pageTitle={
-      <FormattedMessage
-        defaultMessage="Spaces"
-        id="xpack.spaces.management.spacesGridPage.spacesTitle"
-        values={Object {}}
-      />
-    }
-    rightSideItems={
-      Array [
-        <EuiButton
-          data-test-subj="createSpace"
-          fill={true}
-          iconType="plusInCircleFilled"
-          onClick={[Function]}
-        >
-          <FormattedMessage
-            defaultMessage="Create space"
-            id="xpack.spaces.management.spacesGridPage.createSpaceButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>,
-      ]
-    }
-  />
-  <EuiSpacer
-    size="l"
-  />
-  <EuiInMemoryTable
-    columns={
-      Array [
-        Object {
-          "field": "initials",
-          "name": "",
-          "render": [Function],
-          "width": "50px",
-        },
-        Object {
-          "field": "name",
-          "name": "Space",
-          "render": [Function],
-          "sortable": true,
-        },
-        Object {
-          "field": "description",
-          "name": "Description",
-          "sortable": true,
-        },
-        Object {
-          "field": "disabledFeatures",
-          "name": "Features",
-          "render": [Function],
-          "sortable": [Function],
-        },
-        Object {
-          "field": "id",
-          "name": "Identifier",
-          "render": [Function],
-          "sortable": true,
-        },
-        Object {
-          "actions": Array [
-            Object {
-              "render": [Function],
-            },
-            Object {
-              "available": [Function],
-              "render": [Function],
-            },
-          ],
-          "name": "Actions",
-        },
-      ]
-    }
-    hasActions={true}
-    itemId="id"
-    items={Array []}
-    loading={true}
-    message={
-      <FormattedMessage
-        defaultMessage="loading…"
-        id="xpack.spaces.management.spacesGridPage.loadingTitle"
-        values={Object {}}
-      />
-    }
-    pagination={true}
-    responsive={true}
-    rowHeader="name"
-    search={
-      Object {
-        "box": Object {
-          "placeholder": "Search",
-        },
-      }
-    }
-    sorting={true}
-    tableCaption="Kibana spaces"
-    tableLayout="fixed"
-  />
-</div>
-`;
-
-exports[`SpacesGridPage renders the list of spaces 1`] = `
-Array [
-  <SpaceAvatarInternal
-    announceSpaceName={true}
-    size="s"
-    space={
-      Object {
-        "_reserved": true,
-        "disabledFeatures": Array [],
-        "id": "default",
-        "name": "Default",
-      }
-    }
-  >
-    <EuiAvatar
-      color="#AA6556"
-      data-test-subj="space-avatar-default"
-      initials="D"
-      initialsLength={2}
-      name="Default"
-      size="s"
-      type="space"
-    >
-      <div
-        aria-label="Default"
-        className="euiAvatar euiAvatar--s euiAvatar--space"
-        data-test-subj="space-avatar-default"
-        role="img"
-        style={
-          Object {
-            "backgroundColor": "#AA6556",
-            "color": "#000000",
-          }
-        }
-        title="Default"
-      >
-        <span
-          aria-hidden="true"
-        >
-          D
-        </span>
-      </div>
-    </EuiAvatar>
-  </SpaceAvatarInternal>,
-  <SpaceAvatarInternal
-    announceSpaceName={true}
-    size="s"
-    space={
-      Object {
-        "disabledFeatures": Array [],
-        "id": "custom-1",
-        "name": "Custom 1",
-      }
-    }
-  >
-    <EuiAvatar
-      color="#DA8B45"
-      data-test-subj="space-avatar-custom-1"
-      initials="C1"
-      initialsLength={2}
-      name="Custom 1"
-      size="s"
-      type="space"
-    >
-      <div
-        aria-label="Custom 1"
-        className="euiAvatar euiAvatar--s euiAvatar--space"
-        data-test-subj="space-avatar-custom-1"
-        role="img"
-        style={
-          Object {
-            "backgroundColor": "#DA8B45",
-            "color": "#000000",
-          }
-        }
-        title="Custom 1"
-      >
-        <span
-          aria-hidden="true"
-        >
-          C1
-        </span>
-      </div>
-    </EuiAvatar>
-  </SpaceAvatarInternal>,
-  <SpaceAvatarInternal
-    announceSpaceName={true}
-    size="s"
-    space={
-      Object {
-        "color": "#ABCDEF",
-        "description": "my description here",
-        "disabledFeatures": Array [],
-        "id": "custom-2",
-        "initials": "LG",
-        "name": "Custom 2",
-      }
-    }
-  >
-    <EuiAvatar
-      color="#ABCDEF"
-      data-test-subj="space-avatar-custom-2"
-      initials="LG"
-      initialsLength={2}
-      name="Custom 2"
-      size="s"
-      type="space"
-    >
-      <div
-        aria-label="Custom 2"
-        className="euiAvatar euiAvatar--s euiAvatar--space"
-        data-test-subj="space-avatar-custom-2"
-        role="img"
-        style={
-          Object {
-            "backgroundColor": "#ABCDEF",
-            "color": "#000000",
-          }
-        }
-        title="Custom 2"
-      >
-        <span
-          aria-hidden="true"
-        >
-          LG
-        </span>
-      </div>
-    </EuiAvatar>
-  </SpaceAvatarInternal>,
-]
-`;
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
index 8cff17b4dfe57..2f765505e8e45 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.test.tsx
@@ -8,11 +8,15 @@
 import { act } from '@testing-library/react';
 import React from 'react';
 
-import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
-import { httpServiceMock, notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
+import {
+  httpServiceMock,
+  notificationServiceMock,
+  scopedHistoryMock,
+} from '@kbn/core/public/mocks';
+import { KibanaFeature } from '@kbn/features-plugin/public';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
+import { mountWithIntl } from '@kbn/test-jest-helpers';
 
-import { KibanaFeature } from '../../../../features/public';
-import { featuresPluginMock } from '../../../../features/public/mocks';
 import { SpaceAvatarInternal } from '../../space_avatar/space_avatar_internal';
 import type { SpacesManager } from '../../spaces_manager';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
@@ -58,29 +62,6 @@ describe('SpacesGridPage', () => {
   const getUrlForApp = (appId: string) => appId;
   const history = scopedHistoryMock.create();
 
-  it('renders as expected', () => {
-    const httpStart = httpServiceMock.createStartContract();
-    httpStart.get.mockResolvedValue([]);
-
-    expect(
-      shallowWithIntl(
-        <SpacesGridPage
-          spacesManager={spacesManager as unknown as SpacesManager}
-          getFeatures={featuresStart.getFeatures}
-          notifications={notificationServiceMock.createStartContract()}
-          getUrlForApp={getUrlForApp}
-          history={history}
-          capabilities={{
-            navLinks: {},
-            management: {},
-            catalogue: {},
-            spaces: { manage: true },
-          }}
-        />
-      )
-    ).toMatchSnapshot();
-  });
-
   it('renders the list of spaces', async () => {
     const httpStart = httpServiceMock.createStartContract();
     httpStart.get.mockResolvedValue([]);
@@ -106,7 +87,6 @@ describe('SpacesGridPage', () => {
     wrapper.update();
 
     expect(wrapper.find(SpaceAvatarInternal)).toHaveLength(spaces.length);
-    expect(wrapper.find(SpaceAvatarInternal)).toMatchSnapshot();
   });
 
   it('notifies when spaces fail to load', async () => {
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index c65530e773148..5d5897f3120d7 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -18,17 +18,17 @@ import {
 } from '@elastic/eui';
 import React, { Component, lazy, Suspense } from 'react';
 
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import type {
   ApplicationStart,
   Capabilities,
   NotificationsStart,
   ScopedHistory,
-} from 'src/core/public';
+} from '@kbn/core/public';
+import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
-import { reactRouterNavigate } from '../../../../../../src/plugins/kibana_react/public';
-import type { FeaturesPluginStart, KibanaFeature } from '../../../../features/public';
 import type { Space } from '../../../common';
 import { isReservedSpace } from '../../../common';
 import { DEFAULT_SPACE_ID } from '../../../common/constants';
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
index 2c64f559602cc..685016be5fae5 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx
@@ -18,9 +18,9 @@ jest.mock('./edit_space', () => ({
   },
 }));
 
-import { coreMock, scopedHistoryMock, themeServiceMock } from 'src/core/public/mocks';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/public/mocks';
 
-import { featuresPluginMock } from '../../../features/public/mocks';
 import type { PluginsStart } from '../plugin';
 import { spacesManagerMock } from '../spaces_manager/mocks';
 import { spacesManagementApp } from './spaces_management_app';
@@ -86,7 +86,7 @@ describe('spacesManagementApp', () => {
         <div
           class="kbnAppWrapper kbnRedirectCrossAppLinks"
         >
-          Spaces Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/","search":"","hash":""}}}
+          Spaces Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/","search":"","hash":""}}}
         </div>
       </div>
     `);
@@ -112,7 +112,7 @@ describe('spacesManagementApp', () => {
         <div
           class="kbnAppWrapper kbnRedirectCrossAppLinks"
         >
-          Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/create","search":"","hash":""}}}
+          Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{}},"history":{"action":"PUSH","length":1,"location":{"pathname":"/create","search":"","hash":""}}}
         </div>
       </div>
     `);
@@ -144,7 +144,7 @@ describe('spacesManagementApp', () => {
         <div
           class="kbnAppWrapper kbnRedirectCrossAppLinks"
         >
-          Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{"_isScalar":false}},"spaceId":"some-space","history":{"action":"PUSH","length":1,"location":{"pathname":"/edit/some-space","search":"","hash":""}}}
+          Spaces Edit Page: {"capabilities":{"catalogue":{},"management":{},"navLinks":{}},"notifications":{"toasts":{}},"spacesManager":{"onActiveSpaceChange$":{}},"spaceId":"some-space","history":{"action":"PUSH","length":1,"location":{"pathname":"/edit/some-space","search":"","hash":""}}}
         </div>
       </div>
     `);
diff --git a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
index 30a724ba504b3..b79dbe24e9335 100644
--- a/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_management_app.tsx
@@ -9,16 +9,16 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Route, Router, Switch, useParams } from 'react-router-dom';
 
+import type { StartServicesAccessor } from '@kbn/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { StartServicesAccessor } from 'src/core/public';
-import type { RegisterManagementAppArgs } from 'src/plugins/management/public';
-
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import type { RegisterManagementAppArgs } from '@kbn/management-plugin/public';
+
 import type { Space } from '../../common';
 import type { PluginsStart } from '../plugin';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx b/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
index e48a685e926f0..aba453ba4aef8 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
@@ -9,8 +9,8 @@ import { EuiButton } from '@elastic/eui';
 import type { CSSProperties } from 'react';
 import React, { Component } from 'react';
 
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ApplicationStart, Capabilities } from 'src/core/public';
 
 interface Props {
   isDisabled?: boolean;
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx
index 4f7e47b6b7bbe..0292c414e9638 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_description.tsx
@@ -11,7 +11,7 @@ import { EuiContextMenuPanel, EuiText } from '@elastic/eui';
 import type { FC } from 'react';
 import React from 'react';
 
-import type { ApplicationStart, Capabilities } from 'src/core/public';
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 
 import { getSpacesFeatureDescription } from '../../constants';
 import { ManageSpacesButton } from './manage_spaces_button';
diff --git a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
index 9a88b3c2db169..36ba0f0bb93b1 100644
--- a/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/components/spaces_menu.tsx
@@ -18,9 +18,9 @@ import {
 import type { ReactElement } from 'react';
 import React, { Component, lazy, Suspense } from 'react';
 
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 import type { InjectedIntl } from '@kbn/i18n-react';
 import { FormattedMessage, injectI18n } from '@kbn/i18n-react';
-import type { ApplicationStart, Capabilities } from 'src/core/public';
 
 import type { Space } from '../../../common';
 import { addSpaceIdToPath, ENTER_SPACE_PATH, SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common';
diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control.tsx
index 1afb6c9244f35..cf12634ae188e 100644
--- a/x-pack/plugins/spaces/public/nav_control/nav_control.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/nav_control.tsx
@@ -9,9 +9,9 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
 import type { SpacesManager } from '../spaces_manager';
 
 export function initSpacesNavControl(spacesManager: SpacesManager, core: CoreStart) {
diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
index d4e7ffe510c8f..953c40e946364 100644
--- a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -10,7 +10,7 @@ import { EuiHeaderSectionItemButton, EuiLoadingSpinner, EuiPopover } from '@elas
 import React, { Component, lazy, Suspense } from 'react';
 import type { Subscription } from 'rxjs';
 
-import type { ApplicationStart, Capabilities } from 'src/core/public';
+import type { ApplicationStart, Capabilities } from '@kbn/core/public';
 
 import type { Space } from '../../common';
 import { getSpaceAvatarComponent } from '../space_avatar';
diff --git a/x-pack/plugins/spaces/public/plugin.test.ts b/x-pack/plugins/spaces/public/plugin.test.ts
index 43b701c48b2c2..4a2526ad89fd3 100644
--- a/x-pack/plugins/spaces/public/plugin.test.ts
+++ b/x-pack/plugins/spaces/public/plugin.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/public/mocks';
-import { advancedSettingsMock } from 'src/plugins/advanced_settings/public/mocks';
-import { homePluginMock } from 'src/plugins/home/public/mocks';
+import { advancedSettingsMock } from '@kbn/advanced-settings-plugin/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { homePluginMock } from '@kbn/home-plugin/public/mocks';
 import {
   createManagementSectionMock,
   managementPluginMock,
-} from 'src/plugins/management/public/mocks';
+} from '@kbn/management-plugin/public/mocks';
 
 import { SpacesPlugin } from './plugin';
 
diff --git a/x-pack/plugins/spaces/public/plugin.tsx b/x-pack/plugins/spaces/public/plugin.tsx
index 782cb3ba708a3..827543d112ab8 100644
--- a/x-pack/plugins/spaces/public/plugin.tsx
+++ b/x-pack/plugins/spaces/public/plugin.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import type { AdvancedSettingsSetup } from 'src/plugins/advanced_settings/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { ManagementSetup, ManagementStart } from 'src/plugins/management/public';
+import type { AdvancedSettingsSetup } from '@kbn/advanced-settings-plugin/public';
+import type { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import type { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
 
-import type { FeaturesPluginStart } from '../../features/public';
 import { AdvancedSettingsService } from './advanced_settings';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
 import { ManagementService } from './management';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
index bfd0594f3afa0..c7328718e9f50 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/no_spaces_available.tsx
@@ -8,8 +8,8 @@
 import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
 import React from 'react';
 
+import type { ApplicationStart } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { ApplicationStart } from 'src/core/public';
 
 interface Props {
   application: ApplicationStart;
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx
index 89a5d5700bd44..d5f8f26fbfe97 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/relatives_footer.tsx
@@ -8,8 +8,8 @@
 import { EuiHorizontalRule, EuiText } from '@elastic/eui';
 import React, { useMemo } from 'react';
 
+import type { SavedObjectReferenceWithContext } from '@kbn/core/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { SavedObjectReferenceWithContext } from 'src/core/public';
 
 import type { ShareToSpaceSavedObjectTarget } from '../types';
 
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx
index 174aa0f204439..8d0ac4c27c642 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.test.tsx
@@ -11,9 +11,9 @@ import { act } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import type { SavedObjectReferenceWithContext } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
 import { findTestSubject, mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
-import type { SavedObjectReferenceWithContext } from 'src/core/public';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Space } from '../../../common';
 import { ALL_SPACES_ID } from '../../../common/constants';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx
index 71bbae4aa3178..78e64e035bc45 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout_internal.tsx
@@ -23,9 +23,9 @@ import {
 } from '@elastic/eui';
 import React, { lazy, Suspense, useEffect, useMemo, useState } from 'react';
 
+import type { SavedObjectReferenceWithContext, ToastsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { SavedObjectReferenceWithContext, ToastsStart } from 'src/core/public';
 
 import { ALL_SPACES_ID, UNKNOWN_SPACE } from '../../../common/constants';
 import { DEFAULT_OBJECT_NOUN } from '../../constants';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
index 78bc23281e4c9..6ca7f86fd453c 100644
--- a/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from 'src/core/public';
+import type { SavedObjectsImportResponse, SavedObjectsImportRetry } from '@kbn/core/public';
 
 export interface ShareOptions {
   selectedSpaceIds: string[];
diff --git a/x-pack/plugins/spaces/public/space_avatar/__snapshots__/space_avatar_internal.test.tsx.snap b/x-pack/plugins/spaces/public/space_avatar/__snapshots__/space_avatar_internal.test.tsx.snap
deleted file mode 100644
index b1a0905cb8a5c..0000000000000
--- a/x-pack/plugins/spaces/public/space_avatar/__snapshots__/space_avatar_internal.test.tsx.snap
+++ /dev/null
@@ -1,68 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`removes aria-label when instructed not to announce the space name 1`] = `
-<SpaceAvatarInternal
-  announceSpaceName={false}
-  space={
-    Object {
-      "id": "",
-      "name": "",
-    }
-  }
->
-  <EuiAvatar
-    aria-hidden={true}
-    aria-label=""
-    color="#DA8B45"
-    data-test-subj="space-avatar-"
-    initials=""
-    initialsLength={2}
-    name=""
-    size="m"
-    type="space"
-  >
-    <div
-      aria-hidden={true}
-      aria-label=""
-      className="euiAvatar euiAvatar--m euiAvatar--space"
-      data-test-subj="space-avatar-"
-      role="img"
-      style={
-        Object {
-          "backgroundColor": "#DA8B45",
-          "color": "#000000",
-        }
-      }
-      title=""
-    >
-      <span
-        aria-hidden="true"
-      />
-    </div>
-  </EuiAvatar>
-</SpaceAvatarInternal>
-`;
-
-exports[`renders with a space name entirely made of whitespace 1`] = `
-<EuiAvatar
-  color="#D36086"
-  data-test-subj="space-avatar-"
-  initials=""
-  initialsLength={2}
-  name=""
-  size="m"
-  type="space"
-/>
-`;
-
-exports[`renders without crashing 1`] = `
-<EuiAvatar
-  color="#DA8B45"
-  data-test-subj="space-avatar-"
-  initials=""
-  initialsLength={2}
-  name=""
-  size="m"
-  type="space"
-/>
-`;
diff --git a/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.test.tsx b/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.test.tsx
index e5db20091bf24..b42208c965a40 100644
--- a/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/space_avatar/space_avatar_internal.test.tsx
@@ -10,19 +10,66 @@ import React from 'react';
 
 import { SpaceAvatarInternal } from './space_avatar_internal';
 
+jest.mock('@elastic/eui', () => ({
+  ...jest.requireActual('@elastic/eui'),
+  EuiAvatar: () => <></>, // we mock this to avoid asserting what the internals of the avatar looks like in our snapshots below
+}));
+
 test('renders without crashing', () => {
   const wrapper = shallow(<SpaceAvatarInternal space={{ name: '', id: '' }} />);
-  expect(wrapper).toMatchSnapshot();
+  expect(wrapper).toMatchInlineSnapshot(`
+    <EuiAvatar
+      color="#DA8B45"
+      data-test-subj="space-avatar-"
+      initials=""
+      initialsLength={2}
+      name=""
+      size="m"
+      type="space"
+    />
+  `);
 });
 
 test('renders with a space name entirely made of whitespace', () => {
   const wrapper = shallow(<SpaceAvatarInternal space={{ name: '      ', id: '' }} />);
-  expect(wrapper).toMatchSnapshot();
+  expect(wrapper).toMatchInlineSnapshot(`
+    <EuiAvatar
+      color="#D36086"
+      data-test-subj="space-avatar-"
+      initials=""
+      initialsLength={2}
+      name=""
+      size="m"
+      type="space"
+    />
+  `);
 });
 
 test('removes aria-label when instructed not to announce the space name', () => {
   const wrapper = mount(
     <SpaceAvatarInternal space={{ name: '', id: '' }} announceSpaceName={false} />
   );
-  expect(wrapper).toMatchSnapshot();
+  expect(wrapper).toMatchInlineSnapshot(`
+    <SpaceAvatarInternal
+      announceSpaceName={false}
+      space={
+        Object {
+          "id": "",
+          "name": "",
+        }
+      }
+    >
+      <EuiAvatar
+        aria-hidden={true}
+        aria-label=""
+        color="#DA8B45"
+        data-test-subj="space-avatar-"
+        initials=""
+        initialsLength={2}
+        name=""
+        size="m"
+        type="space"
+      />
+    </SpaceAvatarInternal>
+  `);
 });
diff --git a/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx b/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx
index de407c2d51c2a..db753d7b57ce9 100644
--- a/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/space_list/space_list_internal.test.tsx
@@ -9,8 +9,8 @@ import { act } from '@testing-library/react';
 import type { ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import type { Space } from '../../common';
 import { getSpacesContextProviderWrapper } from '../spaces_context';
@@ -81,7 +81,7 @@ describe('SpaceListInternal', () => {
     return wrapper.find('EuiButtonEmpty');
   }
   async function getListClickTarget(wrapper: ReactWrapper) {
-    return (await wrapper.find('[data-test-subj="space-avatar-alpha"]')).first();
+    return (await wrapper.find('[data-test-subj="space-avatar-alpha"]')).last();
   }
 
   describe('using default properties', () => {
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
index f785d5dbf3677..4d3a03852e49f 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector.tsx
@@ -19,15 +19,12 @@ import {
 import React, { Component, Fragment } from 'react';
 import ReactDOM from 'react-dom';
 
+import type { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { KibanaPageTemplate, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaSolutionAvatar } from '@kbn/shared-ux-components';
-import type { AppMountParameters, CoreStart } from 'src/core/public';
 
-import {
-  KibanaPageTemplate,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
 import type { Space } from '../../common';
 import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../common/constants';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx b/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
index d6935e065815d..2ef3d9836bf3c 100644
--- a/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
+++ b/x-pack/plugins/spaces/public/space_selector/space_selector_app.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { ApplicationSetup, AppMountParameters, StartServicesAccessor } from 'src/core/public';
 
 import type { SpacesManager } from '../spaces_manager';
 
diff --git a/x-pack/plugins/spaces/public/spaces_context/context.tsx b/x-pack/plugins/spaces/public/spaces_context/context.tsx
index 639960c1724a5..820c993ccac59 100644
--- a/x-pack/plugins/spaces/public/spaces_context/context.tsx
+++ b/x-pack/plugins/spaces/public/spaces_context/context.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import type { SpacesManager } from '../spaces_manager';
 import type { SpacesData } from '../types';
diff --git a/x-pack/plugins/spaces/public/spaces_context/types.ts b/x-pack/plugins/spaces/public/spaces_context/types.ts
index d3a6859875b9c..1ca0985c1b62d 100644
--- a/x-pack/plugins/spaces/public/spaces_context/types.ts
+++ b/x-pack/plugins/spaces/public/spaces_context/types.ts
@@ -7,7 +7,7 @@
 
 import type * as React from 'react';
 
-import type { CoreStart, StartServicesAccessor } from 'src/core/public';
+import type { CoreStart, StartServicesAccessor } from '@kbn/core/public';
 
 import type { PluginsStart } from '../plugin';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx b/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx
index f0a263958c5eb..f316ff3001631 100644
--- a/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx
+++ b/x-pack/plugins/spaces/public/spaces_context/wrapper_internal.tsx
@@ -8,7 +8,7 @@
 import type { PropsWithChildren } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import type { ApplicationStart, DocLinksStart, NotificationsStart } from 'src/core/public';
+import type { ApplicationStart, DocLinksStart, NotificationsStart } from '@kbn/core/public';
 
 import type { GetAllSpacesPurpose } from '../../common';
 import type { SpacesManager } from '../spaces_manager';
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
index f1e4b767b934c..bed49326efea5 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
-import { coreMock } from 'src/core/public/mocks';
 
 import { SpacesManager } from './spaces_manager';
 
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
index 62f3a39a6b48b..540667931e49b 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -12,7 +12,7 @@ import { skipWhile } from 'rxjs/operators';
 import type {
   HttpSetup,
   SavedObjectsCollectMultiNamespaceReferencesResponse,
-} from 'src/core/public';
+} from '@kbn/core/public';
 
 import type {
   GetAllSpacesOptions,
diff --git a/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx b/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx
index e2a1ce69deee8..4faea19df4e36 100644
--- a/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx
+++ b/x-pack/plugins/spaces/public/suspense_error_boundary/suspense_error_boundary.tsx
@@ -9,8 +9,8 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 import type { PropsWithChildren } from 'react';
 import React, { Component, Suspense } from 'react';
 
+import type { NotificationsStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import type { NotificationsStart } from 'src/core/public';
 
 interface Props {
   notifications: NotificationsStart;
diff --git a/x-pack/plugins/spaces/public/ui_api/components.tsx b/x-pack/plugins/spaces/public/ui_api/components.tsx
index a0200adf01b48..c6623dfaf508b 100644
--- a/x-pack/plugins/spaces/public/ui_api/components.tsx
+++ b/x-pack/plugins/spaces/public/ui_api/components.tsx
@@ -8,7 +8,7 @@
 import type { FC, PropsWithChildren, PropsWithRef } from 'react';
 import React from 'react';
 
-import type { StartServicesAccessor } from 'src/core/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
 import { getCopyToSpaceFlyoutComponent } from '../copy_saved_objects_to_space';
 import { getEmbeddableLegacyUrlConflict, getLegacyUrlConflict } from '../legacy_urls';
diff --git a/x-pack/plugins/spaces/public/ui_api/index.ts b/x-pack/plugins/spaces/public/ui_api/index.ts
index a8c77dce6fdff..ad38a92784545 100644
--- a/x-pack/plugins/spaces/public/ui_api/index.ts
+++ b/x-pack/plugins/spaces/public/ui_api/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { StartServicesAccessor } from 'src/core/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
 import { createRedirectLegacyUrl } from '../legacy_urls';
 import type { PluginsStart } from '../plugin';
diff --git a/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx b/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx
index 384eee6c439c9..819ef2f17f94d 100644
--- a/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx
+++ b/x-pack/plugins/spaces/public/ui_api/lazy_wrapper.tsx
@@ -9,7 +9,7 @@ import type { FC, PropsWithChildren, PropsWithRef, ReactElement } from 'react';
 import React, { lazy, useMemo } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
-import type { StartServicesAccessor } from 'src/core/public';
+import type { StartServicesAccessor } from '@kbn/core/public';
 
 import type { PluginsStart } from '../plugin';
 import { SuspenseErrorBoundary } from '../suspense_error_boundary';
diff --git a/x-pack/plugins/spaces/public/ui_api/types.ts b/x-pack/plugins/spaces/public/ui_api/types.ts
index 4fbba0c0af3e3..53161e9b5d540 100644
--- a/x-pack/plugins/spaces/public/ui_api/types.ts
+++ b/x-pack/plugins/spaces/public/ui_api/types.ts
@@ -7,7 +7,7 @@
 
 import type { ReactElement } from 'react';
 
-import type { CoreStart } from 'src/core/public';
+import type { CoreStart } from '@kbn/core/public';
 
 import type { CopyToSpaceFlyoutProps } from '../copy_saved_objects_to_space';
 import type {
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
index 45c4d41112d7d..92c1c07622ac9 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import type { Capabilities, CoreSetup } from 'src/core/server';
-import { coreMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import type { Capabilities, CoreSetup } from '@kbn/core/server';
+import { coreMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 
-import type { KibanaFeature } from '../../../features/server';
-import { featuresPluginMock } from '../../../features/server/mocks';
 import type { Space } from '../../common';
 import type { PluginsStart } from '../plugin';
 import { spacesServiceMock } from '../spaces_service/spaces_service.mock';
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
index ac2ff735de797..4f2b61abc8025 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
@@ -7,9 +7,9 @@
 
 import _ from 'lodash';
 
-import type { Capabilities, CapabilitiesSwitcher, CoreSetup, Logger } from 'src/core/server';
+import type { Capabilities, CapabilitiesSwitcher, CoreSetup, Logger } from '@kbn/core/server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
 
-import type { KibanaFeature } from '../../../features/server';
 import type { Space } from '../../common';
 import type { PluginsStart } from '../plugin';
 import type { SpacesServiceStart } from '../spaces_service';
diff --git a/x-pack/plugins/spaces/server/capabilities/index.ts b/x-pack/plugins/spaces/server/capabilities/index.ts
index 4b23290bfd0ac..47f19b2d8b264 100644
--- a/x-pack/plugins/spaces/server/capabilities/index.ts
+++ b/x-pack/plugins/spaces/server/capabilities/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import type { PluginsStart } from '../plugin';
 import type { SpacesServiceStart } from '../spaces_service';
diff --git a/x-pack/plugins/spaces/server/config.ts b/x-pack/plugins/spaces/server/config.ts
index 7b4c85e3edcdc..980c034da9b61 100644
--- a/x-pack/plugins/spaces/server/config.ts
+++ b/x-pack/plugins/spaces/server/config.ts
@@ -9,7 +9,7 @@ import type { Observable } from 'rxjs';
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
-import type { PluginInitializerContext } from 'src/core/server';
+import type { PluginInitializerContext } from '@kbn/core/server';
 
 export const ConfigSchema = schema.object({
   maxSpaces: schema.number({ defaultValue: 1000 }),
diff --git a/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts b/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts
index 93c0ec3319d5c..25a98d09a2bb8 100644
--- a/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts
+++ b/x-pack/plugins/spaces/server/default_space/create_default_space.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { createDefaultSpace } from './create_default_space';
 
diff --git a/x-pack/plugins/spaces/server/default_space/create_default_space.ts b/x-pack/plugins/spaces/server/default_space/create_default_space.ts
index a982feff59692..a7aee5a6d0ea1 100644
--- a/x-pack/plugins/spaces/server/default_space/create_default_space.ts
+++ b/x-pack/plugins/spaces/server/default_space/create_default_space.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import type { Logger, SavedObjectsRepository, SavedObjectsServiceStart } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
-import type { Logger, SavedObjectsRepository, SavedObjectsServiceStart } from 'src/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 
 interface Deps {
diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts
index d8a1689ae3bd6..5aaeb97ae76c4 100644
--- a/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts
+++ b/x-pack/plugins/spaces/server/default_space/default_space_service.test.ts
@@ -6,16 +6,15 @@
  */
 
 import * as Rx from 'rxjs';
-import { first } from 'rxjs/operators';
 
+import type { CoreStatus, SavedObjectsRepository, ServiceStatusLevel } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers, ServiceStatusLevels } from '@kbn/core/server';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import type { ILicense } from '@kbn/licensing-plugin/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { nextTick } from '@kbn/test-jest-helpers';
 import type { Writable } from '@kbn/utility-types';
-import type { CoreStatus, SavedObjectsRepository, ServiceStatusLevel } from 'src/core/server';
-import { SavedObjectsErrorHelpers, ServiceStatusLevels } from 'src/core/server';
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
 
-import type { ILicense } from '../../../licensing/server';
-import { licensingMock } from '../../../licensing/server/mocks';
 import { SpacesLicenseService } from '../../common/licensing';
 import {
   DefaultSpaceService,
@@ -99,7 +98,7 @@ test(`does not initialize if elasticsearch is unavailable`, async () => {
   expect(repository.get).not.toHaveBeenCalled();
   expect(repository.create).not.toHaveBeenCalled();
 
-  const status = await serviceStatus$.pipe(first()).toPromise();
+  const status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(`"required core services are not ready"`);
 });
@@ -120,7 +119,7 @@ test(`does not initialize if savedObjects is unavailable`, async () => {
 
   expect(repository.get).not.toHaveBeenCalled();
   expect(repository.create).not.toHaveBeenCalled();
-  const status = await serviceStatus$.pipe(first()).toPromise();
+  const status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(`"required core services are not ready"`);
 });
@@ -141,7 +140,7 @@ test(`does not initialize if the license is unavailable`, async () => {
 
   expect(repository.get).not.toHaveBeenCalled();
   expect(repository.create).not.toHaveBeenCalled();
-  const status = await serviceStatus$.pipe(first()).toPromise();
+  const status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(`"missing or invalid license"`);
 });
@@ -163,7 +162,7 @@ test(`initializes once all dependencies are met`, async () => {
   expect(repository.get).not.toHaveBeenCalled();
   expect(repository.create).not.toHaveBeenCalled();
 
-  const status = await serviceStatus$.pipe(first()).toPromise();
+  const status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(`"required core services are not ready"`);
 
@@ -183,7 +182,7 @@ test(`initializes once all dependencies are met`, async () => {
   expect(repository.get).toHaveBeenCalled();
   expect(repository.create).toHaveBeenCalled();
 
-  const nextStatus = await serviceStatus$.pipe(first()).toPromise();
+  const nextStatus = await Rx.firstValueFrom(serviceStatus$);
   expect(nextStatus.level).toEqual(ServiceStatusLevels.available);
   expect(nextStatus.summary).toMatchInlineSnapshot(`"ready"`);
 });
@@ -207,7 +206,7 @@ test('maintains unavailable status if default space cannot be created', async ()
   expect(repository.get).toHaveBeenCalled();
   expect(repository.create).toHaveBeenCalled();
 
-  const status = await serviceStatus$.pipe(first()).toPromise();
+  const status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(
     `"Error creating default space: something bad happened"`
@@ -235,7 +234,7 @@ test('retries operation', async () => {
   expect(repository.get).toHaveBeenCalledTimes(1);
   expect(repository.create).toHaveBeenCalledTimes(1);
 
-  let status = await serviceStatus$.pipe(first()).toPromise();
+  let status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(
     `"Error creating default space: something bad happened"`
@@ -247,7 +246,7 @@ test('retries operation', async () => {
   expect(repository.get).toHaveBeenCalledTimes(2);
   expect(repository.create).toHaveBeenCalledTimes(2);
 
-  status = await serviceStatus$.pipe(first()).toPromise();
+  status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(
     `"Error creating default space: something bad happened"`
@@ -262,7 +261,7 @@ test('retries operation', async () => {
   expect(repository.get).toHaveBeenCalledTimes(2);
   expect(repository.create).toHaveBeenCalledTimes(2);
 
-  status = await serviceStatus$.pipe(first()).toPromise();
+  status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.unavailable);
   expect(status.summary).toMatchInlineSnapshot(
     `"Error creating default space: something bad happened"`
@@ -274,7 +273,7 @@ test('retries operation', async () => {
   expect(repository.get).toHaveBeenCalledTimes(3);
   expect(repository.create).toHaveBeenCalledTimes(3);
 
-  status = await serviceStatus$.pipe(first()).toPromise();
+  status = await Rx.firstValueFrom(serviceStatus$);
   expect(status.level).toEqual(ServiceStatusLevels.available);
   expect(status.summary).toMatchInlineSnapshot(`"ready"`);
 });
diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.ts
index f4418c0a5e358..8ba115e5d32f5 100644
--- a/x-pack/plugins/spaces/server/default_space/default_space_service.ts
+++ b/x-pack/plugins/spaces/server/default_space/default_space_service.ts
@@ -9,10 +9,10 @@ import type { Observable, ObservableInput, Subscription } from 'rxjs';
 import { BehaviorSubject, combineLatest, concat, defer, of, timer } from 'rxjs';
 import { catchError, mergeMap, switchMap, tap } from 'rxjs/operators';
 
-import type { CoreSetup, Logger, SavedObjectsServiceStart, ServiceStatus } from 'src/core/server';
+import type { CoreSetup, Logger, SavedObjectsServiceStart, ServiceStatus } from '@kbn/core/server';
+import { ServiceStatusLevels } from '@kbn/core/server';
+import type { ILicense } from '@kbn/licensing-plugin/server';
 
-import { ServiceStatusLevels } from '../../../../../src/core/server';
-import type { ILicense } from '../../../licensing/server';
 import type { SpacesLicense } from '../../common/licensing';
 import { createDefaultSpace } from './create_default_space';
 
diff --git a/x-pack/plugins/spaces/server/index.ts b/x-pack/plugins/spaces/server/index.ts
index 6628d75a36494..bad6969f2a3a1 100644
--- a/x-pack/plugins/spaces/server/index.ts
+++ b/x-pack/plugins/spaces/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
 import { ConfigSchema } from './config';
 import { SpacesPlugin } from './plugin';
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
index 24e6323cc9500..6335b95c1733d 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
@@ -11,14 +11,14 @@ import type {
   SavedObjectsExportByObjectOptions,
   SavedObjectsImportResponse,
   SavedObjectsImportSuccess,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { copySavedObjectsToSpacesFactory } from './copy_to_spaces';
 
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
index ed09c4d39d137..102e072d7c5d7 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
@@ -7,7 +7,7 @@
 
 import type { Readable } from 'stream';
 
-import type { CoreStart, KibanaRequest, SavedObject } from 'src/core/server';
+import type { CoreStart, KibanaRequest, SavedObject } from '@kbn/core/server';
 
 import { ALL_SPACES_ID } from '../../../common/constants';
 import { spaceIdToNamespace } from '../utils/namespace';
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts
index 4ef08381f2aee..91ea5f20b7eb7 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/create_empty_failure_response.ts
@@ -8,7 +8,7 @@
 import type { Payload } from '@hapi/boom';
 import Boom from '@hapi/boom';
 
-import type { SavedObjectsImportError } from 'src/core/server';
+import type { SavedObjectsImportError } from '@kbn/core/server';
 
 export const createEmptyFailureResponse = (errors?: Array<SavedObjectsImportError | Boom.Boom>) => {
   const errorMessages: Array<SavedObjectsImportError | Payload> = (errors || []).map((error) => {
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
index 80ff7a6b12ed1..ff21b0a5af84d 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectTypeRegistry } from 'src/core/server';
+import type { SavedObjectTypeRegistry } from '@kbn/core/server';
 
 /**
  * This function returns any importable/exportable saved object types that are namespace-agnostic. Even if these are eligible for
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts
index 83d10e5f1a27c..f548f5e2f6c99 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/saved_objects_client_opts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientProviderOptions } from 'src/core/server';
+import type { SavedObjectsClientProviderOptions } from '@kbn/core/server';
 
 export const COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS: SavedObjectsClientProviderOptions = {
   excludedWrappers: ['spaces'],
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
index 374892d018db9..14c08b876feda 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
@@ -12,14 +12,14 @@ import type {
   SavedObjectsImportResponse,
   SavedObjectsImportSuccess,
   SavedObjectsResolveImportErrorsOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { resolveCopySavedObjectsToSpacesConflictsFactory } from './resolve_copy_conflicts';
 
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
index 72a3921618ddc..42dbb0f2f3e2a 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
@@ -12,7 +12,7 @@ import type {
   KibanaRequest,
   SavedObject,
   SavedObjectsImportRetry,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { spaceIdToNamespace } from '../utils/namespace';
 import { createEmptyFailureResponse } from './lib/create_empty_failure_response';
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
index a6c5517743488..127b0c055ae95 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
@@ -12,7 +12,7 @@ import type {
   SavedObjectsImportFailure,
   SavedObjectsImportRetry,
   SavedObjectsImportSuccess,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 export interface CopyOptions {
   objects: Array<{ type: string; id: string }>;
diff --git a/x-pack/plugins/spaces/server/lib/errors.ts b/x-pack/plugins/spaces/server/lib/errors.ts
index 7e20fd72a9517..5d2c59055a1b4 100644
--- a/x-pack/plugins/spaces/server/lib/errors.ts
+++ b/x-pack/plugins/spaces/server/lib/errors.ts
@@ -7,7 +7,7 @@
 
 import { boomify, isBoom } from '@hapi/boom';
 
-import type { CustomHttpResponseOptions, ResponseError } from 'src/core/server';
+import type { CustomHttpResponseOptions, ResponseError } from '@kbn/core/server';
 
 export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
   const boom = isBoom(error) ? error : boomify(error);
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
index 7cc7f67938d2e..f780ee704e319 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
@@ -8,14 +8,14 @@
 import Boom from '@hapi/boom';
 
 // @ts-ignore
+import type { CoreSetup, IBasePath, IRouter } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { kibanaTestUser } from '@kbn/test';
-import type { CoreSetup, IBasePath, IRouter } from 'src/core/server';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
-import type { KibanaFeature } from '../../../../features/server';
-import { featuresPluginMock } from '../../../../features/server/mocks';
 import { convertSavedObjectToSpace } from '../../routes/lib';
 import { spacesClientServiceMock } from '../../spaces_client/spaces_client_service.mock';
 import { SpacesService } from '../../spaces_service';
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
index f5b41786d2478..99f0bc8f1e5ce 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import type { Space } from '../../../common';
 import { addSpaceIdToPath } from '../../../common';
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
index abc960f7eab62..8e3eb5a555212 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
@@ -12,9 +12,9 @@ import type {
   IRouter,
   KibanaRequest,
   KibanaResponseFactory,
-} from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
-import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
+} from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import * as kbnTestServer from '@kbn/core/test_helpers/kbn_server';
 
 import { initSpacesOnRequestInterceptor } from './on_request_interceptor';
 
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts
index 19872e8470319..61d7ac23818ad 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.ts
@@ -10,7 +10,7 @@ import type {
   KibanaRequest,
   LifecycleResponseFactory,
   OnPreRoutingToolkit,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import { getSpaceIdFromPath } from '../../../common';
 
diff --git a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
index a7bb34824096f..0c07a77468f6f 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { spacesClientServiceMock } from '../spaces_client/spaces_client_service.mock';
diff --git a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts
index 368e1b2cf5a2c..1d7ab6d6f2704 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../spaces_service/spaces_service';
 
diff --git a/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts b/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts
index 08435f338fa3a..e2985ded40284 100644
--- a/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/__mocks__/index.ts
@@ -7,7 +7,7 @@
 
 const mockNamespaceIdToString = jest.fn();
 const mockNamespaceStringToId = jest.fn();
-jest.mock('../../../../../../../src/core/server', () => ({
+jest.mock('@kbn/core/server', () => ({
   SavedObjectsUtils: {
     namespaceIdToString: mockNamespaceIdToString,
     namespaceStringToId: mockNamespaceStringToId,
diff --git a/x-pack/plugins/spaces/server/lib/utils/namespace.ts b/x-pack/plugins/spaces/server/lib/utils/namespace.ts
index e1c252597fb61..9422de22eea53 100644
--- a/x-pack/plugins/spaces/server/lib/utils/namespace.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/namespace.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsUtils } from '../../../../../../src/core/server';
+import { SavedObjectsUtils } from '@kbn/core/server';
 
 /**
  * Converts a Space ID string to its namespace ID representation. Note that a Space ID string is equivalent to a namespace string.
diff --git a/x-pack/plugins/spaces/server/plugin.test.ts b/x-pack/plugins/spaces/server/plugin.test.ts
index c5732fc4045bb..024ae1e60100a 100644
--- a/x-pack/plugins/spaces/server/plugin.test.ts
+++ b/x-pack/plugins/spaces/server/plugin.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { usageCollectionPluginMock } from 'src/plugins/usage_collection/server/mocks';
+import type { CoreSetup } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
-import { featuresPluginMock } from '../../features/server/mocks';
-import { licensingMock } from '../../licensing/server/mocks';
 import type { PluginsStart } from './plugin';
 import { SpacesPlugin } from './plugin';
 
diff --git a/x-pack/plugins/spaces/server/plugin.ts b/x-pack/plugins/spaces/server/plugin.ts
index 6ed718ed3f301..ad73be5e5c19b 100644
--- a/x-pack/plugins/spaces/server/plugin.ts
+++ b/x-pack/plugins/spaces/server/plugin.ts
@@ -13,15 +13,15 @@ import type {
   Logger,
   Plugin,
   PluginInitializerContext,
-} from 'src/core/server';
-import type { HomeServerPluginSetup } from 'src/plugins/home/server';
-import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-
+} from '@kbn/core/server';
 import type {
   PluginSetupContract as FeaturesPluginSetup,
   PluginStartContract as FeaturesPluginStart,
-} from '../../features/server';
-import type { LicensingPluginSetup } from '../../licensing/server';
+} from '@kbn/features-plugin/server';
+import type { HomeServerPluginSetup } from '@kbn/home-plugin/server';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+
 import { SpacesLicenseService } from '../common/licensing';
 import { setupCapabilities } from './capabilities';
 import type { ConfigType } from './config';
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts
index d48233a75c59c..d1e26143de906 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_repository.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { ISavedObjectsRepository } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import type { ISavedObjectsRepository } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 export const createMockSavedObjectsRepository = (spaces: any[] = []) => {
   const mockSavedObjectsClientContract = {
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
index be0b402364ecc..585e30b51f193 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { SavedObject, SavedObjectsUpdateResponse } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
+import type { SavedObject, SavedObjectsUpdateResponse } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   coreMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
   savedObjectsTypeRegistryMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 export const createMockSavedObjectsService = (spaces: any[] = []) => {
   const typeRegistry = savedObjectsTypeRegistryMock.create();
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts
index 1d2cb6f37cfbe..d1044a6dd1a2a 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RequestHandlerContext } from 'src/core/server';
+import type { RequestHandlerContext } from '@kbn/core/server';
 
 export const mockRouteContext = {
   licensing: {
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
index f200017b620c4..876c9b772fddf 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
index 6815d19883d26..9b9a3488cc724 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
@@ -8,15 +8,15 @@
 import _ from 'lodash';
 
 import { schema } from '@kbn/config-schema';
-import type { SavedObject } from 'src/core/server';
+import type { SavedObject } from '@kbn/core/server';
 
+import type { ExternalRouteDeps } from '.';
 import {
   copySavedObjectsToSpacesFactory,
   resolveCopySavedObjectsToSpacesConflictsFactory,
 } from '../../../lib/copy_to_spaces';
 import { SPACE_ID_REGEX } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 type SavedObjectIdentifier = Pick<SavedObject, 'id' | 'type'>;
 
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
index 2ad392d48b2ae..95260615e86f4 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory, SavedObjectsErrorHelpers } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory, SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.ts
index 7d70cd1bb3664..b2f0d71d34a21 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.ts
@@ -8,11 +8,11 @@
 import Boom from '@hapi/boom';
 
 import { schema } from '@kbn/config-schema';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initDeleteSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, log, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts
index e475b6b21569a..b4fa5d677b255 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.test.ts
@@ -7,14 +7,14 @@
 
 import * as Rx from 'rxjs';
 
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts
index a14744ddc5eeb..ff523ea99c06b 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/disable_legacy_url_aliases.ts
@@ -7,9 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initDisableLegacyUrlAliasesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getSpacesService, usageStatsServicePromise } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
index 5ebe09444934b..818c748a97498 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
@@ -7,13 +7,13 @@
 
 import * as Rx from 'rxjs';
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get.ts b/x-pack/plugins/spaces/server/routes/api/external/get.ts
index 2cc0984b8ab93..a26cfe0211d16 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initGetSpaceApi(deps: ExternalRouteDeps) {
   const { externalRouter, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
index e1d10ccd3cfe6..923d1668f59a6 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
@@ -8,13 +8,13 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
index 09a4ac5a843a6..06d629a194560 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
@@ -7,10 +7,10 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import type { Space } from '../../../../common';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initGetAllSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, log, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts
index 1100f767c33b8..5a1046579bfde 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.test.ts
@@ -7,14 +7,14 @@
 
 import * as Rx from 'rxjs';
 
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts
index a7afd38dcecb0..ec5b0ce82ece4 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_shareable_references.ts
@@ -7,9 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initGetShareableReferencesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getStartServices } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/index.ts b/x-pack/plugins/spaces/server/routes/api/external/index.ts
index c42e57dea736d..b4126e76a7110 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/index.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../../../spaces_service';
 import type { SpacesRouter } from '../../../types';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
index 56104c247e23d..8107b6f341745 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.ts b/x-pack/plugins/spaces/server/routes/api/external/post.ts
index c2ea044741574..3ea6da647b4f2 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/post.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/post.ts
@@ -7,11 +7,12 @@
 
 import Boom from '@hapi/boom';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+
+import type { ExternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { spaceSchema } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initPostSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, log, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
index 760558572628a..5c82f0dd48ed9 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.ts b/x-pack/plugins/spaces/server/routes/api/external/put.ts
index 196f7c11932eb..fb9f818576580 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/put.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/put.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers } from '../../../../../../../src/core/server';
+import type { ExternalRouteDeps } from '.';
 import type { Space } from '../../../../common';
 import { wrapError } from '../../../lib/errors';
 import { spaceSchema } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initPutSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts
index 06968c3bcb50e..0e7808dccfc1b 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.test.ts
@@ -8,14 +8,14 @@
 import * as Rx from 'rxjs';
 
 import type { ObjectType } from '@kbn/config-schema';
-import type { RouteValidatorConfig } from 'src/core/server';
-import { kibanaResponseFactory } from 'src/core/server';
+import type { RouteValidatorConfig } from '@kbn/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import {
   coreMock,
   httpServerMock,
   httpServiceMock,
   loggingSystemMock,
-} from 'src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { SpacesClientService } from '../../../spaces_client';
diff --git a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts
index 4486d4b3ade09..ea95557514d52 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/update_objects_spaces.ts
@@ -7,11 +7,11 @@
 
 import { schema } from '@kbn/config-schema';
 
+import type { ExternalRouteDeps } from '.';
 import { ALL_SPACES_ID } from '../../../../common/constants';
 import { wrapError } from '../../../lib/errors';
 import { SPACE_ID_REGEX } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import type { ExternalRouteDeps } from './';
 
 export function initUpdateObjectsSpacesApi(deps: ExternalRouteDeps) {
   const { externalRouter, getStartServices } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
index 2a0b3821f1e7f..6c239a7d0c9be 100644
--- a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { coreMock, httpServerMock, httpServiceMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock, httpServerMock, httpServiceMock } from '@kbn/core/server/mocks';
 
 import { spacesClientServiceMock } from '../../../spaces_client/spaces_client_service.mock';
 import { SpacesService } from '../../../spaces_service';
diff --git a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts
index ba96620467376..feb6d8b59628b 100644
--- a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts
+++ b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import type { InternalRouteDeps } from '.';
 import { wrapError } from '../../../lib/errors';
 import { createLicensedRouteHandler } from '../../lib';
-import type { InternalRouteDeps } from './';
 
 export function initGetActiveSpaceApi(deps: InternalRouteDeps) {
   const { internalRouter, getSpacesService } = deps;
diff --git a/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts b/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts
index 42d5719006e54..19b163e31e31f 100644
--- a/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts
+++ b/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import type { RequestHandler, RequestHandlerContext } from 'src/core/server';
-
-import type { LicensingApiRequestHandlerContext } from '../../../../licensing/server';
+import type { RequestHandler, RequestHandlerContext } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 export const createLicensedRouteHandler = <
   P,
diff --git a/x-pack/plugins/spaces/server/routes/views/index.ts b/x-pack/plugins/spaces/server/routes/views/index.ts
index 18222f9122559..de33027f5be45 100644
--- a/x-pack/plugins/spaces/server/routes/views/index.ts
+++ b/x-pack/plugins/spaces/server/routes/views/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { HttpResources, IBasePath, Logger } from 'src/core/server';
+import type { HttpResources, IBasePath, Logger } from '@kbn/core/server';
 
 import { ENTER_SPACE_PATH } from '../../../common';
 import { wrapError } from '../../lib/errors';
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts
index c26983e84de57..28d4e42cfb9cf 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/space_migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { Space } from '../../../common';
 
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts
index 3cece7dcbb553..c8beb16c4df08 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { UsageStats } from '../../usage_stats';
 import { migrateTo7141 } from './usage_stats_migrations';
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts
index 974b9ee1078b8..51f447b4f803b 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/usage_stats_migrations.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep } from 'lodash';
 
-import type { SavedObjectUnsanitizedDoc } from 'src/core/server';
+import type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
 
 import type { UsageStats } from '../../usage_stats';
 
diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts
index c9050da88d1bb..4e2a12955d702 100644
--- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_client_wrapper_factory.ts
@@ -8,7 +8,7 @@
 import type {
   SavedObjectsClientWrapperFactory,
   SavedObjectsClientWrapperOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../spaces_service/spaces_service';
 import { SpacesSavedObjectsClient } from './spaces_saved_objects_client';
diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts
index 4cc94a6c39da5..27e632052dcb6 100644
--- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock } from 'src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 
 import { spacesServiceMock } from '../spaces_service/spaces_service.mock';
 import { SPACES_USAGE_STATS_TYPE } from '../usage_stats';
diff --git a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts
index 2e2bad9ff0994..9a90a26a647d3 100644
--- a/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/saved_objects_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup } from 'src/core/server';
+import type { CoreSetup } from '@kbn/core/server';
 
 import type { SpacesServiceStart } from '../spaces_service';
 import { SPACES_USAGE_STATS_TYPE } from '../usage_stats';
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 f52432786872e..0060039f6f2ca 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
@@ -7,9 +7,9 @@
 
 import Boom from '@hapi/boom';
 
-import type { SavedObject, SavedObjectsType } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from 'src/core/server/mocks';
+import type { SavedObject, SavedObjectsType } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { savedObjectsClientMock, savedObjectsTypeRegistryMock } from '@kbn/core/server/mocks';
 
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { spacesClientMock } from '../spaces_client/spaces_client.mock';
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
index 5149f8695284c..630a1baf2ef95 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
@@ -30,9 +30,9 @@ import type {
   SavedObjectsUpdateObjectsSpacesObject,
   SavedObjectsUpdateObjectsSpacesOptions,
   SavedObjectsUpdateOptions,
-} from 'src/core/server';
+} from '@kbn/core/server';
+import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '@kbn/core/server';
 
-import { SavedObjectsErrorHelpers, SavedObjectsUtils } from '../../../../../src/core/server';
 import { ALL_SPACES_ID } from '../../common/constants';
 import { spaceIdToNamespace } from '../lib/utils/namespace';
 import type { ISpacesClient } from '../spaces_client';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts
index 97a26447ad297..d18fe5d5ec3a9 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 import type { Space } from '../../common';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
index 86b2886d2461a..c1a51c5c52442 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 import type { GetAllSpacesPurpose } from '../../common';
 import type { ConfigType } from '../config';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
index 2bd51a13bc642..cfc001d570c8d 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
@@ -12,7 +12,7 @@ import type {
   ISavedObjectsPointInTimeFinder,
   ISavedObjectsRepository,
   SavedObject,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type {
   GetAllSpacesOptions,
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts
index 7ce9ea798c884..36a4438266239 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.test.ts
@@ -7,7 +7,7 @@
 
 import * as Rx from 'rxjs';
 
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import type { ConfigType } from '../config';
 import { spacesConfig } from '../lib/__fixtures__';
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
index cf7766decc2dd..21b6de36dbd3f 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
@@ -12,7 +12,7 @@ import type {
   ISavedObjectsRepository,
   KibanaRequest,
   SavedObjectsServiceStart,
-} from 'src/core/server';
+} from '@kbn/core/server';
 
 import type { ConfigType } from '../config';
 import type { ISpacesClient } from './spaces_client';
diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
index 7b8fd40105bc4..cf7e27941508c 100644
--- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
@@ -7,9 +7,9 @@
 
 import * as Rx from 'rxjs';
 
-import type { HttpServiceSetup, KibanaRequest, SavedObjectsRepository } from 'src/core/server';
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { coreMock, httpServerMock } from 'src/core/server/mocks';
+import type { HttpServiceSetup, KibanaRequest, SavedObjectsRepository } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { coreMock, httpServerMock } from '@kbn/core/server/mocks';
 
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { getSpaceIdFromPath } from '../../common/lib/spaces_url_parser';
diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
index 36b9ed25fa541..4a2385cf746a6 100644
--- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
+++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IBasePath, KibanaRequest } from 'src/core/server';
+import type { IBasePath, KibanaRequest } from '@kbn/core/server';
 
 import type { Space } from '../../common';
 import { getSpaceIdFromPath } from '../../common';
diff --git a/x-pack/plugins/spaces/server/types.ts b/x-pack/plugins/spaces/server/types.ts
index 9fc70fedd30d0..789f66fe2cbda 100644
--- a/x-pack/plugins/spaces/server/types.ts
+++ b/x-pack/plugins/spaces/server/types.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 
 /**
  * @internal
diff --git a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts
index 59c28034c321c..abf9af3f8afca 100644
--- a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts
+++ b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts
@@ -7,11 +7,11 @@
 
 import * as Rx from 'rxjs';
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { KibanaFeature } from '@kbn/features-plugin/server';
+import type { ILicense, LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 
-import { createCollectorFetchContextMock } from '../../../../../src/plugins/usage_collection/server/mocks';
-import type { KibanaFeature } from '../../../features/server';
-import type { ILicense, LicensingPluginSetup } from '../../../licensing/server';
 import type { PluginsSetup } from '../plugin';
 import type { UsageStats } from '../usage_stats';
 import { usageStatsClientMock } from '../usage_stats/usage_stats_client.mock';
diff --git a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
index bac8bcabda3b1..2cce7dc3c7bb8 100644
--- a/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
+++ b/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { take } from 'rxjs/operators';
+import { firstValueFrom } from 'rxjs';
 
-import type { ElasticsearchClient } from 'src/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 import type {
   CollectorFetchContext,
   UsageCollectionSetup,
-} from 'src/plugins/usage_collection/server';
+} from '@kbn/usage-collection-plugin/server';
 
 import type { PluginsSetup } from '../plugin';
 import type { UsageStats, UsageStatsServiceSetup } from '../usage_stats';
@@ -426,7 +426,7 @@ export function getSpacesUsageCollector(
     },
     fetch: async ({ esClient }: CollectorFetchContext) => {
       const { licensing, kibanaIndex, features, usageStatsServicePromise } = deps;
-      const license = await licensing.license$.pipe(take(1)).toPromise();
+      const license = await firstValueFrom(licensing.license$);
       const available = license.isAvailable; // some form of spaces is available for all valid licenses
 
       const usageData = await getSpacesUsage(esClient, kibanaIndex, features, available);
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts
index aa3fa29e87ce1..db053f37770f0 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
 import { SPACES_USAGE_STATS_ID, SPACES_USAGE_STATS_TYPE } from './constants';
 import type {
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts
index e73d6db948bb4..bb0f70ce4b002 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_client.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Headers, ISavedObjectsRepository } from 'src/core/server';
+import type { Headers, ISavedObjectsRepository } from '@kbn/core/server';
 
 import type { CopyOptions, ResolveConflictsOptions } from '../lib/copy_to_spaces/types';
 import { SPACES_USAGE_STATS_ID, SPACES_USAGE_STATS_TYPE } from './constants';
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts
index 5ea4d9ddd747c..6a365cb23787f 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, loggingSystemMock } from 'src/core/server/mocks';
+import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { SPACES_USAGE_STATS_TYPE } from './constants';
 import { UsageStatsClient } from './usage_stats_client';
diff --git a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts
index baf59cae2a638..cfcc1dffc2a36 100644
--- a/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts
+++ b/x-pack/plugins/spaces/server/usage_stats/usage_stats_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Logger } from 'src/core/server';
+import type { CoreSetup, Logger } from '@kbn/core/server';
 
 import { SPACES_USAGE_STATS_TYPE } from './constants';
 import { UsageStatsClient } from './usage_stats_client';
diff --git a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
index c3b59dbd1c557..de9e2a32e5c27 100644
--- a/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
+++ b/x-pack/plugins/stack_alerts/common/build_sorted_events_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ESSearchRequest } from '../../../../src/core/types/elasticsearch';
+import type { ESSearchRequest } from '@kbn/core/types/elasticsearch';
 
 interface BuildSortedEventsQueryOpts {
   aggs?: Record<string, estypes.AggregationsAggregationContainer>;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx
index 7b27167d5f5f9..d36c0016ca8d8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.test.tsx
@@ -19,8 +19,8 @@ jest.mock('lodash', () => {
   };
 });
 
-jest.mock('../../../../triggers_actions_ui/public', () => {
-  const original = jest.requireActual('../../../../triggers_actions_ui/public');
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
   return {
     ...original,
     getIndexPatterns: () => {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx
index a8b9f3f56dd06..aad203016a065 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/components/index_select_popover.tsx
@@ -21,15 +21,15 @@ import {
   EuiPopoverTitle,
   EuiSelect,
 } from '@elastic/eui';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   firstFieldOption,
   getFields,
   getIndexOptions,
   getTimeFieldOptions,
   IErrorObject,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 
 interface KibanaDeps {
   http: HttpSetup;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts
index bd2de94ce1e96..bceb39ba08cf9 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { COMPARATORS } from '../../../../triggers_actions_ui/public';
+import { COMPARATORS } from '@kbn/triggers-actions-ui-plugin/public';
 
 export const DEFAULT_VALUES = {
   THRESHOLD_COMPARATOR: COMPARATORS.GREATER_THAN,
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
index e35706ce25710..828a4c4e952b8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
@@ -10,20 +10,21 @@ import 'brace';
 import { of } from 'rxjs';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import {
   DataPublicPluginStart,
   IKibanaSearchResponse,
   ISearchStart,
-} from 'src/plugins/data/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/data-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { EsQueryExpression } from './es_query_expression';
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public');
-jest.mock('../../../../../../../src/plugins/es_ui_shared/public', () => ({
+jest.mock('@kbn/kibana-react-plugin/public');
+jest.mock('@kbn/es-ui-shared-plugin/public', () => ({
   XJson: {
     useXJsonMode: jest.fn().mockReturnValue({
       convertToJson: jest.fn(),
@@ -43,8 +44,8 @@ jest.mock('../../../../../../../src/plugins/es_ui_shared/public', () => ({
     />
   ),
 }));
-jest.mock('../../../../../triggers_actions_ui/public', () => {
-  const original = jest.requireActual('../../../../../triggers_actions_ui/public');
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
   return {
     ...original,
     getIndexPatterns: () => {
@@ -99,6 +100,7 @@ const createDataPluginMock = () => {
 };
 
 const dataMock = createDataPluginMock();
+const dataViewMock = dataViewPluginMocks.createStartContract();
 const unifiedSearchMock = unifiedSearchPluginMock.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 
@@ -150,6 +152,7 @@ describe('EsQueryAlertTypeExpression', () => {
         setRuleProperty={() => {}}
         errors={errors}
         data={dataMock}
+        dataViews={dataViewMock}
         defaultActionGroupId=""
         actionGroups={[]}
         charts={chartsStartMock}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx
index 45d7791055f87..10b774648d735 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useState, Fragment, useEffect, useCallback } from 'react';
+import { firstValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
@@ -23,20 +24,20 @@ import {
   EuiLink,
   EuiIconTip,
 } from '@elastic/eui';
-import { DocLinksStart, HttpSetup } from 'kibana/public';
+import { DocLinksStart, HttpSetup } from '@kbn/core/public';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { XJson, EuiCodeEditor } from '../../../../../../../src/plugins/es_ui_shared/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { XJson, EuiCodeEditor } from '@kbn/es-ui-shared-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   getFields,
   ValueExpression,
   RuleTypeParamsExpressionProps,
   ForLastExpression,
   ThresholdExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { validateExpression } from '../validation';
-import { parseDuration } from '../../../../../alerting/common';
 import { buildSortedEventsQuery } from '../../../../common/build_sorted_events_query';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { IndexSelectPopover } from '../../components/index_select_popover';
@@ -147,8 +148,8 @@ export const EsQueryExpression = ({
         const timeWindow = parseDuration(window);
         const parsedQuery = JSON.parse(esQuery);
         const now = Date.now();
-        const { rawResponse } = await data.search
-          .search({
+        const { rawResponse } = await firstValueFrom(
+          data.search.search({
             params: buildSortedEventsQuery({
               index,
               from: new Date(now - timeWindow).toISOString(),
@@ -160,7 +161,7 @@ export const EsQueryExpression = ({
               track_total_hits: true,
             }),
           })
-          .toPromise();
+        );
 
         const hits = rawResponse.hits;
         setTestQueryResult(
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx
index 2c825cdc3c286..df44a8923183c 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/expression.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import 'brace/theme/github';
 
 import { EuiSpacer, EuiCallOut } from '@elastic/eui';
-import { RuleTypeParamsExpressionProps } from '../../../../../triggers_actions_ui/public';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { EsQueryAlertParams } from '../types';
 import { SearchSourceExpression } from './search_source_expression';
 import { EsQueryExpression } from './es_query_expression';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
index 431f451c54f24..e753fee71d44b 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
@@ -9,11 +9,11 @@ import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { injectI18n } from '@kbn/i18n-react';
 
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { getDisplayValueFromFilter } from '../../../../../../../src/plugins/data/public';
-import { Filter } from '../../../../../../../src/plugins/data/common';
-import { DataView } from '../../../../../../../src/plugins/data_views/public';
-import { FilterItem } from '../../../../../../../src/plugins/unified_search/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { getDisplayValueFromFilter } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { FilterItem } from '@kbn/unified-search-plugin/public';
 
 const FilterItemComponent = injectI18n(FilterItem);
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
index 1751e52da3ce6..7041bba0fe2ff 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
@@ -7,12 +7,13 @@
 
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
-import { DataPublicPluginStart, ISearchStart } from 'src/plugins/data/public';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { DataPublicPluginStart, ISearchStart } from '@kbn/data-plugin/public';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { SearchSourceExpression } from './search_source_expression';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { act } from 'react-dom/test-utils';
 import { EuiCallOut, EuiLoadingSpinner } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
@@ -21,6 +22,8 @@ const dataMock = dataPluginMock.createStartContract() as DataPublicPluginStart &
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   search: ISearchStart & { searchSource: { create: jest.MockedFunction<any> } };
 };
+
+const dataViewPluginMock = dataViewPluginMocks.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 const unifiedSearchMock = unifiedSearchPluginMock.createStartContract();
 
@@ -64,6 +67,7 @@ const setup = async (alertParams: EsQueryAlertParams<SearchType.searchSource>) =
       errors={errors}
       unifiedSearch={unifiedSearchMock}
       data={dataMock}
+      dataViews={dataViewPluginMock}
       defaultActionGroupId=""
       actionGroups={[]}
       charts={chartsStartMock}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx
index 2e99fa8e1356b..1d54609223aaf 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.tsx
@@ -17,14 +17,14 @@ import {
   EuiCallOut,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Filter, ISearchSource } from '../../../../../../../src/plugins/data/common';
-import { EsQueryAlertParams, SearchType } from '../types';
+import { Filter, ISearchSource } from '@kbn/data-plugin/common';
 import {
   ForLastExpression,
   RuleTypeParamsExpressionProps,
   ThresholdExpression,
   ValueExpression,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { EsQueryAlertParams, SearchType } from '../types';
 import { DEFAULT_VALUES } from '../constants';
 import { ReadOnlyFilterItems } from './read_only_filter_items';
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts
index 740bf10c04432..fe57801150526 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/index.ts
@@ -7,11 +7,11 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
-import { validateExpression } from './validation';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { EsQueryAlertParams, SearchType } from './types';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
-import { PluginSetupContract as AlertingSetup } from '../../../../alerting/public';
-import { SanitizedRule } from '../../../../alerting/common';
+import { validateExpression } from './validation';
 
 const PLUGIN_ID = 'discover';
 const ES_QUERY_ALERT_TYPE = '.es-query';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts
index 8b46dd6d57337..bccf6ed4ced43 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../../alerting/common';
-import { SerializedSearchSourceFields } from '../../../../../../src/plugins/data/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 
 export interface Comparator {
   text: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts
index 4766ce68dba4a..914dd6a4f5f9f 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/validation.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { ValidationResult, builtInComparators } from '@kbn/triggers-actions-ui-plugin/public';
 import { EsQueryAlertParams } from './types';
-import { ValidationResult, builtInComparators } from '../../../../triggers_actions_ui/public';
 import { isSearchSourceAlert } from './util';
 
 export const validateExpression = (alertParams: EsQueryAlertParams): ValidationResult => {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts
index 19e58d8d1a22f..fad11da20940a 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/index.ts
@@ -7,9 +7,9 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { validateExpression } from './validation';
 import { GeoContainmentAlertParams } from './types';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
 
 export function getAlertType(): RuleTypeModel<GeoContainmentAlertParams> {
   return {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
index 1a44da5fdee58..f53b1bfab5982 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
@@ -8,16 +8,16 @@
 import React, { Fragment, FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
+import { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { ES_GEO_SHAPE_TYPES, GeoContainmentAlertParams } from '../../types';
 import { GeoIndexPatternSelect } from '../util_components/geo_index_pattern_select';
 import { SingleFieldSelect } from '../util_components/single_field_select';
 import { ExpressionWithPopover } from '../util_components/expression_with_popover';
-import { DataViewField, DataView } from '../../../../../../../../src/plugins/data/common';
 
 interface Props {
   ruleParams: GeoContainmentAlertParams;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx
index 3d816129a3ae6..322700209d4d2 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { EntityByExpression, getValidIndexPatternFields } from './entity_by_expression';
-import { DataViewField } from 'src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 const defaultProps = {
   errors: {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
index 9773009b2b52e..b0b02fe27f8ef 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_by_expression.tsx
@@ -9,8 +9,8 @@ import React, { FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import { DataViewField } from 'src/plugins/data_views/public';
-import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
 import { SingleFieldSelect } from '../util_components/single_field_select';
 import { ExpressionWithPopover } from '../util_components/expression_with_popover';
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
index 8b189c59f2af9..10aba3123c2cc 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
@@ -9,19 +9,19 @@ import React, { Fragment, FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   IErrorObject,
   RuleTypeParamsExpressionProps,
-} from '../../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { DataViewField, DataView } from '@kbn/data-plugin/common';
 import { ES_GEO_FIELD_TYPES } from '../../types';
 import { GeoIndexPatternSelect } from '../util_components/geo_index_pattern_select';
 import { SingleFieldSelect } from '../util_components/single_field_select';
 import { ExpressionWithPopover } from '../util_components/expression_with_popover';
-import { DataViewField, DataView } from '../../../../../../../../src/plugins/data/common';
 
 interface Props {
   dateField: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
index 4d8b2a7dcd936..5ef79b7379035 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
@@ -9,10 +9,10 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { EntityIndexExpression } from './expressions/entity_index_expression';
 import { BoundaryIndexExpression } from './expressions/boundary_index_expression';
-import { IErrorObject } from '../../../../../triggers_actions_ui/public';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
+import { IErrorObject } from '@kbn/triggers-actions-ui-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
 
 const dataStartMock = dataPluginMock.createStartContract();
 const unifiedSearchStartMock = unifiedSearchPluginMock.createStartContract();
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
index 5196834bc404b..e569bf7b93991 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
@@ -10,14 +10,14 @@ import { EuiCallOut, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { fromKueryExpression, luceneStringToDsl } from '@kbn/es-query';
-import { RuleTypeParamsExpressionProps } from '../../../../../triggers_actions_ui/public';
+import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { Query } from '@kbn/data-plugin/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { GeoContainmentAlertParams } from '../types';
 import { EntityIndexExpression } from './expressions/entity_index_expression';
 import { EntityByExpression } from './expressions/entity_by_expression';
 import { BoundaryIndexExpression } from './expressions/boundary_index_expression';
-import { DataView } from '../../../../../../../src/plugins/data/common';
-import { Query } from '../../../../../../../src/plugins/data/public';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
 
 const DEFAULT_VALUES = {
   TRACKING_EVENT: '',
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx
index 0d2dc2c209562..01abe69d5f8c1 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { GeoIndexPatternSelect } from './geo_index_pattern_select';
-import { DataViewsContract } from 'src/plugins/data/public';
-import { HttpSetup } from 'kibana/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
 
 class MockIndexPatternSelectComponent extends React.Component {
   render() {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
index 735c0b9d8d97c..b2a235feb1a80 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.tsx
@@ -9,9 +9,9 @@ import React, { Component } from 'react';
 import { EuiCallOut, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DataViewsContract } from 'src/plugins/data/public';
-import { HttpSetup } from 'kibana/public';
-import { DataView } from '../../../../../../../../src/plugins/data/common';
+import { DataViewsContract } from '@kbn/data-plugin/public';
+import { HttpSetup } from '@kbn/core/public';
+import { DataView } from '@kbn/data-plugin/common';
 
 interface Props {
   onChange: (indexPattern: DataView) => void;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx
index 84b68c4899a41..7783c943301f3 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx
@@ -15,7 +15,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { FieldIcon } from '@kbn/react-field';
-import { DataViewField } from 'src/plugins/data_views/public';
+import { DataViewField } from '@kbn/data-views-plugin/public';
 
 function fieldsToOptions(fields?: DataViewField[]): Array<EuiComboBoxOptionOption<DataViewField>> {
   if (!fields) {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts
index ccc94c8ac00f9..719a70858b341 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../../alerting/common';
-import { Query } from '../../../../../../src/plugins/data/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
+import { Query } from '@kbn/data-plugin/common';
 
 export interface GeoContainmentAlertParams extends RuleTypeParams {
   index: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts
index 6c31b3ae157c9..71fd748ea5df1 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ValidationResult } from '../../../../triggers_actions_ui/public';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import { GeoContainmentAlertParams } from './types';
 
 export const validateExpression = (alertParams: GeoContainmentAlertParams): ValidationResult => {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/index.ts
index c0a0f7b6548cf..ff474ff9c6562 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { getAlertType as getGeoContainmentAlertType } from './geo_containment';
 import { getAlertType as getThresholdAlertType } from './threshold';
 import { getAlertType as getEsQueryAlertType } from './es_query';
 import { Config } from '../../common';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
-import { PluginSetupContract as AlertingSetup } from '../../../alerting/public';
 
 export function registerAlertTypes({
   ruleTypeRegistry,
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx
index d0aaa9b8fda52..6fb83aad7287d 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.test.tsx
@@ -9,8 +9,9 @@ import React from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import IndexThresholdAlertTypeExpression, { DEFAULT_VALUES } from './expression';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { IndexThresholdAlertParams } from './types';
 import { validateExpression } from './validation';
 import {
@@ -18,10 +19,10 @@ import {
   builtInComparators,
   getTimeUnitLabel,
   TIME_UNITS,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 
-jest.mock('../../../../triggers_actions_ui/public', () => {
-  const original = jest.requireActual('../../../../triggers_actions_ui/public');
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
   return {
     ...original,
     getIndexPatterns: () => {
@@ -68,6 +69,7 @@ jest.mock('../../../../triggers_actions_ui/public', () => {
 });
 
 const dataMock = dataPluginMock.createStartContract();
+const dataViewMock = dataViewPluginMocks.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 
 describe('IndexThresholdAlertTypeExpression', () => {
@@ -95,6 +97,7 @@ describe('IndexThresholdAlertTypeExpression', () => {
         setRuleProperty={() => {}}
         errors={errors}
         data={dataMock}
+        dataViews={dataViewMock}
         defaultActionGroupId=""
         actionGroups={[]}
         charts={chartsStartMock}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
index 33855d94b6f15..de8b1ec484afc 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
@@ -9,8 +9,8 @@ import React, { useState, Fragment, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSpacer, EuiCallOut, EuiEmptyPrompt, EuiText, EuiTitle } from '@elastic/eui';
-import { HttpSetup } from 'kibana/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { HttpSetup } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   getFields,
   COMPARATORS,
@@ -22,7 +22,7 @@ import {
   WhenExpression,
   builtInAggregationTypes,
   RuleTypeParamsExpressionProps,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { ThresholdVisualization } from './visualization';
 import { IndexThresholdAlertParams } from './types';
 import './expression.scss';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts
index 934525be66a14..f41856d7a5bc8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index.ts
@@ -7,9 +7,9 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { validateExpression } from './validation';
 import { IndexThresholdAlertParams } from './types';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
 
 export function getAlertType(): RuleTypeModel<IndexThresholdAlertParams> {
   return {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts
index 6ec9087c40fee..a884d2230c2b9 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/index_threshold_api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import { TimeSeriesResult } from '../../../../triggers_actions_ui/common';
+import { HttpSetup } from '@kbn/core/public';
+import { TimeSeriesResult } from '@kbn/triggers-actions-ui-plugin/common';
 import { IndexThresholdAlertParams } from './types';
 
 const INDEX_THRESHOLD_DATA_API_ROOT = '/api/triggers_actions_ui/data';
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts
index ba6ca421173f5..ed6758e6d7326 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleTypeParams } from '../../../../alerting/common';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 
 export interface Comparator {
   text: string;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts
index bd2b0c3c36d3c..a7f695094ce31 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/validation.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexThresholdAlertParams } from './types';
 import {
   ValidationResult,
   builtInGroupByTypes,
   builtInAggregationTypes,
   builtInComparators,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { IndexThresholdAlertParams } from './types';
 
 export const validateExpression = (alertParams: IndexThresholdAlertParams): ValidationResult => {
   const {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx
index ed667b4940f29..643d6c79afc7d 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.test.tsx
@@ -9,18 +9,18 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { ThresholdVisualization } from './visualization';
-import { DataPublicPluginStart } from 'src/plugins/data/public/types';
-import { chartPluginMock } from 'src/plugins/charts/public/mocks';
-import { dataPluginMock } from 'src/plugins/data/public/mocks';
-import { uiSettingsServiceMock } from 'src/core/public/mocks';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public/types';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import {
   builtInAggregationTypes,
   builtInComparators,
-} from '../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { Chart, LineAnnotation, LineSeries } from '@elastic/charts';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
-jest.mock('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public');
 jest.mock('./index_threshold_api', () => ({
   getThresholdAlertVisualizationData: jest.fn(() =>
     Promise.resolve({
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx
index 9d7093c1603f2..e1d2ec285f39c 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/visualization.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { Fragment, useEffect, useState } from 'react';
-import { IUiSettingsClient, HttpSetup } from 'kibana/public';
+import { IUiSettingsClient, HttpSetup } from '@kbn/core/public';
 import { interval } from 'rxjs';
 import {
   AnnotationDomainType,
@@ -29,16 +29,16 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ChartsPluginSetup } from 'src/plugins/charts/public';
-import { FieldFormatsStart } from 'src/plugins/field_formats/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { AggregationType, Comparator } from '@kbn/triggers-actions-ui-plugin/public';
+import { parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import {
   getThresholdAlertVisualizationData,
   GetThresholdAlertVisualizationDataParams,
 } from './index_threshold_api';
-import { AggregationType, Comparator } from '../../../../triggers_actions_ui/public';
 import { IndexThresholdAlertParams } from './types';
-import { parseDuration } from '../../../../alerting/common/parse_duration';
 
 const customTheme = () => {
   return {
diff --git a/x-pack/plugins/stack_alerts/public/index.ts b/x-pack/plugins/stack_alerts/public/index.ts
index d6a51e23ab139..f7dc42da7e50c 100644
--- a/x-pack/plugins/stack_alerts/public/index.ts
+++ b/x-pack/plugins/stack_alerts/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { StackAlertsPublicPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new StackAlertsPublicPlugin(ctx);
diff --git a/x-pack/plugins/stack_alerts/public/plugin.tsx b/x-pack/plugins/stack_alerts/public/plugin.tsx
index 8d004523558fb..b7a81e1b0f6bb 100644
--- a/x-pack/plugins/stack_alerts/public/plugin.tsx
+++ b/x-pack/plugins/stack_alerts/public/plugin.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
+import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
 import { registerAlertTypes } from './alert_types';
 import { Config } from '../common';
-import { PluginSetupContract as AlertingSetup } from '../../alerting/public';
 
 export type Setup = void;
 export type Start = void;
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts
index 7e4e8bf831493..68367e5ec8104 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/action_context.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { RuleExecutorOptions, AlertInstanceContext } from '../../../../alerting/server';
+import { RuleExecutorOptions, AlertInstanceContext } from '@kbn/alerting-plugin/server';
 import { OnlyEsQueryAlertParams, OnlySearchSourceAlertParams } from './types';
 
 // alert type context provided to actions
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts
index c59b24ddb6210..3fce895a2bfd1 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.test.ts
@@ -7,23 +7,23 @@
 
 import uuid from 'uuid';
 import type { Writable } from '@kbn/utility-types';
-import { RuleExecutorServices } from '../../../../alerting/server';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import {
   RuleExecutorServicesMock,
   alertsMock,
   AlertInstanceMock,
-} from '../../../../alerting/server/mocks';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
+} from '@kbn/alerting-plugin/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { getAlertType } from './alert_type';
 import { EsQueryAlertParams, EsQueryAlertState } from './alert_type_params';
 import { ActionContext } from './action_context';
-import { ESSearchResponse, ESSearchRequest } from '../../../../../../src/core/types/elasticsearch';
+import { ESSearchResponse, ESSearchRequest } from '@kbn/core/types/elasticsearch';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { elasticsearchClientMock } from '../../../../../../src/core/server/elasticsearch/client/mocks';
-import { coreMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { ActionGroupId, ConditionMetAlertInstanceId } from './constants';
 import { OnlyEsQueryAlertParams, OnlySearchSourceAlertParams } from './types';
-import { searchSourceInstanceMock } from 'src/plugins/data/common/search/search_source/mocks';
+import { searchSourceInstanceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { Comparator } from '../../../common/comparator_types';
 
 const logger = loggingSystemMock.create().get();
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts
index 86732a6803ee7..5b41d7c55fe0a 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger } from 'kibana/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { RuleType } from '../../types';
 import { ActionContext } from './action_context';
 import {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts
index 794e740c8cca6..f205fbd0327ce 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/alert_type_params.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { validateTimeWindowUnits } from '../../../../triggers_actions_ui/server';
-import { RuleTypeState } from '../../../../alerting/server';
+import { validateTimeWindowUnits } from '@kbn/triggers-actions-ui-plugin/server';
+import { RuleTypeState } from '@kbn/alerting-plugin/server';
 import { Comparator } from '../../../common/comparator_types';
 import { ComparatorFnNames } from '../lib';
 import { getComparatorSchemaType } from '../lib/comparator';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts
index 175695aca5f4d..4f203b064592d 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/executor.ts
@@ -6,10 +6,10 @@
  */
 import { sha256 } from 'js-sha256';
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Logger } from 'kibana/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
+import { parseDuration } from '@kbn/alerting-plugin/server';
 import { addMessages, EsQueryAlertActionContext } from './action_context';
 import { ComparatorFns, getHumanReadableComparator } from '../lib';
-import { parseDuration } from '../../../../alerting/server';
 import { ExecutorOptions, OnlyEsQueryAlertParams, OnlySearchSourceAlertParams } from './types';
 import { ActionGroupId, ConditionMetAlertInstanceId } from './constants';
 import { fetchEsQuery } from './lib/fetch_es_query';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts
index 99f9eb1795688..82f8297a85bb5 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { AlertingSetup } from '../../types';
 import { getAlertType } from './alert_type';
 
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts
index 519c392753c58..b4d74412b7f83 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_es_query.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { IScopedClusterClient, Logger } from 'kibana/server';
+import { IScopedClusterClient, Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { OnlyEsQueryAlertParams } from '../types';
 import { buildSortedEventsQuery } from '../../../../common/build_sorted_events_query';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts
index 1e6aac5dcb035..48082f565afb3 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { OnlySearchSourceAlertParams } from '../types';
-import { createSearchSourceMock } from 'src/plugins/data/common/search/search_source/mocks';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 import { updateSearchSource } from './fetch_search_source_query';
-import { stubbedSavedObjectIndexPattern } from '../../../../../../../src/plugins/data_views/common/data_view.stub';
-import { DataView } from '../../../../../../../src/plugins/data_views/common';
-import { fieldFormatsMock } from '../../../../../../../src/plugins/field_formats/common/mocks';
+import { stubbedSavedObjectIndexPattern } from '@kbn/data-views-plugin/common/data_view.stub';
+import { DataView } from '@kbn/data-views-plugin/common';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { Comparator } from '../../../../common/comparator_types';
 
 const createDataView = () => {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts
index 490c6f81ec485..cff24f8975f0f 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/fetch_search_source_query.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import { buildRangeFilter, Filter } from '@kbn/es-query';
-import { Logger } from 'kibana/server';
-import { OnlySearchSourceAlertParams } from '../types';
+import { Logger } from '@kbn/core/server';
 import {
   getTime,
   ISearchSource,
   ISearchStartSearchSource,
   SortDirection,
-} from '../../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
+import { OnlySearchSourceAlertParams } from '../types';
 
 export async function fetchSearchSourceQuery(
   alertId: string,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts
index 9a4d83630f21e..29bb7ad544804 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/es_query/lib/get_search_params.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { OnlyEsQueryAlertParams } from '../types';
-import { parseDuration } from '../../../../../alerting/common';
 
 export function getSearchParams(queryParams: OnlyEsQueryAlertParams) {
   const date = Date.now();
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
index c65dc4d5745ea..0a76813881abf 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
@@ -7,9 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
-import { Logger, SavedObjectReference } from 'src/core/server';
-import { STACK_ALERTS_FEATURE_ID } from '../../../common';
-import { getGeoContainmentExecutor } from './geo_containment';
+import { Logger, SavedObjectReference } from '@kbn/core/server';
 import {
   RuleType,
   RuleTypeState,
@@ -17,8 +15,10 @@ import {
   AlertInstanceContext,
   RuleParamsAndRefs,
   RuleTypeParams,
-} from '../../../../alerting/server';
-import { Query } from '../../../../../../src/plugins/data/common/query';
+} from '@kbn/alerting-plugin/server';
+import { Query } from '@kbn/data-plugin/common/query';
+import { STACK_ALERTS_FEATURE_ID } from '../../../common';
+import { getGeoContainmentExecutor } from './geo_containment';
 
 export const ActionGroupId = 'Tracked entity contained';
 export const RecoveryActionGroupId = 'notGeoContained';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts
index 345c21d62c67a..9caec73ecb8c1 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/es_query_builder.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
-import { Logger } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   fromKueryExpression,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
index 5d59c3cab0746..3b40cbc413bcf 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
@@ -6,10 +6,10 @@
  */
 
 import _ from 'lodash';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { executeEsQueryFactory, getShapesFilters, OTHER_CATEGORY } from './es_query_builder';
-import { RuleExecutorServices } from '../../../../alerting/server';
 import {
   ActionGroupId,
   GeoContainmentInstanceState,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts
index 195ffb97bd81f..072a01efc9749 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { AlertingSetup } from '../../types';
 import {
   GeoContainmentState,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts
index 9fc382240d0be..1f08564a4d668 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/alert_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from '../../../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   getAlertType,
   injectEntityAndBoundaryIds,
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts
index a5f8d0e064874..44bf9e06244f4 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/tests/geo_containment.test.ts
@@ -6,8 +6,8 @@
  */
 
 import _ from 'lodash';
-import { loggingSystemMock, elasticsearchServiceMock } from 'src/core/server/mocks';
-import { RuleExecutorServicesMock, alertsMock } from '../../../../../alerting/server/mocks';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import sampleAggsJsonResponse from './es_sample_response.json';
 import sampleShapesJsonResponse from './es_sample_response_shapes.json';
 import sampleAggsJsonResponseWithNesting from './es_sample_response_with_nesting.json';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/index.ts
index 8ad10298f351b..93a3b679ab0f1 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Logger } from 'src/core/server';
+import { CoreSetup, Logger } from '@kbn/core/server';
 import { AlertingSetup, StackAlertsStartDeps } from '../types';
 import { register as registerIndexThreshold } from './index_threshold';
 import { register as registerGeoContainment } from './geo_containment';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts
index f75869d8e0db2..94e7f9b8501a4 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { RuleExecutorOptions, AlertInstanceContext } from '@kbn/alerting-plugin/server';
 import { Params } from './alert_type_params';
-import { RuleExecutorOptions, AlertInstanceContext } from '../../../../alerting/server';
 
 // alert type context provided to actions
 
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts
index 16117ed6fd507..1751fc6fc2344 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.test.ts
@@ -7,12 +7,12 @@
 
 import uuid from 'uuid';
 import type { Writable } from '@kbn/utility-types';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { RuleExecutorServices } from '../../../../alerting/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 import { getAlertType, ActionGroupId } from './alert_type';
 import { ActionContext } from './action_context';
 import { Params } from './alert_type_params';
-import { RuleExecutorServicesMock, alertsMock } from '../../../../alerting/server/mocks';
+import { RuleExecutorServicesMock, alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { Comparator } from '../../../common/comparator_types';
 
 describe('alertType', () => {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts
index 9da47aa76e0c0..58d680794aedf 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts
@@ -6,15 +6,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
+import {
+  CoreQueryParamsSchemaProperties,
+  TimeSeriesQuery,
+} from '@kbn/triggers-actions-ui-plugin/server';
 import { RuleType, RuleExecutorOptions, StackAlertsStartDeps } from '../../types';
 import { Params, ParamsSchema } from './alert_type_params';
 import { ActionContext, BaseActionContext, addMessages } from './action_context';
 import { STACK_ALERTS_FEATURE_ID } from '../../../common';
-import {
-  CoreQueryParamsSchemaProperties,
-  TimeSeriesQuery,
-} from '../../../../triggers_actions_ui/server';
 import { ComparatorFns, getHumanReadableComparator } from '../lib';
 
 export const ID = '.index-threshold';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts
index bce50c59f038a..7bcf84db20a1f 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.test.ts
@@ -8,7 +8,7 @@
 import { ParamsSchema, Params } from './alert_type_params';
 import { ObjectType, TypeOf } from '@kbn/config-schema';
 import type { Writable } from '@kbn/utility-types';
-import { CoreQueryParams, MAX_GROUPS } from '../../../../triggers_actions_ui/server';
+import { CoreQueryParams, MAX_GROUPS } from '@kbn/triggers-actions-ui-plugin/server';
 import { Comparator } from '../../../common/comparator_types';
 
 const DefaultParams: Writable<Partial<Params>> = {
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts
index a1a35db17edc6..5783b6a64ab83 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type_params.ts
@@ -10,7 +10,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import {
   CoreQueryParamsSchemaProperties,
   validateCoreQueryBody,
-} from '../../../../triggers_actions_ui/server';
+} from '@kbn/triggers-actions-ui-plugin/server';
 import { ComparatorFnNames } from '../lib';
 import { Comparator } from '../../../common/comparator_types';
 import { getComparatorSchemaType } from '../lib/comparator';
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts
index e9016e8cc6a18..065ef6b5ee22c 100644
--- a/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts
+++ b/x-pack/plugins/stack_alerts/server/alert_types/index_threshold/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { AlertingSetup, StackAlertsStartDeps } from '../../types';
 import { getAlertType } from './alert_type';
 
diff --git a/x-pack/plugins/stack_alerts/server/feature.test.ts b/x-pack/plugins/stack_alerts/server/feature.test.ts
index 61d0914fb7df1..8935a8a43c5d2 100644
--- a/x-pack/plugins/stack_alerts/server/feature.test.ts
+++ b/x-pack/plugins/stack_alerts/server/feature.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { AlertingBuiltinsPlugin } from './plugin';
-import { coreMock } from '../../../../src/core/server/mocks';
-import { alertsMock } from '../../alerting/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { BUILT_IN_ALERTS_FEATURE } from './feature';
 
 describe('Stack Alerts Feature Privileges', () => {
diff --git a/x-pack/plugins/stack_alerts/server/feature.ts b/x-pack/plugins/stack_alerts/server/feature.ts
index 166f2103526ef..f7257651f2aeb 100644
--- a/x-pack/plugins/stack_alerts/server/feature.ts
+++ b/x-pack/plugins/stack_alerts/server/feature.ts
@@ -6,13 +6,13 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { KibanaFeatureConfig } from '../../../plugins/features/common';
+import { KibanaFeatureConfig } from '@kbn/features-plugin/common';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { TRANSFORM_RULE_TYPE } from '@kbn/transform-plugin/common';
 import { ID as IndexThreshold } from './alert_types/index_threshold/alert_type';
 import { GEO_CONTAINMENT_ID as GeoContainment } from './alert_types/geo_containment/alert_type';
 import { ES_QUERY_ID as ElasticsearchQuery } from './alert_types/es_query/constants';
 import { STACK_ALERTS_FEATURE_ID } from '../common';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
-import { TRANSFORM_RULE_TYPE } from '../../transform/common';
 
 const TransformHealth = TRANSFORM_RULE_TYPE.TRANSFORM_HEALTH;
 
diff --git a/x-pack/plugins/stack_alerts/server/index.test.ts b/x-pack/plugins/stack_alerts/server/index.test.ts
index 7d66367f7d752..8532883d02684 100644
--- a/x-pack/plugins/stack_alerts/server/index.test.ts
+++ b/x-pack/plugins/stack_alerts/server/index.test.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../../src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.stack_alerts';
 const deprecationContext = configDeprecationsMock.createContext();
diff --git a/x-pack/plugins/stack_alerts/server/index.ts b/x-pack/plugins/stack_alerts/server/index.ts
index b6b117ceb7075..8f18ac9a4df9a 100644
--- a/x-pack/plugins/stack_alerts/server/index.ts
+++ b/x-pack/plugins/stack_alerts/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { get } from 'lodash';
-import { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { AlertingBuiltinsPlugin } from './plugin';
 import { configSchema, Config } from '../common/config';
 export { ID as INDEX_THRESHOLD_ID } from './alert_types/index_threshold/alert_type';
diff --git a/x-pack/plugins/stack_alerts/server/plugin.test.ts b/x-pack/plugins/stack_alerts/server/plugin.test.ts
index b9263553173d2..b1ad7c9da8015 100644
--- a/x-pack/plugins/stack_alerts/server/plugin.test.ts
+++ b/x-pack/plugins/stack_alerts/server/plugin.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { AlertingBuiltinsPlugin } from './plugin';
-import { coreMock } from '../../../../src/core/server/mocks';
-import { alertsMock } from '../../alerting/server/mocks';
-import { featuresPluginMock } from '../../features/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { featuresPluginMock } from '@kbn/features-plugin/server/mocks';
 import { BUILT_IN_ALERTS_FEATURE } from './feature';
 
 describe('AlertingBuiltins Plugin', () => {
diff --git a/x-pack/plugins/stack_alerts/server/plugin.ts b/x-pack/plugins/stack_alerts/server/plugin.ts
index ac8f60de88b6f..6473e8405dda7 100644
--- a/x-pack/plugins/stack_alerts/server/plugin.ts
+++ b/x-pack/plugins/stack_alerts/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, Logger, CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { Plugin, Logger, CoreSetup, PluginInitializerContext } from '@kbn/core/server';
 
 import { StackAlertsDeps, StackAlertsStartDeps } from './types';
 import { registerBuiltInAlertTypes } from './alert_types';
diff --git a/x-pack/plugins/stack_alerts/server/types.ts b/x-pack/plugins/stack_alerts/server/types.ts
index 3690cbd92e459..83e08b05f7634 100644
--- a/x-pack/plugins/stack_alerts/server/types.ts
+++ b/x-pack/plugins/stack_alerts/server/types.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { PluginStartContract as TriggersActionsUiStartContract } from '../../triggers_actions_ui/server';
-import { PluginSetupContract as AlertingSetup } from '../../alerting/server';
+import { PluginStartContract as TriggersActionsUiStartContract } from '@kbn/triggers-actions-ui-plugin/server';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
 
 export type {
   PluginSetupContract as AlertingSetup,
@@ -14,8 +14,8 @@ export type {
   RuleParamsAndRefs,
   RuleExecutorOptions,
   RuleTypeParams,
-} from '../../alerting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+} from '@kbn/alerting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // this plugin's dependendencies
 export interface StackAlertsDeps {
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
index 1d98e37a06a55..46105747f52a4 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
@@ -21,7 +21,7 @@ import { asTaskPollingCycleEvent, asTaskRunEvent, TaskPersistence } from './task
 import { TaskRunResult } from './task_running';
 import { TaskPoolRunResult } from './task_pool';
 import { TaskPoolMock } from './task_pool.mock';
-import { executionContextServiceMock } from '../../../../src/core/server/mocks';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
 
 const executionContext = executionContextServiceMock.createSetupContract();
 
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
index ded9091b4f226..16d8cd796809d 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
@@ -7,7 +7,7 @@
 
 import { Subject, Observable, Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { Logger, ExecutionContextStart } from '../../../../src/core/server';
+import { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Result, asErr, asOk } from './lib/result_type';
 import { TaskManagerConfig } from './config';
diff --git a/x-pack/plugins/task_manager/server/index.test.ts b/x-pack/plugins/task_manager/server/index.test.ts
index 2145c01dfe68f..9b54a274c0316 100644
--- a/x-pack/plugins/task_manager/server/index.test.ts
+++ b/x-pack/plugins/task_manager/server/index.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { config } from './index';
+import { config } from '.';
 import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
-import { configDeprecationsMock } from '../../../../src/core/server/mocks';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
 
 const CONFIG_PATH = 'xpack.task_manager';
 
diff --git a/x-pack/plugins/task_manager/server/index.ts b/x-pack/plugins/task_manager/server/index.ts
index c32ee6218c8c5..f6cb3a6e6b1d5 100644
--- a/x-pack/plugins/task_manager/server/index.ts
+++ b/x-pack/plugins/task_manager/server/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { PluginConfigDescriptor, PluginInitializerContext } from 'src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { TaskManagerPlugin } from './plugin';
 import { configSchema, TaskManagerConfig, MAX_WORKERS_LIMIT } from './config';
 
diff --git a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
index c5f03b1769385..aa945c74d71ff 100644
--- a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
@@ -6,18 +6,14 @@
  */
 
 import sinon from 'sinon';
-import {
-  elasticsearchServiceMock,
-  savedObjectsRepositoryMock,
-} from '../../../../../src/core/server/mocks';
-import { SavedObjectsErrorHelpers, Logger } from '../../../../../src/core/server';
+import { elasticsearchServiceMock, savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
+import { SavedObjectsErrorHelpers, Logger } from '@kbn/core/server';
 import { ADJUST_THROUGHPUT_INTERVAL } from '../lib/create_managed_configuration';
 import { TaskManagerPlugin, TaskManagerStartContract } from '../plugin';
-import { coreMock } from '../../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { TaskManagerConfig } from '../config';
 
-// FAILING: https://github.com/elastic/kibana/issues/120269
-describe.skip('managed configuration', () => {
+describe('managed configuration', () => {
   let taskManagerStart: TaskManagerStartContract;
   let logger: Logger;
 
@@ -25,6 +21,19 @@ describe.skip('managed configuration', () => {
   const savedObjectsClient = savedObjectsRepositoryMock.create();
   const esStart = elasticsearchServiceMock.createStart();
 
+  const inlineScriptError = new Error('cannot execute [inline] scripts" error') as Error & {
+    meta: unknown;
+  };
+  inlineScriptError.meta = {
+    body: {
+      error: {
+        caused_by: {
+          reason: 'cannot execute [inline] scripts',
+        },
+      },
+    },
+  };
+
   beforeEach(async () => {
     jest.resetAllMocks();
     clock = sinon.useFakeTimers();
@@ -135,16 +144,12 @@ describe.skip('managed configuration', () => {
   });
 
   test('should lower max workers when Elasticsearch returns "cannot execute [inline] scripts" error', async () => {
-    esStart
-      .createClient('taskManager')
-      .asInternalUser.search.mockRejectedValueOnce(
-        elasticsearchServiceMock.createErrorTransportRequestPromise(
-          new Error('cannot execute [inline] scripts" error')
-        )
-      );
+    esStart.client.asInternalUser.search.mockImplementationOnce(async () => {
+      throw inlineScriptError;
+    });
 
     await expect(taskManagerStart.fetch({})).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"cannot execute [inline] scripts" error"`
+      `"cannot execute [inline] scripts\\" error"`
     );
     clock.tick(ADJUST_THROUGHPUT_INTERVAL);
 
@@ -158,16 +163,12 @@ describe.skip('managed configuration', () => {
   });
 
   test('should increase poll interval when Elasticsearch returns "cannot execute [inline] scripts" error', async () => {
-    esStart
-      .createClient('taskManager')
-      .asInternalUser.search.mockRejectedValueOnce(
-        elasticsearchServiceMock.createErrorTransportRequestPromise(
-          new Error('cannot execute [inline] scripts" error')
-        )
-      );
+    esStart.client.asInternalUser.search.mockImplementationOnce(async () => {
+      throw inlineScriptError;
+    });
 
     await expect(taskManagerStart.fetch({})).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"cannot execute [inline] scripts" error"`
+      `"cannot execute [inline] scripts\\" error"`
     );
 
     clock.tick(ADJUST_THROUGHPUT_INTERVAL);
diff --git a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
index b775260942ff1..6e05aceee9a54 100644
--- a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
+++ b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { map } from 'lodash';
 import { Subject, race, from } from 'rxjs';
 import { bufferWhen, filter, bufferCount, flatMap, mapTo, first } from 'rxjs/operators';
diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
index b544674d61c07..0b5e046743627 100644
--- a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
+++ b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
@@ -7,9 +7,9 @@
 
 import { isString } from 'lodash';
 import { JsonValue } from '@kbn/utility-types';
+import { Logger } from '@kbn/core/server';
 import { HealthStatus, RawMonitoringStats } from '../monitoring';
 import { TaskManagerConfig } from '../config';
-import { Logger } from '../../../../../src/core/server';
 
 export function calculateHealthStatus(
   summarizedStats: RawMonitoringStats,
diff --git a/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts b/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts
index 236131496001e..571f29f419e27 100644
--- a/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts
+++ b/x-pack/plugins/task_manager/server/lib/correct_deprecated_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TaskInstance, TaskInstanceWithDeprecatedFields } from '../task';
 
 export function ensureDeprecatedFieldsAreCorrected(
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
index 2dc63b306643e..84dd65cd3cf16 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
@@ -7,7 +7,7 @@
 
 import sinon from 'sinon';
 import { Subject } from 'rxjs';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   createManagedConfiguration,
   ADJUST_THROUGHPUT_INTERVAL,
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
index 188e4bacd52e6..baed33ef9d048 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
@@ -7,8 +7,8 @@
 
 import { interval, merge, of, Observable } from 'rxjs';
 import { filter, mergeScan, map, scan, distinctUntilChanged, startWith } from 'rxjs/operators';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
-import { Logger } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 import { isEsCannotExecuteScriptError } from './identify_es_error';
 
 const FLUSH_MARKER = Symbol('flush');
diff --git a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts
index 0041e57a95e81..6cc6beb26bf7b 100644
--- a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { isTaskSavedObjectNotFoundError } from './is_task_not_found_error';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import uuid from 'uuid';
 
 describe('isTaskSavedObjectNotFoundError', () => {
diff --git a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts
index ca8a7c3bf5277..2acf627f03641 100644
--- a/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts
+++ b/x-pack/plugins/task_manager/server/lib/is_task_not_found_error.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 
 export function isTaskSavedObjectNotFoundError(err: Error, taskId: string) {
   return SavedObjectsErrorHelpers.isNotFoundError(err) && `${err}`.includes(taskId);
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
index 2d4aa837ffb06..9b1b10127abe2 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 import { merge } from 'lodash';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { configSchema, TaskManagerConfig } from '../config';
 import { HealthStatus } from '../monitoring';
 import { MonitoredHealth } from '../routes/health';
 import { logHealthMetrics, resetLastLogLevel } from './log_health_metrics';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TaskPersistence } from '../task_events';
 
 jest.mock('./calculate_health_status', () => ({
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
index 5d513c645a862..4a2757ee739e9 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
@@ -8,7 +8,7 @@
 import { kibanaPackageJson } from '@kbn/utils';
 
 import { isEmpty } from 'lodash';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { HealthStatus } from '../monitoring';
 import { TaskManagerConfig } from '../config';
 import { MonitoredHealth } from '../routes/health';
diff --git a/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts b/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts
index c563e9ca990c6..7b9ec4bbb8b28 100644
--- a/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/remove_if_exists.test.ts
@@ -6,7 +6,7 @@
  */
 
 import uuid from 'uuid';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { removeIfExists } from './remove_if_exists';
 import { taskStoreMock } from '../task_store.mock';
 
diff --git a/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts b/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts
index 34d114b585d45..9faba58a05c06 100644
--- a/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts
+++ b/x-pack/plugins/task_manager/server/lib/remove_if_exists.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { TaskStore } from '../task_store';
 
 /**
diff --git a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
index a5b3288cba528..9b48c84da5319 100644
--- a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
@@ -8,11 +8,11 @@
 import { mapValues } from 'lodash';
 import stats from 'stats-lite';
 import { JsonObject } from '@kbn/utility-types';
+import { Logger } from '@kbn/core/server';
 import { RawMonitoringStats, RawMonitoredStat, HealthStatus } from './monitoring_stats_stream';
 import { AveragedStat } from './task_run_calcultors';
 import { TaskPersistenceTypes } from './task_run_statistics';
 import { asErr, asOk, map, Result } from '../lib/result_type';
-import { Logger } from '../../../../../src/core/server';
 
 export interface CapacityEstimationStat extends JsonObject {
   observed: {
diff --git a/x-pack/plugins/task_manager/server/monitoring/index.ts b/x-pack/plugins/task_manager/server/monitoring/index.ts
index a352ec55f2dbc..84dd78f432193 100644
--- a/x-pack/plugins/task_manager/server/monitoring/index.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { Observable } from 'rxjs';
 import { TaskManagerConfig } from '../config';
 import {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
index 5175525b15cf1..125ce034b0c69 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
@@ -8,7 +8,7 @@
 import { merge, of, Observable } from 'rxjs';
 import { map, scan } from 'rxjs/operators';
 import { set } from '@elastic/safer-lodash-set';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { TaskStore } from '../task_store';
 import { TaskPollingLifecycle } from '../polling_lifecycle';
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
index 250ad344aa2e3..446467ffe0b65 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
@@ -9,6 +9,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, startWith, map } from 'rxjs/operators';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { isNumber, mapValues } from 'lodash';
+import { Logger } from '@kbn/core/server';
 import { AggregatedStatProvider, AggregatedStat } from './runtime_statistics_aggregator';
 import { TaskLifecycleEvent } from '../polling_lifecycle';
 import {
@@ -38,7 +39,6 @@ import {
 import { HealthStatus } from './monitoring_stats_stream';
 import { TaskPollingLifecycle } from '../polling_lifecycle';
 import { TaskExecutionFailureThreshold, TaskManagerConfig } from '../config';
-import { Logger } from '../../../../../src/core/server';
 
 interface FillPoolStat extends JsonObject {
   duration: number[];
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
index 9a63ece0dda46..947f8e397a2cf 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { first, take, bufferCount } from 'rxjs/operators';
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   TaskTypeAggregation,
   WorkloadAggregationResponse,
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
index 34ad4a1753fba..f211ed57a52ad 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
@@ -7,13 +7,13 @@
 
 import { combineLatest, Observable, timer } from 'rxjs';
 import { mergeMap, map, filter, switchMap, catchError } from 'rxjs/operators';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { keyBy, mapValues } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AggregationResultOf } from '@kbn/core/types/elasticsearch';
 import { AggregatedStatProvider } from './runtime_statistics_aggregator';
 import { parseIntervalAsSecond, asInterval, parseIntervalAsMillisecond } from '../lib/intervals';
-import { AggregationResultOf } from '../../../../../src/core/types/elasticsearch';
 import { HealthStatus } from './monitoring_stats_stream';
 import { TaskStore } from '../task_store';
 import { createRunningAveragedStat } from './task_run_calcultors';
diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts
index aa91533eabadf..0a1f77c665044 100644
--- a/x-pack/plugins/task_manager/server/plugin.test.ts
+++ b/x-pack/plugins/task_manager/server/plugin.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { TaskManagerPlugin, getElasticsearchAndSOAvailability } from './plugin';
-import { coreMock } from '../../../../src/core/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { TaskManagerConfig } from './config';
 import { Subject } from 'rxjs';
 import { bufferCount, take } from 'rxjs/operators';
-import { CoreStatus, ServiceStatusLevels } from 'src/core/server';
+import { CoreStatus, ServiceStatusLevels } from '@kbn/core/server';
 
 describe('TaskManagerPlugin', () => {
   describe('setup', () => {
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index b58b0665c10c0..3694f01227178 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -7,7 +7,7 @@
 
 import { combineLatest, Observable, Subject } from 'rxjs';
 import { map, distinctUntilChanged } from 'rxjs/operators';
-import { UsageCollectionSetup, UsageCounter } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
   PluginInitializerContext,
   Plugin,
@@ -16,7 +16,7 @@ import {
   CoreStart,
   ServiceStatusLevels,
   CoreStatus,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 import { TaskPollingLifecycle } from './polling_lifecycle';
 import { TaskManagerConfig } from './config';
 import { createInitialMiddleware, addMiddlewareToChain, Middleware } from './lib/middleware';
diff --git a/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts b/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts
index f3af6f50336ea..d93c187615355 100644
--- a/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts
+++ b/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { Subject, of } from 'rxjs';
+import { Subject, of, firstValueFrom } from 'rxjs';
 import { fakeSchedulers } from 'rxjs-marbles/jest';
 import { sleep } from '../test_utils';
 import { asOk } from '../lib/result_type';
@@ -46,15 +46,12 @@ describe('delayOnClaimConflicts', () => {
       const maxWorkers = 10;
       const taskLifecycleEvents$ = new Subject<TaskLifecycleEvent>();
 
-      const delays$ = delayOnClaimConflicts(
-        of(maxWorkers),
-        of(pollInterval),
-        taskLifecycleEvents$,
-        80,
-        2
-      )
-        .pipe(take(2), bufferCount(2))
-        .toPromise<number[]>();
+      const delays$ = firstValueFrom<number[]>(
+        delayOnClaimConflicts(of(maxWorkers), of(pollInterval), taskLifecycleEvents$, 80, 2).pipe(
+          take(2),
+          bufferCount(2)
+        )
+      );
 
       taskLifecycleEvents$.next(
         asTaskPollingCycleEvent(
@@ -87,8 +84,8 @@ describe('delayOnClaimConflicts', () => {
 
       const delays$ = delayOnClaimConflicts(of(10), of(100), taskLifecycleEvents$, 80, 2);
 
-      const firstSubscriber$ = delays$.pipe(take(2), bufferCount(2)).toPromise<number[]>();
-      const secondSubscriber$ = delays$.pipe(take(2), bufferCount(2)).toPromise<number[]>();
+      const firstSubscriber$ = firstValueFrom<number[]>(delays$.pipe(take(2), bufferCount(2)));
+      const secondSubscriber$ = firstValueFrom<number[]>(delays$.pipe(take(2), bufferCount(2)));
 
       taskLifecycleEvents$.next(
         asTaskPollingCycleEvent(
@@ -105,7 +102,7 @@ describe('delayOnClaimConflicts', () => {
         )
       );
 
-      const thirdSubscriber$ = delays$.pipe(take(2), bufferCount(2)).toPromise<number[]>();
+      const thirdSubscriber$ = firstValueFrom<number[]>(delays$.pipe(take(2), bufferCount(2)));
 
       taskLifecycleEvents$.next(
         asTaskPollingCycleEvent(
diff --git a/x-pack/plugins/task_manager/server/polling/task_poller.test.ts b/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
index ee9af6240e430..3d0deccec1b03 100644
--- a/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
+++ b/x-pack/plugins/task_manager/server/polling/task_poller.test.ts
@@ -11,7 +11,7 @@ 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 { loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { asOk, asErr } from '../lib/result_type';
 
 describe('TaskPoller', () => {
diff --git a/x-pack/plugins/task_manager/server/polling/task_poller.ts b/x-pack/plugins/task_manager/server/polling/task_poller.ts
index 21a1579f85767..fc8ab34e5a8d7 100644
--- a/x-pack/plugins/task_manager/server/polling/task_poller.ts
+++ b/x-pack/plugins/task_manager/server/polling/task_poller.ts
@@ -14,7 +14,7 @@ import { mapTo, filter, scan, concatMap, tap, catchError, switchMap } from 'rxjs
 
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, none, map as mapOptional, getOrElse } from 'fp-ts/lib/Option';
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { pullFromSet } from '../lib/pull_from_set';
 import {
   Result,
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
index 7cbaa5a165544..b92ef758bdafb 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
@@ -20,7 +20,7 @@ import type { TaskClaiming as TaskClaimingClass } from './queries/task_claiming'
 import { asOk, Err, isErr, isOk, Result } from './lib/result_type';
 import { FillPoolResult } from './lib/fill_pool';
 import { ElasticsearchResponseError } from './lib/identify_es_error';
-import { executionContextServiceMock } from '../../../../src/core/server/mocks';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
 
 const executionContext = executionContextServiceMock.createSetupContract();
 let mockTaskClaiming = taskClaimingMock.create({});
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
index ee7e2ec32932e..b6a7c52536d5e 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
@@ -9,8 +9,8 @@ import { Subject, Observable, Subscription } from 'rxjs';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, some, map as mapOptional } from 'fp-ts/lib/Option';
 import { tap } from 'rxjs/operators';
-import { UsageCounter } from '../../../../src/plugins/usage_collection/server';
-import type { Logger, ExecutionContextStart } from '../../../../src/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import type { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Result, asErr, mapErr, asOk, map, mapOk } from './lib/result_type';
 import { ManagedConfiguration } from './lib/create_managed_configuration';
diff --git a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts
index 1c3309c9d53f1..a220c631d55b2 100644
--- a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts
+++ b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getOldestIdleActionTask } from './oldest_idle_action_task';
 
 describe('getOldestIdleActionTask', () => {
diff --git a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts
index a7fb5c1c8c893..49e7bc1e8d9e3 100644
--- a/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts
+++ b/x-pack/plugins/task_manager/server/queries/oldest_idle_action_task.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ElasticsearchClient } from 'kibana/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
 
 /**
  * Returns the millisecond timestamp of the oldest action task that may still be executed (with a 24 hour delay).
diff --git a/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts b/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts
index 7b46f10adaabc..67175c86370d7 100644
--- a/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts
+++ b/x-pack/plugins/task_manager/server/queries/task_claiming.test.ts
@@ -15,7 +15,7 @@ import { SearchOpts, StoreOpts, UpdateByQueryOpts, UpdateByQuerySearchOpts } fro
 import { asTaskClaimEvent, ClaimTaskErr, TaskClaimErrorType, TaskEvent } from '../task_events';
 import { asOk, asErr } from '../lib/result_type';
 import { TaskTypeDictionary } from '../task_type_dictionary';
-import type { MustNotCondition } from '../queries/query_clauses';
+import type { MustNotCondition } from './query_clauses';
 import { mockLogger } from '../test_utils';
 import {
   TaskClaiming,
diff --git a/x-pack/plugins/task_manager/server/queries/task_claiming.ts b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
index 1b4f0fdb73683..f15639661e5d0 100644
--- a/x-pack/plugins/task_manager/server/queries/task_claiming.ts
+++ b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
@@ -15,7 +15,7 @@ import { map, mergeScan } from 'rxjs/operators';
 import { difference, partition, groupBy, mapValues, countBy, pick, isPlainObject } from 'lodash';
 import { some, none } from 'fp-ts/lib/Option';
 
-import { Logger } from '../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 
 import { asOk, asErr, Result } from '../lib/result_type';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
diff --git a/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts
index 5cad8283f1566..ff63ad68df884 100644
--- a/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts
+++ b/x-pack/plugins/task_manager/server/routes/_mock_handler_arguments.ts
@@ -6,9 +6,9 @@
  */
 
 import type { MethodKeysOf } from '@kbn/utility-types';
-import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from 'kibana/server';
+import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
 import { identity } from 'lodash';
-import { httpServerMock } from '../../../../../src/core/server/mocks';
+import { httpServerMock } from '@kbn/core/server/mocks';
 
 export function mockHandlerArguments(
   {}: {},
diff --git a/x-pack/plugins/task_manager/server/routes/health.test.ts b/x-pack/plugins/task_manager/server/routes/health.test.ts
index 580cc9035b366..31d4a17434598 100644
--- a/x-pack/plugins/task_manager/server/routes/health.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.test.ts
@@ -9,19 +9,19 @@ import { Observable, of, Subject } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { merge } from 'lodash';
 import uuid from 'uuid';
-import { httpServiceMock } from 'src/core/server/mocks';
+import { httpServiceMock } from '@kbn/core/server/mocks';
 import { healthRoute } from './health';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 import { sleep } from '../test_utils';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   HealthStatus,
   MonitoringStats,
   RawMonitoringStats,
   summarizeMonitoringStats,
 } from '../monitoring';
-import { ServiceStatusLevels, Logger } from 'src/core/server';
+import { ServiceStatusLevels, Logger } from '@kbn/core/server';
 import { configSchema, TaskManagerConfig } from '../config';
 import { calculateHealthStatusMock } from '../lib/calculate_health_status.mock';
 import { FillPoolResult } from '../lib/fill_pool';
diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts
index 2c0e082eb0991..03fe93c79c951 100644
--- a/x-pack/plugins/task_manager/server/routes/health.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.ts
@@ -11,13 +11,13 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { IClusterClient } from 'src/core/server';
+} from '@kbn/core/server';
+import { IClusterClient } from '@kbn/core/server';
 import { Observable, Subject } from 'rxjs';
 import { tap, map } from 'rxjs/operators';
 import { throttleTime } from 'rxjs/operators';
-import { UsageCounter } from 'src/plugins/usage_collection/server';
-import { Logger, ServiceStatus, ServiceStatusLevels } from '../../../../../src/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
+import { Logger, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import {
   MonitoringStats,
   summarizeMonitoringStats,
diff --git a/x-pack/plugins/task_manager/server/saved_objects/index.ts b/x-pack/plugins/task_manager/server/saved_objects/index.ts
index 2a4dba6ed7d94..2418346234a29 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsServiceSetup, SavedObjectsTypeMappingDefinition } from 'kibana/server';
+import type { SavedObjectsServiceSetup, SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import mappings from './mappings.json';
 import { getMigrations } from './migrations';
diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
index cfd0f874f58ff..a59fb077dbdeb 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.test.ts
@@ -7,8 +7,8 @@
 
 import uuid from 'uuid';
 import { getMigrations } from './migrations';
-import { SavedObjectUnsanitizedDoc } from 'kibana/server';
-import { migrationMocks } from 'src/core/server/mocks';
+import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { migrationMocks } from '@kbn/core/server/mocks';
 import { TaskInstanceWithDeprecatedFields } from '../task';
 
 const migrationContext = migrationMocks.createContext();
diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
index 6e527918f2a7e..eb4ff6c1b0ecf 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
@@ -12,7 +12,7 @@ import {
   SavedObjectMigrationMap,
   SavedObjectsUtils,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 import { REMOVED_TYPES } from '../task_type_dictionary';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
 
diff --git a/x-pack/plugins/task_manager/server/task_pool.test.ts b/x-pack/plugins/task_manager/server/task_pool.test.ts
index 7712bb977803c..498fb8975aae6 100644
--- a/x-pack/plugins/task_manager/server/task_pool.test.ts
+++ b/x-pack/plugins/task_manager/server/task_pool.test.ts
@@ -8,10 +8,10 @@ import sinon from 'sinon';
 import { of, Subject } from 'rxjs';
 import { TaskPool, TaskPoolRunResult } from './task_pool';
 import { resolvable, sleep } from './test_utils';
-import { loggingSystemMock } from '../../../../src/core/server/mocks';
-import { Logger } from '../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { asOk } from './lib/result_type';
-import { SavedObjectsErrorHelpers } from '../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import moment from 'moment';
 import uuid from 'uuid';
 import { TaskRunningStage } from './task_running';
diff --git a/x-pack/plugins/task_manager/server/task_pool.ts b/x-pack/plugins/task_manager/server/task_pool.ts
index d8a9fdd6223fe..e73af74bc73e3 100644
--- a/x-pack/plugins/task_manager/server/task_pool.ts
+++ b/x-pack/plugins/task_manager/server/task_pool.ts
@@ -12,7 +12,7 @@
 import { Observable, Subject } from 'rxjs';
 import moment, { Duration } from 'moment';
 import { padStart } from 'lodash';
-import { Logger } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { TaskRunner } from './task_running';
 import { isTaskSavedObjectNotFoundError } from './lib/is_task_not_found_error';
 import { TaskManagerStat } from './task_events';
diff --git a/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts b/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
index a9d1d8b6f2f16..e010a7a0126b8 100644
--- a/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/ephemeral_task_runner.ts
@@ -15,7 +15,7 @@ import apm from 'elastic-apm-node';
 import uuid from 'uuid';
 import { withSpan } from '@kbn/apm-utils';
 import { identity } from 'lodash';
-import { Logger, ExecutionContextStart } from '../../../../../src/core/server';
+import { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Middleware } from '../lib/middleware';
 import { asOk, asErr, eitherAsync, Result } from '../lib/result_type';
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
index ece82099728e3..73d30b022c626 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.test.ts
@@ -9,7 +9,7 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import { secondsFromNow } from '../lib/intervals';
 import { asOk, asErr } from '../lib/result_type';
-import { TaskManagerRunner, TaskRunningStage, TaskRunResult } from '../task_running';
+import { TaskManagerRunner, TaskRunningStage, TaskRunResult } from '.';
 import {
   TaskEvent,
   asTaskRunEvent,
@@ -18,15 +18,15 @@ import {
   TaskPersistence,
 } from '../task_events';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import moment from 'moment';
 import { TaskDefinitionRegistry, TaskTypeDictionary } from '../task_type_dictionary';
 import { mockLogger } from '../test_utils';
 import { throwUnrecoverableError } from './errors';
 import { taskStoreMock } from '../task_store.mock';
 import apm from 'elastic-apm-node';
-import { executionContextServiceMock } from '../../../../../src/core/server/mocks';
-import { usageCountersServiceMock } from 'src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock';
+import { executionContextServiceMock } from '@kbn/core/server/mocks';
+import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
 import {
   TASK_MANAGER_RUN_TRANSACTION_TYPE,
   TASK_MANAGER_TRANSACTION_TYPE,
diff --git a/x-pack/plugins/task_manager/server/task_running/task_runner.ts b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
index 778a834c168a1..b6199f06300f1 100644
--- a/x-pack/plugins/task_manager/server/task_running/task_runner.ts
+++ b/x-pack/plugins/task_manager/server/task_running/task_runner.ts
@@ -15,12 +15,8 @@ import apm from 'elastic-apm-node';
 import uuid from 'uuid';
 import { withSpan } from '@kbn/apm-utils';
 import { identity, defaults, flow } from 'lodash';
-import {
-  Logger,
-  SavedObjectsErrorHelpers,
-  ExecutionContextStart,
-} from '../../../../../src/core/server';
-import { UsageCounter } from '../../../../../src/plugins/usage_collection/server';
+import { Logger, SavedObjectsErrorHelpers, ExecutionContextStart } from '@kbn/core/server';
+import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { Middleware } from '../lib/middleware';
 import {
   asOk,
diff --git a/x-pack/plugins/task_manager/server/task_scheduling.ts b/x-pack/plugins/task_manager/server/task_scheduling.ts
index abf1ea0f50eda..a38e2d23fccec 100644
--- a/x-pack/plugins/task_manager/server/task_scheduling.ts
+++ b/x-pack/plugins/task_manager/server/task_scheduling.ts
@@ -14,7 +14,7 @@ import uuid from 'uuid';
 import { pick } from 'lodash';
 import { merge, Subject } from 'rxjs';
 import agent from 'elastic-apm-node';
-import { Logger } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import { asOk, either, map, mapErr, promiseResult, isErr } from './lib/result_type';
 import {
   isTaskRunEvent,
diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts
index 8b897d279fe4a..46eb792eedcd9 100644
--- a/x-pack/plugins/task_manager/server/task_store.test.ts
+++ b/x-pack/plugins/task_manager/server/task_store.test.ts
@@ -15,15 +15,15 @@ import {
   TaskLifecycleResult,
   SerializedConcreteTaskInstance,
 } from './task';
-import { elasticsearchServiceMock } from '../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { TaskStore, SearchOpts } from './task_store';
-import { savedObjectsRepositoryMock } from 'src/core/server/mocks';
+import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 import {
   SavedObjectsSerializer,
   SavedObjectTypeRegistry,
   SavedObjectAttributes,
   SavedObjectsErrorHelpers,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { TaskTypeDictionary } from './task_type_dictionary';
 import { mockLogger } from './test_utils';
 
diff --git a/x-pack/plugins/task_manager/server/task_store.ts b/x-pack/plugins/task_manager/server/task_store.ts
index db47ba25300ca..1d0d6ce80e073 100644
--- a/x-pack/plugins/task_manager/server/task_store.ts
+++ b/x-pack/plugins/task_manager/server/task_store.ts
@@ -20,7 +20,7 @@ import {
   ISavedObjectsRepository,
   SavedObjectsUpdateResponse,
   ElasticsearchClient,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
 
 import { asOk, asErr, Result } from './lib/result_type';
 
diff --git a/x-pack/plugins/task_manager/server/task_type_dictionary.ts b/x-pack/plugins/task_manager/server/task_type_dictionary.ts
index a2ea46122acf8..75bd54510b43b 100644
--- a/x-pack/plugins/task_manager/server/task_type_dictionary.ts
+++ b/x-pack/plugins/task_manager/server/task_type_dictionary.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Logger } from '@kbn/core/server';
 import { TaskDefinition, taskDefinitionSchema, TaskRunCreatorFunction } from './task';
-import { Logger } from '../../../../src/core/server';
 
 /**
  * Types that are no longer registered and will be marked as unregistered
diff --git a/x-pack/plugins/task_manager/server/test_utils/index.ts b/x-pack/plugins/task_manager/server/test_utils/index.ts
index 215bd55981b8d..88b98025b5ff5 100644
--- a/x-pack/plugins/task_manager/server/test_utils/index.ts
+++ b/x-pack/plugins/task_manager/server/test_utils/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 /*
  * A handful of helper functions for testing the task manager.
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
index b7a52a7a41bcf..9fdd0c4988575 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
@@ -6,12 +6,12 @@
  */
 import { Subject } from 'rxjs';
 import { merge } from 'lodash';
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
   createUsageCollectionSetupMock,
-} from 'src/plugins/usage_collection/server/mocks';
+} from '@kbn/usage-collection-plugin/server/mocks';
 import { HealthStatus } from '../monitoring';
 import { MonitoredHealth } from '../routes/health';
 import { TaskPersistence } from '../task_events';
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
index d6eb92b944ce1..82e9eb95dd760 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { Observable } from 'rxjs';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { MonitoredHealth } from '../routes/health';
 import { TaskManagerUsage } from './types';
 
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts b/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
index d601cb47bacda..64f5c858a655b 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
-import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
-import { getClusterUuids } from '../../../../src/plugins/telemetry/server';
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
+import { TelemetryCollectionManagerPluginSetup } from '@kbn/telemetry-collection-manager-plugin/server';
+import { getClusterUuids } from '@kbn/telemetry-plugin/server';
 import { getStatsWithXpack } from './telemetry_collection';
 
 interface TelemetryCollectionXpackDepsSetup {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts
index 7d09280b29d3e..77b3bf4de968a 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getLicenseFromLocalOrMaster } from './get_license';
 
 describe('getLicenseFromLocalOrMaster', () => {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts
index 2510b467c381a..11f2b1359ab13 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 
 export type ESLicense = estypes.LicenseGetLicenseInformation;
 
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
index e1bea8d1aa0e1..f2adb257f9cb6 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.test.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { coreMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { coreMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getStatsWithXpack } from './get_stats_with_xpack';
-import { SavedObjectsClient } from '../../../../../src/core/server';
-import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/server/mocks';
+import { SavedObjectsClient } from '@kbn/core/server';
+import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/server/mocks';
 
 const kibana = {
   kibana: {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
index 3adc5bc9f2eac..b789b1e54d2f9 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_stats_with_xpack.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { StatsGetter } from 'src/plugins/telemetry_collection_manager/server';
-import { TelemetryLocalStats, getLocalStats } from '../../../../../src/plugins/telemetry/server';
+import { StatsGetter } from '@kbn/telemetry-collection-manager-plugin/server';
+import { TelemetryLocalStats, getLocalStats } from '@kbn/telemetry-plugin/server';
 import { getXPackUsage } from './get_xpack';
 import { ESLicense, getLicenseFromLocalOrMaster } from './get_license';
 import { isClusterOptedIn } from './is_cluster_opted_in';
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts
index 3a89e11c91a99..4f3cd6a5dc2d6 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getXPackUsage } from './get_xpack';
 
 describe('get_xpack', () => {
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
index 871a2d846f9f7..26cee1c09561d 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_xpack.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { TIMEOUT } from './constants';
 
 /**
diff --git a/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts b/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
index 544ca033b060c..5e74e01fbe843 100644
--- a/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
@@ -12,7 +12,7 @@ import type {
   IEsSearchResponse,
   FieldSpec,
   RuntimeField,
-} from '../../../../../../src/plugins/data/common';
+} from '@kbn/data-plugin/common';
 import type { DocValueFields, Maybe } from '../common';
 
 export type BeatFieldsFactoryQueryType = 'beatFields';
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts
index 9ff370482ef08..8e50d6db48f24 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/all/index.ts
@@ -8,7 +8,7 @@
 import { JsonObject } from '@kbn/utility-types';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import type { Ecs } from '../../../../ecs';
 import type { CursorType, Inspect, Maybe, PaginationInputPaginated } from '../../../common';
 import type { TimelineRequestOptionsPaginated } from '../..';
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts
index 32dfde2b5c8ff..ccc558e96bf34 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/details/index.ts
@@ -7,10 +7,10 @@
 
 import { JsonObject } from '@kbn/utility-types';
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../common';
 import { TimelineRequestOptionsPaginated } from '../..';
-import { Ecs } from '../../../../../common/ecs';
+import { Ecs } from '../../../../ecs';
 
 export interface TimelineEventsDetailsItem {
   ariaRowindex?: Maybe<number>;
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts
index fee5014524fe7..dac5d5651003c 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/eql/index.ts
@@ -6,10 +6,7 @@
  */
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
-import type {
-  EqlSearchStrategyRequest,
-  EqlSearchStrategyResponse,
-} from '../../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyRequest, EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { EqlSearchResponse, Inspect, Maybe, PaginationInputPaginated } from '../../..';
 import { TimelineEdges, TimelineEventsAllRequestOptions } from '../..';
 
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts
index 915f355b5f893..a78ba38f4b55e 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/events/last_event_time/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { Inspect, Maybe } from '../../../common';
 import { TimelineRequestBasicOptions } from '../..';
 
diff --git a/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts b/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts
index c328ba49493f5..3d575ead5463a 100644
--- a/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/timeline/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import type { IEsSearchRequest } from '@kbn/data-plugin/common';
 import { ESQuery } from '../../typed_json';
 import {
   TimelineEventsQueries,
diff --git a/x-pack/plugins/timelines/common/types/timeline/cells/index.ts b/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
index 32c28dfb7adf7..bea01e0dac6ca 100644
--- a/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
+++ b/x-pack/plugins/timelines/common/types/timeline/cells/index.ts
@@ -7,7 +7,7 @@
 
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
-import { RowRenderer } from '../../../types';
+import { RowRenderer } from '../..';
 import { Ecs } from '../../../ecs';
 import { BrowserFields, TimelineNonEcsData } from '../../../search_strategy';
 import { ColumnHeaderOptions } from '../columns';
diff --git a/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx b/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx
index fd758e74df0e9..9aeda73aeef67 100644
--- a/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx
+++ b/x-pack/plugins/timelines/common/types/timeline/columns/index.tsx
@@ -50,6 +50,7 @@ export type TGridCellAction = ({
   header,
   pageSize,
   timelineId,
+  closeCellPopover,
 }: {
   browserFields: BrowserFields;
   /** each row of data is represented as one TimelineNonEcsData[] */
@@ -58,6 +59,7 @@ export type TGridCellAction = ({
   header?: ColumnHeaderOptions;
   pageSize: number;
   timelineId: string;
+  closeCellPopover?: () => void;
 }) => (props: EuiDataGridColumnCellActionProps) => ReactNode;
 
 /** The specification of a column header */
diff --git a/x-pack/plugins/timelines/common/types/timeline/rows/index.ts b/x-pack/plugins/timelines/common/types/timeline/rows/index.ts
index 089f886e1c221..b65f4d19c5abb 100644
--- a/x-pack/plugins/timelines/common/types/timeline/rows/index.ts
+++ b/x-pack/plugins/timelines/common/types/timeline/rows/index.ts
@@ -7,18 +7,15 @@
 
 import { RowRendererId } from '..';
 import { Ecs } from '../../../ecs';
-import { BrowserFields } from '../../../search_strategy/index_fields';
 
 export interface RowRenderer {
   id: RowRendererId;
   isInstance: (data: Ecs) => boolean;
   renderRow: ({
-    browserFields,
     data,
     isDraggable,
     timelineId,
   }: {
-    browserFields: BrowserFields;
     data: Ecs;
     isDraggable: boolean;
     timelineId: string;
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts b/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
index b24b1fdf8501a..9f0e76f20df15 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { EuiButtonEmpty, EuiButtonIcon, EuiButtonIconPropsForButton } from '@elastic/eui';
-import type { FilterManager } from '../../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 
 export interface FilterValueFnArgs {
   /** `Component` is only used with `EuiDataGrid`; the grid keeps a reference to `Component` for show / hide functionality */
diff --git a/x-pack/plugins/timelines/public/components/index.tsx b/x-pack/plugins/timelines/public/components/index.tsx
index a99466676376a..ea1e6fdcf3b6d 100644
--- a/x-pack/plugins/timelines/public/components/index.tsx
+++ b/x-pack/plugins/timelines/public/components/index.tsx
@@ -10,8 +10,8 @@ import { Provider } from 'react-redux';
 import { I18nProvider } from '@kbn/i18n-react';
 import type { Store } from 'redux';
 
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { createStore } from '../store/t_grid';
 
 import { TGrid as TGridComponent } from './t_grid';
diff --git a/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx b/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx
index 2e23d455157f8..f9c920cfe892a 100644
--- a/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/last_updated/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n-react';
-import { LastUpdatedAt } from './';
+import { LastUpdatedAt } from '.';
 
 jest.mock('@kbn/i18n-react', () => {
   const originalModule = jest.requireActual('@kbn/i18n-react');
diff --git a/x-pack/plugins/timelines/public/components/rule_name/index.tsx b/x-pack/plugins/timelines/public/components/rule_name/index.tsx
index 766a7f4848495..2f51c5f78ac5a 100644
--- a/x-pack/plugins/timelines/public/components/rule_name/index.tsx
+++ b/x-pack/plugins/timelines/public/components/rule_name/index.tsx
@@ -8,8 +8,8 @@
 import { EuiLink } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import React, { useCallback, useMemo } from 'react';
-import { CoreStart } from '../../../../../../src/core/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { CoreStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface RuleNameProps {
   name: string;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
index 9655c61c8f155..8ad15580d7bfe 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_event.tsx
@@ -161,7 +161,6 @@ const StatefulEventComponent: React.FC<Props> = ({
       <EventsTrSupplement>
         <StatefulRowRenderer
           ariaRowindex={ariaRowindex}
-          browserFields={browserFields}
           containerRef={containerRef}
           event={event}
           lastFocusedAriaColindex={lastFocusedAriaColindex}
@@ -170,15 +169,7 @@ const StatefulEventComponent: React.FC<Props> = ({
         />
       </EventsTrSupplement>
     ),
-    [
-      ariaRowindex,
-      browserFields,
-      containerRef,
-      event,
-      lastFocusedAriaColindex,
-      rowRenderers,
-      timelineId,
-    ]
+    [ariaRowindex, containerRef, event, lastFocusedAriaColindex, rowRenderers, timelineId]
   );
 
   return (
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx
index 31b1963a24edd..80b6e332e4fcd 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/events/stateful_row_renderer/index.tsx
@@ -17,7 +17,6 @@ import {
 import { useStatefulEventFocus } from '../use_stateful_event_focus';
 
 import * as i18n from '../translations';
-import type { BrowserFields } from '../../../../../../common/search_strategy/index_fields';
 import type { TimelineItem } from '../../../../../../common/search_strategy';
 import type { RowRenderer } from '../../../../../../common/types/timeline';
 import { getRowRenderer } from '../../renderers/get_row_renderer';
@@ -37,7 +36,6 @@ import { getRowRenderer } from '../../renderers/get_row_renderer';
  */
 export const StatefulRowRenderer = ({
   ariaRowindex,
-  browserFields,
   containerRef,
   event,
   lastFocusedAriaColindex,
@@ -45,7 +43,6 @@ export const StatefulRowRenderer = ({
   timelineId,
 }: {
   ariaRowindex: number;
-  browserFields: BrowserFields;
   containerRef: React.MutableRefObject<HTMLDivElement | null>;
   event: TimelineItem;
   lastFocusedAriaColindex: number;
@@ -78,7 +75,6 @@ export const StatefulRowRenderer = ({
               </EuiScreenReaderOnly>
               <div onKeyDown={onKeyDown}>
                 {rowRenderer.renderRow({
-                  browserFields,
                   data: event.ecs,
                   isDraggable: false,
                   timelineId,
@@ -90,7 +86,6 @@ export const StatefulRowRenderer = ({
       ),
     [
       ariaRowindex,
-      browserFields,
       event.ecs,
       focusOwnership,
       onFocus,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx
index afe7c5954cdad..e17bb341b1408 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/helpers.tsx
@@ -9,6 +9,7 @@ import { ALERT_RULE_CONSUMER, ALERT_RULE_PRODUCER } from '@kbn/rule-data-utils';
 import { isEmpty } from 'lodash/fp';
 
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import type { Ecs } from '../../../../common/ecs';
 import type {
   BrowserField,
@@ -22,8 +23,6 @@ import type {
   TimelineEventsType,
 } from '../../../../common/types/timeline';
 
-import type { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const omitTypenameAndEmpty = (k: string, v: any): any | undefined =>
   k !== '__typename' && v != null ? v : undefined;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
index 4ba36a3ec6419..ee40f80047682 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -7,6 +7,7 @@
 
 import {
   EuiDataGrid,
+  EuiDataGridRefProps,
   EuiDataGridColumn,
   EuiDataGridCellValueElementProps,
   EuiDataGridControlColumn,
@@ -28,12 +29,14 @@ import React, {
   useMemo,
   useState,
   useContext,
+  useRef,
 } from 'react';
 import { connect, ConnectedProps, useDispatch } from 'react-redux';
 
 import styled, { ThemeContext } from 'styled-components';
 import { ALERT_RULE_CONSUMER, ALERT_RULE_PRODUCER } from '@kbn/rule-data-utils';
 import { Filter } from '@kbn/es-query';
+import type { EuiTheme } from '@kbn/kibana-react-plugin/common';
 import {
   TGridCellAction,
   BulkActionsProp,
@@ -65,7 +68,7 @@ import type { OnRowSelected, OnSelectAll } from '../types';
 import type { FieldBrowserOptions } from '../../../../common/types';
 import type { Refetch } from '../../../store/t_grid/inputs';
 import { getPageRowIndex } from '../../../../common/utils/pagination';
-import { StatefulEventContext } from '../../../components/stateful_event_context';
+import { StatefulEventContext } from '../../stateful_event_context';
 import { StatefulFieldsBrowser } from '../toolbar/fields_browser';
 import { tGridActions, TGridModel, tGridSelectors, TimelineState } from '../../../store/t_grid';
 import { useDeepEqualSelector } from '../../../hooks/use_selector';
@@ -73,7 +76,6 @@ import { RowAction } from './row_action';
 import * as i18n from './translations';
 import { AlertCount } from '../styles';
 import { checkBoxControlColumn } from './control_columns';
-import type { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
 import { ViewSelection } from '../event_rendered_view/selector';
 import { EventRenderedView } from '../event_rendered_view';
 import { REMOVE_COLUMN } from './column_headers/translations';
@@ -337,6 +339,8 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
     trailingControlColumns = EMPTY_CONTROL_COLUMNS,
     unit = defaultUnit,
   }) => {
+    const dataGridRef = useRef<EuiDataGridRefProps>(null);
+
     const dispatch = useDispatch();
     const getManageTimeline = useMemo(() => tGridSelectors.getManageTimelineById(), []);
     const { queryFields, selectAll } = useDeepEqualSelector((state) =>
@@ -687,6 +691,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
               header: columnHeaders.find((h) => h.id === header.id),
               pageSize,
               timelineId: id,
+              closeCellPopover: dataGridRef.current?.closeCellPopover,
             });
           return {
             ...header,
@@ -711,6 +716,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
                   cellActions:
                     header.tGridCellActions?.map(buildAction) ??
                     defaultCellActions?.map(buildAction),
+                  visibleCellActions: 3,
                 }
               : {}),
           };
@@ -837,6 +843,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
                   onChangeItemsPerPage,
                   onChangePage,
                 }}
+                ref={dataGridRef}
               />
             </EuiDataGridContainer>
           )}
@@ -844,7 +851,6 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
             <EventRenderedView
               appId={appId}
               alertToolbar={alertToolbar}
-              browserFields={browserFields}
               events={data}
               leadingControlColumns={leadingTGridControlColumns ?? []}
               onChangePage={onChangePage}
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx
index 1a4bfcb0e4ab5..094c2a6559585 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/renderers/plain_row_renderer.test.tsx
@@ -9,7 +9,7 @@ import { mount, shallow } from 'enzyme';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 import { Ecs } from '../../../../../common/ecs';
-import { mockBrowserFields, mockTimelineData } from '../../../../mock';
+import { mockTimelineData } from '../../../../mock';
 
 import { plainRowRenderer } from './plain_row_renderer';
 
@@ -21,7 +21,6 @@ describe('plain_row_renderer', () => {
 
   test('renders correctly against snapshot', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: false,
       timelineId: 'test',
@@ -36,7 +35,6 @@ describe('plain_row_renderer', () => {
 
   test('should render a plain row', () => {
     const children = plainRowRenderer.renderRow({
-      browserFields: mockBrowserFields,
       data: mockDatum,
       isDraggable: false,
       timelineId: 'test',
diff --git a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx
index ca812e2c122d5..fec145b10525e 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { eventRenderedProps, TestProviders } from '../../../mock';
-import { EventRenderedView } from './';
+import { EventRenderedView } from '.';
 
 describe('event_rendered_view', () => {
   test('it renders the timestamp correctly', () => {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
index ef27a6a4c7aed..4e7138aae6cbf 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/event_rendered_view/index.tsx
@@ -21,9 +21,9 @@ import moment from 'moment';
 import React, { ComponentType, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
-import { useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 
-import type { BrowserFields, TimelineItem } from '../../../../common/search_strategy';
+import type { TimelineItem } from '../../../../common/search_strategy';
 import type { RowRenderer } from '../../../../common/types';
 import { RuleName } from '../../rule_name';
 import { isEventBuildingBlockType } from '../body/helpers';
@@ -62,7 +62,6 @@ const StyledEuiBasicTable = styled(EuiBasicTable as BasicTableType)`
 export interface EventRenderedViewProps {
   alertToolbar: React.ReactNode;
   appId: string;
-  browserFields: BrowserFields;
   events: TimelineItem[];
   leadingControlColumns: EuiDataGridControlColumn[];
   onChangePage: (newActivePage: number) => void;
@@ -85,7 +84,6 @@ export const PreferenceFormattedDate = React.memo(PreferenceFormattedDateCompone
 const EventRenderedViewComponent = ({
   alertToolbar,
   appId,
-  browserFields,
   events,
   leadingControlColumns,
   onChangePage,
@@ -142,7 +140,8 @@ const EventRenderedViewComponent = ({
             </ActionsContainer>
           );
         },
-        width: '152px',
+        // TODO: derive this from ACTION_BUTTON_COUNT as other columns are done
+        width: '184px',
       },
       {
         field: 'ecs.timestamp',
@@ -192,7 +191,6 @@ const EventRenderedViewComponent = ({
                     <EventRenderedFlexItem className="eui-xScroll">
                       <div className="eui-displayInlineBlock">
                         {rowRenderer.renderRow({
-                          browserFields,
                           data: ecsData,
                           isDraggable: false,
                           timelineId: 'NONE',
@@ -207,7 +205,7 @@ const EventRenderedViewComponent = ({
         width: '60%',
       },
     ],
-    [ActionTitle, browserFields, events, leadingControlColumns, rowRenderers, appId]
+    [ActionTitle, events, leadingControlColumns, rowRenderers, appId]
   );
 
   const handleTableChange = useCallback(
diff --git a/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx
index c5f8cb4afd318..20d30151e5ac7 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/footer/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 
-import { FooterComponent, PagingControlComponent } from './index';
+import { FooterComponent, PagingControlComponent } from '.';
 
 describe('Footer Timeline Component', () => {
   const loadMore = jest.fn();
diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx
index d58cf96e81475..bbf1664ea6474 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.test.tsx
@@ -8,7 +8,7 @@
 import { euiDarkVars } from '@kbn/ui-theme';
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { TGridIntegrated, TGridIntegratedProps } from './index';
+import { TGridIntegrated, TGridIntegratedProps } from '.';
 import { TestProviders, tGridIntegratedProps } from '../../../mock';
 
 const mockId = tGridIntegratedProps.id;
diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
index 2991d80c7af0a..59b2f9c1541a1 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
@@ -14,10 +14,12 @@ import { useDispatch } from 'react-redux';
 
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { DataViewBase, Filter, Query } from '@kbn/es-query';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { Direction, EntityType } from '../../../../common/search_strategy';
 import type { DocValueFields } from '../../../../common/search_strategy';
-import type { CoreStart } from '../../../../../../../src/core/public';
 import type { BrowserFields } from '../../../../common/search_strategy/index_fields';
 import {
   BulkActionsProp,
@@ -35,8 +37,6 @@ import type {
   AlertStatus,
 } from '../../../../common/types/timeline';
 
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { useDeepEqualSelector } from '../../../hooks/use_selector';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { buildCombinedQuery, getCombinedFilterQuery, resolverIsShowing } from '../helpers';
diff --git a/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
index f2899547b464e..dbc8f11313797 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
@@ -16,8 +16,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import type { CoreStart } from '../../../../../../../src/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
 
 const heights = {
   tall: 490,
diff --git a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
index be71d159eafca..86fc4bbc163b2 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
@@ -11,9 +11,11 @@ import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Filter, Query } from '@kbn/es-query';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import { Direction, EntityType } from '../../../../common/search_strategy';
-import type { CoreStart } from '../../../../../../../src/core/public';
 import { TGridCellAction, TimelineTabs } from '../../../../common/types/timeline';
 
 import type {
@@ -26,8 +28,6 @@ import type {
   BulkActionsProp,
   AlertStatus,
 } from '../../../../common/types/timeline';
-import type { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
 import { useDeepEqualSelector } from '../../../hooks/use_selector';
 import { defaultHeaders } from '../body/column_headers/default_headers';
 import { combineQueries, getCombinedFilterQuery } from '../helpers';
diff --git a/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx b/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx
index 37cb2b7fc92e5..00084cbe71c28 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/subtitle/index.test.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { TestProviders } from '../../../mock';
 
-import { Subtitle } from './index';
+import { Subtitle } from '.';
 
 describe('Subtitle', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
index 0fde09f555e00..2f580fdaf08e6 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/alert_status_bulk_actions.tsx
@@ -16,7 +16,7 @@ import type {
 } from '../../../../../common/types';
 import type { Refetch } from '../../../../store/t_grid/inputs';
 import { tGridActions, TGridModel, tGridSelectors, TimelineState } from '../../../../store/t_grid';
-import { BulkActions } from './';
+import { BulkActions } from '.';
 import { useStatusBulkActionItems } from '../../../../hooks/use_status_bulk_action_items';
 
 interface OwnProps {
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx
index fe1c64f90a7f5..a1d8d467a3a60 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/bulk_actions/index.tsx
@@ -9,7 +9,7 @@ import { EuiPopover, EuiButtonEmpty, EuiContextMenuPanel } from '@elastic/eui';
 import numeral from '@elastic/numeral';
 import React, { useState, useCallback, useMemo } from 'react';
 import styled from 'styled-components';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants';
 import * as i18n from './translations';
 
diff --git a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
index 293121a4d3a61..d6c2c7de5aa18 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/toolbar/fields_browser/helpers.tsx
@@ -9,7 +9,7 @@ import { EuiBadge, EuiLoadingSpinner } from '@elastic/eui';
 import { pickBy } from 'lodash/fp';
 import styled from 'styled-components';
 
-import { TimelineId } from '../../../../../public/types';
+import { TimelineId } from '../../../../types';
 import type { BrowserField, BrowserFields } from '../../../../../common/search_strategy';
 import { defaultHeaders } from '../../../../store/t_grid/defaults';
 import { ColumnHeaderOptions } from '../../../../../common';
diff --git a/x-pack/plugins/timelines/public/container/index.tsx b/x-pack/plugins/timelines/public/container/index.tsx
index 06316739fa307..322cd2bfdc54e 100644
--- a/x-pack/plugins/timelines/public/container/index.tsx
+++ b/x-pack/plugins/timelines/public/container/index.tsx
@@ -12,15 +12,15 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { Subscription } from 'rxjs';
 import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { DataView } from '../../../../../src/plugins/data_views/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
+
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
 import {
   clearEventsLoading,
   clearEventsDeleted,
   setTimelineUpdatedAt,
 } from '../store/t_grid/actions';
-
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { isCompleteResponse, isErrorResponse } from '../../../../../src/plugins/data/common';
 import {
   Direction,
   TimelineFactoryQueryTypes,
diff --git a/x-pack/plugins/timelines/public/container/source/index.tsx b/x-pack/plugins/timelines/public/container/source/index.tsx
index e5a84b3ee9d10..cbe2158784913 100644
--- a/x-pack/plugins/timelines/public/container/source/index.tsx
+++ b/x-pack/plugins/timelines/public/container/source/index.tsx
@@ -7,10 +7,16 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { isEmpty, isEqual, pick } from 'lodash/fp';
-import { Subscription } from 'rxjs/internal/Subscription';
+import { Subscription } from 'rxjs';
 
 import memoizeOne from 'memoize-one';
 import { DataViewBase } from '@kbn/es-query';
+
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { isCompleteResponse, isErrorResponse } from '@kbn/data-plugin/common';
+
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import * as i18n from './translations';
 import {
   BrowserField,
   BrowserFields,
@@ -19,12 +25,6 @@ import {
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse,
 } from '../../../common/search_strategy';
-import * as i18n from './translations';
-
-import type { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { isCompleteResponse, isErrorResponse } from '../../../../../../src/plugins/data/common';
-
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useAppToasts } from '../../hooks/use_app_toasts';
 
 const DEFAULT_BROWSER_FIELDS = {};
diff --git a/x-pack/plugins/timelines/public/container/use_update_alerts.ts b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
index a20bebe531d16..373490f8a014f 100644
--- a/x-pack/plugins/timelines/public/container/use_update_alerts.ts
+++ b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { CoreStart } from '../../../../../src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type { AlertStatus } from '../../../timelines/common/types';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { AlertStatus } from '../../common/types';
 import {
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
   RAC_ALERTS_BULK_UPDATE_URL,
diff --git a/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts b/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts
index 8b05aa6df27a7..4a3cc315ae693 100644
--- a/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts
+++ b/x-pack/plugins/timelines/public/hooks/use_app_toasts.ts
@@ -10,14 +10,9 @@ import { isString } from 'lodash/fp';
 import { isAppError, isKibanaError, isSecurityAppError } from '@kbn/securitysolution-t-grid';
 import type { AppError } from '@kbn/securitysolution-t-grid';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type {
-  ErrorToastOptions,
-  ToastsStart,
-  Toast,
-  NotificationsStart,
-} from '../../../../../src/core/public';
-import { IEsError, isEsError } from '../../../../../src/plugins/data/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { ErrorToastOptions, ToastsStart, Toast, NotificationsStart } from '@kbn/core/public';
+import { IEsError, isEsError } from '@kbn/data-plugin/public';
 
 export type UseAppToasts = Pick<ToastsStart, 'addSuccess' | 'addWarning'> & {
   api: ToastsStart;
diff --git a/x-pack/plugins/timelines/public/methods/index.tsx b/x-pack/plugins/timelines/public/methods/index.tsx
index 7d9ec4bcaab27..3bdb4c77e5fc0 100644
--- a/x-pack/plugins/timelines/public/methods/index.tsx
+++ b/x-pack/plugins/timelines/public/methods/index.tsx
@@ -8,8 +8,8 @@
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import type { Store } from 'redux';
-import type { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import type { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { TGridProps } from '../types';
 import type { LastUpdatedAtProps, LoadingPanelProps, FieldBrowserProps } from '../components';
 import { initialTGridState } from '../store/t_grid/reducer';
diff --git a/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts b/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts
index 1121ca2a6e11f..7bd449a622b68 100644
--- a/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts
+++ b/x-pack/plugins/timelines/public/mock/kibana_react.mock.ts
@@ -8,10 +8,10 @@
 import React from 'react';
 
 import { RecursivePartial } from '@elastic/eui/src/components/common';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { EuiTheme } from '../../../../../src/plugins/kibana_react/common';
-import { CoreStart } from '../../../../../src/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { EuiTheme } from '@kbn/kibana-react-plugin/common';
+import { CoreStart } from '@kbn/core/public';
 
 export const mockGetCreateCaseFlyout = jest.fn();
 export const mockGetAllCasesSelectorModal = jest.fn();
diff --git a/x-pack/plugins/timelines/public/mock/mock_local_storage.ts b/x-pack/plugins/timelines/public/mock/mock_local_storage.ts
index 89fb93a164a17..d76140f60fca8 100644
--- a/x-pack/plugins/timelines/public/mock/mock_local_storage.ts
+++ b/x-pack/plugins/timelines/public/mock/mock_local_storage.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IStorage, Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { IStorage, Storage } from '@kbn/kibana-utils-plugin/public';
 
 export const localStorageMock = (): IStorage => {
   let store: Record<string, unknown> = {};
diff --git a/x-pack/plugins/timelines/public/mock/t_grid.tsx b/x-pack/plugins/timelines/public/mock/t_grid.tsx
index 4d2ee5c7f8d67..d856cd43cadaf 100644
--- a/x-pack/plugins/timelines/public/mock/t_grid.tsx
+++ b/x-pack/plugins/timelines/public/mock/t_grid.tsx
@@ -134,7 +134,6 @@ export const tGridIntegratedProps: TGridIntegratedProps = {
 export const eventRenderedProps: EventRenderedViewProps = {
   alertToolbar: <></>,
   appId: '',
-  browserFields: mockBrowserFields,
   events: mockTimelineData,
   leadingControlColumns: [],
   onChangePage: () => null,
diff --git a/x-pack/plugins/timelines/public/plugin.ts b/x-pack/plugins/timelines/public/plugin.ts
index f2c2eafab9563..7e550d7140d62 100644
--- a/x-pack/plugins/timelines/public/plugin.ts
+++ b/x-pack/plugins/timelines/public/plugin.ts
@@ -8,8 +8,8 @@
 import { Store, Unsubscribe } from 'redux';
 import { throttle } from 'lodash';
 
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { CoreSetup, Plugin, CoreStart } from '../../../../src/core/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { CoreSetup, Plugin, CoreStart } from '@kbn/core/public';
 import type { LastUpdatedAtProps, LoadingPanelProps, FieldBrowserProps } from './components';
 import {
   getLastUpdatedLazy,
diff --git a/x-pack/plugins/timelines/public/store/t_grid/index.ts b/x-pack/plugins/timelines/public/store/t_grid/index.ts
index d37c62bc8c265..62ba6f53fa262 100644
--- a/x-pack/plugins/timelines/public/store/t_grid/index.ts
+++ b/x-pack/plugins/timelines/public/store/t_grid/index.ts
@@ -16,7 +16,7 @@ import {
 } from 'redux';
 
 import { createEpicMiddleware } from 'redux-observable';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { TimelineState, TGridEpicDependencies } from '../../types';
 import { tGridReducer } from './reducer';
 import { getTGridByIdSelector } from './selectors';
diff --git a/x-pack/plugins/timelines/public/store/t_grid/model.ts b/x-pack/plugins/timelines/public/store/t_grid/model.ts
index 82a4c3e68fd02..4c872252c4f59 100644
--- a/x-pack/plugins/timelines/public/store/t_grid/model.ts
+++ b/x-pack/plugins/timelines/public/store/t_grid/model.ts
@@ -7,7 +7,7 @@
 
 import type { EuiDataGridColumn } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
-import type { FilterManager } from '../../../../../../src/plugins/data/public';
+import type { FilterManager } from '@kbn/data-plugin/public';
 import type { TimelineNonEcsData } from '../../../common/search_strategy';
 import type {
   ColumnHeaderOptions,
diff --git a/x-pack/plugins/timelines/public/store/t_grid/types.ts b/x-pack/plugins/timelines/public/store/t_grid/types.ts
index b065a5e1b1e95..c4627b3accd71 100644
--- a/x-pack/plugins/timelines/public/store/t_grid/types.ts
+++ b/x-pack/plugins/timelines/public/store/t_grid/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { ColumnHeaderOptions } from '../../../common/types';
 import type { TGridModel, TGridModelSettings } from './model';
 
diff --git a/x-pack/plugins/timelines/public/types.ts b/x-pack/plugins/timelines/public/types.ts
index 0c9e6aa3e325f..4ebbfd51db6b7 100644
--- a/x-pack/plugins/timelines/public/types.ts
+++ b/x-pack/plugins/timelines/public/types.ts
@@ -8,9 +8,9 @@
 import { ReactElement } from 'react';
 import type { SensorAPI } from 'react-beautiful-dnd';
 import { Store } from 'redux';
-import { CoreStart } from '../../../../src/core/public';
-import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { CasesUiStart } from '../../cases/public';
+import { CoreStart } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { CasesUiStart } from '@kbn/cases-plugin/public';
 import type {
   LastUpdatedAtProps,
   LoadingPanelProps,
@@ -22,7 +22,7 @@ export type { SortDirection } from '../common/types';
 import type { TGridIntegratedProps } from './components/t_grid/integrated';
 import type { TGridStandaloneProps } from './components/t_grid/standalone';
 import type { UseAddToTimelineProps, UseAddToTimeline } from './hooks/use_add_to_timeline';
-import { HoverActionsConfig } from './components/hover_actions/index';
+import { HoverActionsConfig } from './components/hover_actions';
 import { TimelineTabs } from '../common/types';
 export * from './store/t_grid';
 export interface TimelinesUIStart {
diff --git a/x-pack/plugins/timelines/server/index.ts b/x-pack/plugins/timelines/server/index.ts
index e14ac343ed815..c1f4c17e7d757 100644
--- a/x-pack/plugins/timelines/server/index.ts
+++ b/x-pack/plugins/timelines/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { TimelinesPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/timelines/server/plugin.ts b/x-pack/plugins/timelines/server/plugin.ts
index eb172b7d27bd6..3cc8356a90280 100644
--- a/x-pack/plugins/timelines/server/plugin.ts
+++ b/x-pack/plugins/timelines/server/plugin.ts
@@ -5,20 +5,14 @@
  * 2.0.
  */
 
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  Logger,
-} from '../../../../src/core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '@kbn/core/server';
 
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { SetupPlugins, StartPlugins, TimelinesPluginUI, TimelinesPluginStart } from './types';
 import { defineRoutes } from './routes';
 import { timelineSearchStrategyProvider } from './search_strategy/timeline';
 import { timelineEqlSearchStrategyProvider } from './search_strategy/timeline/eql';
 import { indexFieldsProvider } from './search_strategy/index_fields';
-import { SecurityPluginSetup } from '../../security/server';
 
 export class TimelinesPlugin
   implements Plugin<TimelinesPluginUI, TimelinesPluginStart, SetupPlugins, StartPlugins>
diff --git a/x-pack/plugins/timelines/server/routes/index.ts b/x-pack/plugins/timelines/server/routes/index.ts
index 1c651469b795a..c4cd611ca6719 100644
--- a/x-pack/plugins/timelines/server/routes/index.ts
+++ b/x-pack/plugins/timelines/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter } from '../../../../../src/core/server';
+import { IRouter } from '@kbn/core/server';
 
 export function defineRoutes(router: IRouter) {
   router.get(
diff --git a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts
index c3af5a764d6a7..75c0add9f0575 100644
--- a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.test.ts
@@ -13,13 +13,10 @@ import {
   formatSecondFields,
   createFieldItem,
   requestIndexFieldSearch,
-} from './index';
+} from '.';
 import { mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField } from './mock';
 import { fieldsBeat as beatFields } from '../../utils/beat_schema/fields';
-import {
-  IndexPatternsFetcher,
-  SearchStrategyDependencies,
-} from '../../../../../../src/plugins/data/server';
+import { IndexPatternsFetcher, SearchStrategyDependencies } from '@kbn/data-plugin/server';
 
 describe('Index Fields', () => {
   describe('formatIndexFields', () => {
diff --git a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts
index ecd4862a7bd18..d6d23d7836ae9 100644
--- a/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/index_fields/index.ts
@@ -8,13 +8,14 @@
 import { from } from 'rxjs';
 import isEmpty from 'lodash/isEmpty';
 import get from 'lodash/get';
-import { ElasticsearchClient, StartServicesAccessor } from 'kibana/server';
+import { ElasticsearchClient, StartServicesAccessor } from '@kbn/core/server';
 import {
   IndexPatternsFetcher,
   ISearchStrategy,
   SearchStrategyDependencies,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
 
+import type { FieldSpec } from '@kbn/data-views-plugin/common';
 import { DELETED_SECURITY_SOLUTION_DATA_VIEW } from '../../../common/constants';
 import {
   IndexFieldsStrategyResponse,
@@ -23,7 +24,6 @@ import {
   BeatFields,
 } from '../../../common/search_strategy';
 import { StartPlugins } from '../../types';
-import type { FieldSpec } from '../../../../../../src/plugins/data_views/common';
 
 const apmIndexPattern = 'apm-*-transaction*';
 const apmDataStreamsPattern = 'traces-apm*';
diff --git a/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts b/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts
index 6ec6ca86538bd..b9f573ba8d38f 100644
--- a/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/index_fields/mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FieldDescriptor } from '../../../../../../src/plugins/data/server';
+import type { FieldDescriptor } from '@kbn/data-plugin/server';
 
 export const mockAuditbeatIndexField: FieldDescriptor[] = [
   {
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts
index a4c8803a758d5..9439f7a6423fb 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/__mocks__/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { EqlSearchStrategyResponse } from '../../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { EqlSearchResponse } from '../../../../../common/search_strategy';
 
 export const sequenceResponse = {
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts
index 976f1485ca761..c30a11ef76f1e 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { EqlSearchStrategyResponse } from '../../../../../../../src/plugins/data/common';
+import type { EqlSearchStrategyResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants';
 import {
   EqlSearchResponse,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
index 5ea8fefff7acb..0b59a213e848d 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
@@ -6,15 +6,8 @@
  */
 
 import { map, mergeMap } from 'rxjs/operators';
-import {
-  ISearchStrategy,
-  PluginStart,
-  shimHitsTotal,
-} from '../../../../../../../src/plugins/data/server';
-import {
-  EqlSearchStrategyResponse,
-  EQL_SEARCH_STRATEGY,
-} from '../../../../../../../src/plugins/data/common';
+import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
+import { EqlSearchStrategyResponse, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 import { EqlSearchResponse } from '../../../../common/search_strategy';
 import {
   TimelineEqlRequestOptions,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
index 72770565ea40b..3cec04f52b671 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
@@ -6,8 +6,8 @@
  */
 
 import { cloneDeep, getOr } from 'lodash/fp';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
 import {
   EventHit,
   TimelineEventsQueries,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
index 04c61a645cf16..1ac0ff00c7db1 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
@@ -14,7 +14,7 @@ import {
   TimelineEventsAllRequestOptions,
   TimelineRequestSortField,
 } from '../../../../../../common/search_strategy';
-import { createQueryFilterClauses } from '../../../../../../server/utils/build_query';
+import { createQueryFilterClauses } from '../../../../../utils/build_query';
 
 export const buildTimelineEventsAllQuery = ({
   authFilter,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts
index 79043f6af3ddd..e0fe70af27c25 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/details/index.ts
@@ -7,7 +7,7 @@
 
 import { cloneDeep, merge, unionBy } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   EventHit,
   TimelineEventsQueries,
@@ -16,7 +16,7 @@ import {
   TimelineEventsDetailsItem,
   EventSource,
 } from '../../../../../../common/search_strategy';
-import { inspectStringifyObject } from '../../../../../../server/utils/build_query';
+import { inspectStringifyObject } from '../../../../../utils/build_query';
 import { TimelineFactory } from '../../types';
 import { buildTimelineDetailsQuery } from './query.events_details.dsl';
 import {
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts
index 50484bbda0e6e..0973a96c2672f 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/kpi/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   TimelineEventsQueries,
   TimelineRequestBasicOptions,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts
index 528230d660a40..b83441900a41a 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/index.ts
@@ -7,7 +7,7 @@
 
 import { getOr } from 'lodash/fp';
 
-import type { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import {
   TimelineEventsQueries,
   TimelineEventsLastEventTimeStrategyResponse,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts
index 2862713b2d8bb..4f50ef11ff4f8 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/last_event_time/query.events_last_event_time.dsl.ts
@@ -6,7 +6,7 @@
  */
 
 import { isEmpty } from 'lodash/fp';
-import type { ISearchRequestParams } from 'src/plugins/data/common';
+import type { ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   TimelineEventsLastEventTimeRequestOptions,
   LastEventIndexKey,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts
index 3eb35c88f8ea9..31bb37e077642 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import type {
-  IEsSearchResponse,
-  ISearchRequestParams,
-} from '../../../../../../../src/plugins/data/common';
+import type { IEsSearchResponse, ISearchRequestParams } from '@kbn/data-plugin/common';
 import {
   TimelineFactoryQueryTypes,
   TimelineStrategyRequestType,
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
index 06f3b0e79b052..980f19ac2950c 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
@@ -12,13 +12,16 @@ import {
   AlertingAuthorizationEntity,
   AlertingAuthorizationFilterType,
   PluginStartContract as AlertingPluginStartContract,
-} from '../../../../alerting/server';
+} from '@kbn/alerting-plugin/server';
 import {
   ISearchStrategy,
   PluginStart,
   SearchStrategyDependencies,
   shimHitsTotal,
-} from '../../../../../../src/plugins/data/server';
+} from '@kbn/data-plugin/server';
+import { ENHANCED_ES_SEARCH_STRATEGY, ISearchOptions } from '@kbn/data-plugin/common';
+import { AuditLogger, SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { AlertAuditAction, alertAuditEvent } from '@kbn/rule-registry-plugin/server';
 import {
   TimelineFactoryQueryTypes,
   TimelineStrategyResponseType,
@@ -28,12 +31,6 @@ import {
 import { timelineFactory } from './factory';
 import { TimelineFactory } from './factory/types';
 import { isAggCardinalityAggregate } from './factory/helpers/is_agg_cardinality_aggregate';
-import {
-  ENHANCED_ES_SEARCH_STRATEGY,
-  ISearchOptions,
-} from '../../../../../../src/plugins/data/common';
-import { AuditLogger, SecurityPluginSetup } from '../../../../security/server';
-import { AlertAuditAction, alertAuditEvent } from '../../../../rule_registry/server';
 
 export const timelineSearchStrategyProvider = <T extends TimelineFactoryQueryTypes>(
   data: PluginStart,
diff --git a/x-pack/plugins/timelines/server/types.ts b/x-pack/plugins/timelines/server/types.ts
index 4367022573037..311281f67ea2a 100644
--- a/x-pack/plugins/timelines/server/types.ts
+++ b/x-pack/plugins/timelines/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { PluginSetup, PluginStart } from '../../../../src/plugins/data/server';
-import { PluginStartContract as AlertingPluginStartContract } from '../../alerting/server';
-import { SecurityPluginSetup } from '../../security/server';
+import type { PluginSetup, PluginStart } from '@kbn/data-plugin/server';
+import { PluginStartContract as AlertingPluginStartContract } from '@kbn/alerting-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface TimelinesPluginUI {}
diff --git a/x-pack/plugins/transform/common/api_schemas/transforms.ts b/x-pack/plugins/transform/common/api_schemas/transforms.ts
index dd956855250a5..70d6a250eb386 100644
--- a/x-pack/plugins/transform/common/api_schemas/transforms.ts
+++ b/x-pack/plugins/transform/common/api_schemas/transforms.ts
@@ -7,7 +7,7 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import type { ES_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+import type { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 import type { Dictionary } from '../types/common';
 import type { PivotAggDict } from '../types/pivot_aggs';
diff --git a/x-pack/plugins/transform/common/constants.ts b/x-pack/plugins/transform/common/constants.ts
index e1d773025d31e..288aefdda7c5c 100644
--- a/x-pack/plugins/transform/common/constants.ts
+++ b/x-pack/plugins/transform/common/constants.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { TransformHealthTests } from './types/alerting';
 
 export const DEFAULT_REFRESH_INTERVAL_MS = 30000;
diff --git a/x-pack/plugins/transform/common/shared_imports.ts b/x-pack/plugins/transform/common/shared_imports.ts
index 2cc01a0dbfa57..0566086046d0e 100644
--- a/x-pack/plugins/transform/common/shared_imports.ts
+++ b/x-pack/plugins/transform/common/shared_imports.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-export type { ChartData } from '../../ml/common';
+export type { ChartData } from '@kbn/ml-plugin/common';
 export {
   composeValidators,
   isPopulatedObject,
   isRuntimeMappings,
   patternValidator,
   isRuntimeField,
-} from '../../ml/common';
+} from '@kbn/ml-plugin/common';
 
-export { RUNTIME_FIELD_TYPES } from '../../../../src/plugins/data/common';
+export { RUNTIME_FIELD_TYPES } from '@kbn/data-plugin/common';
diff --git a/x-pack/plugins/transform/common/types/alerting.ts b/x-pack/plugins/transform/common/types/alerting.ts
index cc031d36f0483..aa08db9a8ce13 100644
--- a/x-pack/plugins/transform/common/types/alerting.ts
+++ b/x-pack/plugins/transform/common/types/alerting.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Rule, RuleTypeParams } from '../../../alerting/common';
+import type { Rule, RuleTypeParams } from '@kbn/alerting-plugin/common';
 
 export type TransformHealthRuleParams = {
   includeTransforms?: string[];
diff --git a/x-pack/plugins/transform/common/types/data_view.ts b/x-pack/plugins/transform/common/types/data_view.ts
index c09b84dea1e4e..98787a1281dbb 100644
--- a/x-pack/plugins/transform/common/types/data_view.ts
+++ b/x-pack/plugins/transform/common/types/data_view.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from '../../../../../src/plugins/data_views/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 
 import { isPopulatedObject } from '../shared_imports';
 
diff --git a/x-pack/plugins/transform/public/__mocks__/shared_imports.ts b/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
index e0788d7747e65..e03cec32d2ca8 100644
--- a/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
+++ b/x-pack/plugins/transform/public/__mocks__/shared_imports.ts
@@ -16,4 +16,4 @@ export const useRequest = jest.fn(() => ({
 export const getSavedSearch = jest.fn();
 
 // just passing through the reimports
-export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '../../../ml/public';
+export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '@kbn/ml-plugin/public';
diff --git a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts
index ffbc0f6021481..dfbe7e3154bf1 100644
--- a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts
+++ b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/register_transform_health_rule.ts
@@ -7,9 +7,9 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import type { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { TRANSFORM_RULE_TYPE } from '../../../common';
 import type { TransformHealthRuleParams } from '../../../common/types/alerting';
-import type { RuleTypeModel } from '../../../../triggers_actions_ui/public';
 import { getResultTestConfig } from '../../../common/utils/alerts';
 
 export function getTransformHealthRuleType(): RuleTypeModel<TransformHealthRuleParams> {
diff --git a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx
index 2bb857195a398..56bd9a2db877e 100644
--- a/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx
+++ b/x-pack/plugins/transform/public/alerting/transform_health_rule_type/transform_health_rule_trigger.tsx
@@ -9,7 +9,7 @@ import { EuiForm, EuiSpacer } from '@elastic/eui';
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import type { RuleTypeParamsExpressionProps } from '../../../../triggers_actions_ui/public';
+import type { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import type { TransformHealthRuleParams } from '../../../common/types/alerting';
 import { TestsSelectionControl } from './tests_selection_control';
 import { TransformSelectorControl } from './transform_selector_control';
diff --git a/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx b/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx
index 6aab7b558cf4d..3a3781070a863 100644
--- a/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx
+++ b/x-pack/plugins/transform/public/app/__mocks__/app_dependencies.tsx
@@ -7,19 +7,19 @@
 
 import { useContext } from 'react';
 
-import type { ScopedHistory } from 'kibana/public';
+import type { ScopedHistory } from '@kbn/core/public';
 
-import { coreMock, themeServiceMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { savedObjectsPluginMock } from '../../../../../../src/plugins/saved_objects/public/mocks';
-import { SharePluginStart } from '../../../../../../src/plugins/share/public';
+import { coreMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { savedObjectsPluginMock } from '@kbn/saved-objects-plugin/public/mocks';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import type { AppDependencies } from '../app_dependencies';
 import { MlSharedContext } from './shared_context';
 import type { GetMlSharedImportsReturnType } from '../../shared_imports';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 
 const coreSetup = coreMock.createSetup();
 const coreStart = coreMock.createStart();
diff --git a/x-pack/plugins/transform/public/app/app.tsx b/x-pack/plugins/transform/public/app/app.tsx
index ec88882d16425..0680228963add 100644
--- a/x-pack/plugins/transform/public/app/app.tsx
+++ b/x-pack/plugins/transform/public/app/app.tsx
@@ -8,16 +8,13 @@
 import React, { useContext, FC } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Route, Switch } from 'react-router-dom';
-import { ScopedHistory } from 'kibana/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { EuiErrorBoundary } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import {
-  KibanaContextProvider,
-  KibanaThemeProvider,
-} from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 
 import { API_BASE_PATH } from '../../common/constants';
 
diff --git a/x-pack/plugins/transform/public/app/app_dependencies.tsx b/x-pack/plugins/transform/public/app/app_dependencies.tsx
index a89f8d5c944fa..9be316b5f1d16 100644
--- a/x-pack/plugins/transform/public/app/app_dependencies.tsx
+++ b/x-pack/plugins/transform/public/app/app_dependencies.tsx
@@ -16,18 +16,18 @@ import type {
   OverlayStart,
   SavedObjectsStart,
   ThemeServiceStart,
-} from 'kibana/public';
-import type { SavedObjectsStart as SavedObjectsPluginStart } from 'src/plugins/saved_objects/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { ScopedHistory } from 'kibana/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { SpacesPluginStart } from '../../../spaces/public';
+} from '@kbn/core/public';
+import type { SavedObjectsStart as SavedObjectsPluginStart } from '@kbn/saved-objects-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { ScopedHistory } from '@kbn/core/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
 
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import type { GetMlSharedImportsReturnType } from '../shared_imports';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
 
 export interface AppDependencies {
   application: ApplicationStart;
diff --git a/x-pack/plugins/transform/public/app/common/data_grid.test.ts b/x-pack/plugins/transform/public/app/common/data_grid.test.ts
index 60218b4f09b2a..31f0a2bc688d8 100644
--- a/x-pack/plugins/transform/public/app/common/data_grid.test.ts
+++ b/x-pack/plugins/transform/public/app/common/data_grid.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPreviewTransformRequestBody, SimpleQuery } from '../common';
+import { getPreviewTransformRequestBody, SimpleQuery } from '.';
 
 import { getIndexDevConsoleStatement, getPivotPreviewDevConsoleStatement } from './data_grid';
 
diff --git a/x-pack/plugins/transform/public/app/common/pivot_aggs.ts b/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
index 42ce5744bcd26..9045191a779cb 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_aggs.ts
@@ -7,7 +7,7 @@
 
 import { FC } from 'react';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 import type { AggName } from '../../../common/types/aggregations';
 import type { Dictionary } from '../../../common/types/common';
diff --git a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
index 0ad059fd29950..dd9a63088e791 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { AggName } from '../../../common/types/aggregations';
 import { Dictionary } from '../../../common/types/common';
 import { EsFieldName } from '../../../common/types/fields';
 import { GenericAgg } from '../../../common/types/pivot_group_by';
 import { isPopulatedObject } from '../../../common/shared_imports';
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
 import { PivotAggsConfigWithUiSupport } from './pivot_aggs';
 
 export enum PIVOT_SUPPORTED_GROUP_BY_AGGS {
diff --git a/x-pack/plugins/transform/public/app/common/request.test.ts b/x-pack/plugins/transform/public/app/common/request.test.ts
index 4fa395289de7a..c654596937387 100644
--- a/x-pack/plugins/transform/public/app/common/request.test.ts
+++ b/x-pack/plugins/transform/public/app/common/request.test.ts
@@ -7,7 +7,7 @@
 
 import { PIVOT_SUPPORTED_AGGS } from '../../../common/types/pivot_aggs';
 
-import { PivotGroupByConfig } from '../common';
+import { PivotGroupByConfig } from '.';
 
 import { StepDefineExposedState } from '../sections/create_transform/components/step_define';
 import { StepDetailsExposedState } from '../sections/create_transform/components/step_details';
@@ -29,7 +29,7 @@ import {
   PivotQuery,
 } from './request';
 import { LatestFunctionConfigUI } from '../../../common/types/transform';
-import { RuntimeField } from '../../../../../../src/plugins/data/common';
+import { RuntimeField } from '@kbn/data-plugin/common';
 
 const simpleQuery: PivotQuery = { query_string: { query: 'airline:AAL' } };
 
diff --git a/x-pack/plugins/transform/public/app/common/request.ts b/x-pack/plugins/transform/public/app/common/request.ts
index 6e82bb64b3e86..350f57a3bcf58 100644
--- a/x-pack/plugins/transform/public/app/common/request.ts
+++ b/x-pack/plugins/transform/public/app/common/request.ts
@@ -7,8 +7,8 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { HttpFetchError } from '../../../../../../src/core/public';
-import type { DataView } from '../../../../../../src/plugins/data_views/public';
+import { HttpFetchError } from '@kbn/core/public';
+import type { DataView } from '@kbn/data-views-plugin/public';
 
 import {
   DEFAULT_CONTINUOUS_MODE_DELAY,
@@ -40,7 +40,7 @@ import {
   GroupByConfigWithUiSupport,
   PivotAggsConfig,
   PivotGroupByConfig,
-} from './';
+} from '.';
 
 export interface SimpleQuery {
   query_string: {
diff --git a/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx b/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx
index 2539f1cf9bc06..266091f5420b8 100644
--- a/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx
+++ b/x-pack/plugins/transform/public/app/components/toast_notification_text.test.tsx
@@ -8,13 +8,13 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 
-import { CoreStart } from 'src/core/public';
-import { themeServiceMock } from 'src/core/public/mocks';
+import { CoreStart } from '@kbn/core/public';
+import { themeServiceMock } from '@kbn/core/public/mocks';
 
 import { ToastNotificationText } from './toast_notification_text';
 
 jest.mock('../../shared_imports');
-jest.mock('../../app/app_dependencies');
+jest.mock('../app_dependencies');
 
 describe('ToastNotificationText', () => {
   test('should render the text as plain text', () => {
diff --git a/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx b/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx
index aebe74a539a1c..6409a8fcf3b45 100644
--- a/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx
+++ b/x-pack/plugins/transform/public/app/components/toast_notification_text.tsx
@@ -19,9 +19,9 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { CoreStart } from 'src/core/public';
+import { CoreStart } from '@kbn/core/public';
 
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 const MAX_SIMPLE_MESSAGE_LENGTH = 140;
 
diff --git a/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts b/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts
index cd46caf931e17..1490a8da28e57 100644
--- a/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts
+++ b/x-pack/plugins/transform/public/app/hooks/__mocks__/use_api.ts
@@ -7,9 +7,9 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { HttpFetchError } from 'kibana/public';
+import { HttpFetchError } from '@kbn/core/public';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import { TransformId } from '../../../../common/types/transform';
 import type { FieldHistogramsResponseSchema } from '../../../../common/api_schemas/field_histograms';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_api.ts b/x-pack/plugins/transform/public/app/hooks/use_api.ts
index 65c0d2050a5ed..251848482f604 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_api.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_api.ts
@@ -9,9 +9,9 @@ import { useMemo } from 'react';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { HttpFetchError } from 'kibana/public';
+import type { HttpFetchError } from '@kbn/core/public';
 
-import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import type { GetTransformsAuditMessagesResponseSchema } from '../../../common/api_schemas/audit_messages';
 import type {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
index 65a20f2d24ddf..42708f2a3f2e2 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import type {
   DeleteTransformStatus,
   DeleteTransformsRequestSchema,
diff --git a/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts b/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts
index d39edb87432ef..63969e94bfbcf 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_get_transforms.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import {
   isGetTransformNodesResponseSchema,
   isGetTransformsResponseSchema,
diff --git a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
index d74c11cbaf607..e56731b512ab3 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx
@@ -12,7 +12,7 @@ import '@testing-library/jest-dom/extend-expect';
 import { render, screen, waitFor } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 
-import { CoreSetup } from 'src/core/public';
+import { CoreSetup } from '@kbn/core/public';
 
 import { getMlSharedImports, UseIndexDataReturnType } from '../../shared_imports';
 
@@ -27,7 +27,7 @@ jest.mock('./use_api');
 
 import { useAppDependencies } from '../__mocks__/app_dependencies';
 import { MlSharedContext } from '../__mocks__/shared_context';
-import { RuntimeField } from '../../../../../../src/plugins/data/common';
+import { RuntimeField } from '@kbn/data-plugin/common';
 
 const query: SimpleQuery = {
   query_string: {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts
index aa8f5421184e5..b38e77745ba99 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { getCombinedProperties } from './use_pivot_data';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 describe('getCombinedProperties', () => {
   test('extracts missing mappings from docs', () => {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts
index d30237abcdb3f..ce94da34fce79 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_pivot_data.ts
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { getFlattenedObject } from '@kbn/std';
 
 import { difference } from 'lodash';
-import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES } from '@kbn/data-plugin/common';
 
 import type { PreviewMappingsProperties } from '../../../common/api_schemas/transforms';
 import { isPostTransformsPreviewResponseSchema } from '../../../common/api_schemas/type_guards';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx
index 1687bd751ac19..c33cec3f5b93f 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_reset_transform.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import type {
   ResetTransformStatus,
   ResetTransformsRequestSchema,
diff --git a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
index 910960cb24eea..07c0a9ae9bcbe 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts
@@ -6,13 +6,9 @@
  */
 
 import { buildEsQuery } from '@kbn/es-query';
-import { SavedObjectsClientContract, SimpleSavedObject, IUiSettingsClient } from 'src/core/public';
-import { getEsQueryConfig } from '../../../../../../../src/plugins/data/public';
-import {
-  DataView,
-  DataViewAttributes,
-  DataViewsContract,
-} from '../../../../../../../src/plugins/data_views/public';
+import { SavedObjectsClientContract, SimpleSavedObject, IUiSettingsClient } from '@kbn/core/public';
+import { getEsQueryConfig } from '@kbn/data-plugin/public';
+import { DataView, DataViewAttributes, DataViewsContract } from '@kbn/data-views-plugin/public';
 
 import { matchAllQuery } from '../../common';
 
diff --git a/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx
index c8abd13db394d..e4d9bdfe431a9 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_start_transform.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import type { StartTransformsRequestSchema } from '../../../common/api_schemas/start_transforms';
 import { isStartTransformsResponseSchema } from '../../../common/api_schemas/type_guards';
diff --git a/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx
index 894ac757b396a..39d009e471180 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx
+++ b/x-pack/plugins/transform/public/app/hooks/use_stop_transform.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import type { StopTransformsRequestSchema } from '../../../common/api_schemas/stop_transforms';
 import { isStopTransformsResponseSchema } from '../../../common/api_schemas/type_guards';
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 2f47b6d70bc79..851ebf374e3e7 100644
--- a/x-pack/plugins/transform/public/app/mount_management_section.ts
+++ b/x-pack/plugins/transform/public/app/mount_management_section.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/public';
-import { ManagementAppMountParams } from '../../../../../src/plugins/management/public/';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { CoreSetup } from '@kbn/core/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
 
 import { PluginsDependencies } from '../plugin';
 import { getMlSharedImports } from '../shared_imports';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx
index 4a9e8bcfc6b8d..6699edbfd8f96 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_pivot_editor/advanced_pivot_editor.tsx
@@ -12,7 +12,7 @@ import { EuiFormRow } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { StepDefineFormHook } from '../step_define';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
index cad258d192061..df6a370707c20 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_editor/advanced_runtime_mappings_editor.tsx
@@ -10,7 +10,7 @@ import React, { memo, FC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { isRuntimeMappings } from '../../../../../../common/shared_imports';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
index b711a5a0cbb81..665c9986e6e69 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_source_editor/advanced_source_editor.tsx
@@ -9,7 +9,7 @@ import React, { FC } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { CodeEditor } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { StepDefineFormHook } from '../step_define';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx
index baf0bbd655925..d5b1139e6cdae 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.test.tsx
@@ -8,10 +8,10 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
-import { coreMock } from '../../../../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 const startMock = coreMock.createStart();
 
 import { AggName } from '../../../../../../common/types/aggregations';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
index 2b4ab9c09e8c8..762f3bb72863f 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
@@ -11,7 +11,7 @@ import { EuiCode, EuiInputPopover } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { QueryStringInput } from '../../../../../../../../../src/plugins/unified_search/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 
 import { SearchItems } from '../../../../hooks/use_search_items';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx
index 63f76ef326740..2e785c2d6680b 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.test.tsx
@@ -11,7 +11,7 @@ import { render } from '@testing-library/react';
 import { StepCreateForm, StepCreateFormProps } from './step_create_form';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: <StepCreateForm />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
index bac7754842510..975eacb569b67 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
@@ -24,10 +24,12 @@ import {
 } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { toMountPoint } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { DISCOVER_APP_LOCATOR } from '../../../../../../../../../src/plugins/discover/public';
+import { DISCOVER_APP_LOCATOR } from '@kbn/discover-plugin/public';
 
+import { DuplicateDataViewError } from '@kbn/data-plugin/public';
+import type { RuntimeField } from '@kbn/data-plugin/common';
 import type { PutTransformsResponseSchema } from '../../../../../../common/api_schemas/transforms';
 import {
   isGetTransformsStatsResponseSchema,
@@ -43,12 +45,10 @@ import { useApi } from '../../../../hooks/use_api';
 import { useAppDependencies, useToastNotifications } from '../../../../app_dependencies';
 import { RedirectToTransformManagement } from '../../../../common/navigation';
 import { ToastNotificationText } from '../../../../components';
-import { DuplicateDataViewError } from '../../../../../../../../../src/plugins/data/public';
 import {
   PutTransformsLatestRequestSchema,
   PutTransformsPivotRequestSchema,
 } from '../../../../../../common/api_schemas/transforms';
-import type { RuntimeField } from '../../../../../../../../../src/plugins/data/common';
 import { isPopulatedObject } from '../../../../../../common/shared_imports';
 import { isContinuousTransform, isLatestTransform } from '../../../../../../common/types/transform';
 import { TransformAlertFlyout } from '../../../../../alerting/transform_alerting_flyout';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts
index 61081e7858b27..ea0c5b8c471bd 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/common.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { getPivotDropdownOptions } from '../common';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import { getPivotDropdownOptions } from '.';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterAggForm } from './filter_agg/components';
-import type { RuntimeField } from '../../../../../../../../../../src/plugins/data/common';
+import type { RuntimeField } from '@kbn/data-plugin/common';
 
 describe('Transform: Define Pivot Common', () => {
   test('getPivotDropdownOptions()', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx
index 8a8c12dfc5583..d8d81d11b4f60 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/editor_form.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiSpacer } from '@elastic/eui';
-import { CodeEditor } from '../../../../../../../../../../../../src/plugins/kibana_react/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { FilterAggConfigEditor } from '../types';
 
 export const FilterEditorForm: FilterAggConfigEditor['aggTypeConfig']['FilterAggFormComponent'] = ({
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx
index 745cd81908ac8..a2305b88fbdda 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.test.tsx
@@ -10,11 +10,8 @@ import React from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { FilterAggForm } from './filter_agg_form';
 import { CreateTransformWizardContext } from '../../../../wizard/wizard';
-import {
-  KBN_FIELD_TYPES,
-  RuntimeField,
-} from '../../../../../../../../../../../../src/plugins/data/common';
-import { DataView } from '../../../../../../../../../../../../src/plugins/data_views/public';
+import { KBN_FIELD_TYPES, RuntimeField } from '@kbn/data-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterTermForm } from './filter_term_form';
 
 describe('FilterAggForm', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx
index 2fbebc600d6dd..6f590a0e17892 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_agg_form.tsx
@@ -9,9 +9,9 @@ import React, { useContext, useMemo } from 'react';
 import { EuiFormRow, EuiIcon, EuiSelect, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import useUpdateEffect from 'react-use/lib/useUpdateEffect';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { CreateTransformWizardContext } from '../../../../wizard/wizard';
 import { commonFilterAggs, filterAggsFieldSupport } from '../constants';
-import { DataView } from '../../../../../../../../../../../../src/plugins/data_views/public';
 import { getFilterAggTypeConfig } from '../config';
 import type { FilterAggType, PivotAggsConfigFilter } from '../types';
 import type { RuntimeMappings } from '../../types';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts
index d0388861b20ce..20f6828f47beb 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../../src/plugins/data/common';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { FilterAggType } from './types';
 
 export const FILTERS = {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts
index 5c4ff5a53f724..0aa29ed5af3b2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts
@@ -6,11 +6,8 @@
  */
 
 import { EuiComboBoxOptionOption } from '@elastic/eui';
-import {
-  ES_FIELD_TYPES,
-  KBN_FIELD_TYPES,
-} from '../../../../../../../../../../src/plugins/data/public';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 
 import { getNestedProperty } from '../../../../../../../common/utils/object_utils';
 import { removeKeywordPostfix } from '../../../../../../../common/utils/field_utils';
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts
index 6e5a34fa6ef2b..e97d47864313c 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/public';
 
 import { EsFieldName } from '../../../../../../../common/types/fields';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts
index d69183820db71..5d53c1e3f4264 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_pivot_editor.ts
@@ -8,7 +8,7 @@
 import { useEffect, useState } from 'react';
 import { XJsonMode } from '@kbn/ace';
 
-import { XJson } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 
 import { PostTransformsPreviewRequestSchema } from '../../../../../../../common/api_schemas/transforms';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
index ec9c0392e7f17..03483a4258ee3 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_advanced_runtime_mappings_editor.ts
@@ -7,8 +7,8 @@
 
 import { useState } from 'react';
 import { XJsonMode } from '@kbn/ace';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 import { StepDefineExposedState } from '../common';
-import { XJson } from '../../../../../../../../../../src/plugins/es_ui_shared/public';
 
 const { useXJsonMode } = XJson;
 const xJsonMode = new XJsonMode();
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts
index 46d5d1b562a84..fe4d332f4a91b 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts
@@ -8,11 +8,11 @@
 import { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBoxOptionOption } from '@elastic/eui';
+import { AggConfigs, FieldParamType } from '@kbn/data-plugin/common';
 import { LatestFunctionConfigUI } from '../../../../../../../common/types/transform';
 import { StepDefineFormProps } from '../step_define_form';
 import { StepDefineExposedState } from '../common';
 import { LatestFunctionConfig } from '../../../../../../../common/api_schemas/transforms';
-import { AggConfigs, FieldParamType } from '../../../../../../../../../../src/plugins/data/common';
 import { useAppDependencies } from '../../../../../app_dependencies';
 
 /**
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts
index c16270a6a2dca..75450a4df16c1 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_pivot_config.ts
@@ -8,6 +8,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { AggName } from '../../../../../../../common/types/aggregations';
 import { dictionaryToArray } from '../../../../../../../common/types/common';
 
@@ -33,7 +34,6 @@ import {
 } from '../../../../../common/pivot_aggs';
 import { TransformPivotConfig } from '../../../../../../../common/types/transform';
 import { PIVOT_SUPPORTED_AGGS } from '../../../../../../../common/types/pivot_aggs';
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/common';
 import { isPivotAggConfigWithUiSupport } from '../../../../../common/pivot_group_by';
 
 /**
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts
index b8c818720f0a9..486e9e4da79e2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_search_bar.ts
@@ -8,7 +8,7 @@
 import { useState } from 'react';
 
 import { toElasticsearchQuery, fromKueryExpression, luceneStringToDsl } from '@kbn/es-query';
-import { Query } from '../../../../../../../../../../src/plugins/data/public';
+import { Query } from '@kbn/data-plugin/public';
 
 import { getPivotQuery } from '../../../../../common';
 
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
index 054deb23eac50..628d2ad62ea8e 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
@@ -10,10 +10,10 @@ import { render } from '@testing-library/react';
 
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
-import { coreMock } from '../../../../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../../../../src/plugins/data/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 const startMock = coreMock.createStart();
 
 import { PIVOT_SUPPORTED_AGGS } from '../../../../../../common/types/pivot_aggs';
@@ -29,9 +29,9 @@ import { getAggNameConflictToastMessages } from './common';
 import { StepDefineForm } from './step_define_form';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
-import { MlSharedContext } from '../../../../../app/__mocks__/shared_context';
+import { MlSharedContext } from '../../../../__mocks__/shared_context';
 import { getMlSharedImports } from '../../../../../shared_imports';
 
 const createMockWebStorage = () => ({
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx
index 1b2d5872e53b6..daa51169ffcef 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx
@@ -21,9 +21,9 @@ import { StepDefineExposedState } from './common';
 import { StepDefineSummary } from './step_define_summary';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
-import { MlSharedContext } from '../../../../../app/__mocks__/shared_context';
+import { MlSharedContext } from '../../../../__mocks__/shared_context';
 import { getMlSharedImports } from '../../../../../shared_imports';
 
 describe('Transform: <DefinePivotSummary />', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
index 06096c470d3b9..141eed06e7ef8 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
@@ -24,8 +24,8 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/common';
-import { toMountPoint } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
 import {
   isEsIndices,
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx
index c16756d0923e9..6873661fcfec2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/wizard/wizard.tsx
@@ -11,6 +11,7 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiSteps, EuiStepStatus } from '@elastic/eui';
 
+import { DataView } from '@kbn/data-views-plugin/public';
 import type { TransformConfigUnion } from '../../../../../../common/types/transform';
 
 import { getCreateTransformRequestBody } from '../../../../common';
@@ -31,7 +32,6 @@ import {
   StepDetailsSummary,
 } from '../step_details';
 import { WizardNav } from '../wizard_nav';
-import { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import type { RuntimeMappings } from '../step_define/common/types';
 
 enum WIZARD_STEPS {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
index 85e5e1ce9a83e..1fb0d69682cda 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_name.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { DeleteActionName, DeleteActionNameProps } from './delete_action_name';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List Actions <DeleteAction />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
index 0f73f6aac40d3..4fb0f9e655208 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.test.tsx
@@ -17,7 +17,7 @@ import { isDiscoverActionDisabled, DiscoverActionName } from './discover_action_
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 // @ts-expect-error mock data is too loosely typed
 const item: TransformListRow = transformListRow;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx
index 71a45b572f833..9194d9f63045e 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/use_action_discover.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { DISCOVER_APP_LOCATOR } from '../../../../../../../../../src/plugins/discover/public';
+import { DISCOVER_APP_LOCATOR } from '@kbn/discover-plugin/public';
 
 import { TransformListAction, TransformListRow } from '../../../../common';
 
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
index 490651afc7e96..ba4619b022620 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_name.test.tsx
@@ -14,7 +14,7 @@ import { StartActionName, StartActionNameProps } from './start_action_name';
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List Actions <StartAction />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
index 54a5e026135df..9496dbd82c70d 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_stop/stop_action_name.test.tsx
@@ -14,7 +14,7 @@ import { StopActionName, StopActionNameProps } from './stop_action_name';
 import transformListRow from '../../../../common/__mocks__/transform_list_row.json';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List Actions <StopAction />', () => {
   test('Minimal initialization', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
index fd0ca655f3056..f5e46a60ebb68 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx
@@ -19,14 +19,13 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
+import { KBN_FIELD_TYPES } from '@kbn/data-plugin/common';
 import { isEsIngestPipelines } from '../../../../../../common/api_schemas/type_guards';
 import { EditTransformFlyoutFormTextInput } from './edit_transform_flyout_form_text_input';
 import { UseEditTransformFlyoutReturnType } from './use_edit_transform_flyout';
 import { useAppDependencies } from '../../../../app_dependencies';
 import { useApi } from '../../../../hooks/use_api';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/common';
-
 interface EditTransformFlyoutFormProps {
   editTransformFlyout: UseEditTransformFlyoutReturnType;
   dataViewId?: string;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx
index 391ea16ecd89e..4adc6077abb9e 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/search_selection/search_selection.tsx
@@ -9,7 +9,7 @@ import { EuiModalBody, EuiModalHeader, EuiModalHeaderTitle } from '@elastic/eui'
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { FC } from 'react';
-import { SavedObjectFinderUi } from '../../../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectFinderUi } from '@kbn/saved-objects-plugin/public';
 import { useAppDependencies } from '../../../../app_dependencies';
 
 interface SearchSelectionProps {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx
index e9ef4a4373116..e77de4b668eca 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.test.tsx
@@ -15,9 +15,9 @@ import transformListRow from '../../../../common/__mocks__/transform_list_row.js
 import { within } from '@testing-library/dom';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
-import { MlSharedContext } from '../../../../../app/__mocks__/shared_context';
+import { MlSharedContext } from '../../../../__mocks__/shared_context';
 import { getMlSharedImports } from '../../../../../shared_imports';
 
 describe('Transform: Transform List <ExpandedRow />', () => {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
index 76aed7dd13e51..51dfc449b89b2 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
@@ -17,7 +17,7 @@ import { SearchItems } from '../../../../hooks/use_search_items';
 import {
   applyTransformConfigToDefineState,
   getDefaultStepDefineState,
-} from '../../../create_transform/components/step_define/';
+} from '../../../create_transform/components/step_define';
 
 interface ExpandedRowPreviewPaneProps {
   transformConfig: TransformConfigUnion;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx
index ac00d31a620b9..430fa9478f60a 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.test.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { TransformList } from './transform_list';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Transform List <TransformList />', () => {
   test('Minimal initialization', () => {
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 68adbca5d662f..a56b58ba8f089 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
@@ -8,7 +8,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 import { useActions } from './use_actions';
 
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx
index a26ccf0348c9a..82d1a7091b8a5 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/use_columns.test.tsx
@@ -10,7 +10,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useColumns } from './use_columns';
 
 jest.mock('../../../../../shared_imports');
-jest.mock('../../../../../app/app_dependencies');
+jest.mock('../../../../app_dependencies');
 
 describe('Transform: Job List Columns', () => {
   test('useColumns()', async () => {
diff --git a/x-pack/plugins/transform/public/app/services/es_index_service.ts b/x-pack/plugins/transform/public/app/services/es_index_service.ts
index 88b54a7487f92..5a0f907b78e22 100644
--- a/x-pack/plugins/transform/public/app/services/es_index_service.ts
+++ b/x-pack/plugins/transform/public/app/services/es_index_service.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { HttpSetup, SavedObjectsClientContract } from 'kibana/public';
+import { HttpSetup, SavedObjectsClientContract } from '@kbn/core/public';
+import { DataView } from '@kbn/data-views-plugin/public';
 import { API_BASE_PATH } from '../../../common/constants';
-import { DataView } from '../../../../../../src/plugins/data_views/public';
 
 export class IndexService {
   async canDeleteIndex(http: HttpSetup) {
diff --git a/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts b/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts
index 37d0ee3a92b75..4f4ff93289ae3 100644
--- a/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts
+++ b/x-pack/plugins/transform/public/app/services/navigation/breadcrumb.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { textService } from '../text';
 
-import { ManagementAppMountParams } from '../../../../../../../src/plugins/management/public';
-
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
 export enum BREADCRUMB_SECTION {
diff --git a/x-pack/plugins/transform/public/plugin.ts b/x-pack/plugins/transform/public/plugin.ts
index a7d0dce256640..74cd845dd49da 100644
--- a/x-pack/plugins/transform/public/plugin.ts
+++ b/x-pack/plugins/transform/public/plugin.ts
@@ -7,16 +7,16 @@
 
 import { i18n as kbnI18n } from '@kbn/i18n';
 
-import type { CoreSetup } from 'src/core/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { SavedObjectsStart } from 'src/plugins/saved_objects/public';
-import type { ManagementSetup } from 'src/plugins/management/public';
-import type { SharePluginStart } from 'src/plugins/share/public';
-import type { SpacesApi } from '../../spaces/public';
+import type { CoreSetup } from '@kbn/core/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import type { SavedObjectsStart } from '@kbn/saved-objects-plugin/public';
+import type { ManagementSetup } from '@kbn/management-plugin/public';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import type { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { registerFeature } from './register_feature';
-import type { PluginSetupContract as AlertingSetup } from '../../alerting/public';
-import type { TriggersAndActionsUIPublicPluginStart } from '../../triggers_actions_ui/public';
 import { getTransformHealthRuleType } from './alerting';
 
 export interface PluginsDependencies {
diff --git a/x-pack/plugins/transform/public/register_feature.ts b/x-pack/plugins/transform/public/register_feature.ts
index d105424052411..b72682f7a5c81 100644
--- a/x-pack/plugins/transform/public/register_feature.ts
+++ b/x-pack/plugins/transform/public/register_feature.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  HomePublicPluginSetup,
-  FeatureCatalogueCategory,
-} from '../../../../src/plugins/home/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export const registerFeature = (home: HomePublicPluginSetup) => {
   // register Transforms so it appears on the Kibana home page
@@ -25,6 +22,6 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     icon: 'managementApp', // there is currently no Transforms icon, so using the general management app icon
     path: '/app/management/data/transform',
     showOnHomePage: false,
-    category: FeatureCatalogueCategory.ADMIN,
+    category: 'admin',
   });
 };
diff --git a/x-pack/plugins/transform/public/shared_imports.ts b/x-pack/plugins/transform/public/shared_imports.ts
index c8375af88a213..4c035753390dd 100644
--- a/x-pack/plugins/transform/public/shared_imports.ts
+++ b/x-pack/plugins/transform/public/shared_imports.ts
@@ -6,21 +6,18 @@
  */
 
 export { XJsonMode } from '@kbn/ace';
-export type { UseRequestConfig } from '../../../../src/plugins/es_ui_shared/public';
-export { useRequest } from '../../../../src/plugins/es_ui_shared/public';
-export {
-  getSavedSearch,
-  getSavedSearchUrlConflictMessage,
-} from '../../../../src/plugins/discover/public';
+export type { UseRequestConfig } from '@kbn/es-ui-shared-plugin/public';
+export { useRequest } from '@kbn/es-ui-shared-plugin/public';
+export { getSavedSearch, getSavedSearchUrlConflictMessage } from '@kbn/discover-plugin/public';
 
 export type {
   GetMlSharedImportsReturnType,
   UseIndexDataReturnType,
   EsSorting,
   RenderCellValue,
-} from '../../ml/public';
-export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '../../ml/public';
+} from '@kbn/ml-plugin/public';
+export { getMlSharedImports, ES_CLIENT_TOTAL_HITS_RELATION } from '@kbn/ml-plugin/public';
 
-import { XJson } from '../../../../src/plugins/es_ui_shared/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
 const { expandLiteralStrings, collapseLiteralStrings } = XJson;
 export { expandLiteralStrings, collapseLiteralStrings };
diff --git a/x-pack/plugins/transform/server/index.ts b/x-pack/plugins/transform/server/index.ts
index 9bd3ffe418b1e..0688210a78137 100644
--- a/x-pack/plugins/transform/server/index.ts
+++ b/x-pack/plugins/transform/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import { TransformServerPlugin } from './plugin';
 
diff --git a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts
index 04a4685c45892..3288fa86a789d 100644
--- a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts
+++ b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/register_transform_health_rule_type.ts
@@ -6,18 +6,18 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import type {
   ActionGroup,
   AlertInstanceContext,
   AlertInstanceState,
   RuleTypeState,
-} from '../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
+import { RuleType } from '@kbn/alerting-plugin/server';
+import type { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/server';
 import { PLUGIN, TRANSFORM_RULE_TYPE } from '../../../../common/constants';
 import { transformHealthRuleParams, TransformHealthRuleParams } from './schema';
-import { RuleType } from '../../../../../alerting/server';
 import { transformHealthServiceProvider } from './transform_health_service';
-import type { PluginSetupContract as AlertingSetup } from '../../../../../alerting/server';
 
 export interface BaseResponse {
   transform_id: string;
diff --git a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
index 90b6c2fbcba60..a00c41f7ec3a1 100644
--- a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
+++ b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { keyBy } from 'lodash';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 import { TransformHealthRuleParams } from './schema';
 import {
   ALL_TRANSFORMS_SELECTION,
@@ -22,7 +23,6 @@ import {
   NotStartedTransformResponse,
   TransformHealthAlertContext,
 } from './register_transform_health_rule_type';
-import type { RulesClient } from '../../../../../alerting/server';
 import type { TransformHealthAlertRule } from '../../../../common/types/alerting';
 import { isContinuousTransform } from '../../../../common/types/transform';
 import { ML_DF_NOTIFICATION_INDEX_PATTERN } from '../../../routes/api/transforms_audit_messages';
diff --git a/x-pack/plugins/transform/server/plugin.ts b/x-pack/plugins/transform/server/plugin.ts
index 6e542bbefc3e1..c803785de2c4b 100644
--- a/x-pack/plugins/transform/server/plugin.ts
+++ b/x-pack/plugins/transform/server/plugin.ts
@@ -6,9 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, Logger, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, Plugin, Logger, PluginInitializerContext } from '@kbn/core/server';
 
-import { LicenseType } from '../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 import { Dependencies } from './types';
 import { ApiRoutes } from './routes';
diff --git a/x-pack/plugins/transform/server/routes/api/error_utils.ts b/x-pack/plugins/transform/server/routes/api/error_utils.ts
index d9b892b7afcee..6f02b1978506f 100644
--- a/x-pack/plugins/transform/server/routes/api/error_utils.ts
+++ b/x-pack/plugins/transform/server/routes/api/error_utils.ts
@@ -9,7 +9,7 @@ import Boom from '@hapi/boom';
 
 import { i18n } from '@kbn/i18n';
 
-import { ResponseError, CustomHttpResponseOptions } from 'src/core/server';
+import { ResponseError, CustomHttpResponseOptions } from '@kbn/core/server';
 
 import { CommonResponseStatusSchema, TransformIdsSchema } from '../../../common/api_schemas/common';
 import { DeleteTransformsResponseSchema } from '../../../common/api_schemas/delete_transforms';
diff --git a/x-pack/plugins/transform/server/routes/api/field_histograms.ts b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
index 5f464949a4fc8..25991d7e865c3 100644
--- a/x-pack/plugins/transform/server/routes/api/field_histograms.ts
+++ b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
@@ -13,7 +13,7 @@ import {
 import { getHistogramsForFields } from '../../shared_imports';
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { wrapError, wrapEsError } from './error_utils';
 
diff --git a/x-pack/plugins/transform/server/routes/api/privileges.ts b/x-pack/plugins/transform/server/routes/api/privileges.ts
index c952ebcf264d2..d8bce73244c15 100644
--- a/x-pack/plugins/transform/server/routes/api/privileges.ts
+++ b/x-pack/plugins/transform/server/routes/api/privileges.ts
@@ -9,7 +9,7 @@ import { APP_CLUSTER_PRIVILEGES, APP_INDEX_PRIVILEGES } from '../../../common/co
 import { Privileges } from '../../../common/types/privileges';
 
 import { RouteDependencies } from '../../types';
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 export function registerPrivilegesRoute({ router, license }: RouteDependencies) {
   router.get(
diff --git a/x-pack/plugins/transform/server/routes/api/transforms.ts b/x-pack/plugins/transform/server/routes/api/transforms.ts
index 78b51fca58547..252cc2eda5529 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms.ts
@@ -14,8 +14,9 @@ import {
   RequestHandler,
   RequestHandlerContext,
   SavedObjectsClientContract,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
+import { DataView } from '@kbn/data-views-plugin/common';
 import { TRANSFORM_STATE } from '../../../common/constants';
 import {
   transformIdParamSchema,
@@ -56,12 +57,11 @@ import {
 
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { isRequestTimeout, fillResultsWithTimeouts, wrapError, wrapEsError } from './error_utils';
 import { registerTransformsAuditMessagesRoutes } from './transforms_audit_messages';
 import { registerTransformNodesRoutes } from './transforms_nodes';
-import { DataView } from '../../../../../../src/plugins/data_views/common';
 import { isLatestTransform } from '../../../common/types/transform';
 import { isKeywordDuplicate } from '../../../common/utils/field_utils';
 import { transformHealthServiceProvider } from '../../lib/alerting/transform_health_rule_type/transform_health_service';
diff --git a/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts b/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts
index 4be207a21ac29..3004a2bd42a71 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms_audit_messages.ts
@@ -10,7 +10,7 @@ import { AuditMessage } from '../../../common/types/messages';
 
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { wrapError, wrapEsError } from './error_utils';
 
diff --git a/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts b/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts
index 0ab01cdeb61c8..3950354f08d40 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms_nodes.ts
@@ -12,7 +12,7 @@ import { isPopulatedObject } from '../../../common/shared_imports';
 
 import { RouteDependencies } from '../../types';
 
-import { addBasePath } from '../index';
+import { addBasePath } from '..';
 
 import { wrapError, wrapEsError } from './error_utils';
 
diff --git a/x-pack/plugins/transform/server/services/license.ts b/x-pack/plugins/transform/server/services/license.ts
index ce28e0365bb21..cd98e28d973a0 100644
--- a/x-pack/plugins/transform/server/services/license.ts
+++ b/x-pack/plugins/transform/server/services/license.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { Logger } from 'src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   IKibanaResponse,
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup, LicenseType } from '../../../licensing/server';
-import type { AlertingApiRequestHandlerContext } from '../../../alerting/server';
+import { LicensingPluginSetup, LicenseType } from '@kbn/licensing-plugin/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
 
 export interface LicenseStatus {
   isValid: boolean;
diff --git a/x-pack/plugins/transform/server/shared_imports.ts b/x-pack/plugins/transform/server/shared_imports.ts
index ebef6d9ea0ffc..dbb216a541694 100644
--- a/x-pack/plugins/transform/server/shared_imports.ts
+++ b/x-pack/plugins/transform/server/shared_imports.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { getHistogramsForFields } from '../../ml/server';
+export { getHistogramsForFields } from '@kbn/ml-plugin/server';
diff --git a/x-pack/plugins/transform/server/types.ts b/x-pack/plugins/transform/server/types.ts
index 53f13cc752650..f9be90a1a20da 100644
--- a/x-pack/plugins/transform/server/types.ts
+++ b/x-pack/plugins/transform/server/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { IRouter } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
+import { IRouter } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import type { AlertingPlugin } from '@kbn/alerting-plugin/server';
 import { License } from './services';
-import type { AlertingPlugin } from '../../alerting/server';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index a1abc744c3336..11a6e812fc6c5 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -222,7 +222,6 @@
     "xpack.lens.dragDrop.keyboardInstructionsReorder": "Appuyez sur la barre d'espace ou sur Entrée pour commencer à faire glisser. Lors du glissement, utilisez les touches fléchées haut/bas pour réorganiser les éléments dans le groupe et les touches gauche/droite pour choisir les cibles de dépôt à l'extérieur du groupe. Appuyez à nouveau sur la barre d'espace ou sur Entrée pour terminer.",
     "xpack.lens.dragDrop.shift": "Déplacer",
     "xpack.lens.dragDrop.swap": "Permuter",
-    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "Supprimer",
     "xpack.lens.editorFrame.buildExpressionError": "Une erreur inattendue s'est produite lors de la préparation du graphique",
     "xpack.lens.editorFrame.colorIndicatorLabel": "Couleur de cette dimension : {hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} {errors, plural, one {erreur} other {erreurs}}",
@@ -647,8 +646,6 @@
     "xpack.lens.shared.legendInsideAlignmentLabel": "Alignement",
     "xpack.lens.shared.legendInsideColumnsLabel": "Nombre de colonnes",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "Alignement",
-    "xpack.lens.shared.legendInsideTooltip": "Requiert que la légende soit placée dans la visualisation",
-    "xpack.lens.shared.legendIsTruncated": "Requiert que le texte soit tronqué",
     "xpack.lens.shared.legendLabel": "Légende",
     "xpack.lens.shared.legendLocationBottomLeft": "En bas à gauche",
     "xpack.lens.shared.legendLocationBottomRight": "En bas à droite",
@@ -660,7 +657,6 @@
     "xpack.lens.shared.legendPositionRight": "Droite",
     "xpack.lens.shared.legendPositionTop": "Haut",
     "xpack.lens.shared.legendVisibilityLabel": "Affichage",
-    "xpack.lens.shared.legendVisibleTooltip": "Requiert que la légende soit affichée",
     "xpack.lens.shared.maxLinesLabel": "Nombre maximal de lignes",
     "xpack.lens.shared.nestedLegendLabel": "Imbriqué",
     "xpack.lens.shared.truncateLegend": "Tronquer le texte",
@@ -678,12 +674,8 @@
     "xpack.lens.table.columnVisibilityLabel": "Masquer la colonne",
     "xpack.lens.table.defaultAriaLabel": "Visualisation du tableau de données",
     "xpack.lens.table.dynamicColoring.cell": "Cellule",
-    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "Les types de valeurs en pourcentage sont relatifs à la plage complète des valeurs de données disponibles.",
     "xpack.lens.table.dynamicColoring.label": "Couleur par valeur",
     "xpack.lens.table.dynamicColoring.none": "Aucune",
-    "coloring.dynamicColoring.rangeType.label": "Type de valeur",
-    "coloring.dynamicColoring.rangeType.number": "Numéro",
-    "coloring.dynamicColoring.rangeType.percent": "Pour cent",
     "xpack.lens.table.dynamicColoring.text": "Texte",
     "xpack.lens.table.hide.hideLabel": "Masquer",
     "xpack.lens.table.palettePanelContainer.back": "Retour",
@@ -797,6 +789,11 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "H. À barres à pourcentages",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "Vertical à barres à pourcentages",
     "xpack.lens.xyVisualization.xyLabel": "XY",
+    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "Supprimer",
+    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "Les types de valeurs en pourcentage sont relatifs à la plage complète des valeurs de données disponibles.",
+    "coloring.dynamicColoring.rangeType.label": "Type de valeur",
+    "coloring.dynamicColoring.rangeType.number": "Numéro",
+    "coloring.dynamicColoring.rangeType.percent": "Pour cent",
     "expressionXY.legend.filterForValueButtonAriaLabel": "Filtre pour la valeur",
     "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}, options de filtre",
     "expressionXY.legend.filterOutValueButtonAriaLabel": "Filtrer la valeur",
@@ -9857,7 +9854,6 @@
     "xpack.fleet.agentEnrollment.stepConfigurePolicyAuthenticationTitle": "Sélectionner le jeton d'enregistrement",
     "xpack.fleet.agentEnrollment.stepDownloadAgentTitle": "Télécharger l'agent Elastic Agent sur votre hôte",
     "xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle": "Enregistrer et démarrer l'agent Elastic Agent",
-    "xpack.fleet.agentEnrollment.stepRunAgentDescription": "Depuis le répertoire des agents, exécutez cette commande pour installer, enregistrer et démarrer un agent Elastic Agent. Vous pouvez réutiliser cette commande pour configurer des agents sur plusieurs hôtes. Cette action nécessite de disposer de privilèges d'administrateur.",
     "xpack.fleet.agentHealth.checkInTooltipText": "Dernier archivage le {lastCheckIn}",
     "xpack.fleet.agentHealth.healthyStatusText": "Sain",
     "xpack.fleet.agentHealth.inactiveStatusText": "Inactif",
@@ -20735,7 +20731,6 @@
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewGraphTitle": "{hits} {hits, plural, =1 {résultat} other {résultats}}",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewHelpText": "Sélectionner une période de temps pour les données afin d'afficher l'aperçu des résultats de requête",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewLabel": "Aperçu de la recherche rapide",
-    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading": "... en cours de chargement",
     "xpack.securitySolution.detectionEngine.queryPreview.queryThresholdGraphCountLabel": "Compte de seuil cumulé",
     "xpack.securitySolution.detectionEngine.rule.editRule.errorMsgDescription": "Une entrée est incorrecte dans {countError, plural, one {cet onglet} other {ces onglets}} : {tabHasError}",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStartedDescription": "Démarré",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index d58da0f2ed657..95f85f0aa9e93 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -242,26 +242,6 @@
     "xpack.lens.dragDrop.keyboardInstructionsReorder": "スペースまたはEnterを押してドラッグを開始します。ドラッグするときには、上下矢印キーを使用すると、グループの項目を並べ替えます。左右矢印キーを使用すると、グループの外側でドロップ対象を選択します。もう一度スペースまたはEnterを押すと終了します。",
     "xpack.lens.dragDrop.shift": "Shift",
     "xpack.lens.dragDrop.swap": "入れ替える",
-    "coloring.dynamicColoring.customPalette.addColor": "色を追加",
-    "coloring.dynamicColoring.customPalette.addColorAriaLabel": "色を追加",
-    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "削除",
-    "coloring.dynamicColoring.customPalette.disallowedEditMinMaxValues": "現在の構成にはカスタム値を設定できません",
-    "coloring.dynamicColoring.customPalette.distributeValues": "値を分散",
-    "coloring.dynamicColoring.customPalette.distributeValuesAriaLabel": "値を分散",
-    "coloring.dynamicColoring.customPalette.invalidMaxValue": "最大値は前の値より大きくなければなりません",
-    "coloring.dynamicColoring.customPalette.invalidValueOrColor": "1つ以上の色範囲に正しくない値または色が含まれています",
-    "coloring.dynamicColoring.customPalette.maximumStepsApplied": "ステップの最大数を適用しました",
-    "coloring.dynamicColoring.customPalette.maxValuePlaceholder": "最大値",
-    "coloring.dynamicColoring.customPalette.minValuePlaceholder": "最小値",
-    "coloring.dynamicColoring.customPalette.oneColorRange": "複数の色が必要です",
-    "coloring.dynamicColoring.customPalette.rangeAriaLabel": "範囲{index}",
-    "coloring.dynamicColoring.customPalette.reverseColors": "色を反転",
-    "coloring.dynamicColoring.customPalette.selectNewColor": "新しい色を選択",
-    "coloring.dynamicColoring.customPalette.setCustomMaxValue": "カスタム最小値を設定",
-    "coloring.dynamicColoring.customPalette.setCustomMinValue": "カスタム最大値を設定",
-    "coloring.dynamicColoring.customPalette.useAutoMaxValue": "最大データ値を使用",
-    "coloring.dynamicColoring.customPalette.useAutoMinValue": "最小データ値を使用",
-    "coloring.dynamicColoring.customPaletteAriaLabel": "色を反転",
     "xpack.lens.editorFrame.buildExpressionError": "グラフの準備中に予期しないエラーが発生しました",
     "xpack.lens.editorFrame.colorIndicatorLabel": "このディメンションの色：{hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} {errors, plural, other  {エラー}}",
@@ -719,7 +699,6 @@
     "xpack.lens.paletteHeatmapGradient.customizeLong": "パレットを編集",
     "xpack.lens.paletteHeatmapGradient.label": "色",
     "xpack.lens.paletteMetricGradient.label": "色",
-    "coloring.dynamicColoring.palettePicker.colorRangesLabel": "色の範囲",
     "xpack.lens.palettePicker.label": "カラーパレット",
     "xpack.lens.paletteTableGradient.customize": "編集",
     "xpack.lens.paletteTableGradient.label": "色",
@@ -776,8 +755,6 @@
     "xpack.lens.shared.legendInsideAlignmentLabel": "アラインメント",
     "xpack.lens.shared.legendInsideColumnsLabel": "列の数",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "アラインメント",
-    "xpack.lens.shared.legendInsideTooltip": "凡例をビジュアライゼーション内に配置する必要があります",
-    "xpack.lens.shared.legendIsTruncated": "テキストを切り捨てる必要があります",
     "xpack.lens.shared.legendLabel": "凡例",
     "xpack.lens.shared.legendLocationBottomLeft": "左下",
     "xpack.lens.shared.legendLocationBottomRight": "右下",
@@ -789,7 +766,6 @@
     "xpack.lens.shared.legendPositionRight": "右",
     "xpack.lens.shared.legendPositionTop": "トップ",
     "xpack.lens.shared.legendVisibilityLabel": "表示",
-    "xpack.lens.shared.legendVisibleTooltip": "凡例を表示する必要があります",
     "xpack.lens.shared.maxLinesLabel": "最大行",
     "xpack.lens.shared.nestedLegendLabel": "ネスト済み",
     "xpack.lens.shared.overwriteAxisTitle": "軸タイトルを上書き",
@@ -812,12 +788,8 @@
     "xpack.lens.table.columnVisibilityLabel": "列を非表示",
     "xpack.lens.table.defaultAriaLabel": "データ表ビジュアライゼーション",
     "xpack.lens.table.dynamicColoring.cell": "セル",
-    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "割合値は使用可能なデータ値の全範囲に対して相対的です。",
     "xpack.lens.table.dynamicColoring.label": "値別の色",
     "xpack.lens.table.dynamicColoring.none": "なし",
-    "coloring.dynamicColoring.rangeType.label": "値型",
-    "coloring.dynamicColoring.rangeType.number": "数字",
-    "coloring.dynamicColoring.rangeType.percent": "割合（%）",
     "xpack.lens.table.dynamicColoring.text": "テキスト",
     "xpack.lens.table.hide.hideLabel": "非表示",
     "xpack.lens.table.palettePanelContainer.back": "戻る",
@@ -861,7 +833,6 @@
     "xpack.lens.xyChart.axisOrientation.horizontal": "横",
     "xpack.lens.xyChart.axisOrientation.label": "向き",
     "xpack.lens.xyChart.axisOrientation.vertical": "縦",
-    "xpack.lens.xyChart.axisOrientationMultilayer.disabled": "このオプションは時間に基づかない軸でのみ構成できます",
     "xpack.lens.xyChart.axisSide.auto": "自動",
     "xpack.lens.xyChart.axisSide.bottom": "一番下",
     "xpack.lens.xyChart.axisSide.label": "軸側",
@@ -946,6 +917,31 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "H.割合棒",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "縦棒割合",
     "xpack.lens.xyVisualization.xyLabel": "XY",
+    "coloring.dynamicColoring.customPalette.addColor": "色を追加",
+    "coloring.dynamicColoring.customPalette.addColorAriaLabel": "色を追加",
+    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "削除",
+    "coloring.dynamicColoring.customPalette.disallowedEditMinMaxValues": "現在の構成にはカスタム値を設定できません",
+    "coloring.dynamicColoring.customPalette.distributeValues": "値を分散",
+    "coloring.dynamicColoring.customPalette.distributeValuesAriaLabel": "値を分散",
+    "coloring.dynamicColoring.customPalette.invalidMaxValue": "最大値は前の値より大きくなければなりません",
+    "coloring.dynamicColoring.customPalette.invalidValueOrColor": "1つ以上の色範囲に正しくない値または色が含まれています",
+    "coloring.dynamicColoring.customPalette.maximumStepsApplied": "ステップの最大数を適用しました",
+    "coloring.dynamicColoring.customPalette.maxValuePlaceholder": "最大値",
+    "coloring.dynamicColoring.customPalette.minValuePlaceholder": "最小値",
+    "coloring.dynamicColoring.customPalette.oneColorRange": "複数の色が必要です",
+    "coloring.dynamicColoring.customPalette.rangeAriaLabel": "範囲{index}",
+    "coloring.dynamicColoring.customPalette.reverseColors": "色を反転",
+    "coloring.dynamicColoring.customPalette.selectNewColor": "新しい色を選択",
+    "coloring.dynamicColoring.customPalette.setCustomMaxValue": "カスタム最小値を設定",
+    "coloring.dynamicColoring.customPalette.setCustomMinValue": "カスタム最大値を設定",
+    "coloring.dynamicColoring.customPalette.useAutoMaxValue": "最大データ値を使用",
+    "coloring.dynamicColoring.customPalette.useAutoMinValue": "最小データ値を使用",
+    "coloring.dynamicColoring.customPaletteAriaLabel": "色を反転",
+    "coloring.dynamicColoring.palettePicker.colorRangesLabel": "色の範囲",
+    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "割合値は使用可能なデータ値の全範囲に対して相対的です。",
+    "coloring.dynamicColoring.rangeType.label": "値型",
+    "coloring.dynamicColoring.rangeType.number": "数字",
+    "coloring.dynamicColoring.rangeType.percent": "割合（%）",
     "expressionXY.legend.filterForValueButtonAriaLabel": "値でフィルター",
     "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}、フィルターオプション",
     "expressionXY.legend.filterOutValueButtonAriaLabel": "値を除外",
@@ -1143,7 +1139,6 @@
     "console.notification.error.historyQuotaReachedMessage": "リクエスト履歴が満杯です。コンソール履歴を消去するか、新しいリクエストの保存を無効にしてください。",
     "console.notification.error.noRequestSelectedTitle": "リクエストを選択していません。リクエストの中にカーソルを置いて選択します。",
     "console.notification.error.unknownErrorTitle": "不明なリクエストエラー",
-    "console.outputCannotPreviewBinaryData": "バイナリデータをプレビューできません。",
     "console.outputTextarea": "開発ツールコンソール出力",
     "console.pageHeading": "コンソール",
     "console.requestInProgressBadgeText": "リクエストが進行中",
@@ -4959,8 +4954,8 @@
     "share.urlService.redirect.RedirectManager.missingParamLocator": "ロケｰターIDが指定されていません。URLで「l」検索パラメーターを指定します。これは既存のロケｰターIDにしてください。",
     "share.urlService.redirect.RedirectManager.missingParamParams": "ロケーターパラメーターが指定されていません。URLで「p」検索パラメーターを指定します。これはロケーターパラメーターのJSONシリアル化オブジェクトにしてください。",
     "share.urlService.redirect.RedirectManager.missingParamVersion": "ロケーターパラメーターバージョンが指定されていません。URLで「v」検索パラメーターを指定します。これはロケーターパラメーターが生成されたときのKibanaのリリースバージョンです。",
-    "sharedUXComponents.exitFullScreenButton.exitFullScreenModeButtonText": "全画面を終了",
-    "sharedUXComponents.exitFullScreenButton.fullScreenModeDescription": "ESC キーで全画面モードを終了します。",
+    "sharedUXPackages.exitFullScreenButton.exitFullScreenModeButtonText": "全画面を終了",
+    "sharedUXPackages.exitFullScreenButton.fullScreenModeDescription": "ESC キーで全画面モードを終了します。",
     "telemetry.callout.appliesSettingTitle": "この設定に加えた変更は {allOfKibanaText} に適用され、自動的に保存されます。",
     "telemetry.callout.appliesSettingTitle.allOfKibanaText": "Kibana のすべて",
     "telemetry.callout.clusterStatisticsDescription": "これは収集される基本的なクラスター統計の例です。インデックス、シャード、ノードの数が含まれます。監視がオンになっているかどうかなどのハイレベルの使用統計も含まれます。",
@@ -6416,7 +6411,6 @@
     "visualizations.listing.table.typeColumnName": "型",
     "visualizations.listingPageTitle": "Visualizeライブラリ",
     "visualizations.newChart.conditionalMessage.advancedSettingsLink": "高度な設定",
-    "visualizations.newChart.conditionalMessage.newLibrary": "{link}で古いライブラリに切り替える",
     "visualizations.newHeatmapChart.notificationMessage": "新しいヒートマップグラフライブラリはまだ分割グラフアグリゲーションをサポートしていません。{conditionalMessage}",
     "visualizations.newVisWizard.aggBasedGroupDescription": "クラシック Visualize ライブラリを使用して、アグリゲーションに基づいてグラフを作成します。",
     "visualizations.newVisWizard.aggBasedGroupTitle": "アグリゲーションに基づく",
@@ -10247,7 +10241,6 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryButtonLabel": "クエリを管理",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryDescription": "このキュレーションのクエリを編集、追加、削除します。",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryTitle": "クエリを管理",
-    "xpack.enterpriseSearch.appSearch.engine.curations.newBadgeLabel": "新機能！",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.description": "表示するオーガニック結果はありません。{manualDescription}",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.manualDescription": "上記のアクティブなクエリを追加または変更します。",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.title": "\"{currentQuery}\"の上位のオーガニックドキュメント",
@@ -11556,7 +11549,6 @@
     "xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle": "Fleetサーバーを一元化されたホストにダウンロード",
     "xpack.fleet.agentEnrollment.stepDownloadAgentTitle": "Elasticエージェントをホストにダウンロード",
     "xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle": "Elasticエージェントを登録して実行",
-    "xpack.fleet.agentEnrollment.stepRunAgentDescription": "エージェントのディレクトリから、このコマンドを実行し、Elasticエージェントを、インストール、登録、起動します。このコマンドを再利用すると、複数のホストでエージェントを設定できます。管理者権限が必要です。",
     "xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s": "Kubernetesマニフェストがダウンロードされるディレクトリから適用コマンドを実行します。",
     "xpack.fleet.agentHealth.checkInTooltipText": "前回のチェックイン {lastCheckIn}",
     "xpack.fleet.agentHealth.healthyStatusText": "正常",
@@ -23597,7 +23589,6 @@
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewLabel": "クイッククエリプレビュー",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllErrors": "すべてのエラーを表示",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllWarnings": "すべての警告を表示",
-    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading": "...loading",
     "xpack.securitySolution.detectionEngine.queryPreview.queryThresholdGraphCountLabel": "累積しきい値数",
     "xpack.securitySolution.detectionEngine.rule.editRule.errorMsgDescription": "{countError, plural, one {このタブ} other {これらのタブ}}に無効な入力があります：{tabHasError}",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStartedDescription": "開始",
@@ -24620,8 +24611,6 @@
     "xpack.securitySolution.indexPatterns.chooseDataViewLabel": "データビューを選択",
     "xpack.securitySolution.indexPatterns.closeButton": "閉じる",
     "xpack.securitySolution.indexPatterns.continue": "追加せずに続行",
-    "xpack.securitySolution.indexPatterns.currentPatterns": "このタイムラインのアクティブなインデックスパターンは{tooltip}です：{callout}",
-    "xpack.securitySolution.indexPatterns.currentPatternsBad": "このタイムラインの現在のインデックスパターン：{callout}",
     "xpack.securitySolution.indexPatterns.dataViewLabel": "データビュー",
     "xpack.securitySolution.indexPatterns.descriptionsLabel": "これらは現在選択されているインデックスパターンです。データビューからインデックスパターンを除外すると、全体的なパフォーマンスを改善できます。",
     "xpack.securitySolution.indexPatterns.disabled": "このページでは無効なインデックスパターンが推奨されますが、最初にKibanaインデックスパターン設定で構成する必要があります。",
@@ -24631,10 +24620,8 @@
     "xpack.securitySolution.indexPatterns.indexPatternsLabel": "インデックスパターン",
     "xpack.securitySolution.indexPatterns.missingPatterns": "以前のタイムラインのデータビューを再作成するには、セキュリティデータビューに次のインデックスパターンがありません：{callout}",
     "xpack.securitySolution.indexPatterns.missingPatterns.callout": "セキュリティデータビューには次のインデックスパターンがありません：{callout}",
-    "xpack.securitySolution.indexPatterns.missingPatterns.description": "一時データビューを作成することで、タイムラインを保持しています。データを修正する場合は、見つからないインデックスパターンをセキュリティデータビューに追加できます。手動でデータビュー{link}を選択することもできます。",
     "xpack.securitySolution.indexPatterns.modifiedBadgeTitle": "変更済み",
     "xpack.securitySolution.indexPatterns.noData": "このタイムラインのインデックスパターンはデータストリーム、インデックス、またはインデックスエイリアスと一致しません。",
-    "xpack.securitySolution.indexPatterns.noMatchData": "次のインデックスパターンはこのタイムラインに保存されますが、データストリーム、インデックス、またはインデックスエイリアスと一致しません：{aliases}",
     "xpack.securitySolution.indexPatterns.onlyDetectionAlertsLabel": "検出アラートのみを表示",
     "xpack.securitySolution.indexPatterns.pickIndexPatternsCombo": "インデックスパターンを選択",
     "xpack.securitySolution.indexPatterns.reloadPageTitle": "ページを再読み込み",
@@ -24644,7 +24631,6 @@
     "xpack.securitySolution.indexPatterns.securityDefaultDataViewLabel": "セキュリティデフォルトデータビュー",
     "xpack.securitySolution.indexPatterns.selectDataView": "データビュー選択",
     "xpack.securitySolution.indexPatterns.successToastTitle": "設定を有効にするためにページの再読み込みが必要です",
-    "xpack.securitySolution.indexPatterns.toggleToNewSourcerer": "一時データビューを作成することで、タイムラインを保持しています。データを修正する場合は、新しいデータビューセレクターを使用して、一時データビューを再作成できます。手動でデータビュー{link}を選択することもできます。",
     "xpack.securitySolution.indexPatterns.toggleToNewSourcerer.link": "こちら",
     "xpack.securitySolution.indexPatterns.update": "データビューを更新して再作成",
     "xpack.securitySolution.indexPatterns.updateAvailableBadgeTitle": "更新が利用可能です",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 1f8bcf7b4fb74..fb23e0f8413a0 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -247,26 +247,6 @@
     "xpack.lens.dragDrop.keyboardInstructionsReorder": "按空格键或 enter 键开始拖动。拖动时，请使用上下箭头键重新排列组中的项目，使用左右箭头键在组之外选择拖动目标。再次按空格键或 enter 键结束操作。",
     "xpack.lens.dragDrop.shift": "Shift 键",
     "xpack.lens.dragDrop.swap": "交换",
-    "coloring.dynamicColoring.customPalette.addColor": "添加颜色",
-    "coloring.dynamicColoring.customPalette.addColorAriaLabel": "添加颜色",
-    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "删除",
-    "coloring.dynamicColoring.customPalette.disallowedEditMinMaxValues": "无法为当前配置设置定制值",
-    "coloring.dynamicColoring.customPalette.distributeValues": "分配值",
-    "coloring.dynamicColoring.customPalette.distributeValuesAriaLabel": "分配值",
-    "coloring.dynamicColoring.customPalette.invalidMaxValue": "最大值必须大于之前的值",
-    "coloring.dynamicColoring.customPalette.invalidValueOrColor": "至少一个颜色范围包含错误的值或颜色",
-    "coloring.dynamicColoring.customPalette.maximumStepsApplied": "您已应用最大步数",
-    "coloring.dynamicColoring.customPalette.maxValuePlaceholder": "最大值",
-    "coloring.dynamicColoring.customPalette.minValuePlaceholder": "最小值",
-    "coloring.dynamicColoring.customPalette.oneColorRange": "需要多种颜色",
-    "coloring.dynamicColoring.customPalette.rangeAriaLabel": "范围 {index}",
-    "coloring.dynamicColoring.customPalette.reverseColors": "反转颜色",
-    "coloring.dynamicColoring.customPalette.selectNewColor": "选择新颜色",
-    "coloring.dynamicColoring.customPalette.setCustomMaxValue": "设置定制最小值",
-    "coloring.dynamicColoring.customPalette.setCustomMinValue": "设置定制最大值",
-    "coloring.dynamicColoring.customPalette.useAutoMaxValue": "使用最大数据值",
-    "coloring.dynamicColoring.customPalette.useAutoMinValue": "使用最小数据值",
-    "coloring.dynamicColoring.customPaletteAriaLabel": "反转颜色",
     "xpack.lens.editorFrame.buildExpressionError": "准备图表时发生意外错误",
     "xpack.lens.editorFrame.colorIndicatorLabel": "此维度的颜色：{hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} 个{errors, plural, other {错误}}",
@@ -725,7 +705,6 @@
     "xpack.lens.paletteHeatmapGradient.customizeLong": "编辑调色板",
     "xpack.lens.paletteHeatmapGradient.label": "颜色",
     "xpack.lens.paletteMetricGradient.label": "颜色",
-    "coloring.dynamicColoring.palettePicker.colorRangesLabel": "颜色范围",
     "xpack.lens.palettePicker.label": "调色板",
     "xpack.lens.paletteTableGradient.customize": "编辑",
     "xpack.lens.paletteTableGradient.label": "颜色",
@@ -780,8 +759,6 @@
     "xpack.lens.shared.legendInsideAlignmentLabel": "对齐方式",
     "xpack.lens.shared.legendInsideColumnsLabel": "列数目",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "对齐方式",
-    "xpack.lens.shared.legendInsideTooltip": "需要图例位于可视化内",
-    "xpack.lens.shared.legendIsTruncated": "需要截断文本",
     "xpack.lens.shared.legendLabel": "图例",
     "xpack.lens.shared.legendLocationBottomLeft": "左下方",
     "xpack.lens.shared.legendLocationBottomRight": "右下方",
@@ -793,7 +770,6 @@
     "xpack.lens.shared.legendPositionRight": "右",
     "xpack.lens.shared.legendPositionTop": "顶部",
     "xpack.lens.shared.legendVisibilityLabel": "显示",
-    "xpack.lens.shared.legendVisibleTooltip": "需要图表显示",
     "xpack.lens.shared.maxLinesLabel": "最大行数",
     "xpack.lens.shared.nestedLegendLabel": "嵌套",
     "xpack.lens.shared.overwriteAxisTitle": "覆盖轴标题",
@@ -816,12 +792,8 @@
     "xpack.lens.table.columnVisibilityLabel": "隐藏列",
     "xpack.lens.table.defaultAriaLabel": "数据表可视化",
     "xpack.lens.table.dynamicColoring.cell": "单元格",
-    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "百分比值是相对于全范围可用数据值的类型。",
     "xpack.lens.table.dynamicColoring.label": "按值上色",
     "xpack.lens.table.dynamicColoring.none": "无",
-    "coloring.dynamicColoring.rangeType.label": "值类型",
-    "coloring.dynamicColoring.rangeType.number": "数字",
-    "coloring.dynamicColoring.rangeType.percent": "百分比",
     "xpack.lens.table.dynamicColoring.text": "文本",
     "xpack.lens.table.hide.hideLabel": "隐藏",
     "xpack.lens.table.palettePanelContainer.back": "返回",
@@ -865,7 +837,6 @@
     "xpack.lens.xyChart.axisOrientation.horizontal": "水平",
     "xpack.lens.xyChart.axisOrientation.label": "方向",
     "xpack.lens.xyChart.axisOrientation.vertical": "垂直",
-    "xpack.lens.xyChart.axisOrientationMultilayer.disabled": "只能使用非基于时间的轴配置这些选项",
     "xpack.lens.xyChart.axisSide.auto": "自动",
     "xpack.lens.xyChart.axisSide.bottom": "底部",
     "xpack.lens.xyChart.axisSide.label": "轴侧",
@@ -950,6 +921,31 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "水平百分比条形图",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "垂直百分比条形图",
     "xpack.lens.xyVisualization.xyLabel": "XY",
+    "coloring.dynamicColoring.customPalette.addColor": "添加颜色",
+    "coloring.dynamicColoring.customPalette.addColorAriaLabel": "添加颜色",
+    "coloring.dynamicColoring.customPalette.deleteButtonAriaLabel": "删除",
+    "coloring.dynamicColoring.customPalette.disallowedEditMinMaxValues": "无法为当前配置设置定制值",
+    "coloring.dynamicColoring.customPalette.distributeValues": "分配值",
+    "coloring.dynamicColoring.customPalette.distributeValuesAriaLabel": "分配值",
+    "coloring.dynamicColoring.customPalette.invalidMaxValue": "最大值必须大于之前的值",
+    "coloring.dynamicColoring.customPalette.invalidValueOrColor": "至少一个颜色范围包含错误的值或颜色",
+    "coloring.dynamicColoring.customPalette.maximumStepsApplied": "您已应用最大步数",
+    "coloring.dynamicColoring.customPalette.maxValuePlaceholder": "最大值",
+    "coloring.dynamicColoring.customPalette.minValuePlaceholder": "最小值",
+    "coloring.dynamicColoring.customPalette.oneColorRange": "需要多种颜色",
+    "coloring.dynamicColoring.customPalette.rangeAriaLabel": "范围 {index}",
+    "coloring.dynamicColoring.customPalette.reverseColors": "反转颜色",
+    "coloring.dynamicColoring.customPalette.selectNewColor": "选择新颜色",
+    "coloring.dynamicColoring.customPalette.setCustomMaxValue": "设置定制最小值",
+    "coloring.dynamicColoring.customPalette.setCustomMinValue": "设置定制最大值",
+    "coloring.dynamicColoring.customPalette.useAutoMaxValue": "使用最大数据值",
+    "coloring.dynamicColoring.customPalette.useAutoMinValue": "使用最小数据值",
+    "coloring.dynamicColoring.customPaletteAriaLabel": "反转颜色",
+    "coloring.dynamicColoring.palettePicker.colorRangesLabel": "颜色范围",
+    "coloring.dynamicColoring.customPalette.colorStopsHelpPercentage": "百分比值是相对于全范围可用数据值的类型。",
+    "coloring.dynamicColoring.rangeType.label": "值类型",
+    "coloring.dynamicColoring.rangeType.number": "数字",
+    "coloring.dynamicColoring.rangeType.percent": "百分比",
     "expressionXY.legend.filterForValueButtonAriaLabel": "筛留值",
     "expressionXY.legend.filterOptionsLegend": "{legendDataLabel}, 筛选选项",
     "expressionXY.legend.filterOutValueButtonAriaLabel": "筛除值",
@@ -1147,7 +1143,6 @@
     "console.notification.error.historyQuotaReachedMessage": "请求历史记录已满。请清除控制台历史记录或禁止保存新的请求。",
     "console.notification.error.noRequestSelectedTitle": "未选择任何请求。将鼠标置于请求内即可选择。",
     "console.notification.error.unknownErrorTitle": "未知请求错误",
-    "console.outputCannotPreviewBinaryData": "无法预览二进制数据。",
     "console.outputTextarea": "开发工具控制台输出",
     "console.pageHeading": "控制台",
     "console.requestInProgressBadgeText": "进行中的请求",
@@ -4966,8 +4961,8 @@
     "share.urlService.redirect.RedirectManager.missingParamLocator": "未指定定位器 ID。在 URL 中指定“l”搜索参数，其应为现有定位器 ID。",
     "share.urlService.redirect.RedirectManager.missingParamParams": "定位器参数未指定。在 URL 中指定“p”搜索参数，其应为定位器参数的 JSON 序列化对象。",
     "share.urlService.redirect.RedirectManager.missingParamVersion": "定位器参数版本未指定。在 URL 中指定“v”搜索参数，其应为生成定位器参数时 Kibana 的版本。",
-    "sharedUXComponents.exitFullScreenButton.exitFullScreenModeButtonText": "退出全屏",
-    "sharedUXComponents.exitFullScreenButton.fullScreenModeDescription": "在全屏模式下，按 ESC 键可退出。",
+    "sharedUXPackages.exitFullScreenButton.exitFullScreenModeButtonText": "退出全屏",
+    "sharedUXPackages.exitFullScreenButton.fullScreenModeDescription": "在全屏模式下，按 ESC 键可退出。",
     "telemetry.callout.appliesSettingTitle": "对此设置的更改将应用到{allOfKibanaText} 且会自动保存。",
     "telemetry.callout.appliesSettingTitle.allOfKibanaText": "整个 Kibana",
     "telemetry.callout.clusterStatisticsDescription": "这是我们将收集的基本集群统计信息的示例。其包括索引、分片和节点的数目。还包括概括性的使用情况统计信息，例如监测是否打开。",
@@ -6425,7 +6420,6 @@
     "visualizations.listing.table.typeColumnName": "类型",
     "visualizations.listingPageTitle": "Visualize 库",
     "visualizations.newChart.conditionalMessage.advancedSettingsLink": "免费的 API 密钥。",
-    "visualizations.newChart.conditionalMessage.newLibrary": "切换到{link}中的旧库",
     "visualizations.newHeatmapChart.notificationMessage": "新的热图图表库尚不支持拆分图表聚合。{conditionalMessage}",
     "visualizations.newVisWizard.aggBasedGroupDescription": "使用我们的经典可视化库，基于聚合创建图表。",
     "visualizations.newVisWizard.aggBasedGroupTitle": "基于聚合",
@@ -10266,7 +10260,6 @@
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryButtonLabel": "管理查询",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryDescription": "编辑、添加或移除此策展的查询。",
     "xpack.enterpriseSearch.appSearch.engine.curations.manageQueryTitle": "管理查询",
-    "xpack.enterpriseSearch.appSearch.engine.curations.newBadgeLabel": "新！",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.description": "没有要显示的有机结果。{manualDescription}",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.manualDescription": "在上面添加或更改活动查询。",
     "xpack.enterpriseSearch.appSearch.engine.curations.organicDocuments.title": "“{currentQuery}”的排名靠前有机文档",
@@ -11575,7 +11568,6 @@
     "xpack.fleet.agentEnrollment.stepDownloadAgentForFleetServerTitle": "将 Fleet 服务器下载到集中式主机",
     "xpack.fleet.agentEnrollment.stepDownloadAgentTitle": "将 Elastic 代理下载到您的主机",
     "xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle": "注册并启动 Elastic 代理",
-    "xpack.fleet.agentEnrollment.stepRunAgentDescription": "从代理目录运行此命令，以安装、注册并启动 Elastic 代理。您可以重复使用此命令在多个主机上设置代理。需要管理员权限。",
     "xpack.fleet.agentEnrollment.stepRunAgentDescriptionk8s": "从下载 Kubernetes 清单的目录运行应用命令。",
     "xpack.fleet.agentHealth.checkInTooltipText": "上次签入时间 {lastCheckIn}",
     "xpack.fleet.agentHealth.healthyStatusText": "运行正常",
@@ -23624,7 +23616,6 @@
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewLabel": "快速查询预览",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllErrors": "查看所有错误",
     "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSeeAllWarnings": "查看所有警告",
-    "xpack.securitySolution.detectionEngine.queryPreview.queryPreviewSubtitleLoading": "...正在加载",
     "xpack.securitySolution.detectionEngine.queryPreview.queryThresholdGraphCountLabel": "累计阈值计数",
     "xpack.securitySolution.detectionEngine.rule.editRule.errorMsgDescription": "您在{countError, plural, other {以下选项卡}}中的输入无效：{tabHasError}",
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStartedDescription": "已启动",
@@ -24648,8 +24639,6 @@
     "xpack.securitySolution.indexPatterns.chooseDataViewLabel": "选择数据视图",
     "xpack.securitySolution.indexPatterns.closeButton": "关闭",
     "xpack.securitySolution.indexPatterns.continue": "继续，而不添加",
-    "xpack.securitySolution.indexPatterns.currentPatterns": "此时间线中的活动索引模式为 {tooltip}：{callout}",
-    "xpack.securitySolution.indexPatterns.currentPatternsBad": "此时间线中的当前索引模式为：{callout}",
     "xpack.securitySolution.indexPatterns.dataViewLabel": "数据视图",
     "xpack.securitySolution.indexPatterns.descriptionsLabel": "这些是当前选择的索引模式。从您的数据视图中筛除索引模式可帮助提高整体性能。",
     "xpack.securitySolution.indexPatterns.disabled": "在此页面上建议使用已禁用的索引模式，但是首先需要在 Kibana 索引模式设置中配置这些模式",
@@ -24659,10 +24648,8 @@
     "xpack.securitySolution.indexPatterns.indexPatternsLabel": "索引模式",
     "xpack.securitySolution.indexPatterns.missingPatterns": "要重新创建上一时间线的数据视图，安全数据视图缺少以下索引模式：{callout}",
     "xpack.securitySolution.indexPatterns.missingPatterns.callout": "安全数据视图缺少以下索引模式：{callout}",
-    "xpack.securitySolution.indexPatterns.missingPatterns.description": "我们已通过创建临时数据视图来保留您的时间线。如果您要修改数据，我们可以将缺失的索引模式添加到安全数据视图。您还可以手动选择数据视图 {link}。",
     "xpack.securitySolution.indexPatterns.modifiedBadgeTitle": "已修改",
     "xpack.securitySolution.indexPatterns.noData": "此时间线上的索引模式不匹配任何数据流、索引或索引别名。",
-    "xpack.securitySolution.indexPatterns.noMatchData": "以下索引模式已保存到此时间线，但不匹配任何数据流、索引或索引别名：{aliases}",
     "xpack.securitySolution.indexPatterns.onlyDetectionAlertsLabel": "仅显示检测告警",
     "xpack.securitySolution.indexPatterns.pickIndexPatternsCombo": "选取索引模式",
     "xpack.securitySolution.indexPatterns.reloadPageTitle": "重新加载页面",
@@ -24672,7 +24659,6 @@
     "xpack.securitySolution.indexPatterns.securityDefaultDataViewLabel": "安全默认数据视图",
     "xpack.securitySolution.indexPatterns.selectDataView": "数据视图选择",
     "xpack.securitySolution.indexPatterns.successToastTitle": "一个或多个设置需要您重新加载页面才能生效",
-    "xpack.securitySolution.indexPatterns.toggleToNewSourcerer": "我们已通过创建临时数据视图来保留您的时间线。如果您要修改数据，我们可以使用新的数据视图选择器重新创建临时数据视图。您还可以手动选择数据视图 {link}。",
     "xpack.securitySolution.indexPatterns.toggleToNewSourcerer.link": "此处",
     "xpack.securitySolution.indexPatterns.update": "更新并重新创建数据视图",
     "xpack.securitySolution.indexPatterns.updateAvailableBadgeTitle": "有可用更新",
diff --git a/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts b/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts
index f95ce25122923..3a081a5a45486 100644
--- a/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts
+++ b/x-pack/plugins/triggers_actions_ui/common/experimental_features.ts
@@ -8,7 +8,7 @@
 export type ExperimentalFeatures = typeof allowedExperimentalValues;
 
 /**
- * A list of allowed values that can be used in `xpack.triggersActionsUi.enableExperimental`.
+ * A list of allowed values that can be used in `xpack.trigger_actions_ui.enableExperimental`.
  * This object is then used to validate and parse the value entered.
  */
 export const allowedExperimentalValues = Object.freeze({
@@ -24,7 +24,7 @@ const TriggersActionsUIInvalidExperimentalValue = class extends Error {};
 const allowedKeys = Object.keys(allowedExperimentalValues) as Readonly<ExperimentalConfigKeys>;
 
 /**
- * Parses the string value used in `xpack.triggersActionsUi.enableExperimental` kibana configuration,
+ * Parses the string value used in `xpack.trigger_actions_ui.enableExperimental` kibana configuration,
  * which should be a string of values delimited by a comma (`,`)
  *
  * @param configValue
diff --git a/x-pack/plugins/triggers_actions_ui/kibana.json b/x-pack/plugins/triggers_actions_ui/kibana.json
index 66135f67c0d58..4be95ed2db91d 100644
--- a/x-pack/plugins/triggers_actions_ui/kibana.json
+++ b/x-pack/plugins/triggers_actions_ui/kibana.json
@@ -8,8 +8,8 @@
   "server": true,
   "ui": true,
   "optionalPlugins": ["alerting", "cloud", "features", "home", "spaces"],
-  "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects", "unifiedSearch"],
+  "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects", "unifiedSearch", "dataViews"],
   "configPath": ["xpack", "trigger_actions_ui"],
   "extraPublicDirs": ["public/common", "public/common/constants"],
-  "requiredBundles": ["home", "alerting", "esUiShared", "kibanaReact", "kibanaUtils"]
+  "requiredBundles": ["alerting", "esUiShared", "kibanaReact", "kibanaUtils"]
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
index 94bb58e511c4c..71da5c46fe876 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
@@ -7,24 +7,25 @@
 
 import React, { lazy } from 'react';
 import { Switch, Route, Redirect, Router } from 'react-router-dom';
-import { ChromeBreadcrumb, CoreStart, CoreTheme, ScopedHistory } from 'kibana/public';
+import { ChromeBreadcrumb, CoreStart, CoreTheme, ScopedHistory } from '@kbn/core/public';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n-react';
 import useObservable from 'react-use/lib/useObservable';
 import { Observable } from 'rxjs';
-import { KibanaFeature } from '../../../features/common';
-import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
-import { Section, routeToRuleDetails, legacyRouteToRuleDetails } from './constants';
-import { ActionTypeRegistryContract, RuleTypeRegistryContract } from '../types';
-import { ChartsPluginStart } from '../../../../../src/plugins/charts/public';
-import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
-import { UnifiedSearchPublicPluginStart } from '../../../../../src/plugins/unified_search/public';
-import { PluginStartContract as AlertingStart } from '../../../alerting/public';
-import type { SpacesPluginStart } from '../../../spaces/public';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { suspendedComponentWithProps } from './lib/suspended_component_with_props';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
+import { ActionTypeRegistryContract, RuleTypeRegistryContract } from '../types';
+import { Section, routeToRuleDetails, legacyRouteToRuleDetails } from './constants';
 
 import { setSavedObjectsClient } from '../common/lib/data_apis';
 import { KibanaContextProvider } from '../common/lib/kibana';
@@ -36,6 +37,7 @@ const RuleDetailsRoute = lazy(
 
 export interface TriggersAndActionsUiServices extends CoreStart {
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   charts: ChartsPluginStart;
   alerting?: AlertingStart;
   spaces?: SpacesPluginStart;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
index 2f220855f9474..08a824f53e465 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
@@ -15,8 +15,8 @@ import {
   EuiText,
 } from '@elastic/eui';
 import './add_message_variables.scss';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { templateActionVariable } from '../lib';
-import { ActionVariable } from '../../../../alerting/common';
 
 interface Props {
   messageVariables?: ActionVariable[];
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
index 82c787426a38e..a799db2702180 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { INTERNAL_BASE_ACTION_API_PATH } from '../../../constants';
 import { EmailConfig } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
index ec86f149e9a43..f91ef64ca28a3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '../index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { EmailActionConnector } from '../types';
 import { getEmailServices } from './email';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
index 709101396edf0..c5da19c305268 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
@@ -8,13 +8,13 @@
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSelectOption } from '@elastic/eui';
+import { AdditionalEmailServices } from '@kbn/actions-plugin/common';
 import {
   ActionTypeModel,
   ConnectorValidationResult,
   GenericValidationResult,
 } from '../../../../types';
 import { EmailActionParams, EmailConfig, EmailSecrets, EmailActionConnector } from '../types';
-import { AdditionalEmailServices } from '../../../../../../actions/common';
 
 const emailServices: EuiSelectOption[] = [
   {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
index 6e591753af35e..e870e0ef38439 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
@@ -21,13 +21,13 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiLink } from '@elastic/eui';
+import { AdditionalEmailServices } from '@kbn/actions-plugin/common';
 import { ActionConnectorFieldsProps } from '../../../../types';
 import { EmailActionConnector } from '../types';
 import { useKibana } from '../../../../common/lib/kibana';
 import { getEncryptedFieldNotifyLabel } from '../../get_encrypted_field_notify_label';
 import { getEmailServices } from './email';
 import { useEmailConfig } from './use_email_config';
-import { AdditionalEmailServices } from '../../../../../../actions/common';
 
 const ExchangeFormFields = lazy(() => import('./exchange_form'));
 export const EmailActionConnectorFields: React.FunctionComponent<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
index ef9dda3bb2d1c..6a640cc734071 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { renderHook, act } from '@testing-library/react-hooks';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useEmailConfig } from './use_email_config';
 
 const http = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
index 9e6df1d1a1019..53ec70b8b62b3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
@@ -6,11 +6,11 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { isEmpty } from 'lodash';
+import { AdditionalEmailServices } from '@kbn/actions-plugin/common';
 import { EmailConfig } from '../types';
 import { getServiceConfig } from './api';
-import { AdditionalEmailServices } from '../../../../../../actions/common';
 
 export function useEmailConfig(
   http: HttpSetup,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
index f43d883be7add..4097adb7b067f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '../index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { EsIndexActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx
index 7b0515d8904e2..1e7259dd802d4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_connector.tsx
@@ -21,7 +21,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { debounce } from 'lodash';
 import { ActionConnectorFieldsProps } from '../../../../types';
-import { EsIndexActionConnector } from '.././types';
+import { EsIndexActionConnector } from '../types';
 import { getTimeFieldOptions } from '../../../../common/lib/get_time_options';
 import { firstFieldOption, getFields, getIndexOptions } from '../../../../common/index_controls';
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
index f5545f2f4c075..0601d0a9b1284 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
@@ -24,7 +24,7 @@ import {
   AlertHistoryDefaultIndexName,
   ALERT_HISTORY_PREFIX,
 } from '../../../../types';
-import { IndexActionParams } from '.././types';
+import { IndexActionParams } from '../types';
 import { JsonEditorWithMessageVariables } from '../../json_editor_with_message_variables';
 import { useKibana } from '../../../../common/lib/kibana';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts
index 853f01246b88b..92e8a550fda05 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/extract_action_variable.ts
@@ -6,7 +6,7 @@
  */
 
 import { fromNullable, Option } from 'fp-ts/lib/Option';
-import { ActionVariable } from '../../../../../alerting/common';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 
 export function extractActionVariable(
   actionVariables: ActionVariable[],
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
index 91b4f1e343bc7..24f1a2b5c9f3a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getIssueTypes, getFieldsByIssueType, getIssues, getIssue } from './api';
 
 const issueTypesData = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
index e9cc583ee44ac..f213bbc7bda40 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import { ActionTypeExecutorResult } from '../../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
 import { Fields, Issue, IssueTypes } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
index 1105f17e038e7..425bcf651f104 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { JiraActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
index 38aed2cfc6f88..f2f3aab1c2a7b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
@@ -8,7 +8,7 @@
 import React, { useMemo, useEffect, useCallback, useState, memo } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { useGetIssues } from './use_get_issues';
 import { useGetSingleIssue } from './use_get_single_issue';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
index 6073971912acc..22c727df7bb09 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExecutorSubActionPushParams } from '../../../../../../actions/server/builtin_action_types/jira/types';
+import { ExecutorSubActionPushParams } from '@kbn/actions-plugin/server/builtin_action_types/jira/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type JiraActionConnector = UserConfiguredActionConnector<JiraConfig, JiraSecrets>;
 export interface JiraActionParams {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
index 71dafef4dca2e..4f0e1e143291c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { Fields } from './types';
 import { getFieldsByIssueType } from './api';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
index 09ed90b296d06..97db74630258c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 
 import { ActionConnector } from '../../../../types';
 import { IssueTypes } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
index 3ad67709f82fb..0dea608b78ac9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
@@ -7,7 +7,7 @@
 
 import { isEmpty, debounce } from 'lodash/fp';
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { Issue } from './types';
 import { getIssues } from './api';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
index 62ddb8b6e362b..3967ab25c889e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { Issue } from './types';
 import { getIssue } from './api';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
index db2f82872900c..10bf1a45806e8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
-import { PagerDutyActionConnector } from '.././types';
+import { PagerDutyActionConnector } from '../types';
 
 const ACTION_TYPE_ID = '.pagerduty';
 let actionTypeModel: ActionTypeModel;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
index 8b9902c3d7d09..42813186fe9f1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
@@ -19,7 +19,7 @@ import {
   PagerDutySecrets,
   PagerDutyActionParams,
   EventActionOptions,
-} from '.././types';
+} from '../types';
 import { hasMustacheTokens } from '../../../lib/has_mustache_tokens';
 
 export function getActionType(): ActionTypeModel<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx
index 0d10223af66cf..ee0b4f214cb5c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { PagerDutyActionConnector } from '.././types';
+import { PagerDutyActionConnector } from '../types';
 import PagerDutyActionConnectorFields from './pagerduty_connectors';
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx
index c734750a59f3b..49aaec5bb6f24 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_connectors.tsx
@@ -10,7 +10,7 @@ import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { ActionConnectorFieldsProps } from '../../../../types';
-import { PagerDutyActionConnector } from '.././types';
+import { PagerDutyActionConnector } from '../types';
 import { useKibana } from '../../../../common/lib/kibana';
 import { getEncryptedFieldNotifyLabel } from '../../get_encrypted_field_notify_label';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
index 6eb349b8f511c..19f47166b2726 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { EventActionOptions, SeverityActionOptions } from '.././types';
+import { EventActionOptions, SeverityActionOptions } from '../types';
 import PagerDutyParamsFields from './pagerduty_params';
 
 describe('PagerDutyParamsFields renders', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
index a7e6aaeec4129..738f1ca74b1a6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
@@ -10,7 +10,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect, EuiSpacer } from '@el
 import { i18n } from '@kbn/i18n';
 import { isUndefined } from 'lodash';
 import { ActionParamsProps } from '../../../../types';
-import { PagerDutyActionParams } from '.././types';
+import { PagerDutyActionParams } from '../types';
 import { TextFieldWithMessageVariables } from '../../text_field_with_message_variables';
 
 const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDutyActionParams>> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
index a345a9c81beb0..c7097bd83e84c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getIncidentTypes, getSeverity } from './api';
 
 const incidentTypesResponse = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
index daca46247ae3e..b0378be04efd3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
index dc8d210ade98a..89b4b6ee668db 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { ResilientActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts
index 9a638195a17f9..fcee38cf441fa 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExecutorSubActionPushParams } from '../../../../../../actions/server/builtin_action_types/resilient/types';
+import { ExecutorSubActionPushParams } from '@kbn/actions-plugin/server/builtin_action_types/resilient/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type ResilientActionConnector = UserConfiguredActionConnector<
   ResilientConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx
index 91a25f8b7b3fe..e398f1a8dd32c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_incident_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { getIncidentTypes } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx
index 9462795a78daf..79e3b27d0a081 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/use_get_severity.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, ToastsApi } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { getSeverity } from './api';
 import * as i18n from './translations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
index d9bf48c4ab854..739250bee0d19 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionTypeExecutorResult, RewriteResponseCase } from '../../../../../actions/common';
+import { ActionTypeExecutorResult, RewriteResponseCase } from '@kbn/actions-plugin/common';
 
 export type ConnectorExecutorResult<T> = ReturnType<
   RewriteResponseCase<ActionTypeExecutorResult<T>>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx
index d2da049f7de6c..e91f76d94d2fb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel, UserConfiguredActionConnector } from '../../../../types';
 
 const ACTION_TYPE_ID = '.server-log';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
index baaffb6721fc4..90bed8f28701a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { ServerLogLevelOptions } from '.././types';
+import { ServerLogLevelOptions } from '../types';
 import ServerLogParamsFields from './server_log_params';
 
 describe('ServerLogParamsFields renders', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
index 6397ce7bc184e..b8f5b84eb471e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log_params.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSelect, EuiFormRow } from '@elastic/eui';
 import { ActionParamsProps } from '../../../../types';
-import { ServerLogActionParams } from '.././types';
+import { ServerLogActionParams } from '../types';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
 
 export const ServerLogParamsFields: React.FunctionComponent<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts
index 4b67d256d99bc..f8acc9a6044b3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { getChoices, getAppInfo } from './api';
 
 const choicesResponse = {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
index 13cd3e5313165..dad3e3e0d0170 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
+import { snExternalServiceConfig } from '@kbn/actions-plugin/server/builtin_action_types/servicenow/config';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { API_INFO_ERROR } from './translations';
 import { AppInfo, RESTApiError } from './types';
 import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
-import { ActionTypeExecutorResult } from '../../../../../../actions/common';
 import { Choice } from './types';
 
 export async function getChoices({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx
index d2d620699f9d3..8bb2974595465 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/credentials.tsx
@@ -7,7 +7,7 @@
 
 import React, { memo } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
-import { ActionConnectorFieldsProps } from '../../../../../public/types';
+import { ActionConnectorFieldsProps } from '../../../../types';
 import * as i18n from './translations';
 import { ServiceNowActionConnector } from './types';
 import { CredentialsApiUrl } from './credentials_api_url';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
index 3f22a51b5bd53..0e6eb4d8ff0f2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { ServiceNowActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
index 556e8cfbca3f0..a12d43c35369e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
@@ -8,6 +8,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { EuiSpacer } from '@elastic/eui';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { snExternalServiceConfig } from '@kbn/actions-plugin/server/builtin_action_types/servicenow/config';
 import { ActionConnectorFieldsProps } from '../../../../types';
 
 import * as i18n from './translations';
@@ -26,9 +28,6 @@ import { checkConnectorIsDeprecated } from '../../../../common/connectors_select
 // eslint-disable-next-line import/no-default-export
 export { ServiceNowConnectorFields as default };
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
-
 const ServiceNowConnectorFields: React.FC<
   ActionConnectorFieldsProps<ServiceNowActionConnector>
 > = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
index 40bb47543a3c8..6f665c3360f62 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 import {
   ExecutorSubActionPushParamsITSM,
   ExecutorSubActionPushParamsSIR,
   ExecutorSubActionAddEventParams,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../actions/server/builtin_action_types/servicenow/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/servicenow/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type ServiceNowActionConnector = UserConfiguredActionConnector<
   ServiceNowConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx
index 4e21b0f66642d..732aeed6313ac 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.tsx
@@ -21,15 +21,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { ActionConnectorFieldsProps } from '../../../../../public/types';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { snExternalServiceConfig } from '@kbn/actions-plugin/server/builtin_action_types/servicenow/config';
+import { ActionConnectorFieldsProps } from '../../../../types';
 import { ServiceNowActionConnector } from './types';
 import { CredentialsApiUrl } from './credentials_api_url';
 import { isFieldInvalid } from './helpers';
 import { ApplicationRequiredCallout } from './application_required_callout';
 import { SNStoreLink } from './sn_store_button';
 import { CredentialsAuth } from './credentials_auth';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
 
 const title = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.serviceNow.updateFormTitle',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
index bfad678f9b24b..e3b10896e8707 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback, useMemo, useState } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 
 import { ActionConnector } from '../../../../types';
 import { Choice, Fields } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
index b115c84562ae6..e81e0efe56a42 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef, useCallback } from 'react';
-import { HttpSetup, IToasts } from 'kibana/public';
+import { HttpSetup, IToasts } from '@kbn/core/public';
 import { ActionConnector } from '../../../../types';
 import { getChoices } from './api';
 import { Choice } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx
index dbdc123e0098f..95ce25a03349e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { SlackActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
index 07d78a8885c51..5d69af2d08779 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/swimlane.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { SwimlaneActionConnector } from './types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
index f0a54e8b6c3bf..f629f98942504 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/types.ts
@@ -7,11 +7,11 @@
 
 /* eslint-disable @kbn/eslint/no-restricted-paths */
 
-import { UserConfiguredActionConnector } from '../../../../types';
 import {
   ExecutorSubActionPushParams,
   MappingConfigType,
-} from '../../../../../../actions/server/builtin_action_types/swimlane/types';
+} from '@kbn/actions-plugin/server/builtin_action_types/swimlane/types';
+import { UserConfiguredActionConnector } from '../../../../types';
 
 export type SwimlaneActionConnector = UserConfiguredActionConnector<
   SwimlaneConfig,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
index f18770067b8a8..fc35c6c26c945 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/swimlane/use_get_application.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useCallback, useRef } from 'react';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { getApplication as getApplicationApi } from './api';
 import * as i18n from './translations';
 import { SwimlaneFieldMappingConfig } from './types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx
index 641c46af6bfc1..da0a67fe79a20 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { TeamsActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
index 3e42e7965c5bd..8a17b1c0b206a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { WebhookActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx
index 62d890d172f0d..93d8c6f5d39db 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/xmatters/xmatters.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { TypeRegistry } from '../../../type_registry';
-import { registerBuiltInActionTypes } from '.././index';
+import { registerBuiltInActionTypes } from '..';
 import { ActionTypeModel } from '../../../../types';
 import { XmattersActionConnector } from '../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
index b98db1178f462..7626cc49a5c4c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/delete_modal_confirmation.tsx
@@ -8,7 +8,7 @@
 import { EuiConfirmModal } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { useKibana } from '../../common/lib/kibana';
 
 export const DeleteModalConfirmation = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
index a488086032f07..402911a5e86bc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.tsx
@@ -14,7 +14,7 @@ import { EuiLink, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { EuiEmptyPrompt } from '@elastic/eui';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import './health_check.scss';
 import { useHealthContext } from '../context/health_context';
 import { useKibana } from '../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
index 9ab9ea990c363..ba3470d4a1dfd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
@@ -12,11 +12,11 @@ import { i18n } from '@kbn/i18n';
 import { monaco, XJsonLang } from '@kbn/monaco';
 
 import './add_message_variables.scss';
-import { XJson } from '../../../../../../src/plugins/es_ui_shared/public';
-import { CodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+import { XJson } from '@kbn/es-ui-shared-plugin/public';
+import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { AddMessageVariables } from './add_message_variables';
-import { ActionVariable } from '../../../../alerting/common';
 import { templateActionVariable } from '../lib';
 
 const NO_EDITOR_ERROR_TITLE = i18n.translate(
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
index 7773c9181c6f7..77938165cf264 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
@@ -8,8 +8,8 @@
 import React, { useState } from 'react';
 import { EuiTextArea, EuiFormRow } from '@elastic/eui';
 import './add_message_variables.scss';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { AddMessageVariables } from './add_message_variables';
-import { ActionVariable } from '../../../../alerting/common';
 import { templateActionVariable } from '../lib';
 
 interface Props {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
index f35156d969d37..e8d43107bc11c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
@@ -8,8 +8,8 @@
 import React, { useState } from 'react';
 import { EuiFieldText } from '@elastic/eui';
 import './add_message_variables.scss';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { AddMessageVariables } from './add_message_variables';
-import { ActionVariable } from '../../../../alerting/common';
 import { templateActionVariable } from '../lib';
 
 interface Props {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
index c6da598a18f8e..fda9677d821f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
@@ -10,8 +10,8 @@ import { i18n } from '@kbn/i18n';
 export {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
-} from '../../../../alerting/common';
-export { BASE_ACTION_API_PATH, INTERNAL_BASE_ACTION_API_PATH } from '../../../../actions/common';
+} from '@kbn/alerting-plugin/common';
+export { BASE_ACTION_API_PATH, INTERNAL_BASE_ACTION_API_PATH } from '@kbn/actions-plugin/common';
 
 export type Section = 'connectors' | 'rules' | 'alerts';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts
index 8815757df6af5..c24362ed5962b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { ActionType } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { loadActionTypes } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { loadActionTypes } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
index e1b63280cc915..86451cd1b9181 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type { ActionType } from '../../../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts
index 565cc0afebfea..a9216eaec2be5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { loadAllActions } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { loadAllActions } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
index 70997ca52dab1..fbef1521b2024 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type { ActionConnector, ActionConnectorProps } from '../../../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts
index 208970fbfc061..42588610e036b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { ActionConnectorWithoutId } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { createActionConnector } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { createActionConnector } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
index 624aff1cd7773..2799848909446 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { RewriteRequestCase, RewriteResponseCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { RewriteRequestCase, RewriteResponseCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type {
   ActionConnector,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts
index ba4c62471555b..9e0696235b12f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { deleteActions } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { deleteActions } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts
index 8c9495158cc57..e403229c97c80 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ACTION_API_PATH } from '../../constants';
 
 export async function deleteActions({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts
index 2b0cdcb2ca69b..60fc763628bfb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { executeAction } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { executeAction } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
index 0a305413f61f7..74cc4d9484c9b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
-import {
-  ActionTypeExecutorResult,
-  RewriteRequestCase,
-} from '../../../../../../plugins/actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { ActionTypeExecutorResult, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 
 const rewriteBodyRes: RewriteRequestCase<ActionTypeExecutorResult<unknown>> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts
index 3cee8d225b001..90c0d3adb9235 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { ActionConnectorWithoutId } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
-import { updateActionConnector } from './index';
+import { httpServiceMock } from '@kbn/core/public/mocks';
+import { updateActionConnector } from '.';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
index a45dc8cfca2f9..18f4bdd60ad27 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { RewriteRequestCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type {
   ActionConnector,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
index c2ab2936e0cc7..9c123a822a541 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
@@ -7,7 +7,7 @@
 
 import { RuleType, ActionVariables } from '../../types';
 import { transformActionVariables } from './action_variables';
-import { ALERTS_FEATURE_ID } from '../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 
 beforeEach(() => jest.resetAllMocks());
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
index 6aff0781a56c2..bfa28ca2a97a4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { pick } from 'lodash';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 import { ActionVariables, REQUIRED_ACTION_VARIABLES, CONTEXT_ACTION_VARIABLES } from '../../types';
-import { ActionVariable } from '../../../../alerting/common';
 
 export type OmitMessageVariablesType = 'all' | 'keepContext';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
index 632217bdb06d5..31cf73f2d3d9c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/execution_duration_utils.ts
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import { padStart } from 'lodash';
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { RuleType } from '../../types';
-import { parseDuration } from '../../../../alerting/common';
 
 export function formatMillisForDisplay(value: number | undefined) {
   if (!value) {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
index fdb11cfd0e1fc..fa4a5b6b2b33e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RecoveredActionGroup } from '../../../../alerting/common';
+import { RecoveredActionGroup } from '@kbn/alerting-plugin/common';
 import { AlertProvidedActionVariables } from './action_variables';
 import { getDefaultsForActionParams } from './get_defaults_for_action_params';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
index a06eb360a70c3..d3f60f4c6335d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RuleActionParam } from '../../../../alerting/common';
+import { RuleActionParam } from '@kbn/alerting-plugin/common';
 import { EventActionOptions } from '../components/builtin_action_types/types';
 import { AlertProvidedActionVariables } from './action_variables';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts
index 53378d1af572d..46653e5bc3911 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRuleAggregations } from './aggregate';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
index d67c4f80b142d..c7bcd438ef697 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/aggregate.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { RuleAggregations } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { mapFiltersToKql } from './map_filters_to_kql';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteBodyRes: RewriteRequestCase<RuleAggregations> = ({
   rule_execution_status: ruleExecutionStatus,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
index 10a16313e87a4..67838f4f84881 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/common_transformations.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { RuleExecutionStatus } from '../../../../../alerting/common';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+import { RuleExecutionStatus } from '@kbn/alerting-plugin/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { Rule, RuleAction, ResolvedRule } from '../../../types';
 
 const transformAction: RewriteRequestCase<RuleAction> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
index acba66c83a735..d3138a115a27b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { RuleUpdates } from '../../../types';
 import { createRule } from './create';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
index 26b6cf6a9628c..4e37f9a02fb80 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/create.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract, RewriteResponseCase } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteResponseCase } from '@kbn/actions-plugin/common';
 import { Rule, RuleUpdates } from '../../../types';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 import { transformRule } from './common_transformations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts
index 95e48cf6e1734..c75314d083e5c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { deleteRules } from './delete';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts
index 053f5d68cdb69..6c0a37c538420 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/delete.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function deleteRules({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts
index 582fb3b59f86f..fcba288fabce4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { disableRule, disableRules } from './disable';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts
index 5b1e0452f51c1..9f3fed034a252 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/disable.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function disableRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts
index 993ae31f28832..27bb6b938d234 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { enableRule, enableRules } from './enable';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts
index fa4a462956663..dbea6772a1dad 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/enable.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function enableRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts
index 9d7a3c5d5e6f5..5a2a4661ef7f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRule } from './get_rule';
 import uuid from 'uuid';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
index 8604de3cc8bcf..1af1fdae94867 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/get_rule.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { Rule } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { transformRule } from './common_transformations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts
index e463e0d5c2515..84a9b86fc55d3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { alertingFrameworkHealth } from './health';
 
 describe('alertingFrameworkHealth', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts
index ca9f3bd94f745..80962de1b17f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/health.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
-import { AlertingFrameworkHealth, AlertsHealth } from '../../../../../alerting/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
+import { AlertingFrameworkHealth, AlertsHealth } from '@kbn/alerting-plugin/common';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 const rewriteAlertingFrameworkHealth: RewriteRequestCase<AlertsHealth> = ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts
index c323f0d4fa189..afe52835e1d08 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadExecutionLogAggregations, SortField } from './load_execution_log_aggregations';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts
index bb631b32328f4..ed6199c722ee0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/load_execution_log_aggregations.ts
@@ -7,16 +7,16 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import type { SortOrder } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 import {
   IExecutionLog,
   ExecutionLogSortFields,
   IExecutionLogWithErrorsResult,
-} from '../../../../../alerting/common';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
+} from '@kbn/alerting-plugin/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
+import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 const getRenamedLog = (data: IExecutionLog) => {
   const {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts
index f89dfdd41ebe6..6e16ea7d05151 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { muteRule, muteRules } from './mute';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts
index 81bbcf2e2b270..f3e863172a625 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function muteRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts
index 384bc65754b03..dc046903b25b0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { muteAlertInstance } from './mute_alert';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts
index 05f2417db9472..d2932440090ae 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/mute_alert.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function muteAlertInstance({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts
index 669a3bbe02a97..7c86c68e99e80 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { resolveRule } from './resolve_rule';
 import uuid from 'uuid';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts
index fa2867ffd85e7..1842ad2d8e01a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/resolve_rule.ts
@@ -4,8 +4,8 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
-import { AsApiContract } from '../../../../../actions/common';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { ResolvedRule } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { transformResolvedRule } from './common_transformations';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts
index ed81bae9777b6..e75e3d132671c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { RuleSummary } from '../../../types';
 import { loadRuleSummary } from './rule_summary';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts
index 0ddc58602bd5e..ab47b573e0188 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_summary.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { RewriteRequestCase, AsApiContract } from '@kbn/actions-plugin/common';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { RuleSummary, ExecutionDuration } from '../../../types';
-import { RewriteRequestCase, AsApiContract } from '../../../../../actions/common';
 
 const transformExecutionDuration: RewriteRequestCase<ExecutionDuration> = ({
   values_with_timestamp: valuesWithTimestamp,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts
index cd14c9f707960..05f21f9a53231 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { RuleType } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRuleTypes } from './rule_types';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 
 const http = httpServiceMock.createStartContract();
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts
index cae0a10deb052..71b7bc4fd3798 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rule_types.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { RuleType } from '../../../types';
 import { BASE_ALERTING_API_PATH } from '../../constants';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteResponseRes = (results: Array<AsApiContract<RuleType>>): RuleType[] => {
   return results.map((item) => rewriteBodyReq(item));
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts
index 2b70955ded4c3..5f6c6e938a0a7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRules } from './rules';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts
index 97c432a480355..52ba09a5c0adf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/rules.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
+import { AsApiContract } from '@kbn/actions-plugin/common';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 import { Rule, Pagination, Sorting } from '../../../types';
-import { AsApiContract } from '../../../../../actions/common';
 import { mapFiltersToKql } from './map_filters_to_kql';
 import { transformRule } from './common_transformations';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts
index 02b40a25bc281..acc854caa06f4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { snoozeRule } from './snooze';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts
index 3a414e914df7d..d1f47bbec012e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/snooze.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function snoozeRule({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts
index db22fa4d2d896..9932cccf76c41 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { loadRuleState } from './state';
 import uuid from 'uuid';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts
index 35fd63d92d25b..3f9fc3d61097e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/state.ts
@@ -4,14 +4,14 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { Errors, identity } from 'io-ts';
+import { ruleStateSchema } from '@kbn/alerting-plugin/common';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
 import { RuleTaskState } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
-import { ruleStateSchema } from '../../../../../alerting/common';
-import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteBodyRes: RewriteRequestCase<RuleTaskState> = ({
   rule_type_state: alertTypeState,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts
index fe55c2e2656fb..f521fe2229b55 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { unmuteRule, unmuteRules } from './unmute';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts
index 951038159ca81..4cb8a63fdebc2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function unmuteRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts
index d95c95158b0b7..c7c1b4ab5dab0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { unmuteAlertInstance } from './unmute_alert';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts
index 2e37aa2c0ee29..fa3dd97750f2a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unmute_alert.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function unmuteAlertInstance({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts
index 58356d81aa7b1..d0a9707cbedf5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { unsnoozeRule } from './unsnooze';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts
index b76b248f9e4ce..3f0ccd0aeab4d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/unsnooze.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
 
 export async function unsnoozeRule({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
index 911245de63f67..29bf8027bfe47 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Rule, RuleNotifyWhenType } from '../../../types';
-import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { updateRule } from './update';
 
 const http = httpServiceMock.createStartContract();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
index a3b9d081c20d3..76383b405e82a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/rule_api/update.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { pick } from 'lodash';
+import { RewriteResponseCase, AsApiContract } from '@kbn/actions-plugin/common';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 import { Rule, RuleUpdates } from '../../../types';
-import { RewriteResponseCase, AsApiContract } from '../../../../../actions/common';
 import { transformRule } from './common_transformations';
 
 type RuleUpdatesBody = Pick<
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
index 88558d1cac836..887564a8213c4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionVariable } from '../../../../alerting/common';
+import { ActionVariable } from '@kbn/alerting-plugin/common';
 
 export function templateActionVariable(variable: ActionVariable) {
   return variable.useWithTripleBracesInTemplates
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
index 97945fd8752c1..bf307083af6b0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
@@ -8,7 +8,7 @@
 import React, { lazy } from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { EuiAccordion } from '@elastic/eui';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { act } from 'react-dom/test-utils';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import {
@@ -23,7 +23,7 @@ import { useKibana } from '../../../common/lib/kibana';
 import {
   RecoveredActionGroup,
   isActionGroupDisabledForActionTypeId,
-} from '../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('../../lib/action_connector_api', () => ({
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 34e2094d51a6d..ea57ca44f52e3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -19,6 +19,7 @@ import {
   EuiToolTip,
   EuiLink,
 } from '@elastic/eui';
+import { ActionGroup, RuleActionParam } from '@kbn/alerting-plugin/common';
 import { loadActionTypes, loadAllActions as loadConnectors } from '../../lib/action_connector_api';
 import {
   ActionTypeModel,
@@ -35,7 +36,6 @@ import { AddConnectorInline } from './connector_add_inline';
 import { actionTypeCompare } from '../../lib/action_type_compare';
 import { checkActionFormActionTypeEnabled } from '../../lib/check_action_type_enabled';
 import { VIEW_LICENSE_OPTIONS_LINK, DEFAULT_HIDDEN_ACTION_TYPES } from '../../../common/constants';
-import { ActionGroup, RuleActionParam } from '../../../../../alerting/common';
 import { useKibana } from '../../../common/lib/kibana';
 import { DefaultActionParamsGetter } from '../../lib/get_defaults_for_action_params';
 import { ConnectorAddModal } from '.';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
index 5c336d37ebb51..8e6c19ed02bb9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
@@ -25,7 +25,7 @@ import {
   EuiErrorBoundary,
 } from '@elastic/eui';
 import { partition } from 'lodash';
-import { ActionVariable, RuleActionParam } from '../../../../../alerting/common';
+import { ActionVariable, RuleActionParam } from '@kbn/alerting-plugin/common';
 import {
   IErrorObject,
   RuleAction,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
index e8a0287d90026..8063bc97334f5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionTypeMenu } from './action_type_menu';
 import { ConnectorValidationResult, GenericValidationResult } from '../../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
index 9870786e5d3cc..02819a714c833 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import ConnectorAddFlyout from './connector_add_flyout';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ConnectorValidationResult, GenericValidationResult } from '../../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
index ef26dfc6fd2a0..06874f22b6428 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
@@ -22,7 +22,7 @@ import {
   EuiCallOut,
   EuiSpacer,
 } from '@elastic/eui';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ActionTypeMenu } from './action_type_menu';
 import { ActionConnectorForm, getConnectorErrors } from './action_connector_form';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
index 0666f8be394d8..0079af71d19f5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
@@ -12,7 +12,7 @@ import ConnectorAddModal from './connector_add_modal';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionType, ConnectorValidationResult, GenericValidationResult } from '../../../types';
 import { useKibana } from '../../../common/lib/kibana';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 
 jest.mock('../../../common/lib/kibana');
 const actionTypeRegistry = actionTypeRegistryMock.create();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
index e2bc9d44b147c..524b848dbb275 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.test.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ConnectorValidationResult, GenericValidationResult } from '../../../types';
 import ConnectorEditFlyout from './connector_edit_flyout';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
index 80239d069ef6a..89c1d72a32716 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
@@ -27,6 +27,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Option, none, some } from 'fp-ts/lib/Option';
+import { ActionTypeExecutorResult, isActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { ActionConnectorForm, getConnectorErrors } from './action_connector_form';
 import { TestConnectorForm } from './test_connector_form';
 import {
@@ -40,10 +41,6 @@ import {
 import { ConnectorReducer, createConnectorReducer } from './connector_reducer';
 import { updateActionConnector, executeAction } from '../../lib/action_connector_api';
 import { hasSaveActionsCapability } from '../../lib/capabilities';
-import {
-  ActionTypeExecutorResult,
-  isActionTypeExecutorResult,
-} from '../../../../../actions/common';
 import './connector_edit_flyout.scss';
 import { useKibana } from '../../../common/lib/kibana';
 import { getConnectorWithInvalidatedFields } from '../../lib/value_validators';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
index 1ecb651314ba9..3bef8e19abff1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connectors_selection.test.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { ConnectorsSelection } from './connectors_selection';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import { ActionType, ConnectorValidationResult, GenericValidationResult } from '../../../types';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx
index 2b64a01f11827..bd7105edf139d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.tsx
@@ -22,8 +22,8 @@ import { Option, map, getOrElse } from 'fp-ts/lib/Option';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import { ActionConnector, ActionTypeRegistryContract, IErrorObject } from '../../../types';
-import { ActionTypeExecutorResult } from '../../../../../actions/common';
 
 export interface ConnectorAddFlyoutProps {
   connector: ActionConnector;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index 1de8ad97af891..4b51c9b306a75 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -11,7 +11,7 @@ import { ThemeProvider } from 'styled-components';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 
 import ActionsConnectorsList from './actions_connectors_list';
-import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { actionTypeRegistryMock } from '../../../action_type_registry.mock';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index d001d08bf63f3..80d1839b231df 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -25,7 +25,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { omit } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { withTheme, EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { withTheme, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { loadAllActions, loadActionTypes, deleteActions } from '../../../lib/action_connector_api';
 import {
   hasDeleteActionsCapability,
@@ -43,7 +43,7 @@ import {
 } from '../../../../types';
 import { EmptyConnectorsPrompt } from '../../../components/prompts/empty_connectors_prompt';
 import { useKibana } from '../../../../common/lib/kibana';
-import { DEFAULT_HIDDEN_ACTION_TYPES } from '../../../../';
+import { DEFAULT_HIDDEN_ACTION_TYPES } from '../../../..';
 import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner';
 import ConnectorEditFlyout from '../../action_connector_form/connector_edit_flyout';
 import ConnectorAddFlyout from '../../action_connector_form/connector_add_flyout';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx
index c3c02dd064bcb..07984648f0a9e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_page/alerts_page.tsx
@@ -20,10 +20,10 @@ import {
   RuleRegistrySearchRequest,
   RuleRegistrySearchResponse,
   RuleRegistrySearchRequestPagination,
-} from '../../../../../../rule_registry/common';
+} from '@kbn/rule-registry-plugin/common';
+import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import { AlertsTable } from '../alerts_table';
 import { useKibana } from '../../../../common/lib/kibana';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { AlertsData } from '../../../../types';
 
 const consumers = [
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
index c0a50e460fe8a..790b16c3129a1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.test.tsx
@@ -10,7 +10,7 @@ import { act } from 'react-dom/test-utils';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 import { AlertsTable } from './alerts_table';
 import { AlertsData } from '../../../types';
-jest.mock('../../../../../../../src/plugins/data/public/');
+jest.mock('@kbn/data-plugin/public');
 jest.mock('../../../common/lib/kibana');
 
 describe('AlertsTable', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts
index 4f00e05ed1122..7c78636559d38 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_pagination.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useCallback, useState } from 'react';
-import { RuleRegistrySearchRequestPagination } from '../../../../../../rule_registry/common';
+import { RuleRegistrySearchRequestPagination } from '@kbn/rule-registry-plugin/common';
 
 type PaginationProps = RuleRegistrySearchRequestPagination & {
   onPageChange: (pagination: RuleRegistrySearchRequestPagination) => void;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx
index 3398df07ce219..e82bbaad26743 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_rule_api_operations.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 
+import { IExecutionLogWithErrorsResult } from '@kbn/alerting-plugin/common';
 import {
   Rule,
   RuleType,
@@ -38,7 +39,6 @@ import {
   snoozeRule,
   unsnoozeRule,
 } from '../../../lib/rule_api';
-import { IExecutionLogWithErrorsResult } from '../../../../../../alerting/common';
 import { useKibana } from '../../../../common/lib/kibana';
 
 export interface ComponentOpts {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx
index 106567a3c363d..b70eaf20a051d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.tsx
@@ -26,7 +26,7 @@ import {
   ActionGroup,
   RuleExecutionStatusErrorReasons,
   AlertStatusValues,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { Rule, RuleSummary, AlertStatus, RuleType } from '../../../../types';
 import {
   ComponentOpts as RuleApis,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx
index a11bea88a9d3a..b41af16ccab47 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.test.tsx
@@ -18,7 +18,7 @@ import {
   RuleExecutionStatusErrorReasons,
   RuleExecutionStatusWarningReasons,
   ALERTS_FEATURE_ID,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../../common/lib/kibana';
 import { ruleTypeRegistryMock } from '../../../rule_type_registry.mock';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx
index e8d4c0b089485..c940666b54077 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details.tsx
@@ -25,8 +25,8 @@ import {
   EuiLink,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { toMountPoint } from '../../../../../../../../src/plugins/kibana_react/public';
-import { RuleExecutionStatusErrorReasons, parseDuration } from '../../../../../../alerting/common';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { RuleExecutionStatusErrorReasons, parseDuration } from '@kbn/alerting-plugin/common';
 import { hasAllPrivilege, hasExecuteActionsCapability } from '../../../lib/capabilities';
 import { getAlertingSectionBreadcrumb, getRuleDetailsBreadcrumb } from '../../../lib/breadcrumb';
 import { getCurrentDocTitle } from '../../../lib/doc_title';
@@ -271,8 +271,8 @@ export const RuleDetails: React.FunctionComponent<RuleDetailsProps> = ({
                   <EuiText size="s">
                     <p>
                       <FormattedMessage
-                        id="xpack.triggersActionsUI.sections.ruleDetails.triggerActionsTitle"
-                        defaultMessage="Trigger actions"
+                        id="xpack.triggersActionsUI.sections.ruleDetails.stateTitle"
+                        defaultMessage="State"
                       />
                     </p>
                   </EuiText>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx
index 032d69fa7ccc4..46d127479031f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.test.tsx
@@ -11,11 +11,11 @@ import { shallow } from 'enzyme';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import { createMemoryHistory, createLocation } from 'history';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { RuleDetailsRoute, getRuleData } from './rule_details_route';
 import { Rule } from '../../../../types';
 import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner';
-import { spacesPluginMock } from '../../../../../../spaces/public/mocks';
+import { spacesPluginMock } from '@kbn/spaces-plugin/public/mocks';
 import { useKibana } from '../../../../common/lib/kibana';
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx
index cc7dca2a2c9c1..30319ce13ae15 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_details_route.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import React, { useState, useEffect } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { EuiSpacer } from '@elastic/eui';
 import { RuleType, ActionType, ResolvedRule } from '../../../../types';
 import { RuleDetailsWithApi as RuleDetails } from './rule_details';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx
index 1c4dd438e180d..1cf4beb0d87c0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_error_log.tsx
@@ -20,12 +20,12 @@ import {
   EuiTableSortingType,
   EuiBasicTableColumn,
 } from '@elastic/eui';
+import { IExecutionErrors } from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../../common/lib/kibana';
 
 import { RefineSearchPrompt } from '../refine_search_prompt';
 import { LoadExecutionLogAggregationsProps } from '../../../lib/rule_api';
 import { Rule } from '../../../../types';
-import { IExecutionErrors } from '../../../../../../alerting/common';
 import {
   ComponentOpts as RuleApis,
   withBulkRuleOperations,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx
index 7cc198c1bf58e..509e30992fd4d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list.tsx
@@ -20,6 +20,11 @@ import {
   EuiDataGridCellValueElementProps,
   OnTimeChangeProps,
 } from '@elastic/eui';
+import {
+  IExecutionLog,
+  executionLogSortableColumns,
+  ExecutionLogSortFields,
+} from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../../common/lib/kibana';
 import { RULE_EXECUTION_DEFAULT_INITIAL_VISIBLE_COLUMNS } from '../../../constants';
 import { RuleEventLogListStatusFilter } from './rule_event_log_list_status_filter';
@@ -28,11 +33,6 @@ import { RuleEventLogListCellRenderer, ColumnId } from './rule_event_log_list_ce
 import { RefineSearchPrompt } from '../refine_search_prompt';
 import { LoadExecutionLogAggregationsProps } from '../../../lib/rule_api';
 import { Rule } from '../../../../types';
-import {
-  IExecutionLog,
-  executionLogSortableColumns,
-  ExecutionLogSortFields,
-} from '../../../../../../alerting/common';
 import {
   ComponentOpts as RuleApis,
   withBulkRuleOperations,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx
index f973815dbd586..a33bdf7e25916 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.test.tsx
@@ -14,7 +14,7 @@ import {
   DEFAULT_DATE_FORMAT,
 } from './rule_event_log_list_cell_renderer';
 import { RuleEventLogListStatus } from './rule_event_log_list_status';
-import { RuleDurationFormat } from '../../../sections/rules_list/components/rule_duration_format';
+import { RuleDurationFormat } from '../../rules_list/components/rule_duration_format';
 
 describe('rule_event_log_list_cell_renderer', () => {
   it('renders primitive values correctly', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx
index 15765f7414616..20e9274f2d73e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_cell_renderer.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import moment from 'moment';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
 import { RuleEventLogListStatus } from './rule_event_log_list_status';
-import { RuleDurationFormat } from '../../../sections/rules_list/components/rule_duration_format';
+import { RuleDurationFormat } from '../../rules_list/components/rule_duration_format';
 import {
   RULE_EXECUTION_LOG_COLUMN_IDS,
   RULE_EXECUTION_LOG_DURATION_COLUMNS,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx
index 07cd2b325e458..fd28f62bda0cd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiIcon } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
 
 interface RuleEventLogListStatusProps {
   status: EcsEventOutcome;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx
index 0d8bafce130f3..c283dda11ada2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_event_log_list_status_filter.tsx
@@ -9,7 +9,7 @@ import React, { useState, useCallback } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFilterButton, EuiPopover, EuiFilterGroup, EuiFilterSelectItem } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EcsEventOutcome } from 'kibana/server';
+import { EcsEventOutcome } from '@kbn/core/server';
 import { RuleEventLogListStatus } from './rule_event_log_list_status';
 
 const statusFilters: EcsEventOutcome[] = ['success', 'failure', 'unknown'];
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx
index d27522e74b6fb..34af31146eb0d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.test.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import uuid from 'uuid';
 import { shallow } from 'enzyme';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import { RuleRoute, getRuleSummary } from './rule_route';
 import { Rule, RuleSummary, RuleType } from '../../../../types';
 import { CenterJustifiedSpinner } from '../../../components/center_justified_spinner';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx
index 3e11f987138d2..7b72f34d05bac 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_route.tsx
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ToastsApi } from 'kibana/public';
+import { ToastsApi } from '@kbn/core/public';
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { Rule, RuleSummary, RuleType } from '../../../../types';
 import {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx
index 096e3bcf111b9..3f4375aad9ac6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/view_in_app.tsx
@@ -8,7 +8,7 @@
 import React, { useState, useEffect } from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { fromNullable, fold } from 'fp-ts/lib/Option';
 import { pipe } from 'fp-ts/lib/pipeable';
 
@@ -16,7 +16,7 @@ import {
   RuleNavigation,
   RuleStateNavigation,
   RuleUrlNavigation,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { Rule } from '../../../../types';
 import { useKibana } from '../../../../common/lib/kibana';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts
index dcdc6c6431755..96c76cd688e48 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/get_initial_interval.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { parseDuration } from '@kbn/alerting-plugin/common';
 import { DEFAULT_RULE_INTERVAL } from '../../constants';
-import { parseDuration } from '../../../../../alerting/common';
 
 export function getInitialInterval(minimumScheduleInterval?: string) {
   if (minimumScheduleInterval) {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx
index 9c9d2da8f6545..a2bd5cc7b3714 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.test.tsx
@@ -11,7 +11,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFormLabel } from '@elastic/eui';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import RuleAdd from './rule_add';
 import { createRule } from '../../lib/rule_api';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
@@ -25,7 +25,7 @@ import {
 } from '../../../types';
 import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { ReactWrapper } from 'enzyme';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../common/lib/kibana';
 import { triggersActionsUiConfig } from '../../../common/lib/config_api';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx
index 94acf30ece4ea..2885d34013402 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_conditions.tsx
@@ -9,7 +9,7 @@ import React, { PropsWithChildren } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiFlexItem, EuiText, EuiFlexGroup, EuiTitle, EuiButtonEmpty } from '@elastic/eui';
 import { partition } from 'lodash';
-import { ActionGroup, getBuiltinActionGroups } from '../../../../../alerting/common';
+import { ActionGroup, getBuiltinActionGroups } from '@kbn/alerting-plugin/common';
 
 const BUILT_IN_ACTION_GROUPS: Set<string> = new Set(getBuiltinActionGroups().map(({ id }) => id));
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx
index 9183ac6163b60..39214c8e8b214 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.test.tsx
@@ -8,7 +8,7 @@
 import * as React from 'react';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
 import {
   ValidationResult,
@@ -20,7 +20,7 @@ import { ruleTypeRegistryMock } from '../../rule_type_registry.mock';
 import { ReactWrapper } from 'enzyme';
 import RuleEdit from './rule_edit';
 import { useKibana } from '../../../common/lib/kibana';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 jest.mock('../../../common/lib/kibana');
 const actionTypeRegistry = actionTypeRegistryMock.create();
 const ruleTypeRegistry = ruleTypeRegistryMock.create();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts
index 7637eb010867b..73769d8d9af10 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_errors.ts
@@ -6,7 +6,7 @@
  */
 import { isObject } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { formatDuration, parseDuration } from '../../../../../alerting/common/parse_duration';
+import { formatDuration, parseDuration } from '@kbn/alerting-plugin/common/parse_duration';
 import {
   RuleTypeModel,
   Rule,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
index e14a9fcc21c4d..f64a3c011187a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.test.tsx
@@ -19,8 +19,8 @@ import {
   GenericValidationResult,
 } from '../../../types';
 import { RuleForm } from './rule_form';
-import { coreMock } from 'src/core/public/mocks';
-import { ALERTS_FEATURE_ID, RecoveredActionGroup } from '../../../../../alerting/common';
+import { coreMock } from '@kbn/core/public/mocks';
+import { ALERTS_FEATURE_ID, RecoveredActionGroup } from '@kbn/alerting-plugin/common';
 import { useKibana } from '../../../common/lib/kibana';
 
 const actionTypeRegistry = actionTypeRegistryMock.create();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
index 909fcfa2fb9e5..80923617da064 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
@@ -36,13 +36,19 @@ import {
   EuiCallOut,
 } from '@elastic/eui';
 import { capitalize } from 'lodash';
-import { KibanaFeature } from '../../../../../features/public';
+import { KibanaFeature } from '@kbn/features-plugin/public';
 import {
   formatDuration,
   getDurationNumberInItsUnit,
   getDurationUnitValue,
   parseDuration,
-} from '../../../../../alerting/common/parse_duration';
+} from '@kbn/alerting-plugin/common/parse_duration';
+import {
+  RuleActionParam,
+  ALERTS_FEATURE_ID,
+  RecoveredActionGroup,
+  isActionGroupDisabledForActionTypeId,
+} from '@kbn/alerting-plugin/common';
 import { RuleReducerAction, InitialRule } from './rule_reducer';
 import {
   RuleTypeModel,
@@ -56,12 +62,6 @@ import {
 } from '../../../types';
 import { getTimeOptions } from '../../../common/lib/get_time_options';
 import { ActionForm } from '../action_connector_form';
-import {
-  RuleActionParam,
-  ALERTS_FEATURE_ID,
-  RecoveredActionGroup,
-  isActionGroupDisabledForActionTypeId,
-} from '../../../../../alerting/common';
 import { hasAllPrivilege, hasShowActionsCapability } from '../../lib/capabilities';
 import { SolutionFilter } from './solution_filter';
 import './rule_form.scss';
@@ -120,6 +120,7 @@ export const RuleForm = ({
     charts,
     data,
     unifiedSearch,
+    dataViews,
   } = useKibana().services;
   const canShowActions = hasShowActionsCapability(capabilities);
 
@@ -524,6 +525,7 @@ export const RuleForm = ({
               metadata={metadata}
               charts={charts}
               data={data}
+              dataViews={dataViews}
               unifiedSearch={unifiedSearch}
             />
           </Suspense>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx
index 4098614c1a906..f092475b18e08 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_notify_when.test.tsx
@@ -10,7 +10,7 @@ import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { Rule } from '../../../types';
-import { ALERTS_FEATURE_ID } from '../../../../../alerting/common';
+import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import { RuleNotifyWhen } from './rule_notify_when';
 
 describe('rule_notify_when', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts
index 1e1a1a5b64462..7f9950ddd5d0c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectAttribute } from 'kibana/public';
+import { SavedObjectAttribute } from '@kbn/core/public';
 import { isEqual } from 'lodash';
 import { Reducer } from 'react';
-import { RuleActionParam, IntervalSchedule } from '../../../../../alerting/common';
+import { RuleActionParam, IntervalSchedule } from '@kbn/alerting-plugin/common';
 import { Rule, RuleAction } from '../../../types';
 
 export type InitialRule = Partial<Rule> &
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx
index 65a4654b6ac29..cbb1a7f5455da 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rule_status_filter.tsx
@@ -14,10 +14,7 @@ import {
   EuiFilterSelectItem,
   EuiHealth,
 } from '@elastic/eui';
-import {
-  RuleExecutionStatuses,
-  RuleExecutionStatusValues,
-} from '../../../../../../alerting/common';
+import { RuleExecutionStatuses, RuleExecutionStatusValues } from '@kbn/alerting-plugin/common';
 import { rulesStatusesTranslationsMapping } from '../translations';
 
 interface RuleStatusFilterProps {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx
index 7a73919b4dfec..f87cee4c6547f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.test.tsx
@@ -18,7 +18,7 @@ import {
   RuleExecutionStatusWarningReasons,
   ALERTS_FEATURE_ID,
   parseDuration,
-} from '../../../../../../alerting/common';
+} from '@kbn/alerting-plugin/common';
 import { getFormattedDuration, getFormattedMilliseconds } from '../../../lib/monitoring_utils';
 
 import { useKibana } from '../../../../common/lib/kibana';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
index fa74c957d35e4..73dc8e8e8c2cd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
@@ -46,6 +46,15 @@ import { EuiSelectableOptionCheckedType } from '@elastic/eui/src/components/sele
 import { useHistory } from 'react-router-dom';
 
 import { isEmpty } from 'lodash';
+import {
+  RuleExecutionStatus,
+  RuleExecutionStatusValues,
+  ALERTS_FEATURE_ID,
+  RuleExecutionStatusErrorReasons,
+  formatDuration,
+  parseDuration,
+  MONITORING_HISTORY_LIMIT,
+} from '@kbn/alerting-plugin/common';
 import {
   ActionType,
   Rule,
@@ -78,15 +87,6 @@ import { hasAllPrivilege, hasExecuteActionsCapability } from '../../../lib/capab
 import { routeToRuleDetails, DEFAULT_SEARCH_PAGE_SIZE } from '../../../constants';
 import { DeleteModalConfirmation } from '../../../components/delete_modal_confirmation';
 import { EmptyPrompt } from '../../../components/prompts/empty_prompt';
-import {
-  RuleExecutionStatus,
-  RuleExecutionStatusValues,
-  ALERTS_FEATURE_ID,
-  RuleExecutionStatusErrorReasons,
-  formatDuration,
-  parseDuration,
-  MONITORING_HISTORY_LIMIT,
-} from '../../../../../../alerting/common';
 import { rulesStatusesTranslationsMapping, ALERT_STATUS_LICENSE_ERROR } from '../translations';
 import { useKibana } from '../../../../common/lib/kibana';
 import { DEFAULT_HIDDEN_ACTION_TYPES } from '../../../../common/constants';
@@ -832,8 +832,8 @@ export const RulesList: React.FunctionComponent = () => {
       {
         field: 'enabled',
         name: i18n.translate(
-          'xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.triggerActionsTitle',
-          { defaultMessage: 'Trigger actions' }
+          'xpack.triggersActionsUI.sections.rulesList.rulesListTable.columns.stateTitle',
+          { defaultMessage: 'State' }
         ),
         sortable: true,
         truncateText: false,
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts
index b05c3f51de4ab..29f2317fc6fcc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { uniq } from 'lodash';
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { loadIndexPatterns, getMatchingIndices, getESIndexFields } from '../lib/data_apis';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts
index 28563730c3db7..765c6b2b7b12e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { triggersActionsUiConfig } from './config_api';
 
 describe('triggersActionsUiConfig', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts
index fe9f921fc7f88..ceeae9271b5ba 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/config_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_TRIGGERS_ACTIONS_UI_API_PATH } from '../../../common';
 import { TriggersActionsUiConfig } from '../../types';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts
index 92908dbe4c4c7..9b0d122e24d4e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.test.ts
@@ -11,7 +11,7 @@ import {
   getMatchingIndices,
   getESIndexFields,
 } from './data_apis';
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 const mockFind = jest.fn();
 const perPage = 1000;
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts
index 7ccf3bf71bec7..55b1ef4be2c74 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 
 const DATA_API_ROOT = '/api/triggers_actions_ui/data';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts
index 42a47068a7a65..6454f726e934b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from 'src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { triggersActionsUiHealth } from './health_api';
 
 describe('triggersActionsUiHealth', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts
index 55db8164bae14..24a7324262316 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/health_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'kibana/public';
+import { HttpSetup } from '@kbn/core/public';
 import { BASE_TRIGGERS_ACTIONS_UI_API_PATH } from '../../../common';
 
 interface TriggersActionsUiHealth {
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts
index ea89e33bf856d..6772eacc2aaed 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/__mocks__/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
-import { notificationServiceMock } from '../../../../../../../../src/core/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import {
   createKibanaContextProviderMock,
   createStartServicesMock,
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
index 97679041b94c8..44e93f1f56ccc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
@@ -6,15 +6,12 @@
  */
 
 import React from 'react';
-import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { unifiedSearchPluginMock } from '../../../../../../../src/plugins/unified_search/public/mocks';
-import {
-  coreMock,
-  scopedHistoryMock,
-  themeServiceMock,
-} from '../../../../../../../src/core/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { TriggersAndActionsUiServices } from '../../../application/app';
 import { RuleTypeRegistryContract, ActionTypeRegistryContract } from '../../../types';
 
@@ -38,6 +35,7 @@ export const createStartServicesMock = (): TriggersAndActionsUiServices => {
     history: scopedHistoryMock.create(),
     setBreadcrumbs: jest.fn(),
     data: dataPluginMock.createStartContract(),
+    dataViews: dataViewPluginMocks.createStartContract(),
     unifiedSearch: unifiedSearchPluginMock.createStartContract(),
     actionTypeRegistry: {
       has: jest.fn(),
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts
index d64b57b4b9127..9a9553351a90e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.ts
@@ -12,7 +12,7 @@ import {
   useUiSetting,
   useUiSetting$,
   withKibana,
-} from '../../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 import { TriggersAndActionsUiServices } from '../../../application/app';
 
 export type KibanaContext = KibanaReactContextValue<TriggersAndActionsUiServices>;
diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
index d68383aaa2018..f72ed095efdcc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -9,7 +9,7 @@
 /* eslint-disable @kbn/eslint/no_export_all */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { Plugin } from './plugin';
 
 export type {
@@ -64,4 +64,4 @@ export { loadActionTypes } from './application/lib/action_connector_api/connecto
 
 export type { TIME_UNITS } from './application/constants';
 export { getTimeUnitLabel } from './common/lib/get_time_unit_label';
-export type { TriggersAndActionsUiServices } from '../public/application/app';
+export type { TriggersAndActionsUiServices } from './application/app';
diff --git a/x-pack/plugins/triggers_actions_ui/public/plugin.ts b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
index 7588af0195006..9684808a623d5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@@ -5,28 +5,24 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart, Plugin as CorePlugin } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin as CorePlugin } from '@kbn/core/public';
 
 import { i18n } from '@kbn/i18n';
 import { ReactElement } from 'react';
-import { PluginInitializerContext } from 'kibana/public';
-import { FeaturesPluginStart } from '../../features/public';
-import { KibanaFeature } from '../../features/common';
+import { PluginInitializerContext } from '@kbn/core/public';
+import { FeaturesPluginStart } from '@kbn/features-plugin/public';
+import { KibanaFeature } from '@kbn/features-plugin/common';
+import { ManagementAppMountParams, ManagementSetup } from '@kbn/management-plugin/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { registerBuiltInActionTypes } from './application/components/builtin_action_types';
 import { TypeRegistry } from './application/type_registry';
-import {
-  ManagementAppMountParams,
-  ManagementSetup,
-} from '../../../../src/plugins/management/public';
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../src/plugins/home/public';
-import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
-import { PluginStartContract as AlertingStart } from '../../alerting/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import type { SpacesPluginStart } from '../../spaces/public';
 
 import { getAddConnectorFlyoutLazy } from './common/get_add_connector_flyout';
 import { getEditConnectorFlyoutLazy } from './common/get_edit_connector_flyout';
@@ -49,7 +45,6 @@ import type {
   AlertsTableProps,
 } from './types';
 import { TriggersActionsUiConfigType } from '../common/types';
-import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 
 export interface TriggersAndActionsUIPublicPluginSetup {
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
@@ -82,6 +77,7 @@ interface PluginsSetup {
 
 interface PluginsStart {
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   charts: ChartsPluginStart;
   alerting?: AlertingStart;
   spaces?: SpacesPluginStart;
@@ -135,7 +131,7 @@ export class Plugin
         icon: 'watchesApp',
         path: '/app/management/insightsAndAlerting/triggersActions',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.ADMIN,
+        category: 'admin',
       });
     }
 
@@ -165,6 +161,7 @@ export class Plugin
         return renderApp({
           ...coreStart,
           data: pluginsStart.data,
+          dataViews: pluginsStart.dataViews,
           charts: pluginsStart.charts,
           alerting: pluginsStart.alerting,
           spaces: pluginsStart.spaces,
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index f4bda5bb2a2d0..590ddbd7a685b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -6,11 +6,12 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import type { DocLinksStart } from 'kibana/public';
+import type { DocLinksStart } from '@kbn/core/public';
 import type { ComponentType } from 'react';
-import type { ChartsPluginSetup } from 'src/plugins/charts/public';
-import type { DataPublicPluginStart } from 'src/plugins/data/public';
-import type { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
+import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { IconType } from '@elastic/eui';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 import {
@@ -25,8 +26,7 @@ import {
   ALERT_HISTORY_PREFIX,
   AlertHistoryDefaultIndexName,
   AsApiContract,
-} from '../../actions/common';
-import { TypeRegistry } from './application/type_registry';
+} from '@kbn/actions-plugin/common';
 import {
   ActionGroup,
   RuleActionParam,
@@ -44,8 +44,9 @@ import {
   RuleTypeParams,
   ActionVariable,
   RuleType as CommonRuleType,
-} from '../../alerting/common';
-import { RuleRegistrySearchRequestPagination } from '../../rule_registry/common';
+} from '@kbn/alerting-plugin/common';
+import { RuleRegistrySearchRequestPagination } from '@kbn/rule-registry-plugin/common';
+import { TypeRegistry } from './application/type_registry';
 
 // In Triggers and Actions we treat all `Alert`s as `SanitizedRule<RuleTypeParams>`
 // so the `Params` is a black-box of Record<string, unknown>
@@ -282,6 +283,7 @@ export interface RuleTypeParamsExpressionProps<
   metadata?: MetaData;
   charts: ChartsPluginSetup;
   data: DataPublicPluginStart;
+  dataViews: DataViewsPublicPluginStart;
   unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
diff --git a/x-pack/plugins/triggers_actions_ui/server/config.ts b/x-pack/plugins/triggers_actions_ui/server/config.ts
index 46593fff21340..ec4196d184310 100644
--- a/x-pack/plugins/triggers_actions_ui/server/config.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/config.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 
 import {
   ExperimentalFeatures,
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/index.ts b/x-pack/plugins/triggers_actions_ui/server/data/index.ts
index 1f6f39a57cbc8..c65f44162ecd7 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Logger, IRouter } from '../../../../../src/core/server';
+import { Logger, IRouter } from '@kbn/core/server';
 import { timeSeriesQuery } from './lib/time_series_query';
 import { registerRoutes } from './routes';
 
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts
index 8df735e37e074..9909297da1063 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.test.ts
@@ -10,7 +10,7 @@
 import { ObjectType } from '@kbn/config-schema';
 import type { Writable } from '@kbn/utility-types';
 import { CoreQueryParams } from './core_query_types';
-import { MAX_GROUPS } from '../index';
+import { MAX_GROUPS } from '..';
 
 const DefaultParams: Writable<Partial<CoreQueryParams>> = {
   index: 'index-name',
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts
index 91085f80fe814..605a06ab7ab5e 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/core_query_types.ts
@@ -10,7 +10,7 @@
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { MAX_GROUPS } from '../index';
+import { MAX_GROUPS } from '..';
 
 export const CoreQueryParamsSchemaProperties = {
   // name of the indices to search
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts
index 116abffc2ca2c..c37945513533e 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/date_range_info.ts
@@ -7,8 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { times } from 'lodash';
-import { parseDuration } from '../../../../alerting/server';
-import { MAX_INTERVALS } from '../index';
+import { parseDuration } from '@kbn/alerting-plugin/server';
+import { MAX_INTERVALS } from '..';
 
 // dates as numbers are epoch millis
 // dates as strings are ISO
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts
index c27d14b70c33f..dc037dde8f499 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.test.ts
@@ -8,10 +8,10 @@
 // test error conditions of calling timeSeriesQuery - postive results tested in FT
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
-import { Logger } from '../../../../../../src/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { Logger } from '@kbn/core/server';
 import { TimeSeriesQuery, timeSeriesQuery, getResultFromEs } from './time_series_query';
-import { alertsMock } from '../../../../alerting/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 
 const DefaultQueryParams: TimeSeriesQuery = {
   index: 'index-name',
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
index 3ea0958b1f27d..6f5ebbe34a891 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
@@ -6,10 +6,10 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Logger } from 'kibana/server';
-import type { ElasticsearchClient } from 'src/core/server';
-import { getEsErrorMessage } from '../../../../alerting/server';
-import { DEFAULT_GROUPS } from '../index';
+import { Logger } from '@kbn/core/server';
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { getEsErrorMessage } from '@kbn/alerting-plugin/server';
+import { DEFAULT_GROUPS } from '..';
 import { getDateRangeInfo } from './date_range_info';
 
 import { TimeSeriesQuery, TimeSeriesResult, TimeSeriesResultRow } from './time_series_types';
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts
index 125bdaa487fd2..d59d99c59419f 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_types.ts
@@ -11,8 +11,8 @@
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 
-import { parseDuration } from '../../../../alerting/server';
-import { MAX_INTERVALS } from '../index';
+import { parseDuration } from '@kbn/alerting-plugin/server';
+import { MAX_INTERVALS } from '..';
 import { CoreQueryParamsSchemaProperties, validateCoreQueryBody } from './core_query_types';
 import {
   getTooManyIntervalsErrorMessage,
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
index c28e6200ba6a9..3cd8d8e81e252 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
@@ -13,8 +13,8 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
   ElasticsearchClient,
-} from 'kibana/server';
-import { Logger } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 
 const bodySchema = schema.object({
   indexPatterns: schema.arrayOf(schema.string()),
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts
index 59cfa62e5985b..a21b2617325c3 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
+import { IRouter } from '@kbn/core/server';
 import { createTimeSeriesQueryRoute } from './time_series_query';
 import { createFieldsRoute } from './fields';
 import { createIndicesRoute } from './indices';
-import { IRouter } from '../../../../../../src/core/server';
 import { getService } from '..';
 
 interface RegisterRoutesParams {
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
index ec19379cfa4ba..b32c80aa6f0b4 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
@@ -18,8 +18,8 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
   ElasticsearchClient,
-} from 'kibana/server';
-import { Logger } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 
 const bodySchema = schema.object({
   pattern: schema.string(),
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
index 05203d9076e22..1273351795f87 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
@@ -11,8 +11,8 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { Logger } from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 import { TimeSeriesQueryParameters } from '../lib/time_series_query';
 import { TimeSeriesQuery, TimeSeriesQuerySchema, TimeSeriesResult } from '../lib/time_series_types';
 export type { TimeSeriesQuery, TimeSeriesResult } from '../lib/time_series_types';
diff --git a/x-pack/plugins/triggers_actions_ui/server/index.ts b/x-pack/plugins/triggers_actions_ui/server/index.ts
index 800eacedab8f3..5b81caa235a29 100644
--- a/x-pack/plugins/triggers_actions_ui/server/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { configSchema, ConfigSchema } from './config';
 import { TriggersActionsPlugin } from './plugin';
 
diff --git a/x-pack/plugins/triggers_actions_ui/server/plugin.ts b/x-pack/plugins/triggers_actions_ui/server/plugin.ts
index c33ce21777782..77ea47ceaa2c3 100644
--- a/x-pack/plugins/triggers_actions_ui/server/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Logger, Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { PluginSetupContract as AlertingPluginSetup } from '../../alerting/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../encrypted_saved_objects/server';
+import { Logger, Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { getService, register as registerDataService } from './data';
 import { createHealthRoute, createConfigRoute } from './routes';
 import { BASE_TRIGGERS_ACTIONS_UI_API_PATH } from '../common';
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts b/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts
index b7e0f15623e81..9c27db6135079 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/config.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock, httpServerMock, loggingSystemMock } from 'src/core/server/mocks';
+import { httpServiceMock, httpServerMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { createConfigRoute } from './config';
 
 describe('createConfigRoute', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/config.ts b/x-pack/plugins/triggers_actions_ui/server/routes/config.ts
index e7c880b35d29a..bf8445a736b78 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/config.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/config.ts
@@ -11,9 +11,9 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { Logger } from '../../../../../src/core/server';
-import { AlertingRulesConfig } from '../../../alerting/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
+import { AlertingRulesConfig } from '@kbn/alerting-plugin/server';
 
 export function createConfigRoute(
   logger: Logger,
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/health.ts b/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
index 509ec34de16ae..1ea2ce9eb04be 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
@@ -11,8 +11,8 @@ import {
   KibanaRequest,
   IKibanaResponse,
   KibanaResponseFactory,
-} from 'kibana/server';
-import { Logger } from '../../../../../src/core/server';
+} from '@kbn/core/server';
+import { Logger } from '@kbn/core/server';
 
 export function createHealthRoute(
   logger: Logger,
diff --git a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
index 41846f1f71ad6..5418f4a8f55d5 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { canInheritTimeRange } from './can_inherit_time_range';
-import { HelloWorldContainer } from '../../../../src/plugins/embeddable/public/lib/test_samples';
-import { HelloWorldEmbeddable } from '../../../../src/plugins/embeddable/public/tests/fixtures';
+import { HelloWorldContainer } from '@kbn/embeddable-plugin/public/lib/test_samples';
+import { HelloWorldEmbeddable } from '@kbn/embeddable-plugin/public/tests/fixtures';
 import { TimeRangeEmbeddable, TimeRangeContainer } from './test_helpers';
 
 test('canInheritTimeRange returns false if embeddable is inside container without a time range', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts
index 19b43ee2fc6be..9a1f089c08302 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Embeddable, IContainer, ContainerInput } from '../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+import { Embeddable, IContainer, ContainerInput } from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 
 interface ContainerTimeRangeInput extends ContainerInput<TimeRangeInput> {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
index 782d7b92588c7..8b5a5c7e6fdde 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
@@ -16,7 +16,7 @@ import {
   urlDrilldownActionFactory,
 } from './test_data';
 import { ActionFactory, BaseActionFactoryContext } from '../../dynamic_actions';
-import { licensingMock } from '../../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { SerializableRecord } from '@kbn/utility-types';
 
 test('Pick and configure action', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
index 94fc3de891a75..4d713f2a700c6 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
@@ -23,6 +23,7 @@ import {
   EuiBetaBadge,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 import {
   txtBetaActionFactoryLabel,
   txtBetaActionFactoryTooltip,
@@ -33,7 +34,6 @@ import {
 } from './i18n';
 import './action_wizard.scss';
 import { ActionFactory, BaseActionConfig, BaseActionFactoryContext } from '../../dynamic_actions';
-import { Trigger } from '../../../../../../src/plugins/ui_actions/public';
 
 export interface ActionWizardProps<
   ActionFactoryContext extends BaseActionFactoryContext = BaseActionFactoryContext
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
index e43fc6ad9a1ba..aded7a306a767 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
@@ -7,20 +7,17 @@
 
 import React, { useState } from 'react';
 import { EuiFieldText, EuiFormRow, EuiSelect, EuiSwitch } from '@elastic/eui';
-import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/public';
-import { ActionWizard } from './action_wizard';
-import { ActionFactory, ActionFactoryDefinition, BaseActionConfig } from '../../dynamic_actions';
-import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
-import { licensingMock } from '../../../../licensing/public/mocks';
+import { reactToUiComponent } from '@kbn/kibana-react-plugin/public';
+import { CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import {
   Trigger,
   UiActionsActionDefinition as ActionDefinition,
-} from '../../../../../../src/plugins/ui_actions/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../../../src/plugins/data/public';
-import {
-  SELECT_RANGE_TRIGGER,
-  VALUE_CLICK_TRIGGER,
-} from '../../../../../../src/plugins/embeddable/public';
+} from '@kbn/ui-actions-plugin/public';
+import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
+import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER } from '@kbn/embeddable-plugin/public';
+import { ActionFactory, ActionFactoryDefinition, BaseActionConfig } from '../../dynamic_actions';
+import { ActionWizard } from './action_wizard';
 
 export const dashboards = [
   { id: 'dashboard1', title: 'Dashboard 1' },
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx
index 7d9232dc793ef..76d686b14f869 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/presentable_picker/presentable_picker_item.tsx
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import { EuiFlexItem, EuiIcon, EuiKeyPadMenuItem, EuiToolTip } from '@elastic/eui';
+import { UiActionsPresentable as Presentable } from '@kbn/ui-actions-plugin/public';
 import {
   txtBetaActionFactoryLabel,
   txtBetaActionFactoryTooltip,
   txtInsufficientLicenseLevel,
 } from './i18n';
-import { UiActionsPresentable as Presentable } from '../../../../../../src/plugins/ui_actions/public';
 
 import './styles.scss';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
index 663161f5ebd2d..e1c6a1aa095e2 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
@@ -12,12 +12,12 @@ import { mount } from 'enzyme';
 
 import { TimeRangeEmbeddable, TimeRangeContainer, TIME_RANGE_EMBEDDABLE } from './test_helpers';
 import { CustomTimeRangeAction } from './custom_time_range_action';
-import { HelloWorldContainer } from '../../../../src/plugins/embeddable/public/lib/test_samples';
+import { HelloWorldContainer } from '@kbn/embeddable-plugin/public/lib/test_samples';
 
 import {
   HelloWorldEmbeddable,
   HELLO_WORLD_EMBEDDABLE,
-} from '../../../../src/plugins/embeddable/public/tests/fixtures';
+} from '@kbn/embeddable-plugin/public/tests/fixtures';
 
 import { nextTick } from '@kbn/test-jest-helpers';
 import { ReactElement } from 'react';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
index f0ec601a0cc2f..58b30c0f2927b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.tsx
@@ -12,9 +12,9 @@ import {
   Embeddable,
   EmbeddableInput,
   EmbeddableOutput,
-} from 'src/plugins/embeddable/public';
-import { Action, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { OpenModal, CommonlyUsedRange } from './types';
 
 export const CUSTOM_TIME_RANGE = 'CUSTOM_TIME_RANGE';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx
index 0e6217d360fa5..8f834b439b55b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { PrettyDuration } from '@elastic/eui';
-import { IEmbeddable, Embeddable, EmbeddableInput } from 'src/plugins/embeddable/public';
-import { Action, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+import { IEmbeddable, Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { doesInheritTimeRange } from './does_inherit_time_range';
 import { OpenModal, CommonlyUsedRange } from './types';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx
index aa91d862b6bd5..9dc7bd017740c 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CustomizeTimeRangeModal } from './customize_time_range_modal';
-import { Embeddable } from '../../../../src/plugins/embeddable/public';
+import { Embeddable } from '@kbn/embeddable-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 
 test("Doesn't display refresh interval options", () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx
index 4baf2c5f280f3..f253e2f3de059 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/customize_time_range_modal.tsx
@@ -20,8 +20,8 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Embeddable, IContainer, ContainerInput } from '../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
+import { Embeddable, IContainer, ContainerInput } from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 import { doesInheritTimeRange } from './does_inherit_time_range';
 import { CommonlyUsedRange } from './types';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts b/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts
index 4b921b0b222ea..58fe86c117f0c 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/does_inherit_time_range.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Embeddable, IContainer, ContainerInput } from '../../../../src/plugins/embeddable/public';
+import { Embeddable, IContainer, ContainerInput } from '@kbn/embeddable-plugin/public';
 import { TimeRangeInput } from './custom_time_range_action';
 
 export function doesInheritTimeRange(embeddable: Embeddable<TimeRangeInput>) {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
index 1dd805342d507..4d64f02d2c14b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
+import { LicenseType } from '@kbn/licensing-plugin/public';
+import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import {
   ActionFactoryDefinition,
   BaseActionConfig,
   BaseActionFactoryContext,
   SerializedEvent,
 } from '../dynamic_actions';
-import { LicenseType } from '../../../licensing/public';
-import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
-import { PersistableStateDefinition } from '../../../../../src/plugins/kibana_utils/common';
 
 /**
  * This is a convenience interface to register a drilldown. Drilldown has
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx
index f341c6b1f27fd..87a32e7198e53 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/drilldown_hello_bar/drilldown_hello_bar.stories.tsx
@@ -7,7 +7,7 @@
 
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
-import { DrilldownHelloBar } from './index';
+import { DrilldownHelloBar } from '.';
 
 const Demo = () => {
   const [show, setShow] = React.useState(true);
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx
index a5cd66d6a7b3b..9c4d98ebdf44e 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.stories.tsx
@@ -10,7 +10,7 @@
 import * as React from 'react';
 import { EuiFlyout, EuiButton } from '@elastic/eui';
 import { storiesOf } from '@storybook/react';
-import { FlyoutFrame } from './index';
+import { FlyoutFrame } from '.';
 
 storiesOf('components/FlyoutFrame', module)
   .add('default', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx
index 11ee764ea87b6..f3cfe38910588 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/components/flyout_frame/flyout_frame.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { render as renderTestingLibrary, fireEvent } from '@testing-library/react';
-import { FlyoutFrame } from './index';
+import { FlyoutFrame } from '.';
 
 describe('<FlyoutFrame>', () => {
   test('renders without crashing', () => {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx
index 1ee194fd13107..6e6cd30f65116 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.test.tsx
@@ -10,9 +10,9 @@ import { DrilldownManagerState, DrilldownManagerStateDeps } from './drilldown_ma
 import { DynamicActionManager } from '../../../dynamic_actions/dynamic_action_manager';
 import { uiActionsEnhancedPluginMock } from '../../../mocks';
 import { AdvancedUiActionsStart } from '../../..';
-import { Trigger } from 'src/plugins/ui_actions/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { notificationServiceMock } from 'src/core/public/mocks';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { notificationServiceMock } from '@kbn/core/public/mocks';
 import { DrilldownState } from './drilldown_state';
 
 class StorageWrapperMock implements IStorageWrapper {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts
index 78944a1712728..59a2e5598fe87 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { ToastsStart } from 'kibana/public';
-import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
-import { Trigger } from '../../../../../../src/plugins/ui_actions/public';
+import { ToastsStart } from '@kbn/core/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { Trigger } from '@kbn/ui-actions-plugin/public';
 import {
   ActionFactory,
   BaseActionFactoryContext,
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx
index 06851b9112c95..6556a8146a135 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/url_drilldown_collect_config/url_drilldown_collect_config.tsx
@@ -16,6 +16,7 @@ import {
   EuiTextColor,
 } from '@elastic/eui';
 import { monaco } from '@kbn/monaco';
+import { UrlTemplateEditor, UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import { UrlDrilldownConfig } from '../../types';
 import './index.scss';
 import {
@@ -27,10 +28,6 @@ import {
   txtUrlTemplateEncodeDescription,
 } from './i18n';
 import { VariablePopover } from '../variable_popover';
-import {
-  UrlTemplateEditor,
-  UrlTemplateEditorVariable,
-} from '../../../../../../../../src/plugins/kibana_react/public';
 
 export interface UrlDrilldownCollectConfigProps {
   config: UrlDrilldownConfig;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx
index a0c1b2ad24b11..963ed7aeb2484 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/components/variable_popover/index.tsx
@@ -16,12 +16,12 @@ import {
   EuiText,
   EuiSelectableOption,
 } from '@elastic/eui';
+import { UrlTemplateEditorVariable } from '@kbn/kibana-react-plugin/public';
 import {
   txtAddVariableButtonTitle,
   txtUrlTemplateVariablesHelpLinkText,
   txtUrlTemplateVariablesFilterPlaceholderText,
 } from './i18n';
-import { UrlTemplateEditorVariable } from '../../../../../../../../src/plugins/kibana_react/public';
 
 export interface Props {
   variables: UrlTemplateEditorVariable[];
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts
index fc4ce4c3d9625..479268e948b27 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/handlebars.ts
@@ -10,7 +10,7 @@ import { encode, RisonValue } from 'rison-node';
 import dateMath from '@kbn/datemath';
 import moment, { Moment } from 'moment';
 import numeral from '@elastic/numeral';
-import { url } from '../../../../../../src/plugins/kibana_utils/public';
+import { url } from '@kbn/kibana-utils-plugin/public';
 
 const handlebars = createHandlebars();
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts
index f8e119719fb86..da584f68edfaa 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/url_drilldown/url_drilldown_global_scope.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/public';
+import { CoreSetup } from '@kbn/core/public';
 import { UrlDrilldownGlobalScope } from './types';
 
 interface UrlDrilldownGlobalScopeDeps {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
index d82373aee1ae0..9d03e00514e24 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
@@ -7,8 +7,8 @@
 
 import { ActionFactory } from './action_factory';
 import { ActionFactoryDefinition } from './action_factory_definition';
-import { licensingMock } from '../../../licensing/public/mocks';
-import { PublicLicense } from '../../../licensing/public';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { PublicLicense } from '@kbn/licensing-plugin/public';
 
 const def: ActionFactoryDefinition = {
   id: 'ACTION_FACTORY_1',
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
index 21e053c3e5c36..436c2e7bf8e8a 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
@@ -5,28 +5,28 @@
  * 2.0.
  */
 
-import type { UiComponent, CollectConfigProps } from 'src/plugins/kibana_utils/public';
+import type { UiComponent, CollectConfigProps } from '@kbn/kibana-utils-plugin/public';
 import type {
   MigrateFunctionsObject,
   GetMigrationFunctionObjectFn,
-} from 'src/plugins/kibana_utils/common';
-import { uiToReactComponent } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-utils-plugin/common';
+import { uiToReactComponent } from '@kbn/kibana-react-plugin/public';
 import type {
   UiActionsPresentable as Presentable,
   ActionMenuItemProps,
-} from '../../../../../src/plugins/ui_actions/public';
-import type { ActionFactoryDefinition } from './action_factory_definition';
-import type { Configurable } from '../../../../../src/plugins/kibana_utils/public';
+} from '@kbn/ui-actions-plugin/public';
+import type { Configurable } from '@kbn/kibana-utils-plugin/public';
+import type { ILicense, LicensingPluginStart, LicenseType } from '@kbn/licensing-plugin/public';
+import type { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import type { SavedObjectReference } from '@kbn/core/types';
+import type { PersistableState } from '@kbn/kibana-utils-plugin/common';
 import type {
   BaseActionConfig,
   BaseActionFactoryContext,
   SerializedAction,
   SerializedEvent,
 } from './types';
-import type { ILicense, LicensingPluginStart, LicenseType } from '../../../licensing/public';
-import type { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
-import type { SavedObjectReference } from '../../../../../src/core/types';
-import type { PersistableState } from '../../../../../src/plugins/kibana_utils/common';
+import type { ActionFactoryDefinition } from './action_factory_definition';
 
 export interface ActionFactoryDeps {
   readonly getLicense?: () => ILicense;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
index db26abf8e1166..029933e3b28d3 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { Configurable } from '../../../../../src/plugins/kibana_utils/public';
+import { Configurable } from '@kbn/kibana-utils-plugin/public';
+import { LicenseType } from '@kbn/licensing-plugin/public';
+import {
+  UiActionsActionDefinition as ActionDefinition,
+  UiActionsPresentable as Presentable,
+} from '@kbn/ui-actions-plugin/public';
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 import {
   BaseActionConfig,
   BaseActionFactoryContext,
   SerializedAction,
   SerializedEvent,
 } from './types';
-import { LicenseType } from '../../../licensing/public';
-import {
-  UiActionsActionDefinition as ActionDefinition,
-  UiActionsPresentable as Presentable,
-} from '../../../../../src/plugins/ui_actions/public';
-import { PersistableStateDefinition } from '../../../../../src/plugins/kibana_utils/common';
 
 /**
  * This is a convenience interface for registering new action factories.
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts
index 6a2cd0eed348a..ad59d8929b265 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_enhancement.ts
@@ -6,9 +6,9 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { EnhancementRegistryDefinition } from '../../../../../src/plugins/embeddable/public';
-import { SavedObjectReference } from '../../../../../src/core/types';
-import { DynamicActionsState } from '../../../ui_actions_enhanced/public';
+import { EnhancementRegistryDefinition } from '@kbn/embeddable-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import { DynamicActionsState } from '..';
 import { UiActionsServiceEnhancements } from '../services';
 
 export const dynamicActionEnhancement = (
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts
index d13ef573396e7..8e94fead9a7d7 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_grouping.ts
@@ -6,8 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../../src/plugins/embeddable/public';
-import { UiActionsPresentableGrouping as PresentableGrouping } from '../../../../../src/plugins/ui_actions/public';
+import { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import { UiActionsPresentableGrouping as PresentableGrouping } from '@kbn/ui-actions-plugin/public';
 
 export const dynamicActionGrouping: PresentableGrouping<{
   embeddable?: IEmbeddable;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
index 64b8214fe4d4c..ab7d322c8576e 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
@@ -7,13 +7,13 @@
 
 import { DynamicActionManager } from './dynamic_action_manager';
 import { ActionStorage, MemoryActionStorage } from './dynamic_action_storage';
-import { UiActionsService } from '../../../../../src/plugins/ui_actions/public';
-import { ActionRegistry } from '../../../../../src/plugins/ui_actions/public/types';
-import { of } from '../../../../../src/plugins/kibana_utils';
+import { UiActionsService } from '@kbn/ui-actions-plugin/public';
+import { ActionRegistry } from '@kbn/ui-actions-plugin/public/types';
+import { of } from '@kbn/kibana-utils-plugin';
 import { UiActionsServiceEnhancements } from '../services';
 import { ActionFactoryDefinition } from './action_factory_definition';
 import { SerializedAction, SerializedEvent } from './types';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { dynamicActionGrouping } from './dynamic_action_grouping';
 
 const actionFactoryDefinition1: ActionFactoryDefinition = {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts
index 2deb0ab6edeb2..a2bbc0db953c5 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.ts
@@ -7,13 +7,10 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { Subscription } from 'rxjs';
+import { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { StateContainer, createStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { ActionStorage } from './dynamic_action_storage';
-import { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
 import { defaultState, transitions, selectors, State } from './dynamic_action_manager_state';
-import {
-  StateContainer,
-  createStateContainer,
-} from '../../../../../src/plugins/kibana_utils/common';
 import { StartContract } from '../plugin';
 import { SerializedAction, SerializedEvent } from './types';
 import { dynamicActionGrouping } from './dynamic_action_grouping';
diff --git a/x-pack/plugins/ui_actions_enhanced/public/index.ts b/x-pack/plugins/ui_actions_enhanced/public/index.ts
index 453a633e851af..0b327cd65ff09 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/index.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { AdvancedUiActionsPublicPlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/mocks.ts b/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
index 33591c9383703..5743d3d690500 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from '../../../../src/core/public';
-import { coreMock } from '../../../../src/core/public/mocks';
-import { uiActionsPluginMock } from '../../../../src/plugins/ui_actions/public/mocks';
-import { embeddablePluginMock } from '../../../../src/plugins/embeddable/public/mocks';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '.';
 import { plugin as pluginInitializer } from '.';
-import { licensingMock } from '../../licensing/public/mocks';
 import { StartDependencies } from './plugin';
 
 export type Setup = jest.Mocked<AdvancedUiActionsSetup>;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/plugin.ts b/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
index 291a948e9e9ea..b64f836ad9596 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
@@ -6,28 +6,23 @@
  */
 
 import { BehaviorSubject, Subscription } from 'rxjs';
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-} from '../../../../src/core/public';
-import { createReactOverlays } from '../../../../src/plugins/kibana_react/public';
-import { UI_SETTINGS } from '../../../../src/plugins/data/public';
-import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import { createReactOverlays } from '@kbn/kibana-react-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
+import { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   CONTEXT_MENU_TRIGGER,
   PANEL_BADGE_TRIGGER,
   EmbeddableSetup,
   EmbeddableStart,
-} from '../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import { ILicense, LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { createStartServicesGetter, Storage } from '@kbn/kibana-utils-plugin/public';
 import { CustomTimeRangeAction } from './custom_time_range_action';
 import { CustomTimeRangeBadge } from './custom_time_range_badge';
 import { CommonlyUsedRange } from './types';
 import { UiActionsServiceEnhancements } from './services';
-import { ILicense, LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
 import { createPublicDrilldownManager, PublicDrilldownManagerComponent } from './drilldowns';
-import { createStartServicesGetter, Storage } from '../../../../src/plugins/kibana_utils/public';
 import { dynamicActionEnhancement } from './dynamic_actions/dynamic_action_enhancement';
 
 interface SetupDependencies {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
index 484a61f661a52..28e7aaa774a7b 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
@@ -10,7 +10,7 @@ import {
   UiActionsServiceEnhancementsParams,
 } from './ui_actions_service_enhancements';
 import { ActionFactoryDefinition, ActionFactory } from '../dynamic_actions';
-import { licensingMock } from '../../../licensing/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 
 const deps: UiActionsServiceEnhancementsParams = {
   getLicense: () => licensingMock.createLicense(),
diff --git a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
index 40155617b22e0..63f90d5a55a1f 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
@@ -6,7 +6,11 @@
  */
 
 import { SerializableRecord } from '@kbn/utility-types';
-import { ActionFactoryRegistry } from '../types';
+import { ILicense } from '@kbn/licensing-plugin/common/types';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import { SavedObjectReference } from '@kbn/core/types';
+import { PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
+import { DrilldownDefinition } from '../drilldowns';
 import {
   ActionFactory,
   ActionFactoryDefinition,
@@ -14,11 +18,7 @@ import {
   BaseActionFactoryContext,
   SerializedEvent,
 } from '../dynamic_actions';
-import { DrilldownDefinition } from '../drilldowns';
-import { ILicense } from '../../../licensing/common/types';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../../licensing/public';
-import { SavedObjectReference } from '../../../../../src/core/types';
-import { PersistableStateDefinition } from '../../../../../src/plugins/kibana_utils/common';
+import { ActionFactoryRegistry } from '../types';
 
 import { DynamicActionsState } from '../../common/types';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts
index 61f4f4ab1f040..b37a0e54d75bd 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_container.ts
@@ -10,8 +10,8 @@ import {
   Container,
   ContainerOutput,
   EmbeddableStart,
-} from '../../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 
 /**
  * interfaces are not allowed to specify a sub-set of the required types until
diff --git a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts
index 3a6512400777e..a916fe6601eed 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable.ts
@@ -10,8 +10,8 @@ import {
   Embeddable,
   EmbeddableInput,
   IContainer,
-} from '../../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 
 interface EmbeddableTimeRangeInput extends EmbeddableInput {
   timeRange: TimeRange;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts
index 1587b144e3a11..4f1fb3af965e8 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/test_helpers/time_range_embeddable_factory.ts
@@ -9,8 +9,8 @@ import {
   EmbeddableInput,
   IContainer,
   EmbeddableFactoryDefinition,
-} from '../../../../../src/plugins/embeddable/public';
-import { TimeRange } from '../../../../../src/plugins/data/public';
+} from '@kbn/embeddable-plugin/public';
+import { TimeRange } from '@kbn/data-plugin/public';
 import { TIME_RANGE_EMBEDDABLE, TimeRangeEmbeddable } from './time_range_embeddable';
 
 interface EmbeddableTimeRangeInput extends EmbeddableInput {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/types.ts b/x-pack/plugins/ui_actions_enhanced/public/types.ts
index 71701b24ca981..7541212569f55 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/types.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaReactOverlays } from '../../../../src/plugins/kibana_react/public';
+import { KibanaReactOverlays } from '@kbn/kibana-react-plugin/public';
 import { ActionFactory } from './dynamic_actions';
 
 export interface CommonlyUsedRange {
diff --git a/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts b/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts
index 45062f36bdfbf..e30567e1231de 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/dynamic_action_enhancement.ts
@@ -6,8 +6,8 @@
  */
 
 import type { SerializableRecord } from '@kbn/utility-types';
-import { EnhancementRegistryDefinition } from '../../../../src/plugins/embeddable/server';
-import { SavedObjectReference } from '../../../../src/core/types';
+import { EnhancementRegistryDefinition } from '@kbn/embeddable-plugin/server';
+import { SavedObjectReference } from '@kbn/core/types';
 import { ActionFactory, DynamicActionsState, SerializedEvent } from './types';
 import { dynamicActionsCollector } from './telemetry/dynamic_actions_collector';
 import { dynamicActionFactoriesCollector } from './telemetry/dynamic_action_factories_collector';
diff --git a/x-pack/plugins/ui_actions_enhanced/server/plugin.ts b/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
index f29b1c03b941a..f021924db3731 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
@@ -6,8 +6,8 @@
  */
 
 import { identity } from 'lodash';
-import { CoreSetup, Plugin } from '../../../../src/core/server';
-import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
 import { dynamicActionEnhancement } from './dynamic_action_enhancement';
 import { ActionFactoryRegistry, SerializedEvent, ActionFactoryDefinition } from './types';
 
diff --git a/x-pack/plugins/ui_actions_enhanced/server/types.ts b/x-pack/plugins/ui_actions_enhanced/server/types.ts
index e0734e31486b5..7280846e9330d 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/types.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/types.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  PersistableState,
-  PersistableStateDefinition,
-} from '../../../../src/plugins/kibana_utils/common';
+import { PersistableState, PersistableStateDefinition } from '@kbn/kibana-utils-plugin/common';
 
 import { SerializedAction, SerializedEvent, DynamicActionsState } from '../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx
index ba09db95ee883..27e41d17a5b10 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/app/app.helpers.tsx
@@ -8,7 +8,7 @@
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { App } from '../../../public/application/app';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts
index 813a269bf5a97..74d2823725286 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.helpers.ts
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { EsDeprecationLogs } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts
index 033b42b1bf973..e6e87087ed55d 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecations/es_deprecations.helpers.ts
@@ -7,7 +7,7 @@
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { EsDeprecations } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
index 3ceadecb208df..ac9404f301a08 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
@@ -14,13 +14,13 @@ import {
   httpServiceMock,
   coreMock,
   scopedHistoryMock,
-} from 'src/core/public/mocks';
-import { sharePluginMock } from 'src/plugins/share/public/mocks';
+} from '@kbn/core/public/mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 
 import { apiService } from '../../../public/application/lib/api';
 import { breadcrumbService } from '../../../public/application/lib/breadcrumbs';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { cloudMock } from '../../../../../../x-pack/plugins/cloud/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { cloudMock } from '@kbn/cloud-plugin/public/mocks';
 
 const data = dataPluginMock.createStartContract();
 const dataViews = { ...data.dataViews };
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts
index 38a82b8e2d5af..b7de4ef3cc5d6 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 
 import { API_BASE_PATH } from '../../../common/constants';
 import {
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx
index 7bc6931550a3b..0c328f0deede0 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import SemVer from 'semver/classes/semver';
 import { merge } from 'lodash';
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { MAJOR_VERSION } from '../../../common/constants';
 
 import { AuthorizationContext, Authorization, Privileges } from '../../../public/shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts
index e235bdc6f4543..accf23715142c 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecation_details_flyout/deprecation_details_flyout.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts
index 6e63d150c09f8..7a62fa33bb876 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/deprecations_table.test.ts
@@ -6,8 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
-import type { DeprecationsServiceStart } from 'kibana/public';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
+import type { DeprecationsServiceStart } from '@kbn/core/public';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts
index 13616286552ef..7a74225e9340a 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/deprecations_table/error_handling.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
index bde2a78b13302..8899212ca341c 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/kibana_deprecations.helpers.ts
@@ -11,7 +11,7 @@ import {
   AsyncTestBedConfig,
   findTestSubject,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { KibanaDeprecations } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts
index 6a3d376acecab..25d4983818210 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana_deprecations/service.mock.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DeprecationsServiceStart, DomainDeprecationDetails } from 'kibana/public';
+import type { DeprecationsServiceStart, DomainDeprecationDetails } from '@kbn/core/public';
 
 const kibanaDeprecations: DomainDeprecationDetails[] = [
   {
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx
index 8671b136844ed..50f7389ac8c11 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/elasticsearch_deprecation_issues.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../../kibana_deprecations/service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx
index cc2cec97cc702..1399897bbdaa0 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/fix_issues_step.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../../kibana_deprecations/service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx
index f060a38440ec1..77c8a9e998edf 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/fix_issues_step/kibana_deprecation_issues.test.tsx
@@ -6,8 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { deprecationsServiceMock } from 'src/core/public/mocks';
-import type { DomainDeprecationDetails } from 'kibana/public';
+import { deprecationsServiceMock } from '@kbn/core/public/mocks';
+import type { DomainDeprecationDetails } from '@kbn/core/public';
 
 import { setupEnvironment } from '../../helpers';
 import { kibanaDeprecationsServiceHelpers } from '../../kibana_deprecations/service.mock';
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts
index 3f56a971b6bf9..d80778d37699e 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview/overview.helpers.ts
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { Overview } from '../../../public/application/components';
 import { WithAppDependencies } from '../helpers';
 
diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts
index 5993d351a8c75..3da2215a14370 100644
--- a/x-pack/plugins/upgrade_assistant/common/types.ts
+++ b/x-pack/plugins/upgrade_assistant/common/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { SavedObject, SavedObjectAttributes } from 'src/core/public';
+import { SavedObject, SavedObjectAttributes } from '@kbn/core/public';
 
 export type DeprecationSource = 'Kibana' | 'Elasticsearch';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/app.tsx b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
index 00c910fd648f7..a939adbc4868d 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/app.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
@@ -9,7 +9,7 @@ import React, { useState, useEffect } from 'react';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiEmptyPrompt, EuiPageContent, EuiLoadingSpinner } from '@elastic/eui';
-import { ScopedHistory } from 'src/core/public';
+import { ScopedHistory } from '@kbn/core/public';
 
 import { API_BASE_PATH } from '../../common/constants';
 import { ClusterUpgradeState } from '../../common/types';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts
index 4a0bbfba1b540..916d007ebac62 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/external_links.test.ts
@@ -8,7 +8,7 @@
 import { getDeprecationDataView } from './external_links';
 
 import { DEPRECATION_LOGS_INDEX_PATTERN } from '../../../../../common/constants';
-import { dataPluginMock, Start } from '../../../../../../../../src/plugins/data/public/mocks';
+import { dataPluginMock, Start } from '@kbn/data-plugin/public/mocks';
 
 describe('External Links', () => {
   let dataService: Start;
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx
index e181ca97d21fa..f05e55a1073ad 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.test.tsx
@@ -16,7 +16,7 @@ import { ChecklistFlyoutStep } from './checklist_step';
 
 jest.mock('../../../../../app_context', () => {
   const { docLinksServiceMock } = jest.requireActual(
-    '../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
+    '@kbn/core/public/doc_links/doc_links_service.mock'
   );
 
   return {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx
index bc944f7773ac7..5e11615d5ca0b 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step.test.tsx
@@ -19,7 +19,7 @@ const kibanaVersion = new SemVer(MAJOR_VERSION);
 
 jest.mock('../../../../../app_context', () => {
   const { docLinksServiceMock } = jest.requireActual(
-    '../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
+    '@kbn/core/public/doc_links/doc_links_service.mock'
   );
 
   return {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx
index 39b3a722055f8..7782d47fc5cc0 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/warning_step_checkbox.tsx
@@ -18,7 +18,7 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../common/types';
 
 export const hasReindexWarning = (
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
index b585ea20b1714..db0f5f6356b19 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
@@ -11,7 +11,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { EuiPageHeader, EuiSpacer, EuiPageContent, EuiLink, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 
 import { EnrichedDeprecationInfo } from '../../../../common/types';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx
index 3b4cd5acafb95..49992be691f5e 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx
@@ -12,7 +12,7 @@ import { EuiPageContent, EuiPageHeader, EuiSpacer, EuiCallOut } from '@elastic/e
 import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import type { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from '@kbn/core/public';
 import { SectionLoading, GlobalFlyout } from '../../../shared_imports';
 import { useAppContext } from '../../app_context';
 import { uiMetricService, UIM_KIBANA_DEPRECATIONS_PAGE_LOAD } from '../../lib/ui_metric';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx
index 1825b04717311..8486a3a4a891f 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/backup_step/backup_step.tsx
@@ -9,7 +9,7 @@ import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';
 
-import type { CloudSetup } from '../../../../../../cloud/public';
+import type { CloudSetup } from '@kbn/cloud-plugin/public';
 import { OnPremBackup } from './on_prem_backup';
 import { CloudBackup } from './cloud_backup';
 import type { OverviewStepProps } from '../../types';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx
index b0aa7b592e3a1..d453364806e91 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/fix_issues_step/components/kibana_deprecation_issues_panel.tsx
@@ -7,7 +7,7 @@
 
 import React, { FunctionComponent, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import type { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from '@kbn/core/public';
 
 import { useAppContext } from '../../../../app_context';
 import { DeprecationIssuesPanel } from './deprecation_issues_panel';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx
index 8fade09bbcb47..22479d971e698 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/migrate_system_indices.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import type { EuiStepProps } from '@elastic/eui/src/components/steps/step';
 
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import type { SystemIndicesMigrationFeature } from '../../../../../common/types';
 import type { OverviewStepProps } from '../../types';
 import { useMigrateSystemIndices } from './use_migrate_system_indices';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
index f55a6c04c640e..73ad9843e6ea5 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import {
   ESUpgradeStatus,
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts
index dd1cc01355696..ebb398d8e0ce9 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/lib/breadcrumbs.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ManagementAppMountParams } from '../../../../../../src/plugins/management/public';
+import { ManagementAppMountParams } from '@kbn/management-plugin/public';
 
 type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
 
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts
index 078e3e641569e..33ce1180d94dd 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/lib/ui_metric.ts
@@ -6,7 +6,7 @@
  */
 
 import { UiCounterMetricType } from '@kbn/analytics';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export const UIM_APP_NAME = 'upgrade_assistant';
 export const UIM_ES_DEPRECATIONS_PAGE_LOAD = 'es_deprecations_page_load';
diff --git a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx
index 6ab764ddcba6d..96ea2004d6e85 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import type { ManagementAppMountParams } from 'src/plugins/management/public';
+import type { ManagementAppMountParams } from '@kbn/management-plugin/public';
 import { RootComponent } from './app';
 import { AppDependencies } from '../types';
 
diff --git a/x-pack/plugins/upgrade_assistant/public/index.ts b/x-pack/plugins/upgrade_assistant/public/index.ts
index e338b9c044f68..a838b5019cd98 100644
--- a/x-pack/plugins/upgrade_assistant/public/index.ts
+++ b/x-pack/plugins/upgrade_assistant/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UpgradeAssistantUIPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => {
diff --git a/x-pack/plugins/upgrade_assistant/public/plugin.ts b/x-pack/plugins/upgrade_assistant/public/plugin.ts
index 7e39b120b0ab3..9ed30445c2fc5 100644
--- a/x-pack/plugins/upgrade_assistant/public/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import SemVer from 'semver/classes/semver';
 import { i18n } from '@kbn/i18n';
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/public';
+import { Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/public';
 
 import { apiService } from './application/lib/api';
 import { breadcrumbService } from './application/lib/breadcrumbs';
diff --git a/x-pack/plugins/upgrade_assistant/public/shared_imports.ts b/x-pack/plugins/upgrade_assistant/public/shared_imports.ts
index 7d23f88a95c44..cbed7f5258411 100644
--- a/x-pack/plugins/upgrade_assistant/public/shared_imports.ts
+++ b/x-pack/plugins/upgrade_assistant/public/shared_imports.ts
@@ -12,7 +12,7 @@ export type {
   Privileges,
   MissingPrivileges,
   Authorization,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   sendRequest,
@@ -23,17 +23,17 @@ export {
   AuthorizationProvider,
   AuthorizationContext,
   NotAuthorizedSection,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export { Storage } from '../../../../src/plugins/kibana_utils/public';
+export { Storage } from '@kbn/kibana-utils-plugin/public';
 
 export {
   KibanaContextProvider,
   reactRouterNavigate,
   RedirectAppLinks,
   KibanaThemeProvider,
-} from '../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
-export type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+export type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-export { APP_WRAPPER_CLASS } from '../../../../src/core/public';
+export { APP_WRAPPER_CLASS } from '@kbn/core/public';
diff --git a/x-pack/plugins/upgrade_assistant/public/types.ts b/x-pack/plugins/upgrade_assistant/public/types.ts
index 6af71bde7a45a..d6b4860c29612 100644
--- a/x-pack/plugins/upgrade_assistant/public/types.ts
+++ b/x-pack/plugins/upgrade_assistant/public/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import { Observable } from 'rxjs';
-import { ManagementSetup } from 'src/plugins/management/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { SharePluginSetup } from 'src/plugins/share/public';
-import { CoreStart, ScopedHistory, CoreTheme } from 'src/core/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { SharePluginSetup } from '@kbn/share-plugin/public';
+import { CoreStart, ScopedHistory, CoreTheme } from '@kbn/core/public';
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { CloudSetup } from '../../cloud/public';
-import { LicensingPluginStart } from '../../licensing/public';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
+import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { BreadcrumbService } from './application/lib/breadcrumbs';
 import { ApiService } from './application/lib/api';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/config.ts b/x-pack/plugins/upgrade_assistant/server/config.ts
index cc073a597d046..5406898ecaf77 100644
--- a/x-pack/plugins/upgrade_assistant/server/config.ts
+++ b/x-pack/plugins/upgrade_assistant/server/config.ts
@@ -8,7 +8,7 @@ import { SemVer } from 'semver';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { schema, TypeOf } from '@kbn/config-schema';
-import { PluginConfigDescriptor } from 'src/core/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 
 import { MAJOR_VERSION } from '../common/constants';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/index.ts b/x-pack/plugins/upgrade_assistant/server/index.ts
index 660aa107292e8..976e7f58bffc7 100644
--- a/x-pack/plugins/upgrade_assistant/server/index.ts
+++ b/x-pack/plugins/upgrade_assistant/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { UpgradeAssistantServerPlugin } from './plugin';
 
 export { config } from './config';
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
index b3b93582e2260..2a448e78e370a 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   getDeprecationLoggingStatus,
   isDeprecationLoggingEnabled,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
index 0c1d5e9ef7960..081903ff0f0ee 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecation_logging_apis.ts
@@ -6,7 +6,7 @@
  */
 
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { DeprecationLoggingStatus } from '../../common/types';
 
 export async function getDeprecationLoggingStatus(
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
index efcd7d4ae0243..5d24abddb9408 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { getESUpgradeStatus } from './es_deprecations_status';
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
index d4e9a164efa1c..014b11e1dbdb5 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
@@ -6,14 +6,14 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'src/core/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { EnrichedDeprecationInfo, ESUpgradeStatus } from '../../common/types';
 
 import { esIndicesStateCheck } from './es_indices_state_check';
 import {
   getESSystemIndicesMigrationStatus,
   convertFeaturesToIndicesArray,
-} from '../lib/es_system_indices_migration';
+} from './es_system_indices_migration';
 
 export async function getESUpgradeStatus(
   dataClient: IScopedClusterClient
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
index 3dcae8b307d55..deeb9310f9beb 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_indices_state_check.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import { getIndexState } from '../../common/get_index_state';
 import { ResolveIndexResponseFromES } from '../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts
index 18345f9a0944e..fcf086abe5388 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_system_indices_migration.ts
@@ -6,7 +6,7 @@
  */
 
 import { flow, flatMap, map, flatten, uniq } from 'lodash/fp';
-import { ElasticsearchClient } from 'src/core/server';
+import { ElasticsearchClient } from '@kbn/core/server';
 import {
   SystemIndicesMigrationStatus,
   SystemIndicesMigrationFeature,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
index 7205a0458494b..72c71a8a21c8e 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.test.ts
@@ -6,9 +6,9 @@
  */
 
 import { SemVer } from 'semver';
-import { IScopedClusterClient, kibanaResponseFactory } from 'src/core/server';
-import { coreMock } from 'src/core/server/mocks';
-import { licensingMock } from '../../../../plugins/licensing/server/mocks';
+import { IScopedClusterClient, kibanaResponseFactory } from '@kbn/core/server';
+import { coreMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { MAJOR_VERSION } from '../../common/constants';
 import { getMockVersionInfo } from './__fixtures__/version';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
index 7b656635d8644..699f40a65bae1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
@@ -13,7 +13,7 @@ import {
   KibanaResponseFactory,
   RequestHandler,
   RequestHandlerContext,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { versionService } from './version';
 
 /**
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
index 296a313abef38..cc0b270c61f41 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.test.ts
@@ -6,8 +6,8 @@
  */
 
 import _ from 'lodash';
-import { deprecationsServiceMock } from 'src/core/server/mocks';
-import { DomainDeprecationDetails } from 'src/core/server/types';
+import { deprecationsServiceMock } from '@kbn/core/server/mocks';
+import { DomainDeprecationDetails } from '@kbn/core/server/types';
 
 import { getKibanaUpgradeStatus } from './kibana_status';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts
index 9908f026d3996..89fdd8e83847b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/kibana_status.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DeprecationsClient } from 'kibana/server';
-import { DomainDeprecationDetails } from 'src/core/server/types';
+import { DeprecationsClient } from '@kbn/core/server';
+import { DomainDeprecationDetails } from '@kbn/core/server/types';
 
 export const getKibanaUpgradeStatus = async (deprecationsClient: DeprecationsClient) => {
   const kibanaDeprecations: DomainDeprecationDetails[] =
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts
index 90adfdfa8fced..061fa0801359d 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { KibanaRequest } from 'src/core/server';
-import { loggingSystemMock, httpServerMock } from 'src/core/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+import { KibanaRequest } from '@kbn/core/server';
+import { loggingSystemMock, httpServerMock } from '@kbn/core/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { ReindexStep, ReindexStatus, ReindexSavedObject } from '../../../common/types';
 import { credentialStoreFactory } from './credential_store';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
index b3d4d5e165a13..4555dfb02d8c1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts
@@ -8,9 +8,9 @@
 import { createHash } from 'crypto';
 import stringify from 'json-stable-stringify';
 
-import { KibanaRequest, Logger } from 'src/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 
-import { SecurityPluginStart } from '../../../../security/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
 
 export type Credential = Record<string, any>;
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
index b6064d76bcd7a..c17cc160a6ce1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { ScopedClusterClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 import moment from 'moment';
 
 import {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
index 3b4e3ad79cc8c..01c73bf85765b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts
@@ -11,7 +11,7 @@ import {
   SavedObjectsFindResponse,
   SavedObjectsClientContract,
   ElasticsearchClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import {
   REINDEX_OP_TYPE,
   ReindexOperation,
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
index a3628a62d8ab0..062782560ef2b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
@@ -8,10 +8,10 @@
 jest.mock('../es_indices_state_check', () => ({ esIndicesStateCheck: jest.fn() }));
 import { BehaviorSubject } from 'rxjs';
 import { TransportResult } from '@elastic/elasticsearch';
-import { Logger } from 'src/core/server';
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
+import { Logger } from '@kbn/core/server';
+import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mocks';
+import { ScopedClusterClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
 
 import {
   ReindexOperation,
@@ -20,8 +20,8 @@ import {
   ReindexStep,
 } from '../../../common/types';
 import { MAJOR_VERSION } from '../../../common/constants';
-import { licensingMock } from '../../../../licensing/server/mocks';
-import { LicensingPluginSetup } from '../../../../licensing/server';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 
 import { getMockVersionInfo } from '../__fixtures__/version';
 import { esIndicesStateCheck } from '../es_indices_state_check';
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index 9d613dd831630..bf605ac119fda 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
-import { first } from 'rxjs/operators';
+import { ElasticsearchClient, Logger } from '@kbn/core/server';
+import { firstValueFrom } from 'rxjs';
 
-import { LicensingPluginSetup } from '../../../../licensing/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 
 import {
   ReindexSavedObject,
@@ -374,7 +374,7 @@ export const reindexServiceFactory = (
        * (i.e., via the licensing plugin). This enables Security to use
        * functionality exposed through Upgrade Assistant.
        */
-      const license = await licensing.license$.pipe(first()).toPromise();
+      const license = await firstValueFrom(licensing.license$);
 
       const securityFeature = license.getFeature('security');
 
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
index 579e4ddb21337..46fcf6a4cec5b 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from 'src/core/server';
+import { IClusterClient, Logger, SavedObjectsClientContract, FakeRequest } from '@kbn/core/server';
 import moment from 'moment';
-import { SecurityPluginStart } from '../../../../security/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { ReindexSavedObject, ReindexStatus } from '../../../common/types';
 import { Credential, CredentialStore } from './credential_store';
 import { reindexActionsFactory } from './reindex_actions';
 import { ReindexService, reindexServiceFactory } from './reindex_service';
-import { LicensingPluginSetup } from '../../../../licensing/server';
 import { sortAndOrderReindexOperations, queuedOpHasStarted, isQueuedOp } from './op_utils';
 
 const POLL_INTERVAL = 30000;
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
index ad33ad248a564..4c3f7bd0a9f77 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { registerUpgradeAssistantUsageCollector } from './usage_collector';
-import { IClusterClient } from 'src/core/server';
+import { IClusterClient } from '@kbn/core/server';
 
 /**
  * Since these route callbacks are so thin, these serve simply as integration tests
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
index 97361c5f05936..2f0d884e092e6 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, ElasticsearchServiceStart } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { ElasticsearchClient, ElasticsearchServiceStart } from '@kbn/core/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { UpgradeAssistantTelemetry } from '../../../common/types';
 import {
   isDeprecationLogIndexingEnabled,
diff --git a/x-pack/plugins/upgrade_assistant/server/plugin.ts b/x-pack/plugins/upgrade_assistant/server/plugin.ts
index 717f03758f825..40cb2f5b3e35d 100644
--- a/x-pack/plugins/upgrade_assistant/server/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import {
   Plugin,
   CoreSetup,
@@ -14,13 +14,13 @@ import {
   Logger,
   SavedObjectsClient,
   SavedObjectsServiceStart,
-} from '../../../../src/core/server';
-import { SecurityPluginStart } from '../../security/server';
-import { InfraPluginSetup } from '../../infra/server';
+} from '@kbn/core/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { InfraPluginSetup } from '@kbn/infra-plugin/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { SecurityPluginSetup } from '../../security/server';
-import { LicensingPluginSetup } from '../../licensing/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SecurityPluginSetup } from '@kbn/security-plugin/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
 import { DEPRECATION_LOGS_SOURCE_ID, DEPRECATION_LOGS_INDEX } from '../common/constants';
 
 import { CredentialStore, credentialStoreFactory } from './lib/reindexing/credential_store';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
index e4e9ae95ef30d..9fb35b838d81d 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { RequestHandler, RequestHandlerContext } from 'src/core/server';
+import { RequestHandler, RequestHandlerContext } from '@kbn/core/server';
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
   deprecationsServiceMock,
-} from '../../../../../../src/core/server/mocks';
+} from '@kbn/core/server/mocks';
 
 export const routeHandlerContextMock = {
   core: {
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
index 07bc3d573e606..8df95072f5ac5 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/deprecation_logging.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts
index 4047ce827acbc..2e6dcfcf07849 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/es_deprecations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 import { handleEsError } from '../shared_imports';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
index 7293c397e5d9f..9e5c61fff5d2e 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { errors as esErrors } from '@elastic/elasticsearch';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
index 38d1b09650b09..45455eee01e10 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
@@ -9,7 +9,7 @@ import { errors } from '@elastic/elasticsearch';
 import { i18n } from '@kbn/i18n';
 import type { TransportResult } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+import { IScopedClusterClient, SavedObjectsClientContract } from '@kbn/core/server';
 
 import { API_BASE_PATH } from '../../common/constants';
 import { MlOperation, ML_UPGRADE_OP_TYPE } from '../../common/types';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts
index a72d1ae0d8b41..e300033f800ba 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/node_disk_space.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts
index 961b63b30f4ea..21c88aea907ea 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { licensingMock } from '../../../../licensing/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from '../__mocks__/routes.mock';
 import { createRequestMock } from '../__mocks__/request.mock';
 import { handleEsError } from '../../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts
index d20912e56fe66..81c65330d14b6 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/create_reindex_worker.ts
@@ -5,14 +5,10 @@
  * 2.0.
  */
 
-import {
-  ElasticsearchServiceStart,
-  Logger,
-  SavedObjectsClient,
-} from '../../../../../../src/core/server';
+import { ElasticsearchServiceStart, Logger, SavedObjectsClient } from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../../licensing/server';
-import { SecurityPluginStart } from '../../../../security/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { ReindexWorker } from '../../lib/reindexing';
 import { CredentialStore } from '../../lib/reindexing/credential_store';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts
index f36e52ffb0eab..2f21e8cb80436 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/map_any_error_to_kibana_http_response.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from '../../../../../../src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 import {
   AccessForbidden,
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
index d81dc8cec4c53..970a11b3eb048 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_handler.ts
@@ -11,10 +11,10 @@ import {
   Logger,
   SavedObjectsClientContract,
   KibanaRequest,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
-import { LicensingPluginSetup } from '../../../../licensing/server';
-import { SecurityPluginStart } from '../../../../security/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 import { ReindexOperation, ReindexStatus } from '../../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
index 38a78f15f2b50..bb3ccaeb8b125 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { licensingMock } from '../../../../licensing/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
+import { kibanaResponseFactory } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from '../__mocks__/routes.mock';
 import { createRequestMock } from '../__mocks__/request.mock';
 import { handleEsError } from '../../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts
index 2d19674d63a75..6b94edb013263 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/status.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 
 import { handleEsError } from '../shared_imports';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts
index 3e8da18f5f70d..914008ccc079c 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/system_indices_migration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { kibanaResponseFactory } from 'src/core/server';
+import { kibanaResponseFactory } from '@kbn/core/server';
 import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { handleEsError } from '../shared_imports';
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts
index 88540d67b13df..7d26065ce0b82 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/migrations/telemetry_saved_object_migrations.ts
@@ -6,7 +6,7 @@
  */
 
 import { get, omit, flow, some } from 'lodash';
-import type { SavedObjectMigrationFn } from 'kibana/server';
+import type { SavedObjectMigrationFn } from '@kbn/core/server';
 
 const v716RemoveUnusedTelemetry: SavedObjectMigrationFn<any, any> = (doc) => {
   // Dynamically defined in 6.7 (https://github.com/elastic/kibana/pull/28878)
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
index 6dc70fab1203f..4b8e2d0cb0f82 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { ML_UPGRADE_OP_TYPE } from '../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
index c8bca6ee90177..36e32cfdea66b 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { REINDEX_OP_TYPE } from '../../common/types';
 
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
index 43cf6c30fccab..a097783022a6b 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'src/core/server';
+import { SavedObjectsType } from '@kbn/core/server';
 
 import { UPGRADE_ASSISTANT_TELEMETRY } from '../../common/constants';
 import { telemetrySavedObjectMigrations } from './migrations';
diff --git a/x-pack/plugins/upgrade_assistant/server/shared_imports.ts b/x-pack/plugins/upgrade_assistant/server/shared_imports.ts
index 1c43f89469ac1..ea52b78b27beb 100644
--- a/x-pack/plugins/upgrade_assistant/server/shared_imports.ts
+++ b/x-pack/plugins/upgrade_assistant/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export type { Privileges } from '../../../../src/plugins/es_ui_shared/common';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export type { Privileges } from '@kbn/es-ui-shared-plugin/common';
diff --git a/x-pack/plugins/upgrade_assistant/server/types.ts b/x-pack/plugins/upgrade_assistant/server/types.ts
index 376514c59d494..f63f5d4666d6f 100644
--- a/x-pack/plugins/upgrade_assistant/server/types.ts
+++ b/x-pack/plugins/upgrade_assistant/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IRouter, Logger, SavedObjectsServiceStart } from 'src/core/server';
-import { LicensingPluginSetup } from '../../licensing/server';
-import { SecurityPluginStart } from '../../security/server';
+import { IRouter, Logger, SavedObjectsServiceStart } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { CredentialStore } from './lib/reindexing/credential_store';
 import { handleEsError } from './shared_imports';
 
diff --git a/x-pack/plugins/uptime/common/config.ts b/x-pack/plugins/uptime/common/config.ts
index fe3e75b0bc5d2..02cb1cdc5f256 100644
--- a/x-pack/plugins/uptime/common/config.ts
+++ b/x-pack/plugins/uptime/common/config.ts
@@ -6,7 +6,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { PluginConfigDescriptor } from 'kibana/server';
+import { PluginConfigDescriptor } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { sslSchema } from '@kbn/server-http-tools';
 
diff --git a/x-pack/plugins/uptime/common/constants/alerts.ts b/x-pack/plugins/uptime/common/constants/alerts.ts
index 7c0f7e8168809..ff3cda7887ef7 100644
--- a/x-pack/plugins/uptime/common/constants/alerts.ts
+++ b/x-pack/plugins/uptime/common/constants/alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ActionGroup } from '../../../alerting/common';
+import { ActionGroup } from '@kbn/alerting-plugin/common';
 
 export type MonitorStatusActionGroup =
   ActionGroup<'xpack.uptime.alerts.actionGroups.monitorStatus'>;
diff --git a/x-pack/plugins/uptime/common/constants/ui.ts b/x-pack/plugins/uptime/common/constants/ui.ts
index 155c6ea80242f..a736e3296161e 100644
--- a/x-pack/plugins/uptime/common/constants/ui.ts
+++ b/x-pack/plugins/uptime/common/constants/ui.ts
@@ -82,3 +82,5 @@ export const FILTER_FIELDS = {
   LOCATION: 'observer.geo.name',
   TYPE: 'monitor.type',
 };
+
+export const SYNTHETICS_INDEX_PATTERN = 'synthetics-*';
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts b/x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts
index ab9a6f90de0a0..8ee664bda1ebf 100644
--- a/x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/monitor_management/locations.ts
@@ -12,19 +12,16 @@ import { tEnum } from '../../utils/t_enum';
 export enum BandwidthLimitKey {
   DOWNLOAD = 'download',
   UPLOAD = 'upload',
-  LATENCY = 'latency',
 }
 
 export const DEFAULT_BANDWIDTH_LIMIT = {
   [BandwidthLimitKey.DOWNLOAD]: 100,
   [BandwidthLimitKey.UPLOAD]: 30,
-  [BandwidthLimitKey.LATENCY]: 1000,
 };
 
 export const DEFAULT_THROTTLING = {
   [BandwidthLimitKey.DOWNLOAD]: DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.DOWNLOAD],
   [BandwidthLimitKey.UPLOAD]: DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.UPLOAD],
-  [BandwidthLimitKey.LATENCY]: DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.LATENCY],
 };
 
 export const BandwidthLimitKeyCodec = tEnum<BandwidthLimitKey>(
@@ -107,7 +104,6 @@ export const isServiceLocationInvalid = (location: MonitorServiceLocation) =>
 export const ThrottlingOptionsCodec = t.interface({
   [BandwidthLimitKey.DOWNLOAD]: t.number,
   [BandwidthLimitKey.UPLOAD]: t.number,
-  [BandwidthLimitKey.LATENCY]: t.number,
 });
 
 export const ServiceLocationsApiResponseCodec = t.interface({
diff --git a/x-pack/plugins/uptime/common/types/synthetics_monitor.ts b/x-pack/plugins/uptime/common/types/synthetics_monitor.ts
index d59e45e86b819..a54cd03003c4e 100644
--- a/x-pack/plugins/uptime/common/types/synthetics_monitor.ts
+++ b/x-pack/plugins/uptime/common/types/synthetics_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SimpleSavedObject } from 'kibana/public';
+import { SimpleSavedObject } from '@kbn/core/public';
 import { EncryptedSyntheticsMonitor, SyntheticsMonitor } from '../runtime_types';
 
 export interface MonitorIdParam {
diff --git a/x-pack/plugins/uptime/e2e/config.ts b/x-pack/plugins/uptime/e2e/config.ts
index 66b97641b2156..e8af8510fe5dc 100644
--- a/x-pack/plugins/uptime/e2e/config.ts
+++ b/x-pack/plugins/uptime/e2e/config.ts
@@ -26,7 +26,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
 
   const manifestUrl = process.env.SYNTHETICS_SERVICE_MANIFEST ?? kibanaConfig[MANIFEST_KEY];
   const serviceUsername = process.env.SYNTHETICS_SERVICE_USERNAME ?? kibanaConfig[SERVICE_USERNAME];
-  const servicPassword = process.env.SYNTHETICS_SERVICE_PASSWORD ?? kibanaConfig[SERVICE_PASSWORD];
+  const servicePassword = process.env.SYNTHETICS_SERVICE_PASSWORD ?? kibanaConfig[SERVICE_PASSWORD];
 
   return {
     ...kibanaCommonTestsConfig.getAll(),
@@ -62,7 +62,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
             ? serviceUsername
             : 'localKibanaIntegrationTestsUser'
         }`,
-        `--xpack.uptime.service.password=${servicPassword}`,
+        `--xpack.uptime.service.password=${servicePassword}`,
       ],
     },
   };
diff --git a/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts b/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
index 5d8d2a1a5d848..884c0e83f97a9 100644
--- a/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/data_view_permissions.ts
@@ -6,8 +6,8 @@
  */
 
 import { journey, step, expect, before } from '@elastic/synthetics';
+import { callKibana } from '@kbn/apm-plugin/scripts/create_apm_users_and_roles/helpers/call_kibana';
 import { byTestId, loginToKibana, waitForLoadingToFinish } from './utils';
-import { callKibana } from '../../../apm/scripts/create_apm_users_and_roles/helpers/call_kibana';
 
 journey('DataViewPermissions', async ({ page, params }) => {
   before(async () => {
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts
index 5380c611c15cb..192fcf06c3095 100644
--- a/x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_details.journey.ts
@@ -11,17 +11,22 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
-import { journey, step, expect, before, Page } from '@elastic/synthetics';
+import uuid from 'uuid';
+import { journey, step, expect, after, before, Page } from '@elastic/synthetics';
 import { monitorManagementPageProvider } from '../page_objects/monitor_management';
 
 journey('MonitorDetails', async ({ page, params }: { page: Page; params: any }) => {
   const uptime = monitorManagementPageProvider({ page, kibanaUrl: params.kibanaUrl });
+  const name = `Test monitor ${uuid.v4()}`;
 
   before(async () => {
     await uptime.waitForLoadingToFinish();
   });
 
+  after(async () => {
+    await uptime.enableMonitorManagement(false);
+  });
+
   step('Go to monitor-management', async () => {
     await uptime.navigateToMonitorManagement();
   });
@@ -32,13 +37,31 @@ journey('MonitorDetails', async ({ page, params }: { page: Page; params: any })
     expect(await invalid.isVisible()).toBeFalsy();
   });
 
+  step('create basic monitor', async () => {
+    await uptime.enableMonitorManagement();
+    await uptime.clickAddMonitor();
+    await uptime.createBasicMonitorDetails({
+      name,
+      locations: ['US Central'],
+      apmServiceName: 'synthetics',
+    });
+    await uptime.fillByTestSubj('syntheticsUrlField', 'https://www.google.com');
+    await uptime.confirmAndSave();
+  });
+
   step('navigate to monitor details page', async () => {
-    await uptime.assertText({ text: 'Test Monitor' });
-    await Promise.all([page.waitForNavigation(), page.click('text="Test Monitor"')]);
-    await uptime.assertText({ text: 'Test Monitor' });
+    await uptime.assertText({ text: name });
+    await Promise.all([page.waitForNavigation(), page.click(`text=${name}`)]);
+    await uptime.assertText({ text: name });
     const url = await page.textContent('[data-test-subj="monitor-page-url"]');
     const type = await page.textContent('[data-test-subj="monitor-page-type"]');
     expect(url).toEqual('https://www.google.com(opens in a new tab or window)');
     expect(type).toEqual('HTTP');
   });
+
+  step('delete monitor', async () => {
+    await uptime.navigateToMonitorManagement();
+    const isSuccessful = await uptime.deleteMonitors();
+    expect(isSuccessful).toBeTruthy();
+  });
 });
diff --git a/x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts b/x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts
index 624538244e6d1..a21627548aeb1 100644
--- a/x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts
+++ b/x-pack/plugins/uptime/e2e/journeys/monitor_name.journey.ts
@@ -11,14 +11,24 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import uuid from 'uuid';
 import { journey, step, expect, before, Page } from '@elastic/synthetics';
 import { monitorManagementPageProvider } from '../page_objects/monitor_management';
 import { byTestId } from './utils';
 
 journey(`MonitorName`, async ({ page, params }: { page: Page; params: any }) => {
+  const name = `Test monitor ${uuid.v4()}`;
   const uptime = monitorManagementPageProvider({ page, kibanaUrl: params.kibanaUrl });
 
+  const createBasicMonitor = async () => {
+    await uptime.createBasicMonitorDetails({
+      name,
+      locations: ['US Central'],
+      apmServiceName: 'synthetics',
+    });
+    await uptime.fillByTestSubj('syntheticsUrlField', 'https://www.google.com');
+  };
+
   before(async () => {
     await uptime.waitForLoadingToFinish();
   });
@@ -33,11 +43,17 @@ journey(`MonitorName`, async ({ page, params }: { page: Page; params: any }) =>
     expect(await invalid.isVisible()).toBeFalsy();
   });
 
-  step(`shows error if name already exists`, async () => {
+  step('create basic monitor', async () => {
     await uptime.enableMonitorManagement();
     await uptime.clickAddMonitor();
+    await createBasicMonitor();
+    await uptime.confirmAndSave();
+  });
+
+  step(`shows error if name already exists`, async () => {
+    await uptime.navigateToAddMonitor();
     await uptime.createBasicMonitorDetails({
-      name: 'Test monitor',
+      name,
       locations: ['US Central'],
       apmServiceName: 'synthetics',
     });
diff --git a/x-pack/plugins/uptime/e2e/playwright_start.ts b/x-pack/plugins/uptime/e2e/playwright_start.ts
index 9108412405602..14d62c9632fa6 100644
--- a/x-pack/plugins/uptime/e2e/playwright_start.ts
+++ b/x-pack/plugins/uptime/e2e/playwright_start.ts
@@ -9,11 +9,10 @@
 
 import Url from 'url';
 import { run as playwrightRun } from '@elastic/synthetics';
+import { createApmAndObsUsersAndRoles } from '@kbn/apm-plugin/scripts/create_apm_users_and_roles/create_apm_users_and_roles';
 import { esArchiverLoad, esArchiverUnload } from './tasks/es_archiver';
 
 import './journeys';
-import { createApmAndObsUsersAndRoles } from '../../apm/scripts/create_apm_users_and_roles/create_apm_users_and_roles';
-import { importMonitors } from './tasks/import_monitors';
 
 export function playwrightRunTests({ headless, match }: { headless: boolean; match?: string }) {
   return async ({ getService }: any) => {
@@ -44,8 +43,6 @@ async function playwrightStart(getService: any, headless = true, match?: string)
     port: config.get('servers.kibana.port'),
   });
 
-  await importMonitors({ kibanaUrl });
-
   await createApmAndObsUsersAndRoles({
     elasticsearch: { username: 'elastic', password: 'changeme' },
     kibana: { roleSuffix: 'e2e', hostname: kibanaUrl },
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
index 2479f25d3234e..bb9e48102dcfc 100644
--- a/x-pack/plugins/uptime/kibana.json
+++ b/x-pack/plugins/uptime/kibana.json
@@ -23,7 +23,7 @@
   "server": true,
   "ui": true,
   "version": "8.0.0",
-  "requiredBundles": ["unifiedSearch", "fleet", "home", "kibanaReact", "kibanaUtils", "ml", "observability"],
+  "requiredBundles": ["unifiedSearch", "fleet", "kibanaReact", "kibanaUtils", "ml", "observability"],
   "owner": {
     "name": "Uptime",
     "githubTeam": "uptime"
diff --git a/x-pack/plugins/uptime/public/apps/locators/overview.ts b/x-pack/plugins/uptime/public/apps/locators/overview.ts
index 313383c8f0943..e2267d4d0fe6d 100644
--- a/x-pack/plugins/uptime/public/apps/locators/overview.ts
+++ b/x-pack/plugins/uptime/public/apps/locators/overview.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { uptimeOverviewLocatorID } from '../../../../observability/public';
+import { uptimeOverviewLocatorID } from '@kbn/observability-plugin/public';
 import { OVERVIEW_ROUTE } from '../../../common/constants/ui';
 
 const formatSearchKey = (key: string, value: string) => `${key}: "${value}"`;
diff --git a/x-pack/plugins/uptime/public/apps/plugin.ts b/x-pack/plugins/uptime/public/apps/plugin.ts
index 26fb87e7fc4ce..ab2ae07e1c454 100644
--- a/x-pack/plugins/uptime/public/apps/plugin.ts
+++ b/x-pack/plugins/uptime/public/apps/plugin.ts
@@ -11,46 +11,40 @@ import {
   Plugin,
   PluginInitializerContext,
   AppMountParameters,
-} from 'kibana/public';
+} from '@kbn/core/public';
 import { from } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { SharePluginSetup, SharePluginStart } from '../../../../../src/plugins/share/public';
-import { DiscoverStart } from '../../../../../src/plugins/discover/public';
-import { DEFAULT_APP_CATEGORIES } from '../../../../../src/core/public';
+import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public';
 
-import {
-  FeatureCatalogueCategory,
-  HomePublicPluginSetup,
-} from '../../../../../src/plugins/home/public';
-import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../triggers_actions_ui/public';
-import {
-  DataPublicPluginSetup,
-  DataPublicPluginStart,
-} from '../../../../../src/plugins/data/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 
-import { alertTypeInitializers, legacyAlertTypeInitializers } from '../lib/alert_types';
-import { FleetStart } from '../../../fleet/public';
+import { FleetStart } from '@kbn/fleet-plugin/public';
 import {
   FetchDataParams,
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
+import { CasesUiStart } from '@kbn/cases-plugin/public';
+import { CloudSetup } from '@kbn/cloud-plugin/public';
 import { PLUGIN } from '../../common/constants/plugin';
-import { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import {
   LazySyntheticsPolicyCreateExtension,
   LazySyntheticsPolicyEditExtension,
 } from '../components/fleet_package';
 import { LazySyntheticsCustomAssetsExtension } from '../components/fleet_package/lazy_synthetics_custom_assets_extension';
-import { Start as InspectorPluginStart } from '../../../../../src/plugins/inspector/public';
-import { CasesUiStart } from '../../../cases/public';
 import { uptimeOverviewNavigatorParams } from './locators/overview';
-import { CloudSetup } from '../../../cloud/public';
+import { alertTypeInitializers, legacyAlertTypeInitializers } from '../lib/alert_types';
 
 export interface ClientPluginsSetup {
   home?: HomePublicPluginSetup;
@@ -97,7 +91,7 @@ export class UptimePlugin
         icon: 'uptimeApp',
         path: '/app/uptime',
         showOnHomePage: false,
-        category: FeatureCatalogueCategory.DATA,
+        category: 'data',
       });
     }
     const getUptimeDataHelper = async () => {
diff --git a/x-pack/plugins/uptime/public/apps/render_app.tsx b/x-pack/plugins/uptime/public/apps/render_app.tsx
index 2e1a6edca6fd0..9a64fe9e18621 100644
--- a/x-pack/plugins/uptime/public/apps/render_app.tsx
+++ b/x-pack/plugins/uptime/public/apps/render_app.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n as i18nFormatter } from '@kbn/i18n';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { getIntegratedAppAvailability } from '../lib/adapters/framework/capabilities_adapter';
 import {
   DEFAULT_DARK_MODE,
diff --git a/x-pack/plugins/uptime/public/apps/uptime_app.tsx b/x-pack/plugins/uptime/public/apps/uptime_app.tsx
index 4387da4038061..91d6ccbfd5267 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_app.tsx
+++ b/x-pack/plugins/uptime/public/apps/uptime_app.tsx
@@ -9,13 +9,16 @@ import { Provider as ReduxProvider } from 'react-redux';
 import { Router } from 'react-router-dom';
 import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { I18nStart, ChromeBreadcrumb, CoreStart, AppMountParameters } from 'kibana/public';
-import { APP_WRAPPER_CLASS } from '../../../../../src/core/public';
+import { I18nStart, ChromeBreadcrumb, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { InspectorContextProvider } from '@kbn/observability-plugin/public';
 import { ClientPluginsSetup, ClientPluginsStart } from './plugin';
 import { UMUpdateBadge } from '../lib/lib';
 import {
@@ -31,10 +34,7 @@ import { UptimeAlertsFlyoutWrapper } from '../components/overview/alerts';
 import { store } from '../state';
 import { kibanaService } from '../state/kibana_service';
 import { ActionMenu } from '../components/common/header/action_menu';
-import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import { UptimeIndexPatternContextProvider } from '../contexts/uptime_index_pattern_context';
-import { InspectorContextProvider } from '../../../observability/public';
 
 export interface UptimeAppColors {
   danger: string;
diff --git a/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts b/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
index 8f8cf16d1e383..d8756715b8181 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
+++ b/x-pack/plugins/uptime/public/apps/uptime_overview_fetcher.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { UptimeFetchDataResponse, FetchDataParams } from '../../../observability/public';
+import { CoreStart } from '@kbn/core/public';
+import { UptimeFetchDataResponse, FetchDataParams } from '@kbn/observability-plugin/public';
 import { fetchIndexStatus, fetchPingHistogram, fetchSnapshotCount } from '../state/api';
 import { kibanaService } from '../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/apps/uptime_page_template.tsx b/x-pack/plugins/uptime/public/apps/uptime_page_template.tsx
index 49b859509a555..e359916de1d22 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_page_template.tsx
+++ b/x-pack/plugins/uptime/public/apps/uptime_page_template.tsx
@@ -8,14 +8,14 @@
 import React, { useEffect, useMemo } from 'react';
 import styled from 'styled-components';
 import { EuiPageHeaderProps, EuiPageTemplateProps } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useInspectorContext } from '@kbn/observability-plugin/public';
 import { CERTIFICATES_ROUTE, OVERVIEW_ROUTE } from '../../common/constants';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from './plugin';
 import { useNoDataConfig } from './use_no_data_config';
 import { EmptyStateLoading } from '../components/overview/empty_state/empty_state_loading';
 import { EmptyStateError } from '../components/overview/empty_state/empty_state_error';
 import { useHasData } from '../components/overview/empty_state/use_has_data';
-import { useInspectorContext } from '../../../observability/public';
 import { useBreakpoints } from '../hooks/use_breakpoints';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/apps/use_no_data_config.ts b/x-pack/plugins/uptime/public/apps/use_no_data_config.ts
index dc00a25e3a111..1424d4047b6f0 100644
--- a/x-pack/plugins/uptime/public/apps/use_no_data_config.ts
+++ b/x-pack/plugins/uptime/public/apps/use_no_data_config.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { useContext } from 'react';
 import { useSelector } from 'react-redux';
-import { KibanaPageTemplateProps, useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaPageTemplateProps, useKibana } from '@kbn/kibana-react-plugin/public';
 import { UptimeSettingsContext } from '../contexts';
 import { ClientPluginsStart } from './plugin';
 import { indexStatusSelector } from '../state/selectors';
diff --git a/x-pack/plugins/uptime/public/badge.ts b/x-pack/plugins/uptime/public/badge.ts
index 6c5eb8f01e790..a42eaa58a7943 100644
--- a/x-pack/plugins/uptime/public/badge.ts
+++ b/x-pack/plugins/uptime/public/badge.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-import { ChromeBadge } from 'src/core/public';
+import { ChromeBadge } from '@kbn/core/public';
 export type UMBadge = ChromeBadge | undefined;
diff --git a/x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts b/x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts
index 0f6431fb7ab7e..47facebe4401f 100644
--- a/x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts
+++ b/x-pack/plugins/uptime/public/components/certificates/use_cert_search.ts
@@ -7,7 +7,7 @@
 
 import { useSelector } from 'react-redux';
 import { useContext } from 'react';
-import { createEsParams, useEsSearch } from '../../../../observability/public';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 
 import { CertResult, GetCertsParams, Ping } from '../../../common/runtime_types';
 
diff --git a/x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx b/x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx
index a12589cc74971..ac25c537a8a7f 100644
--- a/x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx
+++ b/x-pack/plugins/uptime/public/components/common/alerts/uptime_edit_alert_flyout.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type {
   Rule,
   TriggersAndActionsUIPublicPluginStart,
-} from '../../../../../triggers_actions_ui/public';
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { UptimeAlertTypeParams } from '../../../state/alerts/alerts';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
index 3d0fefbd083f8..6bafb9cef1d36 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
@@ -8,12 +8,8 @@
 import React from 'react';
 import moment from 'moment';
 import { AnnotationTooltipFormatter, RectAnnotation, RectAnnotationDatum } from '@elastic/charts';
+import { ANOMALY_SEVERITY, getSeverityColor, getSeverityType } from '@kbn/ml-plugin/public';
 import { AnnotationTooltip } from './annotation_tooltip';
-import {
-  ANOMALY_SEVERITY,
-  getSeverityColor,
-  getSeverityType,
-} from '../../../../../../plugins/ml/public';
 
 interface Props {
   anomalies: any;
diff --git a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx b/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
index b0e39fd5bf651..c302f47e29bdd 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
@@ -24,6 +24,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import numeral from '@elastic/numeral';
 import moment from 'moment';
 import { useSelector } from 'react-redux';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { getChartDateLabel } from '../../../lib/helper';
 import { ChartWrapper } from './chart_wrapper';
 import { UptimeThemeContext } from '../../../contexts';
@@ -32,7 +33,6 @@ import { useMonitorId, useUrlParams } from '../../../hooks';
 import { ChartEmptyState } from './chart_empty_state';
 import { getDateRangeFromChartElement } from './utils';
 import { STATUS_DOWN_LABEL, STATUS_UP_LABEL } from '../translations';
-import { createExploratoryViewUrl } from '../../../../../observability/public';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 import { monitorStatusSelector } from '../../../state/selectors';
 
diff --git a/x-pack/plugins/uptime/public/components/common/header/action_menu.tsx b/x-pack/plugins/uptime/public/components/common/header/action_menu.tsx
index 7faa2fbc294cd..69821360aab8b 100644
--- a/x-pack/plugins/uptime/public/components/common/header/action_menu.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/action_menu.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import { HeaderMenuPortal } from '../../../../../observability/public';
-import { AppMountParameters } from '../../../../../../../src/core/public';
+import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { ActionMenuContent } from './action_menu_content';
 
 export const ActionMenu = ({ appMountParameters }: { appMountParameters: AppMountParameters }) => (
diff --git a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx b/x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx
index c0277aa535585..3e7a6db48ff36 100644
--- a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/action_menu_content.tsx
@@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import { createExploratoryViewUrl } from '../../../../../observability/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 import { useGetUrlParams } from '../../../hooks';
 import { ToggleAlertFlyoutButton } from '../../overview/alerts/alerts_containers';
diff --git a/x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx b/x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx
index c55ef9bdf781e..935f732f1b700 100644
--- a/x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/inspector_header_link.tsx
@@ -8,8 +8,8 @@
 import { EuiHeaderLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { enableInspectEsQueries, useInspectorContext } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { enableInspectEsQueries, useInspectorContext } from '@kbn/observability-plugin/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
diff --git a/x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx b/x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx
index 6c95025219c50..433e6f7b574f4 100644
--- a/x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/manage_monitors_btn.tsx
@@ -12,9 +12,9 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { MONITOR_MANAGEMENT_ROUTE } from '../../../../common/constants';
 import { PUBLIC_BETA_DESCRIPTION } from '../../../pages/monitor_management/service_allowed_wrapper';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsSetup } from '../../../apps/plugin';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
diff --git a/x-pack/plugins/uptime/public/components/common/monitor_tags.tsx b/x-pack/plugins/uptime/public/components/common/monitor_tags.tsx
index 793c27a031546..35684e8326f6c 100644
--- a/x-pack/plugins/uptime/public/components/common/monitor_tags.tsx
+++ b/x-pack/plugins/uptime/public/components/common/monitor_tags.tsx
@@ -9,6 +9,7 @@ import React, { useMemo, useState } from 'react';
 import { EuiBadge, EuiBadgeGroup, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useHistory } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Ping } from '../../../common/runtime_types/ping';
 import { MonitorSummary } from '../../../common/runtime_types/monitor';
 import { useFilterUpdate } from '../../hooks/use_filter_update';
@@ -16,7 +17,6 @@ import { useGetUrlParams } from '../../hooks';
 import { parseCurrentFilters } from '../overview/monitor_list/columns/monitor_name_col';
 import { EXPAND_TAGS_LABEL } from '../overview/monitor_list/columns/translations';
 import { OVERVIEW_ROUTE } from '../../../common/constants';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   ping?: Ping | null;
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts b/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts
index f57596910c849..1046f47f8f380 100644
--- a/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/link_events.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { letBrowserHandleEvent } from './index';
+import { letBrowserHandleEvent } from '.';
 
 describe('letBrowserHandleEvent', () => {
   const event = {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
index 7bff465bae1bd..ae5db0662dd85 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.test.tsx
@@ -25,8 +25,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx
index f817f1ff9a805..dc74717ec2c98 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.test.tsx
@@ -214,7 +214,6 @@ describe('<ThrottlingFields />', () => {
     const throttling = {
       [BandwidthLimitKey.DOWNLOAD]: 100,
       [BandwidthLimitKey.UPLOAD]: 50,
-      [BandwidthLimitKey.LATENCY]: 25,
     };
 
     const defaultLocations = [defaultLocation];
@@ -339,54 +338,6 @@ describe('<ThrottlingFields />', () => {
         )
       ).not.toBeInTheDocument();
     });
-
-    it("shows latency warnings when exceeding the node's latency limits", () => {
-      const { getByLabelText, queryByText } = render(
-        <WrappedComponent
-          policyConfigOverrides={{ throttling, defaultLocations, runsOnService: true }}
-        />
-      );
-
-      const latencyLimit = throttling[BandwidthLimitKey.LATENCY];
-
-      const latency = getByLabelText('Latency') as HTMLInputElement;
-      userEvent.clear(latency);
-      userEvent.type(latency, String(latencyLimit + 1));
-
-      expect(
-        queryByText(
-          `You have exceeded the latency limit for Synthetic Nodes. The latency value can't be larger than ${latencyLimit}ms.`
-        )
-      ).toBeInTheDocument();
-
-      expect(
-        queryByText("You've exceeded the Synthetics Node bandwidth limits")
-      ).toBeInTheDocument();
-
-      expect(
-        queryByText(
-          'When using throttling values larger than a Synthetics Node bandwidth limit, your monitor will still have its bandwidth capped.'
-        )
-      ).toBeInTheDocument();
-
-      userEvent.clear(latency);
-      userEvent.type(latency, String(latencyLimit - 1));
-      expect(
-        queryByText(
-          `You have exceeded the latency limit for Synthetic Nodes. The latency value can't be larger than ${latencyLimit}ms.`
-        )
-      ).not.toBeInTheDocument();
-
-      expect(
-        queryByText("You've exceeded the Synthetics Node bandwidth limits")
-      ).not.toBeInTheDocument();
-
-      expect(
-        queryByText(
-          'When using throttling values larger than a Synthetics Node bandwidth limit, your monitor will still have its bandwidth capped.'
-        )
-      ).not.toBeInTheDocument();
-    });
   });
 
   it('only displays download, upload, and latency fields with throttling is on', () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx
index 683bc1e79e386..f7fc15887e721 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/throttling_fields.tsx
@@ -76,17 +76,15 @@ export const ThrottlingExceededCallout = () => {
 export const ThrottlingExceededMessage = ({
   throttlingField,
   limit,
-  unit,
 }: {
   throttlingField: string;
   limit: number;
-  unit: string;
 }) => {
   return (
     <FormattedMessage
       id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.throttling_exceeded.message"
-      defaultMessage="You have exceeded the { throttlingField } limit for Synthetic Nodes. The { throttlingField } value can't be larger than { limit }{unit}."
-      values={{ throttlingField, limit, unit }}
+      defaultMessage="You have exceeded the { throttlingField } limit for Synthetic Nodes. The { throttlingField } value can't be larger than { limit }Mbps."
+      values={{ throttlingField, limit }}
     />
   );
 };
@@ -97,7 +95,6 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
 
   const maxDownload = throttling[BandwidthLimitKey.DOWNLOAD];
   const maxUpload = throttling[BandwidthLimitKey.UPLOAD];
-  const maxLatency = throttling[BandwidthLimitKey.LATENCY];
 
   const handleInputChange = useCallback(
     ({ value, configKey }: { value: unknown; configKey: ThrottlingConfigs }) => {
@@ -110,7 +107,6 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
     runsOnService && parseFloat(fields[ConfigKey.DOWNLOAD_SPEED]) > maxDownload;
   const exceedsUploadLimits =
     runsOnService && parseFloat(fields[ConfigKey.UPLOAD_SPEED]) > maxUpload;
-  const exceedsLatencyLimits = runsOnService && parseFloat(fields[ConfigKey.LATENCY]) > maxLatency;
   const isThrottlingEnabled = fields[ConfigKey.IS_THROTTLING_ENABLED];
 
   const throttlingInputs = isThrottlingEnabled ? (
@@ -127,7 +123,7 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
         isInvalid={!!validate[ConfigKey.DOWNLOAD_SPEED]?.(fields) || exceedsDownloadLimits}
         error={
           exceedsDownloadLimits ? (
-            <ThrottlingExceededMessage throttlingField="download" limit={maxDownload} unit="Mbps" />
+            <ThrottlingExceededMessage throttlingField="download" limit={maxDownload} />
           ) : (
             <FormattedMessage
               id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.error"
@@ -166,7 +162,7 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
         isInvalid={!!validate[ConfigKey.UPLOAD_SPEED]?.(fields) || exceedsUploadLimits}
         error={
           exceedsUploadLimits ? (
-            <ThrottlingExceededMessage throttlingField="upload" limit={maxUpload} unit="Mbps" />
+            <ThrottlingExceededMessage throttlingField="upload" limit={maxUpload} />
           ) : (
             <FormattedMessage
               id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.upload.error"
@@ -202,16 +198,12 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
           />
         }
         labelAppend={<OptionalLabel />}
-        isInvalid={!!validate[ConfigKey.LATENCY]?.(fields) || exceedsLatencyLimits}
+        isInvalid={!!validate[ConfigKey.LATENCY]?.(fields)}
         error={
-          exceedsLatencyLimits ? (
-            <ThrottlingExceededMessage throttlingField="latency" limit={maxLatency} unit="ms" />
-          ) : (
-            <FormattedMessage
-              id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error"
-              defaultMessage="Latency must not be negative."
-            />
-          )
+          <FormattedMessage
+            id="xpack.uptime.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error"
+            defaultMessage="Latency must not be negative."
+          />
         }
       >
         <EuiFieldNumber
@@ -277,8 +269,7 @@ export const ThrottlingFields = memo<Props>(({ validate, minColumnWidth, onField
         }
         onBlur={() => onFieldBlur?.(ConfigKey.IS_THROTTLING_ENABLED)}
       />
-      {isThrottlingEnabled &&
-      (exceedsDownloadLimits || exceedsUploadLimits || exceedsLatencyLimits) ? (
+      {isThrottlingEnabled && (exceedsDownloadLimits || exceedsUploadLimits) ? (
         <>
           <EuiSpacer />
           <ThrottlingExceededCallout />
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx b/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
index ee3ede16582f9..328d05217b98f 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/code_editor.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { EuiPanel } from '@elastic/eui';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-import { CodeEditor as MonacoCodeEditor } from '../../../../../../src/plugins/kibana_react/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { CodeEditor as MonacoCodeEditor } from '@kbn/kibana-react-plugin/public';
 
 import { MonacoEditorLangId } from './types';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx b/x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx
index 5668b6f1121c8..c029be5fbef22 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/common/described_form_group_with_wrap.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { EuiDescribedFormGroup } from '@elastic/eui';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 /**
  * EuiForm group doesn't expose props to control the flex wrapping on flex groups defining form rows.
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts b/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts
index e71a0511cbaf1..8f1b7ad230d9c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/common/normalizers.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { CommonFields, ConfigKey } from '../types';
-import { NewPackagePolicyInput } from '../../../../../fleet/common';
+import { NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
+import { CommonFields, ConfigKey, DataStream } from '../types';
 import { defaultValues as commonDefaultValues } from './default_values';
 import { DEFAULT_NAMESPACE_STRING } from '../../../../common/constants';
+import { defaultConfig } from '../contexts';
 
 // TO DO: create a standard input format that all fields resolve to
 export type Normalizer = (fields: NewPackagePolicyInput['vars']) => unknown;
@@ -64,6 +65,7 @@ export const commonNormalizers: CommonNormalizerMap = {
   [ConfigKey.LOCATIONS]: getCommonNormalizer(ConfigKey.LOCATIONS),
   [ConfigKey.SCHEDULE]: (fields) => {
     const value = fields?.[ConfigKey.SCHEDULE]?.value;
+    const type = fields?.[ConfigKey.MONITOR_TYPE]?.value as DataStream;
     if (value) {
       const fullString = JSON.parse(fields?.[ConfigKey.SCHEDULE]?.value);
       const fullSchedule = fullString.replace('@every ', '');
@@ -74,7 +76,7 @@ export const commonNormalizers: CommonNormalizerMap = {
         number,
       };
     } else {
-      return commonDefaultValues[ConfigKey.SCHEDULE];
+      return defaultConfig[type][ConfigKey.SCHEDULE];
     }
   },
   [ConfigKey.APM_SERVICE_NAME]: getCommonNormalizer(ConfigKey.APM_SERVICE_NAME),
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx b/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
index 015023318556a..f7b67488e4bcc 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/contexts/browser_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext, useMemo, useState } from 'react';
-import { BrowserSimpleFields, ConfigKey, DataStream } from '../types';
+import { BrowserSimpleFields, ConfigKey, DataStream, ScheduleUnit } from '../types';
 import { defaultValues as commonDefaultValues } from '../common/default_values';
 
 interface BrowserSimpleFieldsContext {
@@ -22,6 +22,10 @@ interface BrowserSimpleFieldsContextProvider {
 
 export const initialValues: BrowserSimpleFields = {
   ...commonDefaultValues,
+  [ConfigKey.SCHEDULE]: {
+    unit: ScheduleUnit.MINUTES,
+    number: '10',
+  },
   [ConfigKey.METADATA]: {
     script_source: {
       is_generated_script: false,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
index 9a22163b9c90d..e4e55b96f09dc 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/custom_fields.test.tsx
@@ -34,8 +34,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx
index c8a96c8eede83..9a3597e678c3c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.test.tsx
@@ -6,7 +6,7 @@
  */
 import { renderHook } from '@testing-library/react-hooks';
 import { useUpdatePolicy } from './use_update_policy';
-import { NewPackagePolicy } from '../../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { validate } from '../validation';
 import {
   ConfigKey,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts b/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts
index 8c312c8c9abfa..dcccecb220ac0 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/hooks/use_update_policy.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { useEffect, useRef, useState } from 'react';
-import { NewPackagePolicy } from '../../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { ConfigKey, DataStream, Validation, MonitorFields } from '../types';
 import { formatters } from '../helpers/formatters';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
index b84a659753a35..c6d2d90467595 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/http/advanced_fields.test.tsx
@@ -26,8 +26,8 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
index ec7266acca989..5fce9cfd1461c 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_create_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyCreateExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazySyntheticsPolicyCreateExtension = lazy<PackagePolicyCreateExtensionComponent>(
   async () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
index e7b0564ad4cc3..0810dec8591bf 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/lazy_synthetics_policy_edit_extension.tsx
@@ -6,7 +6,7 @@
  */
 
 import { lazy } from 'react';
-import { PackagePolicyEditExtensionComponent } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponent } from '@kbn/fleet-plugin/public';
 
 export const LazySyntheticsPolicyEditExtension = lazy<PackagePolicyEditExtensionComponent>(
   async () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
index c3bc20076bc2f..6dad2b9b6efd9 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/request_body_field.test.tsx
@@ -17,8 +17,8 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx
index 7eda6efa20530..65ebdf27dd374 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_custom_assets_extension.tsx
@@ -12,8 +12,8 @@ import {
   PackageAssetsComponent,
   CustomAssetsAccordionProps,
   CustomAssetsAccordion,
-} from '../../../../fleet/public';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+} from '@kbn/fleet-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ClientPluginsStart } from '../../apps/plugin';
 import { PLUGIN } from '../../../common/constants/plugin';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
index db06f9dd8cd91..e93cc20e4d2ad 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { memo, useEffect, useMemo } from 'react';
-import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public';
-import { useTrackPageview } from '../../../../observability/public';
+import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { DataStream } from './types';
 import { PolicyConfig } from './types';
 import {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
index 08c802803b3ea..977f2a94660ce 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
@@ -10,7 +10,7 @@ import 'jest-canvas-mock';
 import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../lib/helper/rtl_helpers';
-import { NewPackagePolicy } from '../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { SyntheticsPolicyCreateExtensionWrapper } from './synthetics_policy_create_extension_wrapper';
 import { defaultConfig } from './synthetics_policy_create_extension';
 import { ConfigKey, DataStream, ScheduleUnit, VerificationMode } from './types';
@@ -27,8 +27,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
index e3e13b16ebf22..976c363ef6568 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { memo } from 'react';
-import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public';
+import { PackagePolicyCreateExtensionComponentProps } from '@kbn/fleet-plugin/public';
 import { SyntheticsPolicyCreateExtension } from './synthetics_policy_create_extension';
 import { SyntheticsProviders } from './contexts';
 
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
index db512537dfdb8..edc8e3f58d490 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { memo } from 'react';
-import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public';
-import { useTrackPageview } from '../../../../observability/public';
+import { PackagePolicyEditExtensionComponentProps } from '@kbn/fleet-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { usePolicyConfigContext } from './contexts';
 import { MonitorFields, PolicyConfig } from './types';
 import { CustomFields } from './custom_fields';
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
index d61566c4ad12e..ed7f02a159822 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
@@ -10,7 +10,7 @@ import 'jest-canvas-mock';
 import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../lib/helper/rtl_helpers';
-import { NewPackagePolicy } from '../../../../fleet/public';
+import { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { SyntheticsPolicyEditExtensionWrapper } from './synthetics_policy_edit_extension_wrapper';
 import { ConfigKey, DataStream, ScheduleUnit } from './types';
 import { defaultConfig } from './synthetics_policy_create_extension';
@@ -27,8 +27,8 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => ({
   useGeneratedHtmlId: () => `id-${Math.random()}`,
 }));
 
-jest.mock('../../../../../../src/plugins/kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../../src/plugins/kibana_react/public');
+jest.mock('@kbn/kibana-react-plugin/public', () => {
+  const original = jest.requireActual('@kbn/kibana-react-plugin/public');
   return {
     ...original,
     // Mocking CodeEditor, which uses React Monaco under the hood
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
index ed676443202ab..bffdc882115a0 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { memo, useMemo } from 'react';
-import { PackagePolicyEditExtensionComponentProps } from '../../../../fleet/public';
+import { PackagePolicyEditExtensionComponentProps } from '@kbn/fleet-plugin/public';
 import { PolicyConfig, MonitorFields } from './types';
-import { ConfigKey, DataStream, TLSFields } from '././types';
+import { ConfigKey, DataStream, TLSFields } from './types';
 import { SyntheticsPolicyEditExtension } from './synthetics_policy_edit_extension';
 import {
   PolicyConfigContextProvider,
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
index 1176ea5e6a5c3..435eb7e4f9001 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useContext, useState } from 'react';
 
 import { EuiButton, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
 import { useSelector, useDispatch } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../../common/constants/alerts';
 import {
   canDeleteMLJobSelector,
@@ -30,7 +31,6 @@ import {
   isAnomalyAlertDeleting,
 } from '../../../state/alerts/alerts';
 import { UptimeEditAlertFlyoutComponent } from '../../common/alerts/uptime_edit_alert_flyout';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   hasMLJob: boolean;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
index ef0d2857b6b5f..482e3f70b3180 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
@@ -8,7 +8,8 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import type { Observable } from 'rxjs';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
+import { toMountPoint, useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   canCreateMLJobSelector,
   hasMLJobSelector,
@@ -30,7 +31,6 @@ import { useGetUrlParams } from '../../../hooks';
 import { getDynamicSettings } from '../../../state/actions/dynamic_settings';
 import { useMonitorId } from '../../../hooks';
 import { kibanaService } from '../../../state/kibana_service';
-import { toMountPoint, useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { CLIENT_ALERT_TYPES } from '../../../../common/constants/alerts';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
index 0fe7dce9ee2c1..6396f99e4d62c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
@@ -7,6 +7,8 @@
 
 import React, { useContext, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { JobStat } from '@kbn/ml-plugin/public';
 import { MachineLearningFlyout } from './ml_flyout_container';
 import {
   hasMLFeatureSelector,
@@ -18,9 +20,7 @@ import { deleteMLJobAction, getExistingMLJobAction, resetMLState } from '../../.
 import { ConfirmJobDeletion } from './confirm_delete';
 import { UptimeRefreshContext } from '../../../contexts';
 import * as labels from './translations';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ManageMLJobComponent } from './manage_ml_job';
-import { JobStat } from '../../../../../../plugins/ml/public';
 import { useMonitorId } from '../../../hooks';
 import { getMLJobId } from '../../../../common/lib';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
index f29be50633fab..1349348981b22 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integerations.test.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import { MLIntegrationComponent } from './ml_integeration';
 import { renderWithRouter, shallowWithRouter } from '../../../lib';
 import * as redux from 'react-redux';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
-import { coreMock } from 'src/core/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { coreMock } from '@kbn/core/public/mocks';
 
 const core = coreMock.createStart();
 describe('ML Integrations', () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
index 35eab80c15967..8b88c8d59a47c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
@@ -7,6 +7,8 @@
 
 import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { JobStat } from '@kbn/ml-plugin/public';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { useGetUrlParams } from '../../../hooks';
 import {
   getAnomalyRecordsAction,
@@ -20,11 +22,9 @@ import {
   selectDurationLines,
 } from '../../../state/selectors';
 import { UptimeRefreshContext } from '../../../contexts';
-import { JobStat } from '../../../../../ml/public';
 import { MonitorDurationComponent } from './monitor_duration';
 import { MonitorIdParam } from '../../../../common/types';
 import { getMLJobId } from '../../../../common/lib';
-import { createExploratoryViewUrl } from '../../../../../observability/public';
 import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context';
 
 export const MonitorDuration: React.FC<MonitorIdParam> = ({ monitorId }) => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
index c73753fd62783..4790b8c1dd376 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/no_image_available.tsx
@@ -8,7 +8,7 @@
 import { EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
 const BorderedText = euiStyled(EuiText)`
   width: 120px;
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
index 1e853bf3461dc..bc56dc7a8a354 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.test.tsx
@@ -10,13 +10,13 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import { PingTimestamp } from './ping_timestamp';
 import { mockReduxHooks } from '../../../../../lib/helper/test_helpers';
 import { render } from '../../../../../lib/helper/rtl_helpers';
-import * as observabilityPublic from '../../../../../../../observability/public';
+import * as observabilityPublic from '@kbn/observability-plugin/public';
 import { getShortTimeStamp } from '../../../../overview/monitor_list/columns/monitor_status_column';
 import moment from 'moment';
 import '../../../../../lib/__mocks__/use_composite_image.mock';
 import { mockRef } from '../../../../../lib/__mocks__/screenshot_ref.mock';
 
-jest.mock('../../../../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public');
 
 mockReduxHooks();
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
index f0f770779f436..4083df8c98a1a 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/ping_timestamp.tsx
@@ -10,13 +10,13 @@ import useIntersection from 'react-use/lib/useIntersection';
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 
+import { useFetcher, FETCH_STATUS } from '@kbn/observability-plugin/public';
 import {
   isScreenshotImageBlob,
   isScreenshotRef,
   ScreenshotImageBlob,
   ScreenshotRefImageData,
 } from '../../../../../../common/runtime_types';
-import { useFetcher, FETCH_STATUS } from '../../../../../../../observability/public';
 import { getJourneyScreenshot } from '../../../../../state/api/journey';
 import { UptimeSettingsContext } from '../../../../../contexts';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
index 3fa94e45f8937..eb0d8c30ae53d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/columns/ping_timestamp/step_image_caption.tsx
@@ -8,7 +8,7 @@
 import React, { MouseEvent, useEffect } from 'react';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText, useEuiTheme } from '@elastic/eui';
 
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ScreenshotRefImageData } from '../../../../../../common/runtime_types';
 import { useBreakpoints } from '../../../../../hooks';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts b/x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts
index 026ba57d3458f..94669b4aeb8e8 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/use_pings.ts
@@ -7,12 +7,12 @@
 
 import { useDispatch, useSelector } from 'react-redux';
 import { useCallback, useContext, useEffect } from 'react';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { selectPingList } from '../../../state/selectors';
 import { GetPingsParams, Ping } from '../../../../common/runtime_types/ping';
 import { getPings as getPingsAction } from '../../../state/actions';
 import { useGetUrlParams, useMonitorId } from '../../../hooks';
 import { UptimeRefreshContext, UptimeSettingsContext } from '../../../contexts';
-import { useFetcher } from '../../../../../observability/public';
 import { fetchJourneysFailedSteps } from '../../../state/api/journey';
 import { useSelectedFilters } from '../../../hooks/use_selected_filters';
 import { MONITOR_TYPES } from '../../../../common/constants';
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
index c6309debdde1f..e43df25779ab9 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { MonitorLocation } from '../../../../../common/runtime_types/monitor';
-import { LocationStatusTags } from './index';
+import { LocationStatusTags } from '.';
 import { mockMoment } from '../../../../lib/helper/test_helpers';
 import { render } from '../../../../lib/helper/rtl_helpers';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
index 0ca7ea3c82750..53be56d16b9fe 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.tsx
@@ -11,7 +11,7 @@ import styled from 'styled-components';
 import { UptimeThemeContext } from '../../../../contexts';
 import { MonitorLocation } from '../../../../../common/runtime_types';
 import { SHORT_TIMESPAN_LOCALE, SHORT_TS_LOCALE } from '../../../../../common/constants';
-import { AvailabilityReporting } from '../index';
+import { AvailabilityReporting } from '..';
 import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column';
 
 // Set height so that it remains within panel, enough height to display 7 locations tags
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx
index d7e8f70475f54..9b58b0deb8ecc 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/status_by_location.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { renderWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
 import { MonitorLocation } from '../../../../common/runtime_types';
-import { StatusByLocations } from './index';
+import { StatusByLocations } from '.';
 
 describe('StatusByLocation component', () => {
   let monitorLocations: MonitorLocation[];
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx
index ccd31edf73d27..1fb138da9e84b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/status_details_container.tsx
@@ -10,7 +10,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useGetUrlParams } from '../../../hooks';
 import { monitorLocationsSelector } from '../../../state/selectors';
 import { getMonitorLocationsAction } from '../../../state/actions/monitor';
-import { MonitorStatusDetailsComponent } from './index';
+import { MonitorStatusDetailsComponent } from '.';
 import { UptimeRefreshContext } from '../../../contexts';
 import { AppState } from '../../../state';
 import { MonitorIdParam } from '../../../../common/types';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
index f64d36fa0f789..53c1b0066705b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumb.tsx
@@ -7,8 +7,8 @@
 
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { JourneyState } from '../../../../state/reducers/journey';
 import { PLUGIN } from '../../../../../common/constants/plugin';
 import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
index 4521d9f82f92e..a46fad2733bb2 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { of } from 'rxjs';
@@ -14,7 +14,7 @@ import { useMonitorBreadcrumb } from './use_monitor_breadcrumb';
 import { OVERVIEW_ROUTE } from '../../../../../common/constants';
 import { Ping } from '../../../../../common/runtime_types/ping';
 import { JourneyState } from '../../../../state/reducers/journey';
-import { chromeServiceMock, uiSettingsServiceMock } from 'src/core/public/mocks';
+import { chromeServiceMock, uiSettingsServiceMock } from '@kbn/core/public/mocks';
 
 describe('useMonitorBreadcrumbs', () => {
   it('sets the given breadcrumbs for steps list view', () => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
index 441ede99fd8b4..235dceafcfd9d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.test.tsx
@@ -13,7 +13,7 @@ import {
   useStepWaterfallMetrics,
 } from './use_step_waterfall_metrics';
 import * as reduxHooks from 'react-redux';
-import * as searchHooks from '../../../../../../observability/public/hooks/use_es_search';
+import * as searchHooks from '@kbn/observability-plugin/public/hooks/use_es_search';
 
 describe('useStepWaterfallMetrics', () => {
   jest
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
index ad2762826c91f..321d9779db486 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_step_waterfall_metrics.ts
@@ -6,7 +6,7 @@
  */
 
 import { useSelector } from 'react-redux';
-import { createEsParams, useEsSearch } from '../../../../../../observability/public';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 import { selectDynamicSettings } from '../../../../state/selectors';
 import { MarkerItems } from '../waterfall/context/waterfall_chart';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
index aaa3d5c1cc23c..4b50f86e6ee3b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_chart_wrapper.tsx
@@ -7,10 +7,10 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 import { EuiHealth } from '@elastic/eui';
+import { useTrackMetric, METRIC_TYPE } from '@kbn/observability-plugin/public';
 import { getSeriesAndDomain, getSidebarItems, getLegendItems } from './data_formatting';
 import { SidebarItem, LegendItem, NetworkItems } from './types';
 import { WaterfallProvider, WaterfallChart, RenderItem, useFlyout } from '../../waterfall';
-import { useTrackMetric, METRIC_TYPE } from '../../../../../../../observability/public';
 import { WaterfallFilter } from './waterfall_filter';
 import { WaterfallFlyout } from './waterfall_flyout';
 import { WaterfallSidebarItem } from './waterfall_sidebar_item';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
index 42c2df4553b4c..a2667e2259e3a 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_filter.tsx
@@ -18,6 +18,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import useDebounce from 'react-use/lib/useDebounce';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import {
   FILTER_REQUESTS_LABEL,
   FILTER_SCREENREADER_LABEL,
@@ -26,7 +27,6 @@ import {
   FILTER_COLLAPSE_REQUESTS_LABEL,
 } from '../../waterfall/components/translations';
 import { MimeType, FriendlyMimetypeLabels } from './types';
-import { METRIC_TYPE, useUiTracker } from '../../../../../../../observability/public';
 
 interface Props {
   query: string;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
index 53e6583e00cc2..bdcea95c0c0c3 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_flyout.tsx
@@ -18,11 +18,11 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { METRIC_TYPE, useUiTracker } from '@kbn/observability-plugin/public';
 import { Table } from '../../waterfall/components/waterfall_flyout_table';
 import { MiddleTruncatedText } from '../../waterfall';
 import { WaterfallMetadataEntry } from '../../waterfall/types';
 import { OnFlyoutClose } from '../../waterfall/components/use_flyout';
-import { METRIC_TYPE, useUiTracker } from '../../../../../../../observability/public';
 
 export const DETAILS = i18n.translate('xpack.uptime.synthetics.waterfall.flyout.details', {
   defaultMessage: 'Details',
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
index 2d08bbbadfbe4..2a69bbba2eb8c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import 'jest-canvas-mock';
 import { fireEvent } from '@testing-library/react';
 
-import { SidebarItem } from '../waterfall/types';
+import { SidebarItem } from './types';
 import { render } from '../../../../../lib/helper/rtl_helpers';
 import { WaterfallSidebarItem } from './waterfall_sidebar_item';
 import { SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL } from '../../waterfall/components/translations';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
index 1aea9d9e69db7..193fe33121636 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/waterfall_sidebar_item.tsx
@@ -7,7 +7,7 @@
 
 import React, { RefObject, useMemo, useCallback, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
-import { SidebarItem } from '../waterfall/types';
+import { SidebarItem } from './types';
 import { MiddleTruncatedText } from '../../waterfall';
 import { SideBarItemHighlighter } from '../../waterfall/components/styles';
 import { SIDEBAR_FILTER_MATCHES_SCREENREADER_LABEL } from '../../waterfall/components/translations';
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx
index 9a66b586d1d56..0ac41c1d15ff6 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/legend.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { IWaterfallContext } from '../context/waterfall_chart';
 import { WaterfallChartProps } from './waterfall_chart';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 
 interface LegendProps {
   items: Required<IWaterfallContext>['legendItems'];
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
index 11cff8d164858..f649a5f2d373f 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
@@ -16,10 +16,10 @@ import {
   EuiIcon,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { WaterfallTooltipContent } from './waterfall_tooltip_content';
 import { WaterfallChartTooltip } from './styles';
 import { FIXED_AXIS_HEIGHT } from './constants';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { formatTooltipHeading } from '../../step_detail/waterfall/data_formatting';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
index 239b93f83df9b..ae4792d8af883 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
@@ -9,8 +9,8 @@ import { FunctionComponent } from 'react';
 import { StyledComponent } from 'styled-components';
 import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiText, EuiPanelProps } from '@elastic/eui';
 import { rgba } from 'polished';
+import { euiStyled, EuiTheme } from '@kbn/kibana-react-plugin/common';
 import { FIXED_AXIS_HEIGHT } from './constants';
-import { euiStyled, EuiTheme } from '../../../../../../../../../src/plugins/kibana_react/common';
 
 interface WaterfallChartOuterContainerProps {
   height?: string;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
index 1d4ba01d529b4..883a7a8ea9268 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_markers.tsx
@@ -8,9 +8,9 @@
 import React, { useMemo } from 'react';
 import { AnnotationDomainType, LineAnnotation } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
+import { useTheme } from '@kbn/observability-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useWaterfallContext } from '..';
-import { useTheme } from '../../../../../../../observability/public';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { MarkerItems } from '../context/waterfall_chart';
 import { WaterfallMarkerIcon } from './waterfall_marker_icon';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
index 21b3bf72d2217..b9f385c29b9f8 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiText } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useWaterfallContext } from '../context/waterfall_chart';
-import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   text: string;
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx b/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
index 5f6e67e363171..4c6f296e468f9 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar.tsx
@@ -18,14 +18,14 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { useSelector } from 'react-redux';
-import { FETCH_STATUS, useFetcher } from '../../../../../observability/public';
+import { FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
 
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { MONITOR_MANAGEMENT_ROUTE } from '../../../../common/constants';
 import { UptimeSettingsContext } from '../../../contexts';
 import { setMonitor } from '../../../state/api';
 
 import { SyntheticsMonitor } from '../../../../common/runtime_types';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { TestRun } from '../test_now_mode/test_now_mode';
 
 import { monitorManagementListSelector } from '../../../state/selectors';
@@ -121,7 +121,7 @@ export const ActionBar = ({
             <EuiButtonEmpty
               color="ghost"
               size="s"
-              href={`${basePath}/app/uptime/${MONITOR_MANAGEMENT_ROUTE}`}
+              href={`${basePath}/app/uptime/${MONITOR_MANAGEMENT_ROUTE}/all`}
             >
               {DISCARD_LABEL}
             </EuiButtonEmpty>
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
index 88520b8761ae7..b92357f3ecc14 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/action_bar/action_bar_errors.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from '../../../lib/helper/rtl_helpers';
-import { FETCH_STATUS } from '../../../../../observability/public';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 import {
   DataStream,
   HTTPFields,
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx b/x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx
index 70796e54624ac..7596c11dbddad 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/add_monitor_btn.tsx
@@ -9,11 +9,11 @@ import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiFlexItem, EuiFlexGroup, EuiToolTip, EuiSwitch } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { kibanaService } from '../../state/kibana_service';
 import { MONITOR_ADD_ROUTE } from '../../../common/constants';
 import { useEnablement } from './hooks/use_enablement';
 import { useSyntheticsServiceAllowed } from './hooks/use_service_allowed';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 export const AddMonitorBtn = () => {
   const history = useHistory();
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx b/x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx
index e22e393882945..28e0bb105e29a 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/edit_monitor_config.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useMemo } from 'react';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import {
   ConfigKey,
   MonitorFields,
@@ -14,7 +15,6 @@ import {
   ScheduleUnit,
   ThrottlingOptions,
 } from '../../../common/runtime_types';
-import { useTrackPageview } from '../../../../observability/public';
 import { SyntheticsProviders } from '../fleet_package/contexts';
 import { PolicyConfig } from '../fleet_package/types';
 import { MonitorConfig } from './monitor_config/monitor_config';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx
index 649b009687e33..fe20dc3ea6c9d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.test.tsx
@@ -9,7 +9,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { MockRedux } from '../../../lib/helper/rtl_helpers';
 import { useInlineErrors } from './use_inline_errors';
 import { DEFAULT_THROTTLING } from '../../../../common/runtime_types';
-import * as obsvPlugin from '../../../../../observability/public/hooks/use_es_search';
+import * as obsvPlugin from '@kbn/observability-plugin/public/hooks/use_es_search';
 
 function mockNow(date: string | number | Date) {
   const fakeNow = new Date(date).getTime();
@@ -63,10 +63,9 @@ describe('useInlineErrors', function () {
           size: 1000,
           sort: [{ '@timestamp': 'desc' }],
         },
-        index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
+        index: 'synthetics-*',
       },
       [
-        'heartbeat-8*,heartbeat-7*,synthetics-*',
         {
           error: { monitorList: null, serviceLocations: null, enablement: null },
           enablement: null,
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts
index 3753d95b8e858..ae9c5d20345a9 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts
+++ b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors.ts
@@ -8,12 +8,13 @@
 import { useSelector } from 'react-redux';
 import moment from 'moment';
 import { useMemo } from 'react';
-import { monitorManagementListSelector, selectDynamicSettings } from '../../../state/selectors';
-import { useEsSearch } from '../../../../../observability/public';
+import { useEsSearch } from '@kbn/observability-plugin/public';
+import { monitorManagementListSelector } from '../../../state/selectors';
 import { Ping } from '../../../../common/runtime_types';
 import { EXCLUDE_RUN_ONCE_FILTER } from '../../../../common/constants/client_defaults';
 import { useUptimeRefreshContext } from '../../../contexts/uptime_refresh_context';
 import { useInlineErrorsCount } from './use_inline_errors_count';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../common/constants';
 
 const sortFieldMap: Record<string, string> = {
   name: 'monitor.name',
@@ -71,8 +72,6 @@ export function useInlineErrors({
 }) {
   const monitorList = useSelector(monitorManagementListSelector);
 
-  const { settings } = useSelector(selectDynamicSettings);
-
   const { lastRefresh } = useUptimeRefreshContext();
 
   const configIds = monitorList.list.monitors.map((monitor) => monitor.id);
@@ -81,7 +80,7 @@ export function useInlineErrors({
 
   const { data, loading } = useEsSearch(
     {
-      index: doFetch ? settings?.heartbeatIndices : '',
+      index: doFetch ? SYNTHETICS_INDEX_PATTERN : '',
       body: {
         size: 1000,
         query: {
@@ -93,7 +92,7 @@ export function useInlineErrors({
         sort: [{ [sortFieldMap[sortField]]: sortOrder }],
       },
     },
-    [settings?.heartbeatIndices, monitorList, lastRefresh, doFetch, sortField, sortOrder],
+    [monitorList, lastRefresh, doFetch, sortField, sortOrder],
     { name: 'getInvalidMonitors' }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
index e973e3dd1a7f1..7ad0d58488e99 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.test.tsx
@@ -8,7 +8,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { MockRedux } from '../../../lib/helper/rtl_helpers';
 import { useInlineErrorsCount } from './use_inline_errors_count';
-import * as obsvPlugin from '../../../../../observability/public/hooks/use_es_search';
+import * as obsvPlugin from '@kbn/observability-plugin/public/hooks/use_es_search';
 import { DEFAULT_THROTTLING } from '../../../../common/runtime_types';
 
 function mockNow(date: string | number | Date) {
@@ -62,10 +62,9 @@ describe('useInlineErrorsCount', function () {
           },
           size: 0,
         },
-        index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
+        index: 'synthetics-*',
       },
       [
-        'heartbeat-8*,heartbeat-7*,synthetics-*',
         {
           error: { monitorList: null, serviceLocations: null, enablement: null },
           list: { monitors: [], page: 1, perPage: 10, total: null, syncErrors: null },
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts
index adda7c433b29c..64b37d371cac5 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts
+++ b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_inline_errors_count.ts
@@ -7,21 +7,20 @@
 
 import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
-import { monitorManagementListSelector, selectDynamicSettings } from '../../../state/selectors';
-import { useEsSearch } from '../../../../../observability/public';
+import { useEsSearch } from '@kbn/observability-plugin/public';
+import { monitorManagementListSelector } from '../../../state/selectors';
 import { useUptimeRefreshContext } from '../../../contexts/uptime_refresh_context';
 import { getInlineErrorFilters } from './use_inline_errors';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../common/constants';
 
 export function useInlineErrorsCount() {
   const monitorList = useSelector(monitorManagementListSelector);
 
-  const { settings } = useSelector(selectDynamicSettings);
-
   const { lastRefresh } = useUptimeRefreshContext();
 
   const { data, loading } = useEsSearch(
     {
-      index: settings?.heartbeatIndices,
+      index: SYNTHETICS_INDEX_PATTERN,
       body: {
         size: 0,
         query: {
@@ -36,7 +35,7 @@ export function useInlineErrorsCount() {
         },
       },
     },
-    [settings?.heartbeatIndices, monitorList, lastRefresh],
+    [monitorList, lastRefresh],
     { name: 'getInvalidMonitorsCount' }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx
index 98e882e543a87..cf63e7c4cd9e6 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/hooks/use_invalid_monitors.tsx
@@ -6,8 +6,8 @@
  */
 
 import moment from 'moment';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { useFetcher } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { Ping, SyntheticsMonitor } from '../../../../common/runtime_types';
 import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
index 3b416436f9cc4..5fdae73a43e11 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/monitor_advanced_fields.tsx
@@ -7,7 +7,7 @@
 import { EuiFieldText, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { memo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ConfigKey } from '../../../../common/runtime_types';
 import type { Validation } from '../../../../common/types';
 import { DescribedFormGroupWithWrap } from '../../fleet_package/common/described_form_group_with_wrap';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
index f1d2d9d470cfe..ccfc1312cbf25 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.test.tsx
@@ -18,7 +18,9 @@ describe('useMonitorName', () => {
     expect(result.current).toStrictEqual({ nameAlreadyExists: false, validName: '' });
     expect(defaultCore.savedObjects.client.find).toHaveBeenCalledWith({
       aggs: {
-        monitorNames: { terms: { field: 'synthetics-monitor.attributes.name', size: 10000 } },
+        monitorNames: {
+          terms: { field: 'synthetics-monitor.attributes.name.keyword', size: 10000 },
+        },
       },
       perPage: 0,
       type: 'synthetics-monitor',
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts
index f37bd94944b92..200a9599b405e 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_config/use_monitor_name.ts
@@ -6,8 +6,8 @@
  */
 
 import { useEffect, useState } from 'react';
-import { useFetcher } from '../../../../../observability/public';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
 import { useMonitorId } from '../../../hooks';
 
@@ -30,7 +30,7 @@ export const useMonitorName = ({ search = '' }: { search?: string }) => {
     const aggs = {
       monitorNames: {
         terms: {
-          field: `${syntheticsMonitorType}.attributes.name`,
+          field: `${syntheticsMonitorType}.attributes.name.keyword`,
           size: 10000,
         },
       },
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
index f8a81a6efce0b..aa1a845c3b759 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.test.tsx
@@ -10,10 +10,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from '../../../lib/helper/rtl_helpers';
 import * as fetchers from '../../../state/api/monitor_management';
-import {
-  FETCH_STATUS,
-  useFetcher as originalUseFetcher,
-} from '../../../../../observability/public';
+import { FETCH_STATUS, useFetcher as originalUseFetcher } from '@kbn/observability-plugin/public';
 import { spyOnUseFetcher } from '../../../lib/helper/spy_use_fetcher';
 import { Actions } from './actions';
 import { DeleteMonitor } from './delete_monitor';
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx
index 88bace104adac..0a90e4eb39a06 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/delete_monitor.tsx
@@ -9,10 +9,10 @@ import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
 import { EuiButtonIcon, EuiConfirmModal, EuiLoadingSpinner } from '@elastic/eui';
 
-import { FETCH_STATUS, useFetcher } from '../../../../../observability/public';
+import { FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { deleteMonitor } from '../../../state/api';
 import { kibanaService } from '../../../state/kibana_service';
-import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
 
 export const DeleteMonitor = ({
   id,
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
index c1ed29e999569..e8d3c37842d0c 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/enablement_empty_state.tsx
@@ -8,7 +8,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiEmptyPrompt, EuiButton, EuiTitle, EuiLink } from '@elastic/eui';
-import { useEnablement } from '..//hooks/use_enablement';
+import { useEnablement } from '../hooks/use_enablement';
 import { kibanaService } from '../../../state/kibana_service';
 import { SYNTHETICS_ENABLE_SUCCESS, SYNTHETICS_DISABLE_SUCCESS } from '../content';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx
index bfac60de96bc7..07a3e36f6ca78 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.test.tsx
@@ -28,7 +28,7 @@ describe('<MonitorListTabs />', () => {
     expect(onPageStateChange).toHaveBeenCalledWith({
       pageIndex: 1,
       pageSize: 10,
-      sortField: 'name',
+      sortField: 'name.keyword',
       sortOrder: 'asc',
     });
   });
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx
index 1aad6d4d888e5..17b7ca839dcd0 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/list_tabs.tsx
@@ -39,7 +39,12 @@ export const MonitorListTabs = ({
 
   useEffect(() => {
     setSelectedTabId(viewType);
-    onPageStateChange({ pageIndex: 1, pageSize: 10, sortOrder: 'asc', sortField: ConfigKey.NAME });
+    onPageStateChange({
+      pageIndex: 1,
+      pageSize: 10,
+      sortOrder: 'asc',
+      sortField: `${ConfigKey.NAME}.keyword`,
+    });
   }, [viewType, onPageStateChange]);
 
   const tabs = [
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
index 8ce9b719c065c..d7e04f0e6140f 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.test.tsx
@@ -10,7 +10,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ConfigKey, DataStream, SyntheticsMonitor } from '../../../../common/runtime_types';
 import { render } from '../../../lib/helper/rtl_helpers';
-import { FETCH_STATUS } from '../../../../../observability/public';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 import { spyOnUseFetcher } from '../../../lib/helper/spy_use_fetcher';
 import { MonitorEnabled } from './monitor_enabled';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx
index 00d146a8f44b4..e441e44da221d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_enabled.tsx
@@ -8,8 +8,8 @@
 import { EuiSwitch, EuiProgress, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { FETCH_STATUS, useFetcher } from '../../../../../observability/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
 import { ConfigKey, EncryptedSyntheticsMonitor } from '../../../../common/runtime_types';
 import { setMonitor } from '../../../state/api';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx
index 40eb185a65f0c..a641f7a76f3a7 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.test.tsx
@@ -72,7 +72,7 @@ describe('<MonitorManagementList />', () => {
   const pageState: MonitorManagementListPageState = {
     pageIndex: 1,
     pageSize: 10,
-    sortField: ConfigKey.NAME,
+    sortField: `${ConfigKey.NAME}.keyword`,
     sortOrder: 'asc',
   };
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx
index 6ad9c4c2535e5..e38dad1c10d46 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list.tsx
@@ -15,13 +15,12 @@ import {
 import { EuiTableSortingType } from '@elastic/eui/src/components/basic_table/table_types';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useContext, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   CommonFields,
   ConfigKey,
   FetchMonitorManagementListQueryArgs,
   ICMPSimpleFields,
-  MonitorFields,
   Ping,
   ServiceLocations,
   EncryptedSyntheticsMonitorWithId,
@@ -39,7 +38,10 @@ import { MonitorTags } from './tags';
 export interface MonitorManagementListPageState {
   pageIndex: number;
   pageSize: number;
-  sortField: keyof MonitorFields;
+  sortField:
+    | `${ConfigKey.URLS}.keyword`
+    | `${ConfigKey.NAME}.keyword`
+    | `${ConfigKey.MONITOR_TYPE}.keyword`;
   sortOrder: NonNullable<FetchMonitorManagementListQueryArgs['sortOrder']>;
 }
 
@@ -86,7 +88,7 @@ export const MonitorManagementList = ({
       onPageStateChange({
         pageIndex: index + 1, // page index for Saved Objects is base 1
         pageSize: size,
-        sortField: field as keyof MonitorFields,
+        sortField: `${field}.keyword` as MonitorManagementListPageState['sortField'],
         sortOrder: direction,
       });
     },
@@ -102,7 +104,7 @@ export const MonitorManagementList = ({
 
   const sorting: EuiTableSortingType<EncryptedSyntheticsMonitorWithId> = {
     sort: {
-      field: sortField as keyof EncryptedSyntheticsMonitorWithId,
+      field: sortField.replace('.keyword', '') as keyof EncryptedSyntheticsMonitorWithId,
       direction: sortOrder,
     },
   };
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx
index 53afdf49c1592..92b61cf1d744d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/monitor_list/monitor_list_container.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useReducer, useCallback, Reducer } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { ConfigKey } from '../../../../common/runtime_types';
 import { getMonitors } from '../../../state/actions';
 import { monitorManagementListSelector } from '../../../state/selectors';
@@ -27,7 +27,7 @@ export const MonitorListContainer: React.FC = () => {
       pageIndex: 1, // saved objects page index is base 1
       pageSize: 10,
       sortOrder: 'asc',
-      sortField: ConfigKey.NAME,
+      sortField: `${ConfigKey.NAME}.keyword`,
     }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx b/x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx
index 845215ec2d19f..2a6512b7b7dfc 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/show_sync_errors.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { kibanaService } from '../../state/kibana_service';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
 import { ServiceLocationErrors, ServiceLocations } from '../../../common/runtime_types';
 
 export const showSyncErrors = (errors: ServiceLocationErrors, locations: ServiceLocations) => {
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
index d164e19705838..edeb0c57eb31d 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/browser_test_results.test.tsx
@@ -47,8 +47,8 @@ describe('BrowserTestRunResult', function () {
             },
             sort: [{ '@timestamp': 'desc' }],
           },
-          index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
-          size: 10,
+          index: 'synthetics-*',
+          size: 1000,
         },
       },
       {}
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
index 04605373f369e..a54cead8378a1 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
+++ b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/browser/use_browser_run_once_monitors.ts
@@ -4,15 +4,13 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
-import { useSelector } from 'react-redux';
 import { useEffect, useState } from 'react';
-import { selectDynamicSettings } from '../../../../state/selectors';
+import { createEsParams, useEsSearch, useFetcher } from '@kbn/observability-plugin/public';
 import { JourneyStep } from '../../../../../common/runtime_types';
-import { createEsParams, useEsSearch, useFetcher } from '../../../../../../observability/public';
 import { useTickTick } from '../use_tick_tick';
 import { fetchJourneySteps } from '../../../../state/api/journey';
 import { isStepEnd } from '../../../synthetics/check_steps/steps_list';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../../common/constants';
 
 export const useBrowserEsResults = ({
   configId,
@@ -23,11 +21,9 @@ export const useBrowserEsResults = ({
   testRunId?: string;
   lastRefresh: number;
 }) => {
-  const { settings } = useSelector(selectDynamicSettings);
-
   return useEsSearch(
     createEsParams({
-      index: settings?.heartbeatIndices,
+      index: SYNTHETICS_INDEX_PATTERN,
       body: {
         sort: [
           {
@@ -60,9 +56,9 @@ export const useBrowserEsResults = ({
           },
         },
       },
-      size: 10,
+      size: 1000,
     }),
-    [configId, settings?.heartbeatIndices, lastRefresh],
+    [configId, lastRefresh],
     { name: 'TestRunData' }
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
index 1d5dfef8a67e7..da27837a34e8c 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/simple_test_results.test.tsx
@@ -39,8 +39,8 @@ describe('SimpleTestResults', function () {
             },
             sort: [{ '@timestamp': 'desc' }],
           },
-          index: 'heartbeat-8*,heartbeat-7*,synthetics-*',
-          size: 10,
+          index: 'synthetics-*',
+          size: 1000,
         },
       },
       {}
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
index fc43844103f25..5d12662d1e113 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
+++ b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/simple/use_simple_run_once_monitors.ts
@@ -5,12 +5,11 @@
  * 2.0.
  */
 
-import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
-import { selectDynamicSettings } from '../../../../state/selectors';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 import { Ping } from '../../../../../common/runtime_types';
-import { createEsParams, useEsSearch } from '../../../../../../observability/public';
 import { useTickTick } from '../use_tick_tick';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../../../common/constants';
 
 export const useSimpleRunOnceMonitors = ({
   configId,
@@ -21,11 +20,9 @@ export const useSimpleRunOnceMonitors = ({
 }) => {
   const { refreshTimer, lastRefresh } = useTickTick(2 * 1000, false);
 
-  const { settings } = useSelector(selectDynamicSettings);
-
   const { data, loading } = useEsSearch(
     createEsParams({
-      index: settings?.heartbeatIndices,
+      index: SYNTHETICS_INDEX_PATTERN,
       body: {
         sort: [
           {
@@ -58,9 +55,9 @@ export const useSimpleRunOnceMonitors = ({
           },
         },
       },
-      size: 10,
+      size: 1000,
     }),
-    [configId, settings?.heartbeatIndices, lastRefresh],
+    [configId, lastRefresh],
     { name: 'TestRunData' }
   );
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx
index a4f04e04ddc14..fc5ab8aef94e4 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor_management/test_now_mode/test_now_mode.tsx
@@ -15,9 +15,9 @@ import {
   EuiPanel,
   EuiSpacer,
 } from '@elastic/eui';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { TestRunResult } from './test_run_results';
 import { MonitorFields } from '../../../../common/runtime_types';
-import { useFetcher } from '../../../../../observability/public';
 import { runOnceMonitor } from '../../../state/api';
 import { kibanaService } from '../../../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/components/monitor_management/validation.ts b/x-pack/plugins/uptime/public/components/monitor_management/validation.ts
index ce6e5110c8f88..78b0b8ba82b68 100644
--- a/x-pack/plugins/uptime/public/components/monitor_management/validation.ts
+++ b/x-pack/plugins/uptime/public/components/monitor_management/validation.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { isValidNamespace } from '../../../../fleet/common';
+import { isValidNamespace } from '@kbn/fleet-plugin/common';
 import {
   ConfigKey,
   DataStream,
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
index ad6ffeacc909f..0e9244cdc15ad 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useState } from 'react';
 import { EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { isValidKuery } from '../../query_bar/query_bar';
 import * as labels from '../translations';
 import { useIndexPattern } from '../../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
index b7d3fc368c4ba..2dc9489f39a6c 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import { setAlertFlyoutType, setAlertFlyoutVisible } from '../../../../state/actions';
-import { ToggleAlertFlyoutButtonComponent } from '../index';
+import { ToggleAlertFlyoutButtonComponent } from '..';
 
 export interface ToggleAlertFlyoutButtonProps {
   alertOptions?: string[];
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
index 5863fc84f4ac9..e6aee6207093e 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/use_snap_shot.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { useIndexPattern, generateUpdatedKueryString } from '../../../../hooks';
-import { useFetcher } from '../../../../../../observability/public';
 import { fetchSnapshotCount } from '../../../../state/api';
 
 export const useSnapShotCount = ({ query, filters }: { query: string; filters: [] | string }) => {
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
index 14cca50bdafdc..c22aed0c8a9ce 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
@@ -15,11 +15,11 @@ import {
 } from '@elastic/eui';
 import { useSelector } from 'react-redux';
 import React, { useEffect, useState } from 'react';
+import { getSeverityColor, getSeverity } from '@kbn/ml-plugin/public';
 import { AnomalyTranslations } from './translations';
 import { AlertExpressionPopover } from '../alert_expression_popover';
 import { DEFAULT_SEVERITY, SelectSeverity, SEVERITY_OPTIONS } from './select_severity';
 import { monitorIdSelector } from '../../../../state/selectors';
-import { getSeverityColor, getSeverity } from '../../../../../../ml/public';
 
 interface Props {
   ruleParams: { [key: string]: any };
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx
index 92ae02972ff62..eed650fe6074a 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/anomaly_alert/select_severity.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiHealth, EuiSpacer, EuiSuperSelect, EuiText } from '@elastic/eui';
-import { getSeverityColor } from '../../../../../../ml/public';
+import { getSeverityColor } from '@kbn/ml-plugin/public';
 
 const warningLabel = i18n.translate('xpack.uptime.controls.selectSeverity.warningLabel', {
   defaultMessage: 'warning',
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
index d9927731a62ef..df0c40e477b26 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.test.tsx
@@ -10,7 +10,7 @@ import { fireEvent, waitFor } from '@testing-library/react';
 import { FiltersExpressionsSelect } from './filters_expression_select';
 import { render } from '../../../../lib/helper/rtl_helpers';
 import { filterAriaLabels as aria } from './translations';
-import * as Hooks from '../../../../../../observability/public/hooks/use_values_list';
+import * as Hooks from '@kbn/observability-plugin/public/hooks/use_values_list';
 
 describe('FiltersExpressionSelect', () => {
   const LOCATION_FIELD_NAME = 'observer.geo.name';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
index 0e083d1fcd679..e34caf1b95b8b 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
@@ -7,9 +7,9 @@
 
 import React, { useState } from 'react';
 import { EuiButtonIcon, EuiExpression, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { FieldValueSuggestions } from '@kbn/observability-plugin/public';
 import { filterLabels } from '../../filter_group/translations';
 import { alertFilterLabels, filterAriaLabels } from './translations';
-import { FieldValueSuggestions } from '../../../../../../observability/public';
 import { useIndexPattern } from '../../../../contexts/uptime_index_pattern_context';
 import { FILTER_FIELDS } from '../../../../../common/constants';
 import { useGetUrlParams } from '../../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx
index 9c373731d7bb5..71cdee07699c3 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/settings_message_expression_popover.tsx
@@ -9,7 +9,7 @@ import { EuiLink } from '@elastic/eui';
 import { EuiExpression, EuiPopover } from '@elastic/eui';
 import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 interface SettingsMessageExpressionPopoverProps {
   'aria-label': string;
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
index 71553893b6725..9aede506dde97 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
@@ -16,9 +16,9 @@ import {
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../../common/constants/alerts';
-import { ClientPluginsStart } from '../../../../public/apps/plugin';
+import { ClientPluginsStart } from '../../../apps/plugin';
 
 import { ToggleFlyoutTranslations } from './translations';
 import { ToggleAlertFlyoutButtonProps } from './alerts_containers';
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
index cf3a9d0800aea..609c4ff6c0c9f 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../../../plugins/triggers_actions_ui/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 
 interface Props {
   alertFlyoutVisible: boolean;
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
index 9848ea77d4673..bf1459cbcd789 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
@@ -8,7 +8,7 @@
 import { EuiEmptyPrompt, EuiPanel, EuiTitle, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 interface EmptyStateErrorProps {
   errors: Array<IHttpFetchError<ResponseErrorBody>>;
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
index 62e9622c17615..706697357dab2 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { FilterGroup } from './filter_group';
-import * as Hooks from '../../../../../observability/public/hooks/use_values_list';
+import * as Hooks from '@kbn/observability-plugin/public/hooks/use_values_list';
 
 describe('FilterGroup', () => {
   it.each([
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
index e25e764390f6b..d73c2df73919b 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
@@ -9,9 +9,9 @@ import React, { useCallback, useState } from 'react';
 import { EuiFilterGroup } from '@elastic/eui';
 import styled from 'styled-components';
 import { capitalize } from 'lodash';
+import { FieldValueSuggestions, useInspectorContext } from '@kbn/observability-plugin/public';
 import { useFilterUpdate } from '../../../hooks/use_filter_update';
 import { useSelectedFilters } from '../../../hooks/use_selected_filters';
-import { FieldValueSuggestions, useInspectorContext } from '../../../../../observability/public';
 import { SelectedFilters } from './selected_filters';
 import { useIndexPattern } from '../../../contexts/uptime_index_pattern_context';
 import { useGetUrlParams } from '../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx
index 541723c331833..3f84fcbfecd75 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/filter_group/selected_filters.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { FilterValueLabel } from '../../../../../observability/public';
+import { FilterValueLabel } from '@kbn/observability-plugin/public';
 import { useIndexPattern } from '../../../contexts/uptime_index_pattern_context';
 import { useSelectedFilters } from '../../../hooks/use_selected_filters';
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
index 02fe666b79464..a6c837ca13a7f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { getLocationStatus, MonitorListStatusColumn } from './monitor_status_column';
 import { Ping } from '../../../../../common/runtime_types';
 import { STATUS } from '../../../../../common/constants';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { mockDate, mockMoment } from '../../../../lib/helper/test_helpers';
 import { render } from '../../../../lib/helper/rtl_helpers';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx
index 896ab6bc662bb..8d8ed5dc684f4 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx
@@ -19,6 +19,7 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { useDispatch, useSelector } from 'react-redux';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { parseTimestamp } from '../parse_timestamp';
 import { DataStream, Ping, PingError } from '../../../../../common/runtime_types';
 import {
@@ -28,7 +29,6 @@ import {
   SHORT_TS_LOCALE,
 } from '../../../../../common/constants';
 
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 import { STATUS_DOWN_LABEL, STATUS_UP_LABEL } from '../../../common/translations';
 import { MonitorProgress } from './progress/monitor_progress';
 import { refreshedMonitorSelector } from '../../../../state/reducers/monitor_list';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
index 2da3a758c081e..b82cf6f552bf9 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
@@ -17,7 +17,7 @@ import {
 } from '../../../../common/runtime_types';
 import { MonitorListComponent } from './monitor_list';
 import moment from 'moment';
-import { IHttpFetchError, ResponseErrorBody } from '../../../../../../../src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import { mockMoment } from '../../../lib/helper/test_helpers';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { NO_DATA_MESSAGE } from './translations';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
index ba9967490be78..f18f912e5231f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
@@ -17,6 +17,7 @@ import {
   EuiSpacer,
   getBreakpoint,
 } from '@elastic/eui';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { X509Expiry } from '../../../../common/runtime_types';
 import { MonitorSummary } from '../../../../common/runtime_types';
 import { MonitorListStatusColumn } from './columns/monitor_status_column';
@@ -36,7 +37,6 @@ import { STATUS_ALERT_COLUMN, TEST_NOW_COLUMN } from './translations';
 import { MonitorNameColumn } from './columns/monitor_name_col';
 import { MonitorTags } from '../../common/monitor_tags';
 import { useMonitorHistogram } from './use_monitor_histogram';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { TestNowColumn } from './columns/test_now_col';
 import { NoItemsMessage } from './no_items_message';
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
index 3677d6b770631..0a46c2f562d11 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { AppState } from '../../../../../state';
 import { isIntegrationsPopupOpen } from '../../../../../state/selectors';
 import { PopoverState, toggleIntegrationsPopover } from '../../../../../state/actions';
-import { ActionsPopoverComponent } from '../index';
+import { ActionsPopoverComponent } from '..';
 
 const mapStateToProps = (state: AppState) => ({
   popoverState: isIntegrationsPopupOpen(state),
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
index 9a00b1f2b7289..1875f4d335b0f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
@@ -17,8 +17,8 @@ import {
 import { EuiListGroupItemProps } from '@elastic/eui/src/components/list_group/list_group_item';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { UptimeSettingsContext } from '../../../../contexts';
-import { Rule } from '../../../../../../triggers_actions_ui/public';
 import { getUrlForAlert } from '../../../../lib/alert_types/common';
 
 interface Props {
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
index 0596c76662a58..092614b870bda 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { Rule } from '../../../../../../triggers_actions_ui/public';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { MostRecentError } from './most_recent_error';
 import { MonitorStatusList } from './monitor_status_list';
 import { MonitorDetails, MonitorSummary } from '../../../../../common/runtime_types';
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts
index 82299825b4154..8a6fb5a174856 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/use_monitor_histogram.ts
@@ -8,6 +8,7 @@
 import { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { useEsSearch } from '@kbn/observability-plugin/public';
 import {
   Histogram,
   HistogramPoint,
@@ -15,7 +16,6 @@ import {
 } from '../../../../common/runtime_types/monitor';
 import { useGetUrlParams } from '../../../hooks';
 import { UptimeRefreshContext } from '../../../contexts';
-import { useEsSearch } from '../../../../../observability/public';
 import { esKuerySelector } from '../../../state/selectors';
 import { getHistogramInterval } from '../../../../common/lib/get_histogram_interval';
 import { Ping } from '../../../../common/runtime_types';
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx b/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
index c894ba345a36f..d6d864ed312af 100644
--- a/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
@@ -8,7 +8,7 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexItem } from '@elastic/eui';
-import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public/';
+import { QueryStringInput } from '@kbn/unified-search-plugin/public';
 import { SyntaxType, useQueryBar } from './use_query_bar';
 import { KQL_PLACE_HOLDER, SIMPLE_SEARCH_PLACEHOLDER } from './translations';
 import { useGetUrlParams, useIndexPattern } from '../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts b/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts
index 296a8fa509d00..78dabd2cad7f7 100644
--- a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts
+++ b/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.ts
@@ -8,7 +8,8 @@
 import React, { useCallback, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 import { useDispatch } from 'react-redux';
-import { Query } from 'src/plugins/data/common';
+import { Query } from '@kbn/data-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   useGetUrlParams,
   useIndexPattern,
@@ -16,7 +17,6 @@ import {
   useUrlParams,
 } from '../../../hooks';
 import { setEsKueryString } from '../../../state/actions';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { UptimePluginServices } from '../../../apps/plugin';
 
 export enum SyntaxType {
diff --git a/x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts b/x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts
index 2d1a9691d60d2..72df487752fa1 100644
--- a/x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts
+++ b/x-pack/plugins/uptime/public/components/overview/snapshot/use_snap_shot.ts
@@ -7,10 +7,10 @@
 
 import { useContext } from 'react';
 import { useSelector } from 'react-redux';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { useGetUrlParams } from '../../../hooks';
 import { esKuerySelector } from '../../../state/selectors';
 import { UptimeRefreshContext } from '../../../contexts';
-import { useFetcher } from '../../../../../observability/public';
 import { fetchSnapshotCount } from '../../../state/api';
 
 export const useSnapShotCount = () => {
diff --git a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx b/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
index d69bcfee7efae..d8b6fa02796e9 100644
--- a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
@@ -9,10 +9,10 @@ import React, { useMemo, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useDispatch } from 'react-redux';
 import { EuiButtonEmpty } from '@elastic/eui';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { getConnectorsAction } from '../../state/alerts/alerts';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { useFetcher } from '../../../../observability/public';
 import { fetchActionTypes } from '../../state/api/alerts';
 
 import { ActionTypeId } from './types';
diff --git a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx b/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
index 5545f555bd81a..9f8ae139a62be 100644
--- a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
@@ -18,14 +18,14 @@ import {
 } from '@elastic/eui';
 import { useSelector } from 'react-redux';
 import styled from 'styled-components';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
 import { SettingsFormProps } from '../../pages/settings';
 import { connectorsSelector } from '../../state/alerts/alerts';
 import { AddConnectorFlyout, ALLOWED_ACTION_TYPES } from './add_connector_flyout';
 import { useGetUrlParams, useUrlParams } from '../../hooks';
 import { alertFormI18n } from './translations';
 import { useInitApp } from '../../hooks/use_init_app';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public/';
 import { ActionTypeId } from './types';
 import { DefaultEmail } from './default_email';
 
diff --git a/x-pack/plugins/uptime/public/components/settings/default_email.tsx b/x-pack/plugins/uptime/public/components/settings/default_email.tsx
index b965d986f5413..6a79ddf39bfd4 100644
--- a/x-pack/plugins/uptime/public/components/settings/default_email.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/default_email.tsx
@@ -9,10 +9,10 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useSelector } from 'react-redux';
 import { EuiDescribedFormGroup } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { OnFieldChangeType } from './certificate_form';
 import { connectorsSelector } from '../../state/alerts/alerts';
 import { DefaultEmail as DefaultEmailType } from '../../../common/runtime_types';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { UptimePluginServices } from '../../apps/plugin';
 import { SettingsPageFieldErrors } from '../../pages/settings';
 
diff --git a/x-pack/plugins/uptime/public/components/settings/settings_actions.tsx b/x-pack/plugins/uptime/public/components/settings/settings_actions.tsx
index ae57233388427..c7aec1dd90d70 100644
--- a/x-pack/plugins/uptime/public/components/settings/settings_actions.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/settings_actions.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { SettingsPageFieldErrors } from '../../pages/settings';
 
 export interface SettingsActionsProps {
diff --git a/x-pack/plugins/uptime/public/components/settings/types.ts b/x-pack/plugins/uptime/public/components/settings/types.ts
index 41c4ae41e38c0..4c2bcad2206e4 100644
--- a/x-pack/plugins/uptime/public/components/settings/types.ts
+++ b/x-pack/plugins/uptime/public/components/settings/types.ts
@@ -16,7 +16,7 @@ import {
   WebhookActionTypeId,
   EmailActionTypeId,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../actions/server/builtin_action_types';
+} from '@kbn/actions-plugin/server/builtin_action_types';
 
 export type ActionTypeId =
   | typeof SlackActionTypeId
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx
index c9fda97b6df04..44d8f23e1f068 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/stderr_logs.tsx
@@ -23,10 +23,10 @@ import { i18n } from '@kbn/i18n';
 import { EuiInMemoryTable } from '@elastic/eui';
 import moment from 'moment';
 import { useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { useStdErrorLogs } from './use_std_error_logs';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
-import { useFetcher } from '../../../../../observability/public';
 import { selectDynamicSettings } from '../../../state/selectors';
 import { Ping } from '../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
index f0bd56ae24bb7..7c729108cc0a1 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/screenshot_link.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { ReactRouterEuiLink } from '../../../common/react_router_helpers';
 import { Ping } from '../../../../../common/runtime_types/ping/ping';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
 
 const LabelLink = euiStyled.div`
   margin-bottom: ${(props) => props.theme.eui.paddingSizes.xs};
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
index b3475828a5e51..4c734918d7502 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
@@ -9,11 +9,11 @@ import moment from 'moment';
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import { StepScreenshotDisplay } from '../../step_screenshot_display';
 import { JourneyStep } from '../../../../../common/runtime_types/ping/synthetics';
 import { Ping } from '../../../../../common/runtime_types/ping/ping';
-import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/common';
-import { useFetcher } from '../../../../../../observability/public';
 import { fetchLastSuccessfulCheck } from '../../../../state/api/journey';
 import { ScreenshotLink } from './screenshot_link';
 import { getShortTimeStamp } from '../../../overview/monitor_list/columns/monitor_status_column';
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx
index 01e0d8709905c..46df119d21014 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_field_trend.tsx
@@ -10,11 +10,11 @@ import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { useSelector } from 'react-redux';
-import { useUptimeStartPlugins } from '../../../contexts/uptime_startup_plugins_context';
+import { AllSeries, createExploratoryViewUrl } from '@kbn/observability-plugin/public';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { JourneyStep } from '../../../../common/runtime_types';
-import { AllSeries, createExploratoryViewUrl } from '../../../../../observability/public';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { useUptimeStartPlugins } from '../../../contexts/uptime_startup_plugins_context';
 import { selectDynamicSettings } from '../../../state/selectors';
 
 export const getLast48Intervals = (activeStep: JourneyStep) => {
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts
index fa563b2ef2728..11dfdcdcc434e 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_std_error_logs.ts
@@ -6,7 +6,7 @@
  */
 
 import { useSelector } from 'react-redux';
-import { createEsParams, useEsSearch } from '../../../../../observability/public';
+import { createEsParams, useEsSearch } from '@kbn/observability-plugin/public';
 import { selectDynamicSettings } from '../../../state/selectors';
 import { Ping } from '../../../../common/runtime_types';
 
diff --git a/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx b/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx
index 80786730505a9..3fc4e124bd2c4 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/executed_step.tsx
@@ -8,9 +8,9 @@
 import { EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui';
 import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
+import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { CodeBlockAccordion } from './code_block_accordion';
 import { JourneyStep } from '../../../common/runtime_types/ping';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
 import { StepScreenshots } from './check_steps/step_expanded_row/step_screenshots';
 
 const CODE_BLOCK_OVERFLOW_HEIGHT = 360;
diff --git a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx
index ad8666f77ce6b..83e1a4e938650 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.test.tsx
@@ -8,11 +8,11 @@
 import React from 'react';
 import { StepScreenshotDisplay } from './step_screenshot_display';
 import { render } from '../../lib/helper/rtl_helpers';
-import * as observabilityPublic from '../../../../observability/public';
+import * as observabilityPublic from '@kbn/observability-plugin/public';
 import '../../lib/__mocks__/use_composite_image.mock';
 import { mockRef } from '../../lib/__mocks__/screenshot_ref.mock';
 
-jest.mock('../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public');
 
 jest.mock('react-use/lib/useIntersection', () => () => ({
   isIntersecting: true,
diff --git a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx
index 7dfc86575205b..e4e010016ea1f 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/step_screenshot_display.tsx
@@ -18,12 +18,12 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useContext, useEffect, useMemo, useRef, useState, FC } from 'react';
 import useIntersection from 'react-use/lib/useIntersection';
+import { useFetcher } from '@kbn/observability-plugin/public';
 import {
   isScreenshotRef as isAScreenshotRef,
   ScreenshotRefImageData,
 } from '../../../common/runtime_types';
 import { UptimeRefreshContext, UptimeSettingsContext, UptimeThemeContext } from '../../contexts';
-import { useFetcher } from '../../../../observability/public';
 import { getJourneyScreenshot } from '../../state/api/journey';
 import { useCompositeImage } from '../../hooks';
 
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx b/x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx
index 6c658ec7f5d40..765d9f8527c88 100644
--- a/x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx
+++ b/x-pack/plugins/uptime/public/contexts/uptime_index_pattern_context.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { useFetcher } from '../../../observability/public';
-import { DataPublicPluginStart, IndexPattern } from '../../../../../src/plugins/data/public';
+import { useFetcher } from '@kbn/observability-plugin/public';
+import { DataPublicPluginStart, IndexPattern } from '@kbn/data-plugin/public';
 import { useHasData } from '../components/overview/empty_state/use_has_data';
 
 export const UptimeIndexPatternContext = createContext({} as IndexPattern);
diff --git a/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts b/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
index 4069220a23d99..8d31ef0abbd91 100644
--- a/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
+++ b/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
@@ -6,7 +6,7 @@
  */
 
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
-import type { IndexPattern } from '../../../../../src/plugins/data/public';
+import type { IndexPattern } from '@kbn/data-plugin/public';
 import { combineFiltersAndUserSearch, stringifyKueries } from '../../common/lib';
 
 const getKueryString = (urlFilters: string, excludedFilters?: string): string => {
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
index 9d7318a45f76e..e5b1a28ba72c6 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { mountWithRouter } from '../lib';
 import { OVERVIEW_ROUTE } from '../../common/constants';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { UptimeUrlParams, getSupportedUrlParams, MountWithReduxProvider } from '../lib/helper';
 import { makeBaseBreadcrumb, useBreadcrumbs } from './use_breadcrumbs';
 
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
index 5ea81e579ff92..83d269f4e35fa 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { ChromeBreadcrumb } from 'kibana/public';
+import { ChromeBreadcrumb } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { MouseEvent, useEffect } from 'react';
 import { EuiBreadcrumb } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { UptimeUrlParams } from '../lib/helper';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { useUrlParams } from '.';
 import { PLUGIN } from '../../common/constants/plugin';
 
diff --git a/x-pack/plugins/uptime/public/hooks/use_chart_theme.ts b/x-pack/plugins/uptime/public/hooks/use_chart_theme.ts
index f9231abaa75a8..f9faca7927d9d 100644
--- a/x-pack/plugins/uptime/public/hooks/use_chart_theme.ts
+++ b/x-pack/plugins/uptime/public/hooks/use_chart_theme.ts
@@ -7,7 +7,7 @@
 
 import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
 import { useMemo } from 'react';
-import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 
 export const useChartTheme = () => {
   const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
diff --git a/x-pack/plugins/uptime/public/index.ts b/x-pack/plugins/uptime/public/index.ts
index f63ac34820763..86170e9bc863a 100644
--- a/x-pack/plugins/uptime/public/index.ts
+++ b/x-pack/plugins/uptime/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '@kbn/core/public';
 import { UptimePlugin } from './apps/plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx b/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
index e35234aab54b0..fdfb07d7ff730 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
@@ -9,13 +9,13 @@ import type { Observable } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React from 'react';
-import type { CoreTheme } from 'kibana/public';
+import type { CoreTheme } from '@kbn/core/public';
 import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
-import { RedirectAppLinks, toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { RedirectAppLinks, toMountPoint } from '@kbn/kibana-react-plugin/public';
+import type { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { ActionConnector } from '../../state/alerts/alerts';
 import { kibanaService } from '../../state/kibana_service';
 import { getUrlForAlert } from './common';
-import type { Rule } from '../../../../triggers_actions_ui/public';
 
 export const simpleAlertEnabled = (
   defaultActions: ActionConnector[],
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx b/x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx
index d6498015e41ce..79b2b28652497 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/duration_anomaly.tsx
@@ -10,11 +10,11 @@ import moment from 'moment';
 
 import { ALERT_END, ALERT_STATUS, ALERT_STATUS_ACTIVE, ALERT_REASON } from '@kbn/rule-data-utils';
 
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import { AlertTypeInitializer } from '.';
 import { getMonitorRouteFromMonitorId } from '../../../common/utils/get_monitor_url';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { DurationAnomalyTranslations } from '../../../common/translations';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
 
 const { defaultActionMessage, description } = DurationAnomalyTranslations;
 const DurationAnomalyAlert = React.lazy(() => import('./lazy_wrapper/duration_anomaly'));
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/index.ts b/x-pack/plugins/uptime/public/lib/alert_types/index.ts
index f2e721f9c8f40..7217e0a083e6b 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/index.ts
+++ b/x-pack/plugins/uptime/public/lib/alert_types/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreStart } from 'kibana/public';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import { CoreStart } from '@kbn/core/public';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { initMonitorStatusAlertType } from './monitor_status';
 import { initTlsAlertType } from './tls';
 import { initTlsLegacyAlertType } from './tls_legacy';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
index 6ec7a416ca01e..bb1f84a45114d 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/duration_anomaly.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { store } from '../../../state';
 import { AnomalyAlertComponent } from '../../../components/overview/alerts/anomaly_alert/anomaly_alert';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { kibanaService } from '../../../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
index 066c15238833a..3c8c8946fa06d 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/monitor_status.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { store } from '../../../state';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { kibanaService } from '../../../state/kibana_service';
 import { AlertMonitorStatus } from '../../../components/overview/alerts/alerts_containers/alert_monitor_status';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
index fcab43741e66d..f4136a079c8b0 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/tls_alert.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { store } from '../../../state';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { ClientPluginsStart } from '../../../apps/plugin';
 import { AlertTls } from '../../../components/overview/alerts/alerts_containers/alert_tls';
 import { kibanaService } from '../../../state/kibana_service';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
index 45af394b65723..881afb0d8eb52 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
+++ b/x-pack/plugins/uptime/public/lib/alert_types/lazy_wrapper/validate_monitor_status.ts
@@ -7,12 +7,12 @@
 
 import { PathReporter } from 'io-ts/lib/PathReporter';
 import { isRight } from 'fp-ts/lib/Either';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   AtomicStatusCheckParamsType,
   MonitorAvailabilityType,
   StatusCheckParamsType,
 } from '../../../../common/runtime_types/alerts';
-import { ValidationResult } from '../../../../../triggers_actions_ui/public';
 
 export function validateMonitorStatusParams(ruleParams: any): ValidationResult {
   const errors: Record<string, any> = {};
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx b/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
index 5d6f8f3fea333..99d8e22f11cdb 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
@@ -16,12 +16,12 @@ import {
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
 
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
+import { ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
 import { AlertTypeInitializer } from '.';
 import { getMonitorRouteFromMonitorId } from '../../../common/utils/get_monitor_url';
 import { MonitorStatusTranslations } from '../../../common/translations';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
-import { ValidationResult } from '../../../../triggers_actions_ui/public';
 
 const { defaultActionMessage, description } = MonitorStatusTranslations;
 
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/tls.tsx b/x-pack/plugins/uptime/public/lib/alert_types/tls.tsx
index f65578ea40ccf..1ecfaefaa1797 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/tls.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/tls.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
-import { ObservabilityRuleTypeModel } from '../../../../observability/public';
+import { ObservabilityRuleTypeModel } from '@kbn/observability-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { TlsTranslations } from '../../../common/translations';
 import { AlertTypeInitializer } from '.';
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx b/x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx
index a2b145ce716d6..cce2e3d011bfa 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/tls_legacy.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { RuleTypeModel } from '../../../../triggers_actions_ui/public';
+import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { TlsTranslationsLegacy } from '../../../common/translations';
 import { AlertTypeInitializer } from '.';
diff --git a/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx b/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
index 31d9bdd7c77e5..913f5e249c688 100644
--- a/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
+++ b/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
@@ -16,25 +16,22 @@ import {
 import { Router, Route } from 'react-router-dom';
 import { merge } from 'lodash';
 import { createMemoryHistory, History } from 'history';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 import { EuiPageTemplate } from '@elastic/eui';
-import { coreMock } from 'src/core/public/mocks';
+import { coreMock } from '@kbn/core/public/mocks';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { configure } from '@testing-library/dom';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import { KibanaContextProvider, KibanaServices } from '@kbn/kibana-react-plugin/public';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { mockState } from '../__mocks__/uptime_store.mock';
-import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
-import { IStorageWrapper } from '../../../../../../src/plugins/kibana_utils/public';
-import {
-  KibanaContextProvider,
-  KibanaServices,
-} from '../../../../../../src/plugins/kibana_react/public';
 import { MountWithReduxProvider } from './helper_with_redux';
 import { AppState } from '../../state';
 import { stringifyUrlParams } from './stringify_url_params';
 import { ClientPluginsStart } from '../../apps/plugin';
-import { triggersActionsUiMock } from '../../../../triggers_actions_ui/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
 import { UptimeRefreshContextProvider, UptimeStartupPluginsContextProvider } from '../../contexts';
 import { kibanaService } from '../../state/kibana_service';
 
diff --git a/x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts b/x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts
index 50a124ad60dfc..47d52a73e6850 100644
--- a/x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/spy_use_fetcher.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import * as observabilityPublic from '../../../../observability/public';
+import * as observabilityPublic from '@kbn/observability-plugin/public';
 
-jest.mock('../../../../observability/public', () => {
-  const originalModule = jest.requireActual('../../../../observability/public');
+jest.mock('@kbn/observability-plugin/public', () => {
+  const originalModule = jest.requireActual('@kbn/observability-plugin/public');
 
   return {
     ...originalModule,
diff --git a/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts b/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
index 6a1fe15c9a6de..0b32c4a2420e8 100644
--- a/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/test_helpers.ts
@@ -43,7 +43,7 @@ export function mockDate() {
 }
 
 export function mockDataPlugin() {
-  jest.mock('../../../../../../src/plugins/data/public', () => {
+  jest.mock('@kbn/data-plugin/public', () => {
     return function () {
       return {
         esKuery: {
diff --git a/x-pack/plugins/uptime/public/pages/certificates.tsx b/x-pack/plugins/uptime/public/pages/certificates.tsx
index 787238eb8ea6e..7b6a4d5e735e3 100644
--- a/x-pack/plugins/uptime/public/pages/certificates.tsx
+++ b/x-pack/plugins/uptime/public/pages/certificates.tsx
@@ -8,7 +8,7 @@
 import { useDispatch } from 'react-redux';
 import { EuiSpacer } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { useTrackPageview } from '../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
 import { getDynamicSettings } from '../state/actions/dynamic_settings';
 import { CertificateList, CertificateSearch, CertSort } from '../components/certificates';
diff --git a/x-pack/plugins/uptime/public/pages/mapping_error.tsx b/x-pack/plugins/uptime/public/pages/mapping_error.tsx
index 116586b140524..66dd6be289ad1 100644
--- a/x-pack/plugins/uptime/public/pages/mapping_error.tsx
+++ b/x-pack/plugins/uptime/public/pages/mapping_error.tsx
@@ -11,9 +11,9 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 import React from 'react';
 
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useTrackPageview } from '../../../observability/public';
 
 export const MappingErrorPage = () => {
   useTrackPageview({ app: 'uptime', path: 'mapping-error' });
diff --git a/x-pack/plugins/uptime/public/pages/monitor.tsx b/x-pack/plugins/uptime/public/pages/monitor.tsx
index 42b921d56f0d5..3abde2d0db1c9 100644
--- a/x-pack/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor.tsx
@@ -8,7 +8,7 @@
 import { EuiSpacer } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
-import { useTrackPageview } from '../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useMonitorId } from '../hooks';
 import { MonitorCharts } from '../components/monitor';
 import { MonitorStatusDetails, PingList } from '../components/monitor';
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx b/x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx
index 1cb3a023adbc1..cdb7ebeccbf04 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor_management/add_monitor.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { ScheduleUnit } from '../../../common/runtime_types';
 import { SyntheticsProviders } from '../../components/fleet_package/contexts';
 import { Loader } from '../../components/monitor_management/loader/loader';
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx b/x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx
index f79698136461c..5c8c85d7c616d 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor_management/edit_monitor.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { useParams } from 'react-router-dom';
-import { useTrackPageview, FETCH_STATUS, useFetcher } from '../../../../observability/public';
+import { useTrackPageview, FETCH_STATUS, useFetcher } from '@kbn/observability-plugin/public';
 import { MonitorFields } from '../../../common/runtime_types';
 import { EditMonitorConfig } from '../../components/monitor_management/edit_monitor_config';
 import { Loader } from '../../components/monitor_management/loader/loader';
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx b/x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx
index 63ce73f7edc20..5c8efb14dac2f 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor_management/monitor_management.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useDispatch, useSelector } from 'react-redux';
 import { EuiCallOut, EuiButton, EuiSpacer, EuiLink } from '@elastic/eui';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { ConfigKey } from '../../../common/runtime_types';
 import { getMonitors } from '../../state/actions';
 import { monitorManagementListSelector } from '../../state/selectors';
@@ -47,7 +47,7 @@ export const MonitorManagementPage: React.FC = () => {
           page: 1, // saved objects page index is base 1
           perPage: 10,
           sortOrder: 'asc',
-          sortField: ConfigKey.NAME,
+          sortField: `${ConfigKey.NAME}.keyword`,
         })
       );
     }
diff --git a/x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx b/x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
index d013af54c38f6..7fd6cc421c3b6 100644
--- a/x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor_management/use_monitor_management_breadcrumbs.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { MONITOR_MANAGEMENT_ROUTE } from '../../../common/constants';
 import { PLUGIN } from '../../../common/constants/plugin';
diff --git a/x-pack/plugins/uptime/public/pages/overview.tsx b/x-pack/plugins/uptime/public/pages/overview.tsx
index 5199eab00f09f..b7f32c2b42448 100644
--- a/x-pack/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/plugins/uptime/public/pages/overview.tsx
@@ -9,8 +9,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
 
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useTrackPageview } from '../../../observability/public';
 import { MonitorList } from '../components/overview/monitor_list/monitor_list_container';
 import { StatusPanel } from '../components/overview/status_panel';
 import { QueryBar } from '../components/overview/query_bar/query_bar';
diff --git a/x-pack/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/uptime/public/pages/settings.tsx
index 3e1c3c911efa1..a12b615bb703d 100644
--- a/x-pack/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/plugins/uptime/public/pages/settings.tsx
@@ -8,11 +8,11 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiForm, EuiSpacer } from '@elastic/eui';
 import { useDispatch, useSelector } from 'react-redux';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { selectDynamicSettings } from '../state/selectors';
 import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic_settings';
 import { DynamicSettings } from '../../common/runtime_types';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { IndicesForm } from '../components/settings/indices_form';
 import {
   CertificateExpirationForm,
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx b/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx
index 48ca6061941b6..63e8ff6f45654 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx
+++ b/x-pack/plugins/uptime/public/pages/synthetics/checks_navigation.tsx
@@ -12,7 +12,7 @@ import { useHistory } from 'react-router-dom';
 import moment from 'moment';
 import { SyntheticsJourneyApiResponse } from '../../../common/runtime_types/ping';
 import { getShortTimeStamp } from '../../components/overview/monitor_list/columns/monitor_status_column';
-import { useBreakpoints } from '../../../public/hooks/use_breakpoints';
+import { useBreakpoints } from '../../hooks/use_breakpoints';
 
 interface Props {
   timestamp: string;
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx b/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx
index 93df71698057f..2ded527f7bb57 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx
+++ b/x-pack/plugins/uptime/public/pages/synthetics/step_detail_page.tsx
@@ -8,14 +8,14 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { useInitApp } from '../../hooks/use_init_app';
 import { StepDetailContainer } from '../../components/monitor/synthetics/step_detail/step_detail_container';
 import { journeySelector } from '../../state/selectors';
 import { JourneyState } from '../../state/reducers/journey';
 import { JourneyStep } from '../../../common/runtime_types/ping/synthetics';
 import { StepPageNavigation } from '../../components/monitor/synthetics/step_detail/step_page_nav';
-import { useUiSetting$ } from '../../../../../../src/plugins/kibana_react/public';
 import { StepPageTitleContent } from '../../components/monitor/synthetics/step_detail/step_page_title';
 import { getJourneySteps } from '../../state/actions/journey';
 
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx
index cfe1b03e6305c..290cdd453bd3c 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx
+++ b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.test.tsx
@@ -23,7 +23,7 @@ jest.mock('../../state/api/journey', () => ({
 // We must mock all other API calls because we're using the real store
 // in this test. Using the real store causes actions and effects to actually
 // run, which could trigger API calls.
-jest.mock('../../state/api/utils.ts', () => ({
+jest.mock('../../state/api/utils', () => ({
   apiService: { get: jest.fn().mockResolvedValue([]) },
 }));
 
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
index a03fe674d7c30..276162d488a22 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
+++ b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { useTrackPageview } from '../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { useInitApp } from '../../hooks/use_init_app';
 import { StepsList } from '../../components/synthetics/check_steps/steps_list';
 import { useCheckSteps } from '../../components/synthetics/check_steps/use_check_steps';
diff --git a/x-pack/plugins/uptime/public/routes.tsx b/x-pack/plugins/uptime/public/routes.tsx
index e66954a5fd4af..a8610462e4363 100644
--- a/x-pack/plugins/uptime/public/routes.tsx
+++ b/x-pack/plugins/uptime/public/routes.tsx
@@ -10,6 +10,8 @@ import { EuiPageTemplateProps, EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@
 import { Route, Switch } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { APP_WRAPPER_CLASS } from '@kbn/core/public';
+import { useInspectorContext } from '@kbn/observability-plugin/public';
 import {
   CERTIFICATES_ROUTE,
   MAPPING_ERROR_ROUTE,
@@ -46,7 +48,6 @@ import { UptimeDatePicker } from './components/common/uptime_date_picker';
 import { CertRefreshBtn } from './components/certificates/cert_refresh_btn';
 import { CertificateTitle } from './components/certificates/certificate_title';
 import { SyntheticsCallout } from './components/overview/synthetics_callout';
-import { APP_WRAPPER_CLASS } from '../../../../src/core/public';
 import {
   StepDetailPageChildren,
   StepDetailPageHeader,
@@ -54,7 +55,6 @@ import {
 } from './pages/synthetics/step_detail_page';
 import { UptimePageTemplateComponent } from './apps/uptime_page_template';
 import { apiService } from './state/api/utils';
-import { useInspectorContext } from '../../observability/public';
 import { AddMonitorBtn } from './components/monitor_management/add_monitor_btn';
 import { SettingsBottomBar } from './components/settings/settings_bottom_bar';
 import { ServiceAllowedWrapper } from './pages/monitor_management/service_allowed_wrapper';
@@ -259,7 +259,8 @@ const getRoutes = (): RouteProps[] => {
               <EuiBetaBadge
                 label="Beta"
                 tooltipContent={i18n.translate('xpack.uptime.routes.monitorManagement.betaLabel', {
-                  defaultMessage: 'This module is not GA. Please help us by reporting any bugs.',
+                  defaultMessage:
+                    'This functionality is in beta and is subject to change. The design and code is less mature than official generally available features and is being provided as-is with no warranties. Beta features are not subject to the support service level agreement of official generally available features.',
                 })}
               />
             </EuiFlexItem>
diff --git a/x-pack/plugins/uptime/public/state/actions/alerts.ts b/x-pack/plugins/uptime/public/state/actions/alerts.ts
index e62e7830951a3..9de508b4b4eda 100644
--- a/x-pack/plugins/uptime/public/state/actions/alerts.ts
+++ b/x-pack/plugins/uptime/public/state/actions/alerts.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { createAsyncAction } from './utils';
 import { MonitorIdParam } from './types';
-import { Rule } from '../../../../triggers_actions_ui/public';
 
 export const getExistingAlertAction = createAsyncAction<MonitorIdParam, Rule>(
   'GET EXISTING ALERTS'
diff --git a/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
index cea387e1b88b0..9f3ddff0e9178 100644
--- a/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
@@ -6,12 +6,12 @@
  */
 
 import { createAction } from 'redux-actions';
-import { createAsyncAction } from './utils';
 import {
   MlCapabilitiesResponse,
   AnomaliesTableRecord,
   JobExistResult,
-} from '../../../../../plugins/ml/public';
+} from '@kbn/ml-plugin/public';
+import { createAsyncAction } from './utils';
 import {
   CreateMLJobSuccess,
   DeleteJobResults,
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts b/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
index b55e7a0c9e791..1dd88c663cec5 100644
--- a/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
+++ b/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
@@ -6,7 +6,7 @@
  */
 
 import { createAction } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { QueryParams } from './types';
 import { MonitorDurationResult } from '../../../common/types';
 
diff --git a/x-pack/plugins/uptime/public/state/actions/types.ts b/x-pack/plugins/uptime/public/state/actions/types.ts
index 13072c1b884e1..953227adfae93 100644
--- a/x-pack/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/plugins/uptime/public/state/actions/types.ts
@@ -6,8 +6,8 @@
  */
 
 import { Action } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
-import type { Rule } from '../../../../triggers_actions_ui/public';
+import { IHttpFetchError } from '@kbn/core/public';
+import type { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { UptimeAlertTypeParams } from '../alerts/alerts';
 
 export interface AsyncAction<Payload, SuccessPayload> {
diff --git a/x-pack/plugins/uptime/public/state/actions/utils.ts b/x-pack/plugins/uptime/public/state/actions/utils.ts
index cd7cc13ed4517..15b03d6b18680 100644
--- a/x-pack/plugins/uptime/public/state/actions/utils.ts
+++ b/x-pack/plugins/uptime/public/state/actions/utils.ts
@@ -6,7 +6,7 @@
  */
 
 import { createAction } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 import { AsyncAction, AsyncAction1 } from './types';
 
 export function createAsyncAction<Payload, SuccessPayload>(
diff --git a/x-pack/plugins/uptime/public/state/alerts/alerts.ts b/x-pack/plugins/uptime/public/state/alerts/alerts.ts
index 757ee2acec0bd..db969394c2f24 100644
--- a/x-pack/plugins/uptime/public/state/alerts/alerts.ts
+++ b/x-pack/plugins/uptime/public/state/alerts/alerts.ts
@@ -8,9 +8,13 @@
 import { i18n } from '@kbn/i18n';
 import { handleActions, Action } from 'redux-actions';
 import { call, put, select, takeLatest } from 'redux-saga/effects';
+import type {
+  ActionConnector as RawActionConnector,
+  Rule,
+} from '@kbn/triggers-actions-ui-plugin/public';
 import { createAsyncAction } from '../actions/utils';
 import { asyncInitState, handleAsyncAction } from '../reducers/utils';
-import type { AppState } from '../../state';
+import type { AppState } from '..';
 import { AsyncInitState } from '../reducers/types';
 import { fetchEffectFactory } from '../effects/fetch_effect';
 import {
@@ -21,10 +25,6 @@ import {
   fetchMonitorAlertRecords,
   NewAlertParams,
 } from '../api/alerts';
-import type {
-  ActionConnector as RawActionConnector,
-  Rule,
-} from '../../../../triggers_actions_ui/public';
 import { kibanaService } from '../kibana_service';
 import { monitorIdSelector } from '../selectors';
 import { AlertsResult, MonitorIdParam } from '../actions/types';
diff --git a/x-pack/plugins/uptime/public/state/api/alert_actions.ts b/x-pack/plugins/uptime/public/state/api/alert_actions.ts
index 93a19cedc6001..5e65231388119 100644
--- a/x-pack/plugins/uptime/public/state/api/alert_actions.ts
+++ b/x-pack/plugins/uptime/public/state/api/alert_actions.ts
@@ -6,10 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { NewAlertParams } from './alerts';
-import { RuleAction as RuleActionOrig } from '../../../../triggers_actions_ui/public';
-import { ACTION_GROUP_DEFINITIONS } from '../../../common/constants/alerts';
-import { MonitorStatusTranslations } from '../../../common/translations';
+import { RuleAction as RuleActionOrig } from '@kbn/triggers-actions-ui-plugin/public';
 import {
   IndexActionParams,
   PagerDutyActionParams,
@@ -19,7 +16,10 @@ import {
   WebhookActionParams,
   EmailActionParams,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../actions/server';
+} from '@kbn/actions-plugin/server';
+import { NewAlertParams } from './alerts';
+import { ACTION_GROUP_DEFINITIONS } from '../../../common/constants/alerts';
+import { MonitorStatusTranslations } from '../../../common/translations';
 import { ActionTypeId } from '../../components/settings/types';
 import { Ping } from '../../../common/runtime_types/ping';
 import { DefaultEmail } from '../../../common/runtime_types';
diff --git a/x-pack/plugins/uptime/public/state/api/alerts.ts b/x-pack/plugins/uptime/public/state/api/alerts.ts
index 49df4f390611b..2e02c36289ab8 100644
--- a/x-pack/plugins/uptime/public/state/api/alerts.ts
+++ b/x-pack/plugins/uptime/public/state/api/alerts.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
+import type { ActionType, AsApiContract, Rule } from '@kbn/triggers-actions-ui-plugin/public';
+import { RuleTypeParams } from '@kbn/alerting-plugin/common';
 import { CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { apiService } from './utils';
 import { ActionConnector } from '../alerts/alerts';
 
 import { AlertsResult, MonitorIdParam } from '../actions/types';
-import type { ActionType, AsApiContract, Rule } from '../../../../triggers_actions_ui/public';
 import { API_URLS } from '../../../common/constants';
-import { RuleTypeParams } from '../../../../alerting/common';
 import { AtomicStatusCheckParams } from '../../../common/runtime_types/alerts';
 
 import { populateAlertActions, RuleAction } from './alert_actions';
diff --git a/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
index 24f2d667323d1..e7655f37d3f01 100644
--- a/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
@@ -6,15 +6,15 @@
  */
 
 import moment from 'moment';
-import { apiService } from './utils';
-import { AnomalyRecords, AnomalyRecordsParams } from '../actions';
-import { API_URLS, ML_MODULE_ID } from '../../../common/constants';
 import {
   DataRecognizerConfigResponse,
   JobExistResult,
   MlCapabilitiesResponse,
-} from '../../../../../plugins/ml/public';
-import { extractErrorMessage } from '../../../../../plugins/ml/common';
+} from '@kbn/ml-plugin/public';
+import { extractErrorMessage } from '@kbn/ml-plugin/common';
+import { apiService } from './utils';
+import { AnomalyRecords, AnomalyRecordsParams } from '../actions';
+import { API_URLS, ML_MODULE_ID } from '../../../common/constants';
 import {
   CreateMLJobSuccess,
   DeleteJobResults,
diff --git a/x-pack/plugins/uptime/public/state/api/snapshot.test.ts b/x-pack/plugins/uptime/public/state/api/snapshot.test.ts
index 01177eceb4720..20a0a0d7a477c 100644
--- a/x-pack/plugins/uptime/public/state/api/snapshot.test.ts
+++ b/x-pack/plugins/uptime/public/state/api/snapshot.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchError } from 'src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { fetchSnapshotCount } from './snapshot';
 import { apiService } from './utils';
 import { API_URLS } from '../../../common/constants';
diff --git a/x-pack/plugins/uptime/public/state/api/utils.ts b/x-pack/plugins/uptime/public/state/api/utils.ts
index 833a6845d6343..cbba8cf02cf22 100644
--- a/x-pack/plugins/uptime/public/state/api/utils.ts
+++ b/x-pack/plugins/uptime/public/state/api/utils.ts
@@ -7,8 +7,8 @@
 
 import { isRight } from 'fp-ts/lib/Either';
 import { formatErrors } from '@kbn/securitysolution-io-ts-utils';
-import { HttpFetchQuery, HttpSetup } from 'src/core/public';
-import { FETCH_STATUS, AddInspectorRequest } from '../../../../observability/public';
+import { HttpFetchQuery, HttpSetup } from '@kbn/core/public';
+import { FETCH_STATUS, AddInspectorRequest } from '@kbn/observability-plugin/public';
 
 class ApiService {
   private static instance: ApiService;
diff --git a/x-pack/plugins/uptime/public/state/certificates/certificates.ts b/x-pack/plugins/uptime/public/state/certificates/certificates.ts
index b5e5376c00df9..c01d6042615b4 100644
--- a/x-pack/plugins/uptime/public/state/certificates/certificates.ts
+++ b/x-pack/plugins/uptime/public/state/certificates/certificates.ts
@@ -6,7 +6,7 @@
  */
 
 import { Action, createAction, handleActions } from 'redux-actions';
-import { AppState } from '../index';
+import { AppState } from '..';
 
 export const setCertificatesTotalAction = createAction<CertificatesState>('SET_CERTIFICATES_TOTAL');
 
diff --git a/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts b/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts
index d02ba142b907a..5216260714cc8 100644
--- a/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts
+++ b/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts
@@ -8,7 +8,7 @@
 import { call, put } from 'redux-saga/effects';
 import { fetchEffectFactory } from './fetch_effect';
 import { indexStatusAction } from '../actions';
-import { HttpFetchError } from 'src/core/public';
+import { HttpFetchError } from '@kbn/core/public';
 import { StatesIndexStatus } from '../../../common/runtime_types';
 import { fetchIndexStatus } from '../api';
 
diff --git a/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts b/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
index 4fbd60f7929ce..387ceeb56a514 100644
--- a/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
+++ b/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
@@ -7,7 +7,7 @@
 
 import { call, put } from 'redux-saga/effects';
 import { Action } from 'redux-actions';
-import { IHttpFetchError } from 'src/core/public';
+import { IHttpFetchError } from '@kbn/core/public';
 
 /**
  * Factory function for a fetch effect. It expects three action creators,
diff --git a/x-pack/plugins/uptime/public/state/effects/journey.test.ts b/x-pack/plugins/uptime/public/state/effects/journey.test.ts
index cbf5fc72a0716..93a9ceec50ae2 100644
--- a/x-pack/plugins/uptime/public/state/effects/journey.test.ts
+++ b/x-pack/plugins/uptime/public/state/effects/journey.test.ts
@@ -10,7 +10,7 @@ import createSagaMiddleware from 'redux-saga';
 import { createStore as createReduxStore, applyMiddleware } from 'redux';
 
 import { rootReducer } from '../reducers';
-import { fetchJourneyStepsEffect } from '../effects/journey';
+import { fetchJourneyStepsEffect } from './journey';
 
 import { getJourneySteps } from '../actions/journey';
 
diff --git a/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
index 00c911e001fb3..28e9bb201743d 100644
--- a/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
@@ -24,7 +24,7 @@ import {
 } from '../api/ml_anomaly';
 import type { MonitorIdParam, DeleteJobResults } from '../actions/types';
 import { anomalyAlertSelector, deleteAlertAction } from '../alerts/alerts';
-import type { AppState } from '../../state';
+import type { AppState } from '..';
 
 export function* fetchMLJobEffect() {
   yield takeLatest(
diff --git a/x-pack/plugins/uptime/public/state/kibana_service.ts b/x-pack/plugins/uptime/public/state/kibana_service.ts
index 6ca2651bf9748..f5f591a98422c 100644
--- a/x-pack/plugins/uptime/public/state/kibana_service.ts
+++ b/x-pack/plugins/uptime/public/state/kibana_service.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable } from 'rxjs';
-import type { CoreStart, CoreTheme } from 'kibana/public';
+import type { CoreStart, CoreTheme } from '@kbn/core/public';
 import { apiService } from './api/utils';
 
 class KibanaService {
diff --git a/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
index 7cac6491aa937..f755609ec5607 100644
--- a/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
@@ -6,6 +6,7 @@
  */
 
 import { handleActions } from 'redux-actions';
+import { MlCapabilitiesResponse, JobExistResult } from '@kbn/ml-plugin/public';
 import {
   getExistingMLJobAction,
   createMLJobAction,
@@ -17,7 +18,6 @@ import {
 } from '../actions';
 import { asyncInitState, handleAsyncAction } from './utils';
 import { AsyncInitState } from './types';
-import { MlCapabilitiesResponse, JobExistResult } from '../../../../../plugins/ml/public';
 import { CreateMLJobSuccess, DeleteJobResults } from '../actions/types';
 
 export interface MLJobState {
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts b/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
index 8083b50367fe7..3630842cb9f8f 100644
--- a/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
@@ -6,7 +6,7 @@
  */
 
 import { handleActions, Action } from 'redux-actions';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 import {
   getMonitorList,
   getMonitorListSuccess,
@@ -16,7 +16,7 @@ import {
   setUpdatingMonitorId,
 } from '../actions';
 import { MonitorSummariesResult } from '../../../common/runtime_types';
-import { AppState } from '../index';
+import { AppState } from '..';
 import { TestNowResponse } from '../api';
 
 export interface MonitorList {
diff --git a/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts b/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts
index 4b0ce493ba13c..83833e531bb9f 100644
--- a/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/test_now_runs.ts
@@ -9,7 +9,7 @@ import { createReducer, PayloadAction } from '@reduxjs/toolkit';
 import { WritableDraft } from 'immer/dist/types/types-external';
 import { clearTestNowMonitorAction, testNowMonitorAction } from '../actions';
 import { TestNowResponse } from '../api';
-import { AppState } from '../index';
+import { AppState } from '..';
 
 export enum TestRunStats {
   LOADING = 'loading',
diff --git a/x-pack/plugins/uptime/public/state/reducers/types.ts b/x-pack/plugins/uptime/public/state/reducers/types.ts
index 71cf9a59f6478..b1b995fcefc4a 100644
--- a/x-pack/plugins/uptime/public/state/reducers/types.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
 
 export interface AsyncInitState<ReduceStateType> {
   data: ReduceStateType | null;
diff --git a/x-pack/plugins/uptime/public/state/selectors/index.test.ts b/x-pack/plugins/uptime/public/state/selectors/index.test.ts
index 88573b748e0a4..62e39f40f1737 100644
--- a/x-pack/plugins/uptime/public/state/selectors/index.test.ts
+++ b/x-pack/plugins/uptime/public/state/selectors/index.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getBasePath, isIntegrationsPopupOpen } from './index';
+import { getBasePath, isIntegrationsPopupOpen } from '.';
 import { mockState } from '../../lib/__mocks__/uptime_store.mock';
 
 describe('state selectors', () => {
diff --git a/x-pack/plugins/uptime/public/state/selectors/index.ts b/x-pack/plugins/uptime/public/state/selectors/index.ts
index f420648664fef..d250eb8bcf059 100644
--- a/x-pack/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/plugins/uptime/public/state/selectors/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { createSelector } from 'reselect';
-import type { AppState } from '../../state';
+import type { AppState } from '..';
 
 // UI Selectors
 export const getBasePath = ({ ui: { basePath } }: AppState) => basePath;
diff --git a/x-pack/plugins/uptime/server/index.ts b/x-pack/plugins/uptime/server/index.ts
index 7c3b2ec345bd6..3ed326d1fc143 100644
--- a/x-pack/plugins/uptime/server/index.ts
+++ b/x-pack/plugins/uptime/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { Plugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/uptime/server/kibana.index.ts
index 461c2ba16366a..34cec1a2af37a 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/uptime/server/kibana.index.ts
@@ -6,8 +6,8 @@
  */
 
 import { Request, Server } from '@hapi/hapi';
-import { Logger } from 'kibana/server';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import { PLUGIN } from '../common/constants/plugin';
 import { compose } from './lib/compose/kibana';
 import { initUptimeServer } from './uptime_server';
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index fb5c0cd1e69a1..b059d1d765067 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -5,33 +5,33 @@
  * 2.0.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import type {
   SavedObjectsClientContract,
   IScopedClusterClient,
   Logger,
   IBasePath,
-} from 'src/core/server';
-import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
-import { ObservabilityPluginSetup } from '../../../../../observability/server';
+} from '@kbn/core/server';
+import type { TelemetryPluginSetup, TelemetryPluginStart } from '@kbn/telemetry-plugin/server';
+import { ObservabilityPluginSetup } from '@kbn/observability-plugin/server';
 import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../../../../encrypted_saved_objects/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../task_manager/server';
-import { UMKibanaRoute } from '../../../rest_api';
-import { PluginSetupContract } from '../../../../../features/server';
-import { MlPluginSetup as MlSetup } from '../../../../../ml/server';
-import { RuleRegistryPluginSetupContract } from '../../../../../rule_registry/server';
+} from '@kbn/task-manager-plugin/server';
+import { PluginSetupContract } from '@kbn/features-plugin/server';
+import { MlPluginSetup as MlSetup } from '@kbn/ml-plugin/server';
+import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { FleetStartContract } from '@kbn/fleet-plugin/server';
 import { UptimeESClient } from '../../lib';
 import type { TelemetryEventsSender } from '../../telemetry/sender';
 import type { UptimeRouter } from '../../../types';
-import { SecurityPluginStart } from '../../../../../security/server';
-import { CloudSetup } from '../../../../../cloud/server';
-import { FleetStartContract } from '../../../../../fleet/server';
+import { UMKibanaRoute } from '../../../rest_api';
 import { UptimeConfig } from '../../../../common/config';
 import { SyntheticsService } from '../../synthetics_service/synthetics_service';
 
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
index 70385698ca6e0..62d38ec3678bb 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { KibanaTelemetryAdapter } from './kibana_telemetry_adapter';
-import { createCollectorFetchContextMock } from 'src/plugins/usage_collection/server/mocks';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 jest
   .spyOn(KibanaTelemetryAdapter, 'countNoOfUniqueMonitorAndLocations')
   .mockResolvedValue(undefined as any);
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
index de09c686d4441..2a3bc50c3ba15 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
@@ -6,8 +6,8 @@
  */
 
 import moment from 'moment';
-import { SavedObjectsClientContract } from 'kibana/server';
-import { CollectorFetchContext, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { PageViewParams, UptimeTelemetry, Usage } from './types';
 import { savedObjectsAdapter } from '../../saved_objects/saved_objects';
 import { UptimeESClient, createUptimeESClient } from '../../lib';
diff --git a/x-pack/plugins/uptime/server/lib/alerts/common.ts b/x-pack/plugins/uptime/server/lib/alerts/common.ts
index 542aaa27819a3..8381adce21d2c 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/common.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/common.ts
@@ -7,7 +7,7 @@
 
 import { isRight } from 'fp-ts/lib/Either';
 import Mustache from 'mustache';
-import { IBasePath } from 'kibana/server';
+import { IBasePath } from '@kbn/core/server';
 import { UptimeCommonState, UptimeCommonStateType } from '../../../common/runtime_types';
 
 export type UpdateUptimeAlertState = (
diff --git a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts b/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts
index 2848df14776b5..eb4509850414b 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.test.ts
@@ -11,10 +11,10 @@ import {
 } from '@kbn/rule-data-utils';
 import { durationAnomalyAlertFactory } from './duration_anomaly';
 import { DURATION_ANOMALY } from '../../../common/constants/alerts';
-import { AnomaliesTableRecord, AnomalyRecordDoc } from '../../../../ml/common/types/anomalies';
+import { AnomaliesTableRecord, AnomalyRecordDoc } from '@kbn/ml-plugin/common/types/anomalies';
 import { DynamicSettings } from '../../../common/runtime_types';
 import { createRuleTypeMocks, bootstrapDependencies } from './test_utils';
-import { getSeverityType } from '../../../../ml/common/util/anomaly_utils';
+import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
 import { Ping } from '../../../common/runtime_types/ping';
 import { ALERT_REASON_MSG, VIEW_IN_APP_URL } from './action_variables';
 
diff --git a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts b/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
index d1e83c917d6f7..db50b5cf4bdbc 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
 import {
@@ -12,12 +12,12 @@ import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
-import { ActionGroupIdsOf } from '../../../../alerting/common';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { AnomaliesTableRecord } from '@kbn/ml-plugin/common/types/anomalies';
+import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
 import { updateState, generateAlertMessage, getViewInAppUrl } from './common';
 import { DURATION_ANOMALY } from '../../../common/constants/alerts';
 import { commonStateTranslations, durationAnomalyTranslations } from './translations';
-import { AnomaliesTableRecord } from '../../../../ml/common/types/anomalies';
-import { getSeverityType } from '../../../../ml/common/util/anomaly_utils';
 import { UptimeCorePluginsSetup } from '../adapters/framework';
 import { UptimeAlertTypeFactory } from './types';
 import { Ping } from '../../../common/runtime_types/ping';
diff --git a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
index 007ad8672eb2f..f1f00a8f7491f 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
@@ -12,6 +12,8 @@ import { i18n } from '@kbn/i18n';
 import { JsonObject } from '@kbn/utility-types';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { formatDurationFromTimeUnitChar, TimeUnitChar } from '@kbn/observability-plugin/common';
 import { UptimeAlertTypeFactory } from './types';
 import {
   StatusCheckFilters,
@@ -35,8 +37,6 @@ import {
 import { UNNAMED_LOCATION } from '../../../common/constants';
 import { getUptimeIndexPattern, IndexPatternTitleAndFields } from '../requests/get_index_pattern';
 import { UMServerLibs, UptimeESClient, createUptimeESClient } from '../lib';
-import { ActionGroupIdsOf } from '../../../../alerting/common';
-import { formatDurationFromTimeUnitChar, TimeUnitChar } from '../../../../observability/common';
 import {
   ALERT_REASON_MSG,
   MESSAGE,
diff --git a/x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts b/x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts
index e1a5da32c5fe4..af248af730eee 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/test_utils/index.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { IBasePath, Logger } from 'kibana/server';
+import { IBasePath, Logger } from '@kbn/core/server';
+import type { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
+import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
+import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { UMServerLibs } from '../../lib';
 import { UptimeCorePluginsSetup, UptimeServerSetup } from '../../adapters';
 import type { UptimeRouter } from '../../../types';
-import type { IRuleDataClient } from '../../../../../rule_registry/server';
-import { ruleRegistryMocks } from '../../../../../rule_registry/server/mocks';
 import { getUptimeESMockClient } from '../../requests/helper';
-import { alertsMock } from '../../../../../alerting/server/mocks';
 import { DynamicSettings } from '../../../../common/runtime_types';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/uptime/server/lib/alerts/tls.ts b/x-pack/plugins/uptime/server/lib/alerts/tls.ts
index 29e02080b2b51..55f7d3f972861 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/tls.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/tls.ts
@@ -7,6 +7,7 @@
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
 import { ALERT_REASON } from '@kbn/rule-data-utils';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
 import { UptimeAlertTypeFactory } from './types';
 import { updateState, generateAlertMessage } from './common';
 import { TLS } from '../../../common/constants/alerts';
@@ -15,8 +16,6 @@ import { Cert, CertResult } from '../../../common/runtime_types';
 import { commonStateTranslations, tlsTranslations } from './translations';
 import { TlsTranslations } from '../../../common/translations';
 
-import { ActionGroupIdsOf } from '../../../../alerting/common';
-
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 import { createUptimeESClient } from '../lib';
 
diff --git a/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts b/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts
index e662160bef3e0..0490477cb24d1 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/tls_legacy.ts
@@ -7,16 +7,15 @@
 
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
+import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
+import { AlertInstanceContext } from '@kbn/alerting-plugin/common';
+import { Alert } from '@kbn/alerting-plugin/server';
 import { UptimeAlertTypeFactory } from './types';
 import { updateState } from './common';
 import { TLS_LEGACY } from '../../../common/constants/alerts';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
 import { Cert, CertResult } from '../../../common/runtime_types';
 import { commonStateTranslations, tlsTranslations } from './translations';
-import { ActionGroupIdsOf } from '../../../../alerting/common';
-
-import { AlertInstanceContext } from '../../../../alerting/common';
-import { Alert } from '../../../../alerting/server';
 
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 import { createUptimeESClient } from '../lib';
diff --git a/x-pack/plugins/uptime/server/lib/alerts/types.ts b/x-pack/plugins/uptime/server/lib/alerts/types.ts
index b100965db7a73..50f3afd7d8aba 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/types.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/types.ts
@@ -4,11 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { UptimeCorePluginsSetup, UptimeServerSetup } from '../adapters';
+import { AlertTypeWithExecutor } from '@kbn/rule-registry-plugin/server';
+import { AlertInstanceContext, RuleTypeState } from '@kbn/alerting-plugin/common';
+import { LifecycleAlertService } from '@kbn/rule-registry-plugin/server';
 import { UMServerLibs } from '../lib';
-import { AlertTypeWithExecutor } from '../../../../rule_registry/server';
-import { AlertInstanceContext, RuleTypeState } from '../../../../alerting/common';
-import { LifecycleAlertService } from '../../../../rule_registry/server';
+import { UptimeCorePluginsSetup, UptimeServerSetup } from '../adapters';
 
 /**
  * Because all of our types are presumably going to list the `producer` as `'uptime'`,
diff --git a/x-pack/plugins/uptime/server/lib/domains/license.test.ts b/x-pack/plugins/uptime/server/lib/domains/license.test.ts
index 80bd0ff3fe3da..23906d077e549 100644
--- a/x-pack/plugins/uptime/server/lib/domains/license.test.ts
+++ b/x-pack/plugins/uptime/server/lib/domains/license.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 import { licenseCheck } from './license';
 
 describe('license check', () => {
diff --git a/x-pack/plugins/uptime/server/lib/domains/license.ts b/x-pack/plugins/uptime/server/lib/domains/license.ts
index a64213a44fc0b..d921766529e8f 100644
--- a/x-pack/plugins/uptime/server/lib/domains/license.ts
+++ b/x-pack/plugins/uptime/server/lib/domains/license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ILicense } from '../../../../licensing/server';
+import { ILicense } from '@kbn/licensing-plugin/server';
 
 export interface UMLicenseStatusResponse {
   statusCode: number;
diff --git a/x-pack/plugins/uptime/server/lib/lib.ts b/x-pack/plugins/uptime/server/lib/lib.ts
index 8b5761900e487..d4bcad0bb1f70 100644
--- a/x-pack/plugins/uptime/server/lib/lib.ts
+++ b/x-pack/plugins/uptime/server/lib/lib.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract, KibanaRequest } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract, KibanaRequest } from '@kbn/core/server';
 import chalk from 'chalk';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import { RequestStatus } from '@kbn/inspector-plugin';
+import { getInspectResponse } from '@kbn/observability-plugin/server';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
 import { UMBackendFrameworkAdapter } from './adapters';
 import { UMLicenseCheck } from './domains';
 import { UptimeRequests } from './requests';
 import { savedObjectsAdapter } from './saved_objects/saved_objects';
-import { ESSearchResponse } from '../../../../../src/core/types/elasticsearch';
-import { RequestStatus } from '../../../../../src/plugins/inspector';
-import { getInspectResponse } from '../../../observability/server';
-import { InspectResponse } from '../../../observability/typings/common';
 
 export interface UMDomainLibs {
   requests: UptimeRequests;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
index e79779133e78c..fbee794b4f3d8 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_index_pattern.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FieldDescriptor, IndexPatternsFetcher } from '../../../../../../src/plugins/data/server';
+import { FieldDescriptor, IndexPatternsFetcher } from '@kbn/data-plugin/server';
 import { UptimeESClient } from '../lib';
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor.ts
index b74852d581311..f8b01b63e88e6 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor.ts
@@ -5,16 +5,13 @@
  * 2.0.
  */
 
-import { SavedObject, SavedObjectsClientContract } from 'kibana/server';
-import { EncryptedSavedObjectsClient } from '../../../../encrypted_saved_objects/server';
+import { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import {
   SyntheticsMonitorWithSecrets,
   EncryptedSyntheticsMonitor,
 } from '../../../common/runtime_types';
-import {
-  syntheticsMonitor,
-  syntheticsMonitorType,
-} from '../../lib/saved_objects/synthetics_monitor';
+import { syntheticsMonitor, syntheticsMonitorType } from '../saved_objects/synthetics_monitor';
 
 export const getSyntheticsMonitor = async ({
   monitorId,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
index f7ec023652d77..64e676b496350 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
@@ -8,13 +8,13 @@
 import { JsonObject } from '@kbn/utility-types';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { PromiseType } from 'utility-types';
+import { formatDurationFromTimeUnitChar, TimeUnitChar } from '@kbn/observability-plugin/common';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { Ping } from '../../../common/runtime_types/ping';
 import { createEsQuery } from '../../../common/utils/es_search';
 import { UptimeESClient } from '../lib';
 import { UNNAMED_LOCATION } from '../../../common/constants';
-import { formatDurationFromTimeUnitChar, TimeUnitChar } from '../../../../observability/common';
 
 export interface GetMonitorStatusParams {
   filters?: JsonObject;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
index 256219778048c..fa878bd7ac7bc 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { CONTEXT_DEFAULTS } from '../../../common/constants';
 import { Snapshot } from '../../../common/runtime_types';
 import { QueryContext } from './search';
-import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
 import { EXCLUDE_RUN_ONCE_FILTER } from '../../../common/constants/client_defaults';
 
 export interface GetSnapshotCountParams {
diff --git a/x-pack/plugins/uptime/server/lib/requests/helper.ts b/x-pack/plugins/uptime/server/lib/requests/helper.ts
index fbc838aa7c7dd..315b0bd3d0f96 100644
--- a/x-pack/plugins/uptime/server/lib/requests/helper.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/helper.ts
@@ -7,11 +7,8 @@
 
 import { AggregationsAggregate } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ElasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
-import {
-  elasticsearchServiceMock,
-  savedObjectsClientMock,
-} from '../../../../../../src/core/server/mocks';
+import { ElasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
+import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { createUptimeESClient, UptimeESClient } from '../lib';
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
index 17e254d3da800..6607c9912c468 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
@@ -6,10 +6,10 @@
  */
 
 import moment from 'moment';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 import { CursorPagination } from './types';
 import { CursorDirection, SortOrder } from '../../../../common/runtime_types';
 import { UptimeESClient } from '../../lib';
-import { ESFilter } from '../../../../../../../src/core/types/elasticsearch';
 import { parseRelativeDate } from '../../../../common/lib/get_histogram_interval';
 
 export class QueryContext {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts b/x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts
index 172e549cc05fa..e07580011767c 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/migrations.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { add820Indices } from './migrations';
-import { SavedObject, SavedObjectMigrationContext } from 'src/core/server';
+import { SavedObject, SavedObjectMigrationContext } from '@kbn/core/server';
 import { DynamicSettings } from '../../../common/runtime_types';
 
 describe('add820Indices migration', () => {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts b/x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts
index 211e58db9784e..01e83fc72d87c 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/migrations.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectMigrationFn } from 'src/core/server';
+import { SavedObjectMigrationFn } from '@kbn/core/server';
 import { DynamicSettings } from '../../../common/runtime_types';
 
 export const add820Indices: SavedObjectMigrationFn<DynamicSettings, DynamicSettings> = (doc) => {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts b/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
index 74f3a4a8f7366..136df1fca14c6 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/saved_objects.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import {
-  SavedObjectsErrorHelpers,
-  SavedObjectsServiceSetup,
-} from '../../../../../../src/core/server';
-import { EncryptedSavedObjectsPluginSetup } from '../../../../encrypted_saved_objects/server';
+import { SavedObjectsErrorHelpers, SavedObjectsServiceSetup } from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
 import { secretKeys } from '../../../common/constants/monitor_management';
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts b/x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts
index 43fee5ecd6dad..1486c65f07b1a 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/service_api_key.ts
@@ -10,9 +10,9 @@ import {
   SavedObjectsClientContract,
   SavedObjectsErrorHelpers,
   SavedObjectsType,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
+import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import { SyntheticsServiceApiKey } from '../../../common/runtime_types/synthetics_service_api_key';
-import { EncryptedSavedObjectsClient } from '../../../../encrypted_saved_objects/server';
 
 export const syntheticsApiKeyID = 'ba997842-b0cf-4429-aa9d-578d9bf0d391';
 export const syntheticsApiKeyObjectType = 'uptime-synthetics-api-key';
@@ -20,7 +20,7 @@ export const syntheticsApiKeyObjectType = 'uptime-synthetics-api-key';
 export const syntheticsServiceApiKey: SavedObjectsType = {
   name: syntheticsApiKeyObjectType,
   hidden: true,
-  namespaceType: 'single',
+  namespaceType: 'agnostic',
   mappings: {
     dynamic: false,
     properties: {
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts b/x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts
index ea20c4c9232e9..306f6ee689a38 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/synthetics_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 
 export const syntheticsMonitorType = 'synthetics-monitor';
@@ -18,27 +18,36 @@ export const syntheticsMonitor: SavedObjectsType = {
     dynamic: false,
     properties: {
       name: {
-        type: 'keyword',
-      },
-      id: {
-        type: 'keyword',
+        type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
       },
       type: {
-        type: 'keyword',
+        type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
       },
       urls: {
-        type: 'keyword',
-      },
-      tags: {
-        type: 'keyword',
-      },
-      secrets: {
         type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
       },
     },
   },
   management: {
-    importableAndExportable: true,
+    importableAndExportable: false,
     icon: 'uptimeApp',
     getTitle: (savedObject) =>
       savedObject.attributes.name +
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts b/x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts
index 4ed7887049c9b..e8307256ddb2c 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects/uptime_settings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsType } from 'kibana/server';
+import { SavedObjectsType } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { add820Indices } from './migrations';
 
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts
index 5743d05429799..5c7f538f18ce1 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/formatters/format_configs.ts
@@ -7,7 +7,7 @@
 
 import { isNil, omitBy } from 'lodash';
 import { ConfigKey, MonitorFields } from '../../../../common/runtime_types';
-import { formatters } from './index';
+import { formatters } from '.';
 
 const UI_KEYS_TO_SKIP = [
   ConfigKey.METADATA,
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts
index 7ad3d0b1e2e67..ffc24f93c57ff 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.test.ts
@@ -6,11 +6,11 @@
  */
 
 import { getAPIKeyForSyntheticsService } from './get_api_key';
-import { encryptedSavedObjectsMock } from '../../../../encrypted_saved_objects/server/mocks';
-import { securityMock } from '../../../../security/server/mocks';
-import { coreMock } from '../../../../../../src/core/server/mocks';
+import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
+import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { coreMock } from '@kbn/core/server/mocks';
 import { syntheticsServiceApiKey } from '../saved_objects/service_api_key';
-import { KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from '@kbn/core/server';
 import { UptimeServerSetup } from '../adapters';
 import { getUptimeESMockClient } from '../requests/helper';
 
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts
index 766f26a0aeca7..1552edd94843d 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_api_key.ts
@@ -8,9 +8,9 @@ import type {
   SecurityClusterPrivilege,
   SecurityIndexPrivilege,
 } from '@elastic/elasticsearch/lib/api/types';
-import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
+import { KibanaRequest, SavedObjectsClientContract } from '@kbn/core/server';
 
-import { SecurityPluginStart } from '../../../../security/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import {
   getSyntheticsServiceAPIKey,
   deleteSyntheticsServiceApiKey,
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
index d9795219ede28..0e198b000e6ea 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.test.ts
@@ -13,7 +13,7 @@
  */
 
 import { getEsHosts } from './get_es_hosts';
-import { CloudSetup } from '../../../../cloud/server';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
 
 describe('getEsHostsTest', () => {
   const cloudSetup = {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts
index 847fcfa9db834..7cf2d04af7b80 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_es_hosts.ts
@@ -12,8 +12,8 @@
  * 2.0.
  */
 
-import { CloudSetup } from '../../../../cloud/server';
-import { decodeCloudId } from '../../../../fleet/common';
+import { CloudSetup } from '@kbn/cloud-plugin/server';
+import { decodeCloudId } from '@kbn/fleet-plugin/common';
 import { ServiceConfig } from '../../../common/config';
 
 export function getEsHosts({
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts
index 82fe06f36d533..9151a1dcac6ad 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.test.ts
@@ -18,7 +18,6 @@ describe('getServiceLocations', function () {
       throttling: {
         [BandwidthLimitKey.DOWNLOAD]: 100,
         [BandwidthLimitKey.UPLOAD]: 50,
-        [BandwidthLimitKey.LATENCY]: 20,
       },
       locations: {
         us_central: {
@@ -50,7 +49,6 @@ describe('getServiceLocations', function () {
       throttling: {
         [BandwidthLimitKey.DOWNLOAD]: 100,
         [BandwidthLimitKey.UPLOAD]: 50,
-        [BandwidthLimitKey.LATENCY]: 20,
       },
       locations: [
         {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts
index 50ecfe38d20dd..45dd0ded1438d 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/get_service_locations.ts
@@ -54,8 +54,7 @@ export async function getServiceLocations(server: UptimeServerSetup) {
     const throttling = pick(
       data.throttling,
       BandwidthLimitKey.DOWNLOAD,
-      BandwidthLimitKey.UPLOAD,
-      BandwidthLimitKey.LATENCY
+      BandwidthLimitKey.UPLOAD
     ) as ThrottlingOptions;
 
     return { throttling, locations };
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts
index 6002d1bd8f1ec..d595bfaa5400e 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/hydrate_saved_object.ts
@@ -10,6 +10,7 @@ import { UptimeESClient } from '../lib';
 import { UptimeServerSetup } from '../adapters';
 import { DecryptedSyntheticsMonitorSavedObject } from '../../../common/types';
 import { SyntheticsMonitor, MonitorFields, Ping } from '../../../common/runtime_types';
+import { SYNTHETICS_INDEX_PATTERN } from '../../../common/constants';
 
 export const hydrateSavedObjects = async ({
   monitors,
@@ -125,7 +126,7 @@ const fetchSampleMonitorDocuments = async (esClient: UptimeESClient, configIds:
       },
     },
     'getHydrateQuery',
-    'synthetics-*'
+    SYNTHETICS_INDEX_PATTERN
   );
 
   return data.body.hits.hits.map(
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts
index 3397dcad94e95..2cfd14b7ebe01 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts
@@ -10,7 +10,7 @@ import { forkJoin, from as rxjsFrom, Observable, of } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 import * as https from 'https';
 import { SslConfig } from '@kbn/server-http-tools';
-import { Logger } from '../../../../../../src/core/server';
+import { Logger } from '@kbn/core/server';
 import {
   MonitorFields,
   ServiceLocations,
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts
index 6cfe4cb837ded..788e726c40d4f 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.test.ts
@@ -7,7 +7,7 @@
 
 import { SyntheticsService } from './synthetics_service';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { loggerMock } from './../../../../../../src/core/server/logging/logger.mock';
+import { loggerMock } from '@kbn/core/server/logging/logger.mock';
 import { UptimeServerSetup } from '../adapters';
 
 describe('SyntheticsService', () => {
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts
index c6fa280f2f163..083f0d9f6126c 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts
@@ -7,14 +7,14 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { SavedObject } from 'kibana/server';
-import { KibanaRequest, Logger } from '../../../../../../src/core/server';
+import { SavedObject } from '@kbn/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import {
   ConcreteTaskInstance,
   TaskManagerSetupContract,
   TaskManagerStartContract,
   TaskInstance,
-} from '../../../../task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { UptimeServerSetup } from '../adapters';
 import { installSyntheticsIndexTemplates } from '../../rest_api/synthetics_service/install_index_templates';
 import { SyntheticsServiceApiKey } from '../../../common/runtime_types/synthetics_service_api_key';
@@ -369,7 +369,10 @@ export class SyntheticsService {
       encryptedMonitors.map((monitor) =>
         encryptedClient.getDecryptedAsInternalUser<SyntheticsMonitorWithSecrets>(
           syntheticsMonitor.name,
-          monitor.id
+          monitor.id,
+          {
+            namespace: monitor.namespaces?.[0],
+          }
         )
       )
     );
diff --git a/x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts b/x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts
index 7848dbedb7fed..7aa7aa8f32f40 100644
--- a/x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts
+++ b/x-pack/plugins/uptime/server/lib/synthetics_service/utils/secrets.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { omit, pick } from 'lodash';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import { secretKeys } from '../../../../common/constants/monitor_management';
 import {
   SyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts b/x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts
index 5a7a69cbcd995..df1ceabaaadab 100644
--- a/x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts
+++ b/x-pack/plugins/uptime/server/lib/telemetry/sender.test.ts
@@ -13,7 +13,7 @@ import axios from 'axios';
 
 import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
 
-import { loggingSystemMock } from 'src/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { MONITOR_UPDATE_CHANNEL } from './constants';
 
diff --git a/x-pack/plugins/uptime/server/lib/telemetry/sender.ts b/x-pack/plugins/uptime/server/lib/telemetry/sender.ts
index 296bc2af2f71f..7a5239d7e2470 100644
--- a/x-pack/plugins/uptime/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/uptime/server/lib/telemetry/sender.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CoreStart, ElasticsearchClient, Logger } from 'src/core/server';
-import type { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
+import type { CoreStart, ElasticsearchClient, Logger } from '@kbn/core/server';
+import type { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 
 import { cloneDeep } from 'lodash';
 
diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/uptime/server/plugin.ts
index 13c05d0182119..7e7547913c373 100644
--- a/x-pack/plugins/uptime/server/plugin.ts
+++ b/x-pack/plugins/uptime/server/plugin.ts
@@ -12,7 +12,10 @@ import {
   Logger,
   SavedObjectsClient,
   SavedObjectsClientContract,
-} from '../../../../src/core/server';
+} from '@kbn/core/server';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
+import { experimentalRuleFieldMap } from '@kbn/rule-registry-plugin/common/assets/field_maps/experimental_rule_field_map';
+import { Dataset } from '@kbn/rule-registry-plugin/server';
 import { uptimeRuleFieldMap } from '../common/rules/uptime_rule_field_map';
 import { initServerWithKibana } from './kibana.index';
 import {
@@ -23,9 +26,6 @@ import {
 } from './lib/adapters';
 import { TelemetryEventsSender } from './lib/telemetry/sender';
 import { registerUptimeSavedObjects, savedObjectsAdapter } from './lib/saved_objects/saved_objects';
-import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
-import { experimentalRuleFieldMap } from '../../rule_registry/common/assets/field_maps/experimental_rule_field_map';
-import { Dataset } from '../../rule_registry/server';
 import { UptimeConfig } from '../common/config';
 import { SyntheticsService } from './lib/synthetics_service/synthetics_service';
 import { syntheticsServiceApiKey } from './lib/saved_objects/service_api_key';
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts
index 521dae85e85db..598328349227d 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/add_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import {
   MonitorFields,
   SyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts
index 17f34b0d82ec0..dc6fc759e81a4 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/delete_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   EncryptedSyntheticsMonitor,
   SyntheticsMonitorWithSecrets,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts
index 9ad9084b72ba5..55be289f7162a 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/edit_monitor.ts
@@ -6,8 +6,8 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsUpdateResponse, SavedObject } from 'kibana/server';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsUpdateResponse, SavedObject } from '@kbn/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import {
   MonitorFields,
   EncryptedSyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts
index 824d453a6804e..556741c99f599 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/get_monitor.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { UMServerLibs } from '../../lib/lib';
 import { UMRestApiRouteFactory } from '../types';
 import { API_URLS } from '../../../common/constants';
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts
index 23921c4d1d6ef..795c75aad4ab5 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/service_errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { KibanaResponseFactory } from '@kbn/core/server';
 
 export function getMonitorNotFoundResponse(response: KibanaResponseFactory, monitorId: string) {
   return response.notFound({ body: { message: `Monitor id ${monitorId} not found!` } });
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
index 24734c88301f1..9d8161b02b634 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.test.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import { sha256 } from 'js-sha256';
-import type { Logger } from 'src/core/server';
-import { loggingSystemMock } from 'src/core/server/mocks';
-import { SavedObject } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { SavedObject } from '@kbn/core/server';
 import {
   SyntheticsMonitor,
   ConfigKey,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
index 29f28e5ab36a6..295f6cfc2e6e9 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/telemetry/monitor_upgrade_sender.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import { sha256 } from 'js-sha256';
-import type { Logger } from 'src/core/server';
-import { SavedObjectsUpdateResponse, SavedObject } from 'kibana/server';
+import type { Logger } from '@kbn/core/server';
+import { SavedObjectsUpdateResponse, SavedObject } from '@kbn/core/server';
 import {
   MonitorFields,
   EncryptedSyntheticsMonitor,
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts b/x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts
index 2ad270db213fb..57a1385e0f1d4 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics_service/test_now_monitor.ts
@@ -6,10 +6,14 @@
  */
 import { schema } from '@kbn/config-schema';
 import { v4 as uuidv4 } from 'uuid';
-import { SyntheticsMonitor } from '../../../common/runtime_types';
+import { SyntheticsMonitor, SyntheticsMonitorWithSecrets } from '../../../common/runtime_types';
 import { UMRestApiRouteFactory } from '../types';
 import { API_URLS } from '../../../common/constants';
-import { syntheticsMonitorType } from '../../lib/saved_objects/synthetics_monitor';
+import {
+  syntheticsMonitor,
+  syntheticsMonitorType,
+} from '../../lib/saved_objects/synthetics_monitor';
+import { normalizeSecrets } from '../../lib/synthetics_service/utils/secrets';
 
 export const testNowMonitorRoute: UMRestApiRouteFactory = () => ({
   method: 'GET',
@@ -26,12 +30,21 @@ export const testNowMonitorRoute: UMRestApiRouteFactory = () => ({
       monitorId
     );
 
+    const encryptedClient = server.encryptedSavedObjects.getClient();
+
+    const monitorWithSecrets =
+      await encryptedClient.getDecryptedAsInternalUser<SyntheticsMonitorWithSecrets>(
+        syntheticsMonitor.name,
+        monitorId
+      );
+
     const { syntheticsService } = server;
 
     const testRunId = uuidv4();
 
     const errors = await syntheticsService.triggerConfigs(request, [
       {
+        ...normalizeSecrets(monitorWithSecrets).attributes,
         ...monitor.attributes,
         id: monitorId,
         fields_under_root: true,
diff --git a/x-pack/plugins/uptime/server/rest_api/types.ts b/x-pack/plugins/uptime/server/rest_api/types.ts
index 48e3f58ae0ad5..ef091214d4b04 100644
--- a/x-pack/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/plugins/uptime/server/rest_api/types.ts
@@ -14,7 +14,7 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { UMServerLibs, UptimeESClient } from '../lib/lib';
 import type { UptimeRequestHandlerContext } from '../types';
 import { UptimeServerSetup } from '../lib/adapters';
diff --git a/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts b/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
index 450997c7c110d..916594beb38ea 100644
--- a/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
+++ b/x-pack/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { SavedObjectsClientContract } from '@kbn/core/server';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaResponse } from '@kbn/core/server/http/router';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/common';
 import { UMKibanaRouteWrapper } from './types';
 import { createUptimeESClient, inspectableEsQueriesMap } from '../lib/lib';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaResponse } from '../../../../../src/core/server/http/router';
-import { enableInspectEsQueries } from '../../../observability/common';
 import { syntheticsServiceApiKey } from '../lib/saved_objects/service_api_key';
 import { API_URLS } from '../../common/constants';
 
diff --git a/x-pack/plugins/uptime/server/types.ts b/x-pack/plugins/uptime/server/types.ts
index 9f649b0263d3c..b05ac2ee38a79 100644
--- a/x-pack/plugins/uptime/server/types.ts
+++ b/x-pack/plugins/uptime/server/types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { AlertingApiRequestHandlerContext } from '../../alerting/server';
-import type { LicensingApiRequestHandlerContext } from '../../licensing/server';
+import type { IRouter, RequestHandlerContext } from '@kbn/core/server';
+import type { AlertingApiRequestHandlerContext } from '@kbn/alerting-plugin/server';
+import type { LicensingApiRequestHandlerContext } from '@kbn/licensing-plugin/server';
 /**
  * @internal
  */
diff --git a/x-pack/plugins/uptime/server/uptime_server.ts b/x-pack/plugins/uptime/server/uptime_server.ts
index fd16e8243c2cd..fe1795f501c0a 100644
--- a/x-pack/plugins/uptime/server/uptime_server.ts
+++ b/x-pack/plugins/uptime/server/uptime_server.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Logger } from 'kibana/server';
-import { createLifecycleRuleTypeFactory, IRuleDataClient } from '../../rule_registry/server';
+import { Logger } from '@kbn/core/server';
+import { createLifecycleRuleTypeFactory, IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import { UMServerLibs } from './lib/lib';
 import { createRouteWithAuth, restApiRoutes, uptimeRouteWrapper } from './rest_api';
 import { UptimeServerSetup, UptimeCorePluginsSetup } from './lib/adapters';
diff --git a/x-pack/plugins/ux/common/agent_name.ts b/x-pack/plugins/ux/common/agent_name.ts
index d8e079400bff4..d8b7971a0d74e 100644
--- a/x-pack/plugins/ux/common/agent_name.ts
+++ b/x-pack/plugins/ux/common/agent_name.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AgentName } from '../../apm/typings/es_schemas/ui/fields/agent';
+import { AgentName } from '@kbn/apm-plugin/typings/es_schemas/ui/fields/agent';
 
 export const RUM_AGENT_NAMES: AgentName[] = [
   'js-base',
diff --git a/x-pack/plugins/ux/common/fetch_options.ts b/x-pack/plugins/ux/common/fetch_options.ts
index 2f862ec7cbc38..14b8900e6ed26 100644
--- a/x-pack/plugins/ux/common/fetch_options.ts
+++ b/x-pack/plugins/ux/common/fetch_options.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpFetchOptions } from 'kibana/public';
+import { HttpFetchOptions } from '@kbn/core/public';
 
 export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
   pathname: string;
diff --git a/x-pack/plugins/ux/public/application/application.test.tsx b/x-pack/plugins/ux/public/application/application.test.tsx
index 1023a7b83345b..82f236631ef7e 100644
--- a/x-pack/plugins/ux/public/application/application.test.tsx
+++ b/x-pack/plugins/ux/public/application/application.test.tsx
@@ -11,11 +11,11 @@ import { mount } from 'enzyme';
 
 import { UXAppRoot } from './ux_app';
 import { RumHome } from '../components/app/rum_dashboard/rum_home';
-import { coreMock } from '../../../../../src/core/public/mocks';
-import { createObservabilityRuleTypeRegistryMock } from '../../../observability/public';
+import { coreMock } from '@kbn/core/public/mocks';
+import { createObservabilityRuleTypeRegistryMock } from '@kbn/observability-plugin/public';
 import { merge } from 'lodash';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
-import { embeddablePluginMock } from '../../../../../src/plugins/embeddable/public/mocks';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 jest.mock('../services/rest/data_view', () => ({
   createStaticDataView: () => Promise.resolve(undefined),
diff --git a/x-pack/plugins/ux/public/application/ux_app.tsx b/x-pack/plugins/ux/public/application/ux_app.tsx
index 03767959e4d17..d2879d4fa2797 100644
--- a/x-pack/plugins/ux/public/application/ux_app.tsx
+++ b/x-pack/plugins/ux/public/application/ux_app.tsx
@@ -18,14 +18,19 @@ import {
   AppMountParameters,
   CoreStart,
   APP_WRAPPER_CLASS,
-} from '../../../../../src/core/public';
+} from '@kbn/core/public';
 
 import {
   KibanaContextProvider,
   RedirectAppLinks,
   useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/kibana-react-plugin/public';
 
+import {
+  DatePickerContextProvider,
+  InspectorContextProvider,
+  useBreadcrumbs,
+} from '@kbn/observability-plugin/public';
 import {
   DASHBOARD_LABEL,
   RumHome,
@@ -33,11 +38,6 @@ import {
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 import { UXActionMenu } from '../components/app/rum_dashboard/action_menu';
 
-import {
-  DatePickerContextProvider,
-  InspectorContextProvider,
-  useBreadcrumbs,
-} from '../../../observability/public';
 import { UrlParamsProvider } from '../context/url_params_context/url_params_context';
 import { createStaticDataView } from '../services/rest/data_view';
 import { createCallApmApi } from '../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
index 84c297dbdea29..35d6afdfd53b3 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
@@ -12,9 +12,9 @@ import {
   RECORDS_FIELD,
   createExploratoryViewUrl,
   HeaderMenuPortal,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { AppMountParameters } from '@kbn/core/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { AppMountParameters } from '../../../../../../../../src/core/public';
 import { SERVICE_NAME } from '../../../../../common/elasticsearch_fieldnames';
 import { UxInspectorHeaderLink } from './inpector_link';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
index 98622184a5cec..0fdebb787f064 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/inpector_link.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import {
   useInspectorContext,
   enableInspectEsQueries,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 
 export function UxInspectorHeaderLink() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx
index e04a23fd8ddbf..d4986503222b9 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_load_dist_chart.tsx
@@ -28,11 +28,11 @@ import {
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
 import styled from 'styled-components';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { PercentileAnnotations } from '../page_load_distribution/percentile_annotations';
 import { I18LABELS } from '../translations';
 import { ChartWrapper } from '../chart_wrapper';
 import { PercentileRange } from '../page_load_distribution';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
 import { BreakdownSeries } from '../page_load_distribution/breakdown_series';
 import { BreakdownItem } from '../../../../../typings/ui_filters';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
index 79e60a2117540..3e39d8c4faeb8 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/page_views_chart.tsx
@@ -27,11 +27,11 @@ import numeral from '@elastic/numeral';
 import moment from 'moment';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { ChartWrapper } from '../chart_wrapper';
 import { I18LABELS } from '../translations';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 
 interface Props {
   data?: {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx
index 2cdeb7be85ce3..c37694317bb16 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/charts/visitor_breakdown_chart.tsx
@@ -21,7 +21,7 @@ import {
   EUI_CHARTS_THEME_DARK,
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { ChartWrapper } from '../chart_wrapper';
 import { I18LABELS } from '../translations';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx
index d896dfd6428d7..8a9dcad9e1915 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/environment_filter/index.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { History } from 'history';
 import React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useEnvironmentsFetcher } from '../../../../hooks/use_environments_fetcher';
 import {
   ENVIRONMENT_ALL,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts
index c228f9acb77c8..e208e8536b718 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/hooks/use_local_uifilters.ts
@@ -7,10 +7,10 @@
 
 import { omit } from 'lodash';
 import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { getExcludedName } from '../local_uifilters';
 
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 import { removeUndefinedProps } from '../../../../context/url_params_context/helpers';
 import {
   uxFiltersByName,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx
index 760ed2cba5390..1085e7e5952a6 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/impactful_metrics/js_errors.tsx
@@ -19,11 +19,12 @@ import {
 import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
+import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 import { I18LABELS } from '../translations';
 import { CsmSharedContext } from '../csm_shared_context';
-import { FETCH_STATUS } from '../../../../../../observability/public';
 
 interface JSErrorItem {
   errorMessage: string;
@@ -32,6 +33,8 @@ interface JSErrorItem {
 }
 
 export function JSErrors() {
+  const { http } = useKibanaServices();
+  const basePath = http.basePath.get();
   const { rangeId, urlParams, uxUiFilters } = useLegacyUrlParams();
 
   const { start, end, serviceName, searchTerm } = urlParams;
@@ -70,7 +73,9 @@ export function JSErrors() {
       field: 'errorMessage',
       name: I18LABELS.errorMessage,
       render: (errorMessage: string, item: JSErrorItem) => (
-        <EuiLink href={`/services/${serviceName}/errors/${item.errorGroupId}`}>
+        <EuiLink
+          href={`${basePath}/app/apm/services/${serviceName}/errors/${item.errorGroupId}`}
+        >
           {errorMessage}
         </EuiLink>
       ),
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx
index a2771994e8310..a8af8fad43231 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
-import { useTrackPageview } from '../../../../../observability/public';
+import { useTrackPageview } from '@kbn/observability-plugin/public';
 import { LocalUIFilters } from './local_uifilters';
 import { RumDashboard } from './rum_dashboard';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx
index 766e4d6f5baa5..b4e5c3546c129 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/index.tsx
@@ -15,11 +15,11 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ESFilter } from 'src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
+import { FieldValueSuggestions } from '@kbn/observability-plugin/public';
 import { useLocalUIFilters } from '../hooks/use_local_uifilters';
 
 import { useBreakpoints } from '../../../../hooks/use_breakpoints';
-import { FieldValueSuggestions } from '../../../../../../observability/public';
 import { URLFilter } from '../url_filter';
 import { SelectedFilters } from './selected_filters';
 import { useDataView } from './use_data_view';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts
index 7c3f49ca9a869..8718485496f38 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/queries.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from 'src/core/types/elasticsearch';
+import { ESFilter } from '@kbn/core/types/elasticsearch';
 
 import { SERVICE_ENVIRONMENT } from '../../../../../common/elasticsearch_fieldnames';
 import {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx
index 74146fe6d981f..296ef32ca5b8c 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_filters.tsx
@@ -9,10 +9,10 @@ import React, { Fragment } from 'react';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
+import { FilterValueLabel } from '@kbn/observability-plugin/public';
+import { IndexPattern } from '@kbn/data-plugin/common';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { FilterValueLabel } from '../../../../../../observability/public';
 import { FiltersUIHook } from '../hooks/use_local_uifilters';
-import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
 import { SelectedWildcards } from './selected_wildcards';
 import { UxLocalUIFilterName } from '../../../../../common/ux_ui_filter';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
index 46257605a22ce..dd6e7f16f7ec8 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/selected_wildcards.tsx
@@ -12,10 +12,10 @@ import {
   FilterValueLabel,
   fromQuery,
   toQuery,
-} from '../../../../../../observability/public';
+} from '@kbn/observability-plugin/public';
+import { IndexPattern } from '@kbn/data-views-plugin/common';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { TRANSACTION_URL } from '../../../../../common/elasticsearch_fieldnames';
-import { IndexPattern } from '../../../../../../../../src/plugins/data_views/common';
 
 interface Props {
   indexPattern: IndexPattern;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts
index 959da46da673e..bb80fd68ff283 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/local_uifilters/use_data_view.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../../src/plugins/data/common';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { DataView } from '@kbn/data-plugin/common';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { useFetcher } from '../../../../hooks/use_fetcher';
-import { DataPublicPluginStart } from '../../../../../../../../src/plugins/data/public';
 import { useDynamicDataViewFetcher } from '../../../../hooks/use_dynamic_data_view';
 
 export function useDataView() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx
index 5e98f36cc0798..264c72758a9e3 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/breakdown_series.tsx
@@ -12,9 +12,9 @@ import {
   EUI_CHARTS_THEME_DARK,
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
-import { PercentileRange } from './index';
+import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
+import { PercentileRange } from '.';
 import { useBreakdowns } from './use_breakdowns';
-import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   field: string;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx
index dd3c05b7084c1..865148af62a7e 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/index.tsx
@@ -14,13 +14,13 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { I18LABELS } from '../translations';
 import { BreakdownFilter } from '../breakdowns/breakdown_filter';
 import { PageLoadDistChart } from '../charts/page_load_dist_chart';
 import { ResetPercentileZoom } from './reset_percentile_zoom';
-import { createExploratoryViewUrl } from '../../../../../../observability/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 import { BreakdownItem } from '../../../../../typings/ui_filters';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx
index 96b0198a870a5..0303aef4ec6e5 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/reset_percentile_zoom.tsx
@@ -14,7 +14,7 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { I18LABELS } from '../translations';
-import { PercentileRange } from './index';
+import { PercentileRange } from '.';
 
 interface Props {
   percentileRange: PercentileRange;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts
index 244cb6d051251..40748c571cb9c 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_load_distribution/use_breakdowns.ts
@@ -7,7 +7,7 @@
 
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { PercentileRange } from './index';
+import { PercentileRange } from '.';
 
 interface Props {
   percentileRange?: PercentileRange;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx
index 062332f680d82..87d6562d869b6 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/page_views_trend/index.tsx
@@ -14,12 +14,12 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { createExploratoryViewUrl } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { I18LABELS } from '../translations';
 import { BreakdownFilter } from '../breakdowns/breakdown_filter';
 import { PageViewsChart } from '../charts/page_views_chart';
-import { createExploratoryViewUrl } from '../../../../../../observability/public';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
 import { BreakdownItem } from '../../../../../typings/ui_filters';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx
index 275a154c30856..9220d0447b657 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_datepicker/index.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 import React from 'react';
+import { DatePicker } from '@kbn/observability-plugin/public';
 import { useUxUrlParams } from '../../../../context/url_params_context/use_ux_url_params';
 import { useDateRangeRedirect } from '../../../../hooks/use_date_range_redirect';
-import { DatePicker } from '../../../../../../observability/public';
 import { clearCache } from '../../../../services/rest/call_api';
 
 export function RumDatePicker() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
index 8fd6663c9ebd1..49696561b475b 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
@@ -8,17 +8,17 @@
 import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiTitle, EuiFlexItem } from '@elastic/eui';
+import { KibanaPageTemplateProps } from '@kbn/kibana-react-plugin/public';
 import { CsmSharedContextProvider } from './csm_shared_context';
 import { WebApplicationSelect } from './panels/web_application_select';
 import { UserPercentile } from './user_percentile';
 import { useBreakpoints } from '../../../hooks/use_breakpoints';
-import { KibanaPageTemplateProps } from '../../../../../../../src/plugins/kibana_react/public';
 import { useHasRumData } from './hooks/use_has_rum_data';
 import { RumDatePicker } from './rum_datepicker';
 import { EmptyStateLoading } from './empty_state_loading';
 import { useKibanaServices } from '../../../hooks/use_kibana_services';
 import { UxEnvironmentFilter } from './environment_filter';
-import { RumOverview } from './index';
+import { RumOverview } from '.';
 
 export const DASHBOARD_LABEL = i18n.translate('xpack.ux.title', {
   defaultMessage: 'Dashboard',
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx
index 3d5c9ddb3b3a2..8be0fb3a7ff2d 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/index.tsx
@@ -8,8 +8,8 @@
 import React, { useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import { omit } from 'lodash';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { URLSearch } from './url_search';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 import { removeUndefinedProps } from '../../../../context/url_params_context/helpers';
 
 export function URLFilter() {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx
index 45b4c8ab8b660..674b9593610ad 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/service_name_filter/index.tsx
@@ -9,8 +9,8 @@ import { EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../../context/url_params_context/use_url_params';
-import { fromQuery, toQuery } from '../../../../../../../observability/public';
 
 interface Props {
   serviceNames?: string[];
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx
index c3c14bd76061a..761724340662c 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/url_filter/url_search/index.tsx
@@ -8,11 +8,11 @@
 import React, { useEffect, useState } from 'react';
 import { isEqual, map } from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { SelectableUrlList } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../../context/url_params_context/use_url_params';
 import { I18LABELS } from '../../translations';
 import { formatToSec } from '../../ux_metrics/key_ux_metrics';
 import { getPercentileLabel } from '../../ux_metrics/translations';
-import { SelectableUrlList } from '../../../../../../../observability/public';
 import { selectableRenderOptions, UrlOption } from './render_option';
 import { useUrlSearch } from './use_url_search';
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx
index bac7b818fc03d..6fb7eb7d2f95f 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/user_percentile/index.tsx
@@ -9,9 +9,9 @@ import React, { useCallback, useEffect } from 'react';
 
 import { EuiSelect } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '@kbn/observability-plugin/public';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { I18LABELS } from '../translations';
-import { fromQuery, toQuery } from '../../../../../../observability/public';
 
 const DEFAULT_P = 50;
 
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx
index d8438de4a7e19..440dc22545061 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/utils/test_helper.tsx
@@ -7,13 +7,13 @@
 
 import React from 'react';
 import { render as testLibRender } from '@testing-library/react';
-import { CoreStart } from 'kibana/public';
+import { CoreStart } from '@kbn/core/public';
 import { of } from 'rxjs';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 import { MemoryHistory } from 'history';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { UrlParamsProvider } from '../../../../context/url_params_context/url_params_context';
 
 export const core = {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx
index 9678090928dd6..a5689a7701027 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/index.tsx
@@ -14,11 +14,11 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
+import { getCoreVitalsComponent } from '@kbn/observability-plugin/public';
 import { I18LABELS } from '../translations';
 import { KeyUXMetrics } from './key_ux_metrics';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useUxQuery } from '../hooks/use_ux_query';
-import { getCoreVitalsComponent } from '../../../../../../observability/public';
 import { CsmSharedContext } from '../csm_shared_context';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { getPercentileLabel } from './translations';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx
index d232b12f3a47b..be811726ed5a9 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { render, Matcher } from '@testing-library/react';
 import * as fetcherHook from '../../../../hooks/use_fetcher';
 import { KeyUXMetrics } from './key_ux_metrics';
-import { FETCH_STATUS } from '../../../../../../observability/public';
+import { FETCH_STATUS } from '@kbn/observability-plugin/public';
 
 describe('KeyUXMetrics', () => {
   it('renders metrics with correct formats', () => {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx
index d95d14c74770b..1dfab3fec5902 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_metrics/key_ux_metrics.tsx
@@ -8,6 +8,7 @@
 import React from 'react';
 import { EuiFlexItem, EuiStat, EuiFlexGroup, EuiIconTip } from '@elastic/eui';
 import numeral from '@elastic/numeral';
+import { UXMetrics } from '@kbn/observability-plugin/public';
 import {
   DATA_UNDEFINED_LABEL,
   FCP_LABEL,
@@ -23,7 +24,6 @@ import {
 } from './translations';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useUxQuery } from '../hooks/use_ux_query';
-import { UXMetrics } from '../../../../../../observability/public';
 
 export function formatToSec(
   value?: number | string,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts
index fdf9849d7983f..5d749b1320196 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/ux_overview_fetchers.ts
@@ -10,7 +10,7 @@ import {
   HasDataParams,
   UxFetchDataResponse,
   UXHasDataResponse,
-} from '../../../../../observability/public/';
+} from '@kbn/observability-plugin/public';
 import { callApmApi } from '../../../services/rest/create_call_apm_api';
 
 export { createCallApmApi } from '../../../services/rest/create_call_apm_api';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx
index 572661dc8cea4..b2ba69ff8bc94 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.test.tsx
@@ -9,8 +9,8 @@ import { render } from 'enzyme';
 import React from 'react';
 
 import { EmbeddedMap } from './embedded_map';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { embeddablePluginMock } from '../../../../../../../../src/plugins/embeddable/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
 describe('Embedded Map', () => {
   test('it renders', () => {
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx
index 780682d66ae3b..a89320ee02ae5 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx
@@ -9,19 +9,16 @@ import React, { useEffect, useState, useRef } from 'react';
 import uuid from 'uuid';
 import styled from 'styled-components';
 
-import {
-  MapEmbeddable,
-  MapEmbeddableInput,
-} from '../../../../../../maps/public';
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common';
+import { MapEmbeddable, MapEmbeddableInput } from '@kbn/maps-plugin/public';
+import { MAP_SAVED_OBJECT_TYPE } from '@kbn/maps-plugin/common';
 import {
   ErrorEmbeddable,
   ViewMode,
   isErrorEmbeddable,
-} from '../../../../../../../../src/plugins/embeddable/public';
+} from '@kbn/embeddable-plugin/public';
+import type { RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 import { useLayerList } from './use_layer_list';
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
-import type { RenderTooltipContentParams } from '../../../../../../maps/public';
 import { MapToolTip } from './map_tooltip';
 import { useMapFilters } from './use_map_filters';
 import { useKibanaServices } from '../../../../hooks/use_kibana_services';
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx
index 56f1ae2014473..8625b8bbd38ef 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/map_tooltip.tsx
@@ -14,13 +14,13 @@ import {
   EuiPopoverTitle,
 } from '@elastic/eui';
 import styled from 'styled-components';
+import type { RenderTooltipContentParams } from '@kbn/maps-plugin/public';
 import {
   COUNTRY_NAME,
   REGION_NAME,
   TRANSACTION_DURATION_COUNTRY,
   TRANSACTION_DURATION_REGION,
 } from './use_layer_list';
-import type { RenderTooltipContentParams } from '../../../../../../maps/public';
 import { I18LABELS } from '../translations';
 
 type MapToolTipProps = Partial<RenderTooltipContentParams>;
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts
index bdef5c0a35782..29cdab566029f 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/use_layer_list.ts
@@ -19,7 +19,7 @@ import {
   SOURCE_TYPES,
   STYLE_TYPE,
   SYMBOLIZE_AS_TYPES,
-} from '../../../../../../maps/common';
+} from '@kbn/maps-plugin/common';
 
 import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
 import {
diff --git a/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts b/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts
index 94beab5c3728e..ee376cff65932 100644
--- a/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts
+++ b/x-pack/plugins/ux/public/context/url_params_context/resolve_url_params.ts
@@ -6,6 +6,7 @@
  */
 
 import { Location } from 'history';
+import { toQuery } from '@kbn/observability-plugin/public';
 import { uxLocalUIFilterNames } from '../../../common/ux_ui_filter';
 import { pickKeys } from '../../../common/utils/pick_keys';
 import {
@@ -16,7 +17,6 @@ import {
   toString,
 } from './helpers';
 import { UrlParams, UxUrlParams } from './types';
-import { toQuery } from '../../../../observability/public';
 import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 
 type TimeUrlParams = Pick<
diff --git a/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts b/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts
index 35e2c2cf14178..1dd84e771406a 100644
--- a/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts
+++ b/x-pack/plugins/ux/public/hooks/use_date_range_redirect.ts
@@ -6,7 +6,7 @@
  */
 import qs from 'query-string';
 import { useHistory, useLocation } from 'react-router-dom';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { useKibanaServices } from './use_kibana_services';
 
 export interface TimePickerTimeDefaults {
diff --git a/x-pack/plugins/ux/public/hooks/use_fetcher.tsx b/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
index b211f263961ee..35165b0aa620f 100644
--- a/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
+++ b/x-pack/plugins/ux/public/hooks/use_fetcher.tsx
@@ -7,13 +7,13 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useMemo, useState } from 'react';
-import { IHttpFetchError, ResponseErrorBody } from 'src/core/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 
 import {
   useInspectorContext,
   FETCH_STATUS,
-} from '../../../observability/public';
+} from '@kbn/observability-plugin/public';
 import {
   AutoAbortedAPMClient,
   callApmApi,
diff --git a/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx b/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx
index d26499131a49d..364e425c48933 100644
--- a/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx
+++ b/x-pack/plugins/ux/public/hooks/use_kibana_services.tsx
@@ -10,8 +10,8 @@ import {
   DocLinksStart,
   IUiSettingsClient,
   ApplicationStart,
-} from 'kibana/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+} from '@kbn/core/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ApmPluginStartDeps } from '../plugin';
 
 interface UxKibanaServices extends ApmPluginStartDeps {
diff --git a/x-pack/plugins/ux/public/index.ts b/x-pack/plugins/ux/public/index.ts
index 261e8dbe83a69..e4244838a927a 100644
--- a/x-pack/plugins/ux/public/index.ts
+++ b/x-pack/plugins/ux/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from '../../../../src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import { UxPlugin, UxPluginSetup, UxPluginStart } from './plugin';
 
 export const plugin: PluginInitializer<UxPluginSetup, UxPluginStart> = () =>
diff --git a/x-pack/plugins/ux/public/plugin.ts b/x-pack/plugins/ux/public/plugin.ts
index 7c6f11378784c..f56c7a140ade5 100644
--- a/x-pack/plugins/ux/public/plugin.ts
+++ b/x-pack/plugins/ux/public/plugin.ts
@@ -13,25 +13,25 @@ import {
   HasDataParams,
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
-} from '../../observability/public';
+} from '@kbn/observability-plugin/public';
 import {
   AppMountParameters,
   CoreSetup,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
   Plugin,
-} from '../../../../src/core/public';
+} from '@kbn/core/public';
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,
-} from '../../../../src/plugins/data/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+} from '@kbn/data-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
-import { FeaturesPluginSetup } from '../../features/public';
-import { LicensingPluginSetup } from '../../licensing/public';
-import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { MapsStartApi } from '../../maps/public';
-import { Start as InspectorPluginStart } from '../../../../src/plugins/inspector/public';
+import { FeaturesPluginSetup } from '@kbn/features-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import { MapsStartApi } from '@kbn/maps-plugin/public';
+import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 
 export type UxPluginSetup = void;
 export type UxPluginStart = void;
diff --git a/x-pack/plugins/ux/public/services/rest/call_api.ts b/x-pack/plugins/ux/public/services/rest/call_api.ts
index 196878a08821e..c0458241460e8 100644
--- a/x-pack/plugins/ux/public/services/rest/call_api.ts
+++ b/x-pack/plugins/ux/public/services/rest/call_api.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import { isString, startsWith } from 'lodash';
 import LRU from 'lru-cache';
 import hash from 'object-hash';
-import { enableInspectEsQueries } from '../../../../observability/public';
+import { enableInspectEsQueries } from '@kbn/observability-plugin/public';
 import { FetchOptions } from '../../../common/fetch_options';
 
 function fetchOptionsWithDebug(
diff --git a/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts b/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts
index ea9a6390a0e7e..eddd5fe07694e 100644
--- a/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts
+++ b/x-pack/plugins/ux/public/services/rest/create_call_apm_api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, CoreStart } from 'kibana/public';
+import { CoreSetup, CoreStart } from '@kbn/core/public';
 import type {
   ClientRequestParamsOf,
   formatRequest as formatRequestType,
@@ -18,13 +18,13 @@ import type {
 // so in order to do targeted imports they must me imported separately, and
 // an error is expected here
 import { formatRequest } from '@kbn/server-route-repository/target_node/format_request';
-import { CallApi, callApi } from './call_api';
 import type {
   APMServerRouteRepository,
   APIEndpoint,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../apm/server';
-import { InspectResponse } from '../../../../observability/typings/common';
+} from '@kbn/apm-plugin/server';
+import { InspectResponse } from '@kbn/observability-plugin/typings/common';
+import { CallApi, callApi } from './call_api';
 import { FetchOptions } from '../../../common/fetch_options';
 
 export type APMClientOptions = Omit<
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx b/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
index 1da2673714a98..283b058f65d44 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/app_context.mock.tsx
@@ -15,7 +15,7 @@ import {
   httpServiceMock,
   scopedHistoryMock,
   executionContextServiceMock,
-} from '../../../../../../src/core/public/mocks';
+} from '@kbn/core/public/mocks';
 import { AppDeps } from '../../../public/application/app';
 import { LicenseStatus } from '../../../common/types/license_status';
 
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
index 31c82cc33cd59..05a84227d32b5 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/http_requests.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { httpServiceMock } from '../../../../../../src/core/public/mocks';
+import { httpServiceMock } from '@kbn/core/public/mocks';
 import { ROUTES } from '../../../common/constants';
 
 const { API_ROOT } = ROUTES;
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx
index f42b452818cc5..621d0aae75dd3 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/setup_environment.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { init as initHttpRequests } from './http_requests';
 import { mockContextValue } from './app_context.mock';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts
index 4e76a1687114a..8af924c807372 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_json.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
 import { registerRouter } from '../../../public/application/lib/navigation';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
index 5a8d7b23e0b58..a4b7cce96ae03 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
 import { registerRouter } from '../../../public/application/lib/navigation';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts
index 9eb35f3f1bb32..22fc71c8d4636 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_edit.helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import { registerTestBed, TestBed, AsyncTestBedConfig } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { WatchEdit } from '../../../public/application/sections/watch_edit/components/watch_edit';
 import { registerRouter } from '../../../public/application/lib/navigation';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts
index f7aca95039863..1da9ad7f23156 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list.helpers.ts
@@ -13,7 +13,7 @@ import {
   TestBed,
   AsyncTestBedConfig,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 import { WatchList } from '../../../public/application/sections/watch_list/components/watch_list';
 import { ROUTES, REFRESH_INTERVALS } from '../../../common/constants';
 import { WithAppDependencies } from './setup_environment';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts
index ab2204f4a6dfe..99e1cf936d1d7 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts
+++ b/x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_status.helpers.ts
@@ -13,7 +13,7 @@ import {
   TestBed,
   AsyncTestBedConfig,
 } from '@kbn/test-jest-helpers';
-import { HttpSetup } from 'src/core/public';
+import { HttpSetup } from '@kbn/core/public';
 
 import { registerRouter } from '../../../public/application/lib/navigation';
 import { WatchStatus } from '../../../public/application/sections/watch_status/components/watch_status';
diff --git a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
index 2a70b4852c77a..73b51f0ddbb89 100644
--- a/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
+++ b/x-pack/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 
-import { HttpFetchOptionsWithPath } from 'kibana/public';
+import { HttpFetchOptionsWithPath } from '@kbn/core/public';
 import { WATCH_ID } from './helpers/jest_constants';
 import { getExecuteDetails } from '../../__fixtures__';
 import { WATCH_TYPES, API_BASE_PATH } from '../../common/constants';
diff --git a/x-pack/plugins/watcher/common/constants/plugin.ts b/x-pack/plugins/watcher/common/constants/plugin.ts
index 0751d4fbddc25..797d7f331c136 100644
--- a/x-pack/plugins/watcher/common/constants/plugin.ts
+++ b/x-pack/plugins/watcher/common/constants/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseType } from '../../../licensing/common/types';
+import { LicenseType } from '@kbn/licensing-plugin/common/types';
 
 export const PLUGIN = {
   ID: 'watcher',
diff --git a/x-pack/plugins/watcher/public/application/app.tsx b/x-pack/plugins/watcher/public/application/app.tsx
index 7f93d5d8cf798..ab7f1df69f3b7 100644
--- a/x-pack/plugins/watcher/public/application/app.tsx
+++ b/x-pack/plugins/watcher/public/application/app.tsx
@@ -14,7 +14,7 @@ import {
   IUiSettingsClient,
   ApplicationStart,
   ExecutionContextStart,
-} from 'kibana/public';
+} from '@kbn/core/public';
 
 import { Router, Switch, Route, Redirect, withRouter, RouteComponentProps } from 'react-router-dom';
 
@@ -22,12 +22,9 @@ import { EuiPageContent, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import {
-  RegisterManagementAppArgs,
-  ManagementAppMountParams,
-} from '../../../../../src/plugins/management/public';
+import { RegisterManagementAppArgs, ManagementAppMountParams } from '@kbn/management-plugin/public';
 
-import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import { LicenseStatus } from '../../common/types/license_status';
 import { WatchStatus } from './sections/watch_status/components/watch_status';
 import { WatchEdit } from './sections/watch_edit/components/watch_edit';
diff --git a/x-pack/plugins/watcher/public/application/app_context.tsx b/x-pack/plugins/watcher/public/application/app_context.tsx
index 81fbfa97845a6..dfe022f58981a 100644
--- a/x-pack/plugins/watcher/public/application/app_context.tsx
+++ b/x-pack/plugins/watcher/public/application/app_context.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { createContext, useContext } from 'react';
-import { DocLinksStart } from 'kibana/public';
+import { DocLinksStart } from '@kbn/core/public';
 import { ACTION_TYPES } from '../../common/constants';
 import { AppDeps } from './app';
 
diff --git a/x-pack/plugins/watcher/public/application/index.tsx b/x-pack/plugins/watcher/public/application/index.tsx
index dd5a46c1cf1b5..4b2b83c35980b 100644
--- a/x-pack/plugins/watcher/public/application/index.tsx
+++ b/x-pack/plugins/watcher/public/application/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
-import { SavedObjectsClientContract, CoreTheme } from 'kibana/public';
+import { SavedObjectsClientContract, CoreTheme } from '@kbn/core/public';
 
 import { KibanaThemeProvider } from './shared_imports';
 import { App, AppDeps } from './app';
diff --git a/x-pack/plugins/watcher/public/application/lib/api.ts b/x-pack/plugins/watcher/public/application/lib/api.ts
index 0971371f7949b..e514c2d4df5d4 100644
--- a/x-pack/plugins/watcher/public/application/lib/api.ts
+++ b/x-pack/plugins/watcher/public/application/lib/api.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { HttpSetup, SavedObjectsClientContract } from 'kibana/public';
+import { HttpSetup, SavedObjectsClientContract } from '@kbn/core/public';
 
 import { Settings } from '../models/settings';
 import { Watch } from '../models/watch';
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx
index c7a2039b713ba..c1c271797d720 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/monitoring_watch_edit/monitoring_watch_edit.tsx
@@ -9,11 +9,10 @@ import React, { useContext } from 'react';
 
 import { EuiPageContent, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 import { WatchContext } from '../../watch_context';
 import { useAppContext } from '../../../../app_context';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 export const MonitoringWatchEdit = ({ pageTitle }: { pageTitle: string }) => {
   const { watch } = useContext(WatchContext);
   const { history } = useAppContext();
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
index 23028075daa3b..b8f9e084dea52 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/charts';
 import dateMath from '@kbn/datemath';
 import moment from 'moment-timezone';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 import { EuiCallOut, EuiLoadingChart, EuiSpacer, EuiEmptyPrompt, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts b/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts
index cfc67fecbcbbb..25d4d3c623a0a 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/watch_edit_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ToastsSetup } from 'kibana/public';
+import { ToastsSetup } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { ACTION_TYPES, WATCH_TYPES } from '../../../../common/constants';
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
index b8322c792461e..542196fb517fb 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
@@ -28,7 +28,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Moment } from 'moment';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { reactRouterNavigate } from '@kbn/kibana-react-plugin/public';
 
 import { REFRESH_INTERVALS, PAGINATION, WATCH_TYPES } from '../../../../../common/constants';
 import { listBreadcrumb } from '../../../lib/breadcrumbs';
diff --git a/x-pack/plugins/watcher/public/application/shared_imports.ts b/x-pack/plugins/watcher/public/application/shared_imports.ts
index 4001b55bfdd2e..971182a22a7a7 100644
--- a/x-pack/plugins/watcher/public/application/shared_imports.ts
+++ b/x-pack/plugins/watcher/public/application/shared_imports.ts
@@ -9,7 +9,7 @@ export type {
   SendRequestConfig,
   SendRequestResponse,
   UseRequestConfig,
-} from '../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
 export {
   sendRequest,
@@ -17,9 +17,6 @@ export {
   XJson,
   PageError,
   EuiCodeEditor,
-} from '../../../../../src/plugins/es_ui_shared/public';
+} from '@kbn/es-ui-shared-plugin/public';
 
-export {
-  KibanaThemeProvider,
-  useExecutionContext,
-} from '../../../../../src/plugins/kibana_react/public';
+export { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/watcher/public/legacy/time_buckets.js b/x-pack/plugins/watcher/public/legacy/time_buckets.js
index 173369152f8e0..a0804e07c4662 100644
--- a/x-pack/plugins/watcher/public/legacy/time_buckets.js
+++ b/x-pack/plugins/watcher/public/legacy/time_buckets.js
@@ -7,8 +7,8 @@
 
 import _ from 'lodash';
 import moment from 'moment';
-import { search, UI_SETTINGS } from '../../../../../src/plugins/data/public';
-import { FIELD_FORMAT_IDS } from '../../../../../src/plugins/field_formats/common';
+import { search, UI_SETTINGS } from '@kbn/data-plugin/public';
+import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
 import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval';
 import {
   convertDurationToNormalizedEsInterval,
diff --git a/x-pack/plugins/watcher/public/plugin.ts b/x-pack/plugins/watcher/public/plugin.ts
index 2da4415010d6c..8f3f549654130 100644
--- a/x-pack/plugins/watcher/public/plugin.ts
+++ b/x-pack/plugins/watcher/public/plugin.ts
@@ -6,12 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { CoreSetup, Plugin, CoreStart, Capabilities } from 'kibana/public';
+import { CoreSetup, Plugin, CoreStart, Capabilities } from '@kbn/core/public';
 import { first, map, skip } from 'rxjs/operators';
 import { Subject, combineLatest } from 'rxjs';
 
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
-import { ILicense } from '../../licensing/public';
+import type { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { LicenseStatus } from '../common/types/license_status';
 import { PLUGIN } from '../common/constants';
 import { Dependencies } from './types';
@@ -89,10 +89,10 @@ export class WatcherUIPlugin implements Plugin<void, void, Dependencies, any> {
     // Because the home feature catalogue does not have enable/disable functionality we pass
     // the config in but keep a reference for enabling and disabling showing on home based on
     // license updates.
-    const watcherHome = {
+    const watcherHome: FeatureCatalogueEntry = {
       id: 'watcher',
       title: 'Watcher', // This is a product name so we don't translate it.
-      category: FeatureCatalogueCategory.ADMIN,
+      category: 'admin',
       description: i18n.translate('xpack.watcher.watcherDescription', {
         defaultMessage: 'Detect changes in your data by creating, managing, and monitoring alerts.',
       }),
diff --git a/x-pack/plugins/watcher/public/types.ts b/x-pack/plugins/watcher/public/types.ts
index 484f6205dc4d4..857acdc2109a1 100644
--- a/x-pack/plugins/watcher/public/types.ts
+++ b/x-pack/plugins/watcher/public/types.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { ManagementSetup } from 'src/plugins/management/public';
-import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { LicensingPluginSetup } from '../../licensing/public';
-import { DataPublicPluginSetup } from '../../../../src/plugins/data/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import { ManagementSetup } from '@kbn/management-plugin/public';
+import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
+import { DataPublicPluginSetup } from '@kbn/data-plugin/public';
+import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 
 export interface Dependencies {
   home: HomePublicPluginSetup;
diff --git a/x-pack/plugins/watcher/server/index.ts b/x-pack/plugins/watcher/server/index.ts
index a98aa235a9cb8..0aba44ed82838 100644
--- a/x-pack/plugins/watcher/server/index.ts
+++ b/x-pack/plugins/watcher/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { WatcherServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new WatcherServerPlugin(ctx);
diff --git a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js
index 92acbbff2d66e..e21b01e4dc398 100644
--- a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js
+++ b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.test.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks';
+import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { fetchAllFromScroll } from './fetch_all_from_scroll';
 
 describe('fetch_all_from_scroll', () => {
diff --git a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
index 42524dd7c70aa..eddc924c4c7c3 100644
--- a/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
+++ b/x-pack/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { ES_SCROLL_SETTINGS } from '../../../common/constants';
 
diff --git a/x-pack/plugins/watcher/server/plugin.ts b/x-pack/plugins/watcher/server/plugin.ts
index 52d77520183ab..75afac5c4d1f2 100644
--- a/x-pack/plugins/watcher/server/plugin.ts
+++ b/x-pack/plugins/watcher/server/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { SemVer } from 'semver';
-import { CoreStart, CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+import { CoreStart, CoreSetup, Logger, Plugin, PluginInitializerContext } from '@kbn/core/server';
 
 import { PLUGIN, INDEX_NAMES } from '../common/constants';
 
diff --git a/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts b/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts
index 237f6dac6a254..26ecb5de4761e 100644
--- a/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/indices/register_get_index_patterns_route.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsFindResult } from 'src/core/server';
+import { SavedObjectsFindResult } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 export function registerGetIndexPatternsRoute({
diff --git a/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts b/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
index 665ff187f17a7..8cf7d0a61d5d8 100644
--- a/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { reduce, size } from 'lodash';
 import { RouteDependencies } from '../../../types';
 
diff --git a/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts b/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
index 62fd86bc0d5dc..458fdb1d56fee 100644
--- a/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 // @ts-ignore
-import { Fields } from '../../models/fields/index';
+import { Fields } from '../../models/fields';
 import { RouteDependencies } from '../../types';
 
 const bodySchema = schema.object({
diff --git a/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts b/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
index 7ea35e9e09764..c24ddc2d74655 100644
--- a/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts
@@ -7,11 +7,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { INDEX_NAMES } from '../../../common/constants';
 import { RouteDependencies } from '../../types';
 // @ts-ignore
-import { WatchHistoryItem } from '../../models/watch_history_item/index';
+import { WatchHistoryItem } from '../../models/watch_history_item';
 
 const paramsSchema = schema.object({
   id: schema.string(),
diff --git a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
index 83ba43e8a4e88..6733da355c862 100644
--- a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 // @ts-ignore
-import { Settings } from '../../../models/settings/index';
+import { Settings } from '../../../models/settings';
 import { RouteDependencies } from '../../../types';
 
 function fetchClusterSettings(client: IScopedClusterClient) {
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
index f0fc5ad5b6588..9f0e17cfe4ef5 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts
@@ -7,9 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 // @ts-ignore
-import { WatchStatus } from '../../../../models/watch_status/index';
+import { WatchStatus } from '../../../../models/watch_status';
 import { RouteDependencies } from '../../../../types';
 
 const paramsSchema = schema.object({
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
index eaf7066e374c9..5b59a35e8ffcd 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { WatchStatus } from '../../../models/watch_status/index';
+import { WatchStatus } from '../../../models/watch_status';
 
 function activateWatch(dataClient: IScopedClusterClient, watchId: string) {
   return dataClient.asCurrentUser.watcher.activateWatch({
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
index c235e97c6e0ba..a22fcee62e588 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { WatchStatus } from '../../../models/watch_status/index';
+import { WatchStatus } from '../../../models/watch_status';
 
 const paramsSchema = schema.object({
   watchId: schema.string(),
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
index a2334741219ec..809500dad205e 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 const paramsSchema = schema.object({
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
index 9882e50356c27..106447879198f 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts
@@ -6,16 +6,16 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { ExecuteDetails } from '../../../models/execute_details/index';
+import { ExecuteDetails } from '../../../models/execute_details';
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 // @ts-ignore
-import { WatchHistoryItem } from '../../../models/watch_history_item/index';
+import { WatchHistoryItem } from '../../../models/watch_history_item';
 
 const bodySchema = schema.object({
   executeDetails: schema.object({}, { unknowns: 'allow' }),
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
index 04050ae2b0e33..af820c20fc01a 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { WatchHistoryItem } from '../../../models/watch_history_item/index';
+import { WatchHistoryItem } from '../../../models/watch_history_item';
 
 const paramsSchema = schema.object({
   watchId: schema.string(),
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
index c6d96724092d9..76dea16c96981 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 import { RouteDependencies } from '../../../types';
 
 const paramsSchema = schema.object({
diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
index 25f31ff43373f..40672b3d8f5a4 100644
--- a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 // @ts-ignore
-import { VisualizeOptions } from '../../../models/visualize_options/index';
+import { VisualizeOptions } from '../../../models/visualize_options';
 
 const bodySchema = schema.object({
   watch: schema.object({}, { unknowns: 'allow' }),
diff --git a/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts b/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
index 592ccac2135d0..9f481fec3f4db 100644
--- a/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watches/register_delete_route.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { schema } from '@kbn/config-schema';
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { RouteDependencies } from '../../../types';
 
 const bodySchema = schema.object({
diff --git a/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts b/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
index 3ae49fae51da5..9ccfddbaf3923 100644
--- a/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
+++ b/x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { IScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from '@kbn/core/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
 import { RouteDependencies } from '../../../types';
 // @ts-ignore
-import { Watch } from '../../../models/watch/index';
+import { Watch } from '../../../models/watch';
 
 function fetchWatches(dataClient: IScopedClusterClient) {
   return dataClient.asCurrentUser
diff --git a/x-pack/plugins/watcher/server/shared_imports.ts b/x-pack/plugins/watcher/server/shared_imports.ts
index e9e3ed72aed64..ad01d3942d4d2 100644
--- a/x-pack/plugins/watcher/server/shared_imports.ts
+++ b/x-pack/plugins/watcher/server/shared_imports.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
-export { License } from '../../license_api_guard/server';
+export { handleEsError } from '@kbn/es-ui-shared-plugin/server';
+export { License } from '@kbn/license-api-guard-plugin/server';
diff --git a/x-pack/plugins/watcher/server/types.ts b/x-pack/plugins/watcher/server/types.ts
index 87cd5e40c2792..d0800947fb50f 100644
--- a/x-pack/plugins/watcher/server/types.ts
+++ b/x-pack/plugins/watcher/server/types.ts
@@ -6,10 +6,10 @@
  */
 
 import { SemVer } from 'semver';
-import type { IRouter } from 'src/core/server';
+import type { IRouter } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
-import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { License, handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
diff --git a/x-pack/tasks/download_chromium.ts b/x-pack/tasks/download_chromium.ts
index 6ac0f07d1c297..785ab5f3f258b 100644
--- a/x-pack/tasks/download_chromium.ts
+++ b/x-pack/tasks/download_chromium.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { download, paths } from '../plugins/screenshotting/server/utils';
+import { download, paths } from '@kbn/screenshotting-plugin/server/utils';
 
 export const downloadChromium = async () => {
   // eslint-disable-next-line no-console
diff --git a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
index b5ee6a1948599..9532e8e365655 100644
--- a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
+++ b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { Datafeed, Job } from '../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
diff --git a/x-pack/test/accessibility/apps/remote_clusters.ts b/x-pack/test/accessibility/apps/remote_clusters.ts
index 099e3f9f170d9..67c85eda60a4a 100644
--- a/x-pack/test/accessibility/apps/remote_clusters.ts
+++ b/x-pack/test/accessibility/apps/remote_clusters.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ClusterPayloadEs } from '@kbn/remote-clusters-plugin/common/lib';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { ClusterPayloadEs } from '../../../plugins/remote_clusters/common/lib';
 
 const emptyPrompt = 'remoteClusterListEmptyPrompt';
 const createButton = 'remoteClusterEmptyPromptCreateButton';
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts
index 778c87f0ed03e..75b66396c269c 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/server/plugin.ts
@@ -12,10 +12,10 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { SpacesPluginSetup } from '../../../../../../../plugins/spaces/server';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 
 interface FixtureSetupDeps {
   spaces?: SpacesPluginSetup;
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
index e9e6d6732327a..31ae7f1507ca8 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
@@ -11,7 +11,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts
index b7ca07f79a627..b4de0deb47ffb 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts
@@ -11,7 +11,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts
index feb05a952ab53..9a7711dae8211 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/pagerduty_simulation.ts
@@ -12,7 +12,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
index 6e3e1491b633f..4525768a0fb42 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
@@ -7,11 +7,11 @@
 
 import http from 'http';
 import https from 'https';
-import { Plugin, CoreSetup, IRouter } from 'kibana/server';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { PluginSetupContract as ActionsPluginSetupContract } from '../../../../../../../plugins/actions/server/plugin';
-import { ActionType } from '../../../../../../../plugins/actions/server';
+import { Plugin, CoreSetup, IRouter } from '@kbn/core/server';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { PluginSetupContract as ActionsPluginSetupContract } from '@kbn/actions-plugin/server/plugin';
+import { ActionType } from '@kbn/actions-plugin/server';
 import { initPlugin as initPagerduty } from './pagerduty_simulation';
 import { initPlugin as initSwimlane } from './swimlane_simulation';
 import { initPlugin as initServiceNow } from './servicenow_simulation';
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts
index d5e82300be2b8..e84e8fd09dc5d 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/resilient_simulation.ts
@@ -11,7 +11,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts
index 727ecbf915e93..b6733d0cf07da 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/xmatters_simulation.ts
@@ -12,7 +12,7 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   IRouter,
-} from 'kibana/server';
+} from '@kbn/core/server';
 
 export function initPlugin(router: IRouter, path: string) {
   router.post(
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
index 2246bdc424264..357458cc38e41 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
+import { ActionType } from '@kbn/actions-plugin/server';
 import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
-import { ActionType } from '../../../../../../../plugins/actions/server';
 
 export function defineActionTypes(
   core: CoreSetup<FixtureStartDeps>,
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts
index 9acc0d791b886..901542bc5b519 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts
@@ -5,18 +5,18 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { curry, times } from 'lodash';
-import { ES_TEST_INDEX_NAME } from '../../../../lib';
-import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
 import {
   RuleType,
   AlertInstanceState,
   AlertInstanceContext,
   RuleTypeState,
   RuleTypeParams,
-} from '../../../../../../../plugins/alerting/server';
+} from '@kbn/alerting-plugin/server';
+import { ES_TEST_INDEX_NAME } from '../../../../lib';
+import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
 
 export const EscapableStrings = {
   escapableBold: '*bold*',
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts
index 027ea50a8ae6a..5a260b165f792 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FixturePlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) => new FixturePlugin(initContext);
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts
index 776686bcd1c0a..c0ea6a6379c72 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/lib/retry_if_conflicts.ts
@@ -11,7 +11,7 @@
 // have the caller make explicit conflict checks, where the conflict was
 // caused by a background update.
 
-import { Logger } from 'kibana/server';
+import { Logger } from '@kbn/core/server';
 
 type RetryableForConflicts<T> = () => Promise<T>;
 
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts
index 0f345c81f08b4..0a6394632b5a5 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/plugin.ts
@@ -5,23 +5,22 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart, Logger, PluginInitializerContext } from 'kibana/server';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { PluginSetupContract as ActionsPluginSetup } from '../../../../../../../plugins/actions/server/plugin';
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../../plugins/alerting/server/plugin';
+import { Plugin, CoreSetup, CoreStart, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { firstValueFrom, Subject } from 'rxjs';
+import { PluginSetupContract as ActionsPluginSetup } from '@kbn/actions-plugin/server/plugin';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../../../plugins/task_manager/server/plugin';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+} from '@kbn/task-manager-plugin/server/plugin';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
 import { defineAlertTypes } from './alert_types';
 import { defineActionTypes } from './action_types';
 import { defineRoutes } from './routes';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
-import { PluginStartContract as ActionsPluginStart } from '../../../../../../../plugins/actions/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
@@ -42,9 +41,7 @@ export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, Fixtu
   private readonly logger: Logger;
 
   taskManagerStart$: Subject<TaskManagerStartContract> = new Subject<TaskManagerStartContract>();
-  taskManagerStart: Promise<TaskManagerStartContract> = this.taskManagerStart$
-    .pipe(first())
-    .toPromise();
+  taskManagerStart: Promise<TaskManagerStartContract> = firstValueFrom(this.taskManagerStart$);
 
   constructor(initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get('fixtures', 'plugins', 'alerts');
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts
index f4f2a9a007532..837ca4adf217b 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/routes.ts
@@ -13,15 +13,15 @@ import {
   KibanaResponseFactory,
   IKibanaResponse,
   Logger,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
-import { InvalidatePendingApiKey } from '../../../../../../../plugins/alerting/server/types';
-import { RawRule } from '../../../../../../../plugins/alerting/server/types';
+import { InvalidatePendingApiKey } from '@kbn/alerting-plugin/server/types';
+import { RawRule } from '@kbn/alerting-plugin/server/types';
 import {
   ConcreteTaskInstance,
   TaskInstance,
   TaskManagerStartContract,
-} from '../../../../../../../plugins/task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { FixtureStartDeps } from './plugin';
 import { retryIfConflicts } from './lib/retry_if_conflicts';
 
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts
index 841d72a45d9f4..a902d2a12a837 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/alert_types.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup } from '@kbn/core/server';
+import { RuleType } from '@kbn/alerting-plugin/server';
 import { FixtureStartDeps, FixtureSetupDeps } from './plugin';
-import { RuleType } from '../../../../../../../plugins/alerting/server';
 
 export function defineAlertTypes(
   core: CoreSetup<FixtureStartDeps>,
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts
index 8c253839678b2..66a85b32e6be6 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/server/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
-import { PluginSetupContract as ActionsPluginSetup } from '../../../../../../../plugins/actions/server/plugin';
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../../plugins/alerting/server/plugin';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { PluginSetupContract as ActionsPluginSetup } from '@kbn/actions-plugin/server/plugin';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { defineAlertTypes } from './alert_types';
 
 export interface FixtureSetupDeps {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts
index e570662937dc3..10fedc3151270 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/server/plugin.ts
@@ -13,11 +13,10 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+} from '@kbn/core/server';
+import { firstValueFrom, Subject } from 'rxjs';
 import { schema } from '@kbn/config-schema';
-import { TaskManagerStartContract } from '../../../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 export interface SampleTaskManagerFixtureStartDeps {
   taskManager: TaskManagerStartContract;
@@ -48,9 +47,7 @@ export class SampleTaskManagerFixturePlugin
   implements Plugin<void, void, {}, SampleTaskManagerFixtureStartDeps>
 {
   taskManagerStart$: Subject<TaskManagerStartContract> = new Subject<TaskManagerStartContract>();
-  taskManagerStart: Promise<TaskManagerStartContract> = this.taskManagerStart$
-    .pipe(first())
-    .toPromise();
+  taskManagerStart: Promise<TaskManagerStartContract> = firstValueFrom(this.taskManagerStart$);
 
   public setup(core: CoreSetup) {
     const router = core.http.createRouter();
diff --git a/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts b/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
index 194be6d184692..912e153f9a8c0 100644
--- a/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IValidatedEvent } from '../../../../plugins/event_log/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { getUrlPrefix } from '.';
 import { FtrProviderContext } from '../ftr_provider_context';
 
diff --git a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
index 11e0b047ffd85..d8b1397edbd75 100644
--- a/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/task_manager_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { Client } from '@elastic/elasticsearch';
-import { SerializedConcreteTaskInstance } from '../../../../plugins/task_manager/server/task';
+import { SerializedConcreteTaskInstance } from '@kbn/task-manager-plugin/server/task';
 
 export interface TaskManagerDoc {
   type: string;
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
index 913baa2517fbb..321d14683ee2f 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { UserAtSpaceScenarios } from '../../scenarios';
 import {
   ESTestIndexTool,
@@ -15,7 +16,6 @@ import {
   getEventLog,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
index 37455149a2a42..15e648bb2166c 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
@@ -8,6 +8,9 @@
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
+import { TaskRunning, TaskRunningStage } from '@kbn/task-manager-plugin/server/task_running';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { UserAtSpaceScenarios, Superuser } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -21,12 +24,6 @@ import {
   TaskManagerUtils,
   getEventLog,
 } from '../../../common/lib';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
-import {
-  TaskRunning,
-  TaskRunningStage,
-} from '../../../../../plugins/task_manager/server/task_running';
-import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
index 2eb33d95fa4ea..4e61fd6593113 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { RuleExecutionStatusErrorReasons } from '../../../../../plugins/alerting/common';
+import { RuleExecutionStatusErrorReasons } from '@kbn/alerting-plugin/common';
 import { Spaces } from '../../scenarios';
 import { getUrlPrefix, getTestRuleData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
index 8134b03e4ba69..a1e23db7944f1 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts
@@ -32,28 +32,35 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
         await tearDown(getService);
       });
 
-      loadTestFile(require.resolve('./find'));
-      loadTestFile(require.resolve('./create'));
-      loadTestFile(require.resolve('./delete'));
-      loadTestFile(require.resolve('./disable'));
-      loadTestFile(require.resolve('./enable'));
-      loadTestFile(require.resolve('./execution_status'));
-      loadTestFile(require.resolve('./get'));
-      loadTestFile(require.resolve('./get_alert_state'));
-      loadTestFile(require.resolve('./get_alert_summary'));
-      loadTestFile(require.resolve('./rule_types'));
-      loadTestFile(require.resolve('./mute_all'));
-      loadTestFile(require.resolve('./mute_instance'));
-      loadTestFile(require.resolve('./unmute_all'));
-      loadTestFile(require.resolve('./unmute_instance'));
-      loadTestFile(require.resolve('./update'));
-      loadTestFile(require.resolve('./update_api_key'));
-      loadTestFile(require.resolve('./alerts'));
-      loadTestFile(require.resolve('./event_log'));
-      loadTestFile(require.resolve('./mustache_templates'));
-      loadTestFile(require.resolve('./health'));
-      loadTestFile(require.resolve('./excluded'));
-      loadTestFile(require.resolve('./snooze'));
+      describe('', function () {
+        this.tags('ciGroup17');
+        loadTestFile(require.resolve('./find'));
+        loadTestFile(require.resolve('./create'));
+        loadTestFile(require.resolve('./delete'));
+        loadTestFile(require.resolve('./disable'));
+        loadTestFile(require.resolve('./enable'));
+        loadTestFile(require.resolve('./execution_status'));
+        loadTestFile(require.resolve('./get'));
+        loadTestFile(require.resolve('./get_alert_state'));
+        loadTestFile(require.resolve('./get_alert_summary'));
+        loadTestFile(require.resolve('./rule_types'));
+      });
+
+      describe('', function () {
+        this.tags('ciGroup30');
+        loadTestFile(require.resolve('./mute_all'));
+        loadTestFile(require.resolve('./mute_instance'));
+        loadTestFile(require.resolve('./unmute_all'));
+        loadTestFile(require.resolve('./unmute_instance'));
+        loadTestFile(require.resolve('./update'));
+        loadTestFile(require.resolve('./update_api_key'));
+        loadTestFile(require.resolve('./alerts'));
+        loadTestFile(require.resolve('./event_log'));
+        loadTestFile(require.resolve('./mustache_templates'));
+        loadTestFile(require.resolve('./health'));
+        loadTestFile(require.resolve('./excluded'));
+        loadTestFile(require.resolve('./snooze'));
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
index 4aa8447823dca..4f324cae689cd 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { SavedObjectsUtils } from '@kbn/core/server/saved_objects';
 import { UserAtSpaceScenarios, Superuser } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { ESTestIndexTool, getUrlPrefix, ObjectRemover, AlertUtils } from '../../../common/lib';
 import { setupSpacesAndUsers } from '..';
-import { SavedObjectsUtils } from '../../../../../../src/core/server/saved_objects';
 
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
index 2b26410afeaed..1196e3716347d 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
@@ -58,10 +58,14 @@ export async function tearDown(getService: FtrProviderContext['getService']) {
 // eslint-disable-next-line import/no-default-export
 export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('alerting api integration security and spaces enabled', function () {
-    this.tags('ciGroup17');
+    describe('', function () {
+      this.tags('ciGroup17');
+      loadTestFile(require.resolve('./telemetry'));
+      loadTestFile(require.resolve('./actions'));
+    });
 
-    loadTestFile(require.resolve('./telemetry'));
-    loadTestFile(require.resolve('./actions'));
-    loadTestFile(require.resolve('./alerting'));
+    describe('', function () {
+      loadTestFile(require.resolve('./alerting'));
+    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts
index 27b523fa24298..8a6532302a2e1 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/action_task_params/migrations.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObject, SavedObjectReference } from 'src/core/server';
-import { ActionTaskParams } from '../../../../../plugins/actions/server/types';
+import { SavedObject, SavedObjectReference } from '@kbn/core/server';
+import { ActionTaskParams } from '@kbn/actions-plugin/server/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
index 274e147898d9b..79e5928c61739 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/preconfigured_alert_history_connector.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { AlertHistoryDefaultIndexName } from '@kbn/actions-plugin/common';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { getTestRuleData, ObjectRemover } from '../../../../common/lib';
-import { AlertHistoryDefaultIndexName } from '../../../../../../plugins/actions/common';
 
 const ALERT_HISTORY_OVERRIDE_INDEX = 'kibana-alert-history-not-the-default';
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
index 389a4beeb8737..06e077f4b9de4 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
@@ -6,6 +6,7 @@
  */
 import type { Client } from '@elastic/elasticsearch';
 import expect from '@kbn/expect';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import {
   ESTestIndexTool,
@@ -15,7 +16,6 @@ import {
   getEventLog,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
index 58ddd5516d8a5..53cb0a1f662ce 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts_base.ts
@@ -9,7 +9,9 @@ import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Response as SupertestResponse } from 'supertest';
-import { RecoveredActionGroup } from '../../../../../plugins/alerting/common';
+import { RecoveredActionGroup } from '@kbn/alerting-plugin/common';
+import { TaskRunning, TaskRunningStage } from '@kbn/task-manager-plugin/server/task_running';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { Space } from '../../../common/types';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -22,11 +24,6 @@ import {
   ensureDatetimeIsWithinRange,
   TaskManagerUtils,
 } from '../../../common/lib';
-import {
-  TaskRunning,
-  TaskRunningStage,
-} from '../../../../../plugins/task_manager/server/task_running';
-import { ConcreteTaskInstance } from '../../../../../plugins/task_manager/server';
 
 export function alertTests({ getService }: FtrProviderContext, space: Space) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
index 741f198607c3e..979f91266afcc 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { TimeSeriesQuery } from '@kbn/triggers-actions-ui-plugin/server';
 import { Spaces } from '../../../../scenarios';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 import { ESTestIndexTool, ES_TEST_INDEX_NAME, getUrlPrefix } from '../../../../../common/lib';
-import { TimeSeriesQuery } from '../../../../../../../plugins/triggers_actions_ui/server';
 
 import { createEsDocuments } from './create_test_data';
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
index bda5778c2ce1c..143d845d074c4 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
@@ -6,7 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
+import { RawRule } from '@kbn/alerting-plugin/server/types';
 import { Spaces } from '../../scenarios';
 import {
   checkAAD,
@@ -17,7 +18,6 @@ import {
   TaskManagerDoc,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { RawRule } from '../../../../../plugins/alerting/server/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function createAlertTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts
index ac095fd4c4419..008761b3a5d62 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ephemeral.ts
@@ -7,6 +7,8 @@
 
 import expect from '@kbn/expect';
 import { flatten } from 'lodash';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
+import { DEFAULT_MAX_EPHEMERAL_ACTIONS_PER_ALERT } from '@kbn/alerting-plugin/server/config';
 import { Spaces } from '../../scenarios';
 import {
   getUrlPrefix,
@@ -17,8 +19,6 @@ import {
   ES_TEST_INDEX_NAME,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
-import { DEFAULT_MAX_EPHEMERAL_ACTIONS_PER_ALERT } from '../../../../../plugins/alerting/server/config';
 
 // eslint-disable-next-line import/no-default-export
 export default function createNotifyWhenTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
index b1a2155ef9f91..909b3315600c2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import uuid from 'uuid';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import {
   getUrlPrefix,
@@ -16,7 +17,6 @@ import {
   ESTestIndexTool,
 } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 const NANOS_IN_MILLIS = 1000 * 1000;
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
index 6d7f95df10d9b..c65ffb1bef5ac 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import { getUrlPrefix, getTestRuleData, ObjectRemover, getEventLog } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 // eslint-disable-next-line import/no-default-export
 export default function eventLogAlertTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts
index 23200cdab110a..33cb64dcdbed1 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { RawRule, RawRuleAction } from '@kbn/alerting-plugin/server/types';
+import { FILEBEAT_7X_INDICATOR_PATH } from '@kbn/alerting-plugin/server/saved_objects/migrations';
 import { getUrlPrefix } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import type { RawRule, RawRuleAction } from '../../../../../plugins/alerting/server/types';
-import { FILEBEAT_7X_INDICATOR_PATH } from '../../../../../plugins/alerting/server/saved_objects/migrations';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts
index 0364bd251a4c7..1bc267f86f073 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/ml_rule_types/anomaly_detection/alert.ts
@@ -8,18 +8,18 @@
 import expect from '@kbn/expect';
 import { sample } from 'lodash';
 import { duration } from 'moment';
-import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { MlAnomalyDetectionAlertParams } from '@kbn/ml-plugin/common/types/alerts';
+import { ANOMALY_SCORE_MATCH_GROUP_ID } from '@kbn/ml-plugin/server/lib/alerts/register_anomaly_detection_alert_type';
+import { ML_ALERT_TYPES } from '@kbn/ml-plugin/common/constants/alerts';
+import { Spaces } from '../../../../scenarios';
 import {
   ES_TEST_INDEX_NAME,
   ESTestIndexTool,
   getUrlPrefix,
   ObjectRemover,
 } from '../../../../../common/lib';
-import { Spaces } from '../../../../scenarios';
-import { Datafeed, Job } from '../../../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { MlAnomalyDetectionAlertParams } from '../../../../../../../plugins/ml/common/types/alerts';
-import { ANOMALY_SCORE_MATCH_GROUP_ID } from '../../../../../../../plugins/ml/server/lib/alerts/register_anomaly_detection_alert_type';
-import { ML_ALERT_TYPES } from '../../../../../../../plugins/ml/common/constants/alerts';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 const ACTION_TYPE_ID = '.index';
 const ALERT_TYPE_ID = ML_ALERT_TYPES.ANOMALY_DETECTION;
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts
index 5049f7c863a06..5024a1489f4c8 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/notify_when.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { Spaces } from '../../scenarios';
 import { getUrlPrefix, ObjectRemover, getTestRuleData, getEventLog } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server';
 
 // eslint-disable-next-line import/no-default-export
 export default function createNotifyWhenTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts
index c5fb4ec61aa4f..c289be244ed3a 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/transform_rule_types/transform_health/alert.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 import {
   ES_TEST_INDEX_NAME,
@@ -14,7 +15,6 @@ import {
   ObjectRemover,
 } from '../../../../../common/lib';
 import { Spaces } from '../../../../scenarios';
-import { PutTransformsRequestSchema } from '../../../../../../../plugins/transform/common/api_schemas/transforms';
 
 const ACTION_TYPE_ID = '.index';
 const ALERT_TYPE_ID = 'transform_health';
diff --git a/x-pack/test/api_integration/apis/features/features/features.ts b/x-pack/test/api_integration/apis/features/features/features.ts
index 3339484c2b9a2..289427971c44f 100644
--- a/x-pack/test/api_integration/apis/features/features/features.ts
+++ b/x-pack/test/api_integration/apis/features/features/features.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { KibanaFeature } from '../../../../../plugins/features/server';
+import { KibanaFeature } from '@kbn/features-plugin/server';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 8cca6b589ef2b..e1bae98269d4e 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -8,11 +8,10 @@
 import moment from 'moment';
 import expect from '@kbn/expect';
 
+import { getDailyEvents } from '@kbn/lens-plugin/server/usage/task';
+import { getVisualizationCounts } from '@kbn/lens-plugin/server/usage/visualization_counts';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import { getDailyEvents } from '../../../../plugins/lens/server/usage/task';
-import { getVisualizationCounts } from '../../../../plugins/lens/server/usage/visualization_counts';
-
 const COMMON_HEADERS = {
   'kbn-xsrf': 'some-xsrf-token',
 };
diff --git a/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts b/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts
index 18f3a181dde53..43699de65e524 100644
--- a/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts
+++ b/x-pack/test/api_integration/apis/logs_ui/log_threshold_alert.ts
@@ -10,14 +10,14 @@ import sinon from 'sinon';
 import {
   executeAlert,
   executeRatioAlert,
-} from '../../../../plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor';
-import { DATES } from '../metrics_ui/constants';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/infra-plugin/server/lib/alerting/log_threshold/log_threshold_executor';
 import {
   Comparator,
   TimeUnit,
   RatioCriteria,
-} from '../../../../plugins/infra/common/alerting/logs/log_threshold/types';
+} from '@kbn/infra-plugin/common/alerting/logs/log_threshold/types';
+import { DATES } from '../metrics_ui/constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/logs_ui/log_views.ts b/x-pack/test/api_integration/apis/logs_ui/log_views.ts
index e2b316218c9fd..646d9fd3bb5e3 100644
--- a/x-pack/test/api_integration/apis/logs_ui/log_views.ts
+++ b/x-pack/test/api_integration/apis/logs_ui/log_views.ts
@@ -6,14 +6,14 @@
  */
 
 import expect from '@kbn/expect';
-import { defaultLogViewId, LogViewAttributes } from '../../../../plugins/infra/common/log_views';
+import { defaultLogViewId, LogViewAttributes } from '@kbn/infra-plugin/common/log_views';
 import {
   defaultSourceConfiguration,
   infraSourceConfigurationSavedObjectName,
   mergeSourceConfiguration,
-} from '../../../../plugins/infra/server/lib/sources';
-import { extractSavedObjectReferences } from '../../../../plugins/infra/server/lib/sources/saved_object_references';
-import { logViewSavedObjectName } from '../../../../plugins/infra/server/saved_objects/log_view';
+} from '@kbn/infra-plugin/server/lib/sources';
+import { extractSavedObjectReferences } from '@kbn/infra-plugin/server/lib/sources/saved_object_references';
+import { logViewSavedObjectName } from '@kbn/infra-plugin/server/saved_objects/log_view';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
index 1471cfed22b60..a17f22c245a4c 100644
--- a/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/management/advanced_settings/feature_controls.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
+import { CSV_QUOTE_VALUES_SETTING } from '@kbn/share-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { CSV_QUOTE_VALUES_SETTING } from '../../../../../../src/plugins/share/common/constants';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest: SuperTest<any> = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js
index 7f5df1e4632fa..d625c2a78f00e 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { FOLLOWER_INDEX_ADVANCED_SETTINGS } from '../../../../../plugins/cross_cluster_replication/common/constants';
+import { FOLLOWER_INDEX_ADVANCED_SETTINGS } from '@kbn/cross-cluster-replication-plugin/common/constants';
 import { getFollowerIndexPayload } from './fixtures';
 import { registerHelpers as registerElasticSearchHelpers } from './lib';
 import { registerHelpers as registerRemoteClustersHelpers } from './remote_clusters.helpers';
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/constants.js b/x-pack/test/api_integration/apis/management/index_lifecycle_management/constants.ts
similarity index 84%
rename from x-pack/test/api_integration/apis/management/index_lifecycle_management/constants.js
rename to x-pack/test/api_integration/apis/management/index_lifecycle_management/constants.ts
index a907737fca125..b2ae24d03b990 100644
--- a/x-pack/test/api_integration/apis/management/index_lifecycle_management/constants.js
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/constants.ts
@@ -10,3 +10,5 @@ export const DEFAULT_POLICY_NAME = 'watch-history-ilm-policy';
 export const INDEX_TEMPLATE_NAME = 'api-integration-tests-template';
 export const INDEX_TEMPLATE_PATTERN_PREFIX = 'api_integration_tests_';
 export const NODE_CUSTOM_ATTRIBUTE = 'name:apiIntegrationTestNode';
+export const SNAPSHOT_REPOSITORY_NAME = 'test_repo';
+export const CLOUD_REPOSITORY_NAME = 'found-snapshots';
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/index.js b/x-pack/test/api_integration/apis/management/index_lifecycle_management/index.js
index 164ca6634a28a..1e9cb006f1663 100644
--- a/x-pack/test/api_integration/apis/management/index_lifecycle_management/index.js
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/index.js
@@ -11,5 +11,7 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./templates'));
     loadTestFile(require.resolve('./indices'));
     loadTestFile(require.resolve('./nodes'));
+    loadTestFile(require.resolve('./snapshot_policies'));
+    loadTestFile(require.resolve('./snapshot_repositories'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_policies.helpers.ts b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_policies.helpers.ts
new file mode 100644
index 0000000000000..80c1794d675a6
--- /dev/null
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_policies.helpers.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { API_BASE_PATH, SNAPSHOT_REPOSITORY_NAME } from './constants';
+
+export const registerSnapshotPoliciesHelpers = (getService: FtrProviderContext['getService']) => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  let policiesCreated: string[] = [];
+
+  const loadSnapshotPolicies = () => supertest.get(`${API_BASE_PATH}/snapshot_policies`);
+
+  const createSnapshotPolicy = (policyName: string, repositoryName?: string) => {
+    return es.slm
+      .putLifecycle({
+        policy_id: policyName,
+        config: {
+          indices: 'test_index',
+        },
+        name: policyName,
+        repository: repositoryName ?? SNAPSHOT_REPOSITORY_NAME,
+        schedule: '0 30 1 * * ?',
+      })
+      .then(() => policiesCreated.push(policyName));
+  };
+
+  const deletePolicy = (policyName: string) => es.slm.deleteLifecycle({ policy_id: policyName });
+
+  const cleanupPolicies = () =>
+    Promise.all(policiesCreated.map(deletePolicy))
+      .then(() => {
+        policiesCreated = [];
+      })
+      .catch((err) => {
+        // eslint-disable-next-line no-console
+        console.error(`[Cleanup error] Error deleting ES resources: ${err.message}`);
+      });
+
+  return {
+    loadSnapshotPolicies,
+    createSnapshotPolicy,
+    cleanupPolicies,
+  };
+};
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_policies.ts b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_policies.ts
new file mode 100644
index 0000000000000..2bfd0f0a3f56f
--- /dev/null
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_policies.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { registerSnapshotPoliciesHelpers } from './snapshot_policies.helpers';
+import { registerSnapshotRepositoriesHelpers } from './snapshot_repositories.helpers';
+import { SNAPSHOT_REPOSITORY_NAME } from './constants';
+
+const snapshotPolicyName = 'test_snapshot_policy';
+export default function ({ getService }: FtrProviderContext) {
+  const deployment = getService('deployment');
+
+  const { loadSnapshotPolicies, createSnapshotPolicy, cleanupPolicies } =
+    registerSnapshotPoliciesHelpers(getService);
+
+  const { createSnapshotRepository, cleanupRepositories } =
+    registerSnapshotRepositoriesHelpers(getService);
+
+  describe('snapshot policies', () => {
+    before(async () => Promise.all([cleanupPolicies(), cleanupRepositories()]));
+    after(async () => Promise.all([cleanupPolicies(), cleanupRepositories()]));
+
+    it('returns empty array if no policies', async () => {
+      const { body } = await loadSnapshotPolicies().expect(200);
+      expect(body).to.eql([]);
+    });
+
+    it('returns policies', async () => {
+      const isCloud = await deployment.isCloud();
+      if (!isCloud) {
+        await createSnapshotRepository(SNAPSHOT_REPOSITORY_NAME);
+      }
+      await createSnapshotPolicy(snapshotPolicyName);
+      const { body } = await loadSnapshotPolicies().expect(200);
+
+      expect(body).to.have.length(1);
+      expect(body[0]).to.eql(snapshotPolicyName);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_repositories.helpers.ts b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_repositories.helpers.ts
new file mode 100644
index 0000000000000..9d30d36b24917
--- /dev/null
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_repositories.helpers.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { API_BASE_PATH } from './constants';
+
+export const registerSnapshotRepositoriesHelpers = (
+  getService: FtrProviderContext['getService']
+) => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  let repositoriesCreated: string[] = [];
+
+  const loadSnapshotRepositories = () => supertest.get(`${API_BASE_PATH}/snapshot_repositories`);
+
+  const createSnapshotRepository = (repositoryName: string) => {
+    return es.snapshot
+      .createRepository({
+        name: repositoryName,
+        body: {
+          type: 'fs',
+          settings: {
+            location: '/tmp/repo',
+          },
+        },
+        verify: false,
+      })
+      .then(() => repositoriesCreated.push(repositoryName));
+  };
+
+  const deleteRepository = (repositoryName: string) => {
+    return es.snapshot.deleteRepository({ name: repositoryName });
+  };
+
+  const cleanupRepositories = () =>
+    Promise.all(repositoriesCreated.map(deleteRepository))
+      .then(() => {
+        repositoriesCreated = [];
+      })
+      .catch((err) => {
+        // eslint-disable-next-line no-console
+        console.error(`[Cleanup error] Error deleting ES resources: ${err.message}`);
+      });
+
+  return {
+    loadSnapshotRepositories,
+    createSnapshotRepository,
+    cleanupRepositories,
+  };
+};
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_repositories.ts b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_repositories.ts
new file mode 100644
index 0000000000000..bc1acfd9a5a07
--- /dev/null
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/snapshot_repositories.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { registerSnapshotRepositoriesHelpers } from './snapshot_repositories.helpers';
+import { CLOUD_REPOSITORY_NAME } from './constants';
+
+const repositoryName = 'test_repository';
+
+export default function ({ getService }: FtrProviderContext) {
+  const deployment = getService('deployment');
+  let isCloud: boolean;
+
+  const { loadSnapshotRepositories, createSnapshotRepository, cleanupRepositories } =
+    registerSnapshotRepositoriesHelpers(getService);
+
+  describe('snapshot repositories', () => {
+    before(async () => {
+      isCloud = await deployment.isCloud();
+      await Promise.all([cleanupRepositories()]);
+    });
+    after(async () => Promise.all([cleanupRepositories()]));
+
+    it('returns empty array if no repositories ', async () => {
+      const {
+        body: { repositories },
+      } = await loadSnapshotRepositories().expect(200);
+      if (!isCloud) {
+        expect(repositories).to.eql([]);
+      }
+    });
+
+    it('returns cloud default repository if on Cloud', async () => {
+      const {
+        body: { repositories },
+      } = await loadSnapshotRepositories().expect(200);
+      if (isCloud) {
+        expect(repositories).to.have.length(1);
+        expect(repositories).to.eql([CLOUD_REPOSITORY_NAME]);
+      }
+    });
+
+    it('returns repositories', async () => {
+      await createSnapshotRepository(repositoryName);
+      const {
+        body: { repositories },
+      } = await loadSnapshotRepositories().expect(200);
+
+      if (isCloud) {
+        expect(repositories).to.have.length(2);
+        expect(repositories[0]).to.contain(repositoryName);
+      } else {
+        expect(repositories).to.have.length(1);
+        expect(repositories[0]).to.eql(repositoryName);
+      }
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
index 8970e8cd642fd..cd3c63ab96f4a 100644
--- a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DataStream } from '@kbn/index-management-plugin/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 // @ts-ignore
 import { API_BASE_PATH } from './constants';
-import { DataStream } from '../../../../../plugins/index_management/common';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts b/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts
index 1677013dd5e7e..d9916da65fec2 100644
--- a/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts
+++ b/x-pack/test/api_integration/apis/management/snapshot_restore/snapshots.ts
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
+import { SnapshotDetails } from '@kbn/snapshot-restore-plugin/common/types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { registerEsHelpers, SlmPolicy } from './lib';
-import { SnapshotDetails } from '../../../../../plugins/snapshot_restore/common/types';
 
 const REPO_NAME_1 = 'test_repo_1';
 const REPO_NAME_2 = 'test_another_repo_2';
diff --git a/x-pack/test/api_integration/apis/maps/get_grid_tile.js b/x-pack/test/api_integration/apis/maps/get_grid_tile.js
index ab8c86215a3a5..38b34257d06ae 100644
--- a/x-pack/test/api_integration/apis/maps/get_grid_tile.js
+++ b/x-pack/test/api_integration/apis/maps/get_grid_tile.js
@@ -192,5 +192,13 @@ export default function ({ getService }) {
         ],
       ]);
     });
+
+    it('should return error when index does not exist', async () => {
+      await supertest
+        .get(URL.replace('index=logstash-*', 'index=notRealIndex') + '&renderAs=point')
+        .set('kbn-xsrf', 'kibana')
+        .responseType('blob')
+        .expect(404);
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/maps/get_tile.js b/x-pack/test/api_integration/apis/maps/get_tile.js
index dd85fd094a804..9f85b6098f2be 100644
--- a/x-pack/test/api_integration/apis/maps/get_tile.js
+++ b/x-pack/test/api_integration/apis/maps/get_tile.js
@@ -84,5 +84,18 @@ export default function ({ getService }) {
         ],
       ]);
     });
+
+    it('should return error when index does not exist', async () => {
+      await supertest
+        .get(
+          `/api/maps/mvt/getTile/2/1/1.pbf\
+?geometryFieldName=geo.coordinates\
+&index=notRealIndex\
+&requestBody=(_source:!f,docvalue_fields:!(bytes,geo.coordinates,machine.os.raw,(field:'@timestamp',format:epoch_millis)),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:10000,stored_fields:!(bytes,geo.coordinates,machine.os.raw,'@timestamp'))`
+        )
+        .set('kbn-xsrf', 'kibana')
+        .responseType('blob')
+        .expect(404);
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/metrics_ui/http_source.ts b/x-pack/test/api_integration/apis/metrics_ui/http_source.ts
index f0eba78f90a02..1b298d79b8aa1 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/http_source.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/http_source.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { SourceResponse } from '../../../../plugins/infra/server/lib/sources';
+import { SourceResponse } from '@kbn/infra-plugin/server/lib/sources';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts b/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts
index 9867abcc67a7d..f924966146755 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/infra_log_analysis_validation_log_entry_datasets.ts
@@ -10,8 +10,8 @@ import {
   LOG_ANALYSIS_VALIDATE_DATASETS_PATH,
   validateLogEntryDatasetsRequestPayloadRT,
   validateLogEntryDatasetsResponsePayloadRT,
-} from '../../../../plugins/infra/common/http_api/log_analysis/validation/datasets';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/log_analysis/validation/datasets';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts b/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts
index 75869e37199c5..b600ab0469b53 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/inventory_threshold_alert.ts
@@ -6,18 +6,15 @@
  */
 
 import expect from '@kbn/expect';
-import type { Logger, LogMeta } from 'kibana/server';
+import type { Logger, LogMeta } from '@kbn/core/server';
 import sinon from 'sinon';
-import {
-  Comparator,
-  InventoryMetricConditions,
-} from '../../../../plugins/infra/common/alerting/metrics';
+import { Comparator, InventoryMetricConditions } from '@kbn/infra-plugin/common/alerting/metrics';
 import {
   InventoryItemType,
   SnapshotMetricType,
-} from '../../../../plugins/infra/common/inventory_models/types';
-import { evaluateCondition } from '../../../../plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition';
-import { InfraSource } from '../../../../plugins/infra/server/lib/sources';
+} from '@kbn/infra-plugin/common/inventory_models/types';
+import { evaluateCondition } from '@kbn/infra-plugin/server/lib/alerting/inventory_metric_threshold/evaluate_condition';
+import { InfraSource } from '@kbn/infra-plugin/server/lib/sources';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
index a6292769fc5a4..bd9a9a0e7c480 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
@@ -11,13 +11,13 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
 import { fold } from 'fp-ts/lib/Either';
 
-import { createPlainError, throwErrors } from '../../../../plugins/infra/common/runtime_types';
+import { createPlainError, throwErrors } from '@kbn/infra-plugin/common/runtime_types';
 
 import {
   LOG_ENTRIES_HIGHLIGHTS_PATH,
   logEntriesHighlightsRequestRT,
   logEntriesHighlightsResponseRT,
-} from '../../../../plugins/infra/common/http_api';
+} from '@kbn/infra-plugin/common/http_api';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts b/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts
index 3588bedc807be..4ac098f95764d 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts
@@ -13,13 +13,13 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
 import { fold } from 'fp-ts/lib/Either';
 
-import { createPlainError, throwErrors } from '../../../../plugins/infra/common/runtime_types';
+import { createPlainError, throwErrors } from '@kbn/infra-plugin/common/runtime_types';
 
 import {
   LOG_ENTRIES_SUMMARY_PATH,
   logEntriesSummaryRequestRT,
   logEntriesSummaryResponseRT,
-} from '../../../../plugins/infra/common/http_api/log_entries';
+} from '@kbn/infra-plugin/common/http_api/log_entries';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
index 5c57046db030b..5cdca5a369edf 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   InfraMetadata,
   InfraMetadataRequest,
-} from '../../../../plugins/infra/common/http_api/metadata_api';
+} from '@kbn/infra-plugin/common/http_api/metadata_api';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import { DATES } from './constants';
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts b/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
index 1accdaf49156b..9c9d4bd096a63 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metric_threshold_alert.ts
@@ -11,12 +11,12 @@ import {
   Comparator,
   CountMetricExpressionParams,
   NonCountMetricExpressionParams,
-} from '../../../../plugins/infra/common/alerting/metrics';
-import { InfraSource } from '../../../../plugins/infra/common/source_configuration/source_configuration';
+} from '@kbn/infra-plugin/common/alerting/metrics';
+import { InfraSource } from '@kbn/infra-plugin/common/source_configuration/source_configuration';
 import {
   EvaluatedRuleParams,
   evaluateRule,
-} from '../../../../plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_rule';
+} from '@kbn/infra-plugin/server/lib/alerting/metric_threshold/lib/evaluate_rule';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
index 1011a9ee95dba..5e0cff513002e 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
@@ -8,13 +8,13 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 
-import { InfraTimerangeInput } from '../../../../plugins/infra/common/http_api/snapshot_api';
-import { InventoryMetric } from '../../../../plugins/infra/common/inventory_models/types';
+import { InfraTimerangeInput } from '@kbn/infra-plugin/common/http_api/snapshot_api';
+import { InventoryMetric } from '@kbn/infra-plugin/common/inventory_models/types';
+import { NodeDetailsMetricDataResponse } from '@kbn/infra-plugin/common/http_api/node_details_api';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import { DATES } from './constants';
 
-import { NodeDetailsMetricDataResponse } from '../../../../plugins/infra/common/http_api/node_details_api';
 const { min, max } = DATES['7.0.0'].hosts;
 
 interface NodeDetailsRequest {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts
index 8b77bf7b1c089..7df64d9057a4d 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import moment from 'moment';
-import { MetricExpressionParams } from '../../../../plugins/infra/common/alerting/metrics';
-import { getElasticsearchMetricQuery } from '../../../../plugins/infra/server/lib/alerting/metric_threshold/lib/metric_query';
+import { MetricExpressionParams } from '@kbn/infra-plugin/common/alerting/metrics';
+import { getElasticsearchMetricQuery } from '@kbn/infra-plugin/server/lib/alerting/metric_threshold/lib/metric_query';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts
index 1eaae741f7e05..e5cd8babe8aff 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { first } from 'lodash';
 import moment from 'moment';
+import { metricsExplorerResponseRT } from '@kbn/infra-plugin/common/http_api/metrics_explorer';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { DATES } from './constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { metricsExplorerResponseRT } from '../../../../plugins/infra/common/http_api/metrics_explorer';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
 
 const { min, max } = DATES['7.0.0'].hosts;
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts
index ee73c9bd92a54..b3b3f53d6d6c3 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_overview_top.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   TopNodesRequestRT,
   TopNodesResponseRT,
-} from '../../../../plugins/infra/common/http_api/overview_api';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/overview_api';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts
index bba38f622b0ab..87e736c0bc822 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   ProcessListAPIRequestRT,
   ProcessListAPIResponseRT,
-} from '../../../../plugins/infra/common/http_api/host_details/process_list';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/host_details/process_list';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts
index ba4d7123556c1..0884065f11520 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_process_list_chart.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   ProcessListAPIChartRequestRT,
   ProcessListAPIChartResponseRT,
-} from '../../../../plugins/infra/common/http_api/host_details/process_list';
-import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/host_details/process_list';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
index 4181344f064b9..d604dc69a87e9 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   SnapshotNodeResponse,
   SnapshotMetricInput,
   SnapshotRequest,
-} from '../../../../plugins/infra/common/http_api/snapshot_api';
+} from '@kbn/infra-plugin/common/http_api/snapshot_api';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATES } from './constants';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/metrics_ui/sources.ts b/x-pack/test/api_integration/apis/metrics_ui/sources.ts
index e9ea8f725073f..0ba6f49634b54 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/sources.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/sources.ts
@@ -11,7 +11,7 @@ import {
   MetricsSourceConfigurationResponse,
   PartialMetricsSourceConfigurationProperties,
   metricsSourceConfigurationResponseRT,
-} from '../../../../plugins/infra/common/metrics_sources';
+} from '@kbn/infra-plugin/common/metrics_sources';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts b/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts
index a3e072c79f916..db075a725b9f6 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/common_jobs.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { ANNOTATION_TYPE } from '../../../../../plugins/ml/common/constants/annotations';
-import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
+import { ANNOTATION_TYPE } from '@kbn/ml-plugin/common/constants/annotations';
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 
 export const commonJobConfig = {
   description: 'test_job_annotation',
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 07575891ba083..4e52f6e130484 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,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 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';
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
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 eb1318a2763e9..7227b33f05901 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,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { ANNOTATION_TYPE } from '@kbn/ml-plugin/common/constants/annotations';
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 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';
 import { testSetupJobConfigs, jobIds, testSetupAnnotations } from './common_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
index 7d8fd15681212..dbdf96821779d 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/close_with_spaces.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
index 54550c547521f..e5cd2295d0989 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
index 09e98d1430491..2fcdcdacfe927 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/open_with_spaces.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { JOB_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/calendars/helpers.ts b/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
index 3d60285bb5d23..e0cf79ae7ba83 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Calendar } from '../../../../../plugins/ml/server/models/calendar';
+import { Calendar } from '@kbn/ml-plugin/server/models/calendar';
 
 type ScheduledEvent = estypes.MlCalendarEvent;
 
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts
index 44c1b0c6fe2bb..22d01b3596af3 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
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 b2d306b923f1d..cee102eb4697a 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
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts
index 8b03c42caa787..1cd71bc016262 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts
index 31db3b645093b..6a5cb782ed651 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
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 9faaa32441a30..bef0f56a77ac7 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
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_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';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts
index 8793376374693..431d249d95ee7 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts
@@ -6,12 +6,12 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 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_api';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
index 638e81cf88947..67a5dd3f37900 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts
index c9c54260a93c1..7a11ddb1de1b1 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
index c1a2ea32e942a..30a516a46ea18 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATA_FRAME_TASK_STATE } from '../../../../../plugins/ml/common/constants/data_frame_analytics';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
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 3cc7a1f194409..565333adefaa1 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
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts
index 530661559dd2b..51a0c9743de4a 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts b/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts
index 8335bd73c1f3f..2ce349bde39ee 100644
--- a/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts
+++ b/x-pack/test/api_integration/apis/ml/job_audit_messages/clear_messages.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getJobConfig } from './index';
+import { getJobConfig } from '.';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts b/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts
index 2c79f02c75030..046aa248a1951 100644
--- a/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts
+++ b/x-pack/test/api_integration/apis/ml/job_audit_messages/get_job_audit_messages.ts
@@ -10,7 +10,7 @@ import { omit, keyBy } from 'lodash';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { getJobConfig } from './index';
+import { getJobConfig } from '.';
 
 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 4e335cdbd48d1..c65fd91c733e7 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
@@ -10,7 +10,7 @@ import {
   basicValidJobMessages,
   basicInvalidJobMessages,
   nonBasicIssuesMessages,
-} from '../../../../../../x-pack/plugins/ml/common/constants/messages.test.mock';
+} from '@kbn/ml-plugin/common/constants/messages.test.mock';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
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 e29ef5efd5192..62250c63fc000 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,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 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';
 
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
index a3a6ad309cb31..5e291bac8d716 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { JOB_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts
index 2136e16e3c153..ce8c5648863af 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/common_jobs.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 export const SINGLE_METRIC_JOB_CONFIG: Job = {
diff --git a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts
index fae4c70666048..b331f5f10878c 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 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';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
index 9e282a4ef9a11..b1bbc4fcd22f3 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/force_start_datafeeds_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts
index f837f58543f5b..936a1547ea161 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 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';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
index 7af6a6f3ea1bc..55f6b70b8a5ab 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/stop_datafeeds_spaces.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
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 325e89dbb058a..2f0e2d3e9433a 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
@@ -7,12 +7,11 @@
 
 import expect from '@kbn/expect';
 
+import { isPopulatedObject } from '@kbn/ml-plugin/common/util/object_utils';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 
-import { isPopulatedObject } from '../../../../../plugins/ml/common/util/object_utils';
-
 const moduleIds = [
   'apache_data_stream',
   'apache_ecs',
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 c9a1c79c260fa..f09376212418a 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
@@ -8,10 +8,9 @@
 import expect from '@kbn/expect';
 import { isEmpty, sortBy } from 'lodash';
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
+import { Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 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_api';
 
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 d062b1880e1bf..547d1bc469a11 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
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 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_api';
 
 export default ({ getService }: FtrProviderContext) => {
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 c63729cd7ac96..3a515321f1a3d 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
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { AnomalyCategorizerStatsDoc } from '@kbn/ml-plugin/common/types/anomalies';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_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';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts b/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
index a0dfa0e795f5a..3606677fc0a3e 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_category_definition.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed } from '@kbn/ml-plugin/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_api';
-import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts b/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
index 3f410dc3ce3cd..ddcdf6244629d 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_category_examples.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { Datafeed } from '@kbn/ml-plugin/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_api';
-import { Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
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 2ce6e8da49797..f676ab68e7806 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
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { Datafeed, Job } from '@kbn/ml-plugin/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_api';
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
index 4ee7f6966b64a..c20348e63a028 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { MlSavedObjectType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { MlSavedObjectType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
index 11705b78c690b..53252ab4c5e4d 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
+import { TrainedModelType } from '@kbn/ml-plugin/common/types/saved_objects';
+import { PutTrainedModelConfig } from '@kbn/ml-plugin/common/types/trained_models';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { TrainedModelType } from '../../../../../plugins/ml/common/types/saved_objects';
-import { PutTrainedModelConfig } from '../../../../../plugins/ml/common/types/trained_models';
 
 type ModelType = 'regression' | 'classification';
 
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/sync.ts b/x-pack/test/api_integration/apis/ml/saved_objects/sync.ts
index 149d75429d977..8f2dda89a8ab5 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/sync.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/sync.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import { cloneDeep } from 'lodash';
+import { MlSavedObjectType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { MlSavedObjectType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default ({ getService }: FtrProviderContext) => {
   const ml = getService('ml');
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
index 5d3f113c663ff..079b1b32f10b9 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
-import { JobType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/ml/system/capabilities.ts b/x-pack/test/api_integration/apis/ml/system/capabilities.ts
index 9d5d5a355e7c6..c231d87866c4e 100644
--- a/x-pack/test/api_integration/apis/ml/system/capabilities.ts
+++ b/x-pack/test/api_integration/apis/ml/system/capabilities.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
 
 const NUMBER_OF_CAPABILITIES = 36;
 
diff --git a/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts b/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts
index 23b36a2601c09..234de19dfd79b 100644
--- a/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts
+++ b/x-pack/test/api_integration/apis/ml/system/space_capabilities.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { MlCapabilitiesResponse } from '@kbn/ml-plugin/common/types/capabilities';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
 import { USER } from '../../../../functional/services/ml/security_common';
-import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
 
 const idSpaceWithMl = 'space_with_ml';
 const idSpaceNoMl = 'space_no_ml';
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance.js b/x-pack/test/api_integration/apis/monitoring/apm/instance.js
index 229cc05a58a1b..b2b7d67062535 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instance.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instance.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmInstanceFixture from './fixtures/instance';
+import apmInstanceFixture from './fixtures/instance.json';
 
 export default function ({ getService }) {
   // Skipping for now since failure is unclear
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
index 37e17fce25b64..4ab87ffdc7d51 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmInstanceFixture from './fixtures/instance';
+import apmInstanceFixture from './fixtures/instance.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview.js b/x-pack/test/api_integration/apis/monitoring/apm/overview.js
index afa8d55f28adc..543cb153927fa 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmClusterFixture from './fixtures/cluster';
+import apmClusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js
index 8aef96ab1d9e6..2c56416fb230c 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import apmClusterFixture from './fixtures/cluster';
+import apmClusterFixture from './fixtures/cluster.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/detail.js b/x-pack/test/api_integration/apis/monitoring/beats/detail.js
index 2a347f448f188..8a456410694b8 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatDetailFixture from './fixtures/detail';
+import beatDetailFixture from './fixtures/detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js
index a7f6ebda90feb..7bad06ac7df17 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatDetailFixture from './fixtures/detail';
+import beatDetailFixture from './fixtures/detail.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/overview.js b/x-pack/test/api_integration/apis/monitoring/beats/overview.js
index ce8b6cb317768..b2f002b00af1c 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatsClusterFixture from './fixtures/cluster';
+import beatsClusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js
index c168443f3e778..9be0d00a34f0a 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import beatsClusterFixture from './fixtures/cluster';
+import beatsClusterFixture from './fixtures/cluster.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/list.js b/x-pack/test/api_integration/apis/monitoring/cluster/list.js
index 686b63b6e7562..6859f13b7b66a 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/list.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/list.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import multiclusterFixture from './fixtures/multicluster';
+import multiclusterFixture from './fixtures/multicluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js b/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js
index a92dd9fd30658..13b5310bc1fe6 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import multiclusterFixture from './fixtures/multicluster';
+import multiclusterFixture from './fixtures/multicluster.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
index 02bf91357ed4b..3f3ad9ce30f9e 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js
index 65243499ce8b8..5ca42e46f2008 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
index a34473501c2e2..22c7706b9a32f 100644
--- a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
+++ b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 import { get } from 'lodash';
-import * as esMetrics from '../../../../../plugins/monitoring/server/lib/metrics/elasticsearch/metrics';
-import * as kibanaMetrics from '../../../../../plugins/monitoring/server/lib/metrics/kibana/metrics';
-import * as logstashMetrics from '../../../../../plugins/monitoring/server/lib/metrics/logstash/metrics';
-import * as beatsMetrics from '../../../../../plugins/monitoring/server/lib/metrics/beats/metrics';
-import * as apmMetrics from '../../../../../plugins/monitoring/server/lib/metrics/apm/metrics';
+import * as esMetrics from '@kbn/monitoring-plugin/server/lib/metrics/elasticsearch/metrics';
+import * as kibanaMetrics from '@kbn/monitoring-plugin/server/lib/metrics/kibana/metrics';
+import * as logstashMetrics from '@kbn/monitoring-plugin/server/lib/metrics/logstash/metrics';
+import * as beatsMetrics from '@kbn/monitoring-plugin/server/lib/metrics/beats/metrics';
+import * as apmMetrics from '@kbn/monitoring-plugin/server/lib/metrics/apm/metrics';
 
 export default function ({ getService }) {
   const es = getService('es');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
index 870bfb31a50e5..0d4c29ede6980 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import ccrFixture from './fixtures/ccr';
+import ccrFixture from './fixtures/ccr.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js
index 5ab23f20d7724..d7b2b2b13d9d2 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import ccrFixture from './fixtures/ccr';
+import ccrFixture from './fixtures/ccr.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js
index a4bca9798b178..5e42cca12a261 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import ccrShardFixture from './fixtures/ccr_shard';
+import ccrShardFixture from './fixtures/ccr_shard.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js
index dd20b9ed4b091..532a3b298f9b1 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js
@@ -7,7 +7,7 @@
 
 import { omit } from 'lodash';
 import expect from '@kbn/expect';
-import ccrShardFixture from './fixtures/ccr_shard';
+import ccrShardFixture from './fixtures/ccr_shard.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js
index e243c3a372f7b..699a69c625b27 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import indexDetailFixture from './fixtures/index_detail';
-import indexDetailAdvancedFixture from './fixtures/index_detail_advanced';
+import indexDetailFixture from './fixtures/index_detail.json';
+import indexDetailAdvancedFixture from './fixtures/index_detail_advanced.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js
index 5e2aded61cd40..2bce60939b5f4 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import indexDetailFixture from './fixtures/index_detail';
-import indexDetailAdvancedFixture from './fixtures/index_detail_advanced';
+import indexDetailFixture from './fixtures/index_detail.json';
+import indexDetailAdvancedFixture from './fixtures/index_detail_advanced.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
index 0b94aaa9f27da..a443ce0a525d5 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import relocatingShardsFixture from './fixtures/indices_shards_relocating';
-import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all';
-import indicesRedClusterFixture from './fixtures/indices_red_cluster';
-import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all';
+import relocatingShardsFixture from './fixtures/indices_shards_relocating.json';
+import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all.json';
+import indicesRedClusterFixture from './fixtures/indices_red_cluster.json';
+import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js
index 0aafc8e908d8d..dcd8dbb77a213 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import relocatingShardsFixture from './fixtures/indices_shards_relocating';
-import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all';
-import indicesRedClusterFixture from './fixtures/indices_red_cluster';
-import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all';
+import relocatingShardsFixture from './fixtures/indices_shards_relocating.json';
+import relocationShardsAllFixture from './fixtures/indices_shards_relocating_all.json';
+import indicesRedClusterFixture from './fixtures/indices_red_cluster.json';
+import indicesRedClusterAllFixture from './fixtures/indices_red_cluster_all.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js
index 266b805a258e7..1ae82990a8bee 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
+import nodeDetailFixture from './fixtures/node_detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js
index 90c6b6b25f4b0..1ed6a4e736608 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail_advanced.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js
index 29069a9e28d78..9f20bce50f9b1 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail_advanced.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js
index 7c767838f6aa9..c978424951d9e 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
+import nodeDetailFixture from './fixtures/node_detail.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
index e437fd707e763..4b6d1c9eab401 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import nodesListingFixtureGreen from './fixtures/nodes_listing_green';
-import nodesListingFixtureRed from './fixtures/nodes_listing_red';
-import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup';
-import nodesListingFixturePagination from './fixtures/nodes_listing_pagination';
+import nodesListingFixtureGreen from './fixtures/nodes_listing_green.json';
+import nodesListingFixtureRed from './fixtures/nodes_listing_red.json';
+import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup.json';
+import nodesListingFixturePagination from './fixtures/nodes_listing_pagination.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js
index 36d3870cc4562..accc064e14a84 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import nodesListingFixtureGreen from './fixtures/nodes_listing_green';
-import nodesListingFixtureRed from './fixtures/nodes_listing_red';
-import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup';
-import nodesListingFixturePagination from './fixtures/nodes_listing_pagination';
+import nodesListingFixtureGreen from './fixtures/nodes_listing_green.json';
+import nodesListingFixtureRed from './fixtures/nodes_listing_red.json';
+import nodesListingFixtureCgroup from './fixtures/nodes_listing_cgroup.json';
+import nodesListingFixturePagination from './fixtures/nodes_listing_pagination.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
index 1f023401fbe2e..4d8e2d20d88b9 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum';
-import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum';
-import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating';
+import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum.json';
+import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum.json';
+import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js
index 5760f6e5241cf..870406f3bb469 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum';
-import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum';
-import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating';
+import overviewFixtureGreenPlatinum from './fixtures/overview_green_platinum.json';
+import overviewFixtureRedPlatinum from './fixtures/overview_red_platinum.json';
+import overviewFixtureShardsRelocating from './fixtures/overview_shards_relocating.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
index 9827c1d888a7e..af7a360ec1bd8 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import instanceFixture from './fixtures/instance';
+import instanceFixture from './fixtures/instance.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js
index f0e73ca9ce537..8ad6f32c2c564 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { normalizeDataTypeDifferences } from '../normalize_data_type_differences';
-import instanceFixture from './fixtures/instance';
+import instanceFixture from './fixtures/instance.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
index 1a5f71150b1d8..ac683a12710ba 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import listingFixture from './fixtures/listing';
+import listingFixture from './fixtures/listing.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js
index 0cef32c560d9c..2876cc29dcccf 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import listingFixture from './fixtures/listing';
+import listingFixture from './fixtures/listing.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
index 23a783d58d2d8..4887e7b62b246 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js
index a08f378b92a15..ca755c742e0b0 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { normalizeDataTypeDifferences } from '../normalize_data_type_differences';
-import overviewFixture from './fixtures/overview';
+import overviewFixture from './fixtures/overview.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
index 507448a73bdf9..bd12ff4f7e01b 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import clusterFixture from './fixtures/cluster';
+import clusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js b/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js
index cd0dac1cb5f0c..d74554d62ff16 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import indexDetailFixture from './fixtures/index_detail';
+import indexDetailFixture from './fixtures/index_detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js b/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js
index e2d8db4d587ba..251ddbbd4b816 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import multipleClustersFixture from './fixtures/multiple_clusters';
+import multipleClustersFixture from './fixtures/multiple_clusters.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js b/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js
index 3888f3995df36..a6cf9801980c4 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
+import nodeDetailFixture from './fixtures/node_detail.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
index 801cc55ffbcad..aad42340f0e53 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/multicluster_pipelines';
+import fixture from './fixtures/multicluster_pipelines.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js
index 4c5f3ddb5a20f..521731c920a6f 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/multicluster_pipelines';
+import fixture from './fixtures/multicluster_pipelines.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js
index a9a12d2f2c853..f234b5019edc8 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import nodeDetailFixture from './fixtures/node_detail';
-import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail.json';
+import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js
index 08c9db594937f..ad4fdcb462fd9 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { normalizeDataTypeDifferences } from '../normalize_data_type_differences';
-import nodeDetailFixture from './fixtures/node_detail';
-import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced';
+import nodeDetailFixture from './fixtures/node_detail.json';
+import nodeDetailAdvancedFixture from './fixtures/node_detail_advanced.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
index 8911f5f77c3a8..da287e37ea37f 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodesFixture from './fixtures/nodes';
+import nodesFixture from './fixtures/nodes.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js
index 35d3487f1bce7..aac85aff13041 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import nodesFixture from './fixtures/nodes';
+import nodesFixture from './fixtures/nodes.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
index 7378c37a97357..f64ab3c700cd5 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import pipelinesFixture from './fixtures/pipelines';
+import pipelinesFixture from './fixtures/pipelines.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js
index f1cbc25d6ed9a..7081af982d237 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import pipelinesFixture from './fixtures/pipelines';
+import pipelinesFixture from './fixtures/pipelines.json';
 import { getLifecycleMethods } from '../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js
index 744934c1b315f..23718f59feb0f 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_apm';
+import fixture from './fixtures/detect_apm.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js
index 542ee98f3d23d..3945289a242e3 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_beats';
+import fixture from './fixtures/detect_beats.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js
index de805a05af13f..1cb4097b43e5c 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_beats_management';
+import fixture from './fixtures/detect_beats_management.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js
index c7f33061c41c1..e32c86ef126f9 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_logstash';
+import fixture from './fixtures/detect_logstash.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js
index f85636b01dfa3..6f18c74cc8aee 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/detect_logstash_management';
+import fixture from './fixtures/detect_logstash_management.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js
index c6b00d77199ea..56af7410ecd09 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_mb';
+import fixture from './fixtures/es_and_kibana_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js
index 58a8dbc558a0e..482a3173a92f4 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_exclusive_mb';
+import fixture from './fixtures/es_and_kibana_exclusive_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js
index 81467301e7b5f..14d6cefb8e6e3 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_exclusive_mb';
+import fixture from './fixtures/es_and_kibana_exclusive_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js
index c9bd3a4255cc7..53035670753fc 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/es_and_kibana_mb';
+import fixture from './fixtures/es_and_kibana_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js
index bb4a66e274886..b71e40759a833 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_mb';
+import fixture from './fixtures/kibana_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js
index a730dbe238d6e..4adb8272b1735 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_exclusive_mb';
+import fixture from './fixtures/kibana_exclusive_mb.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js
index 9bdc00179d3ee..85d7775dd6254 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_exclusive_mb';
+import fixture from './fixtures/kibana_exclusive_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js
index 450a8eb571996..1502512352421 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import fixture from './fixtures/kibana_mb';
+import fixture from './fixtures/kibana_mb.json';
 import { getLifecycleMethods } from '../../data_stream';
 
 export default function ({ getService }) {
diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js
index 2ed84ebf76ecf..4653e7232b920 100644
--- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js
+++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import clusterFixture from './fixtures/cluster';
+import clusterFixture from './fixtures/cluster.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js
index 3b6ccffe63998..ee538544177d3 100644
--- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js
+++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import clustersFixture from './fixtures/clusters';
+import clustersFixture from './fixtures/clusters.json';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/search/session.ts b/x-pack/test/api_integration/apis/search/session.ts
index 2c8a03ddbc4f2..8a7b3f330bcf8 100644
--- a/x-pack/test/api_integration/apis/search/session.ts
+++ b/x-pack/test/api_integration/apis/search/session.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { SearchSessionStatus } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { SearchSessionStatus } from '../../../../../src/plugins/data/common';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index ecf37477831a9..61ac283dfea34 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -8,7 +8,7 @@
 import util from 'util';
 import { isEqual, isEqualWith } from 'lodash';
 import expect from '@kbn/expect';
-import { RawKibanaPrivileges } from '../../../../plugins/security/common/model';
+import { RawKibanaPrivileges } from '@kbn/security-plugin/common/model';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security_solution/authentications.ts b/x-pack/test/api_integration/apis/security_solution/authentications.ts
index 920be90ba4227..aa098648d86fd 100644
--- a/x-pack/test/api_integration/apis/security_solution/authentications.ts
+++ b/x-pack/test/api_integration/apis/security_solution/authentications.ts
@@ -12,7 +12,7 @@ import {
   UserAuthenticationsRequestOptions,
   UserAuthenticationsStrategyResponse,
   UsersQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts b/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
index e9c00318592c5..67341c0dccb99 100644
--- a/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
+++ b/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 
+import { APP_ID } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   createUsersAndRoles,
@@ -20,7 +21,6 @@ import {
   getCase,
 } from '../../../cases_api_integration/common/lib/utils';
 import { getPostCaseRequest } from '../../../cases_api_integration/common/lib/mock';
-import { APP_ID } from '../../../../plugins/security_solution/common/constants';
 
 const secAll: Role = {
   name: 'sec_all_role',
diff --git a/x-pack/test/api_integration/apis/security_solution/events.ts b/x-pack/test/api_integration/apis/security_solution/events.ts
index fef37e9939fcb..7072ee0fafa71 100644
--- a/x-pack/test/api_integration/apis/security_solution/events.ts
+++ b/x-pack/test/api_integration/apis/security_solution/events.ts
@@ -12,7 +12,7 @@ import {
   Direction,
   TimelineEventsQueries,
   TimelineEventsAllStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { getDocValueFields, getFieldsToRequest, getFilterValue } from './utils';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/host_details.ts b/x-pack/test/api_integration/apis/security_solution/host_details.ts
index d2de0f84a3769..6a28dba22b0ab 100644
--- a/x-pack/test/api_integration/apis/security_solution/host_details.ts
+++ b/x-pack/test/api_integration/apis/security_solution/host_details.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   HostDetailsStrategyResponse,
   HostsQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/hosts.ts b/x-pack/test/api_integration/apis/security_solution/hosts.ts
index bb2969f85a98b..653434f5fb25b 100644
--- a/x-pack/test/api_integration/apis/security_solution/hosts.ts
+++ b/x-pack/test/api_integration/apis/security_solution/hosts.ts
@@ -13,7 +13,7 @@ import {
   HostsStrategyResponse,
   HostDetailsStrategyResponse,
   HostFirstLastSeenStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts
index f38cf406a9dbe..8d6f5520d884b 100644
--- a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts
+++ b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts
@@ -11,7 +11,7 @@ import {
   HostsKpiHostsStrategyResponse,
   HostsKpiQueries,
   HostsKpiUniqueIpsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts
index 637b69ff1daaa..8c9e3e3229585 100644
--- a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts
+++ b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts
@@ -6,7 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   NetworkKpiDnsStrategyResponse,
   NetworkKpiNetworkEventsStrategyResponse,
@@ -14,7 +13,8 @@ import {
   NetworkKpiTlsHandshakesStrategyResponse,
   NetworkKpiUniqueFlowsStrategyResponse,
   NetworkKpiUniquePrivateIpsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts b/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts
index 24cf4699d952c..50722c39476c6 100644
--- a/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts
+++ b/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts
@@ -11,7 +11,7 @@ import {
   MatrixHistogramQuery,
   MatrixHistogramType,
   NetworkDnsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/network_details.ts b/x-pack/test/api_integration/apis/security_solution/network_details.ts
index 07e526c7c4bf5..c1cbcb6469d9f 100644
--- a/x-pack/test/api_integration/apis/security_solution/network_details.ts
+++ b/x-pack/test/api_integration/apis/security_solution/network_details.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   NetworkDetailsStrategyResponse,
   NetworkQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/network_dns.ts b/x-pack/test/api_integration/apis/security_solution/network_dns.ts
index 474c6261babf0..ed3be02d8cc29 100644
--- a/x-pack/test/api_integration/apis/security_solution/network_dns.ts
+++ b/x-pack/test/api_integration/apis/security_solution/network_dns.ts
@@ -12,7 +12,7 @@ import {
   Direction,
   NetworkDnsFields,
   NetworkDnsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts
index 41b083ab90578..783ef2efe907a 100644
--- a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts
+++ b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts
@@ -13,7 +13,7 @@ import {
   FlowTargetSourceDest,
   NetworkTopTablesFields,
   NetworkTopNFlowStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/overview_host.ts b/x-pack/test/api_integration/apis/security_solution/overview_host.ts
index b2a32ac46c3f3..3c14b4f91d86c 100644
--- a/x-pack/test/api_integration/apis/security_solution/overview_host.ts
+++ b/x-pack/test/api_integration/apis/security_solution/overview_host.ts
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   HostsQueries,
   HostsOverviewStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/overview_network.ts b/x-pack/test/api_integration/apis/security_solution/overview_network.ts
index ffee9b851ffc0..51398a1e396ec 100644
--- a/x-pack/test/api_integration/apis/security_solution/overview_network.ts
+++ b/x-pack/test/api_integration/apis/security_solution/overview_network.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   NetworkOverviewStrategyResponse,
   NetworkQueries,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts
index d3217148ad8bb..e7abf13b2e3d6 100644
--- a/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts
+++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/helpers.ts
@@ -7,7 +7,7 @@
 
 import type SuperTest from 'supertest';
 import uuid from 'uuid';
-import { TimelineType } from '../../../../../plugins/security_solution/common/types/timeline';
+import { TimelineType } from '@kbn/security-solution-plugin/common/types/timeline';
 
 export const createBasicTimeline = async (
   supertest: SuperTest.SuperTest<SuperTest.Test>,
diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts
index 5bdbb76d53908..32d307ebc22d5 100644
--- a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts
+++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts
@@ -6,13 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { TimelineResult, TimelineType } from '@kbn/security-solution-plugin/common/types/timeline';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import {
-  TimelineResult,
-  TimelineType,
-} from '../../../../../plugins/security_solution/common/types/timeline';
-
 import { createBasicTimeline } from './helpers';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security_solution/timeline.ts b/x-pack/test/api_integration/apis/security_solution/timeline.ts
index f586719e6015e..f9a2a795d43ca 100644
--- a/x-pack/test/api_integration/apis/security_solution/timeline.ts
+++ b/x-pack/test/api_integration/apis/security_solution/timeline.ts
@@ -6,10 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  SavedTimeline,
-  TimelineType,
-} from '../../../../plugins/security_solution/common/types/timeline';
+import { SavedTimeline, TimelineType } from '@kbn/security-solution-plugin/common/types/timeline';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { createBasicTimeline, createBasicTimelineTemplate } from './saved_objects/helpers';
diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts
index 9f1b5fccd9d1a..830cb9d84b71b 100644
--- a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts
+++ b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts
@@ -11,7 +11,7 @@ import {
   TimelineEventsQueries,
   TimelineEventsDetailsStrategyResponse,
   TimelineKpiStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts b/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts
index c5ea6e2aeaa63..47c6e28d9bab7 100644
--- a/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts
+++ b/x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts
@@ -10,13 +10,13 @@ import {
   noteSavedObjectType,
   pinnedEventSavedObjectType,
   timelineSavedObjectType,
-} from '../../../../plugins/security_solution/server/lib/timeline/saved_object_mappings';
-import { TimelineWithoutExternalRefs } from '../../../../plugins/security_solution/common/types/timeline';
-import { NoteWithoutExternalRefs } from '../../../../plugins/security_solution/common/types/timeline/note';
+} from '@kbn/security-solution-plugin/server/lib/timeline/saved_object_mappings';
+import { TimelineWithoutExternalRefs } from '@kbn/security-solution-plugin/common/types/timeline';
+import { NoteWithoutExternalRefs } from '@kbn/security-solution-plugin/common/types/timeline/note';
 
+import { PinnedEventWithoutExternalRefs } from '@kbn/security-solution-plugin/common/types/timeline/pinned_event';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { getSavedObjectFromES } from './utils';
-import { PinnedEventWithoutExternalRefs } from '../../../../plugins/security_solution/common/types/timeline/pinned_event';
 
 interface TimelineWithoutSavedQueryId {
   [timelineSavedObjectType]: TimelineWithoutExternalRefs;
diff --git a/x-pack/test/api_integration/apis/security_solution/tls.ts b/x-pack/test/api_integration/apis/security_solution/tls.ts
index c872844cb3d46..5949a3b85c2a7 100644
--- a/x-pack/test/api_integration/apis/security_solution/tls.ts
+++ b/x-pack/test/api_integration/apis/security_solution/tls.ts
@@ -12,7 +12,7 @@ import {
   NetworkTlsFields,
   FlowTarget,
   NetworkTlsStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts
index a6749b27030e1..bf30a39e80c89 100644
--- a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts
+++ b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   HostsQueries,
   HostsUncommonProcessesStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const FROM = '2000-01-01T00:00:00.000Z';
diff --git a/x-pack/test/api_integration/apis/security_solution/users.ts b/x-pack/test/api_integration/apis/security_solution/users.ts
index d592c99bf006f..f9c0cda614a7f 100644
--- a/x-pack/test/api_integration/apis/security_solution/users.ts
+++ b/x-pack/test/api_integration/apis/security_solution/users.ts
@@ -12,7 +12,7 @@ import {
   NetworkUsersFields,
   FlowTarget,
   NetworkUsersStrategyResponse,
-} from '../../../../plugins/security_solution/common/search_strategy';
+} from '@kbn/security-solution-plugin/common/search_strategy';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/api_integration/apis/telemetry/opt_in.ts b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
index c73f554f2074f..dafdac7e3f219 100644
--- a/x-pack/test/api_integration/apis/telemetry/opt_in.ts
+++ b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository';
+import { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/telemetry_repository';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry.ts b/x-pack/test/api_integration/apis/telemetry/telemetry.ts
index a41346c29c1a3..2f693a82db93e 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry.ts
@@ -9,22 +9,22 @@ import expect from '@kbn/expect';
 import moment from 'moment';
 import type SuperTest from 'supertest';
 import deepmerge from 'deepmerge';
-import type { FtrProviderContext } from '../../ftr_provider_context';
-import type { SecurityService } from '../../../../../test/common/services/security/security';
 
-import multiClusterFixture from './fixtures/multicluster.json';
-import basicClusterFixture from './fixtures/basiccluster.json';
-import ossRootTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_root.json';
-import xpackRootTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_root.json';
-import monitoringRootTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_monitoring.json';
-import ossPluginsTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_plugins.json';
-import xpackPluginsTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_plugins.json';
-import { assertTelemetryPayload } from '../../../../../test/api_integration/apis/telemetry/utils';
-import type { UnencryptedTelemetryPayload } from '../../../../../src/plugins/telemetry/common/types';
+import ossRootTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_root.json';
+import xpackRootTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_root.json';
+import monitoringRootTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_monitoring.json';
+import ossPluginsTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_plugins.json';
+import xpackPluginsTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_plugins.json';
+import type { UnencryptedTelemetryPayload } from '@kbn/telemetry-plugin/common/types';
 import type {
   UsageStatsPayload,
   CacheDetails,
-} from '../../../../../src/plugins/telemetry_collection_manager/server/types';
+} from '@kbn/telemetry-collection-manager-plugin/server/types';
+import { assertTelemetryPayload } from '../../../../../test/api_integration/apis/telemetry/utils';
+import basicClusterFixture from './fixtures/basiccluster.json';
+import multiClusterFixture from './fixtures/multicluster.json';
+import type { SecurityService } from '../../../../../test/common/services/security/security';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 function omitCacheDetails(usagePayload: Array<Record<string, unknown>>) {
   return usagePayload.map(({ cacheDetails, ...item }) => item);
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts b/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts
index 630fdef6a8d1f..4011efac6d758 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.ts
@@ -7,15 +7,15 @@
 
 import expect from '@kbn/expect';
 import deepmerge from 'deepmerge';
-import type { FtrProviderContext } from '../../ftr_provider_context';
+import ossRootTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_root.json';
+import ossPluginsTelemetrySchema from '@kbn/telemetry-plugin/schema/oss_plugins.json';
+import xpackRootTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_root.json';
+import xpackPluginsTelemetrySchema from '@kbn/telemetry-collection-xpack-plugin/schema/xpack_plugins.json';
 import {
   assertTelemetryPayload,
   flatKeys,
 } from '../../../../../test/api_integration/apis/telemetry/utils';
-import ossRootTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_root.json';
-import ossPluginsTelemetrySchema from '../../../../../src/plugins/telemetry/schema/oss_plugins.json';
-import xpackRootTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_root.json';
-import xpackPluginsTelemetrySchema from '../../../../plugins/telemetry_collection_xpack/schema/xpack_plugins.json';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 const disableCollection = {
   persistent: {
diff --git a/x-pack/test/api_integration/apis/transform/common.ts b/x-pack/test/api_integration/apis/transform/common.ts
index a4dcf5affcb2d..21001dfb9c8f0 100644
--- a/x-pack/test/api_integration/apis/transform/common.ts
+++ b/x-pack/test/api_integration/apis/transform/common.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PutTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
+import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
 
 export async function asyncForEach(array: any[], callback: Function) {
   for (let index = 0; index < array.length; index++) {
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 7f14081e5c574..541418889970f 100644
--- a/x-pack/test/api_integration/apis/transform/delete_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/delete_transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { DeleteTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/delete_transforms';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { DeleteTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/delete_transforms';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/reset_transforms.ts b/x-pack/test/api_integration/apis/transform/reset_transforms.ts
index f94a12e4d8e8a..4a219b2d2280a 100644
--- a/x-pack/test/api_integration/apis/transform/reset_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/reset_transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { ResetTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/reset_transforms';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { ResetTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/reset_transforms';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/start_transforms.ts b/x-pack/test/api_integration/apis/transform/start_transforms.ts
index 07a7f6715305a..682003fc6b825 100644
--- a/x-pack/test/api_integration/apis/transform/start_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/start_transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { StartTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/start_transforms';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { StartTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/start_transforms';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/stop_transforms.ts b/x-pack/test/api_integration/apis/transform/stop_transforms.ts
index af07dec07e547..302e53e1fbbae 100644
--- a/x-pack/test/api_integration/apis/transform/stop_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/stop_transforms.ts
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 
-import type { PutTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import type { StopTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/stop_transforms';
-import { isStopTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
+import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import type { StopTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/stop_transforms';
+import { isStopTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/transform/transforms.ts b/x-pack/test/api_integration/apis/transform/transforms.ts
index d962aa1f08eb2..88c9929f8ed73 100644
--- a/x-pack/test/api_integration/apis/transform/transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import type { GetTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { isGetTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
+import type { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { isGetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
 
diff --git a/x-pack/test/api_integration/apis/transform/transforms_nodes.ts b/x-pack/test/api_integration/apis/transform/transforms_nodes.ts
index ef39e963f137d..98ed88375c62a 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_nodes.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_nodes.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import type { GetTransformNodesResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { isGetTransformNodesResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
+import type { GetTransformNodesResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { isGetTransformNodesResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
 
diff --git a/x-pack/test/api_integration/apis/transform/transforms_preview.ts b/x-pack/test/api_integration/apis/transform/transforms_preview.ts
index ec35f04ab817c..6b1f636e051c6 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_preview.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_preview.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import type { PostTransformsPreviewRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
+import type { PostTransformsPreviewRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
diff --git a/x-pack/test/api_integration/apis/transform/transforms_stats.ts b/x-pack/test/api_integration/apis/transform/transforms_stats.ts
index 4d6b761a7828f..6343a2c9f002f 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_stats.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_stats.ts
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import type { GetTransformsStatsResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms_stats';
-import { isGetTransformsStatsResponseSchema } from '../../../../plugins/transform/common/api_schemas/type_guards';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import type { GetTransformsStatsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms_stats';
+import { isGetTransformsStatsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/type_guards';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
 import { USER } from '../../../functional/services/transform/security_common';
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts b/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts
index 7ca6fbc9ed4d5..90b0c52dbcc3e 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/cluster_settings.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts
index 57eb43068a5a0..59077c9ac2167 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.helpers.ts
@@ -10,7 +10,7 @@ import Chance from 'chance';
 import {
   DEPRECATION_LOGS_INDEX,
   DEPRECATION_LOGS_ORIGIN_FIELD,
-} from '../../../../plugins/upgrade_assistant/common/constants';
+} from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const chance = new Chance();
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts
index 66bf9a46d05d5..a9c79972de0b2 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecation_logs.ts
@@ -11,7 +11,7 @@ import {
   DEPRECATION_LOGS_ORIGIN_FIELD,
   APPS_WITH_DEPRECATION_LOGS,
   API_BASE_PATH,
-} from '../../../../plugins/upgrade_assistant/common/constants';
+} from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { initHelpers } from './es_deprecation_logs.helpers';
 
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts
index 7995408eeb1ce..796ac132f7c56 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/es_deprecations.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts b/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts
index 0a023c8a2065e..98784c70d07a2 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/node_disk_space.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts b/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts
index 9bac04bf1d48e..f005aa899b5a4 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/privileges.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { DEPRECATION_LOGS_INDEX } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DEPRECATION_LOGS_INDEX } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const security = getService('security');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts b/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts
index 412f5d2a0c7fd..b63a042455512 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/remote_clusters.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts b/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts
index cd85b048dc8f6..bf61ce885c0da 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/version_precheck.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { API_BASE_PATH } from '@kbn/upgrade-assistant-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_BASE_PATH } from '../../../../plugins/upgrade_assistant/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
index 9af6acf6a30af..c9c545cbad242 100644
--- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PINGS_DATE_RANGE_END, PINGS_DATE_RANGE_START } from './constants';
-import { API_URLS } from '../../../../plugins/uptime/common/constants';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
index 2658afd0d90d2..a7547d61992f2 100644
--- a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
+++ b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
@@ -7,9 +7,9 @@
 
 import moment from 'moment';
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { PINGS_DATE_RANGE_START, PINGS_DATE_RANGE_END } from './constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { API_URLS } from '../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts
index 54c8cbc6b07a9..379b740c22427 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/add_monitor.ts
@@ -6,10 +6,10 @@
  */
 import { omit } from 'lodash';
 import expect from '@kbn/expect';
-import { secretKeys } from '../../../../../plugins/uptime/common/constants/monitor_management';
-import { HTTPFields } from '../../../../../plugins/uptime/common/runtime_types';
+import { secretKeys } from '@kbn/uptime-plugin/common/constants/monitor_management';
+import { HTTPFields } from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { getFixtureJson } from './helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/certs.ts b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
index b9bc38801d394..8e76567bb13fb 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/certs.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
@@ -8,13 +8,13 @@
 import expect from '@kbn/expect';
 import moment from 'moment';
 import { isRight } from 'fp-ts/lib/Either';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { CertType } from '../../../../../plugins/uptime/common/runtime_types';
-import { makeChecksWithStatus } from './helper/make_checks';
+import { CertType } from '@kbn/uptime-plugin/common/runtime_types';
 import {
   processCertsResult,
   getCertsRequestBody,
-} from '../../../../../plugins/uptime/common/requests/get_certs_request_body';
+} from '@kbn/uptime-plugin/common/requests/get_certs_request_body';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { makeChecksWithStatus } from './helper/make_checks';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
index 2c215b7ba103c..e82759d581191 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { HTTPFields, MonitorFields } from '../../../../../plugins/uptime/common/runtime_types';
+import { HTTPFields, MonitorFields } from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { getFixtureJson } from './helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
index bccde2e6d9cb8..19b50a0d1a260 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
@@ -7,15 +7,9 @@
 
 import expect from '@kbn/expect';
 import { isRight } from 'fp-ts/lib/Either';
+import { DynamicSettingsType, DynamicSettings } from '@kbn/uptime-plugin/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS, API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import {
-  DynamicSettingsType,
-  DynamicSettings,
-} from '../../../../../plugins/uptime/common/runtime_types';
-import {
-  DYNAMIC_SETTINGS_DEFAULTS,
-  API_URLS,
-} from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts
index 4263d7aece810..81bcc58c9da85 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/edit_monitor.ts
@@ -6,15 +6,11 @@
  */
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
-import { SimpleSavedObject } from 'kibana/public';
-import { secretKeys } from '../../../../../plugins/uptime/common/constants/monitor_management';
-import {
-  ConfigKey,
-  HTTPFields,
-  MonitorFields,
-} from '../../../../../plugins/uptime/common/runtime_types';
+import { SimpleSavedObject } from '@kbn/core/public';
+import { secretKeys } from '@kbn/uptime-plugin/common/constants/monitor_management';
+import { ConfigKey, HTTPFields, MonitorFields } from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { getFixtureJson } from './helper/get_fixture_json';
 export default function ({ getService }: FtrProviderContext) {
   describe('[PUT] /internal/uptime/service/monitors', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts b/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts
index 0fd67b8cb3663..311c52eecb98d 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/get_monitor.ts
@@ -6,11 +6,11 @@
  */
 
 import expect from '@kbn/expect';
-import { SimpleSavedObject } from 'kibana/public';
-import { MonitorFields } from '../../../../../plugins/uptime/common/runtime_types';
+import { SimpleSavedObject } from '@kbn/core/public';
+import { MonitorFields } from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
+import { formatSecrets } from '@kbn/uptime-plugin/server/lib/synthetics_service/utils/secrets';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
-import { formatSecrets } from '../../../../../plugins/uptime/server/lib/synthetics_service/utils/secrets';
 import { getFixtureJson } from './helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index 61b1666b3e559..1ab5b6f2af082 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../../ftr_provider_context';
 import {
   settingsObjectId,
   settingsObjectType,
-} from '../../../../../plugins/uptime/server/lib/saved_objects/uptime_settings';
+} from '@kbn/uptime-plugin/server/lib/saved_objects/uptime_settings';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index_status.ts b/x-pack/test/api_integration/apis/uptime/rest/index_status.ts
index 23a98fef34d51..826569041a7bd 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index_status.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index_status.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('docCount query', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts
index 4fa0837e2e812..8606c81e94641 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_duration.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('monitor duration query', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
index 036d3ad856f57..9e4632f552a90 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_latest_status.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('get monitor latest status API', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
index c9fd7c76e6d22..54112045db13f 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { MonitorSummary } from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { makeChecksWithStatus } from './helper/make_checks';
-import { MonitorSummary } from '../../../../../plugins/uptime/common/runtime_types';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
index 68d17cf3a4dd2..cef035eafb77e 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 import { isRight } from 'fp-ts/lib/Either';
-import { FtrProviderContext } from '../../../ftr_provider_context';
 import {
   MonitorSummariesResult,
   MonitorSummariesResultType,
-} from '../../../../../plugins/uptime/common/runtime_types';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
+} from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 interface ExpectedMonitorStatesPage {
   response: any;
diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts
index fcc0873be9a76..bc30a932e77b2 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/ping_histogram.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('pingHistogram', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
index 7a0367728eed7..84d4af6f650be 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 import { isLeft } from 'fp-ts/lib/Either';
 import { PathReporter } from 'io-ts/lib/PathReporter';
-import { PingsResponseType } from '../../../../../plugins/uptime/common/runtime_types';
+import { PingsResponseType } from '@kbn/uptime-plugin/common/runtime_types';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 function decodePingsResponseData(response: any) {
   const decoded = PingsResponseType.decode(response);
diff --git a/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts b/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
index e7f604116e305..98954776cf2cf 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/snapshot.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { expectFixtureEql } from './helper/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { makeChecksWithStatus, getChecksDateRange } from './helper/make_checks';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts b/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts
index e9eff005afa3c..72a5422338ef6 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/synthetics_enablement.ts
@@ -6,15 +6,16 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
+import { serviceApiKeyPrivileges } from '@kbn/uptime-plugin/server/lib/synthetics_service/get_api_key';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
-import { serviceApiKeyPrivileges } from '../../../../../plugins/uptime/server/lib/synthetics_service/get_api_key';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('/internal/uptime/service/enablement', () => {
     const supertestWithAuth = getService('supertest');
     const supertest = getService('supertestWithoutAuth');
     const security = getService('security');
+    const kibanaServer = getService('kibanaServer');
 
     before(async () => {
       await supertestWithAuth.delete(API_URLS.SYNTHETICS_ENABLEMENT).set('kbn-xsrf', 'true');
@@ -311,6 +312,86 @@ export default function ({ getService }: FtrProviderContext) {
           await security.role.delete(roleName);
         }
       });
+
+      it('is space agnostic', async () => {
+        const username = 'admin';
+        const roleName = `synthetics_admin`;
+        const password = `${username}-password`;
+        const SPACE_ID = 'test-space';
+        const SPACE_NAME = 'test-space-name';
+        await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_NAME });
+        try {
+          await security.role.create(roleName, {
+            kibana: [
+              {
+                feature: {
+                  uptime: ['all'],
+                },
+                spaces: ['*'],
+              },
+            ],
+            elasticsearch: {
+              cluster: ['manage_security', ...serviceApiKeyPrivileges.cluster],
+              indices: serviceApiKeyPrivileges.index,
+            },
+          });
+
+          await security.user.create(username, {
+            password,
+            roles: [roleName],
+            full_name: 'a kibana user',
+          });
+
+          // can disable synthetics in default space when enabled in a non default space
+          await supertest
+            .post(`/s/${SPACE_ID}${API_URLS.SYNTHETICS_ENABLEMENT}`)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          await supertest
+            .delete(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          const apiResponse = await supertest
+            .get(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(apiResponse.body).eql({
+            areApiKeysEnabled: true,
+            canEnable: true,
+            isEnabled: false,
+          });
+
+          // can disable synthetics in non default space when enabled in default space
+          await supertest
+            .post(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          await supertest
+            .delete(`/s/${SPACE_ID}${API_URLS.SYNTHETICS_ENABLEMENT}`)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          const apiResponse2 = await supertest
+            .get(API_URLS.SYNTHETICS_ENABLEMENT)
+            .auth(username, password)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(apiResponse2.body).eql({
+            areApiKeysEnabled: true,
+            canEnable: true,
+            isEnabled: false,
+          });
+        } finally {
+          await security.user.delete(username);
+          await security.role.delete(roleName);
+        }
+      });
     });
   });
 }
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 e9aa339f62e14..cc493b31115a9 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
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { makeChecksWithStatus } from './helper/make_checks';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts
index ff257c152daa9..41716323ffd9e 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { API_URLS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../plugins/uptime/common/constants';
 import { makeChecksWithStatus } from './helper/make_checks';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/services/infraops_source_configuration.ts b/x-pack/test/api_integration/services/infraops_source_configuration.ts
index f78cc880a1d17..e3ec8ff0149b2 100644
--- a/x-pack/test/api_integration/services/infraops_source_configuration.ts
+++ b/x-pack/test/api_integration/services/infraops_source_configuration.ts
@@ -8,7 +8,7 @@
 import {
   PartialMetricsSourceConfiguration,
   MetricsSourceConfigurationResponse,
-} from '../../../plugins/infra/common/metrics_sources';
+} from '@kbn/infra-plugin/common/metrics_sources';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function InfraOpsSourceConfigurationProvider({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/services/usage_api.ts b/x-pack/test/api_integration/services/usage_api.ts
index c761cd0bc93e0..64089d0a9b8ef 100644
--- a/x-pack/test/api_integration/services/usage_api.ts
+++ b/x-pack/test/api_integration/services/usage_api.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { TelemetryCollectionManagerPlugin } from '@kbn/telemetry-collection-manager-plugin/server/plugin';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { TelemetryCollectionManagerPlugin } from '../../../../src/plugins/telemetry_collection_manager/server/plugin';
 
 export function UsageAPIProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts b/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
index 14a45b451b94f..3058fc3b66c6d 100644
--- a/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
+++ b/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 
+import { APP_ID } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   createUsersAndRoles,
@@ -20,7 +21,6 @@ import {
   getCase,
 } from '../../../cases_api_integration/common/lib/utils';
 import { getPostCaseRequest } from '../../../cases_api_integration/common/lib/mock';
-import { APP_ID } from '../../../../plugins/security_solution/common/constants';
 
 const secAll: Role = {
   name: 'sec_all_role',
diff --git a/x-pack/test/apm_api_integration/common/apm_api_supertest.ts b/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
index 1c829cbb94b41..86beb73d51ea3 100644
--- a/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
+++ b/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
@@ -8,12 +8,12 @@
 import { format } from 'url';
 import supertest from 'supertest';
 import request from 'superagent';
-import { parseEndpoint } from '../../../plugins/apm/common/apm_api/parse_endpoint';
+import { parseEndpoint } from '@kbn/apm-plugin/common/apm_api/parse_endpoint';
 import type {
   APIReturnType,
   APIClientRequestParamsOf,
-} from '../../../plugins/apm/public/services/rest/create_call_apm_api';
-import type { APIEndpoint } from '../../../plugins/apm/server';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import type { APIEndpoint } from '@kbn/apm-plugin/server';
 
 export function createApmApiClient(st: supertest.SuperTest<supertest.Test>) {
   return async <TEndpoint extends APIEndpoint>(
diff --git a/x-pack/test/apm_api_integration/common/authentication.ts b/x-pack/test/apm_api_integration/common/authentication.ts
index 001aea3224eaa..09390067ff4a9 100644
--- a/x-pack/test/apm_api_integration/common/authentication.ts
+++ b/x-pack/test/apm_api_integration/common/authentication.ts
@@ -6,8 +6,8 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
+import { PrivilegeType } from '@kbn/apm-plugin/common/privilege_type';
 import { SecurityServiceProvider } from '../../../../test/common/services/security';
-import { PrivilegeType } from '../../../plugins/apm/common/privilege_type';
 
 type SecurityService = Awaited<ReturnType<typeof SecurityServiceProvider>>;
 
diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
index c1829869641a9..da483d3127ad9 100644
--- a/x-pack/test/apm_api_integration/common/config.ts
+++ b/x-pack/test/apm_api_integration/common/config.ts
@@ -8,8 +8,8 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 import supertest from 'supertest';
 import { format, UrlObject } from 'url';
-import { SecurityServiceProvider } from 'test/common/services/security';
 import { Client } from '@elastic/elasticsearch';
+import { SecurityServiceProvider } from '../../../../test/common/services/security';
 import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
 import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
 import { APMFtrConfigName } from '../configs';
diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts
index ac59059e49d83..51f4bb6a84e72 100644
--- a/x-pack/test/apm_api_integration/common/registry.ts
+++ b/x-pack/test/apm_api_integration/common/registry.ts
@@ -8,8 +8,8 @@
 import Path from 'path';
 import { castArray, groupBy } from 'lodash';
 import callsites from 'callsites';
-import { maybe } from '../../../plugins/apm/common/utils/maybe';
-import { joinByKey } from '../../../plugins/apm/common/utils/join_by_key';
+import { maybe } from '@kbn/apm-plugin/common/utils/maybe';
+import { joinByKey } from '@kbn/apm-plugin/common/utils/join_by_key';
 import { APMFtrConfigName } from '../configs';
 import { FtrProviderContext } from './ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/common/synthtrace_es_client_service.ts b/x-pack/test/apm_api_integration/common/synthtrace_es_client_service.ts
index b5fe58907cbd8..79bfb6df25620 100644
--- a/x-pack/test/apm_api_integration/common/synthtrace_es_client_service.ts
+++ b/x-pack/test/apm_api_integration/common/synthtrace_es_client_service.ts
@@ -11,6 +11,8 @@ import { InheritedFtrProviderContext } from './ftr_provider_context';
 export async function synthtraceEsClientService(context: InheritedFtrProviderContext) {
   const es = context.getService('es');
 
-  const forceDataStreams = false;
-  return new apm.ApmSynthtraceEsClient(es, createLogger(LogLevel.info), forceDataStreams);
+  return new apm.ApmSynthtraceEsClient(es, createLogger(LogLevel.info), {
+    forceLegacyIndices: true,
+    refreshAfterIndex: true,
+  });
 }
diff --git a/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts b/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts
index bd03493039b49..3a42456742caa 100644
--- a/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts
+++ b/x-pack/test/apm_api_integration/common/utils/create_and_run_apm_ml_job.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import job from '../../../../plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/apm_tx_metrics.json';
-import datafeed from '../../../../plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_tx_metrics.json';
+import job from '@kbn/ml-plugin/server/models/data_recognizer/modules/apm_transaction/ml/apm_tx_metrics.json';
+import datafeed from '@kbn/ml-plugin/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_apm_tx_metrics.json';
 import { MlApi } from '../../../functional/services/ml/api';
 
 export function createAndRunApmMlJob({ ml, environment }: { ml: MlApi; environment: string }) {
diff --git a/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts b/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
index ded1bfa376009..f7c8d2e27eaaa 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
@@ -8,7 +8,7 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { range } from 'lodash';
-import { AlertType } from '../../../../plugins/apm/common/alert_types';
+import { AlertType } from '@kbn/apm-plugin/common/alert_types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createAndRunApmMlJob } from '../../common/utils/create_and_run_apm_ml_job';
 import { waitForRuleStatus } from './wait_for_rule_status';
@@ -43,7 +43,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const events = timerange(new Date(start).getTime(), new Date(end).getTime())
           .interval('1m')
           .rate(1)
-          .spans((timestamp) => {
+          .generator((timestamp) => {
             const isInSpike = timestamp >= spikeStart && timestamp < spikeEnd;
             const count = isInSpike ? 4 : NORMAL_RATE;
             const duration = isInSpike ? 1000 : NORMAL_DURATION;
@@ -56,7 +56,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                   .timestamp(timestamp)
                   .duration(duration)
                   .outcome(outcome)
-                  .serialize()
               ),
             ];
           });
diff --git a/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts b/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts
index e06c519a978ab..2fc0aaaead898 100644
--- a/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/anomalies/anomaly_charts.spec.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { range, omit } from 'lodash';
 import { apm, timerange } from '@elastic/apm-synthtrace';
+import { ServiceAnomalyTimeseries } from '@kbn/apm-plugin/common/anomaly_detection/service_anomaly_timeseries';
+import { ApmMlDetectorType } from '@kbn/apm-plugin/common/anomaly_detection/apm_ml_detectors';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { ApmApiError } from '../../common/apm_api_supertest';
-import { ServiceAnomalyTimeseries } from '../../../../plugins/apm/common/anomaly_detection/service_anomaly_timeseries';
-import { ApmMlDetectorType } from '../../../../plugins/apm/common/anomaly_detection/apm_ml_detectors';
 import { createAndRunApmMlJob } from '../../common/utils/create_and_run_apm_ml_job';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
@@ -103,7 +103,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const events = timerange(new Date(start).getTime(), new Date(end).getTime())
           .interval('1m')
           .rate(1)
-          .spans((timestamp) => {
+          .generator((timestamp) => {
             const isInSpike = timestamp >= spikeStart && timestamp < spikeEnd;
             const count = isInSpike ? 4 : NORMAL_RATE;
             const duration = isInSpike ? 1000 : NORMAL_DURATION;
@@ -116,14 +116,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                   .timestamp(timestamp)
                   .duration(duration)
                   .outcome(outcome)
-                  .serialize()
               ),
-              ...serviceB
+              serviceB
                 .transaction('tx', 'Worker')
                 .timestamp(timestamp)
                 .duration(duration)
-                .success()
-                .serialize(),
+                .success(),
             ];
           });
 
diff --git a/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts b/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts
index a942862891969..fad428a96f18a 100644
--- a/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/cold_start/cold_start.spec.ts
@@ -7,14 +7,14 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 import moment from 'moment';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { dataConfig, generateData } from './generate_data';
 import {
   APIReturnType,
   APIClientRequestParamsOf,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { dataConfig, generateData } from './generate_data';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 type ColdStartRate =
   APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate'>;
diff --git a/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts b/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts
index 4cd9026f6ac51..ed432f58d47aa 100644
--- a/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/cold_start_by_transaction_name.spec.ts
@@ -7,14 +7,14 @@
 import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 import moment from 'moment';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { dataConfig, generateData } from './generate_data';
 import {
   APIReturnType,
   APIClientRequestParamsOf,
-} from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../../plugins/apm/typings/common';
-import { isFiniteNumber } from '../../../../../plugins/apm/common/utils/is_finite_number';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { dataConfig, generateData } from './generate_data';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 type ColdStartRate =
   APIReturnType<'GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate_by_transaction_name'>;
diff --git a/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/generate_data.ts b/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/generate_data.ts
index 723083e932117..b77d879a65e98 100644
--- a/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/cold_start/cold_start_by_transaction_name/generate_data.ts
@@ -32,7 +32,7 @@ export async function generateData({
   const traceEvents = timerange(start, end)
     .interval('1m')
     .rate(coldStartRate)
-    .spans((timestamp) =>
+    .generator((timestamp) =>
       instance
         .transaction(transactionName)
         .defaults({
@@ -41,13 +41,12 @@ export async function generateData({
         .timestamp(timestamp)
         .duration(duration)
         .success()
-        .serialize()
     )
-    .concat(
+    .merge(
       timerange(start, end)
         .interval('1m')
         .rate(warmStartRate)
-        .spans((timestamp) =>
+        .generator((timestamp) =>
           instance
             .transaction(transactionName)
             .defaults({
@@ -56,7 +55,6 @@ export async function generateData({
             .timestamp(timestamp)
             .duration(duration)
             .success()
-            .serialize()
         )
     );
 
diff --git a/x-pack/test/apm_api_integration/tests/cold_start/generate_data.ts b/x-pack/test/apm_api_integration/tests/cold_start/generate_data.ts
index 1270f9bed02e8..6bae1110c5f35 100644
--- a/x-pack/test/apm_api_integration/tests/cold_start/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/cold_start/generate_data.ts
@@ -39,7 +39,7 @@ export async function generateData({
     timerange(start, end)
       .interval('1m')
       .rate(coldStartRate)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         instance
           .transaction(coldStartTransaction.name)
           .defaults({
@@ -48,12 +48,11 @@ export async function generateData({
           .timestamp(timestamp)
           .duration(coldStartTransaction.duration)
           .success()
-          .serialize()
       ),
     timerange(start, end)
       .interval('1m')
       .rate(warmStartRate)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         instance
           .transaction(warmStartTransaction.name)
           .defaults({
@@ -62,7 +61,6 @@ export async function generateData({
           .timestamp(timestamp)
           .duration(warmStartTransaction.duration)
           .success()
-          .serialize()
       ),
   ];
 
diff --git a/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts b/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
index 0a175762fe3e8..8fedcad2a6979 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import type { FailedTransactionsCorrelationsResponse } from '@kbn/apm-plugin/common/correlations/failed_transactions_correlations/types';
+import { EVENT_OUTCOME } from '@kbn/apm-plugin/common/elasticsearch_fieldnames';
+import { EventOutcome } from '@kbn/apm-plugin/common/event_outcome';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import type { FailedTransactionsCorrelationsResponse } from '../../../../plugins/apm/common/correlations/failed_transactions_correlations/types';
-import { EVENT_OUTCOME } from '../../../../plugins/apm/common/elasticsearch_fieldnames';
-import { EventOutcome } from '../../../../plugins/apm/common/event_outcome';
 
 // These tests go through the full sequence of queries required
 // to get the final results for a failed transactions correlation analysis.
diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts b/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
index 1cdd59777c1c5..3e46cd9c7c2b3 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
@@ -9,11 +9,11 @@ import { chunk } from 'lodash';
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 import type {
   LatencyCorrelation,
   LatencyCorrelationsResponse,
-} from '../../../../plugins/apm/common/correlations/latency_correlations/types';
+} from '@kbn/apm-plugin/common/correlations/latency_correlations/types';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // These tests go through the full sequence of queries required
 // to get the final results for a latency correlation analysis.
diff --git a/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts b/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts
index 64472022c4f99..0e5fb6d1c98fd 100644
--- a/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/data_view/static.spec.ts
@@ -7,7 +7,7 @@
 
 import { apm, ApmSynthtraceEsClient, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
-import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../plugins/apm/common/index_pattern_constants';
+import { APM_STATIC_INDEX_PATTERN_ID } from '@kbn/apm-plugin/common/index_pattern_constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { SupertestReturnType } from '../../common/apm_api_supertest';
 
@@ -142,8 +142,8 @@ function generateApmData(synthtrace: ApmSynthtraceEsClient) {
     range
       .interval('1s')
       .rate(1)
-      .spans((timestamp) =>
-        instance.transaction('GET /api').timestamp(timestamp).duration(30).success().serialize()
+      .generator((timestamp) =>
+        instance.transaction('GET /api').timestamp(timestamp).duration(30).success()
       ),
   ]);
 }
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/generate_data.ts b/x-pack/test/apm_api_integration/tests/dependencies/generate_data.ts
index b12dc10f8a874..ef6974af7efc8 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/generate_data.ts
@@ -37,7 +37,7 @@ export async function generateData({
     timerange(start, end)
       .interval('1m')
       .rate(rate)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         instance
           .transaction(transaction.name)
           .timestamp(timestamp)
@@ -51,7 +51,6 @@ export async function generateData({
               .destination(span.destination)
               .timestamp(timestamp)
           )
-          .serialize()
       )
   );
 }
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts b/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts
index 4445a6cbc31d3..bbec4088235c3 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/service_dependencies.spec.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { BackendNode } from '../../../../plugins/apm/common/connections';
+import { BackendNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts b/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
index 1b4b27c6b441b..b587cdd99b1c9 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { NodeType, BackendNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
-import { NodeType, BackendNode } from '../../../../plugins/apm/common/connections';
 import { roundNumber } from '../../utils';
 
 type TopDependencies = APIReturnType<'GET /internal/apm/backends/top_backends'>;
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts b/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts
index 0c730ebfb53ad..6822048e4e685 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/upstream_services.spec.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { ServiceNode } from '../../../../plugins/apm/common/connections';
+import { ServiceNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts b/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
index f8202a4c51699..205b5838e307d 100644
--- a/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
@@ -7,8 +7,8 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { mean, meanBy, sumBy } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
@@ -131,46 +131,42 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           timerange(start, end)
             .interval('1m')
             .rate(GO_PROD_LIST_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoProdInstance
                 .transaction(transactionNameProductList)
                 .timestamp(timestamp)
                 .duration(1000)
                 .success()
-                .serialize()
             ),
           timerange(start, end)
             .interval('1m')
             .rate(GO_PROD_LIST_ERROR_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoProdInstance
                 .transaction(transactionNameProductList)
                 .duration(1000)
                 .timestamp(timestamp)
                 .failure()
-                .serialize()
             ),
           timerange(start, end)
             .interval('1m')
             .rate(GO_PROD_ID_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoProdInstance
                 .transaction(transactionNameProductId)
                 .timestamp(timestamp)
                 .duration(1000)
                 .success()
-                .serialize()
             ),
           timerange(start, end)
             .interval('1m')
             .rate(GO_PROD_ID_ERROR_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoProdInstance
                 .transaction(transactionNameProductId)
                 .duration(1000)
                 .timestamp(timestamp)
                 .failure()
-                .serialize()
             ),
         ]);
       });
diff --git a/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts
index b943952a1b68e..7f7aa7a85d407 100644
--- a/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/error_rate/service_maps.spec.ts
@@ -80,46 +80,42 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_LIST_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction(transactionNameProductList, 'Worker')
                   .timestamp(timestamp)
                   .duration(1000)
                   .success()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_LIST_ERROR_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction(transactionNameProductList, 'Worker')
                   .duration(1000)
                   .timestamp(timestamp)
                   .failure()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_ID_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction(transactionNameProductId)
                   .timestamp(timestamp)
                   .duration(1000)
                   .success()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_ID_ERROR_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction(transactionNameProductId)
                   .duration(1000)
                   .timestamp(timestamp)
                   .failure()
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts b/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
index 9511284aba455..4cd338441eefa 100644
--- a/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
@@ -6,12 +6,12 @@
  */
 import expect from '@kbn/expect';
 import { first, last, sumBy } from 'lodash';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { config, generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
index 7ce10da82c1d5..49f4877231731 100644
--- a/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
@@ -9,8 +9,8 @@ import { apm, timerange } from '@elastic/apm-synthtrace';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 type ErrorGroups =
@@ -79,48 +79,44 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(appleTransaction.successRate)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceInstance
                   .transaction(appleTransaction.name)
                   .timestamp(timestamp)
                   .duration(1000)
                   .success()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(appleTransaction.failureRate)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceInstance
                   .transaction(appleTransaction.name)
                   .errors(serviceInstance.error('error 1', 'foo').timestamp(timestamp))
                   .duration(1000)
                   .timestamp(timestamp)
                   .failure()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(bananaTransaction.successRate)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceInstance
                   .transaction(bananaTransaction.name)
                   .timestamp(timestamp)
                   .duration(1000)
                   .success()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(bananaTransaction.failureRate)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceInstance
                   .transaction(bananaTransaction.name)
                   .errors(serviceInstance.error('error 2', 'bar').timestamp(timestamp))
                   .duration(1000)
                   .timestamp(timestamp)
                   .failure()
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/errors/generate_data.ts b/x-pack/test/apm_api_integration/tests/errors/generate_data.ts
index 2daef094691f5..2f0c95ddc5d77 100644
--- a/x-pack/test/apm_api_integration/tests/errors/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/generate_data.ts
@@ -41,19 +41,18 @@ export async function generateData({
     return timerange(start, end)
       .interval(interval)
       .rate(transaction.successRate)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         serviceGoProdInstance
           .transaction(transaction.name)
           .timestamp(timestamp)
           .duration(1000)
           .success()
-          .serialize()
       )
-      .concat(
+      .merge(
         timerange(start, end)
           .interval(interval)
           .rate(transaction.failureRate)
-          .spans((timestamp) =>
+          .generator((timestamp) =>
             serviceGoProdInstance
               .transaction(transaction.name)
               .errors(
@@ -62,7 +61,6 @@ export async function generateData({
               .duration(1000)
               .timestamp(timestamp)
               .failure()
-              .serialize()
           )
       );
   });
diff --git a/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts b/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
index 14de478afe4f9..af9a3d01f08a7 100644
--- a/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
@@ -8,8 +8,8 @@ import expect from '@kbn/expect';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { config, generateData } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts b/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
index d1cc42a4c7c9d..4e82dc3509823 100644
--- a/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { PROCESSOR_EVENT } from '../../../../plugins/apm/common/elasticsearch_fieldnames';
-import { ProcessorEvent } from '../../../../plugins/apm/common/processor_event';
+import { PROCESSOR_EVENT } from '@kbn/apm-plugin/common/elasticsearch_fieldnames';
+import { ProcessorEvent } from '@kbn/apm-plugin/common/processor_event';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts b/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
index bd47450d26ccf..3ba46802d6ee7 100644
--- a/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
@@ -7,8 +7,8 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { meanBy, sumBy } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
@@ -133,22 +133,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           timerange(start, end)
             .interval('1m')
             .rate(GO_PROD_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoProdInstance
                 .transaction('GET /api/product/list')
                 .duration(GO_PROD_DURATION)
                 .timestamp(timestamp)
-                .serialize()
             ),
           timerange(start, end)
             .interval('1m')
             .rate(GO_DEV_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoDevInstance
                 .transaction('GET /api/product/:id')
                 .duration(GO_DEV_DURATION)
                 .timestamp(timestamp)
-                .serialize()
             ),
         ]);
       });
diff --git a/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts
index 23978d2682fc4..dc150d598b7a7 100644
--- a/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/latency/service_maps.spec.ts
@@ -79,22 +79,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction('GET /api/product/list', 'Worker')
                   .duration(GO_PROD_DURATION)
                   .timestamp(timestamp)
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_DEV_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoDevInstance
                   .transaction('GET /api/product/:id')
                   .duration(GO_DEV_DURATION)
                   .timestamp(timestamp)
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
index def2e2a4c48e5..92e7c8a80bcb1 100644
--- a/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { first } from 'lodash';
-import { GenericMetricsChart } from '../../../../plugins/apm/server/routes/metrics/fetch_and_transform_metrics';
+import { GenericMetricsChart } from '@kbn/apm-plugin/server/routes/metrics/fetch_and_transform_metrics';
 import { SupertestReturnType } from '../../common/apm_api_supertest';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
index ec31e520970ae..90c08433b6ab5 100644
--- a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
@@ -106,32 +106,29 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction('GET /api/product/list')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_DEV_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoDevInstance
                   .transaction('GET /api/product/:id')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(JAVA_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceJavaInstance
                   .transaction('POST /api/product/buy')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
index 454b129464c00..347dad2295565 100644
--- a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { first, isEmpty, last, orderBy, uniq } from 'lodash';
-import { ServiceConnectionNode } from '../../../../plugins/apm/common/service_map';
+import { ServiceConnectionNode } from '@kbn/apm-plugin/common/service_map';
 import { ApmApiError, SupertestReturnType } from '../../common/apm_api_supertest';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
diff --git a/x-pack/test/apm_api_integration/tests/service_nodes/get_service_nodes.spec.ts b/x-pack/test/apm_api_integration/tests/service_nodes/get_service_nodes.spec.ts
index 87207211c6ca8..e65de89eded70 100644
--- a/x-pack/test/apm_api_integration/tests/service_nodes/get_service_nodes.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_nodes/get_service_nodes.spec.ts
@@ -58,7 +58,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           timerange(start, end)
             .interval('1m')
             .rate(1)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               instance
                 .appMetrics({
                   'system.process.cpu.total.norm.pct': 1,
@@ -67,7 +67,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                   'jvm.thread.count': 25,
                 })
                 .timestamp(timestamp)
-                .serialize()
             )
         );
       });
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
index cbb76183f9a00..af04672913038 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
@@ -8,13 +8,13 @@
 import expect from '@kbn/expect';
 import { last, omit, pick, sortBy } from 'lodash';
 import { ValuesType } from 'utility-types';
-import { Node, NodeType } from '../../../../../plugins/apm/common/connections';
-import { roundNumber } from '../../../utils';
+import { Node, NodeType } from '@kbn/apm-plugin/common/connections';
 import {
   ENVIRONMENT_ALL,
   ENVIRONMENT_NOT_DEFINED,
-} from '../../../../../plugins/apm/common/environment_filter_values';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
+} from '@kbn/apm-plugin/common/environment_filter_values';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { roundNumber } from '../../../utils';
 import archives from '../../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { apmDependenciesMapping, createServiceDependencyDocs } from './es_utils';
@@ -267,7 +267,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const lastValue = roundNumber(last(opbeansNode?.currentStats.latency.timeseries)?.y);
 
         expect(firstValue).to.be(roundNumber(20 / 3));
-        expect(lastValue).to.be('1.000');
+        expect(lastValue).to.be(1);
       });
 
       it('returns postgres as an external dependency', () => {
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts b/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
index 3d07f3feacdd2..8736b46f73459 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { take } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
 import { ApmServices } from '../../common/config';
 
 export async function getServiceNodeIds({
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
index 99c2585162fdf..7f4c0d643bf10 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
@@ -6,9 +6,9 @@
  */
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
 import { getServiceNodeIds } from './get_service_node_ids';
 
 type ServiceOverviewInstanceDetails =
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
index 653a96ad79b3b..6e007fd9b2ebd 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import moment from 'moment';
-import { Coordinate } from '../../../../plugins/apm/typings/timeseries';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { Coordinate } from '@kbn/apm-plugin/typings/timeseries';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
 import { getServiceNodeIds } from './get_service_node_ids';
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
index 37e0d65ff9411..eef162dd086cb 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
@@ -9,14 +9,14 @@ import expect from '@kbn/expect';
 import { pick, sortBy } from 'lodash';
 import moment from 'moment';
 import { apm, timerange } from '@elastic/apm-synthtrace';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import archives from '../../common/fixtures/es_archiver/archives_metadata';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { ENVIRONMENT_ALL } from '../../../../plugins/apm/common/environment_filter_values';
-import { SERVICE_NODE_NAME_MISSING } from '../../../../plugins/apm/common/service_nodes';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { ENVIRONMENT_ALL } from '@kbn/apm-plugin/common/environment_filter_values';
+import { SERVICE_NODE_NAME_MISSING } from '@kbn/apm-plugin/common/service_nodes';
+import archives from '../../common/fixtures/es_archiver/archives_metadata';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const registry = getService('registry');
@@ -319,41 +319,37 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           }
 
           return synthtraceEsClient.index([
-            interval.rate(GO_A_INSTANCE_RATE_SUCCESS).spans((timestamp) =>
+            interval.rate(GO_A_INSTANCE_RATE_SUCCESS).generator((timestamp) =>
               goInstanceA
                 .transaction('GET /api/product/list')
                 .success()
                 .duration(500)
                 .timestamp(timestamp)
                 .children(...withSpans(timestamp))
-                .serialize()
             ),
-            interval.rate(GO_A_INSTANCE_RATE_FAILURE).spans((timestamp) =>
+            interval.rate(GO_A_INSTANCE_RATE_FAILURE).generator((timestamp) =>
               goInstanceA
                 .transaction('GET /api/product/list')
                 .failure()
                 .duration(500)
                 .timestamp(timestamp)
                 .children(...withSpans(timestamp))
-                .serialize()
             ),
-            interval.rate(GO_B_INSTANCE_RATE_SUCCESS).spans((timestamp) =>
+            interval.rate(GO_B_INSTANCE_RATE_SUCCESS).generator((timestamp) =>
               goInstanceB
                 .transaction('GET /api/product/list')
                 .success()
                 .duration(500)
                 .timestamp(timestamp)
                 .children(...withSpans(timestamp))
-                .serialize()
             ),
-            interval.rate(JAVA_INSTANCE_RATE).spans((timestamp) =>
+            interval.rate(JAVA_INSTANCE_RATE).generator((timestamp) =>
               javaInstance
                 .transaction('GET /api/product/list')
                 .success()
                 .duration(500)
                 .timestamp(timestamp)
                 .children(...withSpans(timestamp))
-                .serialize()
             ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts b/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
index ad261055c8006..68f82c7357dc0 100644
--- a/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
index 8867327ac418a..c0ae9e24c830e 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 import { first, last, sumBy } from 'lodash';
 import moment from 'moment';
-import { isFiniteNumber } from '../../../../../plugins/apm/common/utils/is_finite_number';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { config, generateData } from './generate_data';
 import { getErrorGroupIds } from './get_error_group_ids';
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
index 43df9a5c4ec5e..df86dc2bda16f 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
@@ -9,8 +9,8 @@ import moment from 'moment';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { generateData, config } from './generate_data';
 
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/generate_data.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/generate_data.ts
index 658c8d89e3385..11d180e3b8c2a 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups/generate_data.ts
@@ -45,48 +45,44 @@ export async function generateData({
     timerange(start, end)
       .interval('1m')
       .rate(PROD_LIST_RATE)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         serviceGoProdInstance
           .transaction(transactionNameProductList)
           .timestamp(timestamp)
           .duration(1000)
           .success()
-          .serialize()
       ),
     timerange(start, end)
       .interval('1m')
       .rate(PROD_LIST_ERROR_RATE)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         serviceGoProdInstance
           .transaction(transactionNameProductList)
           .errors(serviceGoProdInstance.error(ERROR_NAME_1, 'foo').timestamp(timestamp))
           .duration(1000)
           .timestamp(timestamp)
           .failure()
-          .serialize()
       ),
     timerange(start, end)
       .interval('1m')
       .rate(PROD_ID_RATE)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         serviceGoProdInstance
           .transaction(transactionNameProductId)
           .timestamp(timestamp)
           .duration(1000)
           .success()
-          .serialize()
       ),
     timerange(start, end)
       .interval('1m')
       .rate(PROD_ID_ERROR_RATE)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         serviceGoProdInstance
           .transaction(transactionNameProductId)
           .errors(serviceGoProdInstance.error(ERROR_NAME_2, 'bar').timestamp(timestamp))
           .duration(1000)
           .timestamp(timestamp)
           .failure()
-          .serialize()
       ),
   ]);
 }
diff --git a/x-pack/test/apm_api_integration/tests/services/get_service_node_metadata.spec.ts b/x-pack/test/apm_api_integration/tests/services/get_service_node_metadata.spec.ts
index b5bbd3a565a84..61a25e3bffaab 100644
--- a/x-pack/test/apm_api_integration/tests/services/get_service_node_metadata.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/get_service_node_metadata.spec.ts
@@ -62,13 +62,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           timerange(start, end)
             .interval('1m')
             .rate(1)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               instance
                 .transaction('GET /api/product/list')
                 .timestamp(timestamp)
                 .duration(1000)
                 .success()
-                .serialize()
             )
         );
       });
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details/generate_data.ts b/x-pack/test/apm_api_integration/tests/services/service_details/generate_data.ts
index d0c29823e4f26..d088600c94ab2 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_details/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_details/generate_data.ts
@@ -71,7 +71,7 @@ export async function generateData({
     timerange(start, end)
       .interval('30s')
       .rate(rate)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         instance
           .transaction(transaction.name)
           .timestamp(timestamp)
@@ -94,12 +94,11 @@ export async function generateData({
           })
           .duration(transaction.duration)
           .success()
-          .serialize()
       ),
     timerange(start, end)
       .interval('30s')
       .rate(rate)
-      .spans((timestamp) =>
+      .generator((timestamp) =>
         instance
           .transaction(transaction.name)
           .timestamp(timestamp)
@@ -122,7 +121,6 @@ export async function generateData({
           })
           .duration(transaction.duration)
           .success()
-          .serialize()
       ),
   ];
 
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts b/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
index cf59b0d39660d..c53c9f9f16e86 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_details/service_details.spec.ts
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 import { first } from 'lodash';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
 
 type ServiceDetails = APIReturnType<'GET /internal/apm/services/{serviceName}/metadata/details'>;
 
diff --git a/x-pack/test/apm_api_integration/tests/services/service_icons/generate_data.ts b/x-pack/test/apm_api_integration/tests/services/service_icons/generate_data.ts
index fc94368acc8e7..b779c584167b3 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_icons/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_icons/generate_data.ts
@@ -38,7 +38,7 @@ export async function generateData({
   const traceEvents = timerange(start, end)
     .interval('30s')
     .rate(rate)
-    .spans((timestamp) =>
+    .generator((timestamp) =>
       instance
         .transaction(transaction.name)
         .defaults({
@@ -49,7 +49,6 @@ export async function generateData({
         .timestamp(timestamp)
         .duration(transaction.duration)
         .success()
-        .serialize()
     );
 
   await synthtraceEsClient.index(traceEvents);
diff --git a/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts b/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts
index 389b8c6ac1fc8..11cb59fff0756 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_icons/service_icons.spec.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import { dataConfig, generateData } from './generate_data';
-import { APIReturnType } from '../../../../../plugins/apm/public/services/rest/create_call_apm_api';
 
 type ServiceIconMetadata = APIReturnType<'GET /internal/apm/services/{serviceName}/metadata/icons'>;
 
diff --git a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
index edb2d7d79315f..feb9aa8b8e5c4 100644
--- a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
@@ -7,10 +7,10 @@
 import expect from '@kbn/expect';
 import url from 'url';
 import moment from 'moment';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
 
 type ServicesDetailedStatisticsReturn =
   APIReturnType<'GET /internal/apm/services/detailed_statistics'>;
diff --git a/x-pack/test/apm_api_integration/tests/services/sorted_and_filtered_services.spec.ts b/x-pack/test/apm_api_integration/tests/services/sorted_and_filtered_services.spec.ts
index b529ab36c5637..b0e29debb62af 100644
--- a/x-pack/test/apm_api_integration/tests/services/sorted_and_filtered_services.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/sorted_and_filtered_services.spec.ts
@@ -67,19 +67,17 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const eventsWithinTimerange = timerange(new Date(start).getTime(), new Date(end).getTime())
           .interval('15m')
           .rate(1)
-          .spans((timestamp) => {
+          .generator((timestamp) => {
             const isInSpike = spikeStart <= timestamp && spikeEnd >= timestamp;
             return [
-              ...serviceA
+              serviceA
                 .transaction('GET /api')
                 .duration(isInSpike ? 1000 : 1100)
-                .timestamp(timestamp)
-                .serialize(),
-              ...serviceB
+                .timestamp(timestamp),
+              serviceB
                 .transaction('GET /api')
                 .duration(isInSpike ? 1000 : 4000)
-                .timestamp(timestamp)
-                .serialize(),
+                .timestamp(timestamp),
             ];
           });
 
@@ -89,15 +87,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         )
           .interval('15m')
           .rate(1)
-          .spans((timestamp) => {
-            return serviceC
-              .transaction('GET /api', 'custom')
-              .duration(1000)
-              .timestamp(timestamp)
-              .serialize();
+          .generator((timestamp) => {
+            return serviceC.transaction('GET /api', 'custom').duration(1000).timestamp(timestamp);
           });
 
-        await synthtraceClient.index(eventsWithinTimerange.concat(eventsOutsideOfTimerange));
+        await synthtraceClient.index(eventsWithinTimerange.merge(eventsOutsideOfTimerange));
 
         await Promise.all([
           createAndRunApmMlJob({ environment: 'production', ml }),
diff --git a/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts b/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
index f319f3566a551..b7aa922549092 100644
--- a/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
@@ -9,12 +9,12 @@ import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { first, last, meanBy } from 'lodash';
 import moment from 'moment';
-import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
 import {
   APIClientRequestParamsOf,
   APIReturnType,
-} from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
-import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -88,32 +88,29 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction('GET /api/product/list')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_DEV_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoDevInstance
                   .transaction('GET /api/product/:id')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(JAVA_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceJavaInstance
                   .transaction('POST /api/product/buy')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts b/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
index 3d46a022ff8ed..2642553b2dfd8 100644
--- a/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { sortBy } from 'lodash';
 import { apm, timerange } from '@elastic/apm-synthtrace';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { ENVIRONMENT_ALL } from '@kbn/apm-plugin/common/environment_filter_values';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
-import { ENVIRONMENT_ALL } from '../../../../plugins/apm/common/environment_filter_values';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const registry = getService('registry');
@@ -98,36 +98,33 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         return synthtrace.index([
           transactionInterval
             .rate(config.multiple.prod.rps)
-            .spans((timestamp) => [
-              ...multipleEnvServiceProdInstance
+            .generator((timestamp) =>
+              multipleEnvServiceProdInstance
                 .transaction('GET /api')
                 .timestamp(timestamp)
                 .duration(config.multiple.prod.duration)
                 .success()
-                .serialize(),
-            ]),
+            ),
           transactionInterval
             .rate(config.multiple.dev.rps)
-            .spans((timestamp) => [
-              ...multipleEnvServiceDevInstance
+            .generator((timestamp) =>
+              multipleEnvServiceDevInstance
                 .transaction('GET /api')
                 .timestamp(timestamp)
                 .duration(config.multiple.dev.duration)
                 .failure()
-                .serialize(),
-            ]),
+            ),
           transactionInterval
             .rate(config.multiple.prod.rps)
-            .spans((timestamp) => [
-              ...multipleEnvServiceDevInstance
+            .generator((timestamp) =>
+              multipleEnvServiceDevInstance
                 .transaction('non-request', 'rpc')
                 .timestamp(timestamp)
                 .duration(config.multiple.prod.duration)
                 .success()
-                .serialize(),
-            ]),
-          metricInterval.rate(1).spans((timestamp) => [
-            ...metricOnlyInstance
+            ),
+          metricInterval.rate(1).generator((timestamp) =>
+            metricOnlyInstance
               .appMetrics({
                 'system.memory.actual.free': 1,
                 'system.cpu.total.norm.pct': 1,
@@ -135,13 +132,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 'system.process.cpu.total.norm.pct': 1,
               })
               .timestamp(timestamp)
-              .serialize(),
-          ]),
+          ),
           errorInterval
             .rate(1)
-            .spans((timestamp) => [
-              ...errorOnlyInstance.error('Foo').timestamp(timestamp).serialize(),
-            ]),
+            .generator((timestamp) => errorOnlyInstance.error('Foo').timestamp(timestamp)),
         ]);
       });
 
diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
index f77a901b4ffa3..ecf5b87e82d70 100644
--- a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
@@ -9,8 +9,8 @@ import { inspect } from 'util';
 
 import expect from '@kbn/expect';
 import { omit, orderBy } from 'lodash';
-import { AgentConfigurationIntake } from '../../../../plugins/apm/common/agent_configuration/configuration_types';
-import { AgentConfigSearchParams } from '../../../../plugins/apm/server/routes/settings/agent_configuration/route';
+import { AgentConfigurationIntake } from '@kbn/apm-plugin/common/agent_configuration/configuration_types';
+import { AgentConfigSearchParams } from '@kbn/apm-plugin/server/routes/settings/agent_configuration/route';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts b/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
index 71c0f593cf9f9..4a32ef4a023a6 100644
--- a/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/agent_keys/agent_keys.spec.ts
@@ -6,8 +6,8 @@
  */
 import expect from '@kbn/expect';
 import { first } from 'lodash';
+import { PrivilegeType } from '@kbn/apm-plugin/common/privilege_type';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { PrivilegeType } from '../../../../../plugins/apm/common/privilege_type';
 import { ApmApiError, ApmApiSupertest } from '../../../common/apm_api_supertest';
 import { ApmUser } from '../../../common/authentication';
 
diff --git a/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts b/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
index aeb110dc1faf2..4220a04b02ef1 100644
--- a/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CustomLink } from '../../../../plugins/apm/common/custom_link/custom_link_types';
+import { CustomLink } from '@kbn/apm-plugin/common/custom_link/custom_link_types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { ApmApiError } from '../../common/apm_api_supertest';
 
diff --git a/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts b/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
index 0cd16e5652f65..74bdc860bfba3 100644
--- a/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
@@ -8,7 +8,7 @@ import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
   TRANSACTION_TYPE,
-} from '../../../../plugins/apm/common/elasticsearch_fieldnames';
+} from '@kbn/apm-plugin/common/elasticsearch_fieldnames';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function suggestionsTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
index 9b24a73a50ee2..ee7c27aa6ddd4 100644
--- a/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
@@ -7,7 +7,7 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { meanBy, sumBy } from 'lodash';
-import { BackendNode, ServiceNode } from '../../../../plugins/apm/common/connections';
+import { BackendNode, ServiceNode } from '@kbn/apm-plugin/common/connections';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -104,7 +104,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction('GET /api/product/list')
                   .duration(1000)
@@ -130,12 +130,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                       .success()
                       .timestamp(timestamp)
                   )
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(JAVA_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceJavaInstance
                   .transaction('POST /api/product/buy')
                   .duration(1000)
@@ -153,7 +152,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                       .success()
                       .timestamp(timestamp)
                   )
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts b/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
index f460bb700caff..566281b59a6af 100644
--- a/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
@@ -7,7 +7,7 @@
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { meanBy, sumBy } from 'lodash';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -119,22 +119,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           timerange(start, end)
             .interval('1m')
             .rate(GO_PROD_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoProdInstance
                 .transaction('GET /api/product/list')
                 .duration(1000)
                 .timestamp(timestamp)
-                .serialize()
             ),
           timerange(start, end)
             .interval('1m')
             .rate(GO_DEV_RATE)
-            .spans((timestamp) =>
+            .generator((timestamp) =>
               serviceGoDevInstance
                 .transaction('GET /api/product/:id')
                 .duration(1000)
                 .timestamp(timestamp)
-                .serialize()
             ),
         ]);
       });
diff --git a/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts b/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts
index 147371be3d64e..670881d783514 100644
--- a/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/throughput/service_maps.spec.ts
@@ -6,7 +6,6 @@
  */
 import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
-import { meanBy } from 'lodash';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -19,12 +18,23 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   const start = new Date('2021-01-01T00:00:00.000Z').getTime();
   const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
 
+  const commonQuery = {
+    start: new Date(start).toISOString(),
+    end: new Date(end).toISOString(),
+    environment: 'ENVIRONMENT_ALL',
+  };
+
+  async function callApi() {
+    return await apmApiClient.readUser({
+      endpoint: `GET /internal/apm/service-map/service/{serviceName}`,
+      params: {
+        path: { serviceName },
+        query: commonQuery,
+      },
+    });
+  }
+
   async function getThroughputValues(processorEvent: 'transaction' | 'metric') {
-    const commonQuery = {
-      start: new Date(start).toISOString(),
-      end: new Date(end).toISOString(),
-      environment: 'ENVIRONMENT_ALL',
-    };
     const [serviceInventoryAPIResponse, serviceMapsNodeDetails] = await Promise.all([
       apmApiClient.readUser({
         endpoint: 'GET /internal/apm/services',
@@ -46,10 +56,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     const serviceInventoryThroughput = serviceInventoryAPIResponse.body.items[0].throughput;
 
-    const serviceMapsNodeDetailsThroughput = meanBy(
-      serviceMapsNodeDetails.body.currentPeriod.transactionStats?.throughput?.timeseries,
-      'y'
-    );
+    const serviceMapsNodeDetailsThroughput =
+      serviceMapsNodeDetails.body.currentPeriod.transactionStats?.throughput?.value;
 
     return {
       serviceInventoryThroughput,
@@ -79,22 +87,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
-                  .transaction('GET /api/product/list', 'Worker')
+                  .transaction('GET /apple 🍎 ', 'Worker')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_DEV_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoDevInstance
-                  .transaction('GET /api/product/:id')
+                  .transaction('GET /apple 🍎 ')
                   .duration(1000)
                   .timestamp(timestamp)
-                  .serialize()
               ),
           ]);
         });
@@ -113,7 +119,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             [
               ...Object.values(throughputTransactionValues),
               ...Object.values(throughputMetricValues),
-            ].forEach((value) => expect(roundNumber(value)).to.be.equal(roundNumber(GO_DEV_RATE)));
+            ].forEach((value) => expect(roundNumber(value)).to.be.equal(GO_DEV_RATE));
+          });
+        });
+
+        describe('when calling service maps transactions stats api', () => {
+          let serviceMapsNodeThroughput: number | null | undefined;
+          before(async () => {
+            const response = await callApi();
+            serviceMapsNodeThroughput =
+              response.body.currentPeriod.transactionStats?.throughput?.value;
+          });
+
+          it('returns expected throughput value', () => {
+            expect(roundNumber(serviceMapsNodeThroughput)).to.be.equal(GO_DEV_RATE);
           });
         });
       });
diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
index 8790e4325f820..54e8c442e7978 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import { first, last } from 'lodash';
 import { format } from 'url';
 import moment from 'moment';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
index 7a78fe2742ef5..b5d9ba8102b79 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import url from 'url';
 import moment from 'moment';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
index 0895c20371cc1..8087b781eb395 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import qs from 'querystring';
 import { sortBy } from 'lodash';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import archives_metadata from '../../common/fixtures/es_archiver/archives_metadata';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
index 587206cb46a64..770924dd1cf98 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
@@ -8,9 +8,9 @@ import { apm, timerange } from '@elastic/apm-synthtrace';
 import expect from '@kbn/expect';
 import { first, isEmpty, last, meanBy } from 'lodash';
 import moment from 'moment';
-import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
-import { asPercent } from '../../../../plugins/apm/common/utils/formatters';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { LatencyAggregationType } from '@kbn/apm-plugin/common/latency_aggregation_types';
+import { asPercent } from '@kbn/apm-plugin/common/utils/formatters';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { roundNumber } from '../../utils';
 
@@ -93,24 +93,22 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction(transactionName)
                   .timestamp(timestamp)
                   .duration(1000)
                   .success()
-                  .serialize()
               ),
             timerange(start, end)
               .interval('1m')
               .rate(GO_PROD_ERROR_RATE)
-              .spans((timestamp) =>
+              .generator((timestamp) =>
                 serviceGoProdInstance
                   .transaction(transactionName)
                   .duration(1000)
                   .timestamp(timestamp)
                   .failure()
-                  .serialize()
               ),
           ]);
         });
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
index 56719588b439b..c7e07e6b48b1b 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { pick, sum } from 'lodash';
 import url from 'url';
-import { APIReturnType } from '../../../../plugins/apm/public/services/rest/create_call_apm_api';
+import { APIReturnType } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
 
diff --git a/x-pack/test/apm_api_integration/utils.ts b/x-pack/test/apm_api_integration/utils.ts
index 0fb99e2aa3c7c..8cb818faac52d 100644
--- a/x-pack/test/apm_api_integration/utils.ts
+++ b/x-pack/test/apm_api_integration/utils.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { Coordinate } from '../../plugins/apm/typings/timeseries';
-import { isFiniteNumber } from '../../plugins/apm/common/utils/is_finite_number';
-import { Maybe } from '../../plugins/apm/typings/common';
+import { Coordinate } from '@kbn/apm-plugin/typings/timeseries';
+import { isFiniteNumber } from '@kbn/apm-plugin/common/utils/is_finite_number';
+import { Maybe } from '@kbn/apm-plugin/typings/common';
 
 export function roundNumber(num: Maybe<number>) {
-  return isFiniteNumber(num) ? num.toPrecision(4) : '';
+  return isFiniteNumber(num) ? Number(num.toPrecision(4)) : null;
 }
 
 export function removeEmptyCoordinates(coordinates: Coordinate[]) {
diff --git a/x-pack/test/cases_api_integration/common/config.ts b/x-pack/test/cases_api_integration/common/config.ts
index a59b78d87ebe5..803327cd037d3 100644
--- a/x-pack/test/cases_api_integration/common/config.ts
+++ b/x-pack/test/cases_api_integration/common/config.ts
@@ -94,7 +94,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     );
 
     return {
-      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
+      testFiles,
       servers,
       services,
       junit: {
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
index d39c2f2e714df..50d0aa6df9b82 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { FixturePlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
index 8bb361fba4440..ea42b988d2f26 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from 'kibana/server';
+import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from '@kbn/core/server';
 import { schema } from '@kbn/config-schema';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
-import { PluginStartContract as CasesPluginStart } from '../../../../../../../plugins/cases/server';
-import { CasesPatchRequest } from '../../../../../../../plugins/cases/common/api';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
+import { PluginStartContract as CasesPluginStart } from '@kbn/cases-plugin/server';
+import { CasesPatchRequest } from '@kbn/cases-plugin/common/api';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts
index f94358be2bc19..83ec0812264bb 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/observability/server/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts b/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
index bd3569ef52816..a6eb9ba6f1d5b 100644
--- a/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
+++ b/x-pack/test/cases_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/cases_api_integration/common/lib/authentication/index.ts b/x-pack/test/cases_api_integration/common/lib/authentication/index.ts
index 86016b273ea44..d4776bbcad327 100644
--- a/x-pack/test/cases_api_integration/common/lib/authentication/index.ts
+++ b/x-pack/test/cases_api_integration/common/lib/authentication/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrProviderContext as CommonFtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext as CommonFtrProviderContext } from '../../ftr_provider_context';
 import { Role, User, UserInfo } from './types';
 import { users } from './users';
 import { roles } from './roles';
diff --git a/x-pack/test/cases_api_integration/common/lib/mock.ts b/x-pack/test/cases_api_integration/common/lib/mock.ts
index 713d910f0bd1d..ce025a5681b4f 100644
--- a/x-pack/test/cases_api_integration/common/lib/mock.ts
+++ b/x-pack/test/cases_api_integration/common/lib/mock.ts
@@ -17,7 +17,7 @@ import {
   CaseStatuses,
   CommentRequest,
   CommentRequestActionsType,
-} from '../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
 
 export const defaultUser = { email: null, full_name: null, username: 'elastic' };
 /**
diff --git a/x-pack/test/cases_api_integration/common/lib/utils.ts b/x-pack/test/cases_api_integration/common/lib/utils.ts
index 9c56db80e45fc..a433f5da1d74a 100644
--- a/x-pack/test/cases_api_integration/common/lib/utils.ts
+++ b/x-pack/test/cases_api_integration/common/lib/utils.ts
@@ -15,15 +15,15 @@ import type { TransportResult } from '@elastic/elasticsearch';
 import type { Client } from '@elastic/elasticsearch';
 
 import type SuperTest from 'supertest';
-import { ObjectRemover as ActionsRemover } from '../../../alerting_api_integration/common/lib';
 import {
+  CASES_INTERNAL_URL,
   CASES_URL,
   CASE_CONFIGURE_CONNECTORS_URL,
   CASE_CONFIGURE_URL,
   CASE_REPORTERS_URL,
   CASE_STATUS_URL,
   CASE_TAGS_URL,
-} from '../../../../plugins/cases/common/constants';
+} from '@kbn/cases-plugin/common/constants';
 import {
   CasesConfigureRequest,
   CasesConfigureResponse,
@@ -49,15 +49,18 @@ import {
   CasesByAlertId,
   CaseResolveResponse,
   CaseMetricsResponse,
-} from '../../../../plugins/cases/common/api';
-import { getPostCaseRequest } from './mock';
-import { getCaseUserActionUrl } from '../../../../plugins/cases/common/api/helpers';
-import { SignalHit } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import { ActionResult, FindActionResult } from '../../../../plugins/actions/server/types';
+  BulkCreateCommentRequest,
+  CommentType,
+} from '@kbn/cases-plugin/common/api';
+import { getCaseUserActionUrl } from '@kbn/cases-plugin/common/api/helpers';
+import { SignalHit } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
+import { ActionResult, FindActionResult } from '@kbn/actions-plugin/server/types';
+import { ESCasesConfigureAttributes } from '@kbn/cases-plugin/server/services/configure/types';
+import { ESCaseAttributes } from '@kbn/cases-plugin/server/services/cases/types';
 import { User } from './authentication/types';
 import { superUser } from './authentication/users';
-import { ESCasesConfigureAttributes } from '../../../../plugins/cases/server/services/configure/types';
-import { ESCaseAttributes } from '../../../../plugins/cases/server/services/cases/types';
+import { getPostCaseRequest, postCaseReq } from './mock';
+import { ObjectRemover as ActionsRemover } from '../../../alerting_api_integration/common/lib';
 import { getServiceNowServer } from '../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
 
 function toArray<T>(input: T | T[]): T[] {
@@ -656,6 +659,31 @@ export const createComment = async ({
   return theCase;
 };
 
+export const bulkCreateAttachments = async ({
+  supertest,
+  caseId,
+  params,
+  auth = { user: superUser, space: null },
+  expectedHttpCode = 200,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  caseId: string;
+  params: BulkCreateCommentRequest;
+  auth?: { user: User; space: string | null };
+  expectedHttpCode?: number;
+}): Promise<CaseResponse> => {
+  const { body: theCase } = await supertest
+    .post(
+      `${getSpaceUrlPrefix(auth.space)}${CASES_INTERNAL_URL}/${caseId}/attachments/_bulk_create`
+    )
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(params)
+    .expect(expectedHttpCode);
+
+  return theCase;
+};
+
 export const updateCase = async ({
   supertest,
   params,
@@ -1143,3 +1171,48 @@ export const extractWarningValueFromWarningHeader = (warningHeader: string) => {
   const warningValue = warningHeader.substring(firstQuote + 1, lastQuote);
   return warningValue;
 };
+
+export const getAttachments = (numberOfAttachments: number): BulkCreateCommentRequest => {
+  return [...Array(numberOfAttachments)].map((index) => {
+    if (index % 0) {
+      return {
+        type: CommentType.user,
+        comment: `Test ${index + 1}`,
+        owner: 'securitySolutionFixture',
+      };
+    }
+
+    return {
+      type: CommentType.alert,
+      alertId: `test-id-${index + 1}`,
+      index: `test-index-${index + 1}`,
+      rule: {
+        id: `rule-test-id-${index + 1}`,
+        name: `Test ${index + 1}`,
+      },
+      owner: 'securitySolutionFixture',
+    };
+  });
+};
+
+export const createCaseAndBulkCreateAttachments = async ({
+  supertest,
+  numberOfAttachments = 3,
+  auth = { user: superUser, space: null },
+  expectedHttpCode = 200,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  numberOfAttachments?: number;
+  auth?: { user: User; space: string | null };
+  expectedHttpCode?: number;
+}): Promise<{ theCase: CaseResponse; attachments: BulkCreateCommentRequest }> => {
+  const postedCase = await createCase(supertest, postCaseReq);
+  const attachments = getAttachments(numberOfAttachments);
+  const patchedCase = await bulkCreateAttachments({
+    supertest,
+    caseId: postedCase.id,
+    params: attachments,
+  });
+
+  return { theCase: patchedCase, attachments };
+};
diff --git a/x-pack/test/cases_api_integration/common/lib/validation.ts b/x-pack/test/cases_api_integration/common/lib/validation.ts
index 826ac7e2600e1..c901631388f11 100644
--- a/x-pack/test/cases_api_integration/common/lib/validation.ts
+++ b/x-pack/test/cases_api_integration/common/lib/validation.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CaseResponse, CasesByAlertId } from '../../../../plugins/cases/common/api';
+import { CaseResponse, CasesByAlertId } from '@kbn/cases-plugin/common/api';
 
 /**
  * Ensure that the result of the alerts API request matches with the cases created for the test.
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
index 5285b57f3be72..a78f70710dbad 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 import { postCaseReq } from '../../../../common/lib/mock';
@@ -20,7 +21,6 @@ import {
   createCase,
   pushCase,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
index f1c16e9b6dc56..4d6c20192442a 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
@@ -6,9 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { CaseResponse } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
 import { getPostCaseRequest, postCommentAlertReq } from '../../../../common/lib/mock';
 import {
   createCase,
@@ -17,7 +18,6 @@ import {
   deleteAllCaseItems,
 } from '../../../../common/lib/utils';
 import { validateCasesFromAlertIDResponse } from '../../../../common/lib/validation';
-import { CaseResponse } from '../../../../../../plugins/cases/common/api';
 import {
   globalRead,
   noKibanaPrivileges,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
index 5cf7c4947c23c..657424e644be5 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
@@ -6,9 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { CaseResponse, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
 import {
   postCaseReq,
   postCommentUserReq,
@@ -23,11 +24,6 @@ import {
   updateCase,
   createComment,
 } from '../../../../common/lib/utils';
-import {
-  CaseResponse,
-  CaseStatuses,
-  CommentType,
-} from '../../../../../../plugins/cases/common/api';
 import {
   obsOnly,
   secOnly,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts
index abafc514e56f3..d11cf527da983 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/get_case.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser, getCaseDetailsUrl } from '../../../../../../plugins/cases/common/api';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { AttributesTypeUser, getCaseDetailsUrl } from '@kbn/cases-plugin/common/api';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
index 6093ca55232a7..44da07a845ff7 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
@@ -7,24 +7,14 @@
 
 import expect from '@kbn/expect';
 import { join } from 'path';
-import { SavedObject } from 'kibana/server';
+import { SavedObject } from '@kbn/core/server';
 import supertest from 'supertest';
-import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
-import {
-  deleteAllCaseItems,
-  createCase,
-  createComment,
-  findCases,
-  getCaseUserActions,
-} from '../../../../common/lib/utils';
-import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   CASES_URL,
   CASE_SAVED_OBJECT,
   CASE_USER_ACTION_SAVED_OBJECT,
   CASE_COMMENT_SAVED_OBJECT,
-} from '../../../../../../plugins/cases/common/constants';
+} from '@kbn/cases-plugin/common/constants';
 import {
   AttributesTypeUser,
   CommentsResponse,
@@ -37,7 +27,17 @@ import {
   CommentUserAction,
   CreateCaseUserAction,
   CaseStatuses,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  deleteAllCaseItems,
+  createCase,
+  createComment,
+  findCases,
+  getCaseUserActions,
+} from '../../../../common/lib/utils';
+import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
index 08e76cd5ab4fd..d844cbae1d79e 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
@@ -6,11 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASES_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import {
   deleteAllCaseItems,
   getCase,
@@ -18,7 +16,6 @@ import {
   resolveCase,
 } from '../../../../common/lib/utils';
 import { superUser } from '../../../../common/lib/authentication/users';
-import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
index c93823822e440..8e25ee9225493 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
@@ -8,15 +8,14 @@
 import expect from '@kbn/expect';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   CasesResponse,
   CaseStatuses,
   CommentType,
   ConnectorTypes,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   getPostCaseRequest,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts
index e302d72bdd575..9cd986a032b24 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/post_case.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
 import {
   ConnectorTypes,
   ConnectorJiraTypeFields,
   CaseStatuses,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
 import { getPostCaseRequest, postCaseResp, defaultUser } from '../../../../common/lib/mock';
 import {
   deleteCasesByESQuery,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts
index 0d7605f9ecaa6..1f681f225938d 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/resolve_case.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
index 27433c09cd2e0..1a9671385a36c 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
@@ -6,9 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CaseStatuses } from '@kbn/cases-plugin/common/api';
+import { CASE_STATUS_URL } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
 import { getPostCaseRequest, postCaseReq } from '../../../../../common/lib/mock';
 import {
   createCase,
@@ -27,7 +28,6 @@ import {
   secOnlyRead,
   superUser,
 } from '../../../../../common/lib/authentication/users';
-import { CASE_STATUS_URL } from '../../../../../../../plugins/cases/common/constants';
 import { assertWarningHeader } from '../../../../../common/lib/validation';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
index 006deaad27f56..b7af123f9091a 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { CasesResponse, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { postCaseReq } from '../../../../common/lib/mock';
@@ -15,11 +16,6 @@ import {
   deleteAllCaseItems,
   getSignalsWithES,
 } from '../../../../common/lib/utils';
-import {
-  CasesResponse,
-  CaseStatuses,
-  CommentType,
-} from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
index ba3f8e8cba40e..76b0901c3ee8c 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { CommentsResponse } from '../../../../../../plugins/cases/common/api';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { CommentsResponse } from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   getPostCaseRequest,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
index d6e52b6577fef..321cd3e7d8196 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { getCaseCommentsUrl } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { postCaseReq, getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
@@ -28,7 +29,6 @@ import {
   secOnlyRead,
   superUser,
 } from '../../../../common/lib/authentication/users';
-import { getCaseCommentsUrl } from '../../../../../../plugins/cases/common/api';
 import { assertWarningHeader } from '../../../../common/lib/validation';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts
index cc0290bd13666..59c86d0437768 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/migrations.ts
@@ -6,13 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
+import { CommentResponseAlertsType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASES_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import { deleteAllCaseItems, getComment } from '../../../../common/lib/utils';
-import { CommentResponseAlertsType } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
index f22df42678eb5..549e2547f84a0 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
@@ -7,13 +7,13 @@
 
 import { omit } from 'lodash/fp';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
 import {
   AttributesTypeAlerts,
   AttributesTypeUser,
   CommentType,
-} from '../../../../../../plugins/cases/common/api';
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
 import {
   defaultUser,
   postCaseReq,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
index 9c208139330ea..681f026246542 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
@@ -8,15 +8,15 @@
 import { omit } from 'lodash/fp';
 import expect from '@kbn/expect';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   CommentType,
   AttributesTypeUser,
   AttributesTypeAlerts,
-} from '../../../../../../plugins/cases/common/api';
+  CaseStatuses,
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   defaultUser,
   postCaseReq,
@@ -35,6 +35,7 @@ import {
   removeServerGeneratedPropertiesFromUserAction,
   removeServerGeneratedPropertiesFromSavedObject,
   superUserSpace1Auth,
+  updateCase,
 } from '../../../../common/lib/utils';
 import {
   createSignalsIndex,
@@ -263,34 +264,29 @@ export default ({ getService }: FtrProviderContext): void => {
         }
       });
 
-      it('400s when case is missing', async () => {
+      it('404s when the case does not exist', async () => {
         await createComment({
           supertest,
           caseId: 'not-exists',
-          params: {
-            // @ts-expect-error
-            bad: 'comment',
-          },
-          expectedHttpCode: 400,
+          params: postCommentUserReq,
+          expectedHttpCode: 404,
         });
       });
 
       it('400s when adding an alert to a closed case', async () => {
         const postedCase = await createCase(supertest, postCaseReq);
-
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
+        await updateCase({
+          supertest,
+          params: {
             cases: [
               {
                 id: postedCase.id,
                 version: postedCase.version,
-                status: 'closed',
+                status: CaseStatuses.closed,
               },
             ],
-          })
-          .expect(200);
+          },
+        });
 
         await createComment({
           supertest,
@@ -299,92 +295,95 @@ export default ({ getService }: FtrProviderContext): void => {
           expectedHttpCode: 400,
         });
       });
-    });
 
-    describe('alerts', () => {
-      beforeEach(async () => {
-        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
-        await createSignalsIndex(supertest, log);
-      });
-
-      afterEach(async () => {
-        await deleteSignalsIndex(supertest, log);
-        await deleteAllAlerts(supertest, log);
-        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      it('400s when attempting to add more than 1K alerts to a case', async () => {
+        const alerts = [...Array(1001).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentAlertReq, alertId: alerts, index: alerts },
+          expectedHttpCode: 400,
+        });
       });
 
-      it('should change the status of the alert if sync alert is on', async () => {
-        const rule = getRuleForSignalTesting(['auditbeat-*']);
+      it('400s when attempting to add an alert to a case that already has 1K alerts', async () => {
+        const alerts = [...Array(1000).keys()].map((num) => `test-${num}`);
         const postedCase = await createCase(supertest, postCaseReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentAlertReq, alertId: alerts, index: alerts },
+        });
 
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: postedCase.id,
-                version: postedCase.version,
-                status: 'in-progress',
-              },
-            ],
-          })
-          .expect(200);
-
-        const { id } = await createRule(supertest, log, rule);
-        await waitForRuleSuccessOrStatus(supertest, log, id);
-        await waitForSignalsToBePresent(supertest, log, 1, [id]);
-        const signals = await getSignalsByIds(supertest, log, [id]);
-
-        const alert = signals.hits.hits[0];
-        expect(alert._source?.[ALERT_WORKFLOW_STATUS]).eql('open');
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentAlertReq, alertId: 'test-id', index: 'test-index' },
+          expectedHttpCode: 400,
+        });
+      });
 
+      it('400s when the case already has alerts and the sum of existing and new alerts exceed 1k', async () => {
+        const alerts = [...Array(1200).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
         await createComment({
           supertest,
           caseId: postedCase.id,
           params: {
-            alertId: alert._id,
-            index: alert._index,
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-            owner: 'securitySolutionFixture',
-            type: CommentType.alert,
+            ...postCommentAlertReq,
+            alertId: alerts.slice(0, 500),
+            index: alerts.slice(0, 500),
           },
         });
 
-        await es.indices.refresh({ index: alert._index });
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: {
+            ...postCommentAlertReq,
+            alertId: alerts.slice(500),
+            index: alerts.slice(500),
+          },
+          expectedHttpCode: 400,
+        });
+      });
+    });
 
-        const { body: updatedAlert } = await supertest
-          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-          .set('kbn-xsrf', 'true')
-          .send(getQuerySignalIds([alert._id]))
-          .expect(200);
+    describe('alerts', () => {
+      beforeEach(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+        await createSignalsIndex(supertest, log);
+      });
 
-        expect(updatedAlert.hits.hits[0]._source[ALERT_WORKFLOW_STATUS]).eql('acknowledged');
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest, log);
+        await deleteAllAlerts(supertest, log);
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
-      it('should NOT change the status of the alert if sync alert is off', async () => {
+      const bulkCreateAlertsAndVerifyAlertStatus = async (
+        syncAlerts: boolean,
+        expectedAlertStatus: string
+      ) => {
         const rule = getRuleForSignalTesting(['auditbeat-*']);
         const postedCase = await createCase(supertest, {
           ...postCaseReq,
-          settings: { syncAlerts: false },
+          settings: { syncAlerts },
         });
 
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
+        await updateCase({
+          supertest,
+          params: {
             cases: [
               {
                 id: postedCase.id,
                 version: postedCase.version,
-                status: 'in-progress',
+                status: CaseStatuses['in-progress'],
               },
             ],
-          })
-          .expect(200);
+          },
+        });
 
         const { id } = await createRule(supertest, log, rule);
         await waitForRuleSuccessOrStatus(supertest, log, id);
@@ -417,7 +416,15 @@ export default ({ getService }: FtrProviderContext): void => {
           .send(getQuerySignalIds([alert._id]))
           .expect(200);
 
-        expect(updatedAlert.hits.hits[0]._source[ALERT_WORKFLOW_STATUS]).eql('open');
+        expect(updatedAlert.hits.hits[0]._source[ALERT_WORKFLOW_STATUS]).eql(expectedAlertStatus);
+      };
+
+      it('should change the status of the alert if sync alert is on', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(true, 'acknowledged');
+      });
+
+      it('should NOT change the status of the alert if sync alert is off', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(false, 'open');
       });
     });
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts
index 79d5a46fa8bdd..308a22c371a48 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/migrations.ts
@@ -6,11 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { CASE_CONFIGURE_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASE_CONFIGURE_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import {
   getConfiguration,
   getConfigureSavedObjectsFromES,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
index 0e92456b66c85..d2fa0d950e774 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 import {
   removeServerGeneratedPropertiesFromSavedObject,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
index 4b7b511d1f414..47744830ec8b8 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts
index a4733d0c87038..f70c8593d3c94 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/index.ts
@@ -39,6 +39,12 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./metrics/get_case_metrics_actions'));
     loadTestFile(require.resolve('./metrics/get_case_metrics_connectors'));
 
+    /**
+     * Internal routes
+     */
+
+    loadTestFile(require.resolve('./internal/bulk_create_attachments'));
+
     // NOTE: Migrations are not included because they can inadvertently remove the .kibana indices which removes the users and spaces
     // which causes errors in any tests after them that relies on those
   });
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
new file mode 100644
index 0000000000000..f3c1b190260bc
--- /dev/null
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
@@ -0,0 +1,683 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { omit } from 'lodash/fp';
+import expect from '@kbn/expect';
+import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import {
+  BulkCreateCommentRequest,
+  CaseResponse,
+  CaseStatuses,
+  CommentRequest,
+  CommentType,
+} from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import {
+  defaultUser,
+  postCaseReq,
+  postCommentUserReq,
+  postCommentAlertReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  getCaseUserActions,
+  removeServerGeneratedPropertiesFromUserAction,
+  removeServerGeneratedPropertiesFromSavedObject,
+  superUserSpace1Auth,
+  createCaseAndBulkCreateAttachments,
+  bulkCreateAttachments,
+  updateCase,
+} from '../../../../common/lib/utils';
+import {
+  createSignalsIndex,
+  deleteSignalsIndex,
+  deleteAllAlerts,
+  getRuleForSignalTesting,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+  getSignalsByIds,
+  createRule,
+  getQuerySignalIds,
+} from '../../../../../detection_engine_api_integration/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnly,
+  obsOnlyRead,
+  obsSecRead,
+  secOnly,
+  secOnlyRead,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+  const es = getService('es');
+  const log = getService('log');
+
+  const validateComments = (
+    comments: CaseResponse['comments'],
+    attachments: BulkCreateCommentRequest
+  ) => {
+    comments?.forEach((attachment, index) => {
+      const comment = removeServerGeneratedPropertiesFromSavedObject(attachment);
+
+      expect(comment).to.eql({
+        ...attachments[index],
+        created_by: defaultUser,
+        pushed_at: null,
+        pushed_by: null,
+        updated_by: null,
+      });
+    });
+  };
+
+  describe('bulk_create_attachments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    describe('creation', () => {
+      it('should no create an attachment on empty request', async () => {
+        const { theCase } = await createCaseAndBulkCreateAttachments({
+          supertest,
+          numberOfAttachments: 0,
+        });
+
+        expect(theCase.comments?.length).to.be(0);
+      });
+
+      it('should create one attachment', async () => {
+        const { theCase, attachments } = await createCaseAndBulkCreateAttachments({
+          supertest,
+          numberOfAttachments: 1,
+        });
+
+        validateComments(theCase.comments, attachments);
+      });
+
+      it('should bulk create multiple attachments', async () => {
+        const { theCase, attachments } = await createCaseAndBulkCreateAttachments({
+          supertest,
+        });
+
+        expect(theCase.totalComment).to.eql(attachments.length);
+        expect(theCase.updated_by).to.eql(defaultUser);
+
+        validateComments(theCase.comments, attachments);
+      });
+
+      it('creates the correct user action', async () => {
+        const { theCase, attachments } = await createCaseAndBulkCreateAttachments({
+          supertest,
+        });
+
+        const userActions = await getCaseUserActions({ supertest, caseID: theCase.id });
+
+        userActions.slice(1).forEach((userAction, index) => {
+          const userActionWithoutServerGeneratedAttributes =
+            removeServerGeneratedPropertiesFromUserAction(userAction);
+
+          expect(userActionWithoutServerGeneratedAttributes).to.eql({
+            type: 'comment',
+            action: 'create',
+            created_by: defaultUser,
+            payload: {
+              comment: {
+                ...attachments[index],
+              },
+            },
+            case_id: theCase.id,
+            comment_id: theCase.comments?.find((comment) => comment.id === userAction.comment_id)
+              ?.id,
+            owner: 'securitySolutionFixture',
+          });
+        });
+      });
+    });
+
+    describe('errors', () => {
+      it('400s when attempting to create a comment with a different owner than the case', async () => {
+        const postedCase = await createCase(
+          supertest,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' })
+        );
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'observabilityFixture',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when type is missing', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+            {
+              // @ts-expect-error
+              bad: 'comment',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when missing attributes for type user', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+            // @ts-expect-error
+            {
+              type: CommentType.user,
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when adding excess attributes for type user', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        for (const attribute of ['alertId', 'index']) {
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [
+              {
+                type: CommentType.user,
+                comment: 'test',
+                owner: 'securitySolutionFixture',
+              },
+              {
+                type: CommentType.user,
+                [attribute]: attribute,
+                comment: 'a comment',
+                owner: 'securitySolutionFixture',
+              },
+            ],
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('400s when missing attributes for type alert', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        const allRequestAttributes = {
+          type: CommentType.alert,
+          index: 'test-index',
+          alertId: 'test-id',
+          rule: {
+            id: 'id',
+            name: 'name',
+          },
+          owner: 'securitySolutionFixture',
+        };
+
+        for (const attribute of ['alertId', 'index']) {
+          const requestAttributes = omit(attribute, allRequestAttributes);
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [
+              {
+                type: CommentType.user,
+                comment: 'test',
+                owner: 'securitySolutionFixture',
+              },
+              // @ts-expect-error
+              requestAttributes,
+            ],
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('400s when adding excess attributes for type alert', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        for (const attribute of ['comment']) {
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [
+              {
+                type: CommentType.user,
+                comment: 'test',
+                owner: 'securitySolutionFixture',
+              },
+              {
+                type: CommentType.alert,
+                [attribute]: attribute,
+                alertId: 'test-id',
+                index: 'test-index',
+                rule: {
+                  id: 'id',
+                  name: 'name',
+                },
+                owner: 'securitySolutionFixture',
+              },
+            ],
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('404s when the case does not exist', async () => {
+        await bulkCreateAttachments({
+          supertest,
+          caseId: 'not-exists',
+          params: [
+            {
+              type: CommentType.user,
+              comment: 'test',
+              owner: 'securitySolutionFixture',
+            },
+          ],
+          expectedHttpCode: 404,
+        });
+      });
+
+      it('400s when adding an alert to a closed case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              type: CommentType.alert,
+              alertId: 'test-id',
+              index: 'test-index',
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              owner: 'securitySolutionFixture',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when adding an alert with other attachments to a closed case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        await createCaseAndBulkCreateAttachments({ supertest, expectedHttpCode: 400 });
+      });
+
+      it('400s when attempting to add more than 1K alerts to a case', async () => {
+        const alerts = [...Array(1001).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts,
+              index: alerts,
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when attempting to add more than 1K alerts to a case in the same request', async () => {
+        const alerts = [...Array(1001).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(0, 500),
+              index: alerts.slice(0, 500),
+            },
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(500, alerts.length),
+              index: alerts.slice(500, alerts.length),
+            },
+            postCommentAlertReq,
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when attempting to add an alert to a case that already has 1K alerts', async () => {
+        const alerts = [...Array(1000).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts,
+              index: alerts,
+            },
+          ],
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: 'test-id',
+              index: 'test-index',
+            },
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when the case already has alerts and the sum of existing and new alerts exceed 1k', async () => {
+        const alerts = [...Array(1200).keys()].map((num) => `test-${num}`);
+        const postedCase = await createCase(supertest, postCaseReq);
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(0, 500),
+              index: alerts.slice(0, 500),
+            },
+          ],
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            {
+              ...postCommentAlertReq,
+              alertId: alerts.slice(500),
+              index: alerts.slice(500),
+            },
+            postCommentAlertReq,
+          ],
+          expectedHttpCode: 400,
+        });
+      });
+    });
+
+    describe('alerts', () => {
+      beforeEach(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+        await createSignalsIndex(supertest, log);
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest, log);
+        await deleteAllAlerts(supertest, log);
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      });
+
+      const bulkCreateAlertsAndVerifyAlertStatus = async (
+        syncAlerts: boolean,
+        expectedAlertStatus: string
+      ) => {
+        const rule = getRuleForSignalTesting(['auditbeat-*']);
+        const postedCase = await createCase(supertest, {
+          ...postCaseReq,
+          settings: { syncAlerts },
+        });
+
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+          },
+        });
+
+        const { id } = await createRule(supertest, log, rule);
+        await waitForRuleSuccessOrStatus(supertest, log, id);
+        await waitForSignalsToBePresent(supertest, log, 1, [id]);
+        const signals = await getSignalsByIds(supertest, log, [id]);
+        const attachments: CommentRequest[] = [];
+        const indices: string[] = [];
+        const ids: string[] = [];
+
+        signals.hits.hits.forEach((alert) => {
+          expect(alert._source?.[ALERT_WORKFLOW_STATUS]).eql('open');
+          attachments.push({
+            alertId: alert._id,
+            index: alert._index,
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+            owner: 'securitySolutionFixture',
+            type: CommentType.alert,
+          });
+
+          indices.push(alert._index);
+          ids.push(alert._id);
+        });
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: attachments,
+        });
+
+        await es.indices.refresh({ index: indices });
+
+        const { body: updatedAlerts } = await supertest
+          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getQuerySignalIds(ids))
+          .expect(200);
+
+        updatedAlerts.hits.hits.forEach(
+          (alert: { _source: { 'kibana.alert.workflow_status': string } }) => {
+            expect(alert._source[ALERT_WORKFLOW_STATUS]).eql(expectedAlertStatus);
+          }
+        );
+      };
+
+      it('should change the status of the alerts if sync alert is on', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(true, 'acknowledged');
+      });
+
+      it('should NOT change the status of the alert if sync alert is off', async () => {
+        await bulkCreateAlertsAndVerifyAlertStatus(false, 'open');
+      });
+    });
+
+    describe('alert format', () => {
+      type AlertComment = CommentType.alert;
+
+      for (const [alertId, index, type] of [
+        ['1', ['index1', 'index2'], CommentType.alert],
+        [['1', '2'], 'index', CommentType.alert],
+      ]) {
+        it(`throws an error with an alert comment with contents id: ${alertId} indices: ${index} type: ${type}`, async () => {
+          const postedCase = await createCase(supertest, postCaseReq);
+          await bulkCreateAttachments({
+            supertest,
+            caseId: postedCase.id,
+            params: [{ ...postCommentAlertReq, alertId, index, type: type as AlertComment }],
+            expectedHttpCode: 400,
+          });
+        });
+      }
+
+      it('does not throw an error with correct alert formatting', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const attachments = [
+          {
+            ...postCommentAlertReq,
+            alertId: '1',
+            index: ['index1'],
+            type: CommentType.alert as const,
+          },
+          {
+            ...postCommentAlertReq,
+            alertId: ['1', '2'],
+            index: ['index', 'other-index'],
+            type: CommentType.alert as const,
+          },
+        ];
+
+        await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: attachments,
+          expectedHttpCode: 200,
+        });
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should bulk create attachments when the user has the correct permissions for that owner', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await bulkCreateAttachments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: [postCommentUserReq],
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+
+      it('should not create a comment when the user does not have permissions for that owner', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          { user: obsOnly, space: 'space1' }
+        );
+
+        await bulkCreateAttachments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: [{ ...postCommentUserReq, owner: 'observabilityFixture' }],
+          auth: { user: secOnly, space: 'space1' },
+          expectedHttpCode: 403,
+        });
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should not create a comment`, async () => {
+          const postedCase = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            superUserSpace1Auth
+          );
+
+          await bulkCreateAttachments({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            params: [postCommentUserReq],
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should not create a comment in a space the user does not have permissions for', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        await bulkCreateAttachments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: [postCommentUserReq],
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts
index adfb22d3cf145..ca99f5fb8a871 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/metrics/get_case_metrics_connectors.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { getPostCaseRequest } from '../../../../common/lib/mock';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -16,7 +17,6 @@ import {
   getCaseMetrics,
   updateCase,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
index b09059966a16b..283e6b0c5301b 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
@@ -6,7 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
   CaseResponse,
@@ -14,8 +13,9 @@ import {
   CommentType,
   ConnectorTypes,
   getCaseUserActionUrl,
-} from '../../../../../../plugins/cases/common/api';
-import { CreateCaseUserAction } from '../../../../../../plugins/cases/common/api/cases/user_actions/create_case';
+} from '@kbn/cases-plugin/common/api';
+import { CreateCaseUserAction } from '@kbn/cases-plugin/common/api/cases/user_actions/create_case';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { postCaseReq, postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
 import {
   deleteAllCaseItems,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
index 744d549aa8790..9bf55018bbbf4 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
@@ -6,13 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
+import { CaseUserActionsResponse, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
-import {
-  CASES_URL,
-  SECURITY_SOLUTION_OWNER,
-} from '../../../../../../plugins/cases/common/constants';
 import { deleteAllCaseItems, getCaseUserActions } from '../../../../common/lib/utils';
-import { CaseUserActionsResponse, CommentType } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default function createGetTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
index 193621a422726..a92e4ee28ff5b 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
@@ -10,6 +10,7 @@
 import http from 'http';
 
 import expect from '@kbn/expect';
+import { CaseConnector, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -36,11 +37,6 @@ import {
   createConfiguration,
   getSignalsWithES,
 } from '../../../../common/lib/utils';
-import {
-  CaseConnector,
-  CaseStatuses,
-  CommentType,
-} from '../../../../../../plugins/cases/common/api';
 import {
   globalRead,
   noKibanaPrivileges,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
index 6d7f8398277f3..ee93dd1b07aab 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { UserActionWithResponse, PushedUserAction } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../../common/ftr_provider_context';
 
 import { defaultUser } from '../../../../../common/lib/mock';
@@ -23,10 +24,6 @@ import {
 } from '../../../../../common/lib/utils';
 
 import { ObjectRemover as ActionsRemover } from '../../../../../../alerting_api_integration/common/lib';
-import {
-  UserActionWithResponse,
-  PushedUserAction,
-} from '../../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
index 404b63376daa4..3809806d9ec11 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
@@ -20,7 +21,6 @@ import {
   getConfigurationOutput,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
index a4e69ab928325..b5a58d3af5086 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CASE_CONFIGURE_CONNECTORS_URL } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CASE_CONFIGURE_CONNECTORS_URL } from '../../../../../../plugins/cases/common/constants';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 import {
   getServiceNowConnector,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
index 26eba77dd2576..6fd90d0620fd2 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -21,7 +22,6 @@ import {
   createConnector,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
index 077bfc5861322..f9df2610dca29 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
@@ -7,7 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
index 1605003bf7015..985393eafe719 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/index.ts
@@ -24,7 +24,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext): void => {
     // Trial
     loadTestFile(require.resolve('./cases/push_case'));
     loadTestFile(require.resolve('./cases/user_actions/get_all_user_actions'));
-    loadTestFile(require.resolve('./configure/index'));
+    loadTestFile(require.resolve('./configure'));
 
     // Common
     loadTestFile(require.resolve('../common'));
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts
index 1fc70b0f97f5d..4ac0573428445 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/post_case.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { getPostCaseRequest, nullUser, postCaseResp } from '../../../../common/lib/mock';
 import {
   deleteCasesByESQuery,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts
index 7f2a774c28f39..c4e46675e7549 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/cases/status/get_status.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CaseStatuses } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
 import { postCaseReq } from '../../../../../common/lib/mock';
 import {
   createCase,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts
index 4df4c560413e8..2569d035fabb5 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/find_comments.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { CASES_URL } from '@kbn/cases-plugin/common/constants';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
 import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
 import {
   createComment,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts
index 452d05c9c2362..286c0d7b6925d 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/patch_comment.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { AttributesTypeUser, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser, CommentType } from '../../../../../../plugins/cases/common/api';
 import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
 import {
   deleteCasesByESQuery,
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts
index 72356d0d314ff..0f268e3288c82 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/comments/post_comment.ts
@@ -6,18 +6,16 @@
  */
 
 import expect from '@kbn/expect';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
-import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
 import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
 import {
-  deleteCasesByESQuery,
-  deleteCasesUserActions,
-  deleteComments,
   createCase,
   createComment,
   removeServerGeneratedPropertiesFromSavedObject,
   getAuthWithSuperUser,
+  deleteAllCaseItems,
 } from '../../../../common/lib/utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -28,9 +26,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
   describe('post_comment', () => {
     afterEach(async () => {
-      await deleteCasesByESQuery(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
+      await deleteAllCaseItems(es);
     });
 
     it('should post a comment in space1', async () => {
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts
index 251a545f10681..0b18a56bdcd11 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/index.ts
@@ -29,5 +29,10 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./configure/get_configure'));
     loadTestFile(require.resolve('./configure/patch_configure'));
     loadTestFile(require.resolve('./configure/post_configure'));
+
+    /**
+     * Internal routes
+     */
+    loadTestFile(require.resolve('./internal/bulk_create_attachments'));
   });
 };
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/common/internal/bulk_create_attachments.ts b/x-pack/test/cases_api_integration/spaces_only/tests/common/internal/bulk_create_attachments.ts
new file mode 100644
index 0000000000000..c39aa4bf1aae3
--- /dev/null
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/common/internal/bulk_create_attachments.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createCase,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getAuthWithSuperUser,
+  bulkCreateAttachments,
+  deleteAllCaseItems,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('bulk_create_attachments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should bulk create attachments in space1', async () => {
+      const postedCase = await createCase(supertestWithoutAuth, postCaseReq, 200, authSpace1);
+      const patchedCase = await bulkCreateAttachments({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: [postCommentUserReq],
+        auth: authSpace1,
+      });
+
+      const comment = removeServerGeneratedPropertiesFromSavedObject(
+        patchedCase.comments![0] as AttributesTypeUser
+      );
+
+      expect(comment).to.eql({
+        type: postCommentUserReq.type,
+        comment: postCommentUserReq.comment,
+        created_by: nullUser,
+        pushed_at: null,
+        pushed_by: null,
+        updated_by: null,
+        owner: 'securitySolutionFixture',
+      });
+
+      // updates the case correctly after adding a comment
+      expect(patchedCase.totalComment).to.eql(patchedCase.comments!.length);
+      expect(patchedCase.updated_by).to.eql(nullUser);
+    });
+
+    it('should not post a comment on a case in a different space', async () => {
+      const postedCase = await createCase(supertestWithoutAuth, postCaseReq, 200, authSpace1);
+      await bulkCreateAttachments({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: [postCommentUserReq],
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts
index 4da44f08c6236..405323005e64e 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/get_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
@@ -21,7 +22,6 @@ import {
   getAuthWithSuperUser,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 import { nullUser } from '../../../../common/lib/mock';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
index ca362d13ae459..084e05921fb47 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
@@ -7,6 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
@@ -23,7 +24,6 @@ import {
   getActionsSpace,
   getServiceNowSimulationServer,
 } from '../../../../common/lib/utils';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
 import { nullUser } from '../../../../common/lib/mock';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts
index b815278db5bd8..13d2cc6070727 100644
--- a/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/spaces_only/tests/trial/configure/post_configure.ts
@@ -7,7 +7,7 @@
 
 import http from 'http';
 import expect from '@kbn/expect';
-import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { ConnectorTypes } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
index 5db4a25036eca..ff490693e86a2 100644
--- a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (): Plugin => ({
diff --git a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
index 6bea9af2ed310..7f00f2b6b2b5b 100644
--- a/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
+++ b/x-pack/test/cloud_integration/fixtures/saml/saml_provider/server/init_routes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { getSAMLResponse, getSAMLRequestId } from './saml_tools';
 
 export function initRoutes(core: CoreSetup) {
diff --git a/x-pack/test/common/services/bsearch_secure.ts b/x-pack/test/common/services/bsearch_secure.ts
index c1aa173280f54..458e0878e187f 100644
--- a/x-pack/test/common/services/bsearch_secure.ts
+++ b/x-pack/test/common/services/bsearch_secure.ts
@@ -11,7 +11,7 @@
 import expect from '@kbn/expect';
 import request from 'superagent';
 import type SuperTest from 'supertest';
-import { IEsSearchResponse } from 'src/plugins/data/common';
+import { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { RetryService } from '../../../../test/common/services/retry/retry';
 
diff --git a/x-pack/test/common/services/infra_log_views.ts b/x-pack/test/common/services/infra_log_views.ts
index df7eb96ebc793..94f7efef7992d 100644
--- a/x-pack/test/common/services/infra_log_views.ts
+++ b/x-pack/test/common/services/infra_log_views.ts
@@ -11,8 +11,8 @@ import {
   PutLogViewRequestPayload,
   putLogViewRequestPayloadRT,
   putLogViewResponsePayloadRT,
-} from '../../../plugins/infra/common/http_api/log_views';
-import { decodeOrThrow } from '../../../plugins/infra/common/runtime_types';
+} from '@kbn/infra-plugin/common/http_api/log_views';
+import { decodeOrThrow } from '@kbn/infra-plugin/common/runtime_types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function InfraLogViewsServiceProvider({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/common/services/ingest_manager.ts b/x-pack/test/common/services/ingest_manager.ts
index 1ee7e2e9316b9..1ef80be40d803 100644
--- a/x-pack/test/common/services/ingest_manager.ts
+++ b/x-pack/test/common/services/ingest_manager.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { fleetSetupRouteService } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { fleetSetupRouteService } from '../../../plugins/fleet/common';
 
 export function IngestManagerProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/common/services/security_solution/roles_users_utils.ts b/x-pack/test/common/services/security_solution/roles_users_utils.ts
index 34829e360cd20..f8e18fadc992e 100644
--- a/x-pack/test/common/services/security_solution/roles_users_utils.ts
+++ b/x-pack/test/common/services/security_solution/roles_users_utils.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { assertUnreachable } from '../../../../plugins/security_solution/common/utility_types';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { assertUnreachable } from '@kbn/security-solution-plugin/common/utility_types';
 import {
   t1AnalystUser,
   t2AnalystUser,
@@ -26,9 +25,10 @@ import {
   platformEngineerRole,
   detectionsAdminRole,
   readerRole,
-} from '../../../../plugins/security_solution/server/lib/detection_engine/scripts/roles_users';
+} from '@kbn/security-solution-plugin/server/lib/detection_engine/scripts/roles_users';
 
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export { ROLES };
 
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
index 8db3d9797b6df..70ee954bd9166 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { PrePackagedRulesAndTimelinesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
+import { PrePackagedRulesAndTimelinesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
 
-import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts
index fa78fdd5fe04e..7d32af43d1913 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts
index b54e1432f5463..3bdd1cc914d35 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_CREATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -48,7 +48,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should create a single rule with a rule_id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRule()])
           .expect(200);
@@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should create a single rule without a rule_id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRuleWithoutRuleId()])
           .expect(200);
@@ -70,7 +70,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return a 200 ok but have a 409 conflict if we attempt to create the same rule_id twice', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRule(), getSimpleRule()])
           .expect(200);
@@ -88,13 +88,13 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return a 200 ok but have a 409 conflict if we attempt to create the same rule_id that already exists', async () => {
         await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRule()])
           .expect(200);
 
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'foo')
           .send([getSimpleRule()])
           .expect(200);
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts
index e5f828d0f862d..7dc77d7c1ab9b 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts
index b7517697ad2a9..6d48b558d18a2 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/delete_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_DELETE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
@@ -43,7 +43,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete the rule in bulk
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1' }])
           .expect(200);
@@ -57,7 +57,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its rule_id
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: bodyWithCreatedRule.rule_id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -71,7 +71,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its id
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the ruled_id does not exist when trying to delete a rule_id', async () => {
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: 'fake_id' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -100,7 +100,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the id does not exist when trying to delete an id', async () => {
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -120,7 +120,7 @@ export default ({ getService }: FtrProviderContext): void => {
         const bodyWithCreatedRule = await createRule(supertest, log, getSimpleRuleWithoutRuleId());
 
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }, { id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -155,7 +155,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete the rule in bulk
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1' }])
           .expect(200);
@@ -169,7 +169,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its rule_id
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: bodyWithCreatedRule.rule_id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -183,7 +183,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its id
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -194,7 +194,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the ruled_id does not exist when trying to delete a rule_id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: 'fake_id' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -212,7 +212,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the id does not exist when trying to delete an id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -232,7 +232,7 @@ export default ({ getService }: FtrProviderContext): void => {
         const bodyWithCreatedRule = await createRule(supertest, log, getSimpleRuleWithoutRuleId());
 
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }, { id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts
index 913f93d24c16e..833b9ccb9ee1f 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/export_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts
index 5d33e85d2d598..de445454f54ce 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/find_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts b/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts
index 6764ed27a43e7..c3b2eb3568ccb 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/get_prepackaged_rules_status.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_PREPACKAGED_URL,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
index 662582fe6f0cc..8df19b4fb910d 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts b/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
index 0c9dfd05c9d4a..a1c34b51e12d5 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { TIMELINE_IMPORT_URL } from '../../../../plugins/security_solution/common/constants';
+import { TIMELINE_IMPORT_URL } from '@kbn/security-solution-plugin/common/constants';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteAllTimelines } from '../../utils';
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts b/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
index 20f5d3567ad23..016d04c64f577 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { TIMELINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { TIMELINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
index 005352a643af1..3ac8e7bb8b574 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
@@ -12,7 +12,8 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
+import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -26,7 +27,6 @@ import {
   waitForRuleSuccessOrStatus,
   getRuleForSignalTesting,
 } from '../../utils';
-import { DetectionAlert } from '../../../../plugins/security_solution/common/detection_engine/schemas/alerts';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts
index 34d0369f72c03..ae92c294867ce 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts
index 0be23c1d8a289..a79c9e19857b8 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/patch_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -42,7 +42,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', name: 'some other name' }])
           .expect(200);
@@ -60,7 +60,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch both rule names
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { rule_id: 'rule-1', name: 'some other name' },
@@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ id: createRuleBody.id, name: 'some other name' }])
           .expect(200);
@@ -105,7 +105,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch both rule names
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { id: createRule1.id, name: 'some other name' },
@@ -132,7 +132,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ id: createdBody.id, name: 'some other name' }])
           .expect(200);
@@ -149,7 +149,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's enabled to false
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', enabled: false }])
           .expect(200);
@@ -166,7 +166,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's enabled to false and another property
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', severity: 'low', enabled: false }])
           .expect(200);
@@ -185,14 +185,14 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's timeline_title
         await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', timeline_title: 'some title', timeline_id: 'some id' }])
           .expect(200);
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', name: 'some other name' }])
           .expect(200);
@@ -209,7 +209,7 @@ export default ({ getService }: FtrProviderContext) => {
 
       it('should return a 200 but give a 404 in the message if it is given a fake id', async () => {
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ id: '5096dec6-b6b9-4d8d-8f93-6c2602079d9d', name: 'some other name' }])
           .expect(200);
@@ -227,7 +227,7 @@ export default ({ getService }: FtrProviderContext) => {
 
       it('should return a 200 but give a 404 in the message if it is given a fake rule_id', async () => {
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'fake_id', name: 'some other name' }])
           .expect(200);
@@ -245,7 +245,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch one rule name and give a fake id for the second
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { rule_id: 'rule-1', name: 'some other name' },
@@ -275,7 +275,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch one rule name and give a fake id for the second
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { id: createdBody.id, name: 'some other name' },
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts b/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts
index 48d13e8b2afd6..08d0be9d66d9c 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/query_signals.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
   ALERTS_AS_DATA_FIND_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { getSignalStatus, createSignalsIndex, deleteSignalsIndex } from '../../utils';
 
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts
index b874f19f30d42..e37c17d35ccdf 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/read_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
index d0c839fcb1b62..983fdc4c8a285 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
@@ -9,8 +9,9 @@ import expect from '@kbn/expect';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../plugins/security_solution/common/constants';
-import { RAC_ALERTS_BULK_UPDATE_URL } from '../../../../plugins/timelines/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { RAC_ALERTS_BULK_UPDATE_URL } from '@kbn/timelines-plugin/common/constants';
+import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -23,7 +24,6 @@ import {
   waitForRuleSuccessOrStatus,
   getRuleForSignalTesting,
 } from '../../utils';
-import { DetectionAlert } from '../../../../plugins/security_solution/common/detection_engine/schemas/alerts';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts
index 66baade16bd3c..0a8ac78019630 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts
index 46e34869a8e03..b614c1defa761 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/update_rules_bulk.ts
@@ -7,7 +7,10 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import {
+  DETECTION_ENGINE_RULES_BULK_UPDATE,
+  DETECTION_ENGINE_RULES_URL,
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -46,7 +49,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update a simple rule's name
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule])
           .expect(200);
@@ -76,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update both rule names
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1, updatedRule2])
           .expect(200);
@@ -105,7 +108,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete updatedRule1.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1])
           .expect(200);
@@ -133,7 +136,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete updatedRule2.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1, updatedRule2])
           .expect(200);
@@ -162,7 +165,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete updatedRule1.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1])
           .expect(200);
@@ -183,7 +186,7 @@ export default ({ getService }: FtrProviderContext) => {
         updatedRule1.enabled = false;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1])
           .expect(200);
@@ -206,7 +209,7 @@ export default ({ getService }: FtrProviderContext) => {
         ruleUpdate.timeline_id = 'some id';
 
         await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate])
           .expect(200);
@@ -216,7 +219,7 @@ export default ({ getService }: FtrProviderContext) => {
         ruleUpdate2.name = 'some other name';
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate2])
           .expect(200);
@@ -235,7 +238,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete ruleUpdate.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate])
           .expect(200);
@@ -257,7 +260,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete ruleUpdate.id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate])
           .expect(200);
@@ -283,7 +286,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update one rule name and give a fake id for the second
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate, ruleUpdate2])
           .expect(200);
@@ -320,7 +323,7 @@ export default ({ getService }: FtrProviderContext) => {
         rule2.name = 'some other name';
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([rule1, rule2])
           .expect(200);
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
index 5506febb781f6..90c80c172fcfa 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts
index b935a38753e1f..512863e039e3a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_prepackaged_rules.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import { PrePackagedRulesAndTimelinesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
+import { PrePackagedRulesAndTimelinesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
 
-import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts
index 953dfb42b7b46..865185387c57c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/alerts/alerts_compatibility.ts
@@ -11,7 +11,15 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL,
-} from '../../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ThreatEcs } from '@kbn/security-solution-plugin/common/ecs/threat';
+import {
+  EqlCreateSchema,
+  QueryCreateSchema,
+  SavedQueryCreateSchema,
+  ThreatMatchCreateSchema,
+  ThresholdCreateSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import {
   createRule,
   createSignalsIndex,
@@ -30,14 +38,6 @@ import {
   waitForSignalsToBePresent,
 } from '../../../utils';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { ThreatEcs } from '../../../../../plugins/security_solution/common/ecs/threat';
-import {
-  EqlCreateSchema,
-  QueryCreateSchema,
-  SavedQueryCreateSchema,
-  ThreatMatchCreateSchema,
-  ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts
index 766cc5406f2b1..467b87b6c64b9 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/check_privileges.ts
@@ -6,7 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { ThresholdCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -18,9 +21,6 @@ import {
   getThresholdRuleForSignalTesting,
 } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
-import { ThresholdCreateSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
index 0dfc753be402c..f44e72f5cd50a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
@@ -16,18 +16,13 @@ import {
   QueryCreateSchema,
   ThreatMatchCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import {
-  createListsIndex,
-  deleteAllExceptions,
-  deleteListsIndex,
-  importFile,
-} from '../../../lists_api_integration/utils';
-import { RulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -52,7 +47,12 @@ import {
   getEqlRuleForSignalTesting,
   getThresholdRuleForSignalTesting,
 } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import {
+  createListsIndex,
+  deleteAllExceptions,
+  deleteListsIndex,
+  importFile,
+} from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
index 6d867877e0dc3..bd39aea863461 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
@@ -9,9 +9,9 @@ import expect from '@kbn/expect';
 import {
   DEFAULT_ALERTS_INDEX,
   DETECTION_ENGINE_INDEX_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 
-import { SIGNALS_FIELD_ALIASES_VERSION } from '../../../../plugins/security_solution/server/lib/detection_engine/routes/index/get_signals_template';
+import { SIGNALS_FIELD_ALIASES_VERSION } from '@kbn/security-solution-plugin/server/lib/detection_engine/routes/index/get_signals_template';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteSignalsIndex } from '../../utils';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts
index 343db03c2ae27..20c914e17ce70 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts
@@ -22,7 +22,12 @@ import {
 } from '@kbn/rule-data-utils';
 import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
-import { MachineLearningCreateSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { MachineLearningCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import {
+  ALERT_ANCESTORS,
+  ALERT_DEPTH,
+  ALERT_ORIGINAL_TIME,
+} from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
@@ -36,11 +41,6 @@ import {
   deleteListsIndex,
   importFile,
 } from '../../../lists_api_integration/utils';
-import {
-  ALERT_ANCESTORS,
-  ALERT_DEPTH,
-  ALERT_ORIGINAL_TIME,
-} from '../../../../plugins/security_solution/common/field_maps/field_names';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts
index 82899ff0de8f7..8f9a057a7e90e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts
@@ -7,10 +7,11 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -30,13 +31,8 @@ import {
   waitForAlertToComplete,
   waitForSignalsToBePresent,
 } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
@@ -311,7 +307,6 @@ export default ({ getService }: FtrProviderContext) => {
           bodyId,
           RuleExecutionStatus['partial failure']
         );
-        await sleep(5000);
 
         const { body: rule } = await supertest
           .get(DETECTION_ENGINE_RULES_URL)
@@ -344,7 +339,6 @@ export default ({ getService }: FtrProviderContext) => {
           bodyId,
           RuleExecutionStatus['partial failure']
         );
-        await sleep(5000);
         await waitForSignalsToBePresent(supertest, log, 2, [bodyId]);
 
         const { body: rule } = await supertest
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts
index 7ea9e4cdb5f84..da5d54fdf2d7a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_CREATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -30,6 +30,24 @@ export default ({ getService }: FtrProviderContext): void => {
   const log = getService('log');
 
   describe('create_rules_bulk', () => {
+    describe('deprecations', () => {
+      afterEach(async () => {
+        await deleteAllAlerts(supertest, log);
+      });
+
+      it('should return a warning header', async () => {
+        const { header } = await supertest
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
+          .set('kbn-xsrf', 'true')
+          .send([getSimpleRule()])
+          .expect(200);
+
+        expect(header.warning).to.be(
+          '299 Kibana "Deprecated endpoint: /api/detection_engine/rules/_bulk_create API is deprecated since v8.2. Please use the /api/detection_engine/rules/_bulk_action API instead. See https://www.elastic.co/guide/en/security/master/rule-api-overview.html for more detail."'
+        );
+      });
+    });
+
     describe('creating rules in bulk', () => {
       before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
@@ -50,7 +68,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should create a single rule with a rule_id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRule()])
           .expect(200);
@@ -81,7 +99,7 @@ export default ({ getService }: FtrProviderContext): void => {
       it('should create a single rule with a rule_id and validate it ran successfully', async () => {
         const simpleRule = getRuleForSignalTesting(['auditbeat-*']);
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([simpleRule])
           .expect(200);
@@ -91,7 +109,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should create a single rule without a rule_id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRuleWithoutRuleId()])
           .expect(200);
@@ -102,7 +120,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return a 200 ok but have a 409 conflict if we attempt to create the same rule_id twice', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRule(), getSimpleRule()])
           .expect(200);
@@ -120,13 +138,13 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return a 200 ok but have a 409 conflict if we attempt to create the same rule_id that already exists', async () => {
         await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'true')
           .send([getSimpleRule()])
           .expect(200);
 
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_create`)
+          .post(DETECTION_ENGINE_RULES_BULK_CREATE)
           .set('kbn-xsrf', 'foo')
           .send([getSimpleRule()])
           .expect(200);
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts
index 60cb8a4017905..5a5011f05aac5 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts
@@ -11,9 +11,10 @@ import {
   DEFAULT_SIGNALS_INDEX,
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-} from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
-import { SIGNALS_TEMPLATE_VERSION } from '../../../../plugins/security_solution/server/lib/detection_engine/routes/index/get_signals_template';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { SIGNALS_TEMPLATE_VERSION } from '@kbn/security-solution-plugin/server/lib/detection_engine/routes/index/get_signals_template';
+import { Signal } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -23,7 +24,6 @@ import {
   waitForIndexToPopulate,
 } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { Signal } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
 
 interface CreateResponse {
   index: string;
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
index 278018796d10a..b38b9b09bbe96 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
@@ -20,10 +20,22 @@ import {
 } from '@kbn/rule-data-utils';
 import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+
+import { getCreateThreatMatchRulesSchemaMock } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request/rule_schemas.mock';
+import { getThreatMatchingSchemaPartialMock } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema.mocks';
+import { ENRICHMENT_TYPES } from '@kbn/security-solution-plugin/common/cti/constants';
+import { Ancestor } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
+import {
+  ALERT_ANCESTORS,
+  ALERT_DEPTH,
+  ALERT_ORIGINAL_EVENT_ACTION,
+  ALERT_ORIGINAL_EVENT_CATEGORY,
+  ALERT_ORIGINAL_EVENT_MODULE,
+  ALERT_ORIGINAL_TIME,
+} from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import {
   createRule,
   createSignalsIndex,
@@ -34,19 +46,7 @@ import {
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
 } from '../../utils';
-
-import { getCreateThreatMatchRulesSchemaMock } from '../../../../plugins/security_solution/common/detection_engine/schemas/request/rule_schemas.mock';
-import { getThreatMatchingSchemaPartialMock } from '../../../../plugins/security_solution/common/detection_engine/schemas/response/rules_schema.mocks';
-import { ENRICHMENT_TYPES } from '../../../../plugins/security_solution/common/cti/constants';
-import { Ancestor } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import {
-  ALERT_ANCESTORS,
-  ALERT_DEPTH,
-  ALERT_ORIGINAL_EVENT_ACTION,
-  ALERT_ORIGINAL_EVENT_CATEGORY,
-  ALERT_ORIGINAL_EVENT_MODULE,
-  ALERT_ORIGINAL_TIME,
-} from '../../../../plugins/security_solution/common/field_maps/field_names';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 const format = (value: unknown): string => JSON.stringify(value, null, 2);
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts
index 19076506998a9..69cbd9fd4d4c7 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { BASE_ALERTING_API_PATH } from '../../../../plugins/alerting/common';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { BASE_ALERTING_API_PATH } from '@kbn/alerting-plugin/common';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createLegacyRuleAction,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts
index 69be1f2eb0aff..29f5d5edf49d9 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_rules_bulk.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { BASE_ALERTING_API_PATH } from '../../../../plugins/alerting/common';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { BASE_ALERTING_API_PATH } from '@kbn/alerting-plugin/common';
+import { DETECTION_ENGINE_RULES_BULK_DELETE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createLegacyRuleAction,
@@ -31,6 +31,22 @@ export default ({ getService }: FtrProviderContext): void => {
   const log = getService('log');
 
   describe('delete_rules_bulk', () => {
+    describe('deprecations', () => {
+      it('should return a warning header', async () => {
+        await createRule(supertest, log, getSimpleRule());
+
+        const { header } = await supertest
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
+          .set('kbn-xsrf', 'true')
+          .send([{ rule_id: 'rule-1' }])
+          .expect(200);
+
+        expect(header.warning).to.be(
+          '299 Kibana "Deprecated endpoint: /api/detection_engine/rules/_bulk_delete API is deprecated since v8.2. Please use the /api/detection_engine/rules/_bulk_action API instead. See https://www.elastic.co/guide/en/security/master/rule-api-overview.html for more detail."'
+        );
+      });
+    });
+
     describe('deleting rules bulk using DELETE', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest, log);
@@ -46,7 +62,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete the rule in bulk
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1' }])
           .expect(200);
@@ -60,7 +76,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its rule_id
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: bodyWithCreatedRule.rule_id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -74,7 +90,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its id
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -85,7 +101,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the ruled_id does not exist when trying to delete a rule_id', async () => {
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: 'fake_id' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -103,7 +119,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the id does not exist when trying to delete an id', async () => {
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -123,7 +139,7 @@ export default ({ getService }: FtrProviderContext): void => {
         const bodyWithCreatedRule = await createRule(supertest, log, getSimpleRuleWithoutRuleId());
 
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }, { id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -158,7 +174,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete the rule in bulk
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1' }])
           .expect(200);
@@ -172,7 +188,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its rule_id
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: bodyWithCreatedRule.rule_id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -186,7 +202,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete that rule by its id
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -197,7 +213,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the ruled_id does not exist when trying to delete a rule_id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ rule_id: 'fake_id' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -215,7 +231,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should return an error if the id does not exist when trying to delete an id', async () => {
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -235,7 +251,7 @@ export default ({ getService }: FtrProviderContext): void => {
         const bodyWithCreatedRule = await createRule(supertest, log, getSimpleRuleWithoutRuleId());
 
         const { body } = await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .post(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: bodyWithCreatedRule.id }, { id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612' }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -272,7 +288,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete the rule with the legacy action
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: createRuleBody.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -320,7 +336,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // delete 2 rules where both have legacy actions
         const { body } = await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: createRuleBody1.id }, { id: createRuleBody2.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
@@ -372,7 +388,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // bulk delete the rule
         await supertest
-          .delete(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
+          .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
           .send([{ id: createRuleBody.id }])
           .set('kbn-xsrf', 'true')
           .expect(200);
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts
index c73f817215da8..ecb4cab25286c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts
@@ -11,8 +11,8 @@ import {
   DEFAULT_SIGNALS_INDEX,
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-} from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createSignalsIndex, deleteSignalsIndex, getIndexNameFromLoad, waitFor } from '../../utils';
 import { createUserAndRole } from '../../../common/services/security_solution';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
index 7ea1985e8d7df..b30e16681d488 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts
index 8733c645112d1..009d212649248 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts
@@ -11,8 +11,8 @@ import {
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-} from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
index a56403ce54252..f2e5e19ed182f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts
index cb1dd1470190e..a374136ce4907 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts
@@ -23,14 +23,24 @@ import { flattenWithPrefix } from '@kbn/securitysolution-rules';
 
 import { orderBy, get } from 'lodash';
 
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
 import {
   EqlCreateSchema,
   QueryCreateSchema,
   SavedQueryCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { Ancestor } from '@kbn/security-solution-plugin/server/lib/detection_engine/signals/types';
+import {
+  ALERT_ANCESTORS,
+  ALERT_DEPTH,
+  ALERT_ORIGINAL_TIME,
+  ALERT_ORIGINAL_EVENT,
+  ALERT_ORIGINAL_EVENT_CATEGORY,
+  ALERT_GROUP_ID,
+  ALERT_THRESHOLD_RESULT,
+} from '@kbn/security-solution-plugin/common/field_maps/field_names';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   createRule,
   createSignalsIndex,
@@ -46,17 +56,7 @@ import {
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
 } from '../../utils';
-import { Ancestor } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import {
-  ALERT_ANCESTORS,
-  ALERT_DEPTH,
-  ALERT_ORIGINAL_TIME,
-  ALERT_ORIGINAL_EVENT,
-  ALERT_ORIGINAL_EVENT_CATEGORY,
-  ALERT_GROUP_ID,
-  ALERT_THRESHOLD_RESULT,
-} from '../../../../plugins/security_solution/common/field_maps/field_names';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 /**
  * Specific _id to use for some of the tests. If the archiver changes and you see errors
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts
index 6764ed27a43e7..c3b2eb3568ccb 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_prepackaged_rules_status.ts
@@ -10,7 +10,7 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_PREPACKAGED_URL,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts
index b8287c4433ba4..d3bddc8b0d46c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_rule_execution_events.ts
@@ -10,8 +10,8 @@ import expect from '@kbn/expect';
 import moment from 'moment';
 import { set } from '@elastic/safer-lodash-set';
 import uuid from 'uuid';
-import { detectionEngineRuleExecutionEventsUrl } from '../../../../plugins/security_solution/common/constants';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
+import { detectionEngineRuleExecutionEventsUrl } from '@kbn/security-solution-plugin/common/constants';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts
index a1400e865fa56..e5351b7e0f47b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL } from '../../../../plugins/security_solution/common/constants';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import { DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createSignalsIndex, deleteSignalsIndex, getIndexNameFromLoad } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts
index 21d545aef0f04..b2dffead914b8 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_export_rules.ts
@@ -8,10 +8,10 @@
 import expect from '@kbn/expect';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 
-import { deleteAllExceptions } from '../../../lists_api_integration/utils';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
@@ -21,7 +21,7 @@ import {
   deleteSignalsIndex,
   getSimpleRule,
 } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
+import { deleteAllExceptions } from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // This test was meant to be more full flow, ensuring that
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
index e26471b0316ed..6c332b09483e2 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
@@ -8,8 +8,14 @@
 import expect from '@kbn/expect';
 
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import {
+  toNdJsonString,
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -22,14 +28,8 @@ import {
   removeServerGeneratedProperties,
   ruleToNdjson,
 } from '../../utils';
-import {
-  toNdJsonString,
-  getImportExceptionsListItemSchemaMock,
-  getImportExceptionsListSchemaMock,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
 import { deleteAllExceptions } from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 
 const getImportRuleBuffer = (connectorId: string) => {
   const rule1 = {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
index dbe24c77b57ae..891d282b2f980 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
@@ -58,21 +58,21 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     // That split here enable us on using a different ciGroup to run the tests
     // listed on ./exception_operators_data_types/index
     describe('', function () {
-      loadTestFile(require.resolve('./exception_operators_data_types/index'));
+      loadTestFile(require.resolve('./exception_operators_data_types'));
     });
 
     // That split here enable us on using a different ciGroup to run the tests
     // listed on ./keyword_family/index
     describe('', function () {
-      loadTestFile(require.resolve('./keyword_family/index'));
+      loadTestFile(require.resolve('./keyword_family'));
     });
 
     describe('', function () {
-      loadTestFile(require.resolve('./alerts/index'));
+      loadTestFile(require.resolve('./alerts'));
     });
 
     describe('', function () {
-      loadTestFile(require.resolve('./telemetry/index'));
+      loadTestFile(require.resolve('./telemetry'));
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
index 7b3f938ceef2b..011ed04376281 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   EqlCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_THRESHOLD_RESULT } from '../../../../../plugins/security_solution/common/field_maps/field_names';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_THRESHOLD_RESULT } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
index 964bb40add2a1..c07f0efb1df98 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
@@ -7,6 +7,12 @@
 
 import expect from '@kbn/expect';
 
+import {
+  EqlCreateSchema,
+  QueryCreateSchema,
+  ThresholdCreateSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_THRESHOLD_RESULT } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
   createRule,
@@ -20,12 +26,6 @@ import {
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
 } from '../../../utils';
-import {
-  EqlCreateSchema,
-  QueryCreateSchema,
-  ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_THRESHOLD_RESULT } from '../../../../../plugins/security_solution/common/field_maps/field_names';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
index c33354e383809..52c5ae615da95 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import {
   EqlCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_THRESHOLD_RESULT } from '../../../../../plugins/security_solution/common/field_maps/field_names';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_THRESHOLD_RESULT } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
index 18edf09727d3a..0b7491e00b430 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
@@ -12,7 +12,9 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
   DETECTION_ENGINE_SIGNALS_STATUS_URL,
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -28,8 +30,6 @@ import {
   getRuleForSignalTesting,
 } from '../../utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
-import { DetectionAlert } from '../../../../plugins/security_solution/common/detection_engine/schemas/alerts';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
index ccfd8371c3f2d..ee94c94c99376 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
index 51cf1a334a2c7..41f8066e50779 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_BULK_UPDATE } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -28,6 +28,26 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
 
   describe('patch_rules_bulk', () => {
+    describe('deprecations', () => {
+      afterEach(async () => {
+        await deleteAllAlerts(supertest, log);
+      });
+
+      it('should return a warning header', async () => {
+        await createRule(supertest, log, getSimpleRule('rule-1'));
+
+        const { header } = await supertest
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
+          .set('kbn-xsrf', 'true')
+          .send([{ rule_id: 'rule-1', name: 'some other name' }])
+          .expect(200);
+
+        expect(header.warning).to.be(
+          '299 Kibana "Deprecated endpoint: /api/detection_engine/rules/_bulk_update API is deprecated since v8.2. Please use the /api/detection_engine/rules/_bulk_action API instead. See https://www.elastic.co/guide/en/security/master/rule-api-overview.html for more detail."'
+        );
+      });
+    });
+
     describe('patch rules bulk', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest, log);
@@ -43,7 +63,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', name: 'some other name' }])
           .expect(200);
@@ -61,7 +81,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch both rule names
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { rule_id: 'rule-1', name: 'some other name' },
@@ -88,7 +108,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ id: createRuleBody.id, name: 'some other name' }])
           .expect(200);
@@ -106,7 +126,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch both rule names
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { id: createRule1.id, name: 'some other name' },
@@ -149,7 +169,7 @@ export default ({ getService }: FtrProviderContext) => {
         ]);
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { id: rule1.id, enabled: false },
@@ -182,7 +202,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ id: createdBody.id, name: 'some other name' }])
           .expect(200);
@@ -199,7 +219,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's enabled to false
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', enabled: false }])
           .expect(200);
@@ -216,7 +236,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's enabled to false and another property
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', severity: 'low', enabled: false }])
           .expect(200);
@@ -235,14 +255,14 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch a simple rule's timeline_title
         await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', timeline_title: 'some title', timeline_id: 'some id' }])
           .expect(200);
 
         // patch a simple rule's name
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'rule-1', name: 'some other name' }])
           .expect(200);
@@ -259,7 +279,7 @@ export default ({ getService }: FtrProviderContext) => {
 
       it('should return a 200 but give a 404 in the message if it is given a fake id', async () => {
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ id: '5096dec6-b6b9-4d8d-8f93-6c2602079d9d', name: 'some other name' }])
           .expect(200);
@@ -277,7 +297,7 @@ export default ({ getService }: FtrProviderContext) => {
 
       it('should return a 200 but give a 404 in the message if it is given a fake rule_id', async () => {
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([{ rule_id: 'fake_id', name: 'some other name' }])
           .expect(200);
@@ -295,7 +315,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch one rule name and give a fake id for the second
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { rule_id: 'rule-1', name: 'some other name' },
@@ -325,7 +345,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // patch one rule name and give a fake id for the second
         const { body } = await supertest
-          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([
             { id: createdBody.id, name: 'some other name' },
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts
index 5b36d9a880397..10ae8f20da539 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.ts
@@ -10,11 +10,12 @@ import expect from '@kbn/expect';
 import {
   DETECTION_ENGINE_RULES_BULK_ACTION,
   DETECTION_ENGINE_RULES_URL,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import {
   BulkAction,
   BulkActionEditType,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/common/schemas';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/common/schemas';
+import { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   binaryToString,
@@ -28,7 +29,6 @@ import {
   createLegacyRuleAction,
   getLegacyActionSO,
 } from '../../utils';
-import { RulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/response';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts
index 14af40f901461..4f49e5ec17a6d 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/preview_rules.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_PREVIEW } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_PREVIEW } from '@kbn/security-solution-plugin/common/constants';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteAllAlerts, getSimplePreviewRule, getSimpleRulePreviewOutput } from '../../utils';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // eslint-disable-next-line import/no-default-export
@@ -91,6 +91,38 @@ export default ({ getService }: FtrProviderContext) => {
             .expect(403);
         });
       });
+
+      describe('hunter', () => {
+        const role = ROLES.hunter;
+
+        beforeEach(async () => {
+          await createUserAndRole(getService, role);
+        });
+
+        afterEach(async () => {
+          await deleteUserAndRole(getService, role);
+        });
+
+        it('should return with an error about not having correct permissions', async () => {
+          const { body } = await supertestWithoutAuth
+            .post(DETECTION_ENGINE_RULES_PREVIEW)
+            .auth(role, 'changeme')
+            .set('kbn-xsrf', 'true')
+            .send(getSimplePreviewRule())
+            .expect(200);
+
+          const { logs } = getSimpleRulePreviewOutput(undefined, [
+            {
+              errors: [
+                'Missing "read" privileges for the ".preview.alerts-security.alerts" or ".internal.preview.alerts-security.alerts" indices. Without these privileges you cannot use the Rule Preview feature.',
+              ],
+              warnings: [],
+              duration: 0,
+            },
+          ]);
+          expect(body).to.eql({ logs });
+        });
+      });
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts
index dc72146db3834..fa5453f07d22f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_privileges.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
-import { DETECTION_ENGINE_PRIVILEGES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_PRIVILEGES_URL } from '@kbn/security-solution-plugin/common/constants';
 
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ROLES } from '../../../../plugins/security_solution/common/test';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
index 92cc8cf52f18f..5f03ce094e95e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createRule,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts
index b3469c89dd459..2b4b31bb5510b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/resolve_read_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createSignalsIndex, deleteAllAlerts, deleteSignalsIndex } from '../../utils';
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts
index 8936115ac6e59..d2050179abd0e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/index.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('Detection rule type telemetry', function () {
     describe('', function () {
-      this.tags('ciGroup11');
+      this.tags('ciGroup28');
       loadTestFile(require.resolve('./usage_collector/all_types'));
       loadTestFile(require.resolve('./usage_collector/detection_rules'));
       loadTestFile(require.resolve('./usage_collector/detection_rule_status'));
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts
index b80cb9d478ca3..627faebb2daaa 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/task_based/detection_rules.ts
@@ -8,6 +8,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import expect from '@kbn/expect';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   createRule,
@@ -22,7 +23,6 @@ import {
   createExceptionListItem,
 } from '../../../../utils';
 import { deleteAllExceptions } from '../../../../../lists_api_integration/utils';
-import { DETECTION_ENGINE_RULES_URL } from '../../../../../../plugins/security_solution/common/constants';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts
index 29baea4e4bd90..2e2a9811356cb 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/all_types.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { getInitialDetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/get_initial_usage';
 import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -13,7 +14,6 @@ import {
   deleteSignalsIndex,
   getStats,
 } from '../../../../utils';
-import { getInitialDetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/get_initial_usage';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts
index 9092cacdad050..05f7ce40d9d32 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rule_status.ts
@@ -6,15 +6,20 @@
  */
 
 import expect from '@kbn/expect';
-import type { MlJobUsageMetric } from '../../../../../../plugins/security_solution/server/usage/detections/ml_jobs/types';
-import type { RulesTypeUsage } from '../../../../../../plugins/security_solution/server/usage/detections/rules/types';
-import type { DetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/types';
+import type { MlJobUsageMetric } from '@kbn/security-solution-plugin/server/usage/detections/ml_jobs/types';
+import type { RulesTypeUsage } from '@kbn/security-solution-plugin/server/usage/detections/rules/types';
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
 import type {
   ThreatMatchCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
-import { getInitialMlJobUsage } from '../../../../../../plugins/security_solution/server/usage/detections/ml_jobs/get_initial_usage';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getInitialMlJobUsage } from '@kbn/security-solution-plugin/server/usage/detections/ml_jobs/get_initial_usage';
+import { getInitialDetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/get_initial_usage';
+import {
+  getInitialMaxAvgMin,
+  getInitialSingleEventLogUsage,
+  getInitialSingleEventMetric,
+} from '@kbn/security-solution-plugin/server/usage/detections/rules/get_initial_usage';
 import {
   createRule,
   createSignalsIndex,
@@ -29,12 +34,7 @@ import {
   waitForSignalsToBePresent,
   deleteAllEventLogExecutionEvents,
 } from '../../../../utils';
-import { getInitialDetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/get_initial_usage';
-import {
-  getInitialMaxAvgMin,
-  getInitialSingleEventLogUsage,
-  getInitialSingleEventMetric,
-} from '../../../../../../plugins/security_solution/server/usage/detections/rules/get_initial_usage';
+import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts
index d565960cb2442..febaf8df1890f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/telemetry/usage_collector/detection_rules.ts
@@ -6,11 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import type { DetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/types';
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
 import type {
   ThreatMatchCreateSchema,
   ThresholdCreateSchema,
-} from '../../../../../../plugins/security_solution/common/detection_engine/schemas/request';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getInitialDetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/get_initial_usage';
+import { getInitialEventLogUsage } from '@kbn/security-solution-plugin/server/usage/detections/rules/get_initial_usage';
 import type { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   createLegacyRuleAction,
@@ -34,8 +36,6 @@ import {
   updateRule,
   deleteAllEventLogExecutionEvents,
 } from '../../../../utils';
-import { getInitialDetectionMetrics } from '../../../../../../plugins/security_solution/server/usage/detections/get_initial_usage';
-import { getInitialEventLogUsage } from '../../../../../../plugins/security_solution/server/usage/detections/rules/get_initial_usage';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts
index ec12446f1f9df..9a459b1ffb0e1 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/throttle.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import {
   DETECTION_ENGINE_RULES_URL,
   NOTIFICATION_THROTTLE_NO_ACTIONS,
   NOTIFICATION_THROTTLE_RULE,
-} from '../../../../plugins/security_solution/common/constants';
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts
index e0d539a3fe33b..cdec24ae1cc14 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts
@@ -7,12 +7,12 @@
 
 import expect from '@kbn/expect';
 import { orderBy } from 'lodash';
-import { RuleExecutionStatus } from '../../../../plugins/security_solution/common/detection_engine/schemas/common';
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
 import {
   EqlCreateSchema,
   QueryCreateSchema,
-} from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
-import { ALERT_ORIGINAL_TIME } from '../../../../plugins/security_solution/common/field_maps/field_names';
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { ALERT_ORIGINAL_TIME } from '@kbn/security-solution-plugin/common/field_maps/field_names';
 
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
@@ -27,10 +27,6 @@ import {
   getEqlRuleForSignalTesting,
 } from '../../utils';
 
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
@@ -70,7 +66,6 @@ export default ({ getService }: FtrProviderContext) => {
           const rule = getRuleForSignalTesting(['timestamp_in_seconds']);
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -86,7 +81,6 @@ export default ({ getService }: FtrProviderContext) => {
           };
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -101,7 +95,6 @@ export default ({ getService }: FtrProviderContext) => {
           const rule = getEqlRuleForSignalTesting(['timestamp_in_seconds']);
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -117,7 +110,6 @@ export default ({ getService }: FtrProviderContext) => {
           };
           const { id } = await createRule(supertest, log, rule);
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsOpen = await getSignalsByIds(supertest, log, [id]);
           const hits = signalsOpen.hits.hits
@@ -184,7 +176,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 3, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id], 3);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -204,7 +195,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -226,7 +216,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id, id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -249,7 +238,6 @@ export default ({ getService }: FtrProviderContext) => {
           const { id } = await createRule(supertest, log, rule);
 
           await waitForRuleSuccessOrStatus(supertest, log, id);
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 1, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id, id]);
           const hits = signalsResponse.hits.hits
@@ -271,7 +259,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -293,7 +280,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 2, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id, id]);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
@@ -348,7 +334,6 @@ export default ({ getService }: FtrProviderContext) => {
             id,
             RuleExecutionStatus['partial failure']
           );
-          await sleep(5000);
           await waitForSignalsToBePresent(supertest, log, 200, [id]);
           const signalsResponse = await getSignalsByIds(supertest, log, [id], 200);
           const signals = signalsResponse.hits.hits.map((hit) => hit._source);
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts
index a46df0711c45d..53062e2c2cae6 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
index 819683b564c68..0291164fd39cb 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
index b165258237b41..19447dec2b4a8 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
@@ -6,9 +6,12 @@
  */
 
 import expect from '@kbn/expect';
-import { FullResponseSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+import { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 
-import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import {
+  DETECTION_ENGINE_RULES_URL,
+  DETECTION_ENGINE_RULES_BULK_UPDATE,
+} from '@kbn/security-solution-plugin/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -30,6 +33,27 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
 
   describe('update_rules_bulk', () => {
+    describe('deprecations', () => {
+      afterEach(async () => {
+        await deleteAllAlerts(supertest, log);
+      });
+
+      it('should return a warning header', async () => {
+        await createRule(supertest, log, getSimpleRule('rule-1'));
+        const updatedRule = getSimpleRuleUpdate('rule-1');
+
+        const { header } = await supertest
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
+          .set('kbn-xsrf', 'true')
+          .send([updatedRule])
+          .expect(200);
+
+        expect(header.warning).to.be(
+          '299 Kibana "Deprecated endpoint: /api/detection_engine/rules/_bulk_update API is deprecated since v8.2. Please use the /api/detection_engine/rules/_bulk_action API instead. See https://www.elastic.co/guide/en/security/master/rule-api-overview.html for more detail."'
+        );
+      });
+    });
+
     describe('update rules bulk', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest, log);
@@ -48,7 +72,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update a simple rule's name
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule])
           .expect(200);
@@ -78,7 +102,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update both rule names
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1, updatedRule2])
           .expect(200);
@@ -137,7 +161,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update both rule names
         const { body }: { body: FullResponseSchema[] } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1, updatedRule2])
           .expect(200);
@@ -199,7 +223,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update both rule names
         const { body }: { body: FullResponseSchema[] } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1, updatedRule2])
           .expect(200);
@@ -225,7 +249,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete updatedRule1.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1])
           .expect(200);
@@ -253,7 +277,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete updatedRule2.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1, updatedRule2])
           .expect(200);
@@ -282,7 +306,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete updatedRule1.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1])
           .expect(200);
@@ -303,7 +327,7 @@ export default ({ getService }: FtrProviderContext) => {
         updatedRule1.enabled = false;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([updatedRule1])
           .expect(200);
@@ -326,7 +350,7 @@ export default ({ getService }: FtrProviderContext) => {
         ruleUpdate.timeline_id = 'some id';
 
         await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate])
           .expect(200);
@@ -336,7 +360,7 @@ export default ({ getService }: FtrProviderContext) => {
         ruleUpdate2.name = 'some other name';
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate2])
           .expect(200);
@@ -355,7 +379,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete ruleUpdate.rule_id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate])
           .expect(200);
@@ -377,7 +401,7 @@ export default ({ getService }: FtrProviderContext) => {
         delete ruleUpdate.id;
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate])
           .expect(200);
@@ -403,7 +427,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         // update one rule name and give a fake id for the second
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([ruleUpdate, ruleUpdate2])
           .expect(200);
@@ -440,7 +464,7 @@ export default ({ getService }: FtrProviderContext) => {
         rule2.name = 'some other name';
 
         const { body } = await supertest
-          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .put(DETECTION_ENGINE_RULES_BULK_UPDATE)
           .set('kbn-xsrf', 'true')
           .send([rule1, rule2])
           .expect(200);
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
deleted file mode 100644
index de66002343212..0000000000000
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ /dev/null
@@ -1,2119 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
-import { KbnClient } from '@kbn/test';
-import { ALERT_RULE_RULE_ID, ALERT_RULE_UUID } from '@kbn/rule-data-utils';
-
-import type { TransportResult } from '@elastic/elasticsearch';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { Client } from '@elastic/elasticsearch';
-import type SuperTest from 'supertest';
-import type {
-  ListArray,
-  NonEmptyEntriesArray,
-  OsTypeArray,
-} from '@kbn/securitysolution-io-ts-list-types';
-import type {
-  CreateExceptionListItemSchema,
-  CreateExceptionListSchema,
-  ExceptionListItemSchema,
-  ExceptionListSchema,
-} from '@kbn/securitysolution-io-ts-list-types';
-import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { ToolingLog } from '@kbn/dev-utils';
-import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import { SavedObjectReference } from 'kibana/server';
-import { PrePackagedRulesAndTimelinesStatusSchema } from '../../plugins/security_solution/common/detection_engine/schemas/response';
-import {
-  CreateRulesSchema,
-  UpdateRulesSchema,
-  FullResponseSchema,
-  QueryCreateSchema,
-  EqlCreateSchema,
-  ThresholdCreateSchema,
-  PreviewRulesSchema,
-  ThreatMatchCreateSchema,
-  RulePreviewLogs,
-  SavedQueryCreateSchema,
-} from '../../plugins/security_solution/common/detection_engine/schemas/request';
-import { signalsMigrationType } from '../../plugins/security_solution/server/lib/detection_engine/migrations/saved_objects';
-import {
-  RuleExecutionStatus,
-  Status,
-  SignalIds,
-} from '../../plugins/security_solution/common/detection_engine/schemas/common';
-import { RulesSchema } from '../../plugins/security_solution/common/detection_engine/schemas/response/rules_schema';
-import {
-  DETECTION_ENGINE_INDEX_URL,
-  DETECTION_ENGINE_PREPACKAGED_URL,
-  DETECTION_ENGINE_QUERY_SIGNALS_URL,
-  DETECTION_ENGINE_RULES_URL,
-  DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
-  DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
-  INTERNAL_IMMUTABLE_KEY,
-  INTERNAL_RULE_ID_KEY,
-  SECURITY_TELEMETRY_URL,
-  UPDATE_OR_CREATE_LEGACY_ACTIONS,
-} from '../../plugins/security_solution/common/constants';
-import { DetectionMetrics } from '../../plugins/security_solution/server/usage/detections/types';
-import { LegacyRuleActions } from '../../plugins/security_solution/server/lib/detection_engine/rule_actions/legacy_types';
-import { DetectionAlert } from '../../plugins/security_solution/common/detection_engine/schemas/alerts';
-
-/**
- * This will remove server generated properties such as date times, etc...
- * @param rule Rule to pass in to remove typical server generated properties
- */
-export const removeServerGeneratedProperties = (
-  rule: FullResponseSchema
-): Partial<FullResponseSchema> => {
-  const {
-    /* eslint-disable @typescript-eslint/naming-convention */
-    id,
-    created_at,
-    updated_at,
-    execution_summary,
-    /* eslint-enable @typescript-eslint/naming-convention */
-    ...removedProperties
-  } = rule;
-  return removedProperties;
-};
-
-/**
- * This will remove server generated properties such as date times, etc... including the rule_id
- * @param rule Rule to pass in to remove typical server generated properties
- */
-export const removeServerGeneratedPropertiesIncludingRuleId = (
-  rule: FullResponseSchema
-): Partial<FullResponseSchema> => {
-  const ruleWithRemovedProperties = removeServerGeneratedProperties(rule);
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { rule_id, ...additionalRuledIdRemoved } = ruleWithRemovedProperties;
-  return additionalRuledIdRemoved;
-};
-
-/**
- * This is a typical simple rule for testing that is easy for most basic testing
- * @param ruleId
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getSimpleRule = (ruleId = 'rule-1', enabled = false): QueryCreateSchema => ({
-  name: 'Simple Rule Query',
-  description: 'Simple Rule Query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index: ['auditbeat-*'],
-  type: 'query',
-  query: 'user.name: root or user.name: admin',
-});
-
-/**
- * This is a typical simple preview rule for testing that is easy for most basic testing
- * @param ruleId
- * @param enabled The number of times the rule will be run through the executors. Defaulted to 12,
- * the execution time for the default interval time of 5m.
- */
-export const getSimplePreviewRule = (
-  ruleId = 'preview-rule-1',
-  invocationCount = 12
-): PreviewRulesSchema => ({
-  name: 'Simple Rule Query',
-  description: 'Simple Rule Query',
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index: ['auditbeat-*'],
-  type: 'query',
-  query: 'user.name: root or user.name: admin',
-  invocationCount,
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is rule-1 by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'rule-1',
-  enabled = true
-): QueryCreateSchema => ({
-  name: 'Signal Testing Query',
-  description: 'Tests a simple query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index,
-  type: 'query',
-  query: '*:*',
-  from: '1900-01-01T00:00:00.000Z',
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of Saved Query signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for SavedQuery and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is threshold-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getSavedQueryRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'saved-query-rule',
-  enabled = true
-): SavedQueryCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'saved_query',
-  saved_id: 'abcd',
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of EQL signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for EQL and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is eql-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getEqlRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'eql-rule',
-  enabled = true
-): EqlCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'eql',
-  language: 'eql',
-  query: 'any where true',
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of Threat Match signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for Threat Match and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is threshold-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getThreatMatchRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'threat-match-rule',
-  enabled = true
-): ThreatMatchCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'threat_match',
-  language: 'kuery',
-  query: '*:*',
-  threat_query: '*:*',
-  threat_mapping: [
-    // We match host.name against host.name
-    {
-      entries: [
-        {
-          field: 'host.name',
-          value: 'host.name',
-          type: 'mapping',
-        },
-      ],
-    },
-  ],
-  threat_index: index, // match against same index for simplicity
-});
-
-/**
- * This is a typical signal testing rule that is easy for most basic testing of output of Threshold signals.
- * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
- * creation for Threshold and testing by getting all the signals at once.
- * @param ruleId The optional ruleId which is threshold-rule by default.
- * @param enabled Enables the rule on creation or not. Defaulted to true.
- */
-export const getThresholdRuleForSignalTesting = (
-  index: string[],
-  ruleId = 'threshold-rule',
-  enabled = true
-): ThresholdCreateSchema => ({
-  ...getRuleForSignalTesting(index, ruleId, enabled),
-  type: 'threshold',
-  language: 'kuery',
-  query: '*:*',
-  threshold: {
-    field: 'process.name',
-    value: 21,
-  },
-});
-
-export const getRuleForSignalTestingWithTimestampOverride = (
-  index: string[],
-  ruleId = 'rule-1',
-  enabled = true,
-  timestampOverride = 'event.ingested'
-): QueryCreateSchema => ({
-  name: 'Signal Testing Query',
-  description: 'Tests a simple query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index,
-  type: 'query',
-  query: '*:*',
-  timestamp_override: timestampOverride,
-  from: '1900-01-01T00:00:00.000Z',
-});
-
-/**
- * This is a typical simple rule for testing that is easy for most basic testing
- * @param ruleId The rule id
- * @param enabled Set to tru to enable it, by default it is off
- */
-export const getSimpleRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
-  name: 'Simple Rule Query',
-  description: 'Simple Rule Query',
-  enabled,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  index: ['auditbeat-*'],
-  type: 'query',
-  query: 'user.name: root or user.name: admin',
-});
-
-/**
- * This is a representative ML rule payload as expected by the server
- * @param ruleId The rule id
- * @param enabled Set to tru to enable it, by default it is off
- */
-export const getSimpleMlRule = (ruleId = 'rule-1', enabled = false): CreateRulesSchema => ({
-  name: 'Simple ML Rule',
-  description: 'Simple Machine Learning Rule',
-  enabled,
-  anomaly_threshold: 44,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  machine_learning_job_id: ['some_job_id'],
-  type: 'machine_learning',
-});
-
-/**
- * This is a representative ML rule payload as expected by the server for an update
- * @param ruleId The rule id
- * @param enabled Set to tru to enable it, by default it is off
- */
-export const getSimpleMlRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
-  name: 'Simple ML Rule',
-  description: 'Simple Machine Learning Rule',
-  enabled,
-  anomaly_threshold: 44,
-  risk_score: 1,
-  rule_id: ruleId,
-  severity: 'high',
-  machine_learning_job_id: ['some_job_id'],
-  type: 'machine_learning',
-});
-
-export const getSignalStatus = () => ({
-  aggs: { statuses: { terms: { field: 'kibana.alert.workflow_status', size: 10 } } },
-});
-
-export const getQueryAllSignals = () => ({
-  query: { match_all: {} },
-});
-
-export const getQuerySignalIds = (signalIds: SignalIds) => ({
-  query: {
-    terms: {
-      _id: signalIds,
-    },
-  },
-});
-
-/**
- * Given an array of ruleIds for a test this will get the signals
- * created from that rule_id.
- * @param ruleIds The rule_id to search for signals
- */
-export const getQuerySignalsRuleId = (ruleIds: string[]) => ({
-  query: {
-    terms: {
-      [ALERT_RULE_RULE_ID]: ruleIds,
-    },
-  },
-});
-
-/**
- * Given an array of ids for a test this will get the signals
- * created from that rule's regular id.
- * @param ruleIds The rule_id to search for signals
- */
-export const getQuerySignalsId = (ids: string[], size = 10) => ({
-  size,
-  query: {
-    terms: {
-      [ALERT_RULE_UUID]: ids,
-    },
-  },
-});
-
-export const setSignalStatus = ({
-  signalIds,
-  status,
-}: {
-  signalIds: SignalIds;
-  status: Status;
-}) => ({
-  signal_ids: signalIds,
-  status,
-});
-
-export const getSignalStatusEmptyResponse = () => ({
-  timed_out: false,
-  total: 0,
-  updated: 0,
-  deleted: 0,
-  batches: 0,
-  version_conflicts: 0,
-  noops: 0,
-  retries: { bulk: 0, search: 0 },
-  throttled_millis: 0,
-  requests_per_second: -1,
-  throttled_until_millis: 0,
-  failures: [],
-});
-
-/**
- * This is a typical simple rule for testing that is easy for most basic testing
- */
-export const getSimpleRuleWithoutRuleId = (): CreateRulesSchema => {
-  const simpleRule = getSimpleRule();
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { rule_id, ...ruleWithoutId } = simpleRule;
-  return ruleWithoutId;
-};
-
-/**
- * Useful for export_api testing to convert from a multi-part binary back to a string
- * @param res Response
- * @param callback Callback
- */
-export const binaryToString = (res: any, callback: any): void => {
-  res.setEncoding('binary');
-  res.data = '';
-  res.on('data', (chunk: any) => {
-    res.data += chunk;
-  });
-  res.on('end', () => {
-    callback(null, Buffer.from(res.data));
-  });
-};
-
-/**
- * This is the typical output of a simple rule that Kibana will output with all the defaults
- * except for the server generated properties.  Useful for testing end to end tests.
- */
-export const getSimpleRuleOutput = (ruleId = 'rule-1', enabled = false): Partial<RulesSchema> => ({
-  actions: [],
-  author: [],
-  created_by: 'elastic',
-  description: 'Simple Rule Query',
-  enabled,
-  false_positives: [],
-  from: 'now-6m',
-  immutable: false,
-  index: ['auditbeat-*'],
-  interval: '5m',
-  rule_id: ruleId,
-  language: 'kuery',
-  output_index: '.siem-signals-default',
-  max_signals: 100,
-  risk_score: 1,
-  risk_score_mapping: [],
-  name: 'Simple Rule Query',
-  query: 'user.name: root or user.name: admin',
-  references: [],
-  severity: 'high',
-  severity_mapping: [],
-  updated_by: 'elastic',
-  tags: [],
-  to: 'now',
-  type: 'query',
-  threat: [],
-  throttle: 'no_actions',
-  exceptions_list: [],
-  version: 1,
-});
-
-/**
- * This is the typical output of a simple rule preview, with errors and warnings coming up from the rule
- * execution process and a `previewId` generated server side for later preview querying
- *
- * @param previewId Rule id generated by the server itself
- * @param logs Errors and warnings returned by executor and route file, defaults to empty array
- */
-export const getSimpleRulePreviewOutput = (
-  previewId = undefined,
-  logs: RulePreviewLogs[] = []
-) => ({
-  logs,
-  previewId,
-  isAborted: false,
-});
-
-export const resolveSimpleRuleOutput = (
-  ruleId = 'rule-1',
-  enabled = false
-): Partial<RulesSchema> => ({ outcome: 'exactMatch', ...getSimpleRuleOutput(ruleId, enabled) });
-
-/**
- * This is the typical output of a simple rule that Kibana will output with all the defaults except
- * for all the server generated properties such as created_by. Useful for testing end to end tests.
- */
-export const getSimpleRuleOutputWithoutRuleId = (ruleId = 'rule-1'): Partial<RulesSchema> => {
-  const rule = getSimpleRuleOutput(ruleId);
-  const { rule_id: rId, ...ruleWithoutRuleId } = rule;
-  return ruleWithoutRuleId;
-};
-
-/**
- * This is the typical output of a simple rule that Kibana will output with all the defaults except
- * for all the server generated properties such as created_by. Useful for testing end to end tests.
- */
-export const resolveSimpleRuleOutputWithoutRuleId = (ruleId = 'rule-1'): Partial<RulesSchema> => {
-  const rule = getSimpleRuleOutput(ruleId);
-  const { rule_id: rId, ...ruleWithoutRuleId } = rule;
-  return { outcome: 'exactMatch', ...ruleWithoutRuleId };
-};
-
-export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => {
-  const rule = getSimpleRuleOutput(ruleId);
-  const { query, language, index, ...rest } = rule;
-
-  return {
-    ...rest,
-    name: 'Simple ML Rule',
-    description: 'Simple Machine Learning Rule',
-    anomaly_threshold: 44,
-    machine_learning_job_id: ['some_job_id'],
-    type: 'machine_learning',
-  };
-};
-
-/**
- * Removes all rules by looping over any found and removing them from REST.
- * @param supertest The supertest agent.
- */
-export const deleteAllAlerts = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      const { body } = await supertest
-        .get(`${DETECTION_ENGINE_RULES_URL}/_find?per_page=9999`)
-        .set('kbn-xsrf', 'true')
-        .send();
-
-      const ids = body.data.map((rule: FullResponseSchema) => ({
-        id: rule.id,
-      }));
-
-      await supertest
-        .post(`${DETECTION_ENGINE_RULES_URL}/_bulk_delete`)
-        .send(ids)
-        .set('kbn-xsrf', 'true');
-
-      const { body: finalCheck } = await supertest
-        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
-        .set('kbn-xsrf', 'true')
-        .send();
-      return finalCheck.data.length === 0;
-    },
-    'deleteAllAlerts',
-    log,
-    50,
-    1000
-  );
-};
-
-export const downgradeImmutableRule = async (
-  es: Client,
-  log: ToolingLog,
-  ruleId: string
-): Promise<void> => {
-  return countDownES(
-    async () => {
-      return es.updateByQuery(
-        {
-          index: '.kibana',
-          refresh: true,
-          wait_for_completion: true,
-          body: {
-            script: {
-              lang: 'painless',
-              source: 'ctx._source.alert.params.version--',
-            },
-            query: {
-              term: {
-                'alert.tags': `${INTERNAL_RULE_ID_KEY}:${ruleId}`,
-              },
-            },
-          },
-        },
-        { meta: true }
-      );
-    },
-    'downgradeImmutableRule',
-    log
-  );
-};
-
-/**
- * Remove all timelines from the .kibana index
- * @param es The ElasticSearch handle
- */
-export const deleteAllTimelines = async (es: Client): Promise<void> => {
-  await es.deleteByQuery({
-    index: '.kibana',
-    q: 'type:siem-ui-timeline',
-    wait_for_completion: true,
-    refresh: true,
-    body: {},
-  });
-};
-
-/**
- * Remove all rules execution info saved objects from the .kibana index
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
- * @param es The ElasticSearch handle
- * @param log The tooling logger
- */
-export const deleteAllRuleExecutionInfo = async (es: Client, log: ToolingLog): Promise<void> => {
-  return countDownES(
-    async () => {
-      return es.deleteByQuery(
-        {
-          index: '.kibana',
-          q: 'type:siem-detection-engine-rule-execution-info',
-          wait_for_completion: true,
-          refresh: true,
-          body: {},
-        },
-        { meta: true }
-      );
-    },
-    'deleteAllRuleExecutionInfo',
-    log
-  );
-};
-
-/**
- * Creates the signals index for use inside of beforeEach blocks of tests
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
- * @param supertest The supertest client library
- */
-export const createSignalsIndex = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
-      return true;
-    },
-    'createSignalsIndex',
-    log
-  );
-};
-
-export const createLegacyRuleAction = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  alertId: string,
-  connectorId: string
-): Promise<unknown> =>
-  supertest
-    .post(`${UPDATE_OR_CREATE_LEGACY_ACTIONS}`)
-    .set('kbn-xsrf', 'true')
-    .query({ alert_id: alertId })
-    .send({
-      name: 'Legacy notification with one action',
-      interval: '1h',
-      actions: [
-        {
-          id: connectorId,
-          group: 'default',
-          params: {
-            message: 'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
-          },
-          actionTypeId: '.slack',
-        },
-      ],
-    });
-
-/**
- * Deletes the signals index for use inside of afterEach blocks of tests
- * @param supertest The supertest client library
- */
-export const deleteSignalsIndex = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
-      return true;
-    },
-    'deleteSignalsIndex',
-    log
-  );
-};
-
-/**
- * Given an array of rule_id strings this will return a ndjson buffer which is useful
- * for testing uploads.
- * @param ruleIds Array of strings of rule_ids
- */
-export const getSimpleRuleAsNdjson = (ruleIds: string[], enabled = false): Buffer => {
-  const stringOfRules = ruleIds.map((ruleId) => {
-    const simpleRule = getSimpleRule(ruleId, enabled);
-    return JSON.stringify(simpleRule);
-  });
-  return Buffer.from(stringOfRules.join('\n'));
-};
-
-/**
- * Given a rule this will convert it to an ndjson buffer which is useful for
- * testing upload features.
- * @param rule The rule to convert to ndjson
- */
-export const ruleToNdjson = (rule: CreateRulesSchema): Buffer => {
-  const stringified = JSON.stringify(rule);
-  return Buffer.from(`${stringified}\n`);
-};
-
-/**
- * This will return a complex rule with all the outputs possible
- * @param ruleId The ruleId to set which is optional and defaults to rule-1
- */
-export const getComplexRule = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
-  actions: [],
-  author: [],
-  name: 'Complex Rule Query',
-  description: 'Complex Rule Query',
-  false_positives: [
-    'https://www.example.com/some-article-about-a-false-positive',
-    'some text string about why another condition could be a false positive',
-  ],
-  risk_score: 1,
-  risk_score_mapping: [],
-  rule_id: ruleId,
-  filters: [
-    {
-      query: {
-        match_phrase: {
-          'host.name': 'siem-windows',
-        },
-      },
-    },
-  ],
-  enabled: false,
-  index: ['auditbeat-*', 'filebeat-*'],
-  interval: '5m',
-  output_index: '.siem-signals-default',
-  meta: {
-    anything_you_want_ui_related_or_otherwise: {
-      as_deep_structured_as_you_need: {
-        any_data_type: {},
-      },
-    },
-  },
-  max_signals: 10,
-  tags: ['tag 1', 'tag 2', 'any tag you want'],
-  to: 'now',
-  from: 'now-6m',
-  severity: 'high',
-  severity_mapping: [],
-  language: 'kuery',
-  type: 'query',
-  threat: [
-    {
-      framework: 'MITRE ATT&CK',
-      tactic: {
-        id: 'TA0040',
-        name: 'impact',
-        reference: 'https://attack.mitre.org/tactics/TA0040/',
-      },
-      technique: [
-        {
-          id: 'T1499',
-          name: 'endpoint denial of service',
-          reference: 'https://attack.mitre.org/techniques/T1499/',
-        },
-      ],
-    },
-    {
-      framework: 'Some other Framework you want',
-      tactic: {
-        id: 'some-other-id',
-        name: 'Some other name',
-        reference: 'https://example.com',
-      },
-      technique: [
-        {
-          id: 'some-other-id',
-          name: 'some other technique name',
-          reference: 'https://example.com',
-        },
-      ],
-    },
-  ],
-  references: [
-    'http://www.example.com/some-article-about-attack',
-    'Some plain text string here explaining why this is a valid thing to look out for',
-  ],
-  timeline_id: 'timeline_id',
-  timeline_title: 'timeline_title',
-  note: '# some investigation documentation',
-  version: 1,
-  query: 'user.name: root or user.name: admin',
-});
-
-/**
- * This will return a complex rule with all the outputs possible
- * @param ruleId The ruleId to set which is optional and defaults to rule-1
- */
-export const getComplexRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
-  actions: [],
-  author: [],
-  created_by: 'elastic',
-  name: 'Complex Rule Query',
-  description: 'Complex Rule Query',
-  false_positives: [
-    'https://www.example.com/some-article-about-a-false-positive',
-    'some text string about why another condition could be a false positive',
-  ],
-  risk_score: 1,
-  risk_score_mapping: [],
-  rule_id: ruleId,
-  filters: [
-    {
-      query: {
-        match_phrase: {
-          'host.name': 'siem-windows',
-        },
-      },
-    },
-  ],
-  enabled: false,
-  index: ['auditbeat-*', 'filebeat-*'],
-  immutable: false,
-  interval: '5m',
-  output_index: '.siem-signals-default',
-  meta: {
-    anything_you_want_ui_related_or_otherwise: {
-      as_deep_structured_as_you_need: {
-        any_data_type: {},
-      },
-    },
-  },
-  max_signals: 10,
-  tags: ['tag 1', 'tag 2', 'any tag you want'],
-  to: 'now',
-  from: 'now-6m',
-  severity: 'high',
-  severity_mapping: [],
-  language: 'kuery',
-  type: 'query',
-  threat: [
-    {
-      framework: 'MITRE ATT&CK',
-      tactic: {
-        id: 'TA0040',
-        name: 'impact',
-        reference: 'https://attack.mitre.org/tactics/TA0040/',
-      },
-      technique: [
-        {
-          id: 'T1499',
-          name: 'endpoint denial of service',
-          reference: 'https://attack.mitre.org/techniques/T1499/',
-        },
-      ],
-    },
-    {
-      framework: 'Some other Framework you want',
-      tactic: {
-        id: 'some-other-id',
-        name: 'Some other name',
-        reference: 'https://example.com',
-      },
-      technique: [
-        {
-          id: 'some-other-id',
-          name: 'some other technique name',
-          reference: 'https://example.com',
-        },
-      ],
-    },
-  ],
-  references: [
-    'http://www.example.com/some-article-about-attack',
-    'Some plain text string here explaining why this is a valid thing to look out for',
-  ],
-  throttle: 'no_actions',
-  timeline_id: 'timeline_id',
-  timeline_title: 'timeline_title',
-  updated_by: 'elastic',
-  note: '# some investigation documentation',
-  version: 1,
-  query: 'user.name: root or user.name: admin',
-  exceptions_list: [],
-});
-
-export const getWebHookAction = () => ({
-  actionTypeId: '.webhook',
-  config: {
-    method: 'post',
-    url: 'http://localhost',
-  },
-  secrets: {
-    user: 'example',
-    password: 'example',
-  },
-  name: 'Some connector',
-});
-
-export const getRuleWithWebHookAction = (
-  id: string,
-  enabled = false,
-  rule?: CreateRulesSchema
-): CreateRulesSchema | UpdateRulesSchema => {
-  const finalRule = rule != null ? { ...rule, enabled } : getSimpleRule('rule-1', enabled);
-  return {
-    ...finalRule,
-    throttle: 'rule',
-    actions: [
-      {
-        group: 'default',
-        id,
-        params: {
-          body: '{}',
-        },
-        action_type_id: '.webhook',
-      },
-    ],
-  };
-};
-
-export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial<RulesSchema> => ({
-  ...getSimpleRuleOutput(),
-  throttle: 'rule',
-  actions: [
-    {
-      action_type_id: '.webhook',
-      group: 'default',
-      id: actionId,
-      params: {
-        body: '{}',
-      },
-    },
-  ],
-});
-
-// Similar to ReactJs's waitFor from here: https://testing-library.com/docs/dom-testing-library/api-async#waitfor
-export const waitFor = async (
-  functionToTest: () => Promise<boolean>,
-  functionName: string,
-  log: ToolingLog,
-  maxTimeout: number = 400000,
-  timeoutWait: number = 250
-): Promise<void> => {
-  let found = false;
-  let numberOfTries = 0;
-  const maxTries = Math.floor(maxTimeout / timeoutWait);
-  while (!found && numberOfTries < maxTries) {
-    if (await functionToTest()) {
-      found = true;
-    } else {
-      log.debug(`Try number ${numberOfTries} out of ${maxTries} for function ${functionName}`);
-      numberOfTries++;
-    }
-
-    await new Promise((resolveTimeout) => setTimeout(resolveTimeout, timeoutWait));
-  }
-
-  if (!found) {
-    throw new Error(`timed out waiting for function condition to be true within ${functionName}`);
-  }
-};
-
-/**
- * Does a plain countdown and checks against es queries for either conflicts in the error
- * or for any over the wire issues such as timeouts or temp 404's to make the tests more
- * reliant.
- * @param esFunction The function to test against
- * @param esFunctionName The name of the function to print if we encounter errors
- * @param log The tooling logger
- * @param retryCount The number of times to retry before giving up (has default)
- * @param timeoutWait Time to wait before trying again (has default)
- */
-export const countDownES = async (
-  esFunction: () => Promise<TransportResult<Record<string, any>, unknown>>,
-  esFunctionName: string,
-  log: ToolingLog,
-  retryCount: number = 20,
-  timeoutWait = 250
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      const result = await esFunction();
-      if (result.body.version_conflicts !== 0) {
-        log.error(`Version conflicts for ${result.body.version_conflicts}`);
-        return false;
-      } else {
-        return true;
-      }
-    },
-    esFunctionName,
-    log,
-    retryCount,
-    timeoutWait
-  );
-};
-
-/**
- * Refresh an index, making changes available to search.
- * Useful for tests where we want to ensure that a rule does NOT create alerts, e.g. testing exceptions.
- * @param es The ElasticSearch handle
- */
-export const refreshIndex = async (es: Client, index?: string) => {
-  await es.indices.refresh({
-    index,
-  });
-};
-
-/**
- * Does a plain countdown and checks against a boolean to determine if to wait and try again.
- * This is useful for over the wire things that can cause issues such as conflict or timeouts
- * for testing resiliency.
- * @param functionToTest The function to test against
- * @param name The name of the function to print if we encounter errors
- * @param log The tooling logger
- * @param retryCount The number of times to retry before giving up (has default)
- * @param timeoutWait Time to wait before trying again (has default)
- */
-export const countDownTest = async (
-  functionToTest: () => Promise<boolean>,
-  name: string,
-  log: ToolingLog,
-  retryCount: number = 20,
-  timeoutWait = 250,
-  ignoreThrow: boolean = false
-) => {
-  if (retryCount > 0) {
-    try {
-      const passed = await functionToTest();
-      if (!passed) {
-        log.error(`Failure trying to ${name}, retries left are: ${retryCount - 1}`);
-        // retry, counting down, and delay a bit before
-        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
-        await countDownTest(functionToTest, name, log, retryCount - 1, timeoutWait, ignoreThrow);
-      }
-    } catch (err) {
-      if (ignoreThrow) {
-        throw err;
-      } else {
-        log.error(
-          `Failure trying to ${name}, with exception message of: ${
-            err.message
-          }, retries left are: ${retryCount - 1}`
-        );
-        // retry, counting down, and delay a bit before
-        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
-        await countDownTest(functionToTest, name, log, retryCount - 1, timeoutWait, ignoreThrow);
-      }
-    }
-  } else {
-    log.error(`Could not ${name}, no retries are left`);
-  }
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. If this detects
- * a conflict it will try to manually remove the rule before re-adding the rule one time and log
- * and error about the race condition.
- * rule a second attempt. It only re-tries adding the rule if it encounters a conflict once.
- * @param supertest The supertest deps
- * @param log The tooling logger
- * @param rule The rule to create
- */
-export const createRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  rule: CreateRulesSchema
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .send(rule);
-  if (response.status === 409) {
-    if (rule.rule_id != null) {
-      log.debug(
-        `Did not get an expected 200 "ok" when creating a rule (createRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-          response.body
-        )}, status: ${JSON.stringify(response.status)}`
-      );
-      await deleteRule(supertest, log, rule.rule_id);
-      const secondResponseTry = await supertest
-        .post(DETECTION_ENGINE_RULES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(rule);
-      if (secondResponseTry.status !== 200) {
-        throw new Error(
-          `Unexpected non 200 ok when attempting to create a rule (second try): ${JSON.stringify(
-            response.body
-          )}`
-        );
-      } else {
-        return secondResponseTry.body;
-      }
-    } else {
-      throw new Error('When creating a rule found an unexpected conflict (404)');
-    }
-  } else if (response.status !== 200) {
-    throw new Error(
-      `Unexpected non 200 ok when attempting to create a rule: ${JSON.stringify(response.status)}`
-    );
-  } else {
-    return response.body;
-  }
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. Does a delete of a rule.
- * It does not check for a 200 "ok" on this.
- * @param supertest The supertest deps
- * @param ruleId The rule id to delete
- * @param log The tooling logger
- */
-export const deleteRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleId: string
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .delete(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
-    .set('kbn-xsrf', 'true');
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when deleting the rule (deleteRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests.
- * @param supertest The supertest deps
- * @param rule The rule to create
- */
-export const createRuleWithAuth = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  rule: CreateRulesSchema,
-  auth: { user: string; pass: string }
-): Promise<FullResponseSchema> => {
-  const { body } = await supertest
-    .post(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .auth(auth.user, auth.pass)
-    .send(rule);
-  return body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This checks for
- * an expected 200 still and does not do any retries.
- * @param supertest The supertest deps
- * @param rule The rule to create
- */
-export const updateRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  updatedRule: UpdateRulesSchema
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .put(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .send(updatedRule);
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when updating a rule (updateRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This
- * creates a new action and expects a 200 and does not do any retries.
- * @param supertest The supertest deps
- */
-export const createNewAction = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-) => {
-  const response = await supertest
-    .post('/api/actions/action')
-    .set('kbn-xsrf', 'true')
-    .send(getWebHookAction());
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when creating a new action. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This
- * uses the find API to get an immutable rule by id.
- * @param supertest The supertest deps
- */
-export const findImmutableRuleById = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleId: string
-): Promise<{
-  page: number;
-  perPage: number;
-  total: number;
-  data: FullResponseSchema[];
-}> => {
-  const response = await supertest
-    .get(
-      `${DETECTION_ENGINE_RULES_URL}/_find?filter=alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true" AND alert.attributes.tags: "${INTERNAL_RULE_ID_KEY}:${ruleId}"`
-    )
-    .set('kbn-xsrf', 'true')
-    .send();
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when finding an immutable rule by id (findImmutableRuleById). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This
- * creates a new action and expects a 200 and does not do any retries.
- * @param supertest The supertest deps
- */
-export const getPrePackagedRulesStatus = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<PrePackagedRulesAndTimelinesStatusSchema> => {
-  const response = await supertest
-    .get(`${DETECTION_ENGINE_PREPACKAGED_URL}/_status`)
-    .set('kbn-xsrf', 'true')
-    .send();
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a pre-packaged rule status. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This checks for
- * an expected 200 still and does not try to any retries. Creates exception lists
- * @param supertest The supertest deps
- * @param exceptionList The exception list to create
- * @param log The tooling logger
- */
-export const createExceptionList = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  exceptionList: CreateExceptionListSchema
-): Promise<ExceptionListSchema> => {
-  const response = await supertest
-    .post(EXCEPTION_LIST_URL)
-    .set('kbn-xsrf', 'true')
-    .send(exceptionList);
-
-  if (response.status === 409) {
-    if (exceptionList.list_id != null) {
-      log.error(
-        `When creating an exception list found an unexpected conflict (409) creating an exception list (createExceptionList), will attempt a cleanup and one time re-try. This usually indicates a bad cleanup or race condition within the tests: ${JSON.stringify(
-          response.body
-        )}, status: ${JSON.stringify(response.status)}`
-      );
-      await deleteExceptionList(supertest, log, exceptionList.list_id);
-      const secondResponseTry = await supertest
-        .post(EXCEPTION_LIST_URL)
-        .set('kbn-xsrf', 'true')
-        .send(exceptionList);
-      if (secondResponseTry.status !== 200) {
-        throw new Error(
-          `Unexpected non 200 ok when attempting to create an exception list (second try): ${JSON.stringify(
-            response.body
-          )}`
-        );
-      } else {
-        return secondResponseTry.body;
-      }
-    } else {
-      throw new Error('When creating an exception list found an unexpected conflict (404)');
-    }
-  } else if (response.status !== 200) {
-    throw new Error(
-      `Unexpected non 200 ok when attempting to create an exception list: ${JSON.stringify(
-        response.status
-      )}`
-    );
-  } else {
-    return response.body;
-  }
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. Does a delete of an exception list.
- * It does not check for a 200 "ok" on this.
- * @param supertest The supertest deps
- * @param listId The exception list to delete
- * @param log The tooling logger
- */
-export const deleteExceptionList = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  listId: string
-): Promise<FullResponseSchema> => {
-  const response = await supertest
-    .delete(`${EXCEPTION_LIST_URL}?list_id=${listId}`)
-    .set('kbn-xsrf', 'true');
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when deleting an exception list (deleteExceptionList). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This checks for
- * an expected 200 still and does not try to any retries. Creates exception lists
- * @param supertest The supertest deps
- * @param exceptionListItem The exception list item to create
- * @param log The tooling logger
- */
-export const createExceptionListItem = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  exceptionListItem: CreateExceptionListItemSchema
-): Promise<ExceptionListItemSchema> => {
-  const response = await supertest
-    .post(EXCEPTION_LIST_ITEM_URL)
-    .set('kbn-xsrf', 'true')
-    .send(exceptionListItem);
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when creating an exception list item (createExceptionListItem). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * Helper to cut down on the noise in some of the tests. This gets
- * a particular rule.
- * @param supertest The supertest deps
- * @param rule The rule to create
- */
-export const getRule = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleId: string
-): Promise<RulesSchema> => {
-  const response = await supertest
-    .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
-    .set('kbn-xsrf', 'true');
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a rule (getRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-export const waitForAlertToComplete = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  id: string
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const response = await supertest.get(`/api/alerts/alert/${id}/state`).set('kbn-xsrf', 'true');
-      if (response.status !== 200) {
-        log.debug(
-          `Did not get an expected 200 "ok" when waiting for an alert to complete (waitForAlertToComplete). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-            response.body
-          )}, status: ${JSON.stringify(response.status)}`
-        );
-      }
-      return response.body.previousStartedAt != null;
-    },
-    'waitForAlertToComplete',
-    log
-  );
-};
-
-/**
- * Waits for the rule in find status to be 'succeeded'
- * or the provided status, before continuing
- * @param supertest Deps
- */
-export const waitForRuleSuccessOrStatus = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  id: string,
-  status: RuleExecutionStatus = RuleExecutionStatus.succeeded,
-  afterDate?: Date
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      try {
-        const response = await supertest
-          .get(DETECTION_ENGINE_RULES_URL)
-          .set('kbn-xsrf', 'true')
-          .query({ id });
-        if (response.status !== 200) {
-          log.debug(
-            `Did not get an expected 200 "ok" when waiting for a rule success or status (waitForRuleSuccessOrStatus). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-              response.body
-            )}, status: ${JSON.stringify(response.status)}`
-          );
-        }
-
-        // TODO: https://github.com/elastic/kibana/pull/121644 clean up, make type-safe
-        const rule = response.body;
-        const ruleStatus = rule?.execution_summary?.last_execution.status;
-        const ruleStatusDate = rule?.execution_summary?.last_execution.date;
-
-        if (ruleStatus !== status) {
-          log.debug(
-            `Did not get an expected status of ${status} while waiting for a rule success or status for rule id ${id} (waitForRuleSuccessOrStatus). Will continue retrying until status is found. body: ${JSON.stringify(
-              response.body
-            )}, status: ${JSON.stringify(response.status)}`
-          );
-        }
-        return (
-          rule != null &&
-          ruleStatus === status &&
-          (afterDate ? new Date(ruleStatusDate) > afterDate : true)
-        );
-      } catch (e) {
-        if ((e as Error).message.includes('got 503 "Service Unavailable"')) {
-          return false;
-        }
-        throw e;
-      }
-    },
-    'waitForRuleSuccessOrStatus',
-    log
-  );
-};
-
-/**
- * Waits for the signal hits to be greater than the supplied number
- * before continuing with a default of at least one signal
- * @param supertest Deps
- * @param numberOfSignals The number of signals to wait for, default is 1
- */
-export const waitForSignalsToBePresent = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  numberOfSignals = 1,
-  signalIds: string[]
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const signalsOpen = await getSignalsByIds(supertest, log, signalIds, numberOfSignals);
-      return signalsOpen.hits.hits.length >= numberOfSignals;
-    },
-    'waitForSignalsToBePresent',
-    log
-  );
-};
-
-/**
- * Waits for the event-log execution completed doc count to be greater than the
- * supplied number before continuing with a default of at least one execution
- * @param es The ES client
- * @param log
- * @param ruleId The id of rule to check execution logs for
- * @param totalExecutions The number of executions to wait for, default is 1
- */
-export const waitForEventLogExecuteComplete = async (
-  es: Client,
-  log: ToolingLog,
-  ruleId: string,
-  totalExecutions = 1
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const executionCount = await getEventLogExecuteCompleteById(es, log, ruleId);
-      return executionCount >= totalExecutions;
-    },
-    'waitForEventLogExecuteComplete',
-    log
-  );
-};
-
-/**
- * Given a single rule id this will return the number of event-log execution
- * completed docs
- * @param es The ES client
- * @param log
- * @param ruleId Rule id
- */
-export const getEventLogExecuteCompleteById = async (
-  es: Client,
-  log: ToolingLog,
-  ruleId: string
-): Promise<number> => {
-  const response = await es.search({
-    index: '.kibana-event-log*',
-    track_total_hits: true,
-    size: 0,
-    query: {
-      bool: {
-        must: [],
-        filter: [
-          {
-            match_phrase: {
-              'event.provider': 'alerting',
-            },
-          },
-          {
-            match_phrase: {
-              'event.action': 'execute',
-            },
-          },
-          {
-            match_phrase: {
-              'rule.id': ruleId,
-            },
-          },
-        ],
-        should: [],
-        must_not: [],
-      },
-    },
-  });
-
-  return (response?.hits?.total as SearchTotalHits)?.value ?? 0;
-};
-
-/**
- * Indexes provided execution events into .kibana-event-log-*
- * @param es The ElasticSearch handle
- * @param log The tooling logger
- * @param events
- */
-export const indexEventLogExecutionEvents = async (
-  es: Client,
-  log: ToolingLog,
-  events: object[]
-): Promise<void> => {
-  const operations = events.flatMap((doc: object) => [
-    { index: { _index: '.kibana-event-log-*' } },
-    doc,
-  ]);
-
-  await es.bulk({ refresh: true, operations });
-
-  return;
-};
-
-/**
- * Remove all .kibana-event-log-* documents with an execution.uuid
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
- * @param es The ElasticSearch handle
- * @param log The tooling logger
- */
-export const deleteAllEventLogExecutionEvents = async (
-  es: Client,
-  log: ToolingLog
-): Promise<void> => {
-  return countDownES(
-    async () => {
-      return es.deleteByQuery(
-        {
-          index: '.kibana-event-log-*',
-          q: '_exists_:kibana.alert.rule.execution.uuid',
-          wait_for_completion: true,
-          refresh: true,
-          body: {},
-        },
-        { meta: true }
-      );
-    },
-    'deleteAllEventLogExecutionEvents',
-    log
-  );
-};
-
-/**
- * Returns all signals both closed and opened by ruleId
- * @param supertest Deps
- */
-export const getSignalsByRuleIds = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ruleIds: string[]
-): Promise<estypes.SearchResponse<DetectionAlert>> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-    .set('kbn-xsrf', 'true')
-    .send(getQuerySignalsRuleId(ruleIds));
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a signal by rule_id (getSignalsByRuleIds). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-
-  const { body: signalsOpen }: { body: estypes.SearchResponse<DetectionAlert> } = response;
-  return signalsOpen;
-};
-
-/**
- * Given an array of rule ids this will return only signals based on that rule id both
- * open and closed
- * @param supertest agent
- * @param ids Array of the rule ids
- */
-export const getSignalsByIds = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  ids: string[],
-  size?: number
-): Promise<estypes.SearchResponse<DetectionAlert>> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-    .set('kbn-xsrf', 'true')
-    .send(getQuerySignalsId(ids, size));
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting a signal by id. CI issues could happen (getSignalsByIds). Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  const { body: signalsOpen }: { body: estypes.SearchResponse<DetectionAlert> } = response;
-  return signalsOpen;
-};
-
-/**
- * Given a single rule id this will return only signals based on that rule id.
- * @param supertest agent
- * @param ids Rule id
- */
-export const getSignalsById = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  id: string
-): Promise<estypes.SearchResponse<DetectionAlert>> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-    .set('kbn-xsrf', 'true')
-    .send(getQuerySignalsId([id]));
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting signals by id (getSignalsById). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  const { body: signalsOpen }: { body: estypes.SearchResponse<DetectionAlert> } = response;
-  return signalsOpen;
-};
-
-export const installPrePackagedRules = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<void> => {
-  await countDownTest(
-    async () => {
-      const { status, body } = await supertest
-        .put(DETECTION_ENGINE_PREPACKAGED_URL)
-        .set('kbn-xsrf', 'true')
-        .send();
-      if (status !== 200) {
-        log.debug(
-          `Did not get an expected 200 "ok" when installing pre-packaged rules (installPrePackagedRules) yet. Retrying until we get a 200 "ok". body: ${JSON.stringify(
-            body
-          )}, status: ${JSON.stringify(status)}`
-        );
-      }
-
-      return status === 200;
-    },
-    'installPrePackagedRules',
-    log
-  );
-};
-
-/**
- * Convenience testing function where you can pass in just the endpoint entries and you will
- * get a container created with the entries.
- * @param supertest super test agent
- * @param endpointEntries The endpoint entries to create the rule and exception list from
- * @param osTypes The os types to optionally add or not to add to the container
- */
-export const createContainerWithEndpointEntries = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  endpointEntries: Array<{
-    entries: NonEmptyEntriesArray;
-    osTypes: OsTypeArray | undefined;
-  }>
-): Promise<ListArray> => {
-  // If not given any endpoint entries, return without any
-  if (endpointEntries.length === 0) {
-    return [];
-  }
-
-  // create the endpoint exception list container
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
-    description: 'endpoint description',
-    list_id: 'endpoint_list',
-    name: 'endpoint_list',
-    type: 'endpoint',
-  });
-
-  // Add the endpoint exception list container to the backend
-  await Promise.all(
-    endpointEntries.map((endpointEntry) => {
-      const exceptionListItem: CreateExceptionListItemSchema = {
-        description: 'endpoint description',
-        entries: endpointEntry.entries,
-        list_id: 'endpoint_list',
-        name: 'endpoint_list',
-        os_types: endpointEntry.osTypes,
-        type: 'simple',
-      };
-      return createExceptionListItem(supertest, log, exceptionListItem);
-    })
-  );
-
-  // To reduce the odds of in-determinism and/or bugs we ensure we have
-  // the same length of entries before continuing.
-  await waitFor(
-    async () => {
-      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
-      return body.data.length === endpointEntries.length;
-    },
-    `within createContainerWithEndpointEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
-    log
-  );
-
-  return [
-    {
-      id,
-      list_id,
-      namespace_type,
-      type,
-    },
-  ];
-};
-
-/**
- * Convenience testing function where you can pass in just the endpoint entries and you will
- * get a container created with the entries.
- * @param supertest super test agent
- * @param entries The entries to create the rule and exception list from
- * @param osTypes The os types to optionally add or not to add to the container
- */
-export const createContainerWithEntries = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  entries: NonEmptyEntriesArray[]
-): Promise<ListArray> => {
-  // If not given any endpoint entries, return without any
-  if (entries.length === 0) {
-    return [];
-  }
-  // Create the rule exception list container
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
-    description: 'some description',
-    list_id: 'some-list-id',
-    name: 'some name',
-    type: 'detection',
-  });
-
-  // Add the rule exception list container to the backend
-  await Promise.all(
-    entries.map((entry) => {
-      const exceptionListItem: CreateExceptionListItemSchema = {
-        description: 'some description',
-        list_id: 'some-list-id',
-        name: 'some name',
-        type: 'simple',
-        entries: entry,
-      };
-      return createExceptionListItem(supertest, log, exceptionListItem);
-    })
-  );
-
-  // To reduce the odds of in-determinism and/or bugs we ensure we have
-  // the same length of entries before continuing.
-  await waitFor(
-    async () => {
-      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
-      return body.data.length === entries.length;
-    },
-    `within createContainerWithEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
-    log
-  );
-
-  return [
-    {
-      id,
-      list_id,
-      namespace_type,
-      type,
-    },
-  ];
-};
-
-/**
- * Convenience testing function where you can pass in just the entries and you will
- * get a rule created with the entries added to an exception list and exception list item
- * all auto-created at once.
- * @param supertest super test agent
- * @param rule The rule to create and attach an exception list to
- * @param entries The entries to create the rule and exception list from
- * @param endpointEntries The endpoint entries to create the rule and exception list from
- * @param osTypes The os types to optionally add or not to add to the container
- */
-export const createRuleWithExceptionEntries = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  rule: CreateRulesSchema,
-  entries: NonEmptyEntriesArray[],
-  endpointEntries?: Array<{
-    entries: NonEmptyEntriesArray;
-    osTypes: OsTypeArray | undefined;
-  }>
-): Promise<FullResponseSchema> => {
-  const maybeExceptionList = await createContainerWithEntries(supertest, log, entries);
-  const maybeEndpointList = await createContainerWithEndpointEntries(
-    supertest,
-    log,
-    endpointEntries ?? []
-  );
-
-  // create the rule but don't run it immediately as running it immediately can cause
-  // the rule to sometimes not filter correctly the first time with an exception list
-  // or other timing issues. Then afterwards wait for the rule to have succeeded before
-  // returning.
-  const ruleWithException: CreateRulesSchema = {
-    ...rule,
-    enabled: false,
-    exceptions_list: [...maybeExceptionList, ...maybeEndpointList],
-  };
-  const ruleResponse = await createRule(supertest, log, ruleWithException);
-  const response = await supertest
-    .patch(DETECTION_ENGINE_RULES_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ rule_id: ruleResponse.rule_id, enabled: true });
-
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when patching a rule with exception entries (createRuleWithExceptionEntries). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return ruleResponse;
-};
-
-export const getIndexNameFromLoad = (loadResponse: Record<string, unknown>): string => {
-  const indexNames = Object.keys(loadResponse);
-  if (indexNames.length > 1) {
-    throw new Error(
-      `expected load response to contain one index, but contained multiple: [${indexNames}]`
-    );
-  }
-  return indexNames[0];
-};
-
-/**
- * Waits for the given index to contain documents
- *
- * @param esClient elasticsearch {@link Client}
- * @param index name of the index to query
- */
-export const waitForIndexToPopulate = async (
-  es: Client,
-  log: ToolingLog,
-  index: string
-): Promise<void> => {
-  await waitFor(
-    async () => {
-      const response = await es.count({ index });
-      return response.count > 0;
-    },
-    `waitForIndexToPopulate: ${index}`,
-    log
-  );
-};
-
-export const deleteMigrations = async ({
-  ids,
-  kbnClient,
-}: {
-  ids: string[];
-  kbnClient: KbnClient;
-}): Promise<void> => {
-  await Promise.all(
-    ids.map((id) =>
-      kbnClient.savedObjects.delete({
-        id,
-        type: signalsMigrationType,
-      })
-    )
-  );
-};
-
-interface CreateMigrationResponse {
-  index: string;
-  migration_index: string;
-  migration_id: string;
-}
-
-export const startSignalsMigration = async ({
-  indices,
-  supertest,
-  log,
-}: {
-  supertest: SuperTest.SuperTest<SuperTest.Test>;
-  log: ToolingLog;
-  indices: string[];
-}): Promise<CreateMigrationResponse[]> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_SIGNALS_MIGRATION_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ index: indices });
-
-  const {
-    body: { indices: created },
-  }: { body: { indices: CreateMigrationResponse[] } } = response;
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when starting a signals migration (startSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return created;
-};
-
-interface FinalizeMigrationResponse {
-  id: string;
-  completed?: boolean;
-  error?: unknown;
-}
-
-export const finalizeSignalsMigration = async ({
-  migrationIds,
-  supertest,
-  log,
-}: {
-  supertest: SuperTest.SuperTest<SuperTest.Test>;
-  log: ToolingLog;
-  migrationIds: string[];
-}): Promise<FinalizeMigrationResponse[]> => {
-  const response = await supertest
-    .post(DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ migration_ids: migrationIds });
-
-  const {
-    body: { migrations },
-  }: { body: { migrations: FinalizeMigrationResponse[] } } = response;
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when finalizing signals migration (finalizeSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return migrations;
-};
-
-export const getOpenSignals = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog,
-  es: Client,
-  rule: FullResponseSchema
-) => {
-  await waitForRuleSuccessOrStatus(supertest, log, rule.id);
-  // Critically important that we wait for rule success AND refresh the write index in that order before we
-  // assert that no signals were created. Otherwise, signals could be written but not available to query yet
-  // when we search, causing tests that check that signals are NOT created to pass when they should fail.
-  await refreshIndex(es, '.alerts-security.alerts-default*');
-  return getSignalsByIds(supertest, log, [rule.id]);
-};
-
-/**
- * Cluster stats URL. Replace this with any from kibana core if there is ever a constant there for this.
- */
-export const getStatsUrl = (): string => '/api/telemetry/v2/clusters/_stats';
-
-/**
- * Given a body this will return the detection metrics from it.
- * @param body The Stats body
- * @returns Detection metrics
- */
-export const getDetectionMetricsFromBody = (
-  body: Array<{
-    stats: {
-      stack_stats: {
-        kibana: { plugins: { security_solution: { detectionMetrics: DetectionMetrics } } };
-      };
-    };
-  }>
-): DetectionMetrics => {
-  return body[0].stats.stack_stats.kibana.plugins.security_solution.detectionMetrics;
-};
-
-/**
- * Gets the stats from the stats endpoint.
- * @param supertest The supertest agent.
- * @returns The detection metrics
- */
-export const getStats = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<DetectionMetrics> => {
-  const response = await supertest
-    .post(getStatsUrl())
-    .set('kbn-xsrf', 'true')
-    .send({ unencrypted: true, refreshCache: true });
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting the stats for detections. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return getDetectionMetricsFromBody(response.body);
-};
-
-/**
- * Gets the stats from the stats endpoint within specifically the security_solutions application.
- * This is considered the "batch" telemetry.
- * @param supertest The supertest agent.
- * @returns The detection metrics
- */
-export const getSecurityTelemetryStats = async (
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  log: ToolingLog
-): Promise<any> => {
-  const response = await supertest
-    .get(SECURITY_TELEMETRY_URL)
-    .set('kbn-xsrf', 'true')
-    .send({ unencrypted: true, refreshCache: true });
-  if (response.status !== 200) {
-    log.error(
-      `Did not get an expected 200 "ok" when getting the batch stats for security_solutions. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
-        response.body
-      )}, status: ${JSON.stringify(response.status)}`
-    );
-  }
-  return response.body;
-};
-
-/**
- * This is a typical simple indicator match/threat match for testing that is easy for most basic testing
- * @param ruleId
- * @param enabled Enables the rule on creation or not. Defaulted to false.
- */
-export const getSimpleThreatMatch = (
-  ruleId = 'rule-1',
-  enabled = false
-): ThreatMatchCreateSchema => ({
-  description: 'Detecting root and admin users',
-  name: 'Query with a rule id',
-  severity: 'high',
-  enabled,
-  index: ['auditbeat-*'],
-  type: 'threat_match',
-  risk_score: 55,
-  language: 'kuery',
-  rule_id: ruleId,
-  from: '1900-01-01T00:00:00.000Z',
-  query: '*:*',
-  threat_query: '*:*',
-  threat_index: ['auditbeat-*'],
-  threat_mapping: [
-    // We match host.name against host.name
-    {
-      entries: [
-        {
-          field: 'host.name',
-          value: 'host.name',
-          type: 'mapping',
-        },
-      ],
-    },
-  ],
-  threat_filters: [],
-});
-
-interface LegacyActionSO extends LegacyRuleActions {
-  references: SavedObjectReference[];
-}
-
-/**
- * Fetch all legacy action sidecar SOs from the .kibana index
- * @param es The ElasticSearch service
- */
-export const getLegacyActionSO = async (es: Client): Promise<SearchResponse<LegacyActionSO>> =>
-  es.search({
-    index: '.kibana',
-    q: 'type:siem-detection-engine-rule-actions',
-  });
diff --git a/x-pack/test/detection_engine_api_integration/utils/binary_to_string.ts b/x-pack/test/detection_engine_api_integration/utils/binary_to_string.ts
new file mode 100644
index 0000000000000..47202a385de56
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/binary_to_string.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Useful for export_api testing to convert from a multi-part binary back to a string
+ * @param res Response
+ * @param callback Callback
+ */
+export const binaryToString = (res: any, callback: any): void => {
+  res.setEncoding('binary');
+  res.data = '';
+  res.on('data', (chunk: any) => {
+    res.data += chunk;
+  });
+  res.on('end', () => {
+    callback(null, Buffer.from(res.data));
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/count_down_es.ts b/x-pack/test/detection_engine_api_integration/utils/count_down_es.ts
new file mode 100644
index 0000000000000..d587e5e40864b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/count_down_es.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TransportResult } from '@elastic/elasticsearch';
+import type { ToolingLog } from '@kbn/dev-utils';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Does a plain countdown and checks against es queries for either conflicts in the error
+ * or for any over the wire issues such as timeouts or temp 404's to make the tests more
+ * reliant.
+ * @param esFunction The function to test against
+ * @param esFunctionName The name of the function to print if we encounter errors
+ * @param log The tooling logger
+ * @param retryCount The number of times to retry before giving up (has default)
+ * @param timeoutWait Time to wait before trying again (has default)
+ */
+export const countDownES = async (
+  esFunction: () => Promise<TransportResult<Record<string, any>, unknown>>,
+  esFunctionName: string,
+  log: ToolingLog,
+  retryCount: number = 50,
+  timeoutWait = 250
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      const result = await esFunction();
+      if (result.body.version_conflicts !== 0) {
+        return {
+          passed: false,
+          errorMessage: 'Version conflicts for ${result.body.version_conflicts}',
+        };
+      } else {
+        return { passed: true };
+      }
+    },
+    esFunctionName,
+    log,
+    retryCount,
+    timeoutWait
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/count_down_test.ts b/x-pack/test/detection_engine_api_integration/utils/count_down_test.ts
new file mode 100644
index 0000000000000..57cb06243d78e
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/count_down_test.ts
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+
+/**
+ * Does a plain countdown and checks against a boolean to determine if to wait and try again.
+ * This is useful for over the wire things that can cause issues such as conflict or timeouts
+ * for testing resiliency.
+ * @param functionToTest The function to test against
+ * @param name The name of the function to print if we encounter errors
+ * @param log The tooling logger
+ * @param retryCount The number of times to retry before giving up (has default)
+ * @param timeoutWait Time to wait before trying again (has default)
+ */
+export const countDownTest = async <T>(
+  functionToTest: () => Promise<{
+    passed: boolean;
+    returnValue?: T | undefined;
+    errorMessage?: string;
+  }>,
+  name: string,
+  log: ToolingLog,
+  retryCount: number = 50,
+  timeoutWait = 250,
+  ignoreThrow: boolean = false
+): Promise<T | undefined> => {
+  if (retryCount > 0) {
+    try {
+      const testReturn = await functionToTest();
+      if (!testReturn.passed) {
+        const error = testReturn.errorMessage != null ? ` error: ${testReturn.errorMessage},` : '';
+        log.error(`Failure trying to ${name},${error} retries left are: ${retryCount - 1}`);
+        // retry, counting down, and delay a bit before
+        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
+        const returnValue = await countDownTest(
+          functionToTest,
+          name,
+          log,
+          retryCount - 1,
+          timeoutWait,
+          ignoreThrow
+        );
+        return returnValue;
+      } else {
+        return testReturn.returnValue;
+      }
+    } catch (err) {
+      if (ignoreThrow) {
+        throw err;
+      } else {
+        log.error(
+          `Failure trying to ${name}, with exception message of: ${
+            err.message
+          }, retries left are: ${retryCount - 1}`
+        );
+        // retry, counting down, and delay a bit before
+        await new Promise((resolve) => setTimeout(resolve, timeoutWait));
+        const returnValue = await countDownTest(
+          functionToTest,
+          name,
+          log,
+          retryCount - 1,
+          timeoutWait,
+          ignoreThrow
+        );
+        return returnValue;
+      }
+    }
+  } else {
+    log.error(`Could not ${name}, no retries are left`);
+    return undefined;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_container_with_endpoint_entries.ts b/x-pack/test/detection_engine_api_integration/utils/create_container_with_endpoint_entries.ts
new file mode 100644
index 0000000000000..ae4bfa40a39a3
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_container_with_endpoint_entries.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type {
+  CreateExceptionListItemSchema,
+  ListArray,
+  NonEmptyEntriesArray,
+  OsTypeArray,
+} from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+import { createExceptionListItem } from './create_exception_list_item';
+import { waitFor } from './wait_for';
+import { createExceptionList } from './create_exception_list';
+
+/**
+ * Convenience testing function where you can pass in just the endpoint entries and you will
+ * get a container created with the entries.
+ * @param supertest super test agent
+ * @param endpointEntries The endpoint entries to create the rule and exception list from
+ * @param osTypes The os types to optionally add or not to add to the container
+ */
+export const createContainerWithEndpointEntries = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  endpointEntries: Array<{
+    entries: NonEmptyEntriesArray;
+    osTypes: OsTypeArray | undefined;
+  }>
+): Promise<ListArray> => {
+  // If not given any endpoint entries, return without any
+  if (endpointEntries.length === 0) {
+    return [];
+  }
+
+  // create the endpoint exception list container
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
+    description: 'endpoint description',
+    list_id: 'endpoint_list',
+    name: 'endpoint_list',
+    type: 'endpoint',
+  });
+
+  // Add the endpoint exception list container to the backend
+  await Promise.all(
+    endpointEntries.map((endpointEntry) => {
+      const exceptionListItem: CreateExceptionListItemSchema = {
+        description: 'endpoint description',
+        entries: endpointEntry.entries,
+        list_id: 'endpoint_list',
+        name: 'endpoint_list',
+        os_types: endpointEntry.osTypes,
+        type: 'simple',
+      };
+      return createExceptionListItem(supertest, log, exceptionListItem);
+    })
+  );
+
+  // To reduce the odds of in-determinism and/or bugs we ensure we have
+  // the same length of entries before continuing.
+  await waitFor(
+    async () => {
+      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
+      return body.data.length === endpointEntries.length;
+    },
+    `within createContainerWithEndpointEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
+    log
+  );
+
+  return [
+    {
+      id,
+      list_id,
+      namespace_type,
+      type,
+    },
+  ];
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_container_with_entries.ts b/x-pack/test/detection_engine_api_integration/utils/create_container_with_entries.ts
new file mode 100644
index 0000000000000..9bd9cef7229bd
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_container_with_entries.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import type { ListArray, NonEmptyEntriesArray } from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+import { createExceptionList } from './create_exception_list';
+import { createExceptionListItem } from './create_exception_list_item';
+import { waitFor } from './wait_for';
+
+/**
+ * Convenience testing function where you can pass in just the endpoint entries and you will
+ * get a container created with the entries.
+ * @param supertest super test agent
+ * @param entries The entries to create the rule and exception list from
+ * @param osTypes The os types to optionally add or not to add to the container
+ */
+export const createContainerWithEntries = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  entries: NonEmptyEntriesArray[]
+): Promise<ListArray> => {
+  // If not given any endpoint entries, return without any
+  if (entries.length === 0) {
+    return [];
+  }
+  // Create the rule exception list container
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { id, list_id, namespace_type, type } = await createExceptionList(supertest, log, {
+    description: 'some description',
+    list_id: 'some-list-id',
+    name: 'some name',
+    type: 'detection',
+  });
+
+  // Add the rule exception list container to the backend
+  await Promise.all(
+    entries.map((entry) => {
+      const exceptionListItem: CreateExceptionListItemSchema = {
+        description: 'some description',
+        list_id: 'some-list-id',
+        name: 'some name',
+        type: 'simple',
+        entries: entry,
+      };
+      return createExceptionListItem(supertest, log, exceptionListItem);
+    })
+  );
+
+  // To reduce the odds of in-determinism and/or bugs we ensure we have
+  // the same length of entries before continuing.
+  await waitFor(
+    async () => {
+      const { body } = await supertest.get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`);
+      return body.data.length === entries.length;
+    },
+    `within createContainerWithEntries ${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${list_id}`,
+    log
+  );
+
+  return [
+    {
+      id,
+      list_id,
+      namespace_type,
+      type,
+    },
+  ];
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_exception_list.ts b/x-pack/test/detection_engine_api_integration/utils/create_exception_list.ts
new file mode 100644
index 0000000000000..e2942d0262705
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_exception_list.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type {
+  CreateExceptionListSchema,
+  ExceptionListSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { deleteExceptionList } from './delete_exception_list';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This checks for
+ * an expected 200 still and does not try to any retries. Creates exception lists
+ * @param supertest The supertest deps
+ * @param exceptionList The exception list to create
+ * @param log The tooling logger
+ */
+export const createExceptionList = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  exceptionList: CreateExceptionListSchema
+): Promise<ExceptionListSchema> => {
+  const response = await supertest
+    .post(EXCEPTION_LIST_URL)
+    .set('kbn-xsrf', 'true')
+    .send(exceptionList);
+
+  if (response.status === 409) {
+    if (exceptionList.list_id != null) {
+      log.error(
+        `When creating an exception list found an unexpected conflict (409) creating an exception list (createExceptionList), will attempt a cleanup and one time re-try. This usually indicates a bad cleanup or race condition within the tests: ${JSON.stringify(
+          response.body
+        )}, status: ${JSON.stringify(response.status)}`
+      );
+      await deleteExceptionList(supertest, log, exceptionList.list_id);
+      const secondResponseTry = await supertest
+        .post(EXCEPTION_LIST_URL)
+        .set('kbn-xsrf', 'true')
+        .send(exceptionList);
+      if (secondResponseTry.status !== 200) {
+        throw new Error(
+          `Unexpected non 200 ok when attempting to create an exception list (second try): ${JSON.stringify(
+            response.body
+          )}`
+        );
+      } else {
+        return secondResponseTry.body;
+      }
+    } else {
+      throw new Error('When creating an exception list found an unexpected conflict (404)');
+    }
+  } else if (response.status !== 200) {
+    throw new Error(
+      `Unexpected non 200 ok when attempting to create an exception list: ${JSON.stringify(
+        response.status
+      )}`
+    );
+  } else {
+    return response.body;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_exception_list_item.ts b/x-pack/test/detection_engine_api_integration/utils/create_exception_list_item.ts
new file mode 100644
index 0000000000000..c912446b1b08d
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_exception_list_item.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type {
+  CreateExceptionListItemSchema,
+  ExceptionListItemSchema,
+} from '@kbn/securitysolution-io-ts-list-types';
+
+import { EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This checks for
+ * an expected 200 still and does not try to any retries. Creates exception lists
+ * @param supertest The supertest deps
+ * @param exceptionListItem The exception list item to create
+ * @param log The tooling logger
+ */
+export const createExceptionListItem = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  exceptionListItem: CreateExceptionListItemSchema
+): Promise<ExceptionListItemSchema> => {
+  const response = await supertest
+    .post(EXCEPTION_LIST_ITEM_URL)
+    .set('kbn-xsrf', 'true')
+    .send(exceptionListItem);
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when creating an exception list item (createExceptionListItem). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_legacy_rule_action.ts b/x-pack/test/detection_engine_api_integration/utils/create_legacy_rule_action.ts
new file mode 100644
index 0000000000000..6428b41cdeba8
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_legacy_rule_action.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+
+import { UPDATE_OR_CREATE_LEGACY_ACTIONS } from '@kbn/security-solution-plugin/common/constants';
+
+export const createLegacyRuleAction = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  alertId: string,
+  connectorId: string
+): Promise<unknown> =>
+  supertest
+    .post(`${UPDATE_OR_CREATE_LEGACY_ACTIONS}`)
+    .set('kbn-xsrf', 'true')
+    .query({ alert_id: alertId })
+    .send({
+      name: 'Legacy notification with one action',
+      interval: '1h',
+      actions: [
+        {
+          id: connectorId,
+          group: 'default',
+          params: {
+            message: 'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          },
+          actionTypeId: '.slack',
+        },
+      ],
+    });
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_new_action.ts b/x-pack/test/detection_engine_api_integration/utils/create_new_action.ts
new file mode 100644
index 0000000000000..349a8afdf977c
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_new_action.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { getWebHookAction } from './get_web_hook_action';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This
+ * creates a new action and expects a 200 and does not do any retries.
+ * @param supertest The supertest deps
+ */
+export const createNewAction = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+) => {
+  const response = await supertest
+    .post('/api/actions/action')
+    .set('kbn-xsrf', 'true')
+    .send(getWebHookAction());
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when creating a new action. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_rule.ts b/x-pack/test/detection_engine_api_integration/utils/create_rule.ts
new file mode 100644
index 0000000000000..caedcf357d363
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_rule.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type {
+  CreateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { deleteRule } from './delete_rule';
+
+/**
+ * Helper to cut down on the noise in some of the tests. If this detects
+ * a conflict it will try to manually remove the rule before re-adding the rule one time and log
+ * and error about the race condition.
+ * rule a second attempt. It only re-tries adding the rule if it encounters a conflict once.
+ * @param supertest The supertest deps
+ * @param log The tooling logger
+ * @param rule The rule to create
+ */
+export const createRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  rule: CreateRulesSchema
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .post(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .send(rule);
+  if (response.status === 409) {
+    if (rule.rule_id != null) {
+      log.debug(
+        `Did not get an expected 200 "ok" when creating a rule (createRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+          response.body
+        )}, status: ${JSON.stringify(response.status)}`
+      );
+      await deleteRule(supertest, log, rule.rule_id);
+      const secondResponseTry = await supertest
+        .post(DETECTION_ENGINE_RULES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(rule);
+      if (secondResponseTry.status !== 200) {
+        throw new Error(
+          `Unexpected non 200 ok when attempting to create a rule (second try): ${JSON.stringify(
+            response.body
+          )}`
+        );
+      } else {
+        return secondResponseTry.body;
+      }
+    } else {
+      throw new Error('When creating a rule found an unexpected conflict (404)');
+    }
+  } else if (response.status !== 200) {
+    throw new Error(
+      `Unexpected non 200 ok when attempting to create a rule: ${JSON.stringify(response.status)}`
+    );
+  } else {
+    return response.body;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_rule_with_auth.ts b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_auth.ts
new file mode 100644
index 0000000000000..266d01166d1b7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_auth.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import type {
+  CreateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Helper to cut down on the noise in some of the tests.
+ * @param supertest The supertest deps
+ * @param rule The rule to create
+ */
+export const createRuleWithAuth = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  rule: CreateRulesSchema,
+  auth: { user: string; pass: string }
+): Promise<FullResponseSchema> => {
+  const { body } = await supertest
+    .post(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .auth(auth.user, auth.pass)
+    .send(rule);
+  return body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_rule_with_exception_entries.ts b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_exception_entries.ts
new file mode 100644
index 0000000000000..da4b2d1b5a263
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_rule_with_exception_entries.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { NonEmptyEntriesArray, OsTypeArray } from '@kbn/securitysolution-io-ts-list-types';
+import type {
+  CreateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { createContainerWithEntries } from './create_container_with_entries';
+import { createContainerWithEndpointEntries } from './create_container_with_endpoint_entries';
+import { createRule } from './create_rule';
+
+/**
+ * Convenience testing function where you can pass in just the entries and you will
+ * get a rule created with the entries added to an exception list and exception list item
+ * all auto-created at once.
+ * @param supertest super test agent
+ * @param rule The rule to create and attach an exception list to
+ * @param entries The entries to create the rule and exception list from
+ * @param endpointEntries The endpoint entries to create the rule and exception list from
+ * @param osTypes The os types to optionally add or not to add to the container
+ */
+export const createRuleWithExceptionEntries = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  rule: CreateRulesSchema,
+  entries: NonEmptyEntriesArray[],
+  endpointEntries?: Array<{
+    entries: NonEmptyEntriesArray;
+    osTypes: OsTypeArray | undefined;
+  }>
+): Promise<FullResponseSchema> => {
+  const maybeExceptionList = await createContainerWithEntries(supertest, log, entries);
+  const maybeEndpointList = await createContainerWithEndpointEntries(
+    supertest,
+    log,
+    endpointEntries ?? []
+  );
+
+  // create the rule but don't run it immediately as running it immediately can cause
+  // the rule to sometimes not filter correctly the first time with an exception list
+  // or other timing issues. Then afterwards wait for the rule to have succeeded before
+  // returning.
+  const ruleWithException: CreateRulesSchema = {
+    ...rule,
+    enabled: false,
+    exceptions_list: [...maybeExceptionList, ...maybeEndpointList],
+  };
+  const ruleResponse = await createRule(supertest, log, ruleWithException);
+  const response = await supertest
+    .patch(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ rule_id: ruleResponse.rule_id, enabled: true });
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when patching a rule with exception entries (createRuleWithExceptionEntries). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return ruleResponse;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/create_signals_index.ts b/x-pack/test/detection_engine_api_integration/utils/create_signals_index.ts
new file mode 100644
index 0000000000000..13ddf59a40257
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/create_signals_index.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+import { ToolingLog } from '@kbn/dev-utils';
+
+import { DETECTION_ENGINE_INDEX_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Creates the signals index for use inside of beforeEach blocks of tests
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
+ * @param supertest The supertest client library
+ */
+export const createSignalsIndex = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+      return {
+        passed: true,
+      };
+    },
+    'createSignalsIndex',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_alerts.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_alerts.ts
new file mode 100644
index 0000000000000..cd0382d6fed19
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_alerts.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import {
+  DETECTION_ENGINE_RULES_BULK_ACTION,
+  DETECTION_ENGINE_RULES_URL,
+} from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Removes all rules by looping over any found and removing them from REST.
+ * @param supertest The supertest agent.
+ */
+export const deleteAllAlerts = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .send({ action: 'delete', query: '' })
+        .set('kbn-xsrf', 'true');
+
+      const { body: finalCheck } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
+        .set('kbn-xsrf', 'true')
+        .send();
+      return {
+        passed: finalCheck.data.length === 0,
+      };
+    },
+    'deleteAllAlerts',
+    log,
+    50,
+    1000
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_event_log_execution_events.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_event_log_execution_events.ts
new file mode 100644
index 0000000000000..4e3ba89fcb9c9
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_event_log_execution_events.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type { Client } from '@elastic/elasticsearch';
+
+import { countDownES } from './count_down_es';
+
+/**
+ * Remove all .kibana-event-log-* documents with an execution.uuid
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
+ * @param es The ElasticSearch handle
+ * @param log The tooling logger
+ */
+export const deleteAllEventLogExecutionEvents = async (
+  es: Client,
+  log: ToolingLog
+): Promise<void> => {
+  return countDownES(
+    async () => {
+      return es.deleteByQuery(
+        {
+          index: '.kibana-event-log-*',
+          q: '_exists_:kibana.alert.rule.execution.uuid',
+          wait_for_completion: true,
+          refresh: true,
+          body: {},
+        },
+        { meta: true }
+      );
+    },
+    'deleteAllEventLogExecutionEvents',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts
new file mode 100644
index 0000000000000..849c81d4f98db
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_rule_execution_info.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Client } from '@elastic/elasticsearch';
+import type { ToolingLog } from '@kbn/dev-utils';
+import { countDownES } from './count_down_es';
+
+/**
+ * Remove all rules execution info saved objects from the .kibana index
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
+ * @param es The ElasticSearch handle
+ * @param log The tooling logger
+ */
+export const deleteAllRuleExecutionInfo = async (es: Client, log: ToolingLog): Promise<void> => {
+  return countDownES(
+    async () => {
+      return es.deleteByQuery(
+        {
+          index: '.kibana',
+          q: 'type:siem-detection-engine-rule-execution-info',
+          wait_for_completion: true,
+          refresh: true,
+          body: {},
+        },
+        { meta: true }
+      );
+    },
+    'deleteAllRuleExecutionInfo',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.ts b/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.ts
new file mode 100644
index 0000000000000..973995fc1b619
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_all_timelines.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Client } from '@elastic/elasticsearch';
+
+/**
+ * Remove all timelines from the .kibana index
+ * @param es The ElasticSearch handle
+ */
+export const deleteAllTimelines = async (es: Client): Promise<void> => {
+  await es.deleteByQuery({
+    index: '.kibana',
+    q: 'type:siem-ui-timeline',
+    wait_for_completion: true,
+    refresh: true,
+    body: {},
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_exception_list.ts b/x-pack/test/detection_engine_api_integration/utils/delete_exception_list.ts
new file mode 100644
index 0000000000000..f5f98d1330401
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_exception_list.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Helper to cut down on the noise in some of the tests. Does a delete of an exception list.
+ * It does not check for a 200 "ok" on this.
+ * @param supertest The supertest deps
+ * @param listId The exception list to delete
+ * @param log The tooling logger
+ */
+export const deleteExceptionList = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  listId: string
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .delete(`${EXCEPTION_LIST_URL}?list_id=${listId}`)
+    .set('kbn-xsrf', 'true');
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when deleting an exception list (deleteExceptionList). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_migrations.ts b/x-pack/test/detection_engine_api_integration/utils/delete_migrations.ts
new file mode 100644
index 0000000000000..9da2e76aba4f9
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_migrations.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { KbnClient } from '@kbn/test';
+
+import { signalsMigrationType } from '@kbn/security-solution-plugin/server/lib/detection_engine/migrations/saved_objects';
+
+export const deleteMigrations = async ({
+  ids,
+  kbnClient,
+}: {
+  ids: string[];
+  kbnClient: KbnClient;
+}): Promise<void> => {
+  await Promise.all(
+    ids.map((id) =>
+      kbnClient.savedObjects.delete({
+        id,
+        type: signalsMigrationType,
+      })
+    )
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_rule.ts b/x-pack/test/detection_engine_api_integration/utils/delete_rule.ts
new file mode 100644
index 0000000000000..cf784df40dc5b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_rule.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. Does a delete of a rule.
+ * It does not check for a 200 "ok" on this.
+ * @param supertest The supertest deps
+ * @param ruleId The rule id to delete
+ * @param log The tooling logger
+ */
+export const deleteRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleId: string
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .delete(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+    .set('kbn-xsrf', 'true');
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when deleting the rule (deleteRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/delete_signals_index.ts b/x-pack/test/detection_engine_api_integration/utils/delete_signals_index.ts
new file mode 100644
index 0000000000000..a422b54ef9f61
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/delete_signals_index.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type SuperTest from 'supertest';
+import type { ToolingLog } from '@kbn/dev-utils';
+import { DETECTION_ENGINE_INDEX_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+/**
+ * Deletes the signals index for use inside of afterEach blocks of tests
+ * @param supertest The supertest client library
+ */
+export const deleteSignalsIndex = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+      return {
+        passed: true,
+      };
+    },
+    'deleteSignalsIndex',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/downgrade_immutable_rule.ts b/x-pack/test/detection_engine_api_integration/utils/downgrade_immutable_rule.ts
new file mode 100644
index 0000000000000..9e49420f34329
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/downgrade_immutable_rule.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type { Client } from '@elastic/elasticsearch';
+import { INTERNAL_RULE_ID_KEY } from '@kbn/security-solution-plugin/common/constants';
+import { countDownES } from './count_down_es';
+
+export const downgradeImmutableRule = async (
+  es: Client,
+  log: ToolingLog,
+  ruleId: string
+): Promise<void> => {
+  return countDownES(
+    async () => {
+      return es.updateByQuery(
+        {
+          index: '.kibana',
+          refresh: true,
+          wait_for_completion: true,
+          body: {
+            script: {
+              lang: 'painless',
+              source: 'ctx._source.alert.params.version--',
+            },
+            query: {
+              term: {
+                'alert.tags': `${INTERNAL_RULE_ID_KEY}:${ruleId}`,
+              },
+            },
+          },
+        },
+        { meta: true }
+      );
+    },
+    'downgradeImmutableRule',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/finalize_signals_migration.ts b/x-pack/test/detection_engine_api_integration/utils/finalize_signals_migration.ts
new file mode 100644
index 0000000000000..c3e4a4ada5bae
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/finalize_signals_migration.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL } from '@kbn/security-solution-plugin/common/constants';
+
+interface FinalizeMigrationResponse {
+  id: string;
+  completed?: boolean;
+  error?: unknown;
+}
+
+export const finalizeSignalsMigration = async ({
+  migrationIds,
+  supertest,
+  log,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  log: ToolingLog;
+  migrationIds: string[];
+}): Promise<FinalizeMigrationResponse[]> => {
+  const response = await supertest
+    .post(DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ migration_ids: migrationIds });
+
+  const {
+    body: { migrations },
+  }: { body: { migrations: FinalizeMigrationResponse[] } } = response;
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when finalizing signals migration (finalizeSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return migrations;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/find_immutable_rule_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/find_immutable_rule_by_id.ts
new file mode 100644
index 0000000000000..0281bce218bef
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/find_immutable_rule_by_id.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import {
+  DETECTION_ENGINE_RULES_URL,
+  INTERNAL_IMMUTABLE_KEY,
+  INTERNAL_RULE_ID_KEY,
+} from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This
+ * uses the find API to get an immutable rule by id.
+ * @param supertest The supertest deps
+ */
+export const findImmutableRuleById = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleId: string
+): Promise<{
+  page: number;
+  perPage: number;
+  total: number;
+  data: FullResponseSchema[];
+}> => {
+  const response = await supertest
+    .get(
+      `${DETECTION_ENGINE_RULES_URL}/_find?filter=alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true" AND alert.attributes.tags: "${INTERNAL_RULE_ID_KEY}:${ruleId}"`
+    )
+    .set('kbn-xsrf', 'true')
+    .send();
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when finding an immutable rule by id (findImmutableRuleById). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_complex_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule.ts
new file mode 100644
index 0000000000000..07ac5ea879bb6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+/**
+ * This will return a complex rule with all the outputs possible
+ * @param ruleId The ruleId to set which is optional and defaults to rule-1
+ */
+export const getComplexRule = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
+  actions: [],
+  author: [],
+  name: 'Complex Rule Query',
+  description: 'Complex Rule Query',
+  false_positives: [
+    'https://www.example.com/some-article-about-a-false-positive',
+    'some text string about why another condition could be a false positive',
+  ],
+  risk_score: 1,
+  risk_score_mapping: [],
+  rule_id: ruleId,
+  filters: [
+    {
+      query: {
+        match_phrase: {
+          'host.name': 'siem-windows',
+        },
+      },
+    },
+  ],
+  enabled: false,
+  index: ['auditbeat-*', 'filebeat-*'],
+  interval: '5m',
+  output_index: '.siem-signals-default',
+  meta: {
+    anything_you_want_ui_related_or_otherwise: {
+      as_deep_structured_as_you_need: {
+        any_data_type: {},
+      },
+    },
+  },
+  max_signals: 10,
+  tags: ['tag 1', 'tag 2', 'any tag you want'],
+  to: 'now',
+  from: 'now-6m',
+  severity: 'high',
+  severity_mapping: [],
+  language: 'kuery',
+  type: 'query',
+  threat: [
+    {
+      framework: 'MITRE ATT&CK',
+      tactic: {
+        id: 'TA0040',
+        name: 'impact',
+        reference: 'https://attack.mitre.org/tactics/TA0040/',
+      },
+      technique: [
+        {
+          id: 'T1499',
+          name: 'endpoint denial of service',
+          reference: 'https://attack.mitre.org/techniques/T1499/',
+        },
+      ],
+    },
+    {
+      framework: 'Some other Framework you want',
+      tactic: {
+        id: 'some-other-id',
+        name: 'Some other name',
+        reference: 'https://example.com',
+      },
+      technique: [
+        {
+          id: 'some-other-id',
+          name: 'some other technique name',
+          reference: 'https://example.com',
+        },
+      ],
+    },
+  ],
+  references: [
+    'http://www.example.com/some-article-about-attack',
+    'Some plain text string here explaining why this is a valid thing to look out for',
+  ],
+  timeline_id: 'timeline_id',
+  timeline_title: 'timeline_title',
+  note: '# some investigation documentation',
+  version: 1,
+  query: 'user.name: root or user.name: admin',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_complex_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule_output.ts
new file mode 100644
index 0000000000000..98fdfa99cbd3c
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_complex_rule_output.ts
@@ -0,0 +1,100 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+/**
+ * This will return a complex rule with all the outputs possible
+ * @param ruleId The ruleId to set which is optional and defaults to rule-1
+ */
+export const getComplexRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => ({
+  actions: [],
+  author: [],
+  created_by: 'elastic',
+  name: 'Complex Rule Query',
+  description: 'Complex Rule Query',
+  false_positives: [
+    'https://www.example.com/some-article-about-a-false-positive',
+    'some text string about why another condition could be a false positive',
+  ],
+  risk_score: 1,
+  risk_score_mapping: [],
+  rule_id: ruleId,
+  filters: [
+    {
+      query: {
+        match_phrase: {
+          'host.name': 'siem-windows',
+        },
+      },
+    },
+  ],
+  enabled: false,
+  index: ['auditbeat-*', 'filebeat-*'],
+  immutable: false,
+  interval: '5m',
+  output_index: '.siem-signals-default',
+  meta: {
+    anything_you_want_ui_related_or_otherwise: {
+      as_deep_structured_as_you_need: {
+        any_data_type: {},
+      },
+    },
+  },
+  max_signals: 10,
+  tags: ['tag 1', 'tag 2', 'any tag you want'],
+  to: 'now',
+  from: 'now-6m',
+  severity: 'high',
+  severity_mapping: [],
+  language: 'kuery',
+  type: 'query',
+  threat: [
+    {
+      framework: 'MITRE ATT&CK',
+      tactic: {
+        id: 'TA0040',
+        name: 'impact',
+        reference: 'https://attack.mitre.org/tactics/TA0040/',
+      },
+      technique: [
+        {
+          id: 'T1499',
+          name: 'endpoint denial of service',
+          reference: 'https://attack.mitre.org/techniques/T1499/',
+        },
+      ],
+    },
+    {
+      framework: 'Some other Framework you want',
+      tactic: {
+        id: 'some-other-id',
+        name: 'Some other name',
+        reference: 'https://example.com',
+      },
+      technique: [
+        {
+          id: 'some-other-id',
+          name: 'some other technique name',
+          reference: 'https://example.com',
+        },
+      ],
+    },
+  ],
+  references: [
+    'http://www.example.com/some-article-about-attack',
+    'Some plain text string here explaining why this is a valid thing to look out for',
+  ],
+  throttle: 'no_actions',
+  timeline_id: 'timeline_id',
+  timeline_title: 'timeline_title',
+  updated_by: 'elastic',
+  note: '# some investigation documentation',
+  version: 1,
+  query: 'user.name: root or user.name: admin',
+  exceptions_list: [],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_detection_metrics_from_body.ts b/x-pack/test/detection_engine_api_integration/utils/get_detection_metrics_from_body.ts
new file mode 100644
index 0000000000000..20febd5e9180f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_detection_metrics_from_body.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
+
+/**
+ * Given a body this will return the detection metrics from it.
+ * @param body The Stats body
+ * @returns Detection metrics
+ */
+export const getDetectionMetricsFromBody = (
+  body: Array<{
+    stats: {
+      stack_stats: {
+        kibana: { plugins: { security_solution: { detectionMetrics: DetectionMetrics } } };
+      };
+    };
+  }>
+): DetectionMetrics => {
+  return body[0].stats.stack_stats.kibana.plugins.security_solution.detectionMetrics;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_eql_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_eql_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..21a8509a16460
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_eql_rule_for_signal_testing.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { EqlCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of EQL signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for EQL and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is eql-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getEqlRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'eql-rule',
+  enabled = true
+): EqlCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'eql',
+  language: 'eql',
+  query: 'any where true',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_event_log_execute_complete_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_event_log_execute_complete_by_id.ts
new file mode 100644
index 0000000000000..29d81e80dded2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_event_log_execute_complete_by_id.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type { Client } from '@elastic/elasticsearch';
+import type { SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
+
+/**
+ * Given a single rule id this will return the number of event-log execution
+ * completed docs
+ * @param es The ES client
+ * @param log
+ * @param ruleId Rule id
+ */
+export const getEventLogExecuteCompleteById = async (
+  es: Client,
+  log: ToolingLog,
+  ruleId: string
+): Promise<number> => {
+  const response = await es.search({
+    index: '.kibana-event-log*',
+    track_total_hits: true,
+    size: 0,
+    query: {
+      bool: {
+        must: [],
+        filter: [
+          {
+            match_phrase: {
+              'event.provider': 'alerting',
+            },
+          },
+          {
+            match_phrase: {
+              'event.action': 'execute',
+            },
+          },
+          {
+            match_phrase: {
+              'rule.id': ruleId,
+            },
+          },
+        ],
+        should: [],
+        must_not: [],
+      },
+    },
+  });
+
+  return (response?.hits?.total as SearchTotalHits)?.value ?? 0;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_index_name_from_load.ts b/x-pack/test/detection_engine_api_integration/utils/get_index_name_from_load.ts
new file mode 100644
index 0000000000000..7fb30f2a867f3
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_index_name_from_load.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getIndexNameFromLoad = (loadResponse: Record<string, unknown>): string => {
+  const indexNames = Object.keys(loadResponse);
+  if (indexNames.length > 1) {
+    throw new Error(
+      `expected load response to contain one index, but contained multiple: [${indexNames}]`
+    );
+  }
+  return indexNames[0];
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts b/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts
new file mode 100644
index 0000000000000..2c714614f9caa
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_legacy_action_so.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { Client } from '@elastic/elasticsearch';
+import type { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { SavedObjectReference } from '@kbn/core/server';
+import type { LegacyRuleActions } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_actions/legacy_types';
+
+interface LegacyActionSO extends LegacyRuleActions {
+  references: SavedObjectReference[];
+}
+
+/**
+ * Fetch all legacy action sidecar SOs from the .kibana index
+ * @param es The ElasticSearch service
+ */
+export const getLegacyActionSO = async (es: Client): Promise<SearchResponse<LegacyActionSO>> =>
+  es.search({
+    index: '.kibana',
+    q: 'type:siem-detection-engine-rule-actions',
+  });
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_open_signals.ts b/x-pack/test/detection_engine_api_integration/utils/get_open_signals.ts
new file mode 100644
index 0000000000000..caf496716f7f2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_open_signals.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { Client } from '@elastic/elasticsearch';
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { waitForRuleSuccessOrStatus } from './wait_for_rule_success_or_status';
+import { refreshIndex } from './refresh_index';
+import { getSignalsByIds } from './get_signals_by_ids';
+
+export const getOpenSignals = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  es: Client,
+  rule: FullResponseSchema
+) => {
+  await waitForRuleSuccessOrStatus(supertest, log, rule.id);
+  // Critically important that we wait for rule success AND refresh the write index in that order before we
+  // assert that no signals were created. Otherwise, signals could be written but not available to query yet
+  // when we search, causing tests that check that signals are NOT created to pass when they should fail.
+  await refreshIndex(es, '.alerts-security.alerts-default*');
+  return getSignalsByIds(supertest, log, [rule.id]);
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_prepackaged_rule_status.ts b/x-pack/test/detection_engine_api_integration/utils/get_prepackaged_rule_status.ts
new file mode 100644
index 0000000000000..aa1a32add99ab
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_prepackaged_rule_status.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { PrePackagedRulesAndTimelinesStatusSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response';
+
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This
+ * creates a new action and expects a 200 and does not do any retries.
+ * @param supertest The supertest deps
+ */
+export const getPrePackagedRulesStatus = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<PrePackagedRulesAndTimelinesStatusSchema> => {
+  const response = await supertest
+    .get(`${DETECTION_ENGINE_PREPACKAGED_URL}/_status`)
+    .set('kbn-xsrf', 'true')
+    .send();
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting a pre-packaged rule status. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_all_signals.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_all_signals.ts
new file mode 100644
index 0000000000000..fd003857fdc1f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_all_signals.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getQueryAllSignals = () => ({
+  query: { match_all: {} },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_signal_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_signal_ids.ts
new file mode 100644
index 0000000000000..586a7e9c8de73
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_signal_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SignalIds } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+
+export const getQuerySignalIds = (signalIds: SignalIds) => ({
+  query: {
+    terms: {
+      _id: signalIds,
+    },
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_signals_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_ids.ts
new file mode 100644
index 0000000000000..2a94be5897749
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ALERT_RULE_UUID } from '@kbn/rule-data-utils';
+
+/**
+ * Given an array of ids for a test this will get the signals
+ * created from that rule's regular id.
+ * @param ids The rule_id to search for signals
+ */
+export const getQuerySignalsId = (ids: string[], size = 10) => ({
+  size,
+  query: {
+    terms: {
+      [ALERT_RULE_UUID]: ids,
+    },
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_query_signals_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_rule_id.ts
new file mode 100644
index 0000000000000..5644d1bff1fbd
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_query_signals_rule_id.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ALERT_RULE_RULE_ID } from '@kbn/rule-data-utils';
+
+/**
+ * Given an array of ruleIds for a test this will get the signals
+ * created from that rule_id.
+ * @param ruleIds The rule_id to search for signals
+ */
+export const getQuerySignalsRuleId = (ruleIds: string[]) => ({
+  query: {
+    terms: {
+      [ALERT_RULE_RULE_ID]: ruleIds,
+    },
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule.ts
new file mode 100644
index 0000000000000..0a79ab9d7ae40
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This gets
+ * a particular rule.
+ * @param supertest The supertest deps
+ * @param rule The rule to create
+ */
+export const getRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleId: string
+): Promise<RulesSchema> => {
+  const response = await supertest
+    .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+    .set('kbn-xsrf', 'true');
+
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting a rule (getRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..ee07daad625c7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is rule-1 by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'rule-1',
+  enabled = true
+): QueryCreateSchema => ({
+  name: 'Signal Testing Query',
+  description: 'Tests a simple query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index,
+  type: 'query',
+  query: '*:*',
+  from: '1900-01-01T00:00:00.000Z',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing_with_timestamp_override.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing_with_timestamp_override.ts
new file mode 100644
index 0000000000000..d742e727137c5
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule_for_signal_testing_with_timestamp_override.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+export const getRuleForSignalTestingWithTimestampOverride = (
+  index: string[],
+  ruleId = 'rule-1',
+  enabled = true,
+  timestampOverride = 'event.ingested'
+): QueryCreateSchema => ({
+  name: 'Signal Testing Query',
+  description: 'Tests a simple query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index,
+  type: 'query',
+  query: '*:*',
+  timestamp_override: timestampOverride,
+  from: '1900-01-01T00:00:00.000Z',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_rule_with_web_hook_action.ts b/x-pack/test/detection_engine_api_integration/utils/get_rule_with_web_hook_action.ts
new file mode 100644
index 0000000000000..02aaf938b0003
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_rule_with_web_hook_action.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  CreateRulesSchema,
+  UpdateRulesSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getSimpleRule } from './get_simple_rule';
+
+export const getRuleWithWebHookAction = (
+  id: string,
+  enabled = false,
+  rule?: CreateRulesSchema
+): CreateRulesSchema | UpdateRulesSchema => {
+  const finalRule = rule != null ? { ...rule, enabled } : getSimpleRule('rule-1', enabled);
+  return {
+    ...finalRule,
+    throttle: 'rule',
+    actions: [
+      {
+        group: 'default',
+        id,
+        params: {
+          body: '{}',
+        },
+        action_type_id: '.webhook',
+      },
+    ],
+  };
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_saved_query_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_saved_query_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..da6c17d5a4026
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_saved_query_rule_for_signal_testing.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SavedQueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of Saved Query signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for SavedQuery and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is threshold-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getSavedQueryRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'saved-query-rule',
+  enabled = true
+): SavedQueryCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'saved_query',
+  saved_id: 'abcd',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_security_telemetry_stats.ts b/x-pack/test/detection_engine_api_integration/utils/get_security_telemetry_stats.ts
new file mode 100644
index 0000000000000..073fb920b37b2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_security_telemetry_stats.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { SECURITY_TELEMETRY_URL } from '@kbn/security-solution-plugin/common/constants';
+
+/**
+ * Gets the stats from the stats endpoint within specifically the security_solutions application.
+ * This is considered the "batch" telemetry.
+ * @param supertest The supertest agent.
+ * @returns The detection metrics
+ */
+export const getSecurityTelemetryStats = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<any> => {
+  const response = await supertest
+    .get(SECURITY_TELEMETRY_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ unencrypted: true, refreshCache: true });
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting the batch stats for security_solutions. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signal_status.ts b/x-pack/test/detection_engine_api_integration/utils/get_signal_status.ts
new file mode 100644
index 0000000000000..d3c922c30ccc6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signal_status.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getSignalStatus = () => ({
+  aggs: { statuses: { terms: { field: 'kibana.alert.workflow_status', size: 10 } } },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signal_status_empty_response.ts b/x-pack/test/detection_engine_api_integration/utils/get_signal_status_empty_response.ts
new file mode 100644
index 0000000000000..bcbc286a9f088
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signal_status_empty_response.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getSignalStatusEmptyResponse = () => ({
+  timed_out: false,
+  total: 0,
+  updated: 0,
+  deleted: 0,
+  batches: 0,
+  version_conflicts: 0,
+  noops: 0,
+  retries: { bulk: 0, search: 0 },
+  throttled_millis: 0,
+  requests_per_second: -1,
+  throttled_until_millis: 0,
+  failures: [],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signals_by_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_id.ts
new file mode 100644
index 0000000000000..7f90ad1189ca0
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_id.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+import { getQuerySignalsId } from './get_query_signals_ids';
+
+/**
+ * Given a single rule id this will return only signals based on that rule id.
+ * @param supertest agent
+ * @param ids Rule id
+ */
+export const getSignalsById = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  id: string
+): Promise<SearchResponse<DetectionAlert>> => {
+  const signalsOpen = await countDownTest<SearchResponse<DetectionAlert>>(
+    async () => {
+      const response = await supertest
+        .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+        .set('kbn-xsrf', 'true')
+        .send(getQuerySignalsId([id]));
+      if (response.status !== 200) {
+        return {
+          passed: false,
+          returnValue: undefined,
+        };
+      } else {
+        return {
+          passed: true,
+          returnValue: response.body,
+        };
+      }
+    },
+    'getSignalsById',
+    log
+  );
+  if (signalsOpen == null) {
+    throw new Error('Signals not defined after countdown, cannot continue');
+  } else {
+    return signalsOpen;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signals_by_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_ids.ts
new file mode 100644
index 0000000000000..3a8da122fbb4d
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_ids.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+import { getQuerySignalsId } from './get_query_signals_ids';
+
+/**
+ * Given an array of rule ids this will return only signals based on that rule id both
+ * open and closed
+ * @param supertest agent
+ * @param ids Array of the rule ids
+ */
+export const getSignalsByIds = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ids: string[],
+  size?: number
+): Promise<SearchResponse<DetectionAlert>> => {
+  const signalsOpen = await countDownTest<SearchResponse<DetectionAlert>>(
+    async () => {
+      const response = await supertest
+        .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+        .set('kbn-xsrf', 'true')
+        .send(getQuerySignalsId(ids, size));
+      if (response.status !== 200) {
+        return {
+          passed: false,
+          errorMessage: `Status is not 200 as expected, it is: ${response.status}`,
+        };
+      } else {
+        return {
+          passed: true,
+          returnValue: response.body,
+        };
+      }
+    },
+    'getSignalsByIds',
+    log
+  );
+  if (signalsOpen == null) {
+    throw new Error('Signals not defined after countdown, cannot continue');
+  } else {
+    return signalsOpen;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_signals_by_rule_ids.ts b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_rule_ids.ts
new file mode 100644
index 0000000000000..0345b22504759
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_signals_by_rule_ids.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+import { getQuerySignalsRuleId } from './get_query_signals_rule_id';
+
+/**
+ * Returns all signals both closed and opened by ruleId
+ * @param supertest Deps
+ */
+export const getSignalsByRuleIds = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  ruleIds: string[]
+): Promise<SearchResponse<DetectionAlert>> => {
+  const signalsOpen = await countDownTest<SearchResponse<DetectionAlert>>(
+    async () => {
+      const response = await supertest
+        .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+        .set('kbn-xsrf', 'true')
+        .send(getQuerySignalsRuleId(ruleIds));
+      if (response.status !== 200) {
+        return {
+          passed: false,
+          errorMessage: `Status is not 200 as expected, it is: ${response.status}`,
+        };
+      } else {
+        return {
+          passed: true,
+          returnValue: response.body,
+        };
+      }
+    },
+    'getSignalsByRuleIds',
+    log
+  );
+  if (signalsOpen == null) {
+    throw new Error('Signals not defined after countdown, cannot continue');
+  } else {
+    return signalsOpen;
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule.ts
new file mode 100644
index 0000000000000..5cf6c1c41aff4
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a representative ML rule payload as expected by the server
+ * @param ruleId The rule id
+ * @param enabled Set to tru to enable it, by default it is off
+ */
+export const getSimpleMlRule = (ruleId = 'rule-1', enabled = false): CreateRulesSchema => ({
+  name: 'Simple ML Rule',
+  description: 'Simple Machine Learning Rule',
+  enabled,
+  anomaly_threshold: 44,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  machine_learning_job_id: ['some_job_id'],
+  type: 'machine_learning',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_output.ts
new file mode 100644
index 0000000000000..c845c0d343261
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_output.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> => {
+  const rule = getSimpleRuleOutput(ruleId);
+  const { query, language, index, ...rest } = rule;
+
+  return {
+    ...rest,
+    name: 'Simple ML Rule',
+    description: 'Simple Machine Learning Rule',
+    anomaly_threshold: 44,
+    machine_learning_job_id: ['some_job_id'],
+    type: 'machine_learning',
+  };
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_update.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_update.ts
new file mode 100644
index 0000000000000..b5200ddd86357
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_ml_rule_update.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { UpdateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a representative ML rule payload as expected by the server for an update
+ * @param ruleId The rule id
+ * @param enabled Set to tru to enable it, by default it is off
+ */
+export const getSimpleMlRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
+  name: 'Simple ML Rule',
+  description: 'Simple Machine Learning Rule',
+  enabled,
+  anomaly_threshold: 44,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  machine_learning_job_id: ['some_job_id'],
+  type: 'machine_learning',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_preview_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_preview_rule.ts
new file mode 100644
index 0000000000000..5232af55b89b6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_preview_rule.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PreviewRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple preview rule for testing that is easy for most basic testing
+ * @param ruleId
+ * @param invocationCount The number of times the rule will be run through the executors. Defaulted to 12,
+ * the execution time for the default interval time of 5m.
+ */
+export const getSimplePreviewRule = (
+  ruleId = 'preview-rule-1',
+  invocationCount = 12
+): PreviewRulesSchema => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index: ['auditbeat-*'],
+  type: 'query',
+  query: 'user.name: root or user.name: admin',
+  invocationCount,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule.ts
new file mode 100644
index 0000000000000..a7e53a368b93c
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple rule for testing that is easy for most basic testing
+ * @param ruleId
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getSimpleRule = (ruleId = 'rule-1', enabled = false): QueryCreateSchema => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index: ['auditbeat-*'],
+  type: 'query',
+  query: 'user.name: root or user.name: admin',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_as_ndjson.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_as_ndjson.ts
new file mode 100644
index 0000000000000..fd416b1682b3d
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_as_ndjson.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getSimpleRule } from './get_simple_rule';
+
+/**
+ * Given an array of rule_id strings this will return a ndjson buffer which is useful
+ * for testing uploads.
+ * @param ruleIds Array of strings of rule_ids
+ */
+export const getSimpleRuleAsNdjson = (ruleIds: string[], enabled = false): Buffer => {
+  const stringOfRules = ruleIds.map((ruleId) => {
+    const simpleRule = getSimpleRule(ruleId, enabled);
+    return JSON.stringify(simpleRule);
+  });
+  return Buffer.from(stringOfRules.join('\n'));
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output.ts
new file mode 100644
index 0000000000000..30dc7eecb9256
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+/**
+ * This is the typical output of a simple rule that Kibana will output with all the defaults
+ * except for the server generated properties.  Useful for testing end to end tests.
+ */
+export const getSimpleRuleOutput = (ruleId = 'rule-1', enabled = false): Partial<RulesSchema> => ({
+  actions: [],
+  author: [],
+  created_by: 'elastic',
+  description: 'Simple Rule Query',
+  enabled,
+  false_positives: [],
+  from: 'now-6m',
+  immutable: false,
+  index: ['auditbeat-*'],
+  interval: '5m',
+  rule_id: ruleId,
+  language: 'kuery',
+  output_index: '.siem-signals-default',
+  max_signals: 100,
+  risk_score: 1,
+  risk_score_mapping: [],
+  name: 'Simple Rule Query',
+  query: 'user.name: root or user.name: admin',
+  references: [],
+  severity: 'high',
+  severity_mapping: [],
+  updated_by: 'elastic',
+  tags: [],
+  to: 'now',
+  type: 'query',
+  threat: [],
+  throttle: 'no_actions',
+  exceptions_list: [],
+  version: 1,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_with_web_hook_action.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_with_web_hook_action.ts
new file mode 100644
index 0000000000000..45dd0bfd5d477
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_with_web_hook_action.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial<RulesSchema> => ({
+  ...getSimpleRuleOutput(),
+  throttle: 'rule',
+  actions: [
+    {
+      action_type_id: '.webhook',
+      group: 'default',
+      id: actionId,
+      params: {
+        body: '{}',
+      },
+    },
+  ],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_without_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_without_rule_id.ts
new file mode 100644
index 0000000000000..dbf94965278d6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_output_without_rule_id.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+/**
+ * This is the typical output of a simple rule that Kibana will output with all the defaults except
+ * for all the server generated properties such as created_by. Useful for testing end to end tests.
+ */
+export const getSimpleRuleOutputWithoutRuleId = (ruleId = 'rule-1'): Partial<RulesSchema> => {
+  const rule = getSimpleRuleOutput(ruleId);
+  const { rule_id: rId, ...ruleWithoutRuleId } = rule;
+  return ruleWithoutRuleId;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_preview_output.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_preview_output.ts
new file mode 100644
index 0000000000000..26fe0eafd1456
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_preview_output.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulePreviewLogs } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is the typical output of a simple rule preview, with errors and warnings coming up from the rule
+ * execution process and a `previewId` generated server side for later preview querying
+ *
+ * @param previewId Rule id generated by the server itself
+ * @param logs Errors and warnings returned by executor and route file, defaults to empty array
+ */
+export const getSimpleRulePreviewOutput = (
+  previewId = undefined,
+  logs: RulePreviewLogs[] = []
+) => ({
+  logs,
+  previewId,
+  isAborted: false,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_update.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_update.ts
new file mode 100644
index 0000000000000..0749abe811784
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_update.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { UpdateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple rule for testing that is easy for most basic testing
+ * @param ruleId The rule id
+ * @param enabled Set to tru to enable it, by default it is off
+ */
+export const getSimpleRuleUpdate = (ruleId = 'rule-1', enabled = false): UpdateRulesSchema => ({
+  name: 'Simple Rule Query',
+  description: 'Simple Rule Query',
+  enabled,
+  risk_score: 1,
+  rule_id: ruleId,
+  severity: 'high',
+  index: ['auditbeat-*'],
+  type: 'query',
+  query: 'user.name: root or user.name: admin',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_without_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_without_rule_id.ts
new file mode 100644
index 0000000000000..25994c8e6e14b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_rule_without_rule_id.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getSimpleRule } from './get_simple_rule';
+
+/**
+ * This is a typical simple rule for testing that is easy for most basic testing
+ */
+export const getSimpleRuleWithoutRuleId = (): CreateRulesSchema => {
+  const simpleRule = getSimpleRule();
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { rule_id, ...ruleWithoutId } = simpleRule;
+  return ruleWithoutId;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_simple_threat_match.ts b/x-pack/test/detection_engine_api_integration/utils/get_simple_threat_match.ts
new file mode 100644
index 0000000000000..57cca015d2c4b
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_simple_threat_match.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ThreatMatchCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This is a typical simple indicator match/threat match for testing that is easy for most basic testing
+ * @param ruleId
+ * @param enabled Enables the rule on creation or not. Defaulted to false.
+ */
+export const getSimpleThreatMatch = (
+  ruleId = 'rule-1',
+  enabled = false
+): ThreatMatchCreateSchema => ({
+  description: 'Detecting root and admin users',
+  name: 'Query with a rule id',
+  severity: 'high',
+  enabled,
+  index: ['auditbeat-*'],
+  type: 'threat_match',
+  risk_score: 55,
+  language: 'kuery',
+  rule_id: ruleId,
+  from: '1900-01-01T00:00:00.000Z',
+  query: '*:*',
+  threat_query: '*:*',
+  threat_index: ['auditbeat-*'],
+  threat_mapping: [
+    // We match host.name against host.name
+    {
+      entries: [
+        {
+          field: 'host.name',
+          value: 'host.name',
+          type: 'mapping',
+        },
+      ],
+    },
+  ],
+  threat_filters: [],
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_stats.ts b/x-pack/test/detection_engine_api_integration/utils/get_stats.ts
new file mode 100644
index 0000000000000..239fca801e107
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_stats.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+import type { DetectionMetrics } from '@kbn/security-solution-plugin/server/usage/detections/types';
+
+import { getStatsUrl } from './get_stats_url';
+import { getDetectionMetricsFromBody } from './get_detection_metrics_from_body';
+
+/**
+ * Gets the stats from the stats endpoint.
+ * @param supertest The supertest agent.
+ * @returns The detection metrics
+ */
+export const getStats = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<DetectionMetrics> => {
+  const response = await supertest
+    .post(getStatsUrl())
+    .set('kbn-xsrf', 'true')
+    .send({ unencrypted: true, refreshCache: true });
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when getting the stats for detections. CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return getDetectionMetricsFromBody(response.body);
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_stats_url.ts b/x-pack/test/detection_engine_api_integration/utils/get_stats_url.ts
new file mode 100644
index 0000000000000..ac6537f670f77
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_stats_url.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Cluster stats URL. Replace this with any from kibana core if there is ever a constant there for this.
+ */
+export const getStatsUrl = (): string => '/api/telemetry/v2/clusters/_stats';
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_threat_match_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_threat_match_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..3e663607c1186
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_threat_match_rule_for_signal_testing.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ThreatMatchCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of Threat Match signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for Threat Match and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is threshold-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getThreatMatchRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'threat-match-rule',
+  enabled = true
+): ThreatMatchCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'threat_match',
+  language: 'kuery',
+  query: '*:*',
+  threat_query: '*:*',
+  threat_mapping: [
+    // We match host.name against host.name
+    {
+      entries: [
+        {
+          field: 'host.name',
+          value: 'host.name',
+          type: 'mapping',
+        },
+      ],
+    },
+  ],
+  threat_index: index, // match against same index for simplicity
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_threshold_rule_for_signal_testing.ts b/x-pack/test/detection_engine_api_integration/utils/get_threshold_rule_for_signal_testing.ts
new file mode 100644
index 0000000000000..aea1a5746bf78
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_threshold_rule_for_signal_testing.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ThresholdCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+import { getRuleForSignalTesting } from './get_rule_for_signal_testing';
+
+/**
+ * This is a typical signal testing rule that is easy for most basic testing of output of Threshold signals.
+ * It starts out in an enabled true state. The 'from' is set very far back to test the basics of signal
+ * creation for Threshold and testing by getting all the signals at once.
+ * @param ruleId The optional ruleId which is threshold-rule by default.
+ * @param enabled Enables the rule on creation or not. Defaulted to true.
+ */
+export const getThresholdRuleForSignalTesting = (
+  index: string[],
+  ruleId = 'threshold-rule',
+  enabled = true
+): ThresholdCreateSchema => ({
+  ...getRuleForSignalTesting(index, ruleId, enabled),
+  type: 'threshold',
+  language: 'kuery',
+  query: '*:*',
+  threshold: {
+    field: 'process.name',
+    value: 21,
+  },
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/get_web_hook_action.ts b/x-pack/test/detection_engine_api_integration/utils/get_web_hook_action.ts
new file mode 100644
index 0000000000000..27a93b396b93f
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/get_web_hook_action.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const getWebHookAction = () => ({
+  actionTypeId: '.webhook',
+  config: {
+    method: 'post',
+    url: 'http://localhost',
+  },
+  secrets: {
+    user: 'example',
+    password: 'example',
+  },
+  name: 'Some connector',
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/index.ts b/x-pack/test/detection_engine_api_integration/utils/index.ts
new file mode 100644
index 0000000000000..3fb9c8ebafc02
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/index.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './binary_to_string';
+export * from './count_down_es';
+export * from './count_down_test';
+export * from './create_container_with_endpoint_entries';
+export * from './create_container_with_entries';
+export * from './create_exception_list';
+export * from './create_exception_list_item';
+export * from './create_legacy_rule_action';
+export * from './create_new_action';
+export * from './create_rule';
+export * from './create_rule_with_auth';
+export * from './create_rule_with_exception_entries';
+export * from './create_signals_index';
+export * from './delete_all_alerts';
+export * from './delete_all_event_log_execution_events';
+export * from './delete_all_rule_execution_info';
+export * from './delete_all_timelines';
+export * from './delete_exception_list';
+export * from './delete_migrations';
+export * from './delete_rule';
+export * from './delete_signals_index';
+export * from './downgrade_immutable_rule';
+export * from './finalize_signals_migration';
+export * from './find_immutable_rule_by_id';
+export * from './get_complex_rule';
+export * from './get_complex_rule_output';
+export * from './get_detection_metrics_from_body';
+export * from './get_eql_rule_for_signal_testing';
+export * from './get_event_log_execute_complete_by_id';
+export * from './get_index_name_from_load';
+export * from './get_legacy_action_so';
+export * from './get_open_signals';
+export * from './get_prepackaged_rule_status';
+export * from './get_query_all_signals';
+export * from './get_query_signal_ids';
+export * from './get_query_signals_ids';
+export * from './get_query_signals_rule_id';
+export * from './get_rule';
+export * from './get_rule_for_signal_testing';
+export * from './get_rule_for_signal_testing_with_timestamp_override';
+export * from './get_rule_with_web_hook_action';
+export * from './get_saved_query_rule_for_signal_testing';
+export * from './get_security_telemetry_stats';
+export * from './get_signal_status';
+export * from './get_signal_status_empty_response';
+export * from './get_signals_by_id';
+export * from './get_signals_by_ids';
+export * from './get_signals_by_rule_ids';
+export * from './get_simple_ml_rule';
+export * from './get_simple_ml_rule_output';
+export * from './get_simple_ml_rule_update';
+export * from './get_simple_preview_rule';
+export * from './get_simple_rule';
+export * from './get_simple_rule_as_ndjson';
+export * from './get_simple_rule_output';
+export * from './get_simple_rule_output_with_web_hook_action';
+export * from './get_simple_rule_output_without_rule_id';
+export * from './get_simple_rule_preview_output';
+export * from './get_simple_rule_update';
+export * from './get_simple_rule_without_rule_id';
+export * from './get_simple_threat_match';
+export * from './get_stats';
+export * from './get_stats_url';
+export * from './get_threat_match_rule_for_signal_testing';
+export * from './get_threshold_rule_for_signal_testing';
+export * from './get_web_hook_action';
+export * from './index_event_log_execution_events';
+export * from './install_prepackaged_rules';
+export * from './refresh_index';
+export * from './remove_server_generated_properties';
+export * from './remove_server_generated_properties_including_rule_id';
+export * from './resolve_simple_rule_output';
+export * from './rule_to_ndjson';
+export * from './set_signal_status';
+export * from './start_signals_migration';
+export * from './update_rule';
+export * from './wait_for';
+export * from './wait_for_alert_to_complete';
+export * from './wait_for_event_log_execute_complete';
+export * from './wait_for_index_to_populate';
+export * from './wait_for_rule_success_or_status';
+export * from './wait_for_signals_to_be_present';
diff --git a/x-pack/test/detection_engine_api_integration/utils/index_event_log_execution_events.ts b/x-pack/test/detection_engine_api_integration/utils/index_event_log_execution_events.ts
new file mode 100644
index 0000000000000..cf2438ebdefbb
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/index_event_log_execution_events.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type { Client } from '@elastic/elasticsearch';
+
+/**
+ * Indexes provided execution events into .kibana-event-log-*
+ * @param es The ElasticSearch handle
+ * @param log The tooling logger
+ * @param events
+ */
+export const indexEventLogExecutionEvents = async (
+  es: Client,
+  log: ToolingLog,
+  events: object[]
+): Promise<void> => {
+  const operations = events.flatMap((doc: object) => [
+    { index: { _index: '.kibana-event-log-*' } },
+    doc,
+  ]);
+
+  await es.bulk({ refresh: true, operations });
+
+  return;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/install_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/utils/install_prepackaged_rules.ts
new file mode 100644
index 0000000000000..3c0a32d266202
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/install_prepackaged_rules.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '@kbn/security-solution-plugin/common/constants';
+import { countDownTest } from './count_down_test';
+
+export const installPrePackagedRules = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog
+): Promise<void> => {
+  await countDownTest(
+    async () => {
+      const { status, body } = await supertest
+        .put(DETECTION_ENGINE_PREPACKAGED_URL)
+        .set('kbn-xsrf', 'true')
+        .send();
+      if (status !== 200) {
+        return {
+          passed: false,
+          errorMessage: `Did not get an expected 200 "ok" when installing pre-packaged rules (installPrePackagedRules) yet. Retrying until we get a 200 "ok". body: ${JSON.stringify(
+            body
+          )}, status: ${JSON.stringify(status)}`,
+        };
+      } else {
+        return { passed: true };
+      }
+    },
+    'installPrePackagedRules',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/refresh_index.ts b/x-pack/test/detection_engine_api_integration/utils/refresh_index.ts
new file mode 100644
index 0000000000000..f888216cb6eed
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/refresh_index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Client } from '@elastic/elasticsearch';
+
+/**
+ * Refresh an index, making changes available to search.
+ * Useful for tests where we want to ensure that a rule does NOT create alerts, e.g. testing exceptions.
+ * @param es The ElasticSearch handle
+ */
+export const refreshIndex = async (es: Client, index?: string) => {
+  await es.indices.refresh({
+    index,
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties.ts b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties.ts
new file mode 100644
index 0000000000000..5404c09c34aac
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * This will remove server generated properties such as date times, etc...
+ * @param rule Rule to pass in to remove typical server generated properties
+ */
+export const removeServerGeneratedProperties = (
+  rule: FullResponseSchema
+): Partial<FullResponseSchema> => {
+  const {
+    /* eslint-disable @typescript-eslint/naming-convention */
+    id,
+    created_at,
+    updated_at,
+    execution_summary,
+    /* eslint-enable @typescript-eslint/naming-convention */
+    ...removedProperties
+  } = rule;
+  return removedProperties;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties_including_rule_id.ts b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties_including_rule_id.ts
new file mode 100644
index 0000000000000..e8e7e1900afb7
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/remove_server_generated_properties_including_rule_id.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { FullResponseSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+import { removeServerGeneratedProperties } from './remove_server_generated_properties';
+
+/**
+ * This will remove server generated properties such as date times, etc... including the rule_id
+ * @param rule Rule to pass in to remove typical server generated properties
+ */
+export const removeServerGeneratedPropertiesIncludingRuleId = (
+  rule: FullResponseSchema
+): Partial<FullResponseSchema> => {
+  const ruleWithRemovedProperties = removeServerGeneratedProperties(rule);
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { rule_id, ...additionalRuledIdRemoved } = ruleWithRemovedProperties;
+  return additionalRuledIdRemoved;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/resolve_simple_rule_output.ts b/x-pack/test/detection_engine_api_integration/utils/resolve_simple_rule_output.ts
new file mode 100644
index 0000000000000..468cbdfa23aa5
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/resolve_simple_rule_output.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/response/rules_schema';
+
+import { getSimpleRuleOutput } from './get_simple_rule_output';
+
+export const resolveSimpleRuleOutput = (
+  ruleId = 'rule-1',
+  enabled = false
+): Partial<RulesSchema> => ({ outcome: 'exactMatch', ...getSimpleRuleOutput(ruleId, enabled) });
diff --git a/x-pack/test/detection_engine_api_integration/utils/rule_to_ndjson.ts b/x-pack/test/detection_engine_api_integration/utils/rule_to_ndjson.ts
new file mode 100644
index 0000000000000..1082212432c01
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/rule_to_ndjson.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CreateRulesSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Given a rule this will convert it to an ndjson buffer which is useful for
+ * testing upload features.
+ * @param rule The rule to convert to ndjson
+ */
+export const ruleToNdjson = (rule: CreateRulesSchema): Buffer => {
+  const stringified = JSON.stringify(rule);
+  return Buffer.from(`${stringified}\n`);
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/set_signal_status.ts b/x-pack/test/detection_engine_api_integration/utils/set_signal_status.ts
new file mode 100644
index 0000000000000..2cd4cb557f637
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/set_signal_status.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  Status,
+  SignalIds,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+
+export const setSignalStatus = ({
+  signalIds,
+  status,
+}: {
+  signalIds: SignalIds;
+  status: Status;
+}) => ({
+  signal_ids: signalIds,
+  status,
+});
diff --git a/x-pack/test/detection_engine_api_integration/utils/start_signals_migration.ts b/x-pack/test/detection_engine_api_integration/utils/start_signals_migration.ts
new file mode 100644
index 0000000000000..f334ed3bbdb33
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/start_signals_migration.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_SIGNALS_MIGRATION_URL } from '@kbn/security-solution-plugin/common/constants';
+
+interface CreateMigrationResponse {
+  index: string;
+  migration_index: string;
+  migration_id: string;
+}
+
+export const startSignalsMigration = async ({
+  indices,
+  supertest,
+  log,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  log: ToolingLog;
+  indices: string[];
+}): Promise<CreateMigrationResponse[]> => {
+  const response = await supertest
+    .post(DETECTION_ENGINE_SIGNALS_MIGRATION_URL)
+    .set('kbn-xsrf', 'true')
+    .send({ index: indices });
+
+  const {
+    body: { indices: created },
+  }: { body: { indices: CreateMigrationResponse[] } } = response;
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when starting a signals migration (startSignalsMigration). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return created;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/update_rule.ts b/x-pack/test/detection_engine_api_integration/utils/update_rule.ts
new file mode 100644
index 0000000000000..8e9b64506a140
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/update_rule.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import {
+  UpdateRulesSchema,
+  FullResponseSchema,
+} from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
+
+/**
+ * Helper to cut down on the noise in some of the tests. This checks for
+ * an expected 200 still and does not do any retries.
+ * @param supertest The supertest deps
+ * @param rule The rule to create
+ */
+export const updateRule = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  updatedRule: UpdateRulesSchema
+): Promise<FullResponseSchema> => {
+  const response = await supertest
+    .put(DETECTION_ENGINE_RULES_URL)
+    .set('kbn-xsrf', 'true')
+    .send(updatedRule);
+  if (response.status !== 200) {
+    log.error(
+      `Did not get an expected 200 "ok" when updating a rule (updateRule). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+        response.body
+      )}, status: ${JSON.stringify(response.status)}`
+    );
+  }
+  return response.body;
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for.ts
new file mode 100644
index 0000000000000..ff113526798f3
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+
+// Similar to ReactJs's waitFor from here: https://testing-library.com/docs/dom-testing-library/api-async#waitfor
+export const waitFor = async (
+  functionToTest: () => Promise<boolean>,
+  functionName: string,
+  log: ToolingLog,
+  maxTimeout: number = 400000,
+  timeoutWait: number = 250
+): Promise<void> => {
+  let found = false;
+  let numberOfTries = 0;
+  const maxTries = Math.floor(maxTimeout / timeoutWait);
+  while (!found && numberOfTries < maxTries) {
+    if (await functionToTest()) {
+      found = true;
+    } else {
+      log.debug(`Try number ${numberOfTries} out of ${maxTries} for function ${functionName}`);
+      numberOfTries++;
+    }
+
+    await new Promise((resolveTimeout) => setTimeout(resolveTimeout, timeoutWait));
+  }
+
+  if (!found) {
+    throw new Error(`timed out waiting for function condition to be true within ${functionName}`);
+  }
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_alert_to_complete.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_alert_to_complete.ts
new file mode 100644
index 0000000000000..3cdf38a7120c8
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_alert_to_complete.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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { waitFor } from './wait_for';
+
+export const waitForAlertToComplete = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  id: string
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const response = await supertest.get(`/api/alerts/alert/${id}/state`).set('kbn-xsrf', 'true');
+      if (response.status !== 200) {
+        log.debug(
+          `Did not get an expected 200 "ok" when waiting for an alert to complete (waitForAlertToComplete). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+            response.body
+          )}, status: ${JSON.stringify(response.status)}`
+        );
+      }
+      return response.body.previousStartedAt != null;
+    },
+    'waitForAlertToComplete',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_event_log_execute_complete.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_event_log_execute_complete.ts
new file mode 100644
index 0000000000000..7af010055b26e
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_event_log_execute_complete.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type { Client } from '@elastic/elasticsearch';
+
+import { waitFor } from './wait_for';
+import { getEventLogExecuteCompleteById } from './get_event_log_execute_complete_by_id';
+
+/**
+ * Waits for the event-log execution completed doc count to be greater than the
+ * supplied number before continuing with a default of at least one execution
+ * @param es The ES client
+ * @param log
+ * @param ruleId The id of rule to check execution logs for
+ * @param totalExecutions The number of executions to wait for, default is 1
+ */
+export const waitForEventLogExecuteComplete = async (
+  es: Client,
+  log: ToolingLog,
+  ruleId: string,
+  totalExecutions = 1
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const executionCount = await getEventLogExecuteCompleteById(es, log, ruleId);
+      return executionCount >= totalExecutions;
+    },
+    'waitForEventLogExecuteComplete',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_index_to_populate.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_index_to_populate.ts
new file mode 100644
index 0000000000000..2ba7f56813a86
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_index_to_populate.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type { Client } from '@elastic/elasticsearch';
+import { waitFor } from './wait_for';
+
+/**
+ * Waits for the given index to contain documents
+ *
+ * @param esClient elasticsearch {@link Client}
+ * @param index name of the index to query
+ */
+export const waitForIndexToPopulate = async (
+  es: Client,
+  log: ToolingLog,
+  index: string
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const response = await es.count({ index });
+      return response.count > 0;
+    },
+    `waitForIndexToPopulate: ${index}`,
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_success_or_status.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_success_or_status.ts
new file mode 100644
index 0000000000000..c09ca5c2b9679
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_success_or_status.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { RuleExecutionStatus } from '@kbn/security-solution-plugin/common/detection_engine/schemas/common';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { waitFor } from './wait_for';
+
+/**
+ * Waits for the rule in find status to be 'succeeded'
+ * or the provided status, before continuing
+ * @param supertest Deps
+ */
+export const waitForRuleSuccessOrStatus = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  id: string,
+  status: RuleExecutionStatus = RuleExecutionStatus.succeeded,
+  afterDate?: Date
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      try {
+        const response = await supertest
+          .get(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .query({ id });
+        if (response.status !== 200) {
+          log.debug(
+            `Did not get an expected 200 "ok" when waiting for a rule success or status (waitForRuleSuccessOrStatus). CI issues could happen. Suspect this line if you are seeing CI issues. body: ${JSON.stringify(
+              response.body
+            )}, status: ${JSON.stringify(response.status)}`
+          );
+        }
+
+        // TODO: https://github.com/elastic/kibana/pull/121644 clean up, make type-safe
+        const rule = response.body;
+        const ruleStatus = rule?.execution_summary?.last_execution.status;
+        const ruleStatusDate = rule?.execution_summary?.last_execution.date;
+
+        if (ruleStatus !== status) {
+          log.debug(
+            `Did not get an expected status of ${status} while waiting for a rule success or status for rule id ${id} (waitForRuleSuccessOrStatus). Will continue retrying until status is found. body: ${JSON.stringify(
+              response.body
+            )}, status: ${JSON.stringify(response.status)}`
+          );
+        }
+        return (
+          rule != null &&
+          ruleStatus === status &&
+          (afterDate ? new Date(ruleStatusDate) > afterDate : true)
+        );
+      } catch (e) {
+        if ((e as Error).message.includes('got 503 "Service Unavailable"')) {
+          return false;
+        }
+        throw e;
+      }
+    },
+    'waitForRuleSuccessOrStatus',
+    log
+  );
+};
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_signals_to_be_present.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_signals_to_be_present.ts
new file mode 100644
index 0000000000000..398a921823848
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_signals_to_be_present.ts
@@ -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
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ToolingLog } from '@kbn/dev-utils';
+import type SuperTest from 'supertest';
+
+import { getSignalsByIds } from './get_signals_by_ids';
+import { waitFor } from './wait_for';
+
+/**
+ * Waits for the signal hits to be greater than the supplied number
+ * before continuing with a default of at least one signal
+ * @param supertest Deps
+ * @param numberOfSignals The number of signals to wait for, default is 1
+ */
+export const waitForSignalsToBePresent = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  log: ToolingLog,
+  numberOfSignals = 1,
+  signalIds: string[]
+): Promise<void> => {
+  await waitFor(
+    async () => {
+      const signalsOpen = await getSignalsByIds(supertest, log, signalIds, numberOfSignals);
+      return signalsOpen.hits.hits.length >= numberOfSignals;
+    },
+    'waitForSignalsToBePresent',
+    log
+  );
+};
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts
index fd6701ddd2695..db90569310cbc 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/hidden_saved_object_routes.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, CoreSetup } from 'kibana/server';
+import { IRouter, CoreSetup } from '@kbn/core/server';
 import { PluginsSetup, PluginsStart } from '.';
 
 export function registerHiddenSORoutes(
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts
index e1cf24521d1b1..b9ab3324750dd 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts
@@ -11,12 +11,12 @@ import {
   PluginInitializer,
   SavedObjectsNamespaceType,
   SavedObjectUnsanitizedDoc,
-} from '../../../../../../src/core/server';
+} from '@kbn/core/server';
 import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
-} from '../../../../../plugins/encrypted_saved_objects/server';
-import { SpacesPluginSetup } from '../../../../../plugins/spaces/server';
+} from '@kbn/encrypted-saved-objects-plugin/server';
+import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { registerHiddenSORoutes } from './hidden_saved_object_routes';
 
 const SAVED_OBJECT_WITH_SECRET_TYPE = 'saved-object-with-secret';
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts b/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts
index 79880e1f21cb0..e0743ee31d88e 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObject } from 'src/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/examples/config.ts b/x-pack/test/examples/config.ts
index cf37cad5bc243..6eb1e86dd0826 100644
--- a/x-pack/test/examples/config.ts
+++ b/x-pack/test/examples/config.ts
@@ -37,6 +37,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('./search_examples'),
       require.resolve('./embedded_lens'),
       require.resolve('./reporting_examples'),
+      require.resolve('./screenshotting'),
     ],
 
     kbnTestServer: {
diff --git a/x-pack/test/examples/embedded_lens/index.ts b/x-pack/test/examples/embedded_lens/index.ts
index 98ea7f80754a2..debab4773f9eb 100644
--- a/x-pack/test/examples/embedded_lens/index.ts
+++ b/x-pack/test/examples/embedded_lens/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../../../test/plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, loadTestFile }: PluginFunctionalProviderContext) {
diff --git a/x-pack/test/examples/reporting_examples/index.ts b/x-pack/test/examples/reporting_examples/index.ts
index a0e8689a26586..e4e5c93e5eee2 100644
--- a/x-pack/test/examples/reporting_examples/index.ts
+++ b/x-pack/test/examples/reporting_examples/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../../../test/plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: PluginFunctionalProviderContext) {
diff --git a/x-pack/test/examples/screenshotting/index.ts b/x-pack/test/examples/screenshotting/index.ts
new file mode 100644
index 0000000000000..b59663766389f
--- /dev/null
+++ b/x-pack/test/examples/screenshotting/index.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../test/functional/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({
+  getService,
+  getPageObjects,
+  updateBaselines,
+}: FtrProviderContext & { updateBaselines: boolean }) {
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const screenshots = getService('screenshots');
+  const testSubjects = getService('testSubjects');
+  const PageObjects = getPageObjects(['common']);
+
+  describe('Screenshotting Example', function () {
+    before(async () => {
+      this.tags('ciGroup13');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
+      await PageObjects.common.navigateToApp('screenshottingExample');
+
+      await testSubjects.setValue(
+        'expression',
+        `kibana
+          | kibana_context
+          | esaggs
+              index={indexPatternLoad id='logstash-*'}
+              aggs={aggCount id="1" enabled=true schema="metric"}
+              aggs={aggMax id="1" enabled=true schema="metric" field="bytes"}
+              aggs={aggTerms id="2" enabled=true schema="segment" field="response.raw" size=4 order="desc" orderBy="1"}
+          | metricVis metric={visdimension 0}
+        `
+      );
+      await testSubjects.click('run');
+    });
+
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    it('should capture a screenshot ', async () => {
+      const image = await testSubjects.find('image');
+      const difference = await screenshots.compareAgainstBaseline(
+        'screenshotting_example_image',
+        updateBaselines,
+        image
+      );
+
+      expect(difference).to.be.lessThan(0.1);
+    });
+
+    it('should return memory metrics', async () => {
+      const memory = await testSubjects.find('memory');
+      const text = await memory.getVisibleText();
+
+      expect(text).to.match(/\d+\.\d+ MB/);
+    });
+
+    it('should return CPU metrics', async () => {
+      const memory = await testSubjects.find('cpu');
+      const text = await memory.getVisibleText();
+
+      expect(text).to.match(/\d+\.\d+%/);
+    });
+
+    it('should show an error message', async () => {
+      await testSubjects.setValue('expression', 'something');
+      await testSubjects.click('run');
+
+      const error = await testSubjects.find('error');
+      const text = await error.getVisibleText();
+
+      expect(text).to.contain('Function something could not be found.');
+    });
+  });
+}
diff --git a/x-pack/test/examples/search_examples/index.ts b/x-pack/test/examples/search_examples/index.ts
index 18b2acbd56564..c0f8ab22c8f8f 100644
--- a/x-pack/test/examples/search_examples/index.ts
+++ b/x-pack/test/examples/search_examples/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+import { PluginFunctionalProviderContext } from '../../../../test/plugin_functional/services';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, loadTestFile }: PluginFunctionalProviderContext) {
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
index 6c2c2c7bc8b48..ba13772b10253 100644
--- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../plugins/fleet/common';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts
index d5fe4b2463d4c..e84c9f53de4cc 100644
--- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import { skipIfNoDockerRegistry } from '../../helpers';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { setupFleetAndAgents } from '../agents/services';
 import {
   AGENT_POLICY_INDEX,
   AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
diff --git a/x-pack/test/fleet_api_integration/apis/agents/status.ts b/x-pack/test/fleet_api_integration/apis/agents/status.ts
index bbcdfb0f1c4c3..75ee62c576669 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/status.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/status.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { AGENTS_INDEX } from '../../../../plugins/fleet/common';
 
 export default function ({ getService }: FtrProviderContext) {
   const es = getService('es');
diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
index e84aa13475564..dd53da8289ccd 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
@@ -7,10 +7,10 @@
 
 import expect from '@kbn/expect';
 import semver from 'semver';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { setupFleetAndAgents } from './services';
 import { skipIfNoDockerRegistry } from '../../helpers';
-import { AGENTS_INDEX } from '../../../../plugins/fleet/common';
 import { testUsers } from '../test_users';
 
 const makeSnapshotVersion = (version: string) => {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
index e3815150c0b66..29110f5807edf 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_upgrade.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { skipIfNoDockerRegistry } from '../../helpers';
 import {
   BulkInstallPackageInfo,
   BulkInstallPackagesResponse,
   IBulkInstallPackageHTTPError,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
 import { testUsers } from '../test_users';
 
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
index 34cebed5b5d5a..8f2b3effd94ed 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
@@ -7,7 +7,7 @@
 import type { Client } from '@elastic/elasticsearch';
 import expect from '@kbn/expect';
 import { sortBy } from 'lodash';
-import { AssetReference } from '../../../../plugins/fleet/common';
+import { AssetReference } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_update.ts b/x-pack/test/fleet_api_integration/apis/epm/install_update.ts
index 4774d9e2d844d..baffa5bbd2655 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_update.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_update.ts
@@ -6,12 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
-import {
-  PACKAGES_SAVED_OBJECT_TYPE,
-  MAX_TIME_COMPLETE_INSTALL,
-} from '../../../../plugins/fleet/common';
 import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts b/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts
index 42ac48a4bd281..edc1279a5dbcf 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/package_install_complete.ts
@@ -6,10 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  PACKAGES_SAVED_OBJECT_TYPE,
-  MAX_TIME_COMPLETE_INSTALL,
-} from '../../../../plugins/fleet/common';
+import { PACKAGES_SAVED_OBJECT_TYPE, MAX_TIME_COMPLETE_INSTALL } from '@kbn/fleet-plugin/common';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/apis/epm/setup.ts b/x-pack/test/fleet_api_integration/apis/epm/setup.ts
index 8dc12750b8109..6d79a1c0a85c4 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/setup.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { GetInfoResponse, InstalledRegistry } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
-import { GetInfoResponse, InstalledRegistry } from '../../../../plugins/fleet/common';
 import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/template.ts b/x-pack/test/fleet_api_integration/apis/epm/template.ts
index 9cef0d3f28415..30b2baebe959b 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/template.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/template.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { appContextService } from '@kbn/fleet-plugin/server/services';
+import { getTemplate } from '@kbn/fleet-plugin/server/services/epm/elasticsearch/template/template';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { appContextService } from '../../../../plugins/fleet/server/services';
-import { getTemplate } from '../../../../plugins/fleet/server/services/epm/elasticsearch/template/template';
 
 export default function ({ getService }: FtrProviderContext) {
   const templateName = 'bar';
diff --git a/x-pack/test/fleet_api_integration/apis/index.js b/x-pack/test/fleet_api_integration/apis/index.js
index 435d7e4f99d6b..9f68eb1c7f81f 100644
--- a/x-pack/test/fleet_api_integration/apis/index.js
+++ b/x-pack/test/fleet_api_integration/apis/index.js
@@ -9,6 +9,8 @@ import { setupTestUsers } from './test_users';
 
 export default function ({ loadTestFile, getService }) {
   describe('Fleet Endpoints', function () {
+    this.tags('ciGroup29');
+
     before(async () => {
       await setupTestUsers(getService('security'));
     });
@@ -39,16 +41,16 @@ export default function ({ loadTestFile, getService }) {
     loadTestFile(require.resolve('./package_policy/upgrade'));
 
     // Agent policies
-    loadTestFile(require.resolve('./agent_policy/index'));
+    loadTestFile(require.resolve('./agent_policy'));
 
     // Data Streams
-    loadTestFile(require.resolve('./data_streams/index'));
+    loadTestFile(require.resolve('./data_streams'));
 
     // Settings
-    loadTestFile(require.resolve('./settings/index'));
+    loadTestFile(require.resolve('./settings'));
 
     // Preconfiguration
-    loadTestFile(require.resolve('./preconfiguration/index'));
+    loadTestFile(require.resolve('./preconfiguration'));
 
     // Service tokens
     loadTestFile(require.resolve('./service_tokens'));
diff --git a/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts b/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
index 532a10f30d689..b53aafd5e03cd 100644
--- a/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
+++ b/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   FLEET_ELASTIC_AGENT_PACKAGE,
   FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID,
-} from '../../../../plugins/fleet/common/constants/epm';
+} from '@kbn/fleet-plugin/common/constants/epm';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
index 28f143aa94d52..6dcc12cd4711d 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { skipIfNoDockerRegistry } from '../../helpers';
-import { setupFleetAndAgents } from '../agents/services';
-
 import {
   UpgradePackagePolicyDryRunResponse,
   UpgradePackagePolicyResponse,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { setupFleetAndAgents } from '../agents/services';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
diff --git a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
index 012ca79c4a809..ee7679d2cef65 100644
--- a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
+++ b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { PRECONFIGURATION_API_ROUTES } from '../../../../plugins/fleet/common/constants';
+import { PRECONFIGURATION_API_ROUTES } from '@kbn/fleet-plugin/common/constants';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
diff --git a/x-pack/test/fleet_api_integration/apis/settings/update.ts b/x-pack/test/fleet_api_integration/apis/settings/update.ts
index 566eeb156d243..0398d9155a07a 100644
--- a/x-pack/test/fleet_api_integration/apis/settings/update.ts
+++ b/x-pack/test/fleet_api_integration/apis/settings/update.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { AGENT_POLICY_INDEX } from '../../../../plugins/fleet/common';
+import { AGENT_POLICY_INDEX } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
diff --git a/x-pack/test/fleet_functional/page_objects/agents_page.ts b/x-pack/test/fleet_functional/page_objects/agents_page.ts
index 99e9ebfdcc15a..557d554f82673 100644
--- a/x-pack/test/fleet_functional/page_objects/agents_page.ts
+++ b/x-pack/test/fleet_functional/page_objects/agents_page.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-import { PLUGIN_ID } from '../../../plugins/fleet/common';
+import { PLUGIN_ID } from '@kbn/fleet-plugin/common';
 
 // NOTE: import path below should be the deep path to the actual module - else we get CI errors
-import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths';
+import { pagePathGetters } from '@kbn/fleet-plugin/public/constants/page_paths';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function AgentsPage({ getService, getPageObjects }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
diff --git a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
index 71ef909ffa24a..89c58645b64b0 100644
--- a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
+++ b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
index 1b1aa9abc831a..efac6d6739fcb 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   createDashboardEditUrl,
   DashboardConstants,
-} from '../../../../../../src/plugins/dashboard/public/dashboard_constants';
+} from '@kbn/dashboard-plugin/public/dashboard_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
index 2cab9263b5f49..0d177a0f3c65b 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   createDashboardEditUrl,
   DashboardConstants,
-} from '../../../../../../src/plugins/dashboard/public/dashboard_constants';
+} from '@kbn/dashboard-plugin/public/dashboard_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
index 7032f25debb8f..0a12de3fb44d6 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -31,8 +31,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/106631
-  describe.skip('discover feature controls security', () => {
+  describe('discover feature controls security', () => {
     before(async () => {
       await kibanaServer.importExport.load(
         'x-pack/test/functional/fixtures/kbn_archiver/discover/feature_controls/security'
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
index 936dd49255205..9adcfc552031c 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts
@@ -28,14 +28,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/113067
-  describe.skip('spaces', () => {
+  describe('spaces', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/60559
-    describe.skip('space with no features disabled', () => {
+    describe('space with no features disabled', () => {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
@@ -174,13 +172,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await spacesService.delete('custom_space_no_index_patterns');
       });
 
-      it('Navigates to Kibana home rather than index pattern management when no index patterns exist', async () => {
+      it('Navigates to Kibana Analytics overview  when no data views exist', async () => {
         await PageObjects.common.navigateToUrl('discover', '', {
           basePath: '/s/custom_space_no_index_patterns',
           ensureCurrentUrl: false,
           shouldUseHashForSubUrl: false,
         });
-        await testSubjects.existOrFail('homeApp', { timeout: config.get('timeouts.waitFor') });
+        await testSubjects.existOrFail('kbnOverviewAddIntegrations', {
+          timeout: config.get('timeouts.waitFor'),
+        });
       });
     });
   });
diff --git a/x-pack/test/functional/apps/discover/value_suggestions.ts b/x-pack/test/functional/apps/discover/value_suggestions.ts
index 34fbebbba5b55..5afd3d53ca85b 100644
--- a/x-pack/test/functional/apps/discover/value_suggestions.ts
+++ b/x-pack/test/functional/apps/discover/value_suggestions.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
diff --git a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
index 8af2e45b59838..2d5813e81c214 100644
--- a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
+++ b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
@@ -11,7 +11,8 @@ export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
   const security = getService('security');
 
-  describe('auto fit map to bounds', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/129467
+  describe.skip('auto fit map to bounds', () => {
     describe('initial location', () => {
       before(async () => {
         await security.testUser.setRoles(['global_maps_all', 'test_logstash_reader']);
diff --git a/x-pack/test/functional/apps/maps/embeddable/dashboard.js b/x-pack/test/functional/apps/maps/embeddable/dashboard.js
index cab0f9d4df7dd..ca80057850494 100644
--- a/x-pack/test/functional/apps/maps/embeddable/dashboard.js
+++ b/x-pack/test/functional/apps/maps/embeddable/dashboard.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['common', 'dashboard', 'maps']);
diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
index 2f00a5f6d0f91..1beddd72d3fde 100644
--- a/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
+++ b/x-pack/test/functional/apps/maps/feature_controls/maps_spaces.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { APP_ID } from '@kbn/maps-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { APP_ID } from '../../../../../plugins/maps/common/constants';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const spacesService = getService('spaces');
diff --git a/x-pack/test/functional/apps/maps/sample_data.js b/x-pack/test/functional/apps/maps/sample_data.js
index 35733e8d75ffb..cf8bd4c85cf26 100644
--- a/x-pack/test/functional/apps/maps/sample_data.js
+++ b/x-pack/test/functional/apps/maps/sample_data.js
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 
 export default function ({ getPageObjects, getService, updateBaselines }) {
   const PageObjects = getPageObjects(['common', 'maps', 'header', 'home', 'timePicker']);
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts
index e5b2fb30d4e45..c47171c1cd75a 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
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 f7cae920106de..3b36701e651a7 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Annotation } from '../../../../../plugins/ml/common/types/annotations';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
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 a65963a415392..bf6fcd10a9152 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
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
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 f8360804d7e83..555040ef8e59e 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
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '@kbn/ml-plugin/common/constants/categorization_job';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '../../../../../plugins/ml/common/constants/categorization_job';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts b/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts
index 9b27afdcf878a..a83f5d814c028 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { TIME_RANGE_TYPE } from '@kbn/ml-plugin/public/application/jobs/components/custom_url_editor/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { TIME_RANGE_TYPE } from '../../../../../plugins/ml/public/application/jobs/components/custom_url_editor/constants';
 import type {
   DiscoverUrlConfig,
   DashboardUrlConfig,
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts b/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts
index 4f97f9f48dcdb..964e0762d9322 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/forecasts.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
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 0a04201eeef81..c0946713a2564 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
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 const JOB_CONFIG: Job = {
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 84c98ff319869..3a33c95edba42 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
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts
index 41adf8dc8c49b..57d3922b043a3 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/results_view_content.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
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 fe0baae9ed945..f5610e8b607da 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
@@ -7,8 +7,8 @@
 
 import path from 'path';
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
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 a65468e0ca3ec..4334e72e9a16e 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
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { TestData, MetricFieldVisConfig } from './types';
 import {
@@ -14,7 +15,6 @@ import {
   farequoteLuceneSearchTestData,
   sampleLogTestData,
 } from './index_test_data';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
   const headerPage = getPageObject('header');
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
index 69a1edb403369..6ddf3bba3a81f 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 import { MetricFieldVisConfig, NonMetricFieldVisConfig } from './types';
 interface TestData {
   suiteTitle: string;
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
index b4279e9c2c440..f661ca3014ac7 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { TestData } from './types';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
 export const farequoteDataViewTestData: TestData = {
   suiteTitle: 'farequote index pattern',
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/types.ts b/x-pack/test/functional/apps/ml/data_visualizer/types.ts
index a5a016289b461..1ee0a9d8b6d12 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/types.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FieldVisConfig } from '../../../../../plugins/data_visualizer/public/application/common/components/stats_table/types';
+import type { FieldVisConfig } from '@kbn/data-visualizer-plugin/public/application/common/components/stats_table/types';
 
 export interface MetricFieldVisConfig extends FieldVisConfig {
   fieldName: string;
diff --git a/x-pack/test/functional/apps/ml/embeddables/constants.ts b/x-pack/test/functional/apps/ml/embeddables/constants.ts
index f315b7ee44dc8..e68380b6c01b8 100644
--- a/x-pack/test/functional/apps/ml/embeddables/constants.ts
+++ b/x-pack/test/functional/apps/ml/embeddables/constants.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 
 // @ts-expect-error not full interface
 export const JOB_CONFIG: Job = {
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
index c3d0ee718cecd..85e249861378f 100644
--- a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import type { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import type { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
 
 const testADJobs: Array<{ job: Job; datafeed: Datafeed }> = [
   {
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
index c1a434e14e2df..ef367797ef7e9 100644
--- a/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
@@ -7,8 +7,8 @@
 
 import path from 'path';
 
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { JobType } from '../../../../../plugins/ml/common/types/saved_objects';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/reporting_management/report_listing.ts b/x-pack/test/functional/apps/reporting_management/report_listing.ts
index 4e5aaaeba538f..08d585b9aa571 100644
--- a/x-pack/test/functional/apps/reporting_management/report_listing.ts
+++ b/x-pack/test/functional/apps/reporting_management/report_listing.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { REPORT_TABLE_ID } from '../../../../plugins/reporting/common/constants';
+import { REPORT_TABLE_ID } from '@kbn/reporting-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
diff --git a/x-pack/test/functional/apps/security/users.ts b/x-pack/test/functional/apps/security/users.ts
index d7201eae98bdb..67be1e7ddecce 100644
--- a/x-pack/test/functional/apps/security/users.ts
+++ b/x-pack/test/functional/apps/security/users.ts
@@ -7,10 +7,9 @@
 
 import expect from '@kbn/expect';
 import { keyBy } from 'lodash';
+import type { UserFormValues } from '@kbn/security-plugin/public/management/users/edit_user/user_form';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import type { UserFormValues } from '../../../../plugins/security/public/management/users/edit_user/user_form';
-
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['security', 'settings']);
   const config = getService('config');
diff --git a/x-pack/test/functional/apps/transform/cloning.ts b/x-pack/test/functional/apps/transform/cloning.ts
index 3cbb0892bd4ec..fd414ae5d5365 100644
--- a/x-pack/test/functional/apps/transform/cloning.ts
+++ b/x-pack/test/functional/apps/transform/cloning.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   isLatestTransform,
   isPivotTransform,
   TransformPivotConfig,
-} from '../../../../plugins/transform/common/types/transform';
-import { getLatestTransformConfig } from './index';
+} from '@kbn/transform-plugin/common/types/transform';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getLatestTransformConfig } from '.';
 
 interface TestData {
   type: 'pivot' | 'latest';
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 bc680cd2c0ff9..297ae51e42e35 100644
--- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts
+++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
@@ -14,7 +14,7 @@ import {
   isPivotTransformTestData,
   LatestTransformTestData,
   PivotTransformTestData,
-} from './index';
+} from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const canvasElement = getService('canvasElement');
diff --git a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
index 2c7889572ce74..d70e84bd4db71 100644
--- a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
+++ b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -17,7 +17,7 @@ import {
   isPivotTransformTestData,
   LatestTransformTestData,
   PivotTransformTestData,
-} from './index';
+} from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
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 b33027da24341..1e69686d363ab 100644
--- a/x-pack/test/functional/apps/transform/creation_saved_search.ts
+++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
@@ -14,7 +14,7 @@ import {
   isPivotTransformTestData,
   LatestTransformTestData,
   PivotTransformTestData,
-} from './index';
+} from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/deleting.ts b/x-pack/test/functional/apps/transform/deleting.ts
index 47a36bb326243..ba49a5c0ae7f9 100644
--- a/x-pack/test/functional/apps/transform/deleting.ts
+++ b/x-pack/test/functional/apps/transform/deleting.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/editing.ts b/x-pack/test/functional/apps/transform/editing.ts
index 36177fcaa3016..62feab8864e05 100644
--- a/x-pack/test/functional/apps/transform/editing.ts
+++ b/x-pack/test/functional/apps/transform/editing.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 import type {
   TransformLatestConfig,
   TransformPivotConfig,
-} from '../../../../plugins/transform/common/types/transform';
+} from '@kbn/transform-plugin/common/types/transform';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/index.ts b/x-pack/test/functional/apps/transform/index.ts
index 4966e018a4b03..181325e83b36b 100644
--- a/x-pack/test/functional/apps/transform/index.ts
+++ b/x-pack/test/functional/apps/transform/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   TransformLatestConfig,
   TransformPivotConfig,
-} from '../../../../plugins/transform/common/types/transform';
+} from '@kbn/transform-plugin/common/types/transform';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts b/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts
index fe29510e82497..59ad6d0d8dfa4 100644
--- a/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts
+++ b/x-pack/test/functional/apps/transform/permissions/full_transform_access.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPivotTransformConfig } from '../index';
+import { getPivotTransformConfig } from '..';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts b/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts
index de70c411cfe2e..be808d606fdd6 100644
--- a/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts
+++ b/x-pack/test/functional/apps/transform/permissions/read_transform_access.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPivotTransformConfig } from '../index';
+import { getPivotTransformConfig } from '..';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
diff --git a/x-pack/test/functional/apps/transform/resetting.ts b/x-pack/test/functional/apps/transform/resetting.ts
index ea32c401f3551..471f8f7681a20 100644
--- a/x-pack/test/functional/apps/transform/resetting.ts
+++ b/x-pack/test/functional/apps/transform/resetting.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/transform/starting.ts b/x-pack/test/functional/apps/transform/starting.ts
index e83d90a985a0c..c2940a95aaece 100644
--- a/x-pack/test/functional/apps/transform/starting.ts
+++ b/x-pack/test/functional/apps/transform/starting.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
-import { getLatestTransformConfig, getPivotTransformConfig } from './index';
+import { getLatestTransformConfig, getPivotTransformConfig } from '.';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 6ecf87f88b8be..4970ccef7466b 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   settingsObjectId,
   settingsObjectType,
-} from '../../../../plugins/uptime/server/lib/saved_objects/uptime_settings';
+} from '@kbn/uptime-plugin/server/lib/saved_objects/uptime_settings';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index 310a5cc0c9970..5beace54c1b06 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { DynamicSettings } from '@kbn/uptime-plugin/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '@kbn/uptime-plugin/common/constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DynamicSettings } from '../../../../plugins/uptime/common/runtime_types';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../plugins/uptime/common/constants';
 import { makeChecks } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
index 80aff8d27c77d..1c57b71e0689b 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { VisualizeConstants } from '../../../../../../src/plugins/visualizations/common/constants';
+import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json b/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json
deleted file mode 100644
index 9f15ea353570e..0000000000000
--- a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json
+++ /dev/null
@@ -1,3590 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "0bb0c0d5488d757907f6be6e4c27ff698666948e2cf01d53e8fa43958b36c6a8",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:32.045Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.493Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-1",
-              "field": "host.name",
-              "id": "M2yvt38BIyEvspK01XQt",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "P2yvt38BIyEvspK05HSe",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "P2yvt38BIyEvspK05HSe",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-1 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "P2yvt38BIyEvspK05HSe",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:32.045Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:32.045Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "0dd11069ba6c63ec60ac902d6fb0a8a52c4f5ab20f03babe7b861c6d34431bad",
-    "source": {
-      "agent": {
-        "name": "security-linux-3.example.dev",
-        "id": "06851da1-73e7-41e3-97d6-ff1d62c98dc5",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-3",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.196",
-        "name": "security-linux-3",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:31.654Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.495Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-3",
-              "field": "host.name",
-              "id": "NWyvt38BIyEvspK013R3",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "Pmyvt38BIyEvspK043Ri",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "Pmyvt38BIyEvspK043Ri",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-3 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "Pmyvt38BIyEvspK043Ri",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.654Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:31.654Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "999fef09ceb58f30dcbbe2a5fd410f8a22dda6179fa5f1041c7a759a31932ef9",
-    "source": {
-      "agent": {
-        "name": "security-linux-2.example.dev",
-        "id": "87c417dd-08d6-4e24-ad69-285cb8de84e9",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-2",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.195",
-        "name": "security-linux-2",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:31.330Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.496Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-2",
-              "field": "host.name",
-              "id": "NGyvt38BIyEvspK01nQn",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "PWyvt38BIyEvspK04XTd",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "PWyvt38BIyEvspK04XTd",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-2 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "PWyvt38BIyEvspK04XTd",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.330Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:31.330Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "f75bc411e6b0c30c26aa310c1e65ff8430cc0a98ddf74c335941dd7456858e85",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:31.001Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.497Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-1",
-              "field": "host.name",
-              "id": "M2yvt38BIyEvspK01XQt",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "PGyvt38BIyEvspK04HSX",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "PGyvt38BIyEvspK04HSX",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-1 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "PGyvt38BIyEvspK04HSX",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.001Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:31.001Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "b46b35ce011486304a3a1e1b1dc2b772e2b80684a3a8663e9cd101691cff7429",
-    "source": {
-      "agent": {
-        "name": "security-linux-3.example.dev",
-        "id": "06851da1-73e7-41e3-97d6-ff1d62c98dc5",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-3",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.196",
-        "name": "security-linux-3",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:30.665Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.498Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-3",
-              "field": "host.name",
-              "id": "NWyvt38BIyEvspK013R3",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "O2yvt38BIyEvspK033RN",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "O2yvt38BIyEvspK033RN",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-3 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "O2yvt38BIyEvspK033RN",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:30.665Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:30.665Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "570caf7637457b9721fd46ec22166adb57916298bf68ef31df07bd0bbac95d7c",
-    "source": {
-      "agent": {
-        "name": "security-linux-2.example.dev",
-        "id": "87c417dd-08d6-4e24-ad69-285cb8de84e9",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-2",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.195",
-        "name": "security-linux-2",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:30.353Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.499Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-2",
-              "field": "host.name",
-              "id": "NGyvt38BIyEvspK01nQn",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "Omyvt38BIyEvspK03nQB",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "Omyvt38BIyEvspK03nQB",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-2 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "Omyvt38BIyEvspK03nQB",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:30.353Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:30.353Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "0c7bfb7198c9db281b639b1044c74db2b881e3152ee863e6c9304a6fb5d0e5bb",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:30.031Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.501Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-1",
-              "field": "host.name",
-              "id": "M2yvt38BIyEvspK01XQt",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "OWyvt38BIyEvspK03HTF",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "OWyvt38BIyEvspK03HTF",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-1 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "OWyvt38BIyEvspK03HTF",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:30.031Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:30.031Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "ae1c6e5c7680cdc986ff52b1913e93ba2a010ea207364d4782550adf180e49ee",
-    "source": {
-      "agent": {
-        "name": "security-linux-3.example.dev",
-        "id": "06851da1-73e7-41e3-97d6-ff1d62c98dc5",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-3",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.196",
-        "name": "security-linux-3",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:29.715Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.502Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-3",
-              "field": "host.name",
-              "id": "NWyvt38BIyEvspK013R3",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "OGyvt38BIyEvspK023SI",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "OGyvt38BIyEvspK023SI",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-3 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "OGyvt38BIyEvspK023SI",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:29.715Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:29.715Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "a73fda6bdb25425c8597f63e2b87b662798ad46f195c47ac4243d9d0b9705dd8",
-    "source": {
-      "agent": {
-        "name": "security-linux-2.example.dev",
-        "id": "87c417dd-08d6-4e24-ad69-285cb8de84e9",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-2",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.195",
-        "name": "security-linux-2",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:29.387Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.503Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-2",
-              "field": "host.name",
-              "id": "NGyvt38BIyEvspK01nQn",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "N2yvt38BIyEvspK02nRK",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "N2yvt38BIyEvspK02nRK",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-2 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "N2yvt38BIyEvspK02nRK",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:29.387Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:29.387Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "77038fe81327ce7b578e69896fdd1869fab16d13633b5fb0cb7743bae9120ca5",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:28.994Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:51.504Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "threat": {
-        "enrichments": [
-          {
-            "indicator": {},
-            "matched": {
-              "atomic": "security-linux-1",
-              "field": "host.name",
-              "id": "M2yvt38BIyEvspK01XQt",
-              "index": "threat-index-000001",
-              "type": "indicator_match_rule"
-            }
-          }
-        ]
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "Nmyvt38BIyEvspK02HTJ",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "Nmyvt38BIyEvspK02HTJ",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "62f9a8c0-aac9-11ec-aa31-c9ea2cb79db7",
-          "actions": [],
-          "interval": "1m",
-          "name": "threat-match-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:47.264Z",
-          "updated_at": "2022-03-23T16:50:48.396Z",
-          "description": "a simple threat match rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "bef9b0da-8c2f-4b82-930f-37ffa1b57fc1",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threat_match",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threat_query": "*",
-          "threat_mapping": [
-            {
-              "entries": [
-                {
-                  "field": "host.name",
-                  "type": "mapping",
-                  "value": "host.name"
-                }
-              ]
-            }
-          ],
-          "threat_language": "kuery",
-          "threat_index": [
-            "threat-index-*"
-          ],
-          "threat_indicator_path": "threat.indicator"
-        },
-        "reason": "event on security-linux-1 created low alert threat-match-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "Nmyvt38BIyEvspK02HTJ",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:28.994Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:28.994Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "21d26a1ad7b01b28667638d5f8db96f6e94957394efe7a16057948095a445ac4",
-    "source": {
-      "@timestamp": "2022-03-23T16:50:48.441Z",
-      "host.name": "security-linux-1",
-      "event": {
-        "kind": "signal"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "8e75aa13-6b35-5d96-b52b-1d62909a9d75",
-            "type": "event",
-            "index": "events-index-*",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "8e75aa13-6b35-5d96-b52b-1d62909a9d75",
-            "type": "event",
-            "index": "events-index-*",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "60b8b970-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "threshold-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:44.260Z",
-          "updated_at": "2022-03-23T16:50:45.341Z",
-          "description": "a simple threshold rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "b97ae2a4-f188-43b2-b082-69667b563152",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threshold",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threshold": {
-            "field": [
-              "host.name"
-            ],
-            "value": 1
-          }
-        },
-        "reason": "event created low alert threshold-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "8e75aa13-6b35-5d96-b52b-1d62909a9d75",
-          "type": "event",
-          "index": "events-index-*",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:32.045Z",
-        "threshold_result": {
-          "terms": [
-            {
-              "field": "host.name",
-              "value": "security-linux-1"
-            }
-          ],
-          "count": 4,
-          "from": "2022-03-23T06:50:48.395Z"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "4c2a3865ca7df72e4cc17b5114feb2535b2459fd52f6fbd0669d4884f5956dc2",
-    "source": {
-      "@timestamp": "2022-03-23T16:50:48.442Z",
-      "host.name": "security-linux-2",
-      "event": {
-        "kind": "signal"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "9c957c24-8ce5-516b-ba8e-44b582da6579",
-            "type": "event",
-            "index": "events-index-*",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "9c957c24-8ce5-516b-ba8e-44b582da6579",
-            "type": "event",
-            "index": "events-index-*",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "60b8b970-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "threshold-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:44.260Z",
-          "updated_at": "2022-03-23T16:50:45.341Z",
-          "description": "a simple threshold rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "b97ae2a4-f188-43b2-b082-69667b563152",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threshold",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threshold": {
-            "field": [
-              "host.name"
-            ],
-            "value": 1
-          }
-        },
-        "reason": "event created low alert threshold-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "9c957c24-8ce5-516b-ba8e-44b582da6579",
-          "type": "event",
-          "index": "events-index-*",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.330Z",
-        "threshold_result": {
-          "terms": [
-            {
-              "field": "host.name",
-              "value": "security-linux-2"
-            }
-          ],
-          "count": 3,
-          "from": "2022-03-23T06:50:48.395Z"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "3754896311b1d9f9dee45ecf06aa5160f8cd3d4504ef5c856ba285edd61d059d",
-    "source": {
-      "@timestamp": "2022-03-23T16:50:48.442Z",
-      "host.name": "security-linux-3",
-      "event": {
-        "kind": "signal"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "326cc81c-b55f-5b69-8222-e930bcb24692",
-            "type": "event",
-            "index": "events-index-*",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "326cc81c-b55f-5b69-8222-e930bcb24692",
-            "type": "event",
-            "index": "events-index-*",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "60b8b970-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "threshold-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:44.260Z",
-          "updated_at": "2022-03-23T16:50:45.341Z",
-          "description": "a simple threshold rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "b97ae2a4-f188-43b2-b082-69667b563152",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "threshold",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": [],
-          "threshold": {
-            "field": [
-              "host.name"
-            ],
-            "value": 1
-          }
-        },
-        "reason": "event created low alert threshold-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "326cc81c-b55f-5b69-8222-e930bcb24692",
-          "type": "event",
-          "index": "events-index-*",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.654Z",
-        "threshold_result": {
-          "terms": [
-            {
-              "field": "host.name",
-              "value": "security-linux-3"
-            }
-          ],
-          "count": 3,
-          "from": "2022-03-23T06:50:48.395Z"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "5cddda6852c5f8b6c32d4bfa5e876aa51884e0c7a2d4faaababf91ec9cb68de7",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:28.994Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.440Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "Nmyvt38BIyEvspK02HTJ",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "Nmyvt38BIyEvspK02HTJ",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-1 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "Nmyvt38BIyEvspK02HTJ",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:28.994Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:28.994Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "5050902fa762858249c32b1d228dd71ca9217ace612b65f9669fb3a5f371ab63",
-    "source": {
-      "agent": {
-        "name": "security-linux-2.example.dev",
-        "id": "87c417dd-08d6-4e24-ad69-285cb8de84e9",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-2",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.195",
-        "name": "security-linux-2",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:29.387Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.477Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "N2yvt38BIyEvspK02nRK",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "N2yvt38BIyEvspK02nRK",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-2 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "N2yvt38BIyEvspK02nRK",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:29.387Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:29.387Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "525833fe5aa3cabce849adf9291b4d4009c25edbe528d5d2add1dc749c00513b",
-    "source": {
-      "agent": {
-        "name": "security-linux-3.example.dev",
-        "id": "06851da1-73e7-41e3-97d6-ff1d62c98dc5",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-3",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.196",
-        "name": "security-linux-3",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:29.715Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.499Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "OGyvt38BIyEvspK023SI",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "OGyvt38BIyEvspK023SI",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-3 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "OGyvt38BIyEvspK023SI",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:29.715Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:29.715Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "4f9c5a7581544f9dc1fa4c9f541c7e7573d7460ddeeda1875bee081e6615035b",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:30.031Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.510Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "OWyvt38BIyEvspK03HTF",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "OWyvt38BIyEvspK03HTF",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-1 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "OWyvt38BIyEvspK03HTF",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:30.031Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:30.031Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "d791d45b87a37e3b8a8388d7d6237728aa14ab6ec81bfa84f96457bd42b39e4a",
-    "source": {
-      "agent": {
-        "name": "security-linux-2.example.dev",
-        "id": "87c417dd-08d6-4e24-ad69-285cb8de84e9",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-2",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.195",
-        "name": "security-linux-2",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:30.353Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.533Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "Omyvt38BIyEvspK03nQB",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "Omyvt38BIyEvspK03nQB",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-2 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "Omyvt38BIyEvspK03nQB",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:30.353Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:30.353Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "747a4cfd4dbc1dd3924b341b0d3d94098252579354bf140e1621cb4b8681e911",
-    "source": {
-      "agent": {
-        "name": "security-linux-3.example.dev",
-        "id": "06851da1-73e7-41e3-97d6-ff1d62c98dc5",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-3",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.196",
-        "name": "security-linux-3",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:30.665Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.547Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "O2yvt38BIyEvspK033RN",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "O2yvt38BIyEvspK033RN",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-3 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "O2yvt38BIyEvspK033RN",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:30.665Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:30.665Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "5a217bc36610a820dbbb20f7b189065d631038a9dbb33bde1511f0f6a63183d2",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:31.001Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.561Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "PGyvt38BIyEvspK04HSX",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "PGyvt38BIyEvspK04HSX",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-1 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "PGyvt38BIyEvspK04HSX",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.001Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:31.001Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "fde1f09c4420ce5747f04ca051bcdc90762394ea019a7cc2cfee8de3bd575a59",
-    "source": {
-      "agent": {
-        "name": "security-linux-2.example.dev",
-        "id": "87c417dd-08d6-4e24-ad69-285cb8de84e9",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-2",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.195",
-        "name": "security-linux-2",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:31.330Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.593Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "PWyvt38BIyEvspK04XTd",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "PWyvt38BIyEvspK04XTd",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-2 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "PWyvt38BIyEvspK04XTd",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.330Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:31.330Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "337f39b1fb862a4c6910605b16e6b5b59623219e99dcb7d442cd334229ad3a7e",
-    "source": {
-      "agent": {
-        "name": "security-linux-3.example.dev",
-        "id": "06851da1-73e7-41e3-97d6-ff1d62c98dc5",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-3",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.196",
-        "name": "security-linux-3",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:31.654Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.606Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "Pmyvt38BIyEvspK043Ri",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "Pmyvt38BIyEvspK043Ri",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-3 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "Pmyvt38BIyEvspK043Ri",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:31.654Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:31.654Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".siem-signals-default-000001-7.16.0",
-    "id": "44f8d6e34631ced611f6588e7f0cdf52ac5647eff09cfbd36a38ad2a7d4bf32f",
-    "source": {
-      "agent": {
-        "name": "security-linux-1.example.dev",
-        "id": "d8f66724-3cf2-437c-b124-6ac9fb0e2311",
-        "type": "filebeat",
-        "version": "7.16.0"
-      },
-      "log": {
-        "file": {
-          "path": "/opt/Elastic/Agent/data/elastic-agent-a13c93/logs/default/filebeat-20220301-3.ndjson"
-        },
-        "offset": 148938
-      },
-      "cloud": {
-        "availability_zone": "us-central1-c",
-        "instance": {
-          "name": "security-linux-1",
-          "id": "8995531128842994872"
-        },
-        "provider": "gcp",
-        "service": {
-          "name": "GCE"
-        },
-        "machine": {
-          "type": "g1-small"
-        },
-        "project": {
-          "id": "elastic-siem"
-        },
-        "account": {
-          "id": "elastic-siem"
-        }
-      },
-      "ecs": {
-        "version": "7.16.0"
-      },
-      "host": {
-        "hostname": "security-linux-1",
-        "os": {
-          "kernel": "4.19.0-18-cloud-amd64",
-          "codename": "buster",
-          "name": "Debian GNU/Linux",
-          "type": "linux",
-          "family": "debian",
-          "version": "10 (buster)",
-          "platform": "debian"
-        },
-        "containerized": false,
-        "ip": "11.200.0.194",
-        "name": "security-linux-1",
-        "architecture": "x86_64"
-      },
-      "event": {
-        "agent_id_status": "verified",
-        "ingested": "2022-03-23T16:50:32.045Z",
-        "dataset": "elastic_agent.filebeat",
-        "kind": "signal"
-      },
-      "service.name": "filebeat",
-      "message": "Status message.",
-      "@timestamp": "2022-03-23T16:50:40.624Z",
-      "data_stream": {
-        "namespace": "default",
-        "type": "logs",
-        "dataset": "elastic_agent.filebeat"
-      },
-      "signal": {
-        "_meta": {
-          "version": 57
-        },
-        "parents": [
-          {
-            "id": "P2yvt38BIyEvspK05HSe",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "ancestors": [
-          {
-            "id": "P2yvt38BIyEvspK05HSe",
-            "type": "event",
-            "index": "events-index-000001",
-            "depth": 0
-          }
-        ],
-        "status": "open",
-        "rule": {
-          "id": "5b7cd9a0-aac9-11ec-bb53-fd375b7a173a",
-          "actions": [],
-          "interval": "1m",
-          "name": "query-rule",
-          "tags": [],
-          "enabled": true,
-          "created_by": "elastic",
-          "updated_by": "elastic",
-          "throttle": null,
-          "created_at": "2022-03-23T16:50:34.234Z",
-          "updated_at": "2022-03-23T16:50:36.214Z",
-          "description": "a simple query rule",
-          "risk_score": 21,
-          "severity": "low",
-          "license": "",
-          "output_index": ".siem-signals-default-000001",
-          "author": [],
-          "false_positives": [],
-          "from": "now-36000s",
-          "rule_id": "1fcc46ae-7e1e-4002-a4e1-e456029cb7ec",
-          "max_signals": 100,
-          "risk_score_mapping": [],
-          "severity_mapping": [],
-          "threat": [],
-          "to": "now",
-          "references": [],
-          "version": 1,
-          "exceptions_list": [],
-          "immutable": false,
-          "type": "query",
-          "language": "kuery",
-          "index": [
-            "events-index-*"
-          ],
-          "query": "*",
-          "filters": []
-        },
-        "reason": "event on security-linux-1 created low alert query-rule.",
-        "depth": 1,
-        "parent": {
-          "id": "P2yvt38BIyEvspK05HSe",
-          "type": "event",
-          "index": "events-index-000001",
-          "depth": 0
-        },
-        "original_time": "2022-03-23T16:50:32.045Z",
-        "original_event": {
-          "agent_id_status": "verified",
-          "ingested": "2022-03-23T16:50:32.045Z",
-          "dataset": "elastic_agent.filebeat"
-        }
-      }
-    }
-  }
-}
-
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json.gz
new file mode 100644
index 0000000000000..11557b3830248
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json b/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json
deleted file mode 100644
index 3838e29ee5aa4..0000000000000
--- a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json
+++ /dev/null
@@ -1,5819 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".siem-signals-default": {
-        "is_write_index": true
-      }
-    },
-    "index": ".siem-signals-default-000001-7.16.0",
-    "mappings": {
-      "dynamic": "false",
-      "_meta": {
-        "version": 57,
-        "aliases_version": 1
-      },
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        },
-        "agent": {
-          "properties": {
-            "build": {
-              "properties": {
-                "original": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "ephemeral_id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "as": {
-          "properties": {
-            "number": {
-              "type": "long"
-            },
-            "organization": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "client": {
-          "properties": {
-            "address": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "as": {
-              "properties": {
-                "number": {
-                  "type": "long"
-                },
-                "organization": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "postal_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "timezone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "nat": {
-              "properties": {
-                "ip": {
-                  "type": "ip"
-                },
-                "port": {
-                  "type": "long"
-                }
-              }
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "registered_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "subdomain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "top_level_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "user": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "cloud": {
-          "properties": {
-            "account": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "availability_zone": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "instance": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "machine": {
-              "properties": {
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "project": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "provider": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "region": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "service": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "code_signature": {
-          "properties": {
-            "exists": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "subject_name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "trusted": {
-              "type": "boolean"
-            },
-            "valid": {
-              "type": "boolean"
-            }
-          }
-        },
-        "container": {
-          "properties": {
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "image": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "tag": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "labels": {
-              "type": "object"
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "runtime": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "data_stream": {
-          "properties": {
-            "dataset": {
-              "type": "keyword"
-            },
-            "namespace": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "destination": {
-          "properties": {
-            "address": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "as": {
-              "properties": {
-                "number": {
-                  "type": "long"
-                },
-                "organization": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "postal_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "timezone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "nat": {
-              "properties": {
-                "ip": {
-                  "type": "ip"
-                },
-                "port": {
-                  "type": "long"
-                }
-              }
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "registered_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "subdomain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "top_level_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "user": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "dll": {
-          "properties": {
-            "code_signature": {
-              "properties": {
-                "exists": {
-                  "type": "boolean"
-                },
-                "signing_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "status": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subject_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "team_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "trusted": {
-                  "type": "boolean"
-                },
-                "valid": {
-                  "type": "boolean"
-                }
-              }
-            },
-            "hash": {
-              "properties": {
-                "md5": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha1": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha256": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha512": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "ssdeep": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "path": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "pe": {
-              "properties": {
-                "architecture": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "company": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "description": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "file_version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "imphash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "original_file_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "product": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "dns": {
-          "properties": {
-            "answers": {
-              "properties": {
-                "class": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "data": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "ttl": {
-                  "type": "long"
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "header_flags": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "op_code": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "question": {
-              "properties": {
-                "class": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "registered_domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subdomain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "top_level_domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "resolved_ip": {
-              "type": "ip"
-            },
-            "response_code": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "ecs": {
-          "properties": {
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "error": {
-          "properties": {
-            "code": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "message": {
-              "type": "text",
-              "norms": false
-            },
-            "stack_trace": {
-              "type": "keyword",
-              "index": false,
-              "doc_values": false,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "event": {
-          "properties": {
-            "action": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "agent_id_status": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "category": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "code": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "created": {
-              "type": "date"
-            },
-            "dataset": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "duration": {
-              "type": "long"
-            },
-            "end": {
-              "type": "date"
-            },
-            "hash": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "ingested": {
-              "type": "date"
-            },
-            "kind": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "module": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "original": {
-              "type": "keyword",
-              "index": false,
-              "doc_values": false
-            },
-            "outcome": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "provider": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "reason": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "reference": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "risk_score": {
-              "type": "float"
-            },
-            "risk_score_norm": {
-              "type": "float"
-            },
-            "sequence": {
-              "type": "long"
-            },
-            "severity": {
-              "type": "long"
-            },
-            "start": {
-              "type": "date"
-            },
-            "timezone": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "url": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "file": {
-          "properties": {
-            "accessed": {
-              "type": "date"
-            },
-            "attributes": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "code_signature": {
-              "properties": {
-                "exists": {
-                  "type": "boolean"
-                },
-                "signing_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "status": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subject_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "team_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "trusted": {
-                  "type": "boolean"
-                },
-                "valid": {
-                  "type": "boolean"
-                }
-              }
-            },
-            "created": {
-              "type": "date"
-            },
-            "ctime": {
-              "type": "date"
-            },
-            "device": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "directory": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "drive_letter": {
-              "type": "keyword",
-              "ignore_above": 1
-            },
-            "elf": {
-              "properties": {
-                "architecture": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "byte_order": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "cpu_type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "creation_date": {
-                  "type": "date"
-                },
-                "exports": {
-                  "type": "flattened"
-                },
-                "header": {
-                  "properties": {
-                    "abi_version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "class": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "data": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "entrypoint": {
-                      "type": "long"
-                    },
-                    "object_version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "os_abi": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "imports": {
-                  "type": "flattened"
-                },
-                "sections": {
-                  "type": "nested",
-                  "properties": {
-                    "chi2": {
-                      "type": "long"
-                    },
-                    "entropy": {
-                      "type": "long"
-                    },
-                    "flags": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "physical_offset": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "physical_size": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "virtual_address": {
-                      "type": "long"
-                    },
-                    "virtual_size": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "segments": {
-                  "type": "nested",
-                  "properties": {
-                    "sections": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "shared_libraries": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "telfhash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "extension": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "gid": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "group": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "hash": {
-              "properties": {
-                "md5": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha1": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha256": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha512": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "ssdeep": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "inode": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "mime_type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "mode": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "mtime": {
-              "type": "date"
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "owner": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "path": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "pe": {
-              "properties": {
-                "architecture": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "company": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "description": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "file_version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "imphash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "original_file_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "product": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "size": {
-              "type": "long"
-            },
-            "target_path": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "uid": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "x509": {
-              "properties": {
-                "alternative_names": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "issuer": {
-                  "properties": {
-                    "common_name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "country": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "distinguished_name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "locality": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "organization": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "organizational_unit": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "state_or_province": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "not_after": {
-                  "type": "date"
-                },
-                "not_before": {
-                  "type": "date"
-                },
-                "public_key_algorithm": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "public_key_curve": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "public_key_exponent": {
-                  "type": "long",
-                  "index": false,
-                  "doc_values": false
-                },
-                "public_key_size": {
-                  "type": "long"
-                },
-                "serial_number": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "signature_algorithm": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subject": {
-                  "properties": {
-                    "common_name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "country": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "distinguished_name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "locality": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "organization": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "organizational_unit": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "state_or_province": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "version_number": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "geo": {
-          "properties": {
-            "city_name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "continent_name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "country_iso_code": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "country_name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "location": {
-              "type": "geo_point"
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "region_iso_code": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "region_name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "group": {
-          "properties": {
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "hash": {
-          "properties": {
-            "md5": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "sha1": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "sha256": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "sha512": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "host": {
-          "properties": {
-            "architecture": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "cpu": {
-              "properties": {
-                "usage": {
-                  "type": "scaled_float",
-                  "scaling_factor": 1000
-                }
-              }
-            },
-            "disk": {
-              "properties": {
-                "read": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "write": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "postal_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "timezone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "hostname": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "network": {
-              "properties": {
-                "egress": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "packets": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "ingress": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "packets": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "kernel": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "caseless": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "normalizer": "lowercase"
-                    },
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "platform": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "uptime": {
-              "type": "long"
-            },
-            "user": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "http": {
-          "properties": {
-            "request": {
-              "properties": {
-                "body": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "content": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    }
-                  }
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "method": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "mime_type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "referrer": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "response": {
-              "properties": {
-                "body": {
-                  "properties": {
-                    "bytes": {
-                      "type": "long"
-                    },
-                    "content": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    }
-                  }
-                },
-                "bytes": {
-                  "type": "long"
-                },
-                "mime_type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "status_code": {
-                  "type": "long"
-                }
-              }
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "interface": {
-          "properties": {
-            "alias": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "kibana": {
-          "properties": {
-            "alert": {
-              "properties": {
-                "ancestors": {
-                  "properties": {
-                    "depth": {
-                      "type": "alias",
-                      "path": "signal.ancestors.depth"
-                    },
-                    "id": {
-                      "type": "alias",
-                      "path": "signal.ancestors.id"
-                    },
-                    "index": {
-                      "type": "alias",
-                      "path": "signal.ancestors.index"
-                    },
-                    "type": {
-                      "type": "alias",
-                      "path": "signal.ancestors.type"
-                    }
-                  }
-                },
-                "depth": {
-                  "type": "alias",
-                  "path": "signal.depth"
-                },
-                "original_event": {
-                  "properties": {
-                    "action": {
-                      "type": "alias",
-                      "path": "signal.original_event.action"
-                    },
-                    "category": {
-                      "type": "alias",
-                      "path": "signal.original_event.category"
-                    },
-                    "code": {
-                      "type": "alias",
-                      "path": "signal.original_event.code"
-                    },
-                    "created": {
-                      "type": "alias",
-                      "path": "signal.original_event.created"
-                    },
-                    "dataset": {
-                      "type": "alias",
-                      "path": "signal.original_event.dataset"
-                    },
-                    "duration": {
-                      "type": "alias",
-                      "path": "signal.original_event.duration"
-                    },
-                    "end": {
-                      "type": "alias",
-                      "path": "signal.original_event.end"
-                    },
-                    "hash": {
-                      "type": "alias",
-                      "path": "signal.original_event.hash"
-                    },
-                    "id": {
-                      "type": "alias",
-                      "path": "signal.original_event.id"
-                    },
-                    "kind": {
-                      "type": "alias",
-                      "path": "signal.original_event.kind"
-                    },
-                    "module": {
-                      "type": "alias",
-                      "path": "signal.original_event.module"
-                    },
-                    "outcome": {
-                      "type": "alias",
-                      "path": "signal.original_event.outcome"
-                    },
-                    "provider": {
-                      "type": "alias",
-                      "path": "signal.original_event.provider"
-                    },
-                    "reason": {
-                      "type": "alias",
-                      "path": "signal.original_event.reason"
-                    },
-                    "risk_score": {
-                      "type": "alias",
-                      "path": "signal.original_event.risk_score"
-                    },
-                    "risk_score_norm": {
-                      "type": "alias",
-                      "path": "signal.original_event.risk_score_norm"
-                    },
-                    "sequence": {
-                      "type": "alias",
-                      "path": "signal.original_event.sequence"
-                    },
-                    "severity": {
-                      "type": "alias",
-                      "path": "signal.original_event.severity"
-                    },
-                    "start": {
-                      "type": "alias",
-                      "path": "signal.original_event.start"
-                    },
-                    "timezone": {
-                      "type": "alias",
-                      "path": "signal.original_event.timezone"
-                    },
-                    "type": {
-                      "type": "alias",
-                      "path": "signal.original_event.type"
-                    }
-                  }
-                },
-                "original_time": {
-                  "type": "alias",
-                  "path": "signal.original_time"
-                },
-                "reason": {
-                  "type": "alias",
-                  "path": "signal.reason"
-                },
-                "risk_score": {
-                  "type": "alias",
-                  "path": "signal.rule.risk_score"
-                },
-                "rule": {
-                  "properties": {
-                    "author": {
-                      "type": "alias",
-                      "path": "signal.rule.author"
-                    },
-                    "building_block_type": {
-                      "type": "alias",
-                      "path": "signal.rule.building_block_type"
-                    },
-                    "created_at": {
-                      "type": "alias",
-                      "path": "signal.rule.created_at"
-                    },
-                    "created_by": {
-                      "type": "alias",
-                      "path": "signal.rule.created_by"
-                    },
-                    "description": {
-                      "type": "alias",
-                      "path": "signal.rule.description"
-                    },
-                    "enabled": {
-                      "type": "alias",
-                      "path": "signal.rule.enabled"
-                    },
-                    "false_positives": {
-                      "type": "alias",
-                      "path": "signal.rule.false_positives"
-                    },
-                    "from": {
-                      "type": "alias",
-                      "path": "signal.rule.from"
-                    },
-                    "immutable": {
-                      "type": "alias",
-                      "path": "signal.rule.immutable"
-                    },
-                    "index": {
-                      "type": "alias",
-                      "path": "signal.rule.index"
-                    },
-                    "interval": {
-                      "type": "alias",
-                      "path": "signal.rule.interval"
-                    },
-                    "language": {
-                      "type": "alias",
-                      "path": "signal.rule.language"
-                    },
-                    "license": {
-                      "type": "alias",
-                      "path": "signal.rule.license"
-                    },
-                    "max_signals": {
-                      "type": "alias",
-                      "path": "signal.rule.max_signals"
-                    },
-                    "name": {
-                      "type": "alias",
-                      "path": "signal.rule.name"
-                    },
-                    "note": {
-                      "type": "alias",
-                      "path": "signal.rule.note"
-                    },
-                    "query": {
-                      "type": "alias",
-                      "path": "signal.rule.query"
-                    },
-                    "references": {
-                      "type": "alias",
-                      "path": "signal.rule.references"
-                    },
-                    "risk_score_mapping": {
-                      "properties": {
-                        "field": {
-                          "type": "alias",
-                          "path": "signal.rule.risk_score_mapping.field"
-                        },
-                        "operator": {
-                          "type": "alias",
-                          "path": "signal.rule.risk_score_mapping.operator"
-                        },
-                        "value": {
-                          "type": "alias",
-                          "path": "signal.rule.risk_score_mapping.value"
-                        }
-                      }
-                    },
-                    "rule_id": {
-                      "type": "alias",
-                      "path": "signal.rule.rule_id"
-                    },
-                    "rule_name_override": {
-                      "type": "alias",
-                      "path": "signal.rule.rule_name_override"
-                    },
-                    "saved_id": {
-                      "type": "alias",
-                      "path": "signal.rule.saved_id"
-                    },
-                    "severity_mapping": {
-                      "properties": {
-                        "field": {
-                          "type": "alias",
-                          "path": "signal.rule.severity_mapping.field"
-                        },
-                        "operator": {
-                          "type": "alias",
-                          "path": "signal.rule.severity_mapping.operator"
-                        },
-                        "severity": {
-                          "type": "alias",
-                          "path": "signal.rule.severity_mapping.severity"
-                        },
-                        "value": {
-                          "type": "alias",
-                          "path": "signal.rule.severity_mapping.value"
-                        }
-                      }
-                    },
-                    "tags": {
-                      "type": "alias",
-                      "path": "signal.rule.tags"
-                    },
-                    "threat": {
-                      "properties": {
-                        "framework": {
-                          "type": "alias",
-                          "path": "signal.rule.threat.framework"
-                        },
-                        "tactic": {
-                          "properties": {
-                            "id": {
-                              "type": "alias",
-                              "path": "signal.rule.threat.tactic.id"
-                            },
-                            "name": {
-                              "type": "alias",
-                              "path": "signal.rule.threat.tactic.name"
-                            },
-                            "reference": {
-                              "type": "alias",
-                              "path": "signal.rule.threat.tactic.reference"
-                            }
-                          }
-                        },
-                        "technique": {
-                          "properties": {
-                            "id": {
-                              "type": "alias",
-                              "path": "signal.rule.threat.technique.id"
-                            },
-                            "name": {
-                              "type": "alias",
-                              "path": "signal.rule.threat.technique.name"
-                            },
-                            "reference": {
-                              "type": "alias",
-                              "path": "signal.rule.threat.technique.reference"
-                            },
-                            "subtechnique": {
-                              "properties": {
-                                "id": {
-                                  "type": "alias",
-                                  "path": "signal.rule.threat.technique.subtechnique.id"
-                                },
-                                "name": {
-                                  "type": "alias",
-                                  "path": "signal.rule.threat.technique.subtechnique.name"
-                                },
-                                "reference": {
-                                  "type": "alias",
-                                  "path": "signal.rule.threat.technique.subtechnique.reference"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "threat_index": {
-                      "type": "alias",
-                      "path": "signal.rule.threat_index"
-                    },
-                    "threat_indicator_path": {
-                      "type": "alias",
-                      "path": "signal.rule.threat_indicator_path"
-                    },
-                    "threat_language": {
-                      "type": "alias",
-                      "path": "signal.rule.threat_language"
-                    },
-                    "threat_mapping": {
-                      "properties": {
-                        "entries": {
-                          "properties": {
-                            "field": {
-                              "type": "alias",
-                              "path": "signal.rule.threat_mapping.entries.field"
-                            },
-                            "type": {
-                              "type": "alias",
-                              "path": "signal.rule.threat_mapping.entries.type"
-                            },
-                            "value": {
-                              "type": "alias",
-                              "path": "signal.rule.threat_mapping.entries.value"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "threat_query": {
-                      "type": "alias",
-                      "path": "signal.rule.threat_query"
-                    },
-                    "threshold": {
-                      "properties": {
-                        "field": {
-                          "type": "alias",
-                          "path": "signal.rule.threshold.field"
-                        },
-                        "value": {
-                          "type": "alias",
-                          "path": "signal.rule.threshold.value"
-                        }
-                      }
-                    },
-                    "timeline_id": {
-                      "type": "alias",
-                      "path": "signal.rule.timeline_id"
-                    },
-                    "timeline_title": {
-                      "type": "alias",
-                      "path": "signal.rule.timeline_title"
-                    },
-                    "to": {
-                      "type": "alias",
-                      "path": "signal.rule.to"
-                    },
-                    "type": {
-                      "type": "alias",
-                      "path": "signal.rule.type"
-                    },
-                    "updated_at": {
-                      "type": "alias",
-                      "path": "signal.rule.updated_at"
-                    },
-                    "updated_by": {
-                      "type": "alias",
-                      "path": "signal.rule.updated_by"
-                    },
-                    "uuid": {
-                      "type": "alias",
-                      "path": "signal.rule.id"
-                    },
-                    "version": {
-                      "type": "alias",
-                      "path": "signal.rule.version"
-                    }
-                  }
-                },
-                "severity": {
-                  "type": "alias",
-                  "path": "signal.rule.severity"
-                },
-                "threshold_result": {
-                  "properties": {
-                    "cardinality": {
-                      "properties": {
-                        "field": {
-                          "type": "alias",
-                          "path": "signal.threshold_result.cardinality.field"
-                        },
-                        "value": {
-                          "type": "alias",
-                          "path": "signal.threshold_result.cardinality.value"
-                        }
-                      }
-                    },
-                    "count": {
-                      "type": "alias",
-                      "path": "signal.threshold_result.count"
-                    },
-                    "from": {
-                      "type": "alias",
-                      "path": "signal.threshold_result.from"
-                    },
-                    "terms": {
-                      "properties": {
-                        "field": {
-                          "type": "alias",
-                          "path": "signal.threshold_result.terms.field"
-                        },
-                        "value": {
-                          "type": "alias",
-                          "path": "signal.threshold_result.terms.value"
-                        }
-                      }
-                    }
-                  }
-                },
-                "workflow_status": {
-                  "type": "alias",
-                  "path": "signal.status"
-                }
-              }
-            }
-          }
-        },
-        "labels": {
-          "type": "object"
-        },
-        "log": {
-          "properties": {
-            "file": {
-              "properties": {
-                "path": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "level": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "logger": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "origin": {
-              "properties": {
-                "file": {
-                  "properties": {
-                    "line": {
-                      "type": "integer"
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "function": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "original": {
-              "type": "keyword",
-              "index": false,
-              "doc_values": false
-            },
-            "syslog": {
-              "properties": {
-                "facility": {
-                  "properties": {
-                    "code": {
-                      "type": "long"
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "priority": {
-                  "type": "long"
-                },
-                "severity": {
-                  "properties": {
-                    "code": {
-                      "type": "long"
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "message": {
-          "type": "text",
-          "norms": false
-        },
-        "network": {
-          "properties": {
-            "application": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "community_id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "direction": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "forwarded_ip": {
-              "type": "ip"
-            },
-            "iana_number": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "inner": {
-              "properties": {
-                "vlan": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                }
-              }
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "packets": {
-              "type": "long"
-            },
-            "protocol": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "transport": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "vlan": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "observer": {
-          "properties": {
-            "egress": {
-              "properties": {
-                "interface": {
-                  "properties": {
-                    "alias": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "vlan": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "zone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "postal_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "timezone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "hostname": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "ingress": {
-              "properties": {
-                "interface": {
-                  "properties": {
-                    "alias": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "vlan": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "zone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "kernel": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "platform": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "product": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "serial_number": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "vendor": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "orchestrator": {
-          "properties": {
-            "api_version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "cluster": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "url": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "namespace": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "organization": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "resource": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "organization": {
-          "properties": {
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            }
-          }
-        },
-        "os": {
-          "properties": {
-            "family": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "full": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "kernel": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "platform": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "package": {
-          "properties": {
-            "architecture": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "build_version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "checksum": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "description": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "install_scope": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "installed": {
-              "type": "date"
-            },
-            "license": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "path": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "reference": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "size": {
-              "type": "long"
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "pe": {
-          "properties": {
-            "company": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "description": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "file_version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "original_file_name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "product": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "process": {
-          "properties": {
-            "args": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "args_count": {
-              "type": "long"
-            },
-            "code_signature": {
-              "properties": {
-                "exists": {
-                  "type": "boolean"
-                },
-                "signing_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "status": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subject_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "team_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "trusted": {
-                  "type": "boolean"
-                },
-                "valid": {
-                  "type": "boolean"
-                }
-              }
-            },
-            "command_line": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "elf": {
-              "properties": {
-                "architecture": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "byte_order": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "cpu_type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "creation_date": {
-                  "type": "date"
-                },
-                "exports": {
-                  "type": "flattened"
-                },
-                "header": {
-                  "properties": {
-                    "abi_version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "class": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "data": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "entrypoint": {
-                      "type": "long"
-                    },
-                    "object_version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "os_abi": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "imports": {
-                  "type": "flattened"
-                },
-                "sections": {
-                  "type": "nested",
-                  "properties": {
-                    "chi2": {
-                      "type": "long"
-                    },
-                    "entropy": {
-                      "type": "long"
-                    },
-                    "flags": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "physical_offset": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "physical_size": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "virtual_address": {
-                      "type": "long"
-                    },
-                    "virtual_size": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "segments": {
-                  "type": "nested",
-                  "properties": {
-                    "sections": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "shared_libraries": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "telfhash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "entity_id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "executable": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "exit_code": {
-              "type": "long"
-            },
-            "hash": {
-              "properties": {
-                "md5": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha1": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha256": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "sha512": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "ssdeep": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "parent": {
-              "properties": {
-                "args": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "args_count": {
-                  "type": "long"
-                },
-                "code_signature": {
-                  "properties": {
-                    "exists": {
-                      "type": "boolean"
-                    },
-                    "signing_id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "status": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "subject_name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "team_id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "trusted": {
-                      "type": "boolean"
-                    },
-                    "valid": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "command_line": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "elf": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "byte_order": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "cpu_type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "creation_date": {
-                      "type": "date"
-                    },
-                    "exports": {
-                      "type": "flattened"
-                    },
-                    "header": {
-                      "properties": {
-                        "abi_version": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "class": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "data": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "entrypoint": {
-                          "type": "long"
-                        },
-                        "object_version": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "os_abi": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "type": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "version": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "imports": {
-                      "type": "flattened"
-                    },
-                    "sections": {
-                      "type": "nested",
-                      "properties": {
-                        "chi2": {
-                          "type": "long"
-                        },
-                        "entropy": {
-                          "type": "long"
-                        },
-                        "flags": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "physical_offset": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "physical_size": {
-                          "type": "long"
-                        },
-                        "type": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "virtual_address": {
-                          "type": "long"
-                        },
-                        "virtual_size": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "segments": {
-                      "type": "nested",
-                      "properties": {
-                        "sections": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "type": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "shared_libraries": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "telfhash": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "entity_id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "executable": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "exit_code": {
-                  "type": "long"
-                },
-                "hash": {
-                  "properties": {
-                    "md5": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha1": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha256": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha512": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "ssdeep": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "pe": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "company": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "description": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "file_version": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "imphash": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "original_file_name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "product": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "pgid": {
-                  "type": "long"
-                },
-                "pid": {
-                  "type": "long"
-                },
-                "ppid": {
-                  "type": "long"
-                },
-                "start": {
-                  "type": "date"
-                },
-                "thread": {
-                  "properties": {
-                    "id": {
-                      "type": "long"
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "title": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "uptime": {
-                  "type": "long"
-                },
-                "working_directory": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                }
-              }
-            },
-            "pe": {
-              "properties": {
-                "architecture": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "company": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "description": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "file_version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "imphash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "original_file_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "product": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "pgid": {
-              "type": "long"
-            },
-            "pid": {
-              "type": "long"
-            },
-            "ppid": {
-              "type": "long"
-            },
-            "start": {
-              "type": "date"
-            },
-            "thread": {
-              "properties": {
-                "id": {
-                  "type": "long"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "title": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "uptime": {
-              "type": "long"
-            },
-            "working_directory": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            }
-          }
-        },
-        "registry": {
-          "properties": {
-            "data": {
-              "properties": {
-                "bytes": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "strings": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "hive": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "key": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "path": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "value": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "related": {
-          "properties": {
-            "hash": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "hosts": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "user": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "rule": {
-          "properties": {
-            "author": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "category": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "description": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "license": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "reference": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "ruleset": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "uuid": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "address": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "as": {
-              "properties": {
-                "number": {
-                  "type": "long"
-                },
-                "organization": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "postal_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "timezone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "nat": {
-              "properties": {
-                "ip": {
-                  "type": "ip"
-                },
-                "port": {
-                  "type": "long"
-                }
-              }
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "registered_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "subdomain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "top_level_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "user": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "service": {
-          "properties": {
-            "ephemeral_id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "node": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "state": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "type": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "signal": {
-          "properties": {
-            "_meta": {
-              "properties": {
-                "version": {
-                  "type": "long"
-                }
-              }
-            },
-            "ancestors": {
-              "properties": {
-                "depth": {
-                  "type": "long"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "index": {
-                  "type": "keyword"
-                },
-                "rule": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "depth": {
-              "type": "integer"
-            },
-            "group": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "index": {
-                  "type": "integer"
-                }
-              }
-            },
-            "original_event": {
-              "properties": {
-                "action": {
-                  "type": "keyword"
-                },
-                "category": {
-                  "type": "keyword"
-                },
-                "code": {
-                  "type": "keyword"
-                },
-                "created": {
-                  "type": "date"
-                },
-                "dataset": {
-                  "type": "keyword"
-                },
-                "duration": {
-                  "type": "long"
-                },
-                "end": {
-                  "type": "date"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "kind": {
-                  "type": "keyword"
-                },
-                "module": {
-                  "type": "keyword"
-                },
-                "original": {
-                  "type": "keyword",
-                  "index": false,
-                  "doc_values": false
-                },
-                "outcome": {
-                  "type": "keyword"
-                },
-                "provider": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "keyword"
-                },
-                "risk_score": {
-                  "type": "float"
-                },
-                "risk_score_norm": {
-                  "type": "float"
-                },
-                "sequence": {
-                  "type": "long"
-                },
-                "severity": {
-                  "type": "long"
-                },
-                "start": {
-                  "type": "date"
-                },
-                "timezone": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "original_signal": {
-              "type": "object",
-              "dynamic": "false",
-              "enabled": false
-            },
-            "original_time": {
-              "type": "date"
-            },
-            "parent": {
-              "properties": {
-                "depth": {
-                  "type": "long"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "index": {
-                  "type": "keyword"
-                },
-                "rule": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "parents": {
-              "properties": {
-                "depth": {
-                  "type": "long"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "index": {
-                  "type": "keyword"
-                },
-                "rule": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reason": {
-              "type": "keyword"
-            },
-            "rule": {
-              "properties": {
-                "author": {
-                  "type": "keyword"
-                },
-                "building_block_type": {
-                  "type": "keyword"
-                },
-                "created_at": {
-                  "type": "date"
-                },
-                "created_by": {
-                  "type": "keyword"
-                },
-                "description": {
-                  "type": "keyword"
-                },
-                "enabled": {
-                  "type": "keyword"
-                },
-                "false_positives": {
-                  "type": "keyword"
-                },
-                "filters": {
-                  "type": "object"
-                },
-                "from": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "immutable": {
-                  "type": "keyword"
-                },
-                "index": {
-                  "type": "keyword"
-                },
-                "interval": {
-                  "type": "keyword"
-                },
-                "language": {
-                  "type": "keyword"
-                },
-                "license": {
-                  "type": "keyword"
-                },
-                "max_signals": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "note": {
-                  "type": "text"
-                },
-                "output_index": {
-                  "type": "keyword"
-                },
-                "query": {
-                  "type": "keyword"
-                },
-                "references": {
-                  "type": "keyword"
-                },
-                "risk_score": {
-                  "type": "float"
-                },
-                "risk_score_mapping": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "operator": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "rule_id": {
-                  "type": "keyword"
-                },
-                "rule_name_override": {
-                  "type": "keyword"
-                },
-                "saved_id": {
-                  "type": "keyword"
-                },
-                "severity": {
-                  "type": "keyword"
-                },
-                "severity_mapping": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "operator": {
-                      "type": "keyword"
-                    },
-                    "severity": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "size": {
-                  "type": "keyword"
-                },
-                "tags": {
-                  "type": "keyword"
-                },
-                "threat": {
-                  "properties": {
-                    "framework": {
-                      "type": "keyword"
-                    },
-                    "tactic": {
-                      "properties": {
-                        "id": {
-                          "type": "keyword"
-                        },
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "reference": {
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "technique": {
-                      "properties": {
-                        "id": {
-                          "type": "keyword"
-                        },
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "reference": {
-                          "type": "keyword"
-                        },
-                        "subtechnique": {
-                          "properties": {
-                            "id": {
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "type": "keyword"
-                            },
-                            "reference": {
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "threat_filters": {
-                  "type": "object"
-                },
-                "threat_index": {
-                  "type": "keyword"
-                },
-                "threat_indicator_path": {
-                  "type": "keyword"
-                },
-                "threat_language": {
-                  "type": "keyword"
-                },
-                "threat_mapping": {
-                  "properties": {
-                    "entries": {
-                      "properties": {
-                        "field": {
-                          "type": "keyword"
-                        },
-                        "type": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "threat_query": {
-                  "type": "keyword"
-                },
-                "threshold": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "timeline_id": {
-                  "type": "keyword"
-                },
-                "timeline_title": {
-                  "type": "keyword"
-                },
-                "timestamp_override": {
-                  "type": "keyword"
-                },
-                "to": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "updated_at": {
-                  "type": "date"
-                },
-                "updated_by": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "threshold_count": {
-              "type": "float"
-            },
-            "threshold_result": {
-              "properties": {
-                "cardinality": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "count": {
-                  "type": "long"
-                },
-                "from": {
-                  "type": "date"
-                },
-                "terms": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "source": {
-          "properties": {
-            "address": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "as": {
-              "properties": {
-                "number": {
-                  "type": "long"
-                },
-                "organization": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "bytes": {
-              "type": "long"
-            },
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "geo": {
-              "properties": {
-                "city_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "continent_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "country_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "location": {
-                  "type": "geo_point"
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "postal_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_iso_code": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "region_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "timezone": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "ip": {
-              "type": "ip"
-            },
-            "mac": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "nat": {
-              "properties": {
-                "ip": {
-                  "type": "ip"
-                },
-                "port": {
-                  "type": "long"
-                }
-              }
-            },
-            "packets": {
-              "type": "long"
-            },
-            "port": {
-              "type": "long"
-            },
-            "registered_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "subdomain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "top_level_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "user": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "span": {
-          "properties": {
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "tags": {
-          "type": "keyword",
-          "ignore_above": 1024
-        },
-        "threat": {
-          "properties": {
-            "enrichments": {
-              "type": "nested",
-              "properties": {
-                "indicator": {
-                  "properties": {
-                    "as": {
-                      "properties": {
-                        "number": {
-                          "type": "long"
-                        },
-                        "organization": {
-                          "properties": {
-                            "name": {
-                              "type": "keyword",
-                              "ignore_above": 1024,
-                              "fields": {
-                                "text": {
-                                  "type": "text",
-                                  "norms": false
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "confidence": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "description": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "email": {
-                      "properties": {
-                        "address": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "file": {
-                      "properties": {
-                        "accessed": {
-                          "type": "date"
-                        },
-                        "attributes": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "code_signature": {
-                          "properties": {
-                            "exists": {
-                              "type": "boolean"
-                            },
-                            "signing_id": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "status": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "subject_name": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "team_id": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "trusted": {
-                              "type": "boolean"
-                            },
-                            "valid": {
-                              "type": "boolean"
-                            }
-                          }
-                        },
-                        "created": {
-                          "type": "date"
-                        },
-                        "ctime": {
-                          "type": "date"
-                        },
-                        "device": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "directory": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "drive_letter": {
-                          "type": "keyword",
-                          "ignore_above": 1
-                        },
-                        "elf": {
-                          "properties": {
-                            "architecture": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "byte_order": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "cpu_type": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "creation_date": {
-                              "type": "date"
-                            },
-                            "exports": {
-                              "type": "flattened"
-                            },
-                            "header": {
-                              "properties": {
-                                "abi_version": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "class": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "data": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "entrypoint": {
-                                  "type": "long"
-                                },
-                                "object_version": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "os_abi": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "type": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "version": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                }
-                              }
-                            },
-                            "imports": {
-                              "type": "flattened"
-                            },
-                            "sections": {
-                              "type": "nested",
-                              "properties": {
-                                "chi2": {
-                                  "type": "long"
-                                },
-                                "entropy": {
-                                  "type": "long"
-                                },
-                                "flags": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "name": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "physical_offset": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "physical_size": {
-                                  "type": "long"
-                                },
-                                "type": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "virtual_address": {
-                                  "type": "long"
-                                },
-                                "virtual_size": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "segments": {
-                              "type": "nested",
-                              "properties": {
-                                "sections": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                },
-                                "type": {
-                                  "type": "keyword",
-                                  "ignore_above": 1024
-                                }
-                              }
-                            },
-                            "shared_libraries": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "telfhash": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            }
-                          }
-                        },
-                        "extension": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "gid": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "group": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "inode": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "mime_type": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "mode": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "mtime": {
-                          "type": "date"
-                        },
-                        "name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "owner": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "path": {
-                          "type": "keyword",
-                          "ignore_above": 1024,
-                          "fields": {
-                            "text": {
-                              "type": "text",
-                              "norms": false
-                            }
-                          }
-                        },
-                        "size": {
-                          "type": "long"
-                        },
-                        "target_path": {
-                          "type": "keyword",
-                          "ignore_above": 1024,
-                          "fields": {
-                            "text": {
-                              "type": "text",
-                              "norms": false
-                            }
-                          }
-                        },
-                        "type": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "uid": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "first_seen": {
-                      "type": "date"
-                    },
-                    "geo": {
-                      "properties": {
-                        "city_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "continent_code": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "continent_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "country_iso_code": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "country_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "location": {
-                          "type": "geo_point"
-                        },
-                        "name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "postal_code": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "region_iso_code": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "region_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "timezone": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "hash": {
-                      "properties": {
-                        "md5": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "sha1": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "sha256": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "sha512": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "ssdeep": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "ip": {
-                      "type": "ip"
-                    },
-                    "last_seen": {
-                      "type": "date"
-                    },
-                    "marking": {
-                      "properties": {
-                        "tlp": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "modified_at": {
-                      "type": "date"
-                    },
-                    "pe": {
-                      "properties": {
-                        "architecture": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "company": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "description": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "file_version": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "imphash": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "original_file_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "product": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "port": {
-                      "type": "long"
-                    },
-                    "provider": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "reference": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "registry": {
-                      "properties": {
-                        "data": {
-                          "properties": {
-                            "bytes": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "strings": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "type": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            }
-                          }
-                        },
-                        "hive": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "key": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "path": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "value": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "scanner_stats": {
-                      "type": "long"
-                    },
-                    "sightings": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "url": {
-                      "properties": {
-                        "domain": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "extension": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "fragment": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "full": {
-                          "type": "keyword",
-                          "ignore_above": 1024,
-                          "fields": {
-                            "text": {
-                              "type": "text",
-                              "norms": false
-                            }
-                          }
-                        },
-                        "original": {
-                          "type": "keyword",
-                          "ignore_above": 1024,
-                          "fields": {
-                            "text": {
-                              "type": "text",
-                              "norms": false
-                            }
-                          }
-                        },
-                        "password": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "path": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "port": {
-                          "type": "long"
-                        },
-                        "query": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "registered_domain": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "scheme": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "subdomain": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "top_level_domain": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "username": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "x509": {
-                      "properties": {
-                        "alternative_names": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "issuer": {
-                          "properties": {
-                            "common_name": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "country": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "distinguished_name": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "locality": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "organization": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "organizational_unit": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "state_or_province": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            }
-                          }
-                        },
-                        "not_after": {
-                          "type": "date"
-                        },
-                        "not_before": {
-                          "type": "date"
-                        },
-                        "public_key_algorithm": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "public_key_curve": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "public_key_exponent": {
-                          "type": "long",
-                          "index": false,
-                          "doc_values": false
-                        },
-                        "public_key_size": {
-                          "type": "long"
-                        },
-                        "serial_number": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "signature_algorithm": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "subject": {
-                          "properties": {
-                            "common_name": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "country": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "distinguished_name": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "locality": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "organization": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "organizational_unit": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            },
-                            "state_or_province": {
-                              "type": "keyword",
-                              "ignore_above": 1024
-                            }
-                          }
-                        },
-                        "version_number": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    }
-                  }
-                },
-                "matched": {
-                  "properties": {
-                    "atomic": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "field": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "index": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "type": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                }
-              }
-            },
-            "framework": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "group": {
-              "properties": {
-                "alias": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "reference": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "software": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "platforms": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "reference": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "tactic": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "reference": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "technique": {
-              "properties": {
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "reference": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subtechnique": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024,
-                      "fields": {
-                        "text": {
-                          "type": "text",
-                          "norms": false
-                        }
-                      }
-                    },
-                    "reference": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "tls": {
-          "properties": {
-            "cipher": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "client": {
-              "properties": {
-                "certificate": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "certificate_chain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "hash": {
-                  "properties": {
-                    "md5": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha1": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha256": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "issuer": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "ja3": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "not_after": {
-                  "type": "date"
-                },
-                "not_before": {
-                  "type": "date"
-                },
-                "server_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "subject": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "supported_ciphers": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "x509": {
-                  "properties": {
-                    "alternative_names": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "issuer": {
-                      "properties": {
-                        "common_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "country": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "distinguished_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "locality": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organization": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organizational_unit": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "state_or_province": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "not_after": {
-                      "type": "date"
-                    },
-                    "not_before": {
-                      "type": "date"
-                    },
-                    "public_key_algorithm": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "public_key_curve": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "public_key_exponent": {
-                      "type": "long",
-                      "index": false,
-                      "doc_values": false
-                    },
-                    "public_key_size": {
-                      "type": "long"
-                    },
-                    "serial_number": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "signature_algorithm": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "subject": {
-                      "properties": {
-                        "common_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "country": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "distinguished_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "locality": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organization": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organizational_unit": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "state_or_province": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "version_number": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                }
-              }
-            },
-            "curve": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "established": {
-              "type": "boolean"
-            },
-            "next_protocol": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "resumed": {
-              "type": "boolean"
-            },
-            "server": {
-              "properties": {
-                "certificate": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "certificate_chain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "hash": {
-                  "properties": {
-                    "md5": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha1": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "sha256": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "issuer": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "ja3s": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "not_after": {
-                  "type": "date"
-                },
-                "not_before": {
-                  "type": "date"
-                },
-                "subject": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "x509": {
-                  "properties": {
-                    "alternative_names": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "issuer": {
-                      "properties": {
-                        "common_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "country": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "distinguished_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "locality": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organization": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organizational_unit": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "state_or_province": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "not_after": {
-                      "type": "date"
-                    },
-                    "not_before": {
-                      "type": "date"
-                    },
-                    "public_key_algorithm": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "public_key_curve": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "public_key_exponent": {
-                      "type": "long",
-                      "index": false,
-                      "doc_values": false
-                    },
-                    "public_key_size": {
-                      "type": "long"
-                    },
-                    "serial_number": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "signature_algorithm": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "subject": {
-                      "properties": {
-                        "common_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "country": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "distinguished_name": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "locality": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organization": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "organizational_unit": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        },
-                        "state_or_province": {
-                          "type": "keyword",
-                          "ignore_above": 1024
-                        }
-                      }
-                    },
-                    "version_number": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                }
-              }
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "version_protocol": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "trace": {
-          "properties": {
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "transaction": {
-          "properties": {
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "url": {
-          "properties": {
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "extension": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "fragment": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "full": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "original": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "password": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "path": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "port": {
-              "type": "long"
-            },
-            "query": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "registered_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "scheme": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "subdomain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "top_level_domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "username": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "user": {
-          "properties": {
-            "changes": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "domain": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "effective": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "email": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "full_name": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "group": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "hash": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "roles": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "target": {
-              "properties": {
-                "domain": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "email": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full_name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "group": {
-                  "properties": {
-                    "domain": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "id": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    },
-                    "name": {
-                      "type": "keyword",
-                      "ignore_above": 1024
-                    }
-                  }
-                },
-                "hash": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "id": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "roles": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            }
-          }
-        },
-        "user_agent": {
-          "properties": {
-            "device": {
-              "properties": {
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "original": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "os": {
-              "properties": {
-                "family": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "full": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "kernel": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "name": {
-                  "type": "keyword",
-                  "ignore_above": 1024,
-                  "fields": {
-                    "text": {
-                      "type": "text",
-                      "norms": false
-                    }
-                  }
-                },
-                "platform": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "type": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                },
-                "version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "version": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "vlan": {
-          "properties": {
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "name": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        },
-        "vulnerability": {
-          "properties": {
-            "category": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "classification": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "description": {
-              "type": "keyword",
-              "ignore_above": 1024,
-              "fields": {
-                "text": {
-                  "type": "text",
-                  "norms": false
-                }
-              }
-            },
-            "enumeration": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "reference": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "report_id": {
-              "type": "keyword",
-              "ignore_above": 1024
-            },
-            "scanner": {
-              "properties": {
-                "vendor": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "score": {
-              "properties": {
-                "base": {
-                  "type": "float"
-                },
-                "environmental": {
-                  "type": "float"
-                },
-                "temporal": {
-                  "type": "float"
-                },
-                "version": {
-                  "type": "keyword",
-                  "ignore_above": 1024
-                }
-              }
-            },
-            "severity": {
-              "type": "keyword",
-              "ignore_above": 1024
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "lifecycle": {
-          "name": ".siem-signals-default",
-          "rollover_alias": ".siem-signals-default"
-        },
-        "routing": {
-          "allocation": {
-            "include": {
-              "_tier_preference": "data_content"
-            }
-          }
-        },
-        "mapping": {
-          "total_fields": {
-            "limit": "10000"
-          }
-        },
-        "number_of_shards": "1",
-        "number_of_replicas": "1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json.gz
new file mode 100644
index 0000000000000..014968698c55a
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/7.16.0/mappings.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/data.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/data.json.gz
new file mode 100644
index 0000000000000..e63a4ccc0ab4f
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/mappings.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/mappings.json.gz
new file mode 100644
index 0000000000000..fb737e83c010d
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/7.17.0/mappings.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/data.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/data.json.gz
new file mode 100644
index 0000000000000..26952621f10e4
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/mappings.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/mappings.json.gz
new file mode 100644
index 0000000000000..3a26e140e7eaa
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/8.0.0/mappings.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/data.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/data.json.gz
new file mode 100644
index 0000000000000..1bd5cf631c289
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/mappings.json.gz b/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/mappings.json.gz
new file mode 100644
index 0000000000000..05640f1e93e34
Binary files /dev/null and b/x-pack/test/functional/es_archives/security_solution/alerts/8.1.0/mappings.json.gz differ
diff --git a/x-pack/test/functional/page_objects/gis_page.ts b/x-pack/test/functional/page_objects/gis_page.ts
index 909a96706575b..1ef767ea0a358 100644
--- a/x-pack/test/functional/page_objects/gis_page.ts
+++ b/x-pack/test/functional/page_objects/gis_page.ts
@@ -6,7 +6,7 @@
  */
 
 import _ from 'lodash';
-import { APP_ID } from '../../../plugins/maps/common/constants';
+import { APP_ID } from '@kbn/maps-plugin/common/constants';
 import { FtrService } from '../ftr_provider_context';
 
 function escapeLayerName(layerName: string) {
diff --git a/x-pack/test/functional/page_objects/graph_page.ts b/x-pack/test/functional/page_objects/graph_page.ts
index 95f1bf486d5d1..1203d4077b5b8 100644
--- a/x-pack/test/functional/page_objects/graph_page.ts
+++ b/x-pack/test/functional/page_objects/graph_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrService } from '../ftr_provider_context';
 
 interface Node {
diff --git a/x-pack/test/functional/page_objects/infra_logs_page.ts b/x-pack/test/functional/page_objects/infra_logs_page.ts
index 57252af224b2f..fe43dd1767d94 100644
--- a/x-pack/test/functional/page_objects/infra_logs_page.ts
+++ b/x-pack/test/functional/page_objects/infra_logs_page.ts
@@ -9,9 +9,9 @@
 // import moment from 'moment';
 import querystring from 'querystring';
 import { encode, RisonValue } from 'rison-node';
+import { LogPositionUrlState } from '@kbn/infra-plugin/public/containers/logs/log_position/with_log_position_url_state';
+import { FlyoutOptionsUrlState } from '@kbn/infra-plugin/public/containers/logs/log_flyout';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { LogPositionUrlState } from '../../../../x-pack/plugins/infra/public/containers/logs/log_position/with_log_position_url_state';
-import { FlyoutOptionsUrlState } from '../../../../x-pack/plugins/infra/public/containers/logs/log_flyout';
 
 export interface TabsParams {
   stream: {
diff --git a/x-pack/test/functional/page_objects/infra_metrics_explorer.ts b/x-pack/test/functional/page_objects/infra_metrics_explorer.ts
index 5334125687dfe..b46563cc2d3b5 100644
--- a/x-pack/test/functional/page_objects/infra_metrics_explorer.ts
+++ b/x-pack/test/functional/page_objects/infra_metrics_explorer.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function InfraMetricsExplorerProvider({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/page_objects/ingest_pipelines_page.ts b/x-pack/test/functional/page_objects/ingest_pipelines_page.ts
index 0de17f9d943ac..ebee2fbe6d86d 100644
--- a/x-pack/test/functional/page_objects/ingest_pipelines_page.ts
+++ b/x-pack/test/functional/page_objects/ingest_pipelines_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function IngestPipelinesPageProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/functional/page_objects/reporting_page.ts b/x-pack/test/functional/page_objects/reporting_page.ts
index 234e19bf90af0..187149406aae8 100644
--- a/x-pack/test/functional/page_objects/reporting_page.ts
+++ b/x-pack/test/functional/page_objects/reporting_page.ts
@@ -11,7 +11,7 @@ import path from 'path';
 import type SuperTest from 'supertest';
 import { format as formatUrl } from 'url';
 import { promisify } from 'util';
-import { REPORT_TABLE_ID, REPORT_TABLE_ROW_ID } from '../../../plugins/reporting/common/constants';
+import { REPORT_TABLE_ID, REPORT_TABLE_ROW_ID } from '@kbn/reporting-plugin/common/constants';
 import { FtrService } from '../ftr_provider_context';
 
 const writeFileAsync = promisify(fs.writeFile);
diff --git a/x-pack/test/functional/page_objects/search_sessions_management_page.ts b/x-pack/test/functional/page_objects/search_sessions_management_page.ts
index 29faf3cee3b51..269299dd7918a 100644
--- a/x-pack/test/functional/page_objects/search_sessions_management_page.ts
+++ b/x-pack/test/functional/page_objects/search_sessions_management_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SEARCH_SESSIONS_TABLE_ID } from '../../../../src/plugins/data/common';
+import { SEARCH_SESSIONS_TABLE_ID } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function SearchSessionsPageProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index fbdb918b217f2..8731a3a3f5459 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -6,9 +6,9 @@
  */
 
 import { adminTestUser } from '@kbn/test';
+import { AuthenticatedUser, Role } from '@kbn/security-plugin/common/model';
+import type { UserFormValues } from '@kbn/security-plugin/public/management/users/edit_user/user_form';
 import { FtrService } from '../ftr_provider_context';
-import { AuthenticatedUser, Role } from '../../../plugins/security/common/model';
-import type { UserFormValues } from '../../../plugins/security/public/management/users/edit_user/user_form';
 
 interface LoginOptions {
   expectSpaceSelector?: boolean;
diff --git a/x-pack/test/functional/services/cases/api.ts b/x-pack/test/functional/services/cases/api.ts
index e863504c2add3..b58153084aec4 100644
--- a/x-pack/test/functional/services/cases/api.ts
+++ b/x-pack/test/functional/services/cases/api.ts
@@ -6,7 +6,7 @@
  */
 
 import pMap from 'p-map';
-import { CasePostRequest } from '../../../../plugins/cases/common/api';
+import { CasePostRequest } from '@kbn/cases-plugin/common/api';
 import {
   createCase as createCaseAPI,
   deleteAllCaseItems,
diff --git a/x-pack/test/functional/services/cases/common.ts b/x-pack/test/functional/services/cases/common.ts
index bf5b8e6e8b0be..7722c32f79837 100644
--- a/x-pack/test/functional/services/cases/common.ts
+++ b/x-pack/test/functional/services/cases/common.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CaseStatuses } from '../../../../plugins/cases/common';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function CasesCommonServiceProvider({ getService, getPageObject }: FtrProviderContext) {
diff --git a/x-pack/test/functional/services/cases/list.ts b/x-pack/test/functional/services/cases/list.ts
index 29fc34d3f0dd5..651f52434e55f 100644
--- a/x-pack/test/functional/services/cases/list.ts
+++ b/x-pack/test/functional/services/cases/list.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
-import { CaseStatuses } from '../../../../plugins/cases/common';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function CasesTableServiceProvider({ getService, getPageObject }: FtrProviderContext) {
diff --git a/x-pack/test/functional/services/ml/alerting.ts b/x-pack/test/functional/services/ml/alerting.ts
index 0acda99622443..7007f0d00f284 100644
--- a/x-pack/test/functional/services/ml/alerting.ts
+++ b/x-pack/test/functional/services/ml/alerting.ts
@@ -6,12 +6,12 @@
  */
 
 import expect from '@kbn/expect';
+import { ML_ALERT_TYPES } from '@kbn/ml-plugin/common/constants/alerts';
+import { Rule } from '@kbn/alerting-plugin/common';
+import { MlAnomalyDetectionAlertParams } from '@kbn/ml-plugin/common/types/alerts';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 import { MlCommonUI } from './common_ui';
-import { ML_ALERT_TYPES } from '../../../../plugins/ml/common/constants/alerts';
-import { Rule } from '../../../../plugins/alerting/common';
-import { MlAnomalyDetectionAlertParams } from '../../../../plugins/ml/common/types/alerts';
 
 export function MachineLearningAlertingProvider(
   { getService }: FtrProviderContext,
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
index 36e01737adff3..48a8edb5d1b76 100644
--- a/x-pack/test/functional/services/ml/api.ts
+++ b/x-pack/test/functional/services/ml/api.ts
@@ -10,21 +10,21 @@ import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 import fs from 'fs';
 import path from 'path';
-import { Calendar } from '../../../../plugins/ml/server/models/calendar/index';
-import { Annotation } from '../../../../plugins/ml/common/types/annotations';
-import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { DATAFEED_STATE, JOB_STATE } from '../../../../plugins/ml/common/constants/states';
-import { DataFrameTaskStateType } from '../../../../plugins/ml/common/types/data_frame_analytics';
-import { DATA_FRAME_TASK_STATE } from '../../../../plugins/ml/common/constants/data_frame_analytics';
-import { Datafeed, Job } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { JobType } from '../../../../plugins/ml/common/types/saved_objects';
+import { Calendar } from '@kbn/ml-plugin/server/models/calendar';
+import { Annotation } from '@kbn/ml-plugin/common/types/annotations';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DATAFEED_STATE, JOB_STATE } from '@kbn/ml-plugin/common/constants/states';
+import { DataFrameTaskStateType } from '@kbn/ml-plugin/common/types/data_frame_analytics';
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
+import { Datafeed, Job } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import {
   ML_ANNOTATIONS_INDEX_ALIAS_READ,
   ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
-} from '../../../../plugins/ml/common/constants/index_patterns';
-import { COMMON_REQUEST_HEADERS } from '../../../functional/services/ml/common_api';
-import { PutTrainedModelConfig } from '../../../../plugins/ml/common/types/trained_models';
+} from '@kbn/ml-plugin/common/constants/index_patterns';
+import { PutTrainedModelConfig } from '@kbn/ml-plugin/common/types/trained_models';
+import { COMMON_REQUEST_HEADERS } from './common_api';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export type MlApi = ProvidedType<typeof MachineLearningAPIProvider>;
 
diff --git a/x-pack/test/functional/services/ml/common_config.ts b/x-pack/test/functional/services/ml/common_config.ts
index af3d393a16754..246dd0899b013 100644
--- a/x-pack/test/functional/services/ml/common_config.ts
+++ b/x-pack/test/functional/services/ml/common_config.ts
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import { DeepPartial } from '../../../../plugins/ml/common/types/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import { Job, Datafeed } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
-
 // @ts-expect-error not full interface
 const FQ_SM_JOB_CONFIG: Job = {
   job_id: ``,
diff --git a/x-pack/test/functional/services/ml/common_ui.ts b/x-pack/test/functional/services/ml/common_ui.ts
index 6432b1675dc9d..d4ad5d863eac1 100644
--- a/x-pack/test/functional/services/ml/common_ui.ts
+++ b/x-pack/test/functional/services/ml/common_ui.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import type { CanvasElementColorStats } from '../canvas_element';
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics.ts b/x-pack/test/functional/services/ml/data_frame_analytics.ts
index 6231e71b766fa..e1e1433dbd79a 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics.ts
@@ -7,11 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { DATA_FRAME_TASK_STATE } from '@kbn/ml-plugin/common/constants/data_frame_analytics';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 
-import { DATA_FRAME_TASK_STATE } from '../../../../plugins/ml/common/constants/data_frame_analytics';
-
 export function MachineLearningDataFrameAnalyticsProvider(
   { getService }: FtrProviderContext,
   mlApi: MlApi
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 89f5ff5ef17a7..88ef0fdf08c8d 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
@@ -6,16 +6,16 @@
  */
 
 import expect from '@kbn/expect';
-import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 
+import {
+  isRegressionAnalysis,
+  isClassificationAnalysis,
+} from '@kbn/ml-plugin/common/util/analytics_utils';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import type { CanvasElementColorStats } from '../canvas_element';
 import type { MlCommonUI } from './common_ui';
 import { MlApi } from './api';
-import {
-  isRegressionAnalysis,
-  isClassificationAnalysis,
-} from '../../../../plugins/ml/common/util/analytics_utils';
 
 export function MachineLearningDataFrameAnalyticsCreationProvider(
   { getPageObject, getService }: FtrProviderContext,
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
index 1c64a514de5be..f6e10fa02bce5 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import type { CanvasElementColorStats } from '../canvas_element';
 import type { MlCommonUI } from './common_ui';
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
index 58f3d618c76e3..e2d3977fabea0 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 type ExpectedSectionTableEntries = Record<string, string>;
diff --git a/x-pack/test/functional/services/ml/data_visualizer_table.ts b/x-pack/test/functional/services/ml/data_visualizer_table.ts
index e5c0dafbd00f7..04d9bf98c7b04 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_table.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { ML_JOB_FIELD_TYPES } from '../../../../plugins/ml/common/constants/field_types';
 import { MlCommonUI } from './common_ui';
 export type MlDataVisualizerTable = ProvidedType<typeof MachineLearningDataVisualizerTableProvider>;
 
diff --git a/x-pack/test/functional/services/ml/job_management.ts b/x-pack/test/functional/services/ml/job_management.ts
index b993cc04ceb2c..c07cc91921fd7 100644
--- a/x-pack/test/functional/services/ml/job_management.ts
+++ b/x-pack/test/functional/services/ml/job_management.ts
@@ -7,11 +7,10 @@
 
 import expect from '@kbn/expect';
 
+import { JOB_STATE, DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 
-import { JOB_STATE, DATAFEED_STATE } from '../../../../plugins/ml/common/constants/states';
-
 export function MachineLearningJobManagementProvider(
   { getService }: FtrProviderContext,
   mlApi: MlApi
diff --git a/x-pack/test/functional/services/ml/job_table.ts b/x-pack/test/functional/services/ml/job_table.ts
index 1ba825203518d..28f937b7e597a 100644
--- a/x-pack/test/functional/services/ml/job_table.ts
+++ b/x-pack/test/functional/services/ml/job_table.ts
@@ -8,15 +8,14 @@
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlCommonUI } from './common_ui';
-import { MlCustomUrls } from './custom_urls';
-
 import {
   TimeRangeType,
   TIME_RANGE_TYPE,
   URL_TYPE,
-} from '../../../../plugins/ml/public/application/jobs/components/custom_url_editor/constants';
+} from '@kbn/ml-plugin/public/application/jobs/components/custom_url_editor/constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { MlCommonUI } from './common_ui';
+import { MlCustomUrls } from './custom_urls';
 
 export type MlADJobTable = ProvidedType<typeof MachineLearningJobTableProvider>;
 
diff --git a/x-pack/test/functional/services/ml/job_wizard_categorization.ts b/x-pack/test/functional/services/ml/job_wizard_categorization.ts
index 95eee8c8edf9f..508a2ff4297af 100644
--- a/x-pack/test/functional/services/ml/job_wizard_categorization.ts
+++ b/x-pack/test/functional/services/ml/job_wizard_categorization.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '@kbn/ml-plugin/common/constants/categorization_job';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '../../../../plugins/ml/common/constants/categorization_job';
 
 export function MachineLearningJobWizardCategorizationProvider({ getService }: FtrProviderContext) {
   const comboBox = getService('comboBox');
diff --git a/x-pack/test/functional/services/ml/stack_management_jobs.ts b/x-pack/test/functional/services/ml/stack_management_jobs.ts
index 63833c1339564..10f55efce8155 100644
--- a/x-pack/test/functional/services/ml/stack_management_jobs.ts
+++ b/x-pack/test/functional/services/ml/stack_management_jobs.ts
@@ -10,12 +10,12 @@ import { REPO_ROOT } from '@kbn/utils';
 import fs from 'fs';
 import path from 'path';
 
+import type { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
+import type { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import type { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
 import type { FtrProviderContext } from '../../ftr_provider_context';
 import type { MlADJobTable } from './job_table';
 import type { MlDFAJobTable } from './data_frame_analytics_table';
-import type { JobType } from '../../../../plugins/ml/common/types/saved_objects';
-import type { Job, Datafeed } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import type { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
 
 type SyncFlyoutObjectType =
   | 'MissingObjects'
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index b6675543a04a2..3115eca61b443 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -7,11 +7,11 @@
 
 import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
+import { JobType } from '@kbn/ml-plugin/common/types/saved_objects';
 import { savedSearches, dashboards } from './test_resources_data';
 import { COMMON_REQUEST_HEADERS } from './common_api';
 import { MlApi } from './api';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { JobType } from '../../../../plugins/ml/common/types/saved_objects';
 
 export enum SavedObjectType {
   CONFIG = 'config',
diff --git a/x-pack/test/functional/services/ml/trained_models_table.ts b/x-pack/test/functional/services/ml/trained_models_table.ts
index 3eed354aca4c1..4028e44b11418 100644
--- a/x-pack/test/functional/services/ml/trained_models_table.ts
+++ b/x-pack/test/functional/services/ml/trained_models_table.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import { ProvidedType } from '@kbn/test';
 import { upperFirst } from 'lodash';
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 import type { FtrProviderContext } from '../../ftr_provider_context';
 import type { MlCommonUI } from './common_ui';
 
diff --git a/x-pack/test/functional/services/observability/users.ts b/x-pack/test/functional/services/observability/users.ts
index ac2fc8ddd324e..4e33afe270223 100644
--- a/x-pack/test/functional/services/observability/users.ts
+++ b/x-pack/test/functional/services/observability/users.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Role } from '../../../../plugins/security/common/model';
+import { Role } from '@kbn/security-plugin/common/model';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 type CreateRolePayload = Pick<Role, 'metadata' | 'elasticsearch' | 'kibana'>;
diff --git a/x-pack/test/functional/services/search_sessions.ts b/x-pack/test/functional/services/search_sessions.ts
index 4490b87006833..a3d04af530d54 100644
--- a/x-pack/test/functional/services/search_sessions.ts
+++ b/x-pack/test/functional/services/search_sessions.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { SavedObjectsFindResponse } from 'src/core/server';
+import { SavedObjectsFindResponse } from '@kbn/core/server';
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrService } from '../ftr_provider_context';
 
diff --git a/x-pack/test/functional/services/transform/api.ts b/x-pack/test/functional/services/transform/api.ts
index 748694ce4e804..30a3da31a5dbe 100644
--- a/x-pack/test/functional/services/transform/api.ts
+++ b/x-pack/test/functional/services/transform/api.ts
@@ -7,14 +7,14 @@
 
 import expect from '@kbn/expect';
 
-import type { PutTransformsRequestSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { TransformState, TRANSFORM_STATE } from '../../../../plugins/transform/common/constants';
-import type { TransformStats } from '../../../../plugins/transform/common/types/transform_stats';
+import type { PutTransformsRequestSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { TransformState, TRANSFORM_STATE } from '@kbn/transform-plugin/common/constants';
+import type { TransformStats } from '@kbn/transform-plugin/common/types/transform_stats';
 
+import { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { PostTransformsUpdateRequestSchema } from '@kbn/transform-plugin/common/api_schemas/update_transforms';
+import { TransformPivotConfig } from '@kbn/transform-plugin/common/types/transform';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { GetTransformsResponseSchema } from '../../../../plugins/transform/common/api_schemas/transforms';
-import { PostTransformsUpdateRequestSchema } from '../../../../plugins/transform/common/api_schemas/update_transforms';
-import { TransformPivotConfig } from '../../../../plugins/transform/common/types/transform';
 
 export async function asyncForEach(array: any[], callback: Function) {
   for (let index = 0; index < array.length; index++) {
diff --git a/x-pack/test/functional/services/uptime/settings.ts b/x-pack/test/functional/services/uptime/settings.ts
index 944bb02ebec80..e6493efd9b264 100644
--- a/x-pack/test/functional/services/uptime/settings.ts
+++ b/x-pack/test/functional/services/uptime/settings.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { DynamicSettings } from '@kbn/uptime-plugin/common/runtime_types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DynamicSettings } from '../../../../plugins/uptime/common/runtime_types';
 
 export function UptimeSettingsProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts
index 8815e46323585..6412a3892660d 100644
--- a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts
+++ b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+import type { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import { CorsTestPlugin } from './plugin';
 import { configSchema, ConfigSchema } from './config';
 
diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts
index 9ba373c02fafa..c15845b3ed00a 100644
--- a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts
+++ b/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts
@@ -10,7 +10,7 @@ import { kbnTestConfig } from '@kbn/test';
 import Url from 'url';
 import abab from 'abab';
 
-import type { Plugin, CoreSetup, CoreStart, PluginInitializerContext } from 'src/core/server';
+import type { Plugin, CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/server';
 import type { ConfigSchema } from './config';
 
 const apiToken = abab.btoa(kbnTestConfig.getUrlParts().auth!);
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
index 1d032ed6576e7..19c53e78c4876 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { IframeEmbeddedPlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
index 4ec484f9485a6..02400226bf062 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import Url from 'url';
-import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { Plugin, CoreSetup, PluginInitializerContext } from '@kbn/core/server';
 
 function renderBody(iframeUrl: string) {
   return `
diff --git a/x-pack/test/functional_execution_context/config.ts b/x-pack/test/functional_execution_context/config.ts
index 336a15026b3a3..6169df6adcef3 100644
--- a/x-pack/test/functional_execution_context/config.ts
+++ b/x-pack/test/functional_execution_context/config.ts
@@ -12,7 +12,7 @@ import { logFilePath } from './test_utils';
 const alertTestPlugin = Path.resolve(__dirname, './fixtures/plugins/alerts');
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const functionalConfig = await readConfigFile(require.resolve('../../test/functional/config'));
+  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
 
   const servers = {
     ...functionalConfig.get('servers'),
@@ -25,7 +25,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...functionalConfig.getAll(),
     rootTags: ['skipCloud'],
-    testFiles: [require.resolve('./tests/')],
+    testFiles: [require.resolve('./tests')],
     junit: {
       reportName: 'Execution Context Functional Tests',
     },
diff --git a/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts b/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts
index 20e0adbf5dacd..82e6253ab6d10 100644
--- a/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/functional_execution_context/fixtures/plugins/alerts/server/plugin.ts
@@ -6,12 +6,12 @@
  */
 import apmAgent from 'elastic-apm-node';
 
-import type { Plugin, CoreSetup } from 'kibana/server';
-import { PluginSetupContract as AlertingPluginSetup } from '../../../../../../plugins/alerting/server/plugin';
-import { EncryptedSavedObjectsPluginStart } from '../../../../../../plugins/encrypted_saved_objects/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../plugins/features/server';
-import { SpacesPluginStart } from '../../../../../../plugins/spaces/server';
-import { SecurityPluginStart } from '../../../../../../plugins/security/server';
+import type { Plugin, CoreSetup } from '@kbn/core/server';
+import { PluginSetupContract as AlertingPluginSetup } from '@kbn/alerting-plugin/server/plugin';
+import { EncryptedSavedObjectsPluginStart } from '@kbn/encrypted-saved-objects-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SecurityPluginStart } from '@kbn/security-plugin/server';
 
 export interface FixtureSetupDeps {
   features: FeaturesPluginSetup;
diff --git a/x-pack/test/functional_execution_context/ftr_provider_context.ts b/x-pack/test/functional_execution_context/ftr_provider_context.ts
index c5aadf858692a..d6c0afa5ceffd 100644
--- a/x-pack/test/functional_execution_context/ftr_provider_context.ts
+++ b/x-pack/test/functional_execution_context/ftr_provider_context.ts
@@ -6,7 +6,7 @@
  */
 
 import { GenericFtrProviderContext } from '@kbn/test';
-import { pageObjects } from '../../test/functional/page_objects';
+import { pageObjects } from '../functional/page_objects';
 import { services } from './services';
 
 export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/x-pack/test/functional_execution_context/services.ts b/x-pack/test/functional_execution_context/services.ts
index e0aaa899deabf..9508ce5eba16d 100644
--- a/x-pack/test/functional_execution_context/services.ts
+++ b/x-pack/test/functional_execution_context/services.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import { services as functionalServices } from '../../test/functional/services';
+import { services as functionalServices } from '../functional/services';
 
 export const services = functionalServices;
diff --git a/x-pack/test/functional_execution_context/test_utils.ts b/x-pack/test/functional_execution_context/test_utils.ts
index 94750fa55e964..03299689186a2 100644
--- a/x-pack/test/functional_execution_context/test_utils.ts
+++ b/x-pack/test/functional_execution_context/test_utils.ts
@@ -7,7 +7,7 @@
 import Fs from 'fs/promises';
 import Path from 'path';
 import { isEqualWith } from 'lodash';
-import type { Ecs, KibanaExecutionContext } from 'kibana/server';
+import type { Ecs, KibanaExecutionContext } from '@kbn/core/server';
 import type { RetryService } from '../../../test/common/services/retry';
 
 export const logFilePath = Path.resolve(__dirname, './kibana.log');
diff --git a/x-pack/test/functional_synthetics/apps/uptime/index.ts b/x-pack/test/functional_synthetics/apps/uptime/index.ts
index 64a9da5c30ea3..925731c769bfc 100644
--- a/x-pack/test/functional_synthetics/apps/uptime/index.ts
+++ b/x-pack/test/functional_synthetics/apps/uptime/index.ts
@@ -9,6 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ loadTestFile, getService }: FtrProviderContext) => {
   describe('Uptime app', function () {
+    this.tags('ciGroup8');
     describe('with generated data', () => {
       loadTestFile(require.resolve('./synthetics_integration'));
     });
diff --git a/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts b/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts
index 93635ea0b0a73..aa10329dd820d 100644
--- a/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts
+++ b/x-pack/test/functional_synthetics/apps/uptime/synthetics_integration.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { FullAgentPolicy } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { FullAgentPolicy } from '../../../../plugins/fleet/common';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
 export default function (providerContext: FtrProviderContext) {
@@ -555,7 +555,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: 'on',
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               throttling: '5d/3u/20l',
@@ -605,7 +605,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: 'on',
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               throttling: '5d/3u/20l',
@@ -664,7 +664,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: advancedConfig.screenshots,
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               throttling: '1337d/1338u/1339l',
@@ -728,7 +728,7 @@ export default function (providerContext: FtrProviderContext) {
             monitorType: 'browser',
             config: {
               screenshots: advancedConfig.screenshots,
-              schedule: '@every 3m',
+              schedule: '@every 10m',
               timeout: null,
               tags: [config.tags],
               'service.name': config.apmServiceName,
diff --git a/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts b/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts
index fba4f2ce80e6b..044a092e5aecb 100644
--- a/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts
+++ b/x-pack/test/functional_synthetics/page_objects/synthetics_integration_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function SyntheticsIntegrationPageProvider({
diff --git a/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts b/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts
index 898d527245b16..14c7abaa57343 100644
--- a/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts
+++ b/x-pack/test/functional_synthetics/services/uptime/synthetics_package.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
   DeletePackagePoliciesRequest,
@@ -13,7 +12,8 @@ import {
   GetFullAgentPolicyResponse,
   GetPackagesResponse,
   GetAgentPoliciesResponse,
-} from '../../../../plugins/fleet/common';
+} from '@kbn/fleet-plugin/common';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const INGEST_API_ROOT = '/api/fleet';
 const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts b/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts
index e1f06f8a33e9f..c64f1514b7c45 100644
--- a/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/cases/list_view.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { CaseStatuses } from '../../../../plugins/cases/common';
 
 export default ({ getPageObject, getService }: FtrProviderContext) => {
   const header = getPageObject('header');
diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts b/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts
index 8c14e7e1263ee..a175e10fb7d18 100644
--- a/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/cases/view_case.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import uuid from 'uuid';
+import { CaseStatuses } from '@kbn/cases-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { CaseStatuses } from '../../../../plugins/cases/common';
 
 export default ({ getPageObject, getService }: FtrProviderContext) => {
   const common = getPageObject('common');
diff --git a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
index cfcfbb021b52a..9a486d4983d9c 100644
--- a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
@@ -6,8 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { DATAFEED_STATE } from '@kbn/ml-plugin/common/constants/states';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { DATAFEED_STATE } from '../../../../plugins/ml/common/constants/states';
 
 function createTestJobAndDatafeed() {
   const timestamp = Date.now();
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
index 4069f2f64c027..1127a7423a3aa 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
@@ -10,9 +10,9 @@ import uuid from 'uuid';
 import { omit, mapValues, range, flatten } from 'lodash';
 import moment from 'moment';
 import { asyncForEach } from '@kbn/std';
+import { alwaysFiringAlertType } from '@kbn/alerting-fixture-plugin/server/plugin';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { ObjectRemover } from '../../lib/object_remover';
-import { alwaysFiringAlertType } from '../../fixtures/plugins/alerts/server/plugin';
 import { getTestAlertData, getTestActionData } from '../../lib/get_test_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
@@ -136,7 +136,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     return response;
   }
 
-  describe('Rule Details', function () {
+  // Failing: See https://github.com/elastic/kibana/issues/129337
+  // Failing: See https://github.com/elastic/kibana/issues/129337
+  describe.skip('Rule Details', function () {
     describe('Header', function () {
       const testRunUuid = uuid.v4();
       before(async () => {
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx
index 2198ce456be4f..25709923a7c8a 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/application.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, RouteComponentProps } from 'react-router-dom';
 import { EuiPage, EuiText } from '@elastic/eui';
-import { AppMountParameters, CoreStart } from '../../../../../../../src/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 
 export interface AlertingExampleComponentParams {
   basename: string;
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts
index d3eff0b60955e..43fcb32a0ed20 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/public/plugin.ts
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
-import { PluginSetupContract as AlertingSetup } from '../../../../../../plugins/alerting/public';
-import { SanitizedRule } from '../../../../../../plugins/alerting/common';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../../../../plugins/triggers_actions_ui/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
+import { PluginSetupContract as AlertingSetup } from '@kbn/alerting-plugin/public';
+import { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { TriggersAndActionsUIPublicPluginSetup } from '@kbn/triggers-actions-ui-plugin/public';
 
 export type Setup = void;
 export type Start = void;
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts
index db084696a4dbf..b7c2aea144b5b 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import { AlertingFixturePlugin } from './plugin';
 
 export const plugin: PluginInitializer<void, void> = () => new AlertingFixturePlugin();
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts
index 2cd6b50a2062f..18cdf7f385f3e 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/server/plugin.ts
@@ -5,12 +5,9 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
-import {
-  PluginSetupContract as AlertingSetup,
-  RuleType,
-} from '../../../../../../plugins/alerting/server';
-import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../plugins/features/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { PluginSetupContract as AlertingSetup, RuleType } from '@kbn/alerting-plugin/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 
 // this plugin's dependendencies
 export interface AlertingExampleDeps {
diff --git a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
index e346971b48ea4..f330a24e218ba 100644
--- a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
+++ b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   CustomCheerio,
   CustomCheerioStatic,
-} from 'test/functional/services/lib/web_element_wrapper/custom_cheerio_api';
+} from '../../../../test/functional/services/lib/web_element_wrapper/custom_cheerio_api';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 const ENTER_KEY = '\uE007';
diff --git a/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts b/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts
index bf2d379521df3..87eefab7f04a1 100644
--- a/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts
+++ b/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'src/core/server';
-import { LicensingPluginSetup } from '../../../../../plugins/licensing/public';
+import { CoreSetup } from '@kbn/core/server';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 interface SetupPlugins {
   licensing: LicensingPluginSetup;
diff --git a/x-pack/test/licensing_plugin/public/feature_usage.ts b/x-pack/test/licensing_plugin/public/feature_usage.ts
index 0e914bca8fc11..f083d789c04f7 100644
--- a/x-pack/test/licensing_plugin/public/feature_usage.ts
+++ b/x-pack/test/licensing_plugin/public/feature_usage.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { LicensingPluginStart, LicenseType } from '@kbn/licensing-plugin/public';
 import { FtrProviderContext } from '../services';
-import { LicensingPluginStart, LicenseType } from '../../../plugins/licensing/public';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 interface FeatureUsage {
   last_used?: number;
diff --git a/x-pack/test/licensing_plugin/public/updates.ts b/x-pack/test/licensing_plugin/public/updates.ts
index d7442e491875a..938f6dd8fcdd7 100644
--- a/x-pack/test/licensing_plugin/public/updates.ts
+++ b/x-pack/test/licensing_plugin/public/updates.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import { FtrProviderContext } from '../services';
-import { LicensingPluginSetup } from '../../../plugins/licensing/public';
 import { createScenario } from '../scenario';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function (ftrContext: FtrProviderContext) {
diff --git a/x-pack/test/licensing_plugin/scenario.ts b/x-pack/test/licensing_plugin/scenario.ts
index 6618c986a5707..f7d2f5790460d 100644
--- a/x-pack/test/licensing_plugin/scenario.ts
+++ b/x-pack/test/licensing_plugin/scenario.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { PublicLicenseJSON } from '@kbn/licensing-plugin/server';
 import { FtrProviderContext } from './services';
-import { PublicLicenseJSON } from '../../plugins/licensing/server';
-import '../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 const delay = (ms: number) => new Promise((res) => setTimeout(res, ms));
 
diff --git a/x-pack/test/licensing_plugin/server/updates.ts b/x-pack/test/licensing_plugin/server/updates.ts
index 55b2b68ff8f82..6acbe42bc1abe 100644
--- a/x-pack/test/licensing_plugin/server/updates.ts
+++ b/x-pack/test/licensing_plugin/server/updates.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../services';
 import { createScenario } from '../scenario';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+import '@kbn/core-provider-plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function (ftrContext: FtrProviderContext) {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts
index 7588d37d4b111..fd8039f4005be 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_list_items.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import {
   getCreateExceptionListItemMinimalSchemaMock,
   getCreateExceptionListItemMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts
index 346e5a1269f3a..a3c71a8be2fc1 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_exception_lists.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   getCreateExceptionListMinimalSchemaMock,
   getCreateExceptionListMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
 
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts
index 29ea19940a480..40be89af0284a 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_list_items.ts
@@ -8,15 +8,15 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 
 import {
   getCreateMinimalListItemSchemaMock,
   getCreateMinimalListItemSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
   createListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts
index fce6863d1adbe..b64f9d4206db3 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/create_lists.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   getCreateMinimalListSchemaMock,
   getCreateMinimalListSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
   createListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts
index 7ff4870174300..1a97ac6db4cb0 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_list_items.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   getCreateExceptionListItemMinimalSchemaMock,
   getCreateExceptionListItemMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListItemServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts
index f1cc67f3dd430..5361bcb82f6a2 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_exception_lists.ts
@@ -9,11 +9,11 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   getCreateExceptionListMinimalSchemaMock,
   getCreateExceptionListMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts
index 57ca9a95ae7b7..d317e647174f7 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_list_items.ts
@@ -8,11 +8,11 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts
index cecb4510be9c3..3c4adc092d4aa 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/delete_lists.ts
@@ -13,22 +13,22 @@ import {
   LIST_ITEM_URL,
   LIST_URL,
 } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
   getCreateMinimalListSchemaMock,
   getCreateMinimalListSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMockWithoutId } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { DETECTION_TYPE, LIST_ID } from '@kbn/lists-plugin/common/constants.mock';
 import {
   createListsIndex,
   deleteAllExceptions,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMockWithoutId } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { DETECTION_TYPE, LIST_ID } from '../../../../plugins/lists/common/constants.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
index 54bd8f4d740cc..b3f8e7c0697fe 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_exception_list.ts
@@ -9,6 +9,8 @@ import expect from '@kbn/expect';
 import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
 
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   removeExceptionListServerGeneratedProperties,
@@ -16,8 +18,6 @@ import {
   binaryToString,
   deleteAllExceptions,
 } from '../../utils';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts
index ce2663cb96acb..fe471e2794b43 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/export_list_items.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 import type { CreateListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_ITEM_URL, LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
-import { LIST_ID, NAME } from '../../../../plugins/lists/common/constants.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { LIST_ID, NAME } from '@kbn/lists-plugin/common/constants.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { createListsIndex, deleteListsIndex, binaryToString } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts
index 7cfb94451fbb1..bb65b1c9c4933 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_list_items.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListItemServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts
index f5ff59de8eeca..349a44c506949 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_exception_lists.ts
@@ -8,8 +8,8 @@
 import expect from '@kbn/expect';
 
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts
index 20dadcfda6f22..c4ecce7d4d0e7 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_list_items.ts
@@ -8,12 +8,12 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { LIST_ITEM_ID, LIST_ID } from '../../../../plugins/lists/common/constants.mock';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { LIST_ITEM_ID, LIST_ID } from '@kbn/lists-plugin/common/constants.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts
index 25b8c705633fc..ffb13b66c8db9 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/find_lists.ts
@@ -8,15 +8,15 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts
index f82ef1f0246f8..8736ad75eeb6f 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_exceptions.ts
@@ -7,13 +7,13 @@
 
 import expect from '@kbn/expect';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import {
   toNdJsonString,
   getImportExceptionsListItemSchemaMock,
   getImportExceptionsListSchemaMock,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { deleteAllExceptions } from '../../utils';
 
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts
index 894dcdfbea02a..514ad3eb9f501 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/import_list_items.ts
@@ -8,8 +8,9 @@
 import expect from '@kbn/expect';
 import type { ListSchema, ListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { getImportListItemAsBuffer } from '@kbn/lists-plugin/common/schemas/request/import_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import {
@@ -20,8 +21,6 @@ import {
   waitFor,
 } from '../../utils';
 
-import { getImportListItemAsBuffer } from '../../../../plugins/lists/common/schemas/request/import_list_item_schema.mock';
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts
index e0035a5ecf079..42783a461ce7e 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_list_items.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
 import {
   getCreateExceptionListItemMinimalSchemaMock,
   getCreateExceptionListItemMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListItemServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts
index dd39ad9725287..31293e97cb078 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_exception_lists.ts
@@ -9,11 +9,11 @@ import expect from '@kbn/expect';
 
 import type { ExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
 import {
   getCreateExceptionListMinimalSchemaMock,
   getCreateExceptionListMinimalSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts
index 7292440e1a12a..dc99e9d4d180a 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_list_items.ts
@@ -8,11 +8,11 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
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
index e2633eea08e12..c84bc80bb0231 100644
--- 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
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 
 import { LIST_PRIVILEGES_URL } from '@kbn/securitysolution-list-constants';
-import { getReadPrivilegeMock } from '../../../../plugins/lists/server/routes/read_privileges_route.mock';
+import { getReadPrivilegeMock } from '@kbn/lists-plugin/server/routes/read_privileges_route.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts
index 414177d268213..162b57501c479 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/read_lists.ts
@@ -8,18 +8,18 @@
 import expect from '@kbn/expect';
 
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-
 import {
   getCreateMinimalListSchemaMock,
   getCreateMinimalListSchemaMockWithoutId,
-} from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+} from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
 import {
   createListsIndex,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts
index 891a56dfe8a30..d5848e7ee44be 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/summary_exception_lists.ts
@@ -9,10 +9,10 @@ import expect from '@kbn/expect';
 
 import { ExceptionListSummarySchema } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { LIST_ID } from '../../../../plugins/lists/common/constants.mock';
+import { LIST_ID } from '@kbn/lists-plugin/common/constants.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
 import { createListsIndex, deleteListsIndex, deleteAllExceptions } from '../../utils';
 
 interface SummaryResponseType {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts
index 37c997f686565..f1ee3ec7d981d 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_list_items.ts
@@ -12,15 +12,14 @@ import type {
   ExceptionListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL, EXCEPTION_LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_item_schema.mock';
-import { getCreateExceptionListItemMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_item_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
 
-import { getUpdateMinimalExceptionListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_exception_list_item_schema.mock';
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts
index 6844c847e8d92..d4c5cd422e772 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_exception_lists.ts
@@ -12,14 +12,13 @@ import type {
   ExceptionListSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
-import { getExceptionResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/exception_list_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_exception_list_schema.mock';
+import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../utils';
 
-import { getUpdateMinimalExceptionListSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_exception_list_schema.mock';
-
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts
index a4309d07a879d..e34ce8ba35465 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_list_items.ts
@@ -13,17 +13,17 @@ import type {
   ListItemSchema,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_URL, LIST_ITEM_URL } from '@kbn/securitysolution-list-constants';
-import { getListItemResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_item_schema.mock';
-import { getCreateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_item_schema.mock';
+import { getListItemResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_item_schema.mock';
+import { getCreateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_item_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getUpdateMinimalListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_list_item_schema.mock';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
   removeListItemServerGeneratedProperties,
 } from '../../utils';
-import { getUpdateMinimalListItemSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_list_item_schema.mock';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts
index 1c3fe393caf0c..7861c9fa2aa91 100644
--- a/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts
+++ b/x-pack/test/lists_api_integration/security_and_spaces/tests/update_lists.ts
@@ -9,16 +9,16 @@ import expect from '@kbn/expect';
 
 import type { UpdateListSchema, ListSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { LIST_URL } from '@kbn/securitysolution-list-constants';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
 
-import { getCreateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/create_list_schema.mock';
+import { getCreateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_list_schema.mock';
+import { getListResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/list_schema.mock';
+import { getUpdateMinimalListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_list_schema.mock';
 import {
   createListsIndex,
   deleteListsIndex,
   removeListServerGeneratedProperties,
 } from '../../utils';
-import { getListResponseMockWithoutAutoGeneratedValues } from '../../../../plugins/lists/common/schemas/response/list_schema.mock';
-import { getUpdateMinimalListSchemaMock } from '../../../../plugins/lists/common/schemas/request/update_list_schema.mock';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
diff --git a/x-pack/test/lists_api_integration/utils.ts b/x-pack/test/lists_api_integration/utils.ts
index c0dc1d930a57e..7ea7cfcf4b5cd 100644
--- a/x-pack/test/lists_api_integration/utils.ts
+++ b/x-pack/test/lists_api_integration/utils.ts
@@ -22,12 +22,12 @@ import {
   LIST_ITEM_URL,
 } from '@kbn/securitysolution-list-constants';
 import { ToolingLog } from '@kbn/dev-utils';
-import { getImportListItemAsBuffer } from '../../plugins/lists/common/schemas/request/import_list_item_schema.mock';
+import { getImportListItemAsBuffer } from '@kbn/lists-plugin/common/schemas/request/import_list_item_schema.mock';
 import { countDownTest } from '../detection_engine_api_integration/utils';
 
 /**
  * Creates the lists and lists items index for use inside of beforeEach blocks of tests
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
  * @param supertest The supertest client library
  */
 export const createListsIndex = async (
@@ -37,7 +37,9 @@ export const createListsIndex = async (
   return countDownTest(
     async () => {
       await supertest.post(LIST_INDEX).set('kbn-xsrf', 'true').send();
-      return true;
+      return {
+        passed: true,
+      };
     },
     'createListsIndex',
     log
@@ -55,7 +57,9 @@ export const deleteListsIndex = async (
   return countDownTest(
     async () => {
       await supertest.delete(LIST_INDEX).set('kbn-xsrf', 'true').send();
-      return true;
+      return {
+        passed: true,
+      };
     },
     'deleteListsIndex',
     log
@@ -64,7 +68,7 @@ export const deleteListsIndex = async (
 
 /**
  * Creates the exception lists and lists items index for use inside of beforeEach blocks of tests
- * This will retry 20 times before giving up and hopefully still not interfere with other tests
+ * This will retry 50 times before giving up and hopefully still not interfere with other tests
  * @param supertest The supertest client library
  */
 export const createExceptionListsIndex = async (
@@ -74,7 +78,9 @@ export const createExceptionListsIndex = async (
   return countDownTest(
     async () => {
       await supertest.post(LIST_INDEX).set('kbn-xsrf', 'true').send();
-      return true;
+      return {
+        passed: true,
+      };
     },
     'createListsIndex',
     log
@@ -223,7 +229,9 @@ export const deleteAllExceptionsByType = async (
         .get(`${EXCEPTION_LIST_URL}/_find?namespace_type=${type}`)
         .set('kbn-xsrf', 'true')
         .send();
-      return finalCheck.data.length === 0;
+      return {
+        passed: finalCheck.data.length === 0,
+      };
     },
     `deleteAllExceptions by type: "${type}"`,
     log,
diff --git a/x-pack/test/load/runner.ts b/x-pack/test/load/runner.ts
index ba40bcf294e57..6437fbd3fe516 100644
--- a/x-pack/test/load/runner.ts
+++ b/x-pack/test/load/runner.ts
@@ -11,7 +11,7 @@ import { REPO_ROOT } from '@kbn/utils';
 import Fs from 'fs';
 import { createFlagError } from '@kbn/dev-utils';
 import { setTimeout as setTimeoutAsync } from 'timers/promises';
-import { FtrProviderContext } from './../functional/ftr_provider_context';
+import { FtrProviderContext } from '../functional/ftr_provider_context';
 
 const baseSimulationPath = 'src/test/scala/org/kibanaLoadTest/simulation';
 const simulationPackage = 'org.kibanaLoadTest.simulation';
diff --git a/x-pack/test/observability_api_integration/trial/tests/annotations.ts b/x-pack/test/observability_api_integration/trial/tests/annotations.ts
index be4e98f9937d0..47ddc7437d146 100644
--- a/x-pack/test/observability_api_integration/trial/tests/annotations.ts
+++ b/x-pack/test/observability_api_integration/trial/tests/annotations.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { JsonObject } from '@kbn/utility-types';
-import { Annotation } from '../../../../plugins/observability/common/annotations';
+import { Annotation } from '@kbn/observability-plugin/common/annotations';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 const DEFAULT_INDEX_NAME = 'observability-annotations';
diff --git a/x-pack/test/performance/tests/playwright/index.ts b/x-pack/test/performance/tests/playwright/index.ts
index 05dfe4cdfbc81..d7e7c43b00178 100644
--- a/x-pack/test/performance/tests/playwright/index.ts
+++ b/x-pack/test/performance/tests/playwright/index.ts
@@ -15,6 +15,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
     loadTestFile(require.resolve('./flight_dashboard'));
     loadTestFile(require.resolve('./web_logs_dashboard'));
     loadTestFile(require.resolve('./promotion_tracking_dashboard'));
+    loadTestFile(require.resolve('./many_fields_discover'));
 
     after(async () => {
       await performance.shutdownBrowser();
diff --git a/x-pack/test/performance/tests/playwright/many_fields_discover.ts b/x-pack/test/performance/tests/playwright/many_fields_discover.ts
new file mode 100644
index 0000000000000..0e66b63bb5794
--- /dev/null
+++ b/x-pack/test/performance/tests/playwright/many_fields_discover.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { StepCtx } from '../../services/performance';
+
+export default function manyFieldsDiscover({ getService }: FtrProviderContext) {
+  // FAILING: https://github.com/elastic/kibana/issues/130287
+  describe.skip('many_fields_discover', () => {
+    const performance = getService('performance');
+    const esArchiver = getService('esArchiver');
+    const kibanaServer = getService('kibanaServer');
+
+    before(async () => {
+      await kibanaServer.importExport.load(
+        'test/functional/fixtures/kbn_archiver/many_fields_data_view'
+      );
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/many_fields');
+    });
+
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/many_fields_data_view'
+      );
+      await esArchiver.unload('test/functional/fixtures/es_archiver/many_fields');
+    });
+
+    it('many_fields_discover', async () => {
+      await performance.runUserJourney(
+        'many_fields_discover',
+        [
+          {
+            name: 'Go to Discover Page',
+            handler: async ({ page, kibanaUrl }: StepCtx) => {
+              await page.goto(`${kibanaUrl}/app/discover`);
+              await page.waitForSelector('[data-test-subj="discoverDocTable"]');
+            },
+          },
+          {
+            name: 'Expand the first document',
+            handler: async ({ page }) => {
+              const expandButtons = page.locator('[data-test-subj="docTableExpandToggleColumn"]');
+              await expandButtons.first().click();
+              await page.locator('text="Expanded document"');
+            },
+          },
+        ],
+        {
+          requireAuth: false,
+        }
+      );
+    });
+  });
+}
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
index 6041933f7590c..9f227af8a7a64 100644
--- a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class ElasticsearchClientXPack implements Plugin {
   constructor() {}
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts
index a0c68d2b04bae..eb8bfa1b80cff 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
+import { PluginInitializerContext } from '@kbn/core/server';
 import { EventLogFixturePlugin } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) =>
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
index 805feee159f27..031f898c06fc9 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
@@ -13,9 +13,9 @@ import {
   IRouter,
   Logger,
   RouteValidationResultFactory,
-} from 'kibana/server';
-import { IEventLogService, IEventLogger } from '../../../../../plugins/event_log/server';
-import { IValidatedEvent } from '../../../../../plugins/event_log/server/types';
+} from '@kbn/core/server';
+import { IEventLogService, IEventLogger } from '@kbn/event-log-plugin/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server/types';
 
 export const logEventRoute = (router: IRouter, eventLogger: IEventLogger, logger: Logger) => {
   router.post(
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
index 8c796546b2bf7..87bb7de7f2f41 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, Logger, PluginInitializerContext } from 'kibana/server';
-import { IEventLogService, IEventLogClientService } from '../../../../../plugins/event_log/server';
+import { Plugin, CoreSetup, Logger, PluginInitializerContext } from '@kbn/core/server';
+import { IEventLogService, IEventLogClientService } from '@kbn/event-log-plugin/server';
 import {
   logEventRoute,
   registerProviderActionsRoute,
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts
index 32161d27a4ff0..b649fbc808272 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/server';
+import { PluginInitializer } from '@kbn/core/server';
 import {
   FeatureUsageTestPlugin,
   FeatureUsageTestPluginSetup,
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts
index b52b9da1e1dfc..8bed6fcd0ebab 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/plugin.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'kibana/server';
-import {
-  LicensingPluginSetup,
-  LicensingPluginStart,
-} from '../../../../../plugins/licensing/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
+import { LicensingPluginSetup, LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { registerRoutes } from './routes';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts
index 717f72bf7ab6b..dd514f034b7c1 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/hit.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, StartServicesAccessor } from 'src/core/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { FeatureUsageTestStartDependencies, FeatureUsageTestPluginStart } from '../plugin';
 
 export function registerFeatureHitRoute(
diff --git a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
index 492193acbcb54..59e6ed28ea0ee 100644
--- a/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/feature_usage_test/server/routes/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IRouter, StartServicesAccessor } from 'src/core/server';
+import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { FeatureUsageTestStartDependencies, FeatureUsageTestPluginStart } from '../plugin';
 
 import { registerFeatureHitRoute } from './hit';
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
index d761bc50ce080..cea7432cbae08 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
@@ -13,9 +13,9 @@ import {
   IKibanaResponse,
   IRouter,
   IScopedClusterClient,
-} from 'src/core/server';
+} from '@kbn/core/server';
 import { EventEmitter } from 'events';
-import { TaskManagerStartContract } from '../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
 
 const scope = 'testing';
 const taskManagerQuery = {
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
index d46ee62451aed..59cb0ee43d8c1 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
@@ -6,18 +6,17 @@
  */
 
 import _ from 'lodash';
-import { Plugin, CoreSetup, CoreStart } from 'src/core/server';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
 import { EventEmitter } from 'events';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { initRoutes } from './init_routes';
+import { firstValueFrom, Subject } from 'rxjs';
 import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
   ConcreteTaskInstance,
   EphemeralTask,
-} from '../../../../../plugins/task_manager/server';
-import { DEFAULT_MAX_WORKERS } from '../../../../../plugins/task_manager/server/config';
+} from '@kbn/task-manager-plugin/server';
+import { DEFAULT_MAX_WORKERS } from '@kbn/task-manager-plugin/server/config';
+import { initRoutes } from './init_routes';
 
 // this plugin's dependendencies
 export interface SampleTaskManagerFixtureSetupDeps {
@@ -32,9 +31,7 @@ export class SampleTaskManagerFixturePlugin
     Plugin<void, void, SampleTaskManagerFixtureSetupDeps, SampleTaskManagerFixtureStartDeps>
 {
   taskManagerStart$: Subject<TaskManagerStartContract> = new Subject<TaskManagerStartContract>();
-  taskManagerStart: Promise<TaskManagerStartContract> = this.taskManagerStart$
-    .pipe(first())
-    .toPromise();
+  taskManagerStart: Promise<TaskManagerStartContract> = firstValueFrom(this.taskManagerStart$);
 
   public setup(core: CoreSetup, { taskManager }: SampleTaskManagerFixtureSetupDeps) {
     const taskTestingEvents = new EventEmitter();
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
index 22a794567abfb..a7bcdf2ddc52c 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
@@ -9,9 +9,9 @@ import { merge, omit, chunk, isEmpty } from 'lodash';
 import uuid from 'uuid';
 import expect from '@kbn/expect';
 import moment from 'moment';
+import { IEvent } from '@kbn/event-log-plugin/server';
+import { IValidatedEvent } from '@kbn/event-log-plugin/server/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { IEvent } from '../../../../plugins/event_log/server';
-import { IValidatedEvent } from '../../../../plugins/event_log/server/types';
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
index f317ad2dcff13..14c92d91138dd 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
@@ -8,7 +8,7 @@
 import _ from 'lodash';
 import uuid from 'uuid';
 import expect from '@kbn/expect';
-import { IEvent } from '../../../../plugins/event_log/server';
+import { IEvent } from '@kbn/event-log-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts
index 90d72adfaab22..6e199072deaee 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/health_route.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import url from 'url';
 import { keyBy, mapValues } from 'lodash';
 import supertest from 'supertest';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server';
 
 interface MonitoringStats {
   last_update: string;
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
index 1b0ffdedb0077..644ed91410299 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/migrations.ts
@@ -12,9 +12,9 @@ import {
   ConcreteTaskInstance,
   TaskInstanceWithDeprecatedFields,
   TaskStatus,
-} from '../../../../plugins/task_manager/server/task';
+} from '@kbn/task-manager-plugin/server/task';
+import { SavedObjectsUtils } from '@kbn/core/server/saved_objects';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { SavedObjectsUtils } from '../../../../../src/core/server/saved_objects';
 
 export default function createGetTests({ getService }: FtrProviderContext) {
   const es = getService('es');
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
index 827ed91578e8e..b040b1623b2d5 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
@@ -8,13 +8,10 @@
 import { random, times } from 'lodash';
 import expect from '@kbn/expect';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import TaskManagerMapping from '@kbn/task-manager-plugin/server/saved_objects/mappings.json';
+import { DEFAULT_MAX_WORKERS, DEFAULT_POLL_INTERVAL } from '@kbn/task-manager-plugin/server/config';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import TaskManagerMapping from '../../../../plugins/task_manager/server/saved_objects/mappings.json';
-import {
-  DEFAULT_MAX_WORKERS,
-  DEFAULT_POLL_INTERVAL,
-} from '../../../../plugins/task_manager/server/config';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server';
 
 const {
   task: { properties: taskManagerIndexMapping },
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts
index 90590f1e3e572..14f75191322b6 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts
@@ -9,8 +9,8 @@ import _ from 'lodash';
 import expect from '@kbn/expect';
 import url from 'url';
 import supertest from 'supertest';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server';
 
 export interface RawDoc {
   _id: string;
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts
index c668ffaaede56..a70225035d03c 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_scheduled_at.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ConcreteTaskInstance } from '../../../../plugins/task_manager/server/task';
+import { ConcreteTaskInstance } from '@kbn/task-manager-plugin/server/task';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 export default function createTaskManagementScheduledAtTests({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts
index e60ad50b9ed85..845bd4cb210e2 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/init_routes.ts
@@ -13,12 +13,9 @@ import {
   IKibanaResponse,
   IRouter,
   CoreSetup,
-} from 'kibana/server';
+} from '@kbn/core/server';
 import { range, chunk } from 'lodash';
-import {
-  TaskManagerStartContract,
-  ConcreteTaskInstance,
-} from '../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract, ConcreteTaskInstance } from '@kbn/task-manager-plugin/server';
 import { PerfApi, PerfResult } from './types';
 
 const scope = 'perf-testing';
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts
index a8ae44f72702d..9d0face98b862 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/server/plugin.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/server';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/server';
+import { firstValueFrom, Subject } from 'rxjs';
 
 import uuid from 'uuid';
 import _ from 'lodash';
@@ -18,7 +17,7 @@ import {
   TaskManagerSetupContract,
   TaskManagerStartContract,
   ConcreteTaskInstance,
-} from '../../../../../plugins/task_manager/server';
+} from '@kbn/task-manager-plugin/server';
 import { PerfState, PerfApi, PerfResult } from './types';
 import { initRoutes } from './init_routes';
 
@@ -35,9 +34,7 @@ export class SampleTaskManagerFixturePlugin
     Plugin<void, void, SampleTaskManagerFixtureSetupDeps, SampleTaskManagerFixtureStartDeps>
 {
   taskManagerStart$: Subject<TaskManagerStartContract> = new Subject<TaskManagerStartContract>();
-  taskManagerStart: Promise<TaskManagerStartContract> = this.taskManagerStart$
-    .pipe(first())
-    .toPromise();
+  taskManagerStart: Promise<TaskManagerStartContract> = firstValueFrom(this.taskManagerStart$);
 
   public setup(core: CoreSetup, { taskManager }: SampleTaskManagerFixtureSetupDeps) {
     const performanceState = resetPerfState({});
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts b/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts
index 495cfbff19eea..9e5b16abfa90a 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/common/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GlobalSearchProviderResult } from '../../../../../plugins/global_search/common/types';
+import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/common/types';
 
 export const createResult = (
   parts: Partial<GlobalSearchProviderResult>
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts b/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts
index 9450384458d09..c3b10dd5cf5e1 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'src/core/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   GlobalSearchTestPlugin,
   GlobalSearchTestPluginSetup,
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
index a2023bb215613..b203006c60b6b 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
@@ -6,12 +6,13 @@
  */
 
 import { map, reduce } from 'rxjs/operators';
-import { Plugin, CoreSetup, CoreStart, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart, AppMountParameters } from '@kbn/core/public';
+import { lastValueFrom } from 'rxjs';
 import {
   GlobalSearchPluginSetup,
   GlobalSearchPluginStart,
   GlobalSearchResult,
-} from '../../../../../plugins/global_search/public';
+} from '@kbn/global-search-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface GlobalSearchTestPluginSetup {}
@@ -56,13 +57,12 @@ export class GlobalSearchTestPlugin
   ): GlobalSearchTestPluginStart {
     return {
       find: (term) =>
-        globalSearch
-          .find({ term }, {})
-          .pipe(
+        lastValueFrom(
+          globalSearch.find({ term }, {}).pipe(
             map((batch) => batch.results),
             reduce((memo, results) => [...memo, ...results])
           )
-          .toPromise(),
+        ),
     };
   }
 }
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx b/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
index 148b82f613a67..761e16e81bac7 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
@@ -9,15 +9,15 @@ import { Router } from 'react-router-dom';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { useMemo } from 'react';
 import styled from 'styled-components';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   DataAccessLayer,
   ResolverPluginSetup,
-} from '../../../../../../../plugins/security_solution/public/resolver/types';
+} from '@kbn/security-solution-plugin/public/resolver/types';
 
 /**
  * Render the Resolver Test app. Returns a cleanup function.
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts b/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts
index 166c2b45e3df6..5867b687442c1 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   ResolverTestPlugin,
   ResolverTestPluginSetupDependencies,
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
index 3cec96a1f42b9..06f66d6a2c49e 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { PluginSetup as SecuritySolutionPluginSetup } from '../../../../../plugins/security_solution/public';
+import { PluginSetup as SecuritySolutionPluginSetup } from '@kbn/security-solution-plugin/public';
 
 export type ResolverTestPluginSetup = void;
 export type ResolverTestPluginStart = void;
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx b/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
index 2542e82c5e28d..a7fb3ddb10d60 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
@@ -8,12 +8,12 @@
 import { Router } from 'react-router-dom';
 import React, { useCallback, useRef } from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters, CoreStart } from 'kibana/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
-import { TimelinesUIStart } from '../../../../../../../plugins/timelines/public';
-import { DataPublicPluginStart } from '../../../../../../../../src/plugins/data/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 type CoreStartTimelines = CoreStart & { data: DataPublicPluginStart };
 
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts b/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts
index 5f038b5b933e6..540e23622b2b3 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer } from 'kibana/public';
+import { PluginInitializer } from '@kbn/core/public';
 import {
   TimelinesTestPlugin,
   TimelinesTestPluginSetupDependencies,
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts
index 86b3c7b0ddf7c..13758e02603a3 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/plugin.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { Plugin, CoreStart, CoreSetup, AppMountParameters } from 'kibana/public';
+import { Plugin, CoreStart, CoreSetup, AppMountParameters } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
-import { TimelinesUIStart } from '../../../../../plugins/timelines/public';
+import { TimelinesUIStart } from '@kbn/timelines-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { renderApp } from './applications/timelines_test';
-import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
 
 export type TimelinesTestPluginSetup = void;
 export type TimelinesTestPluginStart = void;
diff --git a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts
index 24bd4e09a4ea3..fd6a46b391cb8 100644
--- a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts
+++ b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts
@@ -6,9 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { GlobalSearchResult } from '@kbn/global-search-plugin/common/types';
+import { GlobalSearchTestApi } from '@kbn/global-search-test-plugin/public/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { GlobalSearchResult } from '../../../../plugins/global_search/common/types';
-import { GlobalSearchTestApi } from '../../plugins/global_search_test/public/types';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
diff --git a/x-pack/test/plugin_functional/test_suites/resolver/index.ts b/x-pack/test/plugin_functional/test_suites/resolver/index.ts
index 9a243d1e2a2c3..688ba536b1232 100644
--- a/x-pack/test/plugin_functional/test_suites/resolver/index.ts
+++ b/x-pack/test/plugin_functional/test_suites/resolver/index.ts
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { panAnimationDuration } from '@kbn/security-solution-plugin/public/resolver/store/camera/scaling_constants';
 import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { panAnimationDuration } from '../../../../plugins/security_solution/public/resolver/store/camera/scaling_constants';
 
 const expectedDifference = 0.09;
 
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts b/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts
index 6694b5299cd67..922ff565b4e29 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import supertest from 'supertest';
-import { JobParamsDownloadCSV } from '../../../plugins/reporting/server/export_types/csv_searchsource_immediate/types';
+import { JobParamsDownloadCSV } from '@kbn/reporting-plugin/server/export_types/csv_searchsource_immediate/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 const getMockJobParams = (obj: object) => {
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts b/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
index 2ddeeb711600e..5051b74c6e8d1 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/error_codes.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ReportApiJSON } from '../../../plugins/reporting/common/types';
+import { ReportApiJSON } from '@kbn/reporting-plugin/common/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts
index 972e1b2f46855..0490cddb568d2 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { SerializedSearchSourceFields } from 'src/plugins/data/common';
-import { ReportApiJSON } from '../../../plugins/reporting/common/types';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
+import { ReportApiJSON } from '@kbn/reporting-plugin/common/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
index ec2c95e5e41ef..3a360ca0a1f5c 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
@@ -6,10 +6,9 @@
  */
 
 import expect from '@kbn/expect';
+import { ILM_POLICY_NAME } from '@kbn/reporting-plugin/common/constants';
 import { FtrProviderContext } from '../ftr_provider_context';
 
-import { ILM_POLICY_NAME } from '../../../plugins/reporting/common/constants';
-
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
   const es = getService('es');
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts b/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts
index 771c12b4a2366..ad086319776f9 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/security_roles_privileges.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import { SerializedSearchSourceFields } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
index 78858239ddec9..4afc788344117 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import * as Rx from 'rxjs';
+import { lastValueFrom } from 'rxjs';
 import { filter, first, map, switchMap, tap, timeout } from 'rxjs/operators';
 import { FtrProviderContext } from '../ftr_provider_context';
 
@@ -75,7 +76,7 @@ export default function ({ getService }: FtrProviderContext) {
         const path = await reportingAPI.postJobJSON(`/api/reporting/generate/csv_searchsource`, {
           jobParams: `(${JOB_PARAMS_CSV_DEFAULT_SPACE},title:'EC SEARCH')`,
         });
-        const csv = await getCompleted$(path).toPromise();
+        const csv = await lastValueFrom(getCompleted$(path));
 
         expectSnapshot(csv.slice(0, 500)).toMatchInline(`
           "\\"order_date\\",category,\\"customer_full_name\\",\\"taxful_total_price\\",currency
@@ -99,7 +100,7 @@ export default function ({ getService }: FtrProviderContext) {
             jobParams: `(${JOB_PARAMS_CSV_NONDEFAULT_SPACE},title:'Ecom Search from Non-Default')`,
           }
         );
-        const csv = await getCompleted$(path).toPromise();
+        const csv = await lastValueFrom(getCompleted$(path));
         expectSnapshot(csv.slice(0, 500)).toMatchInline(`
           "order_date;category;customer_full_name;taxful_total_price;currency
           Jul 11, 2019 @ 16:00:00.000;Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories;Sultan Al Boone;174;EUR
@@ -122,7 +123,7 @@ export default function ({ getService }: FtrProviderContext) {
           jobParams: `(browserTimezone:${tzParam},${JOB_PARAMS_CSV_DEFAULT_SPACE},title:'EC SEARCH')`,
         });
 
-        const csv = await getCompleted$(path).toPromise();
+        const csv = await lastValueFrom(getCompleted$(path));
         expectSnapshot(csv.slice(0, 500)).toMatchInline(`
           "\\"order_date\\",category,\\"customer_full_name\\",\\"taxful_total_price\\",currency
           \\"Jul 11, 2019 @ 17:00:00.000\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Sultan Al Boone\\",174,EUR
@@ -138,7 +139,7 @@ export default function ({ getService }: FtrProviderContext) {
         const path = await reportingAPI.postJobJSON(`/api/reporting/generate/csv_searchsource`, {
           jobParams: `(${JOB_PARAMS_CSV_DEFAULT_SPACE},title:'EC SEARCH')`,
         });
-        const csv = await getCompleted$(path).toPromise();
+        const csv = await lastValueFrom(getCompleted$(path));
         expectSnapshot(csv.slice(0, 500)).toMatchInline(`
           "\\"order_date\\",category,\\"customer_full_name\\",\\"taxful_total_price\\",currency
           \\"Jul 12, 2019 @ 00:00:00.000\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Sultan Al Boone\\",174,EUR
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
index e1935c2617f41..22be1d776e792 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { pick } from 'lodash';
-import { ReportApiJSON } from '../../../plugins/reporting/common/types';
+import { ReportApiJSON } from '@kbn/reporting-plugin/common/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 const apiResponseFields = [
diff --git a/x-pack/test/reporting_api_integration/services/scenarios.ts b/x-pack/test/reporting_api_integration/services/scenarios.ts
index be72233a26ffc..c61bb809da3a4 100644
--- a/x-pack/test/reporting_api_integration/services/scenarios.ts
+++ b/x-pack/test/reporting_api_integration/services/scenarios.ts
@@ -9,11 +9,11 @@ import rison, { RisonValue } from 'rison-node';
 import {
   API_GET_ILM_POLICY_STATUS,
   API_MIGRATE_ILM_POLICY_URL,
-} from '../../../plugins/reporting/common/constants';
-import { JobParamsCSV } from '../../../plugins/reporting/server/export_types/csv_searchsource/types';
-import { JobParamsDownloadCSV } from '../../../plugins/reporting/server/export_types/csv_searchsource_immediate/types';
-import { JobParamsPNGDeprecated } from '../../../plugins/reporting/server/export_types/png/types';
-import { JobParamsPDFDeprecated } from '../../../plugins/reporting/server/export_types/printable_pdf/types';
+} from '@kbn/reporting-plugin/common/constants';
+import { JobParamsCSV } from '@kbn/reporting-plugin/server/export_types/csv_searchsource/types';
+import { JobParamsDownloadCSV } from '@kbn/reporting-plugin/server/export_types/csv_searchsource_immediate/types';
+import { JobParamsPNGDeprecated } from '@kbn/reporting-plugin/server/export_types/png/types';
+import { JobParamsPDFDeprecated } from '@kbn/reporting-plugin/server/export_types/printable_pdf/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 function removeWhitespace(str: string) {
diff --git a/x-pack/test/reporting_api_integration/services/usage.ts b/x-pack/test/reporting_api_integration/services/usage.ts
index cdc0cfb5305c2..fd16f3859fa11 100644
--- a/x-pack/test/reporting_api_integration/services/usage.ts
+++ b/x-pack/test/reporting_api_integration/services/usage.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
-import { indexTimestamp } from '../../../plugins/reporting/server/lib/store/index_timestamp';
+import { indexTimestamp } from '@kbn/reporting-plugin/server/lib/store/index_timestamp';
 import {
   AvailableTotal,
   JobTypes,
   LayoutCounts,
   ReportingUsageType,
-} from '../../../plugins/reporting/server/usage/types';
+} from '@kbn/reporting-plugin/server/usage/types';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // NOTE: the usage stats come from an HTTP API, which converts key names to snake_case
diff --git a/x-pack/test/rule_registry/common/config.ts b/x-pack/test/rule_registry/common/config.ts
index 91cc290f60361..d6fec474a00bf 100644
--- a/x-pack/test/rule_registry/common/config.ts
+++ b/x-pack/test/rule_registry/common/config.ts
@@ -55,7 +55,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     };
 
     return {
-      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
+      testFiles,
       servers,
       services,
       junit: {
diff --git a/x-pack/test/rule_registry/common/lib/authentication/index.ts b/x-pack/test/rule_registry/common/lib/authentication/index.ts
index f76159976a902..438fd972486e1 100644
--- a/x-pack/test/rule_registry/common/lib/authentication/index.ts
+++ b/x-pack/test/rule_registry/common/lib/authentication/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrProviderContext as CommonFtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext as CommonFtrProviderContext } from '../../ftr_provider_context';
 import { Role, User, UserInfo } from './types';
 import { allUsers } from './users';
 import { allRoles } from './roles';
diff --git a/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts b/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts
index fb974da00b52f..82652e5726fcf 100644
--- a/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts
+++ b/x-pack/test/rule_registry/common/lib/helpers/cleanup_registry_indices.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { IRuleDataClient } from '../../../../../plugins/rule_registry/server';
+import { IRuleDataClient } from '@kbn/rule-registry-plugin/server';
 import { GetService } from '../../types';
 
 export const cleanupRegistryIndices = async (getService: GetService, client: IRuleDataClient) => {
diff --git a/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts b/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts
index 64999aafd2f60..73e15c6cdbaeb 100644
--- a/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts
+++ b/x-pack/test/rule_registry/common/lib/helpers/wait_until_next_execution.ts
@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { Rule } from '@kbn/alerting-plugin/common';
 import { GetService } from '../../types';
 import { getAlertsTargetIndices } from './get_alerts_target_indices';
 import { BULK_INDEX_DELAY, MAX_POLLS } from '../../constants';
-import { Rule } from '../../../../../plugins/alerting/common';
 import { getSpaceUrlPrefix } from '../authentication/spaces';
 import { User } from '../authentication/types';
 
diff --git a/x-pack/test/rule_registry/common/types.ts b/x-pack/test/rule_registry/common/types.ts
index bd457d17a92df..970b131ef8c18 100644
--- a/x-pack/test/rule_registry/common/types.ts
+++ b/x-pack/test/rule_registry/common/types.ts
@@ -11,8 +11,8 @@ import {
   ActionGroupIdsOf,
   AlertInstanceState as AlertState,
   AlertInstanceContext as AlertContext,
-} from '../../../plugins/alerting/common';
-import { RuleTypeState } from '../../../plugins/alerting/server';
+} from '@kbn/alerting-plugin/common';
+import { RuleTypeState } from '@kbn/alerting-plugin/server';
 import { services } from './services';
 
 export type GetService = GenericFtrProviderContext<typeof services, {}>['getService'];
diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts
index e94257f5f9fb6..ef06fc80c485c 100644
--- a/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts
+++ b/x-pack/test/rule_registry/security_and_spaces/tests/basic/find_alerts.ts
@@ -6,7 +6,7 @@
  */
 import expect from '@kbn/expect';
 
-import { ALERT_WORKFLOW_STATUS } from '../../../../../plugins/rule_registry/common/technical_rule_data_field_names';
+import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import {
   superUser,
   globalRead,
diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
index 2c203a4ffbcd3..27dfd7a9c9a90 100644
--- a/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
+++ b/x-pack/test/rule_registry/security_and_spaces/tests/basic/search_strategy.ts
@@ -7,8 +7,9 @@
 import expect from '@kbn/expect';
 import { AlertConsumers } from '@kbn/rule-data-utils';
 
+import { RuleRegistrySearchResponse } from '@kbn/rule-registry-plugin/common/search_strategy';
+import { QueryCreateSchema } from '@kbn/security-solution-plugin/common/detection_engine/schemas/request';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { RuleRegistrySearchResponse } from '../../../../../plugins/rule_registry/common/search_strategy';
 import {
   deleteSignalsIndex,
   createSignalsIndex,
@@ -19,7 +20,6 @@ import {
   waitForRuleSuccessOrStatus,
 } from '../../../../detection_engine_api_integration/utils';
 import { ID } from '../../../../detection_engine_api_integration/security_and_spaces/tests/generating_signals';
-import { QueryCreateSchema } from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
 import {
   obsOnlySpacesAllEsRead,
   obsOnlySpacesAll,
@@ -42,7 +42,8 @@ export default ({ getService }: FtrProviderContext) => {
 
   const SPACE1 = 'space1';
 
-  describe('ruleRegistryAlertsSearchStrategy', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/129219
+  describe.skip('ruleRegistryAlertsSearchStrategy', () => {
     let kibanaVersion: string;
     before(async () => {
       kibanaVersion = await kbnClient.version.get();
diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts
index 4e9c9c1475388..2e8358b239561 100644
--- a/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts
+++ b/x-pack/test/rule_registry/spaces_only/tests/trial/create_rule.ts
@@ -18,6 +18,7 @@ import {
   VERSION,
 } from '@kbn/rule-data-utils';
 import { omit } from 'lodash';
+import { Rule } from '@kbn/alerting-plugin/common';
 import type { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
   getAlertsTargetIndices,
@@ -29,7 +30,6 @@ import {
   deleteAlert,
 } from '../../../common/lib/helpers';
 import { AlertDef, AlertParams } from '../../../common/types';
-import { Rule } from '../../../../../plugins/alerting/common';
 import { APM_METRIC_INDEX_NAME } from '../../../common/constants';
 import { obsOnly } from '../../../common/lib/authentication/users';
 
diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts
index 689144791b048..d778be1705c46 100644
--- a/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts
+++ b/x-pack/test/rule_registry/spaces_only/tests/trial/lifecycle_executor.ts
@@ -5,25 +5,22 @@
  * 2.0.
  */
 
-import type { ElasticsearchClient, Logger, LogMeta } from 'kibana/server';
+import type { ElasticsearchClient, Logger, LogMeta } from '@kbn/core/server';
 import sinon from 'sinon';
 import expect from '@kbn/expect';
-import { mappingFromFieldMap } from '../../../../../plugins/rule_registry/common/mapping_from_field_map';
+import { mappingFromFieldMap } from '@kbn/rule-registry-plugin/common/mapping_from_field_map';
 import {
   AlertConsumers,
   ALERT_REASON,
   ALERT_UUID,
-} from '../../../../../plugins/rule_registry/common/technical_rule_data_field_names';
+} from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import {
   createLifecycleExecutor,
   WrappedLifecycleRuleState,
-} from '../../../../../plugins/rule_registry/server/utils/create_lifecycle_executor';
+} from '@kbn/rule-registry-plugin/server/utils/create_lifecycle_executor';
+import { Dataset, IRuleDataClient, RuleDataService } from '@kbn/rule-registry-plugin/server';
+import { RuleExecutorOptions } from '@kbn/alerting-plugin/server';
 import type { FtrProviderContext } from '../../../common/ftr_provider_context';
-import {
-  Dataset,
-  IRuleDataClient,
-  RuleDataService,
-} from '../../../../../plugins/rule_registry/server';
 import {
   MockRuleParams,
   MockRuleState,
@@ -31,7 +28,6 @@ import {
   MockAlertState,
   MockAllowedActionGroups,
 } from '../../../common/types';
-import { RuleExecutorOptions } from '../../../../../plugins/alerting/server';
 import { cleanupRegistryIndices } from '../../../common/lib/helpers/cleanup_registry_indices';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts b/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
index 36bbbb4bb8755..9221ac18c6dcd 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, SavedObject } from 'kibana/server';
+import { CoreSetup, SavedObject } from '@kbn/core/server';
 
 export class Plugin {
   constructor() {}
diff --git a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
index a4c69ec5a2ab1..82f2e2d5eaec9 100644
--- a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
+++ b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import type { Client } from '@elastic/elasticsearch';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { SPACES, ALL_SPACES_ID } from './spaces';
 import { AUTHENTICATION } from './authentication';
 import { TestCase, TestUser, ExpectResponseBody } from './types';
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
index 454f88e1d8b02..7779c604472e1 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES, ALL_SPACES_ID } from '../lib/spaces';
 import {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/import.ts b/x-pack/test/saved_object_api_integration/common/suites/import.ts
index 58b323e86d607..7580521e170a6 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/import.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/import.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import type { Client } from '@elastic/elasticsearch';
-import type { SavedObjectReference } from 'src/core/server';
+import type { SavedObjectReference } from '@kbn/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import { expectResponses, getUrlPrefix, getTestTitle } from '../lib/saved_object_test_utils';
diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
index c63b6c323f093..a7711719da7df 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import type { Client } from '@elastic/elasticsearch';
-import type { SavedObjectReference, SavedObjectsImportRetry } from 'src/core/server';
+import type { SavedObjectReference, SavedObjectsImportRetry } from '@kbn/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import { expectResponses, getUrlPrefix, getTestTitle } from '../lib/saved_object_test_utils';
diff --git a/x-pack/test/saved_objects_field_count/runner.ts b/x-pack/test/saved_objects_field_count/runner.ts
index 22c6fd5d4612f..e6b53f2a2f399 100644
--- a/x-pack/test/saved_objects_field_count/runner.ts
+++ b/x-pack/test/saved_objects_field_count/runner.ts
@@ -6,7 +6,7 @@
  */
 
 import { CiStatsReporter } from '@kbn/dev-utils';
-import { FtrProviderContext } from './../functional/ftr_provider_context';
+import { FtrProviderContext } from '../functional/ftr_provider_context';
 
 const IGNORED_FIELDS = [
   // The following fields are returned by the _field_caps API but aren't counted
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts
index 6906fa5dfc38a..a329f4de12f62 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/custom_urls.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { TIME_RANGE_TYPE } from '@kbn/ml-plugin/public/application/jobs/components/custom_url_editor/constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { TIME_RANGE_TYPE } from '../../../../../plugins/ml/public/application/jobs/components/custom_url_editor/constants';
 
-import { ECOMMERCE_INDEX_PATTERN } from '../index';
+import { ECOMMERCE_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts
index 7f9da26466414..88759715a36e8 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/geographic_data.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
+import { ML_JOB_FIELD_TYPES } from '@kbn/ml-plugin/common/constants/field_types';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
 
-import { ECOMMERCE_INDEX_PATTERN, LOGS_INDEX_PATTERN } from '../index';
+import { ECOMMERCE_INDEX_PATTERN, LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
   const elasticChart = getService('elasticChart');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts
index e1859c5ae0a76..8e58a1db85182 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/mapping_anomalies.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
-import { LOGS_INDEX_PATTERN } from '../index';
+import { LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
   const header = getPageObject('header');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts
index 23ef7ce03ce09..dd1f5f222c8de 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/anomaly_detection/population_analysis.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { Job, Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
 
-import { LOGS_INDEX_PATTERN } from '../index';
+import { LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const elasticChart = getService('elasticChart');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts
index ba78775a3a2d5..3912e3919e914 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/classification.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import { FLIGHTS_INDEX_PATTERN } from '../index';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
+import { FLIGHTS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts
index 0571535432ef7..d46900cd8bb3f 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/outlier_detection.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import { LOGS_INDEX_PATTERN } from '../index';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
+import { LOGS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts
index 9b9f5f7a29b31..ea59c68088363 100644
--- a/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts
+++ b/x-pack/test/screenshot_creation/apps/ml_docs/data_frame_analytics/regression.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
+import { DataFrameAnalyticsConfig } from '@kbn/ml-plugin/public/application/data_frame_analytics/common';
+import { DeepPartial } from '@kbn/ml-plugin/common/types/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
-import { FLIGHTS_INDEX_PATTERN } from '../index';
-import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
-import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
+import { FLIGHTS_INDEX_PATTERN } from '..';
 
 export default function ({ getService }: FtrProviderContext) {
   const ml = getService('ml');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts
index a534da5b2572b..b87f43f73ed2e 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts
@@ -14,7 +14,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
   const searchSessions = getService('searchSessions');
 
   describe('Dashboard', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts
index d06d5d5ebd6ab..6a13dc268b705 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts
@@ -13,7 +13,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
   const PageObjects = getPageObjects(['common']);
 
   describe('Search session sharing', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts
index 31fcb61cf2278..1f8d219674428 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts
@@ -14,7 +14,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
   const searchSessions = getService('searchSessions');
 
   describe('Discover', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts b/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts
index c559af88fd9d9..5e45db7bd7233 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts
@@ -12,7 +12,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('lens search sessions', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts
index d1e3d9408c0ca..b72d8db06a1d8 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts
@@ -12,7 +12,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('search sessions management', function () {
-    this.tags('ciGroup3');
+    this.tags('ciGroup5');
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts b/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts
index f3df8aca222a9..3fe195595d0ff 100644
--- a/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts
+++ b/x-pack/test/security_api_integration/fixtures/audit/audit_log/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup } from 'src/core/server';
+import { Plugin, CoreSetup } from '@kbn/core/server';
 
 export class AuditTrailTestPlugin implements Plugin {
   public setup(core: CoreSetup) {
diff --git a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts
index cbee55f2066c7..b5a6123de4398 100644
--- a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts
+++ b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import type { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (): Plugin => ({
diff --git a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts
index eb30d1c3d95f3..81c2e1cb03f49 100644
--- a/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts
+++ b/x-pack/test/security_api_integration/fixtures/oidc/oidc_provider/server/init_routes.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { IRouter } from '../../../../../../../src/core/server';
+import type { IRouter } from '@kbn/core/server';
 import { createTokens } from '../../oidc_tools';
 
 export function initRoutes(router: IRouter) {
diff --git a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts
index 280d79f3b202b..5558cceea2572 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts
+++ b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import type { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (): Plugin => ({
diff --git a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts
index 6d2a8c7b4b529..aee93b1dc7137 100644
--- a/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts
+++ b/x-pack/test/security_api_integration/fixtures/saml/saml_provider/server/init_routes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from '../../../../../../../src/core/server';
+import { CoreSetup } from '@kbn/core/server';
 import { getSAMLResponse, getSAMLRequestId } from '../../saml_tools';
 
 export function initRoutes(core: CoreSetup) {
diff --git a/x-pack/test/security_api_integration/session_idle.config.ts b/x-pack/test/security_api_integration/session_idle.config.ts
index ee1fe3782a42a..0c78327c044eb 100644
--- a/x-pack/test/security_api_integration/session_idle.config.ts
+++ b/x-pack/test/security_api_integration/session_idle.config.ts
@@ -51,6 +51,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
             saml_disable: { order: 3, realm: 'saml1', session: { idleTimeout: 0 } },
           },
         })}`,
+        // Exclude Uptime tasks to not interfere (additional ES load) with the session cleanup task.
+        `--xpack.task_manager.unsafe.exclude_task_types=${JSON.stringify(['UPTIME:*'])}`,
       ],
     },
 
diff --git a/x-pack/test/security_api_integration/session_lifespan.config.ts b/x-pack/test/security_api_integration/session_lifespan.config.ts
index e236cbb8484d4..bc3ef851ceeca 100644
--- a/x-pack/test/security_api_integration/session_lifespan.config.ts
+++ b/x-pack/test/security_api_integration/session_lifespan.config.ts
@@ -51,6 +51,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
             saml_disable: { order: 3, realm: 'saml1', session: { lifespan: 0 } },
           },
         })}`,
+        // Exclude Uptime tasks to not interfere (additional ES load) with the session cleanup task.
+        `--xpack.task_manager.unsafe.exclude_task_types=${JSON.stringify(['UPTIME:*'])}`,
       ],
     },
 
diff --git a/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts b/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts
index 0836897bb3f00..5439964a26838 100644
--- a/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts
+++ b/x-pack/test/security_api_integration/tests/login_selector/basic_functionality.ts
@@ -11,7 +11,7 @@ import { resolve } from 'path';
 import url from 'url';
 import { CA_CERT_PATH } from '@kbn/dev-utils';
 import expect from '@kbn/expect';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common/model';
 import { getStateAndNonce } from '../../fixtures/oidc/oidc_tools';
 import {
   getMutualAuthenticationResponseToken,
diff --git a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
index 1668d9bc1b811..c5639c26b8af4 100644
--- a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
@@ -9,7 +9,7 @@ import { parse as parseCookie, Cookie } from 'tough-cookie';
 import { setTimeout as setTimeoutAsync } from 'timers/promises';
 import expect from '@kbn/expect';
 import { adminTestUser } from '@kbn/test';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common';
 import { getSAMLRequestId, getSAMLResponse } from '../../fixtures/saml/saml_tools';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -76,8 +76,7 @@ export default function ({ getService }: FtrProviderContext) {
     return cookie;
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/121482
-  describe.skip('Session Idle cleanup', () => {
+  describe('Session Idle cleanup', () => {
     beforeEach(async () => {
       await es.cluster.health({ index: '.kibana_security_session*', wait_for_status: 'green' });
       await esDeleteAllIndices('.kibana_security_session*');
diff --git a/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts b/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts
index c8149cfca8a11..a4c70fc2dd54c 100644
--- a/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts
+++ b/x-pack/test/security_api_integration/tests/session_invalidate/invalidate.ts
@@ -8,7 +8,7 @@
 import { parse as parseCookie, Cookie } from 'tough-cookie';
 import expect from '@kbn/expect';
 import { adminTestUser } from '@kbn/test';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common/model';
 import { getSAMLRequestId, getSAMLResponse } from '../../fixtures/saml/saml_tools';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
index 59c5878f01cab..f39e43856415b 100644
--- a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
@@ -9,7 +9,7 @@ import { parse as parseCookie, Cookie } from 'tough-cookie';
 import { setTimeout as setTimeoutAsync } from 'timers/promises';
 import expect from '@kbn/expect';
 import { adminTestUser } from '@kbn/test';
-import type { AuthenticationProvider } from '../../../../plugins/security/common/model';
+import type { AuthenticationProvider } from '@kbn/security-plugin/common/model';
 import { getSAMLRequestId, getSAMLResponse } from '../../fixtures/saml/saml_tools';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
diff --git a/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx b/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx
index 745a8852968c0..3cb36e7c1fe78 100644
--- a/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx
+++ b/x-pack/test/security_functional/fixtures/common/test_endpoints/public/plugin.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CoreSetup, Plugin } from 'src/core/public';
+import type { CoreSetup, Plugin } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { debounce, filter, first } from 'rxjs/operators';
diff --git a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts
index d06a8c1059b49..43b634048d8cd 100644
--- a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts
+++ b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PluginInitializer, Plugin } from '../../../../../../../src/core/server';
+import { PluginInitializer, Plugin } from '@kbn/core/server';
 import { initRoutes } from './init_routes';
 
 export const plugin: PluginInitializer<void, void> = (initializerContext): Plugin => ({
diff --git a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts
index 443858287cf81..951ca0b755758 100644
--- a/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts
+++ b/x-pack/test/security_functional/fixtures/common/test_endpoints/server/init_routes.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { errors } from '@elastic/elasticsearch';
-import { CoreSetup, PluginInitializerContext } from '../../../../../../../src/core/server';
+import { CoreSetup, PluginInitializerContext } from '@kbn/core/server';
 
 export function initRoutes(initializerContext: PluginInitializerContext, core: CoreSetup) {
   const logger = initializerContext.logger.get();
diff --git a/x-pack/test/security_solution_cypress/cases_cli_config.ts b/x-pack/test/security_solution_cypress/cases_cli_config.ts
new file mode 100644
index 0000000000000..90fec2404e6f0
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/cases_cli_config.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+import { SecuritySolutionCypressCliCasesTestRunner } from './runner';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const securitySolutionCypressConfig = await readConfigFile(require.resolve('./config.ts'));
+  return {
+    ...securitySolutionCypressConfig.getAll(),
+
+    testRunner: SecuritySolutionCypressCliCasesTestRunner,
+  };
+}
diff --git a/x-pack/test/security_solution_cypress/runner.ts b/x-pack/test/security_solution_cypress/runner.ts
index b537be4e80b41..21404b8b2e47f 100644
--- a/x-pack/test/security_solution_cypress/runner.ts
+++ b/x-pack/test/security_solution_cypress/runner.ts
@@ -38,6 +38,33 @@ export async function SecuritySolutionCypressCliTestRunner({ getService }: FtrPr
   });
 }
 
+export async function SecuritySolutionCypressCliCasesTestRunner({
+  getService,
+}: FtrProviderContext) {
+  const log = getService('log');
+  const config = getService('config');
+  const esArchiver = getService('esArchiver');
+
+  await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat');
+
+  await withProcRunner(log, async (procs) => {
+    await procs.run('cypress', {
+      cmd: 'yarn',
+      args: ['cypress:run:cases'],
+      cwd: resolve(__dirname, '../../plugins/security_solution'),
+      env: {
+        FORCE_COLOR: '1',
+        CYPRESS_BASE_URL: Url.format(config.get('servers.kibana')),
+        CYPRESS_ELASTICSEARCH_URL: Url.format(config.get('servers.elasticsearch')),
+        CYPRESS_ELASTICSEARCH_USERNAME: config.get('servers.elasticsearch.username'),
+        CYPRESS_ELASTICSEARCH_PASSWORD: config.get('servers.elasticsearch.password'),
+        ...process.env,
+      },
+      wait: true,
+    });
+  });
+}
+
 export async function SecuritySolutionCypressCliFirefoxTestRunner({
   getService,
 }: FtrProviderContext) {
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 3a49278bd21a8..368783b0efd1c 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
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 import {
@@ -13,7 +14,6 @@ import {
   deleteAllDocsFromMetadataCurrentIndex,
   deleteAllDocsFromMetadataUnitedIndex,
 } from '../../../security_solution_endpoint_api_int/apis/data_stream_helper';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'endpoint', 'header', 'endpointPageUtils']);
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
index b27dc32725f03..60d7052984166 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
@@ -6,13 +6,13 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../../common/services/security_solution';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const PageObjects = getPageObjects(['security', 'endpoint', 'detections', 'hosts']);
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
index 70d60ba5c1b67..e57895f4f32b7 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getRegistryUrl as getRegistryUrlFromIngest } from '../../../../plugins/fleet/server';
+import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
   isRegistryEnabled,
@@ -16,6 +16,7 @@ export default function (providerContext: FtrProviderContext) {
   const { loadTestFile, getService } = providerContext;
 
   describe('endpoint', function () {
+    this.tags('ciGroup7');
     const ingestManager = getService('ingestManager');
     const log = getService('log');
     const endpointTestResources = getService('endpointTestResources');
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 cd56755192fa0..9bf6a19b4a589 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
@@ -6,10 +6,10 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { popupVersionsMap } from '@kbn/security-solution-plugin/public/management/pages/policy/view/policy_forms/protections/popup_options_to_versions';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
-import { popupVersionsMap } from '../../../../plugins/security_solution/public/management/pages/policy/view/policy_forms/protections/popup_options_to_versions';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const browser = getService('browser');
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
index 9476d20ccb4b0..7f2357cebb2c6 100644
--- 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
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { IndexedHostsAndAlertsResponse } from '../../../../plugins/security_solution/common/endpoint/index_data';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'trustedApps']);
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 f0c0de05b5460..d4e2479d24bc7 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function EndpointPageProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts b/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
index 81e868c5a38cb..b068ba59940a4 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-import { INTEGRATIONS_PLUGIN_ID } from '../../../plugins/fleet/common';
+import { INTEGRATIONS_PLUGIN_ID } from '@kbn/fleet-plugin/common';
 
 // NOTE: import path below should be the deep path to the actual module - else we get CI errors
-import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths';
+import { pagePathGetters } from '@kbn/fleet-plugin/public/constants/page_paths';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function FleetIntegrations({ getService, getPageObjects }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint.ts b/x-pack/test/security_solution_endpoint/services/endpoint.ts
index 2fd03ca51e346..27dcd67c6d684 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint.ts
@@ -7,22 +7,22 @@
 
 import { errors } from '@elastic/elasticsearch';
 import { Client } from '@elastic/elasticsearch';
-import { FtrService } from '../../functional/ftr_provider_context';
 import {
   metadataCurrentIndexPattern,
   metadataTransformPrefix,
   METADATA_UNITED_INDEX,
-} from '../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   deleteIndexedHostsAndAlerts,
   IndexedHostsAndAlertsResponse,
   indexHostsAndAlerts,
-} from '../../../plugins/security_solution/common/endpoint/index_data';
-import { TransformConfigUnion } from '../../../plugins/transform/common/types/transform';
-import { GetTransformsResponseSchema } from '../../../plugins/transform/common/api_schemas/transforms';
-import { catchAndWrapError } from '../../../plugins/security_solution/server/endpoint/utils';
-import { installOrUpgradeEndpointFleetPackage } from '../../../plugins/security_solution/common/endpoint/data_loaders/setup_fleet_for_endpoint';
-import { EndpointError } from '../../../plugins/security_solution/common/endpoint/errors';
+} from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { TransformConfigUnion } from '@kbn/transform-plugin/common/types/transform';
+import { GetTransformsResponseSchema } from '@kbn/transform-plugin/common/api_schemas/transforms';
+import { catchAndWrapError } from '@kbn/security-solution-plugin/server/endpoint/utils';
+import { installOrUpgradeEndpointFleetPackage } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/setup_fleet_for_endpoint';
+import { EndpointError } from '@kbn/security-solution-plugin/common/endpoint/errors';
+import { FtrService } from '../../functional/ftr_provider_context';
 
 export class EndpointTestResources extends FtrService {
   private readonly esClient = this.ctx.getService('es');
diff --git a/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts b/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
index f304e110df266..9c97072d1020b 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
@@ -12,13 +12,13 @@ import type {
 } from '@kbn/securitysolution-io-ts-list-types';
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { Response } from 'superagent';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/trusted_apps/constants';
+import { EndpointError } from '@kbn/security-solution-plugin/common/endpoint/errors';
+import { EVENT_FILTER_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/event_filters/constants';
+import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/host_isolation_exceptions/constants';
+import { BLOCKLISTS_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/blocklist/constants';
 import { FtrService } from '../../functional/ftr_provider_context';
-import { ExceptionsListItemGenerator } from '../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
-import { TRUSTED_APPS_EXCEPTION_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/trusted_apps/constants';
-import { EndpointError } from '../../../plugins/security_solution/common/endpoint/errors';
-import { EVENT_FILTER_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/event_filters/constants';
-import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/host_isolation_exceptions/constants';
-import { BLOCKLISTS_LIST_DEFINITION } from '../../../plugins/security_solution/public/management/pages/blocklist/constants';
 
 export interface ArtifactTestData {
   artifact: ExceptionListItemSchema;
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 a376072cddb3c..8c2e7abc6e9a4 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -6,7 +6,6 @@
  */
 
 import uuid from 'uuid';
-import { FtrProviderContext } from '../ftr_provider_context';
 import {
   CreateAgentPolicyRequest,
   CreateAgentPolicyResponse,
@@ -18,13 +17,14 @@ import {
   GetPackagePoliciesResponse,
   GetFullAgentPolicyResponse,
   GetPackagesResponse,
-} from '../../../plugins/fleet/common';
-import { policyFactory } from '../../../plugins/security_solution/common/endpoint/models/policy_config';
-import { Immutable } from '../../../plugins/security_solution/common/endpoint/types';
+} from '@kbn/fleet-plugin/common';
+import { policyFactory } from '@kbn/security-solution-plugin/common/endpoint/models/policy_config';
+import { Immutable } from '@kbn/security-solution-plugin/common/endpoint/types';
 
 // NOTE: import path below should be the deep path to the actual module - else we get CI errors
-import { pkgKeyFromPackageInfo } from '../../../plugins/fleet/public/services/pkg_key_from_package_info';
-import { EndpointError } from '../../../plugins/security_solution/common/endpoint/errors';
+import { pkgKeyFromPackageInfo } from '@kbn/fleet-plugin/public/services/pkg_key_from_package_info';
+import { EndpointError } from '@kbn/security-solution-plugin/common/endpoint/errors';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 const INGEST_API_ROOT = '/api/fleet';
 const INGEST_API_AGENT_POLICIES = `${INGEST_API_ROOT}/agent_policies`;
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts b/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts
index 63e9430679f80..d6d759d3830f5 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/data_stream_helper.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { AGENTS_INDEX } from '../../../plugins/fleet/common';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
 import {
   metadataIndexPattern,
   eventsIndexPattern,
@@ -16,7 +16,7 @@ import {
   telemetryIndexPattern,
   METADATA_UNITED_INDEX,
   METADATA_DATASTREAM,
-} from '../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
 
 export function deleteDataStream(getService: (serviceName: 'es') => Client, index: string) {
   const client = getService('es');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
index 5f58eb40c0956..68b2cef5b1319 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
@@ -8,14 +8,14 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services//endpoint_artifacts';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
-} from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
+} from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   createUserAndRole,
   deleteUserAndRole,
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
index 8ef3aaf9509dd..517c090605a85 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
@@ -8,20 +8,20 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
+import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import {
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
 import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
-import { BY_POLICY_ARTIFACT_TAG_PREFIX } from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../../common/services/security_solution';
-import {
-  getImportExceptionsListSchemaMock,
-  toNdJsonString,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
index 5e1166d03f0d5..acbc72b479544 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
@@ -8,23 +8,23 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
-} from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
+} from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import {
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../../common/services/security_solution';
-import {
-  getImportExceptionsListSchemaMock,
-  toNdJsonString,
-} from '../../../../plugins/lists/common/schemas/request/import_exceptions_schema.mock';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
 
 export default function ({ getService }: FtrProviderContext) {
   const USER = ROLES.detections_admin;
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
index 60b479c5b37d9..041b0ea5794fb 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
@@ -8,14 +8,14 @@
 import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
 import { ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services//endpoint_artifacts';
 import {
   BY_POLICY_ARTIFACT_TAG_PREFIX,
   GLOBAL_ARTIFACT_TAG,
-} from '../../../../plugins/security_solution/common/endpoint/service/artifacts';
-import { ExceptionsListItemGenerator } from '../../../../plugins/security_solution/common/endpoint/data_generators/exceptions_list_item_generator';
+} from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
+import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
 import {
   createUserAndRole,
   deleteUserAndRole,
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts
index 1b9ce8911c5bf..f560103c6c862 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_authz.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { wrapErrorAndRejectPromise } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/utils';
 import { FtrProviderContext } from '../ftr_provider_context';
-import { IndexedHostsAndAlertsResponse } from '../../../plugins/security_solution/common/endpoint/index_data';
 import {
   createUserAndRole,
   deleteUserAndRole,
   ROLES,
 } from '../../common/services/security_solution';
-import { wrapErrorAndRejectPromise } from '../../../plugins/security_solution/common/endpoint/data_loaders/utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const endpointTestResources = getService('endpointTestResources');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/index.ts b/x-pack/test/security_solution_endpoint_api_int/apis/index.ts
index 94a5a9122f187..3c98b703aed55 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/index.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/index.ts
@@ -5,14 +5,16 @@
  * 2.0.
  */
 
+import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { isRegistryEnabled, getRegistryUrlFromTestEnv } from '../registry';
-import { getRegistryUrl as getRegistryUrlFromIngest } from '../../../plugins/fleet/server';
 
 export default function endpointAPIIntegrationTests(providerContext: FtrProviderContext) {
   const { loadTestFile, getService } = providerContext;
 
   describe('Endpoint plugin', function () {
+    this.tags('ciGroup9');
+
     const ingestManager = getService('ingestManager');
 
     const log = getService('log');
@@ -27,7 +29,7 @@ export default function endpointAPIIntegrationTests(providerContext: FtrProvider
     before(async () => {
       await ingestManager.setup();
     });
-    loadTestFile(require.resolve('./resolver/index'));
+    loadTestFile(require.resolve('./resolver'));
     loadTestFile(require.resolve('./metadata'));
     loadTestFile(require.resolve('./policy'));
     loadTestFile(require.resolve('./package'));
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
index 86c8e32f3bdf9..9b023e6992385 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
@@ -8,7 +8,18 @@
 import uuid from 'uuid';
 import expect from '@kbn/expect';
 import { TransformGetTransformStatsTransformStats } from '@elastic/elasticsearch/lib/api/types';
-import { FtrProviderContext } from '../ftr_provider_context';
+import {
+  METADATA_DATASTREAM,
+  HOST_METADATA_LIST_ROUTE,
+  METADATA_UNITED_INDEX,
+  METADATA_UNITED_TRANSFORM,
+  METADATA_TRANSFORMS_STATUS_ROUTE,
+  metadataTransformPrefix,
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
+import { indexFleetEndpointPolicy } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/index_fleet_endpoint_policy';
+import { TRANSFORM_STATES } from '@kbn/security-solution-plugin/common/constants';
+import { generateAgentDocs, generateMetadataDocs } from './metadata.fixtures';
 import {
   deleteAllDocsFromMetadataCurrentIndex,
   deleteAllDocsFromMetadataDatastream,
@@ -20,18 +31,7 @@ import {
   deleteAllDocsFromIndex,
   bulkIndex,
 } from './data_stream_helper';
-import {
-  METADATA_DATASTREAM,
-  HOST_METADATA_LIST_ROUTE,
-  METADATA_UNITED_INDEX,
-  METADATA_UNITED_TRANSFORM,
-  METADATA_TRANSFORMS_STATUS_ROUTE,
-  metadataTransformPrefix,
-} from '../../../plugins/security_solution/common/endpoint/constants';
-import { AGENTS_INDEX } from '../../../plugins/fleet/common';
-import { generateAgentDocs, generateMetadataDocs } from './metadata.fixtures';
-import { indexFleetEndpointPolicy } from '../../../plugins/security_solution/common/endpoint/data_loaders/index_fleet_endpoint_policy';
-import { TRANSFORM_STATES } from '../../../plugins/security_solution/common/constants';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
index db993d8c47205..9df605fa32a04 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts
@@ -9,12 +9,12 @@ import expect from '@kbn/expect';
 import {
   ResolverPaginatedEvents,
   SafeEndpointEvent,
-} from '../../../plugins/security_solution/common/endpoint/types';
-import { eventsIndexPattern } from '../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/types';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   EndpointDocGenerator,
   Event,
-} from '../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { InsertedEvents, processEventsIndex } from '../services/resolver';
 import { deleteEventsStream } from './data_stream_helper';
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
index 7c8c73c2771c3..6c1ee98a153e4 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
@@ -7,27 +7,27 @@
 
 import _ from 'lodash';
 import expect from '@kbn/expect';
-import { firstNonNullValue } from '../../../../plugins/security_solution/common/endpoint/models/ecs_safety_helpers';
-import { NodeID } from '../../../../plugins/security_solution/server/endpoint/routes/resolver/tree/utils';
+import { firstNonNullValue } from '@kbn/security-solution-plugin/common/endpoint/models/ecs_safety_helpers';
+import { NodeID } from '@kbn/security-solution-plugin/server/endpoint/routes/resolver/tree/utils';
 import {
   SafeResolverEvent,
   ResolverNode,
   ResolverSchema,
-} from '../../../../plugins/security_solution/common/endpoint/types';
+} from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   parentEntityIDSafeVersion,
   entityIDSafeVersion,
   eventIDSafeVersion,
   timestampSafeVersion,
   timestampAsDateSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
 import {
   Event,
   Tree,
   TreeNode,
   RelatedEventInfo,
   categoryMapping,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
 
 /**
  * Schema used for the /tree api post requests that uses the ancestry
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts
index 2c9269c76ddb7..268f67a30a918 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
-import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants';
-import { ResolverEntityIndex } from '../../../../plugins/security_solution/common/endpoint/types';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
+import { ResolverEntityIndex } from '@kbn/security-solution-plugin/common/endpoint/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts
index e75a3460c6af2..6cf74092caf9e 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity_id.ts
@@ -9,17 +9,17 @@ import expect from '@kbn/expect';
 import {
   entityIDSafeVersion,
   timestampAsDateSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
-import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   ResolverEntityIndex,
   ResolverNode,
-} from '../../../../plugins/security_solution/common/endpoint/types';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   EndpointDocGenerator,
   Event,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { InsertedEvents, processEventsIndex } from '../../services/resolver';
 import { createAncestryArray, schemaWithAncestry } from './common';
 
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
index 81299e1cc7e2b..10cac58533b24 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
@@ -7,18 +7,18 @@
 
 import expect from '@kbn/expect';
 import { JsonObject } from '@kbn/utility-types';
-import { eventsIndexPattern } from '../../../../plugins/security_solution/common/endpoint/constants';
+import { eventsIndexPattern } from '@kbn/security-solution-plugin/common/endpoint/constants';
 import {
   eventIDSafeVersion,
   parentEntityIDSafeVersion,
   timestampAsDateSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
-import { ResolverPaginatedEvents } from '../../../../plugins/security_solution/common/endpoint/types';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
+import { ResolverPaginatedEvents } from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   Tree,
   RelatedEventCategory,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { Options, GeneratedTrees } from '../../services/resolver';
 import { compareArrays } from './common';
 
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
index 1da80619cdcc7..e4838b49f7ca1 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
@@ -6,17 +6,17 @@
  */
 
 import expect from '@kbn/expect';
-import { getNameField } from '../../../../plugins/security_solution/server/endpoint/routes/resolver/tree/utils/fetch';
-import { ResolverNode } from '../../../../plugins/security_solution/common/endpoint/types';
+import { getNameField } from '@kbn/security-solution-plugin/server/endpoint/routes/resolver/tree/utils/fetch';
+import { ResolverNode } from '@kbn/security-solution-plugin/common/endpoint/types';
 import {
   parentEntityIDSafeVersion,
   timestampSafeVersion,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
-import { FtrProviderContext } from '../../ftr_provider_context';
+} from '@kbn/security-solution-plugin/common/endpoint/models/event';
 import {
   Tree,
   RelatedEventCategory,
-} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { Options, GeneratedTrees } from '../../services/resolver';
 import { schemaWithAncestry, schemaWithName, schemaWithoutAncestry, verifyTree } from './common';
 
diff --git a/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts b/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts
index 586de1f1276ee..3c744390dd146 100644
--- a/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/services/resolver.ts
@@ -10,8 +10,8 @@ import {
   Tree,
   EndpointDocGenerator,
   Event,
-} from '../../../plugins/security_solution/common/endpoint/generate_data';
-import { firstNonNullValue } from '../../../plugins/security_solution/common/endpoint/models/ecs_safety_helpers';
+} from '@kbn/security-solution-plugin/common/endpoint/generate_data';
+import { firstNonNullValue } from '@kbn/security-solution-plugin/common/endpoint/models/ecs_safety_helpers';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export const processEventsIndex = 'logs-endpoint.events.process-default';
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts b/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
index 88c168b6f6297..1b54ea67554fa 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
+++ b/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup } from 'kibana/server';
+import { CoreSetup } from '@kbn/core/server';
 
 export class Plugin {
   constructor() {}
diff --git a/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts b/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts
index a4ce22c6c010c..b7e698244ee29 100644
--- a/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts
+++ b/x-pack/test/spaces_api_integration/common/lib/space_test_utils.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Client } from '@elastic/elasticsearch';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 
 export function getUrlPrefix(spaceId?: string) {
   return spaceId && spaceId !== DEFAULT_SPACE_ID ? `/s/${spaceId}` : ``;
diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
index bd343cad737aa..72997ead35683 100644
--- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -9,8 +9,8 @@ import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { EsArchiver } from '@kbn/es-archiver';
 import type { Client } from '@elastic/elasticsearch';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { CopyResponse } from '../../../../plugins/spaces/server/lib/copy_to_spaces';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+import { CopyResponse } from '@kbn/spaces-plugin/server/lib/copy_to_spaces';
 import { getAggregatedSpaceData, getUrlPrefix } from '../lib/space_test_utils';
 import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
diff --git a/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts b/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts
index e99d9b46b8963..f9d1fe6b97236 100644
--- a/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/disable_legacy_url_aliases.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import type { Client } from '@elastic/elasticsearch';
-import { LegacyUrlAlias } from 'src/core/server/saved_objects/object_types';
+import { LegacyUrlAlias } from '@kbn/core/server/saved_objects/object_types';
 import { SPACES } from '../lib/spaces';
 import { getUrlPrefix } from '../../../saved_object_api_integration/common/lib/saved_object_test_utils';
 import {
diff --git a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
index 65afaf38f48a9..0030932f3f36a 100644
--- a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
@@ -11,7 +11,7 @@ import { SuperTest } from 'supertest';
 import {
   SavedObjectsCollectMultiNamespaceReferencesResponse,
   SavedObjectReferenceWithContext,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 import { MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import {
diff --git a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
index 75aea0a3fe4e0..f74434f72227e 100644
--- a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
@@ -8,9 +8,9 @@
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { EsArchiver } from '@kbn/es-archiver';
-import { SavedObject } from 'src/core/server';
-import { DEFAULT_SPACE_ID } from '../../../../plugins/spaces/common/constants';
-import { CopyResponse } from '../../../../plugins/spaces/server/lib/copy_to_spaces';
+import { SavedObject } from '@kbn/core/server';
+import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
+import { CopyResponse } from '@kbn/spaces-plugin/server/lib/copy_to_spaces';
 import { getUrlPrefix } from '../lib/space_test_utils';
 import { DescribeFn, TestDefinitionAuthentication } from '../lib/types';
 
diff --git a/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts b/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts
index 3b795ae719db8..5528ceaa27602 100644
--- a/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts
@@ -13,7 +13,7 @@ import { SuperTest } from 'supertest';
 import {
   SavedObjectsErrorHelpers,
   SavedObjectsUpdateObjectsSpacesResponse,
-} from '../../../../../src/core/server';
+} from '@kbn/core/server';
 import { SPACES } from '../lib/spaces';
 import {
   expectResponses,
diff --git a/x-pack/test/timeline/common/config.ts b/x-pack/test/timeline/common/config.ts
index 75f0eb24a6cd9..7b0e02aec7efb 100644
--- a/x-pack/test/timeline/common/config.ts
+++ b/x-pack/test/timeline/common/config.ts
@@ -57,7 +57,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     };
 
     return {
-      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
+      testFiles,
       servers,
       services,
       junit: {
diff --git a/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts b/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts
index 1e9cfe3eb841b..828be46bd484a 100644
--- a/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts
+++ b/x-pack/test/timeline/security_and_spaces/tests/basic/events.ts
@@ -9,8 +9,12 @@ import { JsonObject } from '@kbn/utility-types';
 import expect from '@kbn/expect';
 import { ALERT_UUID, ALERT_RULE_CONSUMER } from '@kbn/rule-data-utils';
 
+import { TimelineEdges, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
+import {
+  Direction,
+  TimelineEventsQueries,
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { User } from '../../../../rule_registry/common/lib/authentication/types';
-import { TimelineEdges, TimelineNonEcsData } from '../../../../../plugins/timelines/common/';
 import { getSpaceUrlPrefix } from '../../../../rule_registry/common/lib/authentication/spaces';
 
 import {
@@ -33,10 +37,6 @@ import {
   secOnlySpacesAll,
   noKibanaPrivileges,
 } from '../../../../rule_registry/common/lib/authentication/users';
-import {
-  Direction,
-  TimelineEventsQueries,
-} from '../../../../../plugins/security_solution/common/search_strategy';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 interface TestCase {
diff --git a/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts b/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
index a9ba7bd908a9e..7b2ea3d2cc1b7 100644
--- a/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
+++ b/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
@@ -11,8 +11,12 @@ import { JsonObject } from '@kbn/utility-types';
 import expect from '@kbn/expect';
 import { ALERT_RULE_CONSUMER } from '@kbn/rule-data-utils';
 
+import { TimelineEdges, TimelineNonEcsData } from '@kbn/timelines-plugin/common';
+import {
+  Direction,
+  TimelineEventsQueries,
+} from '@kbn/security-solution-plugin/common/search_strategy';
 import { User } from '../../../../rule_registry/common/lib/authentication/types';
-import { TimelineEdges, TimelineNonEcsData } from '../../../../../plugins/timelines/common/';
 import { getSpaceUrlPrefix } from '../../../../rule_registry/common/lib/authentication/spaces';
 
 import {
@@ -22,10 +26,6 @@ import {
   obsMinReadSpacesAll,
   superUser,
 } from '../../../../rule_registry/common/lib/authentication/users';
-import {
-  Direction,
-  TimelineEventsQueries,
-} from '../../../../../plugins/security_solution/common/search_strategy';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 class FileWrapper {
diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
index 2adbb0509e822..619823d55d3aa 100644
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/public';
+import { CoreSetup, Plugin } from '@kbn/core/public';
 export const plugin = () => new FooPlugin();
 
 class FooPlugin implements Plugin {
diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
index 3c72e118e7217..7bb8b446dcc79 100644
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { CoreSetup, Plugin } from 'src/core/server';
-import { PluginSetupContract as FeaturesPluginSetupContract } from '../../../../../../../plugins/features/server';
+import { CoreSetup, Plugin } from '@kbn/core/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '@kbn/features-plugin/server';
 
 export const plugin = () => new FooPlugin();
 
diff --git a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
index 45d83eb1d9e8e..2c8db86386bac 100644
--- a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
+++ b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
@@ -6,7 +6,7 @@
  */
 
 import axios, { AxiosInstance } from 'axios';
-import type { Capabilities as UICapabilities } from 'src/core/types';
+import type { Capabilities as UICapabilities } from '@kbn/core/types';
 import { format as formatUrl } from 'url';
 import util from 'util';
 import { ToolingLog } from '@kbn/dev-utils';
diff --git a/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts b/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts
index 19a3499b9c87c..98e31129a3ccd 100644
--- a/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts
+++ b/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/common';
 
 export default function ({
   getPageObjects,
diff --git a/x-pack/test/upgrade/reporting_services.ts b/x-pack/test/upgrade/reporting_services.ts
index 2de3b72bc9a47..2467cee0ad822 100644
--- a/x-pack/test/upgrade/reporting_services.ts
+++ b/x-pack/test/upgrade/reporting_services.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { indexTimestamp } from '../../plugins/reporting/server/lib/store/index_timestamp';
+import { indexTimestamp } from '@kbn/reporting-plugin/server/lib/store/index_timestamp';
 import { services as xpackServices } from '../functional/services';
 import { services as apiIntegrationServices } from '../api_integration/services';
 import { FtrProviderContext } from './ftr_provider_context';
diff --git a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
index 635cb8e288ae1..b8f689edb6a31 100644
--- a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
+++ b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
@@ -7,9 +7,9 @@
 
 import expect from '@kbn/expect';
 
-import { ReindexStatus, REINDEX_OP_TYPE } from '../../../plugins/upgrade_assistant/common/types';
-import { generateNewIndexName } from '../../../plugins/upgrade_assistant/server/lib/reindexing/index_settings';
-import { getIndexState } from '../../../plugins/upgrade_assistant/common/get_index_state';
+import { ReindexStatus, REINDEX_OP_TYPE } from '@kbn/upgrade-assistant-plugin/common/types';
+import { generateNewIndexName } from '@kbn/upgrade-assistant-plugin/server/lib/reindexing/index_settings';
+import { getIndexState } from '@kbn/upgrade-assistant-plugin/common/get_index_state';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts b/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts
index ff1e89b58c7e8..91029671c596a 100644
--- a/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts
+++ b/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts
@@ -5,19 +5,16 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
-import { first } from 'rxjs/operators';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 import './types';
+import { firstValueFrom } from 'rxjs';
 
 export class ApplicationUsageTest implements Plugin {
   public setup(core: CoreSetup) {}
 
   public start(core: CoreStart) {
-    core.application.applications$
-      .pipe(first())
-      .toPromise()
-      .then((applications) => {
-        window.__applicationIds__ = [...applications.keys()];
-      });
+    firstValueFrom(core.application.applications$).then((applications) => {
+      window.__applicationIds__ = [...applications.keys()];
+    });
   }
 }
diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json b/x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json
index e625acbc569cf..02a6929fb8539 100644
--- a/x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json
+++ b/x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json
@@ -7,5 +7,8 @@
     "public/**/*.ts",
     "public/**/*.tsx",
   ],
-  "exclude": []
+  "exclude": [],
+  "references": [
+    { "path": "../../../../../src/core/tsconfig.json" },
+  ]
 }
diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts
index 63321649aeea7..22f9f2504fd2a 100644
--- a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts
+++ b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Plugin, CoreSetup, CoreStart } from 'kibana/public';
+import { Plugin, CoreSetup, CoreStart } from '@kbn/core/public';
 import './types';
 
 export class StackManagementUsageTest implements Plugin {
diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts
index a39cbfac02428..557558b5b827d 100644
--- a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts
+++ b/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
+import { IUiSettingsClient } from '@kbn/core/public';
 export {}; // Hack to declare this file as a module so TS allows us to extend the Global Window interface
 
 declare global {
diff --git a/x-pack/test/usage_collection/test_suites/application_usage/index.ts b/x-pack/test/usage_collection/test_suites/application_usage/index.ts
index fc53c8ddf5ed3..4b41aada9ad29 100644
--- a/x-pack/test/usage_collection/test_suites/application_usage/index.ts
+++ b/x-pack/test/usage_collection/test_suites/application_usage/index.ts
@@ -6,8 +6,8 @@
  */
 
 import expect from '@kbn/expect';
+import { applicationUsageSchema } from '@kbn/kibana-usage-collection-plugin/server/collectors/application_usage/schema';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { applicationUsageSchema } from '../../../../../src/plugins/kibana_usage_collection/server/collectors/application_usage/schema';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Application Usage', function () {
diff --git a/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts b/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts
index 3bcf6f6384fd1..dac552220f7c1 100644
--- a/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts
+++ b/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts
@@ -6,8 +6,8 @@
  */
 
 import _ from 'lodash';
+import { stackManagementSchema } from '@kbn/kibana-usage-collection-plugin/server/collectors/management/schema';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { stackManagementSchema } from '../../../../../src/plugins/kibana_usage_collection/server/collectors/management/schema';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   // FLAKY: https://github.com/elastic/kibana/issues/119038
diff --git a/yarn.lock b/yarn.lock
index bf1639a09b849..70460f4c8d036 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -270,7 +270,7 @@
   dependencies:
     "@babel/types" "^7.17.0"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.7.0":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
   integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
@@ -646,7 +646,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-jsx@^7.12.1", "@babel/plugin-syntax-jsx@^7.16.7", "@babel/plugin-syntax-jsx@^7.2.0":
+"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.16.7", "@babel/plugin-syntax-jsx@^7.2.0":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665"
   integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==
@@ -1228,21 +1228,21 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.16.2.tgz#05dd7f06659759fda30f87b15534f1e42f1201bb"
   integrity sha512-KgqAWMH0emL6f3xH6nqyTryoBMqlJ627LBIe9PT1PRRQPz2FtHib3FIHJPukp1slzF3hJYZvdiVwgPnHbaSOOA==
 
-"@bazel/typescript@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-5.3.1.tgz#f996abebfa57a29a170a83d0c84780286f06cb72"
-  integrity sha512-fP0fGzLbsOVdbAn6mlrX1LBAT0TJ+S0VVOap9SSSXCb2PknnKEHZupUww/raVSczy+cqcd/Vfpllzm/AcdOmyw==
+"@bazel/typescript@4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.6.2.tgz#9f07b6f8cfb6b0a0e228e5971de412911c910a90"
+  integrity sha512-AUF7kq82bP6DX9Brihr/eQqvNccxVfSXosFxt80h94og5cmMyoc/euXha6rxlOBP3yWXmSo+/qjzO7o8PWJduQ==
   dependencies:
-    "@bazel/worker" "5.3.1"
+    "@bazel/worker" "4.6.2"
     protobufjs "6.8.8"
     semver "5.6.0"
     source-map-support "0.5.9"
     tsutils "3.21.0"
 
-"@bazel/worker@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.3.1.tgz#87d850fdfc22cde24f380961f66daa5cbfd4acf7"
-  integrity sha512-KB+Xs198NLhN01zhlOPr/VEmz/tzwGq/pI1gdnCTLDMTCspV6LnJaIeGgicXuKrzz0V1LhvlvsI5lqJt9yuGYw==
+"@bazel/worker@4.6.2":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-4.6.2.tgz#0bd105344533335327c2edfa3fc65b04c39cdea8"
+  integrity sha512-DLpN6iQAH6uiUraAs4CESyqs60u55fcKmYgOOVObGuLSQQuX49Lw7XRIN90NibRPwpbBDQichWE3zfra0yKTTw==
   dependencies:
     google-protobuf "^3.6.1"
 
@@ -1531,10 +1531,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@53.0.1":
-  version "53.0.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-53.0.1.tgz#82359460ae4edab3a538846b6915518cb1214848"
-  integrity sha512-fPOuDyc7adjHBp+UHOtIJTHdZVKi8MGzyuYxTRN8ZYLHbzcNTaCsogdk+0eb6u4ISRqhk3tudG8Q0znksVHt1w==
+"@elastic/eui@54.0.0":
+  version "54.0.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-54.0.0.tgz#373a50f0ebbecfbe39b86f1d87f3ba1c6f942a81"
+  integrity sha512-0qm4SoGYup0Cyb+k50heIdJ9pTIYQwA2knNWZ+UE92SzPUzAwSmhrwkiqzTqGCgB6/Kd2Ck4gzFjI+ct1njkmg==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"
@@ -1707,23 +1707,23 @@
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@emotion/babel-plugin@^11.0.0", "@emotion/babel-plugin@^11.2.0":
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.2.0.tgz#f25c6df8ec045dad5ae6ca63df0791673b98c920"
-  integrity sha512-lsnQBnl3l4wu/FJoyHnYRpHJeIPNkOBMbtDUIXcO8luulwRKZXPvA10zd2eXVN6dABIWNX4E34en/jkejIg/yA==
+"@emotion/babel-plugin@^11.2.0", "@emotion/babel-plugin@^11.7.1":
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.7.1.tgz#853fc4985d89dab0ea8e17af2858473d1b11be7e"
+  integrity sha512-K3/6Y+J/sIAjplf3uIteWLhPuOyuMNnE+iyYnTF/m294vc6IL90kTHp7y8ldZYbpKlP17rpOWDKM9DvTcrOmNQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
-    "@babel/plugin-syntax-jsx" "^7.12.1"
-    "@babel/runtime" "^7.7.2"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/plugin-syntax-jsx" "^7.12.13"
+    "@babel/runtime" "^7.13.10"
     "@emotion/hash" "^0.8.0"
     "@emotion/memoize" "^0.7.5"
-    "@emotion/serialize" "^1.0.0"
+    "@emotion/serialize" "^1.0.2"
     babel-plugin-macros "^2.6.1"
     convert-source-map "^1.5.0"
     escape-string-regexp "^4.0.0"
     find-root "^1.1.0"
     source-map "^0.5.7"
-    stylis "^4.0.3"
+    stylis "4.0.13"
 
 "@emotion/babel-preset-css-prop@^11.2.0":
   version "11.2.0"
@@ -1757,27 +1757,16 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/cache@^11.4.0":
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"
-  integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==
-  dependencies:
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.0.0"
-    "@emotion/utils" "^1.0.0"
-    "@emotion/weak-memoize" "^0.2.5"
-    stylis "^4.0.3"
-
-"@emotion/cache@^11.5.0":
-  version "11.5.0"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.5.0.tgz#a5eb78cbef8163939ee345e3ddf0af217b845e62"
-  integrity sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==
+"@emotion/cache@^11.7.1":
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
+  integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
   dependencies:
     "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.0.3"
+    "@emotion/sheet" "^1.1.0"
     "@emotion/utils" "^1.0.0"
     "@emotion/weak-memoize" "^0.2.5"
-    stylis "^4.0.10"
+    stylis "4.0.13"
 
 "@emotion/core@^10.0.9", "@emotion/core@^10.1.1":
   version "10.1.1"
@@ -1791,13 +1780,13 @@
     "@emotion/sheet" "0.9.4"
     "@emotion/utils" "0.11.3"
 
-"@emotion/css-prettifier@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/css-prettifier/-/css-prettifier-1.0.0.tgz#3ed4240d93c9798c001cedf27dd0aa960bdddd1a"
-  integrity sha512-efxSrRTiTqHTQVKW15Gz5H4pNAw8OqcG8NaiwkJIkqIdNXTD4Qr1zC1Ou6r2acd1oJJ2s56nb1ClnXMiWoj6gQ==
+"@emotion/css-prettifier@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@emotion/css-prettifier/-/css-prettifier-1.0.1.tgz#a3ce1667398e83701f52ec43938208faeef2e0a5"
+  integrity sha512-cA9Dtol47mtvWKasPC+8tkh2DS0wBkX0MMHKieXGSkGyx079V7yFY85KC0pPalcIy+vi0LbMR9DNyiJBqYgJ1Q==
   dependencies:
     "@emotion/memoize" "^0.7.4"
-    stylis "^4.0.3"
+    stylis "4.0.13"
 
 "@emotion/css@^10.0.27", "@emotion/css@^10.0.9":
   version "10.0.27"
@@ -1808,14 +1797,14 @@
     "@emotion/utils" "0.11.3"
     babel-plugin-emotion "^10.0.27"
 
-"@emotion/css@^11.4.0":
-  version "11.5.0"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.5.0.tgz#0a80017080cb44d47994fe576b9923bfc8b0f6ad"
-  integrity sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==
+"@emotion/css@^11.9.0":
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.9.0.tgz#d5aeaca5ed19fc61cbdc9e032ad0b32fa6e366be"
+  integrity sha512-S9UjCxSrxEHawOLnWw4upTwfYKb0gVQdatHejn3W9kPyXxmKv3HmjVfJ84kDLmdX8jR20OuDQwaJ4Um24qD9vA==
   dependencies:
-    "@emotion/babel-plugin" "^11.0.0"
-    "@emotion/cache" "^11.5.0"
-    "@emotion/serialize" "^1.0.0"
+    "@emotion/babel-plugin" "^11.7.1"
+    "@emotion/cache" "^11.7.1"
+    "@emotion/serialize" "^1.0.3"
     "@emotion/sheet" "^1.0.3"
     "@emotion/utils" "^1.0.0"
 
@@ -1836,16 +1825,16 @@
   dependencies:
     "@emotion/memoize" "0.7.4"
 
-"@emotion/jest@^11.3.0":
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/@emotion/jest/-/jest-11.3.0.tgz#43bed6dcb47c8691b346cee231861ebc8f9b0016"
-  integrity sha512-LZqYc3yerhic1IvAcEwBLRs1DsUt3oY7Oz6n+e+HU32iYOK/vpfzlhgmQURE94BHfv6eCOj6DV38f3jSnIkBkQ==
+"@emotion/jest@^11.9.0":
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/jest/-/jest-11.9.0.tgz#3ab2494d1b4ac63f4b61a2bb14db36d96f7ecd58"
+  integrity sha512-DgmKVpciuv2tyZiRKe7uU3Rs0djpJExTRmcjxjSPAI6zuxmpbWZMDcjazdNnAD3e8HPWG2KZy3svumFw6N283g==
   dependencies:
     "@babel/runtime" "^7.13.10"
-    "@emotion/css-prettifier" "^1.0.0"
+    "@emotion/css-prettifier" "^1.0.1"
     chalk "^4.1.0"
     specificity "^0.4.1"
-    stylis "^4.0.3"
+    stylis "4.0.13"
 
 "@emotion/memoize@0.7.4":
   version "0.7.4"
@@ -1862,16 +1851,16 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
-"@emotion/react@^11.4.0":
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.4.0.tgz#2465ad7b073a691409b88dfd96dc17097ddad9b7"
-  integrity sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==
+"@emotion/react@^11.9.0":
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.0.tgz#b6d42b1db3bd7511e7a7c4151dc8bc82e14593b8"
+  integrity sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==
   dependencies:
     "@babel/runtime" "^7.13.10"
-    "@emotion/cache" "^11.4.0"
-    "@emotion/serialize" "^1.0.2"
-    "@emotion/sheet" "^1.0.1"
-    "@emotion/utils" "^1.0.0"
+    "@emotion/babel-plugin" "^11.7.1"
+    "@emotion/cache" "^11.7.1"
+    "@emotion/serialize" "^1.0.3"
+    "@emotion/utils" "^1.1.0"
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
 
@@ -1896,10 +1885,10 @@
     "@emotion/unitless" "^0.6.7"
     "@emotion/utils" "^0.8.2"
 
-"@emotion/serialize@^1.0.0", "@emotion/serialize@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
-  integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==
+"@emotion/serialize@^1.0.2", "@emotion/serialize@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.3.tgz#99e2060c26c6292469fb30db41f4690e1c8fea63"
+  integrity sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA==
   dependencies:
     "@emotion/hash" "^0.8.0"
     "@emotion/memoize" "^0.7.4"
@@ -1912,15 +1901,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
   integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
 
-"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"
-  integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==
-
-"@emotion/sheet@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.3.tgz#00c326cd7985c5ccb8fe2c1b592886579dcfab8f"
-  integrity sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ==
+"@emotion/sheet@^1.0.3", "@emotion/sheet@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
+  integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
 
 "@emotion/styled-base@^10.0.27":
   version "10.0.31"
@@ -1975,6 +1959,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
   integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
 
+"@emotion/utils@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
+  integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
+
 "@emotion/weak-memoize@0.2.5", "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
@@ -2959,7 +2948,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/babel-code-parser@link:bazel-bin/packages/kbn-babel-code-parser":
+"@kbn/babel-plugin-synthetic-packages@link:bazel-bin/packages/kbn-babel-plugin-synthetic-packages":
   version "0.0.0"
   uid ""
 
@@ -3035,6 +3024,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/find-used-node-modules@link:bazel-bin/packages/kbn-find-used-node-modules":
+  version "0.0.0"
+  uid ""
+
 "@kbn/flot-charts@link:bazel-bin/packages/kbn-flot-charts":
   version "0.0.0"
   uid ""
@@ -3051,6 +3044,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/import-resolver@link:bazel-bin/packages/kbn-import-resolver":
+  version "0.0.0"
+  uid ""
+
 "@kbn/interpreter@link:bazel-bin/packages/kbn-interpreter":
   version "0.0.0"
   uid ""
@@ -3167,6 +3164,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/shared-ux-button-exit-full-screen@link:bazel-bin/packages/shared-ux/button/exit_full_screen":
+  version "0.0.0"
+  uid ""
+
 "@kbn/shared-ux-components@link:bazel-bin/packages/kbn-shared-ux-components":
   version "0.0.0"
   uid ""
@@ -3195,6 +3196,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/synthetic-package-map@link:bazel-bin/packages/kbn-synthetic-package-map":
+  version "0.0.0"
+  uid ""
+
 "@kbn/telemetry-tools@link:bazel-bin/packages/kbn-telemetry-tools":
   version "0.0.0"
   uid ""
@@ -5151,6 +5156,11 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
   integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
 
+"@tsd/typescript@~4.6.3":
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/@tsd/typescript/-/typescript-4.6.3.tgz#9b4c8198da7614fe1547436fbd5657cfe8327c1d"
+  integrity sha512-WjipklCf6qWQL4Hkw+FSwOXMA5JqKv04ro/c1aviYSzLJFdcFMrR/FHjOGBIEAIq7pb8Bw74wd+G45dWfC/Jnw==
+
 "@turf/along@6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.0.1.tgz#595cecdc48fc7fcfa83c940a8e3eb24d4c2e04d4"
@@ -5322,10 +5332,10 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
   integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
-  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
+"@types/babel__core@*", "@types/babel__core@^7.1.19":
+  version "7.1.19"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
+  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -5333,10 +5343,10 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
-"@types/babel__core@^7.1.19":
-  version "7.1.19"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
+  version "7.1.10"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
+  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -5351,6 +5361,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@types/babel__helper-plugin-utils@^7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.0.tgz#dcd2416f9c189d5837ab2a276368cf67134efe78"
+  integrity sha512-60YtHzhQ9HAkToHVV+TB4VLzBn9lrfgrsOjiJMtbv/c1jPdekBxaByd6DMsGBzROXWoIL6U3lEFvvbu69RkUoA==
+  dependencies:
+    "@types/babel__core" "*"
+
 "@types/babel__template@*":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
@@ -5438,14 +5455,7 @@
   resolved "https://registry.yarnpkg.com/@types/cmd-shim/-/cmd-shim-2.0.0.tgz#c3d81d3c2a51af3c65c19b4f1d493a75abf07a5c"
   integrity sha512-WuV5bOQTGxqzewPnJbrDe51I5mnX2wTRYy+PduRuIvSuBWZlxDYD6Qt/f1m5sezxx1yyE9+1wHJ/0sRuNIoFaQ==
 
-"@types/color-convert@*":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-1.9.0.tgz#bfa8203e41e7c65471e9841d7e306a7cd8b5172d"
-  integrity sha512-OKGEfULrvSL2VRbkl/gnjjgbbF7ycIlpSsX7Nkab4MOWi5XxmgBYvuiQ7lcCFY5cPDz7MUNaKgxte2VRmtr4Fg==
-  dependencies:
-    "@types/color-name" "*"
-
-"@types/color-convert@^2.0.0":
+"@types/color-convert@*", "@types/color-convert@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
   integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
@@ -5457,10 +5467,10 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"@types/color@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.0.tgz#40f8a6bf2fd86e969876b339a837d8ff1b0a6e30"
-  integrity sha512-5qqtNia+m2I0/85+pd2YzAXaTyKO8j+svirO5aN+XaQJ5+eZ8nx0jPtEWZLxCi50xwYsX10xUHetFzfb1WEs4Q==
+"@types/color@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.3.tgz#e6d8d72b7aaef4bb9fe80847c26c7c786191016d"
+  integrity sha512-X//qzJ3d3Zj82J9sC/C18ZY5f43utPbAJ6PhYt/M7uG6etcF6MRpKdN880KBy43B0BMzSfeT96MzrsNjFI3GbA==
   dependencies:
     "@types/color-convert" "*"
 
@@ -5580,7 +5590,7 @@
     "@types/cheerio" "*"
     "@types/react" "*"
 
-"@types/eslint@^7.28.0":
+"@types/eslint@^7.2.13", "@types/eslint@^7.28.0":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
   integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
@@ -6050,6 +6060,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__find-used-node-modules@link:bazel-bin/packages/kbn-find-used-node-modules/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__generate@link:bazel-bin/packages/kbn-generate/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6062,6 +6076,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__import-resolver@link:bazel-bin/packages/kbn-import-resolver/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__interpreter@link:bazel-bin/packages/kbn-interpreter/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6174,6 +6192,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__shared-ux-button-exit-full-screen@link:bazel-bin/packages/shared-ux/button/exit_full_screen/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__shared-ux-components@link:bazel-bin/packages/kbn-shared-ux-components/npm_module_types":
   version "0.0.0"
   uid ""
@@ -6292,6 +6314,20 @@
   resolved "https://registry.yarnpkg.com/@types/lz-string/-/lz-string-1.3.34.tgz#69bfadde419314b4a374bf2c8e58659c035ed0a5"
   integrity sha512-j6G1e8DULJx3ONf6NdR5JiR2ZY3K3PaaqiEuKYkLQO0Czfi1AzrtjfnfCROyWGeDd5IVMKCwsgSmMip9OWijow==
 
+"@types/mapbox__point-geometry@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz#488a9b76e8457d6792ea2504cdd4ecdd9860a27e"
+  integrity sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA==
+
+"@types/mapbox__vector-tile@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz#8fa1379dbaead1e1b639b8d96cfd174404c379d6"
+  integrity sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==
+  dependencies:
+    "@types/geojson" "*"
+    "@types/mapbox__point-geometry" "*"
+    "@types/pbf" "*"
+
 "@types/markdown-it@^12.2.3":
   version "12.2.3"
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
@@ -6522,6 +6558,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
   integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
 
+"@types/pbf@*", "@types/pbf@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.2.tgz#8d291ad68b4b8c533e96c174a2e3e6399a59ed61"
+  integrity sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ==
+
 "@types/pdfkit@*":
   version "0.10.6"
   resolved "https://registry.yarnpkg.com/@types/pdfkit/-/pdfkit-0.10.6.tgz#9ddde7e642e6c3f1245134456a03fbc4b67dc4b5"
@@ -10372,7 +10413,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.8.2, color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -10396,15 +10437,7 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.4.0, color-string@^1.5.2, color-string@^1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
-  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color-string@^1.9.0:
+color-string@^1.5.2, color-string@^1.6.0, color-string@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa"
   integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
@@ -10417,14 +10450,6 @@ color-support@^1.1.3:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
-  integrity sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=
-  dependencies:
-    color-convert "^1.8.2"
-    color-string "^1.4.0"
-
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
@@ -10434,17 +10459,17 @@ color@3.0.x:
     color-string "^1.5.2"
 
 color@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
-  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
+  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
   dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.4"
+    color-convert "^1.9.3"
+    color-string "^1.6.0"
 
-color@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-4.2.1.tgz#498aee5fce7fc982606c8875cab080ac0547c884"
-  integrity sha512-MFJr0uY4RvTQUKvPq7dh9grVOTYSFeXja2mBXioCGjnjJoXrAp9jJ1NQTDR73c9nwBSAQiNKloKl5zq9WB9UPw==
+color@^4.2.1, color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
   dependencies:
     color-convert "^2.0.1"
     color-string "^1.9.0"
@@ -13437,11 +13462,12 @@ eslint-config-prettier@^7.2.0:
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
   integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
 
-eslint-formatter-pretty@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.0.0.tgz#dc15f3bf4fb51b7ba5fbedb77f57ba8841140ce2"
-  integrity sha512-QgdeZxQwWcN0TcXXNZJiS6BizhAANFhCzkE7Yl9HKB7WjElzwED6+FbbZB2gji8ofgJTGPqKm6VRCNT3OGCeEw==
+eslint-formatter-pretty@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz#7a6877c14ffe2672066c853587d89603e97c7708"
+  integrity sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==
   dependencies:
+    "@types/eslint" "^7.2.13"
     ansi-escapes "^4.2.1"
     chalk "^4.1.0"
     eslint-rule-docs "^1.1.5"
@@ -15272,13 +15298,6 @@ glob@~7.1.1, glob@~7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
-  integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
-  dependencies:
-    ini "^1.3.5"
-
 global-dirs@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
@@ -17113,14 +17132,6 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz#6e084bbc92061fbb0971ec58b6ce6d404e24da69"
   integrity sha1-bghLvJIGH7sJcexYts5tQE4k2mk=
 
-is-installed-globally@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
-
 is-installed-globally@^0.4.0, is-installed-globally@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -17179,11 +17190,6 @@ is-npm@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-npm@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
-  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
-
 is-npm@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
@@ -18846,7 +18852,7 @@ latest-version@^1.0.0:
   dependencies:
     package-json "^1.0.0"
 
-latest-version@^5.0.0, latest-version@^5.1.0:
+latest-version@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
   integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
@@ -19910,25 +19916,6 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-7.0.1.tgz#1ed4a0a50b3844b451369c48362eb0515f04c1dc"
-  integrity sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    arrify "^2.0.1"
-    camelcase "^6.0.0"
-    camelcase-keys "^6.2.2"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "^4.0.2"
-    normalize-package-data "^2.5.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.13.1"
-    yargs-parser "^18.1.3"
-
 meow@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-8.0.0.tgz#1aa10ee61046719e334ffdc038bb5069250ec99a"
@@ -20142,7 +20129,7 @@ minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@4.1.0, minimist-options@^4.0.2:
+minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
@@ -23316,13 +23303,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726"
-  integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==
-  dependencies:
-    escape-goat "^2.0.0"
-
 pupa@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
@@ -24555,10 +24535,13 @@ redux-logger@^3.0.6:
   dependencies:
     deep-diff "^0.3.5"
 
-redux-observable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-1.2.0.tgz#ff51b6c6be2598e9b5e89fc36639186bb0e669c7"
-  integrity sha512-yeR90RP2WzZzCxxnQPlh2uFzyfFLsfXu8ROh53jGDPXVqj71uNDMmvi/YKQkd9ofiVoO4OYb1snbowO49tCEMg==
+redux-observable@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-2.0.0.tgz#4358bef2e924723a8b1ad0e835ccebb1612a6b9a"
+  integrity sha512-FJz4rLXX+VmDDwZS/LpvQsKnSanDOe8UVjiLryx1g3seZiS69iLpMrcvXD5oFO7rtkPyRdo/FmTqldnT3X3m+w==
+  dependencies:
+    rxjs "^7.0.0"
+    tslib "~2.1.0"
 
 redux-saga@^1.1.3:
   version "1.1.3"
@@ -25407,7 +25390,7 @@ rxjs-marbles@^5.0.6:
   dependencies:
     fast-equals "^2.0.0"
 
-rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.1, rxjs@^6.5.5, rxjs@^6.6.0, rxjs@^6.6.3:
+rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.1, rxjs@^6.6.0, rxjs@^6.6.3:
   version "6.6.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
   integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
@@ -25421,6 +25404,13 @@ rxjs@^6.6.7:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^7.0.0, rxjs@^7.5.5:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+  dependencies:
+    tslib "^2.1.0"
+
 rxjs@^7.2.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68"
@@ -27167,21 +27157,16 @@ stylis@3.5.0:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
   integrity sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==
 
+stylis@4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
+  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+
 stylis@^3.5.0:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
   integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
 
-stylis@^4.0.10:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"
-  integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==
-
-stylis@^4.0.3:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.7.tgz#412a90c28079417f3d27c028035095e4232d2904"
-  integrity sha512-OFFeUXFgwnGOKvEXaSv0D0KQ5ADP0n6g3SVONx6I/85JzNZ3u50FRwB3lVIk1QO2HNdI75tbVzc4Z66Gdp9voA==
-
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -28137,17 +28122,17 @@ tsconfig-paths@^3.11.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tsd@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/tsd/-/tsd-0.13.1.tgz#d2a8baa80b8319dafea37fbeb29fef3cec86e92b"
-  integrity sha512-+UYM8LRG/M4H8ISTg2ow8SWi65PS7Os+4DUnyiQLbJysXBp2DEmws9SMgBH+m8zHcJZqUJQ+mtDWJXP1IAvB2A==
+tsd@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/tsd/-/tsd-0.20.0.tgz#0346321ee3c506545486227e488e753109164248"
+  integrity sha512-iba/JlyT3qtnA9t8VrX2Fipu3L31U48oRIf1PNs+lIwQ7n63GTkt9eQlB5bLtfb7nYfy9t8oZzs+K4QEoEIS8Q==
   dependencies:
-    eslint-formatter-pretty "^4.0.0"
+    "@tsd/typescript" "~4.6.3"
+    eslint-formatter-pretty "^4.1.0"
     globby "^11.0.1"
-    meow "^7.0.1"
+    meow "^9.0.0"
     path-exists "^4.0.0"
     read-pkg-up "^7.0.0"
-    update-notifier "^4.1.0"
 
 tslib@2.3.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@~2.3.1:
   version "2.3.1"
@@ -28227,11 +28212,6 @@ type-detect@^1.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
   integrity sha1-diIXzAbbJY7EiQihKY6LlRIejqI=
 
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
 type-fest@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
@@ -28797,25 +28777,6 @@ update-notifier@^0.5.0:
     semver-diff "^2.0.0"
     string-length "^1.0.0"
 
-update-notifier@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
-  integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
-  dependencies:
-    boxen "^4.2.0"
-    chalk "^3.0.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.1"
-    is-npm "^4.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    pupa "^2.0.1"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
-
 update-notifier@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
@@ -30483,7 +30444,7 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.2, yargs-parser@^18.1.3:
+yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==